Request 6043 (accepted)

Overview

Request 6043 (accepted)

Update to version 2.4

Created by Aloysius 29 days ago
In state accepted

Submit gpac

Submit package home:Aloysius:branches:Essentials / gpac to package Essentials / gpac

gpac.changes Changed

@@ -1,4 +1,69 @@
 -------------------------------------------------------------------
+Wed Apr 17 18:05:10 UTC 2024 - Luigi Baldoni <aloisio@gmx.com>
+
+- Update to version 2.4
+  Emscripten|WebAssembly(WASM) support:
+  * Session can run in worker or in main browser loop
+  * Automatic disable of ffdec and ffenc threads when not
+    running in worker
+  * Use fetch() api for downloader
+  * Support for WebCodecs
+  * Support for getUserMedia and canvas readable streams
+  * gpac.html demo page
+  Media Formats:
+  * Fixes in text subtitle converters
+  * Improved DolbyVision muxing from mkv
+  * Dasher support for inputs with multiple stsd entries
+  * Allow multiplexed representations for LL-HLS
+  * Improved eac3 support
+  * QT cmov support (reading and writing)
+  * QT lpcm support
+  * Improved chaptering support
+  * Improved timecode inspection
+  * Support for big-endian PCM formats
+  * Support for uncv (raw video in mp4 and heif)
+  * Support for forced subtitles
+  * Support for HEVC bitstreams merging in dash (for multi-res
+    tile adaptation)
+  Filters:
+  * Async HTTP request in all filters
+  * JS/Python/NodeJS bindings for httpout server
+  * Fixed CORS and mime types in httpout for wasm and
+    sharedArrayuffer support
+  * Allow compilation without threads
+  * Allow compilation without network
+  * Fixed GF_FileIO for async read and write modes
+  * Added seeking in mp4dmx in mem mode
+  * vout updated to use VBO (required for gles2)
+  * libcaca video output support
+  * Allow ffdmx to work as demux filter on gpac input file pids
+  * GHI format for pre-indexing DASH/HLS session for JIT
+    packaging/encryption/transcode
+  * Zero-copy for mp4dmx and fragmented mp4mx
+  * Various speed optimizations (filter session, isomedia lib,
+    disk io, xml)
+  * Allow running the session without mutexes
+  * Closed Caption decoding filter (CEA708)
+  * MPEG-H decoder using IIS mpeghdec
+  * Templating for property assignment
+  * Conditional filter replacement to identify based on codecID
+  * Per-filter logging
+  MP4Box:
+  * Add track reordering option
+  Misc:
+  * Migrated doc from github's wiki to wiki.gpac.io
+  * FFMPEG 7 support
+  * Added features for configure (vout, aout, fonts, doc, evg)
+  * Allow specifying network interface by name or IP (instead of
+    IP only)
+  * UDP/TCP filtering and recording to / playback from pcap,
+    pcapng and GPAC gpc files
+  * Added Nix and Docker build files
+  * many bug fixes, improvements and security patches
+- Refresh gpac-rpath.patch
+- Drop gpac-doxygen_195.patch (merged upstream)
+
+-------------------------------------------------------------------
 Wed Oct 18 14:42:16 UTC 2023 - Manfred Hollstein <manfred.h@gmx.net>
 
 - Add gpac.a52dec.patch when building for Tumbleweed or Slowroll

gpac.spec Changed

gpac-doxygen_195.patch Deleted

gpac-rpath.patch Changed

@@ -1,9 +1,9 @@
-Index: gpac-2.2.0/applications/gpac/Makefile
+Index: gpac-2.4.0/applications/gpac/Makefile
 ===================================================================
---- gpac-2.2.0.orig/applications/gpac/Makefile
-+++ gpac-2.2.0/applications/gpac/Makefile
-@@ -39,7 +39,7 @@ LINKFLAGS+=-lgpac
- ifeq ($(CONFIG_DARWIN),yes)
+--- gpac-2.4.0.orig/applications/gpac/Makefile
++++ gpac-2.4.0/applications/gpac/Makefile
+@@ -58,7 +58,7 @@ ifeq ($(CONFIG_EMSCRIPTEN),yes)
+ else ifeq ($(CONFIG_DARWIN),yes)
  #LINKFLAGS+= -Wl,-rpath,'@loader_path'
  else
 -LINKFLAGS+= -Wl,-rpath,'$$ORIGIN' -Wl,-rpath-link,../../bin/gcc
@@ -11,12 +11,12 @@
  endif
  endif
  
-Index: gpac-2.2.0/applications/mp4box/Makefile
+Index: gpac-2.4.0/applications/mp4box/Makefile
 ===================================================================
---- gpac-2.2.0.orig/applications/mp4box/Makefile
-+++ gpac-2.2.0/applications/mp4box/Makefile
-@@ -18,7 +18,7 @@ LINKFLAGS=-L../../bin/gcc -L../../extra_
- ifeq ($(CONFIG_DARWIN),yes)
+--- gpac-2.4.0.orig/applications/mp4box/Makefile
++++ gpac-2.4.0/applications/mp4box/Makefile
+@@ -24,7 +24,7 @@ ifeq ($(CONFIG_EMSCRIPTEN),yes)
+ else ifeq ($(CONFIG_DARWIN),yes)
  #LINKFLAGS+= -Wl,-rpath,'@loader_path'
  else
 -LINKFLAGS+= -Wl,-rpath,'$$ORIGIN' -Wl,-rpath-link,../../bin/gcc

gpac-2.2.1.tar.gz/applications/deprecated Deleted

gpac-2.2.1.tar.gz/applications/deprecated/mp42ts Deleted

gpac-2.2.1.tar.gz/applications/deprecated/mp42ts/Makefile Deleted

@@ -1,70 +0,0 @@
-include ../../config.mak
-
-vpath %.c $(SRC_PATH)/applications/mp42ts
-
-CFLAGS= $(OPTFLAGS) -I"$(SRC_PATH)/include"
-
-ifeq ($(DEBUGBUILD),yes)
-CFLAGS+=-g
-LDFLAGS+=-g
-endif
-
-ifeq ($(GPROFBUILD),yes)
-CFLAGS+=-pg
-LDFLAGS+=-pg
-endif
-
-LINKFLAGS=-L../../bin/gcc
-ifeq ($(CONFIG_WIN32),yes)
-EXE=.exe
-PROG=MP42TS$(EXE)
-else
-EXT=
-PROG=MP42TS
-endif
-
-ifeq ($(STATICBUILD),yes)
-##include static modules and other deps for libgpac
-include ../../static.mak
-
-#FIXME we have to disable AAC+bifs support in mp42ts since it reuses things from aac_in already in libgpac ...
-ifeq ($(STATIC_MODULES),yes)
-CFLAGS+=-DGPAC_DISABLE_PLAYER
-endif
-
-LINKFLAGS+=-lgpac_static
-LINKFLAGS+= $(GPAC_SH_FLAGS)
-LINKFLAGS+=$(EXTRALIBS)
-else
-LINKFLAGS+=-lgpac 
-ifeq ($(CONFIG_DARWIN),yes)
-#LINKFLAGS+= -Wl,-rpath,'@loader_path'
-else
-LINKFLAGS+= -Wl,-rpath,'$$ORIGIN' -Wl,-rpath-link,../../bin/gcc
-endif
-endif
-
-
-#common objs - insert after ../static if any to overwrite list of objects
-OBJS= main.o
-
-SRCS := $(OBJS:.o=.c) 
-
-all: $(PROG)
-
-$(PROG): $(OBJS)
-	$(CC) -o ../../bin/gcc/$@ $(OBJS) $(LINKFLAGS) $(LDFLAGS)
-
-clean: 
-	rm -f $(OBJS) ../../bin/gcc/$(PROG)
-
-dep: depend
-
-depend:
-	rm -f .depend	
-	$(CC) -MM $(CFLAGS) $(SRCS) 1>.depend
-
-distclean: clean
-	rm -f Makefile.bak .depend
-
--include .depend

gpac-2.2.1.tar.gz/applications/deprecated/mp42ts/main.c Deleted

@@ -1,2932 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Jean Le Feuvre, Cyril Concolato, Romain Bouqueau
- *			Copyright (c) Telecom ParisTech 2005-2012
- *					All rights reserved
- *
- *  This file is part of GPAC / mp4-to-ts (mp42ts) application
- *
- *  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/media_tools.h>
-#include <gpac/constants.h>
-#include <gpac/base_coding.h>
-#include <gpac/mpegts.h>
-#include <gpac/main.h>
-
-#ifndef GPAC_DISABLE_STREAMING
-#include <gpac/internal/ietf_dev.h>
-#endif
-
-#ifndef GPAC_DISABLE_SENG
-#include <gpac/scene_engine.h>
-#endif
-
-#ifndef GPAC_DISABLE_TTXT
-#include <gpac/webvtt.h>
-#endif
-
-
-#ifdef GPAC_DISABLE_MPEG2TS_MUX
-#error "Cannot compile MP42TS if GPAC is not built with MPEG2-TS Muxing support"
-#endif
-
-#define MP42TS_PRINT_TIME_MS 500 /*refresh printed info every CLOCK_REFRESH ms*/
-#define MP42TS_VIDEO_FREQ 1000 /*meant to send AVC IDR only every CLOCK_REFRESH ms*/
-
-#define GPAC_DISABLE_PLAYER
-
-
-s32 temi_id_1 = -1;
-s32 temi_id_2 = -1;
-
-u32 temi_url_insertion_delay = 1000;
-u32 temi_offset = 0;
-Bool temi_disable_loop = GF_FALSE;
-
-Double temi_period=0;
-Bool request_temi_toggle = GF_FALSE;
-Bool temi_on = GF_TRUE;
-Bool temi_single_toggle = GF_FALSE;
-u64 temi_period_last_dts = 0;
-FILE *logfile = NULL;
-
-//no longer supported for filters
-#define GPAC_DISABLE_PLAYER
-
-
-static void usage()
-{
-	fprintf(stderr, "mp42ts <inputs> <destinations> options\n"
-	        "\n"
-	        "Inputs:\n"
-	        "-src filename:OPTS   specifies an input file used for a TS service\n"
-	        "                        * currently only supports ISO files and SDP files\n"
-	        "                        * can be used several times, once for each program\n"
-	        "By default each source is a program in a TS. \n"
-	        "Source options are colon-separated list of options, as follows:\n"
-	        "ID=N                   specifies the program ID for this source.\n"
-	        "             All sources with the same ID will be added to the same program\n"
-	        "name=STR               program name, as used in DVB service description table\n"
-	        "provider=STR           provider name, as used in DVB service description table\n"
-	        "disc                   the first packet of each stream will have the discontinuity marker set\n"
-	        "pmt=N                  sets version number of the PMT\n"
-
-	        "\n"
-	        "-prog filename        same as -src filename\n"
-	        "\n"
-	        "Destinations:\n"
-	        "Several destinations may be specified as follows, at least one is mandatory\n"
-	        "-dst-udp UDP_address:port (multicast or unicast)\n"
-	        "-dst-rtp RTP_address:port\n"
-	        "-dst-file filename\n"
-	        "The following parameters may be specified when -dst-file is used\n"
-	        "-segment-dir dir       server local directory to store segments (ends with a '/')\n"
-	        "-segment-duration dur  segment duration in seconds\n"
-	        "-segment-manifest file m3u8 file basename\n"
-	        "-segment-http-prefix p client address for accessing server segments\n"
-	        "-segment-number n      number of segments to list in the manifest\n"
-	        "\n"
-	        "Basic options:\n"
-	        "-rate R                specifies target rate in kbps of the multiplex (optional)\n"
-	        "-real-time             specifies the muxer will work in real-time mode\n"
-	        "                        * if not specified, the muxer will generate the TS as quickly as possible\n"
-	        "                        * automatically set for SDP or BT input\n"
-	        "-pcr-init V            sets initial value V for PCR - if not set, random value is used\n"
-	        "-pcr-offset V          offsets all timestamps from PCR by V, in 90kHz. Default value is computed based on input media.\n"
-	        "-psi-rate V            sets PSI refresh rate V in ms (default 100ms).\n"
-	        "                        * If 0, PSI data is only send once at the beginning or before each IDR when -rap option is set.\n"
-	        "                        * This should be set to 0 for DASH streams.\n"
-	        "-time n                request the muxer to stop after n ms\n"
-	        "-single-au             forces 1 PES = 1 AU (disabled by default)\n"
-	        "-multi-au              forces 1 PES = N AU for all streams (disabled by default).\n"
-	        "                        By default, audio streams pack N AUs in one PES but video and systems data use 1 AU per PES.\n"
-	        "-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 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 or at each PES header\n"
-	        "-force-pcr-only        allows sending PCR-only packets to enforce the requested PCR rate - STILL EXPERIMENTAL.\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"
-	        "-temi URL            Inserts TEMI time codes in adaptation field. URL is optional, and can be a number for external timeline IDs\n"
-	        "-temi-delay DelayMS    Specifies delay between two TEMI url descriptors (default is 1000)\n"
-	        "-temi-offset OffsetMS  Specifies an offset in ms to add to TEMI (by default TEMI starts at 0)\n"
-	        "-temi-noloop           Do not restart the TEMI timeline at the end of the source\n"
-	        "-temi2 ID              Inserts a secondary TEMI time codes in adaptation field of the audio PID if any. ID shall be set to the desired external timeline IDs\n"
-	        "-insert-ntp            Inserts NTP timestamp in TEMI timeline descriptor\n"
-	        "-sdt-rate MS           Gives the SDT carrousel rate in milliseconds. If 0 (default), SDT is not sent\n"
-	        "\n"
-	        "MPEG-4/T-DMB options:\n"
-	        "-bifs-src filename          update file: must be either an .sdp or a .bt file\n"
-	        "-audio url             may be mp3/udp or aac/http (shoutcast/icecast)\n"
-	        "-video url             shall be a raw h264 frame\n"
-	        "-mpeg4-carousel n      carousel period in ms\n"
-	        "-mpeg4 or -4on2        forces usage of MPEG-4 signaling (IOD and SL Config)\n"
-	        "-4over2                same as -4on2 and uses PMT to carry OD Updates\n"
-	        "-bifs-pes              carries BIFS over PES instead of sections\n"
-	        "-bifs-pes-ex           carries BIFS over PES without writing timestamps in SL\n"
-	        "\n"
-	        "Misc options\n"
-#ifdef GPAC_MEMORY_TRACKING
-            "-mem-track             enables memory tracker\n"
-            "-mem-track-stack       enables memory tracker stack dumping\n"
-#endif
-	        "-h or -help            print this screen\n"
-	        "-hc                    print libgpac options\n"
-	        "\n"
-			"GPAC version %s\n"
-	        "(c) Telecom ParisTech 2000-2018 - Licence LGPL v2\n"
-	        "GPAC Configuration: " GPAC_CONFIGURATION "\n"
-	        "Features: %s %s\n\n", gf_gpac_version(), gf_enabled_features(), gf_disabled_features()
-	       );
-}
-
-
-#define MAX_MUX_SRC_PROG	100
-typedef struct
-{
-
-#ifndef GPAC_DISABLE_ISOM
-	GF_ISOFile *mp4;
-#endif
-
-	u32 nb_streams, pcr_idx;
-	GF_ESInterface streams40;
-	GF_Descriptor *iod;
-#ifndef GPAC_DISABLE_SENG
-	GF_SceneEngine *seng;
-#endif
-	GF_Thread *th;
-	char *bifs_src_name;
-	u32 rate;
-	Bool repeat;
-	u32 mpeg4_signaling;
-	Bool audio_configured;
-	u64 samples_done, samples_count;
-	u32 nb_real_streams;
-	Bool real_time;
-	GF_List *od_updates;
-
-	u32 max_sample_size;
-
-	char program_name20;
-	char provider_name20;
-	u32 ID;
-	Bool is_not_program_declaration;
-	Bool set_disc;
-	u32 pmt_version;
-
-	Double last_ntp;
-} M2TSSource;
-
-#ifndef GPAC_DISABLE_ISOM
-typedef struct
-{
-	GF_ISOFile *mp4;
-	u32 track, sample_number, sample_count;
-	u32 mstype, mtype;
-	GF_ISOSample *sample;
-	/*refresh rate for images*/
-	u32 image_repeat_ms, nb_repeat_last;
-	void *dsi;
-	u32 dsi_size;
-
-	void *dsi_and_rap;
-	Bool loop;
-	Bool is_repeat;
-	s64 ts_offset, cts_dts_shift;
-	M2TSSource *source;
-
-	const char *temi_url;
-	u32 last_temi_url, timeline_id;
-	Bool insert_ntp;
-
-} GF_ESIMP4;
-#endif
-
-typedef struct
-{
-	u32 carousel_period, ts_delta;
-	u16 aggregate_on_stream;
-	Bool adjust_carousel_time;
-	Bool discard;
-	Bool rap;
-	Bool critical;
-	Bool vers_inc;
-} GF_ESIStream;
-
-typedef struct
-{
-	u32 size;
-	char *data;
-} GF_SimpleDataDescriptor;
-
-//TODO: find a clean way to save this data
-#ifndef GPAC_DISABLE_PLAYER
-static u32 audio_OD_stream_id = (u32)-1;
-#endif
-
-#define AUDIO_OD_ESID	100
-#define AUDIO_DATA_ESID	101
-#define VIDEO_DATA_ESID	105
-
-/*output types*/
-enum
-{
-	GF_MP42TS_FILE, /*open mpeg2ts file*/
-	GF_MP42TS_UDP,  /*open udp socket*/
-	GF_MP42TS_RTP,  /*open rtp socket*/
-#ifndef GPAC_DISABLE_PLAYER
-	GF_MP42TS_HTTP,	/*open http downloader*/
-#endif
-};
-
-static u32 format_af_descriptor(char *af_data, u32 timeline_id, u64 timecode, u32 timescale, u64 ntp, const char *temi_url, u32 *last_url_time)
-{
-	u32 res;
-	u32 len;
-	u32 last_time=0;
-	GF_BitStream *bs = gf_bs_new(af_data, 188, GF_BITSTREAM_WRITE);
-
-	if (ntp) {
-		last_time = 1000*(ntp>>32);
-		last_time += 1000*(ntp&0xFFFFFFFF)/0xFFFFFFFF;
-	} else if (timescale) {
-		last_time = (u32) (1000*timecode/timescale);
-	}
-	if (temi_url && (!*last_url_time || (last_time - *last_url_time + 1 >= temi_url_insertion_delay)) ) {
-		*last_url_time = last_time + 1;
-		len = 0;
-		gf_bs_write_int(bs,	GF_M2TS_AFDESC_LOCATION_DESCRIPTOR, 8);
-		gf_bs_write_int(bs,	len, 8);
-
-		gf_bs_write_int(bs,	0, 1); //force_reload
-		gf_bs_write_int(bs,	0, 1); //is_announcement
-		gf_bs_write_int(bs,	0, 1); //splicing_flag
-		gf_bs_write_int(bs,	0, 1); //use_base_temi_url
-		gf_bs_write_int(bs,	0xFF, 5); //reserved
-		gf_bs_write_int(bs,	timeline_id, 7); //timeline_id
-
-		if (temi_url) {
-			char *url = (char *)temi_url;
-			if (!strnicmp(temi_url, "http://", 7)) {
-				gf_bs_write_int(bs,	1, 8); //url_scheme
-				url = (char *) temi_url + 7;
-			} else if (!strnicmp(temi_url, "https://", 8)) {
-				gf_bs_write_int(bs,	2, 8); //url_scheme
-				url = (char *) temi_url + 8;
-			} else {
-				gf_bs_write_int(bs,	0, 8); //url_scheme
-			}
-			gf_bs_write_u8(bs, (u32) strlen(url)); //url_path_len
-			gf_bs_write_data(bs, url, (u32) strlen(url) ); //url
-			gf_bs_write_u8(bs, 0); //nb_addons
-		}
-		//rewrite len
-		len = (u32) gf_bs_get_position(bs) - 2;
-		af_data1 = len;
-	}
-
-	if (timescale || ntp) {
-		Bool use64 = (timecode > 0xFFFFFFFFUL) ? GF_TRUE : GF_FALSE;
-		len = 3; //3 bytes flags
-
-		if (timescale) len += 4 + (use64 ? 8 : 4);
-		if (ntp) len += 8;
-
-		//write timeline descriptor
-		gf_bs_write_int(bs,	GF_M2TS_AFDESC_TIMELINE_DESCRIPTOR, 8);
-		gf_bs_write_int(bs,	len, 8);
-
-		gf_bs_write_int(bs,	timescale ? (use64 ? 2 : 1) : 0, 2); //has_timestamp
-		gf_bs_write_int(bs,	ntp ? 1 : 0, 1); //has_ntp
-		gf_bs_write_int(bs,	0, 1); //has_ptp
-		gf_bs_write_int(bs,	0, 2); //has_timecode
-		gf_bs_write_int(bs,	0, 1); //force_reload
-		gf_bs_write_int(bs,	0, 1); //paused
-		gf_bs_write_int(bs,	0, 1); //discontinuity
-		gf_bs_write_int(bs,	0xFF, 7); //reserved
-		gf_bs_write_int(bs,	timeline_id, 8); //timeline_id
-		if (timescale) {
-			gf_bs_write_u32(bs,	timescale); //timescale
-			if (use64)
-				gf_bs_write_u64(bs,	timecode); //timestamp
-			else
-				gf_bs_write_u32(bs,	(u32) timecode); //timestamp
-		}
-		if (ntp) {
-			gf_bs_write_u64(bs,	ntp); //ntp
-		}
-	}
-	res = (u32) gf_bs_get_position(bs);
-	gf_bs_del(bs);
-	return res;
-}
-
-#ifndef GPAC_DISABLE_ISOM
-
-static GF_Err mp4_input_ctrl(GF_ESInterface *ifce, u32 act_type, void *param)
-{
-	char af_data188;
-	GF_ESIMP4 *priv = (GF_ESIMP4 *)ifce->input_udta;
-	if (!priv) return GF_BAD_PARAM;
-
-	switch (act_type) {
-	case GF_ESI_INPUT_DATA_FLUSH:
-	{
-		GF_ESIPacket pck;
-#ifndef GPAC_DISABLE_TTXT
-		GF_List *cues = NULL;
-#endif
-		if (!priv->sample)
-			priv->sample = gf_isom_get_sample(priv->mp4, priv->track, priv->sample_number+1, NULL);
-
-		if (!priv->sample) {
-			return GF_IO_ERR;
-		}
-
-		memset(&pck, 0, sizeof(GF_ESIPacket));
-
-		pck.flags = GF_ESI_DATA_AU_START | GF_ESI_DATA_HAS_CTS;
-		if (priv->sample->IsRAP) pck.sap_type = priv->sample->IsRAP;
-		pck.cts = priv->sample->DTS + priv->ts_offset;
-		if (priv->is_repeat) pck.flags |= GF_ESI_DATA_REPEAT;
-
-		if (priv->timeline_id) {
-			Bool deactivate_temi=GF_FALSE;
-			u64 ntp=0;
-			u64 tc = priv->sample->DTS + priv->sample->CTS_Offset + priv->cts_dts_shift;
-			Bool insert_temi=GF_FALSE;
-			if (temi_disable_loop) {
-				tc += priv->ts_offset;
-			}
-
-			if (temi_offset) {
-				tc += ((u64) temi_offset) * ifce->timescale / 1000;
-			}
-
-			if (priv->insert_ntp) {
-				u32 sec, frac;
-				gf_net_get_ntp(&sec, &frac);
-				ntp = sec;
-				ntp <<= 32;
-				ntp |= frac;
-			}
-			if (!temi_period) {
-				//toggle temi at RAP POINTS ONLY
-				if (request_temi_toggle && priv->sample->IsRAP) {
-					temi_on = !temi_on;
-					if (!temi_on) {
-						deactivate_temi = GF_TRUE;
-					}
-					fprintf(stderr, "Turning TEMI %st at DTS "LLU" (%g sec)\n", temi_on ? "on" : "off" , priv->sample->DTS, ((Double)priv->sample->DTS)/ifce->timescale);
-					request_temi_toggle = GF_FALSE;
-				}
-				insert_temi = temi_on;
-			} else {
-
-				if (!temi_on) {
-					if (priv->sample->IsRAP && ((priv->sample->DTS - temi_period_last_dts) >= temi_period * ifce->timescale)) {
-						temi_on = GF_TRUE;
-						temi_period_last_dts = priv->sample->DTS;
-						fprintf(stderr, "Turning TEMI on at DTS "LLU" (%g sec)\n", priv->sample->DTS, ((Double)priv->sample->DTS)/ifce->timescale);
-					}
-				} else {
-					if (!temi_single_toggle && priv->sample->IsRAP && ((priv->sample->DTS - temi_period_last_dts) >= temi_period * ifce->timescale)) {
-						temi_on = GF_FALSE;
-						temi_period_last_dts = priv->sample->DTS;
-						fprintf(stderr, "Turning TEMI off at DTS "LLU" (%g sec)\n", priv->sample->DTS, ((Double)priv->sample->DTS)/ifce->timescale);
-						deactivate_temi = GF_TRUE;
-					}
-				}
-				insert_temi = temi_on;
-			}
-
-			if (insert_temi) {
-				pck.mpeg2_af_descriptors_size = format_af_descriptor(af_data, priv->timeline_id - 1, tc, ifce->timescale, ntp, priv->temi_url, &priv->last_temi_url);
-				pck.mpeg2_af_descriptors = af_data;
-			} else if (deactivate_temi) {
-				pck.mpeg2_af_descriptors_size = format_af_descriptor(af_data, priv->timeline_id - 1, 0, 0, 0, "", &priv->last_temi_url);
-				pck.mpeg2_af_descriptors = af_data;
-			}
-		}
-
-		if (priv->nb_repeat_last) {
-			pck.cts += priv->nb_repeat_last*ifce->timescale * priv->image_repeat_ms / 1000;
-		}
-
-		pck.dts = pck.cts;
-		if (priv->cts_dts_shift) {
-			pck.cts += + priv->cts_dts_shift;
-			pck.flags |= GF_ESI_DATA_HAS_DTS;
-		}
-
-		if (priv->sample->CTS_Offset) {
-			pck.cts += priv->sample->CTS_Offset;
-			pck.flags |= GF_ESI_DATA_HAS_DTS;
-		}
-
-		if (priv->sample->IsRAP && priv->dsi && priv->dsi_size) {
-			pck.data = (char*)priv->dsi;
-			pck.data_len = priv->dsi_size;
-			ifce->output_ctrl(ifce, GF_ESI_OUTPUT_DATA_DISPATCH, &pck);
-			pck.flags &= ~GF_ESI_DATA_AU_START;
-		}
-
-		pck.flags |= GF_ESI_DATA_AU_END;
-		pck.data = priv->sample->data;
-		pck.data_len = priv->sample->dataLength;
-		pck.duration = gf_isom_get_sample_duration(priv->mp4, priv->track, priv->sample_number+1);
-#ifndef GPAC_DISABLE_TTXT
-		if (priv->mtype==GF_ISOM_MEDIA_TEXT && priv->mstype==GF_ISOM_SUBTYPE_WVTT) {
-			u64             start;
-			GF_WebVTTCue    *cue;
-			GF_List *gf_webvtt_parse_iso_cues(GF_ISOSample *iso_sample, u64 start);
-			start = (priv->sample->DTS * 1000) / ifce->timescale;
-			cues = gf_webvtt_parse_iso_cues(priv->sample, start);
-			if (gf_list_count(cues)>1) {
-				GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("MPEG-2 TS Muxer More than one cue in sample\n"));
-			}
-			cue = (GF_WebVTTCue *)gf_list_get(cues, 0);
-			if (cue) {
-				pck.data = cue->text;
-				pck.data_len = (u32)strlen(cue->text)+1;
-			} else {
-				pck.data = NULL;
-				pck.data_len = 0;
-			}
-		}
-#endif
-		ifce->output_ctrl(ifce, GF_ESI_OUTPUT_DATA_DISPATCH, &pck);
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("MPEG-2 TS Muxer Track %d: sample %d CTS %d\n", priv->track, priv->sample_number+1, pck.cts));
-
-#ifndef GPAC_DISABLE_VTT
-		if (cues) {
-			while (gf_list_count(cues)) {
-				GF_WebVTTCue *cue = (GF_WebVTTCue *)gf_list_get(cues, 0);
-				gf_list_rem(cues, 0);
-				gf_webvtt_cue_del(cue);
-			}
-			gf_list_del(cues);
-			cues = NULL;
-		}
-#endif
-		gf_isom_sample_del(&priv->sample);
-		priv->sample_number++;
-
-		if (!priv->source->real_time && !priv->is_repeat) {
-			priv->source->samples_done++;
-			gf_set_progress("MPEG-2 TS Muxing", priv->source->samples_done, priv->source->samples_count);
-		}
-
-		if (priv->sample_number==priv->sample_count) {
-			if (priv->loop) {
-				Double scale;
-				u64 duration;
-				/*increment ts offset*/
-				scale = gf_isom_get_media_timescale(priv->mp4, priv->track);
-				scale /= gf_isom_get_timescale(priv->mp4);
-				duration = (u64) (gf_isom_get_duration(priv->mp4) * scale);
-				priv->ts_offset += duration;
-				priv->sample_number = 0;
-				priv->is_repeat = (priv->sample_count==1) ? GF_TRUE : GF_FALSE;
-			}
-			else if (priv->image_repeat_ms && priv->source->nb_real_streams) {
-				priv->nb_repeat_last++;
-				priv->sample_number--;
-				priv->is_repeat = GF_TRUE;
-			} else {
-				if (!(ifce->caps & GF_ESI_STREAM_IS_OVER)) {
-					ifce->caps |= GF_ESI_STREAM_IS_OVER;
-					if (priv->sample_count>1) {
-						assert(priv->source->nb_real_streams);
-						priv->source->nb_real_streams--;
-					}
-				}
-			}
-		}
-	}
-	return GF_OK;
-
-	case GF_ESI_INPUT_DESTROY:
-		if (priv->dsi) gf_free(priv->dsi);
-		if (ifce->decoder_config) {
-			gf_free(ifce->decoder_config);
-			ifce->decoder_config = NULL;
-		}
-		gf_free(priv);
-		ifce->input_udta = NULL;
-		return GF_OK;
-	default:
-		return GF_BAD_PARAM;
-	}
-}
-
-static void fill_isom_es_ifce(M2TSSource *source, GF_ESInterface *ifce, GF_ISOFile *mp4, u32 track_num, u32 bifs_use_pes, Bool compute_max_size)
-{
-	GF_ESIMP4 *priv;
-	char *_lan;
-	GF_ESD *esd;
-	Bool is_hevc=GF_FALSE;
-	u64 avg_rate, duration;
-	s32 ref_count;
-	s64 mediaOffset;
-
-	GF_SAFEALLOC(priv, GF_ESIMP4);
-	if (!priv) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_APP, ("Failed to allocate MP4 input handler\n"));
-		return;
-	}
-
-	priv->mp4 = mp4;
-	priv->track = track_num;
-	priv->mtype = gf_isom_get_media_type(priv->mp4, priv->track);
-	priv->mstype = gf_isom_get_media_subtype(priv->mp4, priv->track, 1);
-	priv->loop = source->real_time ? GF_TRUE : GF_FALSE;
-	priv->sample_count = gf_isom_get_sample_count(mp4, track_num);
-	source->samples_count += priv->sample_count;
-	if (priv->sample_count>1)
-		source->nb_real_streams++;
-
-	priv->source = source;
-	memset(ifce, 0, sizeof(GF_ESInterface));
-	ifce->stream_id = gf_isom_get_track_id(mp4, track_num);
-
-	esd = gf_media_map_esd(mp4, track_num, 0);
-
-	if (esd) {
-		ifce->stream_type = esd->decoderConfig->streamType;
-		ifce->object_type_indication = esd->decoderConfig->objectTypeIndication;
-		if (esd->decoderConfig->decoderSpecificInfo && esd->decoderConfig->decoderSpecificInfo->dataLength) {
-			switch (esd->decoderConfig->objectTypeIndication) {
-			case GF_CODECID_AAC_MPEG4:
-			case GF_CODECID_AAC_MPEG2_MP:
-			case GF_CODECID_AAC_MPEG2_LCP:
-			case GF_CODECID_AAC_MPEG2_SSRP:
-			case GF_CODECID_MPEG4_PART2:
-				ifce->decoder_config = (char *)gf_malloc(sizeof(char)*esd->decoderConfig->decoderSpecificInfo->dataLength);
-				ifce->decoder_config_size = esd->decoderConfig->decoderSpecificInfo->dataLength;
-				memcpy(ifce->decoder_config, esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength);
-				if (esd->decoderConfig->objectTypeIndication == GF_CODECID_MPEG4_PART2) {
-					priv->dsi = (char *)gf_malloc(sizeof(char)*esd->decoderConfig->decoderSpecificInfo->dataLength);
-					priv->dsi_size = esd->decoderConfig->decoderSpecificInfo->dataLength;
-					memcpy(priv->dsi, esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength);
-				}
-				break;
-			case GF_CODECID_HEVC:
-			case GF_CODECID_LHVC:
-				is_hevc=GF_TRUE;
-			case GF_CODECID_AVC:
-			case GF_CODECID_SVC:
-			case GF_CODECID_MVC:
-				gf_isom_set_nalu_extract_mode(mp4, track_num, GF_ISOM_NALU_EXTRACT_LAYER_ONLY | GF_ISOM_NALU_EXTRACT_INBAND_PS_FLAG | GF_ISOM_NALU_EXTRACT_ANNEXB_FLAG | GF_ISOM_NALU_EXTRACT_VDRD_FLAG);
-				break;
-			case GF_CODECID_WEBVTT:
-				ifce->decoder_config = (char *)gf_malloc(sizeof(char)*esd->decoderConfig->decoderSpecificInfo->dataLength);
-				ifce->decoder_config_size = esd->decoderConfig->decoderSpecificInfo->dataLength;
-				memcpy(ifce->decoder_config, esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength);
-				break;
-			}
-		}
-		gf_odf_desc_del((GF_Descriptor *)esd);
-	}
-	gf_isom_get_media_language(mp4, track_num, &_lan);
-	if (!_lan || !strcmp(_lan, "und")) {
-		ifce->lang = 0;
-	} else {
-		ifce->lang = GF_4CC(_lan0,_lan1,_lan2,' ');
-	}
-	if (_lan) {
-		gf_free(_lan);
-	}
-
-	ifce->timescale = gf_isom_get_media_timescale(mp4, track_num);
-	ifce->duration = gf_isom_get_media_timescale(mp4, track_num);
-	avg_rate = gf_isom_get_media_data_size(mp4, track_num);
-	if (!avg_rate) return;
-	avg_rate *= ifce->timescale * 8;
-	if (0!=(duration=gf_isom_get_media_duration(mp4, track_num)))
-		avg_rate /= duration;
-
-	ifce->bit_rate = (u32) avg_rate;
-	ifce->duration = (Double) (s64) gf_isom_get_media_duration(mp4, track_num);
-	ifce->duration /= ifce->timescale;
-
-	GF_SAFEALLOC(ifce->sl_config, GF_SLConfig);
-	if (!ifce->sl_config) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_APP, ("Failed to allocate interface SLConfig\n"));
-		return;
-	}
-
-	ifce->sl_config->tag = GF_ODF_SLC_TAG;
-	ifce->sl_config->useAccessUnitStartFlag = 1;
-	ifce->sl_config->useAccessUnitEndFlag = 1;
-	ifce->sl_config->useRandomAccessPointFlag = 1;
-	ifce->sl_config->useTimestampsFlag = 1;
-	ifce->sl_config->timestampLength = 33;
-	ifce->sl_config->timestampResolution = ifce->timescale;
-
-	/*test mode in which time stamps are 90khz and not coded but copied over from PES header*/
-	if (bifs_use_pes==2) {
-		ifce->sl_config->timestampLength = 0;
-		ifce->sl_config->timestampResolution = 90000;
-	}
-
-#ifdef GPAC_DISABLE_ISOM_WRITE
-	fprintf(stderr, "Warning: GPAC was compiled without ISOM Write support, can't set SL Config!\n");
-#else
-	gf_isom_set_extraction_slc(mp4, track_num, 1, ifce->sl_config);
-#endif
-
-	ifce->input_ctrl = mp4_input_ctrl;
-	if (priv != ifce->input_udta) {
-		if (ifce->input_udta)
-			gf_free(ifce->input_udta);
-		ifce->input_udta = priv;
-	}
-
-
-	if (! gf_isom_get_edit_list_type(mp4, track_num, &mediaOffset)) {
-		priv->ts_offset = mediaOffset;
-	}
-
-	if (gf_isom_has_time_offset(mp4, track_num)==2) {
-		priv->cts_dts_shift = gf_isom_get_cts_to_dts_shift(mp4, track_num);
-	}
-
-	ifce->depends_on_stream = 0;
-	ref_count = gf_isom_get_reference_count(mp4, track_num, GF_ISOM_REF_SCAL);
-	if (ref_count > 0) {
-		gf_isom_get_reference_ID(mp4, track_num, GF_ISOM_REF_SCAL, (u32) ref_count, &ifce->depends_on_stream);
-	} else if (is_hevc) {
-		ref_count = gf_isom_get_reference_count(mp4, track_num, GF_ISOM_REF_BASE);
-		if (ref_count > 0) {
-			gf_isom_get_reference_ID(mp4, track_num, GF_ISOM_REF_BASE, (u32) ref_count, &ifce->depends_on_stream);
-		}
-	}
-
-	if (compute_max_size) {
-		u32 i;
-		for (i=0; i < priv->sample_count; i++) {
-			u32 s = gf_isom_get_sample_size(mp4, track_num, i+1);
-			if (s>source->max_sample_size) source->max_sample_size = s;
-		}
-	}
-
-}
-
-#endif //GPAC_DISABLE_ISOM
-
-
-#ifndef GPAC_DISABLE_SENG
-static GF_Err seng_input_ctrl(GF_ESInterface *ifce, u32 act_type, void *param)
-{
-	if (act_type==GF_ESI_INPUT_DESTROY) {
-		//TODO: free my data
-		if (ifce->input_udta)
-			gf_free(ifce->input_udta);
-		ifce->input_udta = NULL;
-		return GF_OK;
-	}
-
-	return GF_OK;
-}
-#endif
-
-
-#ifndef GPAC_DISABLE_STREAMING
-typedef struct
-{
-	/*RTP channel*/
-	GF_RTPChannel *rtp_ch;
-
-	/*depacketizer*/
-	GF_RTPDepacketizer *depacketizer;
-
-	GF_ESIPacket pck;
-
-	GF_ESInterface *ifce;
-
-	Bool cat_dsi, is_264;
-	void *dsi_and_rap;
-	u32 avc_dsi_size;
-
-	Bool use_carousel;
-	u32 au_sn;
-
-	s64 ts_offset;
-	Bool rtcp_init;
-	M2TSSource *source;
-
-	u32 min_dts_inc;
-	u64 prev_cts;
-	u64 prev_dts;
-} GF_ESIRTP;
-
-static GF_Err rtp_input_ctrl(GF_ESInterface *ifce, u32 act_type, void *param)
-{
-	u32 size, PayloadStart;
-	GF_Err e;
-	GF_RTPHeader hdr;
-	char buffer8000;
-	GF_ESIRTP *rtp = (GF_ESIRTP*)ifce->input_udta;
-
-	if (!ifce->input_udta) return GF_BAD_PARAM;
-
-	switch (act_type) {
-	case GF_ESI_INPUT_DATA_FLUSH:
-		/*flush rtcp channel*/
-		while (1) {
-			Bool has_sr = GF_FALSE;
-			size = gf_rtp_read_rtcp(rtp->rtp_ch, buffer, 8000);
-			if (!size) break;
-			e = gf_rtp_decode_rtcp(rtp->rtp_ch, buffer, size, &has_sr);
-
-			if (e == GF_EOS) ifce->caps |= GF_ESI_STREAM_IS_OVER;
-
-			if (has_sr && !rtp->rtcp_init) {
-				Double time = rtp->rtp_ch->last_SR_NTP_sec;
-				time += ((Double)rtp->rtp_ch->last_SR_NTP_frac)/0xFFFFFFFF;
-				if (!rtp->source->last_ntp) {
-					rtp->source->last_ntp = time;
-				}
-				if (time >= rtp->source->last_ntp) {
-					time -= rtp->source->last_ntp;
-				} else {
-					time = 0;
-				}
-				rtp->ts_offset = rtp->rtp_ch->last_SR_rtp_time;
-				rtp->ts_offset -= (s64) (time * rtp->rtp_ch->TimeScale);
-				rtp->rtcp_init = GF_TRUE;
-			}
-		}
-		/*flush rtp channel*/
-		while (1) {
-			size = gf_rtp_read_rtp(rtp->rtp_ch, buffer, 8000);
-			if (!size) break;
-			e = gf_rtp_decode_rtp(rtp->rtp_ch, buffer, size, &hdr, &PayloadStart);
-			if (e) return e;
-			gf_rtp_depacketizer_process(rtp->depacketizer, &hdr, buffer + PayloadStart, size - PayloadStart);
-		}
-		return GF_OK;
-	case GF_ESI_INPUT_DESTROY:
-		gf_rtp_depacketizer_del(rtp->depacketizer);
-		if (rtp->dsi_and_rap) gf_free(rtp->dsi_and_rap);
-		gf_rtp_del(rtp->rtp_ch);
-		gf_free(rtp);
-
-		if (ifce->decoder_config) {
-			gf_free(ifce->decoder_config);
-			ifce->decoder_config = NULL;
-		}
-		ifce->input_udta = NULL;
-		return GF_OK;
-	}
-	return GF_OK;
-}
-
-static void rtp_sl_packet_cbk(void *udta, char *payload, u32 size, GF_SLHeader *hdr, GF_Err e)
-{
-	GF_ESIRTP *rtp = (GF_ESIRTP*)udta;
-
-	/*sync not found yet, cannot start (since we don't support PCR discontinuities yet ...)*/
-	if (!rtp->rtcp_init) return;
-
-	/*try to compute a DTS*/
-	if (hdr->accessUnitStartFlag && !hdr->decodingTimeStampFlag) {
-		if (!rtp->prev_cts) {
-			rtp->prev_cts = rtp->prev_dts = hdr->compositionTimeStamp;
-		}
-
-		if (hdr->compositionTimeStamp > rtp->prev_cts) {
-			u32 diff = (u32) (hdr->compositionTimeStamp - rtp->prev_cts);
-			if (!rtp->min_dts_inc || (rtp->min_dts_inc > diff)) {
-				rtp->min_dts_inc = diff;
-				rtp->prev_dts = hdr->compositionTimeStamp - diff;
-			}
-		}
-		hdr->decodingTimeStampFlag = 1;
-		hdr->decodingTimeStamp = rtp->prev_dts + rtp->min_dts_inc;
-		rtp->prev_dts += rtp->min_dts_inc;
-		if (hdr->compositionTimeStamp < hdr->decodingTimeStamp) {
-			hdr->decodingTimeStamp = hdr->compositionTimeStamp;
-		}
-	}
-
-	rtp->pck.data = payload;
-	rtp->pck.data_len = size;
-	rtp->pck.dts = hdr->decodingTimeStamp + rtp->ts_offset;
-	rtp->pck.cts = hdr->compositionTimeStamp + rtp->ts_offset;
-	rtp->pck.flags = 0;
-	if (hdr->compositionTimeStampFlag) rtp->pck.flags |= GF_ESI_DATA_HAS_CTS;
-	if (hdr->decodingTimeStampFlag) rtp->pck.flags |= GF_ESI_DATA_HAS_DTS;
-	if (hdr->accessUnitStartFlag) rtp->pck.flags |= GF_ESI_DATA_AU_START;
-	if (hdr->accessUnitEndFlag) rtp->pck.flags |= GF_ESI_DATA_AU_END;
-	if (hdr->randomAccessPointFlag) rtp->pck.sap_type = 1;
-
-	if (rtp->use_carousel) {
-		if ((hdr->AU_sequenceNumber==rtp->au_sn) && hdr->randomAccessPointFlag) rtp->pck.flags |= GF_ESI_DATA_REPEAT;
-		rtp->au_sn = hdr->AU_sequenceNumber;
-	}
-
-	if (rtp->is_264) {
-		if (!payload) return;
-
-		/*send a NALU delim: copy over NAL ref idc*/
-		if (hdr->accessUnitStartFlag) {
-			char sc6;
-			sc0 = sc1 = sc2 = 0;
-			sc3 = 1;
-			sc4 = (payload4 & 0x60) | GF_AVC_NALU_ACCESS_UNIT;
-			sc5 = 0xF0 /*7 "all supported NALUs" (=111) + rbsp trailing (10000)*/;
-
-			rtp->pck.data = sc;
-			rtp->pck.data_len = 6;
-			rtp->ifce->output_ctrl(rtp->ifce, GF_ESI_OUTPUT_DATA_DISPATCH, &rtp->pck);
-
-			rtp->pck.flags &= ~GF_ESI_DATA_AU_START;
-
-			/*since we don't inspect the RTP content, we can only concatenate SPS and PPS indicated in SDP*/
-			if (hdr->randomAccessPointFlag && rtp->dsi_and_rap) {
-				rtp->pck.data = (char*)rtp->dsi_and_rap;
-				rtp->pck.data_len = rtp->avc_dsi_size;
-
-				rtp->ifce->output_ctrl(rtp->ifce, GF_ESI_OUTPUT_DATA_DISPATCH, &rtp->pck);
-			}
-
-			rtp->pck.data = payload;
-			rtp->pck.data_len = size;
-		}
-
-		rtp->ifce->output_ctrl(rtp->ifce, GF_ESI_OUTPUT_DATA_DISPATCH, &rtp->pck);
-	} else {
-		if (rtp->cat_dsi && hdr->randomAccessPointFlag && hdr->accessUnitStartFlag) {
-			if (rtp->dsi_and_rap) gf_free(rtp->dsi_and_rap);
-			rtp->pck.data_len = size + rtp->depacketizer->sl_map.configSize;
-			rtp->dsi_and_rap = gf_malloc(sizeof(char)*(rtp->pck.data_len));
-			memcpy(rtp->dsi_and_rap, rtp->depacketizer->sl_map.config, rtp->depacketizer->sl_map.configSize);
-			memcpy((char *) rtp->dsi_and_rap + rtp->depacketizer->sl_map.configSize, payload, size);
-			rtp->pck.data = (char*)rtp->dsi_and_rap;
-		}
-		rtp->ifce->output_ctrl(rtp->ifce, GF_ESI_OUTPUT_DATA_DISPATCH, &rtp->pck);
-	}
-}
-
-static void fill_rtp_es_ifce(GF_ESInterface *ifce, GF_SDPMedia *media, GF_SDPInfo *sdp, M2TSSource *source)
-{
-	u32 i;
-	GF_Err e;
-	GF_X_Attribute*att;
-	GF_ESIRTP *rtp;
-	GF_RTPMap*map;
-	GF_SDPConnection *conn;
-	GF_RTSPTransport trans;
-
-	/*check connection*/
-	conn = sdp->c_connection;
-	if (!conn) conn = (GF_SDPConnection*)gf_list_get(media->Connections, 0);
-
-	/*check payload type*/
-	map = (GF_RTPMap*)gf_list_get(media->RTPMaps, 0);
-	GF_SAFEALLOC(rtp, GF_ESIRTP);
-	if (!rtp) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_APP, ("Failed to allocate RTP input handler\n"));
-		return;
-	}
-
-	memset(ifce, 0, sizeof(GF_ESInterface));
-	rtp->rtp_ch = gf_rtp_new();
-	i=0;
-	while ((att = (GF_X_Attribute*)gf_list_enum(media->Attributes, &i))) {
-		if (!stricmp(att->Name, "mpeg4-esid") && att->Value) ifce->stream_id = atoi(att->Value);
-	}
-
-	memset(&trans, 0, sizeof(GF_RTSPTransport));
-	trans.Profile = media->Profile;
-	trans.source = conn ? conn->host : sdp->o_address;
-	trans.IsUnicast = gf_sk_is_multicast_address(trans.source) ? GF_FALSE : GF_TRUE;
-	if (!trans.IsUnicast) {
-		trans.port_first = media->PortNumber;
-		trans.port_last = media->PortNumber + 1;
-		trans.TTL = conn ? conn->TTL : 0;
-	} else {
-		trans.client_port_first = media->PortNumber;
-		trans.client_port_last = media->PortNumber + 1;
-	}
-
-	if (gf_rtp_setup_transport(rtp->rtp_ch, &trans, NULL) != GF_OK) {
-		gf_rtp_del(rtp->rtp_ch);
-		fprintf(stderr, "Cannot initialize RTP transport\n");
-		return;
-	}
-	/*setup depacketizer*/
-	rtp->depacketizer = gf_rtp_depacketizer_new(media, rtp_sl_packet_cbk, rtp);
-	if (!rtp->depacketizer) {
-		gf_rtp_del(rtp->rtp_ch);
-		fprintf(stderr, "Cannot create RTP depacketizer\n");
-		return;
-	}
-	/*setup channel*/
-	gf_rtp_setup_payload(rtp->rtp_ch, map->PayloadType, map->ClockRate);
-	ifce->input_udta = rtp;
-	ifce->input_ctrl = rtp_input_ctrl;
-	rtp->ifce = ifce;
-	rtp->source = source;
-
-	ifce->object_type_indication = rtp->depacketizer->sl_map.CodecID;
-	ifce->stream_type = rtp->depacketizer->sl_map.StreamType;
-	ifce->timescale = gf_rtp_get_clockrate(rtp->rtp_ch);
-	if (rtp->depacketizer->sl_map.config) {
-		switch (ifce->object_type_indication) {
-		case GF_CODECID_MPEG4_PART2:
-			rtp->cat_dsi = GF_TRUE;
-			break;
-		case GF_CODECID_AVC:
-		case GF_CODECID_SVC:
-		case GF_CODECID_MVC:
-			rtp->is_264 = GF_TRUE;
-			rtp->depacketizer->flags |= GF_RTP_AVC_USE_ANNEX_B;
-			{
-#ifndef GPAC_DISABLE_AV_PARSERS
-				GF_AVCConfig *avccfg = gf_odf_avc_cfg_read(rtp->depacketizer->sl_map.config, rtp->depacketizer->sl_map.configSize);
-				if (avccfg) {
-					GF_AVCConfigSlot *slc;
-					u32 i;
-					GF_BitStream *bs;
-
-					bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
-					for (i=0; i<gf_list_count(avccfg->sequenceParameterSets); i++) {
-						slc = (GF_AVCConfigSlot*)gf_list_get(avccfg->sequenceParameterSets, i);
-						gf_bs_write_u32(bs, 1);
-						gf_bs_write_data(bs, slc->data, slc->size);
-					}
-					for (i=0; i<gf_list_count(avccfg->pictureParameterSets); i++) {
-						slc = (GF_AVCConfigSlot*)gf_list_get(avccfg->pictureParameterSets, i);
-						gf_bs_write_u32(bs, 1);
-						gf_bs_write_data(bs, slc->data, slc->size);
-					}
-					gf_bs_get_content(bs, (char **) &rtp->dsi_and_rap, &rtp->avc_dsi_size);
-					gf_bs_del(bs);
-				}
-				gf_odf_avc_cfg_del(avccfg);
-#endif
-			}
-			break;
-		case GF_CODECID_AAC_MPEG4:
-			ifce->decoder_config = (char*)gf_malloc(sizeof(char) * rtp->depacketizer->sl_map.configSize);
-			ifce->decoder_config_size = rtp->depacketizer->sl_map.configSize;
-			memcpy(ifce->decoder_config, rtp->depacketizer->sl_map.config, rtp->depacketizer->sl_map.configSize);
-			break;
-		}
-	}
-	if (rtp->depacketizer->sl_map.StreamStateIndication) {
-		rtp->use_carousel = GF_TRUE;
-		rtp->au_sn=0;
-	}
-
-	gf_rtp_depacketizer_reset(rtp->depacketizer, GF_TRUE);
-	e = gf_rtp_initialize(rtp->rtp_ch, 0x100000ul, GF_FALSE, 0, 10, 200, NULL);
-	if (e!=GF_OK) {
-		gf_rtp_del(rtp->rtp_ch);
-		fprintf(stderr, "Cannot initialize RTP channel: %s\n", gf_error_to_string(e));
-		return;
-	}
-	fprintf(stderr, "RTP interface initialized\n");
-}
-#endif /*GPAC_DISABLE_STREAMING*/
-
-#ifndef GPAC_DISABLE_SENG
-static GF_Err void_input_ctrl(GF_ESInterface *ifce, u32 act_type, void *param)
-{
-	return GF_OK;
-}
-#endif
-
-/*AAC import features*/
-#ifndef GPAC_DISABLE_PLAYER
-
-void *audio_prog = NULL;
-static void SampleCallBack(void *calling_object, u16 ESID, char *data, u32 size, u64 ts);
-#define DONT_USE_TERMINAL_MODULE_API
-#include "../../modules/aac_in/aac_in.c"
-AACReader *aac_reader = NULL;
-u64 audio_discontinuity_offset = 0;
-
-/*create an OD codec and encode the descriptor*/
-static GF_Err encode_audio_desc(GF_ESD *esd, GF_SimpleDataDescriptor *audio_desc)
-{
-	GF_Err e;
-	GF_ODCodec *odc = gf_odf_codec_new();
-	GF_ODUpdate *od_com = (GF_ODUpdate*)gf_odf_com_new(GF_ODF_OD_UPDATE_TAG);
-	GF_ObjectDescriptor *od = (GF_ObjectDescriptor*)gf_odf_desc_new(GF_ODF_OD_TAG);
-	assert( esd );
-	assert( audio_desc );
-	gf_list_add(od->ESDescriptors, esd);
-	od->objectDescriptorID = AUDIO_DATA_ESID;
-	gf_list_add(od_com->objectDescriptors, od);
-
-	e = gf_odf_codec_add_com(odc, (GF_ODCom*)od_com);
-	if (e) {
-		fprintf(stderr, "Audio input error add the command to be encoded\n");
-		return e;
-	}
-	e = gf_odf_codec_encode(odc, 0);
-	if (e) {
-		fprintf(stderr, "Audio input error encoding the descriptor\n");
-		return e;
-	}
-	e = gf_odf_codec_get_au(odc, &audio_desc->data, &audio_desc->size);
-	if (e) {
-		fprintf(stderr, "Audio input error getting the descriptor\n");
-		return e;
-	}
-	e = gf_odf_com_del((GF_ODCom**)&od_com);
-	if (e) {
-		fprintf(stderr, "Audio input error deleting the command\n");
-		return e;
-	}
-	gf_odf_codec_del(odc);
-
-	return GF_OK;
-}
-
-#endif
-
-
-static void SampleCallBack(void *calling_object, u16 ESID, char *data, u32 size, u64 ts)
-{
-	u32 i;
-	//fprintf(stderr, "update: ESID=%d - size=%d - ts="LLD"\n", ESID, size, ts);
-
-	if (calling_object) {
-		M2TSSource *source = (M2TSSource *)calling_object;
-
-#ifndef GPAC_DISABLE_PLAYER
-		if (ESID == AUDIO_DATA_ESID) {
-			if (audio_OD_stream_id != (u32)-1) {
-				/*this is the first time we get some audio data. Therefore we are sure we can retrieve the audio descriptor. Then we'll
-				  send it by calling this callback recursively so that a player gets the audio descriptor before audio data.
-				  Hack: the descriptor is carried thru the input_udta, you shall delete it*/
-				GF_SimpleDataDescriptor *audio_desc = source->streamsaudio_OD_stream_id.input_udta;
-				if (audio_desc && !audio_desc->data) /*intended for HTTP/AAC: an empty descriptor was set (vs already filled for RTP/UDP MP3)*/
-				{
-					/*get the audio descriptor and encode it*/
-					GF_ESD *esd = AAC_GetESD(aac_reader);
-					assert(esd->slConfig->timestampResolution);
-					esd->slConfig->useAccessUnitStartFlag = 1;
-					esd->slConfig->useAccessUnitEndFlag = 1;
-					esd->slConfig->useTimestampsFlag = 1;
-					esd->slConfig->timestampLength = 33;
-					/*audio stream, all samples are RAPs*/
-					esd->slConfig->useRandomAccessPointFlag = 0;
-					esd->slConfig->hasRandomAccessUnitsOnlyFlag = 1;
-					for (i=0; i<source->nb_streams; i++) {
-						if (source->streamsi.stream_id == AUDIO_DATA_ESID) {
-							GF_Err e;
-							source->streamsi.timescale = esd->slConfig->timestampResolution;
-							e = gf_m2ts_program_stream_update_ts_scale(&source->streamsi, esd->slConfig->timestampResolution);
-							if (e != GF_OK) {
-								fprintf(stderr, "Failed updating TS program timescale\n");
-							}
-							else if (!source->streamsi.sl_config)
-								source->streamsi.sl_config = (GF_SLConfig *)gf_odf_desc_new(GF_ODF_SLC_TAG);
-
-							memcpy(source->streamsi.sl_config, esd->slConfig, sizeof(GF_SLConfig));
-							break;
-						}
-					}
-					esd->ESID = AUDIO_DATA_ESID;
-					assert(audio_OD_stream_id != (u32)-1);
-					encode_audio_desc(esd, audio_desc);
-
-					/*build the ESI*/
-					{
-						/*audio OD descriptor: rap=1 and vers_inc=0*/
-						GF_SAFEALLOC(source->streamsaudio_OD_stream_id.input_udta, GF_ESIStream);
-						if (!source->streamsaudio_OD_stream_id.input_udta) {
-							GF_LOG(GF_LOG_ERROR, GF_LOG_APP, ("Failed to allocate aac input handler\n"));
-							return;
-						}
-						((GF_ESIStream*)source->streamsaudio_OD_stream_id.input_udta)->rap = 1;
-
-						/*we have the descriptor; now call this callback recursively so that a player gets the audio descriptor before audio data.*/
-						source->repeat = 1;
-						SampleCallBack(source, AUDIO_OD_ESID, audio_desc->data, audio_desc->size, 0/*gf_m2ts_get_sys_clock(muxer)*/);
-						source->repeat = 0;
-
-						/*clean*/
-						gf_free(audio_desc->data);
-						gf_free(audio_desc);
-						gf_free(source->streamsaudio_OD_stream_id.input_udta);
-						source->streamsaudio_OD_stream_id.input_udta = NULL;
-					}
-				}
-			}
-			/*update the timescale if needed*/
-			else if (!source->audio_configured) {
-				GF_ESD *esd = AAC_GetESD(aac_reader);
-				assert(esd->slConfig->timestampResolution);
-				for (i=0; i<source->nb_streams; i++) {
-					if (source->streamsi.stream_id == AUDIO_DATA_ESID) {
-						GF_Err e;
-						source->streamsi.timescale = esd->slConfig->timestampResolution;
-						source->streamsi.decoder_config = esd->decoderConfig->decoderSpecificInfo->data;
-						source->streamsi.decoder_config_size = esd->decoderConfig->decoderSpecificInfo->dataLength;
-						esd->decoderConfig->decoderSpecificInfo->data = NULL;
-						esd->decoderConfig->decoderSpecificInfo->dataLength = 0;
-						e = gf_m2ts_program_stream_update_ts_scale(&source->streamsi, esd->slConfig->timestampResolution);
-						if (!e)
-							source->audio_configured = 1;
-						break;
-					}
-				}
-				gf_odf_desc_del((GF_Descriptor *)esd);
-			}
-
-			/*overwrite timing as it is flushed to 0 on discontinuities*/
-			ts += audio_discontinuity_offset;
-		}
-#endif
-		i=0;
-		while (i<source->nb_streams) {
-			if (source->streamsi.output_ctrl==NULL) {
-				fprintf(stderr, "MULTIPLEX NOT YET CREATED\n");
-				return;
-			}
-			if (source->streamsi.stream_id == ESID) {
-				GF_ESIStream *priv = (GF_ESIStream *)source->streamsi.input_udta;
-				GF_ESIPacket pck;
-				memset(&pck, 0, sizeof(GF_ESIPacket));
-				pck.data = data;
-				pck.data_len = size;
-				pck.flags |= GF_ESI_DATA_HAS_CTS;
-				pck.flags |= GF_ESI_DATA_HAS_DTS;
-				pck.flags |= GF_ESI_DATA_AU_START;
-				pck.flags |= GF_ESI_DATA_AU_END;
-				if (ts) pck.cts = pck.dts = ts;
-
-				if (priv->rap)
-					pck.sap_type = 1;
-				if (source->repeat || !priv->vers_inc) {
-					pck.flags |= GF_ESI_DATA_REPEAT;
-					fprintf(stderr, "RAP carousel from scene engine sent: ESID=%d - size=%d - ts="LLD"\n", ESID, size, ts);
-				} else {
-					if (ESID != AUDIO_DATA_ESID && ESID != VIDEO_DATA_ESID)	/*don't log A/V inputs*/
-						fprintf(stderr, "Update from scene engine sent: ESID=%d - size=%d - ts="LLD"\n", ESID, size, ts);
-				}
-				source->streamsi.output_ctrl(&source->streamsi, GF_ESI_OUTPUT_DATA_DISPATCH, &pck);
-				return;
-			}
-			i++;
-		}
-	}
-	return;
-}
-
-//static gf_seng_callback * SampleCallBack = &mySampleCallBack;
-
-
-static volatile Bool run = 1;
-
-#ifndef GPAC_DISABLE_SENG
-static GF_ESIStream * set_broadcast_params(M2TSSource *source, u16 esid, u32 period, u32 ts_delta, u16 aggregate_on_stream, Bool adjust_carousel_time, Bool force_rap, Bool aggregate_au, Bool discard_pending, Bool signal_rap, Bool signal_critical, Bool version_inc)
-{
-	u32 i=0;
-	GF_ESIStream *priv=NULL;
-	GF_ESInterface *esi=NULL;
-
-	/*locate our stream*/
-	if (esid) {
-		while (i<source->nb_streams) {
-			if (source->streamsi.stream_id == esid) {
-				priv = (GF_ESIStream *)source->streamsi.input_udta;
-				esi = &source->streamsi;
-				break;
-			}
-			else {
-				i++;
-			}
-		}
-		/*TODO: stream not found*/
-	}
-
-	/*TODO - set/reset the ESID for the parsers*/
-	if (!priv) return NULL;
-
-	/*TODO - if discard is set, abort current carousel*/
-	if (discard_pending) {
-	}
-
-	/*remember RAP flag*/
-	priv->rap = signal_rap;
-	priv->critical = signal_critical;
-	priv->vers_inc = version_inc;
-
-	priv->ts_delta = ts_delta;
-	priv->adjust_carousel_time = adjust_carousel_time;
-
-	/*change stream aggregation mode*/
-	if ((aggregate_on_stream != (u16)-1) && (priv->aggregate_on_stream != aggregate_on_stream)) {
-		gf_seng_enable_aggregation(source->seng, esid, aggregate_on_stream);
-		priv->aggregate_on_stream = aggregate_on_stream;
-	}
-	/*change stream aggregation mode*/
-	if (priv->aggregate_on_stream==esi->stream_id) {
-		if (priv->aggregate_on_stream && (period!=(u32)-1) && (esi->repeat_rate != period)) {
-			esi->repeat_rate = period;
-		}
-	} else {
-		esi->repeat_rate = 0;
-	}
-	return priv;
-}
-#endif
-
-#ifndef GPAC_DISABLE_SENG
-
-static u32 seng_output(void *param)
-{
-	GF_Err e;
-	u64 last_src_modif, mod_time;
-	M2TSSource *source = (M2TSSource *)param;
-	GF_SceneEngine *seng = source->seng;
-#ifndef GPAC_DISABLE_PLAYER
-	GF_SimpleDataDescriptor *audio_desc;
-#endif
-	Bool update_context=0;
-	Bool force_rap, adjust_carousel_time, discard_pending, signal_rap, signal_critical, version_inc, aggregate_au;
-	u32 period, ts_delta;
-	u16 es_id, aggregate_on_stream;
-	e = GF_OK;
-	gf_sleep(2000); /*TODO: events instead? What are we waiting for?*/
-	gf_seng_encode_context(seng, SampleCallBack);
-
-	last_src_modif = source->bifs_src_name ? gf_file_modification_time(source->bifs_src_name) : 0;
-
-	/*send the audio descriptor*/
-#ifndef GPAC_DISABLE_PLAYER
-	if (source->mpeg4_signaling==GF_M2TS_MPEG4_SIGNALING_FULL && audio_OD_stream_id!=(u32)-1) {
-		audio_desc = source->streamsaudio_OD_stream_id.input_udta;
-		if (audio_desc && audio_desc->data) /*RTP/UDP + MP3 case*/
-		{
-			assert(audio_OD_stream_id != (u32)-1);
-			assert(!aac_reader); /*incompatible with AAC*/
-			source->repeat = 1;
-			SampleCallBack(source, AUDIO_OD_ESID, audio_desc->data, audio_desc->size, 0/*gf_m2ts_get_sys_clock(muxer)*/);
-			source->repeat = 0;
-			gf_free(audio_desc->data);
-			gf_free(audio_desc);
-			source->streamsaudio_OD_stream_id.input_udta = NULL;
-		}
-	}
-#endif
-
-	while (run) {
-		if (!gf_prompt_has_input()) {
-			if (source->bifs_src_name) {
-				mod_time = gf_file_modification_time(source->bifs_src_name);
-				if (mod_time != last_src_modif) {
-					FILE *srcf;
-					char flag_buf201, *flag;
-					fprintf(stderr, "Update file modified - processing\n");
-					last_src_modif = mod_time;
-
-					srcf = gf_fopen(source->bifs_src_name, "rt");
-					if (!srcf) continue;
-
-					/*checks if we have a broadcast config*/
-					if (!fgets(flag_buf, 200, srcf))
-						flag_buf0 = '\0';
-					gf_fclose(srcf);
-
-					aggregate_au = force_rap = adjust_carousel_time = discard_pending = signal_rap = signal_critical = 0;
-					version_inc = 1;
-					period = -1;
-					aggregate_on_stream = -1;
-					ts_delta = 0;
-					es_id = 0;
-
-					/*find our keyword*/
-					flag = strstr(flag_buf, "gpac_broadcast_config ");
-					if (flag) {
-						flag += strlen("gpac_broadcast_config ");
-						/*move to next word*/
-						while (flag && (flag0==' ')) flag++;
-
-						while (1) {
-							char *sep = strchr(flag, ' ');
-							if (sep) sep0 = 0;
-							if (!strnicmp(flag, "esid=", 5)) {
-								/*ESID on which the update is applied*/
-								es_id = atoi(flag+5);
-							} else if (!strnicmp(flag, "period=", 7)) {
-								/*TODO: target period carousel for ESID ??? (ESID/carousel)*/
-								period = atoi(flag+7);
-							} else if (!strnicmp(flag, "ts=", 3)) {
-								/*TODO: */
-								ts_delta = atoi(flag+3);
-							} else if (!strnicmp(flag, "carousel=", 9)) {
-								/*TODO: why? => sends the update on carousel id specified by this argument*/
-								aggregate_on_stream = atoi(flag+9);
-							} else if (!strnicmp(flag, "restamp=", 8)) {
-								/*CTS is updated when carouselled*/
-								adjust_carousel_time = atoi(flag+8);
-							} else if (!strnicmp(flag, "discard=", 8)) {
-								/*when we receive several updates during a single carousel period, this attribute specifies whether the current update discard pending ones*/
-								discard_pending = atoi(flag+8);
-							} else if (!strnicmp(flag, "aggregate=", 10)) {
-								/*Boolean*/
-								aggregate_au = atoi(flag+10);
-							} else if (!strnicmp(flag, "force_rap=", 10)) {
-								/*TODO: */
-								force_rap = atoi(flag+10);
-							} else if (!strnicmp(flag, "rap=", 4)) {
-								/*TODO: */
-								signal_rap = atoi(flag+4);
-							} else if (!strnicmp(flag, "critical=", 9)) {
-								/*TODO: */
-								signal_critical = atoi(flag+9);
-							} else if (!strnicmp(flag, "vers_inc=", 9)) {
-								/*Boolean to increment m2ts section version number*/
-								version_inc = atoi(flag+9);
-							}
-							if (sep) {
-								sep0 = ' ';
-								flag = sep+1;
-							} else {
-								break;
-							}
-						}
-
-						set_broadcast_params(source, es_id, period, ts_delta, aggregate_on_stream, adjust_carousel_time, force_rap, aggregate_au, discard_pending, signal_rap, signal_critical, version_inc);
-					}
-
-					e = gf_seng_encode_from_file(seng, es_id, aggregate_au ? 0 : 1, source->bifs_src_name, SampleCallBack);
-					if (e) {
-						fprintf(stderr, "Processing command failed: %s\n", gf_error_to_string(e));
-					} else
-						gf_seng_aggregate_context(seng, 0);
-
-					update_context=1;
-
-
-
-				}
-			}
-			if (update_context) {
-				source->repeat = 1;
-				e = gf_seng_encode_context(seng, SampleCallBack);
-				source->repeat = 0;
-				update_context = 0;
-			}
-
-			gf_sleep(10);
-		} else { /*gf_prompt_has_input()*/
-			char c = gf_prompt_get_char();
-			switch (c) {
-			case 'u':
-			{
-				GF_Err e;
-				char szCom8192;
-				fprintf(stderr, "Enter command to send:\n");
-				fflush(stdin);
-				szCom0 = 0;
-				if (1 > scanf("%^\t\n", szCom)) {
-					fprintf(stderr, "No command has been properly entered, aborting.\n");
-					break;
-				}
-				e = gf_seng_encode_from_string(seng, 0, 0, szCom, SampleCallBack);
-				if (e) {
-					fprintf(stderr, "Processing command failed: %s\n", gf_error_to_string(e));
-				}
-				update_context=1;
-			}
-			break;
-			case 'p':
-			{
-				char radGF_MAX_PATH;
-				fprintf(stderr, "Enter output file name - \"std\" for stderr: ");
-				if (1 > scanf("%s", rad)) {
-					fprintf(stderr, "No outfile name has been entered, aborting.\n");
-					break;
-				}
-				e = gf_seng_save_context(seng, !strcmp(rad, "std") ? NULL : rad);
-				fprintf(stderr, "Dump done (%s)\n", gf_error_to_string(e));
-			}
-			break;
-			case 'q':
-			{
-				run = 0;
-			}
-			}
-			e = GF_OK;
-		}
-	}
-
-
-	return e ? 1 : 0;
-}
-
-void fill_seng_es_ifce(GF_ESInterface *ifce, u32 i, GF_SceneEngine *seng, u32 period)
-{
-	GF_Err e = GF_OK;
-	u32 len;
-	GF_ESIStream *stream;
-	char *config_buffer = NULL;
-
-	memset(ifce, 0, sizeof(GF_ESInterface));
-	e = gf_seng_get_stream_config(seng, i, (u16*) &(ifce->stream_id), &config_buffer, &len, (u32*) &(ifce->stream_type), (u32*) &(ifce->object_type_indication), &(ifce->timescale));
-	if (e) {
-		fprintf(stderr, "Cannot set the stream config for stream %d to %d: %s\n", ifce->stream_id, period, gf_error_to_string(e));
-	}
-
-	ifce->repeat_rate = period;
-	GF_SAFEALLOC(stream, GF_ESIStream);
-	if (!stream) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_APP, ("Failed to allocate SENG input handler\n"));
-		return;
-	}
-
-	stream->rap = 1;
-	if (ifce->input_udta)
-		gf_free(ifce->input_udta);
-	ifce->input_udta = stream;
-
-	//fprintf(stderr, "Caroussel period: %d\n", period);
-//	e = gf_seng_set_carousel_time(seng, ifce->stream_id, period);
-	if (e) {
-		fprintf(stderr, "Cannot set carousel time on stream %d to %d: %s\n", ifce->stream_id, period, gf_error_to_string(e));
-	}
-	ifce->input_ctrl = seng_input_ctrl;
-
-}
-#endif
-
-static Bool open_source(M2TSSource *source, char *src, u32 carousel_rate, u32 mpeg4_signaling, char *update, char *audio_input_ip, u16 audio_input_port, char *video_buffer, Bool force_real_time, u32 bifs_use_pes, const char *temi_url, Bool compute_max_size, Bool insert_ntp)
-{
-#ifndef GPAC_DISABLE_STREAMING
-	GF_SDPInfo *sdp;
-#endif
-
-	memset(source, 0, sizeof(M2TSSource));
-	source->mpeg4_signaling = mpeg4_signaling;
-
-	/*open ISO file*/
-#ifndef GPAC_DISABLE_ISOM
-	if (gf_isom_probe_file(src)) {
-		u32 i;
-		u32 nb_tracks;
-		Bool has_bifs_od = 0;
-		Bool temi_assigned = 0;
-		u32 first_audio = 0;
-		u32 first_other = 0;
-		s64 min_offset = 0;
-		u32 min_offset_timescale = 0;
-		source->mp4 = gf_isom_open(src, GF_ISOM_OPEN_READ, 0);
-		if (!source->mp4)
-			return GF_FALSE;
-		source->nb_streams = 0;
-		source->real_time = force_real_time;
-		/*on MPEG-2 TS, carry 3GPP timed text as MPEG-4 Part17*/
-		gf_isom_text_set_streaming_mode(source->mp4, 1);
-		nb_tracks = gf_isom_get_track_count(source->mp4);
-
-		for (i=0; i<nb_tracks; i++) {
-			Bool check_deps = 0;
-			if (gf_isom_get_media_type(source->mp4, i+1) == GF_ISOM_MEDIA_HINT)
-				continue;
-
-			fill_isom_es_ifce(source, &source->streamsi, source->mp4, i+1, bifs_use_pes, compute_max_size);
-			if (!source->streamsi.input_udta) continue;
-			if (min_offset > ((GF_ESIMP4 *)source->streamsi.input_udta)->ts_offset) {
-				min_offset = ((GF_ESIMP4 *)source->streamsi.input_udta)->ts_offset;
-				min_offset_timescale = source->streamsi.timescale;
-			}
-
-			switch(source->streamsi.stream_type) {
-			case GF_STREAM_OD:
-				has_bifs_od = 1;
-				source->streamsi.repeat_rate = carousel_rate;
-				break;
-			case GF_STREAM_SCENE:
-				has_bifs_od = 1;
-				source->streamsi.repeat_rate = carousel_rate;
-				break;
-			case GF_STREAM_VISUAL:
-				/*turn on image repeat*/
-				switch (source->streamsi.object_type_indication) {
-				case GF_CODECID_JPEG:
-				case GF_CODECID_PNG:
-					((GF_ESIMP4 *)source->streamsi.input_udta)->image_repeat_ms = carousel_rate;
-					break;
-				default:
-					check_deps = 1;
-					if (gf_isom_get_sample_count(source->mp4, i+1)>1) {
-						/*get first visual stream as PCR*/
-						if (!source->pcr_idx) {
-							source->pcr_idx = i+1;
-							if ((temi_id_1>=0) || (temi_id_2>=0)) {
-								temi_assigned = GF_TRUE;
-								((GF_ESIMP4 *)source->streamsi.input_udta)->timeline_id = (u32) ( (temi_id_1>=0) ? temi_id_1 + 1 : temi_id_2 + 1 );
-								((GF_ESIMP4 *)source->streamsi.input_udta)->insert_ntp = insert_ntp;
-
-								if (temi_url && (temi_id_1>=0))
-									((GF_ESIMP4 *)source->streamsi.input_udta)->temi_url = temi_url;
-
-								if (temi_id_1>=0) temi_id_1 = -1;
-								else temi_id_2 = -1;
-							}
-						}
-					}
-					break;
-				}
-				break;
-			case GF_STREAM_AUDIO:
-				if (!first_audio) first_audio = i+1;
-				check_deps = 1;
-				break;
-			default:
-				/*log not supported stream type: %s*/
-				break;
-			}
-			source->nb_streams++;
-			if (gf_isom_get_sample_count(source->mp4, i+1)>1) first_other = i+1;
-
-			if (check_deps) {
-				u32 k;
-				Bool found_dep = 0;
-				for (k=0; k<nb_tracks; k++) {
-					if (gf_isom_get_media_type(source->mp4, k+1) != GF_ISOM_MEDIA_OD)
-						continue;
-
-					/*this stream is not referred to by any OD, send as regular PES*/
-					if (gf_isom_has_track_reference(source->mp4, k+1, GF_ISOM_REF_OD, gf_isom_get_track_id(source->mp4, i+1) )==1) {
-						found_dep = 1;
-						break;
-					}
-				}
-				if (!found_dep) {
-					source->streamsi.caps |= GF_ESI_STREAM_WITHOUT_MPEG4_SYSTEMS;
-				}
-			}
-		}
-		if (has_bifs_od && !source->mpeg4_signaling) source->mpeg4_signaling = GF_M2TS_MPEG4_SIGNALING_FULL;
-		if ( !temi_assigned && first_audio && ((temi_id_1>=0) || (temi_id_2>=0) ) ) {
-			((GF_ESIMP4 *)source->streamsfirst_audio-1.input_udta)->timeline_id = (u32) ( (temi_id_1>=0) ? temi_id_1 + 1 : temi_id_2 + 1 );
-			((GF_ESIMP4 *)source->streamsfirst_audio-1.input_udta)->insert_ntp = insert_ntp;
-
-			if (temi_url && (temi_id_1>=0) )
-				((GF_ESIMP4 *)source->streamsfirst_audio-1.input_udta)->temi_url = temi_url;
-
-			if (temi_id_1>=0) temi_id_1 = -1;
-			else temi_id_2 = -1;
-		}
-
-		/*if no visual PCR found, use first audio*/
-		if (!source->pcr_idx) source->pcr_idx = first_audio;
-		if (!source->pcr_idx) source->pcr_idx = first_other;
-		if (source->pcr_idx) {
-			GF_ESIMP4 *priv;
-			source->pcr_idx-=1;
-			priv = source->streamssource->pcr_idx.input_udta;
-			gf_isom_set_default_sync_track(source->mp4, priv->track);
-		}
-
-		if (min_offset < 0) {
-			for (i=0; i<source->nb_streams; i++) {
-				Double scale = source->streamsi.timescale;
-				scale /= min_offset_timescale;
-				((GF_ESIMP4 *)source->streamsi.input_udta)->ts_offset += (s64) (-min_offset * scale);
-			}
-		}
-
-		source->iod = gf_isom_get_root_od(source->mp4);
-		if (source->iod) {
-			GF_ObjectDescriptor*iod = (GF_ObjectDescriptor*)source->iod;
-			if (gf_list_count( ((GF_ObjectDescriptor*)source->iod)->ESDescriptors) == 0) {
-				gf_odf_desc_del(source->iod);
-				source->iod = NULL;
-			} else {
-				fprintf(stderr, "IOD found for program %s\n", src);
-
-				/*if using 4over2, get rid of OD tracks*/
-				if (source->mpeg4_signaling==GF_M2TS_MPEG4_SIGNALING_SCENE) {
-					for (i=0; i<gf_list_count(iod->ESDescriptors); i++) {
-						u32 track_num, k;
-						GF_M2TSDescriptor *oddesc;
-						GF_ISOSample *sample;
-						GF_ESD *esd = gf_list_get(iod->ESDescriptors, i);
-						if (esd->decoderConfig->streamType!=GF_STREAM_OD) continue;
-						track_num = gf_isom_get_track_by_id(source->mp4, esd->ESID);
-						if (gf_isom_get_sample_count(source->mp4, track_num)>1) continue;
-
-						sample = gf_isom_get_sample(source->mp4, track_num, 1, NULL);
-						if (sample->dataLength >= 255-2) {
-							gf_isom_sample_del(&sample);
-							continue;
-						}
-						/*rewrite ESD dependencies*/
-						for (k=0; k<gf_list_count(iod->ESDescriptors); k++) {
-							GF_ESD *dep_esd = gf_list_get(iod->ESDescriptors, k);
-							if (dep_esd->dependsOnESID==esd->ESID) dep_esd->dependsOnESID = esd->dependsOnESID;
-						}
-
-						for (k=0; k<source->nb_streams; k++) {
-							if (source->streamsk.stream_id==esd->ESID) {
-								source->streamsk.stream_type = 0;
-								break;
-							}
-						}
-
-						if (!source->od_updates) source->od_updates = gf_list_new();
-						GF_SAFEALLOC(oddesc, GF_M2TSDescriptor);
-						oddesc->data_len = sample->dataLength;
-						oddesc->data = sample->data;
-						oddesc->tag = GF_M2TS_MPEG4_ODUPDATE_DESCRIPTOR;
-						sample->data = NULL;
-						gf_isom_sample_del(&sample);
-						gf_list_add(source->od_updates, oddesc);
-
-						gf_list_rem(iod->ESDescriptors, i);
-						i--;
-						gf_odf_desc_del((GF_Descriptor *) esd);
-						source->samples_count--;
-					}
-				}
-
-			}
-		}
-		return 1;
-	}
-#endif
-
-
-#ifndef GPAC_DISABLE_STREAMING
-	/*open SDP file*/
-	if (strstr(src, ".sdp")) {
-		GF_X_Attribute *att;
-		char *sdp_buf;
-		u32 sdp_size, i;
-		GF_Err e;
-
-		e = gf_file_load_data(src, (u8 **) &sdp_buf, &sdp_size);
-		if (e) {
-			fprintf(stderr, "Error opening %s\n", src);
-			return 0;
-		}
-
-		sdp = gf_sdp_info_new();
-		e = gf_sdp_info_parse(sdp, sdp_buf, sdp_size);
-		gf_free(sdp_buf);
-		if (e) {
-			fprintf(stderr, "Error opening %s : %s\n", src, gf_error_to_string(e));
-			gf_sdp_info_del(sdp);
-			return 0;
-		}
-
-		i=0;
-		while ((att = (GF_X_Attribute*)gf_list_enum(sdp->Attributes, &i))) {
-			char buf2000;
-			u32 size;
-			char *buf64;
-			u32 size64;
-			char *iod_str;
-			if (strcmp(att->Name, "mpeg4-iod") ) continue;
-			iod_str = att->Value + 1;
-			if (strnicmp(iod_str, "data:application/mpeg4-iod;base64", strlen("data:application/mpeg4-iod;base64"))) continue;
-
-			buf64 = strstr(iod_str, ",");
-			if (!buf64) break;
-			buf64 += 1;
-			size64 = (u32) strlen(buf64) - 1;
-			size = gf_base64_decode(buf64, size64, buf, 2000);
-
-			gf_odf_desc_read(buf, size, &source->iod);
-			break;
-		}
-
-		source->nb_streams = gf_list_count(sdp->media_desc);
-		for (i=0; i<source->nb_streams; i++) {
-			GF_SDPMedia *media = gf_list_get(sdp->media_desc, i);
-			fill_rtp_es_ifce(&source->streamsi, media, sdp, source);
-			switch(source->streamsi.stream_type) {
-			case GF_STREAM_OD:
-			case GF_STREAM_SCENE:
-				source->mpeg4_signaling = GF_M2TS_MPEG4_SIGNALING_FULL;
-				source->streamsi.repeat_rate = carousel_rate;
-				break;
-			}
-			if (!source->pcr_idx && (source->streamsi.stream_type == GF_STREAM_VISUAL)) {
-				source->pcr_idx = i+1;
-			}
-		}
-
-		if (source->pcr_idx) source->pcr_idx-=1;
-		gf_sdp_info_del(sdp);
-
-		return 2;
-	} else
-#endif /*GPAC_DISABLE_STREAMING*/
-
-#ifndef GPAC_DISABLE_SENG
-		if (strstr(src, ".bt")) //open .bt file
-		{
-			u32 i;
-			u32 load_type=0;
-			source->seng = gf_seng_init(source, src, load_type, NULL, (load_type == GF_SM_LOAD_DIMS) ? 1 : 0);
-			if (!source->seng) {
-				fprintf(stderr, "Cannot create scene engine\n");
-				exit(1);
-			}
-			else {
-				fprintf(stderr, "Scene engine created.\n");
-			}
-			assert( source );
-			assert( source->seng);
-			source->iod = gf_seng_get_iod(source->seng);
-			if (! source->iod) {
-				fprintf(stderr, __FILE__": No IOD\n");
-			}
-
-			source->nb_streams = gf_seng_get_stream_count(source->seng);
-			source->rate = carousel_rate;
-			source->mpeg4_signaling = GF_M2TS_MPEG4_SIGNALING_FULL;
-
-			for (i=0; i<source->nb_streams; i++) {
-				fill_seng_es_ifce(&source->streamsi, i, source->seng, source->rate);
-				//fprintf(stderr, "Fill interface\n");
-				if (!source->pcr_idx && (source->streamsi.stream_type == GF_STREAM_AUDIO)) {
-					source->pcr_idx = i+1;
-				}
-			}
-
-#ifndef GPAC_DISABLE_PLAYER
-			/*when an audio input is present, declare it and store OD + ESD_U*/
-			if (audio_input_ip) {
-				/*add the audio program*/
-				source->pcr_idx = source->nb_streams;
-				source->streamssource->nb_streams.stream_type = GF_STREAM_AUDIO;
-				/*hack: http urls are not decomposed therefore audio_input_port remains null*/
-				if (audio_input_port) {	/*UDP/RTP*/
-					source->streamssource->nb_streams.object_type_indication = GF_CODECID_MPEG_AUDIO;
-				} else { /*HTTP*/
-					aac_reader->oti = source->streamssource->nb_streams.object_type_indication = GF_CODECID_AAC_MPEG4;
-				}
-				source->streamssource->nb_streams.input_ctrl = void_input_ctrl;
-				source->streamssource->nb_streams.stream_id = AUDIO_DATA_ESID;
-				source->streamssource->nb_streams.timescale = 1000;
-
-				GF_SAFEALLOC(source->streamssource->nb_streams.input_udta, GF_ESIStream);
-				if (!source->streamssource->nb_streams.input_udta) {
-					GF_LOG(GF_LOG_ERROR, GF_LOG_APP, ("Failed to allocate audio input handler\n"));
-					return 0;
-				}
-
-				((GF_ESIStream*)source->streamssource->nb_streams.input_udta)->vers_inc = 1;	/*increment version number at every audio update*/
-				assert( source );
-				//assert( source->iod);
-				if (source->iod && ((source->iod->tag!=GF_ODF_IOD_TAG) || (mpeg4_signaling != GF_M2TS_MPEG4_SIGNALING_SCENE))) {
-					/*create the descriptor*/
-					GF_ESD *esd;
-					GF_SimpleDataDescriptor *audio_desc;
-					GF_SAFEALLOC(audio_desc, GF_SimpleDataDescriptor);
-					if (audio_input_port) {	/*UDP/RTP*/
-						esd = gf_odf_desc_esd_new(0);
-						esd->decoderConfig->streamType = source->streamssource->nb_streams.stream_type;
-						esd->decoderConfig->objectTypeIndication = source->streamssource->nb_streams.object_type_indication;
-					} else {				/*HTTP*/
-						esd = AAC_GetESD(aac_reader);		/*in case of AAC, we have to wait the first ADTS chunk*/
-					}
-					assert( esd );
-					esd->ESID = source->streamssource->nb_streams.stream_id;
-					if (esd->slConfig->timestampResolution) /*in case of AAC, we have to wait the first ADTS chunk*/
-						encode_audio_desc(esd, audio_desc);
-					else
-						gf_odf_desc_del((GF_Descriptor *)esd);
-
-					/*find the audio OD stream and attach its descriptor*/
-					for (i=0; i<source->nb_streams; i++) {
-						if (source->streamsi.stream_id == AUDIO_OD_ESID) {
-							if (source->streamsi.input_udta)
-								gf_free(source->streamsi.input_udta);
-							source->streamsi.input_udta = (void*)audio_desc;	/*Hack: the real input_udta type (for our SampleCallBack function) is GF_ESIStream*/
-							audio_OD_stream_id = i;
-							break;
-						}
-					}
-					if (audio_OD_stream_id == (u32)-1) {
-						fprintf(stderr, "Error: could not find an audio OD stream with ESID=100 in '%s'\n", src);
-						return 0;
-					}
-				} else {
-					source->mpeg4_signaling = GF_M2TS_MPEG4_SIGNALING_SCENE;
-				}
-				source->nb_streams++;
-			}
-#endif
-
-			/*when an audio input is present, declare it and store OD + ESD_U*/
-			if (video_buffer) {
-				/*add the video program*/
-				source->streamssource->nb_streams.stream_type = GF_STREAM_VISUAL;
-				source->streamssource->nb_streams.object_type_indication = GF_CODECID_AVC;
-				source->streamssource->nb_streams.input_ctrl = void_input_ctrl;
-				source->streamssource->nb_streams.stream_id = VIDEO_DATA_ESID;
-				source->streamssource->nb_streams.timescale = 1000;
-
-				GF_SAFEALLOC(source->streamssource->nb_streams.input_udta, GF_ESIStream);
-				if (!source->streamssource->nb_streams.input_udta) {
-					GF_LOG(GF_LOG_ERROR, GF_LOG_APP, ("Failed to allocate video input handler\n"));
-					return 0;
-				}
-				((GF_ESIStream*)source->streamssource->nb_streams.input_udta)->vers_inc = 1;	/*increment version number at every video update*/
-				assert(source);
-
-				if (source->iod && ((source->iod->tag!=GF_ODF_IOD_TAG) || (mpeg4_signaling != GF_M2TS_MPEG4_SIGNALING_SCENE))) {
-					assert(0); /*TODO*/
-#if 0
-					/*create the descriptor*/
-					GF_ESD *esd;
-					GF_SimpleDataDescriptor *video_desc;
-					GF_SAFEALLOC(video_desc, GF_SimpleDataDescriptor);
-					esd = gf_odf_desc_esd_new(0);
-					esd->decoderConfig->streamType = source->streamssource->nb_streams.stream_type;
-					esd->decoderConfig->objectTypeIndication = source->streamssource->nb_streams.object_type_indication;
-					esd->ESID = source->streamssource->nb_streams.stream_id;
-
-					/*find the audio OD stream and attach its descriptor*/
-					for (i=0; i<source->nb_streams; i++) {
-						if (source->streamsi.stream_id == 103/*TODO: VIDEO_OD_ESID*/) {
-							if (source->streamsi.input_udta)
-								gf_free(source->streamsi.input_udta);
-							source->streamsi.input_udta = (void*)video_desc;
-							audio_OD_stream_id = i;
-							break;
-						}
-					}
-					if (audio_OD_stream_id == (u32)-1) {
-						fprintf(stderr, "Error: could not find an audio OD stream with ESID=100 in '%s'\n", src);
-						return 0;
-					}
-#endif
-				} else {
-					assert (source->mpeg4_signaling == GF_M2TS_MPEG4_SIGNALING_SCENE);
-				}
-
-				source->nb_streams++;
-			}
-
-			if (!source->pcr_idx) source->pcr_idx=1;
-			source->th = gf_th_new("Carousel");
-			source->bifs_src_name = update;
-			gf_th_run(source->th, seng_output, source);
-			return 1;
-		} else
-#endif
-		{
-			FILE *f = gf_fopen(src, "rt");
-			if (f) {
-				gf_fclose(f);
-				fprintf(stderr, "Error opening %s - not a supported input media, skipping.\n", src);
-			} else {
-				fprintf(stderr, "Error opening %s - no such file.\n", src);
-			}
-			return 0;
-		}
-}
-
-#ifdef GPAC_MEMORY_TRACKING
-GF_MemTrackerType mem_track = GF_MemTrackerNone;
-#endif
-
-/*macro to keep retro compatibility with '=' and spaces in parse_args*/
-#define CHECK_PARAM(param) (!strnicmp(arg, param, strlen(param)) \
-        && (   ((argstrlen(param) == '=') && (next_arg = arg+strlen(param)+1)) \
-            || ((strlen(arg) == strlen(param)) && ++i && (i<argc) && (next_arg = argvi))))
-
-/*parse MP42TS arguments*/
-static GFINLINE GF_Err parse_args(int argc, char **argv, u32 *mux_rate, u32 *carrousel_rate, s64 *pcr_init_val, u32 *pcr_offset, u32 *psi_refresh_rate, GF_M2TS_PackMode *pes_packing_mode, u32 *bifs_use_pes,
-                                  M2TSSource *sources, u32 *nb_sources, char **bifs_src_name,
-                                  Bool *real_time, u32 *run_time, char **video_buffer, u32 *video_buffer_size,
-                                  u32 *audio_input_type, char **audio_input_ip, u16 *audio_input_port,
-                                  u32 *output_type, char **ts_out, char **udp_out, char **rtp_out, u16 *output_port,
-                                  char** segment_dir, u32 *segment_duration, char **segment_manifest, u32 *segment_number, char **segment_http_prefix, u32 *split_rap, u32 *nb_pck_pack, u32 *pcr_ms, u32 *ttl, const char **ip_ifce, const char **temi_url, u32 *sdt_refresh_rate, Bool *enable_forced_pcr)
-{
-	Bool rate_found=0, mpeg4_carousel_found=0, time_found=0, src_found=0, dst_found=0, audio_input_found=0, video_input_found=0,
-	     seg_dur_found=0, seg_dir_found=0, seg_manifest_found=0, seg_number_found=0, seg_http_found=0, real_time_found=0, insert_ntp=0;
-	char *arg = NULL, *next_arg = NULL, *error_msg = "no argument found";
-	u32 mpeg4_signaling = GF_M2TS_MPEG4_SIGNALING_NONE;
-	Bool force_real_time = 0;
-	s32 i;
-
-	/*first pass: find audio - NO GPAC INIT MODIFICATION MUST OCCUR IN THIS PASS*/
-	for (i=1; i<argc; i++) {
-		arg = argvi;
-		if (!stricmp(arg, "-h") || strstr(arg, "-help")) {
-			usage();
-			return GF_EOS;
-		}
-		else if (!stricmp(arg, "-hc") ) {
-			fprintf(stderr, "libgpac options:\n");
-			gf_sys_print_core_help(GF_ARGMODE_ALL, 0);
-			return GF_EOS;
-		}
-		else if (CHECK_PARAM("-pcr-init")) {
-			sscanf(next_arg, LLD, pcr_init_val);
-		}
-		else if (CHECK_PARAM("-pcr-offset")) {
-			*pcr_offset = atoi(next_arg);
-		}
-		else if (CHECK_PARAM("-video")) {
-			GF_Err e;
-			if (video_input_found) {
-				error_msg = "multiple '-video' found";
-				arg = NULL;
-				goto error;
-			}
-			video_input_found = 1;
-			e = gf_file_load_data(next_arg, (u8 **) video_buffer, video_buffer_size);
-			if (e) {
-				fprintf(stderr, "Error while reading video file %s\n", next_arg);
-				goto error;
-			}
-		} else if (CHECK_PARAM("-audio")) {
-			if (audio_input_found) {
-				error_msg = "multiple '-audio' found";
-				arg = NULL;
-				goto error;
-			}
-			audio_input_found = 1;
-			if (!strnicmp(next_arg, "udp://", 6) || !strnicmp(next_arg, "rtp://", 6) || !strnicmp(next_arg, "http://", 7)) {
-				char *sep;
-				/*set audio input type*/
-				if (!strnicmp(next_arg, "udp://", 6))
-					*audio_input_type = GF_MP42TS_UDP;
-				else if (!strnicmp(next_arg, "rtp://", 6))
-					*audio_input_type = GF_MP42TS_RTP;
-#ifndef GPAC_DISABLE_PLAYER
-				else if (!strnicmp(next_arg, "http://", 7))
-					*audio_input_type = GF_MP42TS_HTTP;
-#endif
-				/*http needs to get the complete URL*/
-				switch(*audio_input_type) {
-				case GF_MP42TS_UDP:
-				case GF_MP42TS_RTP:
-					sep = strchr(next_arg+6, ':');
-					*real_time=1;
-					if (sep) {
-						*audio_input_port = atoi(sep+1);
-						sep0=0;
-						*audio_input_ip = gf_strdup(next_arg+6);
-						sep0=':';
-					} else {
-						*audio_input_ip = gf_strdup(next_arg+6);
-					}
-					break;
-#ifndef GPAC_DISABLE_PLAYER
-				case GF_MP42TS_HTTP:
-					/* No need to dup since it may come from argv */
-					*audio_input_ip = next_arg;
-					assert(audio_input_port != 0);
-					break;
-#endif
-				default:
-					assert(0);
-				}
-			}
-		} else if (CHECK_PARAM("-psi-rate")) {
-			*psi_refresh_rate = atoi(next_arg);
-		} else if (!stricmp(arg, "-bifs-pes")) {
-			*bifs_use_pes = 1;
-		} else if (!stricmp(arg, "-bifs-pes-ex")) {
-			*bifs_use_pes = 2;
-		} else if (!stricmp(arg, "-mpeg4") || !stricmp(arg, "-4on2")) {
-			mpeg4_signaling = GF_M2TS_MPEG4_SIGNALING_FULL;
-		} else if (!stricmp(arg, "-4over2")) {
-			mpeg4_signaling = GF_M2TS_MPEG4_SIGNALING_SCENE;
-		} else if (!strcmp(arg, "-mem-track") || !strcmp(arg, "-mem-track-stack")) {
-#ifdef GPAC_MEMORY_TRACKING
-			gf_sys_close();
-            mem_track = !strcmp(arg, "-mem-track-stack") ? GF_MemTrackerBackTrace : GF_MemTrackerSimple;
-			gf_sys_init(mem_track, NULL);
-			gf_log_set_tool_level(GF_LOG_MEMORY, GF_LOG_INFO);
-#else
-			fprintf(stderr, "WARNING - GPAC not compiled with Memory Tracker - ignoring \"%s\"\n", arg);
-#endif
-		} else if (CHECK_PARAM("-rate")) {
-			if (rate_found) {
-				error_msg = "multiple '-rate' found";
-				arg = NULL;
-				goto error;
-			}
-			rate_found = 1;
-			*mux_rate = 1000*atoi(next_arg);
-		} else if (CHECK_PARAM("-mpeg4-carousel")) {
-			if (mpeg4_carousel_found) {
-				error_msg = "multiple '-mpeg4-carousel' found";
-				arg = NULL;
-				goto error;
-			}
-			mpeg4_carousel_found = 1;
-			*carrousel_rate = atoi(next_arg);
-		} else if (!strnicmp(arg, "-real-time", 10)) {
-			if (real_time_found) {
-				goto error;
-			}
-			real_time_found = 1;
-			*real_time = 1;
-		} else if (CHECK_PARAM("-time")) {
-			if (time_found) {
-				error_msg = "multiple '-time' found";
-				arg = NULL;
-				goto error;
-			}
-			time_found = 1;
-			*run_time = atoi(next_arg);
-		} else if (!stricmp(arg, "-single-au")) {
-			*pes_packing_mode = GF_M2TS_PACK_NONE;
-		} else if (!stricmp(arg, "-multi-au")) {
-			*pes_packing_mode = GF_M2TS_PACK_ALL;
-		} else if (!stricmp(arg, "-rap")) {
-			*split_rap = 1;
-		} else if (!stricmp(arg, "-flush-rap")) {
-			*split_rap = 2;
-		} else if (!stricmp(arg, "-force-pcr-only")) {
-			*enable_forced_pcr = GF_TRUE;
-		} else if (CHECK_PARAM("-nb-pack")) {
-			*nb_pck_pack = atoi(next_arg);
-		} else if (CHECK_PARAM("-nb-pck")) {
-			*nb_pck_pack = atoi(next_arg);
-		} else if (CHECK_PARAM("-pcr-ms")) {
-			*pcr_ms = atoi(next_arg);
-		} else if (CHECK_PARAM("-ttl")) {
-			*ttl = atoi(next_arg);
-		} else if (CHECK_PARAM("-ifce")) {
-			*ip_ifce = next_arg;
-		} else if (CHECK_PARAM("-sdt-rate")) {
-			*sdt_refresh_rate = atoi(next_arg);
-		} else if (CHECK_PARAM("-segment-dir")) {
-			if (seg_dir_found) {
-				goto error;
-			}
-			seg_dir_found = 1;
-			*segment_dir = next_arg;
-			/* TODO: add the path separation char, if missing */
-		} else if (CHECK_PARAM("-segment-duration")) {
-			if (seg_dur_found) {
-				goto error;
-			}
-			seg_dur_found = 1;
-			*segment_duration = atoi(next_arg);
-		} else if (CHECK_PARAM("-segment-manifest")) {
-			if (seg_manifest_found) {
-				goto error;
-			}
-			seg_manifest_found = 1;
-			*segment_manifest = next_arg;
-		} else if (CHECK_PARAM("-segment-http-prefix")) {
-			if (seg_http_found) {
-				goto error;
-			}
-			seg_http_found = 1;
-			*segment_http_prefix = next_arg;
-		} else if (CHECK_PARAM("-segment-number")) {
-			if (seg_number_found) {
-				goto error;
-			}
-			seg_number_found = 1;
-			*segment_number = atoi(next_arg);
-		}
-		else if (CHECK_PARAM("-bifs-src")) {
-			if (src_found) {
-				error_msg = "multiple '-bifs-src' found";
-				arg = NULL;
-				goto error;
-			}
-			src_found = 1;
-			*bifs_src_name = next_arg;
-		} else if (CHECK_PARAM("-dst-file")) {
-			dst_found = 1;
-			*ts_out = gf_strdup(next_arg);
-		} else if (CHECK_PARAM("-temi")) {
-			if (next_arg0=='-') {
-				*temi_url = NULL;
-				i--;
-				temi_id_1 = 150;
-			} else {
-				u32 temi_id = 0;
-				if (sscanf(next_arg, "%d", &temi_id) == 1) {
-					if (temi_id < 0x80 || temi_id>0xFF) {
-						fprintf(stderr, "TEMI external timeline IDs shall be in the range 0x80, 0xFF, but %d was specified\n", temi_id);
-						return GF_BAD_PARAM;
-					}
-				}
-				if (!temi_id) {
-					*temi_url = next_arg;
-					if (strlen(next_arg) > 150) {
-						fprintf(stderr, "URLs longer than 150 bytes are not currently supported\n");
-						return GF_NOT_SUPPORTED;
-					}
-					temi_id_1 = 0;
-				} else {
-					temi_id_1 = temi_id;
-					*temi_url = NULL;
-				}
-			}
-		} else if (CHECK_PARAM("-temi2")) {
-			u32 temi_id = 0;
-			if (next_arg0=='-') {
-				fprintf(stderr, "No ID for secondary external TEMI timeline specified\n");
-				return GF_BAD_PARAM;
-			}
-			if (sscanf(next_arg, "%d", &temi_id) == 1) {
-				if (temi_id < 0x80 || temi_id>0xFF) {
-					fprintf(stderr, "TEMI external timeline IDs shall be in the range 0x80, 0xFF, but %d was specified\n", temi_id);
-					return GF_BAD_PARAM;
-				}
-				temi_id_2 = temi_id;
-			} else {
-				fprintf(stderr, "No ID for secondary external TEMI timeline specified\n");
-				return GF_BAD_PARAM;
-			}
-		} else if (CHECK_PARAM("-temi-delay")) {
-			temi_url_insertion_delay = atoi(next_arg);
-		} else if (CHECK_PARAM("-temi-offset")) {
-			temi_offset = atoi(next_arg);
-		} else if (!stricmp(arg, "-temi-noloop")) {
-			temi_disable_loop = 1;
-		} else if (!stricmp(arg, "-temi-off")) {
-			temi_on = GF_FALSE;
-		} else if (CHECK_PARAM("-temi-period")) {
-			temi_period = atof(next_arg);
-			if (temi_period<0) {
-				temi_period *= -1;
-				temi_single_toggle = GF_TRUE;
-			}
-		} else if (!stricmp(arg, "-insert-ntp")) {
-			insert_ntp = GF_TRUE;
-		}
-		else if (CHECK_PARAM("-dst-udp")) {
-			char *sep = strchr(next_arg, ':');
-			dst_found = 1;
-			*real_time=1;
-			if (sep) {
-				*output_port = atoi(sep+1);
-				sep0=0;
-				*udp_out = gf_strdup(next_arg);
-				sep0=':';
-			} else {
-				*udp_out = gf_strdup(next_arg);
-			}
-		}
-		else if (CHECK_PARAM("-dst-rtp")) {
-			char *sep = strchr(next_arg, ':');
-			dst_found = 1;
-			*real_time=1;
-			if (sep) {
-				*output_port = atoi(sep+1);
-				sep0=0;
-				*rtp_out = gf_strdup(next_arg);
-				sep0=':';
-			} else {
-				*rtp_out = gf_strdup(next_arg);
-			}
-		} else if (CHECK_PARAM("-src")) { //second pass arguments
-		} else if (CHECK_PARAM("-prog")) { //second pass arguments
-		} else {
-			u32 res = gf_sys_is_gpac_arg(arg);
-			if (!res) {
-				error_msg = "unknown option";
-				goto error;
-			} else if (res==2) {
-				if (!strchr(arg, '=')) i++;
-			}
-		}
-	}
-	
-	if (*real_time) force_real_time = 1;
-	rate_found = 1;
-
-	/*second pass: open sources*/
-	for (i=1; i<argc; i++) {
-		u32 res;
-		char *src_args;
-		arg = argvi;
-		if (arg0 !='-') continue;
-
-		if (! CHECK_PARAM("-src") && ! CHECK_PARAM("-prog") ) continue;
-
-		src_args = strchr(next_arg, ':');
-		if (src_args && (src_args1=='\\')) {
-			src_args = strchr(src_args+2, ':');
-		}
-		if (src_args) {
-			src_args0 = 0;
-			src_args = src_args + 1;
-		}
-
-		res = open_source(&sources*nb_sources, next_arg, *carrousel_rate, mpeg4_signaling, *bifs_src_name, *audio_input_ip, *audio_input_port, *video_buffer, force_real_time, *bifs_use_pes, *temi_url, (*pcr_offset == (u32) -1) ? 1 : 0, insert_ntp);
-
-		//we may have arguments
-		while (src_args) {
-			char *sep = strchr(src_args, ':');
-			if (sep) sep0 = 0;
-
-			if (!strnicmp(src_args, "name=", 5)) {
-				strncpy(sources*nb_sources.program_name, src_args+5, 20);
-			} else if (!strnicmp(src_args, "provider=", 9)) {
-				strncpy(sources*nb_sources.provider_name, src_args+9, 20);
-			} else if (!strnicmp(src_args, "ID=", 3)) {
-				u32 k;
-				sources*nb_sources.ID = atoi(src_args+3);
-
-				for (k=0; k<*nb_sources; k++) {
-					if (sourcesk.ID == sources*nb_sources.ID) {
-						sources*nb_sources.is_not_program_declaration = 1;
-						if (sourcesk.max_sample_size < sources*nb_sources.max_sample_size)
-							sourcesk.max_sample_size = sources*nb_sources.max_sample_size;
-
-						break;
-					}
-				}
-			} else if (!strnicmp(src_args, "disc", 4)) {
-				sources*nb_sources.set_disc = GF_TRUE;
-			} else if (!strnicmp(src_args, "PMT=", 4)) {
-				sources*nb_sources.pmt_version = atoi(src_args+4);
-			}
-
-			if (sep) {
-				sep0 = ':';
-				src_args = sep+1;
-			} else
-				break;
-		}
-
-		if (res) {
-			(*nb_sources)++;
-			if (res==2) *real_time=1;
-		}
-	}
-	/*syntax is correct; now testing the presence of mandatory arguments*/
-	if (dst_found && *nb_sources && rate_found) {
-		return GF_OK;
-	} else {
-		if (!dst_found)
-			fprintf(stderr, "Error: Destination argument not found\n");
-		if (! *nb_sources)
-			fprintf(stderr, "Error: No Programs are available\n");
-		usage();
-		return GF_BAD_PARAM;
-	}
-
-error:
-	if (!arg) {
-		fprintf(stderr, "Error: %s\n", error_msg);
-	} else {
-		fprintf(stderr, "Error: %s \"%s\"\n", error_msg, arg);
-	}
-	return GF_BAD_PARAM;
-}
-
-static GF_Err write_manifest(char *manifest, char *segment_dir, u32 segment_duration, char *segment_prefix, char *http_prefix, u32 first_segment, u32 last_segment, Bool end)
-{
-	FILE *manifest_fp;
-	u32 i;
-	char manifest_tmp_nameGF_MAX_PATH;
-	char manifest_nameGF_MAX_PATH;
-	char *tmp_manifest = manifest_tmp_name;
-
-	if (segment_dir) {
-		sprintf(manifest_tmp_name, "%stmp.m3u8", segment_dir);
-		sprintf(manifest_name, "%s%s", segment_dir, manifest);
-	} else {
-		sprintf(manifest_tmp_name, "tmp.m3u8");
-		sprintf(manifest_name, "%s", manifest);
-	}
-
-	manifest_fp = gf_fopen(tmp_manifest, "wt");
-	if (!manifest_fp) {
-		fprintf(stderr, "Could not create m3u8 manifest file (%s)\n", tmp_manifest);
-		return GF_BAD_PARAM;
-	}
-
-	fprintf(manifest_fp, "#EXTM3U\n#EXT-X-TARGETDURATION:%u\n#EXT-X-MEDIA-SEQUENCE:%u\n", segment_duration, first_segment);
-
-	for (i = first_segment; i <= last_segment; i++) {
-		fprintf(manifest_fp, "#EXTINF:%u,\n%s%s_%u.ts\n", segment_duration, http_prefix, segment_prefix, i);
-	}
-
-	if (end) {
-		fprintf(manifest_fp, "#EXT-X-ENDLIST\n");
-	}
-	gf_fclose(manifest_fp);
-
-	if (!rename(tmp_manifest, manifest_name)) {
-		return GF_OK;
-	} else {
-		if (remove(manifest_name)) {
-			fprintf(stderr, "Error removing file %s\n", manifest_name);
-			return GF_IO_ERR;
-		} else if (rename(tmp_manifest, manifest_name)) {
-			fprintf(stderr, "Could not rename temporary m3u8 manifest file (%s) into %s\n", tmp_manifest, manifest_name);
-			return GF_IO_ERR;
-		} else {
-			return GF_OK;
-		}
-	}
-}
-
-int main(int argc, char **argv)
-{
-	/********************/
-	/*   declarations   */
-	/********************/
-	const char *ts_pck;
-	char *ts_pack_buffer = NULL;
-	GF_Err e;
-	u32 run_time;
-	Bool real_time, is_stdout;
-	s64 pcr_init_val = -1;
-	u32 usec_till_next, ttl, split_rap, sdt_refresh_rate;
-	GF_M2TS_PackMode pes_packing_mode;
-	u32 i, j, mux_rate, nb_sources, cur_pid, carrousel_rate, last_print_time, last_video_time, bifs_use_pes, psi_refresh_rate, nb_pck_pack, nb_pck_in_pack, pcr_ms;
-	char *ts_out = NULL, *udp_out = NULL, *rtp_out = NULL, *audio_input_ip = NULL;
-	FILE *ts_output_file = NULL;
-	GF_Socket *ts_output_udp_sk = NULL, *audio_input_udp_sk = NULL;
-#ifndef GPAC_DISABLE_STREAMING
-	GF_RTPChannel *ts_output_rtp = NULL;
-	GF_RTSPTransport tr;
-	GF_RTPHeader hdr;
-#endif
-	char *video_buffer;
-	u32 video_buffer_size;
-	u16 output_port = 0, audio_input_port = 0;
-	u32 output_type, audio_input_type, pcr_offset;
-	char *audio_input_buffer = NULL;
-	u32 audio_input_buffer_length=65536;
-	char *bifs_src_name;
-	const char *insert_temi = 0;
-	M2TSSource sourcesMAX_MUX_SRC_PROG;
-	u32 segment_duration, segment_index, segment_number;
-	char segment_manifest_defaultGF_MAX_PATH;
-	char *segment_manifest, *segment_http_prefix, *segment_dir;
-	char segment_prefixGF_MAX_PATH;
-	char segment_nameGF_MAX_PATH;
-	const char *ip_ifce = NULL;
-	GF_M2TS_Time prev_seg_time;
-	GF_M2TS_Mux *muxer;
-	Bool enable_forced_pcr = GF_FALSE;
-	/*****************/
-	/*   gpac init   */
-	/*****************/
-	gf_sys_init(GF_MemTrackerNone, NULL);
-	gf_log_set_tool_level(GF_LOG_ALL, GF_LOG_WARNING);
-
-	/***********************/
-	/*   initialisations   */
-	/***********************/
-	real_time = 0;
-	is_stdout = 0;
-	ts_output_file = NULL;
-	video_buffer = NULL;
-	last_video_time = 0;
-	audio_input_type = 0;
-	sdt_refresh_rate = 0;
-	ts_output_udp_sk = NULL;
-	udp_out = NULL;
-#ifndef GPAC_DISABLE_STREAMING
-	ts_output_rtp = NULL;
-	rtp_out = NULL;
-#endif
-	ts_out = NULL;
-	bifs_src_name = NULL;
-	nb_sources = 0;
-	mux_rate = 0;
-	run_time = 0;
-	carrousel_rate = 500;
-	output_port = 1234;
-	segment_duration = 0;
-	segment_number = 10; /* by default, we keep the 10 previous segments */
-	segment_index = 0;
-	segment_manifest = NULL;
-	segment_http_prefix = NULL;
-	segment_dir = NULL;
-	prev_seg_time.sec = 0;
-	prev_seg_time.nanosec = 0;
-	video_buffer_size = 0;
-	nb_pck_pack = 1;
-	pcr_ms = 100;
-#ifndef GPAC_DISABLE_PLAYER
-	aac_reader = AAC_Reader_new();
-#endif
-	muxer = NULL;
-	pes_packing_mode = GF_M2TS_PACK_AUDIO_ONLY;
-	bifs_use_pes = 0;
-	split_rap = 0;
-	ttl = 1;
-	psi_refresh_rate = GF_M2TS_PSI_DEFAULT_REFRESH_RATE;
-	pcr_offset = (u32) -1;
-
-	/***********************/
-	/*   parse arguments   */
-	/***********************/
-	if (GF_OK != parse_args(argc, argv, &mux_rate, &carrousel_rate, &pcr_init_val, &pcr_offset, &psi_refresh_rate, &pes_packing_mode, &bifs_use_pes, sources, &nb_sources, &bifs_src_name,
-	                        &real_time, &run_time, &video_buffer, &video_buffer_size,
-	                        &audio_input_type, &audio_input_ip, &audio_input_port,
-	                        &output_type, &ts_out, &udp_out, &rtp_out, &output_port,
-	                        &segment_dir, &segment_duration, &segment_manifest, &segment_number, &segment_http_prefix, &split_rap, &nb_pck_pack, &pcr_ms, &ttl, &ip_ifce, &insert_temi, &sdt_refresh_rate, &enable_forced_pcr)) {
-		goto exit;
-	}
-
-	e = gf_sys_set_args(argc, (const char **) argv);
-	if (e) {
-		fprintf(stderr, "Error assigning libgpac arguments: %s\n", gf_error_to_string(e) );
-		goto exit;
-	}
-
-	if (run_time && !mux_rate) {
-		fprintf(stderr, "Cannot specify TS run time for VBR multiplex - disabling run time\n");
-		run_time = 0;
-	}
-
-	/***************************/
-	/*   create mp42ts muxer   */
-	/***************************/
-	muxer = gf_m2ts_mux_new(mux_rate, psi_refresh_rate, real_time);
-	if (!muxer) {
-		fprintf(stderr, "Could not create the muxer. Aborting.\n");
-		goto exit;
-	}
-	gf_m2ts_mux_use_single_au_pes_mode(muxer, pes_packing_mode);
-	if (pcr_init_val>=0) gf_m2ts_mux_set_initial_pcr(muxer, (u64) pcr_init_val);
-	gf_m2ts_mux_set_pcr_max_interval(muxer, pcr_ms);
-	gf_m2ts_mux_enable_pcr_only_packets(muxer, enable_forced_pcr);
-
-
-	if (ts_out != NULL) {
-		if (segment_duration) {
-			strcpy(segment_prefix, ts_out);
-			if (segment_dir) {
-				if (strchr("\\/", segment_namestrlen(segment_name)-1)) {
-					sprintf(segment_name, "%s%s_%d.ts", segment_dir, segment_prefix, segment_index);
-				} else {
-					sprintf(segment_name, "%s/%s_%d.ts", segment_dir, segment_prefix, segment_index);
-				}
-			} else {
-				sprintf(segment_name, "%s_%d.ts", segment_prefix, segment_index);
-			}
-			ts_out = gf_strdup(segment_name);
-			if (!segment_manifest) {
-				sprintf(segment_manifest_default, "%s.m3u8", segment_prefix);
-				segment_manifest = segment_manifest_default;
-			}
-			//write_manifest(segment_manifest, segment_dir, segment_duration, segment_prefix, segment_http_prefix, segment_index, 0, 0);
-		}
-		if (!strcmp(ts_out, "stdout") || !strcmp(ts_out, "-") ) {
-			ts_output_file = stdout;
-			is_stdout = GF_TRUE;
-		} else {
-			ts_output_file = gf_fopen(ts_out, "wb");
-			is_stdout = GF_FALSE;
-		}
-		if (!ts_output_file) {
-			fprintf(stderr, "Error opening %s\n", ts_out);
-			goto exit;
-		}
-	}
-	if (udp_out != NULL) {
-		ts_output_udp_sk = gf_sk_new(GF_SOCK_TYPE_UDP);
-		if (gf_sk_is_multicast_address((char *)udp_out)) {
-			e = gf_sk_setup_multicast(ts_output_udp_sk, (char *)udp_out, output_port, ttl, 0, (char *) ip_ifce);
-		} else {
-			e = gf_sk_bind(ts_output_udp_sk, ip_ifce, output_port, (char *)udp_out, output_port, GF_SOCK_REUSE_PORT);
-		}
-		if (e) {
-			fprintf(stderr, "Error initializing UDP socket: %s\n", gf_error_to_string(e));
-			goto exit;
-		}
-	}
-#ifndef GPAC_DISABLE_STREAMING
-	if (rtp_out != NULL) {
-		ts_output_rtp = gf_rtp_new();
-		gf_rtp_set_ports(ts_output_rtp, output_port);
-		memset(&tr, 0, sizeof(GF_RTSPTransport));
-		tr.IsUnicast = gf_sk_is_multicast_address((char *)rtp_out) ? 0 : 1;
-		tr.Profile="RTP/AVP";
-		tr.destination = (char *)rtp_out;
-		tr.source = "0.0.0.0";
-		tr.IsRecord = 0;
-		tr.Append = 0;
-		tr.SSRC = rand();
-		tr.port_first = output_port;
-		tr.port_last = output_port+1;
-		if (tr.IsUnicast) {
-			tr.client_port_first = output_port;
-			tr.client_port_last = output_port+1;
-		} else {
-			tr.source = (char *)rtp_out;
-			tr.TTL = ttl;
-		}
-		e = gf_rtp_setup_transport(ts_output_rtp, &tr, (char *)ts_out);
-		if (e != GF_OK) {
-			fprintf(stderr, "Cannot setup RTP transport info : %s\n", gf_error_to_string(e));
-			goto exit;
-		}
-		e = gf_rtp_initialize(ts_output_rtp, 0, 1, 1500, 0, 0, (char *) ip_ifce);
-		if (e != GF_OK) {
-			fprintf(stderr, "Cannot initialize RTP sockets : %s\n", gf_error_to_string(e));
-			goto exit;
-		}
-		memset(&hdr, 0, sizeof(GF_RTPHeader));
-		hdr.Version = 2;
-		hdr.PayloadType = 33;	/*MP2T*/
-		hdr.SSRC = tr.SSRC;
-		hdr.Marker = 0;
-	}
-#endif /*GPAC_DISABLE_STREAMING*/
-
-	/************************************/
-	/*   create streaming audio input   */
-	/************************************/
-	if (audio_input_ip)
-		switch(audio_input_type) {
-		case GF_MP42TS_UDP:
-			audio_input_udp_sk = gf_sk_new(GF_SOCK_TYPE_UDP);
-			if (gf_sk_is_multicast_address((char *)audio_input_ip)) {
-				e = gf_sk_setup_multicast(audio_input_udp_sk, (char *)audio_input_ip, audio_input_port, 32, 0, NULL);
-			} else {
-				e = gf_sk_bind(audio_input_udp_sk, NULL, audio_input_port, (char *)audio_input_ip, audio_input_port, GF_SOCK_REUSE_PORT);
-			}
-			if (e) {
-				fprintf(stderr, "Error initializing UDP socket for %s:%d : %s\n", audio_input_ip, audio_input_port, gf_error_to_string(e));
-				goto exit;
-			}
-			gf_sk_set_buffer_size(audio_input_udp_sk, 0, GF_M2TS_UDP_BUFFER_SIZE);
-			gf_sk_set_block_mode(audio_input_udp_sk, 0);
-
-			/*allocate data buffer*/
-			audio_input_buffer = (char*)gf_malloc(audio_input_buffer_length);
-			assert(audio_input_buffer);
-			break;
-		case GF_MP42TS_RTP:
-			/*TODO: not implemented*/
-			assert(0);
-			break;
-#ifndef GPAC_DISABLE_PLAYER
-		case GF_MP42TS_HTTP:
-			audio_prog = (void*)&sourcesnb_sources-1;
-			aac_download_file(aac_reader, audio_input_ip);
-			break;
-#endif
-		case GF_MP42TS_FILE:
-			assert(0); /*audio live input is restricted to realtime/streaming*/
-			break;
-		default:
-			assert(0);
-		}
-
-	if (!nb_sources) {
-		fprintf(stderr, "No program to mux, quitting.\n");
-	}
-
-	for (i=0; i<nb_sources; i++) {
-		if (!sourcesi.ID) {
-			for (j=i+1; j<nb_sources; j++) {
-				if (sourcesi.ID < sourcesj.ID) sourcesi.ID = sourcesi.ID+1;
-			}
-			if (!sourcesi.ID) sourcesi.ID = 1;
-		}
-	}
-
-	/****************************************/
-	/*   declare all streams to the muxer   */
-	/****************************************/
-	cur_pid = 100;	/*PIDs start from 100*/
-	for (i=0; i<nb_sources; i++) {
-		GF_M2TS_Mux_Program *program;
-
-		if (! sourcesi.is_not_program_declaration) {
-			u32 prog_pcr_offset = 0;
-			if (pcr_offset==(u32)-1) {
-				if (sourcesi.max_sample_size && mux_rate) {
-					Double r = sourcesi.max_sample_size * 8;
-					r *= 90000;
-					r/= mux_rate;
-					//add 10% of safety to cover TS signaling and other potential table update while sending the largest PES
-					r *= 1.1;
-					prog_pcr_offset = (u32) r;
-				}
-			} else {
-				prog_pcr_offset = pcr_offset;
-			}
-			fprintf(stderr, "Setting up program ID %d - send rates: PSI %d ms PCR %d ms - PCR offset %d\n", sourcesi.ID, psi_refresh_rate, pcr_ms, prog_pcr_offset);
-
-			program = gf_m2ts_mux_program_add(muxer, sourcesi.ID, cur_pid, psi_refresh_rate, prog_pcr_offset, sourcesi.mpeg4_signaling, sourcesi.pmt_version, sourcesi.set_disc);
-			if (sourcesi.mpeg4_signaling) program->iod = sourcesi.iod;
-			if (sourcesi.od_updates) {
-				program->loop_descriptors = sourcesi.od_updates;
-				sourcesi.od_updates = NULL;
-			}
-		} else {
-			program = gf_m2ts_mux_program_find(muxer, sourcesi.ID);
-		}
-		if (!program) continue;
-
-		for (j=0; j<sourcesi.nb_streams; j++) {
-			GF_M2TS_Mux_Stream *stream;
-			Bool force_pes_mode = 0;
-			/*likely an OD stream disabled*/
-			if (!sourcesi.streamsj.stream_type) continue;
-
-			if (sourcesi.streamsj.stream_type==GF_STREAM_SCENE) force_pes_mode = bifs_use_pes ? 1 : 0;
-
-			stream = gf_m2ts_program_stream_add(program, &sourcesi.streamsj, cur_pid+j+1, (sourcesi.pcr_idx==j) ? 1 : 0, force_pes_mode, GF_TRUE);
-			if (split_rap && (sourcesi.streamsj.stream_type==GF_STREAM_VISUAL)) stream->start_pes_at_rap = 1;
-		}
-
-		cur_pid += sourcesi.nb_streams;
-		while (cur_pid % 10)
-			cur_pid ++;
-
-		if (sourcesi.program_name0 || sourcesi.provider_name0 ) gf_m2ts_mux_program_set_name(program, sourcesi.program_name, sourcesi.provider_name);
-	}
-	muxer->flush_pes_at_rap = (split_rap == 2) ? GF_TRUE : GF_FALSE;
-
-	if (sdt_refresh_rate) {
-		gf_m2ts_mux_enable_sdt(muxer, sdt_refresh_rate);
-	}
-	gf_m2ts_mux_update_config(muxer, 1);
-
-	if (nb_pck_pack>1) {
-		ts_pack_buffer = gf_malloc(sizeof(char) * 188 * nb_pck_pack);
-	}
-
-	/*****************/
-	/*   main loop   */
-	/*****************/
-	last_print_time = gf_sys_clock();
-	while (run) {
-		u32 status;
-
-		/*check for some audio input from the network*/
-		if (audio_input_ip) {
-			u32 read;
-			switch (audio_input_type) {
-			case GF_MP42TS_UDP:
-			case GF_MP42TS_RTP:
-				/*e =*/
-				gf_sk_receive(audio_input_udp_sk, audio_input_buffer, audio_input_buffer_length, &read);
-				if (read) {
-					SampleCallBack((void*)&sourcesnb_sources-1, AUDIO_DATA_ESID, audio_input_buffer, read, gf_m2ts_get_sys_clock(muxer));
-				}
-				break;
-#ifndef GPAC_DISABLE_PLAYER
-			case GF_MP42TS_HTTP:
-				/*nothing to do: AAC_OnLiveData is called automatically*/
-				/*check we're still alive*/
-				if (gf_dm_is_thread_dead(aac_reader->dnload)) {
-					GF_ESD *esd;
-					aac_download_file(aac_reader, audio_input_ip);
-					esd = AAC_GetESD(aac_reader);
-					if (!esd)
-						break;
-					assert(esd->slConfig->timestampResolution); /*if we don't have this value we won't be able to adjust the timestamps within the MPEG2-TS*/
-					if (esd->slConfig->timestampResolution)
-						audio_discontinuity_offset = gf_m2ts_get_sys_clock(muxer) * (u64)esd->slConfig->timestampResolution / 1000;
-					gf_odf_desc_del((GF_Descriptor *)esd);
-				}
-				break;
-#endif
-			default:
-				assert(0);
-			}
-		}
-
-		/*flush all packets*/
-		nb_pck_in_pack=0;
-		while ((ts_pck = gf_m2ts_mux_process(muxer, &status, &usec_till_next)) != NULL) {
-
-			if (ts_pack_buffer) {
-				memcpy(ts_pack_buffer + 188 * nb_pck_in_pack, ts_pck, 188);
-				nb_pck_in_pack++;
-
-				if (nb_pck_in_pack < nb_pck_pack)
-					continue;
-
-				ts_pck = (const char *) ts_pack_buffer;
-			} else {
-				nb_pck_in_pack = 1;
-			}
-
-call_flush:
-			if (ts_output_file != NULL) {
-				gf_fwrite(ts_pck, 1, 188 * nb_pck_in_pack, ts_output_file);
-				if (segment_duration && (muxer->time.sec > prev_seg_time.sec + segment_duration)) {
-					prev_seg_time = muxer->time;
-					gf_fclose(ts_output_file);
-					segment_index++;
-					if (segment_dir) {
-						if (strchr("\\/", segment_namestrlen(segment_name)-1)) {
-							sprintf(segment_name, "%s%s_%d.ts", segment_dir, segment_prefix, segment_index);
-						} else {
-							sprintf(segment_name, "%s/%s_%d.ts", segment_dir, segment_prefix, segment_index);
-						}
-					} else {
-						sprintf(segment_name, "%s_%d.ts", segment_prefix, segment_index);
-					}
-					ts_output_file = gf_fopen(segment_name, "wb");
-					if (!ts_output_file) {
-						fprintf(stderr, "Error opening %s\n", segment_name);
-						goto exit;
-					}
-					/* delete the oldest segment */
-					if (segment_number && ((s32) (segment_index - segment_number - 1) >= 0)) {
-						char old_segment_nameGF_MAX_PATH;
-						if (segment_dir) {
-							if (strchr("\\/", segment_namestrlen(segment_name)-1)) {
-								sprintf(old_segment_name, "%s%s_%d.ts", segment_dir, segment_prefix, segment_index - segment_number - 1);
-							} else {
-								sprintf(old_segment_name, "%s/%s_%d.ts", segment_dir, segment_prefix, segment_index - segment_number - 1);
-							}
-						} else {
-							sprintf(old_segment_name, "%s_%d.ts", segment_prefix, segment_index - segment_number - 1);
-						}
-						gf_delete_file(old_segment_name);
-					}
-					write_manifest(segment_manifest, segment_dir, segment_duration, segment_prefix, segment_http_prefix,
-//								   (segment_index >= segment_number/2 ? segment_index - segment_number/2 : 0), segment_index >1 ? segment_index-1 : 0, 0);
-					               ( (segment_index > segment_number ) ? segment_index - segment_number : 0), segment_index >1 ? segment_index-1 : 0, 0);
-				}
-			}
-
-			if (ts_output_udp_sk != NULL) {
-				e = gf_sk_send(ts_output_udp_sk, (char*)ts_pck, 188 * nb_pck_in_pack);
-				if (e) {
-					fprintf(stderr, "Error %s sending UDP packet\n", gf_error_to_string(e));
-				}
-			}
-#ifndef GPAC_DISABLE_STREAMING
-			if (ts_output_rtp != NULL) {
-				u32 ts;
-				hdr.SequenceNumber++;
-				/*muxer clock at 90k*/
-				ts = muxer->time.sec*90000 + muxer->time.nanosec*9/100000;
-				/*FIXME - better discontinuity check*/
-				hdr.Marker = (ts < hdr.TimeStamp) ? 1 : 0;
-				hdr.TimeStamp = ts;
-				e = gf_rtp_send_packet(ts_output_rtp, &hdr, (char*)ts_pck, 188 * nb_pck_in_pack, 0);
-				if (e) {
-					fprintf(stderr, "Error %s sending RTP packet\n", gf_error_to_string(e));
-				}
-			}
-#endif
-
-			nb_pck_in_pack = 0;
-
-			if (status>=GF_M2TS_STATE_PADDING) {
-				break;
-			}
-		}
-		if (nb_pck_in_pack) {
-			ts_pck = (const char *) ts_pack_buffer;
-			goto call_flush;
-		}
-
-		/*push video*/
-		{
-			u32 now=gf_sys_clock();
-			if (now/MP42TS_VIDEO_FREQ != last_video_time/MP42TS_VIDEO_FREQ) {
-				/*should use carrousel behaviour instead of being pushed manually*/
-				if (video_buffer)
-					SampleCallBack((void*)&sourcesnb_sources-1, VIDEO_DATA_ESID, video_buffer, video_buffer_size, gf_m2ts_get_sys_clock(muxer)+1000/*try buffering due to VLC msg*/);
-				last_video_time = now;
-			}
-		}
-
-		if (real_time) {
-			/*refresh every MP42TS_PRINT_TIME_MS ms*/
-			u32 now=gf_sys_clock();
-			if (now > last_print_time + MP42TS_PRINT_TIME_MS) {
-				last_print_time = now;
-				fprintf(stderr, "M2TS: time % 6d - TS time % 6d - bitrate % 8d\r", gf_m2ts_get_sys_clock(muxer), gf_m2ts_get_ts_clock(muxer), muxer->average_birate_kbps);
-
-				if (gf_prompt_has_input()) {
-					char c = gf_prompt_get_char();
-					if (c=='q') break;
-					else if (c=='t') request_temi_toggle = GF_TRUE;
-				}
-			}
-			if (status == GF_M2TS_STATE_IDLE) {
-#if 0
-				/*wait till next packet is ready to be sent*/
-				if (usec_till_next>1000) {
-					//fprintf(stderr, "%d usec till next packet\n", usec_till_next);
-					gf_sleep(usec_till_next / 1000);
-				}
-#else
-				//we don't have enough precision on usec counting and we end up eating one core on most machines, so let's just sleep
-				//one second whenever we are idle - it's maybe too much but the muxer will catchup afterwards
-				gf_sleep(1);
-#endif
-			}
-		}
-
-
-		if (run_time) {
-			if (gf_m2ts_get_ts_clock(muxer) > run_time) {
-				fprintf(stderr, "Stopping multiplex at %d ms (requested runtime %d ms)\n", gf_m2ts_get_ts_clock(muxer), run_time);
-				break;
-			}
-		}
-		if (status==GF_M2TS_STATE_EOS) {
-			break;
-		}
-	}
-
-	{
-		u64 bits = muxer->tot_pck_sent*8*188;
-		u64 dur_ms = gf_m2ts_get_ts_clock(muxer);
-		if (!dur_ms) dur_ms = 1;
-		fprintf(stderr, "Done muxing - %.02f sec - %sbitrate %d kbps "LLD" packets written\n", ((Double) dur_ms)/1000.0,mux_rate ? "" : "average ", (u32) (bits/dur_ms), muxer->tot_pck_sent);
-		fprintf(stderr, " Padding: "LLD" packets (%g kbps) - "LLD" PES padded bytes (%g kbps)\n", muxer->tot_pad_sent, (Double) (muxer->tot_pad_sent*188*8.0/dur_ms) , muxer->tot_pes_pad_bytes, (Double) (muxer->tot_pes_pad_bytes*8.0/dur_ms) );
-	}
-
-exit:
-	if (ts_pack_buffer) gf_free(ts_pack_buffer);
-	run = 0;
-	if (segment_duration) {
-		write_manifest(segment_manifest, segment_dir, segment_duration, segment_prefix, segment_http_prefix, segment_index - segment_number, segment_index, 1);
-	}
-	if (ts_output_file && !is_stdout) gf_fclose(ts_output_file);
-	if (ts_output_udp_sk) gf_sk_del(ts_output_udp_sk);
-#ifndef GPAC_DISABLE_STREAMING
-	if (ts_output_rtp) gf_rtp_del(ts_output_rtp);
-#endif
-	if (ts_out) gf_free(ts_out);
-	if (audio_input_udp_sk) gf_sk_del(audio_input_udp_sk);
-	if (audio_input_buffer) gf_free (audio_input_buffer);
-	if (video_buffer) gf_free(video_buffer);
-	if (udp_out) gf_free(udp_out);
-#ifndef GPAC_DISABLE_STREAMING
-	if (rtp_out) gf_free(rtp_out);
-#endif
-	if (muxer) gf_m2ts_mux_del(muxer);
-
-	for (i=0; i<nb_sources; i++) {
-		for (j=0; j<sourcesi.nb_streams; j++) {
-			if (sourcesi.streamsj.input_ctrl) sourcesi.streamsj.input_ctrl(&sourcesi.streamsj, GF_ESI_INPUT_DESTROY, NULL);
-			if (sourcesi.streamsj.input_udta) {
-				gf_free(sourcesi.streamsj.input_udta);
-			}
-			if (sourcesi.streamsj.decoder_config) {
-				gf_free(sourcesi.streamsj.decoder_config);
-			}
-			if (sourcesi.streamsj.sl_config) {
-				gf_free(sourcesi.streamsj.sl_config);
-			}
-		}
-		if (sourcesi.iod) gf_odf_desc_del((GF_Descriptor*)sourcesi.iod);
-#ifndef GPAC_DISABLE_ISOM
-		if (sourcesi.mp4) gf_isom_close(sourcesi.mp4);
-#endif
-
-#ifndef GPAC_DISABLE_SENG
-		if (sourcesi.seng) {
-			gf_seng_terminate(sourcesi.seng);
-			sourcesi.seng = NULL;
-		}
-#endif
-		if (sourcesi.th) gf_th_del(sourcesi.th);
-	}
-
-#ifndef GPAC_DISABLE_PLAYER
-	if (aac_reader) AAC_Reader_del(aac_reader);
-#endif
-
-	gf_sys_close();
-
-#ifdef GPAC_MEMORY_TRACKING
-	if (mem_track && (gf_memory_size() || gf_file_handles_count() )) {
-	        gf_log_set_tool_level(GF_LOG_MEMORY, GF_LOG_INFO);
-		gf_memory_print();
-		return 2;
-	}
-#endif
-	return 0;
-}

gpac-2.2.1.tar.gz/applications/deprecated/mp42ts/mp42ts.vcxproj Deleted

@@ -1,265 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="14.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>{F728CC74-A7D0-43D2-8A28-05CE9F2EF0D0}</ProjectGuid>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </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" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
-  </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" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
-  </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" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
-  </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" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <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>
-    <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>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Midl>
-      <TypeLibraryName>.\obj\mp42ts_deb\mp42ts.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>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>
-      <PrecompiledHeaderOutputFile>
-      </PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
-      <BrowseInformation>true</BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TypeLibraryName>.\obj\mp42ts_deb\mp42ts.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeaderOutputFile>
-      </PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
-      <BrowseInformation>true</BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <MinimalRebuild>false</MinimalRebuild>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Midl>
-      <TypeLibraryName>.\obj\mp42ts_rel\mp42ts.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>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>
-      <PrecompiledHeaderOutputFile>.\obj\mp42ts_rel/$(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>
-      <AdditionalDependencies>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TypeLibraryName>.\obj\mp42ts_rel\mp42ts.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Full</Optimization>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>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>
-      <PrecompiledHeaderOutputFile>.\obj\mp42ts_rel/$(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>
-      <AdditionalDependencies>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\applications\mp42ts\main.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="libgpac_dll.vcxproj">
-      <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
-      <Private>true</Private>
-      <ReferenceOutputAssembly>true</ReferenceOutputAssembly>
-      <CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
-      <LinkLibraryDependencies>true</LinkLibraryDependencies>
-      <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file

gpac-2.2.1.tar.gz/applications/deprecated/mp4box_android Deleted

gpac-2.2.1.tar.gz/applications/deprecated/mp4box_android/.gitignore Deleted

gpac-2.2.1.tar.gz/applications/deprecated/mp4box_android/app Deleted

gpac-2.2.1.tar.gz/applications/deprecated/mp4box_android/app/build.gradle Deleted

gpac-2.2.1.tar.gz/applications/deprecated/mp4box_android/app/src Deleted

gpac-2.2.1.tar.gz/applications/deprecated/mp4box_android/app/src/main Deleted

gpac-2.2.1.tar.gz/applications/deprecated/mp4box_android/app/src/main/AndroidManifest.xml Deleted

gpac-2.2.1.tar.gz/applications/deprecated/mp4box_android/app/src/main/java Deleted

gpac-2.2.1.tar.gz/applications/deprecated/mp4box_android/app/src/main/java/com Deleted

gpac-2.2.1.tar.gz/applications/deprecated/mp4box_android/app/src/main/java/com/gpac Deleted

gpac-2.2.1.tar.gz/applications/deprecated/mp4box_android/app/src/main/java/com/gpac/mp4box Deleted

gpac-2.2.1.tar.gz/applications/deprecated/mp4box_android/app/src/main/java/com/gpac/mp4box/mp4box.java Deleted

@@ -1,210 +0,0 @@
-package com.gpac.mp4box;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.FileReader;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-
-import com.gpac.mp4box.R;
-
-import android.app.Activity;
-import android.graphics.Typeface;
-import android.os.Bundle;
-import android.os.Environment;
-import android.text.InputType;
-import android.text.method.ScrollingMovementMethod;
-import android.widget.Button;
-import android.widget.EditText;
-import android.util.Log;
-import android.view.View;
-
-import android.content.pm.PackageManager;
-import android.content.Context;
-import android.app.AlarmManager;
-import android.app.PendingIntent;
-import android.content.Intent;
-import android.widget.TextView;
-
-import java.io.OutputStreamWriter;
-import java.io.IOException;
-
-public class mp4box extends Activity {
-
-	private mp4terminal myTerminal;
-
-
-    private final static String LOG_LIB = "com.gpac.mp4box.loader";
-    private static Map<String, Throwable> errors = null;
-
-    synchronized static Map<String, Throwable> loadAllLibraries() {
-
-        final String toLoad = {"avutil", "swresample", "swscale", "avcodec", "avformat", "avfilter", "avdevice",
-                                "faad", "ft2", "png",
-                                "jpegdroid", "mad", "openjpeg",
-                                "z", "gpac", "mp4box"};
-
-        HashMap<String, Throwable> exceptions = new HashMap<String, Throwable>();
-
-        for (String s : toLoad) {
-            try {
-                Log.i(LOG_LIB, "Loading library " + s + "...");
-                System.loadLibrary(s);
-
-            } catch (UnsatisfiedLinkError e) {
-                exceptions.put(s, e);
-                Log.e(LOG_LIB, "Failed to load library : " + s + " due to link error " + e.getLocalizedMessage(), e);
-            } catch (SecurityException e) {
-                exceptions.put(s, e);
-                Log.e(LOG_LIB, "Failed to load library : " + s + " due to security error " + e.getLocalizedMessage(), e);
-            } catch (Throwable e) {
-                exceptions.put(s, e);
-                Log.e(LOG_LIB, "Failed to load library : " + s + " due to Runtime error " + e.getLocalizedMessage(), e);
-            }
-        }
-
-        errors = Collections.unmodifiableMap(exceptions);
-        return errors;
-    }
-
-
-    public void reloadUIStatus() {
-
-        final EditText cmdlineTxt = (EditText) findViewById(R.id.CommandLineEdit);
-        ArrayList<String> cmdlineFile = readFromFile("mp4box.cmdline.txt");
-        if (cmdlineFile.size()>0) {
-            cmdlineTxt.setText(cmdlineFile.get(0));
-        }
-
-
-        final TextView stdoutTxt = (TextView) findViewById(R.id.stdoutView);
-        ArrayList<String> stdoutFile = readFromFile("mp4box.stderrout.txt");
-        if (stdoutFile.size()>0) {
-            stdoutTxt.setText("");
-            for (String line: stdoutFile) {
-                stdoutTxt.append(line + "\n");
-            }
-        }
-        stdoutTxt.setMovementMethod(new ScrollingMovementMethod());
-
-    }
-
-    /** Called when the activity is first created. */
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        System.out.println( "hello world java" );
-
-        setContentView(R.layout.main);
-
-        reloadUIStatus();
-
-        myTerminal = new mp4terminal();
-        errors = loadAllLibraries();
-
-        final Button button = (Button) findViewById(R.id.OkButton);
-        button.setOnClickListener(new View.OnClickListener() {
-            public void onClick(View v) {
-
-            	EditText oCommandLine = (EditText) findViewById(R.id.CommandLineEdit );
-            	CharSequence sCommandLine = oCommandLine.getText();
-                writeToFile(sCommandLine.toString(), "mp4box.cmdline.txt");
-
-            	myTerminal.run( sCommandLine.toString() );
-
-
-                doRestart(getApplicationContext());
-            }
-        });
-
-    }
-
-    private void writeToFile(String string, String filename) {
-        try {
-
-            File file = new File(Environment.getExternalStorageDirectory(), filename);
-            if (!file.exists())
-                file.createNewFile();
-
-            FileOutputStream fos;
-            byte data = string.getBytes();
-            fos = new FileOutputStream(file);
-            fos.write(data);
-            fos.flush();
-            fos.close();
-
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-
-    }
-
-    private ArrayList<String> readFromFile(String filename) {
-
-        ArrayList<String> lines = new ArrayList<>();
-
-        try {
-
-            File file = new File(Environment.getExternalStorageDirectory(), filename);
-            BufferedReader br = new BufferedReader(new FileReader(file));
-
-            String line;
-            while ((line = br.readLine()) != null) {
-                lines.add(line);
-            }
-            br.close();
-        }
-
-        catch (Exception e) {
-            Log.d(LOG_LIB, "While opening " + filename + " got: " + e.toString());
-        }
-
-        return lines;
-    }
-
-
-
-    public static void doRestart(Context c) {
-        try {
-            //check if the context is given
-            if (c != null) {
-                //fetch the packagemanager so we can get the default launch activity
-                // (you can replace this intent with any other activity if you want
-                PackageManager pm = c.getPackageManager();
-                //check if we got the PackageManager
-                if (pm != null) {
-                    //create the intent with the default start activity for your application
-                    Intent mStartActivity = pm.getLaunchIntentForPackage(
-                            c.getPackageName()
-                    );
-                    if (mStartActivity != null) {
-                        mStartActivity.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
-                        //create a pending intent so the application is restarted after System.exit(0) was called.
-                        // We use an AlarmManager to call this intent in 100ms
-                        int mPendingIntentId = 223344;
-                        PendingIntent mPendingIntent = PendingIntent
-                                .getActivity(c, mPendingIntentId, mStartActivity,
-                                        PendingIntent.FLAG_CANCEL_CURRENT);
-                        AlarmManager mgr = (AlarmManager) c.getSystemService(Context.ALARM_SERVICE);
-                        mgr.set(AlarmManager.RTC, System.currentTimeMillis() + 100, mPendingIntent);
-                        //kill the application
-                        System.exit(0);
-                    } else {
-                        Log.e(LOG_LIB, "Was not able to restart application, mStartActivity null");
-                    }
-                } else {
-                    Log.e(LOG_LIB, "Was not able to restart application, PM null");
-                }
-            } else {
-                Log.e(LOG_LIB, "Was not able to restart application, Context null");
-            }
-        } catch (Exception ex) {
-            Log.e(LOG_LIB, "Was not able to restart application");
-        }
-    }
-
-}
\ No newline at end of file

gpac-2.2.1.tar.gz/applications/deprecated/mp4box_android/app/src/main/java/com/gpac/mp4box/mp4terminal.java Deleted

gpac-2.2.1.tar.gz/applications/deprecated/mp4box_android/app/src/main/jni Deleted

gpac-2.2.1.tar.gz/applications/deprecated/mp4box_android/app/src/main/jni/wrapper.c Deleted

@@ -1,101 +0,0 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <android/log.h>
-#include <jni.h>
-#include "stdlib.h"
-#include "stdio.h"
-#include "string.h"
-
-
-#define jniTAG "WRAPPER_JNI"
-
-#define jniLOGV(X...)  __android_log_print(ANDROID_LOG_VERBOSE, jniTAG, X)
-#define jniLOGI(X)  __android_log_print(ANDROID_LOG_INFO, jniTAG, X)
-#define jniLOGE(X)  __android_log_print(ANDROID_LOG_ERROR, jniTAG, X)
-
-/*#define CAST_HANDLE(wr) jclass c = env->GetObjectClass(obj);\
-                        if (!c) return;\
-                        jfieldID fid = env->GetFieldID(c, "handle", "J");\
-                        if (!fid){\
-                          __android_log_print(ANDROID_LOG_ERROR, jniTAG, "No Field ID, ERROR");\
-                          return;\
-                        }\
-                        jlong h = env->GetLongField(obj, fid);
-                        //CNativeWrapper* wr = (CNativeWrapper*) h;*/
-
-char ** ConvertCommandLine( const char* sCommand, int* iNbArg );
-int mp4boxMain(int argc, char **argv);
-
-JNIEXPORT void JNICALL Java_com_gpac_mp4box_mp4terminal_run(JNIEnv * env, jobject obj, jstring sCommand)
-{
-	//CAST_HANDLE(wr);
-	jniLOGV("mp4terminal::start");
-	/*if (!wr)
-	{
-		jniLOGV("mp4terminal::end : aborted");
-	    return;
-	}*/
-	jboolean isCopy;
-	const char * sOriginalCommand = (*env)->GetStringUTFChars(env, sCommand, &isCopy);
-
-	jniLOGV("mp4terminal::command get back ok");
-	jniLOGV("%s\n", sOriginalCommand);
-
-	int i = 0;
-	char** sConvertedCommandLine;
-	sConvertedCommandLine = ConvertCommandLine( sOriginalCommand, &i );
-	jniLOGV("Convert command line done");
-
-	FILE* ferr = freopen( "/mnt/sdcard/mp4box.stderrout.txt", "w", stderr );
-	FILE* fout = freopen( "/mnt/sdcard/mp4box.stderrout.txt", "w", stdout );
-
-	mp4boxMain(i, sConvertedCommandLine);
-
-	(*env)->ReleaseStringUTFChars(env, sCommand, sOriginalCommand);
-	jniLOGV("mp4terminal::end");
-	fclose(ferr);
-	fclose(fout);
-}
-
-char ** ConvertCommandLine( const char* sCommand, int* iNbArg )
-{
-	int iLength = strlen( sCommand );
-	int iArgNumber = 1;
-	int i = 0;
-	char** pReturn;
-	int iPreviousPos = 0;
-	int k = 1;//begin at character position 1 as the 0 position will be held by the process name , i.e. mp4box
-	int l = 0;
-
-	for ( i = 0; i < iLength ; i++ )
-	{
-		if( sCommandi == ' '  )
-		{
-			iArgNumber++;
-		}
-	}
-	iArgNumber++; // last argument will not be detected as it is not followed by a space character
-	pReturn = (char**)malloc(sizeof(char*)*iArgNumber);
-	pReturn0 = (char*)malloc(sizeof( char) * ( 7 ));
-	strcpy( pReturn0, "MP4Box" );//just a place holder , will never be read.
-	pReturn06 = '\0';
-
-	for ( l = 0; l <= iLength ; l++ )
-	{
-		if( sCommandl ==  ' ' ||  l == ( iLength ) )
-		{
-			pReturnk = (char*)malloc(sizeof( char) * ( l - iPreviousPos + 1));
-			strncpy( pReturnk, sCommand + iPreviousPos, l - iPreviousPos );
-			pReturnkl-iPreviousPos = '\0';
-			iPreviousPos = l + 1;
-			k++;
-		}
-	}
-	*iNbArg = iArgNumber;
-	return pReturn;
-}
-#ifdef __cplusplus
-}
-#endif

gpac-2.2.1.tar.gz/applications/deprecated/mp4box_android/app/src/main/res Deleted

gpac-2.2.1.tar.gz/applications/deprecated/mp4box_android/app/src/main/res/drawable-hdpi Deleted

gpac-2.2.1.tar.gz/applications/deprecated/mp4box_android/app/src/main/res/drawable-hdpi/icon.png Deleted

gpac-2.2.1.tar.gz/applications/deprecated/mp4box_android/app/src/main/res/drawable-ldpi Deleted

gpac-2.2.1.tar.gz/applications/deprecated/mp4box_android/app/src/main/res/drawable-ldpi/icon.png Deleted

gpac-2.2.1.tar.gz/applications/deprecated/mp4box_android/app/src/main/res/drawable-mdpi Deleted

gpac-2.2.1.tar.gz/applications/deprecated/mp4box_android/app/src/main/res/drawable-mdpi/icon.png Deleted

gpac-2.2.1.tar.gz/applications/deprecated/mp4box_android/app/src/main/res/layout Deleted

gpac-2.2.1.tar.gz/applications/deprecated/mp4box_android/app/src/main/res/layout/main.xml Deleted

@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:orientation="vertical"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    >
-
-    <TextView android:layout_height="wrap_content" android:layout_width="wrap_content" android:id="@+id/textView1" android:text="@string/CommandLineTitle"></TextView>
-
-    <LinearLayout
-        android:orientation="horizontal"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-
-        <EditText android:layout_height="wrap_content" android:text="-version" android:layout_width="292dp" android:id="@+id/CommandLineEdit"
-            android:layout_weight="1"></EditText>
-
-        <Button android:layout_height="wrap_content" android:id="@+id/OkButton" android:layout_width="wrap_content" android:text="@string/OkButton"
-            android:layout_weight="1"></Button>
-
-    </LinearLayout>
-
-    <TextView
-        android:text="output"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:id="@+id/stdoutView"
-        android:scrollbars = "vertical"
-        android:fontFamily="monospace"
-        android:typeface="monospace"
-        android:textSize="8sp" />
-
-</LinearLayout>

gpac-2.2.1.tar.gz/applications/deprecated/mp4box_android/app/src/main/res/values Deleted

gpac-2.2.1.tar.gz/applications/deprecated/mp4box_android/app/src/main/res/values/strings.xml Deleted

gpac-2.2.1.tar.gz/applications/deprecated/mp4box_android/build.gradle Deleted

gpac-2.2.1.tar.gz/applications/deprecated/mp4box_android/gradle Deleted

gpac-2.2.1.tar.gz/applications/deprecated/mp4box_android/gradle/wrapper Deleted

gpac-2.2.1.tar.gz/applications/deprecated/mp4box_android/gradle/wrapper/gradle-wrapper.jar Deleted

gpac-2.2.1.tar.gz/applications/deprecated/mp4box_android/gradle/wrapper/gradle-wrapper.properties Deleted

gpac-2.2.1.tar.gz/applications/deprecated/mp4box_android/gradlew Deleted

@@ -1,160 +0,0 @@
-#!/usr/bin/env bash
-
-##############################################################################
-##
-##  Gradle start up script for UN*X
-##
-##############################################################################
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
-
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
-
-# Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
-
-warn ( ) {
-    echo "$*"
-}
-
-die ( ) {
-    echo
-    echo "$*"
-    echo
-    exit 1
-}
-
-# OS specific support (must be 'true' or 'false').
-cygwin=false
-msys=false
-darwin=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-esac
-
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while  -h "$PRG"  ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> $.*$$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
-
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
-
-# Determine the Java command to use to start the JVM.
-if  -n "$JAVA_HOME"  ; then
-    if  -x "$JAVA_HOME/jre/sh/java"  ; then
-        # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
-    else
-        JAVACMD="$JAVA_HOME/bin/java"
-    fi
-    if  ! -x "$JAVACMD"  ; then
-        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-    fi
-else
-    JAVACMD="java"
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-fi
-
-# Increase the maximum file descriptors if we can.
-if  "$cygwin" = "false" -a "$darwin" = "false"  ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if  $? -eq 0  ; then
-        if  "$MAX_FD" = "maximum" -o "$MAX_FD" = "max"  ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if  $? -ne 0  ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
-fi
-
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if  "$GRADLE_CYGPATTERN" != ""  ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if  $CHECK -ne 0  &&  $CHECK2 -eq 0  ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
-        fi
-        i=$((i+1))
-    done
-    case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
-    esac
-fi
-
-# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
-function splitJvmOpts() {
-    JVM_OPTS=("$@")
-}
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
-JVM_OPTS${#JVM_OPTS*}="-Dorg.gradle.appname=$APP_BASE_NAME"
-
-exec "$JAVACMD" "${JVM_OPTS@}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"

gpac-2.2.1.tar.gz/applications/deprecated/mp4box_android/gradlew.bat Deleted

@@ -1,90 +0,0 @@
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem  Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto init
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:init
-@rem Get command-line arguments, handling Windowz variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-if "%@eval2+2" == "4" goto 4NT_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-goto execute
-
-:4NT_args
-@rem Get arguments from the 4NT Shell from JP Software
-set CMD_LINE_ARGS=%$
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega

gpac-2.2.1.tar.gz/applications/deprecated/mp4box_android/settings.gradle Deleted

gpac-2.2.1.tar.gz/applications/deprecated/mp4client Deleted

gpac-2.2.1.tar.gz/applications/deprecated/mp4client/Makefile Deleted

@@ -1,88 +0,0 @@
-include ../../config.mak
-
-vpath %.c $(SRC_PATH)/applications/mp4client
-
-CFLAGS=-I"$(SRC_PATH)/include" $(OPTFLAGS)
-
-LINKFLAGS=$(GPAC_SH_FLAGS)
-
-ifeq ($(DEBUGBUILD),yes)
-CFLAGS+=-g
-LDFLAGS+=-g
-endif
-
-ifeq ($(GPROFBUILD),yes)
-CFLAGS+=-pg
-LDFLAGS+=-pg
-endif
-
-ifeq ($(GPACREADONLY),yes)
-CFLAGS+=-DGPAC_READ_ONLY
-endif
-
-ifeq ($(CONFIG_WIN32),yes)
-LINKFLAGS+=$(UNICODEFLAGS)
-EXE=.exe
-PROG=MP4Client$(EXE)
-
-ifeq ($(HAS_WMAIN),no)
-CFLAGS+=-DNO_WMAIN
-endif
-
-else
-EXT=
-PROG=MP4Client
-endif
-
-ifeq ($(STATICBUILD),yes)
-##include static modules and other deps for libgpac
-include ../../static.mak
-LINKFLAGS+=$(shell pkg-config ../../gpac.pc --libs --static | sed 's/-lgpac //'  )
-LINKFLAGS+=$(GPAC_SH_FLAGS) $(EXTRALIBS)
-else
-LINKFLAGS+=-lgpac
-ifeq ($(CONFIG_DARWIN),yes)
-#LINKFLAGS+= -Wl,-rpath,'@loader_path'
-else
-LINKFLAGS+= -Wl,-rpath,'$$ORIGIN' -Wl,-rpath-link,../../bin/gcc
-endif
-endif
-
-#common obj
-OBJS= main.o
-ifeq ($(CONFIG_DARWIN),yes)
-OBJS+= carbon_events.o
-LDFLAGS += -framework Carbon
-endif
-
-
-SRCS := $(OBJS:.o=.c)
-
-ifeq ($(CONFIG_WIN32),yes)
-OBJS+=$(SRC_PATH)/manifest.o
-endif
-
-all: $(PROG)
-
-MP4Client$(EXE): $(OBJS)
-	$(CC) -o ../../bin/gcc/$@ $(OBJS) -L../../bin/gcc $(LINKFLAGS) $(LDFLAGS)
-
-clean:
-	rm -f $(OBJS) ../../bin/gcc/$(PROG)
-
-install: clean
-	install -m 755 $(INSTFLAGS) ../../bin/gcc/MP4Client "$(DESTDIR)$(prefix)/bin"
-
-uninstall:
-	rm -rf $(DESTDIR)$(prefix)/bin/MP4Client
-
-dep: depend
-
-depend:
-	rm -f .depend
-	$(CC) -MM $(CFLAGS) $(SRCS) 1>.depend
-
-distclean: clean
-	rm -f Makefile.bak .depend
-
--include .depend

gpac-2.2.1.tar.gz/applications/deprecated/mp4client/carbon_events.c Deleted

@@ -1,109 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2005-2012
- *					All rights reserved
- *
- *  This file is part of GPAC / command-line client
- *
- *  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.
- *
- */
-
-#if defined(__DARWIN__) || defined(__APPLE__)
-#include <Carbon/Carbon.h>
-#endif
-
-
-int gf_sys_set_args(int argc, const char **argv);
-void send_open_url(const char *url);
-
-void RunApplicationEventLoop(void);
-void QuitApplicationEventLoop(void);
-
-char *my_argv2;
-
-static int main_evt_loop_run = 1;
-
-static AEEventHandlerUPP	open_app_UPP, open_doc_UPP;
-
-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);
-}
-
-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 path4096;
-			FSRefMakePath(&ref, (UInt8 *) path, 4096);
-			if (main_evt_loop_run) {
-				my_argv1 = strdup(path);
-				gf_sys_set_args(2, (const char **) my_argv);
-			} else {
-				send_open_url(path);
-			}
-		}
-	}
-	AEDisposeDesc(&docList);
-
-	if (main_evt_loop_run) {
-		QuitApplicationEventLoop();
-		main_evt_loop_run = 0;
-	}
-	return (noErr);
-}
-
-void carbon_init ()
-{
-	my_argv0 = "GPAC";
-	my_argv1 = 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();
-}
-
-void carbon_uninit()
-{
-
-	DisposeAEEventHandlerUPP(open_app_UPP);
-	DisposeAEEventHandlerUPP(open_doc_UPP);
-
-	if (my_argv1) free(my_argv1);
-}
-
-

gpac-2.2.1.tar.gz/applications/deprecated/mp4client/main.c Deleted

@@ -1,2752 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2005-2022
- *					All rights reserved
- *
- *  This file is part of GPAC / command-line client
- *
- *  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.
- *
- */
-
-
-/*includes both terminal and od browser*/
-#include <gpac/terminal.h>
-#include <gpac/term_info.h>
-#include <gpac/constants.h>
-#include <gpac/events.h>
-#include <gpac/media_tools.h>
-#include <gpac/options.h>
-#include <gpac/main.h>
-
-#include <gpac/avparse.h>
-#include <gpac/network.h>
-#include <gpac/utf.h>
-
-/*ISO 639 languages*/
-#include <gpac/iso639.h>
-
-
-#ifndef WIN32
-#include <dlfcn.h>
-#include <pwd.h>
-#include <unistd.h>
-#if defined(__DARWIN__) || defined(__APPLE__)
-#include <sys/types.h>
-#include <sys/stat.h>
-
-void carbon_init();
-void carbon_uninit();
-
-#endif
-
-#else
-#include <windows.h> /*for GetModuleFileName*/
-#endif	//WIN32
-
-/*local prototypes*/
-static void PrintWorldInfo(GF_Terminal *term);
-static void ViewOD(GF_Terminal *term, u32 OD_ID, u32 number, const char *URL);
-static void PrintODList(GF_Terminal *term, GF_ObjectManager *root_odm, u32 num, u32 indent, char *root_name);
-
-static void ViewODs(GF_Terminal *term, Bool show_timing);
-static void MakeScreenshot(Bool for_coverage);
-static void PrintAVInfo(Bool final);
-
-static u32 gui_mode = 0;
-static int ret_val = 0;
-
-static Bool restart = GF_FALSE;
-static Bool reload = GF_FALSE;
-Bool do_coverage = GF_FALSE;
-
-Bool no_prog = 0;
-
-static FILE *helpout = NULL;
-u32 help_flags = 0;
-
-#if defined(__DARWIN__) || defined(__APPLE__)
-#define VK_MOD  GF_KEY_MOD_ALT
-#else
-#define VK_MOD  GF_KEY_MOD_CTRL
-#endif
-
-static Bool no_audio = GF_FALSE;
-static u32 bench_mode = 0;
-static u32 bench_mode_start = 0;
-static u32 bench_buffer = 0;
-static Bool eos_seen = GF_FALSE;
-static Bool addon_visible = GF_TRUE;
-Bool is_connected = GF_FALSE;
-Bool startup_file = GF_FALSE;
-GF_User user;
-GF_Terminal *term;
-u64 Duration;
-GF_Err last_error = GF_OK;
-static Bool enable_add_ons = GF_TRUE;
-static Fixed playback_speed = FIX_ONE;
-
-static s32 request_next_playlist_item = GF_FALSE;
-FILE *playlist = NULL;
-static Bool readonly_playlist = GF_FALSE;
-
-static u32 display_rti = 0;
-static Bool Run;
-static Bool CanSeek = GF_FALSE;
-static char the_urlGF_MAX_PATH;
-static char pl_pathGF_MAX_PATH;
-static Bool no_mime_check = GF_TRUE;
-static u64 log_rti_time_start = 0;
-static Bool loop_at_end = GF_FALSE;
-static u32 forced_width=0;
-static u32 forced_height=0;
-
-/*windowless options*/
-u32 align_mode = 0;
-u32 init_w = 0;
-u32 init_h = 0;
-u32 last_x, last_y;
-Bool right_down = GF_FALSE;
-
-Float scale = 1;
-
-static Bool shell_visible = GF_TRUE;
-#if defined(WIN32) && !defined(_WIN32_WCE)
-
-static HWND console_hwnd = NULL;
-static Bool owns_wnd = GF_FALSE;
-#include <tlhelp32.h>
-#include <Psapi.h>
-static DWORD getParentPID(DWORD pid)
-{
-	DWORD ppid = 0;
-	HANDLE h = CreateToolhelp32Snapshot(TH32CS_SNAPPROCESS, 0);
-	if (h) {
-		PROCESSENTRY32 pe = { 0 };
-		pe.dwSize = sizeof(PROCESSENTRY32);
-		if (Process32First(h, &pe)) {
-			do {
-				if (pe.th32ProcessID == pid) {
-					ppid = pe.th32ParentProcessID;
-					break;
-				}
-			} while (Process32Next(h, &pe));
-		}
-		CloseHandle(h);
-	}
-	return (ppid);
-}
-
-static void getProcessName(DWORD pid, PUCHAR fname, DWORD sz)
-{
-	HANDLE h = OpenProcess(PROCESS_QUERY_INFORMATION | PROCESS_VM_READ, FALSE, pid);
-	if (h) {
-		GetModuleFileNameEx(h, NULL, fname, sz);
-		CloseHandle(h);
-	}
-}
-static void w32_hide_shell(u32 cmd_type)
-{
-	typedef HWND (WINAPI *GetConsoleWindowT)(void);
-	HMODULE hk32 = GetModuleHandle("kernel32.dll");
-	if (!console_hwnd) {
-		char parentNameGF_MAX_PATH;
-		DWORD dwProcessId = 0;
-		DWORD dwParentProcessId = 0;
-		DWORD dwParentParentProcessId = 0;
-		GetConsoleWindowT GetConsoleWindow = (GetConsoleWindowT)GetProcAddress(hk32, "GetConsoleWindow");
-		console_hwnd = GetConsoleWindow();
-		dwProcessId = GetCurrentProcessId();
-		dwParentProcessId = getParentPID(dwProcessId);
-		if (dwParentProcessId)
-				dwParentParentProcessId = getParentPID(dwParentProcessId);
-		//get parent process name, check for explorer
-		parentName0 = 0;
-		getProcessName(dwParentProcessId, parentName, GF_MAX_PATH);
-		if (strstr(parentName, "explorer")) {
-			owns_wnd = GF_TRUE;
-		}
-		//get parent parent process name, check for devenv (or any other ide name ...)
-		else if (dwParentParentProcessId) {
-			owns_wnd = GF_FALSE;
-			parentName0 = 0;
-			getProcessName(dwParentParentProcessId, parentName, GF_MAX_PATH);
-			if (strstr(parentName, "devenv")) {
-				owns_wnd = GF_TRUE;
-			}
-		} else {
-			owns_wnd = GF_FALSE;
-		}
-	}
-	if (!owns_wnd || !console_hwnd) return;
-
-	if (cmd_type==0) {
-		ShowWindow(console_hwnd, SW_SHOW);
-		shell_visible = GF_TRUE;
-	}
-	else if (cmd_type==1) {
-		ShowWindow(console_hwnd, SW_HIDE);
-		shell_visible = GF_FALSE;
-	}
-	else if (cmd_type == 2) {
-		PostMessage(GetConsoleWindow(), WM_CLOSE, 0, 0);
-	}
-}
-
-#define hide_shell w32_hide_shell
-#else
-
-#define hide_shell(_var)
-
-#endif
-
-
-void send_open_url(const char *url)
-{
-	GF_Event evt;
-	memset(&evt, 0, sizeof(GF_Event));
-	evt.type = GF_EVENT_NAVIGATE;
-	evt.navigate.to_url = url;
-	gf_term_send_event(term, &evt);
-}
-
-GF_GPACArg mp4client_args =
-{
-#ifdef GPAC_MEMORY_TRACKING
- 	GF_DEF_ARG("mem-track", NULL, "enable memory tracker", NULL, NULL, GF_ARG_BOOL, GF_ARG_HINT_EXPERT),
- 	GF_DEF_ARG("mem-track-stack", NULL, "enable memory tracker with stack dumping", NULL, NULL, GF_ARG_BOOL, GF_ARG_HINT_EXPERT),
-#endif
-	 GF_DEF_ARG("rti", NULL, "log run-time info (FPS, CPU, Mem usage) to given file", NULL, NULL, GF_ARG_STRING, GF_ARG_HINT_EXPERT),
-	 GF_DEF_ARG("rtix", NULL, "same as -rti but driven by GPAC logs", NULL, NULL, GF_ARG_STRING, GF_ARG_HINT_EXPERT),
-	 GF_DEF_ARG("size", NULL, "specify visual size WxH. If not set, scene size or video size is used", NULL, NULL, GF_ARG_STRING, GF_ARG_HINT_ADVANCED),
-	 GF_DEF_ARG("rti-refresh", NULL, "set refresh time in ms between two runt-time counters queries (default is 200)", NULL, NULL, GF_ARG_INT, 0),
-
- 	GF_DEF_ARG("no-thread", NULL, "disable thread usage (except for depending on driver audio)", NULL, NULL, GF_ARG_BOOL, GF_ARG_HINT_EXPERT),
- 	GF_DEF_ARG("no-audio", NULL, "disable audio", NULL, NULL, GF_ARG_BOOL, GF_ARG_HINT_ADVANCED),
-
-#ifdef GPAC_CONFIG_WIN32
- 	GF_DEF_ARG("no-wnd", NULL, "use windowless mode (Win32 only)", NULL, NULL, GF_ARG_BOOL, GF_ARG_HINT_EXPERIMENTAL),
- 	GF_DEF_ARG("no-back", NULL, "use transparent background for output window when no background is specified (Win32 only)", NULL, NULL, GF_ARG_BOOL, GF_ARG_HINT_EXPERIMENTAL),
- 	GF_DEF_ARG("align", NULL, "specify v and h alignment for windowless mode\n"
- 	"- tl: top/left\n"
- 	"- tm: top/horizontal middle\n"
- 	"- tr: top/right\n"
- 	"- ml: vertical middle/left\n"
- 	"- mm: vertical middle/horizontal middle\n"
- 	"- mr: vertical middle/right\n"
- 	"- bl: bottom/left\n"
- 	"- bm: bottom/horizontal middle\n"
- 	"- br: bottom/right", "tl", "tl|tm|tr|ml|mm|mr|bl|bm|br", GF_ARG_INT, GF_ARG_HINT_EXPERIMENTAL),
-#endif // GPAC_CONFIG_WIN32
-
- 	GF_DEF_ARG("pause", NULL, "pause at first frame", NULL, NULL, GF_ARG_BOOL, GF_ARG_HINT_ADVANCED),
-	GF_DEF_ARG("play-from", NULL, "start playback from given time in seconds in media", NULL, NULL, GF_ARG_DOUBLE, 0),
-	GF_DEF_ARG("speed", NULL, "start playback wit given speed", NULL, NULL, GF_ARG_DOUBLE, 0),
-	GF_DEF_ARG("loop", NULL, "loop playback", NULL, NULL, GF_ARG_BOOL, 0),
-	GF_DEF_ARG("fs", NULL, "start in fullscreen mode", NULL, NULL, GF_ARG_BOOL, 0),
-	GF_DEF_ARG("exit", NULL, "exit when presentation is over", NULL, NULL, GF_ARG_BOOL, GF_ARG_HINT_ADVANCED),
-	GF_DEF_ARG("run-for", NULL, "run for indicated time in seconds and exits", NULL, NULL, GF_ARG_BOOL, GF_ARG_HINT_ADVANCED),
-	GF_DEF_ARG("service", NULL, "auto-tune to given service ID in a multiplex", NULL, NULL, GF_ARG_INT, GF_ARG_HINT_ADVANCED),
-	GF_DEF_ARG("no-save", NULL, "do not save configuration file on exit", NULL, NULL, GF_ARG_BOOL, GF_ARG_HINT_EXPERT),
-	GF_DEF_ARG("no-addon", NULL, "disable automatic loading of media addons declared in source URL", NULL, NULL, GF_ARG_BOOL, GF_ARG_HINT_EXPERT),
-	GF_DEF_ARG("gui", NULL, "start in GUI mode. The GUI is indicated in the configuration(core_config) file __GeneralStartupFile__", NULL, NULL, GF_ARG_BOOL, 0),
-	GF_DEF_ARG("p", NULL, "use indicated profile for the global GPAC config. If not found, config file is created. If a file path is indicated, this will load profile from that file. Otherwise, this will create a directory of the specified name and store new config there. Reserved name `0` means a new profile, not stored to disk. Works using -p=NAME or -p NAME", NULL, NULL, GF_ARG_STRING, GF_ARG_HINT_ADVANCED),
-	GF_DEF_ARG("stats", NULL, "dump filter session stats after playback", NULL, NULL, GF_ARG_BOOL, GF_ARG_HINT_EXPERT),
-	GF_DEF_ARG("graph", NULL, "dump filter session graph after playback", NULL, NULL, GF_ARG_BOOL, GF_ARG_HINT_EXPERT),
-	GF_DEF_ARG("nk", NULL, "disable keyboard interaction", NULL, NULL, GF_ARG_BOOL, GF_ARG_HINT_ADVANCED),
-	GF_DEF_ARG("h", "help", "show this help. Use `-hx` to show expert help", NULL, NULL, GF_ARG_BOOL, 0),
-	GF_DEF_ARG("hc", NULL, "show libgpac core options", NULL, NULL, GF_ARG_BOOL, 0),
-	GF_DEF_ARG("hr", NULL, "show runtime options when keyboard interaction is enabled", NULL, NULL, GF_ARG_BOOL, 0),
-	{0}
-};
-
-
-void PrintUsage(Bool show_all)
-{
-	u32 i=0;
-
-	if (help_flags & GF_PRINTARG_MAN) {
-		fprintf(helpout, ".SH \"DESCRIPTION\"\n.LP\nMP4Client is GPAC command-line media player. It supports all GPAC playback features (2D and 3D support, local playback, RTP streaming, HTTP faststart, many audio and video codecs ...).\n.br\nSpecific URLs shortcuts are available, see gpac -h compositor\n.\n.\n.SH OPTIONS\n");
-	} else {
-		gf_sys_format_help(helpout, help_flags, "Usage: MP4Client options filename\n"
-			"# General\n"
-			"The player accepts any URL supported by GPAC.\n"
-			"Specific URLs shortcuts are available, see GPAC Compositor (gpac -h compositor)(compositor)\n"
-			"\n"
-			"Warning: MP4Client is being deprecated, use `gpac -play URL`, `gpac -gui URL` or `gpac -mp4c URL`.\n"
-			"\n"
-			"Version: %s\n"
-			"%s\n"
-			"For more info on GPAC configuration, use `gpac ` -h(GPAC) `bin`  \n  \n"
-			"# Options  \n  \n",
-			(help_flags == GF_PRINTARG_MD) ? GPAC_VERSION : gf_gpac_version(),
-			gf_gpac_copyright_cite()
-		);
-	}
-
-	while (mp4client_argsi.name) {
-		GF_GPACArg *arg = &mp4client_argsi;
-		i++;
-		if (!show_all && (arg->flags & (GF_ARG_HINT_EXPERIMENTAL|GF_ARG_HINT_EXPERT) ))
-			continue;
-		gf_sys_print_arg(helpout, help_flags, arg, "mp4client");
-	}
-}
-
-typedef enum
-{
-	MP4C_QUIT = 0,
-	MP4C_KILL,
-	MP4C_RELOAD,
-	MP4C_OPEN,
-	MP4C_OPEN_PL,
-	MP4C_PL_NEXT,
-	MP4C_PL_JUMP,
-	MP4C_DISCONNECT,
-	MP4C_SELECT,
-	MP4C_PAUSE_RESUME,
-	MP4C_STEP,
-	MP4C_SEEK,
-	MP4C_SEEK_TIME,
-	MP4C_TIME,
-	MP4C_UPDATE,
-	MP4C_EVALJS,
-	MP4C_SCREENSHOT,
-	MP4C_WORLDINFO,
-	MP4C_ODLIST,
-	MP4C_ODINFO_ID,
-	MP4C_ODINFO_NUM,
-	MP4C_ODTIME,
-	MP4C_ODBUF,
-	MP4C_DUMPSCENE,
-	MP4C_STRESSMODE,
-	MP4C_NAVMODE,
-	MP4C_LASTVP,
-	MP4C_OGL2D,
-	MP4C_AR_4_3,
-	MP4C_AR_16_9,
-	MP4C_AR_NONE,
-	MP4C_AR_ORIG,
-	MP4C_LOGS,
-	MP4C_RELOAD_OPTS,
-	MP4C_DISP_RTI,
-	MP4C_DISP_FPS,
-	MP4C_DISP_STATS,
-	MP4C_DISP_GRAPH,
-	MP4C_HELP,
-	MP4C_DOWNRATE,
-	MP4C_VMEM_CACHE,
-
-} MP4C_Command;
-
-struct _mp4c_key
-{
- u8 char_code;
- MP4C_Command cmd_type;
- const char *cmd_help;
- u32 flags;
-} MP4C_Keys = {
-	{'q', MP4C_QUIT, "quit", 0},
-	{'X', MP4C_KILL, "kill", 0},
-	{'r', MP4C_KILL, "reload current presentation", 0},
-	{'o', MP4C_OPEN, "connect to the specified URL", 0},
-	{'O', MP4C_OPEN_PL, "connect to the specified playlist", 0},
-	{'N', MP4C_PL_NEXT, "switch to the next URL in the playlist. Also works with `\\n`", 0},
-	{'P', MP4C_PL_JUMP, "jump to a given number ahead in the playlist", 0},
-	{'D', MP4C_DISCONNECT, "disconnect the current presentation", 0},
-	{'G', MP4C_SELECT, "select object or service ID", 0},
-	{'p', MP4C_PAUSE_RESUME, "play/pause the presentation", 0},
-	{'s', MP4C_STEP, "step one frame ahead", 0},
-	{'z', MP4C_SEEK, "seek into presentation by percentage", 0},
-	{'T', MP4C_SEEK_TIME, "seek into presentation by time", 0},
-	{'t', MP4C_TIME, "print current timing", 0},
-	{'u', MP4C_UPDATE, "send a command (BIFS or LASeR) to the main scene", 0},
-	{'e', MP4C_EVALJS, "evaluate JavaScript code in the main scene", 0},
-	{'Z', MP4C_SCREENSHOT, "dump current output frame to PNG", 0},
-	{'w', MP4C_WORLDINFO, "view world info", 0},
-	{ 'v', MP4C_ODLIST, "view list of active media objects in scene", 0},
-	{ 'i', MP4C_ODINFO_ID, "view Object Descriptor info (by ID)", 0},
-	{ 'j', MP4C_ODINFO_NUM, "view Object Descriptor info (by number)", 0},
-	{ 'b', MP4C_ODTIME, "view media objects timing and buffering info", 0},
-	{ 'm', MP4C_ODBUF, "view media objects buffering and memory info", 0},
-	{ 'd', MP4C_DUMPSCENE, "dump scene graph", 0},
-	{ 'k', MP4C_STRESSMODE, "turn stress mode on/off", 0},
-	{ 'n', MP4C_NAVMODE, "change navigation mode", 0},
-	{ 'x', MP4C_LASTVP, "reset to last active viewpoint", 0},
-	{ '3', MP4C_OGL2D, "switch OpenGL on or off for 2D scenes", 0},
-	{ '4', MP4C_AR_4_3, "force 4/3 Aspect Ratio", 0},
-	{ '5', MP4C_AR_16_9, "force 16/9 Aspect Ratio", 0},
-	{ '6', MP4C_AR_NONE, "force no Aspect Ratio (always fill screen)", 0},
-	{ '7', MP4C_AR_ORIG, "force original Aspect Ratio (default)", 0},
-	{ 'H', MP4C_DOWNRATE, "set HTTP max download rate", 0},
-	{ 'E', MP4C_RELOAD_OPTS, "force reload of compositor options", 0},
-
-	{ 'L', MP4C_LOGS, "change to new log tool/level. CF MP4Client usage for possible values", 0},
-	{ 'R', MP4C_DISP_RTI, "toggle run-time info display in window title bar on/off", 0},
-	{ 'F', MP4C_DISP_FPS, "toggle displaying of FPS in stderr on/off", 0},
-	{ 'f', MP4C_DISP_STATS, "print filter session stats", 0},
-	{ 'g', MP4C_DISP_GRAPH, "print filter session graph", 0},
-
-	{ 'h', MP4C_HELP, "print this message", 0},
-	//below this, only experimental features
-	{ 'M', MP4C_VMEM_CACHE, "specify video cache memory for 2D objects", 1},
-	{0}
-};
-
-MP4C_Command get_cmd(u8 char_code)
-{
-	u32 i=0;
-	while (MP4C_Keysi.char_code) {
-		if (MP4C_Keysi.char_code == char_code)
-			return MP4C_Keysi.cmd_type;
-		i++;
-	}
-	return 0;
-}
-
-void PrintHelp()
-{
-	u32 i=0;
-
-	gf_sys_format_help(helpout, help_flags, "# MP4Client runtime commands\n"
-		"## Prompt Interaction\n"
-		"The following keys are used for prompt interaction:\n");
-
-	while (MP4C_Keysi.char_code) {
-		struct _mp4c_key *k = &MP4C_Keysi;
-		i++;
-		gf_sys_format_help(helpout, help_flags|GF_PRINTARG_HIGHLIGHT_FIRST, "%c: %s%s\n", k->char_code, k->cmd_help, k->flags ? " **! experimental !**" : "");
-	}
-
-	gf_sys_format_help(helpout, help_flags, "\n"
-		"## Content interaction\n"
-		"It is possible to interact with content (interactive or not) using mouse and keyboard.\n"
-		"The following commands are available:\n"
-		"TODO\n"
-		"\n"
-	);
-}
-
-
-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(stderr, "%02d:%02d:%02d.%03d", h, m, s, ms);
-}
-
-
-static u32 rti_update_time_ms = 200;
-static FILE *rti_logs = NULL;
-
-static void UpdateRTInfo(const char *legend)
-{
-	GF_SystemRTInfo rti;
-
-	/*refresh every second*/
-	if (!Run) return;
-	if (!display_rti && !rti_logs) return;
-	if (!gf_sys_get_rti(rti_update_time_ms, &rti, 0) && !legend)
-		return;
-
-	if (display_rti) {
-		char szMsg1024;
-
-		if (rti.total_cpu_usage && (bench_mode<2) ) {
-			sprintf(szMsg, "FPS %02.02f CPU %2d (%02d) Mem %d kB",
-			        gf_term_get_framerate(term, 0), rti.total_cpu_usage, rti.process_cpu_usage, (u32) (rti.gpac_memory / 1024));
-		} else {
-			sprintf(szMsg, "FPS %02.02f CPU %02d Mem %d kB",
-			        gf_term_get_framerate(term, 0), rti.process_cpu_usage, (u32) (rti.gpac_memory / 1024) );
-		}
-
-		if (display_rti==2) {
-			if (bench_mode>=2) {
-				PrintAVInfo(GF_FALSE);
-			}
-			fprintf(stderr, "%s\r", szMsg);
-		} else {
-			GF_Event evt;
-			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",
-		        gf_sys_clock(),
-		        gf_term_get_time_in_ms(term),
-		        rti.total_cpu_usage,
-		        (u32) gf_term_get_framerate(term, 0),
-		        (u32) (rti.gpac_memory / 1024),
-		        legend ? legend : ""
-		       );
-		if (!legend) fprintf(rti_logs, "\n");
-	}
-}
-
-#include <gpac/revision.h>
-#define MP4CLIENT_CAPTION	"GPAC MP4Client "GPAC_VERSION "-rev" GPAC_GIT_REVISION
-
-static void ResetCaption()
-{
-	GF_Event event;
-	if (display_rti) return;
-	event.type = GF_EVENT_SET_CAPTION;
-	event.caption.caption = NULL;
-
-	if (is_connected) {
-		char szName1024;
-		GF_TermURLInfo urli;
-
-		/*get any service info*/
-		if (!startup_file && gf_term_get_service_info(term, gf_term_get_root_object(term), &urli) == GF_OK) {
-			strcpy(szName, "");
-			if (urli.track_num) {
-				char szBuf10;
-				sprintf(szBuf, "%02d ", (u32) urli.track_num );
-				strcat(szName, szBuf);
-			}
-			if (urli.artist) {
-				strcat(szName, urli.artist);
-				strcat(szName, " ");
-			}
-			if (urli.name) {
-				strcat(szName, urli.name);
-				strcat(szName, " ");
-			}
-			if (urli.album) {
-				strcat(szName, "(");
-				strcat(szName, urli.album);
-				strcat(szName, ")");
-			}
-			if (urli.provider) {
-				strcat(szName, "(");
-				strcat(szName, urli.provider);
-				strcat(szName, ")");
-			}
-			if (strlen(szName)) event.caption.caption = szName;
-		}
-		if (!event.caption.caption) {
-			char *str = strrchr(the_url, '\\');
-			if (!str) str = strrchr(the_url, '/');
-			event.caption.caption = str ? str+1 : the_url;
-		}
-	} else {
-		event.caption.caption = MP4CLIENT_CAPTION;
-	}
-	gf_term_user_event(term, &event);
-}
-
-#ifdef WIN32
-u32 get_sys_col(int idx)
-{
-	u32 res;
-	DWORD val = GetSysColor(idx);
-	res = (val)&0xFF;
-	res<<=8;
-	res |= (val>>8)&0xFF;
-	res<<=8;
-	res |= (val>>16)&0xFF;
-	return res;
-}
-#endif
-
-void switch_bench(u32 is_on)
-{
-	bench_mode = is_on;
-	display_rti = is_on ? 2 : 0;
-	ResetCaption();
-	gf_term_set_option(term, GF_OPT_VIDEO_BENCH, is_on);
-}
-
-#ifdef GPAC_ENABLE_COVERAGE
-#define gf_getch() 0
-#define gf_read_line_input(_line, _maxSize, _showContent) GF_FALSE
-#endif //!GPAC_ENABLE_COVERAGE
-
-static void do_set_speed(Fixed desired_speed)
-{
-	if (gf_term_set_speed(term, desired_speed) == GF_OK) {
-		playback_speed = desired_speed;
-		fprintf(stderr, "Playing at %g speed\n", FIX2FLT(playback_speed));
-	} else {
-		fprintf(stderr, "Adjusting speed to %g not supported for this content\n", FIX2FLT(desired_speed));
-	}
-}
-
-Bool GPAC_EventProc(void *ptr, GF_Event *evt)
-{
-	if (!term) return 0;
-
-	if (gui_mode==1) {
-		if (evt->type==GF_EVENT_QUIT) {
-			Run = 0;
-			if (evt->message.error>0)
-				ret_val = evt->message.error;
-		} else if (evt->type==GF_EVENT_KEYDOWN) {
-			switch (evt->key.key_code) {
-			case GF_KEY_C:
-				if (evt->key.flags & (GF_KEY_MOD_CTRL|GF_KEY_MOD_ALT)) {
-					hide_shell(shell_visible ? 1 : 0);
-					if (shell_visible) gui_mode=2;
-				}
-				break;
-			default:
-				break;
-			}
-		}
-		return 0;
-	}
-
-	switch (evt->type) {
-	case GF_EVENT_DURATION:
-		Duration = (u64) ( 1000 * (s64) evt->duration.duration);
-		CanSeek = evt->duration.can_seek;
-		break;
-	case GF_EVENT_MESSAGE:
-	{
-		const char *servName;
-		if (!evt->message.service || !strcmp(evt->message.service, the_url)) {
-			servName = "";
-		} else if (!strnicmp(evt->message.service, "data:", 5)) {
-			servName = "(embedded data)";
-		} else {
-			servName = evt->message.service;
-		}
-
-
-		if (!evt->message.message) return 0;
-
-		if (evt->message.error) {
-			if (!is_connected) last_error = evt->message.error;
-			if (evt->message.error==GF_SCRIPT_INFO) {
-				GF_LOG(GF_LOG_INFO, GF_LOG_CONSOLE, ("%s\n", evt->message.message));
-			} else {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_CONSOLE, ("%s %s: %s\n", servName, evt->message.message, gf_error_to_string(evt->message.error)));
-			}
-		} else {
-			GF_LOG(GF_LOG_INFO, GF_LOG_CONSOLE, ("%s %s\n", servName, evt->message.message));
-		}
-	}
-	break;
-	case GF_EVENT_PROGRESS:
-	{
-		char *szTitle = "";
-		if (evt->progress.progress_type==0) {
-			szTitle = "Buffer ";
-			if (bench_mode && (bench_mode!=3) ) {
-				if (evt->progress.done >= evt->progress.total) bench_buffer = 0;
-				else bench_buffer = 1 + 100*evt->progress.done / evt->progress.total;
-				break;
-			}
-		}
-		else if (evt->progress.progress_type==1) {
-			if (bench_mode) break;
-			szTitle = "Download ";
-		}
-		else if (evt->progress.progress_type==2) szTitle = "Import ";
-		gf_set_progress(szTitle, evt->progress.done, evt->progress.total);
-	}
-	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_VOUT_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(!bench_mode);
-			break;
-		}
-		break;
-	case GF_EVENT_KEYDOWN:
-		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(!bench_mode);
-			}
-			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_C:
-			if (evt->key.flags & (GF_KEY_MOD_CTRL|GF_KEY_MOD_ALT)) {
-				hide_shell(shell_visible ? 1 : 0);
-				if (!shell_visible) gui_mode=1;
-			}
-			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_O:
-			if ((evt->key.flags & GF_KEY_MOD_CTRL) && is_connected) {
-				if (gf_term_get_option(term, GF_OPT_MAIN_ADDON)) {
-					fprintf(stderr, "Resuming to main content\n");
-					gf_term_set_option(term, GF_OPT_PLAY_STATE, GF_STATE_PLAY_LIVE);
-				} else {
-					fprintf(stderr, "Main addon not enabled\n");
-				}
-			}
-			break;
-		case GF_KEY_P:
-			if ((evt->key.flags & GF_KEY_MOD_CTRL) && is_connected) {
-				u32 pause_state = gf_term_get_option(term, GF_OPT_PLAY_STATE) ;
-				fprintf(stderr, "Status: %s\n", pause_state ? "Playing" : "Paused");
-				if ((pause_state == GF_STATE_PAUSED) && (evt->key.flags & GF_KEY_MOD_SHIFT)) {
-					gf_term_set_option(term, GF_OPT_PLAY_STATE, GF_STATE_PLAY_LIVE);
-				} else {
-					gf_term_set_option(term, GF_OPT_PLAY_STATE, (pause_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_B:
-			if ((evt->key.flags & GF_KEY_MOD_CTRL) && is_connected)
-				ViewODs(term, 1);
-			break;
-		case GF_KEY_M:
-			if ((evt->key.flags & GF_KEY_MOD_CTRL) && is_connected)
-				ViewODs(term, 0);
-			break;
-		case GF_KEY_H:
-			if ((evt->key.flags & GF_KEY_MOD_CTRL) && is_connected) {
-				gf_term_switch_quality(term, 1);
-			//	gf_term_set_option(term, GF_OPT_MULTIVIEW_MODE, 0);
-			}
-			break;
-		case GF_KEY_L:
-			if ((evt->key.flags & GF_KEY_MOD_CTRL) && is_connected) {
-				gf_term_switch_quality(term, 0);
-			//	gf_term_set_option(term, GF_OPT_MULTIVIEW_MODE, 1);
-			}
-			break;
-		case GF_KEY_F5:
-			if (is_connected)
-				reload = 1;
-			break;
-		case GF_KEY_A:
-			addon_visible = !addon_visible;
-			gf_term_toggle_addons(term, addon_visible);
-			break;
-		case GF_KEY_UP:
-			if ((evt->key.flags & VK_MOD) && is_connected) {
-				do_set_speed(playback_speed * 2);
-			}
-			break;
-		case GF_KEY_DOWN:
-			if ((evt->key.flags & VK_MOD) && is_connected) {
-				do_set_speed(playback_speed / 2);
-			}
-			break;
-		case GF_KEY_LEFT:
-			if ((evt->key.flags & VK_MOD) && is_connected) {
-				do_set_speed(-1 * playback_speed );
-			}
-			break;
-
-		}
-		break;
-
-	case GF_EVENT_CONNECT:
-		if (evt->connect.is_connected) {
-			is_connected = 1;
-			fprintf(stderr, "Service Connected\n");
-			eos_seen = GF_FALSE;
-			if (playback_speed != FIX_ONE)
-				gf_term_set_speed(term, playback_speed);
-
-			if (do_coverage) {
-				gf_term_switch_quality(term, 1);
-			}
-
-		} else if (is_connected) {
-			fprintf(stderr, "Service %s\n", is_connected ? "Disconnected" : "Connection Failed");
-			is_connected = 0;
-			Duration = 0;
-		}
-		if (init_w && init_h) {
-			gf_term_set_size(term, init_w, init_h);
-		}
-		ResetCaption();
-		break;
-	case GF_EVENT_EOS:
-		eos_seen = GF_TRUE;
-		if (playlist) {
-			if (Duration>1500)
-				request_next_playlist_item = GF_TRUE;
-		}
-		else if (loop_at_end) {
-			restart = 1;
-		}
-		break;
-	case GF_EVENT_SIZE:
-		if (user.init_flags & GF_VOUT_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) || scale) {
-			GF_Event size;
-			u32 nw = forced_width ? forced_width : evt->size.width;
-			u32 nh = forced_height ? forced_height : evt->size.height;
-
-			if (scale != 1) {
-				nw  = (u32)(nw * scale);
-				nh = (u32)(nh * scale);
-			}
-			if ((nw != evt->size.width) || (nh != evt->size.height)) {
-				size.type = GF_EVENT_SIZE;
-				size.size.width = nw;
-				size.size.height = nh;
-				gf_term_user_event(term, &size);
-			}
-		}
-		break;
-
-	case GF_EVENT_METADATA:
-		ResetCaption();
-		break;
-	case GF_EVENT_DROPFILE:
-	{
-		u32 i, pos;
-		/*todo - force playlist mode*/
-		if (readonly_playlist) {
-			gf_fclose(playlist);
-			playlist = NULL;
-		}
-		readonly_playlist = 0;
-		if (!playlist) {
-			readonly_playlist = 0;
-			playlist = gf_file_temp(NULL);
-		}
-		pos = (u32) gf_ftell(playlist);
-		i=0;
-		while (i<evt->open_file.nb_files) {
-			if (evt->open_file.filesi != NULL) {
-				fprintf(playlist, "%s\n", evt->open_file.filesi);
-			}
-			i++;
-		}
-		gf_fseek(playlist, pos, SEEK_SET);
-		request_next_playlist_item = 1;
-	}
-	return 1;
-
-	case GF_EVENT_QUIT:
-		if (evt->message.error<0)  {
-			fprintf(stderr, "A fatal error was encoutered: %s (%s) - exiting ...\n", evt->message.message ? evt->message.message : "no details", gf_error_to_string(evt->message.error) );
-		} else {
-			ret_val = evt->message.error;
-		}
-		Run = 0;
-		break;
-	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)) {
-			strncpy(the_url, evt->navigate.to_url, sizeof(the_url)-1);
-			the_urlsizeof(the_url) - 1 = 0;
-			fprintf(stderr, "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);
-		}
-		break;
-	case GF_EVENT_SET_CAPTION:
-		gf_term_user_event(term, evt);
-		break;
-	case GF_EVENT_AUTHORIZATION:
-	{
-		u32 nb_retry = 4;
-		assert( evt->type == GF_EVENT_AUTHORIZATION);
-		assert( evt->auth.user);
-		assert( evt->auth.password);
-		assert( evt->auth.site_url);
-		while ((!strlen(evt->auth.user) || !strlen(evt->auth.password)) && (nb_retry > 0) ) {
-			nb_retry--;
-			fprintf(stderr, "**** Authorization required for site %s ****\n", evt->auth.site_url);
-			fprintf(stderr, "login   : ");
-			if (!gf_read_line_input(evt->auth.user, 50, 1))
-				continue;
-			fprintf(stderr, "\npassword: ");
-			if (!gf_read_line_input(evt->auth.password, 50, 0))
-				continue;
-			fprintf(stderr, "*********\n");
-		}
-		if (nb_retry == 0) {
-			fprintf(stderr, "**** No User or password has been filled, aborting ***\n");
-			return 0;
-		}
-		return 1;
-	}
-	case GF_EVENT_ADDON_DETECTED:
-		if (enable_add_ons) {
-			fprintf(stderr, "Media Addon %s detected - enabling it\n", evt->addon_connect.addon_url);
-			addon_visible = 1;
-		}
-		return enable_add_ons;
-	}
-	return 0;
-}
-
-
-void list_modules()
-{
-	u32 i;
-	fprintf(stderr, "\rAvailable modules:\n");
-	for (i=0; i<gf_modules_count(); i++) {
-		char *str = (char *) gf_modules_get_file_name(i);
-		if (str) fprintf(stderr, "\t%s\n", str);
-	}
-	fprintf(stderr, "\n");
-}
-
-void set_navigation()
-{
-	GF_Err e;
-	char nav;
-	u32 type = gf_term_get_option(term, GF_OPT_NAVIGATION_TYPE);
-	e = GF_OK;
-//	fflush(stdin);
-
-	if (!type) {
-		fprintf(stderr, "Content/compositor doesn't allow user-selectable navigation\n");
-	} else if (type==1) {
-		fprintf(stderr, "Select Navigation (\'N\'one, \'E\'xamine, \'S\'lide): ");
-		nav = do_coverage ? 'N' : gf_getch();
-		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(stderr, "Unknown selector \'%c\' - only \'N\',\'E\',\'S\' allowed\n", nav);
-	} else if (type==2) {
-		fprintf(stderr, "Select Navigation (\'N\'one, \'W\'alk, \'F\'ly, \'E\'xamine, \'P\'an, \'S\'lide, \'G\'ame, \'V\'R, \'O\'rbit): ");
-		nav = do_coverage ? 'N' : gf_getch();
-		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(stderr, "Unknown selector %c - only \'N\',\'W\',\'F\',\'E\',\'P\',\'S\',\'G\', \'V\', \'O\' allowed\n", nav);
-	}
-	if (e) fprintf(stderr, "Error setting mode: %s\n", gf_error_to_string(e));
-}
-
-
-static void on_rti_log(void *cbk, GF_LOG_Level ll, GF_LOG_Tool lm, const char *fmt, va_list list)
-{
-	if (rti_logs && (lm & GF_LOG_RTI)) {
-		char szMsg2048;
-		vsnprintf(szMsg, 2048, fmt, list);
-		UpdateRTInfo(szMsg + 6 /*"RTI "*/);
-	}
-}
-
-static void init_rti_logs(char *rti_file, char *url, Bool use_rtix)
-{
-	if (rti_logs) gf_fclose(rti_logs);
-	rti_logs = gf_fopen(rti_file, "wt");
-	if (rti_logs) {
-		fprintf(rti_logs, "!! GPAC RunTime Info ");
-		if (url) fprintf(rti_logs, "for file %s", url);
-		fprintf(rti_logs, " !!\n");
-		fprintf(rti_logs, "SysTime(ms)\tSceneTime(ms)\tCPU\tFPS\tMemory(kB)\tObservation\n");
-
-		/*turn on RTI loging*/
-		if (use_rtix) {
-			gf_log_set_callback(NULL, on_rti_log);
-			gf_log_set_tool_level(GF_LOG_RTI, GF_LOG_DEBUG);
-
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_RTI, ("RTI System state when enabling log\n"));
-		} else if (log_rti_time_start) {
-			log_rti_time_start = gf_sys_clock_high_res();
-		}
-	}
-}
-
-
-#ifdef WIN32
-#include <wincon.h>
-#endif
-
-int mp4client_main(int argc, char **argv)
-{
-	char c;
-	MP4C_Command cmdtype;
-	const char *str;
-	GF_Err e;
-	u32 i, ll;
-	u32 simulation_time_in_ms = 0;
-	u32 initial_service_id = 0;
-	Bool auto_exit = GF_FALSE;
-	Bool start_fs = GF_FALSE;
-	Bool use_rtix = GF_FALSE;
-	Bool pause_at_first = GF_FALSE;
-	Bool no_cfg_save = GF_FALSE;
-	Bool print_stats = GF_FALSE;
-	Bool print_graph = GF_FALSE;
-	Bool no_keyboard = GF_FALSE;
-	Double play_from = 0;
-#ifdef GPAC_MEMORY_TRACKING
-    GF_MemTrackerType mem_track = GF_MemTrackerNone;
-#endif
-	Bool has_command;
-	char *url_arg, *gpac_profile, *rti_file;
-	FILE *logfile = NULL;
-#ifndef WIN32
-	dlopen(NULL, RTLD_NOW|RTLD_GLOBAL);
-#endif
-
-	helpout = stdout;
-
-	/*by default use current dir*/
-	strcpy(the_url, ".");
-
-	memset(&user, 0, sizeof(GF_User));
-
-	has_command = GF_FALSE;
-	url_arg = gpac_profile = rti_file = NULL;
-
-	/*first identify profile and mem tracking */
-	for (i=1; i<(u32) argc; i++) {
-		char *arg = argvi;
-		if (!strcmp(arg, "-p")) {
-			gpac_profile = argvi+1;
-			i++;
-		} else if (!strncmp(arg, "-p=", 3)) {
-			gpac_profile = argvi+3;
-		} else if (!strcmp(arg, "-mem-track") || !strcmp(arg, "-mem-track-stack")) {
-#ifdef GPAC_MEMORY_TRACKING
-            mem_track = !strcmp(arg, "-mem-track-stack") ? GF_MemTrackerBackTrace : GF_MemTrackerSimple;
-#else
-			fprintf(stderr, "WARNING - GPAC not compiled with Memory Tracker - ignoring \"%s\"\n", arg);
-#endif
-		} else if (!strcmp(arg, "-gui")) {
-			gui_mode = 1;
-		} else if (!strcmp(arg, "-guid")) {
-			gui_mode = 2;
-		} else if (!strcmp(arg, "-h") || !strcmp(arg, "-help")) {
-			PrintUsage(GF_FALSE);
-			return 0;
-		} else if (!strcmp(arg, "-hx")) {
-			PrintUsage(GF_TRUE);
-			return 0;
-		} else if (!strcmp(arg, "-hr")) {
-			PrintHelp();
-			return 0;
-		} else if (!strcmp(arg, "-hc")) {
-			fprintf(helpout, "libgpac options:\n");
-			gf_sys_print_core_help(helpout, help_flags, GF_ARGMODE_ALL, 0);
-			return 0;
-		}
-	}
-
-#ifdef GPAC_MEMORY_TRACKING
-	gf_sys_init(mem_track, gpac_profile);
-#else
-	gf_sys_init(GF_MemTrackerNone, gpac_profile);
-#endif
-
-	gf_log_set_tool_level(GF_LOG_ALL, GF_LOG_WARNING);
-	//we by default want 2 additional threads:
-	//main thread might get locked on vsync
-	//second thread might be busy decoding audio/video
-	//third thread will then be able to refill all buffers/perform networks tasks
-	gf_opts_set_key("temp", "threads", "2");
-
-	e = gf_sys_set_args(argc, (const char **) argv);
-	if (e) {
-		fprintf(stderr, "Error assigning libgpac arguments: %s\n", gf_error_to_string(e) );
-		gf_sys_close();
-		return 1;
-	}
-
-	if (!gui_mode) {
-		str = gf_opts_get_key("General", "ForceGUI");
-		if (str && !strcmp(str, "yes")) gui_mode = 1;
-	}
-
-	for (i=1; i<(u32) argc; i++) {
-		char *arg = argvi;
-
-		if (!strcmp(arg, "-genmd")) {
-			help_flags = GF_PRINTARG_MD;
-			helpout = gf_fopen("mp4client.md", "w");
-
-	 		fprintf(helpout, "**HOME**(Home) » MP4Client  \n");
-	 		fprintf(helpout, "\n");
-			PrintUsage(GF_TRUE);
-			PrintHelp();
-			gf_fclose(helpout);
-			gf_sys_close();
-			return 0;
-		} else if (!strcmp(arg, "-genman")) {
-			help_flags = GF_PRINTARG_MAN;
-			helpout = gf_fopen("mp4client.1", "w");
-
-
-	 		fprintf(helpout, ".TH MP4Client 1 2019 MP4Client GPAC\n");
-			fprintf(helpout, ".\n.SH NAME\n.LP\nMP4Client \\- GPAC command-line media player\n.SH SYNOPSIS\n.LP\n.B MP4Client\n.RI options \\ file\n.br\n.\n");
-
-	 		PrintUsage(GF_TRUE);
-			PrintHelp();
-
-			fprintf(helpout, ".SH EXAMPLES\n.TP\nBasic and advanced examples are available at https://wiki.gpac.io/mp4client\n");
-			fprintf(helpout, ".SH MORE\n.LP\nAuthors: GPAC developers, see git repo history (-log)\n"
-			".br\nFor bug reports, feature requests, more information and source code, visit https://github.com/gpac/gpac\n"
-			".br\nbuild: %s\n"
-			".br\nCopyright: %s\n.br\n"
-			".SH SEE ALSO\n"
-			".LP\ngpac(1), MP4Box(1)\n", gf_gpac_version(), gf_gpac_copyright());
-
-			gf_fclose(helpout);
-			gf_sys_close();
-			return 0;
-		} else if (!strcmp(arg, "-rti")) {
-			rti_file = argvi+1;
-			i++;
-		} else if (!strcmp(arg, "-rtix")) {
-			rti_file = argvi+1;
-			i++;
-			use_rtix = GF_TRUE;
-		} else if (!strcmp(arg, "-rti-refresh")) {
-			rti_update_time_ms = atoi(argvi+1);
-			i++;
-		} else if (!stricmp(arg, "-size")) {
-			/*usage of %ud breaks sscanf on MSVC*/
-			if (sscanf(argvi+1, "%dx%d", &forced_width, &forced_height) != 2) {
-				forced_width = forced_height = 0;
-			}
-			i++;
-		}
-		//libgpac opts using an argument
-		else if (!strcmp(arg, "-log-file") || !strcmp(arg, "-lf") || !strcmp(arg, "-logs") || !strcmp(arg, "-cfg")  || !strcmp(arg, "-ifce") ) {
-			i++;
-		}
-
-		else if (!strcmp(arg, "-no-thread")) {
-			gf_opts_set_key("temp", "threads", "0");
-		}
-		else if (!strcmp(arg, "-no-audio")) {
-			no_audio = GF_TRUE;
-		}
-		else if (!strcmp(arg, "-fs")) start_fs = 1;
-		else if (!stricmp(arg, "-no-save") || !stricmp(arg, "--no-save") /*old versions used --n-save ...*/) {
-			no_cfg_save=1;
-		}
-		else if (!stricmp(arg, "-run-for")) {
-			simulation_time_in_ms = (u32) (atof(argvi+1) * 1000);
-			if (!simulation_time_in_ms)
-				simulation_time_in_ms = 1; /*1ms*/
-			i++;
-		} else if (!stricmp(arg, "-scale")) {
-			sscanf(argvi+1, "%f", &scale);
-			i++;
-		}
-		/* already parsed */
-		else if (!strcmp(arg, "-nk")) {
-			no_keyboard = GF_TRUE;
-		}
-		/* already parsed */
-		else if (!strcmp(arg, "-p")) {
-			i++;
-		}
-		/* already parsed */
-		else if (!strcmp(arg, "-mem-track") || !strcmp(arg, "-mem-track-stack") || !strcmp(arg, "-gui") || !strcmp(arg, "-guid")
-			 || !strncmp(arg, "-p=", 3)
-		) {
-		}
-
-		/*arguments only used in non-gui mode*/
-		else if (!gui_mode) {
-			if (arg0 != '-') {
-				if (url_arg) {
-					fprintf(stderr, "Several input URLs provided (\"%s\", \"%s\"). Check your command-line.\n", url_arg, arg);
-					return 1;
-				}
-				url_arg = arg;
-			}
-			else if (!strcmp(arg, "-loop")) loop_at_end = 1;
-			else if (!strcmp(arg, "-bench")) bench_mode = 1;
-			else if (!strcmp(arg, "-vbench")) bench_mode = 2;
-			else if (!strcmp(arg, "-sbench")) bench_mode = 3;
-			else if (!strcmp(arg, "-no-addon")) enable_add_ons = GF_FALSE;
-
-			else if (!strcmp(arg, "-pause")) pause_at_first = 1;
-			else if (!strcmp(arg, "-play-from")) {
-				play_from = atof((const char *) argvi+1);
-				i++;
-			}
-			else if (!strcmp(arg, "-speed")) {
-				playback_speed = FLT2FIX( atof((const char *) argvi+1) );
-				if (playback_speed <= 0) playback_speed = FIX_ONE;
-				i++;
-			}
-			else if (!strcmp(arg, "-no-wnd")) user.init_flags |= GF_VOUT_WINDOWLESS;
-			else if (!strcmp(arg, "-no-back")) user.init_flags |= GF_VOUT_WINDOW_NO_DECORATION;
-			else if (!strcmp(arg, "-align")) {
-				if (argvi+10=='m') align_mode = 1;
-				else if (argvi+10=='b') align_mode = 2;
-				align_mode <<= 8;
-				if (argvi+11=='m') align_mode |= 1;
-				else if (argvi+11=='r') align_mode |= 2;
-				i++;
-			}
-			else if (!strcmp(arg, "-exit")) auto_exit = GF_TRUE;
-			else if (!stricmp(arg, "-com")) {
-				has_command = GF_TRUE;
-				i++;
-			}
-			else if (!stricmp(arg, "-service")) {
-				initial_service_id = atoi(argvi+1);
-				i++;
-			} else if (!stricmp(arg, "-stats")) {
-				print_stats=GF_TRUE;
-			} else if (!stricmp(arg, "-graph")) {
-				print_graph=GF_TRUE;
-			} else if (!stricmp(arg, "-cov")) {
-				do_coverage = GF_TRUE;
-				print_stats = GF_TRUE;
-				print_graph = GF_TRUE;
-			} else {
-				u32 res = gf_sys_is_gpac_arg(arg);
-				if (!res) {
-					fprintf(stderr, "Unrecognized option %s\n", arg);
-				} else if (res==2) {
-					i++;
-				}
-			}
-		} else if (gf_sys_is_gpac_arg(arg)==2) {
-			i++;
-		}
- 	}
-
-	//will run switch helpout to stderr
-	helpout = stderr;
-
-	if (!gui_mode && !url_arg && (gf_opts_get_key("General", "StartupFile") != NULL)) {
-		gui_mode=1;
-	}
-
-#ifdef WIN32
-	if (gui_mode==1) {
-		const char *opt;
-		TCHAR buffer1024;
-		DWORD res = GetCurrentDirectory(1024, buffer);
-		bufferres = 0;
-		opt = gf_opts_get_key("core", "module-dir");
-		if (strstr(opt, buffer)) {
-			gui_mode=1;
-		} else {
-			gui_mode=2;
-		}
-	}
-#endif
-
-	if (gui_mode==1) {
-		hide_shell(1);
-	}
-	if (gui_mode) {
-		gf_sys_set_cfg_option("core:noprog=yes");
-	}
-
-#if defined(__DARWIN__) || defined(__APPLE__)
-	carbon_init();
-#endif
-
-
-	if (rti_file) init_rti_logs(rti_file, url_arg, use_rtix);
-
-	{
-		GF_SystemRTInfo rti;
-		if (gf_sys_get_rti(0, &rti, 0))
-			fprintf(stderr, "System info: %d MB RAM - %d cores\n", (u32) (rti.physical_memory/1024/1024), rti.nb_cores);
-	}
-
-
-	init_w = forced_width;
-	init_h = forced_height;
-
-	user.EventProc = GPAC_EventProc;
-	/*dummy in this case (global vars) but MUST be non-NULL*/
-	user.opaque = &user;
-
-	if (no_audio) gf_opts_set_key("temp", "no-audio", "yes");
-
-	if (bench_mode) {
-		gf_opts_discard_changes();
-		auto_exit = GF_TRUE;
-		if (bench_mode!=2)
-			gf_opts_set_key("temp", "no-video", "yes");
-	}
-
-	if (forced_width && forced_height) {
-		char dim50;
-		sprintf(dim, "%d", forced_width);
-		gf_opts_set_key("Temp", "DefaultWidth", dim);
-		sprintf(dim, "%d", forced_height);
-		gf_opts_set_key("Temp", "DefaultHeight", dim);
-	}
-
-	fprintf(stderr, "Loading GPAC Terminal\n");
-	i = gf_sys_clock();
-
-	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();
-		gf_opts_discard_changes();
-		gf_sys_close();
-		if (logfile) gf_fclose(logfile);
-		return 1;
-	}
-	fprintf(stderr, "Terminal Loaded in %d ms\n", gf_sys_clock()-i);
-
-	if (bench_mode) {
-		display_rti = 2;
-		gf_term_set_option(term, GF_OPT_VIDEO_BENCH, (bench_mode==3) ? 2 : 1);
-		if (bench_mode==1) bench_mode=2;
-	}
-
-	str = gf_opts_get_key("General", "NoMIMETypeFetch");
-	no_mime_check = (str && !stricmp(str, "yes")) ? 1 : 0;
-
-	if (gf_opts_get_bool("core", "proxy-on")) {
-		str = gf_opts_get_key("core", "proxy-name");
-		if (str) fprintf(stderr, "HTTP Proxy %s enabled\n", str);
-	}
-
-	if (rti_file) {
-		UpdateRTInfo("At GPAC load time\n");
-	}
-
-	Run = 1;
-
-	if (url_arg && !strcmp(url_arg, "NOGUI")) {
-		url_arg = NULL;
-	}
-	/*connect if requested*/
-	else if (!gui_mode && url_arg) {
-		char *ext;
-
-		if (strlen(url_arg) >= sizeof(the_url)) {
-			fprintf(stderr, "Input url %s is too long, truncating to %d chars.\n", url_arg, (int)(sizeof(the_url) - 1));
-			strncpy(the_url, url_arg, sizeof(the_url)-1);
-			the_urlsizeof(the_url) - 1 = 0;
-		}
-		else {
-			strcpy(the_url, url_arg);
-		}
-		ext = strrchr(the_url, '.');
-		//only local playlist - maybe we could remove and control through flist ?
-		if (ext && !strncmp("http", the_url, 4) && (!stricmp(ext, ".m3u") || !stricmp(ext, ".pls"))) {
-			e = GF_OK;
-			fprintf(stderr, "Opening Playlist %s\n", the_url);
-
-			strcpy(pl_path, the_url);
-			playlist = e ? NULL : gf_fopen(the_url, "rt");
-			readonly_playlist = 1;
-			if (playlist) {
-				request_next_playlist_item = GF_TRUE;
-			} else {
-				if (e)
-					fprintf(stderr, "Failed to open playlist %s: %s\n", the_url, gf_error_to_string(e) );
-				fprintf(stderr, "Hit 'h' for help\n\n");
-			}
-		} else {
-			fprintf(stderr, "Opening URL %s\n", the_url);
-			if (pause_at_first) fprintf(stderr, "Status: Paused\n");
-			gf_term_connect_from_time(term, the_url, (u64) (play_from*1000), pause_at_first);
-		}
-	} else {
-		fprintf(stderr, "Hit 'h' for help\n\n");
-		str = gf_opts_get_key("General", "StartupFile");
-		if (str) {
-			snprintf(the_url, sizeof(the_url)-1, "MP4Client %s", gf_gpac_version() );
-			the_urlsizeof(the_url) - 1 = 0;
-			gf_term_connect(term, str);
-			startup_file = 1;
-			is_connected = 1;
-		}
-	}
-	if (gui_mode==2) gui_mode=0;
-
-	if (start_fs) gf_term_set_option(term, GF_OPT_FULLSCREEN, 1);
-
-	if (bench_mode) {
-		rti_update_time_ms = 500;
-		bench_mode_start = gf_sys_clock();
-	}
-
-	if (simulation_time_in_ms)
-		simulation_time_in_ms += gf_sys_clock();
-
-
-	while (Run) {
-
-		/*we don't want getchar to block*/
-		if ((gui_mode==1) || (no_keyboard || !gf_prompt_has_input()) ) {
-			if (reload) {
-				reload = 0;
-				gf_term_disconnect(term);
-				gf_term_connect(term, startup_file ? gf_opts_get_key("General", "StartupFile") : the_url);
-			}
-			if (restart && gf_term_get_option(term, GF_OPT_IS_OVER)) {
-				restart = 0;
-				gf_term_play_from_time(term, 0, 0);
-			}
-			if (request_next_playlist_item) {
-				c = '\n';
-				request_next_playlist_item = 0;
-				goto force_input;
-			}
-
-			if (has_command && is_connected) {
-				has_command = GF_FALSE;
-				for (i=0; i<(u32)argc; i++) {
-					if (!strcmp(argvi, "-com")) {
-						gf_term_scene_update(term, NULL, argvi+1);
-						i++;
-					}
-				}
-			}
-			if (initial_service_id && is_connected) {
-				GF_ObjectManager *root_od = gf_term_get_root_object(term);
-				if (root_od) {
-					gf_term_select_service(term, root_od, initial_service_id);
-					initial_service_id = 0;
-				}
-			}
-
-			if (!use_rtix || display_rti) UpdateRTInfo(NULL);
-
-
-			gf_term_process_step(term);
-
-			if (auto_exit && eos_seen && gf_term_get_option(term, GF_OPT_IS_OVER)) {
-				Run = GF_FALSE;
-			}
-
-			/*sim time*/
-			if (simulation_time_in_ms
-			        && ( (gf_term_get_elapsed_time_in_ms(term)>simulation_time_in_ms) || (!url_arg && gf_sys_clock()>simulation_time_in_ms))
-			   ) {
-				Run = GF_FALSE;
-			}
-			continue;
-		}
-
-		c = gf_prompt_get_char();
-
-force_input:
-		if (c=='\n') cmdtype=MP4C_PL_NEXT;
-		else cmdtype = get_cmd(c);
-
-		switch (cmdtype) {
-		case MP4C_QUIT:
-		{
-			GF_Event evt;
-			memset(&evt, 0, sizeof(GF_Event));
-			evt.type = GF_EVENT_QUIT;
-			gf_term_send_event(term, &evt);
-		}
-//			Run = 0;
-		break;
-		case MP4C_KILL:
-			exit(0);
-			break;
-
-		case MP4C_OPEN:
-			startup_file = 0;
-			gf_term_disconnect(term);
-			fprintf(stderr, "Enter the absolute URL\n");
-			if (1 > scanf("%1023s", the_url)) {
-				fprintf(stderr, "Cannot read absolute URL, aborting\n");
-				break;
-			}
-			if (rti_file) init_rti_logs(rti_file, the_url, use_rtix);
-			gf_term_connect(term, the_url);
-			break;
-		case MP4C_OPEN_PL:
-			gf_term_disconnect(term);
-			fprintf(stderr, "Enter the absolute URL to the playlist\n");
-			if (1 > scanf("%1023s", the_url)) {
-				fprintf(stderr, "Cannot read the absolute URL, aborting.\n");
-				break;
-			}
-			playlist = gf_fopen(the_url, "rt");
-			if (playlist) {
-				if (1 >	fscanf(playlist, "%1023s", the_url)) {
-					fprintf(stderr, "Cannot read any URL from playlist, aborting.\n");
-					gf_fclose( playlist);
-					break;
-				}
-				fprintf(stderr, "Opening URL %s\n", the_url);
-				gf_term_connect(term, the_url);
-			}
-			break;
-		case MP4C_PL_NEXT:
-			if (playlist) {
-				int res;
-				gf_term_disconnect(term);
-
-				res = fscanf(playlist, "%1023s", the_url);
-				if ((res == EOF) && loop_at_end) {
-					gf_fseek(playlist, 0, SEEK_SET);
-					res = fscanf(playlist, "%1023s", the_url);
-				}
-				if (res == EOF) {
-					fprintf(stderr, "No more items - exiting\n");
-					Run = 0;
-				} else if (the_url0 == '#') {
-					request_next_playlist_item = GF_TRUE;
-				} else {
-					fprintf(stderr, "Opening URL %s\n", the_url);
-					gf_term_connect_with_path(term, the_url, pl_path);
-				}
-			}
-			break;
-		case MP4C_PL_JUMP:
-			if (playlist) {
-				u32 count;
-				gf_term_disconnect(term);
-				if (1 > scanf("%u", &count)) {
-					fprintf(stderr, "Cannot read number, aborting.\n");
-					break;
-				}
-				while (count) {
-					if (fscanf(playlist, "%1023s", the_url)) {
-						fprintf(stderr, "Failed to read line, aborting\n");
-						break;
-					}
-					count--;
-				}
-				fprintf(stderr, "Opening URL %s\n", the_url);
-				gf_term_connect(term, the_url);
-			}
-			break;
-		case MP4C_RELOAD:
-			if (is_connected)
-				reload = 1;
-			break;
-
-		case MP4C_DISCONNECT:
-			if (is_connected) gf_term_disconnect(term);
-			break;
-
-		case MP4C_PAUSE_RESUME:
-			if (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, is_pause ? GF_STATE_PLAYING : GF_STATE_PAUSED);
-			}
-			break;
-		case MP4C_STEP:
-			if (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 MP4C_SEEK:
-		case MP4C_SEEK_TIME:
-			if (!CanSeek || (Duration<=2000)) {
-				fprintf(stderr, "scene not seekable\n");
-			} else {
-				Double res;
-				s32 seekTo;
-				fprintf(stderr, "Duration: ");
-				PrintTime(Duration);
-				res = gf_term_get_time_in_ms(term);
-				if (cmdtype==MP4C_SEEK) {
-					res *= 100;
-					res /= (s64)Duration;
-					fprintf(stderr, " (current %.2f %%)\nEnter Seek percentage:\n", res);
-					if (scanf("%d", &seekTo) == 1) {
-						if (seekTo > 100) seekTo = 100;
-						res = (Double)(s64)Duration;
-						res /= 100;
-						res *= seekTo;
-						gf_term_play_from_time(term, (u64) (s64) res, 0);
-					}
-				} else {
-					u32 r, h, m, s;
-					fprintf(stderr, " - Current Time: ");
-					PrintTime((u64) res);
-					fprintf(stderr, "\nEnter seek time (Format: s, m:s or h:m:s):\n");
-					h = m = s = 0;
-					r =scanf("%d:%d:%d", &h, &m, &s);
-					if (r==2) {
-						s = m;
-						m = h;
-						h = 0;
-					}
-					else if (r==1) {
-						s = h;
-						m = h = 0;
-					}
-
-					if (r && (r<=3)) {
-						u64 time = h*3600 + m*60 + s;
-						gf_term_play_from_time(term, time*1000, 0);
-					}
-				}
-			}
-			break;
-
-		case MP4C_TIME:
-		{
-			if (is_connected) {
-				fprintf(stderr, "Current Time: ");
-				PrintTime(gf_term_get_time_in_ms(term));
-				fprintf(stderr, " - Duration: ");
-				PrintTime(Duration);
-				fprintf(stderr, "\n");
-			}
-		}
-		break;
-		case MP4C_WORLDINFO:
-			if (is_connected) PrintWorldInfo(term);
-			break;
-		case MP4C_ODLIST:
-			if (is_connected) PrintODList(term, NULL, 0, 0, "Root");
-			break;
-		case MP4C_ODINFO_ID:
-			if (is_connected) {
-				u32 ID;
-				fprintf(stderr, "Enter OD ID (0 for main OD): ");
-				fflush(stderr);
-				if (scanf("%ud", &ID) == 1) {
-					ViewOD(term, ID, (u32)-1, NULL);
-				} else {
-					char str_urlGF_MAX_PATH;
-					if (scanf("%1023s", str_url) == 1)
-						ViewOD(term, 0, (u32)-1, str_url);
-				}
-			}
-			break;
-		case MP4C_ODINFO_NUM:
-			if (is_connected) {
-				u32 num;
-				do {
-					fprintf(stderr, "Enter OD number (0 for main OD): ");
-					fflush(stderr);
-				} while( 1 > scanf("%ud", &num));
-				ViewOD(term, (u32)-1, num, NULL);
-			}
-			break;
-		case MP4C_ODTIME:
-			if (is_connected) ViewODs(term, 1);
-			break;
-
-		case MP4C_ODBUF:
-			if (is_connected) ViewODs(term, 0);
-			break;
-
-		case MP4C_NAVMODE:
-			if (is_connected) set_navigation();
-			break;
-		case MP4C_LASTVP:
-			if (is_connected) gf_term_set_option(term, GF_OPT_NAVIGATION_TYPE, 0);
-			break;
-
-		case MP4C_DUMPSCENE:
-			if (is_connected) {
-				GF_ObjectManager *odm = NULL;
-				char radnameGF_MAX_PATH, *sExt;
-				u32 count, odid;
-				Bool xml_dump, std_out;
-				radname0 = 0;
-				do {
-					fprintf(stderr, "Enter Inline OD ID if any or 0 : ");
-					fflush(stderr);
-				} while( 1 >  scanf("%ud", &odid));
-				if (odid) {
-					GF_ObjectManager *root_odm = gf_term_get_root_object(term);
-					if (!root_odm) break;
-					count = gf_term_get_object_count(term, root_odm);
-					for (i=0; i<count; i++) {
-						GF_MediaInfo info;
-						odm = gf_term_get_object(term, root_odm, i);
-						if (gf_term_get_object_info(term, odm, &info) == GF_OK) {
-							if (info.ODID==odid) break;
-						}
-						odm = NULL;
-					}
-				}
-				do {
-					fprintf(stderr, "Enter file radical name (+\'.x\' for XML dumping) - \"std\" for stderr: ");
-					fflush(stderr);
-				} while( 1 > scanf("%1023s", radname));
-				sExt = strrchr(radname, '.');
-				xml_dump = 0;
-				if (sExt) {
-					if (!stricmp(sExt, ".x")) xml_dump = 1;
-					sExt0 = 0;
-				}
-				std_out = strnicmp(radname, "std", 3) ? 0 : 1;
-				e = gf_term_dump_scene(term, std_out ? NULL : radname, NULL, xml_dump, 0, odm);
-				fprintf(stderr, "Dump done (%s)\n", gf_error_to_string(e));
-			}
-			break;
-
-		case MP4C_OGL2D:
-		{
-			Bool use_3d = !gf_term_get_option(term, GF_OPT_USE_OPENGL);
-			if (gf_term_set_option(term, GF_OPT_USE_OPENGL, use_3d)==GF_OK) {
-				fprintf(stderr, "Using %s for 2D drawing\n", use_3d ? "OpenGL" : "2D rasterizer");
-			}
-		}
-		break;
-		case MP4C_STRESSMODE:
-		{
-			Bool opt = gf_term_get_option(term, GF_OPT_STRESS_MODE);
-			opt = !opt;
-			fprintf(stderr, "Turning stress mode %s\n", opt ? "on" : "off");
-			gf_term_set_option(term, GF_OPT_STRESS_MODE, opt);
-		}
-		break;
-		case MP4C_AR_4_3:
-			gf_term_set_option(term, GF_OPT_ASPECT_RATIO, GF_ASPECT_RATIO_4_3);
-			break;
-		case MP4C_AR_16_9:
-			gf_term_set_option(term, GF_OPT_ASPECT_RATIO, GF_ASPECT_RATIO_16_9);
-			break;
-		case MP4C_AR_NONE:
-			gf_term_set_option(term, GF_OPT_ASPECT_RATIO, GF_ASPECT_RATIO_FILL_SCREEN);
-			break;
-		case MP4C_AR_ORIG:
-			gf_term_set_option(term, GF_OPT_ASPECT_RATIO, GF_ASPECT_RATIO_KEEP);
-			break;
-
-		case MP4C_DISP_RTI:
-			display_rti = !display_rti;
-			ResetCaption();
-			break;
-		case MP4C_DISP_FPS:
-			if (display_rti) display_rti = 0;
-			else display_rti = 2;
-			ResetCaption();
-			break;
-		case MP4C_DISP_STATS:
-		case MP4C_DISP_GRAPH:
-			ll = gf_log_get_tool_level(GF_LOG_APP);
-			gf_log_set_tool_level(GF_LOG_APP, GF_LOG_INFO);
-			if (cmdtype==MP4C_DISP_STATS)
-				gf_term_print_stats(term);
-			else
-				gf_term_print_graph(term);
-			gf_log_set_tool_level(GF_LOG_APP, ll);
-			break;
-		case MP4C_UPDATE:
-		{
-			char szCom8192;
-			fprintf(stderr, "Enter command to send:\n");
-//			fflush(stdin);
-			szCom0 = 0;
-			if (1 > scanf("%8191^\t\n", szCom)) {
-				fprintf(stderr, "Cannot read command to send, aborting.\n");
-				break;
-			}
-			e = gf_term_scene_update(term, NULL, szCom);
-			if (e) fprintf(stderr, "Processing command failed: %s\n", gf_error_to_string(e));
-		}
-		break;
-		case MP4C_EVALJS:
-		{
-			char jsCode8192;
-			fprintf(stderr, "Enter JavaScript code to evaluate:\n");
-//			fflush(stdin);
-			jsCode0 = 0;
-			if (1 > scanf("%8191^\t\n", jsCode)) {
-				fprintf(stderr, "Cannot read code to evaluate, aborting.\n");
-				break;
-			}
-			e = gf_term_scene_update(term, "application/ecmascript", jsCode);
-			if (e) fprintf(stderr, "Processing JS code failed: %s\n", gf_error_to_string(e));
-		}
-		break;
-
-		case MP4C_LOGS:
-		{
-			char szLog1024, *cur_logs;
-			cur_logs = gf_log_get_tools_levels();
-			fprintf(stderr, "Enter new log level (current tools %s):\n", cur_logs);
-			gf_free(cur_logs);
-			if (scanf("%1023s", szLog) < 1) {
-				fprintf(stderr, "Cannot read new log level, aborting.\n");
-				break;
-			}
-			gf_log_modify_tools_levels(szLog);
-		}
-		break;
-
-		case MP4C_VMEM_CACHE:
-		{
-			u32 size;
-			do {
-				fprintf(stderr, "Enter new video cache memory in kBytes (current %ud):\n", gf_term_get_option(term, GF_OPT_VIDEO_CACHE_SIZE));
-			} while (1 > scanf("%ud", &size));
-			gf_term_set_option(term, GF_OPT_VIDEO_CACHE_SIZE, size);
-		}
-		break;
-
-		case MP4C_DOWNRATE:
-		{
-			u32 http_bitrate = gf_term_get_option(term, GF_OPT_HTTP_MAX_RATE);
-			do {
-				fprintf(stderr, "Enter new http bitrate in bps (0 for none) - current limit: %d\n", http_bitrate);
-			} while (1 > scanf("%ud", &http_bitrate));
-
-			gf_term_set_option(term, GF_OPT_HTTP_MAX_RATE, http_bitrate);
-		}
-		break;
-
-		case MP4C_RELOAD_OPTS:
-			gf_term_set_option(term, GF_OPT_RELOAD_CONFIG, 1);
-			break;
-
-		/*extract to PNG*/
-		case MP4C_SCREENSHOT:
-			MakeScreenshot(GF_FALSE);
-			break;
-
-		case MP4C_SELECT:
-		{
-			GF_ObjectManager *root_od, *odm;
-			u32 index;
-			char szOpt8192;
-			fprintf(stderr, "Enter 0-based index of object to select or service ID:\n");
-//			fflush(stdin);
-			szOpt0 = 0;
-			if (1 > scanf("%8191^\t\n", szOpt)) {
-				fprintf(stderr, "Cannot read OD ID\n");
-				break;
-			}
-			index = atoi(szOpt);
-			odm = NULL;
-			root_od = gf_term_get_root_object(term);
-			if (root_od) {
-				if ( gf_term_find_service(term, root_od, index)) {
-					gf_term_select_service(term, root_od, index);
-				} else {
-					fprintf(stderr, "Cannot find service %d - trying with object index\n", index);
-					odm = gf_term_get_object(term, root_od, index);
-					if (odm) {
-						gf_term_select_object(term, odm);
-					} else {
-						fprintf(stderr, "Cannot find object at index %d\n", index);
-					}
-				}
-			}
-		}
-		break;
-
-		case MP4C_HELP:
-			PrintHelp();
-			break;
-		default:
-			break;
-		}
-	}
-
-	if (bench_mode) {
-		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);
-	}
-
-	if (print_graph || print_stats) {
-		ll = gf_log_get_tool_level(GF_LOG_APP);
-		gf_log_set_tool_level(GF_LOG_APP, GF_LOG_INFO);
-		if (print_graph)
-			gf_term_print_graph(term);
-		if (print_stats)
-			gf_term_print_stats(term);
-		gf_log_set_tool_level(GF_LOG_APP, ll);
-	}
-
-#ifdef GPAC_ENABLE_COVERAGE
-	if (do_coverage) {
-		u32 w, h, k, nb_drawn;
-		GF_Event evt;
-		Bool is_bound;
-		const char *outName;
-		GF_ObjectManager *root_odm, *odm;
-		PrintAVInfo(GF_TRUE);
-		PrintODList(term, NULL, 0, 0, "Root");
-		ViewODs(term, GF_TRUE);
-		ViewODs(term, GF_FALSE);
-		ViewOD(term, 0, (u32) -1, NULL);
-		ViewOD(term, 0, 1, NULL);
-		PrintUsage(0);
-		PrintHelp();
-		PrintWorldInfo(term);
-		gf_term_dump_scene(term, NULL, NULL, GF_FALSE, 0, NULL);
-		gf_term_get_current_service_id(term);
-		gf_term_toggle_addons(term, GF_FALSE);
-		set_navigation();
-		get_cmd('v');
-
-		gf_term_play_from_time(term, 0, 0);
-
-		memset(&evt, 0, sizeof(GF_Event));
-		evt.type = GF_EVENT_MOUSEUP;
-		evt.mouse.x = 20;
-		evt.mouse.y = 20;
-		gf_term_send_event(term, &evt);
-
-		gf_term_set_option(term, GF_OPT_PLAY_STATE, GF_STATE_STEP_PAUSE);
-		//exercise step clocks
-		gf_term_set_option(term, GF_OPT_PLAY_STATE, GF_STATE_STEP_PAUSE);
-		root_odm = gf_term_get_root_object(term);
-		gf_term_find_service(term, root_odm, 0);
-		gf_term_select_service(term, root_odm, 0);
-		odm = gf_term_get_object(term, root_odm, 0);
-		gf_term_select_object(term, odm );
-		gf_term_object_subscene_type(term, odm);
-		gf_term_get_visual_output_size(term, &w, &h);
-
-		gf_term_is_type_supported(term, "video/mp4");
-		gf_term_get_url(term);
-		gf_term_get_simulation_frame_rate(term, &nb_drawn);
-
-		gf_term_get_text_selection(term, GF_TRUE);
-		gf_term_paste_text(term, "test", GF_TRUE);
-
-		gf_term_set_option(term, GF_OPT_AUDIO_MUTE, 1);
-
-
-		MakeScreenshot(GF_TRUE);
-
-		gf_term_scene_update(term, NULL, "REPLACE DYN_TRANS.translation BY 10 10");
-		gf_term_add_object(term, NULL, GF_TRUE);
-
-		gf_term_get_viewpoint(term, 1, &outName, &is_bound);
-		gf_term_set_viewpoint(term, 1, "testvp");
-
-		for (k=GF_NAVIGATE_WALK; k<=GF_NAVIGATE_VR; k++) {
-			gf_term_set_option(term, GF_OPT_NAVIGATION, k);
-			memset(&evt, 0, sizeof(GF_Event));
-			evt.type = GF_EVENT_MOUSEDOWN;
-			evt.mouse.x = 100;
-			evt.mouse.y = 100;
-			gf_term_user_event(term, &evt);
-			evt.type = GF_EVENT_MOUSEMOVE;
-			evt.mouse.x += 10;
-			gf_term_user_event(term, &evt);
-			evt.mouse.y += 10;
-			gf_term_user_event(term, &evt);
-
-			evt.type = GF_EVENT_KEYDOWN;
-			evt.key.key_code = GF_KEY_CONTROL;
-			gf_term_user_event(term, &evt);
-
-			evt.type = GF_EVENT_MOUSEMOVE;
-			evt.mouse.x = 120;
-			evt.mouse.y = 110;
-			gf_term_user_event(term, &evt);
-
-			evt.type = GF_EVENT_KEYUP;
-			evt.key.key_code = GF_KEY_CONTROL;
-			gf_term_user_event(term, &evt);
-
-			evt.type = GF_EVENT_KEYDOWN;
-			evt.key.key_code = GF_KEY_J;
-			gf_term_user_event(term, &evt);
-
-		}
-		gf_term_set_option(term, GF_OPT_NAVIGATION_TYPE, 0);
-
-		gf_term_connect_with_path(term, "logo.jpg", "./media/auxiliary_files/");
-		gf_term_navigate_to(term, "./media/auxiliary_files/logo.jpg");
-		send_open_url("./media/auxiliary_files/logo.jpg");
-		switch_bench(1);
-		do_set_speed(1.0);
-		hide_shell(0);
-		list_modules();
-	}
-#endif
-
-	i = gf_sys_clock();
-	gf_term_disconnect(term);
-	if (rti_file) UpdateRTInfo("Disconnected\n");
-
-	if (playlist) gf_fclose(playlist);
-
-#if defined(__DARWIN__) || defined(__APPLE__)
-	carbon_uninit();
-#endif
-
-	//special condition for immediate exit without terminal deletion
-	if (ret_val==3) {
-		fprintf(stderr, "Exit forced, no cleanup\n");
-		exit(0);
-	}
-
-	fprintf(stderr, "Deleting terminal... ");
-	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");
-
-	if (no_cfg_save)
-		gf_opts_discard_changes();
-
-	gf_sys_close();
-
-	if (rti_logs) gf_fclose(rti_logs);
-	if (logfile) gf_fclose(logfile);
-
-	if (gui_mode) {
-		hide_shell(2);
-	}
-
-#ifdef GPAC_MEMORY_TRACKING
-	if (mem_track && (gf_memory_size() || gf_file_handles_count() )) {
-	        gf_log_set_tool_level(GF_LOG_MEMORY, GF_LOG_INFO);
-		gf_memory_print();
-		return 2;
-	}
-#endif
-
-	return ret_val;
-}
-
-GF_MAIN_FUNC(mp4client_main)
-
-
-static void MakeScreenshot(Bool for_coverage)
-{
-	char szFileName100;
-	u32 nb_pass, nb_views, offscreen_view = 0;
-	GF_VideoSurface fb;
-	GF_Err e;
-	nb_pass = 1;
-	nb_views = gf_term_get_option(term, GF_OPT_NUM_STEREO_VIEWS);
-	if (nb_views>1) {
-		fprintf(stderr, "Auto-stereo mode detected - type number of view to dump (0 is main output, 1 to %d offscreen view, %d for all offscreen, %d for all offscreen and main)\n", nb_views, nb_views+1, nb_views+2);
-		if (!for_coverage) {
-			if (scanf("%d", &offscreen_view) != 1) {
-				offscreen_view = 0;
-			}
-		}
-		if (offscreen_view==nb_views+1) {
-			offscreen_view = 1;
-			nb_pass = nb_views;
-		}
-		else if (offscreen_view==nb_views+2) {
-			offscreen_view = 0;
-			nb_pass = nb_views+1;
-		}
-	}
-	if (for_coverage && !offscreen_view) {
-		if (gf_term_get_offscreen_buffer(term, &fb, 0, 0)==GF_OK)
-			gf_term_release_screen_buffer(term, &fb);
-	}
-	while (nb_pass) {
-		nb_pass--;
-		if (offscreen_view) {
-			sprintf(szFileName, "view%d_dump.png", offscreen_view);
-			e = gf_term_get_offscreen_buffer(term, &fb, offscreen_view-1, 0);
-		} else {
-			sprintf(szFileName, "gpac_video_dump_"LLU".png", gf_net_get_utc() );
-			e = gf_term_get_screen_buffer(term, &fb);
-		}
-		offscreen_view++;
-		if (e) {
-			fprintf(stderr, "Error dumping screen buffer %s\n", gf_error_to_string(e) );
-			nb_pass = 0;
-		} else {
-#ifndef GPAC_DISABLE_AV_PARSERS
-			u32 dst_size = fb.width*fb.height*4;
-			char *dst = (char*)gf_malloc(sizeof(char)*dst_size);
-
-			e = gf_img_png_enc(fb.video_buffer, fb.width, fb.height, fb.pitch_y, fb.pixel_format, dst, &dst_size);
-			if (e) {
-				fprintf(stderr, "Error encoding PNG %s\n", gf_error_to_string(e) );
-				nb_pass = 0;
-			} else {
-				FILE *png = gf_fopen(szFileName, "wb");
-				if (!png) {
-					fprintf(stderr, "Error writing file %s\n", szFileName);
-					nb_pass = 0;
-				} else {
-					gf_fwrite(dst, dst_size, png);
-					gf_fclose(png);
-					fprintf(stderr, "Dump to %s\n", szFileName);
-				}
-			}
-			if (dst) gf_free(dst);
-			gf_term_release_screen_buffer(term, &fb);
-
-			if (for_coverage) gf_file_delete(szFileName);
-#endif //GPAC_DISABLE_AV_PARSERS
-		}
-	}
-	fprintf(stderr, "Done: %s\n", szFileName);
-}
-
-static GF_ObjectManager *video_odm = NULL;
-static GF_ObjectManager *audio_odm = NULL;
-static GF_ObjectManager *scene_odm = NULL;
-static u32 last_odm_count = 0;
-
-static void PrintAVInfo(Bool final)
-{
-	GF_MediaInfo a_odi, v_odi, s_odi;
-	Double avg_dec_time;
-	u32 tot_time;
-
-	if (scene_odm) {
-		GF_ObjectManager *root_odm = gf_term_get_root_object(term);
-		u32 count = gf_term_get_object_count(term, root_odm);
-		if (last_odm_count != count) {
-			last_odm_count = count;
-			scene_odm = NULL;
-		}
-	}
-	if (!video_odm && !audio_odm && !scene_odm) {
-		u32 count, i;
-		GF_ObjectManager *root_odm = gf_term_get_root_object(term);
-		if (!root_odm) return;
-
-		if (gf_term_get_object_info(term, root_odm, &v_odi)==GF_OK) {
-			if (!scene_odm  && (v_odi.generated_scene== 0)) {
-				scene_odm = root_odm;
-			}
-		}
-
-		count = gf_term_get_object_count(term, root_odm);
-		for (i=0; i<count; i++) {
-			GF_ObjectManager *odm = gf_term_get_object(term, root_odm, i);
-			if (!odm) break;
-			if (gf_term_get_object_info(term, odm, &v_odi) == GF_OK) {
-				if (!video_odm && (v_odi.od_type == GF_STREAM_VISUAL) && (v_odi.raw_media || (v_odi.cb_max_count>1) || v_odi.direct_video_memory || (bench_mode == 3) )) {
-					video_odm = odm;
-				}
-				else if (!audio_odm && (v_odi.od_type == GF_STREAM_AUDIO)) {
-					audio_odm = odm;
-				}
-				else if (!scene_odm && (v_odi.od_type == GF_STREAM_SCENE)) {
-					scene_odm = odm;
-				}
-			}
-		}
-	}
-
-	if (0 && bench_buffer) {
-		fprintf(stderr, "Buffering %d %% ", bench_buffer-1);
-		return;
-	}
-
-	if (video_odm) {
-		if (gf_term_get_object_info(term, video_odm, &v_odi)!= GF_OK) {
-			video_odm = NULL;
-			return;
-		}
-	} else {
-		memset(&v_odi, 0, sizeof(v_odi));
-	}
-	if (audio_odm) {
-		gf_term_get_object_info(term, audio_odm, &a_odi);
-	} else {
-		memset(&a_odi, 0, sizeof(a_odi));
-	}
-	if (!video_odm && scene_odm) {
-		gf_term_get_object_info(term, scene_odm, &s_odi);
-	} else {
-		memset(&s_odi, 0, sizeof(s_odi));
-	}
-
-	if (final) {
-		tot_time = gf_sys_clock() - bench_mode_start;
-		fprintf(stderr, "                                                                                     \r");
-		fprintf(stderr, "************** Bench Mode Done in %d ms ********************\n", tot_time);
-		if (bench_mode==3) fprintf(stderr, "** Systems layer only (no decoding) **\n");
-
-		if (!video_odm) {
-			u32 nb_frames_drawn;
-			Double FPS = gf_term_get_simulation_frame_rate(term, &nb_frames_drawn);
-			fprintf(stderr, "Drawn %d frames FPS %.2f (simulation FPS %.2f) - duration %d ms\n", nb_frames_drawn, ((Float)nb_frames_drawn*1000)/tot_time,(Float) FPS, gf_term_get_time_in_ms(term)  );
-		}
-	}
-	if (video_odm) {
-		fprintf(stderr, "%s %dx%d sar=%d:%d duration %.2fs\n", v_odi.codec_name, v_odi.width, v_odi.height, v_odi.par ? (v_odi.par>>16)&0xFF : 1, v_odi.par ? (v_odi.par)&0xFF : 1, v_odi.duration);
-		if (final) {
-			u32 dec_run_time = v_odi.last_frame_time - v_odi.first_frame_time;
-			if (!dec_run_time) dec_run_time = 1;
-			if (v_odi.duration) fprintf(stderr, "%d%% ", (u32) (100*v_odi.current_time / v_odi.duration ) );
-			fprintf(stderr, "%d frames FPS %.2f (max %d us/f) rate avg %d max %d", v_odi.nb_dec_frames, ((Float)v_odi.nb_dec_frames*1000) / dec_run_time, v_odi.max_dec_time, (u32) v_odi.avg_bitrate/1000, (u32) v_odi.max_bitrate/1000);
-			if (v_odi.nb_dropped) {
-				fprintf(stderr, " (Error during bench: %d frames drop)", v_odi.nb_dropped);
-			}
-			fprintf(stderr, "\n");
-		}
-	}
-	if (audio_odm) {
-		fprintf(stderr, "%s SR %d num channels %d %s duration %.2fs\n", a_odi.codec_name, a_odi.sample_rate, a_odi.num_channels, gf_audio_fmt_name(a_odi.afmt), a_odi.duration);
-		if (final) {
-			u32 dec_run_time = a_odi.last_frame_time - a_odi.first_frame_time;
-			if (!dec_run_time) dec_run_time = 1;
-			if (a_odi.duration) fprintf(stderr, "%d%% ", (u32) (100*a_odi.current_time / a_odi.duration ) );
-			fprintf(stderr, "%d frames (ms/f %.2f avg %.2f max) rate avg %d max %d", a_odi.nb_dec_frames, ((Float)dec_run_time)/a_odi.nb_dec_frames, a_odi.max_dec_time/1000.0, (u32) a_odi.avg_bitrate/1000, (u32) a_odi.max_bitrate/1000);
-			if (a_odi.nb_dropped) {
-				fprintf(stderr, " (Error during bench: %d frames drop)", a_odi.nb_dropped);
-			}
-			fprintf(stderr, "\n");
-		}
-	}
-	if (scene_odm) {
-		u32 w, h;
-		gf_term_get_visual_output_size(term, &w, &h);
-		fprintf(stderr, "%s scene size %dx%d rastered to %dx%d duration %.2fs\n", s_odi.codec_name ? s_odi.codec_name : "", s_odi.width, s_odi.height, w, h, s_odi.duration);
-		if (final) {
-			if (s_odi.nb_dec_frames>2 && s_odi.total_dec_time) {
-				u32 dec_run_time = s_odi.last_frame_time - s_odi.first_frame_time;
-				if (!dec_run_time) dec_run_time = 1;
-				fprintf(stderr, "%d frames FPS %.2f (max %d us/f) rate avg %d max %d", s_odi.nb_dec_frames, ((Float)s_odi.nb_dec_frames*1000) / dec_run_time, s_odi.max_dec_time, (u32) s_odi.avg_bitrate/1000, (u32) s_odi.max_bitrate/1000);
-				fprintf(stderr, "\n");
-			} else {
-				u32 nb_frames_drawn;
-				Double FPS;
-				gf_term_get_simulation_frame_rate(term, &nb_frames_drawn);
-				tot_time = gf_sys_clock() - bench_mode_start;
-				FPS = gf_term_get_framerate(term, 0);
-				fprintf(stderr, "%d frames FPS %.2f (abs %.2f)\n", nb_frames_drawn, (1000.0*nb_frames_drawn / tot_time), FPS);
-			}
-
-			fprintf(stderr, "**********************************************************\n\n");
-			return;
-		}
-	}
-
-	if (video_odm) {
-		tot_time = v_odi.last_frame_time - v_odi.first_frame_time;
-		if (!tot_time) tot_time=1;
-		if (v_odi.duration) fprintf(stderr, "%d%% ", (u32) (100*v_odi.current_time / v_odi.duration ) );
-		fprintf(stderr, "%d f FPS %.2f (%.2f ms max) rate %d ", v_odi.nb_dec_frames, ((Float)v_odi.nb_dec_frames*1000) / tot_time, v_odi.max_dec_time/1000.0, (u32) v_odi.avg_bitrate/1000);
-	}
-	else if (scene_odm) {
-
-		if (s_odi.nb_dec_frames>2 && s_odi.total_dec_time) {
-			avg_dec_time = (Float) 1000000 * s_odi.nb_dec_frames;
-			avg_dec_time /= s_odi.total_dec_time;
-			if (s_odi.duration) fprintf(stderr, "%d%% ", (u32) (100*s_odi.current_time / s_odi.duration ) );
-			fprintf(stderr, "%d f %.2f (%d us max) - rate %d ", s_odi.nb_dec_frames, avg_dec_time, s_odi.max_dec_time, (u32) s_odi.avg_bitrate/1000);
-		} else {
-			u32 nb_frames_drawn;
-			Double FPS;
-			gf_term_get_simulation_frame_rate(term, &nb_frames_drawn);
-			tot_time = gf_sys_clock() - bench_mode_start;
-			FPS = gf_term_get_framerate(term, 1);
-			fprintf(stderr, "%d f FPS %.2f (abs %.2f) ", nb_frames_drawn, (1000.0*nb_frames_drawn / tot_time), FPS);
-		}
-	}
-	else if (audio_odm) {
-		gf_term_get_object_info(term, audio_odm, &a_odi);
-
-		tot_time = a_odi.last_frame_time - a_odi.first_frame_time;
-		if (!tot_time) tot_time=1;
-		if (a_odi.duration) fprintf(stderr, "%d%% ", (u32) (100*a_odi.current_time / a_odi.duration ) );
-		fprintf(stderr, "%d frames (ms/f %.2f avg %.2f max)", a_odi.nb_dec_frames, ((Float)tot_time)/a_odi.nb_dec_frames, a_odi.max_dec_time/1000.0);
-	}
-}
-
-static void PrintWorldInfo(GF_Terminal *term)
-{
-	u32 i;
-	const char *title;
-	GF_List *descs;
-	descs = gf_list_new();
-	title = gf_term_get_world_info(term, NULL, descs);
-	if (!title && !gf_list_count(descs)) {
-		fprintf(stderr, "No World Info available\n");
-	} else {
-		fprintf(stderr, "\t%s\n", title ? title : "No title available");
-		for (i=0; i<gf_list_count(descs); i++) {
-			char *str = gf_list_get(descs, i);
-			fprintf(stderr, "%s\n", str);
-		}
-	}
-	gf_list_del(descs);
-}
-
-static void PrintODList(GF_Terminal *term, GF_ObjectManager *root_odm, u32 num, u32 indent, char *root_name)
-{
-	GF_MediaInfo odi;
-	u32 i, count;
-	char szIndent50;
-
-	if (!root_odm) {
-		fprintf(stderr, "Currently loaded objects:\n");
-		root_odm = gf_term_get_root_object(term);
-	}
-	if (!root_odm) return;
-
-	count = gf_term_get_current_service_id(term);
-	if (count)
-		fprintf(stderr, "Current service ID %d\n", count);
-
-	if (gf_term_get_object_info(term, root_odm, &odi) != GF_OK) return;
-	if (!odi.ODID) {
-		fprintf(stderr, "Service not attached\n");
-		return;
-	}
-
-	for (i=0; i<indent; i++) szIndenti=' ';
-	szIndentindent=0;
-
-	fprintf(stderr, "%s", szIndent);
-	fprintf(stderr, "#%d %s - ", num, root_name);
-	if (odi.ServiceID) fprintf(stderr, "Service ID %d ", odi.ServiceID);
-	if (odi.media_url) {
-		fprintf(stderr, "%s\n", odi.media_url);
-	} else {
-		fprintf(stderr, "OD ID %d\n", odi.ODID);
-	}
-
-	szIndentindent=' ';
-	szIndentindent+1=0;
-	indent++;
-
-	count = gf_term_get_object_count(term, root_odm);
-	for (i=0; i<count; i++) {
-		GF_ObjectManager *odm = gf_term_get_object(term, root_odm, i);
-		if (!odm) break;
-		num++;
-		if (gf_term_get_object_info(term, odm, &odi) == GF_OK) {
-			switch (gf_term_object_subscene_type(term, odm)) {
-			case 1:
-				PrintODList(term, odm, num, indent, "Root");
-				break;
-			case 2:
-				PrintODList(term, odm, num, indent, "Inline Scene");
-				break;
-			case 3:
-				PrintODList(term, odm, num, indent, "EXTERNPROTO Library");
-				break;
-			default:
-				fprintf(stderr, "%s", szIndent);
-				fprintf(stderr, "#%d - ", num);
-				if (odi.media_url) {
-					fprintf(stderr, "%s", odi.media_url);
-				} else if (odi.service_url) {
-					fprintf(stderr, "%s", odi.service_url);
-				} else if (odi.remote_url) {
-					fprintf(stderr, "%s", odi.remote_url);
-				} else {
-					fprintf(stderr, "ID %d", odi.ODID);
-				}
-				fprintf(stderr, " - %s", (odi.od_type==GF_STREAM_VISUAL) ? "Video" : (odi.od_type==GF_STREAM_AUDIO) ? "Audio" : "Systems");
-				if (odi.ServiceID) fprintf(stderr, " - Service ID %d", odi.ServiceID);
-				fprintf(stderr, "\n");
-				break;
-			}
-		}
-	}
-}
-
-static void ViewOD(GF_Terminal *term, u32 OD_ID, u32 number, const char *szURL)
-{
-	GF_MediaInfo odi;
-	u32 i, count, d_enum, id;
-	GF_TermNetStats stats;
-	GF_Err e;
-	GF_ObjectManager *odm, *root_odm = gf_term_get_root_object(term);
-	if (!root_odm) return;
-
-	odm = NULL;
-	if (!szURL && ((!OD_ID && (number == (u32)-1)) || ((OD_ID == (u32)(-1)) && !number))) {
-		odm = root_odm;
-		if ((gf_term_get_object_info(term, odm, &odi) != GF_OK)) odm=NULL;
-	} else {
-		count = gf_term_get_object_count(term, root_odm);
-		for (i=0; i<count; i++) {
-			odm = gf_term_get_object(term, root_odm, i);
-			if (!odm) break;
-			if (gf_term_get_object_info(term, odm, &odi) == GF_OK) {
-				if (szURL && strstr(odi.service_url, szURL)) break;
-				if ((number == (u32)(-1)) && (odi.ODID == OD_ID)) break;
-				else if (i == (u32)(number-1)) break;
-			}
-			odm = NULL;
-		}
-	}
-	if (!odm) {
-		if (szURL) fprintf(stderr, "cannot find OD for URL %s\n", szURL);
-		if (number == (u32)-1) fprintf(stderr, "cannot find OD with ID %d\n", OD_ID);
-		else fprintf(stderr, "cannot find OD with number %d\n", number);
-		return;
-	}
-	if (!odi.ODID) {
-		if (number == (u32)-1) fprintf(stderr, "Object %d not attached yet\n", OD_ID);
-		else fprintf(stderr, "Object #%d not attached yet\n", number);
-		return;
-	}
-
-	fprintf(stderr, "Object Duration: ");
-	if (odi.duration) {
-		PrintTime((u32) (odi.duration*1000));
-	} else {
-		fprintf(stderr, "unknown");
-	}
-	fprintf(stderr, "\n");
-
-	fprintf(stderr, "Service Handler: %s\n", odi.service_handler);
-	fprintf(stderr, "Service URL: %s\n", odi.service_url);
-
-	if (odi.codec_name) {
-		Float avg_dec_time;
-		switch (odi.od_type) {
-		case GF_STREAM_VISUAL:
-			fprintf(stderr, "Video Object: Width %d - Height %d\r\n", odi.width, odi.height);
-			fprintf(stderr, "Media Codec: %s\n", odi.codec_name);
-			if (odi.par) fprintf(stderr, "Pixel Aspect Ratio: %d:%d\n", (odi.par>>16)&0xFF, (odi.par)&0xFF);
-			break;
-		case GF_STREAM_AUDIO:
-			fprintf(stderr, "Audio Object: Sample Rate %d - %d channels\r\n", odi.sample_rate, odi.num_channels);
-			fprintf(stderr, "Media Codec: %s\n", odi.codec_name);
-			break;
-		case GF_STREAM_SCENE:
-		case GF_STREAM_PRIVATE_SCENE:
-			if (odi.width && odi.height) {
-				fprintf(stderr, "Scene Description - Width %d - Height %d\n", odi.width, odi.height);
-			} else {
-				fprintf(stderr, "Scene Description - no size specified\n");
-			}
-			fprintf(stderr, "Scene Codec: %s\n", odi.codec_name);
-			break;
-		case GF_STREAM_TEXT:
-			if (odi.width && odi.height) {
-				fprintf(stderr, "Text Object: Width %d - Height %d\n", odi.width, odi.height);
-			} else {
-				fprintf(stderr, "Text Object: No size specified\n");
-			}
-			fprintf(stderr, "Text Codec %s\n", odi.codec_name);
-			break;
-		}
-
-		avg_dec_time = 0;
-		if (odi.nb_dec_frames) {
-			avg_dec_time = (Float) odi.total_dec_time;
-			avg_dec_time /= odi.nb_dec_frames;
-		}
-		fprintf(stderr, "\tBitrate over last second: %d kbps\n\tMax bitrate over one second: %d kbps\n\tAverage Decoding Time %.2f us %d max)\n\tTotal decoded frames %d\n",
-		        (u32) odi.avg_bitrate/1024, odi.max_bitrate/1024, avg_dec_time, odi.max_dec_time, odi.nb_dec_frames);
-	}
-	if (odi.protection) fprintf(stderr, "Encrypted Media scheme %s\n", gf_4cc_to_str(odi.protection) );
-
-	fprintf(stderr, "\nStream ID %d - %s - Clock ID %d\n", odi.pid_id, gf_stream_type_name(odi.od_type), odi.ocr_id);
-//	if (esd->dependsOnESID) fprintf(stderr, "\tDepends on Stream ID %d for decoding\n", esd->dependsOnESID);
-
-	if (odi.lang_code)
-		fprintf(stderr, "\tStream Language: %s\n", odi.lang_code);
-
-	fprintf(stderr, "\n");
-
-	switch (odi.status) {
-	case 0:
-		fprintf(stderr, "Stopped - ");
-		break;
-	case 1:
-		fprintf(stderr, "Playing - ");
-		break;
-	case 2:
-		fprintf(stderr, "Paused - ");
-		break;
-	case 3:
-		fprintf(stderr, "Not setup yet\n");
-		return;
-	default:
-		fprintf(stderr, "Setup Failed\n");
-		return;
-	}
-	if (odi.buffer>=0) fprintf(stderr, "Buffer: %d ms - ", odi.buffer);
-	else fprintf(stderr, "Not buffering - ");
-	fprintf(stderr, "Clock drift: %d ms\n", odi.clock_drift);
-	if (odi.db_unit_count) fprintf(stderr, "%d AU in DB\n", odi.db_unit_count);
-	if (odi.cb_max_count) fprintf(stderr, "Composition Buffer: %d CU (%d max)\n", odi.cb_unit_count, odi.cb_max_count);
-	fprintf(stderr, "\n");
-
-	if (odi.owns_service) {
-		const char *url;
-		u32 done, total, bps;
-		d_enum = 0;
-		while (gf_term_get_download_info(term, odm, &d_enum, &url, &done, &total, &bps)) {
-			if (d_enum==1) fprintf(stderr, "Current Downloads in service:\n");
-			if (done && total) {
-				fprintf(stderr, "%s: %d / %d bytes (%.2f %%) - %.2f kBps\n", url, done, total, (100.0f*done)/total, ((Float)bps)/1024.0f);
-			} else {
-				fprintf(stderr, "%s: %.2f kbps\n", url, ((Float)8*bps)/1024.0f);
-			}
-		}
-		if (!d_enum) fprintf(stderr, "No Downloads in service\n");
-		fprintf(stderr, "\n");
-	}
-
-	d_enum = 0;
-	while (gf_term_get_channel_net_info(term, odm, &d_enum, &id, &stats, &e)) {
-		if (e) continue;
-		if (!stats.bw_down && !stats.bw_up) continue;
-
-		fprintf(stderr, "Stream ID %d statistics:\n", id);
-		if (stats.multiplex_port) {
-			fprintf(stderr, "\tMultiplex Port %d - multiplex ID %d\n", stats.multiplex_port, stats.port);
-		} else {
-			fprintf(stderr, "\tPort %d\n", stats.port);
-		}
-		fprintf(stderr, "\tPacket Loss Percentage: %.4f\n", stats.pck_loss_percentage);
-		fprintf(stderr, "\tDown Bandwidth: %d bps\n", stats.bw_down);
-		if (stats.bw_up) fprintf(stderr, "\tUp Bandwidth: %d bps\n", stats.bw_up);
-		if (stats.ctrl_port) {
-			if (stats.multiplex_port) {
-				fprintf(stderr, "\tControl Multiplex Port: %d - Control Multiplex ID %d\n", stats.multiplex_port, stats.ctrl_port);
-			} else {
-				fprintf(stderr, "\tControl Port: %d\n", stats.ctrl_port);
-			}
-			fprintf(stderr, "\tDown Bandwidth: %d bps\n", stats.ctrl_bw_down);
-			fprintf(stderr, "\tUp Bandwidth: %d bps\n", stats.ctrl_bw_up);
-		}
-		fprintf(stderr, "\n");
-	}
-}
-
-static void PrintODTiming(GF_Terminal *term, GF_ObjectManager *odm, u32 indent)
-{
-	GF_MediaInfo odi;
-	u32 ind = indent;
-	u32 i, count;
-	if (!odm) return;
-
-	if (gf_term_get_object_info(term, odm, &odi) != GF_OK) return;
-	if (!odi.ODID) {
-		fprintf(stderr, "Service not attached\n");
-		return;
-	}
-	while (ind) {
-		fprintf(stderr, " ");
-		ind--;
-	}
-
-	if (! odi.generated_scene) {
-
-		fprintf(stderr, "- OD %d: ", odi.ODID);
-		switch (odi.status) {
-		case 1:
-			fprintf(stderr, "Playing - ");
-			break;
-		case 2:
-			fprintf(stderr, "Paused - ");
-			break;
-		default:
-			fprintf(stderr, "Stopped - ");
-			break;
-		}
-		if (odi.buffer>=0) fprintf(stderr, "Buffer: %d ms - ", odi.buffer);
-		else fprintf(stderr, "Not buffering - ");
-		fprintf(stderr, "Clock drift: %d ms", odi.clock_drift);
-		fprintf(stderr, " - time: ");
-		PrintTime((u32) (odi.current_time*1000));
-		fprintf(stderr, "\n");
-
-	} else {
-		fprintf(stderr, "+ Service %s:\n", odi.service_url);
-	}
-
-	count = gf_term_get_object_count(term, odm);
-	for (i=0; i<count; i++) {
-		GF_ObjectManager *an_odm = gf_term_get_object(term, odm, i);
-		PrintODTiming(term, an_odm, indent+1);
-	}
-	return;
-
-}
-
-static void PrintODBuffer(GF_Terminal *term, GF_ObjectManager *odm, u32 indent)
-{
-	Float avg_dec_time;
-	GF_MediaInfo odi;
-	u32 ind, i, count;
-	if (!odm) return;
-
-	if (gf_term_get_object_info(term, odm, &odi) != GF_OK) return;
-	if (!odi.ODID) {
-		fprintf(stderr, "Service not attached\n");
-		return;
-	}
-
-	ind = indent;
-	while (ind) {
-		fprintf(stderr, " ");
-		ind--;
-	}
-
-	if (odi.generated_scene) {
-		fprintf(stderr, "+ Service %s:\n", odi.service_url);
-	} else {
-		fprintf(stderr, "- OD %d: ", odi.ODID);
-		switch (odi.status) {
-		case 1:
-			fprintf(stderr, "Playing");
-			break;
-		case 2:
-			fprintf(stderr, "Paused");
-			break;
-		default:
-			fprintf(stderr, "Stopped");
-			break;
-		}
-		if (odi.buffer>=0) fprintf(stderr, " - Buffer: %d ms", odi.buffer);
-		if (odi.db_unit_count) fprintf(stderr, " - DB: %d AU", odi.db_unit_count);
-		if (odi.cb_max_count) fprintf(stderr, " - CB: %d/%d CUs", odi.cb_unit_count, odi.cb_max_count);
-
-		fprintf(stderr, "\n");
-		ind = indent;
-		while (ind) {
-			fprintf(stderr, " ");
-			ind--;
-		}
-
-		fprintf(stderr, " %d decoded frames - %d dropped frames\n", odi.nb_dec_frames, odi.nb_dropped);
-
-		ind = indent;
-		while (ind) {
-			fprintf(stderr, " ");
-			ind--;
-		}
-
-		avg_dec_time = 0;
-		if (odi.nb_dec_frames) {
-			avg_dec_time = (Float) odi.total_dec_time;
-			avg_dec_time /= odi.nb_dec_frames;
-		}
-		fprintf(stderr, " Avg Bitrate %d kbps (%d max) - Avg Decoding Time %.2f us (%d max)\n",
-		        (u32) odi.avg_bitrate/1024, odi.max_bitrate/1024, avg_dec_time, odi.max_dec_time);
-	}
-
-	count = gf_term_get_object_count(term, odm);
-	for (i=0; i<count; i++) {
-		GF_ObjectManager *an_odm = gf_term_get_object(term, odm, i);
-		PrintODBuffer(term, an_odm, indent+1);
-	}
-
-}
-
-static void ViewODs(GF_Terminal *term, Bool show_timing)
-{
-	GF_ObjectManager *root_odm = gf_term_get_root_object(term);
-	if (!root_odm) return;
-
-	if (show_timing) {
-		PrintODTiming(term, root_odm, 0);
-	} else {
-		PrintODBuffer(term, root_odm, 0);
-	}
-	fprintf(stderr, "\n");
-}

gpac-2.2.1.tar.gz/applications/deprecated/mp4client/mp4client.rc Deleted

@@ -1,72 +0,0 @@
-// Microsoft Visual C++ generated resource script.
-//
-#include "resource.h"
-
-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
-#include "windows.h"
-
-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
-
-/////////////////////////////////////////////////////////////////////////////
-// Français (France) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_FRA)
-#ifdef _WIN32
-LANGUAGE LANG_FRENCH, SUBLANG_FRENCH
-#pragma code_page(1252)
-#endif //_WIN32
-
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE 
-BEGIN
-    "resource.h\0"
-END
-
-2 TEXTINCLUDE 
-BEGIN
-    "#include ""windows.h""\r\n"
-    "\0"
-END
-
-3 TEXTINCLUDE 
-BEGIN
-    "\r\n"
-    "\0"
-END
-
-#endif    // APSTUDIO_INVOKED
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Icon
-//
-
-// Icon with lowest ID value placed first to ensure application icon
-// remains consistent on all systems.
-IDI_ICON3               ICON                    "..\\..\\share\\doc\\osmo4.ico"
-#endif    // Français (France) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-
-#ifndef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 3 resource.
-//
-
-
-/////////////////////////////////////////////////////////////////////////////
-#endif    // not APSTUDIO_INVOKED
-

gpac-2.2.1.tar.gz/applications/deprecated/mp4client/resource.h Deleted

gpac-2.2.1.tar.gz/applications/deprecated/old_arch Deleted

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/GPAX Deleted

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/GPAX/GPAX.cpp Deleted

@@ -1,76 +0,0 @@
-// GPAX.cpp : Implementation of DLL Exports.
-
-
-// Note: Proxy/Stub Information
-//      To build a separate proxy/stub DLL,
-//      run nmake -f GPAXps.mk in the project directory.
-
-#include "stdafx.h"
-#include "resource.h"
-#include <initguid.h>
-#include "GPAX.h"
-
-#include "GPAX_i.c"
-#include "GPAXPlugin.h"
-
-
-CComModule _Module;
-
-BEGIN_OBJECT_MAP(ObjectMap)
-OBJECT_ENTRY(CLSID_GPAX, CGPAXPlugin)
-END_OBJECT_MAP()
-
-/////////////////////////////////////////////////////////////////////////////
-// DLL Entry Point
-
-extern "C"
-#ifdef _WIN32_WCE
-BOOL WINAPI DllMain(HANDLE hInstance, DWORD dwReason, LPVOID /*lpReserved*/)
-#else
-BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD dwReason, LPVOID /*lpReserved*/)
-#endif
-{
-	if (dwReason == DLL_PROCESS_ATTACH)
-	{
-		_Module.Init(ObjectMap, (HINSTANCE) hInstance, &LIBID_GPAXLib);
-		DisableThreadLibraryCalls((HINSTANCE) hInstance);
-	}
-	else if (dwReason == DLL_PROCESS_DETACH)
-		_Module.Term();
-	return TRUE;    // ok
-}
-
-/////////////////////////////////////////////////////////////////////////////
-// Used to determine whether the DLL can be unloaded by OLE
-
-STDAPI DllCanUnloadNow(void)
-{
-	return (_Module.GetLockCount()==0) ? S_OK : S_FALSE;
-}
-
-/////////////////////////////////////////////////////////////////////////////
-// Returns a class factory to create an object of the requested type
-
-STDAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID* ppv)
-{
-	return _Module.GetClassObject(rclsid, riid, ppv);
-}
-
-/////////////////////////////////////////////////////////////////////////////
-// DllRegisterServer - Adds entries to the system registry
-
-STDAPI DllRegisterServer(void)
-{
-	// registers object, typelib and all interfaces in typelib
-	return _Module.RegisterServer(TRUE);
-}
-
-/////////////////////////////////////////////////////////////////////////////
-// DllUnregisterServer - Removes entries from the system registry
-
-STDAPI DllUnregisterServer(void)
-{
-	return _Module.UnregisterServer(TRUE);
-}
-
-

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/GPAX/GPAX.def Deleted

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/GPAX/GPAX.dsp Deleted

@@ -1,173 +0,0 @@
-# Microsoft Developer Studio Project File - Name="GPAX" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-
-CFG=GPAX - Win32 Release
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "GPAX.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "GPAX.mak" CFG="GPAX - Win32 Release"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "GPAX - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "GPAX - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "GPAX - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "obj/w32_deb"
-# PROP Intermediate_Dir "obj/w32_deb"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MTd /W3 /Gm /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /Yu"stdafx.h" /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /ZI /Od /I "../../include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /FR /Yu"stdafx.h" /FD /GZ /c
-# ADD BASE RSC /l 0x804 /d "_DEBUG"
-# ADD RSC /l 0x804 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 js32.lib zlib.lib winmm.lib ws2_32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /out:"../../bin/w32_deb/GPAX.dll" /pdbtype:sept /libpath:"../../extra_lib/lib/w32_deb"
-# Begin Custom Build - Performing registration
-OutDir=.\obj/w32_deb
-TargetPath=\CVS\gpac\bin\w32_deb\GPAX.dll
-InputPath=\CVS\gpac\bin\w32_deb\GPAX.dll
-SOURCE="$(InputPath)"
-
-"$(OutDir)\regsvr32.trg" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	regsvr32 /s /c "$(TargetPath)" 
-	echo regsvr32 exec. time > "$(OutDir)\regsvr32.trg" 
-	
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "GPAX - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "obj/w32_rel"
-# PROP BASE Intermediate_Dir "obj/w32_rel"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "obj/w32_rel"
-# PROP Intermediate_Dir "obj/w32_rel"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MDd /W3 /Gm /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /FR /Yu"stdafx.h" /FD /GZ /c
-# ADD CPP /nologo /MD /W3 /Gm /ZI /I "../../include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /FR /Yu"stdafx.h" /FD /GZ /c
-# SUBTRACT CPP /O<none>
-# ADD BASE RSC /l 0x804 /d "_DEBUG"
-# ADD RSC /l 0x804 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 js32.lib zlib.lib winmm.lib ws2_32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept /libpath:"../gpac/extra_lib/lib/w32_deb"
-# ADD LINK32 js32.lib zlib.lib winmm.lib ws2_32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /out:"../../bin/w32_rel/GPAX.dll" /pdbtype:sept /libpath:"../../extra_lib/lib/w32_rel"
-# Begin Special Build Tool
-SOURCE="$(InputPath)"
-PostBuild_Cmds=copy ..\..\bin\w32_rel\GPAX.dll "C:\Program Files\GPAC"
-# End Special Build Tool
-
-!ENDIF 
-
-# Begin Target
-
-# Name "GPAX - Win32 Debug"
-# Name "GPAX - Win32 Release"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=.\GPAX.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\GPAX.def
-# End Source File
-# Begin Source File
-
-SOURCE=.\GPAX.idl
-# ADD MTL /tlb ".\GPAX.tlb" /h "GPAX.h" /iid "GPAX_i.c" /Oicf
-# End Source File
-# Begin Source File
-
-SOURCE=.\GPAX.rc
-# End Source File
-# Begin Source File
-
-SOURCE=.\GPAXPlugin.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\StdAfx.cpp
-# ADD CPP /Yc"stdafx.h"
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=.\GPAXPlugin.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\Resource.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\StdAfx.h
-# End Source File
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# Begin Source File
-
-SOURCE=.\gpax.bmp
-# End Source File
-# Begin Source File
-
-SOURCE=.\GPAX.rgs
-# End Source File
-# Begin Source File
-
-SOURCE=.\GPAXProp.rgs
-# End Source File
-# End Group
-# End Target
-# End Project
-# Section GPAX : {00000000-0000-0000-0000-800000800000}
-# 	1:21:IDS_DOCSTRINGGPAXProp:105
-# 	1:12:IDD_GPAXPROP:107
-# 	1:12:IDR_GPAXPROP:106
-# 	1:20:IDS_HELPFILEGPAXProp:104
-# 	1:17:IDS_TITLEGPAXProp:103
-# End Section

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/GPAX/GPAX.h Deleted

@@ -1,570 +0,0 @@
-
-#pragma warning( disable: 4049 )  /* more than 64k source lines */
-
-/* this ALWAYS GENERATED file contains the definitions for the interfaces */
-
-
-/* File created by MIDL compiler version 5.03.0286 */
-/* at Thu Jul 20 19:14:15 2006
- */
-/* Compiler settings for \CVS\gpac\applications\GPAX\GPAX.idl:
-    Oicf (OptLev=i2), W1, Zp8, env=Win32 (32b run), ms_ext, c_ext
-    error checks: allocation ref bounds_check enum stub_data
-    VC __declspec() decoration level:
-         __declspec(uuid()), __declspec(selectany), __declspec(novtable)
-         DECLSPEC_UUID(), MIDL_INTERFACE()
-*/
-//@@MIDL_FILE_HEADING(  )
-
-
-/* verify that the <rpcndr.h> version is high enough to compile this file*/
-#ifndef __REQUIRED_RPCNDR_H_VERSION__
-#define __REQUIRED_RPCNDR_H_VERSION__ 440
-#endif
-
-#include "rpc.h"
-#include "rpcndr.h"
-
-#ifndef __GPAX_h__
-#define __GPAX_h__
-
-/* Forward Declarations */
-
-#ifndef __IGPAX_FWD_DEFINED__
-#define __IGPAX_FWD_DEFINED__
-typedef interface IGPAX IGPAX;
-#endif 	/* __IGPAX_FWD_DEFINED__ */
-
-
-#ifndef __IGPAXEvents_FWD_DEFINED__
-#define __IGPAXEvents_FWD_DEFINED__
-typedef interface IGPAXEvents IGPAXEvents;
-#endif 	/* __IGPAXEvents_FWD_DEFINED__ */
-
-
-#ifndef __GPAX_FWD_DEFINED__
-#define __GPAX_FWD_DEFINED__
-
-#ifdef __cplusplus
-typedef class GPAX GPAX;
-#else
-typedef struct GPAX GPAX;
-#endif /* __cplusplus */
-
-#endif 	/* __GPAX_FWD_DEFINED__ */
-
-
-/* header files for imported files */
-#include "oaidl.h"
-#include "ocidl.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-void __RPC_FAR * __RPC_USER MIDL_user_allocate(size_t);
-void __RPC_USER MIDL_user_free( void __RPC_FAR * );
-
-
-#ifndef __GPAXLib_LIBRARY_DEFINED__
-#define __GPAXLib_LIBRARY_DEFINED__
-
-/* library GPAXLib */
-/* helpstringversionuuid */
-
-
-
-#define	DISPID_SRC	( 100 )
-
-#define	DISPID_AutoStart	( 101 )
-
-#define	DISPID_DownloadProgress	( 102 )
-
-#define	DISPID_PlayEvent	( 100 )
-
-#define	DISPID_PauseEvent	( 101 )
-
-#define	DISPID_StopEvent	( 102 )
-
-
-EXTERN_C const IID LIBID_GPAXLib;
-
-#ifndef __IGPAX_INTERFACE_DEFINED__
-#define __IGPAX_INTERFACE_DEFINED__
-
-/* interface IGPAX */
-/* objectoleautomationhiddendualhelpstringuuid */
-
-
-EXTERN_C const IID IID_IGPAX;
-
-#if defined(__cplusplus) && !defined(CINTERFACE)
-
-MIDL_INTERFACE("E2A9A937-BB35-47E0-8942-964806299AB4")
-IGPAX :
-public IDispatch
-{
-public:
-	virtual /* helpstring */ HRESULT STDMETHODCALLTYPE Play( void) = 0;
-
-	virtual /* helpstring */ HRESULT STDMETHODCALLTYPE Pause( void) = 0;
-
-	virtual /* helpstring */ HRESULT STDMETHODCALLTYPE Stop( void) = 0;
-
-	virtual /* helpstring */ HRESULT STDMETHODCALLTYPE Update(
-	    /* in */ BSTR mtype,
-	    /* in */ BSTR updates) = 0;
-
-	virtual /* helpstring */ HRESULT STDMETHODCALLTYPE QualitySwitch(
-	    /* in */ INT switchUp) = 0;
-
-	virtual /* helpstring */ HRESULT STDMETHODCALLTYPE SetURL(
-	    /* in */ BSTR url) = 0;
-
-	virtual /* helpstringpropgetid */ HRESULT STDMETHODCALLTYPE get_src(
-	    /* retvalout */ BSTR __RPC_FAR *url) = 0;
-
-	virtual /* helpstringpropputid */ HRESULT STDMETHODCALLTYPE put_src(
-	    /* in */ BSTR url) = 0;
-
-	virtual /* helpstringpropgetid */ HRESULT STDMETHODCALLTYPE get_AutoStart(
-	    /* retvalout */ VARIANT_BOOL __RPC_FAR *autoplay) = 0;
-
-	virtual /* helpstringpropputid */ HRESULT STDMETHODCALLTYPE put_AutoStart(
-	    /* in */ VARIANT_BOOL autoplay) = 0;
-
-	virtual /* helpstringpropgetid */ HRESULT STDMETHODCALLTYPE get_DownloadProgress(
-	    /* retvalout */ INT __RPC_FAR *downloadProgress) = 0;
-
-	virtual /* helpstringpropputid */ HRESULT STDMETHODCALLTYPE put_DownloadProgress(
-	    /* in */ INT downloadProgress) = 0;
-
-};
-
-#else 	/* C style interface */
-
-typedef struct IGPAXVtbl
-{
-	BEGIN_INTERFACE
-
-	HRESULT ( STDMETHODCALLTYPE __RPC_FAR *QueryInterface )(
-	    IGPAX __RPC_FAR * This,
-	    /* in */ REFIID riid,
-	    /* iid_isout */ void __RPC_FAR *__RPC_FAR *ppvObject);
-
-	ULONG ( STDMETHODCALLTYPE __RPC_FAR *AddRef )(
-	    IGPAX __RPC_FAR * This);
-
-	ULONG ( STDMETHODCALLTYPE __RPC_FAR *Release )(
-	    IGPAX __RPC_FAR * This);
-
-	HRESULT ( STDMETHODCALLTYPE __RPC_FAR *GetTypeInfoCount )(
-	    IGPAX __RPC_FAR * This,
-	    /* out */ UINT __RPC_FAR *pctinfo);
-
-	HRESULT ( STDMETHODCALLTYPE __RPC_FAR *GetTypeInfo )(
-	    IGPAX __RPC_FAR * This,
-	    /* in */ UINT iTInfo,
-	    /* in */ LCID lcid,
-	    /* out */ ITypeInfo __RPC_FAR *__RPC_FAR *ppTInfo);
-
-	HRESULT ( STDMETHODCALLTYPE __RPC_FAR *GetIDsOfNames )(
-	    IGPAX __RPC_FAR * This,
-	    /* in */ REFIID riid,
-	    /* size_isin */ LPOLESTR __RPC_FAR *rgszNames,
-	    /* in */ UINT cNames,
-	    /* in */ LCID lcid,
-	    /* size_isout */ DISPID __RPC_FAR *rgDispId);
-
-	/* local */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *Invoke )(
-	    IGPAX __RPC_FAR * This,
-	    /* in */ DISPID dispIdMember,
-	    /* in */ REFIID riid,
-	    /* in */ LCID lcid,
-	    /* in */ WORD wFlags,
-	    /* outin */ DISPPARAMS __RPC_FAR *pDispParams,
-	    /* out */ VARIANT __RPC_FAR *pVarResult,
-	    /* out */ EXCEPINFO __RPC_FAR *pExcepInfo,
-	    /* out */ UINT __RPC_FAR *puArgErr);
-
-	/* helpstring */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *Play )(
-	    IGPAX __RPC_FAR * This);
-
-	/* helpstring */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *Pause )(
-	    IGPAX __RPC_FAR * This);
-
-	/* helpstring */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *Stop )(
-	    IGPAX __RPC_FAR * This);
-
-	/* helpstring */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *Update )(
-	    IGPAX __RPC_FAR * This,
-	    /* in */ BSTR mtype,
-	    /* in */ BSTR updates);
-
-	/* helpstring */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *QualitySwitch )(
-	    IGPAX __RPC_FAR * This,
-	    /* in */ INT switchUp);
-
-	/* helpstring */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *SetURL )(
-	    IGPAX __RPC_FAR * This,
-	    /* in */ BSTR url);
-
-	/* helpstringpropgetid */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *get_src )(
-	    IGPAX __RPC_FAR * This,
-	    /* retvalout */ BSTR __RPC_FAR *url);
-
-	/* helpstringpropputid */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *put_src )(
-	    IGPAX __RPC_FAR * This,
-	    /* in */ BSTR url);
-
-	/* helpstringpropgetid */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *get_AutoStart )(
-	    IGPAX __RPC_FAR * This,
-	    /* retvalout */ VARIANT_BOOL __RPC_FAR *autoplay);
-
-	/* helpstringpropputid */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *put_AutoStart )(
-	    IGPAX __RPC_FAR * This,
-	    /* in */ VARIANT_BOOL autoplay);
-
-	END_INTERFACE
-} IGPAXVtbl;
-
-interface IGPAX
-{
-	CONST_VTBL struct IGPAXVtbl __RPC_FAR *lpVtbl;
-};
-
-
-
-#ifdef COBJMACROS
-
-
-#define IGPAX_QueryInterface(This,riid,ppvObject)	\
-    (This)->lpVtbl -> QueryInterface(This,riid,ppvObject)
-
-#define IGPAX_AddRef(This)	\
-    (This)->lpVtbl -> AddRef(This)
-
-#define IGPAX_Release(This)	\
-    (This)->lpVtbl -> Release(This)
-
-
-#define IGPAX_GetTypeInfoCount(This,pctinfo)	\
-    (This)->lpVtbl -> GetTypeInfoCount(This,pctinfo)
-
-#define IGPAX_GetTypeInfo(This,iTInfo,lcid,ppTInfo)	\
-    (This)->lpVtbl -> GetTypeInfo(This,iTInfo,lcid,ppTInfo)
-
-#define IGPAX_GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId)	\
-    (This)->lpVtbl -> GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId)
-
-#define IGPAX_Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr)	\
-    (This)->lpVtbl -> Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr)
-
-
-#define IGPAX_Play(This)	\
-    (This)->lpVtbl -> Play(This)
-
-#define IGPAX_Pause(This)	\
-    (This)->lpVtbl -> Pause(This)
-
-#define IGPAX_Stop(This)	\
-    (This)->lpVtbl -> Stop(This)
-
-#define IGPAX_Update(This,mtype,updates)	\
-    (This)->lpVtbl -> Update(This,mtype,updates)
-
-#define IGPAX_QualitySwitch(This,switchUp)	\
-    (This)->lpVtbl -> QualitySwitch(This,switchUp)
-
-#define IGPAX_SetURL(This,url)	\
-    (This)->lpVtbl -> SetURL(This,url)
-
-#define IGPAX_get_src(This,url)	\
-    (This)->lpVtbl -> get_src(This,url)
-
-#define IGPAX_put_src(This,url)	\
-    (This)->lpVtbl -> put_src(This,url)
-
-#define IGPAX_get_AutoStart(This,autoplay)	\
-    (This)->lpVtbl -> get_AutoStart(This,autoplay)
-
-#define IGPAX_put_AutoStart(This,autoplay)	\
-    (This)->lpVtbl -> put_AutoStart(This,autoplay)
-
-#endif /* COBJMACROS */
-
-
-#endif 	/* C style interface */
-
-
-
-/* helpstring */ HRESULT STDMETHODCALLTYPE IGPAX_Play_Proxy(
-    IGPAX __RPC_FAR * This);
-
-
-void __RPC_STUB IGPAX_Play_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* helpstring */ HRESULT STDMETHODCALLTYPE IGPAX_Pause_Proxy(
-    IGPAX __RPC_FAR * This);
-
-
-void __RPC_STUB IGPAX_Pause_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* helpstring */ HRESULT STDMETHODCALLTYPE IGPAX_Stop_Proxy(
-    IGPAX __RPC_FAR * This);
-
-
-void __RPC_STUB IGPAX_Stop_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* helpstring */ HRESULT STDMETHODCALLTYPE IGPAX_Update_Proxy(
-    IGPAX __RPC_FAR * This,
-    /* in */ BSTR mtype,
-    /* in */ BSTR updates);
-
-
-void __RPC_STUB IGPAX_Update_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-/* helpstring */ HRESULT STDMETHODCALLTYPE IGPAX_QualitySwitch_Proxy(
-    IGPAX __RPC_FAR * This,
-    /* in */ INT switchUp);
-
-
-void __RPC_STUB IGPAX_QualitySwitch_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-/* helpstring */ HRESULT STDMETHODCALLTYPE IGPAX_SetURL_Proxy(
-    IGPAX __RPC_FAR * This,
-    /* in */ BSTR url);
-
-
-void __RPC_STUB IGPAX_SetURL_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* helpstringpropgetid */ HRESULT STDMETHODCALLTYPE IGPAX_get_src_Proxy(
-    IGPAX __RPC_FAR * This,
-    /* retvalout */ BSTR __RPC_FAR *url);
-
-
-void __RPC_STUB IGPAX_get_src_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* helpstringpropputid */ HRESULT STDMETHODCALLTYPE IGPAX_put_src_Proxy(
-    IGPAX __RPC_FAR * This,
-    /* in */ BSTR url);
-
-
-void __RPC_STUB IGPAX_put_src_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* helpstringpropgetid */ HRESULT STDMETHODCALLTYPE IGPAX_get_AutoStart_Proxy(
-    IGPAX __RPC_FAR * This,
-    /* retvalout */ VARIANT_BOOL __RPC_FAR *autoplay);
-
-
-void __RPC_STUB IGPAX_get_AutoStart_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* helpstringpropputid */ HRESULT STDMETHODCALLTYPE IGPAX_put_AutoStart_Proxy(
-    IGPAX __RPC_FAR * This,
-    /* in */ VARIANT_BOOL autoplay);
-
-
-void __RPC_STUB IGPAX_put_AutoStart_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-/* helpstringpropgetid */ HRESULT STDMETHODCALLTYPE IGPAX_get_DownloadProgress_Proxy(
-    IGPAX __RPC_FAR * This,
-    /* retvalout */ INT __RPC_FAR *autoplay);
-
-
-void __RPC_STUB IGPAX_get_DownloadProgress_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-/* helpstringpropputid */ HRESULT STDMETHODCALLTYPE IGPAX_put_DownloadProgress_Proxy(
-    IGPAX __RPC_FAR * This,
-    /* in */ INT autoplay);
-
-
-void __RPC_STUB IGPAX_put_DownloadProgress_Stub(
-    IRpcStubBuffer *This,
-    IRpcChannelBuffer *_pRpcChannelBuffer,
-    PRPC_MESSAGE _pRpcMessage,
-    DWORD *_pdwStubPhase);
-
-
-
-#endif 	/* __IGPAX_INTERFACE_DEFINED__ */
-
-
-#ifndef __IGPAXEvents_DISPINTERFACE_DEFINED__
-#define __IGPAXEvents_DISPINTERFACE_DEFINED__
-
-/* dispinterface IGPAXEvents */
-/* helpstringuuid */
-
-
-EXTERN_C const IID DIID_IGPAXEvents;
-
-#if defined(__cplusplus) && !defined(CINTERFACE)
-
-MIDL_INTERFACE("1FDA32FC-4C9A-461F-B33B-0715B0343006")
-IGPAXEvents :
-public IDispatch
-{
-};
-
-#else 	/* C style interface */
-
-typedef struct IGPAXEventsVtbl
-{
-	BEGIN_INTERFACE
-
-	HRESULT ( STDMETHODCALLTYPE __RPC_FAR *QueryInterface )(
-	    IGPAXEvents __RPC_FAR * This,
-	    /* in */ REFIID riid,
-	    /* iid_isout */ void __RPC_FAR *__RPC_FAR *ppvObject);
-
-	ULONG ( STDMETHODCALLTYPE __RPC_FAR *AddRef )(
-	    IGPAXEvents __RPC_FAR * This);
-
-	ULONG ( STDMETHODCALLTYPE __RPC_FAR *Release )(
-	    IGPAXEvents __RPC_FAR * This);
-
-	HRESULT ( STDMETHODCALLTYPE __RPC_FAR *GetTypeInfoCount )(
-	    IGPAXEvents __RPC_FAR * This,
-	    /* out */ UINT __RPC_FAR *pctinfo);
-
-	HRESULT ( STDMETHODCALLTYPE __RPC_FAR *GetTypeInfo )(
-	    IGPAXEvents __RPC_FAR * This,
-	    /* in */ UINT iTInfo,
-	    /* in */ LCID lcid,
-	    /* out */ ITypeInfo __RPC_FAR *__RPC_FAR *ppTInfo);
-
-	HRESULT ( STDMETHODCALLTYPE __RPC_FAR *GetIDsOfNames )(
-	    IGPAXEvents __RPC_FAR * This,
-	    /* in */ REFIID riid,
-	    /* size_isin */ LPOLESTR __RPC_FAR *rgszNames,
-	    /* in */ UINT cNames,
-	    /* in */ LCID lcid,
-	    /* size_isout */ DISPID __RPC_FAR *rgDispId);
-
-	/* local */ HRESULT ( STDMETHODCALLTYPE __RPC_FAR *Invoke )(
-	    IGPAXEvents __RPC_FAR * This,
-	    /* in */ DISPID dispIdMember,
-	    /* in */ REFIID riid,
-	    /* in */ LCID lcid,
-	    /* in */ WORD wFlags,
-	    /* outin */ DISPPARAMS __RPC_FAR *pDispParams,
-	    /* out */ VARIANT __RPC_FAR *pVarResult,
-	    /* out */ EXCEPINFO __RPC_FAR *pExcepInfo,
-	    /* out */ UINT __RPC_FAR *puArgErr);
-
-	END_INTERFACE
-} IGPAXEventsVtbl;
-
-interface IGPAXEvents
-{
-	CONST_VTBL struct IGPAXEventsVtbl __RPC_FAR *lpVtbl;
-};
-
-
-
-#ifdef COBJMACROS
-
-
-#define IGPAXEvents_QueryInterface(This,riid,ppvObject)	\
-    (This)->lpVtbl -> QueryInterface(This,riid,ppvObject)
-
-#define IGPAXEvents_AddRef(This)	\
-    (This)->lpVtbl -> AddRef(This)
-
-#define IGPAXEvents_Release(This)	\
-    (This)->lpVtbl -> Release(This)
-
-
-#define IGPAXEvents_GetTypeInfoCount(This,pctinfo)	\
-    (This)->lpVtbl -> GetTypeInfoCount(This,pctinfo)
-
-#define IGPAXEvents_GetTypeInfo(This,iTInfo,lcid,ppTInfo)	\
-    (This)->lpVtbl -> GetTypeInfo(This,iTInfo,lcid,ppTInfo)
-
-#define IGPAXEvents_GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId)	\
-    (This)->lpVtbl -> GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId)
-
-#define IGPAXEvents_Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr)	\
-    (This)->lpVtbl -> Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr)
-
-#endif /* COBJMACROS */
-
-
-#endif 	/* C style interface */
-
-
-#endif 	/* __IGPAXEvents_DISPINTERFACE_DEFINED__ */
-
-
-EXTERN_C const CLSID CLSID_GPAX;
-
-#ifdef __cplusplus
-
-class DECLSPEC_UUID("181D18E6-4DC1-4B55-B72E-BE2A10064995")
-	GPAX;
-#endif
-#endif /* __GPAXLib_LIBRARY_DEFINED__ */
-
-/* Additional Prototypes for ALL interfaces */
-
-/* end of Additional Prototypes */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-
-

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/GPAX/GPAX.idl Deleted

@@ -1,92 +0,0 @@
-// GPAX.idl : IDL source for GPAX.dll
-//
-
-// This file will be processed by the MIDL tool to
-// produce the type library (GPAX.tlb) and marshalling code.
-
-import "oaidl.idl";
-import "ocidl.idl";
-#include "olectl.h"
-	
-
-
-	uuid(E64FAC7F-0134-4A75-A7DA-80D53EBC56A6),
-	version(1.0),
-	helpstring("GPAX ActiveX Control")
-
-
-library GPAXLib
-{
-	importlib("stdole2.tlb");
-
-    // Forward declare all types defined in this typelib
-    interface IGPAX;
-    dispinterface IGPAXEvents;
-
-    const int DISPID_SRC				= 100;
-    const int DISPID_AutoStart			= 101;
-	const int DISPID_DownloadProgress	= 102;
-
-
-	//IDispatch interface
-	
-		odl,
-		uuid(E2A9A937-BB35-47E0-8942-964806299AB4),
-		helpstring("GPAC ActiveX Control"),
-		dual,
-		hidden,
-		oleautomation
-	
-	interface IGPAX : IDispatch
-	{
-		/*functions*/
-		helpstring("Play Movie") HRESULT Play();
-		helpstring("Pause/Resume Movie") HRESULT Pause();
-		helpstring("Stop Movie") HRESULT Stop();
-		helpstring("Update Scene") HRESULT Update(in BSTR mtype, in BSTR updates);
-		helpstring("Switch Quality") HRESULT QualitySwitch (in int switch_up);
-		helpstring("Change URL") HRESULT SetURL (in BSTR url);
-
-
-		/*properties*/
-        id(DISPID_SRC), propget, helpstring("Get/Set the media source")
-        HRESULT src(out, retval BSTR* url);
-        id(DISPID_SRC), propput, helpstring("Get/Set the media source")
-        HRESULT src(in BSTR url);
-
-        id(DISPID_AutoStart), propget, helpstring("Get/Set automatic playback upon load")
-        HRESULT AutoStart(out, retval VARIANT_BOOL* autoplay);
-        id(DISPID_AutoStart), propput, helpstring("Get/Set automatic playback upon load")
-        HRESULT AutoStart(in VARIANT_BOOL autoplay);
-
-		id(DISPID_DownloadProgress), propget, helpstring("Get/Set download progress")
-        HRESULT DownloadProgress(out, retval INT* downloadProgress);
-        id(DISPID_DownloadProgress), propput, helpstring("Get/Set download progress")
-        HRESULT DownloadProgress(in INT downloadProgress);
-	};
-
-
-	//event interface
-	
-		uuid(1FDA32FC-4C9A-461F-B33B-0715B0343006),
-		helpstring("GPAX Control Events")
-	
-	dispinterface IGPAXEvents
-	{
-		properties:
-		methods:
-	};
-
-
-	//AX control
-	
-		uuid(181D18E6-4DC1-4B55-B72E-BE2A10064995),
-		helpstring("GPAC Control"),
-		control
-	
-	coclass GPAX
-	{
-		default interface IGPAX;
-		default, source dispinterface IGPAXEvents;
-	};
-};

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/GPAX/GPAX.rc Deleted

@@ -1,151 +0,0 @@
-//Microsoft Developer Studio generated resource script.
-//
-#include "resource.h"
-
-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
-#include "winres.h"
-
-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
-
-#include <gpac/version.h>
-
-/////////////////////////////////////////////////////////////////////////////
-// Chinese (P.R.C.) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_CHS)
-#ifdef _WIN32
-LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED
-#pragma code_page(936)
-#endif //_WIN32
-
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE DISCARDABLE 
-BEGIN
-    "resource.h\0"
-END
-
-2 TEXTINCLUDE DISCARDABLE 
-BEGIN
-    "#include ""winres.h""\r\n"
-    "\0"
-END
-
-3 TEXTINCLUDE DISCARDABLE 
-BEGIN
-    "1 TYPELIB ""GPAX.tlb""\r\n"
-    "\0"
-END
-
-#endif    // APSTUDIO_INVOKED
-
-#endif    // Chinese (P.R.C.) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-/////////////////////////////////////////////////////////////////////////////
-// English (U.S.) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-#ifdef _WIN32
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-#pragma code_page(1252)
-#endif //_WIN32
-
-#ifndef _MAC
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,0,0,1
- PRODUCTVERSION 1,0,0,1
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x4L
- FILETYPE 0x2L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904b0"
-        BEGIN
-            VALUE "Comments", "\0"
-            VALUE "CompanyName", "ENST\0"
-            VALUE "FileDescription", "GPAX\0"
-            VALUE "FileVersion", GPAC_VERSION"\0"
-            VALUE "InternalName", "GPAX\0"
-            VALUE "LegalCopyright", "Copyright © 2012-\0"
-            VALUE "LegalTrademarks", "\0"
-            VALUE "OriginalFilename", "GPAX.dll\0"
-            VALUE "PrivateBuild", "\0"
-            VALUE "ProductName", "Telecom ParisTech GPAX\0"
-            VALUE "ProductVersion", GPAC_VERSION"\0"
-            VALUE "SpecialBuild", "\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END
-
-#endif    // !_MAC
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Bitmap
-//
-
-IDB_GPAXPLUGIN          BITMAP  DISCARDABLE     "gpax.bmp"
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// REGISTRY
-//
-
-IDR_GPAXPLUGIN          REGISTRY DISCARDABLE    "GPAX.rgs"
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// String Table
-//
-
-STRINGTABLE DISCARDABLE 
-BEGIN
-    IDS_PROJNAME            "GPAX"
-    IDS_TITLEGPAXProp       "&GPAX"
-    IDS_HELPFILEGPAXProp    "Help File Name"
-    IDS_DOCSTRINGGPAXProp   "URLs setting"
-END
-
-#endif    // English (U.S.) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-
-#ifndef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 3 resource.
-//
-1 TYPELIB "GPAX.tlb"
-
-/////////////////////////////////////////////////////////////////////////////
-#endif    // not APSTUDIO_INVOKED
-

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/GPAX/GPAX.rgs Deleted

@@ -1,175 +0,0 @@
-HKCR
-{
-	ForceRemove '.aac'
-	{
-		val 'Content Type' = s 'audio/aac'
-	}
-	ForceRemove '.amr'
-	{
-		val 'Content Type' = s 'audio/amr'
-	}
-	ForceRemove '.mp4'
-	{
-		val 'Content Type' = s 'application/mp4'
-	}
-	ForceRemove '.3gp'
-	{
-		val 'Content Type' = s 'video/3gpp'
-	}
-	ForceRemove '.3g2'
-	{
-		val 'Content Type' = s 'video/3gpp2'
-	}
-	ForceRemove '.wrl'
-	{
-		val 'Content Type' = s 'model/vrml'
-	}
-	ForceRemove '.x3dv'
-	{
-		val 'Content Type' = s 'model/x3d+vrml'
-	}
-	ForceRemove '.x3d'
-	{
-		val 'Content Type' = s 'model/x3d+xml'
-	}
-	ForceRemove '.svg'
-	{
-		val 'Content Type' = s 'image/svg+xml'
-	}
-	ForceRemove '.sdp'
-	{
-		val 'Content Type' = s 'application/sdp'
-	}
-	
-	GPAX.GPAXPlugin.1 = s 'GPAC ActiveX'
-	{
-		CLSID = s '{181D18E6-4DC1-4B55-B72E-BE2A10064995}'
-	}
-	GPAX.GPAXPlugin = s 'GPAC ActiveX'
-	{
-		CLSID = s '{181D18E6-4DC1-4B55-B72E-BE2A10064995}'
-		CurVer = s 'GPAX.GPAXPlugin.1'
-	}
-	NoRemove CLSID
-	{
-		ForceRemove {181D18E6-4DC1-4B55-B72E-BE2A10064995} = s 'GPAC ActiveX'
-		{
-			ProgID = s 'GPAX.GPAXPlugin.1'
-			VersionIndependentProgID = s 'GPAX.GPAXPlugin'
-			ForceRemove 'Programmable'
-			InprocServer32 = s '%MODULE%'
-			{
-				val ThreadingModel = s 'Both'
-			}
-			ForceRemove 'Control'
-			ForceRemove 'Insertable'
-			ForceRemove 'ToolboxBitmap32' = s '%MODULE%, 101'
-			'MiscStatus' = s '0'
-			{
-			    '1' = s '131473'
-			}
-			'TypeLib' = s '{E64FAC7F-0134-4A75-A7DA-80D53EBC56A6}'
-			'Version' = s '1.0'
-	         ForceRemove 'EnableFullPage'
-		     {
-				ForceRemove .mp4
-				ForceRemove .3gp
-				ForceRemove .3g2
-				ForceRemove .wrl
-				ForceRemove .x3d
-				ForceRemove .x3dv
-				ForceRemove .svg
-	         }
-		}
-	}
-
-	NoRemove MIME
-	{
-		NoRemove Database
-		{
-			NoRemove 'Content Type'
-			{
-				'application/x-gpac'
-				{
-					val CLSID = s '{181D18E6-4DC1-4B55-B72E-BE2A10064995}'
-					val Extension = s '.gpac'
-				}
-				'application/mp4'
-				{
-					val CLSID = s '{181D18E6-4DC1-4B55-B72E-BE2A10064995}'
-					val Extension = s '.mp4'
-				}
-				'application/sdp'
-				{
-					val CLSID = s '{181D18E6-4DC1-4B55-B72E-BE2A10064995}'
-					val Extension = s '.sdp'
-				}
-				'audio/aac'
-				{
-					val CLSID = s '{181D18E6-4DC1-4B55-B72E-BE2A10064995}'
-					val Extension = s '.aac'
-				}
-				'audio/amr'
-				{
-					val CLSID = s '{181D18E6-4DC1-4B55-B72E-BE2A10064995}'
-					val Extension = s '.amr'
-				}
-				'audio/mp4'
-				{
-					val CLSID = s '{181D18E6-4DC1-4B55-B72E-BE2A10064995}'
-					val Extension = s '.mp4'
-				}
-				'audio/mpeg'
-				{
-					val CLSID = s '{181D18E6-4DC1-4B55-B72E-BE2A10064995}'
-					val Extension = s '.mp3'
-				}
-				'image/svg+xml'
-				{
-					val CLSID = s '{181D18E6-4DC1-4B55-B72E-BE2A10064995}'
-					val Extension = s '.svg'
-				}
-				'model/vrml'
-				{
-					val CLSID = s '{181D18E6-4DC1-4B55-B72E-BE2A10064995}'
-					val Extension = s '.wrl'
-				}
-				'model/x3d+vrml'
-				{
-					val CLSID = s '{181D18E6-4DC1-4B55-B72E-BE2A10064995}'
-					val Extension = s '.x3dv'
-				}
-				'model/x3d+xml'
-				{
-					val CLSID = s '{181D18E6-4DC1-4B55-B72E-BE2A10064995}'
-					val Extension = s '.x3d'
-				}
-				'video/mp4'
-				{
-					val CLSID = s '{181D18E6-4DC1-4B55-B72E-BE2A10064995}'
-					val Extension = s '.mp4'
-				}
-				'video/3gpp'
-				{
-					val CLSID = s '{181D18E6-4DC1-4B55-B72E-BE2A10064995}'
-					val Extension = s '.3gp'
-				}
-				'video/3gpp2'
-				{
-					val CLSID = s '{181D18E6-4DC1-4B55-B72E-BE2A10064995}'
-					val Extension = s '.3g2'
-				}
-				'video/avi'
-				{
-					val CLSID = s '{181D18E6-4DC1-4B55-B72E-BE2A10064995}'
-					val Extension = s '.avi'
-				}
-				'video/mpeg'
-				{
-					val CLSID = s '{181D18E6-4DC1-4B55-B72E-BE2A10064995}'
-					val Extension = s '.mpg'
-				}
-			}
-		}
-	}
-}

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/GPAX/GPAX.vcxproj Deleted

@@ -1,376 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="14.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>{72486240-A124-496E-A67A-E76FEC7E99BE}</ProjectGuid>
-    <RootNamespace>GPAX</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <UseOfAtl>Dynamic</UseOfAtl>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <UseOfAtl>Dynamic</UseOfAtl>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <UseOfAtl>Dynamic</UseOfAtl>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <UseOfAtl>Dynamic</UseOfAtl>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </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>
-  <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>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <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>
-    <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'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <CustomBuildStep>
-      <Message>
-      </Message>
-      <Command>
-      </Command>
-      <Outputs>
-      </Outputs>
-    </CustomBuildStep>
-    <Midl>
-      <TypeLibraryName>.\obj/w32_deb/GPAX.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>false</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
-      <BrowseInformation>true</BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Link>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ModuleDefinitionFile>..\..\applications\GPAX\GPAX.def</ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
-      <SubSystem>Windows</SubSystem>
-      <ImportLibrary>$(IntDir)$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <CustomBuildStep>
-      <Message>
-      </Message>
-      <Command>
-      </Command>
-      <Outputs>
-      </Outputs>
-    </CustomBuildStep>
-    <Midl>
-      <TypeLibraryName>.\obj/w32_deb/GPAX.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>false</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
-      <BrowseInformation>true</BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Link>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ModuleDefinitionFile>..\..\applications\GPAX\GPAX.def</ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
-      <SubSystem>Windows</SubSystem>
-      <ImportLibrary>$(IntDir)$(ProjectName).lib</ImportLibrary>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <CustomBuildStep>
-      <Message>
-      </Message>
-      <Command>
-      </Command>
-      <Outputs>
-      </Outputs>
-    </CustomBuildStep>
-    <Midl>
-      <TypeLibraryName>.\obj/w32_rel/GPAX.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
-      <BrowseInformation>true</BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x040c</Culture>
-      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>zlib.lib;winmm.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ModuleDefinitionFile>..\..\applications\GPAX\GPAX.def</ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
-      <SubSystem>Windows</SubSystem>
-      <SupportUnloadOfDelayLoadedDLL>false</SupportUnloadOfDelayLoadedDLL>
-      <ImportLibrary>$(IntDir)$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-    <PostBuildEvent>
-      <Command>
-      </Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <CustomBuildStep>
-      <Message>
-      </Message>
-      <Command>
-      </Command>
-      <Outputs>
-      </Outputs>
-    </CustomBuildStep>
-    <Midl>
-      <TypeLibraryName>.\obj/w32_rel/GPAX.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
-      <BrowseInformation>true</BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <InlineFunctionExpansion>Default</InlineFunctionExpansion>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x040c</Culture>
-      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ModuleDefinitionFile>..\..\applications\GPAX\GPAX.def</ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
-      <SubSystem>Windows</SubSystem>
-      <SupportUnloadOfDelayLoadedDLL>false</SupportUnloadOfDelayLoadedDLL>
-      <ImportLibrary>$(IntDir)$(ProjectName).lib</ImportLibrary>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-    <PostBuildEvent>
-      <Command>
-      </Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <None Include="..\..\applications\GPAX\gpax.bmp" />
-    <None Include="..\..\applications\GPAX\GPAX.def" />
-    <None Include="..\..\applications\GPAX\GPAX.rgs" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\applications\GPAX\GPAX.cpp">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\applications\GPAX\GPAXPlugin.cpp">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\applications\GPAX\StdAfx.cpp">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\applications\GPAX\GPAX.h" />
-    <ClInclude Include="..\..\applications\GPAX\GPAXPlugin.h" />
-    <ClInclude Include="..\..\applications\GPAX\resource.h" />
-    <ClInclude Include="..\..\applications\GPAX\StdAfx.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <Midl Include="..\..\applications\GPAX\GPAX.idl">
-      <TypeLibraryName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\GPAX.tlb</TypeLibraryName>
-      <TypeLibraryName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\GPAX.tlb</TypeLibraryName>
-      <TypeLibraryName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\GPAX.tlb</TypeLibraryName>
-      <TypeLibraryName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\GPAX.tlb</TypeLibraryName>
-    </Midl>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="..\..\applications\GPAX\GPAX.rc">
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\gpac\applications\GPAX;$(OUTDIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">\gpac\applications\GPAX;$(OUTDIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\gpac\applications\GPAX;$(OUTDIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">\gpac\applications\GPAX;$(OUTDIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="libgpac_dll.vcxproj">
-      <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/GPAX/GPAXPlugin.cpp Deleted

@@ -1,710 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2006-2012
- *					All rights reserved
- *
- *  This file is part of GPAC / ActiveX control
- *
- *  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 "stdafx.h"
-#include "GPAX.h"
-#include "GPAXPlugin.h"
-#include <gpac/network.h>
-#include <gpac/utf.h>
-#include <shlobj.h>
-#include <math.h>
-
-#ifndef _WIN32_WCE
-#include <direct.h>
-#include <mshtml.h>
-#endif
-
-/////////////////////////////////////////////////////////////////////////////
-// CGPAXPlugin
-
-#if 0
-static print_err(char *msg, char *title)
-{
-	u16 w_msg1024, w_title1024;
-	CE_CharToWide(msg, w_msg);
-	CE_CharToWide(title, w_title);
-	::MessageBox(NULL, w_msg, w_title, MB_OK);
-}
-#endif
-
-
-void CGPAXPlugin::SetStatusText(char *msg)
-{
-#ifndef _WIN32_WCE
-	if (m_pBrowser) {
-		if (msg) {
-			u16 w_msg1024;
-			gf_utf8_mbstowcs(w_msg, 1024, (const char **)&msg);
-			m_pBrowser->put_StatusText((BSTR) w_msg);
-		} else {
-			m_pBrowser->put_StatusText(L"");
-		}
-	}
-#endif
-}
-//GPAC player Event Handler. not yet implemented, just dummies here
-Bool CGPAXPlugin::EventProc(GF_Event *evt)
-{
-	char msg1024;
-	if (!m_term) return GF_FALSE;
-
-	switch (evt->type) {
-	case GF_EVENT_MESSAGE:
-		if (evt->message.error) {
-			sprintf(msg, "(GPAC) %s (%s)", evt->message.message, gf_error_to_string(evt->message.error));
-		} else {
-			sprintf(msg, "(GPAC) %s", evt->message.message);
-		}
-		SetStatusText(msg);
-		break;
-	case GF_EVENT_PROGRESS:
-		if (evt->progress.done == evt->progress.total) {
-			SetStatusText(NULL);
-			m_iDownload_progress = 100;
-		} else {
-			char *szTitle = "";
-			if (evt->progress.progress_type==0) szTitle = "Buffer ";
-			else if (evt->progress.progress_type==1)
-			{
-				szTitle = "Download ";
-				m_iDownload_progress = (int)floor((100.0*evt->progress.done) / evt->progress.total);
-			}
-			else if (evt->progress.progress_type==2) szTitle = "Import ";
-			sprintf(msg, "(GPAC) %s: %02.2f", szTitle, (100.0*evt->progress.done) / evt->progress.total);
-			SetStatusText(msg);
-		}
-		break;
-	case GF_EVENT_CONNECT:
-		m_bIsConnected = evt->connect.is_connected;
-		break;
-	/*IGNORE any scene size, just work with the size allocated in the parent doc*/
-	case GF_EVENT_SCENE_SIZE:
-		gf_term_set_size(m_term, m_width, m_height);
-		break;
-	/*window has been resized (full-screen plugin), resize*/
-	case GF_EVENT_SIZE:
-		m_width = evt->size.width;
-		m_height = evt->size.height;
-		gf_term_set_size(m_term, m_width, m_height);
-		break;
-	case GF_EVENT_DBLCLICK:
-		gf_term_set_option(m_term, GF_OPT_FULLSCREEN, !gf_term_get_option(m_term, GF_OPT_FULLSCREEN));
-		break;
-	case GF_EVENT_KEYDOWN:
-		if ((evt->key.flags  & GF_KEY_MOD_ALT)) {
-		} else {
-			switch (evt->key.key_code) {
-			case GF_KEY_HOME:
-				gf_term_set_option(m_term, GF_OPT_NAVIGATION_TYPE, 1);
-				break;
-			case GF_KEY_ESCAPE:
-				gf_term_set_option(m_term, GF_OPT_FULLSCREEN, !gf_term_get_option(m_term, GF_OPT_FULLSCREEN));
-				break;
-			}
-		}
-		break;
-	case GF_EVENT_NAVIGATE_INFO:
-		strcpy(msg, evt->navigate.to_url);
-		SetStatusText(msg);
-		break;
-	case GF_EVENT_NAVIGATE:
-		if (gf_term_is_supported_url(m_term, evt->navigate.to_url, GF_TRUE, GF_TRUE)) {
-			gf_term_navigate_to(m_term, evt->navigate.to_url);
-			return GF_TRUE;
-		}
-#ifndef _WIN32_WCE
-		else if (m_pBrowser) {
-			u32 i;
-			const char **sz_ptr;
-			u16 w_szTar1024, w_szURL1024;
-			VARIANT target, flags;
-			flags.intVal = 0;
-			target.bstrVal = L"_SELF";
-
-			for (i=0; i<evt->navigate.param_count; i++) {
-				if (!strcmp(evt->navigate.parametersi, "_parent")) target.bstrVal = L"_PARENT";
-				else if (!strcmp(evt->navigate.parametersi, "_blank")) target.bstrVal = L"_BLANK";
-				else if (!strcmp(evt->navigate.parametersi, "_top")) target.bstrVal = L"_TOP";
-				else if (!strcmp(evt->navigate.parametersi, "_new")) flags.intVal |= navOpenInNewWindow;
-				else if (!strnicmp(evt->navigate.parametersi, "_target=", 8)) {
-					sz_ptr = & evt->navigate.parametersi+8;
-					gf_utf8_mbstowcs(w_szTar, 1024, (const char **)sz_ptr);
-					target.bstrVal = (BSTR) w_szTar;
-				}
-			}
-			sz_ptr = & evt->navigate.to_url;
-			gf_utf8_mbstowcs(w_szURL, 1024, (const char **)sz_ptr);
-			m_pBrowser->Navigate((BSTR) w_szURL, &flags, &target, NULL, NULL);
-			return GF_TRUE;
-		}
-#endif
-		break;
-	}
-	return GF_FALSE;
-}
-
-Bool GPAX_EventProc(void *ptr, GF_Event *evt)
-{
-	CGPAXPlugin *_this = (CGPAXPlugin *)ptr;
-	return _this->EventProc(evt);
-}
-
-//Read Parameters from pPropBag given by MSIE
-Bool CGPAXPlugin::ReadParamString(LPPROPERTYBAG pPropBag, LPERRORLOG pErrorLog,
-                                  WCHAR *name, char *buf, int bufsize)
-{
-	VARIANT v;
-	HRESULT hr;
-	Bool retval = GF_FALSE;
-
-	v.vt = VT_EMPTY;
-	v.bstrVal = NULL;
-	hr = pPropBag->Read(name, &v, pErrorLog);
-	if(SUCCEEDED(hr))
-	{
-		if(v.vt==VT_BSTR && v.bstrVal)
-		{
-//            USES_CONVERSION;
-//            lstrcpyn(buf,OLE2T(v.bstrVal),bufsize);
-			const u16 *srcp = (const u16 *) v.bstrVal;
-			size_t len = gf_utf8_wcstombs(buf, bufsize, &srcp);
-			if (len>=0) {
-				buf(u32) len = 0;
-				retval = GF_TRUE;
-			}
-		}
-		VariantClear(&v);
-	}
-	return retval;
-}
-
-void CGPAXPlugin::LoadDATAUrl()
-{
-#ifndef _WIN32_WCE
-	HRESULT hr;
-
-	if (m_url0) return;
-	/*get parent doc*/
-	CComPtr<IOleContainer> spContainer;
-	if (m_spClientSite->GetContainer(&spContainer) != S_OK)
-		return;
-	CComPtr<IHTMLDocument2> spDoc = CComQIPtr<IHTMLDocument2>(spContainer);
-	CComPtr<IHTMLElementCollection> spColl;
-	if (spDoc->get_all(&spColl) != S_OK)
-		return;
-	/*get HTML <object> in the doc*/
-	CComPtr<IDispatch> spDisp;
-	CComPtr<IHTMLElementCollection> sphtmlObjects;
-
-	CComPtr<IDispatch> spDispObjects;
-	if (spColl->tags(CComVariant("OBJECT"), &spDispObjects) != S_OK)
-		return;
-	CComPtr<IHTMLElementCollection> spObjs = CComQIPtr<IHTMLElementCollection>(spDispObjects);
-
-	/*browse all objects and find us*/
-	long lCount = 0;
-	spObjs->get_length(&lCount);
-	for (long lCnt = 0; lCnt < lCount; lCnt++) {
-		IDispatch *an_obj= NULL;
-		CComVariant varEmpty;
-		CComVariant varName;
-		varName.vt = VT_I4;
-		varName.lVal = lCnt;
-		hr = spObjs->item(varName, varEmpty, &an_obj);
-		varName.Clear();
-		varEmpty.Clear();
-		if (hr != S_OK) continue;
-
-		/*get the IHTMLObject*/
-		IHTMLObjectElement* pObjectElem=NULL;
-		an_obj->QueryInterface(IID_IHTMLObjectElement, (void**)&pObjectElem);
-		if (!pObjectElem) continue;
-
-		/*get its parent owner - it MUST be us*/
-		IDispatch *disp= NULL;
-		pObjectElem->get_object(&disp);
-		if (disp != this) continue;
-
-		BSTR data = NULL;
-		if ((pObjectElem->get_data(&data) == S_OK) && data) {
-			const u16 *srcp = (const u16 *) data;
-			size_t len = gf_utf8_wcstombs(m_url, MAXLEN_URL, &srcp);
-			if (len>=0) m_url(u32) len = 0;
-		}
-		SysFreeString(data);
-		break;
-	}
-
-	if (m_url) {
-		UpdateURL();
-	}
-#endif
-
-}
-
-// trap keys and forward on to the control
-BOOL CGPAXPlugin::PreTranslateMessage(MSG* pMsg)
-{
-	switch (pMsg->message)
-	{
-	case WM_KEYDOWN:
-	case WM_KEYUP:
-		switch (pMsg->wParam)
-		{
-		case VK_UP:
-		case VK_DOWN:
-		case VK_LEFT:
-		case VK_RIGHT:
-		case VK_HOME:
-		case VK_END:
-			SendMessage (pMsg->message, pMsg->wParam, pMsg->lParam);
-			// Windowless controls won't be able to call SendMessage.
-			// Instead, just respond to the message here.
-			return TRUE;
-		}
-		break;
-	}
-	return FALSE;
-//  return COleControl::PreTranslateMessage(pMsg);
-}
-
-
-
-
-#define GPAC_REG_KEY	HKEY_CURRENT_USER
-
-static void gpax_do_log(void *cbk, GF_LOG_Level level, GF_LOG_Tool tool, const char *fmt, va_list list)
-{
-	FILE *logs = (FILE *) cbk;
-	vfprintf(logs, fmt, list);
-	fflush(logs);
-}
-
-//Create window message fuction. when the window is created, also initialize a instance of
-//GPAC player instance.
-LRESULT CGPAXPlugin::OnCreate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled)
-{
-	if (m_term) return 0;
-	const char *str;
-
-	if (m_hWnd==NULL) return 0;
-
-	gf_sys_init(GF_MemTrackerNone);
-
-	//Create a structure m_user for initialize the terminal. the parameters to set:
-	//1)config file path
-	//2)Modules file path
-	//3)window handler
-	//4)EventProc
-	memset(&m_user, 0, sizeof(m_user));
-
-	gf_log_set_tool_level(GF_LOG_ALL, GF_LOG_ERROR);
-
-	m_user.config = gf_cfg_init(NULL, NULL);
-	if(!m_user.config) {
-#ifdef _WIN32_WCE
-		::MessageBox(NULL, _T("GPAC Configuration file not found"), _T("Fatal Error"), MB_OK);
-#else
-		::MessageBox(NULL, "GPAC Configuration file not found", "Fatal Error", MB_OK);
-#endif
-		goto err_exit;
-	}
-
-	/*check log file*/
-	str = gf_opts_get_key("General", "log-file");
-	if (str) {
-		m_pLogs = gf_fopen(str, "wt");
-		if (m_pLogs) gf_log_set_callback(m_pLogs, gpax_do_log);
-	}
-
-	/*if logs are specified, use them*/
-	gf_log_set_tools_levels( gf_cfg_get_key(m_user.config, "General", "Logs") );
-
-
-	str = gf_cfg_get_key(m_user.config, "Core", "ModulesDirectory");
-	m_user.modules = gf_modules_new(NULL, m_user.config);
-	if(!gf_modules_get_count(m_user.modules)) goto err_exit;
-
-	m_user.os_window_handler = m_hWnd;
-	m_user.opaque = this;
-	m_user.EventProc = GPAX_EventProc;
-
-	//create a terminal
-	m_term = gf_term_new(&m_user);
-
-	if (!m_term) goto err_exit;
-
-	gf_term_set_option(m_term, GF_OPT_AUDIO_VOLUME, 100);
-
-	LoadDATAUrl();
-
-	RECT rc;
-	::GetWindowRect(m_hWnd, &rc);
-	m_width = rc.right-rc.left;
-	m_height = rc.bottom-rc.top;
-	if (m_bAutoStart && strlen(m_url)) Play();
-	return 0;
-
-	//Error Processing
-err_exit:
-	if(m_user.modules)
-		gf_modules_del(m_user.modules);
-	m_user.modules = NULL;
-	if(m_user.config)
-		gf_cfg_del(m_user.config);
-	m_user.config = NULL;
-	gf_sys_close();
-	return 1;
-}
-
-void CGPAXPlugin::UnloadTerm()
-{
-	if (m_term) {
-		GF_Terminal *a_term = m_term;
-		m_term = NULL;
-		gf_term_del(a_term);
-	}
-	if (m_user.modules) gf_modules_del(m_user.modules);
-	if (m_user.config) gf_cfg_del(m_user.config);
-	if (m_pLogs)
-		gf_fclose(m_pLogs);
-	m_pLogs = NULL;
-	gf_log_set_callback(NULL, NULL);
-	memset(&m_user, 0, sizeof(m_user));
-	gf_sys_close();
-}
-CGPAXPlugin::~CGPAXPlugin()
-{
-	UnloadTerm();
-#ifndef _WIN32_WCE
-	if (m_pBrowser) m_pBrowser->Release();
-	m_pBrowser = NULL;
-#endif
-}
-LRESULT CGPAXPlugin::OnDestroy(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled)
-{
-	UnloadTerm();
-	return 0;
-}
-
-
-HRESULT CGPAXPlugin::OnDraw(ATL_DRAWINFO& di)
-{
-	if (m_term && m_bInitialDraw) {
-		m_bInitialDraw = GF_FALSE;
-		if (m_bAutoStart) Play();
-	}
-	return S_OK;
-}
-
-// Load is called before OnCreate, but it may not be called at
-// all if there are no parameters.
-STDMETHODIMP CGPAXPlugin::Load(LPPROPERTYBAG pPropBag, LPERRORLOG pErrorLog)
-{
-	char szOpt1024;
-	// examine the <embed>/<param> tag arguments
-
-	m_url0 = 0;
-	ReadParamString(pPropBag,pErrorLog,L"src", m_url, MAXLEN_URL);
-	if (!m_url0)
-		ReadParamString(pPropBag,pErrorLog,L"data", m_url, MAXLEN_URL);
-
-	if (ReadParamString(pPropBag,pErrorLog,L"autostart", szOpt, 1024))
-		m_bAutoStart = (!stricmp(szOpt, "false") || !stricmp(szOpt, "no")) ? GF_FALSE : GF_TRUE;
-
-	if (ReadParamString(pPropBag,pErrorLog,L"use3d", szOpt, 1024))
-		m_bUse3D = (!stricmp(szOpt, "true") || !stricmp(szOpt, "yes")) ? GF_TRUE : GF_FALSE;
-
-	if (ReadParamString(pPropBag,pErrorLog,L"aspectratio", szOpt, 1024)) {
-		if (!stricmp(szOpt, "keep")) m_AR = GF_ASPECT_RATIO_KEEP;
-		else if (!stricmp(szOpt, "16:9")) m_AR = GF_ASPECT_RATIO_16_9;
-		else if (!stricmp(szOpt, "4:3")) m_AR = GF_ASPECT_RATIO_4_3;
-		else if (!stricmp(szOpt, "fill")) m_AR = GF_ASPECT_RATIO_FILL_SCREEN;
-	}
-
-	if (ReadParamString(pPropBag,pErrorLog,L"loop", szOpt, 1024))
-		m_bLoop = !stricmp(szOpt, "true") ? GF_FALSE : GF_TRUE;
-
-	if (ReadParamString(pPropBag,pErrorLog,L"gui", szOpt, 1024))
-		m_bUseGUI = (!stricmp(szOpt, "true") || !stricmp(szOpt, "yes")) ? GF_TRUE : GF_FALSE;
-
-	UpdateURL();
-
-#ifndef _WIN32_WCE
-	/*get the top-level container*/
-	if (!m_pBrowser) {
-		IServiceProvider *isp, *isp2 = NULL;
-		if ( SUCCEEDED(m_spClientSite->QueryInterface(IID_IServiceProvider, reinterpret_cast<void **>(&isp)) ) ) {
-
-			if (SUCCEEDED(isp->QueryService(SID_STopLevelBrowser, IID_IServiceProvider, reinterpret_cast<void **>(&isp2)) ) ) {
-				isp2->QueryService(SID_SWebBrowserApp, IID_IWebBrowser2, reinterpret_cast<void **>(&m_pBrowser));
-				isp2->Release();
-			}
-			isp->Release();
-		}
-	}
-	if (m_pBrowser) m_pBrowser->put_StatusText(L"GPAC Ready");
-#endif
-
-	return IPersistPropertyBagImpl<CGPAXPlugin>::Load(pPropBag, pErrorLog);
-}
-
-void CGPAXPlugin::UpdateURL()
-{
-	/*get absolute URL*/
-	if (!strlen(m_url)) return;
-	IMoniker* pMoniker	= NULL;
-	LPOLESTR sDisplayName;
-
-	if (SUCCEEDED(m_spClientSite->GetMoniker(OLEGETMONIKER_TEMPFORUSER,
-	              OLEWHICHMK_CONTAINER,
-	              &pMoniker) ) ) {
-		char parent_url1024;
-		pMoniker->GetDisplayName(NULL, NULL, &sDisplayName);
-		wcstombs(parent_url, sDisplayName, 300);
-		pMoniker->Release();
-
-		char *abs_url = gf_url_concatenate(parent_url, m_url);
-		if (abs_url) {
-			strcpy(m_url, abs_url);
-			gf_free(abs_url);
-		}
-	}
-}
-
-STDMETHODIMP CGPAXPlugin::Save(LPPROPERTYBAG pPropBag, BOOL fClearDirty, BOOL fSaveAllProperties)
-{
-	u16 wurlMAXLEN_URL;
-	const char *sptr;
-	u16 len;
-
-	VARIANT value;
-	if( pPropBag == NULL) return E_INVALIDARG;
-
-	VariantInit(&value);
-
-	V_VT(&value) = VT_BOOL;
-	V_BOOL(&value) = m_bAutoStart ? VARIANT_TRUE : VARIANT_FALSE;
-	pPropBag->Write(OLESTR("AutoStart"), &value);
-	VariantClear(&value);
-
-	V_VT(&value) = VT_BSTR;
-
-	sptr = (const char *)m_url;
-	len = (u16) gf_utf8_mbstowcs(wurl, MAXLEN_URL, &sptr);
-	V_BSTR(&value) = SysAllocStringLen(NULL, len+1);
-	memcpy(V_BSTR(&value) , wurl, len*sizeof(u16));
-	V_BSTR(&value) len = 0;
-
-	pPropBag->Write(OLESTR("src"), &value);
-	VariantClear(&value);
-	return S_OK;
-}
-
-STDMETHODIMP CGPAXPlugin::Play()
-{
-	if (m_term) {
-		if (!m_bIsConnected) {
-			if (strlen(m_url)) {
-				/*connect from 0 and pause if not autoplay*/
-				const char *gui = gf_cfg_get_key(m_user.config, "General", "StartupFile");
-				if (gui && m_bUseGUI) {
-					gf_cfg_set_key(m_user.config, "Temp", "BrowserMode", "yes");
-					gf_cfg_set_key(m_user.config, "Temp", "GUIStartupFile", m_url);
-					gf_term_connect(m_term, gui);
-				} else {
-					gf_term_connect(m_term, m_url);
-				}
-				gf_term_set_option(m_term, GF_OPT_ASPECT_RATIO, m_AR);
-			}
-		} else
-			gf_term_set_option(m_term, GF_OPT_PLAY_STATE, GF_STATE_PLAYING);   //if target is connected, set it playing
-	}
-	return S_OK;
-}
-
-STDMETHODIMP CGPAXPlugin::Pause()
-{
-	if(m_term) {
-		if (gf_term_get_option(m_term, GF_OPT_PLAY_STATE) == GF_STATE_PAUSED) {
-			gf_term_set_option(m_term, GF_OPT_PLAY_STATE, GF_STATE_PLAYING);
-		} else {
-			gf_term_set_option(m_term, GF_OPT_PLAY_STATE, GF_STATE_PAUSED);
-		}
-	}
-	return S_OK;
-}
-
-STDMETHODIMP CGPAXPlugin::Stop()
-{
-	if(m_term) gf_term_disconnect(m_term);     //set it stop
-	return S_OK;
-}
-
-STDMETHODIMP CGPAXPlugin::QualitySwitch(int switch_up)
-{
-	if (m_term) gf_term_switch_quality(m_term, switch_up ? GF_TRUE : GF_FALSE);
-	return S_OK;
-}
-
-STDMETHODIMP CGPAXPlugin::SetURL(BSTR _url)
-{
-	if (m_term) {
-		u16 *srcp;
-		u32 len;
-		char *url;
-
-		srcp = (u16 *)_url;
-		len = (u32) gf_utf8_wcstombs(NULL, 0, (const u16 **)&srcp);
-		if (len) {
-			url = (char *) gf_malloc(sizeof(char) * (len+1));
-			srcp = (u16 *)_url;
-			len = (u32) gf_utf8_wcstombs(url, len, (const u16 **)&srcp);
-			urllen = 0;
-			strcpy(m_url, url);
-			gf_term_connect(m_term, url);
-			gf_free(url);
-		}
-	}
-	return S_OK;
-}
-
-STDMETHODIMP CGPAXPlugin::Update(BSTR _mtype, BSTR _updates)
-{
-	if (m_term) {
-		u16 *srcp;
-		u32 len;
-		char mtype1024, *updates;
-
-		srcp = (u16 *) _mtype;
-		len = (u32) gf_utf8_wcstombs(mtype, 1024, (const u16 **)&srcp);
-		mtypelen = 0;
-
-		srcp = (u16 *)_updates;
-		len = (u32) gf_utf8_wcstombs(NULL, 0, (const u16 **)&srcp);
-		if (len) {
-			updates = (char *) gf_malloc(sizeof(char) * (len+1));
-			srcp = (u16 *)_updates;
-			len = (u32) gf_utf8_wcstombs(updates, len, (const u16 **)&srcp);
-			updateslen = 0;
-			gf_term_scene_update(m_term, mtype, updates);
-			gf_free(updates);
-		}
-	}
-	return S_OK;
-}
-
-STDMETHODIMP CGPAXPlugin::get_src(BSTR *url)
-{
-	u16 wurlMAXLEN_URL;
-	const char *sptr;
-	u16 len;
-	if (url==NULL) return E_POINTER;
-
-	sptr = (const char *)m_url;
-	len = (u32) gf_utf8_mbstowcs(wurl, MAXLEN_URL, &sptr);
-	*url = SysAllocStringLen(NULL, len+1);
-	memcpy(*url, wurl, len*sizeof(u16));
-	*urllen = 0;
-	return S_OK;
-}
-STDMETHODIMP CGPAXPlugin::put_src(BSTR url)
-{
-	const u16 *srcp = (const u16 *)url;
-	u32 len = (u32) gf_utf8_wcstombs(m_url, MAXLEN_URL, &srcp);
-	m_urllen = 0;
-	UpdateURL();
-	return S_OK;
-}
-
-STDMETHODIMP CGPAXPlugin::get_AutoStart(VARIANT_BOOL *as)
-{
-	if (as==NULL) return E_POINTER;
-	*as = m_bAutoStart ? VARIANT_TRUE: VARIANT_FALSE;
-	return S_OK;
-}
-STDMETHODIMP CGPAXPlugin::put_AutoStart(VARIANT_BOOL as)
-{
-	m_bAutoStart = (as !=VARIANT_FALSE) ? GF_TRUE : GF_FALSE;
-	return S_OK;
-}
-
-STDMETHODIMP CGPAXPlugin::get_DownloadProgress(INT *dp)
-{
-	if (dp==NULL) return E_POINTER;
-	*dp = m_iDownload_progress;
-	return S_OK;
-}
-STDMETHODIMP CGPAXPlugin::put_DownloadProgress(INT dp)
-{
-	return S_OK;
-}
-
-STDMETHODIMP CGPAXPlugin::GetInterfaceSafetyOptions(
-    REFIID riid,
-    DWORD *pdwSupportedOptions,
-    DWORD *pdwEnabledOptions
-)
-{
-	if( (NULL == pdwSupportedOptions) || (NULL == pdwEnabledOptions) )
-		return E_POINTER;
-
-	*pdwSupportedOptions = INTERFACESAFE_FOR_UNTRUSTED_DATA|INTERFACESAFE_FOR_UNTRUSTED_CALLER;
-
-	if ((IID_IDispatch == riid) || (IID_IGPAX == riid)) {
-		*pdwEnabledOptions = INTERFACESAFE_FOR_UNTRUSTED_CALLER;
-		return NOERROR;
-	}
-	else if (IID_IPersistPropertyBag == riid)  {
-		*pdwEnabledOptions = INTERFACESAFE_FOR_UNTRUSTED_DATA;
-		return NOERROR;
-	}
-	*pdwEnabledOptions = 0;
-	return E_NOINTERFACE;
-};
-
-STDMETHODIMP CGPAXPlugin::SetInterfaceSafetyOptions(
-    REFIID riid,
-    DWORD dwOptionSetMask,
-    DWORD dwEnabledOptions
-)
-{
-	if ((IID_IDispatch == riid) || (IID_IGPAX == riid) ) {
-		if( (INTERFACESAFE_FOR_UNTRUSTED_CALLER == dwOptionSetMask)
-		        && (INTERFACESAFE_FOR_UNTRUSTED_CALLER == dwEnabledOptions) ) {
-			return NOERROR;
-		}
-		return E_FAIL;
-	}
-	else if (IID_IPersistPropertyBag == riid) {
-		if( (INTERFACESAFE_FOR_UNTRUSTED_DATA == dwOptionSetMask)
-		        && (INTERFACESAFE_FOR_UNTRUSTED_DATA == dwEnabledOptions) ) {
-			return NOERROR;
-		}
-		return E_FAIL;
-	}
-	return E_FAIL;
-};
-

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/GPAX/GPAXPlugin.h Deleted

@@ -1,269 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2006-2012
- *					All rights reserved
- *
- *  This file is part of GPAC / ActiveX control
- *
- *  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.
- *
- */
-
-#ifndef __GPAXPLUGIN_H_
-#define __GPAXPLUGIN_H_
-
-#define MAXLEN_URL     300
-
-#include "resource.h"       // main symbols
-#include <atlctl.h>
-#include <SHLGUID.h>
-
-
-
-#include <gpac/terminal.h>
-#include <gpac/user.h>
-#include <gpac/config_file.h>
-#include <gpac/module.h>
-#include <gpac/options.h>
-
-#if (_MSC_VER >= 1300)
-using namespace ATL;
-#endif
-
-
-Bool GPAX_EventProc(void *ptr, GF_Event *evt);
-
-/////////////////////////////////////////////////////////////////////////////
-// CGPAXPlugin
-class ATL_NO_VTABLE CGPAXPlugin :
-	public CComObjectRootEx<CComSingleThreadModel>,
-	public IDispatchImpl<IGPAX, &IID_IGPAX, &LIBID_GPAXLib>,
-	public CComControl<CGPAXPlugin>,
-	public CComCoClass<CGPAXPlugin, &CLSID_GPAX>,
-	public IOleControlImpl<CGPAXPlugin>,
-	public IOleObjectImpl<CGPAXPlugin>,
-	public IOleInPlaceActiveObjectImpl<CGPAXPlugin>,
-	public IViewObjectExImpl<CGPAXPlugin>,
-	public IOleInPlaceObjectWindowlessImpl<CGPAXPlugin>,
-	public IProvideClassInfo2Impl<&CLSID_GPAX, &DIID_IGPAXEvents, &LIBID_GPAXLib>,
-
-	public IPersistStreamInitImpl<CGPAXPlugin>,
-	public ISupportErrorInfo,
-	public IConnectionPointContainerImpl<CGPAXPlugin>,
-	public IPersistStorageImpl<CGPAXPlugin>,
-	public ISpecifyPropertyPagesImpl<CGPAXPlugin>,
-	public IQuickActivateImpl<CGPAXPlugin>,
-	public IDataObjectImpl<CGPAXPlugin>,
-	public IPropertyNotifySinkCP<CGPAXPlugin>,
-
-	public IPersistPropertyBagImpl<CGPAXPlugin>,
-	public IObjectSafetyImpl<CGPAXPlugin, INTERFACESAFE_FOR_UNTRUSTED_CALLER | INTERFACESAFE_FOR_UNTRUSTED_DATA>
-
-{
-public:
-	CGPAXPlugin() {
-		m_term = NULL;
-		m_bAutoStart = GF_TRUE;
-		m_bInitialDraw = GF_TRUE;
-		m_bWindowOnly = GF_TRUE;  //to declare that the control is a window control in order
-		//to inherit the member variable m_hWnd which contains the window handler
-		m_bIsConnected = GF_FALSE;
-		m_bUse3D = GF_FALSE;
-		m_bUseGUI = GF_FALSE;
-		m_iDownload_progress = 0;
-		m_AR = GF_ASPECT_RATIO_KEEP;
-		m_url0 = 0;
-		m_pLogs = NULL;
-#ifndef _WIN32_WCE
-		m_pBrowser = NULL;
-#endif
-		memset(&m_user, 0, sizeof(m_user));
-
-		m_dwCurrentSafety = INTERFACESAFE_FOR_UNTRUSTED_CALLER | INTERFACESAFE_FOR_UNTRUSTED_DATA;
-	}
-
-	~CGPAXPlugin();
-
-	Bool EventProc(GF_Event *evt);
-
-	BOOL PreTranslateMessage(MSG* pMsg);
-
-	DECLARE_REGISTRY_RESOURCEID(IDR_GPAXPLUGIN)
-	DECLARE_PROTECT_FINAL_CONSTRUCT()
-#if (_MSC_VER >= 1300)
-	DECLARE_OLEMISC_STATUS(OLEMISC_ACTSLIKEBUTTON | OLEMISC_ACTIVATEWHENVISIBLE)
-#endif
-
-	static LPCTSTR GetWindowClassName() {
-		return TEXT("GPAC ActiveX");
-	}
-
-	BEGIN_COM_MAP(CGPAXPlugin)
-	COM_INTERFACE_ENTRY(IGPAX)
-	COM_INTERFACE_ENTRY(IDispatch)
-	COM_INTERFACE_ENTRY(IViewObjectEx)
-	COM_INTERFACE_ENTRY(IProvideClassInfo)
-	COM_INTERFACE_ENTRY(IOleControl)
-	COM_INTERFACE_ENTRY(IOleObject)
-
-	COM_INTERFACE_ENTRY_IMPL(IViewObjectEx)
-	COM_INTERFACE_ENTRY_IMPL_IID(IID_IViewObject2, IViewObjectEx)
-	COM_INTERFACE_ENTRY_IMPL_IID(IID_IViewObject, IViewObjectEx)
-	COM_INTERFACE_ENTRY_IMPL_IID(IID_IOleWindow, IOleInPlaceObjectWindowless)
-	COM_INTERFACE_ENTRY_IMPL_IID(IID_IOleInPlaceObject, IOleInPlaceObjectWindowless)
-	COM_INTERFACE_ENTRY_IMPL_IID(IID_IOleWindow, IOleInPlaceActiveObject)
-
-	COM_INTERFACE_ENTRY_IMPL(IOleInPlaceActiveObject)
-	COM_INTERFACE_ENTRY_IMPL(IOleInPlaceObjectWindowless)
-
-//	COM_INTERFACE_ENTRY(IObjectSafety)
-	COM_INTERFACE_ENTRY_IID(IID_IObjectSafety, IObjectSafety)
-	COM_INTERFACE_ENTRY(IPersistPropertyBag)
-	COM_INTERFACE_ENTRY_IMPL_IID(IID_IPersist, IPersistPropertyBag)
-
-	/*	COM_INTERFACE_ENTRY(IViewObject)
-	    COM_INTERFACE_ENTRY(IViewObject2)
-	    COM_INTERFACE_ENTRY2(IOleWindow, IOleInPlaceObjectWindowless)
-	    COM_INTERFACE_ENTRY(IOleInPlaceObject)
-		*/
-
-	COM_INTERFACE_ENTRY(IProvideClassInfo2)
-	COM_INTERFACE_ENTRY(IPersistStreamInit)
-	COM_INTERFACE_ENTRY2(IPersist, IPersistStreamInit)
-	COM_INTERFACE_ENTRY(ISupportErrorInfo)
-	COM_INTERFACE_ENTRY(IConnectionPointContainer)
-	COM_INTERFACE_ENTRY(ISpecifyPropertyPages)
-	COM_INTERFACE_ENTRY(IQuickActivate)
-	COM_INTERFACE_ENTRY(IPersistStorage)
-	COM_INTERFACE_ENTRY(IDataObject)
-
-	END_COM_MAP()
-
-	BEGIN_PROP_MAP(CGPAXPlugin)
-	END_PROP_MAP()
-
-	BEGIN_CONNECTION_POINT_MAP(CGPAXPlugin)
-	CONNECTION_POINT_ENTRY(IID_IPropertyNotifySink)
-	END_CONNECTION_POINT_MAP()
-
-	BEGIN_MSG_MAP(CGPAXPlugin)
-	CHAIN_MSG_MAP(CComControl<CGPAXPlugin>)
-	DEFAULT_REFLECTION_HANDLER()
-	MESSAGE_HANDLER(WM_CREATE, OnCreate)
-	MESSAGE_HANDLER(WM_DESTROY, OnDestroy)
-
-	END_MSG_MAP()
-	// Handler prototypes:
-	//  LRESULT MessageHandler(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled);
-	//  LRESULT CommandHandler(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled);
-	//  LRESULT NotifyHandler(int idCtrl, LPNMHDR pnmh, BOOL& bHandled);
-
-
-
-	// ISupportsErrorInfo
-	STDMETHOD(InterfaceSupportsErrorInfo)(REFIID riid)
-	{
-		static const IID* arr =
-		{
-			&IID_IGPAX,
-		};
-		for (int i=0; i<sizeof(arr)/sizeof(arr0); i++)
-		{
-#if (_MSC_VER < 1300)
-			if (::ATL::InlineIsEqualGUID(*arri, riid))
-#else
-			if (::InlineIsEqualGUID(*arri, riid))
-#endif
-				return S_OK;
-		}
-		return S_FALSE;
-	}
-	STDMETHODIMP GetInterfaceSafetyOptions(
-	    REFIID riid,
-	    DWORD *pdwSupportedOptions,
-	    DWORD *pdwEnabledOptions
-	);
-
-	STDMETHODIMP SetInterfaceSafetyOptions(
-	    REFIID riid,
-	    DWORD dwOptionSetMask,
-	    DWORD dwEnabledOptions
-	);
-
-	// IViewObjectEx
-	DECLARE_VIEW_STATUS(VIEWSTATUS_SOLIDBKGND | VIEWSTATUS_OPAQUE)
-
-	// IGPAX
-public:
-	//Interface methods
-	STDMETHOD(Stop)();
-	STDMETHOD(Pause)();
-	STDMETHOD(Play)();
-	STDMETHOD(Update)(BSTR mtype,BSTR updates);
-	STDMETHOD(QualitySwitch)(int switch_up);
-	STDMETHOD(SetURL)(BSTR url);
-
-	//Interface properties
-	STDMETHODIMP get_src(BSTR *url);
-	STDMETHODIMP put_src(BSTR url);
-	STDMETHODIMP get_AutoStart(VARIANT_BOOL *as);
-	STDMETHODIMP put_AutoStart(VARIANT_BOOL as);
-	STDMETHODIMP get_DownloadProgress(INT *dp);
-	STDMETHODIMP put_DownloadProgress(INT dp);
-
-	//Customed Window Message functions: OnCreate and OnDestroy are called when a window
-	//is created or destroyed. OnDraw is to establish inital connection.
-	HRESULT OnDraw(ATL_DRAWINFO& di);
-	LRESULT OnCreate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled);
-	LRESULT OnDestroy(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled);
-
-	//IPersistPropertyBag method: to handle persist property packed and transfered by MSIE
-	//in html doc, the ActiveX control is added by tags
-	//   <object CLSID=...>
-	//		<PARAM name="..." value="...">
-	//   </object>
-	//the interface IPersistPropertyBag enable MSIE and ActiveX Control to communicate these
-	//properties included in tags <PARAM>
-	STDMETHODIMP Load(LPPROPERTYBAG pPropBag, LPERRORLOG pErrorLog);
-	STDMETHODIMP Save(LPPROPERTYBAG, BOOL, BOOL);
-
-
-private:
-	Bool ReadParamString(LPPROPERTYBAG pPropBag, LPERRORLOG pErrorLog, WCHAR *name, char *buf, int bufsize);
-	void SetStatusText(char *msg);
-	void UpdateURL();
-	void UnloadTerm();
-	void LoadDATAUrl();
-
-	GF_Terminal *m_term;
-	GF_User m_user;
-	char m_urlMAXLEN_URL;
-#ifndef _WIN32_WCE
-	/*pointer to the parent browser if any*/
-	IWebBrowser2 *m_pBrowser;
-#endif
-
-	u32 m_width, m_height, m_AR;
-	Bool m_bIsConnected, m_bInitialDraw, m_bAutoStart, m_bUse3D, m_bLoop, m_bUseGUI;
-	int m_iDownload_progress;
-	FILE *m_pLogs;
-
-};
-
-
-
-#endif //__GPAXPLUGIN_H_

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/GPAX/GPAX_i.c Deleted

@@ -1,178 +0,0 @@
-
-#pragma warning( disable: 4049 )  /* more than 64k source lines */
-
-/* this ALWAYS GENERATED file contains the IIDs and CLSIDs */
-
-/* link this file in with the server and any clients */
-
-
-/* File created by MIDL compiler version 5.03.0286 */
-/* at Thu Jul 20 19:14:15 2006
- */
-/* Compiler settings for \CVS\gpac\applications\GPAX\GPAX.idl:
-    Oicf (OptLev=i2), W1, Zp8, env=Win32 (32b run), ms_ext, c_ext
-    error checks: allocation ref bounds_check enum stub_data
-    VC __declspec() decoration level:
-         __declspec(uuid()), __declspec(selectany), __declspec(novtable)
-         DECLSPEC_UUID(), MIDL_INTERFACE()
-*/
-//@@MIDL_FILE_HEADING(  )
-
-#if !defined(_M_IA64) && !defined(_M_AXP64)
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-#include <rpc.h>
-#include <rpcndr.h>
-
-#ifdef _MIDL_USE_GUIDDEF_
-
-#ifndef INITGUID
-#define INITGUID
-#include <guiddef.h>
-#undef INITGUID
-#else
-#include <guiddef.h>
-#endif
-
-#define MIDL_DEFINE_GUID(type,name,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8) \
-        DEFINE_GUID(name,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8)
-
-#else // !_MIDL_USE_GUIDDEF_
-
-#ifndef __IID_DEFINED__
-#define __IID_DEFINED__
-
-typedef struct _IID
-{
-	unsigned long x;
-	unsigned short s1;
-	unsigned short s2;
-	unsigned char  c8;
-} IID;
-
-#endif // __IID_DEFINED__
-
-#ifndef CLSID_DEFINED
-#define CLSID_DEFINED
-typedef IID CLSID;
-#endif // CLSID_DEFINED
-
-#define MIDL_DEFINE_GUID(type,name,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8) \
-        const type name = {l,w1,w2,{b1,b2,b3,b4,b5,b6,b7,b8}}
-
-#endif !_MIDL_USE_GUIDDEF_
-
-MIDL_DEFINE_GUID(IID, LIBID_GPAXLib,0xE64FAC7F,0x0134,0x4A75,0xA7,0xDA,0x80,0xD5,0x3E,0xBC,0x56,0xA6);
-
-
-MIDL_DEFINE_GUID(IID, IID_IGPAX,0xE2A9A937,0xBB35,0x47E0,0x89,0x42,0x96,0x48,0x06,0x29,0x9A,0xB4);
-
-
-MIDL_DEFINE_GUID(IID, DIID_IGPAXEvents,0x1FDA32FC,0x4C9A,0x461F,0xB3,0x3B,0x07,0x15,0xB0,0x34,0x30,0x06);
-
-
-MIDL_DEFINE_GUID(CLSID, CLSID_GPAX,0x181D18E6,0x4DC1,0x4B55,0xB7,0x2E,0xBE,0x2A,0x10,0x06,0x49,0x95);
-
-#undef MIDL_DEFINE_GUID
-
-#ifdef __cplusplus
-}
-#endif
-
-
-
-#endif /* !defined(_M_IA64) && !defined(_M_AXP64)*/
-
-
-#pragma warning( disable: 4049 )  /* more than 64k source lines */
-
-/* this ALWAYS GENERATED file contains the IIDs and CLSIDs */
-
-/* link this file in with the server and any clients */
-
-
-/* File created by MIDL compiler version 5.03.0286 */
-/* at Thu Jul 20 19:14:15 2006
- */
-/* Compiler settings for \CVS\gpac\applications\GPAX\GPAX.idl:
-    Oicf (OptLev=i2), W1, Zp8, env=Win64 (32b run,appending), ms_ext, c_ext, robust
-    error checks: allocation ref bounds_check enum stub_data
-    VC __declspec() decoration level:
-         __declspec(uuid()), __declspec(selectany), __declspec(novtable)
-         DECLSPEC_UUID(), MIDL_INTERFACE()
-*/
-//@@MIDL_FILE_HEADING(  )
-
-#if defined(_M_IA64) || defined(_M_AXP64)
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-#include <rpc.h>
-#include <rpcndr.h>
-
-#ifdef _MIDL_USE_GUIDDEF_
-
-#ifndef INITGUID
-#define INITGUID
-#include <guiddef.h>
-#undef INITGUID
-#else
-#include <guiddef.h>
-#endif
-
-#define MIDL_DEFINE_GUID(type,name,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8) \
-        DEFINE_GUID(name,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8)
-
-#else // !_MIDL_USE_GUIDDEF_
-
-#ifndef __IID_DEFINED__
-#define __IID_DEFINED__
-
-typedef struct _IID
-{
-	unsigned long x;
-	unsigned short s1;
-	unsigned short s2;
-	unsigned char  c8;
-} IID;
-
-#endif // __IID_DEFINED__
-
-#ifndef CLSID_DEFINED
-#define CLSID_DEFINED
-typedef IID CLSID;
-#endif // CLSID_DEFINED
-
-#define MIDL_DEFINE_GUID(type,name,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8) \
-        const type name = {l,w1,w2,{b1,b2,b3,b4,b5,b6,b7,b8}}
-
-#endif !_MIDL_USE_GUIDDEF_
-
-MIDL_DEFINE_GUID(IID, LIBID_GPAXLib,0xE64FAC7F,0x0134,0x4A75,0xA7,0xDA,0x80,0xD5,0x3E,0xBC,0x56,0xA6);
-
-
-MIDL_DEFINE_GUID(IID, IID_IGPAX,0xE2A9A937,0xBB35,0x47E0,0x89,0x42,0x96,0x48,0x06,0x29,0x9A,0xB4);
-
-
-MIDL_DEFINE_GUID(IID, DIID_IGPAXEvents,0x1FDA32FC,0x4C9A,0x461F,0xB3,0x3B,0x07,0x15,0xB0,0x34,0x30,0x06);
-
-
-MIDL_DEFINE_GUID(CLSID, CLSID_GPAX,0x181D18E6,0x4DC1,0x4B55,0xB7,0x2E,0xBE,0x2A,0x10,0x06,0x49,0x95);
-
-#undef MIDL_DEFINE_GUID
-
-#ifdef __cplusplus
-}
-#endif
-
-
-
-#endif /* defined(_M_IA64) || defined(_M_AXP64)*/
-

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/GPAX/GPAX_p.c Deleted

@@ -1,603 +0,0 @@
-/* this ALWAYS GENERATED file contains the proxy stub code */
-
-
-/* File created by MIDL compiler version 5.01.0164 */
-/* at Mon Jul 17 15:58:48 2006
- */
-/* Compiler settings for D:\CVS\gpac\applications\GPAX\GPAX.idl:
-    Oicf (OptLev=i2), W1, Zp8, env=Win32, ms_ext, c_ext
-    error checks: allocation ref bounds_check enum stub_data
-*/
-//@@MIDL_FILE_HEADING(  )
-
-#define USE_STUBLESS_PROXY
-
-
-/* verify that the <rpcproxy.h> version is high enough to compile this file*/
-#ifndef __REDQ_RPCPROXY_H_VERSION__
-#define __REQUIRED_RPCPROXY_H_VERSION__ 440
-#endif
-
-
-#include "rpcproxy.h"
-#ifndef __RPCPROXY_H_VERSION__
-#error this stub requires an updated version of <rpcproxy.h>
-#endif // __RPCPROXY_H_VERSION__
-
-
-#include "GPAX.h"
-
-#define TYPE_FORMAT_STRING_SIZE   59
-#define PROC_FORMAT_STRING_SIZE   213
-
-typedef struct _MIDL_TYPE_FORMAT_STRING
-{
-	short          Pad;
-	unsigned char  Format TYPE_FORMAT_STRING_SIZE ;
-} MIDL_TYPE_FORMAT_STRING;
-
-typedef struct _MIDL_PROC_FORMAT_STRING
-{
-	short          Pad;
-	unsigned char  Format PROC_FORMAT_STRING_SIZE ;
-} MIDL_PROC_FORMAT_STRING;
-
-
-extern const MIDL_TYPE_FORMAT_STRING __MIDL_TypeFormatString;
-extern const MIDL_PROC_FORMAT_STRING __MIDL_ProcFormatString;
-
-
-/* Standard interface: __MIDL_itf_GPAX_0000, ver. 0.0,
-   GUID={0x00000000,0x0000,0x0000,{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}} */
-
-
-/* Object interface: IUnknown, ver. 0.0,
-   GUID={0x00000000,0x0000,0x0000,{0xC0,0x00,0x00,0x00,0x00,0x00,0x00,0x46}} */
-
-
-/* Object interface: IDispatch, ver. 0.0,
-   GUID={0x00020400,0x0000,0x0000,{0xC0,0x00,0x00,0x00,0x00,0x00,0x00,0x46}} */
-
-
-/* Object interface: IGPAX, ver. 0.0,
-   GUID={0xE2A9A937,0xBB35,0x47E0,{0x89,0x42,0x96,0x48,0x06,0x29,0x9A,0xB4}} */
-
-
-extern const MIDL_STUB_DESC Object_StubDesc;
-
-
-extern const MIDL_SERVER_INFO IGPAX_ServerInfo;
-
-#pragma code_seg(".orpc")
-extern const USER_MARSHAL_ROUTINE_QUADRUPLE UserMarshalRoutines1;
-
-static const MIDL_STUB_DESC Object_StubDesc =
-{
-	0,
-	NdrOleAllocate,
-	NdrOleFree,
-	0,
-	0,
-	0,
-	0,
-	0,
-	__MIDL_TypeFormatString.Format,
-	1, /* -error bounds_check flag */
-	0x20000, /* Ndr library version */
-	0,
-	0x50100a4, /* MIDL Version 5.1.164 */
-	0,
-	UserMarshalRoutines,
-	0,  /* notify & notify_flag routine table */
-	1,  /* Flags */
-	0,  /* Reserved3 */
-	0,  /* Reserved4 */
-	0   /* Reserved5 */
-};
-
-static const unsigned short IGPAX_FormatStringOffsetTable =
-{
-	(unsigned short) -1,
-	(unsigned short) -1,
-	(unsigned short) -1,
-	(unsigned short) -1,
-	0,
-	22,
-	44,
-	66,
-	100,
-	128,
-	156,
-	184
-};
-
-static const MIDL_SERVER_INFO IGPAX_ServerInfo =
-{
-	&Object_StubDesc,
-	0,
-	__MIDL_ProcFormatString.Format,
-	&IGPAX_FormatStringOffsetTable-3,
-	0,
-	0,
-	0,
-	0
-};
-
-static const MIDL_STUBLESS_PROXY_INFO IGPAX_ProxyInfo =
-{
-	&Object_StubDesc,
-	__MIDL_ProcFormatString.Format,
-	&IGPAX_FormatStringOffsetTable-3,
-	0,
-	0,
-	0
-};
-
-CINTERFACE_PROXY_VTABLE(15) _IGPAXProxyVtbl =
-{
-	&IGPAX_ProxyInfo,
-	&IID_IGPAX,
-	IUnknown_QueryInterface_Proxy,
-	IUnknown_AddRef_Proxy,
-	IUnknown_Release_Proxy ,
-	0 /* (void *)-1 /* IDispatch::GetTypeInfoCount */ ,
-	0 /* (void *)-1 /* IDispatch::GetTypeInfo */ ,
-	0 /* (void *)-1 /* IDispatch::GetIDsOfNames */ ,
-	0 /* IDispatch_Invoke_Proxy */ ,
-	(void *)-1 /* IGPAX::Play */ ,
-	(void *)-1 /* IGPAX::Pause */ ,
-	(void *)-1 /* IGPAX::Stop */ ,
-	(void *)-1 /* IGPAX::Update */ ,
-	(void *)-1 /* IGPAX::QualitySwitch */ ,
-	(void *)-1 /* IGPAX::get_URL */ ,
-	(void *)-1 /* IGPAX::put_URL */ ,
-	(void *)-1 /* IGPAX::get_AutoStart */ ,
-	(void *)-1 /* IGPAX::put_AutoStart */
-};
-
-
-static const PRPC_STUB_FUNCTION IGPAX_table =
-{
-	STUB_FORWARDING_FUNCTION,
-	STUB_FORWARDING_FUNCTION,
-	STUB_FORWARDING_FUNCTION,
-	STUB_FORWARDING_FUNCTION,
-	NdrStubCall2,
-	NdrStubCall2,
-	NdrStubCall2,
-	NdrStubCall2,
-	NdrStubCall2,
-	NdrStubCall2,
-	NdrStubCall2,
-	NdrStubCall2
-};
-
-CInterfaceStubVtbl _IGPAXStubVtbl =
-{
-	&IID_IGPAX,
-	&IGPAX_ServerInfo,
-	15,
-	&IGPAX_table-3,
-	CStdStubBuffer_DELEGATING_METHODS
-};
-
-#pragma data_seg(".rdata")
-
-static const USER_MARSHAL_ROUTINE_QUADRUPLE UserMarshalRoutines1 =
-{
-
-	{
-		BSTR_UserSize
-		,BSTR_UserMarshal
-		,BSTR_UserUnmarshal
-		,BSTR_UserFree
-	}
-
-};
-
-
-#if !defined(__RPC_WIN32__)
-#error  Invalid build platform for this stub.
-#endif
-
-#if !(TARGET_IS_NT40_OR_LATER)
-#error You need a Windows NT 4.0 or later to run this stub because it uses these features:
-#error   -Oif or -Oicf, wire_marshal or user_marshal attribute, more than 32 methods in the interface.
-#error However, your C/C++ compilation flags indicate you intend to run this app on earlier systems.
-#error This app will die there with the RPC_X_WRONG_STUB_VERSION error.
-#endif
-
-
-static const MIDL_PROC_FORMAT_STRING __MIDL_ProcFormatString =
-{
-	0,
-	{
-
-		/* Procedure Play */
-
-		0x33,		/* FC_AUTO_HANDLE */
-		0x6c,		/* Old Flags:  object, Oi2 */
-		/*  2 */	NdrFcLong( 0x0 ),	/* 0 */
-		/*  6 */	NdrFcShort( 0x7 ),	/* 7 */
-#ifndef _ALPHA_
-		/*  8 */	NdrFcShort( 0x8 ),	/* x86, MIPS, PPC Stack size/offset = 8 */
-#else
-		NdrFcShort( 0x10 ),	/* Alpha Stack size/offset = 16 */
-#endif
-		/* 10 */	NdrFcShort( 0x0 ),	/* 0 */
-		/* 12 */	NdrFcShort( 0x8 ),	/* 8 */
-		/* 14 */	0x4,		/* Oi2 Flags:  has return, */
-		0x1,		/* 1 */
-
-		/* Return value */
-
-		/* 16 */	NdrFcShort( 0x70 ),	/* Flags:  out, return, base type, */
-#ifndef _ALPHA_
-		/* 18 */	NdrFcShort( 0x4 ),	/* x86, MIPS, PPC Stack size/offset = 4 */
-#else
-		NdrFcShort( 0x8 ),	/* Alpha Stack size/offset = 8 */
-#endif
-		/* 20 */	0x8,		/* FC_LONG */
-		0x0,		/* 0 */
-
-		/* Procedure Pause */
-
-		/* 22 */	0x33,		/* FC_AUTO_HANDLE */
-		0x6c,		/* Old Flags:  object, Oi2 */
-		/* 24 */	NdrFcLong( 0x0 ),	/* 0 */
-		/* 28 */	NdrFcShort( 0x8 ),	/* 8 */
-#ifndef _ALPHA_
-		/* 30 */	NdrFcShort( 0x8 ),	/* x86, MIPS, PPC Stack size/offset = 8 */
-#else
-		NdrFcShort( 0x10 ),	/* Alpha Stack size/offset = 16 */
-#endif
-		/* 32 */	NdrFcShort( 0x0 ),	/* 0 */
-		/* 34 */	NdrFcShort( 0x8 ),	/* 8 */
-		/* 36 */	0x4,		/* Oi2 Flags:  has return, */
-		0x1,		/* 1 */
-
-		/* Return value */
-
-		/* 38 */	NdrFcShort( 0x70 ),	/* Flags:  out, return, base type, */
-#ifndef _ALPHA_
-		/* 40 */	NdrFcShort( 0x4 ),	/* x86, MIPS, PPC Stack size/offset = 4 */
-#else
-		NdrFcShort( 0x8 ),	/* Alpha Stack size/offset = 8 */
-#endif
-		/* 42 */	0x8,		/* FC_LONG */
-		0x0,		/* 0 */
-
-		/* Procedure Stop */
-
-		/* 44 */	0x33,		/* FC_AUTO_HANDLE */
-		0x6c,		/* Old Flags:  object, Oi2 */
-		/* 46 */	NdrFcLong( 0x0 ),	/* 0 */
-		/* 50 */	NdrFcShort( 0x9 ),	/* 9 */
-#ifndef _ALPHA_
-		/* 52 */	NdrFcShort( 0x8 ),	/* x86, MIPS, PPC Stack size/offset = 8 */
-#else
-		NdrFcShort( 0x10 ),	/* Alpha Stack size/offset = 16 */
-#endif
-		/* 54 */	NdrFcShort( 0x0 ),	/* 0 */
-		/* 56 */	NdrFcShort( 0x8 ),	/* 8 */
-		/* 58 */	0x4,		/* Oi2 Flags:  has return, */
-		0x1,		/* 1 */
-
-		/* Return value */
-
-		/* 60 */	NdrFcShort( 0x70 ),	/* Flags:  out, return, base type, */
-#ifndef _ALPHA_
-		/* 62 */	NdrFcShort( 0x4 ),	/* x86, MIPS, PPC Stack size/offset = 4 */
-#else
-		NdrFcShort( 0x8 ),	/* Alpha Stack size/offset = 8 */
-#endif
-		/* 64 */	0x8,		/* FC_LONG */
-		0x0,		/* 0 */
-
-		/* Procedure Update */
-
-		/* 66 */	0x33,		/* FC_AUTO_HANDLE */
-		0x6c,		/* Old Flags:  object, Oi2 */
-		/* 68 */	NdrFcLong( 0x0 ),	/* 0 */
-		/* 72 */	NdrFcShort( 0xa ),	/* 10 */
-#ifndef _ALPHA_
-		/* 74 */	NdrFcShort( 0x10 ),	/* x86, MIPS, PPC Stack size/offset = 16 */
-#else
-		NdrFcShort( 0x20 ),	/* Alpha Stack size/offset = 32 */
-#endif
-		/* 76 */	NdrFcShort( 0x0 ),	/* 0 */
-		/* 78 */	NdrFcShort( 0x8 ),	/* 8 */
-		/* 80 */	0x6,		/* Oi2 Flags:  clt must size, has return, */
-		0x3,		/* 3 */
-
-		/* Parameter mtype */
-
-		/* 82 */	NdrFcShort( 0x8b ),	/* Flags:  must size, must free, in, by val, */
-#ifndef _ALPHA_
-		/* 84 */	NdrFcShort( 0x4 ),	/* x86, MIPS, PPC Stack size/offset = 4 */
-#else
-		NdrFcShort( 0x8 ),	/* Alpha Stack size/offset = 8 */
-#endif
-		/* 86 */	NdrFcShort( 0x1a ),	/* Type Offset=26 */
-
-		/* Parameter updates */
-
-		/* 88 */	NdrFcShort( 0x8b ),	/* Flags:  must size, must free, in, by val, */
-#ifndef _ALPHA_
-		/* 90 */	NdrFcShort( 0x8 ),	/* x86, MIPS, PPC Stack size/offset = 8 */
-#else
-		NdrFcShort( 0x10 ),	/* Alpha Stack size/offset = 16 */
-#endif
-		/* 92 */	NdrFcShort( 0x1a ),	/* Type Offset=26 */
-
-		/* Return value */
-
-		/* 94 */	NdrFcShort( 0x70 ),	/* Flags:  out, return, base type, */
-#ifndef _ALPHA_
-		/* 96 */	NdrFcShort( 0xc ),	/* x86, MIPS, PPC Stack size/offset = 12 */
-#else
-		NdrFcShort( 0x18 ),	/* Alpha Stack size/offset = 24 */
-#endif
-		/* 98 */	0x8,		/* FC_LONG */
-		0x0,		/* 0 */
-
-		/* Procedure get_URL */
-
-		/* 100 */	0x33,		/* FC_AUTO_HANDLE */
-		0x6c,		/* Old Flags:  object, Oi2 */
-		/* 102 */	NdrFcLong( 0x0 ),	/* 0 */
-		/* 106 */	NdrFcShort( 0xb ),	/* 11 */
-#ifndef _ALPHA_
-		/* 108 */	NdrFcShort( 0xc ),	/* x86, MIPS, PPC Stack size/offset = 12 */
-#else
-		NdrFcShort( 0x18 ),	/* Alpha Stack size/offset = 24 */
-#endif
-		/* 110 */	NdrFcShort( 0x0 ),	/* 0 */
-		/* 112 */	NdrFcShort( 0x8 ),	/* 8 */
-		/* 114 */	0x5,		/* Oi2 Flags:  srv must size, has return, */
-		0x2,		/* 2 */
-
-		/* Parameter mrl */
-
-		/* 116 */	NdrFcShort( 0x2113 ),	/* Flags:  must size, must free, out, simple ref, srv alloc size=8 */
-#ifndef _ALPHA_
-		/* 118 */	NdrFcShort( 0x4 ),	/* x86, MIPS, PPC Stack size/offset = 4 */
-#else
-		NdrFcShort( 0x8 ),	/* Alpha Stack size/offset = 8 */
-#endif
-		/* 120 */	NdrFcShort( 0x2c ),	/* Type Offset=44 */
-
-		/* Return value */
-
-		/* 122 */	NdrFcShort( 0x70 ),	/* Flags:  out, return, base type, */
-#ifndef _ALPHA_
-		/* 124 */	NdrFcShort( 0x8 ),	/* x86, MIPS, PPC Stack size/offset = 8 */
-#else
-		NdrFcShort( 0x10 ),	/* Alpha Stack size/offset = 16 */
-#endif
-		/* 126 */	0x8,		/* FC_LONG */
-		0x0,		/* 0 */
-
-		/* Procedure put_URL */
-
-		/* 128 */	0x33,		/* FC_AUTO_HANDLE */
-		0x6c,		/* Old Flags:  object, Oi2 */
-		/* 130 */	NdrFcLong( 0x0 ),	/* 0 */
-		/* 134 */	NdrFcShort( 0xc ),	/* 12 */
-#ifndef _ALPHA_
-		/* 136 */	NdrFcShort( 0xc ),	/* x86, MIPS, PPC Stack size/offset = 12 */
-#else
-		NdrFcShort( 0x18 ),	/* Alpha Stack size/offset = 24 */
-#endif
-		/* 138 */	NdrFcShort( 0x0 ),	/* 0 */
-		/* 140 */	NdrFcShort( 0x8 ),	/* 8 */
-		/* 142 */	0x6,		/* Oi2 Flags:  clt must size, has return, */
-		0x2,		/* 2 */
-
-		/* Parameter mrl */
-
-		/* 144 */	NdrFcShort( 0x8b ),	/* Flags:  must size, must free, in, by val, */
-#ifndef _ALPHA_
-		/* 146 */	NdrFcShort( 0x4 ),	/* x86, MIPS, PPC Stack size/offset = 4 */
-#else
-		NdrFcShort( 0x8 ),	/* Alpha Stack size/offset = 8 */
-#endif
-		/* 148 */	NdrFcShort( 0x1a ),	/* Type Offset=26 */
-
-		/* Return value */
-
-		/* 150 */	NdrFcShort( 0x70 ),	/* Flags:  out, return, base type, */
-#ifndef _ALPHA_
-		/* 152 */	NdrFcShort( 0x8 ),	/* x86, MIPS, PPC Stack size/offset = 8 */
-#else
-		NdrFcShort( 0x10 ),	/* Alpha Stack size/offset = 16 */
-#endif
-		/* 154 */	0x8,		/* FC_LONG */
-		0x0,		/* 0 */
-
-		/* Procedure get_AutoStart */
-
-		/* 156 */	0x33,		/* FC_AUTO_HANDLE */
-		0x6c,		/* Old Flags:  object, Oi2 */
-		/* 158 */	NdrFcLong( 0x0 ),	/* 0 */
-		/* 162 */	NdrFcShort( 0xd ),	/* 13 */
-#ifndef _ALPHA_
-		/* 164 */	NdrFcShort( 0xc ),	/* x86, MIPS, PPC Stack size/offset = 12 */
-#else
-		NdrFcShort( 0x18 ),	/* Alpha Stack size/offset = 24 */
-#endif
-		/* 166 */	NdrFcShort( 0x0 ),	/* 0 */
-		/* 168 */	NdrFcShort( 0xe ),	/* 14 */
-		/* 170 */	0x4,		/* Oi2 Flags:  has return, */
-		0x2,		/* 2 */
-
-		/* Parameter autoplay */
-
-		/* 172 */	NdrFcShort( 0x2150 ),	/* Flags:  out, base type, simple ref, srv alloc size=8 */
-#ifndef _ALPHA_
-		/* 174 */	NdrFcShort( 0x4 ),	/* x86, MIPS, PPC Stack size/offset = 4 */
-#else
-		NdrFcShort( 0x8 ),	/* Alpha Stack size/offset = 8 */
-#endif
-		/* 176 */	0x6,		/* FC_SHORT */
-		0x0,		/* 0 */
-
-		/* Return value */
-
-		/* 178 */	NdrFcShort( 0x70 ),	/* Flags:  out, return, base type, */
-#ifndef _ALPHA_
-		/* 180 */	NdrFcShort( 0x8 ),	/* x86, MIPS, PPC Stack size/offset = 8 */
-#else
-		NdrFcShort( 0x10 ),	/* Alpha Stack size/offset = 16 */
-#endif
-		/* 182 */	0x8,		/* FC_LONG */
-		0x0,		/* 0 */
-
-		/* Procedure put_AutoStart */
-
-		/* 184 */	0x33,		/* FC_AUTO_HANDLE */
-		0x6c,		/* Old Flags:  object, Oi2 */
-		/* 186 */	NdrFcLong( 0x0 ),	/* 0 */
-		/* 190 */	NdrFcShort( 0xe ),	/* 14 */
-#ifndef _ALPHA_
-		/* 192 */	NdrFcShort( 0xc ),	/* x86, MIPS, PPC Stack size/offset = 12 */
-#else
-		NdrFcShort( 0x18 ),	/* Alpha Stack size/offset = 24 */
-#endif
-		/* 194 */	NdrFcShort( 0x6 ),	/* 6 */
-		/* 196 */	NdrFcShort( 0x8 ),	/* 8 */
-		/* 198 */	0x4,		/* Oi2 Flags:  has return, */
-		0x2,		/* 2 */
-
-		/* Parameter autoplay */
-
-		/* 200 */	NdrFcShort( 0x48 ),	/* Flags:  in, base type, */
-#ifndef _ALPHA_
-		/* 202 */	NdrFcShort( 0x4 ),	/* x86, MIPS, PPC Stack size/offset = 4 */
-#else
-		NdrFcShort( 0x8 ),	/* Alpha Stack size/offset = 8 */
-#endif
-		/* 204 */	0x6,		/* FC_SHORT */
-		0x0,		/* 0 */
-
-		/* Return value */
-
-		/* 206 */	NdrFcShort( 0x70 ),	/* Flags:  out, return, base type, */
-#ifndef _ALPHA_
-		/* 208 */	NdrFcShort( 0x8 ),	/* x86, MIPS, PPC Stack size/offset = 8 */
-#else
-		NdrFcShort( 0x10 ),	/* Alpha Stack size/offset = 16 */
-#endif
-		/* 210 */	0x8,		/* FC_LONG */
-		0x0,		/* 0 */
-
-		0x0
-	}
-};
-
-static const MIDL_TYPE_FORMAT_STRING __MIDL_TypeFormatString =
-{
-	0,
-	{
-		NdrFcShort( 0x0 ),	/* 0 */
-		/*  2 */
-		0x12, 0x0,	/* FC_UP */
-		/*  4 */	NdrFcShort( 0xc ),	/* Offset= 12 (16) */
-		/*  6 */
-		0x1b,		/* FC_CARRAY */
-		0x1,		/* 1 */
-		/*  8 */	NdrFcShort( 0x2 ),	/* 2 */
-		/* 10 */	0x9,		/* Corr desc: FC_ULONG */
-		0x0,		/*  */
-		/* 12 */	NdrFcShort( 0xfffc ),	/* -4 */
-		/* 14 */	0x6,		/* FC_SHORT */
-		0x5b,		/* FC_END */
-		/* 16 */
-		0x17,		/* FC_CSTRUCT */
-		0x3,		/* 3 */
-		/* 18 */	NdrFcShort( 0x8 ),	/* 8 */
-		/* 20 */	NdrFcShort( 0xfffffff2 ),	/* Offset= -14 (6) */
-		/* 22 */	0x8,		/* FC_LONG */
-		0x8,		/* FC_LONG */
-		/* 24 */	0x5c,		/* FC_PAD */
-		0x5b,		/* FC_END */
-		/* 26 */	0xb4,		/* FC_USER_MARSHAL */
-		0x83,		/* 131 */
-		/* 28 */	NdrFcShort( 0x0 ),	/* 0 */
-		/* 30 */	NdrFcShort( 0x4 ),	/* 4 */
-		/* 32 */	NdrFcShort( 0x0 ),	/* 0 */
-		/* 34 */	NdrFcShort( 0xffffffe0 ),	/* Offset= -32 (2) */
-		/* 36 */
-		0x11, 0x4,	/* FC_RP alloced_on_stack */
-		/* 38 */	NdrFcShort( 0x6 ),	/* Offset= 6 (44) */
-		/* 40 */
-		0x13, 0x0,	/* FC_OP */
-		/* 42 */	NdrFcShort( 0xffffffe6 ),	/* Offset= -26 (16) */
-		/* 44 */	0xb4,		/* FC_USER_MARSHAL */
-		0x83,		/* 131 */
-		/* 46 */	NdrFcShort( 0x0 ),	/* 0 */
-		/* 48 */	NdrFcShort( 0x4 ),	/* 4 */
-		/* 50 */	NdrFcShort( 0x0 ),	/* 0 */
-		/* 52 */	NdrFcShort( 0xfffffff4 ),	/* Offset= -12 (40) */
-		/* 54 */
-		0x11, 0xc,	/* FC_RP alloced_on_stack simple_pointer */
-		/* 56 */	0x6,		/* FC_SHORT */
-		0x5c,		/* FC_PAD */
-
-		0x0
-	}
-};
-
-const CInterfaceProxyVtbl * _GPAX_ProxyVtblList =
-{
-	( CInterfaceProxyVtbl *) &_IGPAXProxyVtbl,
-	0
-};
-
-const CInterfaceStubVtbl * _GPAX_StubVtblList =
-{
-	( CInterfaceStubVtbl *) &_IGPAXStubVtbl,
-	0
-};
-
-PCInterfaceName const _GPAX_InterfaceNamesList =
-{
-	"IGPAX",
-	0
-};
-
-const IID *  _GPAX_BaseIIDList =
-{
-	&IID_IDispatch,
-	0
-};
-
-
-#define _GPAX_CHECK_IID(n)	IID_GENERIC_CHECK_IID( _GPAX, pIID, n)
-
-int __stdcall _GPAX_IID_Lookup( const IID * pIID, int * pIndex )
-{
-
-	if(!_GPAX_CHECK_IID(0))
-	{
-		*pIndex = 0;
-		return 1;
-	}
-
-	return 0;
-}
-
-const ExtendedProxyFileInfo GPAX_ProxyFileInfo =
-{
-	(PCInterfaceProxyVtblList *) & _GPAX_ProxyVtblList,
-	(PCInterfaceStubVtblList *) & _GPAX_StubVtblList,
-	(const PCInterfaceName * ) & _GPAX_InterfaceNamesList,
-	(const IID ** ) & _GPAX_BaseIIDList,
-	& _GPAX_IID_Lookup,
-	1,
-	2,
-	0, /* table of async_uuid interfaces */
-	0, /* Filler1 */
-	0, /* Filler2 */
-	0  /* Filler3 */
-};

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/GPAX/GPAXps.def Deleted

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/GPAX/GPAXps.mk Deleted

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/GPAX/StdAfx.cpp Deleted

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/GPAX/StdAfx.h Deleted

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/GPAX/dlldata.c Deleted

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/GPAX/gpax.bmp Deleted

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/GPAX/resource.h Deleted

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/dashcast Deleted

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/dashcast/Makefile Deleted

@@ -1,86 +0,0 @@
-include ../../config.mak
-
-vpath %.c $(SRC_PATH)/applications/dashcast
-
-CFLAGS= $(OPTFLAGS) -D_GNU_SOURCE -Wno-deprecated-declarations -I"$(SRC_PATH)/include" -I../../ $(ffmpeg_cflags)
-
-LINKFLAGS=$(GPAC_SH_FLAGS)
-
-ifeq ($(DEBUGBUILD),yes)
-CFLAGS+=-g
-LDFLAGS+=-g
-endif
-
-ifeq ($(GPROFBUILD),yes)
-CFLAGS+=-pg
-LDFLAGS+=-pg
-endif
-
-ifeq ($(GPACREADONLY),yes)
-CFLAGS+=-DGPAC_READ_ONLY
-endif
-
-ifneq ($(CONFIG_LIBAV),no)
-CFLAGS+=-DGPAC_USE_LIBAV
-endif
-
-ifeq ($(CONFIG_WIN32),yes)
-EXE=.exe
-PROG=DashCast$(EXE)
-else
-EXT=
-PROG=DashCast
-endif
-
-
-ifeq ($(STATICBUILD),yes)
-##include static modules and other deps for libgpac
-include ../../static.mak
-LINKFLAGS+=-lgpac_static
-LINKFLAGS+= $(GPAC_SH_FLAGS)
-LINKFLAGS+=$(EXTRALIBS)
-else
-LINKFLAGS+=-lgpac
-endif
-
-#common obj
-OBJS= dashcast.o audio_data.o audio_decoder.o audio_encoder.o audio_muxer.o circular_buffer.o cmd_data.o controler.o message_queue.o register.o video_data.o video_decoder.o video_encoder.o video_muxer.o video_scaler.o task.o
-
-LINKFLAGS+= $(ffmpeg_lflags_dashcast)
-
-ifneq ($(CONFIG_LIBSWRESAMPLE),no)
-CFLAGS+=-DDC_AUDIO_RESAMPLER
-LINKFLAGS+=-lswresample
-endif
-
-ifeq ($(CONFIG_DARWIN),yes)
-#fixme - use proper detection of libavdevice dependencies
-#LINKFLAGS+=-lavfilter -lswresample -lbz2
-endif
-
-SRCS := $(OBJS:.o=.c)
-
-all: $(PROG)
-
-DashCast$(EXE): $(OBJS)
-	$(CC) -o ../../bin/gcc/$@ $(OBJS) -L../../bin/gcc $(LDFLAGS) $(LINKFLAGS)
-
-clean:
-	rm -f $(OBJS) ../../bin/gcc/$(PROG)
-
-install: clean
-	install -m 755 $(INSTFLAGS) ../../bin/gcc/DashCast "$(DESTDIR)$(prefix)/bin"
-
-uninstall:
-	rm -rf $(DESTDIR)$(prefix)/bin/DashCast
-
-dep: depend
-
-depend:
-	rm -f .depend
-	$(CC) -MM $(CFLAGS) $(SRCS) 1>.depend
-
-distclean: clean
-	rm -f Makefile.bak .depend
-
--include .depend

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/dashcast/audio_data.c Deleted

@@ -1,97 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Arash Shafiei
- *			Copyright (c) Telecom ParisTech 2000-2013
- *					All rights reserved
- *
- *  This file is part of GPAC / dashcast
- *
- *  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 "audio_data.h"
-
-
-void dc_audio_data_set_default(AudioDataConf *audio_data_conf)
-{
-	strcpy(audio_data_conf->filename, "");
-	strcpy(audio_data_conf->format, "");
-	strcpy(audio_data_conf->codec, "");
-	audio_data_conf->bitrate = -1;
-	audio_data_conf->channels= -1;
-	audio_data_conf->samplerate = -1;
-}
-
-void dc_audio_data_init(AudioDataConf *audio_data_conf, char *filename, char *format)
-{
-	if (filename != NULL && strlen(filename) > 0)
-		strcpy(audio_data_conf->filename, filename);
-	else
-		strcpy(audio_data_conf->filename, "");
-
-	if (format != NULL && strlen(format) > 0)
-		strcpy(audio_data_conf->format, format);
-	else
-		strcpy(audio_data_conf->format, "");
-}
-
-int dc_audio_input_data_init(AudioInputData *audio_input_data, int channels, int samplerate, int num_consumers, int mode)
-{
-	int i;
-
-	dc_producer_init(&audio_input_data->producer, AUDIO_CB_SIZE, "audio decoder");
-	dc_circular_buffer_create(&audio_input_data->circular_buf, AUDIO_CB_SIZE, mode, num_consumers);
-
-	for (i = 0; i < AUDIO_CB_SIZE; i++) {
-		AudioDataNode *audio_data_node = (AudioDataNode*)gf_malloc(sizeof(AudioDataNode));
-		audio_input_data->circular_buf.listi.data = (void *) audio_data_node;
-
-		audio_data_node->abuf_size = MAX_AUDIO_PACKET_SIZE;
-		audio_data_node->abuf = (uint8_t*)gf_malloc(audio_data_node->abuf_size * sizeof(uint8_t));
-	}
-
-	audio_input_data->aframe = FF_ALLOC_FRAME();
-	if (audio_input_data->aframe == NULL) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Cannot initialize AudioInputData"));
-		return -1;
-	}
-
-	audio_input_data->channels = channels;
-	audio_input_data->samplerate = samplerate;
-
-	return 0;
-}
-
-void dc_audio_input_data_destroy(AudioInputData *audio_input_data)
-{
-	int i;
-	if (audio_input_data->circular_buf.list) {
-		for (i = 0; i < AUDIO_CB_SIZE; i++) {
-			AudioDataNode *audio_data_node = (AudioDataNode*)audio_input_data->circular_buf.listi.data;
-			gf_free(audio_data_node->abuf);
-			gf_free(audio_data_node);
-		}
-	}
-
-	dc_circular_buffer_destroy(&audio_input_data->circular_buf);
-}
-
-void dc_audio_inout_data_end_signal(AudioInputData *audio_input_data)
-{
-	dc_producer_end_signal(&audio_input_data->producer, &audio_input_data->circular_buf);
-	dc_producer_end_signal_previous(&audio_input_data->producer, &audio_input_data->circular_buf);
-}

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/dashcast/audio_data.h Deleted

@@ -1,146 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Arash Shafiei
- *			Copyright (c) Telecom ParisTech 2000-2013
- *					All rights reserved
- *
- *  This file is part of GPAC / dashcast
- *
- *  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.
- *
- */
-
-#ifndef AUDIO_DATA_H_
-#define AUDIO_DATA_H_
-
-#define AUDIO_CB_SIZE 3
-
-#define LIVE_FRAME_SIZE 1024
-#define MAX_AUDIO_PACKET_SIZE (128 * 1024)
-
-
-#include "../../modules/ffmpeg_in/ffmpeg_in.h"
-#include "libavcodec/avcodec.h"
-#include "libavutil/channel_layout.h"
-#include "libavutil/mem.h"
-#include "libav_compat.h"
-#include "circular_buffer.h"
-
-#include <time.h>
-
-//we force the number of channels between the decoder and the encoder: interleaved 16 bits stereo 44100Hz
-#define DC_AUDIO_SAMPLE_RATE 44100
-#define DC_AUDIO_NUM_CHANNELS 2
-#define DC_AUDIO_CHANNEL_LAYOUT AV_CH_LAYOUT_STEREO
-#define DC_AUDIO_SAMPLE_FORMAT AV_SAMPLE_FMT_S16
-
-#define DC_AUDIO_MAX_CHUNCK_SIZE 192000
-
-
-/*
- * AudioInputData is designed to keep the data of input audio in a circular buffer.
- * The circular buffer has its own mechanism for synchronization.
- */
-typedef struct {
-	/* The circular buffer of input audio. Input audio is the audio frames after decoding. */
-	CircularBuffer circular_buf;
-
-	/* The user of circular buffer has an index to it, which is in this variable. */
-	Producer producer;
-
-	AVFrame *aframe;
-
-	int64_t next_pts;
-
-	int channels;
-	int samplerate;
-} AudioInputData;
-
-/*
- * This structure corresponds to an entry of audio configuration in the configuration file
- */
-typedef struct {
-	/* audio file name */
-	char filenameGF_MAX_PATH;
-	/* audio format */
-	char formatGF_MAX_PATH;
-	/* audio bitrate */
-	int bitrate;
-	/* audio samplerate */
-	int samplerate;
-	/* audio channel number */
-	int channels;
-	/* audio codec */
-	char codecGF_MAX_PATH;
-	/* custom parameter to be passed directly to the encoder - free it once you're done */
-	char customGF_MAX_PATH;
-
-	/* used for source switching */
-	char source_idGF_MAX_PATH;
-	time_t start_time;
-	time_t end_time;
-
-	/* RFC6381 codec name, only valid when VIDEO_MUXER == GPAC_INIT_VIDEO_MUXER_AVC1 */
-	char codec6381RFC6381_CODEC_NAME_SIZE_MAX;
-} AudioDataConf;
-
-/*
- * Each node in a circular buffer is a pointer.
- * To use the circular buffer for audio frame we must
- * define the node. AudioDataNode simply contains
- * an AVFrame.
- */
-typedef struct {
-	uint8_t *abuf;
-	int abuf_size;
-	uint64_t channel_layout;
-	int sample_rate;
-	int format;
-	int channels;
-} AudioDataNode;
-
-void dc_audio_data_set_default(AudioDataConf *audio_data_conf);
-
-/*
- * Initialize an AudioInputData.
- *
- * @param audio_input_data out is the structure to be initialize.
- * @param num_consumers in contains information on the number of users of circular buffer;
- * which means the number of audio encoders.
- * @param live in indicates the system is live
- *
- * @return 0 on success, -1 on failure.
- *
- * @note Must use dc_audio_data_destroy to free memory.
- */
-int dc_audio_input_data_init(AudioInputData *audio_input_data, int channels, int samplerate, int num_consumers, int mode);
-
-/*
- * Destroy an AudioInputData
- *
- * @param audio_input_data in the structure to be destroyed.
- */
-void dc_audio_input_data_destroy(AudioInputData *audio_input_data);
-
-/*
- * Signal to all the users of the circular buffer in the AudioInputData
- * which the current node is the last node to consume.
- *
- * @param audio_input_data in the structure to be signaled on.
- */
-void dc_audio_inout_data_end_signal(AudioInputData *audio_input_data);
-
-#endif /* AUDIO_DATA_H_ */

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/dashcast/audio_decoder.c Deleted

@@ -1,446 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Arash Shafiei
- *			Copyright (c) Telecom ParisTech 2000-2013
- *					All rights reserved
- *
- *  This file is part of GPAC / dashcast
- *
- *  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 "audio_decoder.h"
-
-int dc_audio_decoder_open(AudioInputFile *audio_input_file, AudioDataConf *audio_data_conf, int mode, int no_loop, int video_framerate)
-{
-	u32 i;
-	AVCodecContext *codec_ctx;
-	AVCodec *codec;
-	AVInputFormat *in_fmt = NULL;
-
-	if (!audio_data_conf) return -1;
-	
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("DashCast Audio Decoder enter setup at UTC "LLU"\n", gf_net_get_utc() ));
-	
-	if (strcmp(audio_data_conf->format,"") != 0) {
-		in_fmt = av_find_input_format(audio_data_conf->format);
-		if (in_fmt == NULL) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Cannot find the format %s.\n", audio_data_conf->format));
-			return -1;
-		}
-	}
-
-	/*
-	 * Open audio (may already be opened when shared with the video input).
-	 */
-	if (!audio_input_file->av_fmt_ctx) {
-		s32 ret;
-		AVDictionary *options = NULL;
-		//we may need to set the framerate when the default one used by ffmpeg is not supported
-		if (video_framerate > 0) {
-			char vfr16;
-			snprintf(vfr, sizeof(vfr), "%d", video_framerate);
-			ret = av_dict_set(&options, "framerate", vfr, 0);
-			if (ret < 0) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Could not set video framerate %s.\n", vfr));
-				return -1;
-			}
-		}
-		
-		ret = avformat_open_input(&audio_input_file->av_fmt_ctx, audio_data_conf->filename, in_fmt, options ? &options : NULL);
-
-		if (ret != 0) {
-			if (options) {
-				av_dict_free(&options);
-				options = NULL;
-				GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Error %d opening input - retrying without options\n", ret));
-				ret = avformat_open_input(&audio_input_file->av_fmt_ctx, audio_data_conf->filename, in_fmt, NULL);
-			}
-
-			if (ret != 0) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Cannot open file: %s\n", audio_data_conf->filename));
-				return -1;
-			}
-		}
-
-		if (options) av_dict_free(&options);
-
-		/*
-		* Retrieve stream information
-		*/
-		if (avformat_find_stream_info(audio_input_file->av_fmt_ctx, NULL) < 0) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Cannot find stream information\n"));
-			return -1;
-		}
-
-		av_dump_format(audio_input_file->av_fmt_ctx, 0, audio_data_conf->filename, 0);
-	}
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("DashCast Audio capture open at UTC "LLU"\n", gf_net_get_utc() ));
-
-	/*
-	 * Find the first audio stream
-	 */
-	audio_input_file->astream_idx = -1;
-	for (i=0; i<audio_input_file->av_fmt_ctx->nb_streams; i++) {
-		if (audio_input_file->av_fmt_ctx->streamsi->codec->codec_type == AVMEDIA_TYPE_AUDIO) {
-			audio_input_file->astream_idx = i;
-			break;
-		}
-	}
-	if (audio_input_file->astream_idx == -1) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Cannot find a audio stream\n"));
-		return -1;
-	}
-
-	/*
-	 * Get a pointer to the codec context for the audio stream
-	 */
-	codec_ctx = audio_input_file->av_fmt_ctx->streamsaudio_input_file->astream_idx->codec;
-
-	/*
-	 * Find the decoder for the audio stream
-	 */
-	codec = avcodec_find_decoder(codec_ctx->codec_id);
-	if (codec == NULL) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Input audio codec is not supported.\n"));
-		avformat_close_input(&audio_input_file->av_fmt_ctx);
-		return -1;
-	}
-
-	/*
-	 * Open codec
-	 */
-	if (avcodec_open2(codec_ctx, codec, NULL) < 0) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Cannot open input audio codec.\n"));
-		avformat_close_input(&audio_input_file->av_fmt_ctx);
-		return -1;
-	}
-
-#ifdef DC_AUDIO_RESAMPLER
-	audio_input_file->aresampler = NULL;
-#endif
-	audio_input_file->fifo = av_fifo_alloc(2 * MAX_AUDIO_PACKET_SIZE);
-
-	audio_data_conf->channels = codec_ctx->channels;
-	audio_data_conf->samplerate = codec_ctx->sample_rate;
-
-	audio_input_file->mode = mode;
-	audio_input_file->no_loop = no_loop;
-
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("DashCast Audio Decoder open at UTC "LLU"\n", gf_net_get_utc() ));
-	
-	return 0;
-}
-
-#ifdef DC_AUDIO_RESAMPLER
-static int ensure_resampler(AudioInputFile *audio_input_file, int sample_rate, int num_channels, u64 channel_layout, enum AVSampleFormat sample_format)
-{
-	if (!audio_input_file->aresampler) {
-		audio_input_file->aresampler = swr_alloc();
-		if (!audio_input_file->aresampler) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Cannot allocate the audio resampler. Aborting.\n"));
-			return -1;
-		}
-		av_opt_set_channel_layout(audio_input_file->aresampler, "in_channel_layout", channel_layout, 0);
-		av_opt_set_channel_layout(audio_input_file->aresampler, "out_channel_layout", DC_AUDIO_CHANNEL_LAYOUT, 0);
-		av_opt_set_sample_fmt(audio_input_file->aresampler, "in_sample_fmt", sample_format, 0);
-		av_opt_set_sample_fmt(audio_input_file->aresampler, "out_sample_fmt", DC_AUDIO_SAMPLE_FORMAT, 0);
-		av_opt_set_int(audio_input_file->aresampler, "in_sample_rate", sample_rate, 0);
-		av_opt_set_int(audio_input_file->aresampler, "out_sample_rate", DC_AUDIO_SAMPLE_RATE, 0);
-		av_opt_set_int(audio_input_file->aresampler, "in_channels", num_channels, 0);
-		av_opt_set_int(audio_input_file->aresampler, "out_channels", DC_AUDIO_NUM_CHANNELS, 0);
-
-		if (swr_init(audio_input_file->aresampler)) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Could not open the audio resampler. Aborting.\n"));
-			return -1;
-		}
-	}
-
-	return 0;
-}
-
-//resample - see http://ffmpeg.org/pipermail/libav-user/2012-June/002164.html
-static int resample_audio(AudioInputFile *audio_input_file, AudioInputData *audio_input_data, AVCodecContext *audio_codec_ctx, uint8_t ***output, int *num_planes_out, int num_channels, enum AVSampleFormat sample_format)
-{
-	int i;
-	*num_planes_out = av_sample_fmt_is_planar(DC_AUDIO_SAMPLE_FORMAT) ? DC_AUDIO_NUM_CHANNELS : 1;
-	*output = (uint8_t**)av_malloc(*num_planes_out*sizeof(uint8_t*));
-	for (i=0; i<*num_planes_out; i++) {
-		(*output) i = (uint8_t*)av_malloc(DC_AUDIO_MAX_CHUNCK_SIZE); //FIXME: fix using size below av_samples_get_buffer_size()
-	}
-
-	i = swr_convert(audio_input_file->aresampler, *output, audio_input_data->aframe->nb_samples, (const uint8_t **)audio_input_data->aframe->extended_data, audio_input_data->aframe->nb_samples);
-	if (i < 0) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Could not resample audio frame. Aborting.\n"));
-		return -1;
-	}
-
-	return i;
-}
-#endif
-
-int dc_audio_decoder_read(AudioInputFile *audio_input_file, AudioInputData *audio_input_data)
-{
-	int ret;
-	AVPacket packet;
-	int got_frame = 0;
-	AVCodecContext *codec_ctx;
-	AudioDataNode *audio_data_node;
-
-	/* Get a pointer to the codec context for the audio stream */
-	codec_ctx = audio_input_file->av_fmt_ctx->streamsaudio_input_file->astream_idx->codec;
-
-	/* Read frames */
-	while (1) {
-		if (audio_input_file->av_pkt_list) {
-			if (gf_list_count(audio_input_file->av_pkt_list)) {
-				AVPacket *packet_copy;
-				assert(audio_input_file->av_pkt_list);
-				gf_mx_p(audio_input_file->av_pkt_list_mutex);
-				packet_copy = (AVPacket*)gf_list_pop_front(audio_input_file->av_pkt_list);
-				gf_mx_v(audio_input_file->av_pkt_list_mutex);
-
-				if (packet_copy == NULL) {
-					ret = AVERROR_EOF;
-				} else {
-					memcpy(&packet, packet_copy, sizeof(AVPacket));
-					gf_free(packet_copy);
-					ret = 0;
-				}
-			} else {
-				gf_sleep(1);
-				continue;
-			}
-		} else {
-			ret = av_read_frame(audio_input_file->av_fmt_ctx, &packet);
-		}
-		if (ret == AVERROR_EOF) {
-			if (audio_input_file->mode == LIVE_MEDIA && audio_input_file->no_loop == 0) {
-				av_seek_frame(audio_input_file->av_fmt_ctx, audio_input_file->astream_idx, 0, 0);
-				continue;
-			}
-
-			/* Flush decoder */
-			packet.data = NULL;
-			packet.size = 0;
-
-#ifndef FF_API_AVFRAME_LAVC
-			avcodec_get_frame_defaults(audio_input_data->aframe);
-#else
-			av_frame_unref(audio_input_data->aframe);
-#endif
-
-			avcodec_decode_audio4(codec_ctx, audio_input_data->aframe, &got_frame, &packet);
-
-			if (got_frame) {
-				dc_producer_lock(&audio_input_data->producer, &audio_input_data->circular_buf);
-				dc_producer_unlock_previous(&audio_input_data->producer, &audio_input_data->circular_buf);
-				audio_data_node = (AudioDataNode*)dc_producer_produce(&audio_input_data->producer, &audio_input_data->circular_buf);
-
-				audio_data_node->abuf_size = audio_input_data->aframe->linesize0;
-				memcpy(audio_data_node->abuf, audio_input_data->aframe->data0, audio_data_node->abuf_size);
-
-				dc_producer_advance(&audio_input_data->producer, &audio_input_data->circular_buf);
-				return 0;
-			}
-
-			dc_producer_end_signal(&audio_input_data->producer, &audio_input_data->circular_buf);
-			dc_producer_unlock_previous(&audio_input_data->producer, &audio_input_data->circular_buf);
-
-			return -2;
-		}
-		else if (ret < 0)
-		{
-			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Cannot read audio frame.\n"));
-			continue;
-		}
-
-		/* Is this a packet from the audio stream? */
-		if (packet.stream_index == audio_input_file->astream_idx) {
-			/* Set audio frame to default */
-
-#ifndef FF_API_AVFRAME_LAVC
-			avcodec_get_frame_defaults(audio_input_data->aframe);
-#else
-			av_frame_unref(audio_input_data->aframe);
-#endif
-
-			/* Decode audio frame */
-			if (avcodec_decode_audio4(codec_ctx, audio_input_data->aframe, &got_frame, &packet) < 0) {
-				av_free_packet(&packet);
-				GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Error while decoding audio.\n"));
-				dc_producer_end_signal(&audio_input_data->producer, &audio_input_data->circular_buf);
-				dc_producer_unlock_previous(&audio_input_data->producer, &audio_input_data->circular_buf);
-				return -1;
-			}
-
-			if (audio_input_data->aframe->pts != AV_NOPTS_VALUE)
-				audio_input_data->next_pts = audio_input_data->aframe->pts;
-
-			audio_input_data->next_pts += ((int64_t)AV_TIME_BASE * audio_input_data->aframe->nb_samples) / codec_ctx->sample_rate;
-
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("DashCast Decode audio frame pts %d at UTC "LLU"\n", audio_input_data->next_pts, gf_net_get_utc() ));
-			
-			/* Did we get an audio frame? */
-			if (got_frame) {
-				uint8_t **data;
-				int data_size;
-				enum AVSampleFormat sample_format;
-				Bool resample;
-#ifdef DC_AUDIO_RESAMPLER
-				int num_planes_out=0;
-#endif
-#ifdef GPAC_USE_LIBAV
-				int sample_rate = codec_ctx->sample_rate;
-				int num_channels = codec_ctx->channels;
-				u64 channel_layout = codec_ctx->channel_layout;
-#else
-				int sample_rate = audio_input_data->aframe->sample_rate;
-				int num_channels = audio_input_data->aframe->channels;
-				u64 channel_layout;
-				if (!audio_input_data->aframe->channel_layout) {
-					if (audio_input_data->aframe->channels == 2) {
-						audio_input_data->aframe->channel_layout = AV_CH_LAYOUT_STEREO;
-					} else if (audio_input_data->aframe->channels == 1) {
-						audio_input_data->aframe->channel_layout = AV_CH_LAYOUT_MONO;
-					} else {
-						GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Unknown input channel layout for %d channels. Aborting.\n", audio_input_data->aframe->channels));
-						exit(1);
-					}
-				}
-				channel_layout = audio_input_data->aframe->channel_layout;
-#endif
-				sample_format = (enum AVSampleFormat)audio_input_data->aframe->format;
-				resample = (sample_rate    != DC_AUDIO_SAMPLE_RATE
-				                 || num_channels   != DC_AUDIO_NUM_CHANNELS
-				                 || channel_layout != DC_AUDIO_CHANNEL_LAYOUT
-				                 || sample_format  != DC_AUDIO_SAMPLE_FORMAT);
-
-				/* Resample if needed */
-				if (resample) {
-#ifndef DC_AUDIO_RESAMPLER
-					GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Audio resampling is needed at the decoding stage, but not supported by your version of DashCast. Aborting.\n"));
-					exit(1);
-#else
-					uint8_t **output;
-					int nb_samp;
-					if (ensure_resampler(audio_input_file, sample_rate, num_channels, channel_layout, sample_format)) {
-						return -1;
-					}
-
-					nb_samp = resample_audio(audio_input_file, audio_input_data, codec_ctx, &output, &num_planes_out, num_channels, sample_format);
-					if (nb_samp<0) {
-						return -1;
-					}
-
-					av_samples_get_buffer_size(&data_size, DC_AUDIO_NUM_CHANNELS, nb_samp, DC_AUDIO_SAMPLE_FORMAT, 0);
-					data = output;
-#endif
-				} else {
-					/*no resampling needed: read data from the AVFrame*/
-					data = audio_input_data->aframe->extended_data;
-					data_size = audio_input_data->aframe->linesize0;
-				}
-
-				assert(!av_sample_fmt_is_planar(DC_AUDIO_SAMPLE_FORMAT));
-				av_fifo_generic_write(audio_input_file->fifo, data0, data_size, NULL);
-
-				if (/*audio_input_file->circular_buf.mode == OFFLINE*/audio_input_file->mode == ON_DEMAND || audio_input_file->mode == LIVE_MEDIA) {
-					dc_producer_lock(&audio_input_data->producer, &audio_input_data->circular_buf);
-
-					/* Unlock the previous node in the circular buffer. */
-					dc_producer_unlock_previous(&audio_input_data->producer, &audio_input_data->circular_buf);
-
-					/* Get the pointer of the current node in circular buffer. */
-					audio_data_node = (AudioDataNode *) dc_producer_produce(&audio_input_data->producer, &audio_input_data->circular_buf);
-					audio_data_node->channels = DC_AUDIO_NUM_CHANNELS;
-					audio_data_node->channel_layout = DC_AUDIO_CHANNEL_LAYOUT;
-					audio_data_node->sample_rate = DC_AUDIO_SAMPLE_RATE;
-					audio_data_node->format = DC_AUDIO_SAMPLE_FORMAT;
-					audio_data_node->abuf_size = data_size;
-					av_fifo_generic_read(audio_input_file->fifo, audio_data_node->abuf, audio_data_node->abuf_size, NULL);
-
-					dc_producer_advance(&audio_input_data->producer, &audio_input_data->circular_buf);
-				} else {
-					while (av_fifo_size(audio_input_file->fifo) >= LIVE_FRAME_SIZE) {
-						/* Lock the current node in the circular buffer. */
-						if (dc_producer_lock(&audio_input_data->producer, &audio_input_data->circular_buf) < 0) {
-							continue;
-						}
-
-						/* Unlock the previous node in the circular buffer. */
-						dc_producer_unlock_previous(&audio_input_data->producer, &audio_input_data->circular_buf);
-
-						/* Get the pointer of the current node in circular buffer. */
-						audio_data_node = (AudioDataNode *) dc_producer_produce(&audio_input_data->producer, &audio_input_data->circular_buf);
-
-						audio_data_node->abuf_size = LIVE_FRAME_SIZE;
-						av_fifo_generic_read(audio_input_file->fifo, audio_data_node->abuf, audio_data_node->abuf_size, NULL);
-
-						dc_producer_advance(&audio_input_data->producer, &audio_input_data->circular_buf);
-					}
-				}
-
-#ifdef DC_AUDIO_RESAMPLER
-				if (resample) {
-					int i;
-					for (i=0; i<num_planes_out; ++i) {
-						av_free(datai);
-					}
-					av_free(data);
-				}
-#endif
-
-				return 0;
-			}
-		}
-
-		/*
-		 * Free the packet that was allocated by av_read_frame
-		 */
-		av_free_packet(&packet);
-	}
-
-	GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Unknown error while reading audio frame.\n"));
-	return -1;
-}
-
-void dc_audio_decoder_close(AudioInputFile *audio_input_file)
-{
-	/*
-	 * Close the audio format context
-	 */
-	avformat_close_input(&audio_input_file->av_fmt_ctx);
-
-	if (audio_input_file->av_pkt_list_mutex) {
-		gf_mx_p(audio_input_file->av_pkt_list_mutex);
-		while (gf_list_count(audio_input_file->av_pkt_list)) {
-			AVPacket *pkt = (AVPacket*)gf_list_last(audio_input_file->av_pkt_list);
-			av_free_packet(pkt);
-			gf_list_rem_last(audio_input_file->av_pkt_list);
-		}
-		gf_list_del(audio_input_file->av_pkt_list);
-		gf_mx_v(audio_input_file->av_pkt_list_mutex);
-		gf_mx_del(audio_input_file->av_pkt_list_mutex);
-	}
-
-	av_fifo_free(audio_input_file->fifo);
-
-#ifdef DC_AUDIO_RESAMPLER
-	swr_free(&audio_input_file->aresampler);
-#endif
-}

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/dashcast/audio_decoder.h Deleted

@@ -1,100 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Arash Shafiei
- *			Copyright (c) Telecom ParisTech 2000-2013
- *					All rights reserved
- *
- *  This file is part of GPAC / dashcast
- *
- *  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.
- *
- */
-
-#ifndef AUDIO_DECODER_H_
-#define AUDIO_DECODER_H_
-
-#include "audio_data.h"
-
-#include "libavformat/avformat.h"
-#include "libavutil/fifo.h"
-#ifdef DC_AUDIO_RESAMPLER
-#include "libavutil/opt.h"
-#include "libswresample/swresample.h"
-#endif
-
-
-/*
- * The structure which keeps the data of
- * input audio file.
- */
-typedef struct {
-	/* Format context structure provided by avlib to open and read from a media file. */
-	AVFormatContext *av_fmt_ctx;
-
-	/* A list of AVPackets and return value to be processed: when this parameter is non-null,
-	 * the video thread makes the demux and pushes the packets. */
-	GF_List  *av_pkt_list;
-	GF_Mutex *av_pkt_list_mutex;
-
-	/* The index of the audio stream in the file. */
-	int astream_idx;
-
-	/* This is the output FIFO linking the decoder to the other encoder: only conveys
-	 * stereo 44100 (and resample if needed) */
-	AVFifoBuffer *fifo;
-#ifdef DC_AUDIO_RESAMPLER
-	/* Optional audio resampling between the decoder and the encoder */
-	SwrContext *aresampler;
-#endif
-
-	LockMode mode;
-	int no_loop;
-} AudioInputFile;
-
-/*
- * Open the input audio
- *
- * @param cmd_data in contains information about the file name
- * and the audio format.
- *
- * @param audio_input_file out pointer to the structure which we want to
- * open the file
- *
- * @return 0 on success -1 on failure.
- */
-int dc_audio_decoder_open(AudioInputFile *audio_input_file, AudioDataConf *audio_data_conf, int mode, int no_loop, int video_framerate);
-
-/*
- * Read and decode audio and put samples on circular buffer
- *
- * @param audio_input_file in contains info on input audio. This parameter
- * must have been opened with open_audio_input
- *
- * @param audio_input_data out the samples will be saved on the circular buffer
- * of this parameter.
- *
- * @return 0 on success, -1 on failure, -2 on EOF (end of the file)
- */
-int dc_audio_decoder_read(AudioInputFile *audio_input_file, AudioInputData *audio_input_data);
-
-/*
- * Close the input audio
- *
- * @param audio_input_file in the audio file to be closed
- */
-void dc_audio_decoder_close(AudioInputFile *audio_input_file);
-
-#endif /* AUDIO_DECODER_H_ */

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/dashcast/audio_encoder.c Deleted

@@ -1,355 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Arash Shafiei
- *			Copyright (c) Telecom ParisTech 2000-2013
- *					All rights reserved
- *
- *  This file is part of GPAC / dashcast
- *
- *  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 "audio_encoder.h"
-
-
-extern void build_dict(void *priv_data, const char *options);
-
-
-int dc_audio_encoder_open(AudioOutputFile *audio_output_file, AudioDataConf *audio_data_conf)
-{
-	AVDictionary *opts = NULL;
-
-	audio_output_file->audio_data_conf = audio_data_conf;
-	audio_output_file->fifo = av_fifo_alloc(2 * MAX_AUDIO_PACKET_SIZE);
-	audio_output_file->aframe = FF_ALLOC_FRAME();
-	audio_output_file->adata_buf = (uint8_t*) av_malloc(2 * MAX_AUDIO_PACKET_SIZE);
-#ifndef GPAC_USE_LIBAV
-	audio_output_file->aframe->channels = -1;
-#endif
-#ifndef LIBAV_FRAME_OLD
-	audio_output_file->aframe->channel_layout = 0;
-	audio_output_file->aframe->sample_rate = -1;
-#endif
-	audio_output_file->aframe->format = -1;
-	audio_output_file->codec = avcodec_find_encoder_by_name(audio_data_conf->codec);
-	if (audio_output_file->codec == NULL) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Output audio codec %s not found\n", audio_data_conf->codec));
-		return -1;
-	}
-
-	audio_output_file->codec_ctx = avcodec_alloc_context3(audio_output_file->codec);
-	audio_output_file->codec_ctx->codec_id = audio_output_file->codec->id;
-	audio_output_file->codec_ctx->codec_type = AVMEDIA_TYPE_AUDIO;
-	audio_output_file->codec_ctx->bit_rate = audio_data_conf->bitrate;
-	audio_output_file->codec_ctx->sample_rate = DC_AUDIO_SAMPLE_RATE /*audio_data_conf->samplerate*/;
-
-	{
-		AVRational time_base;
-		time_base.num = 1;
-		time_base.den = audio_output_file->codec_ctx->sample_rate;
-		audio_output_file->codec_ctx->time_base = time_base;
-	}
-	audio_output_file->codec_ctx->channels = audio_data_conf->channels;
-	
-	/*FIXME: depends on channels -> http://ffmpeg.org/doxygen/trunk/channel__layout_8c_source.html#l00074*/
-	if (audio_data_conf->channels == 1) {
-		audio_output_file->codec_ctx->channel_layout = AV_CH_LAYOUT_MONO;
-	} else {
-		audio_output_file->codec_ctx->channel_layout = AV_CH_LAYOUT_STEREO;
-	}
-
-	audio_output_file->codec_ctx->sample_fmt = audio_output_file->codec->sample_fmts0;
-#ifdef DC_AUDIO_RESAMPLER
-	audio_output_file->aresampler = NULL;
-#endif
-	if (strcmp(audio_data_conf->custom, "")) {
-		build_dict(audio_output_file->codec_ctx->priv_data, audio_data_conf->custom);
-	}
-	audio_output_file->astream_idx = 0;
-
-	/* open the audio codec */
-	av_dict_set(&opts, "strict", "experimental", 0);
-	if (avcodec_open2(audio_output_file->codec_ctx, audio_output_file->codec, &opts) < 0) {
-		/*FIXME: if we enter here (set "mp2" as a codec and "200000" as a bitrate -> deadlock*/
-		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Cannot open output audio codec\n"));
-		av_dict_free(&opts);
-		return -1;
-	}
-	av_dict_free(&opts);
-
-	audio_output_file->frame_bytes = audio_output_file->codec_ctx->frame_size * av_get_bytes_per_sample(DC_AUDIO_SAMPLE_FORMAT) * DC_AUDIO_NUM_CHANNELS;
-
-#ifndef FF_API_AVFRAME_LAVC
-	avcodec_get_frame_defaults(audio_output_file->aframe);
-#else
-	av_frame_unref(audio_output_file->aframe);
-#endif
-
-
-	audio_output_file->aframe->nb_samples = audio_output_file->codec_ctx->frame_size;
-
-	if (avcodec_fill_audio_frame(audio_output_file->aframe, audio_output_file->codec_ctx->channels, audio_output_file->codec_ctx->sample_fmt,
-	                             audio_output_file->adata_buf, audio_output_file->codec_ctx->frame_size * av_get_bytes_per_sample(audio_output_file->codec_ctx->sample_fmt) * audio_output_file->codec_ctx->channels, 1) < 0) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Fill audio frame failed\n"));
-		return -1;
-	}
-
-	//audio_output_file->acc_samples = 0;
-
-	return 0;
-}
-
-int dc_audio_encoder_read(AudioOutputFile *audio_output_file, AudioInputData *audio_input_data)
-{
-	int ret;
-	AudioDataNode *audio_data_node;
-
-	ret = dc_consumer_lock(&audio_output_file->consumer, &audio_input_data->circular_buf);
-	if (ret < 0) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Audio encoder got an end of buffer!\n"));
-		return -2;
-	}
-
-	dc_consumer_unlock_previous(&audio_output_file->consumer, &audio_input_data->circular_buf);
-
-	audio_data_node = (AudioDataNode *) dc_consumer_consume(&audio_output_file->consumer, &audio_input_data->circular_buf);
-#ifndef GPAC_USE_LIBAV
-	audio_output_file->aframe->channels = audio_output_file->codec_ctx->channels;
-#endif
-#ifndef LIBAV_FRAME_OLD
-	audio_output_file->aframe->channel_layout = audio_output_file->codec_ctx->channel_layout;
-	audio_output_file->aframe->sample_rate = audio_output_file->codec_ctx->sample_rate;
-#endif
-	audio_output_file->aframe->format = audio_output_file->codec_ctx->sample_fmt;
-
-	/* Write audio sample on fifo */
-	av_fifo_generic_write(audio_output_file->fifo, audio_data_node->abuf, audio_data_node->abuf_size, NULL);
-
-	dc_consumer_advance(&audio_output_file->consumer);
-
-	return 0;
-}
-
-#if 0
-int dc_audio_encoder_flush(AudioOutputFile *audio_output_file, AudioInputData *audio_input_data)
-{
-	int got_pkt;
-	//AVStream *audio_stream = audio_output_file->av_fmt_ctx->streamsaudio_output_file->astream_idx;
-	//AVCodecContext *audio_codec_ctx = audio_stream->codec;
-	AVCodecContext *audio_codec_ctx = audio_output_file->codec_ctx;
-
-	av_init_packet(&audio_output_file->packet);
-	audio_output_file->packet.data = NULL;
-	audio_output_file->packet.size = 0;
-
-	/* Set PTS (method 1) */
-	audio_output_file->aframe->pts = audio_input_data->next_pts;
-	/* Encode audio */
-#ifdef DC_AUDIO_RESAMPLER
-#error resampling is not done here
-#endif
-	if (avcodec_encode_audio2(audio_codec_ctx, &audio_output_file->packet, NULL, &got_pkt) != 0) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Error while encoding audio.\n"));
-		return -1;
-	}
-	if (got_pkt) {
-		//audio_output_file->acc_samples += audio_output_file->aframe->nb_samples;
-		return 0;
-	}
-	av_free_packet(&audio_output_file->packet);
-	return 1;
-}
-#endif
-
-#ifdef DC_AUDIO_RESAMPLER
-static int ensure_resampler(AudioOutputFile *audio_output_file, AVCodecContext *audio_codec_ctx)
-{
-	if (!audio_output_file->aresampler) {
-		audio_output_file->aresampler = swr_alloc();
-		if (!audio_output_file->aresampler) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Cannot allocate the audio resampler. Aborting.\n"));
-			return -1;
-		}
-		av_opt_set_channel_layout(audio_output_file->aresampler, "in_channel_layout", DC_AUDIO_CHANNEL_LAYOUT, 0);
-		av_opt_set_channel_layout(audio_output_file->aresampler, "out_channel_layout", audio_codec_ctx->channel_layout, 0);
-		av_opt_set_sample_fmt(audio_output_file->aresampler, "in_sample_fmt", DC_AUDIO_SAMPLE_FORMAT, 0);
-		av_opt_set_sample_fmt(audio_output_file->aresampler, "out_sample_fmt", audio_codec_ctx->sample_fmt, 0);
-		av_opt_set_int(audio_output_file->aresampler, "in_sample_rate", DC_AUDIO_SAMPLE_RATE, 0);
-		av_opt_set_int(audio_output_file->aresampler, "out_sample_rate", audio_codec_ctx->sample_rate, 0);
-		av_opt_set_int(audio_output_file->aresampler, "in_channels", DC_AUDIO_NUM_CHANNELS, 0);
-		av_opt_set_int(audio_output_file->aresampler, "out_channels", audio_codec_ctx->channels, 0);
-
-		if (swr_init(audio_output_file->aresampler)) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Could not open the audio resampler. Aborting.\n"));
-			return -1;
-		}
-	}
-
-	return 0;
-}
-
-//resample - see http://ffmpeg.org/pipermail/libav-user/2012-June/002164.html
-static int resample_audio(AudioOutputFile *audio_output_file, AVCodecContext *audio_codec_ctx, int *num_planes_out)
-{
-	int i, linesize;
-	uint8_t **output;
-	*num_planes_out = av_sample_fmt_is_planar(audio_output_file->codec->sample_fmts0) ? audio_output_file->codec_ctx->channels : 1;
-	linesize = audio_output_file->codec_ctx->frame_size * av_get_bytes_per_sample(audio_output_file->codec->sample_fmts0) * audio_output_file->codec_ctx->channels / *num_planes_out;
-	output = (uint8_t**)av_malloc(*num_planes_out*sizeof(uint8_t*));
-	for (i=0; i<*num_planes_out; i++) {
-		outputi = (uint8_t*)av_malloc(linesize);
-	}
-
-	if (swr_convert(audio_output_file->aresampler, output, audio_output_file->aframe->nb_samples, (const uint8_t **)audio_output_file->aframe->extended_data, audio_output_file->aframe->nb_samples) < 0) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Could not resample audio frame. Aborting.\n"));
-		return -1;
-	}
-
-	audio_output_file->aframe->extended_data = output;
-	for (i=0; i<*num_planes_out; i++) {
-		audio_output_file->aframe->linesizei = linesize;
-	}
-	audio_codec_ctx->channel_layout = audio_output_file->aframe->channel_layout;
-	audio_codec_ctx->sample_fmt = audio_output_file->aframe->format;
-	audio_codec_ctx->sample_rate = audio_output_file->aframe->sample_rate;
-#ifndef GPAC_USE_LIBAV
-	audio_codec_ctx->channels = audio_output_file->aframe->channels;
-#endif
-
-	return 0;
-}
-#endif
-
-int dc_audio_encoder_encode(AudioOutputFile *audio_output_file, AudioInputData *audio_input_data)
-{
-	int got_pkt;
-	AVCodecContext *audio_codec_ctx = audio_output_file->codec_ctx;
-
-	while (av_fifo_size(audio_output_file->fifo) >= audio_output_file->frame_bytes) {
-#ifdef DC_AUDIO_RESAMPLER
-		uint8_t **data = NULL; //mirror AVFrame::data
-		int num_planes_out = 0;
-#endif
-		Bool resample;
-
-		av_fifo_generic_read(audio_output_file->fifo, audio_output_file->adata_buf, audio_output_file->frame_bytes, NULL);
-
-		audio_output_file->aframe->data0 = audio_output_file->adata_buf;
-		audio_output_file->aframe->linesize0 = audio_output_file->frame_bytes;
-		audio_output_file->aframe->linesize1 = 0;
-
-		av_init_packet(&audio_output_file->packet);
-		audio_output_file->packet.data = NULL;
-		audio_output_file->packet.size = 0;
-
-		/*
-		 * Set PTS (method 1)
-		 */
-		//audio_output_file->aframe->pts = audio_input_data->next_pts;
-
-		/*
-		 * Set PTS (method 2)
-		 */
-		//{
-		//	int64_t now = av_gettime();
-		//	AVRational avr;
-		//	avr.num = 1;
-		//	avr.den = AV_TIME_BASE;
-		//	audio_output_file->aframe->pts = av_rescale_q(now, avr, audio_codec_ctx->time_base);
-		//}
-
-		resample = (DC_AUDIO_SAMPLE_FORMAT != audio_codec_ctx->sample_fmt
-		            || DC_AUDIO_SAMPLE_RATE != audio_codec_ctx->sample_rate
-		            || DC_AUDIO_NUM_CHANNELS != audio_codec_ctx->channels
-		            || DC_AUDIO_CHANNEL_LAYOUT != audio_codec_ctx->channel_layout);
-		/* Resample if needed */
-		if (resample) {
-#ifndef DC_AUDIO_RESAMPLER
-			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Audio resampling is needed at the encoding stage, but not supported by your version of DashCast. Aborting.\n"));
-			exit(1);
-#else
-			if (ensure_resampler(audio_output_file, audio_codec_ctx)) {
-				return -1;
-			}
-
-			data = audio_output_file->aframe->extended_data;
-			if (resample_audio(audio_output_file, audio_codec_ctx, &num_planes_out)) {
-				return -1;
-			}
-#endif
-		}
-
-		/* Encode audio */
-		if (avcodec_encode_audio2(audio_codec_ctx, &audio_output_file->packet, audio_output_file->aframe, &got_pkt) != 0) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Error while encoding audio.\n"));
-#ifdef DC_AUDIO_RESAMPLER
-			if (resample) {
-				int i;
-				for (i=0; i<num_planes_out; ++i) {
-					av_free(audio_output_file->aframe->extended_datai);
-				}
-				av_free(audio_output_file->aframe->extended_data);
-				audio_output_file->aframe->extended_data = data;
-			}
-#endif
-			return -1;
-		}
-
-#ifdef DC_AUDIO_RESAMPLER
-		if (resample) {
-			int i;
-			for (i=0; i<num_planes_out; ++i) {
-				av_free(audio_output_file->aframe->extended_datai);
-			}
-			av_free(audio_output_file->aframe->extended_data);
-			audio_output_file->aframe->extended_data = data;
-		}
-#endif
-
-		if (got_pkt) {
-			//audio_output_file->acc_samples += audio_output_file->aframe->nb_samples;
-			return 0;
-		}
-
-		av_free_packet(&audio_output_file->packet);
-	}
-
-	return 1;
-}
-
-void dc_audio_encoder_close(AudioOutputFile *audio_output_file)
-{
-//	int i;
-//
-//	/* free the streams */
-//	for (i = 0; i < audio_output_file->av_fmt_ctx->nb_streams; i++) {
-//		avcodec_close(audio_output_file->av_fmt_ctx->streamsi->codec);
-//		av_freep(&audio_output_file->av_fmt_ctx->streamsi->info);
-//	}
-
-	av_fifo_free(audio_output_file->fifo);
-
-	av_free(audio_output_file->adata_buf);
-	av_free(audio_output_file->aframe);
-
-	avcodec_close(audio_output_file->codec_ctx);
-	av_free(audio_output_file->codec_ctx);
-
-#ifdef DC_AUDIO_RESAMPLER
-	swr_free(&audio_output_file->aresampler);
-#endif
-}

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/dashcast/audio_encoder.h Deleted

@@ -1,64 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Arash Shafiei
- *			Copyright (c) Telecom ParisTech 2000-2013
- *					All rights reserved
- *
- *  This file is part of GPAC / dashcast
- *
- *  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.
- *
- */
-
-#ifndef AUDIO_ENCODER_H_
-#define AUDIO_ENCODER_H_
-
-#include "audio_muxer.h"
-
-/*
- * Open an audio stream
- *
- * @param audio_output_file in add an audio stream to the file
- * with the parameters already passed to open_audio_output
- *
- * @return 0 on success, -1 on failure
- */
-int dc_audio_encoder_open(AudioOutputFile *audio_output_file, AudioDataConf *audio_data_conf);
-
-int dc_audio_encoder_read(AudioOutputFile *audio_output_file, AudioInputData *audio_input_data);
-
-//int dc_audio_encoder_flush(AudioOutputFile *audio_output_file, AudioInputData *audio_input_data);
-
-/*
- * Read the decoded audio sample from circular buffer (which is in audio_input_data)
- * and encode and write them on the output file
- *
- * @param audio_output_file in audio output file
- * @param audio_input_data in audio input data structure which contains a circular buffer with audio samples
- *
- * @return 0 on success, -1 on failure, -2 on finishing;
- * when there is no more data on circular buffer to encode
- */
-int dc_audio_encoder_encode(AudioOutputFile *audio_output_file, AudioInputData *audio_input_data);
-
-/*
- * Close the output audio file
- *
- * @param audio_output_file in audio output file
- */
-void dc_audio_encoder_close(AudioOutputFile *audio_output_file);
-
-#endif /* AUDIO_ENCODER_H_ */

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/dashcast/audio_muxer.c Deleted

@@ -1,466 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Arash Shafiei
- *			Copyright (c) Telecom ParisTech 2000-2013
- *					All rights reserved
- *
- *  This file is part of GPAC / dashcast
- *
- *  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 "audio_muxer.h"
-#include "libavformat/avio.h"
-
-#ifndef GPAC_DISABLE_ISOM
-
-int dc_gpac_audio_moov_create(AudioOutputFile *audio_output_file, char *filename)
-{
-	GF_Err ret;
-	u32 di, track;
-	u8 bpsample;
-	GF_ESD *esd;
-#ifndef GPAC_DISABLE_AV_PARSERS
-	GF_M4ADecSpecInfo acfg;
-#endif
-	AVCodecContext *audio_codec_ctx = audio_output_file->codec_ctx;
-
-	audio_output_file->isof = gf_isom_open(filename, GF_ISOM_OPEN_WRITE, NULL);
-	if (!audio_output_file->isof) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Cannot open iso file %s\n", filename));
-		return -1;
-	}
-
-	esd = gf_odf_desc_esd_new(2);
-	if (!esd) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Cannot create GF_ESD\n"));
-		return -1;
-	}
-
-	esd->decoderConfig = (GF_DecoderConfig *) gf_odf_desc_new(GF_ODF_DCD_TAG);
-	esd->slConfig = (GF_SLConfig *) gf_odf_desc_new(GF_ODF_SLC_TAG);
-	esd->decoderConfig->streamType = GF_STREAM_AUDIO;
-	if (!strcmp(audio_output_file->codec_ctx->codec->name, "aac")) { //TODO: find an automatic table
-		esd->decoderConfig->objectTypeIndication = GPAC_OTI_AUDIO_AAC_MPEG4;
-		esd->decoderConfig->bufferSizeDB = 20;
-		esd->slConfig->timestampResolution = audio_codec_ctx->sample_rate;
-		esd->decoderConfig->decoderSpecificInfo = (GF_DefaultDescriptor *) gf_odf_desc_new(GF_ODF_DSI_TAG);
-		esd->ESID = 1;
-
-#ifndef GPAC_DISABLE_AV_PARSERS
-		memset(&acfg, 0, sizeof(GF_M4ADecSpecInfo));
-		acfg.base_object_type = GF_M4A_AAC_LC;
-		acfg.base_sr = audio_codec_ctx->sample_rate;
-		acfg.nb_chan = audio_codec_ctx->channels;
-		acfg.sbr_object_type = 0;
-		acfg.audioPL = gf_m4a_get_profile(&acfg);
-
-		ret = gf_m4a_write_config(&acfg, &esd->decoderConfig->decoderSpecificInfo->data, &esd->decoderConfig->decoderSpecificInfo->dataLength);
-		assert(ret == GF_OK);
-#endif
-	} else {
-		if (strcmp(audio_output_file->codec_ctx->codec->name, "mp2")) {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("Unlisted codec, setting GPAC_OTI_AUDIO_MPEG1 descriptor.\n"));
-		}
-		esd->decoderConfig->objectTypeIndication = GPAC_OTI_AUDIO_MPEG1;
-		esd->decoderConfig->bufferSizeDB = 20;
-		esd->slConfig->timestampResolution = audio_codec_ctx->sample_rate;
-		esd->decoderConfig->decoderSpecificInfo = (GF_DefaultDescriptor *) gf_odf_desc_new(GF_ODF_DSI_TAG);
-		esd->ESID = 1;
-
-#ifndef GPAC_DISABLE_AV_PARSERS
-		memset(&acfg, 0, sizeof(GF_M4ADecSpecInfo));
-		acfg.base_object_type = GF_M4A_LAYER2;
-		acfg.base_sr = audio_codec_ctx->sample_rate;
-		acfg.nb_chan = audio_codec_ctx->channels;
-		acfg.sbr_object_type = 0;
-		acfg.audioPL = gf_m4a_get_profile(&acfg);
-
-		ret = gf_m4a_write_config(&acfg, &esd->decoderConfig->decoderSpecificInfo->data, &esd->decoderConfig->decoderSpecificInfo->dataLength);
-		assert(ret == GF_OK);
-#endif
-	}
-
-	//gf_isom_store_movie_config(video_output_file->isof, 0);
-	track = gf_isom_new_track(audio_output_file->isof, esd->ESID, GF_ISOM_MEDIA_AUDIO, audio_codec_ctx->sample_rate);
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("TimeScale: %d \n", audio_codec_ctx->time_base.den));
-	if (!track) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Cannot create new track\n"));
-		return -1;
-	}
-
-	ret = gf_isom_set_track_enabled(audio_output_file->isof, track, 1);
-	if (ret != GF_OK) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("%s: gf_isom_set_track_enabled\n", gf_error_to_string(ret)));
-		return -1;
-	}
-
-//	if (!esd->ESID) esd->ESID = gf_isom_get_track_id(audio_output_file->isof, track);
-
-	ret = gf_isom_new_mpeg4_description(audio_output_file->isof, track, esd, NULL, NULL, &di);
-	if (ret != GF_OK) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("%s: gf_isom_new_mpeg4_description\n", gf_error_to_string(ret)));
-		return -1;
-	}
-
-	gf_odf_desc_del((GF_Descriptor *) esd);
-	esd = NULL;
-
-	bpsample = av_get_bytes_per_sample(audio_output_file->codec_ctx->sample_fmt) * 8;
-
-	ret = gf_isom_set_audio_info(audio_output_file->isof, track, di, audio_codec_ctx->sample_rate, audio_output_file->codec_ctx->channels, bpsample, GF_IMPORT_AUDIO_SAMPLE_ENTRY_v0_BS);
-	if (ret != GF_OK) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("%s: gf_isom_set_audio_info\n", gf_error_to_string(ret)));
-		return -1;
-	}
-
-#ifndef GPAC_DISABLE_AV_PARSERS
-	ret = gf_isom_set_pl_indication(audio_output_file->isof, GF_ISOM_PL_AUDIO, acfg.audioPL);
-	if (ret != GF_OK) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("%s: gf_isom_set_pl_indication\n", gf_error_to_string(ret)));
-		return -1;
-	}
-#endif
-
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("time scale: %d  sample dur: %d \n", audio_codec_ctx->time_base.den, audio_output_file->codec_ctx->frame_size));
-
-	ret = gf_isom_setup_track_fragment(audio_output_file->isof, track, 1, audio_output_file->codec_ctx->frame_size, 0, 0, 0, 0, 0);
-	if (ret != GF_OK) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("%s: gf_isom_setup_track_fragment\n", gf_error_to_string(ret)));
-		return -1;
-	}
-
-	//gf_isom_add_track_to_root_od(video_output_file->isof,1);
-
-	ret = gf_isom_finalize_for_fragment(audio_output_file->isof, 1);
-	if (ret != GF_OK) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("%s: gf_isom_finalize_for_fragment\n", gf_error_to_string(ret)));
-		return -1;
-	}
-
-	ret = gf_media_get_rfc_6381_codec_name(audio_output_file->isof, track, audio_output_file->audio_data_conf->codec6381, GF_FALSE, GF_FALSE);
-	if (ret != GF_OK) return -1;
-	return 0;
-}
-
-int dc_gpac_audio_isom_open_seg(AudioOutputFile *audio_output_file, char *filename)
-{
-	GF_Err ret;
-	ret = gf_isom_start_segment(audio_output_file->isof, filename, GF_TRUE);
-	if (ret != GF_OK) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("%s: gf_isom_start_segment\n", gf_error_to_string(ret)));
-		return -1;
-	}
-
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("DashCast Audio segment %s started at "LLU"\n", filename, gf_net_get_utc() ));
-
-	audio_output_file->dts = 0;
-
-	return 0;
-}
-
-int dc_gpac_audio_isom_write(AudioOutputFile *audio_output_file)
-{
-	GF_Err ret;
-	audio_output_file->sample->data = (char *) audio_output_file->packet.data;
-	audio_output_file->sample->dataLength = audio_output_file->packet.size;
-
-	audio_output_file->sample->DTS = audio_output_file->dts; //audio_output_file->aframe->pts;
-	audio_output_file->sample->IsRAP = RAP; //audio_output_file->aframe->key_frame;//audio_codec_ctx->coded_frame->key_frame;
-
-	ret = gf_isom_fragment_add_sample(audio_output_file->isof, 1, audio_output_file->sample, 1, audio_output_file->codec_ctx->frame_size, 0, 0, 0);
-	audio_output_file->dts += audio_output_file->codec_ctx->frame_size;
-	if (ret != GF_OK) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("%s: gf_isom_fragment_add_sample\n", gf_error_to_string(ret)));
-		return -1;
-	}
-	return 0;
-}
-
-int dc_gpac_audio_isom_close_seg(AudioOutputFile *audio_output_file)
-{
-	u64 seg_size;
-	GF_Err ret;
-	ret = gf_isom_close_segment(audio_output_file->isof, 0, 0, 0, 0, 0, 0, 0, GF_TRUE, GF_FALSE, audio_output_file->seg_marker, NULL, NULL, &seg_size);
-	if (ret != GF_OK) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("%s: gf_isom_close_segment\n", gf_error_to_string(ret)));
-		return -1;
-	}
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("DashCast Audio segment %s closed at "LLU" - size "LLU" bytes\n", gf_isom_get_segment_name(audio_output_file->isof), gf_net_get_utc(), seg_size ));
-
-	//audio_output_file->acc_samples = 0;
-
-	return 0;
-}
-
-int dc_gpac_audio_isom_close(AudioOutputFile *audio_output_file)
-{
-	GF_Err ret;
-	ret = gf_isom_close(audio_output_file->isof);
-	if (ret != GF_OK) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("%s: gf_isom_close\n", gf_error_to_string(ret)));
-		return -1;
-	}
-
-	//audio_output_file->acc_samples = 0;
-
-	return 0;
-}
-
-#endif
-
-
-
-int dc_ffmpeg_audio_muxer_open(AudioOutputFile *audio_output_file, char *filename)
-{
-	AVStream *audio_stream;
-	AVOutputFormat *output_fmt;
-	AVDictionary *opts = NULL;
-
-	AVCodecContext *audio_codec_ctx = audio_output_file->codec_ctx;
-	audio_output_file->av_fmt_ctx = NULL;
-
-//	strcpy(audio_output_file->filename, audio_data_conf->filename);
-//	audio_output_file->abr = audio_data_conf->bitrate;
-//	audio_output_file->asr = audio_data_conf->samplerate;
-//	audio_output_file->ach = audio_data_conf->channels;
-//	strcpy(audio_output_file->codec, audio_data_conf->codec);
-
-	/* Find output format */
-	output_fmt = av_guess_format(NULL, filename, NULL);
-	if (!output_fmt) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Cannot find suitable output format\n"));
-		return -1;
-	}
-
-	audio_output_file->av_fmt_ctx = avformat_alloc_context();
-	if (!audio_output_file->av_fmt_ctx) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Cannot allocate memory for pOutVideoFormatCtx\n"));
-		return -1;
-	}
-
-	audio_output_file->av_fmt_ctx->oformat = output_fmt;
-	strcpy(audio_output_file->av_fmt_ctx->filename, filename);
-
-	/* Open the output file */
-	if (!(output_fmt->flags & AVFMT_NOFILE)) {
-		if (avio_open(&audio_output_file->av_fmt_ctx->pb, filename, URL_WRONLY) < 0) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Cannot not open '%s'\n", filename));
-			return -1;
-		}
-	}
-
-	audio_stream = avformat_new_stream(audio_output_file->av_fmt_ctx, audio_output_file->codec);
-	if (!audio_stream) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Cannot create output video stream\n"));
-		return -1;
-	}
-
-	audio_stream->codec->codec_id = audio_output_file->codec->id;
-	audio_stream->codec->codec_type = AVMEDIA_TYPE_AUDIO;
-	audio_stream->codec->bit_rate = audio_codec_ctx->bit_rate;//audio_output_file->audio_data_conf->bitrate;
-	audio_stream->codec->sample_rate = audio_codec_ctx->sample_rate;//audio_output_file->audio_data_conf->samplerate;
-	audio_stream->codec->channels = audio_codec_ctx->channels;//audio_output_file->audio_data_conf->channels;
-	assert(audio_codec_ctx->codec->sample_fmts);
-	audio_stream->codec->sample_fmt = audio_codec_ctx->codec->sample_fmts0;
-
-//	if (audio_output_file->av_fmt_ctx->oformat->flags & AVFMT_GLOBALHEADER)
-//		audio_output_file->codec_ctx->flags |= CODEC_FLAG_GLOBAL_HEADER;
-
-	//video_stream->codec = video_output_file->codec_ctx;
-
-	/* open the video codec */
-	av_dict_set(&opts, "strict", "experimental", 0);
-	if (avcodec_open2(audio_stream->codec, audio_output_file->codec, &opts) < 0) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Cannot open output video codec\n"));
-		av_dict_free(&opts);
-		return -1;
-	}
-	av_dict_free(&opts);
-
-	return avformat_write_header(audio_output_file->av_fmt_ctx, NULL);
-
-}
-
-int dc_ffmpeg_audio_muxer_write(AudioOutputFile *audio_output_file)
-{
-	AVStream *audio_stream = audio_output_file->av_fmt_ctx->streamsaudio_output_file->astream_idx;
-	AVCodecContext *audio_codec_ctx = audio_stream->codec;
-
-	audio_output_file->packet.stream_index = audio_stream->index;
-
-	if (audio_output_file->packet.pts != AV_NOPTS_VALUE)
-		audio_output_file->packet.pts = av_rescale_q(audio_output_file->packet.pts, audio_codec_ctx->time_base, audio_stream->time_base);
-
-	if (audio_output_file->packet.duration > 0)
-		audio_output_file->packet.duration = (int)av_rescale_q(audio_output_file->packet.duration, audio_codec_ctx->time_base, audio_stream->time_base);
-	/*
-	 * if (pkt.pts != AV_NOPTS_VALUE)
-	 * pkt.pts = av_rescale_q(pkt.pts, audioEncCtx->time_base, audioStream->time_base);
-	 */
-
-	audio_output_file->packet.flags |= AV_PKT_FLAG_KEY;
-
-	if (av_interleaved_write_frame(audio_output_file->av_fmt_ctx, &audio_output_file->packet) != 0) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Writing frame is not successful\n"));
-		av_free_packet(&audio_output_file->packet);
-		return -1;
-	}
-
-	av_free_packet(&audio_output_file->packet);
-
-	return 0;
-}
-
-int dc_ffmpeg_audio_muxer_close(AudioOutputFile *audio_output_file)
-{
-	u32 i;
-
-	av_write_trailer(audio_output_file->av_fmt_ctx);
-	avio_close(audio_output_file->av_fmt_ctx->pb);
-
-	// free the streams
-	for (i = 0; i < audio_output_file->av_fmt_ctx->nb_streams; i++) {
-		avcodec_close(audio_output_file->av_fmt_ctx->streamsi->codec);
-		av_freep(&audio_output_file->av_fmt_ctx->streamsi->info);
-	}
-
-	//video_output_file->av_fmt_ctx->streamsvideo_output_file->vstream_idx->codec = NULL;
-	avformat_free_context(audio_output_file->av_fmt_ctx);
-
-	//audio_output_file->acc_samples = 0;
-
-	return 0;
-
-}
-
-int dc_audio_muxer_init(AudioOutputFile *audio_output_file, AudioDataConf *audio_data_conf, AudioMuxerType muxer_type, int frame_per_seg, int frame_per_frag, u32 seg_marker)
-{
-	char nameGF_MAX_PATH;
-	snprintf(name, sizeof(name), "audio encoder %s", audio_data_conf->filename);
-	dc_consumer_init(&audio_output_file->consumer, AUDIO_CB_SIZE, name);
-
-#ifndef GPAC_DISABLE_ISOM
-	audio_output_file->sample = gf_isom_sample_new();
-	audio_output_file->isof = NULL;
-#endif
-
-	audio_output_file->muxer_type = muxer_type;
-	audio_output_file->frame_per_seg = frame_per_seg;
-	audio_output_file->frame_per_frag = frame_per_frag;
-	audio_output_file->seg_marker = seg_marker;
-	return 0;
-}
-
-void dc_audio_muxer_free(AudioOutputFile *audio_output_file)
-{
-#ifndef GPAC_DISABLE_ISOM
-	if (audio_output_file->isof != NULL) {
-		gf_isom_close(audio_output_file->isof);
-	}
-	//gf_isom_sample_del(&audio_output_file->sample);
-#endif
-}
-
-GF_Err dc_audio_muxer_open(AudioOutputFile *audio_output_file, char *directory, char *id_name, int seg)
-{
-	GF_Err ret = GF_NOT_SUPPORTED;
-	char nameGF_MAX_PATH;
-
-	switch (audio_output_file->muxer_type) {
-	case FFMPEG_AUDIO_MUXER:
-		snprintf(name, sizeof(name), "%s/%s_%d_ffmpeg.mp4", directory, id_name, seg);
-		return dc_ffmpeg_audio_muxer_open(audio_output_file, name);
-#ifndef GPAC_DISABLE_ISOM
-	case GPAC_AUDIO_MUXER:
-		snprintf(name, sizeof(name), "%s/%s_%d_gpac.mp4", directory, id_name, seg);
-		dc_gpac_audio_moov_create(audio_output_file, name);
-		return dc_gpac_audio_isom_open_seg(audio_output_file, NULL);
-	case GPAC_INIT_AUDIO_MUXER:
-		if (seg == 1) {
-			snprintf(name, sizeof(name), "%s/%s_init_gpac.mp4", directory, id_name);
-			dc_gpac_audio_moov_create(audio_output_file, name);
-			audio_output_file->first_dts = 0;
-		}
-		snprintf(name, sizeof(name), "%s/%s_%d_gpac.m4s", directory, id_name, seg);
-		ret = dc_gpac_audio_isom_open_seg(audio_output_file, name);
-		return ret;
-#endif
-	default:
-		ret = GF_BAD_PARAM;
-		break;
-	}
-
-	return ret;
-}
-
-int dc_audio_muxer_write(AudioOutputFile *audio_output_file, int frame_nb, Bool insert_ntp)
-{
-	switch (audio_output_file->muxer_type) {
-	case FFMPEG_AUDIO_MUXER:
-		return dc_ffmpeg_audio_muxer_write(audio_output_file);
-#ifndef GPAC_DISABLE_ISOM
-	case GPAC_AUDIO_MUXER:
-	case GPAC_INIT_AUDIO_MUXER:
-		if (frame_nb % audio_output_file->frame_per_frag == 0) {
-			gf_isom_start_fragment(audio_output_file->isof, 1);
-
-			if (insert_ntp) {
-				gf_isom_set_fragment_reference_time(audio_output_file->isof, 1, audio_output_file->frame_ntp, audio_output_file->first_dts * audio_output_file->codec_ctx->frame_size);
-			}
-
-			gf_isom_set_traf_base_media_decode_time(audio_output_file->isof, 1, audio_output_file->first_dts * audio_output_file->codec_ctx->frame_size);
-			audio_output_file->first_dts += audio_output_file->frame_per_frag;
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("DashCast Audio start fragment first DTS %u at "LLU"\n", audio_output_file->first_dts, gf_net_get_utc() ));
-		}
-		dc_gpac_audio_isom_write(audio_output_file);
-		if (frame_nb % audio_output_file->frame_per_frag == audio_output_file->frame_per_frag - 1) {
-			gf_isom_flush_fragments(audio_output_file->isof, 1);
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("DashCast Audio flush fragment first DTS %u at "LLU"\n", audio_output_file->first_dts, gf_net_get_utc() ));
-		}
-		//TODO - do same as video, flush based on time in case of losses
-		if (frame_nb + 1 == audio_output_file->frame_per_seg) {
-			return 1;
-		}
-
-		return 0;
-#endif
-
-	default:
-		return GF_BAD_PARAM;
-	}
-	return GF_BAD_PARAM;
-}
-
-int dc_audio_muxer_close(AudioOutputFile *audio_output_file)
-{
-	switch (audio_output_file->muxer_type) {
-	case FFMPEG_AUDIO_MUXER:
-		return dc_ffmpeg_audio_muxer_close(audio_output_file);
-#ifndef GPAC_DISABLE_ISOM
-	case GPAC_AUDIO_MUXER:
-		dc_gpac_audio_isom_close_seg(audio_output_file);
-		return dc_gpac_audio_isom_close(audio_output_file);
-	case GPAC_INIT_AUDIO_MUXER:
-		return dc_gpac_audio_isom_close_seg(audio_output_file);
-#endif
-	default:
-		return GF_BAD_PARAM;
-	}
-
-	return GF_BAD_PARAM;
-}

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/dashcast/audio_muxer.h Deleted

@@ -1,132 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Arash Shafiei
- *			Copyright (c) Telecom ParisTech 2000-2013
- *					All rights reserved
- *
- *  This file is part of GPAC / dashcast
- *
- *  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.
- *
- */
-
-#ifndef AUDIO_MUXER_H_
-#define AUDIO_MUXER_H_
-
-#include <stdlib.h>
-#include "../../modules/ffmpeg_in/ffmpeg_in.h"
-#include "libavutil/fifo.h"
-#include "libavformat/avformat.h"
-#include "libavdevice/avdevice.h"
-#ifdef DC_AUDIO_RESAMPLER
-#include "libswresample/swresample.h"
-#endif
-#include "libavutil/mathematics.h"
-#include "libavutil/opt.h"
-#include <gpac/isomedia.h>
-#include <gpac/internal/media_dev.h>
-#include <gpac/constants.h>
-#include "audio_data.h"
-
-
-typedef enum {
-	FFMPEG_AUDIO_MUXER,
-	GPAC_AUDIO_MUXER,
-	GPAC_INIT_AUDIO_MUXER
-} AudioMuxerType;
-
-/*
- * AudioOutputFile structure has the data needed
- * to encode audio samples and write them on the file.
- * It reads the data from a circular buffer so it needs
- * to keep the index to that circular buffer. This index is
- * available in Consumer data structure.
- *
- */
-typedef struct {
-	AudioDataConf *audio_data_conf;
-
-	/* File format context structure */
-	AVFormatContext *av_fmt_ctx;
-	AVCodec *codec;
-	AVCodecContext *codec_ctx;
-
-#ifndef GPAC_DISABLE_ISOM
-	GF_ISOFile *isof;
-	GF_ISOSample *sample;
-#endif
-
-	int dts;
-
-	/* The index to the audio stream in the file */
-	int astream_idx;
-
-	/* It keeps the index with which encoder access to the circular buffer (as a consumer) */
-	Consumer consumer;
-
-#ifdef DC_AUDIO_RESAMPLER
-	/* Optional audio resampling between the decoder and the encoder */
-	SwrContext *aresampler;
-#endif
-
-	/* Variables that encoder needs to encode data */
-	AVFrame *aframe;
-	uint8_t *adata_buf;
-	int frame_bytes;
-	AVPacket packet;
-
-	/*
-	 * Audio samples stored in the AVFrame are not always
-	 * complete. Which means more than 1 AVFrame is needed
-	 * to complete an access unit. This fifo is provided
-	 * to store audio samples in the fifo and once an access unit
-	 * is complete we can encode it.
-	 */
-	AVFifoBuffer *fifo;
-
-	AudioMuxerType muxer_type;
-
-	/* Accumulated sample */
-	//int acc_samples;
-
-	int frame_per_seg;
-	int frame_per_frag;
-	int first_dts;
-
-	u32 seg_marker;
-	u64 frame_ntp;
-} AudioOutputFile;
-
-int dc_audio_muxer_init(AudioOutputFile *audio_output_file, AudioDataConf *audio_data_conf, AudioMuxerType muxer_type, int frame_per_seg, int frame_per_frag, u32 seg_marker);
-void dc_audio_muxer_free(AudioOutputFile *audio_output_file);
-
-/*
- * Open the output audio
- *
- * @param audio_output_file out open the audio output on this file
- *
- * @param audio_data_conf in the structure containing the
- * configuration of the output file (bitrate, samplerate, name, channels)
- *
- * @return 0 on success, -1 on failure
- */
-GF_Err dc_audio_muxer_open(AudioOutputFile *audio_output_file, char *directory, char *id_name, int seg);
-
-GF_Err dc_audio_muxer_write(AudioOutputFile *audio_output_file, int frame_nb, Bool insert_ntp);
-
-GF_Err dc_audio_muxer_close(AudioOutputFile *audio_output_file);
-
-#endif /* AUDIO_MUXER_H_ */

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/dashcast/circular_buffer.c Deleted

@@ -1,255 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Arash Shafiei
- *			Copyright (c) Telecom ParisTech 2000-2013
- *					All rights reserved
- *
- *  This file is part of GPAC / dashcast
- *
- *  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 "circular_buffer.h"
-
-
-//#define DEBUG
-
-
-void dc_circular_buffer_create(CircularBuffer *circular_buf, u32 size, LockMode mode, int max_num_consumers)
-{
-	u32 i;
-	circular_buf->size = size;
-	circular_buf->list = (Node*)gf_malloc(size * sizeof(Node));
-	circular_buf->mode = mode;
-	circular_buf->max_num_consumers = max_num_consumers;
-
-	for (i=0; i<size; i++) {
-		circular_buf->listi.num_producers = 0;
-		circular_buf->listi.num_consumers = 0;
-		circular_buf->listi.num_consumers_accessed = 0;
-		circular_buf->listi.marked = 0;
-		circular_buf->listi.num_consumers_waiting = 0;
-		circular_buf->listi.consumers_semaphore = gf_sema_new(1000, 0);
-		circular_buf->listi.producers_semaphore = gf_sema_new(1000, 0);
-		circular_buf->listi.mutex = gf_mx_new("Circular Buffer Mutex");
-	}
-}
-
-void dc_circular_buffer_destroy(CircularBuffer *circular_buf)
-{
-	u32 i;
-	for (i = 0; i < circular_buf->size; i++) {
-		gf_sema_del(circular_buf->listi.consumers_semaphore);
-		gf_sema_del(circular_buf->listi.producers_semaphore);
-		gf_mx_del(circular_buf->listi.mutex);
-	}
-
-	gf_free(circular_buf->list);
-}
-
-void dc_consumer_init(Consumer *consumer, int max_idx, char *name)
-{
-	consumer->idx = 0;
-	consumer->max_idx = max_idx;
-	strcpy(consumer->name, name);
-}
-
-void * dc_consumer_consume(Consumer *consumer, CircularBuffer *circular_buf)
-{
-	return circular_buf->listconsumer->idx.data;
-}
-
-int dc_consumer_lock(Consumer *consumer, CircularBuffer *circular_buf)
-{
-	Node *node = &circular_buf->listconsumer->idx;
-
-	gf_mx_p(node->mutex);
-	if (node->marked == 2) {
-		gf_mx_v(node->mutex);
-		return -1;
-	}
-
-	node->num_consumers_waiting++;
-	while (node->num_producers || !node->marked) {
-		gf_mx_v(node->mutex);
-		gf_sema_wait(node->consumers_semaphore);
-		gf_mx_p(node->mutex);
-
-		if (node->marked == 2) {
-			gf_mx_v(node->mutex);
-			return -1;
-		}
-	}
-	node->num_consumers_waiting--;
-
-	if (node->marked == 2) {
-		gf_mx_v(node->mutex);
-		return -1;
-	}
-	node->num_consumers++;
-	node->num_consumers_accessed++;
-	gf_mx_v(node->mutex);
-
-	return 0;
-}
-
-int dc_consumer_unlock(Consumer *consumer, CircularBuffer *circular_buf)
-{
-	int last_consumer = 0;
-	Node *node = &circular_buf->listconsumer->idx;
-
-	gf_mx_p(node->mutex);
-	node->num_consumers--;
-
-	if (node->num_consumers_accessed == circular_buf->max_num_consumers) {
-		node->marked = 0;
-		node->num_consumers_accessed = 0;
-		last_consumer = 1;
-	}
-
-	gf_sema_notify(node->producers_semaphore, 1);
-
-	gf_mx_v(node->mutex);
-
-	return last_consumer;
-}
-
-int dc_consumer_unlock_previous(Consumer *consumer, CircularBuffer *circular_buf)
-{
-	int node_idx = (consumer->idx - 1 + consumer->max_idx) % consumer->max_idx;
-	int last_consumer = 0;
-	Node *node = &circular_buf->listnode_idx;
-
-	gf_mx_p(node->mutex);
-
-	node->num_consumers--;
-	if (node->num_consumers < 0)
-		node->num_consumers = 0;
-
-	if (node->num_consumers_accessed == circular_buf->max_num_consumers) {
-		if (node->marked != 2)
-			node->marked = 0;
-		node->num_consumers_accessed = 0;
-		last_consumer = 1;
-	}
-
-	gf_sema_notify(node->producers_semaphore, 1);
-
-	gf_mx_v(node->mutex);
-
-	return last_consumer;
-}
-
-void dc_consumer_advance(Consumer *consumer)
-{
-	consumer->idx = (consumer->idx + 1) % consumer->max_idx;
-}
-
-void dc_producer_init(Producer *producer, int max_idx, char *name)
-{
-	producer->idx = 0;
-	producer->max_idx = max_idx;
-	strcpy(producer->name, name);
-}
-
-void * dc_producer_produce(Producer *producer, CircularBuffer *circular_buf)
-{
-	return circular_buf->listproducer->idx.data;
-}
-
-int dc_producer_lock(Producer *producer, CircularBuffer *circular_buf)
-{
-	Node *node = &circular_buf->listproducer->idx;
-
-	gf_mx_p(node->mutex);
-
-	if ( (circular_buf->mode == LIVE_CAMERA || circular_buf->mode == LIVE_MEDIA) && (node->num_consumers || node->marked)) {
-		gf_mx_v(node->mutex);
-		return -1;
-	}
-
-	while (node->num_consumers || node->marked) {
-		gf_mx_v(node->mutex);
-		gf_sema_wait(node->producers_semaphore);
-		gf_mx_p(node->mutex);
-	}
-
-	node->num_producers++;
-	if (circular_buf->size>1) {
-		node->marked = 1;
-	}
-
-	gf_mx_v(node->mutex);
-
-	return 0;
-}
-
-void dc_producer_unlock(Producer *producer, CircularBuffer *circular_buf)
-{
-	Node *node = &circular_buf->listproducer->idx;
-
-	gf_mx_p(node->mutex);
-	node->num_producers--;
-	gf_sema_notify(node->consumers_semaphore, node->num_consumers_waiting);
-	gf_mx_v(node->mutex);
-}
-
-void dc_producer_unlock_previous(Producer *producer, CircularBuffer *circular_buf)
-{
-	int node_idx = (producer->idx - 1 + producer->max_idx) % producer->max_idx;
-	Node *node = &circular_buf->listnode_idx;
-
-	gf_mx_p(node->mutex);
-	node->num_producers = 0;
-	gf_sema_notify(node->consumers_semaphore, node->num_consumers_waiting);
-	gf_mx_v(node->mutex);
-}
-
-void dc_producer_advance(Producer *producer, CircularBuffer *circular_buf)
-{
-	if (circular_buf->size == 1) {
-		Node *node = &circular_buf->listproducer->idx;
-		gf_mx_p(node->mutex);
-		node->marked = 1;
-		gf_sema_notify(node->consumers_semaphore, node->num_consumers_waiting);
-		gf_mx_v(node->mutex);
-	}
-	producer->idx = (producer->idx + 1) % producer->max_idx;
-}
-
-void dc_producer_end_signal(Producer *producer, CircularBuffer *circular_buf)
-{
-	Node *node = &circular_buf->listproducer->idx;
-
-	gf_mx_p(node->mutex);
-	node->marked = 2;
-	gf_sema_notify(node->consumers_semaphore, node->num_consumers_waiting);
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("producer %s sends end signal %d \n", producer->name, producer->idx));
-	gf_mx_v(node->mutex);
-}
-
-void dc_producer_end_signal_previous(Producer *producer, CircularBuffer *circular_buf)
-{
-	int i_node = (producer->max_idx + producer->idx - 1) % producer->max_idx;
-	Node *node = &circular_buf->listi_node;
-
-	gf_mx_p(node->mutex);
-	node->marked = 2;
-	gf_sema_notify(node->consumers_semaphore, node->num_consumers_waiting);
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("producer %s sends end signal %d \n", producer->name, node));
-	gf_mx_v(node->mutex);
-}

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/dashcast/circular_buffer.h Deleted

@@ -1,246 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Arash Shafiei
- *			Copyright (c) Telecom ParisTech 2000-2013
- *					All rights reserved
- *
- *  This file is part of GPAC / dashcast
- *
- *  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.
- *
- */
-
-#ifndef CIRCULAR_BUFFER_H_
-#define CIRCULAR_BUFFER_H_
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <gpac/thread.h>
-
-
-/*
- * The method (mode) of multithread management.
- * It can be LIVE or OFFLINE.
- * LIVE means that the system is real time. The producer does not wait
- * for anyone and it always produces and finds a place on the circular buffer.
- * OFFLINE means that the system is working offline, so the producer can
- * wait for the consumers to finish their job.
- */
-typedef enum {
-	LIVE_CAMERA,
-	LIVE_MEDIA,
-	ON_DEMAND
-} LockMode;
-
-/*
- * Every node of the circular buffer has a data, plus
- * all the variables needed for multithread management.
- */
-typedef struct {
-	/* Pointer to the data on the node */
-	void *data;
-	/* The number of the producer currently using this node */
-	int num_producers;
-	/* The number of consumer currently using this node */
-	int num_consumers;
-	/* The number of consumer currently waiting for this node */
-	int num_consumers_waiting;
-	/* Mutex used for synchronizing the users of this node. */
-	GF_Mutex *mutex;
-	/* Semaphore for producer */
-	GF_Semaphore *producers_semaphore;
-	/* Semaphore for consumers */
-	GF_Semaphore *consumers_semaphore;
-	/* If marked is 0 it means the data on this node is not valid.
-	 * If marked is 1 it means that the data on this node is valid.
-	 * If marked is 2 it means this node is the last node. */
-	int marked;
-	/* Indicates the number of consumers which already accessed this node.
-	 * It is used for the case where the last consumer has to do something. */
-	int num_consumers_accessed;
-} Node;
-
-/*
- * The circular buffer has a size, a list of nodes and it
- * has the number of consumers using it. Also it needs to know which
- * locking mechanism it needs to use. (LIVE or OFFLINE)
- */
-typedef struct {
-	/* The size of circular buffer */
-	u32 size;
-	/* A list of all the nodes */
-	Node *list;
-	/* The mode for multithread management. */
-	LockMode mode;
-	/* The maximum number of the consumers using the circular buffer */
-	u32 max_num_consumers;
-} CircularBuffer;
-
-/*
- * Producer has an index to the circular buffer.
- */
-typedef struct {
-	/* The index where the producer is using */
-	int idx;
-	/* The maximum of the index. (Which means the size of circular buffer) */
-	int max_idx;
-
-	char nameGF_MAX_PATH;
-} Producer;
-
-/*
- * Consumer has an index to the circular buffer.
- */
-typedef struct {
-	/* The index where the consumer is using */
-	int idx;
-	/* The maximum of the index. (Which means the size of circular buffer) */
-	int max_idx;
-
-	char nameGF_MAX_PATH;
-} Consumer;
-
-/*
- * Create a circular buffer
- *
- * @param circular_buf out circular buffer to be created
- * @param size in size of circular buffer
- * @param mode in mode of multithread management (LIVE or OFFLINE)
- * @param num_consumers in maximum number of the consumers of the circular buffer
- */
-void dc_circular_buffer_create(CircularBuffer *circular_buf, u32 size, LockMode mode, int num_consumers);
-
-/*
- * Destroy the circular buffer
- *
- * @param circular_buf in circular buffer to be destroyed
- */
-void dc_circular_buffer_destroy(CircularBuffer *circular_buf);
-
-/*
- * Initialize a consumer
- *
- * @param consumer out the consumer to be initialize
- * @param num_consumers in maximum number of the consumers
- */
-void dc_consumer_init(Consumer *consumer, int num_consumers, char *name);
-
-/*
- * Return the data in the node in question. (circular_bufconsumer index)
- *
- * @param consumer in consumer
- * @param circular_buf in circular buffer
- */
-void * dc_consumer_consume(Consumer *consumer, CircularBuffer *circular_buf);
-
-/*
- * Consumer lock on circular buffer
- *
- * @param consumer in consumer
- * @param circular_buf in circular buffer
- *
- * @return 0 on success, -1 if the node in question is the last node and not usable.
- */
-int dc_consumer_lock(Consumer *consumer, CircularBuffer *circular_buf);
-
-/*
- * Consumer unlock on circular buffer
- *
- * @param consumer in consumer
- * @param circular_buf in circular buffer
- *
- * @return 0 on normal exit, 1 if the consumer unlocking this node is the last consumer.
- */
-int dc_consumer_unlock(Consumer *consumer, CircularBuffer *circular_buf);
-
-/*
- * Consumer unlock on previous node of the circular buffer
- *
- * @param consumer in consumer
- * @param circular_buf in circular buffer
- *
- * @return 0 on normal exit, 1 if the consumer unlocking this node is the last consumer.
- */
-int dc_consumer_unlock_previous(Consumer *consumer, CircularBuffer *circular_buf);
-
-/*
- * Consumer leads its index
- *
- * @param consumer in consumer
- */
-void dc_consumer_advance(Consumer *consumer);
-
-/*
- * Initialize a producer
- *
- * @param producer out the producer to be initialize
- * @param maxpro in maximum number of the producers
- */
-void dc_producer_init(Producer *producer, int maxpro, char *name);
-
-/*
- * Return the data in the node in question. (circular_bufconsumer index)
- *
- * @param producer in producer
- * @param circular_buf in circular buffer
- */
-void * dc_producer_produce(Producer *producer, CircularBuffer *circular_buf);
-
-/*
- * Producer lock on circular buffer
- *
- * @param producer in producer
- * @param circular_buf in circular buffer
- *
- * @return 0 on success, -1 if the mode is live and cannot wait.
- */
-int dc_producer_lock(Producer *producer, CircularBuffer *circular_buf);
-
-/*
- * Producer unlock on circular buffer
- *
- * @param producer in producer
- * @param circular_buf in circular buffer
- */
-void dc_producer_unlock(Producer *producer, CircularBuffer *circular_buf);
-
-/*
- * Producer unlock on the previous node of the circular buffer
- *
- * @param producer in producer
- * @param circular_buf in circular buffer
- */
-void dc_producer_unlock_previous(Producer *, CircularBuffer *);
-
-/*
- * Producer leads its index
- *
- * @param producer in producer
- * @param circular_buf in circular buffer
- */
-void dc_producer_advance(Producer *producer, CircularBuffer *);
-
-/*
- * Producer signal that the current node is the last node
- *
- * @param producer in producer
- * @param circular_buf in circular buffer
- */
-void dc_producer_end_signal(Producer *producer, CircularBuffer *circular_buf);
-
-void dc_producer_end_signal_previous(Producer *producer, CircularBuffer *circular_buf);
-
-#endif /* CIRCULAR_BUFFER_H_ */

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/dashcast/cmd_data.c Deleted

@@ -1,936 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Arash Shafiei
- *			Copyright (c) Telecom ParisTech 2000-2013
- *					All rights reserved
- *
- *  This file is part of GPAC / dashcast
- *
- *  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 "cmd_data.h"
-
-
-#define DASHCAST_CHECK_NEXT_ARG \
-			i++; \
-			if (i >= argc) { \
-				fprintf(stderr, "%s: %s", command_error, argvi); \
-				fprintf(stderr, "%s", command_usage); \
-				return -1; \
-			}
-
-
-int dc_str_to_resolution(char *str, int *width, int *height)
-{
-	char *token = strtok(str, "x");
-	if (!token) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Cannot parse resolution string.\n"));
-		return -1;
-	}
-	*width = atoi(token);
-
-	token = strtok(NULL, " ");
-	if (!token) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Cannot parse resolution string.\n"));
-		return -1;
-	}
-	*height = atoi(token);
-
-	return 0;
-}
-
-
-#define DEFAULT_VIDEO_BITRATE    1000000
-#define DEFAULT_VIDEO_FRAMERATE  25
-#define DEFAULT_VIDEO_WIDTH      640
-#define DEFAULT_VIDEO_HEIGHT     480
-#define DEFAULT_VIDEO_CODEC      "libx264"
-#define DEFAULT_AUDIO_BITRATE    192000
-#define DEFAULT_AUDIO_SAMPLERATE 44100
-#define DEFAULT_AUDIO_CHANNELS   2
-#define DEFAULT_AUDIO_CODEC      "aac"
-
-
-static void dc_create_configuration(CmdData *cmd_data)
-{
-	u32 i;
-	GF_Config *conf = cmd_data->conf;
-	u32 sec_count = gf_cfg_get_section_count(conf);
-	if (!sec_count) {
-		gf_cfg_set_key(conf, "v1", "type", "video");
-		gf_cfg_set_key(conf, "a1", "type", "audio");
-		sec_count = gf_cfg_get_section_count(conf);
-	}
-	for (i=0; i<sec_count; i++) {
-		char valueGF_MAX_PATH;
-		const char *section_name = gf_cfg_get_section_name(conf, i);
-		const char *section_type = gf_cfg_get_key(conf, section_name, "type");
-
-		if (strcmp(section_type, "video") == 0) {
-			if (!gf_cfg_get_key(conf, section_name, "bitrate")) {
-				if (cmd_data->video_data_conf.bitrate == -1)
-					cmd_data->video_data_conf.bitrate = DEFAULT_VIDEO_BITRATE;
-				snprintf(value, sizeof(value), "%d", cmd_data->video_data_conf.bitrate);
-				gf_cfg_set_key(conf, section_name, "bitrate", value);
-			}
-
-			if (!gf_cfg_get_key(conf, section_name, "framerate")) {
-				if (cmd_data->video_data_conf.framerate == -1)
-					cmd_data->video_data_conf.framerate = DEFAULT_VIDEO_FRAMERATE;
-				snprintf(value, sizeof(value), "%d", cmd_data->video_data_conf.framerate);
-				gf_cfg_set_key(conf, section_name, "framerate", value);
-			}
-
-			if (!gf_cfg_get_key(conf, section_name, "width")) {
-				if (cmd_data->video_data_conf.width == -1)
-					cmd_data->video_data_conf.width = DEFAULT_VIDEO_WIDTH;
-				snprintf(value, sizeof(value), "%d", cmd_data->video_data_conf.width);
-				gf_cfg_set_key(conf, section_name, "width", value);
-			}
-
-			if (!gf_cfg_get_key(conf, section_name, "height")) {
-				if (cmd_data->video_data_conf.height == -1)
-					cmd_data->video_data_conf.height = DEFAULT_VIDEO_HEIGHT;
-				snprintf(value, sizeof(value), "%d", cmd_data->video_data_conf.height);
-				gf_cfg_set_key(conf, section_name, "height", value);
-			}
-
-			if (!gf_cfg_get_key(conf, section_name, "crop_x")) {
-				if (cmd_data->video_data_conf.crop_x == -1)
-					cmd_data->video_data_conf.crop_x = 0;
-				snprintf(value, sizeof(value), "%d", cmd_data->video_data_conf.crop_x);
-				gf_cfg_set_key(conf, section_name, "crop_x", value);
-			}
-			if (!gf_cfg_get_key(conf, section_name, "low_delay")) {
-				gf_cfg_set_key(conf, section_name, "low_delay", cmd_data->video_data_conf.low_delay ? "yes" : "no");
-			}
-
-			if (!gf_cfg_get_key(conf, section_name, "crop_y")) {
-				if (cmd_data->video_data_conf.crop_y == -1)
-					cmd_data->video_data_conf.crop_y = 0;
-				snprintf(value, sizeof(value), "%d", cmd_data->video_data_conf.crop_y);
-				gf_cfg_set_key(conf, section_name, "crop_y", value);
-			}
-
-			if (!gf_cfg_get_key(conf, section_name, "codec"))
-				gf_cfg_set_key(conf, section_name, "codec", DEFAULT_VIDEO_CODEC);
-		}
-
-		if (strcmp(section_type, "audio") == 0) {
-			if (!gf_cfg_get_key(conf, section_name, "bitrate")) {
-				if (cmd_data->audio_data_conf.bitrate == -1)
-					cmd_data->audio_data_conf.bitrate = DEFAULT_AUDIO_BITRATE;
-				snprintf(value, sizeof(value), "%d", cmd_data->audio_data_conf.bitrate);
-				gf_cfg_set_key(conf, section_name, "bitrate", value);
-			}
-
-			if (!gf_cfg_get_key(conf, section_name, "samplerate")) {
-				if (cmd_data->audio_data_conf.samplerate == -1)
-					cmd_data->audio_data_conf.samplerate = DEFAULT_AUDIO_SAMPLERATE;
-				snprintf(value, sizeof(value), "%d", cmd_data->audio_data_conf.samplerate);
-				gf_cfg_set_key(conf, section_name, "samplerate", value);
-			}
-
-			if (!gf_cfg_get_key(conf, section_name, "channels")) {
-				if (cmd_data->audio_data_conf.channels == -1)
-					cmd_data->audio_data_conf.channels = DEFAULT_AUDIO_CHANNELS;
-				snprintf(value, sizeof(value), "%d", cmd_data->audio_data_conf.channels);
-				gf_cfg_set_key(conf, section_name, "channels", value);
-			}
-
-			if (!gf_cfg_get_key(conf, section_name, "codec")) {
-				if (strlen(cmd_data->audio_data_conf.codec))
-					gf_cfg_set_key(conf, section_name, "codec", cmd_data->audio_data_conf.codec);
-				else
-					gf_cfg_set_key(conf, section_name, "codec", DEFAULT_AUDIO_CODEC);
-			}
-		}
-	}
-}
-
-int dc_read_configuration(CmdData *cmd_data)
-{
-	const char *opt;
-	u32 i;
-	GF_Config *conf = cmd_data->conf;
-
-	u32 sec_count = gf_cfg_get_section_count(conf);
-	for (i=0; i<sec_count; i++) {
-		const char *section_name = gf_cfg_get_section_name(conf, i);
-		const char *section_type = gf_cfg_get_key(conf, section_name, "type");
-
-		if (strcmp(section_type, "video") == 0) {
-			VideoDataConf *video_data_conf;
-			GF_SAFEALLOC(video_data_conf, VideoDataConf);
-			strcpy(video_data_conf->filename, section_name);
-			opt = gf_cfg_get_key(conf, section_name, "codec");
-			if (!opt) opt = DEFAULT_VIDEO_CODEC;
-			strcpy(video_data_conf->codec, opt);
-			opt = gf_cfg_get_key(conf, section_name, "bitrate");
-			video_data_conf->bitrate = opt ? atoi(opt) : DEFAULT_VIDEO_BITRATE;
-			opt = gf_cfg_get_key(conf, section_name, "framerate");
-			video_data_conf->framerate = opt ? atoi(opt) : DEFAULT_VIDEO_FRAMERATE;
-			opt = gf_cfg_get_key(conf, section_name, "height");
-			video_data_conf->height = opt ? atoi(opt) : DEFAULT_VIDEO_HEIGHT;
-			opt = gf_cfg_get_key(conf, section_name, "width");
-			video_data_conf->width = opt ? atoi(opt) : DEFAULT_VIDEO_WIDTH;
-			opt = gf_cfg_get_key(conf, section_name, "crop_x");
-			video_data_conf->crop_x = opt ? atoi(opt) : 0;
-			opt = gf_cfg_get_key(conf, section_name, "crop_y");
-			video_data_conf->crop_x = opt ? atoi(opt) : 0;
-			opt = gf_cfg_get_key(conf, section_name, "low_delay");
-			video_data_conf->low_delay = (opt && !strcmp(opt, "yes")) ? 1 : 0;
-			opt = gf_cfg_get_key(conf, section_name, "custom");
-			if (opt) {
-				if (strlen(opt) >= GF_MAX_PATH)
-					fprintf(stderr, "Warning: video custom opt is too long. Truncating.\n");
-				strncpy(video_data_conf->custom, opt, GF_MAX_PATH-1);
-			}
-			gf_list_add(cmd_data->video_lst, (void *) video_data_conf);
-		}
-		else if (strcmp(section_type, "audio") == 0)
-		{
-			AudioDataConf *audio_data_conf;
-			GF_SAFEALLOC(audio_data_conf, AudioDataConf);
-			strcpy(audio_data_conf->filename, section_name);
-			opt = gf_cfg_get_key(conf, section_name, "codec");
-			if (!opt) opt = DEFAULT_AUDIO_CODEC;
-			strcpy(audio_data_conf->codec, opt);
-			opt = gf_cfg_get_key(conf, section_name, "bitrate");
-			audio_data_conf->bitrate = opt ? atoi(opt) : DEFAULT_AUDIO_BITRATE;
-			opt = gf_cfg_get_key(conf, section_name, "samplerate");
-			audio_data_conf->samplerate = opt ? atoi(opt) : DEFAULT_AUDIO_SAMPLERATE;
-			opt = gf_cfg_get_key(conf, section_name, "channels");
-			audio_data_conf->channels = opt ? atoi(opt) : DEFAULT_AUDIO_CHANNELS;
-			opt = gf_cfg_get_key(conf, section_name, "custom");
-			if (opt) {
-				if (strlen(opt) >= GF_MAX_PATH)
-					fprintf(stderr, "Warning: audio custom opt is too long. Truncating.\n");
-				strncpy(audio_data_conf->custom, opt, GF_MAX_PATH-1);
-			}
-			gf_list_add(cmd_data->audio_lst, (void *) audio_data_conf);
-		} else {
-			fprintf(stderr, "Configuration file: type %s is not supported.\n", section_type);
-		}
-	}
-
-	fprintf(stdout, "\3334m\331m");
-	fprintf(stdout, "Configurations:\n");
-	for (i=0; i<gf_list_count(cmd_data->video_lst); i++) {
-		VideoDataConf *video_data_conf = (VideoDataConf*)gf_list_get(cmd_data->video_lst, i);
-		fprintf(stdout, "    id:%s\tres:%dx%d\tvbr:%d\n", video_data_conf->filename,
-		        video_data_conf->width, video_data_conf->height,
-		        video_data_conf->bitrate/*, video_data_conf->framerate, video_data_conf->codec*/);
-	}
-
-	for (i=0; i<gf_list_count(cmd_data->audio_lst); i++) {
-		AudioDataConf *audio_data_conf = (AudioDataConf*)gf_list_get(cmd_data->audio_lst, i);
-		fprintf(stdout, "    id:%s\tabr:%d\n", audio_data_conf->filename, audio_data_conf->bitrate/*, audio_data_conf->samplerate, audio_data_conf->channels,audio_data_conf->codec*/);
-	}
-	fprintf(stdout, "\330m");
-	fflush(stdout);
-
-	return 0;
-}
-
-/**
- * Parse time from a string to a struct tm.
- */
-static Bool parse_time(const char* str_time, struct tm *tm_time)
-{
-	if (!tm_time)
-		return GF_FALSE;
-
-#if defined(__GNUC__)
-	strptime(str_time, "%Y-%m-%d %H:%M:%S", tm_time);
-#elif defined(WIN32)
-	assert(0); //TODO
-#else
-#error
-#endif
-
-	return GF_TRUE;
-}
-
-int dc_read_switch_config(CmdData *cmd_data)
-{
-	u32 i;
-	int src_number;
-	char start_time4096, end_time4096;
-
-	time_t now_t = time(NULL);
-	struct tm start_tm = *localtime(&now_t);
-	struct tm end_tm = *localtime(&now_t);
-
-	GF_Config *conf = cmd_data->switch_conf;
-	u32 sec_count = gf_cfg_get_section_count(conf);
-
-	dc_task_init(&cmd_data->task_list);
-
-	if (sec_count == 0) {
-		return 0;
-	}
-
-	for (i = 0; i < sec_count; i++) {
-		const char *section_name = gf_cfg_get_section_name(conf, i);
-		const char *section_type = gf_cfg_get_key(conf, section_name, "type");
-
-		if (strcmp(section_type, "video") == 0) {
-			VideoDataConf *video_data_conf = (VideoDataConf*)gf_malloc(sizeof(VideoDataConf));
-
-			strcpy(video_data_conf->source_id, section_name);
-			strcpy(video_data_conf->filename, gf_cfg_get_key(conf, section_name, "source"));
-
-			strcpy(start_time, gf_cfg_get_key(conf, section_name, "start"));
-			parse_time(start_time, &start_tm);
-			video_data_conf->start_time = mktime(&start_tm);
-			strcpy(end_time, gf_cfg_get_key(conf, section_name, "end"));
-			parse_time(end_time, &end_tm);
-			video_data_conf->end_time = mktime(&end_tm);
-
-			gf_list_add(cmd_data->vsrc, (void *) video_data_conf);
-
-			src_number = gf_list_count(cmd_data->vsrc);
-
-			dc_task_add(&cmd_data->task_list, src_number, video_data_conf->source_id, video_data_conf->start_time, video_data_conf->end_time);
-		}
-		else if (strcmp(section_type, "audio") == 0)
-		{
-			AudioDataConf *audio_data_conf = (AudioDataConf*)gf_malloc(sizeof(AudioDataConf));
-			strcpy(audio_data_conf->source_id, section_name);
-			strcpy(audio_data_conf->filename, gf_cfg_get_key(conf, section_name, "source"));
-
-			strcpy(start_time, gf_cfg_get_key(conf, section_name, "start"));
-			parse_time(start_time, &start_tm);
-			audio_data_conf->start_time = mktime(&start_tm);
-
-			strcpy(end_time, gf_cfg_get_key(conf, section_name, "end"));
-			parse_time(end_time, &end_tm);
-			audio_data_conf->end_time = mktime(&end_tm);
-
-			gf_list_add(cmd_data->asrc, (void *) audio_data_conf);
-		} else {
-			fprintf(stdout, "Switch source configuration file: type %s is not supported.\n", section_type);
-		}
-	}
-
-	fprintf(stdout, "\3334m\331m");
-	fprintf(stdout, "Sources:\n");
-	for (i=0; i<gf_list_count(cmd_data->vsrc); i++) {
-		VideoDataConf *video_data_conf = (VideoDataConf*)gf_list_get(cmd_data->vsrc, i);
-		strftime(start_time, 20, "%Y-%m-%d %H:%M:%S", localtime(&video_data_conf->start_time));
-		strftime(end_time, 20, "%Y-%m-%d %H:%M:%S", localtime(&video_data_conf->end_time));
-		fprintf(stdout, "    id:%s\tsource:%s\tstart:%s\tend:%s\n", video_data_conf->source_id, video_data_conf->filename, start_time, end_time);
-	}
-
-	for (i=0; i<gf_list_count(cmd_data->asrc); i++) {
-		AudioDataConf *audio_data_conf = (AudioDataConf*)gf_list_get(cmd_data->asrc, i);
-		strftime(start_time, 20, "%Y-%m-%d %H:%M:%S", localtime(&audio_data_conf->start_time));
-		strftime(end_time, 20, "%Y-%m-%d %H:%M:%S", localtime(&audio_data_conf->end_time));
-		fprintf(stdout, "    id:%s\tsource:%s\tstart:%s\tend:%s\n", audio_data_conf->source_id, audio_data_conf->filename, start_time, end_time);
-	}
-	fprintf(stdout, "\330m");
-	fflush(stdout);
-
-	return 0;
-}
-
-void dc_cmd_data_init(CmdData *cmd_data)
-{
-	memset(cmd_data, 0, sizeof(CmdData));
-	dc_audio_data_set_default(&cmd_data->audio_data_conf);
-	dc_video_data_set_default(&cmd_data->video_data_conf);
-
-	cmd_data->mode = ON_DEMAND;
-	cmd_data->ast_offset = -1;
-	cmd_data->min_buffer_time = -1;
-	cmd_data->minimum_update_period = -1;
-	cmd_data->use_source_timing = GF_TRUE;
-
-	cmd_data->audio_lst = gf_list_new();
-	cmd_data->video_lst = gf_list_new();
-	cmd_data->asrc = gf_list_new();
-	cmd_data->vsrc = gf_list_new();
-}
-
-void dc_cmd_data_destroy(CmdData *cmd_data)
-{
-	while (gf_list_count(cmd_data->audio_lst)) {
-		AudioDataConf *audio_data_conf = (AudioDataConf*)gf_list_last(cmd_data->audio_lst);
-		gf_list_rem_last(cmd_data->audio_lst);
-		gf_free(audio_data_conf);
-	}
-	gf_list_del(cmd_data->audio_lst);
-
-	while (gf_list_count(cmd_data->video_lst)) {
-		VideoDataConf *video_data_conf = (VideoDataConf*)gf_list_last(cmd_data->video_lst);
-		gf_list_rem_last(cmd_data->video_lst);
-		gf_free(video_data_conf);
-	}
-	gf_list_del(cmd_data->video_lst);
-
-	gf_list_del(cmd_data->asrc);
-	gf_list_del(cmd_data->vsrc);
-	gf_cfg_del(cmd_data->conf);
-	gf_cfg_del(cmd_data->switch_conf);
-	if (cmd_data->logfile)
-		gf_fclose(cmd_data->logfile);
-
-	dc_task_destroy(&cmd_data->task_list);
-
-	gf_sys_close();
-}
-
-static void on_dc_log(void *cbk, GF_LOG_Level ll, GF_LOG_Tool lm, const char *av_fmt_ctx, va_list list)
-{
-	FILE *logs = (FILE*)cbk;
-	vfprintf(logs, av_fmt_ctx, list);
-	fflush(logs);
-}
-
-int dc_parse_command(int argc, char **argv, CmdData *cmd_data)
-{
-	GF_MemTrackerType mem_track = GF_MemTrackerNone;
-	int i;
-
-	const char *command_usage =
-	    "Usage: DashCast options\n"
-	    "GPAC version " GPAC_FULL_VERSION"\n"
-	    "\n"
-	    "General options:\n"
-	    "    -log-file filename       set output log file. Also works with -lf\n"
-	    "    -logs LOGS               set log tools and levels, formatted as a ':'-separated list of toolX:toolZ@levelX\n"
-#ifdef GPAC_MEMORY_TRACKING
-	    "    -mem-track               enable the memory tracker\n"
-        "    -mem-track-stack         enable the memory tracker with stack dumping\n"
-#endif
-	    "    -conf filename           set the configuration file name (default: dashcast.conf)\n"
-	    "    -switch-source filename  set the configuration file name for source switching\n"
-	    "\n"
-	    "Live options:\n"
-	    "    -live                    system is live and input is a camera\n"
-	    "    -live-media              system is live and input is a media file\n"
-	    "    -no-loop                 system does not loop on the input media file when live\n"
-	    "    -dynamic-ast             changes segment availability start time at each MPD generation (old behaviour but not allowed in most profiles)\n"
-    	"    -insert-utc              inserts UTC clock at the start of each segment\n"
-	    "    -no-rewrite              Do not rewrite the MPD as a static one at the end of the live session\n"
-	    "\n"
-	    "Source options:\n"
-	    "    -npts                    use frame counting for timestamps (not error-free) instead of source timing (default)\n"
-	    "    -av string               set the source name for a multiplexed audio and video input\n"
-	    "                                - if this option is present, neither '-a' nor '-v' shall be present\n"
-	    "* Video options:\n"
-	    "    -v string                set the source name for a video input\n"
-	    "                                - if input is from a webcam, use \"/dev/videox\" \n"
-	    "                                  where x is the video device number\n"
-	    "                                - if input is the screen video, use \":0.0+x,y\" \n"
-	    "                                  which captures from upper-left at x,y\n"
-	    "                                - if input is from stdin, use \"pipe:\"\n"
-	    "    -vf string               set the input video format\n"
-#ifdef WIN32
-	    "                                - to capture from a directshow device, set dshow\n"
-#else
-	    "                                - to capture from a webcam, set video4linux2\n"
-	    "                                - to capture the screen, set x11grab\n"
-	    "    -v4l2f inv4l2f           inv4l2f is the input format for webcam acquisition\n"
-	    "                                - it can be mjpeg, yuyv422, etc.\n"
-#endif
-	    "    -pixf FMT                set the input pixel format\n"
-	    "    -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"
-	    "    -demux-buffer SIZE       sets demux buffer size to SIZE.\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"
-	    "    -af string               set the input audio format\n"
-	    "\n"
-	    "Output options:\n"
-	    "* Video encoding options:\n"
-	    "    -vcodec string          set the output video codec (default: h264)\n"
-#if 0 //TODO: bind to option and params - test first how it binds to current input parameters
-	    "    -vb int                 set the output video bitrate (in bits)\n"
-#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"
-	    "* 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
-	    "    -ab int                 set the output audio bitrate in bits (default: 192000)\n"
-	    "    -as int                 set the sample rate (default: 44100)\n"
-	    "    -ach int                set the number of output audio channels (default: 2)\n"
-#endif
-	    "    -acustom string         send custom parameters directly to the audio encoder\n"
-	    "\n"
-	    "DASH options:\n"
-	    "    -seg-dur dur:int         set the segment duration in millisecond (default value: 1000)\n"
-	    "    -frag dur:int            set the fragment duration in millisecond (default value: 1000) (same as -frag-dur)\n"
-	    "    -seg-marker marker:4cc   add a marker box named marker at the end of DASH segment\n"
-	    "    -out outdir:str          outdir is the output data directory (default: output)\n"
-	    "    -mpd mpdname:str         mpdname is the MPD file name (default: dashcast.mpd)\n"
-	    "    -ast-offset dur:int      dur is the MPD availabilityStartTime shift in milliseconds (default value: 0)\n"
-	    "    -mpd-refresh dur:int     dur is the MPD minimumUpdatePeriod in seconds\n"
-	    "    -time-shift dur:int      dur is the MPD TimeShiftBufferDepth in seconds\n"
-	    "                                - the default value is 10. Specify -1 to keep all files.\n"
-	    "    -min-buffer dur:float    dur is the MPD minBufferTime in seconds (default value: 1.0)\n"
-	    "    -base-url baseurl:str    baseurl is the MPD BaseURL\n"
-	    "\n"
-	    "\n"
-	    "Examples:\n"
-	    "\n"
-	    "    DashCast -av test.avi -live-media\n"
-	    "    DashCast -a test_audio.mp3 -v test_audio.mp4 -live-media\n"
-#ifdef WIN32
-	    "    DashCast -vf dshow  -vres 1280x720 -vfr 24 -v video=\"screen-capture-recorder\" -live (please install http://screencapturer.sf.net/)\n"
-	    "    DashCast -vf dshow  -vres 1280x720 -vfr 24 -v video=\"YOUR-WEBCAM\" -pixf yuv420p -live (see https://trac.ffmpeg.org/wiki/DirectShow)\n"
-#elif defined(__DARWIN) || defined(__APPLE__)
-	    "    DashCast -vf avfoundation -vres 1280x720 -v \"FaceTime HD Camera\" -vfr 25 -live\n"
-	    "    DashCast -vf avfoundation -vres 1280x720 -v \"Capture screen 0\" -vfr 25 -live\n"
-#else
-	    "    DashCast -vf video4linux2 -vres 1280x720 -vfr 24 -v4l2f mjpeg -v /dev/video0 -af alsa -a plughw:1,0 -live\n"
-	    "    DashCast -vf x11grab -vres 800x600 -vfr 25 -v :0.0 -live\n"
-#endif
-	    "\n";
-
-	const char *command_error = "\3331mUnknown option or missing mandatory argument.\330m\n";
-
-	if (argc == 1) {
-		fprintf(stderr, "%s", command_usage);
-		return -2;
-	}
-
-#ifdef GPAC_MEMORY_TRACKING
-	i = 1;
-	while (i < argc) {
-        if (strcmp(argvi, "-mem-track") == 0) {
-            mem_track = GF_MemTrackerSimple;
-            break;
-        }
-        else if (strcmp(argvi, "-mem-track-stack") == 0) {
-            mem_track = GF_MemTrackerBackTrace;
-            break;
-        }
-		i++;
-	}
-#endif
-
-	gf_sys_init(mem_track);
-
-	gf_log_set_tool_level(GF_LOG_ALL, GF_LOG_WARNING);
-	if (mem_track) {
-		gf_log_set_tool_level(GF_LOG_MEMORY, GF_LOG_INFO);
-	}
-
-	/* Initialize command data */
-	dc_cmd_data_init(cmd_data);
-	cmd_data->mem_track = mem_track;
-
-	i = 1;
-	while (i < argc) {
-		if (strcmp(argvi, "-a") == 0 || strcmp(argvi, "-v") == 0 || strcmp(argvi, "-av") == 0) {
-			DASHCAST_CHECK_NEXT_ARG
-			if (strcmp(argvi - 1, "-a") == 0 || strcmp(argvi - 1, "-av") == 0) {
-				if (strcmp(cmd_data->audio_data_conf.filename, "") != 0) {
-					fprintf(stderr, "Audio source has already been specified.\n");
-					fprintf(stderr, "%s", command_usage);
-					return -1;
-				}
-				strcpy(cmd_data->audio_data_conf.filename, argvi);
-			}
-
-			if (strcmp(argvi - 1, "-v") == 0 || strcmp(argvi - 1, "-av") == 0) {
-				if (strcmp(cmd_data->video_data_conf.filename, "") != 0) {
-					fprintf(stderr, "Video source has already been specified.\n");
-					fprintf(stderr, "%s", command_usage);
-					return -1;
-				}
-				strcpy(cmd_data->video_data_conf.filename, argvi);
-			}
-
-			i++;
-		} else if (strcmp(argvi, "-af") == 0 || strcmp(argvi, "-vf") == 0) {
-			DASHCAST_CHECK_NEXT_ARG
-			if (strcmp(argvi - 1, "-af") == 0) {
-				if (strcmp(cmd_data->audio_data_conf.format, "") != 0) {
-					fprintf(stderr, "Audio format has already been specified.\n");
-					fprintf(stderr, "%s", command_usage);
-					return -1;
-				}
-				strcpy(cmd_data->audio_data_conf.format, argvi);
-			}
-			if (strcmp(argvi - 1, "-vf") == 0) {
-				if (strcmp(cmd_data->video_data_conf.format, "") != 0) {
-					fprintf(stderr, "Video format has already been specified.\n");
-					fprintf(stderr, "%s", command_usage);
-					return -1;
-				}
-				strcpy(cmd_data->video_data_conf.format, argvi);
-			}
-			i++;
-		} else if (strcmp(argvi, "-pixf") == 0) {
-			DASHCAST_CHECK_NEXT_ARG
-			if (strcmp(cmd_data->video_data_conf.pixel_format, "") != 0) {
-				fprintf(stderr, "Input pixel format has already been specified.\n");
-				fprintf(stderr, "%s", command_usage);
-				return -1;
-			}
-			strcpy(cmd_data->video_data_conf.pixel_format, argvi);
-			i++;
-		} else if (strcmp(argvi, "-vfr") == 0) {
-			DASHCAST_CHECK_NEXT_ARG
-			if (cmd_data->video_data_conf.framerate != -1) {
-				fprintf(stderr, "Video framerate has already been specified.\n");
-				fprintf(stderr, "%s", command_usage);
-				return -1;
-			}
-			cmd_data->video_data_conf.framerate = atoi(argvi);
-			i++;
-		} else if (strcmp(argvi, "-vres") == 0) {
-			DASHCAST_CHECK_NEXT_ARG
-			if (cmd_data->video_data_conf.height != -1 && cmd_data->video_data_conf.width != -1) {
-				fprintf(stderr, "Video resolution has already been specified.\n");
-				fprintf(stderr, "%s", command_usage);
-				return -1;
-			}
-			dc_str_to_resolution(argvi, &cmd_data->video_data_conf.width, &cmd_data->video_data_conf.height);
-			i++;
-		} else if (strcmp(argvi, "-vcrop") == 0) {
-			DASHCAST_CHECK_NEXT_ARG
-			if (cmd_data->video_data_conf.crop_x && cmd_data->video_data_conf.crop_y) {
-				fprintf(stderr, "Video crop has already been specified.\n");
-				fprintf(stderr, "%s", command_usage);
-				return -1;
-			}
-			dc_str_to_resolution(argvi, &cmd_data->video_data_conf.crop_x, &cmd_data->video_data_conf.crop_y);
-			i++;
-		} else if (strcmp(argvi, "-vcodec") == 0) {
-			DASHCAST_CHECK_NEXT_ARG
-			if (strcmp(cmd_data->video_data_conf.codec, "") != 0) {
-				fprintf(stderr, "Video codec has already been specified.\n");
-				fprintf(stderr, "%s", command_usage);
-				return -1;
-			}
-			strncpy(cmd_data->video_data_conf.codec, argvi, GF_MAX_PATH-1);
-			i++;
-		} else if (strcmp(argvi, "-vcustom") == 0) {
-			DASHCAST_CHECK_NEXT_ARG
-			if (strlen(cmd_data->video_data_conf.custom)) {
-				fprintf(stderr, "Video custom has already been specified: appending\n");
-				fprintf(stderr, "%s", command_usage);
-				return -1;
-			}
-			if (strlen(argvi) >= GF_MAX_PATH)
-				fprintf(stderr, "Warning: video custom is too long. Truncating.\n");
-			strncpy(cmd_data->video_data_conf.custom, argvi, GF_MAX_PATH-1);
-			i++;
-		} else if (strcmp(argvi, "-acodec") == 0) {
-			DASHCAST_CHECK_NEXT_ARG
-			if (strcmp(cmd_data->audio_data_conf.codec, "") != 0) {
-				fprintf(stderr, "Audio codec has already been specified.\n");
-				fprintf(stderr, "%s", command_usage);
-				return -1;
-			}
-			strncpy(cmd_data->audio_data_conf.codec, argvi, GF_MAX_PATH-1);
-			i++;
-		} else if (strcmp(argvi, "-acustom") == 0) {
-			DASHCAST_CHECK_NEXT_ARG
-			if (strlen(cmd_data->audio_data_conf.custom)) {
-				fprintf(stderr, "Audio custom has already been specified: appending\n");
-				fprintf(stderr, "%s", command_usage);
-				return -1;
-			}
-			if (strlen(argvi) >= GF_MAX_PATH)
-				fprintf(stderr, "Warning: audio custom is too long. Truncating.\n");
-			strncpy(cmd_data->audio_data_conf.custom, argvi, GF_MAX_PATH-1);
-			i++;
-		} else if (strcmp(argvi, "-conf") == 0) {
-			DASHCAST_CHECK_NEXT_ARG
-			cmd_data->conf = gf_cfg_force_new(NULL, argvi);
-			i++;
-		} else if (strcmp(argvi, "-switch-source") == 0) {
-			DASHCAST_CHECK_NEXT_ARG
-			cmd_data->switch_conf = gf_cfg_force_new(NULL, argvi);
-			i++;
-		} else if (strcmp(argvi, "-out") == 0) {
-			DASHCAST_CHECK_NEXT_ARG
-			strcpy(cmd_data->out_dir, argvi);
-			i++;
-#ifndef WIN32
-		} else if (strcmp(argvi, "-v4l2f") == 0) {
-			DASHCAST_CHECK_NEXT_ARG
-			strcpy(cmd_data->video_data_conf.v4l2f, argvi);
-			i++;
-#endif
-		} else if (strcmp(argvi, "-seg-marker") == 0) {
-			char *m;
-			DASHCAST_CHECK_NEXT_ARG
-			m = argvi;
-			if (strlen(m) == 4) {
-				cmd_data->seg_marker = GF_4CC(m0, m1, m2, m3);
-			} else {
-				fprintf(stderr, "Invalid marker box name specified: %s\n", m);
-				return -1;
-			}
-			i++;
-		} else if (strcmp(argvi, "-mpd") == 0) {
-			DASHCAST_CHECK_NEXT_ARG
-			if (strcmp(cmd_data->mpd_filename, "") != 0) {
-				fprintf(stderr, "MPD file has already been specified.\n");
-				fprintf(stderr, "%s", command_usage);
-				return -1;
-			}
-			strncpy(cmd_data->mpd_filename, argvi, GF_MAX_PATH-1);
-			i++;
-		} else if (strcmp(argvi, "-seg-dur") == 0) {
-			DASHCAST_CHECK_NEXT_ARG
-			if (cmd_data->seg_dur != 0) {
-				fprintf(stderr, "Segment duration has already been specified.\n");
-				fprintf(stderr, "%s", command_usage);
-				return -1;
-			}
-			cmd_data->seg_dur = atoi(argvi);
-			i++;
-		} else if ((strcmp(argvi, "-frag-dur") == 0) || (strcmp(argvi, "-frag") == 0)) {
-			DASHCAST_CHECK_NEXT_ARG
-			if (cmd_data->frag_dur != 0) {
-				fprintf(stderr, "Fragment duration has already been specified.\n");
-				fprintf(stderr, "%s", command_usage);
-				return -1;
-			}
-			cmd_data->frag_dur = atoi(argvi);
-			i++;
-		} else if (strcmp(argvi, "-ast-offset") == 0) {
-			DASHCAST_CHECK_NEXT_ARG
-			if (cmd_data->ast_offset != -1) {
-				fprintf(stderr, "AvailabilityStartTime offset has already been specified.\n");
-				fprintf(stderr, "%s", command_usage);
-				return -1;
-			}
-			cmd_data->ast_offset = atoi(argvi);
-			i++;
-		} else if (strcmp(argvi, "-mpd-refresh") == 0) {
-			DASHCAST_CHECK_NEXT_ARG
-			if (cmd_data->minimum_update_period != -1) {
-				fprintf(stderr, "minimumUpdatePeriod (mpd-refresh) has already been specified.\n");
-				fprintf(stderr, "%s", command_usage);
-				return -1;
-			}
-			cmd_data->minimum_update_period = atoi(argvi);
-			i++;
-		} else if (strcmp(argvi, "-time-shift") == 0) {
-			DASHCAST_CHECK_NEXT_ARG
-			if (cmd_data->time_shift != 0) {
-				fprintf(stderr, "TimeShiftBufferDepth has already been specified.\n");
-				fprintf(stderr, "%s", command_usage);
-				return -1;
-			}
-			cmd_data->time_shift = atoi(argvi);
-			i++;
-		} else if (strcmp(argvi, "-gop") == 0) {
-			DASHCAST_CHECK_NEXT_ARG
-			if (cmd_data->gop_size != 0) {
-				fprintf(stderr, "GOP size has already been specified.\n");
-				fprintf(stderr, "%s", command_usage);
-				return -1;
-			}
-			cmd_data->gop_size = atoi(argvi);
-			i++;
-		} else if (strcmp(argvi, "-min-buffer") == 0) {
-			DASHCAST_CHECK_NEXT_ARG
-			if (cmd_data->min_buffer_time != -1) {
-				fprintf(stderr, "Min Buffer Time has already been specified.\n");
-				fprintf(stderr, "%s", command_usage);
-				return -1;
-			}
-			cmd_data->min_buffer_time = (float)atof(argvi);
-			i++;
-		} else if (strcmp(argvi, "-demux-buffer") == 0) {
-			DASHCAST_CHECK_NEXT_ARG
-			cmd_data->video_data_conf.demux_buffer_size = (int)atoi(argvi);
-			i++;
-		} else if (strcmp(argvi, "-base-url") == 0) {
-			DASHCAST_CHECK_NEXT_ARG
-			if (strcmp(cmd_data->base_url, "") != 0) {
-				fprintf(stderr, "BaseURL has already been specified.\n");
-				fprintf(stderr, "%s", command_usage);
-				return -1;
-			}
-			strncpy(cmd_data->base_url, argvi, GF_MAX_PATH-1);
-			i++;
-		} else if (strcmp(argvi, "-low-delay") == 0) {
-			cmd_data->video_data_conf.low_delay = 1;
-			i++;
-		} else if (strcmp(argvi, "-live") == 0) {
-			cmd_data->mode = LIVE_CAMERA;
-			i++;
-		} else if (strcmp(argvi, "-npts") == 0) {
-			cmd_data->use_source_timing = GF_FALSE;
-			i++;
-		} else if (strcmp(argvi, "-live-media") == 0) {
-			cmd_data->mode = LIVE_MEDIA;
-			i++;
-		} else if (strcmp(argvi, "-no-loop") == 0) {
-			cmd_data->no_loop = 1;
-			i++;
-		} else if (strcmp(argvi, "-insert-utc") == 0) {
-			cmd_data->insert_utc = 1;
-			i++;
-		} else if (strcmp(argvi, "-no-rewrite") == 0) {
-			cmd_data->no_mpd_rewrite = 1;
-			i++;
-		} else if (strcmp(argvi, "-dynamic-ast") == 0) {
-			cmd_data->use_dynamic_ast = 1;
-			i++;
-		} else if (strcmp(argvi, "-send-message") == 0) {
-			//FIXME: unreferenced option. Seems related to a separate fragment thread.
-			cmd_data->send_message = 1;
-			i++;
-		} else if (strcmp(argvi, "-logs") == 0) {
-			DASHCAST_CHECK_NEXT_ARG
-			if (gf_log_set_tools_levels(argvi) != GF_OK) {
-				fprintf(stderr, "Invalid log format %s", argvi);
-				return 1;
-			}
-			i++;
-		} else if (!strcmp(argvi, "-mem-track") || !strcmp(argvi, "-mem-track-stack") ) {
-			i++;
-#ifndef GPAC_MEMORY_TRACKING
-			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("WARNING - GPAC not compiled with Memory Tracker - ignoring \"%s\"\n", argvi));
-#endif
-		} else if (!strcmp(argvi, "-lf") || !strcmp(argvi, "-log-file")) {
-			DASHCAST_CHECK_NEXT_ARG
-			cmd_data->logfile = gf_fopen(argvi, "wt");
-			gf_log_set_callback(cmd_data->logfile, on_dc_log);
-			i++;
-		} else if (strcmp(argvi, "-gdr") == 0) {
-			if ( (i+1 <= argc) && (argvi+10 != '-')) {
-				DASHCAST_CHECK_NEXT_ARG
-				cmd_data->gdr = atoi(argvi);
-			} else {
-				//for historical reasons in dashcast
-				cmd_data->gdr = 8;
-			}
-			i++;
-		} else {
-			fprintf(stderr, "%s: %s", command_error, argvi);
-			fprintf(stderr, "%s", command_usage);
-			return -1;
-		}
-	}
-
-	if (strcmp(cmd_data->mpd_filename, "") == 0) {
-		strcpy(cmd_data->mpd_filename, "dashcast.mpd");
-	}
-
-	if (strcmp(cmd_data->out_dir, "") == 0) {
-		struct stat status;
-		strcpy(cmd_data->out_dir, "output");
-		if (stat(cmd_data->out_dir, &status) != 0) {
-			gf_mkdir(cmd_data->out_dir);
-		}
-	}
-
-	if (strcmp(cmd_data->video_data_conf.filename, "") == 0 && strcmp(cmd_data->audio_data_conf.filename, "") == 0) {
-		fprintf(stderr, "Audio/Video source must be specified.\n");
-		fprintf(stderr, "%s", command_usage);
-		return -1;
-	}
-
-	if (cmd_data->seg_dur == 0) {
-		cmd_data->seg_dur = 1000;
-	}
-
-	if (cmd_data->frag_dur == 0) {
-		cmd_data->frag_dur = cmd_data->seg_dur;
-	}
-
-	if (cmd_data->ast_offset == -1) {
-		//generate MPD as soon as possible (no offset)
-		cmd_data->ast_offset = 0;
-	}
-
-	if (cmd_data->mode == ON_DEMAND)
-		cmd_data->time_shift = -1;
-	else {
-		if (cmd_data->time_shift == 0) {
-			cmd_data->time_shift = 10;
-		}
-	}
-
-	if (cmd_data->min_buffer_time == -1) {
-		cmd_data->min_buffer_time = 1.0;
-	}
-
-	if ((cmd_data->minimum_update_period == -1) && (cmd_data->mode == LIVE_CAMERA)) {
-		fprintf(stderr, "MPD refresh time not set in live - defaulting to segment duration\n");
-		cmd_data->minimum_update_period = cmd_data->seg_dur / 1000;
-	}
-
-	//safety checks
-	if (cmd_data->video_data_conf.crop_x || cmd_data->video_data_conf.crop_y) {
-		if (cmd_data->video_data_conf.width == -1 && cmd_data->video_data_conf.height == -1) {
-			fprintf(stderr, "You cannot use '-vcrop' without '-vres'. Please check usage.\n");
-			fprintf(stderr, "%s", command_usage);
-			return -1;
-		}
-	}
-
-	fprintf(stdout, "\3334m\331m");
-	fprintf(stdout, "Options:\n");
-	fprintf(stdout, "    video source: %s\n", cmd_data->video_data_conf.filename);
-	if (strcmp(cmd_data->video_data_conf.format, "") != 0) {
-		fprintf(stdout, "    video format: %s\n", cmd_data->video_data_conf.format);
-	}
-#ifndef WIN32
-	if (strcmp(cmd_data->video_data_conf.v4l2f, "") != 0) {
-		fprintf(stdout, "    v4l2 format: %s\n", cmd_data->video_data_conf.v4l2f);
-	}
-#endif
-	if (cmd_data->video_data_conf.framerate != -1) {
-		fprintf(stdout, "    video framerate: %d\n", cmd_data->video_data_conf.framerate);
-	}
-	if (cmd_data->video_data_conf.height != -1 && cmd_data->video_data_conf.width != -1) {
-		fprintf(stdout, "    video resolution: %dx%d\n", cmd_data->video_data_conf.width, cmd_data->video_data_conf.height);
-	}
-	if (cmd_data->video_data_conf.crop_x != -1 && cmd_data->video_data_conf.crop_y != -1) {
-		fprintf(stdout, "    video crop: %dx%d\n", cmd_data->video_data_conf.crop_x, cmd_data->video_data_conf.crop_y);
-	}
-
-	fprintf(stdout, "    audio source: %s\n", cmd_data->audio_data_conf.filename);
-	if (strcmp(cmd_data->audio_data_conf.format, "") != 0) {
-		fprintf(stdout, "    audio format: %s\n", cmd_data->audio_data_conf.format);
-	}
-	fprintf(stdout, "\330m");
-	fflush(stdout);
-
-	if (!cmd_data->conf) {
-		cmd_data->conf = gf_cfg_force_new(NULL, "dashcast.conf");
-		dc_create_configuration(cmd_data);
-	}
-	dc_read_configuration(cmd_data);
-
-	if (!cmd_data->switch_conf) {
-		cmd_data->switch_conf = gf_cfg_force_new(NULL, "switch.conf");
-	}
-	dc_read_switch_config(cmd_data);
-
-	return 0;
-}

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/dashcast/cmd_data.h Deleted

@@ -1,138 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Arash Shafiei
- *			Copyright (c) Telecom ParisTech 2000-2013
- *					All rights reserved
- *
- *  This file is part of GPAC / dashcast
- *
- *  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.
- *
- */
-
-#ifndef CMD_DATA_H_
-#define CMD_DATA_H_
-
-#define MAX_SOURCE_NUMBER 20
-
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/stat.h>
-#include <time.h>
-#include <gpac/config_file.h>
-#include <gpac/list.h>
-#include "audio_data.h"
-#include "video_data.h"
-#include "task.h"
-
-
-/*
- * This structure corresponds to
- * the data in command line
- */
-typedef struct {
-	/* input video */
-	VideoDataConf video_data_conf;
-	/* audio input data */
-	AudioDataConf audio_data_conf;
-	/* Configuration file */
-	GF_Config *conf;
-	/* Switch source configuration file */
-	GF_Config *switch_conf;
-	/* MPD file */
-	char mpd_filenameGF_MAX_PATH;
-	/* segment duration */
-	int seg_dur;
-	/* fragment duration */
-	int frag_dur;
-	/* Exit signal emitting from user to end the program */
-	volatile int exit_signal;
-	/* List of entries for video in configuration file */
-	GF_List *video_lst;
-	/* List of entries for audio in configuration file */
-	GF_List *audio_lst;
-	/* Indicates that the system is live */
-	/* List of video input sources */
-	GF_List *vsrc;
-	/* List of audio input sources */
-	GF_List *asrc;
-	//int live;
-	/* Indicates that the system is live from a media input */
-	//int live_media;
-	/* The mode of the system: ON_DEMAND, LIVE_CAMERA, LIVE_MEDIA */
-	int mode;
-	/* Does not loop on input */
-	int no_loop;
-	/* MPD AvailabilityStartTime offset in milliseconds. Default is 1000 milliseconds delay */
-	int ast_offset;
-	/* MPD time shift buffer depth in seconds */
-	int time_shift;
-	/* MPD minimumUpdatePeriod in seconds */
-	int minimum_update_period;
-	/* Send message on port 1234 once fragment is ready */
-	int send_message;
-	/* End of Segment Box name */
-	u32 seg_marker;
-	/* GDR */
-	int gdr;
-	/* GOP size in frames - 0 means framerate (1 sec)*/
-	int gop_size;
-	/* MPD min buffer time */
-	float min_buffer_time;
-	/* MPD BaseURL*/
-	char base_urlGF_MAX_PATH;
-	/* output directory name */
-	char out_dirGF_MAX_PATH;
-	/* switch source configuration file */
-	//char switch_cfg_filenameGF_MAX_PATH;
-	FILE *logfile;
-	TaskList task_list;
-	/*dynamic ast*/
-	int use_dynamic_ast;
-	/*insert UTC */
-	int insert_utc;
-
-	Bool use_source_timing;
-    GF_MemTrackerType mem_track;
-	Bool no_mpd_rewrite;
-} CmdData;
-
-/*
- * Initilize the command data structure
- *
- * @param cmd_data out structure to be initialize
- */
-void dc_cmd_data_init(CmdData *cmd_data);
-
-/*
- * Destroy the command data structure
- *
- * @param cmd_data out structure to be destroyed
- */
-void dc_cmd_data_destroy(CmdData *cmd_data);
-
-/*
- * Parse command line
- *
- * @param argc in number of arguments
- * @param argv in a list of strings each containing one argument
- * @param cmd_data out the data structure to fill
- */
-int dc_parse_command(int argc, char **argv, CmdData *cmd_data);
-
-#endif /* CMD_DATA_H_ */

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/dashcast/controler.c Deleted

@@ -1,1454 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Arash Shafiei
- *			Copyright (c) Telecom ParisTech 2000-2013
- *					All rights reserved
- *
- *  This file is part of GPAC / dashcast
- *
- *  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 "controler.h"
-
-
-#if (!defined(__DARWIN__) && !defined(__APPLE__))
-# include <malloc.h>
-#endif
-
-#include <time.h>
-
-#if defined(__GNUC__)
-# include <unistd.h>
-# include <sys/time.h>
-#elif defined(WIN32)
-# include <Winsock.h>
-# include <sys/timeb.h>
-# define suseconds_t long
-#else
-# error
-#endif
-
-#include <gpac/network.h>
-
-typedef struct {
-	int segnum;
-	u64 utc_time, ntpts;
-} segtime;
-
-
-//#define MAX_SOURCE_NUMBER 20
-#define FRAGMENTER 0
-//#define DEBUG 1
-
-//#define VIDEO_MUXER FFMPEG_VIDEO_MUXER
-//#define VIDEO_MUXER RAW_VIDEO_H264
-//#define VIDEO_MUXER GPAC_VIDEO_MUXER
-#define VIDEO_MUXER GPAC_INIT_VIDEO_MUXER_AVC1
-//#define VIDEO_MUXER GPAC_INIT_VIDEO_MUXER_AVC3
-
-//#define AUDIO_MUXER FFMPEG_AUDIO_MUXER
-//#define AUDIO_MUXER GPAC_AUDIO_MUXER
-#define AUDIO_MUXER GPAC_INIT_AUDIO_MUXER
-
-#define AUDIO_FRAME_SIZE 1024
-
-
-void optimize_seg_frag_dur(int *seg, int *frag)
-{
-	int min_rem;
-	int seg_nb = *seg;
-	int frag_nb = *frag;
-	if (!frag_nb) frag_nb = 1;
-
-	min_rem = seg_nb % frag_nb;
-
-	if (seg_nb % (frag_nb + 1) < min_rem) {
-		min_rem = seg_nb % (frag_nb + 1);
-		*seg = seg_nb;
-		*frag = frag_nb + 1;
-	}
-
-	if ((seg_nb + 1) % frag_nb < min_rem) {
-		min_rem = (seg_nb + 1) % frag_nb;
-		*seg = seg_nb + 1;
-		*frag = frag_nb;
-	}
-
-	if ((seg_nb + 1) % (frag_nb + 1) < min_rem) {
-		min_rem = (seg_nb + 1) % (frag_nb + 1);
-		*seg = seg_nb + 1;
-		*frag = frag_nb + 1;
-	}
-
-	*seg -= min_rem;
-}
-
-Bool change_source_thread(void *params)
-{
-	Bool ret = GF_FALSE;
-	return ret;
-}
-
-u32 send_frag_event(void *params)
-{
-	int ret;
-	//int status;
-	char buffGF_MAX_PATH;
-	ThreadParam *th_param = (ThreadParam*)params;
-	CmdData *cmd_data = th_param->in_data;
-	MessageQueue *mq = th_param->mq;
-
-	while (1) {
-		if (cmd_data->exit_signal) {
-			break;
-		}
-
-		ret = dc_message_queue_get(mq, (void*) buff);
-		if (ret > 0) {
-			fprintf(stdout, "Message received: %s\n", buff);
-		}
-	}
-
-	return 0;
-}
-
-static void dc_write_mpd(CmdData *cmddata, const AudioDataConf *audio_data_conf, const VideoDataConf *video_data_conf, const char *presentation_duration, const char *availability_start_time, const char *time_shift, const int segnum, const int ast_offset)
-{
-	u32 i = 0, sec;
-	int audio_seg_dur = 0, video_seg_dur = 0, audio_frag_dur = 0,	video_frag_dur = 0;
-	int audio_frame_size = AUDIO_FRAME_SIZE;
-	time_t gtime;
-	struct tm *t;
-	FILE *f;
-
-	char nameGF_MAX_PATH;
-
-	snprintf(name, sizeof(name), "%s/%s", cmddata->out_dir, cmddata->mpd_filename);
-
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("DashCast Write MPD at UTC "LLU" ms - %s : %s\n", gf_net_get_utc(), (cmddata->mode == ON_DEMAND) ? "mediaPresentationDuration" : "availabilityStartTime", (cmddata->mode == ON_DEMAND) ? presentation_duration : availability_start_time));
-
-	if (strcmp(cmddata->audio_data_conf.filename, "") != 0) {
-		audio_data_conf = (const AudioDataConf*)gf_list_get(cmddata->audio_lst, 0);
-		if (audio_data_conf) {
-			audio_seg_dur = (int)((audio_data_conf->samplerate / (double) audio_frame_size) * (cmddata->seg_dur / 1000.0));
-			audio_frag_dur = (int)((audio_data_conf->samplerate / (double) audio_frame_size) * (cmddata->frag_dur / 1000.0));
-			optimize_seg_frag_dur(&audio_seg_dur, &audio_frag_dur);
-		}
-	}
-
-	if (strcmp(cmddata->video_data_conf.filename, "") != 0) {
-		video_data_conf = (VideoDataConf*)gf_list_get(cmddata->video_lst, 0);
-		if (video_data_conf) {
-			video_seg_dur = (int)(video_data_conf->framerate * (cmddata->seg_dur / 1000.0));
-			video_frag_dur = (int)(video_data_conf->framerate * (cmddata->frag_dur / 1000.0));
-			optimize_seg_frag_dur(&video_seg_dur, &video_frag_dur);
-		}
-	}
-
-	f = gf_fopen(name, "w");
-	//TODO: if (!f) ...
-
-	//	time_t t = time(NULL);
-	//	time_t t2 = t + 2;
-	//	t += (2 * (cmddata->seg_dur / 1000.0));
-	//	tm = *gmtime(&t2);
-	//	snprintf(availability_start_time, "%d-%d-%dT%d:%d:%dZ", tm.tm_year + 1900,
-	//			tm.tm_mon + 1, tm.tm_mday, tm.tm_hour, tm.tm_min, tm.tm_sec);
-	//	fprintf(stdout, "%s \n", availability_start_time);
-
-	fprintf(f, "<?xml version=\"1.0\"?>\n");
-	fprintf(f, "<MPD xmlns=\"urn:mpeg:dash:schema:mpd:2011\" profiles=\"urn:mpeg:dash:profile:full:2011\" minBufferTime=\"PT%fS\"", cmddata->min_buffer_time);
-	
-	if (cmddata->mode == ON_DEMAND) {
-		fprintf(f, " type=\"static\" mediaPresentationDuration=\"%s\"", presentation_duration);
-	} else {
-		fprintf(f, " type=\"dynamic\" availabilityStartTime=\"%s\"", availability_start_time);
-		if (time_shift) fprintf(f, " timeShiftBufferDepth=\"%s\"", time_shift);
-
-		if (cmddata->minimum_update_period > 0)
-			fprintf(f, " minimumUpdatePeriod=\"PT%dS\"", cmddata->minimum_update_period);
-
-		gf_net_get_ntp(&sec, NULL);
-		gtime = sec - GF_NTP_SEC_1900_TO_1970;
-		t = gmtime(&gtime);
-		fprintf(f, " publishTime=\"%d-%02d-%02dT%02d:%02d:%02dZ\"", 1900+t->tm_year, t->tm_mon+1, t->tm_mday, t->tm_hour, t->tm_min, t->tm_sec);
-
-	}
-
-	fprintf(f, ">\n");
-
-	fprintf(f,
-	        " <ProgramInformation moreInformationURL=\"http://gpac.io\">\n"
-	        "  <Title>%s</Title>\n"
-	        " </ProgramInformation>\n", cmddata->mpd_filename);
-
-	if (strcmp(cmddata->base_url, "") != 0) {
-		fprintf(f, " <BaseURL>%s</BaseURL>\n", cmddata->base_url);
-	}
-
-	fprintf(f, " <Period start=\"PT0H0M0.000S\" id=\"P1\">\n");
-
-	if (strcmp(cmddata->audio_data_conf.filename, "") != 0) {
-		fprintf(f, "  <AdaptationSet segmentAlignment=\"true\" bitstreamSwitching=\"false\">\n");
-
-		fprintf(f,
-		        "   <AudioChannelConfiguration schemeIdUri=\"urn:mpeg:dash:23003:3:audio_channel_configuration:2011\" "
-		        "value=\"2\"/>\n");
-
-		fprintf(f,
-		        "   <SegmentTemplate timescale=\"%d\" duration=\"%d\" media=\"$RepresentationID$_$Number$_gpac.m4s\""
-		        " startNumber=\"%d\" initialization=\"$RepresentationID$_init_gpac.mp4\"",
-		        audio_data_conf->samplerate, audio_seg_dur * audio_frame_size, segnum);
-
-		if (ast_offset<0) {
-			fprintf(f, " availabilityTimeOffset=\"%g\"", -ast_offset/1000.0);
-		}
-		fprintf(f, "/>\n");
-
-
-
-		for (i = 0; i < gf_list_count(cmddata->audio_lst); i++) {
-			audio_data_conf = (const AudioDataConf*)gf_list_get(cmddata->audio_lst, i);
-			fprintf(f,
-			        "   <Representation id=\"%s\" mimeType=\"audio/mp4\" codecs=\"%s\" "
-			        "audioSamplingRate=\"%d\" startWithSAP=\"1\" bandwidth=\"%d\">\n"
-			        "   </Representation>\n", audio_data_conf->filename, audio_data_conf->codec6381, audio_data_conf->samplerate, audio_data_conf->bitrate);
-		}
-
-		fprintf(f, "  </AdaptationSet>\n");
-	}
-
-	if (strcmp(cmddata->video_data_conf.filename, "") != 0) {
-		fprintf(f, "  <AdaptationSet segmentAlignment=\"true\" bitstreamSwitching=\"false\">\n");
-
-		fprintf(f,
-		        "   <SegmentTemplate timescale=\"%d\" duration=\"%d\" media=\"$RepresentationID$_$Number$_gpac.m4s\""
-		        " startNumber=\"%d\" initialization=\"$RepresentationID$_init_gpac.mp4\"",
-		        video_data_conf->framerate, video_seg_dur, segnum);
-
-
-		if (ast_offset<0) {
-			fprintf(f, " availabilityTimeOffset=\"%g\"", -ast_offset/1000.0);
-		}
-		fprintf(f, "/>\n");
-
-		for (i = 0; i < gf_list_count(cmddata->video_lst); i++) {
-			video_data_conf = (VideoDataConf*)gf_list_get(cmddata->video_lst, i);
-			fprintf(f, "   <Representation id=\"%s\" mimeType=\"video/mp4\" codecs=\"%s\" "
-			        "width=\"%d\" height=\"%d\" frameRate=\"%d\" sar=\"1:1\" startWithSAP=\"1\" bandwidth=\"%d\">\n"
-			        "   </Representation>\n", video_data_conf->filename,
-			        VIDEO_MUXER == GPAC_INIT_VIDEO_MUXER_AVC1 ? video_data_conf->codec6381 : "avc3",
-			        video_data_conf->width, video_data_conf->height, video_data_conf->framerate,
-			        video_data_conf->bitrate);
-		}
-
-		fprintf(f, "  </AdaptationSet>\n");
-	}
-
-	fprintf(f, " </Period>\n");
-
-	fprintf(f, "</MPD>\n");
-
-	gf_fclose(f);
-}
-
-static u32 mpd_thread(void *params)
-{
-	ThreadParam *th_param = (ThreadParam*)params;
-	CmdData *cmddata = th_param->in_data;
-	MessageQueue *mq = th_param->mq;
-	char availability_start_timeGF_MAX_PATH;
-	char presentation_durationGF_MAX_PATH;
-	char time_shiftGF_MAX_PATH = "";
-	AudioDataConf *audio_data_conf = NULL;
-	VideoDataConf *video_data_conf = NULL;
-	struct tm ast_time;
-	int dur = 0;
-	int h, m, s, ms;
-	segtime last_seg_time;
-	segtime main_seg_time;
-	Bool first = GF_TRUE;
-	main_seg_time.segnum = 0;
-	main_seg_time.utc_time = 0;
-	main_seg_time.ntpts = 0;
-	last_seg_time = main_seg_time;
-
-	if (cmddata->mode == LIVE_CAMERA || cmddata->mode == LIVE_MEDIA) {
-		while (1) {
-			u32 msecs;
-			time_t t;
-			segtime seg_time;
-			seg_time.segnum = 0;
-			seg_time.utc_time = 0;
-			seg_time.ntpts = 0;
-
-			if (cmddata->exit_signal) {
-				break;
-			}
-			
-			if (strcmp(cmddata->video_data_conf.filename, "") != 0) {
-				if (dc_message_queue_get(mq, &seg_time) < 0) {
-					continue;
-				}
-			}
-			
-			if (strcmp(cmddata->audio_data_conf.filename, "") != 0) {
-				if (dc_message_queue_get(mq, &seg_time) < 0) {
-					continue;
-				}
-			}
-			assert(seg_time.ntpts);
-
-			if (cmddata->use_dynamic_ast) {
-				main_seg_time = seg_time;
-			} else {
-				//get the last notification of AST
-				if (first) {
-					main_seg_time = seg_time;
-					first = GF_FALSE;
-				}
-				assert(main_seg_time.ntpts);
-			}
-
-			last_seg_time = seg_time;
-			assert(main_seg_time.ntpts <= seg_time.ntpts);
-			
-			t = (seg_time.ntpts >> 32)  - GF_NTP_SEC_1900_TO_1970;
-			msecs = (u32) ( (seg_time.ntpts & 0xFFFFFFFF) * (1000.0/0xFFFFFFFF) );
-			ast_time = *gmtime(&t);
-			fprintf(stdout, "Generating MPD at %d-%02d-%02dT%02d:%02d:%02d.%03dZ\n", 1900 + ast_time.tm_year, ast_time.tm_mon+1, ast_time.tm_mday, ast_time.tm_hour, ast_time.tm_min, ast_time.tm_sec, msecs);
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("DashCast Generating MPD at %d-%02d-%02dT%02d:%02d:%02d.%03dZ - UTC "LLU" ms - AST UTC "LLU" ms\n", 1900 + ast_time.tm_year, ast_time.tm_mon+1, ast_time.tm_mday, ast_time.tm_hour, ast_time.tm_min, ast_time.tm_sec, msecs, seg_time.utc_time, main_seg_time.utc_time));
-
-			t = (main_seg_time.ntpts >> 32)  - GF_NTP_SEC_1900_TO_1970;
-			if (cmddata->ast_offset>0) {
-				t += cmddata->ast_offset/1000;
-			}
-			msecs = (u32) ( (main_seg_time.ntpts & 0xFFFFFFFF) * (1000.0/0xFFFFFFFF) );
-			ast_time = *gmtime(&t);
-			assert(ast_time.tm_year);
-			
-			sprintf(availability_start_time, "%d-%02d-%02dT%02d:%02d:%02d.%03dZ", 1900 + ast_time.tm_year, ast_time.tm_mon+1, ast_time.tm_mday, ast_time.tm_hour, ast_time.tm_min, ast_time.tm_sec, msecs);
-			fprintf(stdout, "StartTime: %s - startNumber %d - last number %d\n", availability_start_time, main_seg_time.segnum+1, seg_time.segnum+1);
-
-			if (cmddata->time_shift != -1) {
-				int ts, h, m, s;
-				ts = cmddata->time_shift;
-				h = ts / 3600;
-				ts = ts % 3600;
-				m = ts / 60;
-				s = ts % 60;
-				snprintf(time_shift, sizeof(time_shift), "PT%02dH%02dM%02dS", h, m, s);
-			}
-
-			dc_write_mpd(cmddata, audio_data_conf, video_data_conf, presentation_duration, availability_start_time, time_shift, main_seg_time.segnum+1, cmddata->ast_offset);
-		}
-		
-		if (cmddata->no_mpd_rewrite) return 0;
-
-		//finally rewrite the MPD to static
-		dur = cmddata->seg_dur * (last_seg_time.segnum - main_seg_time.segnum);
-		if (cmddata->time_shift) {
-			if (dur > cmddata->time_shift * 1000) {
-				u32 nb_seg = cmddata->time_shift*1000 / cmddata->seg_dur;
-				main_seg_time.segnum = last_seg_time.segnum - nb_seg;
-				//dur = cmddata->time_shift;
-			}
-			dur = cmddata->seg_dur * (last_seg_time.segnum - main_seg_time.segnum);
-		}
-		cmddata->mode = ON_DEMAND;
-		
-	} else {
-		int a_dur = 0;
-		int v_dur = 0;
-
-		if (strcmp(cmddata->audio_data_conf.filename, "") != 0) {
-			dc_message_queue_get(mq, &a_dur);
-		}
-
-		if (strcmp(cmddata->video_data_conf.filename, "") != 0) {
-			dc_message_queue_get(mq, &v_dur);
-		}
-		
-		dur =  v_dur > a_dur ? v_dur : a_dur;
-	}
-	
-	
-	h = dur / 3600000;
-	dur = dur % 3600000;
-	m = dur / 60000;
-	dur = dur % 60000;
-	s = dur / 1000;
-	ms = dur % 1000;
-	snprintf(presentation_duration, sizeof(presentation_duration), "PT%02dH%02dM%02d.%03dS", h, m, s, ms);
-	fprintf(stdout, "Duration: %s\n", presentation_duration);
-		
-
-	dc_write_mpd(cmddata, audio_data_conf, video_data_conf, presentation_duration, availability_start_time, 0, main_seg_time.segnum+1, 0);
-
-	return 0;
-}
-
-u32 delete_seg_thread(void *params)
-{
-	int ret;
-	ThreadParam *th_param = (ThreadParam*)params;
-	CmdData *cmd_data = th_param->in_data;
-	MessageQueue *mq = th_param->mq;
-
-	char buffGF_MAX_PATH;
-
-	while (1) {
-		ret = dc_message_queue_get(mq, (void*) buff);
-		if (ret > 0) {
-			int status;
-			status = unlink(buff);
-			if (status != 0) {
-				GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("Unable to delete the file %s\n", buff));
-			}
-		}
-
-		if (cmd_data->exit_signal) {
-			break;
-		}
-	}
-
-	return 0;
-}
-
-Bool fragmenter_thread(void *params)
-{
-//	int ret;
-	ThreadParam *th_param = (ThreadParam*)params;
-	CmdData *cmd_data = th_param->in_data;
-	MessageQueue *mq = th_param->mq;
-
-	char buffGF_MAX_PATH;
-
-	while (1) {
-		/*ret = */dc_message_queue_get(mq, (void*) buff);
-		if (cmd_data->exit_signal) {
-			break;
-		}
-	}
-
-	return GF_FALSE;
-}
-
-static u32 keyboard_thread(void *params)
-{
-
-	ThreadParam *th_param = (ThreadParam*)params;
-	CmdData *in_data = th_param->in_data;
-	char c;
-
-	while (1) {
-		if (gf_prompt_has_input()) {
-			c = gf_prompt_get_char();
-			if (c == 'q' || c == 'Q') {
-				in_data->exit_signal = 1;
-				break;
-			}
-		}
-
-		if (in_data->exit_signal) {
-			break;
-		}
-
-		gf_sleep(100);
-	}
-	GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Keyboard thread exit\n"));
-	return 0;
-}
-
-u32 video_decoder_thread(void *params)
-{
-#ifdef DASHCAST_PRINT
-	int i = 0;
-#endif
-	int ret;
-	int source_number = 0;
-
-	//int first_time = 1;
-	struct timeval time_start, time_end, time_wait;
-	VideoThreadParam *thread_params = (VideoThreadParam *) params;
-
-	CmdData *in_data = thread_params->in_data;
-	VideoInputData *video_input_data = thread_params->video_input_data;
-	VideoInputFile **video_input_file = thread_params->video_input_file;
-
-	suseconds_t total_wait_time = (int) (1000000.0 / (double) in_data->video_data_conf.framerate);
-	suseconds_t pick_packet_delay, select_delay = 0, real_wait, other_delays = 2;
-
-	Task t;
-	//fprintf(stdout, "wait time : %f\n", total_wait_time);
-
-	if (!gf_list_count(in_data->video_lst))
-		return 0;
-
-	while (1) {
-		dc_task_get_current(&in_data->task_list, &t);
-		source_number = t.source_number;
-
-		//fprintf(stdout, "sourcenumber: %d\n", source_number);
-
-//		if (video_input_filesource_number->mode == LIVE_MEDIA) {
-			gf_gettimeofday(&time_start, NULL);
-//		}
-
-		ret = dc_video_decoder_read(video_input_filesource_number, video_input_data, source_number, in_data->use_source_timing, (in_data->mode == LIVE_CAMERA) ? 1 : 0, (const int *) &in_data->exit_signal);
-#ifdef DASHCAST_PRINT
-		fprintf(stdout, "Read video frame %d\r", i++);
-		fflush(stdout);
-#endif
-		if (ret == -2) {
-			GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("Video reader has no more frame to read.\n"));
-			break;
-		}
-		if (ret == -1) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("An error occurred while reading video frame.\n"));
-			break;
-		}
-
-		if (in_data->exit_signal) {
-			dc_video_input_data_end_signal(video_input_data);
-			break;
-		}
-
-		if (video_input_filesource_number->mode == LIVE_MEDIA) {
-			gf_gettimeofday(&time_end, NULL);
-			pick_packet_delay = ((time_end.tv_sec - time_start.tv_sec) * 1000000) + time_end.tv_usec - time_start.tv_usec;
-			time_wait.tv_sec = 0;
-			real_wait = total_wait_time - pick_packet_delay - select_delay - other_delays;
-			time_wait.tv_usec = real_wait;
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("delay: %ld = %ld - %ld\n", time_wait.tv_usec, total_wait_time, pick_packet_delay));
-
-			gf_gettimeofday(&time_start, NULL);
-			select(0, NULL, NULL, NULL, &time_wait);
-			gf_gettimeofday(&time_end, NULL);
-
-			select_delay = (((time_end.tv_sec - time_start.tv_sec) * 1000000) + time_end.tv_usec - time_start.tv_usec) - real_wait;
-		}
-	}
-
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("Video decoder is exiting...\n"));
-	GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("video decoder thread exit\n"));
-	return 0;
-}
-
-u32 audio_decoder_thread(void *params)
-{
-	int ret;
-	struct timeval time_start, time_end, time_wait;
-	AudioThreadParam *thread_params = (AudioThreadParam*)params;
-
-	CmdData *in_data = thread_params->in_data;
-	AudioInputData *audio_input_data = thread_params->audio_input_data;
-	AudioInputFile *audio_input_file = thread_params->audio_input_file;
-
-	suseconds_t pick_packet_delay, select_delay = 0, real_wait, other_delays = 1;
-	suseconds_t total_wait_time;
-	if (in_data->audio_data_conf.samplerate < 1024) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Error: invalid audio sample rate: %d\n", in_data->audio_data_conf.samplerate));
-		dc_audio_inout_data_end_signal(audio_input_data);
-		//FIXME: deadlock on the mpd thread. Reproduce with big_buck_bunny.mp4.
-		return 1;
-	}
-	total_wait_time = (int) (1000000.0 / (in_data->audio_data_conf.samplerate / (double) AUDIO_FRAME_SIZE));
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("wait time : %ld\n", total_wait_time));
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("sample-rate : %ld\n", in_data->audio_data_conf.samplerate));
-
-	if (!gf_list_count(in_data->audio_lst))
-		return 0;
-
-	while (1) {
-//		if (audio_input_file->mode == LIVE_MEDIA) {
-			gf_gettimeofday(&time_start, NULL);
-//		}
-
-		ret = dc_audio_decoder_read(audio_input_file, audio_input_data);
-		if (ret == -2) {
-			GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("Audio decoder has no more frame to read.\n"));
-			break;
-		}
-		if (ret == -1) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("An error occurred while reading audio frame.\n"));
-			break;
-		}
-
-		if (in_data->exit_signal) {
-			dc_audio_inout_data_end_signal(audio_input_data);
-			break;
-		}
-
-		if (audio_input_file->mode == LIVE_MEDIA) {
-			gf_gettimeofday(&time_end, NULL);
-			pick_packet_delay = ((time_end.tv_sec - time_start.tv_sec) * 1000000) + time_end.tv_usec - time_start.tv_usec;
-			time_wait.tv_sec = 0;
-			real_wait = total_wait_time - pick_packet_delay - select_delay - other_delays;
-			time_wait.tv_usec = real_wait;
-
-			gf_gettimeofday(&time_start, NULL);
-			select(0, NULL, NULL, NULL, &time_wait);
-			gf_gettimeofday(&time_end, NULL);
-
-			select_delay = (((time_end.tv_sec - time_start.tv_sec) * 1000000) + time_end.tv_usec - time_start.tv_usec) - real_wait;
-		}
-	}
-
-	GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("Audio decoder is exiting...\n"));
-	return 0;
-}
-
-u32 video_scaler_thread(void *params)
-{
-	int ret;
-	VideoThreadParam *thread_params = (VideoThreadParam *) params;
-	CmdData *in_data = thread_params->in_data;
-	VideoInputData *video_input_data = thread_params->video_input_data;
-	VideoScaledData *video_scaled_data = thread_params->video_scaled_data;
-
-	if (!gf_list_count(in_data->video_lst))
-		return 0;
-
-	while (1) {
-		ret = dc_video_scaler_scale(video_input_data, video_scaled_data);
-		if (ret == -2) {
-			GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("Video scaler has no more frame to read.\n"));
-			break;
-		}
-	}
-
-	dc_video_scaler_end_signal(video_scaled_data);
-
-	GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("video scaler thread exit\n"));
-	return 0;
-}
-
-u32 video_encoder_thread(void *params)
-{
-	int ret, shift, frame_nb, seg_frame_max, frag_frame_max, seg_nb = 0, loss_state = 0, quit = 0, real_video_seg_dur;
-	char name_to_deleteGF_MAX_PATH, name_to_sendGF_MAX_PATH;
-	u64 start_utc, seg_utc;
-	segtime time_at_segment_start;
-	VideoMuxerType muxer_type = VIDEO_MUXER;
-	VideoThreadParam *thread_params = (VideoThreadParam*)params;
-	u32 sec, frac;
-	Bool init_mpd = GF_FALSE;
-	CmdData *in_data = thread_params->in_data;
-	int video_conf_idx = thread_params->video_conf_idx;
-	VideoDataConf *video_data_conf = (VideoDataConf*)gf_list_get(in_data->video_lst, video_conf_idx);
-
-	VideoScaledData *video_scaled_data = thread_params->video_scaled_data;
-	int video_cb_size = (in_data->mode == LIVE_MEDIA || in_data->mode == LIVE_CAMERA) ? 1 : VIDEO_CB_DEFAULT_SIZE;
-	VideoOutputFile out_file;
-
-	MessageQueue *mq = thread_params->mq;
-	MessageQueue *delete_seg_mq = thread_params->delete_seg_mq;
-	MessageQueue *send_seg_mq = thread_params->send_seg_mq;
-
-	if (!gf_list_count(in_data->video_lst))
-		return 0;
-
-	seg_frame_max = (int)(video_data_conf->framerate * (float) (in_data->seg_dur / 1000.0));
-	frag_frame_max = (int)(video_data_conf->framerate * (float) (in_data->frag_dur / 1000.0));
-	optimize_seg_frag_dur(&seg_frame_max, &frag_frame_max);
-
-	real_video_seg_dur = (int) (seg_frame_max * 1000.0 / (float) video_data_conf->framerate);
-	GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("video_encoder seg_frame_max=%d, frag_frame_max=%d, real_video_seg_dur=%d ms\n", seg_frame_max, frag_frame_max, real_video_seg_dur));
-
-
-	if (seg_frame_max <= 0)
-		seg_frame_max = -1;
-
-	if (dc_video_muxer_init(&out_file, video_data_conf, muxer_type, seg_frame_max, frag_frame_max, in_data->seg_marker, in_data->gdr, in_data->seg_dur, in_data->frag_dur, (u32) video_scaled_data->vsprop->video_input_data->frame_duration, in_data->gop_size, video_cb_size) < 0) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Cannot init output video file.\n"));
-		in_data->exit_signal = 1;
-		return -1;
-	}
-
-	if (dc_video_encoder_open(&out_file, video_data_conf, in_data->use_source_timing, video_scaled_data->sar) < 0) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Cannot open output video stream.\n"));
-		in_data->exit_signal = 1;
-		return -1;
-	}
-
-	if (in_data->mode == LIVE_MEDIA || in_data->mode == LIVE_CAMERA) {
-		init_mpd = GF_TRUE;
-	}
-
-
-	time_at_segment_start.ntpts = 0;
-	start_utc = gf_net_get_utc();
-
-	while (1) {
-		frame_nb = 0;
-		//log time at segment start, because segment availabilityStartTime is computed from AST anchor + segment duration
-		//logging at the end of the segment production will induce one segment delay
-		time_at_segment_start.segnum = seg_nb;
-		time_at_segment_start.utc_time = gf_net_get_utc();
-		gf_net_get_ntp(&sec, &frac);
-
-#ifndef GPAC_DISABLE_LOG
-		if (gf_log_tool_level_on(GF_LOG_DASH, GF_LOG_INFO)) {
-			if (time_at_segment_start.ntpts) {
-				u32 ref_sec, ref_frac;
-				Double tr, t;
-				ref_sec = (time_at_segment_start.ntpts>>32) & 0xFFFFFFFFULL;
-				ref_frac = (u32) (time_at_segment_start.ntpts & 0xFFFFFFFFULL);
-				tr = ref_sec * 1000.0;
-				tr += ref_frac*1000.0 /0xFFFFFFFF;
-				t = sec * 1000.0;
-				t += frac*1000.0 /0xFFFFFFFF;
-				GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("DashCast NTP diff since last segment start in msec is %f\n", t - tr));
-
-			}
-		}
-#endif
-
-		time_at_segment_start.ntpts = sec;
-		time_at_segment_start.ntpts <<= 32;
-		time_at_segment_start.ntpts |= frac;
-
-		//force writing MPD before any encoding happens (eg don't wait for the end of the first segment)
-		if (init_mpd) {
-			init_mpd = GF_FALSE;
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("DashCast Initial MPD publish at UTC "LLU" ms\n", time_at_segment_start.utc_time));
-			dc_message_queue_put(mq, &time_at_segment_start, sizeof(time_at_segment_start));
-		}
-
-		assert(! out_file.segment_started);
-
-		if (dc_video_muxer_open(&out_file, in_data->out_dir, video_data_conf->filename, seg_nb+1) < 0) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Cannot open output video file.\n"));
-			in_data->exit_signal = 1;
-			return -1;
-		}
-//		fprintf(stdout, "Header size: %d\n", ret);
-		while (1) {
-			//we have the RAP already encoded, skip coder
-			if (loss_state == 2) {
-				ret = 1;
-				loss_state = 0;
-			} else {
-				ret = dc_video_encoder_encode(&out_file, video_scaled_data);
-			}
-
-			if (ret == -2) {
-				GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("Video encoder has no more data to encode.\n"));
-				quit = 1;
-				break;
-			}
-			if (ret == -1) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("An error occured while writing video frame.\n"));
-				quit = 1;
-				break;
-			}
-
-			if (ret > 0) {
-				int r;
-
-				/*resync at first RAP: flush current broken segment and restart next one on rap*/
-				if ((loss_state==1) && out_file.codec_ctx->coded_frame->key_frame) {
-					loss_state = 2;
-					break;
-				}
-
-				r = dc_video_muxer_write(&out_file, frame_nb, in_data->insert_utc ? GF_TRUE : GF_FALSE);
-				if (r < 0) {
-					quit = 1;
-					in_data->exit_signal = 1;
-					break;
-				} else if (r == 1) {
-					GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("fragment is written!\n"));
-					if (in_data->send_message == 1) {
-						snprintf(name_to_send, sizeof(name_to_send), "%s/%s_%d_gpac.m4s", in_data->out_dir, video_data_conf->filename, seg_nb);
-						dc_message_queue_put(send_seg_mq, name_to_send, sizeof(name_to_send));
-					}
-
-					break;
-				}
-
-				frame_nb++;
-			}
-		}
-
-		dc_video_muxer_close(&out_file);
-
-		// If system is live,
-		// Send the time that a segment is available to MPD generator thread.
-		if (in_data->mode == LIVE_MEDIA || in_data->mode == LIVE_CAMERA) {
-			//check we don't loose sync
-			int diff;
-			int seg_diff;
-			seg_utc = gf_net_get_utc();
-			diff = (int) (seg_utc - start_utc);
-
-			//if seg UTC is after next segment UTC (current ends at seg_nb+1, next at seg_nb+2), adjust numbers
-			if (diff > (seg_nb+2) * real_video_seg_dur) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("video_encoder Rep %s UTC diff %d bigger than segment duration %d - some frame where probably lost. Adjusting\n", out_file.rep_id, diff, seg_nb));
-
-				while (diff > (seg_nb+2) * real_video_seg_dur) {
-					seg_nb++;
-
-					//do a rough estimate of losses to adjust timing...
-					if (! in_data->use_source_timing) {
-						out_file.first_dts_in_fragment += out_file.codec_ctx->time_base.den;
-					}
-				}
-				//wait for RAP to cut next segment
-				loss_state = 1;
-			} else {
-#define SYNC_SAFE	800
-
-				seg_diff = diff;
-				seg_diff -= (seg_nb+1) * real_video_seg_dur;
-				if (seg_diff > SYNC_SAFE) {
-					GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("video_encoder Rep %s UTC diff at segment close: %d is higher than cumulated segment duration %d (diff %d) - frame rate is probably not correct!\n", out_file.rep_id, diff, (seg_nb+1) * in_data->seg_dur, seg_diff));
-				}
-				else if (seg_diff < -SYNC_SAFE) {
-					GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("video_encoder Rep %s UTC diff at segment close: %d is lower than cumulated segment duration %d (diff %d) - frame rate is probably not correct or frames were lost!\n", out_file.rep_id, diff, (seg_nb+1) * in_data->seg_dur, seg_diff));
-				} else {
-					GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("video_encoder Rep %s UTC diff at segment close: %d - cumulated segment duration %d (diff %d)\n", out_file.rep_id, diff, (seg_nb+1) * in_data->seg_dur, seg_diff));
-				}
-			}
-
-			//time_t t = time(NULL);
-			dc_message_queue_put(mq, &time_at_segment_start, sizeof(time_at_segment_start));
-		}
-
-		if ((in_data->time_shift != -1)) {
-			shift = 1000 * in_data->time_shift / in_data->seg_dur;
-			if (seg_nb > shift) {
-				snprintf(name_to_delete, sizeof(name_to_delete), "%s/%s_%d_gpac.m4s", in_data->out_dir, video_data_conf->filename, (seg_nb - shift));
-				dc_message_queue_put(delete_seg_mq, name_to_delete, sizeof(name_to_delete));
-			}
-		}
-
-		seg_nb++;
-
-		if (quit)
-			break;
-	}
-
-	// If system is not live,
-	// Send the duration of the video
-	if (in_data->mode == ON_DEMAND) {
-		if (thread_params->video_conf_idx == 0) {
-			int dur = (seg_nb * seg_frame_max * 1000) / video_data_conf->framerate;
-			int dur_tot = (out_file.codec_ctx->frame_number * 1000)
-			              / video_data_conf->framerate;
-			if (dur > dur_tot)
-				dur = dur_tot;
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("Duration: %d \n", dur));
-			dc_message_queue_put(mq, &dur, sizeof(dur));
-		}
-	}
-
-	/* Close output video file */
-	dc_video_encoder_close(&out_file);
-
-	dc_video_muxer_free(&out_file);
-
-	GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("video encoder thread exit\n"));
-	return 0;
-}
-
-u32 audio_encoder_thread(void *params)
-{
-	int ret, exit_loop = 0, quit = 0, seg_nb = 0, frame_per_seg, frame_per_frag, frame_nb, shift, real_audio_seg_dur;
-	//int seg_frame_max;
-	//int frag_frame_max;
-	//int audio_frame_size = AUDIO_FRAME_SIZE;
-	char name_to_deleteGF_MAX_PATH;
-	u64 start_utc, seg_utc;
-	segtime time_at_segment_start;
-	Bool check_first_seg_utc = GF_TRUE;
-
-	AudioMuxerType muxer_type = AUDIO_MUXER;
-	AudioThreadParam *thread_params = (AudioThreadParam *) params;
-
-	CmdData *in_data = thread_params->in_data;
-	int audio_conf_idx = thread_params->audio_conf_idx;
-	AudioDataConf *audio_data_conf = (AudioDataConf*)gf_list_get(in_data->audio_lst, audio_conf_idx);
-
-	AudioInputData *audio_input_data = thread_params->audio_input_data;
-	AudioOutputFile audio_output_file;
-
-	MessageQueue *mq = thread_params->mq;
-	MessageQueue *delete_seg_mq = thread_params->delete_seg_mq;
-
-	if (!gf_list_count(in_data->audio_lst))
-		return 0;
-
-	//seg_frame_max = audio_data_conf->samplerate
-	//		* (float) (in_data->seg_dur / 1000.0);
-
-	//frag_frame_max = audio_data_conf->samplerate * (float) (in_data->frag_dur / 1000.0);
-	//if (seg_frame_max <= 0)
-	//	seg_frame_max = -1;
-
-	if (dc_audio_encoder_open(&audio_output_file, audio_data_conf) < 0) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Cannot open output audio stream.\n"));
-		in_data->exit_signal = 1;
-		return -1;
-	}
-
-	frame_per_seg  = (int)((audio_data_conf->samplerate / (double) audio_output_file.codec_ctx->frame_size) * (in_data->seg_dur  / 1000.0));
-	frame_per_frag = (int)((audio_data_conf->samplerate / (double) audio_output_file.codec_ctx->frame_size) * (in_data->frag_dur / 1000.0));
-	optimize_seg_frag_dur(&frame_per_seg, &frame_per_frag);
-
-	real_audio_seg_dur = (int) (frame_per_seg * (double) audio_output_file.codec_ctx->frame_size * 1000.0 / (double) audio_data_conf->samplerate);
-	GF_LOG(GF_LOG_INFO, GF_LOG_DASH,("audio_encoder frame_per_seg=%d, frame_per_frag=%d, real_audio_seg_dur=%d ms\n", frame_per_seg, frame_per_frag, real_audio_seg_dur) );
-
-	if (dc_audio_muxer_init(&audio_output_file, audio_data_conf, muxer_type, frame_per_seg, frame_per_frag, in_data->seg_marker) < 0) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Cannot init output audio.\n"));
-		in_data->exit_signal = 1;
-		return -1;
-	}
-
-	start_utc = gf_net_get_utc();
-	GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("audio_encoder start_utc="LLU"\n", start_utc));
-
-	while (1) {
-		//logging at the end of the segment production will induce one segment delay
-		time_at_segment_start.utc_time = gf_net_get_utc();
-		time_at_segment_start.ntpts = gf_net_get_ntp_ts();
-
-		frame_nb = 0;
-		quit = 0;
-		
-		if (dc_audio_muxer_open(&audio_output_file, in_data->out_dir, audio_data_conf->filename, seg_nb+1) < 0) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Cannot open output audio.\n"));
-			in_data->exit_signal = 1;
-			return -1;
-		}
-
-		while (1) {
-			exit_loop = 0;
-//			if (frame_per_seg > 0) {
-//				if (frame_nb == frame_per_seg) {
-//
-//					//if (dc_audio_encoder_flush(&audio_output_file, audio_input_data) == 0) {
-//					//	dc_audio_muxer_write(&audio_output_file);
-//					//	frame_nb++;//= audio_output_file.codec_ctx->frame_size; //audio_output_file.acc_samples;
-//					//}
-//
-//					exit_loop = 1;
-//					break;
-//				}
-//			}
-
-			audio_output_file.frame_ntp = gf_net_get_ntp_ts();
-			ret = dc_audio_encoder_read(&audio_output_file, audio_input_data);
-			if (ret == -2) {
-				GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("Audio encoder has no more data to encode.\n"));
-				//if (dc_audio_encoder_flush(&audio_output_file, audio_input_data) == 0) {
-				//	dc_audio_muxer_write(&audio_output_file);
-				//	frame_nb++;//= audio_output_file.codec_ctx->frame_size; //audio_output_file.acc_samples;
-				//}
-				quit = 1;
-				break;
-			}
-
-			while (1) {
-				ret = dc_audio_encoder_encode(&audio_output_file, audio_input_data);
-				if (ret == 1) {
-					break;
-				}
-				if (ret == -1) {
-					GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("An error occured while encoding audio frame.\n"));
-					quit = 1;
-					break;
-				}
-
-				ret = dc_audio_muxer_write(&audio_output_file, frame_nb, in_data->insert_utc);
-				if (ret == -1) {
-					GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("An error occured while writing audio frame.\n"));
-					quit = 1;
-					break;
-				}
-
-				if (ret == 1) {
-					exit_loop = 1;
-					break;
-				}
-
-				frame_nb++; //= audio_output_file.codec_ctx->frame_size; //audio_output_file.acc_samples;
-			}
-
-			if (exit_loop || quit)
-				break;
-		}
-
-		dc_audio_muxer_close(&audio_output_file);
-
-		// Send the time that a segment is available to MPD generator thread.
-		if (in_data->mode == LIVE_CAMERA || in_data->mode == LIVE_MEDIA) {
-			int diff;
-			if (check_first_seg_utc) {
-				u64 now = gf_net_get_utc();
-				check_first_seg_utc = GF_FALSE;
-				
-				diff = (int) (now - time_at_segment_start.utc_time);
-				if (diff  < real_audio_seg_dur / 2) {
-					u32 sec, frac, ms;
-					s32 left, nb_s;
-					gf_net_get_ntp(&sec, &frac);
-					nb_s = real_audio_seg_dur/1000;
-					sec -= nb_s;
-					ms = (u32) ((u64) 1000 * frac / 0xFFFFFFFF);
-					left = ms;
-					left -= (s32) (real_audio_seg_dur - 1000*nb_s);
-					while (left<0) {
-						left += 1000;
-						sec-=1;
-					}
-					time_at_segment_start.ntpts = sec;
-					time_at_segment_start.ntpts <<= 32;
-					time_at_segment_start.ntpts |= (u32) ((0xFFFFFFFF*left)/1000);
-					
-					start_utc = time_at_segment_start.utc_time = now - real_audio_seg_dur;
-					GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("audio_encoder First segment produced faster (%d ms) than duration (%d ms) probably due to HW buffers - adjusting ast\n", diff, real_audio_seg_dur));
-				}
-			}
-			if (thread_params->audio_conf_idx == 0) {
-
-				//check we don't loose sync
-				seg_utc = gf_net_get_utc();
-				diff = (int) (seg_utc - start_utc);
-				//if seg UTC is after next segment UTC (current ends at seg_nb+1, next at seg_nb+2), adjust numbers
-				if (diff > (seg_nb+2) * real_audio_seg_dur) {
-					GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("audio_encoder UTC dur %d bigger than segment duration %d - some frame where probably lost. Adjusting\n", diff, seg_nb));
-					while (diff > (seg_nb+2) * real_audio_seg_dur) {
-						seg_nb++;
-					}
-				}
-				GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("audio_encoder UTC dur %d - cumulated segment duration %d (diff %d ms)\n", diff, (seg_nb+1) * real_audio_seg_dur, diff - (seg_nb+1) * real_audio_seg_dur));
-
-				
-				time_at_segment_start.segnum = seg_nb;
-				dc_message_queue_put(mq, &time_at_segment_start, sizeof(time_at_segment_start));
-			}
-		}
-
-		if (in_data->time_shift != -1) {
-			shift = 1000 * in_data->time_shift / in_data->seg_dur;
-			if (seg_nb > shift) {
-				snprintf(name_to_delete, sizeof(name_to_delete), "%s/%s_%d_gpac.m4s", in_data->out_dir, audio_data_conf->filename, (seg_nb - shift));
-				dc_message_queue_put(delete_seg_mq, name_to_delete, sizeof(name_to_delete));
-			}
-		}
-
-		seg_nb++;
-
-		if (quit)
-			break;
-	}
-
-	// If system is not live,
-	// Send the duration of the video
-	if (in_data->mode == ON_DEMAND) {
-		if (thread_params->audio_conf_idx == 0) {
-			int dur = (seg_nb * audio_output_file.codec_ctx->frame_size * frame_per_seg * 1000) / audio_data_conf->samplerate;
-			int dur_tot = (audio_output_file.codec_ctx->frame_number * audio_output_file.codec_ctx->frame_size * 1000) / audio_data_conf->samplerate;
-			if (dur > dur_tot)
-				dur = dur_tot;
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("Duration: %d \n", dur));
-			dc_message_queue_put(mq, &dur, sizeof(dur));
-		}
-	}
-
-	dc_audio_muxer_free(&audio_output_file);
-
-	/* Close output audio file */
-	dc_audio_encoder_close(&audio_output_file);
-
-	GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("Audio encoder is exiting...\n"));
-	return 0;
-}
-
-int dc_run_controler(CmdData *in_data)
-{
-	int ret = 0;
-	u32 video_cb_size = VIDEO_CB_DEFAULT_SIZE;
-	u32 i, j;
-
-	ThreadParam keyboard_th_params;
-	ThreadParam mpd_th_params;
-	ThreadParam delete_seg_th_params;
-	ThreadParam send_frag_th_params;
-
-	//Video parameters
-	VideoThreadParam vdecoder_th_params;
-	VideoThreadParam *vencoder_th_params = (VideoThreadParam*)alloca(gf_list_count(in_data->video_lst) * sizeof(VideoThreadParam));
-	VideoInputData video_input_data;
-	VideoInputFile *video_input_fileMAX_SOURCE_NUMBER;
-	VideoScaledDataList video_scaled_data_list;
-	VideoThreadParam *vscaler_th_params = NULL;
-
-	//Audio parameters
-	AudioThreadParam adecoder_th_params;
-	AudioThreadParam *aencoder_th_params = (AudioThreadParam*)alloca(gf_list_count(in_data->audio_lst) * sizeof(AudioThreadParam));
-	AudioInputData audio_input_data;
-	AudioInputFile audio_input_file;
-
-	MessageQueue mq;
-	MessageQueue delete_seg_mq;
-	MessageQueue send_frag_mq;
-
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("DashCast Controler init at UTC "LLU"\n", gf_net_get_utc() ));
-	dc_register_libav();
-
-	for (i = 0; i < MAX_SOURCE_NUMBER; i++)
-		video_input_filei = (VideoInputFile*)gf_malloc(sizeof(VideoInputFile));
-
-	dc_message_queue_init(&mq);
-	dc_message_queue_init(&delete_seg_mq);
-	dc_message_queue_init(&send_frag_mq);
-
-	memset(&audio_input_data, 0, sizeof(AudioInputData));
-	memset(&audio_input_file, 0, sizeof(AudioInputFile));
-	memset(&video_input_data, 0, sizeof(VideoInputData));
-
-
-	if (in_data->mode == LIVE_CAMERA || in_data->mode == LIVE_MEDIA)
-		video_cb_size  = 1;
-
-	if (strcmp(in_data->video_data_conf.filename, "") != 0) {
-		dc_video_scaler_list_init(&video_scaled_data_list, in_data->video_lst);
-		vscaler_th_params = (VideoThreadParam*)gf_malloc(video_scaled_data_list.size * sizeof(VideoThreadParam));
-
-		/* Open input video */
-		if (dc_video_decoder_open(video_input_file0, &in_data->video_data_conf, in_data->mode, in_data->no_loop, video_scaled_data_list.size) < 0) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Cannot open input video.\n"));
-			ret = -1;
-			goto exit;
-		}
-
-		if (dc_video_input_data_init(&video_input_data, /*video_input_file0->width, video_input_file0->height,
-		  video_input_file0->pix_fmt,*/video_scaled_data_list.size, in_data->mode, MAX_SOURCE_NUMBER, video_cb_size) < 0) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Cannot initialize audio data.\n"));
-			ret = -1;
-			goto exit;
-		}
-
-		/* open other input videos for source switching */
-		for (i = 0; i < gf_list_count(in_data->vsrc); i++) {
-			VideoDataConf *video_data_conf = (VideoDataConf*)gf_list_get(in_data->vsrc, i);
-			if (dc_video_decoder_open(video_input_filei + 1, video_data_conf, LIVE_MEDIA, 1, video_scaled_data_list.size) < 0) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Cannot open input video.\n"));
-				ret = -1;
-				goto exit;
-			}
-		}
-
-		for (i=0; i<gf_list_count(in_data->vsrc) + 1; i++) {
-			dc_video_input_data_set_prop(&video_input_data, i, video_input_filei->width, video_input_filei->height, in_data->video_data_conf.crop_x, in_data->video_data_conf.crop_y, video_input_filei->pix_fmt, video_input_filei->sar);
-		}
-
-		for (i=0; i<video_scaled_data_list.size; i++) {
-			dc_video_scaler_data_init(&video_input_data, video_scaled_data_list.video_scaled_datai, MAX_SOURCE_NUMBER, video_cb_size);
-
-			for (j=0; j<gf_list_count(in_data->vsrc) + 1; j++) {
-				dc_video_scaler_data_set_prop(&video_input_data, video_scaled_data_list.video_scaled_datai, j);
-			}
-		}
-
-		/* Initialize video decoder thread */
-		vdecoder_th_params.thread = gf_th_new("video_decoder_thread");
-
-		for (i=0; i<video_scaled_data_list.size; i++) {
-			vscaler_th_paramsi.thread = gf_th_new("video_scaler_thread");
-		}
-
-		/* Initialize video encoder threads */
-		for (i=0; i<gf_list_count(in_data->video_lst); i++)
-			vencoder_th_paramsi.thread = gf_th_new("video_encoder_thread");
-	}
-
-	/* When video and audio share the same source, open it once. This allow to read from unicast streams */
-	if (!strcmp(in_data->video_data_conf.filename, in_data->audio_data_conf.filename)) {
-		audio_input_file.av_fmt_ctx = video_input_file0->av_fmt_ctx;
-		video_input_file0->av_fmt_ctx_ref_cnt++;
-		audio_input_file.av_pkt_list = video_input_file0->av_pkt_list = gf_list_new();
-		audio_input_file.av_pkt_list_mutex = video_input_file0->av_pkt_list_mutex = gf_mx_new("Demux AVPackets List");
-	}
-
-	if (strcmp(in_data->audio_data_conf.filename, "") != 0) {
-		/* Open input audio */
-		if (dc_audio_decoder_open(&audio_input_file, &in_data->audio_data_conf, in_data->mode, in_data->no_loop, in_data->video_data_conf.framerate) < 0) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Cannot open input audio.\n"));
-			ret = -1;
-			goto exit;
-		}
-
-		if (dc_audio_input_data_init(&audio_input_data, in_data->audio_data_conf.channels, in_data->audio_data_conf.samplerate, gf_list_count(in_data->audio_lst), in_data->mode) < 0) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Cannot initialize audio data.\n"));
-			ret = -1;
-			goto exit;
-		}
-
-		/* Initialize audio decoder thread */
-		adecoder_th_params.thread = gf_th_new("audio_decoder_thread");
-
-		/* Initialize audio encoder threads */
-		for (i = 0; i < gf_list_count(in_data->audio_lst); i++)
-			aencoder_th_paramsi.thread = gf_th_new("video_encoder_thread");
-	}
-
-	/******** Keyboard controler Thread ********/
-
-	/* Initialize keyboard controller thread */
-	keyboard_th_params.thread = gf_th_new("keyboard_thread");
-
-	/* Create keyboard controller thread */
-	keyboard_th_params.in_data = in_data;
-	if (gf_th_run(keyboard_th_params.thread, keyboard_thread, (void *)&keyboard_th_params) != GF_OK) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Error while doing pthread_create for keyboard_thread.\n"));
-	}
-
-	/********************************************/
-
-	//Communication between decoder and audio encoder
-	for (i = 0; i < gf_list_count(in_data->audio_lst); i++) {
-		AudioDataConf *tmadata = (AudioDataConf*)gf_list_get(in_data->audio_lst, i);
-		tmadata->channels = in_data->audio_data_conf.channels;
-		tmadata->samplerate = in_data->audio_data_conf.samplerate;
-	}
-
-	//Communication between decoder and video encoder
-	for (i = 0; i < gf_list_count(in_data->video_lst); i++) {
-		VideoDataConf *tmvdata = (VideoDataConf*)gf_list_get(in_data->video_lst, i);
-		tmvdata->framerate = in_data->video_data_conf.framerate;
-		if (in_data->use_source_timing) {
-			tmvdata->time_base = in_data->video_data_conf.time_base;
-		}
-	}
-
-	/******** MPD Thread ********/
-
-	/* Initialize MPD generator thread */
-	mpd_th_params.thread = gf_th_new("mpd_thread");
-
-	/* Create MPD generator thread */
-	mpd_th_params.in_data = in_data;
-	mpd_th_params.mq = &mq;
-	if (gf_th_run(mpd_th_params.thread, mpd_thread, (void *)&mpd_th_params) != GF_OK) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Error while doing pthread_create for mpd_thread.\n"));
-	}
-
-
-	if (strcmp(in_data->video_data_conf.filename, "") != 0) {
-		/* Create video decoder thread */
-		vdecoder_th_params.in_data = in_data;
-		vdecoder_th_params.video_input_data = &video_input_data;
-		vdecoder_th_params.video_input_file = video_input_file;
-		if (gf_th_run(vdecoder_th_params.thread, video_decoder_thread, (void *) &vdecoder_th_params) != GF_OK) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Error while doing pthread_create for video_decoder_thread.\n"));
-		}
-
-		while ((in_data->mode == LIVE_CAMERA) && !video_input_data.frame_duration) {
-			gf_sleep(0);
-		}
-	}
-
-	if (strcmp(in_data->audio_data_conf.filename, "") != 0) {
-		/* Create audio decoder thread */
-		adecoder_th_params.in_data = in_data;
-		adecoder_th_params.audio_input_data = &audio_input_data;
-		adecoder_th_params.audio_input_file = &audio_input_file;
-		if (gf_th_run(adecoder_th_params.thread, audio_decoder_thread, (void *) &adecoder_th_params) != GF_OK) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Error while doing pthread_create for audio_decoder_thread.\n"));
-		}
-	}
-
-	/****************************/
-
-	if (strcmp(in_data->video_data_conf.filename, "") != 0) {
-		/* Create video encoder threads */
-		for (i=0; i<gf_list_count(in_data->video_lst); i++) {
-			VideoDataConf * video_data_conf = (VideoDataConf*)gf_list_get(in_data->video_lst, i);
-
-			vencoder_th_paramsi.in_data = in_data;
-			vencoder_th_paramsi.video_conf_idx = i;
-			vencoder_th_paramsi.video_scaled_data = dc_video_scaler_get_data(&video_scaled_data_list, video_data_conf->width, video_data_conf->height);
-
-			vencoder_th_paramsi.mq = &mq;
-			vencoder_th_paramsi.delete_seg_mq = &delete_seg_mq;
-			vencoder_th_paramsi.send_seg_mq = &send_frag_mq;
-
-			if (gf_th_run(vencoder_th_paramsi.thread, video_encoder_thread, (void*)&vencoder_th_paramsi) != GF_OK) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Error while doing pthread_create for video_encoder_thread.\n"));
-			}
-		}
-
-		/* Create video scaler threads */
-		for (i=0; i<video_scaled_data_list.size; i++) {
-			vscaler_th_paramsi.in_data = in_data;
-			vscaler_th_paramsi.video_scaled_data = video_scaled_data_list.video_scaled_datai;
-			vscaler_th_paramsi.video_input_data = &video_input_data;
-
-			if (gf_th_run(vscaler_th_paramsi.thread, video_scaler_thread, (void*)&vscaler_th_paramsi) != GF_OK) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Error while doing pthread_create for video_scaler_thread.\n"));
-			}
-		}
-	}
-
-	if (strcmp(in_data->audio_data_conf.filename, "") != 0) {
-		/* Create audio encoder threads */
-		for (i = 0; i < gf_list_count(in_data->audio_lst); i++) {
-			aencoder_th_paramsi.in_data = in_data;
-			aencoder_th_paramsi.audio_conf_idx = i;
-			aencoder_th_paramsi.audio_input_data = &audio_input_data;
-
-			aencoder_th_paramsi.mq = &mq;
-			aencoder_th_paramsi.delete_seg_mq = &delete_seg_mq;
-			aencoder_th_paramsi.send_seg_mq = &send_frag_mq;
-
-			if (gf_th_run(aencoder_th_paramsi.thread, audio_encoder_thread, (void *) &aencoder_th_paramsi) != GF_OK) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Error while doing pthread_create for audio_encoder_thread.\n"));
-			}
-		}
-	}
-
-	if (in_data->time_shift != -1) {
-		/* Initialize delete segment thread */
-		delete_seg_th_params.thread = gf_th_new("delete_seg_thread");
-		delete_seg_th_params.in_data = in_data;
-		delete_seg_th_params.mq = &delete_seg_mq;
-		if (gf_th_run(delete_seg_th_params.thread, delete_seg_thread, (void *) &delete_seg_th_params) != GF_OK) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Error while doing pthread_create for delete_seg_thread.\n"));
-		}
-	}
-
-	if (in_data->send_message == 1) {
-		/* Initialize delete segment thread */
-		send_frag_th_params.thread = gf_th_new("send_frag_event_thread");
-		send_frag_th_params.in_data = in_data;
-		send_frag_th_params.mq = &send_frag_mq;
-		if (gf_th_run(send_frag_th_params.thread, send_frag_event, (void *) &send_frag_th_params) != GF_OK) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Error while doing pthread_create for send_frag_event_thread.\n"));
-		}
-	}
-
-	fprintf(stdout, "Press q or Q to exit...\n");
-
-	if (strcmp(in_data->audio_data_conf.filename, "") != 0) {
-		/* Wait for and destroy audio decoder threads */
-		gf_th_stop(adecoder_th_params.thread);
-		gf_th_del(adecoder_th_params.thread);
-	}
-
-	if (strcmp(in_data->video_data_conf.filename, "") != 0) {
-		/* Wait for and destroy video decoder threads */
-		gf_th_stop(vdecoder_th_params.thread);
-		gf_th_del(vdecoder_th_params.thread);
-	}
-
-	if (strcmp(in_data->audio_data_conf.filename, "") != 0) {
-		/* Wait for and destroy audio encoder threads */
-		for (i = 0; i < gf_list_count(in_data->audio_lst); i++) {
-			gf_th_stop(aencoder_th_paramsi.thread);
-			gf_th_del(aencoder_th_paramsi.thread);
-		}
-	}
-
-	if (strcmp(in_data->video_data_conf.filename, "") != 0) {
-		/* Wait for and destroy video encoder threads */
-		for (i=0; i<gf_list_count(in_data->video_lst); i++) {
-			gf_th_stop(vencoder_th_paramsi.thread);
-			gf_th_del(vencoder_th_paramsi.thread);
-		}
-
-		/* Wait for and destroy video scaler threads */
-		for (i=0; i<video_scaled_data_list.size; i++) {
-			gf_th_stop(vscaler_th_paramsi.thread);
-			gf_th_del(vscaler_th_paramsi.thread);
-		}
-	}
-	
-	keyboard_th_params.in_data->exit_signal = 1;
-
-	/********** Keyboard thread ***********/
-
-	/* Wait for and destroy keyboard controler thread */
-	gf_th_stop(keyboard_th_params.thread);
-	gf_th_del(keyboard_th_params.thread);
-
-	/**************************************/
-
-	/********** MPD generator thread ***********/
-
-	/* Wait for and destroy MPD generator thread */
-	gf_th_stop(mpd_th_params.thread);
-	gf_th_del(mpd_th_params.thread);
-
-	/**************************************/
-
-	if (in_data->time_shift != -1) {
-		//	dc_message_queue_flush(&delete_seg_mq);
-		/* Wait for and destroy delete segment thread */
-		gf_th_stop(delete_seg_th_params.thread);
-		gf_th_del(delete_seg_th_params.thread);
-	}
-
-	if (in_data->send_message == 1) {
-		/* Wait for and destroy delete segment thread */
-		gf_th_stop(send_frag_th_params.thread);
-		gf_th_del(send_frag_th_params.thread);
-	}
-
-exit:
-	if (strcmp(in_data->audio_data_conf.filename, "") != 0) {
-		/* Destroy audio input data */
-		dc_audio_input_data_destroy(&audio_input_data);
-		/* Close input audio */
-		dc_audio_decoder_close(&audio_input_file);
-	}
-
-	if (strcmp(in_data->video_data_conf.filename, "") != 0) {
-		/* Destroy video input data */
-		dc_video_input_data_destroy(&video_input_data);
-
-		for (i = 0; i < gf_list_count(in_data->vsrc); i++) {
-			/* Close input video */
-			dc_video_decoder_close(video_input_filei);
-		}
-
-		for (i=0; i<video_scaled_data_list.size; i++) {
-			dc_video_scaler_data_destroy(video_scaled_data_list.video_scaled_datai);
-		}
-
-		/* Destroy video scaled data */
-		dc_video_scaler_list_destroy(&video_scaled_data_list);
-	}
-
-	if (vscaler_th_params)
-		gf_free(vscaler_th_params);
-
-	for (i = 0; i < MAX_SOURCE_NUMBER; i++)
-		gf_free(video_input_filei);
-
-	dc_message_queue_free(&mq);
-	dc_message_queue_free(&delete_seg_mq);
-	dc_message_queue_free(&send_frag_mq);
-
-	dc_unregister_libav();
-
-	return ret;
-}

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/dashcast/controler.h Deleted

@@ -1,100 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Arash Shafiei
- *			Copyright (c) Telecom ParisTech 2000-2013
- *					All rights reserved
- *
- *  This file is part of GPAC / dashcast
- *
- *  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.
- *
- */
-
-#ifndef CONTROLER_H_
-#define CONTROLER_H_
-
-#include <gpac/tools.h>
-#include <gpac/thread.h>
-#include <gpac/media_tools.h>
-
-#include "register.h"
-#include "video_decoder.h"
-#include "video_encoder.h"
-#include "audio_decoder.h"
-#include "audio_encoder.h"
-#include "cmd_data.h"
-#include "message_queue.h"
-
-
-/* General thread parameters */
-typedef struct {
-	/* command data */
-	CmdData *in_data;
-	/* handle to thread */
-	GF_Thread *thread;
-
-	MessageQueue *mq;
-} ThreadParam;
-
-/* Video thread parameters */
-typedef struct {
-	/* command data */
-	CmdData *in_data;
-	/* The index in the configuration file to a video entry corresponding to the thread. */
-	int video_conf_idx;
-	/* Video input data structure corresponding to the thread. (This data is shared between video decoder and video scaler) */
-	VideoInputData *video_input_data;
-	/* Video scaled data structure corresponding to the thread. (This data is shared between video scaler and video encoder) */
-	VideoScaledData *video_scaled_data;
-	/* Video input file structure corresponding to the thread */
-	VideoInputFile **video_input_file;
-	/* handle to the thread */
-	GF_Thread *thread;
-
-	MessageQueue *mq;
-	MessageQueue *delete_seg_mq;
-	MessageQueue *send_seg_mq;
-} VideoThreadParam;
-
-/* Audio thread parameters */
-typedef struct {
-	/* command data */
-	CmdData *in_data;
-	/* The index in the configuration file to an audio entry corresponding to the thread */
-	int audio_conf_idx;
-	/* Audio input data (This data is shared between audio decoder and audio encoder */
-	AudioInputData *audio_input_data;
-	/* Audio input file structure */
-	AudioInputFile *audio_input_file;
-	/* handle to the thread */
-	GF_Thread *thread;
-
-	MessageQueue *mq;
-	MessageQueue *delete_seg_mq;
-	MessageQueue *send_seg_mq;
-} AudioThreadParam;
-
-/*
- * Run controler runs all decoder, scalers, and encoders
- * of audio and video
- *
- * @param cmd_data in command data
- *
- * @return 0 on success, -1 on failure
- */
-int dc_run_controler(CmdData *);
-
-#endif /* CONTROLER_H_ */

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/dashcast/dashcast.c Deleted

@@ -1,65 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Arash Shafiei
- *			Copyright (c) Telecom ParisTech 2000-2013
- *					All rights reserved
- *
- *  This file is part of GPAC / dashcast
- *
- *  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 "cmd_data.h"
-#include "controler.h"
-
-
-int main(int argc, char **argv)
-{
-#ifdef GPAC_MEMORY_TRACKING
-	GF_MemTrackerType mem_track = GF_MemTrackerNone;
-#endif
-	s32 res;
-	CmdData cmd_data;
-
-	/* Read command line (performs init) and parse input */
-	res = dc_parse_command(argc, argv, &cmd_data);
-	if (res < 0) {
-		if (res==-1) dc_cmd_data_destroy(&cmd_data);
-		return -1;
-	}
-
-	res = dc_run_controler(&cmd_data);
-
-#ifdef GPAC_MEMORY_TRACKING
-	mem_track = cmd_data.mem_track;
-#endif
-
-	/* Destroy command data */
-	dc_cmd_data_destroy(&cmd_data);
-
-	if (res) return res;
-
-#ifdef GPAC_MEMORY_TRACKING
-	if (mem_track && (gf_memory_size() || gf_file_handles_count() )) {
-        gf_log_set_tool_level(GF_LOG_MEMORY, GF_LOG_INFO);
-		gf_memory_print();
-		return 2;
-	}
-#endif
-	return 0;
-}
-

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/dashcast/libav_compat.h Deleted

@@ -1,56 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Romain Bouqueau
- *			Copyright (c) Telecom ParisTech 2000-2013 - Romain Bouqueau 2013
- *					All rights reserved
- *
- *  This file is part of GPAC / dashcast
- *
- *  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.
- *
- */
-
-#ifndef LIBAV_COMPAT_H_
-#define LIBAV_COMPAT_H_
-
-#ifndef URL_WRONLY
-#define URL_WRONLY AVIO_FLAG_WRITE
-#endif
-
-#if (LIBAVCODEC_VERSION_MAJOR>54)
-#define CODEC_ID_RAWVIDEO AV_CODEC_ID_RAWVIDEO
-#define CODEC_ID_H264 AV_CODEC_ID_H264
-#endif
-
-#if (LIBAVCODEC_VERSION_MAJOR<54)
-#define LIBAV_ENCODE_OLD
-#endif
-
-#ifndef AV_CH_LAYOUT_STEREO
-#define AV_CH_FRONT_LEFT 0x00000001
-#define AV_CH_FRONT_RIGHT 0x00000002
-#define AV_CH_LAYOUT_STEREO (AV_CH_FRONT_LEFT|AV_CH_FRONT_RIGHT)
-#endif
-
-#if (LIBAVCODEC_VERSION_MAJOR<55) || ((LIBAVCODEC_VERSION_MAJOR==55) && (LIBAVCODEC_VERSION_MINOR<=40))
-#define FF_ALLOC_FRAME avcodec_alloc_frame
-#define LIBAV_FRAME_OLD
-#else
-#define FF_ALLOC_FRAME av_frame_alloc
-#endif
-
-#endif
-

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/dashcast/message_queue.c Deleted

@@ -1,120 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Arash Shafiei
- *			Copyright (c) Telecom ParisTech 2000-2013
- *					All rights reserved
- *
- *  This file is part of GPAC / dashcast
- *
- *  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 "message_queue.h"
-
-
-void dc_message_queue_init(MessageQueue *mq)
-{
-	memset(mq, 0, sizeof(MessageQueue));
-	mq->first_node = NULL;
-	mq->last_node = NULL;
-	mq->nb_nodes = 0;
-	mq->mutex = gf_mx_new("MessageQueue Mutex");
-	mq->sem = gf_sema_new(1000, 0); //TODO: why 1000 (at other places too)
-}
-
-void dc_message_queue_put(MessageQueue *mq, void *data, u32 size)
-{
-	MessageQueueNode *mqn = (MessageQueueNode*)gf_malloc(sizeof(MessageQueueNode));
-	mqn->data = gf_malloc(size);
-	memcpy(mqn->data, data, size);
-	mqn->size = size;
-	mqn->next = NULL;
-
-	gf_mx_p(mq->mutex);
-
-	if (!mq->last_node)
-		mq->first_node = mqn;
-	else
-		mq->last_node->next = mqn;
-
-	mq->last_node = mqn;
-	mq->nb_nodes++;
-
-	gf_sema_notify(mq->sem, 1);
-	gf_mx_v(mq->mutex);
-}
-
-int dc_message_queue_get(MessageQueue *mq, void * data)
-{
-	int ret = 0;
-	MessageQueueNode *mqn;
-
-	gf_mx_p(mq->mutex);
-
-	mqn = mq->first_node;
-	if (!mqn) {
-		gf_mx_v(mq->mutex);
-		ret = gf_sema_wait_for(mq->sem, 10000);
-		gf_mx_p(mq->mutex);
-
-		mqn = mq->first_node;
-
-		if (!ret || !mqn) {
-			gf_mx_v(mq->mutex);
-			return -1;
-		}
-	}
-	if (mqn) {
-		mq->first_node = mqn->next;
-		if (!mq->first_node)
-			mq->last_node = NULL;
-		mq->nb_nodes--;
-		memcpy(data, mqn->data, mqn->size);
-		ret = (int)mqn->size;
-		gf_free(mqn->data);
-		gf_free(mqn);
-	}
-
-	gf_mx_v(mq->mutex);
-
-	return ret;
-}
-
-void dc_message_queue_flush(MessageQueue *mq)
-{
-	MessageQueueNode *mqn, *mqn1;
-
-	gf_mx_p(mq->mutex);
-
-	for (mqn = mq->first_node; mqn != NULL; mqn = mqn1) {
-		mqn1 = mqn->next;
-		gf_free(mqn);
-	}
-	mq->last_node = NULL;
-	mq->first_node = NULL;
-	mq->nb_nodes = 0;
-
-	gf_sema_notify(mq->sem, 1);
-	gf_mx_v(mq->mutex);
-}
-
-void dc_message_queue_free(MessageQueue *mq)
-{
-	dc_message_queue_flush(mq);
-	gf_mx_del(mq->mutex);
-	gf_sema_del(mq->sem);
-}

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/dashcast/message_queue.h Deleted

@@ -1,58 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Arash Shafiei
- *			Copyright (c) Telecom ParisTech 2000-2013
- *					All rights reserved
- *
- *  This file is part of GPAC / dashcast
- *
- *  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.
- *
- */
-
-#ifndef MESSAGE_QUEUE_H_
-#define MESSAGE_QUEUE_H_
-
-#include <string.h>
-#include <stdlib.h>
-#include <gpac/thread.h>
-
-
-typedef struct MessageQueueNode {
-	void *data;
-	u32 size;
-	struct MessageQueueNode *next;
-} MessageQueueNode;
-
-typedef struct MessageQueue {
-	MessageQueueNode *last_node;
-	MessageQueueNode *first_node;
-	int nb_nodes;
-	GF_Semaphore *sem;
-	GF_Mutex *mutex;
-} MessageQueue;
-
-void dc_message_queue_init(MessageQueue *mq);
-
-void dc_message_queue_put(MessageQueue *mq, void *data, u32 size);
-
-int dc_message_queue_get(MessageQueue *mq, void *data);
-
-void dc_message_queue_flush(MessageQueue *mq);
-
-void dc_message_queue_free(MessageQueue *mq);
-
-#endif /* MESSAGE_QUEUE_H_ */

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/dashcast/register.c Deleted

@@ -1,85 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Arash Shafiei
- *			Copyright (c) Telecom ParisTech 2000-2013
- *					All rights reserved
- *
- *  This file is part of GPAC / dashcast
- *
- *  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 "register.h"
-
-
-static GF_List *av_mutex = NULL;
-
-int lock_call_back(void ** mutex, enum AVLockOp op)
-{
-	switch (op) {
-	case AV_LOCK_CREATE:
-	{
-		static int i = 0;
-		char mxName64;
-		snprintf(mxName, 64, "AVLIB callback mutex %d", i++);
-		*mutex = gf_mx_new(mxName);
-		gf_list_add(av_mutex, *mutex);
-		break;
-	}
-	case AV_LOCK_OBTAIN:
-		gf_mx_p(*mutex);
-		break;
-	case AV_LOCK_RELEASE:
-		gf_mx_v(*mutex);
-		break;
-	case AV_LOCK_DESTROY:
-		gf_list_del_item(av_mutex, *mutex);
-		gf_mx_del(*mutex);
-		*mutex = NULL;
-		break;
-	}
-
-	return 0;
-}
-
-void dc_register_libav()
-{
-	av_mutex = gf_list_new();
-
-	av_register_all();
-	avcodec_register_all();
-	avdevice_register_all();
-	avformat_network_init();
-
-	av_lockmgr_register(&lock_call_back);
-}
-
-void dc_unregister_libav()
-{
-	av_lockmgr_register(NULL);
-
-	if (av_mutex) {
-		while (gf_list_count(av_mutex)) {
-			GF_Mutex *mx = (GF_Mutex*)gf_list_last(av_mutex);
-			gf_list_rem_last(av_mutex);
-			gf_mx_del(mx);
-		}
-		gf_list_del(av_mutex);
-		av_mutex = NULL;
-	}
-}
-

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/dashcast/register.h Deleted

@@ -1,50 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Arash Shafiei
- *			Copyright (c) Telecom ParisTech 2000-2013
- *					All rights reserved
- *
- *  This file is part of GPAC / dashcast
- *
- *  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.
- *
- */
-
-#ifndef REGISTER_H_
-#define REGISTER_H_
-
-//#include <pthread.h>
-#include "../../modules/ffmpeg_in/ffmpeg_in.h"
-#include "libavcodec/avcodec.h"
-#include "libavdevice/avdevice.h"
-#include "libavformat/avformat.h"
-
-#include <gpac/thread.h>
-
-
-/*
- * Register all codecs and define
- * the lock manager on top of avlib
- */
-void dc_register_libav();
-void dc_unregister_libav();
-
-/*
- * performs libav* cleanup
- */
-void dc_unregister_libav();
-
-#endif /* REGISTER_H_ */

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/dashcast/task.c Deleted

@@ -1,69 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Arash Shafiei
- *			Copyright (c) Telecom ParisTech 2000-2013
- *					All rights reserved
- *
- *  This file is part of GPAC / dashcast
- *
- *  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 "task.h"
-
-
-void dc_task_init(TaskList *list)
-{
-	list->tasks = gf_list_new();
-	list->size = 0;
-}
-
-void dc_task_destroy(TaskList *list)
-{
-	gf_list_del(list->tasks);
-}
-
-void dc_task_add(TaskList *list, int source_number, char *id_name, time_t start, time_t end)
-{
-	Task *task = (Task*)gf_malloc(sizeof(Task));
-	task->source_number = source_number;
-	strncpy(task->id, id_name, MAX_ID_SIZE-1);
-	task->start_time_t = start;
-	task->end_time_t = end;
-	gf_list_add(list->tasks, task);
-	list->size++;
-}
-
-int dc_task_get_current(TaskList *list, Task *task)
-{
-	u32 i;
-	time_t now_time = time(NULL);
-	for (i = 0; i<list->size; i++) {
-		Task *cur_task = (Task*)gf_list_get(list->tasks, i);
-		if (now_time > cur_task->start_time_t && now_time < cur_task->end_time_t) {
-			//strncpy(task->id, cur_task->id, MAX_ID_SIZE-1);
-			//memcpy(&task->start_time, &cur_task->start_time, sizeof(struct tm));
-			//memcpy(&task->end_time, &cur_task->end_time, sizeof(struct tm));
-			task->source_number = cur_task->source_number;
-			return 0;
-		}
-	}
-
-	task->source_number = 0;
-	return -1;
-}
-

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/dashcast/task.h Deleted

@@ -1,69 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Arash Shafiei
- *			Copyright (c) Telecom ParisTech 2000-2013
- *					All rights reserved
- *
- *  This file is part of GPAC / dashcast
- *
- *  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.
- *
- */
-
-#ifndef TASK_H_
-#define TASK_H_
-
-#define MAX_ID_SIZE 512
-
-#include <stdio.h>
-#include <time.h>
-#include <gpac/list.h>
-
-
-typedef struct {
-	char idMAX_ID_SIZE;
-	int source_number;
-	time_t start_time_t;
-	time_t end_time_t;
-} Task;
-
-typedef struct {
-	GF_List *tasks;
-	u32 size;
-} TaskList;
-
-/**
- * initialize a list of task
- */
-void dc_task_init(TaskList *list);
-
-/**
- * destroy the list of task
- */
-void dc_task_destroy(TaskList *list);
-
-/**
- * audio_input_data a task to the list
- */
-void dc_task_add(TaskList *list, int source_number, char *id_name, time_t start, time_t end);
-
-/**
- * give the task which corresponds to the time=NOW
- * note: in the case of infering tasks, the first one is picked
- */
-int dc_task_get_current(TaskList *list, Task *task);
-
-#endif /* TASK_H_ */

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/dashcast/video_data.c Deleted

@@ -1,97 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Arash Shafiei
- *			Copyright (c) Telecom ParisTech 2000-2013
- *					All rights reserved
- *
- *  This file is part of GPAC / dashcast
- *
- *  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 "video_data.h"
-
-
-void dc_video_data_set_default(VideoDataConf *video_data_conf)
-{
-	memset(video_data_conf, 0, sizeof(VideoDataConf));
-	video_data_conf->bitrate = -1;
-	video_data_conf->framerate = -1;
-	video_data_conf->crop_x = 0;
-	video_data_conf->crop_y = 0;
-	video_data_conf->height = -1;
-	video_data_conf->width = -1;
-}
-
-void dc_video_input_data_end_signal(VideoInputData *video_input_data)
-{
-	dc_producer_end_signal(&video_input_data->producer, &video_input_data->circular_buf);
-	dc_producer_end_signal_previous(&video_input_data->producer, &video_input_data->circular_buf);
-}
-
-int dc_video_input_data_init(VideoInputData *video_input_data, /*int width, int height, int pix_fmt*/ int num_consumers, int mode, int max_source, int video_cb_size)
-{
-	int i;
-
-	dc_producer_init(&video_input_data->producer, video_cb_size, "video decoder");
-
-	//video_input_data->width = width;
-	//video_input_data->height = height;
-	//video_input_data->pix_fmt = pix_fmt;
-
-	video_input_data->vprop = (VideoInputProp*)gf_malloc(max_source * sizeof(VideoInputProp));
-
-	dc_circular_buffer_create(&video_input_data->circular_buf, video_cb_size, mode, num_consumers);
-
-	for (i=0; i<video_cb_size; i++) {
-		VideoDataNode *video_data_node;
-		GF_SAFEALLOC(video_data_node, VideoDataNode);
-		if (!video_data_node) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_APP, ("Cannot allocate video input\n"));
-			return -1;
-		}
-		video_input_data->circular_buf.listi.data = (void *) video_data_node;
-		video_data_node->vframe = FF_ALLOC_FRAME();
-	}
-
-	return 0;
-}
-
-void dc_video_input_data_set_prop(VideoInputData *video_input_data, int index, int width, int height, int crop_x, int crop_y, int pix_fmt, AVRational sar)
-{
-	video_input_data->vpropindex.width = width;
-	video_input_data->vpropindex.height = height;
-	video_input_data->vpropindex.crop_x = crop_x;
-	video_input_data->vpropindex.crop_y = crop_y;
-	video_input_data->vpropindex.pix_fmt = pix_fmt;
-	video_input_data->vpropindex.sar = sar;
-}
-
-void dc_video_input_data_destroy(VideoInputData *video_input_data)
-{
-	int i;
-	for (i=0; i<(int) video_input_data->circular_buf.size; i++) {
-		if (video_input_data->circular_buf.list) {
-			VideoDataNode *video_data_node = (VideoDataNode*)video_input_data->circular_buf.listi.data;
-			av_free(video_data_node->vframe);
-			gf_free(video_data_node);
-		}
-	}
-
-	dc_circular_buffer_destroy(&video_input_data->circular_buf);
-	gf_free(video_input_data->vprop);
-}

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/dashcast/video_data.h Deleted

@@ -1,173 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Arash Shafiei
- *			Copyright (c) Telecom ParisTech 2000-2013
- *					All rights reserved
- *
- *  This file is part of GPAC / dashcast
- *
- *  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.
- *
- */
-
-#ifndef VIDEO_DATA_H_
-#define VIDEO_DATA_H_
-
-#include "../../modules/ffmpeg_in/ffmpeg_in.h"
-#include "libavcodec/avcodec.h"
-#include "libswscale/swscale.h"
-#include "libav_compat.h"
-
-#include "circular_buffer.h"
-
-#include <time.h>
-
-//anything different is broken in dash cast (random frame inversions at encoding time ...)
-#define VIDEO_CB_DEFAULT_SIZE 1
-
-
-/*
- * This structure corresponds to an
- * entry of video configuration in the
- * configuration file.
- */
-typedef struct {
-	/* video file name */
-	char filenameGF_MAX_PATH;
-	/* video format */
-	char formatGF_MAX_PATH;
-	/* video format */
-	char pixel_formatGF_MAX_PATH;
-	/* v4l2 format */
-	char v4l2fGF_MAX_PATH;
-	/* left crop */
-	int crop_x;
-	/* top crop */
-	int crop_y;
-	/* video final width */
-	int width;
-	/* video final height */
-	int height;
-	/* video bitrate */
-	int bitrate;
-	/* video frame rate */
-	int framerate;
-	/* video codec */
-	char codecGF_MAX_PATH;
-	/* RFC6381 codec name, only valid when VIDEO_MUXER == GPAC_INIT_VIDEO_MUXER_AVC1 */
-	char codec6381RFC6381_CODEC_NAME_SIZE_MAX;
-	/* custom parameter to be passed directly to the encoder - free it once you're done */
-	char customGF_MAX_PATH;
-	/*low delay is used*/
-	int low_delay;
-	/*demuxer buffer size or 0 if default FFmpeg one is used*/
-	int demux_buffer_size;
-
-	/* used for source switching */
-	char source_idGF_MAX_PATH;
-	time_t start_time;
-	time_t end_time;
-
-	//copy over from source file
-	AVRational time_base;
-	u64 frame_duration;
-} VideoDataConf;
-
-typedef struct {
-	/* Width, height and pixel format of the input video. */
-	int width;
-	int height;
-	int crop_x, crop_y;
-	int pix_fmt;
-	AVRational sar;
-} VideoInputProp;
-
-/*
- * VideoInputData is designed to keep the data
- * of input video in a circular buffer.
- * The circular buffer has its own mechanism for synchronization.
- */
-typedef struct {
-	/* The circular buffer of the video frames after decoding. */
-	CircularBuffer circular_buf;
-	/* The user of circular buffer has an index to it, which is in this variable. */
-	Producer producer;
-
-	VideoInputProp *vprop;
-
-	/* Width, height and pixel format of the input video */
-	//int width;
-	//int height;
-	//int pix_fmt;
-	u64 frame_duration;
-} VideoInputData;
-
-
-/*
- * Each node in a circular buffer is a pointer.
- * To use the circular buffer for video frame we must
- * define the node. VideoDataNode simply contains
- * an AVFrame.
- */
-typedef struct {
-	AVFrame * vframe;
-	int source_number;
-	uint8_t nb_raw_frames_ref;
-	AVPacket raw_packet;
-
-	u64 frame_ntp, frame_utc;
-} VideoDataNode;
-
-void dc_video_data_set_default(VideoDataConf *video_data_conf);
-
-/*
- * Initialize a VideoInputData.
- *
- * @param video_input_data out is the structure to be initialize.
- * @param width in input video width
- * @param height in input video height
- * @param pixfmt in input video pixel format
- * @param num_consumers in contains information on the number of users of circular buffer;
- * which means the number of video encoders.
- * @param live in indicates the system is live
- *
- * @return 0 on success, -1 on failure.
- *
- * @note Must use dc_video_data_destroy to free memory.
- */
-int dc_video_input_data_init(VideoInputData *video_input_data,/* int width, int height, int pix_fmt,*/ int num_consumers, int mode, int num_producers, int video_cb_size);
-
-/*
- * Set properties for a VideoInputData.
- */
-void dc_video_input_data_set_prop(VideoInputData *video_input_data, int index, int width, int height, int crop_x, int crop_y, int pix_fmt, AVRational sar);
-
-/*
- * Destroy a VideoInputData.
- *
- * @param video_input_data in the structure to be destroyed.
- */
-void dc_video_input_data_destroy(VideoInputData *video_input_data);
-
-/*
- * Signal to all the users of the circular buffer in the VideoInputData
- * which the current node is the last node to consume.
- *
- * @param video_input_data in the structure to be signaled on.
- */
-void dc_video_input_data_end_signal(VideoInputData *video_input_data);
-
-#endif /* VIDEO_DATA_H_ */

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/dashcast/video_decoder.c Deleted

@@ -1,441 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Arash Shafiei
- *			Copyright (c) Telecom ParisTech 2000-2013
- *					All rights reserved
- *
- *  This file is part of GPAC / dashcast
- *
- *  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 "video_decoder.h"
-#include <time.h>
-#include <gpac/network.h>
-
-
-//#define DASHCAST_DEBUG_TIME_
-
-
-int dc_video_decoder_open(VideoInputFile *video_input_file, VideoDataConf *video_data_conf, int mode, int no_loop, int nb_consumers)
-{
-	s32 ret;
-	u32 i;
-	s32 open_res;
-	AVInputFormat *in_fmt = NULL;
-	AVDictionary *options = NULL;
-	AVCodecContext *codec_ctx;
-	AVCodec *codec;
-
-	memset(video_input_file, 0, sizeof(VideoInputFile));
-
-	if (video_data_conf->width > 0 && video_data_conf->height > 0) {
-		char vres16;
-		snprintf(vres, sizeof(vres), "%dx%d", video_data_conf->width, video_data_conf->height);
-		ret = av_dict_set(&options, "video_size", vres, 0);
-		if (ret < 0) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Could not set video size %s.\n", vres));
-			return -1;
-		}
-	}
-
-	if (video_data_conf->framerate > 0) {
-		char vfr16;
-		snprintf(vfr, sizeof(vfr), "%d", video_data_conf->framerate);
-		ret = av_dict_set(&options, "framerate", vfr, 0);
-		if (ret < 0) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Could not set video framerate %s.\n", vfr));
-			return -1;
-		}
-	}
-
-	if (strlen(video_data_conf->pixel_format)) {
-		ret = av_dict_set(&options, "pixel_format", video_data_conf->pixel_format, 0);
-		if (ret < 0) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Could not set pixel format %s.\n", video_data_conf->pixel_format));
-			return -1;
-		}
-	}
-
-#ifndef WIN32
-	if (strcmp(video_data_conf->v4l2f, "") != 0) {
-		ret = av_dict_set(&options, "input_format", video_data_conf->v4l2f, 0);
-		if (ret < 0) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Could not set input format %s.\n", video_data_conf->v4l2f));
-			return -1;
-		}
-	}
-#endif
-
-	if (strcmp(video_data_conf->format, "") != 0) {
-		in_fmt = av_find_input_format(video_data_conf->format);
-		if (in_fmt == NULL) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Cannot find the format %s.\n", video_data_conf->format));
-			return -1;
-		}
-	}
-
-	video_input_file->av_fmt_ctx = NULL;
-
-	if (video_data_conf->demux_buffer_size) {
-		char szBufSize100;
-		sprintf(szBufSize, "%d", video_data_conf->demux_buffer_size);
-		ret = av_dict_set(&options, "buffer_size", szBufSize, 0);
-		if (ret < 0) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Could not set demuxer's input buffer size.\n"));
-			return -1;
-		}
-	}
-
-	/* Open video */
-	open_res = avformat_open_input(&video_input_file->av_fmt_ctx, video_data_conf->filename, in_fmt, options ? &options : NULL);
-	if ( (open_res < 0) && !stricmp(video_data_conf->filename, "screen-capture-recorder") ) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Buggy screen capture input (open failed with code %d), retrying without specifying resolution\n", open_res));
-		av_dict_set(&options, "video_size", NULL, 0);
-		open_res = avformat_open_input(&video_input_file->av_fmt_ctx, video_data_conf->filename, in_fmt, options ? &options : NULL);
-	}
-
-	if ( (open_res < 0) && options) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Error %d opening input - retrying without options\n", open_res));
-		av_dict_free(&options);
-		open_res = avformat_open_input(&video_input_file->av_fmt_ctx, video_data_conf->filename, in_fmt, NULL);
-	}
-
-	if (open_res < 0) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Cannot open file %s\n", video_data_conf->filename));
-		return -1;
-	}
-
-	/* Retrieve stream information */
-	if (avformat_find_stream_info(video_input_file->av_fmt_ctx, NULL) < 0) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Cannot find stream information\n"));
-		return -1;
-	}
-
-	av_dump_format(video_input_file->av_fmt_ctx, 0, video_data_conf->filename, 0);
-
-	/* Find the first video stream */
-	video_input_file->vstream_idx = -1;
-	for (i = 0; i < video_input_file->av_fmt_ctx->nb_streams; i++) {
-		if (video_input_file->av_fmt_ctx->streamsi->codec->codec_type == AVMEDIA_TYPE_VIDEO) {
-			video_input_file->vstream_idx = i;
-			break;
-		}
-	}
-	if (video_input_file->vstream_idx == -1) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Cannot find a video stream\n"));
-		return -1;
-	}
-
-	/* Get a pointer to the codec context for the video stream */
-	codec_ctx = video_input_file->av_fmt_ctx->streamsvideo_input_file->vstream_idx->codec;
-
-	/* Find the decoder for the video stream */
-	codec = avcodec_find_decoder(codec_ctx->codec_id);
-	if (codec == NULL) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Codec is not supported.\n"));
-		if (!video_input_file->av_fmt_ctx_ref_cnt)
-			avformat_close_input(&video_input_file->av_fmt_ctx);
-		return -1;
-	}
-
-	/* Open codec */
-	if (avcodec_open2(codec_ctx, codec, NULL) < 0) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Cannot open codec.\n"));
-		if (!video_input_file->av_fmt_ctx_ref_cnt)
-			avformat_close_input(&video_input_file->av_fmt_ctx);
-		return -1;
-	}
-
-	video_input_file->width = codec_ctx->width;
-	video_input_file->height = codec_ctx->height;
-	video_input_file->sar = codec_ctx->sample_aspect_ratio;
-
-	video_input_file->pix_fmt = codec_ctx->pix_fmt;
-	if (codec_ctx->time_base.num==1) {
-		GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("AVCTX give frame duration of %d/%d - keeping requested rate %d, but this may result in unexpected behaviour.\n", codec_ctx->time_base.num, codec_ctx->time_base.den, video_data_conf->framerate ));
-
-		if (codec_ctx->time_base.den==1000000) {
-			codec_ctx->time_base.num = codec_ctx->time_base.den / video_data_conf->framerate;
-		}
-	}
-	else if (video_data_conf->framerate >= 0 && codec_ctx->time_base.num) {
-		video_data_conf->framerate = codec_ctx->time_base.den / codec_ctx->time_base.num;
-	}
-	if (video_data_conf->framerate <= 1 || video_data_conf->framerate > 1000) {
-		const int num = video_input_file->av_fmt_ctx->streamsvideo_input_file->vstream_idx->avg_frame_rate.num;
-		const int den = video_input_file->av_fmt_ctx->streamsvideo_input_file->vstream_idx->avg_frame_rate.den == 0 ? 1 : video_input_file->av_fmt_ctx->streamsvideo_input_file->vstream_idx->avg_frame_rate.den;
-		video_data_conf->framerate = num / den;
-		if (video_data_conf->framerate / 1000 != 0) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Framerate %d was divided by 1000: %d\n", video_data_conf->framerate, video_data_conf->framerate/1000));
-			video_data_conf->framerate = video_data_conf->framerate / 1000;
-		}
-
-		if (video_data_conf->framerate <= 1 || video_data_conf->framerate > 1000) {
-			video_data_conf->framerate = num / den;
-			if (video_data_conf->framerate / 1000 != 0) {
-				video_data_conf->framerate = video_data_conf->framerate / 1000;
-			}
-		}
-	}
-
-	if (video_data_conf->framerate <= 1 || video_data_conf->framerate > 1000) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Invalid input framerate %d (AVCTX timebase is %d/%d).\n", video_data_conf->framerate, codec_ctx->time_base.num, codec_ctx->time_base.den));
-		return -1;
-	}
-
-	video_data_conf->time_base = video_input_file->av_fmt_ctx->streamsvideo_input_file->vstream_idx->time_base;
-	video_input_file->mode = mode;
-	video_input_file->no_loop = no_loop;
-	video_input_file->nb_consumers = nb_consumers;
-	return 0;
-}
-
-int dc_video_decoder_read(VideoInputFile *video_input_file, VideoInputData *video_input_data, int source_number, int use_source_timing, int is_live_capture, const int *exit_signal_addr)
-{
-#ifdef DASHCAST_DEBUG_TIME_
-	struct timeval start, end;
-	long elapsed_time;
-#endif
-	AVPacket packet;
-	int ret, got_frame, already_locked = 0;
-	AVCodecContext *codec_ctx;
-	VideoDataNode *video_data_node;
-
-	/* Get a pointer to the codec context for the video stream */
-	codec_ctx = video_input_file->av_fmt_ctx->streamsvideo_input_file->vstream_idx->codec;
-
-	/* Read frames */
-	while (1) {
-#ifdef DASHCAST_DEBUG_TIME_
-		gf_gettimeofday(&start, NULL);
-#endif
-		memset(&packet, 0, sizeof(AVPacket));
-		ret = av_read_frame(video_input_file->av_fmt_ctx, &packet);
-#ifdef DASHCAST_DEBUG_TIME_
-		gf_gettimeofday(&end, NULL);
-		elapsed_time = (end.tv_sec * 1000000 + end.tv_usec) - (start.tv_sec * 1000000 + start.tv_usec);
-		fprintf(stdout, "fps: %f\n", 1000000.0/elapsed_time);
-#endif
-
-		/* If we demux for the audio thread, send the packet to the audio */
-		if (video_input_file->av_fmt_ctx_ref_cnt && ((packet.stream_index != video_input_file->vstream_idx) || (ret == AVERROR_EOF))) {
-			AVPacket *packet_copy = NULL;
-			if (ret != AVERROR_EOF) {
-				GF_SAFEALLOC(packet_copy, AVPacket);
-				if (packet_copy)
-					memcpy(packet_copy, &packet, sizeof(AVPacket));
-			}
-
-			assert(video_input_file->av_pkt_list);
-			gf_mx_p(video_input_file->av_pkt_list_mutex);
-			gf_list_add(video_input_file->av_pkt_list, packet_copy);
-			gf_mx_v(video_input_file->av_pkt_list_mutex);
-
-			if (ret != AVERROR_EOF) {
-				continue;
-			}
-		}
-
-		if (ret == AVERROR_EOF) {
-			if (video_input_file->mode == LIVE_MEDIA && video_input_file->no_loop == 0) {
-				av_seek_frame(video_input_file->av_fmt_ctx, video_input_file->vstream_idx, 0, 0);
-				av_free_packet(&packet);
-				continue;
-			}
-
-			dc_producer_lock(&video_input_data->producer, &video_input_data->circular_buf);
-			dc_producer_unlock_previous(&video_input_data->producer, &video_input_data->circular_buf);
-			video_data_node = (VideoDataNode *) dc_producer_produce(&video_input_data->producer, &video_input_data->circular_buf);
-			video_data_node->source_number = source_number;
-			/* Flush decoder */
-			memset(&packet, 0, sizeof(AVPacket));
-#ifndef FF_API_AVFRAME_LAVC
-			avcodec_get_frame_defaults(video_data_node->vframe);
-#else
-			av_frame_unref(video_data_node->vframe);
-#endif
-
-			avcodec_decode_video2(codec_ctx, video_data_node->vframe, &got_frame, &packet);
-			if (got_frame) {
-				dc_producer_advance(&video_input_data->producer, &video_input_data->circular_buf);
-				return 0;
-			}
-
-			dc_producer_end_signal(&video_input_data->producer, &video_input_data->circular_buf);
-			dc_producer_unlock(&video_input_data->producer, &video_input_data->circular_buf);
-			return -2;
-		}
-		else if (ret < 0)
-		{
-			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Cannot read video frame.\n"));
-			continue;
-		}
-
-		/* Is this a packet from the video stream? */
-		if (packet.stream_index == video_input_file->vstream_idx) {
-			u32 nb_retry = 10;
-			while (!already_locked) {
-				if (dc_producer_lock(&video_input_data->producer, &video_input_data->circular_buf) < 0) {
-					if (!nb_retry) break;
-					gf_sleep(10);
-					nb_retry--;
-					continue;
-				}
-				dc_producer_unlock_previous(&video_input_data->producer, &video_input_data->circular_buf);
-				already_locked = 1;
-			}
-			if (!already_locked) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("dashcast Live system dropped a video frame\n"));
-				continue;
-			}
-
-			video_data_node = (VideoDataNode *) dc_producer_produce(&video_input_data->producer, &video_input_data->circular_buf);
-			video_data_node->source_number = source_number;
-
-			/* Set video frame to default */
-#ifndef FF_API_AVFRAME_LAVC
-			avcodec_get_frame_defaults(video_data_node->vframe);
-#else
-			av_frame_unref(video_data_node->vframe);
-#endif
-
-			video_data_node->frame_ntp = gf_net_get_ntp_ts();
-			video_data_node->frame_utc = gf_net_get_utc();
-
-			/* Decode video frame */
-			if (avcodec_decode_video2(codec_ctx, video_data_node->vframe, &got_frame, &packet) < 0) {
-				av_free_packet(&packet);
-				GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Error while decoding video.\n"));
-				dc_producer_end_signal(&video_input_data->producer, &video_input_data->circular_buf);
-				dc_producer_unlock(&video_input_data->producer, &video_input_data->circular_buf);
-				return -1;
-			}
-
-			/* Did we get a video frame? */
-			if (got_frame) {
-				if (use_source_timing && is_live_capture) {
-					u64 pts;
-					if (video_input_file->pts_init == 0) {
-						video_input_file->pts_init = 1;
-						video_input_file->utc_at_init = gf_net_get_utc();
-						video_input_file->first_pts = packet.pts;
-						video_input_file->prev_pts = 0;
-						video_input_data->frame_duration = 0;
-					}
-#if 0
-					if (video_input_file->pts_init && (video_input_file->pts_init!=3) ) {
-						if (packet.pts==AV_NOPTS_VALUE) {
-							video_input_file->pts_init=1;
-						} else if (video_input_file->pts_init==1) {
-							video_input_file->pts_init=2;
-							video_input_file->pts_dur_estimate = packet.pts;
-						} else if (video_input_file->pts_init==2) {
-							video_input_file->pts_init=3;
-							video_input_data->frame_duration = packet.pts - video_input_file->pts_dur_estimate;
-							video_input_file->sync_tolerance = 9*video_input_data->frame_duration/5;
-							//TODO - check with audio if sync is OK
-						}
-					}
-#endif
-
-					//move to 0-based PTS
-					if (packet.pts!=AV_NOPTS_VALUE) {
-						pts = packet.pts - video_input_file->first_pts;
-					} else {
-						pts = video_input_file->prev_pts + video_input_data->frame_duration;
-					}
-
-					//check for drop frames
-#ifndef GPAC_DISABLE_LOG
-					if (0 && gf_log_tool_level_on(GF_LOG_DASH, GF_LOG_WARNING)) {
-						if (pts - video_input_file->prev_pts > video_input_file->sync_tolerance) {
-							u32 nb_lost=0;
-							while (video_input_file->prev_pts + video_input_data->frame_duration + video_input_file->sync_tolerance < pts) {
-								video_input_file->prev_pts += video_input_data->frame_duration;
-								nb_lost++;
-							}
-							if (nb_lost) {
-								GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("DashCast Capture lost %d video frames \n", nb_lost));
-							}
-						}
-					}
-#endif
-
-					if ((pts != video_input_file->prev_pts) && (video_input_file->pts_init == 1)) {
-						video_input_file->pts_init = 2;
-						video_input_data->frame_duration = pts - video_input_file->prev_pts;
-						video_input_file->sync_tolerance = 9*video_input_data->frame_duration/5;
-					}
-
-					video_input_file->prev_pts = pts;
-					video_data_node->vframe->pts = pts;
-				}
-
-				if (video_data_node->vframe->pts==AV_NOPTS_VALUE) {
-					if (!use_source_timing) {
-						video_data_node->vframe->pts = video_input_file->frame_decoded;
-					} else {
-						video_data_node->vframe->pts = video_data_node->vframe->pkt_pts;
-					}
-				}
-				video_input_file->frame_decoded++;
-
-				GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("DashCast Video Frame TS "LLU" decoded at UTC "LLU" ms (frame duration %d)\n", video_data_node->vframe->pts, gf_net_get_utc(), video_input_data->frame_duration));
-
-				// For a decode/encode process we must free this memory.
-				//But if the input is raw and there is no need to decode then
-				// the packet is directly passed for decoded frame. We must wait until rescale is done before freeing it
-
-				if (codec_ctx->codec->id == CODEC_ID_RAWVIDEO) {
-					if (is_live_capture && !video_input_data->frame_duration) {
-					} else {
-						video_data_node->nb_raw_frames_ref = video_input_file->nb_consumers;
-
-						video_data_node->raw_packet = packet;
-
-						dc_producer_advance(&video_input_data->producer, &video_input_data->circular_buf);
-						while (video_data_node->nb_raw_frames_ref && ! *exit_signal_addr) {
-							gf_sleep(0);
-						}
-					}
-				} else {
-					dc_producer_advance(&video_input_data->producer, &video_input_data->circular_buf);
-					av_free_packet(&packet);
-				}
-				return 0;
-
-			}
-		}
-
-		/* Free the packet that was allocated by av_read_frame */
-		av_free_packet(&packet);
-	}
-
-	GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Unknown error while reading video frame.\n"));
-	return -1;
-}
-
-void dc_video_decoder_close(VideoInputFile *video_input_file)
-{
-	/* Close the video format context */
-	if (!video_input_file->av_fmt_ctx_ref_cnt)
-		avformat_close_input(&video_input_file->av_fmt_ctx);
-
-	video_input_file->av_pkt_list = NULL;
-	video_input_file->av_pkt_list_mutex = NULL;
-}

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/dashcast/video_decoder.h Deleted

@@ -1,97 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Arash Shafiei
- *			Copyright (c) Telecom ParisTech 2000-2013
- *					All rights reserved
- *
- *  This file is part of GPAC / dashcast
- *
- *  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.
- *
- */
-
-#ifndef VIDEO_DECODER_H_
-#define VIDEO_DECODER_H_
-
-#include "video_data.h"
-
-#include "libavformat/avformat.h"
-#include "libavdevice/avdevice.h"
-
-
-/*
- * The structure which keeps the data of
- * input video file.
- */
-typedef struct {
-	/* Format context structure provided by avlib to open and read from a media file. */
-	AVFormatContext *av_fmt_ctx;
-	/* A reference counter on the format context (may be shared with other sources). Currently redundant with av_pkt_list non-NULLness. */
-	int av_fmt_ctx_ref_cnt;
-	/* A list of AVPackets and return value to be processed: when this parameter is non-null,
-	 * the video thread makes the demux and pushes the packets. Packets must be freed when retrieved.*/
-	GF_List  *av_pkt_list;
-	GF_Mutex *av_pkt_list_mutex;
-	/* The index of the video stream in the file. */
-	int vstream_idx;
-	/* video width, height, and pixel format. */
-	int width;
-	int height;
-	int pix_fmt;
-	AVRational sar;
-
-	int mode;
-	int no_loop, nb_consumers;
-
-	u32 frame_decoded;
-	u32 pts_init;
-	u64 first_pts, prev_pts, pts_dur_estimate, sync_tolerance;
-	u64 utc_at_init;
-} VideoInputFile;
-
-/*
- * Open the input video
- *
- * @param cmd_data in contains information about the file name
- * and the video format.
- *
- * @param video_input_file out pointer to the structure which we want to
- * open the file
- *
- * @return 0 on success -1 on failure.
- */
-int dc_video_decoder_open(VideoInputFile *video_input_file, VideoDataConf *video_data_conf, int mode, int no_loop, int nb_consumers);
-
-/*
- * Read and decode video and put decoded frames on circular buffer
- *
- * @param video_input_file in contains info on input video.
- * @param video_input_data out the decoded samples will be put
- * on the circular buffer of this parameter.
- *
- * @return 0 on success, -1 on failure, -2 on EOF (end of the file)
- */
-int dc_video_decoder_read(VideoInputFile *video_input_file, VideoInputData *video_input_data, int source_number, int use_source_timing, int is_live_capture, const int *exit_signal_addr);
-
-/*
- * Close the input video
- *
- * @param video_input_file in the video file to be closed
- *
- */
-void dc_video_decoder_close(VideoInputFile *);
-
-#endif /* VIDEO_DECODER_H_ */

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/dashcast/video_encoder.c Deleted

@@ -1,294 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Arash Shafiei
- *			Copyright (c) Telecom ParisTech 2000-2013
- *					All rights reserved
- *
- *  This file is part of GPAC / dashcast
- *
- *  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 "video_encoder.h"
-#include "libavutil/opt.h"
-#include "libavdevice/avdevice.h"
-
-
-#if (defined(WIN32) || defined(_WIN32_WCE)) && !defined(__GNUC__)
-
-#define _TOSTR(_val) #_val
-#define TOSTR(_val) _TOSTR(_val)
-
-#endif
-
-
-//#define DEBUG 1
-
-
-/**
- * A function which pushes argument to a libav codec using its private data.
- * param priv_data
- * param options a list of space separated and ':' affected options (e.g. "a:b c:d e:f"). @options be non NULL.
- */
-void build_dict(void *priv_data, const char *options) {
-	char *opt = gf_strdup(options);
-	char *tok = strtok(opt, "=");
-	char *tokval = NULL;
-	while (tok && (tokval=strtok(NULL, " "))) {
-		if (av_opt_set(priv_data, tok, tokval, 0) < 0)
-			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Unknown custom option \"%s\" with value \"%s\" in %s\n", tok, tokval, options));
-		tok = strtok(NULL, "=");
-	}
-	gf_free(opt);
-}
-
-int dc_video_encoder_open(VideoOutputFile *video_output_file, VideoDataConf *video_data_conf, Bool use_source_timing, AVRational sar)
-{
-	video_output_file->vbuf_size = 9 * video_data_conf->width * video_data_conf->height + 10000;
-	video_output_file->vbuf = (uint8_t *) av_malloc(video_output_file->vbuf_size);
-	video_output_file->video_data_conf = video_data_conf;
-
-	video_output_file->codec = avcodec_find_encoder_by_name(video_data_conf->codec);
-	if (video_output_file->codec == NULL) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Output video codec %s not found\n", video_data_conf->codec));
-		return -1;
-	}
-
-	video_output_file->codec_ctx = avcodec_alloc_context3(video_output_file->codec);
-
-	video_output_file->codec_ctx->codec_id = video_output_file->codec->id;
-	video_output_file->codec_ctx->codec_type = AVMEDIA_TYPE_VIDEO;
-	video_output_file->codec_ctx->bit_rate = video_data_conf->bitrate;
-	video_output_file->codec_ctx->width = video_data_conf->width;
-	video_output_file->codec_ctx->height = video_data_conf->height;
-	video_output_file->codec_ctx->sample_aspect_ratio = sar;
-
-	video_output_file->codec_ctx->time_base.num = 1;
-	video_output_file->codec_ctx->time_base.den = video_output_file->gop_size ? video_output_file->gop_size : video_data_conf->framerate;
-
-	video_output_file->use_source_timing = use_source_timing;
-	if (use_source_timing) {
-		//for avcodec to do rate allocation, we need to have ctx->timebase == 1/framerate
-		video_output_file->codec_ctx->time_base.den = video_data_conf->time_base.den;
-		video_output_file->codec_ctx->time_base.num = video_data_conf->time_base.num * video_data_conf->time_base.den / video_data_conf->framerate;
-	}
-	video_output_file->codec_ctx->pix_fmt = PIX_FMT_YUV420P;
-	video_output_file->codec_ctx->gop_size = video_data_conf->framerate;
-
-//	video_output_file->codec_ctx->codec_id = video_codec->id;
-//	video_output_file->codec_ctx->codec_type = AVMEDIA_TYPE_VIDEO;
-//	video_output_file->codec_ctx->bit_rate = video_data_conf->bitrate;
-//	video_output_file->codec_ctx->width = video_data_conf->width;
-//	video_output_file->codec_ctx->height = video_data_conf->height;
-//	video_output_file->codec_ctx->time_base = (AVRational) {1 ,
-//				video_output_file->video_data_conf->framerate};
-//	video_output_file->codec_ctx->codec->pix_fmt = PIX_FMT_YUV420P;
-	video_output_file->codec_ctx->gop_size = video_data_conf->framerate;
-//
-//	av_opt_set(video_output_file->codec_ctx->priv_data, "preset", "ultrafast", 0);
-//	av_opt_set(video_output_file->codec_ctx->priv_data, "tune", "zerolatency", 0);
-
-	/*
-	 video_output_file->codec_ctx->max_b_frames = 0;
-	 video_output_file->codec_ctx->thread_count = 1;
-	 video_output_file->codec_ctx->delay = 0;
-	 video_output_file->codec_ctx->rc_lookahead = 0;
-	 */
-
-	/*
-	 * video_stream->codec->gosize = video_output_file->vfr;
-	 * videoStream->codec->gosize = 1;
-	 * video_stream->codec->rc_lookahead = 0;
-	 * videoStream->time_base = (AVRational) {1 , 1000000};
-	 * videoStream->r_frame_rate = (AVRational) {outVideoCtx->video_framerate, 1};
-	 * av_opt_set(videoStream->codec->priv_data, "preset", "slow", 0);
-	 * videoStream->codec->me_range = 16;
-	 * videoStream->codec->max_qdiff = 4;
-	 * videoStream->codec->qmin = 10;
-	 * videoStream->codec->qmax = 51;
-	 * videoStream->codec->qcompress = 0.6;
-	 * videoStream->codec->profile = FF_PROFILE_H264_BASELINE;
-	 * videoStream->codec->level = 10;
-	 *
-	 */
-
-	if ( strlen(video_data_conf->custom) ) {
-		build_dict(video_output_file->codec_ctx->priv_data, video_data_conf->custom);
-	} else if (video_data_conf->low_delay) {
-		GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("Video Encoder: applying default options (preset=ultrafast tune=zerolatency)\n"));
-		av_opt_set(video_output_file->codec_ctx->priv_data, "vprofile", "baseline", 0);
-		av_opt_set(video_output_file->codec_ctx->priv_data, "preset", "ultrafast", 0);
-		av_opt_set(video_output_file->codec_ctx->priv_data, "tune", "zerolatency", 0);
-		if (strstr(video_data_conf->codec, "264")) {
-			av_opt_set(video_output_file->codec_ctx->priv_data, "x264opts", "no-mbtree:sliced-threads:sync-lookahead=0", 0);
-		}
-	}
-
-	if (video_output_file->gdr) {
-		av_opt_set_int(video_output_file->codec_ctx->priv_data, "intra-refresh", 1, 0);
-		av_opt_set_int(video_output_file->codec_ctx->priv_data, "key-int", video_output_file->gdr, 0);
-	}
-
-#ifdef AV_CODEC_FLAG_GLOBAL_HEADER
-	//the global header gives access to the extradata (SPS/PPS)
-	video_output_file->codec_ctx->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
-#endif
-
-	video_output_file->vstream_idx = 0;//video_stream->index;
-
-	/* open the video codec - options are passed thru video_output_file->codec_ctx->priv_data */
-	if (avcodec_open2(video_output_file->codec_ctx, video_output_file->codec, NULL) < 0) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Cannot open output video codec\n"));
-		return -1;
-	}
-
-	video_output_file->rep_id = video_data_conf->filename;
-	return 0;
-}
-
-int dc_video_encoder_encode(VideoOutputFile *video_output_file, VideoScaledData *video_scaled_data)
-{
-	VideoScaledDataNode *video_data_node;
-	int ret;
-	u64 time_spent;
-	int got_packet = 0;
-	AVPacket pkt;
-	
-	AVCodecContext *video_codec_ctx = video_output_file->codec_ctx;
-
-	//FIXME: deadlock when pressing 'q' with BigBuckBunny_640x360.m4v
-	ret = dc_consumer_lock(&video_output_file->consumer, &video_scaled_data->circular_buf);
-	if (ret < 0) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Video encoder got an end of buffer!\n"));
-		return -2;
-	}
-
-	if (video_scaled_data->circular_buf.size > 1)
-		dc_consumer_unlock_previous(&video_output_file->consumer, &video_scaled_data->circular_buf);
-
-	video_data_node = (VideoScaledDataNode*)dc_consumer_consume(&video_output_file->consumer, &video_scaled_data->circular_buf);
-
-	/*
-	 * Set PTS (method 1)
-	 */
-	if (!video_output_file->use_source_timing) {
-		video_data_node->vframe->pts = video_codec_ctx->frame_number;
-	}
-
-	time_spent = gf_sys_clock_high_res();
-	/* Encoding video */
-	av_init_packet(&pkt);
-	pkt.data = video_output_file->vbuf;
-	pkt.size = video_output_file->vbuf_size;
-	pkt.pts = pkt.dts = video_data_node->vframe->pkt_dts = video_data_node->vframe->pkt_pts = video_data_node->vframe->pts;
-	video_data_node->vframe->pict_type = 0;
-	video_data_node->vframe->width = video_codec_ctx->width;
-	video_data_node->vframe->height = video_codec_ctx->height;
-	video_data_node->vframe->format = video_codec_ctx->pix_fmt;
-
-
-#ifdef LIBAV_ENCODE_OLD
-	if (!video_output_file->segment_started)
-		video_data_node->vframe->pict_type = FF_I_TYPE;
-
-	video_output_file->encoded_frame_size = avcodec_encode_video(video_codec_ctx, video_output_file->vbuf, video_output_file->vbuf_size, video_data_node->vframe);
-	got_packet = video_output_file->encoded_frame_size>=0 ? 1 : 0;
-#else
-	//this is correct but unfortunately doesn't work with some versions of FFMPEG (output is just grey video ...)
-	if (!video_output_file->segment_started)
-		video_data_node->vframe->pict_type = AV_PICTURE_TYPE_I;
-
-	video_output_file->encoded_frame_size = avcodec_encode_video2(video_codec_ctx, &pkt, video_data_node->vframe, &got_packet);
-#endif
-
-	time_spent = gf_sys_clock_high_res() - time_spent;
-	//this is not true with libav !
-#ifndef GPAC_USE_LIBAV
-	if (video_output_file->encoded_frame_size >= 0)
-		video_output_file->encoded_frame_size = pkt.size;
-#else
-	if (got_packet)
-		video_output_file->encoded_frame_size = pkt.size;
-#endif
-	if (video_output_file->encoded_frame_size >= 0) {
-		if (got_packet) {
-			video_codec_ctx->coded_frame->pts = video_codec_ctx->coded_frame->pkt_pts = pkt.pts;
-			video_codec_ctx->coded_frame->pkt_dts = pkt.dts;
-			video_codec_ctx->coded_frame->key_frame = (pkt.flags & AV_PKT_FLAG_KEY) ? 1 : 0;
-			video_output_file->frame_ntp = video_data_node->frame_ntp;
-			video_output_file->frame_utc = video_data_node->frame_utc;
-
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("DashCast Video %s Frame TS "LLU" encoded at UTC "LLU" ms in "LLU" us size %d bytes\n", video_output_file->rep_id, pkt.pts, gf_net_get_utc(), time_spent, video_output_file->encoded_frame_size ));
-		}
-	}
-
-	dc_consumer_advance(&video_output_file->consumer);
-
-	if (video_scaled_data->circular_buf.size == 1)
-		dc_consumer_unlock_previous(&video_output_file->consumer, &video_scaled_data->circular_buf);
-
-	if (video_output_file->encoded_frame_size < 0) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Error occured while encoding video frame.\n"));
-		return -1;
-	}
-
-	/* if zero size, it means the image was buffered */
-//	if (out_size > 0) {
-//		av_init_packet(&pkt);
-//		pkt.data = NULL;
-//		pkt.size = 0;
-//
-//		if (video_codec_ctx->coded_frame->pts != AV_NOPTS_VALUE) {
-//			pkt.pts = av_rescale_q(video_codec_ctx->coded_frame->pts,
-//					video_codec_ctx->time_base, video_stream->time_base);
-//		}
-//
-//
-//		if (video_codec_ctx->coded_frame->key_frame)
-//			pkt.flags |= AV_PKT_FLAG_KEY;
-//
-//		pkt.stream_index = video_stream->index;
-//		pkt.data = video_output_file->vbuf;
-//		pkt.size = out_size;
-//
-//		// write the compressed frame in the media file
-//		if (av_interleaved_write_frame(video_output_file->av_fmt_ctx, &pkt)
-//				!= 0) {
-//			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Writing frame is not successful\n"));
-//			return -1;
-//		}
-//
-//		av_free_packet(&pkt);
-//
-//	}
-
-	return video_output_file->encoded_frame_size;
-}
-
-void dc_video_encoder_close(VideoOutputFile *video_output_file)
-{
-//	int i;
-//
-//	// free the streams
-//	for (i = 0; i < video_output_file->av_fmt_ctx->nb_streams; i++) {
-//		avcodec_close(video_output_file->av_fmt_ctx->streamsi->codec);
-//		av_freep(&video_output_file->av_fmt_ctx->streamsi->info);
-//	}
-	av_free(video_output_file->vbuf);
-	avcodec_close(video_output_file->codec_ctx);
-	av_free(video_output_file->codec_ctx);
-}

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/dashcast/video_encoder.h Deleted

@@ -1,63 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Arash Shafiei
- *			Copyright (c) Telecom ParisTech 2000-2013
- *					All rights reserved
- *
- *  This file is part of GPAC / dashcast
- *
- *  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.
- *
- */
-
-#ifndef VIDEO_ENCODER_H_
-#define VIDEO_ENCODER_H_
-
-#include "video_muxer.h"
-
-
-/*
- * Open an video stream
- *
- * @param video_output_file in add a video stream to the file
- * with the parameters already passed to open_video_output
- *
- * @return 0 on success, -1 on failure
- */
-int dc_video_encoder_open(VideoOutputFile *video_output_file, VideoDataConf *video_data_conf, Bool use_source_timing, AVRational sar);
-
-/*
- * Read the decoded video frames from circular buffer
- * of the corresponding resolution
- * and encode and write them on the output file
- *
- * @param video_output_file in video output file
- * @param video_scaled_data in scaled video data structure which
- * contains a circular buffer with video frames
- *
- * @return 0 on success, -1 on failure, -2 on finishing;
- * when there is no more data on circular buffer to encode
- */
-int dc_video_encoder_encode(VideoOutputFile *video_output_file, VideoScaledData *video_scaled_data);
-
-/*
- * Close the output video file
- *
- * @param video_output_file in video output file
- */
-void dc_video_encoder_close(VideoOutputFile *video_output_file);
-
-#endif /* VIDEO_ENCODER_H_ */

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/dashcast/video_muxer.c Deleted

@@ -1,979 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Arash Shafiei
- *			Copyright (c) Telecom ParisTech 2000-2013
- *					All rights reserved
- *
- *  This file is part of GPAC / dashcast
- *
- *  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 "video_muxer.h"
-#include "libavutil/opt.h"
-#include <gpac/network.h>
-
-
-/**
- * A function which takes FFmpeg H264 extradata (SPS/PPS) and bring them ready to be pushed to the MP4 muxer.
- * @param extradata
- * @param extradata_size
- * @param dstcfg
- * @returns GF_OK is the extradata was parsed and is valid, other values otherwise.
- */
-static GF_Err avc_import_ffextradata(const u8 *extradata, const u64 extradata_size, GF_AVCConfig *dstcfg)
-{
-#ifdef GPAC_DISABLE_AV_PARSERS
-	return GF_OK;
-#else
-	u8 nal_size;
-	AVCState avc;
-	GF_BitStream *bs;
-	if (!extradata || (extradata_size < sizeof(u32)))
-		return GF_BAD_PARAM;
-	bs = gf_bs_new((const char *) extradata, extradata_size, GF_BITSTREAM_READ);
-	if (!bs)
-		return GF_BAD_PARAM;
-	if (gf_bs_read_u32(bs) != 0x00000001) {
-		gf_bs_del(bs);
-		return GF_BAD_PARAM;
-	}
-
-	//SPS
-	{
-		s32 idx;
-		char *buffer = NULL;
-		const u64 nal_start = 4;
-		nal_size = gf_media_nalu_next_start_code_bs(bs);
-		if (nal_start + nal_size > extradata_size) {
-			gf_bs_del(bs);
-			return GF_BAD_PARAM;
-		}
-		buffer = (char*)gf_malloc(nal_size);
-		gf_bs_read_data(bs, buffer, nal_size);
-		gf_bs_seek(bs, nal_start);
-		if ((gf_bs_read_u8(bs) & 0x1F) != GF_AVC_NALU_SEQ_PARAM) {
-			gf_bs_del(bs);
-			gf_free(buffer);
-			return GF_BAD_PARAM;
-		}
-
-		idx = gf_media_avc_read_sps(buffer, nal_size, &avc, 0, NULL);
-		if (idx < 0) {
-			gf_bs_del(bs);
-			gf_free(buffer);
-			return GF_BAD_PARAM;
-		}
-
-		dstcfg->configurationVersion = 1;
-		dstcfg->profile_compatibility = avc.spsidx.prof_compat;
-		dstcfg->AVCProfileIndication = avc.spsidx.profile_idc;
-		dstcfg->AVCLevelIndication = avc.spsidx.level_idc;
-		dstcfg->chroma_format = avc.spsidx.chroma_format;
-		dstcfg->luma_bit_depth = 8 + avc.spsidx.luma_bit_depth_m8;
-		dstcfg->chroma_bit_depth = 8 + avc.spsidx.chroma_bit_depth_m8;
-
-		{
-			GF_AVCConfigSlot *slc = (GF_AVCConfigSlot*)gf_malloc(sizeof(GF_AVCConfigSlot));
-			slc->size = nal_size;
-			slc->id = idx;
-			slc->data = buffer;
-			gf_list_add(dstcfg->sequenceParameterSets, slc);
-		}
-	}
-
-	//PPS
-	{
-		s32 idx;
-		char *buffer = NULL;
-		const u64 nal_start = 4 + nal_size + 4;
-		gf_bs_seek(bs, nal_start);
-		nal_size = gf_media_nalu_next_start_code_bs(bs);
-		if (nal_start + nal_size > extradata_size) {
-			gf_bs_del(bs);
-			return GF_BAD_PARAM;
-		}
-		buffer = (char*)gf_malloc(nal_size);
-		gf_bs_read_data(bs, buffer, nal_size);
-		gf_bs_seek(bs, nal_start);
-		if ((gf_bs_read_u8(bs) & 0x1F) != GF_AVC_NALU_PIC_PARAM) {
-			gf_bs_del(bs);
-			gf_free(buffer);
-			return GF_BAD_PARAM;
-		}
-
-		idx = gf_media_avc_read_pps(buffer, nal_size, &avc);
-		if (idx < 0) {
-			gf_bs_del(bs);
-			gf_free(buffer);
-			return GF_BAD_PARAM;
-		}
-
-		{
-			GF_AVCConfigSlot *slc = (GF_AVCConfigSlot*)gf_malloc(sizeof(GF_AVCConfigSlot));
-			slc->size = nal_size;
-			slc->id = idx;
-			slc->data = buffer;
-			gf_list_add(dstcfg->pictureParameterSets, slc);
-		}
-	}
-
-	gf_bs_del(bs);
-	return GF_OK;
-#endif
-}
-
-/**
- * A function which takes FFmpeg H265 extradata (SPS/PPS) and bring them ready to be pushed to the MP4 muxer.
- * @param extradata
- * @param extradata_size
- * @param dstcfg
- * @returns GF_OK is the extradata was parsed and is valid, other values otherwise.
- */
-static GF_Err hevc_import_ffextradata(const u8 *extradata, const u64 extradata_size, GF_HEVCConfig *dst_cfg)
-{
-#ifdef GPAC_DISABLE_AV_PARSERS
-	return GF_OK;
-#else
-	HEVCState hevc;
-	GF_HEVCParamArray *vpss = NULL, *spss = NULL, *ppss = NULL, *seis = NULL;
-	GF_BitStream *bs;
-	char *buffer = NULL;
-	u32 buffer_size = 0;
-	if (!extradata || (extradata_size < sizeof(u32)))
-		return GF_BAD_PARAM;
-	bs = gf_bs_new((const char *) extradata, extradata_size, GF_BITSTREAM_READ);
-	if (!bs)
-		return GF_BAD_PARAM;
-
-	memset(&hevc, 0, sizeof(HEVCState));
-	hevc.sps_active_idx = -1;
-
-	while (gf_bs_available(bs)) {
-		s32 idx;
-		GF_AVCConfigSlot *slc;
-		u8 nal_unit_type, temporal_id, layer_id;
-		u64 nal_start, start_code;
-		u32 nal_size;
-
-		start_code = gf_bs_read_u32(bs);
-		if (start_code>>8 == 0x000001) {
-			nal_start = gf_bs_get_position(bs) - 1;
-			gf_bs_seek(bs, nal_start);
-			start_code = 1;
-		}
-		if (start_code != 0x00000001) {
-			gf_bs_del(bs);
-			if (buffer) gf_free(buffer);
-			if (vpss && spss && ppss) return GF_OK;
-			return GF_BAD_PARAM;
-		}
-		nal_start = gf_bs_get_position(bs);
-		nal_size = gf_media_nalu_next_start_code_bs(bs);
-		if (nal_start + nal_size > extradata_size) {
-			gf_bs_del(bs);
-			return GF_BAD_PARAM;
-		}
-
-		if (nal_size > buffer_size) {
-			buffer = (char*)gf_realloc(buffer, nal_size);
-			buffer_size = nal_size;
-		}
-		gf_bs_read_data(bs, buffer, nal_size);
-
-		gf_media_hevc_parse_nalu(buffer, nal_size, &hevc, &nal_unit_type, &temporal_id, &layer_id);
-		if (layer_id) {
-			gf_bs_del(bs);
-			gf_free(buffer);
-			return GF_BAD_PARAM;
-		}
-
-		switch (nal_unit_type) {
-		case GF_HEVC_NALU_VID_PARAM:
-			idx = gf_media_hevc_read_vps(buffer, nal_size , &hevc);
-			if (idx < 0) {
-				gf_bs_del(bs);
-				gf_free(buffer);
-				return GF_BAD_PARAM;
-			}
-
-			assert(hevc.vpsidx.state == 1); //we don't expect multiple VPS
-			if (hevc.vpsidx.state == 1) {
-				hevc.vpsidx.state = 2;
-				hevc.vpsidx.crc = gf_crc_32(buffer, nal_size);
-
-				dst_cfg->avgFrameRate = hevc.vpsidx.rates0.avg_pic_rate;
-				dst_cfg->constantFrameRate = hevc.vpsidx.rates0.constand_pic_rate_idc;
-				dst_cfg->numTemporalLayers = hevc.vpsidx.max_sub_layers;
-				dst_cfg->temporalIdNested = hevc.vpsidx.temporal_id_nesting;
-
-				if (!vpss) {
-					GF_SAFEALLOC(vpss, GF_HEVCParamArray);
-					if (vpss) {
-						vpss->nalus = gf_list_new();
-						gf_list_add(dst_cfg->param_array, vpss);
-						vpss->array_completeness = 1;
-						vpss->type = GF_HEVC_NALU_VID_PARAM;
-					}
-				}
-
-				slc = (GF_AVCConfigSlot*)gf_malloc(sizeof(GF_AVCConfigSlot));
-				if (slc) {
-					slc->size = nal_size;
-					slc->id = idx;
-					slc->data = (char*)gf_malloc(sizeof(char)*slc->size);
-					if (slc->data)
-						memcpy(slc->data, buffer, sizeof(char)*slc->size);
-
-					if (vpss)
-						gf_list_add(vpss->nalus, slc);
-				}
-			}
-			break;
-		case GF_HEVC_NALU_SEQ_PARAM:
-			idx = gf_media_hevc_read_sps(buffer, nal_size, &hevc);
-			if (idx < 0) {
-				gf_bs_del(bs);
-				gf_free(buffer);
-				return GF_BAD_PARAM;
-			}
-
-			assert(!(hevc.spsidx.state & AVC_SPS_DECLARED)); //we don't expect multiple SPS
-			if ((hevc.spsidx.state & AVC_SPS_PARSED) && !(hevc.spsidx.state & AVC_SPS_DECLARED)) {
-				hevc.spsidx.state |= AVC_SPS_DECLARED;
-				hevc.spsidx.crc = gf_crc_32(buffer, nal_size);
-			}
-
-			dst_cfg->configurationVersion = 1;
-			dst_cfg->profile_space = hevc.spsidx.ptl.profile_space;
-			dst_cfg->tier_flag = hevc.spsidx.ptl.tier_flag;
-			dst_cfg->profile_idc = hevc.spsidx.ptl.profile_idc;
-			dst_cfg->general_profile_compatibility_flags = hevc.spsidx.ptl.profile_compatibility_flag;
-			dst_cfg->progressive_source_flag = hevc.spsidx.ptl.general_progressive_source_flag;
-			dst_cfg->interlaced_source_flag = hevc.spsidx.ptl.general_interlaced_source_flag;
-			dst_cfg->non_packed_constraint_flag = hevc.spsidx.ptl.general_non_packed_constraint_flag;
-			dst_cfg->frame_only_constraint_flag = hevc.spsidx.ptl.general_frame_only_constraint_flag;
-
-			dst_cfg->constraint_indicator_flags = hevc.spsidx.ptl.general_reserved_44bits;
-			dst_cfg->level_idc = hevc.spsidx.ptl.level_idc;
-
-			dst_cfg->chromaFormat = hevc.spsidx.chroma_format_idc;
-			dst_cfg->luma_bit_depth = hevc.spsidx.bit_depth_luma;
-			dst_cfg->chroma_bit_depth = hevc.spsidx.bit_depth_chroma;
-
-			if (!spss) {
-				GF_SAFEALLOC(spss, GF_HEVCParamArray);
-				if (spss) {
-					spss->nalus = gf_list_new();
-					gf_list_add(dst_cfg->param_array, spss);
-					spss->array_completeness = 1;
-					spss->type = GF_HEVC_NALU_SEQ_PARAM;
-				}
-			}
-
-			slc = (GF_AVCConfigSlot*)gf_malloc(sizeof(GF_AVCConfigSlot));
-			if (slc) {
-				slc->size = nal_size;
-				slc->id = idx;
-				slc->data = (char*)gf_malloc(sizeof(char)*slc->size);
-				if (slc->data)
-					memcpy(slc->data, buffer, sizeof(char)*slc->size);
-				if (spss)
-					gf_list_add(spss->nalus, slc);
-			}
-			break;
-		case GF_HEVC_NALU_PIC_PARAM:
-			idx = gf_media_hevc_read_pps(buffer, nal_size, &hevc);
-			if (idx < 0) {
-				gf_bs_del(bs);
-				gf_free(buffer);
-				return GF_BAD_PARAM;
-			}
-
-			assert(hevc.ppsidx.state == 1); //we don't expect multiple PPS
-			if (hevc.ppsidx.state == 1) {
-				hevc.ppsidx.state = 2;
-				hevc.ppsidx.crc = gf_crc_32(buffer, nal_size);
-
-				if (!ppss) {
-					GF_SAFEALLOC(ppss, GF_HEVCParamArray);
-					if (ppss) {
-						ppss->nalus = gf_list_new();
-						gf_list_add(dst_cfg->param_array, ppss);
-						ppss->array_completeness = 1;
-						ppss->type = GF_HEVC_NALU_PIC_PARAM;
-					}
-				}
-
-				slc = (GF_AVCConfigSlot*)gf_malloc(sizeof(GF_AVCConfigSlot));
-				if (slc) {
-					slc->size = nal_size;
-					slc->id = idx;
-					slc->data = (char*)gf_malloc(sizeof(char)*slc->size);
-					if (slc->data)
-						memcpy(slc->data, buffer, sizeof(char)*slc->size);
-
-					if (ppss)
-						gf_list_add(ppss->nalus, slc);
-				}
-			}
-			break;
-		case GF_HEVC_NALU_SEI_PREFIX:
-			if (!seis) {
-				GF_SAFEALLOC(seis, GF_HEVCParamArray);
-				if (seis) {
-					seis->nalus = gf_list_new();
-					seis->array_completeness = 0;
-					seis->type = GF_HEVC_NALU_SEI_PREFIX;
-				}
-			}
-			slc = (GF_AVCConfigSlot*)gf_malloc(sizeof(GF_AVCConfigSlot));
-			if (slc) {
-				slc->size = nal_size;
-				slc->data = (char*)gf_malloc(sizeof(char)*slc->size);
-				if (slc->data)
-					memcpy(slc->data, buffer, sizeof(char)*slc->size);
-				if (seis)
-					gf_list_add(seis->nalus, slc);
-			}
-			break;
-		default:
-			break;
-		}
-	}
-
-	gf_bs_del(bs);
-	if (buffer) gf_free(buffer);
-
-	return GF_OK;
-#endif
-}
-
-#ifndef GPAC_DISABLE_ISOM
-
-static GF_Err dc_gpac_video_write_config(VideoOutputFile *video_output_file, u32 *di, u32 track) {
-	GF_Err ret;
-	if (video_output_file->codec_ctx->codec_id == CODEC_ID_H264) {
-		GF_AVCConfig *avccfg;
-		avccfg = gf_odf_avc_cfg_new();
-		if (!avccfg) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Cannot create AVCConfig\n"));
-			return GF_OUT_OF_MEM;
-		}
-
-		ret = avc_import_ffextradata(video_output_file->codec_ctx->extradata, video_output_file->codec_ctx->extradata_size, avccfg);
-		if (ret != GF_OK) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Cannot parse AVC/H264 SPS/PPS\n"));
-			gf_odf_avc_cfg_del(avccfg);
-			return ret;
-		}
-
-		ret = gf_isom_avc_config_new(video_output_file->isof, track, avccfg, NULL, NULL, di);
-		if (ret != GF_OK) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("%s: gf_isom_avc_config_new\n", gf_error_to_string(ret)));
-			return ret;
-		}
-
-		gf_odf_avc_cfg_del(avccfg);
-
-		//inband SPS/PPS
-		if (video_output_file->muxer_type == GPAC_INIT_VIDEO_MUXER_AVC3) {
-			ret = gf_isom_avc_set_inband_config(video_output_file->isof, track, 1);
-			if (ret != GF_OK) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("%s: gf_isom_avc_set_inband_config\n", gf_error_to_string(ret)));
-				return ret;
-			}
-		}
-	} else if (!strcmp(video_output_file->codec_ctx->codec->name, "libx265")) { //FIXME CODEC_ID_HEVC would break on old releases
-		GF_HEVCConfig *hevccfg = gf_odf_hevc_cfg_new();
-		if (!hevccfg) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Cannot create HEVCConfig\n"));
-			return GF_OUT_OF_MEM;
-		}
-
-		ret = hevc_import_ffextradata(video_output_file->codec_ctx->extradata, video_output_file->codec_ctx->extradata_size, hevccfg);
-		if (ret != GF_OK) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Cannot parse HEVC/H265 SPS/PPS\n"));
-			gf_odf_hevc_cfg_del(hevccfg);
-			return ret;
-		}
-
-		ret = gf_isom_hevc_config_new(video_output_file->isof, track, hevccfg, NULL, NULL, di);
-		if (ret != GF_OK) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("%s: gf_isom_hevc_config_new\n", gf_error_to_string(ret)));
-			return ret;
-		}
-
-		gf_odf_hevc_cfg_del(hevccfg);
-
-		//inband SPS/PPS
-		if (video_output_file->muxer_type == GPAC_INIT_VIDEO_MUXER_AVC3) {
-			ret = gf_isom_hevc_set_inband_config(video_output_file->isof, track, 1);
-			if (ret != GF_OK) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("%s: gf_isom_hevc_set_inband_config\n", gf_error_to_string(ret)));
-				return ret;
-			}
-		}
-	}
-
-	return GF_OK;
-}
-
-int dc_gpac_video_moov_create(VideoOutputFile *video_output_file, char *filename)
-{
-	GF_Err ret;
-	AVCodecContext *video_codec_ctx = video_output_file->codec_ctx;
-	u32 di=1, track;
-
-	//TODO: For the moment it is fixed
-	//u32 sample_dur = video_output_file->codec_ctx->time_base.den;
-
-	//int64_t profile = 0;
-	//av_opt_get_int(video_output_file->codec_ctx->priv_data, "level", AV_OPT_SEARCH_CHILDREN, &profile);
-
-	video_output_file->isof = gf_isom_open(filename, GF_ISOM_OPEN_WRITE, NULL);
-	if (!video_output_file->isof) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Cannot open iso file %s\n", filename));
-		return -1;
-	}
-	//gf_isom_store_movie_config(video_output_file->isof, 0);
-	track = gf_isom_new_track(video_output_file->isof, 0, GF_ISOM_MEDIA_VISUAL, video_codec_ctx->time_base.den);
-	video_output_file->trackID = gf_isom_get_track_id(video_output_file->isof, track);
-
-	video_output_file->timescale = video_codec_ctx->time_base.den;
-	if (!video_output_file->frame_dur)
-		video_output_file->frame_dur = video_codec_ctx->time_base.num;
-
-	if (!track) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Cannot create new track\n"));
-		return -1;
-	}
-
-	ret = gf_isom_set_track_enabled(video_output_file->isof, track, 1);
-	if (ret != GF_OK) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("%s: gf_isom_set_track_enabled\n", gf_error_to_string(ret)));
-		return -1;
-	}
-
-	ret = dc_gpac_video_write_config(video_output_file, &di, track);
-	if (ret != GF_OK) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("%s: dc_gpac_video_write_config\n", gf_error_to_string(ret)));
-		return -1;
-	}
-
-	gf_isom_set_visual_info(video_output_file->isof, track, di, video_codec_ctx->width, video_codec_ctx->height);
-	gf_isom_set_sync_table(video_output_file->isof, track);
-
-	ret = gf_isom_setup_track_fragment(video_output_file->isof, track, 1, video_output_file->use_source_timing ? (u32) video_output_file->frame_dur : 1, 0, 0, 0, 0, 0);
-	if (ret != GF_OK) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("%s: gf_isom_setup_track_fragment\n", gf_error_to_string(ret)));
-		return -1;
-	}
-
-	ret = gf_isom_finalize_for_fragment(video_output_file->isof, track);
-	if (ret != GF_OK) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("%s: gf_isom_finalize_for_fragment\n", gf_error_to_string(ret)));
-		return -1;
-	}
-
-	ret = gf_media_get_rfc_6381_codec_name(video_output_file->isof, track, video_output_file->video_data_conf->codec6381, GF_FALSE, GF_FALSE);
-	if (ret != GF_OK) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("%s: gf_isom_finalize_for_fragment\n", gf_error_to_string(ret)));
-		return -1;
-	}
-
-	return 0;
-}
-
-int dc_gpac_video_isom_open_seg(VideoOutputFile *video_output_file, char *filename)
-{
-	GF_Err ret;
-	ret = gf_isom_start_segment(video_output_file->isof, filename, 1);
-	if (ret != GF_OK) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("%s: gf_isom_start_segment\n", gf_error_to_string(ret)));
-		return -1;
-	}
-	GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("DashCast Opening new segment %s at UTC "LLU" ms\n", filename, gf_net_get_utc() ));
-	return 0;
-}
-
-int dc_gpac_video_isom_write(VideoOutputFile *video_output_file)
-{
-	GF_Err ret;
-	AVCodecContext *video_codec_ctx = video_output_file->codec_ctx;
-
-	u32 sc_size = 0;
-	u32 nalu_size = 0;
-
-	u32 buf_len = video_output_file->encoded_frame_size;
-	u8 *buf_ptr = video_output_file->vbuf;
-
-	GF_BitStream *out_bs = gf_bs_new(NULL, 2 * buf_len, GF_BITSTREAM_WRITE);
-	nalu_size = gf_media_nalu_next_start_code(buf_ptr, buf_len, &sc_size);
-	if (nalu_size != 0) {
-		gf_bs_write_u32(out_bs, nalu_size);
-		gf_bs_write_data(out_bs, (const char*) buf_ptr, nalu_size);
-	}
-	if (sc_size) {
-		buf_ptr += (nalu_size + sc_size);
-		buf_len -= (nalu_size + sc_size);
-	}
-
-	while (buf_len) {
-		nalu_size = gf_media_nalu_next_start_code(buf_ptr, buf_len, &sc_size);
-		if (nalu_size != 0) {
-			gf_bs_write_u32(out_bs, nalu_size);
-			gf_bs_write_data(out_bs, (const char*) buf_ptr, nalu_size);
-		}
-
-		buf_ptr += nalu_size;
-
-		if (!sc_size || (buf_len < nalu_size + sc_size))
-			break;
-		buf_len -= nalu_size + sc_size;
-		buf_ptr += sc_size;
-	}
-
-	gf_bs_get_content(out_bs, &video_output_file->sample->data, &video_output_file->sample->dataLength);
-	//video_output_file->sample->data = //(char *) (video_output_file->vbuf + nalu_size + sc_size);
-	//video_output_file->sample->dataLength = //video_output_file->encoded_frame_size - (sc_size + nalu_size);
-
-	video_output_file->sample->DTS = video_codec_ctx->coded_frame->pkt_dts;
-	video_output_file->sample->CTS_Offset = (s32) (video_codec_ctx->coded_frame->pts - video_output_file->sample->DTS);
-	video_output_file->sample->IsRAP = video_codec_ctx->coded_frame->key_frame;
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("Isom Write: RAP %d , DTS "LLD" CTS offset %d \n", video_output_file->sample->IsRAP, video_output_file->sample->DTS, video_output_file->sample->CTS_Offset));
-
-	ret = gf_isom_fragment_add_sample(video_output_file->isof, video_output_file->trackID, video_output_file->sample, 1, video_output_file->use_source_timing ? (u32) video_output_file->frame_dur : 1, 0, 0, 0);
-	if (ret != GF_OK) {
-		gf_bs_del(out_bs);
-		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("%s: gf_isom_fragment_add_sample\n", gf_error_to_string(ret)));
-		return -1;
-	}
-
-	//free data but keep sample structure alive
-	gf_free(video_output_file->sample->data);
-	video_output_file->sample->data = NULL;
-	video_output_file->sample->dataLength = 0;
-
-	gf_bs_del(out_bs);
-	return 0;
-}
-
-int dc_gpac_video_isom_close_seg(VideoOutputFile *video_output_file)
-{
-	u64 seg_size;
-	GF_Err ret = gf_isom_close_segment(video_output_file->isof, 0, 0, 0, 0, 0, 0, 0, GF_TRUE, GF_FALSE, video_output_file->seg_marker, NULL, NULL, &seg_size);
-	if (ret != GF_OK) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("%s: gf_isom_close_segment\n", gf_error_to_string(ret)));
-		return -1;
-	}
-	GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("DashCast Rep %s Closing segment %s at UTC "LLU" ms - size "LLU" bytes\n", video_output_file->rep_id, gf_isom_get_segment_name(video_output_file->isof), gf_net_get_utc(), seg_size ));
-
-	return 0;
-}
-
-int dc_gpac_video_isom_close(VideoOutputFile *video_output_file)
-{
-	GF_Err ret;
-	ret = gf_isom_close(video_output_file->isof);
-	if (ret != GF_OK) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("%s: gf_isom_close\n", gf_error_to_string(ret)));
-		return -1;
-	}
-
-	return 0;
-}
-
-#endif
-
-
-int dc_raw_h264_open(VideoOutputFile *video_output_file, char *filename)
-{
-	video_output_file->file = gf_fopen(filename, "w");
-	return 0;
-}
-
-int dc_raw_h264_write(VideoOutputFile *video_output_file)
-{
-	fwrite(video_output_file->vbuf, video_output_file->encoded_frame_size, 1, video_output_file->file);
-	return 0;
-}
-
-int dc_raw_h264_close(VideoOutputFile *video_output_file)
-{
-	gf_fclose(video_output_file->file);
-	return 0;
-}
-
-int dc_ffmpeg_video_muxer_open(VideoOutputFile *video_output_file, char *filename)
-{
-	AVStream *video_stream;
-	AVOutputFormat *output_fmt;
-	int ret;
-
-	AVCodecContext *video_codec_ctx = video_output_file->codec_ctx;
-	video_output_file->av_fmt_ctx = NULL;
-
-//	video_output_file->vbr = video_data_conf->bitrate;
-//	video_output_file->vfr = video_data_conf->framerate;
-//	video_output_file->width = video_data_conf->width;
-//	video_output_file->height = video_data_conf->height;
-//	strcpy(video_output_file->filename, video_data_conf->filename);
-//	strcpy(video_output_file->codec, video_data_conf->codec);
-
-	/* Find output format */
-	output_fmt = av_guess_format(NULL, filename, NULL);
-	if (!output_fmt) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Cannot find suitable output format\n"));
-		return -1;
-	}
-
-	video_output_file->av_fmt_ctx = avformat_alloc_context();
-	if (!video_output_file->av_fmt_ctx) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Cannot allocate memory for pOutVideoFormatCtx\n"));
-		return -1;
-	}
-
-	video_output_file->av_fmt_ctx->oformat = output_fmt;
-	strcpy(video_output_file->av_fmt_ctx->filename, filename);
-
-	/* Open the output file */
-	if (!(output_fmt->flags & AVFMT_NOFILE)) {
-		if (avio_open(&video_output_file->av_fmt_ctx->pb, filename, URL_WRONLY) < 0) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Cannot not open '%s'\n", filename));
-			return -1;
-		}
-	}
-
-	video_stream = avformat_new_stream(video_output_file->av_fmt_ctx,
-	                                   video_output_file->codec);
-	if (!video_stream) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Cannot create output video stream\n"));
-		return -1;
-	}
-
-	//video_stream->codec = video_output_file->codec_ctx;
-
-	video_stream->codec->codec_id = video_output_file->codec->id;
-	video_stream->codec->codec_type = AVMEDIA_TYPE_VIDEO;
-	video_stream->codec->bit_rate = video_codec_ctx->bit_rate; //video_output_file->video_data_conf->bitrate;
-	video_stream->codec->width = video_codec_ctx->width; //video_output_file->video_data_conf->width;
-	video_stream->codec->height = video_codec_ctx->height; //video_output_file->video_data_conf->height;
-
-	video_stream->codec->time_base = video_codec_ctx->time_base;
-
-	video_stream->codec->pix_fmt = PIX_FMT_YUV420P;
-	video_stream->codec->gop_size = video_codec_ctx->time_base.den; //video_output_file->video_data_conf->framerate;
-
-	av_opt_set(video_stream->codec->priv_data, "preset", "ultrafast", 0);
-	av_opt_set(video_stream->codec->priv_data, "tune", "zerolatency", 0);
-
-	/* open the video codec */
-	if (avcodec_open2(video_stream->codec, video_output_file->codec, NULL) < 0) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Cannot open output video codec\n"));
-		return -1;
-	}
-
-	ret = avformat_write_header(video_output_file->av_fmt_ctx, NULL);
-
-	if (!ret) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("avformat_write_header returned %d\n", ret));
-		return ret;
-	}
-
-	video_output_file->timescale = video_codec_ctx->time_base.den;
-	return 0;
-}
-
-int dc_ffmpeg_video_muxer_write(VideoOutputFile *video_output_file)
-{
-	AVPacket pkt;
-	AVStream *video_stream = video_output_file->av_fmt_ctx->streamsvideo_output_file->vstream_idx;
-	AVCodecContext *video_codec_ctx = video_stream->codec;
-
-	av_init_packet(&pkt);
-	pkt.data = NULL;
-	pkt.size = 0;
-
-	if (video_codec_ctx->coded_frame->pts != AV_NOPTS_VALUE) {
-		pkt.pts = av_rescale_q(video_codec_ctx->coded_frame->pts, video_codec_ctx->time_base, video_stream->time_base);
-	}
-
-	if (video_codec_ctx->coded_frame->key_frame)
-		pkt.flags |= AV_PKT_FLAG_KEY;
-
-	pkt.stream_index = video_stream->index;
-	pkt.data = video_output_file->vbuf;
-	pkt.size = video_output_file->encoded_frame_size;
-
-	// write the compressed frame in the media file
-	if (av_interleaved_write_frame(video_output_file->av_fmt_ctx, &pkt) != 0) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Writing frame is not successful\n"));
-		return -1;
-	}
-
-	av_free_packet(&pkt);
-
-	return 0;
-}
-
-int dc_ffmpeg_video_muxer_close(VideoOutputFile *video_output_file)
-{
-	u32 i;
-
-	av_write_trailer(video_output_file->av_fmt_ctx);
-
-	avio_close(video_output_file->av_fmt_ctx->pb);
-
-	// free the streams
-	for (i = 0; i < video_output_file->av_fmt_ctx->nb_streams; i++) {
-		avcodec_close(video_output_file->av_fmt_ctx->streamsi->codec);
-		av_freep(&video_output_file->av_fmt_ctx->streamsi->info);
-	}
-
-	//video_output_file->av_fmt_ctx->streamsvideo_output_file->vstream_idx->codec = NULL;
-	avformat_free_context(video_output_file->av_fmt_ctx);
-
-	return 0;
-}
-
-int dc_video_muxer_init(VideoOutputFile *video_output_file, VideoDataConf *video_data_conf, VideoMuxerType muxer_type, int frame_per_segment, int frame_per_fragment, u32 seg_marker, int gdr, int seg_dur, int frag_dur, int frame_dur, int gop_size, int video_cb_size)
-{
-	char nameGF_MAX_PATH;
-	memset(video_output_file, 0, sizeof(VideoOutputFile));
-	snprintf(name, sizeof(name), "video encoder %s", video_data_conf->filename);
-	dc_consumer_init(&video_output_file->consumer, video_cb_size, name);
-
-#ifndef GPAC_DISABLE_ISOM
-	video_output_file->sample = gf_isom_sample_new();
-	video_output_file->isof = NULL;
-#endif
-
-	video_output_file->muxer_type = muxer_type;
-
-	video_output_file->frame_per_segment = frame_per_segment;
-	video_output_file->frame_per_fragment = frame_per_fragment;
-
-	video_output_file->seg_dur = seg_dur;
-	video_output_file->frag_dur = frag_dur;
-
-	video_output_file->seg_marker = seg_marker;
-	video_output_file->gdr = gdr;
-	video_output_file->gop_size = gop_size;
-	video_output_file->frame_dur = frame_dur;
-
-	return 0;
-}
-
-int dc_video_muxer_free(VideoOutputFile *video_output_file)
-{
-#ifndef GPAC_DISABLE_ISOM
-	if (video_output_file->isof != NULL) {
-		gf_isom_close(video_output_file->isof);
-	}
-
-	gf_isom_sample_del(&video_output_file->sample);
-#endif
-	return 0;
-}
-
-GF_Err dc_video_muxer_open(VideoOutputFile *video_output_file, char *directory, char *id_name, int seg)
-{
-	char nameGF_MAX_PATH;
-
-	switch (video_output_file->muxer_type) {
-	case FFMPEG_VIDEO_MUXER:
-		snprintf(name, sizeof(name), "%s/%s_%d_ffmpeg.mp4", directory, id_name, seg);
-		return dc_ffmpeg_video_muxer_open(video_output_file, name);
-	case RAW_VIDEO_H264:
-		snprintf(name, sizeof(name), "%s/%s_%d.264", directory, id_name, seg);
-		return dc_raw_h264_open(video_output_file, name);
-#ifndef GPAC_DISABLE_ISOM
-	case GPAC_VIDEO_MUXER:
-		snprintf(name, sizeof(name), "%s/%s_%d_gpac.mp4", directory, id_name, seg);
-		dc_gpac_video_moov_create(video_output_file, name);
-		return dc_gpac_video_isom_open_seg(video_output_file, NULL);
-	case GPAC_INIT_VIDEO_MUXER_AVC1:
-		if (seg == 1) {
-			snprintf(name, sizeof(name), "%s/%s_init_gpac.mp4", directory, id_name);
-			dc_gpac_video_moov_create(video_output_file, name);
-			video_output_file->first_dts_in_fragment = 0;
-		}
-		snprintf(name, sizeof(name), "%s/%s_%d_gpac.m4s", directory, id_name, seg);
-		return dc_gpac_video_isom_open_seg(video_output_file, name);
-	case GPAC_INIT_VIDEO_MUXER_AVC3:
-		if (seg == 0) {
-			snprintf(name, sizeof(name), "%s/%s_init_gpac.mp4", directory, id_name);
-			dc_gpac_video_moov_create(video_output_file, name);
-			video_output_file->first_dts_in_fragment = 0;
-		}
-		snprintf(name, sizeof(name), "%s/%s_%d_gpac.m4s", directory, id_name, seg);
-		return dc_gpac_video_isom_open_seg(video_output_file, name);
-#endif
-	default:
-		return GF_BAD_PARAM;
-	};
-
-	return -2;
-}
-
-int dc_video_muxer_write(VideoOutputFile *video_output_file, int frame_nb, Bool insert_ntp)
-{
-	Bool segment_close = GF_FALSE;
-	Bool fragment_close = GF_FALSE;
-	switch (video_output_file->muxer_type) {
-	case FFMPEG_VIDEO_MUXER:
-		return dc_ffmpeg_video_muxer_write(video_output_file);
-	case RAW_VIDEO_H264:
-		return dc_raw_h264_write(video_output_file);
-#ifndef GPAC_DISABLE_ISOM
-	case GPAC_VIDEO_MUXER:
-	case GPAC_INIT_VIDEO_MUXER_AVC1:
-	case GPAC_INIT_VIDEO_MUXER_AVC3:
-		if (video_output_file->use_source_timing) {
-			GF_Err ret;
-			if (!video_output_file->fragment_started) {
-				video_output_file->fragment_started = 1;
-				ret = gf_isom_start_fragment(video_output_file->isof, 1);
-				if (ret < 0)
-					return -1;
-
-
-				//insert UTC for each fragment
-				if (insert_ntp) {
-					gf_isom_set_fragment_reference_time(video_output_file->isof, video_output_file->trackID, video_output_file->frame_ntp, video_output_file->codec_ctx->coded_frame->pts);
-				}
-
-				video_output_file->first_dts_in_fragment = video_output_file->codec_ctx->coded_frame->pkt_dts;
-				if (!video_output_file->segment_started) {
-					video_output_file->pts_at_segment_start = video_output_file->codec_ctx->coded_frame->pts;
-					video_output_file->segment_started = 1;
-					if (!video_output_file->nb_segments) {
-						video_output_file->pts_at_first_segment = video_output_file->pts_at_segment_start;
-					}
-
-#ifndef GPAC_DISABLE_LOG
-					if (insert_ntp && gf_log_tool_level_on(GF_LOG_DASH, GF_LOG_INFO)) {
-						if (!video_output_file->ntp_at_first_dts) {
-							video_output_file->ntp_at_first_dts = video_output_file->frame_ntp;
-						} else {
-							s32 ntp_diff = gf_net_get_ntp_diff_ms(video_output_file->ntp_at_first_dts);
-							s32 ts_diff = (s32) ( 1000 * (video_output_file->codec_ctx->coded_frame->pts - video_output_file->pts_at_first_segment) / video_output_file->timescale );
-
-							s32 diff_ms = ts_diff - ntp_diff;
-							GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("DashCast Video Segment start NTP diff: %d ms TS diff: %d ms drift: %d ms\n", ntp_diff, ts_diff, diff_ms));
-						}
-					}
-#endif
-				}
-				gf_isom_set_traf_base_media_decode_time(video_output_file->isof, video_output_file->trackID, video_output_file->first_dts_in_fragment);
-			}
-
-			if (dc_gpac_video_isom_write(video_output_file) < 0) {
-				return -1;
-			}
-			video_output_file->last_pts = video_output_file->codec_ctx->coded_frame->pts;
-			video_output_file->last_dts = video_output_file->codec_ctx->coded_frame->pkt_dts;
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("DashCast PTS: "LLU", DTS: "LLU", first DTS in frag: "LLU", timescale: %d, frag dur: %d\n", video_output_file->last_pts, video_output_file->last_dts, video_output_file->first_dts_in_fragment, video_output_file->timescale, video_output_file->frag_dur));
-
-			//we may have rounding errors on the input PTS :( add half frame dur safety
-			//flush segments based on the cumultated duration , to avoid drift
-			/* Check why segment tests work on PTS while fragment tests work on DTS ? */
-			/* Check why fragment closing is not tested based on accumulation of fragment duration to avoid drifts */
-			segment_close =  ((video_output_file->last_pts - video_output_file->pts_at_first_segment + video_output_file->frame_dur) * 1000 >=
-			                  (video_output_file->nb_segments+1)*video_output_file->seg_dur * (u64)video_output_file->timescale);
-#if 0
-			segment_close =  ((video_output_file->last_pts - video_output_file->pts_at_segment_start + 3*video_output_file->frame_dur/2) * 1000 >=
-			                  (video_output_file->seg_dur * (u64)video_output_file->timescale);
-#endif
-			//flush fragment if adding next frame will exceed target duration by half the frame duration
-			                  fragment_close = ((video_output_file->last_dts - video_output_file->first_dts_in_fragment + 3 * video_output_file->frame_dur / 2) * 1000 >=
-			                                    (video_output_file->frag_dur * (u64)video_output_file->timescale));
-
-			if (segment_close || fragment_close) {
-				gf_isom_flush_fragments(video_output_file->isof, 1);
-				video_output_file->fragment_started = 0;
-				GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("DashCast Flushed fragment at UTC "LLU" ms - First DTS "LLU" last PTS "LLU" - First Segment PTS "LLU" timescale %d\n", gf_net_get_utc(), video_output_file->first_dts_in_fragment, video_output_file->codec_ctx->coded_frame->pts, video_output_file->pts_at_segment_start, video_output_file->timescale));
-			}
-
-			if (segment_close) {
-			return 1;
-		}
-		return 0;
-	}
-
-	if (frame_nb % video_output_file->frame_per_fragment == 0) {
-			gf_isom_start_fragment(video_output_file->isof, 1);
-
-			if (!video_output_file->segment_started) {
-				video_output_file->pts_at_segment_start = video_output_file->codec_ctx->coded_frame->pts;
-				video_output_file->segment_started = 1;
-
-				if (insert_ntp) {
-					gf_isom_set_fragment_reference_time(video_output_file->isof, video_output_file->trackID, video_output_file->frame_ntp, video_output_file->pts_at_segment_start);
-				}
-			}
-
-
-			gf_isom_set_traf_base_media_decode_time(video_output_file->isof, video_output_file->trackID, video_output_file->first_dts_in_fragment);
-			video_output_file->first_dts_in_fragment += video_output_file->frame_per_fragment;
-		}
-
-		dc_gpac_video_isom_write(video_output_file);
-
-		if (frame_nb % video_output_file->frame_per_fragment == video_output_file->frame_per_fragment - 1) {
-			gf_isom_flush_fragments(video_output_file->isof, 1);
-			GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("DashCast Flushed fragment to disk at UTC "LLU" ms - last coded frame PTS "LLU"\n", gf_net_get_utc(), video_output_file->codec_ctx->coded_frame->pts));
-		}
-
-		if (frame_nb + 1 == video_output_file->frame_per_segment)
-			return 1;
-
-		return 0;
-#endif
-
-	default:
-		return -2;
-	}
-
-	return -2;
-}
-
-int dc_video_muxer_close(VideoOutputFile *video_output_file)
-{
-	video_output_file->fragment_started = video_output_file->segment_started = 0;
-	video_output_file->nb_segments++;
-
-	switch (video_output_file->muxer_type) {
-	case FFMPEG_VIDEO_MUXER:
-		return dc_ffmpeg_video_muxer_close(video_output_file);
-	case RAW_VIDEO_H264:
-		return dc_raw_h264_close(video_output_file);
-#ifndef GPAC_DISABLE_ISOM
-	case GPAC_VIDEO_MUXER:
-		dc_gpac_video_isom_close_seg(video_output_file);
-		return dc_gpac_video_isom_close(video_output_file);
-	case GPAC_INIT_VIDEO_MUXER_AVC1:
-	case GPAC_INIT_VIDEO_MUXER_AVC3:
-		return dc_gpac_video_isom_close_seg(video_output_file);
-#endif
-	default:
-		return -2;
-	}
-
-	return -2;
-}

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/dashcast/video_muxer.h Deleted

@@ -1,116 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Arash Shafiei
- *			Copyright (c) Telecom ParisTech 2000-2013
- *					All rights reserved
- *
- *  This file is part of GPAC / dashcast
- *
- *  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.
- *
- */
-
-#ifndef VIDEO_MUXER_H_
-#define VIDEO_MUXER_H_
-
-#include "../../modules/ffmpeg_in/ffmpeg_in.h"
-#include "libavformat/avformat.h"
-#include "libavdevice/avdevice.h"
-#include "libswscale/swscale.h"
-#include "libavutil/mathematics.h"
-#include <gpac/isomedia.h>
-#include <gpac/internal/media_dev.h>
-
-#include "video_scaler.h"
-
-typedef enum {
-	FFMPEG_VIDEO_MUXER,
-	RAW_VIDEO_H264,
-	GPAC_VIDEO_MUXER,
-	GPAC_INIT_VIDEO_MUXER_AVC1,
-	GPAC_INIT_VIDEO_MUXER_AVC3
-} VideoMuxerType;
-
-/*
- * VideoOutputFile structure has the data needed to encode video frames and write them on the file.
- * It reads the data from a circular buffer so it needs to keep the index to that circular buffer. This index is
- * available in Consumer data structure.
- */
-typedef struct {
-	VideoDataConf *video_data_conf;
-	VideoMuxerType muxer_type;
-
-	/* file format context structure */
-	AVFormatContext *av_fmt_ctx;
-	AVCodecContext *codec_ctx;
-	AVCodec *codec;
-
-	FILE *file;
-
-#ifndef GPAC_DISABLE_ISOM
-	GF_ISOFile *isof;
-	GF_ISOSample *sample;
-#endif
-
-	u32 trackID;
-	/* Index of the video stream in the file */
-	int vstream_idx;
-	/* keeps the index with which encoder access to the circular buffer (as a consumer) */
-	Consumer consumer;
-
-	/* Variables that encoder needs to encode data */
-	uint8_t *vbuf;
-	int vbuf_size;
-	int encoded_frame_size;
-
-	int frame_per_fragment;
-	int frame_per_segment;
-
-	int seg_dur;
-	int frag_dur;
-
-	u64 first_dts_in_fragment;
-	u64 ntp_at_first_dts;
-
-	u32 seg_marker;
-
-	int gop_size;
-	int gdr;
-
-	Bool use_source_timing;
-
-	u64 pts_at_segment_start, pts_at_first_segment;
-	u64 last_pts, last_dts;
-	u64 frame_dur;
-	u32 timescale;
-	u32 nb_segments;
-	Bool fragment_started, segment_started;
-	const char *rep_id;
-
-	u64 frame_ntp, frame_utc;
-} VideoOutputFile;
-
-int dc_video_muxer_init(VideoOutputFile *video_output_file, VideoDataConf *video_data_conf, VideoMuxerType muxer_type, int frame_per_segment, int frame_per_fragment, u32 seg_marker, int gdr, int seg_dur, int frag_dur, int frame_dur, int gop_size, int video_cb_size);
-
-int dc_video_muxer_free(VideoOutputFile *video_output_file);
-
-int dc_video_muxer_open(VideoOutputFile *video_output_file, char *directory, char *id_name, int seg);
-
-int dc_video_muxer_write(VideoOutputFile *video_output_file, int frame_nb, Bool insert_ntp_timestamp);
-
-int dc_video_muxer_close(VideoOutputFile *video_output_file);
-
-#endif /* VIDEO_MUXER_H_ */

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/dashcast/video_scaler.c Deleted

@@ -1,279 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Arash Shafiei
- *			Copyright (c) Telecom ParisTech 2000-2013
- *					All rights reserved
- *
- *  This file is part of GPAC / dashcast
- *
- *  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 "video_scaler.h"
-
-
-#ifdef GPAC_USE_LIBAV
-#define av_frame_free	av_free
-#endif
-
-VideoScaledDataNode * dc_video_scaler_node_create(int width, int height, int crop_x, int crop_y, int pix_fmt)
-{
-	VideoScaledDataNode *video_scaled_data_node = (VideoScaledDataNode*)gf_malloc(sizeof(VideoDataNode));
-	if (video_scaled_data_node) {
-		video_scaled_data_node->vframe = FF_ALLOC_FRAME();
-		if (crop_x || crop_y) {
-			video_scaled_data_node->cropped_frame = FF_ALLOC_FRAME();
-		} else {
-			video_scaled_data_node->cropped_frame = NULL;
-		}
-	}
-	if (!video_scaled_data_node || !video_scaled_data_node->vframe || ((crop_x || crop_y) && !video_scaled_data_node->cropped_frame)) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Cannot allocate VideoNode!\n"));
-		av_frame_free(&video_scaled_data_node->vframe);
-		av_frame_free(&video_scaled_data_node->cropped_frame);
-		gf_free(video_scaled_data_node);
-		return NULL;
-	}
-
-	/* Determine required buffer size and allocate buffer */
-	avpicture_alloc((AVPicture*)video_scaled_data_node->vframe, pix_fmt, width, height);
-	if (video_scaled_data_node->cropped_frame) {
-		avpicture_alloc((AVPicture*)video_scaled_data_node->cropped_frame, pix_fmt, width-crop_x, height-crop_y);
-	}
-
-	return video_scaled_data_node;
-}
-
-void dc_video_scaler_node_destroy(VideoScaledDataNode *video_scaled_data_node)
-{
-#ifndef GPAC_USE_LIBAV
-	av_frame_free(&video_scaled_data_node->vframe);
-#endif
-	gf_free(video_scaled_data_node);
-}
-
-void dc_video_scaler_list_init(VideoScaledDataList *video_scaled_data_list, GF_List * video_lst)
-{
-	u32 i, j;
-	int found;
-
-	video_scaled_data_list->size = 0;
-	video_scaled_data_list->video_scaled_data = NULL;
-
-	for (i=0; i<gf_list_count(video_lst); i++) {
-		VideoDataConf *video_data_conf = (VideoDataConf*)gf_list_get(video_lst, i);
-		found = 0;
-		for (j=0; j<video_scaled_data_list->size; j++) {
-			if (   video_scaled_data_list->video_scaled_dataj->out_height == video_data_conf->height
-			        && video_scaled_data_list->video_scaled_dataj->out_width  == video_data_conf->width) {
-				found = 1;
-				video_scaled_data_list->video_scaled_dataj->num_consumers++;
-				break;
-			}
-		}
-		if (!found) {
-			VideoScaledData *video_scaled_data;
-			GF_SAFEALLOC(video_scaled_data, VideoScaledData);
-			if (!video_scaled_data) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_APP, ("Cannot allocate video rescaler\n"));
-				return;
-			}
-			video_scaled_data->out_width  = video_data_conf->width;
-			video_scaled_data->out_height = video_data_conf->height;
-			video_scaled_data->num_consumers = 1;
-
-			video_scaled_data_list->video_scaled_data = (VideoScaledData**)gf_realloc(video_scaled_data_list->video_scaled_data, (video_scaled_data_list->size+1)*sizeof(VideoScaledData*));
-
-			video_scaled_data_list->video_scaled_datavideo_scaled_data_list->size = video_scaled_data;
-			video_scaled_data_list->size++;
-		}
-	}
-}
-
-void dc_video_scaler_list_destroy(VideoScaledDataList *video_scaled_data_list)
-{
-	u32 i;
-	for (i=0; i<video_scaled_data_list->size; i++)
-		gf_free(video_scaled_data_list->video_scaled_datai);
-
-	gf_free(video_scaled_data_list->video_scaled_data);
-}
-
-void dc_video_scaler_end_signal(VideoScaledData *video_scaled_data)
-{
-	dc_producer_end_signal(&video_scaled_data->producer, &video_scaled_data->circular_buf);
-	dc_producer_unlock_previous(&video_scaled_data->producer, &video_scaled_data->circular_buf);
-}
-
-int dc_video_scaler_data_init(VideoInputData *video_input_data, VideoScaledData *video_scaled_data, int max_source, int video_cb_size)
-{
-	int i;
-	char nameGF_MAX_PATH;
-	snprintf(name, sizeof(name), "video scaler %dx%d", video_scaled_data->out_width, video_scaled_data->out_height);
-
-	dc_producer_init(&video_scaled_data->producer, video_cb_size, name);
-	dc_consumer_init(&video_scaled_data->consumer, video_cb_size, name);
-
-	video_scaled_data->num_producers = max_source;
-	video_scaled_data->out_pix_fmt = PIX_FMT_YUV420P;
-	GF_SAFE_ALLOC_N(video_scaled_data->vsprop, max_source, VideoScaledProp);
-	memset(video_scaled_data->vsprop, 0, max_source * sizeof(VideoScaledProp));
-
-	dc_circular_buffer_create(&video_scaled_data->circular_buf, video_cb_size, video_input_data->circular_buf.mode, video_scaled_data->num_consumers);
-	for (i=0; i<video_cb_size; i++) {
-		video_scaled_data->circular_buf.listi.data = dc_video_scaler_node_create(video_scaled_data->out_width, video_scaled_data->out_height, video_input_data->vpropi.crop_x, video_input_data->vpropi.crop_y, video_scaled_data->out_pix_fmt);
-	}
-
-	video_scaled_data->vsprop->video_input_data = video_input_data;
-	return 0;
-}
-
-int dc_video_scaler_data_set_prop(VideoInputData *video_input_data, VideoScaledData *video_scaled_data, int index)
-{
-	video_scaled_data->vspropindex.in_width   = video_input_data->vpropindex.width - video_input_data->vpropindex.crop_x;
-	video_scaled_data->vspropindex.in_height  = video_input_data->vpropindex.height - video_input_data->vpropindex.crop_y;
-	video_scaled_data->vspropindex.in_pix_fmt = video_input_data->vpropindex.pix_fmt;
-
-	video_scaled_data->sar  = video_input_data->vpropindex.sar;
-
-	video_scaled_data->vspropindex.sws_ctx = sws_getContext(
-	            video_scaled_data->vspropindex.in_width,
-	            video_scaled_data->vspropindex.in_height,
-	            video_scaled_data->vspropindex.in_pix_fmt,
-	            video_scaled_data->out_width, video_scaled_data->out_height,
-	            video_scaled_data->out_pix_fmt, SWS_FAST_BILINEAR, NULL, NULL, NULL);
-	if (video_scaled_data->vspropindex.sws_ctx == NULL) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Cannot initialize the conversion context!\n"));
-		return -1;
-	}
-
-	return 0;
-}
-
-int dc_video_scaler_scale(VideoInputData *video_input_data, VideoScaledData *video_scaled_data)
-{
-	int ret, index, src_height;
-	VideoDataNode *video_data_node;
-	VideoScaledDataNode *video_scaled_data_node;
-	AVFrame *src_vframe;
-
-	//step 1: try to lock output slot. If none available, return ....
-	if (video_input_data->circular_buf.size > 1)
-		dc_consumer_unlock_previous(&video_scaled_data->consumer, &video_input_data->circular_buf);
-
-	ret = dc_producer_lock(&video_scaled_data->producer, &video_scaled_data->circular_buf);
-	//not ready
-	if (ret<0) {
-		return -1;
-	}
-	dc_producer_unlock_previous(&video_scaled_data->producer, &video_scaled_data->circular_buf);
-
-	//step 2: lock input
-	ret = dc_consumer_lock(&video_scaled_data->consumer, &video_input_data->circular_buf);
-	if (ret < 0) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Video scaler got an end of input tbuffer!\n"));
-		return -2;
-	}
-
-	//step 3 - grab source and dest images
-	video_data_node = (VideoDataNode*)dc_consumer_consume(&video_scaled_data->consumer, &video_input_data->circular_buf);
-	video_scaled_data_node = (VideoScaledDataNode*)dc_producer_produce(&video_scaled_data->producer, &video_scaled_data->circular_buf);
-	index = video_data_node->source_number;
-
-	//crop if necessary
-	if (video_input_data->vpropindex.crop_x || video_input_data->vpropindex.crop_y) {
-#if 0
-		av_frame_copy_props(video_scaled_data_node->cropped_frame, video_data_node->vframe);
-		video_scaled_data_node->cropped_frame->width  = video_input_data->vpropindex.width  - video_input_data->vpropindex.crop_x;
-		video_scaled_data_node->cropped_frame->height = video_input_data->vpropindex.height - video_input_data->vpropindex.crop_y;
-#endif
-		if (av_picture_crop((AVPicture*)video_scaled_data_node->cropped_frame, (AVPicture*)video_data_node->vframe, PIX_FMT_YUV420P, video_input_data->vpropindex.crop_y, video_input_data->vpropindex.crop_x) < 0) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Video scaler: error while cropping picture.\n"));
-			return -1;
-		}
-		src_vframe = video_scaled_data_node->cropped_frame;
-		src_height = video_input_data->vpropindex.height - video_input_data->vpropindex.crop_y;
-	} else {
-		assert(!video_scaled_data_node->cropped_frame);
-		src_vframe = video_data_node->vframe;
-		src_height = video_input_data->vpropindex.height;
-	}
-
-
-	//rescale the cropped frame
-	ret = sws_scale(video_scaled_data->vspropindex.sws_ctx,
-	                (const uint8_t * const *)src_vframe->data, src_vframe->linesize, 0, src_height,
-	                video_scaled_data_node->vframe->data, video_scaled_data_node->vframe->linesize);
-
-	if (!ret) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Video scaler: error while resizing picture.\n"));
-		return -1;
-	}
-	video_scaled_data_node->vframe->pts = video_data_node->vframe->pts;
-	video_scaled_data_node->frame_ntp = video_data_node->frame_ntp;
-	video_scaled_data_node->frame_utc = video_data_node->frame_utc;
-
-
-	if (video_data_node->nb_raw_frames_ref) {
-		if (video_data_node->nb_raw_frames_ref==1) {
-#ifndef GPAC_USE_LIBAV
-			av_frame_unref(video_data_node->vframe);
-#endif
-			av_free_packet(&video_data_node->raw_packet);
-		}
-		video_data_node->nb_raw_frames_ref--;
-	}
-
-	dc_consumer_advance(&video_scaled_data->consumer);
-	dc_producer_advance(&video_scaled_data->producer, &video_scaled_data->circular_buf);
-
-	if (video_input_data->circular_buf.size == 1)
-		dc_consumer_unlock_previous(&video_scaled_data->consumer, &video_input_data->circular_buf);
-	return 0;
-}
-
-int dc_video_scaler_data_destroy(VideoScaledData *video_scaled_data)
-{
-	int i;
-	for (i=0; i<(int) video_scaled_data->circular_buf.size; i++) {
-		if (video_scaled_data->circular_buf.list) {
-			dc_video_scaler_node_destroy(video_scaled_data->circular_buf.listi.data);
-		}
-	}
-
-	for (i=0 ; i<video_scaled_data->num_producers; i++) {
-		if (video_scaled_data->vspropi.sws_ctx)
-			av_free(video_scaled_data->vspropi.sws_ctx);
-	}
-	gf_free(video_scaled_data->vsprop);
-	//av_free(video_scaled_data->sws_ctx);
-
-	dc_circular_buffer_destroy(&video_scaled_data->circular_buf);
-
-	return 0;
-}
-
-VideoScaledData * dc_video_scaler_get_data(VideoScaledDataList *video_scaled_data_list, int width, int height)
-{
-	u32 i;
-	for (i=0; i<video_scaled_data_list->size; i++) {
-		if (video_scaled_data_list->video_scaled_datai->out_width == width && video_scaled_data_list->video_scaled_datai->out_height == height)
-			return video_scaled_data_list->video_scaled_datai;
-	}
-
-	return NULL;
-}

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/dashcast/video_scaler.h Deleted

@@ -1,169 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Arash Shafiei
- *			Copyright (c) Telecom ParisTech 2000-2013
- *					All rights reserved
- *
- *  This file is part of GPAC / dashcast
- *
- *  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.
- *
- */
-
-#ifndef VIDEO_SCALER_H_
-#define VIDEO_SCALER_H_
-
-#include <stdlib.h>
-#include <gpac/list.h>
-
-#include "video_data.h"
-
-
-typedef struct {
-	/* scaler of the libav */
-	struct SwsContext *sws_ctx;
-	/* width, height, and the pixel format of the scaled video */
-	int in_width;
-	int in_height;
-	int in_pix_fmt;
-
-	VideoInputData *video_input_data;
-} VideoScaledProp;
-
-/*
- * VideoScaledData keeps a circular buffer
- * of video frame with a defined resolution.
- */
-typedef struct {
-	VideoScaledProp *vsprop;
-
-	int out_width;
-	int out_height;
-	int out_pix_fmt;
-	AVRational sar;
-
-	/* scaler of the libav */
-	//struct SwsContext * sws_ctx;
-	/* width, height, and the pixel format of the scaled video */
-	//int width;
-	//int height;
-	//int pix_fmt;
-
-	/* circular buffer containing the scaled video frames */
-	CircularBuffer circular_buf;
-
-	/* Scaler is a consumer and also producer.
-	 * It consumes from the video input data and it produces the video scaled data.
-	 * So it deals with two circular buffer and we need to keep the index for both. */
-	Producer producer;
-	Consumer consumer;
-
-	/* The number of consumers of this circular buffer.
-	 * (Which are the encoders who are using this resolution) */
-	int num_consumers;
-	int num_producers;
-} VideoScaledData;
-
-/*
- * Each node in a circular buffer is a pointer.
- * To use the circular buffer for scaled video frame we must define the node. This structure contains the data needed to encode a video frame.
- */
-typedef struct {
-	AVFrame *vframe;
-	AVFrame *cropped_frame;
-	u64 frame_ntp, frame_utc;
-} VideoScaledDataNode;
-
-/*
- * A list of pointers to scaled video data.
- */
-typedef struct {
-	VideoScaledData **video_scaled_data;
-	u32 size;
-} VideoScaledDataList;
-
-/*
- * Read the configuration file info and fill the video scaled data list with all the resolution available.
- * Each resolution is associated to a circular buffer in a video scaled data.
- *
- * @param cmd_data in Command data which contains the configuration file info
- * @param video_scaled_data_list out the list to be filled
- */
-void dc_video_scaler_list_init(VideoScaledDataList *video_scaled_data_list, GF_List *video_lst);
-
-/*
- * Destroy a video scaled data list.
- *
- * @param video_scaled_data_list in the list to be destroyed.
- */
-void dc_video_scaler_list_destroy(VideoScaledDataList *video_scaled_data_list);
-
-/*
- * Signal to all the users of the circular buffer in the VideoScaledData
- * which the current node is the last node to consume.
- *
- * @param video_scaled_data in the structure to be signaled on.
- */
-void dc_video_scaler_end_signal(VideoScaledData *video_scaled_data);
-
-/*
- * Initialize a VideoScaledData.
- *
- * @param video_input_data in contains the info of the input video.
- * @param video_scaled_data out structure to be initialized.
- *
- * @return 0 on success, -1 on failure.
- *
- * @note Must use dc_video_scaler_data_destroy to free memory.
- */
-int dc_video_scaler_data_init(VideoInputData *video_input_data, VideoScaledData *video_scaled_data, int num_producers, int video_cb_size);
-
-/*
- * Set properties of a VideoScaledData.
- */
-int dc_video_scaler_data_set_prop(VideoInputData *video_input_data, VideoScaledData *video_scaled_data, int index);
-
-/*
- * Get a frame from the circular buffer on the input video,
- * scale it and put the result on the circular buffer of the
- * video scaled data
- *
- * @param video_input_data in contains input frames
- * @param video_scaled_data out contains scaled frames
- *
- * return 0 on success, -2 if the node is the last node to scale
- */
-int dc_video_scaler_scale(VideoInputData *video_input_data, VideoScaledData *video_scaled_data);
-
-/*
- * Destroy a VideoScaledData
- *
- * @param video_scaled_data in structure to be destroyed.
- */
-int dc_video_scaler_data_destroy(VideoScaledData *video_scaled_data);
-
-/*
- * Return the VideoScaledData from the list which has width and height
- *
- * @param video_scaled_data_list in video scaled data list
- * @param width in frame width
- * @param height in frame height
- *
- * @return a VideoScaledData which corresponds to the width and height on success, NULL on failure
- */
-VideoScaledData * dc_video_scaler_get_data(VideoScaledDataList *video_scaled_data_list, int width, int height);
-
-#endif /* VIDEO_SCALER_H_ */

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/mp42avi Deleted

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/mp42avi/Makefile Deleted

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/mp42avi/main.c Deleted

@@ -1,768 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2012
- *					All rights reserved
- *
- *  This file is part of GPAC / command-line mp4 toolbox
- *
- *  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/isomedia.h>
-#include <gpac/compositor.h>
-#include <gpac/scenegraph.h>
-#include <gpac/bifs.h>
-#include <gpac/options.h>
-
-#ifdef WIN32
-#include <windows.h>
-#define GPAC_CFG_FILE "GPAC.cfg"
-#else
-#include <pwd.h>
-typedef struct tagBITMAPFILEHEADER
-{
-	u16	bfType;
-	u32	bfSize;
-	u16	bfReserved1;
-	u16	bfReserved2;
-	u32 bfOffBits;
-} BITMAPFILEHEADER;
-
-typedef struct tagBITMAPINFOHEADER {
-	u32	biSize;
-	s32	biWidth;
-	s32	biHeight;
-	u16	biPlanes;
-	u16	biBitCount;
-	u32	biCompression;
-	u32	biSizeImage;
-	s32	biXPelsPerMeter;
-	s32	biYPelsPerMeter;
-	u32	biClrUsed;
-	u32	biClrImportant;
-} BITMAPINFOHEADER;
-
-#define BI_RGB        0L
-
-#define GPAC_CFG_FILE ".gpacrc"
-#endif
-
-#include <gpac/internal/avilib.h>
-#include <gpac/internal/compositor_dev.h>
-
-void PrintVersion()
-{
-	printf ("MP42AVI - GPAC version %s\n", GPAC_FULL_VERSION);
-}
-
-void PrintUsage()
-{
-	printf ("MP42AVI option input\n"
-	        "Dumps BIFS media frames as AVI, BMP or raw\n\n"
-	        "Options\n"
-	        "-fps Framerate: specifies extraction framerate - if not set computed from track length\n"
-	        "-size WxH: forces output BIFS to the given resolution\n"
-	        "-raw frame: uses raw format for output - only dumps one frame if specified\n"
-	        "-bmp frame: uses BMP format for output - only dumps one frame if specified\n"
-	        "-outpath path: specifies where to dump frames/movie\n"
-	        "\n"
-	        "Note: when dumping a frame, either the frame number can be specified or the frame time\n"
-	        "in the format hh:mm:ss:xFz where hh, mm, ss are hours, minutes, seconds, x the number\n"
-	        "of the frame in the seconds and z the frame rate used to express the time\n"
-	        "\n"
-	        "-cfg: specifies path to GPAC config file (GPAC.cfg)\n"
-	        "-v: prints version\n"
-	        "-h: prints this message\n"
-	        "\nWritten by Jean Le Feuvre - (c) 2000-2005\n");
-}
-
-
-typedef struct
-{
-	GF_Compositor *sr;
-	GF_SceneGraph *sg;
-	GF_BifsDecoder *bifs;
-	GF_ISOFile *file;
-
-	u32 track;
-	u64 duration, cts;
-} BIFSVID;
-
-void node_init(void *cbk, GF_Node *node)
-{
-	BIFSVID *b2v = cbk;
-	switch (gf_node_get_tag(node)) {
-	case TAG_MPEG4_Conditional:
-	case TAG_MPEG4_QuantizationParameter:
-		break;
-	default:
-		if (b2v->sr) gf_sc_on_node_init(b2v->sr, node);
-		break;
-	}
-}
-
-void node_modif(void *cbk, GF_Node *node)
-{
-	BIFSVID *b2v = cbk;
-	if (b2v->sr) gf_sc_invalidate(b2v->sr, node);
-}
-
-Double get_scene_time(void *cbk)
-{
-	Double res;
-	BIFSVID *b2v = cbk;
-	res = (Double) (s64) b2v->cts;
-	res /= (Double) (s64) b2v->duration;
-	return res;
-}
-
-void write_bmp(GF_VideoSurface *fb, char *rad_name, u32 img_num)
-{
-	char strGF_MAX_PATH;
-	BITMAPFILEHEADER fh;
-	BITMAPINFOHEADER fi;
-	FILE *fout;
-	u32 j, i;
-	char *ptr;
-
-	if (img_num<10) {
-		sprintf(str, "%s_00%d.bmp", rad_name, img_num);
-	} else if (img_num<100) {
-		sprintf(str, "%s_0%d.bmp", rad_name, img_num);
-	} else {
-		sprintf(str, "%s_%d.bmp", rad_name, img_num);
-	}
-
-	fout = gf_fopen(str, "wb");
-	if (!fout) return;
-
-	memset(&fh, 0, sizeof(fh));
-	fh.bfType = 19778;
-	fh.bfOffBits = 14 + 40;
-
-	memset(&fi, 0, sizeof(char)*40);
-	fi.biSize = sizeof(char)*40;
-	fi.biWidth = fb->width;
-	fi.biHeight = fb->height;
-	fi.biPlanes = 1;
-	fi.biBitCount = 24;
-	fi.biCompression = BI_RGB;
-	fi.biSizeImage = fb->pitch * fb->height;
-
-	/*NOT ALIGNED!!*/
-	gf_fwrite(&fh.bfType, 2, 1, fout);
-	gf_fwrite(&fh.bfSize, 4, 1, fout);
-	gf_fwrite(&fh.bfReserved1, 2, 1, fout);
-	gf_fwrite(&fh.bfReserved2, 2, 1, fout);
-	gf_fwrite(&fh.bfOffBits, 4, 1, fout);
-
-	gf_fwrite(&fi, 1, 40, fout);
-
-	for (j=fb->height; j>0; j--) {
-		ptr = fb->video_buffer + (j-1)*fb->pitch;
-		//gf_fwrite(ptr, 1, fb->width  * 3, fout);
-		for (i=0; i<fb->width; i++) {
-			fputc(ptr2, fout);
-			fputc(ptr1, fout);
-			fputc(ptr0, fout);
-			ptr+=3;
-		}
-	}
-
-	gf_fclose(fout);
-}
-
-
-void write_raw(GF_VideoSurface *fb, char *rad_name, u32 img_num)
-{
-	char strGF_MAX_PATH;
-	FILE *fout;
-	if (img_num<10) {
-		sprintf(str, "%s_00%d.raw", rad_name, img_num);
-	} else if (img_num<100) {
-		sprintf(str, "%s_0%d.raw", rad_name, img_num);
-	} else {
-		sprintf(str, "%s_%d.raw", rad_name, img_num);
-	}
-
-	fout = gf_fopen(str, "wb");
-	if (!fout) return;
-	gf_fwrite(fb->video_buffer , fb->height*fb->pitch, 1, fout);
-	gf_fclose(fout);
-}
-
-void dump_frame(BIFSVID b2v, char *conv_buf, char *out_path, u32 dump_type, avi_t *avi_out, u32 frameNum)
-{
-	u32 k;
-	GF_VideoSurface fb;
-
-	/*lock it*/
-	gf_sc_get_screen_buffer(b2v.sr, &fb);
-	/*export frame*/
-	switch (dump_type) {
-	case 0:
-		/*reverse frame*/
-		for (k=0; k<fb.height; k++) {
-			memcpy(conv_buf + k*fb.width*3, fb.video_buffer + (fb.height-k-1) * fb.pitch, sizeof(char) * fb.width  * 3);
-		}
-		if (AVI_write_frame(avi_out, conv_buf, fb.height*fb.width*3, 1) <0)
-			printf("Error writing frame\n");
-		break;
-	case 2:
-		write_raw(&fb, out_path, frameNum);
-		break;
-	case 1:
-		write_bmp(&fb, out_path, frameNum);
-		break;
-	}
-	/*unlock it*/
-	gf_sc_release_screen_buffer(b2v.sr, &fb);
-}
-
-/*generates an intertwined bmp from a scene file with 5 different viewpoints*/
-void bifs3d_viewpoints_merger(GF_ISOFile *file, char *szConfigFile, u32 width, u32 height, char *rad_name, u32 dump_type, char *out_dir, Double fps, s32 frameID, s32 dump_time)
-{
-	GF_User user;
-	char out_pathGF_MAX_PATH;
-	char old_driv1024;
-	BIFSVID b2v;
-	Bool needs_raw;
-	GF_Err e;
-	GF_VideoSurface fb;
-	unsigned char **rendered_frames;
-	u32 nb_viewpoints = 5;
-	u32 viewpoint_index;
-
-
-	/* Configuration of the Rendering Capabilities */
-	{
-		const char *test;
-		char config_pathGF_MAX_PATH;
-		memset(&user, 0, sizeof(GF_User));
-		user.config = gf_cfg_init(szConfigFile, NULL);
-
-		if (!user.config) {
-			fprintf(stdout, "Error: Configuration File \"%s\" not found in %s\n", GPAC_CFG_FILE, config_path);
-			return;
-		}
-
-		test = gf_cfg_get_key(user.config, "Core", "ModulesDirectory");
-		user.modules = gf_modules_new((const unsigned char *) test, user.config);
-		strcpy(old_driv, "raw_out");
-		if (!gf_modules_get_count(user.modules)) {
-			printf("Error: no modules found\n");
-			goto err_exit;
-		}
-
-		/*switch driver to raw_driver*/
-		test = gf_cfg_get_key(user.config, "core", "video-output");
-		if (test) strcpy(old_driv, test);
-
-		needs_raw = 0;
-		test = gf_cfg_get_key(user.config, "Compositor", "RendererName");
-		/*since we only support RGB24 for MP42AVI force using RAW out with 2D driver*/
-		if (test && strstr(test, "2D")) {
-			needs_raw = 1;
-		}
-	}
-
-	memset(&b2v, 0, sizeof(BIFSVID));
-	user.init_flags = 0;
-	/* Initialization of the compositor */
-	b2v.sr = gf_sc_new(&user, 0, NULL);
-	gf_sc_set_option(b2v.sr, GF_OPT_VISIBLE, 0);
-
-	/* Initialization of the scene graph */
-	b2v.sg = gf_sg_new();
-	gf_sg_set_scene_time_callback(b2v.sg, get_scene_time, &b2v);
-	gf_sg_set_init_callback(b2v.sg, node_init, &b2v);
-	gf_sg_set_modified_callback(b2v.sg, node_modif, &b2v);
-
-	/*load config*/
-	gf_sc_set_option(b2v.sr, GF_OPT_RELOAD_CONFIG, 1);
-
-	{
-		u32 di;
-		u32 track_number;
-		GF_ESD *esd;
-		u16 es_id;
-		b2v.bifs = gf_bifs_decoder_new(b2v.sg, 0);
-
-		for (track_number=0; track_number<gf_isom_get_track_count(file); track_number++) {
-			esd = gf_isom_get_esd(file, track_number+1, 1);
-			if (!esd) continue;
-			if (!esd->dependsOnESID && (esd->decoderConfig->streamType == GF_STREAM_SCENE)) break;
-			gf_odf_desc_del((GF_Descriptor *) esd);
-			esd = NULL;
-		}
-		if (!esd) {
-			printf("no bifs track found\n");
-			goto err_exit;
-		}
-
-		es_id = (u16) gf_isom_get_track_id(file, track_number+1);
-		e = gf_bifs_decoder_configure_stream(b2v.bifs, es_id, esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength, esd->decoderConfig->objectTypeIndication);
-		if (e) {
-			printf("BIFS init error %s\n", gf_error_to_string(e));
-			gf_odf_desc_del((GF_Descriptor *) esd);
-			esd = NULL;
-			goto err_exit;
-		}
-
-		{
-			GF_ISOSample *samp = gf_isom_get_sample(file, track_number+1, 1, &di);
-			b2v.cts = samp->DTS + samp->CTS_Offset;
-			/*apply command*/
-			gf_bifs_decode_au(b2v.bifs, es_id, samp->data, samp->dataLength, ((Double)(s64)b2v.cts)/1000.0);
-			gf_isom_sample_del(&samp);
-		}
-
-		b2v.duration = gf_isom_get_media_duration(file, track_number+1);
-
-		gf_odf_desc_del((GF_Descriptor *) esd);
-
-	}
-	gf_sc_set_scene(b2v.sr, b2v.sg);
-
-	if (!width || !height) {
-		gf_sg_get_scene_size_info(b2v.sg, &width, &height);
-	}
-	/*we work in RGB24, and we must make sure the pitch is %4*/
-	if ((width*3)%4) {
-		printf("Adjusting width (%d) to have a stride multiple of 4\n", width);
-		while ((width*3)%4) width--;
-	}
-	gf_sc_set_size(b2v.sr, width, height);
-	gf_sc_get_screen_buffer(b2v.sr, &fb);
-	width = fb.width;
-	height = fb.height;
-	gf_sc_release_screen_buffer(b2v.sr, &fb);
-
-	GF_SAFEALLOC(rendered_frames, nb_viewpoints*sizeof(char *));
-	for (viewpoint_index = 1; viewpoint_index <= nb_viewpoints; viewpoint_index++) {
-		GF_SAFEALLOC(rendered_framesviewpoint_index-1, fb.width*fb.height*3);
-		gf_sc_set_viewpoint(b2v.sr, viewpoint_index, NULL);
-		gf_sc_draw_frame(b2v.sr, 0, NULL);
-		/*needed for background2D !!*/
-		gf_sc_draw_frame(b2v.sr, 0, NULL);
-		strcpy(out_path, "");
-		if (out_dir) {
-			strcat(out_path, out_dir);
-			if (out_pathstrlen(out_path)-1 != '\\') strcat(out_path, "\\");
-		}
-		strcat(out_path, rad_name);
-		strcat(out_path, "_view");
-		gf_sc_get_screen_buffer(b2v.sr, &fb);
-		write_bmp(&fb, out_path, viewpoint_index);
-		memcpy(rendered_framesviewpoint_index-1, fb.video_buffer, fb.width*fb.height*3);
-		gf_sc_release_screen_buffer(b2v.sr, &fb);
-	}
-
-	if (width != 800 || height != 480) {
-		printf("Wrong scene dimension, cannot produce output\n");
-		goto err_exit;
-	} else {
-		u32 x, y;
-		GF_VideoSurface out_fb;
-		u32 bpp = 3;
-		out_fb.width = 800;
-		out_fb.height = 480;
-		out_fb.pitch = 800*bpp;
-		out_fb.pixel_format = GF_PIXEL_RGB_24;
-		out_fb.is_hardware_memory = 0;
-		GF_SAFEALLOC(out_fb.video_buffer, out_fb.pitch*out_fb.height)
-#if 1
-		for (y=0; y<out_fb.height; y++) {
-			/*starting red pixel is R1, R5, R4, R3, R2, R1, R5, ... when increasing line num*/
-			u32 line_shift = (5-y) % 5;
-			for (x=0; x<out_fb.width; x++) {
-				u32 view_shift = (line_shift+bpp*x)%5;
-				u32 offset = out_fb.pitch*y + x*bpp;
-				/* red */
-				out_fb.video_bufferoffset = rendered_framesview_shiftoffset;
-				/* green */
-				out_fb.video_bufferoffset+1 = rendered_frames(view_shift+1)%5offset+1;
-				/* blue */
-				out_fb.video_bufferoffset+2 = rendered_frames(view_shift+2)%5offset+2;
-			}
-		}
-#else
-		/*calibration*/
-		for (y=0; y<out_fb.height; y++) {
-			u32 line_shift = (5- y%5) % 5;
-			for (x=0; x<out_fb.width; x++) {
-				u32 view_shift = (line_shift+bpp*x)%5;
-				u32 offset = out_fb.pitch*y + x*bpp;
-				out_fb.video_bufferoffset = ((view_shift)%5 == 2) ? 0xFF : 0;
-				out_fb.video_bufferoffset+1 = ((view_shift+1)%5 == 2) ? 0xFF : 0;
-				out_fb.video_bufferoffset+2 = ((view_shift+2)%5 == 2) ? 0xFF : 0;
-			}
-		}
-#endif
-		write_bmp(&out_fb, "output", 0);
-	}
-
-	/*destroy everything*/
-	gf_bifs_decoder_del(b2v.bifs);
-	gf_sg_del(b2v.sg);
-	gf_sc_set_scene(b2v.sr, NULL);
-	gf_sc_del(b2v.sr);
-
-
-
-err_exit:
-	/*	if (rendered_frames) {
-			for (viewpoint_index = 1; viewpoint_index <= nb_viewpoints; viewpoint_index++) {
-				if (rendered_framesviewpoint_index-1) gf_free(rendered_framesviewpoint_index-1);
-			}
-			gf_free(rendered_frames);
-		}
-		if (output_merged_frame) gf_free(output_merged_frame);
-	*/
-	if (user.modules) gf_modules_del(user.modules);
-	if (needs_raw) gf_cfg_set_key(user.config, "core", "video-output", old_driv);
-	gf_cfg_del(user.config);
-}
-
-void bifs_to_vid(GF_ISOFile *file, char *szConfigFile, u32 width, u32 height, char *rad_name, u32 dump_type, char *out_dir, Double fps, s32 frameID, s32 dump_time)
-{
-	GF_User user;
-	BIFSVID b2v;
-	u16 es_id;
-	Bool first_dump, needs_raw;
-	u32 i, j, di, count, timescale, frameNum;
-	u32 duration, cur_time;
-	GF_VideoSurface fb;
-	GF_Err e;
-	char old_driv1024;
-	const char *test;
-	char config_pathGF_MAX_PATH;
-	avi_t *avi_out;
-	Bool reset_fps;
-	GF_ESD *esd;
-	char comp5;
-	char *conv_buf;
-
-	memset(&user, 0, sizeof(GF_User));
-	if (szConfigFile && strlen(szConfigFile)) {
-		user.config = gf_cfg_init(config_path, NULL);
-	} else {
-		user.config = gf_cfg_init(NULL, NULL);
-	}
-
-	if (!user.config) {
-		fprintf(stdout, "Error: Configuration File \"%s\" not found in %s\n", GPAC_CFG_FILE, config_path);
-		return;
-	}
-	avi_out = NULL;
-	conv_buf = NULL;
-	esd = NULL;
-	needs_raw = 0;
-	test = gf_cfg_get_key(user.config, "Core", "ModulesDirectory");
-	user.modules = gf_modules_new((const unsigned char *) test, user.config);
-	strcpy(old_driv, "raw_out");
-	if (!gf_modules_get_count(user.modules)) {
-		printf("Error: no modules found\n");
-		goto err_exit;
-	}
-
-	/*switch driver to raw_driver*/
-	test = gf_cfg_get_key(user.config, "core", "video-output");
-	if (test) strcpy(old_driv, test);
-
-	test = gf_cfg_get_key(user.config, "Compositor", "RendererName");
-	/*since we only support RGB24 for MP42AVI force using RAW out with 2D driver*/
-	if (test && strstr(test, "2D")) {
-		needs_raw = 1;
-	}
-
-	needs_raw = 0;
-	user.init_flags = 0;
-	b2v.sr = gf_sc_new(&user, 0, NULL);
-	gf_sc_set_option(b2v.sr, GF_OPT_VISIBLE, 0);
-
-	b2v.sg = gf_sg_new();
-	gf_sg_set_scene_time_callback(b2v.sg, get_scene_time, &b2v);
-	gf_sg_set_init_callback(b2v.sg, node_init, &b2v);
-	gf_sg_set_modified_callback(b2v.sg, node_modif, &b2v);
-
-	/*load config*/
-	gf_sc_set_option(b2v.sr, GF_OPT_RELOAD_CONFIG, 1);
-
-	b2v.bifs = gf_bifs_decoder_new(b2v.sg, 0);
-
-	strcpy(config_path, "");
-	if (out_dir) {
-		strcat(config_path, out_dir);
-		if (config_pathstrlen(config_path)-1 != '\\') strcat(config_path, "\\");
-	}
-	strcat(config_path, rad_name);
-	strcat(config_path, "_bifs");
-	if (!dump_type) {
-		strcat(config_path, ".avi");
-		avi_out = AVI_open_output_file(config_path);
-		comp0 = comp1 = comp2 = comp3 = comp4 = 0;
-		if (!avi_out) goto err_exit;
-	}
-
-
-	for (i=0; i<gf_isom_get_track_count(file); i++) {
-		esd = gf_isom_get_esd(file, i+1, 1);
-		if (!esd) continue;
-		if (!esd->dependsOnESID && (esd->decoderConfig->streamType == GF_STREAM_SCENE)) break;
-		gf_odf_desc_del((GF_Descriptor *) esd);
-		esd = NULL;
-	}
-	if (!esd) {
-		printf("no bifs track found\n");
-		goto err_exit;
-	}
-
-	b2v.duration = gf_isom_get_media_duration(file, i+1);
-	timescale = gf_isom_get_media_timescale(file, i+1);
-	es_id = (u16) gf_isom_get_track_id(file, i+1);
-	e = gf_bifs_decoder_configure_stream(b2v.bifs, es_id, esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength, esd->decoderConfig->objectTypeIndication);
-	if (e) {
-		printf("BIFS init error %s\n", gf_error_to_string(e));
-		gf_odf_desc_del((GF_Descriptor *) esd);
-		esd = NULL;
-		goto err_exit;
-	}
-	if (dump_time>=0) dump_time = dump_time *1000 / timescale;
-
-	gf_sc_set_scene(b2v.sr, b2v.sg);
-	count = gf_isom_get_sample_count(file, i+1);
-
-	reset_fps = 0;
-	if (!fps) {
-		fps = (Float) (count * timescale);
-		fps /= (Double) (s64) b2v.duration;
-		printf("Estimated BIFS FrameRate %g\n", fps);
-		reset_fps = 1;
-	}
-
-	if (!width || !height) {
-		gf_sg_get_scene_size_info(b2v.sg, &width, &height);
-	}
-	/*we work in RGB24, and we must make sure the pitch is %4*/
-	if ((width*3)%4) {
-		printf("Adjusting width (%d) to have a stride multiple of 4\n", width);
-		while ((width*3)%4) width--;
-	}
-
-	gf_sc_set_size(b2v.sr, width, height);
-	gf_sc_draw_frame(b2v.sr, 0, NULL);
-
-	gf_sc_get_screen_buffer(b2v.sr, &fb);
-	width = fb.width;
-	height = fb.height;
-	if (avi_out) {
-		AVI_set_video(avi_out, width, height, fps, comp);
-		conv_buf = gf_malloc(sizeof(char) * width * height * 3);
-	}
-	printf("Dumping at BIFS resolution %d x %d\n\n", width, height);
-	gf_sc_release_screen_buffer(b2v.sr, &fb);
-
-	cur_time = 0;
-
-	duration = (u32)(timescale / fps);
-	if (reset_fps) fps = 0;
-
-	frameNum = 1;
-	first_dump = 1;
-	for (j=0; j<count; j++) {
-		GF_ISOSample *samp = gf_isom_get_sample(file, i+1, j+1, &di);
-
-		b2v.cts = samp->DTS + samp->CTS_Offset;
-		/*apply command*/
-		gf_bifs_decode_au(b2v.bifs, es_id, samp->data, samp->dataLength, ((Double)(s64)b2v.cts)/1000.0);
-		gf_isom_sample_del(&samp);
-
-		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, 0, NULL);
-		/*needed for background2D !!*/
-		if (first_dump) {
-			gf_sc_draw_frame(b2v.sr, 0, NULL);
-			first_dump = 0;
-		}
-
-		if (fps) {
-			if (cur_time > b2v.cts) continue;
-
-			while (1) {
-				printf("dumped frame time %f (frame %d - sample %d)\r", ((Float)cur_time)/timescale, frameNum, j+1);
-				dump_frame(b2v, conv_buf, config_path, dump_type, avi_out, frameNum);
-				frameNum++;
-				cur_time += duration;
-				if (cur_time > b2v.cts) break;
-			}
-		} else {
-			dump_frame(b2v, conv_buf, config_path, dump_type, avi_out, (frameID>=0) ? frameID : frameNum);
-			if (frameID>=0 || dump_time>=0) break;
-			frameNum++;
-			printf("dumped frame %d / %d\r", j+1, count);
-		}
-
-	}
-	gf_odf_desc_del((GF_Descriptor *) esd);
-
-	/*destroy everything*/
-	gf_bifs_decoder_del(b2v.bifs);
-	gf_sg_del(b2v.sg);
-	gf_sc_set_scene(b2v.sr, NULL);
-	gf_sc_del(b2v.sr);
-
-err_exit:
-	if (avi_out) AVI_close(avi_out);
-	if (conv_buf) gf_free(conv_buf);
-	if (user.modules) gf_modules_del(user.modules);
-	if (needs_raw) gf_cfg_set_key(user.config, "core", "video-output", old_driv);
-	gf_cfg_del(user.config);
-}
-
-int main (int argc, char **argv)
-{
-	Double fps_dump;
-	u32 i;
-	char rad500;
-	s32 frameID, h, m, s, f;
-	Float fps;
-	u32 dump_type;
-	s32 dump_time;
-	u32 dump_w, dump_h;
-	Bool copy;
-	char szConfigFile4096;
-	char *dump_out;
-	char *inName, *arg;
-	GF_ISOFile *file;
-
-	if (argc < 2) {
-		PrintUsage();
-		return 0;
-	}
-
-	dump_type = 0;
-	fps_dump = 0.0f;
-	dump_w = dump_h = 0;
-	dump_out = NULL;
-	inName = NULL;
-	frameID = -1;
-	dump_time = -1;
-	szConfigFile0 = 0;
-
-	for (i = 1; i < (u32) argc ; i++) {
-		arg = argvi;
-		if (arg0 != '-') {
-			inName = arg;
-			break;
-		}
-		if (!stricmp(arg, "-h")) {
-			PrintUsage();
-			return 0;
-		} else if (!stricmp(arg, "-version")) {
-			PrintVersion();
-			return 0;
-		} else if (!stricmp(arg, "-size")) {
-			sscanf(argvi+1, "%dx%d", &dump_w, &dump_h);
-			i++;
-		} else if (!stricmp(arg, "-raw")) {
-			dump_type = 2;
-			if ((i+1<(u32)argc) && (argvi+10!='-')) {
-				if (strstr(argvi+1, "T")) {
-					if (strstr(argvi+1, "F")) {
-						sscanf(argvi+1, "T%d:%d:%d:%dF%f", &h, &m, &s, &f, &fps);
-						dump_time = (s32) ((3600*h + 60*m + s)*1000 + 1000*f/fps);
-					} else {
-						sscanf(argvi+1, "T%d:%d:%d", &h, &m, &s);
-						dump_time = (s32) ((3600*h + 60*m + s)*1000);
-					}
-				} else {
-					frameID = atoi(argvi+1);
-				}
-				i++;
-			}
-		} else if (!stricmp(arg, "-bmp")) {
-			dump_type = 1;
-			if ((i+1<(u32)argc) && (argvi+10!='-')) {
-				if (strstr(argvi+1, "T")) {
-					if (strstr(argvi+1, "F")) {
-						sscanf(argvi+1, "T%d:%d:%d:%dF%f", &h, &m, &s, &f, &fps);
-						dump_time = (s32) ((3600*h + 60*m + s)*1000 + 1000*f/fps);
-					} else {
-						sscanf(argvi+1, "T%d:%d:%d", &h, &m, &s);
-						dump_time = (s32) ((3600*h + 60*m + s)*1000);
-					}
-				} else {
-					frameID = atoi(argvi+1);
-				}
-				i++;
-			}
-		} else if (!stricmp(arg, "-3d")) {
-			dump_type = 3;
-		} else if (!stricmp(arg, "-outpath")) {
-			dump_out = argvi+1;
-			i++;
-		} else if (!stricmp(arg, "-fps")) {
-			fps_dump = atof(argvi+1);
-			i++;
-		} else if (!stricmp(arg, "-copy")) {
-			copy = 1;
-		} else if (!stricmp(arg, "-cfg")) {
-			strcpy(szConfigFile, argvi+1);
-			i += 1;
-		} else {
-			PrintUsage();
-			return (0);
-		}
-	}
-	if (!inName) {
-		PrintUsage();
-		return 0;
-	}
-	gf_sys_init(GF_MemTrackerNone);
-
-	file = gf_isom_open(inName, GF_ISOM_OPEN_READ, NULL);
-	if (!file) {
-		printf("Error opening file: %s\n", gf_error_to_string(gf_isom_last_error(NULL)));
-		return 0;
-	}
-
-	if (dump_out) {
-		arg = strrchr(inName, GF_PATH_SEPARATOR);
-		if (arg) {
-			strcpy(rad, arg + 1);
-		} else {
-			strcpy(rad, inName);
-		}
-	} else {
-		strcpy(rad, inName);
-	}
-	while (radstrlen(rad)-1 != '.') radstrlen(rad)-1 = 0;
-	radstrlen(rad)-1 = 0;
-	if (dump_type == 3) {
-		bifs3d_viewpoints_merger(file, szConfigFile, dump_w, dump_h, rad, dump_type, dump_out, fps_dump, frameID, dump_time);
-	}
-	else bifs_to_vid(file, szConfigFile, dump_w, dump_h, rad, dump_type, dump_out, fps_dump, frameID, dump_time);
-	printf("\ndone\n");
-	gf_isom_delete(file);
-	return 0;
-
-}
-

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/osmo4_sym Deleted

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/osmo4_sym/aif Deleted

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/osmo4_sym/aif/osmo4_icon.bmp Deleted

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/osmo4_sym/aif/osmo4_icon_mask.bmp Deleted

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/osmo4_sym/aif/osmo4_menu.bmp Deleted

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/osmo4_sym/aif/osmo4_menu_mask.bmp Deleted

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/osmo4_sym/aif/osmo4aif.rss Deleted

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/osmo4_sym/osmo4.cpp Deleted

@@ -1,82 +0,0 @@
-#include "osmo4.h"
-#include "osmo4_ui.h"
-
-
-EXPORT_C CApaApplication* NewApplication()
-{
-	return new COsmo4Application;
-}
-
-
-#ifdef EKA2
-
-#include <eikstart.h>
-
-GLDEF_C TInt E32Main()
-{
-	return EikStart::RunApplication( NewApplication );
-}
-
-#else
-
-
-GLDEF_C TInt E32Dll( TDllReason /*aReason*/ )
-{
-	return KErrNone;
-}
-
-#endif
-
-
-#if defined(__SERIES60_3X__)
-const TUid KUidOsmo4App = { 0xf01f9075 };
-#else
-const TUid KUidOsmo4App = { 0x1000AC00 };
-#endif
-
-
-CApaDocument* COsmo4Application::CreateDocumentL()
-{
-	return (static_cast<CApaDocument*> ( COsmo4Document::NewL( *this ) ) );
-}
-
-TUid COsmo4Application::AppDllUid() const
-{
-	return KUidOsmo4App;
-}
-
-
-COsmo4Document* COsmo4Document::NewL( CEikApplication& aApp )
-{
-	COsmo4Document* self = NewLC( aApp );
-	CleanupStack::Pop( self );
-	return self;
-}
-
-COsmo4Document* COsmo4Document::NewLC( CEikApplication& aApp )
-{
-	COsmo4Document* self =
-	    new ( ELeave ) COsmo4Document( aApp );
-
-	CleanupStack::PushL( self );
-	self->ConstructL();
-	return self;
-}
-void COsmo4Document::ConstructL()
-{
-}
-
-COsmo4Document::COsmo4Document( CEikApplication& aApp )
-	: CAknDocument( aApp )
-{
-}
-
-COsmo4Document::~COsmo4Document()
-{
-}
-
-CEikAppUi* COsmo4Document::CreateAppUiL()
-{
-	return ( static_cast <CEikAppUi*> ( new ( ELeave ) COsmo4AppUi ) );
-}
-

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/osmo4_sym/osmo4.h Deleted

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/osmo4_sym/osmo4_ui.cpp Deleted

@@ -1,605 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2006-2012
- *					All rights reserved
- *
- *  This file is part of GPAC / Symbian GUI player
- *
- *  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 FILES
-#include <avkon.hrh>
-#include <eikmenup.h>
-#include <akntitle.h>
-
-#include <stringloader.h>
-#include <osmo4.rsg>
-#include <f32file.h>
-#include <s32file.h>
-#include <bacline.h>
-#include <eikbtgps.h>
-#include <aknquerydialog.h>
-
-
-#include "osmo4_ui.h"
-#include "osmo4_view.h"
-#include "playlist.h"
-
-#include <gpac/utf.h>
-#include <gpac/options.h>
-
-
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-
-// -----------------------------------------------------------------------------
-// Cosmo4AppUi::ConstructL()
-// Symbian 2nd phase constructor can leave.
-// -----------------------------------------------------------------------------
-//
-void COsmo4AppUi::ConstructL()
-{
-	// Initialise app UI with standard value.
-	BaseConstructL(CAknAppUi::EAknEnableSkin);
-
-	/*Create display*/
-	iAppView = COsmo4AppView::NewL( ClientRect() );
-	AddToStackL(iAppView);
-
-	/*create playlist*/
-#ifndef GPAC_GUI_ONLY
-	iPlaylist = CPlaylist::NewL( ClientRect(), iAppView->GetUser() );
-
-	iPlaylist->MakeVisible(EFalse);
-#endif
-
-	iAppView->MakeVisible(ETrue);
-	view_mode = 0;
-
-	m_title = NULL;
-
-	//StatusPane ()->SwitchLayoutL ( R_AVKON_STATUS_PANE_LAYOUT_SMALL );
-
-	nb_keys = 0;
-	CaptureKeys(1);
-
-
-
-	CCommandLineArguments *args = CCommandLineArguments::NewL();
-#ifndef GPAC_GUI_ONLY
-	if (args->Count() > 1) {
-		TPtrC url = args->Arg(1);
-#if defined(_UNICODE)
-		char szURL1024;
-		u16 szURLUTF161024;
-		size_t len;
-		len = url.Size();
-		memcpy(szURLUTF16, url.Ptr(), sizeof(u8)*len);
-		szURLUTF16len/2 = 0;
-		const u16 *sptr = szURLUTF16;
-		len = gf_utf8_wcstombs(szURL, 512, &sptr);
-		if (len != (size_t) -1) {
-			szURLlen = 0;
-			iAppView->Connect((const char *)szURL);
-		}
-#else
-		iAppView->Connect((const char *)url.Ptr());
-#endif
-	}
-#endif
-	delete args;
-}
-
-// -----------------------------------------------------------------------------
-// COsmo4AppUi::COsmo4AppUi()
-// C++ default constructor can NOT contain any code, that might leave.
-// -----------------------------------------------------------------------------
-//
-COsmo4AppUi::COsmo4AppUi()
-{
-	// No implementation required
-}
-
-// -----------------------------------------------------------------------------
-// COsmo4AppUi::~COsmo4AppUi()
-// Destructor.
-// -----------------------------------------------------------------------------
-//
-COsmo4AppUi::~COsmo4AppUi()
-{
-	CaptureKeys(0);
-
-	switch (view_mode) {
-	case 0:
-		if (iAppView) RemoveFromStack(iAppView);
-		break;
-	case 1:
-		if (iPlaylist) RemoveFromStack(iPlaylist);
-		break;
-	}
-	if (iAppView) delete iAppView;
-	if (iPlaylist) delete iPlaylist;
-	if (m_title) gf_free(m_title);
-	m_title = NULL;
-}
-
-
-void COsmo4AppUi::CaptureKey(TInt32 code, TInt32 scancode)
-{
-	RWindowGroup iWG = CCoeEnv::Static()->RootWin();
-	if (nb_keys>=MAX_KEY_CAP) return;
-	keysnb_keys.key_cap = iWG.CaptureKey(code, 0, 0);
-	keysnb_keys.key_cap_ud = iWG.CaptureKeyUpAndDowns(scancode, 0, 0);
-	nb_keys++;
-}
-/*
-possible meaning for key codes:
-EStdKeyYes          -Call
-EStdKeyNo           -End
-EStdKeyApplication0 -Apps key
-EStdKeyDevice0      -Left softkey
-EStdKeyDevice1      -Right softkey
-EStdKeyDevice2      -Power
-EStdKeyDevice3      -Button press
-EStdKeyDevice4      -Flip - Open
-EStdKeyDevice5      -Flip - Close
-EStdKeyDevice6      -Side key
-
-EStdKeyDeviceD		-Jog Dial forward
-EStdKeyDeviceE		-Jog Dial back
-*/
-void COsmo4AppUi::CaptureKeys(int do_capture)
-{
-	if (do_capture) {
-		CaptureKey(EKeyIncVolume, EStdKeyIncVolume);
-		CaptureKey(EKeyDecVolume, EStdKeyDecVolume);
-	} else {
-		RWindowGroup iWG = CCoeEnv::Static()->RootWin();
-		for (int i=0; i<nb_keys; i++) {
-			iWG.CancelCaptureKey(keysi.key_cap);
-			iWG.CancelCaptureKeyUpAndDowns(keysi.key_cap_ud);
-		}
-		nb_keys = 0;
-	}
-}
-
-
-void COsmo4AppUi::HandleForegroundEventL(TBool aForeground)
-{
-	CaptureKeys(aForeground ? 1 : 0);
-	CAknAppUi::HandleForegroundEventL(aForeground);
-}
-
-// -----------------------------------------------------------------------------
-// COsmo4AppUi::HandleCommandL()
-// Takes care of command handling.
-// -----------------------------------------------------------------------------
-//
-void COsmo4AppUi::HandleCommandL( TInt aCommand )
-{
-	GF_Err e;
-#ifndef GPAC_GUI_ONLY
-	switch( aCommand ) {
-	case EAknSoftkeyBack:
-		if (view_mode==1) TogglePlaylist();
-		break;
-	case EEikCmdExit:
-	case EAknSoftkeyExit:
-		iAppView->Shutdown();
-		Exit();
-		break;
-	/*PLAYLIST commands*/
-	case EOsmo4PlayListAdd:
-		iPlaylist->PlaylistAct(Osmo4PLAdd);
-		break;
-	case EOsmo4PlayListRem:
-		iPlaylist->PlaylistAct(Osmo4PLRem);
-		break;
-	case EOsmo4PlayListMoveUp:
-		iPlaylist->PlaylistAct(Osmo4PLMoveUp);
-		break;
-	case EOsmo4PlayListMoveDown:
-		iPlaylist->PlaylistAct(Osmo4PLMoveDown);
-		break;
-	case EOsmo4PlayListClear:
-		iPlaylist->PlaylistAct(Osmo4PLClear);
-		break;
-	case EOsmo4PlayListMode:
-		iPlaylist->PlaylistAct(Osmo4PLToggleMode);
-		break;
-	case EOsmo4PlayListAllFiles:
-		iPlaylist->PlaylistAct(Osmo4PLToggleAllFiles);
-		break;
-
-	/*FILE menu command*/
-	case EOsmo4PlayListView:
-		TogglePlaylist();
-		break;
-	case EOsmo4OpenURL:
-		break;
-	case EOsmo4Fullscreen:
-		break;
-	case EOsmo4ViewMaxSize:
-	{
-		CEikStatusPane* statusPane = StatusPane();
-		if (statusPane->IsVisible()) statusPane->MakeVisible(EFalse);
-		else statusPane->MakeVisible(ETrue);
-	}
-	break;
-	case EOsmo4AROriginal:
-		gf_term_set_option(iAppView->m_term, GF_OPT_ASPECT_RATIO, GF_ASPECT_RATIO_KEEP);
-		break;
-	case EOsmo4ARFillScreen:
-		gf_term_set_option(iAppView->m_term, GF_OPT_ASPECT_RATIO, GF_ASPECT_RATIO_FILL_SCREEN);
-		break;
-	case EOsmo4AR4_3:
-		gf_term_set_option(iAppView->m_term, GF_OPT_ASPECT_RATIO, GF_ASPECT_RATIO_4_3);
-		break;
-	case EOsmo4AR16_9:
-		gf_term_set_option(iAppView->m_term, GF_OPT_ASPECT_RATIO, GF_ASPECT_RATIO_16_9);
-		break;
-
-	case EOsmo4NavReset:
-		gf_term_set_option(iAppView->m_term, GF_OPT_NAVIGATION_TYPE, 0);
-		break;
-	case EOsmo4NavNone:
-		gf_term_set_option(iAppView->m_term, GF_OPT_NAVIGATION, GF_NAVIGATE_NONE);
-		break;
-	case EOsmo4NavSlide:
-		e = gf_term_set_option(iAppView->m_term, GF_OPT_NAVIGATION, GF_NAVIGATE_SLIDE);
-		if (e) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("Cannot set navigation: %s", gf_error_to_string(e) ));
-		}
-		break;
-	case EOsmo4NavWalk:
-		gf_term_set_option(iAppView->m_term, GF_OPT_NAVIGATION, GF_NAVIGATE_WALK);
-		break;
-	case EOsmo4NavFly:
-		gf_term_set_option(iAppView->m_term, GF_OPT_NAVIGATION, GF_NAVIGATE_FLY);
-		break;
-	case EOsmo4NavExamine:
-		gf_term_set_option(iAppView->m_term, GF_OPT_NAVIGATION, GF_NAVIGATE_EXAMINE);
-		break;
-	case EOsmo4NavHeadlight:
-		gf_term_set_option(iAppView->m_term, GF_OPT_HEADLIGHT, !gf_term_get_option(iAppView->m_term, GF_OPT_HEADLIGHT) );
-		break;
-	case EOsmo4CollideNone:
-		gf_term_set_option(iAppView->m_term, GF_OPT_COLLISION, GF_COLLISION_NONE);
-		break;
-	case EOsmo4CollideSimple:
-		gf_term_set_option(iAppView->m_term, GF_OPT_COLLISION, GF_COLLISION_NORMAL);
-		break;
-	case EOsmo4CollideDisp:
-		gf_term_set_option(iAppView->m_term, GF_OPT_COLLISION, GF_COLLISION_DISPLACEMENT);
-		break;
-	case EOsmo4NavGravity:
-		gf_term_set_option(iAppView->m_term, GF_OPT_GRAVITY, !gf_term_get_option(iAppView->m_term, GF_OPT_GRAVITY));
-		break;
-	case EOsmo4ViewRTI:
-		iAppView->show_rti = !iAppView->show_rti;
-		break;
-
-	case EOsmo4OptEnableLogs:
-	{
-		const char *opt = gf_cfg_get_key(iAppView->m_user.config, "General", "Logs");
-		if (opt && !stricmp(opt, "@debug")) {
-			gf_cfg_set_key(iAppView->m_user.config, "General", "Logs", "all@error");
-		} else {
-			gf_cfg_set_key(iAppView->m_user.config, "General", "Logs", "all@debug");
-		}
-		iAppView->SetupLogs();
-	}
-	break;
-	case EOsmo4OptOpenGL:
-	{
-		const char *opt = gf_cfg_get_key(iAppView->m_user.config, "Compositor", "ForceOpenGL");
-		Bool use_gl = (opt && !strcmp(opt, "yes")) ? 1 : 0;
-		gf_cfg_set_key(iAppView->m_user.config, "Compositor", "ForceOpenGL", use_gl ? "no" : "yes");
-		gf_term_set_option(iAppView->m_term, GF_OPT_USE_OPENGL, !use_gl);
-	}
-	break;
-	case EOsmo4OptDirectDraw:
-	{
-		const char *opt = gf_cfg_get_key(iAppView->m_user.config, "Compositor", "DirectDraw");
-		Bool use_dd = (opt && !strcmp(opt, "yes")) ? 1 : 0;
-		gf_cfg_set_key(iAppView->m_user.config, "Compositor", "DirectDraw", use_dd ? "no" : "yes");
-		gf_term_set_option(iAppView->m_term, GF_OPT_DIRECT_DRAW, !use_dd);
-	}
-	break;
-	case EOsmo4OptXMLProgressive:
-	{
-		const char *opt = gf_cfg_get_key(iAppView->m_user.config, "SAXLoader", "Progressive");
-		Bool use_prog = (opt && !strcmp(opt, "yes")) ? 1 : 0;
-		gf_cfg_set_key(iAppView->m_user.config, "SAXLoader", "Progressive", use_prog ? "no" : "yes");
-		gf_cfg_set_key(iAppView->m_user.config, "SAXLoader", "MaxDuration", "100");
-	}
-	break;
-
-	default:
-		if ((aCommand>=EOsmo4OpenRecentFirst) && (aCommand<=EOsmo4OpenRecentLast)) {
-			const char *sOpt = gf_cfg_get_key_name(iAppView->m_user.config, "RecentFiles", aCommand - EOsmo4OpenRecentFirst);
-			if (sOpt) iAppView->Connect(sOpt);
-		} else {
-			iAppView->MessageBox("Unandled command - panic", "Osmo4");
-			Panic( EOsmo4Ui );
-		}
-		break;
-	}
-#endif
-}
-
-
-// -----------------------------------------------------------------------------
-//  Called by the framework when the application status pane
-//  size is changed.  Passes the new client rectangle to the
-//  AppView
-// -----------------------------------------------------------------------------
-//
-void COsmo4AppUi::HandleStatusPaneSizeChange()
-{
-	iAppView->SetRect( ClientRect() );
-#ifndef GPAC_GUI_ONLY
-	iPlaylist->SetRect( ClientRect() );
-#endif
-}
-
-void COsmo4AppUi::TogglePlaylist()
-{
-	CEikButtonGroupContainer* cba= CEikButtonGroupContainer::Current();
-
-#ifndef GPAC_GUI_ONLY
-	switch (view_mode) {
-	case 0:
-		RemoveFromStack(iAppView);
-		iAppView->ShowHide(0);
-		AddToStackL(iPlaylist);
-		if (cba) {
-			cba->SetCommandSetL(R_AVKON_SOFTKEYS_OPTIONS_BACK);
-			cba->DrawDeferred();
-		}
-		view_was_max = StatusPane()->IsVisible() ? 0 : 1;
-		if (view_was_max) StatusPane()->MakeVisible(ETrue);
-		iPlaylist->ShowHide(1);
-		view_mode = 1;
-		break;
-	case 1:
-		RemoveFromStack(iPlaylist);
-		iPlaylist->ShowHide(0);
-		AddToStackL(iAppView);
-		if (cba) {
-			cba->SetCommandSetL(R_AVKON_SOFTKEYS_OPTIONS_EXIT);
-			cba->DrawDeferred();
-		}
-		iAppView->ShowHide(1);
-		if (view_was_max) StatusPane()->MakeVisible(EFalse);
-		view_was_max = 0;
-		view_mode = 0;
-		break;
-	}
-#endif
-}
-
-void COsmo4AppUi::PlayURL(const char *url)
-{
-	if (view_mode) {
-		TogglePlaylist();
-	}
-	if (url) {
-		char *sep;
-		iAppView->Connect(url);
-		sep = strrchr(url, '\\');
-		SetTitle(sep ? sep+1 : url);
-	}
-}
-
-void COsmo4AppUi::SetTitleInfo(const char *title)
-{
-#if 1
-	CEikStatusPane* statusPane = StatusPane();
-	CAknTitlePane *iTitlePane = (CAknTitlePane*) statusPane->ControlL(TUid::Uid(EEikStatusPaneUidTitle));
-
-	if (!title) title = "Osmo4";
-
-	HBufC *htitle = HBufC::NewL( strlen(title)+1);
-	htitle->Des().Copy( TPtrC8(( TText8* ) title) );
-	iTitlePane->SetText(htitle);
-#endif
-}
-
-void COsmo4AppUi::SetTitle(const char *title, int store_it)
-{
-	if (store_it) {
-		if (m_title) gf_free(m_title);
-		m_title = NULL;
-		if (title) m_title = gf_strdup(title);
-	}
-	SetTitleInfo(title ? title : m_title);
-}
-
-void COsmo4AppUi::SetInfo(const char *info)
-{
-	if (view_mode) return;
-	if (info) {
-		char szTitle200;
-		sprintf(szTitle, "%s\n%s", info, m_title ? m_title : "Osmo4");
-		SetTitleInfo(szTitle);
-	} else {
-		SetTitleInfo(m_title);
-	}
-}
-
-
-#define DECLARE_MENU_ITEM(__text, __com, __check, __res, has_sep)	\
-		item.iText = __text;	\
-		item.iCommandId = __com;	\
-		item.iFlags = has_sep ? EEikMenuItemSeparatorAfter : 0;	\
-		if (__check) item.iFlags |= EEikMenuItemCheckBox | EEikMenuItemSymbolOn; \
-		item.iCascadeId = __res;	\
-		aMenuPane->AddMenuItemL(item);
-
-
-void COsmo4AppUi::DynInitMenuPaneL(TInt aResourceId, CEikMenuPane* aMenuPane)
-{
-	CEikMenuPaneItem::SData item;
-
-	if (aResourceId==R_OSMO4_MENU) {
-
-		aMenuPane->Reset();
-
-		if (view_mode==1) {
-#ifndef GPAC_GUI_ONLY
-			Bool is_file = iPlaylist->SelectionIsFile();
-			Bool in_pl = (is_file && iPlaylist->IsInPlaylist()) ? 1 : 0;
-
-			if (iPlaylist->PlaylistMode()) {
-				DECLARE_MENU_ITEM(_L("Up"), EOsmo4PlayListMoveUp, 0, 0, 0);
-				DECLARE_MENU_ITEM(_L("Down"), EOsmo4PlayListMoveDown, 0, 0, 0);
-				DECLARE_MENU_ITEM(_L("Remove"), EOsmo4PlayListRem, 0, 0, 0);
-				DECLARE_MENU_ITEM(_L("Clear"), EOsmo4PlayListClear, 0, 0, 1);
-			} else if (!in_pl) {
-				DECLARE_MENU_ITEM(_L("Add to PlayList"), EOsmo4PlayListAdd, 0, 0, 1);
-			} else if (is_file) {
-				DECLARE_MENU_ITEM(_L("Remove from Playlist"), EOsmo4PlayListRem, 0, 0, 1);
-			}
-
-			if (! iPlaylist->PlaylistMode()) {
-				DECLARE_MENU_ITEM(iPlaylist->ViewAllFiles() ? _L("View known files") : _L("View all files"), EOsmo4PlayListAllFiles, 0, 0, 1);
-			} else {
-				DECLARE_MENU_ITEM(_L("Sort"), 0, 0, R_OSMO4_SM1, 1);
-			}
-			DECLARE_MENU_ITEM(iPlaylist->PlaylistMode() ? _L("Browse") : _L("Playlist"), EOsmo4PlayListMode, 0, 0, 0);
-#endif
-		} else {
-			/*open*/
-			DECLARE_MENU_ITEM(_L("File"), 0, 0, R_OSMO4_SM1, 0);
-			DECLARE_MENU_ITEM(_L("View"), 0, 0, R_OSMO4_SM2, 0);
-			DECLARE_MENU_ITEM(_L("Options"), 0, 0, R_OSMO4_SM3, 0);
-			//DECLARE_MENU_ITEM(_L("Exit"), EEikCmdExit, 0, 0, 0);
-		}
-		smenu_id = 0;
-		return;
-	}
-	else if (aResourceId==R_OSMO4_SM1) {
-		aMenuPane->Reset();
-		/*sort menu*/
-		if (view_mode==1) {
-		}
-		/*file menu*/
-		else {
-			DECLARE_MENU_ITEM(_L("Open local"), EOsmo4PlayListView, 0, 0, 0);
-			DECLARE_MENU_ITEM(_L("Open URL"), EOsmo4OpenURL, 0, 0, 1);
-#ifndef GPAC_GUI_ONLY
-			if (gf_cfg_get_key_name(iAppView->m_user.config, "RecentFiles", 0) != NULL) {
-				DECLARE_MENU_ITEM(_L("Recent"), 0, 0, R_OSMO4_SSM1, 0);
-			}
-#endif
-		}
-		smenu_id = 1;
-		return;
-	}
-	/*not used*/
-	if (view_mode==1) return;
-
-	/*View menu*/
-	if (aResourceId==R_OSMO4_SM2) {
-		aMenuPane->Reset();
-#ifndef GPAC_GUI_ONLY
-		/*content view menu*/
-		if (gf_term_get_option(iAppView->m_term, GF_OPT_NAVIGATION_TYPE) != GF_NAVIGATE_TYPE_NONE) {
-			DECLARE_MENU_ITEM(_L("Navigate"), 0, 0, R_OSMO4_SSM1, 1);
-		}
-#endif
-		DECLARE_MENU_ITEM(_L("Fullscreen"), EOsmo4Fullscreen, 0, 0, 0);
-		/*don't allow content AR modification by user*/
-		//DECLARE_MENU_ITEM(_L("Aspect Ratio"), 0, 0, R_OSMO4_SSM2, 1);
-		DECLARE_MENU_ITEM(_L("Maximize size"), EOsmo4ViewMaxSize, (StatusPane()->IsVisible() ? 0 : 1), 0, 1);
-		DECLARE_MENU_ITEM(_L("CPU Usage"), EOsmo4ViewRTI, iAppView->show_rti, 0, 0);
-		smenu_id = 2;
-		return;
-	}
-	/*Option menu*/
-	if (aResourceId==R_OSMO4_SM3) {
-#ifndef GPAC_GUI_ONLY
-		const char *opt = gf_cfg_get_key(iAppView->m_user.config, "Compositor", "ForceOpenGL");
-		DECLARE_MENU_ITEM(_L("Use 2D OpenGL"), EOsmo4OptOpenGL, (opt && !strcmp(opt, "yes")) ? 1 : 0, 0, 0);
-		opt = gf_cfg_get_key(iAppView->m_user.config, "Compositor", "DirectDraw");
-		DECLARE_MENU_ITEM(_L("Direct Draw"), EOsmo4OptDirectDraw, (opt && !strcmp(opt, "yes")) ? 1 : 0, 0, 0);
-		opt = gf_cfg_get_key(iAppView->m_user.config, "SAXLoader", "Progressive");
-		DECLARE_MENU_ITEM(_L("Progressive XML"), EOsmo4OptXMLProgressive, (opt && !strcmp(opt, "yes")) ? 1 : 0, 0, 0);
-
-#endif
-
-		DECLARE_MENU_ITEM(_L("Enable Logs"), EOsmo4OptEnableLogs, iAppView->do_log, 0, 0);
-		return;
-	}
-
-	if (aResourceId==R_OSMO4_SSM1) {
-		aMenuPane->Reset();
-		if (smenu_id == 1) {
-			u32 i = 0;
-#ifndef GPAC_GUI_ONLY
-			while (1) {
-				const char *opt = gf_cfg_get_key_name(iAppView->m_user.config, "RecentFiles", i);
-				if (!opt) break;
-				const char *sep = strrchr(opt, '\\');
-				if (!sep) sep = strrchr(opt, '/');
-				if (!sep) sep = opt;
-				else sep += 1;
-				item.iText.Copy( TPtrC8(( TText8* ) sep)  );
-				item.iCommandId = EOsmo4OpenRecentFirst + i;
-				item.iFlags = 0;
-				item.iCascadeId = 0;
-				aMenuPane->AddMenuItemL(item);
-				i++;
-				if (i>=10) break;
-			}
-			if (!i) {
-				DECLARE_MENU_ITEM(_L("_"), 0, 0, 0, 0);
-			}
-#endif
-		} else if (smenu_id == 2) {
-			DECLARE_MENU_ITEM(_L("Reset"), EOsmo4NavReset, 0, 0, 1);
-			DECLARE_MENU_ITEM(_L("None"), EOsmo4NavNone, 0, 0, 0);
-			DECLARE_MENU_ITEM(_L("Slide"), EOsmo4NavSlide, 0, 0, 0);
-
-#ifndef GPAC_GUI_ONLY
-			if (gf_term_get_option(iAppView->m_term, GF_OPT_NAVIGATION_TYPE) == GF_NAVIGATE_TYPE_3D) {
-				DECLARE_MENU_ITEM(_L("Walk"), EOsmo4NavWalk, 0, 0, 0);
-				DECLARE_MENU_ITEM(_L("Fly"), EOsmo4NavFly, 0, 0, 0);
-				DECLARE_MENU_ITEM(_L("Examine"), EOsmo4NavExamine, 0, 0, 1);
-				DECLARE_MENU_ITEM(_L("Headlight"), EOsmo4NavHeadlight, 0, 0, 0);
-				DECLARE_MENU_ITEM(_L("Gravity"), EOsmo4NavGravity, 0, 0, 0);
-			}
-#endif
-		}
-		return;
-	}
-
-	if (aResourceId==R_OSMO4_SSM2) {
-		aMenuPane->Reset();
-		DECLARE_MENU_ITEM(_L("Keep Original"), EOsmo4AROriginal, 0, 0, 0);
-		DECLARE_MENU_ITEM(_L("Fill Screen"), EOsmo4ARFillScreen, 0, 0, 0);
-		DECLARE_MENU_ITEM(_L("Ratio 4-3"), EOsmo4AR4_3, 0, 0, 0);
-		DECLARE_MENU_ITEM(_L("Ratio 16-9"), EOsmo4AR16_9, 0, 0, 0);
-		return;
-	}
-}
-

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/osmo4_sym/osmo4_ui.h Deleted

@@ -1,181 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2006-2012
- *					All rights reserved
- *
- *  This file is part of GPAC / Symbian GUI player
- *
- *  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.
- *
- */
-
-#ifndef __OSMO4_UI_H__
-#define __OSMO4_UI_H__
-
-// INCLUDES
-#include <aknappui.h>
-
-
-// FORWARD DECLARATIONS
-class COsmo4AppView;
-class CPlaylist;
-
-
-// osmo4 enumerate command codes
-enum TOsmo4Ids
-{
-	/*Playlist commands*/
-	EOsmo4PlayListView = 0x6001,
-	EOsmo4PlayListAdd,
-	EOsmo4PlayListRem,
-	EOsmo4PlayListMode,
-	EOsmo4PlayListMoveUp,
-	EOsmo4PlayListMoveDown,
-	EOsmo4PlayListClear,
-	EOsmo4PlayListAllFiles,
-	/*file commands*/
-	EOsmo4OpenURL,
-	EOsmo4OpenRecentFirst,
-	EOsmo4OpenRecentLast = EOsmo4OpenRecentFirst + 10,
-	/*view commands*/
-	EOsmo4Fullscreen,
-	EOsmo4ViewMaxSize,
-	EOsmo4AROriginal,
-	EOsmo4ARFillScreen,
-	EOsmo4AR4_3,
-	EOsmo4AR16_9,
-	EOsmo4NavReset,
-	EOsmo4NavNone,
-	EOsmo4NavSlide,
-	EOsmo4NavWalk,
-	EOsmo4NavFly,
-	EOsmo4NavExamine,
-	EOsmo4NavHeadlight,
-	EOsmo4NavGravity,
-	EOsmo4CollideNone,
-	EOsmo4CollideSimple,
-	EOsmo4CollideDisp,
-	EOsmo4ViewRTI,
-
-	/*option commands*/
-	EOsmo4OptEnableLogs,
-	EOsmo4OptOpenGL,
-	EOsmo4OptDirectDraw,
-	EOsmo4OptXMLProgressive,
-
-
-};
-
-
-/** osmo4 application panic codes */
-enum TOsmo4Panics
-{
-	EOsmo4Ui = 1
-	           // add further panics here
-};
-
-inline void Panic(TOsmo4Panics aReason)
-{
-	_LIT(applicationName,"Osmo4");
-	User::Panic(applicationName, aReason);
-}
-
-
-#define MAX_KEY_CAP	10
-typedef struct
-{
-	TInt32 key_cap;
-	TInt32 key_cap_ud;
-} KeyCapInfo;
-
-// CLASS DECLARATION
-/**
-* COsmo4AppUi application UI class.
-* Interacts with the user through the UI and request message processing
-* from the handler class
-*/
-class COsmo4AppUi : public CAknAppUi
-{
-public: // Constructors and destructor
-
-	/**
-	* ConstructL.
-	* 2nd phase constructor.
-	*/
-	void ConstructL();
-
-	/**
-	* COsmo4AppUi.
-	* C++ default constructor. This needs to be public due to
-	* the way the framework constructs the AppUi
-	*/
-	COsmo4AppUi();
-
-	/**
-	* ~COsmo4AppUi.
-	* Virtual Destructor.
-	*/
-	virtual ~COsmo4AppUi();
-
-private:  // Functions from base classes
-
-	/**
-	* From CEikAppUi, HandleCommandL.
-	* Takes care of command handling.
-	* @param aCommand Command to be handled.
-	*/
-	void HandleCommandL( TInt aCommand );
-
-
-	/**
-	*  HandleStatusPaneSizeChange.
-	*  Called by the framework when the application status pane
-	*  size is changed.
-	*/
-
-	void HandleStatusPaneSizeChange();
-	virtual void DynInitMenuPaneL(TInt aResourceId, CEikMenuPane* aMenuPane);
-
-public:
-	void PlayURL(const char *);
-	void SetTitle(const char *title, TBool store_it = ETrue);
-	void SetInfo(const char *);
-
-private:
-	void TogglePlaylist();
-	void SetTitleInfo(const char *);
-	void HandleForegroundEventL(TBool aForeground);
-	void CaptureKeys(int do_capture);
-	void CaptureKey(TInt32 code, TInt32 scancode);
-
-private:
-	COsmo4AppView* iAppView;
-	CPlaylist *iPlaylist;
-	int view_was_max;
-	int smenu_id;
-	char *m_title;
-	/*current view mode*/
-	int view_mode;
-
-	KeyCapInfo keysMAX_KEY_CAP;
-	int nb_keys;
-};
-
-#endif // __OSMO4_UI_H__
-
-// End of File
-

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/osmo4_sym/osmo4_view.cpp Deleted

@@ -1,587 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2006-2012
- *					All rights reserved
- *
- *  This file is part of GPAC / Symbian GUI player
- *
- *  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 FILES
-#include <coemain.h>
-#include <eikenv.h>
-
-#include "osmo4_view.h"
-#include "osmo4_ui.h"
-
-#include <gpac/options.h>
-/*for initial setup*/
-#include <gpac/modules/service.h>
-
-
-#if defined(__SERIES60_3X__)
-#define GPAC_CFG_DIR	"\\private\\F01F9075\\"
-#define GPAC_MODULES_DIR	"\\sys\\bin\\"
-#else
-#define GPAC_CFG_DIR	"\\system\\apps\\Osmo4\\"
-#define GPAC_MODULES_DIR	GPAC_CFG_DIR
-#endif
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// Cosmo4AppView::NewL()
-// Two-phased constructor.
-// -----------------------------------------------------------------------------
-//
-COsmo4AppView* COsmo4AppView::NewL( const TRect& aRect )
-{
-	COsmo4AppView* self = COsmo4AppView::NewLC( aRect );
-	CleanupStack::Pop( self );
-	return self;
-}
-
-// -----------------------------------------------------------------------------
-// COsmo4AppView::NewLC()
-// Two-phased constructor.
-// -----------------------------------------------------------------------------
-//
-COsmo4AppView* COsmo4AppView::NewLC( const TRect& aRect )
-{
-	COsmo4AppView* self = new ( ELeave ) COsmo4AppView;
-	CleanupStack::PushL( self );
-	self->ConstructL( aRect );
-	return self;
-}
-
-
-
-// -----------------------------------------------------------------------------
-// COsmo4AppView::COsmo4AppView()
-// C++ default constructor can NOT contain any code, that might leave.
-// -----------------------------------------------------------------------------
-//
-COsmo4AppView::COsmo4AppView()
-{
-	// No implementation required
-	m_pTimer = NULL;
-#ifndef GPAC_GUI_ONLY
-	memset(&m_user, 0, sizeof(GF_User));
-	m_term = NULL;
-	m_mx = NULL;
-	memset(&m_rti, 0, sizeof(GF_SystemRTInfo));
-#endif
-	last_title_update = 0;
-	show_rti = 0;
-#if defined(__SERIES60_3X__)
-	selector = NULL;
-	target = NULL;
-#endif
-}
-
-
-
-// -----------------------------------------------------------------------------
-// COsmo4AppView::~COsmo4AppView()
-// Destructor.
-// -----------------------------------------------------------------------------
-//
-COsmo4AppView::~COsmo4AppView()
-{
-	Shutdown();
-#ifndef GPAC_GUI_ONLY
-	if (m_mx) gf_mx_del(m_mx);
-#endif
-
-#if defined(__SERIES60_3X__)
-	if (selector) delete selector;
-	//if (target) delete target;
-#endif
-}
-
-void COsmo4AppView::Shutdown()
-{
-//	MessageBox("Osmo4 shutdown request", "");
-	if (m_pTimer) {
-		m_pTimer->Cancel();
-		delete m_pTimer;
-		m_pTimer = NULL;
-	}
-#ifndef GPAC_GUI_ONLY
-	if (m_term) {
-		GF_Terminal *t = m_term;
-		m_term = NULL;
-		gf_term_del(t);
-	}
-	if (m_Logs) {
-		gf_fclose(m_Logs);
-		m_Logs = NULL;
-	}
-	if (m_user.config) {
-		gf_cfg_del(m_user.config);
-		m_user.config = NULL;
-	}
-	if (m_user.modules) {
-		gf_modules_del(m_user.modules);
-		m_user.modules = NULL;
-	}
-#endif
-//	MessageBox("Osmo4 shutdown OK", "");
-}
-
-void COsmo4AppView::MessageBox(const char *text, const char *title)
-{
-	HBufC *msg1, *msg2;
-	TInt length = User::StringLength( ( TUint8* ) text) + 1;
-	msg1 = HBufC::NewL( length );
-	msg1->Des().Copy( TPtrC8(( TText8* ) text) );
-
-	length = User::StringLength( ( TUint8* ) title) + 1;
-	msg2 = HBufC::NewL( length );
-	msg2->Des().Copy( TPtrC8(( TText8* ) title) );
-
-	CEikonEnv::Static()->InfoWinL(*msg2, *msg1);
-	delete msg1;
-	delete msg2;
-}
-
-TInt myTick(TAny* aObject)
-{
-	return ((COsmo4AppView*)aObject)->OnTick();
-}
-
-TInt COsmo4AppView::OnTick()
-{
-#ifndef GPAC_GUI_ONLY
-	if (m_term) gf_term_process_step(m_term);
-
-	/*check RTI display*/
-	if (show_rti && gf_sys_get_rti(500, &m_rti, 0)) DisplayRTI();
-#endif
-	/*never stop...*/
-	return 1;
-}
-
-void COsmo4AppView::DisplayRTI()
-{
-#ifndef GPAC_GUI_ONLY
-	COsmo4AppUi *app = (COsmo4AppUi *) CEikonEnv::Static()->AppUi();
-	char szInfo20;
-	sprintf(szInfo, "CPU %02d FPS %02.2f", m_rti.process_cpu_usage, gf_term_get_framerate(m_term, 0));
-	app->SetInfo(szInfo);
-#endif
-}
-
-
-//GPAC log function
-static void on_gpac_log(void *cbk, GF_LOG_Level ll, GF_LOG_Tool lm, const char *fmt, va_list list)
-{
-	char szMsg2048;
-	COsmo4AppView *app = (COsmo4AppView *)cbk;
-
-#ifndef GPAC_GUI_ONLY
-	gf_mx_p(app->m_mx);
-	if (app->m_Logs) {
-		vfprintf(app->m_Logs, fmt, list);
-	} else {
-		vsnprintf(szMsg, 2048, fmt, list);
-		app->MessageBox(szMsg, "Error:");
-	}
-	gf_mx_v(app->m_mx);
-#endif
-}
-
-static Bool GPAC_EventProc(void *ptr, GF_Event *evt)
-{
-	COsmo4AppView *app = (COsmo4AppView *)ptr;
-	return app->EventProc(evt);
-}
-
-Bool COsmo4AppView::EventProc(GF_Event *evt)
-{
-	TRect r;
-
-#ifndef GPAC_GUI_ONLY
-	switch (evt->type) {
-	case GF_EVENT_MESSAGE:
-		if (!evt->message.message) return 0;
-		if (evt->message.error) {
-			char err1024;
-			sprintf(err, "Error: %s", gf_error_to_string(evt->message.error));
-			MessageBox(evt->message.message, err);
-		} else {
-			MessageBox(evt->message.message, "Info");
-		}
-		break;
-	case GF_EVENT_SCENE_SIZE:
-		r = Rect();
-		gf_term_set_size(m_term, r.Width(), r.Height());
-		break;
-	}
-#endif
-	return 0;
-}
-
-void COsmo4AppView::SetupLogs()
-{
-	const char *opt;
-
-#ifndef GPAC_GUI_ONLY
-	gf_mx_p(m_mx);
-	if (do_log) {
-		gf_log_set_tool_level(GF_LOG_ALL, GF_LOG_NONE);
-		do_log = 0;
-	}
-	/*setup GPAC logs: log all errors*/
-	opt = gf_cfg_get_key(m_user.config, "General", "Logs");
-	if (opt && !strstr(opt, "none")) {
-		const char *filename = gf_cfg_get_key(m_user.config, "General", "LogFile");
-		if (!filename) {
-			gf_cfg_set_key(m_user.config, "General", "LogFile", "\\data\\gpac_logs.txt");
-			filename = "\\data\\gpac_logs.txt";
-		}
-		m_Logs = gf_fopen(filename, "wt");
-		if (!m_Logs) {
-			MessageBox("Cannot open log file - disabling logs", "Warning !");
-		} else {
-			MessageBox("Debug logs enabled!", filename);
-			do_log = 1;
-			gf_log_set_tools_levels( opt );
-		}
-	}
-	if (!do_log) {
-		gf_log_set_tool_level(GF_LOG_ALL, GF_LOG_ERROR);
-		if (m_Logs) gf_fclose(m_Logs);
-	}
-
-	gf_log_set_callback(this, on_gpac_log);
-	gf_mx_v(m_mx);
-
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_CORE, ("Osmo4 logs initialized\n"));
-#endif
-}
-
-
-static void Osmo4_progress_cbk(void *usr, char *title, u32 done, u32 total)
-{
-#ifndef GPAC_GUI_ONLY
-	COsmo4AppView *view = (COsmo4AppView *) usr;
-	COsmo4AppUi *app = (COsmo4AppUi *) CEikonEnv::Static()->AppUi();
-
-	if (done==total) {
-		app->SetInfo(NULL);
-	} else if (view->last_title_update + 500 < gf_sys_clock()) {
-		char szName1024;
-		view->last_title_update = gf_sys_clock();
-		sprintf(szName, "%s %02d %%", title, (done*100 / total) );
-		app->SetInfo(szName);
-	}
-#endif
-}
-
-// -----------------------------------------------------------------------------
-// COsmo4AppView::ConstructL()
-// Symbian 2nd phase constructor can leave.
-// -----------------------------------------------------------------------------
-//
-void COsmo4AppView::ConstructL( const TRect& aRect )
-{
-	const char *opt;
-	Bool first_launch = 0;
-
-#if defined(__SERIES60_3X__)
-	selector = CRemConInterfaceSelector::NewL();
-	target = CRemConCoreApiTarget::NewL(*selector, *this);
-	selector->OpenTargetL();
-#endif
-
-	// Create a window for this application view
-	CreateWindowL();
-	// Set the windows size
-	SetRect( aRect );
-	//draw
-	ActivateL();
-
-#ifndef GPAC_GUI_ONLY
-	m_window = Window();
-	m_session = CEikonEnv::Static()->WsSession();
-
-	m_mx = gf_mx_new("Osmo4");
-
-	//load config file
-	m_user.config = gf_cfg_init(NULL, &first_launch);
-	if (!m_user.config) {
-		MessageBox("Cannot create GPAC Config file", "Fatal Error");
-		User::Leave(KErrGeneral);
-	}
-	if (first_launch) {
-		MessageBox("Osmo4", "Thank you for Installing");
-	}
-
-	/*load modules*/
-	opt = gf_cfg_get_key(m_user.config, "Core", "ModulesDirectory");
-	m_user.modules = gf_modules_new(opt, m_user.config);
-	if (!m_user.modules || !gf_modules_get_count(m_user.modules)) {
-		MessageBox(m_user.modules ? "No modules available" : "Cannot create module manager", "Fatal Error");
-		if (m_user.modules) gf_modules_del(m_user.modules);
-		gf_cfg_del(m_user.config);
-		User::Leave(KErrGeneral);
-	}
-
-	if (first_launch) {
-		/*first launch, register all files ext*/
-		for (u32 i=0; i<gf_modules_get_count(m_user.modules); i++) {
-			GF_InputService *ifce = (GF_InputService *) gf_modules_load_interface(m_user.modules, i, GF_NET_CLIENT_INTERFACE);
-			if (!ifce) continue;
-			if (ifce) {
-				ifce->CanHandleURL(ifce, "test.test");
-				gf_modules_close_interface((GF_BaseInterface *)ifce);
-			}
-		}
-	}
-
-	/*we don't thread the terminal, ie appart from the audio renderer, media decoding and visual rendering is
-	handled by the app process*/
-	m_user.init_flags = GF_TERM_NO_REGULATION;
-	m_user.EventProc = GPAC_EventProc;
-	m_user.opaque = this;
-	m_user.os_window_handler = (void *) &m_window;
-	m_user.os_display = (void *) &m_session;
-
-	m_term = gf_term_new(&m_user);
-	if (!m_term) {
-		MessageBox("Cannot load GPAC terminal", "Fatal Error");
-		gf_modules_del(m_user.modules);
-		gf_cfg_del(m_user.config);
-		User::Leave(KErrGeneral);
-	}
-	//MessageBox("GPAC terminal loaded", "Success !");
-
-	/*ok set output size*/
-	TSize s = m_window.Size();
-	gf_term_set_size(m_term, s.iWidth, s.iHeight);
-
-
-	/*start our callback (every ms)*/
-	const TInt KTickInterval = 33000;
-	m_pTimer = CPeriodic::NewL(CActive::EPriorityStandard);
-	m_pTimer->Start(KTickInterval, KTickInterval, TCallBack(myTick, this));
-
-	opt = gf_cfg_get_key(m_user.config, "General", "StartupFile");
-	if (opt) gf_term_connect(m_term, opt);
-
-#endif
-
-}
-
-
-// -----------------------------------------------------------------------------
-// COsmo4AppView::Draw()
-// Draws the display.
-// -----------------------------------------------------------------------------
-//
-void COsmo4AppView::Draw( const TRect& /*aRect*/ ) const
-{
-#ifndef GPAC_GUI_ONLY
-	if (!m_term) {
-		CWindowGc& gc = SystemGc();
-		TRgb black(0,0,0);
-		gc.SetBrushColor(black);
-		gc.Clear();
-	} else {
-		/*FIXME - this is just to force a screen flush, needs rework*/
-		gf_term_set_option(m_term, GF_OPT_FREEZE_DISPLAY, 0);
-	}
-#else
-	CWindowGc& gc = SystemGc();
-	TRgb black(0,0,0);
-	TRect rect = Rect();
-	gc.SetBrushColor(black);
-	gc.Clear(rect);
-#endif
-}
-
-void COsmo4AppView::ShowHide(Bool show)
-{
-#ifndef GPAC_GUI_ONLY
-	if (show) {
-		MakeVisible(ETrue);
-		if (m_term) {
-			gf_term_set_option(m_term, GF_OPT_VISIBLE, 1);
-			DrawDeferred();
-		}
-	} else {
-		MakeVisible(EFalse);
-		if (m_term) gf_term_set_option(m_term, GF_OPT_VISIBLE, 0);
-	}
-#else
-	MakeVisible(ETrue);
-#endif
-}
-
-// -----------------------------------------------------------------------------
-// COsmo4AppView::SizeChanged()
-// Called by framework when the view size is changed.
-// -----------------------------------------------------------------------------
-//
-void COsmo4AppView::SizeChanged()
-{
-#ifndef GPAC_GUI_ONLY
-	if (m_term) {
-		TSize s = m_window.Size();
-		gf_term_set_size(m_term, s.iWidth, s.iHeight);
-	}
-#endif
-	DrawNow();
-}
-
-void COsmo4AppView::Connect(const char *url)
-{
-#ifndef GPAC_GUI_ONLY
-	char the_url1024;
-	/*copy before removing from recent files*/
-	strcpy(the_url, url);
-	gf_cfg_set_key(m_user.config, "RecentFiles", the_url, NULL);
-	gf_cfg_insert_key(m_user.config, "RecentFiles", the_url, "", 0);
-	u32 count = gf_cfg_get_key_count(m_user.config, "RecentFiles");
-	if (count > 10) gf_cfg_set_key(m_user.config, "RecentFiles", gf_cfg_get_key_name(m_user.config, "RecentFiles", count-1), NULL);
-
-	if (m_term) gf_term_connect(m_term, the_url);
-#endif
-}
-
-
-TKeyResponse COsmo4AppView::OfferKeyEventL(const TKeyEvent& aKeyEvent, TEventCode aType)
-{
-	GF_Event evt;
-	u32 ret;
-
-	evt.key.hw_code = aKeyEvent.iScanCode;
-	evt.key.flags = 0;
-	switch (aType) {
-	case EEventKeyUp:
-		evt.type = GF_EVENT_KEYUP;
-		break;
-	case EEventKeyDown:
-	case EEventKey:
-		evt.type = GF_EVENT_KEYDOWN;
-		break;
-	default:
-		return EKeyWasNotConsumed;
-	}
-
-	switch (aKeyEvent.iCode) {
-	case EKeyLeftArrow:
-		evt.key.key_code = GF_KEY_LEFT;
-		break;
-	case EKeyRightArrow:
-		evt.key.key_code = GF_KEY_RIGHT;
-		break;
-	case EKeyUpArrow:
-		evt.key.key_code = GF_KEY_UP;
-		break;
-	case EKeyDownArrow:
-		evt.key.key_code = GF_KEY_DOWN;
-		break;
-	case EKeyIncVolume:
-		evt.key.key_code = GF_KEY_VOLUMEUP;
-		break;
-	case EKeyDecVolume:
-		evt.key.key_code = GF_KEY_VOLUMEDOWN;
-		break;
-	default:
-		switch (aKeyEvent.iScanCode) {
-		case EStdKeyIncVolume:
-			evt.key.key_code = GF_KEY_VOLUMEUP;
-			break;
-		case EStdKeyDecVolume:
-			evt.key.key_code = GF_KEY_VOLUMEDOWN;
-			break;
-		default:
-			return EKeyWasNotConsumed;
-		}
-	}
-#ifndef GPAC_GUI_ONLY
-	ret = gf_term_user_event(m_term, &evt);
-	/*generate a key up*/
-	if (aType==EEventKey) {
-		evt.type = GF_EVENT_KEYUP;
-		ret += gf_term_user_event(m_term, &evt);
-	}
-#else
-	ret = 0;
-#endif
-	return ret ? EKeyWasConsumed : EKeyWasNotConsumed;
-}
-
-#if defined(__SERIES60_3X__)
-void COsmo4AppView::MrccatoCommand(TRemConCoreApiOperationId aOperationId, TRemConCoreApiButtonAction aButtonAct)
-{
-	GF_Event e;
-	switch (aOperationId) {
-	/*
-	    TRequestStatus status;
-		case ERemConCoreApiPausePlayFunction:
-		case ERemConCoreApiStop:
-		case ERemConCoreApiRewind:
-		case ERemConCoreApiForward:
-		case ERemConCoreApiFastForward:
-		case ERemConCoreApiBackward:
-			switch (aButtonAct) {
-			case ERemConCoreApiButtonPress:
-				break;
-			case ERemConCoreApiButtonRelease:
-				break;
-			case ERemConCoreApiButtonClick:
-				break;
-			default:
-				break;
-			}
-	*/
-	case ERemConCoreApiVolumeUp:
-	case ERemConCoreApiVolumeDown:
-#ifndef GPAC_GUI_ONLY
-		e.key.hw_code = 0;
-		e.key.flags = 0;
-		e.key.key_code = (aOperationId==ERemConCoreApiVolumeUp) ? GF_KEY_VOLUMEUP : GF_KEY_VOLUMEDOWN;
-		switch (aButtonAct) {
-		case ERemConCoreApiButtonPress:
-			e.type = GF_EVENT_KEYDOWN;
-			gf_term_user_event(m_term, &e);
-			break;
-		case ERemConCoreApiButtonRelease:
-			e.type = GF_EVENT_KEYUP;
-			gf_term_user_event(m_term, &e);
-			break;
-		default:
-			e.type = GF_EVENT_KEYDOWN;
-			gf_term_user_event(m_term, &e);
-			e.type = GF_EVENT_KEYUP;
-			gf_term_user_event(m_term, &e);
-			break;
-		}
-#endif
-		break;
-	default:
-		break;
-	}
-}
-
-#endif

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/osmo4_sym/osmo4_view.h Deleted

@@ -1,171 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2006-2012
- *					All rights reserved
- *
- *  This file is part of GPAC / Symbian GUI player
- *
- *  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.
- *
- */
-
-
-#ifndef __OSMO4_VIEW_H__
-#define __OSMO4_VIEW_H__
-
-// INCLUDES
-#include <coecntrl.h>
-
-#if defined(__SERIES60_3X__)
-#include <remconcoreapitargetobserver.h>
-#include <remconcoreapitarget.h>
-#include <remconinterfaceselector.h>
-#endif
-
-
-#include <gpac/terminal.h>
-#include <gpac/thread.h>
-
-
-// CLASS DECLARATION
-class COsmo4AppView : public CCoeControl
-#if defined(__SERIES60_3X__)
-	,MRemConCoreApiTargetObserver
-#endif
-
-{
-public: // New methods
-
-	/**
-	* NewL.
-	* Two-phased constructor.
-	* Create a COsmo4AppView object, which will draw itself to aRect.
-	* @param aRect The rectangle this view will be drawn to.
-	* @return a pointer to the created instance of COsmo4AppView.
-	*/
-	static COsmo4AppView* NewL( const TRect& aRect );
-
-	/**
-	* NewLC.
-	* Two-phased constructor.
-	* Create a COsmo4AppView object, which will draw itself
-	* to aRect.
-	* @param aRect Rectangle this view will be drawn to.
-	* @return A pointer to the created instance of COsmo4AppView.
-	*/
-	static COsmo4AppView* NewLC( const TRect& aRect );
-
-	/**
-	* ~COsmo4AppView
-	* Virtual Destructor.
-	*/
-	virtual ~COsmo4AppView();
-
-public:  // Functions from base classes
-
-	/**
-	* From CCoeControl, Draw
-	* Draw this COsmo4AppView to the screen.
-	* @param aRect the rectangle of this view that needs updating
-	*/
-	void Draw( const TRect& aRect ) const;
-
-	/**
-	* From CoeControl, SizeChanged.
-	* Called by framework when the view size is changed.
-	*/
-	virtual void SizeChanged();
-
-#ifndef GPAC_GUI_ONLY
-	GF_User *GetUser() {
-		return &m_user;
-	}
-#else
-	GF_User *GetUser() {
-		return NULL;
-	}
-#endif
-	void SetupLogs();
-	void MessageBox(const char *text, const char *title);
-
-	virtual TKeyResponse OfferKeyEventL(const TKeyEvent& aKeyEvent, TEventCode aType);
-
-#if defined(__SERIES60_3X__)
-	void MrccatoCommand(TRemConCoreApiOperationId aOperationId, TRemConCoreApiButtonAction aButtonAct);
-#endif
-
-	TInt OnTick();
-
-	void Shutdown();
-
-	void Connect(const char *url);
-	void ShowHide(Bool show);
-	Bool EventProc(GF_Event *evt);
-
-#ifndef GPAC_GUI_ONLY
-	GF_Terminal *m_term;
-#endif
-
-private: // Constructors
-
-	/**
-	* ConstructL
-	* 2nd phase constructor.
-	* Perform the second phase construction of a
-	* COsmo4AppView object.
-	* @param aRect The rectangle this view will be drawn to.
-	*/
-	void ConstructL(const TRect& aRect);
-
-	void DisplayRTI();
-
-	/**
-	* COsmo4AppView.
-	* C++ default constructor.
-	*/
-	COsmo4AppView();
-
-	CPeriodic *m_pTimer;
-
-	RWindow m_window;
-	RWsSession m_session;
-#ifndef GPAC_GUI_ONLY
-	GF_SystemRTInfo m_rti;
-#endif
-
-#if defined(__SERIES60_3X__)
-	CRemConInterfaceSelector *selector;
-	CRemConCoreApiTarget *target;
-#endif
-
-
-public:
-	u32 last_title_update;
-	FILE *m_Logs;
-	Bool do_log;
-	Bool show_rti;
-#ifndef GPAC_GUI_ONLY
-	GF_Mutex *m_mx;
-	GF_User m_user;
-#endif
-};
-
-
-#endif // __OSMO4_VIEW_H__
-
-// End of File
-

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/osmo4_sym/playlist.cpp Deleted

@@ -1,529 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2006-2012
- *					All rights reserved
- *
- *  This file is part of GPAC / Symbian GUI player
- *
- *  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 <eiktxlbx.h>
-#include <eiktxlbm.h>
-
-
-#include <gpac/utf.h>
-
-// INCLUDE FILES
-#include "osmo4_ui.h"
-#include "playlist.h"
-
-#ifdef USE_SKIN
-#include <aknlists.h>
-#include <akntabgrp.h>
-#include <AknsDrawUtils.h>// skin
-#include <AknsBasicBackgroundControlContext.h> //skin 
-#endif
-
-
-CPlaylist::CPlaylist()
-{
-	playlist_mode = 0;
-	view_all_files = 0;
-}
-CPlaylist::~CPlaylist()
-{
-	delete iListBox;
-	delete iBackGround;
-}
-
-CPlaylist* CPlaylist::NewL( const TRect& aRect, GF_User *user)
-{
-	CPlaylist* self = CPlaylist::NewLC( aRect, user);
-	CleanupStack::Pop( self );
-	return self;
-}
-CPlaylist* CPlaylist::NewLC( const TRect& aRect, GF_User *user)
-{
-	CPlaylist* self = new ( ELeave ) CPlaylist;
-	CleanupStack::PushL( self );
-	self->ConstructL( aRect, user);
-	return self;
-}
-
-void CPlaylist::ConstructL(const TRect& aRect, GF_User *user)
-{
-	CreateWindowL();
-
-#ifdef USE_SKIN
-	iListBox = new (ELeave) CAknSingleStyleListBox();
-#else
-	iListBox = new (ELeave) CEikTextListBox();
-#endif
-	iListBox->ConstructL(this);
-	iListBox->SetContainerWindowL(*this);
-	iListBox->SetListBoxObserver(this);
-
-	CDesCArray* textArray = new (ELeave) CDesCArrayFlat(16);
-	iListBox->Model()->SetItemTextArray( textArray );
-	iListBox->Model()->SetOwnershipType( ELbmOwnsItemArray );
-
-	// Creates scrollbar.
-	iListBox->CreateScrollBarFrameL( ETrue );
-	iListBox->ScrollBarFrame()->SetScrollBarVisibilityL(CEikScrollBarFrame::EAuto, CEikScrollBarFrame::EAuto);
-	//iListBox->ActivateL();
-
-	iListBox->SetFocus(ETrue);
-
-	SetRect(aRect);
-	ActivateL();
-	MakeVisible(EFalse);
-
-	strcpy(szCurrentDir, "");
-
-#ifndef GPAC_GUI_ONLY
-	m_user = user;
-
-	strcpy(ext_list, "");
-	u32 count = gf_cfg_get_key_count(user->config, "MimeTypes");
-	for (u32 i=0; i<count; i++) {
-		char szKeyList1000, *sKey;
-		const char *sMime = gf_cfg_get_key_name(user->config, "MimeTypes", i);
-		const char *opt = gf_cfg_get_key(user->config, "MimeTypes", sMime);
-		strcpy(szKeyList, opt+1);
-		sKey = strrchr(szKeyList, '\"');
-		if (!sKey) continue;
-		sKey0 = 0;
-		strcat(ext_list, szKeyList);
-		strcat(ext_list, " ");
-	}
-
-	const char *opt = gf_cfg_get_key(m_user->config, "General", "LastWorkingDir");
-	if (opt) strcpy(szCurrentDir, opt);
-#endif
-
-}
-
-void CPlaylist::SizeChanged()
-{
-	iListBox->SetRect( Rect() );
-}
-
-void CPlaylist::Draw(const TRect& aRect) const
-{
-#ifdef USE_SKIN
-	CWindowGc& gc = SystemGc();
-	MAknsSkinInstance* skin = AknsUtils::SkinInstance();
-	MAknsControlContext* cc = AknsDrawUtils::ControlContext( this );
-	AknsDrawUtils::Background( skin, cc, this, gc, aRect );
-#endif
-
-}
-
-#ifdef USE_SKIN
-TTypeUid::Ptr CPlaylist::MopSupplyObject(TTypeUid aId)
-{
-	if(aId.iUid == MAknsControlContext::ETypeId && iBackGround) {
-		return MAknsControlContext::SupplyMopObject( aId, iBackGround);
-	}
-	return CCoeControl::MopSupplyObject( aId );
-}
-#endif
-
-
-TInt CPlaylist::CountComponentControls() const
-{
-	return 1;
-}
-CCoeControl* CPlaylist::ComponentControl(TInt aIndex) const
-{
-	switch (aIndex) {
-	case 0:
-		return iListBox;
-	default:
-		return NULL;
-	}
-}
-
-TKeyResponse CPlaylist::OfferKeyEventL(const TKeyEvent& aKeyEvent, TEventCode aType)
-{
-	if (aType != EEventKey) return iListBox->OfferKeyEventL(aKeyEvent, aType);
-
-	switch (aKeyEvent.iScanCode) {
-	case EStdKeyEnter:
-		HandleSelection();
-		return EKeyWasConsumed;
-	default:
-		return iListBox->OfferKeyEventL(aKeyEvent, aType);
-	}
-}
-void CPlaylist::HandleListBoxEventL(CEikListBox* aListBox, TListBoxEvent aEventType )
-{
-	if (aEventType == MEikListBoxObserver::EEventItemClicked ||
-	        aEventType == MEikListBoxObserver::EEventEnterKeyPressed)
-
-		HandleSelection();
-}
-
-void CPlaylist::ShowHide(Bool show)
-{
-	if (show) {
-		RefreshPlaylist();
-		MakeVisible(ETrue);
-		DrawNow();
-	} else {
-		/*cleanup*/
-		ResetView();
-		MakeVisible(EFalse);
-		((COsmo4AppUi *) CEikonEnv::Static()->AppUi())->SetTitle(NULL, 0);
-	}
-}
-
-
-void CPlaylist::FlushItemList()
-{
-	iListBox->HandleItemAdditionL();
-	iListBox->SetCurrentItemIndexAndDraw(0);
-}
-
-void CPlaylist::ResetView()
-{
-	CDesCArray* array = static_cast<CDesCArray*>(iListBox->Model()->ItemTextArray());
-	array->Reset();
-	iListBox->Reset();
-}
-
-void CPlaylist::AddItem(const char *name, int is_directory)
-{
-	TBuf<100> tmp;
-	char szName100;
-	CDesCArray* array = static_cast<CDesCArray*>(iListBox->Model()->ItemTextArray());
-
-	if (is_directory) {
-#ifdef USE_SKIN
-		sprintf(szName, "\t+ %s\t\t", name);
-#else
-		sprintf(szName, "+ %s", name);
-#endif
-	} else {
-#ifdef USE_SKIN
-		sprintf(szName, "\t%s\t\t", name);
-#else
-		strcpy(szName, name);
-#endif
-	}
-	tmp.SetLength(strlen(szName)+1);
-	tmp.Copy( TPtrC8(( TText8* ) szName) );
-	tmp.ZeroTerminate();
-	array->AppendL(tmp);
-}
-
-static Bool enum_dirs(void *cbk, char *name, char *path, GF_FileEnumInfo *file_info)
-{
-	CPlaylist *of = (CPlaylist *)cbk;
-	of->AddItem(name, 1);
-	return 0;
-}
-
-static Bool enum_files(void *cbk, char *name, char *path, GF_FileEnumInfo *file_info)
-{
-	CPlaylist *of = (CPlaylist *)cbk;
-	of->AddItem(name, 0);
-	return 0;
-}
-
-
-void CPlaylist::ScanDirectory(const char *dir)
-{
-	ResetView();
-
-	if (!dir || !strlen(dir)) {
-		RFs iFs;
-		TDriveList aList;
-		iFs.Connect();
-		iFs.DriveList(aList);
-		for (TInt i=0; i<KMaxDrives; i++) {
-			if (aListi) {
-				TChar aDrive;
-				iFs.DriveToChar(i, aDrive);
-				sprintf(szCurrentDir, "%c:", (TUint)aDrive);
-				AddItem(szCurrentDir, 0);
-			}
-		}
-		iFs.Close();
-		FlushItemList();
-		strcpy(szCurrentDir, "");
-		return;
-	} else {
-		strcpy(szCurrentDir, dir);
-		AddItem("..", 1);
-	}
-
-#ifndef GPAC_GUI_ONLY
-	gf_enum_directory((const char *) szCurrentDir, 1, enum_dirs, this, NULL);
-	gf_enum_directory((char *) szCurrentDir, 0, enum_files, this, view_all_files ? NULL : ext_list);
-#endif
-	FlushItemList();
-
-	((COsmo4AppUi *) CEikonEnv::Static()->AppUi())->SetTitle(szCurrentDir, 0);
-
-}
-
-void CPlaylist::GetSelectionName(char *szName)
-{
-	CDesCArray* array = static_cast<CDesCArray*>(iListBox->Model()->ItemTextArray());
-	TInt idx = iListBox->CurrentItemIndex();
-
-#ifndef GPAC_GUI_ONLY
-
-#if defined(_UNICODE)
-	size_t len;
-	/*handle terminating zero !!*/
-	u16 szNameUTF16100;
-	len = (*array)idx.Size();
-	memcpy(szNameUTF16, (*array)idx.Ptr(), sizeof(u8)*len);
-	szNameUTF16len/2 = 0;
-	const u16 *sptr = szNameUTF16;
-
-	/*skip initial '\t'*/
-#ifdef USE_SKIN
-	sptr += 1;
-#endif
-
-	len = gf_utf8_wcstombs(szName, 512, &sptr);
-	szNamelen = 0;
-
-
-#else
-
-	char *src = (*array)idx).Ptr();
-	/*skip initial '\t'*/
-#ifdef USE_SKIN
-	src += 1;
-#endif
-	strcpy(szName, (const char *) src) ;
-#endif
-
-	/*remove trailing "\t\t"*/
-#ifdef USE_SKIN
-	len = strlen(szName);
-	szNamelen-2 = 0;
-#endif
-
-#else
-	szName0 = 0;
-#endif
-
-}
-
-void CPlaylist::HandleSelection()
-{
-	char szName100;
-	GetSelectionName(szName);
-
-	/*sub-directory*/
-	if ((szName0 == '+') && (szName1 == ' ')) {
-		/*browse up*/
-		if ((szName2 == '.') && (szName3 == '.')) {
-			char *prev = strrchr(szCurrentDir, '\\');
-			if (prev) {
-				prev0 = 0;
-				ScanDirectory(szCurrentDir);
-			} else {
-				ScanDirectory(NULL);
-			}
-		} else {
-			strcat(szCurrentDir, "\\");
-			strcat(szCurrentDir, szName+2);
-			ScanDirectory(szCurrentDir);
-		}
-	} else if (szName1 == ':') {
-		ScanDirectory(szName);
-	} else {
-		char szURL1024;
-		COsmo4AppUi *app = (COsmo4AppUi *) CEikonEnv::Static()->AppUi();
-		if (playlist_mode) {
-			TInt idx = iListBox->CurrentItemIndex();
-#ifndef GPAC_GUI_ONLY
-			const char *url = gf_cfg_get_key_name(m_user->config, "Playlist", idx);
-			if (url) app->PlayURL(url);
-#endif
-		} else {
-			gf_cfg_set_key(m_user->config, "General", "LastWorkingDir", (const char *) szCurrentDir);
-			sprintf(szURL, "%s\\%s", szCurrentDir, szName);
-			app->PlayURL(szURL);
-		}
-	}
-}
-
-Bool CPlaylist::SelectionIsFile()
-{
-	char szName100;
-	GetSelectionName(szName);
-	if ((szName0 == '+') && (szName1 == ' ')) return 0;
-	else if (szName1 == ':') return 0;
-	return 1;
-}
-
-Bool CPlaylist::IsInPlaylist()
-{
-	char szURL1024;
-	char szName100;
-	GetSelectionName(szName);
-	if ((szName0 == '+') && (szName1 == ' ')) return 0;
-	else if (szName1 == ':') return 0;
-
-	/*remove from playlist*/
-	sprintf(szURL, "%s\\%s", szCurrentDir, szName);
-#ifndef GPAC_GUI_ONLY
-	const char *opt = gf_cfg_get_key(m_user->config, "Playlist", szURL);
-	if (opt) return 1;
-#endif
-	return 0;
-}
-
-static Bool dir_add_files(void *cbk, char *name, char *path, GF_FileEnumInfo *file_info)
-{
-	CPlaylist *pl = (CPlaylist *)cbk;
-
-#if 0
-	if (!bViewUnknownTypes && extension_list) {
-		char *ext = strrchr(name, '.');
-		if (!ext || !strstr(extension_list, ext+1)) return 0;
-	}
-#endif
-
-#ifndef GPAC_GUI_ONLY
-	gf_cfg_set_key(pl->m_user->config, "Playlist", path, "");
-#endif
-
-	return 0;
-}
-
-
-void CPlaylist::RefreshPlaylist()
-{
-	if (playlist_mode) {
-#ifndef GPAC_GUI_ONLY
-		u32 count = gf_cfg_get_key_count(m_user->config, "Playlist");
-		ResetView();
-		for (u32 i=0; i<count; i++) {
-			const char *opt = gf_cfg_get_key_name(m_user->config, "Playlist", i);
-			const char *sep = strrchr(opt, '\\');
-			if (!sep) sep = strrchr(opt, '/');
-			AddItem(sep ? (sep+1) : opt, 0);
-		}
-		if (!count) AddItem("empty", 0);
-#endif
-		FlushItemList();
-
-		((COsmo4AppUi *) CEikonEnv::Static()->AppUi())->SetTitle("Playlist", 0);
-	} else {
-		ScanDirectory(szCurrentDir);
-	}
-}
-
-
-void CPlaylist::PlaylistAct(Osmo4_PLActions act)
-{
-	char szURL1024;
-	char szName100;
-	CDesCArray*array;
-	TInt idx;
-	TInt count;
-
-	if (act==Osmo4PLClear) {
-		while (1) {
-#ifndef GPAC_GUI_ONLY
-			const char *opt = gf_cfg_get_key_name(m_user->config, "Playlist", 0);
-			if (!opt) break;
-			gf_cfg_set_key(m_user->config, "Playlist", opt, NULL);
-#endif
-		}
-		RefreshPlaylist();
-		return;
-	} else if (act == Osmo4PLToggleMode) {
-		playlist_mode = !playlist_mode;
-		RefreshPlaylist();
-		return;
-	} else if (act == Osmo4PLToggleAllFiles) {
-		view_all_files = !view_all_files;
-		RefreshPlaylist();
-		return;
-	} else if (act == Osmo4PLAdd) {
-#ifndef GPAC_GUI_ONLY
-		GetSelectionName(szName);
-		if ((szName0 == '+') && (szName1 == ' ')) {
-			if ((szName2 != '.') && (szName3 != '.')) {
-				sprintf(szURL, "%s\\%s", szCurrentDir, szName+2);
-				gf_enum_directory(szURL, 0, dir_add_files, this, view_all_files ? NULL : ext_list);
-			}
-		} else if (szName1 == ':') {
-			gf_enum_directory(szName, 0, dir_add_files, this, view_all_files ? NULL : ext_list);
-		} else {
-			sprintf(szURL, "%s\\%s", szCurrentDir, szName);
-			gf_cfg_set_key(m_user->config, "Playlist", szURL, "");
-		}
-#endif
-		return;
-	}
-
-	GetSelectionName(szName);
-	if ((szName0 == '+') && (szName1 == ' ')) return;
-	else if (szName1 == ':') return;
-
-	switch (act) {
-	/*remove from playlist*/
-	case Osmo4PLRem:
-#ifndef GPAC_GUI_ONLY
-		sprintf(szURL, "%s\\%s", szCurrentDir, szName);
-		gf_cfg_set_key(m_user->config, "Playlist", szURL, NULL);
-#endif
-		RefreshPlaylist();
-		break;
-	/*move up*/
-	case Osmo4PLMoveUp:
-		array = static_cast<CDesCArray*>(iListBox->Model()->ItemTextArray());
-		count = array->Count();
-		idx = iListBox->CurrentItemIndex();
-		sprintf(szURL, "%s\\%s", szCurrentDir, szName);
-#ifndef GPAC_GUI_ONLY
-		gf_cfg_set_key(m_user->config, "Playlist", szURL, NULL);
-		gf_cfg_insert_key(m_user->config, "Playlist", szURL, "", idx-1);
-#endif
-		RefreshPlaylist();
-		if (idx>1) iListBox->SetCurrentItemIndexAndDraw(idx-1);
-		break;
-	/*move down*/
-	case Osmo4PLMoveDown:
-		array = static_cast<CDesCArray*>(iListBox->Model()->ItemTextArray());
-		count = array->Count();
-		idx = iListBox->CurrentItemIndex();
-		sprintf(szURL, "%s\\%s", szCurrentDir, szName);
-#ifndef GPAC_GUI_ONLY
-		gf_cfg_set_key(m_user->config, "Playlist", szURL, NULL);
-		gf_cfg_insert_key(m_user->config, "Playlist", szURL, "", idx+1);
-#endif
-		RefreshPlaylist();
-		if (idx<count-1) iListBox->SetCurrentItemIndexAndDraw(idx+1);
-		break;
-	default:
-		break;
-	}
-}
-

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/osmo4_sym/playlist.h Deleted

@@ -1,114 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2006-2012
- *					All rights reserved
- *
- *  This file is part of GPAC / Symbian GUI player
- *
- *  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.
- *
- */
-
-#ifndef __osmo4playlist_H__
-#define __osmo4playlist_H__
-
-#include <e32base.h>
-#include <coecntrl.h>
-#include <eiklbo.h>
-
-#define USE_SKIN
-
-#ifdef USE_SKIN
-class MAknsControlContext; // for skins support
-#endif
-
-
-#include <gpac/user.h>
-
-class CEikTextListBox; //For list box
-
-enum Osmo4_PLActions
-{
-	Osmo4PLAdd = 0,
-	Osmo4PLRem,
-	Osmo4PLClear,
-	Osmo4PLMoveUp,
-	Osmo4PLMoveDown,
-	Osmo4PLToggleMode,
-	Osmo4PLToggleAllFiles,
-};
-
-class CPlaylist : public CCoeControl,MEikListBoxObserver
-{
-public:
-	static CPlaylist* NewL( const TRect& aRect, GF_User *user);
-	static CPlaylist* NewLC( const TRect& aRect, GF_User *user);
-	virtual ~CPlaylist();
-	void SizeChanged();
-
-	virtual TKeyResponse OfferKeyEventL(const TKeyEvent& aKeyEvent, TEventCode aType);
-
-	void HandleListBoxEventL(CEikListBox* aListBox, TListBoxEvent aEventType );
-
-	void AddItem(const char *name, int is_directory);
-	TInt CountComponentControls() const;
-	CCoeControl* ComponentControl(TInt aIndex) const;
-	void Draw(const TRect& aRect) const;
-
-	void ShowHide(Bool show);
-	Bool SelectionIsFile();
-	Bool IsInPlaylist();
-	Bool PlaylistMode() {
-		return playlist_mode;
-	}
-	Bool ViewAllFiles() {
-		return view_all_files;
-	}
-
-	void PlaylistAct(Osmo4_PLActions act);
-
-#ifndef GPAC_GUI_ONLY
-	GF_User *m_user;
-#endif
-
-private:
-	void ConstructL(const TRect& aRect, GF_User *user);
-	CPlaylist();
-
-
-#ifdef USE_SKIN
-	TTypeUid::Ptr MopSupplyObject(TTypeUid aId);
-	MAknsControlContext* iBackGround;
-#endif
-
-
-	void ResetView();
-	void FlushItemList();
-	void ScanDirectory(const char *dir);
-	void HandleSelection();
-	void GetSelectionName(char *name);
-	void RefreshPlaylist();
-
-	char szCurrentDir1024;
-	CEikTextListBox* iListBox;
-	Bool playlist_mode;
-	Bool view_all_files;
-	char ext_list4096;
-};
-
-#endif //__osmo4playlist_H__
-

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/osmo4_sym/res Deleted

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/osmo4_sym/res/osmo4.rss Deleted

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/osmo4_sym/res/osmo4.svg Deleted

@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg baseProfile="tiny" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="100%" height="100%" viewBox="0 0 88 88">
-<g>
-<g>
-<rect fill="none" width="88" height="88"/>
-</g>
-
-<defs>
-<radialGradient id="grad1" fx="0.45" fy="0.2">
-<stop offset="0" stop-color="rgb(128, 128, 128)"/>
-<stop offset="1" stop-color="black"/>
-</radialGradient>
-<radialGradient id="grad2" fx="0.5" fy="0.5">
-<stop offset="0" stop-color="black"/>
-<stop offset="0.8" stop-color="rgb(128,0,0)"/>
-<stop offset="0.9" stop-color="rgb(255,0,0)"/>
-<stop offset="1" stop-color="rgb(128,0,0)"/>
-</radialGradient>
-</defs>
-
-<g transform="translate(1,1)">
-<circle fill="rgb(128, 128, 128)" cx="44" cy="54" r="20"/> 
-<polygon fill="rgb(128, 128, 128)" points="44 34 64 14 24 14"/> 
-<circle fill="none" stroke-width="8" stroke="rgb(128, 128, 128)" cx="44" cy="44" r="34"/> 
-</g>
-
-<g>
-<circle fill="url(#grad1)" cx="44" cy="54" r="20"/> 
-<polygon fill="black" points="44 34 64 14 24 14"/> 
-<circle fill="none" stroke-width="8" stroke="red" cx="44" cy="44" r="34"/> 
-</g>
-
-</g>
-</svg>

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/osmo4_sym/res/osmo4_caption.rss Deleted

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/osmo4_sym/res/osmo4_gen.rss Deleted

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/osmo4_sym/res/osmo4_reg.rss Deleted

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/osmo4_w32 Deleted

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/osmo4_w32/AddressBar.cpp Deleted

@@ -1,182 +0,0 @@
-// AddressBar.cpp : implementation file
-//
-
-#include "stdafx.h"
-#include "osmo4.h"
-#include "MainFrm.h"
-
-#ifdef _DEBUG
-#define new DEBUG_NEW
-#undef THIS_FILE
-static char THIS_FILE = __FILE__;
-#endif
-
-/////////////////////////////////////////////////////////////////////////////
-// AddressBar dialog
-
-IMPLEMENT_DYNAMIC(CInitDialogBar, CDialogBar)
-
-BEGIN_MESSAGE_MAP(CInitDialogBar, CDialogBar)
-END_MESSAGE_MAP()
-
-
-CInitDialogBar::CInitDialogBar()
-{
-}
-
-CInitDialogBar::~CInitDialogBar()
-{
-}
-
-BOOL CInitDialogBar::Create(CWnd * pParentWnd, LPCTSTR lpszTemplateName, UINT nStyle, UINT nID)
-{
-	if(!CDialogBar::Create(pParentWnd, lpszTemplateName, nStyle, nID))
-		return FALSE;
-
-	if (!OnInitDialog()) return FALSE;
-
-	return TRUE;
-}
-
-BOOL CInitDialogBar::Create(CWnd * pParentWnd, UINT nIDTemplate, UINT nStyle, UINT nID)
-{
-	if(!Create(pParentWnd, MAKEINTRESOURCE(nIDTemplate), nStyle, nID)) return FALSE;
-
-	if(!OnInitDialog()) return FALSE;
-	return TRUE;
-}
-
-
-BOOL CInitDialogBar::OnInitDialog()
-{
-	UpdateData(FALSE);
-	return TRUE;
-}
-
-void CInitDialogBar::DoDataExchange(CDataExchange* pDX)
-{
-	CDialogBar::DoDataExchange(pDX);
-}
-
-
-
-IMPLEMENT_DYNAMIC(AddressBar, CInitDialogBar)
-
-
-BEGIN_MESSAGE_MAP(AddressBar, CInitDialogBar)
-	//{{AFX_MSG_MAP(AddressBar)
-	ON_WM_SIZE()
-	ON_WM_CLOSE()
-	ON_CBN_SELENDOK(IDC_ADDRESS, OnSelendOK)
-	//}}AFX_MSG_MAP
-END_MESSAGE_MAP()
-
-
-AddressBar::AddressBar () : CInitDialogBar()
-{
-}
-
-BOOL AddressBar::OnInitDialog()
-{
-	CInitDialogBar::OnInitDialog();
-
-	return TRUE;
-}
-
-
-void AddressBar::DoDataExchange(CDataExchange* pDX)
-{
-	CInitDialogBar::DoDataExchange(pDX);
-	//{{AFX_DATA_MAP(AddressBar)
-	DDX_Control(pDX, IDC_DUMTXT, m_Title);
-	DDX_Control(pDX, IDC_ADDRESS, m_Address);
-	//}}AFX_DATA_MAP
-}
-
-
-/////////////////////////////////////////////////////////////////////////////
-// AddressBar message handlers
-
-void AddressBar::OnSize(UINT nType, int cx, int cy)
-{
-	u32 w;
-	POINT pt;
-	//CDialog::OnSize(nType, cx, cy);
-
-	if (!m_Address.m_hWnd) return;
-	RECT rc;
-	m_Title.GetClientRect(&rc);
-	w = rc.right - rc.left;
-	m_Address.GetWindowRect(&rc);
-	pt.x = rc.left;
-	pt.y = rc.top;
-	ScreenToClient(&pt);
-	rc.right = cx - pt.x;
-	m_Address.SetWindowPos(this, 0, 0, rc.right, rc.bottom, SWP_NOZORDER | SWP_NOMOVE);
-
-}
-
-void AddressBar::OnClose()
-{
-}
-
-void AddressBar::ReloadURLs()
-{
-	Osmo4 *gpac = GetApp();
-	u32 i=0;
-
-	while (m_Address.GetCount()) m_Address.DeleteString(0);
-	while (1) {
-		const char *sOpt = gf_cfg_get_key_name(gpac->m_user.config, "RecentFiles", i);
-		if (!sOpt) return;
-		m_Address.AddString(sOpt);
-		i++;
-	}
-}
-
-void AddressBar::SelectionReady()
-{
-	void UpdateLastFiles(GF_Config *cfg, const char *URL);
-
-	CString URL;
-	int sel = m_Address.GetCurSel();
-	if (sel == CB_ERR) {
-		m_Address.GetWindowText(URL);
-	} else {
-		m_Address.GetLBText(sel, URL);
-	}
-	if (!URL.GetLength()) return;
-	Osmo4 *gpac = GetApp();
-	Playlist *pl = ((CMainFrame*)gpac->m_pMainWnd)->m_pPlayList;
-	/*don't store local files*/
-	if (URL.Find("://", 0)>0) {
-		UpdateLastFiles(gpac->m_user.config, URL);
-		ReloadURLs();
-	}
-	pl->Truncate();
-	pl->QueueURL(URL);
-	pl->RefreshList();
-	pl->PlayNext();
-}
-
-void AddressBar::OnSelendOK()
-{
-	SelectionReady();
-}
-
-BOOL AddressBar::PreTranslateMessage(MSG* pMsg)
-{
-	if (pMsg->message == WM_KEYDOWN) {
-		switch (pMsg->wParam) {
-		case VK_RETURN:
-			::TranslateMessage(pMsg);
-			::DispatchMessage(pMsg);
-			SelectionReady();
-			return TRUE;
-		default:
-			break;
-		}
-	}
-	return CInitDialogBar::PreTranslateMessage(pMsg);
-}
-

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/osmo4_w32/AddressBar.h Deleted

@@ -1,90 +0,0 @@
-#if !defined(AFX_ADDRESSBAR_H__B0764C99_5CC2_4412_8B1F_22E71BAD70F0__INCLUDED_)
-#define AFX_ADDRESSBAR_H__B0764C99_5CC2_4412_8B1F_22E71BAD70F0__INCLUDED_
-
-#if _MSC_VER > 1000
-#pragma once
-#endif // _MSC_VER > 1000
-// AddressBar.h : header file
-//
-
-
-/////////////////////////////////////////////////////////////////////////////
-// AddressBar dialog
-
-class CInitDialogBar : public CDialogBar
-{
-	DECLARE_DYNAMIC(CInitDialogBar)
-
-// Construction
-public:
-	CInitDialogBar();
-	virtual ~CInitDialogBar();
-
-// Overrides
-	// ClassWizard generated virtual function overrides
-	//{{AFX_VIRTUAL(CInitDialogBar)
-protected:
-	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
-	//}}AFX_VIRTUAL
-
-public:
-	virtual BOOL Create(CWnd * pParentWnd, UINT nIDTemplate, UINT nStyle, UINT nID);
-	virtual BOOL Create(CWnd * pParentWnd, LPCTSTR lpszTemplateName, UINT nStyle, UINT nID);
-
-protected:
-	virtual BOOL OnInitDialog();
-
-protected:
-
-	DECLARE_MESSAGE_MAP()
-};
-
-/////////////////////////////////////////////////////////////////////////////
-// AddressBar dialog
-
-class AddressBar : public CInitDialogBar
-{
-
-	DECLARE_DYNAMIC(AddressBar)
-
-	// Construction
-public:
-	AddressBar();
-
-// Dialog Data
-	//{{AFX_DATA(AddressBar)
-	enum { IDD = IDD_NAVBAR };
-	CStatic	m_Title;
-	CComboBox	m_Address;
-	//}}AFX_DATA
-
-	void ReloadURLs();
-	void SelectionReady();
-
-
-// Overrides
-	// ClassWizard generated virtual function overrides
-	//{{AFX_VIRTUAL(AddressBar)
-protected:
-	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
-	virtual BOOL PreTranslateMessage(MSG* pMsg);
-	//virtual BOOL OnCommand(WPARAM wParam, LPARAM lParam);
-	//}}AFX_VIRTUAL
-
-// Implementation
-protected:
-
-	// Generated message map functions
-	//{{AFX_MSG(AddressBar)
-	virtual BOOL OnInitDialog();
-	afx_msg void OnSize(UINT nType, int cx, int cy);
-	afx_msg void OnClose();
-	afx_msg void OnSelendOK();
-	//}}AFX_MSG
-	DECLARE_MESSAGE_MAP()
-};
-
-//{{AFX_INSERT_LOCATION}}
-// Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_ADDRESSBAR_H__B0764C99_5CC2_4412_8B1F_22E71BAD70F0__INCLUDED_)

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/osmo4_w32/FileProps.cpp Deleted

@@ -1,622 +0,0 @@
-// FileProps.cpp : implementation file
-//
-
-#include "stdafx.h"
-#include "osmo4.h"
-#include "FileProps.h"
-#include "MainFrm.h"
-
-/*ISO 639 languages*/
-#include <gpac/iso639.h>
-
-#ifdef _DEBUG
-#define new DEBUG_NEW
-#undef THIS_FILE
-static char THIS_FILE = __FILE__;
-#endif
-
-/////////////////////////////////////////////////////////////////////////////
-// CFileProps dialog
-
-
-CFileProps::CFileProps(CWnd* pParent /*=NULL*/)
-	: CDialog(CFileProps::IDD, pParent)
-{
-	//{{AFX_DATA_INIT(CFileProps)
-	//}}AFX_DATA_INIT
-}
-
-
-void CFileProps::DoDataExchange(CDataExchange* pDX)
-{
-	CDialog::DoDataExchange(pDX);
-	//{{AFX_DATA_MAP(CFileProps)
-	DDX_Control(pDX, IDC_VIEWSEL, m_ViewSel);
-	DDX_Control(pDX, IDC_ODINFO, m_ODInfo);
-	DDX_Control(pDX, IDC_ODTREE, m_ODTree);
-	//}}AFX_DATA_MAP
-}
-
-
-BEGIN_MESSAGE_MAP(CFileProps, CDialog)
-	//{{AFX_MSG_MAP(CFileProps)
-	ON_NOTIFY(TVN_SELCHANGED, IDC_ODTREE, OnSelchangedOdtree)
-	ON_BN_CLICKED(IDC_WORLD, OnWorld)
-	ON_BN_CLICKED(IDC_VIEWSG, OnViewsg)
-	ON_WM_TIMER()
-	ON_WM_CLOSE()
-	ON_WM_DESTROY()
-	ON_NOTIFY(TCN_SELCHANGE, IDC_VIEWSEL, OnSelchangeViewsel)
-	//}}AFX_MSG_MAP
-END_MESSAGE_MAP()
-
-/////////////////////////////////////////////////////////////////////////////
-// CFileProps message handlers
-
-
-#define FP_TIMER_ID	20
-
-BOOL CFileProps::OnInitDialog()
-{
-	CDialog::OnInitDialog();
-
-	char sText5000;
-	sprintf(sText, "%s Properties", ((CMainFrame*)GetApp()->m_pMainWnd)->m_pPlayList->GetDisplayName());
-
-	SetWindowText(sText);
-	current_odm = NULL;
-
-	m_ViewSel.InsertItem(0, "General");
-	m_ViewSel.InsertItem(1, "Streams");
-	m_ViewSel.InsertItem(2, "Playback");
-	m_ViewSel.InsertItem(3, "Network");
-
-	m_ODTree.SetIndent(0);
-	RewriteODTree();
-	SetTimer(FP_TIMER_ID, 500, NULL);
-
-	return TRUE;
-}
-
-
-void CFileProps::WriteInlineTree(GF_ObjectManager *root_od, HTREEITEM parent)
-{
-	Osmo4 *gpac = GetApp();
-
-	/*browse all ODs*/
-	u32 count = gf_term_get_object_count(gpac->m_term, root_od);
-
-	for (u32 i=0; i<count; i++) {
-		GF_ObjectManager *odm = gf_term_get_object(gpac->m_term, root_od, i);
-		if (!odm) return;
-		HTREEITEM item = m_ODTree.InsertItem("Object Descriptor", 0, 0, parent);
-		m_ODTree.SetItemData(item, (DWORD) odm);
-		/*if inline propagate*/
-		switch (gf_term_object_subscene_type(gpac->m_term, odm)) {
-		case 1:
-			m_ODTree.SetItemText(item, "Root Scene");
-			WriteInlineTree(odm, item);
-			break;
-		case 2:
-			m_ODTree.SetItemText(item, "Inline Scene");
-			WriteInlineTree(odm, item);
-			break;
-		case 3:
-			m_ODTree.SetItemText(item, "Extern Proto Lib");
-			WriteInlineTree(odm, item);
-			break;
-		default:
-			break;
-		}
-	}
-}
-
-void CFileProps::RewriteODTree()
-{
-	Osmo4 *gpac = GetApp();
-
-	m_ODTree.DeleteAllItems();
-
-	GF_ObjectManager *root_odm = gf_term_get_root_object(gpac->m_term);
-	if (!root_odm) return;
-
-	HTREEITEM root = m_ODTree.InsertItem("Root OD", 0, 0);
-	m_ODTree.SetItemData(root, (DWORD) root_odm);
-
-	m_ODTree.SetItemText(root, "Root Scene");
-	WriteInlineTree(root_odm, root);
-}
-
-void CFileProps::OnSelchangedOdtree(NMHDR* pNMHDR, LRESULT* pResult)
-{
-	NM_TREEVIEW* pNMTreeView = (NM_TREEVIEW*)pNMHDR;
-	*pResult = 0;
-
-	HTREEITEM item = m_ODTree.GetSelectedItem();
-	GF_ObjectManager *odm = (GF_ObjectManager *) m_ODTree.GetItemData(item);
-	if (!odm) return;
-
-	SetInfo(odm);
-}
-
-
-void CFileProps::OnClose()
-{
-	KillTimer(FP_TIMER_ID);
-	DestroyWindow();
-}
-
-void CFileProps::OnDestroy()
-{
-	CDialog::OnDestroy();
-	delete this;
-	((CMainFrame *)GetApp()->m_pMainWnd)->m_pProps = NULL;
-}
-
-void CFileProps::OnSelchangeViewsel(NMHDR* pNMHDR, LRESULT* pResult)
-{
-	SetInfo(current_odm);
-	*pResult = 0;
-}
-
-void CFileProps::SetInfo(GF_ObjectManager *odm)
-{
-	current_odm = odm;
-	switch (m_ViewSel.GetCurSel()) {
-	case 3:
-		SetNetworkInfo();
-		break;
-	case 2:
-		SetDecoderInfo();
-		break;
-	case 1:
-		SetStreamsInfo();
-		break;
-	default:
-		SetGeneralInfo();
-		break;
-	}
-}
-
-void CFileProps::OnTimer(UINT_PTR nIDEvent)
-{
-	if (nIDEvent == FP_TIMER_ID) {
-		switch (m_ViewSel.GetCurSel()) {
-		case 3:
-			SetNetworkInfo();
-			break;
-		case 2:
-			SetDecoderInfo();
-			break;
-		}
-	}
-
-	CDialog::OnTimer(nIDEvent);
-}
-
-void CFileProps::SetGeneralInfo()
-{
-	char info10000;
-	char buf1000;
-	GF_MediaInfo odi;
-	GF_ObjectManager *odm;
-	u32 h, m, s, i, j;
-
-	Osmo4 *gpac = GetApp();
-	odm = current_odm;
-
-	strcpy(info, "");
-	if (!odm || gf_term_get_object_info(gpac->m_term, odm, &odi) != GF_OK) return;
-
-	if (!odi.od) {
-		strcat(info, odi.service_url);
-		m_ODInfo.SetWindowText(info);
-		return;
-	}
-	sprintf(buf, "%sObject Descriptor ID %d\r\n", (odi.has_profiles) ? "Initial " : "", odi.od->objectDescriptorID);
-	strcat(info, buf);
-	if (odi.duration) {
-		h = (u32) (odi.duration / 3600);
-		m = (u32) (odi.duration / 60) - h*60;
-		s = (u32) (odi.duration) - h*3600 - m*60;
-		sprintf(buf, "Duration %02d:%02d:%02d\r\n", h, m, s);
-		strcat(info, buf);
-	} else {
-		strcat(info, "Unknown duration\r\n");
-	}
-	if (odi.owns_service) {
-		strcat(info, "Service Handler: ");
-		strcat(info, odi.service_handler);
-		strcat(info, "\r\n");
-		strcat(info, "Service URL: ");
-		strcat(info, odi.service_url);
-		strcat(info, "\r\n");
-	}
-
-	if (odi.od->URLString) {
-		strcat(info, "Remote OD - URL: ");
-		strcat(info, odi.od->URLString);
-		strcat(info, "\r\n");
-	}
-	/*get OD content info*/
-	if (odi.codec_name) {
-		switch (odi.od_type) {
-		case GF_STREAM_VISUAL:
-			sprintf(buf, "Video Object: Width %d - Height %d\r\n", odi.width, odi.height);
-			strcat(info, buf);
-			strcat(info, "Media Codec ");
-			strcat(info, odi.codec_name);
-			strcat(info, "\r\n");
-			if (odi.par) {
-				sprintf(buf, "Pixel Aspect Ratio: %d:%d\r\n", (odi.par>>16)&0xFF, (odi.par)&0xFF);
-				strcat(info, buf);
-			}
-			break;
-		case GF_STREAM_AUDIO:
-			sprintf(buf, "Audio Object: Sample Rate %d - %d channels\r\n", odi.sample_rate, odi.num_channels);
-			strcat(info, buf);
-			strcat(info, "Media Codec ");
-			strcat(info, odi.codec_name);
-			strcat(info, "\r\n");
-			break;
-		case GF_STREAM_PRIVATE_SCENE:
-		case GF_STREAM_SCENE:
-			if (odi.width && odi.height) {
-				sprintf(buf, "Scene Description: Width %d - Height %d\r\n", odi.width, odi.height);
-			} else {
-				sprintf(buf, "Scene Description: No size specified\r\n");
-			}
-			strcat(info, buf);
-			strcat(info, "Scene Codec ");
-			strcat(info, odi.codec_name);
-			strcat(info, "\r\n");
-			break;
-		case GF_STREAM_TEXT:
-			if (odi.width && odi.height) {
-				sprintf(buf, "Text Object: Width %d - Height %d\r\n", odi.width, odi.height);
-			} else {
-				sprintf(buf, "Text Object: No size specified\r\n");
-			}
-			strcat(info, buf);
-			strcat(info, "Text Codec ");
-			strcat(info, odi.codec_name);
-			strcat(info, "\r\n");
-			break;
-		}
-	}
-	if (odi.protection) {
-		strcat(info, "Encrypted Media");
-		if (odi.protection==2) strcat(info, " NOT UNLOCKED");
-		strcat(info, "\r\n");
-	}
-
-	if (!gf_list_count(odi.od->OCIDescriptors)) {
-		m_ODInfo.SetWindowText(info);
-		return;
-	}
-
-	strcat(info, "\r\nObject Content Information:\r\n");
-
-	/*check OCI (not everything interests us) - FIXME: support for unicode*/
-	for (i=0; i<gf_list_count(odi.od->OCIDescriptors); i++) {
-		GF_Descriptor *desc = (GF_Descriptor *) gf_list_get(odi.od->OCIDescriptors, i);
-		switch (desc->tag) {
-		case GF_ODF_SEGMENT_TAG:
-		{
-			GF_Segment *sd = (GF_Segment *) desc;
-			strcat(info, "\r\nSegment Descriptor:\r\n");
-			sprintf(buf, "Name: %s - start time %g sec - duration %g sec\r\n", sd->SegmentName, sd->startTime, sd->Duration);
-			strcat(info, buf);
-		}
-		break;
-		case GF_ODF_CC_NAME_TAG:
-		{
-			GF_CC_Name *ccn = (GF_CC_Name *)desc;
-			strcat(info, "\r\nContent Creators:\r\n");
-			for (j=0; j<gf_list_count(ccn->ContentCreators); j++) {
-				GF_ContentCreatorInfo *ci = (GF_ContentCreatorInfo *) gf_list_get(ccn->ContentCreators, j);
-				if (!ci->isUTF8) continue;
-				strcat(info, "\t");
-				strcat(info, ci->contentCreatorName);
-				strcat(info, "\r\n");
-			}
-		}
-		break;
-
-		case GF_ODF_SHORT_TEXT_TAG:
-		{
-			GF_ShortTextual *std = (GF_ShortTextual *)desc;
-			strcat(info, "\r\n");
-			strcat(info, std->eventName);
-			strcat(info, ": ");
-			strcat(info, std->eventText);
-			strcat(info, "\r\n");
-		}
-		break;
-		/*todo*/
-		case GF_ODF_CC_DATE_TAG:
-			break;
-		default:
-			break;
-		}
-
-	}
-
-	m_ODInfo.SetWindowText(info);
-}
-
-void CFileProps::OnWorld()
-{
-	CString wit;
-	const char *str;
-	GF_List *descs;
-	Osmo4 *gpac = GetApp();
-
-	descs = gf_list_new();
-	str = gf_term_get_world_info(gpac->m_term, current_odm, descs);
-	if (!str) {
-		MessageBox("No World Info available", "Sorry!");
-		return;
-	}
-
-	wit = "";
-	for (u32 i=0; i<gf_list_count(descs); i++) {
-		const char *d = (const char *) gf_list_get(descs, i);
-		wit += d;
-		wit += "\n";
-	}
-	MessageBox(wit, str);
-	gf_list_del(descs);
-}
-
-void CFileProps::OnViewsg()
-{
-	char szOutRadnameGF_MAX_PATH, *pFilename=NULL;
-	Osmo4 *gpac = GetApp();
-
-	strcpy(szOutRadname, gpac->szUserPath);
-	if ( szOutRadnamestrlen(szOutRadname)-1 != '\\'
-	        && szOutRadnamestrlen(szOutRadname)-1 != '/')
-		strcat(szOutRadname, "\\");
-	strcat(szOutRadname, "scene_dump");
-
-	GF_Err e = gf_term_dump_scene(gpac->m_term, (char *) szOutRadname, &pFilename, gpac->m_ViewXMTA, GF_FALSE, current_odm);
-
-	if (e) {
-		MessageBox(gf_error_to_string(e), "Error while dumping");
-	} else {
-		ShellExecute(NULL, "open", pFilename, NULL, NULL, SW_SHOWNORMAL);
-	}
-	if (pFilename) gf_free(pFilename);
-}
-
-void CFileProps::SetDecoderInfo()
-{
-	GF_MediaInfo odi;
-	char buf1000, info2000;
-	u32 h, m, s;
-	Osmo4 *gpac = GetApp();
-
-	sprintf(info, "");
-	m_ODInfo.SetWindowText("");
-
-	if (!current_odm || gf_term_get_object_info(gpac->m_term, current_odm, &odi)) return;
-	if (!odi.od) return;
-
-	strcat(info, "Status: ");
-	switch (odi.status) {
-	case 0:
-	case 1:
-	case 2:
-		h = (u32) (odi.current_time / 3600);
-		m = (u32) (odi.current_time / 60) - h*60;
-		s = (u32) (odi.current_time) - h*3600 - m*60;
-		sprintf(buf, "%s\r\nObject Time: %02d:%02d:%02d\r\n", (odi.status==0) ? "Stopped" : (odi.status==1) ? "Playing" : "Paused", h, m, s);
-		strcat(info, buf);
-		break;
-	case 3:
-		strcat(info, "Not Setup");
-		m_ODInfo.SetWindowText(info);
-		return;
-	default:
-		strcat(info, "Setup Failed");
-		m_ODInfo.SetWindowText(info);
-		return;
-	}
-	/*get clock drift*/
-	sprintf(buf, "Clock drift: %d ms\r\n", odi.clock_drift);
-	strcat(info, buf);
-	/*get buffering*/
-	if (odi.buffer>=0) {
-		sprintf(buf, "Buffering Time: %d ms\r\n", odi.buffer);
-		strcat(info, buf);
-	} else if (odi.buffer==-1) {
-		strcat(info, "Not buffering\r\n");
-	} else {
-		strcat(info, "Not Playing\r\n");
-	}
-	/*get DB occupation*/
-	if (odi.buffer>=0) {
-		sprintf(buf, "Decoding Buffer: %d Access Units\r\n", odi.db_unit_count);
-		strcat(info, buf);
-	}
-	/*get CB occupation*/
-	if (odi.cb_max_count) {
-		sprintf(buf, "Composition Memory: %d/%d Units\r\n", odi.cb_unit_count, odi.cb_max_count);
-		strcat(info, buf);
-	}
-
-	Float avg_dec_time = 0;
-	if (odi.nb_dec_frames) {
-		avg_dec_time = (Float) odi.total_dec_time;
-		avg_dec_time /= odi.nb_dec_frames;
-	}
-	sprintf(buf, "Bitrate over last second: %d kbps\r\nMax bitrate over one second: %d kbps\r\nAverage Decoding Time %.2f ms (%d max)\r\nTotal decoded frames %d - %d dropped\r\n",
-	        (u32) odi.avg_bitrate/1024, odi.max_bitrate/1024, avg_dec_time, odi.max_dec_time, odi.nb_dec_frames, odi.nb_dropped);
-	strcat(info, buf);
-
-	m_ODInfo.SetWindowText(info);
-}
-
-
-void CFileProps::SetStreamsInfo()
-{
-	u32 i, count;
-	char info10000;
-	char buf1000;
-	GF_MediaInfo odi;
-	GF_ObjectManager *odm;
-	Bool is_media;
-
-	Osmo4 *gpac = GetApp();
-	odm = current_odm;
-
-	strcpy(info, "");
-	m_ODInfo.SetWindowText("");
-
-	if (!odm || gf_term_get_object_info(gpac->m_term, odm, &odi) != GF_OK) return;
-	if (!odi.od) return;
-
-
-	if (odi.has_profiles) {
-		strcat(info, "MPEG-4 Profiles and Levels:\r\n");
-		sprintf(buf, "\tOD Profile@Level %d\r\n", odi.OD_pl);
-		strcat(info, buf);
-		sprintf(buf, "\tScene Profile@Level %d\r\n", odi.scene_pl);
-		strcat(info, buf);
-		sprintf(buf, "\tGraphics Profile@Level %d\r\n", odi.graphics_pl);
-		strcat(info, buf);
-		sprintf(buf, "\tAudio Profile@Level %d\r\n", odi.audio_pl);
-		strcat(info, buf);
-		sprintf(buf, "\tVisual Profile@Level %d\r\n", odi.visual_pl);
-		strcat(info, buf);
-		sprintf(buf, "\tInline Content Profiled %s\r\n", odi.inline_pl ? "yes" : "no");
-		strcat(info, buf);
-		strcat(info, "\r\n");
-	}
-	is_media = GF_FALSE;
-	count = gf_list_count(odi.od->ESDescriptors);
-
-	for (i=0; i<count; i++) {
-		GF_ESD *esd = (GF_ESD *) gf_list_get(odi.od->ESDescriptors, i);
-
-		sprintf(buf, "\t** Stream ID %d - Clock ID %d **\r\n", esd->ESID, esd->OCRESID);
-		strcat(info, buf);
-		if (esd->dependsOnESID) {
-			sprintf(buf, "Depends on Stream ID %d for decoding\r\n", esd->dependsOnESID);
-			strcat(info, buf);
-		}
-		sprintf(buf, "%s\r\n", gf_esd_get_textual_description(esd));
-		strcat(info, buf);
-
-		sprintf(buf, "Buffer Size %d\r\nAverage Bitrate %d bps\r\nMaximum Bitrate %d bps\r\n", esd->decoderConfig->bufferSizeDB, esd->decoderConfig->avgBitrate, esd->decoderConfig->maxBitrate);
-		strcat(info, buf);
-		if (esd->slConfig->predefined==SLPredef_SkipSL) {
-			sprintf(buf, "Not using MPEG-4 Synchronization Layer\r\n");
-		} else {
-			sprintf(buf, "Stream Clock Resolution %d\r\n", esd->slConfig->timestampResolution);
-		}
-		strcat(info, buf);
-		if (esd->URLString) {
-			sprintf(buf, "Stream Location: %s\r\n", esd->URLString);
-			strcat(info, buf);
-		}
-
-		/*check language*/
-		if (esd->langDesc) {
-			s32 lang_idx;
-			char lan4;
-			lan0 = esd->langDesc->langCode>>16;
-			lan1 = (esd->langDesc->langCode>>8)&0xFF;
-			lan2 = (esd->langDesc->langCode)&0xFF;
-			lan3 = 0;
-
-			lang_idx = gf_lang_find(lan);
-			if (lang_idx>=0) {
-				sprintf(buf, "Stream Language: %s\r\n", gf_lang_get_name(lang_idx) );
-				strcat(info, buf);
-			}
-		}
-		strcat(info, "\r\n");
-	}
-
-	m_ODInfo.SetWindowText(info);
-}
-
-void CFileProps::SetNetworkInfo()
-{
-	char info10000;
-	char buf10000;
-	u32 id;
-	NetStatCommand com;
-	GF_MediaInfo odi;
-	u32 d_enum, nb_streams;
-	GF_Err e;
-	GF_ObjectManager *odm;
-	Osmo4 *gpac = GetApp();
-	odm = current_odm;
-
-	strcpy(info, "");
-	m_ODInfo.SetWindowText("");
-
-	if (!odm || gf_term_get_object_info(gpac->m_term, odm, &odi) != GF_OK) return;
-	if (!odi.od) return;
-
-	if (odi.owns_service) {
-		const char *url, *path;
-		u32 done, total, bps;
-		strcpy(info, "Current Downloads in service:\r\n");
-		d_enum = 0;
-		while (gf_term_get_download_info(gpac->m_term, odm, &d_enum, &url, &path, &done, &total, &bps)) {
-			if (total && done) {
-				sprintf(buf, "%s %s: %d / %d bytes (%.2f %%) - %.2f kBps\r\n", url, path, done, total, (100.0f*done)/total, ((Float)bps)/1024);
-			} else {
-				sprintf(buf, "%s %s: %.2f kbps\r\n", url, path, ((Float)bps*8)/1024);
-			}
-			strcat(info, buf);
-		}
-		if (!d_enum) strcpy(info, "No Downloads in service\r\n");
-		strcat(info, "\r\n");
-	}
-
-	d_enum = 0;
-	nb_streams = 0;
-	while (gf_term_get_channel_net_info(gpac->m_term, odm, &d_enum, &id, &com, &e)) {
-		if (e) continue;
-		if (!com.bw_down && !com.bw_up) continue;
-		nb_streams ++;
-
-		sprintf(buf, "Stream ID %d statistics:\r\n", id);
-		strcat(info, buf);
-		if (com.multiplex_port) {
-			sprintf(buf, "\tMultiplex Port %d - multiplex ID %d\r\n", com.multiplex_port, com.port);
-		} else {
-			sprintf(buf, "\tPort %d\r\n", com.port);
-		}
-		strcat(info, buf);
-		sprintf(buf, "\tPacket Loss Percentage: %.4f\r\n", com.pck_loss_percentage);
-		strcat(info, buf);
-		sprintf(buf, "\tDown Bandwidth: %.3f kbps\r\n", ((Float)com.bw_down) / 1024);
-		strcat(info, buf);
-		if (com.bw_up) {
-			sprintf(buf, "\tUp Bandwidth: %d bps\r\n", com.bw_up);
-			strcat(info, buf);
-		}
-		if (com.ctrl_port) {
-			if (com.multiplex_port) {
-				sprintf(buf, "\tControl Multiplex Port: %d - Control Multiplex ID %d\r\n", com.multiplex_port, com.ctrl_port);
-			} else {
-				sprintf(buf, "\tControl Port: %d\r\n", com.ctrl_port);
-			}
-			strcat(info, buf);
-			sprintf(buf, "\tControl Down Bandwidth: %d bps\r\n", com.ctrl_bw_down);
-			strcat(info, buf);
-			sprintf(buf, "\tControl Up Bandwidth: %d bps\r\n", com.ctrl_bw_up);
-			strcat(info, buf);
-		}
-		strcat(info, "\r\n");
-	}
-	if (!nb_streams) strcat(info, "No network streams in this object\r\n");
-
-	m_ODInfo.SetWindowText(info);
-}

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/osmo4_w32/FileProps.h Deleted

@@ -1,70 +0,0 @@
-#if !defined(AFX_FILEPROPS_H__CA4484B4_0301_4BE1_8736_551250121C3F__INCLUDED_)
-#define AFX_FILEPROPS_H__CA4484B4_0301_4BE1_8736_551250121C3F__INCLUDED_
-
-#if _MSC_VER > 1000
-#pragma once
-#endif // _MSC_VER > 1000
-// FileProps.h : header file
-//
-
-/////////////////////////////////////////////////////////////////////////////
-// CFileProps dialog
-
-class CFileProps : public CDialog
-{
-// Construction
-public:
-	CFileProps(CWnd* pParent = NULL);   // standard constructor
-	BOOL Create(CWnd * pParent)
-	{
-		return CDialog::Create( CFileProps::IDD, pParent);
-	}
-
-// Dialog Data
-	//{{AFX_DATA(CFileProps)
-	enum { IDD = IDD_PROPERTIES };
-	CTabCtrl	m_ViewSel;
-	CEdit	m_ODInfo;
-	CTreeCtrl	m_ODTree;
-	//}}AFX_DATA
-
-
-	void RewriteODTree();
-	void WriteInlineTree(GF_ObjectManager *root_od, HTREEITEM parent);
-	void SetInfo(GF_ObjectManager *odm);
-
-private:
-	GF_ObjectManager *current_odm;
-	void SetGeneralInfo();
-	void SetStreamsInfo();
-	void SetDecoderInfo();
-	void SetNetworkInfo();
-
-// Overrides
-	// ClassWizard generated virtual function overrides
-	//{{AFX_VIRTUAL(CFileProps)
-protected:
-	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
-	//}}AFX_VIRTUAL
-
-// Implementation
-protected:
-
-	// Generated message map functions
-	//{{AFX_MSG(CFileProps)
-	virtual BOOL OnInitDialog();
-	afx_msg void OnSelchangedOdtree(NMHDR* pNMHDR, LRESULT* pResult);
-	afx_msg void OnWorld();
-	afx_msg void OnViewsg();
-	afx_msg void OnTimer(UINT_PTR nIDEvent);
-	afx_msg void OnClose();
-	afx_msg void OnDestroy();
-	afx_msg void OnSelchangeViewsel(NMHDR* pNMHDR, LRESULT* pResult);
-	//}}AFX_MSG
-	DECLARE_MESSAGE_MAP()
-};
-
-//{{AFX_INSERT_LOCATION}}
-// Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_FILEPROPS_H__CA4484B4_0301_4BE1_8736_551250121C3F__INCLUDED_)

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/osmo4_w32/MainFrm.cpp Deleted

@@ -1,1588 +0,0 @@
-// MainFrm.cpp : implementation of the CMainFrame class
-//
-
-#include "stdafx.h"
-#include "Osmo4.h"
-
-#include "MainFrm.h"
-#include "resource.h"
-
-#include <gpac/network.h>
-
-#ifdef _DEBUG
-#define new DEBUG_NEW
-#undef THIS_FILE
-static char THIS_FILE = __FILE__;
-#endif
-
-/////////////////////////////////////////////////////////////////////////////
-// CChildView
-
-CChildView::CChildView()
-{
-}
-
-CChildView::~CChildView()
-{
-	/*since the wndproc is overwritten by the terminal, we detach the handle otherwise we get a nice assertion
-	failure from windows*/
-	HWND hWnd = Detach();
-	::PostMessage(hWnd, WM_QUIT, 0, 0);
-}
-
-
-BEGIN_MESSAGE_MAP(CChildView,CWnd )
-	//{{AFX_MSG_MAP(CChildView)
-	//}}AFX_MSG_MAP
-END_MESSAGE_MAP()
-
-
-/////////////////////////////////////////////////////////////////////////////
-// CChildView message handlers
-
-BOOL CChildView::PreCreateWindow(CREATESTRUCT& cs)
-{
-	cs.dwExStyle = 0;
-	cs.style &= ~WS_BORDER;
-
-	cs.lpszClass = AfxRegisterWndClass(CS_HREDRAW|CS_VREDRAW|CS_DBLCLKS,
-	                                   ::LoadCursor(NULL, IDC_ARROW), HBRUSH(COLOR_WINDOW+1), NULL);
-
-	return TRUE;
-}
-
-
-
-/////////////////////////////////////////////////////////////////////////////
-// CMainFrame
-
-IMPLEMENT_DYNAMIC(CMainFrame, CFrameWnd)
-
-BEGIN_MESSAGE_MAP(CMainFrame, CFrameWnd)
-	//{{AFX_MSG_MAP(CMainFrame)
-	ON_WM_CREATE()
-	ON_WM_SETFOCUS()
-	ON_WM_INITMENUPOPUP()
-	ON_WM_SIZE()
-	ON_WM_MOVE()
-	ON_MESSAGE(WM_SETSIZE,OnSetSize)
-	ON_MESSAGE(WM_NAVIGATE,OnNavigate)
-	ON_MESSAGE(WM_OPENURL, Open)
-	ON_MESSAGE(WM_NEWINSTANCE, NewInstanceOpened)
-
-	ON_WM_LBUTTONDOWN()
-	ON_WM_LBUTTONDBLCLK()
-	ON_WM_LBUTTONUP()
-	ON_WM_CHAR()
-	ON_WM_SYSKEYDOWN()
-	ON_WM_SYSKEYUP()
-	ON_WM_KEYDOWN()
-	ON_WM_KEYUP()
-	ON_WM_DROPFILES()
-	ON_MESSAGE(WM_CONSOLEMSG, OnConsoleMessage)
-	ON_COMMAND(ID_VIEW_ORIGINAL, OnViewOriginal)
-	ON_COMMAND(ID_VIEW_FULLSCREEN, OnViewFullscreen)
-	ON_COMMAND(ID_AR_KEEP, OnArKeep)
-	ON_COMMAND(ID_AR_FILL, OnArFill)
-	ON_COMMAND(ID_AR_43, OnAr43)
-	ON_COMMAND(ID_AR_169, OnAr169)
-	ON_UPDATE_COMMAND_UI(ID_AR_169, OnUpdateAr169)
-	ON_UPDATE_COMMAND_UI(ID_AR_43, OnUpdateAr43)
-	ON_UPDATE_COMMAND_UI(ID_AR_FILL, OnUpdateArFill)
-	ON_UPDATE_COMMAND_UI(ID_AR_KEEP, OnUpdateArKeep)
-	ON_COMMAND(ID_NAVIGATE_NONE, OnNavigateNone)
-	ON_COMMAND(ID_NAVIGATE_WALK, OnNavigateWalk)
-	ON_COMMAND(ID_NAVIGATE_FLY, OnNavigateFly)
-	ON_COMMAND(ID_NAVIGATE_EXAM, OnNavigateExam)
-	ON_COMMAND(ID_NAVIGATE_SLIDE, OnNavigateSlide)
-	ON_COMMAND(ID_NAVIGATE_PAN, OnNavigatePan)
-	ON_COMMAND(ID_NAVIGATE_ORBIT, OnNavigateOrbit)
-	ON_COMMAND(ID_NAVIGATE_GAME, OnNavigateGame)
-	ON_COMMAND(ID_NAVIGATE_VR, OnNavigateVR)
-	ON_COMMAND(ID_NAV_RESET, OnNavigateReset)
-	ON_COMMAND(ID_SHORTCUTS, OnShortcuts)
-	ON_COMMAND(IDD_CONFIGURE, OnConfigure)
-	ON_COMMAND(ID_FILE_PROP, OnFileProp)
-	ON_COMMAND(ID_VIEW_PL, OnViewPlaylist)
-	ON_UPDATE_COMMAND_UI(ID_FILE_PROP, OnUpdateFileProp)
-	ON_UPDATE_COMMAND_UI(ID_NAVIGATE_NONE, OnUpdateNavigate)
-	ON_COMMAND(ID_REC_ENABLE, OnCacheEnable)
-	ON_UPDATE_COMMAND_UI(ID_REC_ENABLE, OnUpdateCacheEnable)
-	ON_COMMAND(ID_REC_STOP, OnCacheStop)
-	ON_COMMAND(ID_REC_ABORT, OnCacheAbort)
-	ON_UPDATE_COMMAND_UI(ID_REC_STOP, OnUpdateCacheStop)
-	ON_COMMAND(ID_COLLIDE_DISP, OnCollideDisp)
-	ON_UPDATE_COMMAND_UI(ID_COLLIDE_DISP, OnUpdateCollideDisp)
-	ON_COMMAND(ID_COLLIDE_NONE, OnCollideNone)
-	ON_UPDATE_COMMAND_UI(ID_COLLIDE_NONE, OnUpdateCollideNone)
-	ON_COMMAND(ID_COLLIDE_REG, OnCollideReg)
-	ON_UPDATE_COMMAND_UI(ID_COLLIDE_REG, OnUpdateCollideReg)
-	ON_COMMAND(ID_HEADLIGHT, OnHeadlight)
-	ON_UPDATE_COMMAND_UI(ID_HEADLIGHT, OnUpdateHeadlight)
-	ON_COMMAND(ID_GRAVITY, OnGravity)
-	ON_UPDATE_COMMAND_UI(ID_GRAVITY, OnUpdateGravity)
-	ON_COMMAND(ID_NAV_INFO, OnNavInfo)
-	ON_COMMAND(ID_NAV_NEXT, OnNavNext)
-	ON_COMMAND(ID_NAV_PREV, OnNavPrev)
-	ON_UPDATE_COMMAND_UI(ID_NAV_NEXT, OnUpdateNavNext)
-	ON_UPDATE_COMMAND_UI(ID_NAV_PREV, OnUpdateNavPrev)
-	ON_COMMAND(ID_CLEAR_NAV, OnClearNav)
-	ON_UPDATE_COMMAND_UI(ID_VIEW_PL, OnUpdateViewPlaylist)
-	ON_COMMAND(ID_PLAYLIST_LOOP, OnPlaylistLoop)
-	ON_UPDATE_COMMAND_UI(ID_PLAYLIST_LOOP, OnUpdatePlaylistLoop)
-	ON_COMMAND(ID_ADD_SUBTITLE, OnAddSubtitle)
-	ON_UPDATE_COMMAND_UI(ID_REC_ABORT, OnUpdateCacheStop)
-	ON_UPDATE_COMMAND_UI(ID_NAVIGATE_WALK, OnUpdateNavigate)
-	ON_UPDATE_COMMAND_UI(ID_NAVIGATE_FLY, OnUpdateNavigate)
-	ON_UPDATE_COMMAND_UI(ID_NAVIGATE_EXAM, OnUpdateNavigate)
-	ON_UPDATE_COMMAND_UI(ID_NAVIGATE_PAN, OnUpdateNavigate)
-	ON_UPDATE_COMMAND_UI(ID_NAVIGATE_SLIDE, OnUpdateNavigate)
-	ON_UPDATE_COMMAND_UI(ID_NAVIGATE_ORBIT, OnUpdateNavigate)
-	ON_UPDATE_COMMAND_UI(ID_NAVIGATE_VR, OnUpdateNavigate)
-	ON_UPDATE_COMMAND_UI(ID_NAVIGATE_GAME, OnUpdateNavigate)
-	ON_COMMAND(ID_FILE_EXIT, OnFileExit)
-	ON_COMMAND(ID_VIEW_CPU, OnViewCPU)
-	ON_UPDATE_COMMAND_UI(ID_VIEW_CPU, OnUpdateViewCPU)
-
-	ON_COMMAND(ID_FILE_COPY, OnFileCopy)
-	ON_UPDATE_COMMAND_UI(ID_FILE_COPY, OnUpdateFileCopy)
-	ON_COMMAND(ID_FILE_PASTE, OnFilePaste)
-	ON_UPDATE_COMMAND_UI(ID_FILE_PASTE, OnUpdateFilePaste)
-
-	//}}AFX_MSG_MAP
-END_MESSAGE_MAP()
-
-
-/////////////////////////////////////////////////////////////////////////////
-// CMainFrame construction/destruction
-
-CMainFrame::CMainFrame()
-{
-	m_icoerror = AfxGetApp()->LoadIcon(IDI_ERR);
-	m_icomessage = AfxGetApp()->LoadIcon(IDI_MESSAGE);
-	m_bFullScreen = GF_FALSE;
-	m_RestoreFS = 0;
-	m_aspect_ratio = GF_ASPECT_RATIO_KEEP;
-	m_pProps = NULL;
-	m_pOpt = NULL;
-	m_pPlayList = NULL;
-	m_pWndView = new CChildView();
-	m_bInitShow = GF_TRUE;
-	m_bStartupFile = GF_TRUE;
-	m_num_chapters = 0;
-	m_chapters_start = NULL;
-	m_last_prog = -1;
-	m_timer_on = 0;
-	m_show_rti = GF_FALSE;
-	nb_viewpoints = 0;
-}
-
-CMainFrame::~CMainFrame()
-{
-	if (m_chapters_start) gf_free(m_chapters_start);
-	if (m_pProps != NULL) m_pProps->DestroyWindow();
-	if (m_pOpt != NULL) m_pOpt->DestroyWindow();
-	if (m_pPlayList != NULL) delete m_pPlayList;
-	delete m_pWndView;
-}
-
-#define RTI_TIMER	22
-#define RTI_REFRESH_MS		250
-
-void CALLBACK EXPORT RTInfoTimer(HWND , UINT , UINT_PTR nID , DWORD )
-{
-	char szMsg100;
-	GF_SystemRTInfo rti;
-	if (nID != RTI_TIMER) return;
-	Osmo4 *app = GetApp();
-	CMainFrame *pFrame = (CMainFrame *) app->m_pMainWnd;
-	/*shutdown*/
-	if (!pFrame) return;
-
-	if (pFrame->m_show_rti && !pFrame->m_timer_on) {
-		if (!gf_sys_get_rti(RTI_REFRESH_MS, &rti, 0)) return;
-		if (!rti.gpac_memory) rti.gpac_memory = rti.process_memory ? rti.process_memory : rti.physical_memory;
-
-		if (pFrame->m_show_rti && !pFrame->m_timer_on) {
-			sprintf(szMsg, "FPS %02.2f - CPU %02d (%02d) - Mem %d kB",
-			        gf_term_get_framerate(app->m_term, GF_FALSE), rti.total_cpu_usage, rti.process_cpu_usage, rti.gpac_memory/1024);
-			pFrame->m_wndStatusBar.SetPaneText(1, szMsg);
-		}
-	}
-
-	if (! gf_term_get_option(app->m_term, GF_OPT_IS_FINISHED)) {
-		u32 ms = gf_term_get_time_in_ms(app->m_term);
-		u32 h = ms / 1000 / 3600;
-		u32 m = ms / 1000 / 60 - h*60;
-		u32 s = ms / 1000 - h*3600 - m*60;
-
-		sprintf(szMsg, "%02d:%02d.%02d", h, m, s);
-		pFrame->m_wndStatusBar.SetPaneText(0, szMsg);
-	}
-}
-
-static UINT status_indics =
-{
-	ID_TIMER,
-	ID_SEPARATOR,           // status line indicator
-};
-
-
-
-int CMainFrame::OnCreate(LPCREATESTRUCT lpCreateStruct)
-{
-	UINT buttonArray50;
-	TBBUTTONINFO bi;
-	u32 *ba;
-	if (CFrameWnd::OnCreate(lpCreateStruct) == -1)
-		return -1;
-
-	// create a view to occupy the client area of the frame
-	if (!m_pWndView->CreateEx(0, NULL, NULL, WS_CHILD, 0, 0, 300, 200, m_hWnd, NULL, NULL))
-	{
-		TRACE0("Failed to create view window\n");
-		return -1;
-	}
-	m_pPlayList = new Playlist();
-	m_pPlayList->Create();
-	m_pPlayList->ShowWindow(SW_HIDE);
-
-
-	if (!m_wndToolBar.CreateEx(this, WS_CHILD | CBRS_TOP | CBRS_FLYBY) ||
-	        !m_wndToolBar.LoadBitmap(IDR_MAINTOOLS))
-	{
-		TRACE0("Failed to create toolbar\n");
-		return -1;      // fail to create
-	}
-
-	ba = &buttonArray0;
-	*ba = ID_OPEN_FILE;
-	ba++;
-	*ba = ID_SEPARATOR;
-	ba++;
-	*ba = ID_NAV_PREV;
-	ba++;
-	*ba = ID_NAV_NEXT;
-	ba++;
-	*ba = ID_SEPARATOR;
-	ba++;
-	*ba = ID_FILE_PLAY;
-	ba++;
-	*ba = ID_FILE_STEP;
-	ba++;
-	*ba = ID_FILE_STOP;
-	ba++;
-	*ba = ID_SEPARATOR;
-	ba++;
-	*ba = ID_FILE_PROP;
-	ba++;
-	*ba = ID_SEPARATOR;
-	ba++;
-	*ba = ID_FILE_PROP;
-	ba++;
-	*ba = ID_SWITCH_RENDER;
-	m_wndToolBar.SetButtons(buttonArray, 13);
-	m_wndToolBar.SetButtonInfo(0, ID_OPEN_FILE, TBBS_BUTTON, 0);
-	m_wndToolBar.SetButtonInfo(1, ID_SEPARATOR, TBBS_SEPARATOR, 0);
-	m_wndToolBar.SetButtonInfo(2, ID_NAV_PREV, TBBS_DROPDOWN, 1);
-	m_wndToolBar.SetButtonInfo(3, ID_NAV_NEXT, TBBS_DROPDOWN, 2);
-	m_wndToolBar.SetButtonInfo(4, ID_SEPARATOR, TBBS_SEPARATOR, 0);
-	m_wndToolBar.SetButtonInfo(5, ID_FILE_PLAY, TBBS_BUTTON, 3);
-	m_wndToolBar.SetButtonInfo(6, ID_FILE_STEP, TBBS_BUTTON, 5);
-	m_wndToolBar.SetButtonInfo(7, ID_FILE_STOP, TBBS_BUTTON, 6);
-	m_wndToolBar.SetButtonInfo(8, ID_SEPARATOR, TBBS_SEPARATOR, 0);
-	m_wndToolBar.SetButtonInfo(9, ID_FILE_PROP, TBBS_BUTTON, 7);
-	m_wndToolBar.SetButtonInfo(10, ID_SEPARATOR, TBBS_SEPARATOR, 0);
-	m_wndToolBar.SetButtonInfo(11, IDD_CONFIGURE, TBBS_BUTTON, 8);
-	m_wndToolBar.SetButtonInfo(12, ID_SWITCH_RENDER, TBBS_BUTTON, 9);
-
-	CToolBarCtrl &ctrl = m_wndToolBar.GetToolBarCtrl();
-	ctrl.SetStyle(TBSTYLE_FLAT | TBSTYLE_DROPDOWN);
-	ctrl.SetExtendedStyle(TBSTYLE_EX_DRAWDDARROWS);
-
-	memset(&bi, 0, sizeof(bi));
-	bi.cbSize = sizeof(bi);
-	ctrl.GetButtonInfo(2, &bi);
-	bi.fsStyle |= TBSTYLE_DROPDOWN;
-	ctrl.SetButtonInfo(ID_NAV_PREV, &bi);
-
-	memset(&bi, 0, sizeof(bi));
-	bi.cbSize = sizeof(bi);
-	ctrl.GetButtonInfo(3, &bi);
-	bi.fsStyle |= TBSTYLE_DROPDOWN;
-	ctrl.SetButtonInfo(ID_NAV_NEXT, &bi);
-
-	if (!m_wndStatusBar.Create(this) ||
-	        !m_wndStatusBar.SetIndicators(status_indics,
-	                                      sizeof(status_indics)/sizeof(UINT)))
-	{
-		TRACE0("Failed to create status bar\n");
-		return -1;      // fail to create
-	}
-
-	if (!m_Address.Create(this, IDD_NAVBAR, WS_CHILD | CBRS_TOP | CBRS_FLYBY | CBRS_SIZE_DYNAMIC, IDD_NAVBAR) ) {
-		return -1;      // fail to create
-	}
-
-	if (!m_Sliders.Create(IDD_SLIDERS, this) ) {
-		return -1;      // fail to create
-	}
-
-	m_wndStatusBar.SetPaneInfo(0, ID_TIMER, SBPS_NORMAL, 60);
-	m_wndStatusBar.SetPaneInfo(1, ID_SEPARATOR, SBPS_STRETCH, 0);
-	SetIcon(AfxGetApp()->LoadIcon(IDR_MAINFRAME), TRUE);
-	SetIcon(AfxGetApp()->LoadIcon(IDR_MAINFRAME), FALSE);
-
-	SetTimer(RTI_TIMER, RTI_REFRESH_MS, RTInfoTimer);
-	return 0;
-}
-
-
-BOOL CMainFrame::PreCreateWindow(CREATESTRUCT& cs)
-{
-	if( !CFrameWnd::PreCreateWindow(cs) )
-		return FALSE;
-	// TODO: Modify the Window class or styles here by modifying
-	//  the CREATESTRUCT cs
-
-	cs.dwExStyle &= ~WS_EX_CLIENTEDGE;
-	cs.lpszClass = AfxRegisterWndClass(0);
-	return TRUE;
-}
-
-/////////////////////////////////////////////////////////////////////////////
-// CMainFrame diagnostics
-
-#ifdef _DEBUG
-void CMainFrame::AssertValid() const
-{
-	CFrameWnd::AssertValid();
-}
-
-void CMainFrame::Dump(CDumpContext& dc) const
-{
-	CFrameWnd::Dump(dc);
-}
-
-#endif //_DEBUG
-
-/////////////////////////////////////////////////////////////////////////////
-// CMainFrame message handlers
-void CMainFrame::OnSetFocus(CWnd* pOldWnd)
-{
-	m_pWndView->SetFocus();
-	if (m_RestoreFS==1) {
-		m_RestoreFS=2;
-	}
-	else if (m_RestoreFS==2) {
-		m_RestoreFS = 0;
-		SetFullscreen();
-	}
-}
-
-BOOL CMainFrame::OnCmdMsg(UINT nID, int nCode, void* pExtra, AFX_CMDHANDLERINFO* pHandlerInfo)
-{
-	// let the view have first crack at the command
-	if (m_pWndView->OnCmdMsg(nID, nCode, pExtra, pHandlerInfo))
-		return TRUE;
-
-	// otherwise, do default handling
-	return CFrameWnd::OnCmdMsg(nID, nCode, pExtra, pHandlerInfo);
-}
-
-
-void CMainFrame::OnSize(UINT nType, int cx, int cy)
-{
-	RECT rc2;
-	u32 tool_h, slide_h, add_h, stat_h;
-
-	if (m_bInitShow) {
-		CFrameWnd::OnSize(nType, cx, cy);
-		return;
-	}
-	m_wndToolBar.GetClientRect(&rc2);
-	tool_h = rc2.bottom - rc2.top;
-	m_Address.GetClientRect(&rc2);
-	add_h = rc2.bottom - rc2.top;
-	m_Sliders.GetClientRect(&rc2);
-	slide_h = rc2.bottom - rc2.top;
-	m_wndStatusBar.GetClientRect(&rc2);
-	stat_h = rc2.bottom - rc2.top;
-	if ((u32) cy <= tool_h+add_h+slide_h+stat_h) {
-		OnSetSize(cx, 1);
-		return;
-	}
-
-	CFrameWnd::OnSize(nType, cx, cy);
-	cy -= tool_h + add_h + slide_h + stat_h;
-
-	m_Address.SetWindowPos(this, 0, 0, cx, add_h, SWP_SHOWWINDOW | SWP_NOMOVE);
-
-	m_pWndView->ShowWindow(SW_SHOW);
-	m_pWndView->SetWindowPos(this, 0, add_h + tool_h, cx, cy, SWP_NOZORDER);
-
-	m_Sliders.SetWindowPos(this, 0, add_h + tool_h + cy, cx, slide_h, SWP_NOZORDER|SWP_SHOWWINDOW);
-	/*and resize term*/
-	gf_term_set_size(GetApp()->m_term, cx, cy);
-}
-
-
-LRESULT CMainFrame::OnSetSize(WPARAM wParam, LPARAM lParam)
-{
-	UINT width, height;
-	width = (UINT) wParam;
-	height = (UINT) lParam;
-	if (m_bInitShow) {
-		m_wndToolBar.UpdateWindow();
-		m_wndToolBar.ShowWindow(SW_SHOW);
-		m_Address.UpdateWindow();
-		m_Address.ShowWindow(SW_SHOW);
-		m_Sliders.UpdateWindow();
-		m_Sliders.ShowWindow(SW_SHOW);
-		m_Sliders.m_PosSlider.EnableWindow(FALSE);
-		m_pWndView->ShowWindow(SW_SHOW);
-		ShowWindow(SW_SHOW);
-		m_bInitShow = GF_FALSE;
-	}
-
-	RECT winRect;
-	winRect.left = 0;
-	winRect.right = width;
-	winRect.top = 0;
-	winRect.bottom = height;
-	AdjustWindowRectEx(&winRect, GetStyle(), TRUE, GetExStyle());
-	winRect.bottom -= winRect.top;
-	winRect.right -= winRect.left;
-	winRect.left = winRect.top = 0;
-
-	RECT rc2;
-	m_Address.GetClientRect(&rc2);
-	winRect.bottom += rc2.bottom;
-	m_wndToolBar.GetClientRect(&rc2);
-	winRect.bottom += rc2.bottom;
-	m_Sliders.GetClientRect(&rc2);
-	winRect.bottom += rc2.bottom;
-	m_wndStatusBar.GetClientRect(&rc2);
-	winRect.bottom += rc2.bottom;
-
-	GetWindowRect(&rc2);
-	rc2.bottom -= rc2.top;
-	rc2.right -= rc2.left;
-	if ((rc2.right != winRect.right) || (rc2.bottom != winRect.bottom)) {
-		SetWindowPos(NULL, 0, 0, winRect.right, winRect.bottom, SWP_NOZORDER | SWP_NOMOVE | SWP_SHOWWINDOW);
-	} else {
-		/*just resize term*/
-		//gf_term_set_size(GetApp()->m_term, width, height);
-		SetWindowPos(NULL, 0, 0, winRect.right, winRect.bottom, SWP_NOZORDER | SWP_NOMOVE | SWP_SHOWWINDOW);
-	}
-	return 0;
-}
-
-void CMainFrame::OnMove(int x, int y)
-{
-	CFrameWnd::OnMove(x, y);
-	RECT rc;
-
-	m_wndToolBar.GetClientRect(&rc);
-	m_wndToolBar.SetWindowPos(this, x, y, 0, 0, SWP_NOSIZE | SWP_SHOWWINDOW);
-	y += rc.bottom - rc.top;
-	m_Address.SetWindowPos(this, x, y, 0, 0, SWP_NOSIZE | SWP_SHOWWINDOW);
-	m_Address.GetClientRect(&rc);
-	y += rc.bottom - rc.top;
-	m_pWndView->SetWindowPos(this, x, y, 0, 0, SWP_NOSIZE);
-	m_pWndView->GetClientRect(&rc);
-	y += rc.bottom;
-	m_Sliders.SetWindowPos(this, x, y, 0, 0, SWP_NOSIZE | SWP_SHOWWINDOW);
-}
-
-
-#define PROGRESS_TIMER	20
-#define PROGRESS_REFRESH_MS		100
-
-void CALLBACK EXPORT ProgressTimer(HWND , UINT , UINT_PTR nID , DWORD )
-{
-	u32 now;
-	if (nID != PROGRESS_TIMER) return;
-	Osmo4 *app = GetApp();
-	CMainFrame *pFrame = (CMainFrame *) app->m_pMainWnd;
-	/*shutdown*/
-	if (!pFrame) return;
-
-	now = gf_term_get_time_in_ms(app->m_term);
-	if (!now) return;
-
-	if (app->can_seek && !pFrame->m_Sliders.m_grabbed) {
-		if (now >= app->max_duration + 100) {
-			if (gf_term_get_option(app->m_term, GF_OPT_IS_FINISHED)) {
-				pFrame->m_pPlayList->PlayNext();
-			}
-			/*if no IsOver go on forever*/
-		} else {
-			if (!app->m_reset)
-				pFrame->m_Sliders.m_PosSlider.SetPos(now);
-		}
-	}
-}
-
-void CMainFrame::SetProgTimer(Bool bOn)
-{
-	if (bOn)
-		SetTimer(PROGRESS_TIMER, PROGRESS_REFRESH_MS, ProgressTimer);
-	else
-		KillTimer(PROGRESS_TIMER);
-}
-
-
-LRESULT CMainFrame::Open(WPARAM wParam, LPARAM lParam)
-{
-	Bool do_pause;
-	Osmo4 *app = GetApp();
-	CString txt, url;
-	m_bStartupFile = GF_FALSE;
-	txt = "Osmo4 - ";
-	txt += m_pPlayList->GetDisplayName();
-
-	url = m_pPlayList->GetURL();
-	m_Address.m_Address.SetWindowText(url);
-	SetWindowText(txt);
-	if (app->start_mode==1) do_pause = GF_TRUE;
-	else if (app->start_mode==2) do_pause = GF_FALSE;
-	else do_pause = /*!app->m_AutoPlay*/GF_FALSE;
-	gf_term_connect_from_time(app->m_term, (LPCSTR) url, app->m_reconnect_time, do_pause);
-	app->m_reconnect_time = 0;
-	app->start_mode = 0;
-	app->UpdatePlayButton();
-	nb_viewpoints = 0;
-	return 1;
-}
-
-LRESULT CMainFrame::NewInstanceOpened(WPARAM wParam, LPARAM lParam)
-{
-	Bool queue_only = GF_FALSE;
-	char *url = (char *) static_gpac_get_url();
-	if (!strnicmp(url, "-queue ", 7)) {
-		queue_only = GF_TRUE;
-		url += 7;
-	}
-	m_pPlayList->QueueURL(url);
-	m_pPlayList->RefreshList();
-	if (!queue_only) m_pPlayList->PlayNext();
-	return 1;
-}
-
-
-void CMainFrame::ForwardMessage()
-{
-	const MSG *msg = GetCurrentMessage();
-	m_pWndView->SendMessage(msg->message, msg->wParam, msg->lParam);
-}
-void CMainFrame::OnSysKeyUp(UINT , UINT , UINT ) {
-	ForwardMessage();
-}
-void CMainFrame::OnSysKeyDown(UINT , UINT , UINT ) {
-	ForwardMessage();
-}
-void CMainFrame::OnChar(UINT , UINT , UINT ) {
-	ForwardMessage();
-}
-void CMainFrame::OnKeyDown(UINT , UINT , UINT ) {
-	ForwardMessage();
-}
-void CMainFrame::OnKeyUp(UINT , UINT , UINT ) {
-	ForwardMessage();
-}
-void CMainFrame::OnLButtonDown(UINT , CPoint ) {
-	ForwardMessage();
-}
-void CMainFrame::OnLButtonDblClk(UINT , CPoint ) {
-	ForwardMessage();
-}
-void CMainFrame::OnLButtonUp(UINT , CPoint ) {
-	ForwardMessage();
-}
-
-void CMainFrame::OnDropFiles(HDROP hDropInfo)
-{
-	u32 i, count;
-	Osmo4 *app = GetApp();
-	char fileNameMAX_PATH;
-
-	count = ::DragQueryFile(hDropInfo, 0xFFFFFFFF, NULL, 0);
-	if (!count) return;
-
-	/*if playing and sub d&d, open sub in current presentation*/
-	if (app->m_isopen && (count==1)) {
-		::DragQueryFile(hDropInfo, 0, fileName, MAX_PATH);
-		char *ext = strrchr(fileName, '.');
-		if (ext && ( !stricmp(ext, ".srt") || !stricmp(ext, ".sub") || !stricmp(ext, ".ttxt") || !stricmp(ext, ".xml") ) ) {
-			AddSubtitle(fileName, GF_TRUE);
-			return;
-		}
-	}
-
-	/*	if (count==1)
-			m_pPlayList->Truncate();
-		else
-	*/		m_pPlayList->Clear();
-
-	for (i=0; i<count; i++) {
-		::DragQueryFile (hDropInfo, i, fileName, MAX_PATH);
-		m_pPlayList->QueueURL(fileName);
-	}
-	m_pPlayList->RefreshList();
-	m_pPlayList->PlayNext();
-}
-
-void CALLBACK EXPORT ConsoleTimer(HWND , UINT , UINT_PTR , DWORD )
-{
-	CMainFrame *pFrame = (CMainFrame *) GetApp()->m_pMainWnd;
-
-	pFrame->m_wndStatusBar.GetStatusBarCtrl().SetIcon(2, NULL);
-	pFrame->KillTimer(pFrame->m_timer_on);
-	pFrame->m_timer_on = 0;
-	pFrame->m_wndStatusBar.SetPaneText(1, "Ready");
-}
-
-#define CONSOLE_DISPLAY_TIME	1000
-
-LRESULT CMainFrame::OnConsoleMessage(WPARAM wParam, LPARAM lParam)
-{
-	if (m_timer_on) KillTimer(m_timer_on);
-
-	if (console_err>=0) {
-		m_wndStatusBar.GetStatusBarCtrl().SetIcon(2, m_icomessage);
-		m_wndStatusBar.SetPaneText(1, console_message);
-	} else {
-		char msg5000;
-		m_wndStatusBar.GetStatusBarCtrl().SetIcon(2, m_icoerror);
-		sprintf(msg, "%s (%s)", console_message, console_service);
-		m_wndStatusBar.SetPaneText(1, msg);
-	}
-	m_timer_on = SetTimer(10, wParam ? (UINT) wParam : CONSOLE_DISPLAY_TIME, ConsoleTimer);
-	return 0;
-}
-
-BOOL CMainFrame::DestroyWindow()
-{
-	if (GetApp()->m_isopen) KillTimer(PROGRESS_TIMER);
-	/*signal close to prevent callbacks but don't close, this is done in ExitInstance (otherwise there's a
-	deadlock happening not sure why yet)*/
-//	GetApp()->m_open = 0;
-	return CFrameWnd::DestroyWindow();
-}
-
-
-void CMainFrame::OnViewOriginal()
-{
-	Osmo4 *gpac = GetApp();
-	gf_term_set_option(gpac->m_term, GF_OPT_ORIGINAL_VIEW, 1);
-	OnSetSize(gpac->orig_width, gpac->orig_height);
-}
-
-void CMainFrame::SetFullscreen()
-{
-	Osmo4 *gpac = GetApp();
-	if (!m_bFullScreen) {
-		GetWindowRect(&backup_wnd_rc);
-		if (gf_term_set_option(gpac->m_term, GF_OPT_FULLSCREEN, 1) == GF_OK)
-			m_bFullScreen = GF_TRUE;
-	} else {
-		if (gf_term_set_option(gpac->m_term, GF_OPT_FULLSCREEN, 0) == GF_OK)
-			m_bFullScreen = GF_FALSE;
-		SetWindowPos(NULL, backup_wnd_rc.left, backup_wnd_rc.top, backup_wnd_rc.right-backup_wnd_rc.left, backup_wnd_rc.bottom-backup_wnd_rc.top, SWP_NOZORDER);
-	}
-}
-
-void CMainFrame::OnViewFullscreen()
-{
-	SetFullscreen();
-}
-
-void CMainFrame::OnArKeep()
-{
-	gf_term_set_option(GetApp()->m_term, GF_OPT_ASPECT_RATIO, GF_ASPECT_RATIO_KEEP);
-	m_aspect_ratio = GF_ASPECT_RATIO_KEEP;
-}
-
-void CMainFrame::OnArFill()
-{
-	gf_term_set_option(GetApp()->m_term, GF_OPT_ASPECT_RATIO, GF_ASPECT_RATIO_FILL_SCREEN);
-	m_aspect_ratio = GF_ASPECT_RATIO_FILL_SCREEN;
-}
-
-void CMainFrame::OnAr43()
-{
-	gf_term_set_option(GetApp()->m_term, GF_OPT_ASPECT_RATIO, GF_ASPECT_RATIO_4_3);
-	m_aspect_ratio = GF_ASPECT_RATIO_4_3;
-}
-
-void CMainFrame::OnAr169()
-{
-	gf_term_set_option(GetApp()->m_term, GF_OPT_ASPECT_RATIO, GF_ASPECT_RATIO_16_9);
-	m_aspect_ratio = GF_ASPECT_RATIO_16_9;
-}
-
-void CMainFrame::OnUpdateAr169(CCmdUI* pCmdUI)
-{
-	pCmdUI->SetCheck(m_aspect_ratio == GF_ASPECT_RATIO_16_9);
-}
-
-void CMainFrame::OnUpdateAr43(CCmdUI* pCmdUI)
-{
-	pCmdUI->SetCheck(m_aspect_ratio == GF_ASPECT_RATIO_4_3);
-}
-
-void CMainFrame::OnUpdateArFill(CCmdUI* pCmdUI)
-{
-	pCmdUI->SetCheck(m_aspect_ratio == GF_ASPECT_RATIO_FILL_SCREEN);
-}
-
-void CMainFrame::OnUpdateArKeep(CCmdUI* pCmdUI)
-{
-	pCmdUI->SetCheck(m_aspect_ratio == GF_ASPECT_RATIO_KEEP);
-}
-
-void CMainFrame::OnUpdateNavigate(CCmdUI* pCmdUI)
-{
-	BOOL enable;
-	Osmo4 *app = GetApp();
-	pCmdUI->Enable(FALSE);
-	if (!app->m_isopen) return;
-
-	u32 type = gf_term_get_option(app->m_term, GF_OPT_NAVIGATION_TYPE);
-	enable = type ? TRUE : FALSE;
-
-	if (pCmdUI->m_nID==ID_NAV_RESET) {
-		pCmdUI->Enable(TRUE);
-		return;
-	}
-
-	u32 mode = gf_term_get_option(app->m_term, GF_OPT_NAVIGATION);
-	/*common 2D/3D modes*/
-	if (pCmdUI->m_nID==ID_NAVIGATE_NONE) {
-		pCmdUI->Enable(enable);
-		pCmdUI->SetCheck(mode ? 0 : 1);
-	}
-	else if (pCmdUI->m_nID==ID_NAVIGATE_EXAM) {
-		pCmdUI->Enable(enable);
-		pCmdUI->SetCheck((mode==GF_NAVIGATE_EXAMINE) ? 1 : 0);
-	}
-	else if (pCmdUI->m_nID==ID_NAVIGATE_SLIDE) {
-		pCmdUI->Enable(enable);
-		pCmdUI->SetCheck((mode==GF_NAVIGATE_SLIDE) ? 1 : 0);
-	}
-
-	if (type==GF_NAVIGATE_TYPE_2D) return;
-	pCmdUI->Enable(enable);
-	if (pCmdUI->m_nID==ID_NAVIGATE_WALK) pCmdUI->SetCheck((mode==GF_NAVIGATE_WALK) ? 1 : 0);
-	else if (pCmdUI->m_nID==ID_NAVIGATE_FLY) pCmdUI->SetCheck((mode==GF_NAVIGATE_FLY) ? 1 : 0);
-	else if (pCmdUI->m_nID==ID_NAVIGATE_PAN) pCmdUI->SetCheck((mode==GF_NAVIGATE_PAN) ? 1 : 0);
-	else if (pCmdUI->m_nID==ID_NAVIGATE_VR) pCmdUI->SetCheck((mode==GF_NAVIGATE_VR) ? 1 : 0);
-	else if (pCmdUI->m_nID==ID_NAVIGATE_GAME) pCmdUI->SetCheck((mode==GF_NAVIGATE_GAME) ? 1 : 0);
-}
-
-
-void CMainFrame::SetNavigate(u32 mode)
-{
-	Osmo4 *app = GetApp();
-	gf_term_set_option(app->m_term, GF_OPT_NAVIGATION, mode);
-}
-void CMainFrame::OnNavigateNone() {
-	SetNavigate(GF_NAVIGATE_NONE);
-}
-void CMainFrame::OnNavigateWalk() {
-	SetNavigate(GF_NAVIGATE_WALK);
-}
-void CMainFrame::OnNavigateFly() {
-	SetNavigate(GF_NAVIGATE_FLY);
-}
-void CMainFrame::OnNavigateExam() {
-	SetNavigate(GF_NAVIGATE_EXAMINE);
-}
-void CMainFrame::OnNavigateSlide() {
-	SetNavigate(GF_NAVIGATE_SLIDE);
-}
-void CMainFrame::OnNavigatePan() {
-	SetNavigate(GF_NAVIGATE_PAN);
-}
-void CMainFrame::OnNavigateOrbit() {
-	SetNavigate(GF_NAVIGATE_ORBIT);
-}
-void CMainFrame::OnNavigateVR() {
-	SetNavigate(GF_NAVIGATE_VR);
-}
-void CMainFrame::OnNavigateGame() {
-	SetNavigate(GF_NAVIGATE_GAME);
-}
-
-void CMainFrame::OnNavigateReset()
-{
-	Osmo4 *app = GetApp();
-	gf_term_set_option(app->m_term, GF_OPT_NAVIGATION_TYPE, 0);
-}
-
-
-LRESULT CMainFrame::OnNavigate(WPARAM /*wParam*/, LPARAM /*lParam*/)
-{
-	Osmo4 *gpac = GetApp();
-
-	/*this is a migrate instruction, just disconnect the player*/
-	if (gpac->m_navigate_url.IsEmpty() ) {
-		gf_term_disconnect(gpac->m_term);
-		return 0;
-	}
-
-	if (gf_term_is_supported_url(gpac->m_term, gpac->m_navigate_url, GF_TRUE, gpac->m_NoMimeFetch)) {
-		char *str = gf_url_concatenate(m_pPlayList->GetURL(), gpac->m_navigate_url);
-		if (str) {
-			m_pPlayList->Truncate();
-			m_pPlayList->QueueURL(str);
-			gf_free(str);
-			m_pPlayList->RefreshList();
-			m_pPlayList->PlayNext();
-			return 0;
-		}
-	}
-
-	if (m_bFullScreen) {
-		SetFullscreen();
-		m_RestoreFS = 1;
-	}
-
-	console_message = gpac->m_navigate_url;
-	console_err = GF_OK;
-	PostMessage(WM_CONSOLEMSG);
-	ShellExecute(NULL, "open", (LPCSTR) gpac->m_navigate_url, NULL, NULL, SW_SHOWNORMAL);
-
-	return 0;
-}
-
-void CMainFrame::OnFileProp()
-{
-	if (!m_pProps) {
-		m_pProps = new CFileProps(this);
-		m_pProps->Create(this);
-	}
-	m_pProps->ShowWindow(SW_SHOW);
-}
-
-void CMainFrame::OnUpdateFileProp(CCmdUI* pCmdUI)
-{
-	pCmdUI->Enable(GetApp()->m_isopen);
-}
-
-void CMainFrame::OnConfigure()
-{
-	if (!m_pOpt) {
-		m_pOpt = new COptions(this);
-		m_pOpt->Create(this);
-	}
-	m_pOpt->ShowWindow(SW_SHOW);
-}
-
-void CMainFrame::OnShortcuts()
-{
-	MessageBox(
-	    "Open File: Ctrl + O\n"
-	    "Open URL: Ctrl + U\n"
-	    "Reload File: F5\n"
-	    "Pause/Resume File: Ctrl + P\n"
-	    "Step by Step: Ctrl + S\n"
-	    "Seek +5%: Alt + left arrow\n"
-	    "Seek -5%: Alt + right arrow\n"
-	    "Switch quality up: Ctrl + H\n"
-	    "Switch quality down: Ctrl + L\n"
-	    "Fullscreen On/Off: Double-click or Escape\n"
-	    "\n"
-	    "Show Properties: Ctrl + I\n"
-	    "Show Playlist: F3\n"
-	    "Next Playlist Item: Ctrl + right arrow\n"
-	    "Previous Playlist Item: Ctrl + left arrow\n"
-	    "\n"
-	    "Aspect Ratio Normal: Ctrl + 1\n"
-	    "Aspect Ratio Fill: Ctrl + 2\n"
-	    "Aspect Ratio 4/3: Ctrl + 3\n"
-	    "Aspect Ratio 16/9: Ctrl + 4\n"
-
-
-	    , "Shortcuts Available on Osmo4", MB_OK);
-}
-
-void CMainFrame::OnNavInfo()
-{
-	MessageBox(
-	    "* Walk & Fly modes:\n"
-	    "\tH move: H pan - V move: Z-translate - V move+CTRL or Wheel: V pan - Right Click (Walk only): Jump\n"
-	    "\tleft/right: H pan - left/right+CTRL: H translate - up/down: Z-translate - up/down+CTRL: V pan\n"
-	    "* Pan mode:\n"
-	    "\tH move: H pan - V move: V pan - V move+CTRL or Wheel: Z-translate\n"
-	    "\tleft/right: H pan - left/right+CTRL: H translate - up/down: V pan - up/down+CTRL: Z-translate\n"
-	    "* Slide mode:\n"
-	    "\tH move: H translate - V move: V translate - V move+CTRL or Wheel: Z-translate\n"
-	    "\tleft/right: H translate - left/right+CTRL: H pan - up/down: V translate - up/down+CTRL: Z-translate\n"
-	    "* Examine & Orbit mode:\n"
-	    "\tH move: Y-Axis rotate - H move+CTRL: Z-Axis rotate - V move: X-Axis rotate - V move+CTRL or Wheel: Z-translate\n"
-	    "\tleft/right: Y-Axis rotate - left/right+CTRL: H translate - up/down: X-Axis rotate - up/down+CTRL: Y-translate\n"
-	    "* VR mode:\n"
-	    "\tH move: H pan - V move: V pan - V move+CTRL or Wheel: Camera Zoom\n"
-	    "\tleft/right: H pan - up/down: V pan - up/down+CTRL: Camera Zoom\n"
-	    "* Game mode (press END to escape):\n"
-	    "\tH move: H pan - V move: V pan\n"
-	    "\tleft/right: H translate - up/down: Z-translate\n"
-	    "\n"
-	    "* All 3D modes: CTRL+PGUP/PGDOWN will zoom in/out camera (field of view) \n"
-
-	    "\n"
-	    "*Slide Mode in 2D:\n"
-	    "\tH move: H translate - V move: V translate - V move+CTRL: zoom\n"
-	    "\tleft/right: H translate - up/down: V translate - up/down+CTRL: zoom\n"
-	    "*Examine Mode in 2D (3D renderer only):\n"
-	    "\tH move: Y-Axis rotate - V move: X-Axis rotate\n"
-	    "\tleft/right: Y-Axis rotate - up/down: X-Axis rotate\n"
-
-	    "\n"
-	    "HOME: reset navigation to last viewpoint (2D or 3D navigation)\n"
-	    "SHIFT key in all modes: fast movement\n"
-
-	    , "3D navigation keys (\'H\'orizontal and \'V\'ertical) used in GPAC", MB_OK);
-}
-
-
-
-void CMainFrame::BuildViewList()
-{
-	Osmo4 *app = GetApp();
-	if (!app->m_isopen) return;
-
-	/*THIS IS HARCODED FROM THE MENU LAYOUT */
-	CMenu *pMenu = GetMenu()->GetSubMenu(1)->GetSubMenu(0);
-	while (pMenu->GetMenuItemCount()) pMenu->DeleteMenu(0, MF_BYPOSITION);
-
-	s32 id = ID_VP_0;
-	nb_viewpoints = 0;
-	while (1) {
-		const char *szName = NULL;
-		Bool bound;
-		GF_Err e = gf_term_get_viewpoint(app->m_term, nb_viewpoints+1, &szName, &bound);
-		if (e) break;
-		if (szName) {
-			pMenu->AppendMenu(MF_ENABLED, id+nb_viewpoints, szName);
-		} else {
-			char szLabel1024;
-			sprintf(szLabel, "Viewpoint #%d", nb_viewpoints+1);
-			pMenu->AppendMenu(MF_ENABLED, id+nb_viewpoints, szLabel);
-		}
-		nb_viewpoints++;
-		if (nb_viewpoints==ID_VP_19-ID_VP_0) break;
-	}
-}
-
-
-void CMainFrame::BuildStreamList(Bool reset_only)
-{
-	u32 nb_subs;
-	CMenu *pSelect;
-	Osmo4 *app = GetApp();
-
-	pSelect = GetMenu()->GetSubMenu(2)->GetSubMenu(0);
-	/*THIS IS HARCODED FROM THE MENU LAYOUT */
-	CMenu *pMenu = pSelect->GetSubMenu(0);
-	while (pMenu->GetMenuItemCount()) pMenu->DeleteMenu(0, MF_BYPOSITION);
-	pMenu = pSelect->GetSubMenu(1);
-	while (pMenu->GetMenuItemCount()) pMenu->DeleteMenu(0, MF_BYPOSITION);
-	pMenu = pSelect->GetSubMenu(2);
-	while (pMenu->GetMenuItemCount()) pMenu->DeleteMenu(0, MF_BYPOSITION);
-
-	if (reset_only) {
-		m_bFirstStreamQuery = GF_TRUE;
-		return;
-	}
-	if (!app->m_isopen || !gf_term_get_option(app->m_term, GF_OPT_CAN_SELECT_STREAMS)) return;
-
-	GF_ObjectManager *root_od = gf_term_get_root_object(app->m_term);
-	if (!root_od) return;
-	u32 count = gf_term_get_object_count(app->m_term, root_od);
-	nb_subs = 0;
-
-	for (u32 i=0; i<count; i++) {
-		char szLabel1024;
-		GF_MediaInfo info;
-		GF_ObjectManager *odm = gf_term_get_object(app->m_term, root_od, i);
-		if (!odm) return;
-
-		if (gf_term_get_object_info(app->m_term, odm, &info) != GF_OK) break;
-		if (info.owns_service) {
-			char *szName = (char *)strrchr(info.service_url, '\\');
-			if (!szName) szName = (char *)strrchr(info.service_url, '/');
-			if (!szName) szName = (char *) info.service_url;
-			else szName += 1;
-			strcpy(szLabel, szName);
-			szName = strrchr(szLabel, '.');
-			if (szName) szName0 = 0;
-		}
-
-		switch (info.od_type) {
-		case GF_STREAM_AUDIO:
-			pMenu = pSelect->GetSubMenu(0);
-			if (!info.owns_service) {
-				if (info.lang) {
-					sprintf(szLabel, "Language %s (ID %d)", gf_4cc_to_str(info.lang), info.od->objectDescriptorID);
-				} else {
-					sprintf(szLabel, "ID %d", info.od->objectDescriptorID);
-				}
-			}
-			pMenu->AppendMenu(MF_ENABLED, ID_SELOBJ_0 + i, szLabel);
-			break;
-		case GF_STREAM_VISUAL:
-			pMenu = pSelect->GetSubMenu(1);
-			if (!info.owns_service) sprintf(szLabel, "ID %d", info.od->objectDescriptorID);
-			pMenu->AppendMenu(MF_ENABLED, ID_SELOBJ_0 + i, szLabel);
-			break;
-		case GF_STREAM_TEXT:
-			nb_subs ++;
-			pMenu = pSelect->GetSubMenu(2);
-			if (!info.owns_service) {
-				if (info.lang) {
-					sprintf(szLabel, "Language %s (ID %d)", gf_4cc_to_str(info.lang), info.od->objectDescriptorID);
-				} else {
-					sprintf(szLabel, "ID %d", info.od->objectDescriptorID);
-				}
-			}
-			pMenu->AppendMenu(MF_ENABLED, ID_SELOBJ_0 + i, szLabel);
-			break;
-		}
-	}
-	if (m_bFirstStreamQuery) {
-		m_bFirstStreamQuery = GF_FALSE;
-		if (!nb_subs && app->m_LookForSubtitles) LookForSubtitles();
-	}
-
-}
-
-BOOL CMainFrame::OnCommand(WPARAM wParam, LPARAM lParam)
-{
-	int ID = LOWORD(wParam);
-	Osmo4 *app = GetApp();
-
-	if ( (ID>=ID_VP_0) && (ID<=ID_VP_0+nb_viewpoints)) {
-		ID -= ID_VP_0;
-		gf_term_set_viewpoint(app->m_term, ID+1, NULL);
-		return TRUE;
-	}
-	if ( (ID>=ID_NAV_PREV_0) && (ID<=ID_NAV_PREV_9)) {
-		ID -= ID_NAV_PREV_0;
-		s32 prev = m_pPlayList->m_cur_entry - ID;
-		if (prev>=0) {
-			m_pPlayList->m_cur_entry = prev;
-			m_pPlayList->PlayPrev();
-		}
-		return TRUE;
-	}
-	if ( (ID>=ID_NAV_NEXT_0) && (ID<=ID_NAV_NEXT_9)) {
-		ID -= ID_NAV_NEXT_0;
-		u32 next = m_pPlayList->m_cur_entry + ID;
-		if (next < gf_list_count(m_pPlayList->m_entries) ) {
-			m_pPlayList->m_cur_entry = next;
-			m_pPlayList->PlayNext();
-		}
-		return TRUE;
-	}
-	if ( (ID>=ID_SELOBJ_0) && (ID<=ID_SELOBJ_29)) {
-		ID -= ID_SELOBJ_0;
-		GF_ObjectManager *root_od = gf_term_get_root_object(app->m_term);
-		if (!root_od) return TRUE;
-		GF_ObjectManager *odm = gf_term_get_object(app->m_term, root_od, ID);
-		gf_term_select_object(app->m_term, odm);
-		return TRUE;
-	}
-	if ( (ID>=ID_SETCHAP_FIRST) && (ID<=ID_SETCHAP_LAST)) {
-		ID -= ID_SETCHAP_FIRST;
-		gf_term_play_from_time(app->m_term, (u32) (1000*m_chapters_startID), 0);
-		return TRUE;
-	}
-	return CFrameWnd::OnCommand(wParam, lParam);
-}
-
-void CMainFrame::OnInitMenuPopup(CMenu* pPopupMenu, UINT ID, BOOL bSys)
-{
-	Osmo4 *app = GetApp();
-	/*viewport list*/
-	if (pPopupMenu->GetMenuItemID(0)==ID_VP_0) {
-		for (int i=0; i<nb_viewpoints; i++) {
-			const char *szName;
-			Bool bound;
-			GF_Err e = gf_term_get_viewpoint(app->m_term, i+1, &szName, &bound);
-			pPopupMenu->EnableMenuItem(i, MF_BYPOSITION);
-			if (bound) pPopupMenu->CheckMenuItem(i, MF_BYPOSITION | MF_CHECKED);
-		}
-		return;
-	}
-	/*navigation*/
-	if ((pPopupMenu->GetMenuItemID(0)==ID_NAV_PREV_0) || (pPopupMenu->GetMenuItemID(0)==ID_NAV_NEXT_0)) {
-		int count = pPopupMenu->GetMenuItemCount();
-		for (int i=0; i<count; i++) {
-			pPopupMenu->EnableMenuItem(i, MF_BYPOSITION);
-		}
-		return;
-	}
-	/*stream selection*/
-	if (pPopupMenu->m_hMenu == GetMenu()->GetSubMenu(2)->m_hMenu) {
-		if (!app->m_isopen || !gf_term_get_option(app->m_term, GF_OPT_CAN_SELECT_STREAMS)) {
-			pPopupMenu->EnableMenuItem(0, MF_BYPOSITION | MF_DISABLED | MF_GRAYED);
-		} else {
-			pPopupMenu->EnableMenuItem(0, MF_BYPOSITION | MF_ENABLED);
-		}
-	}
-	if ((pPopupMenu->GetMenuItemID(0)>=ID_SELOBJ_0) && (pPopupMenu->GetMenuItemID(0)<=ID_SELOBJ_29)) {
-		GF_ObjectManager *root_od = gf_term_get_root_object(app->m_term);
-		if (!root_od) return;
-
-		int count = pPopupMenu->GetMenuItemCount();
-		for (int i=0; i<count; i++) {
-			u32 id = pPopupMenu->GetMenuItemID(i) - ID_SELOBJ_0;
-			GF_ObjectManager *odm = gf_term_get_object(app->m_term, root_od, id);
-			if (!odm) {
-				pPopupMenu->EnableMenuItem(i, MF_DISABLED | MF_BYPOSITION);
-			} else {
-				GF_MediaInfo info;
-
-				gf_term_get_object_info(app->m_term, odm, &info);
-				pPopupMenu->EnableMenuItem(i, MF_BYPOSITION);
-				pPopupMenu->CheckMenuItem(i, MF_BYPOSITION | (info.status ? MF_CHECKED : MF_UNCHECKED) );
-			}
-		}
-		return;
-	}
-	/*chapters*/
-	if (pPopupMenu->m_hMenu == GetMenu()->GetSubMenu(2)->m_hMenu) {
-		if (!app->m_isopen || !m_num_chapters) {
-			pPopupMenu->EnableMenuItem(1, MF_BYPOSITION | MF_DISABLED | MF_GRAYED);
-		} else {
-			pPopupMenu->EnableMenuItem(1, MF_BYPOSITION | MF_ENABLED);
-		}
-	}
-	if ((pPopupMenu->GetMenuItemID(0)>=ID_SETCHAP_FIRST) && (pPopupMenu->GetMenuItemID(0)<=ID_SETCHAP_LAST)) {
-		Double now = gf_term_get_time_in_ms(app->m_term);
-		now /= 1000;
-
-		int count = pPopupMenu->GetMenuItemCount();
-		for (int i=0; i<count; i++) {
-			u32 id = pPopupMenu->GetMenuItemID(i) - ID_SETCHAP_FIRST;
-			pPopupMenu->EnableMenuItem(i, MF_BYPOSITION);
-
-			Bool is_current = GF_FALSE;
-			if (m_chapters_startid<=now) {
-				if (id+1<m_num_chapters) {
-					if (m_chapters_startid+1>now) is_current = GF_TRUE;
-				} else {
-					is_current = GF_TRUE;
-				}
-			}
-			pPopupMenu->CheckMenuItem(i, MF_BYPOSITION | (is_current ? MF_CHECKED : MF_UNCHECKED));
-		}
-		return;
-	}
-	/*default*/
-	CFrameWnd::OnInitMenuPopup(pPopupMenu, ID, bSys);
-}
-
-void CMainFrame::OnCollideDisp()
-{
-	gf_term_set_option(GetApp()->m_term, GF_OPT_COLLISION, GF_COLLISION_DISPLACEMENT);
-}
-
-void CMainFrame::OnUpdateCollideDisp(CCmdUI* pCmdUI)
-{
-	Osmo4 *gpac = GetApp();
-	pCmdUI->Enable(gpac->m_isopen);
-	pCmdUI->SetCheck( (gf_term_get_option(gpac->m_term, GF_OPT_COLLISION) == GF_COLLISION_DISPLACEMENT) ? 1 : 0);
-}
-
-void CMainFrame::OnCollideNone()
-{
-	gf_term_set_option(GetApp()->m_term, GF_OPT_COLLISION, GF_COLLISION_NONE);
-}
-
-void CMainFrame::OnUpdateCollideNone(CCmdUI* pCmdUI)
-{
-	Osmo4 *gpac = GetApp();
-	pCmdUI->Enable(gpac->m_isopen);
-	pCmdUI->SetCheck( (gf_term_get_option(gpac->m_term, GF_OPT_COLLISION) == GF_COLLISION_NONE) ? 1 : 0);
-}
-
-void CMainFrame::OnCollideReg()
-{
-	gf_term_set_option(GetApp()->m_term, GF_OPT_COLLISION, GF_COLLISION_NORMAL);
-}
-
-void CMainFrame::OnUpdateCollideReg(CCmdUI* pCmdUI)
-{
-	Osmo4 *gpac = GetApp();
-	pCmdUI->Enable(gpac->m_isopen);
-	pCmdUI->SetCheck( (gf_term_get_option(gpac->m_term, GF_OPT_COLLISION) == GF_COLLISION_NORMAL) ? 1 : 0);
-}
-
-void CMainFrame::OnHeadlight()
-{
-	Osmo4 *app = GetApp();
-	Bool val = gf_term_get_option(app->m_term, GF_OPT_HEADLIGHT) ? GF_FALSE : GF_TRUE;
-	gf_term_set_option(app->m_term, GF_OPT_HEADLIGHT, val);
-}
-
-void CMainFrame::OnUpdateHeadlight(CCmdUI* pCmdUI)
-{
-	Osmo4 *app = GetApp();
-	pCmdUI->Enable(FALSE);
-	if (!app->m_isopen) return;
-	u32 type = gf_term_get_option(app->m_term, GF_OPT_NAVIGATION_TYPE);
-	if (type!=GF_NAVIGATE_TYPE_3D) return;
-
-	pCmdUI->Enable(TRUE);
-	pCmdUI->SetCheck(gf_term_get_option(app->m_term, GF_OPT_HEADLIGHT) ? 1 : 0);
-}
-
-void CMainFrame::OnGravity()
-{
-	Osmo4 *app = GetApp();
-	Bool val = gf_term_get_option(app->m_term, GF_OPT_GRAVITY) ? GF_FALSE : GF_TRUE;
-	gf_term_set_option(app->m_term, GF_OPT_GRAVITY, val);
-}
-
-void CMainFrame::OnUpdateGravity(CCmdUI* pCmdUI)
-{
-	Osmo4 *app = GetApp();
-	pCmdUI->Enable(FALSE);
-	if (!app->m_isopen) return;
-	u32 type = gf_term_get_option(app->m_term, GF_OPT_NAVIGATION_TYPE);
-	if (type!=GF_NAVIGATE_TYPE_3D) return;
-	type = gf_term_get_option(app->m_term, GF_OPT_NAVIGATION);
-	if (type != GF_NAVIGATE_WALK) return;
-	pCmdUI->Enable(TRUE);
-	pCmdUI->SetCheck(gf_term_get_option(app->m_term, GF_OPT_GRAVITY) ? 1 : 0);
-}
-
-
-BOOL CMainFrame::OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult)
-{
-
-	if (((LPNMHDR)lParam)->code == TBN_DROPDOWN) {
-		RECT rc;
-		s32 i, count, start;
-		POINT pt;
-		CMenu *pPopup = new CMenu();
-		pPopup->CreatePopupMenu();
-
-		m_wndToolBar.GetWindowRect(&rc);
-		pt.y = rc.bottom;
-		pt.x = rc.left;
-		m_wndToolBar.GetToolBarCtrl().GetItemRect(0, &rc);
-		pt.x += (rc.right - rc.left);
-		m_wndToolBar.GetToolBarCtrl().GetItemRect(1, &rc);
-		pt.x += (rc.right - rc.left);
-
-		count = gf_list_count(m_pPlayList->m_entries);
-		if ( ((LPNMTOOLBAR)lParam)->iItem == ID_NAV_PREV) {
-			start = m_pPlayList->m_cur_entry - 1;
-			for (i=0; i<10; i++) {
-				if (start - i < 0) break;
-				if (start - i >= count) break;
-				PLEntry *ple = (PLEntry *) gf_list_get(m_pPlayList->m_entries, start - i);
-				pPopup->AppendMenu(MF_STRING | MF_ENABLED, ID_NAV_PREV_0 + i, ple->m_disp_name);
-			}
-		} else {
-			start = m_pPlayList->m_cur_entry + 1;
-			for (i=0; i<10; i++) {
-				if (start + i >= count) break;
-				PLEntry *ple = (PLEntry *) gf_list_get(m_pPlayList->m_entries, start + i);
-				pPopup->AppendMenu(MF_STRING | MF_ENABLED, ID_NAV_NEXT_0 + i, ple->m_disp_name);
-			}
-			m_wndToolBar.GetToolBarCtrl().GetItemRect(2, &rc);
-			pt.x += (rc.right - rc.left);
-		}
-		pPopup->TrackPopupMenu(TPM_LEFTALIGN | TPM_RIGHTBUTTON, pt.x, pt.y, this);
-		delete pPopup;
-
-		return FALSE;
-	}
-	return CFrameWnd::OnNotify(wParam, lParam, pResult);
-}
-
-void CMainFrame::OnNavNext()
-{
-	Osmo4 *app = GetApp();
-	/*don't play if last could trigger playlist loop*/
-	if ((m_pPlayList->m_cur_entry<0) || (gf_list_count(m_pPlayList->m_entries) == 1 + (u32) m_pPlayList->m_cur_entry)) return;
-	m_pPlayList->PlayNext();
-}
-
-void CMainFrame::OnUpdateNavNext(CCmdUI* pCmdUI)
-{
-	if (m_pPlayList->m_cur_entry<0) pCmdUI->Enable(FALSE);
-	else if ((u32) m_pPlayList->m_cur_entry + 1 == gf_list_count(m_pPlayList->m_entries) ) pCmdUI->Enable(FALSE);
-	else pCmdUI->Enable(TRUE);
-}
-
-void CMainFrame::OnNavPrev()
-{
-	Osmo4 *app = GetApp();
-	if (m_pPlayList->m_cur_entry<=0) return;
-	m_pPlayList->PlayPrev();
-}
-
-void CMainFrame::OnUpdateNavPrev(CCmdUI* pCmdUI)
-{
-	if (m_pPlayList->m_cur_entry<=0) pCmdUI->Enable(FALSE);
-	else pCmdUI->Enable(TRUE);
-}
-
-
-void CMainFrame::OnClearNav()
-{
-	m_pPlayList->ClearButPlaying();
-}
-
-void CMainFrame::OnViewPlaylist()
-{
-	m_pPlayList->ShowWindow(m_pPlayList->IsWindowVisible() ? SW_HIDE : SW_SHOW);
-}
-
-void CMainFrame::OnUpdateViewPlaylist(CCmdUI* pCmdUI)
-{
-	pCmdUI->SetCheck(m_pPlayList->IsWindowVisible() ? 1 : 0);
-}
-void CMainFrame::OnPlaylistLoop()
-{
-	GetApp()->m_Loop = GetApp()->m_Loop ? GF_FALSE : GF_TRUE;
-	gf_cfg_set_key(GetApp()->m_user.config, "General", "PlaylistLoop", GetApp()->m_Loop ? "yes" : "no");
-}
-
-void CMainFrame::OnUpdatePlaylistLoop(CCmdUI* pCmdUI)
-{
-	pCmdUI->SetCheck(GetApp()->m_Loop ? GF_TRUE : GF_FALSE);
-}
-
-void CMainFrame::OnAddSubtitle()
-{
-	CFileDialog fd(TRUE,NULL,NULL, OFN_HIDEREADONLY | OFN_FILEMUSTEXIST, "All Subtitles|*.srt;*.sub;*.ttxt;*.xml|SRT Subtitles|*.srt|SUB Subtitles|*.sub|3GPP TimedText|*.ttxt|QuckTime TeXML|*.xml|");
-	if (fd.DoModal() != IDOK) return;
-
-	AddSubtitle(fd.GetPathName(), GF_TRUE);
-}
-
-void CMainFrame::AddSubtitle(const char *fileName, Bool auto_play)
-{
-	gf_term_add_object(GetApp()->m_term, fileName, auto_play);
-}
-
-static Bool subs_enum_dir_item(void *cbck, char *item_name, char *item_path, GF_FileEnumInfo *file_info)
-{
-	CMainFrame *_this = (CMainFrame *)cbck;
-	_this->AddSubtitle(item_path, GF_FALSE);
-	return GF_FALSE;
-}
-
-void CMainFrame::LookForSubtitles()
-{
-	char dirGF_MAX_PATH;
-	CString url = m_pPlayList->GetURL();
-	strcpy(dir, url);
-	char *sep = strrchr(dir, '\\');
-	if (!sep) ::GetCurrentDirectory(GF_MAX_PATH, dir);
-	else sep0 = 0;
-
-	gf_enum_directory(dir, GF_FALSE, subs_enum_dir_item, this, "ttxt;srt");
-}
-
-void CMainFrame::OnCacheEnable()
-{
-	Osmo4 *app = GetApp();
-	u32 state = gf_term_get_option(app->m_term, GF_OPT_MEDIA_CACHE);
-	if (state==GF_MEDIA_CACHE_DISABLED) {
-		gf_term_set_option(app->m_term, GF_OPT_MEDIA_CACHE, GF_MEDIA_CACHE_ENABLED);
-	} else if (state==GF_MEDIA_CACHE_DISABLED) {
-		gf_term_set_option(app->m_term, GF_OPT_MEDIA_CACHE, GF_MEDIA_CACHE_DISABLED);
-	}
-}
-
-void CMainFrame::OnUpdateCacheEnable(CCmdUI* pCmdUI)
-{
-	Osmo4 *app = GetApp();
-	u32 state = gf_term_get_option(app->m_term, GF_OPT_MEDIA_CACHE);
-	switch (state) {
-	case GF_MEDIA_CACHE_ENABLED:
-		pCmdUI->SetText("Enabled");
-		pCmdUI->Enable(TRUE);
-		break;
-	case GF_MEDIA_CACHE_RUNNING:
-		pCmdUI->SetText("Running");
-		pCmdUI->Enable(FALSE);
-		break;
-	case GF_MEDIA_CACHE_DISABLED:
-		pCmdUI->SetText("Disabled");
-		break;
-	}
-}
-
-void CMainFrame::OnUpdateCacheStop(CCmdUI* pCmdUI)
-{
-	Osmo4 *app = GetApp();
-	u32 state = gf_term_get_option(app->m_term, GF_OPT_MEDIA_CACHE);
-	pCmdUI->Enable( (state==GF_MEDIA_CACHE_RUNNING) ? TRUE : FALSE);
-}
-
-void CMainFrame::OnCacheStop()
-{
-	Osmo4 *app = GetApp();
-	gf_term_set_option(app->m_term, GF_OPT_MEDIA_CACHE, GF_MEDIA_CACHE_DISABLED);
-}
-void CMainFrame::OnCacheAbort()
-{
-	Osmo4 *app = GetApp();
-	gf_term_set_option(app->m_term, GF_OPT_MEDIA_CACHE, GF_MEDIA_CACHE_DISCARD);
-}
-
-void CMainFrame::OnFileExit()
-{
-	DestroyWindow();
-}
-
-
-void CMainFrame::BuildChapterList(Bool reset_only)
-{
-	CMenu *pChaps;
-	GF_MediaInfo odi;
-	NetInfoCommand com;
-	Osmo4 *app = GetApp();
-
-	/*THIS IS HARCODED FROM THE MENU LAYOUT */
-	pChaps = GetMenu()->GetSubMenu(2)->GetSubMenu(1);
-	while (pChaps->GetMenuItemCount()) pChaps->DeleteMenu(0, MF_BYPOSITION);
-
-	if (m_chapters_start) gf_free(m_chapters_start);
-	m_chapters_start = NULL;
-	m_num_chapters = 0;
-	if (reset_only) return;
-
-	GF_ObjectManager *root_od = gf_term_get_root_object(app->m_term);
-	if (!root_od) return;
-	if (gf_term_get_object_info(app->m_term, root_od, &odi) != GF_OK) return;
-
-	u32 count = gf_list_count(odi.od->OCIDescriptors);
-	m_num_chapters = 0;
-	for (u32 i=0; i<count; i++) {
-		char szLabel1024;
-		GF_Segment *seg = (GF_Segment *) gf_list_get(odi.od->OCIDescriptors, i);
-		if (seg->tag != GF_ODF_SEGMENT_TAG) continue;
-
-		if (seg->SegmentName && strlen((const char *)seg->SegmentName)) {
-			strcpy(szLabel, (const char *) seg->SegmentName);
-		} else {
-			sprintf(szLabel, "Chapter #%02d", m_num_chapters+1);
-		}
-		pChaps->AppendMenu(MF_ENABLED, ID_SETCHAP_FIRST + m_num_chapters, szLabel);
-
-		m_chapters_start = (Double *) gf_realloc(m_chapters_start, sizeof(Double)*(m_num_chapters+1));
-		m_chapters_startm_num_chapters = seg->startTime;
-		m_num_chapters++;
-	}
-
-	/*get any service info*/
-	if (!m_bStartupFile && gf_term_get_service_info(app->m_term, root_od, &com) == GF_OK) {
-		CString title("");
-		if (com.track_info) {
-			title.Format("%02d ", (u32) (com.track_info>>16) );
-		}
-		if (com.artist) {
-			title += com.artist;
-			title += " ";
-		}
-		if (com.name) {
-			title += com.name;
-			title += " ";
-		}
-		if (com.album) {
-			title += "(";
-			title += com.album;
-			title += ")";
-		}
-
-		if (title.GetLength()) SetWindowText(title);
-	}
-}
-
-void CMainFrame::OnViewCPU()
-{
-	m_show_rti = m_show_rti ? GF_FALSE : GF_TRUE;
-}
-
-void CMainFrame::OnUpdateViewCPU(CCmdUI* pCmdUI)
-{
-	pCmdUI->Enable(TRUE);
-	pCmdUI->SetCheck(m_show_rti);
-}
-
-
-void CMainFrame::OnFileCopy()
-{
-	size_t len;
-	const char *text = gf_term_get_text_selection(GetApp()->m_term, GF_FALSE);
-	if (!text) return;
-
-	if (!IsClipboardFormatAvailable(CF_TEXT)) return;
-	if (!OpenClipboard()) return;
-	EmptyClipboard();
-
-	len = strlen(text);
-	if (!len) return;
-
-	HGLOBAL hglbCopy = GlobalAlloc(GMEM_MOVEABLE, (len + 1) * sizeof(char));
-	LPTSTR lptstrCopy = (char *) GlobalLock(hglbCopy);
-	memcpy(lptstrCopy, text, len * sizeof(char));
-	lptstrCopylen = 0;
-	GlobalUnlock(hglbCopy);
-	SetClipboardData(CF_TEXT, hglbCopy);
-	CloseClipboard();
-}
-
-void CMainFrame::OnUpdateFileCopy(CCmdUI* pCmdUI)
-{
-	Osmo4 *app = GetApp();
-	if (IsClipboardFormatAvailable(CF_TEXT)
-	        && app->m_term
-	        && (gf_term_get_text_selection(app->m_term, GF_TRUE)!=NULL)
-	   ) {
-		pCmdUI->Enable(TRUE);
-	} else {
-		pCmdUI->Enable(FALSE);
-	}
-}
-
-
-void CMainFrame::OnFilePaste()
-{
-	if (!IsClipboardFormatAvailable(CF_TEXT)) return;
-	if (!OpenClipboard()) return;
-
-	HGLOBAL hglbCopy = GetClipboardData(CF_TEXT);
-	if (hglbCopy) {
-		LPTSTR lptstrCopy = (char *) GlobalLock(hglbCopy);
-		gf_term_paste_text(GetApp()->m_term, lptstrCopy, GF_FALSE);
-		GlobalUnlock(hglbCopy);
-	}
-	CloseClipboard();
-}
-
-void CMainFrame::OnUpdateFilePaste(CCmdUI* pCmdUI)
-{
-	Osmo4 *app = GetApp();
-	if (IsClipboardFormatAvailable(CF_TEXT)
-	        && app->m_term
-	        && (gf_term_paste_text(app->m_term, NULL, GF_TRUE)==GF_OK)
-	   ) {
-		pCmdUI->Enable(TRUE);
-	} else {
-		pCmdUI->Enable(FALSE);
-	}
-}
-
-

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/osmo4_w32/MainFrm.h Deleted

@@ -1,224 +0,0 @@
-// MainFrm.h : interface of the CMainFrame class
-//
-/////////////////////////////////////////////////////////////////////////////
-
-#if !defined(AFX_MAINFRM_H__3666B63B_D886_4F0B_9953_A2AF09E3C15A__INCLUDED_)
-#define AFX_MAINFRM_H__3666B63B_D886_4F0B_9953_A2AF09E3C15A__INCLUDED_
-
-#if _MSC_VER > 1000
-#pragma once
-#endif // _MSC_VER > 1000
-
-#include <gpac/tools.h>
-#include <gpac/constants.h>
-#include <gpac/modules/service.h>
-#include <gpac/options.h>
-
-#include "FileProps.h"
-#include "Options.h"
-#include "AddressBar.h"
-#include "Sliders.h"
-#include "Playlist.h"
-
-
-class CChildView : public CWnd
-{
-// Construction
-public:
-	CChildView();
-
-// Attributes
-public:
-
-// Operations
-public:
-
-// Overrides
-	// ClassWizard generated virtual function overrides
-	//{{AFX_VIRTUAL(CChildView)
-protected:
-	virtual BOOL PreCreateWindow(CREATESTRUCT& cs);
-	//}}AFX_VIRTUAL
-
-// Implementation
-public:
-	virtual ~CChildView();
-
-	// Generated message map functions
-protected:
-	//{{AFX_MSG(CChildView)
-	//}}AFX_MSG
-	DECLARE_MESSAGE_MAP()
-};
-
-
-class CMainFrame : public CFrameWnd
-{
-
-public:
-	CMainFrame();
-protected:
-	DECLARE_DYNAMIC(CMainFrame)
-
-// Attributes
-public:
-
-// Operations
-public:
-
-// Overrides
-	// ClassWizard generated virtual function overrides
-	//{{AFX_VIRTUAL(CMainFrame)
-public:
-	virtual BOOL PreCreateWindow(CREATESTRUCT& cs);
-	virtual BOOL OnCmdMsg(UINT nID, int nCode, void* pExtra, AFX_CMDHANDLERINFO* pHandlerInfo);
-	virtual BOOL DestroyWindow();
-protected:
-	virtual BOOL OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult);
-	//}}AFX_VIRTUAL
-
-// Implementation
-public:
-	virtual ~CMainFrame();
-#ifdef _DEBUG
-	virtual void AssertValid() const;
-	virtual void Dump(CDumpContext& dc) const;
-#endif
-
-public:
-	CStatusBar  m_wndStatusBar;
-	CToolBar    m_wndToolBar;
-	Sliders m_Sliders;
-	AddressBar m_Address;
-	CFileProps *m_pProps;
-	COptions *m_pOpt;
-	Playlist *m_pPlayList;
-	CChildView *m_pWndView;
-	Bool m_bFullScreen;
-	u32 m_RestoreFS;
-	UINT_PTR m_timer_on;
-	CString console_message;
-	CString console_service;
-	GF_Err console_err;
-	u32 m_aspect_ratio;
-	RECT backup_wnd_rc;
-	Bool m_bFirstStreamQuery;
-	/*filter progress events to avoid killing importers with status bar text display...*/
-	s32 m_last_prog;
-	Bool m_show_rti;
-	Bool m_bStartupFile;
-
-public:
-	void SetFullscreen();
-	void BuildViewList();
-	void BuildStreamList(Bool reset_ony);
-	void BuildChapterList(Bool reset_ony);
-	void SetProgTimer(Bool bOn);
-	void AddSubtitle(const char *fileName, Bool auto_play);
-
-private:
-	void ForwardMessage();
-	HICON m_icoerror, m_icomessage;
-	s32 nb_viewpoints;
-	Bool m_bInitShow;
-
-	void SetNavigate(u32 mode);
-	void LookForSubtitles();
-
-	Double *m_chapters_start;
-	u32 m_num_chapters;
-
-
-// Generated message map functions
-protected:
-	//{{AFX_MSG(CMainFrame)
-	afx_msg int OnCreate(LPCREATESTRUCT lpCreateStruct);
-	afx_msg void OnSetFocus(CWnd *pOldWnd);
-	afx_msg void OnInitMenuPopup(CMenu* pPopupMenu, UINT nIndex, BOOL bSysMenu);
-	afx_msg BOOL OnCommand(WPARAM wParam, LPARAM lParam);
-	afx_msg void OnSize(UINT nType, int cx, int cy);
-	afx_msg void OnMove(int x, int y);
-	afx_msg LRESULT OnSetSize(WPARAM wParam, LPARAM lParam);
-	afx_msg LRESULT OnNavigate(WPARAM wParam, LPARAM lParam);
-	afx_msg LRESULT Open(WPARAM wParam, LPARAM lParam);
-	afx_msg LRESULT NewInstanceOpened(WPARAM wParam, LPARAM lParam);
-
-	afx_msg void OnLButtonDown(UINT nFlags, CPoint point);
-	afx_msg void OnLButtonDblClk(UINT nFlags, CPoint point);
-	afx_msg void OnLButtonUp(UINT nFlags, CPoint point);
-	afx_msg void OnChar( UINT nChar, UINT nRepCnt, UINT nFlags );
-	afx_msg void OnSysKeyDown( UINT nChar, UINT nRepCnt, UINT nFlags );
-	afx_msg void OnSysKeyUp( UINT nChar, UINT nRepCnt, UINT nFlags );
-	afx_msg void OnKeyDown( UINT nChar, UINT nRepCnt, UINT nFlags );
-	afx_msg void OnKeyUp( UINT nChar, UINT nRepCnt, UINT nFlags );
-	afx_msg void OnDropFiles(HDROP hDropInfo);
-	afx_msg LRESULT OnConsoleMessage(WPARAM wParam, LPARAM lParam);
-	afx_msg void OnViewOriginal();
-	afx_msg void OnViewFullscreen();
-	afx_msg void OnArKeep();
-	afx_msg void OnArFill();
-	afx_msg void OnAr43();
-	afx_msg void OnAr169();
-	afx_msg void OnUpdateAr169(CCmdUI* pCmdUI);
-	afx_msg void OnUpdateAr43(CCmdUI* pCmdUI);
-	afx_msg void OnUpdateArFill(CCmdUI* pCmdUI);
-	afx_msg void OnUpdateArKeep(CCmdUI* pCmdUI);
-	afx_msg void OnNavigateNone();
-	afx_msg void OnNavigateWalk();
-	afx_msg void OnNavigateFly();
-	afx_msg void OnNavigateExam();
-	afx_msg void OnNavigateSlide();
-	afx_msg void OnNavigatePan();
-	afx_msg void OnNavigateOrbit();
-	afx_msg void OnNavigateGame();
-	afx_msg void OnNavigateVR();
-	afx_msg void OnNavigateReset();
-	afx_msg void OnShortcuts();
-	afx_msg void OnConfigure();
-	afx_msg void OnFileProp();
-	afx_msg void OnViewPlaylist();
-	afx_msg void OnUpdateFileProp(CCmdUI* pCmdUI);
-	afx_msg void OnUpdateNavigate(CCmdUI* pCmdUI);
-	afx_msg void OnCacheEnable();
-	afx_msg void OnUpdateCacheEnable(CCmdUI* pCmdUI);
-	afx_msg void OnCacheStop();
-	afx_msg void OnCacheAbort();
-	afx_msg void OnUpdateCacheStop(CCmdUI* pCmdUI);
-	afx_msg void OnCollideDisp();
-	afx_msg void OnUpdateCollideDisp(CCmdUI* pCmdUI);
-	afx_msg void OnCollideNone();
-	afx_msg void OnUpdateCollideNone(CCmdUI* pCmdUI);
-	afx_msg void OnCollideReg();
-	afx_msg void OnUpdateCollideReg(CCmdUI* pCmdUI);
-	afx_msg void OnHeadlight();
-	afx_msg void OnUpdateHeadlight(CCmdUI* pCmdUI);
-	afx_msg void OnGravity();
-	afx_msg void OnUpdateGravity(CCmdUI* pCmdUI);
-	afx_msg void OnNavInfo();
-	afx_msg void OnNavNext();
-	afx_msg void OnNavPrev();
-	afx_msg void OnUpdateNavNext(CCmdUI* pCmdUI);
-	afx_msg void OnUpdateNavPrev(CCmdUI* pCmdUI);
-	afx_msg void OnClearNav();
-	afx_msg void OnUpdateViewPlaylist(CCmdUI* pCmdUI);
-	afx_msg void OnPlaylistLoop();
-	afx_msg void OnUpdatePlaylistLoop(CCmdUI* pCmdUI);
-	afx_msg void OnAddSubtitle();
-	afx_msg void OnFileExit();
-	afx_msg void OnViewCPU();
-	afx_msg void OnUpdateViewCPU(CCmdUI* pCmdUI);
-	afx_msg void OnFileCopy();
-	afx_msg void OnUpdateFileCopy(CCmdUI* pCmdUI);
-	afx_msg void OnFilePaste();
-	afx_msg void OnUpdateFilePaste(CCmdUI* pCmdUI);
-
-	//}}AFX_MSG
-	DECLARE_MESSAGE_MAP()
-};
-
-/////////////////////////////////////////////////////////////////////////////
-
-//{{AFX_INSERT_LOCATION}}
-// Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_MAINFRM_H__3666B63B_D886_4F0B_9953_A2AF09E3C15A__INCLUDED_)

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/osmo4_w32/OpenUrl.cpp Deleted

@@ -1,98 +0,0 @@
-// OpenUrl.cpp : implementation file
-//
-
-#include "stdafx.h"
-#include "Osmo4.h"
-#include "OpenUrl.h"
-
-#ifdef _DEBUG
-#define new DEBUG_NEW
-#undef THIS_FILE
-static char THIS_FILE = __FILE__;
-#endif
-
-/////////////////////////////////////////////////////////////////////////////
-// COpenUrl dialog
-
-
-COpenUrl::COpenUrl(CWnd* pParent /*=NULL*/)
-	: CDialog(COpenUrl::IDD, pParent)
-{
-	//{{AFX_DATA_INIT(COpenUrl)
-	// NOTE: the ClassWizard will add member initialization here
-	//}}AFX_DATA_INIT
-}
-
-
-void COpenUrl::DoDataExchange(CDataExchange* pDX)
-{
-	CDialog::DoDataExchange(pDX);
-	//{{AFX_DATA_MAP(COpenUrl)
-	DDX_Control(pDX, IDC_COMBOURL, m_URLs);
-	//}}AFX_DATA_MAP
-}
-
-
-BEGIN_MESSAGE_MAP(COpenUrl, CDialog)
-	//{{AFX_MSG_MAP(COpenUrl)
-	ON_BN_CLICKED(IDC_BUTGO, OnButgo)
-	//}}AFX_MSG_MAP
-END_MESSAGE_MAP()
-
-
-
-
-#define MAX_LAST_FILES		20
-void UpdateLastFiles(GF_Config *cfg, const char *URL)
-{
-	u32 nb_entries;
-	gf_cfg_set_key(cfg, "RecentFiles", URL, NULL);
-	gf_cfg_insert_key(cfg, "RecentFiles", URL, "", 0);
-	/*remove last entry if needed*/
-	nb_entries = gf_cfg_get_key_count(cfg, "RecentFiles");
-	if (nb_entries>MAX_LAST_FILES) {
-		gf_cfg_set_key(cfg, "RecentFiles", gf_cfg_get_key_name(cfg, "RecentFiles", nb_entries-1), NULL);
-	}
-}
-
-
-/////////////////////////////////////////////////////////////////////////////
-// COpenUrl message handlers
-
-void COpenUrl::OnButgo()
-{
-	CString URL;
-	int sel = m_URLs.GetCurSel();
-	if (sel == CB_ERR) {
-		m_URLs.GetWindowText(URL);
-	} else {
-		m_URLs.GetLBText(sel, URL);
-	}
-	if (!URL.GetLength()) {
-		EndDialog(IDCANCEL);
-		return;
-	}
-
-	Osmo4 *gpac = GetApp();
-
-	m_url = URL;
-	UpdateLastFiles(gpac->m_user.config, (const char *) URL);
-	EndDialog(IDOK);
-}
-
-BOOL COpenUrl::OnInitDialog()
-{
-	CDialog::OnInitDialog();
-
-	Osmo4 *gpac = GetApp();
-	u32 i=0;
-
-	while (m_URLs.GetCount()) m_URLs.DeleteString(0);
-	while (1) {
-		const char *sOpt = gf_cfg_get_key_name(gpac->m_user.config, "RecentFiles", i);
-		if (!sOpt) break;
-		m_URLs.AddString(sOpt);
-		i++;
-	}
-	return TRUE;
-}

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/osmo4_w32/OpenUrl.h Deleted

@@ -1,49 +0,0 @@
-#if !defined(AFX_OPENURL_H__ADB51A74_305E_4183_8D44_03EEB83D2BFA__INCLUDED_)
-#define AFX_OPENURL_H__ADB51A74_305E_4183_8D44_03EEB83D2BFA__INCLUDED_
-
-#if _MSC_VER > 1000
-#pragma once
-#endif // _MSC_VER > 1000
-// OpenUrl.h : header file
-//
-
-/////////////////////////////////////////////////////////////////////////////
-// COpenUrl dialog
-
-class COpenUrl : public CDialog
-{
-// Construction
-public:
-	COpenUrl(CWnd* pParent = NULL);   // standard constructor
-	CString m_url;
-
-// Dialog Data
-	//{{AFX_DATA(COpenUrl)
-	enum { IDD = IDD_OPENFILE };
-	CComboBox	m_URLs;
-	//}}AFX_DATA
-
-
-// Overrides
-	// ClassWizard generated virtual function overrides
-	//{{AFX_VIRTUAL(COpenUrl)
-protected:
-	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
-	//}}AFX_VIRTUAL
-
-// Implementation
-protected:
-
-	// Generated message map functions
-	//{{AFX_MSG(COpenUrl)
-	afx_msg void OnBrowse();
-	afx_msg void OnButgo();
-	virtual BOOL OnInitDialog();
-	//}}AFX_MSG
-	DECLARE_MESSAGE_MAP()
-};
-
-//{{AFX_INSERT_LOCATION}}
-// Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_OPENURL_H__ADB51A74_305E_4183_8D44_03EEB83D2BFA__INCLUDED_)

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/osmo4_w32/Options.cpp Deleted

@@ -1,2080 +0,0 @@
-// Options.cpp : implementation file
-//
-
-#include "stdafx.h"
-#include "Osmo4.h"
-#include "MainFrm.h"
-
-#include <gpac/modules/codec.h>
-#include <gpac/modules/raster2d.h>
-#include <gpac/modules/font.h>
-#include <gpac/modules/audio_out.h>
-#include <gpac/modules/video_out.h>
-
-#include <gpac/iso639.h>
-#include "Options.h"
-
-#ifdef _DEBUG
-#define new DEBUG_NEW
-#undef THIS_FILE
-static char THIS_FILE = __FILE__;
-#endif
-
-/////////////////////////////////////////////////////////////////////////////
-// COptions dialog
-
-
-COptions::COptions(CWnd* pParent /*=NULL*/)
-	: CDialog(COptions::IDD, pParent)
-{
-	//{{AFX_DATA_INIT(COptions)
-	//}}AFX_DATA_INIT
-}
-
-
-void COptions::DoDataExchange(CDataExchange* pDX)
-{
-	CDialog::DoDataExchange(pDX);
-	//{{AFX_DATA_MAP(COptions)
-	DDX_Control(pDX, IDC_SELECT, m_Selector);
-	//}}AFX_DATA_MAP
-}
-
-
-BEGIN_MESSAGE_MAP(COptions, CDialog)
-	//{{AFX_MSG_MAP(COptions)
-	ON_BN_CLICKED(IDC_SAVEOPT, OnSaveopt)
-	ON_WM_CLOSE()
-	ON_WM_DESTROY()
-	ON_CBN_SELCHANGE(IDC_SELECT, OnSelchangeSelect)
-	//}}AFX_MSG_MAP
-END_MESSAGE_MAP()
-
-BOOL COptions::OnInitDialog()
-{
-	CDialog::OnInitDialog();
-
-	m_general.Create(IDD_OPT_GEN, this);
-	m_systems.Create(IDD_OPT_SYSTEMS, this);
-	m_render.Create(IDD_OPT_RENDER, this);
-	m_render2d.Create(IDD_OPT_RENDER2D, this);
-	m_render3d.Create(IDD_OPT_RENDER3D, this);
-	m_decoder.Create(IDD_OPT_DECODER, this);
-	m_audio.Create(IDD_OPT_AUDIO, this);
-	m_video.Create(IDD_OPT_VIDEO, this);
-	m_http.Create(IDD_OPT_HTTP, this);
-	m_font.Create(IDD_OPT_FONT, this);
-	m_stream.Create(IDD_OPT_STREAM, this);
-	m_cache.Create(IDD_OPT_MCACHE, this);
-	m_files.Create(IDD_OPT_FILETYPES, this);
-	m_logs.Create(IDD_OPT_LOGS, this);
-
-	m_Selector.AddString("General");
-	m_Selector.AddString("MPEG-4 Systems");
-	m_Selector.AddString("Media Decoders");
-	m_Selector.AddString("Compositor");
-	m_Selector.AddString("2D Drawing");
-	m_Selector.AddString("3D Drawing");
-	m_Selector.AddString("Video Output");
-	m_Selector.AddString("Audio Output");
-	m_Selector.AddString("Text Engine");
-	m_Selector.AddString("File Download");
-	m_Selector.AddString("Real-Time Streaming");
-	m_Selector.AddString("Streaming Cache");
-	m_Selector.AddString("File Types");
-	m_Selector.AddString("Log System");
-
-	HideAll();
-
-	const char *sOpt = gf_cfg_get_key(GetApp()->m_user.config, "General", "ConfigPanel");
-	u32 sel = sOpt ? atoi(sOpt) : 0;
-	if (sel>13) sel=13;
-	m_Selector.SetCurSel(sel);
-	m_general.ShowWindow(SW_SHOW);
-
-	OnSelchangeSelect();
-
-	return TRUE;
-}
-
-
-/////////////////////////////////////////////////////////////////////////////
-// COptions message handlers
-
-void COptions::HideAll()
-{
-	m_general.ShowWindow(SW_HIDE);
-	m_systems.ShowWindow(SW_HIDE);
-	m_render.ShowWindow(SW_HIDE);
-	m_render2d.ShowWindow(SW_HIDE);
-	m_render3d.ShowWindow(SW_HIDE);
-	m_audio.ShowWindow(SW_HIDE);
-	m_video.ShowWindow(SW_HIDE);
-	m_http.ShowWindow(SW_HIDE);
-	m_font.ShowWindow(SW_HIDE);
-	m_stream.ShowWindow(SW_HIDE);
-	m_decoder.ShowWindow(SW_HIDE);
-	m_cache.ShowWindow(SW_HIDE);
-	m_files.ShowWindow(SW_HIDE);
-	m_files.ShowWindow(SW_HIDE);
-	m_logs.ShowWindow(SW_HIDE);
-}
-
-void COptions::OnSelchangeSelect()
-{
-	HideAll();
-	switch (m_Selector.GetCurSel()) {
-	case 0:
-		m_general.ShowWindow(SW_SHOW);
-		break;
-	case 1:
-		m_systems.ShowWindow(SW_SHOW);
-		break;
-	case 2:
-		m_decoder.ShowWindow(SW_SHOW);
-		break;
-	case 3:
-		m_render.ShowWindow(SW_SHOW);
-		break;
-	case 4:
-		m_render2d.ShowWindow(SW_SHOW);
-		break;
-	case 5:
-		m_render3d.ShowWindow(SW_SHOW);
-		break;
-	case 6:
-		m_video.ShowWindow(SW_SHOW);
-		break;
-	case 7:
-		m_audio.ShowWindow(SW_SHOW);
-		break;
-	case 8:
-		m_font.ShowWindow(SW_SHOW);
-		break;
-	case 9:
-		m_http.ShowWindow(SW_SHOW);
-		break;
-	case 10:
-		m_stream.ShowWindow(SW_SHOW);
-		break;
-	case 11:
-		m_cache.ShowWindow(SW_SHOW);
-		break;
-	case 12:
-		m_files.ShowWindow(SW_SHOW);
-		break;
-	case 13:
-		m_logs.ShowWindow(SW_SHOW);
-		break;
-	}
-}
-
-void COptions::OnSaveopt()
-{
-	m_general.SaveOptions();
-	m_systems.SaveOptions();
-	m_decoder.SaveOptions();
-	m_render.SaveOptions();
-	m_render2d.SaveOptions();
-	m_render3d.SaveOptions();
-	m_audio.SaveOptions();
-	m_video.SaveOptions();
-	m_http.SaveOptions();
-	m_font.SaveOptions();
-	m_stream.SaveOptions();
-	m_cache.SaveOptions();
-	m_logs.SaveOptions();
-
-	Osmo4 *gpac = GetApp();
-	gf_term_set_option(gpac->m_term, GF_OPT_RELOAD_CONFIG, 1);
-	m_render2d.SetYUV();
-}
-
-void COptions::OnClose()
-{
-	char str20;
-	sprintf(str, "%d", m_Selector.GetCurSel());
-	gf_cfg_set_key(GetApp()->m_user.config, "General", "ConfigPanel", str);
-
-	DestroyWindow();
-}
-
-void COptions::OnDestroy()
-{
-	CDialog::OnDestroy();
-	delete this;
-	((CMainFrame *)GetApp()->m_pMainWnd)->m_pOpt = NULL;
-}
-
-
-COptGen::COptGen(CWnd* pParent /*=NULL*/)
-	: CDialog(COptGen::IDD, pParent)
-{
-	//{{AFX_DATA_INIT(COptGen)
-	//}}AFX_DATA_INIT
-}
-
-
-void COptGen::DoDataExchange(CDataExchange* pDX)
-{
-	CDialog::DoDataExchange(pDX);
-	//{{AFX_DATA_MAP(COptGen)
-	DDX_Control(pDX, IDC_LOOKFORSUB, m_LookForSubs);
-	DDX_Control(pDX, IDC_DUMP_XMT, m_ViewXMT);
-	DDX_Control(pDX, IDC_NO_CONSOLE, m_NoConsole);
-	DDX_Control(pDX, IDC_LOOP, m_Loop);
-	DDX_Control(pDX, IDC_SINGLE_INSTANCE, m_SingleInstance);
-	//}}AFX_DATA_MAP
-}
-
-
-BEGIN_MESSAGE_MAP(COptGen, CDialog)
-	//{{AFX_MSG_MAP(COptGen)
-	//}}AFX_MSG_MAP
-END_MESSAGE_MAP()
-
-/////////////////////////////////////////////////////////////////////////////
-// COptGen message handlers
-
-
-
-BOOL COptGen::OnInitDialog()
-{
-	CDialog::OnInitDialog();
-
-	Osmo4 *gpac = GetApp();
-	const char *sOpt;
-
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "General", "Loop");
-	m_Loop.SetCheck((sOpt && !stricmp(sOpt, "yes")) ? 1 : 0);
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "General", "LookForSubtitles");
-	m_LookForSubs.SetCheck((sOpt && !stricmp(sOpt, "yes")) ? 1 : 0);
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "General", "ConsoleOff");
-	m_NoConsole.SetCheck((sOpt && !stricmp(sOpt, "yes")) ? 1 : 0);
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "General", "ViewXMT");
-	m_ViewXMT.SetCheck((sOpt && !stricmp(sOpt, "yes")) ? 1 : 0);
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "General", "SingleInstance");
-	m_SingleInstance.SetCheck((sOpt && !stricmp(sOpt, "yes")) ? 1 : 0);
-	return TRUE;
-}
-
-void COptGen::SaveOptions()
-{
-	Osmo4 *gpac = GetApp();
-
-	gpac->m_Loop = (Bool) m_Loop.GetCheck();
-	gf_cfg_set_key(gpac->m_user.config, "General", "Loop", gpac->m_Loop ? "yes" : "no");
-	gpac->m_LookForSubtitles = (Bool) m_LookForSubs.GetCheck();
-	gf_cfg_set_key(gpac->m_user.config, "General", "LookForSubtitles",  gpac->m_LookForSubtitles ? "yes" : "no");
-	gpac->m_NoConsole = (Bool) m_NoConsole.GetCheck();
-	gf_cfg_set_key(gpac->m_user.config, "General", "ConsoleOff", gpac->m_NoConsole ? "yes" : "no");
-	gpac->m_ViewXMTA = (Bool) m_ViewXMT.GetCheck();
-	gf_cfg_set_key(gpac->m_user.config, "General", "ViewXMT", gpac->m_ViewXMTA ? "yes" : "no");
-	gpac->m_SingleInstance = (Bool) m_SingleInstance.GetCheck();
-	gf_cfg_set_key(gpac->m_user.config, "General", "SingleInstance", gpac->m_SingleInstance ? "yes" : "no");
-}
-
-COptSystems::COptSystems(CWnd* pParent /*=NULL*/)
-	: CDialog(COptSystems::IDD, pParent)
-{
-	//{{AFX_DATA_INIT(COptSystems)
-	// NOTE: the ClassWizard will add member initialization here
-	//}}AFX_DATA_INIT
-}
-
-
-void COptSystems::DoDataExchange(CDataExchange* pDX)
-{
-	CDialog::DoDataExchange(pDX);
-	//{{AFX_DATA_MAP(COptSystems)
-	DDX_Control(pDX, IDC_FORCE_DURATION, m_ForceDuration);
-	DDX_Control(pDX, IDC_DEC_THREAD, m_Threading);
-	DDX_Control(pDX, IDC_BIFSDROP, m_LateFramesAlwaysDrawn);
-	DDX_Control(pDX, IDC_LANG, m_Lang);
-	//}}AFX_DATA_MAP
-}
-
-
-BEGIN_MESSAGE_MAP(COptSystems, CDialog)
-	//{{AFX_MSG_MAP(COptSystems)
-	//}}AFX_MSG_MAP
-END_MESSAGE_MAP()
-
-/////////////////////////////////////////////////////////////////////////////
-// COptSystems message handlers
-
-
-
-
-
-BOOL COptSystems::OnInitDialog()
-{
-	CDialog::OnInitDialog();
-
-	Osmo4 *gpac = GetApp();
-	const char *sOpt;
-
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "Systems", "Language3CC");
-	if (!sOpt) sOpt = "eng";
-	s32 select = 0;
-	while (m_Lang.GetCount()) m_Lang.DeleteString(0);
-	u32 i, count = gf_lang_get_count();
-	for (i=0; i<count; i++) {
-		const char *n2c = gf_lang_get_2cc(i);
-		const char *n3c = gf_lang_get_3cc(i);
-
-		m_Lang.AddString(gf_lang_get_name(i) );
-		if (sOpt && n3c && !stricmp(sOpt, n3c))
-			select = m_Lang.GetCount() - 1;
-	}
-	m_Lang.SetCurSel(select);
-
-
-	/*system config*/
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "Systems", "ThreadingPolicy");
-	select = 0;
-	while (m_Threading.GetCount()) m_Threading.DeleteString(0);
-	m_Threading.AddString("Single Thread");
-	m_Threading.AddString("Mutli Thread");
-	if (sOpt && !stricmp(sOpt, "Multi")) select = 1;
-	m_Threading.AddString("Free");
-	if (sOpt && !stricmp(sOpt, "Free")) select = 2;
-	m_Threading.SetCurSel(select);
-
-
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "Systems", "ForceSingleClock");
-	if (sOpt && !stricmp(sOpt, "yes")) {
-		m_ForceDuration.SetCheck(1);
-	} else {
-		m_ForceDuration.SetCheck(0);
-	}
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "Systems", "DrawLateFrames");
-	if (sOpt && !stricmp(sOpt, "yes")) {
-		m_LateFramesAlwaysDrawn.SetCheck(1);
-	} else {
-		m_LateFramesAlwaysDrawn.SetCheck(0);
-	}
-
-
-	return TRUE;
-}
-
-
-void COptSystems::SaveOptions()
-{
-	Osmo4 *gpac = GetApp();
-
-	s32 sel = m_Lang.GetCurSel();
-	u32 i=0;
-
-	gf_cfg_set_key(gpac->m_user.config, "Systems", "LanguageName", gf_lang_get_name(i) );
-	gf_cfg_set_key(gpac->m_user.config, "Systems", "Language3CC", gf_lang_get_3cc(i) );
-	gf_cfg_set_key(gpac->m_user.config, "Systems", "Language2CC", gf_lang_get_2cc(i) );
-
-	sel = m_Threading.GetCurSel();
-	gf_cfg_set_key(gpac->m_user.config, "Systems", "ThreadingPolicy", (sel==0) ? "Single" : ( (sel==1) ? "Multi" : "Free"));
-	gf_cfg_set_key(gpac->m_user.config, "Systems", "ForceSingleClock", m_ForceDuration.GetCheck() ? "yes" : "no");
-	gf_cfg_set_key(gpac->m_user.config, "Systems", "DrawLateFrames", m_LateFramesAlwaysDrawn.GetCheck() ? "yes" : "no");
-}
-
-
-OptDecoder::OptDecoder(CWnd* pParent /*=NULL*/)
-	: CDialog(OptDecoder::IDD, pParent)
-{
-	//{{AFX_DATA_INIT(OptDecoder)
-	// NOTE: the ClassWizard will add member initialization here
-	//}}AFX_DATA_INIT
-}
-
-
-void OptDecoder::DoDataExchange(CDataExchange* pDX)
-{
-	CDialog::DoDataExchange(pDX);
-	//{{AFX_DATA_MAP(OptDecoder)
-	DDX_Control(pDX, IDC_VIDEC_LIST, m_Video);
-	DDX_Control(pDX, IDC_AUDEC_LIST, m_Audio);
-	//}}AFX_DATA_MAP
-}
-
-
-BEGIN_MESSAGE_MAP(OptDecoder, CDialog)
-	//{{AFX_MSG_MAP(OptDecoder)
-	//}}AFX_MSG_MAP
-END_MESSAGE_MAP()
-
-/////////////////////////////////////////////////////////////////////////////
-// OptDecoder message handlers
-
-
-
-BOOL OptDecoder::OnInitDialog()
-{
-	u32 i;
-	const char *sOpt;
-	CDialog::OnInitDialog();
-
-	Osmo4 *gpac = GetApp();
-
-	/*audio dec enum*/
-	while (m_Audio.GetCount()) m_Audio.DeleteString(0);
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "Systems", "DefAudioDec");
-	u32 count = gf_modules_get_count(gpac->m_user.modules);
-	GF_BaseDecoder *ifce;
-	s32 select = 0;
-	s32 to_sel = 0;
-	for (i=0; i<count; i++) {
-		ifce = (GF_BaseDecoder *) gf_modules_load_interface(gpac->m_user.modules, i, GF_MEDIA_DECODER_INTERFACE);
-		if (!ifce) continue;
-
-		if (ifce->CanHandleStream(ifce, GF_STREAM_AUDIO, NULL, 0)) {
-			if (sOpt && !stricmp(ifce->module_name, sOpt)) select = to_sel;
-			m_Audio.AddString(ifce->module_name);
-			to_sel++;
-		}
-		gf_modules_close_interface((GF_BaseInterface *)ifce);
-	}
-	m_Audio.SetCurSel(select);
-
-	/*video dec enum*/
-	while (m_Video.GetCount()) m_Video.DeleteString(0);
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "Systems", "DefVideoDec");
-	count = gf_modules_get_count(gpac->m_user.modules);
-	select = 0;
-	to_sel = 0;
-	for (i=0; i<count; i++) {
-		ifce = (GF_BaseDecoder *) gf_modules_load_interface(gpac->m_user.modules, i, GF_MEDIA_DECODER_INTERFACE);
-		if (!ifce) continue;
-
-		if (ifce->CanHandleStream(ifce, GF_STREAM_VISUAL, NULL, 0)) {
-			if (sOpt && !stricmp(ifce->module_name, sOpt)) select = to_sel;
-			m_Video.AddString(ifce->module_name);
-			to_sel++;
-		}
-		gf_modules_close_interface((GF_BaseInterface *)ifce);
-	}
-	m_Video.SetCurSel(select);
-	return TRUE;
-}
-
-void OptDecoder::SaveOptions()
-{
-	Osmo4 *gpac = GetApp();
-	char str100;
-	m_Audio.GetWindowText(str, 100);
-	gf_cfg_set_key(gpac->m_user.config, "Systems", "DefAudioDec", str);
-	m_Video.GetWindowText(str, 100);
-	gf_cfg_set_key(gpac->m_user.config, "Systems", "DefVideoDec", str);
-
-}
-
-COptRender::COptRender(CWnd* pParent /*=NULL*/)
-	: CDialog(COptRender::IDD, pParent)
-{
-	//{{AFX_DATA_INIT(COptRender)
-	//}}AFX_DATA_INIT
-}
-
-
-void COptRender::DoDataExchange(CDataExchange* pDX)
-{
-	CDialog::DoDataExchange(pDX);
-	//{{AFX_DATA_MAP(COptRender)
-	DDX_Control(pDX, IDC_DRAW_BOUNDS, m_DrawBounds);
-	DDX_Control(pDX, IDC_GD_LIST, m_Graphics);
-	DDX_Control(pDX, IDC_USE_RENDER3D, m_Use3DRender);
-	DDX_Control(pDX, IDC_AA_LIST, m_AntiAlias);
-	DDX_Control(pDX, IDC_FORCE_SIZE, m_ForceSize);
-	DDX_Control(pDX, IDC_FAST_RENDER, m_HighSpeed);
-	DDX_Control(pDX, IDC_BIFS_RATE, m_BIFSRate);
-	//}}AFX_DATA_MAP
-}
-
-
-BEGIN_MESSAGE_MAP(COptRender, CDialog)
-	//{{AFX_MSG_MAP(COptRender)
-	//}}AFX_MSG_MAP
-END_MESSAGE_MAP()
-
-/////////////////////////////////////////////////////////////////////////////
-// COptRender message handlers
-
-
-
-#define NUM_RATES 11
-static char *BIFSRates11 =
-{
-	"5.0",
-	"7.5",
-	"10.0",
-	"12.5",
-	"15.0",
-	"24.0",
-	"25.0",
-	"30.0",
-	"50.0",
-	"60.0",
-	"100.0",
-};
-
-
-
-BOOL COptRender::OnInitDialog()
-{
-	s32 i;
-	CDialog::OnInitDialog();
-
-	Osmo4 *gpac = GetApp();
-	const char *sOpt;
-
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "Compositor", "OpenGLMode");
-	m_Use3DRender.SetCheck( (sOpt && !strcmp(sOpt, "always")) ? 1 : 0);
-
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "Compositor", "ForceSceneSize");
-	m_ForceSize.SetCheck( (sOpt && !stricmp(sOpt, "yes")) ? 1 : 0);
-
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "Compositor", "FrameRate");
-	if (!sOpt) sOpt = "30.0";
-	s32 select = 0;
-	while (m_BIFSRate.GetCount()) m_BIFSRate.DeleteString(0);
-	for (i = 0; i<NUM_RATES; i++) {
-		m_BIFSRate.AddString(BIFSRatesi);
-		if (sOpt && !stricmp(sOpt, BIFSRatesi) ) select = i;
-	}
-	m_BIFSRate.SetCurSel(select);
-
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "Compositor", "HighSpeed");
-	m_HighSpeed.SetCheck( (sOpt && !stricmp(sOpt, "yes")) ? 1 : 0);
-
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "Compositor", "AntiAlias");
-	while (m_AntiAlias.GetCount()) m_AntiAlias.DeleteString(0);
-
-	m_AntiAlias.AddString("None");
-	m_AntiAlias.AddString("Text only");
-	m_AntiAlias.AddString("Complete");
-	select = 2;
-	if (sOpt && !stricmp(sOpt, "Text")) select = 1;
-	else if (sOpt && !stricmp(sOpt, "None")) select = 0;
-	m_AntiAlias.SetCurSel(select);
-
-	/*graphics driver enum*/
-	while (m_Graphics.GetCount()) m_Graphics.DeleteString(0);
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "core", "raster2d");
-	s32 count = gf_modules_get_count(gpac->m_user.modules);
-	GF_BaseInterface *ifce;
-	select = 0;
-	u32 to_sel = 0;
-	for (i=0; i<count; i++) {
-		ifce = gf_modules_load_interface(gpac->m_user.modules, i, GF_RASTER_2D_INTERFACE);
-		if (!ifce) continue;
-		if (sOpt && !stricmp(ifce->module_name, sOpt)) select = to_sel;
-		m_Graphics.AddString(ifce->module_name);
-		gf_modules_close_interface(ifce);
-		to_sel++;
-	}
-	m_Graphics.SetCurSel(select);
-
-
-	m_DrawBounds.AddString("None");
-	m_DrawBounds.AddString("Box/Rect");
-	m_DrawBounds.AddString("AABB Tree");
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "Compositor", "BoundingVolume");
-	if (sOpt && !stricmp(sOpt, "Box")) m_DrawBounds.SetCurSel(1);
-	else if (sOpt && !stricmp(sOpt, "AABB")) m_DrawBounds.SetCurSel(2);
-	else m_DrawBounds.SetCurSel(0);
-
-	return TRUE;
-}
-
-
-Bool COptRender::SaveOptions()
-{
-	char str50;
-	Osmo4 *gpac = GetApp();
-
-	gf_cfg_set_key(gpac->m_user.config, "Compositor", "HighSpeed", m_HighSpeed.GetCheck() ? "yes" : "no");
-	gf_cfg_set_key(gpac->m_user.config, "Compositor", "ForceSceneSize", m_ForceSize.GetCheck() ? "yes" : "no");
-
-	s32 sel = m_BIFSRate.GetCurSel();
-	gf_cfg_set_key(gpac->m_user.config, "Compositor", "FrameRate", BIFSRatessel);
-
-	sel = m_AntiAlias.GetCurSel();
-	gf_cfg_set_key(gpac->m_user.config, "Compositor", "AntiAlias", (sel==0) ? "None" : ( (sel==1) ? "Text" : "All"));
-
-	sel = m_DrawBounds.GetCurSel();
-	gf_cfg_set_key(gpac->m_user.config, "Compositor", "BoundingVolume", (sel==2) ? "AABB" : (sel==1) ? "Box" : "None");
-
-	m_Graphics.GetWindowText(str, 50);
-	gf_cfg_set_key(gpac->m_user.config, "core", "raster2d", str);
-
-	gf_cfg_set_key(gpac->m_user.config, "Compositor", "OpenGLMode", m_Use3DRender.GetCheck() ? "always" : "disable");
-	return GF_FALSE;
-}
-
-
-COptRender2D::COptRender2D(CWnd* pParent /*=NULL*/)
-	: CDialog(COptRender2D::IDD, pParent)
-{
-	//{{AFX_DATA_INIT(COptRender2D)
-	// NOTE: the ClassWizard will add member initialization here
-	//}}AFX_DATA_INIT
-}
-
-
-void COptRender2D::DoDataExchange(CDataExchange* pDX)
-{
-	CDialog::DoDataExchange(pDX);
-	//{{AFX_DATA_MAP(COptRender2D)
-	DDX_Control(pDX, IDC_FORMAT_YUV, m_YUVFormat);
-	DDX_Control(pDX, IDC_YUV, m_NoYUV);
-	DDX_Control(pDX, IDC_ZOOM_SCALABLE, m_Scalable);
-	DDX_Control(pDX, IDC_DIRECTRENDER, m_DirectRender);
-	//}}AFX_DATA_MAP
-}
-
-
-BEGIN_MESSAGE_MAP(COptRender2D, CDialog)
-	//{{AFX_MSG_MAP(COptRender2D)
-	//}}AFX_MSG_MAP
-END_MESSAGE_MAP()
-
-/////////////////////////////////////////////////////////////////////////////
-// COptRender2D message handlers
-
-BOOL COptRender2D::OnInitDialog()
-{
-	CDialog::OnInitDialog();
-
-	Osmo4 *gpac = GetApp();
-	const char *sOpt;
-
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "Compositor", "DrawMode");
-	if (sOpt && !stricmp(sOpt, "immediate")) {
-		m_DirectRender.SetCheck(1);
-	} else {
-		m_DirectRender.SetCheck(0);
-	}
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "Compositor", "ScalableZoom");
-	if (sOpt && !stricmp(sOpt, "no")) {
-		m_Scalable.SetCheck(0);
-	} else {
-		m_Scalable.SetCheck(1);
-	}
-
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "Compositor", "DisableYUV");
-	if (sOpt && !stricmp(sOpt, "yes")) {
-		m_NoYUV.SetCheck(1);
-	} else {
-		m_NoYUV.SetCheck(0);
-	}
-
-	SetYUV();
-
-	return TRUE;  // return TRUE unless you set the focus to a control
-	// EXCEPTION: OCX Property Pages should return FALSE
-}
-
-void COptRender2D::SetYUV()
-{
-	Osmo4 *gpac = GetApp();
-	u32 yuv_format = gf_term_get_option(gpac->m_term, GF_OPT_YUV_FORMAT);
-	if (!yuv_format) {
-		m_YUVFormat.SetWindowText("(No YUV used)");
-	} else {
-		char str100;
-		sprintf(str, "(%s used)", gf_4cc_to_str(yuv_format));
-		m_YUVFormat.SetWindowText(str);
-	}
-}
-
-void COptRender2D::SaveOptions()
-{
-	Osmo4 *gpac = GetApp();
-	gf_cfg_set_key(gpac->m_user.config, "Compositor", "DrawMode", m_DirectRender.GetCheck() ? "immediate" : "defer");
-	gf_cfg_set_key(gpac->m_user.config, "Compositor", "ScalableZoom", m_Scalable.GetCheck() ? "yes" : "no");
-
-	gf_cfg_set_key(gpac->m_user.config, "Compositor", "DisableYUV", m_NoYUV.GetCheck() ? "yes" : "no");
-}
-
-
-COptRender3D::COptRender3D(CWnd* pParent /*=NULL*/)
-	: CDialog(COptRender3D::IDD, pParent)
-{
-	//{{AFX_DATA_INIT(COptRender3D)
-	//}}AFX_DATA_INIT
-}
-
-
-void COptRender3D::DoDataExchange(CDataExchange* pDX)
-{
-	CDialog::DoDataExchange(pDX);
-	//{{AFX_DATA_MAP(COptRender3D)
-	DDX_Control(pDX, IDC_BITMAP_USE_PIXEL, m_BitmapPixels);
-	DDX_Control(pDX, IDC_DISABLE_TX_RECT, m_DisableTXRect);
-	DDX_Control(pDX, IDC_RASTER_OUTLINE, m_RasterOutlines);
-	DDX_Control(pDX, IDC_EMUL_POW2, m_EmulPow2);
-	DDX_Control(pDX, IDC_DISABLE_POLY_AA, m_PolyAA);
-	DDX_Control(pDX, IDC_DRAW_NORMALS, m_DrawNormals);
-	DDX_Control(pDX, IDC_BACK_CULL, m_BackCull);
-	DDX_Control(pDX, IDC_DRAW_MODE, m_Wireframe);
-	//}}AFX_DATA_MAP
-}
-
-
-BEGIN_MESSAGE_MAP(COptRender3D, CDialog)
-	//{{AFX_MSG_MAP(COptRender3D)
-	//}}AFX_MSG_MAP
-END_MESSAGE_MAP()
-
-/////////////////////////////////////////////////////////////////////////////
-// COptRender3D message handlers
-
-
-BOOL COptRender3D::OnInitDialog()
-{
-	CDialog::OnInitDialog();
-
-
-	Osmo4 *gpac = GetApp();
-	const char *sOpt;
-
-	m_DrawNormals.AddString("Never");
-	m_DrawNormals.AddString("Per Face");
-	m_DrawNormals.AddString("Per Vertex");
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "Compositor", "DrawNormals");
-	if (sOpt && !stricmp(sOpt, "PerFace")) m_DrawNormals.SetCurSel(1);
-	else if (sOpt && !stricmp(sOpt, "PerVertex")) m_DrawNormals.SetCurSel(2);
-	else m_DrawNormals.SetCurSel(0);
-
-	m_BackCull.AddString("Off");
-	m_BackCull.AddString("On");
-	m_BackCull.AddString("Alpha");
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "Compositor", "BackFaceCulling");
-	if (sOpt && !stricmp(sOpt, "Off")) m_BackCull.SetCurSel(0);
-	else if (sOpt && !stricmp(sOpt, "Alpha")) m_BackCull.SetCurSel(2);
-	else m_BackCull.SetCurSel(1);
-
-	m_Wireframe.AddString("Solid");
-	m_Wireframe.AddString("Wireframe");
-	m_Wireframe.AddString("Both");
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "Compositor", "Wireframe");
-	if (sOpt && !stricmp(sOpt, "WireOnly")) m_Wireframe.SetCurSel(1);
-	else if (sOpt && !stricmp(sOpt, "WireOnSolid")) m_Wireframe.SetCurSel(2);
-	else m_Wireframe.SetCurSel(0);
-
-
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "Compositor", "RasterOutlines");
-	m_RasterOutlines.SetCheck((sOpt && !stricmp(sOpt, "yes")) ? 1 : 0);
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "Compositor", "EmulatePOW2");
-	m_EmulPow2.SetCheck((sOpt && !stricmp(sOpt, "yes")) ? 1 : 0);
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "Compositor", "PolygonAA");
-	m_PolyAA.SetCheck((sOpt && !stricmp(sOpt, "yes")) ? 1 : 0);
-
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "Compositor", "BitmapCopyPixels");
-	m_BitmapPixels.SetCheck((sOpt && !stricmp(sOpt, "yes")) ? 1 : 0);
-
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "Compositor", "DisableRectExt");
-	m_DisableTXRect.SetCheck((sOpt && !stricmp(sOpt, "yes")) ? 1 : 0);
-	return TRUE;  // return TRUE unless you set the focus to a control
-	// EXCEPTION: OCX Property Pages should return FALSE
-}
-
-void COptRender3D::SaveOptions()
-{
-	Osmo4 *gpac = GetApp();
-
-	u32 sel = m_DrawNormals.GetCurSel();
-	gf_cfg_set_key(gpac->m_user.config, "Compositor", "DrawNormals", (sel==2) ? "PerVertex" : (sel==1) ? "PerFace" : "Never");
-	sel = m_BackCull.GetCurSel();
-	gf_cfg_set_key(gpac->m_user.config, "Compositor", "BackFaceCulling", (sel==2) ? "Alpha" : (sel==1) ? "On" : "Off");
-	sel = m_Wireframe.GetCurSel();
-	gf_cfg_set_key(gpac->m_user.config, "Compositor", "Wireframe", (sel==2) ? "WireOnSolid" : (sel==1) ? "WireOnly" : "WireNone");
-
-	gf_cfg_set_key(gpac->m_user.config, "Compositor", "RasterOutlines", m_RasterOutlines.GetCheck() ? "yes" : "no");
-	gf_cfg_set_key(gpac->m_user.config, "Compositor", "EmulatePOW2", m_EmulPow2.GetCheck() ? "yes" : "no");
-	gf_cfg_set_key(gpac->m_user.config, "Compositor", "PolygonAA", m_PolyAA.GetCheck() ? "yes" : "no");
-
-	gf_cfg_set_key(gpac->m_user.config, "Compositor", "DisableRectExt", m_DisableTXRect.GetCheck() ? "yes" : "no");
-	gf_cfg_set_key(gpac->m_user.config, "Compositor", "BitmapCopyPixels", m_BitmapPixels.GetCheck() ? "yes" : "no");
-}
-
-COptVideo::COptVideo(CWnd* pParent /*=NULL*/)
-	: CDialog(COptVideo::IDD, pParent)
-{
-	//{{AFX_DATA_INIT(COptVideo)
-	//}}AFX_DATA_INIT
-}
-
-
-void COptVideo::DoDataExchange(CDataExchange* pDX)
-{
-	CDialog::DoDataExchange(pDX);
-	//{{AFX_DATA_MAP(COptVideo)
-	DDX_Control(pDX, IDC_SWITCH_RES, m_SwitchRes);
-	DDX_Control(pDX, IDC_VIDEO_LIST, m_Videos);
-	DDX_Control(pDX, IDC_HWMEMORY, m_UseHWMemory);
-	//}}AFX_DATA_MAP
-}
-
-
-BEGIN_MESSAGE_MAP(COptVideo, CDialog)
-	//{{AFX_MSG_MAP(COptVideo)
-	//}}AFX_MSG_MAP
-END_MESSAGE_MAP()
-
-/////////////////////////////////////////////////////////////////////////////
-// COptVideo message handlers
-
-BOOL COptVideo::OnInitDialog()
-{
-	CDialog::OnInitDialog();
-
-	Osmo4 *gpac = GetApp();
-	const char *sOpt;
-
-	m_SwitchRes.SetCheck(gf_cfg_get_bool(gpac->m_user.config, "core", "switch-vres") );
-	sOpt = gf_cfg_get_bool(gpac->m_user.config, "core", "hwvmem");
-	m_UseHWMemory.SetCheck(sOpt && !stricmp(sOpt, "Always") ? 1 : 0);
-
-
-	u32 count = gf_modules_get_count(gpac->m_user.modules);
-	GF_BaseInterface *ifce;
-	s32 to_sel = 0;
-	s32 select = 0;
-	/*video drivers enum*/
-	while (m_Videos.GetCount()) m_Videos.DeleteString(0);
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "core", "video-output");
-
-	for (u32 i=0; i<count; i++) {
-		ifce = gf_modules_load_interface(gpac->m_user.modules, i, GF_VIDEO_OUTPUT_INTERFACE);
-		if (!ifce) continue;
-		if (sOpt && !stricmp(ifce->module_name, sOpt)) select = to_sel;
-		m_Videos.AddString(ifce->module_name);
-		gf_modules_close_interface(ifce);
-		to_sel++;
-	}
-	m_Videos.SetCurSel(select);
-
-	return TRUE;
-
-}
-
-void COptVideo::SaveOptions()
-{
-	Osmo4 *gpac = GetApp();
-	char str50;
-
-	gf_cfg_set_key(gpac->m_user.config, "core", "switch-vres", m_SwitchRes.GetCheck() ? "yes" : "no");
-	gf_cfg_set_key(gpac->m_user.config, "core", "hwvmem", m_UseHWMemory.GetCheck() ? "Always" : "Auto");
-	m_Videos.GetWindowText(str, 50);
-	gf_cfg_set_key(gpac->m_user.config, "core", "video-output", str);
-}
-
-
-COptAudio::COptAudio(CWnd* pParent /*=NULL*/)
-	: CDialog(COptAudio::IDD, pParent)
-{
-	//{{AFX_DATA_INIT(COptAudio)
-	//}}AFX_DATA_INIT
-}
-
-
-void COptAudio::DoDataExchange(CDataExchange* pDX)
-{
-	CDialog::DoDataExchange(pDX);
-	//{{AFX_DATA_MAP(COptAudio)
-	DDX_Control(pDX, IDC_AUDIO_NOTIFS, m_Notifs);
-	DDX_Control(pDX, IDC_DRIVER_LIST, m_DriverList);
-	DDX_Control(pDX, IDC_AUDIO_RESYNC, m_AudioResync);
-	DDX_Control(pDX, IDC_AUDIO_MULTICH, m_AudioMultiCH);
-	DDX_Control(pDX, IDC_AUDIO_FPS, m_AudioDur);
-	DDX_Control(pDX, IDC_SPIN_FPS, m_SpinFPS);
-	DDX_Control(pDX, IDC_FORCE_AUDIO, m_ForceConfig);
-	DDX_Control(pDX, IDC_SPIN_AUDIO, m_AudioSpin);
-	DDX_Control(pDX, IDC_EDIT_AUDIO, m_AudioEdit);
-	//}}AFX_DATA_MAP
-}
-
-
-BEGIN_MESSAGE_MAP(COptAudio, CDialog)
-	//{{AFX_MSG_MAP(COptAudio)
-	ON_BN_CLICKED(IDC_FORCE_AUDIO, OnForceAudio)
-	ON_CBN_SELCHANGE(IDC_DRIVER_LIST, OnSelchangeDriverList)
-	//}}AFX_MSG_MAP
-END_MESSAGE_MAP()
-
-/////////////////////////////////////////////////////////////////////////////
-// COptAudio message handlers
-
-BOOL COptAudio::OnInitDialog()
-{
-	CDialog::OnInitDialog();
-
-	m_AudioSpin.SetBuddy(& m_AudioEdit);
-	m_SpinFPS.SetBuddy(& m_AudioDur);
-	m_SpinFPS.SetRange(0, 2000);
-
-	Osmo4 *gpac = GetApp();
-	const char *sOpt;
-
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "Audio", "ForceConfig");
-	if (sOpt && !stricmp(sOpt, "yes")) {
-		m_ForceConfig.SetCheck(1);
-	} else {
-		m_ForceConfig.SetCheck(0);
-	}
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "Audio", "NumBuffers");
-	if (sOpt) {
-		m_AudioEdit.SetWindowText(sOpt);
-	} else {
-		m_AudioEdit.SetWindowText("2");
-	}
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "Audio", "TotalDuration");
-	if (sOpt) {
-		m_AudioDur.SetWindowText(sOpt);
-	} else {
-		m_AudioDur.SetWindowText("120");
-	}
-
-	OnForceAudio();
-
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "Audio", "NoResync");
-	m_AudioResync.SetCheck( (sOpt && !stricmp(sOpt, "yes")) ? 1 : 0);
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "Audio", "DisableMultiChannel");
-	m_AudioMultiCH.SetCheck((sOpt && !stricmp(sOpt, "yes")) ? 1 : 0);
-
-	/*driver enum*/
-	while (m_DriverList.GetCount()) m_DriverList.DeleteString(0);
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "core", "audio-output");
-	u32 count = gf_modules_get_count(gpac->m_user.modules);
-	GF_BaseInterface *ifce;
-	s32 select = 0;
-	s32 to_sel = 0;
-	for (u32 i=0; i<count; i++) {
-		ifce = gf_modules_load_interface(gpac->m_user.modules, i, GF_AUDIO_OUTPUT_INTERFACE);
-		if (!ifce) continue;
-		if (sOpt && !stricmp(ifce->module_name, sOpt)) select = to_sel;
-		m_DriverList.AddString(ifce->module_name);
-		gf_modules_close_interface(ifce);
-		to_sel++;
-	}
-	m_DriverList.SetCurSel(select);
-
-	m_Notifs.ShowWindow(SW_HIDE);
-	if (sOpt && strstr(sOpt, "DirectSound")) m_Notifs.ShowWindow(SW_SHOW);
-
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "Audio", "DisableNotification");
-	if (sOpt && !stricmp(sOpt, "yes"))
-		m_Notifs.SetCheck(1);
-	else
-		m_Notifs.SetCheck(0);
-
-	return TRUE;
-}
-
-
-void COptAudio::SaveOptions()
-{
-	Osmo4 *gpac = GetApp();
-	char str50;
-
-	gf_cfg_set_key(gpac->m_user.config, "Audio", "ForceConfig", m_ForceConfig.GetCheck() ? "yes" : "no");
-	gf_cfg_set_key(gpac->m_user.config, "Audio", "NoResync", m_AudioResync.GetCheck() ? "yes" : "no");
-	gf_cfg_set_key(gpac->m_user.config, "Audio", "DisableMultiChannel", m_AudioMultiCH.GetCheck() ? "yes" : "no");
-
-	m_AudioEdit.GetWindowText(str, 20);
-	gf_cfg_set_key(gpac->m_user.config, "Audio", "NumBuffers", str);
-	m_AudioDur.GetWindowText(str, 20);
-	gf_cfg_set_key(gpac->m_user.config, "Audio", "TotalDuration", str);
-
-	m_DriverList.GetWindowText(str, 50);
-	gf_cfg_set_key(gpac->m_user.config, "core", "audio-output", str);
-
-	if (strstr(str, "DirectSound")) {
-		gf_cfg_set_key(gpac->m_user.config, "Audio", "DisableNotification", m_Notifs.GetCheck() ? "yes" : "no");
-	}
-
-}
-
-void COptAudio::OnForceAudio()
-{
-	BOOL en = m_ForceConfig.GetCheck();
-
-	m_AudioSpin.EnableWindow(en);
-	m_AudioEdit.EnableWindow(en);
-	m_SpinFPS.EnableWindow(en);
-	m_AudioDur.EnableWindow(en);
-}
-
-void COptAudio::OnSelchangeDriverList()
-{
-	char str50;
-	m_DriverList.GetWindowText(str, 50);
-	if (strstr(str, "DirectSound")) {
-		m_Notifs.ShowWindow(SW_SHOW);
-	} else {
-		m_Notifs.ShowWindow(SW_HIDE);
-	}
-}
-
-
-
-
-COptFont::COptFont(CWnd* pParent /*=NULL*/)
-	: CDialog(COptFont::IDD, pParent)
-{
-	//{{AFX_DATA_INIT(COptFont)
-	//}}AFX_DATA_INIT
-}
-
-
-void COptFont::DoDataExchange(CDataExchange* pDX)
-{
-	CDialog::DoDataExchange(pDX);
-	//{{AFX_DATA_MAP(COptFont)
-	DDX_Control(pDX, IDC_TEXTURE_MODE, m_TextureModes);
-	DDX_Control(pDX, IDC_FONT_LIST, m_Fonts);
-	DDX_Control(pDX, IDC_BROWSE_FONT, m_BrowseFont);
-	//}}AFX_DATA_MAP
-}
-
-
-BEGIN_MESSAGE_MAP(COptFont, CDialog)
-	//{{AFX_MSG_MAP(COptFont)
-	ON_BN_CLICKED(IDC_BROWSE_FONT, OnBrowseFont)
-	//}}AFX_MSG_MAP
-END_MESSAGE_MAP()
-
-/////////////////////////////////////////////////////////////////////////////
-// COptFont message handlers
-
-BOOL COptFont::OnInitDialog()
-{
-	u32 i;
-	GF_BaseInterface *ifce;
-
-	CDialog::OnInitDialog();
-
-	Osmo4 *gpac = GetApp();
-	const char *sOpt;
-
-	/*video drivers enum*/
-	while (m_Fonts.GetCount()) m_Fonts.DeleteString(0);
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "FontCache", "FontReader");
-	s32 to_sel = 0;
-	s32 select = 0;
-	u32 count = gf_modules_get_count(gpac->m_user.modules);
-	for (i=0; i<count; i++) {
-		ifce = gf_modules_load_interface(gpac->m_user.modules, i, GF_FONT_READER_INTERFACE);
-		if (!ifce) continue;
-		if (sOpt && !stricmp(ifce->module_name, sOpt)) select = to_sel;
-		m_Fonts.AddString(ifce->module_name);
-		gf_modules_close_interface(ifce);
-		to_sel++;
-	}
-	m_Fonts.SetCurSel(select);
-
-
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "FontCache", "FontDirectory");
-	if (sOpt) m_BrowseFont.SetWindowText(sOpt);
-
-	/*text texturing modes*/
-	while (m_TextureModes.GetCount()) m_TextureModes.DeleteString(0);
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "Compositor", "TextureTextMode");
-	m_TextureModes.AddString("Default");
-	m_TextureModes.AddString("Never");
-	m_TextureModes.AddString("Always");
-	if (sOpt && !stricmp(sOpt, "3D")) m_TextureModes.SetCurSel(1);
-	else if (sOpt && !stricmp(sOpt, "Always")) m_TextureModes.SetCurSel(2);
-	else m_TextureModes.SetCurSel(0);
-
-	return TRUE;
-}
-
-
-
-static char szCacheDirMAX_PATH;
-
-static int CALLBACK LocCbck(HWND hwnd, UINT uMsg, LPARAM lp, LPARAM pData)
-{
-	char dirMAX_PATH;
-	if (uMsg == BFFM_INITIALIZED) {
-		strcpy(dir, szCacheDir);
-		SendMessage(hwnd, BFFM_SETSELECTION, TRUE,(LPARAM) dir);
-	}
-	return 0;
-}
-
-void COptFont::OnBrowseFont()
-{
-	BROWSEINFO brw;
-	LPMALLOC pMalloc;
-	LPITEMIDLIST ret;
-	char dirMAX_PATH;
-
-	if (NOERROR == ::SHGetMalloc(&pMalloc) ) {
-
-		m_BrowseFont.GetWindowText(szCacheDir, MAX_PATH);
-
-		memset(&brw, 0, sizeof(BROWSEINFO));
-		brw.hwndOwner = this->GetSafeHwnd();
-		brw.pszDisplayName = dir;
-		brw.lpszTitle = "Select Font Directory...";
-		brw.ulFlags = 0L;
-		brw.lpfn = LocCbck;
-
-		ret = SHBrowseForFolder(&brw);
-		if (ret != NULL) {
-			if (::SHGetPathFromIDList(ret, dir)) {
-				m_BrowseFont.SetWindowText(dir);
-			}
-			pMalloc->Free(ret);
-		}
-		pMalloc->Release();
-	}
-}
-
-
-void COptFont::SaveOptions()
-{
-	Osmo4 *gpac = GetApp();
-	char strMAX_PATH;
-
-	m_Fonts.GetWindowText(str, 50);
-	gf_cfg_set_key(gpac->m_user.config, "FontCache", "FontReader", str);
-	m_BrowseFont.GetWindowText(str, 50);
-	gf_cfg_set_key(gpac->m_user.config, "FontCache", "FontDirectory", str);
-	switch (m_TextureModes.GetCurSel()) {
-	case 2:
-		gf_cfg_set_key(gpac->m_user.config, "Compositor", "TextureTextMode", "Always");
-		break;
-	case 1:
-		gf_cfg_set_key(gpac->m_user.config, "Compositor", "TextureTextMode", "Never");
-		break;
-	default:
-		gf_cfg_set_key(gpac->m_user.config, "Compositor", "TextureTextMode", "Default");
-		break;
-	}
-}
-
-
-COptHTTP::COptHTTP(CWnd* pParent /*=NULL*/)
-	: CDialog(COptHTTP::IDD, pParent)
-{
-	//{{AFX_DATA_INIT(COptHTTP)
-	//}}AFX_DATA_INIT
-}
-
-
-void COptHTTP::DoDataExchange(CDataExchange* pDX)
-{
-	CDialog::DoDataExchange(pDX);
-	//{{AFX_DATA_MAP(COptHTTP)
-	DDX_Control(pDX, IDC_HTTP_PROXY, m_ProxyName);
-	DDX_Control(pDX, IDC_HTTP_USE_PROXY, m_useProxy);
-	DDX_Control(pDX, IDC_SAX_DELAY, m_SAXDuration);
-	DDX_Control(pDX, IDC_SAX_PROGRESSIVE, m_Progressive);
-	DDX_Control(pDX, IDC_RESTART_CACHE, m_DisableCache);
-	DDX_Control(pDX, IDC_CLEAN_CACHE, m_CleanCache);
-	DDX_Control(pDX, IDC_BROWSE_CACHE, m_CacheDir);
-	//}}AFX_DATA_MAP
-}
-
-
-BEGIN_MESSAGE_MAP(COptHTTP, CDialog)
-	//{{AFX_MSG_MAP(COptHTTP)
-	ON_BN_CLICKED(IDC_BROWSE_CACHE, OnBrowseCache)
-	ON_BN_CLICKED(IDC_SAX_PROGRESSIVE, OnSaxProgressive)
-	ON_BN_CLICKED(IDC_HTTP_USE_PROXY, OnUseProxy)
-	//}}AFX_MSG_MAP
-	ON_BN_CLICKED(IDC_RESTART_CACHE, &COptHTTP::OnBnClickedRestartCache)
-END_MESSAGE_MAP()
-
-/////////////////////////////////////////////////////////////////////////////
-// COptHTTP message handlers
-
-
-void COptHTTP::OnBrowseCache()
-{
-	BROWSEINFO brw;
-	LPMALLOC pMalloc;
-	LPITEMIDLIST ret;
-	char dirMAX_PATH;
-
-	if (NOERROR == ::SHGetMalloc(&pMalloc) ) {
-
-		m_CacheDir.GetWindowText(szCacheDir, MAX_PATH);
-
-		memset(&brw, 0, sizeof(BROWSEINFO));
-		brw.hwndOwner = this->GetSafeHwnd();
-		brw.pszDisplayName = dir;
-		brw.lpszTitle = "Select HTTP Cache Directory...";
-		brw.ulFlags = 0L;
-		brw.lpfn = LocCbck;
-
-		ret = SHBrowseForFolder(&brw);
-		if (ret != NULL) {
-			if (::SHGetPathFromIDList(ret, dir)) {
-				m_CacheDir.SetWindowText(dir);
-			}
-			pMalloc->Free(ret);
-		}
-		pMalloc->Release();
-	}
-}
-
-BOOL COptHTTP::OnInitDialog()
-{
-	char proxyGF_MAX_PATH;
-	CDialog::OnInitDialog();
-
-	Osmo4 *gpac = GetApp();
-	const char *sOpt;
-
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "Core", "CacheDirectory");
-	if (sOpt) m_CacheDir.SetWindowText(sOpt);
-
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "Core", "CleanCache");
-	m_CleanCache.SetCheck((sOpt && !stricmp(sOpt, "yes")) ? 1 : 0);
-
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "Core", "DisableCache");
-	m_DisableCache.SetCheck((sOpt && !stricmp(sOpt, "yes")) ? 1 : 0);
-
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "SAXLoader", "Progressive");
-	m_Progressive.SetCheck((sOpt && !stricmp(sOpt, "yes")) ? 1 : 0);
-	OnSaxProgressive();
-
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "SAXLoader", "MaxDuration");
-	if (sOpt) {
-		m_SAXDuration.SetWindowText(sOpt);
-	} else {
-		m_SAXDuration.SetWindowText("0");
-	}
-	//if (m_Progressive.GetCheck()) m_SAXDuration.EnableWindow(1);
-
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "Core", "HTTPProxyEnabled");
-	m_useProxy.SetCheck((sOpt && !stricmp(sOpt, "yes")) ? 1 : 0);
-	OnUseProxy();
-	strcpy(proxy, "");
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "Core", "HTTPProxyName");
-	if (sOpt) {
-		strcpy(proxy, sOpt);
-		sOpt = gf_cfg_get_key(gpac->m_user.config, "Core", "HTTPProxyPort");
-		if (sOpt) {
-			strcat(proxy, ":");
-			strcat(proxy, sOpt);
-		}
-	}
-	m_ProxyName.SetWindowText(proxy);
-	return TRUE;
-}
-
-void COptHTTP::OnSaxProgressive()
-{
-	if (m_Progressive.GetCheck()) {
-		m_SAXDuration.EnableWindow(1);
-	} else {
-		m_SAXDuration.EnableWindow(0);
-	}
-}
-
-
-void COptHTTP::OnUseProxy()
-{
-	if (m_useProxy.GetCheck()) {
-		m_ProxyName.EnableWindow(1);
-	} else {
-		m_ProxyName.EnableWindow(0);
-	}
-}
-
-void COptHTTP::SaveOptions()
-{
-	Osmo4 *gpac = GetApp();
-
-	gf_cfg_set_key(gpac->m_user.config, "Core", "CleanCache", m_CleanCache.GetCheck() ? "yes" : "no");
-	gf_cfg_set_key(gpac->m_user.config, "Core", "DisableCache", m_DisableCache.GetCheck() ? "yes" : "no");
-	gf_cfg_set_key(gpac->m_user.config, "SAXLoader", "Progressive", m_Progressive.GetCheck() ? "yes" : "no");
-
-	m_SAXDuration.GetWindowText(szCacheDir, MAX_PATH);
-	gf_cfg_set_key(gpac->m_user.config, "SAXLoader", "MaxDuration", szCacheDir);
-
-	gf_cfg_set_key(gpac->m_user.config, "Core", "HTTPProxyEnabled", m_useProxy.GetCheck() ? "yes" : "no");
-	m_ProxyName.GetWindowText(szCacheDir, MAX_PATH);
-	char *sep = strrchr(szCacheDir, ':');
-	if (sep) {
-		sep0 = 0;
-		gf_cfg_set_key(gpac->m_user.config, "Core", "HTTPProxyName", szCacheDir);
-		sep0 = ':';
-		gf_cfg_set_key(gpac->m_user.config, "Core", "HTTPProxyPort", sep+1);
-	} else {
-		gf_cfg_set_key(gpac->m_user.config, "Core", "HTTPProxyName", szCacheDir);
-		gf_cfg_set_key(gpac->m_user.config, "Core", "HTTPProxyPort", NULL);
-	}
-	m_CacheDir.GetWindowText(szCacheDir, MAX_PATH);
-	gf_cfg_set_key(gpac->m_user.config, "Core", "CacheDirectory", szCacheDir);
-}
-
-
-COptStream::COptStream(CWnd* pParent /*=NULL*/)
-	: CDialog(COptStream::IDD, pParent)
-{
-	//{{AFX_DATA_INIT(COptStream)
-	//}}AFX_DATA_INIT
-}
-
-
-void COptStream::DoDataExchange(CDataExchange* pDX)
-{
-	CDialog::DoDataExchange(pDX);
-	//{{AFX_DATA_MAP(COptStream)
-	DDX_Control(pDX, IDC_REBUFFER_LEN, m_RebufferLen);
-	DDX_Control(pDX, IDC_REBUFFER, m_Rebuffer);
-	DDX_Control(pDX, IDC_BUFFER, m_Buffer);
-	DDX_Control(pDX, IDC_TIMEOUT, m_Timeout);
-	DDX_Control(pDX, IDC_REORDER, m_Reorder);
-	DDX_Control(pDX, IDC_RTSP, m_UseRTSP);
-	DDX_Control(pDX, IDC_PORT, m_Port);
-	//}}AFX_DATA_MAP
-}
-
-
-BEGIN_MESSAGE_MAP(COptStream, CDialog)
-	//{{AFX_MSG_MAP(COptStream)
-	ON_CBN_SELCHANGE(IDC_PORT, OnSelchangePort)
-	ON_BN_CLICKED(IDC_RTSP, OnRtsp)
-	ON_BN_CLICKED(IDC_REBUFFER, OnRebuffer)
-	ON_EN_UPDATE(IDC_REBUFFER_LEN, OnUpdateRebufferLen)
-	ON_EN_UPDATE(IDC_BUFFER, OnUpdateBuffer)
-	//}}AFX_MSG_MAP
-END_MESSAGE_MAP()
-
-/////////////////////////////////////////////////////////////////////////////
-// COptStream message handlers
-
-BOOL COptStream::OnInitDialog()
-{
-	CDialog::OnInitDialog();
-
-	Osmo4 *gpac = GetApp();
-	const char *sOpt;
-
-	while (m_Port.GetCount()) m_Port.DeleteString(0);
-	m_Port.AddString("554 (RTSP standard)");
-	m_Port.AddString("7070 (RTSP ext)");
-	m_Port.AddString("80 (RTSP / HTTP tunnel)");
-	m_Port.AddString("8080 (RTSP / HTTP tunnel)");
-
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "Streaming", "DefaultPort");
-	u32 port = 554;
-	Bool force_rtsp = GF_FALSE;
-	if (sOpt) port = atoi(sOpt);
-	switch (port) {
-	case 8080:
-		m_Port.SetCurSel(3);
-		force_rtsp = GF_TRUE;
-		break;
-	case 80:
-		m_Port.SetCurSel(2);
-		force_rtsp = GF_TRUE;
-		break;
-	case 7070:
-		m_Port.SetCurSel(1);
-		break;
-	default:
-		m_Port.SetCurSel(0);
-		break;
-	}
-
-	Bool use_rtsp = GF_FALSE;
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "Streaming", "RTPoverRTSP");
-	if (sOpt && !stricmp(sOpt, "yes")) use_rtsp = GF_TRUE;
-
-	if (force_rtsp) {
-		m_UseRTSP.SetCheck(1);
-		m_UseRTSP.EnableWindow(0);
-		m_Reorder.SetCheck(0);
-		m_Reorder.EnableWindow(0);
-	} else {
-		m_UseRTSP.SetCheck(use_rtsp);
-		m_UseRTSP.EnableWindow(1);
-		m_Reorder.EnableWindow(1);
-		sOpt = gf_cfg_get_key(gpac->m_user.config, "Streaming", "ReorderSize");
-		if (sOpt && !stricmp(sOpt, "0")) {
-			m_Reorder.SetCheck(0);
-		} else {
-			m_Reorder.SetCheck(1);
-		}
-	}
-
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "Streaming", "RTSPTimeout");
-	if (sOpt) {
-		m_Timeout.SetWindowText(sOpt);
-	} else {
-		m_Timeout.SetWindowText("30000");
-	}
-
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "Network", "BufferLength");
-	if (sOpt) {
-		m_Buffer.SetWindowText(sOpt);
-	} else {
-		m_Buffer.SetWindowText("3000");
-	}
-
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "Network", "RebufferLength");
-	u32 buf_len = 0;
-	if (sOpt) buf_len = atoi(sOpt);
-	if (buf_len) {
-		m_RebufferLen.SetWindowText(sOpt);
-		m_Rebuffer.SetCheck(1);
-		m_RebufferLen.EnableWindow(1);
-	} else {
-		m_RebufferLen.SetWindowText("0");
-		m_Rebuffer.SetCheck(0);
-		m_RebufferLen.EnableWindow(0);
-	}
-
-	return TRUE;
-}
-
-
-void COptStream::OnSelchangePort()
-{
-	s32 sel = m_Port.GetCurSel();
-	switch (sel) {
-	case 3:
-	case 2:
-		m_UseRTSP.SetCheck(1);
-		m_UseRTSP.EnableWindow(0);
-		m_Reorder.SetCheck(0);
-		m_Reorder.EnableWindow(0);
-		break;
-	case 1:
-	default:
-		m_UseRTSP.SetCheck(0);
-		m_UseRTSP.EnableWindow(1);
-		m_Reorder.SetCheck(1);
-		m_Reorder.EnableWindow(1);
-		break;
-	}
-}
-
-void COptStream::OnRtsp()
-{
-	if (m_UseRTSP.GetCheck()) {
-		m_Reorder.SetCheck(0);
-		m_Reorder.EnableWindow(0);
-	} else {
-		m_Reorder.SetCheck(1);
-		m_Reorder.EnableWindow(1);
-	}
-
-}
-
-void COptStream::CheckRebuffer()
-{
-	char str50;
-	s32 buf, rebuf;
-	m_Buffer.GetWindowText(str, 50);
-	buf = atoi(str);
-	m_RebufferLen.GetWindowText(str, 50);
-	rebuf = atoi(str);
-	if (rebuf*2 > buf) {
-		rebuf = buf/2;
-		sprintf(str, "%d", rebuf);
-		m_RebufferLen.SetWindowText(str);
-	}
-}
-
-void COptStream::OnRebuffer()
-{
-	if (!m_Rebuffer.GetCheck()) {
-		m_RebufferLen.EnableWindow(0);
-	} else {
-		m_RebufferLen.EnableWindow(1);
-		CheckRebuffer();
-	}
-}
-
-void COptStream::OnUpdateRebufferLen()
-{
-	CheckRebuffer();
-}
-
-void COptStream::OnUpdateBuffer()
-{
-	CheckRebuffer();
-}
-
-void COptStream::SaveOptions()
-{
-	Osmo4 *gpac = GetApp();
-	Bool force_rtsp = GF_FALSE;
-	s32 sel = m_Port.GetCurSel();
-	switch (sel) {
-	case 3:
-		gf_cfg_set_key(gpac->m_user.config, "Streaming", "DefaultPort", "8080");
-		force_rtsp = GF_TRUE;
-		break;
-	case 2:
-		gf_cfg_set_key(gpac->m_user.config, "Streaming", "DefaultPort", "80");
-		force_rtsp = GF_TRUE;
-		break;
-	case 1:
-		gf_cfg_set_key(gpac->m_user.config, "Streaming", "DefaultPort", "7070");
-		break;
-	default:
-		gf_cfg_set_key(gpac->m_user.config, "Streaming", "DefaultPort", "554");
-		break;
-	}
-
-	if (force_rtsp) {
-		gf_cfg_set_key(gpac->m_user.config, "Streaming", "RTPoverRTSP", "yes");
-	} else {
-		gf_cfg_set_key(gpac->m_user.config, "Streaming", "RTPoverRTSP", m_UseRTSP.GetCheck() ? "yes" : "no");
-		if (!m_UseRTSP.GetCheck()) gf_cfg_set_key(gpac->m_user.config, "Streaming", "ReorderSize", m_Reorder.GetCheck() ? "30" : "0");
-	}
-
-	char str50;
-
-	m_Timeout.GetWindowText(str, 50);
-	gf_cfg_set_key(gpac->m_user.config, "Streaming", "RTSPTimeout", str);
-
-	m_Buffer.GetWindowText(str, 50);
-	gf_cfg_set_key(gpac->m_user.config, "Network", "BufferLength", str);
-	if (m_Rebuffer.GetCheck()) {
-		m_RebufferLen.GetWindowText(str, 50);
-		gf_cfg_set_key(gpac->m_user.config, "Network", "RebufferLength", str);
-	} else {
-		gf_cfg_set_key(gpac->m_user.config, "Network", "RebufferLength", "0");
-	}
-}
-
-
-
-
-COptMCache::COptMCache(CWnd* pParent /*=NULL*/)
-	: CDialog(COptMCache::IDD, pParent)
-{
-	//{{AFX_DATA_INIT(COptMCache)
-	// NOTE: the ClassWizard will add member initialization here
-	//}}AFX_DATA_INIT
-}
-
-
-void COptMCache::DoDataExchange(CDataExchange* pDX)
-{
-	CDialog::DoDataExchange(pDX);
-	//{{AFX_DATA_MAP(COptMCache)
-	DDX_Control(pDX, IDC_BASEPRES, m_BaseName);
-	DDX_Control(pDX, IDC_MCACHE_USENAME, m_UseBase);
-	DDX_Control(pDX, IDC_MCACHE_OVERWRITE, m_Overwrite);
-	DDX_Control(pDX, IDC_BROWSE_MCACHE, m_RecDir);
-	//}}AFX_DATA_MAP
-}
-
-
-BEGIN_MESSAGE_MAP(COptMCache, CDialog)
-	//{{AFX_MSG_MAP(COptMCache)
-	ON_BN_CLICKED(IDC_BROWSE_MCACHE, OnBrowseMcache)
-	ON_BN_CLICKED(IDC_MCACHE_USENAME, OnMcacheUsename)
-	//}}AFX_MSG_MAP
-END_MESSAGE_MAP()
-
-/////////////////////////////////////////////////////////////////////////////
-// COptMCache message handlers
-
-void COptMCache::OnBrowseMcache()
-{
-	BROWSEINFO brw;
-	LPMALLOC pMalloc;
-	LPITEMIDLIST ret;
-	char dirMAX_PATH;
-
-	if (NOERROR == ::SHGetMalloc(&pMalloc) ) {
-
-		m_RecDir.GetWindowText(szCacheDir, MAX_PATH);
-
-		memset(&brw, 0, sizeof(BROWSEINFO));
-		brw.hwndOwner = this->GetSafeHwnd();
-		brw.pszDisplayName = dir;
-		brw.lpszTitle = "Select HTTP Cache Directory...";
-		brw.ulFlags = 0L;
-		brw.lpfn = LocCbck;
-
-		ret = SHBrowseForFolder(&brw);
-		if (ret != NULL) {
-			if (::SHGetPathFromIDList(ret, dir)) {
-				m_RecDir.SetWindowText(dir);
-			}
-			pMalloc->Free(ret);
-		}
-		pMalloc->Release();
-	}
-}
-
-BOOL COptMCache::OnInitDialog()
-{
-	CDialog::OnInitDialog();
-
-	Osmo4 *gpac = GetApp();
-	const char *sOpt;
-
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "StreamingCache", "RecordDirectory");
-	if (!sOpt) sOpt = gf_cfg_get_key(gpac->m_user.config, "Core", "CacheDirectory");
-	if (sOpt) m_RecDir.SetWindowText(sOpt);
-
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "StreamingCache", "KeepExistingFiles");
-	m_Overwrite.SetCheck((sOpt && !stricmp(sOpt, "yes")) ? 0 : 1);
-
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "StreamingCache", "BaseFileName");
-	if (sOpt) {
-		m_UseBase.SetCheck(1);
-		m_BaseName.EnableWindow(TRUE);
-		m_BaseName.SetWindowText(sOpt);
-	} else {
-		m_UseBase.SetCheck(0);
-		m_BaseName.EnableWindow(FALSE);
-		m_BaseName.SetWindowText("uses service URL");
-	}
-	return TRUE;
-}
-
-void COptMCache::OnMcacheUsename()
-{
-	if (m_UseBase.GetCheck()) {
-		m_BaseName.EnableWindow(TRUE);
-		m_BaseName.SetWindowText("record");
-	} else {
-		m_BaseName.EnableWindow(FALSE);
-		m_BaseName.SetWindowText("uses service URL");
-	}
-}
-
-void COptMCache::SaveOptions()
-{
-	Osmo4 *gpac = GetApp();
-
-	gf_cfg_set_key(gpac->m_user.config, "StreamingCache", "KeepExistingFiles", m_Overwrite.GetCheck() ? "no" : "yes");
-	if (m_UseBase.GetCheck()) {
-		m_BaseName.GetWindowText(szCacheDir, MAX_PATH);
-		gf_cfg_set_key(gpac->m_user.config, "StreamingCache", "BaseFileName", szCacheDir);
-	} else {
-		gf_cfg_set_key(gpac->m_user.config, "StreamingCache", "BaseFileName", NULL);
-	}
-	m_RecDir.GetWindowText(szCacheDir, MAX_PATH);
-	gf_cfg_set_key(gpac->m_user.config, "StreamingCache", "RecordDirectory", szCacheDir);
-}
-
-
-OptFiles::OptFiles(CWnd* pParent /*=NULL*/)
-	: CDialog(OptFiles::IDD, pParent)
-{
-	//{{AFX_DATA_INIT(OptFiles)
-	// NOTE: the ClassWizard will add member initialization here
-	//}}AFX_DATA_INIT
-}
-
-
-void OptFiles::DoDataExchange(CDataExchange* pDX)
-{
-	CDialog::DoDataExchange(pDX);
-	//{{AFX_DATA_MAP(OptFiles)
-	DDX_Control(pDX, IDC_ASSOCIATE, m_DoAssociate);
-	DDX_Control(pDX, IDC_FILES_PLUG, m_PlugName);
-	DDX_Control(pDX, IDC_FILES_MIMES, m_mimes);
-	DDX_Control(pDX, IDC_FILES_EXT, m_extensions);
-	DDX_Control(pDX, IDC_FILELIST, m_FileDescs);
-	//}}AFX_DATA_MAP
-}
-
-
-BEGIN_MESSAGE_MAP(OptFiles, CDialog)
-	//{{AFX_MSG_MAP(OptFiles)
-	ON_CBN_SELCHANGE(IDC_FILELIST, OnSelchangeFilelist)
-	ON_BN_CLICKED(IDC_ASSOCIATE, OnAssociate)
-	//}}AFX_MSG_MAP
-END_MESSAGE_MAP()
-
-/////////////////////////////////////////////////////////////////////////////
-// OptFiles message handlers
-
-BOOL OptFiles::OnInitDialog()
-{
-	CDialog::OnInitDialog();
-
-	Osmo4 *gpac = GetApp();
-	u32 count, i;
-
-	while (m_FileDescs.GetCount()) m_FileDescs.DeleteString(0);
-	count = gf_cfg_get_key_count(gpac->m_user.config, "MimeTypes");
-	for (i=0; i<count; i++) {
-		char *sMime, *sKey, sDesc200;
-		const char *sOpt;
-		sMime = (char *) gf_cfg_get_key_name(gpac->m_user.config, "MimeTypes", i);
-		if (!sMime) continue;
-		sOpt = gf_cfg_get_key(gpac->m_user.config, "MimeTypes", sMime);
-		if (!sOpt) continue;
-		sKey = (char *) strstr(sOpt, "\" \"");
-		if (!sKey) continue;
-		strcpy(sDesc, sKey+3);
-		sKey = strchr(sDesc, '\"');
-		if (!sKey) continue;
-		sKey0 = 0;
-		m_FileDescs.AddString(sDesc);
-	}
-	m_FileDescs.SetCurSel(0);
-	SetSelection(0);
-	return TRUE;
-}
-
-void OptFiles::OnSelchangeFilelist()
-{
-	SetSelection(m_FileDescs.GetCurSel());
-}
-
-void OptFiles::SetSelection(u32 sel)
-{
-	Osmo4 *gpac = GetApp();
-	char *sMime, *sKey, sDesc200, sText200;
-	sMime = (char *) gf_cfg_get_key_name(gpac->m_user.config, "MimeTypes", sel);
-	sprintf(sText, "Mime Type: %s", sMime);
-	m_mimes.SetWindowText(sText);
-	strcpy(cur_mime, sMime);
-	sMime = (char *) gf_cfg_get_key(gpac->m_user.config, "MimeTypes", sMime);
-	strcpy(sDesc, sMime+1);
-	sKey = strchr(sDesc, '\"');
-	sKey0 = 0;
-	sprintf(sText, "Extensions: %s", sDesc);
-	strcpy(cur_ext, sDesc);
-	m_extensions.SetWindowText(sText);
-	sKey = strrchr(sMime, '\"');
-	sprintf(sText, "Module: %s", sKey+2);
-	m_PlugName.SetWindowText(sText);
-
-	Bool has_asso, need_asso, go = GF_TRUE;
-	sKey = cur_ext;
-	need_asso = has_asso = GF_FALSE;
-
-	HKEY hKey;
-	DWORD dwSize;
-	while (go) {
-		Bool ok;
-		char szExt50, szReg60, c;
-		char *tmp = strchr(sKey, ' ');
-		if (!tmp) {
-			go = GF_FALSE;
-		}
-		else {
-			c = tmp0;
-			tmp0 = 0;
-		}
-		sprintf(szExt, ".%s", sKey);
-		sprintf(szReg, "GPAC\\%s", sKey);
-		if (tmp) {
-			tmp0 = c;
-			tmp += 1;
-		}
-
-		if (RegOpenKeyEx(HKEY_CLASSES_ROOT, szExt, 0, KEY_READ, &hKey ) == ERROR_SUCCESS) {
-			dwSize = 200;
-			ok = GF_TRUE;
-			if (RegQueryValueEx(hKey, "", NULL, NULL,(unsigned char*) sDesc, &dwSize) != ERROR_SUCCESS) ok = GF_FALSE;
-			RegCloseKey(hKey);
-			if (ok && !stricmp((char *)sDesc, szReg)) has_asso = GF_TRUE;
-			else need_asso = GF_TRUE;
-		} else need_asso = GF_TRUE;
-		sKey = tmp;
-
-	}
-	m_DoAssociate.SetCheck(has_asso);
-	if (need_asso && has_asso)
-		OnAssociate();
-}
-
-
-void OptFiles::OnAssociate()
-{
-	char *sKey, sDesc200;
-	unsigned char szAppMAX_PATH;
-	unsigned char szIcoMAX_PATH;
-
-	strcpy((char *) szApp, GetApp()->szApplicationPath);
-	strcpy((char *) szIco, (const char *) szApp);
-	strcat((char *) szIco, "Osmo4.ico");
-	strcat((char *) szApp, "Osmo4.exe \"%L\"");
-
-	if (m_DoAssociate.GetCheck()) {
-		Bool go = GF_TRUE;
-		sKey = cur_ext;
-
-		HKEY hKey;
-		DWORD dwSize;
-		while (go) {
-			Bool ok;
-			char szExt50, szReg60, szOld80, szPath1024, c;
-			char *tmp = strchr(sKey, ' ');
-			if (!tmp) {
-				go = GF_FALSE;
-			}
-			else {
-				c = tmp0;
-				tmp0 = 0;
-			}
-			sprintf(szExt, ".%s", sKey);
-			sprintf(szReg, "GPAC\\%s", sKey);
-			if (tmp) {
-				tmp0 = c;
-				tmp += 1;
-			}
-
-			RegOpenKeyEx(HKEY_CLASSES_ROOT, szExt, 0, 0, &hKey );
-			dwSize = 200;
-			ok = GF_TRUE;
-			if (RegQueryValueEx(hKey, "", NULL, NULL,(unsigned char*) sDesc, &dwSize) != ERROR_SUCCESS) ok = GF_FALSE;
-			RegCloseKey(hKey);
-			strcpy(szOld, "");
-			if (ok && stricmp((char *)sDesc, szReg)) strcpy(szOld, sDesc);
-
-			strcpy(szPath, szReg);
-			strcat(szPath, "\\DefaultIcon");
-			RegCreateKeyEx(HKEY_CLASSES_ROOT, szPath, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hKey, &dwSize);
-			RegSetValueEx(hKey, "", 0, REG_SZ, szIco, (DWORD) strlen((const char *) szIco)+1);
-			RegCloseKey(hKey);
-
-			strcpy(szPath, szReg);
-			strcat(szPath, "\\Shell\\open\\command");
-			RegCreateKeyEx(HKEY_CLASSES_ROOT, szPath, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hKey, &dwSize);
-			RegSetValueEx(hKey, "", 0, REG_SZ, szApp, (DWORD) strlen((const char *) szApp)+1);
-			RegCloseKey(hKey);
-
-			if (strlen(szOld)) {
-				strcpy(szPath, szReg);
-				strcat(szPath, "\\Backup");
-				RegCreateKeyEx(HKEY_CLASSES_ROOT, szPath, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hKey, &dwSize);
-				RegSetValueEx(hKey, "", 0, REG_SZ, (unsigned char *) szOld, (DWORD) strlen((const char *) szIco)+1);
-				RegCloseKey(hKey);
-			}
-
-			RegCreateKeyEx(HKEY_CLASSES_ROOT, szExt, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hKey, &dwSize);
-			RegSetValueEx(hKey, "", 0, REG_SZ, (const unsigned char *) szReg, (DWORD) strlen(szReg)+1);
-			RegCloseKey(hKey);
-
-			sKey = tmp;
-		}
-	} else {
-		Bool go = GF_TRUE;
-		sKey = cur_ext;
-
-		HKEY hKey;
-		DWORD dwSize;
-		while (go) {
-			Bool ok;
-			char szExt50, szReg60, szPath1024, c;
-			char *tmp = strchr(sKey, ' ');
-			if (!tmp) {
-				go = GF_FALSE;
-			}
-			else {
-				c = tmp0;
-				tmp0 = 0;
-			}
-			sprintf(szExt, ".%s", sKey);
-			sprintf(szReg, "GPAC\\%s", sKey);
-			if (tmp) {
-				tmp0 = c;
-				tmp += 1;
-			}
-
-			strcpy(szPath, szReg);
-			strcat(szPath, "\\Backup");
-			RegOpenKeyEx(HKEY_CLASSES_ROOT, szPath, 0, 0, &hKey );
-			dwSize = 200;
-			ok = GF_TRUE;
-			if (RegQueryValueEx(hKey, "", NULL, NULL,(unsigned char*) sDesc, &dwSize) != ERROR_SUCCESS) ok = GF_FALSE;
-			RegCloseKey(hKey);
-			if (ok && strlen((char *)sDesc)) {
-				RegCreateKeyEx(HKEY_CLASSES_ROOT, szExt, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hKey, &dwSize);
-				RegSetValueEx(hKey, "", 0, REG_SZ, (unsigned char*) sDesc, (DWORD) strlen((const char *) sDesc)+1);
-				RegCloseKey(hKey);
-			}
-
-			RegOpenKeyEx(HKEY_CLASSES_ROOT, szReg, 0, 0, &hKey );
-			RegDeleteKey(hKey, "Backup");
-			RegDeleteKey(hKey, "DefaultIcon");
-			RegDeleteKey(hKey, "Shell\\open\\command");
-			RegDeleteKey(hKey, "Shell\\open");
-			RegDeleteKey(hKey, "Shell");
-			RegCloseKey(hKey);
-			RegDeleteKey(HKEY_CLASSES_ROOT, szReg);
-
-			sKey = tmp;
-		}
-	}
-}
-
-COptLogs::COptLogs(CWnd* pParent /*=NULL*/)
-	: CDialog(COptLogs::IDD, pParent)
-{
-	//{{AFX_DATA_INIT(COptLogs)
-	// NOTE: the ClassWizard will add member initialization here
-	//}}AFX_DATA_INIT
-}
-
-
-void COptLogs::DoDataExchange(CDataExchange* pDX)
-{
-	CDialog::DoDataExchange(pDX);
-	//{{AFX_DATA_MAP(COptLogs)
-	DDX_Control(pDX, IDC_TOOL_SYNC, m_sync);
-	DDX_Control(pDX, IDC_TOOL_SCRIPT, m_script);
-	DDX_Control(pDX, IDC_TOOL_SCENE, m_scene);
-	DDX_Control(pDX, IDC_TOOL_RTP, m_rtp);
-	DDX_Control(pDX, IDC_TOOL_RENDER, m_render);
-	DDX_Control(pDX, IDC_TOOL_PARSER, m_parser);
-	DDX_Control(pDX, IDC_TOOL_NET, m_net);
-	DDX_Control(pDX, IDC_TOOL_MMIO, m_mmio);
-	DDX_Control(pDX, IDC_TOOL_MEDIA, m_media);
-	DDX_Control(pDX, IDC_TOOL_CORE, m_core);
-	DDX_Control(pDX, IDC_TOOL_CONTAINER, m_container);
-	DDX_Control(pDX, IDC_TOOL_COMPOSE, m_compose);
-	DDX_Control(pDX, IDC_TOOL_CODING, m_coding);
-	DDX_Control(pDX, IDC_TOOL_CODEC, m_codec);
-	DDX_Control(pDX, IDC_TOOL_AUTHOR, m_author);
-	DDX_Control(pDX, IDC_LOG_LEVEL, m_Level);
-	//}}AFX_DATA_MAP
-}
-
-
-BEGIN_MESSAGE_MAP(COptLogs, CDialog)
-	//{{AFX_MSG_MAP(COptLogs)
-	//}}AFX_MSG_MAP
-END_MESSAGE_MAP()
-
-/////////////////////////////////////////////////////////////////////////////
-// COptLogs message handlers
-
-BOOL COptLogs::OnInitDialog()
-{
-	CDialog::OnInitDialog();
-
-#if 0
-	Osmo4 *gpac = GetApp();
-	switch (gpac->m_log_level) {
-	case GF_LOG_ERROR:
-		m_Level.SetCurSel(1);
-		break;
-	case GF_LOG_WARNING:
-		m_Level.SetCurSel(2);
-		break;
-	case GF_LOG_INFO:
-		m_Level.SetCurSel(3);
-		break;
-	case GF_LOG_DEBUG:
-		m_Level.SetCurSel(4);
-		break;
-	default:
-		m_Level.SetCurSel(0);
-		break;
-	}
-
-	m_sync.SetCheck(gpac->m_log_tools & GF_LOG_COMPTIME);
-	m_script.SetCheck(gpac->m_log_tools & GF_LOG_SCRIPT);
-	m_scene.SetCheck(gpac->m_log_tools & GF_LOG_SCENE);
-	m_rtp.SetCheck(gpac->m_log_tools & GF_LOG_RTP);
-	m_render.SetCheck(gpac->m_log_tools & GF_LOG_COMPOSE);
-	m_parser.SetCheck(gpac->m_log_tools & GF_LOG_PARSER);
-	m_net.SetCheck(gpac->m_log_tools & GF_LOG_NETWORK);
-	m_mmio.SetCheck(gpac->m_log_tools & GF_LOG_MMIO);
-	m_media.SetCheck(gpac->m_log_tools & GF_LOG_MEDIA);
-	m_core.SetCheck(gpac->m_log_tools & GF_LOG_CORE);
-	m_container.SetCheck(gpac->m_log_tools & GF_LOG_CONTAINER);
-	m_compose.SetCheck(gpac->m_log_tools & GF_LOG_INTERACT);
-	m_coding.SetCheck(gpac->m_log_tools & GF_LOG_CODING);
-	m_codec.SetCheck(gpac->m_log_tools & GF_LOG_CODEC);
-	m_author.SetCheck(gpac->m_log_tools & GF_LOG_FILTER);
-#endif
-
-	return TRUE;
-}
-
-void COptLogs::SaveOptions()
-{
-	Osmo4 *gpac = GetApp();
-	CString str = "";
-	const char *level = "error";
-	u32 flags = 0;
-
-	switch (m_Level.GetCurSel()) {
-	case 1:
-		level = "error";
-		break;
-	case 2:
-		level = "warning";
-		break;
-	case 3:
-		level = "info";
-		break;
-	case 4:
-		level = "debug";
-		break;
-	default:
-		level = "none";
-		break;
-	}
-
-	if (m_sync.GetCheck()) {
-		str +="sync:";
-	}
-	if (m_script.GetCheck()) {
-		str +="script:";
-	}
-	if (m_scene.GetCheck()) {
-		str +="scene:";
-	}
-	if (m_rtp.GetCheck()) {
-		str +="rtp:";
-	}
-	if (m_render.GetCheck()) {
-		str +="compose:";
-	}
-	if (m_parser.GetCheck()) {
-		str +="parser:";
-	}
-	if (m_net.GetCheck()) {
-		str +="network:";
-	}
-	if (m_mmio.GetCheck()) {
-		str +="mmio:";
-	}
-	if (m_media.GetCheck()) {
-		str +="media:";
-	}
-	if (m_core.GetCheck()) {
-		str +="core:";
-	}
-	if (m_container.GetCheck()) {
-		str +="container:";
-	}
-	if (m_compose.GetCheck()) {
-		str +="interact:";
-	}
-	if (m_coding.GetCheck()) {
-		str +="coding:";
-	}
-	if (m_codec.GetCheck()) {
-		str +="codec:";
-	}
-	if (m_author.GetCheck()) {
-		str +="author:";
-	}
-
-	gf_cfg_set_key(gpac->m_user.config, "General", "Logs", str);
-	str += "@";
-	str += level;
-	gf_log_set_tools_levels(str);
-}
-
-void COptHTTP::OnBnClickedRestartCache()
-{
-	// TODO : ajoutez ici le code de votre gestionnaire de notification de contrôle
-}

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/osmo4_w32/Options.h Deleted

@@ -1,624 +0,0 @@
-#if !defined(AFX_OPTIONS_H__5C839953_58C0_4D9D_89CE_2820C7686C1B__INCLUDED_)
-#define AFX_OPTIONS_H__5C839953_58C0_4D9D_89CE_2820C7686C1B__INCLUDED_
-
-#if _MSC_VER > 1000
-#pragma once
-#endif // _MSC_VER > 1000
-// Options.h : header file
-//
-
-
-class COptAudio : public CDialog
-{
-// Construction
-public:
-	COptAudio(CWnd* pParent = NULL);   // standard constructor
-
-// Dialog Data
-	//{{AFX_DATA(COptAudio)
-	enum { IDD = IDD_OPT_AUDIO };
-	CButton	m_Notifs;
-	CComboBox	m_DriverList;
-	CButton	m_AudioResync;
-	CButton	m_AudioMultiCH;
-	CEdit	m_AudioDur;
-	CSpinButtonCtrl	m_SpinFPS;
-	CButton	m_ForceConfig;
-	CSpinButtonCtrl	m_AudioSpin;
-	CEdit	m_AudioEdit;
-	//}}AFX_DATA
-
-	void SaveOptions();
-
-// Overrides
-	// ClassWizard generated virtual function overrides
-	//{{AFX_VIRTUAL(COptAudio)
-protected:
-	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
-	//}}AFX_VIRTUAL
-
-// Implementation
-protected:
-
-	// Generated message map functions
-	//{{AFX_MSG(COptAudio)
-	virtual BOOL OnInitDialog();
-	afx_msg void OnForceAudio();
-	afx_msg void OnSelchangeDriverList();
-	//}}AFX_MSG
-	DECLARE_MESSAGE_MAP()
-};
-
-/////////////////////////////////////////////////////////////////////////////
-// OptDecoder dialog
-
-class OptDecoder : public CDialog
-{
-// Construction
-public:
-	OptDecoder(CWnd* pParent = NULL);   // standard constructor
-
-// Dialog Data
-	//{{AFX_DATA(OptDecoder)
-	enum { IDD = IDD_OPT_DECODER };
-	CComboBox	m_Video;
-	CComboBox	m_Audio;
-	//}}AFX_DATA
-
-	void SaveOptions();
-
-// Overrides
-	// ClassWizard generated virtual function overrides
-	//{{AFX_VIRTUAL(OptDecoder)
-protected:
-	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
-	//}}AFX_VIRTUAL
-
-// Implementation
-protected:
-
-	// Generated message map functions
-	//{{AFX_MSG(OptDecoder)
-	virtual BOOL OnInitDialog();
-	//}}AFX_MSG
-	DECLARE_MESSAGE_MAP()
-};
-
-class OptFiles : public CDialog
-{
-// Construction
-public:
-	OptFiles(CWnd* pParent = NULL);   // standard constructor
-
-// Dialog Data
-	//{{AFX_DATA(OptFiles)
-	enum { IDD = IDD_OPT_FILETYPES };
-	CButton	m_DoAssociate;
-	CStatic	m_PlugName;
-	CStatic	m_mimes;
-	CStatic	m_extensions;
-	CComboBox	m_FileDescs;
-	//}}AFX_DATA
-
-	void SetSelection(u32 sel);
-	char cur_ext200, cur_mime200;
-
-// Overrides
-	// ClassWizard generated virtual function overrides
-	//{{AFX_VIRTUAL(OptFiles)
-protected:
-	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
-	//}}AFX_VIRTUAL
-
-// Implementation
-protected:
-
-	// Generated message map functions
-	//{{AFX_MSG(OptFiles)
-	virtual BOOL OnInitDialog();
-	afx_msg void OnSelchangeFilelist();
-	afx_msg void OnAssociate();
-	//}}AFX_MSG
-	DECLARE_MESSAGE_MAP()
-};
-
-/////////////////////////////////////////////////////////////////////////////
-// COptFont dialog
-
-class COptFont : public CDialog
-{
-// Construction
-public:
-	COptFont(CWnd* pParent = NULL);   // standard constructor
-
-// Dialog Data
-	//{{AFX_DATA(COptFont)
-	enum { IDD = IDD_OPT_FONT };
-	CComboBox	m_TextureModes;
-	CComboBox	m_Fonts;
-	CButton	m_BrowseFont;
-	//}}AFX_DATA
-
-
-	void SaveOptions();
-
-// Overrides
-	// ClassWizard generated virtual function overrides
-	//{{AFX_VIRTUAL(COptFont)
-protected:
-	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
-	//}}AFX_VIRTUAL
-
-// Implementation
-protected:
-
-	// Generated message map functions
-	//{{AFX_MSG(COptFont)
-	virtual BOOL OnInitDialog();
-	afx_msg void OnBrowseFont();
-	//}}AFX_MSG
-	DECLARE_MESSAGE_MAP()
-};
-
-/////////////////////////////////////////////////////////////////////////////
-// COptGen dialog
-
-class COptGen : public CDialog
-{
-// Construction
-public:
-	COptGen(CWnd* pParent = NULL);   // standard constructor
-
-// Dialog Data
-	//{{AFX_DATA(COptGen)
-	enum { IDD = IDD_OPT_GEN };
-	CButton	m_LookForSubs;
-	CButton	m_ViewXMT;
-	CButton	m_NoConsole;
-	CButton	m_Loop;
-	CButton	m_SingleInstance;
-	//}}AFX_DATA
-
-	void SaveOptions();
-
-// Overrides
-	// ClassWizard generated virtual function overrides
-	//{{AFX_VIRTUAL(COptGen)
-protected:
-	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
-	//}}AFX_VIRTUAL
-
-// Implementation
-protected:
-
-	// Generated message map functions
-	//{{AFX_MSG(COptGen)
-	virtual BOOL OnInitDialog();
-	//}}AFX_MSG
-	DECLARE_MESSAGE_MAP()
-};
-
-
-/////////////////////////////////////////////////////////////////////////////
-// COptHTTP dialog
-
-class COptHTTP : public CDialog
-{
-// Construction
-public:
-	COptHTTP(CWnd* pParent = NULL);   // standard constructor
-
-// Dialog Data
-	//{{AFX_DATA(COptHTTP)
-	enum { IDD = IDD_OPT_HTTP };
-	CEdit	m_ProxyName;
-	CButton	m_useProxy;
-	CEdit	m_SAXDuration;
-	CButton	m_Progressive;
-	CButton	m_DisableCache;
-	CButton	m_CleanCache;
-	CButton	m_CacheDir;
-	//}}AFX_DATA
-
-
-	void SaveOptions();
-
-// Overrides
-	// ClassWizard generated virtual function overrides
-	//{{AFX_VIRTUAL(COptHTTP)
-protected:
-	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
-	//}}AFX_VIRTUAL
-
-// Implementation
-protected:
-
-	// Generated message map functions
-	//{{AFX_MSG(COptHTTP)
-	afx_msg void OnBrowseCache();
-	virtual BOOL OnInitDialog();
-	afx_msg void OnSaxProgressive();
-	afx_msg void OnUseProxy();
-	//}}AFX_MSG
-	DECLARE_MESSAGE_MAP()
-public:
-	afx_msg void OnBnClickedRestartCache();
-};
-
-
-class COptMCache : public CDialog
-{
-// Construction
-public:
-	COptMCache(CWnd* pParent = NULL);   // standard constructor
-
-// Dialog Data
-	//{{AFX_DATA(COptMCache)
-	enum { IDD = IDD_OPT_MCACHE };
-	CEdit	m_BaseName;
-	CButton	m_UseBase;
-	CButton	m_Overwrite;
-	CButton	m_RecDir;
-	//}}AFX_DATA
-
-
-	void SaveOptions();
-
-// Overrides
-	// ClassWizard generated virtual function overrides
-	//{{AFX_VIRTUAL(COptMCache)
-protected:
-	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
-	//}}AFX_VIRTUAL
-
-// Implementation
-protected:
-
-	// Generated message map functions
-	//{{AFX_MSG(COptMCache)
-	virtual BOOL OnInitDialog();
-	afx_msg void OnBrowseMcache();
-	afx_msg void OnMcacheUsename();
-	//}}AFX_MSG
-	DECLARE_MESSAGE_MAP()
-};
-
-class COptRender : public CDialog
-{
-// Construction
-public:
-	COptRender(CWnd* pParent = NULL);   // standard constructor
-
-// Dialog Data
-	//{{AFX_DATA(COptRender)
-	enum { IDD = IDD_OPT_RENDER };
-	CComboBox	m_DrawBounds;
-	CComboBox	m_Graphics;
-	CButton	m_Use3DRender;
-	CComboBox	m_AntiAlias;
-	CButton	m_ForceSize;
-	CButton	m_HighSpeed;
-	CComboBox	m_BIFSRate;
-	//}}AFX_DATA
-
-
-	Bool SaveOptions();
-
-// Overrides
-	// ClassWizard generated virtual function overrides
-	//{{AFX_VIRTUAL(COptRender)
-protected:
-	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
-	//}}AFX_VIRTUAL
-
-// Implementation
-protected:
-
-	// Generated message map functions
-	//{{AFX_MSG(COptRender)
-	virtual BOOL OnInitDialog();
-	//}}AFX_MSG
-	DECLARE_MESSAGE_MAP()
-};
-
-class COptRender2D : public CDialog
-{
-// Construction
-public:
-	COptRender2D(CWnd* pParent = NULL);   // standard constructor
-
-	void SaveOptions();
-	void SetYUV();
-
-// Dialog Data
-	//{{AFX_DATA(COptRender2D)
-	enum { IDD = IDD_OPT_RENDER2D };
-	CStatic	m_YUVFormat;
-	CButton	m_NoYUV;
-	CButton	m_Scalable;
-	CButton	m_DirectRender;
-	//}}AFX_DATA
-
-
-// Overrides
-	// ClassWizard generated virtual function overrides
-	//{{AFX_VIRTUAL(COptRender2D)
-protected:
-	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
-	//}}AFX_VIRTUAL
-
-// Implementation
-protected:
-
-	// Generated message map functions
-	//{{AFX_MSG(COptRender2D)
-	virtual BOOL OnInitDialog();
-	//}}AFX_MSG
-	DECLARE_MESSAGE_MAP()
-};
-
-class COptRender3D : public CDialog
-{
-// Construction
-public:
-	COptRender3D(CWnd* pParent = NULL);   // standard constructor
-
-	void SaveOptions();
-
-// Dialog Data
-	//{{AFX_DATA(COptRender3D)
-	enum { IDD = IDD_OPT_RENDER3D };
-	CButton	m_BitmapPixels;
-	CButton	m_DisableTXRect;
-	CButton	m_RasterOutlines;
-	CButton	m_EmulPow2;
-	CButton	m_PolyAA;
-	CComboBox	m_BackCull;
-	CComboBox	m_DrawNormals;
-	CComboBox	m_Wireframe;
-	//}}AFX_DATA
-
-
-// Overrides
-	// ClassWizard generated virtual function overrides
-	//{{AFX_VIRTUAL(COptRender3D)
-protected:
-	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
-	//}}AFX_VIRTUAL
-
-// Implementation
-protected:
-
-	// Generated message map functions
-	//{{AFX_MSG(COptRender3D)
-	virtual BOOL OnInitDialog();
-	//}}AFX_MSG
-	DECLARE_MESSAGE_MAP()
-};
-
-class COptStream : public CDialog
-{
-// Construction
-public:
-	COptStream(CWnd* pParent = NULL);   // standard constructor
-
-// Dialog Data
-	//{{AFX_DATA(COptStream)
-	enum { IDD = IDD_OPT_STREAM };
-	CEdit	m_RebufferLen;
-	CButton	m_Rebuffer;
-	CEdit	m_Buffer;
-	CEdit	m_Timeout;
-	CButton	m_Reorder;
-	CButton	m_UseRTSP;
-	CComboBox	m_Port;
-	//}}AFX_DATA
-
-
-	void SaveOptions();
-
-	void CheckRebuffer();
-
-// Overrides
-	// ClassWizard generated virtual function overrides
-	//{{AFX_VIRTUAL(COptStream)
-protected:
-	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
-	//}}AFX_VIRTUAL
-
-// Implementation
-protected:
-
-	// Generated message map functions
-	//{{AFX_MSG(COptStream)
-	virtual BOOL OnInitDialog();
-	afx_msg void OnSelchangePort();
-	afx_msg void OnRtsp();
-	afx_msg void OnRebuffer();
-	afx_msg void OnUpdateRebufferLen();
-	afx_msg void OnUpdateBuffer();
-	//}}AFX_MSG
-	DECLARE_MESSAGE_MAP()
-};
-
-class COptSystems : public CDialog
-{
-// Construction
-public:
-	COptSystems(CWnd* pParent = NULL);   // standard constructor
-
-// Dialog Data
-	//{{AFX_DATA(COptSystems)
-	enum { IDD = IDD_OPT_SYSTEMS };
-	CButton	m_ForceDuration;
-	CComboBox	m_Threading;
-	CButton	m_LateFramesAlwaysDrawn;
-	CComboBox	m_Lang;
-	//}}AFX_DATA
-
-	void SaveOptions();
-
-// Overrides
-	// ClassWizard generated virtual function overrides
-	//{{AFX_VIRTUAL(COptSystems)
-protected:
-	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
-	//}}AFX_VIRTUAL
-
-// Implementation
-protected:
-
-	// Generated message map functions
-	//{{AFX_MSG(COptSystems)
-	virtual BOOL OnInitDialog();
-	//}}AFX_MSG
-	DECLARE_MESSAGE_MAP()
-};
-
-class COptVideo : public CDialog
-{
-// Construction
-public:
-	COptVideo(CWnd* pParent = NULL);   // standard constructor
-
-// Dialog Data
-	//{{AFX_DATA(COptVideo)
-	enum { IDD = IDD_OPT_VIDEO };
-	CButton	m_SwitchRes;
-	CButton	m_UseHWMemory;
-	CComboBox	m_Videos;
-	//}}AFX_DATA
-
-
-	void SaveOptions();
-
-// Overrides
-	// ClassWizard generated virtual function overrides
-	//{{AFX_VIRTUAL(COptVideo)
-protected:
-	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
-	//}}AFX_VIRTUAL
-
-// Implementation
-protected:
-
-	// Generated message map functions
-	//{{AFX_MSG(COptVideo)
-	virtual BOOL OnInitDialog();
-	//}}AFX_MSG
-	DECLARE_MESSAGE_MAP()
-};
-
-/////////////////////////////////////////////////////////////////////////////
-// COptLogs dialog
-
-class COptLogs : public CDialog
-{
-// Construction
-public:
-	COptLogs(CWnd* pParent = NULL);   // standard constructor
-	void SaveOptions();
-
-// Dialog Data
-	//{{AFX_DATA(COptLogs)
-	enum { IDD = IDD_OPT_LOGS };
-	CButton	m_sync;
-	CButton	m_script;
-	CButton	m_scene;
-	CButton	m_rtp;
-	CButton	m_render;
-	CButton	m_parser;
-	CButton	m_net;
-	CButton	m_mmio;
-	CButton	m_media;
-	CButton	m_core;
-	CButton	m_container;
-	CButton	m_compose;
-	CButton	m_coding;
-	CButton	m_codec;
-	CButton	m_author;
-	CComboBox	m_Level;
-	//}}AFX_DATA
-
-
-// Overrides
-	// ClassWizard generated virtual function overrides
-	//{{AFX_VIRTUAL(COptLogs)
-protected:
-	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
-	//}}AFX_VIRTUAL
-
-// Implementation
-protected:
-
-	// Generated message map functions
-	//{{AFX_MSG(COptLogs)
-	virtual BOOL OnInitDialog();
-	//}}AFX_MSG
-	DECLARE_MESSAGE_MAP()
-};
-
-
-
-/////////////////////////////////////////////////////////////////////////////
-// COptions dialog
-
-class COptions : public CDialog
-{
-// Construction
-public:
-	COptions(CWnd* pParent = NULL);   // standard constructor
-	BOOL Create(CWnd * pParent)
-	{
-		return CDialog::Create( COptions::IDD, pParent);
-	}
-
-// Dialog Data
-	//{{AFX_DATA(COptions)
-	enum { IDD = IDD_OPTIONS };
-	CComboBox	m_Selector;
-	//}}AFX_DATA
-
-
-// Overrides
-	// ClassWizard generated virtual function overrides
-	//{{AFX_VIRTUAL(COptions)
-protected:
-	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
-	//}}AFX_VIRTUAL
-
-// Implementation
-protected:
-
-	COptGen m_general;
-	COptSystems m_systems;
-	COptRender m_render;
-	COptRender2D m_render2d;
-	COptRender3D m_render3d;
-	COptAudio m_audio;
-	OptDecoder m_decoder;
-	COptVideo m_video;
-	COptHTTP m_http;
-	COptFont m_font;
-	COptStream m_stream;
-	COptMCache m_cache;
-	OptFiles m_files;
-	COptLogs m_logs;
-
-	void HideAll();
-
-	// Generated message map functions
-	//{{AFX_MSG(COptions)
-	virtual BOOL OnInitDialog();
-	afx_msg void OnSaveopt();
-	afx_msg void OnClose();
-	afx_msg void OnDestroy();
-	afx_msg void OnSelchangeSelect();
-	//}}AFX_MSG
-	DECLARE_MESSAGE_MAP()
-};
-
-//{{AFX_INSERT_LOCATION}}
-// Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_OPTIONS_H__5C839953_58C0_4D9D_89CE_2820C7686C1B__INCLUDED_)

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/osmo4_w32/Osmo4.cpp Deleted

@@ -1,944 +0,0 @@
-// GPAC.cpp : Defines the class behaviors for the application.
-//
-
-#include "stdafx.h"
-#include "Osmo4.h"
-#include <gpac/network.h>
-#include <direct.h>
-#include "MainFrm.h"
-#include "OpenUrl.h"
-#include "resource.h"
-
-#ifdef _DEBUG
-#define new DEBUG_NEW
-#undef THIS_FILE
-static char THIS_FILE = __FILE__;
-#endif
-
-/////////////////////////////////////////////////////////////////////////////
-// Osmo4
-
-BEGIN_MESSAGE_MAP(Osmo4, CWinApp)
-	//{{AFX_MSG_MAP(Osmo4)
-	ON_COMMAND(ID_OPEN_FILE, OnOpenFile)
-	ON_COMMAND(ID_FILE_STEP, OnFileStep)
-	ON_COMMAND(ID_OPEN_URL, OnOpenUrl)
-	ON_COMMAND(ID_FILE_RELOAD, OnFileReload)
-	ON_COMMAND(ID_CONFIG_RELOAD, OnConfigReload)
-	ON_COMMAND(ID_FILE_PLAY, OnFilePlay)
-	ON_UPDATE_COMMAND_UI(ID_FILE_PLAY, OnUpdateFilePlay)
-	ON_UPDATE_COMMAND_UI(ID_FILE_STEP, OnUpdateFileStep)
-	ON_COMMAND(ID_FILE_STOP, OnFileStop)
-	ON_UPDATE_COMMAND_UI(ID_FILE_STOP, OnUpdateFileStop)
-	ON_COMMAND(ID_SWITCH_RENDER, OnSwitchRender)
-	ON_UPDATE_COMMAND_UI(ID_FILE_RELOAD, OnUpdateFileStop)
-	ON_COMMAND(ID_H_ABOUT, OnAbout)
-	ON_COMMAND(ID_FILE_MIGRATE, OnFileMigrate)
-	//}}AFX_MSG_MAP
-END_MESSAGE_MAP()
-
-/////////////////////////////////////////////////////////////////////////////
-// Osmo4 construction
-
-Osmo4::Osmo4()
-{
-}
-
-/////////////////////////////////////////////////////////////////////////////
-// The one and only Osmo4 object
-
-Osmo4 theApp;
-
-
-
-class UserPassDialog : public CDialog
-{
-// Construction
-public:
-	UserPassDialog(CWnd* pParent = NULL);   // standard constructor
-
-	Bool GetPassword(const char *site_url, char *user, char *password);
-
-// Dialog Data
-	//{{AFX_DATA(UserPassDialog)
-	enum { IDD = IDD_PASSWD };
-	CStatic	m_SiteURL;
-	CEdit m_User;
-	CEdit m_Pass;
-	//}}AFX_DATA
-
-	void SetSelection(u32 sel);
-	char cur_ext200, cur_mime200;
-
-// Overrides
-	// ClassWizard generated virtual function overrides
-	//{{AFX_VIRTUAL(UserPassDialog)
-protected:
-	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
-	//}}AFX_VIRTUAL
-
-// Implementation
-protected:
-	const char *m_site_url;
-	char *m_user, *m_password;
-
-	// Generated message map functions
-	//{{AFX_MSG(UserPassDialog)
-	virtual BOOL OnInitDialog();
-	afx_msg void OnClose();
-	//}}AFX_MSG
-};
-
-UserPassDialog::UserPassDialog(CWnd* pParent /*=NULL*/)
-	: CDialog(UserPassDialog::IDD, pParent)
-{
-	//{{AFX_DATA_INIT(COptStream)
-	//}}AFX_DATA_INIT
-}
-
-void UserPassDialog::DoDataExchange(CDataExchange* pDX)
-{
-	CDialog::DoDataExchange(pDX);
-	//{{AFX_DATA_MAP(UserPassDialog)
-	DDX_Control(pDX, IDC_TXT_SITE, m_SiteURL);
-	DDX_Control(pDX, IDC_EDIT_USER, m_User);
-	DDX_Control(pDX, IDC_EDIT_PASSWORD, m_Pass);
-	//}}AFX_DATA_MAP
-}
-
-BOOL UserPassDialog::OnInitDialog()
-{
-	CDialog::OnInitDialog();
-	m_SiteURL.SetWindowText(m_site_url);
-	m_User.SetWindowText(m_user);
-	m_Pass.SetWindowText("");
-	return TRUE;
-}
-
-void UserPassDialog::OnClose()
-{
-	m_User.GetWindowText(m_user, 50);
-	m_Pass.GetWindowText(m_password, 50);
-}
-
-Bool UserPassDialog::GetPassword(const char *site_url, char *user, char *password)
-{
-	m_site_url = site_url;
-	m_user = user;
-	if (DoModal() != IDOK) return GF_FALSE;
-	return GF_TRUE;
-}
-
-
-static void Osmo4_progress_cbk(const void *usr, const char *title, u64 done, u64 total)
-{
-	if (!total) return;
-	CMainFrame *pFrame = (CMainFrame *) ((Osmo4 *) usr)->m_pMainWnd;
-	s32 prog = (s32) ( (100 * (u64)done) / total);
-	if (pFrame->m_last_prog < prog) {
-		pFrame->console_err = GF_OK;
-		pFrame->m_last_prog = prog;
-		pFrame->console_message.Format("%s %02d %%", title, prog);
-		pFrame->PostMessage(WM_CONSOLEMSG, 0, 0);
-		if (done==total) pFrame->m_last_prog = -1;
-	}
-}
-
-#define W32_MIN_WIDTH 120
-
-static void log_msg(char *msg)
-{
-	::MessageBox(NULL, msg, "GPAC", MB_OK);
-}
-Bool Osmo4_EventProc(void *priv, GF_Event *evt)
-{
-	u32 dur;
-	Osmo4 *gpac = (Osmo4 *) priv;
-	CMainFrame *pFrame = (CMainFrame *) gpac->m_pMainWnd;
-	/*shutdown*/
-	if (!pFrame) return GF_FALSE;
-
-	switch (evt->type) {
-	case GF_EVENT_DURATION:
-		dur = (u32) (1000 * evt->duration.duration);
-		//if (dur<1100) dur = 0;
-		pFrame->m_pPlayList->SetDuration((u32) evt->duration.duration );
-		gpac->max_duration = dur;
-		gpac->can_seek = evt->duration.can_seek;
-		if (!gpac->can_seek) {
-			pFrame->m_Sliders.m_PosSlider.EnableWindow(FALSE);
-		} else {
-			pFrame->m_Sliders.m_PosSlider.EnableWindow(TRUE);
-			pFrame->m_Sliders.m_PosSlider.SetRangeMin(0);
-			pFrame->m_Sliders.m_PosSlider.SetRangeMax(dur);
-		}
-		break;
-
-	case GF_EVENT_MESSAGE:
-		if (!evt->message.service || !strcmp(evt->message.service, (LPCSTR) pFrame->m_pPlayList->GetURL() )) {
-			pFrame->console_service = "main service";
-		} else {
-			pFrame->console_service = evt->message.service;
-		}
-		if (evt->message.error!=GF_OK) {
-			if (evt->message.error<GF_OK || !gpac->m_NoConsole) {
-				pFrame->console_err = evt->message.error;
-				pFrame->console_message = evt->message.message;
-				gpac->m_pMainWnd->PostMessage(WM_CONSOLEMSG, 0, 0);
-
-				/*any error before connection confirm is a service connection error*/
-				if (!gpac->m_isopen) pFrame->m_pPlayList->SetDead();
-			}
-			return GF_FALSE;
-		}
-		if (gpac->m_NoConsole) return GF_FALSE;
-
-		/*process user message*/
-		pFrame->console_err = GF_OK;
-		pFrame->console_message = evt->message.message;
-		gpac->m_pMainWnd->PostMessage(WM_CONSOLEMSG, 0, 0);
-		break;
-	case GF_EVENT_PROGRESS:
-		char *szType;
-		if (evt->progress.progress_type==0) szType = "Buffer ";
-		else if (evt->progress.progress_type==1) szType = "Download ";
-		else if (evt->progress.progress_type==2) szType = "Import ";
-		gf_set_progress(szType, evt->progress.done, evt->progress.total);
-		break;
-	case GF_EVENT_NAVIGATE_INFO:
-		pFrame->console_message = evt->navigate.to_url;
-		gpac->m_pMainWnd->PostMessage(WM_CONSOLEMSG, 1000, 0);
-		break;
-
-	case GF_EVENT_SCENE_SIZE:
-		if (evt->size.width && evt->size.height) {
-			gpac->orig_width = evt->size.width;
-			gpac->orig_height = evt->size.height;
-			if (gpac->m_term && !pFrame->m_bFullScreen)
-				pFrame->PostMessage(WM_SETSIZE, evt->size.width, evt->size.height);
-		}
-		break;
-		/*don't resize on win32 msg notif*/
-#if 0
-	case GF_EVENT_SIZE:
-		if (/*gpac->m_term && !pFrame->m_bFullScreen && */gpac->orig_width && (evt->size.width < W32_MIN_WIDTH) )
-			pFrame->PostMessage(WM_SETSIZE, W32_MIN_WIDTH, (W32_MIN_WIDTH*gpac->orig_height) / gpac->orig_width);
-		else
-			pFrame->PostMessage(WM_SETSIZE, evt->size.width, evt->size.height);
-		break;
-#endif
-
-	case GF_EVENT_CONNECT:
-//		if (pFrame->m_bStartupFile) return 0;
-
-		pFrame->BuildStreamList(GF_TRUE);
-		if (evt->connect.is_connected) {
-			pFrame->BuildChapterList(GF_FALSE);
-			gpac->m_isopen = GF_TRUE;
-			//resetting sliders when opening a new file creates a deadlock on the window thread which is disconnecting
-			pFrame->m_wndToolBar.SetButtonInfo(5, ID_FILE_PLAY, TBBS_BUTTON, gpac->m_isopen ? 4 : 3);
-			pFrame->m_Sliders.m_PosSlider.SetPos(0);
-			pFrame->SetProgTimer(GF_TRUE);
-		} else {
-			gpac->max_duration = 0;
-			gpac->m_isopen = GF_FALSE;
-			pFrame->BuildChapterList(GF_TRUE);
-		}
-		if (!pFrame->m_bFullScreen) {
-			pFrame->SetFocus();
-			pFrame->SetForegroundWindow();
-		}
-		break;
-
-	case GF_EVENT_QUIT:
-		pFrame->PostMessage(WM_CLOSE, 0L, 0L);
-		break;
-	case GF_EVENT_MIGRATE:
-	{
-	}
-	break;
-	case GF_EVENT_KEYDOWN:
-		gf_term_process_shortcut(gpac->m_term, evt);
-		/*update volume control*/
-		pFrame->m_Sliders.SetVolume();
-
-		switch (evt->key.key_code) {
-		case GF_KEY_HOME:
-			gf_term_set_option(gpac->m_term, GF_OPT_NAVIGATION_TYPE, 1);
-			break;
-		case GF_KEY_ESCAPE:
-			pFrame->PostMessage(WM_COMMAND, ID_VIEW_FULLSCREEN);
-			break;
-		case GF_KEY_MEDIANEXTTRACK:
-			pFrame->m_pPlayList->PlayNext();
-			break;
-		case GF_KEY_MEDIAPREVIOUSTRACK:
-			pFrame->m_pPlayList->PlayPrev();
-			break;
-		case GF_KEY_H:
-			if ((evt->key.flags & GF_KEY_MOD_CTRL) && gpac->m_isopen)
-				gf_term_switch_quality(gpac->m_term, GF_TRUE);
-			break;
-		case GF_KEY_L:
-			if ((evt->key.flags & GF_KEY_MOD_CTRL) && gpac->m_isopen)
-				gf_term_switch_quality(gpac->m_term, GF_FALSE);
-			break;
-		case GF_KEY_LEFT:
-		case GF_KEY_RIGHT:
-			if (gpac->m_isopen && (gf_term_get_option(gpac->m_term, GF_OPT_NAVIGATION) == GF_NAVIGATE_NONE)) {
-				if (evt->key.flags & GF_KEY_MOD_CTRL) {
-					if (evt->key.key_code==GF_KEY_LEFT) pFrame->m_pPlayList->PlayPrev();
-					else if (evt->key.key_code==GF_KEY_RIGHT) pFrame->m_pPlayList->PlayNext();
-				}
-				else if (gpac->can_seek && (evt->key.flags & GF_KEY_MOD_ALT)) {
-					u32 duration = gpac->max_duration;
-					s32 current_time = gf_term_get_time_in_ms(gpac->m_term);
-
-					if (evt->key.key_code==GF_KEY_LEFT) {
-						current_time -= 5*duration/100;
-						if (current_time<0) current_time=0;
-						gf_term_play_from_time(gpac->m_term, (u64) current_time, 0);
-					}
-					else if (evt->key.key_code==GF_KEY_RIGHT) {
-						current_time += 5*duration/100;
-						if ((u32) current_time < duration) {
-							gf_term_play_from_time(gpac->m_term, (u64) current_time, 0);
-						}
-					}
-				}
-			}
-			break;
-		}
-		break;
-	case GF_EVENT_NAVIGATE:
-		/*fixme - a proper browser would require checking mime type & co*/
-		/*store URL since it may be destroyed, and post message*/
-		gpac->m_navigate_url = evt->navigate.to_url;
-		pFrame->PostMessage(WM_NAVIGATE, NULL, NULL);
-		return GF_TRUE;
-	case GF_EVENT_VIEWPOINTS:
-		pFrame->BuildViewList();
-		return GF_FALSE;
-	case GF_EVENT_STREAMLIST:
-		pFrame->BuildStreamList(GF_FALSE);
-		return GF_FALSE;
-	case GF_EVENT_SET_CAPTION:
-		pFrame->SetWindowText(evt->caption.caption);
-		break;
-	case GF_EVENT_DBLCLICK:
-		pFrame->PostMessage(WM_COMMAND, ID_VIEW_FULLSCREEN);
-		return GF_FALSE;
-	case GF_EVENT_AUTHORIZATION:
-	{
-		UserPassDialog passdlg;
-		return passdlg.GetPassword(evt->auth.site_url, evt->auth.user, evt->auth.password);
-	}
-	}
-	return GF_FALSE;
-}
-
-
-/*here's the trick: use a storage section shared among all processes for the wnd handle and for the command line
-NOTE: this has to be static memory of course, don't try to alloc anything there...*/
-#pragma comment(linker, "/SECTION:.shr,RWS")
-#pragma data_seg(".shr")
-HWND static_gpac_hwnd = NULL;
-char static_szCmdLineMAX_PATH = "";
-#pragma data_seg()
-
-const char *static_gpac_get_url()
-{
-	return (const char *) static_szCmdLine;
-}
-
-static void osmo4_do_log(void *cbk, GF_LOG_Level level, GF_LOG_Tool tool, const char *fmt, va_list list)
-{
-	FILE *logs = (FILE *) cbk;
-	vfprintf(logs, fmt, list);
-	fflush(logs);
-}
-
-BOOL Osmo4::InitInstance()
-{
-	CCommandLineInfo cmdInfo;
-
-	afxAmbientActCtx = FALSE;
-
-	m_logs = NULL;
-
-	m_term = NULL;
-
-	memset(&m_user, 0, sizeof(GF_User));
-
-	/*get Osmo4.exe path*/
-	strcpy((char *) szApplicationPath, AfxGetApp()->m_pszHelpFilePath);
-	while (szApplicationPathstrlen((char *) szApplicationPath)-1 != '\\') szApplicationPathstrlen((char *) szApplicationPath)-1 = 0;
-	if (szApplicationPathstrlen((char *) szApplicationPath)-1 != '\\') strcat(szApplicationPath, "\\");
-
-	gf_sys_init(GF_MemTrackerNone);
-
-	/*setup user*/
-	memset(&m_user, 0, sizeof(GF_User));
-
-	Bool first_launch = GF_FALSE;
-	/*init config and modules*/
-	m_user.config = gf_cfg_init(NULL, &first_launch);
-	if (!m_user.config) {
-		MessageBox(NULL, "GPAC Configuration file not found", "Fatal Error", MB_OK);
-		m_pMainWnd->PostMessage(WM_CLOSE);
-	}
-
-	char *name = gf_cfg_get_filename(m_user.config);
-	char *sep = strrchr(name, '\\');
-	if (sep) sep0 = 0;
-	strcpy(szUserPath, name);
-	if (sep) sep0 = '\\';
-
-	const char *opt = gf_cfg_get_key(m_user.config, "General", "SingleInstance");
-	m_SingleInstance = (opt && !stricmp(opt, "yes")) ? GF_TRUE : GF_FALSE;
-
-	m_hMutex = NULL;
-	if (m_SingleInstance) {
-		m_hMutex = CreateMutex(NULL, FALSE, "Osmo4_GPAC_INSTANCE");
-		if ( GetLastError() == ERROR_ALREADY_EXISTS ) {
-			char szDIR1024;
-			if (m_hMutex) CloseHandle(m_hMutex);
-			m_hMutex = NULL;
-
-			if (!static_gpac_hwnd || !IsWindow(static_gpac_hwnd) ) {
-				::MessageBox(NULL, "Osmo4 ghost process detected", "Error at last shutdown" , MB_OK);
-			} else {
-				::SetForegroundWindow(static_gpac_hwnd);
-
-				if (m_lpCmdLine && strlen(m_lpCmdLine)) {
-					DWORD_PTR res;
-					size_t len;
-					char *the_url, *cmd;
-					GetCurrentDirectory(1024, szDIR);
-					if (szDIRstrlen(szDIR)-1 != '\\') strcat(szDIR, "\\");
-					cmd = (char *)(const char *) m_lpCmdLine;
-					strcpy(static_szCmdLine, "");
-					if (cmd0=='"') cmd+=1;
-
-					if (!strnicmp(cmd, "-queue ", 7)) {
-						strcat(static_szCmdLine, "-queue ");
-						cmd += 7;
-					}
-					the_url = gf_url_concatenate(szDIR, cmd);
-					if (!the_url) {
-						strcat(static_szCmdLine, cmd);
-					} else {
-						strcat(static_szCmdLine, the_url);
-						gf_free(the_url);
-					}
-					while ( (len = strlen(static_szCmdLine)) ) {
-						char s = static_szCmdLinelen-1;
-						if ((s==' ') || (s=='"')) static_szCmdLinelen-1=0;
-						else break;
-					}
-					::SendMessageTimeout(static_gpac_hwnd, WM_NEWINSTANCE, 0, 0, 0, 1000, &res);
-				}
-			}
-
-			return FALSE;
-		}
-	}
-
-#if 0
-	// Standard initialization
-#ifdef _AFXDLL
-	Enable3dControls();			// Call this when using MFC in a shared DLL
-#else
-	Enable3dControlsStatic();	// Call this when linking to MFC statically
-#endif
-
-#endif
-
-	SetRegistryKey(_T("GPAC"));
-	CMainFrame* pFrame = new CMainFrame;
-	m_pMainWnd = pFrame;
-	pFrame->LoadFrame(IDR_MAINFRAME, WS_OVERLAPPEDWINDOW | FWS_ADDTOTITLE, NULL, NULL);
-	pFrame->LoadAccelTable( MAKEINTRESOURCE(IDR_MAINACCEL));
-
-	m_pMainWnd->DragAcceptFiles();
-
-	if (m_SingleInstance) static_gpac_hwnd = m_pMainWnd->m_hWnd;
-
-	m_user.modules = gf_modules_new(NULL, m_user.config);
-	if (!m_user.modules || ! gf_modules_get_count(m_user.modules) ) {
-		MessageBox(NULL, "No modules available - system cannot work", "Fatal Error", MB_OK);
-		m_pMainWnd->PostMessage(WM_CLOSE);
-	}
-	else if (first_launch) {
-		/*first launch, register all files ext*/
-		u32 i;
-		for (i=0; i<gf_modules_get_count(m_user.modules); i++) {
-			GF_InputService *ifce = (GF_InputService *) gf_modules_load_interface(m_user.modules, i, GF_NET_CLIENT_INTERFACE);
-			if (!ifce) continue;
-			if (ifce) {
-				ifce->CanHandleURL(ifce, "test.test");
-				gf_modules_close_interface((GF_BaseInterface *)ifce);
-			}
-		}
-		/*set some shortcuts*/
-		gf_cfg_set_key(m_user.config, "Shortcuts", "VolumeUp", "ctrl+Up");
-		gf_cfg_set_key(m_user.config, "Shortcuts", "VolumeDown", "ctrl+Down");
-		gf_cfg_set_key(m_user.config, "Shortcuts", "FastRewind", "ctrl+Left");
-		gf_cfg_set_key(m_user.config, "Shortcuts", "FastForward", "ctrl+Right");
-		gf_cfg_set_key(m_user.config, "Shortcuts", "Play", "ctrl+ ");
-	}
-
-	/*check log file*/
-	const char *str = gf_cfg_get_key(m_user.config, "General", "LogFile");
-	if (str) {
-		m_logs = gf_fopen(str, "wt");
-		gf_log_set_callback(m_logs, osmo4_do_log);
-	}
-	else m_logs = NULL;
-
-	/*set log level*/
-	if (gf_log_set_tools_levels(gf_cfg_get_key(m_user.config, "General", "Logs")) != GF_OK)
-		fprintf(stdout, "osmo4: invalid log level specified\n");
-
-	m_user.opaque = this;
-	m_user.os_window_handler = pFrame->m_pWndView->m_hWnd;
-	m_user.EventProc = Osmo4_EventProc;
-
-	m_reset = GF_FALSE;
-	orig_width = 320;
-	orig_height = 240;
-
-	gf_set_progress_callback(this, Osmo4_progress_cbk);
-
-	m_term = gf_term_new(&m_user);
-	if (! m_term) {
-		MessageBox(NULL, "Cannot load GPAC Terminal", "Fatal Error", MB_OK);
-		m_pMainWnd->PostMessage(WM_CLOSE);
-		return TRUE;
-	}
-	SetOptions();
-	UpdateRenderSwitch();
-
-	pFrame->SendMessage(WM_SETSIZE, orig_width, orig_height);
-	pFrame->m_Address.ReloadURLs();
-
-	pFrame->m_Sliders.SetVolume();
-
-	m_reconnect_time = 0;
-
-
-	ParseCommandLine(cmdInfo);
-
-	start_mode = 0;
-
-	if (! cmdInfo.m_strFileName.IsEmpty()) {
-		pFrame->m_pPlayList->QueueURL(cmdInfo.m_strFileName);
-		pFrame->m_pPlayList->RefreshList();
-		pFrame->m_pPlayList->PlayNext();
-	} else {
-		char sPLMAX_PATH;
-		strcpy((char *) sPL, szUserPath);
-		strcat(sPL, "gpac_pl.m3u");
-		pFrame->m_pPlayList->OpenPlayList(sPL);
-		const char *sOpt = gf_cfg_get_key(GetApp()->m_user.config, "General", "PLEntry");
-		if (sOpt) {
-			s32 count = (s32)gf_list_count(pFrame->m_pPlayList->m_entries);
-			pFrame->m_pPlayList->m_cur_entry = atoi(sOpt);
-			if (pFrame->m_pPlayList->m_cur_entry>=count)
-				pFrame->m_pPlayList->m_cur_entry = count-1;
-		} else {
-			pFrame->m_pPlayList->m_cur_entry = -1;
-		}
-#if 0
-		if (pFrame->m_pPlayList->m_cur_entry>=0) {
-			start_mode = 1;
-			pFrame->m_pPlayList->Play();
-		}
-#endif
-
-		sOpt = gf_cfg_get_key(m_user.config, "General", "StartupFile");
-		if (sOpt && !strstr(sOpt, "gui") ) gf_term_connect(m_term, sOpt);
-
-		sOpt = gf_cfg_get_key(m_user.config, "General", "PlaylistLoop");
-		m_Loop = (sOpt && !strcmp(sOpt, "yes")) ? GF_TRUE : GF_FALSE;
-	}
-	pFrame->SetFocus();
-	pFrame->SetForegroundWindow();
-	return TRUE;
-}
-
-int Osmo4::ExitInstance()
-{
-	if (m_term) gf_term_del(m_term);
-	if (m_user.modules) gf_modules_del(m_user.modules);
-	if (m_user.config) gf_cfg_del(m_user.config);
-	gf_sys_close();
-	/*last instance*/
-	if (m_hMutex) {
-		CloseHandle(m_hMutex);
-		static_gpac_hwnd = NULL;
-	}
-	if (m_logs) gf_fclose(m_logs);
-	return CWinApp::ExitInstance();
-}
-
-
-
-/////////////////////////////////////////////////////////////////////////////
-// Osmo4 message handlers
-
-
-
-
-
-/////////////////////////////////////////////////////////////////////////////
-// CAboutDlg dialog used for App About
-
-class CAboutDlg : public CDialog
-{
-public:
-	CAboutDlg();
-
-// Dialog Data
-	//{{AFX_DATA(CAboutDlg)
-	enum { IDD = IDD_ABOUTBOX };
-	//}}AFX_DATA
-
-	// ClassWizard generated virtual function overrides
-	//{{AFX_VIRTUAL(CAboutDlg)
-protected:
-	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
-	//}}AFX_VIRTUAL
-
-// Implementation
-protected:
-	//{{AFX_MSG(CAboutDlg)
-	virtual BOOL OnInitDialog();
-	afx_msg void OnGogpac();
-	//}}AFX_MSG
-	DECLARE_MESSAGE_MAP()
-};
-
-CAboutDlg::CAboutDlg() : CDialog(CAboutDlg::IDD)
-{
-	//{{AFX_DATA_INIT(CAboutDlg)
-	//}}AFX_DATA_INIT
-}
-
-void CAboutDlg::DoDataExchange(CDataExchange* pDX)
-{
-	CDialog::DoDataExchange(pDX);
-	//{{AFX_DATA_MAP(CAboutDlg)
-	//}}AFX_DATA_MAP
-}
-
-BEGIN_MESSAGE_MAP(CAboutDlg, CDialog)
-	//{{AFX_MSG_MAP(CAboutDlg)
-	ON_BN_CLICKED(IDC_GOGPAC, OnGogpac)
-	//}}AFX_MSG_MAP
-END_MESSAGE_MAP()
-
-void Osmo4::OnAbout()
-{
-	CAboutDlg aboutDlg;
-	aboutDlg.DoModal();
-}
-
-BOOL CAboutDlg::OnInitDialog()
-{
-	CDialog::OnInitDialog();
-	CString str = "GPAC/Osmo4 - version " GPAC_FULL_VERSION;
-	SetWindowText(str);
-	return TRUE;
-}
-
-void CAboutDlg::OnGogpac()
-{
-	ShellExecute(NULL, "open", "http://gpac.io", NULL, NULL, SW_SHOWNORMAL);
-}
-
-/////////////////////////////////////////////////////////////////////////////
-// Osmo4 message handlers
-
-
-void Osmo4::SetOptions()
-{
-	const char *sOpt = gf_cfg_get_key(m_user.config, "General", "Loop");
-	m_Loop = (sOpt && !stricmp(sOpt, "yes")) ? GF_TRUE : GF_FALSE;
-	sOpt = gf_cfg_get_key(m_user.config, "General", "LookForSubtitles");
-	m_LookForSubtitles = (sOpt && !stricmp(sOpt, "yes")) ? GF_TRUE : GF_FALSE;
-	sOpt = gf_cfg_get_key(m_user.config, "General", "ConsoleOff");
-	m_NoConsole = (sOpt && !stricmp(sOpt, "yes")) ? GF_TRUE : GF_FALSE;
-	sOpt = gf_cfg_get_key(m_user.config, "General", "ViewXMT");
-	m_ViewXMTA  = (sOpt && !stricmp(sOpt, "yes")) ? GF_TRUE : GF_FALSE;
-	sOpt = gf_cfg_get_key(m_user.config, "General", "NoMIMETypeFetch");
-	m_NoMimeFetch = (!sOpt || !stricmp(sOpt, "yes")) ? GF_TRUE : GF_FALSE;
-}
-
-
-void Osmo4::OnOpenUrl()
-{
-	COpenUrl url;
-	if (url.DoModal() != IDOK) return;
-
-	CMainFrame *pFrame = (CMainFrame *) m_pMainWnd;
-	pFrame->m_pPlayList->Truncate();
-	pFrame->m_pPlayList->QueueURL(url.m_url);
-	pFrame->m_pPlayList->RefreshList();
-	pFrame->m_pPlayList->PlayNext();
-}
-
-
-CString Osmo4::GetFileFilter()
-{
-	u32 keyCount, i;
-	CString sFiles;
-	CString sExts;
-	CString supportedFiles;
-
-	/*force MP4 and 3GP files at beginning to make sure they are selected (Win32 bug with too large filters)*/
-	supportedFiles = "All Known Files|*.m3u;*.pls;*.mp4;*.3gp;*.3g2";
-
-	sExts = "";
-	sFiles = "";
-	keyCount = gf_cfg_get_key_count(m_user.config, "MimeTypes");
-	for (i=0; i<keyCount; i++) {
-		const char *sMime;
-		Bool first;
-		char *sKey;
-		const char *opt;
-		char szKeyList1000, sDesc1000;
-		sMime = gf_cfg_get_key_name(m_user.config, "MimeTypes", i);
-		if (!sMime) continue;
-		CString sOpt;
-		opt = gf_cfg_get_key(m_user.config, "MimeTypes", sMime);
-		/*remove module name*/
-		strcpy(szKeyList, opt+1);
-		sKey = strrchr(szKeyList, '\"');
-		if (!sKey) continue;
-		sKey0 = 0;
-		/*get description*/
-		sKey = strrchr(szKeyList, '\"');
-		if (!sKey) continue;
-		strcpy(sDesc, sKey+1);
-		sKey0 = 0;
-		sKey = strrchr(szKeyList, '\"');
-		if (!sKey) continue;
-		sKey0 = 0;
-
-		/*if same description for # mime types skip (means an old mime syntax)*/
-		if (sFiles.Find(sDesc)>=0) continue;
-		/*if same extensions for # mime types skip (don't polluate the file list)*/
-		if (sExts.Find(szKeyList)>=0) continue;
-
-		sExts += szKeyList;
-		sExts += " ";
-		sFiles += sDesc;
-		sFiles += "|";
-
-		first = GF_TRUE;
-
-		sOpt = CString(szKeyList);
-		while (1) {
-
-			int pos = sOpt.Find(' ');
-			CString ext = (pos==-1) ? sOpt : sOpt.Left(pos);
-			/*WATCHOUT: we do have some "double" ext , eg .wrl.gz - these are NOT supported by windows*/
-			if (ext.Find(".")<0) {
-				if (!first) {
-					sFiles += ";";
-				} else {
-					first = GF_FALSE;
-				}
-				sFiles += "*.";
-				sFiles += ext;
-
-				CString sext = ext;
-				sext += ";";
-				if (supportedFiles.Find(sext)<0) {
-					supportedFiles += ";*.";
-					supportedFiles += ext;
-				}
-			}
-
-			if (sOpt==ext) break;
-			CString rem;
-			rem.Format("%s ", (LPCTSTR) ext);
-			sOpt.Replace((LPCTSTR) rem, "");
-		}
-		sFiles += "|";
-	}
-	supportedFiles += "|";
-	supportedFiles += sFiles;
-	supportedFiles += "M3U Playlists|*.m3u|ShoutCast Playlists|*.pls|All Files |*.*|";
-	return supportedFiles;
-}
-
-void Osmo4::OnOpenFile()
-{
-	CString sFiles = GetFileFilter();
-	u32 nb_items;
-
-	/*looks like there's a bug here, main filter isn't used correctly while the others are*/
-	CFileDialog fd(TRUE,NULL,NULL, OFN_ALLOWMULTISELECT | OFN_HIDEREADONLY | OFN_FILEMUSTEXIST , sFiles);
-	fd.m_ofn.nMaxFile = 25000;
-	fd.m_ofn.lpstrFile = (char *) gf_malloc(sizeof(char) * fd.m_ofn.nMaxFile);
-	fd.m_ofn.lpstrFile0 = 0;
-
-	if (fd.DoModal()!=IDOK) {
-		gf_free(fd.m_ofn.lpstrFile);
-		return;
-	}
-
-	CMainFrame *pFrame = (CMainFrame *) m_pMainWnd;
-
-	nb_items = 0;
-	POSITION pos = fd.GetStartPosition();
-	while (pos) {
-		CString file = fd.GetNextPathName(pos);
-		nb_items++;
-	}
-	/*if several items, act as playlist (replace playlist), otherwise as browser (lost all "next" context)*/
-	if (nb_items==1)
-		pFrame->m_pPlayList->Truncate();
-	else
-		pFrame->m_pPlayList->Clear();
-
-	pos = fd.GetStartPosition();
-	while (pos) {
-		CString file = fd.GetNextPathName(pos);
-		pFrame->m_pPlayList->QueueURL(file);
-	}
-	gf_free(fd.m_ofn.lpstrFile);
-	pFrame->m_pPlayList->RefreshList();
-	pFrame->m_pPlayList->PlayNext();
-}
-
-
-void Osmo4::Pause()
-{
-	if (!m_isopen) return;
-	gf_term_set_option(m_term, GF_OPT_PLAY_STATE, (gf_term_get_option(m_term, GF_OPT_PLAY_STATE)==GF_STATE_PLAYING) ? GF_STATE_PAUSED : GF_STATE_PLAYING);
-}
-
-void Osmo4::OnMainPause()
-{
-	Pause();
-}
-
-void Osmo4::OnFileStep()
-{
-	gf_term_set_option(m_term, GF_OPT_PLAY_STATE, GF_STATE_STEP_PAUSE);
-	((CMainFrame *) m_pMainWnd)->m_wndToolBar.SetButtonInfo(5, ID_FILE_PLAY, TBBS_BUTTON, 3);
-}
-void Osmo4::OnUpdateFileStep(CCmdUI* pCmdUI)
-{
-	pCmdUI->Enable(m_isopen && !m_reset);
-}
-
-void Osmo4::PlayFromTime(u32 time)
-{
-	Bool do_pause;
-	if (start_mode==1) do_pause = GF_TRUE;
-	else if (start_mode==2) do_pause = GF_FALSE;
-	else do_pause = /*!m_AutoPlay*/GF_FALSE;
-	gf_term_play_from_time(m_term, time, do_pause);
-	m_reset = GF_FALSE;
-}
-
-
-void Osmo4::OnFileReload()
-{
-	gf_term_disconnect(m_term);
-	m_pMainWnd->PostMessage(WM_OPENURL);
-}
-
-void Osmo4::OnFileMigrate()
-{
-}
-
-void Osmo4::OnConfigReload()
-{
-	gf_term_set_option(m_term, GF_OPT_RELOAD_CONFIG, 1);
-}
-
-void Osmo4::UpdatePlayButton(Bool force_play)
-{
-	if (!force_play && gf_term_get_option(m_term, GF_OPT_PLAY_STATE)==GF_STATE_PLAYING) {
-		((CMainFrame *) m_pMainWnd)->m_wndToolBar.SetButtonInfo(5, ID_FILE_PLAY, TBBS_BUTTON, 4);
-	} else {
-		((CMainFrame *) m_pMainWnd)->m_wndToolBar.SetButtonInfo(5, ID_FILE_PLAY, TBBS_BUTTON, 3);
-	}
-}
-
-void Osmo4::OnFilePlay()
-{
-	if (m_isopen) {
-		if (m_reset) {
-			m_reset = GF_FALSE;
-			PlayFromTime(0);
-			((CMainFrame *)m_pMainWnd)->SetProgTimer(GF_TRUE);
-		} else {
-			Pause();
-		}
-		UpdatePlayButton();
-	} else {
-		((CMainFrame *) m_pMainWnd)->m_pPlayList->Play();
-	}
-}
-
-void Osmo4::OnUpdateFilePlay(CCmdUI* pCmdUI)
-{
-	if (m_isopen) {
-		pCmdUI->Enable(TRUE);
-		if (pCmdUI->m_nID==ID_FILE_PLAY) {
-			if (!m_isopen) {
-				pCmdUI->SetText("Play/Pause\tCtrl+P");
-			} else if (gf_term_get_option(m_term, GF_OPT_PLAY_STATE)==GF_STATE_PLAYING) {
-				pCmdUI->SetText("Pause\tCtrl+P");
-			} else {
-				pCmdUI->SetText("Resume\tCtrl+P");
-			}
-		}
-	} else {
-		pCmdUI->Enable(((CMainFrame *)m_pMainWnd)->m_pPlayList->HasValidEntries() );
-		pCmdUI->SetText("Play\tCtrl+P");
-	}
-}
-
-void Osmo4::OnFileStop()
-{
-	CMainFrame *pFrame = (CMainFrame *) m_pMainWnd;
-	if (m_reset) return;
-	if (gf_term_get_option(m_term, GF_OPT_PLAY_STATE)==GF_STATE_PLAYING) Pause();
-	m_reset = GF_TRUE;
-	pFrame->m_Sliders.m_PosSlider.SetPos(0);
-	pFrame->SetProgTimer(GF_FALSE);
-	pFrame->m_wndToolBar.SetButtonInfo(5, ID_FILE_PLAY, TBBS_BUTTON, 3);
-	start_mode = 2;
-}
-
-void Osmo4::OnUpdateFileStop(CCmdUI* pCmdUI)
-{
-//	pCmdUI->Enable(m_isopen);
-}
-
-void Osmo4::OnSwitchRender()
-{
-	const char *opt = gf_cfg_get_key(m_user.config, "Compositor", "OpenGLMode");
-	Bool use_gl = (opt && !stricmp(opt, "always")) ? GF_TRUE : GF_FALSE;
-	gf_cfg_set_key(m_user.config, "Compositor", "OpenGLMode", use_gl ? "disable" : "always");
-
-	gf_term_set_option(m_term, GF_OPT_USE_OPENGL, !use_gl);
-
-	UpdateRenderSwitch();
-}
-
-void Osmo4::UpdateRenderSwitch()
-{
-	const char *opt = gf_cfg_get_key(m_user.config, "Compositor", "OpenGLMode");
-	if (opt && !stricmp(opt, "disable"))
-		((CMainFrame *) m_pMainWnd)->m_wndToolBar.SetButtonInfo(12, ID_SWITCH_RENDER, TBBS_BUTTON, 10);
-	else
-		((CMainFrame *) m_pMainWnd)->m_wndToolBar.SetButtonInfo(12, ID_SWITCH_RENDER, TBBS_BUTTON, 9);
-}

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/osmo4_w32/Osmo4.h Deleted

@@ -1,115 +0,0 @@
-// GPAC.h : main header file for the GPAC application
-//
-
-#if !defined(AFX_GPAC_H__8B06A368_E142_47E3_ABE7_0B459FC0E853__INCLUDED_)
-#define AFX_GPAC_H__8B06A368_E142_47E3_ABE7_0B459FC0E853__INCLUDED_
-
-#if _MSC_VER > 1000
-#pragma once
-#endif // _MSC_VER > 1000
-
-#ifndef __AFXWIN_H__
-#error include 'stdafx.h' before including this file for PCH
-#endif
-
-#include "resource.h"       // main symbols
-
-/////////////////////////////////////////////////////////////////////////////
-// Osmo4:
-// See GPAC.cpp for the implementation of this class
-//
-
-
-/*GPAC terminal*/
-#include <gpac/terminal.h>
-/*GPAC terminal info (OD browsing)*/
-#include <gpac/term_info.h>
-
-enum {
-	WM_SCENE_DONE = WM_USER + 1,
-	WM_NAVIGATE,
-	WM_SETSIZE,
-	WM_OPENURL,
-	WM_RESTARTURL,
-	WM_CONSOLEMSG,
-	WM_NEWINSTANCE,
-};
-
-const char *static_gpac_get_url();
-
-class Osmo4 : public CWinApp
-{
-public:
-	Osmo4();
-
-	GF_Terminal *m_term;
-	GF_User m_user;
-
-	Bool m_isopen, m_reset;
-	u32 max_duration;
-	Bool can_seek;
-	u32 orig_width,orig_height, m_reconnect_time;
-
-	CString m_navigate_url;
-	void Pause();
-	void PlayFromTime(u32 time);
-
-	void SetOptions();
-	void UpdateRenderSwitch();
-	void UpdatePlayButton(Bool force_play = GF_FALSE);
-
-	/*general options*/
-	Bool m_Loop, m_LookForSubtitles, m_NoConsole, m_ViewXMTA, m_SingleInstance, m_NoMimeFetch;
-	u32 start_mode;
-
-	CString GetFileFilter();
-
-	char szApplicationPathGF_MAX_PATH;
-	char szUserPathGF_MAX_PATH;
-
-	FILE *m_logs;
-
-	HANDLE m_hMutex;
-
-// Overrides
-	// ClassWizard generated virtual function overrides
-	//{{AFX_VIRTUAL(Osmo4)
-public:
-	virtual BOOL InitInstance();
-	virtual int ExitInstance();
-	//}}AFX_VIRTUAL
-
-// Implementation
-
-public:
-	//{{AFX_MSG(Osmo4)
-	afx_msg void OnOpenFile();
-	afx_msg void OnMainPause();
-	afx_msg void OnFileStep();
-	afx_msg void OnOpenUrl();
-	afx_msg void OnFileReload();
-	afx_msg void OnFileMigrate();
-	afx_msg void OnConfigReload();
-	afx_msg void OnFilePlay();
-	afx_msg void OnUpdateFilePlay(CCmdUI* pCmdUI);
-	afx_msg void OnUpdateFileStep(CCmdUI* pCmdUI);
-	afx_msg void OnFileStop();
-	afx_msg void OnUpdateFileStop(CCmdUI* pCmdUI);
-	afx_msg void OnSwitchRender();
-	afx_msg void OnAbout();
-	//}}AFX_MSG
-	DECLARE_MESSAGE_MAP()
-};
-
-inline Osmo4 *GetApp() {
-	return (Osmo4 *)AfxGetApp();
-}
-
-
-
-/////////////////////////////////////////////////////////////////////////////
-
-//{{AFX_INSERT_LOCATION}}
-// Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_GPAC_H__8B06A368_E142_47E3_ABE7_0B459FC0E853__INCLUDED_)

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/osmo4_w32/Osmo4.rc Deleted

@@ -1,885 +0,0 @@
-// Microsoft Visual C++ generated resource script.
-//
-#include "resource.h"
-
-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
-#include "afxres.h"
-
-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
-
-/////////////////////////////////////////////////////////////////////////////
-// English (United States) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-#pragma code_page(1252)
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Menu
-//
-
-IDR_MAINFRAME MENU
-BEGIN
-    POPUP "&File"
-    BEGIN
-        MENUITEM "&Open File\tCtrl+O",          ID_OPEN_FILE
-        MENUITEM "Open &URL\tCtrl+U",           ID_OPEN_URL
-        MENUITEM SEPARATOR
-        MENUITEM "File Propert&ies\tCtrl+I",    ID_FILE_PROP
-        POPUP "Streaming Cache"
-        BEGIN
-            MENUITEM "&Enable",                     ID_REC_ENABLE
-            MENUITEM "&Stop and Save",              ID_REC_STOP
-            MENUITEM "&Abort",                      ID_REC_ABORT
-        END
-        MENUITEM SEPARATOR
-        MENUITEM "Copy",                        ID_FILE_COPY
-        MENUITEM "Paste",                       ID_FILE_PASTE
-        MENUITEM SEPARATOR
-        MENUITEM "Exit",                        ID_FILE_EXIT
-    END
-    POPUP "View"
-    BEGIN
-        POPUP "Viewpoint"
-        BEGIN
-            MENUITEM "",                            ID_VIEWPORT_EMPTY
-        END
-        POPUP "&Navigation"
-        BEGIN
-            MENUITEM "Headlight",                   ID_HEADLIGHT
-            MENUITEM SEPARATOR
-            MENUITEM "&None",                       ID_NAVIGATE_NONE
-            MENUITEM "&Walk",                       ID_NAVIGATE_WALK
-            MENUITEM "&Fly",                        ID_NAVIGATE_FLY
-            MENUITEM "&Examine",                    ID_NAVIGATE_EXAM
-            MENUITEM "&Pan",                        ID_NAVIGATE_PAN
-            MENUITEM "&Slide",                      ID_NAVIGATE_SLIDE
-            MENUITEM "&Orbit",                      ID_NAVIGATE_ORBIT
-            MENUITEM "&VR",                         ID_NAVIGATE_VR
-            MENUITEM "&Game",                       ID_NAVIGATE_GAME
-            MENUITEM SEPARATOR
-            POPUP "Collision"
-            BEGIN
-                MENUITEM "Off",                         ID_COLLIDE_NONE
-                MENUITEM "Regular",                     ID_COLLIDE_REG
-                MENUITEM "Displacement",                ID_COLLIDE_DISP
-            END
-            MENUITEM "Gravity",                     ID_GRAVITY
-            MENUITEM SEPARATOR
-            MENUITEM "&Reset",                      ID_NAV_RESET
-        END
-        MENUITEM SEPARATOR
-        MENUITEM "&Fullscreen",                 ID_VIEW_FULLSCREEN
-        MENUITEM "Original &Aspect",            ID_VIEW_ORIGINAL
-        POPUP "Aspect &Ratio"
-        BEGIN
-            MENUITEM "&Keep Original",              ID_AR_KEEP
-            MENUITEM "&Fill Screen",                ID_AR_FILL
-            MENUITEM "Ratio 4/3",                   ID_AR_43
-            MENUITEM "Ratio 16/9",                  ID_AR_169
-        END
-        MENUITEM SEPARATOR
-        MENUITEM "Resource Usage",              ID_VIEW_CPU
-        MENUITEM SEPARATOR
-        MENUITEM "&Options",                    IDD_CONFIGURE
-    END
-    POPUP "Play"
-    BEGIN
-        POPUP "Stream &Selection"
-        BEGIN
-            POPUP "Audio"
-            BEGIN
-                MENUITEM "",                            ID_AUDIO_EMPTY
-            END
-            POPUP "Video"
-            BEGIN
-                MENUITEM "",                            ID_VIDEO_EMPTY
-            END
-            POPUP "Subtitle"
-            BEGIN
-                MENUITEM "",                            ID_SUBS_EMPTY
-            END
-            MENUITEM SEPARATOR
-            MENUITEM "Add Subtitle",                ID_ADD_SUBTITLE
-        END
-        POPUP "&Chapters"
-        BEGIN
-            MENUITEM "",                            ID_SETCHAP_FIRST
-        END
-        MENUITEM SEPARATOR
-        MENUITEM "Playlist\tF3",                ID_VIEW_PL, CHECKED
-        MENUITEM "&Loop Playlist",              ID_PLAYLIST_LOOP
-        MENUITEM SEPARATOR
-        MENUITEM "Play/Pause\tCtrl+P",          ID_FILE_PLAY
-        MENUITEM "Step-by-Step\tCtrl+S",        ID_FILE_STEP
-        MENUITEM "Stop",                        ID_FILE_STOP
-        MENUITEM SEPARATOR
-        MENUITEM "Reload File\tF5",             ID_FILE_RELOAD
-        MENUITEM SEPARATOR
-        MENUITEM "Clear History",               ID_CLEAR_NAV
-        MENUITEM "Reload Config",               ID_CONFIG_RELOAD
-    END
-    POPUP "?"
-    BEGIN
-        MENUITEM "Shortcut List",               ID_SHORTCUTS
-        MENUITEM "Navigation Keys",             ID_NAV_INFO
-        MENUITEM SEPARATOR
-        MENUITEM "&About ...",                  ID_H_ABOUT
-    END
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog
-//
-
-IDD_ABOUTBOX DIALOGEX 0, 0, 209, 137
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-EXSTYLE WS_EX_CLIENTEDGE
-CAPTION "Osmo4 / GPAC version X.X.X"
-FONT 8, "MS Sans Serif", 0, 0, 0x1
-BEGIN
-    ICON            IDR_MAINFRAME,IDC_STATIC,8,4,20,20
-    CTEXT           "Osmo4 Player - GPAC Multimedia Framework",IDC_STATIC,31,10,150,10,SS_NOPREFIX
-    CTEXT           "(c) 2000-2013 Telecom ParisTech\nAll Rights Reserved",IDC_STATIC,4,64,201,18
-    CTEXT           "This program is free software and may be distributed according to the terms of the GNU Lesser General Public License",IDC_STATIC,4,26,200,18
-    PUSHBUTTON      "http://gpac.io",IDC_GOGPAC,43,47,121,13,BS_FLAT,WS_EX_STATICEDGE
-    GROUPBOX        "With Many Thanks To:",IDC_STATIC,3,82,203,53
-    CTEXT           "The FreeType Project\nMozilla SpiderMonkey (JavaScript support)\n\nZLIB, the PNG Group, the I.J.G.\nFFMPEG, FAAD, XVID, MAD",IDC_STATIC,9,92,189,41
-END
-
-IDD_PASSWD DIALOG 0, 0, 134, 71
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Enter user name and password"
-FONT 8, "MS Sans Serif"
-BEGIN
-    DEFPUSHBUTTON   "OK",IDOK,4,56,50,12
-    PUSHBUTTON      "Cancel",IDCANCEL,80,56,50,12
-    LTEXT           "Static__________________________",IDC_TXT_SITE,25,4,105,8
-    LTEXT           "Login",IDC_STATIC,7,21,18,8
-    LTEXT           "Password",IDC_STATIC,7,37,32,8
-    EDITTEXT        IDC_EDIT_USER,47,18,55,14,ES_AUTOHSCROLL
-    EDITTEXT        IDC_EDIT_PASSWORD,47,34,55,14,ES_PASSWORD | ES_AUTOHSCROLL
-    LTEXT           "Site",IDC_STATIC,7,4,13,8
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,0,0,1
- PRODUCTVERSION 1,0,0,1
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x4L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904b0"
-        BEGIN
-            VALUE "FileDescription", "Osmo4-GPAC"
-		VALUE "FileVersion", "0.8.0"
-            VALUE "InternalName", "Osmo4"
-            VALUE "LegalCopyright", "Copyright (C) Telecom ParisTech 2005-2012"
-            VALUE "OriginalFilename", "Osmo4.EXE"
-            VALUE "ProductName", "Osmo4-GPAC"
-		VALUE "ProductVersion", "0.8.0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// DESIGNINFO
-//
-
-#ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO
-BEGIN
-    IDD_ABOUTBOX, DIALOG
-    BEGIN
-        BOTTOMMARGIN, 136
-    END
-END
-#endif    // APSTUDIO_INVOKED
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Toolbar
-//
-
-IDR_MAINTOOLS TOOLBAR 16, 15
-BEGIN
-    BUTTON      ID_OPEN_FILE
-    BUTTON      ID_NAV_PREV
-    BUTTON      ID_NAV_NEXT
-    BUTTON      ID_FILE_PLAY
-    BUTTON      ID_FILE_PLAY
-    BUTTON      ID_FILE_STEP
-    BUTTON      ID_FILE_STOP
-    BUTTON      ID_FILE_PROPS
-    BUTTON      IDD_CONFIGURE
-    BUTTON      ID_SWITCH_RENDER
-    BUTTON      ID_SWITCH_RENDER
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Bitmap
-//
-
-IDR_MAINTOOLS           BITMAP                  "res\\maintool.bmp"
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// String Table
-//
-
-STRINGTABLE
-BEGIN
-    IDR_MAINFRAME           "Osmo4"
-END
-
-STRINGTABLE
-BEGIN
-    AFX_IDS_APP_TITLE       "Osmo4"
-    AFX_IDS_IDLEMESSAGE     "Ready"
-END
-
-STRINGTABLE
-BEGIN
-    ID_FILE_EXIT            "Quit the application; prompts to save documents\nExit"
-    ID_H_ABOUT              "Display program information, version number and copyright\nAbout"
-    ID_PLAYLIST_LOOP        "Restarts playlist from beginning when playlist is over"
-    ID_OPEN_FILE             "Opens local file"
-    ID_VIEW_ORIGINAL        "restore Original Aspect of presentation"
-END
-
-STRINGTABLE
-BEGIN
-    ID_VIEW_STATUS_BAR      "Show or hide the status bar\nToggle StatusBar"
-END
-
-STRINGTABLE
-BEGIN
-    AFX_IDS_SCSIZE          "Change the window size"
-    AFX_IDS_SCMOVE          "Change the window position"
-    AFX_IDS_SCMINIMIZE      "Reduce the window to an icon"
-    AFX_IDS_SCMAXIMIZE      "Enlarge the window to full size"
-    AFX_IDS_SCNEXTWINDOW    "Switch to the next document window"
-    AFX_IDS_SCPREVWINDOW    "Switch to the previous document window"
-    AFX_IDS_SCCLOSE         "Close the active window and prompts to save the documents"
-END
-
-STRINGTABLE
-BEGIN
-    AFX_IDS_SCRESTORE       "Restore the window to normal size"
-    AFX_IDS_SCTASKLIST      "Activate Task List"
-END
-
-STRINGTABLE
-BEGIN
-    ID_FILE_STOP            "Stops current presentation"
-    ID_SWITCH_RENDER        "Switch between 2D and 3D renderers"
-    ID_COLLIDE_NONE         "Turns collision detection off"
-    ID_COLLIDE_REG          "Turns collision detection on"
-    ID_COLLIDE_DISP         "Collision with camera displacement"
-    ID_HEADLIGHT            "Turns headlight on/off"
-END
-
-STRINGTABLE
-BEGIN
-    ID_CLEAR_NAV            "Clears navigation history"
-    ID_TIMER                " "
-    ID_FPS                  " "
-    ID_VIEW_PL              "View navigation history as a playlist"
-END
-
-STRINGTABLE
-BEGIN
-    ID_VIEW_FULLSCREEN      "Move to Full Screen mode (Esc to exit)"
-    ID_AR_KEEP              "Keep Aspect Ratio of presentation"
-    ID_SHORTCUTS            "List of available shortcuts"
-    ID_FILE_PROP            "Show presentation properties"
-    ID_FILE_STEP            "Step one frame into presentation"
-    IDD_CONFIGURE           "Configure Player"
-    ID_VIEW_SCALABLE        "Uses vectorial zooming when resizing the window"
-    ID_OPEN_URL             "Open remote presentation"
-    ID_FILE_RELOAD          "Reload current presentation"
-    ID_FILE_PLAY            "Play/Pause presentation"
-    ID_NAVIGATE_NONE        "Disable navigation"
-END
-
-STRINGTABLE
-BEGIN
-    ID_NAVIGATE_WALK        "Turn walk navigation on"
-    ID_AR_FILL              "Ignores Aspect Ratio and always fill screen"
-    ID_AR_43                "Forces Aspect Ratio of 4/3"
-    ID_AR_169               "Forces Aspect Ratio of 16/9"
-    ID_NAV_RESET            "Restore last viewpoint"
-END
-
-STRINGTABLE
-BEGIN
-    ID_NAVIGATE_VR          "QT-VR like navigation"
-    ID_REC_ENABLE           "Enable recording of streaming data"
-    ID_REC_STOP             "Stops recording and save to file"
-    ID_REC_ABORT            "Stops recording and discard data"
-END
-
-STRINGTABLE
-BEGIN
-    ID_FILE_COPY            "Copy selected text to clipboard"
-    ID_FILE_PASTE           "Paste clipboard"
-END
-
-#endif    // English (United States) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-/////////////////////////////////////////////////////////////////////////////
-// French (France) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_FRA)
-LANGUAGE LANG_FRENCH, SUBLANG_FRENCH
-#pragma code_page(1252)
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog
-//
-
-IDD_OPENFILE DIALOG 0, 0, 301, 23
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Select Location"
-FONT 8, "MS Sans Serif"
-BEGIN
-    COMBOBOX        IDC_COMBOURL,3,5,273,67,CBS_DROPDOWN | CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP
-    DEFPUSHBUTTON   "OK",IDC_BUTGO,279,5,19,13
-END
-
-IDD_OPTIONS DIALOG 0, 0, 174, 106
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Osmo4 Options"
-FONT 8, "MS Sans Serif"
-BEGIN
-    PUSHBUTTON      "Apply",IDC_SAVEOPT,147,2,26,12
-    COMBOBOX        IDC_SELECT,42,2,99,173,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT           "Category",IDC_STATIC,7,4,29,8
-END
-
-IDD_OPT_GEN DIALOG 0, 20, 169, 76
-STYLE DS_SETFONT | DS_MODALFRAME | DS_CONTROL | WS_CHILD
-FONT 8, "MS Sans Serif"
-BEGIN
-    CONTROL         "Loop At End",IDC_LOOP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,4,55,10
-    CONTROL         "Look for subtitles",IDC_LOOKFORSUB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,42,69,10
-    CONTROL         "Disable console messages",IDC_NO_CONSOLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,17,99,10
-    CONTROL         "View Graph in XMT-A format",IDC_DUMP_XMT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,30,105,10
-    CONTROL         "Single Instance",IDC_SINGLE_INSTANCE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,54,65,10
-END
-
-IDD_OPT_RENDER DIALOG 0, 20, 169, 76
-STYLE DS_SETFONT | DS_MODALFRAME | DS_CONTROL | WS_CHILD
-FONT 8, "MS Sans Serif"
-BEGIN
-    LTEXT           "Rendering Frame Rate",IDC_STATIC,5,4,72,8
-    COMBOBOX        IDC_BIFS_RATE,81,2,84,55,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    CONTROL         "Fast Rendering",IDC_FAST_RENDER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,49,64,10
-    CONTROL         "Force Scene Size",IDC_FORCE_SIZE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,96,49,72,10
-    LTEXT           "Anti-Aliasing Level",IDC_STATIC,7,20,58,8
-    COMBOBOX        IDC_AA_LIST,81,17,84,46,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    CONTROL         "Use 3D Renderer",IDC_USE_RENDER3D,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,63,71,10
-    LTEXT           "2D Rasterizer",IDC_STATIC,7,35,44,8
-    COMBOBOX        IDC_GD_LIST,81,33,84,44,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    COMBOBOX        IDC_DRAW_BOUNDS,109,60,56,44,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT           "Bounds",IDC_STATIC,82,64,25,8
-END
-
-IDD_OPT_AUDIO DIALOG 0, 20, 169, 76
-STYLE DS_SETFONT | DS_CONTROL | WS_CHILD | WS_THICKFRAME
-FONT 8, "MS Sans Serif"
-BEGIN
-    CONTROL         "Spin1",IDC_SPIN_AUDIO,"msctls_updown32",UDS_SETBUDDYINT | UDS_ARROWKEYS,27,15,11,14
-    EDITTEXT        IDC_EDIT_AUDIO,5,15,19,14,ES_READONLY | ES_NUMBER
-    CONTROL         "Force Audio Config",IDC_FORCE_AUDIO,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,3,73,10
-    LTEXT           "buffers",IDC_STATIC,43,18,23,8
-    CONTROL         "Spin1",IDC_SPIN_FPS,"msctls_updown32",UDS_SETBUDDYINT | UDS_ARROWKEYS,104,15,11,14
-    EDITTEXT        IDC_AUDIO_FPS,77,15,24,14,ES_NUMBER
-    LTEXT           "Audio Driver",IDC_STATIC,7,63,40,8
-    CONTROL         "No Resynchronization",IDC_AUDIO_RESYNC,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,46,82,10
-    COMBOBOX        IDC_DRIVER_LIST,63,60,103,62,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    CONTROL         "Disable Notifications",IDC_AUDIO_NOTIFS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,89,47,79,10
-    CONTROL         "Disable Multichannel",IDC_AUDIO_MULTICH,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,34,81,10
-    LTEXT           "ms total length",IDC_STATIC,118,18,49,8
-END
-
-IDD_OPT_VIDEO DIALOG 0, 20, 169, 76
-STYLE DS_SETFONT | DS_MODALFRAME | DS_CONTROL | WS_CHILD
-FONT 8, "MS Sans Serif"
-BEGIN
-    LTEXT           "Video Driver",IDC_STATIC,6,7,40,8
-    COMBOBOX        IDC_VIDEO_LIST,55,5,111,44,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    CONTROL         "Change video resolution in fullscreen",IDC_SWITCH_RES,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,5,29,131,10
-    CONTROL         "Use Hardware Video Memory in 2D mode",IDC_HWMEMORY,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,5,44,143,10
-END
-
-IDD_OPT_HTTP DIALOGEX 0, 20, 169, 76
-STYLE DS_SETFONT | DS_MODALFRAME | DS_CONTROL | WS_CHILD
-FONT 8, "MS Sans Serif", 0, 0, 0x0
-BEGIN
-    PUSHBUTTON      "...",IDC_BROWSE_CACHE,57,4,109,12
-    CONTROL         "Clean cache at exit",IDC_CLEAN_CACHE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,87,23,77,10
-    CONTROL         "Disable Cache",IDC_RESTART_CACHE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,3,22,62,10
-    LTEXT           "Cache Directory",IDC_STATIC,5,5,52,8
-    CONTROL         "XML progressive load",IDC_SAX_PROGRESSIVE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,3,42,84,10
-    EDITTEXT        IDC_SAX_DELAY,142,41,22,12,ES_CENTER | ES_AUTOHSCROLL | ES_NUMBER
-    LTEXT           "TimeSlice (ms)",IDC_STATIC,91,43,46,8
-    EDITTEXT        IDC_HTTP_PROXY,54,58,111,12,ES_AUTOHSCROLL
-    CONTROL         "Use proxy",IDC_HTTP_USE_PROXY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,3,59,47,10
-END
-
-IDD_OPT_FONT DIALOG 0, 20, 169, 76
-STYLE DS_SETFONT | DS_MODALFRAME | DS_CONTROL | WS_CHILD
-FONT 8, "MS Sans Serif"
-BEGIN
-    LTEXT           "Font Engine",IDC_STATIC,6,11,39,8
-    COMBOBOX        IDC_FONT_LIST,60,8,105,44,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    PUSHBUTTON      "...",IDC_BROWSE_FONT,2,40,164,12
-    LTEXT           "System Font Directory",IDC_STATIC,46,29,70,8
-    COMBOBOX        IDC_TEXTURE_MODE,101,58,64,44,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT           "Text Texturing Mode",IDC_STATIC,7,60,69,8
-END
-
-IDD_OPT_SYSTEMS DIALOG 0, 20, 169, 76
-STYLE DS_SETFONT | DS_MODALFRAME | DS_CONTROL | WS_CHILD
-FONT 8, "MS Sans Serif"
-BEGIN
-    COMBOBOX        IDC_LANG,75,4,92,58,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT           "Prefered Language for stream selection",IDC_STATIC,3,3,61,17
-    LTEXT           "Decoder Threading",IDC_STATIC,4,28,62,8
-    COMBOBOX        IDC_DEC_THREAD,75,25,92,57,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    CONTROL         "Always draw late BIFS frames",IDC_BIFSDROP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,3,43,109,10
-    CONTROL         "Force Single Timeline",IDC_FORCE_DURATION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,3,58,83,10
-END
-
-IDD_OPT_STREAM DIALOG 0, 20, 169, 76
-STYLE DS_SETFONT | DS_MODALFRAME | DS_CONTROL | WS_CHILD
-FONT 8, "MS Sans Serif"
-BEGIN
-    LTEXT           "Default Port",IDC_STATIC,6,6,40,8
-    COMBOBOX        IDC_PORT,52,3,113,61,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
-    CONTROL         "RTP over RTSP",IDC_RTSP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,19,68,10
-    CONTROL         "use RTP reordering",IDC_REORDER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,81,19,76,10
-    LTEXT           "milliseconds before control timeout",IDC_STATIC,38,34,108,8
-    EDITTEXT        IDC_TIMEOUT,3,32,30,12,ES_CENTER | ES_AUTOHSCROLL | ES_NUMBER
-    LTEXT           "milliseconds of Media Buffering ",IDC_STATIC,38,48,100,8
-    EDITTEXT        IDC_BUFFER,3,47,30,12,ES_CENTER | ES_AUTOHSCROLL | ES_NUMBER
-    EDITTEXT        IDC_REBUFFER_LEN,83,60,30,12,ES_CENTER | ES_AUTOHSCROLL | ES_NUMBER
-    CONTROL         "Rebuffer if less than",IDC_REBUFFER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,63,79,10
-    LTEXT           "milliseconds",IDC_STATIC,117,63,41,8
-END
-
-IDD_PROPERTIES DIALOGEX 0, 0, 338, 150
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Presentation Properties"
-FONT 8, "MS Sans Serif", 0, 0, 0x1
-BEGIN
-    CONTROL         "Tree1",IDC_ODTREE,"SysTreeView32",TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_DISABLEDRAGDROP | TVS_SHOWSELALWAYS | TVS_TRACKSELECT | TVS_SINGLEEXPAND | WS_BORDER | WS_TABSTOP,2,2,120,114
-    EDITTEXT        IDC_ODINFO,123,17,213,130,ES_MULTILINE | ES_AUTOVSCROLL | ES_AUTOHSCROLL | ES_NOHIDESEL | ES_OEMCONVERT | ES_READONLY | WS_VSCROLL | WS_HSCROLL,WS_EX_DLGMODALFRAME | WS_EX_STATICEDGE
-    PUSHBUTTON      "Get World Info",IDC_WORLD,2,118,119,13
-    PUSHBUTTON      "View Scene Graph",IDC_VIEWSG,2,134,119,13
-    CONTROL         "Tab1",IDC_VIEWSEL,"SysTabControl32",TCS_BUTTONS,124,2,208,14
-END
-
-IDD_OPT_DECODER DIALOG 0, 20, 169, 76
-STYLE DS_SETFONT | DS_MODALFRAME | DS_CONTROL | WS_CHILD
-FONT 8, "MS Sans Serif"
-BEGIN
-    LTEXT           "Prefered Audio Module",-1,46,5,69,8
-    COMBOBOX        IDC_AUDEC_LIST,26,17,111,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT           "Prefered Video Module",-1,48,40,69,8
-    COMBOBOX        IDC_VIDEC_LIST,25,52,113,55,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-END
-
-IDD_OPT_RENDER2D DIALOG 0, 20, 169, 76
-STYLE DS_SETFONT | DS_MODALFRAME | WS_CHILD
-FONT 8, "MS Sans Serif"
-BEGIN
-    CONTROL         "Disable YUV Hardware",IDC_YUV,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,5,54,89,10
-    LTEXT           "Static",IDC_FORMAT_YUV,97,57,67,8
-    CONTROL         "Direct Rendering",IDC_DIRECTRENDER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,5,32,72,10
-    CONTROL         "Scalable Zoom",IDC_ZOOM_SCALABLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,5,10,77,10
-END
-
-IDD_OPT_RENDER3D DIALOG 0, 20, 169, 76
-STYLE DS_SETFONT | DS_MODALFRAME | WS_CHILD
-FONT 8, "MS Sans Serif"
-BEGIN
-    CONTROL         "Use OpenGL Outlines",IDC_RASTER_OUTLINE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,5,2,84,10
-    CONTROL         "Emulate power-of-two textures for video",IDC_EMUL_POW2,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,45,140,10
-    CONTROL         "Polygon Anti-Aliasing",IDC_DISABLE_POLY_AA,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,90,2,78,10
-    CONTROL         "Disable rectangular texture extensions",IDC_DISABLE_TX_RECT,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,55,135,10
-    CONTROL         "Bitmap node uses direct pixel copy",IDC_BITMAP_USE_PIXEL,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,65,125,10
-    LTEXT           "Draw Normals",IDC_STATIC,4,17,45,8
-    COMBOBOX        IDC_DRAW_NORMALS,4,25,48,44,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT           "Backface Cull",IDC_STATIC,57,17,55,8
-    COMBOBOX        IDC_BACK_CULL,57,25,47,44,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT           "Draw Mode",IDC_STATIC,113,17,55,8
-    COMBOBOX        IDC_DRAW_MODE,111,25,53,44,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-END
-
-IDD_SLIDERS DIALOGEX 0, 0, 218, 18
-STYLE DS_SETFONT | WS_CHILD
-FONT 8, "MS Sans Serif", 0, 0, 0x0
-BEGIN
-    CONTROL         "Slider1",ID_SLIDER,"msctls_trackbar32",TBS_TOP | TBS_NOTICKS,0,3,185,12
-    CONTROL         "Slider1",ID_AUDIO_VOL,"msctls_trackbar32",TBS_BOTH | TBS_NOTICKS | WS_BORDER | WS_TABSTOP,187,3,30,13
-END
-
-IDD_NAVBAR DIALOGEX 0, 0, 279, 15
-STYLE DS_SETFONT | WS_CHILD
-FONT 8, "MS Sans Serif", 0, 0, 0x1
-BEGIN
-    COMBOBOX        IDC_ADDRESS,29,1,130,196,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP,WS_EX_ACCEPTFILES
-    LTEXT           "Address",IDC_DUMTXT,1,4,26,8
-END
-
-IDD_PLAYLIST DIALOGEX 0, 0, 186, 54
-STYLE DS_SETFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME
-EXSTYLE WS_EX_TOOLWINDOW
-CAPTION "Osmo4 Playlist"
-FONT 8, "MS Sans Serif", 0, 0, 0x1
-BEGIN
-    CONTROL         "List4",IDC_FILELIST,"SysListView32",LVS_REPORT | WS_BORDER | WS_TABSTOP,1,0,182,51
-END
-
-IDD_OPT_MCACHE DIALOG 0, 20, 169, 76
-STYLE DS_SETFONT | DS_MODALFRAME | DS_CONTROL | WS_CHILD
-FONT 8, "MS Sans Serif"
-BEGIN
-    PUSHBUTTON      "...",IDC_BROWSE_MCACHE,41,2,126,12
-    CONTROL         "Overwrite existing files",IDC_MCACHE_OVERWRITE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,3,18,85,10
-    CONTROL         "Use filename",IDC_MCACHE_USENAME,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,3,31,57,10
-    LTEXT           "Record To",IDC_STATIC,4,4,35,8
-    EDITTEXT        IDC_BASEPRES,81,31,82,12,ES_CENTER | ES_AUTOHSCROLL | ES_NUMBER
-END
-
-IDD_OPT_FILETYPES DIALOG 0, 20, 169, 76
-STYLE DS_SETFONT | DS_MODALFRAME | DS_CONTROL | WS_CHILD
-FONT 8, "MS Sans Serif"
-BEGIN
-    COMBOBOX        IDC_FILELIST,59,6,108,61,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT           "Supported Files",IDC_STATIC,6,8,50,8
-    LTEXT           "Extension",IDC_FILES_EXT,7,25,154,8
-    LTEXT           "Mime Type",IDC_FILES_MIMES,7,37,156,8
-    CONTROL         "Associate with Osmo4",IDC_ASSOCIATE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,60,84,10
-    LTEXT           "Plugin",IDC_FILES_PLUG,8,49,154,8
-END
-
-IDD_OPT_LOGS DIALOG 0, 20, 169, 76
-STYLE DS_SETFONT | DS_MODALFRAME | DS_CONTROL | WS_CHILD
-FONT 8, "MS Sans Serif"
-BEGIN
-    LTEXT           "Level",IDC_STATIC,6,7,18,8
-    COMBOBOX        IDC_LOG_LEVEL,30,4,64,74,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    CONTROL         "core",IDC_TOOL_CORE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,3,23,30,10
-    CONTROL         "coding",IDC_TOOL_CODING,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,3,33,37,10
-    CONTROL         "container",IDC_TOOL_CONTAINER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,3,43,45,10
-    CONTROL         "network",IDC_TOOL_NET,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,3,53,41,10
-    CONTROL         "rtp",IDC_TOOL_RTP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,3,63,24,10
-    CONTROL         "author",IDC_TOOL_AUTHOR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,48,24,36,10
-    CONTROL         "sync",IDC_TOOL_SYNC,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,48,34,31,10
-    CONTROL         "codec",IDC_TOOL_CODEC,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,48,44,36,10
-    CONTROL         "parser",IDC_TOOL_PARSER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,48,54,35,10
-    CONTROL         "media",IDC_TOOL_MEDIA,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,48,64,35,10
-    CONTROL         "scene",IDC_TOOL_SCENE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,86,24,35,10
-    CONTROL         "script",IDC_TOOL_SCRIPT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,86,34,33,10
-    CONTROL         "compose",IDC_TOOL_COMPOSE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,86,44,45,10
-    CONTROL         "render",IDC_TOOL_RENDER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,86,54,36,10
-    CONTROL         "mmio",IDC_TOOL_MMIO,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,86,64,32,10
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// DESIGNINFO
-//
-
-#ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO
-BEGIN
-    IDD_OPT_VIDEO, DIALOG
-    BEGIN
-        RIGHTMARGIN, 168
-    END
-
-    IDD_OPT_FONT, DIALOG
-    BEGIN
-        LEFTMARGIN, 1
-        RIGHTMARGIN, 168
-        BOTTOMMARGIN, 74
-    END
-
-    IDD_OPT_SYSTEMS, DIALOG
-    BEGIN
-        RIGHTMARGIN, 167
-        TOPMARGIN, 1
-        BOTTOMMARGIN, 75
-    END
-
-    IDD_OPT_STREAM, DIALOG
-    BEGIN
-        LEFTMARGIN, 1
-        RIGHTMARGIN, 167
-        TOPMARGIN, 1
-    END
-
-    IDD_PROPERTIES, DIALOG
-    BEGIN
-        RIGHTMARGIN, 335
-        TOPMARGIN, 1
-    END
-
-    IDD_OPT_DECODER, DIALOG
-    BEGIN
-        RIGHTMARGIN, 168
-    END
-
-    IDD_OPT_RENDER3D, DIALOG
-    BEGIN
-        RIGHTMARGIN, 168
-    END
-
-    IDD_NAVBAR, DIALOG
-    BEGIN
-        RIGHTMARGIN, 167
-    END
-
-    IDD_OPT_FILETYPES, DIALOG
-    BEGIN
-        RIGHTMARGIN, 168
-    END
-
-    IDD_OPT_LOGS, DIALOG
-    BEGIN
-        RIGHTMARGIN, 168
-    END
-END
-#endif    // APSTUDIO_INVOKED
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Toolbar
-//
-
-IDR_PLAYLIST TOOLBAR 16, 15
-BEGIN
-    BUTTON      ID_PL_OPEN
-    BUTTON      ID_PL_SAVE
-    BUTTON      ID_PL_ADD_FILE
-    BUTTON      ID_PL_REM_FILE
-    BUTTON      ID_PL_UP
-    BUTTON      ID_PL_DOWN
-    BUTTON      ID_PL_SORT_FILE
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Bitmap
-//
-
-IDR_PLAYLIST            BITMAP                  "res\\playlist.bmp"
-
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE 
-BEGIN
-    "resource.h\0"
-END
-
-2 TEXTINCLUDE 
-BEGIN
-    "#include ""afxres.h""\r\n"
-    "\0"
-END
-
-3 TEXTINCLUDE 
-BEGIN
-    "#define _AFX_NO_SPLITTER_RESOURCES\r\n"
-    "#define _AFX_NO_OLE_RESOURCES\r\n"
-    "#define _AFX_NO_TRACKER_RESOURCES\r\n"
-    "#define _AFX_NO_PROPERTY_RESOURCES\r\n"
-    "\r\n"
-    "#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)\r\n"
-    "#ifdef _WIN32\r\n"
-    "LANGUAGE 9, 1\r\n"
-    "#pragma code_page(1252)\r\n"
-    "#endif //_WIN32\r\n"
-    "#include ""res\\Osmo4.rc2""  // non-Microsoft Visual C++ edited resources\r\n"
-    "#include ""afxres.rc""         // Standard components\r\n"
-    "#endif\r\n"
-    "\0"
-END
-
-#endif    // APSTUDIO_INVOKED
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Icon
-//
-
-// Icon with lowest ID value placed first to ensure application icon
-// remains consistent on all systems.
-IDR_MAINFRAME           ICON                    "..\\..\\doc\\osmo4.ico"
-IDI_PLAY                ICON                    "res\\play.ico"
-IDI_STOP                ICON                    "res\\stop.ico"
-IDI_PAUSE               ICON                    "res\\pause.ico"
-IDI_MESSAGE             ICON                    "res\\message.ico"
-IDI_ERR                 ICON                    "res\\error.ico"
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog Info
-//
-
-IDD_OPT_RENDER DLGINIT
-BEGIN
-    IDC_BIFS_RATE, 0x403, 4, 0
-0x2e35, 0x0030, 
-    IDC_BIFS_RATE, 0x403, 4, 0
-0x2e37, 0x0035, 
-    IDC_BIFS_RATE, 0x403, 5, 0
-0x3031, 0x302e, "\000" 
-    IDC_BIFS_RATE, 0x403, 5, 0
-0x3231, 0x352e, "\000" 
-    IDC_BIFS_RATE, 0x403, 5, 0
-0x3531, 0x302e, "\000" 
-    IDC_BIFS_RATE, 0x403, 5, 0
-0x3432, 0x302e, "\000" 
-    IDC_BIFS_RATE, 0x403, 5, 0
-0x3532, 0x302e, "\000" 
-    IDC_BIFS_RATE, 0x403, 5, 0
-0x3033, 0x302e, "\000" 
-    0
-END
-
-IDD_OPT_SYSTEMS DLGINIT
-BEGIN
-    IDC_LANG, 0x403, 8, 0
-0x6e45, 0x6c67, 0x7369, 0x0068, 
-    IDC_LANG, 0x403, 7, 0
-0x7246, 0x6e65, 0x6863, "\000" 
-    IDC_LANG, 0x403, 7, 0
-0x6547, 0x6d72, 0x6e61, "\000" 
-    IDC_LANG, 0x403, 8, 0
-0x7449, 0x6c61, 0x6169, 0x006e, 
-    IDC_LANG, 0x403, 8, 0
-0x7053, 0x6e61, 0x7369, 0x0068, 
-    IDC_LANG, 0x403, 9, 0
-0x6843, 0x6e69, 0x6565, 0x6573, "\000" 
-    IDC_LANG, 0x403, 10, 0
-0x614a, 0x6170, 0x656e, 0x7365, 0x0065, 
-    IDC_DEC_THREAD, 0x403, 14, 0
-0x6953, 0x676e, 0x656c, 0x5420, 0x7268, 0x6165, 0x0064, 
-    IDC_DEC_THREAD, 0x403, 13, 0
-0x754d, 0x6c74, 0x2069, 0x6854, 0x6572, 0x6461, "\000" 
-    IDC_DEC_THREAD, 0x403, 5, 0
-0x7246, 0x6565, "\000" 
-    0
-END
-
-IDD_OPT_LOGS DLGINIT
-BEGIN
-    IDC_LOG_LEVEL, 0x403, 9, 0
-0x6944, 0x6173, 0x6c62, 0x6465, "\000" 
-    IDC_LOG_LEVEL, 0x403, 6, 0
-0x7245, 0x6f72, 0x0072, 
-    IDC_LOG_LEVEL, 0x403, 8, 0
-0x6157, 0x6e72, 0x6e69, 0x0067, 
-    IDC_LOG_LEVEL, 0x403, 5, 0
-0x6e49, 0x6f66, "\000" 
-    IDC_LOG_LEVEL, 0x403, 6, 0
-0x6544, 0x7562, 0x0067, 
-    0
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Accelerator
-//
-
-IDR_MAINACCEL ACCELERATORS
-BEGIN
-    "^P",           ID_FILE_PLAY,           ASCII,  NOINVERT
-    "\t",           ID_FILE_PROP,           ASCII,  NOINVERT
-    VK_F5,          ID_FILE_RELOAD,         VIRTKEY, NOINVERT
-    "^S",           ID_FILE_STEP,           ASCII,  NOINVERT
-    "^O",           ID_OPEN_FILE,            ASCII,  NOINVERT
-    "^U",           ID_OPEN_URL,            ASCII,  NOINVERT
-    VK_F3,          ID_VIEW_PL,             VIRTKEY, NOINVERT
-END
-
-#endif    // French (France) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-
-#ifndef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 3 resource.
-//
-#define _AFX_NO_SPLITTER_RESOURCES
-#define _AFX_NO_OLE_RESOURCES
-#define _AFX_NO_TRACKER_RESOURCES
-#define _AFX_NO_PROPERTY_RESOURCES
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-#ifdef _WIN32
-LANGUAGE 9, 1
-#pragma code_page(1252)
-#endif //_WIN32
-#include "res\Osmo4.rc2"  // non-Microsoft Visual C++ edited resources
-#include "afxres.rc"         // Standard components
-#endif
-
-/////////////////////////////////////////////////////////////////////////////
-#endif    // not APSTUDIO_INVOKED
-

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/osmo4_w32/Osmo4.vcxproj Deleted

@@ -1,387 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="14.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>{C79C2D73-06E9-4622-92CE-F166B1B51792}</ProjectGuid>
-    <RootNamespace>Osmo4</RootNamespace>
-    <Keyword>MFCProj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>Dynamic</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>Dynamic</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>Dynamic</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>Dynamic</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </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>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\obj/osmo4_w32_rel/Osmo4.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;%(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>
-      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
-      <SubSystem>Windows</SubSystem>
-      <StackReserveSize>8388608</StackReserveSize>
-      <TargetMachine>MachineX86</TargetMachine>
-    </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/osmo4_w32_rel/Osmo4.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <InlineFunctionExpansion>Default</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;%(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>
-      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
-      <SubSystem>Windows</SubSystem>
-      <StackReserveSize>8388608</StackReserveSize>
-    </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/osmo4_w32_deb/Osmo4.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;%(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>
-      <BrowseInformation>true</BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x040c</Culture>
-      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Link>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
-      <SubSystem>Windows</SubSystem>
-      <TargetMachine>MachineX86</TargetMachine>
-    </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/osmo4_w32_deb/Osmo4.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
-      <BrowseInformation>true</BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x040c</Culture>
-      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Link>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
-      <SubSystem>Windows</SubSystem>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\applications\osmo4_w32\AddressBar.cpp">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\applications\osmo4_w32\FileProps.cpp">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\applications\osmo4_w32\MainFrm.cpp">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\applications\osmo4_w32\OpenUrl.cpp">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\applications\osmo4_w32\Options.cpp">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\applications\osmo4_w32\Osmo4.cpp">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\applications\osmo4_w32\Playlist.cpp">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\applications\osmo4_w32\Sliders.cpp">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\applications\osmo4_w32\StdAfx.cpp">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="..\..\applications\osmo4_w32\Osmo4.rc">
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\gpac\applications\osmo4_w32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">\gpac\applications\osmo4_w32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\gpac\applications\osmo4_w32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">\gpac\applications\osmo4_w32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\applications\osmo4_w32\AddressBar.h" />
-    <ClInclude Include="..\..\applications\osmo4_w32\FileProps.h" />
-    <ClInclude Include="..\..\applications\osmo4_w32\MainFrm.h" />
-    <ClInclude Include="..\..\applications\osmo4_w32\OpenUrl.h" />
-    <ClInclude Include="..\..\applications\osmo4_w32\Options.h" />
-    <ClInclude Include="..\..\applications\osmo4_w32\Osmo4.h" />
-    <ClInclude Include="..\..\applications\osmo4_w32\Playlist.h" />
-    <ClInclude Include="..\..\applications\osmo4_w32\Resource.h" />
-    <ClInclude Include="..\..\applications\osmo4_w32\Sliders.h" />
-    <ClInclude Include="..\..\applications\osmo4_w32\StdAfx.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\..\applications\osmo4_w32\res\error.ico" />
-    <None Include="..\..\applications\osmo4_w32\res\maintool.bmp" />
-    <None Include="..\..\applications\osmo4_w32\res\message.ico" />
-    <None Include="..\..\applications\osmo4_w32\res\osmo4.ico" />
-    <None Include="..\..\applications\osmo4_w32\res\pause.ico" />
-    <None Include="..\..\applications\osmo4_w32\res\play.ico" />
-    <None Include="..\..\applications\osmo4_w32\res\playlist.bmp" />
-    <None Include="..\..\applications\osmo4_w32\res\stop.ico" />
-    <None Include="..\..\doc\osmo4.ico" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="libgpac_dll.vcxproj">
-      <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/osmo4_w32/Playlist.cpp Deleted

@@ -1,969 +0,0 @@
-// Playlist.cpp : implementation file
-//
-
-#include "stdafx.h"
-#include "osmo4.h"
-#include "MainFrm.h"
-#include "OpenURL.h"
-
-#ifdef _DEBUG
-#define new DEBUG_NEW
-#undef THIS_FILE
-static char THIS_FILE = __FILE__;
-#endif
-
-/////////////////////////////////////////////////////////////////////////////
-// Playlist dialog
-
-PLEntry::PLEntry(CString url, char *path)
-{
-	if (!path || strrchr(url, '\\') || strstr(url, "://")) {
-		m_url = gf_strdup(url);
-	} else {
-		char szPathMAX_PATH;
-		strcpy(szPath, path);
-		strcat(szPath, url);
-		m_url = gf_strdup(szPath);
-	}
-	char *str = (char *) strrchr(url, '\\');
-	if (!str) str = (char *) strrchr(url, '/');
-	if (str && strlen(str+1)) {
-		m_disp_name = gf_strdup(str+1);
-		str = strrchr(m_disp_name, '.');
-		if (str) str0 = 0;
-	} else {
-		str = (char *) strstr(url, "://");
-		if (str) {
-			str += 3;
-			m_disp_name = gf_strdup(str);
-		} else {
-			m_disp_name = gf_strdup(url);
-			str = strrchr(m_disp_name, '.');
-			if (str) str0 = 0;
-		}
-	}
-	m_duration = 0;
-	m_bIsDead = GF_FALSE;
-	m_bIsPlaying = GF_FALSE;
-	m_bIsSelected = GF_FALSE;
-}
-
-PLEntry::~PLEntry()
-{
-	if (m_url) gf_free(m_url);
-	if (m_disp_name) gf_free(m_disp_name);
-
-}
-
-
-static char szCacheDirMAX_PATH;
-
-Playlist::Playlist()
-	: CDialog(Playlist::IDD, NULL)
-{
-	//{{AFX_DATA_INIT(Playlist)
-	//}}AFX_DATA_INIT
-
-	m_entries = gf_list_new();
-	m_cur_entry = -1;
-	m_all_dead_entries=-1;
-	GetCurrentDirectory(MAX_PATH, szCacheDir);
-}
-
-Playlist::~Playlist()
-{
-	Clear();
-	gf_list_del(m_entries);
-}
-
-void Playlist::DoDataExchange(CDataExchange* pDX)
-{
-	CDialog::DoDataExchange(pDX);
-	//{{AFX_DATA_MAP(Playlist)
-	DDX_Control(pDX, IDC_FILELIST, m_FileList);
-	//}}AFX_DATA_MAP
-}
-
-
-BEGIN_MESSAGE_MAP(Playlist, CDialog)
-	//{{AFX_MSG_MAP(Playlist)
-	ON_WM_SIZE()
-	ON_COMMAND(ID_PL_ADD_FILE, OnPlAddFile)
-	ON_COMMAND(ID_PL_REM_FILE, OnPlRemFile)
-	ON_COMMAND(ID_PL_UP, OnSelUp)
-	ON_COMMAND(ID_PL_DOWN, OnSelDown)
-	ON_COMMAND(ID_PL_SAVE, OnPlSave)
-	ON_WM_DROPFILES()
-	ON_WM_CLOSE()
-	ON_WM_DESTROY()
-	ON_COMMAND(ID_PL_REM_DEAD, OnPlRemDead)
-	ON_COMMAND(ID_PL_REM_ALL, OnPlRemAll)
-	ON_COMMAND(ID_PL_ADD_DIR, OnPlAddDir)
-	ON_COMMAND(ID_PL_ADD_DIR_REC, OnPlAddDirRec)
-	ON_COMMAND(ID_PL_ADD_URL, OnPlAddUrl)
-	ON_COMMAND(ID_PL_OPEN, OnPlOpen)
-	ON_COMMAND(ID_PL_PLAY, OnPlPlay)
-	ON_COMMAND(ID_PL_SEL_REV, OnReverseSelection)
-	ON_COMMAND(ID_PL_SORT_REV, OnReverseList)
-	ON_COMMAND(ID_PL_RANDOM, OnRandomize)
-	ON_COMMAND(ID_PL_SORT_TITLE, OnSortTitle)
-	ON_COMMAND(ID_PL_SORT_FILE, OnSortFile)
-	ON_COMMAND(ID_PL_SORT_DUR, OnSortDuration)
-	ON_NOTIFY(NM_RCLICK, IDC_FILELIST, OnRclickFilelist)
-	ON_NOTIFY(NM_DBLCLK, IDC_FILELIST, OnDblclkFilelist)
-	//}}AFX_MSG_MAP
-END_MESSAGE_MAP()
-
-/////////////////////////////////////////////////////////////////////////////
-// Playlist message handlers
-
-BOOL Playlist::OnInitDialog()
-{
-	UINT buttonArray50;
-	TBBUTTONINFO bi;
-	u32 *ba;
-	CDialog::OnInitDialog();
-
-
-	SetIcon(AfxGetApp()->LoadIcon(IDR_MAINFRAME), TRUE);
-	SetIcon(AfxGetApp()->LoadIcon(IDR_MAINFRAME), FALSE);
-
-	if (!m_toolBar.CreateEx(this, WS_CHILD | CBRS_TOP | CBRS_FLYBY) ||
-	        !m_toolBar.LoadBitmap(IDR_PLAYLIST))
-	{
-		TRACE0("Failed to create toolbar\n");
-		return 0;
-	}
-
-	ba = &buttonArray0;
-	*ba = ID_PL_OPEN;
-	ba++;
-	*ba = ID_PL_SAVE;
-	ba++;
-	*ba = ID_SEPARATOR;
-	ba++;
-	*ba = ID_PL_ADD_FILE;
-	ba++;
-	*ba = ID_PL_REM_FILE;
-	ba++;
-	*ba = ID_SEPARATOR;
-	ba++;
-	*ba = ID_PL_UP;
-	ba++;
-	*ba = ID_PL_DOWN;
-	ba++;
-	*ba = ID_SEPARATOR;
-	ba++;
-	*ba = ID_PL_SORT_FILE;
-	ba++;
-	m_toolBar.SetButtons(buttonArray, 9);
-	m_toolBar.SetButtonInfo(0, ID_PL_OPEN, TBBS_BUTTON, 0);
-	m_toolBar.SetButtonInfo(1, ID_PL_SAVE, TBBS_BUTTON, 1);
-	m_toolBar.SetButtonInfo(2, ID_SEPARATOR, TBBS_SEPARATOR, 0);
-	m_toolBar.SetButtonInfo(3, ID_PL_ADD_FILE, TBBS_DROPDOWN | TBBS_BUTTON, 2);
-	m_toolBar.SetButtonInfo(4, ID_PL_REM_FILE, TBBS_DROPDOWN | TBBS_BUTTON, 3);
-	m_toolBar.SetButtonInfo(5, ID_SEPARATOR, TBBS_SEPARATOR, 0);
-	m_toolBar.SetButtonInfo(6, ID_PL_UP, TBBS_BUTTON, 4);
-	m_toolBar.SetButtonInfo(7, ID_PL_DOWN, TBBS_BUTTON, 5);
-//	m_toolBar.SetButtonInfo(8, ID_SEPARATOR, TBBS_SEPARATOR, 0);
-	m_toolBar.SetButtonInfo(8, ID_PL_SORT_FILE, TBBS_DROPDOWN | TBBS_BUTTON, 6);
-
-	CToolBarCtrl &ctrl = m_toolBar.GetToolBarCtrl();
-	ctrl.SetStyle(TBSTYLE_FLAT | TBSTYLE_DROPDOWN);
-	ctrl.SetExtendedStyle(TBSTYLE_EX_DRAWDDARROWS);
-
-	memset(&bi, 0, sizeof(bi));
-	bi.cbSize = sizeof(bi);
-	ctrl.GetButtonInfo(3, &bi);
-	bi.fsStyle |= TBSTYLE_DROPDOWN;
-	ctrl.SetButtonInfo(ID_PL_ADD_FILE, &bi);
-
-	memset(&bi, 0, sizeof(bi));
-	bi.cbSize = sizeof(bi);
-	ctrl.GetButtonInfo(4, &bi);
-	bi.fsStyle |= TBBS_DROPDOWN | TBSTYLE_DROPDOWN;
-	ctrl.SetButtonInfo(ID_PL_REM_FILE, &bi);
-
-	memset(&bi, 0, sizeof(bi));
-	bi.cbSize = sizeof(bi);
-	ctrl.GetButtonInfo(9, &bi);
-	bi.fsStyle |= TBSTYLE_DROPDOWN;
-	ctrl.SetButtonInfo(ID_PL_SORT_FILE, &bi);
-
-	m_FileList.InsertColumn(0, "", LVCFMT_LEFT, 30, 0);
-	m_FileList.InsertColumn(1, "Title", LVCFMT_LEFT, 200, 1);
-	m_FileList.InsertColumn(2, "Duration", LVCFMT_LEFT, 200, 2);
-
-
-	m_toolBar.UpdateWindow();
-	m_toolBar.ShowWindow(SW_SHOW);
-
-	SetWindowPos(NULL, 0, 0, 400, 600, SWP_NOZORDER | SWP_NOMOVE);
-
-	PostMessage(WM_NULL);
-	DragAcceptFiles();
-
-	return TRUE;
-}
-
-void Playlist::OnSize(UINT nType, int cx, int cy)
-{
-	u32 tool_h;
-	CDialog::OnSize(nType, cx, cy);
-	RECT rc;
-	if (!m_toolBar.m_hWnd) return;
-	if (!m_FileList.m_hWnd) return;
-
-	m_toolBar.GetClientRect(&rc);
-	tool_h = rc.bottom - rc.top;
-	m_toolBar.SetWindowPos(this, 0, 0, cx, tool_h, SWP_NOZORDER);
-	m_FileList.SetWindowPos(this, 0, tool_h, cx, cy-tool_h, SWP_NOZORDER);
-
-	m_FileList.SetExtendedStyle(m_FileList.GetExtendedStyle() | LVS_EX_FULLROWSELECT);
-
-	m_FileList.SetColumnWidth(0, 30);
-	m_FileList.SetColumnWidth(2, 60);
-	m_FileList.SetColumnWidth(1, cx-95);
-
-}
-
-void Playlist::OnDropFiles(HDROP hDropInfo)
-{
-	u32 i, count;
-	Osmo4 *app = GetApp();
-	char fileNameMAX_PATH;
-	count = ::DragQueryFile(hDropInfo, 0xFFFFFFFF, NULL, 0);
-	if (!count) return;
-	for (i=0; i<count; i++) {
-		::DragQueryFile (hDropInfo, i, fileName, MAX_PATH);
-		QueueURL(fileName);
-	}
-	RefreshList();
-}
-
-
-BOOL Playlist::OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult)
-{
-
-	if (((LPNMHDR)lParam)->code == TBN_DROPDOWN) {
-		RECT rc;
-		POINT pt;
-		CMenu *pPopup = new CMenu();
-		pPopup->CreatePopupMenu();
-
-		m_toolBar.GetWindowRect(&rc);
-		pt.y = rc.bottom;
-		pt.x = rc.left;
-
-		if ( ((LPNMTOOLBAR)lParam)->iItem == ID_PL_ADD_FILE) {
-			pPopup->AppendMenu(MF_STRING | MF_ENABLED, ID_PL_ADD_DIR, "Directory...");
-			pPopup->AppendMenu(MF_STRING | MF_ENABLED, ID_PL_ADD_DIR_REC, "Directory and subfolders...");
-			pPopup->AppendMenu(MF_STRING | MF_ENABLED, ID_PL_ADD_URL, "URL...");
-			m_toolBar.GetToolBarCtrl().GetItemRect(3, &rc);
-			pt.x += rc.left;
-		} else if ( ((LPNMTOOLBAR)lParam)->iItem == ID_PL_REM_FILE) {
-			pPopup->AppendMenu(MF_STRING | MF_ENABLED, ID_PL_REM_ALL, "Clear");
-			pPopup->AppendMenu(MF_STRING | MF_ENABLED, ID_PL_REM_DEAD, "Remove dead entries");
-
-			m_toolBar.GetToolBarCtrl().GetItemRect(4, &rc);
-			pt.x += rc.left;
-		} else if ( ((LPNMTOOLBAR)lParam)->iItem == ID_PL_SORT_FILE) {
-			pPopup->AppendMenu(MF_STRING | MF_ENABLED, ID_PL_SORT_TITLE, "Sort Files by title");
-			pPopup->AppendMenu(MF_STRING | MF_ENABLED, ID_PL_SORT_FILE, "Sort Files by filename");
-			pPopup->AppendMenu(MF_STRING | MF_ENABLED, ID_PL_SORT_DUR, "Sort Files by duration");
-			pPopup->AppendMenu(MF_SEPARATOR,0);
-			pPopup->AppendMenu(MF_STRING | MF_ENABLED, ID_PL_SORT_REV, "Reverse Playlist");
-			pPopup->AppendMenu(MF_STRING | MF_ENABLED, ID_PL_RANDOM, "Shuffle Playlist");
-
-			m_toolBar.GetToolBarCtrl().GetItemRect(8, &rc);
-			pt.x += rc.left;
-		}
-		pPopup->TrackPopupMenu(TPM_LEFTALIGN | TPM_RIGHTBUTTON, pt.x, pt.y, this);
-		delete pPopup;
-
-		return FALSE;
-	}
-	return CDialog::OnNotify(wParam, lParam, pResult);
-}
-
-void Playlist::Clear()
-{
-	m_FileList.DeleteAllItems();
-	while (gf_list_count(m_entries)) {
-		PLEntry *ple = (PLEntry *) gf_list_get(m_entries, 0);
-		gf_list_rem(m_entries, 0);
-		delete ple;
-	}
-	m_cur_entry = -1;
-}
-
-void Playlist::ClearButPlaying()
-{
-	PLEntry *p=NULL;
-	if (m_cur_entry>=0) p = (PLEntry *) gf_list_get(m_entries, m_cur_entry);
-	if (p) gf_list_rem(m_entries, m_cur_entry);
-
-	Clear();
-	if (p) {
-		gf_list_add(m_entries, p);
-		m_cur_entry = 0;
-	}
-	RefreshList();
-}
-
-void Playlist::UpdateEntry(u32 i)
-{
-	char szText20;
-	PLEntry *ple = (PLEntry *) gf_list_get(m_entries, i);
-	if (i+1<10) sprintf(szText, "00%d", i+1);
-	else if (i+1<100) sprintf(szText, "0%d", i+1);
-	else sprintf(szText, "%d", i+1);
-	m_FileList.SetItem(i, 0, LVIF_TEXT, szText, 0, 0, 0, 0);
-
-	CString str;
-	if (ple->m_bIsDead) {
-		str = "!! DEAD !! ";
-		str += ple->m_disp_name;
-	}
-	else if (ple->m_bIsPlaying) {
-		str = ">> ";
-		str += ple->m_disp_name;
-		str += " >>";
-	}
-	else str = ple->m_disp_name;
-	m_FileList.SetItem(i, 1, LVIF_TEXT, str, 0, 0, 0, 0);
-
-	if (ple->m_duration) {
-		u32 h = (u32) (ple->m_duration / 3600);
-		u32 m = (u32) (ple->m_duration / 60) - h*60;
-		u32 s = (u32) (ple->m_duration) - h*3600 - m*60;
-		sprintf(szText, "%02d:%02d:%02d", h, m, s);
-		m_FileList.SetItem(i, 2, LVIF_TEXT, szText, 0, 0, 0, 0);
-	} else {
-		m_FileList.SetItem(i, 2, LVIF_TEXT, "Unknown", 0, 0, 0, 0);
-	}
-
-}
-
-void Playlist::RefreshList()
-{
-	u32 i, top_idx;
-	char szPathGF_MAX_PATH;
-
-	top_idx = m_FileList.GetTopIndex();
-	m_FileList.DeleteAllItems();
-
-	for (i=0; i<gf_list_count(m_entries); i++) {
-		PLEntry *ple = (PLEntry *) gf_list_get(m_entries, i);
-		m_FileList.InsertItem(i, "");
-		m_FileList.SetItemData(i, (u32) ple);
-
-		UpdateEntry(i);
-		/*in case of sorting*/
-		if (ple->m_bIsPlaying) m_cur_entry = i;
-
-		if (ple->m_bIsSelected) {
-			m_FileList.SetItemState(i, LVIS_SELECTED, LVIS_SELECTED);
-			ple->m_bIsSelected = GF_FALSE;
-		}
-	}
-
-	if (m_cur_entry >= (s32)gf_list_count(m_entries)) m_cur_entry = gf_list_count(m_entries);
-	else {
-		s32 last_idx = top_idx + m_FileList.GetCountPerPage();
-		m_FileList.EnsureVisible(top_idx, 0);
-		if (gf_list_count(m_entries)<(u32) last_idx) last_idx = gf_list_count(m_entries);
-		m_FileList.EnsureVisible(last_idx, 1);
-	}
-
-
-	strcpy((char *) szPath, GetApp()->szUserPath);
-	strcat(szPath, "gpac_pl.m3u");
-	Save(szPath, GF_TRUE);
-}
-
-void Playlist::OnPlAddFile()
-{
-	Osmo4 *app = GetApp();
-	CString sFiles = app->GetFileFilter();
-
-	CFileDialog fd(TRUE,NULL,NULL, OFN_ALLOWMULTISELECT | OFN_HIDEREADONLY | OFN_FILEMUSTEXIST , sFiles);
-	fd.m_ofn.nMaxFile = 25000;
-	fd.m_ofn.lpstrFile = (char *) gf_malloc(sizeof(char) * fd.m_ofn.nMaxFile);
-	fd.m_ofn.lpstrFile0 = 0;
-
-	if (fd.DoModal() == IDOK) {
-		s32 cur = m_FileList.GetItemCount();
-		POSITION pos = fd.GetStartPosition();
-		while (pos) {
-			QueueURL(fd.GetNextPathName(pos));
-		}
-	}
-	gf_free(fd.m_ofn.lpstrFile);
-	m_all_dead_entries=-1;
-	RefreshList();
-}
-
-void Playlist::OnClose()
-{
-	ShowWindow(SW_HIDE);
-}
-
-void Playlist::OnPlRemFile()
-{
-	if (!m_FileList.GetSelectedCount()) return;
-	POSITION pos = m_FileList.GetFirstSelectedItemPosition();
-	while (pos != NULL) {
-		int nItem = m_FileList.GetNextSelectedItem(pos);
-		PLEntry *ple = (PLEntry *) m_FileList.GetItemData(nItem);
-		gf_list_del_item(m_entries, ple);
-		delete ple;
-	}
-	m_all_dead_entries=-1;
-	RefreshList();
-}
-
-void Playlist::OnSelUp()
-{
-	s32 i;
-	if (!m_FileList.GetSelectedCount()) return;
-	POSITION pos = m_FileList.GetFirstSelectedItemPosition();
-	int nItem = m_FileList.GetNextSelectedItem(pos);
-	if (nItem==0) return;
-
-	pos = m_FileList.GetFirstSelectedItemPosition();
-	while (pos != NULL) {
-		nItem = m_FileList.GetNextSelectedItem(pos);
-		PLEntry *ple = (PLEntry *) m_FileList.GetItemData(nItem);
-		i = gf_list_del_item(m_entries, ple);
-		assert(i>=1);
-		gf_list_insert(m_entries, ple, i-1);
-		ple->m_bIsSelected = GF_TRUE;
-	}
-	RefreshList();
-}
-
-void Playlist::OnSelDown()
-{
-	s32 i, nItem;
-	if (!m_FileList.GetSelectedCount()) return;
-	POSITION pos = m_FileList.GetFirstSelectedItemPosition();
-	while (pos != NULL) nItem = m_FileList.GetNextSelectedItem(pos);
-
-	if ((u32) nItem + 1 == gf_list_count(m_entries)) return;
-
-	pos = m_FileList.GetFirstSelectedItemPosition();
-	while (pos != NULL) {
-		nItem = m_FileList.GetNextSelectedItem(pos);
-		PLEntry *ple = (PLEntry *) m_FileList.GetItemData(nItem);
-		i = gf_list_del_item(m_entries, ple);
-		gf_list_insert(m_entries, ple, i+1);
-		ple->m_bIsSelected = GF_TRUE;
-	}
-	RefreshList();
-}
-
-void Playlist::OnPlRemAll()
-{
-	Clear();
-	RefreshList();
-	m_cur_entry = -1;
-}
-
-void Playlist::OnPlRemDead()
-{
-	for (u32 i=0; i<gf_list_count(m_entries); i++) {
-		PLEntry *ple = (PLEntry *) gf_list_get(m_entries, i);
-		if (!ple->m_bIsDead) continue;
-		gf_list_rem(m_entries, i);
-		i--;
-		delete ple;
-	}
-	m_all_dead_entries=-1;
-	RefreshList();
-}
-
-
-static int CALLBACK LocCbck(HWND hwnd, UINT uMsg, LPARAM lp, LPARAM pData)
-{
-	char dirMAX_PATH;
-	if (uMsg == BFFM_INITIALIZED) {
-		strcpy(dir, szCacheDir);
-		SendMessage(hwnd, BFFM_SETSELECTION, TRUE,(LPARAM) dir);
-	}
-	return 0;
-}
-static Bool pl_enum_dir_item(void *cbck, char *item_name, char *item_path, GF_FileEnumInfo *file_info)
-{
-	Osmo4 *gpac = GetApp();
-	Playlist *_this = (Playlist *)cbck;
-
-	if (gf_term_is_supported_url(gpac->m_term, item_name, GF_FALSE, GF_TRUE)) {
-		_this->QueueURL(item_path);
-	}
-	return GF_FALSE;
-}
-
-static Bool pl_enum_dir_dirs(void *cbck, char *item_name, char *item_path, GF_FileEnumInfo *file_info)
-{
-	gf_enum_directory(item_path, GF_FALSE, pl_enum_dir_item, cbck, NULL);
-	gf_enum_directory(item_path, GF_TRUE, pl_enum_dir_dirs, cbck, NULL);
-	return GF_FALSE;
-}
-
-
-void Playlist::AddDir(Bool do_recurse)
-{
-	BROWSEINFO brw;
-	LPMALLOC pMalloc;
-	LPITEMIDLIST ret;
-	char dirMAX_PATH;
-
-	Bool res = GF_FALSE;
-	if (NOERROR == ::SHGetMalloc(&pMalloc) ) {
-		memset(&brw, 0, sizeof(BROWSEINFO));
-		brw.hwndOwner = this->GetSafeHwnd();
-		brw.pszDisplayName = dir;
-		brw.lpszTitle = "Select Directory...";
-		brw.ulFlags = 0L;
-		brw.lpfn = LocCbck;
-
-		ret = SHBrowseForFolder(&brw);
-		if (ret != NULL) {
-			if (::SHGetPathFromIDList(ret, dir)) res = GF_TRUE;
-			pMalloc->Free(ret);
-		}
-		pMalloc->Release();
-	}
-	if (!res) return;
-	strcpy(szCacheDir, dir);
-
-	gf_enum_directory(dir, GF_FALSE, pl_enum_dir_item, this, NULL);
-	if (do_recurse) gf_enum_directory(dir, GF_FALSE, pl_enum_dir_dirs, this, NULL);
-	m_all_dead_entries=-1;
-	RefreshList();
-}
-void Playlist::OnPlAddDir()
-{
-	AddDir(GF_FALSE);
-}
-void Playlist::OnPlAddDirRec()
-{
-	AddDir(GF_TRUE);
-}
-
-void Playlist::OnPlAddUrl()
-{
-	COpenUrl url;
-	if (url.DoModal() != IDOK) return;
-	PLEntry *ple = new PLEntry(url.m_url);
-	gf_list_add(m_entries, ple);
-	m_all_dead_entries=-1;
-	RefreshList();
-}
-
-void Playlist::OnPlSave()
-{
-	Bool save_m3u;
-	char szPathGF_MAX_PATH;
-	if (!gf_list_count(m_entries)) return;
-	CFileDialog fd(FALSE,NULL,NULL, OFN_OVERWRITEPROMPT, "M3U Playlists|*.m3u|ShoutCast Playlists|*.pls|");
-	if (fd.DoModal() != IDOK) return;
-
-	strcpy(szPath, fd.GetPathName());
-	strlwr(szPath);
-	save_m3u = (fd.m_ofn.nFilterIndex==1) ? GF_TRUE : GF_FALSE;
-	if (save_m3u) {
-		if (!strstr(szPath, ".m3u")) {
-			strcpy(szPath, fd.GetPathName());
-			strcat(szPath, ".m3u");
-		} else {
-			strcpy(szPath, fd.GetPathName());
-		}
-	} else {
-		if (!strstr(szPath, ".pls")) {
-			strcpy(szPath, fd.GetPathName());
-			strcat(szPath, ".pls");
-		} else {
-			strcpy(szPath, fd.GetPathName());
-		}
-	}
-	Save(szPath, save_m3u);
-}
-
-void Playlist::Save(char *szPath, Bool save_m3u)
-{
-	FILE *out = gf_fopen(szPath, "wt");
-	if (!save_m3u)
-		fprintf(out, "playlist\nNumberOfEntries=%d\n", gf_list_count(m_entries));
-
-	for (u32 i=0; i<gf_list_count(m_entries); i++) {
-		PLEntry *ple = (PLEntry *) gf_list_get(m_entries, i);
-		if (save_m3u) {
-			fprintf(out, "%s\n", ple->m_url);
-		} else {
-			fprintf(out, "File%d=%s\n", i+1, ple->m_url);
-			fprintf(out, "Title%d=%s\n", i+1, ple->m_disp_name);
-			fprintf(out, "Length%d=%d\n", i+1, ple->m_duration ? ple->m_duration : -1);
-
-		}
-	}
-	if (!save_m3u) fprintf(out, "Version=2\n");
-
-	fprintf(out, "\n");
-	gf_fclose(out);
-}
-
-void Playlist::OnPlOpen()
-{
-	CFileDialog fd(TRUE,NULL,NULL, OFN_HIDEREADONLY | OFN_FILEMUSTEXIST, "M3U & PLS Playlists|*.m3u;*.pls|M3U Playlists|*.m3u|ShoutCast Playlists|*.pls|");
-	if (fd.DoModal() != IDOK) return;
-
-	Clear();
-	OpenPlayList(fd.GetPathName());
-	m_cur_entry = 0;
-	Play();
-}
-
-void Playlist::OpenPlayList(CString fileName)
-{
-	FILE *pl;
-	PLEntry *ple;
-	Bool load_m3u, go;
-	char szLineGF_MAX_PATH, *sep;
-	char szPathGF_MAX_PATH;
-
-	strcpy(szPath, fileName);
-	sep = strrchr(szPath, '\\');
-	if (sep) sep1 = 0;
-	else szPath0 = 0;
-
-	pl = gf_fopen(fileName, "rt");
-	if (!pl) return;
-	ple = NULL;
-	load_m3u = GF_TRUE;
-	while (!feof(pl)) {
-		fgets(szLine, GF_MAX_PATH, pl);
-		go = GF_TRUE;
-		while (go) {
-			switch (szLinestrlen(szLine)-1) {
-			case '\n':
-			case '\r':
-			case ' ':
-				szLinestrlen(szLine)-1 = 0;
-				break;
-			default:
-				go = GF_FALSE;
-				break;
-			}
-		}
-		if (!strlen(szLine)) continue;
-		if (!stricmp(szLine, "playlist")) {
-			load_m3u = GF_FALSE;
-		} else if (load_m3u) {
-			ple = new PLEntry(szLine, szPath);
-			gf_list_add(m_entries, ple);
-		} else if (!strnicmp(szLine, "file", 4)) {
-			char *st = strchr(szLine, '=');
-			if (!st) ple = NULL;
-			else {
-				ple = new PLEntry(st + 1, szPath);
-				gf_list_add(m_entries, ple);
-			}
-		} else if (ple && !strnicmp(szLine, "Length", 6)) {
-			char *st = strchr(szLine, '=');
-			s32 d = atoi(st + 1);
-			if (d>0) ple->m_duration = d;
-		} else if (ple && !strnicmp(szLine, "Title", 5)) {
-			char *st = strchr(szLine, '=');
-			gf_free(ple->m_disp_name);
-			ple->m_disp_name = gf_strdup(st + 6);
-		}
-	}
-	gf_fclose(pl);
-	m_all_dead_entries=-1;
-	m_cur_entry = -1;
-	RefreshList();
-}
-
-
-void Playlist::OnRclickFilelist(NMHDR* pNMHDR, LRESULT* pResult)
-{
-	if (!m_FileList.GetItemCount()) return;
-
-	CMenu *pPopup = new CMenu();
-	pPopup->CreatePopupMenu();
-
-	if (m_FileList.GetSelectedCount()==1) {
-		pPopup->AppendMenu(MF_STRING | MF_ENABLED, ID_PL_PLAY, "Play");
-		pPopup->AppendMenu(MF_SEPARATOR, 0, "");
-	}
-	pPopup->AppendMenu(MF_STRING | MF_ENABLED, ID_PL_SEL_REV, "Inverse Selection");
-	if (m_FileList.GetSelectedCount()) pPopup->AppendMenu(MF_STRING | MF_ENABLED, ID_PL_REM_FILE, "Remove File(s)");
-	if (m_FileList.GetItemCount()>1) {
-		pPopup->AppendMenu(MF_SEPARATOR, 0, "");
-		pPopup->AppendMenu(MF_STRING | MF_ENABLED, ID_PL_SORT_TITLE, "Sort By Title");
-		pPopup->AppendMenu(MF_STRING | MF_ENABLED, ID_PL_SORT_FILE, "Sort By File Name");
-		pPopup->AppendMenu(MF_STRING | MF_ENABLED, ID_PL_SORT_DUR, "Sort By Duration");
-		pPopup->AppendMenu(MF_SEPARATOR, 0, "");
-		pPopup->AppendMenu(MF_STRING | MF_ENABLED, ID_PL_SORT_REV, "Reverse List");
-		pPopup->AppendMenu(MF_STRING | MF_ENABLED, ID_PL_RANDOM, "Randomize");
-	}
-
-	POINT pt;
-	GetCursorPos(&pt);
-	pPopup->TrackPopupMenu(TPM_RIGHTBUTTON, pt.x, pt.y, this);
-	delete pPopup;
-
-	*pResult = 0;
-}
-
-void Playlist::OnReverseSelection()
-{
-	u32 i;
-	POSITION pos = m_FileList.GetFirstSelectedItemPosition();
-	while (pos != NULL) {
-		int nItem = m_FileList.GetNextSelectedItem(pos);
-		PLEntry *ple = (PLEntry *) m_FileList.GetItemData(nItem);
-		ple->m_bIsSelected = GF_TRUE;
-	}
-
-	for (i=0; i<gf_list_count(m_entries); i++) {
-		PLEntry *ple = (PLEntry *) gf_list_get(m_entries, i);
-		ple->m_bIsSelected = (Bool) !ple->m_bIsSelected;
-	}
-	RefreshList();
-}
-
-void Playlist::OnReverseList()
-{
-	u32 count = gf_list_count(m_entries);
-	u32 hcount = count / 2;
-	count--;
-	for (u32 i=0; i<hcount; i++) {
-		PLEntry *ple1 = (PLEntry *) gf_list_get(m_entries, i);
-		PLEntry *ple2 = (PLEntry *) gf_list_get(m_entries, count-i);
-		gf_list_rem(m_entries, i);
-		gf_list_insert(m_entries, ple2, i);
-		gf_list_rem(m_entries, count-i);
-		gf_list_insert(m_entries, ple1, count-i);
-	}
-	RefreshList();
-}
-
-void Playlist::OnRandomize()
-{
-	GF_List *new_entries = gf_list_new();
-
-	gf_rand_init(GF_FALSE);
-
-	while (gf_list_count(m_entries)>1) {
-		u32 pos = gf_rand() % (gf_list_count(m_entries)-1);
-		PLEntry *ple = (PLEntry *)gf_list_get(m_entries, pos);
-		gf_list_rem(m_entries, pos);
-		gf_list_add(new_entries, ple);
-	}
-	PLEntry *ple = (PLEntry *)gf_list_get(m_entries, 0);
-	gf_list_rem(m_entries, 0);
-	gf_list_add(new_entries, ple);
-
-	gf_list_del(m_entries);
-	m_entries = new_entries;
-	m_cur_entry = -1;
-	RefreshList();
-}
-
-void Playlist::Sort(u32 type)
-{
-	u32 i, j, smallest;
-	if (gf_list_count(m_entries)<=1) return;
-
-	for (i=0; i<gf_list_count(m_entries)-1; i++) {
-		smallest = i;
-		for (j=i+1; j<gf_list_count(m_entries); j++) {
-			PLEntry *ple2 = (PLEntry *) gf_list_get(m_entries, smallest);
-			PLEntry *ple1 = (PLEntry *) gf_list_get(m_entries, j);
-			s32 test = 0;
-			switch (type) {
-			case 0:
-				test = stricmp(ple1->m_url, ple2->m_url);
-				break;
-			case 1:
-				test = stricmp(ple1->m_disp_name, ple2->m_disp_name);
-				break;
-			case 2:
-				test = ple1->m_duration - ple2->m_duration;
-				break;
-			}
-			if (test<0) smallest = j;
-		}
-		PLEntry *ple = (PLEntry *)gf_list_get(m_entries, smallest);
-		gf_list_rem(m_entries, smallest);
-		gf_list_insert(m_entries, ple, i);
-	}
-	m_cur_entry = -1;
-	RefreshList();
-}
-
-void Playlist::OnSortFile() {
-	Sort(0);
-}
-void Playlist::OnSortTitle() {
-	Sort(1);
-}
-void Playlist::OnSortDuration() {
-	Sort(2);
-}
-
-
-Bool Playlist::HasValidEntries()
-{
-	u32 nb_dead = 0;
-	if (m_all_dead_entries==-1) {
-		for (u32 i=0; i<gf_list_count(m_entries); i++) {
-			PLEntry *ple = (PLEntry *) gf_list_get(m_entries, i);
-			ple->m_bIsPlaying = GF_FALSE;
-			if (ple->m_bIsDead) nb_dead ++;
-		}
-		m_all_dead_entries = (nb_dead==gf_list_count(m_entries)) ? 1 : 0;
-	}
-	if (m_all_dead_entries==1) return GF_FALSE;
-	return GF_TRUE;
-}
-
-void Playlist::RefreshCurrent()
-{
-	if (m_cur_entry==-1) return;
-	PLEntry *ple = (PLEntry *) gf_list_get(m_entries, m_cur_entry);
-	if (ple && ple->m_bIsPlaying) {
-		ple->m_bIsPlaying = GF_FALSE;
-		UpdateEntry(m_cur_entry);
-	}
-}
-
-void Playlist::Play()
-{
-	PLEntry *ple;
-
-	if (!HasValidEntries()) return;
-
-	RefreshCurrent();
-	if (m_cur_entry==-1) m_cur_entry = 0;
-
-	if (m_cur_entry >= (s32)gf_list_count(m_entries)) {
-		if (!GetApp()->m_Loop) return;
-		m_cur_entry = 0;
-	}
-
-	ple = (PLEntry *) gf_list_get(m_entries, m_cur_entry);
-	assert(ple);
-	if (ple->m_bIsDead) {
-		m_cur_entry++;
-		Play();
-	} else {
-		char szPLE20;
-		ple->m_bIsPlaying = GF_TRUE;
-		UpdateEntry(m_cur_entry);
-		sprintf(szPLE, "%d", m_cur_entry);
-		gf_cfg_set_key(GetApp()->m_user.config, "General", "PLEntry", szPLE);
-		GetApp()->m_pMainWnd->PostMessage(WM_OPENURL);
-	}
-}
-
-void Playlist::OnDblclkFilelist(NMHDR* pNMHDR, LRESULT* pResult)
-{
-	POSITION pos = m_FileList.GetFirstSelectedItemPosition();
-	RefreshCurrent();
-	m_cur_entry = m_FileList.GetNextSelectedItem(pos);
-	Play();
-	*pResult = 0;
-}
-
-void Playlist::OnPlPlay()
-{
-	POSITION pos = m_FileList.GetFirstSelectedItemPosition();
-
-	RefreshCurrent();
-	m_cur_entry = m_FileList.GetNextSelectedItem(pos);
-	Play();
-}
-
-void Playlist::Truncate()
-{
-	while (m_cur_entry+1 < (s32)gf_list_count(m_entries)) {
-		PLEntry *ple = (PLEntry *) gf_list_get(m_entries, m_cur_entry+1);
-		gf_list_rem(m_entries, m_cur_entry+1);
-		delete ple;
-	}
-	RefreshList();
-}
-
-
-void Playlist::QueueURL(CString filename)
-{
-	char *ext = (char *) strrchr(filename, '.');
-	if (ext && (!stricmp(ext, ".m3u") || !stricmp(ext, ".pls")) ) {
-		OpenPlayList(filename);
-	} else {
-		PLEntry *ple = new PLEntry(filename);
-		gf_list_add(m_entries, ple);
-	}
-	m_all_dead_entries=-1;
-}
-
-void Playlist::PlayNext()
-{
-	s32 count = (s32)gf_list_count(m_entries);
-
-	RefreshCurrent();
-	if (1+m_cur_entry < count) {
-		m_cur_entry++;
-		Play();
-	} else if ((1+m_cur_entry == count) && GetApp()->m_Loop) {
-		m_cur_entry=0;
-		Play();
-	}
-}
-
-void Playlist::PlayPrev()
-{
-	RefreshCurrent();
-	if (m_cur_entry>0) {
-		m_cur_entry--;
-		Play();
-	}
-}
-
-void Playlist::SetDead()
-{
-	PLEntry *ple = (PLEntry *) gf_list_get(m_entries, m_cur_entry);
-	if (ple) {
-		ple->m_bIsDead = GF_TRUE;
-		UpdateEntry(m_cur_entry);
-		m_all_dead_entries=-1;
-		if (ple->m_bIsPlaying) PlayNext();
-	}
-}
-void Playlist::SetDuration(u32 duration)
-{
-	PLEntry *ple = (PLEntry *) gf_list_get(m_entries, m_cur_entry);
-	if (ple) {
-		ple->m_duration = duration;
-		UpdateEntry(m_cur_entry);
-	}
-}
-
-CString Playlist::GetDisplayName()
-{
-	PLEntry *ple = (PLEntry *) gf_list_get(m_entries, m_cur_entry);
-	if (ple) return CString(ple->m_disp_name);
-	return CString("");
-}
-
-CString Playlist::GetURL()
-{
-	PLEntry *ple = (PLEntry *) gf_list_get(m_entries, m_cur_entry);
-	if (ple) return CString(ple->m_url);
-	return CString("");
-}
-

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/osmo4_w32/Playlist.h Deleted

@@ -1,120 +0,0 @@
-#if !defined(AFX_PLAYLIST_H__EA74376A_83DF_435E_8484_A15BF5B77A32__INCLUDED_)
-#define AFX_PLAYLIST_H__EA74376A_83DF_435E_8484_A15BF5B77A32__INCLUDED_
-
-#if _MSC_VER > 1000
-#pragma once
-#endif // _MSC_VER > 1000
-// Playlist.h : header file
-//
-
-
-class PLEntry
-{
-public:
-	PLEntry(CString url, char *path = NULL);
-	~PLEntry();
-
-	char *m_url;
-	char *m_disp_name;
-	u32 m_duration;
-
-	Bool m_bIsSelected;
-	Bool m_bIsDead;
-	Bool m_bIsPlaying;
-};
-
-
-/////////////////////////////////////////////////////////////////////////////
-// Playlist dialog
-
-class Playlist : public CDialog
-{
-// Construction
-public:
-	Playlist();
-	virtual ~Playlist();
-
-	virtual BOOL Create() {
-		/*use desktop window to enable playlist behind player*/
-		return CDialog::Create(IDD_PLAYLIST, GetDesktopWindow());
-	}
-
-	CToolBar    m_toolBar;
-	GF_List *m_entries;
-
-	void Clear();
-	void ClearButPlaying();
-	void RefreshList();
-	void AddDir(Bool do_recurse);
-	void Truncate();
-	void SetDead();
-	void SetDuration(u32 duration);
-
-	void Play();
-	void PlayNext();
-	void PlayPrev();
-	Bool HasValidEntries();
-	CString GetDisplayName();
-	CString GetURL();
-
-	void OpenPlayList(CString fileName);
-
-	void QueueURL(CString filename);
-	s32 m_cur_entry;
-
-// Dialog Data
-	//{{AFX_DATA(Playlist)
-	enum { IDD = IDD_PLAYLIST};
-	CListCtrl	m_FileList;
-	//}}AFX_DATA
-
-// Overrides
-	// ClassWizard generated virtual function overrides
-	//{{AFX_VIRTUAL(Playlist)
-protected:
-	virtual void DoDataExchange(CDataExchange* pDX);
-	virtual BOOL OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult);
-	//}}AFX_VIRTUAL
-
-// Implementation
-protected:
-	s32 m_all_dead_entries;
-	void UpdateEntry(u32 idx);
-	void RefreshCurrent();
-	void Sort(u32 type);
-	void Save(char *szPath, Bool save_m3u);
-
-	// Generated message map functions
-	//{{AFX_MSG(Playlist)
-	virtual BOOL OnInitDialog() ;
-	afx_msg void OnSize(UINT nType, int cx, int cy);
-	afx_msg void OnDropFiles(HDROP hDropInfo);
-	afx_msg void OnPlAddFile();
-	afx_msg void OnPlRemFile();
-	afx_msg void OnSelUp();
-	afx_msg void OnSelDown();
-	afx_msg void OnPlSave();
-	afx_msg void OnClose();
-	afx_msg void OnPlRemDead();
-	afx_msg void OnPlRemAll();
-	afx_msg void OnPlAddDir();
-	afx_msg void OnPlAddDirRec();
-	afx_msg void OnPlAddUrl();
-	afx_msg void OnPlOpen();
-	afx_msg void OnReverseSelection();
-	afx_msg void OnReverseList();
-	afx_msg void OnRandomize();
-	afx_msg void OnSortTitle();
-	afx_msg void OnSortFile();
-	afx_msg void OnSortDuration();
-	afx_msg void OnPlPlay();
-	afx_msg void OnRclickFilelist(NMHDR* pNMHDR, LRESULT* pResult);
-	afx_msg void OnDblclkFilelist(NMHDR* pNMHDR, LRESULT* pResult);
-	//}}AFX_MSG
-	DECLARE_MESSAGE_MAP()
-};
-
-//{{AFX_INSERT_LOCATION}}
-// Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_PLAYLIST_H__EA74376A_83DF_435E_8484_A15BF5B77A32__INCLUDED_)

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/osmo4_w32/Sliders.cpp Deleted

@@ -1,148 +0,0 @@
-// Sliders.cpp : implementation file
-//
-
-#include "stdafx.h"
-#include "osmo4.h"
-#include "Sliders.h"
-#include <gpac/options.h>
-
-#ifdef _DEBUG
-#define new DEBUG_NEW
-#undef THIS_FILE
-static char THIS_FILE = __FILE__;
-#endif
-
-/////////////////////////////////////////////////////////////////////////////
-// Sliders dialog
-
-Sliders::Sliders(CWnd* pParent /*=NULL*/)
-	: CDialog(Sliders::IDD, pParent)
-{
-	//{{AFX_DATA_INIT(Sliders)
-	//}}AFX_DATA_INIT
-
-	m_grabbed = GF_FALSE;
-}
-
-
-void Sliders::DoDataExchange(CDataExchange* pDX)
-{
-	CDialog::DoDataExchange(pDX);
-	//{{AFX_DATA_MAP(Sliders)
-	DDX_Control(pDX, ID_AUDIO_VOL, m_AudioVol);
-	DDX_Control(pDX, ID_SLIDER, m_PosSlider);
-	//}}AFX_DATA_MAP
-}
-
-
-BEGIN_MESSAGE_MAP(Sliders, CDialog)
-	//{{AFX_MSG_MAP(Sliders)
-	ON_WM_HSCROLL()
-	ON_WM_SIZE()
-	ON_WM_CLOSE()
-	//}}AFX_MSG_MAP
-END_MESSAGE_MAP()
-
-/////////////////////////////////////////////////////////////////////////////
-// Sliders message handlers
-
-void Sliders::OnHScroll(UINT nSBCode, UINT nPos, CScrollBar* pScrollBar)
-{
-
-	Osmo4 *app = GetApp();
-	if (pScrollBar->GetDlgCtrlID() == ID_SLIDER) {
-		switch (nSBCode) {
-		case TB_PAGEUP:
-		case TB_PAGEDOWN:
-		case TB_LINEUP:
-		case TB_LINEDOWN:
-		case TB_TOP:
-		case TB_BOTTOM:
-//			m_grabbed = GF_TRUE;
-			break;
-		case TB_THUMBPOSITION:
-		case TB_THUMBTRACK:
-			m_grabbed = GF_TRUE;
-			break;
-		case TB_ENDTRACK:
-			if (m_grabbed) {
-				if (!app->can_seek || !app->m_isopen) {
-					m_PosSlider.SetPos(0);
-				} else {
-					u32 range = m_PosSlider.GetRangeMax() - m_PosSlider.GetRangeMin();
-					u32 seek_to = m_PosSlider.GetPos();
-					app->PlayFromTime(seek_to);
-				}
-				m_grabbed = GF_FALSE;
-			}
-			break;
-		}
-	}
-	if (pScrollBar->GetDlgCtrlID() == ID_AUDIO_VOL) {
-		u32 vol = m_AudioVol.GetPos();
-		gf_term_set_option(app->m_term, GF_OPT_AUDIO_VOLUME, vol);
-	}
-	CDialog::OnHScroll(nSBCode, nPos, pScrollBar);
-}
-
-void Sliders::OnSize(UINT nType, int cx, int cy)
-{
-	CDialog::OnSize(nType, cx, cy);
-
-	if (!m_PosSlider.m_hWnd) return;
-	RECT rc, rc2;
-
-	u32 tw = 40;
-	//m_PosSlider.GetClientRect(&rc);
-	//rc.right = rc.left + cx;
-	//m_PosSlider.SetWindowPos(this, rc.left, rc.top, rc.right, rc.bottom, SWP_NOZORDER | SWP_NOMOVE);
-
-	m_PosSlider.GetClientRect(&rc);
-	rc.right = rc.left + cx - tw;
-	rc.top += 10;
-	rc.bottom += 10;
-	m_PosSlider.SetWindowPos(this, rc.left, rc.top, rc.right, rc.bottom, SWP_NOZORDER | SWP_NOMOVE);
-
-	const UINT nPixelsLength = 24;
-	m_PosSlider.ModifyStyle(0,TBS_FIXEDLENGTH,FALSE);
-	m_PosSlider.SendMessage(TBM_SETTHUMBLENGTH,nPixelsLength,0);
-
-	m_AudioVol.GetClientRect(&rc2);
-	rc2.top = rc2.bottom = cy/2;
-	rc2.top -= cy/3;
-	rc2.bottom += cy/3;
-	rc2.left = rc.right;
-	rc2.right = rc.right+tw;
-	m_AudioVol.MoveWindow(&rc2);
-
-}
-
-/*we sure don't want to close this window*/
-void Sliders::OnClose()
-{
-	u32 i = 0;
-	return;
-}
-
-BOOL Sliders::PreTranslateMessage(MSG* pMsg)
-{
-	if (pMsg->message == WM_KEYDOWN) {
-		GetApp()->m_pMainWnd->SetFocus();
-		GetApp()->m_pMainWnd->PostMessage(pMsg->message, pMsg->wParam, pMsg->lParam);
-		return TRUE;
-	}
-	return CDialog::PreTranslateMessage(pMsg);
-}
-
-
-BOOL Sliders::OnInitDialog()
-{
-	CDialog::OnInitDialog();
-	m_AudioVol.SetRange(0, 100);
-	return TRUE;
-}
-
-void Sliders::SetVolume()
-{
-	m_AudioVol.SetPos(gf_term_get_option(GetApp()->m_term, GF_OPT_AUDIO_VOLUME));
-}

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/osmo4_w32/Sliders.h Deleted

@@ -1,62 +0,0 @@
-#if !defined(AFX_SLIDERS_H__3542255E_1376_4FB7_91E7_B4841BB4F173__INCLUDED_)
-#define AFX_SLIDERS_H__3542255E_1376_4FB7_91E7_B4841BB4F173__INCLUDED_
-
-#if _MSC_VER > 1000
-#pragma once
-#endif // _MSC_VER > 1000
-// Sliders.h : header file
-//
-
-/////////////////////////////////////////////////////////////////////////////
-// Sliders dialog
-class MySliderCtrl : public CSliderCtrl
-{
-public:
-	MySliderCtrl () {}   // standard constructor
-
-protected:
-	afx_msg virtual void OnLButtonDown(UINT   nFlags,   CPoint   point);
-};
-
-class Sliders : public CDialog
-{
-// Construction
-public:
-	Sliders(CWnd* pParent = NULL);   // standard constructor
-
-	void SetVolume();
-	Bool m_grabbed;
-
-// Dialog Data
-	//{{AFX_DATA(Sliders)
-	enum { IDD = IDD_SLIDERS };
-	CSliderCtrl	m_AudioVol;
-	CSliderCtrl	m_PosSlider;
-	//}}AFX_DATA
-
-
-// Overrides
-	// ClassWizard generated virtual function overrides
-	//{{AFX_VIRTUAL(Sliders)
-protected:
-	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
-	//}}AFX_VIRTUAL
-
-// Implementation
-protected:
-
-	// Generated message map functions
-	//{{AFX_MSG(Sliders)
-	afx_msg void OnHScroll(UINT nSBCode, UINT nPos, CScrollBar* pScrollBar);
-	afx_msg void OnSize(UINT nType, int cx, int cy);
-	afx_msg void OnClose();
-	virtual BOOL OnInitDialog();
-	virtual BOOL PreTranslateMessage(MSG* pMsg);
-	//}}AFX_MSG
-	DECLARE_MESSAGE_MAP()
-};
-
-//{{AFX_INSERT_LOCATION}}
-// Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_SLIDERS_H__3542255E_1376_4FB7_91E7_B4841BB4F173__INCLUDED_)

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/osmo4_w32/StdAfx.cpp Deleted

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/osmo4_w32/StdAfx.h Deleted

@@ -1,30 +0,0 @@
-// stdafx.h : include file for standard system include files,
-//  or project specific include files that are used frequently, but
-//      are changed infrequently
-//
-
-#if !defined(AFX_STDAFX_H__1EEB44C5_1152_4872_8CA7_BD2994085EDC__INCLUDED_)
-#define AFX_STDAFX_H__1EEB44C5_1152_4872_8CA7_BD2994085EDC__INCLUDED_
-
-#ifndef WINVER
-#define WINVER 0x0501
-#endif
-
-#if _MSC_VER > 1000
-#pragma once
-#endif // _MSC_VER > 1000
-
-#define VC_EXTRALEAN		// Exclude rarely-used stuff from Windows headers
-
-#include <afxwin.h>         // MFC core and standard components
-#include <afxext.h>         // MFC extensions
-#include <afxdtctl.h>		// MFC support for Internet Explorer 4 Common Controls
-#ifndef _AFX_NO_AFXCMN_SUPPORT
-#include <afxcmn.h>			// MFC support for Windows Common Controls
-#endif // _AFX_NO_AFXCMN_SUPPORT
-
-
-//{{AFX_INSERT_LOCATION}}
-// Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_STDAFX_H__1EEB44C5_1152_4872_8CA7_BD2994085EDC__INCLUDED_)

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/osmo4_w32/res Deleted

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/osmo4_w32/res/Osmo4.rc2 Deleted

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/osmo4_w32/res/error.ico Deleted

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/osmo4_w32/res/maintool.bmp Deleted

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/osmo4_w32/res/message.ico Deleted

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/osmo4_w32/res/osmo4.ico Deleted

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/osmo4_w32/res/pause.ico Deleted

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/osmo4_w32/res/play.ico Deleted

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/osmo4_w32/res/playlist.bmp Deleted

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/osmo4_w32/res/stop.ico Deleted

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/osmo4_w32/resource.h Deleted

@@ -1,323 +0,0 @@
-//{{NO_DEPENDENCIES}}
-// Microsoft Visual C++ generated include file.
-// Used by Osmo4.rc
-//
-#define IDD_ABOUTBOX                    100
-#define IDR_MAINFRAME                   128
-#define IDR_GPACTYPE                    129
-#define IDD_CONTROL                     132
-#define IDI_PLAY                        141
-#define IDI_STOP                        142
-#define IDI_PAUSE                       143
-#define IDI_MESSAGE                     144
-#define IDI_ERR                         145
-#define IDD_OPTIONS                     152
-#define IDD_OPT_GEN                     154
-#define IDD_OPT_RENDER                  155
-#define IDD_OPT_AUDIO                   157
-#define IDD_OPT_VIDEO                   158
-#define IDD_OPT_HTTP                    159
-#define IDD_OPT_FONT                    161
-#define IDD_OPT_SYSTEMS                 162
-#define IDD_OPT_STREAM                  164
-#define IDD_PROPERTIES                  166
-#define IDD_OPT_DECODER                 167
-#define IDD_OPT_RENDER2D                168
-#define IDD_OPT_RENDER3D                169
-#define IDR_MAINTOOLS                   170
-#define ID_MAINSLIDER                   171
-#define IDD_SLIDERS                     173
-#define IDD_NAVBAR                      176
-#define IDD_PLAYLIST                    177
-#define IDR_PLAYLIST                    178
-#define IDD_OPT_FILETYPES               179
-#define IDR_MENUPL                      182
-#define IDD_PASSWD                      188
-#define IDR_MAINACCEL                   190
-#define IDC_FILES_MIMES                 1000
-#define IDC_FILES_PLUG                  1001
-#define ID_AUDIO_VOL                    1002
-#define IDC_TXT_SITE                    1003
-#define IDC_EDIT_USER                   1004
-#define IDC_EDIT_PASSWORD               1005
-#define IDC_PLAY                        1006
-#define IDC_STOP                        1007
-#define IDC_COMBOURL                    1008
-#define IDC_BROWSE                      1009
-#define IDC_BUTGO                       1010
-#define IDC_SPIN_OPT                    1011
-#define IDC_OPT_SET_NAME                1012
-#define IDC_LANG                        1013
-#define IDC_LOOP                        1014
-#define IDC_AUTOSTART                   1015
-#define IDC_FILEASSOC                   1016
-#define IDC_NO_CONSOLE                  1017
-#define IDC_BIFS_RATE                   1018
-#define IDC_DEC_THREAD                  1019
-#define IDC_DIRECTRENDER                1020
-#define IDC_HWMEMORY                    1021
-#define IDC_BIFSDROP                    1023
-#define IDC_SPIN_AUDIO                  1024
-#define IDC_EDIT_AUDIO                  1025
-#define IDC_FORCE_AUDIO                 1026
-#define IDC_SPIN_FPS                    1027
-#define IDC_AUDIO_FPS                   1028
-#define IDC_AUDIO_MULTICH               1029
-#define IDC_GD_LIST                     1031
-#define IDC_FAST_RENDER                 1032
-#define IDC_FORCE_DURATION              1033
-#define IDC_YUV                         1034
-#define IDC_AUDIO_RESYNC                1035
-#define IDC_AUDIO_NOTIFS                1036
-#define IDC_STOPATEND                   1037
-#define IDC_CLEAN_CACHE                 1038
-#define IDC_RESTART_CACHE               1039
-#define IDC_NOTIFY_PROG                 1040
-#define IDC_BROWSE_CACHE                1041
-#define IDC_LOOKFORSUB                  1042
-#define IDD_OPT_MCACHE                  1043
-#define IDC_DRIVER_LIST                 1044
-#define IDC_AA_LIST                     1045
-#define IDC_ZOOM_SCALABLE               1046
-#define IDD_OPENFILE                    1047
-#define IDC_SINGLE_INSTANCE             1048
-#define IDC_VIDEO_LIST                  1049
-#define IDC_FONT_LIST                   1050
-#define IDC_BROWSE_FONT                 1051
-#define IDC_USE_FONT                    1052
-#define IDC_SAVEOPT                     1053
-#define IDC_PORT                        1054
-#define IDC_RTSP                        1055
-#define IDC_TIMEOUT                     1056
-#define IDC_BUFFER                      1057
-#define IDC_REBUFFER_LEN                1058
-#define IDC_REBUFFER                    1059
-#define IDC_ODTREE                      1060
-#define IDC_VIEWSG                      1061
-#define IDC_FORCE_SIZE                  1062
-#define IDC_USE_RENDER3D                1063
-#define IDC_ODINFO                      1064
-#define IDC_WORLD                       1065
-#define IDC_GOGPAC                      1066
-#define IDC_GOOSMO4                     1067
-#define IDC_DUMP_XMT                    1068
-#define IDC_OBJECT_TIME                 1069
-#define IDC_FORMAT_YUV                  1070
-#define IDC_DRAW_BOUNDS                 1071
-#define IDC_REORDER                     1072
-#define IDC_TEXTURE_MODE                1073
-#define IDC_SWITCH_RES                  1074
-#define IDC_AUDEC_LIST                  1075
-#define IDC_VIDEC_LIST                  1076
-#define IDC_ASSOCIATE                   1077
-#define IDC_RASTER_OUTLINE              1078
-#define IDC_EMUL_POW2                   1079
-#define IDC_DISABLE_POLY_AA             1080
-#define IDC_WIRE_NONE                   1081
-#define IDC_WIRE_ONLY                   1082
-#define IDC_WIRE_BOTH                   1083
-#define IDC_DISABLE_TX_RECT             1084
-#define IDC_BITMAP_USE_PIXEL            1085
-#define IDC_TEXTURE_TEXT                1086
-#define IDC_SLIDER                      1087
-#define ID_SLIDER                       1088
-#define IDC_SELECT                      1089
-#define IDC_NO_BACKCULL                 1090
-#define IDC_FILES_EXT                   1091
-#define IDC_VIEWSEL                     1094
-#define IDC_ADDRESS                     1096
-#define IDC_DUMTXT                      1097
-#define IDC_FILELIST                    1109
-#define IDC_BROWSE_MCACHE               1110
-#define IDC_MCACHE_OVERWRITE            1111
-#define IDC_MCACHE_USENAME              1112
-#define IDC_BASEPRES                    1113
-#define ID_FILE_EXIT                    1114
-#define ID_H_ABOUT                      1115
-#define ID_PLAYLIST_LOOP                1116
-#define ID_OPEN_FILE                     1117
-#define ID_VIEW_CONTROL                 1118
-#define ID_VIEW_ORIGINAL                1119
-#define ID_VIEW_FULLSCREEN              1120
-#define ID_AR_KEEP                      1121
-#define IDC_DRAW_NORMALS                1122
-#define IDC_BACK_CULL                   1123
-#define IDC_DRAW_MODE                   1124
-#define ID_SHORTCUTS                    1125
-#define ID_FILE_RESTART                 1126
-#define ID_OPT_QUALITY                  1127
-#define ID_FILE_PROP                    1128
-#define ID_FILE_STEP                    1129
-#define IDD_CONFIGURE                   1130
-#define ID_VIEW_SCALABLE                1131
-#define ID_OPEN_URL                     1132
-#define ID_FILE_RELOAD                  1133
-#define ID_FILE_PLAY                    1134
-#define ID_NAVIGATE_NONE                1135
-#define ID_NAVIGATE_WALK                1136
-#define ID_NAVIGATE_FLY                 1137
-#define ID_NAVIGATE_EXAM                1138
-#define ID_NAVIGATE_PAN                 1139
-#define ID_NAVIGATE_SLIDE               1140
-#define ID_NAVIGATE_GAME                1141
-#define ID_AR_FILL                      1142
-#define ID_AR_43                        1143
-#define ID_AR_169                       1144
-#define ID_FILE_MIGRATE                 1145
-#define ID_NAV_RESET                    1151
-#define ID_FILE_STOP                    1152
-#define ID_FILE_PREV                    1155
-#define ID_FILE_NEXT                    1156
-#define ID_FILE_PROPS                   1157
-#define ID_SWITCH_RENDER                1158
-#define ID_RELOAD_TERMINAL              1159
-#define ID_VIEW_PLAYLIST                1160
-#define ID_NAVIGATE_ORBIT               1161
-#define ID_COLLIDE_NONE                 1162
-#define ID_COLLIDE_REG                  1163
-#define ID_COLLIDE_DISP                 1164
-#define ID_GRAVITY                      1165
-#define ID_HEADLIGHT                    1166
-#define ID_NAV_INFO                     1167
-#define ID_NAV_PREV                     1168
-#define ID_NAV_NEXT                     1169
-#define ID_CLEAR_NAV                    1170
-#define ID_TIMER                        1171
-#define ID_FPS                          1172
-#define ID_VIEWPORT_EMPTY               1173
-#define ID_PL_REM_ALL                   1174
-#define ID_PL_REM_DEAD                  1175
-#define ID_PL_ADD_DIR_REC               1176
-#define ID_PL_ADD_FILE                  1177
-#define ID_PL_REM_FILE                  1178
-#define ID_PL_OPEN                      1179
-#define ID_PL_SAVE                      1180
-#define ID_PL_UP                        1181
-#define ID_PL_DOWN                      1182
-#define ID_VIEW_PL                      1183
-#define ID_PL_ADD_DIR                   1184
-#define ID_PL_ADD_URL                   1185
-#define ID_PL_PLAY                      1186
-#define ID_PL_SEL_REV                   1187
-#define ID_PL_SORT_TITLE                1188
-#define ID_PL_SORT_FILE                 1189
-#define ID_PL_SORT_DUR                  1190
-#define ID_PL_SORT_REV                  1191
-#define ID_PL_RANDOM                    1192
-#define ID_ADD_SUBTITLE                 1193
-#define ID_NAVIGATE_VR                  1194
-#define ID_REC_ENABLE                   1195
-#define ID_REC_STOP                     1196
-#define ID_REC_ABORT                    1197
-#define ID_AUDIO_EMPTY                  1198
-#define ID_VIDEO_EMPTY                  1199
-#define ID_SUBS_EMPTY                   1200
-#define ID_VIEW_CPU                     1201
-#define IDC_SAX_PROGRESSIVE             1202
-#define IDC_SAX_DELAY                   1203
-#define IDC_HTTP_PROXY                  1204
-#define IDC_HTTP_USE_PROXY              1205
-#define IDC_LOG_LEVEL                   1210
-#define IDC_TOOL_CORE                   1211
-#define IDC_TOOL_CODING                 1212
-#define IDC_TOOL_CONTAINER              1213
-#define IDC_TOOL_NET                    1214
-#define IDC_TOOL_RTP                    1215
-#define IDC_TOOL_AUTHOR                 1216
-#define IDC_TOOL_CODEC                  1217
-#define IDC_TOOL_PARSER                 1218
-#define IDC_TOOL_MEDIA                  1219
-#define IDC_TOOL_SCENE                  1220
-#define IDC_TOOL_SCRIPT                 1221
-#define IDC_TOOL_COMPOSE                1222
-#define IDC_TOOL_RENDER                 1223
-#define IDC_TOOL_MMIO                   1224
-#define IDC_TOOL_SYNC                   1225
-#define IDD_OPT_LOGS                    1226
-#define ID_VP_0                         1300
-#define ID_VP_1                         1301
-#define ID_VP_2                         1302
-#define ID_VP_3                         1303
-#define ID_VP_4                         1304
-#define ID_VP_5                         1305
-#define ID_VP_6                         1306
-#define ID_VP_7                         1307
-#define ID_VP_8                         1308
-#define ID_VP_9                         1309
-#define ID_VP_10                        1310
-#define ID_VP_11                        1311
-#define ID_VP_12                        1312
-#define ID_VP_13                        1313
-#define ID_VP_14                        1314
-#define ID_VP_15                        1315
-#define ID_VP_16                        1316
-#define ID_VP_17                        1317
-#define ID_VP_18                        1318
-#define ID_VP_19                        1319
-#define ID_NAV_PREV_0                   1320
-#define ID_NAV_PREV_1                   1321
-#define ID_NAV_PREV_2                   1322
-#define ID_NAV_PREV_3                   1323
-#define ID_NAV_PREV_4                   1324
-#define ID_NAV_PREV_5                   1325
-#define ID_NAV_PREV_6                   1326
-#define ID_NAV_PREV_7                   1327
-#define ID_NAV_PREV_8                   1328
-#define ID_NAV_PREV_9                   1329
-#define ID_NAV_NEXT_0                   1330
-#define ID_NAV_NEXT_1                   1331
-#define ID_NAV_NEXT_2                   1332
-#define ID_NAV_NEXT_3                   1333
-#define ID_NAV_NEXT_4                   1334
-#define ID_NAV_NEXT_5                   1335
-#define ID_NAV_NEXT_6                   1336
-#define ID_NAV_NEXT_7                   1337
-#define ID_NAV_NEXT_8                   1338
-#define ID_NAV_NEXT_9                   1339
-#define ID_SELOBJ_0                     1340
-#define ID_SELOBJ_1                     1341
-#define ID_SELOBJ_2                     1342
-#define ID_SELOBJ_3                     1343
-#define ID_SELOBJ_4                     1344
-#define ID_SELOBJ_5                     1345
-#define ID_SELOBJ_6                     1346
-#define ID_SELOBJ_7                     1347
-#define ID_SELOBJ_8                     1348
-#define ID_SELOBJ_9                     1349
-#define ID_SELOBJ_10                    1350
-#define ID_SELOBJ_11                    1351
-#define ID_SELOBJ_12                    1352
-#define ID_SELOBJ_13                    1353
-#define ID_SELOBJ_14                    1354
-#define ID_SELOBJ_15                    1355
-#define ID_SELOBJ_16                    1356
-#define ID_SELOBJ_17                    1357
-#define ID_SELOBJ_18                    1358
-#define ID_SELOBJ_19                    1359
-#define ID_SELOBJ_20                    1360
-#define ID_SELOBJ_21                    1361
-#define ID_SELOBJ_22                    1362
-#define ID_SELOBJ_23                    1363
-#define ID_SELOBJ_24                    1364
-#define ID_SELOBJ_25                    1365
-#define ID_SELOBJ_26                    1366
-#define ID_SELOBJ_27                    1367
-#define ID_SELOBJ_28                    1368
-#define ID_SELOBJ_29                    1369
-#define ID_SETCHAP_FIRST                2000
-#define ID_SETCHAP_LAST                 2200
-#define ID_FILE_COPY                    32961
-#define ID_FILE_PASTE                   32962
-#define ID_CONFIG_RELOAD                32963
-
-// Next default values for new objects
-//
-#ifdef APSTUDIO_INVOKED
-#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_3D_CONTROLS                     1
-#define _APS_NEXT_RESOURCE_VALUE        192
-#define _APS_NEXT_COMMAND_VALUE         32981
-#define _APS_NEXT_CONTROL_VALUE         1131
-#define _APS_NEXT_SYMED_VALUE           101
-#endif
-#endif

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/osmo4_wce Deleted

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/osmo4_wce/MainFrm.cpp Deleted

@@ -1,661 +0,0 @@
-// MainFrm.cpp : implementation of the CMainFrame class
-//
-
-#ifdef _DEBUG
-#include "stdafx.h"
-#else
-#include "stdafx.h"
-#undef _DEBUG
-#endif
-
-#include "Osmo4.h"
-
-#include <gpac/options.h>
-#include <gpac/network.h>
-
-#include "MainFrm.h"
-#include <gx.h>
-
-#ifdef _DEBUG
-#define new DEBUG_NEW
-#undef THIS_FILE
-static char THIS_FILE = __FILE__;
-#endif
-
-
-
-CChildView::CChildView()
-{
-}
-
-CChildView::~CChildView()
-{
-	/*since the wndproc is overwritten by the terminal, we detach the handle otherwise we get a nice assertion
-	failure from windows*/
-	HWND hWnd = Detach();
-	::PostMessage(hWnd, WM_QUIT, 0, 0);
-}
-
-
-BEGIN_MESSAGE_MAP(CChildView,CWnd )
-	//{{AFX_MSG_MAP(CChildView)
-	//}}AFX_MSG_MAP
-END_MESSAGE_MAP()
-
-
-/////////////////////////////////////////////////////////////////////////////
-// CChildView message handlers
-
-BOOL CChildView::PreCreateWindow(CREATESTRUCT& cs)
-{
-	if (!CWnd::PreCreateWindow(cs))
-		return FALSE;
-
-	cs.style &= ~WS_BORDER;
-	cs.lpszClass = AfxRegisterWndClass(CS_HREDRAW|CS_VREDRAW|CS_DBLCLKS,
-	                                   NULL, HBRUSH(COLOR_WINDOW+1), NULL);
-
-	return TRUE;
-}
-
-/////////////////////////////////////////////////////////////////////////////
-// CMainFrame
-
-IMPLEMENT_DYNAMIC(CMainFrame, CFrameWnd)
-
-BEGIN_MESSAGE_MAP(CMainFrame, CFrameWnd)
-	//{{AFX_MSG_MAP(CMainFrame)
-	ON_WM_CREATE()
-	ON_WM_SETFOCUS()
-	ON_COMMAND(ID_APP_EXIT, OnAppExit)
-	ON_MESSAGE(WM_OPENURL, Open)
-	ON_MESSAGE(WM_SETTINGCHANGE, OnSIPChange)
-	ON_MESSAGE(WM_SETSIZE,OnSetSize)
-	ON_MESSAGE(WM_NAVIGATE,OnNavigate)
-	ON_WM_SIZE()
-	ON_COMMAND(ID_FILE_STEP, OnFileStep)
-	ON_UPDATE_COMMAND_UI(ID_FILE_STEP, OnUpdateFileStep)
-	ON_COMMAND(ID_FILE_PAUSE, OnFilePause)
-	ON_UPDATE_COMMAND_UI(ID_FILE_PAUSE, OnUpdateFilePause)
-	ON_COMMAND(ID_FILE_STOP, OnFileStop)
-	ON_UPDATE_COMMAND_UI(ID_FILE_STOP, OnUpdateFileStop)
-	ON_COMMAND(ID_VIEW_FULLSCREEN, OnViewFullscreen)
-	ON_UPDATE_COMMAND_UI(ID_VIEW_FULLSCREEN, OnUpdateViewFullscreen)
-	ON_WM_CLOSE()
-	ON_COMMAND(ID_VIEW_FIT, OnViewFit)
-	ON_UPDATE_COMMAND_UI(ID_VIEW_FIT, OnUpdateViewFit)
-	ON_COMMAND(ID_VIEW_AR_ORIG, OnViewArOrig)
-	ON_COMMAND(ID_VIEW_AR_FILL, OnViewArFill)
-	ON_COMMAND(ID_VIEW_AR_43, OnViewAr43)
-	ON_COMMAND(ID_VIEW_AR_169, OnViewAr169)
-	ON_COMMAND(ID_NAV_NONE, OnNavNone)
-	ON_COMMAND(ID_NAV_SLIDE, OnNavSlide)
-	ON_COMMAND(ID_NAV_RESET, OnNaveReset)
-	ON_COMMAND_RANGE(ID_NAV_NONE, ID_NAV_EXAMINE, OnSetNavigation)
-	ON_WM_KEYDOWN()
-	ON_WM_KEYUP()
-	ON_COMMAND(ID_VIEW_TIMING, OnViewTiming)
-	ON_UPDATE_COMMAND_UI(ID_VIEW_TIMING, OnUpdateViewTiming)
-	ON_WM_INITMENUPOPUP()
-	//}}AFX_MSG_MAP
-END_MESSAGE_MAP()
-
-/////////////////////////////////////////////////////////////////////////////
-// CMainFrame construction/destruction
-
-CMainFrame::CMainFrame()
-{
-	GXOpenInput();
-	m_view_timing = 0;
-	m_restore_fs = 0;
-}
-
-CMainFrame::~CMainFrame()
-{
-	GXCloseInput();
-}
-
-void CMainFrame::OnSetFocus(CWnd* pOldWnd)
-{
-	if (m_restore_fs) {
-		m_restore_fs = 0;
-		GetApp()->ShowTaskBar(0);
-		OnViewFullscreen();
-	}
-}
-
-int CMainFrame::OnCreate(LPCREATESTRUCT lpCreateStruct)
-{
-	COsmo4 *app = GetApp();
-
-	if (CFrameWnd::OnCreate(lpCreateStruct) == -1)
-		return -1;
-
-	// create a view to occupy the client area of the frame
-	if (!m_wndView.Create(NULL, NULL, AFX_WS_DEFAULT_VIEW | WS_BORDER,
-	                      CRect(0, 0, 0, 0), this, AFX_IDW_PANE_FIRST, NULL))
-	{
-		TRACE0("Failed to create view window\n");
-		return -1;
-	}
-	m_wndView.ShowWindow(SW_HIDE);
-
-
-	if (!m_dumbWnd.Create(NULL, NULL, AFX_WS_DEFAULT_VIEW | WS_BORDER,
-	                      CRect(0, 0, 0, 0), this, AFX_IDW_PANE_FIRST, NULL))
-	{
-		TRACE0("Failed to create dumb window\n");
-		return -1;
-	}
-	m_dumbWnd.SetWindowPos(this, 0, 0, app->m_screen_width, app->m_screen_height-app->m_menu_height, 0L);
-	m_dumbWnd.ShowWindow(SW_HIDE);
-
-	if (!m_progBar.Create(IDD_CONTROL , this) ) {
-		TRACE0("Failed to create status bar\n");
-		return -1;      // fail to create
-	}
-	m_progBar.UpdateWindow();
-	m_progBar.SetWindowPos(this, 0, 0, app->m_screen_width, app->m_menu_height, 0L);
-	m_progBar.ShowWindow(SW_SHOWNORMAL);
-
-
-//	m_wndCommandBar.m_bShowSharedNewButton = FALSE;
-
-	if (!m_wndCommandBar.Create(this)
-	        || !m_wndCommandBar.InsertMenuBar(IDR_MENU)
-	        || !m_wndCommandBar.AddAdornments()
-	        || !m_wndCommandBar.LoadBitmap(IDR_MAINFRAME)
-	   )
-	{
-		TRACE0("Failed to create CommandBar\n");
-		return -1;      // fail to create
-	}
-
-	CToolBarCtrl & toolBar = m_wndCommandBar.GetToolBarCtrl();
-	TBBUTTON tb;
-	memset(&tb, 0, sizeof(tb));
-	tb.idCommand = ID_OPEN_FILE;
-	tb.iBitmap = 0;
-	tb.fsStyle = TBSTYLE_BUTTON;
-	toolBar.AddButtons(1, &tb);
-	tb.idCommand = 0;
-	tb.iBitmap = 0;
-	tb.fsStyle = TBSTYLE_SEP;
-	toolBar.AddButtons(1, &tb);
-	tb.idCommand = ID_FILE_PAUSE;
-	tb.iBitmap = 1;
-	tb.fsStyle = TBSTYLE_BUTTON;
-	toolBar.AddButtons(1, &tb);
-	tb.idCommand = ID_FILE_STEP;
-	tb.iBitmap = 2;
-	tb.fsStyle = TBSTYLE_BUTTON;
-	toolBar.AddButtons(1, &tb);
-	tb.idCommand = ID_FILE_STOP;
-	tb.iBitmap = 3;
-	tb.fsStyle = TBSTYLE_BUTTON;
-	toolBar.AddButtons(1, &tb);
-	tb.idCommand = 0;
-	tb.iBitmap = 0;
-	tb.fsStyle = TBSTYLE_SEP;
-	toolBar.AddButtons(1, &tb);
-
-	SetIcon(AfxGetApp()->LoadIcon(IDR_MAINFRAME), TRUE);
-	SetIcon(AfxGetApp()->LoadIcon(IDR_MAINFRAME), FALSE);
-	SetWindowPos(NULL, 0, 0, app->m_screen_width, app->m_screen_height, 0L);
-
-	SetWindowText(_T("Osmo4"));
-	return 0;
-}
-
-void CMainFrame::SetPauseButton(Bool force_play_button)
-{
-	CToolBarCtrl & toolBar = m_wndCommandBar.GetToolBarCtrl();
-	TBBUTTON tb;
-	memset(&tb, 0, sizeof(tb));
-	tb.idCommand = ID_FILE_PAUSE;
-	tb.fsStyle = TBSTYLE_BUTTON;
-
-	if (force_play_button || GetApp()->m_stopped || gf_term_get_option(GetApp()->m_term, GF_OPT_PLAY_STATE)==GF_STATE_PAUSED) {
-		tb.iBitmap = 4;
-	} else {
-		tb.iBitmap = 1;
-	}
-	toolBar.DeleteButton(5);
-	toolBar.InsertButton(5, &tb);
-}
-
-
-BOOL CMainFrame::PreCreateWindow(CREATESTRUCT& cs)
-{
-	if( !CFrameWnd::PreCreateWindow(cs) )
-		return FALSE;
-	// TODO: Modify the Window class or styles here by modifying
-	//  the CREATESTRUCT cs
-
-
-	cs.lpszClass = AfxRegisterWndClass(0);
-	return TRUE;
-}
-
-
-/////////////////////////////////////////////////////////////////////////////
-// CMainFrame diagnostics
-
-/*
-#ifdef _DEBUG
-void CMainFrame::AssertValid() const
-{
-	CFrameWnd::AssertValid();
-}
-
-void CMainFrame::Dump(CDumpContext& dc) const
-{
-	CFrameWnd::Dump(dc);
-}
-
-#endif //_DEBUG
-*/
-
-/////////////////////////////////////////////////////////////////////////////
-// CMainFrame message handlers
-BOOL CMainFrame::OnCmdMsg(UINT nID, int nCode, void* pExtra, AFX_CMDHANDLERINFO* pHandlerInfo)
-{
-	// let the view have first crack at the command
-	if (m_wndView.OnCmdMsg(nID, nCode, pExtra, pHandlerInfo))
-		return TRUE;
-
-	// otherwise, do default handling
-	return CFrameWnd::OnCmdMsg(nID, nCode, pExtra, pHandlerInfo);
-}
-
-#define PROGRESS_TIMER	20
-#define PROGRESS_REFRESH_MS		500
-
-void CALLBACK EXPORT ProgressTimer(HWND , UINT , UINT nID , DWORD )
-{
-	if (nID != PROGRESS_TIMER) return;
-	((CMainFrame *) GetApp()->m_pMainWnd)->UpdateTime();
-}
-
-void CMainFrame::UpdateTime()
-{
-	u32 now;
-
-	COsmo4 *app = GetApp();
-	if (!app->m_open || app->m_stopped) return;
-	now = gf_term_get_time_in_ms(app->m_term);
-	if (!now) return;
-
-	if (app->m_can_seek && (now>=app->m_duration + 100)) {
-		if (gf_term_get_option(app->m_term, GF_OPT_IS_FINISHED)) {
-			if (app->m_Loop && m_full_screen) {
-				gf_term_play_from_time(app->m_term, 0, 0);
-			} else {
-				OnFileStop();
-				if (app->m_Loop) OnFilePause();
-			}
-			return;
-		}
-	}
-
-	if (!m_full_screen) m_progBar.SetPosition(now);
-}
-
-void CMainFrame::CloseURL()
-{
-	COsmo4 *app = GetApp();
-	if (!app->m_open) return;
-	if (m_view_timing) KillTimer(PROGRESS_TIMER);
-	gf_term_disconnect(app->m_term);
-	app->m_open = 0;
-	app->m_can_seek = 0;
-	app->m_duration = (u32) -1;
-	m_progBar.m_prev_time = 0;
-	m_progBar.SetPosition(0);
-}
-
-void CMainFrame::OnAppExit()
-{
-	CloseURL();
-	PostMessage(WM_QUIT);
-}
-
-void CMainFrame::OnSize(UINT nType, int cx, int cy)
-{
-	COsmo4 *app = GetApp();
-	u32 disp_w, disp_h, c_w, c_h, x, y;
-
-	if (m_full_screen) return;
-
-	disp_w = app->m_screen_width;
-	disp_h = app->m_screen_height;
-	CFrameWnd::OnSize(nType, disp_w, disp_h);
-
-	x = y = 0;
-	disp_h -= app->m_menu_height;
-
-	if (m_view_timing) {
-		disp_h -= app->m_menu_height;
-		y = app->m_menu_height;
-		m_progBar.SetWindowPos(this, 0, 0, app->m_screen_width, app->m_menu_height, 0L);
-		m_progBar.ShowWindow(SW_SHOWNORMAL);
-	} else {
-		m_progBar.ShowWindow(SW_HIDE);
-	}
-	m_dumbWnd.SetWindowPos(this, 0, y, disp_w, disp_h, 0L);
-	m_dumbWnd.ShowWindow(SW_SHOW);
-
-	if (m_view_timing)
-		SetTimer(PROGRESS_TIMER, PROGRESS_REFRESH_MS, ProgressTimer);
-
-	if (!app->m_scene_width || !app->m_scene_height) {
-		m_wndView.SetWindowPos(this, 0, y, disp_w, disp_h, SWP_SHOWWINDOW);
-		gf_term_set_size(app->m_term, disp_w, disp_h);
-		return;
-	}
-
-	if (!app->m_fit_screen && (app->m_scene_width < disp_w) && (app->m_scene_height < disp_h)) {
-		c_w = app->m_scene_width;
-		c_h = app->m_scene_height;
-		x = (disp_w - c_w) / 2;
-		y = (disp_h - c_h) / 2;
-	} else {
-		c_w = disp_w;
-		c_h = disp_h;
-	}
-	m_wndView.SetWindowPos(this, x, y, c_w, c_h, SWP_SHOWWINDOW | SWP_NOZORDER);
-	gf_term_set_size(app->m_term, c_w, c_h);
-}
-
-
-void CMainFrame::OnViewFullscreen()
-{
-	COsmo4 *app = GetApp();
-	if (!app->m_open) return;
-	u32 disp_w = app->m_screen_width;
-	u32 disp_h = app->m_screen_height;
-
-	Bool is_full_screen = !m_full_screen;
-
-	/*prevent resize messages*/
-	m_full_screen = 1;
-
-	HWND hWnd = GetSafeHwnd();
-	::SetForegroundWindow(hWnd);
-	::CommandBar_Show(m_wndCommandBar.GetSafeHwnd(), is_full_screen ? FALSE : TRUE);
-	SHFullScreen(hWnd, SHFS_HIDESTARTICON | SHFS_HIDETASKBAR | SHFS_HIDESIPBUTTON);
-
-	if (is_full_screen) {
-		m_dumbWnd.ShowWindow(SW_HIDE);
-
-		::MoveWindow(m_hWnd, 0, 0, disp_w, disp_h, 0);
-		m_wndView.GetWindowRect(&m_view_rc);
-		m_wndView.SetWindowPos(this, 0, 0, disp_w, disp_h, SWP_NOZORDER);
-		gf_term_set_option(app->m_term, GF_OPT_FULLSCREEN, is_full_screen);
-		m_full_screen = 1;
-	} else {
-		gf_term_set_option(app->m_term, GF_OPT_FULLSCREEN, is_full_screen);
-		m_full_screen = 0;
-		OnSetSize(0,0);
-		m_dumbWnd.ShowWindow(SW_SHOW);
-		gf_term_set_option(app->m_term, GF_OPT_REFRESH, 0);
-	}
-}
-
-
-void CMainFrame::OnUpdateViewFullscreen(CCmdUI* pCmdUI)
-{
-	pCmdUI->Enable(GetApp()->m_open ? TRUE : FALSE);
-}
-
-LONG CMainFrame::OnSetSize(WPARAM wParam, LPARAM lParam)
-{
-	RECT rc;
-	if (m_full_screen) return 0;
-	GetWindowRect(&rc);
-	SetWindowPos(NULL, 0, 0, rc.right-rc.left, rc.bottom-rc.top, SWP_NOZORDER | SWP_NOMOVE);
-	return 1;
-}
-
-LONG CMainFrame::Open(WPARAM wParam, LPARAM lParam)
-{
-	COsmo4 *app = GetApp();
-	CloseURL();
-	char filename5000;
-	CE_WideToChar((u16 *) (LPCTSTR) app->m_filename, filename);
-	app->m_stopped = 0;
-
-	if (app->m_reconnect_time) {
-		gf_term_connect_from_time(app->m_term, filename, app->m_reconnect_time, 0);
-		app->m_reconnect_time = 0;
-	} else {
-		gf_term_connect(app->m_term, filename);
-	}
-	app->SetBacklightState(1);
-	return 1;
-}
-
-
-
-
-LONG CMainFrame::OnNavigate(WPARAM /*wParam*/, LPARAM /*lParam*/)
-{
-	COsmo4 *app = GetApp();
-	char to_urlMAX_PATH;
-	CE_WideToChar((u16 *) (LPCTSTR) app->m_navigate_url, to_url);
-
-	if (gf_term_is_supported_url(app->m_term, to_url, 1, app->m_no_mime_fetch)) {
-		char fileNameMAX_PATH;
-		TCHAR w_to_urlMAX_PATH;
-		CE_WideToChar((u16 *) (LPCTSTR) app->m_filename, fileName);
-		char *str = gf_url_concatenate(fileName, to_url);
-		if (!str) str = gf_strdup(to_url);
-		CE_CharToWide(str, (u16 *)w_to_url);
-		gf_free(str);
-		app->m_filename = w_to_url;
-		Open(0, 0);
-	} else {
-		SHELLEXECUTEINFO info;
-		console_message = app->m_navigate_url;
-		console_err = GF_OK;
-		PostMessage(WM_CONSOLEMSG);
-
-
-		if (m_full_screen) {
-			OnViewFullscreen();
-			app->ShowTaskBar(1);
-			m_restore_fs = 1;
-		}
-
-		memset(&info, 0, sizeof(SHELLEXECUTEINFO));
-		info.cbSize = sizeof(SHELLEXECUTEINFO);
-		info.lpVerb = L"open";
-		info.fMask = SEE_MASK_NOCLOSEPROCESS;
-		info.lpFile = L"iexplore";
-		info.lpParameters = (LPCTSTR) app->m_navigate_url;
-		info.nShow = SW_SHOWNORMAL;
-		ShellExecuteEx(&info);
-	}
-	return 1;
-}
-
-void CMainFrame::OnFilePause()
-{
-	COsmo4 *app = GetApp();
-	if (app->m_stopped) {
-		char filename5000;
-		CE_WideToChar((u16 *) (LPCTSTR) app->m_filename, filename);
-		app->m_stopped = 0;
-		gf_term_connect(app->m_term, filename);
-		app->SetBacklightState(1);
-
-		if (m_view_timing)
-			SetTimer(PROGRESS_TIMER, PROGRESS_REFRESH_MS, ProgressTimer);
-
-		SetPauseButton();
-	} else {
-		app->Pause();
-	}
-}
-void CMainFrame::OnUpdateFilePause(CCmdUI* pCmdUI)
-{
-	COsmo4 *app = GetApp();
-	pCmdUI->Enable((app->m_open || app->m_stopped) ? TRUE : FALSE);
-}
-void CMainFrame::OnFileStop()
-{
-	COsmo4 *app = GetApp();
-	if (!app->m_open) return;
-	if (m_full_screen) OnViewFullscreen();
-	app->m_stopped = 1;
-	if (m_view_timing) KillTimer(PROGRESS_TIMER);
-	gf_term_disconnect(app->m_term);
-	m_progBar.SetPosition(0);
-	app->SetBacklightState(0);
-	SetPauseButton();
-}
-
-void CMainFrame::OnUpdateFileStop(CCmdUI* pCmdUI)
-{
-	pCmdUI->Enable( GetApp()->m_open  ? TRUE : FALSE);
-}
-
-void CMainFrame::OnFileStep()
-{
-	COsmo4 *app = GetApp();
-	gf_term_set_option(app->m_term, GF_OPT_PLAY_STATE, GF_STATE_STEP_PAUSE);
-	app->SetBacklightState(0);
-	SetPauseButton(1);
-}
-void CMainFrame::OnUpdateFileStep(CCmdUI* pCmdUI)
-{
-	pCmdUI->Enable(GetApp()->m_open ? TRUE : FALSE);
-}
-
-void CMainFrame::OnClose()
-{
-	PostMessage(WM_DESTROY);
-}
-
-LONG CMainFrame::OnSIPChange(WPARAM wParam, LPARAM lParam)
-{
-	if (wParam == SPI_SETSIPINFO) GetApp()->ShowTaskBar(0);
-	return 1;
-}
-
-void CMainFrame::OnViewFit()
-{
-	COsmo4 *app = GetApp();
-	app->m_fit_screen = !app->m_fit_screen;
-	if (app->m_open) OnSetSize(0, 0);
-}
-
-void CMainFrame::OnUpdateViewFit(CCmdUI* pCmdUI)
-{
-	pCmdUI->SetCheck(GetApp()->m_fit_screen ? TRUE : FALSE);
-}
-
-void CMainFrame::OnViewArOrig()
-{
-	gf_term_set_option(GetApp()->m_term, GF_OPT_ASPECT_RATIO, GF_ASPECT_RATIO_KEEP);
-}
-void CMainFrame::OnViewArFill()
-{
-	gf_term_set_option(GetApp()->m_term, GF_OPT_ASPECT_RATIO, GF_ASPECT_RATIO_FILL_SCREEN);
-}
-void CMainFrame::OnViewAr43()
-{
-	gf_term_set_option(GetApp()->m_term, GF_OPT_ASPECT_RATIO, GF_ASPECT_RATIO_4_3);
-}
-void CMainFrame::OnViewAr169()
-{
-	gf_term_set_option(GetApp()->m_term, GF_OPT_ASPECT_RATIO, GF_ASPECT_RATIO_16_9);
-}
-
-void CMainFrame::OnNavNone()
-{
-	gf_term_set_option(GetApp()->m_term, GF_OPT_NAVIGATION, GF_NAVIGATE_NONE);
-}
-
-void CMainFrame::OnNavSlide()
-{
-	gf_term_set_option(GetApp()->m_term, GF_OPT_NAVIGATION, GF_NAVIGATE_SLIDE);
-}
-
-void CMainFrame::OnNaveReset()
-{
-	gf_term_set_option(GetApp()->m_term, GF_OPT_NAVIGATION_TYPE, 0);
-}
-
-void CMainFrame::ForwardMessage()
-{
-	const MSG *msg = GetCurrentMessage();
-	m_wndView.SendMessage(msg->message, msg->wParam, msg->lParam);
-}
-void CMainFrame::OnKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags)
-{
-	ForwardMessage();
-}
-void CMainFrame::OnKeyUp(UINT nChar, UINT nRepCnt, UINT nFlags)
-{
-	ForwardMessage();
-}
-
-
-void CMainFrame::OnViewTiming()
-{
-	if (m_full_screen) return;
-	if (m_view_timing) KillTimer(PROGRESS_TIMER);
-	m_view_timing = !m_view_timing;
-	OnSetSize(0, 0);
-}
-
-void CMainFrame::OnUpdateViewTiming(CCmdUI* pCmdUI)
-{
-	pCmdUI->SetCheck(m_view_timing ? TRUE : FALSE);
-}
-
-void CMainFrame::OnSetNavigation(UINT nID)
-{
-	gf_term_set_option(GetApp()->m_term, GF_OPT_NAVIGATION, nID - ID_NAV_NONE);
-}
-
-
-void CMainFrame::OnInitMenuPopup(CMenu* pPopupMenu, UINT nIndex, BOOL bSysMenu)
-{
-	COsmo4 *app = GetApp();
-	CFrameWnd::OnInitMenuPopup(pPopupMenu, nIndex, bSysMenu);
-
-	u32 opt = gf_term_get_option(GetApp()->m_term, GF_OPT_ASPECT_RATIO);
-	CheckMenuItem(pPopupMenu->m_hMenu, ID_VIEW_AR_ORIG, MF_BYCOMMAND| (opt==GF_ASPECT_RATIO_KEEP) ? MF_CHECKED : MF_UNCHECKED);
-	CheckMenuItem(pPopupMenu->m_hMenu, ID_VIEW_AR_FILL, MF_BYCOMMAND| (opt==GF_ASPECT_RATIO_FILL_SCREEN) ? MF_CHECKED : MF_UNCHECKED);
-	CheckMenuItem(pPopupMenu->m_hMenu, ID_VIEW_AR_43, MF_BYCOMMAND| (opt==GF_ASPECT_RATIO_4_3) ? MF_CHECKED : MF_UNCHECKED);
-	CheckMenuItem(pPopupMenu->m_hMenu, ID_VIEW_AR_169, MF_BYCOMMAND| (opt==GF_ASPECT_RATIO_16_9) ? MF_CHECKED : MF_UNCHECKED);
-
-	CheckMenuItem(pPopupMenu->m_hMenu, ID_VIEW_FIT, MF_BYCOMMAND| app->m_fit_screen ? MF_CHECKED : MF_UNCHECKED);
-
-	u32 type;
-	if (!app->m_open) type = GF_NAVIGATE_TYPE_NONE;
-	else type = gf_term_get_option(app->m_term, GF_OPT_NAVIGATION_TYPE);
-
-	EnableMenuItem(pPopupMenu->m_hMenu, ID_NAV_NONE, MF_BYCOMMAND | ((type==GF_NAVIGATE_TYPE_NONE) ? MF_GRAYED : MF_ENABLED) );
-	EnableMenuItem(pPopupMenu->m_hMenu, ID_NAV_SLIDE, MF_BYCOMMAND | ((type==GF_NAVIGATE_TYPE_NONE) ? MF_GRAYED : MF_ENABLED) );
-	EnableMenuItem(pPopupMenu->m_hMenu, ID_NAV_RESET, MF_BYCOMMAND | ((type==GF_NAVIGATE_TYPE_NONE) ? MF_GRAYED : MF_ENABLED) );
-
-	EnableMenuItem(pPopupMenu->m_hMenu, ID_NAV_WALK, MF_BYCOMMAND | ( (type!=GF_NAVIGATE_TYPE_3D) ? MF_GRAYED : MF_ENABLED) );
-	EnableMenuItem(pPopupMenu->m_hMenu, ID_NAV_FLY, MF_BYCOMMAND | ((type!=GF_NAVIGATE_TYPE_3D) ? MF_GRAYED : MF_ENABLED) );
-	EnableMenuItem(pPopupMenu->m_hMenu, ID_NAV_EXAMINE, MF_BYCOMMAND | ((type!=GF_NAVIGATE_TYPE_3D) ? MF_GRAYED : MF_ENABLED) );
-	EnableMenuItem(pPopupMenu->m_hMenu, ID_COLLIDE_OFF, MF_BYCOMMAND | ((type!=GF_NAVIGATE_TYPE_3D) ? MF_GRAYED : MF_ENABLED) );
-	EnableMenuItem(pPopupMenu->m_hMenu, ID_COLLIDE_REG, MF_BYCOMMAND | ((type!=GF_NAVIGATE_TYPE_3D) ? MF_GRAYED : MF_ENABLED) );
-	EnableMenuItem(pPopupMenu->m_hMenu, ID_COLLIDE_DISP, MF_BYCOMMAND | ((type!=GF_NAVIGATE_TYPE_3D) ? MF_GRAYED : MF_ENABLED) );
-	EnableMenuItem(pPopupMenu->m_hMenu, ID_NAV_GRAVITY, MF_BYCOMMAND | ((type!=GF_NAVIGATE_TYPE_3D) ? MF_GRAYED : MF_ENABLED) );
-
-	if (type==GF_NAVIGATE_TYPE_NONE) {
-		u32 mode = gf_term_get_option(app->m_term, GF_OPT_NAVIGATION);
-		CheckMenuItem(pPopupMenu->m_hMenu, ID_NAV_NONE, MF_BYCOMMAND | ( (mode==GF_NAVIGATE_NONE) ? MF_CHECKED : MF_UNCHECKED) );
-		CheckMenuItem(pPopupMenu->m_hMenu, ID_NAV_SLIDE, MF_BYCOMMAND | ( (mode==GF_NAVIGATE_SLIDE) ? MF_CHECKED : MF_UNCHECKED) );
-		CheckMenuItem(pPopupMenu->m_hMenu, ID_NAV_WALK, MF_BYCOMMAND | ( (mode==GF_NAVIGATE_WALK) ? MF_CHECKED : MF_UNCHECKED) );
-		CheckMenuItem(pPopupMenu->m_hMenu, ID_NAV_FLY, MF_BYCOMMAND | ((mode==GF_NAVIGATE_FLY) ? MF_CHECKED : MF_UNCHECKED) );
-		CheckMenuItem(pPopupMenu->m_hMenu, ID_NAV_EXAMINE, MF_BYCOMMAND | ((mode==GF_NAVIGATE_EXAMINE) ? MF_CHECKED : MF_UNCHECKED) );
-	}
-}

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/osmo4_wce/MainFrm.h Deleted

@@ -1,151 +0,0 @@
-// MainFrm.h : interface of the CMainFrame class
-//
-/////////////////////////////////////////////////////////////////////////////
-
-#if !defined(AFX_MAINFRM_H__1DEE4BC7_6B56_48A8_BDD7_5DC14EF6AD3E__INCLUDED_)
-#define AFX_MAINFRM_H__1DEE4BC7_6B56_48A8_BDD7_5DC14EF6AD3E__INCLUDED_
-
-#if _MSC_VER >= 1000
-#pragma once
-#endif // _MSC_VER >= 1000
-
-#include "ProgressBar.h"
-
-
-class CChildView : public CWnd
-{
-// Construction
-public:
-	CChildView();
-
-// Attributes
-public:
-
-// Operations
-public:
-
-// Overrides
-	// ClassWizard generated virtual function overrides
-	//{{AFX_VIRTUAL(CChildView)
-protected:
-	virtual BOOL PreCreateWindow(CREATESTRUCT& cs);
-	//}}AFX_VIRTUAL
-
-// Implementation
-public:
-	virtual ~CChildView();
-	// Generated message map functions
-protected:
-	//{{AFX_MSG(CChildView)
-	//}}AFX_MSG
-	DECLARE_MESSAGE_MAP()
-};
-
-class CMainFrame : public CFrameWnd
-{
-public:
-	CMainFrame();
-
-
-
-protected:
-	DECLARE_DYNAMIC(CMainFrame)
-
-// Attributes
-public:
-
-	ProgressBar    m_progBar;
-	Bool m_full_screen, m_restore_fs, m_view_timing;
-	u32 m_timer_on;
-	CString console_message;
-	GF_Err console_err;
-	u32 m_aspect_ratio;
-
-// Operations
-public:
-	void SetPauseButton(Bool force_play_button = 0);
-
-// Overrides
-	// ClassWizard generated virtual function overrides
-	//{{AFX_VIRTUAL(CMainFrame)
-	virtual BOOL PreCreateWindow(CREATESTRUCT& cs);
-	afx_msg void OnSetFocus(CWnd *pOldWnd);
-	virtual BOOL OnCmdMsg(UINT nID, int nCode, void* pExtra, AFX_CMDHANDLERINFO* pHandlerInfo);
-	//}}AFX_VIRTUAL
-
-// Implementation
-public:
-	virtual ~CMainFrame();
-
-	/*
-	#ifdef _DEBUG
-		virtual void AssertValid() const;
-		virtual void Dump(CDumpContext& dc) const;
-	#endif
-	*/
-
-protected:  // control bar embedded members
-
-#if (_MSC_VER >= 1300)
-	CCommandBar	m_wndCommandBar;
-#else
-	CCeCommandBar	m_wndCommandBar;
-#endif
-
-	void CloseURL();
-	void ForwardMessage();
-
-private:
-	RECT m_view_rc;
-
-public:
-	/*m_dumbWnd is used to clean the screen...*/
-	CChildView m_wndView, m_dumbWnd;
-	void UpdateTime();
-
-// Generated message map functions
-protected:
-	//{{AFX_MSG(CMainFrame)
-	afx_msg int OnCreate(LPCREATESTRUCT lpCreateStruct);
-	afx_msg void OnAppExit();
-	afx_msg LONG Open(WPARAM wParam, LPARAM lParam);
-	afx_msg LONG OnSIPChange(WPARAM wParam, LPARAM lParam);
-	afx_msg LONG OnSetSize(WPARAM wParam, LPARAM lParam);
-	afx_msg LONG OnNavigate(WPARAM wParam, LPARAM lParam);
-	afx_msg void OnSize(UINT nType, int cx, int cy);
-	afx_msg void OnFileStep();
-	afx_msg void OnUpdateFileStep(CCmdUI* pCmdUI);
-	afx_msg void OnFilePause();
-	afx_msg void OnUpdateFilePause(CCmdUI* pCmdUI);
-	afx_msg void OnFileStop();
-	afx_msg void OnUpdateFileStop(CCmdUI* pCmdUI);
-	afx_msg void OnViewFullscreen();
-	afx_msg void OnUpdateViewFullscreen(CCmdUI* pCmdUI);
-	afx_msg void OnClose();
-	afx_msg void OnViewFit();
-	afx_msg void OnUpdateViewFit(CCmdUI* pCmdUI);
-	afx_msg void OnViewArOrig();
-	afx_msg void OnViewArFill();
-	afx_msg void OnViewAr43();
-	afx_msg void OnViewAr169();
-	afx_msg void OnNavNone();
-	afx_msg void OnNavSlide();
-	afx_msg void OnNaveReset();
-	afx_msg void OnSetNavigation(UINT nID);
-
-	afx_msg void OnKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags);
-	afx_msg void OnKeyUp(UINT nChar, UINT nRepCnt, UINT nFlags);
-	afx_msg void OnViewTiming();
-	afx_msg void OnUpdateViewTiming(CCmdUI* pCmdUI);
-	afx_msg void OnInitMenuPopup(CMenu* pPopupMenu, UINT nIndex, BOOL bSysMenu);
-	//}}AFX_MSG
-
-	DECLARE_MESSAGE_MAP()
-};
-
-/////////////////////////////////////////////////////////////////////////////
-
-//{{AFX_INSERT_LOCATION}}
-// Microsoft eMbedded Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_MAINFRM_H__1DEE4BC7_6B56_48A8_BDD7_5DC14EF6AD3E__INCLUDED_)

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/osmo4_wce/OpenDlg.cpp Deleted

@@ -1,92 +0,0 @@
-// OpenDlg.cpp : implementation file
-//
-#include "stdafx.h"
-#include "resource.h"
-#include "OpenDlg.h"
-#include "Osmo4.h"
-
-#ifdef _DEBUG
-#define new DEBUG_NEW
-#undef THIS_FILE
-static char THIS_FILE = __FILE__;
-#endif
-
-/////////////////////////////////////////////////////////////////////////////
-// OpenDlg dialog
-
-
-OpenDlg::OpenDlg(CWnd* pParent /*=NULL*/)
-	: CDialog(OpenDlg::IDD, pParent)
-{
-	//{{AFX_DATA_INIT(OpenDlg)
-	// NOTE: the ClassWizard will add member initialization here
-	//}}AFX_DATA_INIT
-}
-
-
-void OpenDlg::DoDataExchange(CDataExchange* pDX)
-{
-	CDialog::DoDataExchange(pDX);
-	//{{AFX_DATA_MAP(OpenDlg)
-	DDX_Control(pDX, IDC_FILELIST, m_URLs);
-	//}}AFX_DATA_MAP
-}
-
-
-BEGIN_MESSAGE_MAP(OpenDlg, CDialog)
-	//{{AFX_MSG_MAP(OpenDlg)
-	//}}AFX_MSG_MAP
-END_MESSAGE_MAP()
-
-void OpenDlg::OnOK()
-{
-	CString URL;
-	char szUrl5000;
-
-	int sel = m_URLs.GetCurSel();
-	if (sel == CB_ERR) {
-		m_URLs.GetWindowText(URL);
-	} else {
-		m_URLs.GetLBText(sel, URL);
-	}
-	if (!URL.GetLength()) {
-		EndDialog(IDCANCEL);
-		return;
-	}
-	COsmo4 *app = GetApp();
-	u32 nb_entries;
-
-	app->m_filename = URL;
-
-	CE_WideToChar((unsigned short *) (LPCTSTR) URL, szUrl);
-
-	gf_cfg_set_key(app->m_user.config, "RecentFiles", szUrl, NULL);
-	gf_cfg_insert_key(app->m_user.config, "RecentFiles", szUrl, "", 0);
-	/*remove last entry if needed*/
-	nb_entries = gf_cfg_get_key_count(app->m_user.config, "RecentFiles");
-	if (nb_entries>20) {
-		gf_cfg_set_key(app->m_user.config, "RecentFiles", gf_cfg_get_key_name(app->m_user.config, "RecentFiles", nb_entries-1), NULL);
-	}
-	EndDialog(IDOK);
-}
-
-BOOL OpenDlg::OnInitDialog()
-{
-	TCHAR w_str5000;
-	CDialog::OnInitDialog();
-	COsmo4 *app = GetApp();
-	const char *sOpt;
-	u32 i=0;
-
-	while (m_URLs.GetCount()) m_URLs.DeleteString(0);
-	while (1) {
-		sOpt = gf_cfg_get_key_name(app->m_user.config, "RecentFiles", i);
-		if (!sOpt) break;
-		CE_CharToWide((char *) sOpt, (u16 *)w_str);
-		m_URLs.AddString(w_str);
-		i++;
-	}
-
-	SetFocus();
-	return TRUE;
-}

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/osmo4_wce/OpenDlg.h Deleted

@@ -1,47 +0,0 @@
-#if !defined(AFX_OPENDLG_H__DD903B38_EA45_4251_A8C9_4E4B08BECCCC__INCLUDED_)
-#define AFX_OPENDLG_H__DD903B38_EA45_4251_A8C9_4E4B08BECCCC__INCLUDED_
-
-#if _MSC_VER >= 1000
-#pragma once
-#endif // _MSC_VER >= 1000
-// OpenDlg.h : header file
-//
-
-/////////////////////////////////////////////////////////////////////////////
-// OpenDlg dialog
-
-class OpenDlg : public CDialog
-{
-// Construction
-public:
-	OpenDlg(CWnd* pParent = NULL);   // standard constructor
-
-// Dialog Data
-	//{{AFX_DATA(OpenDlg)
-	enum { IDD = IDD_OPENFILE };
-	CComboBox	m_URLs;
-	//}}AFX_DATA
-
-
-// Overrides
-	// ClassWizard generated virtual function overrides
-	//{{AFX_VIRTUAL(OpenDlg)
-protected:
-	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
-	//}}AFX_VIRTUAL
-
-// Implementation
-protected:
-
-	// Generated message map functions
-	//{{AFX_MSG(OpenDlg)
-	virtual void OnOK();
-	virtual BOOL OnInitDialog();
-	//}}AFX_MSG
-	DECLARE_MESSAGE_MAP()
-};
-
-//{{AFX_INSERT_LOCATION}}
-// Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_OPENDLG_H__DD903B38_EA45_4251_A8C9_4E4B08BECCCC__INCLUDED_)

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/osmo4_wce/Options.cpp Deleted

@@ -1,1237 +0,0 @@
-// Options.cpp : implementation file
-//
-
-#include "stdafx.h"
-#include "Osmo4.h"
-#include <gpac/options.h>
-#include <gpac/modules/audio_out.h>
-#include <gpac/modules/codec.h>
-#include <gpac/modules/font.h>
-#include <gpac/constants.h>
-#include <gpac/iso639.h>
-
-#include "Options.h"
-#include <gx.h>
-
-#ifdef _DEBUG
-#define new DEBUG_NEW
-#undef THIS_FILE
-static char THIS_FILE = __FILE__;
-#endif
-
-/////////////////////////////////////////////////////////////////////////////
-// COptions dialog
-
-
-COptions::COptions(CWnd* pParent /*=NULL*/)
-	: CDialog(COptions::IDD, pParent)
-{
-	//{{AFX_DATA_INIT(COptions)
-	//}}AFX_DATA_INIT
-
-}
-
-
-void COptions::DoDataExchange(CDataExchange* pDX)
-{
-	CDialog::DoDataExchange(pDX);
-	//{{AFX_DATA_MAP(COptions)
-	DDX_Control(pDX, IDC_COMBOSEL, m_Selection);
-	//}}AFX_DATA_MAP
-}
-
-
-BEGIN_MESSAGE_MAP(COptions, CDialog)
-	//{{AFX_MSG_MAP(COptions)
-	ON_BN_CLICKED(IDC_SAVEOPT, OnSaveopt)
-	ON_CBN_SELCHANGE(IDC_COMBOSEL, OnSelchangeCombosel)
-	//}}AFX_MSG_MAP
-END_MESSAGE_MAP()
-
-/////////////////////////////////////////////////////////////////////////////
-// COptions message handlers
-
-
-void COptions::OnSelchangeCombosel()
-{
-	HideAll();
-	switch (m_Selection.GetCurSel()) {
-	case 0:
-		m_general.ShowWindow(SW_SHOW);
-		break;
-	case 1:
-		m_systems.ShowWindow(SW_SHOW);
-		break;
-	case 2:
-		m_decoder.ShowWindow(SW_SHOW);
-		break;
-	case 3:
-		m_render.ShowWindow(SW_SHOW);
-		break;
-	case 4:
-		m_render3D.ShowWindow(SW_SHOW);
-		break;
-	case 5:
-		m_audio.ShowWindow(SW_SHOW);
-		break;
-	case 6:
-		m_font.ShowWindow(SW_SHOW);
-		break;
-	case 7:
-		m_http.ShowWindow(SW_SHOW);
-		break;
-	case 8:
-		m_stream.ShowWindow(SW_SHOW);
-		break;
-	}
-}
-
-void COptions::HideAll()
-{
-	m_general.ShowWindow(SW_HIDE);
-	m_systems.ShowWindow(SW_HIDE);
-	m_render.ShowWindow(SW_HIDE);
-	m_render3D.ShowWindow(SW_HIDE);
-	m_audio.ShowWindow(SW_HIDE);
-	m_http.ShowWindow(SW_HIDE);
-	m_font.ShowWindow(SW_HIDE);
-	m_stream.ShowWindow(SW_HIDE);
-	m_decoder.ShowWindow(SW_HIDE);
-}
-
-BOOL COptions::OnInitDialog()
-{
-	CDialog::OnInitDialog();
-
-	m_general.Create(IDD_OPT_GEN, this);
-	m_systems.Create(IDD_OPT_SYSTEMS, this);
-	m_decoder.Create(IDD_OPT_DECODER, this);
-	m_render.Create(IDD_OPT_RENDER, this);
-	m_render3D.Create(IDD_OPT_RENDER3D, this);
-	m_audio.Create(IDD_OPT_AUDIO, this);
-	m_http.Create(IDD_OPT_HTTP, this);
-	m_font.Create(IDD_OPT_FONT, this);
-	m_stream.Create(IDD_OPT_STREAM, this);
-
-	m_Selection.AddString(_T("General"));
-	m_Selection.AddString(_T("MPEG-4 Systems"));
-	m_Selection.AddString(_T("Decoders"));
-	m_Selection.AddString(_T("Compositor"));
-	m_Selection.AddString(_T("3D Rendering"));
-	m_Selection.AddString(_T("Audio"));
-	m_Selection.AddString(_T("Text"));
-	m_Selection.AddString(_T("Download"));
-	m_Selection.AddString(_T("Streaming"));
-	HideAll();
-
-	const char *sOpt = gf_cfg_get_key(GetApp()->m_user.config, "General", "ConfigPanel");
-	u32 sel = sOpt ? atoi(sOpt) : 0;
-	if (sel>8) sel=8;
-	m_Selection.SetCurSel(sel);
-	OnSelchangeCombosel();
-
-	SetFocus();
-	return TRUE;
-}
-
-void COptions::OnSaveopt()
-{
-	m_general.SaveOptions();
-	m_systems.SaveOptions();
-	m_render.SaveOptions();
-	m_render3D.SaveOptions();
-	m_audio.SaveOptions();
-	m_http.SaveOptions();
-	m_font.SaveOptions();
-	m_stream.SaveOptions();
-	m_decoder.SaveOptions();
-
-	COsmo4 *gpac = GetApp();
-	gf_term_set_option(gpac->m_term, GF_OPT_RELOAD_CONFIG, 1);
-}
-
-void COptions::OnOK()
-{
-	char str20;
-	sprintf(str, "%d", m_Selection.GetCurSel());
-	gf_cfg_set_key(GetApp()->m_user.config, "General", "ConfigPanel", str);
-
-	EndDialog(IDCANCEL);
-}
-
-
-
-COptAudio::COptAudio(CWnd* pParent /*=NULL*/)
-	: CDialog(COptAudio::IDD, pParent)
-{
-	//{{AFX_DATA_INIT(COptAudio)
-	//}}AFX_DATA_INIT
-}
-
-
-void COptAudio::DoDataExchange(CDataExchange* pDX)
-{
-	CDialog::DoDataExchange(pDX);
-	//{{AFX_DATA_MAP(COptAudio)
-	DDX_Control(pDX, IDC_DRIVER_LIST, m_DriverList);
-	DDX_Control(pDX, IDC_AUDIO_RESYNC, m_AudioResync);
-	DDX_Control(pDX, IDC_AUDIO_DUR, m_AudioDur);
-	DDX_Control(pDX, IDC_SPIN_DUR, m_SpinDur);
-	DDX_Control(pDX, IDC_FORCE_AUDIO, m_ForceConfig);
-	DDX_Control(pDX, IDC_SPIN_AUDIO, m_AudioSpin);
-	DDX_Control(pDX, IDC_EDIT_AUDIO, m_AudioEdit);
-	//}}AFX_DATA_MAP
-}
-
-
-BEGIN_MESSAGE_MAP(COptAudio, CDialog)
-	//{{AFX_MSG_MAP(COptAudio)
-	ON_BN_CLICKED(IDC_FORCE_AUDIO, OnForceAudio)
-	//}}AFX_MSG_MAP
-END_MESSAGE_MAP()
-
-/////////////////////////////////////////////////////////////////////////////
-// COptAudio message handlers
-
-BOOL COptAudio::OnInitDialog()
-{
-	CDialog::OnInitDialog();
-
-	m_AudioSpin.SetBuddy(& m_AudioEdit);
-	m_SpinDur.SetBuddy(& m_AudioDur);
-	m_SpinDur.SetRange(0, 1000);
-
-	COsmo4 *gpac = GetApp();
-	const char *sOpt;
-	TCHAR wTmp500;
-
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "Audio", "ForceConfig");
-	m_ForceConfig.SetCheck( (sOpt && !stricmp(sOpt, "yes")) ? 1 : 0);
-
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "Audio", "NumBuffers");
-	if (sOpt) {
-		CE_CharToWide((char *)sOpt, (u16 *)wTmp);
-		m_AudioEdit.SetWindowText(wTmp);
-	} else {
-		m_AudioEdit.SetWindowText(_T("2"));
-	}
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "Audio", "TotalDuration");
-	if (sOpt) {
-		CE_CharToWide((char *)sOpt, (u16 *)wTmp);
-		m_AudioDur.SetWindowText(wTmp);
-	} else {
-		m_AudioDur.SetWindowText(_T("200"));
-	}
-
-	OnForceAudio();
-
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "Audio", "NoResync");
-	if (sOpt && !stricmp(sOpt, "yes")) {
-		m_AudioResync.SetCheck(1);
-	} else {
-		m_AudioResync.SetCheck(0);
-	}
-
-	/*driver enum*/
-	while (m_DriverList.GetCount()) m_DriverList.DeleteString(0);
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "core", "audio-output");
-	u32 count = gf_modules_get_count(gpac->m_user.modules);
-	GF_BaseInterface *ifce;
-	s32 select = 0;
-	s32 to_sel = 0;
-	for (u32 i=0; i<count; i++) {
-		ifce = gf_modules_load_interface(gpac->m_user.modules, i, GF_AUDIO_OUTPUT_INTERFACE);
-		if (!ifce) continue;
-		if (sOpt && !stricmp(((GF_BaseInterface *)ifce)->module_name, sOpt)) select = to_sel;
-		CE_CharToWide((char *) ((GF_BaseInterface *)ifce)->module_name, (u16 *)wTmp);
-		m_DriverList.AddString(wTmp);
-		gf_modules_close_interface(ifce);
-		to_sel++;
-	}
-	m_DriverList.SetCurSel(select);
-
-
-	return TRUE;
-}
-
-
-void COptAudio::SaveOptions()
-{
-	COsmo4 *gpac = GetApp();
-	TCHAR wstr50;
-	char str50;
-
-	gf_cfg_set_key(gpac->m_user.config, "Audio", "ForceConfig", m_ForceConfig.GetCheck() ? "yes" : "no");
-	gf_cfg_set_key(gpac->m_user.config, "Audio", "NoResync", m_AudioResync.GetCheck() ? "yes" : "no");
-
-	m_AudioEdit.GetWindowText(wstr, 20);
-	CE_WideToChar((u16 *)wstr, str);
-	gf_cfg_set_key(gpac->m_user.config, "Audio", "NumBuffers", str);
-	m_AudioDur.GetWindowText(wstr, 20);
-	CE_WideToChar((u16 *)wstr, str);
-	gf_cfg_set_key(gpac->m_user.config, "Audio", "TotalDuration", str);
-
-	m_DriverList.GetWindowText(wstr, 50);
-	CE_WideToChar((u16 *)wstr, str);
-	gf_cfg_set_key(gpac->m_user.config, "core", "audio-output", str);
-
-}
-
-void COptAudio::OnForceAudio()
-{
-	BOOL en = m_ForceConfig.GetCheck();
-
-	m_AudioSpin.EnableWindow(en);
-	m_AudioEdit.EnableWindow(en);
-	m_SpinDur.EnableWindow(en);
-	m_AudioDur.EnableWindow(en);
-}
-
-
-COptDecoder::COptDecoder(CWnd* pParent /*=NULL*/)
-	: CDialog(COptDecoder::IDD, pParent)
-{
-	//{{AFX_DATA_INIT(COptDecoder)
-	// NOTE: the ClassWizard will add member initialization here
-	//}}AFX_DATA_INIT
-}
-
-
-void COptDecoder::DoDataExchange(CDataExchange* pDX)
-{
-	CDialog::DoDataExchange(pDX);
-	//{{AFX_DATA_MAP(COptDecoder)
-	DDX_Control(pDX, IDC_VIDEC_LIST, m_Video);
-	DDX_Control(pDX, IDC_AUDEC_LIST, m_Audio);
-	//}}AFX_DATA_MAP
-}
-
-
-BEGIN_MESSAGE_MAP(COptDecoder, CDialog)
-	//{{AFX_MSG_MAP(COptDecoder)
-	//}}AFX_MSG_MAP
-END_MESSAGE_MAP()
-
-/////////////////////////////////////////////////////////////////////////////
-// COptDecoder message handlers
-
-BOOL COptDecoder::OnInitDialog()
-{
-	u32 i;
-	CDialog::OnInitDialog();
-
-	COsmo4 *gpac = GetApp();
-	const char *sOpt;
-
-	/*audio dec enum*/
-	while (m_Audio.GetCount()) m_Audio.DeleteString(0);
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "Systems", "DefAudioDec");
-	u32 count = gf_modules_get_count(gpac->m_user.modules);
-	GF_BaseDecoder *ifce;
-	s32 select = 0;
-	s32 to_sel = 0;
-	for (i=0; i<count; i++) {
-		ifce = (GF_BaseDecoder *) gf_modules_load_interface(gpac->m_user.modules, i, GF_MEDIA_DECODER_INTERFACE);
-		if (!ifce) continue;
-		if (ifce->CanHandleStream(ifce, GF_STREAM_AUDIO, NULL, 0)) {
-			if (sOpt && !stricmp(((GF_BaseInterface *)ifce)->module_name, sOpt)) select = to_sel;
-			TCHAR wzTmp500;
-			CE_CharToWide((char *) ifce->module_name, (u16 *)wzTmp);
-			m_Audio.AddString(wzTmp);
-			to_sel++;
-		}
-		gf_modules_close_interface((GF_BaseInterface *) ifce);
-	}
-	m_Audio.SetCurSel(select);
-
-	/*audio dec enum*/
-	while (m_Video.GetCount()) m_Video.DeleteString(0);
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "Systems", "DefVideoDec");
-	count = gf_modules_get_count(gpac->m_user.modules);
-	select = 0;
-	to_sel = 0;
-	for (i=0; i<count; i++) {
-		ifce  = (GF_BaseDecoder *) gf_modules_load_interface(gpac->m_user.modules, i, GF_MEDIA_DECODER_INTERFACE);
-		if (!ifce) continue;
-		if (ifce->CanHandleStream(ifce, GF_STREAM_VISUAL, NULL, 0)) {
-			if (sOpt && !stricmp(((GF_BaseInterface *)ifce)->module_name, sOpt)) select = to_sel;
-			TCHAR wzTmp500;
-			CE_CharToWide((char *) ifce->module_name, (u16 *)wzTmp);
-			m_Video.AddString(wzTmp);
-			to_sel++;
-		}
-		gf_modules_close_interface((GF_BaseInterface *) ifce);
-	}
-	m_Video.SetCurSel(select);
-
-	return TRUE;
-}
-
-void COptDecoder::SaveOptions()
-{
-	COsmo4 *gpac = GetApp();
-	TCHAR wstr100;
-	char str100;
-
-	m_Audio.GetWindowText(wstr, 50);
-	CE_WideToChar((u16 *)wstr, str);
-	gf_cfg_set_key(gpac->m_user.config, "Systems", "DefAudioDec", str);
-	m_Video.GetWindowText(wstr, 50);
-	CE_WideToChar((u16 *)wstr, str);
-	gf_cfg_set_key(gpac->m_user.config, "Systems", "DefVideoDec", str);
-}
-
-
-
-COptFont::COptFont(CWnd* pParent /*=NULL*/)
-	: CDialog(COptFont::IDD, pParent)
-{
-	//{{AFX_DATA_INIT(COptFont)
-	//}}AFX_DATA_INIT
-}
-
-
-void COptFont::DoDataExchange(CDataExchange* pDX)
-{
-	CDialog::DoDataExchange(pDX);
-	//{{AFX_DATA_MAP(COptFont)
-	DDX_Control(pDX, IDC_USE_TEXTURE, m_UseTexture);
-	DDX_Control(pDX, IDC_FONT_LIST, m_Fonts);
-	DDX_Control(pDX, IDC_BROWSE_FONT, m_BrowseFont);
-	//}}AFX_DATA_MAP
-}
-
-
-BEGIN_MESSAGE_MAP(COptFont, CDialog)
-	//{{AFX_MSG_MAP(COptFont)
-	ON_BN_CLICKED(IDC_BROWSE_FONT, OnBrowseFont)
-	//}}AFX_MSG_MAP
-END_MESSAGE_MAP()
-
-/////////////////////////////////////////////////////////////////////////////
-// COptFont message handlers
-
-BOOL COptFont::OnInitDialog()
-{
-	u32 i;
-	GF_BaseInterface *ifce;
-
-	CDialog::OnInitDialog();
-
-	COsmo4 *gpac = GetApp();
-	TCHAR wTmp500;
-	const char *sOpt;
-
-	/*video drivers enum*/
-	while (m_Fonts.GetCount()) m_Fonts.DeleteString(0);
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "FontCache", "FontReader");
-	s32 to_sel = 0;
-	s32 select = 0;
-	u32 count = gf_modules_get_count(gpac->m_user.modules);
-	for (i=0; i<count; i++) {
-		ifce = gf_modules_load_interface(gpac->m_user.modules, i, GF_FONT_READER_INTERFACE);
-		if (!ifce) continue;
-		if (sOpt && !stricmp(((GF_BaseInterface *)ifce)->module_name, sOpt)) select = to_sel;
-		CE_CharToWide((char *) ifce->module_name, (u16 *)wTmp);
-		m_Fonts.AddString(wTmp);
-		gf_modules_close_interface(ifce);
-		to_sel++;
-	}
-	m_Fonts.SetCurSel(select);
-
-
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "FontCache", "FontDirectory");
-	CE_CharToWide((char *)sOpt, (u16 *)wTmp);
-	if (sOpt) m_BrowseFont.SetWindowText(wTmp);
-
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "Compositor", "TextureTextMode");
-	m_UseTexture.SetCheck( (!sOpt || stricmp(sOpt, "Never")) ? 1 : 0);
-
-	return TRUE;
-}
-
-void COptFont::OnBrowseFont()
-{
-
-}
-
-
-void COptFont::SaveOptions()
-{
-	COsmo4 *gpac = GetApp();
-	char strMAX_PATH;
-	TCHAR wstrMAX_PATH;
-
-	m_Fonts.GetWindowText(wstr, 50);
-	CE_WideToChar((u16 *)wstr, str);
-	gf_cfg_set_key(gpac->m_user.config, "FontCache", "FontReader", str);
-	m_BrowseFont.GetWindowText(wstr, 50);
-	CE_WideToChar((u16 *)wstr, str);
-	gf_cfg_set_key(gpac->m_user.config, "FontCache", "FontDirectory", str);
-	gf_cfg_set_key(gpac->m_user.config, "Compositor", "TextureTextMode", m_UseTexture.GetCheck() ? "Default" : "Never");
-}
-
-
-
-COptGen::COptGen(CWnd* pParent /*=NULL*/)
-	: CDialog(COptGen::IDD, pParent)
-{
-	//{{AFX_DATA_INIT(COptGen)
-	//}}AFX_DATA_INIT
-}
-
-
-void COptGen::DoDataExchange(CDataExchange* pDX)
-{
-	CDialog::DoDataExchange(pDX);
-	//{{AFX_DATA_MAP(COptGen)
-	DDX_Control(pDX, IDC_NO_BACKLIGHT, m_NoBacklight);
-	DDX_Control(pDX, IDC_FILL_SCREEN, m_Fill);
-	DDX_Control(pDX, IDC_LOOP, m_Loop);
-	DDX_Control(pDX, IDC_ENABLE_LOGS, m_Logs);
-	//}}AFX_DATA_MAP
-}
-
-
-BEGIN_MESSAGE_MAP(COptGen, CDialog)
-	//{{AFX_MSG_MAP(COptGen)
-	ON_BN_CLICKED(IDC_FILEASSOC, OnFileassoc)
-	//}}AFX_MSG_MAP
-END_MESSAGE_MAP()
-
-/////////////////////////////////////////////////////////////////////////////
-// COptGen message handlers
-
-
-
-BOOL COptGen::OnInitDialog()
-{
-	CDialog::OnInitDialog();
-	COsmo4 *gpac = GetApp();
-	const char *sOpt;
-
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "General", "Loop");
-	if (sOpt && !stricmp(sOpt, "yes")) {
-		m_Loop.SetCheck(1);
-	} else {
-		m_Loop.SetCheck(0);
-	}
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "General", "FillScreen");
-	m_Fill.SetCheck((sOpt && !stricmp(sOpt, "yes")) ? 1 : 0);
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "General", "DisableBackLight");
-	m_NoBacklight.SetCheck((sOpt && !stricmp(sOpt, "yes")) ? 1 : 0);
-
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "General", "Logs");
-	m_Logs.SetCheck((sOpt && !strstr(sOpt, "none")) ? 1 : 0);
-	return TRUE;
-}
-
-void COptGen::SaveOptions()
-{
-	COsmo4 *gpac = GetApp();
-
-	gpac->m_Loop = m_Loop.GetCheck();
-	gf_cfg_set_key(gpac->m_user.config, "General", "Loop", gpac->m_Loop ? "yes" : "no");
-	gpac->m_fit_screen = m_Fill.GetCheck();
-	gf_cfg_set_key(gpac->m_user.config, "General", "FillScreen", gpac->m_fit_screen ? "yes" : "no");
-	gpac->m_disable_backlight = m_NoBacklight.GetCheck();
-	gf_cfg_set_key(gpac->m_user.config, "General", "DisableBackLight", gpac->m_disable_backlight ? "yes" : "no");
-
-	gpac->EnableLogs(m_Logs.GetCheck() ? 1 : 0);
-}
-
-void COptGen::OnFileassoc()
-{
-	HKEY hSection;
-	TCHAR szDirMAX_PATH;
-	char szTempMAX_PATH;
-	TCHAR cmdMAX_PATH;
-	DWORD ioSize = MAX_PATH;
-	DWORD dwDisp;
-
-	RegOpenKeyEx(HKEY_LOCAL_MACHINE, _T("SOFTWARE\\Osmo4"), 0, KEY_READ, &hSection);
-
-	GetModuleFileName(NULL, szDir, MAX_PATH);
-
-	while (szDirstrlen((char *) szDir)-1 != (TCHAR) '\\') szDirstrlen((char *) szDir)-1 = 0;
-	if (!hSection)
-		RegCreateKeyEx(HKEY_LOCAL_MACHINE, _T("SOFTWARE\\Osmo4"), 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hSection, &dwDisp);
-
-	CE_WideToChar((u16 *)szDir, szTemp);
-	/*overwrite install dir with current path*/
-	RegSetValueEx(hSection, _T("Install_Dir"), 0, REG_SZ, (const unsigned char *) szTemp, strlen(szTemp)+1);
-	RegCloseKey(hSection);
-
-
-	/*overwrite .mp4 file associations */
-	RegCreateKeyEx(HKEY_CLASSES_ROOT, _T("mp4file\\DefaultIcon"), 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hSection, &dwDisp);
-	wcscpy(cmd, szDir);
-	wcscat(cmd, _T("Osmo4.ico") );
-	CE_WideToChar((u16 *)cmd, szTemp);
-
-	RegSetValueEx(hSection, _T(""), 0, REG_SZ, (const unsigned char *) szTemp, strlen((const char *) szTemp)+1);
-	RegCloseKey(hSection);
-
-	RegCreateKeyEx(HKEY_CLASSES_ROOT, _T("mp4file\\Shell\\open\\command"), 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hSection, &dwDisp);
-	wcscpy(cmd, szDir);
-	wcscat(cmd, _T("Osmo4.exe \"%L\"") );
-	CE_WideToChar((u16 *)cmd, szTemp);
-	RegSetValueEx(hSection, _T(""), 0, REG_SZ, (const unsigned char *) szTemp, strlen(szTemp)+1);
-	RegCloseKey(hSection);
-
-	RegCreateKeyEx(HKEY_CLASSES_ROOT, _T(".mp4"), 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hSection, &dwDisp);
-	RegSetValueEx(hSection, _T(""), 0, REG_SZ, (const unsigned char *) "mp4file", strlen("mp4file")+1);
-	RegCloseKey(hSection);
-}
-
-
-
-COptHTTP::COptHTTP(CWnd* pParent /*=NULL*/)
-	: CDialog(COptHTTP::IDD, pParent)
-{
-	//{{AFX_DATA_INIT(COptHTTP)
-	//}}AFX_DATA_INIT
-}
-
-
-void COptHTTP::DoDataExchange(CDataExchange* pDX)
-{
-	CDialog::DoDataExchange(pDX);
-	//{{AFX_DATA_MAP(COptHTTP)
-	DDX_Control(pDX, IDC_RESTART_CACHE, m_RestartFile);
-	DDX_Control(pDX, IDC_CLEAN_CACHE, m_CleanCache);
-	DDX_Control(pDX, IDC_BROWSE_CACHE, m_CacheDir);
-	DDX_Control(pDX, IDC_SAX_PROGRESSIVE, m_Progressive);
-	DDX_Control(pDX, IDC_SAX_DURATION, m_SaxDuration);
-	//}}AFX_DATA_MAP
-}
-
-
-BEGIN_MESSAGE_MAP(COptHTTP, CDialog)
-	//{{AFX_MSG_MAP(COptHTTP)
-	ON_BN_CLICKED(IDC_BROWSE_CACHE, OnBrowseCache)
-	ON_BN_CLICKED(IDC_SAX_PROGRESSIVE, OnProgressive)
-	//}}AFX_MSG_MAP
-END_MESSAGE_MAP()
-
-/////////////////////////////////////////////////////////////////////////////
-// COptHTTP message handlers
-
-
-void COptHTTP::OnBrowseCache()
-{
-
-}
-
-BOOL COptHTTP::OnInitDialog()
-{
-	CDialog::OnInitDialog();
-
-	COsmo4 *gpac = GetApp();
-	TCHAR wTmp500;
-	const char *sOpt;
-
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "Core", "CleanCache");
-	m_CleanCache.SetCheck((sOpt && !stricmp(sOpt, "yes")) ? 1 : 0);
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "Core", "RestartFiles");
-	m_RestartFile.SetCheck((sOpt && !stricmp(sOpt, "yes")) ? 1 : 0);
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "SAXLoader", "Progressive");
-	m_Progressive.SetCheck((sOpt && !stricmp(sOpt, "yes")) ? 1 : 0);
-
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "SAXLoader", "MaxDuration");
-	if (sOpt) {
-		CE_CharToWide((char *) sOpt, (u16 *)wTmp);
-		m_SaxDuration.SetWindowText(wTmp);
-	} else {
-		m_SaxDuration.SetWindowText( _T("30") );
-	}
-
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "Core", "CacheDirectory");
-	CE_CharToWide((char *) sOpt, (u16 *)wTmp);
-	if (sOpt) m_CacheDir.SetWindowText(wTmp);
-
-	OnProgressive();
-	return TRUE;
-}
-
-void COptHTTP::OnProgressive()
-{
-	m_SaxDuration.EnableWindow( m_Progressive.GetCheck() ? TRUE : FALSE );
-}
-
-void COptHTTP::SaveOptions()
-{
-	TCHAR wTmp500;
-	char szCacheDir500;
-	COsmo4 *gpac = GetApp();
-
-	gf_cfg_set_key(gpac->m_user.config, "Core", "CleanCache", m_CleanCache.GetCheck() ? "yes" : "no");
-	gf_cfg_set_key(gpac->m_user.config, "Core", "RestartFiles", m_RestartFile.GetCheck() ? "yes" : "no");
-	gf_cfg_set_key(gpac->m_user.config, "SAXLoader", "Progressive", m_Progressive.GetCheck() ? "yes" : "no");
-
-	m_SaxDuration.GetWindowText(wTmp, MAX_PATH);
-	CE_WideToChar((u16 *)wTmp, szCacheDir);
-	gf_cfg_set_key(gpac->m_user.config, "SAXLoader", "MaxDuration", szCacheDir);
-
-	m_CacheDir.GetWindowText(wTmp, MAX_PATH);
-	CE_WideToChar((u16 *)wTmp, szCacheDir);
-	gf_cfg_set_key(gpac->m_user.config, "Core", "CacheDirectory", szCacheDir);
-}
-
-
-
-COptRender::COptRender(CWnd* pParent /*=NULL*/)
-	: CDialog(COptRender::IDD, pParent)
-{
-	//{{AFX_DATA_INIT(COptRender)
-	//}}AFX_DATA_INIT
-}
-
-
-void COptRender::DoDataExchange(CDataExchange* pDX)
-{
-	CDialog::DoDataExchange(pDX);
-	//{{AFX_DATA_MAP(COptRender)
-	DDX_Control(pDX, IDC_AA_LIST, m_Antialias);
-	DDX_Control(pDX, IDC_FORCE_SIZE, m_ForceSize);
-	DDX_Control(pDX, IDC_FAST_RENDER, m_HighSpeed);
-	DDX_Control(pDX, IDC_ZOOM_SCALABLE, m_Scalable);
-	DDX_Control(pDX, IDC_DIRECTRENDER, m_DirectRender);
-	DDX_Control(pDX, IDC_BIFS_RATE, m_BIFSRate);
-	//}}AFX_DATA_MAP
-}
-
-
-BEGIN_MESSAGE_MAP(COptRender, CDialog)
-	//{{AFX_MSG_MAP(COptRender)
-	//}}AFX_MSG_MAP
-END_MESSAGE_MAP()
-
-/////////////////////////////////////////////////////////////////////////////
-// COptRender message handlers
-
-
-
-#define NUM_RATES 11
-static char *BIFSRates11 =
-{
-	"5.0",
-	"7.5",
-	"10.0",
-	"12.5",
-	"15.0",
-	"24.0",
-	"25.0",
-	"30.0",
-	"50.0",
-	"60.0",
-	"100.0",
-};
-
-
-
-BOOL COptRender::OnInitDialog()
-{
-	CDialog::OnInitDialog();
-
-	COsmo4 *gpac = GetApp();
-	const char *sOpt;
-
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "Compositor", "DirectDraw");
-	if (sOpt && !stricmp(sOpt, "yes")) {
-		m_DirectRender.SetCheck(1);
-	} else {
-		m_DirectRender.SetCheck(0);
-	}
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "Compositor", "ScalableZoom");
-	if (sOpt && !stricmp(sOpt, "no")) {
-		m_Scalable.SetCheck(0);
-	} else {
-		m_Scalable.SetCheck(1);
-	}
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "Compositor", "ForceSceneSize");
-	if (sOpt && !stricmp(sOpt, "yes")) {
-		m_ForceSize.SetCheck(1);
-	} else {
-		m_ForceSize.SetCheck(0);
-	}
-
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "Compositor", "FrameRate");
-	if (!sOpt) sOpt = "30.0";
-	s32 select = 0;
-	while (m_BIFSRate.GetCount()) m_BIFSRate.DeleteString(0);
-	for (s32 i = 0; i<NUM_RATES; i++) {
-		TCHAR szText100;
-		CE_CharToWide(BIFSRatesi, (u16 *)szText);
-		m_BIFSRate.AddString(szText);
-		if (sOpt && !stricmp(sOpt, BIFSRatesi) ) select = i;
-	}
-	m_BIFSRate.SetCurSel(select);
-
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "Compositor", "HighSpeed");
-	m_HighSpeed.SetCheck((sOpt && !stricmp(sOpt, "yes")) ? 1 : 0);
-
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "Compositor", "AntiAlias");
-	while (m_Antialias.GetCount()) m_Antialias.DeleteString(0);
-
-	m_Antialias.AddString(_T("None"));
-	m_Antialias.AddString(_T("Text only"));
-	m_Antialias.AddString(_T("Complete"));
-	select = 2;
-	if (sOpt && !stricmp(sOpt, "Text")) select = 1;
-	else if (sOpt && !stricmp(sOpt, "None")) select = 0;
-	m_Antialias.SetCurSel(select);
-
-	return TRUE;
-}
-
-
-void COptRender::SaveOptions()
-{
-	COsmo4 *gpac = GetApp();
-
-	gf_cfg_set_key(gpac->m_user.config, "Compositor", "DirectDraw", m_DirectRender.GetCheck() ? "yes" : "no");
-	gf_cfg_set_key(gpac->m_user.config, "Compositor", "ScalableZoom", m_Scalable.GetCheck() ? "yes" : "no");
-	gf_cfg_set_key(gpac->m_user.config, "Compositor", "HighSpeed", m_HighSpeed.GetCheck() ? "yes" : "no");
-	gf_cfg_set_key(gpac->m_user.config, "Compositor", "ForceSceneSize", m_ForceSize.GetCheck() ? "yes" : "no");
-
-	s32 sel = m_BIFSRate.GetCurSel();
-	gf_cfg_set_key(gpac->m_user.config, "Compositor", "FrameRate", BIFSRatessel);
-
-	sel = m_Antialias.GetCurSel();
-	gf_cfg_set_key(gpac->m_user.config, "Compositor", "AntiAlias", (sel==0) ? "None" : ( (sel==1) ? "Text" : "All"));
-}
-
-
-
-
-COptRender3D::COptRender3D(CWnd* pParent /*=NULL*/)
-	: CDialog(COptRender3D::IDD, pParent)
-{
-	//{{AFX_DATA_INIT(COptRender)
-	//}}AFX_DATA_INIT
-}
-
-
-void COptRender3D::DoDataExchange(CDataExchange* pDX)
-{
-	CDialog::DoDataExchange(pDX);
-	//{{AFX_DATA_MAP(COptRender)
-	DDX_Control(pDX, IDC_WIRE_MODE, m_WireMode);
-	DDX_Control(pDX, IDC_DRAW_NORMALS, m_DrawNormals);
-	DDX_Control(pDX, IDC_USE_3D_REN, m_Use3DRender);
-	DDX_Control(pDX, IDC_NO_BACKCULL, m_NoBackFace);
-	DDX_Control(pDX, IDC_EMULATE_POW2, m_EmulatePOW2);
-	//}}AFX_DATA_MAP
-}
-
-
-BEGIN_MESSAGE_MAP(COptRender3D, CDialog)
-	//{{AFX_MSG_MAP(COptRender3D)
-	//}}AFX_MSG_MAP
-END_MESSAGE_MAP()
-
-BOOL COptRender3D::OnInitDialog()
-{
-	CDialog::OnInitDialog();
-
-	COsmo4 *gpac = GetApp();
-	const char *sOpt;
-
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "Compositor", "ForceOpenGL");
-	m_Use3DRender.SetCheck( (sOpt && !strcmp(sOpt, "yes")) ? 1 : 0);
-
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "Compositor", "BackFaceCulling");
-	m_NoBackFace.SetCheck( (sOpt && !stricmp(sOpt, "Off")) ? 1 : 0);
-
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "Compositor", "EmulatePOW2");
-	m_EmulatePOW2.SetCheck( (sOpt && !stricmp(sOpt, "yes")) ? 1 : 0);
-
-	m_WireMode.ResetContent();
-	m_WireMode.AddString(_T("Solid Draw"));
-	m_WireMode.AddString(_T("Wireframe"));
-	m_WireMode.AddString(_T("Both"));
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "Compositor", "Wireframe");
-	if (sOpt && !stricmp(sOpt, "WireOnly")) m_WireMode.SetCurSel(1);
-	else if (sOpt && !stricmp(sOpt, "WireOnSolid")) m_WireMode.SetCurSel(2);
-	else m_WireMode.SetCurSel(0);
-
-
-	m_DrawNormals.ResetContent();
-	m_DrawNormals.AddString(_T("Never"));
-	m_DrawNormals.AddString(_T("Per Face"));
-	m_DrawNormals.AddString(_T("Per Vertex"));
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "Compositor", "DrawNormals");
-	if (sOpt && !stricmp(sOpt, "PerFace")) m_DrawNormals.SetCurSel(1);
-	else if (sOpt && !stricmp(sOpt, "PerVertex")) m_DrawNormals.SetCurSel(2);
-	else m_DrawNormals.SetCurSel(0);
-
-	return TRUE;
-}
-
-
-void COptRender3D::SaveOptions()
-{
-	COsmo4 *gpac = GetApp();
-
-	u32 sel = m_DrawNormals.GetCurSel();
-	gf_cfg_set_key(gpac->m_user.config, "Compositor", "DrawNormals", (sel==2) ? "PerVertex" : (sel==1) ? "PerFace" : "Never");
-
-	sel = m_WireMode.GetCurSel();
-	gf_cfg_set_key(gpac->m_user.config, "Compositor", "Wireframe", (sel==2) ? "WireOnSolid" : (sel==1) ? "WireOnly" : "WireNone");
-
-	gf_cfg_set_key(gpac->m_user.config, "Compositor", "BackFaceCulling", m_NoBackFace.GetCheck() ? "Off" : "On");
-	gf_cfg_set_key(gpac->m_user.config, "Compositor", "EmulatePOW2", m_EmulatePOW2.GetCheck() ? "yes" : "no");
-}
-
-
-COptStream::COptStream(CWnd* pParent /*=NULL*/)
-	: CDialog(COptStream::IDD, pParent)
-{
-	//{{AFX_DATA_INIT(COptStream)
-	//}}AFX_DATA_INIT
-}
-
-
-void COptStream::DoDataExchange(CDataExchange* pDX)
-{
-	CDialog::DoDataExchange(pDX);
-	//{{AFX_DATA_MAP(COptStream)
-	DDX_Control(pDX, IDC_REBUFFER_LEN, m_RebufferLen);
-	DDX_Control(pDX, IDC_REBUFFER, m_Rebuffer);
-	DDX_Control(pDX, IDC_BUFFER, m_Buffer);
-	DDX_Control(pDX, IDC_TIMEOUT, m_Timeout);
-	DDX_Control(pDX, IDC_REORDER, m_Reorder);
-	DDX_Control(pDX, IDC_RTSP, m_UseRTSP);
-	DDX_Control(pDX, IDC_PORT, m_Port);
-	//}}AFX_DATA_MAP
-}
-
-
-BEGIN_MESSAGE_MAP(COptStream, CDialog)
-	//{{AFX_MSG_MAP(COptStream)
-	ON_CBN_SELCHANGE(IDC_PORT, OnSelchangePort)
-	ON_BN_CLICKED(IDC_RTSP, OnRtsp)
-	ON_BN_CLICKED(IDC_REBUFFER, OnRebuffer)
-	ON_EN_UPDATE(IDC_REBUFFER_LEN, OnUpdateRebufferLen)
-	ON_EN_UPDATE(IDC_BUFFER, OnUpdateBuffer)
-	//}}AFX_MSG_MAP
-END_MESSAGE_MAP()
-
-/////////////////////////////////////////////////////////////////////////////
-// COptStream message handlers
-
-BOOL COptStream::OnInitDialog()
-{
-	CDialog::OnInitDialog();
-
-	COsmo4 *gpac = GetApp();
-	TCHAR wTmp500;
-	const char *sOpt;
-
-	while (m_Port.GetCount()) m_Port.DeleteString(0);
-	m_Port.AddString(_T("554 (RTSP standard)"));
-	m_Port.AddString(_T("7070 (RTSP ext)"));
-	m_Port.AddString(_T("80 (RTSP / HTTP tunnel)"));
-	m_Port.AddString(_T("8080 (RTSP / HTTP tunnel)"));
-
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "Streaming", "DefaultPort");
-	u32 port = 554;
-	Bool force_rtsp = 0;
-	if (sOpt) port = atoi(sOpt);
-	switch (port) {
-	case 8080:
-		m_Port.SetCurSel(3);
-		force_rtsp = 1;
-		break;
-	case 80:
-		m_Port.SetCurSel(2);
-		force_rtsp = 1;
-		break;
-	case 7070:
-		m_Port.SetCurSel(1);
-		break;
-	default:
-		m_Port.SetCurSel(0);
-		break;
-	}
-
-	Bool use_rtsp = 0;
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "Streaming", "RTPoverRTSP");
-	if (sOpt && !stricmp(sOpt, "yes")) use_rtsp = 1;
-
-	if (force_rtsp) {
-		m_UseRTSP.SetCheck(1);
-		m_UseRTSP.EnableWindow(0);
-		m_Reorder.SetCheck(0);
-		m_Reorder.EnableWindow(0);
-	} else {
-		m_UseRTSP.SetCheck(use_rtsp);
-		m_UseRTSP.EnableWindow(1);
-		m_Reorder.EnableWindow(1);
-		sOpt = gf_cfg_get_key(gpac->m_user.config, "Streaming", "ReorderSize");
-		if (sOpt && !stricmp(sOpt, "0")) {
-			m_Reorder.SetCheck(0);
-		} else {
-			m_Reorder.SetCheck(1);
-		}
-	}
-
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "Streaming", "RTSPTimeout");
-	if (sOpt) {
-		CE_CharToWide((char *) sOpt, (u16 *)wTmp);
-		m_Timeout.SetWindowText(wTmp);
-	} else {
-		m_Timeout.SetWindowText(_T("30000"));
-	}
-
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "Network", "BufferLength");
-	if (sOpt) {
-		CE_CharToWide((char *) sOpt, (u16 *)wTmp);
-		m_Buffer.SetWindowText(wTmp);
-	} else {
-		m_Buffer.SetWindowText(_T("3000"));
-	}
-
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "Network", "RebufferLength");
-	u32 buf_len = 0;
-	if (sOpt) buf_len = atoi(sOpt);
-	if (buf_len) {
-		CE_CharToWide((char *) sOpt, (u16 *)wTmp);
-		m_RebufferLen.SetWindowText(wTmp);
-		m_Rebuffer.SetCheck(1);
-		m_RebufferLen.EnableWindow(1);
-	} else {
-		m_RebufferLen.SetWindowText(_T("0"));
-		m_Rebuffer.SetCheck(0);
-		m_RebufferLen.EnableWindow(0);
-	}
-
-	return TRUE;
-}
-
-
-void COptStream::OnSelchangePort()
-{
-	s32 sel = m_Port.GetCurSel();
-	switch (sel) {
-	case 3:
-	case 2:
-		m_UseRTSP.SetCheck(1);
-		m_UseRTSP.EnableWindow(0);
-		m_Reorder.SetCheck(0);
-		m_Reorder.EnableWindow(0);
-		break;
-	case 1:
-	default:
-		m_UseRTSP.SetCheck(0);
-		m_UseRTSP.EnableWindow(1);
-		m_Reorder.SetCheck(1);
-		m_Reorder.EnableWindow(1);
-		break;
-	}
-}
-
-void COptStream::OnRtsp()
-{
-	if (m_UseRTSP.GetCheck()) {
-		m_Reorder.SetCheck(0);
-		m_Reorder.EnableWindow(0);
-	} else {
-		m_Reorder.SetCheck(1);
-		m_Reorder.EnableWindow(1);
-	}
-
-}
-
-void COptStream::CheckRebuffer()
-{
-	TCHAR wstr50;
-	char str50;
-	s32 buf, rebuf;
-	m_Buffer.GetWindowText(wstr, 50);
-	CE_WideToChar((u16 *)wstr, str);
-	buf = atoi(str);
-	m_RebufferLen.GetWindowText(wstr, 50);
-	CE_WideToChar((u16 *)wstr, str);
-	rebuf = atoi(str);
-	if (rebuf*2 > buf) {
-		rebuf = buf/2;
-		wsprintf(wstr, _T("%d"), rebuf);
-		m_RebufferLen.SetWindowText(wstr);
-	}
-}
-
-void COptStream::OnRebuffer()
-{
-	if (!m_Rebuffer.GetCheck()) {
-		m_RebufferLen.EnableWindow(0);
-	} else {
-		m_RebufferLen.EnableWindow(1);
-		CheckRebuffer();
-	}
-}
-
-void COptStream::OnUpdateRebufferLen()
-{
-	CheckRebuffer();
-}
-
-void COptStream::OnUpdateBuffer()
-{
-	CheckRebuffer();
-}
-
-void COptStream::SaveOptions()
-{
-	COsmo4 *gpac = GetApp();
-	Bool force_rtsp = 0;
-	s32 sel = m_Port.GetCurSel();
-	switch (sel) {
-	case 3:
-		gf_cfg_set_key(gpac->m_user.config, "Streaming", "DefaultPort", "8080");
-		force_rtsp = 1;
-		break;
-	case 2:
-		gf_cfg_set_key(gpac->m_user.config, "Streaming", "DefaultPort", "80");
-		force_rtsp = 1;
-		break;
-	case 1:
-		gf_cfg_set_key(gpac->m_user.config, "Streaming", "DefaultPort", "7070");
-		break;
-	default:
-		gf_cfg_set_key(gpac->m_user.config, "Streaming", "DefaultPort", "554");
-		break;
-	}
-
-	if (force_rtsp) {
-		gf_cfg_set_key(gpac->m_user.config, "Streaming", "RTPoverRTSP", "yes");
-	} else {
-		gf_cfg_set_key(gpac->m_user.config, "Streaming", "RTPoverRTSP", m_UseRTSP.GetCheck() ? "yes" : "no");
-		if (!m_UseRTSP.GetCheck()) gf_cfg_set_key(gpac->m_user.config, "Streaming", "ReorderSize", m_Reorder.GetCheck() ? "30" : "0");
-	}
-
-	TCHAR wstr50;
-	char str50;
-
-	m_Timeout.GetWindowText(wstr, 50);
-	CE_WideToChar((u16 *)wstr, str);
-	gf_cfg_set_key(gpac->m_user.config, "Streaming", "RTSPTimeout", str);
-
-	m_Buffer.GetWindowText(wstr, 50);
-	CE_WideToChar((u16 *)wstr, str);
-	gf_cfg_set_key(gpac->m_user.config, "Network", "BufferLength", str);
-	if (m_Rebuffer.GetCheck()) {
-		m_RebufferLen.GetWindowText(wstr, 50);
-		CE_WideToChar((u16 *)wstr, str);
-		gf_cfg_set_key(gpac->m_user.config, "Network", "RebufferLength", str);
-	} else {
-		gf_cfg_set_key(gpac->m_user.config, "Network", "RebufferLength", "0");
-	}
-}
-
-
-
-COptSystems::COptSystems(CWnd* pParent /*=NULL*/)
-	: CDialog(COptSystems::IDD, pParent)
-{
-	//{{AFX_DATA_INIT(COptSystems)
-	// NOTE: the ClassWizard will add member initialization here
-	//}}AFX_DATA_INIT
-}
-
-
-void COptSystems::DoDataExchange(CDataExchange* pDX)
-{
-	CDialog::DoDataExchange(pDX);
-	//{{AFX_DATA_MAP(COptSystems)
-	DDX_Control(pDX, IDC_FORCE_DURATION, m_ForceDuration);
-	DDX_Control(pDX, IDC_DEC_THREAD, m_Threading);
-	DDX_Control(pDX, IDC_BIFSDROP, m_BifsAlwaysDrawn);
-	DDX_Control(pDX, IDC_LANG, m_Lang);
-	//}}AFX_DATA_MAP
-}
-
-
-BEGIN_MESSAGE_MAP(COptSystems, CDialog)
-	//{{AFX_MSG_MAP(COptSystems)
-	//}}AFX_MSG_MAP
-END_MESSAGE_MAP()
-
-/////////////////////////////////////////////////////////////////////////////
-// COptSystems message handlers
-
-
-
-BOOL COptSystems::OnInitDialog()
-{
-	CDialog::OnInitDialog();
-
-	COsmo4 *gpac = GetApp();
-	const char *sOpt;
-
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "Systems", "Language3CC");
-	if (!sOpt) sOpt = "eng";
-	s32 select = 0;
-	while (m_Lang.GetCount()) m_Lang.DeleteString(0);
-	s32 idx = gf_lang_find(sOpt);
-	u32 i, count = gf_lang_get_count();
-	for (i=0; i<count; i++) {
-		TCHAR szTmp100;
-		CE_CharToWide( (char *)gf_lang_get_name(i), (u16 *)szTmp);
-		m_Lang.AddString(szTmp);
-		if (idx>=0 && (i==idx))
-			select = i;
-	}
-	m_Lang.SetCurSel(select);
-
-
-	/*system config*/
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "Systems", "ThreadingPolicy");
-	select = 0;
-	while (m_Threading.GetCount()) m_Threading.DeleteString(0);
-	m_Threading.AddString(_T("Single Thread"));
-	m_Threading.AddString(_T("Mutli Thread"));
-	if (sOpt && !stricmp(sOpt, "Multi")) select = 1;
-	m_Threading.AddString(_T("Free"));
-	if (sOpt && !stricmp(sOpt, "Free")) select = 2;
-	m_Threading.SetCurSel(select);
-
-
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "Systems", "ForceSingleClock");
-	if (sOpt && !stricmp(sOpt, "yes")) {
-		m_ForceDuration.SetCheck(1);
-	} else {
-		m_ForceDuration.SetCheck(0);
-	}
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "Systems", "AlwaysDrawBIFS");
-	if (sOpt && !stricmp(sOpt, "yes")) {
-		m_BifsAlwaysDrawn.SetCheck(1);
-	} else {
-		m_BifsAlwaysDrawn.SetCheck(0);
-	}
-
-
-	return TRUE;
-}
-
-
-void COptSystems::SaveOptions()
-{
-	COsmo4 *gpac = GetApp();
-
-	s32 sel = m_Lang.GetCurSel();
-	gf_cfg_set_key(gpac->m_user.config, "Systems", "LanguageName", gf_lang_get_name(sel) );
-	gf_cfg_set_key(gpac->m_user.config, "Systems", "Language3CC", gf_lang_get_3cc(sel) );
-	gf_cfg_set_key(gpac->m_user.config, "Systems", "Language2CC", gf_lang_get_2cc(sel) );
-
-	sel = m_Threading.GetCurSel();
-	gf_cfg_set_key(gpac->m_user.config, "Systems", "ThreadingPolicy", (sel==0) ? "Single" : ( (sel==1) ? "Multi" : "Free"));
-
-	/*reset duration flag*/
-	gpac->m_duration = (u32) -1;
-	gf_cfg_set_key(gpac->m_user.config, "Systems", "ForceSingleClock", m_ForceDuration.GetCheck() ? "yes" : "no");
-	gf_cfg_set_key(gpac->m_user.config, "Systems", "AlwaysDrawBIFS", m_BifsAlwaysDrawn.GetCheck() ? "yes" : "no");
-
-}
-

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/osmo4_wce/Options.h Deleted

@@ -1,388 +0,0 @@
-#if !defined(AFX_OPTIONS_H__5C839953_58C0_4D9D_89CE_2820C7686C1B__INCLUDED_)
-#define AFX_OPTIONS_H__5C839953_58C0_4D9D_89CE_2820C7686C1B__INCLUDED_
-
-#if _MSC_VER > 1000
-#pragma once
-#endif // _MSC_VER > 1000
-// Options.h : header file
-//
-
-
-class COptSystems : public CDialog
-{
-// Construction
-public:
-	COptSystems(CWnd* pParent = NULL);   // standard constructor
-
-// Dialog Data
-	//{{AFX_DATA(COptSystems)
-	enum { IDD = IDD_OPT_SYSTEMS };
-	CButton	m_ForceDuration;
-	CComboBox	m_Threading;
-	CButton	m_BifsAlwaysDrawn;
-	CComboBox	m_Lang;
-	//}}AFX_DATA
-
-	void SaveOptions();
-
-// Overrides
-	// ClassWizard generated virtual function overrides
-	//{{AFX_VIRTUAL(COptSystems)
-protected:
-	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
-	//}}AFX_VIRTUAL
-
-// Implementation
-protected:
-
-	// Generated message map functions
-	//{{AFX_MSG(COptSystems)
-	virtual BOOL OnInitDialog();
-	//}}AFX_MSG
-	DECLARE_MESSAGE_MAP()
-};
-
-class COptStream : public CDialog
-{
-// Construction
-public:
-	COptStream(CWnd* pParent = NULL);   // standard constructor
-
-// Dialog Data
-	//{{AFX_DATA(COptStream)
-	enum { IDD = IDD_OPT_STREAM };
-	CEdit	m_RebufferLen;
-	CButton	m_Rebuffer;
-	CEdit	m_Buffer;
-	CEdit	m_Timeout;
-	CButton	m_Reorder;
-	CButton	m_UseRTSP;
-	CComboBox	m_Port;
-	//}}AFX_DATA
-
-
-	void SaveOptions();
-
-	void CheckRebuffer();
-
-// Overrides
-	// ClassWizard generated virtual function overrides
-	//{{AFX_VIRTUAL(COptStream)
-protected:
-	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
-	//}}AFX_VIRTUAL
-
-// Implementation
-protected:
-
-	// Generated message map functions
-	//{{AFX_MSG(COptStream)
-	virtual BOOL OnInitDialog();
-	afx_msg void OnSelchangePort();
-	afx_msg void OnRtsp();
-	afx_msg void OnRebuffer();
-	afx_msg void OnUpdateRebufferLen();
-	afx_msg void OnUpdateBuffer();
-	//}}AFX_MSG
-	DECLARE_MESSAGE_MAP()
-};
-class COptRender : public CDialog
-{
-// Construction
-public:
-	COptRender(CWnd* pParent = NULL);   // standard constructor
-
-// Dialog Data
-	//{{AFX_DATA(COptRender)
-	enum { IDD = IDD_OPT_RENDER };
-	CComboBox	m_Antialias;
-	CButton	m_ForceSize;
-	CButton	m_HighSpeed;
-	CButton	m_Scalable;
-	CButton	m_DirectRender;
-	CComboBox	m_BIFSRate;
-	//}}AFX_DATA
-
-
-	void SaveOptions();
-
-// Overrides
-	// ClassWizard generated virtual function overrides
-	//{{AFX_VIRTUAL(COptRender)
-protected:
-	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
-	//}}AFX_VIRTUAL
-
-// Implementation
-protected:
-
-	// Generated message map functions
-	//{{AFX_MSG(COptRender)
-	virtual BOOL OnInitDialog();
-	//}}AFX_MSG
-	DECLARE_MESSAGE_MAP()
-};
-class COptHTTP : public CDialog
-{
-// Construction
-public:
-	COptHTTP(CWnd* pParent = NULL);   // standard constructor
-
-// Dialog Data
-	//{{AFX_DATA(COptHTTP)
-	enum { IDD = IDD_OPT_HTTP };
-	CButton	m_RestartFile;
-	CButton	m_Progressive;
-	CButton	m_CleanCache;
-	CButton	m_CacheDir;
-	CEdit	m_SaxDuration;
-	//}}AFX_DATA
-
-
-	void SaveOptions();
-
-// Overrides
-	// ClassWizard generated virtual function overrides
-	//{{AFX_VIRTUAL(COptHTTP)
-protected:
-	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
-	//}}AFX_VIRTUAL
-
-// Implementation
-protected:
-
-	// Generated message map functions
-	//{{AFX_MSG(COptHTTP)
-	afx_msg void OnBrowseCache();
-	afx_msg void OnProgressive();
-	virtual BOOL OnInitDialog();
-	//}}AFX_MSG
-	DECLARE_MESSAGE_MAP()
-};
-class COptGen : public CDialog
-{
-// Construction
-public:
-	COptGen(CWnd* pParent = NULL);   // standard constructor
-
-// Dialog Data
-	//{{AFX_DATA(COptGen)
-	enum { IDD = IDD_OPT_GEN };
-	CButton	m_NoBacklight;
-	CButton	m_Fill;
-	CButton	m_Loop;
-	CButton	m_Logs;
-	//}}AFX_DATA
-
-	void SaveOptions();
-
-// Overrides
-	// ClassWizard generated virtual function overrides
-	//{{AFX_VIRTUAL(COptGen)
-protected:
-	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
-	//}}AFX_VIRTUAL
-
-// Implementation
-protected:
-
-	// Generated message map functions
-	//{{AFX_MSG(COptGen)
-	virtual BOOL OnInitDialog();
-	afx_msg void OnFileassoc();
-	//}}AFX_MSG
-	DECLARE_MESSAGE_MAP()
-};
-class COptFont : public CDialog
-{
-// Construction
-public:
-	COptFont(CWnd* pParent = NULL);   // standard constructor
-
-// Dialog Data
-	//{{AFX_DATA(COptFont)
-	enum { IDD = IDD_OPT_FONT };
-	CButton	m_UseTexture;
-	CComboBox	m_Fonts;
-	CButton	m_BrowseFont;
-	//}}AFX_DATA
-
-
-	void SaveOptions();
-
-// Overrides
-	// ClassWizard generated virtual function overrides
-	//{{AFX_VIRTUAL(COptFont)
-protected:
-	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
-	//}}AFX_VIRTUAL
-
-// Implementation
-protected:
-
-	// Generated message map functions
-	//{{AFX_MSG(COptFont)
-	virtual BOOL OnInitDialog();
-	afx_msg void OnBrowseFont();
-	//}}AFX_MSG
-	DECLARE_MESSAGE_MAP()
-};
-class COptDecoder : public CDialog
-{
-// Construction
-public:
-	COptDecoder(CWnd* pParent = NULL);   // standard constructor
-
-// Dialog Data
-	//{{AFX_DATA(COptDecoder)
-	enum { IDD = IDD_OPT_DECODER };
-	CComboBox	m_Video;
-	CComboBox	m_Audio;
-	//}}AFX_DATA
-
-	void SaveOptions();
-
-// Overrides
-	// ClassWizard generated virtual function overrides
-	//{{AFX_VIRTUAL(COptDecoder)
-protected:
-	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
-	//}}AFX_VIRTUAL
-
-// Implementation
-protected:
-
-	// Generated message map functions
-	//{{AFX_MSG(COptDecoder)
-	virtual BOOL OnInitDialog();
-	//}}AFX_MSG
-	DECLARE_MESSAGE_MAP()
-};
-
-class COptAudio : public CDialog
-{
-// Construction
-public:
-	COptAudio(CWnd* pParent = NULL);   // standard constructor
-
-// Dialog Data
-	//{{AFX_DATA(COptAudio)
-	enum { IDD = IDD_OPT_AUDIO };
-	CComboBox	m_DriverList;
-	CButton	m_AudioResync;
-	CEdit	m_AudioDur;
-	CSpinButtonCtrl	m_SpinDur;
-	CButton	m_ForceConfig;
-	CSpinButtonCtrl	m_AudioSpin;
-	CEdit	m_AudioEdit;
-	//}}AFX_DATA
-
-	void SaveOptions();
-
-// Overrides
-	// ClassWizard generated virtual function overrides
-	//{{AFX_VIRTUAL(COptAudio)
-protected:
-	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
-	//}}AFX_VIRTUAL
-
-// Implementation
-protected:
-
-	// Generated message map functions
-	//{{AFX_MSG(COptAudio)
-	virtual BOOL OnInitDialog();
-	afx_msg void OnForceAudio();
-	//}}AFX_MSG
-	DECLARE_MESSAGE_MAP()
-};
-
-
-class COptRender3D : public CDialog
-{
-// Construction
-public:
-	COptRender3D(CWnd* pParent = NULL);   // standard constructor
-
-// Dialog Data
-	//{{AFX_DATA(COptRender)
-	enum { IDD = IDD_OPT_RENDER3D };
-	CComboBox	m_WireMode;
-	CComboBox	m_DrawNormals;
-	CButton	m_Use3DRender;
-	CButton	m_NoBackFace;
-	CButton	m_EmulatePOW2;
-	//}}AFX_DATA
-
-	void SaveOptions();
-
-// Overrides
-	// ClassWizard generated virtual function overrides
-	//{{AFX_VIRTUAL(COptRender)
-protected:
-	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
-	//}}AFX_VIRTUAL
-
-// Implementation
-protected:
-
-	// Generated message map functions
-	//{{AFX_MSG(COptRender)
-	virtual BOOL OnInitDialog();
-	//}}AFX_MSG
-	DECLARE_MESSAGE_MAP()
-};
-
-/////////////////////////////////////////////////////////////////////////////
-// COptions dialog
-
-class COptions : public CDialog
-{
-// Construction
-public:
-	COptions(CWnd* pParent = NULL);   // standard constructor
-
-// Dialog Data
-	//{{AFX_DATA(COptions)
-	enum { IDD = IDD_OPTIONS };
-	CComboBox	m_Selection;
-	//}}AFX_DATA
-
-
-// Overrides
-	// ClassWizard generated virtual function overrides
-	//{{AFX_VIRTUAL(COptions)
-protected:
-	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
-	//}}AFX_VIRTUAL
-
-// Implementation
-protected:
-
-	COptGen m_general;
-	COptSystems m_systems;
-	COptRender m_render;
-	COptRender3D m_render3D;
-	COptAudio m_audio;
-	COptHTTP m_http;
-	COptFont m_font;
-	COptStream m_stream;
-	COptDecoder m_decoder;
-
-
-	void HideAll();
-
-	// Generated message map functions
-	//{{AFX_MSG(COptions)
-	virtual BOOL OnInitDialog();
-	virtual void OnOK();
-	afx_msg void OnSaveopt();
-	afx_msg void OnSelchangeCombosel();
-	//}}AFX_MSG
-	DECLARE_MESSAGE_MAP()
-};
-
-//{{AFX_INSERT_LOCATION}}
-// Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_OPTIONS_H__5C839953_58C0_4D9D_89CE_2820C7686C1B__INCLUDED_)

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/osmo4_wce/Osmo4.cpp Deleted

@@ -1,638 +0,0 @@
-// Osmo4.cpp : Defines the class behaviors for the application.
-//
-
-#include "stdafx.h"
-#include "Osmo4.h"
-
-#include <gpac/options.h>
-#include <gpac/modules/service.h>
-#include "MainFrm.h"
-#include "OpenDlg.h"
-#include "Options.h"
-#include <gx.h>
-
-
-#ifdef _DEBUG
-#define new DEBUG_NEW
-#undef THIS_FILE
-static char THIS_FILE = __FILE__;
-#endif
-
-/////////////////////////////////////////////////////////////////////////////
-// COsmo4
-
-BEGIN_MESSAGE_MAP(COsmo4, CWinApp)
-	//{{AFX_MSG_MAP(COsmo4)
-	ON_COMMAND(ID_APP_ABOUT, OnAppAbout)
-	ON_COMMAND(IDD_CONFIGURE, OnConfigure)
-	ON_COMMAND(ID_OPEN_FILE, OnOpenFile)
-	ON_COMMAND(ID_OPEN_URL, OnOpenUrl)
-	ON_COMMAND(ID_SHORTCUTS, OnShortcuts)
-	//}}AFX_MSG_MAP
-END_MESSAGE_MAP()
-
-
-
-
-
-
-Bool Osmo4CE_EventProc(void *priv, GF_Event *event)
-{
-	u32 dur;
-	COsmo4 *app = (COsmo4 *) priv;
-	CMainFrame *pFrame = (CMainFrame *) app->m_pMainWnd;
-	/*shutdown*/
-	if (!pFrame) return 0;
-
-	switch (event->type) {
-	case GF_EVENT_MESSAGE:
-		if (event->message.error!=GF_OK) {
-			if (event->message.error<GF_OK) {
-				pFrame->console_err = event->message.error;
-				pFrame->console_message = event->message.message;
-				pFrame->PostMessage(WM_CONSOLEMSG, 0, 0);
-			}
-			return 0;
-		}
-		if (1) return 0;
-		/*process user message*/
-		pFrame->console_err = GF_OK;
-		pFrame->console_message = event->message.message;
-		pFrame->PostMessage(WM_CONSOLEMSG, 0, 0);
-		break;
-	case GF_EVENT_SIZE:
-		break;
-	case GF_EVENT_SCENE_SIZE:
-		app->m_scene_width = event->size.width;
-		app->m_scene_height = event->size.height;
-		if (!pFrame->m_full_screen)
-			pFrame->PostMessage(WM_SETSIZE, event->size.width, event->size.height);
-		break;
-	case GF_EVENT_CONNECT:
-		app->m_open = event->connect.is_connected;
-		break;
-	case GF_EVENT_DURATION:
-		dur = (u32) (1000 * event->duration.duration);
-		if (dur<2000) dur = 0;
-		app->m_duration = dur;
-		app->m_can_seek = event->duration.can_seek && dur;
-		pFrame->m_progBar.m_range_invalidated = 1;
-		/*by default, don't display timing if not seekable and vice-versa*/
-		if (app->m_can_seek != pFrame->m_view_timing) {
-			pFrame->m_view_timing = app->m_can_seek;
-			if (!pFrame->m_full_screen)
-				pFrame->PostMessage(WM_SETSIZE, 0, 0);
-		}
-		break;
-	case GF_EVENT_NAVIGATE:
-		/*store URL since it may be destroyed, and post message*/
-		app->m_navigate_url = event->navigate.to_url;
-		pFrame->PostMessage(WM_NAVIGATE, NULL, NULL);
-		return 1;
-	case GF_EVENT_QUIT:
-		pFrame->PostMessage(WM_CLOSE, 0L, 0L);
-		break;
-	/*ipaq keys*/
-	case GF_EVENT_KEYDOWN:
-		switch (event->key.key_code) {
-		case GF_KEY_F1:
-			pFrame->PostMessage(WM_COMMAND, ID_FILE_OPEN);
-			break;
-		case GF_KEY_F2:
-			pFrame->PostMessage(WM_QUIT);
-			break;
-		case GF_KEY_F3:
-			pFrame->PostMessage(WM_COMMAND, ID_FILE_RESTART);
-			break;
-		case GF_KEY_F5:
-			pFrame->PostMessage(WM_COMMAND, ID_VIEW_FULLSCREEN);
-			break;
-		case GF_KEY_ENTER:
-			pFrame->PostMessage(WM_COMMAND, ID_FILE_PAUSE);
-			break;
-		case GF_KEY_LEFT:
-			if (app->m_duration>=2000) {
-				s32 res = gf_term_get_time_in_ms(app->m_term) - 5*app->m_duration/100;
-				if (res<0) res=0;
-				gf_term_play_from_time(app->m_term, res, 0);
-			}
-			break;
-		case GF_KEY_RIGHT:
-			if (app->m_duration>=2000) {
-				u32 res = gf_term_get_time_in_ms(app->m_term) + 5*app->m_duration/100;
-				if (res>=app->m_duration) res = 0;
-				gf_term_play_from_time(app->m_term, res, 0);
-			}
-			break;
-		case GF_KEY_UP:
-			if (app->m_duration>=2000) pFrame->PostMessage(WM_COMMAND, ID_FILE_STEP);
-			break;
-		case GF_KEY_DOWN:
-			gf_term_set_option(app->m_term, GF_OPT_REFRESH, 0);
-			break;
-		}
-		break;
-	case GF_EVENT_DBLCLICK:
-		pFrame->PostMessage(WM_COMMAND, ID_VIEW_FULLSCREEN);
-		return 0;
-	}
-
-	return 0;
-}
-
-COsmo4::COsmo4()
-	: CWinApp()
-{
-	// TODO: add construction code here,
-	// Place all significant initialization in InitInstance
-	m_logs = NULL;
-}
-
-/////////////////////////////////////////////////////////////////////////////
-// The one and only COsmo4 object
-
-COsmo4 theApp;
-
-static void osmo4_do_log(void *cbk, GF_LOG_Level level, GF_LOG_Tool tool, const char *fmt, va_list list)
-{
-	FILE *logs = (FILE *) cbk;
-	if (logs) {
-		vfprintf(logs, fmt, list);
-		fflush(logs);
-	}
-}
-
-void COsmo4::EnableLogs(Bool turn_on)
-{
-	if (turn_on) {
-		const char *filename = gf_cfg_get_key(m_user.config, "General", "LogFile");
-		if (!filename) {
-			gf_cfg_set_key(m_user.config, "General", "LogFile", "\\gpac_logs.txt");
-			filename = "\\gpac_logs.txt";
-		}
-		m_logs = gf_fopen(filename, "wt");
-		if (!m_logs) {
-			MessageBox(NULL, _T("Couldn't open log file on file system"), _T("Disabling logs"), MB_OK);
-			turn_on = 0;
-		} else {
-			gf_log_set_tools_levels("network:rtp:sync:codec:media@debug");
-			gf_log_set_callback(m_logs, osmo4_do_log);
-			gf_cfg_set_key(m_user.config, "General", "Logs", "network:rtp:sync:codec:media@debug");
-		}
-	}
-	if (!turn_on) {
-		if (m_logs) {
-			gf_fclose(m_logs);
-			m_logs = 0;
-		}
-		gf_log_set_tool_level(GF_LOG_ALL, GF_LOG_NONE);
-		gf_log_set_callback(NULL, NULL);
-		gf_cfg_set_key(m_user.config, "General", "Logs", "all@quiet");
-	}
-}
-
-/////////////////////////////////////////////////////////////////////////////
-// COsmo4 initialization
-
-BOOL COsmo4::InitInstance()
-{
-	Bool first_load = 0;
-	if (!AfxSocketInit())
-	{
-		AfxMessageBox(IDP_SOCKETS_INIT_FAILED);
-		return FALSE;
-	}
-
-	gf_sys_init(GF_MemTrackerNone);
-
-	SetRegistryKey(_T("GPAC"));
-
-	m_prev_batt_bl = m_prev_ac_bl = 0;
-
-	m_screen_width = GetSystemMetrics(SM_CXSCREEN);
-	m_screen_height = GetSystemMetrics(SM_CYSCREEN);
-	m_menu_height = GetSystemMetrics(SM_CYMENU);
-	m_scene_width = m_scene_height = 0;
-
-	CMainFrame* pFrame = new CMainFrame;
-	m_pMainWnd = pFrame;
-
-	pFrame->LoadFrame(IDR_MAINFRAME, WS_VISIBLE, NULL, NULL);
-
-	pFrame->ShowWindow(m_nCmdShow);
-	pFrame->UpdateWindow();
-
-	TCHAR w_config_pathMAX_PATH;
-	char config_pathMAX_PATH;
-	GetModuleFileName(NULL, w_config_path, MAX_PATH);
-	CE_WideToChar((u16 *) w_config_path, (char *) config_path);
-
-	while (config_pathstrlen((char *) config_path)-1 != '\\') config_pathstrlen((char *) config_path)-1 = 0;
-
-	/*setup user*/
-	memset(&m_user, 0, sizeof(GF_User));
-
-	/*init config and plugins*/
-	m_user.config = gf_cfg_init(NULL, &first_load);
-	if (!m_user.config) {
-		MessageBox(NULL, _T("GPAC Configuration file not found"), _T("Fatal Error"), MB_OK);
-		m_pMainWnd->PostMessage(WM_CLOSE);
-	}
-
-	const char *str = gf_cfg_get_key(m_user.config, "General", "Logs");
-	EnableLogs((str && strcmp(str, "all@quiet") ) ? 1 : 0);
-
-	if (first_load) {
-		/*first launch, register all files ext*/
-		u32 i;
-		for (i=0; i<gf_modules_get_count(m_user.modules); i++) {
-			GF_InputService *ifce = (GF_InputService *) gf_modules_load_interface(m_user.modules, i, GF_NET_CLIENT_INTERFACE);
-			if (!ifce) continue;
-			if (ifce) {
-				ifce->CanHandleURL(ifce, "test.test");
-				gf_modules_close_interface((GF_BaseInterface *)ifce);
-			}
-		}
-		::MessageBox(NULL, _T("Osmo4/GPAC Setup complete"), _T("Initial launch"), MB_OK);
-	}
-
-
-	str = gf_cfg_get_key(m_user.config, "Core", "ModulesDirectory");
-	m_user.modules = gf_modules_new(str, m_user.config);
-	if (!m_user.modules || ! gf_modules_get_count(m_user.modules) ) {
-		MessageBox(NULL, _T("No plugins available - system cannot work"), _T("Fatal Error"), MB_OK);
-		m_pMainWnd->PostMessage(WM_QUIT);
-		return FALSE;
-	}
-
-	m_user.config = m_user.config;
-	m_user.modules = m_user.modules;
-	m_user.EventProc = Osmo4CE_EventProc;
-	m_user.opaque = this;
-	m_user.os_window_handler = pFrame->m_wndView.m_hWnd;
-
-
-	m_term = gf_term_new(&m_user);
-	if (! m_term) {
-		MessageBox(NULL, _T("Cannot load MPEG-4 Terminal"), _T("Fatal Error"), MB_OK);
-		m_pMainWnd->PostMessage(WM_QUIT);
-	}
-
-	m_stopped = 0;
-	m_open = 0;
-	m_can_seek = 0;
-	m_DoResume = 0;
-	SetOptions();
-	pFrame->SendMessage(WM_SETSIZE, 0, 0);
-	ShowTaskBar(0);
-
-	CCommandLineInfo cmdInfo;
-	ParseCommandLine(cmdInfo);
-
-	if (! cmdInfo.m_strFileName.IsEmpty()) {
-		m_filename = cmdInfo.m_strFileName;
-		m_pMainWnd->PostMessage(WM_OPENURL);
-	} else {
-		str = gf_cfg_get_key(m_user.config, "General", "StartupFile");
-		if (str) gf_term_connect(m_term, str);
-	}
-	return TRUE;
-}
-
-/////////////////////////////////////////////////////////////////////////////
-// COsmo4 message handlers
-
-
-
-
-
-/////////////////////////////////////////////////////////////////////////////
-// CAboutDlg dialog used for App About
-
-class CAboutDlg : public CDialog
-{
-public:
-	CAboutDlg();
-
-// Dialog Data
-	//{{AFX_DATA(CAboutDlg)
-	enum { IDD = IDD_ABOUTBOX };
-	CStatic m_AbtTxt;
-	//}}AFX_DATA
-
-	// ClassWizard generated virtual function overrides
-	//{{AFX_VIRTUAL(CAboutDlg)
-protected:
-	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
-	//}}AFX_VIRTUAL
-
-// Implementation
-protected:
-	//{{AFX_MSG(CAboutDlg)
-	virtual BOOL OnInitDialog();		// Added for WCE apps
-	//}}AFX_MSG
-	DECLARE_MESSAGE_MAP()
-};
-
-CAboutDlg::CAboutDlg() : CDialog(CAboutDlg::IDD)
-{
-	//{{AFX_DATA_INIT(CAboutDlg)
-	//}}AFX_DATA_INIT
-}
-
-void CAboutDlg::DoDataExchange(CDataExchange* pDX)
-{
-	CDialog::DoDataExchange(pDX);
-	//{{AFX_DATA_MAP(CAboutDlg)
-	DDX_Control(pDX, IDC_ABT_TEXT, m_AbtTxt);
-	//}}AFX_DATA_MAP
-}
-
-BEGIN_MESSAGE_MAP(CAboutDlg, CDialog)
-	//{{AFX_MSG_MAP(CAboutDlg)
-	// No message handlers
-	//}}AFX_MSG_MAP
-END_MESSAGE_MAP()
-
-/////////////////////////////////////////////////////////////////////////////
-// COsmo4 commands
-// Added for WCE apps
-
-BOOL CAboutDlg::OnInitDialog()
-{
-	CDialog::OnInitDialog();
-	CString str = _T("Osmo4 Player\nGPAC V");
-	str += _T(GPAC_VERSION);
-	str += _T(" (build");
-	str += _T(GPAC_BUILD_NUMBER);
-	str += _T(")");
-	m_AbtTxt.SetWindowText(str);
-	return TRUE;
-}
-
-
-
-void COsmo4::OnAppAbout()
-{
-	CAboutDlg aboutDlg;
-	ShowTaskBar(1);
-	aboutDlg.DoModal();
-	ShowTaskBar(0);
-}
-
-
-int COsmo4::ExitInstance()
-{
-	gf_term_del(m_term);
-	gf_modules_del(m_user.modules);
-	gf_cfg_del(m_user.config);
-	ShowTaskBar(1);
-	gf_sys_close();
-	if (m_logs) gf_fclose(m_logs);
-	return CWinApp::ExitInstance();
-}
-
-void COsmo4::SetOptions()
-{
-	const char *sOpt = gf_cfg_get_key(m_user.config, "General", "Loop");
-	m_Loop = (sOpt && !stricmp(sOpt, "yes")) ? 1 : 0;
-	sOpt = gf_cfg_get_key(m_user.config, "General", "FillScreen");
-	m_fit_screen = (sOpt && !stricmp(sOpt, "yes")) ? 1 : 0;
-	sOpt = gf_cfg_get_key(m_user.config, "General", "DisableBackLight");
-	m_disable_backlight = (sOpt && !stricmp(sOpt, "yes")) ? 1 : 0;
-	gf_term_set_option(m_term, GF_OPT_ASPECT_RATIO, GF_ASPECT_RATIO_KEEP);
-	sOpt = gf_cfg_get_key(m_user.config, "General", "NoMIMETypeFetch");
-	m_no_mime_fetch = (!sOpt || !stricmp(sOpt, "yes")) ? 1 : 0;
-
-	//gf_term_set_option(m_term, GF_OPT_AUDIO_VOLUME, 100);
-}
-
-void COsmo4::Pause()
-{
-	if (!m_open) return;
-
-	if (gf_term_get_option(m_term, GF_OPT_PLAY_STATE)==GF_STATE_PLAYING) {
-		gf_term_set_option(m_term, GF_OPT_PLAY_STATE, GF_STATE_PAUSED);
-		SetBacklightState(0);
-	} else {
-		gf_term_set_option(m_term, GF_OPT_PLAY_STATE, GF_STATE_PLAYING);
-		SetBacklightState(1);
-	}
-	((CMainFrame*)m_pMainWnd)->SetPauseButton();
-}
-
-
-void COsmo4::OnConfigure()
-{
-	COptions dlg;
-
-	ShowTaskBar(1);
-	dlg.DoModal();
-	ShowTaskBar(0);
-}
-
-void COsmo4::ShowTaskBar(Bool showIt, Bool pause_only)
-{
-	if (showIt) {
-		m_DoResume = 0;
-		if (gf_term_get_option(m_term, GF_OPT_PLAY_STATE)==GF_STATE_PLAYING) {
-			m_DoResume = 1;
-			gf_term_set_option(m_term, GF_OPT_PLAY_STATE, GF_STATE_PAUSED);
-		}
-		gf_term_set_option(m_term, GF_OPT_FREEZE_DISPLAY, 1);
-		if (!pause_only) {
-			SHFullScreen(GetForegroundWindow(), SHFS_HIDESTARTICON | SHFS_SHOWTASKBAR| SHFS_SHOWSIPBUTTON);
-			::ShowWindow(::FindWindow(_T("HHTaskbar"),NULL), SW_SHOWNA);
-		}
-		SetBacklightState(0);
-	} else {
-		if (!pause_only) {
-			SHFullScreen(GetForegroundWindow(), SHFS_HIDESTARTICON | SHFS_HIDETASKBAR| SHFS_HIDESIPBUTTON);
-			::ShowWindow(::FindWindow(_T("HHTaskbar"),NULL), SW_HIDE);
-		}
-		gf_term_set_option(m_term, GF_OPT_FREEZE_DISPLAY, 0);
-		gf_term_set_option(m_term, GF_OPT_REFRESH, 0);
-		if (m_DoResume) {
-			gf_term_set_option(m_term, GF_OPT_PLAY_STATE, GF_STATE_PLAYING);
-			SetBacklightState(1);
-			m_DoResume = 0;
-		}
-		m_pMainWnd->SetFocus();
-	}
-}
-
-
-CString COsmo4::GetFileFilter()
-{
-	u32 keyCount, i;
-	CString sFiles;
-	CString sExts;
-	CString supportedFiles;
-
-	return CString("All Files |*.*|");
-
-	supportedFiles = "All Known Files|*.m3u;*.pls";
-
-	sExts = "";
-	sFiles = "";
-	keyCount = gf_cfg_get_key_count(m_user.config, "MimeTypes");
-	for (i=0; i<keyCount; i++) {
-		const char *sMime;
-		Bool first;
-		char *sKey;
-		char szKeyList1000, sDesc1000;
-		short swKeyList1000, swDesc1000;
-		sMime = gf_cfg_get_key_name(m_user.config, "MimeTypes", i);
-		if (!sMime) continue;
-		CString sOpt;
-		const char *opt = gf_cfg_get_key(m_user.config, "MimeTypes", sMime);
-		/*remove #include <gpac/options.h>
-		name*/
-		strcpy(szKeyList, opt+1);
-		sKey = strrchr(szKeyList, '\"');
-		if (!sKey) continue;
-		sKey0 = 0;
-		/*get description*/
-		sKey = strrchr(szKeyList, '\"');
-		if (!sKey) continue;
-		strcpy(sDesc, sKey+1);
-		sKey0 = 0;
-		sKey = strrchr(szKeyList, '\"');
-		if (!sKey) continue;
-		sKey0 = 0;
-
-		CE_CharToWide(sDesc, (unsigned short *)swDesc);
-		CE_CharToWide(szKeyList, (unsigned short *)swKeyList);
-
-		/*if same description for # mime types skip (means an old mime syntax)*/
-		if (sFiles.Find((LPCTSTR) swDesc)>=0) continue;
-		/*if same extensions for # mime types skip (don't polluate the file list)*/
-		if (sExts.Find((LPCTSTR) swKeyList)>=0) continue;
-
-		sExts += (LPCTSTR) swKeyList;
-		sExts += " ";
-		sFiles += (LPCTSTR) swDesc;
-		sFiles += "|";
-
-		first = 1;
-
-		sOpt = CString(szKeyList);
-		while (1) {
-
-			int pos = sOpt.Find(' ');
-			CString ext = (pos==-1) ? sOpt : sOpt.Left(pos);
-			/*WATCHOUT: we do have some "double" ext , eg .wrl.gz - these are NOT supported by windows*/
-			if (ext.Find(_T("."))<0) {
-				if (!first) {
-					sFiles += ";";
-				} else {
-					first = 0;
-				}
-				sFiles += "*.";
-				sFiles += ext;
-
-				CString sext = ext;
-				sext += ";";
-				if (supportedFiles.Find(sext)<0) {
-					supportedFiles += ";*.";
-					supportedFiles += ext;
-				}
-			}
-
-			if (sOpt==ext) break;
-			CString rem;
-			rem.Format(_T("%s "), (LPCTSTR) ext);
-			sOpt.Replace((LPCTSTR) rem, _T(""));
-		}
-		sFiles += "|";
-	}
-	supportedFiles += "|";
-	supportedFiles += sFiles;
-	//supportedFiles += "M3U Playlists|*.m3u|ShoutCast Playlists|*.pls|All Files |*.*|";
-	supportedFiles += "All Files |*.*|";
-	return supportedFiles;
-}
-
-void COsmo4::OnOpenFile()
-{
-	Bool res;
-	CFileDialog fd(TRUE,NULL,_T("\\"),OFN_HIDEREADONLY, GetFileFilter());
-
-	ShowTaskBar(1);
-	res = 0;
-	if (fd.DoModal()==IDOK) {
-		res = 1;
-		m_filename = fd.GetPathName();
-		m_DoResume = 0;/*done by term*/
-	}
-	ShowTaskBar(0);
-	if (res) m_pMainWnd->PostMessage(WM_OPENURL);
-}
-
-void COsmo4::OnOpenUrl()
-{
-	OpenDlg dlg;
-	Bool res;
-	ShowTaskBar(1, 1);
-	res = 0;
-	if (dlg.DoModal() == IDOK) {
-		res = 1;
-		m_DoResume = 0;/*done by term*/
-	}
-	ShowTaskBar(0, 1);
-	if (res) m_pMainWnd->PostMessage(WM_OPENURL);
-}
-
-void COsmo4::SetBacklightState(Bool disable)
-{
-	HKEY hKey = 0;
-	DWORD dwSize;
-	DWORD dwValue;
-	HANDLE hBL;
-
-	if (!m_disable_backlight) return;
-
-	if (RegOpenKeyEx(HKEY_CURRENT_USER, _T("ControlPanel\\Backlight"), 0, 0, &hKey ) != ERROR_SUCCESS) return;
-
-	if (disable) {
-		dwSize = 4;
-		RegQueryValueEx(hKey, _T("BatteryTimeout"), NULL, NULL,(unsigned char*) &m_prev_batt_bl, &dwSize);
-		dwSize = 4;
-		RegQueryValueEx(hKey, _T("ACTimeout"), NULL, NULL, (unsigned char*) &m_prev_ac_bl,&dwSize);
-		dwSize = 4;
-		dwValue = 0xefff ;
-		RegSetValueEx(hKey, _T("BatteryTimeout"), NULL, REG_DWORD, (unsigned char *)&dwValue, dwSize);
-		dwSize = 4;
-		dwValue = 0xefff ;
-		RegSetValueEx( hKey, _T("ACTimeout"), NULL, REG_DWORD, (unsigned char *)&dwValue, dwSize);
-	} else {
-		if (m_prev_batt_bl) {
-			dwSize = 4;
-			RegSetValueEx(hKey, _T("BatteryTimeout"), NULL, REG_DWORD, (unsigned char *)&m_prev_batt_bl, dwSize);
-		}
-		if (m_prev_ac_bl) {
-			dwSize = 4;
-			RegSetValueEx(hKey, _T("ACTimeout"), NULL, REG_DWORD,(unsigned char *)&m_prev_ac_bl, dwSize);
-		}
-	}
-	RegCloseKey(hKey);
-	hBL = CreateEvent(NULL, FALSE, FALSE, _T("BackLightChangeEvent"));
-	if (hBL) {
-		SetEvent(hBL);
-		CloseHandle(hBL);
-	}
-}
-
-void COsmo4::OnShortcuts()
-{
-	ShowTaskBar(1);
-
-	MessageBox(NULL,
-	           _T("Double Click: Fullscreen on/off\n"),
-
-	           _T("Osmo4 Shortcuts"),
-	           MB_OK);
-
-	ShowTaskBar(0);
-}
-

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/osmo4_wce/Osmo4.h Deleted

@@ -1,113 +0,0 @@
-// Osmo4.h : main header file for the OSMO4 application
-//
-
-#if !defined(AFX_OSMO4_H__7E4A02D1_F77D_4E97_9E10_032054B29E33__INCLUDED_)
-#define AFX_OSMO4_H__7E4A02D1_F77D_4E97_9E10_032054B29E33__INCLUDED_
-
-#if _MSC_VER >= 1000
-#pragma once
-#endif // _MSC_VER >= 1000
-
-#ifndef __AFXWIN_H__
-#error include 'stdafx.h' before including this file for PCH
-#endif
-
-#include "resource.h"       // main symbols
-
-/////////////////////////////////////////////////////////////////////////////
-// COsmo4:
-// See Osmo4.cpp for the implementation of this class
-//
-
-/*MPEG4 term*/
-#include <gpac/terminal.h>
-
-enum {
-	WM_SCENE_DONE = WM_USER + 1,
-	WM_NAVIGATE,
-	WM_SETSIZE,
-	WM_OPENURL,
-	WM_CONSOLEMSG,
-};
-
-
-#define IPAQ_TRANSLATE_KEY(vk)	(LOWORD(vk) != 0x5b ? LOWORD(vk) : vk )
-/*navigation pad keys*/
-#define VK_IPAQ_LEFT		0x25
-#define VK_IPAQ_UP			0x26
-#define VK_IPAQ_RIGHT		0x27
-#define VK_IPAQ_DOWN		0x28
-/*"enter" key*/
-#define VK_IPAQ_START		0x86
-/*ipaq keys from left to right*/
-#define VK_IPAQ_A			0xC1
-#define VK_IPAQ_B			0xC2
-#define VK_IPAQ_C			0xC3
-#define VK_IPAQ_D			0xC4
-/*record button*/
-#define VK_IPAQ_E			0xC5
-
-class COsmo4 : public CWinApp
-{
-public:
-	COsmo4();
-
-	GF_Terminal *m_term;
-	GF_User m_user;
-	CString m_filename;
-
-	u32 m_duration;
-	CString m_navigate_url;
-	Bool m_Loop, m_fit_screen, m_can_seek, m_open, m_disable_backlight, m_stopped, m_no_mime_fetch;
-	void Pause();
-
-	u32 m_scene_width, m_scene_height, m_reconnect_time;
-	u32 m_screen_width, m_screen_height, m_menu_height;
-	/*task bar on/off*/
-	void ShowTaskBar(Bool showIt, Bool pause_only = 0);
-
-	CString GetFileFilter();
-
-	void SetBacklightState(Bool disable);
-	void EnableLogs(Bool turn_on);
-
-private:
-	Bool m_DoResume;
-
-	void SetOptions();
-
-	/*power management*/
-	u32 m_prev_batt_bl, m_prev_ac_bl;
-
-	FILE *m_logs;
-
-// Overrides
-	// ClassWizard generated virtual function overrides
-	//{{AFX_VIRTUAL(COsmo4)
-public:
-	virtual BOOL InitInstance();
-	virtual int ExitInstance();
-	//}}AFX_VIRTUAL
-
-// Implementation
-
-	//{{AFX_MSG(COsmo4)
-	afx_msg void OnAppAbout();
-	afx_msg void OnConfigure();
-	afx_msg void OnOpenFile();
-	afx_msg void OnOpenUrl();
-	afx_msg void OnShortcuts();
-	//}}AFX_MSG
-	DECLARE_MESSAGE_MAP()
-};
-
-inline COsmo4 *GetApp() {
-	return (COsmo4 *)AfxGetApp();
-}
-
-/////////////////////////////////////////////////////////////////////////////
-
-//{{AFX_INSERT_LOCATION}}
-// Microsoft eMbedded Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_OSMO4_H__7E4A02D1_F77D_4E97_9E10_032054B29E33__INCLUDED_)

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/osmo4_wce/Osmo4.rc Deleted

@@ -1,758 +0,0 @@
-//Microsoft eMbedded Visual C++ generated resource script.
-//
-#include "resource.h"
-
-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
-#include "afxres.h"
-#include "newres.h"
-
-#include <gpac/version.h>
-
-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
-
-/////////////////////////////////////////////////////////////////////////////
-// English (U.S.) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-#ifdef _WIN32
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-#pragma code_page(1252)
-#endif //_WIN32
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Icon
-//
-
-// Icon with lowest ID value placed first to ensure application icon
-// remains consistent on all systems.
-IDR_MAINFRAME           ICON    DISCARDABLE     "res\\Osmo4.ico"
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Bitmap
-//
-
-IDR_MAINFRAME           BITMAP  MOVEABLE PURE   "res\\Cmdbar.bmp"
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Toolbar
-//
-
-IDR_MAINFRAME TOOLBAR DISCARDABLE  16, 16
-BEGIN
-    BUTTON      ID_OPEN_FILE
-    BUTTON      ID_FILE_PAUSE
-    BUTTON      ID_FILE_STEP
-    BUTTON      ID_FILE_STOP
-    BUTTON      ID_VIEW_FULLSCREEN
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Accelerator
-//
-
-IDR_MAINFRAME ACCELERATORS PRELOAD MOVEABLE PURE 
-BEGIN
-    "O",            ID_FILE_OPEN,           VIRTKEY, CONTROL, NOINVERT
-    "Q",            ID_APP_EXIT,            VIRTKEY, CONTROL, NOINVERT
-    "S",            ID_FILE_SAVE,           VIRTKEY, CONTROL, NOINVERT
-    "V",            ID_EDIT_PASTE,          VIRTKEY, CONTROL, NOINVERT
-    "X",            ID_EDIT_CUT,            VIRTKEY, CONTROL, NOINVERT
-    "Z",            ID_EDIT_UNDO,           VIRTKEY, CONTROL, NOINVERT
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog
-//
-
-IDD_ABOUTBOX DIALOG DISCARDABLE  0, 0, 140, 153
-STYLE WS_POPUP | WS_CAPTION
-EXSTYLE 0x80000000L
-CAPTION "About Osmo4"
-FONT 8, "System"
-BEGIN
-    ICON            IDR_MAINFRAME,IDC_STATIC,15,3,21,20
-    CTEXT           "Osmo4 player\nGPAC MPEG-4 SDK",IDC_ABT_TEXT,44,4,64,17
-    CTEXT           "This program is free software and may be distributed according to the terms of the GNU Lesser General Public License",
-                    IDC_STATIC,3,24,131,24
-    CTEXT           "GPAC Copyright (C) Telecom ParisTech 2000 - 2012 - All Rights Reserved http://gpac.io",
-                    IDC_STATIC,4,52,129,26
-					LTEXT           "Authors: Jean Le Feuvre, Cyril Concolato",IDC_STATIC,11,100,109,8
-    LTEXT           "Mozilla SpiderMonkey (JavaScript)",IDC_STATIC,11,110,
-                    109,8
-    LTEXT           "The FreeType Project",IDC_STATIC,11,120,70,8
-    LTEXT           "The PNG Group, The I.J.G.",IDC_STATIC,12,130,87,8
-    LTEXT           "XVID, FAAD, MAD, 3GPP",IDC_STATIC,13,139,80,8
-    LTEXT           "------------ With many thanks to: -------------",
-                    IDC_STATIC,0,91,139,8
-END
-
-IDD_OPENFILE DIALOG DISCARDABLE  0, 0, 133, 116
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Select file location"
-FONT 8, "System"
-BEGIN
-    DEFPUSHBUTTON   "OK",IDOK,92,33,27,14
-    COMBOBOX        IDC_FILELIST,4,17,127,52,CBS_DROPDOWN | CBS_AUTOHSCROLL | 
-                    CBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
-    DEFPUSHBUTTON   "Cancel",IDCANCEL,14,34,27,14
-    LTEXT           "Enter path to remote file",IDC_STATIC,25,6,80,8
-END
-
-
-#ifndef _MAC
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,0,0,1
- PRODUCTVERSION 1,0,0,1
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x4L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904b0"
-        BEGIN
-            VALUE "Comments", "\0"
-            VALUE "CompanyName", "\0"
-            VALUE "FileDescription", "Osmo4-GPAC\0"
-            VALUE "FileVersion", GPAC_VERSION"\0"
-            VALUE "InternalName", "Osmo4\0"
-            VALUE "LegalCopyright", "Copyright (C) Telecom ParisTech 2005-2012\0"
-            VALUE "LegalTrademarks", "\0"
-            VALUE "OriginalFilename", "Osmo4.EXE\0"
-            VALUE "PrivateBuild", "\0"
-            VALUE "ProductName", "Osmo4-GPAC\0"
-            VALUE "ProductVersion", GPAC_VERSION"\0"
-            VALUE "SpecialBuild", "\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END
-
-#endif    // !_MAC
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// DESIGNINFO
-//
-
-#ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO DISCARDABLE 
-BEGIN
-    IDD_ABOUTBOX, DIALOG
-    BEGIN
-        RIGHTMARGIN, 138
-        TOPMARGIN, 1
-    END
-
-    IDD_OPENFILE, DIALOG
-    BEGIN
-        LEFTMARGIN, 2
-        TOPMARGIN, 2
-        BOTTOMMARGIN, 113
-    END
-END
-#endif    // APSTUDIO_INVOKED
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Menubar
-//
-
-IDR_MENU MENU DISCARDABLE 
-BEGIN
-    POPUP "File"
-    BEGIN
-        MENUITEM "Open",                        ID_OPEN_FILE
-        MENUITEM "Open URL",                    ID_OPEN_URL
-        MENUITEM SEPARATOR
-        MENUITEM "Exit",                        ID_APP_EXIT
-    END
-    POPUP "View"
-    BEGIN
-        POPUP "Viewpoint"
-        BEGIN
-            MENUITEM "",                            ID_VIEWPORT_EMPTY
-        END
-        POPUP "Navigation"
-        BEGIN
-            MENUITEM "Reset",                       ID_NAV_RESET
-            MENUITEM SEPARATOR
-            MENUITEM "None",                        ID_NAV_NONE
-            MENUITEM "Walk",                        ID_NAV_WALK
-            MENUITEM "Fly",                         ID_NAV_FLY
-            MENUITEM "Examine",                     ID_NAV_EXAMINE
-            MENUITEM "Slide",                       ID_NAV_SLIDE
-            MENUITEM SEPARATOR
-            MENUITEM "Headlight",                   ID_NAV_HEADLIGHT
-            MENUITEM "Gravity",                     ID_NAV_GRAVITY
-            POPUP "Collision"
-            BEGIN
-                MENUITEM "Off",                         ID_COLLIDE_OFF
-                MENUITEM "Regular",                     ID_COLLIDE_REG
-                MENUITEM "Displacement",                ID_COLLIDE_DISP
-            END
-        END
-        MENUITEM SEPARATOR
-        MENUITEM "Fullscreen",                  ID_VIEW_FULLSCREEN
-        POPUP "Aspect Ratio"
-        BEGIN
-            MENUITEM "Keep Original",               ID_VIEW_AR_ORIG
-            MENUITEM "Fill Screen",                 ID_VIEW_AR_FILL
-            MENUITEM "Ratio 4/3",                   ID_VIEW_AR_43
-            MENUITEM "Ratio 16/9",                  ID_VIEW_AR_169
-            MENUITEM SEPARATOR
-            MENUITEM "Fit Screen",                  ID_VIEW_FIT
-        END
-        MENUITEM SEPARATOR
-        MENUITEM "Time Control",                ID_VIEW_TIMING
-        MENUITEM SEPARATOR
-        MENUITEM "Settings",                    IDD_CONFIGURE
-    END
-    POPUP "?"
-    BEGIN
-        MENUITEM "Shortcuts",                   ID_SHORTCUTS
-        MENUITEM "About ...",                   ID_APP_ABOUT
-    END
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Data
-//
-
-IDR_MENU SHMENUBAR DISCARDABLE 
-BEGIN
-    IDR_MENU, 3,
-    I_IMAGENONE, ID_FILE, TBSTATE_ENABLED, 
-    TBSTYLE_DROPDOWN | TBSTYLE_AUTOSIZE, IDS_CAP_FILE, 0, 0,
-    I_IMAGENONE, ID_VIEW, TBSTATE_ENABLED, 
-    TBSTYLE_DROPDOWN | TBSTYLE_AUTOSIZE, IDS_CAP_VIEW, 0, 1,
-    I_IMAGENONE, ID_MENUITEM32789, TBSTATE_ENABLED, 
-    TBSTYLE_DROPDOWN | TBSTYLE_AUTOSIZE, IDS_CAP_MENUITEM32790, 0, 2,
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// String Table
-//
-
-STRINGTABLE DISCARDABLE 
-BEGIN
-    IDS_EDIT                "File"
-    IDS_TOOL                "Tools"
-    IDP_SOCKETS_INIT_FAILED "Windows sockets initialization failed."
-END
-
-STRINGTABLE PRELOAD DISCARDABLE 
-BEGIN
-    IDR_MAINFRAME           "Osmo4\n\nOsmo4\n\n\nOsmo4.Document\nOsmo4 Document"
-END
-
-STRINGTABLE PRELOAD DISCARDABLE 
-BEGIN
-    AFX_IDS_IDLEMESSAGE     "Ready"
-END
-
-STRINGTABLE DISCARDABLE 
-BEGIN
-    ID_FILE_SAVE_AS         "Save the active document with a new name\nSave As"
-END
-
-STRINGTABLE DISCARDABLE 
-BEGIN
-    ID_APP_ABOUT            "Display program information, version number and copyright\nAbout"
-    ID_APP_EXIT             "Quit the application; prompts to save documents\nExit"
-END
-
-STRINGTABLE DISCARDABLE 
-BEGIN
-    ID_NEXT_PANE            "Switch to the next window pane\nNext Pane"
-    ID_PREV_PANE            "Switch back to the previous window pane\nPrevious Pane"
-END
-
-STRINGTABLE DISCARDABLE 
-BEGIN
-    ID_WINDOW_SPLIT         "Split the active window into panes\nSplit"
-END
-
-STRINGTABLE DISCARDABLE 
-BEGIN
-    ID_EDIT_CLEAR           "Erase the selection\nErase"
-    ID_EDIT_CLEAR_ALL       "Erase everything\nErase All"
-    ID_EDIT_COPY            "Copy the selection and put it on the Clipboard\nCopy"
-    ID_EDIT_CUT             "Cut the selection and put it on the Clipboard\nCut"
-    ID_EDIT_FIND            "Find the specified text\nFind"
-    ID_EDIT_PASTE           "Insert Clipboard contents\nPaste"
-    ID_EDIT_REPEAT          "Repeat the last action\nRepeat"
-    ID_EDIT_REPLACE         "Replace specific text with different text\nReplace"
-    ID_EDIT_SELECT_ALL      "Select the entire document\nSelect All"
-    ID_EDIT_UNDO            "Undo the last action\nUndo"
-    ID_EDIT_REDO            "Redo the previously undone action\nRedo"
-END
-
-STRINGTABLE DISCARDABLE 
-BEGIN
-    AFX_IDS_SCCLOSE         "Close the active window and prompts to save the documents"
-END
-
-STRINGTABLE DISCARDABLE 
-BEGIN
-    AFX_IDS_SCTASKLIST      "Activate Task List"
-END
-
-STRINGTABLE DISCARDABLE 
-BEGIN
-    IDS_NEW                 "New"
-    IDS_FILE                "File"
-    IDS_MHELP               "Help"
-    IDS_SAVE                "Save"
-    IDS_CUT                 "Cut"
-    IDS_COPY                "Copy"
-    IDS_PASTE               "Paste"
-    IDS_ABOUT               "About"
-END
-
-STRINGTABLE DISCARDABLE 
-BEGIN
-    ID_INDICATOR_CAPS       "CAP"
-END
-
-STRINGTABLE DISCARDABLE 
-BEGIN
-    IDS_CAP_FILE            "File"
-    ID_FILE_RESTART         "Restart presentation"
-    IDS_CAP_MENUITEM32790   "?"
-END
-
-STRINGTABLE DISCARDABLE 
-BEGIN
-    IDS_CAP_VIEW            "View"
-END
-
-#endif    // English (U.S.) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-/////////////////////////////////////////////////////////////////////////////
-// French (France) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_FRA)
-#ifdef _WIN32
-LANGUAGE LANG_FRENCH, SUBLANG_FRENCH
-#pragma code_page(1252)
-#endif //_WIN32
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog
-//
-
-IDD_CONTROL DIALOG DISCARDABLE  0, 0, 161, 15
-STYLE DS_SETFOREGROUND | WS_CHILD | WS_VISIBLE
-EXSTYLE WS_EX_STATICEDGE
-FONT 8, "System"
-BEGIN
-    CONTROL         "Slider1",IDC_SLIDER,"msctls_trackbar32",TBS_BOTH | 
-                    TBS_NOTICKS | WS_TABSTOP,0,1,101,12
-    LTEXT           "00:00 FPS 30.00",IDC_TIME,102,3,56,10
-END
-
-IDD_OPTIONS DIALOG DISCARDABLE  0, 0, 134, 121
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Osmo4 Options"
-FONT 8, "System"
-BEGIN
-    PUSHBUTTON      "Apply",IDC_SAVEOPT,108,3,24,14
-    COMBOBOX        IDC_COMBOSEL,3,5,99,80,CBS_DROPDOWNLIST | WS_VSCROLL | 
-                    WS_TABSTOP
-    LTEXT           "-------------------------------------------------------",
-                    IDC_STATIC,0,17,133,8
-END
-
-IDD_OPT_GEN DIALOG DISCARDABLE  0, 120, 133, 121
-STYLE DS_MODALFRAME | DS_CONTROL | WS_CHILD
-FONT 8, "System"
-BEGIN
-    CONTROL         "Loop at end",IDC_LOOP,"Button",BS_AUTOCHECKBOX | 
-                    WS_TABSTOP,6,28,54,10
-    PUSHBUTTON      "Make Default MPEG-4 Player",IDC_FILEASSOC,5,90,124,20,
-                    BS_MULTILINE
-    CONTROL         "Stretch display to fill screen",IDC_FILL_SCREEN,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,6,45,104,10
-    CONTROL         "Disable Backlight while playing",IDC_NO_BACKLIGHT,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,61,111,10
-    CONTROL         "Enable logs",IDC_ENABLE_LOGS,"Button",BS_AUTOCHECKBOX | 
-                    WS_TABSTOP,6,74,52,10
-END
-
-IDD_OPT_RENDER DIALOG DISCARDABLE  0, 20, 133, 121
-STYLE DS_MODALFRAME | DS_CONTROL | WS_CHILD
-FONT 8, "System"
-BEGIN
-    LTEXT           "Rendering Frame Rate",IDC_STATIC,27,27,73,8
-    COMBOBOX        IDC_BIFS_RATE,29,39,68,47,CBS_DROPDOWNLIST | WS_VSCROLL | 
-                    WS_TABSTOP
-    CONTROL         "Direct Rendering",IDC_DIRECTRENDER,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,1,64,69,10
-    CONTROL         "Scalable Zoom",IDC_ZOOM_SCALABLE,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,70,64,61,10
-    CONTROL         "Fast Rendering",IDC_FAST_RENDER,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,70,79,60,10
-    CONTROL         "Force Scene Size",IDC_FORCE_SIZE,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,1,79,70,10
-    LTEXT           "Anti-Aliasing",IDC_STATIC,6,103,40,8
-    COMBOBOX        IDC_AA_LIST,56,99,71,47,CBS_DROPDOWNLIST | WS_VSCROLL | 
-                    WS_TABSTOP
-END
-
-IDD_OPT_SYSTEMS DIALOG DISCARDABLE  0, 20, 133, 121
-STYLE DS_MODALFRAME | DS_CONTROL | WS_CHILD
-FONT 8, "System"
-BEGIN
-    LTEXT           "Prefered Language for stream selection",IDC_STATIC,3,46,
-                    64,19
-    COMBOBOX        IDC_LANG,69,48,60,72,CBS_DROPDOWNLIST | WS_VSCROLL | 
-                    WS_TABSTOP
-    LTEXT           "Decoder Threading",IDC_STATIC,4,75,62,8
-    COMBOBOX        IDC_DEC_THREAD,69,72,60,30,CBS_DROPDOWNLIST | WS_VSCROLL | 
-                    WS_TABSTOP
-    CONTROL         "Always draw late BIFS frames",IDC_BIFSDROP,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,4,91,111,10
-    CONTROL         "Force Single Timeline",IDC_FORCE_DURATION,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,4,106,82,10
-END
-
-IDD_OPT_VIDEO DIALOG DISCARDABLE  0, 20, 133, 121
-STYLE DS_MODALFRAME | DS_CONTROL | WS_CHILD
-FONT 8, "System"
-BEGIN
-    LTEXT           "Graphics Driver",IDC_STATIC,5,54,50,8
-    LTEXT           "Anti-Aliasing",IDC_STATIC,6,77,40,8
-    LTEXT           "Video Driver",IDC_STATIC,5,98,40,8
-    COMBOBOX        IDC_GD_LIST,56,53,71,30,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_TABSTOP
-    COMBOBOX        IDC_AA_LIST,56,73,71,47,CBS_DROPDOWNLIST | WS_VSCROLL | 
-                    WS_TABSTOP
-    COMBOBOX        IDC_VIDEO_LIST,56,95,71,30,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_TABSTOP
-END
-
-IDD_OPT_AUDIO DIALOG DISCARDABLE  0, 20, 133, 121
-STYLE DS_MODALFRAME | DS_CONTROL | WS_CHILD
-FONT 8, "System"
-BEGIN
-    CONTROL         "Force Audio Config",IDC_FORCE_AUDIO,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,5,33,77,10
-    LTEXT           "Number of buffers",IDC_STATIC,5,51,60,8
-    LTEXT           "Total Duration in ms",IDC_STATIC,4,69,64,8
-    EDITTEXT        IDC_EDIT_AUDIO,68,48,34,14,ES_AUTOHSCROLL | ES_READONLY
-    CONTROL         "Spin1",IDC_SPIN_AUDIO,"msctls_updown32",UDS_SETBUDDYINT | 
-                    UDS_ARROWKEYS | UDS_HORZ,105,49,19,12
-    EDITTEXT        IDC_AUDIO_DUR,68,67,34,14,ES_AUTOHSCROLL
-    CONTROL         "Spin1",IDC_SPIN_DUR,"msctls_updown32",UDS_SETBUDDYINT | 
-                    UDS_ARROWKEYS | UDS_HORZ,105,68,19,12
-    CONTROL         "Disable Audio Resync",IDC_AUDIO_RESYNC,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,5,85,84,10
-    LTEXT           "Default Plugin",IDC_STATIC,5,103,45,8
-    COMBOBOX        IDC_DRIVER_LIST,52,100,73,30,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_TABSTOP
-END
-
-IDD_OPT_FONT DIALOG DISCARDABLE  0, 20, 133, 119
-STYLE DS_MODALFRAME | DS_CONTROL | WS_CHILD
-FONT 8, "System"
-BEGIN
-    LTEXT           "Font Engine",IDC_STATIC,35,33,39,8
-    COMBOBOX        IDC_FONT_LIST,12,45,98,30,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_TABSTOP
-    LTEXT           "Systems Font Directory",IDC_STATIC,19,87,76,8
-    PUSHBUTTON      "...",IDC_BROWSE_FONT,6,98,115,12
-    CONTROL         "Draw text through texturing",IDC_USE_TEXTURE,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,10,68,107,10
-END
-
-IDD_OPT_HTTP DIALOG DISCARDABLE  0, 20, 133, 121
-STYLE DS_MODALFRAME | DS_CONTROL | WS_CHILD
-FONT 8, "System"
-BEGIN
-    LTEXT           "Cache Directory",IDC_STATIC,35,9,53,8
-    PUSHBUTTON      "...",IDC_BROWSE_CACHE,7,22,113,14
-    CONTROL         "Remove temp files",IDC_CLEAN_CACHE,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,7,43,75,10
-    CONTROL         "Always redownload incomplete cached files",
-                    IDC_RESTART_CACHE,"Button",BS_AUTOCHECKBOX | 
-                    BS_MULTILINE | WS_TABSTOP,7,54,102,22
-    CONTROL         "XML Progressive Load",IDC_SAX_PROGRESSIVE,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,8,77,85,10
-    EDITTEXT        IDC_SAX_DURATION,27,89,35,14,ES_CENTER | ES_AUTOHSCROLL | 
-                    ES_NUMBER
-END
-
-IDD_OPT_STREAM DIALOG DISCARDABLE  0, 20, 133, 121
-STYLE DS_MODALFRAME | DS_CONTROL | WS_CHILD
-FONT 8, "System"
-BEGIN
-    LTEXT           "Default RTSP Port",IDC_STATIC,33,33,58,8
-    COMBOBOX        IDC_PORT,15,42,95,30,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_TABSTOP
-    CONTROL         "RTP over RTSP",IDC_RTSP,"Button",BS_AUTOCHECKBOX | 
-                    WS_TABSTOP,1,58,64,10
-    CONTROL         "RTP Reordering",IDC_REORDER,"Button",BS_AUTOCHECKBOX | 
-                    WS_TABSTOP,66,58,66,10
-    EDITTEXT        IDC_TIMEOUT,1,72,35,14,ES_CENTER | ES_AUTOHSCROLL | 
-                    ES_NUMBER
-    LTEXT           "ms before control timeout",IDC_STATIC,44,75,83,8
-    EDITTEXT        IDC_BUFFER,1,87,35,14,ES_CENTER | ES_AUTOHSCROLL | 
-                    ES_NUMBER
-    LTEXT           "ms of Media Buffering ",IDC_STATIC,44,90,72,8
-    CONTROL         "Rebuffer if less than",IDC_REBUFFER,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,2,106,78,10
-    EDITTEXT        IDC_REBUFFER_LEN,81,105,35,12,ES_CENTER | ES_AUTOHSCROLL | 
-                    ES_NUMBER
-    LTEXT           "ms",IDC_STATIC,121,108,10,8
-END
-
-IDD_OPT_DECODER DIALOG DISCARDABLE  0, 20, 133, 121
-STYLE DS_MODALFRAME | DS_CONTROL | WS_CHILD
-FONT 8, "System"
-BEGIN
-    LTEXT           "Prefered Audio Output",-1,33,9,70,8
-    LTEXT           "Prefered Video Output",-1,33,44,80,8
-    COMBOBOX        IDC_AUDEC_LIST,11,22,109,54,CBS_DROPDOWNLIST | 
-                    WS_VSCROLL | WS_TABSTOP
-    COMBOBOX        IDC_VIDEC_LIST,12,57,109,47,CBS_DROPDOWNLIST | 
-                    WS_VSCROLL | WS_TABSTOP
-END
-
-IDD_OPT_RENDER3D DIALOG DISCARDABLE  0, 0, 133, 121
-STYLE DS_MODALFRAME | WS_CHILD
-FONT 8, "System"
-BEGIN
-    CONTROL         "Use 3D Renderer",IDC_USE_3D_REN,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,3,29,121,10
-    CONTROL         "Disable Backface Culling",IDC_NO_BACKCULL,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,3,41,92,10
-    CONTROL         "Emulate pow2 textures for video",IDC_EMULATE_POW2,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,1,97,121,10
-    LTEXT           "Drawing Mode",IDC_STATIC,5,56,46,8
-    COMBOBOX        IDC_WIRE_MODE,61,54,61,35,CBS_DROPDOWN | WS_VSCROLL | 
-                    WS_TABSTOP
-    LTEXT           "Draw Normals",IDC_STATIC,5,73,45,8
-    COMBOBOX        IDC_DRAW_NORMALS,62,72,61,35,CBS_DROPDOWN | WS_VSCROLL | 
-                    WS_TABSTOP
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// DESIGNINFO
-//
-
-#ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO DISCARDABLE 
-BEGIN
-    IDD_CONTROL, DIALOG
-    BEGIN
-        RIGHTMARGIN, 160
-        BOTTOMMARGIN, 14
-    END
-
-    IDD_OPTIONS, DIALOG
-    BEGIN
-        RIGHTMARGIN, 133
-        BOTTOMMARGIN, 120
-    END
-
-    IDD_OPT_GEN, DIALOG
-    BEGIN
-        RIGHTMARGIN, 132
-        BOTTOMMARGIN, 120
-    END
-
-    IDD_OPT_RENDER, DIALOG
-    BEGIN
-        RIGHTMARGIN, 132
-        BOTTOMMARGIN, 120
-    END
-
-    IDD_OPT_SYSTEMS, DIALOG
-    BEGIN
-        RIGHTMARGIN, 132
-        BOTTOMMARGIN, 120
-    END
-
-    IDD_OPT_VIDEO, DIALOG
-    BEGIN
-        RIGHTMARGIN, 132
-        BOTTOMMARGIN, 120
-    END
-
-    IDD_OPT_AUDIO, DIALOG
-    BEGIN
-        RIGHTMARGIN, 132
-        BOTTOMMARGIN, 120
-    END
-
-    IDD_OPT_FONT, DIALOG
-    BEGIN
-        RIGHTMARGIN, 132
-        BOTTOMMARGIN, 118
-    END
-
-    IDD_OPT_HTTP, DIALOG
-    BEGIN
-        RIGHTMARGIN, 132
-        BOTTOMMARGIN, 120
-    END
-
-    IDD_OPT_STREAM, DIALOG
-    BEGIN
-        RIGHTMARGIN, 132
-        BOTTOMMARGIN, 120
-    END
-
-    IDD_OPT_DECODER, DIALOG
-    BEGIN
-        RIGHTMARGIN, 132
-        BOTTOMMARGIN, 120
-    END
-END
-#endif    // APSTUDIO_INVOKED
-
-
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE DISCARDABLE 
-BEGIN
-    "resource.h\0"
-END
-
-2 TEXTINCLUDE DISCARDABLE 
-BEGIN
-    "#include ""afxres.h""\r\n"
-    "#include ""newres.h""\r\n"
-    "\0"
-END
-
-3 TEXTINCLUDE DISCARDABLE 
-BEGIN
-    "#define _AFX_NO_SPLITTER_RESOURCES\r\n"
-    "#define _AFX_NO_OLE_RESOURCES\r\n"
-    "#define _AFX_NO_TRACKER_RESOURCES\r\n"
-    "#define _AFX_NO_PROPERTY_RESOURCES\r\n"
-    "\r\n"
-    "#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)\r\n"
-    "#ifdef _WIN32\r\n"
-    "LANGUAGE 9, 1\r\n"
-    "#pragma code_page(1252)\r\n"
-    "#endif //_WIN32\r\n"
-    "#include ""res\\Osmo4.rc2""  // non-Microsoft eMbedded Visual C++ edited resources\r\n"
-    "#include ""afxres.rc""         // Standard components\r\n"
-    "#include ""wceres.rc""         // WCE-specific components\r\n"
-    "#endif\r\n"
-    "\0"
-END
-
-#endif    // APSTUDIO_INVOKED
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog Info
-//
-
-IDD_OPT_RENDER DLGINIT
-BEGIN
-    IDC_BIFS_RATE, 0x403, 8, 0
-0x0035, 0x002e, 0x0030, 0x0000, 
-    IDC_BIFS_RATE, 0x403, 8, 0
-0x0037, 0x002e, 0x0035, 0x0000, 
-    IDC_BIFS_RATE, 0x403, 10, 0
-0x0031, 0x0030, 0x002e, 0x0030, 0x0000, 
-    IDC_BIFS_RATE, 0x403, 10, 0
-0x0031, 0x0032, 0x002e, 0x0035, 0x0000, 
-    IDC_BIFS_RATE, 0x403, 10, 0
-0x0031, 0x0035, 0x002e, 0x0030, 0x0000, 
-    IDC_BIFS_RATE, 0x403, 10, 0
-0x0032, 0x0034, 0x002e, 0x0030, 0x0000, 
-    IDC_BIFS_RATE, 0x403, 10, 0
-0x0032, 0x0035, 0x002e, 0x0030, 0x0000, 
-    IDC_BIFS_RATE, 0x403, 10, 0
-0x0033, 0x0030, 0x002e, 0x0030, 0x0000, 
-    0
-END
-
-IDD_OPT_SYSTEMS DLGINIT
-BEGIN
-    IDC_DEC_THREAD, 0x403, 28, 0
-0x0053, 0x0069, 0x006e, 0x0067, 0x006c, 0x0065, 0x0020, 0x0054, 0x0068, 
-0x0072, 0x0065, 0x0061, 0x0064, 0x0000, 
-    IDC_DEC_THREAD, 0x403, 26, 0
-0x004d, 0x0075, 0x0074, 0x006c, 0x0069, 0x0020, 0x0054, 0x0068, 0x0072, 
-0x0065, 0x0061, 0x0064, 0x0000, 
-    IDC_DEC_THREAD, 0x403, 10, 0
-0x0046, 0x0072, 0x0065, 0x0065, 0x0000, 
-    0
-END
-
-#endif    // French (France) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-
-#ifndef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 3 resource.
-//
-#define _AFX_NO_SPLITTER_RESOURCES
-#define _AFX_NO_OLE_RESOURCES
-#define _AFX_NO_TRACKER_RESOURCES
-#define _AFX_NO_PROPERTY_RESOURCES
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-#ifdef _WIN32
-LANGUAGE 9, 1
-#pragma code_page(1252)
-#endif //_WIN32
-#include "res\Osmo4.rc2"  // non-Microsoft eMbedded Visual C++ edited resources
-#include "afxres.rc"         // Standard components
-//#include "wceres.rc"         // WCE-specific components
-#endif
-
-/////////////////////////////////////////////////////////////////////////////
-#endif    // not APSTUDIO_INVOKED

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/osmo4_wce/ProgressBar.cpp Deleted

@@ -1,133 +0,0 @@
-// ProgressBar.cpp : implementation file
-//
-
-#include "stdafx.h"
-#include "Osmo4.h"
-#include "ProgressBar.h"
-
-#ifdef _DEBUG
-#define new DEBUG_NEW
-#undef THIS_FILE
-static char THIS_FILE = __FILE__;
-#endif
-
-/////////////////////////////////////////////////////////////////////////////
-// ProgressBar dialog
-
-
-ProgressBar::ProgressBar(CWnd* pParent /*=NULL*/)
-	: CDialog(ProgressBar::IDD, pParent)
-{
-	//{{AFX_DATA_INIT(ProgressBar)
-	//}}AFX_DATA_INIT
-
-	m_grabbed = 0;
-	m_range_invalidated = 0;
-}
-
-
-void ProgressBar::DoDataExchange(CDataExchange* pDX)
-{
-	CDialog::DoDataExchange(pDX);
-	//{{AFX_DATA_MAP(ProgressBar)
-	DDX_Control(pDX, IDC_TIME, m_Time);
-	DDX_Control(pDX, IDC_SLIDER, m_Slider);
-	//}}AFX_DATA_MAP
-}
-
-
-BEGIN_MESSAGE_MAP(ProgressBar, CDialog)
-	//{{AFX_MSG_MAP(ProgressBar)
-	ON_WM_SIZE()
-	ON_WM_HSCROLL()
-	//}}AFX_MSG_MAP
-END_MESSAGE_MAP()
-
-/////////////////////////////////////////////////////////////////////////////
-// ProgressBar message handlers
-#define TEXT_RIGHT_PAD	2
-void ProgressBar::OnSize(UINT nType, int cx, int cy)
-{
-	u32 tw;
-	CDialog::OnSize(nType, cx, cy);
-
-	if (!m_Slider.m_hWnd) return;
-
-	RECT rc;
-	m_Time.GetClientRect(&rc);
-	tw = rc.right-rc.left;
-	rc.left = cx - tw - TEXT_RIGHT_PAD;
-	rc.right = cx - TEXT_RIGHT_PAD;
-	m_Time.MoveWindow(&rc);
-	m_Slider.GetClientRect(&rc);
-	rc.left = 0;
-	rc.right = cx - tw - TEXT_RIGHT_PAD;
-	m_Slider.MoveWindow(&rc);
-}
-
-void ProgressBar::OnHScroll(UINT nSBCode, UINT nPos, CScrollBar* pScrollBar)
-{
-	COsmo4 *app = GetApp();
-
-	if (pScrollBar->GetDlgCtrlID() == IDC_SLIDER) {
-		if (!app->m_can_seek) return;
-		switch (nSBCode) {
-		case TB_LINEUP:
-		case TB_LINEDOWN:
-		case TB_PAGEUP:
-		case TB_PAGEDOWN:
-		case TB_THUMBPOSITION:
-		case TB_THUMBTRACK:
-		case TB_TOP:
-		case TB_BOTTOM:
-			m_grabbed = 1;
-			break;
-		case TB_ENDTRACK:
-			if (!app->m_open) {
-				SetPosition(0);
-			} else {
-				u32 seek_to = m_Slider.GetPos();
-				gf_term_play_from_time(app->m_term, seek_to, 0);
-			}
-			m_grabbed = 0;
-			return;
-		}
-	}
-	CDialog::OnHScroll(nSBCode, nPos, pScrollBar);
-}
-
-void ProgressBar::SetPosition(u32 now)
-{
-	TCHAR swText20;
-	u32 nb_s, nb_m;
-	COsmo4 *app = GetApp();
-
-	if (m_range_invalidated) {
-		if (app->m_can_seek) {
-			m_Slider.SetRangeMin(0);
-			m_Slider.SetRangeMax(app->m_duration);
-			m_Slider.ShowWindow(SW_SHOWNORMAL);
-			m_Slider.EnableWindow(TRUE);
-		} else {
-			m_Slider.ShowWindow(SW_SHOWNORMAL);
-			m_Slider.EnableWindow(FALSE);
-
-		}
-		m_range_invalidated = 0;
-	}
-	if (now==m_prev_time) return;
-
-	if (now<m_prev_time) m_prev_time = 0;
-
-	if (!m_prev_time || (m_prev_time + 500 <= now)) {
-		m_FPS = gf_term_get_framerate(app->m_term, 0);
-		m_prev_time = now;
-	}
-	nb_s = now/1000;
-	nb_m = nb_s/60;
-	nb_s -= nb_m*60;
-	wsprintf(swText, _T("%02d:%02d FPS %02.2f"), nb_m, nb_s, m_FPS);
-	m_Time.SetWindowText(swText);
-
-	if (!m_grabbed) m_Slider.SetPos(now);
-}

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/osmo4_wce/ProgressBar.h Deleted

@@ -1,53 +0,0 @@
-#if !defined(AFX_PROGRESSBAR_H__85FCAC2B_9C83_4C83_8E66_D712FC88B221__INCLUDED_)
-#define AFX_PROGRESSBAR_H__85FCAC2B_9C83_4C83_8E66_D712FC88B221__INCLUDED_
-
-#if _MSC_VER > 1000
-#pragma once
-#endif // _MSC_VER > 1000
-// ProgressBar.h : header file
-//
-
-/////////////////////////////////////////////////////////////////////////////
-// ProgressBar dialog
-
-class ProgressBar : public CDialog
-{
-// Construction
-public:
-	ProgressBar(CWnd* pParent = NULL);   // standard constructor
-
-	Bool m_grabbed, m_range_invalidated;
-	Double m_FPS;
-	u32 m_prev_time;
-	void SetPosition(u32 time_ms);
-
-// Dialog Data
-	//{{AFX_DATA(ProgressBar)
-	enum { IDD = IDD_CONTROL };
-	CStatic	m_Time;
-	CSliderCtrl	m_Slider;
-	//}}AFX_DATA
-
-
-// Overrides
-	// ClassWizard generated virtual function overrides
-	//{{AFX_VIRTUAL(ProgressBar)
-protected:
-	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
-	//}}AFX_VIRTUAL
-
-// Implementation
-protected:
-
-	// Generated message map functions
-	//{{AFX_MSG(ProgressBar)
-	afx_msg void OnSize(UINT nType, int cx, int cy);
-	afx_msg void OnHScroll(UINT nSBCode, UINT nPos, CScrollBar* pScrollBar);
-	//}}AFX_MSG
-	DECLARE_MESSAGE_MAP()
-};
-
-//{{AFX_INSERT_LOCATION}}
-// Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_PROGRESSBAR_H__85FCAC2B_9C83_4C83_8E66_D712FC88B221__INCLUDED_)

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/osmo4_wce/Resource.h Deleted

@@ -1,170 +0,0 @@
-//{{NO_DEPENDENCIES}}
-// Microsoft eMbedded Visual C++ generated include file.
-// Used by Osmo4.rc
-//
-#define IDD_ABOUTBOX                    100
-#define IDM_MENU                        101
-#define IDS_EDIT                        102
-#define IDS_TOOL                        103
-#define IDP_SOCKETS_INIT_FAILED         104
-#define IDR_MAIN_EDIT                   105
-#define IDR_MAIN_TOOL                   106
-#define IDI_PAUSE                       120
-#define IDD_OPT_HTTP                    121
-#define IDR_MAINFRAME                   128
-#define IDD_OPT_AUDIO                   129
-#define IDD_OPENFILE                    130
-#define IDD_CONTROL                     131
-#define IDD_OPTIONS                     132
-#define IDD_OPT_GEN                     133
-#define IDD_OPT_RENDER                  134
-#define IDD_OPT_SYSTEMS                 135
-#define IDD_OPT_VIDEO                   136
-#define IDI_PLAY                        137
-#define IDD_OPT_FONT                    138
-#define IDI_STOP                        139
-#define IDD_OPT_STREAM                  140
-#define IDR_MENU                        141
-#define IDD_OPT_RENDER3D                142
-#define IDD_OPT_DECODER                 143
-#define IDC_FILELIST                    1000
-#define IDC_BROWSE                      1001
-#define IDC_SEEK                        1002
-#define IDC_PLAY                        1003
-#define IDC_STOP                        1004
-#define IDC_OPT_SET_NAME                1005
-#define IDC_SAVEOPT                     1006
-#define IDC_LOOP                        1007
-#define IDC_AUTOSTART                   1008
-#define IDC_NO_CONSOLE                  1009
-#define IDC_FILEASSOC                   1010
-#define IDC_BIFS_RATE                   1011
-#define IDC_DIRECTRENDER                1012
-#define IDC_ZOOM_SCALABLE               1013
-#define IDC_FAST_RENDER                 1014
-#define IDC_FORCE_SIZE                  1015
-#define IDC_COLOR                       1016
-#define IDC_LANG                        1017
-#define IDC_DEC_THREAD                  1018
-#define IDC_BIFSDROP                    1019
-#define IDC_FORCE_DURATION              1020
-#define IDC_SLIDER                      1021
-#define IDC_GD_LIST                     1022
-#define IDC_AA_LIST                     1023
-#define IDC_VIDEO_LIST                  1024
-#define IDC_FORCE_AUDIO                 1025
-#define IDC_EDIT_AUDIO                  1026
-#define IDC_SPIN_AUDIO                  1027
-#define IDC_AUDIO_FPS                   1028
-#define IDC_SPIN_DUR                    1029
-#define IDC_AUDIO_RESYNC                1030
-#define IDC_DRIVER_LIST                 1031
-#define IDC_FONT_LIST                   1032
-#define IDC_BROWSE_FONT                 1033
-#define IDC_BROWSE_CACHE                1034
-#define IDC_CLEAN_CACHE                 1035
-#define IDC_RESTART_CACHE               1036
-#define IDC_PORT                        1037
-#define IDC_RTSP                        1038
-#define IDC_REORDER                     1039
-#define IDC_TIMEOUT                     1040
-#define IDC_BUFFER                      1041
-#define IDC_REBUFFER                    1042
-#define IDC_REBUFFER_LEN                1043
-#define IDC_VERSION                     1044
-#define IDC_AUDEC_LIST                  1046
-#define IDC_VIDEC_LIST                  1047
-#define IDC_COMBOSEL                    1048
-#define IDC_TIME                        1049
-#define IDC_ABT_TEXT                    1050
-#define IDC_CTRL_PLAY                   1051
-#define IDC_USE_TEXTURE                 1052
-#define IDC_USE_3D_REN                  1053
-#define IDC_NO_BACKCULL                 1054
-#define IDC_CTRL_STOP                   1055
-#define IDC_EMULATE_POW2                1056
-#define IDC_WIRE_MODE                   1057
-#define IDC_SAX_DURATION                1058
-#define IDC_DRAW_NORMALS                1059
-#define IDC_SPIN_OPT                    1060
-#define IDC_AUDIO_DUR                   1061
-#define IDC_SPIN_FPS                    1062
-#define IDC_FILL_SCREEN                 1063
-#define IDC_VIEW_FPS                    1064
-#define IDC_NO_BACKLIGHT                1065
-#define IDC_SAX_PROGRESSIVE             1066
-#define IDC_ENABLE_LOGS                 1067
-#define IDS_CAP_FILE                    32772
-#define ID_FILE_RESTART                 32773
-#define ID_FPS_DISP                     32774
-#define IDD_CONFIGURE                   32775
-#define ID_VIEW_CONTROL                 32776
-#define ID_FILE_PAUSE                   32777
-#define ID_FILE_STEP                    32778
-#define ID_FILE_STOP                    32779
-#define ID_VIEW_FULLSCREEN              32780
-#define ID_FILE                         32781
-#define ID_MENUITEM32789                32782
-#define IDS_CAP_MENUITEM32790           32783
-#define ID_VIEW                         32784
-#define IDS_CAP_VIEW                    32785
-#define ID_OPEN_FILE                    32786
-#define ID_OPEN_URL                     32787
-#define ID_SHORTCUTS                    32788
-#define ID_VIEW_FIT                     32789
-#define ID_NAV_NONE                     32806
-#define ID_NAV_SLIDE                    32807
-#define ID_NAV_RESET                    32808
-#define ID_NAV_WALK                     32810
-#define ID_NAV_FLY                      32811
-#define ID_NAV_EXAMINE                  32812
-#define ID_NAV_GRAVITY                  32813
-#define ID_COLLIDE_OFF                  32815
-#define ID_COLLIDE_REG                  32816
-#define ID_COLLIDE_DISP                 32817
-#define ID_VIEWPORT_EMPTY               32818
-#define ID_NAV_HEADLIGHT                32819
-#define ID_VP_0                         32820
-#define ID_VP_1                         32821
-#define ID_VP_2                         32822
-#define ID_VP_3                         32823
-#define ID_VP_4                         32824
-#define ID_VP_5                         32825
-#define ID_VP_6                         32826
-#define ID_VP_7                         32827
-#define ID_VP_8                         32828
-#define ID_VP_9                         32829
-#define ID_VP_10                        32830
-#define ID_VP_11                        32831
-#define ID_VP_12                        32832
-#define ID_VP_13                        32833
-#define ID_VP_14                        32834
-#define ID_VP_15                        32835
-#define ID_VP_16                        32836
-#define ID_VP_17                        32837
-#define ID_VP_18                        32838
-#define ID_VP_19                        32839
-#define ID_VIEW_AR_ORIG                 32890
-#define ID_VIEW_AR_FILL                 32891
-#define ID_VIEW_AR_43                   32892
-#define ID_VIEW_AR_169                  32893
-#define ID_VIEW_TIMING                  32894
-#define IDS_NEW                         65000
-#define IDS_FILE                        65001
-#define IDS_MHELP                       65002
-#define IDS_SAVE                        65003
-#define IDS_CUT                         65004
-#define IDS_COPY                        65005
-#define IDS_PASTE                       65006
-#define IDS_ABOUT                       65007
-
-// Next default values for new objects
-//
-#ifdef APSTUDIO_INVOKED
-#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE        143
-#define _APS_NEXT_COMMAND_VALUE         32820
-#define _APS_NEXT_CONTROL_VALUE         1059
-#define _APS_NEXT_SYMED_VALUE           101
-#endif
-#endif

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/osmo4_wce/StdAfx.cpp Deleted

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/osmo4_wce/StdAfx.h Deleted

@@ -1,39 +0,0 @@
-// stdafx.h : include file for standard system include files,
-//  or project specific include files that are used frequently, but
-//      are changed infrequently
-//
-
-#if !defined(AFX_STDAFX_H__C81DFFE9_41A3_474E_A044_3A730DB4FFD6__INCLUDED_)
-#define AFX_STDAFX_H__C81DFFE9_41A3_474E_A044_3A730DB4FFD6__INCLUDED_
-
-#if _MSC_VER >= 1000
-#pragma once
-#endif // _MSC_VER >= 1000
-
-#if (_WIN32_WCE <= 200)
-#error This project does not support MFCCE 2.00 or earlier, because it requires CControlBar, available only in MFCCE 2.01 or later
-#endif
-
-#if (_WIN32_WCE <= 211)
-#error This project can not be built for H/PC Pro 2.11 or earlier platforms.
-#endif
-
-#define VC_EXTRALEAN		// Exclude rarely-used stuff from Windows headers
-
-#include <afxwin.h>         // MFC core and standard components
-#include <afxext.h>         // MFC extensions
-
-#if defined(_AFXDLL)
-#include <afxdtctl.h>		// MFC support for Internet Explorer 4 Common Controls
-#endif
-
-#ifndef _AFX_NO_AFXCMN_SUPPORT
-#include <afxcmn.h>			// MFC support for Windows Common Controls
-#endif // _AFX_NO_AFXCMN_SUPPORT
-
-#include <afxsock.h>		// MFC socket extensions
-
-//{{AFX_INSERT_LOCATION}}
-// Microsoft eMbedded Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_STDAFX_H__C81DFFE9_41A3_474E_A044_3A730DB4FFD6__INCLUDED_)

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/osmo4_wce/newres.h Deleted

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/osmo4_wce/res Deleted

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/osmo4_wce/res/Cmdbar.bmp Deleted

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/osmo4_wce/res/Osmo4.ico Deleted

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/osmo4_wce/res/Osmo4.rc2 Deleted

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/osmo4_wce/smartphone 2003 (armv4) Deleted

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/osmo4_wce/smartphone 2003 (armv4)/release Deleted

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/osmo4_wce/smartphone 2003 (armv4)/release/install Deleted

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/osmo4_wce/smartphone 2003 (armv4)/release/install/archive.bat Deleted

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/osmo4_wce/smartphone 2003 (armv4)/release/install/build_installer.bat Deleted

@@ -1,42 +0,0 @@
-set OLDDIR=%CD%
-cd /d %~dp0
-
-for /f "delims=" %%a in ('git describe --tags --long') do @set VERSION=%%a
-for /f "delims=" %%a in ('git describe --tags --abbrev=0') do @set TAG=%%a-
-for /f "delims=" %%a in ('git rev-parse --abbrev-ref HEAD') do @set BRANCH=%%a
-REM remove anotated tag from VERSION
-setlocal enabledelayedexpansion
-call set VERSION=%%VERSION:!TAG!=%%
-setlocal disabledelayedexpansion
-set revision="%VERSION%-%BRANCH%"
-
-set gpac_version="0.8.0-r%gpac_revision%
-
-ECHO Version > gpaccab.inf
-ECHO Provider = "GPAC %gpac_version%" >> gpaccab.inf
-type gpac.inf >> gpaccab.inf
-
-CabWiz gpaccab.inf
-
-ECHO off
-
-ECHO CEAppManager> gpac.ini
-ECHO Version = %gpac_version%>> gpac.ini
-ECHO Component = GPAC for Windows Mobile>> gpac.ini
-ECHO GPAC for Windows Mobile>> gpac.ini
-ECHO Description = GPAC MPEG-4 Player>> gpac.ini
-ECHO Uninstall = GPAC Osmophone>> gpac.ini
-ECHO IconFile = ..\..\..\..\doc\osmo4.ico>> gpac.ini
-ECHO IconIndex = 0 >> gpac.ini
-ECHO CabFiles = gpaccab.cab >> gpac.ini
-
-ECHO on
-
-ezsetup -l english -i gpac.ini -r readme.txt -e ../../../../COPYING -o gpac.exe
-rename gpac.exe "GPAC_%gpac_version%_WindowsMobile.exe"
-DEL gpaccab.cab
-DEL gpaccab.inf
-DEL gpac.ini
-DEL *.tmp
-
-cd /d %OLDDIR%

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/osmo4_wce/smartphone 2003 (armv4)/release/install/gpac.inf Deleted

@@ -1,148 +0,0 @@
-;Version
-Signature = "$Windows NT$"
-CESignature = "$Windows CE$"
-
-CEStrings
-;Osmo4 for PocketPC install, Osmophone for Smartphone install
-AppName = Osmophone
-InstallDir = \Program Files\GPAC
-
-Strings
-;Osmo4.exe for PocketPC install, Osmophone.exe for Smartphone install
-ExeName = Osmophone.exe
-
-DefaultInstall
-CopyFiles = BinFiles , Exefiles
-AddReg = GPACReg
-CEShortcuts = Shortcut , ProgLink
-CESelfRegister=GPAX.dll
-
-
-SourceDisksNames
-
-1 =, "Common Files",, ..
-2 =, "Extra Files",, .
-3 =, "Doc Files",, ..\..\..\..\doc\
-
-SourceDisksFiles
-libgpac.dll = 1
-%ExeName% = 1
-;Osmo4.exe = 1
-GPAX.dll = 1
-gpac.mp4 = 3
-
-msvcr80.dll = 1
-
-;comment this one if not using OpenGL
-libGLES_CM.dll = 1
-
-;comment this one if not using SpiderMonkey
-js32.dll = 1
-
-;uncomment if your device doesn't have GX installed (I think most do)
-;gx.dll = 2
-
-;all gpac modules - comment the ones you haven't compiled
-gm_aac_in.dll = 1
-gm_bifs_dec.dll = 1
-gm_ctx_load.dll = 1
-gm_dummy_in.dll = 1 
-gm_ft_font.dll = 1
-gm_gapi.dll = 1
-gm_gpac_js.dll = 1
-gm_img_in.dll = 1
-gm_ismacryp.dll = 1
-gm_isom_in.dll = 1
-gm_laser_dec.dll = 1
-gm_mp3_in.dll = 1
-gm_mpegts_in.dll = 1
-gm_odf_dec.dll = 1
-gm_platinum.dll = 1
-gm_rtp_in.dll = 1
-gm_timedtext.dll = 1
-gm_soft_raster.dll = 1
-gm_svg_in.dll = 1
-gm_wav_out.dll = 1
-gm_widgetman.dll = 1
-gm_xvid_dec.dll = 1
-gm_ogg.dll = 1
-;commenting out ffmpeg since we no longer have a recent version (and no one uses smartphone 2003 anymore ...)
-;gm_ffmpeg_in.dll = 1
-;avcodec-52.dll = 1
-;avformat-52.dll = 1
-;avutil-50.dll = 1
-;swscale-0.dll = 1
-
-;==================================================
-
-
-
-; Ouput directories for files & shortcuts
-
-DestinationDirs
-BinFiles = 0, %CE2% 
-Exefiles = 0, %InstallDir%
-Shortcut = 0, %CE17%
-ProgLink = 0, %CE11%
-DefaultDestDir = 0, %InstallDir%
-
-BinFiles
-;"gx.dll"
-"libgpac.dll"
-"GPAX.dll"
-"js32.dll"
-"libGLES_CM.dll"
-"msvcr80.dll"
-
-Exefiles
-"%ExeName%"
-"gpac.mp4"
-"gm_aac_in.dll"
-"gm_bifs_dec.dll"
-"gm_ctx_load.dll"
-"gm_dummy_in.dll"
-"gm_ffmpeg_in.dll"
-"avcodec-52.dll"
-"avformat-52.dll"
-"avutil-50.dll"
-"swscale-0.dll"
-"gm_ft_font.dll"
-"gm_gapi.dll"
-"gm_gpac_js.dll"
-"gm_img_in.dll"
-"gm_ismacryp.dll"
-"gm_isom_in.dll"
-"gm_laser_dec.dll"
-"gm_mp3_in.dll"
-"gm_mpegts_in.dll"
-"gm_odf_dec.dll"
-"gm_platinum.dll"
-"gm_rtp_in.dll"
-"gm_timedtext.dll"
-"gm_soft_raster.dll"
-"gm_svg_in.dll"
-"gm_wav_out.dll"
-"gm_widgetman.dll"
-"gm_xvid_dec.dll"
-"gm_ogg.dll"
-
-GPACReg
-;GPAC cfg file location
-HKCR,GPAC,InstallDir,0x00000000,%InstallDir%
-
-;GPAC cfg file association
-HKCR,.cfg,,0x00000000,txtfile
-
-;MP4 file association
-HKCR,.mp4,,0x00000000,mp4file
-HKCR,mp4file\Shell\Open\Command,,0x00000000,"""%InstallDir%\%ExeName%""" """%%L"""
-
-;Icon number is bin ID of ressource in app
-HKCR,mp4file\DefaultIcon,,0x00000000,"%InstallDir%\%ExeName%,-128"
-
-Shortcut
-"%AppName%", 0, "%ExeName%"
-
-ProgLink
-"%AppName%", 0, "%ExeName%"
-

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/osmo4_wce/smartphone 2003 (armv4)/release/install/readme.txt Deleted

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/osmo4_wx Deleted

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/osmo4_wx/Darwin.Info.plist Deleted

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/osmo4_wx/Darwin.InfoPlist.strings Deleted

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/osmo4_wx/Darwin.Osmo.icns Deleted

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/osmo4_wx/Makefile Deleted

@@ -1,85 +0,0 @@
-include ../../config.mak
-
-vpath %.cpp $(SRC_PATH)/applications/osmo4_wx
-
-CFLAGS= $(CXXFLAGS) -I"$(SRC_PATH)/include"
-
-ifeq ($(DEBUGBUILD),yes)
-CFLAGS+=-g
-LDFLAGS+=-g
-endif
-
-ifeq ($(GPROFBUILD),yes)
-CFLAGS+=-pg
-LDFLAGS+=-pg
-endif
-
-ifeq ($(GPACREADONLY),yes)
-CFLAGS+=-DGPAC_READ_ONLY
-endif
-
-#common obj
-OBJS= wxOsmo4.o wxGPACControl.o fileprops.o Playlist.o menubtn.o
-
-ifeq ($(CONFIG_WIN32),yes)
-EXE=.exe
-PROG=Osmo4$(EXE)
-else
-EXT=
-PROG=Osmo4
-endif
-
-#3 - spidermonkey support
-ifeq ($(CONFIG_JS),no)
-else
-SCENEGRAPH_CFLAGS+=$(JS_FLAGS)
-ifeq ($(CONFIG_JS),local)
-NEED_LOCAL_LIB=yes
-endif
-LINKFLAGS+=$(JS_LIBS)
-endif
-
-CFLAGS+=$(WX_CFLAGS)
-
-SRCS := $(OBJS:.o=.cpp) 
-
-all: $(PROG)
-
-Osmo4$(EXE): $(OBJS)
-	$(CC) -o ../../bin/gcc/$@ $(OBJS) -L../../bin/gcc -lgpac $(WX_LFLAGS) $(LINKFLAGS) $(LDFLAGS)
-
-clean: 
-	rm -f $(OBJS) ../../bin/gcc/$(PROG)
-
-install: 
-ifeq ($(CONFIG_DARWIN),yes)
-	mkdir -p $(DESTDIR)$(mac_apps)/Osmo4.app/Contents/MacOS
-	mkdir -p $(DESTDIR)$(mac_apps)/Osmo4.app/Contents/Resources/English.lproj
-	cp ./Darwin.Info.plist \
-	   $(DESTDIR)$(mac_apps)/Osmo4.app/Contents/Info.plist
-	cp ./Darwin.InfoPlist.strings \
-	   $(DESTDIR)$(mac_apps)/Osmo4.app/Contents/Resources/English.lproj/InfoPlist.strings
-	cp ./Darwin.Osmo.icns \
-	   $(DESTDIR)$(mac_apps)/Osmo4.app/Contents/Resources/Osmo.icns
-	install -m 755 $(INSTFLAGS) ../../bin/gcc/Osmo4 \
-	      $(DESTDIR)$(mac_apps)/Osmo4.app/Contents/MacOS
-	echo -n 'APPLOsm4' > $(DESTDIR)$(mac_apps)/Osmo4.app/Contents/PkgInfo
-else
-	rm -f wxOsmo4.o
-	mkdir -p $(DESTDIR)$(prefix)/bin
-	install -m 755 $(INSTFLAGS) ../../bin/gcc/Osmo4 "$(DESTDIR)$(prefix)/bin"
-endif
-
-uninstall:
-	rm -rf $(DESTDIR)$(prefix)/bin/Osmo4
-
-dep:
-
-depend:
-	rm -f .depend	
-	$(CC) -MM $(CFLAGS) $(SRCS) 1>.depend
-
-distclean: clean
-	rm -f Makefile.bak .depend
-
--include .depend

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/osmo4_wx/Playlist.cpp Deleted

@@ -1,836 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2012
- *					All rights reserved
- *
- *  This file is part of GPAC / Osmo4 wxWidgets GUI
- *
- *  GPAC is gf_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 "wxOsmo4.h"
-#include "Playlist.h"
-
-
-#include "playlist.xpm"
-
-PLEntry::PLEntry(wxString url)
-{
-	m_url = gf_strdup(url.mb_str(wxConvUTF8));
-	Bool is_remote = 0;
-	wxCharBuffer the_url = (const char *) url.mb_str(wxConvUTF8);
-	const char *_url = strstr(the_url, "://");
-	if (_url) {
-		_url += 3;
-		is_remote = 1;
-	}
-	else _url = (const char *) the_url;
-
-	char *str = (char*)strrchr(_url, '\\');
-	if (!str) str = (char*)strrchr(_url, '/');
-	if (str && strlen(str+1)) {
-		m_disp_name = gf_strdup(str+1);
-		str = strrchr(m_disp_name, '.');
-		if (str) str0 = 0;
-	} else {
-		m_disp_name = gf_strdup(_url);
-		if (!is_remote) {
-			str = strrchr(m_disp_name, '.');
-			if (str) str0 = 0;
-		}
-	}
-	m_duration = 0;
-	m_bIsDead = 0;
-	m_bIsPlaying = 0;
-	m_bIsSelected = 0;
-}
-
-PLEntry::~PLEntry()
-{
-	if (m_url) gf_free(m_url);
-	if (m_disp_name) gf_free(m_disp_name);
-
-}
-
-wxPlaylist::wxPlaylist(wxWindow *parent)
-	: wxFrame(parent, -1, wxString(_T("Osmo4 Playlist")), wxDefaultPosition, wxDefaultSize,
-	          wxCLOSE_BOX | wxSYSTEM_MENU | wxCAPTION | wxRESIZE_BORDER)
-{
-
-	m_pApp = (wxOsmo4Frame *)parent;
-
-	m_pOpen = new wxBitmap(pl_open);
-	m_pSave = new wxBitmap(pl_save);
-	m_pAdd = new wxBitmap(pl_add);
-	m_pRem = new wxBitmap(pl_rem);
-	m_pUp = new wxBitmap(pl_up);
-	m_pDown = new wxBitmap(pl_down);
-	m_pSort = new wxBitmap(pl_sort);
-
-	m_pToolBar = CreateToolBar(wxTB_HORIZONTAL);
-	m_pAddBut = new wxMenuButton(m_pToolBar, ID_PL_ADD_FILE, *m_pAdd);
-	wxMenu *menu = new wxMenu();
-	menu->Append(ID_PL_ADD_URL, wxT("&Url"));
-	menu->Append(ID_PL_ADD_DIR, wxT("&Directory"));
-	menu->Append(ID_PL_ADD_DIR_REC, wxT("&Directory and subfolders"));
-	m_pAddBut->AssignMenu(menu);
-	m_pAddBut->SetToolTip(wxString(wxT("Add Files")));
-
-	m_pRemBut = new wxMenuButton(m_pToolBar, ID_PL_REM_FILE, *m_pRem);
-	menu = new wxMenu();
-	menu->Append(ID_PL_REM_ALL, wxT("&Clear"));
-	menu->Append(ID_PL_REM_DEAD, wxT("&Remove dead entries"));
-	m_pRemBut->AssignMenu(menu);
-	m_pRemBut->SetToolTip(wxString(wxT("Remove Selected Files")));
-
-	m_pSortBut = new wxMenuButton(m_pToolBar, ID_PL_SORT_FILE, *m_pSort);
-	menu = new wxMenu();
-	menu->Append(ID_PL_SORT_TITLE, wxT("&Sort by Title"));
-	menu->Append(ID_PL_SORT_FILE, wxT("&Sort by file name"));
-	menu->Append(ID_PL_SORT_DUR, wxT("&Sort by Duration"));
-	menu->AppendSeparator();
-	menu->Append(ID_PL_REVERSE, wxT("&Reverse"));
-	menu->Append(ID_PL_RANDOMIZE, wxT("&Randomize"));
-	m_pSortBut->AssignMenu(menu);
-	m_pSortBut->SetToolTip(wxString(wxT("Sort Playlist by filename")));
-
-	m_pToolBar->AddTool(ID_PL_OPEN, wxT(""), *m_pOpen, wxT("Open Playlist"));
-	m_pToolBar->AddTool(ID_PL_SAVE, wxT(""), *m_pSave, wxT("Save Playlist"));
-	m_pToolBar->AddSeparator();
-	m_pToolBar->AddControl(m_pAddBut);
-	m_pToolBar->AddControl(m_pRemBut);
-	m_pToolBar->AddSeparator();
-	m_pToolBar->AddTool(ID_PL_UP, wxT(""), *m_pUp, wxT("Moves Selected Files Up"));
-	m_pToolBar->AddTool(ID_PL_DOWN, wxT(""), *m_pDown, wxT("Moves Selected Files Down"));
-	m_pToolBar->AddSeparator();
-	m_pToolBar->AddControl(m_pSortBut);
-	m_pToolBar->Realize();
-
-	m_FileList = new wxListCtrl(this, ID_FILE_LIST, wxDefaultPosition, wxDefaultSize, wxLC_REPORT);
-
-	m_FileList->InsertColumn(0, wxT(""), wxLIST_FORMAT_LEFT, 1);
-	m_FileList->InsertColumn(1, wxT("Title"), wxLIST_FORMAT_LEFT, 1);
-	m_FileList->InsertColumn(2, wxT("Duration"), wxLIST_FORMAT_LEFT, 1);
-
-	m_entries = gf_list_new();
-	m_cur_entry = -1;
-	m_all_dead_entries = -1;
-
-	SetSize(220, 380);
-	Centre();
-}
-
-wxPlaylist::~wxPlaylist()
-{
-	Clear();
-	gf_list_del(m_entries);
-	delete m_pAddBut;
-	delete m_pRemBut;
-	delete m_pSortBut;
-	delete m_pOpen;
-	delete m_pSave;
-	delete m_pAdd;
-	delete m_pRem;
-	delete m_pUp;
-	delete m_pDown;
-	delete m_pSort;
-}
-
-
-BEGIN_EVENT_TABLE(wxPlaylist, wxWindow)
-	EVT_CLOSE(wxPlaylist::OnClose)
-	EVT_SIZE(wxPlaylist::OnSize)
-	EVT_TOOL(ID_PL_ADD_FILE, wxPlaylist::OnAddFile)
-	EVT_TOOL(ID_PL_ADD_URL, wxPlaylist::OnAddURL)
-	EVT_TOOL(ID_PL_ADD_DIR, wxPlaylist::OnAddDir)
-	EVT_TOOL(ID_PL_ADD_DIR_REC, wxPlaylist::OnAddDirRec)
-	EVT_TOOL(ID_PL_REM_FILE, wxPlaylist::OnRemFile)
-	EVT_TOOL(ID_PL_REM_ALL, wxPlaylist::OnRemAll)
-	EVT_TOOL(ID_PL_REM_DEAD, wxPlaylist::OnRemDead)
-	EVT_TOOL(ID_PL_UP, wxPlaylist::OnSelUp)
-	EVT_TOOL(ID_PL_DOWN, wxPlaylist::OnSelDown)
-	EVT_TOOL(ID_PL_SAVE, wxPlaylist::OnSave)
-	EVT_TOOL(ID_PL_OPEN, wxPlaylist::OnOpen)
-	EVT_MENU(ID_PL_PLAY, wxPlaylist::OnPlay)
-	EVT_MENU(ID_PL_RANDOMIZE, wxPlaylist::OnRandomize)
-	EVT_MENU(ID_PL_REVERSE, wxPlaylist::OnReverseList)
-	EVT_MENU(ID_PL_SEL_REV, wxPlaylist::OnReverseSelection)
-	EVT_MENU(ID_PL_SORT_TITLE, wxPlaylist::OnSortTitle)
-	EVT_MENU(ID_PL_SORT_FILE, wxPlaylist::OnSortFile)
-	EVT_MENU(ID_PL_SORT_DUR, wxPlaylist::OnSortDuration)
-	EVT_LIST_ITEM_ACTIVATED(ID_FILE_LIST, wxPlaylist::OnItemActivate)
-	EVT_LIST_ITEM_RIGHT_CLICK(ID_FILE_LIST, wxPlaylist::OnRightClick)
-END_EVENT_TABLE()
-
-void wxPlaylist::OnClose(wxCloseEvent &event)
-{
-	if (event.CanVeto()) {
-		event.Veto();
-		Hide();
-	}
-}
-
-void wxPlaylist::OnSize(wxSizeEvent &event)
-{
-	wxSize s = event.GetSize();
-	m_FileList->SetSize(0, 0, s.GetWidth()-2, s.GetHeight());
-	m_FileList->SetColumnWidth(0, 30);
-	m_FileList->SetColumnWidth(2, 60);
-	m_FileList->SetColumnWidth(1, s.GetWidth()-96);
-}
-
-void wxPlaylist::Clear()
-{
-	m_FileList->DeleteAllItems();
-	while (gf_list_count(m_entries)) {
-		PLEntry *ple = (PLEntry *) gf_list_get(m_entries, 0);
-		gf_list_rem(m_entries, 0);
-		delete ple;
-	}
-	m_cur_entry = -1;
-}
-
-void wxPlaylist::ClearButPlaying()
-{
-	PLEntry *p = NULL;
-	if (m_cur_entry >= 0) {
-		p = (PLEntry *) gf_list_get(m_entries, m_cur_entry);
-		gf_list_rem(m_entries, m_cur_entry);
-	}
-	Clear();
-	if (p) {
-		gf_list_add(m_entries, p);
-		m_cur_entry = 0;
-	}
-	RefreshList();
-}
-
-void wxPlaylist::UpdateEntry(u32 idx)
-{
-	char szText20;
-
-	PLEntry *ple = (PLEntry *) gf_list_get(m_entries, idx);
-	if (idx+1<10) sprintf(szText, "00%d", idx+1);
-	else if (idx+1<100) sprintf(szText, "0%d", idx+1);
-	else sprintf(szText, "%d", idx+1);
-	m_FileList->SetItem(idx, 0, wxString(szText, wxConvUTF8));
-
-	wxString str;
-	if (ple->m_bIsDead) str = wxT("!! ") + wxString(ple->m_disp_name, wxConvUTF8) + wxT(" (DEAD)!!)");
-	else if (ple->m_bIsPlaying) str = wxT(">> ") + wxString(ple->m_disp_name, wxConvUTF8) + wxT(" >>");
-	else str = wxString(ple->m_disp_name, wxConvUTF8);
-	m_FileList->SetItem(idx, 1, str);
-
-	if (ple->m_duration) {
-		u32 h = (u32) (ple->m_duration / 3600);
-		u32 m = (u32) (ple->m_duration / 60) - h*60;
-		u32 s = (u32) (ple->m_duration) - h*3600 - m*60;
-		m_FileList->SetItem(idx, 2, wxString::Format(wxT("%02d:%02d:%02d"), h, m, s) );
-	} else {
-		m_FileList->SetItem(idx, 2, wxT("Unknown"));
-	}
-}
-
-void wxPlaylist::RefreshList()
-{
-	u32 i, top_idx;
-	char szPathGF_MAX_PATH;
-	Bool first_sel;
-
-	top_idx = m_FileList->GetTopItem();
-	m_FileList->DeleteAllItems();
-
-	first_sel = 0;
-	for (i=0; i<gf_list_count(m_entries); i++) {
-		PLEntry *ple = (PLEntry *) gf_list_get(m_entries, i);
-		m_FileList->InsertItem(i, wxT(""));
-		/*cast for 64-bit compilation*/
-		m_FileList->SetItemData(i, (unsigned long) ple);
-		UpdateEntry(i);
-
-		if (ple->m_bIsPlaying) m_cur_entry = i;
-
-		if (ple->m_bIsSelected) {
-			m_FileList->SetItemState(i, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED | wxLIST_MASK_STATE);
-			ple->m_bIsSelected = 0;
-			/*ensure first item of selection is visible*/
-			if (!first_sel) {
-				first_sel = 1;
-				top_idx = i;
-			}
-		}
-	}
-
-	if (m_cur_entry >= (s32) gf_list_count(m_entries)-1) m_cur_entry = gf_list_count(m_entries)-1;
-	else {
-		s32 last_idx = top_idx + m_FileList->GetCountPerPage();
-		m_FileList->EnsureVisible(top_idx);
-		if (gf_list_count(m_entries)<1+ (u32) last_idx) last_idx = gf_list_count(m_entries)-1;
-		m_FileList->EnsureVisible(last_idx);
-	}
-
-	strcpy((char *) szPath, m_pApp->szAppPath);
-#ifdef WIN32
-	strcat(szPath, "gpac_pl.m3u");
-#else
-	strcat(szPath, ".gpac_pl.m3u");
-#endif
-	Save(szPath, 1);
-}
-
-void wxPlaylist::OnAddFile(wxCommandEvent &WXUNUSED(event))
-{
-	wxFileDialog dlg(this, wxT("Select file(s)"), wxT(""), wxT(""), m_pApp->GetFileFilter(), wxOPEN | wxCHANGE_DIR | /*wxHIDE_READONLY |*/ wxMULTIPLE);
-
-	if (dlg.ShowModal() == wxID_OK) {
-		wxArrayString stra;
-		dlg.GetPaths(stra);
-		for (u32 i=0; i<stra.GetCount(); i++) {
-			PLEntry *ple = new PLEntry(strai);
-			gf_list_add(m_entries, ple);
-		}
-		m_all_dead_entries = -1;
-		RefreshList();
-	}
-}
-
-
-static Bool pl_enum_dir_item(void *cbck, char *item_name, char *item_path, GF_FileEnumInfo *file_info)
-{
-	wxPlaylist *_this = (wxPlaylist *)cbck;
-
-	if (gf_term_is_supported_url(_this->m_pApp->m_term, item_name, 0, 1)) {
-		PLEntry *ple = new PLEntry(wxString(item_path, wxConvUTF8) );
-		gf_list_add(_this->m_entries, ple);
-	}
-	return 0;
-}
-
-static Bool pl_enum_dir_dirs(void *cbck, char *item_name, char *item_path, GF_FileEnumInfo *file_info)
-{
-	gf_enum_directory(item_path, 0, pl_enum_dir_item, cbck, NULL);
-	gf_enum_directory(item_path, 1, pl_enum_dir_dirs, cbck, NULL);
-	return 0;
-}
-
-
-void wxPlaylist::AddDir(Bool do_recurse)
-{
-	wxDirDialog dlg(this);
-	dlg.SetPath(wxString(szCacheDir, wxConvUTF8) );
-	if (dlg.ShowModal() != wxID_OK) return;
-
-	strcpy(szCacheDir, dlg.GetPath().mb_str(wxConvUTF8));
-	gf_enum_directory(szCacheDir, 0, pl_enum_dir_item, this, NULL);
-	if (do_recurse) gf_enum_directory(szCacheDir, 1, pl_enum_dir_dirs, this, NULL);
-	m_all_dead_entries = -1;
-	RefreshList();
-}
-void wxPlaylist::OnAddDir(wxCommandEvent &WXUNUSED(event))
-{
-	AddDir(0);
-}
-void wxPlaylist::OnAddDirRec(wxCommandEvent &WXUNUSED(event))
-{
-	AddDir(1);
-}
-
-void wxPlaylist::OnAddURL(wxCommandEvent &WXUNUSED(event))
-{
-	OpenURLDlg dlg(this, m_pApp->m_user.config);
-	if (dlg.ShowModal() != wxID_OK) return;
-	PLEntry *ple = new PLEntry(dlg.m_urlVal);
-	gf_list_add(m_entries, ple);
-	m_all_dead_entries = -1;
-	RefreshList();
-}
-
-void wxPlaylist::OnRemFile(wxCommandEvent &WXUNUSED(event))
-{
-	if (!m_FileList->GetSelectedItemCount()) return;
-
-	long item = -1;
-	for (;;) {
-		item = m_FileList->GetNextItem(item, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
-		if (item == -1) break;
-		PLEntry *ple = (PLEntry *) m_FileList->GetItemData(item);
-		gf_list_del_item(m_entries, ple);
-		delete ple;
-	}
-	RefreshList();
-}
-
-void wxPlaylist::OnRemAll(wxCommandEvent &WXUNUSED(event))
-{
-	Clear();
-	RefreshList();
-	m_cur_entry = -1;
-	m_all_dead_entries = 1;
-}
-
-void wxPlaylist::OnRemDead(wxCommandEvent &WXUNUSED(event))
-{
-	for (u32 i=0; i<gf_list_count(m_entries); i++) {
-		PLEntry *ple = (PLEntry *) gf_list_get(m_entries, i);
-		if (!ple->m_bIsDead) continue;
-		gf_list_rem(m_entries, i);
-		i--;
-		delete ple;
-	}
-	m_all_dead_entries = gf_list_count(m_entries) ? 0 : 1;
-	RefreshList();
-}
-
-
-void wxPlaylist::OnSelUp(wxCommandEvent &WXUNUSED(event))
-{
-	s32 i;
-	if (!m_FileList->GetSelectedItemCount()) return;
-	long item = -1;
-	item = m_FileList->GetNextItem(item, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
-	if (item <= 0) return;
-
-	item = -1;
-	for (;;) {
-		item = m_FileList->GetNextItem(item, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
-		if (item == -1) break;
-		PLEntry *ple = (PLEntry *) m_FileList->GetItemData(item);
-		i = gf_list_del_item(m_entries, ple);
-		assert(i>=1);
-		gf_list_insert(m_entries, ple, i-1);
-		ple->m_bIsSelected = 1;
-	}
-	RefreshList();
-}
-
-void wxPlaylist::OnSelDown(wxCommandEvent &WXUNUSED(event))
-{
-	s32 i;
-
-	if (!m_FileList->GetSelectedItemCount()) return;
-	long item = -1;
-	for (;;) {
-		item = m_FileList->GetNextItem(item, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
-		if (item == -1) break;
-	}
-	if ((u32) item + 1 == gf_list_count(m_entries)) return;
-
-	item = -1;
-	for (;;) {
-		item = m_FileList->GetNextItem(item, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
-		if (item == -1) break;
-		PLEntry *ple = (PLEntry *) m_FileList->GetItemData(item);
-		i = gf_list_del_item(m_entries, ple);
-		assert(i>=1);
-		gf_list_insert(m_entries, ple, i+1);
-		ple->m_bIsSelected = 1;
-	}
-	RefreshList();
-}
-
-
-
-void wxPlaylist::OnSave(wxCommandEvent & WXUNUSED(event))
-{
-	Bool save_m3u;
-	char szPathGF_MAX_PATH;
-	if (!gf_list_count(m_entries)) return;
-
-	wxFileDialog dlg(this, wxT("Select file(s)"), wxT(""), wxT(""), wxT("M3U Playlists|*.m3u|ShoutCast Playlists|*.pls|"), wxSAVE | wxCHANGE_DIR | wxOVERWRITE_PROMPT);
-	if (dlg.ShowModal() != wxID_OK) return;
-
-	strcpy(szPath, dlg.GetPath().mb_str(wxConvUTF8));
-	strlwr(szPath);
-	save_m3u = (dlg.GetFilterIndex()==0) ? 1 : 0;
-	if (save_m3u) {
-		if (!strstr(szPath, ".m3u")) {
-			strcpy(szPath, dlg.GetPath().mb_str(wxConvUTF8));
-			strcat(szPath, ".m3u");
-		} else {
-			strcpy(szPath, dlg.GetPath().mb_str(wxConvUTF8));
-		}
-	} else {
-		if (!strstr(szPath, ".pls")) {
-			strcpy(szPath, dlg.GetPath().mb_str(wxConvUTF8));
-			strcat(szPath, ".pls");
-		} else {
-			strcpy(szPath, dlg.GetPath().mb_str(wxConvUTF8));
-		}
-	}
-	Save(szPath, save_m3u);
-}
-
-void wxPlaylist::Save(char *szPath, Bool save_m3u)
-{
-	FILE *out = gf_fopen(szPath, "wt");
-	if (!save_m3u)
-		fprintf(out, "playlist\nNumberOfEntries=%d\n", gf_list_count(m_entries));
-
-	for (u32 i=0; i<gf_list_count(m_entries); i++) {
-		PLEntry *ple = (PLEntry *) gf_list_get(m_entries, i);
-		if (save_m3u) {
-			fprintf(out, "%s\n", ple->m_url);
-		} else {
-			fprintf(out, "File%d=%s\n", i+1, ple->m_url);
-			fprintf(out, "Title%d=%s\n", i+1, ple->m_disp_name);
-			if (ple->m_duration) fprintf(out, "Length%d=%d\n", i+1, ple->m_duration);
-			else fprintf(out, "Length%d=-1\n", i+1);
-		}
-	}
-	if (!save_m3u) fprintf(out, "Version=2\n");
-
-	fprintf(out, "\n");
-	gf_fclose(out);
-}
-
-void wxPlaylist::OnOpen(wxCommandEvent & WXUNUSED(event))
-{
-	wxFileDialog dlg(this, wxT("Select file(s)"), wxT(""), wxT(""), wxT("M3U & PLS Playlists|*.m3u;*.pls|M3U Playlists|*.m3u|ShoutCast Playlists|*.pls|"), wxOPEN | wxCHANGE_DIR/* | wxHIDE_READONLY*/);
-	if (dlg.ShowModal() != wxID_OK) return;
-
-	Clear();
-	OpenPlaylist(dlg.GetPath());
-	m_cur_entry = 0;
-	Play();
-}
-
-void wxPlaylist::OpenPlaylist(wxString filename)
-{
-	FILE *pl;
-	PLEntry *ple;
-	Bool load_m3u, go;
-	char szLineGF_MAX_PATH;
-	pl = gf_fopen(filename.mb_str(wxConvUTF8) , "rt");
-	if (!pl) return;
-
-	ple = NULL;
-	load_m3u = 1;
-	while (!feof(pl)) {
-		fgets(szLine, GF_MAX_PATH, pl);
-		go = 1;
-		while (go) {
-			switch (szLinestrlen(szLine)-1) {
-			case '\n':
-			case '\r':
-			case ' ':
-				szLinestrlen(szLine)-1 = 0;
-				break;
-			default:
-				go = 0;
-				break;
-			}
-		}
-		if (!strlen(szLine)) continue;
-		if (!stricmp(szLine, "playlist")) {
-			load_m3u = 0;
-		} else if (load_m3u) {
-			ple = new PLEntry(wxString(szLine, wxConvUTF8) );
-			gf_list_add(m_entries, ple);
-		} else if (!strnicmp(szLine, "file", 4)) {
-			char *st = strchr(szLine, '=');
-			if (!st) ple = NULL;
-			else {
-				ple = new PLEntry(wxString(st + 1, wxConvUTF8) );
-				gf_list_add(m_entries, ple);
-			}
-		} else if (ple && !strnicmp(szLine, "Length", 6)) {
-			char *st = strchr(szLine, '=');
-			s32 d = atoi(st + 1);
-			if (d>0) ple->m_duration = d;
-		} else if (ple && !strnicmp(szLine, "Title", 5)) {
-			char *st = strchr(szLine, '=');
-			gf_free(ple->m_disp_name);
-			ple->m_disp_name = gf_strdup(st + 6);
-		}
-	}
-	gf_fclose(pl);
-	m_all_dead_entries = -1;
-	m_cur_entry = -1;
-	RefreshList();
-}
-
-void wxPlaylist::OnRightClick(wxListEvent & event)
-{
-	if (!m_FileList->GetItemCount()) return;
-
-	wxMenu *popup = new wxMenu();
-
-	if (m_FileList->GetSelectedItemCount()==1) {
-		popup->Append(ID_PL_PLAY, wxT("Play"));
-		popup->AppendSeparator();
-	}
-	popup->Append(ID_PL_SEL_REV, wxT("Inverse Selection"));
-	if (m_FileList->GetSelectedItemCount()) popup->Append(ID_PL_REM_FILE, wxT("Remove File(s)"));
-	if (m_FileList->GetItemCount()>1) {
-		popup->AppendSeparator();
-		popup->Append(ID_PL_SORT_TITLE, wxT("Sort By Title"));
-		popup->Append(ID_PL_SORT_FILE, wxT("Sort By File Name"));
-		popup->Append(ID_PL_SORT_DUR, wxT("Sort By Duration"));
-		popup->AppendSeparator();
-		popup->Append(ID_PL_REVERSE, wxT("Reverse List"));
-		popup->Append(ID_PL_RANDOMIZE, wxT("Randomize"));
-	}
-
-	PopupMenu(popup, event.GetPoint());
-	delete popup;
-}
-
-void wxPlaylist::OnReverseSelection(wxCommandEvent &WXUNUSED(event) )
-{
-	u32 i;
-	long item = -1;
-	for (;;) {
-		item = m_FileList->GetNextItem(item, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
-		if (item == -1) break;
-		PLEntry *ple = (PLEntry *) m_FileList->GetItemData(item);
-		ple->m_bIsSelected = 1;
-	}
-	for (i=0; i<gf_list_count(m_entries); i++) {
-		PLEntry *ple = (PLEntry *) gf_list_get(m_entries, i);
-		ple->m_bIsSelected = !ple->m_bIsSelected;
-	}
-	RefreshList();
-}
-
-void wxPlaylist::OnReverseList(wxCommandEvent &WXUNUSED(event) )
-{
-	u32 count = gf_list_count(m_entries);
-	u32 hcount = count / 2;
-	count--;
-	for (u32 i=0; i<hcount; i++) {
-		PLEntry *ple1 = (PLEntry *) gf_list_get(m_entries, i);
-		PLEntry *ple2 = (PLEntry *) gf_list_get(m_entries, count-i);
-		gf_list_rem(m_entries, i);
-		gf_list_insert(m_entries, ple2, i);
-		gf_list_rem(m_entries, count-i);
-		gf_list_insert(m_entries, ple1, count-i);
-	}
-	RefreshList();
-}
-
-void wxPlaylist::OnRandomize(wxCommandEvent &WXUNUSED(event) )
-{
-	GF_List *new_entries = gf_list_new();
-
-	gf_rand_init(0);
-
-	while (gf_list_count(m_entries)>1) {
-		u32 pos = gf_rand() % (gf_list_count(m_entries)-1);
-		PLEntry *ple = (PLEntry *)gf_list_get(m_entries, pos);
-		gf_list_rem(m_entries, pos);
-		gf_list_add(new_entries, ple);
-	}
-	PLEntry *ple = (PLEntry *)gf_list_get(m_entries, 0);
-	gf_list_rem(m_entries, 0);
-	gf_list_add(new_entries, ple);
-
-	gf_list_del(m_entries);
-	m_entries = new_entries;
-	m_cur_entry = -1;
-	RefreshList();
-}
-
-void wxPlaylist::Sort(u32 type)
-{
-	u32 i, j, smallest;
-
-	for (i=0; i<gf_list_count(m_entries)-1; i++) {
-		smallest = i;
-		for (j=i+1; j<gf_list_count(m_entries); j++) {
-			PLEntry *ple2 = (PLEntry *) gf_list_get(m_entries, smallest);
-			PLEntry *ple1 = (PLEntry *) gf_list_get(m_entries, j);
-			s32 test = 0;
-			switch (type) {
-			case 0:
-				test = stricmp(ple1->m_url, ple2->m_url);
-				break;
-			case 1:
-				test = stricmp(ple1->m_disp_name, ple2->m_disp_name);
-				break;
-			case 2:
-				test = ple1->m_duration - ple2->m_duration;
-				break;
-			}
-			if (test<0) smallest = j;
-		}
-		PLEntry *ple = (PLEntry *)gf_list_get(m_entries, smallest);
-		gf_list_rem(m_entries, smallest);
-		gf_list_insert(m_entries, ple, i);
-	}
-	m_cur_entry = -1;
-	RefreshList();
-}
-
-void wxPlaylist::OnSortFile(wxCommandEvent &WXUNUSED(event) ) {
-	Sort(0);
-}
-void wxPlaylist::OnSortTitle(wxCommandEvent &WXUNUSED(event) ) {
-	Sort(1);
-}
-void wxPlaylist::OnSortDuration(wxCommandEvent &WXUNUSED(event) ) {
-	Sort(2);
-}
-
-void wxPlaylist::RefreshCurrent()
-{
-	PLEntry *ple;
-	if (m_cur_entry<0) return;
-	ple = (PLEntry *) gf_list_get(m_entries, m_cur_entry);
-	if (ple && ple->m_bIsPlaying) {
-		ple->m_bIsPlaying = 0;
-		UpdateEntry(m_cur_entry);
-	}
-}
-
-Bool wxPlaylist::HasValidEntries()
-{
-	u32 nb_dead = 0;
-	if (m_all_dead_entries==-1) {
-		for (u32 i=0; i<gf_list_count(m_entries); i++) {
-			PLEntry *ple = (PLEntry *) gf_list_get(m_entries, i);
-			ple->m_bIsPlaying = 0;
-			if (ple->m_bIsDead) nb_dead ++;
-		}
-		m_all_dead_entries = (nb_dead==gf_list_count(m_entries)) ? 1 : 0;
-	}
-	return !m_all_dead_entries;
-}
-
-void wxPlaylist::Play()
-{
-	PLEntry *ple;
-
-	if (!HasValidEntries()) return;
-
-	RefreshCurrent();
-
-	if (m_cur_entry >= (s32)gf_list_count(m_entries)) {
-		if (!m_pApp->m_loop) return;
-		m_cur_entry = 0;
-	}
-
-	ple = (PLEntry *) gf_list_get(m_entries, m_cur_entry);
-	if (!ple || ple->m_bIsDead) {
-		m_cur_entry++;
-		Play();
-	} else {
-		char szPLE20;
-		ple->m_bIsPlaying = 1;
-		UpdateEntry(m_cur_entry);
-		sprintf(szPLE, "%d", m_cur_entry);
-		gf_cfg_set_key(m_pApp->m_user.config, "General", "PLEntry", szPLE);
-		m_pApp->DoConnect();
-	}
-}
-
-void wxPlaylist::OnItemActivate(wxListEvent &WXUNUSED(event) )
-{
-	long item = m_FileList->GetNextItem(-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
-	if (item==-1) return;
-	RefreshCurrent();
-	m_cur_entry = item;
-	Play();
-}
-
-
-void wxPlaylist::OnPlay(wxCommandEvent &WXUNUSED(event))
-{
-	long item = m_FileList->GetNextItem(-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
-	if (item==-1) return;
-
-	RefreshCurrent();
-	m_cur_entry = item;
-	Play();
-}
-
-void wxPlaylist::Truncate()
-{
-	if (m_cur_entry<0) return;
-	while ((u32) m_cur_entry+1 < gf_list_count(m_entries)) {
-		PLEntry *ple = (PLEntry *) gf_list_get(m_entries, m_cur_entry+1);
-		gf_list_rem(m_entries, m_cur_entry+1);
-		delete ple;
-	}
-	RefreshList();
-}
-
-void wxPlaylist::QueueURL(wxString filename)
-{
-	char *ext = (char*)strrchr(filename.mb_str(wxConvUTF8), '.');
-	if (ext && (!stricmp(ext, ".m3u") || !stricmp(ext, ".pls")) ) {
-		OpenPlaylist(filename);
-	} else {
-		PLEntry *ple = new PLEntry(filename);
-		gf_list_add(m_entries, ple);
-	}
-}
-
-void wxPlaylist::PlayNext()
-{
-	RefreshCurrent();
-	if (1+m_cur_entry < (s32)gf_list_count(m_entries)) {
-		m_cur_entry++;
-		Play();
-	}
-}
-
-void wxPlaylist::PlayPrev()
-{
-	RefreshCurrent();
-	if (m_cur_entry>0) {
-		m_cur_entry--;
-		Play();
-	}
-}
-
-void wxPlaylist::SetDead()
-{
-	PLEntry *ple = (PLEntry *) gf_list_get(m_entries, m_cur_entry);
-	if (ple) {
-		ple->m_bIsDead = 1;
-		UpdateEntry(m_cur_entry);
-		if (ple->m_bIsPlaying) PlayNext();
-		m_all_dead_entries = -1;
-	}
-}
-void wxPlaylist::SetDuration(u32 duration)
-{
-	PLEntry *ple = (PLEntry *) gf_list_get(m_entries, m_cur_entry);
-	if (ple) {
-		ple->m_duration = duration;
-		UpdateEntry(m_cur_entry);
-	}
-}
-
-wxString wxPlaylist::GetDisplayName()
-{
-	if (m_cur_entry>=0) {
-		PLEntry *ple = (PLEntry *) gf_list_get(m_entries, m_cur_entry);
-		if (ple) return wxString(wxString(ple->m_disp_name, wxConvUTF8) );
-	}
-	return wxT("");
-}
-
-wxString wxPlaylist::GetURL()
-{
-	PLEntry *ple = (PLEntry *) gf_list_get(m_entries, m_cur_entry);
-	if (ple) return wxString(ple->m_url, wxConvUTF8);
-	return wxT("");
-}
-

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/osmo4_wx/Playlist.h Deleted

@@ -1,135 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2012
- *					All rights reserved
- *
- *  This file is part of GPAC / Osmo4 wxWidgets GUI
- *
- *  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.
- *
- *
- */
-
-#ifndef _PLAYLIST_H
-#define _PLAYLIST_H
-
-#include "wx/wxprec.h"
-
-#ifndef WX_PRECOMP
-#include "wx/wx.h"
-#endif
-
-#include "menubtn.h"
-
-enum
-{
-	ID_FILE_LIST = 1000,
-};
-
-class wxOsmo4Frame;
-
-class PLEntry
-{
-public:
-	PLEntry(wxString url);
-	~PLEntry();
-
-	char *m_url;
-	char *m_disp_name;
-	u32 m_duration;
-
-	Bool m_bIsSelected;
-	Bool m_bIsDead;
-	Bool m_bIsPlaying;
-};
-
-
-class wxPlaylist : public wxFrame
-{
-public:
-	wxPlaylist(wxWindow *parent);
-	virtual ~wxPlaylist();
-
-	void Clear();
-	void ClearButPlaying();
-	void RefreshList();
-
-	void Truncate();
-	void QueueURL(wxString filename);
-	void Play();
-	void PlayNext();
-	void PlayPrev();
-	void SetDead();
-	void SetDuration(u32 duration);
-	Bool HasValidEntries();
-	void OpenPlaylist(wxString fileName);
-
-	/*for current entry played*/
-	wxString GetDisplayName();
-	wxString GetURL();
-
-	s32 m_cur_entry;
-	GF_List *m_entries;
-
-	wxOsmo4Frame *m_pApp;
-
-private:
-	DECLARE_EVENT_TABLE()
-
-	void OnClose(wxCloseEvent &event);
-	void OnSize(wxSizeEvent &event);
-	void OnAddFile(wxCommandEvent &event);
-	void OnAddURL(wxCommandEvent &event);
-	void OnAddDir(wxCommandEvent &event);
-	void OnAddDirRec(wxCommandEvent &event);
-	void OnRemFile(wxCommandEvent &event);
-	void OnRemAll(wxCommandEvent &event);
-	void OnRemDead(wxCommandEvent &event);
-	void OnSelUp(wxCommandEvent &event);
-	void OnSelDown(wxCommandEvent &event);
-	void OnSave(wxCommandEvent &event);
-	void OnOpen(wxCommandEvent &event);
-	void OnRightClick(wxListEvent & event);
-	void OnReverseSelection(wxCommandEvent &event);
-	void OnReverseList(wxCommandEvent &event);
-	void OnRandomize(wxCommandEvent &event);
-	void OnSortFile(wxCommandEvent &event);
-	void OnSortTitle(wxCommandEvent &event);
-	void OnSortDuration(wxCommandEvent &event);
-	void OnItemActivate(wxListEvent &event);
-	void OnPlay(wxCommandEvent &event);
-
-
-	void Sort(u32 type);
-	void UpdateEntry(u32 idx);
-	void RefreshCurrent();
-	void Save(char *szPath, Bool save_m3u);
-
-	wxBitmap *m_pOpen, *m_pSave, *m_pAdd, *m_pRem, *m_pUp, *m_pDown, *m_pSort;
-	wxMenuButton *m_pAddBut, *m_pRemBut, *m_pSortBut;
-	wxToolBar *m_pToolBar;
-	wxListCtrl *m_FileList;
-	char szCacheDirGF_MAX_PATH;
-	s32 m_all_dead_entries;
-
-	void AddDir(Bool do_recurse);
-};
-
-
-
-#endif
-

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/osmo4_wx/fileprops.cpp Deleted

@@ -1,650 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2012
- *					All rights reserved
- *
- *  This file is part of GPAC / Osmo4 wxWidgets GUI
- *
- *  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 "fileprops.h"
-#include "wxOsmo4.h"
-#include "Playlist.h"
-#include <wx/filename.h>
-#include <gpac/modules/codec.h>
-#include <gpac/modules/service.h>
-#include <gpac/constants.h>
-/*ISO 639 languages*/
-#include <gpac/iso639.h>
-
-
-wxFileProps::wxFileProps(wxWindow *parent)
-	: wxDialog(parent, -1, wxString(_T("File Properties")))
-{
-
-	m_pApp = (wxOsmo4Frame *)parent;
-	SetSize(540, 260);
-	assert(m_pApp->m_pPlayList);
-
-	m_pTreeView = new wxTreeCtrl(this, ID_TREE_VIEW, wxPoint(4, 2), wxSize(200, 180), wxTR_DEFAULT_STYLE | wxSUNKEN_BORDER);
-
-	new wxStaticText(this, 0, _T("Information"), wxPoint(210, 2), wxSize(60, 20));
-	m_pViewSel = new wxComboBox(this, ID_VIEW_SEL, _T(""), wxPoint(280, 2), wxSize(120, 24), 0, NULL, wxCB_READONLY);
-	m_pViewSel->Append(wxT("General"));
-	m_pViewSel->Append(wxT("Streams"));
-	m_pViewSel->Append(wxT("Playback"));
-	m_pViewSel->Append(wxT("Network"));
-	m_pViewSel->SetSelection(0);
-
-	m_pViewInfo = new wxTextCtrl(this, -1, wxT(""), wxPoint(210, 30), wxSize(320, 200), wxTE_MULTILINE | wxTE_READONLY | wxHSCROLL | wxSUNKEN_BORDER);
-
-#ifdef WIN32
-	m_pViewInfo->SetBackgroundColour(wxColour(wxT("LIGHT GREY")));
-#endif
-
-	m_pViewWI = new wxButton(this, ID_VIEW_WI, wxT("View World Info"), wxPoint(4, 174), wxSize(200, 40));
-	m_pViewSG = new wxButton(this, ID_VIEW_SG, wxT("View Scene Graph"), wxPoint(4, 220), wxSize(200, 40));
-
-
-	wxString str = m_pApp->m_pPlayList->GetDisplayName();
-	str += wxT(" Properties");
-	SetTitle(str);
-
-	m_pTimer = new wxTimer();
-	m_pTimer->SetOwner(this, ID_OD_TIMER);
-	m_pTimer->Start(500, 0);
-	RewriteODTree();
-
-}
-
-wxFileProps::~wxFileProps()
-{
-	m_pTimer->Stop();
-	delete m_pTimer;
-}
-
-
-BEGIN_EVENT_TABLE(wxFileProps, wxDialog)
-	EVT_TREE_ITEM_ACTIVATED(ID_TREE_VIEW, wxFileProps::OnSetSelection)
-	EVT_TREE_SEL_CHANGED(ID_TREE_VIEW, wxFileProps::OnSetSelection)
-	EVT_TREE_ITEM_EXPANDED(ID_TREE_VIEW, wxFileProps::OnSetSelection)
-	EVT_TREE_ITEM_COLLAPSED(ID_TREE_VIEW, wxFileProps::OnSetSelection)
-	EVT_TIMER(ID_OD_TIMER, wxFileProps::OnTimer)
-	EVT_BUTTON(ID_VIEW_SG, wxFileProps::OnViewSG)
-	EVT_BUTTON(ID_VIEW_WI, wxFileProps::OnViewWorld)
-	EVT_COMBOBOX(ID_VIEW_SEL, wxFileProps::OnSelectInfo)
-END_EVENT_TABLE()
-
-void wxFileProps::RewriteODTree()
-{
-	GF_ObjectManager *root_odm = gf_term_get_root_object(m_pApp->m_term);
-	if (!root_odm) return;
-
-	m_pTreeView->DeleteAllItems();
-	ODTreeData *root = new ODTreeData(root_odm);
-	m_pTreeView->AddRoot(wxT("Root OD"), -1, -1, root);
-	wxTreeItemId rootId = m_pTreeView->GetRootItem();
-
-	WriteInlineTree(root);
-	SetInfo(root_odm);
-}
-
-void wxFileProps::WriteInlineTree(ODTreeData *root)
-{
-	/*browse all ODs*/
-	u32 count = gf_term_get_object_count(m_pApp->m_term, root->m_pODMan);
-
-	for (u32 i=0; i<count; i++) {
-		GF_ObjectManager *odm = gf_term_get_object(m_pApp->m_term, root->m_pODMan, i);
-		if (!odm) return;
-		ODTreeData *odd = new ODTreeData(odm);
-		m_pTreeView->AppendItem(root->GetId(), wxT("Object Descriptor"), -1, -1, odd);
-
-		/*if inline propagate*/
-		switch (gf_term_object_subscene_type(m_pApp->m_term, odm)) {
-		case 1:
-			m_pTreeView->SetItemText(odd->GetId(), wxT("Root Scene"));
-			WriteInlineTree(odd);
-			break;
-		case 2:
-			m_pTreeView->SetItemText(odd->GetId(), wxT("Inline Scene"));
-			WriteInlineTree(odd);
-			break;
-		case 3:
-			m_pTreeView->SetItemText(odd->GetId(), wxT("Extern Proto Lib"));
-			break;
-		default:
-			break;
-		}
-	}
-}
-
-void wxFileProps::OnSetSelection(wxTreeEvent& event)
-{
-	ODTreeData *odd = (ODTreeData *) m_pTreeView->GetItemData(event.GetItem());
-	SetInfo(odd->m_pODMan);
-}
-
-void wxFileProps::SetInfo(GF_ObjectManager *odm)
-{
-	m_current_odm = odm;
-
-	switch (m_pViewSel->GetSelection()) {
-	case 3:
-		SetNetworkInfo();
-		break;
-	case 2:
-		SetDecoderInfo();
-		break;
-	case 1:
-		SetStreamsInfo();
-		break;
-	default:
-		SetGeneralInfo();
-		break;
-	}
-}
-
-void wxFileProps::OnTimer(wxTimerEvent& WXUNUSED(event))
-{
-	switch (m_pViewSel->GetSelection()) {
-	case 2:
-		SetDecoderInfo();
-		break;
-	}
-}
-void wxFileProps::OnSelectInfo(wxCommandEvent & WXUNUSED(event) )
-{
-	SetInfo(m_current_odm);
-}
-
-void wxFileProps::SetGeneralInfo()
-{
-	wxString info;
-	GF_MediaInfo odi;
-	u32 h, m, s;
-	u32 i, j;
-
-	info = wxT("");
-	m_pViewInfo->Clear();
-	m_pViewInfo->AppendText(info);
-
-	if (!m_current_odm || gf_term_get_object_info(m_pApp->m_term, m_current_odm, &odi) != GF_OK) return;
-
-	if (odi.has_profiles) info += wxT("Initial ");
-	info += wxString::Format(wxT("Object Descriptor ID %d\n"), odi.od->objectDescriptorID);
-	if (odi.duration) {
-		h = (u32) (odi.duration / 3600);
-		m = (u32) (odi.duration / 60) - h*60;
-		s = (u32) (odi.duration) - h*3600 - m*60;
-		info += wxString::Format(wxT("Duration %02d:%02d:%02d\n"), h, m, s);
-	} else {
-		info += wxT("Unknown duration\n");
-	}
-
-	if (odi.owns_service) {
-		info += wxT("Service Handler: ") + wxString(odi.service_handler, wxConvUTF8) + wxT("\n");
-		info += wxT("Service URL: ") + wxString(odi.service_url, wxConvUTF8) + wxT("\n");
-	}
-
-	if (odi.od->URLString) {
-		info += wxT("Remote OD - URL: ") + wxString(odi.od->URLString, wxConvUTF8) + wxT("\n");
-	}
-
-	if (odi.codec_name) {
-		switch (odi.od_type) {
-		case GF_STREAM_VISUAL:
-			info += wxString::Format(wxT("Video Object: Width %d - Height %d\n"), odi.width, odi.height);
-			info += wxT("Media Codec ") + wxString(odi.codec_name, wxConvUTF8) + wxT("\n");
-			break;
-		case GF_STREAM_AUDIO:
-			info += wxString::Format(wxT("Audio Object: Sample Rate %d - %d channels\n"), odi.sample_rate, odi.num_channels);
-			info += wxT("Media Codec ") + wxString(odi.codec_name, wxConvUTF8) + wxT("\n");
-			break;
-		case GF_STREAM_PRIVATE_SCENE:
-		case GF_STREAM_SCENE:
-			if (odi.width && odi.height) {
-				info += wxString::Format(wxT("Scene Description: Width %d - Height %d\n"), odi.width, odi.height);
-			} else {
-				info += wxT("Scene Description: No size specified\n");
-			}
-			info += wxT("Scene Codec ") + wxString(odi.codec_name, wxConvUTF8) + wxT("\n");
-			break;
-		case GF_STREAM_TEXT:
-			if (odi.width && odi.height) {
-				info += wxString::Format(wxT("Text Object: Width %d - Height %d\n"), odi.width, odi.height);
-			} else {
-				info += wxString::Format(wxT("Text Object: No size specified\n"));
-			}
-			info += wxT("Text Codec ") + wxString(odi.codec_name, wxConvUTF8) + wxT("\n");
-			break;
-		}
-	}
-	if (odi.protection==2) info += wxT("Encrypted Media NOT UNLOCKED");
-	else if (odi.protection==1) info += wxT("Encrypted Media");
-
-	if (!gf_list_count(odi.od->OCIDescriptors)) {
-		m_pViewInfo->Clear();
-		m_pViewInfo->AppendText(info);
-		return;
-	}
-
-	info += wxT("\nObject Content Information:\n");
-
-	/*check OCI (not everything interests us) - FIXME: support for unicode*/
-	for (i=0; i<gf_list_count(odi.od->OCIDescriptors); i++) {
-		GF_Descriptor *desc = (GF_Descriptor *) gf_list_get(odi.od->OCIDescriptors, i);
-		switch (desc->tag) {
-		case GF_ODF_SEGMENT_TAG:
-		{
-			GF_Segment *sd = (GF_Segment *) desc;
-			info += wxT("\nSegment Descriptor:\nName: ") + wxString((char *) sd->SegmentName, wxConvUTF8);
-			info += wxString::Format(wxT(" - start time %g sec - duration %g sec\n"), sd->startTime, sd->Duration);
-		}
-		break;
-		case GF_ODF_CC_NAME_TAG:
-		{
-			GF_CC_Name *ccn = (GF_CC_Name *)desc;
-			info += wxT("\nContent Creators:\n");
-			for (j=0; j<gf_list_count(ccn->ContentCreators); j++) {
-				GF_ContentCreatorInfo *ci = (GF_ContentCreatorInfo *) gf_list_get(ccn->ContentCreators, j);
-				if (!ci->isUTF8) continue;
-				info += wxT("\t") + wxString(ci->contentCreatorName, wxConvUTF8) + wxT("\n");
-			}
-		}
-		break;
-
-		case GF_ODF_SHORT_TEXT_TAG:
-		{
-			GF_ShortTextual *std = (GF_ShortTextual *)desc;
-			info += wxT("\n") + wxString(std->eventName, wxConvUTF8) + wxT(": ") + wxString(std->eventText, wxConvUTF8) + wxT("\n");
-		}
-		break;
-		/*todo*/
-		case GF_ODF_CC_DATE_TAG:
-			break;
-		default:
-			break;
-		}
-
-	}
-
-	m_pViewInfo->Clear();
-	m_pViewInfo->AppendText(info);
-}
-
-void wxFileProps::SetStreamsInfo()
-{
-	u32 i, count;
-	wxString info;
-	GF_MediaInfo odi;
-	char code5;
-
-	info = wxT("");
-	m_pViewInfo->Clear();
-	m_pViewInfo->AppendText(info);
-
-	if (!m_current_odm || gf_term_get_object_info(m_pApp->m_term, m_current_odm, &odi) != GF_OK) return;
-
-	if (odi.has_profiles) {
-		info += wxString::Format(wxT("\tOD Profile@Level %d\n"), odi.OD_pl);
-		info += wxString::Format(wxT("\tScene Profile@Level %d\n"), odi.scene_pl);
-		info += wxString::Format(wxT("\tGraphics Profile@Level %d\n"), odi.graphics_pl);
-		info += wxString::Format(wxT("\tAudio Profile@Level %d\n"), odi.audio_pl);
-		info += wxString::Format(wxT("\tVisual Profile@Level %d\n"), odi.scene_pl);
-		if (odi.inline_pl) info += wxT("\tInline Content use same profiles\n");
-		info += wxT("\n");
-	}
-
-	count = gf_list_count(odi.od->ESDescriptors);
-
-	for (i=0; i<count; i++) {
-		GF_ESD *esd = (GF_ESD *) gf_list_get(odi.od->ESDescriptors, i);
-
-		info += wxString::Format(wxT("Stream ID %d - Clock ID %d\n"), esd->ESID, esd->OCRESID);
-		if (esd->dependsOnESID) {
-			info += wxString::Format(wxT("\tDepends on Stream ID %d for decoding\n"), esd->dependsOnESID);
-		}
-		switch (esd->decoderConfig->streamType) {
-		case GF_STREAM_OD:
-			info += wxString::Format(wxT("\tOD Stream - version %d\n"), esd->decoderConfig->objectTypeIndication);
-			break;
-		case GF_STREAM_OCR:
-			info += wxT("\tObject Clock Reference Stream\n");
-			break;
-		case GF_STREAM_SCENE:
-			info += wxString::Format(wxT("\tScene Description Stream - version %d\n"), esd->decoderConfig->objectTypeIndication);
-			break;
-		case GF_STREAM_PRIVATE_SCENE:
-			info += wxString::Format(wxT("\tGPAC Private Scene Description Stream\n"));
-			break;
-		case GF_STREAM_VISUAL:
-			info += wxT("\tVisual Stream - media type: ");
-			switch (esd->decoderConfig->objectTypeIndication) {
-			case GPAC_OTI_VIDEO_MPEG4_PART2:
-				info += wxT("MPEG-4\n");
-				break;
-			case GPAC_OTI_VIDEO_MPEG2_SIMPLE:
-				info += wxT("MPEG-2 Simple Profile\n");
-				break;
-			case GPAC_OTI_VIDEO_MPEG2_MAIN:
-				info += wxT("MPEG-2 Main Profile\n");
-				break;
-			case GPAC_OTI_VIDEO_MPEG2_SNR:
-				info += wxT("MPEG-2 SNR Profile\n");
-				break;
-			case GPAC_OTI_VIDEO_MPEG2_SPATIAL:
-				info += wxT("MPEG-2 Spatial Profile\n");
-				break;
-			case GPAC_OTI_VIDEO_MPEG2_HIGH:
-				info += wxT("MPEG-2 High Profile\n");
-				break;
-			case GPAC_OTI_VIDEO_MPEG2_422:
-				info += wxT("MPEG-2 422 Profile\n");
-				break;
-			case GPAC_OTI_VIDEO_MPEG1:
-				info += wxT("MPEG-1\n");
-				break;
-			case GPAC_OTI_IMAGE_JPEG:
-				info += wxT("JPEG\n");
-				break;
-			case GPAC_OTI_IMAGE_PNG:
-				info += wxT("PNG\n");
-				break;
-			case GPAC_OTI_IMAGE_JPEG_2000:
-				info += wxT("JPEG2000\n");
-				break;
-			case 0x80:
-				memcpy(code, esd->decoderConfig->decoderSpecificInfo->data, 4);
-				code4 = 0;
-				info += wxT("GPAC Intern (") + wxString(code, wxConvUTF8) + wxT(")\n");
-				break;
-			default:
-				info += wxString::Format(wxT("Private/Unknown Type (0x%x)\n"), esd->decoderConfig->objectTypeIndication);
-				break;
-			}
-			break;
-
-		case GF_STREAM_AUDIO:
-			info += wxT("\tAudio Stream - media type: ");
-			switch (esd->decoderConfig->objectTypeIndication) {
-			case GPAC_OTI_AUDIO_AAC_MPEG4:
-				info += wxT("MPEG-4\n");
-				break;
-			case GPAC_OTI_AUDIO_AAC_MPEG2_MP:
-				info += wxT("MPEG-2 AAC Main Profile\n");
-				break;
-			case GPAC_OTI_AUDIO_AAC_MPEG2_LCP:
-				info += wxT("MPEG-2 AAC LowComplexity Profile\n");
-				break;
-			case GPAC_OTI_AUDIO_AAC_MPEG2_SSRP:
-				info += wxT("MPEG-2 AAC Scalable Sampling Rate Profile\n");
-				break;
-			case GPAC_OTI_AUDIO_MPEG2_PART3:
-				info += wxT("MPEG-2 Audio\n");
-				break;
-			case GPAC_OTI_AUDIO_MPEG1:
-				info += wxT("MPEG-1 Audio\n");
-				break;
-			case 0xA0:
-				info += wxT("EVRC Audio\n");
-				break;
-			case 0xA1:
-				info += wxT("SMV Audio\n");
-				break;
-			case 0xE1:
-				info += wxT("QCELP Audio\n");
-				break;
-			case 0x80:
-				memcpy(code, esd->decoderConfig->decoderSpecificInfo->data, 4);
-				code4 = 0;
-				info += wxT("GPAC Intern (") + wxString(code, wxConvUTF8) + wxT(")\n");
-				break;
-			default:
-				info += wxString::Format(wxT("Private/Unknown Type (0x%x)\n"), esd->decoderConfig->objectTypeIndication);
-				break;
-			}
-			break;
-		case GF_STREAM_MPEG7:
-			info += wxString::Format(wxT("\tMPEG-7 Stream - version %d\n"), esd->decoderConfig->objectTypeIndication);
-			break;
-		case GF_STREAM_IPMP:
-			info += wxString::Format(wxT("\tIPMP Stream - version %d\n"), esd->decoderConfig->objectTypeIndication);
-			break;
-		case GF_STREAM_OCI:
-			info += wxString::Format(wxT("\tOCI Stream - version %d\n"), esd->decoderConfig->objectTypeIndication);
-			break;
-		case GF_STREAM_MPEGJ:
-			info += wxString::Format(wxT("\tMPEGJ Stream - version %d\n"), esd->decoderConfig->objectTypeIndication);
-			break;
-		case GF_STREAM_INTERACT:
-			info += wxString::Format(wxT("\tUser Interaction Stream - version %d\n"), esd->decoderConfig->objectTypeIndication);
-			break;
-		default:
-			info += wxT("Private/Unknown\n");
-			break;
-		}
-
-		info += wxString::Format(wxT("\tBuffer Size %d\n\tAverage Bitrate %d bps\n\tMaximum Bitrate %d bps\n"), esd->decoderConfig->bufferSizeDB, esd->decoderConfig->avgBitrate, esd->decoderConfig->maxBitrate);
-		if (esd->slConfig->predefined==SLPredef_SkipSL) {
-			info += wxString::Format(wxT("\tNot using MPEG-4 Synchronization Layer\n"));
-		} else {
-			info += wxString::Format(wxT("\tStream Clock Resolution %d\n"), esd->slConfig->timestampResolution);
-		}
-		if (esd->URLString)
-			info += wxT("\tStream Location: ") + wxString(esd->URLString, wxConvUTF8) + wxT("\n");
-
-		/*check language*/
-		if (esd->langDesc) {
-			s32 idx;
-			char lan4;
-			lan0 = esd->langDesc->langCode>>16;
-			lan1 = (esd->langDesc->langCode>>8)&0xFF;
-			lan2 = (esd->langDesc->langCode)&0xFF;
-			lan3 = 0;
-			idx = gf_lang_find(lan);
-			if (idx>=0) {
-				info += wxString::Format(wxT("\tStream Language: %s\n"), gf_lang_get_name(idx) );
-			}
-		}
-
-	}
-	m_pViewInfo->Clear();
-	m_pViewInfo->AppendText(info);
-}
-
-
-void wxFileProps::SetDecoderInfo()
-{
-	GF_MediaInfo odi;
-	wxString info;
-	u32 h, m, s;
-
-	if (!m_current_odm || gf_term_get_object_info(m_pApp->m_term, m_current_odm, &odi)) {
-		m_pViewInfo->Clear();
-		m_pViewInfo->AppendText(info);
-		return;
-	}
-
-	info = wxT("Status: ");
-	switch (odi.status) {
-	case 0:
-	case 1:
-	case 2:
-		h = (u32) (odi.current_time / 3600);
-		m = (u32) (odi.current_time / 60) - h*60;
-		s = (u32) (odi.current_time) - h*3600 - m*60;
-		if (odi.status==0) info += wxT("Stopped");
-		else if (odi.status==1) info += wxT("Playing");
-		else info += wxT("Paused");
-		info += wxString::Format(wxT("\nObject Time: %02d:%02d:%02d\n"), h, m, s);
-		break;
-	case 3:
-		info += wxT("Not Setup\n");
-		m_pViewInfo->Clear();
-		m_pViewInfo->AppendText(info);
-		return;
-	default:
-		info += wxT("Setup Failed\n");
-		m_pViewInfo->Clear();
-		m_pViewInfo->AppendText(info);
-		return;
-	}
-	/*get clock drift*/
-	info += wxString::Format(wxT("Clock drift: %d ms\n"), odi.clock_drift);
-	/*get buffering*/
-	if (odi.buffer>=0) info += wxString::Format(wxT("Buffering Time: %d ms\n"), odi.buffer);
-	else if (odi.buffer==-1) info += wxT("Not buffering\n");
-	else info += wxT("Not Playing\n");
-
-	/*get DB occupation*/
-	if (odi.buffer>=0) info += wxString::Format(wxT("Decoding Buffer: %d Access Units\n"), odi.db_unit_count);
-	/*get CB occupation*/
-	if (odi.cb_max_count)
-		info += wxString::Format(wxT("Composition Memory: %d/%d Units\n"), odi.cb_unit_count, odi.cb_max_count);
-
-	Float avg_dec_time = 0;
-	if (odi.nb_dec_frames) {
-		avg_dec_time = (Float) odi.total_dec_time;
-		avg_dec_time /= odi.nb_dec_frames;
-	}
-	info += wxString::Format(wxT("Average Bitrate %d kbps (%d max)\nAverage Decoding Time %.2f ms (%d max)\nTotal decoded frames %d - %d dropped\n"),
-	                         (u32) odi.avg_bitrate/1024, odi.max_bitrate/1024, avg_dec_time, odi.max_dec_time, odi.nb_dec_frames, odi.nb_dropped);
-
-	m_pViewInfo->Clear();
-	m_pViewInfo->AppendText(info);
-}
-
-void wxFileProps::SetNetworkInfo()
-{
-	wxString info;
-	u32 id;
-	NetStatCommand com;
-	GF_MediaInfo odi;
-	u32 d_enum;
-	GF_Err e;
-
-	info = wxT("");
-	m_pViewInfo->Clear();
-	m_pViewInfo->AppendText(wxT(""));
-
-	if (!m_current_odm || gf_term_get_object_info(m_pApp->m_term, m_current_odm, &odi) != GF_OK) return;
-
-	if (odi.owns_service) {
-		const char *url, *path;
-		u32 done, total, bps;
-		info = wxT("Current Downloads in service:\n");
-		d_enum = 0;
-		while (gf_term_get_download_info(m_pApp->m_term, m_current_odm, &d_enum, &url, &path, &done, &total, &bps)) {
-			info += wxString(url, wxConvUTF8);
-			if (total) {
-				info += wxString::Format(wxT(": %d / %d bytes (%.2f %%) - %.2f kBps\n"), done, total, (100.0*done)/total, ((Double)bps)/1024);
-			} else {
-				info += wxString::Format(wxT(": %.2f kBps\n"), ((Double)bps)/1024);
-			}
-		}
-		if (!d_enum) info = wxT("No Downloads in service\n");
-		info += wxT("\n");
-	}
-
-	d_enum = 0;
-	while (gf_term_get_channel_net_info(m_pApp->m_term, m_current_odm, &d_enum, &id, &com, &e)) {
-		if (e) continue;
-		if (!com.bw_down && !com.bw_up) continue;
-
-		info += wxString::Format(wxT("Stream ID %d statistics:\n"), id);
-		if (com.multiplex_port) {
-			info += wxString::Format(wxT("\tMultiplex Port %d - multiplex ID %d\n"), com.multiplex_port, com.port);
-		} else {
-			info += wxString::Format(wxT("\tPort %d\n"), com.port);
-		}
-		info += wxString::Format(wxT("\tPacket Loss Percentage: %.4f\n"), com.pck_loss_percentage);
-		info += wxString::Format(wxT("\tDown Bandwidth: %.3f bps\n"), ((Float)com.bw_down)/1024);
-		if (com.bw_up) info += wxString::Format(wxT("\tUp Bandwidth: %d bps\n"), com.bw_up);
-		if (com.ctrl_port) {
-			if (com.multiplex_port) {
-				info += wxString::Format(wxT("\tControl Multiplex Port: %d - Control Multiplex ID %d\n"), com.multiplex_port, com.ctrl_port);
-			} else {
-				info += wxString::Format(wxT("\tControl Port: %d\n"), com.ctrl_port);
-			}
-			info += wxString::Format(wxT("\tControl Down Bandwidth: %d bps\n"), com.ctrl_bw_down);
-			info += wxString::Format(wxT("\tControl Up Bandwidth: %d bps\n"), com.ctrl_bw_up);
-		}
-		info += wxT("\n");
-	}
-	m_pViewInfo->Clear();
-	m_pViewInfo->AppendText(info);
-}
-
-
-void wxFileProps::OnViewWorld(wxCommandEvent &WXUNUSED(event))
-{
-	wxString wit;
-	const char *str;
-	GF_List *descs;
-	descs = gf_list_new();
-	str = gf_term_get_world_info(m_pApp->m_term, m_current_odm, descs);
-
-	if (!str) {
-		wxMessageDialog(this, wxT("No World Info available"), wxT("Sorry!"), wxOK).ShowModal();
-		return;
-	}
-
-	wit = wxT("");
-	for (u32 i=0; gf_list_count(descs); i++) {
-		const char *d = (const char *) gf_list_get(descs, i);
-		wit += wxString(d, wxConvUTF8);
-		wit += wxT("\n");
-	}
-	wxMessageDialog(this, wit, wxString(str, wxConvUTF8), wxOK).ShowModal();
-	gf_list_del(descs);
-}
-
-void wxFileProps::OnViewSG(wxCommandEvent &WXUNUSED(event))
-{
-	const char *sOpt;
-	Bool dump_xmt;
-	wxFileName out_file;
-	char szOutFileGF_MAX_PATH;
-	wxString fname;
-
-	sOpt = gf_cfg_get_key(m_pApp->m_user.config, "Core", "CacheDirectory");
-	out_file.AssignDir(wxString(sOpt, wxConvUTF8) );
-
-	sOpt = gf_cfg_get_key(m_pApp->m_user.config, "General", "ViewXMT");
-	out_file.SetFullName(wxT("scene_dump"));
-	if (sOpt && !stricmp(sOpt, "yes")) {
-		dump_xmt = 1;
-	} else {
-		dump_xmt = 0;
-	}
-	strcpy(szOutFile, out_file.GetFullName().mb_str(wxConvUTF8));
-
-	GF_Err e = gf_term_dump_scene(m_pApp->m_term, szOutFile, NULL, dump_xmt, 0, m_current_odm);
-	if (e) {
-		wxMessageDialog dlg(this, wxString(gf_error_to_string(e), wxConvUTF8), wxT("Error while dumping"), wxOK);
-		dlg.ShowModal();
-	} else {
-		wxString cmd = get_pref_browser(m_pApp->m_user.config);
-		cmd += wxT(" ");
-		cmd += wxString(szOutFile, wxConvUTF8);
-		wxExecute(cmd);
-	}
-}

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/osmo4_wx/fileprops.h Deleted

@@ -1,84 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2012
- *					All rights reserved
- *
- *  This file is part of GPAC / Osmo4 wxWidgets GUI
- *
- *  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.
- *
- *
- */
-
-#ifndef _FILEPROPS_H
-#define _FILEPROPS_H
-
-#include "wx/wxprec.h"
-
-#ifndef WX_PRECOMP
-#include "wx/wx.h"
-#endif
-
-#include <wx/treectrl.h>
-
-#include <gpac/terminal.h>
-
-/*abstract class for all items in the tree*/
-class ODTreeData : public wxTreeItemData
-{
-public:
-	ODTreeData(GF_ObjectManager *odm) : wxTreeItemData(), m_pODMan(odm) {}
-	GF_ObjectManager *m_pODMan;
-};
-
-
-class wxOsmo4Frame;
-class wxFileProps : public wxDialog
-{
-public:
-	wxFileProps(wxWindow *parent);
-	virtual ~wxFileProps();
-
-private:
-	DECLARE_EVENT_TABLE()
-
-	wxOsmo4Frame *m_pApp;
-
-	wxTreeCtrl *m_pTreeView;
-	wxTextCtrl *m_pViewInfo;
-	wxComboBox *m_pViewSel;
-	wxButton *m_pViewWI, *m_pViewSG;
-	wxTimer *m_pTimer;
-
-	GF_ObjectManager *m_current_odm;
-
-	void RewriteODTree();
-	void SetGeneralInfo();
-	void SetStreamsInfo();
-	void SetDecoderInfo();
-	void SetNetworkInfo();
-	void WriteInlineTree(ODTreeData *pRoot);
-	void OnSetSelection(wxTreeEvent &event);
-	void OnSelectInfo(wxCommandEvent &event);
-	void OnTimer(wxTimerEvent &event);
-	void OnViewWorld(wxCommandEvent &event);
-	void OnViewSG(wxCommandEvent &event);
-	void SetInfo(GF_ObjectManager *odm);
-};
-
-#endif
-

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/osmo4_wx/menubtn.cpp Deleted

@@ -1,870 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wxMenuButton
-// Purpose:     A button with a dropdown wxMenu
-// Author:      John Labenski
-// Modified by:
-// Created:     11/05/2002
-// RCS-ID:
-// Copyright:   (c) John Labenki
-// Licence:     wxWidgets licence
-/////////////////////////////////////////////////////////////////////////////
-
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "menubtn.h"
-#endif
-
-// For compilers that support precompilation, includes "wx/wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-#include "wx/control.h"
-#include "wx/menu.h"
-#include "wx/settings.h"
-#include "wx/bitmap.h"
-#include "wx/pen.h"
-#include "wx/dc.h"
-#endif // WX_PRECOMP
-
-#include <wx/tglbtn.h>
-#include <wx/dcclient.h>
-#include <wx/timer.h>
-#include <wx/image.h>
-
-#include "menubtn.h"
-
-
-
-// ==========================================================================
-// wxCustomButton
-// ==========================================================================
-IMPLEMENT_DYNAMIC_CLASS( wxCustomButton, wxControl )
-
-BEGIN_EVENT_TABLE(wxCustomButton,wxControl)
-	EVT_MOUSE_EVENTS ( wxCustomButton::OnMouseEvents )
-	EVT_PAINT        ( wxCustomButton::OnPaint )
-	EVT_SIZE         ( wxCustomButton::OnSize )
-END_EVENT_TABLE()
-
-wxCustomButton::~wxCustomButton()
-{
-	if (HasCapture()) ReleaseMouse();
-	if (m_timer) delete m_timer;
-}
-
-void wxCustomButton::Init()
-{
-	m_focused = FALSE;
-	m_labelMargin = wxSize(4,4);
-	m_bitmapMargin = wxSize(2,2);
-	m_down = 0;
-	m_timer = NULL;
-	m_eventType = 0;
-	m_button_style = wxCUSTBUT_TOGGLE|wxCUSTBUT_BOTTOM;
-}
-
-bool wxCustomButton::Create(wxWindow* parent, wxWindowID id,
-                            const wxString& label, const wxBitmap &bitmap,
-                            const wxPoint& pos, const wxSize& size,
-                            long style, const wxValidator& val,
-                            const wxString& name)
-{
-	if (!wxControl::Create(parent,id,pos,size,wxNO_BORDER|wxCLIP_CHILDREN,val,name))
-		return FALSE;
-
-	wxControl::SetLabel(label);
-	wxControl::SetBackgroundColour(parent->GetBackgroundColour());
-	wxControl::SetForegroundColour(parent->GetForegroundColour());
-	wxControl::SetFont(parent->GetFont());
-
-	if (bitmap.Ok()) m_bmpLabel = bitmap;
-
-	if (!SetButtonStyle(style)) return FALSE;
-
-	wxSize bestSize = DoGetBestSize();
-	SetSize(wxSize(size.x<0 ? bestSize.x:size.x, size.y<0 ? bestSize.y:size.y));
-#if (wxMINOR_VERSION<8)
-	SetBestSize(GetSize());
-#else
-	SetInitialSize(GetSize());
-#endif
-
-	CalcLayout(TRUE);
-	return TRUE;
-}
-
-void wxCustomButton::SetValue(bool depressed)
-{
-	wxCHECK_RET(!(m_button_style & wxCUSTBUT_NOTOGGLE), wxT("can't set button state"));
-	m_down = depressed ? 1 : 0;
-	Refresh(FALSE);
-}
-
-bool wxCustomButton::SetButtonStyle(long style)
-{
-	int n_styles = 0;
-	if ((style & wxCUSTBUT_LEFT) != 0)   n_styles++;
-	if ((style & wxCUSTBUT_RIGHT) != 0)  n_styles++;
-	if ((style & wxCUSTBUT_TOP) != 0)    n_styles++;
-	if ((style & wxCUSTBUT_BOTTOM) != 0) n_styles++;
-	wxCHECK_MSG(n_styles < 2, FALSE, wxT("Only one wxCustomButton label position allowed"));
-
-	n_styles = 0;
-	if ((style & wxCUSTBUT_NOTOGGLE) != 0)       n_styles++;
-	if ((style & wxCUSTBUT_BUTTON) != 0)         n_styles++;
-	if ((style & wxCUSTBUT_TOGGLE) != 0)         n_styles++;
-	if ((style & wxCUSTBUT_BUT_DCLICK_TOG) != 0) n_styles++;
-	if ((style & wxCUSTBUT_TOG_DCLICK_BUT) != 0) n_styles++;
-	wxCHECK_MSG(n_styles < 2, FALSE, wxT("Only one wxCustomButton style allowed"));
-
-	m_button_style = style;
-
-	if ((m_button_style & wxCUSTBUT_BUTTON) != 0)
-		m_down = 0;
-
-	CalcLayout(TRUE);
-	return TRUE;
-}
-
-void wxCustomButton::SetLabel( const wxString &label )
-{
-	wxControl::SetLabel(label);
-	CalcLayout(TRUE);
-}
-
-// sequence of events in GTK is up, dclick, up.
-
-void wxCustomButton::OnMouseEvents(wxMouseEvent& event)
-{
-	if (m_button_style & wxCUSTBUT_NOTOGGLE) return;
-
-	if (event.LeftDown() || event.RightDown())
-	{
-		if (!HasCapture())
-			CaptureMouse(); // keep depressed until up
-
-		m_down++;
-		Redraw();
-	}
-	else if (event.LeftDClick() || event.RightDClick())
-	{
-		m_down++; // GTK eats second down event
-		Redraw();
-	}
-	else if (event.LeftUp())
-	{
-		if (HasCapture())
-			ReleaseMouse();
-
-		m_eventType = wxEVT_LEFT_UP;
-
-#if (wxMINOR_VERSION<8)
-		if (wxRect(wxPoint(0,0), GetSize()).Inside(event.GetPosition()))
-#else
-		if (wxRect(wxPoint(0,0), GetSize()).Contains(event.GetPosition()))
-#endif
-		{
-			if ((m_button_style & wxCUSTBUT_BUTTON) && (m_down > 0))
-			{
-				m_down = 0;
-				Redraw();
-				SendEvent();
-				return;
-			}
-			else
-			{
-				if (!m_timer)
-				{
-					m_timer = new wxTimer(this, m_down+1);
-					m_timer->Start(200, TRUE);
-				}
-				else
-				{
-					m_eventType = wxEVT_LEFT_DCLICK;
-				}
-
-				if ((m_button_style & wxCUSTBUT_TOGGLE) &&
-				        (m_button_style & wxCUSTBUT_TOG_DCLICK_BUT)) m_down++;
-			}
-		}
-
-		Redraw();
-	}
-	else if (event.RightUp())
-	{
-		if (HasCapture())
-			ReleaseMouse();
-
-		m_eventType = wxEVT_RIGHT_UP;
-
-#if (wxMINOR_VERSION<8)
-		if (wxRect(wxPoint(0,0), GetSize()).Inside(event.GetPosition()))
-#else
-		if (wxRect(wxPoint(0,0), GetSize()).Contains(event.GetPosition()))
-#endif
-		{
-			if ((m_button_style & wxCUSTBUT_BUTTON) && (m_down > 0))
-			{
-				m_down = 0;
-				Redraw();
-				SendEvent();
-				return;
-			}
-			else
-			{
-				m_down++;
-
-				if (!m_timer)
-				{
-					m_timer = new wxTimer(this, m_down);
-					m_timer->Start(250, TRUE);
-				}
-				else
-				{
-					m_eventType = wxEVT_RIGHT_DCLICK;
-				}
-			}
-		}
-
-		Redraw();
-	}
-	else if (event.Entering())
-	{
-		m_focused = TRUE;
-		if ((event.LeftIsDown() || event.RightIsDown()) && HasCapture())
-			m_down++;
-
-		Redraw();
-	}
-	else if (event.Leaving())
-	{
-		m_focused = FALSE;
-		if ((event.LeftIsDown() || event.RightIsDown()) && HasCapture())
-			m_down--;
-
-		Redraw();
-	}
-}
-
-
-
-void wxCustomButton::SendEvent()
-{
-	if (((m_button_style & wxCUSTBUT_TOGGLE) && (m_eventType == wxEVT_LEFT_UP)) ||
-	        ((m_button_style & wxCUSTBUT_BUT_DCLICK_TOG) && (m_eventType == wxEVT_LEFT_DCLICK)) ||
-	        ((m_button_style & wxCUSTBUT_TOG_DCLICK_BUT) && (m_eventType == wxEVT_LEFT_UP)))
-	{
-		wxCommandEvent eventOut(wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, GetId());
-		eventOut.SetInt(m_down%2 ? 1 : 0);
-		eventOut.SetExtraLong(m_eventType);
-		eventOut.SetEventObject(this);
-		GetEventHandler()->ProcessEvent(eventOut);
-	}
-	else
-	{
-		wxCommandEvent eventOut(wxEVT_COMMAND_BUTTON_CLICKED, GetId());
-		eventOut.SetInt(0);
-		eventOut.SetExtraLong(m_eventType);
-		eventOut.SetEventObject(this);
-		GetEventHandler()->ProcessEvent(eventOut);
-	}
-}
-
-wxBitmap wxCustomButton::CreateBitmapDisabled(const wxBitmap &bitmap) const
-{
-	wxCHECK_MSG(bitmap.Ok(), wxNullBitmap, wxT("invalid bitmap"));
-
-	unsigned char br = GetBackgroundColour().Red();
-	unsigned char bg = GetBackgroundColour().Green();
-	unsigned char bb = GetBackgroundColour().Blue();
-
-	wxImage image = bitmap.ConvertToImage();
-	int pos, width = image.GetWidth(), height = image.GetHeight();
-	unsigned char *img_data = image.GetData();
-
-	for (int j=0; j<height; j++)
-	{
-		for (int i=j%2; i<width; i+=2)
-		{
-			pos = (j*width+i)*3;
-			img_datapos   = br;
-			img_datapos+1 = bg;
-			img_datapos+2 = bb;
-		}
-	}
-
-	return wxBitmap(image);
-}
-
-void wxCustomButton::SetBitmapLabel(const wxBitmap& bitmap)
-{
-	m_bmpLabel = bitmap;
-	CalcLayout(TRUE);
-}
-
-void wxCustomButton::OnPaint(wxPaintEvent& WXUNUSED(event))
-{
-	wxPaintDC dc(this);
-	Paint(dc);
-}
-
-void wxCustomButton::Redraw()
-{
-	wxClientDC dc(this);
-	Paint(dc);
-}
-
-void wxCustomButton::Paint( wxDC &dc )
-{
-#if (wxMINOR_VERSION<8)
-	dc.BeginDrawing();
-#endif
-
-	int w, h;
-	GetSize(&w,&h);
-
-	wxColour foreColour = GetForegroundColour();
-	wxColour backColour = GetBackgroundColour();
-
-	if (m_focused)
-	{
-		backColour.Set( wxMin(backColour.Red()   + 20, 255),
-		                wxMin(backColour.Green() + 20, 255),
-		                wxMin(backColour.Blue()  + 20, 255) );
-	}
-
-	wxBitmap bitmap;
-
-	if (IsEnabled())
-	{
-		if (GetValue() && m_bmpSelected.Ok())
-			bitmap = m_bmpSelected;
-		else if (m_focused && m_bmpFocus.Ok())
-			bitmap = m_bmpFocus;
-		else if (m_bmpLabel.Ok())
-			bitmap = m_bmpLabel;
-	}
-	else
-	{
-		// try to create disabled if it doesn't exist
-		if (!m_bmpDisabled.Ok() && m_bmpLabel.Ok())
-			m_bmpDisabled = CreateBitmapDisabled(m_bmpLabel);
-
-		if (m_bmpDisabled.Ok())
-			bitmap = m_bmpDisabled;
-		else if (m_bmpLabel.Ok())
-			bitmap = m_bmpLabel;
-
-		foreColour = wxSystemSettings::GetColour(wxSYS_COLOUR_GRAYTEXT);
-	}
-
-	wxBrush brush(backColour, wxSOLID);
-	dc.SetBackground(brush);
-	dc.SetBrush(brush);
-	dc.SetPen(*wxTRANSPARENT_PEN);
-
-	dc.DrawRectangle(0, 0, w, h);
-
-	if (bitmap.Ok())
-		dc.DrawBitmap(bitmap, m_bitmapPos.x, m_bitmapPos.y, TRUE );
-
-	if (!GetLabel().IsEmpty())
-	{
-		dc.SetFont(GetFont());
-		dc.SetTextBackground(backColour);
-		dc.SetTextForeground(foreColour);
-		dc.DrawText(GetLabel(), m_labelPos.x, m_labelPos.y);
-	}
-
-	if (GetValue())                                        // draw sunken border
-	{
-		dc.SetPen(*wxGREY_PEN);
-		dc.DrawLine(0,h-1,0,0);
-		dc.DrawLine(0,0,w,0);
-		dc.SetPen(*wxWHITE_PEN);
-		dc.DrawLine(w-1,1,w-1,h-1);
-		dc.DrawLine(w-1,h-1,0,h-1);
-		dc.SetPen(*wxBLACK_PEN);
-		dc.DrawLine(1,h-2,1,1);
-		dc.DrawLine(1,1,w-1,1);
-	}
-	else if (((m_button_style & wxCUSTBUT_FLAT) == 0) || m_focused) // draw raised border
-	{
-		dc.SetPen(*wxWHITE_PEN);
-		dc.DrawLine(0,h-2,0,0);
-		dc.DrawLine(0,0,w-1,0);
-		dc.SetPen(*wxBLACK_PEN);
-		dc.DrawLine(w-1,0,w-1,h-1);
-		dc.DrawLine(w-1,h-1,-1,h-1);
-		dc.SetPen(*wxGREY_PEN);
-		dc.DrawLine(2,h-2,w-2,h-2);
-		dc.DrawLine(w-2,h-2,w-2,1);
-	}
-
-	dc.SetBackground(wxNullBrush);
-	dc.SetBrush(wxNullBrush);
-	dc.SetPen(wxNullPen);
-#if (wxMINOR_VERSION<8)
-	dc.EndDrawing();
-#endif
-}
-
-void wxCustomButton::OnSize( wxSizeEvent &event )
-{
-	CalcLayout(TRUE);
-	event.Skip();
-}
-
-void wxCustomButton::SetMargins(const wxSize &margin, bool fit)
-{
-	m_labelMargin = margin;
-	m_bitmapMargin = margin;
-	CalcLayout(TRUE);
-	if (fit) SetSize(DoGetBestSize());
-}
-void wxCustomButton::SetLabelMargin(const wxSize &margin, bool fit)
-{
-	m_labelMargin = margin;
-	CalcLayout(TRUE);
-	if (fit) SetSize(DoGetBestSize());
-}
-void wxCustomButton::SetBitmapMargin(const wxSize &margin, bool fit)
-{
-	m_bitmapMargin = margin;
-	CalcLayout(TRUE);
-	if (fit) SetSize(DoGetBestSize());
-}
-
-wxSize wxCustomButton::DoGetBestSize() const
-{
-	int lw=0, lh=0;
-	int bw=0, bh=0;
-	bool has_bitmap = FALSE;
-	bool has_label = FALSE;
-
-	if (!GetLabel().IsEmpty())
-	{
-		GetTextExtent(GetLabel(), &lw, &lh);
-		lw += 2*m_labelMargin.x;
-		lh += 2*m_labelMargin.y;
-		has_label = TRUE;
-	}
-	if (m_bmpLabel.Ok())
-	{
-		bw = m_bmpLabel.GetWidth() + 2*m_bitmapMargin.x;
-		bh = m_bmpLabel.GetHeight() + 2*m_bitmapMargin.y;
-		has_bitmap = TRUE;
-	}
-
-	if ((m_button_style & wxCUSTBUT_LEFT) || (m_button_style & wxCUSTBUT_RIGHT))
-	{
-		int h = bh > lh ? bh : lh;
-		if (has_bitmap && has_label) lw -= wxMin(m_labelMargin.x, m_bitmapMargin.x);
-		return wxSize(lw+bw, h);
-	}
-
-	int w = bw > lw ? bw : lw;
-	if (has_bitmap && has_label) lh -= wxMin(m_labelMargin.y, m_bitmapMargin.y);
-	return wxSize(w, lh+bh);
-}
-
-void wxCustomButton::CalcLayout(bool refresh)
-{
-	int w, h;
-	GetSize(&w,&h);
-
-	int bw = 0, bh = 0;
-	int lw = 0, lh = 0;
-
-	if (m_bmpLabel.Ok()) // assume they're all the same size
-	{
-		bw = m_bmpLabel.GetWidth();
-		bh = m_bmpLabel.GetHeight();
-	}
-	wxString label = GetLabel();
-	if (!label.IsEmpty())
-	{
-		GetTextExtent(label, &lw, &lh);
-	}
-
-	// Center the label or bitmap if only one or the other
-	if (!m_bmpLabel.Ok())
-	{
-		m_bitmapPos = wxPoint(0,0);
-		m_labelPos = wxPoint((w-lw)/2, (h-lh)/2);
-	}
-	else if (label.IsEmpty())
-	{
-		m_bitmapPos = wxPoint((w-bw)/2, (h-bh)/2);
-		m_labelPos = wxPoint(0,0);
-	}
-	else if (m_button_style & wxCUSTBUT_LEFT)
-	{
-		int mid_margin = wxMax(m_labelMargin.x, m_bitmapMargin.x);
-		m_labelPos  = wxPoint((w - (bw+lw+m_labelMargin.x+m_bitmapMargin.x+mid_margin))/2 + m_labelMargin.x, (h - lh)/2);
-		m_bitmapPos = wxPoint(m_labelPos.x + lw + mid_margin,         (h - bh)/2);
-	}
-	else if (m_button_style & wxCUSTBUT_RIGHT)
-	{
-		int mid_margin = wxMax(m_labelMargin.x, m_bitmapMargin.x);
-		m_bitmapPos = wxPoint((w - (bw+lw+m_labelMargin.x+m_bitmapMargin.x+mid_margin))/2 + m_bitmapMargin.x, (h - bh)/2);
-		m_labelPos  = wxPoint(m_bitmapPos.x + bw + mid_margin,        (h - lh)/2);
-	}
-	else if (m_button_style & wxCUSTBUT_TOP)
-	{
-		int mid_margin = wxMax(m_labelMargin.y, m_bitmapMargin.y);
-		m_labelPos  = wxPoint((w - lw)/2, (h - (bh+lh+m_labelMargin.y+m_bitmapMargin.y+mid_margin))/2 + m_labelMargin.y);
-		m_bitmapPos = wxPoint((w - bw)/2, m_labelPos.y + lh + mid_margin);
-	}
-	else // if (m_button_style & wxCUSTBUT_BOTTOM)  DEFAULT
-	{
-		int mid_margin = wxMax(m_labelMargin.y, m_bitmapMargin.y);
-		m_bitmapPos = wxPoint((w - bw)/2, (h - (bh+lh+m_labelMargin.y+m_bitmapMargin.y+mid_margin))/2 + m_bitmapMargin.y);
-		m_labelPos  = wxPoint((w - lw)/2, m_bitmapPos.y + bh + mid_margin);
-	}
-
-	if (refresh) Refresh(FALSE);
-}
-
-
-/* XPM */
-static const char *down_arrow_xpm_data = {
-	/* columns rows colors chars-per-pixel */
-	"5 3 2 1",
-	"  c None",
-	"a c Black",
-	/* pixels */
-	"aaaaa",
-	" aaa ",
-	"  a  "
-};
-
-static wxBitmap s_dropdownBitmap; // all buttons share the same bitmap
-
-enum
-{
-	IDD_DROPDOWN_BUTTON = 100
-};
-
-//-----------------------------------------------------------------------------
-// wxMenuButtonEvents
-//-----------------------------------------------------------------------------
-
-DEFINE_LOCAL_EVENT_TYPE(wxEVT_MENUBUTTON_OPEN)
-
-// ==========================================================================
-// MenuDropButton
-// ==========================================================================
-
-class MenuDropButton : public wxCustomButton
-{
-public:
-	MenuDropButton( wxWindow *parent, wxWindowID id, long style) : wxCustomButton()
-	{
-		if (!s_dropdownBitmap.Ok())
-			s_dropdownBitmap = wxBitmap(down_arrow_xpm_data);
-
-		Create( parent, id, wxEmptyString, s_dropdownBitmap, wxDefaultPosition,
-		        wxSize(wxMENUBUTTON_DROP_WIDTH, wxMENUBUTTON_DROP_HEIGHT), style);
-	}
-
-	virtual void Paint( wxDC &dc )
-	{
-		wxCustomButton *labelBut = ((wxMenuButton*)GetParent())->GetLabelButton();
-
-		// pretend that both buttons have focus (for flat style)
-		if (labelBut)
-		{
-			wxPoint p = GetParent()->ScreenToClient(wxGetMousePosition());
-
-#if (wxMINOR_VERSION<8)
-			if (GetRect().Inside(p) || labelBut->GetRect().Inside(p))
-#else
-			if (GetRect().Contains(p) || labelBut->GetRect().Contains(p))
-#endif
-			{
-				m_focused = TRUE;
-
-				if (!labelBut->GetFocused())
-					labelBut->SetFocused(TRUE);
-			}
-			else
-			{
-				m_focused = FALSE;
-
-				if (labelBut->GetFocused())
-					labelBut->SetFocused(FALSE);
-			}
-		}
-
-		wxCustomButton::Paint(dc);
-	}
-};
-
-// ==========================================================================
-// MenuLabelButton
-// ==========================================================================
-
-class MenuLabelButton : public wxCustomButton
-{
-public:
-	MenuLabelButton( wxWindow* parent, wxWindowID id,
-	                 const wxString &label,
-	                 const wxBitmap &bitmap,
-	                 long style ) : wxCustomButton()
-	{
-		Create(parent, id, label, bitmap, wxDefaultPosition, wxDefaultSize, style);
-	}
-
-	virtual void Paint( wxDC &dc )
-	{
-		wxCustomButton *dropBut = ((wxMenuButton*)GetParent())->GetDropDownButton();
-
-		// pretend that both buttons have focus (for flat style)
-		if (dropBut)
-		{
-			wxPoint p = GetParent()->ScreenToClient(wxGetMousePosition());
-
-#if (wxMINOR_VERSION<8)
-			if (GetRect().Inside(p) || dropBut->GetRect().Inside(p))
-#else
-			if (GetRect().Contains(p) || dropBut->GetRect().Contains(p))
-#endif
-			{
-				m_focused = TRUE;
-
-				if (!dropBut->GetFocused())
-					dropBut->SetFocused(TRUE);
-			}
-			else
-			{
-				m_focused = FALSE;
-
-				if (dropBut->GetFocused())
-					dropBut->SetFocused(FALSE);
-			}
-		}
-
-		wxCustomButton::Paint(dc);
-	}
-};
-
-// ==========================================================================
-// wxMenuButton
-// ==========================================================================
-
-IMPLEMENT_DYNAMIC_CLASS( wxMenuButton, wxControl )
-
-BEGIN_EVENT_TABLE(wxMenuButton,wxControl)
-	EVT_BUTTON(wxID_ANY, wxMenuButton::OnButton)
-
-#ifdef __WXMSW__
-	EVT_MENU(wxID_ANY, wxMenuButton::OnMenu)
-#endif
-END_EVENT_TABLE()
-
-wxMenuButton::~wxMenuButton()
-{
-	AssignMenu(NULL, TRUE);
-}
-
-void wxMenuButton::Init()
-{
-	m_labelButton = NULL;
-	m_dropdownButton = NULL;
-	m_menu = NULL;
-	m_menu_static = FALSE;
-	m_style = 0;
-}
-
-bool wxMenuButton::Create( wxWindow* parent, wxWindowID id,
-                           const wxString &label,
-                           const wxBitmap &bitmap,
-                           const wxPoint& pos,
-                           const wxSize& size,
-                           long style,
-                           const wxValidator& val,
-                           const wxString& name)
-{
-	m_style = style;
-
-	long flat = style & wxMENUBUT_FLAT;
-
-	wxControl::Create(parent,id,pos,size,wxNO_BORDER|wxCLIP_CHILDREN,val,name);
-	wxControl::SetLabel(label);
-	SetBackgroundColour(parent->GetBackgroundColour());
-	SetForegroundColour(parent->GetForegroundColour());
-	SetFont(parent->GetFont());
-
-	m_labelButton = new MenuLabelButton(this, id, label, bitmap, wxCUSTBUT_BUTTON|flat);
-	m_dropdownButton = new MenuDropButton(this, IDD_DROPDOWN_BUTTON, wxCUSTBUT_BUTTON|flat);
-
-	wxSize bestSize = DoGetBestSize();
-	SetSize( wxSize(size.x < 0 ? bestSize.x : size.x,
-	                size.y < 0 ? bestSize.y : size.y) );
-
-#if (wxMINOR_VERSION<8)
-	SetBestSize(GetSize());
-#else
-	SetInitialSize(GetSize());
-#endif
-
-	return TRUE;
-}
-
-#ifdef __WXMSW__
-// FIXME - I think there was a patch to fix this
-void wxMenuButton::OnMenu( wxCommandEvent &event )
-{
-	event.Skip();
-	wxMenuItem *mi = m_menu->FindItem(event.GetId());
-	if (mi && (mi->GetKind() == wxITEM_RADIO))
-		m_menu->Check(event.GetId(), TRUE);
-}
-#endif // __WXMSW__
-
-void wxMenuButton::OnButton( wxCommandEvent &event)
-{
-	int win_id = event.GetId();
-
-	if (win_id == IDD_DROPDOWN_BUTTON)
-	{
-		wxNotifyEvent mevent(wxEVT_MENUBUTTON_OPEN, GetId());
-		mevent.SetEventObject(this);
-		if (GetEventHandler()->ProcessEvent(mevent) && !mevent.IsAllowed())
-			return;
-
-		if (!m_menu)
-			return;
-
-		PopupMenu(m_menu, wxPoint(0, GetSize().y));
-
-		m_labelButton->Refresh(FALSE);
-		m_dropdownButton->Refresh(FALSE);
-	}
-	else if (win_id == m_labelButton->GetId())
-	{
-
-		wxCommandEvent cevent(wxEVT_COMMAND_MENU_SELECTED, win_id);
-		cevent.SetEventObject(this);
-		cevent.SetId(win_id);
-		GetParent()->GetEventHandler()->ProcessEvent(cevent);
-
-		if (!m_menu) return;
-
-		const wxMenuItemList &items = m_menu->GetMenuItems();
-		int first_radio_id = -1;
-		int checked_id = -1;
-		bool check_next = FALSE;
-
-		// find the next available radio item to check
-		for (wxMenuItemList::Node *node = items.GetFirst(); node; node = node->GetNext())
-		{
-			wxMenuItem *mi = (wxMenuItem*)node->GetData();
-			if (mi && (mi->GetKind() == wxITEM_RADIO))
-			{
-				if (first_radio_id == -1)
-					first_radio_id = mi->GetId();
-
-				if (check_next)
-				{
-					check_next = FALSE;
-					checked_id = mi->GetId();
-					break;
-				}
-				else if (mi->IsChecked())
-					check_next = TRUE;
-			}
-		}
-		// the last item was checked, go back to the first
-		if (check_next && (first_radio_id != -1))
-			checked_id = first_radio_id;
-
-		if (checked_id != -1)
-		{
-			m_menu->Check(checked_id, TRUE);
-
-			wxCommandEvent mevent( wxEVT_COMMAND_MENU_SELECTED, checked_id);
-			mevent.SetEventObject( m_menu );
-			mevent.SetInt(1);
-			GetEventHandler()->ProcessEvent(mevent);
-		}
-	}
-}
-
-int wxMenuButton::GetSelection() const
-{
-	wxCHECK_MSG(m_menu != NULL, wxNOT_FOUND, wxT("No attached menu in wxMenuButton::GetSelection"));
-
-	const wxMenuItemList &items = m_menu->GetMenuItems();
-
-	for (wxMenuItemList::Node *node = items.GetFirst(); node; node = node->GetNext())
-	{
-		wxMenuItem *mi = (wxMenuItem*)node->GetData();
-		if (mi && (mi->GetKind() == wxITEM_RADIO))
-		{
-			if (mi->IsChecked())
-				return mi->GetId();
-		}
-	}
-
-	return wxNOT_FOUND;
-}
-
-void wxMenuButton::AssignMenu(wxMenu *menu, bool static_menu)
-{
-	if (!m_menu_static && m_menu)
-		delete m_menu;
-
-	m_menu = menu;
-	m_menu_static = static_menu;
-}
-
-void wxMenuButton::SetToolTip(const wxString &tip)
-{
-	wxWindow::SetToolTip(tip);
-	((wxWindow*)m_labelButton)->SetToolTip(tip);
-	((wxWindow*)m_dropdownButton)->SetToolTip(tip);
-}
-void wxMenuButton::SetToolTip(wxToolTip *tip)
-{
-	wxWindow::SetToolTip(tip);
-	((wxWindow*)m_labelButton)->SetToolTip(tip);
-	((wxWindow*)m_dropdownButton)->SetToolTip(tip);
-}
-
-void wxMenuButton::DoSetSize(int x, int y, int width, int height, int sizeFlags)
-{
-	wxSize curSize( GetSize() );
-	wxSize bestSize( DoGetBestSize() );
-
-	if (width == -1)
-		width = curSize.GetWidth();
-	if (width < 10)
-		width = bestSize.GetWidth();
-
-	if (height == -1)
-		height = curSize.GetHeight();
-	if (height < 5)
-		height = bestSize.GetHeight();
-
-	wxWindow::DoSetSize(x, y, width, height, sizeFlags);
-
-	if (m_labelButton)
-		m_labelButton->SetSize(0, 0, width - wxMENUBUTTON_DROP_WIDTH, height);
-	if (m_dropdownButton)
-		m_dropdownButton->SetSize(width-wxMENUBUTTON_DROP_WIDTH, 0, wxMENUBUTTON_DROP_WIDTH, height);
-}
-
-wxSize wxMenuButton::DoGetBestSize()
-{
-	if (!m_labelButton || !m_dropdownButton)
-		return wxSize(wxMENUBUTTON_DROP_WIDTH+wxMENUBUTTON_DROP_HEIGHT, wxMENUBUTTON_DROP_HEIGHT);
-
-	wxSize size = m_labelButton->GetBestSize();
-	size.x += wxMENUBUTTON_DROP_WIDTH;
-	return size;
-}

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/osmo4_wx/menubtn.h Deleted

@@ -1,356 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wxMenuButton
-// Purpose:     A button with a dropdown wxMenu
-// Author:      John Labenski
-// Modified by:
-// Created:     11/05/2002
-// Copyright:   (c) John Labenski
-// Licence:     wxWidgets licence
-/////////////////////////////////////////////////////////////////////////////
-
-/*
-
-wxMenuButton is a button that drops down an assigned wxMenu
-
-Create the button with either a text or bitmap label.
-    Create a new wxMenu and call AssignMenu and thats it. When you press the
-    dropdown button the menu appears. When you press the label button the next
-    wxITEM_RADIO (ie wxMenuItem::GetKind) in the menu is selected round robin.
-    If there are no radio items then it really just acts like a menubar, though
-    this is probably not too useful. The events sent in this case are EVT_MENUs
-    either generated by the menu when you click on it or created when you click
-    on the label to select the next radio item.
-*/
-
-#ifndef _WX_MENUBTN_H_
-#define _WX_MENUBTN_H_
-
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "menubtn.h"
-#endif
-
-class wxMenu;
-class wxBitmap;
-class wxCustomButton;
-
-//-----------------------------------------------------------------------------
-// wxCustomButton styles
-//-----------------------------------------------------------------------------
-
-enum wxCustomButton_Style
-{
-	// Position of the label, use only one
-	wxCUSTBUT_LEFT           = 0x0001,
-	wxCUSTBUT_RIGHT          = 0x0002,
-	wxCUSTBUT_TOP            = 0x0004,
-	wxCUSTBUT_BOTTOM         = 0x0008,
-	// Button style, use only one
-	wxCUSTBUT_NOTOGGLE       = 0x0100,
-	wxCUSTBUT_BUTTON         = 0x0200,
-	wxCUSTBUT_TOGGLE         = 0x0400,
-	wxCUSTBUT_BUT_DCLICK_TOG = 0x0800,
-	wxCUSTBUT_TOG_DCLICK_BUT = 0x1000,
-	// drawing styles
-	wxCUSTBUT_FLAT           = 0x2000 // flat, mouseover raises if not depressed
-};
-
-//-----------------------------------------------------------------------------
-// wxCustomButton
-//-----------------------------------------------------------------------------
-
-class WXDLLEXPORT wxCustomButton : public wxControl
-{
-public:
-
-	wxCustomButton() : wxControl() {
-		Init();
-	}
-
-	// wxToggleButton or wxButton compatible constructor (also wxTextCtrl)
-	wxCustomButton(wxWindow* parent, wxWindowID id,
-	               const wxString& label,
-	               const wxPoint& pos = wxDefaultPosition,
-	               const wxSize& size = wxDefaultSize,
-	               long style = wxCUSTBUT_TOGGLE,
-	               const wxValidator& val = wxDefaultValidator,
-	               const wxString& name = wxT("wxCustomButton"))
-		: wxControl()
-	{
-		Init();
-		Create(parent,id,label,wxNullBitmap,pos,size,style,val,name);
-	}
-
-	// wxBitmapButton compatible constructor
-	wxCustomButton(wxWindow *parent, wxWindowID id,
-	               const wxBitmap& bitmap,
-	               const wxPoint& pos = wxDefaultPosition,
-	               const wxSize& size = wxDefaultSize,
-	               long style = wxCUSTBUT_TOGGLE,
-	               const wxValidator& val = wxDefaultValidator,
-	               const wxString& name = wxT("wxCustomButton"))
-		: wxControl()
-	{
-		Init();
-		Create(parent,id,wxEmptyString,bitmap,pos,size,style,val,name);
-	}
-
-	// Native constructor
-	wxCustomButton(wxWindow *parent, wxWindowID id,
-	               const wxString& label, const wxBitmap& bitmap,
-	               const wxPoint& pos = wxDefaultPosition,
-	               const wxSize& size = wxDefaultSize,
-	               long style = wxCUSTBUT_TOGGLE|wxCUSTBUT_BOTTOM,
-	               const wxValidator& val = wxDefaultValidator,
-	               const wxString& name = wxT("wxCustomButton"))
-		: wxControl()
-	{
-		Init();
-		Create(parent,id,label,bitmap,pos,size,style,val,name);
-	}
-
-	virtual ~wxCustomButton();
-
-	bool Create(wxWindow* parent,
-	            wxWindowID id,
-	            const wxString& label,
-	            const wxBitmap &bitmap,
-	            const wxPoint& pos = wxDefaultPosition,
-	            const wxSize& size = wxDefaultSize,
-	            long style = 0,
-	            const wxValidator& val = wxDefaultValidator,
-	            const wxString& name = wxT("wxCustomButton"));
-
-	bool GetValue() const {
-		return m_down%2 != 0;
-	}
-	void SetValue( bool depressed );
-
-	// Use combinations of wxCustomButton_Style(s)
-	long GetButtonStyle() const {
-		return m_button_style;
-	}
-	bool SetButtonStyle( long style );
-
-	// Set the text label, wxEmptyString for none
-	void SetLabel( const wxString &label );
-
-	// set the bitmaps, ONLY this Label bitmap is used for calculating control size
-	//   all bitmaps will be centered accordingly in any case
-	//   call SetSet(GetBestSize()) if you change their size and want the control to resize appropriately
-	void SetBitmapLabel(const wxBitmap& bitmap);
-	void SetBitmapSelected(const wxBitmap& sel)      {
-		m_bmpSelected = sel;
-		CalcLayout(TRUE);
-	};
-	void SetBitmapFocus(const wxBitmap& focus)       {
-		m_bmpFocus = focus;
-		CalcLayout(TRUE);
-	};
-	void SetBitmapDisabled(const wxBitmap& disabled) {
-		m_bmpDisabled = disabled;
-		CalcLayout(TRUE);
-	};
-	// wxBitmapButton compatibility
-	void SetLabel(const wxBitmap& bitmap)            {
-		SetBitmapLabel(bitmap);
-	}
-
-	// retrieve the bitmaps
-	const wxBitmap& GetBitmapLabel()    const {
-		return m_bmpLabel;
-	}
-	const wxBitmap& GetBitmapSelected() const {
-		return m_bmpSelected;
-	}
-	const wxBitmap& GetBitmapFocus()    const {
-		return m_bmpFocus;
-	}
-	const wxBitmap& GetBitmapDisabled() const {
-		return m_bmpDisabled;
-	}
-
-	// Creates a "disabled" bitmap by dithering it with the background colour
-	wxBitmap CreateBitmapDisabled(const wxBitmap &bitmap) const;
-
-	// set/get the margins (in pixels) around the label and bitmap
-	//    if fit = TRUE then resize the button to fit
-	void SetMargins(const wxSize &margin, bool fit = FALSE);
-
-	// set/get the margins around the text label
-	//    the inter bitmap/label margin is the max of either margin, not the sum
-	void SetLabelMargin(const wxSize &margin, bool fit = FALSE);
-	wxSize GetLabelMargin() const {
-		return m_labelMargin;
-	}
-	// set/get the margins around the bitmap
-	//    the inter bitmap/label margin is the max of either margin, not the sum
-	void SetBitmapMargin(const wxSize &margin, bool fit = FALSE);
-	wxSize GetBitmapMargin() const {
-		return m_bitmapMargin;
-	}
-
-	// can be used to activate the focused behavior (see MenuButton)
-	void SetFocused(bool focused) {
-		m_focused = focused;
-		Refresh(FALSE);
-	}
-	bool GetFocused() const {
-		return m_focused;
-	}
-
-protected:
-	void OnPaint(wxPaintEvent &event);
-	void Redraw();
-	virtual void Paint( wxDC &dc );
-
-	virtual wxSize DoGetBestSize() const;
-
-	virtual void SendEvent();
-
-	void OnMouseEvents(wxMouseEvent &event);
-
-	void OnSize( wxSizeEvent &event );
-
-	virtual void CalcLayout(bool refresh);
-
-	long m_down;         // toggle state if m_down%2 then depressed
-	bool m_focused;     // mouse in window
-	long m_button_style;
-
-	// the bitmaps for various states
-	wxBitmap m_bmpLabel,
-	         m_bmpSelected,
-	         m_bmpFocus,
-	         m_bmpDisabled;
-
-	// the margins around the label/bitmap
-	wxSize m_labelMargin,
-	       m_bitmapMargin;
-
-	wxPoint m_bitmapPos,
-	        m_labelPos;
-
-	wxTimer *m_timer;
-
-	wxEventType m_eventType;     // store the mouse event type
-
-private:
-	void Init();
-	DECLARE_DYNAMIC_CLASS(wxCustomButton)
-	DECLARE_EVENT_TABLE()
-};
-
-//-----------------------------------------------------------------------------
-// wxMenuButton styles
-//-----------------------------------------------------------------------------
-
-#define wxMENUBUTTON_DROP_WIDTH  10
-#define wxMENUBUTTON_DROP_HEIGHT 22
-
-enum wxMenuButton_Styles
-{
-	wxMENUBUT_FLAT = wxCUSTBUT_FLAT
-};
-
-//-----------------------------------------------------------------------------
-// wxMenuButton
-//-----------------------------------------------------------------------------
-
-class wxMenuButton : public wxControl
-{
-public:
-
-	wxMenuButton() : wxControl() {
-		Init();
-	}
-
-	// Use this constructor if you need one compatible with a wxBitmapButton
-	//   setup the button later with AssignMenu
-	wxMenuButton( wxWindow* parent, wxWindowID id,
-	              const wxBitmap &bitmap,
-	              const wxPoint& pos = wxDefaultPosition,
-	              const wxSize& size = wxDefaultSize,
-	              long style = 0,
-	              const wxValidator& val = wxDefaultValidator,
-	              const wxString& name = wxT("wxMenuButton"))
-		: wxControl()
-	{
-		Init();
-		Create(parent,id,wxEmptyString,bitmap,pos,size,style,val,name);
-	}
-
-	virtual ~wxMenuButton();
-
-	bool Create( wxWindow* parent,
-	             wxWindowID id,
-	             const wxString &label,
-	             const wxBitmap &bitmap,
-	             const wxPoint& pos = wxDefaultPosition,
-	             const wxSize& size = wxDefaultSize,
-	             long style = wxNO_BORDER,
-	             const wxValidator& val = wxDefaultValidator,
-	             const wxString& name = wxT("wxMenuButton"));
-
-	// Gets the id of the first selected radio item or wxNOT_FOUND (-1) if none
-	int GetSelection() const;
-
-	// This menu will be displayed when the dropdown button is pressed.
-	//   if static_menu is FALSE it will be deleted when the buttton is destroyed.
-	void AssignMenu(wxMenu *menu, bool static_menu = FALSE);
-
-	wxMenu *GetMenu() const {
-		return m_menu;
-	}
-
-	// get a pointer to the label button, for turning it into a toggle perhaps
-	wxCustomButton *GetLabelButton() const {
-		return m_labelButton;
-	}
-	wxCustomButton *GetDropDownButton() const {
-		return m_dropdownButton;
-	}
-
-	void SetToolTip(const wxString &tip);
-	void SetToolTip(wxToolTip *tip);
-
-protected:
-	void OnButton(wxCommandEvent &event);
-
-	virtual void DoSetSize(int x, int y, int width, int height,
-	                       int sizeFlags = wxSIZE_AUTO);
-
-	virtual wxSize DoGetBestSize();
-
-// FIXME! - in MSW the radio items don't check themselves
-#ifdef __WXMSW__
-	void OnMenu( wxCommandEvent &event );
-#endif
-
-	wxCustomButton *m_labelButton;
-	wxCustomButton *m_dropdownButton;
-
-	wxMenu *m_menu;
-	bool m_menu_static;
-	long m_style;
-
-private:
-	void Init();
-	DECLARE_DYNAMIC_CLASS(wxMenuButton)
-	DECLARE_EVENT_TABLE()
-};
-
-//-----------------------------------------------------------------------------
-// wxMenuButtonEvents
-//
-// EVT_MENUBUTTON_OPEN(id, fn) - menu is about to be opened, (dis)(en)able items
-//                               or call Veto() to stop menu from popping up
-//                               this is a wxNotifyEvent
-//-----------------------------------------------------------------------------
-
-BEGIN_DECLARE_EVENT_TYPES()
-DECLARE_LOCAL_EVENT_TYPE( wxEVT_MENUBUTTON_OPEN, 0 )
-END_DECLARE_EVENT_TYPES()
-
-#define EVT_MENUBUTTON_OPEN(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_MENUBUTTON_OPEN, id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction) & fn, (wxObject *) NULL ),
-
-#endif  // _WX_MENUBTN_H_

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/osmo4_wx/osmo4.ico Deleted

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/osmo4_wx/osmo4.xpm Deleted

@@ -1,301 +0,0 @@
-/* XPM */
-static const char * osmo4 = {
-"32 32 266 2",
-"  	c None",
-". 	c #990909",
-"+ 	c #A10505",
-"@ 	c #AB0404",
-"# 	c #AF0202",
-"$ 	c #B10303",
-"% 	c #AE0202",
-"& 	c #A90505",
-"* 	c #A10606",
-"= 	c #990E0E",
-"- 	c #990D0D",
-"; 	c #A80303",
-"> 	c #BD0000",
-", 	c #D40000",
-"' 	c #DE0000",
-") 	c #E20000",
-"! 	c #E10000",
-"~ 	c #DC0000",
-"{ 	c #CD0000",
-" 	c #B80101",
-"^ 	c #A40909",
-"/ 	c #A20505",
-"( 	c #BD0101",
-"_ 	c #E00000",
-": 	c #CB0000",
-"< 	c #A80000",
-" 	c #7E0101",
-"} 	c #6B0202",
-"| 	c #670202",
-"1 	c #720202",
-"2 	c #920000",
-"3 	c #B70000",
-"4 	c #D70000",
-"5 	c #B80303",
-"6 	c #9D0B0B",
-"7 	c #980909",
-"8 	c #B00202",
-"9 	c #DB0000",
-"0 	c #B50909",
-"a 	c #8A1313",
-"b 	c #1C0505",
-"c 	c #070505",
-"d 	c #080808",
-"e 	c #0A0A0A",
-"f 	c #090909",
-"g 	c #070707",
-"h 	c #0C0404",
-"i 	c #5B1414",
-"j 	c #A70F0F",
-"k 	c #CC0303",
-"l 	c #CC0000",
-"m 	c #AB0505",
-"n 	c #950D0D",
-"o 	c #B60101",
-"p 	c #DD0000",
-"q 	c #CF0202",
-"r 	c #9C1414",
-"s 	c #141414",
-"t 	c #0C0C0C",
-"u 	c #0F0F0F",
-"v 	c #111111",
-"w 	c #101010",
-"x 	c #0E0E0E",
-"y 	c #B70707",
-"z 	c #DF0000",
-"A 	c #D50000",
-"B 	c #A90606",
-"C 	c #970E0E",
-"D 	c #B30202",
-"E 	c #C50505",
-"F 	c #812121",
-"G 	c #191919",
-"H 	c #161616",
-"I 	c #181818",
-"J 	c #171717",
-"K 	c #151515",
-"L 	c #AF0A0A",
-"M 	c #D70101",
-"N 	c #D60000",
-"O 	c #AD0606",
-"P 	c #AA0303",
-"Q 	c #DA0000",
-"R 	c #C80505",
-"S 	c #8E1E1E",
-"T 	c #1D1D1D",
-"U 	c #1F1F1F",
-"V 	c #202020",
-"W 	c #B00909",
-"X 	c #CE0000",
-"Y 	c #9F0A0A",
-"Z 	c #9B0808",
-"` 	c #D20000",
-" .	c #D80101",
-"..	c #8B1B1B",
-"+.	c #2D2D2D",
-"@.	c #272727",
-"#.	c #262626",
-"$.	c #252525",
-"%.	c #BB0606",
-"&.	c #BB0303",
-"*.	c #AF0303",
-"=.	c #AF0B0B",
-"-.	c #303030",
-";.	c #2B2B2B",
-">.	c #323232",
-",.	c #CD0202",
-"'.	c #A60A0A",
-").	c #9E0909",
-"!.	c #CF0000",
-"~.	c #CE0404",
-"{.	c #292929",
-".	c #B10808",
-"^.	c #A70303",
-"/.	c #B60A0A",
-"(.	c #961010",
-"_.	c #B90000",
-":.	c #9C1212",
-"<.	c #1A1A1A",
-".	c #222222",
-"}.	c #1C1C1C",
-"|.	c #C20202",
-"1.	c #A30606",
-"2.	c #C60000",
-"3.	c #2A2A2A",
-"4.	c #3B3B3B",
-"5.	c #444444",
-"6.	c #434343",
-"7.	c #3A3A3A",
-"8.	c #1E1E1E",
-"9.	c #131313",
-"0.	c #BB0A0A",
-"a.	c #AD0707",
-"b.	c #9A1515",
-"c.	c #D30000",
-"d.	c #353535",
-"e.	c #484848",
-"f.	c #5F5F5F",
-"g.	c #6C6C6C",
-"h.	c #646464",
-"i.	c #565656",
-"j.	c #343434",
-"k.	c #212121",
-"l.	c #121212",
-"m.	c #B30505",
-"n.	c #B10404",
-"o.	c #9A1111",
-"p.	c #424242",
-"q.	c #555555",
-"r.	c #6B6B6B",
-"s.	c #757575",
-"t.	c #6E6E6E",
-"u.	c #606060",
-"v.	c #4E4E4E",
-"w.	c #3F3F3F",
-"x.	c #2C2C2C",
-"y.	c #B10909",
-"z.	c #B60707",
-"A.	c #9B1515",
-"B.	c #D00000",
-"C.	c #494949",
-"D.	c #595959",
-"E.	c #676767",
-"F.	c #696969",
-"G.	c #616161",
-"H.	c #525252",
-"I.	c #454545",
-"J.	c #B20707",
-"K.	c #363636",
-"L.	c #626262",
-"M.	c #5B5B5B",
-"N.	c #505050",
-"O.	c #282828",
-"P.	c #B80B0B",
-"Q.	c #AC0707",
-"R.	c #AA1111",
-"S.	c #0D0D0D",
-"T.	c #585858",
-"U.	c #545454",
-"V.	c #4B4B4B",
-"W.	c #BF0303",
-"X.	c #9F0B0B",
-"Y.	c #B90707",
-"Z.	c #242424",
-"`.	c #313131",
-" +	c #3E3E3E",
-".+	c #474747",
-"++	c #4D4D4D",
-"@+	c #4F4F4F",
-"#+	c #4C4C4C",
-"$+	c #3D3D3D",
-"%+	c #D90000",
-"&+	c #8E1010",
-"*+	c #A00808",
-"=+	c #D00303",
-"-+	c #3C3C3C",
-";+	c #0B0B0B",
-">+	c #AE0808",
-",+	c #C10101",
-"'+	c #BB0202",
-")+	c #BA0A0A",
-"!+	c #1B1B1B",
-"~+	c #2F2F2F",
-"{+	c #C10303",
-"+	c #A10A0A",
-"^+	c #9F0707",
-"/+	c #D80000",
-"(+	c #BE0303",
-"_+	c #821C1C",
-":+	c #C20404",
-"<+	c #232323",
-"+	c #A90C0C",
-"}+	c #970C0C",
-"|+	c #960E0E",
-"1+	c #BE0101",
-"2+	c #C60505",
-"3+	c #131212",
-"4+	c #B00B0B",
-"5+	c #CE0101",
-"6+	c #A80707",
-"7+	c #990B0B",
-"8+	c #C40404",
-"9+	c #AD0909",
-"0+	c #D00101",
-"a+	c #B00505",
-"b+	c #7B1C1C",
-"c+	c #960C0C",
-"d+	c #BC0202",
-"e+	c #BC0808",
-"f+	c #962525",
-"g+	c #482E2E",
-"h+	c #1E1616",
-"i+	c #141010",
-"j+	c #2F2020",
-"k+	c #703636",
-"l+	c #A81212",
-"m+	c #A90707",
-"n+	c #8E1313",
-"o+	c #D30606",
-"p+	c #B91E1E",
-"q+	c #901919",
-"r+	c #661010",
-"s+	c #540F0F",
-"t+	c #4F0D0D",
-"u+	c #5A0F0F",
-"v+	c #7A1515",
-"w+	c #A21E1E",
-"x+	c #C51212",
-"y+	c #D60101",
-"z+	c #980D0D",
-"A+	c #930C0C",
-"B+	c #B30404",
-"C+	c #C60202",
-"D+	c #7B1919",
-"E+	c #8C1515",
-"F+	c #9F0909",
-"G+	c #B20303",
-"H+	c #C30000",
-"I+	c #CA0000",
-"J+	c #C90000",
-"K+	c #BC0101",
-"L+	c #AA0505",
-"M+	c #8F1111",
-"N+	c #7F1E1E",
-"O+	c #732626",
-"P+	c #762A2A",
-"Q+	c #6E2828",
-"                                                                ",
-"                        . + @ # $ % & * =                       ",
-"                  - ; > , ' ) ) ! ) ! ~ {  ^                   ",
-"                / ( ' _ : <  } | 1 2 3 4 ) , 5 6               ",
-"            7 8 9 ' 0 a b c d e e f g h i j k ) l m             ",
-"          n o p q r     s t u v v w t x       y z A B           ",
-"        C D ) E F         G H I G J K           L M N O         ",
-"        P Q R S             T U U T V             W ' X Y       ",
-"      Z `  ...              +.@.#.$.                %.! &.      ",
-"      *.) =.                  -.;.>.                  ,.4 '.    ",
-"    ).!.~.                      {.                    .) (     ",
-"    ^.z /.                      $.                      A ` (.  ",
-"    _.! :.              K K <.V .}.K K                 |.z 1.  ",
-"    2.9               v <.3.4.5.6.7.;.8.9.J             0.) a.  ",
-"  b.!.c.            w }.d.e.f.g.h.i.5.j.k.l.            m._ n.  ",
-"  o.` !.          u J 3.p.q.r.s.t.u.v.w.x.T w           y._ z.  ",
-"  A.B.`           u k.j.C.D.E.g.F.G.H.I.j.$.9.l.        m._ J.  ",
-"    : 4         s v #.K.C.q.u.h.L.M.N.I.K.O.J x         P.) Q.  ",
-"    > z R.      S.9.#.d.5.v.i.D.T.U.V.p.j.{.G t         W._ X.  ",
-"    % ) Y.      l.9.Z.`. +.+++N.@+#+I.$+>.@.I t         { %+&+  ",
-"    *+, =+      x w V ;.K.$+6.I.I.p.-+K.;..H ;+      >+z ,+    ",
-"      '+_ )+    x S.!+Z.~+d.7.-+-+7.d.~+#.8.9.;+      {+_ +    ",
-"      ^+/+,       e s }.$.;.~+`.`.-.;.#.U J S.w     z.' (+_+    ",
-"         ) :+    t S.K T .@.O.O.@.<+U I v ;+    +` ~ }+      ",
-"        |+1+) 2+    e t 9.I }.T 8.}.G K u e 3+  4+5+' 6+        ",
-"          7+l ) 8+    e ;+u 9.K K 9.v S.f w   9+0+) a+b+        ",
-"            c+d+) N e+f+g+h+;+f e f i+j+k+l+|.~ /+m+            ",
-"              n+D N ! o+p+q+r+s+t+u+v+w+x+y+! X z+              ",
-"                  A+B+X _ ! ~ /+N %+' ) ~ C+Y D+                ",
-"                      E+F+G+H+I+l J+K+L+M+N+                    ",
-"                              O+P+Q+                            ",
-"                                                                "};

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/osmo4_wx/playlist.xpm Deleted

@@ -1,158 +0,0 @@
-/* XPM */
-static const char* pl_open = {
-"16 16 5 1",
-"  c #000000",
-"! c #808000",
-"# c #C0C0C0",
-"$ c #FFFF00",
-"% c #FFFFFF",
-"################",
-"################",
-"#########   ####",
-"######## ### # #",
-"#############  #",
-"#   ########   #",
-" %$%       #####",
-" $%$%$%$%$ #####",
-" %$%$%$%$% #####",
-" $%$%          #",
-" %$% !!!!!!!!! #",
-" $% !!!!!!!!! ##",
-" % !!!!!!!!! ###",
-"  !!!!!!!!! ####",
-"           #####",
-"################"};
-
-/* XPM */
-static const char* pl_save = {
-"16 16 3 1",
-"  c #000000",
-"! c #808000",
-"# c #C0C0C0",
-"################",
-"#              #",
-"# ! ######## # #",
-"# ! ########   #",
-"# ! ######## ! #",
-"# ! ######## ! #",
-"# ! ######## ! #",
-"# ! ######## ! #",
-"# !!        !! #",
-"# !!!!!!!!!!!! #",
-"# !!         ! #",
-"# !!      ## ! #",
-"# !!      ## ! #",
-"# !!      ## ! #",
-"##             #",
-"################"};
-
-/* XPM */
-static const char* pl_add = {
-"16 16 2 1",
-"  c #000000",
-"! c #C0C0C0",
-"!!!!!!!!!!!!!!!!",
-"!!!!!!!!!!!!!!!!",
-"!!!!!!!!!!!!!!!!",
-"!!!!!!   !!!!!!!",
-"!!!!!!   !!!!!!!",
-"!!!!!!   !!!!!!!",
-"!!!!!!   !!!!!!!",
-"!!           !!!",
-"!!           !!!",
-"!!           !!!",
-"!!!!!!   !!!!!!!",
-"!!!!!!   !!!!!!!",
-"!!!!!!   !!!!!!!",
-"!!!!!!   !!!!!!!",
-"!!!!!!!!!!!!!!!!",
-"!!!!!!!!!!!!!!!!"};
-
-/* XPM */
-static const char* pl_rem = {
-"16 16 2 1",
-"  c #000000",
-"! c #C0C0C0",
-"!!!!!!!!!!!!!!!!",
-"!!!!!!!!!!!!!!!!",
-"!!!!!!!!!!!!!!!!",
-"!!!!!!!!!!!!!!!!",
-"!!!!!!!!!!!!!!!!",
-"!!!!!!!!!!!!!!!!",
-"!!!!!!!!!!!!!!!!",
-"!!           !!!",
-"!!           !!!",
-"!!           !!!",
-"!!!!!!!!!!!!!!!!",
-"!!!!!!!!!!!!!!!!",
-"!!!!!!!!!!!!!!!!",
-"!!!!!!!!!!!!!!!!",
-"!!!!!!!!!!!!!!!!",
-"!!!!!!!!!!!!!!!!"};
-
-/* XPM */
-static const char* pl_up = {
-"16 16 2 1",
-"  c #000000",
-"! c #C0C0C0",
-"!!!!!!!!!!!!!!!!",
-"!!!!!!!!!!!!!!!!",
-"!!!!!!!!!!!!!!!!",
-"!!!!!!! !!!!!!!!",
-"!!!!!!   !!!!!!!",
-"!!!!!     !!!!!!",
-"!!!!       !!!!!",
-"!!!         !!!!",
-"!!!!!!   !!!!!!!",
-"!!!!!!   !!!!!!!",
-"!!!!!!   !!!!!!!",
-"!!!!!!   !!!!!!!",
-"!!!!!!   !!!!!!!",
-"!!!!!!   !!!!!!!",
-"!!!!!!!!!!!!!!!!",
-"!!!!!!!!!!!!!!!!"};
-
-/* XPM */
-static const char* pl_down = {
-"16 16 2 1",
-"  c #000000",
-"! c #C0C0C0",
-"!!!!!!!!!!!!!!!!",
-"!!!!!!!!!!!!!!!!",
-"!!!!!!!!!!!!!!!!",
-"!!!!!!   !!!!!!!",
-"!!!!!!   !!!!!!!",
-"!!!!!!   !!!!!!!",
-"!!!!!!   !!!!!!!",
-"!!!!!!   !!!!!!!",
-"!!!!!!   !!!!!!!",
-"!!!         !!!!",
-"!!!!       !!!!!",
-"!!!!!     !!!!!!",
-"!!!!!!   !!!!!!!",
-"!!!!!!! !!!!!!!!",
-"!!!!!!!!!!!!!!!!",
-"!!!!!!!!!!!!!!!!"};
-
-/* XPM */
-static const char* pl_sort = {
-"16 16 2 1",
-"  c #000000",
-"! c #C0C0C0",
-"!!!!!!!!!!!!!!!!",
-"!!!!!!!!!!!!!!!!",
-"!!!!!!!!!!!!!!!!",
-"!!!!!!!!!!!!!!!!",
-"!!!! !!!!! !!!!!",
-"!!!! !!!!   !!!!",
-"!!!! !!!     !!!",
-"!!!! !!!!! !!!!!",
-"!!!! !!!!! !!!!!",
-"!!!! !!!!! !!!!!",
-"!!!! !!!!! !!!!!",
-"!!     !!! !!!!!",
-"!!!   !!!! !!!!!",
-"!!!! !!!!! !!!!!",
-"!!!!!!!!!!!!!!!!",
-"!!!!!!!!!!!!!!!!"};
-

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/osmo4_wx/resource.h Deleted

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/osmo4_wx/toolbar.xpm Deleted

@@ -1,254 +0,0 @@
-/* XPM */
-static const char* tool_open_file = {
-"16 16 2 1",
-"  c #000000",
-"! c none",
-"!!!!!!!!!!!!!!!!",
-"!!!!!!!!!!!!!!!!",
-"!!!!!!!!!!!!!!!!",
-"!!!!!!!!!!!!!!!!",
-"!!!!!!!  !!!!!!!",
-"!!!!!!    !!!!!!",
-"!!!!!      !!!!!",
-"!!!!        !!!!",
-"!!!          !!!",
-"!!            !!",
-"!!            !!",
-"!!!!!!!!!!!!!!!!",
-"!!            !!",
-"!!            !!",
-"!!!!!!!!!!!!!!!!",
-"!!!!!!!!!!!!!!!!"};
-
-/* XPM */
-static const char* tool_prev = {
-"16 16 3 1",
-"  c #000000",
-"! c none",
-"# c #FF0000",
-"!!!!!!!!!!!!!!!!",
-"!!!!!!!!!!!!!!!!",
-"!!!!!!!!!!!!!!!!",
-"!!!!!!!!!!!!  !!",
-"!!!!!!!!!!    !!",
-"!!!!!!!!   ## !!",
-"!!!!!!   #### !!",
-"!!!!   ###### !!",
-"!!!  ######## !!",
-"!!!!    ##### !!",
-"!!!!!!    ### !!",
-"!!!!!!!!    # !!",
-"!!!!!!!!!!    !!",
-"!!!!!!!!!!!!  !!",
-"!!!!!!!!!!!!!!!!",
-"!!!!!!!!!!!!!!!!"};
-
-/* XPM */
-static const char* tool_next = {
-"16 16 3 1",
-"  c #000000",
-"! c none",
-"# c #FF0000",
-"!!!!!!!!!!!!!!!!",
-"!!!!!!!!!!!!!!!!",
-"!!!!!!!!!!!!!!!!",
-"!!  !!!!!!!!!!!!",
-"!!    !!!!!!!!!!",
-"!! ##   !!!!!!!!",
-"!! ####   !!!!!!",
-"!! ######   !!!!",
-"!! ########  !!!",
-"!! ######   !!!!",
-"!! ####   !!!!!!",
-"!! ##   !!!!!!!!",
-"!!    !!!!!!!!!!",
-"!!  !!!!!!!!!!!!",
-"!!!!!!!!!!!!!!!!",
-"!!!!!!!!!!!!!!!!"};
-
-/* XPM */
-static const char* tool_play = {
-"16 16 2 1",
-"  c #000000",
-"! c none",
-"!!!!!!!!!!!!!!!!",
-"!!!!!!!!!!!!!!!!",
-"!!!!!!!!!!!!!!!!",
-"!!  !!!!!!!!!!!!",
-"!!    !!!!!!!!!!",
-"!!      !!!!!!!!",
-"!!        !!!!!!",
-"!!          !!!!",
-"!!            !!",
-"!!          !!!!",
-"!!        !!!!!!",
-"!!      !!!!!!!!",
-"!!    !!!!!!!!!!",
-"!!  !!!!!!!!!!!!",
-"!!!!!!!!!!!!!!!!",
-"!!!!!!!!!!!!!!!!"};
-
-/* XPM */
-static const char* tool_pause = {
-"16 16 3 1",
-"  c #000000",
-"! c #808080",
-"# c none",
-"################",
-"################",
-"################",
-"###   !##!   ###",
-"###   !##!   ###",
-"###   !##!   ###",
-"###   !##!   ###",
-"###   !##!   ###",
-"###   !##!   ###",
-"###   !##!   ###",
-"###   !##!   ###",
-"###   !##!   ###",
-"###   !##!   ###",
-"###   !##!   ###",
-"################",
-"################"};
-
-
-/* XPM */
-static const char* tool_step = {
-"16 16 2 1",
-"  c #000000",
-"! c none",
-"!!!!!!!!!!!!!!!!",
-"!!!!!!!!!!!!!!!!",
-"!!!!!!!!!!!!!!!!",
-"!!   !!!!!!!!!!!",
-"!!     !!!!!!!!!",
-"!!       !!!!!!!",
-"!!!!       !!!!!",
-"!!!!!!       !!!",
-"!!!!!!!!      !!",
-"!!!!!!       !!!",
-"!!!!       !!!!!",
-"!!       !!!!!!!",
-"!!     !!!!!!!!!",
-"!!   !!!!!!!!!!!",
-"!!!!!!!!!!!!!!!!",
-"!!!!!!!!!!!!!!!!"};
-
-
-/* XPM */
-static const char* tool_stop = {
-"16 16 2 1",
-"  c #000000",
-"! c none",
-"!!!!!!!!!!!!!!!!",
-"!!!!!!!!!!!!!!!!",
-"!!!!!!!!!!!!!!!!",
-"!!            !!",
-"!!            !!",
-"!!            !!",
-"!!            !!",
-"!!            !!",
-"!!            !!",
-"!!            !!",
-"!!            !!",
-"!!            !!",
-"!!            !!",
-"!!            !!",
-"!!!!!!!!!!!!!!!!",
-"!!!!!!!!!!!!!!!!"};
-
-/* XPM */
-static const char* tool_info = {
-"16 16 3 1",
-"  c #000000",
-"! c none",
-"# c #0000FF",
-"!!!!!!!!!!!!!!!!",
-"!!!!!      !!!!!",
-"!!!          !!!",
-"!!   ######   !!",
-"!  ####!!####  !",
-"!  ####!!####  !",
-"  ############  ",
-"  #####!!#####  ",
-" ######!!#####  ",
-"  #####!!#####  ",
-"  #####!!#####  ",
-"!  ####!!####  !",
-"!  #####!!###  !",
-"!!   ######   !!",
-"!!!          !!!",
-"!!!!!      !!!!!"};
-
-
-/* XPM */
-static const char* tool_config = {
-"16 16 3 1",
-"  c #000000",
-"! c #808080",
-"# c none",
-"################",
-"################",
-"##   ##   ######",
-"## ## # ## #  ##",
-"## ##          #",
-"## #!# ####### #",
-"## # #!# ## ## #",
-"## #!# #!# ! # #",
-"## # #!# ## ## #",
-"## #!# #!##### #",
-"## # #!# ## ## #",
-"## #!# #!# ! # #",
-"## # #!# ## ## #",
-"##             #",
-"################",
-"################"};
-
-/* XPM */
-static const char* tool_sw_2d = {
-"16 16 4 1",
-" 	c #FF0000",
-".	c #C0C0C0",
-"+	c #0000FF",
-"@	c #000000",
-" .............. ",
-". ..++..++++.. .",
-".. +..+..+..+ ..",
-"... ..+..+.. ...",
-".... +...+. +...",
-"...+. +..+ .+...",
-"...+++ .+ ++....",
-".......  .......",
-"....@@ @@ @.....",
-"...@. .@.@ .....",
-"...@ ....@. ....",
-"... ..@@.@.. ...",
-".. @...@.@.@. ..",
-". ..@@@@@@@@.. .",
-" .............. ",
-"................"};
-
-/* XPM */
-static const char* tool_sw_3d = {
-"16 16 4 1",
-" 	c #FFFFFF",
-".	c #C0C0C0",
-"+	c #0000FF",
-"@	c #000000",
-"                ",
-"................",
-"....++..++++....",
-"...+..+..+..+...",
-"......+..+..+...",
-"....++...+..+...",
-"...+..+..+..+...",
-"...++++.++++....",
-"................",
-"....@@@@@@@.....",
-"...@...@.@......",
-"...@.....@......",
-"...@..@@.@......",
-"...@...@.@.@....",
-"....@@@@@@@@....",
-"................"};
-

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/osmo4_wx/wxGPACControl.cpp Deleted

@@ -1,1051 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2012
- *					All rights reserved
- *
- *  This file is part of GPAC / Osmo4 wxWidgets GUI
- *
- *  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 "wxOsmo4.h"
-#include <gpac/options.h>
-#include <gpac/modules/codec.h>
-#include <gpac/modules/raster2d.h>
-#include <gpac/modules/font.h>
-#include <gpac/modules/audio_out.h>
-#include <gpac/modules/video_out.h>
-
-#include <gpac/iso639.h>
-
-#include "wxGPACControl.h"
-
-
-#define NUM_RATES 11
-static const char *BIFSRates11 =
-{
-	"5.0",
-	"7.5",
-	"10.0",
-	"12.5",
-	"15.0",
-	"24.0",
-	"25.0",
-	"30.0",
-	"50.0",
-	"60.0",
-	"100.0"
-};
-
-void wxGPACControl::SetYUVLabel()
-{
-	u32 yuv_format = gf_term_get_option(m_pApp->m_term, GF_OPT_YUV_FORMAT);
-	if (!yuv_format) {
-		m_yuvtxt->SetLabel(wxT("(No YUV used)"));
-	} else {
-		char str100;
-		sprintf(str, "(%s used)", gf_4cc_to_str(yuv_format));
-		m_yuvtxt->SetLabel(wxString(str, wxConvUTF8) );
-	}
-}
-
-wxGPACControl::wxGPACControl(wxWindow *parent)
-	: wxDialog(parent, -1, wxString(wxT("GPAC Control Panel")))
-{
-	const char *sOpt;
-	SetSize(320, 240);
-	u32 i;
-	wxBoxSizer *bs;
-	Centre();
-
-	m_pApp = (wxOsmo4Frame *)parent;
-
-	s_main = new wxBoxSizer(wxVERTICAL);
-
-	s_header = new wxBoxSizer(wxHORIZONTAL);
-	//s_header->Add(new wxStaticText(this, 0, wxT("Category"), wxDefaultPosition, wxSize(60, 20)), wxALIGN_CENTER);
-	m_select = new wxComboBox(this, ID_SELECT, wxT(""), wxDefaultPosition, wxSize(120, 30), 0, NULL, wxCB_READONLY);
-	s_header->Add(m_select, 2, wxALIGN_CENTER | wxADJUST_MINSIZE);
-	s_header->Add( new wxButton(this, ID_APPLY, wxT("Apply"), wxDefaultPosition,
-#ifdef WIN32
-	                            wxSize(40, 20)
-#else
-	                            wxSize(40, 30)
-#endif
-	                           ),
-	               1, wxALIGN_TOP|wxALIGN_RIGHT|wxADJUST_MINSIZE);
-	s_main->Add(s_header, 0, wxEXPAND, 0);
-
-	/*general section*/
-	s_general = new wxBoxSizer(wxVERTICAL);
-	m_loop = new wxCheckBox(this, 0, wxT("Loop at End"), wxPoint(10, 40), wxSize(140, 20));
-	s_general->Add(m_loop);
-	m_lookforsubs = new wxCheckBox(this, 0, wxT("Look for Subtitles"), wxPoint(180, 40), wxSize(140, 20));
-	s_general->Add(m_lookforsubs);
-	m_noconsole = new wxCheckBox(this, 0, wxT("Disable console messages"), wxPoint(10, 80), wxSize(180, 20));
-	s_general->Add(m_noconsole);
-	m_viewxmt = new wxCheckBox(this, 0, wxT("View graph in XMT-A format"), wxPoint(10, 120), wxSize(180, 20));
-	s_general->Add(m_viewxmt);
-	s_main->Add(s_general, 0, wxEXPAND, 0);
-
-	/*MPEG-4 systems*/
-	s_mpeg4 = new wxBoxSizer(wxVERTICAL);
-	bs = new wxBoxSizer(wxHORIZONTAL);
-	bs->Add(new wxStaticText(this, 0, wxT("Prefered Stream Language")), wxALIGN_CENTER | wxADJUST_MINSIZE);
-	m_lang = new wxComboBox(this, 0, wxT(""), wxDefaultPosition, wxDefaultSize, 0, NULL, wxCB_READONLY);
-	bs->Add(m_lang, wxALIGN_CENTER | wxADJUST_MINSIZE);
-	s_mpeg4->Add(bs, 0, wxALL|wxEXPAND, 2);
-
-	bs = new wxBoxSizer(wxHORIZONTAL);
-	bs->Add(new wxStaticText(this, 0, wxT("Decoder Threading Mode")), wxALIGN_CENTER | wxADJUST_MINSIZE);
-	m_thread = new wxComboBox(this, 0, wxT(""), wxDefaultPosition, wxDefaultSize, 0, NULL, wxCB_READONLY);
-	bs->Add(m_thread, wxALIGN_CENTER | wxADJUST_MINSIZE);
-	s_mpeg4->Add(bs, 0, wxALL|wxEXPAND, 2);
-	m_bifsalwaysdrawn = new wxCheckBox(this, 0, wxT("Always draw late BIFS frames"));
-	s_mpeg4->Add(m_bifsalwaysdrawn);
-	m_singletime = new wxCheckBox(this, 0, wxT("Force Single Timeline"));
-	s_mpeg4->Add(m_singletime);
-	s_main->Add(s_mpeg4, 0, wxEXPAND, 0);
-
-	/*media decoders*/
-	s_mdec = new wxBoxSizer(wxVERTICAL);
-	bs = new wxBoxSizer(wxHORIZONTAL);
-	bs->Add(new wxStaticText(this, 0, wxT("Prefered Audio Output")), wxALIGN_CENTER | wxADJUST_MINSIZE);
-	m_decaudio = new wxComboBox(this, 0, wxT(""), wxDefaultPosition, wxDefaultSize, 0, NULL, wxCB_READONLY);
-	bs->Add(m_decaudio, wxALIGN_CENTER | wxADJUST_MINSIZE);
-	s_mdec->Add(bs, 0, wxALL|wxEXPAND, 2);
-	bs = new wxBoxSizer(wxHORIZONTAL);
-	bs->Add(new wxStaticText(this, 0, wxT("Prefered Video Output")), wxALIGN_CENTER | wxADJUST_MINSIZE);
-	m_decvideo = new wxComboBox(this, 0, wxT(""), wxDefaultPosition, wxDefaultSize, 0, NULL, wxCB_READONLY);
-	bs->Add(m_decvideo, wxALIGN_CENTER | wxADJUST_MINSIZE);
-	s_mdec->Add(bs, 0, wxALL|wxEXPAND, 2);
-	s_main->Add(s_mdec, 0, wxEXPAND, 0);
-
-	/*Rendering*/
-	s_rend = new wxBoxSizer(wxVERTICAL);
-	bs = new wxBoxSizer(wxHORIZONTAL);
-	bs->Add(new wxStaticText(this, 0, wxT("Target Frame Rate")), wxALIGN_CENTER | wxADJUST_MINSIZE);
-	m_fps = new wxComboBox(this, 0, wxT(""), wxDefaultPosition, wxDefaultSize, 0, NULL, wxCB_READONLY);
-	bs->Add(m_fps, wxALIGN_CENTER | wxADJUST_MINSIZE);
-	s_rend->Add(bs, 0, wxALL|wxEXPAND, 2);
-	bs = new wxBoxSizer(wxHORIZONTAL);
-	bs->Add(new wxStaticText(this, 0, wxT("Anti-Aliasing")), wxALIGN_CENTER | wxADJUST_MINSIZE);
-	m_aa = new wxComboBox(this, 0, wxT(""), wxDefaultPosition, wxDefaultSize, 0, NULL, wxCB_READONLY);
-	bs->Add(m_aa, wxALIGN_CENTER | wxADJUST_MINSIZE);
-	s_rend->Add(bs, 0, wxALL|wxEXPAND, 2);
-	bs = new wxBoxSizer(wxHORIZONTAL);
-	bs->Add(new wxStaticText(this, 0, wxT("Graphics Driver")), wxALIGN_CENTER | wxADJUST_MINSIZE);
-	m_graph = new wxComboBox(this, 0, wxT(""), wxDefaultPosition, wxDefaultSize, 0, NULL, wxCB_READONLY);
-	bs->Add(m_graph, wxALIGN_CENTER | wxADJUST_MINSIZE);
-	s_rend->Add(bs, 0, wxALL|wxEXPAND, 2);
-	bs = new wxBoxSizer(wxHORIZONTAL);
-	m_draw_bounds = new wxComboBox(this, 0, wxT(""), wxDefaultPosition, wxDefaultSize, 0, NULL, wxCB_READONLY);
-	bs->Add(new wxStaticText(this, 0, wxT("Bounds")), wxALIGN_CENTER | wxADJUST_MINSIZE | wxALIGN_RIGHT);
-	bs->Add(m_draw_bounds, wxALIGN_CENTER | wxADJUST_MINSIZE);
-	s_rend->Add(bs, 0, wxALL|wxEXPAND, 2);
-	m_fast = new wxCheckBox(this, 0, wxT("Fast Rendering"));
-	m_force_size = new wxCheckBox(this, 0, wxT("Force Scene Size"));
-	bs = new wxBoxSizer(wxHORIZONTAL);
-	bs->Add(m_fast, wxALIGN_CENTER | wxADJUST_MINSIZE);
-	bs->Add(m_force_size, wxALIGN_CENTER | wxADJUST_MINSIZE);
-	s_rend->Add(bs, 0, wxALL|wxEXPAND, 2);
-	m_use3D = new wxCheckBox(this, 0, wxT("Use 3D Renderer"));
-	s_rend->Add(m_use3D, 0, wxALL|wxEXPAND, 2);
-	m_bWas3D = m_use3D->GetValue();
-	s_main->Add(s_rend, 0, wxEXPAND, 0);
-
-	/*Render 2D*/
-	s_rend2d = new wxBoxSizer(wxVERTICAL);
-	m_direct = new wxCheckBox(this, 0, wxT("Direct Rendering"));
-	s_rend2d->Add(m_direct, 0, wxALL|wxEXPAND, 2);
-	m_scalable = new wxCheckBox(this, 0, wxT("Scalable Zoom"));
-	s_rend2d->Add(m_scalable, 0, wxALL|wxEXPAND, 2);
-	bs = new wxBoxSizer(wxHORIZONTAL);
-	m_noyuv = new wxCheckBox(this, 0, wxT("Disable YUV hardware"));
-	bs->Add(m_noyuv, wxALIGN_CENTER | wxADJUST_MINSIZE);
-	m_yuvtxt = new wxStaticText(this, 0, wxT("(No YUV used)"), wxDefaultPosition, wxSize(60, 20), wxALIGN_LEFT);
-	bs->Add(m_yuvtxt, wxALIGN_CENTER|wxADJUST_MINSIZE);
-	s_rend2d->Add(bs, 0, wxALL|wxEXPAND, 2);
-	s_main->Add(s_rend2d, 0, wxEXPAND, 0);
-
-	/*Render 3D*/
-	s_rend3d = new wxBoxSizer(wxVERTICAL);
-	m_raster_outlines = new wxCheckBox(this, 0, wxT("Use OpenGL Raster outlines"));
-	s_rend3d->Add(m_raster_outlines, 0, wxALL|wxEXPAND, 2);
-	m_polyaa = new wxCheckBox(this, 0, wxT("Enable polygon anti-aliasing"));
-	s_rend3d->Add(m_polyaa, 0, wxALL|wxEXPAND, 2);
-	m_nobackcull = new wxCheckBox(this, 0, wxT("Disable backface culling"));
-	s_rend3d->Add(m_nobackcull, 0, wxALL|wxEXPAND, 2);
-
-	bs = new wxBoxSizer(wxHORIZONTAL);
-	bs->Add(new wxStaticText(this, 0, wxT("Wireframe mode")), wxALIGN_CENTER | wxADJUST_MINSIZE);
-	m_wire = new wxComboBox(this, 0, wxT(""), wxDefaultPosition, wxDefaultSize, 0, NULL, wxCB_READONLY);
-	bs->Add(m_wire, wxALIGN_CENTER | wxADJUST_MINSIZE);
-	s_rend3d->Add(bs, 0, wxALL|wxEXPAND, 2);
-
-	bs = new wxBoxSizer(wxHORIZONTAL);
-	bs->Add(new wxStaticText(this, 0, wxT("Draw Normals")), wxALIGN_CENTER | wxADJUST_MINSIZE);
-	m_normals = new wxComboBox(this, 0, wxT(""), wxDefaultPosition, wxDefaultSize, 0, NULL, wxCB_READONLY);
-	bs->Add(m_normals, wxALIGN_CENTER | wxADJUST_MINSIZE);
-	s_rend3d->Add(bs, 0, wxALL|wxEXPAND, 2);
-
-	m_emulpow2 = new wxCheckBox(this, 0, wxT("Emulate power-of-two textures for video"));
-	s_rend3d->Add(m_emulpow2, 0, wxALL|wxEXPAND, 2);
-	m_norectext = new wxCheckBox(this, 0, wxT("Disable rectangular texture extensions"));
-	s_rend3d->Add(m_norectext, 0, wxALL|wxEXPAND, 2);
-	m_copypixels = new wxCheckBox(this, 0, wxT("Bitmap node uses direct pixel copy"));
-	s_rend3d->Add(m_copypixels, 0, wxALL|wxEXPAND, 2);
-	s_main->Add(s_rend3d, 0, wxEXPAND, 0);
-
-	/*video*/
-	s_video = new wxBoxSizer(wxVERTICAL);
-	bs = new wxBoxSizer(wxHORIZONTAL);
-	bs->Add(new wxStaticText(this, 0, wxT("Video Driver")), wxALIGN_CENTER | wxADJUST_MINSIZE | wxALIGN_RIGHT);
-	m_video = new wxComboBox(this, 0, wxT(""), wxDefaultPosition, wxDefaultSize, 0, NULL, wxCB_READONLY);
-	bs->Add(m_video , wxALIGN_CENTER | wxADJUST_MINSIZE);
-	s_video->Add(bs, 0, wxALL|wxEXPAND, 2);
-	m_switchres = new wxCheckBox(this, 0, wxT("Change video resolution in fullscreen"));
-	s_video->Add(m_switchres, 0, wxALL|wxEXPAND, 2);
-	m_usehwmem = new wxCheckBox(this, 0, wxT("Use hardware memory in 2D mode"));
-	s_video->Add(m_usehwmem, 0, wxALL|wxEXPAND, 2);
-	s_main->Add(s_video, 0, wxEXPAND, 0);
-
-
-	/*audio*/
-	s_audio = new wxBoxSizer(wxVERTICAL);
-	bs = new wxBoxSizer(wxHORIZONTAL);
-	bs->Add(new wxStaticText(this, 0, wxT("Audio Driver")), wxALIGN_CENTER | wxADJUST_MINSIZE);
-	m_audio = new wxComboBox(this, ID_AUDIO_DRIVER, wxT(""), wxDefaultPosition, wxDefaultSize, 0, NULL, wxCB_READONLY);
-	bs->Add(m_audio, wxALIGN_CENTER | wxADJUST_MINSIZE);
-	s_audio->Add(bs, 0, wxALL|wxEXPAND, 2);
-	m_forcecfg = new wxCheckBox(this, ID_FORCE_AUDIO, wxT("Force Audio Config"));
-	m_forcecfg->SetValue(1);
-	s_audio->Add(m_forcecfg, 0, wxALL|wxEXPAND, 2);
-
-
-	bs = new wxBoxSizer(wxHORIZONTAL);
-	bs->Add(new wxStaticText(this, 0, wxT("Number of buffers")), wxALIGN_CENTER|wxADJUST_MINSIZE);
-	m_nbbuf = new wxSpinCtrl(this, -1, wxT(""), wxDefaultPosition, wxSize(20, 20), wxSP_WRAP | wxSP_ARROW_KEYS, 1, 30, 15);
-	m_nbbuf->SetValue(8);
-	bs->Add(m_nbbuf, wxALIGN_CENTER | wxADJUST_MINSIZE);
-	s_audio->Add(bs, 0, wxALL|wxEXPAND, 2);
-
-	bs = new wxBoxSizer(wxHORIZONTAL);
-	bs->Add(new wxStaticText(this, 0, wxT("Total length in ms")), wxALIGN_CENTER | wxADJUST_MINSIZE);
-	m_buflen = new wxSpinCtrl(this, -1, wxT(""), wxDefaultPosition, wxSize(20, 20), wxSP_WRAP | wxSP_ARROW_KEYS, 1, 1000);
-	m_buflen->SetValue(400);
-	bs->Add(m_buflen, wxALIGN_CENTER | wxADJUST_MINSIZE|wxLEFT,10);
-	s_audio->Add(bs, 0, wxALL|wxEXPAND, 2);
-
-	m_noresync = new wxCheckBox(this, -1, wxT("Disable Resynchronization"));
-	s_audio->Add(m_noresync);
-	m_nomulitch = new wxCheckBox(this, -1, wxT("Disable Multichannel"));
-	s_audio->Add(m_nomulitch);
-#ifdef WIN32
-	m_notifs = new wxCheckBox(this, -1, wxT("Disable DirectSound Notifications"));
-	s_audio->Add(m_notifs);
-#endif
-	s_main->Add(s_audio, 0, wxEXPAND, 0);
-
-	/*font*/
-	s_font = new wxBoxSizer(wxVERTICAL);
-	bs = new wxBoxSizer(wxHORIZONTAL);
-	bs->Add(new wxStaticText(this, 0, wxT("Font Engine")), wxALIGN_CENTER | wxADJUST_MINSIZE | wxALIGN_RIGHT);
-	m_font = new wxComboBox(this, 0, wxT(""), wxDefaultPosition, wxDefaultSize, 0, NULL, wxCB_READONLY);
-	bs->Add(m_font, wxALIGN_CENTER | wxADJUST_MINSIZE);
-	s_font->Add(bs, 0, wxALL|wxEXPAND, 2);
-	bs = new wxBoxSizer(wxHORIZONTAL);
-	bs->Add(new wxStaticText(this, 0, wxT("System Font Directory")), wxALIGN_CENTER | wxADJUST_MINSIZE | wxALIGN_RIGHT);
-	m_fontdir = new wxButton(this, ID_FONT_DIR, wxT("..."), wxDefaultPosition, wxDefaultSize);
-	bs->Add(m_fontdir, wxALIGN_CENTER | wxADJUST_MINSIZE);
-	s_font->Add(bs, 0, wxALL|wxEXPAND, 2);
-	bs = new wxBoxSizer(wxHORIZONTAL);
-	bs->Add(new wxStaticText(this, 0, wxT("Text Texturing Mode")), wxALIGN_CENTER | wxADJUST_MINSIZE | wxALIGN_RIGHT);
-	m_texturemode = new wxComboBox(this, 0, wxT(""), wxDefaultPosition, wxDefaultSize, 0, NULL, wxCB_READONLY);
-	bs->Add(m_texturemode, wxALIGN_CENTER | wxADJUST_MINSIZE);
-	s_font->Add(bs, 0, wxALL|wxEXPAND, 2);
-	s_main->Add(s_font, 0, wxEXPAND, 0);
-
-	/*download*/
-	s_dnld = new wxBoxSizer(wxVERTICAL);
-	bs = new wxBoxSizer(wxHORIZONTAL);
-	bs->Add(new wxStaticText(this, 0, wxT("Cache Directory")), wxALIGN_CENTER | wxADJUST_MINSIZE | wxALIGN_RIGHT);
-	m_cachedir = new wxButton(this, ID_CACHE_DIR, wxT("..."));
-	bs->Add(m_cachedir, wxALIGN_CENTER | wxADJUST_MINSIZE);
-	s_dnld->Add(bs, 0, wxALL|wxEXPAND, 2);
-	m_cleancache = new wxCheckBox(this, -1, wxT("Remove temp files on exit"));
-	s_dnld->Add(m_cleancache);
-	m_restartcache = new wxCheckBox(this, -1, wxT("Always redownload incomplete cached files"));
-	s_dnld->Add(m_restartcache);
-	bs = new wxBoxSizer(wxHORIZONTAL);
-	m_progressive = new wxCheckBox(this, ID_PROGRESSIVE, wxT("XML progressive load"));
-	bs->Add(m_progressive, wxALIGN_CENTER | wxADJUST_MINSIZE);
-	m_sax_duration = new wxTextCtrl(this, 0, wxT(""), wxPoint(10, 120), wxSize(60, 20));
-	bs->Add(m_sax_duration, wxALIGN_CENTER | wxADJUST_MINSIZE);
-	bs->Add(new wxStaticText(this, 0, wxT("max load slice (ms)")), wxADJUST_MINSIZE | wxALIGN_CENTER);
-	s_dnld->Add(bs, 0, wxALL|wxEXPAND, 2);
-	bs = new wxBoxSizer(wxHORIZONTAL);
-	m_use_proxy = new wxCheckBox(this, ID_USE_PROXY, wxT("Use proxy"));
-	bs->Add(m_use_proxy, wxALIGN_CENTER | wxADJUST_MINSIZE);
-	m_proxy_name = new wxTextCtrl(this, 0, wxT(""), wxPoint(10, 120), wxSize(60, 20));
-	bs->Add(m_proxy_name, wxALIGN_CENTER | wxADJUST_MINSIZE);
-	s_dnld->Add(bs, 0, wxALL|wxEXPAND, 2);
-	s_main->Add(s_dnld, 0, wxEXPAND, 0);
-
-	/*streaming*/
-	s_stream = new wxBoxSizer(wxVERTICAL);
-	bs = new wxBoxSizer(wxHORIZONTAL);
-	bs->Add(new wxStaticText(this, 0, wxT("Default RTSP port")), wxALIGN_CENTER | wxADJUST_MINSIZE | wxALIGN_RIGHT);
-	m_port = new wxComboBox(this, ID_RTSP_PORT, wxT(""), wxPoint(160, 40), wxSize(140, 30), 0, NULL, wxCB_READONLY);
-	bs->Add(m_port, wxALIGN_CENTER | wxADJUST_MINSIZE);
-	s_stream->Add(bs, 0, wxALL|wxEXPAND, 2);
-	m_rtsp = new wxCheckBox(this, ID_RTP_OVER_RTSP, wxT("RTP over RTSP"), wxPoint(10, 80), wxSize(140, 20));
-	m_reorder = new wxCheckBox(this, -1, wxT("use RTP reordering"), wxPoint(160, 80), wxSize(130, 20));
-	bs = new wxBoxSizer(wxHORIZONTAL);
-	bs->Add(m_rtsp, wxALIGN_CENTER | wxADJUST_MINSIZE);
-	bs->Add(m_reorder, wxALIGN_CENTER | wxADJUST_MINSIZE);
-	s_stream->Add(bs, 0, wxALL|wxEXPAND, 2);
-	bs = new wxBoxSizer(wxHORIZONTAL);
-	m_timeout = new wxTextCtrl(this, 0, wxT(""), wxPoint(10, 120), wxSize(60, 20));
-	bs->Add(new wxStaticText(this, 0, wxT("Control Timeout (ms): ")), wxALIGN_CENTER | wxADJUST_MINSIZE | wxALIGN_RIGHT);
-	bs->Add(m_timeout, wxALIGN_CENTER | wxADJUST_MINSIZE);
-	s_stream->Add(bs, 0, wxALL|wxEXPAND, 2);
-	bs = new wxBoxSizer(wxHORIZONTAL);
-	m_buffer = new wxTextCtrl(this, 0, wxT(""), wxPoint(10, 150), wxSize(60, 20));
-	bs->Add(new wxStaticText(this, 0, wxT("Media Buffering (ms): ")), wxALIGN_CENTER | wxADJUST_MINSIZE | wxALIGN_RIGHT);
-	bs->Add(m_buffer, wxALIGN_CENTER | wxADJUST_MINSIZE);
-	s_stream->Add(bs, 0, wxALL|wxEXPAND, 2);
-	bs = new wxBoxSizer(wxHORIZONTAL);
-	m_dorebuffer = new wxCheckBox(this, ID_RTSP_REBUFFER, wxT("Rebuffer if below"));
-	bs->Add(m_dorebuffer, wxALIGN_CENTER | wxADJUST_MINSIZE);
-	m_rebuffer = new wxTextCtrl(this, 0, wxT(""), wxPoint(200, 180), wxSize(60, 20));
-	bs->Add(m_rebuffer, wxALIGN_CENTER | wxADJUST_MINSIZE);
-	m_rebuffer->Disable();
-	s_stream->Add(bs, 0, wxALL|wxEXPAND, 2);
-	s_main->Add(s_stream, 0, wxEXPAND, 0);
-
-	/*streaming cache*/
-	s_rec = new wxBoxSizer(wxVERTICAL);
-	bs = new wxBoxSizer(wxHORIZONTAL);
-	bs->Add(new wxStaticText(this, 0, wxT("Record To: ")), wxALIGN_CENTER | wxADJUST_MINSIZE | wxALIGN_RIGHT);
-	m_recdir = new wxButton(this, ID_RECORD_DIR, wxT("..."));
-	bs->Add(m_recdir, wxALIGN_CENTER | wxADJUST_MINSIZE);
-	s_rec->Add(bs, 0, wxALL|wxEXPAND, 2);
-	m_overwrite = new wxCheckBox(this, -1, wxT("Overwrite existing files"));
-	s_rec->Add(m_overwrite);
-	bs = new wxBoxSizer(wxHORIZONTAL);
-	m_usename = new wxCheckBox(this, ID_USE_FILENAME, wxT("Use filename"));
-	m_recfile = new wxTextCtrl(this, 0, wxT(""));
-	bs->Add(m_usename, wxALIGN_CENTER | wxADJUST_MINSIZE);
-	bs->Add(m_recfile, wxALIGN_CENTER | wxADJUST_MINSIZE);
-	s_rec->Add(bs, 0, wxALL|wxEXPAND, 2);
-	s_main->Add(s_rec, 0, wxEXPAND, 0);
-
-	/*load options*/
-	GF_Config *cfg = m_pApp->m_user.config;
-	/*general*/
-	sOpt = gf_cfg_get_key(cfg, "General", "Loop");
-	m_loop->SetValue((sOpt && !stricmp(sOpt, "yes")) ? 1 : 0);
-	sOpt = gf_cfg_get_key(cfg, "General", "LookForSubtitles");
-	m_lookforsubs->SetValue((sOpt && !stricmp(sOpt, "no")) ? 1 : 0);
-	sOpt = gf_cfg_get_key(cfg, "General", "ConsoleOff");
-	m_noconsole->SetValue((sOpt && !stricmp(sOpt, "yes")) ? 1 : 0);
-	sOpt = gf_cfg_get_key(cfg, "General", "ViewXMT");
-	m_viewxmt->SetValue((sOpt && !stricmp(sOpt, "yes")) ? 1 : 0);
-
-	/*lang config*/
-	u32 count = gf_lang_get_count();
-	for (i=0; i<count; i++) {
-		m_lang->Append(wxString(gf_lang_get_name(i), wxConvUTF8) );
-	}
-
-	sOpt = gf_cfg_get_key(cfg, "Systems", "Language3CC");
-	if (!sOpt) sOpt = "eng";
-	s32 select = gf_lang_find(sOpt);
-	if (select<0) select = 0;
-	m_lang->SetSelection(select);
-
-	/*systems config*/
-	sOpt = gf_cfg_get_key(cfg, "Systems", "ThreadingPolicy");
-	select = 0;
-	m_thread->Append(wxT("Single Thread"));
-	m_thread->Append(wxT("Mutli Thread"));
-	if (sOpt && !stricmp(sOpt, "Multi")) select = 1;
-	m_thread->Append(wxT("Free"));
-	if (sOpt && !stricmp(sOpt, "Free")) select = 2;
-	m_thread->SetSelection(select);
-	sOpt = gf_cfg_get_key(cfg, "Systems", "ForceSingleClock");
-	m_singletime->SetValue((sOpt && !stricmp(sOpt, "yes")) ? 1 : 0);
-	sOpt = gf_cfg_get_key(cfg, "Systems", "AlwaysDrawBIFS");
-	m_bifsalwaysdrawn->SetValue((sOpt && !stricmp(sOpt, "yes")) ? 1 : 0);
-
-
-	/*audio dec enum*/
-	sOpt = gf_cfg_get_key(cfg, "Systems", "DefAudioDec");
-	u32 count = gf_modules_get_count(m_pApp->m_user.modules);
-	GF_BaseDecoder *ifc_d;
-	select = 0;
-	s32 to_sel = 0;
-	for (i=0; i<count; i++) {
-		ifc_d = (GF_BaseDecoder *) gf_modules_load_interface(m_pApp->m_user.modules, i, GF_MEDIA_DECODER_INTERFACE);
-		if (!ifc_d) continue;
-		if (ifc_d->CanHandleStream(ifc_d, GF_STREAM_AUDIO, NULL, 0)) {
-			if (sOpt && !stricmp(ifc_d->module_name, sOpt)) select = to_sel;
-			m_decaudio->Append(wxString(ifc_d->module_name, wxConvUTF8) );
-			to_sel++;
-		}
-		gf_modules_close_interface((GF_BaseInterface *) ifc_d);
-	}
-	m_decaudio->SetSelection(select);
-
-	/*video dec enum*/
-	sOpt = gf_cfg_get_key(cfg, "Systems", "DefVideoDec");
-	select = to_sel = 0;
-	for (i=0; i<count; i++) {
-		ifc_d = (GF_BaseDecoder *) gf_modules_load_interface(m_pApp->m_user.modules, i, GF_MEDIA_DECODER_INTERFACE);
-		if (!ifc_d) continue;
-		if (ifc_d->CanHandleStream(ifc_d, GF_STREAM_VISUAL, NULL, 0)) {
-			if (sOpt && !stricmp(ifc_d->module_name, sOpt)) select = to_sel;
-			m_decvideo->Append(wxString(ifc_d->module_name, wxConvUTF8) );
-			to_sel++;
-		}
-		gf_modules_close_interface((GF_BaseInterface *) ifc_d);
-	}
-	m_decvideo->SetSelection(select);
-
-	/*rendering FIXME*/
-	m_bWas3D = 0;
-	m_use3D->SetValue(m_bWas3D ? 1 : 0);
-
-	sOpt = gf_cfg_get_key(cfg, "Compositor", "ForceSceneSize");
-	m_force_size->SetValue( (sOpt && !stricmp(sOpt, "yes")) ? 1 : 0);
-
-	sOpt = gf_cfg_get_key(cfg, "Compositor", "FrameRate");
-	if (!sOpt) sOpt = "30.0";
-	select = 0;
-	for (i = 0; i<NUM_RATES; i++) {
-		m_fps->Append(wxString(BIFSRatesi, wxConvUTF8) );
-		if (sOpt && !stricmp(sOpt, BIFSRatesi) ) select = i;
-	}
-	m_fps->SetSelection(select);
-
-	sOpt = gf_cfg_get_key(cfg, "Compositor", "HighSpeed");
-	m_fast->SetValue( (sOpt && !stricmp(sOpt, "yes")) ? 1 : 0);
-
-	sOpt = gf_cfg_get_key(cfg, "Compositor", "AntiAlias");
-	m_aa->Append(wxT("None"));
-	m_aa->Append(wxT("Text only"));
-	m_aa->Append(wxT("Complete"));
-	select = 2;
-	if (sOpt && !stricmp(sOpt, "Text")) select = 1;
-	else if (sOpt && !stricmp(sOpt, "None")) select = 0;
-	m_aa->SetSelection(select);
-
-	sOpt = gf_cfg_get_key(cfg, "Compositor", "BoundingVolume");
-	m_draw_bounds->Append(wxT("None"));
-	m_draw_bounds->Append(wxT("Box/Rect"));
-	m_draw_bounds->Append(wxT("AABB Tree"));
-	select = 0;
-	if (sOpt && !stricmp(sOpt, "Box")) select = 1;
-	else if (sOpt && !stricmp(sOpt, "AABB")) select = 2;
-	m_draw_bounds->SetSelection(select);
-
-	/*render2d*/
-	sOpt = gf_cfg_get_key(cfg, "Compositor", "DirectDraw");
-	m_direct->SetValue( (sOpt && !stricmp(sOpt, "yes")) ? 1 : 0);
-	sOpt = gf_cfg_get_key(cfg, "Compositor", "ScalableZoom");
-	m_scalable->SetValue( (sOpt && !stricmp(sOpt, "yes")) ? 1 : 0);
-	sOpt = gf_cfg_get_key(cfg, "Compositor", "DisableYUV");
-	m_noyuv->SetValue( (sOpt && !stricmp(sOpt, "yes")) ? 1 : 0);
-	SetYUVLabel();
-
-	/*graphics driver enum*/
-	sOpt = gf_cfg_get_key(cfg, "core", "raster2d");
-	GF_BaseInterface *ifce;
-	select = to_sel = 0;
-	for (i=0; i<count; i++) {
-		ifce = gf_modules_load_interface(m_pApp->m_user.modules, i, GF_RASTER_2D_INTERFACE);
-		if (!ifce) continue;
-		if (sOpt && !stricmp(((GF_BaseInterface *)ifce)->module_name, sOpt)) select = to_sel;
-		m_graph->Append(wxString(((GF_BaseInterface *)ifce)->module_name, wxConvUTF8) );
-		gf_modules_close_interface(ifce);
-		to_sel++;
-	}
-	m_graph->SetSelection(select);
-
-	/*render3d*/
-	sOpt = gf_cfg_get_key(cfg, "Compositor", "RasterOutlines");
-	m_raster_outlines->SetValue( (sOpt && !stricmp(sOpt, "yes")) ? 1 : 0);
-	sOpt = gf_cfg_get_key(cfg, "Compositor", "EmulatePOW2");
-	m_emulpow2->SetValue((sOpt && !stricmp(sOpt, "yes")) ? 1 : 0);
-	sOpt = gf_cfg_get_key(cfg, "Compositor", "PolygonAA");
-	m_polyaa->SetValue((sOpt && !stricmp(sOpt, "yes")) ? 1 : 0);
-	sOpt = gf_cfg_get_key(cfg, "Compositor", "BackFaceCulling");
-	m_nobackcull->SetValue((sOpt && !stricmp(sOpt, "Off")) ? 1 : 0);
-	sOpt = gf_cfg_get_key(cfg, "Compositor", "Wireframe");
-	sOpt = gf_cfg_get_key(cfg, "Compositor", "BitmapCopyPixels");
-	m_copypixels->SetValue((sOpt && !stricmp(sOpt, "yes")) ? 1 : 0);
-	sOpt = gf_cfg_get_key(cfg, "Compositor", "DisableRectExt");
-	m_norectext->SetValue((sOpt && !stricmp(sOpt, "yes")) ? 1 : 0);
-	m_wire->Append(wxT("No Wireframe"));
-	m_wire->Append(wxT("Wireframe Only"));
-	m_wire->Append(wxT("Solid and Wireframe"));
-	sOpt = gf_cfg_get_key(cfg, "Compositor", "Wireframe");
-	if (sOpt && !stricmp(sOpt, "WireOnly")) m_wire->SetSelection(1);
-	else if (sOpt && !stricmp(sOpt, "WireOnSolid")) m_wire->SetSelection(2);
-	else m_wire->SetSelection(0);
-	m_normals->Append(wxT("Never"));
-	m_normals->Append(wxT("Per Face"));
-	m_normals->Append(wxT("Per Vertex"));
-	sOpt = gf_cfg_get_key(cfg, "Compositor", "DrawNormals");
-	if (sOpt && !stricmp(sOpt, "PerFace")) m_normals->SetSelection(1);
-	else if (sOpt && !stricmp(sOpt, "PerVertex")) m_normals->SetSelection(2);
-	else m_normals->SetSelection(0);
-
-	/*video*/
-	m_switchres->SetValue( gf_cfg_get_bool(cfg, "core", "switch-vres") );
-	sOpt = gf_cfg_get_key(cfg, "core", "hwvmem");
-	m_usehwmem->SetValue( (sOpt && !stricmp(sOpt, "yes")) ? 1 : 0);
-	sOpt = gf_cfg_get_key(cfg, "core", "video-output");
-	select = to_sel = 0;
-	for (i=0; i<count; i++) {
-		ifce = gf_modules_load_interface(m_pApp->m_user.modules, i, GF_VIDEO_OUTPUT_INTERFACE);
-		if (!ifce) continue;
-		if (sOpt && !stricmp(((GF_BaseInterface *)ifce)->module_name, sOpt)) select = to_sel;
-		m_video->Append(wxString(((GF_BaseInterface *)ifce)->module_name, wxConvUTF8) );
-		gf_modules_close_interface(ifce);
-		to_sel++;
-	}
-	m_video->SetSelection(select);
-
-	/*audio*/
-	sOpt = gf_cfg_get_key(cfg, "Audio", "ForceConfig");
-	m_forcecfg->SetValue( (sOpt && !stricmp(sOpt, "yes")) ? 1 : 0);
-	sOpt = gf_cfg_get_key(cfg, "Audio", "NumBuffers");
-	m_nbbuf->SetValue( sOpt ? wxString(sOpt, wxConvUTF8) : wxT("2"));
-	sOpt = gf_cfg_get_key(cfg, "Audio", "TotalDuration");
-	m_buflen->SetValue( sOpt ? wxString(sOpt, wxConvUTF8) : wxT("120"));
-	wxCommandEvent event;
-	ForceAudio(event);
-	sOpt = gf_cfg_get_key(cfg, "Audio", "NoResync");
-	m_noresync->SetValue( (sOpt && !stricmp(sOpt, "yes")) ? 1 : 0);
-	sOpt = gf_cfg_get_key(cfg, "Audio", "DisableMultiChannel");
-	m_nomulitch->SetValue( (sOpt && !stricmp(sOpt, "yes")) ? 1 : 0);
-
-	/*driver enum*/
-	sOpt = gf_cfg_get_key(cfg, "core", "audio-output");
-	select = to_sel = 0;
-	for (i=0; i<count; i++) {
-		ifce = gf_modules_load_interface(m_pApp->m_user.modules, i, GF_AUDIO_OUTPUT_INTERFACE);
-		if (!ifce) continue;
-		if (sOpt && !stricmp(((GF_BaseInterface *)ifce)->module_name, sOpt)) select = to_sel;
-		m_audio->Append(wxString(((GF_BaseInterface *)ifce)->module_name, wxConvUTF8) );
-		gf_modules_close_interface(ifce);
-		to_sel++;
-	}
-	m_audio->SetSelection(select);
-#ifdef WIN32
-	sOpt = gf_cfg_get_key(cfg, "Audio", "DisableNotification");
-	m_notifs->SetValue( (sOpt && !stricmp(sOpt, "yes")) ? 1 : 0);
-	wxCommandEvent audevt;
-	OnSetAudioDriver(audevt);
-#endif
-
-	/*font*/
-	sOpt = gf_cfg_get_key(cfg, "FontCache", "FontReader");
-	to_sel = select = 0;
-	for (i=0; i<count; i++) {
-		ifce = gf_modules_load_interface(m_pApp->m_user.modules, i, GF_FONT_READER_INTERFACE);
-		if (!ifce) continue;
-		if (sOpt && !stricmp(((GF_BaseInterface *)ifce)->module_name, sOpt)) select = to_sel;
-		m_font->Append(wxString(((GF_BaseInterface *)ifce)->module_name, wxConvUTF8) );
-		gf_modules_close_interface(ifce);
-		to_sel++;
-	}
-	m_font->SetSelection(select);
-	sOpt = gf_cfg_get_key(cfg, "FontCache", "FontDirectory");
-	if (sOpt) m_fontdir->SetLabel(wxString(sOpt, wxConvUTF8) );
-	sOpt = gf_cfg_get_key(cfg, "Compositor", "TextureTextMode");
-	m_texturemode->Append(wxT("Default"));
-	m_texturemode->Append(wxT("Never"));
-	m_texturemode->Append(wxT("Always"));
-	if (sOpt && !stricmp(sOpt, "Always")) m_texturemode->SetSelection(2);
-	else if (sOpt && !stricmp(sOpt, "3D")) m_texturemode->SetSelection(1);
-	else m_texturemode->SetSelection(0);
-
-	/*downloader*/
-	sOpt = gf_cfg_get_key(cfg, "Core", "CacheDirectory");
-	if (sOpt) m_cachedir->SetLabel(wxString(sOpt, wxConvUTF8) );
-	sOpt = gf_cfg_get_key(cfg, "Core", "CleanCache");
-	m_cleancache->SetValue( (sOpt && !stricmp(sOpt, "yes")) ? 1 : 0);
-	sOpt = gf_cfg_get_key(cfg, "Core", "RestartFiles");
-	m_restartcache->SetValue( (sOpt && !stricmp(sOpt, "yes")) ? 1 : 0);
-	sOpt = gf_cfg_get_key(cfg, "SAXLoader", "Progressive");
-	m_progressive->SetValue( (sOpt && !stricmp(sOpt, "yes")) ? 1 : 0);
-	sOpt = gf_cfg_get_key(cfg, "SAXLoader", "MaxDuration");
-	m_sax_duration->SetValue(sOpt ? wxString(sOpt, wxConvUTF8) : wxT("30"));
-	if (! m_progressive->GetValue()) m_sax_duration->Enable(0);
-
-	sOpt = gf_cfg_get_key(cfg, "Core", "HTTPProxyEnabled");
-	m_use_proxy->SetValue( (sOpt && !stricmp(sOpt, "yes")) ? 1 : 0);
-	char szProxyGF_MAX_PATH;
-	strcpy(szProxy, "");
-	sOpt = gf_cfg_get_key(cfg, "Core", "HTTPProxyName");
-	if (sOpt) {
-		strcat(szProxy, sOpt);
-		sOpt = gf_cfg_get_key(cfg, "Core", "HTTPProxyPort");
-		if (sOpt) {
-			strcat(szProxy, ":");
-			strcat(szProxy, sOpt);
-		}
-	} else {
-		m_use_proxy->SetValue(0);
-	}
-	m_proxy_name->SetValue( wxString((char *)szProxy, wxConvUTF8) );
-	if (! m_use_proxy->GetValue()) m_proxy_name->Enable(0);
-
-	/*streaming*/
-	m_port->Append(wxT("554 (RTSP standard)"));
-	m_port->Append(wxT("7070 (RTSP ext)"));
-	m_port->Append(wxT("80 (RTSP / HTTP tunnel)"));
-	m_port->Append(wxT("8080 (RTSP / HTTP tunnel)"));
-	sOpt = gf_cfg_get_key(cfg, "Streaming", "DefaultPort");
-	u32 port = 554;
-	Bool force_rtsp = 0;
-	if (sOpt) port = atoi(sOpt);
-	switch (port) {
-	case 8080:
-		m_port->SetSelection(3);
-		force_rtsp = 1;
-		break;
-	case 80:
-		m_port->SetSelection(2);
-		force_rtsp = 1;
-		break;
-	case 7070:
-		m_port->SetSelection(1);
-		break;
-	default:
-		m_port->SetSelection(0);
-		break;
-	}
-
-	Bool use_rtsp = 0;
-	sOpt = gf_cfg_get_key(cfg, "Streaming", "RTPoverRTSP");
-	if (sOpt && !stricmp(sOpt, "yes")) use_rtsp = 1;
-
-	if (force_rtsp) {
-		m_rtsp->SetValue(1);
-		m_rtsp->Enable(0);
-		m_reorder->SetValue(0);
-		m_reorder->Enable(0);
-	} else {
-		m_rtsp->SetValue(use_rtsp ? 1 : 0);
-		m_rtsp->Enable(1);
-		m_reorder->Enable(1);
-		sOpt = gf_cfg_get_key(cfg, "Streaming", "ReorderSize");
-		m_reorder->SetValue( (sOpt && !stricmp(sOpt, "0")) ? 1 : 0);
-	}
-	sOpt = gf_cfg_get_key(cfg, "Streaming", "RTSPTimeout");
-	m_timeout->SetValue(sOpt ? wxString(sOpt, wxConvUTF8) : wxT("30000"));
-	sOpt = gf_cfg_get_key(cfg, "Network", "BufferLength");
-	m_buffer->SetValue(sOpt ? wxString(sOpt, wxConvUTF8) : wxT("3000"));
-	sOpt = gf_cfg_get_key(cfg, "Network", "RebufferLength");
-	u32 buf_len = 0;
-	if (sOpt) buf_len = atoi(sOpt);
-	if (buf_len) {
-		m_dorebuffer->SetValue(1);
-		m_rebuffer->SetValue(wxString(sOpt, wxConvUTF8));
-		m_rebuffer->Enable(1);
-	} else {
-		m_dorebuffer->SetValue(0);
-		m_rebuffer->SetValue(wxT("0"));
-		m_rebuffer->Enable(0);
-	}
-
-	RTPoverRTSP(event);
-
-	sOpt = gf_cfg_get_key(cfg, "StreamingCache", "RecordDirectory");
-	if (!sOpt) sOpt = gf_cfg_get_key(cfg, "Core", "CacheDirectory");
-	if (sOpt) m_recdir->SetLabel(wxString(sOpt, wxConvUTF8));
-	sOpt = gf_cfg_get_key(cfg, "StreamingCache", "KeepExistingFiles");
-	m_overwrite->SetValue((sOpt && !stricmp(sOpt, "yes")) ? 0 : 1);
-
-	sOpt = gf_cfg_get_key(cfg, "StreamingCache", "BaseFileName");
-	if (sOpt) {
-		m_usename->SetValue(1);
-		m_recfile->Enable(1);
-		m_recfile->SetValue(wxString(sOpt, wxConvUTF8));
-	} else {
-		m_usename->SetValue(0);
-		m_recfile->Enable(0);
-		m_recfile->SetValue(wxT("uses service URL"));
-	}
-
-	m_select->Append(wxT("General"));
-	m_select->Append(wxT("MPEG-4 Systems"));
-	m_select->Append(wxT("Media Decoders"));
-	m_select->Append(wxT("Compositor"));
-	m_select->Append(wxT("Renderer 2D"));
-	m_select->Append(wxT("Renderer 3D"));
-	m_select->Append(wxT("Video Output"));
-	m_select->Append(wxT("Audio Output"));
-	m_select->Append(wxT("Text Engine"));
-	m_select->Append(wxT("File Download"));
-	m_select->Append(wxT("Real-Time Streaming"));
-	m_select->Append(wxT("Streaming Cache"));
-
-	sOpt = gf_cfg_get_key(cfg, "General", "ConfigPanel");
-	m_sel = sOpt ? atoi(sOpt) : 0;
-	if (m_sel>11) m_sel=11;
-	m_select->SetSelection(m_sel);
-
-	DoSelect();
-}
-
-BEGIN_EVENT_TABLE(wxGPACControl, wxDialog)
-	EVT_BUTTON(ID_APPLY, wxGPACControl::Apply)
-	EVT_COMBOBOX(ID_SELECT, wxGPACControl::OnSetSelection)
-	EVT_CHECKBOX(ID_FORCE_AUDIO, wxGPACControl::ForceAudio)
-	EVT_COMBOBOX(ID_AUDIO_DRIVER, wxGPACControl::OnSetAudioDriver)
-	EVT_BUTTON(ID_FONT_DIR, wxGPACControl::FontDir)
-	EVT_BUTTON(ID_CACHE_DIR, wxGPACControl::CacheDir)
-	EVT_CHECKBOX(ID_PROGRESSIVE, wxGPACControl::OnProgressive)
-	EVT_CHECKBOX(ID_USE_PROXY, wxGPACControl::OnUseProxy)
-	EVT_CHECKBOX(ID_RTP_OVER_RTSP, wxGPACControl::RTPoverRTSP)
-	EVT_CHECKBOX(ID_RTSP_REBUFFER, wxGPACControl::Rebuffer)
-	EVT_COMBOBOX(ID_RTSP_PORT, wxGPACControl::OnSetRTSPPort)
-	EVT_CHECKBOX(ID_USE_FILENAME, wxGPACControl::OnUseFileName)
-	EVT_BUTTON(ID_RECORD_DIR, wxGPACControl::OnRecDir)
-END_EVENT_TABLE()
-
-
-wxGPACControl::~wxGPACControl()
-{
-	char str20;
-	sprintf(str, "%d", m_sel);
-	gf_cfg_set_key(m_pApp->m_user.config, "General", "ConfigPanel", str);
-}
-
-
-void wxGPACControl::DoSelect()
-{
-
-	/*hide everything*/
-	s_main->Show(s_general, false);
-	s_main->Show(s_mpeg4, false);
-	s_main->Show(s_mdec, false);
-	s_main->Show(s_rend, false);
-	s_main->Show(s_rend2d, false);
-	s_main->Show(s_rend3d, false);
-	s_main->Show(s_video, false);
-	s_main->Show(s_audio, false);
-	s_main->Show(s_font, false);
-	s_main->Show(s_dnld, false);
-	s_main->Show(s_stream, false);
-	s_main->Show(s_rec, false);
-	switch (m_sel) {
-	case 0:
-		s_main->Show(s_general, true);
-		break;
-	case 1:
-		s_main->Show(s_mpeg4, true);
-		break;
-	case 2:
-		s_main->Show(s_mdec, true);
-		break;
-	case 3:
-		s_main->Show(s_rend, true);
-		break;
-	case 4:
-		s_main->Show(s_rend2d, true);
-		break;
-	case 5:
-		s_main->Show(s_rend3d, true);
-		break;
-	case 6:
-		s_main->Show(s_video, true);
-		break;
-	case 7:
-		s_main->Show(s_audio, true);
-		break;
-	case 8:
-		s_main->Show(s_font, true);
-		break;
-	case 9:
-		s_main->Show(s_dnld, true);
-		break;
-	case 10:
-		s_main->Show(s_stream, true);
-		break;
-	case 11:
-		s_main->Show(s_rec, true);
-		break;
-	}
-	SetSizer(s_main);
-	s_main->Fit(this);
-	//s_main->Layout();
-	return;
-
-}
-
-void wxGPACControl::OnSetSelection(wxCommandEvent &WXUNUSED(event))
-{
-	m_sel = m_select->GetSelection();
-	DoSelect();
-}
-
-void wxGPACControl::FontDir(wxCommandEvent &WXUNUSED(event))
-{
-	wxDirDialog dlg(this);
-	dlg.SetPath(m_fontdir->GetLabel());
-	if (dlg.ShowModal() == wxID_OK) {
-		m_fontdir->SetLabel(dlg.GetPath());
-	}
-}
-void wxGPACControl::CacheDir(wxCommandEvent &WXUNUSED(event))
-{
-	wxDirDialog dlg(this);
-	dlg.SetPath(m_cachedir->GetLabel());
-	if (dlg.ShowModal() == wxID_OK) {
-		m_cachedir->SetLabel(dlg.GetPath());
-	}
-}
-
-void wxGPACControl::OnProgressive(wxCommandEvent &WXUNUSED(event))
-{
-	m_sax_duration->Enable(m_progressive->GetValue() ? 1 : 0);
-}
-
-void wxGPACControl::OnUseProxy(wxCommandEvent &WXUNUSED(event))
-{
-	m_proxy_name->Enable(m_use_proxy->GetValue() ? 1 : 0);
-}
-
-void wxGPACControl::RTPoverRTSP(wxCommandEvent &WXUNUSED(event))
-{
-	m_reorder->Enable(m_rtsp->GetValue() ? 0 : 1);
-}
-
-void wxGPACControl::Rebuffer(wxCommandEvent &WXUNUSED(event))
-{
-	if (m_dorebuffer->GetValue()) {
-		m_rebuffer->Enable();
-	} else {
-		m_rebuffer->Disable();
-	}
-}
-
-void wxGPACControl::OnSetRTSPPort(wxCommandEvent &WXUNUSED(event))
-{
-	if (m_port->GetSelection() > 1) {
-		m_rtsp->Enable(0);
-		m_reorder->Enable(0);
-	} else {
-		m_rtsp->Enable(1);
-		m_reorder->Enable(1);
-	}
-}
-
-void wxGPACControl::OnRecDir(wxCommandEvent &WXUNUSED(event))
-{
-	wxDirDialog dlg(this);
-	dlg.SetPath(m_recdir->GetLabel());
-	if (dlg.ShowModal() == wxID_OK) {
-		m_recdir->SetLabel(dlg.GetPath());
-	}
-}
-
-void wxGPACControl::OnUseFileName(wxCommandEvent &WXUNUSED(event))
-{
-	if (m_usename->GetValue()) {
-		m_recfile->Enable();
-		m_recfile->SetValue(wxT("record"));
-	} else {
-		m_recfile->Disable();
-		m_recfile->SetValue(wxT("uses service URL"));
-	}
-}
-
-void wxGPACControl::ForceAudio(wxCommandEvent &WXUNUSED(event))
-{
-	if (m_forcecfg->GetValue()) {
-		m_nbbuf->Enable();
-		m_buflen->Enable();
-	} else {
-		m_nbbuf->Disable();
-		m_buflen->Disable();
-	}
-}
-
-void wxGPACControl::OnSetAudioDriver(wxCommandEvent &WXUNUSED(event))
-{
-#ifdef WIN32
-	if (strstr(m_audio->GetStringSelection().mb_str(wxConvUTF8), "DirectSound")) {
-		m_notifs->Enable(1);
-	} else {
-		m_notifs->Enable(0);
-	}
-#endif
-}
-
-
-
-void wxGPACControl::Apply(wxCommandEvent &WXUNUSED(event))
-{
-	/*save options*/
-	GF_Config *cfg = m_pApp->m_user.config;
-
-	m_pApp->m_loop = m_loop->GetValue() ? 1 : 0;
-	gf_cfg_set_key(cfg, "General", "Loop", m_loop->GetValue() ? "yes" : "no");
-	m_pApp->m_lookforsubs = m_lookforsubs->GetValue() ? 1 : 0;
-	gf_cfg_set_key(cfg, "General", "LookForSubtitles",  m_lookforsubs->GetValue() ? "yes" : "no");
-	m_pApp->m_console_off = m_noconsole->GetValue() ? 1 : 0;
-	gf_cfg_set_key(cfg, "General", "ConsoleOff", m_noconsole->GetValue() ? "yes" : "no");
-	gf_cfg_set_key(cfg, "General", "ViewXMT", m_viewxmt->GetValue() ? "yes" : "no");
-
-	s32 sel = m_lang->GetSelection();
-	gf_cfg_set_key(cfg, "Systems", "LanguageName", gf_lang_get_name(sel) );
-	gf_cfg_set_key(cfg, "Systems", "Language3CC", gf_lang_get_3cc(sel) );
-	gf_cfg_set_key(cfg, "Systems", "Language2CC", gf_lang_get_2cc(sel) );
-
-
-	sel = m_thread->GetSelection();
-	gf_cfg_set_key(cfg, "Systems", "ThreadingPolicy", (sel==0) ? "Single" : ( (sel==1) ? "Multi" : "Free"));
-	gf_cfg_set_key(cfg, "Systems", "ForceSingleClock", m_singletime->GetValue() ? "yes" : "no");
-	gf_cfg_set_key(cfg, "Systems", "AlwaysDrawBIFS", m_bifsalwaysdrawn->GetValue() ? "yes" : "no");
-
-	gf_cfg_set_key(cfg, "Systems", "DefAudioDec", m_decaudio->GetStringSelection().mb_str(wxConvUTF8));
-	gf_cfg_set_key(cfg, "Systems", "DefVideoDec", m_decvideo->GetStringSelection().mb_str(wxConvUTF8));
-
-
-	gf_cfg_set_key(cfg, "Compositor", "HighSpeed", m_fast->GetValue() ? "yes" : "no");
-	gf_cfg_set_key(cfg, "Compositor", "ForceSceneSize", m_force_size->GetValue() ? "yes" : "no");
-
-	gf_cfg_set_key(cfg, "Compositor", "FrameRate", BIFSRatesm_fps->GetSelection());
-	sel = m_aa->GetSelection();
-	gf_cfg_set_key(cfg, "Compositor", "AntiAlias", (sel==0) ? "None" : ( (sel==1) ? "Text" : "All"));
-	sel = m_draw_bounds->GetSelection();
-	gf_cfg_set_key(cfg, "Compositor", "BoundingVolume", (sel==2) ? "AABB" : (sel==1) ? "Box" : "None");
-
-	Bool is_3D = m_use3D->GetValue() ? 1 : 0;
-	if (m_bWas3D != is_3D) {
-		/*FIXME*/
-	}
-	gf_cfg_set_key(cfg, "core", "raster2d", m_graph->GetStringSelection().mb_str(wxConvUTF8));
-
-	gf_cfg_set_key(cfg, "Compositor", "DirectDraw", m_direct->GetValue() ? "yes" : "no");
-	gf_cfg_set_key(cfg, "Compositor", "ScalableZoom", m_scalable->GetValue() ? "yes" : "no");
-	gf_cfg_set_key(cfg, "Compositor", "DisableYUV", m_noyuv->GetValue() ? "yes" : "no");
-
-	gf_cfg_set_key(cfg, "Compositor", "RasterOutlines", m_raster_outlines->GetValue() ? "yes" : "no");
-	gf_cfg_set_key(cfg, "Compositor", "EmulatePOW2", m_emulpow2->GetValue() ? "yes" : "no");
-	gf_cfg_set_key(cfg, "Compositor", "PolygonAA", m_polyaa->GetValue() ? "yes" : "no");
-	gf_cfg_set_key(cfg, "Compositor", "DisableRectExt", m_norectext->GetValue() ? "yes" : "no");
-	gf_cfg_set_key(cfg, "Compositor", "BitmapCopyPixels", m_copypixels->GetValue() ? "yes" : "no");
-	gf_cfg_set_key(cfg, "Compositor", "BackFaceCulling", m_nobackcull->GetValue() ? "Off" : "On");
-
-	sel = m_wire->GetSelection();
-	gf_cfg_set_key(cfg, "Compositor", "Wireframe", (sel==2) ? "WireOnSolid" : ( (sel==1) ? "WireOnly" : "WireNone" ) );
-	sel = m_normals->GetSelection();
-	gf_cfg_set_key(cfg, "Compositor", "DrawNormals", (sel==2) ? "PerVertex" : ( (sel==1) ? "PerFace" : "Never" ) );
-
-	gf_cfg_set_key(cfg, "core", "switch-vres", m_switchres->GetValue() ? "yes" : "no");
-	gf_cfg_set_key(cfg, "core", "hwvmem", m_usehwmem->GetValue() ? "yes" : "no");
-	gf_cfg_set_key(cfg, "core", "video-output", m_video->GetStringSelection().mb_str(wxConvUTF8));
-
-
-	gf_cfg_set_key(cfg, "Audio", "ForceConfig", m_forcecfg->GetValue() ? "yes" : "no");
-	gf_cfg_set_key(cfg, "Audio", "NoResync", m_noresync->GetValue() ? "yes" : "no");
-	gf_cfg_set_key(cfg, "Audio", "DisableMultiChannel", m_nomulitch->GetValue() ? "yes" : "no");
-
-	gf_cfg_set_key(cfg, "Audio", "NumBuffers", wxString::Format(wxT("%d"), m_nbbuf->GetValue()).mb_str(wxConvUTF8) );
-	gf_cfg_set_key(cfg, "Audio", "TotalDuration", wxString::Format(wxT("%d"), m_buflen->GetValue()).mb_str(wxConvUTF8) );
-	gf_cfg_set_key(cfg, "core", "audio-output", m_audio->GetStringSelection().mb_str(wxConvUTF8));
-#ifdef WIN32
-	if (m_notifs->IsEnabled())
-		gf_cfg_set_key(cfg, "Audio", "DisableNotification", m_notifs->GetValue() ? "yes" : "no");
-#endif
-
-	gf_cfg_set_key(cfg, "FontCache", "FontReader", m_font->GetStringSelection().mb_str(wxConvUTF8));
-	gf_cfg_set_key(cfg, "FontCache", "FontDirectory", m_fontdir->GetLabel().mb_str(wxConvUTF8));
-	switch (m_texturemode->GetSelection()) {
-	case 2:
-		gf_cfg_set_key(cfg, "Compositor", "TextureTextMode", "Always");
-		break;
-	case 1:
-		gf_cfg_set_key(cfg, "Compositor", "TextureTextMode", "Never");
-		break;
-	default:
-		gf_cfg_set_key(cfg, "Compositor", "TextureTextMode", "Default");
-		break;
-	}
-
-	gf_cfg_set_key(cfg, "Core", "CleanCache", m_cleancache->GetValue() ? "yes" : "no");
-	gf_cfg_set_key(cfg, "Core", "RestartFiles", m_restartcache->GetValue() ? "yes" : "no");
-	gf_cfg_set_key(cfg, "SAXLoader", "Progressive", m_progressive->GetValue() ? "yes" : "no");
-	gf_cfg_set_key(cfg, "SAXLoader", "MaxDuration", m_sax_duration->GetLabel().mb_str(wxConvUTF8));
-	gf_cfg_set_key(cfg, "Core", "CacheDirectory", m_cachedir->GetLabel().mb_str(wxConvUTF8));
-
-
-	Bool force_rtsp = 0;
-	switch (m_port->GetSelection()) {
-	case 3:
-		gf_cfg_set_key(cfg, "Streaming", "DefaultPort", "8080");
-		force_rtsp = 1;
-		break;
-	case 2:
-		gf_cfg_set_key(cfg, "Streaming", "DefaultPort", "80");
-		force_rtsp = 1;
-		break;
-	case 1:
-		gf_cfg_set_key(cfg, "Streaming", "DefaultPort", "7070");
-		break;
-	default:
-		gf_cfg_set_key(cfg, "Streaming", "DefaultPort", "554");
-		break;
-	}
-
-	if (force_rtsp) {
-		gf_cfg_set_key(cfg, "Streaming", "RTPoverRTSP", "yes");
-	} else {
-		gf_cfg_set_key(cfg, "Streaming", "RTPoverRTSP", m_rtsp->GetValue() ? "yes" : "no");
-		if (!m_rtsp->GetValue()) gf_cfg_set_key(cfg, "Streaming", "ReorderSize", m_dorebuffer->GetValue() ? "30" : "0");
-	}
-
-	gf_cfg_set_key(cfg, "Streaming", "RTSPTimeout", m_timeout->GetValue().mb_str(wxConvUTF8));
-	gf_cfg_set_key(cfg, "Network", "BufferLength", m_buffer->GetValue().mb_str(wxConvUTF8));
-	if (m_dorebuffer->GetValue()) {
-		gf_cfg_set_key(cfg, "Network", "RebufferLength", m_rebuffer->GetValue().mb_str(wxConvUTF8));
-	} else {
-		gf_cfg_set_key(cfg, "Network", "RebufferLength", "0");
-	}
-
-	gf_cfg_set_key(cfg, "StreamingCache", "KeepExistingFiles", m_overwrite->GetValue() ? "no" : "yes");
-	if (m_usename->GetValue()) {
-		gf_cfg_set_key(cfg, "StreamingCache", "BaseFileName", m_recfile->GetValue().mb_str(wxConvUTF8));
-	} else {
-		gf_cfg_set_key(cfg, "StreamingCache", "BaseFileName", NULL);
-	}
-	gf_cfg_set_key(cfg, "StreamingCache", "RecordDirectory", m_recdir->GetLabel().mb_str(wxConvUTF8));
-
-
-	gf_term_set_option(m_pApp->m_term, GF_OPT_RELOAD_CONFIG, 1);
-}
-

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/osmo4_wx/wxGPACControl.h Deleted

@@ -1,138 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2012
- *					All rights reserved
- *
- *  This file is part of GPAC / Osmo4 wxWidgets GUI
- *
- *  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.
- *
- *
- */
-
-#ifndef _OPTIONS_H
-#define _OPTIONS_H
-
-#include "wx/wxprec.h"
-
-#ifndef WX_PRECOMP
-#include "wx/wx.h"
-#endif
-
-#include <wx/spinbutt.h>
-#include <wx/spinctrl.h>
-
-enum
-{
-	ID_SELECT = 1000,
-	ID_APPLY,
-
-	ID_MAKE_DEF,
-	ID_FORCE_AUDIO,
-	ID_AUDIO_DRIVER,
-	ID_FONT_DIR,
-	ID_CACHE_DIR,
-	ID_PROGRESSIVE,
-	ID_RTSP_PORT,
-	ID_RTP_OVER_RTSP,
-	ID_RTSP_REBUFFER,
-	ID_RECORD_DIR,
-	ID_USE_FILENAME,
-	ID_USE_PROXY,
-};
-
-class wxOsmo4Frame;
-class wxGPACControl : public wxDialog
-{
-public:
-	wxGPACControl(wxWindow *parent);
-	virtual ~wxGPACControl();
-
-private:
-	DECLARE_EVENT_TABLE()
-
-	wxOsmo4Frame *m_pApp;
-
-	wxComboBox *m_select;
-	Bool m_bWas3D;
-
-	void Apply(wxCommandEvent &event);
-	void OnSetSelection(wxCommandEvent &event);
-	void ForceAudio(wxCommandEvent &event);
-	void OnSetAudioDriver(wxCommandEvent &event);
-	void FontDir(wxCommandEvent &event);
-	void CacheDir(wxCommandEvent &event);
-	void OnProgressive(wxCommandEvent &event);
-	void OnUseProxy(wxCommandEvent &event);
-	void RTPoverRTSP(wxCommandEvent &event);
-	void Rebuffer(wxCommandEvent &event);
-	void OnSetRTSPPort(wxCommandEvent &event);
-	void OnUseFileName(wxCommandEvent &event);
-	void OnRecDir(wxCommandEvent &event);
-	void DoSelect();
-	s32 m_sel;
-	void SetYUVLabel();
-
-	wxBoxSizer *s_header, *s_main, *s_general, *s_mpeg4, *s_mdec, *s_rend, *s_rend2d, *s_rend3d, *s_audio, *s_video, *s_font, *s_dnld, *s_stream, *s_rec;
-
-	/*general section*/
-	wxCheckBox *m_loop, *m_lookforsubs, *m_noconsole, *m_viewxmt;
-	/*MPEG-4 systems*/
-	wxCheckBox *m_bifsalwaysdrawn, *m_singletime;
-	wxComboBox *m_lang, *m_thread;
-	/*media decoders*/
-	wxComboBox *m_decaudio, *m_decvideo;
-	/*Rendering*/
-	wxComboBox *m_fps, *m_aa, *m_draw_bounds;
-	wxCheckBox *m_use3D, *m_fast, *m_force_size;
-	/*Renderer 2D*/
-	wxComboBox *m_graph;
-	wxCheckBox *m_noyuv, *m_direct, *m_scalable;
-	wxStaticText *m_yuvtxt;
-	/*Renderer 3D*/
-	wxCheckBox *m_raster_outlines, *m_polyaa, *m_nobackcull, *m_emulpow2, *m_norectext, *m_copypixels;
-	wxComboBox *m_wire, *m_normals;
-	/*video*/
-	wxComboBox *m_video;
-	wxCheckBox *m_switchres, *m_usehwmem;
-	/*audio*/
-	wxSpinCtrl *m_nbbuf, *m_buflen;
-	wxComboBox *m_audio;
-	wxCheckBox *m_forcecfg, *m_noresync, *m_nomulitch;
-#ifdef WIN32
-	wxCheckBox *m_notifs;
-#endif
-	/*font*/
-	wxComboBox *m_font;
-	wxButton *m_fontdir;
-	wxComboBox *m_texturemode;
-	/*file download*/
-	wxButton *m_cachedir;
-	wxCheckBox *m_cleancache, *m_restartcache, *m_progressive, *m_use_proxy;
-	wxTextCtrl *m_sax_duration, *m_proxy_name;
-	/*streaming*/
-	wxComboBox *m_port;
-	wxCheckBox *m_rtsp, *m_reorder, *m_dorebuffer;
-	wxTextCtrl *m_timeout, *m_buffer, *m_rebuffer;
-	/*file recorder*/
-	wxButton *m_recdir;
-	wxCheckBox *m_overwrite, *m_usename;
-	wxTextCtrl *m_recfile;
-};
-
-#endif
-

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/osmo4_wx/wxOsmo4.cpp Deleted

@@ -1,2392 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2012
- *					All rights reserved
- *
- *  This file is part of GPAC / Osmo4 wxWidgets GUI
- *
- *  GPAC is gf_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 "wxOsmo4.h"
-#include "wxGPACControl.h"
-#include "fileprops.h"
-#include <wx/image.h>
-#include <gpac/modules/service.h>
-#include <gpac/network.h>
-#include <gpac/constants.h>
-#include <gpac/options.h>
-
-
-IMPLEMENT_APP(wxOsmo4App)
-
-#include "osmo4.xpm"
-
-#include <wx/dnd.h>
-
-
-
-
-
-#include <wx/filename.h>
-#include <wx/clipbrd.h>
-
-#include "toolbar.xpm"
-
-#include "Playlist.h"
-
-#ifdef WIN32
-#define	FRAME_H	140
-#else
-#define	FRAME_H	110
-#endif
-
-
-wxString get_pref_browser(GF_Config *cfg)
-{
-	const char *sOpt = gf_cfg_get_key(cfg, "General", "Browser");
-	if (sOpt) return wxString(sOpt, wxConvUTF8);
-	return wxEmptyString;
-	/*
-	#ifdef __WXMAC__
-		return wxT("safari");
-	#else
-	#ifdef WIN32
-		return wxT("explorer.exe");
-	#else
-		return wxT("mozilla");
-	#endif
-	#endif*/
-}
-
-
-IMPLEMENT_DYNAMIC_CLASS(wxGPACEvent, wxEvent )
-
-wxGPACEvent::wxGPACEvent(wxWindow* win)
-{
-	SetEventType(GPAC_EVENT);
-	SetEventObject(win);
-	gpac_evt.type = 0;
-	to_url = wxT("");
-}
-wxEvent *wxGPACEvent::Clone() const
-{
-	wxGPACEvent *evt = new wxGPACEvent((wxWindow *) m_eventObject);
-	evt->to_url = to_url;
-	evt->gpac_evt = gpac_evt;
-	return evt;
-}
-
-#include <wx/wx.h>
-
-/*open file dlg*/
-BEGIN_EVENT_TABLE(OpenURLDlg, wxDialog)
-	EVT_BUTTON(ID_URL_GO, OpenURLDlg::OnGo)
-END_EVENT_TABLE()
-
-OpenURLDlg::OpenURLDlg(wxWindow *parent, GF_Config *cfg)
-	: wxDialog(parent, -1, wxString(wxT("Enter remote presentation location")))
-{
-#ifndef WIN32
-	SetSize(430, 35);
-#else
-	SetSize(430, 55);
-#endif
-	Centre();
-	m_url = new wxComboBox(this, -1, wxT(""), wxDefaultPosition, wxDefaultSize, 0, NULL, wxCB_DROPDOWN);
-	m_url->SetSize(0, 2, 340, 18, wxSIZE_AUTO);
-	m_go = new wxButton(this, ID_URL_GO, wxT("Go !"));
-#ifndef WIN32
-	m_go->SetSize(344, 2, 20, 18, wxSIZE_AUTO);
-#else
-	m_go->SetSize(364, 2, 30, 18, wxSIZE_AUTO);
-#endif
-	m_urlVal = wxT("");
-
-	m_cfg = cfg;
-
-	const char *sOpt;
-	u32 i=0;
-
-	while (1) {
-		sOpt = gf_cfg_get_key_name(m_cfg, "RecentFiles", i);
-		if (!sOpt) break;
-		m_url->Append(wxString(sOpt, wxConvUTF8) );
-		i++;
-	}
-}
-
-#define MAX_LAST_FILES		20
-void UpdateLastFiles(GF_Config *cfg, const char *URL)
-{
-	u32 nb_entries;
-	gf_cfg_set_key(cfg, "RecentFiles", URL, NULL);
-	gf_cfg_insert_key(cfg, "RecentFiles", URL, "", 0);
-	/*remove last entry if needed*/
-	nb_entries = gf_cfg_get_key_count(cfg, "RecentFiles");
-	if (nb_entries>MAX_LAST_FILES) {
-		gf_cfg_set_key(cfg, "RecentFiles", gf_cfg_get_key_name(cfg, "RecentFiles", nb_entries-1), NULL);
-	}
-}
-
-void OpenURLDlg::OnGo(wxCommandEvent& event)
-{
-	m_urlVal = m_url->GetValue();
-	UpdateLastFiles(m_cfg, m_urlVal.mb_str(wxConvUTF8));
-	EndModal(wxID_OK);
-}
-/*end open file dlg*/
-
-#ifdef WIN32
-u32 get_sys_col(int idx)
-{
-	u32 res;
-	DWORD val = GetSysColor(idx);
-	res = (val)&0xFF;
-	res<<=8;
-	res |= (val>>8)&0xFF;
-	res<<=8;
-	res |= (val>>16)&0xFF;
-	return res;
-}
-#endif
-
-static void wxOsmo4_progress_cbk(const void *usr, const char *title, u64 done, u64 total)
-{
-	if (!total) return;
-	wxOsmo4Frame *app = (wxOsmo4Frame *)usr;
-	s32 prog = (s32) ( (100 * (u64)done) / total);
-	if (app->m_last_prog < prog) {
-		app->m_last_prog = prog;
-
-		if (prog<100) {
-			/*appears to crash wxWidgets / X11 when refreshing the text too often*/
-			if (app->m_LastStatusTime + 200 > gf_sys_clock()) return;
-			char msg1024;
-			sprintf(msg, "%s %02d %%)", title, prog);
-			//app->SetStatus(wxString(msg, wxConvUTF8));
-		} else {
-			app->SetStatus(wxT("Ready"));
-			app->m_last_prog = -1;
-		}
-	}
-}
-
-Bool GPAC_EventProc(void *ptr, GF_Event *evt)
-{
-	wxCommandEvent event;
-	wxOsmo4Frame *app = (wxOsmo4Frame *)ptr;
-
-	switch (evt->type) {
-	case GF_EVENT_DURATION:
-		app->m_duration = (u32) (evt->duration.duration*1000);
-		app->m_can_seek = evt->duration.can_seek;
-		if (app->m_duration<1100) app->m_can_seek = 0;
-		app->m_pProg->Enable(app->m_can_seek ? 1 : 0);
-		app->m_pPlayList->SetDuration((u32) evt->duration.duration);
-		break;
-	case GF_EVENT_MESSAGE:
-	{
-		const char *servName;
-		if (!evt->message.service || !strcmp(evt->message.service, app->m_pPlayList->GetURL().mb_str(wxConvUTF8))) {
-			servName = "main service";
-		} else {
-			servName = evt->message.service;
-		}
-		if (!evt->message.message) return 0;
-
-		if (evt->message.error) {
-			app->SetStatus(wxString(evt->message.message, wxConvUTF8) + wxT(" (") + wxString(servName, wxConvUTF8) + wxT(")") );
-			if (!app->m_connected) app->m_pPlayList->SetDead();
-		}
-		else if (!app->m_console_off) {
-			if (strstr(evt->message.message, "100 %")) {
-				app->SetStatus(wxT(""));
-			} else {
-				app->SetStatus(wxString(evt->message.message, wxConvUTF8) );
-			}
-		}
-
-#if 0
-		/*log*/
-		if (evt->message.error)
-			::wxLogMessage(wxString(evt->message.message, wxConvUTF8) + wxT(" (") + wxString(servName, wxConvUTF8) + wxT(") ") + wxString(gf_error_to_string(evt->message.error), wxConvUTF8) );
-		else
-			::wxLogMessage(wxString(evt->message.message, wxConvUTF8) + wxT(" (") + wxString(servName, wxConvUTF8) + wxT(")"));
-#endif
-	}
-	break;
-	case GF_EVENT_PROGRESS:
-	{
-		const char *sTitle;
-		if (evt->progress.progress_type==0) sTitle = (char *)"Buffer";
-		else if (evt->progress.progress_type==1) sTitle = (char *)"Download";
-		else if (evt->progress.progress_type==2) sTitle = (char *)"Import";
-		gf_set_progress(sTitle, evt->progress.done, evt->progress.total);
-	}
-	break;
-	case GF_EVENT_KEYDOWN:
-		if (app->m_can_seek && (evt->key.flags & GF_KEY_MOD_ALT)) {
-			s32 res;
-			switch (evt->key.key_code) {
-			case GF_KEY_LEFT:
-				res = gf_term_get_time_in_ms(app->m_term) - 5*app->m_duration/100;
-				if (res<0) res=0;
-				gf_term_play_from_time(app->m_term, res, 0);
-				break;
-			case GF_KEY_RIGHT:
-				res = gf_term_get_time_in_ms(app->m_term) + 5*app->m_duration/100;
-				if ((u32) res>=app->m_duration) res = 0;
-				gf_term_play_from_time(app->m_term, res, 0);
-				break;
-			case GF_KEY_DOWN:
-				res = gf_term_get_time_in_ms(app->m_term) - 60000;
-				if (res<0) res=0;
-				gf_term_play_from_time(app->m_term, res, 0);
-				break;
-			case GF_KEY_UP:
-				res = gf_term_get_time_in_ms(app->m_term) + 60000;
-				if ((u32) res>=app->m_duration) res = 0;
-				gf_term_play_from_time(app->m_term, res, 0);
-				break;
-			}
-		} else if (evt->key.flags & GF_KEY_MOD_CTRL) {
-			switch (evt->key.key_code) {
-			case GF_KEY_LEFT:
-				app->m_pPlayList->PlayPrev();
-				break;
-			case GF_KEY_RIGHT:
-				app->m_pPlayList->PlayNext();
-				break;
-			}
-		} else {
-			switch (evt->key.key_code) {
-			case GF_KEY_HOME:
-				gf_term_set_option(app->m_term, GF_OPT_NAVIGATION_TYPE, 1);
-				break;
-			case GF_KEY_ESCAPE:
-				if (gf_term_get_option(app->m_term, GF_OPT_FULLSCREEN))
-					gf_term_set_option(app->m_term, GF_OPT_FULLSCREEN, 0);
-				break;
-			default:
-			{
-				wxGPACEvent wxevt(app);
-				wxevt.gpac_evt = *evt;
-				app->AddPendingEvent(wxevt);
-			}
-			break;
-			}
-		}
-		break;
-
-	case GF_EVENT_CONNECT:
-	{
-		wxGPACEvent wxevt(app);
-		wxevt.gpac_evt.type = GF_EVENT_CONNECT;
-		wxevt.gpac_evt.connect.is_connected = evt->connect.is_connected;
-		if (!evt->connect.is_connected) app->m_duration = 0;
-		app->AddPendingEvent(wxevt);
-	}
-	break;
-	case GF_EVENT_NAVIGATE:
-	{
-		wxGPACEvent wxevt(app);
-		wxevt.to_url = wxString(evt->navigate.to_url, wxConvUTF8);
-		wxevt.gpac_evt.type = evt->type;
-		app->AddPendingEvent(wxevt);
-	}
-	return 1;
-	case GF_EVENT_SET_CAPTION:
-	{
-		wxGPACEvent wxevt(app);
-		wxevt.to_url = wxString(evt->caption.caption, wxConvUTF8);
-		wxevt.gpac_evt.type = evt->type;
-		app->AddPendingEvent(wxevt);
-	}
-	return 1;
-
-	case GF_EVENT_QUIT:
-	case GF_EVENT_VIEWPOINTS:
-	case GF_EVENT_STREAMLIST:
-	case GF_EVENT_SCENE_SIZE:
-//	case GF_EVENT_SIZE:
-	{
-		wxGPACEvent wxevt(app);
-		wxevt.gpac_evt = *evt;
-		app->AddPendingEvent(wxevt);
-	}
-	break;
-	case GF_EVENT_DBLCLICK:
-		gf_term_set_option(app->m_term, GF_OPT_FULLSCREEN, !gf_term_get_option(app->m_term, GF_OPT_FULLSCREEN));
-		return 0;
-	case GF_EVENT_MOUSEDOWN:
-		if (!gf_term_get_option(app->m_term, GF_OPT_FULLSCREEN)) {
-#ifdef __WXGTK__
-			app->m_pVisual->SetFocus();
-#else
-			app->m_pView->SetFocus();
-#endif
-		}
-		break;
-	case GF_EVENT_AUTHORIZATION:
-	{
-		wxGPACEvent wxevt(app);
-		wxTextEntryDialog user_d (0,
-		                          wxT("Please set the user name for connection"),
-		                          wxString(evt->auth.site_url, wxConvUTF8),
-		                          wxString(evt->auth.user, wxConvUTF8));
-		if (user_d.ShowModal() != wxID_OK)
-			return 0;
-		strncpy(evt->auth.user, user_d.GetValue().mb_str(wxConvUTF8), 50);
-		wxPasswordEntryDialog passwd_d(0,
-		                               wxT("Please enter password"),
-		                               wxString(evt->auth.site_url, wxConvUTF8),
-		                               wxString(evt->auth.password, wxConvUTF8));
-		if (passwd_d.ShowModal() != wxID_OK)
-			return 0;
-		strncpy(evt->auth.password, passwd_d.GetValue().mb_str(wxConvUTF8), 50);
-		return 1;
-	}
-	case GF_EVENT_SYS_COLORS:
-#ifdef WIN32
-		evt->sys_cols.sys_colors0 = get_sys_col(COLOR_ACTIVEBORDER);
-		evt->sys_cols.sys_colors1 = get_sys_col(COLOR_ACTIVECAPTION);
-		evt->sys_cols.sys_colors2 = get_sys_col(COLOR_APPWORKSPACE);
-		evt->sys_cols.sys_colors3 = get_sys_col(COLOR_BACKGROUND);
-		evt->sys_cols.sys_colors4 = get_sys_col(COLOR_BTNFACE);
-		evt->sys_cols.sys_colors5 = get_sys_col(COLOR_BTNHIGHLIGHT);
-		evt->sys_cols.sys_colors6 = get_sys_col(COLOR_BTNSHADOW);
-		evt->sys_cols.sys_colors7 = get_sys_col(COLOR_BTNTEXT);
-		evt->sys_cols.sys_colors8 = get_sys_col(COLOR_CAPTIONTEXT);
-		evt->sys_cols.sys_colors9 = get_sys_col(COLOR_GRAYTEXT);
-		evt->sys_cols.sys_colors10 = get_sys_col(COLOR_HIGHLIGHT);
-		evt->sys_cols.sys_colors11 = get_sys_col(COLOR_HIGHLIGHTTEXT);
-		evt->sys_cols.sys_colors12 = get_sys_col(COLOR_INACTIVEBORDER);
-		evt->sys_cols.sys_colors13 = get_sys_col(COLOR_INACTIVECAPTION);
-		evt->sys_cols.sys_colors14 = get_sys_col(COLOR_INACTIVECAPTIONTEXT);
-		evt->sys_cols.sys_colors15 = get_sys_col(COLOR_INFOBK);
-		evt->sys_cols.sys_colors16 = get_sys_col(COLOR_INFOTEXT);
-		evt->sys_cols.sys_colors17 = get_sys_col(COLOR_MENU);
-		evt->sys_cols.sys_colors18 = get_sys_col(COLOR_MENUTEXT);
-		evt->sys_cols.sys_colors19 = get_sys_col(COLOR_SCROLLBAR);
-		evt->sys_cols.sys_colors20 = get_sys_col(COLOR_3DDKSHADOW);
-		evt->sys_cols.sys_colors21 = get_sys_col(COLOR_3DFACE);
-		evt->sys_cols.sys_colors22 = get_sys_col(COLOR_3DHIGHLIGHT);
-		evt->sys_cols.sys_colors23 = get_sys_col(COLOR_3DLIGHT);
-		evt->sys_cols.sys_colors24 = get_sys_col(COLOR_3DSHADOW);
-		evt->sys_cols.sys_colors25 = get_sys_col(COLOR_WINDOW);
-		evt->sys_cols.sys_colors26 = get_sys_col(COLOR_WINDOWFRAME);
-		evt->sys_cols.sys_colors27 = get_sys_col(COLOR_WINDOWTEXT);
-		return 1;
-#else
-		memset(evt->sys_cols.sys_colors, 0, sizeof(u32)*28);
-		return 1;
-#endif
-	}
-	return 0;
-}
-
-
-
-bool wxOsmo4App::OnInit()
-{
-#ifdef __WXGTK__
-	XSynchronize((Display *) wxGetDisplay(), 1);
-#endif
-	wxFrame *frame = new wxOsmo4Frame();
-	frame->Show(TRUE);
-	SetTopWindow(frame);
-	return true;
-}
-
-
-class myDropfiles : public wxFileDropTarget
-{
-public:
-	myDropfiles() : wxFileDropTarget() {}
-	virtual bool OnDropFiles(wxCoord x, wxCoord y, const wxArrayString& filenames);
-	wxOsmo4Frame *m_pMain;
-};
-
-bool myDropfiles::OnDropFiles(wxCoord x, wxCoord y, const wxArrayString& filenames)
-{
-	u32 count = filenames.GetCount();
-
-	if (count==1) {
-		const char *ext = strrchr(filenames.Item(0).mb_str(wxConvUTF8) , '.');
-		/*if playing and sub d&d, open sub in current presentation*/
-		if (m_pMain->m_connected && ext && ( !stricmp(ext, ".srt") || !stricmp(ext, ".sub") || !stricmp(ext, ".ttxt") || !stricmp(ext, ".xml") ) ) {
-			m_pMain->AddSubtitle(filenames.Item(0).mb_str(wxConvUTF8) , 1);
-			return TRUE;
-		}
-	}
-
-	for (u32 i=0; i<count; i++)
-		m_pMain->m_pPlayList->QueueURL(filenames.Item(i));
-
-	m_pMain->m_pPlayList->RefreshList();
-	m_pMain->m_pPlayList->PlayNext();
-	return TRUE;
-}
-
-bool GPACLogs::OnFrameClose(wxFrame *frame)
-{
-	Show(FALSE);
-	return 0;
-}
-
-void wxOsmo4Frame::ShowViewWindow(Bool do_show)
-{
-	m_pView->Show(do_show ? 1 : 0);
-#ifdef __WXGTK__
-	//m_pView->Show(0);
-#endif
-}
-
-#ifdef __WXGTK__
-extern "C" {
-#ifdef __WXGTK20__
-	int gdk_x11_drawable_get_xid( void * );
-	void *gdk_x11_drawable_get_xdisplay( void * );
-#endif
-	void *gtk_widget_get_parent_window( void * );
-}
-#endif
-
-
-void wxOsmo4Frame::CheckVideoOut()
-{
-	const char *sOpt = gf_cfg_get_key(m_user.config, "core", "video-output");
-	void *os_handle = NULL;
-	void *os_display = NULL;
-	/*build a child window for embed display*/
-	if (sOpt && stricmp(sOpt, "SDL Video Output")) {
-		if (m_user.os_window_handler) return;
-		m_bExternalView = 0;
-
-#ifdef __WXGTK__
-		GtkWidget* widget = m_pVisual->GetHandle();
-
-#ifdef __WXGTK20__
-		os_handle = (void *) gdk_x11_drawable_get_xid(gtk_widget_get_parent_window(widget));
-#else
-		os_handle = (void *)*(int *)( (char *)gtk_widget_get_parent_window(widget) + 2 * sizeof(void *) );
-#endif
-
-#elif defined (WIN32)
-		os_handle = m_pView->GetHandle();
-#endif
-		if (os_handle) {
-			m_user.os_window_handler = os_handle;
-			m_user.os_display = os_display;
-			ShowViewWindow(1);
-			m_pView->SetSize(320, 240);
-			SetSize(wxSize(320, 240+FRAME_H));
-			SetWindowStyle(wxDEFAULT_FRAME_STYLE);
-			DoLayout(320, 240);
-			return;
-		}
-	}
-	/*we're using SDL, don't use SDL hack*/
-	m_bExternalView = 1;
-	m_user.os_window_handler = 0;
-	m_user.os_display = NULL;
-	SetSize(wxSize(320,FRAME_H));
-	m_pView->SetSize(0, 0);
-	ShowViewWindow(0);
-	DoLayout();
-	SetWindowStyle(wxDEFAULT_FRAME_STYLE & ~(wxMAXIMIZE_BOX | wxRESIZE_BORDER));
-}
-
-static void wxOsmo4_do_log(void *cbk, GF_LOG_Level level, GF_LOG_Tool tool, const char *fmt, va_list list)
-{
-	wxOsmo4Frame *osmo = (wxOsmo4Frame *)cbk;
-
-	if (osmo->m_logs) {
-		vfprintf(osmo->m_logs, fmt, list);
-		fflush(osmo->m_logs);
-	} else {
-		::wxVLogMessage(wxString(fmt, wxConvUTF8), list);
-	}
-}
-
-
-Bool wxOsmo4Frame::LoadTerminal()
-{
-	m_term = NULL;
-	memset(&m_user, 0, sizeof(GF_User));
-
-	/*locate exec dir for cfg file*/
-	wxPathList pathList;
-	wxString currentDir(wxGetCwd());
-	wxString abs_gpac_path = wxT("");
-	char *gpac_cfg, *sep;
-
-	::wxLogMessage(wxT("Looking for GPAC configuration file"));
-
-	/*load config*/
-	Bool first_launch = 0;
-	m_user.config = gf_cfg_init(NULL, &first_launch);
-
-	if (!m_user.config) {
-		wxMessageDialog(NULL, wxT("Cannot open GPAC configuration file"), wxT("Init error"), wxOK);
-		return 0;
-	}
-
-	gpac_cfg = gf_cfg_get_filename(m_user.config);
-	sep = strrchr(gpac_cfg, '/');
-	if (!sep) sep = strrchr(gpac_cfg, '\\');
-	if (sep) sep0 = 0;
-	strcpy(szAppPath, gpac_cfg);
-	if (sep) sep0 = '/';
-
-	/*check log file*/
-	const char *str = gf_cfg_get_key(m_user.config, "General", "LogFile");
-	if (str) m_logs = gf_fopen(str, "wt");
-	gf_log_set_callback(this, wxOsmo4_do_log);
-
-	/*set log level*/
-	gf_log_set_tools_levels( gf_cfg_get_key(m_user.config, "General", "Logs") );
-
-	gf_sys_init(GF_MemTrackerNone);
-
-	::wxLogMessage(wxT("GPAC configuration file opened - looking for modules"));
-
-	m_user.modules = gf_modules_new(str, m_user.config);
-	/*initial launch*/
-	if (!m_user.modules || !gf_modules_get_count(m_user.modules)) {
-		wxMessageDialog(NULL, wxT("No modules available - system cannot work"), wxT("Fatal Error"), wxOK).ShowModal();
-		if (m_user.modules) gf_modules_del(m_user.modules);
-		gf_cfg_del(m_user.config);
-		m_user.config = NULL;
-		return 0;
-	}
-
-	if (first_launch) {
-		u32 i;
-		for (i=0; i<gf_modules_get_count(m_user.modules); i++) {
-			GF_InputService *ifce = (GF_InputService *) gf_modules_load_interface(m_user.modules, i, GF_NET_CLIENT_INTERFACE);
-			if (!ifce) continue;
-			if (ifce) {
-				ifce->CanHandleURL(ifce, "test.test");
-				gf_modules_close_interface((GF_BaseInterface *) ifce);
-			}
-		}
-	}
-
-
-
-	::wxLogMessage(wxT("%d modules found:"), gf_modules_get_count(m_user.modules));
-	for (u32 i=0; i<gf_modules_get_count(m_user.modules); i++) {
-		::wxLogMessage(wxT("\t") + wxString(gf_modules_get_file_name(m_user.modules, i), wxConvUTF8) );
-	}
-
-	::wxLogMessage(wxT("Starting GPAC Terminal"));
-	/*now load terminal*/
-	m_user.opaque = this;
-	m_user.EventProc = GPAC_EventProc;
-
-	CheckVideoOut();
-
-	m_term = gf_term_new(&m_user);
-	if (!m_term) {
-		wxMessageDialog(NULL, wxT("Fatal Error"), wxT("Cannot load GPAC Terminal"), wxOK).ShowModal();
-		return 0;
-	} else {
-		::wxLogMessage(wxT("GPAC Terminal started") );
-	}
-	return 1;
-}
-
-
-
-wxOsmo4Frame::wxOsmo4Frame() :
-	wxFrame((wxFrame *) NULL, -1, wxT("Osmo4 - GPAC"), wxPoint(-1, -1), wxSize(320, FRAME_H), //wxDEFAULT_FRAME_STYLE & ~(wxMAXIMIZE_BOX | wxRESIZE_BORDER)
-	        wxDEFAULT_FRAME_STYLE
-	       )
-
-{
-	int ws3;
-	m_Address = NULL;
-	m_pView = NULL;
-	m_term = NULL;
-	SetIcon(wxIcon(osmo4));
-	m_bExternalView = 0;
-	m_last_prog = -1;
-	m_num_chapters = 0;
-	m_chapters_start = NULL;
-	m_bViewRTI = 0;
-	m_logs = NULL;
-	m_bStartupFile = 0;
-	gf_set_progress_callback(this, wxOsmo4_progress_cbk);
-
-	myDropfiles *droptarget = new myDropfiles();
-	droptarget->m_pMain = this;
-	SetDropTarget(droptarget);
-	m_pLogs = new GPACLogs(this);
-	m_bGrabbed = 0;
-
-	/*new menu bar*/
-	wxMenuBar *b = new wxMenuBar();
-	/*file*/
-	wxMenu *menu = new wxMenu();
-	menu->Append(GWX_FILE_OPEN, wxT("&Open File\tCtrl+O"), wxT("Open local presentation"));
-	menu->Append(GWX_FILE_OPEN_URL, wxT("&Open URL\tCtrl+U"), wxT("Open remote presentation"));
-	menu->AppendSeparator();
-	menu->Append(FILE_PROPERTIES, wxT("&Properties\tCtrl+I"), wxT("Show presentation properties"));
-	menu->Enable(FILE_PROPERTIES, 0);
-	wxMenu *smenu = new wxMenu();
-	smenu->Append(ID_MCACHE_ENABLE, wxT("&Enable"), wxT("Turns Recorder On/Off"));
-	smenu->Append(ID_MCACHE_STOP, wxT("&Stop"), wxT("Stops recording and saves"));
-	smenu->Append(ID_MCACHE_ABORT, wxT("&Abort"), wxT("Stops recording and discards"));
-	menu->Append(0, wxT("&Streaming Cache"), smenu);
-	menu->AppendSeparator();
-	menu->Append(FILE_COPY, wxT("&Copy\tCtrl+C"), wxT("Copy selected text"));
-	menu->Append(FILE_PASTE, wxT("&Paste\tCtrl+V"), wxT("Copy selected text"));
-	menu->AppendSeparator();
-	menu->Append(FILE_QUIT, wxT("E&xit"), wxT("Quit the application"));
-	b->Append(menu, wxT("&File"));
-	/*view*/
-	menu = new wxMenu();
-	vp_list = new wxMenu();
-	menu->Append(0, wxT("&Viewpoint"), vp_list);
-	smenu = new wxMenu();
-	smenu->Append(ID_HEADLIGHT, wxT("Headlight"), wxT("Turns headlight on/off"), wxITEM_CHECK);
-	smenu->AppendSeparator();
-	smenu->Append(ID_NAVIGATE_NONE, wxT("None"), wxT("Disables Navigation"), wxITEM_CHECK);
-	smenu->Append(ID_NAVIGATE_WALK, wxT("Walk"), wxT("Walk Navigation"), wxITEM_CHECK);
-	smenu->Append(ID_NAVIGATE_FLY, wxT("Fly"), wxT("Fly Navigation"), wxITEM_CHECK);
-	smenu->Append(ID_NAVIGATE_EXAMINE, wxT("Examine"), wxT("Examine Navigation"), wxITEM_CHECK);
-	smenu->Append(ID_NAVIGATE_PAN, wxT("Pan"), wxT("Pan Navigation"), wxITEM_CHECK);
-	smenu->Append(ID_NAVIGATE_SLIDE, wxT("Slide"), wxT("Slide Navigation"), wxITEM_CHECK);
-	smenu->Append(ID_NAVIGATE_ORBIT, wxT("Orbit"), wxT("Orbit Navigation"), wxITEM_CHECK);
-	smenu->Append(ID_NAVIGATE_GAME, wxT("Game"), wxT("Game Navigation"), wxITEM_CHECK);
-	smenu->AppendSeparator();
-	wxMenu *ssmenu = new wxMenu();
-	ssmenu->Append(ID_COLLIDE_NONE, wxT("None"), wxT("No Collision detection"), wxITEM_CHECK);
-	ssmenu->Append(ID_COLLIDE_REG, wxT("Regular"), wxT("Regular Collision detection"), wxITEM_CHECK);
-	ssmenu->Append(ID_COLLIDE_DISP, wxT("Displacement"), wxT("Collision detecion with camera displacement"), wxITEM_CHECK);
-	smenu->Append(0, wxT("&Collision"), ssmenu);
-	smenu->Append(ID_GRAVITY, wxT("Gravity"), wxT("Turns gravity on/off"), wxITEM_CHECK);
-	smenu->AppendSeparator();
-	smenu->Append(ID_NAVIGATE_RESET, wxT("Reset"), wxT("Reset Navigation"));
-
-	menu->Append(0, wxT("&Navigation"), smenu);
-	menu->AppendSeparator();
-	menu->Append(VIEW_FULLSCREEN, wxT("&Fullscreen"), wxT("Toggles Fullscreen"), wxITEM_CHECK);
-	menu->Append(VIEW_ORIGINAL, wxT("&Original Size"), wxT("Restore original size"));
-	smenu = new wxMenu();
-	smenu->Append(VIEW_AR_KEEP, wxT("Keep Original\tCtrl+1"), wxT("Keep original aspect ratio"), wxITEM_CHECK);
-	smenu->Append(VIEW_AR_FILL, wxT("Fill Screen\tCtrl+2"), wxT("Stretch presentation to fill screen"), wxITEM_CHECK);
-	smenu->Append(VIEW_AR_43, wxT("Ratio 4/3\tCtrl+3"), wxT("Force aspect ratio to 4/3"), wxITEM_CHECK);
-	smenu->Append(VIEW_AR_169, wxT("Ratio 16/9\tCtrl+4"), wxT("Force aspect ratio to 16/9"), wxITEM_CHECK);
-	menu->Append(0, wxT("&Aspect Ratio"), smenu);
-	smenu->Check(VIEW_AR_KEEP, 1);
-	menu->AppendSeparator();
-	menu->Append(VIEW_OPTIONS, wxT("&Options"), wxT("View Options"));
-	menu->AppendSeparator();
-	menu->Append(VIEW_RTI, wxT("&Resource Usage"), wxT("View Resource Usage"), wxITEM_CHECK);
-	menu->Append(VIEW_LOGS, wxT("&Logs"), wxT("View GPAC logs"));
-	b->Append(menu, wxT("&View"));
-
-	/*play*/
-	menu = new wxMenu();
-	sel_menu = new wxMenu();
-	sel_menu->Append(0, wxT("&Audio"), new wxMenu());
-	sel_menu->Append(0, wxT("&Video"), new wxMenu());
-	sel_menu->Append(0, wxT("&Subtitles"), new wxMenu());
-	sel_menu->AppendSeparator();
-	sel_menu->Append(ID_ADD_SUB, wxT("&Add Subtitle"), wxT("Adds subtitle"));
-	menu->Append(ID_STREAM_MENU, wxT("&Streams Selection"), sel_menu);
-	chap_menu = new wxMenu();
-	menu->Append(ID_CHAPTER_MENU, wxT("&Chapters"), chap_menu);
-
-	menu->AppendSeparator();
-	menu->Append(VIEW_PLAYLIST, wxT("&Playlist\tCtrl+L"), wxT("Show navigation history as playlist"), wxITEM_CHECK);
-	menu->Append(ID_CLEAR_NAV, wxT("&Clear History"), wxT("Clear navigation history"));
-	menu->AppendSeparator();
-	menu->Append(FILE_PLAY, wxT("&Play/Pause\tCtrl+P"), wxT("Play/Pause/Resume Presentation"));
-	menu->Append(FILE_STEP, wxT("&Step-by-Step\tCtrl+S"), wxT("Play/Pause/Resume Presentation"));
-	menu->Append(FILE_STOP, wxT("&Stop"), wxT("Stop Presentation"));
-	menu->AppendSeparator();
-	menu->Append(FILE_RELOAD_CONFIG, wxT("&Reload Config\tCtrl+R"), wxT("Reload Configuration File"));
-	menu->Append(FILE_RELOAD, wxT("&Reload File\tCtrl+R"), wxT("Reload Presentation"));
-	b->Append(menu, wxT("&Play"));
-
-	menu = new wxMenu();
-	menu->Append(APP_SHORTCUTS, wxT("&Shortcuts"), wxT("Show keyboard shortcuts"));
-	menu->Append(APP_NAV_KEYS, wxT("&Navigation Keys"), wxT("Show navigation keys"));
-	menu->AppendSeparator();
-	menu->Append(APP_ABOUT, wxT("&About"), wxT("Display information and copyright"));
-	b->Append(menu, wxT("&?"));
-
-	SetMenuBar(b);
-
-	m_pStatusbar = CreateStatusBar(1, 0, -1, wxT("statusBar"));
-	ws0 = 60;
-	ws1 = 70;
-	ws2 = -1;
-	m_pStatusbar->SetFieldsCount(3, ws);
-
-	SetStatusBarPane(2);
-	wxColour foreCol = m_pStatusbar->GetBackgroundColour();
-	SetBackgroundColour(foreCol);
-
-
-	m_pTimer = new wxTimer();
-	m_pTimer->SetOwner(this, ID_CTRL_TIMER);
-	m_bGrabbed = 0;
-
-	/*create toolbar*/
-	m_pToolBar = CreateToolBar(wxTB_FLAT|wxTB_HORIZONTAL);
-	m_pOpenFile = new wxBitmap(tool_open_file);
-	m_pPrev = new wxBitmap(tool_prev);
-	m_pNext = new wxBitmap(tool_next);
-	m_pPlay = new wxBitmap(tool_play);
-	m_pPause = new wxBitmap(tool_pause);
-	m_pStep = new wxBitmap(tool_step);
-	m_pStop = new wxBitmap(tool_stop);
-	m_pInfo = new wxBitmap(tool_info);
-	m_pConfig = new wxBitmap(tool_config);
-	m_pSW2D = new wxBitmap(tool_sw_2d);
-	m_pSW3D = new wxBitmap(tool_sw_3d);
-
-	m_pToolBar->AddTool(GWX_FILE_OPEN, wxT(""), *m_pOpenFile, wxT("Open File"));
-	m_pToolBar->AddSeparator();
-	m_pPrevBut = new wxMenuButton(m_pToolBar, FILE_PREV, *m_pPrev);
-	m_pPrevBut->SetToolTip(wxT("Previous Location"));
-	m_pToolBar->AddControl(m_pPrevBut);
-	m_pNextBut = new wxMenuButton(m_pToolBar, FILE_NEXT, *m_pNext);
-	m_pNextBut->SetToolTip(wxT("Next Location"));
-	m_pToolBar->AddControl(m_pNextBut);
-
-	m_pToolBar->AddSeparator();
-	m_pToolBar->AddTool(FILE_PLAY, wxT(""), *m_pPlay, wxT("Play/Pause File"));
-	m_pToolBar->AddTool(FILE_STEP, wxT(""), *m_pStep, wxT("Step-by-Step Mode"));
-	m_pToolBar->AddTool(FILE_STOP, wxT(""), *m_pStop, wxT("Stop File"));
-	m_pToolBar->AddSeparator();
-	m_pToolBar->AddTool(FILE_PROPERTIES, wxT(""), *m_pInfo, wxT("Show File Information"));
-	m_pToolBar->AddSeparator();
-	m_pToolBar->AddTool(VIEW_OPTIONS, wxT(""), *m_pConfig, wxT("GPAC Configuration"));
-	m_pToolBar->AddTool(SWITCH_RENDER, wxT(""), *m_pSW3D, wxT("Switch 2D/3D Renderers"));
-
-	m_pToolBar->Realize();
-
-	m_Address = new wxMyComboBox(this, ID_ADDRESS, wxT(""), wxPoint(50, 0), wxSize(80, 20));
-	wxStaticText *add_text = new wxStaticText(this, -1, wxT("URL"), wxPoint(0, 0), wxSize(40, 20));
-	add_text->SetBackgroundColour(foreCol);
-
-	m_pAddBar = new wxBoxSizer(wxHORIZONTAL);
-	m_pAddBar->Add(add_text, 0, wxALIGN_TOP);
-	m_pAddBar->Add(m_Address, 2, wxALIGN_CENTER|wxEXPAND|wxADJUST_MINSIZE);
-	m_pAddBar->SetMinSize(80, 32);
-	m_pAddBar->Layout();
-
-	m_pProg = new wxSlider(this, ID_SLIDER, 0, 0, 1000, wxPoint(0, 22), wxSize(80, 22), wxSL_HORIZONTAL|wxSUNKEN_BORDER);
-	m_pProg->Enable(0);
-	m_pProg->Show();
-	m_pProg->SetBackgroundColour(foreCol);
-
-	m_pView = new wxWindow(this, -1, wxDefaultPosition, wxDefaultSize, wxNO_BORDER);
-	m_pView->SetBackgroundColour(wxColour(wxT("BLACK")));
-#ifdef __WXGTK__
-	m_pVisual = new wxWindow(m_pView, -1, wxDefaultPosition, wxDefaultSize, wxNO_BORDER);
-	m_pVisual->SetBackgroundColour(wxColour(wxT("BLACK")));
-#endif
-
-	m_pPlayList = new wxPlaylist(this);
-	m_pPlayList->SetIcon(wxIcon(osmo4));
-	m_pPlayList->Hide();
-	Raise();
-	Show();
-
-	m_connected = 0;
-	if (!LoadTerminal()) {
-		Close(TRUE);
-		return;
-	}
-
-
-
-	if (m_bExternalView) SetWindowStyle(wxDEFAULT_FRAME_STYLE & ~(wxMAXIMIZE_BOX | wxRESIZE_BORDER));
-	DoLayout(320, 240);
-	UpdateRenderSwitch();
-
-	const char *sOpt = gf_cfg_get_key(m_user.config, "General", "ConsoleOff");
-	m_console_off = (sOpt && !stricmp(sOpt, "yes")) ? 1 : 0;
-	sOpt = gf_cfg_get_key(m_user.config, "General", "Loop");
-	m_loop = (sOpt && !stricmp(sOpt, "yes")) ? 1 : 0;
-	sOpt = gf_cfg_get_key(m_user.config, "General", "LookForSubtitles");
-	m_lookforsubs = (sOpt && !stricmp(sOpt, "yes")) ? 1 : 0;
-	gf_term_set_option(m_term, GF_OPT_AUDIO_VOLUME, 100);
-
-	ReloadURLs();
-	Raise();
-	m_pStatusbar->SetStatusText(wxT("Ready"), 2);
-	m_LastStatusTime = 0;
-
-	m_pPrevBut->Refresh();
-	m_pNextBut->Refresh();
-
-	wxOsmo4App &app = wxGetApp();
-	if (app.argc>1) {
-		m_pPlayList->QueueURL(wxString(app.argv1));
-		m_pPlayList->RefreshList();
-		m_pPlayList->PlayNext();
-	} else {
-		char sPLGF_MAX_PATH;
-		strcpy((char *) sPL, szAppPath);
-#ifdef WIN32
-		strcat(sPL, "gpac_pl.m3u");
-#else
-		strcat(sPL, ".gpac_pl.m3u");
-#endif
-		m_pPlayList->OpenPlaylist(wxString(sPL, wxConvUTF8) );
-		const char *sOpt = gf_cfg_get_key(m_user.config, "General", "PLEntry");
-		if (sOpt) {
-			m_pPlayList->m_cur_entry = atoi(sOpt);
-			if (m_pPlayList->m_cur_entry>=(s32)gf_list_count(m_pPlayList->m_entries))
-				m_pPlayList->m_cur_entry = -1;
-		}
-
-		sOpt = gf_cfg_get_key(m_user.config, "General", "StartupFile");
-		if (sOpt) {
-			gf_term_connect(m_term, sOpt);
-			m_bStartupFile = 1;
-		}
-	}
-
-	sOpt = gf_cfg_get_key(m_user.config, "core", "audio-output");
-
-	if (!strcmp(sOpt, "No Audio Output Available")) {
-		::wxLogMessage(wxT("WARNING: no audio output availble - make sure no other program is locking the sound card"));
-		SetStatus(wxT("No audio output available"));
-
-	} else {
-		SetStatus(wxT("Ready"));
-	}
-}
-
-wxOsmo4Frame::~wxOsmo4Frame()
-{
-	vp_list = NULL;
-	sel_menu = NULL;
-
-	if (m_user.modules) gf_modules_del(m_user.modules);
-	gf_sys_close();
-	if (m_user.config) gf_cfg_del(m_user.config);
-
-	if (m_chapters_start) gf_free(m_chapters_start);
-	if (m_pView) delete m_pView;
-
-	//m_pToolBar->RemoveTool(FILE_PREV);
-	//m_pToolBar->RemoveTool(FILE_NEXT);
-
-	delete m_pPrevBut;
-	delete m_pNextBut;
-	delete m_pPlayList;
-	delete m_pTimer;
-	delete m_pOpenFile;
-	delete m_pPrev;
-	delete m_pNext;
-	delete m_pPlay;
-	delete m_pPause;
-	delete m_pStep;
-	delete m_pStop;
-	delete m_pInfo;
-	delete m_pConfig;
-	delete m_pSW2D;
-	delete m_pSW3D;
-}
-
-
-BEGIN_EVENT_TABLE(wxOsmo4Frame, wxFrame)
-	EVT_CLOSE(wxOsmo4Frame::OnCloseApp)
-	EVT_MENU(GWX_FILE_OPEN, wxOsmo4Frame::OnFileOpen)
-	EVT_MENU(GWX_FILE_OPEN_URL, wxOsmo4Frame::OnFileOpenURL)
-	EVT_MENU(FILE_RELOAD_CONFIG, wxOsmo4Frame::OnFileReloadConfig)
-	EVT_MENU(FILE_RELOAD, wxOsmo4Frame::OnFileReload)
-	EVT_MENU(FILE_PROPERTIES, wxOsmo4Frame::OnFileProperties)
-	EVT_MENU(FILE_QUIT, wxOsmo4Frame::OnFileQuit)
-	EVT_MENU(VIEW_FULLSCREEN, wxOsmo4Frame::OnFullScreen)
-	EVT_MENU(VIEW_OPTIONS, wxOsmo4Frame::OnOptions)
-	EVT_MENU(VIEW_AR_KEEP, wxOsmo4Frame::OnViewARKeep)
-	EVT_MENU(VIEW_AR_FILL, wxOsmo4Frame::OnViewARFill)
-	EVT_MENU(VIEW_AR_169, wxOsmo4Frame::OnViewAR169)
-	EVT_MENU(VIEW_AR_43, wxOsmo4Frame::OnViewAR43)
-	EVT_MENU(VIEW_ORIGINAL, wxOsmo4Frame::OnViewOriginal)
-	EVT_MENU(VIEW_PLAYLIST, wxOsmo4Frame::OnPlaylist)
-	EVT_UPDATE_UI(VIEW_PLAYLIST, wxOsmo4Frame::OnUpdatePlayList)
-	EVT_MENU(FILE_COPY, wxOsmo4Frame::OnFileCopy)
-	EVT_UPDATE_UI(FILE_COPY, wxOsmo4Frame::OnUpdateFileCopy)
-	EVT_MENU(FILE_PASTE, wxOsmo4Frame::OnFilePaste)
-	EVT_UPDATE_UI(FILE_PASTE, wxOsmo4Frame::OnUpdateFilePaste)
-
-	EVT_MENU(ID_CLEAR_NAV, wxOsmo4Frame::OnClearNav)
-	EVT_UPDATE_UI(ID_STREAM_MENU, wxOsmo4Frame::OnUpdateStreamMenu)
-	EVT_UPDATE_UI(ID_CHAPTER_MENU, wxOsmo4Frame::OnUpdateChapterMenu)
-	EVT_MENU(ID_ADD_SUB, wxOsmo4Frame::OnAddSub)
-
-	EVT_MENU(ID_MCACHE_ENABLE, wxOsmo4Frame::OnCacheEnable)
-	EVT_UPDATE_UI(ID_MCACHE_ENABLE, wxOsmo4Frame::OnUpdateCacheEnable)
-	EVT_MENU(ID_MCACHE_STOP, wxOsmo4Frame::OnCacheStop)
-	EVT_MENU(ID_MCACHE_ABORT, wxOsmo4Frame::OnCacheAbort)
-	EVT_UPDATE_UI(ID_MCACHE_STOP, wxOsmo4Frame::OnUpdateCacheAbort)
-	EVT_UPDATE_UI(ID_MCACHE_ABORT, wxOsmo4Frame::OnUpdateCacheAbort)
-
-
-	EVT_MENU(APP_SHORTCUTS, wxOsmo4Frame::OnShortcuts)
-	EVT_MENU(APP_NAV_KEYS, wxOsmo4Frame::OnNavInfo)
-	EVT_MENU(APP_ABOUT, wxOsmo4Frame::OnAbout)
-	EVT_GPACEVENT(wxOsmo4Frame::OnGPACEvent)
-	EVT_TIMER(ID_CTRL_TIMER, wxOsmo4Frame::OnTimer)
-	EVT_COMMAND_SCROLL(ID_SLIDER, wxOsmo4Frame::OnSlide)
-	EVT_MENU(VIEW_LOGS, wxOsmo4Frame::OnLogs)
-	EVT_MENU(VIEW_RTI, wxOsmo4Frame::OnRTI)
-
-	EVT_MENUBUTTON_OPEN(FILE_PREV, wxOsmo4Frame::OnFilePrevOpen)
-	EVT_MENUBUTTON_OPEN(FILE_NEXT, wxOsmo4Frame::OnFileNextOpen)
-	EVT_MENU(FILE_PREV, wxOsmo4Frame::OnNavPrev)
-	EVT_UPDATE_UI(FILE_PREV, wxOsmo4Frame::OnUpdateNavPrev)
-	EVT_MENU_RANGE(ID_NAV_PREV_0, ID_NAV_PREV_9, wxOsmo4Frame::OnNavPrevMenu)
-	EVT_MENU(FILE_NEXT, wxOsmo4Frame::OnNavNext)
-	EVT_UPDATE_UI(FILE_NEXT, wxOsmo4Frame::OnUpdateNavNext)
-	EVT_MENU_RANGE(ID_NAV_NEXT_0, ID_NAV_NEXT_9, wxOsmo4Frame::OnNavNextMenu)
-
-	EVT_TOOL(FILE_PLAY, wxOsmo4Frame::OnFilePlay)
-	EVT_TOOL(FILE_STEP, wxOsmo4Frame::OnFileStep)
-	EVT_TOOL(FILE_STOP, wxOsmo4Frame::OnFileStop)
-	EVT_TOOL(SWITCH_RENDER, wxOsmo4Frame::OnRenderSwitch)
-
-	EVT_COMBOBOX(ID_ADDRESS, wxOsmo4Frame::OnURLSelect)
-
-	EVT_MENU_RANGE(ID_SELSTREAM_0, ID_SELSTREAM_9, wxOsmo4Frame::OnStreamSel)
-	EVT_UPDATE_UI_RANGE(ID_SELSTREAM_0, ID_SELSTREAM_9, wxOsmo4Frame::OnUpdateStreamSel)
-
-	EVT_MENU_RANGE(ID_SETCHAP_FIRST, ID_SETCHAP_LAST, wxOsmo4Frame::OnChapterSel)
-	EVT_UPDATE_UI_RANGE(ID_SETCHAP_FIRST, ID_SETCHAP_LAST, wxOsmo4Frame::OnUpdateChapterSel)
-
-	EVT_MENU_RANGE(ID_VIEWPOINT_FIRST, ID_VIEWPOINT_LAST, wxOsmo4Frame::OnViewport)
-	EVT_UPDATE_UI_RANGE(ID_VIEWPOINT_FIRST, ID_VIEWPOINT_LAST, wxOsmo4Frame::OnUpdateViewport)
-
-	EVT_MENU_RANGE(ID_NAVIGATE_NONE, ID_NAVIGATE_GAME, wxOsmo4Frame::OnNavigate)
-	EVT_UPDATE_UI_RANGE(ID_NAVIGATE_NONE, ID_NAVIGATE_GAME, wxOsmo4Frame::OnUpdateNavigation)
-	EVT_MENU(ID_NAVIGATE_RESET, wxOsmo4Frame::OnNavigateReset)
-
-	EVT_MENU_RANGE(ID_COLLIDE_NONE, ID_COLLIDE_DISP, wxOsmo4Frame::OnCollide)
-	EVT_UPDATE_UI_RANGE(ID_COLLIDE_NONE, ID_COLLIDE_DISP, wxOsmo4Frame::OnUpdateCollide)
-
-	EVT_MENU(ID_HEADLIGHT, wxOsmo4Frame::OnHeadlight)
-	EVT_UPDATE_UI(ID_HEADLIGHT, wxOsmo4Frame::OnUpdateHeadlight)
-	EVT_MENU(ID_GRAVITY, wxOsmo4Frame::OnGravity)
-	EVT_UPDATE_UI(ID_GRAVITY, wxOsmo4Frame::OnUpdateGravity)
-
-	EVT_UPDATE_UI(FILE_PROPERTIES, wxOsmo4Frame::OnUpdateNeedsConnect)
-	EVT_UPDATE_UI(FILE_RELOAD, wxOsmo4Frame::OnUpdateNeedsConnect)
-	EVT_UPDATE_UI(FILE_PLAY, wxOsmo4Frame::OnUpdatePlay)
-	EVT_UPDATE_UI(FILE_STOP, wxOsmo4Frame::OnUpdateNeedsConnect)
-	EVT_UPDATE_UI(FILE_STEP, wxOsmo4Frame::OnUpdateNeedsConnect)
-	EVT_UPDATE_UI(VIEW_ORIGINAL, wxOsmo4Frame::OnUpdateNeedsConnect)
-	EVT_UPDATE_UI(VIEW_FULLSCREEN, wxOsmo4Frame::OnUpdateFullScreen)
-	EVT_UPDATE_UI(VIEW_AR_KEEP, wxOsmo4Frame::OnUpdateAR)
-	EVT_UPDATE_UI(VIEW_AR_FILL, wxOsmo4Frame::OnUpdateAR)
-	EVT_UPDATE_UI(VIEW_AR_169, wxOsmo4Frame::OnUpdateAR)
-	EVT_UPDATE_UI(VIEW_AR_43, wxOsmo4Frame::OnUpdateAR)
-
-	EVT_SIZE(wxOsmo4Frame::OnSize)
-END_EVENT_TABLE()
-
-void wxOsmo4Frame::DoLayout(u32 v_width, u32 v_height)
-{
-	wxPoint pos;
-	if (!m_Address || !m_pProg) return;
-
-	int t_h = m_pToolBar->GetSize().y;
-	int a_h = m_pAddBar->GetSize().y;
-	int p_h = m_pProg->GetSize().y;
-
-	if (m_bExternalView) {
-		if (v_width && v_height) {
-			m_orig_width = v_width;
-			m_orig_height = v_height;
-		}
-		SetClientSize(320, a_h+p_h+t_h);
-		m_pAddBar->SetDimension(0,0, 320, a_h);
-		m_pProg->SetSize(0, t_h+a_h, 320, p_h, 0);
-		return;
-	}
-
-	if (v_width && v_height) {
-		m_orig_width = v_width;
-		m_orig_height = v_height;
-		v_height += a_h + p_h + t_h;
-		SetClientSize(v_width, v_height);
-		m_pView->SetSize(0, a_h+t_h, v_width, v_height, 0);
-		m_pAddBar->SetDimension(0, t_h, v_width, a_h);
-		m_pProg->SetSize(0, v_height - p_h, v_width, p_h, 0);
-	}
-	wxSize s = GetClientSize();
-	s.y -= a_h + p_h + t_h;
-	if (m_pView) {
-		m_pView->SetSize(0, a_h+t_h, s.x, s.y, 0);
-		m_pAddBar->SetDimension(0, 0, s.x, a_h);
-		m_pAddBar->SetDimension(0, 0, s.x, a_h);
-		m_pAddBar->Layout();
-		m_pProg->SetSize(0, s.y+t_h+a_h, s.x, p_h, 0);
-		if (m_term) gf_term_set_size(m_term, s.x, s.y);
-	}
-}
-
-void wxOsmo4Frame::OnSize(wxSizeEvent &event)
-{
-	DoLayout();
-}
-
-void wxOsmo4Frame::OnCloseApp(wxCloseEvent &WXUNUSED(event))
-{
-	if (m_term) gf_term_del(m_term);
-	m_term = NULL;
-	Destroy();
-}
-
-
-wxString wxOsmo4Frame::GetFileFilter()
-{
-	u32 keyCount, i;
-	wxString sFiles, sSupportedFiles, sExts;
-
-	/*force MP4 and 3GP files at beginning to make sure they are selected (Win32 bug with too large filters)*/
-	sSupportedFiles = wxT("All Known Files|*.m3u;*.pls;*.mp4;*.3gp;*.3g2");
-	sExts = wxT("");
-	sFiles = wxT("");
-	keyCount = gf_cfg_get_key_count(m_user.config, "MimeTypes");
-	for (i=0; i<keyCount; i++) {
-		Bool first = 1;
-		const char *sMime;
-		char *sKey;
-		const char *opt;
-		char szKeyList1000, sDesc1000;
-		sMime = gf_cfg_get_key_name(m_user.config, "MimeTypes", i);
-		if (!sMime) continue;
-		opt = gf_cfg_get_key(m_user.config, "MimeTypes", sMime);
-		/*remove module name*/
-		strcpy(szKeyList, opt+1);
-		sKey = strrchr(szKeyList, '\"');
-		if (!sKey) continue;
-		sKey0 = 0;
-		/*get description*/
-		sKey = strrchr(szKeyList, '\"');
-		if (!sKey) continue;
-		strcpy(sDesc, sKey+1);
-		sKey0 = 0;
-		sKey = strrchr(szKeyList, '\"');
-		if (!sKey) continue;
-		sKey0 = 0;
-
-		/*if same description for # mime types skip (means an old mime syntax)*/
-		if (sFiles.Find(wxString(sDesc, wxConvUTF8) )>=0) continue;
-		/*if same extensions for # mime types skip (don't polluate the file list)*/
-		if (sExts.Find(wxString(szKeyList, wxConvUTF8) )>=0) continue;
-
-		sExts += wxString(szKeyList, wxConvUTF8);
-		sExts += wxT(" ");
-		sFiles += wxString(sDesc, wxConvUTF8);
-		sFiles += wxT("|");
-
-		wxString sOpt = wxString(szKeyList, wxConvUTF8);
-		while (1) {
-			wxString ext = sOpt.BeforeFirst(' ');
-			if (ext.Find('.')<0) {
-				if (first) first = 0;
-				else sFiles += wxT(";");
-				sFiles += wxT("*.");
-				sFiles += ext;
-				wxString sext = ext;
-				sext += wxT(";");
-				if (sSupportedFiles.Find(sext)<0) {
-					sSupportedFiles  += wxT(";*.");
-					sSupportedFiles += ext;
-				}
-			}
-			if (sOpt==ext) break;
-			wxString rem = ext + wxT(" ");
-			sOpt.Replace(rem, wxT(""), TRUE);
-		}
-		sFiles += wxT("|");
-	}
-	sSupportedFiles += wxT("|");
-	sSupportedFiles += sFiles;
-	sSupportedFiles += wxT("M3U Playlists|*.m3u|ShoutCast Playlists|*.pls|All Files|*.*||");
-	return sSupportedFiles;
-}
-
-void wxOsmo4Frame::OnFileOpen(wxCommandEvent & WXUNUSED(event))
-{
-	wxFileDialog dlg(this, wxT("Select file(s)"), wxT(""), wxT(""), GetFileFilter(), wxOPEN | wxMULTIPLE | wxCHANGE_DIR /*| wxHIDE_READONLY*/);
-
-	if (dlg.ShowModal() != wxID_OK) return;
-
-	wxArrayString stra;
-	dlg.GetPaths(stra);
-	if (stra.GetCount() == 1) {
-		m_pPlayList->Truncate();
-	} else {
-		m_pPlayList->Clear();
-	}
-	for (u32 i=0; i<stra.GetCount(); i++)
-		m_pPlayList->QueueURL(strai);
-
-	m_pPlayList->RefreshList();
-	m_pPlayList->PlayNext();
-}
-
-void wxOsmo4Frame::OnFileOpenURL(wxCommandEvent & WXUNUSED(event))
-{
-	OpenURLDlg dlg(this, m_user.config);
-	if (dlg.ShowModal()==wxID_OK) {
-		m_pPlayList->Truncate();
-		m_pPlayList->QueueURL(dlg.m_urlVal);
-		m_pPlayList->RefreshList();
-		m_pPlayList->PlayNext();
-	}
-}
-
-void wxOsmo4Frame::OnFileProperties(wxCommandEvent & WXUNUSED(event))
-{
-	wxFileProps dlg(this);
-	dlg.SetIcon(wxIcon(osmo4));
-	dlg.ShowModal();
-}
-
-void wxOsmo4Frame::OnFileReload(wxCommandEvent & WXUNUSED(event))
-{
-	gf_term_disconnect(m_term);
-	m_connected = 0;
-	DoConnect();
-}
-
-void wxOsmo4Frame::OnFileReloadConfig(wxCommandEvent & WXUNUSED(event))
-{
-	gf_term_set_option(m_term, GF_OPT_RELOAD_CONFIG, 1);
-}
-
-void wxOsmo4Frame::OnFileQuit(wxCommandEvent & WXUNUSED(event))
-{
-	Close(FALSE);
-}
-
-void wxOsmo4Frame::OnViewOriginal(wxCommandEvent & WXUNUSED(event))
-{
-	if (!m_bExternalView) {
-		DoLayout(m_orig_width, m_orig_height);
-	} else {
-		gf_term_set_option(m_term, GF_OPT_ORIGINAL_VIEW, 1);
-	}
-}
-
-void wxOsmo4Frame::OnOptions(wxCommandEvent & WXUNUSED(event))
-{
-	wxGPACControl dlg(this);
-	dlg.SetIcon(wxIcon(osmo4));
-	dlg.ShowModal();
-}
-
-void wxOsmo4Frame::DoConnect()
-{
-	//if (m_connected) { gf_term_disconnect(m_term); m_connected = 0; }
-
-	wxString url = m_pPlayList->GetURL();
-	m_Address->SetValue(url);
-#ifdef __WXGTK__
-	m_pVisual->SetFocus();
-#else
-	m_pView->SetFocus();
-#endif
-	wxString txt = wxT("Osmo4 - ");
-	txt += m_pPlayList->GetDisplayName();
-	SetTitle(txt);
-	m_bStartupFile = 0;
-	gf_term_connect(m_term, url.mb_str(wxConvUTF8));
-}
-
-void wxOsmo4Frame::OnLogs(wxCommandEvent & WXUNUSED(event))
-{
-	m_pLogs->Show();
-}
-
-void wxOsmo4Frame::OnUpdateNeedsConnect(wxUpdateUIEvent &event)
-{
-	event.Enable(m_connected ? 1 : 0);
-}
-
-void wxOsmo4Frame::OnUpdatePlay(wxUpdateUIEvent &event)
-{
-	event.Enable( (m_connected || m_pPlayList->HasValidEntries()) ? 1 : 0);
-}
-
-void wxOsmo4Frame::OnUpdateFullScreen(wxUpdateUIEvent &event)
-{
-	if (m_connected) {
-		event.Enable(1);
-		event.Check(gf_term_get_option(m_term, GF_OPT_FULLSCREEN) ? 1 : 0);
-	} else {
-		event.Enable(0);
-	}
-}
-
-void wxOsmo4Frame::OnFullScreen(wxCommandEvent & WXUNUSED(event))
-{
-	Bool isFS = gf_term_get_option(m_term, GF_OPT_FULLSCREEN) ? 1 : 0;
-	gf_term_set_option(m_term, GF_OPT_FULLSCREEN, isFS ? 0 : 1);
-}
-
-void wxOsmo4Frame::OnViewARKeep(wxCommandEvent & WXUNUSED(event))
-{
-	gf_term_set_option(m_term, GF_OPT_ASPECT_RATIO, GF_ASPECT_RATIO_KEEP);
-}
-void wxOsmo4Frame::OnViewARFill(wxCommandEvent & WXUNUSED(event))
-{
-	gf_term_set_option(m_term, GF_OPT_ASPECT_RATIO, GF_ASPECT_RATIO_FILL_SCREEN);
-}
-void wxOsmo4Frame::OnViewAR169(wxCommandEvent & WXUNUSED(event))
-{
-	gf_term_set_option(m_term, GF_OPT_ASPECT_RATIO, GF_ASPECT_RATIO_16_9);
-}
-void wxOsmo4Frame::OnViewAR43(wxCommandEvent & WXUNUSED(event))
-{
-	gf_term_set_option(m_term, GF_OPT_ASPECT_RATIO, GF_ASPECT_RATIO_4_3);
-}
-
-void wxOsmo4Frame::OnUpdateAR(wxUpdateUIEvent &event)
-{
-	if (!m_connected) {
-		event.Enable(0);
-		return;
-	}
-	event.Enable(1);
-	u32 val = gf_term_get_option(m_term, GF_OPT_ASPECT_RATIO);
-	if ((event.GetId() == VIEW_AR_FILL) && (val==GF_ASPECT_RATIO_FILL_SCREEN))
-		event.Check(1);
-	else if ((event.GetId() == VIEW_AR_KEEP) && (val==GF_ASPECT_RATIO_KEEP))
-		event.Check(1);
-	else if ((event.GetId() == VIEW_AR_169) && (val==GF_ASPECT_RATIO_16_9))
-		event.Check(1);
-	else if ((event.GetId() == VIEW_AR_43) && (val==GF_ASPECT_RATIO_4_3))
-		event.Check(1);
-	else event.Check(0);
-}
-
-void wxOsmo4Frame::OnShortcuts(wxCommandEvent & WXUNUSED(event))
-{
-	wxMessageDialog dlg(this,
-	                    wxT("Shortcuts with focus on main frame:\n")
-	                    wxT("Open File: Ctrl + O\n")
-	                    wxT("Show File Information: Ctrl + I\n")
-	                    wxT("Reload File: Ctrl + R\n")
-	                    wxT("Pause/Resume File: Ctrl + P\n")
-	                    wxT("Step by Step: Ctrl + S\n")
-	                    wxT("Fullscreen On/Off: Alt + Return\n")
-	                    wxT("View Playlist: Ctrl + L\n")
-	                    wxT("Aspect Ratio Normal: Ctrl + 1\n")
-	                    wxT("Aspect Ratio Fill: Ctrl + 2\n")
-	                    wxT("Aspect Ratio 4/3: Ctrl + 3\n")
-	                    wxT("Aspect Ratio 16/9: Ctrl + 4\n")
-	                    wxT("\n")
-	                    wxT("Shortcuts with focus on video frame:\n")
-	                    wxT("Seek +5% into presentation: Alt + right arrow\n")
-	                    wxT("Seek -5% into presentation: Alt + left arrow\n")
-	                    wxT("Seek +1min into presentation: Alt + up arrow\n")
-	                    wxT("Seek -1min into presentation: Alt + down arrow\n")
-	                    wxT("Next Playlist Entry: Ctrl + right arrow\n")
-	                    wxT("Prev Playlist Entry: Ctrl + left arrow\n")
-
-	                    , wxT("Shortcuts Available on Osmo4")
-	                    , wxOK);
-
-	dlg.ShowModal();
-}
-
-void wxOsmo4Frame::OnNavInfo(wxCommandEvent & WXUNUSED(event))
-{
-	wxMessageDialog dlg(this,
-	                    wxT("* Walk & Fly modes:\n")
-	                    wxT("\tH move: H pan - V move: Z-translate - V move+CTRL or Wheel: V pan - Right Click (Walk only): Jump\n")
-	                    wxT("\tleft/right: H pan - left/right+CTRL: H translate - up/down: Z-translate - up/down+CTRL: V pan\n")
-	                    wxT("* Pan mode:\n")
-	                    wxT("\tH move: H pan - V move: V pan - V move+CTRL or Wheel: Z-translate\n")
-	                    wxT("\tleft/right: H pan - left/right+CTRL: H translate - up/down: V pan - up/down+CTRL: Z-translate\n")
-	                    wxT("* Slide mode:\n")
-	                    wxT("\tH move: H translate - V move: V translate - V move+CTRL or Wheel: Z-translate\n")
-	                    wxT("\tleft/right: H translate - left/right+CTRL: H pan - up/down: V translate - up/down+CTRL: Z-translate\n")
-	                    wxT("* Examine & Orbit mode:\n")
-	                    wxT("\tH move: Y-Axis rotate - H move+CTRL: No move - V move: X-Axis rotate - V move+CTRL or Wheel: Z-translate\n")
-	                    wxT("\tleft/right: Y-Axis rotate - left/right+CTRL: H translate - up/down: X-Axis rotate - up/down+CTRL: Y-translate\n")
-	                    wxT("* VR mode:\n")
-	                    wxT("\tH move: H pan - V move: V pan - V move+CTRL or Wheel: Camera Zoom\n")
-	                    wxT("\tleft/right: H pan - up/down: V pan - up/down+CTRL: Camera Zoom\n")
-	                    wxT("* Game mode (press END to escape):\n")
-	                    wxT("\tH move: H pan - V move: V pan\n")
-	                    wxT("\tleft/right: H translate - up/down: Z-translate\n")
-	                    wxT("\n")
-	                    wxT("* All 3D modes: CTRL+PGUP/PGDOWN will zoom in/out camera (field of view) \n")
-	                    wxT("\n")
-	                    wxT("*Slide Mode in 2D:\n")
-	                    wxT("\tH move: H translate - V move: V translate - V move+CTRL: zoom\n")
-	                    wxT("\tleft/right: H translate - up/down: V translate - up/down+CTRL: zoom\n")
-	                    wxT("*Examine Mode in 2D (3D renderer only):\n")
-	                    wxT("\tH move: Y-Axis rotate - V move: X-Axis rotate\n")
-	                    wxT("\tleft/right: Y-Axis rotate - up/down: X-Axis rotate\n")
-	                    wxT("\n")
-	                    wxT("HOME: reset navigation to last viewpoint (2D or 3D navigation)\n")
-	                    wxT("SHIFT key in all modes: fast movement\n")
-
-	                    , wxT("3D navigation keys (\'H\'orizontal and \'V\'ertical) used in GPAC")
-	                    , wxOK );
-	dlg.ShowModal();
-}
-
-
-/*open file dlg*/
-class AboutDlg : public wxDialog {
-public:
-	AboutDlg(wxWindow *parent);
-
-private:
-	wxStaticText *m_info;
-	wxButton *m_close;
-	void OnClose(wxCommandEvent& event);
-	DECLARE_EVENT_TABLE()
-};
-
-BEGIN_EVENT_TABLE(AboutDlg, wxDialog)
-	EVT_BUTTON(ID_ABOUT_CLOSE, AboutDlg::OnClose)
-END_EVENT_TABLE()
-
-AboutDlg::AboutDlg(wxWindow *parent)
-	: wxDialog(parent, -1, wxString(wxT("GPAC/Osmo4 V ")wxT(GPAC_FULL_VERSION)))
-{
-	SetSize(220, 320);
-	Centre();
-	wxBoxSizer *sizer = new wxBoxSizer(wxVERTICAL);
-
-	m_info = new wxStaticText(this, -1, wxT("http://gpac.io"), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTRE);
-	sizer->Add(m_info, 1, wxEXPAND|wxADJUST_MINSIZE, 0);
-	m_close = new wxButton(this, ID_ABOUT_CLOSE, wxT("Close"), wxDefaultPosition, wxSize(120, 20));
-	sizer->Add(m_close, 0, wxEXPAND, 0);
-
-	SetIcon(wxIcon(osmo4));
-	m_info->SetLabel(
-	    wxT("Osmo4 Player\n")
-	    wxT("GPAC Multimedia Framework\n")
-	    wxT("\n")
-	    wxT("This program is gf_free software and may\n")
-	    wxT("be distributed according to the terms\n")
-	    wxT("of the GNU Lesser General Public License\n")
-	    wxT("\n")
-	    wxT("Authors: Jean Le Feuvre\n")
-	    wxT("(c) Telecom ParisTech 2005-2012\n")
-	    wxT("All Rights Reserved\n")
-	    wxT("http://gpac.io\n")
-	    wxT("\n")
-	    wxT(" ** With Many Thanks To ** \n\n")
-	    wxT("Mozilla SpiderMonkey (JavaScript)\n")
-	    wxT("The FreeType Project\n")
-	    wxT("The PNG Group, The I.J.G.\n")
-	    wxT("FFMPEG, FAAD, XVID, MAD\n")
-	);
-
-	SetSizer(sizer);
-	sizer->Fit(this);
-}
-void AboutDlg::OnClose(wxCommandEvent& WXUNUSED(event))
-{
-	Close(FALSE);
-}
-
-void wxOsmo4Frame::OnAbout(wxCommandEvent & WXUNUSED(event))
-{
-	AboutDlg dlg(this);
-	dlg.ShowModal();
-}
-
-
-void wxOsmo4Frame::OnGPACEvent(wxGPACEvent &event)
-{
-	wxString cmd;
-	wxCommandEvent evt;
-	if (!m_term) return;
-
-	switch (event.gpac_evt.type) {
-	case GF_EVENT_NAVIGATE:
-		if (gf_term_is_supported_url(m_term, event.to_url.mb_str(wxConvUTF8), 1, 0)) {
-			char *str = gf_url_concatenate(m_pPlayList->GetURL().mb_str(wxConvUTF8), event.to_url.mb_str(wxConvUTF8));
-			if (str) {
-				m_pPlayList->Truncate();
-				m_pPlayList->QueueURL(wxString(str, wxConvUTF8));
-				m_pPlayList->RefreshList();
-				gf_free(str);
-				m_pPlayList->PlayNext();
-			}
-			return;
-		}
-		cmd = get_pref_browser(m_user.config);
-		if (cmd.IsEmpty()) {
-			cmd += wxT(" ");
-			cmd += event.to_url;
-			wxExecute(cmd);
-		} else {
-#ifdef wxLaunchDefaultBrowser
-			wxLaunchDefaultBrowser(event.to_url);
-#endif
-		}
-		break;
-	case GF_EVENT_QUIT:
-		Close(TRUE);
-		break;
-	case GF_EVENT_SET_CAPTION:
-		SetTitle(event.to_url);
-		break;
-	case GF_EVENT_CONNECT:
-		BuildStreamList(0);
-		ConnectAcknowledged(event.gpac_evt.connect.is_connected);
-		break;
-	case GF_EVENT_KEYDOWN:
-		if (!(event.gpac_evt.key.flags & GF_KEY_MOD_CTRL)) return;
-		switch (event.gpac_evt.key.key_code) {
-		case GF_KEY_R:
-			gf_term_set_option(m_term, GF_OPT_REFRESH, 1);
-			break;
-		case GF_KEY_P:
-			OnFilePlay(evt);
-			break;
-		case GF_KEY_S:
-			OnFileStep(evt);
-			break;
-		}
-		break;
-	case GF_EVENT_SCENE_SIZE:
-		m_orig_width = event.gpac_evt.size.width;
-		m_orig_height = event.gpac_evt.size.height;
-	case GF_EVENT_SIZE:
-		if (! gf_term_get_option(m_term, GF_OPT_FULLSCREEN)) {
-			DoLayout(event.gpac_evt.size.width, event.gpac_evt.size.height);
-		}
-		break;
-	case GF_EVENT_VIEWPOINTS:
-		BuildViewList();
-		break;
-	case GF_EVENT_STREAMLIST:
-		BuildStreamList(0);
-		break;
-	}
-}
-
-
-static wxString format_time(u32 duration, u32 timescale)
-{
-	u32 h, m, s;
-	Float time = duration;
-	time /= timescale;
-	time *= 1000;
-	h = (u32) (time / 1000 / 3600);
-	m = (u32) (time / 1000 / 60 - h*60);
-	s = (u32) (time / 1000 - h*3600 - m*60);
-	return wxString::Format(wxT("%02d:%02d:%02d"), h, m, s);
-}
-
-void wxOsmo4Frame::SetStatus(wxString str)
-{
-	//m_pStatusbar->SetStatusText(str, 2);
-	m_LastStatusTime = gf_sys_clock();
-}
-
-#define RTI_REFRESH_MS		500
-void wxOsmo4Frame::OnRTI(wxCommandEvent & event)
-{
-	m_bViewRTI = event.IsChecked();
-	if (m_bViewRTI) {
-		if (!m_pTimer->IsRunning()) m_pTimer->Start(RTI_REFRESH_MS, 0);
-	} else if (!m_connected && m_pTimer->IsRunning()) {
-		m_LastStatusTime = 0;
-		m_pStatusbar->SetStatusText(wxT("Ready"), 2);
-		m_pTimer->Stop();
-	}
-}
-
-void wxOsmo4Frame::OnTimer(wxTimerEvent& WXUNUSED(event))
-{
-	wxString str;
-	u32 now;
-	if (m_LastStatusTime) {
-		now = gf_sys_clock();
-		if (now > 1000+m_LastStatusTime) {
-			m_LastStatusTime = 0;
-			m_pStatusbar->SetStatusText(wxT("Ready"), 2);
-		}
-	}
-
-	if (m_bViewRTI) {
-		GF_SystemRTInfo rti;
-		if (!gf_sys_get_rti(RTI_REFRESH_MS, &rti, 0)) return;
-		if (rti.gpac_memory) rti.process_memory = rti.gpac_memory;
-
-		str = wxString::Format(wxT("CPU %02d (%02d) - Mem %d kB" ),
-		                       rti.total_cpu_usage, rti.process_cpu_usage, rti.gpac_memory/1024);
-
-		m_pStatusbar->SetStatusText(str, 2);
-	}
-	if (!m_connected) return;
-
-	now = gf_term_get_time_in_ms(m_term);
-	if (!now) return;
-
-	if (!m_duration) {
-		str = format_time(now, 1000);
-		m_pStatusbar->SetStatusText(str);
-		str = wxString::Format(wxT("FPS %.2f"), gf_term_get_framerate(m_term, 0));
-		m_pStatusbar->SetStatusText(str, 1);
-		return;
-	}
-#ifdef __WXGTK__
-	if (m_bGrabbed) {
-		u32 now = gf_sys_clock() - m_last_grab_time;
-		if (now>200) {
-			m_bGrabbed = 0;
-			Double res = (Double) m_last_grab_pos;
-			res /= 1000;
-			res *= m_duration;
-			if (gf_term_get_option(m_term, GF_OPT_PLAY_STATE)==GF_STATE_PAUSED) {
-				gf_term_set_option(m_term, GF_OPT_PLAY_STATE, GF_STATE_PLAYING);
-				m_bToReset = 0;
-			}
-			gf_term_play_from_time(m_term, (u32) res, 0);
-			return;
-		}
-	}
-#endif
-
-	if (!m_bGrabbed) {
-		if ((now >= m_duration + 500) && gf_term_get_option(m_term, GF_OPT_IS_FINISHED)) {
-			m_pPlayList->PlayNext();
-		} else {
-			Double val = now * 1000;
-			val /= m_duration;
-			m_pProg->SetValue((val<=1000) ? (u32) val : 1000);
-
-			if (0) {
-				str = format_time(m_duration-now, 1000);
-			} else {
-				str = format_time(now, 1000);
-			}
-			m_pStatusbar->SetStatusText(str);
-			str = wxString::Format(wxT("FPS %.2f"), gf_term_get_framerate(m_term, 0));
-			m_pStatusbar->SetStatusText(str, 1);
-		}
-	}
-}
-
-void wxOsmo4Frame::ConnectAcknowledged(Bool bOk)
-{
-	if (bOk) {
-		m_pTimer->Start(RTI_REFRESH_MS, 0);
-		m_connected = 1;
-		m_bToReset = 0;
-		UpdatePlay();
-		BuildChapterList(0);
-	} else {
-		BuildChapterList(1);
-		if (!m_connected) {
-			UpdatePlay();
-			m_pTimer->Stop();
-			//m_pProg->Enable(0);
-		}
-	}
-}
-
-void wxOsmo4Frame::OnFilePlay(wxCommandEvent & WXUNUSED(event))
-{
-	wxCommandEvent evt;
-	if (m_connected) {
-		if (gf_term_get_option(m_term, GF_OPT_PLAY_STATE)==GF_STATE_PAUSED) {
-			gf_term_set_option(m_term, GF_OPT_PLAY_STATE, GF_STATE_PLAYING);
-			if (m_bToReset) {
-				m_pTimer->Start(100, 0);
-				gf_term_play_from_time(m_term, 0, 0);
-			}
-			m_bToReset = 0;
-			UpdatePlay();
-		} else {
-			gf_term_set_option(m_term, GF_OPT_PLAY_STATE, GF_STATE_PAUSED);
-			UpdatePlay();
-		}
-	} else {
-		m_pPlayList->Play();
-	}
-}
-
-void wxOsmo4Frame::OnFileStep(wxCommandEvent & WXUNUSED(event))
-{
-	wxCommandEvent evt;
-	gf_term_set_option(m_term, GF_OPT_PLAY_STATE, GF_STATE_STEP_PAUSE);
-	UpdatePlay();
-}
-
-void wxOsmo4Frame::OnFileStop(wxCommandEvent &WXUNUSED(event))
-{
-	Stop();
-}
-
-void wxOsmo4Frame::Stop()
-{
-	if (gf_term_get_option(m_term, GF_OPT_PLAY_STATE)==GF_STATE_PLAYING) {
-		gf_term_set_option(m_term, GF_OPT_PLAY_STATE, GF_STATE_PAUSED);
-	}
-	m_bToReset = 1;
-	m_pTimer->Stop();
-	m_pProg->SetValue(0);
-	UpdatePlay();
-}
-
-void wxOsmo4Frame::OnSlide(wxScrollEvent &event)
-{
-	if (!m_duration) return;
-
-	/*wxSlider on GTK is buggy, so track a release timeout*/
-#ifdef __WXGTK__
-	m_last_grab_time = gf_sys_clock();
-	m_bGrabbed = 1;
-	m_last_grab_pos = event.GetPosition();
-	Double now = (Double) m_last_grab_pos;
-	now /= 1000;
-	now *= m_duration;
-	wxString str = format_time((u32) (now), 1000);
-	m_pStatusbar->SetStatusText(str);
-	if (!m_pTimer->IsRunning()) m_pTimer->Start(100, 0);
-#else
-	s32 type = event.GetEventType();
-	if (type == wxEVT_SCROLL_THUMBTRACK) {
-		m_bGrabbed = 1;
-		Double now = (Double) event.GetPosition();
-		now /= 1000;
-		now *= m_duration;
-		wxString str = format_time((u32) (now), 1000);
-		m_pStatusbar->SetStatusText(str);
-	}
-	else if (m_bGrabbed) {
-		m_bGrabbed = 0;
-		Double res = (Double) m_pProg->GetValue();
-		res /= 1000;
-		res *= m_duration;
-		if (gf_term_get_option(m_term, GF_OPT_PLAY_STATE)==GF_STATE_PAUSED) {
-			gf_term_set_option(m_term, GF_OPT_PLAY_STATE, GF_STATE_PLAYING);
-			m_bToReset = 0;
-			if (!m_pTimer->IsRunning()) m_pTimer->Start(100, 0);
-		}
-		gf_term_play_from_time(m_term, (u32) res, 0);
-	}
-#endif
-}
-
-
-void wxOsmo4Frame::BuildViewList()
-{
-	if (!vp_list || !m_connected) return;
-
-	while (vp_list->GetMenuItemCount()) {
-		wxMenuItem* it = vp_list->FindItemByPosition(0);
-		vp_list->Delete(it);
-	}
-
-	s32 id = ID_VIEWPOINT_FIRST;
-	nb_viewpoints = 0;
-	while (1) {
-		const char *szName;
-		Bool bound;
-		GF_Err e = gf_term_get_viewpoint(m_term, nb_viewpoints+1, &szName, &bound);
-		if (e) break;
-		if (szName) {
-			vp_list->AppendCheckItem(id+nb_viewpoints, wxString(szName, wxConvUTF8) );
-		} else {
-			vp_list->AppendCheckItem(id+nb_viewpoints, wxString::Format(wxT("Viewpoint #%d"), nb_viewpoints+1) );
-		}
-		nb_viewpoints++;
-	}
-}
-
-void wxOsmo4Frame::OnViewport(wxCommandEvent & event)
-{
-	u32 ID = event.GetId() - ID_VIEWPOINT_FIRST;
-	gf_term_set_viewpoint(m_term, ID+1, NULL);
-}
-
-void wxOsmo4Frame::OnUpdateViewport(wxUpdateUIEvent & event)
-{
-	u32 ID = event.GetId() - ID_VIEWPOINT_FIRST;
-	const char *szName;
-	Bool bound;
-	gf_term_get_viewpoint(m_term, ID+1, &szName, &bound);
-	event.Enable(1);
-	if (bound) event.Check(1);
-}
-
-void wxOsmo4Frame::OnNavigate(wxCommandEvent & event)
-{
-	switch (event.GetId()) {
-	case ID_NAVIGATE_NONE:
-		gf_term_set_option(m_term, GF_OPT_NAVIGATION, GF_NAVIGATE_NONE);
-		break;
-	case ID_NAVIGATE_WALK:
-		gf_term_set_option(m_term, GF_OPT_NAVIGATION, GF_NAVIGATE_WALK);
-		break;
-	case ID_NAVIGATE_FLY:
-		gf_term_set_option(m_term, GF_OPT_NAVIGATION, GF_NAVIGATE_FLY);
-		break;
-	case ID_NAVIGATE_EXAMINE:
-		gf_term_set_option(m_term, GF_OPT_NAVIGATION, GF_NAVIGATE_EXAMINE);
-		break;
-	case ID_NAVIGATE_PAN:
-		gf_term_set_option(m_term, GF_OPT_NAVIGATION, GF_NAVIGATE_PAN);
-		break;
-	case ID_NAVIGATE_SLIDE:
-		gf_term_set_option(m_term, GF_OPT_NAVIGATION, GF_NAVIGATE_SLIDE);
-		break;
-	case ID_NAVIGATE_ORBIT:
-		gf_term_set_option(m_term, GF_OPT_NAVIGATION, GF_NAVIGATE_ORBIT);
-		break;
-	case ID_NAVIGATE_GAME:
-		gf_term_set_option(m_term, GF_OPT_NAVIGATION, GF_NAVIGATE_GAME);
-		break;
-	}
-}
-void wxOsmo4Frame::OnNavigateReset(wxCommandEvent & WXUNUSED(event))
-{
-	gf_term_set_option(m_term, GF_OPT_NAVIGATION_TYPE, 0);
-}
-void wxOsmo4Frame::OnUpdateNavigation(wxUpdateUIEvent & event)
-{
-	u32 ID = event.GetId();
-	event.Enable(0);
-	if (!m_connected) return;
-	u32 type = gf_term_get_option(m_term, GF_OPT_NAVIGATION_TYPE);
-	bool enable = type ? 1 : 0;
-
-	u32 mode = gf_term_get_option(m_term, GF_OPT_NAVIGATION);
-	/*common 2D/3D modes*/
-	if (ID==ID_NAVIGATE_NONE) {
-		event.Enable(enable);
-		event.Check(mode ? 0 : 1);
-	}
-	else if (ID==ID_NAVIGATE_EXAMINE) {
-		event.Enable(enable);
-		event.Check((mode==GF_NAVIGATE_EXAMINE) ? 1 : 0);
-	}
-	else if (ID==ID_NAVIGATE_SLIDE) {
-		event.Enable(enable);
-		event.Check((mode==GF_NAVIGATE_SLIDE) ? 1 : 0);
-	}
-
-	if (type==GF_NAVIGATE_TYPE_2D) return;
-	event.Enable(enable);
-	if (ID==ID_NAVIGATE_WALK) event.Check((mode==GF_NAVIGATE_WALK) ? 1 : 0);
-	else if (ID==ID_NAVIGATE_FLY) event.Check((mode==GF_NAVIGATE_FLY) ? 1 : 0);
-	else if (ID==ID_NAVIGATE_PAN) event.Check((mode==GF_NAVIGATE_PAN) ? 1 : 0);
-	else if (ID==ID_NAVIGATE_ORBIT) event.Check((mode==GF_NAVIGATE_ORBIT) ? 1 : 0);
-	else if (ID==ID_NAVIGATE_GAME) event.Check((mode==GF_NAVIGATE_GAME) ? 1 : 0);
-}
-
-void wxOsmo4Frame::OnRenderSwitch(wxCommandEvent &WXUNUSED(event))
-{
-	const char *opt = gf_cfg_get_key(m_user.config, "Compositor", "ForceOpenGL");
-	Bool use_gl = (opt && !stricmp(opt, "yes")) ? 1 : 0;
-	gf_cfg_set_key(m_user.config, "Compositor", "ForceOpenGL", use_gl ? "no" : "yes");
-
-	gf_term_set_option(m_term, GF_OPT_USE_OPENGL, !use_gl);
-
-	UpdateRenderSwitch();
-}
-
-void wxOsmo4Frame::UpdateRenderSwitch()
-{
-	const char *opt = gf_cfg_get_key(m_user.config, "Compositor", "ForceOpenGL");
-	m_pToolBar->RemoveTool(SWITCH_RENDER);
-	if (opt && !stricmp(opt, "yes"))
-		m_pToolBar->InsertTool(12, SWITCH_RENDER, *m_pSW2D, wxNullBitmap, FALSE, NULL, wxT("2D Rasterizer"));
-	else
-		m_pToolBar->InsertTool(12, SWITCH_RENDER, *m_pSW3D, wxNullBitmap, FALSE, NULL, wxT("OpenGL Rendering"));
-
-#ifdef WIN32
-	/*there's a display bug with the menubtn, remove and reinsert*/
-	m_pToolBar->RemoveTool(FILE_PREV);
-	m_pToolBar->RemoveTool(FILE_NEXT);
-	m_pToolBar->InsertControl(2, m_pPrevBut);
-	m_pToolBar->InsertControl(3, m_pNextBut);
-#endif
-	m_pToolBar->Realize();
-}
-
-void wxOsmo4Frame::UpdatePlay()
-{
-	m_pToolBar->RemoveTool(FILE_PLAY);
-	if (m_connected) {
-		if (gf_term_get_option(m_term, GF_OPT_PLAY_STATE)==GF_STATE_PAUSED)
-			m_pToolBar->InsertTool(5, FILE_PLAY, *m_pPlay, wxNullBitmap, FALSE, NULL, wxT("Pause File"));
-		else
-			m_pToolBar->InsertTool(5, FILE_PLAY, *m_pPause, wxNullBitmap, FALSE, NULL, wxT("Play File"));
-	} else {
-		m_pToolBar->InsertTool(5, FILE_PLAY, *m_pPlay, wxNullBitmap, FALSE, NULL, wxT("Pause File"));
-	}
-
-#ifdef WIN32
-	/*there's a display bug with the menubtn, remove and reinsert*/
-	m_pToolBar->RemoveTool(FILE_PREV);
-	m_pToolBar->RemoveTool(FILE_NEXT);
-	m_pToolBar->InsertControl(2, m_pPrevBut);
-	m_pToolBar->InsertControl(3, m_pNextBut);
-#endif
-	m_pToolBar->Realize();
-}
-
-void wxOsmo4Frame::OnCollide(wxCommandEvent & event)
-{
-	u32 ID = event.GetId();
-	if (ID==ID_COLLIDE_NONE) gf_term_set_option(m_term, GF_OPT_COLLISION, GF_COLLISION_NONE);
-	else if (ID==ID_COLLIDE_REG) gf_term_set_option(m_term, GF_OPT_COLLISION, GF_COLLISION_NORMAL);
-	else if (ID==ID_COLLIDE_DISP) gf_term_set_option(m_term, GF_OPT_COLLISION, GF_COLLISION_DISPLACEMENT);
-}
-void wxOsmo4Frame::OnUpdateCollide(wxUpdateUIEvent & event)
-{
-	u32 ID = event.GetId();
-	event.Enable(0);
-	if (!m_connected) return;
-	event.Enable(1);
-	u32 mode = gf_term_get_option(m_term, GF_OPT_COLLISION);
-	if (ID==ID_COLLIDE_NONE) {
-		event.Check((mode==GF_COLLISION_NONE) ? 1 : 0);
-	}
-	else if (ID==ID_COLLIDE_REG) {
-		event.Check((mode==GF_COLLISION_NORMAL) ? 1 : 0);
-	}
-	else if (ID==ID_COLLIDE_DISP) {
-		event.Check((mode==GF_COLLISION_DISPLACEMENT) ? 1 : 0);
-	}
-}
-
-void wxOsmo4Frame::OnHeadlight(wxCommandEvent &WXUNUSED(event))
-{
-	Bool val = !gf_term_get_option(m_term, GF_OPT_HEADLIGHT);
-	gf_term_set_option(m_term, GF_OPT_HEADLIGHT, val);
-}
-void wxOsmo4Frame::OnUpdateHeadlight(wxUpdateUIEvent & event)
-{
-	event.Enable(0);
-	if (!m_connected) return;
-	u32 type = gf_term_get_option(m_term, GF_OPT_NAVIGATION_TYPE);
-	if (type!=GF_NAVIGATE_TYPE_3D) return;
-
-	event.Enable(1);
-	event.Check(gf_term_get_option(m_term, GF_OPT_HEADLIGHT) ? 1 : 0);
-}
-void wxOsmo4Frame::OnGravity(wxCommandEvent & WXUNUSED(event))
-{
-	Bool val = gf_term_get_option(m_term, GF_OPT_GRAVITY) ? 0 : 1;
-	gf_term_set_option(m_term, GF_OPT_GRAVITY, val);
-}
-void wxOsmo4Frame::OnUpdateGravity(wxUpdateUIEvent & event)
-{
-	event.Enable(0);
-	if (!m_connected) return;
-	u32 type = gf_term_get_option(m_term, GF_OPT_NAVIGATION_TYPE);
-	if (type!=GF_NAVIGATE_TYPE_3D) return;
-	type = gf_term_get_option(m_term, GF_OPT_NAVIGATION);
-	if (type != GF_NAVIGATE_WALK) return;
-	event.Enable(1);
-	event.Check(gf_term_get_option(m_term, GF_OPT_GRAVITY) ? 1 : 0);
-}
-
-
-BEGIN_EVENT_TABLE(wxMyComboBox, wxComboBox)
-	EVT_KEY_UP(wxMyComboBox::OnKeyUp)
-END_EVENT_TABLE()
-
-void wxMyComboBox::OnKeyUp(wxKeyEvent &event)
-{
-	if (event.GetKeyCode()==WXK_RETURN) {
-		event.Skip();
-		wxCommandEvent evt;
-		evt.SetEventType(wxEVT_COMMAND_COMBOBOX_SELECTED);
-		evt.SetEventObject(this);
-		evt.SetId(GetId());
-		GetParent()->AddPendingEvent(evt);
-	}
-}
-
-
-void wxOsmo4Frame::ReloadURLs()
-{
-	const char *sOpt;
-	u32 i=0;
-
-	m_Address->Clear();
-	while (1) {
-		sOpt = gf_cfg_get_key_name(m_user.config, "RecentFiles", i);
-		if (!sOpt) break;
-		m_Address->Append(wxString(sOpt, wxConvUTF8) );
-		i++;
-	}
-}
-
-void wxOsmo4Frame::SelectionReady()
-{
-	wxString urlVal = m_Address->GetValue();
-	if (urlVal.Find(wxT("://"))>0) {
-		UpdateLastFiles(m_user.config, urlVal.mb_str(wxConvUTF8));
-		ReloadURLs();
-	}
-	m_pPlayList->Truncate();
-	m_pPlayList->QueueURL(urlVal);
-	m_pPlayList->RefreshList();
-	m_pPlayList->PlayNext();
-}
-
-void wxOsmo4Frame::OnURLSelect(wxCommandEvent &WXUNUSED(event))
-{
-	SelectionReady();
-}
-
-void wxOsmo4Frame::OnPlaylist(wxCommandEvent &WXUNUSED(event))
-{
-	assert(m_pPlayList);
-	m_pPlayList->Show(m_pPlayList->IsShown() ? 0 : 1);
-}
-
-void wxOsmo4Frame::OnUpdatePlayList(wxUpdateUIEvent & event)
-{
-	event.Enable(1);
-	event.Check(m_pPlayList->IsShown() ? 1 : 0);
-}
-
-void wxOsmo4Frame::OnFilePrevOpen(wxNotifyEvent & event)
-{
-	u32 count = gf_list_count(m_pPlayList->m_entries);
-	u32 start = m_pPlayList->m_cur_entry - 1;
-	wxMenu *popup = new wxMenu();
-
-	for (u32 i=0; i<10; i++) {
-		if (i > start) break;
-		if (start - i >= count) break;
-		PLEntry *ple = (PLEntry *) gf_list_get(m_pPlayList->m_entries, start - i);
-		popup->Append(ID_NAV_PREV_0 + i, wxString(ple->m_disp_name, wxConvUTF8) );
-	}
-	m_pPrevBut->AssignMenu(popup);
-}
-
-void wxOsmo4Frame::OnFileNextOpen(wxNotifyEvent & event)
-{
-	u32 count = gf_list_count(m_pPlayList->m_entries);
-	wxMenu *popup = new wxMenu();
-	u32 start = m_pPlayList->m_cur_entry + 1;
-	for (u32 i=0; i<10; i++) {
-		if (start + i >= count) break;
-		PLEntry *ple = (PLEntry *) gf_list_get(m_pPlayList->m_entries, start + i);
-		popup->Append(ID_NAV_NEXT_0 + i, wxString(ple->m_disp_name, wxConvUTF8) );
-	}
-	m_pNextBut->AssignMenu(popup);
-}
-
-void wxOsmo4Frame::OnNavPrev(wxCommandEvent &WXUNUSED(event))
-{
-	if (m_pPlayList->m_cur_entry<=0) return;
-	m_pPlayList->PlayPrev();
-}
-void wxOsmo4Frame::OnUpdateNavPrev(wxUpdateUIEvent & event)
-{
-	if (m_pPlayList->m_cur_entry<=0) event.Enable(0);
-	else event.Enable(TRUE);
-}
-void wxOsmo4Frame::OnNavPrevMenu(wxCommandEvent &event)
-{
-	u32 ID = event.GetId() - ID_NAV_PREV_0;
-	s32 prev = m_pPlayList->m_cur_entry - ID;
-	if (prev>=0) {
-		m_pPlayList->m_cur_entry = prev;
-		m_pPlayList->PlayPrev();
-	}
-}
-void wxOsmo4Frame::OnNavNext(wxCommandEvent &WXUNUSED(event))
-{
-	/*don't play if last could trigger playlist loop*/
-	if ((m_pPlayList->m_cur_entry<0) || (gf_list_count(m_pPlayList->m_entries) == 1 + (u32) m_pPlayList->m_cur_entry)) return;
-	m_pPlayList->PlayNext();
-}
-void wxOsmo4Frame::OnUpdateNavNext(wxUpdateUIEvent & event)
-{
-	if (m_pPlayList->m_cur_entry<0) event.Enable(0);
-	else if ((u32) m_pPlayList->m_cur_entry + 1 == gf_list_count(m_pPlayList->m_entries) ) event.Enable(0);
-	else event.Enable(1);
-}
-
-void wxOsmo4Frame::OnNavNextMenu(wxCommandEvent &event)
-{
-	u32 ID = event.GetId() - ID_NAV_NEXT_0;
-	s32 next = m_pPlayList->m_cur_entry + ID;
-	if (next < (s32) gf_list_count(m_pPlayList->m_entries) ) {
-		m_pPlayList->m_cur_entry = next;
-		m_pPlayList->PlayNext();
-	}
-}
-
-void wxOsmo4Frame::OnClearNav(wxCommandEvent &WXUNUSED(event))
-{
-	m_pPlayList->ClearButPlaying();
-}
-
-
-void wxOsmo4Frame::BuildStreamList(Bool reset_only)
-{
-	u32 nb_subs;
-	wxMenu *pMenu;
-
-	pMenu = sel_menu->FindItemByPosition(0)->GetSubMenu();
-	while (pMenu->GetMenuItemCount()) {
-		wxMenuItem* it = pMenu->FindItemByPosition(0);
-		pMenu->Delete(it);
-	}
-	pMenu = sel_menu->FindItemByPosition(1)->GetSubMenu();
-	while (pMenu->GetMenuItemCount()) {
-		wxMenuItem* it = pMenu->FindItemByPosition(0);
-		pMenu->Delete(it);
-	}
-	pMenu = sel_menu->FindItemByPosition(2)->GetSubMenu();
-	while (pMenu->GetMenuItemCount()) {
-		wxMenuItem* it = pMenu->FindItemByPosition(0);
-		pMenu->Delete(it);
-	}
-
-	if (reset_only) {
-		m_bFirstStreamListBuild = 1;
-		return;
-	}
-
-	if (!gf_term_get_option(m_term, GF_OPT_CAN_SELECT_STREAMS)) return;
-
-	nb_subs = 0;
-	GF_ObjectManager *root_od = gf_term_get_root_object(m_term);
-	if (!root_od) return;
-	u32 count = gf_term_get_object_count(m_term, root_od);
-
-	for (u32 i=0; i<count; i++) {
-		char szLabel1024;
-		GF_MediaInfo info;
-		GF_ObjectManager *odm = gf_term_get_object(m_term, root_od, i);
-		if (!odm) return;
-
-		if (gf_term_get_object_info(m_term, odm, &info) != GF_OK) break;
-
-		if (info.owns_service) {
-			char *szName = (char *) strrchr(info.service_url, '\\');
-			if (!szName) szName = (char *) strrchr(info.service_url, '/');
-			if (!szName) szName = (char *) info.service_url;
-			else szName += 1;
-			strcpy(szLabel, szName);
-			szName = strrchr(szLabel, '.');
-			if (szName) szName0 = '\0';
-		}
-		switch (info.od_type) {
-		case GF_STREAM_AUDIO:
-			pMenu = sel_menu->FindItemByPosition(0)->GetSubMenu();
-			if (!info.owns_service) sprintf(szLabel, "Audio #"LLU, (u64)pMenu->GetMenuItemCount() + 1);
-			pMenu->AppendCheckItem(ID_SELSTREAM_0 +i, wxString(szLabel, wxConvUTF8));
-			break;
-		case GF_STREAM_VISUAL:
-			pMenu = sel_menu->FindItemByPosition(1)->GetSubMenu();
-			if (!info.owns_service) sprintf(szLabel, "Video #"LLU, (u64)pMenu->GetMenuItemCount() + 1);
-			pMenu->AppendCheckItem(ID_SELSTREAM_0 +i, wxString(szLabel, wxConvUTF8));
-			break;
-		case GF_STREAM_TEXT:
-			nb_subs ++;
-			pMenu = sel_menu->FindItemByPosition(2)->GetSubMenu();
-			if (!info.owns_service) sprintf(szLabel, "Subtitle #"LLU, (u64)pMenu->GetMenuItemCount() + 1);
-			pMenu->AppendCheckItem(ID_SELSTREAM_0 +i, wxString(szLabel, wxConvUTF8));
-			break;
-		}
-	}
-	if (m_bFirstStreamListBuild) {
-		m_bFirstStreamListBuild = 0;
-		if (!nb_subs && m_lookforsubs) LookForSubtitles();
-	}
-}
-
-void wxOsmo4Frame::OnStreamSel(wxCommandEvent & event)
-{
-	GF_ObjectManager *root_od = gf_term_get_root_object(m_term);
-	if (!root_od) return;
-	u32 ID = event.GetId() - ID_SELSTREAM_0;
-	GF_ObjectManager *odm = gf_term_get_object(m_term, root_od, ID);
-	gf_term_select_object(m_term, odm);
-}
-
-void wxOsmo4Frame::OnUpdateStreamSel(wxUpdateUIEvent & event)
-{
-	GF_ObjectManager *root_od = gf_term_get_root_object(m_term);
-	if (!root_od) return;
-	u32 ID = event.GetId() - ID_SELSTREAM_0;
-
-	GF_ObjectManager *odm = gf_term_get_object(m_term, root_od, ID);
-	if (!odm) return;
-
-	GF_MediaInfo info;
-	gf_term_get_object_info(m_term, odm, &info);
-	event.Enable(1);
-	event.Check(info.status ? 1 : 0);
-}
-
-void wxOsmo4Frame::OnUpdateStreamMenu(wxUpdateUIEvent & event)
-{
-	if (!m_connected || !gf_term_get_option(m_term, GF_OPT_CAN_SELECT_STREAMS)) {
-		event.Enable(0);
-	} else {
-		event.Enable(1);
-	}
-}
-
-void wxOsmo4Frame::OnAddSub(wxCommandEvent &WXUNUSED(event))
-{
-	wxFileDialog dlg(this, wxT("Add Subtitle"), wxT(""), wxT(""), wxT("All Subtitles|*.srt;*.ttxt|SRT Subtitles|*.srt|3GPP TimedText|*.ttxt|"), wxOPEN | wxCHANGE_DIR /* | wxHIDE_READONLY*/);
-
-	if (dlg.ShowModal() == wxID_OK) {
-		AddSubtitle(dlg.GetPath().mb_str(wxConvUTF8), 1);
-	}
-
-}
-
-void wxOsmo4Frame::AddSubtitle(const char *fileName, Bool auto_play)
-{
-	gf_term_add_object(m_term, fileName, auto_play);
-}
-
-static Bool subs_enum_dir_item(void *cbck, char *item_name, char *item_path, GF_FileEnumInfo *file_info)
-{
-	wxOsmo4Frame *_this = (wxOsmo4Frame*)cbck;
-	_this->AddSubtitle(item_path, 0);
-	return 0;
-}
-
-void wxOsmo4Frame::LookForSubtitles()
-{
-	char dirGF_MAX_PATH;
-	const char *url = m_pPlayList->GetURL().mb_str(wxConvUTF8);
-	strcpy(dir, url);
-	char *sep = strrchr(dir, '\\');
-	if (!sep) strcpy(dir, ::wxGetCwd().mb_str(wxConvUTF8));
-	else sep0 = 0;
-
-	gf_enum_directory(dir, 0, subs_enum_dir_item, this, "ttxt;srt");
-}
-
-void wxOsmo4Frame::OnCacheEnable(wxCommandEvent &WXUNUSED(event))
-{
-	u32 state = gf_term_get_option(m_term, GF_OPT_MEDIA_CACHE);
-	if (state==GF_MEDIA_CACHE_DISABLED) {
-		gf_term_set_option(m_term, GF_OPT_MEDIA_CACHE, GF_MEDIA_CACHE_ENABLED);
-	} else if (state==GF_MEDIA_CACHE_DISABLED) {
-		gf_term_set_option(m_term, GF_OPT_MEDIA_CACHE, GF_MEDIA_CACHE_DISABLED);
-	}
-}
-
-void wxOsmo4Frame::OnCacheStop(wxCommandEvent &WXUNUSED(event))
-{
-	gf_term_set_option(m_term, GF_OPT_MEDIA_CACHE, GF_MEDIA_CACHE_DISABLED);
-}
-
-void wxOsmo4Frame::OnCacheAbort(wxCommandEvent &WXUNUSED(event))
-{
-	gf_term_set_option(m_term, GF_OPT_MEDIA_CACHE, GF_MEDIA_CACHE_DISCARD);
-}
-
-void wxOsmo4Frame::OnUpdateCacheEnable(wxUpdateUIEvent & event)
-{
-	u32 state = gf_term_get_option(m_term, GF_OPT_MEDIA_CACHE);
-	switch (state) {
-	case GF_MEDIA_CACHE_ENABLED:
-		event.Enable(1);
-		event.SetText(wxT("Enabled"));
-		break;
-	case GF_MEDIA_CACHE_RUNNING:
-		event.SetText(wxT("Running"));
-		event.Enable(0);
-		break;
-	case GF_MEDIA_CACHE_DISABLED:
-		event.SetText(wxT("Disabled"));
-		break;
-	}
-}
-
-void wxOsmo4Frame::OnUpdateCacheAbort(wxUpdateUIEvent & event)
-{
-	u32 state = gf_term_get_option(m_term, GF_OPT_MEDIA_CACHE);
-	event.Enable( (state==GF_MEDIA_CACHE_RUNNING) ? 1 : 0);
-}
-
-
-
-void wxOsmo4Frame::BuildChapterList(Bool reset_only)
-{
-	GF_MediaInfo odi;
-
-	while (chap_menu->GetMenuItemCount()) {
-		wxMenuItem* it = chap_menu->FindItemByPosition(0);
-		chap_menu->Delete(it);
-	}
-	if (m_chapters_start) gf_free(m_chapters_start);
-	m_chapters_start = NULL;
-	m_num_chapters = 0;
-	if (reset_only) return;
-
-	GF_ObjectManager *root_od = gf_term_get_root_object(m_term);
-	if (!root_od) return;
-	if (gf_term_get_object_info(m_term, root_od, &odi) != GF_OK) return;
-
-	u32 count = gf_list_count(odi.od->OCIDescriptors);
-	m_num_chapters = 0;
-	for (u32 i=0; i<count; i++) {
-		char szLabel1024;
-		GF_Segment *seg = (GF_Segment *) gf_list_get(odi.od->OCIDescriptors, i);
-		if (seg->tag != GF_ODF_SEGMENT_TAG) continue;
-
-		if (seg->SegmentName && strlen((const char *)seg->SegmentName)) {
-			strcpy(szLabel, (const char *) seg->SegmentName);
-		} else {
-			sprintf(szLabel, "Chapter %02d", m_num_chapters+1);
-		}
-		chap_menu->AppendCheckItem(ID_SETCHAP_FIRST + m_num_chapters, wxString(szLabel, wxConvUTF8));
-
-		m_chapters_start = (Double *) gf_realloc(m_chapters_start, sizeof(Double)*(m_num_chapters+1));
-		m_chapters_startm_num_chapters = seg->startTime;
-		m_num_chapters++;
-	}
-
-	/*get any service info*/
-	NetInfoCommand com;
-	if (!m_bStartupFile && gf_term_get_service_info(m_term, root_od, &com) == GF_OK) {
-		wxString title = wxT("");
-		if (com.track_info) {
-			title.Format(wxT("%02d "), (u32) (com.track_info>>16) );
-		}
-		if (com.artist) {
-			title.Append(wxString(com.artist, wxConvUTF8));
-			title += wxT(" ");
-		}
-		if (com.name) {
-			title.Append(wxString(com.name, wxConvUTF8));
-			title += wxT(" ");
-		}
-		if (com.album) {
-			title += wxT("(");
-			title.Append(wxString(com.album, wxConvUTF8));
-			title += wxT(")");
-		}
-
-		if (title.length()) SetTitle(title);
-	}
-
-}
-
-void wxOsmo4Frame::OnChapterSel(wxCommandEvent & event)
-{
-	GF_ObjectManager *root_od = gf_term_get_root_object(m_term);
-	if (!root_od) return;
-	u32 ID = event.GetId() - ID_SETCHAP_FIRST;
-	gf_term_play_from_time(m_term, (u32) (1000*m_chapters_startID), 0);
-}
-
-void wxOsmo4Frame::OnUpdateChapterSel(wxUpdateUIEvent & event)
-{
-	Double now;
-	Bool is_current;
-	u32 ID = event.GetId() - ID_SETCHAP_FIRST;
-
-	now = gf_term_get_time_in_ms(m_term);
-	now /= 1000;
-
-	is_current = 0;
-	if (m_chapters_startID<=now) {
-		if (ID+1<m_num_chapters) {
-			if (m_chapters_startID+1>now) is_current = 1;
-		} else {
-			is_current = 1;
-		}
-	}
-	event.Enable(1);
-	event.Check(is_current ? 1 : 0);
-}
-
-void wxOsmo4Frame::OnUpdateChapterMenu(wxUpdateUIEvent & event)
-{
-	if (!m_connected || !m_num_chapters) {
-		event.Enable(0);
-	} else {
-		event.Enable(1);
-	}
-}
-
-void wxOsmo4Frame::OnFileCopy(wxCommandEvent &event)
-{
-	const char *text = gf_term_get_text_selection(m_term, 0);
-	if (!text) return;
-	if (!wxTheClipboard->Open()) return;
-
-	wxTheClipboard->SetData( new wxTextDataObject( wxString(text, wxConvUTF8)) );
-	wxTheClipboard->Close();
-}
-
-void wxOsmo4Frame::OnUpdateFileCopy(wxUpdateUIEvent &event)
-{
-	if (gf_term_get_text_selection(m_term, 1)!=NULL) {
-		event.Enable(1);
-	} else {
-		event.Enable(0);
-	}
-}
-
-void wxOsmo4Frame::OnFilePaste(wxCommandEvent &event)
-{
-	if (!wxTheClipboard->Open()) return;
-	if (wxTheClipboard->IsSupported( wxDF_TEXT )) {
-		wxTextDataObject data;
-		wxTheClipboard->GetData(data);
-		gf_term_paste_text(m_term, data.GetText().mb_str(wxConvUTF8), 0);
-	}
-	wxTheClipboard->Close();
-}
-
-void wxOsmo4Frame::OnUpdateFilePaste(wxUpdateUIEvent &event)
-{
-	Bool ok = 0;
-	if (wxTheClipboard->Open()) {
-		if (wxTheClipboard->IsSupported( wxDF_TEXT )) {
-			if (gf_term_paste_text(m_term, NULL, 1)==GF_OK) {
-				ok = 1;
-			}
-		}
-		wxTheClipboard->Close();
-	}
-	event.Enable(ok ? 1 : 0);
-}
-

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/osmo4_wx/wxOsmo4.h Deleted

@@ -1,391 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2012
- *					All rights reserved
- *
- *  This file is part of GPAC / Osmo4 wxWidgets GUI
- *
- *  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.
- *
- *
- */
-
-#ifndef _WXOSMO4_H
-#define _WXOSMO4_H
-
-/*
-we need to force X to work in sync mode when we use embedded view...
-include first to avoid Bool type redef between X11 and gpac
-*/
-#ifdef __WXGTK__
-#include <X11/Xlib.h>
-#endif
-
-#include "wx/wxprec.h"
-
-#ifndef WX_PRECOMP
-#include "wx/wx.h"
-#endif
-
-#include <wx/image.h>
-#include <wx/listctrl.h>
-#include <wx/event.h>
-#include "menubtn.h"
-
-/*include gpac AFTER wx in case we override malloc/realloc/free for mem tracking*/
-#include <gpac/terminal.h>
-#include <gpac/term_info.h>
-
-class wxOsmo4App : public wxApp
-{
-public:
-	virtual bool OnInit();
-};
-
-DECLARE_APP(wxOsmo4App)
-
-class wxOsmo4Frame;
-class wxPlaylist;
-
-class GPACLogs : public wxLogWindow {
-public:
-	GPACLogs(wxFrame *parent) : wxLogWindow(parent, wxT("GPAC Logs"), FALSE, FALSE) {
-		m_pMain = (wxOsmo4Frame *) parent;
-	}
-	virtual bool OnFrameClose(wxFrame *frame);
-
-private:
-	wxOsmo4Frame *m_pMain;
-};
-
-#define MAX_VIEWPOINTS	50
-
-// Menu commands
-enum
-{
-	GWX_FILE_OPEN = wxID_HIGHEST,
-	GWX_FILE_OPEN_URL,
-	FILE_RELOAD,
-	FILE_RELOAD_CONFIG,
-	FILE_PLAY,
-	FILE_STEP,
-	FILE_STOP,
-	FILE_PREV,
-	FILE_NEXT,
-	FILE_PROPERTIES,
-	FILE_COPY,
-	FILE_PASTE,
-	TERM_RELOAD,
-	FILE_QUIT,
-	VIEW_FULLSCREEN,
-	VIEW_ORIGINAL,
-	VIEW_AR_KEEP,
-	VIEW_AR_FILL,
-	VIEW_AR_43,
-	VIEW_AR_169,
-	VIEW_OPTIONS,
-	VIEW_LOGS,
-	VIEW_RTI,
-	VIEW_PLAYLIST,
-	SWITCH_RENDER,
-	APP_SHORTCUTS,
-	APP_NAV_KEYS,
-	APP_ABOUT,
-	ID_ADDRESS,
-	ID_URL_GO,
-	ID_ABOUT_CLOSE,
-	ID_CLEAR_NAV,
-	ID_STREAM_MENU,
-	ID_CHAPTER_MENU,
-	ID_ADD_SUB,
-
-	ID_MCACHE_ENABLE,
-	ID_MCACHE_STOP,
-	ID_MCACHE_ABORT,
-
-	ID_CTRL_TIMER,
-	ID_SLIDER,
-
-	ID_TREE_VIEW,
-	ID_OD_TIMER,
-	ID_VIEW_SG,
-	ID_VIEW_WI,
-	ID_VIEW_SEL,
-
-
-	ID_HEADLIGHT,
-	ID_NAVIGATE_NONE,
-	ID_NAVIGATE_WALK,
-	ID_NAVIGATE_FLY,
-	ID_NAVIGATE_EXAMINE,
-	ID_NAVIGATE_SLIDE,
-	ID_NAVIGATE_PAN,
-	ID_NAVIGATE_ORBIT,
-	ID_NAVIGATE_GAME,
-	ID_NAVIGATE_RESET,
-
-	ID_COLLIDE_NONE,
-	ID_COLLIDE_REG,
-	ID_COLLIDE_DISP,
-	ID_GRAVITY,
-
-	ID_PL_OPEN,
-	ID_PL_SAVE,
-	ID_PL_ADD_FILE,
-	ID_PL_ADD_URL,
-	ID_PL_ADD_DIR,
-	ID_PL_ADD_DIR_REC,
-	ID_PL_REM_FILE,
-	ID_PL_REM_ALL,
-	ID_PL_REM_DEAD,
-	ID_PL_UP,
-	ID_PL_DOWN,
-	ID_PL_RANDOMIZE,
-	ID_PL_REVERSE,
-	ID_PL_SEL_REV,
-	ID_PL_SORT_TITLE,
-	ID_PL_SORT_FILE,
-	ID_PL_SORT_DUR,
-	ID_PL_PLAY,
-
-
-	/*reserve IDs for viewpoint menu*/
-	ID_VIEWPOINT_FIRST,
-	ID_VIEWPOINT_LAST = ID_VIEWPOINT_FIRST + MAX_VIEWPOINTS,
-
-	/*reserve IDs for navigation menus*/
-	ID_NAV_PREV_0,
-	ID_NAV_PREV_9 = ID_NAV_PREV_0 + 10,
-	ID_NAV_NEXT_0,
-	ID_NAV_NEXT_9 = ID_NAV_NEXT_0 + 10,
-	/*reserve IDs for stream selection menus*/
-	ID_SELSTREAM_0,
-	ID_SELSTREAM_9 = ID_SELSTREAM_0 + 10,
-
-	/*reserve IDs for chapter selection menus*/
-	ID_SETCHAP_FIRST,
-	ID_SETCHAP_LAST = ID_SELSTREAM_0 + 200,
-};
-
-wxString get_pref_browser(GF_Config *cfg);
-
-class wxGPACEvent : public wxEvent
-{
-public:
-	wxGPACEvent( wxWindow* win = (wxWindow*) NULL );
-	void CopyObject( wxObject& obj ) const;
-	virtual wxEvent *Clone() const;
-
-	wxString to_url;
-	GF_Event gpac_evt;
-
-	DECLARE_DYNAMIC_CLASS(wxGPACEvent)
-};
-typedef void (wxEvtHandler::*GPACEventFunction)(wxGPACEvent&);
-DEFINE_EVENT_TYPE(GPAC_EVENT)
-
-#define EVT_GPACEVENT(func) DECLARE_EVENT_TABLE_ENTRY(GPAC_EVENT, -1, -1, (wxObjectEventFunction) (wxEventFunction) (GPACEventFunction) & func, (wxObject*) NULL),
-
-class OpenURLDlg : public wxDialog {
-public:
-	OpenURLDlg(wxWindow *parent, GF_Config *cfg);
-	wxString m_urlVal;
-private:
-	wxButton *m_go;
-	wxComboBox *m_url;
-	GF_Config *m_cfg;
-	void OnGo(wxCommandEvent& event);
-	DECLARE_EVENT_TABLE()
-};
-
-class wxMyComboBox : public wxComboBox
-{
-public:
-	wxMyComboBox(wxWindow* parent, wxWindowID id, const wxString& value = wxT(""), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize)
-		: wxComboBox(parent, id, value, pos, size, 0, NULL, wxCB_DROPDOWN)
-	{}
-
-private:
-	DECLARE_EVENT_TABLE()
-
-	void OnKeyUp(wxKeyEvent &event);
-};
-
-class wxOsmo4Frame : public wxFrame {
-public:
-	wxOsmo4Frame();
-	virtual ~wxOsmo4Frame();
-
-	char szAppPathGF_MAX_PATH;
-
-	u32 m_duration;
-	wxString the_next_url;
-	GF_Terminal *m_term;
-	GF_User m_user;
-	Bool m_connected, m_can_seek, m_console_off, m_loop, m_lookforsubs;
-
-	void DoConnect();
-
-	void ConnectAcknowledged(Bool bOk);
-	void SetStatus(wxString str);
-
-	void OnFilePlay(wxCommandEvent &event);
-	void OnFileStep(wxCommandEvent &event);
-	void OnFileStop(wxCommandEvent &event);
-	wxString GetFileFilter();
-
-	void BuildViewList();
-	void BuildStreamList(Bool reset_only);
-	void BuildChapterList(Bool reset_only);
-
-	void AddSubtitle(const char *fileName, Bool auto_play);
-
-	wxWindow *m_pView;
-
-#ifdef __WXGTK__
-	u32 m_last_grab_time, m_last_grab_pos;
-	wxWindow *m_pVisual;
-#endif
-	wxSlider *m_pProg;
-	wxPlaylist *m_pPlayList;
-
-	void DoLayout(u32 v_width = 0, u32 v_height = 0);
-	s32 m_last_prog;
-
-	FILE *m_logs;
-	u32 m_log_level, m_log_tools;
-	u32 m_LastStatusTime;
-
-protected:
-
-private:
-	DECLARE_EVENT_TABLE()
-
-	void OnCloseApp(wxCloseEvent &event);
-	void OnSize(wxSizeEvent &event);
-
-	void OnFileOpen(wxCommandEvent &event);
-	void OnFileOpenURL(wxCommandEvent &event);
-	void OnFileReload(wxCommandEvent &event);
-	void OnFileReloadConfig(wxCommandEvent & event);
-	void OnFileProperties(wxCommandEvent &event);
-	void OnFileQuit(wxCommandEvent &event);
-	void OnFullScreen(wxCommandEvent &event);
-	void OnOptions(wxCommandEvent &event);
-	void OnViewARKeep(wxCommandEvent &event);
-	void OnViewARFill(wxCommandEvent &event);
-	void OnViewAR169(wxCommandEvent &event);
-	void OnViewAR43(wxCommandEvent &event);
-	void OnViewOriginal(wxCommandEvent &event);
-	void OnPlaylist(wxCommandEvent &event);
-	void OnShortcuts(wxCommandEvent &event);
-	void OnNavInfo(wxCommandEvent &event);
-	void OnAddSub(wxCommandEvent &event);
-	void OnAbout(wxCommandEvent &event);
-	Bool LoadTerminal();
-	void OnGPACEvent(wxGPACEvent &event);
-	void OnTimer(wxTimerEvent& event);
-	void OnSlide(wxScrollEvent &event);
-	void OnRelease(wxScrollEvent &event);
-	void OnLogs(wxCommandEvent & event);
-	void OnRTI(wxCommandEvent & event);
-	void OnUpdatePlay(wxUpdateUIEvent &event);
-	void OnUpdateNeedsConnect(wxUpdateUIEvent &event);
-	void OnUpdateFullScreen(wxUpdateUIEvent &event);
-	void OnUpdateAR(wxUpdateUIEvent &event);
-	void OnViewport(wxCommandEvent & event);
-	void OnUpdateViewport(wxUpdateUIEvent & event);
-	void OnNavigate(wxCommandEvent & event);
-	void OnNavigateReset(wxCommandEvent & event);
-	void OnUpdateNavigation(wxUpdateUIEvent & event);
-	void OnRenderSwitch(wxCommandEvent &event);
-	void OnCollide(wxCommandEvent & event);
-	void OnUpdateCollide(wxUpdateUIEvent & event);
-	void OnHeadlight(wxCommandEvent & event);
-	void OnUpdateHeadlight(wxUpdateUIEvent & event);
-	void OnGravity(wxCommandEvent & event);
-	void OnUpdateGravity(wxUpdateUIEvent & event);
-	void OnURLSelect(wxCommandEvent &event);
-	void OnUpdatePlayList(wxUpdateUIEvent & event);
-	void OnFilePrevOpen(wxNotifyEvent & event);
-	void OnFileNextOpen(wxNotifyEvent & event);
-	void OnNavPrev(wxCommandEvent &event);
-	void OnUpdateNavPrev(wxUpdateUIEvent & event);
-	void OnNavPrevMenu(wxCommandEvent &event);
-	void OnNavNext(wxCommandEvent &event);
-	void OnUpdateNavNext(wxUpdateUIEvent & event);
-	void OnNavNextMenu(wxCommandEvent &event);
-	void OnClearNav(wxCommandEvent &event);
-	void OnStreamSel(wxCommandEvent &event);
-	void OnUpdateStreamSel(wxUpdateUIEvent & event);
-	void OnUpdateStreamMenu(wxUpdateUIEvent & event);
-	void OnChapterSel(wxCommandEvent &event);
-	void OnUpdateChapterSel(wxUpdateUIEvent & event);
-	void OnUpdateChapterMenu(wxUpdateUIEvent & event);
-
-	void SelectionReady();
-	void ReloadURLs();
-	void LookForSubtitles();
-
-	void OnCacheEnable(wxCommandEvent &event);
-	void OnCacheStop(wxCommandEvent &event);
-	void OnCacheAbort(wxCommandEvent &event);
-	void OnUpdateCacheEnable(wxUpdateUIEvent & event);
-	void OnUpdateCacheAbort(wxUpdateUIEvent & event);
-
-	void OnFileCopy(wxCommandEvent &event);
-	void OnUpdateFileCopy(wxUpdateUIEvent &event);
-	void OnFilePaste(wxCommandEvent &event);
-	void OnUpdateFilePaste(wxUpdateUIEvent &event);
-
-
-	void CheckVideoOut();
-
-	wxMenuBar* m_pMenubar;
-	wxStatusBar* m_pStatusbar;
-	wxTimer *m_pTimer;
-	GPACLogs *m_pLogs;
-	wxBoxSizer *m_pAddBar;
-
-	Bool m_bGrabbed, m_bToReset, m_bFirstStreamListBuild;
-	wxBitmap *m_pOpenFile, *m_pPrev, *m_pNext, *m_pPlay, *m_pPause, *m_pStep, *m_pStop, *m_pInfo, *m_pConfig, *m_pSW2D, *m_pSW3D;
-	wxMenuButton *m_pPrevBut, *m_pNextBut;
-	wxToolBar *m_pToolBar;
-	wxMyComboBox *m_Address;
-
-	wxMenu *vp_list;
-	wxMenu *sel_menu;
-	wxMenu *chap_menu;
-	void Stop();
-
-	s32 nb_viewpoints;
-
-	void UpdateRenderSwitch();
-	void UpdatePlay();
-
-	u32 m_orig_width, m_orig_height;
-
-	u32 m_num_chapters;
-	Double *m_chapters_start;
-	Bool m_bExternalView, m_bViewRTI, m_bStartupFile;
-
-	void ShowViewWindow(Bool do_show);
-};
-
-
-#endif  //_WXOSMO4_H
-

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/osmo4_wx/wxOsmo4.rc Deleted

@@ -1,72 +0,0 @@
-//Microsoft Developer Studio generated resource script.
-//
-#include "resource.h"
-
-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
-#include "afxres.h"
-
-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
-
-/////////////////////////////////////////////////////////////////////////////
-// French (France) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_FRA)
-#ifdef _WIN32
-LANGUAGE LANG_FRENCH, SUBLANG_FRENCH
-#pragma code_page(1252)
-#endif //_WIN32
-
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE DISCARDABLE
-BEGIN
-    "resource.h\0"
-END
-
-2 TEXTINCLUDE DISCARDABLE
-BEGIN
-    "#include ""afxres.h""\r\n"
-    "\0"
-END
-
-3 TEXTINCLUDE DISCARDABLE
-BEGIN
-    "\r\n"
-    "\0"
-END
-
-#endif    // APSTUDIO_INVOKED
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Icon
-//
-
-// Icon with lowest ID value placed first to ensure application icon
-// remains consistent on all systems.
-IDI_OSMO_ICON               ICON    DISCARDABLE     "../../doc/osmo4.ico"
-#endif    // French (France) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-
-#ifndef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 3 resource.
-//
-
-
-/////////////////////////////////////////////////////////////////////////////
-#endif    // not APSTUDIO_INVOKED
-

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/osmophone Deleted

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/osmophone/Osmo4.ico Deleted

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/osmophone/main.cpp Deleted

@@ -1,1497 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2012
- *					All rights reserved
- *
- *  This file is part of GPAC / command-line client
- *
- *  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.
- *
- */
-
-/*includes both terminal and od browser*/
-#include <gpac/terminal.h>
-#include <gpac/options.h>
-/*for initial setup*/
-#include <gpac/modules/service.h>
-
-#include <gpac/internal/terminal_dev.h>
-#include <gpac/internal/compositor_dev.h>
-
-#include <windows.h>
-#include <commdlg.h>
-#include <commctrl.h>
-
-#ifdef _WIN32_WCE
-#include <aygshell.h>
-#include <gx.h>
-
-#else
-
-#ifndef _T
-#define _T(__a) (LPCSTR) __a
-#endif
-
-#endif
-
-#include "resource.h"
-
-#define WM_LOADTERM	WM_USER + 1
-#define STATE_TIMER_ID		20
-#define STATE_TIMER_DUR		1000
-#define GPAC_TIMER_ID		21
-#define GPAC_TIMER_DUR		33
-
-
-Bool gf_file_dialog(HINSTANCE inst, HWND parent, char *url, const char *ext_list, GF_Config *cfg);
-void set_backlight_state(Bool disable);
-void refresh_recent_files();
-void do_layout(Bool notif_size);
-
-static HWND g_hwnd = NULL;
-static HWND g_hwnd_disp = NULL;
-static HWND g_hwnd_menu = NULL;
-static HWND g_hwnd_status = NULL;
-static HINSTANCE g_hinst = NULL;
-static Bool is_ppc = GF_FALSE;
-
-static Bool is_connected = GF_FALSE;
-static Bool navigation_on = GF_FALSE;
-static Bool playlist_navigation_on = GF_TRUE;
-
-static u32 log_level = GF_LOG_ERROR;
-
-static u32 Duration;
-static Bool CanSeek = GF_FALSE;
-static u32 Volume=100;
-static char the_urlGF_MAX_PATH = "";
-static Bool NavigateTo = GF_FALSE;
-static char the_next_urlGF_MAX_PATH;
-static GF_Terminal *term;
-static GF_User user;
-static u32 disp_w = 0;
-static u32 disp_h = 0;
-static u32 screen_w = 0;
-static u32 screen_h = 0;
-static u32 menu_h = 0;
-static u32 caption_h = 0;
-static u32 ratio_h = 1;
-static Bool backlight_off = GF_FALSE;
-static u32 prev_batt_bl, prev_ac_bl;
-static Bool show_status = GF_TRUE;
-static Bool reset_status = GF_TRUE;
-static u32 last_state_time = 0;
-static Bool loop = GF_FALSE;
-static Bool full_screen = GF_FALSE;
-static Bool force_2d_gl = GF_FALSE;
-static Bool ctrl_mod_down = GF_FALSE;
-static Bool view_cpu = GF_TRUE;
-static Bool use_low_fps = GF_FALSE;
-static Bool use_svg_prog = GF_FALSE;
-
-static Bool log_rti = GF_FALSE;
-static FILE *log_file = NULL;
-static u32 rti_update_time_ms = 200;
-
-static u32 playlist_act = 0;
-
-
-void recompute_res(u32 sw, u32 sh )
-{
-	caption_h = GetSystemMetrics(SM_CYCAPTION);
-	menu_h = GetSystemMetrics(SM_CYMENU)+2;
-	screen_w = GetSystemMetrics(SM_CXSCREEN);
-	screen_h = GetSystemMetrics(SM_CYSCREEN);
-
-	ratio_h = sh / screen_h;
-	screen_w = sw;
-	screen_h = sh;
-	menu_h *= ratio_h;
-//	caption_h *= ratio_h;
-	disp_w = screen_w;
-	disp_h = screen_h - menu_h /*- caption_h*/;
-}
-
-
-void set_status(char *state)
-{
-	if (show_status && g_hwnd_status) {
-#ifdef _WIN32_WCE
-		TCHAR wstate1024;
-		CE_CharToWide(state, (u16 *) wstate);
-		SendMessage(g_hwnd_status, WM_SETTEXT, 0, (LPARAM) wstate);
-#else
-		SendMessage(g_hwnd_status, WM_SETTEXT, 0, (LPARAM) state);
-#endif
-		last_state_time = GetTickCount();
-	}
-}
-
-void update_state_info()
-{
-	TCHAR wstate1024;
-	Double FPS;
-	u32 time, m, s;
-	if (!show_status) return;
-	if (last_state_time) {
-		if (GetTickCount() > last_state_time + 200) {
-			last_state_time = 0;
-			reset_status = GF_TRUE;
-		}
-		else return;
-	}
-	if (!term) return;
-	if (!is_connected && reset_status) {
-		SendMessage(g_hwnd_status, WM_SETTEXT, 0, (LPARAM) TEXT("Ready") );
-		reset_status = GF_FALSE;
-		return;
-	}
-
-	FPS = gf_term_get_framerate(term, GF_FALSE);
-	time = gf_term_get_time_in_ms(term) / 1000;
-	m = time/60;
-	s = time - m*60;
-	if (view_cpu) {
-		GF_SystemRTInfo rti;
-		if (!gf_sys_get_rti(STATE_TIMER_DUR, &rti, 0)) return;
-		wsprintf(wstate, TEXT("T %02d:%02d : FPS %02.2f : CPU %02d"), m, s, FPS, rti.total_cpu_usage);
-	} else {
-		wsprintf(wstate, TEXT("T %02d:%02d : FPS %02.2f"), m, s, FPS);
-	}
-	SendMessage(g_hwnd_status, WM_SETTEXT, 0, (LPARAM) wstate);
-}
-
-
-static u64 prev_pos = 0;
-void cbk_on_progress(void *_title, u64 done, u64 total)
-{
-#if 0
-	char szMsg1024;
-	u32 pos = (u32) ((u64) done * 100)/total;
-	if (pos<prev_pos) prev_pos = 0;
-	if (pos!=prev_pos) {
-		prev_pos = pos;
-		sprintf(szMsg, "%s: (%02d/100)", _title ? (char *)_title : "", pos);
-		set_status(szMsg);
-	}
-#endif
-}
-
-void set_full_screen()
-{
-	full_screen = (Bool)!full_screen;
-	if (full_screen) {
-		show_status = GF_FALSE;
-		do_layout(GF_FALSE);
-		gf_term_set_option(term, GF_OPT_FULLSCREEN, full_screen);
-	} else {
-		const char *str = gf_cfg_get_key(user.config, "General", "ShowStatusBar");
-		show_status = (str && !strcmp(str, "yes")) ? GF_TRUE : GF_FALSE;
-		gf_term_set_option(term, GF_OPT_FULLSCREEN, full_screen);
-		do_layout(GF_TRUE);
-	}
-}
-
-
-static void on_gpac_rti_log(void *cbk, GF_LOG_Level ll, GF_LOG_Tool lm, const char *fmt, va_list list)
-{
-	if (!log_file) return;
-
-	if (lm & GF_LOG_RTI) {
-		GF_SystemRTInfo rti;
-		if (fmt) vfprintf(log_file, fmt, list);
-
-		gf_sys_get_rti(rti_update_time_ms, &rti, 0);
-
-		fprintf(log_file, "% 8d\t% 8d\t% 8d\t% 4d\t% 8d\t\t",
-		        gf_sys_clock(),
-		        gf_term_get_time_in_ms(term),
-		        rti.total_cpu_usage,
-		        (u32) gf_term_get_framerate(term, GF_FALSE),
-		        (u32) ( rti.gpac_memory / 1024)
-		       );
-	} else if (fmt && (ll>=GF_LOG_INFO)) {
-		vfprintf(log_file, fmt, list);
-	}
-}
-static void on_gpac_log(void *cbk, GF_LOG_Level ll, GF_LOG_Tool lm, const char *fmt, va_list list)
-{
-	if (fmt && log_file) vfprintf(log_file, fmt, list);
-}
-
-
-static void setup_logs()
-{
-	if (log_file) gf_fclose(log_file);
-	log_file = NULL;
-
-	gf_log_set_tool_level(GF_LOG_ALL, GF_LOG_ERROR);
-	gf_log_set_callback(NULL, NULL);
-
-	if (log_rti) {
-		const char *filename = gf_cfg_get_key(user.config, "General", "LogFile");
-		if (!filename) {
-			gf_cfg_set_key(user.config, "General", "LogFile", "\\gpac_logs.txt");
-			filename = "\\gpac_logs.txt";
-		}
-		log_file = gf_fopen(filename, "a+t");
-
-		fprintf(log_file, "!! GPAC RunTime Info for file %s !!\n", the_url);
-		fprintf(log_file, "SysTime(ms)\tSceneTime(ms)\tCPU\tFPS\tMemory(kB)\tObservation\n");
-
-		gf_log_set_tool_level(GF_LOG_ALL, GF_LOG_ERROR);
-		gf_log_set_tool_level(GF_LOG_RTI, GF_LOG_DEBUG);
-		gf_log_set_callback(log_file, on_gpac_rti_log);
-
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_RTI, ("RTI System state when enabling log\n"));
-	} else {
-		const char *filename = gf_cfg_get_key(user.config, "General", "LogFile");
-		if (!filename) {
-			gf_cfg_set_key(user.config, "General", "LogFile", "\\gpac_logs.txt");
-			filename = "\\gpac_logs.txt";
-		}
-		const char *logs = gf_cfg_get_key(user.config, "General", "Logs");
-		if (logs) {
-			if (gf_log_set_tools_levels( logs ) != GF_OK) {
-			} else {
-				if (log_file = gf_fopen(filename, "a+t")) {
-					gf_log_set_callback(log_file, on_gpac_log);
-				}
-			}
-		}
-	}
-}
-
-void do_open_file()
-{
-	gf_cfg_set_key(user.config, "RecentFiles", the_url, NULL);
-	gf_cfg_insert_key(user.config, "RecentFiles", the_url, "", 0);
-	u32 count = gf_cfg_get_key_count(user.config, "RecentFiles");
-	if (count > 10) gf_cfg_set_key(user.config, "RecentFiles", gf_cfg_get_key_name(user.config, "RecentFiles", count-1), NULL);
-
-	setup_logs();
-
-	gf_term_connect(term, the_url);
-}
-
-void switch_playlist(Bool play_prev)
-{
-	char szPLE20;
-	u32 idx = 0;
-	u32 count;
-	const char *ple = gf_cfg_get_key(user.config, "General", "PLEntry");
-	if (ple) idx = atoi(ple);
-
-	count = gf_cfg_get_key_count(user.config, "Playlist");
-	if (!count) return;
-	/*not the first launch*/
-	if (strlen(the_url)) {
-		if (!idx && play_prev) return;
-		if (play_prev) idx--;
-		else idx++;
-		if (idx>=count) return;
-	} else {
-		if (idx>=count) idx=0;
-	}
-
-	ple = gf_cfg_get_key_name(user.config, "Playlist", idx);
-	if (!ple) return;
-
-	sprintf(szPLE, "%d", idx);
-	gf_cfg_set_key(user.config, "General", "PLEntry", szPLE);
-
-	strcpy(the_url, ple);
-	do_open_file();
-}
-
-
-Bool GPAC_EventProc(void *ptr, GF_Event *evt)
-{
-	switch (evt->type) {
-	case GF_EVENT_DURATION:
-		Duration = (u32) (evt->duration.duration*1000);
-		CanSeek = evt->duration.can_seek;
-		break;
-	case GF_EVENT_MESSAGE:
-	{
-		if (!evt->message.message) return GF_FALSE;
-		GF_LOG(GF_LOG_ERROR, GF_LOG_CONSOLE, ("%s: %s\n", evt->message.message, gf_error_to_string(evt->message.error)));
-		//set_status((char *) 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 ";
-		cbk_on_progress(szTitle, evt->progress.done, evt->progress.total);
-	}
-	break;
-
-	case GF_EVENT_SIZE:
-		break;
-	case GF_EVENT_RESOLUTION:
-		recompute_res(evt->size.width, evt->size.height);
-		do_layout(GF_TRUE);
-		break;
-
-	case GF_EVENT_SCENE_SIZE:
-		do_layout(GF_TRUE);
-		break;
-	case GF_EVENT_DBLCLICK:
-		set_full_screen();
-		return GF_FALSE;
-	case GF_EVENT_CONNECT:
-		if (evt->connect.is_connected) {
-			is_connected = GF_TRUE;
-			if (!backlight_off) set_backlight_state(GF_TRUE);
-			refresh_recent_files();
-			navigation_on = (gf_term_get_option(term, GF_OPT_NAVIGATION)==GF_NAVIGATE_NONE) ? GF_FALSE : GF_TRUE;
-		} else {
-			navigation_on = GF_FALSE;
-			is_connected = GF_FALSE;
-			Duration = 0;
-		}
-		break;
-	case GF_EVENT_EOS:
-		if (Duration>2000)
-			gf_term_play_from_time(term, 0, 0);
-		break;
-	case GF_EVENT_QUIT:
-		PostMessage(g_hwnd, WM_DESTROY, 0, 0);
-		break;
-	case GF_EVENT_KEYDOWN:
-		switch (evt->key.key_code) {
-		case GF_KEY_ENTER:
-			if (full_screen) set_full_screen();
-			break;
-		case GF_KEY_1:
-			ctrl_mod_down = (Bool)!ctrl_mod_down;
-			evt->key.key_code = GF_KEY_CONTROL;
-			evt->type = ctrl_mod_down ? GF_EVENT_KEYDOWN : GF_EVENT_KEYUP;
-			gf_term_user_event(term, evt);
-			break;
-		case GF_KEY_MEDIAPREVIOUSTRACK:
-			playlist_act = 2;
-			break;
-		case GF_KEY_MEDIANEXTTRACK:
-			playlist_act = 1;
-			break;
-		}
-		break;
-	case GF_EVENT_NAVIGATE:
-		if (gf_term_is_supported_url(term, evt->navigate.to_url, GF_TRUE, GF_TRUE)) {
-			gf_term_navigate_to(term, evt->navigate.to_url);
-			return GF_TRUE;
-		} else {
-#ifdef _WIN32_WCE
-			u16 dst1024;
-#endif
-			SHELLEXECUTEINFO info;
-
-			/*
-						if (full_screen) gf_term_set_option(term, GF_OPT_FULLSCREEN, 0);
-						full_screen = 0;
-			*/
-			memset(&info, 0, sizeof(SHELLEXECUTEINFO));
-			info.cbSize = sizeof(SHELLEXECUTEINFO);
-			info.lpVerb = _T("open");
-			info.fMask = SEE_MASK_NOCLOSEPROCESS;
-			info.lpFile = _T("iexplore");
-#ifdef _WIN32_WCE
-			CE_CharToWide((char *) evt->navigate.to_url, dst);
-			info.lpParameters = (LPCTSTR) dst;
-#else
-			info.lpParameters = evt->navigate.to_url;
-#endif
-			info.nShow = SW_SHOWNORMAL;
-			ShellExecuteEx(&info);
-		}
-		return GF_TRUE;
-	}
-	return GF_FALSE;
-}
-
-//#define TERM_NOT_THREADED
-
-Bool LoadTerminal()
-{
-	/*by default use current dir*/
-	strcpy(the_url, ".");
-
-	setup_logs();
-
-	g_hwnd_disp = CreateWindow(TEXT("STATIC"), NULL, WS_CHILD | WS_VISIBLE , 0, 0, disp_w, disp_h, g_hwnd, NULL, g_hinst, NULL);
-
-	user.EventProc = GPAC_EventProc;
-	/*dummy in this case (global vars) but MUST be non-NULL*/
-	user.opaque = user.modules;
-	user.os_window_handler = g_hwnd_disp;
-#ifdef TERM_NOT_THREADED
-	user.init_flags = GF_TERM_NO_REGULATION;
-	user.threads = 0;
-#endif
-
-	term = gf_term_new(&user);
-	if (!term) {
-		gf_modules_del(user.modules);
-		gf_cfg_del(user.config);
-		memset(&user, 0, sizeof(GF_User));
-		return GF_FALSE;
-	}
-
-#ifdef _WIN32_WCE
-	screen_w = term->compositor->video_out->max_screen_width;
-	screen_h = term->compositor->video_out->max_screen_height;
-	disp_w = screen_w;
-	disp_h = screen_h - menu_h /*- caption_h*/;
-#endif
-
-#ifdef TERM_NOT_THREADED
-	::SetTimer(g_hwnd, GPAC_TIMER_ID, GPAC_TIMER_DUR, NULL);
-#endif
-
-	const char *str = gf_cfg_get_key(user.config, "General", "StartupFile");
-	if (str) {
-		do_layout(GF_TRUE);
-		strcpy(the_url, str);
-		gf_term_connect(term, str);
-	}
-	return GF_TRUE;
-}
-
-void do_layout(Bool notif_size)
-{
-	u32 w, h;
-	if (full_screen) {
-		w = screen_w;
-		h = screen_h;
-		::ShowWindow(g_hwnd_status, SW_HIDE);
-#ifdef _WIN32_WCE
-		::ShowWindow(g_hwnd_menu, SW_HIDE);
-#endif
-
-#ifdef _WIN32_WCE
-		SHFullScreen(g_hwnd, SHFS_HIDESIPBUTTON);
-#endif
-		::MoveWindow(g_hwnd, 0, 0, screen_w, screen_h, 1);
-		::MoveWindow(g_hwnd_disp, 0, 0, screen_w, screen_h, 1);
-		SetForegroundWindow(g_hwnd_disp);
-	} else {
-#ifdef _WIN32_WCE
-		::ShowWindow(g_hwnd_menu, SW_SHOW);
-#endif
-		if (show_status) {
-			::MoveWindow(g_hwnd, 0, 0, disp_w, disp_h, 1);
-			::ShowWindow(g_hwnd_status, SW_SHOW);
-			::MoveWindow(g_hwnd_status, 0, 0, disp_w, caption_h, 1);
-			::MoveWindow(g_hwnd_disp, 0, caption_h, disp_w, disp_h - caption_h, 1);
-			w = disp_w;
-			h = disp_h - caption_h*ratio_h;
-		} else {
-			::ShowWindow(g_hwnd_status, SW_HIDE);
-//			::MoveWindow(g_hwnd, 0, caption_h, disp_w, disp_h, 1);
-			::MoveWindow(g_hwnd, 0, 0, disp_w, disp_h, 1);
-			::MoveWindow(g_hwnd_disp, 0, 0, disp_w, disp_h, 1);
-			w = disp_w;
-			h = disp_h;
-		}
-	}
-	if (notif_size && term) gf_term_set_size(term, w, h);
-}
-
-
-void set_backlight_state(Bool disable)
-{
-#ifdef _WIN32_WCE
-	HKEY hKey = 0;
-	DWORD dwSize;
-	DWORD dwValue;
-	HANDLE hBL;
-	if (RegOpenKeyEx(HKEY_CURRENT_USER, _T("ControlPanel\\Backlight"), 0, 0, &hKey ) != ERROR_SUCCESS) return;
-
-	if (disable) {
-		dwSize = 4;
-		RegQueryValueEx(hKey, _T("BatteryTimeout"), NULL, NULL,(unsigned char*) &prev_batt_bl, &dwSize);
-		dwSize = 4;
-		RegQueryValueEx(hKey, _T("ACTimeout"), NULL, NULL, (unsigned char*) &prev_ac_bl,&dwSize);
-		dwSize = 4;
-		dwValue = 0xefff ;
-		RegSetValueEx(hKey, _T("BatteryTimeout"), NULL, REG_DWORD, (unsigned char *)&dwValue, dwSize);
-		dwSize = 4;
-		dwValue = 0xefff ;
-		RegSetValueEx( hKey, _T("ACTimeout"), NULL, REG_DWORD, (unsigned char *)&dwValue, dwSize);
-		backlight_off = GF_TRUE;
-	} else {
-		if (prev_batt_bl) {
-			dwSize = 4;
-			RegSetValueEx(hKey, _T("BatteryTimeout"), NULL, REG_DWORD, (unsigned char *)&prev_batt_bl, dwSize);
-		}
-		if (prev_ac_bl) {
-			dwSize = 4;
-			RegSetValueEx(hKey, _T("ACTimeout"), NULL, REG_DWORD,(unsigned char *)&prev_ac_bl, dwSize);
-		}
-		backlight_off = GF_FALSE;
-	}
-	RegCloseKey(hKey);
-	hBL = CreateEvent(NULL, FALSE, FALSE, _T("BackLightChangeEvent"));
-	if (hBL) {
-		SetEvent(hBL);
-		CloseHandle(hBL);
-	}
-#endif
-}
-
-static Bool do_resume = GF_FALSE;
-static Bool prev_backlight_state;
-void gf_freeze_display(Bool do_gf_freeze)
-{
-	if (do_gf_freeze) {
-		prev_backlight_state = backlight_off;
-		do_resume = GF_FALSE;
-		if (0 && is_connected && gf_term_get_option(term, GF_OPT_PLAY_STATE)==GF_STATE_PLAYING) {
-			do_resume= GF_TRUE;
-			gf_term_set_option(term, GF_OPT_PLAY_STATE, GF_STATE_PAUSED);
-		}
-		/*gf_freeze display*/
-		gf_term_set_option(term, GF_OPT_FREEZE_DISPLAY, 1);
-
-		set_backlight_state(GF_FALSE);
-		gf_sleep(100);
-	} else {
-		if (prev_backlight_state) set_backlight_state(GF_TRUE);
-		gf_term_set_option(term, GF_OPT_FREEZE_DISPLAY, 0);
-
-		if (do_resume) {
-			gf_term_set_option(term, GF_OPT_PLAY_STATE, GF_STATE_PLAYING);
-			set_backlight_state(GF_TRUE);
-		}
-	}
-}
-
-static void show_taskbar(Bool show_it)
-{
-#ifdef _WIN32_WCE
-	HWND wnd;
-	if (!is_ppc) return;
-
-	wnd = GetForegroundWindow();
-	wnd = g_hwnd;
-	if (show_it) {
-		SHFullScreen(wnd, SHFS_SHOWSTARTICON | SHFS_SHOWTASKBAR| SHFS_SHOWSIPBUTTON);
-		::ShowWindow(::FindWindow(_T("HHTaskbar"),NULL), SW_SHOWNA);
-	} else {
-		::ShowWindow(::FindWindow(_T("HHTaskbar"),NULL), SW_HIDE);
-		SHFullScreen(wnd, SHFS_HIDESTARTICON | SHFS_HIDETASKBAR| SHFS_HIDESIPBUTTON);
-	}
-#endif
-}
-
-void refresh_recent_files()
-{
-#ifdef _WIN32_WCE
-	u32 count = gf_cfg_get_key_count(user.config, "RecentFiles");
-
-	HMENU hMenu = (HMENU)SendMessage(g_hwnd_menu, SHCMBM_GETSUBMENU, 0, ID_MENU_FILE);
-	/*pos is hardcoded*/
-	hMenu = GetSubMenu(hMenu, 2);
-
-	while (RemoveMenu(hMenu, 0, MF_BYPOSITION)) {}
-
-	for (u32 i=0; i<count; i++) {
-		TCHAR txt100;
-		char *name;
-		const char *sOpt = gf_cfg_get_key_name(user.config, "RecentFiles", i);
-		name = strrchr(sOpt, '\\');
-		if (!name) name = strrchr(sOpt, '/');
-		if (!name) name = (char *) sOpt;
-		else name += 1;
-
-		CE_CharToWide(name, (u16 *) txt);
-		AppendMenu(hMenu, MF_STRING, IDM_OPEN_FILE1+i, txt);
-	}
-#endif
-}
-
-
-void open_file(HWND hwnd)
-{
-	Bool res;
-	char ext_list4096;
-	strcpy(ext_list, "");
-
-	gf_freeze_display(GF_TRUE);
-
-	u32 count = gf_cfg_get_key_count(user.config, "MimeTypes");
-	for (u32 i=0; i<count; i++) {
-		char szKeyList1000, *sKey;
-		const char *sMime = gf_cfg_get_key_name(user.config, "MimeTypes", i);
-		const char *opt = gf_cfg_get_key(user.config, "MimeTypes", sMime);
-		strcpy(szKeyList, opt+1);
-		sKey = strrchr(szKeyList, '\"');
-		if (!sKey) continue;
-		sKey0 = 0;
-		strcat(ext_list, szKeyList);
-		strcat(ext_list, " ");
-	}
-#ifdef _WIN32_WCE
-	res = gf_file_dialog(g_hinst, hwnd, the_url, ext_list, user.config);
-#else
-	res = GF_FALSE;
-#endif
-	gf_freeze_display(GF_FALSE);
-
-	/*let's go*/
-	if (res) do_open_file();
-}
-
-void load_recent_file(u32 idx)
-{
-	const char *sOpt = gf_cfg_get_key_name(user.config, "RecentFiles", idx);
-	if (sOpt) {
-		strcpy(the_url, sOpt);
-		do_open_file();
-	}
-}
-
-BOOL CALLBACK AboutDialogProc(const HWND hWnd, const UINT Msg, const WPARAM wParam, const LPARAM lParam)
-{
-	BOOL ret = TRUE;
-	switch (Msg) {
-	case WM_INITDIALOG:
-	{
-		char szText4096;
-		HWND hctl = GetDlgItem(hWnd, IDC_NAMECTRL);
-		sprintf(szText, "GPAC/Osmo4\nversion %s", GPAC_FULL_VERSION);
-#ifdef _WIN32_WCE
-		TCHAR           psz80;
-		ZeroMemory(psz, sizeof(psz));
-		SHINITDLGINFO sid;
-		ZeroMemory(&sid, sizeof(sid));
-		sid.dwMask  = SHIDIM_FLAGS;
-		sid.dwFlags = SHIDIF_SIZEDLGFULLSCREEN;
-		sid.hDlg    = hWnd;
-		SHInitDialog(&sid);
-
-		SHMENUBARINFO mbi;
-		memset(&mbi, 0, sizeof(SHMENUBARINFO));
-		mbi.cbSize = sizeof(SHMENUBARINFO);
-		mbi.hwndParent = hWnd;
-		mbi.nToolBarId = IDR_ABOUT_MENU;
-		mbi.hInstRes = g_hinst;
-		mbi.nBmpId = 0;
-		mbi.cBmpImages = 0;
-		SHCreateMenuBar(&mbi);
-
-		u16 swText4096;
-		CE_CharToWide(szText, swText);
-
-		SetWindowText(hctl, (LPCWSTR) swText);
-#else
-		SetWindowText(hctl, szText);
-#endif
-		MoveWindow(hctl, 0, 0, screen_w, 40, 1);
-		MoveWindow(hWnd, 0, 0, screen_w, disp_w, 1);
-
-	}
-	break;
-	case WM_COMMAND:
-	case WM_CLOSE:
-		EndDialog(hWnd, 0);
-		break;
-	default:
-		ret = FALSE;
-	}
-	return ret;
-}
-void view_about(HWND hwnd)
-{
-	gf_freeze_display(GF_TRUE);
-//	::ShowWindow(g_hwnd_mb, SW_HIDE);
-	int iResult = DialogBox(g_hinst, MAKEINTRESOURCE(IDD_APPABOUT), hwnd,(DLGPROC)AboutDialogProc);
-//	::ShowWindow(g_hwnd_mb, SW_SHOW);
-	gf_freeze_display(GF_FALSE);
-}
-
-void pause_file()
-{
-	if (!is_connected) return;
-#ifdef _WIN32_WCE
-	TBBUTTONINFO tbbi;
-	tbbi.cbSize = sizeof(tbbi);
-	tbbi.dwMask = TBIF_TEXT;
-#endif
-
-	if (gf_term_get_option(term, GF_OPT_PLAY_STATE)==GF_STATE_PLAYING) {
-		gf_term_set_option(term, GF_OPT_PLAY_STATE, GF_STATE_PAUSED);
-#ifdef _WIN32_WCE
-		tbbi.pszText = _T("Resume");
-#endif
-	} else {
-		gf_term_set_option(term, GF_OPT_PLAY_STATE, GF_STATE_PLAYING);
-#ifdef _WIN32_WCE
-		tbbi.pszText = _T("Pause");
-#endif
-	}
-#ifdef _WIN32_WCE
-	SendMessage(g_hwnd_menu, TB_SETBUTTONINFO, IDM_FILE_PAUSE, (LPARAM)&tbbi);
-#endif
-}
-
-void set_svg_progressive()
-{
-	use_svg_prog = (Bool)!use_svg_prog;
-	if (use_svg_prog) {
-		gf_cfg_set_key(user.config, "SAXLoader", "Progressive", "yes");
-		gf_cfg_set_key(user.config, "SAXLoader", "MaxDuration", "30");
-	} else {
-		gf_cfg_set_key(user.config, "SAXLoader", "MaxDuration", "0");
-		gf_cfg_set_key(user.config, "SAXLoader", "Progressive", "no");
-	}
-}
-
-void set_gx_mode(u32 mode)
-{
-	char *opt;
-	switch (mode) {
-	case 0:
-		opt = "raw";
-		break;
-	case 1:
-		opt = "gx";
-		break;
-	case 2:
-		opt = "gdi";
-		break;
-	}
-	gf_cfg_set_key(user.config, "GAPI", "FBAccess", opt);
-
-//	gf_term_del(term);
-//	term = gf_term_new(&user);
-//	gf_term_disconnect(term);
-//	gf_term_connect(term, the_url);
-	do_layout(GF_TRUE);
-}
-
-void do_copy_paste()
-{
-	if (!OpenClipboard(g_hwnd)) return;
-
-	/*or we are editing text and clipboard is not empty*/
-	if (IsClipboardFormatAvailable(CF_TEXT) && (gf_term_paste_text(term, NULL, GF_TRUE)==GF_OK)) {
-		HGLOBAL hglbCopy = GetClipboardData(CF_TEXT);
-		if (hglbCopy) {
-#ifdef _WIN32_WCE
-			char szString1024;
-			LPCTSTR paste_string = (LPCTSTR) GlobalLock(hglbCopy);
-			CE_WideToChar((u16 *) paste_string, szString);
-			gf_term_paste_text(term, szString, GF_FALSE);
-#else
-			char *szString = (char *)GlobalLock(hglbCopy);
-			gf_term_paste_text(term, szString, GF_FALSE);
-#endif
-			GlobalUnlock(hglbCopy);
-		}
-	}
-	/*we have something to copy*/
-	else if (gf_term_get_text_selection(term, GF_TRUE)!=NULL) {
-		u32 len;
-		const char *text = gf_term_get_text_selection(term, GF_FALSE);
-		if (text && strlen(text)) {
-			EmptyClipboard();
-			len = strlen(text);
-
-#ifdef _WIN32_WCE
-			HGLOBAL hglbCopy = GlobalAlloc(GMEM_MOVEABLE, (len + 1) * sizeof(u16));
-			LPCTSTR new_string = (LPCTSTR) GlobalLock(hglbCopy);
-			CE_CharToWide((char*)text, (u16*)new_string);
-#else
-			HGLOBAL hglbCopy = GlobalAlloc(GMEM_MOVEABLE, (len + 1) * sizeof(u8));
-			char *new_string = (char*) GlobalLock(hglbCopy);
-			strcpy(new_string, text);
-#endif
-			GlobalUnlock(hglbCopy);
-			SetClipboardData(CF_TEXT, hglbCopy);
-		}
-	}
-	CloseClipboard();
-}
-
-static void rewrite_log_tools(u32 tool)
-{
-	char *logs;
-	if (tool == GF_LOG_ALL) {
-		gf_log_set_tool_level(GF_LOG_ALL, log_level);
-	} else {
-		if (gf_log_tool_level_on(tool, log_level)) {
-			gf_log_set_tool_level(tool, GF_LOG_QUIET);
-		} else {
-			gf_log_set_tool_level(tool, log_level);
-		}
-	}
-	logs = gf_log_get_tools_levels();
-	if (logs) {
-		gf_cfg_set_key(user.config, "General", "Logs", logs);
-		gf_free(logs);
-	}
-	setup_logs();
-}
-
-BOOL HandleCommand(HWND hwnd, WPARAM wParam, LPARAM lParam)
-{
-	switch (LOWORD(wParam)) {
-	case IDM_FILE_OPEN:
-		open_file(hwnd);
-		break;
-	case IDM_FILE_LOG_RTI:
-		log_rti = (Bool)!log_rti;
-		setup_logs();
-		break;
-	case IDM_FILE_PAUSE:
-		pause_file();
-		break;
-	case IDM_VIEW_ABOUT:
-		view_about(hwnd);
-		break;
-	case IDM_VIEW_FS:
-		set_full_screen();
-		break;
-	case IDM_VIEW_STATUS:
-		show_status = (Bool)!show_status;
-		gf_cfg_set_key(user.config, "General", "ShowStatusBar", show_status ? "yes" : "no");
-		do_layout(GF_TRUE);
-		break;
-	case IDM_VIEW_CPU:
-		view_cpu = (Bool)!view_cpu;
-		break;
-	case IDM_VIEW_FORCEGL:
-		force_2d_gl = (Bool)!force_2d_gl;
-		gf_cfg_set_key(user.config, "Compositor", "ForceOpenGL", force_2d_gl ? "yes" : "no");
-		gf_term_set_option(term, GF_OPT_USE_OPENGL, force_2d_gl);
-		break;
-	case IDM_NAV_RESET:
-		gf_term_set_option(term, GF_OPT_NAVIGATION_TYPE, 0);
-		break;
-	case IDM_NAV_NONE:
-		gf_term_set_option(term, GF_OPT_NAVIGATION, GF_NAVIGATE_NONE);
-		break;
-	case IDM_NAV_SLIDE:
-		gf_term_set_option(term, GF_OPT_NAVIGATION, GF_NAVIGATE_SLIDE);
-		break;
-	case IDM_NAV_WALK:
-		gf_term_set_option(term, GF_OPT_NAVIGATION, GF_NAVIGATE_WALK);
-		break;
-	case IDM_NAV_FLY:
-		gf_term_set_option(term, GF_OPT_NAVIGATION, GF_NAVIGATE_FLY);
-		break;
-	case IDM_NAV_EXAMINE:
-		gf_term_set_option(term, GF_OPT_NAVIGATION, GF_NAVIGATE_EXAMINE);
-		break;
-	case IDM_NAV_HEADLIGHT:
-		gf_term_set_option(term, GF_OPT_HEADLIGHT, !gf_term_get_option(term, GF_OPT_HEADLIGHT) );
-		break;
-	case IDM_NAV_COL_NONE:
-		gf_term_set_option(term, GF_OPT_COLLISION, GF_COLLISION_NONE);
-		break;
-	case IDM_NAV_COL_REG:
-		gf_term_set_option(term, GF_OPT_COLLISION, GF_COLLISION_NORMAL);
-		break;
-	case IDM_NAV_COL_DISP:
-		gf_term_set_option(term, GF_OPT_COLLISION, GF_COLLISION_DISPLACEMENT);
-		break;
-	case IDM_NAV_GRAVITY:
-		gf_term_set_option(term, GF_OPT_GRAVITY, !gf_term_get_option(term, GF_OPT_GRAVITY));
-		break;
-
-	case IDM_VIEW_AR_NONE:
-		gf_term_set_option(term, GF_OPT_ASPECT_RATIO, GF_ASPECT_RATIO_KEEP);
-		break;
-	case IDM_VIEW_AR_FILL:
-		gf_term_set_option(term, GF_OPT_ASPECT_RATIO, GF_ASPECT_RATIO_FILL_SCREEN);
-		break;
-	case IDM_VIEW_AR_4_3:
-		gf_term_set_option(term, GF_OPT_ASPECT_RATIO, GF_ASPECT_RATIO_4_3);
-		break;
-	case IDM_VIEW_AR_16_9:
-		gf_term_set_option(term, GF_OPT_ASPECT_RATIO, GF_ASPECT_RATIO_16_9);
-		break;
-
-	case IDM_VIEW_LOW_RATE:
-		use_low_fps = (Bool)!use_low_fps;
-		gf_term_set_simulation_frame_rate(term, use_low_fps ? 15.0 : 30.0);
-		break;
-	case ID_VIDEO_DIRECTDRAW:
-	{
-		u32 drend = (gf_term_get_option(term, GF_OPT_DRAW_MODE)==GF_DRAW_MODE_IMMEDIATE) ? GF_DRAW_MODE_DEFER : GF_DRAW_MODE_IMMEDIATE;
-		gf_term_set_option(term, GF_OPT_DRAW_MODE, drend);
-		gf_cfg_set_key(user.config, "Compositor", "DrawMode", drend ? "immediate" : "defer");
-	}
-	break;
-
-	case ID_FILE_CUT_PASTE:
-		do_copy_paste();
-		break;
-
-	case IDM_OPEN_FILE1:
-	case IDM_OPEN_FILE2:
-	case IDM_OPEN_FILE3:
-	case IDM_OPEN_FILE4:
-	case IDM_OPEN_FILE5:
-	case IDM_OPEN_FILE6:
-	case IDM_OPEN_FILE7:
-	case IDM_OPEN_FILE8:
-	case IDM_OPEN_FILE9:
-	case IDM_OPEN_FILE10:
-		load_recent_file(LOWORD(wParam) - IDM_OPEN_FILE1);
-		break;
-
-	case IDS_CAP_DISABLE_PLAYLIST:
-		playlist_navigation_on = (Bool)!playlist_navigation_on;
-		break;
-	case IDM_VIEW_SVG_LOAD:
-		set_svg_progressive();
-		break;
-	case ID_VIDEO_DIRECTFB:
-		set_gx_mode(0);
-		break;
-	case ID_VIDEO_GAPI:
-		set_gx_mode(1);
-		break;
-	case ID_VIDEO_GDI:
-		set_gx_mode(2);
-		break;
-
-	case ID_LOGLEVEL_NONE:
-		log_level = GF_LOG_QUIET;
-		rewrite_log_tools(GF_LOG_ALL);
-		break;
-	case ID_LOGLEVEL_ERROR:
-		log_level = GF_LOG_ERROR;
-		rewrite_log_tools(GF_LOG_ALL);
-		break;
-	case ID_LOGLEVEL_WARNING:
-		log_level = GF_LOG_WARNING;
-		rewrite_log_tools(GF_LOG_ALL);
-		break;
-	case ID_LOGLEVEL_INFO:
-		log_level = GF_LOG_INFO;
-		rewrite_log_tools(GF_LOG_ALL);
-		break;
-	case ID_LOGLEVEL_DEBUG:
-		log_level = GF_LOG_DEBUG;
-		rewrite_log_tools(GF_LOG_ALL);
-		break;
-	case ID_TOOLS_CORE:
-		rewrite_log_tools(GF_LOG_CORE);
-		break;
-	case ID_TOOLS_CODING:
-		rewrite_log_tools(GF_LOG_CODING);
-		break;
-	case ID_TOOLS_CONTAINER:
-		rewrite_log_tools(GF_LOG_CONTAINER);
-		break;
-	case ID_TOOLS_NETWORK:
-		rewrite_log_tools(GF_LOG_NETWORK);
-		break;
-	case ID_TOOLS_RTP:
-		rewrite_log_tools(GF_LOG_RTP);
-		break;
-	case ID_TOOLS_SCRIPT:
-		rewrite_log_tools(GF_LOG_SCRIPT);
-		break;
-	case ID_TOOLS_CODEC:
-		rewrite_log_tools(GF_LOG_CODEC);
-		break;
-	case ID_TOOLS_PARSER:
-		rewrite_log_tools(GF_LOG_PARSER);
-		break;
-	case ID_TOOLS_MEDIA:
-		rewrite_log_tools(GF_LOG_MEDIA);
-		break;
-	case ID_TOOLS_SCENE:
-		rewrite_log_tools(GF_LOG_SCENE);
-		break;
-	case ID_TOOLS_INTERACT:
-		rewrite_log_tools(GF_LOG_INTERACT);
-		break;
-	case ID_TOOLS_COMPOSE:
-		rewrite_log_tools(GF_LOG_COMPOSE);
-		break;
-	case ID_TOOLS_MMIO:
-		rewrite_log_tools(GF_LOG_MMIO);
-		break;
-	case ID_TOOLS_RTI:
-		rewrite_log_tools(GF_LOG_RTI);
-		break;
-	case ID_TOOLS_ALL:
-		rewrite_log_tools(GF_LOG_ALL);
-		break;
-	case ID_TOOLS_NONE:
-		log_level = GF_LOG_QUIET;
-		rewrite_log_tools(GF_LOG_ALL);
-		break;
-	case ID_LOGS_RESET:
-		if (log_file) {
-			gf_fclose(log_file);
-			log_file = NULL;
-		}
-		{
-			const char *filename = gf_cfg_get_key(user.config, "General", "LogFile");
-			if (filename) gf_delete_file(filename);
-		}
-		setup_logs();
-		break;
-
-	case IDM_ITEM_QUIT:
-		DestroyWindow(hwnd);
-		return FALSE;
-	}
-	return TRUE;
-}
-
-static BOOL OnMenuPopup(const HWND hWnd, const WPARAM wParam)
-{
-	char *opt;
-	u32 type;
-	CheckMenuItem((HMENU)wParam, IDM_VIEW_STATUS, MF_BYCOMMAND| (show_status ? MF_CHECKED : MF_UNCHECKED) );
-	CheckMenuItem((HMENU)wParam, IDM_VIEW_FORCEGL, MF_BYCOMMAND| (force_2d_gl ? MF_CHECKED : MF_UNCHECKED) );
-	EnableMenuItem((HMENU)wParam, IDM_VIEW_CPU, MF_BYCOMMAND| (show_status ? MF_ENABLED : MF_GRAYED) );
-	if (show_status) CheckMenuItem((HMENU)wParam, IDM_VIEW_CPU, MF_BYCOMMAND| (view_cpu ? MF_CHECKED : MF_UNCHECKED) );
-	CheckMenuItem((HMENU)wParam, IDM_VIEW_LOW_RATE, MF_BYCOMMAND| (use_low_fps ? MF_CHECKED : MF_UNCHECKED) );
-
-	EnableMenuItem((HMENU)wParam, ID_VIDEO_DIRECTDRAW, MF_BYCOMMAND| (!force_2d_gl ? MF_ENABLED : MF_GRAYED) );
-	CheckMenuItem((HMENU)wParam, ID_VIDEO_DIRECTDRAW, MF_BYCOMMAND| (!force_2d_gl && gf_term_get_option(term, GF_OPT_DRAW_MODE) ? MF_CHECKED : MF_UNCHECKED) );
-
-	CheckMenuItem((HMENU)wParam, IDM_VIEW_SVG_LOAD, MF_BYCOMMAND| (use_svg_prog ? MF_CHECKED : MF_UNCHECKED) );
-
-	opt = (char *)gf_cfg_get_key(user.config, "GAPI", "FBAccess");
-	if (!opt) opt = "raw";
-	CheckMenuItem((HMENU)wParam, ID_VIDEO_DIRECTFB, MF_BYCOMMAND| ( (!strcmp(opt,"raw")) ? MF_CHECKED : MF_UNCHECKED) );
-	CheckMenuItem((HMENU)wParam, ID_VIDEO_GAPI, MF_BYCOMMAND| ( (!strcmp(opt,"gx")) ? MF_CHECKED : MF_UNCHECKED) );
-	CheckMenuItem((HMENU)wParam, ID_VIDEO_GDI, MF_BYCOMMAND| ( (!strcmp(opt,"gdi")) ? MF_CHECKED : MF_UNCHECKED) );
-
-
-	type = gf_term_get_option(term, GF_OPT_ASPECT_RATIO);
-	CheckMenuItem((HMENU)wParam, IDS_CAP_DISABLE_PLAYLIST, MF_BYCOMMAND| (!playlist_navigation_on ? MF_CHECKED : MF_UNCHECKED) );
-	CheckMenuItem((HMENU)wParam, IDM_VIEW_AR_NONE, MF_BYCOMMAND| (type==GF_ASPECT_RATIO_KEEP) ? MF_CHECKED : MF_UNCHECKED);
-	CheckMenuItem((HMENU)wParam, IDM_VIEW_AR_FILL, MF_BYCOMMAND| (type==GF_ASPECT_RATIO_FILL_SCREEN) ? MF_CHECKED : MF_UNCHECKED);
-	CheckMenuItem((HMENU)wParam, IDM_VIEW_AR_4_3, MF_BYCOMMAND| (type==GF_ASPECT_RATIO_4_3) ? MF_CHECKED : MF_UNCHECKED);
-	CheckMenuItem((HMENU)wParam, IDM_VIEW_AR_16_9, MF_BYCOMMAND| (type==GF_ASPECT_RATIO_16_9) ? MF_CHECKED : MF_UNCHECKED);
-
-	EnableMenuItem((HMENU)wParam, IDM_FILE_PAUSE, MF_BYCOMMAND| (is_connected ? MF_ENABLED : MF_GRAYED) );
-
-	if (/*we have something to copy*/
-	    (gf_term_get_text_selection(term, GF_TRUE)!=NULL)
-	    /*or we are editing text and clipboard is not empty*/
-	    || (IsClipboardFormatAvailable(CF_TEXT) && (gf_term_paste_text(term, NULL, GF_TRUE)==GF_OK))
-	) {
-		EnableMenuItem((HMENU)wParam, ID_FILE_CUT_PASTE, MF_BYCOMMAND| MF_ENABLED);
-	} else {
-		EnableMenuItem((HMENU)wParam, ID_FILE_CUT_PASTE, MF_BYCOMMAND| MF_GRAYED);
-	}
-
-	CheckMenuItem((HMENU)wParam, IDM_FILE_LOG_RTI, MF_BYCOMMAND| (log_rti) ? MF_CHECKED : MF_UNCHECKED);
-
-	if (!is_connected) type = 0;
-	else type = gf_term_get_option(term, GF_OPT_NAVIGATION_TYPE);
-	navigation_on = type ? GF_TRUE : GF_FALSE;
-
-	EnableMenuItem((HMENU)wParam, IDM_NAV_NONE, MF_BYCOMMAND | (!type ? MF_GRAYED : MF_ENABLED) );
-	EnableMenuItem((HMENU)wParam, IDM_NAV_SLIDE, MF_BYCOMMAND | (!type ? MF_GRAYED : MF_ENABLED) );
-	EnableMenuItem((HMENU)wParam, IDM_NAV_RESET, MF_BYCOMMAND | (!type ? MF_GRAYED : MF_ENABLED) );
-	EnableMenuItem((HMENU)wParam, IDM_NAV_WALK, MF_BYCOMMAND | ( (type!=GF_NAVIGATE_TYPE_3D) ? MF_GRAYED : MF_ENABLED) );
-	EnableMenuItem((HMENU)wParam, IDM_NAV_FLY, MF_BYCOMMAND | ((type!=GF_NAVIGATE_TYPE_3D) ? MF_GRAYED : MF_ENABLED) );
-	EnableMenuItem((HMENU)wParam, IDM_NAV_EXAMINE, MF_BYCOMMAND | ((type!=GF_NAVIGATE_TYPE_3D) ? MF_GRAYED : MF_ENABLED) );
-	EnableMenuItem((HMENU)wParam, IDM_NAV_COL_NONE, MF_BYCOMMAND | ((type!=GF_NAVIGATE_TYPE_3D) ? MF_GRAYED : MF_ENABLED) );
-	EnableMenuItem((HMENU)wParam, IDM_NAV_COL_REG, MF_BYCOMMAND | ((type!=GF_NAVIGATE_TYPE_3D) ? MF_GRAYED : MF_ENABLED) );
-	EnableMenuItem((HMENU)wParam, IDM_NAV_COL_DISP, MF_BYCOMMAND | ((type!=GF_NAVIGATE_TYPE_3D) ? MF_GRAYED : MF_ENABLED) );
-	EnableMenuItem((HMENU)wParam, IDM_NAV_GRAVITY, MF_BYCOMMAND | ((type!=GF_NAVIGATE_TYPE_3D) ? MF_GRAYED : MF_ENABLED) );
-	EnableMenuItem((HMENU)wParam, IDM_NAV_HEADLIGHT, MF_BYCOMMAND | ( (type!=GF_NAVIGATE_TYPE_3D) ? MF_GRAYED : MF_ENABLED) );
-
-	if (type) {
-		u32 mode = gf_term_get_option(term, GF_OPT_NAVIGATION);
-		navigation_on = (mode==GF_NAVIGATE_NONE) ? GF_FALSE : GF_TRUE;
-		CheckMenuItem((HMENU)wParam, IDM_NAV_NONE, MF_BYCOMMAND | ( (mode==GF_NAVIGATE_NONE) ? MF_CHECKED : MF_UNCHECKED) );
-		CheckMenuItem((HMENU)wParam, IDM_NAV_SLIDE, MF_BYCOMMAND | ( (mode==GF_NAVIGATE_SLIDE) ? MF_CHECKED : MF_UNCHECKED) );
-		CheckMenuItem((HMENU)wParam, IDM_NAV_WALK, MF_BYCOMMAND | ( (mode==GF_NAVIGATE_WALK) ? MF_CHECKED : MF_UNCHECKED) );
-		CheckMenuItem((HMENU)wParam, IDM_NAV_FLY, MF_BYCOMMAND | ((mode==GF_NAVIGATE_FLY) ? MF_CHECKED : MF_UNCHECKED) );
-		CheckMenuItem((HMENU)wParam, IDM_NAV_EXAMINE, MF_BYCOMMAND | ((mode==GF_NAVIGATE_EXAMINE) ? MF_CHECKED : MF_UNCHECKED) );
-
-		if (type==GF_NAVIGATE_TYPE_3D) {
-			CheckMenuItem((HMENU)wParam, IDM_NAV_HEADLIGHT, MF_BYCOMMAND | ( gf_term_get_option(term, GF_OPT_HEADLIGHT) ? MF_CHECKED : MF_UNCHECKED) );
-			CheckMenuItem((HMENU)wParam, IDM_NAV_GRAVITY, MF_BYCOMMAND | ( gf_term_get_option(term, GF_OPT_GRAVITY) ? MF_CHECKED : MF_UNCHECKED) );
-			type = gf_term_get_option(term, GF_OPT_COLLISION);
-			CheckMenuItem((HMENU)wParam, IDM_NAV_COL_NONE, MF_BYCOMMAND | ( (type==GF_COLLISION_NONE) ? MF_CHECKED : MF_UNCHECKED) );
-			CheckMenuItem((HMENU)wParam, IDM_NAV_COL_REG, MF_BYCOMMAND | ( (type==GF_COLLISION_NORMAL) ? MF_CHECKED : MF_UNCHECKED) );
-			CheckMenuItem((HMENU)wParam, IDM_NAV_COL_DISP, MF_BYCOMMAND | ( (type==GF_COLLISION_DISPLACEMENT) ? MF_CHECKED : MF_UNCHECKED) );
-		}
-	}
-
-	opt = (char *) gf_cfg_get_key(user.config, "General", "Logs");
-	CheckMenuItem((HMENU)wParam, ID_LOGLEVEL_NONE, MF_BYCOMMAND | ( strstr(opt, "quiet") ? MF_CHECKED : MF_UNCHECKED) );
-	CheckMenuItem((HMENU)wParam, ID_LOGLEVEL_ERROR, MF_BYCOMMAND | ( strstr(opt, "error") ? MF_CHECKED : MF_UNCHECKED) );
-	CheckMenuItem((HMENU)wParam, ID_LOGLEVEL_WARNING, MF_BYCOMMAND | ( strstr(opt, "warning") ? MF_CHECKED : MF_UNCHECKED) );
-	CheckMenuItem((HMENU)wParam, ID_LOGLEVEL_INFO, MF_BYCOMMAND | ( strstr(opt, "info") ? MF_CHECKED : MF_UNCHECKED) );
-	CheckMenuItem((HMENU)wParam, ID_LOGLEVEL_DEBUG, MF_BYCOMMAND | ( strstr(opt, "debug") ? MF_CHECKED : MF_UNCHECKED) );
-
-#define CHECK_TOOL(_ID, _name) CheckMenuItem((HMENU)wParam, _ID, MF_BYCOMMAND | ( ((strstr(opt, _name) != NULL) || !strcmp(opt, "all")) ? MF_CHECKED : MF_UNCHECKED) );
-	opt = (char *) gf_cfg_get_key(user.config, "General", "Logs");
-	CHECK_TOOL(ID_TOOLS_CORE, "core");
-	CHECK_TOOL(ID_TOOLS_CODING, "coding");
-	CHECK_TOOL(ID_TOOLS_CONTAINER, "container");
-	CHECK_TOOL(ID_TOOLS_NETWORK, "network");
-	CHECK_TOOL(ID_TOOLS_RTP, "rtp");
-	CHECK_TOOL(ID_TOOLS_SYNC, "sync");
-	CHECK_TOOL(ID_TOOLS_SCRIPT, "script");
-	CHECK_TOOL(ID_TOOLS_CODEC, "codec");
-	CHECK_TOOL(ID_TOOLS_PARSER, "parser");
-	CHECK_TOOL(ID_TOOLS_MEDIA, "media");
-	CHECK_TOOL(ID_TOOLS_SCENE, "scene");
-	CHECK_TOOL(ID_TOOLS_INTERACT, "interact");
-	CHECK_TOOL(ID_TOOLS_COMPOSE, "compose");
-	CHECK_TOOL(ID_TOOLS_MMIO, "mmio");
-	CHECK_TOOL(ID_TOOLS_RTI, "rti");
-
-
-	return TRUE;
-}
-
-
-BOOL CALLBACK MainWndProc (HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
-{
-	switch (msg) {
-	case WM_CREATE:
-	{
-#ifdef _WIN32_WCE
-		SHMENUBARINFO mbi;
-		memset(&mbi, 0, sizeof(SHMENUBARINFO));
-		mbi.cbSize = sizeof(SHMENUBARINFO);
-		mbi.hwndParent = hwnd;
-		mbi.hInstRes = g_hinst;
-		mbi.nBmpId = 0;
-		mbi.cBmpImages = 0;
-
-		mbi.nToolBarId = IDM_MAIN_MENU;
-		SHCreateMenuBar(&mbi);
-		g_hwnd_menu = mbi.hwndMB;
-#else
-		g_hwnd_menu = NULL;
-#endif
-
-		g_hwnd_status = CreateWindow(TEXT("STATIC"), TEXT("Status"), WS_CHILD|WS_VISIBLE|SS_LEFT, 0, 0, disp_w, caption_h, hwnd, NULL, g_hinst, NULL);
-
-		do_layout(GF_TRUE);
-	}
-	break;
-
-	case WM_COMMAND:
-		if (HandleCommand(hwnd, wParam, lParam))
-			return DefWindowProc(hwnd, msg, wParam, lParam);
-		break;
-	case WM_TIMER:
-		if (wParam==STATE_TIMER_ID) update_state_info();
-#ifdef TERM_NOT_THREADED
-		else gf_term_process_step(term);
-#endif
-		break;
-	case WM_HOTKEY:
-		break;
-	case WM_KEYDOWN:
-		if (playlist_navigation_on && !navigation_on) {
-			if (wParam==VK_LEFT) {
-				switch_playlist(GF_TRUE);
-				break;
-			}
-			else if (wParam==VK_RIGHT) {
-				switch_playlist(GF_FALSE);
-				break;
-			}
-		}
-	/*fall through*/
-	case WM_SYSKEYDOWN:
-	case WM_SYSKEYUP:
-	case WM_KEYUP:
-	case WM_CHAR:
-	case WM_MOUSEMOVE:
-	case WM_LBUTTONDOWN:
-	case WM_LBUTTONDBLCLK:
-	case WM_LBUTTONUP:
-		::SendMessage(g_hwnd_disp, msg, wParam, lParam);
-		return 0;
-	case WM_INITMENUPOPUP:
-		OnMenuPopup(hwnd, wParam);
-		break;
-	case WM_CLOSE:
-		DestroyWindow(hwnd);
-		break;
-	case WM_SETFOCUS:
-		gf_freeze_display(GF_FALSE);
-		break;
-	case WM_KILLFOCUS:
-		if ((HWND) wParam==g_hwnd) {
-			gf_freeze_display(GF_TRUE);
-		}
-		break;
-	case WM_ACTIVATE:
-		if (WA_INACTIVE != LOWORD(wParam)) {
-			if ((HWND) lParam == g_hwnd) {
-				gf_freeze_display(GF_FALSE);
-				SetFocus(hwnd);
-			}
-		} else {
-			if ((HWND) lParam == g_hwnd_disp) {
-				gf_freeze_display(GF_TRUE);
-			}
-		}
-		break;
-	case WM_LOADTERM:
-		if (!LoadTerminal()) {
-			MessageBox(hwnd, _T("Cannot load GPAC"), _T("Error"), MB_OK);
-			PostQuitMessage(0);
-		}
-		break;
-	case WM_DESTROY:
-		PostQuitMessage(0);
-		break;
-	default:
-		return DefWindowProc(hwnd, msg, wParam, lParam);
-	}
-
-	return 0;
-}
-
-BOOL InitInstance (int CmdShow)
-{
-	WNDCLASS wc;
-
-	wc.style			= 0;
-	wc.lpfnWndProc		= (WNDPROC) MainWndProc;
-	wc.cbClsExtra		= 0;
-	wc.cbWndExtra		= 0;
-	wc.hInstance		= g_hinst;
-	wc.hIcon			= LoadIcon(g_hinst, MAKEINTRESOURCE(IDI_ICON));
-	wc.hCursor			= 0;
-	wc.hbrBackground	= (HBRUSH) GetStockObject(WHITE_BRUSH);
-	wc.lpszMenuName		= 0;
-	wc.lpszClassName	= _T("Osmophone");
-	RegisterClass(&wc);
-
-#ifdef _WIN32_WCE
-	int style = WS_VISIBLE;
-#else
-	int style = WS_POPUP;
-#endif
-
-	g_hwnd = CreateWindow(_T("Osmophone"), _T("Osmophone"),
-	                      style,
-	                      0, caption_h, disp_w, disp_h,
-	                      NULL, NULL, g_hinst, NULL);
-
-	if (!g_hwnd) return FALSE;
-
-	ShowWindow(g_hwnd, CmdShow);
-
-	refresh_recent_files();
-
-	::SetTimer(g_hwnd, STATE_TIMER_ID, STATE_TIMER_DUR, NULL);
-	do_layout(GF_TRUE);
-
-	set_status("Loading Terminal");
-	PostMessage(g_hwnd, WM_LOADTERM, 0, 0);
-	set_status("Ready");
-	return TRUE;
-}
-
-#ifndef GETRAWFRAMEBUFFER
-#define GETRAWFRAMEBUFFER   0x00020001
-typedef struct _RawFrameBufferInfo
-{
-	WORD wFormat;
-	WORD wBPP;
-	VOID *pFramePointer;
-	int	cxStride;
-	int	cyStride;
-	int cxPixels;
-	int cyPixels;
-} RawFrameBufferInfo;
-
-#define FORMAT_565 1
-#define FORMAT_555 2
-#define FORMAT_OTHER 3
-#endif
-
-int WINAPI WinMain(HINSTANCE hInstance,
-                   HINSTANCE hPrevInstance,
-#ifdef _WIN32_WCE
-                   LPWSTR lpCmdLine,
-#else
-                   LPSTR lpCmdLine,
-#endif
-                   int nShowCmd
-                  ) {
-	MSG 	msg;
-
-	HWND 	hwndOld = NULL;
-	const char *str;
-	Bool initial_launch = GF_FALSE;
-
-	if (hwndOld = FindWindow(_T("Osmophone"), NULL))
-	{
-		SetForegroundWindow(hwndOld);
-		return 0;
-	}
-
-	memset(&user, 0, sizeof(GF_User));
-	term = NULL;
-
-	g_hinst = hInstance;
-
-	screen_w = GetSystemMetrics(SM_CXSCREEN);
-	screen_h = GetSystemMetrics(SM_CYSCREEN);
-
-	/*are we in low res or high res*/
-	RawFrameBufferInfo Info;
-	HDC DC = GetDC(NULL);
-	ExtEscape(DC, GETRAWFRAMEBUFFER, 0, NULL, sizeof(RawFrameBufferInfo), (char*)&Info);
-	ReleaseDC(NULL,DC);
-	if (Info.pFramePointer) {
-		recompute_res(Info.cxPixels, Info.cyPixels);
-	} else {
-		recompute_res(screen_w, screen_h);
-	}
-
-
-
-#ifdef _WIN32_WCE
-	TCHAR      szBufMAX_PATH;
-	SystemParametersInfo(SPI_GETPLATFORMTYPE, MAX_PATH, szBuf, 0);
-	if (! lstrcmp(szBuf, __TEXT("PocketPC"))) is_ppc = GF_TRUE;
-	else if (! lstrcmp(szBuf, __TEXT("Palm PC2"))) is_ppc = GF_TRUE;
-#endif
-
-
-	user.config = gf_cfg_init(NULL, &initial_launch);
-	if (!user.config) {
-		MessageBox(NULL, _T("Couldn't locate GPAC config file"), _T("Fatal Error"), MB_OK);
-		return 0;
-	}
-
-	str = gf_cfg_get_key(user.config, "Compositor", "ScreenWidth");
-	if (str) screen_w = atoi(str);
-	str = gf_cfg_get_key(user.config, "Compositor", "ScreenHeight");
-	if (str) screen_h = atoi(str);
-	disp_w = screen_w;
-#ifdef _WIN32_WCE
-	disp_h = screen_h - menu_h /*- caption_h*/;
-#else
-	disp_h = screen_h;
-#endif
-
-	gf_sys_init(GF_MemTrackerNone);
-	user.modules = gf_modules_new(NULL, user.config);
-	if (!gf_modules_get_count(user.modules)) {
-		MessageBox(GetForegroundWindow(), _T("No modules found"), _T("GPAC Init Error"), MB_OK);
-		gf_modules_del(user.modules);
-		gf_cfg_del(user.config);
-		memset(&user, 0, sizeof(GF_User));
-		gf_sys_close();
-		return 0;
-	}
-
-	/*first launch, register all files ext*/
-	if (initial_launch) {
-		/*FFMPEG registration - FFMPEG DLLs compiled with CEGCC cannot be loaded directly under WM 6.1
-		cf http://cegcc.sourceforge.net/docs/faq.html#DllDoesNotWorkWithWindowsMobile6.1
-		*/
-		HKEY hKey = NULL;
-		DWORD dwSize;
-		DWORD dwValue;
-		RegCreateKeyEx(HKEY_LOCAL_MACHINE, _T("System\\Loader\\LoadModuleLow"), 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hKey, &dwSize);
-		dwSize = 4;
-		dwValue = 1;
-		LONG res = RegSetValueEx(hKey, _T("avcodec-52.dll"), NULL, REG_DWORD, (unsigned char *)&dwValue, dwSize);
-		res = RegSetValueEx(hKey, _T("avformat-52.dll"), NULL, REG_DWORD, (unsigned char *)&dwValue, dwSize);
-		res = RegSetValueEx(hKey, _T("avutil-50.dll"), NULL, REG_DWORD, (unsigned char *)&dwValue, dwSize);
-		res = RegSetValueEx(hKey, _T("swscale-0.dll"), NULL, REG_DWORD, (unsigned char *)&dwValue, dwSize);
-		RegCloseKey(hKey);
-
-		u32 i;
-		for (i=0; i<gf_modules_get_count(user.modules); i++) {
-			GF_InputService *ifce = (GF_InputService *) gf_modules_load_interface(user.modules, i, GF_NET_CLIENT_INTERFACE);
-			if (!ifce) continue;
-			if (ifce) {
-				ifce->CanHandleURL(ifce, "test.test");
-				gf_modules_close_interface((GF_BaseInterface *)ifce);
-			}
-		}
-		MessageBox(NULL, _T("Thank you for installing GPAC"), _T("Initial setup done"), MB_OK);
-	}
-
-	str = gf_cfg_get_key(user.config, "General", "Loop");
-	loop = (!str || !stricmp(str, "yes")) ? GF_TRUE : GF_FALSE;
-
-	str = gf_cfg_get_key(user.config, "SAXLoader", "Progressive");
-	use_svg_prog = (str && !strcmp(str, "yes")) ? GF_TRUE : GF_FALSE;
-
-	str = gf_cfg_get_key(user.config, "General", "RTIRefreshPeriod");
-	if (str) {
-		rti_update_time_ms = atoi(str);
-	} else {
-		gf_cfg_set_key(user.config, "General", "RTIRefreshPeriod", "200");
-	}
-
-	str = gf_cfg_get_key(user.config, "General", "ShowStatusBar");
-	show_status = (str && !strcmp(str, "yes")) ? GF_TRUE : GF_FALSE;
-
-
-#ifdef _WIN32_WCE
-	if (is_ppc) GXOpenInput();
-#endif
-
-	if (InitInstance(nShowCmd)) {
-		SetForegroundWindow(g_hwnd);
-		show_taskbar(GF_FALSE);
-
-		force_2d_gl = (Bool)gf_term_get_option(term, GF_OPT_USE_OPENGL);
-
-		while (GetMessage(&msg, NULL, 0,0) == TRUE) {
-			TranslateMessage (&msg);
-			DispatchMessage (&msg);
-
-			if (playlist_act) {
-				switch_playlist((Bool)(playlist_act-1));
-				playlist_act = 0;
-			}
-		}
-		show_taskbar(GF_TRUE);
-	}
-#ifdef _WIN32_WCE
-	if (is_ppc) GXCloseInput();
-#endif
-
-	/*and destroy*/
-	if (term) gf_term_del(term);
-	if (user.modules) gf_modules_del(user.modules);
-	if (user.config) gf_cfg_del(user.config);
-
-	if (backlight_off) set_backlight_state(GF_FALSE);
-
-	gf_sys_close();
-	if (log_file) gf_fclose(log_file);
-	return 0;
-}

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/osmophone/newres.h Deleted

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/osmophone/openfile.cpp Deleted

@@ -1,405 +0,0 @@
-#include <windows.h>
-
-#ifdef _WIN32_WCE
-
-#include <aygshell.h>
-
-#include <gpac/config_file.h>
-#include "resource.h"
-
-static HINSTANCE g_hInst = NULL;
-static HMENU g_hMenuView;
-static HWND g_hWndMenuBar;
-static HWND hDirTxt;
-static HWND the_wnd;
-static HWND hList;
-static TCHAR w_current_dirGF_MAX_PATH = _T("\\");
-static u8 current_dirGF_MAX_PATH = "\\";
-static const char *extension_list = NULL;
-static char *out_url = NULL;
-Bool bViewUnknownTypes = GF_FALSE;
-Bool playlist_mode = GF_FALSE;
-GF_Config *cfg;
-
-
-static void refresh_menu_states()
-{
-	if (playlist_mode) {
-		EnableMenuItem(g_hMenuView, IDM_OF_PL_UP, MF_BYCOMMAND|MF_ENABLED);
-		EnableMenuItem(g_hMenuView, IDM_OF_PL_DOWN, MF_BYCOMMAND|MF_ENABLED );
-	} else {
-		EnableMenuItem(g_hMenuView, IDM_OF_VIEW_ALL, MF_BYCOMMAND| (extension_list ? MF_ENABLED : MF_GRAYED) );
-		CheckMenuItem(g_hMenuView, IDM_OF_VIEW_ALL, MF_BYCOMMAND| (bViewUnknownTypes ? MF_CHECKED : MF_UNCHECKED) );
-	}
-	CheckMenuItem(g_hMenuView, IDM_OF_PLAYLIST, MF_BYCOMMAND| (playlist_mode ? MF_CHECKED : MF_UNCHECKED) );
-}
-
-static void switch_menu_pl()
-{
-	DeleteMenu(g_hMenuView, IDM_OF_VIEW_ALL, MF_BYCOMMAND);
-	DeleteMenu(g_hMenuView, IDM_OF_PL_UP, MF_BYCOMMAND);
-	DeleteMenu(g_hMenuView, IDM_OF_PL_DOWN, MF_BYCOMMAND);
-	DeleteMenu(g_hMenuView, IDM_OF_PL_CLEAR, MF_BYCOMMAND);
-
-	if (playlist_mode) {
-		InsertMenu(g_hMenuView, 0, MF_BYPOSITION, IDM_OF_PL_CLEAR, _T("Clear"));
-		InsertMenu(g_hMenuView, 0, MF_BYPOSITION, IDM_OF_PL_DOWN, _T("Move Down") );
-		InsertMenu(g_hMenuView, 0, MF_BYPOSITION, IDM_OF_PL_UP, _T("Move Up") );
-	} else {
-		InsertMenu(g_hMenuView, 0, MF_BYPOSITION, IDM_OF_VIEW_ALL, _T("All Unknown Files") );
-	}
-	TBBUTTONINFO tbbi;
-	tbbi.cbSize = sizeof(tbbi);
-	tbbi.dwMask = TBIF_TEXT;
-	tbbi.pszText = playlist_mode ? _T("Remove") : _T("Add");
-	SendMessage(g_hWndMenuBar, TB_SETBUTTONINFO, IDM_OF_PL_ACT, (LPARAM)&tbbi);
-	refresh_menu_states();
-}
-
-
-Bool enum_dirs(void *cbk, char *name, char *path, GF_FileEnumInfo *file_info)
-{
-	TCHAR w_nameGF_MAX_PATH, w_str_nameGF_MAX_PATH;
-
-	CE_CharToWide(name, (u16 *) w_name);
-	wcscpy(w_str_name, _T("+ "));
-	wcscat(w_str_name, w_name);
-	int iRes = SendMessage(hList, LB_ADDSTRING, 0, (LPARAM)(LPCTSTR) w_str_name);
-	SendMessage(hList, LB_SETITEMDATA, iRes, (LPARAM) 1);
-	return GF_FALSE;
-}
-
-Bool enum_files(void *cbk, char *name, char *path, GF_FileEnumInfo *file_info)
-{
-	TCHAR w_nameGF_MAX_PATH;
-
-	if (!bViewUnknownTypes && extension_list) {
-		char *ext = strrchr(name, '.');
-		if (!ext || !strstr(extension_list, ext+1)) return GF_FALSE;
-	}
-	CE_CharToWide(name, (u16 *) w_name);
-	SendMessage(hList, LB_ADDSTRING, 0, (LPARAM)(LPCTSTR) w_name);
-	return GF_FALSE;
-}
-
-
-void set_directory(TCHAR *dir)
-{
-	SendMessage(hList, LB_RESETCONTENT, 0, 0);
-
-	CE_WideToChar((u16 *) dir, (char *) current_dir);
-	wcscpy(w_current_dir, dir);
-	SetWindowText(hDirTxt, w_current_dir);
-
-	if (strcmp((const char *) current_dir, "\\")) {
-		int iRes = SendMessage(hList, LB_ADDSTRING, 0, (LPARAM)(LPCTSTR) _T("+ ..") );
-		SendMessage(hList, LB_SETITEMDATA, iRes, (LPARAM) 1);
-	}
-
-	/*enum directories*/
-	gf_enum_directory((const char *) current_dir, GF_TRUE, enum_dirs, NULL, NULL);
-	/*enum files*/
-	gf_enum_directory((char *) current_dir, GF_FALSE, enum_files, NULL, NULL);
-	SendMessage(hList, LB_SETCURSEL, 0, 0);
-	SetFocus(hList);
-}
-
-
-
-void refresh_playlist()
-{
-	TCHAR w_nameGF_MAX_PATH;
-	u32 count, i;
-
-	SetWindowText(hDirTxt, _T("Playlist"));
-	SendMessage(hList, LB_RESETCONTENT, 0, 0);
-
-	count = gf_cfg_get_key_count(cfg, "Playlist");
-	for (i=0; i<count; i++) {
-		const char *file = gf_cfg_get_key_name(cfg, "Playlist", i);
-		char *name = strrchr(file, '\\');
-		if (!name) name = strrchr(file, '/');
-		CE_CharToWide(name ? name+1 : (char *) file, (u16 *) w_name);
-		SendMessage(hList, LB_ADDSTRING, 0, (LPARAM)(LPCTSTR) w_name);
-	}
-	i = 0;
-	const char *ple = gf_cfg_get_key(cfg, "General", "PLEntry");
-	i = ple ? atoi(ple) : 0;
-	if (i>=count) i=0;
-	SendMessage(hList, LB_SETCURSEL, i, 0);
-	SetFocus(hList);
-}
-
-void playlist_act(u32 act_type)
-{
-	u32 idx, count;
-	char entryMAX_PATH;
-	const char *url;
-
-	/*reset all*/
-	if (act_type == 3) {
-		count = gf_cfg_get_key_count(cfg, "Playlist");
-		while (count) {
-			url = gf_cfg_get_key_name(cfg, "Playlist", 0);
-			gf_cfg_set_key(cfg, "Playlist", url, NULL);
-			count--;
-		}
-		refresh_playlist();
-		return;
-	}
-	count = SendMessage(hList, LB_GETSELCOUNT, 0, 0);
-	if (!count) return;
-	idx = SendMessage(hList, LB_GETCURSEL, 0, 0);
-
-	if ((act_type==1) && !idx) return;
-	else if ((act_type==2) && (idx+1==count)) return;
-
-	url = gf_cfg_get_key_name(cfg, "Playlist", idx);
-	if (!url) return;
-	strcpy(entry, url);
-	/*remove from playlist*/
-	gf_cfg_set_key(cfg, "Playlist", url, NULL);
-	switch (act_type) {
-	/*remove*/
-	case 0:
-		if (idx+1==count) idx--;
-		break;
-	/*up*/
-	case 1:
-		gf_cfg_insert_key(cfg, "Playlist", entry, "", idx-1);
-		idx--;
-		break;
-	/*down*/
-	case 2:
-		gf_cfg_insert_key(cfg, "Playlist", entry, "", idx+1);
-		idx++;
-		break;
-	}
-	refresh_playlist();
-	SendMessage(hList, LB_SETCURSEL, idx, 0);
-	SetFocus(hList);
-}
-
-Bool add_files(void *cbk, char *name, char *path, GF_FileEnumInfo *file_info)
-{
-	if (!bViewUnknownTypes && extension_list) {
-		char *ext = strrchr(name, '.');
-		if (!ext || !strstr(extension_list, ext+1)) return GF_FALSE;
-	}
-	gf_cfg_set_key(cfg, "Playlist", path, "");
-	return GF_FALSE;
-}
-
-void process_list_change(HWND hWnd, Bool add_to_pl)
-{
-	TCHAR sTxtGF_MAX_PATH;
-	if (!SendMessage(hList, LB_GETSELCOUNT, 0, 0)) return;
-
-	u32 idx = SendMessage(hList, LB_GETCURSEL, 0, 0);
-	SendMessage(hList, LB_GETTEXT, idx, (LPARAM)(LPCTSTR) sTxt);
-
-	DWORD param = SendMessage(hList, LB_GETITEMDATA, idx, 0);
-	if (param==1) {
-		if (!wcscmp(sTxt, _T("+ ..") ) ) {
-			if (add_to_pl) return;
-			current_dirstrlen((const char *) current_dir)-1 = 0;
-			char *b = strrchr((const char *) current_dir, '\\');
-			if (b) b1 = 0;
-			else b0 = '\\';
-			CE_CharToWide((char *) current_dir, (u16 *) w_current_dir);
-			set_directory(w_current_dir);
-		} else {
-			if (add_to_pl) {
-				char dirMAX_PATH;
-				TCHAR wdirMAX_PATH;
-				wcscpy(wdir, w_current_dir);
-				wcscat(wdir, sTxt+2);
-				wcscat(wdir, _T("\\"));
-				CE_WideToChar((u16 *) wdir, (char *) dir);
-				gf_enum_directory(dir, GF_FALSE, add_files, NULL, NULL);
-			} else {
-				wcscat(w_current_dir, sTxt+2);
-				wcscat(w_current_dir, _T("\\"));
-				CE_WideToChar((u16 *) w_current_dir, (char *) current_dir);
-				set_directory(w_current_dir);
-			}
-		}
-	} else {
-		char szTxt1024;
-		CE_WideToChar((u16 *) sTxt, (char *) szTxt);
-		strcpy((char *) out_url, (const char *) current_dir);
-		strcat(out_url, szTxt);
-		if (add_to_pl) {
-			gf_cfg_set_key(cfg, "Playlist", out_url, "");
-			strcpy(out_url, "");
-		} else {
-			if (playlist_mode) {
-				const char *file;
-				char szPLE20;
-				sprintf(szPLE, "%d", idx);
-				gf_cfg_set_key(cfg, "General", "PLEntry", szPLE);
-				file = gf_cfg_get_key_name(cfg, "Playlist", idx);
-				strcpy(out_url, file);
-			}
-			gf_cfg_set_key(cfg, "General", "LastWorkingDir", (const char *) current_dir);
-			EndDialog(hWnd, 1);
-		}
-	}
-}
-
-BOOL InitFileDialog(const HWND hWnd)
-{
-	TCHAR           psz80;
-	ZeroMemory(psz, sizeof(psz));
-	SHINITDLGINFO sid;
-	ZeroMemory(&sid, sizeof(sid));
-	sid.dwMask  = SHIDIM_FLAGS;
-	sid.dwFlags = SHIDIF_SIZEDLGFULLSCREEN;
-	sid.hDlg    = hWnd;
-
-	if (FALSE == SHInitDialog(&sid))
-		return FALSE;
-
-	SHMENUBARINFO mbi;
-	ZeroMemory(&mbi, sizeof(SHMENUBARINFO));
-	mbi.cbSize      = sizeof(SHMENUBARINFO);
-	mbi.hwndParent  = hWnd;
-	mbi.nToolBarId  = IDR_MENU_OPEN;
-	mbi.hInstRes    = g_hInst;
-
-	if (FALSE == SHCreateMenuBar(&mbi))
-	{
-		return FALSE;
-	}
-	g_hWndMenuBar = mbi.hwndMB;
-
-	ShowWindow(g_hWndMenuBar, SW_SHOW);
-
-	the_wnd = hWnd;
-
-	hDirTxt = GetDlgItem(hWnd, IDC_DIRNAME);
-	hList = GetDlgItem(hWnd, IDC_FILELIST);
-	g_hMenuView = (HMENU)SendMessage(g_hWndMenuBar, SHCMBM_GETSUBMENU, 0, ID_OF_VIEW);
-
-	RECT rc;
-	GetClientRect(hWnd, &rc);
-	u32 caption_h = GetSystemMetrics(SM_CYCAPTION) - 3;
-	MoveWindow(hDirTxt, 0, 0, rc.right - rc.left, caption_h, 1);
-	MoveWindow(hList, 0, caption_h, rc.right - rc.left, rc.bottom - rc.top - caption_h, 1);
-
-	if (playlist_mode) {
-		refresh_playlist();
-	} else {
-		if (!strcmp((const char *) current_dir, "\\")) {
-			char *opt = (char *) gf_cfg_get_key(cfg, "General", "LastWorkingDir");
-			if (opt) CE_CharToWide(opt, (u16 *) w_current_dir);
-		}
-		set_directory(w_current_dir);
-	}
-	switch_menu_pl();
-	return TRUE;
-}
-
-BOOL CALLBACK FileDialogProc(const HWND hWnd, const UINT Msg, const WPARAM wParam, const LPARAM lParam)
-{
-	BOOL bProcessedMsg = TRUE;
-
-	switch (Msg) {
-	case WM_INITDIALOG:
-		if (FALSE == InitFileDialog(hWnd))
-			EndDialog(hWnd, -1);
-		break;
-
-	case WM_ACTIVATE:
-		if (WA_INACTIVE != LOWORD(wParam)) SetFocus(hWnd);
-		break;
-
-	case WM_CLOSE:
-		EndDialog(hWnd, 0);
-		break;
-
-	case WM_COMMAND:
-		if (LOWORD(wParam) == IDC_FILELIST) {
-			if (HIWORD(wParam) == LBN_DBLCLK) {
-				process_list_change(hWnd, GF_FALSE);
-			} else {
-				bProcessedMsg = FALSE;
-			}
-		} else {
-			switch (LOWORD(wParam)) {
-			case IDOK:
-				process_list_change(hWnd, GF_FALSE);
-				break;
-			case IDCANCEL:
-				EndDialog(hWnd, 0);
-				break;
-			case IDM_OF_VIEW_ALL:
-				bViewUnknownTypes = (Bool) !bViewUnknownTypes;
-				refresh_menu_states();
-				set_directory(w_current_dir);
-				break;
-			case IDM_OF_PLAYLIST:
-				playlist_mode = (Bool) !playlist_mode;
-				if (playlist_mode) refresh_playlist();
-				else set_directory(w_current_dir);
-				switch_menu_pl();
-				break;
-			case IDM_OF_PL_ACT:
-				if (playlist_mode) {
-					playlist_act(0);
-				} else {
-					process_list_change(hWnd, GF_TRUE);
-				}
-				break;
-			case IDM_OF_PL_UP:
-				playlist_act(1);
-				break;
-			case IDM_OF_PL_DOWN:
-				playlist_act(2);
-				break;
-			case IDM_OF_PL_CLEAR:
-				playlist_act(3);
-				break;
-			default:
-				bProcessedMsg = FALSE;
-				break;
-			}
-		}
-		break;
-	case WM_KEYDOWN:
-		switch (wParam) {
-		case VK_LEFT:
-		case '1':
-			playlist_act(1);
-			break;
-		case VK_RIGHT:
-		case '2':
-			playlist_act(2);
-			break;
-		default:
-			bProcessedMsg = FALSE;
-			break;
-		}
-		break;
-
-	default:
-		bProcessedMsg = FALSE;
-	}
-
-	return bProcessedMsg;
-}
-
-Bool gf_file_dialog(HINSTANCE inst, HWND parent, char *url, const char *ext_list, GF_Config *gpac_cfg)
-{
-	extension_list = ext_list;
-	out_url = url;
-	g_hInst = inst;
-	cfg = gpac_cfg;
-	int iResult = DialogBox(inst, MAKEINTRESOURCE(IDD_FILEDIALOG), parent,(DLGPROC)FileDialogProc);
-	if (iResult>0) return GF_TRUE;
-	return GF_FALSE;
-}
-
-
-#endif
-

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/osmophone/osmophone.rc Deleted

@@ -1,425 +0,0 @@
-// Microsoft Visual C++ generated resource script.
-//
-#include "resource.h"
-
-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
-#include "newres.h"
-
-#include <gpac/version.h>
-
-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
-
-/////////////////////////////////////////////////////////////////////////////
-// Anglais (États-Unis) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-#ifdef _WIN32
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-#pragma code_page(1252)
-#endif //_WIN32
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Icon
-//
-
-// Icon with lowest ID value placed first to ensure application icon
-// remains consistent on all systems.
-IDI_ICON                ICON                    "../../doc/osmo4.ico"
-
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE 
-BEGIN
-    "resource.h\0"
-END
-
-2 TEXTINCLUDE 
-BEGIN
-    "#include ""newres.h""\r\n"
-    "\0"
-END
-
-3 TEXTINCLUDE 
-BEGIN
-    "\r\n"
-    "\0"
-END
-
-#endif    // APSTUDIO_INVOKED
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// RCDATA
-//
-
-IDM_MAIN_MENU1 RCDATA 
-BEGIN
-    0x0066, 0x0002, 0xfffe, 0x9c53, 0x0004, 0x0018, 0x9c55, 0x0000, 0x0000, 
-    0xfffe, 0x9c58, 0x0004, 0x0018, 0x9c59, 0x0000, 0x0001
-END
-
-IDR_ABOUT_MENU RCDATA 
-BEGIN
-    0x006b, 0x0001, 0xfffe, 0x9c77, 0x0004, 0x0010, 0x9c6c, 0x0000, 0xffff
-
-END
-
-IDM_MAIN_MENU2 RCDATA 
-BEGIN
-    0x006c, 0x0002, 0xfffe, 0x9c83, 0x0004, 0x0018, 0x9c85, 0x0000, 0x0000, 
-    0xfffe, 0x9c87, 0x0004, 0x0018, 0x9c89, 0x0000, 0x0001
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Menu
-//
-
-IDM_MAIN_MENU MENU 
-BEGIN
-    POPUP "File"
-    BEGIN
-        MENUITEM "Open",                        IDM_FILE_OPEN
-        MENUITEM "Open URL",                    IDM_FILE_OPEN_URL
-        POPUP "Recent"
-        BEGIN
-            MENUITEM "FILE 1",                      IDM_OPEN_FILE1
-            MENUITEM "FILE 2",                      IDM_OPEN_FILE2
-            MENUITEM "FILE 3",                      IDM_OPEN_FILE3
-            MENUITEM "FILE 4",                      IDM_OPEN_FILE4
-            MENUITEM "FILE 5",                      IDM_OPEN_FILE5
-            MENUITEM "FILE 6",                      IDM_OPEN_FILE6
-            MENUITEM "FILE 7",                      IDM_OPEN_FILE7
-            MENUITEM "FILE 8 ",                     IDM_OPEN_FILE8
-            MENUITEM "FILE 9",                      IDM_OPEN_FILE9
-        END
-        MENUITEM SEPARATOR
-        MENUITEM "Pause",                       IDM_FILE_PAUSE
-        MENUITEM "Copy/Paste",                  ID_FILE_CUT_PASTE
-        MENUITEM SEPARATOR
-        POPUP "Logs"
-        BEGIN
-            POPUP "Level"
-            BEGIN
-                MENUITEM "None",                        ID_LOGLEVEL_NONE
-                MENUITEM "Error",                       ID_LOGLEVEL_ERROR
-                MENUITEM "Warning",                     ID_LOGLEVEL_WARNING
-                MENUITEM "Info",                        ID_LOGLEVEL_INFO
-                MENUITEM "Debug",                       ID_LOGLEVEL_DEBUG
-            END
-            POPUP "Tools"
-            BEGIN
-                MENUITEM "core",                        ID_TOOLS_CORE
-                MENUITEM "coding",                      ID_TOOLS_CODING
-                MENUITEM "container",                   ID_TOOLS_CONTAINER
-                MENUITEM "network",                     ID_TOOLS_NETWORK
-                MENUITEM "rtp",                         ID_TOOLS_RTP
-                MENUITEM "sync",                        ID_TOOLS_SYNC
-                MENUITEM "codec",                       ID_TOOLS_CODEC
-                MENUITEM "parser",                      ID_TOOLS_PARSER
-                MENUITEM "media",                       ID_TOOLS_MEDIA
-                MENUITEM "scene",                       ID_TOOLS_SCENE
-                MENUITEM "script",                      ID_TOOLS_SCRIPT
-                MENUITEM "interact",                    ID_TOOLS_INTERACT
-                MENUITEM "compose",                     ID_TOOLS_COMPOSE
-                MENUITEM "mmio",                        ID_TOOLS_MMIO
-                MENUITEM "rti",                         ID_TOOLS_RTI
-                MENUITEM SEPARATOR
-                MENUITEM "none",                        ID_TOOLS_NONE
-                MENUITEM "all",                         ID_TOOLS_ALL
-            END
-            MENUITEM "Reset",                       ID_LOGS_RESET
-            MENUITEM "Log CPU",                     IDM_FILE_LOG_RTI
-        END
-        MENUITEM SEPARATOR
-        MENUITEM "Exit",                        IDM_ITEM_QUIT
-    END
-    POPUP "View"
-    BEGIN
-        POPUP "Navigate"
-        BEGIN
-            MENUITEM "Reset",                       IDM_NAV_RESET
-            MENUITEM SEPARATOR
-            MENUITEM "None",                        IDM_NAV_NONE
-            MENUITEM "Slide",                       IDM_NAV_SLIDE
-            MENUITEM "Walk",                        IDM_NAV_WALK
-            MENUITEM "Fly",                         IDM_NAV_FLY
-            MENUITEM "Examine",                     IDM_NAV_EXAMINE
-            MENUITEM SEPARATOR
-            MENUITEM "Headlight",                   IDM_NAV_HEADLIGHT
-            MENUITEM "Gravity",                     IDM_NAV_GRAVITY
-            POPUP "Collision"
-            BEGIN
-                MENUITEM "Disabled",                    IDM_NAV_COL_NONE
-                MENUITEM "Regular",                     IDM_NAV_COL_REG
-                MENUITEM "Displacement",                IDM_NAV_COL_DISP
-            END
-        END
-        MENUITEM SEPARATOR
-        MENUITEM "Fullscreen",                  IDM_VIEW_FS
-        POPUP "Info"
-        BEGIN
-            MENUITEM "Status Bar",                  IDM_VIEW_STATUS
-            MENUITEM "CPU usage",                   IDM_VIEW_CPU
-        END
-        MENUITEM SEPARATOR
-        POPUP "Video"
-        BEGIN
-            MENUITEM "Direct FB",                   ID_VIDEO_DIRECTFB
-            MENUITEM "GAPI",                        ID_VIDEO_GAPI
-            MENUITEM "GDI",                         ID_VIDEO_GDI
-            MENUITEM SEPARATOR
-            MENUITEM "2D OpenGL",                   IDM_VIEW_FORCEGL
-            MENUITEM "Direct Draw",                 ID_VIDEO_DIRECTDRAW
-            MENUITEM "15.0 FPS",                    IDM_VIEW_LOW_RATE
-            POPUP "Aspect Ratio"
-            BEGIN
-                MENUITEM "Keep Original",               IDM_VIEW_AR_NONE
-                MENUITEM "Fill Screen",                 IDM_VIEW_AR_FILL
-                MENUITEM "Ratio 4/3",                   IDM_VIEW_AR_4_3
-                MENUITEM "Ratio 16/9",                  IDM_VIEW_AR_16_9
-            END
-        END
-        POPUP "Options"
-        BEGIN
-            MENUITEM "Progressive SVG ",            IDM_VIEW_SVG_LOAD
-            MENUITEM "Disable Playlist",            IDS_CAP_DISABLE_PLAYLIST
-        END
-        MENUITEM "About",                       IDM_VIEW_ABOUT
-    END
-END
-
-IDR_ABOUT_MENU MENU 
-BEGIN
-    MENUITEM "OK",                          IDM_ABOUT_OK
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// String Table
-//
-
-STRINGTABLE 
-BEGIN
-    IDS_CLASSNAME           "Osmophone"
-    IDS_WINDOWNAME          "Osmo4"
-    IDS_APPNAME             "Osmophone.exe"
-END
-
-STRINGTABLE 
-BEGIN
-    IDS_CAP_QUIT            "Exit"
-    IDS_CAP_FILE            "File"
-    IDS_CAP_EXIT            "View"
-    IDS_CAP_VIEW            "View"
-END
-
-STRINGTABLE 
-BEGIN
-    IDS_CAP_OK              "OK"
-END
-
-STRINGTABLE 
-BEGIN
-    IDS_CAP_NAVIGATE        "Navigate"
-END
-
-STRINGTABLE 
-BEGIN
-    IDS_CAP_OPTION          "Options"
-    IDS_CAP_MENUITEM40072   "?"
-END
-
-STRINGTABLE 
-BEGIN
-    IDS_CAP_DISABLE_PLAYLIST "Copy/Paste"
-END
-
-#endif    // Anglais (États-Unis) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-/////////////////////////////////////////////////////////////////////////////
-// Français (France) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_FRA)
-#ifdef _WIN32
-LANGUAGE LANG_FRENCH, SUBLANG_FRENCH
-#pragma code_page(1252)
-#endif //_WIN32
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// RCDATA
-//
-
-IDR_MENU_OPEN RCDATA 
-BEGIN
-    0x006a, 0x0002, 0xfffe, 0x9c9b, 0x0004, 0x0010, 0x9c9f, 0x0000, 0xffff, 
-    0xfffe, 0x9c9a, 0x0004, 0x0018, 0x9c59, 0x0000, 0x0001
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Menu
-//
-
-IDR_MENU_OPEN MENU 
-BEGIN
-    MENUITEM "Add",                         IDM_OF_PL_ACT
-    POPUP "View"
-    BEGIN
-        MENUITEM "All Unknown Files",           IDM_OF_VIEW_ALL
-        MENUITEM "Move Up",                     IDM_OF_PL_UP
-        MENUITEM "Move Down",                   IDM_OF_PL_DOWN
-        MENUITEM "Clear",                       IDM_OF_PL_CLEAR
-        MENUITEM SEPARATOR
-        MENUITEM "Playlist Mode",               IDM_OF_PLAYLIST
-    END
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// DESIGNINFO
-//
-
-#ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO 
-BEGIN
-    IDD_APPABOUT, DIALOG
-    BEGIN
-        LEFTMARGIN, 1
-        RIGHTMARGIN, 113
-        BOTTOMMARGIN, 74
-    END
-
-    IDD_FILEDIALOG, DIALOG
-    BEGIN
-        RIGHTMARGIN, 103
-        BOTTOMMARGIN, 85
-    END
-END
-#endif    // APSTUDIO_INVOKED
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog
-//
-
-IDD_APPABOUT DIALOG  0, 0, 114, 77
-STYLE DS_SETFONT | DS_SETFOREGROUND | WS_POPUP | WS_CAPTION
-CAPTION "About Osmophone"
-FONT 8, "System"
-BEGIN
-    ICON            IDI_ICON,IDC_STATIC,1,0,16,16
-    CTEXT           "Osmo4/GPAC\n"GPAC_VERSION" ",IDC_NAMECTRL,23,1,65,17
-    CTEXT           "Copyright (c) 2007 Telecom ParisTech\nAll Rights Reserved\nLicensed under LGPL",IDC_STATIC,2,44,111,33
-END
-
-IDD_FILEDIALOG DIALOG  0, 0, 104, 86
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Select File"
-FONT 8, "System"
-BEGIN
-    EDITTEXT        IDC_DIRNAME,1,3,100,12,ES_AUTOHSCROLL | ES_READONLY
-    LISTBOX         IDC_FILELIST,1,18,102,65,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,0,0,1
- PRODUCTVERSION 1,0,0,1
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x40004L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040c04b0"
-        BEGIN
-            VALUE "CompanyName", "Telecom ParisTech"
-            VALUE "FileDescription", "osmophone"
-            VALUE "FileVersion", GPAC_VERSION
-            VALUE "InternalName", "osmophone"
-            VALUE "LegalCopyright", "Copyright © Telecom ParisTech 2008"
-            VALUE "OriginalFilename", "osmophone.exe"
-            VALUE "ProductName", "Osmo4-GPAC"
-            VALUE "ProductVersion", GPAC_VERSION
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x40c, 1200
-    END
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// String Table
-//
-
-STRINGTABLE 
-BEGIN
-    IDS_CAP_FILE            "+"
-    IDS_CAP_VIEW            "View"
-END
-
-STRINGTABLE 
-BEGIN
-    IDS_CAP_OK              "OK"
-END
-
-STRINGTABLE 
-BEGIN
-    IDS_CAP_SELECT          "File"
-END
-
-STRINGTABLE 
-BEGIN
-    IDS_CAP_MENUITEM40092   "Add"
-    IDS_CAP_ADD             "Add"
-END
-
-#endif    // Français (France) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-
-#ifndef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 3 resource.
-//
-
-
-/////////////////////////////////////////////////////////////////////////////
-#endif    // not APSTUDIO_INVOKED
-

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/osmophone/osmophone.vcxproj Deleted

@@ -1,343 +0,0 @@
-<?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>{CAA7EF3E-C7F4-4F8A-9E17-9A06DEF9E717}</ProjectGuid>
-    <RootNamespace>osmophone</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </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" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
-  </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" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
-  </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" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
-  </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" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</OutDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</OutDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>$(Platform)\$(Configuration)/osmophone.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_CONSOLE</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\obj\$(Platform)\$(Configuration)\osmophone/</AssemblerListingLocation>
-      <ObjectFileName>.\obj\$(Platform)\$(Configuration)\osmophone/</ObjectFileName>
-      <ProgramDataBaseFileName>.\obj\$(Platform)\$(Configuration)\osmophone/</ProgramDataBaseFileName>
-      <BrowseInformation>true</BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <AdditionalOptions>/r  %(AdditionalOptions)</AdditionalOptions>
-      <PreprocessorDefinitions>UNDER_CE=$(CEVER);_WIN32_WCE=$(CEVER);DEBUG;UNICODE;_UNICODE;$(CePlatform);ARM;_ARM_;ARMV4;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Link>
-      <OutputFile>../../bin/$(Platform)\$(Configuration)/osmophone.exe</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <IgnoreSpecificDefaultLibraries>
-      </IgnoreSpecificDefaultLibraries>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>.\obj\$(Platform)\$(Configuration)\osmophone/osmophone.pdb</ProgramDatabaseFile>
-      <SubSystem>Windows</SubSystem>
-      <StackReserveSize>65536</StackReserveSize>
-      <StackCommitSize>4096</StackCommitSize>
-      <EntryPointSymbol>WinMainCRTStartup</EntryPointSymbol>
-      <BaseAddress>0x00010000</BaseAddress>
-      <TargetMachine>MachineX86</TargetMachine>
-    </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>$(Platform)\$(Configuration)/osmophone.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_CONSOLE</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\obj\$(Platform)\$(Configuration)\osmophone/</AssemblerListingLocation>
-      <ObjectFileName>.\obj\$(Platform)\$(Configuration)\osmophone/</ObjectFileName>
-      <ProgramDataBaseFileName>.\obj\$(Platform)\$(Configuration)\osmophone/</ProgramDataBaseFileName>
-      <BrowseInformation>true</BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <AdditionalOptions>/r  %(AdditionalOptions)</AdditionalOptions>
-      <PreprocessorDefinitions>UNDER_CE=$(CEVER);_WIN32_WCE=$(CEVER);DEBUG;UNICODE;_UNICODE;$(CePlatform);ARM;_ARM_;ARMV4;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Link>
-      <OutputFile>../../bin/$(Platform)\$(Configuration)/osmophone.exe</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <IgnoreSpecificDefaultLibraries>
-      </IgnoreSpecificDefaultLibraries>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>.\obj\$(Platform)\$(Configuration)\osmophone/osmophone.pdb</ProgramDatabaseFile>
-      <SubSystem>Windows</SubSystem>
-      <StackReserveSize>65536</StackReserveSize>
-      <StackCommitSize>4096</StackCommitSize>
-      <EntryPointSymbol>WinMainCRTStartup</EntryPointSymbol>
-      <BaseAddress>0x00010000</BaseAddress>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>$(Platform)\$(Configuration)/osmophone.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_CONSOLE</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <AdditionalOptions>/r  %(AdditionalOptions)</AdditionalOptions>
-      <PreprocessorDefinitions>UNDER_CE=$(CEVER);_WIN32_WCE=$(CEVER);NDEBUG;UNICODE;_UNICODE;$(CePlatform);ARM;_ARM_;ARMV4;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Link>
-      <OutputFile>../../bin/$(Platform)/$(Configuration)/$(ProjectName).exe</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <IgnoreSpecificDefaultLibraries>
-      </IgnoreSpecificDefaultLibraries>
-      <ProgramDatabaseFile>.\obj\$(Platform)\$(Configuration)\osmophone/osmophone.pdb</ProgramDatabaseFile>
-      <SubSystem>Windows</SubSystem>
-      <StackReserveSize>65536</StackReserveSize>
-      <StackCommitSize>4096</StackCommitSize>
-      <EntryPointSymbol>WinMainCRTStartup</EntryPointSymbol>
-      <TargetMachine>MachineX86</TargetMachine>
-    </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>$(Platform)\$(Configuration)/osmophone.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_CONSOLE</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <AdditionalOptions>/r  %(AdditionalOptions)</AdditionalOptions>
-      <PreprocessorDefinitions>UNDER_CE=$(CEVER);_WIN32_WCE=$(CEVER);NDEBUG;UNICODE;_UNICODE;$(CePlatform);ARM;_ARM_;ARMV4;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Link>
-      <OutputFile>../../bin/$(Platform)/$(Configuration)/$(ProjectName).exe</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <IgnoreSpecificDefaultLibraries>
-      </IgnoreSpecificDefaultLibraries>
-      <ProgramDatabaseFile>.\obj\$(Platform)\$(Configuration)\osmophone/osmophone.pdb</ProgramDatabaseFile>
-      <SubSystem>Windows</SubSystem>
-      <StackReserveSize>65536</StackReserveSize>
-      <StackCommitSize>4096</StackCommitSize>
-      <EntryPointSymbol>WinMainCRTStartup</EntryPointSymbol>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\applications\osmophone\main.cpp">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-      </PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-      </PrecompiledHeader>
-      <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</BrowseInformation>
-      <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</BrowseInformation>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-      </PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-      </PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="..\..\applications\osmophone\openfile.cpp">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-      </PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-      </PrecompiledHeader>
-      <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</BrowseInformation>
-      <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</BrowseInformation>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-      </PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-      </PrecompiledHeader>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="..\..\applications\osmophone\osmophone.rc">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">DEBUG;_AFXDLL</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">DEBUG;_AFXDLL</PreprocessorDefinitions>
-      <Culture Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">0x0809</Culture>
-      <Culture Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">0x0809</Culture>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../doc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../doc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">DEBUG;_AFXDLL</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">DEBUG;_AFXDLL</PreprocessorDefinitions>
-      <Culture Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">0x0809</Culture>
-      <Culture Condition="'$(Configuration)|$(Platform)'=='Release|x64'">0x0809</Culture>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../doc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../doc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\applications\osmophone\newres.h" />
-    <ClInclude Include="..\..\applications\osmophone\resource.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\..\doc\osmo4.ico" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="libgpac_dll.vcxproj">
-      <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/osmophone/resource.h Deleted

@@ -1,169 +0,0 @@
-//{{NO_DEPENDENCIES}}
-// Microsoft Visual C++ generated include file.
-// Used by osmophone.rc
-//
-#define IDS_CLASSNAME                   1
-#define IDS_WINDOWNAME                  4
-#define IDS_APPNAME                     5
-#define IDI_ICON                        101
-#define IDM_MENU                        102
-#define IDM_MAIN_MENU                   102
-#define IDM_MAIN_MENU1                  102
-#define IDD_ABOUTBOX                    103
-#define IDD_APPABOUT                    104
-#define IDD_OPENFILE                    105
-#define IDD_FILEDIALOG                  105
-#define IDR_MENU_OPEN                   106
-#define IDR_ABOUT_MENU                  107
-#define IDM_MAIN_MENU2                  108
-#define IDM_MAIN_MENUITEM1              401
-#define IDM_MAIN_MENUITEM2              402
-#define IDS_MAIN_MENUITEM1              410
-#define IDS_MAIN_MENUITEM2              412
-#define IDC_EDIT1                       1001
-#define IDC_DIRNAME                     1001
-#define IDC_LIST1                       1002
-#define IDC_FILELIST                    1002
-#define IDC_LIST2                       1003
-#define IDC_NAMECTRL                    1004
-#define IDM_FILE_EXIT                   40002
-#define IDM_HELP_ABOUT                  40003
-#define IDM_GRAB                        40004
-#define IDM_RELEASE                     40005
-#define ID_FILE_SHOW_WMKEYDOWN          40006
-#define ID_FILE_SHOW_WMKEYUP            40007
-#define ID_FILE_SHOW_WMCHAR             40008
-#define ID_FILE_SHOW_WMMOUSEMOVE        40009
-#define ID_FILE_SHOW_WMLBUTTONDOWN      40010
-#define ID_FILE_SHOW_WMLBUTTONDBLCLK    40011
-#define ID_FILE_SHOW_WMLBUTTONUP        40012
-#define ID_FILE_SHOW_WMRBUTTONDOWN      40013
-#define ID_FILE_SHOW_WMRBUTTONUP        40014
-#define ID_FILE_SHOW_WMRBUTTONDBLCLK    40015
-#define IDM_ITEM_QUIT                   40016
-#define IDS_CAP_QUIT                    40018
-#define ID_MENU_FILE                    40019
-#define IDS_CAP_FILE                    40021
-#define IDM_FILE_OPEN                   40022
-#define IDS_CAP_EXIT                    40023
-#define IDM_MENU_VIEW                   40024
-#define IDS_CAP_VIEW                    40025
-#define IDM_FILE_OPEN_URL               40026
-#define IDM_OPEN_FILE1                  40030
-#define IDM_OPEN_FILE2                  40031
-#define IDM_OPEN_FILE3                  40032
-#define IDM_OPEN_FILE4                  40033
-#define IDM_OPEN_FILE5                  40034
-#define IDM_OPEN_FILE6                  40035
-#define IDM_OPEN_FILE7                  40036
-#define IDM_OPEN_FILE8                  40037
-#define IDM_OPEN_FILE9                  40038
-#define IDM_OPEN_FILE10                 40039
-#define ID_VIEW                         40040
-#define IDM_OF_VIEW_ALL                 40041
-#define IDS_CAP_OK                      40044
-#define IDS_CAP_MENUITEM40045           40046
-#define ID_SELECT                       40047
-#define IDS_CAP_SELECT                  40049
-#define IDM_OF_PL_ADD                   40050
-#define IDM_OF_PLAYLIST                 40051
-#define IDM_OF_PL_REM                   40052
-#define IDM_VIEW_FS                     40053
-#define IDM_VIEW_ABOUT                  40054
-#define IDM_ABOUT_OK                    40055
-#define IDM_VIEW_STATUS                 40057
-#define IDM_VIEW_FORCEGL                40058
-#define ID_NAVIGATE                     40059
-#define IDS_CAP_NAVIGATE                40061
-#define IDM_NAV_NONE                    40062
-#define IDM_NAV_SLIDE                   40063
-#define IDM_SELECT                      40064
-#define IDM_NAV_RESET                   40065
-#define IDM_MENU_SWITCH                 40066
-#define ID_OPTION                       40067
-#define IDS_CAP_OPTION                  40069
-#define ID_MENUITEM40071                40071
-#define IDS_CAP_MENUITEM40072           40073
-#define IDM_NAV_WALK                    40074
-#define IDM_NAV_FLY                     40075
-#define IDM_NAV_EXAMINE                 40076
-#define IDM_NAV_HEADLIGHT               40077
-#define IDM_NAV_GRAVITY                 40078
-#define IDM_NAV_COL_NONE                40079
-#define IDM_NAV_COL_REG                 40080
-#define IDM_NAV_COL_DISP                40081
-#define IDM_VIEW_AR_NONE                40082
-#define IDM_VIEW_AR_FILL                40083
-#define IDM_VIEW_AR_4_3                 40084
-#define IDM_VIEW_AR_16_9                40085
-#define IDM_OF_PL_UP                    40088
-#define IDM_OF_PL_DOWN                  40089
-#define ID_OF_VIEW                      40090
-#define IDM_OF_PL_ACT                   40091
-#define IDS_CAP_MENUITEM40092           40093
-#define IDS_CAP_ADD                     40095
-#define IDM_OF_PL_CLEAR                 40096
-#define IDM_FILE_LOG_RTI                40097
-#define IDM_VIEW_CPU                    40098
-#define IDM_FILE_PAUSE                  40099
-#define IDM_VIEW_LOW_RATE               40100
-#define IDM_VIEW_SVG_LOAD               40102
-#define IDS_CAP_DISABLE_PLAYLIST        40103
-#define ID_FILE_CUT_PASTE               40104
-#define Fra                             40105
-#define ID_VIDEO_DIRECTFB               40106
-#define ID_VIDEO_GAPI                   40107
-#define ID_VIDEO_GDI                    40108
-#define ID_VIDEO_DIRECTDRAW             40109
-#define ID_OPTIONS_TEST                 40111
-#define ID_VIEW_INFO                    40112
-#define ID_Menu                         40113
-#define ID_OPTIONS_TEST40114            40114
-#define ID_OPTIONS_VIDEOOUT             40115
-#define ID_VIDEOOUT_FD                  40116
-#define ID_OPTIONS_VIDEOOUT40117        40117
-#define ID_FILE_LOGS                    40118
-#define ID_FILE_DS                      40119
-#define ID_LOGS_ENABLED                 40120
-#define ID_LOGS_LEVEL                   40121
-#define ID_LEVEL_DEBUG                  40122
-#define ID_LEVEL_WARNING                40123
-#define ID_LEVEL_INFO                   40124
-#define ID_LEVEL_DEBUG40125             40125
-#define ID_LOGLEVEL_ERROR               40126
-#define ID_LOGLEVEL_WARNING             40127
-#define ID_LOGLEVEL_INFO                40128
-#define ID_LOGLEVEL_DEBUG               40129
-#define ID_LOGS_TOOLS                   40130
-#define ID_LOGTOOL_CORE                 40131
-#define ID_TOOLS_CODING                 40132
-#define ID_TOOLS_CONTAINER              40133
-#define ID_TOOLS_NETWORK                40134
-#define ID_TOOLS_RTP                    40135
-#define ID_TOOLS_SYNC                   40136
-#define ID_TOOLS_CODEC                  40137
-#define ID_TOOLS_PARSER                 40138
-#define ID_TOOLS_MEDIA                  40139
-#define ID_TOOLS_SCENE                  40140
-#define ID_TOOLS_SCRIPT                 40141
-#define ID_TOOLS_INTERACT               40142
-#define ID_TOOLS_COMPOSE                40143
-#define ID_TOOLS_MMIO                   40144
-#define ID_TOOLS_RTI                    40145
-#define ID_TOOLS_NONE                   40146
-#define ID_TOOLS_ALL                    40147
-#define ID_TOOLS_CORE                   40148
-#define ID_LEVEL_NONE                   40149
-#define ID_LOGLEVEL_NONE                40150
-#define ID_LOGS_RESET                   40151
-
-// Next default values for new objects
-//
-#ifdef APSTUDIO_INVOKED
-#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE        111
-#define _APS_NEXT_COMMAND_VALUE         40152
-#define _APS_NEXT_CONTROL_VALUE         1005
-#define _APS_NEXT_SYMED_VALUE           101
-#endif
-#endif

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/osmozilla Deleted

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/osmozilla/Makefile Deleted

@@ -1,109 +0,0 @@
-include ../../config.mak
-
-vpath %.cpp $(SRC_PATH)/applications/osmozilla
-
-ifeq ($(CONFIG_WIN32),yes)
-USER_NAME=root
-else
-USER_NAME=$(shell whoami)
-ifeq ($(USER_NAME),root)
-else
-MOZILLA_DIR=local
-endif
-endif
-
-CFLAGS=$(CXXFLAGS) $(XUL_CFLAGS) -I"$(SRC_PATH)/include"
-
-ifeq ($(DEBUGBUILD),yes)
-CFLAGS+=-g
-LDFLAGS+=-g
-endif
-
-ifeq ($(GPROFBUILD),yes)
-CFLAGS+=-pg
-LDFLAGS+=-pg
-endif
-
-ifeq ($(CONFIG_WIN32),yes)
-CFLAGS+=-DXP_WIN
-else
-ifeq ($(CONFIG_DARWIN),yes)
-CFLAGS+=-DXP_MAC
-else
-CFLAGS+=-DXP_UNIX -DMOZ_X11
-endif
-endif
-
-CFLAGS+=-DNPBASIC_EXPORTS -DMOZILLA_STRICT_API -DXPCOM_GLUE
-
-
-LINKLIBS=-L../../bin/gcc -lgpac
-
-OBJS=osmozilla.o osmo_npapi.o
-
-SRCS := $(OBJS:.o=.cpp) 
-
-
-LIB=nposmozilla$(DYN_LIB_SUFFIX)
-ifeq ($(CONFIG_WIN32),yes)
-LINKLIBS+=-lwinmm -lgdi32
-LDFLAGS+=--export-all-symbols
-endif
-
-all: $(LIB)
-
-$(LIB): $(OBJS)
-ifeq ($(CONFIG_WIN32),yes)
-	windres osmozilla.rc osmoz.o
-	$(CXX) $(SHFLAGS) -o ../../bin/gcc/$@ $(OBJS) osmoz.o $(LINKLIBS) $(LDFLAGS)
-	cp "$(SRC_PATH)/applications/osmozilla/nsIOsmozilla.xpt_w32" ../../bin/gcc/nposmozilla.xpt
-	chmod +w ../../bin/gcc/nposmozilla.xpt
-else
-	$(CXX) $(SHFLAGS) $(OBJS) $(LINKLIBS) -o ../../bin/gcc/$@  $(LDFLAGS)
-	cp "$(SRC_PATH)/applications/osmozilla/nsIOsmozilla.xpt_linux" ../../bin/gcc/nposmozilla.xpt
-	chmod +w ../../bin/gcc/nposmozilla.xpt
-endif
-	@echo $(USER_ROOT)
-
-clean:
-	rm -f $(OBJS) ../../bin/gcc/$(LIB) ../../bin/gcc/nposmozilla.xpt
-ifeq ($(CONFIG_WIN32),yes)
-	rm -f osmoz.o
-endif
-
-install: 
-ifeq ($(MOZILLA_DIR),local)
-ifeq ($(USER_NAME),root)
-	@echo "*** Root cannot install local mozilla plugins! ***"
-	@echo "*** Exit root mode and reinstall mozilla plugin! ***"
-else
-	$(MAKE) $(LIB)
-	$(INSTALL) -D -m 755 ../../bin/gcc/$(LIB) "$(HOME)/.mozilla/plugins/$(LIB)"
-	$(INSTALL) -D -m 755 ../../bin/gcc/nposmozilla.xpt "$(HOME)/.mozilla/components/nposmozilla.xpt"
-endif
-else
-	$(INSTALL) -D -m 755 ../../bin/gcc/$(LIB) "$(MOZILLA_DIR)/components/$(LIB)"
-	$(INSTALL) -D -m 755 ../../bin/gcc/nposmozilla.xpt "$(MOZILLA_DIR)/components/nposmozilla.xpt"
-endif
-
-uninstall:
-ifeq ($(MOZILLA_DIR),local)
-ifeq ($(USER_NAME),root)
-else
-	rm -rf "$(HOME)/.mozilla/plugins/$(LIB)"
-	rm -rf "$(HOME)/.mozilla/components/nposmozilla.xpt"
-endif
-else
-	rm -rf "$(MOZILLA_DIR)/components/$(LIB)"
-	rm -rf "$(MOZILLA_DIR)/components/nposmozilla.xpt"
-endif
-
-dep: depend
-
-depend:
-	rm -f .depend	
-	$(CC) -MM $(CFLAGS) $(SRCS) 1>.depend
-
-distclean: clean
-	rm -f Makefile.bak .depend
-

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/osmozilla/nsIOsmozilla.h Deleted

@@ -1,148 +0,0 @@
-/*
-* DO NOT EDIT.  THIS FILE IS GENERATED FROM nsIOsmozilla.idl
-*/
-
-#ifndef __gen_nsIOsmozilla_h__
-#define __gen_nsIOsmozilla_h__
-
-#include "osmo_npapi.h"
-
-#ifdef GECKO_XPCOM
-
-#ifndef __gen_nsISupports_h__
-#include "nsISupports.h"
-#endif
-
-/* For IDL files that don't want to include root IDL files. */
-#ifndef NS_NO_VTABLE
-#define NS_NO_VTABLE
-#endif
-
-/* starting interface:    nsIOsmozilla */
-#define NS_IOSMOZILLA_IID_STR "d2d536a0-b6fc-11d5-9d10-0060b0fbd80b"
-
-#define NS_IOSMOZILLA_IID \
-  {0xd2d536a0, 0xb6fc, 0x11d5, \
-	{ 0x9d, 0x10, 0x00, 0x60, 0xb0, 0xfb, 0xd8, 0x0b }}
-
-class NS_NO_VTABLE nsIOsmozilla : public nsISupports {
-public:
-
-	NS_DEFINE_STATIC_IID_ACCESSOR(NS_IOSMOZILLA_IID)
-
-	/* void Pause (); */
-	NS_IMETHOD Pause(void) = 0;
-
-	/* void Play (); */
-	NS_IMETHOD Play(void) = 0;
-
-	/* void Stop (); */
-	NS_IMETHOD Stop(void) = 0;
-
-	/* void Update (in string type, in string commands); */
-	NS_IMETHOD Update(const char *type, const char *commands) = 0;
-
-	/* void QualitySwitch (in int switch_up); */
-	NS_IMETHOD QualitySwitch(int switch_up) = 0;
-
-	/* void SetURL (in string url); */
-	NS_IMETHOD SetURL(const char *url) = 0;
-};
-
-/* Use this macro when declaring classes that implement this interface. */
-#define NS_DECL_NSIOSMOZILLA \
-	NS_IMETHOD Pause(void); \
-	NS_IMETHOD Play(void); \
-	NS_IMETHOD Stop(void); \
-	NS_IMETHOD Update(const char *type, const char *commands); \
-	NS_IMETHOD QualitySwitch(int switch_up); \
-	NS_IMETHOD SetURL(const char *type);
-
-/* Use this macro to declare functions that forward the behavior of this interface to another object. */
-#define NS_FORWARD_NSIOSMOZILLA(_to) \
-	NS_IMETHOD Pause(void) { return _to Pause(); } \
-	NS_IMETHOD Play(void) { return _to Play(); } \
-	NS_IMETHOD Stop(void) { return _to Stop(); } \
-	NS_IMETHOD Update(const char *type, const char *commands) { return _to Update(type, commands); } \
-	NS_IMETHOD QualitySwitch(int switch_up) { return _to QualitySwitch( switch_up ); } \
-	NS_IMETHOD SetURL(const char *url) { return _to SetURL(url); }
-
-/* Use this macro to declare functions that forward the behavior of this interface to another object in a safe way. */
-#define NS_FORWARD_SAFE_NSIOSMOZILLA(_to) \
-	NS_IMETHOD Pause(void) { return !_to ? NS_ERROR_NULL_POINTER : _to->Pause(); } \
-	NS_IMETHOD Play(void) { return !_to ? NS_ERROR_NULL_POINTER : _to->Play(); } \
-	NS_IMETHOD Stop(void) { return !_to ? NS_ERROR_NULL_POINTER : _to->Stop(); } \
-	NS_IMETHOD Update(const char *type, const char *commands) { return !_to ? NS_ERROR_NULL_POINTER : _to->Update(type, commands); } \
-	NS_IMETHOD QualitySwitch(int switch_up) { return !_to ? NS_ERROR_NULL_POINTER : _to->QualitySwitch(switch_up); } \
-	NS_IMETHOD SetURL(const char *url) { return !_to ? NS_ERROR_NULL_POINTER : _to->Update(url); } \
- 
-#if 0
-/* Use the code below as a template for the implementation class for this interface. */
-
-/* Header file */
-class nsOsmozilla : public nsIOsmozilla
-{
-public:
-	NS_DECL_ISUPPORTS
-	NS_DECL_NSIOSMOZILLA
-
-	nsOsmozilla();
-	virtual ~nsOsmozilla();
-	/* additional members */
-};
-
-/* Implementation file */
-NS_IMPL_ISUPPORTS1(nsOsmozilla, nsIOsmozilla)
-
-nsOsmozilla::nsOsmozilla()
-{
-	/* member initializers and constructor code */
-}
-
-nsOsmozilla::~nsOsmozilla()
-{
-	/* destructor code */
-}
-
-/* void Pause (); */
-NS_IMETHODIMP nsOsmozilla::Pause()
-{
-	return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* void Play (); */
-NS_IMETHODIMP nsOsmozilla::Play()
-{
-	return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* void Stop (); */
-NS_IMETHODIMP nsOsmozilla::Stop()
-{
-	return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* void Update (in string type, in string commands); */
-NS_IMETHODIMP nsOsmozilla::Update(const char *type, const char *commands)
-{
-	return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* void QualitySwitch (in int switch_up); */
-NS_IMETHODIMP nsOsmozilla::QualitySwitch(int switch_up)
-{
-	return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* void SetURL (in string url); */
-NS_IMETHODIMP nsOsmozilla::SetURL(const char *type)
-{
-	return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* End of implementation class template. */
-#endif
-
-#endif //GECKO_XPCOM
-
-#endif /* __gen_nsIOsmozilla_h__ */

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/osmozilla/nsIOsmozilla.idl Deleted

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/osmozilla/nsIOsmozilla.xpt_linux Deleted

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/osmozilla/nsIOsmozilla.xpt_w32 Deleted

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/osmozilla/osmo_npapi.cpp Deleted

@@ -1,854 +0,0 @@
-/*
-*			GPAC - Multimedia Framework C SDK
-*
- *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2012
-*					All rights reserved
-*
-*  This file is part of GPAC / Osmozilla NPAPI plugin
-*
-*  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.
-*
-*/
-
-
-////////////////////////////////////////////////////////////
-//
-// Implementation of Netscape entry points (NPN_*)
-//
-#include "osmo_npapi.h"
-#include "osmozilla.h"
-
-#if defined(XP_UNIX) && !defined(XP_MACOS)
-#include <malloc.h>
-#include <string.h>
-#endif
-
-NPNetscapeFuncs *sBrowserFunctions = NULL;
-
-NPError Osmozilla_GetURL(NPP instance, const char *url, const char *target)
-{
-	if (!sBrowserFunctions) return NPERR_INVALID_FUNCTABLE_ERROR;
-	return sBrowserFunctions->geturl(instance, url, target);
-}
-
-void Osmozilla_SetStatus(NPP instance, const char *message)
-{
-	if (!sBrowserFunctions) return;
-	sBrowserFunctions->status(instance, message);
-}
-
-#ifndef GECKO_XPCOM
-void Osmozilla_InitScripting(Osmozilla *osmo);
-#endif
-
-NPError NPOsmozilla_New(NPMIMEType pluginType, NPP instance, uint16_t mode, int16_t argc, char* argn, char* argv, NPSavedData* saved)
-{
-	Osmozilla *osmo;
-	NPError rv = NPERR_NO_ERROR;
-	if (instance == NULL)
-		return NPERR_INVALID_INSTANCE_ERROR;
-
-	osmo = (Osmozilla *) malloc(sizeof(Osmozilla));
-	memset(osmo, 0, sizeof(Osmozilla));
-
-	osmo->np_instance = instance;
-	// associate the plugin instance object with NPP instance
-	instance->pdata = (void *)osmo;
-
-	osmo->supports_xembed = 0;
-	sBrowserFunctions->getvalue(NULL, NPNVSupportsXEmbedBool, (void *)&osmo->supports_xembed);
-
-	Osmozilla_Initialize(osmo, argc, argn, argv);
-
-#ifndef GECKO_XPCOM
-	Osmozilla_InitScripting(osmo);
-#endif
-
-	return rv;
-}
-
-// here is the place to clean up and destroy the nsPluginInstance object
-NPError NPOsmozilla_Destroy (NPP instance, NPSavedData** save)
-{
-	NPError rv = NPERR_NO_ERROR;
-	Osmozilla *osmozilla;
-	if(instance == NULL)
-		return NPERR_INVALID_INSTANCE_ERROR;
-
-	osmozilla = (Osmozilla*)instance->pdata;
-	if (osmozilla != NULL) {
-		Osmozilla_Shutdown(osmozilla);
-#ifdef GECKO_XPCOM
-		NPOsmozilla_ShutdownScript(osmozilla);
-#else
-		if (osmozilla->script_obj) sBrowserFunctions->releaseobject(osmozilla->script_obj);
-		osmozilla->script_obj = NULL;
-#endif
-
-		free(osmozilla);
-	}
-	instance->pdata = NULL;
-	return rv;
-}
-
-// during this call we know when the plugin window is ready or
-// is about to be destroyed so we can do some gui specific
-// initialization and shutdown
-NPError NPOsmozilla_SetWindow (NPP instance, NPWindow* pNPWindow)
-{
-	Osmozilla *osmozilla;
-	void *os_wnd_handle, *os_wnd_display;
-	NPError rv = NPERR_NO_ERROR;
-
-	if (!instance || !instance->pdata) return NPERR_INVALID_INSTANCE_ERROR;
-	if (pNPWindow == NULL) return NPERR_GENERIC_ERROR;
-	osmozilla = (Osmozilla *)instance->pdata;
-
-	// window just created
-	if (!osmozilla->window_set) {
-		if (pNPWindow->window == NULL) return NPERR_GENERIC_ERROR;
-
-#ifdef XP_WIN
-		os_wnd_handle = pNPWindow->window;
-		os_wnd_display = NULL;
-#elif defined(XP_MAXOS)
-		os_wnd_handle = pNPWindow->window;
-		os_wnd_display = NULL;
-#elif defined(XP_UNIX)
-		os_wnd_handle = pNPWindow->window;
-		/*HACK - although we don't use the display in the X11 plugin, this is used to signal that
-		the user is mozilla and prevent some X11 calls crashing the browser in file playing mode
-		(eg, "firefox myfile.mp4" )*/
-		os_wnd_display =((NPSetWindowCallbackStruct *)pNPWindow->ws_info)->display;
-#endif
-
-		if (! Osmozilla_SetWindow(osmozilla, os_wnd_handle, os_wnd_display, pNPWindow->width, pNPWindow->height) ) {
-			return NPERR_MODULE_LOAD_FAILED_ERROR;
-		}
-
-	}
-
-#if 0
-	// window goes away
-	if((pNPWindow->window == NULL) && plugin->isInitialized())
-		return plugin->SetWindow(pNPWindow);
-
-	// window resized?
-	if(plugin->isInitialized() && (pNPWindow->window != NULL))
-		return plugin->SetWindow(pNPWindow);
-
-	// this should not happen, nothing to do
-	if((pNPWindow->window == NULL) && !plugin->isInitialized())
-		return plugin->SetWindow(pNPWindow);
-#endif
-
-	return rv;
-}
-
-NPError NPOsmozilla_NewStream(NPP instance, NPMIMEType type, NPStream* stream, NPBool seekable, uint16_t *stype)
-{
-	Osmozilla *osmozilla;
-	if(instance == NULL)
-		return NPERR_INVALID_INSTANCE_ERROR;
-
-	osmozilla = (Osmozilla *)instance->pdata;
-	if(osmozilla== NULL)
-		return NPERR_GENERIC_ERROR;
-
-	Osmozilla_ConnectTo(osmozilla, stream->url);
-	*stype = NP_SEEK;
-	return NPERR_NO_ERROR;
-}
-
-NPINT32 NPOsmozilla_WriteReady (NPP instance, NPStream *stream)
-{
-	return 0x0fffffff;
-}
-
-NPINT32 NPOsmozilla_Write (NPP instance, NPStream *stream, NPINT32 offset, NPINT32 len, void *buffer)
-{
-	return len;
-}
-
-NPError NPOsmozilla_DestroyStream (NPP instance, NPStream *stream, NPError reason)
-{
-	return NPERR_NO_ERROR;
-}
-
-void NPOsmozilla_StreamAsFile (NPP instance, NPStream* stream, const char* fname)
-{
-}
-
-void NPOsmozilla_Print (NPP instance, NPPrint* printInfo)
-{
-	Osmozilla *osmozilla;
-	if(instance == NULL)
-		return;
-
-	osmozilla = (Osmozilla *)instance->pdata;
-	if(osmozilla== NULL)
-		return;
-
-	Osmozilla_Print(osmozilla, (printInfo->mode == NP_EMBED) ? 1 : 0, printInfo->print.embedPrint.platformPrint,
-	                printInfo->print.embedPrint.window.x, printInfo->print.embedPrint.window.y,
-	                printInfo->print.embedPrint.window.width, printInfo->print.embedPrint.window.height);
-}
-
-void NPOsmozilla_URLNotify(NPP instance, const char* url, NPReason reason, void* notifyData)
-{
-	return;
-}
-
-NPError	NPOsmozilla_GetValue(NPP instance, NPPVariable variable, void *value)
-{
-	NPError rv = NPERR_NO_ERROR;
-	Osmozilla *osmozilla;
-	if(instance == NULL)
-		return NPERR_INVALID_INSTANCE_ERROR;
-
-	osmozilla = (Osmozilla *)instance->pdata;
-	if(osmozilla== NULL) return NPERR_GENERIC_ERROR;
-
-	switch (variable) {
-#ifdef GECKO_XPCOM
-	case NPPVpluginScriptableInstance:
-		rv = NPOsmozilla_GetPeer(osmozilla, value);
-		break;
-
-	case NPPVpluginScriptableIID:
-		rv = NPOsmozilla_GetPeerIID(osmozilla, value);
-		break;
-#else
-
-	case NPPVpluginScriptableNPObject:
-		sBrowserFunctions->retainobject(osmozilla->script_obj);
-		* (void **)value = osmozilla->script_obj;
-		break;
-
-#endif
-	case NPPVpluginNeedsXEmbed:
-		*((int *)value) = 1;
-		break;
-	case NPPVpluginNameString :
-		*(const char**)value = "Osmozilla/GPAC plugin for NPAPI";
-		break;
-	default:
-		break;
-	}
-
-	return rv;
-}
-
-
-
-NPError NPOsmozilla_SetValue(NPP instance, NPNVariable variable, void *value)
-{
-	return NPERR_NO_ERROR;
-}
-
-int16_t	NPOsmozilla_HandleEvent(NPP instance, void* event)
-{
-	/*we hacked the proc*/
-	return 0;
-}
-
-
-NPError OSCALL NP_Shutdown()
-{
-#ifdef GECKO_XPCOM
-	NPOsmozilla_ReleaseServiceManager();
-#endif
-	return NPERR_NO_ERROR;
-}
-
-static NPError fillPluginFunctionTable(NPPluginFuncs* aNPPFuncs)
-{
-	if(aNPPFuncs == NULL)
-		return NPERR_INVALID_FUNCTABLE_ERROR;
-
-	// Set up the plugin function table that Netscape will use to
-	// call us. Netscape needs to know about our version and size
-	// and have a UniversalProcPointer for every function we implement.
-
-	aNPPFuncs->version       = (NP_VERSION_MAJOR << 8) | NP_VERSION_MINOR;
-	aNPPFuncs->newp          = NPOsmozilla_New;
-	aNPPFuncs->destroy       = NPOsmozilla_Destroy;
-	aNPPFuncs->setwindow     = NPOsmozilla_SetWindow;
-	aNPPFuncs->newstream     = NPOsmozilla_NewStream;
-	aNPPFuncs->destroystream = NPOsmozilla_DestroyStream;
-	aNPPFuncs->asfile        = NPOsmozilla_StreamAsFile;
-	aNPPFuncs->writeready    = NPOsmozilla_WriteReady;
-	aNPPFuncs->write         = NPOsmozilla_Write;
-	aNPPFuncs->print         = NPOsmozilla_Print;
-	aNPPFuncs->event         = NPOsmozilla_HandleEvent;
-	aNPPFuncs->urlnotify     = NPOsmozilla_URLNotify;
-	aNPPFuncs->getvalue      = NPOsmozilla_GetValue;
-	aNPPFuncs->setvalue      = NPOsmozilla_SetValue;
-	return NPERR_NO_ERROR;
-}
-
-
-static NPError NS_PluginInitialize()
-{
-#ifdef GECKO_XPCOM
-	NPOsmozilla_GetServiceManager();
-#endif
-	return NPERR_NO_ERROR;
-}
-
-// get values per plugin
-NPError NS_PluginGetValue(NPPVariable aVariable, void *aValue)
-{
-	NPError err = NPERR_NO_ERROR;
-	switch (aVariable) {
-	case NPPVpluginNameString:
-		*((char **)aValue) = (char *) "Osmozilla";
-		break;
-	case NPPVpluginDescriptionString:
-		*((char **)aValue) = Osmozilla_GetVersion();
-		break;
-	default:
-		err = NPERR_INVALID_PARAM;
-		break;
-	}
-	return err;
-}
-
-
-
-
-#define GPAC_PLUGIN_MIMETYPES \
-	"audio/mpeg:mp2,mp3,mpga,mpega:MP3 Music;" \
-	"audio/x-mpeg:mp2,mp3,mpga,mpega:MP3 Music;" \
-	"audio/amr:amr,awb:AMR Audio;" \
-	"audio/mp4:mp4,mpg4,mpeg4,m4a:MPEG-4 Audio;" \
-	"audio/aac:aac:MPEG-4 AAC Music;" \
-	"audio/aacp:aac:MPEG-4 AACPlus Music;" \
-	"audio/basic:snd,au:Basic Audio;"	\
-	"audio/x-wav:wav:WAV Audio;"	\
-	"audio/3gpp:3gp,3gpp:3GPP/MMS Music;"	\
-	"audio/3gpp2:3g2,3gp2:3GPP2/MMS Music;"	\
-	"video/mpeg:mpg,mpeg,mpe,mpv2:MPEG Video;" \
-	"video/x-mpeg:mpg,mpeg,mpe,mpv2:MPEG Video;" \
-	"video/mpeg-system:mpg,mpeg,mpe,vob,mpv2:MPEG Video;" \
-	"video/x-mpeg-system:mpg,mpeg,mpe,vob,mpv2:MPEG Video;" \
-	"video/avi:avi:AVI Video;" \
-	"video/quicktime:mov,qt:QuickTime Movies;" \
-	"video/x-ms-asf:asf,asx:Windows Media Video;" \
-	"video/x-ms-wmv:wmv:Windows Media;" \
-	"video/mp4:mp4,mpg4:MPEG-4 Video;" \
-	"video/3gpp:3gp,3gpp:3GPP/MMS Video;" \
-	"video/3gpp2:3g2,3gp2:3GPP2/MMS Video;" \
-	"image/jpeg:jpeg,jpg:JPEG Images;"	\
-	"image/png:png:PNG Images;"	\
-	"image/bmp:bmp:MS Bitmap Images;"	\
-	"image/svg+xml:svg,svg.gz,svgz:SVG Document;"	\
-	"image/x-svgm:svgm:SVGM Document;"	\
-	"x-subtitle/srt:srt:SRT SubTitles;"	\
-	"x-subtitle/sub:sub:SUB SubTitles;"	\
-	"x-subtitle/ttxt:ttxt:GPAC 3GPP TimedText;"	\
-	"model/vrml:wrl,wrl.gz:VRML World;"	\
-	"model/x3d+vrml:x3dv,x3dv.gz,x3dvz:X3D/VRML World;"	\
-	"model/x3d+xml:x3d,x3d.gz,x3dz:X3D/XML World;" \
-	"application/ogg:ogg:Ogg Media;" \
-	"application/x-ogg:ogg:Ogg Media;" \
-	"application/x-bt:bt,bt.gz,btz:MPEG-4 Text (BT);"	\
-	"application/x-xmt:xmt,xmt.gz,xmtz:MPEG-4 Text (XMT);"	\
-	"application/mp4:mp4,mpg4:MPEG-4 Movies;" \
-	"application/sdp:sdp:Streaming Media Session;" \
-	/* explicit plugin call */ \
-	"application/x-gpac::GPAC plugin;" \
- 
-char * NP_GetMIMEDescription(void)
-{
-	return (char *) GPAC_PLUGIN_MIMETYPES;
-}
-
-
-NPError NP_GetValue(void *future, NPPVariable aVariable, void *aValue)
-{
-	return NS_PluginGetValue(aVariable, aValue);
-}
-
-
-#if defined(XP_WIN) || defined(XP_MACOS)
-
-NPError OSCALL NP_Initialize(NPNetscapeFuncs* aNPNFuncs)
-{
-	sBrowserFunctions = aNPNFuncs;
-
-	return NS_PluginInitialize();
-}
-
-NPError OSCALL NP_GetEntryPoints(NPPluginFuncs* aNPPFuncs)
-{
-	return fillPluginFunctionTable(aNPPFuncs);
-}
-
-
-#elif defined(XP_UNIX)
-
-NPError OSCALL NP_Initialize(NPNetscapeFuncs* aNPNFuncs, NPPluginFuncs* aNPPFuncs)
-{
-	NPError rv;
-	sBrowserFunctions = aNPNFuncs;
-	rv = fillPluginFunctionTable(aNPPFuncs);
-	if(rv != NPERR_NO_ERROR)
-		return rv;
-
-	return NS_PluginInitialize();
-}
-#endif
-
-
-#ifdef GECKO_XPCOM
-
-
-#include <nsIServiceManager.h>
-#include <nsIMemory.h>
-#include <nsISupportsUtils.h>
-#include <nsISupports.h>
-#include <nsMemory.h>
-
-#include "nsIOsmozilla.h"
-
-#include "osmozilla.h"
-
-
-nsIServiceManager *gServiceManager = NULL;
-
-
-// We must implement nsIClassInfo because it signals the
-// Mozilla Security Manager to allow calls from JavaScript.
-// helper class to implement all necessary nsIClassInfo method stubs
-// and to set flags used by the security system
-
-class nsClassInfoMixin : public nsIClassInfo
-{
-	// These flags are used by the DOM and security systems to signal that
-	// JavaScript callers are allowed to call this object's scritable methods.
-	NS_IMETHOD GetFlags(PRUint32 *aFlags)
-	{	*aFlags = nsIClassInfo::PLUGIN_OBJECT | nsIClassInfo::DOM_OBJECT;
-		return NS_OK;
-	}
-
-	NS_IMETHOD GetImplementationLanguage(PRUint32 *aImplementationLanguage)
-	{	*aImplementationLanguage = nsIProgrammingLanguage::CPLUSPLUS;
-		return NS_OK;
-	}
-
-	// The rest of the methods can safely return error codes...
-	NS_IMETHOD GetInterfaces(PRUint32 *count, nsIID ***array)
-	{
-		return NS_ERROR_NOT_IMPLEMENTED;
-	}
-	NS_IMETHOD GetHelperForLanguage(PRUint32 language, nsISupports **_retval)
-	{
-		return NS_ERROR_NOT_IMPLEMENTED;
-	}
-	NS_IMETHOD GetContractID(char **aContractID)
-	{
-		return NS_ERROR_NOT_IMPLEMENTED;
-	}
-	NS_IMETHOD GetClassDescription(char **aClassDescription)
-	{
-		return NS_ERROR_NOT_IMPLEMENTED;
-	}
-	NS_IMETHOD GetClassID(nsCID **aClassID)
-	{
-		return NS_ERROR_NOT_IMPLEMENTED;
-	}
-	NS_IMETHOD GetClassIDNoAlloc(nsCID *aClassIDNoAlloc)
-	{
-		return NS_ERROR_NOT_IMPLEMENTED;
-	}
-};
-
-
-class nsOsmozillaPeer : public nsIOsmozilla , public nsClassInfoMixin
-{
-public:
-	nsOsmozillaPeer(Osmozilla *osmo);
-	virtual ~nsOsmozillaPeer();
-
-	// methods from nsISupports
-	NS_IMETHOD QueryInterface(const nsIID & aIID, void **aInstancePtr);
-	NS_IMETHOD_(nsrefcnt) AddRef();
-	NS_IMETHOD_(nsrefcnt) Release();
-
-public:
-	NS_DECL_NSIOSMOZILLA
-	void SetInstance(Osmozilla *osmo);
-
-protected:
-	nsrefcnt mRefCnt;
-	Osmozilla *mPlugin;
-};
-
-
-static NS_DEFINE_IID(kIZillaPluginIID, NS_IOSMOZILLA_IID);
-static NS_DEFINE_IID(kIClassInfoIID, NS_ICLASSINFO_IID);
-static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
-
-nsOsmozillaPeer::nsOsmozillaPeer(Osmozilla *osmo)
-{
-	mPlugin=osmo;
-	mRefCnt = 0;
-}
-
-nsOsmozillaPeer::~nsOsmozillaPeer()
-{
-}
-// Notice that we expose our claim to implement nsIClassInfo.
-//NS_IMPL_ISUPPORTS2(nsOsmozillaPeer, nsITestPlugin, nsIClassInfo)
-
-// the following method will be callable from JavaScript
-NS_IMETHODIMP nsOsmozillaPeer::Pause() {
-	Osmozilla_Pause(mPlugin);
-	return NS_OK;
-}
-NS_IMETHODIMP nsOsmozillaPeer::Play() {
-	Osmozilla_Play(mPlugin);
-	return NS_OK;
-}
-NS_IMETHODIMP nsOsmozillaPeer::Stop() {
-	Osmozilla_Stop(mPlugin);
-	return NS_OK;
-}
-
-NS_IMETHODIMP nsOsmozillaPeer::Update(const char *type, const char *commands)
-{
-	Osmozilla_Update(mPlugin, type, commands);
-	return NS_OK;
-}
-
-NS_IMETHODIMP nsOsmozillaPeer::QualitySwitch(int switch_up)
-{
-	Osmozilla_QualitySwitch(mPlugin, switch_up);
-	return NS_OK;
-}
-
-NS_IMETHODIMP nsOsmozillaPeer::SetURL(const char *url)
-{
-	Osmozilla_SetURL(mPlugin, url);
-	return NS_OK;
-}
-
-void nsOsmozillaPeer::SetInstance(Osmozilla *osmo)
-{
-	mPlugin = osmo;
-}
-
-NS_IMETHODIMP_(nsrefcnt) nsOsmozillaPeer::AddRef()
-{
-	++mRefCnt;
-	return mRefCnt;
-}
-
-NS_IMETHODIMP_(nsrefcnt) nsOsmozillaPeer::Release()
-{
-	--mRefCnt;
-	if (mRefCnt == 0) {
-		delete this;
-		return 0;
-	}
-	return mRefCnt;
-}
-
-// here nsOsmozillaPeer should return three interfaces it can be asked for by their iid's
-// static casts are necessary to ensure that correct pointer is returned
-NS_IMETHODIMP nsOsmozillaPeer::QueryInterface(const nsIID & aIID,
-        void **aInstancePtr)
-{
-	if (!aInstancePtr)
-		return NS_ERROR_NULL_POINTER;
-
-	if (aIID.Equals(kIZillaPluginIID)) {
-		*aInstancePtr = NS_STATIC_CAST(nsIOsmozilla *, this);
-		AddRef();
-		return NS_OK;
-	}
-
-	if (aIID.Equals(kIClassInfoIID)) {
-		*aInstancePtr = NS_STATIC_CAST(nsIClassInfo *, this);
-		AddRef();
-		return NS_OK;
-	}
-
-	if (aIID.Equals(kISupportsIID)) {
-		*aInstancePtr = NS_STATIC_CAST(nsISupports *, (NS_STATIC_CAST (nsIOsmozilla *, this)));
-		AddRef();
-		return NS_OK;
-	}
-	return NS_NOINTERFACE;
-}
-
-extern NPNetscapeFuncs *sBrowserFunctions;
-
-void NPOsmozilla_GetServiceManager()
-{
-	// this is probably a good place to get the service manager
-	// note that Mozilla will add reference, so do not forget to release
-	nsISupports *sm = NULL;
-
-	if (!sBrowserFunctions) return;
-	sBrowserFunctions->getvalue(NULL, NPNVserviceManager, &sm);
-
-	// Mozilla returns nsIServiceManager so we can use it directly; doing QI on
-	// nsISupports here can still be more appropriate in case something is changed
-	// in the future so we don't need to do casting of any sort.
-	if (sm) {
-		sm->QueryInterface(NS_GET_IID(nsIServiceManager), (void **) &gServiceManager);
-		NS_RELEASE(sm);
-	}
-}
-
-void NPOsmozilla_ReleaseServiceManager()
-{
-#ifdef GECKO_XPCOM
-	// we should release the service manager
-	NS_IF_RELEASE(gServiceManager);
-	gServiceManager = NULL;
-#endif
-}
-
-void NPOsmozilla_ShutdownScript(Osmozilla *osmo)
-{
-	nsOsmozillaPeer *peer = (nsOsmozillaPeer *) osmo->scriptable_peer;
-	if (peer != NULL) {
-		peer->SetInstance(NULL);
-		NS_IF_RELEASE(peer);
-	}
-}
-
-
-NPError	NPOsmozilla_GetPeer(Osmozilla *osmo, void *value)
-{
-	if (!osmo->scriptable_peer) {
-		osmo->scriptable_peer = new nsOsmozillaPeer(osmo);
-		if (!osmo->scriptable_peer) return NPERR_OUT_OF_MEMORY_ERROR;
-		NS_ADDREF( (nsOsmozillaPeer *) osmo->scriptable_peer);
-	}
-
-	NS_ADDREF( (nsOsmozillaPeer *)osmo->scriptable_peer);
-	*(nsISupports **) value = (nsISupports *) osmo->scriptable_peer;
-	return NPERR_NO_ERROR;
-}
-
-NPError	NPOsmozilla_GetPeerIID(Osmozilla *osmo, void *value)
-{
-	static nsIID scriptableIID = NS_IOSMOZILLA_IID;
-	if (!sBrowserFunctions) return NPERR_OUT_OF_MEMORY_ERROR;
-
-	nsIID *ptr = (nsIID *) sBrowserFunctions->memalloc( sizeof(nsIID) );
-	if (! ptr) return NPERR_OUT_OF_MEMORY_ERROR;
-
-	*ptr = scriptableIID;
-	*(nsIID **) value = ptr;
-	return NPERR_NO_ERROR;
-}
-
-#else
-
-enum
-{
-	kOSMOZILLA_ID_METHOD_PLAY = 0,
-	kOSMOZILLA_ID_METHOD_PAUSE,
-	kOSMOZILLA_ID_METHOD_STOP,
-	kOSMOZILLA_ID_METHOD_UPDATE,
-	kOSMOZILLA_ID_METHOD_QUALITY_SWITCH,
-	kOSMOZILLA_ID_METHOD_SET_URL,
-
-	kOSMOZILLA_NUM_METHODS
-};
-
-NPIdentifier    v_OSMOZILLA_MethodIdentifierskOSMOZILLA_NUM_METHODS;
-const NPUTF8 *  v_OSMOZILLA_MethodNameskOSMOZILLA_NUM_METHODS = {
-	"Play",
-	"Pause",
-	"Stop",
-	"Update",
-	"QualitySwitch",
-	"SetURL",
-};
-
-NPClass osmozilla_script_class;
-
-typedef struct {
-	NPClass *_class;
-	uint32_t referenceCount;
-	Osmozilla *osmo;
-} OsmozillaObject;
-
-NPObject *OSMOZILLA_Allocate(NPP npp, NPClass *theClass)
-{
-	OsmozillaObject *obj = NULL;
-
-	sBrowserFunctions->getstringidentifiers(v_OSMOZILLA_MethodNames, kOSMOZILLA_NUM_METHODS, v_OSMOZILLA_MethodIdentifiers);
-	obj = (OsmozillaObject *)malloc(sizeof(OsmozillaObject));
-	obj->osmo = (Osmozilla *) npp->pdata;
-	return (NPObject *)obj;
-}
-
-void OSMOZILLA_Deallocate(NPObject* obj)
-{
-	free(obj);
-	return;
-}
-
-void OSMOZILLA_Invalidate(NPObject* obj)
-{
-	return;
-}
-
-bool OSMOZILLA_HasMethod(NPObject* obj, NPIdentifier name)
-{
-	int i = 0;
-	while (i < kOSMOZILLA_NUM_METHODS) {
-		if ( name == v_OSMOZILLA_MethodIdentifiersi ) {
-			return 1;
-		}
-		i++;
-	}
-	return 0;
-}
-
-bool OSMOZILLA_Invoke(NPObject* obj, NPIdentifier name, const NPVariant* args, uint32_t argCount, NPVariant* result)
-{
-	OsmozillaObject *npo = (OsmozillaObject *)obj;
-	if (!npo->osmo) return 0;
-	if (name == v_OSMOZILLA_MethodIdentifierskOSMOZILLA_ID_METHOD_PLAY) {
-		Osmozilla_Play(npo->osmo);
-		return 1;
-	}
-	if (name == v_OSMOZILLA_MethodIdentifierskOSMOZILLA_ID_METHOD_PAUSE) {
-		Osmozilla_Pause(npo->osmo);
-		return 1;
-	}
-	if (name == v_OSMOZILLA_MethodIdentifierskOSMOZILLA_ID_METHOD_STOP) {
-		Osmozilla_Stop(npo->osmo);
-		return 1;
-	}
-	if (name == v_OSMOZILLA_MethodIdentifierskOSMOZILLA_ID_METHOD_UPDATE) {
-		const char *mime = NULL;
-		const char *update = NULL;
-		if (argCount==2) {
-			mime = (args0.type==NPVariantType_String) ? args0.value.stringValue.UTF8Characters : NULL;
-			update = (args1.type==NPVariantType_String) ? args1.value.stringValue.UTF8Characters : NULL;
-		}
-		if (!update) return 0;
-		Osmozilla_Update(npo->osmo, mime, update);
-		return 1;
-	}
-	if (name == v_OSMOZILLA_MethodIdentifierskOSMOZILLA_ID_METHOD_QUALITY_SWITCH) {
-		int up = 1;
-		if (argCount==1) {
-			if (args0.type==NPVariantType_Bool) up = args0.value.boolValue ? 1 : 0;
-			else if (args0.type==NPVariantType_Int32) up = args0.value.intValue ? 1 : 0;
-		}
-		Osmozilla_QualitySwitch(npo->osmo, up);
-		return 1;
-	}
-	if (name == v_OSMOZILLA_MethodIdentifierskOSMOZILLA_ID_METHOD_SET_URL) {
-		const char *url = "";
-		if (argCount>=1) {
-			if (args0.type==NPVariantType_String)
-				url = args0.value.stringValue.UTF8Characters;
-		}
-		Osmozilla_SetURL(npo->osmo, url);
-		return 1;
-	}
-	return 0;
-}
-
-bool OSMOZILLA_InvokeDefault(NPObject *npobj, const NPVariant *args, uint32_t argCount, NPVariant *result)
-{
-	return 1;
-}
-
-bool OSMOZILLA_HasProperty(NPObject* obj, NPIdentifier name)
-{
-	bool result = 0;
-	if ( sBrowserFunctions->identifierisstring(name) )
-	{
-		NPUTF8 *val = sBrowserFunctions->utf8fromidentifier(name);
-
-		if ( !strcmp(val, "DownloadProgress") )
-		{
-			result = 1;
-		}
-
-		sBrowserFunctions->memfree(val);
-	}
-	/*nothing exposed yet*/
-	return result;
-}
-
-bool OSMOZILLA_GetProperty(NPObject* obj, NPIdentifier name, NPVariant* result)
-{
-	OsmozillaObject *npo = (OsmozillaObject *)obj;
-	if (!npo->osmo) return 0;
-	if ( sBrowserFunctions->identifierisstring(name) )
-	{
-		NPUTF8 *val = sBrowserFunctions->utf8fromidentifier(name);
-
-		if ( !strcmp(val, "DownloadProgress") )
-		{
-			int val = Osmozilla_GetDownloadProgress(npo->osmo);
-			INT32_TO_NPVARIANT(val, *result);
-		}
-
-		sBrowserFunctions->memfree(val);
-	}
-	return 1;
-}
-
-bool OSMOZILLA_SetProperty(NPObject *obj, NPIdentifier name, const NPVariant *value)
-{
-	return 1;
-}
-
-bool OSMOZILLA_RemoveProperty(NPObject *npobj, NPIdentifier name)
-{
-	return 1;
-}
-
-bool OSMOZILLA_Enumerate(NPObject *npobj, NPIdentifier **value, uint32_t *count)
-{
-	return 1;
-}
-
-void Osmozilla_InitScripting(Osmozilla *osmo)
-{
-	osmozilla_script_class.allocate          = OSMOZILLA_Allocate;
-	osmozilla_script_class.deallocate        = OSMOZILLA_Deallocate;
-	osmozilla_script_class.invalidate        = OSMOZILLA_Invalidate;
-	osmozilla_script_class.hasMethod         = OSMOZILLA_HasMethod;
-	osmozilla_script_class.invoke            = OSMOZILLA_Invoke;
-	osmozilla_script_class.invokeDefault     = OSMOZILLA_InvokeDefault;
-	osmozilla_script_class.hasProperty       = OSMOZILLA_HasProperty;
-	osmozilla_script_class.getProperty       = OSMOZILLA_GetProperty;
-	osmozilla_script_class.setProperty       = OSMOZILLA_SetProperty;
-	osmozilla_script_class.removeProperty    = OSMOZILLA_RemoveProperty;
-	osmozilla_script_class.enumerate         = OSMOZILLA_Enumerate;
-
-	/*create script object*/
-	osmo->script_obj = sBrowserFunctions->createobject(osmo->np_instance, &osmozilla_script_class);
-
-}
-
-#endif //GECKO_XPCOM
-

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/osmozilla/osmo_npapi.h Deleted

@@ -1,136 +0,0 @@
-/*
-*			GPAC - Multimedia Framework C SDK
-*
- *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2012
-*					All rights reserved
-*
-*  This file is part of GPAC / Osmozilla NPAPI plugin
-*
-*  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.
-*
-*/
-
-#ifndef _OSMO_NPAPI_H_
-#define _OSMO_NPAPI_H_
-
-
-#ifdef WIN32
-#include <windows.h>
-#ifndef __cplusplus
-typedef BOOL bool;
-#endif //__cplusplus
-#endif
-
-#include "npapi.h"
-
-/*check this with gecko 1.9.2*/
-#if (NP_VERSION_MINOR < 20)
-#define GECKO_XPCOM
-#endif
-
-#ifdef GECKO_XPCOM
-#include "npupp.h"
-
-#ifndef uint16_t
-typedef uint16 uint16_t;
-#endif
-
-#ifndef int16_t
-typedef int16 int16_t;
-#endif
-
-#define NPINT32	int32
-
-#else
-
-#include "npfunctions.h"
-
-#define NPINT32	int32_t
-
-#endif
-
-#ifdef XP_UNIX
-#include <stdio.h>
-#endif //XP_UNIX
-
-
-#ifndef HIBYTE
-#define HIBYTE(i) (i >> 8)
-#endif
-
-#ifndef LOBYTE
-#define LOBYTE(i) (i & 0xff)
-#endif
-
-/*functions callbacks to browser*/
-NPError Osmozilla_GetURL(NPP instance, const char *url, const char *target);
-void Osmozilla_SetStatus(NPP instance, const char *message);
-
-
-/*
-Plugins functions exposed to browser
-*/
-NPError NPOsmozilla_New(NPMIMEType pluginType, NPP instance, uint16_t mode, int16_t argc, char* argn, char* argv, NPSavedData* saved);
-NPError NPOsmozilla_Destroy(NPP instance, NPSavedData** save);
-NPError NPOsmozilla_SetWindow(NPP instance, NPWindow* window);
-NPError NPOsmozilla_NewStream(NPP instance, NPMIMEType type, NPStream* stream, NPBool seekable, uint16_t* stype);
-NPError NPOsmozilla_DestroyStream(NPP instance, NPStream* stream, NPError reason);
-NPINT32 NPOsmozilla_WriteReady(NPP instance, NPStream* stream);
-NPINT32 NPOsmozilla_Write(NPP instance, NPStream* stream, NPINT32 offset, NPINT32 len, void* buffer);
-void    NPOsmozilla_StreamAsFile(NPP instance, NPStream* stream, const char* fname);
-void    NPOsmozilla_Print(NPP instance, NPPrint* platformPrint);
-int16_t NPOsmozilla_HandleEvent(NPP instance, void* event);
-void    NPOsmozilla_URLNotify(NPP instance, const char* url, NPReason reason, void* notifyData);
-NPError NPOsmozilla_GetValue(NPP instance, NPPVariable variable, void *result);
-NPError NPOsmozilla_SetValue(NPP instance, NPNVariable variable, void *value);
-
-
-/*
-Functions called by browser
-*/
-
-typedef struct __tag_osmozilla Osmozilla;
-
-/*base functions*/
-int Osmozilla_Initialize(Osmozilla *osmo, signed short argc, char* argn, char* argv);
-void Osmozilla_Shutdown(Osmozilla *osmo);
-int Osmozilla_SetWindow(Osmozilla *osmozilla, void *os_wnd_handle, void *os_wnd_display, unsigned int width, unsigned int height);
-void Osmozilla_ConnectTo(Osmozilla *osmozilla, const char *url);
-void Osmozilla_Print(Osmozilla *osmozilla, unsigned int is_embed, void *os_print_dc, unsigned int target_x, unsigned int target_y, unsigned int target_width, unsigned int target_height);
-char *Osmozilla_GetVersion();
-
-
-/*scripting functions*/
-void Osmozilla_Play(Osmozilla *osmo);
-void Osmozilla_Pause(Osmozilla *osmo);
-void Osmozilla_Stop(Osmozilla *osmo);
-void Osmozilla_Update(Osmozilla *osmo, const char *type, const char *commands);
-void Osmozilla_QualitySwitch(Osmozilla *osmo, int switch_up);
-void Osmozilla_SetURL(Osmozilla *osmo, const char *url);
-int Osmozilla_GetDownloadProgress(Osmozilla *osmo);
-
-
-#ifdef GECKO_XPCOM
-
-void NPOsmozilla_GetServiceManager();
-void NPOsmozilla_ReleaseServiceManager();
-void NPOsmozilla_ShutdownScript(Osmozilla *osmo);
-NPError	NPOsmozilla_GetPeer(Osmozilla *osmo, void *value);
-NPError	NPOsmozilla_GetPeerIID(Osmozilla *osmo, void *value);
-
-#endif //GECKO_XPCOM
-
-#endif //_NPPLAT_H_

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/osmozilla/osmozilla.cpp Deleted

@@ -1,531 +0,0 @@
-/*
-*			GPAC - Multimedia Framework C SDK
-*
- *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2012
-*					All rights reserved
-*
-*  This file is part of GPAC / Osmozilla NPAPI plugin
-*
-*  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 "osmozilla.h"
-
-#ifdef XP_WIN
-#include <windows.h>
-#endif
-
-#include <gpac/options.h>
-#include <gpac/terminal.h>
-#include <gpac/term_info.h>
-
-
-short Osmozilla_GetURL(NPP instance, const char *url, const char *target);
-void Osmozilla_SetStatus(NPP instance, const char *message);
-
-
-void Osmozilla_Shutdown(Osmozilla *osmo)
-{
-	if (osmo->url) gf_free(osmo->url);
-	osmo->url = NULL;
-	if (osmo->term) {
-		GF_Terminal *a_term = osmo->term;
-		osmo->term = NULL;
-		gf_term_del(a_term);
-	}
-	if (osmo->user) {
-		if (osmo->user->modules) gf_modules_del(osmo->user->modules);
-		if (osmo->user->config) gf_cfg_del(osmo->user->config);
-		gf_free(osmo->user);
-		osmo->user = NULL;
-	}
-}
-
-static void osmozilla_do_log(void *cbk, GF_LOG_Level level, GF_LOG_Tool tool, const char *fmt, va_list list)
-{
-	FILE *logs = (FILE *) cbk;
-	vfprintf(logs, fmt, list);
-	fflush(logs);
-}
-
-
-Bool Osmozilla_EventProc(void *opaque, GF_Event *evt)
-{
-	char msg1024;
-	Osmozilla *osmo = (Osmozilla *)opaque;
-	if (!osmo->term) return GF_FALSE;
-
-	switch (evt->type) {
-	case GF_EVENT_MESSAGE:
-		if (!evt->message.message) return GF_FALSE;
-		if (evt->message.error)
-			sprintf((char *)msg, "GPAC: %s (%s)", evt->message.message, gf_error_to_string(evt->message.error));
-		else
-			sprintf((char *)msg, "GPAC: %s", evt->message.message);
-
-		Osmozilla_SetStatus(osmo->np_instance, msg);
-		break;
-	case GF_EVENT_PROGRESS:
-		if (evt->progress.done == evt->progress.total) {
-			Osmozilla_SetStatus(osmo->np_instance, "");
-			osmo->download_progress = 100;
-		} else {
-			char *szTitle = (char *)"";
-			if (evt->progress.progress_type==0) szTitle = (char *)"Buffer ";
-			else if (evt->progress.progress_type==1)
-			{
-				szTitle = (char *)"Download ";
-				osmo->download_progress = (int) (100.0*evt->progress.done) / evt->progress.total;
-			}
-			else if (evt->progress.progress_type==2) szTitle = (char *)"Import ";
-
-			sprintf(msg, "(GPAC) %s: %02.2f", szTitle, (100.0*evt->progress.done) / evt->progress.total);
-			Osmozilla_SetStatus(osmo->np_instance, msg);
-		}
-		break;
-
-	/*IGNORE any scene size, just work with the size allocated in the parent doc*/
-	case GF_EVENT_SCENE_SIZE:
-		gf_term_set_size(osmo->term, osmo->width, osmo->height);
-		break;
-	/*window has been resized (full-screen plugin), resize*/
-	case GF_EVENT_SIZE:
-		osmo->width = evt->size.width;
-		osmo->height = evt->size.height;
-		gf_term_set_size(osmo->term, osmo->width, osmo->height);
-		break;
-	case GF_EVENT_CONNECT:
-		osmo->is_connected = evt->connect.is_connected;
-		break;
-	case GF_EVENT_DURATION:
-		osmo->can_seek = evt->duration.can_seek;
-		osmo->duration = evt->duration.duration;
-		break;
-	case GF_EVENT_DBLCLICK:
-		gf_term_set_option(osmo->term, GF_OPT_FULLSCREEN, !gf_term_get_option(osmo->term, GF_OPT_FULLSCREEN));
-		break;
-	case GF_EVENT_NAVIGATE_INFO:
-		strcpy(msg, evt->navigate.to_url);
-		Osmozilla_SetStatus(osmo->np_instance, msg);
-		break;
-	case GF_EVENT_NAVIGATE:
-		if (gf_term_is_supported_url(osmo->term, evt->navigate.to_url, GF_TRUE, osmo->disable_mime ? GF_TRUE : GF_FALSE)) {
-			gf_term_navigate_to(osmo->term, evt->navigate.to_url);
-			return GF_TRUE;
-		} else {
-			u32 i;
-			char *target = (char *)"_self";
-
-			for (i=0; i<evt->navigate.param_count; i++) {
-				if (!strcmp(evt->navigate.parametersi, "_parent")) target = (char *)"_parent";
-				else if (!strcmp(evt->navigate.parametersi, "_blank")) target = (char *)"_blank";
-				else if (!strcmp(evt->navigate.parametersi, "_top")) target = (char *)"_top";
-				else if (!strcmp(evt->navigate.parametersi, "_new")) target = (char *)"_new";
-				else if (!strnicmp(evt->navigate.parametersi, "_target=", 8)) target = (char *) evt->navigate.parametersi+8;
-			}
-			Osmozilla_GetURL(osmo->np_instance, evt->navigate.to_url, target);
-			return GF_TRUE;
-		}
-		break;
-	}
-	return GF_FALSE;
-}
-
-int Osmozilla_Initialize(Osmozilla *osmo, signed short argc, char* argn, char* argv)
-{
-	const char *str;
-	int i;
-	osmo->auto_start = 1;
-	osmo->use_gui = 0;
-
-	/*options sent from plugin*/
-	for(i=0; i<argc; i++) {
-		if (!argni || !argvi) continue;
-		if (!stricmp(argni,"autostart") && (!stricmp(argvi, "false") || !stricmp(argvi, "no")) )
-			osmo->auto_start = 0;
-
-		else if (!stricmp(argni,"src") ) {
-			if (osmo->url) gf_free(osmo->url);
-			osmo->url = gf_strdup(argvi);
-		}
-		else if (!stricmp(argni,"use3d") && (!stricmp(argvi, "true") || !stricmp(argvi, "yes") ) ) {
-			osmo->use_3d = 1;
-		}
-		else if (!stricmp(argni,"loop") && (!stricmp(argvi, "true") || !stricmp(argvi, "yes") ) ) {
-			osmo->loop = 1;
-		}
-		else if (!stricmp(argni,"aspectratio")) {
-			osmo->aspect_ratio = GF_ASPECT_RATIO_KEEP;
-			if (!stricmp(argvi, "keep")) osmo->aspect_ratio = GF_ASPECT_RATIO_KEEP;
-			else if (!stricmp(argvi, "16:9")) osmo->aspect_ratio = GF_ASPECT_RATIO_16_9;
-			else if (!stricmp(argvi, "4:3")) osmo->aspect_ratio = GF_ASPECT_RATIO_4_3;
-			else if (!stricmp(argvi, "fill")) osmo->aspect_ratio = GF_ASPECT_RATIO_FILL_SCREEN;
-		}
-		else if (!stricmp(argni,"gui") && (!stricmp(argvi, "true") || !stricmp(argvi, "yes") ) )
-			osmo->use_gui = 1;
-	}
-
-	/*URL is not absolute, request new stream to mozilla - we don't pass absolute URLs since some may not be
-	handled by gecko */
-	if (osmo->url) {
-		Bool absolute_url = GF_FALSE;
-		if (strstr(osmo->url, "://")) absolute_url = GF_TRUE;
-		else if (osmo->url0 == '/') {
-			FILE *test = gf_fopen(osmo->url, "rb");
-			if (test) {
-				absolute_url = GF_TRUE;
-				gf_fclose(test);
-			}
-		}
-		else if ((osmo->url1 == ':') && ((osmo->url2 == '\\') || (osmo->url2 == '/'))) absolute_url = GF_TRUE;
-
-		if (!absolute_url) {
-			char *url = osmo->url;
-			osmo->url = NULL;
-			Osmozilla_GetURL(osmo->np_instance, url, NULL);
-			gf_free(url);
-		}
-	}
-
-	GF_SAFEALLOC(osmo->user, GF_User);
-	osmo->user->config = gf_cfg_init(NULL, NULL);
-	/*need to have a valid cfg file for now*/
-	if (!osmo->user->config) {
-		gf_free(osmo->user);
-		osmo->user = NULL;
-#ifdef WIN32
-		MessageBox(NULL, "GPAC CONFIGURATION FILE NOT FOUND OR INVALID", "OSMOZILLA FATAL ERROR", MB_OK);
-#else
-		fprintf(stdout, "OSMOZILLA FATAL ERROR\nGPAC CONFIGURATION FILE NOT FOUND OR INVALID\n");
-#endif
-		return 0;
-	}
-
-	osmo->user->modules = gf_modules_new(NULL, osmo->user->config);
-	if (!gf_modules_get_count(osmo->user->modules)) {
-		if (osmo->user->modules) gf_modules_del(osmo->user->modules);
-		gf_free(osmo->user);
-		osmo->user = NULL;
-#ifdef WIN32
-		MessageBox(NULL, "GPAC MODULES NOT FOUND", "OSMOZILLA FATAL ERROR", MB_OK);
-#else
-		fprintf(stdout, "OSMOZILLA FATAL ERROR\nGPAC MODULES NOT FOUND\n");
-#endif
-		return 0;
-	}
-
-	osmo->user->opaque = osmo;
-	osmo->user->EventProc = Osmozilla_EventProc;
-
-	/*always fetch mime ? Check with anchor examples*/
-	osmo->disable_mime = 0;
-	str = gf_cfg_get_key(osmo->user->config, "General", "NoMIMETypeFetch");
-	if (str && !strcmp(str, "yes")) osmo->disable_mime = 0;
-	/*check log file*/
-	str = gf_cfg_get_key(osmo->user->config, "General", "LogFile");
-	if (str) {
-		osmo->logs = gf_fopen(str, "wt");
-		if (osmo->logs) gf_log_set_callback(osmo->logs, osmozilla_do_log);
-	}
-
-	/*setup logs*/
-	if (gf_log_set_tools_levels(gf_cfg_get_key(osmo->user->config, "General", "Logs")) != GF_OK)
-		fprintf(stdout, "Osmozilla: invalid log level specified\n");
-
-	fprintf(stdout, "Osmozilla initialized\n");
-	return 1;
-}
-
-int Osmozilla_SetWindow(Osmozilla *osmo, void *os_wnd_handle, void *os_wnd_display, unsigned int width, unsigned int height)
-{
-	const char *gui;
-
-	if (!osmo->user) return 0;
-
-	if (osmo->window_set) {
-		osmo->width = width;
-		osmo->height = height;
-		if (osmo->is_connected) gf_term_set_size(osmo->term, osmo->width, osmo->height);
-		return 1;
-	}
-	if (!os_wnd_handle) return 0;
-
-	osmo->width = width;
-	osmo->height = height;
-
-	osmo->user->os_window_handler = os_wnd_handle;
-	osmo->user->os_display = os_wnd_display;
-
-	/*Everything is now setup, create the terminal*/
-	fprintf(stdout, "Creating Osmozilla terminal\n");
-	osmo->term = gf_term_new(osmo->user);
-	if (!osmo->term) return 0;
-	fprintf(stdout, "Osmozilla terminal created\n");
-
-	gf_term_set_option(osmo->term, GF_OPT_ASPECT_RATIO, osmo->aspect_ratio);
-	osmo->window_set = 1;
-
-#ifdef XP_WIN
-	SetFocus((HWND)os_wnd_handle);
-#endif
-
-	/*stream not ready*/
-	if (!osmo->url || !osmo->auto_start) {
-		fprintf(stdout, "Osmozilla ready - not connecting to %s yet\n", osmo->url);
-		return 1;
-	}
-
-	/*connect from 0 and pause if not autoplay*/
-	gui = gf_cfg_get_key(osmo->user->config, "General", "StartupFile");
-	if (gui && osmo->use_gui) {
-		gf_cfg_set_key(osmo->user->config, "Temp", "BrowserMode", "yes");
-		gf_cfg_set_key(osmo->user->config, "Temp", "GUIStartupFile", osmo->url);
-		gf_term_connect(osmo->term, gui);
-	} else {
-		gf_term_connect(osmo->term, osmo->url);
-	}
-	fprintf(stdout, "Osmozilla connected to %s\n", osmo->url);
-	return 1;
-}
-
-char *Osmozilla_GetVersion()
-{
-	return (char *) "GPAC Plugin " GPAC_FULL_VERSION " for NPAPI compatible Web Browsers. For more information go to <a href=\"http://gpac.io\">GPAC website</a>";
-}
-
-void Osmozilla_ConnectTo(Osmozilla *osmo, const char *url)
-{
-	if (!osmo->user) return;
-
-	if ( osmo->url && !strcmp(url, osmo->url))
-		return;
-
-	fprintf(stdout, "Osmozilla connecting to %s\n", url);
-
-	if (osmo->url) gf_free(osmo->url);
-	osmo->url = gf_strdup(url);
-
-	/*connect from 0 and pause if not autoplay*/
-	if (osmo->auto_start) {
-		const char *gui = gf_cfg_get_key(osmo->user->config, "General", "StartupFile");
-		if (gui && osmo->use_gui) {
-			gf_cfg_set_key(osmo->user->config, "Temp", "BrowserMode", "yes");
-			gf_cfg_set_key(osmo->user->config, "Temp", "GUIStartupFile", url);
-			gf_term_connect(osmo->term, gui);
-		} else {
-			gf_term_connect(osmo->term, url);
-		}
-	}
-	fprintf(stdout, "Osmozilla connected to %s\n", url);
-}
-
-void Osmozilla_Pause(Osmozilla *osmo)
-{
-	if (osmo->term) {
-		if (gf_term_get_option(osmo->term, GF_OPT_PLAY_STATE) == GF_STATE_PAUSED) {
-			gf_term_set_option(osmo->term, GF_OPT_PLAY_STATE, GF_STATE_PLAYING);
-		} else {
-			gf_term_set_option(osmo->term, GF_OPT_PLAY_STATE, GF_STATE_PAUSED);
-		}
-	}
-}
-
-void Osmozilla_Play(Osmozilla *osmo)
-{
-	if (!osmo->is_connected) {
-		if (osmo->url) gf_term_connect(osmo->term, (const char *) osmo->url);
-	} else {
-		gf_term_set_option(osmo->term, GF_OPT_PLAY_STATE, GF_STATE_PLAYING);
-	}
-}
-
-void Osmozilla_Stop(Osmozilla *osmo)
-{
-	if (osmo->term) gf_term_disconnect(osmo->term);
-}
-
-#ifdef XP_WIN
-PBITMAPINFO CreateBitmapInfoStruct(GF_VideoSurface *pfb)
-{
-	PBITMAPINFO pbmi;
-	WORD    cClrBits;
-
-	cClrBits = 32;
-
-	pbmi = (PBITMAPINFO) LocalAlloc(LPTR,
-	                                sizeof(BITMAPINFOHEADER));
-
-	pbmi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER);
-	pbmi->bmiHeader.biWidth = pfb->width;
-	pbmi->bmiHeader.biHeight = 1;
-	pbmi->bmiHeader.biPlanes = 1;
-	pbmi->bmiHeader.biBitCount = cClrBits;
-
-	pbmi->bmiHeader.biCompression = BI_RGB;
-	pbmi->bmiHeader.biSizeImage = ((pbmi->bmiHeader.biWidth * cClrBits +31) & ~31) /8
-	                              * pbmi->bmiHeader.biHeight;
-	pbmi->bmiHeader.biClrImportant = 0;
-	return pbmi;
-}
-#endif
-
-void Osmozilla_Print(Osmozilla *osmo, unsigned int is_embed, void *os_print_dc, unsigned int target_x, unsigned int target_y, unsigned int target_width, unsigned int target_height)
-{
-	if (is_embed) {
-#ifdef XP_MACOS
-		/*
-		os_print_dc contains a THPrint reference on MacOS
-		*/
-	}
-#endif  // XP_MACOS
-#ifdef XP_UNIX
-	/*
-	os_print_dc contains a NPPrintCallbackStruct on Unix and
-	the plug-in location and size in the NPWindow are in page coordinates (720/ inch), but the printer requires point coordinates (72/inch)
-	*/
-#endif  // XP_UNIX
-#ifdef XP_WIN
-	/*
-	The coordinates for the window rectangle are in TWIPS format.
-	This means that you need to convert the x-y coordinates using the Windows API call DPtoLP when you output text
-	*/
-	GF_VideoSurface fb;
-	u32 xsrc, ysrc;
-	u16 src_16;
-	char *src;
-	float deltay;
-	int	ysuiv = 0;
-	char *ligne;
-	BITMAPINFO	*infoSrc;
-	HDC pDC = (HDC)os_print_dc;
-	/*lock the source buffer */
-	gf_term_get_screen_buffer(osmo->term, &fb);
-	infoSrc = CreateBitmapInfoStruct(&fb);
-	deltay = (float)target_height/(float)fb.height;
-	ligne = (char *) LocalAlloc(GMEM_FIXED, fb.width*4);
-	for (ysrc=0; ysrc<fb.height; ysrc++) {
-		int ycrt, delta;
-		char *dst = (char*)ligne;
-		src = fb.video_buffer + ysrc * fb.pitch_y;
-		for (xsrc=0; xsrc<fb.width; xsrc++)
-		{
-			switch (fb.pixel_format) {
-			case GF_PIXEL_RGB_32:
-			case GF_PIXEL_ARGB:
-				dst0 = src0;
-				dst1 = src1;
-				dst2 = src2;
-				src+=4;
-				break;
-			case GF_PIXEL_BGR_32:
-			case GF_PIXEL_RGBA:
-				dst0 = src3;
-				dst1 = src2;
-				dst2 = src1;
-				src+=4;
-				break;
-			case GF_PIXEL_RGB_24:
-				dst0 = src2;
-				dst1 = src1;
-				dst2 = src0;
-				src+=3;
-				break;
-			case GF_PIXEL_BGR_24:
-				dst0 = src2;
-				dst1 = src1;
-				dst2 = src0;
-				src+=3;
-				break;
-			case GF_PIXEL_RGB_565:
-				src_16 = * ( (u16 *)src );
-				dst2 = (src_16 >> 8) & 0xf8;
-				dst2 += dst2>>5;
-				dst1 = (src_16 >> 3) & 0xfc;
-				dst1 += dst1>>6;
-				dst0 = (src_16 << 3) & 0xf8;
-				dst0 += dst0>>5;
-				src+=2;
-				break;
-			case GF_PIXEL_RGB_555:
-				src_16 = * (u16 *)src;
-				dst2 = (src_16 >> 7) & 0xf8;
-				dst2 += dst2>>5;
-				dst1 = (src_16 >> 2) & 0xf8;
-				dst1 += dst1>>5;
-				dst0 = (src_16 << 3) & 0xf8;
-				dst0 += dst0>>5;
-				src+=2;
-				break;
-			}
-			dst += 4;
-		}
-		ycrt = ysuiv;
-		ysuiv = (u32) ( ((float)ysrc+1.0)*deltay);
-		delta = ysuiv-ycrt;
-		StretchDIBits(
-		    pDC, target_x, target_y, target_width,
-		    delta,
-		    0, 0, fb.width, 1,
-		    ligne, infoSrc, DIB_RGB_COLORS, SRCCOPY);
-	}
-
-	/*unlock GPAC frame buffer */
-	gf_term_release_screen_buffer(osmo->term, &fb);
-	/* gf_free temporary  objects */
-	GlobalFree(ligne);
-	LocalFree(infoSrc);
-#endif   // XP_WIN
-
-	return;
-}
-
-/*TODO - this is full print, present the print dialog and manage the print*/
-}
-
-void Osmozilla_Update(Osmozilla *osmo, const char *type, const char *commands)
-{
-	if (osmo->term) {
-		GF_Err e = gf_term_scene_update(osmo->term, (char *) type, (char *) commands);
-		if (e) {
-			char szMsg1024;
-			sprintf((char *)szMsg, "GPAC: Error applying update (%s)", gf_error_to_string(e) );
-			Osmozilla_SetStatus(osmo->np_instance, szMsg);
-		}
-	}
-}
-
-void Osmozilla_QualitySwitch(Osmozilla *osmo, int switch_up)
-{
-	if (osmo->term)
-		gf_term_switch_quality(osmo->term, switch_up ? GF_TRUE : GF_FALSE);
-}
-
-void Osmozilla_SetURL(Osmozilla *osmo, const char *url)
-{
-	if (osmo->term) {
-		if (osmo->url) gf_free(osmo->url);
-		osmo->url = gf_strdup(url);
-		gf_term_connect(osmo->term, osmo->url);
-	}
-}
-
-int Osmozilla_GetDownloadProgress(Osmozilla *osmo)
-{
-	if (osmo->term)
-		return osmo->download_progress;
-	return 0;
-}

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/osmozilla/osmozilla.def Deleted

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/osmozilla/osmozilla.h Deleted

@@ -1,75 +0,0 @@
-/*
-*			GPAC - Multimedia Framework C SDK
-*
- *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2012
-*					All rights reserved
-*
-*  This file is part of GPAC / Osmozilla NPAPI plugin
-*
-*  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.
-*
-*/
-
-#ifndef __OSMOZILLA_H__
-#define __OSMOZILLA_H__
-
-
-/*DO NOT INCLUDE ANY GPAC FILE IN THIS HEADER, IT CAUSES TYPE REDEFINITION CONFLICT ON OSX*/
-typedef struct _tag_terminal GF_Terminal;
-typedef struct _tag_user GF_User;
-
-#include <stdio.h>
-
-
-typedef struct _NPP *NPP;
-
-typedef struct __tag_osmozilla
-{
-	/*plugiun & window info*/
-	NPP np_instance;
-	int window_set;
-	unsigned int height, width;
-
-	int supports_xembed;
-	/*GPAC term*/
-	GF_User *user;
-	GF_Terminal *term;
-
-	/*general options*/
-	unsigned int loop, auto_start, is_connected, use_3d, disable_mime;
-	unsigned int aspect_ratio;
-
-	/*the URL we are connected to*/
-	char *url;
-	/*timing info of current url*/
-	double duration;
-	char can_seek;
-	int use_gui;
-	int download_progress;
-
-	/*log file if any*/
-	FILE *logs;
-
-#ifdef GECKO_XPCOM
-	void *scriptable_peer;
-#else
-	struct NPObject *script_obj;
-#endif
-
-} Osmozilla;
-
-
-#endif // __OSMOZILLA_H__

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/osmozilla/osmozilla.png Deleted

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/osmozilla/osmozilla.rc Deleted

@@ -1,128 +0,0 @@
-//Microsoft Developer Studio generated resource script.
-//
-#include "resource.h"
-
-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
-#include "winresrc.h"
-
-/*do not include setup.h*/
-#define _GF_SETUP_H_
-#include <gpac/tools.h>
-
-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
-
-/////////////////////////////////////////////////////////////////////////////
-// Neutral resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_NEU)
-#ifdef _WIN32
-LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
-#pragma code_page(1252)
-#endif //_WIN32
-
-#ifndef _MAC
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,0,1,0
- PRODUCTVERSION 1,0,1,0
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x40004L
- FILETYPE 0x2L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904e4"
-        BEGIN
-            VALUE "Comments", "\0"
-            VALUE "CompanyName", " \0"
-            VALUE "FileDescription", "Osmozilla allows playback of many media and rich media files. For more information, visit <a href=""http://gpac.io"">gpac.io</a>\0"
-            VALUE "FileExtents", "*|aac|wrl,wrl.gz|x3dv,x3dv.gz,x3dvz|x3d,x3d.gz,x3dz|svg,svg.gz,svgz|mpg,mpeg,mp2,mpa,mpe,mpv2|asf,wma,wmv,asx,asr|avi|mp4,mpg4|mp4|m4a|3gp,3gpp|3gp,3gpp|3g2,3gp2|3g2,3gp2|mp2,mp3,mpga,mpega|ogg|sdp\0"
-            VALUE "FileOpenName", "GPAC Plugin|AAC Music|VRML World|X3D/VRML World|X3D/XML World|SVG Document|MPEG Video|WindowsMedia Movies|AVI Movies|MPEG-4 Videos|MPEG-4 Movies|MPEG-4 Music|3GPP Movies|3GPP Music|3GPP2 Movies|3GPP2 Music|MP3 Music|OGG Movies|SDP Session\0"
-            VALUE "FileVersion", GPAC_VERSION"-rev"GPAC_GIT_REVISION"\0"
-            VALUE "InternalName", "nposmozilla\0"
-            VALUE "LegalCopyright", "Copyright � Telecom ParisTech 2005-2007\0"
-            VALUE "LegalTrademarks", "\0"
-            VALUE "MIMEType", "application/x-gpac|audio/aac|model/vrml|model/x3d+vrml|model/x3d+xml|image/svg+xml|video/mpeg|video/x-ms-asf|video/avi|video/mp4|application/mp4|audio/mp4|video/3gpp|audio/3gpp|video/3gpp2|audio/3gpp2|audio/mpeg|application/ogg|application/sdp\0"
-            VALUE "OriginalFilename", "nposmozilla.dll\0"
-            VALUE "PrivateBuild", "\0"
-            VALUE "ProductName", "Osmozilla - GPAC Plugin for Mozilla\0"
-            VALUE "ProductVersion", GPAC_VERSION"-rev"GPAC_GIT_REVISION"\0"
-            VALUE "SpecialBuild", "\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1252
-    END
-END
-
-#endif    // !_MAC
-
-#endif    // Neutral resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-/////////////////////////////////////////////////////////////////////////////
-// English (U.S.) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-#ifdef _WIN32
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-#pragma code_page(1252)
-#endif //_WIN32
-
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE DISCARDABLE 
-BEGIN
-    "resource.h\0"
-END
-
-2 TEXTINCLUDE DISCARDABLE 
-BEGIN
-    "#include ""winresrc.h""\r\n"
-    "\0"
-END
-
-3 TEXTINCLUDE DISCARDABLE 
-BEGIN
-    "\r\n"
-    "\0"
-END
-
-#endif    // APSTUDIO_INVOKED
-
-#endif    // English (U.S.) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-
-#ifndef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 3 resource.
-//
-
-
-/////////////////////////////////////////////////////////////////////////////
-#endif    // not APSTUDIO_INVOKED
-

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/osmozilla/osmozilla.vcxproj Deleted

@@ -1,304 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="14.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>{A0288B75-0D95-4106-A3A7-779A891E8FEF}</ProjectGuid>
-    <RootNamespace>osmozilla</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </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>
-  <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>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <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>
-    <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>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">nposmozilla</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">nposmozilla</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">nposmozilla</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">nposmozilla</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\obj/osmozilla_deb/osmozilla.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\extra_lib\include\xulrunner-sdk\include;..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;XP_WIN32;XP_WIN;_X86_;_WINDOWS;_USRDLL;NPBASIC_EXPORTS;MOZILLA_STRICT_API;XPCOM_GLUE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeaderOutputFile>.\obj/osmozilla_deb/osmozilla.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
-      <BrowseInformation>true</BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-      <CallingConvention>Cdecl</CallingConvention>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>advapi32.lib;user32.lib;gdi32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>..\..\applications\osmozilla\osmozilla.def</ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>.\obj/osmozilla_deb/nposmozilla.lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>.\obj/osmozilla_deb/osmozilla.bsc</OutputFile>
-    </Bscmake>
-    <PostBuildEvent>
-      <Command>copy ..\..\applications\osmozilla\nsIOsmozilla.xpt_w32 ..\..\bin\$(Platform)\$(Configuration)\nposmozilla.xpt</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TypeLibraryName>.\obj/osmozilla_deb/osmozilla.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\extra_lib\include\xulrunner-sdk\include;..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;XP_WIN32;XP_WIN;_X86_;_WINDOWS;_USRDLL;NPBASIC_EXPORTS;MOZILLA_STRICT_API;XPCOM_GLUE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeaderOutputFile>.\obj/osmozilla_deb/osmozilla.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
-      <BrowseInformation>true</BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CallingConvention>Cdecl</CallingConvention>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>advapi32.lib;user32.lib;gdi32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>..\..\applications\osmozilla\osmozilla.def</ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>.\obj/osmozilla_deb/nposmozilla.lib</ImportLibrary>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>.\obj/osmozilla_deb/osmozilla.bsc</OutputFile>
-    </Bscmake>
-    <PostBuildEvent>
-      <Command>copy ..\..\applications\osmozilla\nsIOsmozilla.xpt_w32 ..\..\bin\$(Platform)\$(Configuration)\nposmozilla.xpt</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\obj/osmozilla_rel/osmozilla.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\extra_lib\include\xulrunner-sdk\include;..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;NPBASIC_EXPORTS;MOZILLA_STRICT_API;XP_WIN;_X86_;XPCOM_GLUE;WINVER=0x0400;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>.\obj/osmozilla_rel/osmozilla.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\obj/osmozilla_rel/</AssemblerListingLocation>
-      <ObjectFileName>.\obj/osmozilla_rel/</ObjectFileName>
-      <ProgramDataBaseFileName>.\obj/osmozilla_rel/</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>advapi32.lib;user32.lib;gdi32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>..\..\applications\osmozilla\osmozilla.def</ModuleDefinitionFile>
-      <ProgramDatabaseFile>.\obj/osmozilla_rel/nposmozilla.pdb</ProgramDatabaseFile>
-      <ImportLibrary>.\obj/osmozilla_rel/nposmozilla.lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-    <PostBuildEvent>
-      <Command>copy ..\..\applications\osmozilla\nsIOsmozilla.xpt_w32 ..\..\bin\$(Platform)\$(Configuration)\nposmozilla.xpt</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TypeLibraryName>.\obj/osmozilla_rel/osmozilla.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <InlineFunctionExpansion>Default</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\extra_lib\include\xulrunner-sdk\include;..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;NPBASIC_EXPORTS;MOZILLA_STRICT_API;XP_WIN;_WIN64;XPCOM_GLUE;WINVER=0x0400;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>.\obj/osmozilla_rel/osmozilla.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\obj/osmozilla_rel/</AssemblerListingLocation>
-      <ObjectFileName>.\obj/osmozilla_rel/</ObjectFileName>
-      <ProgramDataBaseFileName>.\obj/osmozilla_rel/</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>advapi32.lib;user32.lib;gdi32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>..\..\applications\osmozilla\osmozilla.def</ModuleDefinitionFile>
-      <ProgramDatabaseFile>.\obj/osmozilla_rel/nposmozilla.pdb</ProgramDatabaseFile>
-      <ImportLibrary>.\obj/osmozilla_rel/nposmozilla.lib</ImportLibrary>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-    <PostBuildEvent>
-      <Command>copy ..\..\applications\osmozilla\nsIOsmozilla.xpt_w32 ..\..\bin\$(Platform)\$(Configuration)\nposmozilla.xpt</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\applications\osmozilla\osmo_npapi.cpp" />
-    <ClCompile Include="..\..\applications\osmozilla\osmozilla.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="..\..\applications\osmozilla\osmozilla.rc">
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\applications\osmozilla\nsIOsmozilla.h" />
-    <ClInclude Include="..\..\applications\osmozilla\osmo_npapi.h" />
-    <ClInclude Include="..\..\applications\osmozilla\osmozilla.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="libgpac_dll.vcxproj">
-      <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/osmozilla/readme.txt Deleted

gpac-2.2.1.tar.gz/applications/deprecated/old_arch/osmozilla/resource.h Deleted

gpac-2.2.1.tar.gz/applications/deprecated/osmo4_android_studio Deleted

gpac-2.2.1.tar.gz/applications/deprecated/osmo4_android_studio/.gitignore Deleted

gpac-2.2.1.tar.gz/applications/deprecated/osmo4_android_studio/Readme.md Deleted

gpac-2.2.1.tar.gz/applications/deprecated/osmo4_android_studio/app Deleted

gpac-2.2.1.tar.gz/applications/deprecated/osmo4_android_studio/app/build.gradle Deleted

@@ -1,36 +0,0 @@
-apply plugin: 'com.android.application'
-import org.apache.tools.ant.taskdefs.condition.Os
-
-android {
-    compileSdkVersion 23
-    buildToolsVersion "25.0.2"
-
-    defaultConfig {
-        applicationId "com.gpac.Osmo4"
-        minSdkVersion 16
-        targetSdkVersion 22
-    }
-
-    sourceSets.main {
-        jni.srcDirs =  // This prevents the auto generation of Android.mk
-        jniLibs.srcDir 'src/main/libs' // This is not necessary unless you have precompiled libraries in your project.
-    }
-
-
-
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
-        }
-    }
-}
-
-dependencies {
-    compile files('libs/real3d.jar')
-    compile 'com.android.support:recyclerview-v7:23.1.1'
-    compile 'com.android.support:cardview-v7:23.1.1'
-    compile 'com.android.support:appcompat-v7:23.1.1'
-    compile 'com.android.support:design:23.1.1'
-
-}

gpac-2.2.1.tar.gz/applications/deprecated/osmo4_android_studio/app/src Deleted

gpac-2.2.1.tar.gz/applications/deprecated/osmo4_android_studio/app/src/main Deleted

gpac-2.2.1.tar.gz/applications/deprecated/osmo4_android_studio/app/src/main/AndroidManifest.xml Deleted

@@ -1,155 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.gpac.Osmo4"
-    android:versionCode="1"
-    android:versionName="1.0">
-
-    <uses-permission android:name="android.permission.WAKE_LOCK" />
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.CAMERA" />
-    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
-    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
-
-    <uses-feature
-        android:name="lge.hardware.real3d.barrier.landscape"
-        android:required="false" />
-
-    <uses-feature
-        android:name="android.hardware.camera"
-        android:required="false" />
-    <uses-feature
-        android:name="android.hardware.camera.autofocus"
-        android:required="false" />
-    <uses-feature
-        android:name="android.hardware.sensor.gyroscope"
-        android:required="false" />
-    <uses-feature
-        android:name="android.hardware.sensor.accelerometer"
-        android:required="false" />
-    <uses-feature
-        android:glEsVersion="0x00020000"
-        android:required="true" />
-
-    <application
-        android:icon="@drawable/icon"
-        android:label="@string/app_name">
-        <uses-library
-            android:name="com.lge.real3d"
-            android:required="false" />
-
-        <activity
-            android:name=".Osmo4"
-            android:configChanges="orientation|screenSize"
-            android:label="@string/app_name">
-
-            android:theme="@android:style/Theme.AppCompat">
-            <intent-filter>
-
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-
-            </intent-filter>
-            <intent-filter android:label="View in Osmo">
-                <action android:name="android.intent.action.VIEW" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-
-                <data
-                    android:mimeType="audio/*"
-                    android:scheme="http" />
-
-                <data android:mimeType="audio/*" />
-
-                <data
-                    android:mimeType="video/*"
-                    android:scheme="http" />
-
-                <data android:mimeType="video/*" />
-
-                <data
-                    android:mimeType="x-subtitle/*"
-                    android:scheme="http" />
-
-                <data android:mimeType="x-subtitle/*" />
-
-                <data
-                    android:mimeType="application/x-mpegurl"
-                    android:scheme="http" />
-
-                <data android:mimeType="application/x-mpegurl" />
-
-                <data android:scheme="udp" />
-
-                <data android:scheme="rtsp" />
-
-                <data
-                    android:mimeType="application/vnd.apple.mpegurl"
-                    android:scheme="http" />
-
-                <data android:mimeType="application/vnd.apple.mpegurl" />
-
-                <data
-                    android:mimeType="application/x-isomedia"
-                    android:scheme="http" />
-
-                <data android:mimeType="application/x-isomedia" />
-
-                <data
-                    android:mimeType="application/mp4"
-                    android:scheme="http" />
-
-                <data android:mimeType="application/mp4" />
-
-                <data
-                    android:mimeType="application/sdp"
-                    android:scheme="http" />
-
-                <data android:mimeType="application/sdp" />
-
-                <data
-                    android:mimeType="application/x-bt"
-                    android:scheme="http" />
-
-                <data android:mimeType="application/x-bt" />
-
-                <data
-                    android:mimeType="application/x-xmt"
-                    android:scheme="http" />
-
-                <data
-                    android:mimeType="application/dash+xml"
-                    android:scheme="http" />
-
-                <data android:mimeType="application/x-xmt" />
-
-                <data
-                    android:pathPattern="*.mp4"
-                    android:scheme="file"
-                    />
-            </intent-filter>
-        </activity>
-        <activity
-            android:name=".extra.FileChooserActivity"
-            android:configChanges="orientation|screenSize"
-            android:label="@string/app_name"
-            android:permission="android.permission.WRITE_EXTERNAL_STORAGE">
-            <intent-filter android:priority="1">
-
-                <action android:name="org.openintents.action.PICK_FILE" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <data android:scheme="file" />
-
-            </intent-filter>
-        </activity>
-
-        <activity android:name=".extra.ConfigFileEditorActivity"
-            android:label="@string/configFileEditor"/>
-
-        <activity
-            android:name=".extra.PrefsActivity"
-            android:label="@string/preferences"/>
-
-    </application>
-
-</manifest>

gpac-2.2.1.tar.gz/applications/deprecated/osmo4_android_studio/app/src/main/assets Deleted

gpac-2.2.1.tar.gz/applications/deprecated/osmo4_android_studio/app/src/main/assets/configuration.xml Deleted

@@ -1,171 +0,0 @@
-
-<configuration>
-	<section name="General">
-		<key name="ModulesDirectory" type="path" default="" usage="basic">
-			Specifies the path to modules directory. The MPEG-4 Systems engine cannot be loaded without modules. This option is used by GPAC clients on all platforms. 
-		</key>
-		<key name="CacheDirectory" type="path" default="" usage="basic">
-			Specifies location of temp files. The user must have write access to this location. Although not used by applications, this is used by several modules. 
-		</key>
-		<key name="StartupFile" type="path" default="" usage="basic">
-			Specifies file to load upon startup of most clients (Osmo4/MP4Client). If not specified, no file is loaded. 
-		</key>
-		<key name="LogFile" type="path" default="stdout" usage="basic">
-			Specifies where to output GPAC's log. By default, the logs are written to stdout. Note that GPAC may be compiled without log support. This is not used by MP4Client. 
-		</key>
-		<key name="Logs" type="string" default="error@all" usage="basic">
-			Specifies log level for each tool, with the following syntax: <br></br>
-			tool:tool@level:tool:tool@level<br></br>
-			By default, only errors are logged.<br></br>
-			Available levels are: 
-			<ul>
-			<li><i>quiet</i> : no logging is performed on the tool</li>
-			<li><i>error</i> : only errors are logged</li>
-			<li><i>warning</i> : warnings are also logged.</li>
-			<li><i>info</i> : information messages are also logged</li>
-			<li><i>debug</i> : debug messages are also logged</li>
-			</ul>
-			Available tools are:
-			<ul>
-			<li><i>core</i> : libgpac core</li>
-			<li><i>coding</i> : bitstream formats (audio, video, scene)</li>
-			<li><i>container</i> : container formats (ISO File, MPEG-2 TS, AVI, ...)</li>
-			<li><i>network</i> : network data except RTP trafic</li>
-			<li><i>rtp</i> : rtp, rtcp and rtsp trafic</li>
-			<li><i>author</i> : authoring tools (hint, import, export)</li>
-			<li><i>sync</i> : terminal sync layer</li>
-			<li><i>codec</i> : terminal codec messages</li>
-			<li><i>parser</i> : scene parsers (svg, xmt, bt) and other</li>
-			<li><i>media</i> : terminal media object management</li>
-			<li><i>scene</i> : scene graph and scene manager</li>
-			<li><i>script</i> : scripting engine messages</li>
-			<li><i>interact</i> : user interaction messages</li>
-			<li><i>compose</i> : composition engine (events, etc)</li>
-			<li><i>cache</i> : HTTP cache</li>
-			<li><i>mmio</i> : Audio/Video HW I/O management</li>
-			<li><i>rti</i> : Run-time info (CPU, mem, ...)</li>
-			<li><i>smil</i> : SMIL timing and animation</li>
-			<li><i>memory</i> : GPAC memory tracker</li>
-			<li><i>audio</i> : Audio renderer and mixers</li>
-			<li><i>module</i> : used by some modules</li>
-			<li><i>mutex</i> : mutex information</li>
-			<li><i>console</i> : console messages, such as script alert() and error notifications</li>
-			</ul>
-		</key>
-		<key name="Loop" type="boolean" default="no" usage="basic">
-			Specifies whether the presentation has to be restarted when done playing. 
-		</key>
-		<key name="ConsoleOff" type="boolean" default="no" usage="basic">
-			Specifies whether application messages (script, buffering, download progress) are displayed in the console or not. 
-		</key>
-		<key name="SingleInstance" type="boolean" default="no" usage="basic">
-			Specifies if the player should be a single instance application or not (Osmo4-Win32 only). 
-		</key>
-		<key name="LookForSubtitles" type="boolean" default="no" usage="basic">
-			Specifies if Osmo4 shall look for subtitle files when opening a presentation. 
-		</key>
-		<key name="ViewXMT" type="boolean" default="no" usage="basic">
-			Specifies if scene dumping shall be done in XML (XMT, X3D) or in VRML-like syntax (BT, WRL). 
-		</key>
-		<key name="ConfigPanel" type="uint" default="0" usage="basic">
-			Specifies the latest config panel selected by user. 
-		</key>
-		<key name="NoMIMETypeFetch" type="boolean" default="no" usage="basic">
-			Specifies if the player has to check for mime type when following hyperlinks, or only follow links of known extensions. 
-		</key>
-		<key name="PLEntry" type="uint" default="1" usage="basic">
-			Indicates active playlist entry when player was last closed. Playlist backup is: 
-			<ul>
-				<li>"gpac_pl.m3u" on win32 platforms, stored in same directory as application</li>
-				<li>".gpac_pl.m3u" on other platforms, stored in user home directory</li>
-			</ul>
-		</key>
-		<key name="FillScreen" type="boolean" default="no" usage="basic">
-			Specifies if the display area shall fill all available space on screen. WindowsMobile/Symbian only 
-		</key>
-		<key name="DisableBackLight" type="boolean" default="no" usage="basic">
-			Specifies if the screen backlighting shall be disabled while playing. WindowsMobile/Symbian only 
-		</key>
-		<key name="LastWorkingDir" type="path" default="" usage="basic">
-			Specifies the directory of the last local file opened. Smartphone Windows only 
-		</key>
-		<key name="Browser" type="string" default="" usage="basic">
-			Specifies prefered browser for WWW anchors and scene graph viewing - Only used by Osmo4/wxWidgets.
-		</key>
-	</section>
-	<section name="RecentFiles">
-		The "RecentFiles" section of the config file holds last accessed files (hardcoded to no more than 20) in the last access order. The keys are the file names and no value is used. This section is only used by GUI clients (osmo4/wxOsmo4) 
-	</section>
-	<section name="Systems">
-		<key name="LanguageName" type="string" default="" usage="basic">
-			Specifies the user prefered language in readable english. This is used to select streams in case of alternate content in an audio object. 
-		</key>
-		<key name="Language3CC" type="string" default="" usage="basic">
-			Specifies the user prefered language as expressed in ISO 639-2. This is used to select streams in case of alternate content in an audio object. 
-		</key>
-		<key name="Language2CC" type="string" default="" usage="basic">
-			Specifies the user prefered language as expressed in ISO 639-1. This is used to select streams in case of alternate content in an audio object. 
-		</key>		
-		<key name="DrawLateFrames" type="" default="yes" usage="basic">
-			If set, late frames will still be drawn. If not set, the late frames are droped (or executed for systems decoders) until the decoder output is back in sync. This is by default on to keep better testing heavy content or slow renderers, but should be set to off when needing a better sync or monitoring skipped frames. 
-		</key>
-		<key name="ForceSingleClock" type="" default="no" usage="basic">
-			One big problem with MP4 files is that the notion of "duration" has been unclear for a long time, and most content available (audio-video files) specify a wrong BIFS duration. In such a case the movie cannot be controled/seeked into. Another problem with ISMA streaming is that BIFS/OD don't use the same clock as audio/video, thus seeking the main timeline does not seek AV media. Setting the ForceSingleClock will handle both cases by using a single timeline for all media streams and setting the duration to the one of the longest stream
-		</key>
-		<key name="ThreadingPolicy" type="enum('Free', 'Single', 'Multi')" default="Free" usage="basic">
-			Specifies how media decoders are to be threaded. "Free" lets decoders decide of their threading, "Single" means that all decoders are managed in a single thread performing scheduling and priority handling and "Multi" means that each decoder runs in its own thread. 
-		</key>
-		<key name="Priority" type="enum('low','normal','high','real-time')" default="normal" usage="basic">
-			Specifies the priority of the decoders (priority is applied to decoder thread(s) regardless of threading mode). 
-		</key>
-		<key name="TimeSlice" type="uint" default="0" usage="basic">
-			Specifies the target maximum time (in ms) of one cycle of the media manager (the media manager will attempts to call all the active decoders within this time. Depending on the threading mode this option can be ignored.
-		</key>
-		<key name="ModuleUnload" type="boolean" default="yes" usage="basic">
-			Specifies whether modules should be unloaded if not used or not. Default: "yes". 
-		</key>
-		<key name="ResyncLateClock" type="uint" default="0" usage="basic">
-			Specifies the threshold after which late clocks are resynchronized to timestamps for OCR streams. By default, no threashold (0) is used and clocks are never resynchronized. This allows to resync clocks to the media owning the clock when the decoding is really too slow, and should only be used for debugging purposes. 
-		</key>
-		<key name="NoVisualThread" type="boolean" default="no" usage="basic">
-			Specifies whether the visual rendering is done in the main codec manager or in a dedicated thread. 
-		</key>
-		<key name="DefAudioDec" type="string" default="" usage="basic">
-			Specifies which module to use by default for audio decoding. The string is the name of the module to be used (same considerations as other modules, cf introduction). 
-		</key>
-		<key name="DefVideoDec" type="string" default="" usage="basic">
-			Specifies which module to use by default for video decoding. The string is the name of the module to be used (same considerations as other modules, cf introduction). 
-		</key>
-		<key name="DefImageDec" type="string" default="" usage="basic">
-			Specifies which module to use by default for image decoding. The string is the name of the module to be used (same considerations as other modules, cf introduction). 
-		</key>
-		<key name="codec_*" type="string" default="" usage="basic">
-			Allows to specify default media module (audio/video) per stream type and object type. This is useful if you have more than one decoder for a given type (ex, XviD and FFMPEG for MPEG-4 visual SP). The syntax is:<br></br>
-			codec_AA_BB=modulename<br></br>
-			where AA is the hexadecimal MPEG-4 streamType value for the codec (04=visual, 05=audio) and BB is the hexadecimal MPEG-4 objectTypeIndication of the media (0x20 = MPEG-4 video, 0x40=MPEG-4 Audio, ...). The string is the name of the module to be used (same considerations as other modules, cf introduction). 
-		</key>
- 	</section>
-	<section name="Network">
-		<key name="BufferLength" type="uint" default="3000" usage="basic">
-			Specifies the length of the decoding buffer in milliseconds. The client will wait for the buffer to be filled before starting decoding. A module may decide to use a different value based on protocol and network jitters.
-		</key>
- 	</section>
-	<section name="DASH">
-		<key name="LowLatency" type="enum('always', 'chunk', 'no')" default="no" usage="basic">
-			Sets low-latency mode enabled. In low-latency mode, media data is parsed as soon as possible while segment is being downloaded. Default is no. If chunk is selected, media data is re-parsed at each HTTP 1.1 chunk end. If always is selected, media data is re-parsed as soon as HTTP data is received.
-		</key>
- 	</section>
-</configuration>

gpac-2.2.1.tar.gz/applications/deprecated/osmo4_android_studio/app/src/main/java Deleted

gpac-2.2.1.tar.gz/applications/deprecated/osmo4_android_studio/app/src/main/java/com Deleted

gpac-2.2.1.tar.gz/applications/deprecated/osmo4_android_studio/app/src/main/java/com/gpac Deleted

gpac-2.2.1.tar.gz/applications/deprecated/osmo4_android_studio/app/src/main/java/com/gpac/Osmo4 Deleted

gpac-2.2.1.tar.gz/applications/deprecated/osmo4_android_studio/app/src/main/java/com/gpac/Osmo4/BitmapView.java Deleted

@@ -1,93 +0,0 @@
-///**
-// *  Osmo on Android
-// *  Aug/2010
-// *  NGO Van Luyen
-// *
-// *
-// */
-//package com.gpac.Osmo4;
-//
-//import android.content.Context;
-//import android.graphics.Bitmap;
-//import android.graphics.Canvas;
-//import android.util.Log;
-//import android.view.View;
-//
-///**
-// * 
-// * @version $Revision$
-// * 
-// */
-//@Deprecated
-//public class BitmapView extends View {
-//
-//    private Bitmap m_Bitmap = null;
-//
-//    private int m_width = 100, m_height = 100;
-//
-//    private final static String LOG_BITMAP = BitmapView.class.getSimpleName();
-//
-//    /**
-//     * Constructor
-//     * 
-//     * @param context The current view's context
-//     */
-//    public BitmapView(Context context) {
-//        super(context);
-//    }
-//
-//    @Override
-//    protected void onDraw(Canvas canvas) {
-//        // canvas.drawColor(0xFFCCCCCC);
-//        m_width = canvas.getWidth();
-//        m_height = canvas.getHeight();
-//        if (m_Bitmap == null) {
-//            if (m_width < 1)
-//                m_width = 100;
-//            if (m_height < 1)
-//                m_height = 100;
-//            m_Bitmap = Bitmap.createBitmap(m_width, m_height, Bitmap.Config.ARGB_8888);
-//            gpacinit();
-//        }
-//
-//        GpacObject.gpacrender(m_Bitmap);
-//        canvas.drawBitmap(m_Bitmap, 0, 0, null);
-//        // force a redraw, with a different time-based pattern.
-//        invalidate();
-//
-//    }
-//
-//    /**
-//     * Called to init all GPAC resources
-//     */
-//    private void gpacinit() {
-//        Log.i(LOG_BITMAP, "Going to gpacinit"); //$NON-NLS-1$
-//        if (m_Bitmap != null) {
-//            Log.e(LOG_BITMAP, "m_Bitmap != null"); //$NON-NLS-1$
-//            if (m_width < 1)
-//                m_width = 100;
-//            if (m_height < 1)
-//                m_height = 100;
-//            GpacObject.gpacinit(m_Bitmap,
-//                                null,
-//                                m_width,
-//                                m_height,
-//                                Osmo4Renderer.GPAC_CFG_DIR,
-//                                Osmo4Renderer.GPAC_MODULES_DIR,
-//                                Osmo4Renderer.GPAC_CACHE_DIR,
-//                                Osmo4Renderer.GPAC_FONT_DIR,
-//                                null);
-//            // GpacObject.gpacconnect("/data/osmo/bifs-2D-interactivity-stringsensor.mp4");
-//            GpacObject.gpacresize(m_width, m_height);
-//        }
-//    }
-//
-//    /**
-//     * Called to free all GPAC resources
-//     */
-//    public void gpacfree() {
-//        Log.e(LOG_BITMAP, "gpacfree()"); //$NON-NLS-1$
-//        GpacObject.gpacdisconnect();
-//        GpacObject.gpacfree();
-//    }
-// }

gpac-2.2.1.tar.gz/applications/deprecated/osmo4_android_studio/app/src/main/java/com/gpac/Osmo4/GPACInstance.java Deleted

@@ -1,424 +0,0 @@
-/**
- * $URL$
- *
- * $LastChangedBy$ - $LastChangedDate$
- */
-package com.gpac.Osmo4;
-
-import java.io.File;
-import java.io.PrintStream;
-import java.util.Collections;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-import android.util.Log;
-import android.view.KeyEvent;
-import android.view.MotionEvent;
-
-/**
- * @version $Revision$
- *
- */
-public class GPACInstance implements GPACInstanceInterface {
-
-    private final static String LOG_LIB = "LibrariesLoader"; //$NON-NLS-1$
-
-    private final Thread uniqueThread;
-
-    /**
-     *
-     * a recursive method to get the directory hierarchy under root.
-     *
-     * @param sb StringBuilder object which will return the final hierarchy
-     * @param root root of the hierarchy
-     * @param inc initial number of spaces.
-     */
-    private static void listing(StringBuilder sb, File root, int inc) {
-        StringBuilder increment = new StringBuilder();
-        for (int i = 0; i < inc; i++)
-            increment.append(' ');
-        String incr = increment.toString();
-        for (File f : root.listFiles()) {
-            sb.append(incr).append(f.getName());
-            if (f.isDirectory()) {
-                sb.append(" Directory\n"); //$NON-NLS-1$
-                listing(sb, f, inc + 2);
-            } else {
-                sb.append(" ").append(f.length() + " bytes\n"); //$NON-NLS-1$//$NON-NLS-2$
-            }
-        }
-    }
-
-    /**
-     * Loads all libraries
-     *
-     * @param config
-     *
-     * @return a map of exceptions containing the library as key and the exception as value. If map is empty, no error
-     *
-     */
-
-
-    synchronized static Map<String, Throwable> loadAllLibraries(GpacConfig config) {
-        if (errors != null)
-            return errors;
-        StringBuilder sb = new StringBuilder();
-        final String toLoad = { "GLESv2", "log",
-                                 "jpegdroid", "javaenv",
-                                 "mad", "ft2", "faad",
-                                 "openjpeg", "png", "z",
-                                 "avutil", "swscale", "swresample", "avcodec", "avformat", "avfilter", "avdevice",
-                                 "gpacWrapper", "gpac",
-                                 "gm_droid_mpegv" };
-        HashMap<String, Throwable> exceptions = new HashMap<String, Throwable>();
-        for (String s : toLoad) {
-            try {
-                String msg = "Loading library " + s + "...";//$NON-NLS-1$//$NON-NLS-2$
-                sb.append(msg);
-                Log.i(LOG_LIB, msg);
-                System.loadLibrary(s);
-            } catch (UnsatisfiedLinkError e) {
-                sb.append("Failed to load " + s + ", error=" + e.getLocalizedMessage() + " :: " //$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$
-                          + e.getClass().getSimpleName() + "\n"); //$NON-NLS-1$
-                exceptions.put(s, e);
-                Log.e(LOG_LIB, "Failed to load library : " + s + " due to link error " + e.getLocalizedMessage(), e); //$NON-NLS-1$ //$NON-NLS-2$
-            } catch (SecurityException e) {
-                exceptions.put(s, e);
-                Log.e(LOG_LIB, "Failed to load library : " + s + " due to security error " + e.getLocalizedMessage(), e); //$NON-NLS-1$ //$NON-NLS-2$
-            } catch (Throwable e) {
-                exceptions.put(s, e);
-                Log.e(LOG_LIB, "Failed to load library : " + s + " due to Runtime error " + e.getLocalizedMessage(), e); //$NON-NLS-1$ //$NON-NLS-2$
-            }
-        }
-
-        if (!exceptions.isEmpty()) {
-            try {
-                PrintStream out = new PrintStream(config.getGpacLogDirectory() + "debug_libs.txt", "UTF-8"); //$NON-NLS-1$//$NON-NLS-2$
-                out.println("$Revision$"); //$NON-NLS-1$
-                out.println(new Date());
-                out.println("\n*** Configuration\n"); //$NON-NLS-1$
-                out.println(config.getConfigAsText());
-                sb.append("*** Libs listing: "); //$NON-NLS-1$
-                sb.append(config.getGpacLibsDirectory());
-                sb.append('\n');
-                listing(sb, new File(config.getGpacLibsDirectory()), 2);
-                sb.append("*** Modules listing: "); //$NON-NLS-1$
-                sb.append(config.getGpacModulesDirectory());
-                sb.append('\n');
-                listing(sb, new File(config.getGpacModulesDirectory()), 2);
-                sb.append("*** Fonts listing: \n"); //$NON-NLS-1$
-                sb.append(config.getGpacFontDirectory());
-                sb.append('\n');
-                listing(sb, new File(config.getGpacFontDirectory()), 2);
-                sb.append("*** Exceptions:\n"); //$NON-NLS-1$
-                for (Map.Entry<String, Throwable> ex : exceptions.entrySet()) {
-                    sb.append(ex.getKey()).append(": ") //$NON-NLS-1$
-                      .append(ex.getValue().getLocalizedMessage())
-                      .append('(')
-                      .append(ex.getValue().getClass())
-                      .append(")\n"); //$NON-NLS-1$
-                }
-                out.println(sb.toString());
-                out.flush();
-                out.close();
-            } catch (Exception e) {
-                Log.e(LOG_LIB, "Failed to output debug info to debug file", e); //$NON-NLS-1$
-            }
-        }
-        errors = Collections.unmodifiableMap(exceptions);
-        return errors;
-    }
-
-    private static Map<String, Throwable> errors = null;
-
-    private boolean hasToBeFreed = true;
-
-    /**
-     * Constructor
-     *
-     * @param callback
-     * @param width
-     * @param height
-     * @param config The configuration to use for GPAC
-     * @param urlToOpen
-     * @throws GpacInstanceException
-     */
-    public GPACInstance(GpacCallback callback, int width, int height, GpacConfig config, String urlToOpen)
-            throws GpacInstanceException {
-        StringBuilder sb = new StringBuilder();
-        Map<String, Throwable> errors = loadAllLibraries(config);
-        if (!errors.isEmpty()) {
-            sb.append("Exceptions while loading libraries:"); //$NON-NLS-1$
-            for (Map.Entry<String, Throwable> x : errors.entrySet()) {
-                sb.append('\n')
-                  .append(x.getKey())
-                  .append('')
-                  .append(x.getValue().getClass().getSimpleName())
-                  .append(": ") //$NON-NLS-1$
-                  .append(x.getValue().getLocalizedMessage());
-            }
-            Log.e(LOG_LIB, sb.toString());
-        }
-        try {
-            handle = createInstance(callback,
-                                    width,
-                                    height,
-                                    config.getGpacConfigDirectory(),
-                                    config.getGpacModulesDirectory(),
-                                    config.getGpacCacheDirectory(),
-                                    config.getGpacFontDirectory(),
-                                    config.getGpacGuiDirectory(),
-                                    urlToOpen);
-        } catch (Throwable e) {
-            throw new GpacInstanceException("Error while creating instance\n" + sb.toString()); //$NON-NLS-1$
-        }
-        if (handle == 0) {
-            throw new GpacInstanceException("Error while creating instance, no handle created!\n" + sb.toString()); //$NON-NLS-1$
-        }
-        synchronized (this) {
-            hasToBeFreed = true;
-        }
-        uniqueThread = Thread.currentThread();
-    }
-
-    /**
-     * This one handles the pointer to the real C object
-     */
-    private final long handle;
-
-    /**
-     * @return the handle
-     */
-    public synchronized long getHandle() {
-        return handle;
-    }
-
-    private void checkCurrentThread() throws RuntimeException {
-        if (Thread.currentThread() != uniqueThread)
-            throw new RuntimeException("Method called outside allowed Thread scope !"); //$NON-NLS-1$
-    }
-
-    @Override
-    public void disconnect() {
-        checkCurrentThread();
-        gpacrender();
-        gpacdisconnect();
-    }
-
-    @Override
-    public void connect(String url) {
-        Log.i(LOG_LIB, "connect(" + url + ")"); //$NON-NLS-1$ //$NON-NLS-2$
-        checkCurrentThread();
-        gpacrender();
-        gpacconnect(url);
-    }
-
-    /**
-     * Call this method when a key has been pressed
-     *
-     * @param keyCode
-     * @param event
-     * @param pressed true if key is pressed, false if key is released
-     * @param unicode
-     */
-    public void eventKey(int keyCode, KeyEvent event, boolean pressed, int unicode) {
-        checkCurrentThread();
-        gpaceventkeypress(keyCode, event.getScanCode(), pressed ? 1 : 0, event.getFlags(), unicode);
-    }
-
-    /**
-     * Renders the current frame
-     */
-    public void render() {
-        checkCurrentThread();
-        gpacrender();
-    }
-
-    /**
-     * Resizes the object to new dimensions
-     *
-     * @param width
-     * @param height
-     */
-    public void resize(int width, int height) {
-        Log.i(LOG_LIB, "Resizing to " + width + "x" + height); //$NON-NLS-1$ //$NON-NLS-2$
-        gpacresize(width, height);
-    }
-
-    private boolean touched = false;
-
-    /**
-     * Call this when a motion event occurs
-     *
-     * @param event
-     */
-    public void motionEvent(MotionEvent event) {
-        checkCurrentThread();
-        final float x = event.getX();
-        final float y = event.getY();
-        switch (event.getAction()) {
-            // not in 1.6 case MotionEvent.ACTION_POINTER_1_DOWN:
-            case MotionEvent.ACTION_DOWN:
-               gpaceventmousemove(x, y);
-               gpaceventmousedown(x, y);
-               touched = true;
-               break;
-            // not in 1.6 case MotionEvent.ACTION_POINTER_1_UP:
-            case MotionEvent.ACTION_UP:
-            	if ( !touched )
-            		break;
-            	gpaceventmouseup(x, y);
-              touched = false;
-              break;
-            case MotionEvent.ACTION_MOVE:
-            	gpaceventmousemove(x, y);
-            	if ( !touched ) {
-            		touched = true;
-            		//Log.i("Osmo4", "Mouse down: " + x +"," + y);
-            		gpaceventmousedown(x, y);
-            	}
-            	break;
-            case MotionEvent.ACTION_CANCEL:
-            	if ( !touched )
-            		break;
-            	//Log.i("Osmo4", "Mouse up: " + x +"," + y);
-              gpaceventmouseup(x, y);
-              touched = false;
-              break;
-        }
-    }
-
-    @Override
-    public void finalize() throws Throwable {
-        // Not sure how to do this..., destroy is supposed to be called already
-        // destroy();
-        super.finalize();
-    }
-
-    /**
-     * All Native functions, those functions are binded using the handle
-     */
-
-    /**
-     * Opens an URL
-     *
-     * @param url The URL to open
-     */
-    private native void gpacconnect(String url);
-
-    /**
-     * Used to create the GPAC instance
-     *
-     * @param callback
-     * @param width
-     * @param height
-     * @param cfg_dir
-     * @param modules_dir
-     * @param cache_dir
-     * @param font_dir
-     * @param gui_dir
-     * @return
-     */
-    private native long createInstance(GpacCallback callback, int width, int height, String cfg_dir,
-            String modules_dir, String cache_dir, String font_dir, String gui_dir, String url_to_open);
-
-    /**
-     * Disconnects the currently loaded URL
-     */
-    private native void gpacdisconnect();
-
-    /**
-     * Renders
-     *
-     * @param handle
-     */
-    private native void gpacrender();
-
-    /**
-     * Resizes the current view
-     *
-     * @param width The new width to set
-     * @param height The new height to set
-     */
-    private native void gpacresize(int width, int height);
-
-    /**
-     * Free all GPAC resources
-     */
-    private native void gpacfree();
-
-    /**
-     * To call when a key has been pressed
-     *
-     * @param keycode
-     * @param rawkeycode
-     * @param up
-     * @param flag
-     */
-    private native void gpaceventkeypress(int keycode, int rawkeycode, int up, int flag, int unicode);
-
-    /**
-     * To call when a mouse is down
-     *
-     * @param x Position in pixels
-     * @param y Position in pixels
-     */
-    private native void gpaceventmousedown(float x, float y);
-
-    /**
-     * To call when a mouse is up (released)
-     *
-     * @param x Position in pixels
-     * @param y Position in pixels
-     */
-    private native void gpaceventmouseup(float x, float y);
-
-    /**
-     * To call when a mouse is moving
-     *
-     * @param x Position in pixels
-     * @param y Position in pixels
-     */
-    private native void gpaceventmousemove(float x, float y);
-
-    /**
-     * To call when a change in orientation is returned from the sensors
-     * All angles are in RADIANS and positive in the COUNTER-CLOCKWISE direction
-     *
-     * @param x yaw (rotation around the -Z axis) range: -PI, PI
-     * @param y pitch (rotation around the -X axis) range: -PI/2, PI/2
-     * @param z roll (rotation around the Y axis) range: -PI, PI
-     */
-    private native void gpaceventorientationchange(float x, float y, float z);
-
-    public void onOrientationChange(float yaw, float pitch, float roll){
-        gpaceventorientationchange(yaw, pitch, roll);
-    }
-
-    @Override
-    public void destroy() {
-        boolean freeIt;
-        synchronized (this) {
-            freeIt = hasToBeFreed;
-            hasToBeFreed = false;
-        }
-        if (freeIt) {
-            disconnect();
-            gpacfree();
-        }
-    }
-
-    /**
-     * @see com.gpac.Osmo4.GPACInstanceInterface#setGpacPreference(String, String, String)
-     */
-    @Override
-    public native void setGpacPreference(String category, String name, String value);
-
-
-
-    /**
-     * @see com.gpac.Osmo4.GPACInstanceInterface#setGpacLogs(String)
-     */
-    @Override
-    public native void setGpacLogs(String tools_at_levels);
-}

gpac-2.2.1.tar.gz/applications/deprecated/osmo4_android_studio/app/src/main/java/com/gpac/Osmo4/GPACInstanceInterface.java Deleted

@@ -1,70 +0,0 @@
-/**
- * $URL$
- *
- * $LastChangedBy$ - $LastChangedDate$
- */
-package com.gpac.Osmo4;
-
-/**
- * @copyright RTL Group 2008
- * @author RTL Group DTIT software development team (last changed by $LastChangedBy$)
- * @version $Revision$
- * 
- */
-public interface GPACInstanceInterface {
-
-    /**
-     * @version $Revision$
-     * 
-     */
-    public static class GpacInstanceException extends Exception {
-
-        /**
-         * 
-         */
-        private static final long serialVersionUID = 3207851655866335152L;
-
-        /**
-         * Constructor
-         * 
-         * @param msg
-         */
-        public GpacInstanceException(String msg) {
-            super(msg);
-        }
-
-    }
-
-    /**
-     * Call this method to disconnect
-     */
-    public void disconnect();
-
-    /**
-     * Call this method to connect to a given URL
-     * 
-     * @param url The URL to connect to
-     */
-    public void connect(String url);
-
-    /**
-     * Destroys the current instance, you won't be able to use it anymore...
-     */
-    public void destroy();
-
-    /**
-     * Set a GPAC preference to given value
-     * 
-     * @param category
-     * @param name The name of preference as defined in GPAC.cfg
-     * @param value The value to set, if null, value will be deleted
-     */
-    public void setGpacPreference(String category, String name, String value);
-
-    /**
-     * Set a GPAC debug level for a given tool
-     * 
-     * @param tools_at_levels a ":" separated debugspec with debugspec := tool@debug_level
-     */
-    public void setGpacLogs(String tools_at_levels);
-}

gpac-2.2.1.tar.gz/applications/deprecated/osmo4_android_studio/app/src/main/java/com/gpac/Osmo4/GpacCallback.java Deleted

@@ -1,312 +0,0 @@
-/**
- * $URL$
- *
- * $LastChangedBy$ - $LastChangedDate$
- */
-package com.gpac.Osmo4;
-
-/**
- * Interface to implement by Java Objects to listen for callbacks from GPAC native code
- * 
- * @version $Revision$
- * 
- */
-public interface GpacCallback {
-
-    /**
-     * GPAC Error codes
-     * 
-     * @version $Revision$
-     * 
-     */
-    public enum GF_Err {
-
-        /** Message from any scripting engine used in the presentation (ECMAScript, MPEG-J, ...) (Info). */
-        GF_SCRIPT_INFO(3),
-        /**
-         * Indicates an data frame has several AU packed (not MPEG-4 compliant). This is used by decoders to force
-         * multiple decoding of the same data frame (Info).
-         */
-        GF_PACKED_FRAMES(2),
-        /** Indicates the end of a stream or of a file (Info). */
-        GF_EOS(1),
-        /*
-         * ! \n\n
-         */
-        /** Operation success (no error). */
-        GF_OK(0),
-        /** \n */
-        /** One of the input parameter is not correct or cannot be used in the current operating mode of the framework. */
-        GF_BAD_PARAM(-1),
-        /** Memory allocation failure. */
-        GF_OUT_OF_MEM(-2),
-        /** Input/Output failure (disk access, system call failures) */
-        GF_IO_ERR(-3),
-        /** The desired feature or operation is not supported by the framework */
-        GF_NOT_SUPPORTED(-4),
-        /** Input data has been corrupted */
-        GF_CORRUPTED_DATA(-5),
-        /** A modification was attempted on a scene node which could not be found */
-        GF_SG_UNKNOWN_NODE(-6),
-        /** The PROTO node interface does not match the nodes using it */
-        GF_SG_INVALID_PROTO(-7),
-        /** An error occured in the scripting engine */
-        GF_SCRIPT_ERROR(-8),
-        /**
-         * Buffer is too small to contain decoded data. Decoders shall use this error whenever they need to resize their
-         * output memory buffers
-         */
-        GF_BUFFER_TOO_SMALL(-9),
-        /** Bitstream is not compliant to the specfication it refers to */
-        GF_NON_COMPLIANT_BITSTREAM(-10),
-        /** No decoders could be found to handle the desired media type */
-        GF_CODEC_NOT_FOUND(-11),
-        /** The URL is not properly formatted or cannot be found */
-        GF_URL_ERROR(-12),
-        /** An service error has occured at the local side */
-        GF_SERVICE_ERROR(-13),
-        /** A service error has occured at the remote (server) side */
-        GF_REMOTE_SERVICE_ERROR(-14),
-        /** The desired stream could not be found in the service */
-        GF_STREAM_NOT_FOUND(-15),
-        /** The IsoMedia file is not a valid one */
-        GF_ISOM_INVALID_FILE(-20),
-        /** The IsoMedia file is not complete. Either the file is being downloaded, or it has been truncated */
-        GF_ISOM_INCOMPLETE_FILE(-21),
-        /** The media in this IsoMedia track is not valid (usually due to a broken stream description) */
-        GF_ISOM_INVALID_MEDIA(-22),
-        /** The requested operation cannot happen in the current opening mode of the IsoMedia file */
-        GF_ISOM_INVALID_MODE(-23),
-        /** This IsoMedia track refers to media outside the file in an unknown way */
-        GF_ISOM_UNKNOWN_DATA_REF(-24),
-
-        /** An invalid MPEG-4 Object Descriptor was found */
-        GF_ODF_INVALID_DESCRIPTOR(-30),
-        /** An MPEG-4 Object Descriptor was found or added to a forbidden descriptor */
-        GF_ODF_FORBIDDEN_DESCRIPTOR(-31),
-        /** An invalid MPEG-4 BIFS command was detected */
-        GF_ODF_INVALID_COMMAND(-32),
-        /** The scene has been encoded using an unknown BIFS version */
-        GF_BIFS_UNKNOWN_VERSION(-33),
-
-        /** The remote IP address could not be solved */
-        GF_IP_ADDRESS_NOT_FOUND(-40),
-        /** The connection to the remote peer has failed */
-        GF_IP_CONNECTION_FAILURE(-41),
-        /** The network operation has failed */
-        GF_IP_NETWORK_FAILURE(-42),
-        /** The network connection has been closed */
-        GF_IP_CONNECTION_CLOSED(-43),
-        /** The network operation has failed because no data is available */
-        GF_IP_NETWORK_EMPTY(-44),
-        /** The network operation has been discarded because it would be a blocking one */
-        GF_IP_SOCK_WOULD_BLOCK(-45),
-        /**
-         * UDP connection did not receive any data at all. Signaled by client services to reconfigure network if
-         * possible
-         */
-        GF_IP_UDP_TIMEOUT(-46),
-
-        /** Authentication with the remote host has failed */
-        GF_AUTHENTICATION_FAILURE(-50),
-        /** Script not ready for playback */
-        GF_SCRIPT_NOT_READY(-51),
-
-        /**
-         * Unknown GPAC Error code
-         */
-        JAVA_UNKNOWN_ERROR(-100);
-
-        int value;
-
-        GF_Err(int x) {
-            this.value = x;
-        }
-
-        /**
-         * Get a GPAC Error code from its value
-         * 
-         * @param status The int status corresponding to the error
-         * @return A {@link GF_Err} object
-         */
-        public static GF_Err getError(int status) {
-            for (GF_Err x : values()) {
-                if (x.value == status)
-                    return x;
-            }
-            return JAVA_UNKNOWN_ERROR;
-        }
-    }
-
-    /**
-     * Mapping between GPAC Log Modules and Java symbols
-     * 
-     * @version $Revision$
-     * 
-     */
-    public enum GF_Log_Module implements Comparable<GF_Log_Module> {
-        /** Log message from the core library (init, threads, network calls, etc) */
-        GF_LOG_CORE(0),
-        /** Log message from a raw media parser (BIFS, LASeR, A/V formats) */
-        GF_LOG_CODING(1),
-        /** Log message from a bitstream parser (IsoMedia, MPEG-2 TS, OGG, ...) */
-        GF_LOG_CONTAINER(2),
-        /** Log message from the network/service stack (messages & co) */
-        GF_LOG_NETWORK(3),
-        /** Log message from the network/service stack (messages & co) */
-        GF_LOG_HTTP(4),
-        /** Log message from the RTP/RTCP stack (TS info) and packet structure & hinting (debug) */
-        GF_LOG_RTP(5),
-        /** Log message from a codec */
-        GF_LOG_CODEC(6),
-        /** Log message from any XML parser (context loading, etc) */
-        GF_LOG_PARSER(7),
-        /** Log message from the terminal/compositor, indicating media object state */
-        GF_LOG_MEDIA(8),
-        /** Log message from the scene graph/scene manager (handling of nodes and attribute modif, DOM core) */
-        GF_LOG_SCENE(9),
-        /** Log message from the scripting engine */
-        GF_LOG_SCRIPT(10),
-        /** Log message from event handling */
-        GF_LOG_INTERACT(11),
-        /** Log message from compositor */
-        GF_LOG_COMPOSE(12),
-        /** Log message from compositor */
-        GF_LOG_COMPTIME(13),
-        /** Log for video object cache */
-        GF_LOG_CACHE(14),
-        /** Log message from multimedia I/O devices (audio/video input/output, ...) */
-        GF_LOG_MMIO(15),
-        /** Log for runtime info (times, memory, CPU usage) */
-        GF_LOG_RTI(16),
-        /** Log for memory tracker */
-        GF_LOG_MEMORY(17),
-        /** Log for audio compositor */
-        GF_LOG_AUDIO(18),
-        /** generic Log for modules */
-        GF_LOG_MODULE(19),
-        /** Log for GPAC mutexes and threads (Very verbose at DEBUG)*/
-        GF_LOG_MUTEX(20),
-        /*! Log for threads and condition */
-		GF_LOG_CONDITION(21),
-		/*! Log for all HTTP streaming */
-		GF_LOG_DASH(22),
-		/*! Log for all filter engine */
-		GF_LOG_FILTER(23),
-		/*! Log for all filter scheduler */
-		GF_LOG_SCHEDULER(24),
-		/*! Log for ROUTE demux */
-		GF_LOG_ROUTE(25),
-		/*! Log for all messages coming from GF_Terminal or script alert()*/
-		GF_LOG_CONSOLE(26),
-		/*! Log for all messages coming the application, not used by libgpac or the modules*/
-		GF_LOG_APP(27),
-        /**
-         * Unknown Log subsystem
-         */
-        GF_LOG_UNKNOWN(28);
-
-        int value;
-
-        /**
-         * Private Constructor
-         */
-        private GF_Log_Module(int x) {
-            this.value = x;
-        }
-
-        /**
-         * Finds a module from its module_code
-         * 
-         * @param module_code
-         * @return The Module found (never null)
-         */
-        public static GF_Log_Module getModule(int module_code) {
-            for (GF_Log_Module x : values()) {
-                if (x.value == module_code)
-                    return x;
-            }
-            return GF_LOG_UNKNOWN;
-        }
-    }
-
-    /**
-     * Display a message
-     * 
-     * @param message
-     * @param title
-     * @param errorCode
-     */
-    public void displayMessage(String message, String title, int errorCode);
-    
-    
-    /**
-     * Called when setup log file
-     * 
-     * @param path
-     */
-    public void setLogFile(String path);
-
-    /**
-     * Called when logging
-     * 
-     * @param level
-     * @param module
-     * @param message
-     */
-    public void onLog(int level, int module, String message);
-
-    /**
-     * Called when progress is set
-     * 
-     * @param msg
-     * @param done
-     * @param total
-     */
-    public void onProgress(String msg, int done, int total);
-
-    /**
-     * Called when GPAC is ready
-     */
-    public void onGPACReady();
-
-    /**
-     * Called when GPAC initialization fails
-     * 
-     * @param e
-     */
-    public void onGPACError(Throwable e);
-
-    // /**
-    // * Returns UserName:Password for given site
-    // *
-    // * @param siteURL The URL of site requiring authorization
-    // * @param userName The User Name (may be null if never set)
-    // * @param password The password (may be null if never set)
-    // * @return A String formatted as username:password
-    // */
-    // public String onGPACAuthorization(String siteURL, String userName, String password);
-
-    /**
-     * Set the new caption for the application
-     * 
-     * @param newCaption The new caption to set for application
-     */
-    public void setCaption(String newCaption);
-
-    /**
-     * Show the virtual keyboard
-     * 
-     * @param showKeyboard
-     */
-    public void showKeyboard(boolean showKeyboard);
-
-    /**
-     * Toggle Sensors on/off
-     * 
-     * @param active sensor (true/false)
-     */
-    public void sensorSwitch(boolean active);
-    
-
-}

gpac-2.2.1.tar.gz/applications/deprecated/osmo4_android_studio/app/src/main/java/com/gpac/Osmo4/GpacConfig.java Deleted

@@ -1,236 +0,0 @@
-/**
- * $URL$
- *
- * $LastChangedBy$ - $LastChangedDate$
- */
-package com.gpac.Osmo4;
-
-import java.io.File;
-import android.content.Context;
-import android.content.pm.PackageManager.NameNotFoundException;
-import android.os.Environment;
-import android.util.Log;
-
-/**
- * This class handles all GPAC configuration directories
- *
- * @author Pierre Souchay (VizionR SAS) (last changed by $LastChangedBy$)
- * @version $Revision$
- *
- */
-
-/**
- * NOTE FOR DEVELOPERS
- * Whenever you add or change a path here, you MUST verify also the corresponding path in src/utils/os_config_init.c
- */
-public class GpacConfig {
-
-    private final static String LOG_GPAC_CONFIG = GpacConfig.class.getSimpleName();
-
-    /**
-     * Default Constructor
-     *
-     * @param context
-     */
-    public GpacConfig(Context context) {
-        String dataDir;
-        try {
-            if (context == null || context.getPackageManager() == null) {
-                dataDir = Environment.getDataDirectory() + "/data/com.gpac.Osmo4/"; //$NON-NLS-1$
-                Log.e(LOG_GPAC_CONFIG, "Cannot get context or PackageManager, using default directory=" + dataDir); //$NON-NLS-1$
-            } else
-                dataDir = context.getPackageManager().getApplicationInfo(context.getPackageName(), 0).dataDir;
-        } catch (NameNotFoundException e) {
-            Log.e(LOG_GPAC_CONFIG, "This is bad, we cannot find ourself : " + context.getPackageName(), e); //$NON-NLS-1$
-            throw new RuntimeException("Cannot find package " + context.getPackageName(), e); //$NON-NLS-1$
-        }
-        gpacAppDirectory = dataDir + '/';
-        Log.v(LOG_GPAC_CONFIG, "Using directory " + gpacAppDirectory + " for osmo"); //$NON-NLS-1$ //$NON-NLS-2$
-        gpacCacheDirectory = context.getCacheDir().getAbsolutePath();
-        Log.v(LOG_GPAC_CONFIG, "Using directory " + gpacCacheDirectory + " for cache"); //$NON-NLS-1$ //$NON-NLS-2$
-        //
-        //Log.v(LOG_GPAC_CONFIG, "Using directory " + gpacModulesDirectory + " for modules"); //$NON-NLS-1$ //$NON-NLS-2$
-        gpacLibsDirectory = dataDir + "/lib/"; //$NON-NLS-1$
-        Log.v(LOG_GPAC_CONFIG, "Using directory " + gpacLibsDirectory + " for libraries"); //$NON-NLS-1$ //$NON-NLS-2$
-
-        gpacGuiDirectory = dataDir + "/share/gui/";
-        Log.v(LOG_GPAC_CONFIG, "Using directory " + gpacGuiDirectory + " for GUI"); //$NON-NLS-1$ //$NON-NLS-2$
-
-        gpacShaderDirectory = dataDir + "/share/shaders/";
-        Log.v(LOG_GPAC_CONFIG, "Using directory " + gpacShaderDirectory + " for shader files"); //$NON-NLS-1$ //$NON-NLS-2$
-
-        File osmo = new File(Environment.getExternalStorageDirectory(), "osmo"); //$NON-NLS-1$
-        gpacLogDirectory = osmo.getAbsolutePath() + "/log/";
-        Log.v(LOG_GPAC_CONFIG, "Using directory " + gpacLogDirectory + " for log files"); //$NON-NLS-1$ //$NON-NLS-2$
-
-        //check if GPAC.cfg exists in /sdcard/osmo
-        File gpac_cfg = new File(osmo.getAbsolutePath(), "GPAC.cfg");
-		if (gpac_cfg.exists())
-			gpacConfigDirectory = osmo.getAbsolutePath() + "/";
-		else
-			gpacConfigDirectory = null;
-    }
-
-    /**
-     * Ensures all directories are created
-     *
-     * @return The {@link GpacConfig} instance itself
-     */
-    public GpacConfig ensureAllDirectoriesExist() {
-        for (String s : new String { gpacAppDirectory, gpacCacheDirectory, gpacShaderDirectory, gpacLogDirectory }) {
-            createDirIfNotExist(s);
-        }
-        return this;
-    }
-
-    /**
-     * Default directory for GPAC configuration directory, ends with /
-     *
-     * @return the gpacAppDirectory
-     */
-    public String getGpacAppDirectory() {
-        return gpacAppDirectory;
-    }
-
-
-    /**
-     * Default directory for GPAC configuration directory, ends with /
-     *
-     * @return the gpacConfigDirectory
-     */
-    public String getGpacConfigDirectory() {
-        return gpacConfigDirectory;
-    }
-
-    /**
-     * Directory of Android containing all fonts
-     *
-     * @return the gpacFontDirectory
-     */
-    public String getGpacFontDirectory() {
-        return gpacFontDirectory;
-    }
-
-    /**
-     * Default directory for GPAC modules directory, ends with /
-     *
-     * @return the gpacModulesDirectory
-     */
-    public String getGpacModulesDirectory() {
-        // return gpacModulesDirectory;
-        return gpacLibsDirectory;
-    }
-
-    /**
-     * @return the gpacLibsDirectory
-     */
-    public String getGpacLibsDirectory() {
-        return gpacLibsDirectory;
-    }
-
-    /**
-     * Default directory for cached files
-     *
-     * @return the gpacCacheDirectory
-     */
-    public String getGpacCacheDirectory() {
-        return gpacCacheDirectory;
-    }
-
-    /**
-     * Default directory for GUI files
-     *
-     * @return the gpacGuiDirectory
-     */
-    public String getGpacGuiDirectory() {
-        return gpacGuiDirectory;
-    }
-
-    /**
-     * Default directory for shader files
-     *
-     * @return the gpacShaderDirectory
-     */
-    public String getGpacShaderDirectory() {
-        return gpacShaderDirectory;
-    }
-
-    /**
-     * Default directory for log files
-     *
-     * @return the gpacLogDirectory
-     */
-    public String getGpacLogDirectory() {
-        return gpacLogDirectory;
-    }
-
-    private final String gpacAppDirectory;
-
-    private final String gpacConfigDirectory;
-
-    private final String gpacFontDirectory = "/system/fonts/"; //$NON-NLS-1$
-
-    // private final String gpacModulesDirectory;
-
-    private final String gpacLibsDirectory;
-
-    private final String gpacCacheDirectory;
-
-    private final String gpacGuiDirectory;
-
-    private final String gpacShaderDirectory;
-
-    private final String gpacLogDirectory;
-
-    /**
-     * Creates a given directory if it does not exist
-     *
-     * @param path
-     */
-    private static boolean createDirIfNotExist(String path) {
-        File f = new File(path);
-        if (!f.exists()) {
-            if (!f.mkdirs()) {
-                Log.e(LOG_GPAC_CONFIG, "Failed to create directory " + path); //$NON-NLS-1$
-                return false;
-            } else {
-                Log.i(LOG_GPAC_CONFIG, "Created directory " + path); //$NON-NLS-1$
-            }
-        }
-        return true;
-    }
-
-    /**
-     * Get the GPAC.cfg file
-     *
-     * @return the file
-     */
-    public File getGpacConfigFile() {
-        return new File(getGpacConfigDirectory(), "GPAC.cfg"); //$NON-NLS-1$
-    }
-
-    /**
-     * Get the GPAC.cfg file
-     *
-     * @return the file
-     */
-    public File getGpacLastRevFile() {
-        return new File(getGpacConfigDirectory(), "lastRev.txt"); //$NON-NLS-1$
-    }
-
-    /**
-     * Get the configuration as text
-     *
-     * @return a String with newlines representing all the configuration
-     */
-    public String getConfigAsText() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("GpacAppDirectory=").append(getGpacAppDirectory()).append('\n'); //$NON-NLS-1$
-        sb.append("GpacModulesDirectory=").append(getGpacModulesDirectory()).append('\n'); //$NON-NLS-1$
-        sb.append("GpacFontDirectory=").append(getGpacFontDirectory()).append('\n'); //$NON-NLS-1$
-        sb.append("GpacCacheDirectory=").append(getGpacCacheDirectory()).append('\n'); //$NON-NLS-1$
-        sb.append("GpacGuiDirectory=").append(getGpacGuiDirectory()).append('\n'); //$NON-NLS-1$
-        sb.append("GpacShaderDirectory=").append(getGpacShaderDirectory()).append('\n'); //$NON-NLS-1$
-        return sb.toString();
-    }
-}

gpac-2.2.1.tar.gz/applications/deprecated/osmo4_android_studio/app/src/main/java/com/gpac/Osmo4/MPEGVSensor.java Deleted

@@ -1,503 +0,0 @@
-package com.gpac.Osmo4;
-
-import android.app.Activity;
-import android.hardware.Sensor;
-import android.hardware.SensorEvent;
-import android.hardware.SensorEventListener;
-import android.hardware.SensorManager;
-import android.location.Location;
-import android.location.LocationListener;
-import android.location.LocationManager;
-import android.os.Bundle;
-
-/**
- * Handle Physical sensors
- * 
- * @authors Ivica Arsov (ivica.arsov@it-sudparis.eu) - Pierre Souchay <pierre.souchay@vizionr.fr> (last changed by $LastChangedBy$)
- * @version $Revision$
- * 
- */
-public class MPEGVSensor implements SensorEventListener, LocationListener {
-
-    public static Activity myAct = null;
-
-    private native void sendData(int ptr, String data);
-
-    private static SensorManager mySensorManager = null;
-    private static LocationManager myLocationManager = null;
-
-    private static Sensor sensor = null;
-
-    private static Sensor sensor1 = null;
-
-    private int SensorType = -2;
-
-    private int InternalPtr = 0;
-
-    private Boolean run = false;
-
-    /**
-     * Init the sensor Manager
-     * 
-     * @param mgr The manager to set
-     * @return the sensor manager set
-     */
-    public static SensorManager initSensorManager(SensorManager mgr) {
-        return mySensorManager = mgr;
-    }
-
-    /**
-     * Init the location Manager
-     * 
-     * @param mgr The manager to set
-     * @return the location manager set
-     */
-    public static LocationManager initLocationManager(LocationManager mgr) {
-        return myLocationManager = mgr;
-    }
-
-    /**
-     * Starts the given sensor and register the listener
-     * 
-     * @param ptr The pointer
-     * @param type The type of sensor as defined in {@link Sensor}
-     */
-    public void startSensor(int ptr, int type) {
-        InternalPtr = ptr;
-		SensorType = type;
-		
-		switch (SensorType) {
-			case Sensor.TYPE_ORIENTATION: {
-				sensor = mySensorManager
-						.getDefaultSensor(Sensor.TYPE_ACCELEROMETER);
-				if ( !mySensorManager.registerListener(MPEGVSensor.this, sensor,
-						SensorManager.SENSOR_DELAY_GAME))
-					return;
-				sensor1 = mySensorManager
-						.getDefaultSensor(Sensor.TYPE_MAGNETIC_FIELD);
-				if ( !mySensorManager.registerListener(MPEGVSensor.this, sensor1,
-						SensorManager.SENSOR_DELAY_GAME))
-				{
-					mySensorManager.unregisterListener(MPEGVSensor.this);
-					return;
-				}
-				run = true;
-				break;
-			}
-			case Sensor.TYPE_ACCELEROMETER: {
-				sensor = mySensorManager
-						.getDefaultSensor(Sensor.TYPE_ACCELEROMETER);
-				if( !mySensorManager.registerListener(MPEGVSensor.this, sensor,
-						SensorManager.SENSOR_DELAY_GAME))
-					return;
-				run = true;
-				break;
-			}
-			case Sensor.TYPE_GYROSCOPE: {
-				sensor = mySensorManager.getDefaultSensor(Sensor.TYPE_GYROSCOPE);
-				if ( !mySensorManager.registerListener(MPEGVSensor.this, sensor,
-						SensorManager.SENSOR_DELAY_GAME))
-					return;
-				run = true;
-				break;
-			}
-			case Sensor.TYPE_MAGNETIC_FIELD: {
-				sensor = mySensorManager
-						.getDefaultSensor(Sensor.TYPE_MAGNETIC_FIELD);
-				if ( !mySensorManager.registerListener(MPEGVSensor.this, sensor,
-						SensorManager.SENSOR_DELAY_GAME))
-					return;
-				run = true;
-				break;
-			}
-			case Sensor.TYPE_LIGHT: {
-				sensor = mySensorManager.getDefaultSensor(Sensor.TYPE_LIGHT);
-				if ( !mySensorManager.registerListener(MPEGVSensor.this, sensor,
-						SensorManager.SENSOR_DELAY_UI))
-					return;
-				run = true;
-				break;
-			}
-			case Sensor.TYPE_PRESSURE: {
-				sensor = mySensorManager.getDefaultSensor(Sensor.TYPE_PRESSURE);
-				if ( !mySensorManager.registerListener(MPEGVSensor.this, sensor,
-						SensorManager.SENSOR_DELAY_UI))
-					return;
-				run = true;
-				break;
-			}
-			//case Sensor.TYPE_ROTATION_VECTOR: {
-			case 11: {
-				sensor = mySensorManager
-						.getDefaultSensor(11);
-				if ( !mySensorManager.registerListener(MPEGVSensor.this, sensor,
-						SensorManager.SENSOR_DELAY_GAME))
-					return;
-				run = true;
-				break;
-			}
-			case 100: { // Type for the GPS sensor
-				myAct.runOnUiThread(new Runnable() {
-					
-					@Override
-					public void run() {
-						myLocationManager.requestLocationUpdates(LocationManager.GPS_PROVIDER, 0, 0, MPEGVSensor.this);
-						run = true;
-					}
-				});
-			}
-		}
-    }
-
-    /**
-     * Stops the sensor and unregister listener
-     */
-    public void stopSensor() {
-        if (SensorType == 100)
-			myAct.runOnUiThread(new Runnable() {
-
-				@Override
-				public void run() {
-
-					myLocationManager.removeUpdates(MPEGVSensor.this);
-
-				}
-			});
-		else
-			mySensorManager.unregisterListener(MPEGVSensor.this);
-		run = false;
-    }
-
-    @Override
-    public void onAccuracyChanged(Sensor arg0, int arg1) {
-        // TODO Auto-generated method stub
-
-    }
-
-	public double azzimuth = 0;
-	public double pitch = 0;
-	public double roll = 0;
-
-	public double x, y, z, angle;
-
-	private float mGData = new float3;
-	private float mMData = new float3;
-	private float mR = new float16;
-	private float mI = new float16;
-	private float mOrientation = new float3;
-
-	int buffsize = 8;
-
-	public double al = new doublebuffsize;
-	public double pl = new doublebuffsize;
-	public double rl = new doublebuffsize;
-	int ind = 0;
-
-	double rotangle = 0;
-
-	@Override
-	public void onSensorChanged(SensorEvent event) {
-		
-		if ( !run )
-			return;
-		
-		switch (SensorType)
-		{
-			case Sensor.TYPE_ORIENTATION:
-			{
-				int type = event.sensor.getType();
-		        if (type == Sensor.TYPE_ACCELEROMETER) {
-		            for (int i=0 ; i<3 ; i++)
-		            	mGDatai = event.valuesi;
-			        
-		            lowPass(mGData, accel);
-			        //filterAccData();
-		            //Log.i("Acc: ", "" + event.values0 + " " + event.values1 + " " + event.values2);
-		        } else if (type == Sensor.TYPE_MAGNETIC_FIELD) {
-		            for (int i=0 ; i<3 ; i++)
-		            	mMDatai = event.valuesi;
-			        
-		            lowPass(mMData, mag);
-			        //filterMagData();
-		            //Log.i("Mag: ", "" + event.values0 + " " + event.values1 + " " + event.values2);
-		        } else {
-		        	if ( event.sensor.getType() == Sensor.TYPE_ORIENTATION )
-		    		{
-		    			azzimuth = event.values0;
-		    			pitch = event.values1;
-		    			roll = event.values2;
-		    		}
-		        	return;
-		        }
-		        
-		        SensorManager.getRotationMatrix(mR, mI, mGData, mMData);
-		        SensorManager.getOrientation(mR, mOrientation);
-		        
-		        lowPass(mOrientation, ordata);
-		        //filterOrientationData();
-		        
-		        alind = mOrientation0;
-		        plind = mOrientation1;
-		        rlind = mOrientation2;
-		        
-		        if ( ++ind == buffsize )
-		        	ind = 0;
-		        
-		        double a = 0, p = 0, r = 0;
-		        for ( int i =0; i < buffsize; i++ )
-		        {
-		        	a += ali;
-		        	p += pli;
-		        	r += rli;
-		        }
-		        
-		        a /= buffsize;
-		        p /= buffsize;
-		        r /= buffsize;
-		        
-		        final float rad2deg = (float)(180.0f/Math.PI);
-		        azzimuth = a*rad2deg;//mOrientation0*rad2deg;
-				pitch = p*rad2deg;//mOrientation1*rad2deg;
-				roll = r*rad2deg;//mOrientation2*rad2deg;
-				
-//				mOrientation0 = (float)azzimuth;
-//				mOrientation1 = (float)pitch;
-//				mOrientation2 = (float)roll;
-//				
-//				filterOrientationData();
-//				
-//				azzimuth = mOrientation0;
-//		        pitch = mOrientation1;
-//		        roll = mOrientation2;
-				
-				String res = "";
-				res += azzimuth+";" + pitch + ";" + roll + ";";
-				sendData(InternalPtr, res);
-				break;
-			}
-			case Sensor.TYPE_ACCELEROMETER:
-			{
-				for (int i=0 ; i<3 ; i++)
-	            	mGDatai = event.valuesi;
-				
-				lowPass(mGData, accel);
-				
-				alind = mGData0;
-		        plind = mGData1;
-		        rlind = mGData2;
-		        
-		        if ( ++ind == buffsize )
-		        	ind = 0;
-		        
-		        double a = 0, p = 0, r = 0;
-		        for ( int i =0; i < buffsize; i++ )
-		        {
-		        	a += ali;
-		        	p += pli;
-		        	r += rli;
-		        }
-		        
-		        a /= buffsize;
-		        p /= buffsize;
-		        r /= buffsize;
-		        
-		        String res = "";
-				res += a+";" + p + ";" + r + ";";
-				sendData(InternalPtr, res);
-				break;
-			}
-			case Sensor.TYPE_GYROSCOPE:
-			{
-				for (int i=0 ; i<3 ; i++)
-	            	mGDatai = event.valuesi;
-				
-				lowPass(mGData, accel);
-				
-				alind = mGData0;
-		        plind = mGData1;
-		        rlind = mGData2;
-		        
-		        if ( ++ind == buffsize )
-		        	ind = 0;
-		        
-		        double a = 0, p = 0, r = 0;
-		        for ( int i =0; i < buffsize; i++ )
-		        {
-		        	a += ali;
-		        	p += pli;
-		        	r += rli;
-		        }
-		        
-		        a /= buffsize;
-		        p /= buffsize;
-		        r /= buffsize;
-		        
-		        String res = "";
-				res += a+";" + p + ";" + r + ";";
-				sendData(InternalPtr, res);
-				break;
-			}
-			case Sensor.TYPE_MAGNETIC_FIELD:
-			{
-				for (int i=0 ; i<3 ; i++)
-	            	mGDatai = event.valuesi;
-				
-				lowPass(mGData, accel);
-				
-				alind = mGData0;
-		        plind = mGData1;
-		        rlind = mGData2;
-		        
-		        if ( ++ind == buffsize )
-		        	ind = 0;
-		        
-		        double a = 0, p = 0, r = 0;
-		        for ( int i =0; i < buffsize; i++ )
-		        {
-		        	a += ali;
-		        	p += pli;
-		        	r += rli;
-		        }
-		        
-		        a /= buffsize;
-		        p /= buffsize;
-		        r /= buffsize;
-		        
-		        String res = "";
-				res += a+";" + p + ";" + r + ";";
-				sendData(InternalPtr, res);
-				break;
-			}
-			//case Sensor.TYPE_ROTATION_VECTOR:
-			case 11:
-			{
-				double a = event.values0, p = event.values1, r = event.values2;
-				
-				final float rad2deg = (float)(180.0f/Math.PI);
-		        a = a*rad2deg;
-				p = p*rad2deg;
-				r = r*rad2deg;
-				
-				String res = "";
-				res += a + ";" + p + ";" + r + ";";
-				sendData(InternalPtr, res);
-				
-				break;
-			}
-			case Sensor.TYPE_LIGHT:
-			{
-				String res = "";
-				res += event.values0 + ";";
-				sendData(InternalPtr, res);
-				break;
-			}
-			case Sensor.TYPE_PRESSURE:
-			{
-				String res = "";
-				res += event.values0+";";
-				sendData(InternalPtr, res);
-				break;
-			}
-		}
-	}
-
-	static final float ALPHA = 0.01f;
-
-	protected float lowPass(float input, float output) {
-		if (output == null)
-			return input;
-
-		for (int i = 0; i < input.length; i++) {
-			outputi = outputi + ALPHA * (inputi - outputi);
-		}
-		return output;
-	}
-
-	Boolean accinited = false;
-	float accel = new float3;
-
-	private void filterData(float data, float filter) {
-		float kFilteringFactor = 0.1f;
-
-		filter0 = data0 * kFilteringFactor + filter0
-				* (1.0f - kFilteringFactor);
-		filter1 = data1 * kFilteringFactor + filter1
-				* (1.0f - kFilteringFactor);
-		filter2 = data2 * kFilteringFactor + filter2
-				* (1.0f - kFilteringFactor);
-		data0 = data0 - filter0;
-		data1 = data1 - filter1;
-		data2 = data2 - filter2;
-
-		filter0 = data0;
-		filter1 = data1;
-		filter2 = data2;
-	}
-
-	private void filterAccData() {
-		if (!accinited) {
-			accel0 = mGData0;
-			accel1 = mGData1;
-			accel2 = mGData2;
-			accinited = true;
-		}
-		filterData(mGData, accel);
-	}
-
-	Boolean maginited = false;
-	float mag = new float3;
-
-	private void filterMagData() {
-		if (!maginited) {
-			mag0 = mMData0;
-			mag1 = mMData1;
-			mag2 = mMData2;
-			maginited = true;
-		}
-		filterData(mMData, mag);
-	}
-
-	Boolean orinited = false;
-	float ordata = new float3;
-
-	private void filterOrientationData() {
-		if (!orinited) {
-			ordata0 = mOrientation0;
-			ordata1 = mOrientation1;
-			ordata2 = mOrientation2;
-			orinited = true;
-		}
-		filterData(mOrientation, ordata);
-	}
-
-	@Override
-	public void onLocationChanged(Location loc) {
-		String res = "";
-		res += loc.getLongitude() + ";" 
-				+ loc.getLatitude() + ";" 
-				+ loc.getAltitude() + ";"
-				+ loc.getAccuracy() + ";"
-				+ loc.getBearing() + ";";
-		sendData(InternalPtr, res);
-	}
-
-	@Override
-	public void onProviderDisabled(String arg0) {
-		// TODO Auto-generated method stub
-		
-	}
-
-	@Override
-	public void onProviderEnabled(String arg0) {
-		// TODO Auto-generated method stub
-		
-	}
-
-	@Override
-	public void onStatusChanged(String arg0, int arg1, Bundle arg2) {
-		// TODO Auto-generated method stub
-		
-	}
-
-}
-

gpac-2.2.1.tar.gz/applications/deprecated/osmo4_android_studio/app/src/main/java/com/gpac/Osmo4/Osmo4.java Deleted

@@ -1,1383 +0,0 @@
-/**
- *  Osmo on Android
- *  Aug/2010
- *  NGO Van Luyen
- * $Id$
- *
- */
-package com.gpac.Osmo4;
-
-import java.io.BufferedReader;
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.OutputStreamWriter;
-import java.io.PrintStream;
-import java.nio.charset.Charset;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.HashMap;
-import java.util.Set;
-import java.util.Map;
-import java.util.concurrent.Callable;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
-import android.app.Activity;
-import android.app.AlertDialog;
-import android.app.Dialog;
-import android.app.ProgressDialog;
-import android.content.ActivityNotFoundException;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.content.DialogInterface.OnClickListener;
-import android.content.Intent;
-import android.content.pm.ActivityInfo;
-import android.content.res.Configuration;
-import android.hardware.SensorManager;
-import android.location.LocationManager;
-import android.net.Uri;
-import android.os.Bundle;
-import android.os.PowerManager;
-import android.os.PowerManager.WakeLock;
-import android.os.StrictMode;
-import android.os.Vibrator;
-import android.text.InputType;
-import android.util.Log;
-import android.view.View;
-import android.view.KeyEvent;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
-import android.view.ViewGroup;
-import android.view.Window;
-import android.view.WindowManager;
-import android.view.inputmethod.InputMethodManager;
-import android.widget.ArrayAdapter;
-import android.widget.AutoCompleteTextView;
-import android.widget.LinearLayout;
-import android.widget.Toast;
-import android.content.res.AssetManager;
-import android.os.Environment;
-
-
-import android.os.Handler;
-import android.os.Message;
-import android.view.GestureDetector;
-import android.view.MotionEvent;
-
-import com.gpac.Osmo4.Osmo4GLSurfaceView;
-import com.gpac.Osmo4.Preview;
-import com.gpac.Osmo4.R;
-import com.gpac.Osmo4.extra.ConfigFileEditorActivity;
-import com.gpac.Osmo4.extra.FileChooserActivity;
-import com.gpac.Osmo4.extra.PrefsActivity;
-import com.gpac.Osmo4.logs.GpacLogger;
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.URLClassLoader;
-
-import com.lge.real3d.Real3D;
-import com.lge.real3d.Real3DInfo;
-/**
- * The main Osmo4 activity, used to launch everything
- *
- * @version $Revision$
- *
- */
-public class Osmo4 extends Activity implements GpacCallback {
-
-    // private String m_modules_list;
-	private static final int INITIAL_HIDE_DELAY = 300;
-
-	public boolean m3DLibraryLoaded = false;
-	private Real3D mReal3D;
-	private View mDecorView;
-
-    private boolean shouldDeleteGpacConfig = false;
-
-    /**
-     * @return the shouldDeleteGpacConfig
-     */
-    public synchronized boolean isShouldDeleteGpacConfig() {
-        return shouldDeleteGpacConfig;
-    }
-
-    /**
-     * @param shouldDeleteGpacConfig the shouldDeleteGpacConfig to set
-     */
-    public synchronized void setShouldDeleteGpacConfig(boolean shouldDeleteGpacConfig) {
-        this.shouldDeleteGpacConfig = shouldDeleteGpacConfig;
-    }
-
-    private final static String CFG_STARTUP_CATEGORY = "General"; //$NON-NLS-1$
-
-    private final static String CFG_STARTUP_NAME = "StartupFile"; //$NON-NLS-1$
-
-    private static boolean keyboardIsVisible = false;
-
-    private final static int DEFAULT_BUFFER_SIZE = 8192;
-
-    private static boolean uivisible;
-
-    public static Context context;
-
-    private GpacConfig gpacConfig;
-
-    /**
-     * Activity request ID for picking a file from local file system
-     */
-    public final static int PICK_FILE_REQUEST = 1;
-
-    private final static String LOG_OSMO_TAG = "Osmo4"; //$NON-NLS-1$
-
-    /**
-     * List of all extensions recognized by Osmo
-     */
-    public final static String OSMO_REGISTERED_FILE_EXTENSIONS = "*.mp4,*.bt,*.xmt,*.xml,*.ts,*.svg,*.mp3,*.m3u8,*.mpg,*.aac,*.m4a,*.jpg,*.png,*.wrl,*.mpd"; //$NON-NLS-1$
-
-    private PowerManager.WakeLock wl = null;
-
-    private Osmo4GLSurfaceView mGLView;
-
-    private GpacLogger logger;
-
-    private ProgressDialog startupProgress;
-
-    private LinearLayout gl_view;
-
-    /**
-     * Handling of Sensors
-     */
-    private SensorServices sensors;
-
-    // ---------------------------------------
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-	context = getApplicationContext();
-
-        try {
-			Class c = Class.forName("com.lge.real3d.Real3D");
-			final String LGE_3D_DISPLAY = "lge.hardware.real3d.barrier.landscape";
-			if(this.getPackageManager().hasSystemFeature(LGE_3D_DISPLAY))
-				m3DLibraryLoaded = true;
-        }
-        catch (ClassNotFoundException e) {
-        	m3DLibraryLoaded = false;
-        }
-		MPEGVSensor.myAct = this;
-        MPEGVSensor.initSensorManager((SensorManager) getSystemService(Context.SENSOR_SERVICE));
-		MPEGVSensor.initLocationManager((LocationManager)getSystemService(Context.LOCATION_SERVICE));
-
-        final String toOpen;
-        if (Intent.ACTION_VIEW.equals(getIntent().getAction())) {
-            Uri uri = getIntent().getData();
-            if (uri != null) {
-                synchronized (this) {
-                    toOpen = uri.toString();
-                }
-            } else
-                toOpen = null;
-        } else
-            toOpen = null;
-        if (gpacConfig == null) {
-            gpacConfig = new GpacConfig(this);
-            if (gpacConfig == null) {
-                Log.e(LOG_OSMO_TAG, "Failed to load GPAC config"); //$NON-NLS-1$
-                displayPopup(getResources().getString(R.string.failedToLoadGPACConfig),
-                             getResources().getString(R.string.failedToLoadGPACConfig));
-            } else
-                gpacConfig.ensureAllDirectoriesExist();
-        }
-        if (logger == null)
-            logger = new GpacLogger(gpacConfig);
-        logger.onCreate();
-        if (startupProgress == null) {
-            startupProgress = new ProgressDialog(this);
-            startupProgress.setCancelable(false);
-        }
-        startupProgress.setMessage(getResources().getText(R.string.osmoLoading));
-        startupProgress.setTitle(R.string.osmoLoading);
-        startupProgress.show();
-
-        if (mGLView != null) {
-            setContentView(R.layout.main);
-            if (toOpen != null)
-                openURLasync(toOpen);
-            // OK, it means activity has already been started
-            return;
-        }
-		Preview.context = this;
-
-        setContentView(R.layout.main);
-
-		final View contentView = (LinearLayout)findViewById(R.id.surface_gl);
-		mDecorView =  getWindow().getDecorView();
-
-	mDecorView.setOnSystemUiVisibilityChangeListener
-		(new View.OnSystemUiVisibilityChangeListener() {
-	    @Override
-	    public void onSystemUiVisibilityChange(int visibility) {
-		if ((visibility & View.SYSTEM_UI_FLAG_FULLSCREEN) == 0) {
-			uivisible = true;
-		} else {
-			uivisible = false;
-		}
-	    }
-	});
-
-		contentView.setClickable(true);
-        final GestureDetector clickDetector = new GestureDetector(this,
-		new GestureDetector.SimpleOnGestureListener() {
-			@Override
-			public boolean onSingleTapUp(MotionEvent e) {
-				if (uivisible) {
-					if (Osmo4.this.keyboardIsVisible)
-						((InputMethodManager) getSystemService(INPUT_METHOD_SERVICE)).hideSoftInputFromWindow(mGLView.getWindowToken(), 0);
-					hideSystemUI();
-				}
-				return true;
-			}
-		});
-        contentView.setOnTouchListener(new View.OnTouchListener() {
-            @Override
-            public boolean onTouch(View view, MotionEvent motionEvent) {
-                return clickDetector.onTouchEvent(motionEvent);
-            }
-        });
-
-	showSystemUI();
-		mGLView = new Osmo4GLSurfaceView(this);
-
-		gl_view = (LinearLayout)findViewById(R.id.surface_gl);
-
-        sensors = new SensorServices(this);
-
-        if( m3DLibraryLoaded ) //should be checking wether the terminal is a LG one
-        {
-        	//TryLoad3DClass(true);
-        	mReal3D = new Real3D(mGLView.getHolder());
-        	mReal3D.setReal3DInfo(new Real3DInfo(true, Real3D.REAL3D_TYPE_SS, Real3D.REAL3D_ORDER_LR));
-        }
-        service.submit(new Runnable() {
-
-            @Override
-            public void run() {
-                // loadAllModules();
-                runOnUiThread(new Runnable() {
-
-                    @Override
-                    public void run() {
-                        startupProgress.setIndeterminate(true);
-                        startupProgress.setMessage(getResources().getText(R.string.gpacLoading));
-                        PowerManager pm = (PowerManager) getSystemService(Context.POWER_SERVICE);
-                        WakeLock wl = pm.newWakeLock(PowerManager.SCREEN_DIM_WAKE_LOCK, LOG_OSMO_TAG);
-                        if (wl != null)
-                            wl.acquire();
-                        synchronized (Osmo4.this) {
-                            Osmo4.this.wl = wl;
-                        }
-
-                        Osmo4Renderer renderer = new Osmo4Renderer(Osmo4.this, gpacConfig, toOpen);
-                        mGLView.setRenderer(renderer);
-
-                        gl_view.addView(mGLView);
-
-                        sensors.setRenderer(renderer);
-                    }
-                });
-
-            }
-        });
-        // creates no media files if it does not exist
-        service.submit(new Runnable() {
-
-            @Override
-            public void run() {
-                for (String s : new String { gpacConfig.getGpacAppDirectory(), gpacConfig.getGpacCacheDirectory() }) {
-                    File noMedia = new File(s, ".nomedia"); //$NON-NLS-1$
-                    if (!noMedia.exists()) {
-                        try {
-                            noMedia.createNewFile();
-                        } catch (IOException e) {
-                            Log.w(LOG_OSMO_TAG, "Failed to create " + noMedia.getAbsolutePath(), e); //$NON-NLS-1$
-                        }
-                    }
-                }
-            }
-        });
-
-        //copy GUI elements
-        File guiDir = new File(gpacConfig.getGpacGuiDirectory());
-        if (!guiDir.isDirectory()) {
-        	// there was a file which have the same name with GUI dir, delete it
-        	if (guiDir.exists()) {
-        		if (!guiDir.delete())
-        			Log.e(LOG_OSMO_TAG, "Failed to delete " + guiDir);
-        	}
-        	if (!guiDir.mkdirs())
-        		Log.e(LOG_OSMO_TAG, "Failed to create directory " + guiDir);
-        	copyAssets(gpacConfig, GUI_ROOT_ASSET_DIR);
-        }
-
-        //copy Shaders
-        File shaderDir = new File(gpacConfig.getGpacShaderDirectory());
-        if (!shaderDir.isDirectory()) {
-            // we do not delete the directory if it already exists, because it might contain custom shaders
-            if (shaderDir.exists()) {
-                    Log.v(LOG_OSMO_TAG, "Shader directory already exists at: " + shaderDir);
-            }else if (!shaderDir.mkdirs()){
-                Log.e(LOG_OSMO_TAG, "Failed to create directory " + shaderDir);
-            }
-        }
-        copyAssets(gpacConfig, SHADER_ROOT_ASSET_DIR);
-
-        //if there is not a GPAC.cfg in external storage (i.e  using config in app directory)
-        //copy GPAC.cfg from gpacAppDirectoryto gpacLogDirectory
-        File osmo = new File(Environment.getExternalStorageDirectory(), "osmo");
-        File gpac_external_cfg = new File(osmo.getAbsolutePath(), "GPAC.cfg");
-        if (!gpac_external_cfg.exists()) {
-            try {
-                InputStream in = new FileInputStream(gpacConfig.getGpacAppDirectory() + "GPAC.cfg");
-                OutputStream out = new FileOutputStream(gpacConfig.getGpacLogDirectory() + "GPAC.cfg");
-                byte buf = new byte1024;
-                int len;
-                while ((len = in.read(buf)) > 0) {
-                    out.write(buf, 0, len);
-                }
-                in.close();
-                out.close();
-            } catch (IOException e) {
-                Log.d(LOG_OSMO_TAG, "Error in copying config file: " + e.toString());
-            }
-        }
-
-    }
-
-    /*
-     * Copy GUI elements
-     *
-     * @param config
-     *
-     * Reference: http://stackoverflow.com/questions/4447477/android-how-to-copy-files-from-assets-folder-to-sdcard
-    */
-    private final static String GUI_ROOT_ASSET_DIR = "gui";
-    private final static String SHADER_ROOT_ASSET_DIR = "shaders";
-
-    private void copyAssets(GpacConfig config, String asset_dir) {
-     		StringBuilder sb = new StringBuilder();
-     		HashMap<String, Throwable> exceptions = new HashMap<String, Throwable>();
-				AssetManager assetManager = getAssets();
-				String list = null;
-				Log.d(LOG_OSMO_TAG, "Copy assets of " + asset_dir);
-				try {
-				    list = assetManager.list(asset_dir);
-				} catch (IOException e) {
-				    Log.e(LOG_OSMO_TAG, "Failed to get asset file list.", e);
-				    exceptions.put("Failed to get asset file list", e);
-				}
-				for(String path : list) {
-				    try {
-				      copyFileOrDir(config, asset_dir, path);
-				    } catch(IOException e) {
-				        Log.e(LOG_OSMO_TAG, "Failed to copy: " + path, e);
-				        exceptions.put("Failed to copy " + path, e);
-				    }
-				}
-
-				if (!exceptions.isEmpty()) {
-					try {
-              PrintStream out = new PrintStream(config.getGpacLogDirectory() + "debug_assets.txt", "UTF-8"); //$NON-NLS-1$//$NON-NLS-2$
-	            sb.append("*** Exceptions:\n"); //$NON-NLS-1$
-	            for (Map.Entry<String, Throwable> ex : exceptions.entrySet()) {
-	                sb.append(ex.getKey()).append(": ") //$NON-NLS-1$
-	                  .append(ex.getValue().getLocalizedMessage())
-	                  .append('(')
-	                  .append(ex.getValue().getClass())
-	                  .append(")\n"); //$NON-NLS-1$
-	            }
-              out.println(sb.toString());
-              out.flush();
-              out.close();
-          } catch (Exception e) {
-              Log.e(LOG_OSMO_TAG, "Failed to output debug info to debug file", e); //$NON-NLS-1$
-          }
-				}
-		}
-
-		private void copyFileOrDir(GpacConfig config, String root, String path) throws IOException {
-				AssetManager assetManager = getAssets();
-				String assets = null;
-				assets = assetManager.list(root + "/" + path);
-				if (assets.length == 0) {
-				   copyFile(config, root, path);
-		    } else {
-                    String fullPath = null;
-                    if(root == GUI_ROOT_ASSET_DIR){
-                        fullPath = config.getGpacGuiDirectory() + path;
-                    }else if(root == SHADER_ROOT_ASSET_DIR){
-                        fullPath = config.getGpacShaderDirectory() + path;
-                    }else{  //Fallback (useless for now)
-                        fullPath = path;
-                    }
-		        File dir = new File(fullPath);
-		        if (!dir.exists())
-		            dir.mkdir();
-		        for (int i = 0; i < assets.length; ++i) {
-		            copyFileOrDir(config, root, path + "/" + assetsi);
-		        }
-		    }
-		}
-
-		private void copyFile(GpacConfig config, String root, String filename) throws IOException {
-		// if this file exists, do nothing
-
-            if(root.equals(GUI_ROOT_ASSET_DIR)){
-				if ((new File(config.getGpacGuiDirectory() + filename).exists()))
-					return;
-            }
-
-            AssetManager assetManager = getAssets();
-			InputStream in = null;
-			OutputStream out = null;
-			in = assetManager.open(root + "/" + filename);
-
-            String newFileName = null;
-            if(root.equals(GUI_ROOT_ASSET_DIR)){
-			     newFileName = config.getGpacGuiDirectory() + filename;
-            }else if(root.equals(SHADER_ROOT_ASSET_DIR)){
-                newFileName = config.getGpacShaderDirectory() + filename;
-            }else{  //Fallback
-                newFileName = filename;
-            }
-			  out = new FileOutputStream(newFileName);
-
-			  byte buffer = new byte1024;
-			  int read;
-			  while ((read = in.read(buffer)) != -1) {
-			      out.write(buffer, 0, read);
-			  }
-			  in.close();
-			  in = null;
-			  out.flush();
-			  out.close();
-			  out = null;
-		}
-
-    // ---------------------------------------
-
-    public static boolean isUIvisible(){
-	return uivisible;
-    }
-
-    public static boolean IskeyboardVisible(){
-	return keyboardIsVisible;
-    }
-
-    @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        MenuInflater inflater = getMenuInflater();
-        inflater.inflate(R.menu.main_menu, menu);
-        return true;
-    }
-
-    private String getRecentURLsFile() {
-        return gpacConfig.getGpacAppDirectory() + "recentURLs.txt"; //$NON-NLS-1$
-    }
-
-    private boolean openURL() {
-        Future<String> res = service.submit(new Callable<String>() {
-
-            @Override
-            public String call() throws Exception {
-                BufferedReader reader = null;
-                try {
-                    reader = new BufferedReader(new InputStreamReader(new FileInputStream(getRecentURLsFile()),
-                                                                      DEFAULT_ENCODING), DEFAULT_BUFFER_SIZE);
-
-                    String s = null;
-                    Set<String> results = new HashSet<String>();
-                    while (null != (s = reader.readLine())) {
-                        results.add(s);
-                    }
-                    addAllRecentURLs(results);
-                    return results.toArray(new String0);
-                } finally {
-                    if (reader != null)
-                        reader.close();
-                }
-            }
-        });
-        AlertDialog.Builder builder = new AlertDialog.Builder(this);
-        final AutoCompleteTextView textView = new AutoCompleteTextView(this);
-        textView.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_URI);
-        builder.setMessage(R.string.pleaseEnterAnURLtoConnectTo)
-               .setCancelable(true)
-               .setPositiveButton(R.string.open_url, new DialogInterface.OnClickListener() {
-
-                   @Override
-                   public void onClick(DialogInterface dialog, int id) {
-                       dialog.cancel();
-                       final String newURL = textView.getText().toString();
-                       openURLasync(newURL);
-                       service.execute(new Runnable() {
-
-                           @Override
-                           public void run() {
-                               addAllRecentURLs(Collections.singleton(newURL));
-                               File tmp = new File(getRecentURLsFile() + ".tmp"); //$NON-NLS-1$
-                               BufferedWriter w = null;
-                               try {
-                                   w = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(tmp),
-                                                                                 DEFAULT_ENCODING), DEFAULT_BUFFER_SIZE);
-                                   Collection<String> toWrite = getAllRecentURLs();
-                                   for (String s : toWrite) {
-                                       w.write(s);
-                                       w.write("\n"); //$NON-NLS-1$
-                                   }
-                                   w.close();
-                                   w = null;
-                                   if (tmp.renameTo(new File(getRecentURLsFile())))
-                                       Log.e(LOG_OSMO_TAG, "Failed to rename " + tmp + " to " + getRecentURLsFile()); //$NON-NLS-1$//$NON-NLS-2$
-
-                               } catch (IOException e) {
-                                   Log.e(LOG_OSMO_TAG, "Failed to write recent URLs to " + tmp, e); //$NON-NLS-1$
-                                   try {
-                                       if (w != null)
-                                           w.close();
-                                   } catch (IOException ex) {
-                                       Log.e(LOG_OSMO_TAG, "Failed to close stream " + tmp, ex); //$NON-NLS-1$
-                                   }
-                               }
-
-                           }
-                       });
-                   }
-               })
-               .setNegativeButton(R.string.cancel_button, null);
-
-        textView.setText("http://"); //$NON-NLS-1$
-        builder.setView(textView);
-
-        builder.show();
-        ArrayAdapter<String> adapter;
-        try {
-            adapter = new ArrayAdapter<String>(this,
-                                               android.R.layout.simple_dropdown_item_1line,
-                                               res.get(1, TimeUnit.SECONDS));
-            textView.setAdapter(adapter);
-        } catch (ExecutionException e) {
-            // Ignored
-            Log.e(LOG_OSMO_TAG, "Error while parsing recent URLs", e); //$NON-NLS-1$
-        } catch (TimeoutException e) {
-            Log.e(LOG_OSMO_TAG, "It took too long to parse recent URLs", e); //$NON-NLS-1$
-        } catch (InterruptedException e) {
-            Log.e(LOG_OSMO_TAG, "Interrupted while parsing recent URLs", e); //$NON-NLS-1$
-        }
-
-        return true;
-    }
-
-    private final ExecutorService service = Executors.newSingleThreadExecutor();
-
-    private final Set<String> allRecentURLs = new HashSet<String>();
-
-    private synchronized void addAllRecentURLs(Collection<String> urlsToAdd) {
-        allRecentURLs.addAll(urlsToAdd);
-    }
-
-    private synchronized Collection<String> getAllRecentURLs() {
-        return new ArrayList<String>(allRecentURLs);
-    }
-
-    private final static Charset DEFAULT_ENCODING = Charset.forName("UTF-8"); //$NON-NLS-1$
-
-    /**
-     * Opens a new activity to select a file
-     *
-     * @return true if activity has been selected
-     */
-    private boolean openFileDialog() {
-        String title = getResources().getString(R.string.pleaseSelectAFile);
-        Uri uriDefaultDir = Uri.fromFile(new File(gpacConfig.getGpacAppDirectory()));
-        Intent intent = new Intent();
-        intent.setAction(Intent.ACTION_PICK);
-        // Files and directories
-        intent.setDataAndType(uriDefaultDir, "vnd.android.cursor.dir/lysesoft.andexplorer.file"); //$NON-NLS-1$
-        // Optional filtering on file extension.
-        intent.putExtra("browser_filter_extension_whitelist", OSMO_REGISTERED_FILE_EXTENSIONS); //$NON-NLS-1$
-        // Title
-        intent.putExtra("explorer_title", title); //$NON-NLS-1$
-
-        try {
-            startActivityForResult(intent, PICK_FILE_REQUEST);
-            return true;
-        } catch (ActivityNotFoundException e) {
-            // OK, lets try with another one... (it includes out bundled one)
-            intent = new Intent("org.openintents.action.PICK_FILE"); //$NON-NLS-1$
-            intent.setData(uriDefaultDir);
-            intent.putExtra(FileChooserActivity.TITLE_PARAMETER, title);
-            intent.putExtra("browser_filter_extension_whitelist", OSMO_REGISTERED_FILE_EXTENSIONS); //$NON-NLS-1$
-            try {
-                startActivityForResult(intent, PICK_FILE_REQUEST);
-                return true;
-            } catch (ActivityNotFoundException ex) {
-                // Not found neither... We build our own dialog to display error
-                // Note that this should happen only if we did not embed out own intent
-                AlertDialog.Builder builder = new AlertDialog.Builder(this);
-                builder.setMessage("Impossible to find an Intent to choose a file... Cannot open file !") //$NON-NLS-1$
-                       .setCancelable(true)
-                       .setPositiveButton(R.string.cancel_button, null);
-                AlertDialog alert = builder.create();
-                alert.show();
-                return false;
-            }
-        }
-    }
-
-    // ---------------------------------------
-    @Override
-    protected void onActivityResult(int requestCode, int resultCode, Intent intent) {
-        if (requestCode == PICK_FILE_REQUEST) {
-            if (resultCode == RESULT_OK) {
-                Uri uri = intent.getData();
-                if (uri != null) {
-                    String url = uri.toString();
-                    String file = "file://"; //$NON-NLS-1$
-                    if (url.startsWith(file)) {
-                        url = uri.getPath();
-                    }
-                    Log.i(LOG_OSMO_TAG, "Requesting opening local file " + url); //$NON-NLS-1$
-                    openURLasync(url);
-                }
-            }
-        }
-    }
-
-    private String currentURL;
-
-    private void openURLasync(final String url) {
-        service.execute(new Runnable() {
-
-            @Override
-            public void run() {
-                mGLView.connect(url);
-                currentURL = url;
-                runOnUiThread(new Runnable() {
-
-                    @Override
-                    public void run() {
-                        setTitle(getResources().getString(R.string.titleWithURL, url));
-                    }
-                });
-            }
-        });
-    }
-
-    // ---------------------------------------
-
-    @Override
-    public void onConfigurationChanged(Configuration newConfig) {
-        super.onConfigurationChanged(newConfig);
-    }
-
-    // ---------------------------------------
-
-    private int last_orientation = 0;
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        // Handle item selection
-        switch (item.getItemId()) {
-            case R.id.open_url:
-                return openURL();
-            case R.id.open_file:
-                // newGame();
-                return openFileDialog();
-            case R.id.cleanCache:
-                return cleanCache();
-            case R.id.showVirtualKeyboard:
-                showKeyboard(!keyboardIsVisible);
-                return true;
-            case R.id.reloadFile:
-                openURLasync(currentURL);
-                return true;
-            case R.id.autoRotate:
-                if (item.isChecked()) {
-                    item.setChecked(false);
-                    last_orientation = this.getRequestedOrientation();
-                    int ornt = getResources().getConfiguration().orientation;
-                    if (ornt == Configuration.ORIENTATION_PORTRAIT)
-                        this.setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
-                    else
-                        this.setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
-                } else {
-                    item.setChecked(true);
-                    this.setRequestedOrientation(last_orientation);
-                }
-                return true;
-            case R.id.enableDebug:
-                if (item.isChecked()) {
-                    item.setChecked(false);
-                    mGLView.setGpacLogs("all@error"); //$NON-NLS-1$
-                } else {
-                    item.setChecked(true);
-                    mGLView.setGpacLogs("sync:codec:dash:media@debug:container@warning"); //$NON-NLS-1$
-                }
-                return true;
-            case R.id.setAsStartupFile: {
-                AlertDialog.Builder b = new AlertDialog.Builder(this);
-                b.setTitle(R.string.setAsStartupFileTitle);
-                if (currentURL != null) {
-                    b.setMessage(getResources().getString(R.string.setAsStartupFileMessage, currentURL));
-                    b.setPositiveButton(R.string.setAsStartupFileYes, new OnClickListener() {
-
-                        @Override
-                        public void onClick(DialogInterface dialog, int which) {
-                            dialog.dismiss();
-                            mGLView.setGpacPreference(CFG_STARTUP_CATEGORY, CFG_STARTUP_NAME, currentURL);
-                        }
-                    });
-                } else {
-                    b.setMessage(getResources().getString(R.string.setAsStartupFileMessageNoURL));
-                }
-                b.setNegativeButton(R.string.setAsStartupFileNo, new OnClickListener() {
-
-                    @Override
-                    public void onClick(DialogInterface dialog, int which) {
-                        dialog.dismiss();
-                    }
-                });
-                b.setNeutralButton(R.string.setAsStartupFileNull, new OnClickListener() {
-
-                    @Override
-                    public void onClick(DialogInterface dialog, int which) {
-                        dialog.dismiss();
-                        mGLView.setGpacPreference(CFG_STARTUP_CATEGORY, CFG_STARTUP_NAME, null);
-                    }
-                });
-                b.show();
-                return true;
-            }
-            case R.id.resetGpacConfig: {
-                AlertDialog.Builder b = new AlertDialog.Builder(this);
-                b.setCancelable(true)
-                .setTitle(R.string.resetGpacConfig)
-                .setMessage(R.string.resetGpacConfigMessage)
-                .setNegativeButton(R.string.cancel_button, null)
-                .setPositiveButton(R.string.ok_button, new OnClickListener() {
-                    @Override
-                    public void onClick(DialogInterface dialog, int which) {
-                        dialog.dismiss();
-                        setShouldDeleteGpacConfig(true);
-                        deleteConfigIfNeeded();
-                    }
-                })
-                .show();
-                return true;
-            }
-
-            case R.id.configFileEditor: {
-                Intent i = new Intent(Osmo4.this, ConfigFileEditorActivity.class);
-                startActivity(i);
-                return true;
-            }
-
-            case R.id.about: {
-                Dialog d = new Dialog(this);
-                d.setTitle(R.string.aboutTitle);
-                d.setCancelable(true);
-                d.setContentView(R.layout.about_dialog);
-                d.show();
-            }
-                return true;
-
-            case R.id.preferences:{
-                Intent i = new Intent(Osmo4.this, PrefsActivity.class);
-                startActivity(i);
-                return true;
-            }
-
-            case R.id.quit:
-                if ( mGLView != null )
-            		mGLView.disconnect();
-                this.finish();
-                return true;
-            default:
-                return super.onOptionsItemSelected(item);
-        }
-    }
-
-    /**
-     * Cleans GPAC cache
-     *
-     * @return true if successful
-     */
-    protected boolean cleanCache() {
-        final CharSequence oldTitle = getTitle();
-        runOnUiThread(new Runnable() {
-
-            @Override
-            public void run() {
-                startupProgress.setTitle(R.string.cleaningCache);
-                startupProgress.setMessage(getResources().getString(R.string.cleaningCache,
-                                                                    gpacConfig.getGpacCacheDirectory()));
-                startupProgress.setProgress(0);
-                startupProgress.setIndeterminate(false);
-                startupProgress.show();
-            }
-        });
-        service.submit(new Runnable() {
-
-            @Override
-            public void run() {
-                File dir = new File(gpacConfig.getGpacCacheDirectory());
-                if (!dir.exists() || !dir.canRead() || !dir.canWrite() || !dir.isDirectory()) {
-                    return;
-                }
-                File files = dir.listFiles();
-                int i = 0;
-                for (File f : files) {
-                    if (f.isFile())
-                        if (!f.delete()) {
-                            Log.w(LOG_OSMO_TAG, "Failed to delete file " + f); //$NON-NLS-1$
-                        } else {
-                            Log.v(LOG_OSMO_TAG, f + " has been deleted"); //$NON-NLS-1$
-                        }
-                    final int percent = (++i) * 100 / files.length;
-                    runOnUiThread(new Runnable() {
-
-                        @Override
-                        public void run() {
-                            startupProgress.setProgress(percent);
-                        }
-                    });
-                }
-                runOnUiThread(new Runnable() {
-
-                    @Override
-                    public void run() {
-                        startupProgress.setProgress(100);
-                        startupProgress.setTitle(oldTitle);
-                        startupProgress.dismiss();
-                    }
-                });
-            }
-        });
-        return true;
-    }
-
-    private void deleteConfigIfNeeded() {
-        if (isShouldDeleteGpacConfig()) {
-            Log.i(LOG_OSMO_TAG, "Deleting GPAC config file..."); //$NON-NLS-1$
-            File f = gpacConfig.getGpacConfigFile();
-            if (f.exists() && !f.delete()) {
-                Log.e(LOG_OSMO_TAG, "Failed to delete " + f.getAbsolutePath()); //$NON-NLS-1$
-            }
-            f = gpacConfig.getGpacLastRevFile();
-            if (f.exists() && !f.delete()) {
-                Log.e(LOG_OSMO_TAG, "Failed to delete " + f.getAbsolutePath()); //$NON-NLS-1$
-            }
-        }
-    }
-
-    // ---------------------------------------
-    @Override
-    protected void onDestroy() {
-        deleteConfigIfNeeded();
-        service.shutdown();
-        logger.onDestroy();
-        synchronized (this) {
-            if (wl != null)
-                wl.release();
-        }
-        Log.d(LOG_OSMO_TAG, "Disconnecting instance..."); //$NON-NLS-1$
-        mGLView.disconnect();
-        Log.d(LOG_OSMO_TAG, "Destroying GPAC instance..."); //$NON-NLS-1$
-        mGLView.destroy();
-        // Deleteing is done two times if GPAC fails to shutdown by crashing...
-        deleteConfigIfNeeded();
-        super.onDestroy();
-    }
-
-    @Override
-    public boolean onKeyDown(int keyCode, KeyEvent event) {
-        // Handle the back button
-        if (keyCode == KeyEvent.KEYCODE_BACK) {
-            // Ask the user if they want to quit
-            new AlertDialog.Builder(this).setIcon(android.R.drawable.ic_dialog_alert)
-                                         .setTitle(R.string.quit)
-                                         .setMessage(R.string.really_quit)
-                                         .setPositiveButton(R.string.yes, new DialogInterface.OnClickListener() {
-
-                                             @Override
-                                             public void onClick(DialogInterface dialog, int which) {
-
-                                                 // Stop the activity
-                                                 if ( mGLView != null )
-                                                     mGLView.disconnect();
-                                                 Osmo4.this.finish();
-                                             }
-
-                                         })
-                                         .setNegativeButton(R.string.no, null)
-                                         .show();
-
-            return true;
-        } else {
-            return super.onKeyDown(keyCode, event);
-        }
-
-    }
-
-    // ---------------------------------------
-    // private void loadAllModules() {
-    //        Log.i(LOG_OSMO_TAG, "Start loading all modules..."); //$NON-NLS-1$
-    // long start = System.currentTimeMillis();
-    // byte buffer = new byte1024;
-    // int ids = getAllRawResources();
-    //        String currentRevision = "$Revision$"; //$NON-NLS-1$
-    // File revisionFile = gpacConfig.getGpacLastRevFile();
-    // boolean fastStartup = false;
-    // // We check if we already copied all the modules once without error...
-    // if (revisionFile.exists() && revisionFile.canRead()) {
-    // BufferedReader r = null;
-    // try {
-    // r = new BufferedReader(new InputStreamReader(new FileInputStream(revisionFile), DEFAULT_ENCODING),
-    // DEFAULT_BUFFER_SIZE);
-    // String rev = r.readLine();
-    // if (currentRevision.equals(rev)) {
-    // fastStartup = true;
-    // }
-    // } catch (IOException ignored) {
-    // } finally {
-    // // Exception or not, always close the stream...
-    // if (r != null)
-    // try {
-    // r.close();
-    // } catch (IOException ignored) {
-    // }
-    // }
-    // }
-    // boolean noErrors = true;
-    // final StringBuilder errorsMsg = new StringBuilder();
-    // for (int i = 0; i < ids.length; i++) {
-    // OutputStream fos = null;
-    // InputStream ins = null;
-    //            String fn = gpacConfig.getGpacModulesDirectory() + m_modules_listi + ".so"; //$NON-NLS-1$
-    // File finalFile = new File(fn);
-    // // If file has already been copied, not need to do it again
-    // if (fastStartup && finalFile.exists() && finalFile.canRead()) {
-    //                Log.i(LOG_OSMO_TAG, "Skipping " + finalFile); //$NON-NLS-1$
-    // continue;
-    // }
-    // try {
-    // final String msg = getResources().getString(R.string.copying_native_libs,
-    // finalFile.getName(),
-    // finalFile.getParent());
-    // runOnUiThread(new Runnable() {
-    //
-    // @Override
-    // public void run() {
-    // startupProgress.setIndeterminate(false);
-    // startupProgress.setMessage(msg);
-    // }
-    // });
-    //                Log.i(LOG_OSMO_TAG, "Copying resource " + idsi + " to " //$NON-NLS-1$//$NON-NLS-2$
-    // + finalFile.getAbsolutePath());
-    //                File tmpFile = new File(fn + ".tmp"); //$NON-NLS-1$
-    // int read;
-    // ins = new BufferedInputStream(getResources().openRawResource(idsi), DEFAULT_BUFFER_SIZE);
-    // fos = new BufferedOutputStream(new FileOutputStream(tmpFile), DEFAULT_BUFFER_SIZE);
-    // while (0 < (read = ins.read(buffer))) {
-    // fos.write(buffer, 0, read);
-    // }
-    // ins.close();
-    // ins = null;
-    // fos.close();
-    // fos = null;
-    // if (!tmpFile.renameTo(finalFile)) {
-    // if (finalFile.exists() && finalFile.delete() && !tmpFile.renameTo(finalFile))
-    //                        Log.e(LOG_OSMO_TAG, "Failed to rename " + tmpFile.getAbsolutePath() + " to " //$NON-NLS-1$//$NON-NLS-2$
-    // + finalFile.getAbsolutePath());
-    // }
-    // final int percent = i * 10000 / ids.length;
-    // runOnUiThread(new Runnable() {
-    //
-    // @Override
-    // public void run() {
-    // startupProgress.setProgress(percent);
-    // }
-    // });
-    // } catch (IOException e) {
-    // noErrors = false;
-    //                String msg = "IOException for resource : " + idsi; //$NON-NLS-1$
-    // errorsMsg.append(msg).append('\n').append(finalFile.getAbsolutePath()).append('\n');
-    // errorsMsg.append(e.getLocalizedMessage());
-    // Log.e(LOG_OSMO_TAG, msg, e);
-    // } finally {
-    // if (ins != null) {
-    // try {
-    // ins.close();
-    // } catch (IOException e) {
-    //                        Log.e(LOG_OSMO_TAG, "Error while closing read stream", e); //$NON-NLS-1$
-    // }
-    // }
-    // if (fos != null) {
-    // try {
-    // fos.close();
-    // } catch (IOException e) {
-    //                        Log.e(LOG_OSMO_TAG, "Error while closing write stream", e); //$NON-NLS-1$
-    // }
-    // }
-    // }
-    // }
-    // // If no error during copy, fast startup will be enabled for next time
-    // if (noErrors && !fastStartup) {
-    // BufferedWriter w = null;
-    // try {
-    // w = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(revisionFile), DEFAULT_ENCODING),
-    // DEFAULT_BUFFER_SIZE);
-    // w.write(currentRevision);
-    // w.write('\n');
-    // // We add the date as second line to ease debug in case of problem
-    // w.write(String.valueOf(new Date()));
-    // } catch (IOException ignored) {
-    // } finally {
-    // if (w != null)
-    // try {
-    // w.close();
-    // } catch (IOException ignored) {
-    // }
-    // }
-    // } else {
-    // if (!noErrors) {
-    // setShouldDeleteGpacConfig(true);
-    //                displayMessage(errorsMsg.toString(), "Errors while copying modules !", GF_Err.GF_IO_ERR.value); //$NON-NLS-1$
-    // }
-    // }
-    //        Log.i(LOG_OSMO_TAG, "Done loading all modules, took " + (System.currentTimeMillis() - start) + "ms."); //$NON-NLS-1$ //$NON-NLS-2$
-    // startupProgress.setProgress(100);
-    // startupProgress.setIndeterminate(true);
-    // runOnUiThread(new Runnable() {
-    //
-    // @Override
-    // public void run() {
-    // setTitle(LOG_OSMO_TAG);
-    // }
-    // });
-    // }
-
-    // private int getAllRawResources() throws RuntimeException {
-    // R.raw r = new R.raw();
-    //
-    // java.lang.reflect.Field fields = R.raw.class.getDeclaredFields();
-    // final int ids = new intfields.length;
-    // m_modules_list = new Stringfields.length;
-    //
-    // try {
-    // for (int i = 0; i < fields.length; i++) {
-    // java.lang.reflect.Field f = fieldsi;
-    // idsi = f.getInt(r);
-    // m_modules_listi = f.getName();
-    //                Log.i(LOG_OSMO_TAG, "R.raw." + f.getName() + " = 0x" + Integer.toHexString(idsi)); //$NON-NLS-1$ //$NON-NLS-2$
-    // }
-    // } catch (IllegalArgumentException e) {
-    // throw new RuntimeException(e);
-    // } catch (IllegalAccessException e) {
-    // throw new RuntimeException(e);
-    // }
-    //
-    // return ids;
-    // }
-
-    // ---------------------------------------
-
-    private String lastDisplayedMessage;
-
-    private void displayPopup(final CharSequence message, final CharSequence title) {
-        final String fullMsg = getResources().getString(R.string.displayPopupFormat, title, message);
-        synchronized (this) {
-			// In case of an error message, always popup it
-            if (fullMsg.equals(lastDisplayedMessage) && !title.equals("Error"))
-                return;
-            lastDisplayedMessage = fullMsg;
-        }
-        runOnUiThread(new Runnable() {
-
-            @Override
-            public void run() {
-                Toast toast = Toast.makeText(Osmo4.this, fullMsg, Toast.LENGTH_SHORT);
-                toast.show();
-            }
-        });
-
-    }
-
-    /**
-     * @see com.gpac.Osmo4.GpacCallback#displayMessage(String, String, int)
-     */
-    @Override
-    public void displayMessage(final String message, final String title, final int status) {
-        if (status == GF_Err.GF_OK.value) {
-            // displayPopup(message, title);
-            Log.d(LOG_OSMO_TAG, message);
-        } else {
-            runOnUiThread(new Runnable() {
-
-                @Override
-                public void run() {
-                    StringBuilder sb = new StringBuilder();
-                    sb.append(GF_Err.getError(status));
-                    sb.append(' ');
-                    sb.append(title);
-                    AlertDialog.Builder builder = new AlertDialog.Builder(Osmo4.this);
-                    builder.setTitle(sb.toString());
-                    sb.append('\n');
-                    sb.append(message);
-                    builder.setMessage(sb.toString());
-                    builder.setCancelable(true);
-                    builder.setPositiveButton(R.string.ok_button, new OnClickListener() {
-
-                        @Override
-                        public void onClick(DialogInterface dialog, int which) {
-                            dialog.cancel();
-                        }
-                    });
-                    try {
-                        builder.create().show();
-                    } catch (WindowManager.BadTokenException e) {
-                        // May happen when we close the window and there are still somes messages
-                        Log.e(LOG_OSMO_TAG, "Failed to display Message " + sb.toString(), e); //$NON-NLS-1$
-                    }
-                }
-            });
-        }
-    }
-
-    /**
-     * @see com.gpac.Osmo4.GpacCallback#onLog(int, int, String)
-     */
-    @Override
-    public void onLog(int level, int module, String message) {
-        logger.onLog(level, module, message);
-		if (level == Log.ERROR)
-			displayPopup(message, "Error");
-    }
-
-    /**
-     * @see com.gpac.Osmo4.GpacCallback#onProgress(java.lang.String, int, int)
-     */
-    @Override
-    public void onProgress(final String msg, final int done, final int total) {
-        if (Log.isLoggable(LOG_OSMO_TAG, Log.DEBUG))
-            Log.d(LOG_OSMO_TAG, "Setting progress to " + done + "/" + total + ", message=" + msg); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-        runOnUiThread(new Runnable() {
-
-            @Override
-            public void run() {
-                // GPAC sometimes return total = 0
-                if (total < 1) {
-                    setProgressBarIndeterminate(true);
-                } else {
-                    int progress = done * 10000 / (total < 1 ? 1 : total);
-                    if (progress > 9900)
-                        progress = 10000;
-                    setProgressBarIndeterminate(false);
-                    setProgress(progress);
-                }
-            }
-        });
-    }
-
-    /**
-     * @see com.gpac.Osmo4.GpacCallback#onGPACReady()
-     */
-    @Override
-    public void onGPACReady() {
-        startupProgress.dismiss();
-        Log.i(LOG_OSMO_TAG, "GPAC is ready"); //$NON-NLS-1$
-    }
-
-    /**
-     * @see com.gpac.Osmo4.GpacCallback#onGPACError(java.lang.Throwable)
-     */
-    @Override
-    public void onGPACError(final Throwable e) {
-        startupProgress.dismiss();
-        Log.e(LOG_OSMO_TAG, "GPAC Error", e); //$NON-NLS-1$
-        runOnUiThread(new Runnable() {
-
-            @Override
-            public void run() {
-                // In such case, we force GPAC Configuration file deletion
-                setShouldDeleteGpacConfig(true);
-                StringBuilder sb = new StringBuilder();
-                sb.append("Failed to init GPAC due to "); //$NON-NLS-1$
-                sb.append(e.getClass().getSimpleName());
-                AlertDialog.Builder builder = new AlertDialog.Builder(Osmo4.this);
-                builder.setTitle(sb.toString());
-                sb.append('\n');
-                sb.append("Description: "); //$NON-NLS-1$
-                sb.append(e.getLocalizedMessage());
-                sb.append('\n');
-                sb.append("Revision: $Revision$"); //$NON-NLS-1$
-                sb.append("\nConfiguration information :\n") //$NON-NLS-1$
-                  .append(gpacConfig.getConfigAsText());
-                builder.setMessage(sb.toString());
-                builder.setCancelable(true);
-                builder.setPositiveButton(R.string.ok_button, new OnClickListener() {
-
-                    @Override
-                    public void onClick(DialogInterface dialog, int which) {
-                        dialog.cancel();
-                    }
-                });
-                builder.create().show();
-            }
-        });
-    }
-
-    @Override
-    protected void onPause() {
-        super.onPause();
-        if (mGLView != null)
-            mGLView.onPause();
-    }
-
-    @Override
-    protected void onResume() {
-        super.onResume();
-        if (mGLView != null)
-            mGLView.onResume();
-    }
-
-    /**
-     * @see com.gpac.Osmo4.GpacCallback#setCaption(java.lang.String)
-     */
-    @Override
-    public void setCaption(final String newCaption) {
-        runOnUiThread(new Runnable() {
-
-            @Override
-            public void run() {
-                setTitle(newCaption);
-            }
-        });
-    }
-
-    /**
-     * @see android.app.Activity#onStop()
-     */
-    @Override
-    protected void onStop() {
-        Log.i(LOG_OSMO_TAG, "onStop called on activity"); //$NON-NLS-1$
-        super.onStop();
-    }
-
-    /**
-     * @see com.gpac.Osmo4.GpacCallback#showKeyboard(boolean)
-     */
-    @Override
-    public void showKeyboard(boolean showKeyboard) {
-        this.keyboardIsVisible = showKeyboard;
-
-        runOnUiThread(new Runnable() {
-
-            @Override
-            public void run() {
-                InputMethodManager mgr = ((InputMethodManager) getSystemService(INPUT_METHOD_SERVICE));
-                if ( Osmo4.this.keyboardIsVisible ){
-                	mgr.showSoftInput(mGLView, 0);
-			getActionBar().hide();
-			getWindow().addFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
-			getWindow().addFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION);
-		}
-                else{
-                	mgr.hideSoftInputFromWindow(mGLView.getWindowToken(), 0);
-			getActionBar().show();
-			getWindow().clearFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
-			getWindow().clearFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION);
-		}
-                //mgr.toggleSoftInputFromWindow(mGLView.getWindowToken(), 0, 0);
-		 mGLView.requestFocus();
-            }
-        });
-    }
-	@Override
-    public void onWindowFocusChanged(boolean hasFocus) {
-        super.onWindowFocusChanged(hasFocus);
-
-        // When the window loses focus (e.g. the action overflow is shown),
-        // cancel any pending hide action. When the window gains focus,
-        // hide the system UI.
-        if (hasFocus) {
-            delayedHide(INITIAL_HIDE_DELAY);
-        } else {
-            mHideHandler.removeMessages(0);
-        }
-    }
-
-    public void setLogFile(String logfile) {
-	    logger.setEnableLogOnDisk(true);
-	    logger.setLogFile(logfile);
-    	logger.onCreate();
-    }
-
-    private void hideSystemUI() {
-        mDecorView.setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_STABLE
-										 | View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
-										 | View.SYSTEM_UI_FLAG_HIDE_NAVIGATION
-										 | View.SYSTEM_UI_FLAG_FULLSCREEN
-										 | View.SYSTEM_UI_FLAG_LOW_PROFILE
-										 | View.SYSTEM_UI_FLAG_IMMERSIVE);
-    }
-
-     private void showSystemUI() {
-        mDecorView.setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_STABLE
-										 | View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION
-										 | View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN);
-    }
-
-    private final Handler mHideHandler = new Handler() {
-        @Override
-        public void handleMessage(Message msg) {
-            hideSystemUI();
-        }
-    };
-
-    private void delayedHide(int delayMillis) {
-        mHideHandler.removeMessages(0);
-        mHideHandler.sendEmptyMessageDelayed(0, delayMillis);
-    }
-    /**
-     * @see com.gpac.Osmo4.GpacCallback#sensorSwitch(boolean)
-     */
-    @Override
-    public void sensorSwitch(final boolean active) {
-        if(active){
-            //this.setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
-            sensors.registerSensors();
-            Log.i(LOG_OSMO_TAG, "Received Register Sensors call");
-        }else{
-            sensors.unregisterSensors();
-            Log.i(LOG_OSMO_TAG, "Received Un-Register Sensors call");
-        }
-    }
-
-}

gpac-2.2.1.tar.gz/applications/deprecated/osmo4_android_studio/app/src/main/java/com/gpac/Osmo4/Osmo4GLSurfaceView.java Deleted

@@ -1,234 +0,0 @@
-package com.gpac.Osmo4;
-
-import android.content.Context;
-import android.opengl.GLSurfaceView;
-import android.util.Log;
-import android.view.KeyEvent;
-import android.view.MotionEvent;
-import android.widget.Toast;
-
-/**
- * The view represented the blitted contents by libgpac
- * 
- * @version $Revision$
- * 
- */
-public class Osmo4GLSurfaceView extends GLSurfaceView implements GPACInstanceInterface {
-
-    private final static String LOG_GL_SURFACE = Osmo4GLSurfaceView.class.getSimpleName();
-
-    /**
-     * Constructor
-     * 
-     * @param context
-     */
-    public Osmo4GLSurfaceView(Context context) {
-        super(context);
-        setEGLContextClientVersion(2);
-        setPreserveEGLContextOnPause(true);
-        setDebugFlags(DEBUG_CHECK_GL_ERROR | DEBUG_LOG_GL_CALLS);
-        setFocusable(true);
-        setFocusableInTouchMode(true);
-    }
-
-    private Osmo4Renderer gpacRenderer;
-
-    /**
-     * Set the renderer
-     * 
-     * @param renderer
-     */
-    public void setRenderer(Osmo4Renderer renderer) {
-        synchronized (this) {
-            this.gpacRenderer = renderer;
-        }
-        super.setRenderer(renderer);
-        setRenderMode(RENDERMODE_CONTINUOUSLY);
-    }
-
-    private synchronized Osmo4Renderer getGpacRenderer() {
-        return gpacRenderer;
-    }
-
-    private GPACInstance getInstance() {
-        Osmo4Renderer r = getGpacRenderer();
-        if (r == null)
-            return null;
-        return r.getInstance();
-    }
-
-    // ------------------------------------
-    @Override
-    public boolean onTouchEvent(final MotionEvent event) {
-	if(!Osmo4.isUIvisible() | Osmo4.IskeyboardVisible()){
-		queueEvent(new Runnable() {
-
-		    @Override
-		    public void run() {
-		        GPACInstance instance = getInstance();
-		        if (instance != null)
-		            instance.motionEvent(event);
-		    }
-		});
-		return true;
-	}
-    return false;
-    }
-
-    /**
-     * Should we handle this key in GPAC ?
-     * 
-     * @param keyCode
-     * @param event
-     * @return
-     */
-    private static final long TIME_INTERVAL = 500;
-    private static long mBackPressed;
-    private static boolean handleInGPAC(int keyCode, KeyEvent event) {
-        if (event.isSystem() && keyCode!=KeyEvent.KEYCODE_BACK)
-            return false;
-        switch (keyCode) {
-            case KeyEvent.KEYCODE_MEDIA_STOP:
-            case KeyEvent.KEYCODE_MENU:
-		return false;
-            case KeyEvent.KEYCODE_BACK:
-		if (mBackPressed + TIME_INTERVAL > System.currentTimeMillis()){
-			return false;
-		}
-                return true;
-            default:
-                return true;
-        }
-    }
-
-    @Override
-    public boolean onKeyDown(final int keyCode, final KeyEvent event) {
-	if (keyCode == KeyEvent.KEYCODE_BACK) Toast.makeText(Osmo4.context, "Press back button twice to exit", Toast.LENGTH_SHORT).show();
-        if (handleInGPAC(keyCode, event)) {
-            Log.d(LOG_GL_SURFACE, "onKeyDown = " + keyCode); //$NON-NLS-1$
-            queueEvent(new Runnable() {
-
-                @Override
-                public void run() {
-                    GPACInstance instance = getInstance();
-                    if (instance != null)
-                        instance.eventKey(keyCode, event, true, event.getUnicodeChar());
-                }
-            });
-            return true;
-        }
-        return false;
-    }
-
-    // ------------------------------------
-    @Override
-    public boolean onKeyUp(final int keyCode, final KeyEvent event) {
-        if (handleInGPAC(keyCode, event)) {
-            Log.d(LOG_GL_SURFACE, "onKeyUp =" + keyCode); //$NON-NLS-1$
-	    if (keyCode == KeyEvent.KEYCODE_BACK) mBackPressed = System.currentTimeMillis();
-            queueEvent(new Runnable() {
-
-                @Override
-                public void run() {
-                    GPACInstance instance = getInstance();
-                    if (instance != null)
-                        instance.eventKey(keyCode, event, false, event.getUnicodeChar());
-                }
-            });
-            return true;
-        }
-        return false;
-    }
-
-    @Override
-    public void onResume() {
-        if (getInstance() != null)
-            super.onResume();
-    }
-
-    @Override
-    public void onPause() {
-        if (getInstance() != null)
-            super.onPause();
-    }
-
-    /**
-     * @see com.gpac.Osmo4.GPACInstanceInterface#connect(java.lang.String)
-     */
-    @Override
-    public void connect(final String url) {
-        queueEvent(new Runnable() {
-
-            @Override
-            public void run() {
-                GPACInstance instance = getInstance();
-                if (instance != null)
-                    instance.connect(url);
-            }
-        });
-    }
-
-    /**
-     * @see com.gpac.Osmo4.GPACInstanceInterface#disconnect()
-     */
-    @Override
-    public void disconnect() {
-        queueEvent(new Runnable() {
-
-            @Override
-            public void run() {
-                GPACInstance instance = getInstance();
-                if (instance != null)
-                    instance.disconnect();
-            }
-        });
-    }
-
-    /**
-     * @see com.gpac.Osmo4.GPACInstanceInterface#destroy()
-     */
-    @Override
-    public void destroy() {
-        queueEvent(new Runnable() {
-
-            @Override
-            public void run() {
-                GPACInstance instance = getInstance();
-                if (instance != null)
-                    instance.destroy();
-            }
-        });
-    }
-
-    /**
-     * @see com.gpac.Osmo4.GPACInstanceInterface#setGpacPreference(String, String, String)
-     */
-    @Override
-    public void setGpacPreference(final String category, final String name, final String value) {
-        queueEvent(new Runnable() {
-
-            @Override
-            public void run() {
-                GPACInstance instance = getInstance();
-                if (instance != null)
-                    instance.setGpacPreference(category, name, value);
-            }
-        });
-    }
-    
-    /**
-     * @see com.gpac.Osmo4.GPACInstanceInterface#setGpacLogs(String tools_at_levels)
-     */
-    @Override
-    public void setGpacLogs(final String tools_at_levels) {
-        queueEvent(new Runnable() {
-
-            @Override
-            public void run() {
-                GPACInstance instance = getInstance();
-                if (instance != null)
-                    instance.setGpacLogs(tools_at_levels);
-            }
-        });
-    }
-}

gpac-2.2.1.tar.gz/applications/deprecated/osmo4_android_studio/app/src/main/java/com/gpac/Osmo4/Osmo4Renderer.java Deleted

@@ -1,98 +0,0 @@
-package com.gpac.Osmo4;
-
-import javax.microedition.khronos.egl.EGLConfig;
-import javax.microedition.khronos.opengles.GL10;
-import android.opengl.GLES20;
-import android.opengl.GLSurfaceView;
-import android.util.Log;
-
-/**
- * The renderer
- * 
- * @version $Revision$
- * 
- */
-public class Osmo4Renderer implements GLSurfaceView.Renderer {
-
-    private final GpacConfig gpacConfig;
-
-    private final static String LOG_RENDERER = Osmo4Renderer.class.getSimpleName();
-
-    @Override
-    public void onSurfaceCreated(GL10 gl, EGLConfig config) {
-        if (instance == null) {
-            try {
-                Log.i(LOG_RENDERER, "Creating instance from thread " + Thread.currentThread()); //$NON-NLS-1$
-                instance = new GPACInstance(callback, 320, 430, gpacConfig, urlToLoad);
-            } catch (com.gpac.Osmo4.GPACInstanceInterface.GpacInstanceException e) {
-                Log.e(LOG_RENDERER, "Failed to create new GPAC instance !"); //$NON-NLS-1$
-                instance = null;
-                callback.onGPACError(e);
-                return;
-            }
-            if (callback != null)
-                callback.onGPACReady();
-        }
-    }
-
-    private GPACInstance instance = null;
-
-    private final String urlToLoad;
-
-    /**
-     * @return the urlToLoad
-     */
-    public synchronized String getUrlToLoad() {
-        return urlToLoad;
-    }
-
-    /**
-     * Constructor
-     * 
-     * @param callback
-     * @param gpacConfig
-     * @param urlToLoad The URL to load at startup, can be null
-     */
-    public Osmo4Renderer(GpacCallback callback, GpacConfig gpacConfig, String urlToLoad) {
-        this.callback = callback;
-        this.urlToLoad = urlToLoad;
-        this.gpacConfig = gpacConfig;
-    }
-
-    private final GpacCallback callback;
-
-    @Override
-    public void onSurfaceChanged(GL10 gl, int w, int h) {
-        // gl.glViewport(0, 0, w, h);
-        if (instance != null) {
-            Log.i(LOG_RENDERER, "Surface changed from thread " + Thread.currentThread()); //$NON-NLS-1$
-            instance.resize(w, h);
-        }
-    }
-
-    private int frames;
-
-    private long startFrame = System.currentTimeMillis();
-
-    @Override
-    public void onDrawFrame(GL10 gl) {
-        if (instance != null) {
-            frames++;
-            if (frames % 1000 == 0) {
-                long now = System.currentTimeMillis();
-                Log.i(LOG_RENDERER, "Frames Per Second = " + ((now - startFrame) / 1000) + " fps"); //$NON-NLS-1$//$NON-NLS-2$
-                this.startFrame = now;
-            }
-            instance.render();
-        }
-    }
-
-    /**
-     * Get the current GPAC Instance
-     * 
-     * @return the instance
-     */
-    synchronized GPACInstance getInstance() {
-        return instance;
-    }
-}

gpac-2.2.1.tar.gz/applications/deprecated/osmo4_android_studio/app/src/main/java/com/gpac/Osmo4/Preview.java Deleted

@@ -1,694 +0,0 @@
-package com.gpac.Osmo4;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.lang.reflect.Method;
-import java.util.List;
-import android.app.Activity;
-import android.app.ProgressDialog;
-import android.graphics.Bitmap;
-import android.graphics.PixelFormat;
-import android.hardware.Camera;
-import android.hardware.Camera.Parameters;
-import android.hardware.Camera.Size;
-import android.os.Environment;
-import android.os.Handler;
-import android.os.HandlerThread;
-import android.util.Log;
-import android.view.SurfaceHolder;
-import android.view.SurfaceView;
-import android.view.View;
-import android.widget.LinearLayout;
-
-/**
- * Manage camera preview and frame grabbing.
- * 
- * Mostly copied from
- * 
- * {@link "http://developer.android.com/resources/samples/ApiDemos/src/com/example/android/apis/graphics/CameraPreview.html"}
- */
-public class Preview {
-
-    private static final String TAG = "Preview"; //$NON-NLS-1$
-
-    private Camera mCamera = null;
-
-    private Size mPreviewSize = null;
-
-    private int nBuffers = 0;
-
-    private int mBufferSize = 0;
-
-    private int mPreviewFormat = 0;
-
-    private PreviewHandler mPreviewHandler = null;
-
-    private boolean takePicture = false;
-
-    private boolean mPreviewing = false;
-
-    private boolean isPortrait = false;
-
-    private int width = 0;
-
-    private int height = 0;
-    
-    private int bitsPerPixel = 0;
-	
-	public static Activity context = null;
-	
-	private boolean previewRequested = false;
-	private boolean previewStarted = false;
-	
-	private CameraPreview camPreview = null;
-
-    // Native functions
-    private native void processFrameBuf(byte data);
-
-    Preview() {
-        mCamera = Camera.open();
-        if (mCamera == null) {
-            Log.e(TAG, "Camera failed to open"); //$NON-NLS-1$
-            return;
-        }
-        setParameters(mCamera.getParameters());
-        mCamera.release();
-        mCamera = null;
-    }
-	
-	private class CameraPreview implements SurfaceHolder.Callback {
-		
-		private SurfaceHolder holder = null;
-		private SurfaceView mCamSV;
-		private boolean hasCallback = false;
-		//private LinearLayout cam_view;
-		
-		private ProgressDialog cameraOpening;
- 
-		
-		public CameraPreview(final Activity context) {
-			Log.v(TAG, "CameraPreview: Constructor...");
-			
-			cameraOpening = new ProgressDialog(context);
-			cameraOpening.setCancelable(false);
-			cameraOpening.setIndeterminate(true);
-			cameraOpening.setMessage("Opening camera");
-			cameraOpening.setTitle("Osmo4 camera");
-			
-			//cam_view = (LinearLayout)context.findViewById(R.id.surface_camera);
-		        
-		    //cam_view.addView(mCamSV);
-		    
-		    context.runOnUiThread(new Runnable() {
-				
-				@Override
-				public void run() {
-					cameraOpening.show();
-				}
-			});
-
-			mCamSV = (SurfaceView)context.findViewById(R.id.surface_camera);
-			
-		    holder = mCamSV.getHolder();
-			holder.addCallback(CameraPreview.this);
-			holder.setType(SurfaceHolder.SURFACE_TYPE_PUSH_BUFFERS);
-			
-			hasCallback = true;
-
-			context.runOnUiThread(new Runnable() {
-				
-				@Override
-				public void run() {
-					Log.i(TAG, "CameraPreview: Set visible...");
-					mCamSV.setVisibility(View.VISIBLE);
-					Log.i(TAG, "CameraPreview: Set visible done");
-				}
-			});
-			Log.v(TAG, "CameraPreview: Constructor done");
-		}
-		
-		public void startPreview()
-		{
-			Log.v(TAG, "CameraPreview: Start preview...");
-			mCamera.startPreview();
-			context.runOnUiThread(new Runnable() {
-				@Override
-				public void run() {
-					//Log.i(TAG, "CameraPreview: Set gone...");
-					Log.i(TAG, "CameraPreview: Dismiss");
-					//mCamSV.setVisibility(View.GONE);
-					cameraOpening.dismiss();
-					//Log.i(TAG, "CameraPreview: Set gone done");
-				}
-			});
-			mPreviewHandler = new PreviewHandler("CameraPreviewHandler");
-			mPreviewing = true;
-			Log.v(TAG, "CameraPreview: Start preview done");
-		}
-		
-		public void stopPreview()
-		{
-			if ( hasCallback )
-			{
-				Log.v(TAG, "CameraPreview: Remove callback");
-				holder.removeCallback(CameraPreview.this);
-				//cam_view.removeView(mCamSV);
-				//mCamSV = null;
-				context.runOnUiThread(new Runnable() {
-					@Override
-					public void run() {
-						Log.i(TAG, "CameraPreview: Set gone...");
-						mCamSV.setVisibility(View.GONE);
-						Log.i(TAG, "CameraPreview: Set gone done");
-					}
-				});
-				hasCallback = false;
-			}
-		}
-
-		@Override
-		public void surfaceChanged(SurfaceHolder holder, int format, int width,
-				int height) {
-			Log.v(TAG, "CameraPreview: Surface changed "+width+"x"+height+" ...");
-		}
-
-		@Override
-		public void surfaceCreated(SurfaceHolder holder) {
-			try {
-				Log.v(TAG, "CameraPreview: Surface created...");
-				mCamera.setPreviewDisplay(holder);
-				if ( previewRequested )	{
-					startPreview();
-					previewRequested = false;
-				}
-				else
-					previewStarted = true;
-				Log.v(TAG, "CameraPreview: Surface created done");
-			} catch (IOException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
-			}
-		}
-
-		@Override
-		public void surfaceDestroyed(SurfaceHolder holder) {
-			// TODO Auto-generated method stub
-			
-		}
-		
-		@Override
-		public void finalize()
-		{
-			stopPreview();
-			camPreview = null;
-		}
-	}
-		
-    @Override
-    protected void finalize() {
-        stopCamera();
-    }
-
-    /**
-     * Set up the camera parameters and begin the preview.
-     * 
-     * @param isPortrait True if camera orientation is portrait. False if it is landscape.
-     * @return True if successful.
-     */
-    public boolean initializeCamera(boolean isPortrait) {
-	
-        this.isPortrait = isPortrait;
-
-        // Open camera
-        if (mCamera == null) {
-            Log.i(TAG, "Open camera..."); //$NON-NLS-1$
-            mCamera = Camera.open();
-            if (mCamera == null) {
-                Log.w(TAG, "Camera failed to open"); //$NON-NLS-1$
-                return false;
-            }
-        }
-
-        pausePreview();
-
-        // Get parameters
-        mCamera.setParameters(setParameters(mCamera.getParameters()));
-        width = mPreviewSize.width;
-				height = mPreviewSize.height;
-        if (mPreviewSize == null || mPreviewFormat == 0) {
-            Log.e(TAG, "Preview size or format error"); //$NON-NLS-1$
-            return false;
-        }
-
-        // Define buffer size
-        PixelFormat pixelinfo = new PixelFormat();
-        PixelFormat.getPixelFormatInfo(mPreviewFormat, pixelinfo);
-        bitsPerPixel = pixelinfo.bitsPerPixel;
-        mBufferSize = mPreviewSize.width * mPreviewSize.height * pixelinfo.bitsPerPixel / 8;
-        Log.d(TAG, "Pixelsize = " + pixelinfo.bitsPerPixel + " Buffersize = " + mBufferSize); //$NON-NLS-1$//$NON-NLS-2$
-        nBuffers = 1;
-
-        // Initialize frame grabbing
-        // mPreviewHandler = new PreviewHandler("CameraPreviewHandler");
-
-        context.runOnUiThread(new Runnable() {
-			
-			@Override
-			public void run() {
-				camPreview = new CameraPreview(context);
-				//camPreview.setVisibility(View.INVISIBLE);
-			}
-		});
-
-        Log.d(TAG, "Camera preview started"); //$NON-NLS-1$
-        return true;
-    }
-
-    /**
-     * Get the size of Preview
-     * 
-     * @return null if camera not setup
-     */
-    public Size getPreviewSize() {
-        return mPreviewSize;
-    }
-
-    /**
-     * Get the preview format
-     * 
-     * @return 0 if not initialized
-     */
-    public int getPreviewFormat() {
-        return mPreviewFormat;
-    }
-
-    /**
-     * Get the Image height
-     * 
-     * @return -1 if not initialized, the height otherwise
-     */
-    public int getImageHeight() {
-        Size sz = getPreviewSize();
-        if (sz == null)
-            return -1;
-        return sz.height;
-    }
-
-    /**
-     * Get the image Width if set
-     * 
-     * @return -1 if not initialized, the width otherwise
-     */
-    public int getImageWidth() {
-        Size sz = getPreviewSize();
-        if (sz == null)
-            return -1;
-        return sz.width;
-    }
-    
-    /**
-     * Get the bits per pixel
-     * 
-     * @return 0 if not initialized
-     */
-    public int getBitsPerPixel() {
-        return bitsPerPixel;
-    }
-
-    /**
-     * Stop preview and release the camera. Because the CameraDevice object is not a shared resource, it is very
-     * important to release it when the activity is paused.
-     */
-    public void stopCamera() {
-        Log.v(TAG, "stopCamera()"); //$NON-NLS-1$
-
-        if ( mPreviewing )
-			pausePreview();
-        if (mCamera != null) {
-			camPreview.stopPreview();
-			camPreview = null;
-            mCamera.release();
-            mCamera = null;
-            previewRequested = false;
-			previewStarted = false;
-			Log.v(TAG, "Camera released"); //$NON-NLS-1$
-        }
-    }
-
-    /**
-     * Stop the processing thread
-     */
-    public void pausePreview() {
-		Log.v(TAG, "pausePreview()");
-		if ( mPreviewing ) {
-			if ( mPreviewHandler != null )
-				mPreviewHandler.stopPreview();
-            mPreviewHandler = null;
-            mCamera.stopPreview();
-            mPreviewing = false;
-			Log.v(TAG, "Camera preview stopped"); //$NON-NLS-1$
-        }
-    }
-
-    /**
-     * Restart the processing thread
-     */
-    public void resumePreview() {
-        Log.v(TAG, "resumePreview()");
-		if ( previewStarted ) {
-			camPreview.startPreview();
-			previewStarted = false;
-		}
-		else
-			previewRequested = true;
-    }
-
-    /**
-     * Set preferred mPreviewSize and mPrevieformat and return adapted camera parameters. If mPreviewSize == null or
-     * mPreviewFormat == 0 then some error has occurred.
-     * 
-     * @param parameters the parameters to set
-     * 
-     * @return the parameters set as argument
-     * @throws IllegalArgumentException if argument is null
-     */
-    protected Camera.Parameters setParameters(Camera.Parameters parameters) throws IllegalArgumentException {
-        if (parameters == null)
-            throw new IllegalArgumentException("parameters must not be null"); //$NON-NLS-1$
-        // Get preview size
-        mPreviewSize = parameters.getPreviewSize();
-				parameters.setPreviewSize(mPreviewSize.width, mPreviewSize.height);
-        Log.d(TAG, "PreviewSize: " + mPreviewSize.width + 'x' + mPreviewSize.height); //$NON-NLS-1$
-
-        // Get preview format
-        mPreviewFormat = PixelFormat.YCbCr_420_SP;
-        // getOptimalPreviewFormat(parameters
-        // .getSupportedPreviewFormats());
-        if (mPreviewFormat == 0) {
-            Log.e(TAG, "Cannot set mPreviewFormat"); //$NON-NLS-1$
-        } else {
-            Log.d(TAG, "Previewformat: " + mPreviewFormat); //$NON-NLS-1$
-            parameters.setPreviewFormat(mPreviewFormat);
-        }
-
-				Log.d(TAG, "PreviewFrameRate: " + parameters.getPreviewFrameRate()); //$NON-NLS-1$
-        parameters.setPreviewFrameRate(parameters.getPreviewFrameRate());
-        parameters.setFocusMode(Parameters.FOCUS_MODE_CONTINUOUS_VIDEO );
-
-        return parameters;
-    }
-	
-		
-	private Size getOptimalPreviewSize(List<Size> sizes, int w, int h) {
-        final double ASPECT_TOLERANCE = 0.1;
-        double targetRatio = (double) w / h;
-        if (sizes == null) return null;
-
-        Size optimalSize = null;
-        double minDiff = Double.MAX_VALUE;
-
-        int targetHeight = h;
-
-        // Try to find an size match aspect ratio and size
-        for (Size size : sizes) {
-            double ratio = (double) size.width / size.height;
-            if (Math.abs(ratio - targetRatio) > ASPECT_TOLERANCE) continue;
-            if (Math.abs(size.height - targetHeight) < minDiff) {
-                optimalSize = size;
-                minDiff = Math.abs(size.height - targetHeight);
-            }
-        }
-
-        // Cannot find the one match the aspect ratio, ignore the requirement
-        if (optimalSize == null) {
-            minDiff = Double.MAX_VALUE;
-            for (Size size : sizes) {
-                if (Math.abs(size.height - targetHeight) < minDiff) {
-                    optimalSize = size;
-                    minDiff = Math.abs(size.height - targetHeight);
-                }
-            }
-        }
-        return optimalSize;
-    }
-
-    /**
-     * Return preferred camera preview format. At the moment, PixelFormat.YCbCr_420_SP is required.
-     * 
-     * @param formats Supported formats: Camera.Parameters.getSupportedPreviewFormats()
-     * @return Image format 17 (YUV420SP) if supported, 0 if not.
-     */
-    protected int getOptimalPreviewFormat(List<Integer> formats) {
-        int optFormat = 0;
-        for (Integer format : formats) {
-            int intFormat = format.intValue();
-            Log.d(TAG, "supported image format: " + intFormat); //$NON-NLS-1$
-            if (intFormat == PixelFormat.YCbCr_420_SP) {
-                optFormat = intFormat;
-            }
-        }
-        return optFormat;
-    }
-
-    /**
-     * Process a frame grabbed from the camera.
-     * 
-     * @param data Image from camera in YUV420SP format.
-     */
-    protected void processFrame(byte data) {
-        if (takePicture) {
-            // Test: decode and save image
-            int rgbBuf = decodeYUV420SP(data, width, height);
-            saveImageToFile(rgbBuf, width, height);
-            takePicture = false;
-        }
-        // End of test
-
-        // Send data to C library
-        processFrameBuf(data);
-    }
-
-    /**
-     * Save an RGB image to the file /sdcard/image.jpg
-     * 
-     * @param rgbBuffer RGB image buffer to save
-     * @param width Width of the image
-     * @param height Height of the image
-     */
-    public void saveImageToFile(int rgbBuffer, int width, int height) {
-        Bitmap bm = Bitmap.createBitmap(rgbBuffer, width, height, Bitmap.Config.RGB_565);
-
-        // Save image
-        String path = Environment.getExternalStorageDirectory().toString();
-        OutputStream fOut = null;
-        File file = new File(path, "image.jpg"); //$NON-NLS-1$
-        try {
-            try {
-                fOut = new FileOutputStream(file);
-                bm.compress(Bitmap.CompressFormat.JPEG, 100, fOut);
-                fOut.flush();
-            } catch (IOException e1) {
-                Log.e(TAG, "io error file output stream while writing", e1); //$NON-NLS-1$
-                e1.printStackTrace();
-            } finally {
-                if (fOut != null)
-                    fOut.close();
-            }
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-    }
-
-    /**
-     * Convert an image from YUV to RGB format.
-     * 
-     * @param yuv420sp YUV format image, as a byte array
-     * @param width Width of the image
-     * @param height Height of the image
-     * @return RGB image as an int array
-     */
-    public int decodeYUV420SP(byte yuv420sp, int width, int height) {
-        final int frameSize = width * height;
-
-        int rgb = new intwidth * height;
-        for (int j = 0, yp = 0; j < height; j++) {
-            int uvp = frameSize + (j >> 1) * width, u = 0, v = 0;
-            for (int i = 0; i < width; i++, yp++) {
-                int y = (0xff & (yuv420spyp)) - 16;
-                if (y < 0)
-                    y = 0;
-                if ((i & 1) == 0) {
-                    v = (0xff & yuv420spuvp++) - 128;
-                    u = (0xff & yuv420spuvp++) - 128;
-                }
-
-                int y1192 = 1192 * y;
-                int r = (y1192 + 1634 * v);
-                int g = (y1192 - 833 * v - 400 * u);
-                int b = (y1192 + 2066 * u);
-
-                if (r < 0)
-                    r = 0;
-                else if (r > 262143)
-                    r = 262143;
-                if (g < 0)
-                    g = 0;
-                else if (g > 262143)
-                    g = 262143;
-                if (b < 0)
-                    b = 0;
-                else if (b > 262143)
-                    b = 262143;
-                rgbyp = 0xff000000 | ((r << 6) & 0xff0000) | ((g >> 2) & 0xff00) | ((b >> 10) & 0xff);
-            }
-        }
-        return rgb;
-    }
-
-    /**
-     * Interface between PreviewHandler and mCamera
-     * 
-     * @param cb
-     */
-    private void setPreviewCallbackWithBuffer(Camera.PreviewCallback cb) {
-        // call mCamera.setPreviewCallbackWithBuffer(cb)
-        // if cb != null then also add a callback buffers
-        try {
-            if (bufferWorks) {
-                if (cb != null) {
-                    for (int i = 0; i < nBuffers; i++) {
-                        // TODO level 8: mCamera.addCallbackBuffer(new
-                        // bytemBufferSize);
-                        camAddCbBuffer.invoke(mCamera, new bytemBufferSize);
-                    }
-                }
-                // TODO level 8: mCamera.setPreviewCallbackWithBuffer(cb);
-                camSetPreview.invoke(mCamera, cb);
-            } else if (cb != null) {
-                mCamera.setOneShotPreviewCallback(cb);
-            }
-        } catch (Exception e) {
-            Log.e(TAG, "setPreviewCallbackWithBuffer failed:" + e, e); //$NON-NLS-1$
-        }
-    }
-
-    private int fps_max_count = 100;
-
-    private int fps_count = 1;
-
-    private long fps_last = -42;
-
-    private void addCallbackBuffer(byte buffer) {
-        if (--fps_count == 0) {
-            long now = System.currentTimeMillis();
-            if (fps_last != -42) {
-                float fps = fps_max_count * 1000.f / (now - fps_last);
-                Log.i(TAG, "fps: " + fps); //$NON-NLS-1$
-                fps_max_count = (int) (5.f * fps);
-            }
-            fps_count = fps_max_count;
-            fps_last = now;
-        }
-        try {
-            if (bufferWorks) {
-                camAddCbBuffer.invoke(mCamera, buffer);
-            } else {
-                mCamera.setOneShotPreviewCallback(mPreviewHandler);
-            }
-        } catch (Exception e) {
-            Log.e(TAG, "addCallbackBuffer failed: " + e); //$NON-NLS-1$
-        }
-    }
-
-    /*
-     * TODO: for level 8 all the stuff below becomes obsolete Use reflection for accessing hidden methods
-     */
-    private static final Method getCamAddCallbackBuffer() {
-        try {
-            return Class.forName("android.hardware.Camera").getMethod("addCallbackBuffer", byte.class); //$NON-NLS-1$//$NON-NLS-2$
-        } catch (Exception e) {
-            Log.e(TAG, "No addCallbackBuffer: " + e); //$NON-NLS-1$
-        }
-        return null;
-    }
-
-    private static final Method getCamSetPreviewCallbackWithBuffer() {
-        try {
-            return Class.forName("android.hardware.Camera").getMethod("setPreviewCallbackWithBuffer", //$NON-NLS-1$ //$NON-NLS-2$
-                                                                      Camera.PreviewCallback.class);
-        } catch (Exception e) {
-            Log.e(TAG, "No setPreviewCallbackWithBuffer: " + e); //$NON-NLS-1$
-        }
-        return null;
-    }
-
-    /**
-     * Handles camera frame buffer callbacks in a new thread.
-     */
-    protected class PreviewHandler extends HandlerThread implements Camera.PreviewCallback {
-
-        private Handler mHandler;
-
-        private boolean stopped = false;
-
-        PreviewHandler(String name) {
-            super(name);
-            mHandler = null;
-            start();
-        }
-
-        @Override
-        public void onPreviewFrame(final byte data, final Camera camera) {
-        	synchronized (this) {
-				if (mHandler != null && camera == mCamera) {
-                mHandler.post(new Runnable() {
-
-                    @Override
-                    public void run() {
-                        if (!stopped) {
-                            processFrame(data);
-                            if (mHandler != null) {
-                                addCallbackBuffer(data);
-                            }
-                        }
-                    }
-                });
-            }
-			}
-            
-        }
-
-        @Override
-        synchronized protected void onLooperPrepared() {
-        	synchronized (this) {
-	            Log.v(TAG, "onLooperPrepared()"); //$NON-NLS-1$
-	            if (stopped == false) {
-	                mHandler = new Handler();
-	                Log.d(TAG, "frame processing start"); //$NON-NLS-1$
-	                setPreviewCallbackWithBuffer(this);
-	                // mCamera.setPreviewCallback(this);
-	            }
-        	}
-        }
-
-        synchronized private void stopPreview() {
-        	synchronized (this) {
-		        stopped = true;
-		        if (mHandler != null) {
-		            Log.d(TAG, "frame processing stop"); //$NON-NLS-1$
-		            setPreviewCallbackWithBuffer(null);
-		            // mCamera.setPreviewCallback(null);
-		            mHandler = null;
-		        }
-        	}
-        }
-    }
-
-    private static final Method camAddCbBuffer = getCamAddCallbackBuffer();
-
-    private static final Method camSetPreview = getCamSetPreviewCallbackWithBuffer();
-
-    private static final boolean bufferWorks = camAddCbBuffer != null && camSetPreview != null;
-}

gpac-2.2.1.tar.gz/applications/deprecated/osmo4_android_studio/app/src/main/java/com/gpac/Osmo4/SensorServices.java Deleted

@@ -1,385 +0,0 @@
-package com.gpac.Osmo4;
-
-import android.content.Context;
-import android.util.Log;
-import android.view.Display;
-import android.view.WindowManager;
-
-
-import java.util.TimerTask;
-import java.util.Timer;
-
-import android.hardware.Sensor;
-import android.hardware.SensorEvent;
-import android.hardware.SensorEventListener;
-import android.hardware.SensorManager;
-
-/**
- * Class for 360video sensors management
- *
- * @author Emmanouil Potetsianakis <emmanouil.potetsianakis@telecom-paristech.fr>
- * @version $Revision$
- */
-public class SensorServices implements SensorEventListener, GPACInstanceInterface {
-
-    //automatically set to true, if TYPE_ROTATION_VECTOR sensor is detected
-    //NOTE: this is a composite sensor; does not work with fusion
-    private boolean useRotationVector;
-
-//Startof Options
-    private static final int SENSOR_DELAY = SensorManager.SENSOR_DELAY_FASTEST;   // 0: SENSOR_DELAY_FASTEST, 1: SENSOR_DELAY_GAME, 2: SENSOR_DELAY_UI, 3: SENSOR_DELAY_NORMAL
-
-    private static final boolean USE_ORIENTATION_FILTER = true;       //if true smoothSensorMeasurement is applied to getOrientation result
-    private static final boolean USE_ORIENTATION_THRESHOLD = true;    //if true keepOrientation() discards results within the error margin
-
-    //the lower the value, the more smoothing is applied (lower response) - set to 1.0 for no filter
-    private static final float ORIENTATION_FILTER_LVL = 0.04f;
-    //threshold to discard orientation x, y, z
-    private static final float ORIENTATION_THRESHOLD = {0.2f, 0.02f, 0.02f};
-//Endof Options
-
-
-    private static SensorManager sensorManager;
-
-    private static Sensor accelerometer;    //base sensor
-    private static Sensor magnetometer;     //base sensor
-    private static Sensor rotationSensor;   //composite sensor
-
-    protected Osmo4Renderer rend;
-    private Display displayDev;
-
-    private boolean newOrientation = false; //auto-set to true when new Rotation arrives (from acc), auto-set to false when rotation is sent to player
-
-    private Timer fuseTimer = new Timer();
-
-    private float acceleration = {0.0f, 0.0f, 0.0f};  //holds acceleration values (g)
-    private float magnetic = {0.0f, 0.0f, 0.0f};      //holds magnetic field values (μT)
-    private float rotationValues = {0.0f, 0.0f, 0.0f};//holds rotation vector
-    private float orientation = {0.0f, 0.0f, 0.0f};   //from acc+magn
-    private float lastOrient = {0.0f, 0.0f, 0.0f}, prevOrient;
-
-    private float rotationMx = new float9;
-    private float rotationMxRaw = new float9;
-
-    private static final String LOG_TAG = "GPAC SensorServices";
-    private static final float _PI_ = (float) Math.PI;
-
-
-    /**
-     * Constructor (initialize sensors)
-     *
-     * @param context The parent Context
-     * @return SensorServices object
-     */
-    public SensorServices(Context context) {
-        //init sensors
-        sensorManager = (SensorManager) context.getSystemService(Context.SENSOR_SERVICE);
-        magnetometer = sensorManager.getDefaultSensor(Sensor.TYPE_MAGNETIC_FIELD);
-        accelerometer = sensorManager.getDefaultSensor(Sensor.TYPE_ACCELEROMETER);
-        rotationSensor = sensorManager.getDefaultSensor(Sensor.TYPE_ROTATION_VECTOR);
-
-        //init the rest
-        WindowManager wm = (WindowManager) context.getSystemService(Context.WINDOW_SERVICE);
-        displayDev = wm.getDefaultDisplay();
-
-        //check sensor availability and select
-        if(rotationSensor!=null){
-            useRotationVector = true;
-            return;
-        }else{
-            Log.w(LOG_TAG, "No Rotation Vector composit sensor found - Switching to Acc+Magn sensors");
-        }
-
-        if (magnetometer == null || accelerometer == null){
-            Log.e(LOG_TAG, "No Accelerometer and/or Magnetic Field sensors found"); //TODOk handle this - rollback to manual navigation
-        }
-
-    }
-
-    public void setRenderer(Osmo4Renderer renderer) {
-        rend = renderer;
-    }
-
-    /**
-     * Register sensors to start receiving data
-     */
-    public void registerSensors() {
-
-        if(rotationSensor!=null){
-            sensorManager.registerListener(this, rotationSensor, SENSOR_DELAY);
-            Log.i(LOG_TAG, "Using Rotation Vector sensor for 360navigation");
-            return;
-        }
-
-        if(magnetometer != null && accelerometer != null){
-            sensorManager.registerListener(this, magnetometer, SENSOR_DELAY);
-            sensorManager.registerListener(this, accelerometer, SENSOR_DELAY);
-            Log.i(LOG_TAG, "Using Acceleration & Magnetic Field sensors for 360navigation");
-        }
-    }
-
-    //TODOk we do not handle this yet - there is an issue with onResume (not working) and onPause (working)
-    public void unregisterSensors() {
-        sensorManager.unregisterListener(this);
-    }
-
-    /**
-     * We calculate rotation/orientation on new acc measurements
-     **/
-    @Override
-    public void onSensorChanged(SensorEvent event) {
-
-        boolean newevent = false;
-
-        switch (event.sensor.getType()) {
-            case Sensor.TYPE_ROTATION_VECTOR:
-                rotationValues = event.values.clone();
-                newOrientation = calculateRotationMx();
-                if (newOrientation){
-                    float tmpOrient = new float3;
-                    SensorManager.getOrientation(rotationMx, tmpOrient);
-                    rend.getInstance().onOrientationChange(-tmpOrient0, tmpOrient1, -tmpOrient2);
-                }
-                return;
-            case Sensor.TYPE_ACCELEROMETER:
-                newevent=true;
-                acceleration = event.values.clone();
-                break;
-            case Sensor.TYPE_MAGNETIC_FIELD:
-                newevent=true;
-                magnetic = event.values.clone();
-                break;
-            default:
-                return;
-        }
-        if(newevent){
-            newOrientation = calculateRotationMx();
-            if (!newOrientation) return;
-            calculateOrientation();
-            updateOrientation();
-        }
-    }
-
-    /**
-     * Calculate orientation X,Y,Z from Acc and Magn
-     * Orientation is stored in prevOrient
-     * Rotation matrix is stored in rotationMx
-     *
-     * @return true if rotationMatrix was updated
-     */
-    private boolean calculateRotationMx() {
-        boolean gotRotation = false;
-
-
-        if(useRotationVector){
-            try {
-                SensorManager.getRotationMatrixFromVector(rotationMxRaw, rotationValues);
-                gotRotation = true;
-            } catch (Exception e) {
-                gotRotation = false;
-                Log.e(LOG_TAG, "Error getting rotation matrix" + e.getMessage());
-            }
-        }else{
-            try {
-                gotRotation = SensorManager.getRotationMatrix(rotationMxRaw, null, acceleration, magnetic);
-            } catch (Exception e) {
-                gotRotation = false;
-                Log.e(LOG_TAG, "Error getting rotation matrix" + e.getMessage());
-            }
-        }    
-
-        if (gotRotation) {
-            //NOTE: the rotation considered is according to device natural orientation
-            //and it might NOT be the same as the screen orientation
-            switch (displayDev.getRotation()) {
-                case 1: //Surface.ROTATION_90
-                    rotationMx = rotationMxRaw.clone();
-                    break;
-                case 2: //Surface.ROTATION_180
-                    SensorManager.remapCoordinateSystem(rotationMxRaw, SensorManager.AXIS_Y, SensorManager.AXIS_MINUS_X, rotationMx);
-                    break;
-                case 3: //Surface.ROTATION_270
-                    SensorManager.remapCoordinateSystem(rotationMxRaw, SensorManager.AXIS_MINUS_X, SensorManager.AXIS_MINUS_Y, rotationMx);
-                    break;
-                case 0: //no rotation (= Surface.ROTATION_0)
-                    SensorManager.remapCoordinateSystem(rotationMxRaw, SensorManager.AXIS_MINUS_Y, SensorManager.AXIS_X, rotationMx);
-                    break;
-            }
-        }
-
-        return gotRotation;
-    }
-
-    private void calculateOrientation() {
-        float tmpOrient = new float3;
-        SensorManager.getOrientation(rotationMx, tmpOrient);
-        orientation = tmpOrient.clone();
-    }
-
-    private void updateOrientation() {
-        lastOrient = orientation.clone();
-        boolean refreshOrientation = true;
-        if (USE_ORIENTATION_THRESHOLD) {
-            refreshOrientation = keepOrientation(lastOrient, prevOrient);
-        }
-
-        if (refreshOrientation) {
-            if (USE_ORIENTATION_FILTER) {
-                prevOrient = smoothSensorMeasurement(lastOrient, prevOrient);
-            } else {
-                prevOrient = lastOrient;
-            }
-        }
-
-        //NOTE: we invert yaw and roll (for 360 navigation)
-        rend.getInstance().onOrientationChange(-prevOrient0, prevOrient1, -prevOrient2);
-        newOrientation = false;
-    }
-
-    private float getRotationMxFromOrientation(float o) {
-        float xM = new float9;
-        float yM = new float9;
-        float zM = new float9;
-
-        float sinX = (float) Math.sin(o1);
-        float cosX = (float) Math.cos(o1);
-        float sinY = (float) Math.sin(o2);
-        float cosY = (float) Math.cos(o2);
-        float sinZ = (float) Math.sin(o0);
-        float cosZ = (float) Math.cos(o0);
-
-        // rotation about x-axis (pitch)
-        xM0 = 1.0f;
-        xM1 = 0.0f;
-        xM2 = 0.0f;
-        xM3 = 0.0f;
-        xM4 = cosX;
-        xM5 = sinX;
-        xM6 = 0.0f;
-        xM7 = -sinX;
-        xM8 = cosX;
-
-        // rotation about y-axis (roll)
-        yM0 = cosY;
-        yM1 = 0.0f;
-        yM2 = sinY;
-        yM3 = 0.0f;
-        yM4 = 1.0f;
-        yM5 = 0.0f;
-        yM6 = -sinY;
-        yM7 = 0.0f;
-        yM8 = cosY;
-
-        // rotation about z-axis (azimuth)
-        zM0 = cosZ;
-        zM1 = sinZ;
-        zM2 = 0.0f;
-        zM3 = -sinZ;
-        zM4 = cosZ;
-        zM5 = 0.0f;
-        zM6 = 0.0f;
-        zM7 = 0.0f;
-        zM8 = 1.0f;
-
-        // rotation order is y, x, z (roll, pitch, azimuth)
-        float resultMatrix = multiplyMx(xM, yM);
-        resultMatrix = multiplyMx(zM, resultMatrix);
-        return resultMatrix;
-    }
-
-    private float multiplyMx(float A, float B) {
-        float result = new float9;
-
-        result0 = A0 * B0 + A1 * B3 + A2 * B6;
-        result1 = A0 * B1 + A1 * B4 + A2 * B7;
-        result2 = A0 * B2 + A1 * B5 + A2 * B8;
-
-        result3 = A3 * B0 + A4 * B3 + A5 * B6;
-        result4 = A3 * B1 + A4 * B4 + A5 * B7;
-        result5 = A3 * B2 + A4 * B5 + A5 * B8;
-
-        result6 = A6 * B0 + A7 * B3 + A8 * B6;
-        result7 = A6 * B1 + A7 * B4 + A8 * B7;
-        result8 = A6 * B2 + A7 * B5 + A8 * B8;
-
-        return result;
-    }
-
-    private static boolean keepOrientation(float in, float out) {
-
-        if (out == null) return true;
-
-        for (int i = 0; i < in.length; i++) {
-            if (Math.abs(ini - outi) > ORIENTATION_THRESHOLDi) return true;
-        }
-
-        return false;
-    }
-
-
-    private static float smoothSensorMeasurement(float in, float out) {
-
-        if (out == null) return in;
-
-        float output = {0.0f, 0.0f, 0.0f};
-        float diff = 0.0f;
-
-
-        for (int i = 0; i < in.length; i++) {
-
-            diff = (ini - outi);
-
-            if (Math.abs(diff) > Math.PI) {
-                float diff_f = 0.0f;
-                if (diff > Math.PI) {
-                    diff = 2 * _PI_ - diff;
-                    diff_f = outi - ORIENTATION_FILTER_LVL * diff;
-                    if (diff_f < -Math.PI) {
-                        outputi = (2 * _PI_ + diff_f);
-                    } else {
-                        outputi = diff_f;
-                    }
-                } else if (diff < -Math.PI) {
-                    diff = 2 * _PI_ + diff;
-                    diff_f = outi + ORIENTATION_FILTER_LVL * diff;
-                    if (diff_f > Math.PI) {
-                        outputi = -2 * _PI_ + diff_f;
-                    } else {
-                        outputi = diff_f;
-                    }
-
-                }
-
-            } else {
-                outputi = outi + ORIENTATION_FILTER_LVL * diff;
-            }
-        }
-
-        return output;
-    }
-
-
-    @Override
-    public void onAccuracyChanged(Sensor sensor, int accuracy) {
-        //required - but not used
-    }
-
-    @Override
-    public native void setGpacLogs(String tools_at_levels);
-
-    @Override
-    public native void setGpacPreference(String category, String name, String value);
-
-    @Override
-    public void destroy() {
-    }
-
-    @Override
-    public void connect(String pop) {
-    }
-
-    @Override
-    public void disconnect() {
-    }
-
-}
\ No newline at end of file

gpac-2.2.1.tar.gz/applications/deprecated/osmo4_android_studio/app/src/main/java/com/gpac/Osmo4/extra Deleted

gpac-2.2.1.tar.gz/applications/deprecated/osmo4_android_studio/app/src/main/java/com/gpac/Osmo4/extra/ConfigFileEditor.java Deleted

@@ -1,326 +0,0 @@
-package com.gpac.Osmo4.extra;
-
-import android.content.Context;
-import android.util.Log;
-
-import com.gpac.Osmo4.GpacConfig;
-
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
-import org.xmlpull.v1.XmlPullParserFactory;
-
-import java.io.BufferedReader;
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-
-
-public class ConfigFileEditor {
-
-    private String TAG = "ConfigFileEditor";
-
-    private String ATTRIBUTE_NAME = "name";
-    private String ATTRIBUTE_TYPE = "type";
-    private String ATTRIBUTE_DEFAULT = "default";
-    private String ATTRIBUTE_USAGE = "usage";
-
-    private final String TYPE_PATH = "path";
-    private final String TYPE_FILENAME = "filename";
-    private final String TYPE_STRING = "string";
-    private final String TYPE_BOOLEAN = "boolean";
-    private final String TYPE_UINT = "uint";
-
-    private File configFile;
-
-    private XmlPullParserFactory xmlFactoryObject;
-    private XmlPullParser parser;
-    private GpacConfig config;
-    private Context context;
-
-    public ConfigFileEditor(Context context) {
-        this.context = context;
-        config = new GpacConfig(context);
-        configFile = new File(config.getGpacConfigDirectory(), "GPAC.cfg");
-
-        try {
-            xmlFactoryObject = XmlPullParserFactory.newInstance();
-        } catch (XmlPullParserException e) {
-            Log.v(TAG, "Cannot create xml parser new instance");
-            e.printStackTrace();
-        }
-    }
-
-    private void start() {
-        InputStream inputStream = null;
-        try {
-            inputStream  = context.getAssets().open("configuration.xml");
-            parser = xmlFactoryObject.newPullParser();
-            parser.setInput(inputStream, null);
-        } catch (XmlPullParserException | IOException e) {
-            e.printStackTrace();
-        }
-    }
-
-    /**
-     *  get all the keys from the xml file
-     *
-     * @return array of all keys
-     */
-    public String getAllKeys() {
-        ArrayList<String> list = new ArrayList<>();
-        int event = 0;
-        try {
-            start();
-            event = parser.getEventType();
-
-            while (event != XmlPullParser.END_DOCUMENT) {
-                String name = parser.getName();
-                switch (event) {
-                    case XmlPullParser.START_TAG:
-                        if (name.equals("key")) {
-                            String attrName = parser.getAttributeValue(null, ATTRIBUTE_NAME).trim();
-                            list.add(attrName);
-                        }
-                        break;
-
-                    case XmlPullParser.END_TAG:
-                        break;
-                }
-                event = parser.next();
-            }
-        } catch (XmlPullParserException e) {
-            Log.e(TAG, "XML Exception");
-            e.printStackTrace();
-        } catch (IOException e) {
-            Log.e(TAG, "IOException");
-            e.printStackTrace();
-        }
-        return list.toArray(new String0);
-    }
-
-    /**
-     *  get all the attributes for a single key
-     *
-     * @param key key to find attributes for
-     * @return Attribute object with all attributes set. If key not found, returns null
-     */
-    public Attribute getAllAttributesForKey(String key) {
-        Attribute attribute = null;
-        String section = null;
-        String attrName = null;
-        String attrType = null;
-        String attrDfault = null;
-        String attrUsage = null;
-        StringBuilder attrDescription = new StringBuilder();
-
-        boolean keyFound = false;
-        boolean exit = false;
-        int depth = 0;
-        int event;
-        try {
-            start();                    //start from beginning
-            event = parser.getEventType();
-            while (event != XmlPullParser.END_DOCUMENT && !exit) {
-                String name = parser.getName();
-                switch (event) {
-                    case XmlPullParser.START_TAG:
-
-                        if(name.equals("section")){
-                            section = parser.getAttributeValue(null, ATTRIBUTE_NAME);
-                        }
-                        if (name.equals("key") && parser.getAttributeValue(null, ATTRIBUTE_NAME).equals(key)) {
-                            attrName = parser.getAttributeValue(null, ATTRIBUTE_NAME);
-                            attrType = parser.getAttributeValue(null, ATTRIBUTE_TYPE);
-                            attrDfault = parser.getAttributeValue(null, ATTRIBUTE_DEFAULT);
-                            attrUsage = parser.getAttributeValue(null, ATTRIBUTE_USAGE);
-                            keyFound = true;
-                        }
-                        if(keyFound)
-                            ++depth;
-                        if (keyFound && depth > 1){
-                            attrDescription.append("<").append(parser.getName()).append(">");
-                        }
-                        break;
-
-                    case XmlPullParser.TEXT:
-                        if(keyFound) {
-                            attrDescription.append(parser.getText().trim());
-                        }
-                        break;
-
-                    case XmlPullParser.END_TAG:
-                        if(keyFound)
-                            --depth;
-
-                        if (keyFound && depth > 0){
-                            attrDescription.append("</").append(parser.getName()).append(">");
-                        }
-
-                        if(name.equals("key") && keyFound){
-                            attribute = new Attribute(section, attrName, attrType, attrDfault, attrUsage, attrDescription.toString());
-                            keyFound = false;
-                            exit = true;
-                        }
-                        break;
-                }
-                event = parser.next();
-            }
-        } catch (XmlPullParserException e) {
-            Log.e(TAG, "XML Exception");
-            e.printStackTrace();
-        } catch (IOException e) {
-            Log.e(TAG, "IOException");
-            e.printStackTrace();
-        }
-        return attribute;
-    }
-
-
-    /**
-     * get value for key from the config file
-     *
-     * @param key key to find
-     * @return the value from the config file, if key not found, returns null.
-     */
-    public String getValue(String key) {
-        String line;
-        try {
-            BufferedReader br = new BufferedReader(new FileReader(configFile));
-
-            while ((line = br.readLine()) != null) {
-                String parts = line.split("=");
-                if(parts0.trim().equals(key)){
-                    return parts1;
-                }
-            }
-            br.close();
-        } catch (FileNotFoundException e) {
-            Log.e(TAG, "GPAC.cfg not found");
-            e.printStackTrace();
-        } catch (IOException e) {
-            Log.e(TAG, "IO Exception while parsing GPAC.cfg");
-            e.printStackTrace();
-        }
-        return null;
-    }
-
-    /**
-     *  checks if the new value is valid or not.
-     * @param type type of newValue
-     * @param newValue value to check
-     * @return true if valid, otherwise false
-     */
-    public boolean isValueValid(String type, String newValue) {
-
-        switch (type) {
-          /*  case TYPE_PATH:
-            case TYPE_FILENAME:
-                File file = new File(newValue);
-                if(!file.exists()){
-                    Log.e(TAG, "The path does not exist : " + newValue);
-                    return false;
-                }
-                break;
-          */
-
-            case TYPE_BOOLEAN:
-                return newValue.equals("yes") || newValue.equals("no");
-
-            case TYPE_UINT:
-                try {
-                    int num = Integer.parseInt(newValue);
-                    return num >= 0;
-                } catch(Exception e) {
-                    Log.e(TAG, "The type is uint but value provided: "+ newValue);
-                    return false;
-                }
-
-            case TYPE_STRING:
-            default:
-                return true;
-
-        }
-    }
-
-    /**
-     *   set the value in the config file
-     * @param key key for newValue
-     * @param newValue
-     */
-    public void setValue(String key, String newValue) {
-
-        String line = null;
-        try {
-            File tempFile = new File(config.getGpacConfigDirectory(), "temp.cfg");
-            BufferedReader br = new BufferedReader(new FileReader(configFile));
-            BufferedWriter bw = new BufferedWriter(new FileWriter(tempFile));
-
-            while ((line = br.readLine()) != null) {
-                String parts = line.split("=");
-                if(parts0.equals(key)){
-                    line = key + "=" + newValue;
-                }
-                bw.write(line);
-                bw.newLine();
-            }
-            br.close();
-            bw.close();
-
-            if(!configFile.delete()) {
-                Log.e(TAG, "Cannot delete config file");
-            }
-
-            if(!tempFile.renameTo(configFile)) {
-                Log.e(TAG, "Cannot rename temp file to GPAC.cfg");
-            }
-
-        } catch (IOException e) {
-            Log.e(TAG, "IOException ");
-            e.printStackTrace();
-        }
-    }
-
-    class Attribute {
-        private String section;
-        private String name;
-        private String type;
-        private String dfault;
-        private String usage;
-        private String desciption;
-
-        public Attribute(String section, String name, String type, String dfault, String usage, String desciption) {
-            this.section = section;
-            this.name = name;
-            this.type = type;
-            this.dfault = dfault;
-            this.usage = usage;
-            this.desciption = desciption;
-        }
-
-        public String getName() {
-            return name;
-        }
-
-        public String getType() {
-            return type;
-        }
-
-        public String getDefault() {
-            return dfault;
-        }
-
-        public String getUsage() {
-            return usage;
-        }
-
-        public String getDesciption() {
-            return desciption;
-        }
-    }
-
-}

gpac-2.2.1.tar.gz/applications/deprecated/osmo4_android_studio/app/src/main/java/com/gpac/Osmo4/extra/ConfigFileEditorActivity.java Deleted

@@ -1,150 +0,0 @@
-package com.gpac.Osmo4.extra;
-
-import android.app.Activity;
-import android.os.Bundle;
-import android.text.Html;
-import android.text.method.ScrollingMovementMethod;
-import android.util.Log;
-import android.view.KeyEvent;
-import android.view.View;
-import android.widget.AdapterView;
-import android.widget.ArrayAdapter;
-import android.widget.AutoCompleteTextView;
-import android.widget.Button;
-import android.widget.EditText;
-import android.widget.TextView;
-import android.widget.Toast;
-
-import com.gpac.Osmo4.R;
-
-
-public class ConfigFileEditorActivity extends Activity {
-
-    private String TAG = "ConfigFileEditorActivity";
-
-    private AutoCompleteTextView optionsTextView;
-    private TextView typeTextView;
-    private TextView dfaultTextView;
-    private TextView usageTextView;
-    private TextView descriptionTextView;
-    private TextView currentValueTextView;
-    private EditText newValueEditText;
-    private Button saveButton;
-    private String currentValue;
-
-    private ConfigFileEditor editor;
-    private ConfigFileEditor.Attribute attribute;
-    private String currentName;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_config_file_editor);
-
-        optionsTextView = (AutoCompleteTextView) findViewById(R.id.optionsTextView);
-        typeTextView = (TextView) findViewById(R.id.typeTextView);
-        dfaultTextView = (TextView) findViewById(R.id.dfaultTextView);
-        usageTextView = (TextView) findViewById(R.id.usageTextView);
-        descriptionTextView = (TextView) findViewById(R.id.descriptionTextView);
-        currentValueTextView = (TextView) findViewById(R.id.currentValueEditText);
-        newValueEditText = (EditText) findViewById(R.id.newValueEditText);
-        saveButton = (Button) findViewById(R.id.saveButton);
-
-        descriptionTextView.setMovementMethod(new ScrollingMovementMethod());
-        editor = new ConfigFileEditor(this);
-        final Stringkeys = editor.getAllKeys();
-        final ArrayAdapter<String> adapter = new ArrayAdapter<>(this,
-                android.R.layout.simple_dropdown_item_1line, keys);
-        optionsTextView.setAdapter(adapter);
-
-        optionsTextView.setOnClickListener(onOptionTextViewClick);
-        optionsTextView.setOnItemClickListener(onItemClick);
-        optionsTextView.setOnKeyListener(keyListener);
-        saveButton.setOnClickListener(onSaveButtonClick);
-    }
-
-    private View.OnClickListener onOptionTextViewClick = new View.OnClickListener() {
-        @Override
-        public void onClick(View v) {
-            optionsTextView.showDropDown();
-        }
-    };
-
-    private AdapterView.OnItemClickListener onItemClick = new AdapterView.OnItemClickListener() {
-        @Override
-        public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-            setAllFields((String) parent.getItemAtPosition(position));
-        }
-    };
-
-    private View.OnKeyListener keyListener = new View.OnKeyListener() {
-        @Override
-        public boolean onKey(View v, int keyCode, KeyEvent event) {
-            if(event.getAction() == KeyEvent.ACTION_DOWN &&
-                    keyCode == KeyEvent.KEYCODE_ENTER) {
-                currentName = optionsTextView.getText().toString().trim();
-                if (currentName == null || currentName.equals("")) {
-                    return false;
-                } else {
-                    optionsTextView.dismissDropDown();
-                    setAllFields(currentName);
-                    return true;
-                }
-            }
-            return false;
-        }
-    };
-
-    private View.OnClickListener onSaveButtonClick = new View.OnClickListener() {
-        @Override
-        public void onClick(View v) {
-            String newValue = newValueEditText.getText().toString().trim();
-            if(newValue == null || newValue.equals("")) {
-                Toast.makeText(ConfigFileEditorActivity.this, "New value is empty", Toast.LENGTH_LONG).show();
-                return;
-            }
-
-            if(currentValue == null){
-                Log.e(TAG, getString(R.string.noKey));
-                return;
-            }
-
-            if (newValue.equals(currentValue)){
-                Toast.makeText(ConfigFileEditorActivity.this, getString(R.string.noChange), Toast.LENGTH_LONG).show();
-                return;
-            }
-
-            if(editor.isValueValid(currentName, newValue)){
-                editor.setValue(currentName, newValue);
-                setAllFields(currentName);
-                Toast.makeText(ConfigFileEditorActivity.this, getString(R.string.valueUpdated), Toast.LENGTH_LONG).show();
-                newValueEditText.setText("");
-            } else {
-                Toast.makeText(ConfigFileEditorActivity.this, getString(R.string.valueNotValid), Toast.LENGTH_LONG).show();
-                Log.e(TAG, getString(R.string.valueNotValid));
-            }
-
-        }
-    };
-
-    private void setAllFields(String key) {
-        currentName = key;
-        attribute = editor.getAllAttributesForKey(key);
-        if(attribute == null) {
-            Log.v(TAG, "no attribute found for the given key in the option file : " + key);
-            typeTextView.setText(getString(R.string.noAttribute));
-            dfaultTextView.setText(getString(R.string.noAttribute));
-            usageTextView.setText(getString(R.string.noAttribute));
-            descriptionTextView.setText(getString(R.string.noAttribute));
-        }
-         else {
-            typeTextView.setText(attribute.getType());
-            dfaultTextView.setText(attribute.getDefault());
-            usageTextView.setText(attribute.getUsage());
-            descriptionTextView.setText(Html.fromHtml(attribute.getDesciption(), null, new XMLTagHandler()));
-            Log.v(TAG, "description " + attribute.getDesciption());
-        }
-        currentValue = editor.getValue(key);
-        if (currentValue == null) currentValueTextView.setText(getString(R.string.noKey)); else currentValueTextView.setText(currentValue);
-    }
-}
\ No newline at end of file

gpac-2.2.1.tar.gz/applications/deprecated/osmo4_android_studio/app/src/main/java/com/gpac/Osmo4/extra/FileArrayAdapter.java Deleted

@@ -1,144 +0,0 @@
-package com.gpac.Osmo4.extra;
-
-import android.content.Context;
-import android.graphics.drawable.Drawable;
-import android.support.v4.content.ContextCompat;
-import android.support.v4.graphics.drawable.DrawableCompat;
-import android.support.v7.widget.CardView;
-import android.support.v7.widget.RecyclerView;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-
-import com.gpac.Osmo4.R;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Date;
-
-
-public class FileArrayAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
-
-    public interface OnItemClickListener {
-        void onItemClick(View view, int position);
-    }
-
-    private ArrayList<File> files;
-    private OnItemClickListener onItemClickListener;
-    private Context context;
-
-    public FileArrayAdapter(ArrayList<File> files, OnItemClickListener onItemClickListener, Context context) {
-        this.files = files;
-        this.onItemClickListener = onItemClickListener;
-        this.context = context;
-    }
-
-    @Override
-    public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
-        return new ListItemViewHolder(
-                        LayoutInflater
-                                .from(parent.getContext())
-                                .inflate(R.layout.list_item_file_chooser, parent, false));
-    }
-
-    @Override
-    public void onBindViewHolder(final RecyclerView.ViewHolder viewHolder, final int position) {
-
-        ListItemViewHolder holder = (ListItemViewHolder) viewHolder;
-        File file = getItem(position);
-        holder.title.setText(file.getName());
-        holder.lastModified.setText(new Date(file.lastModified()).toString());
-        setIcon(file, holder);
-        holder.cardView.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                onItemClickListener.onItemClick(v, position);
-            }
-        });
-    }
-
-    public void setIcon(File file, ListItemViewHolder holder) {
-
-        String extension;
-        Drawable drawable = null;
-
-        try {
-            extension = FileManager.getExtension(file.getAbsolutePath());
-
-            if (file.isFile()) {
-                switch (extension) {
-
-                    case ".c":  case ".cpp":    case ".doc":    case ".docx":   case ".exe":
-                    case ".h":  case ".html":   case ".java":   case ".log":    case ".txt":
-                    case ".pdf":    case ".ppt":    case ".xls":
-                        drawable = ContextCompat.getDrawable(context, R.drawable.ic_file);
-                        break;
-
-                    case ".3ga":    case ".aac":    case ".mp3":    case ".m4a":    case ".ogg":
-                    case ".wav":    case ".wma":
-                        drawable = ContextCompat.getDrawable(context, R.drawable.ic_audio);
-                        break;
-
-                    case ".3gp":    case ".avi":    case ".mpg":    case ".mpeg":   case ".mp4":
-                    case ".mkv":    case ".webm":   case ".wmv":    case ".vob":
-                        drawable = ContextCompat.getDrawable(context, R.drawable.ic_video);
-                        break;
-
-                    case ".ai": case ".bmp":    case ".exif":   case ".gif":    case ".jpg":
-                    case ".jpeg":   case ".png":    case ".svg":
-                        drawable = ContextCompat.getDrawable(context, R.drawable.ic_image);
-                        break;
-
-                    case ".rar":    case ".zip":    case ".ZIP":
-                        drawable = ContextCompat.getDrawable(context, R.drawable.ic_compressed);
-                        break;
-
-                    default:
-                        drawable = ContextCompat.getDrawable(context, R.drawable.ic_error);
-                        break;
-                }
-            } else if (file.isDirectory()) {
-                drawable = ContextCompat.getDrawable(context, R.drawable.ic_folder);
-            } else drawable = ContextCompat.getDrawable(context, R.drawable.ic_error);
-
-        } catch (Exception e) {
-            drawable = ContextCompat.getDrawable(context, R.drawable.ic_error);
-        }
-        drawable = DrawableCompat.wrap(drawable);
-        holder.icon.setImageDrawable(drawable);
-    }
-
-    @Override
-    public int getItemCount() {
-        return files.size();
-    }
-
-    public File getItem(int position) {
-        return files.get(position);
-    }
-
-    static class ListItemViewHolder extends RecyclerView.ViewHolder {
-
-        CardView cardView;
-        TextView title;
-        TextView lastModified;
-        ImageView icon;
-        LinearLayout linearLayout;
-
-        public ListItemViewHolder(View itemView) {
-            super(itemView);
-            cardView = (CardView) itemView.findViewById(R.id.cardView);
-            title = (TextView) itemView.findViewById(R.id.title);
-            icon = (ImageView) itemView.findViewById(R.id.icon);
-            linearLayout = (LinearLayout) itemView.findViewById(R.id.linearLayout);
-            lastModified = (TextView) itemView.findViewById(R.id.lastModified);
-        }
-    }
-
-    public ArrayList<File> getFiles() {
-        return files;
-    }
-}
\ No newline at end of file

gpac-2.2.1.tar.gz/applications/deprecated/osmo4_android_studio/app/src/main/java/com/gpac/Osmo4/extra/FileChooserActivity.java Deleted

@@ -1,97 +0,0 @@
-/**
- * $URL$
- * <p/>
- * $LastChangedBy$ - $LastChangedDate$
- */
-package com.gpac.Osmo4.extra;
-
-import android.Manifest;
-import android.app.Activity;
-import android.app.AlertDialog;
-import android.app.FragmentManager;
-import android.content.DialogInterface;
-import android.content.pm.PackageManager;
-import android.os.Bundle;
-import android.support.v4.app.ActivityCompat;
-import android.support.v4.content.ContextCompat;
-import android.view.Menu;
-import android.view.MenuItem;
-
-import com.gpac.Osmo4.R;
-
-
-public class FileChooserActivity extends Activity {
-
-    final String FILE_CHOOSER_FRAGMENT = "fileChooserFragment";
-    public final static String TITLE_PARAMETER = "org.openintents.extra.TITLE";
-
-    private FragmentManager fm;
-    private FileChooserFragment fileChooserFragment;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_file_chooser);
-
-        requestForPermission();
-        fm = getFragmentManager();
-
-        if (fm.findFragmentById(R.id.fileChooserLayout) == null) {
-            fileChooserFragment = new FileChooserFragment();
-            fm.beginTransaction()
-                    .add(R.id.fileChooserLayout, fileChooserFragment, FILE_CHOOSER_FRAGMENT)
-                    .addToBackStack(FILE_CHOOSER_FRAGMENT)
-                    .commit();
-        }
-    }
-
-    private void requestForPermission() {
-
-        if (ContextCompat.checkSelfPermission(FileChooserActivity.this, Manifest.permission.WRITE_EXTERNAL_STORAGE)
-                != PackageManager.PERMISSION_GRANTED) {
-
-            if (ActivityCompat.shouldShowRequestPermissionRationale(FileChooserActivity.this,
-                    Manifest.permission.WRITE_EXTERNAL_STORAGE)) {
-
-                promptForPermissionsDialog(getString(R.string.requestPermissionStorage), new DialogInterface.OnClickListener() {
-                    @Override
-                    public void onClick(DialogInterface dialog, int which) {
-                        ActivityCompat.requestPermissions(FileChooserActivity.this,
-                                new String{Manifest.permission.WRITE_EXTERNAL_STORAGE},
-                                100);
-                    }
-                });
-            } else {
-                ActivityCompat.requestPermissions(FileChooserActivity.this,
-                        new String{Manifest.permission.WRITE_EXTERNAL_STORAGE},
-                        100);
-            }
-        }
-    }
-
-    private void promptForPermissionsDialog(String message, DialogInterface.OnClickListener onClickListener) {
-        new AlertDialog.Builder(FileChooserActivity.this)
-                .setMessage(message)
-                .setPositiveButton(getString(R.string.yes), onClickListener)
-                .setNegativeButton(getString(R.string.no), null)
-                .create()
-                .show();
-    }
-
-    @Override
-    public void onBackPressed() {
-        fileChooserFragment.backPressed();
-    }
-
-
-    @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        return true;
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        return super.onOptionsItemSelected(item);
-    }
-
-}
\ No newline at end of file

gpac-2.2.1.tar.gz/applications/deprecated/osmo4_android_studio/app/src/main/java/com/gpac/Osmo4/extra/FileChooserFragment.java Deleted

@@ -1,160 +0,0 @@
-package com.gpac.Osmo4.extra;
-
-import android.Manifest;
-import android.app.ActionBar;
-import android.app.Activity;
-import android.app.Fragment;
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.content.pm.PackageManager;
-import android.net.Uri;
-import android.os.AsyncTask;
-import android.os.Bundle;
-import android.os.Environment;
-import android.preference.PreferenceManager;
-import android.support.annotation.Nullable;
-import android.support.v4.content.ContextCompat;
-import android.support.v7.widget.GridLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.Toast;
-
-import com.gpac.Osmo4.R;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Arrays;
-
-public class FileChooserFragment extends Fragment {
-
-    private final String PREF_SHOW_HIDDEN_FILES = "SHOW_HIDDEN_FILES";
-    private final String PREF_SORT_ORDER = "SORT_ORDER";
-    private final String PREF_SORT_BY = "SORT_BY";
-    private final String PREF_FOLDERS_FIRST = "FOLDERS_FIRST";
-
-    private File currDir;
-    private ArrayList<File> files;
-    private FileArrayAdapter adapter;
-    private SharedPreferences prefs;
-    private ActionBar actionBar;
-
-    private boolean showHiddenFiles;
-    private String sortOrder;
-    private String sortBy;
-    private boolean foldersFirst;
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        if (ContextCompat.checkSelfPermission(getActivity(), Manifest.permission.WRITE_EXTERNAL_STORAGE)
-                != PackageManager.PERMISSION_GRANTED)
-            currDir = new File("/");
-
-        else currDir = Environment.getExternalStorageDirectory();
-    }
-
-    @Nullable
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-        View view = inflater.inflate(R.layout.fragment_file_chooser, container, false);
-        setRetainInstance(true);
-
-        RecyclerView recyclerView = (RecyclerView) view.findViewById(R.id.recyclerView);
-        GridLayoutManager gridLayoutManager = new GridLayoutManager(getActivity(), 2);
-        gridLayoutManager.setOrientation(GridLayoutManager.VERTICAL);
-        files = new ArrayList<>();
-        actionBar = getActivity().getActionBar();
-        adapter = new FileArrayAdapter(files, onItemClickListenerCallback, getActivity());
-        prefs = PreferenceManager.getDefaultSharedPreferences(getActivity());
-        setPreferences();
-        recyclerView.setLayoutManager(gridLayoutManager);
-        populateList(currDir);
-        recyclerView.setAdapter(adapter);
-        return view;
-    }
-
-    @Override
-    public void onResume() {
-        super.onResume();
-        setPreferences();
-    }
-
-    private void setPreferences() {
-        showHiddenFiles = prefs.getBoolean(PREF_SHOW_HIDDEN_FILES, true);
-        sortOrder = prefs.getString(PREF_SORT_ORDER, FileManager.SORT_ORDER_ASC);
-        sortBy = prefs.getString(PREF_SORT_BY, FileManager.SORT_BY_NAME);
-        foldersFirst = prefs.getBoolean(PREF_FOLDERS_FIRST, true);
-    }
-
-    public void backPressed() {
-        if (currDir.getAbsolutePath().equals("/") || !currDir.getParentFile().canRead())
-            getActivity().finish();
-        else populateList(currDir.getParentFile());
-    }
-
-    private FileArrayAdapter.OnItemClickListener onItemClickListenerCallback = new FileArrayAdapter.OnItemClickListener() {
-        @Override
-        public void onItemClick(View view, int position) {
-            File f = adapter.getItem(position);
-            if (f.isDirectory())
-                onDirectoryClick(f);
-            else if (f.isFile())
-                onFileClick(f);
-        }
-    };
-
-    private void onFileClick(File f) {
-        Intent data = new Intent();
-        data.setData(Uri.fromFile(f));
-        getActivity().setResult(Activity.RESULT_OK, data);
-        getActivity().finish();
-    }
-
-    private void onDirectoryClick(File f) {
-        if (f.canRead())
-            populateList(f);
-        else Toast.makeText(getActivity(), "Cannot read " + f, Toast.LENGTH_LONG).show();
-    }
-
-    public void populateList(File file) {
-        new BackgroundWork(file).execute();
-    }
-
-    class BackgroundWork extends AsyncTask<File, String, Boolean> {
-
-        private File file;
-        public BackgroundWork(File file) {
-            this.file = file;
-        }
-
-        @Override
-        protected Boolean doInBackground(File... params) {
-
-            if (!file.canRead()) {
-                Toast.makeText(getActivity(), "Directory cannot be read", Toast.LENGTH_LONG).show();
-                return false;
-            }
-            files.clear();
-            ArrayList<File> list = new ArrayList<>(Arrays.asList(file.listFiles()));
-
-            files.addAll(
-                    FileManager.sort(
-                            showHiddenFiles? list : FileManager.removeHiddenFiles(list),
-                            sortOrder,
-                            sortBy,
-                            foldersFirst
-                    ));
-            currDir = file;
-            return true;
-        }
-
-        @Override
-        protected void onPostExecute(Boolean aVoid) {
-            actionBar.setTitle(file.getAbsolutePath());
-            adapter.notifyDataSetChanged();
-        }
-    }
-}
\ No newline at end of file

gpac-2.2.1.tar.gz/applications/deprecated/osmo4_android_studio/app/src/main/java/com/gpac/Osmo4/extra/FileManager.java Deleted

@@ -1,189 +0,0 @@
-package com.gpac.Osmo4.extra;
-
-import android.os.Build;
-import android.support.annotation.Nullable;
-import android.util.Log;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-
-
-public class FileManager {
-
-    public static final String SORT_ORDER_ASC = "ASC";
-    public static final String SORT_ORDER_DESC = "DESC";
-
-    public static final String SORT_BY_NAME = "NAME";
-    public static final String SORT_BY_SIZE = "SIZE";
-    public static final String SORT_BY_LAST_MODIFIED = "LAST_MODIFIED";
-
-    public static String getExtension(String url) {
-
-        if (url.contains("?")) {
-            url = url.substring(0, url.indexOf("?"));
-        }
-        if (url.lastIndexOf(".") == -1) {
-            return null;
-        } else {
-            String ext = url.substring(url.lastIndexOf("."));
-            if (ext.contains("%")) {
-                ext = ext.substring(0, ext.indexOf("%"));
-            }
-            if (ext.contains("/")) {
-                ext = ext.substring(0, ext.indexOf("/"));
-            }
-            return ext.toLowerCase();
-        }
-    }
-
-    public static ArrayList<File> sort(ArrayList<File> files, String sortOrder, String sortBy, boolean folderFirst) {
-
-        switch (sortOrder) {
-
-            case SORT_ORDER_ASC:
-                switch (sortBy) {
-                    case SORT_BY_SIZE:
-                        return sortBySize(files, SORT_ORDER_ASC, folderFirst);
-
-                    case SORT_BY_LAST_MODIFIED:
-                        return sortByLastModified(files, SORT_ORDER_ASC, folderFirst);
-
-                    case SORT_BY_NAME:
-                    default:
-                        return sortByName(files, SORT_ORDER_ASC, folderFirst);
-                }
-
-            case SORT_ORDER_DESC:
-                switch (sortBy) {
-                    case SORT_BY_NAME:
-                        return sortByName(files, SORT_ORDER_DESC, folderFirst);
-
-                    case SORT_BY_LAST_MODIFIED:
-                        return sortByLastModified(files, SORT_ORDER_DESC, folderFirst);
-
-                    case SORT_BY_SIZE:
-                    default:
-                        return sortBySize(files, SORT_ORDER_DESC, folderFirst);
-                }
-
-            default:
-                return sortByName(files, SORT_ORDER_ASC, folderFirst);
-        }
-
-    }
-
-    private static ArrayList<File> sortByName(final ArrayList<File> files, final String sortOrder, final boolean folderFirst) {
-
-        Collections.sort(files, new Comparator<File>() {
-            @Override
-            public int compare(File lhs, File rhs) {
-                if(folderFirst) {
-                    if (lhs.isDirectory() && !rhs.isDirectory()) return -1;
-                    if (!lhs.isDirectory() && rhs.isDirectory()) return 1;
-                }
-                switch (sortOrder) {
-                    case SORT_ORDER_DESC:
-                        return rhs.getName().compareToIgnoreCase(lhs.getName());
-
-                    case SORT_ORDER_ASC:
-                    default:
-                        return lhs.getName().compareToIgnoreCase(rhs.getName());
-                }
-            }
-        });
-        return files;
-    }
-
-    private static ArrayList<File> sortBySize(ArrayList<File> files, final String sortOrder, final boolean folderFirst) {
-
-        Collections.sort(files, new Comparator<File>() {
-            @Override
-            public int compare(File lhs, File rhs) {
-
-                if(folderFirst) {
-                    if (lhs.isDirectory() && !rhs.isDirectory()) return -1;
-                    if (!lhs.isDirectory() && rhs.isDirectory()) return 1;
-                }
-
-                long lhsLength = 0, rhsLength = 0, diff;
-
-                if(lhs.isDirectory()) lhsLength = getFolderSize(lhs);
-                if(lhs.isFile()) lhsLength = lhs.length();
-                if(rhs.isDirectory()) rhsLength = getFolderSize(rhs);
-                if(rhs.isFile()) rhsLength = rhs.length();
-
-                switch (sortOrder) {
-                    case SORT_ORDER_DESC:
-                        diff = rhsLength - lhsLength;
-                        break;
-                    case SORT_ORDER_ASC:
-                    default:
-                        diff = lhsLength - rhsLength;
-                        break;
-                }
-
-                if (diff < 0) return -1;
-                else if (diff > 0) return 1;
-                else return 0;
-            }
-        });
-        return files;
-    }
-
-    private static ArrayList<File> sortByLastModified(ArrayList<File> files, final String sortOrder, final boolean foldersFirst) {
-
-        Collections.sort(files, new Comparator<File>() {
-            @Override
-            public int compare(File lhs, File rhs) {
-
-                if (foldersFirst){
-                    if(lhs.isDirectory() && !rhs.isDirectory())  return -1;
-                    if(!lhs.isDirectory() && rhs.isDirectory()) return 1;
-                }
-
-                long diff;
-                switch (sortOrder) {
-                    case SORT_ORDER_DESC:
-                        diff = rhs.lastModified() - lhs.lastModified();
-                        break;
-
-                    case SORT_ORDER_ASC:
-                    default:
-                        diff = lhs.lastModified() - rhs.lastModified();
-                        break;
-                }
-
-                if (diff < 0) return -1;
-                else if (diff > 0) return 1;
-                else return 0;
-            }
-        });
-        return files;
-    }
-
-    public static long getFolderSize(File file) {
-
-        long size = 0;
-        for (File f : file.listFiles()) {
-            if (f.isFile()) size += f.length();
-            else size += getFolderSize(f);
-        }
-        return size;
-    }
-
-    public static boolean isHiddenFile(File file) {
-        return file.getName().startsWith(".");
-    }
-
-    public static ArrayList<File> removeHiddenFiles(ArrayList<File> files) {
-        ArrayList<File> list = new ArrayList<>();
-
-        for (File file : files) {
-            if (!isHiddenFile(file))
-                list.add(file);
-        }
-        return list;
-    }
-}
\ No newline at end of file

gpac-2.2.1.tar.gz/applications/deprecated/osmo4_android_studio/app/src/main/java/com/gpac/Osmo4/extra/PrefsActivity.java Deleted

gpac-2.2.1.tar.gz/applications/deprecated/osmo4_android_studio/app/src/main/java/com/gpac/Osmo4/extra/XMLTagHandler.java Deleted

@@ -1,40 +0,0 @@
-package com.gpac.Osmo4.extra;
-
-import android.text.Editable;
-import android.text.Html.TagHandler;
-
-import org.xml.sax.XMLReader;
-
-public class XMLTagHandler implements TagHandler{
-    boolean first= true;
-    String parent=null;
-    int index=1;
-    @Override
-    public void handleTag(boolean opening, String tag, Editable output, XMLReader xmlReader) {
-
-        if(tag.equals("ul")) {
-            parent = "ul";
-            output.append("\n");
-        }
-        else if(tag.equals("ol")) parent="ol";
-        if(tag.equals("li")){
-            if(parent.equals("ul")){
-                if(first){
-                    output.append("\n\t•");
-                    first= false;
-                }else{
-                    first = true;
-                }
-            }
-            else{
-                if(first){
-                    output.append("\n\t"+index+". ");
-                    first= false;
-                    index++;
-                }else{
-                    first = true;
-                }
-            }
-        }
-    }
-}

gpac-2.2.1.tar.gz/applications/deprecated/osmo4_android_studio/app/src/main/java/com/gpac/Osmo4/logs Deleted

gpac-2.2.1.tar.gz/applications/deprecated/osmo4_android_studio/app/src/main/java/com/gpac/Osmo4/logs/GpacLogger.java Deleted

@@ -1,159 +0,0 @@
-/**
- * $URL$
- *
- * $LastChangedBy$ - $LastChangedDate$
- */
-package com.gpac.Osmo4.logs;
-
-import java.io.BufferedOutputStream;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.PrintStream;
-import java.util.Date;
-import java.util.SortedSet;
-import java.util.TreeSet;
-import android.util.Log;
-import com.gpac.Osmo4.GpacCallback.GF_Log_Module;
-import com.gpac.Osmo4.GpacConfig;
-
-/**
- * This class handles logging.
- * 
- * It will be extended soon to be configurable and enable saving files on disk
- * 
- * @version $Revision$
- * 
- */
-public class GpacLogger {
-
-    /**
-     * Default Constructor
-     * 
-     * @param gpacConfig
-     */
-    public GpacLogger(GpacConfig gpacConfig) {
-        loggedModules.add(GF_Log_Module.GF_LOG_AUDIO);
-        loggedModules.add(GF_Log_Module.GF_LOG_MEDIA);
-        loggedModules.add(GF_Log_Module.GF_LOG_MODULE);
-        loggedModules.add(GF_Log_Module.GF_LOG_CORE);
-        logDir = gpacConfig.getGpacLogDirectory(); //$NON-NLS-1$
-    }
-
-    private boolean enableLogOnDisk = false;
-
-    /**
-     * @return the enableLogOnDisk
-     */
-    public synchronized boolean isEnableLogOnDisk() {
-        return enableLogOnDisk;
-    }
-
-    /**
-     * @param enableLogOnDisk the enableLogOnDisk to set
-     */
-    public synchronized void setEnableLogOnDisk(boolean enableLogOnDisk) {
-        this.enableLogOnDisk = enableLogOnDisk;
-    }
-    
-    private String logDir;
-    private String logFile;
-    
-    public synchronized void setLogFile(String logFile) {
-    	//reset writer
-	    writer = null;
-    	this.logFile = logDir + logFile;
-    }
-
-    /**
-     * Called when creating logger
-     */
-    public void onCreate() {
-        if (!enableLogOnDisk)
-            return;
-        if (writer == null) {
-            try {
-                writer = new PrintStream(new BufferedOutputStream(new FileOutputStream(new File(logFile)), 128), true, "UTF-8"); //$NON-NLS-1$
-            } catch (Exception e) {
-                Log.e(GpacLogger.class.getSimpleName(), "Failed to create writer", e); //$NON-NLS-1$
-            }
-        }
-        if (writer != null)
-            writer.println("New log $Revision$ at " + new Date()); //$NON-NLS-1$
-    }
-
-    /**
-     * Called when stopping logger
-     */
-    public void onDestroy() {
-        if (!enableLogOnDisk)
-            return;
-        PrintStream w = this.writer;
-        writer = null;
-        if (w != null) {
-            w.println("Closing log file at " + new Date()); //$NON-NLS-1$
-            w.close();
-        }
-    }
-
-    /**
-     * Logs from C-code
-     * 
-     * @param level
-     * @param module
-     * @param message
-     */
-    public void onLog(int level, int module, String message) {
-        GF_Log_Module gModule = GF_Log_Module.getModule(module);
-        doLog(gModule, level, message);
-    }
-
-    private void doLog(GF_Log_Module module, int level, String message) {
-        Log.println(4, module.name(), message);
-        if (enableLogOnDisk) {
-            PrintStream s = writer;
-            if (s != null) {
-                s.println(module.name() + "\t" + message); //$NON-NLS-1$
-                s.flush();
-            }
-        }
-    }
-
-    private final SortedSet<GF_Log_Module> loggedModules = new TreeSet<GF_Log_Module>();
-
-    // The log level used by GPAC modules that are part of loggedModules collection
-    private int loggedLevel = Log.DEBUG;
-
-    // The log level used by GPAC modules not part of loggedModules collection
-    private int defaultLoggedLevel = Log.INFO;
-
-    /**
-     * @return the loggedLevel
-     */
-    public synchronized int getLoggedLevel() {
-        return loggedLevel;
-    }
-
-    /**
-     * @param loggedLevel the loggedLevel to set
-     */
-    public synchronized void setLoggedLevel(int loggedLevel) {
-        this.loggedLevel = loggedLevel;
-    }
-
-    /**
-     * @return the defaultLoggedLevel
-     */
-    public synchronized int getDefaultLoggedLevel() {
-        return defaultLoggedLevel;
-    }
-
-    /**
-     * @param defaultLoggedLevel the defaultLoggedLevel to set
-     */
-    public synchronized void setDefaultLoggedLevel(int defaultLoggedLevel) {
-        this.defaultLoggedLevel = defaultLoggedLevel;
-    }
-
-    private volatile PrintStream writer;
-
-}

gpac-2.2.1.tar.gz/applications/deprecated/osmo4_android_studio/app/src/main/jni Deleted

gpac-2.2.1.tar.gz/applications/deprecated/osmo4_android_studio/app/src/main/jni/README.txt Deleted

gpac-2.2.1.tar.gz/applications/deprecated/osmo4_android_studio/app/src/main/jni/wrapper.cpp Deleted

@@ -1,1125 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *				Authors: Jean Le Feuvre
- *				Copyright (c) Telecom ParisTech 2009-
- *					All rights reserved
- *
- *	Created by NGO Van Luyen, Ivica ARSOV / ARTEMIS / Telecom SudParis /Institut TELECOM on Oct, 2010
- *
- *  This file is part of GPAC / Wrapper
- *
- *  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 <jni.h>
-
-#include <gpac/terminal.h>
-#include <gpac/thread.h>
-#include <gpac/options.h>
-#include <gpac/network.h>
-//#include <gpac/internal/terminal_dev.h>
-#include <gpac/internal/compositor_dev.h>
-
-#include "wrapper.h"
-#include "wrapper_jni.hpp"
-
-#include <math.h>
-#include <android/log.h>
-
-#define TAG "GPAC_WRAPPER"
-
-#define LOGV(...) __android_log_print(ANDROID_LOG_VERBOSE, TAG,  __VA_ARGS__)
-#define LOGD(...)  __android_log_print(ANDROID_LOG_DEBUG, TAG,  __VA_ARGS__)
-#define LOGE(...)  __android_log_print(ANDROID_LOG_ERROR, TAG,  __VA_ARGS__)
-#define LOGW(...)  __android_log_print(ANDROID_LOG_WARN, TAG,  __VA_ARGS__)
-#define LOGI(...)  __android_log_print(ANDROID_LOG_INFO, TAG,  __VA_ARGS__)
-#include <pthread.h>
-
-static JavaVM* javaVM = NULL;
-
-static pthread_key_t jni_thread_env_key = 0;
-
-struct _tag_terminal
-{
-	GF_User *user;
-	GF_Compositor *compositor;
-	GF_FilterSession *fsess;
-};
-
-//these two are used by modumles - define them when using static module build
-#ifdef GPAC_STATIC_MODULES
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-JavaVM* GetJavaVM()
-{
-	return javaVM;
-}
-
-JNIEnv* GetEnv()
-{
-	JNIEnv* env = 0;
-	if (javaVM) javaVM->GetEnv((void**)(&env), JNI_VERSION_1_2);
-	return env;
-}
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-
-
-/**
- * This method is called when a pthread is destroyed, so we can delete the JNI env
- */
-static void jni_destroy_env_func(void * env) {
-	LOGI("Destroying a thread with attached data, env=%p.\n", env);
-	JavaEnvTh * jniEnv = (JavaEnvTh *) env;
-	if (jniEnv) {
-		/*jniEnv->env->DeleteLocalRef(&jniEnv->cbk_displayMessage);
-		jniEnv->env->DeleteLocalRef(&jniEnv->cbk_onProgress);
-		jniEnv->env->DeleteLocalRef(&jniEnv->cbk_showKeyboard);
-		jniEnv->env->DeleteLocalRef(&jniEnv->cbk_setCaption);
-		jniEnv->env->DeleteLocalRef(&jniEnv->cbk_onLog);*/
-		memset(jniEnv, 0, sizeof(JavaEnvTh));
-		gf_free(jniEnv);
-	}
-	pthread_setspecific(jni_thread_env_key, NULL);
-	if (javaVM)
-		javaVM->DetachCurrentThread();
-}
-
-static int jniRegisterNativeMethods(JNIEnv* env, const char* className,
-                                    const JNINativeMethod* gMethods, int numMethods)
-{
-	int res;
-	jclass clazz;
-	clazz = env->FindClass(className);
-	if (clazz == NULL) {
-		LOGE("Native registration unable to find class '%s'\n", className);
-		return -1;
-	}
-	LOGI("Registering %d methods...\n", numMethods );
-	res = env->RegisterNatives(clazz, gMethods, numMethods);
-	if (res < 0) {
-		LOGE("RegisterNatives failed for '%s'\n", className);
-		return res;
-	}
-	return 0;
-}
-
-static JNINativeMethod sMethods = {
-	/* name, signature, funcPtr */
-
-	{	"createInstance",
-		"(Lcom/gpac/Osmo4/GpacCallback;IILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)J",
-		(void*)&Java_com_gpac_Osmo4_GPACInstance_createInstance
-	},
-	{	"gpacdisconnect",
-		"()V",
-		(void*)Java_com_gpac_Osmo4_GPACInstance_gpacdisconnect
-	},
-	{	"gpacrender",
-		"()V",
-		(void*)Java_com_gpac_Osmo4_GPACInstance_gpacrender
-	},
-	{	"gpacresize",
-		"(II)V",
-		(void*)Java_com_gpac_Osmo4_GPACInstance_gpacresize
-	},
-	{	"gpacfree",
-		"()V",
-		(void*)Java_com_gpac_Osmo4_GPACInstance_gpacfree
-	},
-	{	"gpaceventkeypress",
-		"(IIIII)V",
-		(void*)Java_com_gpac_Osmo4_GPACInstance_gpaceventkeypress
-	},
-	{	"gpaceventmousedown",
-		"(FF)V",
-		(void*)Java_com_gpac_Osmo4_GPACInstance_gpaceventmousedown
-	},
-	{	"gpaceventmouseup",
-		"(FF)V",
-		(void*)Java_com_gpac_Osmo4_GPACInstance_gpaceventmouseup
-	},
-	{	"gpaceventmousemove",
-		"(FF)V",
-		(void*)Java_com_gpac_Osmo4_GPACInstance_gpaceventmousemove
-	},
-	{	"gpaceventorientationchange",
-		"(FFF)V",
-		(void*)Java_com_gpac_Osmo4_GPACInstance_gpaceventorientationchange
-	},
-	{	"setGpacPreference",
-		"(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V",
-		(void*)Java_com_gpac_Osmo4_GPACInstance_setGpacPreference
-	},
-	{	"setGpacLogs",
-		"(Ljava/lang/String;)V",
-		(void*)Java_com_gpac_Osmo4_GPACInstance_setGpacLogs
-	},
-	NULL
-};
-
-
-jint JNI_OnUnLoad(JavaVM* vm, void* reserved) {
-	LOGI("Deleting library, vm=%p...\n", vm);
-	if (pthread_key_delete(jni_thread_env_key)) {
-		LOGW("Failed to delete key jni_thread_env_key jni_thread_env_key=%d\n", jni_thread_env_key);
-	}
-	javaVM = NULL;
-	jni_thread_env_key = (int) NULL;
-	return 0;
-}
-
-#define NUM_JNI_VERSIONS 4
-//---------------------------------------------------------------------------------------------------
-jint JNI_OnLoad(JavaVM* vm, void* reserved) {
-	int res;
-	int jniV;
-	int allowedVersionsNUM_JNI_VERSIONS;
-	const char * className = "com/gpac/Osmo4/GPACInstance";
-	allowedVersions0 = JNI_VERSION_1_6;
-	allowedVersions1 = JNI_VERSION_1_4;
-	allowedVersions2 = JNI_VERSION_1_2;
-	allowedVersions3 = JNI_VERSION_1_1;
-	JNIEnv * env = NULL;
-	if (!vm)
-		return -1;
-	for (int i = 0 ; i < NUM_JNI_VERSIONS; i++) {
-		jniV = allowedVersionsi;
-		if (vm->GetEnv((void**)(&env), jniV) == JNI_OK) {
-			LOGI("Selected JNI VERSION%d\n", i);
-			break;
-		} else {
-			if (i == NUM_JNI_VERSIONS - 1) {
-				LOGW("Failed to find any supported JNI VERSION of the %d proposed.", NUM_JNI_VERSIONS);
-				return -1;
-			}
-		}
-
-	}
-	if (! env) {
-		LOGW("Failed to find any supported JNI VERSION");
-		return -1;
-	}
-	javaVM = vm;
-	LOGI("Registering %s natives\n", className);
-	res = jniRegisterNativeMethods(env, className, sMethods, (sizeof(sMethods) - 1)/sizeof(JNINativeMethod));
-	if (res < 0) {
-		LOGE("Failed to register native methods, result was = %d, try to continue anyway...\n", res);
-		/*return -1;*/
-	}
-	LOGI("Registering natives DONE, now registering pthread_keys with destructor=%p\n", &jni_destroy_env_func);
-	int ret = pthread_key_create(&jni_thread_env_key, &jni_destroy_env_func);
-	if (ret) {
-		LOGE("Failed to register jni_thread_env_key jni_thread_env_key=%d\n", jni_thread_env_key);
-	}
-	return jniV;
-}
-
-//---------------------------------------------------------------------------------------------------
-//CNativeWrapper
-//-------------------------------
-
-CNativeWrapper::CNativeWrapper() {
-	do_log = 1;
-	m_term = NULL;
-	m_mx = NULL;
-	mainJavaEnv = NULL;
-
-	log_file = NULL;
-	m_window = NULL;
-	m_session = NULL;
-
-	m_cfg_dir0=0;
-	m_modules_dir0=0;
-	m_cache_dir0=0;
-	m_font_dir0=0;
-
-#ifndef GPAC_GUI_ONLY
-	memset(&m_user, 0, sizeof(GF_User));
-	memset(&m_rti, 0, sizeof(GF_SystemRTInfo));
-#endif
-}
-//-------------------------------
-CNativeWrapper::~CNativeWrapper() {
-	debug_log("~CNativeWrapper()");
-	JavaEnvTh * env = getEnv();
-	if (env && env->cbk_obj)
-		env->env->DeleteGlobalRef(env->cbk_obj);
-	if (log_file) gf_fclose(log_file);
-	log_file = NULL;
-	Shutdown();
-	debug_log("~CNativeWrapper() : DONE\n");
-}
-//-------------------------------
-void CNativeWrapper::debug_log(const char* msg) {
-	LOGV("%s", msg);
-}
-//-------------------------------
-void CNativeWrapper::Shutdown()
-{
-	debug_log("shutdown");
-	if (m_term)
-		gf_term_disconnect(m_term);
-	if (m_mx)
-		gf_mx_del(m_mx);
-	m_mx = NULL;
-#ifndef GPAC_GUI_ONLY
-	if (m_term) {
-		GF_Terminal *t = m_term;
-		m_term = NULL;
-		gf_term_del(t);
-	}
-	/*
-	if (m_user.config) {
-		gf_cfg_del(m_user.config);
-		m_user.config = NULL;
-	}
-	if (m_user.modules) {
-		gf_modules_del(m_user.modules);
-		m_user.modules = NULL;
-	}*/
-#endif
-	m_term = NULL;
-	gf_sys_close();
-	debug_log("shutdown end");
-}
-
-void CNativeWrapper::setJavaEnv(JavaEnvTh * envToSet, JNIEnv *env, jobject callback) {
-	assert( envToSet );
-	jclass localRef = env->GetObjectClass(callback);
-	envToSet->env = env;
-	envToSet->javaThreadId = gf_th_id();
-	envToSet->cbk_obj = callback;
-	envToSet->cbk_displayMessage =
-	    env->GetMethodID(localRef, "displayMessage", "(Ljava/lang/String;Ljava/lang/String;I)V");
-	envToSet->cbk_onProgress =
-	    env->GetMethodID(localRef, "onProgress", "(Ljava/lang/String;II)V");
-	envToSet->cbk_onLog =
-	    env->GetMethodID(localRef, "onLog", "(IILjava/lang/String;)V");
-	envToSet->cbk_setCaption =
-	    env->GetMethodID(localRef, "setCaption", "(Ljava/lang/String;)V");
-	envToSet->cbk_showKeyboard =
-	    env->GetMethodID(localRef, "showKeyboard", "(Z)V");
-	envToSet->cbk_setLogFile =
-	    env->GetMethodID(localRef, "setLogFile", "(Ljava/lang/String;)V");
-	envToSet->cbk_sensorSwitch =
-	    env->GetMethodID(localRef, "sensorSwitch", "(Z)V");
-	env->DeleteLocalRef(localRef);
-}
-
-static u32 beforeThreadExits(void * param) {
-	/* Ivica - I think there is no need for this because the detach is done in jni_destroy_env_func()*/
-
-	/*LOGI("Before Thread exist, detach the JavaVM from Thread for thread %p...\n", gf_th_current());
-	if (javaVM)
-	javaVM->DetachCurrentThread();
-	*/
-	return 0;
-}
-
-JavaEnvTh * CNativeWrapper::getEnv() {
-	JNIEnv *env;
-	JavaEnvTh * javaEnv;
-	if (!javaVM) {
-		debug_log("************* No JVM Found ************");
-		return NULL;
-	}
-	javaEnv = (JavaEnvTh*) pthread_getspecific( jni_thread_env_key );
-	if (javaEnv)
-		return javaEnv;
-	javaEnv = (JavaEnvTh *) gf_malloc(sizeof(JavaEnvTh));
-	if (!javaEnv)
-		return NULL;
-	memset(javaEnv, 0, sizeof(JavaEnvTh));
-	javaVM->AttachCurrentThread(&env, NULL);
-	if (!env) {
-		LOGE("Attaching to thread did failed for thread id=%d", gf_th_id());
-		gf_free(javaEnv);
-		return NULL;
-	}
-	LOGI("Rebuilding methods for thread %d", gf_th_id());
-	setJavaEnv(javaEnv, env, mainJavaEnv->cbk_obj);
-	if (pthread_setspecific(jni_thread_env_key, javaEnv)) {
-		LOGE("Failed to set specific thread data to jni_thread_env_key for thread=%d. No ENV available !", gf_th_id());
-		gf_free(javaEnv);
-		return NULL;
-	}
-	GF_Thread * t;
-	LOGI("Getting current Thread %d...", gf_th_id());
-	t = gf_th_current();
-	LOGI("Getting current Thread DONE = %p, now registering before exit...", t);
-
-	if (GF_OK != gf_register_before_exit_function(gf_th_current(), &beforeThreadExits)) {
-		LOGE("Failed to register exit function for thread %p, no javaEnv for current thread.", gf_th_current());
-		//javaVM->DetachCurrentThread();
-		gf_free(javaEnv);
-		javaEnv = NULL;
-	}
-	LOGI("Registering DONE for %d", gf_th_id());
-	return javaEnv;
-}
-
-
-//-------------------------------
-int CNativeWrapper::MessageBox(const char* msg, const char* title, GF_Err status) {
-	LOGV("MessageBox start %s", msg);
-	JavaEnvTh * env = getEnv();
-	if (!env || !env->cbk_displayMessage)
-		return 0;
-	env->env->PushLocalFrame(2);
-	jstring tit = env->env->NewStringUTF(title?title:"null");
-	jstring mes = env->env->NewStringUTF(msg?msg:"null");
-	env->env->CallVoidMethod(env->cbk_obj, env->cbk_displayMessage, mes, tit, status);
-	env->env->PopLocalFrame(NULL);
-	LOGV("MessageBox done %s", msg);
-	return 1;
-}
-//-------------------------------
-int CNativeWrapper::Quit(int code) {
-
-	Shutdown();
-	// send shutdown request to java
-	return code;
-}
-
-#include <stdio.h>
-
-void CNativeWrapper::on_fm_request(void *cbk, u32 type, u32 param, int *value) {
-	CNativeWrapper * self = (CNativeWrapper *) cbk;
-	JavaEnvTh *envth = self->getEnv();
-
-	envth->env->PushLocalFrame(1);
-	switch(type) {
-	case 0: // Get PI
-	case 1: // Get RT
-	case 2: // Get PS
-		jint jvalue;
-		jvalue = envth->env->CallIntMethod(envth->cbk_obj, envth->cbk_onFmRequest, type, param);
-		*value = (int)jvalue;
-		break;
-	case 3: // Set Freq
-	case 4: // Set Volume
-		envth->env->CallVoidMethod(envth->cbk_obj, envth->cbk_onFmRequest, type, param);
-		break;
-	}
-	envth->env->PopLocalFrame(NULL);
-}
-
-
-//-------------------------------
-void CNativeWrapper::on_gpac_log(void *cbk, GF_LOG_Level ll, GF_LOG_Tool lm, const char *fmt, va_list list) {
-	char szMsg4096;
-	const char * tag;
-	char unknTag32;
-	int level = (ll == GF_LOG_ERROR) ? ANDROID_LOG_ERROR : ANDROID_LOG_DEBUG;
-	vsnprintf(szMsg, 4096, fmt, list);
-	CNativeWrapper * self = (CNativeWrapper *) cbk;
-	if (!self)
-		goto displayInAndroidlogs;
-
-#if 0
-	{
-		JavaEnvTh *env = self->getEnv();
-		jstring msg;
-
-		if (!env || !env->cbk_onLog)
-			goto displayInAndroidlogs;
-
-		env->env->PushLocalFrame(1);
-		msg = env->env->NewStringUTF(szMsg);
-		env->env->CallVoidMethod(env->cbk_obj, env->cbk_onLog, level, lm, msg);
-		env->env->PopLocalFrame(NULL);
-		return;
-	}
-
-#else
-	if (self->log_file) {
-		vfprintf(self->log_file, fmt, list);
-		fflush(self->log_file);
-	}
-#endif
-
-
-displayInAndroidlogs:
-	{
-		/* When no callback is properly set, we use direct logging */
-		switch( lm) {
-		case GF_LOG_CORE:
-			tag="GF_LOG_CORE";
-			break;
-		case GF_LOG_CODING:
-			tag="GF_LOG_CODING";
-			break;
-		case GF_LOG_CONTAINER:
-			tag="GF_LOG_CONTAINER";
-			break;
-		case GF_LOG_NETWORK:
-			tag="GF_LOG_NETWORK";
-			break;
-		case GF_LOG_RTP:
-			tag="GF_LOG_RTP";
-			break;
-		case GF_LOG_COMPTIME:
-			tag="GF_LOG_COMPTIME";
-			break;
-		case GF_LOG_CODEC:
-			tag="GF_LOG_CODEC";
-			break;
-		case GF_LOG_PARSER:
-			tag="GF_LOG_PARSER";
-			break;
-		case GF_LOG_MEDIA:
-			tag="GF_LOG_MEDIA";
-			break;
-		case GF_LOG_SCENE:
-			tag="GF_LOG_SCENE";
-			break;
-		case GF_LOG_SCRIPT:
-			tag="GF_LOG_SCRIPT";
-			break;
-		case GF_LOG_INTERACT:
-			tag="GF_LOG_INTERACT";
-			break;
-		case GF_LOG_COMPOSE:
-			tag="GF_LOG_COMPOSE";
-			break;
-		case GF_LOG_CACHE:
-			tag="GF_LOG_CACHE";
-			break;
-		case GF_LOG_MMIO:
-			tag="GF_LOG_MMIO";
-			break;
-		case GF_LOG_RTI:
-			tag="GF_LOG_RTI";
-			break;
-		case GF_LOG_MEMORY:
-			tag="GF_LOG_MEMORY";
-			break;
-		case GF_LOG_AUDIO:
-			tag="GF_LOG_AUDIO";
-			break;
-		case GF_LOG_MODULE:
-			tag="GF_LOG_MODULE";
-			break;
-		case GF_LOG_MUTEX:
-			tag="GF_LOG_MUTEX";
-			break;
-		case GF_LOG_CONDITION:
-			tag="GF_LOG_CONDITION";
-			break;
-		case GF_LOG_DASH:
-			tag="GF_LOG_DASH";
-			break;
-		case GF_LOG_FILTER:
-			tag="GF_LOG_FILTER";
-			break;
-		case GF_LOG_SCHEDULER:
-			tag="GF_LOG_SCHEDULER";
-			break;
-		case GF_LOG_ROUTE:
-			tag="GF_LOG_ROUTE";
-			break;
-		case GF_LOG_CONSOLE:
-			tag="GF_LOG_CONSOLE";
-			break;
-		case GF_LOG_APP:
-			tag="GF_LOG_APP";
-			break;
-		default:
-			snprintf(unknTag, 32, "GPAC_UNKNOWN%d", lm);
-			tag = unknTag;
-		}
-		__android_log_print(level, tag, "%s\n", szMsg);
-	}
-}
-//-------------------------------
-Bool CNativeWrapper::GPAC_EventProc(void *cbk, GF_Event *evt) {
-	if (cbk)
-	{
-		CNativeWrapper* ptr = (CNativeWrapper *) cbk;
-		char msg4096;
-		msg0 = 0;
-		LOGD("GPAC_EventProc() Message=%d", evt->type);
-		switch (evt->type) {
-		case GF_EVENT_CLICK:
-		case GF_EVENT_MOUSEUP:
-		case GF_EVENT_MOUSEDOWN:
-		case GF_EVENT_MOUSEOVER:
-		case GF_EVENT_MOUSEOUT:
-		case GF_EVENT_MOUSEMOVE:
-		case GF_EVENT_MOUSEWHEEL:
-		case GF_EVENT_KEYUP:
-		case GF_EVENT_KEYDOWN:
-		case GF_EVENT_LONGKEYPRESS:
-		case GF_EVENT_TEXTINPUT:
-			/* We ignore all these events */
-			break;
-		case GF_EVENT_MEDIA_SETUP_BEGIN:
-		case GF_EVENT_MEDIA_SETUP_DONE:
-		case GF_EVENT_MEDIA_LOAD_START:
-		case GF_EVENT_MEDIA_PLAYING:
-		case GF_EVENT_MEDIA_WAITING:
-		case GF_EVENT_MEDIA_PROGRESS:
-		case GF_EVENT_MEDIA_LOAD_DONE:
-		case GF_EVENT_ABORT:
-		case GF_EVENT_ERROR:
-			LOGD("GPAC_EventProc() Media Event detected = index=%d", evt->type - GF_EVENT_MEDIA_SETUP_BEGIN);
-			break;
-		case GF_EVENT_MESSAGE:
-		{
-			ptr->debug_log("GPAC_EventProc start");
-			if ( evt->message.message )
-			{
-				strcat(msg, evt->message.message);
-				strcat(msg, ": ");
-			}
-			strcat(msg, gf_error_to_string(evt->message.error));
-
-			ptr->debug_log(msg);
-			//ptr->MessageBox(msg, evt->message.service ? evt->message.service : "GF_EVENT_MESSAGE", evt->message.error);
-			ptr->debug_log("GPAC_EventProc end");
-		};
-		break;
-		case GF_EVENT_CONNECT:
-			if (evt->connect.is_connected)
-				ptr->MessageBox("Connected", "Connected to scene", GF_OK);
-			else
-				ptr->MessageBox("Disconnected", "Disconnected from scene.", GF_OK);
-			break;
-		case GF_EVENT_PROGRESS:
-		{
-			const char * szTitle;
-			if (evt->progress.progress_type==0)
-				szTitle = "Buffering";
-			else if (evt->progress.progress_type==1)
-				szTitle = "Downloading...";
-			else if (evt->progress.progress_type==2)
-				szTitle = "Import ";
-			else
-				szTitle = "Unknown Progress Event";
-			ptr->Osmo4_progress_cbk(ptr, szTitle, evt->progress.done, evt->progress.total);
-			gf_set_progress(szTitle, evt->progress.done, evt->progress.total);
-		}
-		break;
-		case GF_EVENT_TEXT_EDITING_START:
-		case GF_EVENT_TEXT_EDITING_END:
-		{
-			JavaEnvTh * env = ptr->getEnv();
-			if (!env || !env->cbk_showKeyboard)
-				return GF_FALSE;
-			LOGI("Needs to display/hide the Virtual Keyboard (%d)", evt->type);
-			env->env->CallVoidMethod(env->cbk_obj, env->cbk_showKeyboard, GF_EVENT_TEXT_EDITING_START == evt->type);
-			LOGV("Done showing virtual keyboard (%d)", evt->type);
-		}
-		break;
-		case GF_EVENT_EOS:
-			LOGI("EOS Reached (%d)", evt->type);
-			break;
-		case GF_EVENT_DISCONNECT:
-			/* FIXME : not sure about this behaviour */
-			if (ptr)
-				ptr->disconnect();
-			break;
-		case GF_EVENT_NAVIGATE:
-			ptr->navigate( evt);
-			break;
-		case GF_EVENT_SENSOR_REQUEST:
-			if(evt->activate_sensor.sensor_type == GF_EVENT_SENSOR_ORIENTATION){
-				if(evt->activate_sensor.activate){
-					LOGV("We received Sensor Request for turning ON location sensors");
-					JavaEnvTh * env = ptr->getEnv();
-					if (!env || !env->cbk_sensorSwitch)
-						return GF_FALSE;
-					env->env->CallVoidMethod(env->cbk_obj, env->cbk_sensorSwitch, evt->activate_sensor.activate);
-				}else{
-					LOGV("We received Sensor Request for turning OFF location sensors");
-					JavaEnvTh * env = ptr->getEnv();
-					if (!env || !env->cbk_sensorSwitch)
-						return GF_FALSE;
-					env->env->CallVoidMethod(env->cbk_obj, env->cbk_sensorSwitch, evt->activate_sensor.activate);
-				}
-				return GF_TRUE;
-			}
-			break;
-		case GF_EVENT_SENSOR_ORIENTATION:
-			/* Ignore this event */
-			/*
-			LOGV("We received Sensor Orientation event (x: %f, y: %f, z: %f)",evt->sensor.x, evt->sensor.y, evt->sensor.z);
-			*/
-			break;
-		default:
-			LOGI("Unknown Message %d", evt->type);
-		}
-	}
-	return GF_FALSE;
-}
-
-void CNativeWrapper::navigate( GF_Event* evt)
-{
-	if (gf_term_is_supported_url(m_term, evt->navigate.to_url, GF_TRUE, GF_TRUE))
-	{
-		gf_term_navigate_to(m_term, evt->navigate.to_url);
-	}
-}
-
-void CNativeWrapper::progress_cbk(const char *title, u64 done, u64 total) {
-	JavaEnvTh *env = getEnv();
-	if (!env || !env->cbk_onProgress)
-		return;
-	//debug_log("Osmo4_progress_cbk start");
-	env->env->PushLocalFrame(1);
-	jstring js = env->env->NewStringUTF(title);
-	env->env->CallVoidMethod(env->cbk_obj, env->cbk_onProgress, js, done, total);
-	env->env->PopLocalFrame(NULL);
-	//debug_log("Osmo4_progress_cbk end");
-}
-
-
-//-------------------------------
-void CNativeWrapper::Osmo4_progress_cbk(const void *usr, const char *title, u64 done, u64 total) {
-	if (!usr)
-		return;
-	CNativeWrapper * self = (CNativeWrapper *) usr;
-	self->progress_cbk(title, done, total);
-}
-//-------------------------------
-void CNativeWrapper::SetupLogs() {
-	const char *opt;
-	debug_log("SetupLogs()");
-
-	gf_mx_p(m_mx);
-	gf_log_set_tools_levels( gf_opts_get_key("core", "logs"), GF_TRUE );
-	gf_log_set_callback(this, on_gpac_log);
-	opt = gf_opts_get_key("core", "log-file");
-	if (opt) {
-#if 0
-		JavaEnvTh *env = getEnv();
-		if (env && env->cbk_setLogFile) {
-			env->env->PushLocalFrame(1);
-			jstring js = env->env->NewStringUTF(opt);
-			env->env->CallVoidMethod(env->cbk_obj, env->cbk_setLogFile, js);
-			env->env->PopLocalFrame(NULL);
-		}
-#else
-		log_file = gf_fopen(opt, "wt");
-#endif
-	}
-	gf_mx_v(m_mx);
-
-	GF_LOG(GF_LOG_INFO, GF_LOG_CORE, ("Osmo4 logs initialized\n"));
-	/* Test for JNI invocations, should work properly
-	int k;
-	for (k = 0 ; k < 512; k++){
-		GF_LOG(GF_LOG_INFO, GF_LOG_CORE, ("Message %d\n", k));
-	}*/
-}
-//-------------------------------
-// dir should end with /
-int CNativeWrapper::init(JNIEnv * env, void * bitmap, jobject * callback, int width, int height, const char * cfg_dir, const char * modules_dir, const char * cache_dir, const char * font_dir, const char * gui_dir, const char * urlToLoad) {
-	LOGI("Initializing GPAC with URL=%s...", urlToLoad);
-	strcpy(m_modules_dir, modules_dir);
-	strcpy(m_cache_dir, cache_dir);
-	strcpy(m_font_dir, font_dir);
-	if (cfg_dir)
-		strcpy(m_cfg_dir, cfg_dir);
-
-/*	char m_cfg_filenameGF_MAX_PATH;
-	if (m_cfg_dir0) {
-		LOGI("GPAC.cfg found in %s, force using it.\n", m_cfg_dir);
-		strcpy(m_cfg_filename, m_cfg_dir);
-		strcat(m_cfg_filename, "GPAC.cfg");
-	}
-*/
-
-	int m_Width = width;
-	int m_Height = height;
-
-	const char *opt;
-
-	m_window = env;
-	m_session = bitmap;
-	if (!mainJavaEnv)
-		mainJavaEnv = (JavaEnvTh *) gf_malloc(sizeof(JavaEnvTh));
-	memset(mainJavaEnv, 0, sizeof(JavaEnvTh));
-	setJavaEnv(mainJavaEnv, env, env->NewGlobalRef(*callback));
-	if (pthread_setspecific( jni_thread_env_key, mainJavaEnv)) {
-		LOGE("Failed to set specific thread data to jni_thread_env_key=%d for main thread !", jni_thread_env_key);
-	}
-
-	m_mx = gf_mx_new("Osmo4");
-
-	m_user.init_flags = 0;
-	m_user.opaque = this;
-
-	m_user.os_window_handler = m_window;
-	m_user.os_display = m_session;
-	m_user.EventProc = GPAC_EventProc;
-	if (!javaVM) {
-		LOGE("NO JAVA VM FOUND, m_user=%p !!!!\n", &m_user);
-		return Quit(KErrGeneral);
-	}
-
-	LOGD("Loading GPAC terminal, m_user=%p...", &m_user);
-	gf_sys_init(GF_MemTrackerNone, NULL);
-	gf_fm_request_set_callback(this, on_fm_request);
-
-	gf_set_progress_callback(this, Osmo4_progress_cbk);
-
-	//load config file
-	//LOGI("Loading User Config %s...", "GPAC.cfg");
-	//m_user.config = gf_cfg_init(m_cfg_dir ? m_cfg_filename : NULL, NULL);
-
-
-	char path512;
-	strcpy(path, gui_dir);
-	char vertex_path512, fragment_path512;
-	strcpy(vertex_path, path);
-	strcpy(fragment_path, path);
-	strcat(vertex_path, "/../shaders/vertex.glsl");
-	strcat(fragment_path, "/../shaders/fragment.glsl");
-
-	gf_opts_set_key("core", "vert-shader", vertex_path);
-	gf_opts_set_key("core", "frag-shader", fragment_path);
-	gf_opts_set_key("filter@compositor", "ogl", "hybrid");
-	opt = gf_opts_get_key("core", "mod-dirs");
-	LOGI("loading modules in directory %s...", opt);
-
-	/*m_user.modules = gf_modules_new(opt, m_user.config);
-	if (!m_user.modules || !gf_modules_get_count(m_user.modules)) {
-		LOGE("No modules found in directory %s !", opt);
-		if (m_user.modules)
-			gf_modules_del(m_user.modules);
-		gf_cfg_del(m_user.config);
-		m_user.config = NULL;
-		return Quit(KErrGeneral);
-	}*/
-
-	SetupLogs();
-	m_term = gf_term_new(&m_user);
-	if (!m_term) {
-		LOGE("Cannot load GPAC Terminal with m_user=%p", &m_user);
-		MessageBox("Cannot load GPAC terminal", "Fatal Error", GF_SERVICE_ERROR);
-		/*gf_modules_del(m_user.modules);
-		m_user.modules = NULL;
-		gf_cfg_del(m_user.config);
-		m_user.config = NULL;*/
-		return Quit(KErrGeneral);
-	}
-
-	/*force fullscreen*/
-	gf_term_set_option(m_term, GF_OPT_FULLSCREEN, 1);
-
-	//setAudioEnvironment(javaVM);
-
-	LOGD("Setting term size m_user=%p...", &m_user);
-	gf_term_set_size(m_term, m_Width, m_Height);
-
-	opt = gf_opts_get_key("General", "StartupFile");
-	LOGD("File loaded at startup=%s.", opt);
-
-	if (!urlToLoad)
-		urlToLoad = opt;
-	if (urlToLoad) {
-		LOGI("Connecting to %s...", urlToLoad);
-		gf_term_connect(m_term, urlToLoad);
-	}
-	debug_log("init end");
-	LOGD("Saving config file...\n");
-	//gf_cfg_save(m_user.config);
-	LOGI("Initialization complete, config file saved.\n");
-
-	return 0;
-}
-//-------------------------------
-int CNativeWrapper::connect(const char *url)
-{
-	if (m_term)
-	{
-		const char *str;
-		debug_log("Starting to connect ...");
-		str = gf_opts_get_key("General", "StartupFile");
-		if (str)
-		{
-			gf_opts_set_key("Temp", "GUIStartupFile", url);
-			gf_term_connect(m_term, str);
-		}
-		if( url )
-		{
-			gf_term_connect_from_time(m_term, url, 0, GF_FALSE);
-		}
-	}
-	debug_log("connected ...");
-	return 0;
-}
-
-void CNativeWrapper::setGpacPreference( const char * category, const char * name, const char * value)
-{
-	//if (m_user.config) {
-		gf_opts_set_key(category, name, value);
-	//	gf_cfg_save(m_user.config);
-	//}
-}
-
-//-----------------------------------------------------
-void CNativeWrapper::disconnect() {
-	if (m_term) {
-		debug_log("disconnecting");
-		gf_term_disconnect(m_term);
-		debug_log("disconnected ...");
-	}
-}
-//-----------------------------------------------------
-void CNativeWrapper::step(void * env, void * bitmap) {
-	m_window = env;
-	m_session = bitmap;
-	m_term->compositor->frame_draw_type = GF_SC_DRAW_FRAME;
-	while (!gf_term_process_step(m_term)) {
-		debug_log("step(): nothing drawn, retrying\n");
-	}
-	debug_log("step(): frame drawn\n");
-}
-
-//-----------------------------------------------------
-void CNativeWrapper::setAudioEnvironment(JavaVM* javaVM) {
-	if (!m_term) {
-		debug_log("setAudioEnvironment(): no m_term found.");
-		return;
-	}
-	debug_log("setAudioEnvironment start");
-	//m_term->compositor->audio_renderer->audio_out->Setup(m_term->compositor->audio_renderer->audio_out, javaVM, 0, 0);
-	debug_log("setAudioEnvironment end");
-}
-//-----------------------------------------------------
-void CNativeWrapper::resize(int w, int h) {
-	if (!m_term)
-		return;
-	debug_log("resize start");
-	gf_term_set_size(m_term, w, h);
-	debug_log("resize end");
-}
-
-//-----------------------------------------------------
-void CNativeWrapper::onMouseDown(float x, float y) {
-	if (!m_term)
-		return;
-	debug_log("onMouseDown start");
-	//char msg100;
-	//sprintf(msg, "onMousedown x=%f, y=%f", x, y );
-	//debug_log(msg);
-
-	GF_Event evt;
-	evt.type = GF_EVENT_MOUSEDOWN;
-	evt.mouse.button = GF_MOUSE_LEFT;
-	evt.mouse.x = x;
-	evt.mouse.y = y;
-
-	gf_term_user_event(m_term, &evt);
-	debug_log("onMouseDown end");
-}
-//-----------------------------------------------------
-void CNativeWrapper::onMouseUp(float x, float y) {
-	if (!m_term)
-		return;
-	debug_log("onMouseUp start");
-	//char msg100;
-	//sprintf(msg, "onMouseUp x=%f, y=%f", x, y );
-	//debug_log(msg);
-
-	GF_Event evt;
-	evt.type = GF_EVENT_MOUSEUP;
-	evt.mouse.button = GF_MOUSE_LEFT;
-	evt.mouse.x = x;
-	evt.mouse.y = y;
-
-	gf_term_user_event(m_term, &evt);
-	debug_log("onMouseUp end");
-}
-//-----------------------------------------------------
-void CNativeWrapper::onMouseMove(float x, float y) {
-	if (!m_term)
-		return;
-	GF_Event evt;
-	evt.type = GF_EVENT_MOUSEMOVE;
-	evt.mouse.button = GF_MOUSE_LEFT;
-	evt.mouse.x = x;
-	evt.mouse.y = y;
-
-	gf_term_user_event(m_term, &evt);
-}
-//-----------------------------------------------------
-void CNativeWrapper::onKeyPress(int keycode, int rawkeycode, int up, int flag, int unicode) {
-	if (!m_term)
-		return;
-	debug_log("onKeyPress start");
-	GF_Event evt;
-	memset(&evt, 0, sizeof(GF_Event));
-	if (up == 0) evt.type = GF_EVENT_KEYUP;
-	else evt.type = GF_EVENT_KEYDOWN;
-
-	evt.key.flags = 0;
-	evt.key.hw_code = rawkeycode;
-
-	translate_key(keycode, &evt.key);
-	//evt.key.key_code = GF_KEY_A;
-	gf_term_user_event(m_term, &evt);
-
-	if (evt.type == GF_EVENT_KEYUP && unicode) {
-		memset(&evt, 0, sizeof(GF_Event));
-		evt.type = GF_EVENT_TEXTINPUT;
-		evt.character.unicode_char = unicode;
-		gf_term_user_event(m_term, &evt);
-	}
-}
-//-----------------------------------------------------
-void CNativeWrapper::translate_key(ANDROID_KEYCODE keycode, GF_EventKey *evt) {
-	evt->flags = 0;
-	switch (keycode) {
-	case ANDROID_KEYCODE_BACK:
-		evt->key_code = GF_KEY_BACKSPACE;
-		evt->hw_code = 8;
-		break;
-	case ANDROID_KEYCODE_TAB:
-		evt->key_code = GF_KEY_TAB;
-		evt->hw_code = 9;
-		break;
-	case ANDROID_KEYCODE_CLEAR:
-		evt->key_code = GF_KEY_CLEAR;
-		break;
-	case ANDROID_KEYCODE_DPAD_CENTER:
-	case ANDROID_KEYCODE_ENTER:
-		evt->key_code = GF_KEY_ENTER;
-		evt->hw_code = 13;
-		break;
-	case ANDROID_KEYCODE_SHIFT_LEFT:
-		evt->key_code = GF_KEY_SHIFT;
-		break;
-	case ANDROID_KEYCODE_SHIFT_RIGHT:
-		evt->key_code = GF_KEY_SHIFT;
-		break;
-	case ANDROID_KEYCODE_ALT_LEFT:
-		evt->key_code = GF_KEY_ALT;
-		break;
-	case ANDROID_KEYCODE_ALT_RIGHT:
-		evt->key_code = GF_KEY_ALT;
-		break;
-	case ANDROID_KEYCODE_SPACE:
-		evt->key_code = GF_KEY_SPACE;
-		evt->hw_code = 32;
-		break;
-	case ANDROID_KEYCODE_HOME:
-		evt->key_code = GF_KEY_HOME;
-		break;
-	case ANDROID_KEYCODE_DPAD_LEFT:
-		evt->key_code = GF_KEY_LEFT;
-		break;
-	case ANDROID_KEYCODE_DPAD_UP:
-		evt->key_code = GF_KEY_UP;
-		break;
-	case ANDROID_KEYCODE_DPAD_RIGHT:
-		evt->key_code = GF_KEY_RIGHT;
-		break;
-	case ANDROID_KEYCODE_DPAD_DOWN:
-		evt->key_code = GF_KEY_DOWN;
-		break;
-	case ANDROID_KEYCODE_DEL:
-		evt->key_code = GF_KEY_BACKSPACE;
-		evt->hw_code = 8;
-		break;
-	case ANDROID_KEYCODE_0:
-		evt->key_code = GF_KEY_0;
-		evt->flags = GF_KEY_EXT_NUMPAD;
-		break;
-	case ANDROID_KEYCODE_1:
-		evt->key_code = GF_KEY_1;
-		evt->flags = GF_KEY_EXT_NUMPAD;
-		break;
-	case ANDROID_KEYCODE_2:
-		evt->key_code = GF_KEY_2;
-		evt->flags = GF_KEY_EXT_NUMPAD;
-		break;
-	case ANDROID_KEYCODE_3:
-		evt->key_code = GF_KEY_3;
-		evt->flags = GF_KEY_EXT_NUMPAD;
-		break;
-	case ANDROID_KEYCODE_4:
-		evt->key_code = GF_KEY_4;
-		evt->flags = GF_KEY_EXT_NUMPAD;
-		break;
-	case ANDROID_KEYCODE_5:
-		evt->key_code = GF_KEY_5;
-		evt->flags = GF_KEY_EXT_NUMPAD;
-		break;
-	case ANDROID_KEYCODE_6:
-		evt->key_code = GF_KEY_6;
-		evt->flags = GF_KEY_EXT_NUMPAD;
-		break;
-	case ANDROID_KEYCODE_7:
-		evt->key_code = GF_KEY_7;
-		evt->flags = GF_KEY_EXT_NUMPAD;
-		break;
-	case ANDROID_KEYCODE_8:
-		evt->key_code = GF_KEY_8;
-		evt->flags = GF_KEY_EXT_NUMPAD;
-		break;
-	case ANDROID_KEYCODE_9:
-		evt->key_code = GF_KEY_9;
-		evt->flags = GF_KEY_EXT_NUMPAD;
-		break;
-	/*thru VK_9 are the same as ASCII '0' thru '9' (0x30 - 0x39) */
-	/* VK_A thru VK_Z are the same as ASCII 'A' thru 'Z' (0x41 - 0x5A) */
-	default:
-		if ((keycode>=ANDROID_KEYCODE_A) && (keycode<=ANDROID_KEYCODE_Z)) {
-			evt->key_code = GF_KEY_A + keycode - ANDROID_KEYCODE_A;
-		} else {
-			evt->key_code = GF_KEY_UNIDENTIFIED;
-		}
-		break;
-	}
-}
-//-----------------------------------------------------
-     /**
-      * x: yaw (azimuth - rotation around the -Z axis) range: -PI, PI
-      * y: pitch (rotation around the -X axis) range: -PI/2, PI/2
-      * z: roll (rotation around the Y axis) range: -PI, PI
-      */
-void CNativeWrapper::onOrientationChange(float x, float y, float z) {
-	if (!m_term)
-		return;
-	GF_Event evt;
-	evt.type = GF_EVENT_SENSOR_ORIENTATION;
-	evt.sensor.x = x;
-	evt.sensor.y = y;
-	evt.sensor.z = z;
-	evt.sensor.w = 0;
-
-	gf_term_user_event(m_term, &evt);
-}
-//-----------------------------------------------------
-void CNativeWrapper::setGpacLogs(const char *tools_at_level)
-{
-	gf_log_set_tools_levels(tools_at_level, GF_TRUE);
-}
-
-//---------------------------------------------------------------------------------------------------
-//---------------------------------------------------------------------------------------------------

gpac-2.2.1.tar.gz/applications/deprecated/osmo4_android_studio/app/src/main/jni/wrapper.h Deleted

@@ -1,229 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *				Authors: Jean Le Feuvre
- *				Copyright (c) Telecom ParisTech 2009-
- *					All rights reserved
- *
- *	Created by NGO Van Luyen, Ivica ARSOV / ARTEMIS / Telecom SudParis /Institut TELECOM on Oct, 2010
- *
- *  This file is part of GPAC / Wrapper
- *
- *  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.
- *
- */
-
-#ifndef WRAPPER
-#define  WRAPPER
-
-#include <jni.h>
-
-#include <gpac/terminal.h>
-#include <gpac/thread.h>
-#include <gpac/options.h>
-#include <gpac/network.h>
-
-//#define		MAX_PATH	255
-
-#define		KErrGeneral	1
-//#define		GPAC_CFG_DIR	"/data/osmo/"
-#define		GPAC_CFG_DIR	m_cfg_dir
-//#define		GPAC_MODULES_DIR "/data/osmo/modules/"
-#define		GPAC_MODULES_DIR m_modules_dir
-//#define		GPAC_MODULES_PATH "/data/osmo/modules/"
-#define		GPAC_MODULES_PATH m_modules_dir
-//#define		GPAC_CACHE_DIR "/data/osmo/cache/"
-#define		GPAC_CACHE_DIR m_cache_dir
-//#define		GPAC_LOG_FILE "/data/osmo/gpac_logs.txt"
-#define		GPAC_LOG_FILE m_log_filename
-//#define		GPAC_FONT_DIR "/system/fonts/"
-#define		GPAC_FONT_DIR m_font_dir
-
-// keyboard code
-#define ANDROID_KEYCODE		int
-#define ANDROID_KEYCODE_0	7
-#define ANDROID_KEYCODE_1	8
-#define ANDROID_KEYCODE_2	9
-#define ANDROID_KEYCODE_3	10
-#define ANDROID_KEYCODE_4	11
-#define ANDROID_KEYCODE_5	12
-#define ANDROID_KEYCODE_6	13
-#define ANDROID_KEYCODE_7	14
-#define ANDROID_KEYCODE_8	15
-#define ANDROID_KEYCODE_9	16
-#define ANDROID_KEYCODE_A	29
-#define ANDROID_KEYCODE_B	30
-#define ANDROID_KEYCODE_C	31
-#define ANDROID_KEYCODE_D	32
-#define ANDROID_KEYCODE_E	33
-#define ANDROID_KEYCODE_F	34
-#define ANDROID_KEYCODE_G	35
-#define ANDROID_KEYCODE_H	36
-#define ANDROID_KEYCODE_I	37
-#define ANDROID_KEYCODE_J	38
-#define ANDROID_KEYCODE_K	39
-#define ANDROID_KEYCODE_L	40
-#define ANDROID_KEYCODE_M	41
-#define ANDROID_KEYCODE_N	42
-#define ANDROID_KEYCODE_O	43
-#define ANDROID_KEYCODE_P	44
-#define ANDROID_KEYCODE_Q	45
-#define ANDROID_KEYCODE_R	46
-#define ANDROID_KEYCODE_S	47
-#define ANDROID_KEYCODE_T	48
-#define ANDROID_KEYCODE_U	49
-#define ANDROID_KEYCODE_V	50
-#define ANDROID_KEYCODE_W	51
-#define ANDROID_KEYCODE_X	52
-#define ANDROID_KEYCODE_Y	53
-#define ANDROID_KEYCODE_Z	54
-#define ANDROID_KEYCODE_ALT_LEFT	57
-#define ANDROID_KEYCODE_ALT_RIGHT	58
-#define ANDROID_KEYCODE_AT		77
-#define ANDROID_KEYCODE_BACK		4
-#define ANDROID_KEYCODE_BACKSLASH	73
-#define ANDROID_KEYCODE_CALL		5
-#define ANDROID_KEYCODE_CAMERA		27
-#define ANDROID_KEYCODE_CLEAR		28
-#define ANDROID_KEYCODE_COMMA		55
-#define ANDROID_KEYCODE_DEL		67
-#define ANDROID_KEYCODE_DPAD_CENTER	23
-#define ANDROID_KEYCODE_DPAD_DOWN	20
-#define ANDROID_KEYCODE_DPAD_LEFT	21
-#define ANDROID_KEYCODE_DPAD_RIGHT	22
-#define ANDROID_KEYCODE_DPAD_UP		19
-#define ANDROID_KEYCODE_ENDCALL		6
-#define ANDROID_KEYCODE_ENTER		66
-#define ANDROID_KEYCODE_ENVELOPE	65
-#define ANDROID_KEYCODE_EQUALS		70
-#define ANDROID_KEYCODE_EXPLORER	64
-#define ANDROID_KEYCODE_FOCUS		80
-#define ANDROID_KEYCODE_GRAVE		68
-#define ANDROID_KEYCODE_HEADSETHOOK	79
-#define ANDROID_KEYCODE_HOME		3
-#define ANDROID_KEYCODE_LEFT_BRACKET	71
-#define ANDROID_KEYCODE_MEDIA_FAST_FORWARD	90
-#define ANDROID_KEYCODE_MEDIA_NEXT	87
-#define ANDROID_KEYCODE_MEDIA_PLAY_PAUSE	85
-#define ANDROID_KEYCODE_MEDIA_PREVIOUS	88
-#define ANDROID_KEYCODE_MEDIA_REWIND	89
-#define ANDROID_KEYCODE_MEDIA_STOP	86
-#define ANDROID_KEYCODE_MENU		82
-#define ANDROID_KEYCODE_MINUS		69
-#define ANDROID_KEYCODE_MUTE		91
-#define ANDROID_KEYCODE_NUM		78
-#define ANDROID_KEYCODE_PLUS		81
-#define ANDROID_KEYCODE_POWER		26
-#define ANDROID_KEYCODE_RIGHT_BRACKET	72
-#define ANDROID_KEYCODE_SEARCH		84
-#define ANDROID_KEYCODE_SEMICOLON	74
-#define ANDROID_KEYCODE_SHIFT_LEFT	59
-#define ANDROID_KEYCODE_SHIFT_RIGHT	60
-#define ANDROID_KEYCODE_SLASH		76
-#define ANDROID_KEYCODE_SOFT_LEFT	1
-#define ANDROID_KEYCODE_SOFT_RIGHT	2
-#define ANDROID_KEYCODE_SPACE		62
-#define ANDROID_KEYCODE_STAR		17
-#define ANDROID_KEYCODE_SYM		63
-#define ANDROID_KEYCODE_TAB		61
-
-#define ANDROID_KEYCODE_UNKWON		-1
-
-#include <jni.h>
-
-typedef struct _JavaEnvTh {
-	JNIEnv * env;
-	u32 javaThreadId;
-	jobject cbk_obj;
-	jmethodID cbk_displayMessage;
-	jmethodID cbk_onProgress;
-	jmethodID cbk_showKeyboard;
-	jmethodID cbk_setCaption;
-	jmethodID cbk_onLog;
-	jmethodID cbk_onFmRequest;
-	jmethodID cbk_setLogFile;
-	jmethodID cbk_sensorSwitch;
-} JavaEnvTh;
-
-//---------------------------------------------------------------------------------------------------
-//---------------------------------------------------------------------------------------------------
-class CNativeWrapper {
-
-private:
-	void* m_window;
-	void* m_session;
-
-	GF_Terminal *m_term;
-
-	/*
-	 * Callback management
-	 */
-	JavaEnvTh *mainJavaEnv;
-
-	GF_Mutex *m_mx;
-	GF_User m_user;
-	GF_SystemRTInfo m_rti;
-
-	int	do_log;
-	FILE	*log_file;
-
-private:
-	char m_cfg_dirGF_MAX_PATH;
-	char m_modules_dirGF_MAX_PATH;
-	char m_cache_dirGF_MAX_PATH;
-	char m_font_dirGF_MAX_PATH;
-	void setJavaEnv(JavaEnvTh * envToSet, JNIEnv *env, jobject callback);
-private:
-	void SetupLogs();
-	void Shutdown();
-protected:
-	JavaEnvTh * getEnv();
-
-public:
-	CNativeWrapper();
-	~CNativeWrapper();
-	int init(JNIEnv * env, void * bitmap, jobject * callback, int width, int height, const char * cfg_dir, const char * modules_dir, const char * cache_dir, const char * font_dir, const char * gui_dir, const char * urlToLoad);
-
-	int connect(const char *url);
-	void disconnect();
-	void step(void * env, void * bitmap);
-	void resize(int w, int h);
-	void setAudioEnvironment(JavaVM* javaVM);
-
-	void onMouseDown(float x, float y);
-	void onMouseUp(float x, float y);
-	void onMouseMove(float x, float y);
-	void onKeyPress(int keycode, int rawkeycode, int up, int flag, int unicode);
-	void onOrientationChange(float x, float y, float z);
-	void translate_key(ANDROID_KEYCODE keycode, GF_EventKey *evt);
-	void navigate( GF_Event* evt);
-	void setGpacPreference( const char * category, const char * name, const char * value);
-	void setGpacLogs(const char *tools_at_level);
-
-public:
-	int MessageBox(const char* msg, const char* title, GF_Err status);
-	int Quit(int code);WRAPPER
-	static void on_gpac_log(void *cbk, GF_LOG_Level ll, GF_LOG_Tool lm, const char *fmt, va_list list);
-	static void on_fm_request(void *cbk, u32 type, u32 param, int *value);
-	static Bool GPAC_EventProc(void *cbk, GF_Event *evt);
-	void progress_cbk(const char *title, u64 done, u64 total);
-	static void Osmo4_progress_cbk(const void *usr, const char *title, u64 done, u64 total);
-
-private:
-	void debug_log(const char* msg);
-
-};
-
-#endif

gpac-2.2.1.tar.gz/applications/deprecated/osmo4_android_studio/app/src/main/jni/wrapper_jni.cpp Deleted

@@ -1,200 +0,0 @@
-//#include "wrapper_jni.h"
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "wrapper_jni.hpp"
-
-/*
- * Class:     com_gpac_Osmo4_GPACInstance
- * Method:    createInstance
- * Signature: (Lcom/gpac/Osmo4/GpacCallback;IILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)I
- */
-JNIEXPORT jlong JNICALL Java_com_gpac_Osmo4_GPACInstance_createInstance(JNIEnv * env, jclass obj, jobject callback, jint width, jint height, jstring cfg_dir, jstring modules_dir, jstring cache_dir, jstring font_dir, jstring gui_dir, jstring url_to_open)
-{
-	jboolean isCopy;
-	const char * s1 = NULL;
-	if (cfg_dir)
-		s1 = env->GetStringUTFChars(cfg_dir, &isCopy);
-	const char * s2 = env->GetStringUTFChars(modules_dir, &isCopy);
-	const char * s3 = env->GetStringUTFChars(cache_dir, &isCopy);
-	const char * s4 = env->GetStringUTFChars(font_dir, &isCopy);
-	const char * s5 = env->GetStringUTFChars(gui_dir, &isCopy);
-	const char * s6 = NULL;
-	if (url_to_open)
-		s6 = env->GetStringUTFChars(url_to_open, &isCopy);
-	else
-		s6 = NULL;
-	CNativeWrapper * gpac_obj = new CNativeWrapper();
-	if (gpac_obj) {
-		int w = width;
-		int h = height;
-		jniLOGI("Calling gpac_obj->init()...");
-		if (gpac_obj->init(env, NULL, &callback,
-		                   w, h,
-		                   s1, s2, s3, s4, s5, s6)) {
-			jniLOGE("FAILED to init(), return code not 0");
-			delete gpac_obj;
-			gpac_obj = NULL;
-		}
-	} else {
-		jniLOGE("FAILED to create new CNativeWrapper() : not enough memory ?");
-	}
-
-	if (s1)
-		env->ReleaseStringUTFChars(cfg_dir, s1);
-	env->ReleaseStringUTFChars(modules_dir, s2);
-	env->ReleaseStringUTFChars(cache_dir, s3);
-	env->ReleaseStringUTFChars(font_dir, s4);
-	env->ReleaseStringUTFChars(gui_dir, s5);
-	if (s6)
-		env->ReleaseStringUTFChars(url_to_open, s6);
-	__android_log_print(ANDROID_LOG_VERBOSE, jniTAG, "Returned Handle = %p", gpac_obj);
-	return (jlong) gpac_obj;
-}
-//-----------------------------------
-JNIEXPORT void JNICALL Java_com_gpac_Osmo4_GPACInstance_gpacconnect(JNIEnv * env, jobject obj, jstring fileName)
-{
-	CAST_HANDLE(wr);
-	jniLOGV("connect::start");
-	if (!wr) {
-		jniLOGV("connect::end : aborted");
-		return;
-	}
-	jboolean isCopy;
-	const char * cFileName = env->GetStringUTFChars(fileName, &isCopy);
-
-	wr->connect(cFileName);
-
-	env->ReleaseStringUTFChars(fileName, cFileName);
-	jniLOGV("connect::end");
-}
-//-----------------------------------
-JNIEXPORT void JNICALL Java_com_gpac_Osmo4_GPACInstance_gpacdisconnect(JNIEnv * env, jobject obj) {
-	CAST_HANDLE(wr);
-	jniLOGV("disconnect::start");
-	if (wr)
-		wr->disconnect();
-	jniLOGV("disconnect::end");
-}
-//-----------------------------------
-JNIEXPORT void JNICALL Java_com_gpac_Osmo4_GPACInstance_gpacfree(JNIEnv * env, jobject obj)
-{
-	CAST_HANDLE(wr);
-	jniLOGV("free::start");
-	if (wr)
-		delete wr;
-	jniLOGV("free::end");
-}
-//-----------------------------------
-JNIEXPORT void JNICALL Java_com_gpac_Osmo4_GPACInstance_gpacrender (JNIEnv * env, jobject obj)
-{
-	CAST_HANDLE(wr);
-	//jniLOGV("render::start");
-	if (wr)
-		wr->step(env, NULL);
-	//jniLOGV("render::end");
-}
-//-----------------------------------
-JNIEXPORT void JNICALL Java_com_gpac_Osmo4_GPACInstance_gpacresize (JNIEnv * env, jobject obj, jint width, jint height)
-{
-	CAST_HANDLE(wr);
-	jniLOGV("resize::start");
-	if (wr)
-		wr->resize(width, height);
-	jniLOGV("resize::end");
-}
-//-----------------------------------
-JNIEXPORT void JNICALL Java_com_gpac_Osmo4_GPACInstance_gpaceventmousedown(JNIEnv * env, jobject obj, jfloat x, jfloat y) {
-	CAST_HANDLE(wr);
-	//jniLOGV("mouseDown::start");
-	if (wr)
-		wr->onMouseDown(x, y);
-	//jniLOGV("mouseDown::end");
-}
-//-----------------------------------
-JNIEXPORT void JNICALL Java_com_gpac_Osmo4_GPACInstance_gpaceventmouseup(JNIEnv * env, jobject obj, jfloat x, jfloat y) {
-	CAST_HANDLE(wr);
-	//jniLOGV("mouseUp::start");
-	if (wr)
-		wr->onMouseUp(x, y);
-	//jniLOGV("mouseUp::end");
-}
-//-----------------------------------
-JNIEXPORT void JNICALL Java_com_gpac_Osmo4_GPACInstance_gpaceventmousemove(JNIEnv * env, jobject obj, jfloat x, jfloat y) {
-	CAST_HANDLE(wr);
-	//jniLOGV("mouseMouv::start");
-	if (wr)
-		wr->onMouseMove(x, y);
-	//jniLOGV("mouseMouv::end");
-}
-//-----------------------------------
-JNIEXPORT void JNICALL Java_com_gpac_Osmo4_GPACInstance_gpaceventkeypress(JNIEnv * env, jobject obj, jint keycode, jint rawkeycode, jint up, jint flag, jint unicode) {
-	CAST_HANDLE(wr);
-	//jniLOGV("keypress::start");
-	if (wr)
-		wr->onKeyPress(keycode, rawkeycode, up, flag, unicode);
-	//jniLOGV("keypress::end");
-}
-//-----------------------------------
-JNIEXPORT void JNICALL Java_com_gpac_Osmo4_GPACInstance_gpaceventorientationchange(JNIEnv * env, jobject obj, jfloat x, jfloat y, jfloat z) {
-	CAST_HANDLE(wr);
-	if (wr)	
-		wr->onOrientationChange(x, y, z);
-}
-
-/*
-JNIEXPORT void JNICALL Java_com_gpac_Osmo4_GPACInstance_getdpi(JNIEnv * env, jobject obj, jint keycode,jfloat x, jfloat y){
-        CAST_HANDLE(wr);
-        jniLOGV("get DPI::start");
-	jclass cls = (*env)->GetObjectClass(env, obj);
-	jmethodID mid = (*env)->GetStaticMethodID(env, cls, "getdpi", "(FF)V");
-	if (mid == 0)
-	  return;
-	(*env)->CallStaticIntMethod(env, cls, mid, x,y);
-        jniLOGV("get DPI::end");
-}
-*/
-
-/*
- * Class:     com_gpac_Osmo4_GPACInstance
- * Method:    setGpacPreference
- * Signature: (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
- */
-JNIEXPORT void JNICALL Java_com_gpac_Osmo4_GPACInstance_setGpacPreference
-(JNIEnv * env, jobject obj, jstring category, jstring name, jstring value) {
-	CAST_HANDLE(wr);
-	jboolean isCopy;
-	const char * scat = env->GetStringUTFChars(category, &isCopy);
-	const char * sname = env->GetStringUTFChars(name, &isCopy);
-	const char * svalue;
-	if (value)
-		svalue = env->GetStringUTFChars(value, &isCopy);
-	else
-		svalue = NULL;
-	if (wr)
-		wr->setGpacPreference(scat, sname, svalue);
-	env->ReleaseStringUTFChars(category, scat);
-	env->ReleaseStringUTFChars(name, sname);
-	if (value)
-		env->ReleaseStringUTFChars(value, svalue);
-}
-//-----------------------------------
-
-
-
-JNIEXPORT void JNICALL Java_com_gpac_Osmo4_GPACInstance_setGpacLogs(JNIEnv * env, jobject obj, jstring tools_at_levels) {
-	CAST_HANDLE(wr);
-	jniLOGV("setDebug::start");
-	if (wr) {
-		jboolean isCopy;
-		const char * string_tools_at_levels = env->GetStringUTFChars(tools_at_levels, &isCopy);
-		wr->setGpacLogs(string_tools_at_levels);
-		env->ReleaseStringUTFChars(tools_at_levels, string_tools_at_levels);
-	}
-	jniLOGV("setDebug::end");
-}
-
-#ifdef __cplusplus
-}
-#endif

gpac-2.2.1.tar.gz/applications/deprecated/osmo4_android_studio/app/src/main/jni/wrapper_jni.hpp Deleted

@@ -1,83 +0,0 @@
-//#include "wrapper_jni.h"
-#ifndef WRAPPER_JNI
-#define WRAPPER_JNI
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <jni.h>
-#include <android/log.h>
-#include "wrapper.h"
-
-#define jniTAG "WRAPPER_JNI"
-
-#define jniLOGV(X)  __android_log_print(ANDROID_LOG_VERBOSE, jniTAG, X)
-#define jniLOGI(X)  __android_log_print(ANDROID_LOG_INFO, jniTAG, X)
-#define jniLOGE(X)  __android_log_print(ANDROID_LOG_ERROR, jniTAG, X)
-
-#define CAST_HANDLE(wr) jclass c = env->GetObjectClass(obj);\
-                        if (!c) return;\
-                        jfieldID fid = env->GetFieldID(c, "handle", "J");\
-                        if (!fid){\
-                          __android_log_print(ANDROID_LOG_ERROR, jniTAG, "No Field ID, ERROR");\
-                          return;\
-                        }\
-                        jlong h = env->GetLongField(obj, fid);\
-                        CNativeWrapper* wr = (CNativeWrapper*)h;
-//                        __android_log_print(ANDROID_LOG_VERBOSE, jniTAG, "Handle = %p", wr);
-
-/*
- * Class:     com_gpac_Osmo4_GPACInstance
- * Method:    createInstance
- * Signature: (Lcom/gpac/Osmo4/GpacCallback;IILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)I
- */
-JNIEXPORT jlong JNICALL Java_com_gpac_Osmo4_GPACInstance_createInstance(JNIEnv * env, jclass obj, jobject callback, jint width, jint height, jstring cfg_dir, jstring modules_dir, jstring cache_dir, jstring font_dir, jstring gui_dir, jstring url_to_open);
-//-----------------------------------
-JNIEXPORT void JNICALL Java_com_gpac_Osmo4_GPACInstance_gpacconnect(JNIEnv * env, jobject obj, jstring fileName);
-//-----------------------------------
-JNIEXPORT void JNICALL Java_com_gpac_Osmo4_GPACInstance_gpacdisconnect(JNIEnv * env, jobject obj);
-//-----------------------------------
-JNIEXPORT void JNICALL Java_com_gpac_Osmo4_GPACInstance_gpacfree(JNIEnv * env, jobject obj);
-//-----------------------------------
-JNIEXPORT void JNICALL Java_com_gpac_Osmo4_GPACInstance_gpacrender (JNIEnv * env, jobject obj);
-//-----------------------------------
-JNIEXPORT void JNICALL Java_com_gpac_Osmo4_GPACInstance_gpacresize (JNIEnv * env, jobject obj, jint width, jint height);
-//-----------------------------------
-JNIEXPORT void JNICALL Java_com_gpac_Osmo4_GPACInstance_gpaceventmousedown(JNIEnv * env, jobject obj, jfloat x, jfloat y);
-//-----------------------------------
-JNIEXPORT void JNICALL Java_com_gpac_Osmo4_GPACInstance_gpaceventmouseup(JNIEnv * env, jobject obj, jfloat x, jfloat y);
-//-----------------------------------
-JNIEXPORT void JNICALL Java_com_gpac_Osmo4_GPACInstance_gpaceventmousemove(JNIEnv * env, jobject obj, jfloat x, jfloat y);
-//-----------------------------------
-JNIEXPORT void JNICALL Java_com_gpac_Osmo4_GPACInstance_gpaceventkeypress(JNIEnv * env, jobject obj, jint keycode, jint rawkeycode, jint up, jint flag, jint unicode);
-/*
-JNIEXPORT void JNICALL Java_com_gpac_Osmo4_GPACInstance_getdpi(JNIEnv * env, jobject obj, jint keycode,jfloat x, jfloat y){
-        CAST_HANDLE(wr);
-        jniLOGV("get DPI::start");
-	jclass cls = (*env)->GetObjectClass(env, obj);
-	jmethodID mid = (*env)->GetStaticMethodID(env, cls, "getdpi", "(FF)V");
-	if (mid == 0)
-	  return;
-	(*env)->CallStaticIntMethod(env, cls, mid, x,y);
-        jniLOGV("get DPI::end");
-}
-*/
-
-/*
- * Class:     com_gpac_Osmo4_GPACInstance
- * Method:    setGpacPreference
- * Signature: (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
- */
-JNIEXPORT void JNICALL Java_com_gpac_Osmo4_GPACInstance_setGpacPreference
-(JNIEnv * env, jobject obj, jstring category, jstring name, jstring value);
-
-
-
-JNIEXPORT void JNICALL Java_com_gpac_Osmo4_GPACInstance_setGpacLogs(JNIEnv * env, jobject obj, jstring tools_at_levels);
-JNIEXPORT void JNICALL Java_com_gpac_Osmo4_GPACInstance_gpaceventorientationchange(JNIEnv * env, jobject obj, jfloat x, jfloat y, jfloat z);
-
-#ifdef __cplusplus
-}
-#endif
-#endif

gpac-2.2.1.tar.gz/applications/deprecated/osmo4_android_studio/app/src/main/res Deleted

gpac-2.2.1.tar.gz/applications/deprecated/osmo4_android_studio/app/src/main/res/layout Deleted

gpac-2.2.1.tar.gz/applications/deprecated/osmo4_android_studio/app/src/main/res/layout/about_dialog.xml Deleted

@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:orientation="vertical">
-
-    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="top|center_horizontal"
-        android:gravity="center_vertical"
-        android:orientation="horizontal"
-        android:padding="2dip">
-
-        <ImageView
-            android:id="@+id/about_img1"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:padding="2dip"
-            android:src="@drawable/icon" />
-
-        <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:id="@+id/aboutCopyright1"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:layout_gravity="right"
-                android:text="@string/aboutCopyright1" />
-
-            <TextView
-                android:id="@+id/aboutCopyright2"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:layout_gravity="right"
-                android:text="@string/aboutCopyright2" />
-
-            <TextView
-                android:id="@+id/aboutLicence"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:layout_gravity="right"
-                android:text="@string/aboutLicence" />
-
-            <TextView
-                android:id="@+id/aboutAuthors"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/aboutAuthors" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <ListView
-        android:id="@+id/aboutAuthors_listView"
-        style="@android:style/Widget.TextView"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:entries="@array/allAuthors_array"
-        android:isScrollContainer="true" />
-</LinearLayout>

gpac-2.2.1.tar.gz/applications/deprecated/osmo4_android_studio/app/src/main/res/layout/activity_config_file_editor.xml Deleted

@@ -1,197 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical" android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <LinearLayout
-        android:orientation="horizontal"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="10dp"
-        android:layout_marginRight="10dp"
-        android:layout_marginTop="5dp">
-        <TextView
-            android:text="@string/option"
-            android:layout_height="wrap_content"
-            android:textStyle="bold"
-            android:textSize="18sp"
-            android:layout_width="0dp"
-            android:layout_weight="30"
-            />
-
-        <android.widget.AutoCompleteTextView
-            android:id="@+id/optionsTextView"
-            android:layout_height="wrap_content"
-            android:layout_width="0dp"
-            android:singleLine="true"
-            android:layout_weight="70"
-            />
-    </LinearLayout>
-
-    <LinearLayout
-        android:orientation="horizontal"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="10dp"
-        android:layout_marginRight="10dp"
-        android:layout_marginTop="5dp">
-        <TextView
-            android:text="@string/type"
-            android:layout_height="wrap_content"
-            android:textStyle="bold"
-            android:textSize="18sp"
-            android:layout_width="0dp"
-            android:layout_weight="30"
-            />
-
-        <TextView
-            android:id="@+id/typeTextView"
-            android:layout_height="wrap_content"
-            android:layout_width="0dp"
-            android:layout_weight="70"
-            />
-    </LinearLayout>
-
-
-    <LinearLayout
-        android:orientation="horizontal"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="10dp"
-        android:layout_marginRight="10dp"
-        android:layout_marginTop="5dp">
-        <TextView
-            android:text="@string/dfault"
-            android:layout_height="wrap_content"
-            android:textStyle="bold"
-            android:textSize="18sp"
-            android:layout_width="0dp"
-            android:layout_weight="30"
-            />
-        <TextView
-            android:id="@+id/dfaultTextView"
-            android:layout_height="wrap_content"
-            android:layout_width="0dp"
-            android:layout_weight="70"
-            />
-    </LinearLayout>
-
-
-    <LinearLayout
-        android:orientation="horizontal"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="10dp"
-        android:layout_marginRight="10dp"
-        android:layout_marginTop="5dp">
-        <TextView
-            android:text="@string/usage"
-            android:layout_height="wrap_content"
-            android:textStyle="bold"
-            android:textSize="18sp"
-            android:layout_width="0dp"
-            android:layout_weight="30"
-            />
-        <TextView
-            android:id="@+id/usageTextView"
-            android:layout_height="wrap_content"
-            android:layout_width="0dp"
-            android:layout_weight="70"
-            />
-    </LinearLayout>
-
-
-    <LinearLayout
-        android:orientation="horizontal"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="10dp"
-        android:layout_marginRight="10dp"
-        android:layout_marginTop="5dp">
-        <TextView
-            android:text="@string/description"
-            android:layout_height="wrap_content"
-            android:textStyle="bold"
-            android:textSize="18sp"
-            android:layout_width="0dp"
-            android:layout_weight="30"
-            />
-        <TextView
-            android:id="@+id/descriptionTextView"
-            android:layout_height="wrap_content"
-            android:layout_width="0dp"
-            android:maxLines="10"
-            android:scrollbars="vertical"
-            android:layout_weight="70"
-            />
-    </LinearLayout>
-
-
-    <LinearLayout
-        android:orientation="horizontal"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="10dp"
-        android:layout_marginRight="10dp"
-        android:layout_marginTop="5dp">
-        <TextView
-            android:text="@string/currentValue"
-            android:layout_height="wrap_content"
-            android:textStyle="bold"
-            android:textSize="18sp"
-            android:layout_width="0dp"
-            android:layout_weight="30"
-            />
-        <TextView
-            android:id="@+id/currentValueEditText"
-            android:layout_height="wrap_content"
-            android:layout_width="0dp"
-            android:maxLines="4"
-            android:layout_weight="70"
-            />
-    </LinearLayout>
-
-    <LinearLayout
-        android:orientation="horizontal"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="10dp"
-        android:layout_marginRight="10dp"
-        android:layout_marginTop="5dp">
-        <TextView
-            android:text="@string/newValue"
-            android:layout_height="wrap_content"
-            android:textStyle="bold"
-            android:textSize="18sp"
-            android:layout_width="0dp"
-            android:layout_weight="30"
-            />
-        <EditText
-            android:id="@+id/newValueEditText"
-            android:layout_height="wrap_content"
-            android:layout_width="0dp"
-            android:maxLines="4"
-            android:layout_weight="70"
-            />
-    </LinearLayout>
-
-    <LinearLayout
-        android:orientation="horizontal"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="10dp"
-        android:layout_marginRight="10dp"
-        android:layout_marginTop="5dp">
-
-        <Button
-            android:id="@+id/saveButton"
-            android:text="@string/save"
-            android:layout_height="wrap_content"
-            android:layout_width="0dp"
-            android:maxLines="4"
-            android:layout_weight="70"
-            />
-    </LinearLayout>
-
-
-</LinearLayout>
\ No newline at end of file

gpac-2.2.1.tar.gz/applications/deprecated/osmo4_android_studio/app/src/main/res/layout/activity_file_chooser.xml Deleted

gpac-2.2.1.tar.gz/applications/deprecated/osmo4_android_studio/app/src/main/res/layout/auth_requested.xml Deleted

@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent">
-
-    <LinearLayout
-        android:id="@+id/verticalLayout"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical">
-
-        <TableLayout
-            android:id="@+id/url_auth_layout"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content">
-
-            <TableRow
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:layout_gravity="fill_horizontal"
-                android:baselineAligned="true">
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="fill_parent"
-                    android:layout_gravity="right"
-                    android:text="@string/usernameLabel" />
-
-                <EditText
-                    android:id="@+id/userName"
-                    android:layout_width="fill_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="2"
-                    android:gravity="fill_horizontal|right"
-                    android:hint="@string/usernameHint"
-                    android:inputType="textUri"
-                    android:text="" />
-            </TableRow>
-
-            <TableRow
-                android:layout_height="wrap_content"
-                android:layout_gravity="fill_horizontal"
-                android:gravity="fill_horizontal">
-
-                <TextView
-                    android:layout_width="fill_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="right"
-                    android:layout_weight="0"
-                    android:baselineAligned="true"
-                    android:text="@string/passwordLabel" />
-
-                <EditText
-                    android:id="@+id/passwordPrompt"
-                    android:layout_width="fill_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="fill_horizontal"
-                    android:layout_weight="2"
-                    android:gravity="fill_horizontal|right"
-                    android:hint="@string/passwordHint"
-                    android:inputType="textPassword"
-                    android:text="" />
-            </TableRow>
-        </TableLayout>
-
-        <LinearLayout
-            android:id="@+id/linearLayout1"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content">
-
-            <Button
-                android:id="@+id/button1"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="Button" />
-
-            <Button
-                android:id="@+id/button2"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="Button" />
-
-
-        </LinearLayout>
-    </LinearLayout>
-
-
-</FrameLayout>

gpac-2.2.1.tar.gz/applications/deprecated/osmo4_android_studio/app/src/main/res/layout/fragment_file_chooser.xml Deleted

gpac-2.2.1.tar.gz/applications/deprecated/osmo4_android_studio/app/src/main/res/layout/list_item_file_chooser.xml Deleted

@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/linearLayout"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:weightSum="1"
-    android:focusable="true"
-    android:clickable="true"
-    >
-
-    <android.support.v7.widget.CardView
-        android:id="@+id/cardView"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:padding="5dp"
-        android:layout_margin="3dp"
-        app:cardBackgroundColor="#777777"
-        >
-
-        <LinearLayout
-            android:orientation="horizontal"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:padding="2dp"
-           >
-
-            <ImageView
-                android:id="@+id/icon"
-                android:layout_width="66dp"
-                android:layout_height="66dp"
-              />
-
-            <LinearLayout
-                android:orientation="vertical"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:weightSum="1">
-
-                <LinearLayout
-                    android:orientation="vertical"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:weightSum="1">
-
-                    <TextView
-                        android:layout_width="match_parent"
-                        android:layout_height="30dp"
-                        android:textAppearance="?android:attr/textAppearanceLarge"
-                        android:text="title"
-                        android:id="@+id/title"
-                        android:layout_marginLeft="10dp"
-                        android:textSize="15dp"
-                        android:textStyle="bold"
-                        android:maxLines="2"
-                        android:layout_weight="0.79"
-                        android:gravity="center_vertical" />
-
-                    <LinearLayout
-                        android:orientation="horizontal"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:weightSum="1"
-                        android:layout_marginLeft="10dp">
-
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:textAppearance="?android:attr/textAppearanceSmall"
-                            android:text="lastModified"
-                            android:id="@+id/lastModified"
-                            android:textSize="10dp"
-                            android:layout_weight="0.23"
-                            android:maxLines="1" />
-
-                    </LinearLayout>
-                </LinearLayout>
-            </LinearLayout>
-
-        </LinearLayout>
-
-    </android.support.v7.widget.CardView>
-
-</LinearLayout>
\ No newline at end of file

gpac-2.2.1.tar.gz/applications/deprecated/osmo4_android_studio/app/src/main/res/layout/main.xml Deleted

@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/main_view"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:orientation="vertical">
-
-    <LinearLayout
-        android:id="@+id/surface_gl"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:gravity="center"
-        android:orientation="vertical" />
-
-    
-    
-    <SurfaceView
-        android:id="@+id/surface_camera"
-        android:layout_width="1px"
-        android:layout_height="1px"
-        android:gravity="center"
-        android:orientation="vertical"
-        android:visibility="gone" />
-
-    
-
-</FrameLayout>
\ No newline at end of file

gpac-2.2.1.tar.gz/applications/deprecated/osmo4_android_studio/app/src/main/res/menu Deleted

gpac-2.2.1.tar.gz/applications/deprecated/osmo4_android_studio/app/src/main/res/menu/main_menu.xml Deleted

@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item
-        android:id="@+id/open_file"
-        android:checkable="false"
-        android:enabled="true"
-        android:title="@string/open_file"
-        android:visible="true" />
-
-    <item
-        android:id="@+id/open_url"
-        android:checkable="false"
-        android:enabled="true"
-        android:title="@string/open_url"
-        android:visible="true" />
-
-    <item
-        android:id="@+id/configFileEditor"
-        android:checkable="false"
-        android:enabled="true"
-        android:title="@string/configFileEditor"
-        android:visible="true" />
-
-    <group
-        android:id="@+id/options"
-        android:checkableBehavior="none"
-        android:enabled="true"
-        android:menuCategory="secondary"
-        android:visible="true">
-
-        <item
-            android:id="@+id/showVirtualKeyboard"
-            android:checkable="false"
-            android:enabled="true"
-            android:title="@string/showVirtualKeyboard"
-            android:visible="true" />
-
-        <item
-            android:id="@+id/quickSettings"
-            android:title="@string/quickSettings">
-            <menu>
-                <group android:checkableBehavior="all">
-                    <item
-                        android:id="@+id/enableDebug"
-                        android:title="@string/debug" />
-                    <item
-                        android:id="@+id/autoRotate"
-                        android:checked="true"
-                        android:title="@string/autoRotate" />
-                </group>
-            </menu>
-        </item>
-
-        <item
-            android:id="@+id/cleanCache"
-            android:checkable="false"
-            android:enabled="true"
-            android:title="@string/cleanCache"
-            android:visible="true" />
-
-        <item
-            android:id="@+id/reloadFile"
-            android:checkable="false"
-            android:enabled="true"
-            android:title="@string/reloadFile"
-            android:visible="true" />
-
-        <item
-            android:id="@+id/setAsStartupFile"
-            android:checkable="false"
-            android:enabled="true"
-            android:title="@string/setAsStartupFile"
-            android:visible="true" />
-
-        <item
-            android:id="@+id/resetGpacConfig"
-            android:checkable="false"
-            android:enabled="true"
-            android:title="@string/resetGpacConfig"
-            android:visible="true" />
-
-        <item
-            android:id="@+id/preferences"
-            android:title="@string/preferences"
-            android:checkable="false"
-            android:enabled="true"
-            android:visible="true"/>
-
-        <item
-            android:id="@+id/about"
-            android:checkable="false"
-            android:enabled="true"
-            android:title="@string/about"
-            android:visible="true" />
-
-        <item
-            android:id="@+id/quit"
-            android:checkable="false"
-            android:enabled="true"
-            android:title="@string/quit"
-            android:visible="true" />
-    </group>
-
-</menu>
\ No newline at end of file

gpac-2.2.1.tar.gz/applications/deprecated/osmo4_android_studio/app/src/main/res/values Deleted

gpac-2.2.1.tar.gz/applications/deprecated/osmo4_android_studio/app/src/main/res/values/arrays.xml Deleted

gpac-2.2.1.tar.gz/applications/deprecated/osmo4_android_studio/app/src/main/res/values/strings.xml Deleted

@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <string name="ok_button">OK</string>
-    <string name="cancel_button">Cancel</string>
-    <string name="resetGpacConfigMessage">This will remove all GPAC settings. You have to quit the applications to apply changes. Do you
-        want to continue ?</string>
-    <string name="open_file">Open file…</string>
-    <string name="open_url">Open URL…</string>
-    <string name="about">About…</string>
-    <string name="quit">Exit</string>
-    <string name="really_quit">Are you sure that you want to exit Osmo4?</string>
-    <string name="yes">Yes</string>
-    <string name="no">No</string>
-    <string name="app_name">Osmo4</string>
-    <string name="titleWithURL">Osmo4 %s</string>
-    <string name="copying_native_libs">Copying module %1$s to %2$s…</string>
-    <string name="displayPopupFormat">%1$s\n%2$s</string>
-    <string name="gpacNotInitialized">GPAC is not initialized</string>
-    <string name="cleanCache">Clean Cache</string>
-    <string name="cleaningCache">Cleaning Cache…</string>
-    <string name="cleaningCacheDirectory">Cleaning Cache directory %s…</string>
-    <string name="showVirtualKeyboard">Keyboard</string>
-    <string name="reloadFile">Reload File</string>
-    <string name="debug">Enable Debug</string>
-    <string name="autoRotate">AutoRotate</string>
-    <string name="quickSettings">Quick Settings</string>
-    <string name="gpacNotInitializedLongMessages">Sorry, GPAC is not initialized, operation cannot be performed</string>
-    <string name="usernameLabel">Username:</string>
-    <string name="usernameHint">Username</string>
-    <string name="passwordLabel">Password:</string>
-    <string name="passwordHint">Password</string>
-    <string name="pleaseEnterAnURLtoConnectTo">Please Enter an URL to connect to…</string>
-    <string name="pleaseSelectAFile">Select a file to open</string>
-    <string name="parentDirectory">Parent Directory</string>
-    <string name="directory">Directory</string>
-    <string name="failedToLoadGPACConfig">Failed to load GPAC Config</string>
-    <string name="fileSize">File %d bytes</string>
-    <string name="selectFileTitlePattern">%1$s %2$s</string>
-    <string name="selectFileDefaultTitle">Select a file</string>
-    <string name="options">Options</string>
-    <string name="aboutTitle">Osmo4 : GPAC for Android</string>
-    <string name="aboutCopyright1">© Telecom-Paris-Tech, 2000–2012</string>
-    <string name="aboutCopyright2">© Telecom-Paris-Tech</string>
-    <string name="aboutLicence">published under LGPL</string>
-    <string name="aboutAuthors">Authors:</string>
-    <string name="osmoLoading">Osmo4 is loading…</string>
-    <string name="gpacLoading">Gpac is loading…</string>
-    <string name="resetGpacConfig">Reset GPAC Config</string>
-    <string name="setAsStartupFile">Set as startup file…</string>
-    <string name="setAsStartupFileMessage">Use %s as startup file ?</string>
-    <string name="setAsStartupFileTitle">Startup file</string>
-    <string name="setAsStartupFileYes">Use current</string>
-    <string name="setAsStartupFileNo">Cancel</string>
-    <string name="setAsStartupFileNull">No startup file</string>
-    <string name="setAsStartupFileMessageNoURL">You are not connected to any URL. You may use this entry to set an URL as a startup file when
-        connected to a given URL or file.</string>
-    <string name="requestPermissionStorage">You need to give permission to access External Storage</string>
-    <string name="configFileEditor">Config File Editor</string>
-    <string name="noAttribute">No attribute found</string>
-    <string name="noKey">No key found</string>
-    <string name="noChange">New value same as old value</string>
-    <string name="valueUpdated">Value updated</string>
-    <string name="valueNotValid">Value not valid</string>
-    <string name="option">Option</string>
-    <string name="type">Type</string>
-    <string name="dfault">Default</string>
-    <string name="usage">Usage</string>
-    <string name="description">Description</string>
-    <string name="currentValue">Current value</string>
-    <string name="newValue">New value</string>
-    <string name="save">Save</string>
-    <string name="files">Files</string>
-    <string name="showHiddenFiles">Show hidden files</string>
-    <string name="hiddenFilesSummary">Show files starting with \' . \'</string>
-    <string name="sorting">Sorting</string>
-    <string name="optionSummary">Click to view Options</string>
-    <string name="sortOrder">Sort order</string>
-    <string name="selectOne">Select one</string>
-    <string name="sortBy">Sort files by</string>
-    <string name="preferences">Preferences</string>
-    <string name="foldersFirst">Folders First</string>
-    
-    <string-array name="allAuthors_array">
-        <item>Romain Bouqueau</item>
-        <item>Cyril Concolato</item>
-        <item>Jean Lefeuvre</item>
-        <item>Jonathan Sillan</item>
-        <item>Pierre Souchay (VizionR)</item>
-        <item>NGO Van Luyen</item>
-        <item>Arsov Ivica</item>
-    </string-array>
-
-</resources>

gpac-2.2.1.tar.gz/applications/deprecated/osmo4_android_studio/app/src/main/res/xml Deleted

gpac-2.2.1.tar.gz/applications/deprecated/osmo4_android_studio/app/src/main/res/xml/preference.xml Deleted

@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <PreferenceCategory
-        android:title="@string/files">
-        <CheckBoxPreference
-            android:key="SHOW_HIDDEN_FILES"
-            android:title="@string/showHiddenFiles"
-            android:summary="@string/hiddenFilesSummary"
-            />
-    </PreferenceCategory>
-
-    <PreferenceCategory
-        android:title="@string/sorting">
-
-            <ListPreference
-                android:key="SORT_ORDER"
-                android:title="@string/sortOrder"
-                android:entries="@array/sortOrder"
-                android:entryValues="@array/sortOrderCodes"
-                android:dialogTitle="@string/selectOne"
-                />
-
-            <ListPreference
-                android:key="SORT_BY"
-                android:title="@string/sortBy"
-                android:entries="@array/sortBy"
-                android:entryValues="@array/sortByCodes"
-                android:dialogTitle="@string/selectOne"
-                />
-
-            <CheckBoxPreference
-                android:key="FOLDERS_FIRST"
-                android:title="@string/foldersFirst"
-                />
-
-    </PreferenceCategory>
-</PreferenceScreen>
\ No newline at end of file

gpac-2.2.1.tar.gz/applications/deprecated/osmo4_android_studio/build.gradle Deleted

gpac-2.2.1.tar.gz/applications/deprecated/osmo4_android_studio/import-summary.txt Deleted

@@ -1,136 +0,0 @@
-ECLIPSE ANDROID PROJECT IMPORT SUMMARY
-======================================
-
-Ignored Files:
---------------
-The following files were *not* copied into the new Gradle project; you
-should evaluate whether these are still needed in your project and if
-so manually move them:
-
-* .DS_Store
-* Osmo4_keystore
-* ant.properties
-* build.xml
-* jni/
-* jni/README.txt
-* jni/wrapper.cpp
-* jni/wrapper.h
-* jni/wrapper_jni.c
-* proguard-project.txt
-
-Moved Files:
-------------
-Android Gradle projects use a different directory structure than ADT
-Eclipse projects. Here's how the projects were restructured:
-
-* AndroidManifest.xml => app/src/main/AndroidManifest.xml
-* assets/ => app/src/main/assets/
-* libs/armeabi-v7a/libavcodec.so => app/src/main/jniLibs/armeabi-v7a/libavcodec.so
-* libs/armeabi-v7a/libavfilter.so => app/src/main/jniLibs/armeabi-v7a/libavfilter.so
-* libs/armeabi-v7a/libavformat.so => app/src/main/jniLibs/armeabi-v7a/libavformat.so
-* libs/armeabi-v7a/libavutil.so => app/src/main/jniLibs/armeabi-v7a/libavutil.so
-* libs/armeabi-v7a/libeditline.so => app/src/main/jniLibs/armeabi-v7a/libeditline.so
-* libs/armeabi-v7a/libfaad.so => app/src/main/jniLibs/armeabi-v7a/libfaad.so
-* libs/armeabi-v7a/libft2.so => app/src/main/jniLibs/armeabi-v7a/libft2.so
-* libs/armeabi-v7a/libgm_aac_in.so => app/src/main/jniLibs/armeabi-v7a/libgm_aac_in.so
-* libs/armeabi-v7a/libgm_bifs_dec.so => app/src/main/jniLibs/armeabi-v7a/libgm_bifs_dec.so
-* libs/armeabi-v7a/libgm_ctx_load.so => app/src/main/jniLibs/armeabi-v7a/libgm_ctx_load.so
-* libs/armeabi-v7a/libgm_droid_cam.so => app/src/main/jniLibs/armeabi-v7a/libgm_droid_cam.so
-* libs/armeabi-v7a/libgm_droid_mpegv.so => app/src/main/jniLibs/armeabi-v7a/libgm_droid_mpegv.so
-* libs/armeabi-v7a/libgm_droidaudio.so => app/src/main/jniLibs/armeabi-v7a/libgm_droidaudio.so
-* libs/armeabi-v7a/libgm_droidout.so => app/src/main/jniLibs/armeabi-v7a/libgm_droidout.so
-* libs/armeabi-v7a/libgm_dummy_in.so => app/src/main/jniLibs/armeabi-v7a/libgm_dummy_in.so
-* libs/armeabi-v7a/libgm_ffmpeg_in.so => app/src/main/jniLibs/armeabi-v7a/libgm_ffmpeg_in.so
-* libs/armeabi-v7a/libgm_ft_font.so => app/src/main/jniLibs/armeabi-v7a/libgm_ft_font.so
-* libs/armeabi-v7a/libgm_gpac_js.so => app/src/main/jniLibs/armeabi-v7a/libgm_gpac_js.so
-* libs/armeabi-v7a/libgm_img_in.so => app/src/main/jniLibs/armeabi-v7a/libgm_img_in.so
-* libs/armeabi-v7a/libgm_ismacryp.so => app/src/main/jniLibs/armeabi-v7a/libgm_ismacryp.so
-* libs/armeabi-v7a/libgm_isom_in.so => app/src/main/jniLibs/armeabi-v7a/libgm_isom_in.so
-* libs/armeabi-v7a/libgm_laser_dec.so => app/src/main/jniLibs/armeabi-v7a/libgm_laser_dec.so
-* libs/armeabi-v7a/libgm_mp3_in.so => app/src/main/jniLibs/armeabi-v7a/libgm_mp3_in.so
-* libs/armeabi-v7a/libgm_mpd_in.so => app/src/main/jniLibs/armeabi-v7a/libgm_mpd_in.so
-* libs/armeabi-v7a/libgm_mpegts_in.so => app/src/main/jniLibs/armeabi-v7a/libgm_mpegts_in.so
-* libs/armeabi-v7a/libgm_odf_dec.so => app/src/main/jniLibs/armeabi-v7a/libgm_odf_dec.so
-* libs/armeabi-v7a/libgm_osd.so => app/src/main/jniLibs/armeabi-v7a/libgm_osd.so
-* libs/armeabi-v7a/libgm_rtp_in.so => app/src/main/jniLibs/armeabi-v7a/libgm_rtp_in.so
-* libs/armeabi-v7a/libgm_saf_in.so => app/src/main/jniLibs/armeabi-v7a/libgm_saf_in.so
-* libs/armeabi-v7a/libgm_soft_raster.so => app/src/main/jniLibs/armeabi-v7a/libgm_soft_raster.so
-* libs/armeabi-v7a/libgm_svg_in.so => app/src/main/jniLibs/armeabi-v7a/libgm_svg_in.so
-* libs/armeabi-v7a/libgm_timedtext.so => app/src/main/jniLibs/armeabi-v7a/libgm_timedtext.so
-* libs/armeabi-v7a/libgm_widgetman.so => app/src/main/jniLibs/armeabi-v7a/libgm_widgetman.so
-* libs/armeabi-v7a/libgpac.so => app/src/main/jniLibs/armeabi-v7a/libgpac.so
-* libs/armeabi-v7a/libgpacWrapper.so => app/src/main/jniLibs/armeabi-v7a/libgpacWrapper.so
-* libs/armeabi-v7a/libjavaenv.so => app/src/main/jniLibs/armeabi-v7a/libjavaenv.so
-* libs/armeabi-v7a/libjpegdroid.so => app/src/main/jniLibs/armeabi-v7a/libjpegdroid.so
-* libs/armeabi-v7a/libjs_osmo.so => app/src/main/jniLibs/armeabi-v7a/libjs_osmo.so
-* libs/armeabi-v7a/libmad.so => app/src/main/jniLibs/armeabi-v7a/libmad.so
-* libs/armeabi-v7a/libopenjpeg.so => app/src/main/jniLibs/armeabi-v7a/libopenjpeg.so
-* libs/armeabi-v7a/libpng.so => app/src/main/jniLibs/armeabi-v7a/libpng.so
-* libs/armeabi-v7a/libstlport_shared.so => app/src/main/jniLibs/armeabi-v7a/libstlport_shared.so
-* libs/armeabi-v7a/libswresample.so => app/src/main/jniLibs/armeabi-v7a/libswresample.so
-* libs/armeabi-v7a/libswscale.so => app/src/main/jniLibs/armeabi-v7a/libswscale.so
-* libs/armeabi-v7a/libz.so => app/src/main/jniLibs/armeabi-v7a/libz.so
-* libs/armeabi/libavcodec.so => app/src/main/jniLibs/armeabi/libavcodec.so
-* libs/armeabi/libavfilter.so => app/src/main/jniLibs/armeabi/libavfilter.so
-* libs/armeabi/libavformat.so => app/src/main/jniLibs/armeabi/libavformat.so
-* libs/armeabi/libavutil.so => app/src/main/jniLibs/armeabi/libavutil.so
-* libs/armeabi/libeditline.so => app/src/main/jniLibs/armeabi/libeditline.so
-* libs/armeabi/libfaad.so => app/src/main/jniLibs/armeabi/libfaad.so
-* libs/armeabi/libft2.so => app/src/main/jniLibs/armeabi/libft2.so
-* libs/armeabi/libgm_aac_in.so => app/src/main/jniLibs/armeabi/libgm_aac_in.so
-* libs/armeabi/libgm_bifs_dec.so => app/src/main/jniLibs/armeabi/libgm_bifs_dec.so
-* libs/armeabi/libgm_ctx_load.so => app/src/main/jniLibs/armeabi/libgm_ctx_load.so
-* libs/armeabi/libgm_droid_cam.so => app/src/main/jniLibs/armeabi/libgm_droid_cam.so
-* libs/armeabi/libgm_droid_mpegv.so => app/src/main/jniLibs/armeabi/libgm_droid_mpegv.so
-* libs/armeabi/libgm_droidaudio.so => app/src/main/jniLibs/armeabi/libgm_droidaudio.so
-* libs/armeabi/libgm_droidout.so => app/src/main/jniLibs/armeabi/libgm_droidout.so
-* libs/armeabi/libgm_dummy_in.so => app/src/main/jniLibs/armeabi/libgm_dummy_in.so
-* libs/armeabi/libgm_ffmpeg_in.so => app/src/main/jniLibs/armeabi/libgm_ffmpeg_in.so
-* libs/armeabi/libgm_ft_font.so => app/src/main/jniLibs/armeabi/libgm_ft_font.so
-* libs/armeabi/libgm_gpac_js.so => app/src/main/jniLibs/armeabi/libgm_gpac_js.so
-* libs/armeabi/libgm_img_in.so => app/src/main/jniLibs/armeabi/libgm_img_in.so
-* libs/armeabi/libgm_ismacryp.so => app/src/main/jniLibs/armeabi/libgm_ismacryp.so
-* libs/armeabi/libgm_isom_in.so => app/src/main/jniLibs/armeabi/libgm_isom_in.so
-* libs/armeabi/libgm_laser_dec.so => app/src/main/jniLibs/armeabi/libgm_laser_dec.so
-* libs/armeabi/libgm_mp3_in.so => app/src/main/jniLibs/armeabi/libgm_mp3_in.so
-* libs/armeabi/libgm_mpd_in.so => app/src/main/jniLibs/armeabi/libgm_mpd_in.so
-* libs/armeabi/libgm_mpegts_in.so => app/src/main/jniLibs/armeabi/libgm_mpegts_in.so
-* libs/armeabi/libgm_odf_dec.so => app/src/main/jniLibs/armeabi/libgm_odf_dec.so
-* libs/armeabi/libgm_osd.so => app/src/main/jniLibs/armeabi/libgm_osd.so
-* libs/armeabi/libgm_rtp_in.so => app/src/main/jniLibs/armeabi/libgm_rtp_in.so
-* libs/armeabi/libgm_saf_in.so => app/src/main/jniLibs/armeabi/libgm_saf_in.so
-* libs/armeabi/libgm_soft_raster.so => app/src/main/jniLibs/armeabi/libgm_soft_raster.so
-* libs/armeabi/libgm_svg_in.so => app/src/main/jniLibs/armeabi/libgm_svg_in.so
-* libs/armeabi/libgm_timedtext.so => app/src/main/jniLibs/armeabi/libgm_timedtext.so
-* libs/armeabi/libgm_widgetman.so => app/src/main/jniLibs/armeabi/libgm_widgetman.so
-* libs/armeabi/libgpac.so => app/src/main/jniLibs/armeabi/libgpac.so
-* libs/armeabi/libgpacWrapper.so => app/src/main/jniLibs/armeabi/libgpacWrapper.so
-* libs/armeabi/libjavaenv.so => app/src/main/jniLibs/armeabi/libjavaenv.so
-* libs/armeabi/libjpegdroid.so => app/src/main/jniLibs/armeabi/libjpegdroid.so
-* libs/armeabi/libjs_osmo.so => app/src/main/jniLibs/armeabi/libjs_osmo.so
-* libs/armeabi/libmad.so => app/src/main/jniLibs/armeabi/libmad.so
-* libs/armeabi/libopenjpeg.so => app/src/main/jniLibs/armeabi/libopenjpeg.so
-* libs/armeabi/libpng.so => app/src/main/jniLibs/armeabi/libpng.so
-* libs/armeabi/libstlport_shared.so => app/src/main/jniLibs/armeabi/libstlport_shared.so
-* libs/armeabi/libswresample.so => app/src/main/jniLibs/armeabi/libswresample.so
-* libs/armeabi/libswscale.so => app/src/main/jniLibs/armeabi/libswscale.so
-* libs/armeabi/libz.so => app/src/main/jniLibs/armeabi/libz.so
-* libs/real3d.jar => app/libs/real3d.jar
-* res/ => app/src/main/res/
-* src/ => app/src/main/java/
-* src/.DS_Store => app/src/main/resources/.DS_Store
-
-Next Steps:
------------
-You can now build the project. The Gradle project needs network
-connectivity to download dependencies.
-
-Bugs:
------
-If for some reason your project does not build, and you determine that
-it is due to a bug or limitation of the Eclipse to Gradle importer,
-please file a bug at http://b.android.com with category
-Component-Tools.
-
-(This import summary is for your information only, and can be deleted
-after import once you are satisfied with the results.)

gpac-2.2.1.tar.gz/applications/deprecated/osmo4_android_studio/settings.gradle Deleted

gpac-2.2.1.tar.gz/applications/deprecated/osmo4_ios Deleted

gpac-2.2.1.tar.gz/applications/deprecated/osmo4_ios/main.c Deleted

@@ -1,841 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Jean Le Feuvre, Romain Bouqueau
- *			Copyright (c) Telecom ParisTech 2000-2012
- *					All rights reserved
- *
- *  This file is part of GPAC / command-line client
- *
- *  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.
- *
- */
-
-/*includes both terminal and od browser*/
-#include <gpac/terminal.h>
-#include <gpac/term_info.h>
-#include <gpac/constants.h>
-#include <gpac/options.h>
-#include <gpac/events.h>
-
-#include <pwd.h>
-#include <unistd.h>
-
-#include "sensors_def.h"
-
-void PrintAVInfo(Bool final);
-
-static Bool restart = 0;
-static Bool not_threaded = 1;
-
-static Bool no_audio = 0;
-Bool is_connected = 0;
-Bool startup_file = 0;
-GF_User user;
-GF_Terminal *term;
-u64 Duration;
-GF_Err last_error = GF_OK;
-
-static u32 display_rti = 0;
-static Bool Run;
-static Bool CanSeek = 0;
-static char the_urlGF_MAX_PATH;
-static Bool no_mime_check = 1;
-static Bool be_quiet = 0;
-static u32 log_time_start = 0;
-
-static u32 forced_width=0;
-static u32 forced_height=0;
-static u32 bench_mode = 0;
-static u32 bench_mode_start = 0;
-static u32 paused_by_bench = 0;
-
-/*windowless options*/
-u32 align_mode = 0;
-u32 init_w = 0;
-u32 init_h = 0;
-u32 last_x, last_y;
-Bool right_down = 0;
-
-static u32 rti_update_time_ms = 200;
-static FILE *rti_logs = NULL;
-static u64 memory_at_gpac_startup = 0;
-
-static void UpdateRTInfo(const char *legend)
-{
-	GF_SystemRTInfo rti;
-	if (paused_by_bench==1) return;
-
-	/*refresh every second*/
-	if (!display_rti && !rti_logs) return;
-	if (!gf_sys_get_rti(rti_update_time_ms, &rti, 0) && !legend)
-		return;
-
-	if (display_rti) {
-		if (display_rti==2) {
-			char szMsg1024;
-
-			if (rti.total_cpu_usage && (bench_mode<2) ) {
-				sprintf(szMsg, "FPS %02.02f CPU %2d (%02d) Mem %d kB",
-			        gf_term_get_framerate(term, 0), rti.total_cpu_usage, rti.process_cpu_usage, (u32) (rti.gpac_memory / 1024));
-			} else {
-				sprintf(szMsg, "FPS %02.02f CPU %02d Mem %d kB",
-			        gf_term_get_framerate(term, 0), rti.process_cpu_usage, (u32) (rti.gpac_memory / 1024) );
-			}
-
-			PrintAVInfo(GF_FALSE);
-
-
-			fprintf(stderr, "%s\r", szMsg);
-		} else {
-			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 (rti_logs) {
-		fprintf(rti_logs, "% 8d\t% 8d\t% 8d\t% 4d\t% 8d\t%s",
-		        gf_sys_clock(),
-		        gf_term_get_time_in_ms(term),
-		        rti.total_cpu_usage,
-		        (u32) gf_term_get_framerate(term, 0),
-		        (u32) (rti.gpac_memory / 1024),
-		        legend ? legend : ""
-		       );
-		if (!legend) fprintf(rti_logs, "\n");
-	}
-}
-
-static void ResetCaption()
-{
-	GF_Event event;
-	if (display_rti) return;
-	memset(&event, 0, sizeof(GF_Event));
-
-	event.type = GF_EVENT_SET_CAPTION;
-	if (is_connected) {
-#ifdef FILTER_FIXME
-		char szName1024;
-		NetInfoCommand com;
-
-		event.caption.caption = NULL;
-		/*get any service info*/
-		if (!startup_file && gf_term_get_service_info(term, gf_term_get_root_object(term), &com) == GF_OK) {
-			strcpy(szName, "");
-			if (com.track_info) {
-				char szBuf10;
-				sprintf(szBuf, "%02d ", (u32) (com.track_info>>16) );
-				strcat(szName, szBuf);
-			}
-			if (com.artist) {
-				strcat(szName, com.artist);
-				strcat(szName, " ");
-			}
-			if (com.name) {
-				strcat(szName, com.name);
-				strcat(szName, " ");
-			}
-			if (com.album) {
-				strcat(szName, "(");
-				strcat(szName, com.album);
-				strcat(szName, ")");
-			}
-
-			if (strlen(szName)) event.caption.caption = szName;
-		}
-		if (!event.caption.caption) {
-			char *str = strrchr(the_url, '\\');
-			if (!str) str = strrchr(the_url, '/');
-			event.caption.caption = str ? str+1 : the_url;
-		}
-#endif
-
-	} else {
-		event.caption.caption = "GPAC MP4Client " GPAC_VERSION;
-	}
-	gf_term_user_event(term, &event);
-}
-
-#ifdef WIN32
-u32 get_sys_col(int idx)
-{
-	u32 res;
-	DWORD val = GetSysColor(idx);
-	res = (val)&0xFF;
-	res<<=8;
-	res |= (val>>8)&0xFF;
-	res<<=8;
-	res |= (val>>16)&0xFF;
-	return res;
-}
-#endif
-
-
-void *gyro_dev = NULL;
-
-void ios_sensor_callback(int sensorType, float x, float y, float z, float w)
-{
-	GF_Event evt;
-	memset(&evt, 0, sizeof(GF_Event));
-
-	switch (sensorType) {
-	case SENSOR_ORIENTATION:
-		evt.type = GF_EVENT_SENSOR_ORIENTATION;
-		evt.sensor.x = x;
-		evt.sensor.y = y;
-		evt.sensor.z = z;
-		evt.sensor.w = w;
-		gf_term_user_event(term, &evt);
-		return;
-	default:
-		return;
-	}
-}
-
-static s32 request_next_playlist_item = GF_FALSE;
-FILE *playlist = NULL;
-
-Bool GPAC_EventProc(void *ptr, GF_Event *evt)
-{
-	if (!term) return 0;
-
-	switch (evt->type) {
-	case GF_EVENT_DURATION:
-		Duration = 1000;
-		Duration = (u64) (((s64) Duration) * evt->duration.duration);
-		CanSeek = evt->duration.can_seek;
-		break;
-	case GF_EVENT_MESSAGE:
-	{
-		const char *servName;
-		if (!evt->message.service || !strcmp(evt->message.service, the_url)) {
-			servName = "main service";
-		} else if (!strnicmp(evt->message.service, "data:", 5)) {
-			servName = "";
-		} else {
-			servName = evt->message.service;
-		}
-		if (!evt->message.message) return 0;
-		if (evt->message.error) {
-			if (!is_connected) last_error = evt->message.error;
-			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_PROGRESS:
-		if (bench_mode && (evt->progress.progress_type==1) ) {
-
-			fprintf(stderr, "Bench mode paused - downloading %02d %%\r", (u32) (evt->progress.done*100.0/evt->progress.total) );
-			if (!paused_by_bench) {
-				gf_term_set_option(term, GF_OPT_VIDEO_BENCH, 0);
-				gf_term_set_option(term, GF_OPT_PLAY_STATE, GF_STATE_PAUSED);
-				paused_by_bench=1;
-			} else if (evt->progress.done == evt->progress.total) {
-				gf_term_set_option(term, GF_OPT_PLAY_STATE, GF_STATE_PLAYING);
-				gf_term_set_option(term, GF_OPT_VIDEO_BENCH, (bench_mode==3) ? 2 : 1);
-				bench_mode_start = gf_sys_clock();
-				paused_by_bench=2;
-			}
-		}
-		break;
-
-	case GF_EVENT_CONNECT:
-		if (evt->connect.is_connected) {
-			is_connected = 1;
-			GF_LOG(GF_LOG_INFO, GF_LOG_APP, ("Service Connected\n"));
-		} else if (is_connected) {
-			GF_LOG(GF_LOG_INFO, GF_LOG_APP, ("Service %s\n", is_connected ? "Disconnected" : "Connection Failed"));
-			is_connected = 0;
-			Duration = 0;
-		}
-		if (init_w && init_h) {
-			gf_term_set_size(term, init_w, init_h);
-		}
-		ResetCaption();
-		break;
-
-	case GF_EVENT_QUIT:
-		Run = 0;
-		break;
-	case GF_EVENT_DISCONNECT:
-		gf_term_disconnect(term);
-		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);
-			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 {
-			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_DBLCLICK:
-		if (playlist) {
-			request_next_playlist_item=GF_TRUE;
-		}
-		break;
-	case GF_EVENT_SENSOR_REQUEST:
-		if (evt->activate_sensor.sensor_type==GF_EVENT_SENSOR_ORIENTATION) {
-			if (!gyro_dev) {
-				gyro_dev = sensor_create(SENSOR_ORIENTATION, ios_sensor_callback);
-				if (!gyro_dev)
-					return GF_FALSE;
-			}
-			if (evt->activate_sensor.activate) {
-				/*start sensors*/
-				sensor_start(gyro_dev);
-			} else if (gyro_dev) {
-				sensor_stop(gyro_dev);
-			}
-			return GF_TRUE;
-		}
-		return GF_FALSE;
-	}
-	return 0;
-}
-
-
-static void on_gpac_log(void *cbk, GF_LOG_Level ll, GF_LOG_Tool lm, const char *fmt, va_list list)
-{
-	FILE *logs = cbk;
-
-	if (rti_logs && (lm & GF_LOG_RTI)) {
-		char szMsg2048;
-		vsnprintf(szMsg, 2048, fmt, list);
-		UpdateRTInfo(szMsg + 6 /*"RTI "*/);
-	} else {
-		if (log_time_start) fprintf(logs, "At %d", gf_sys_clock() - log_time_start);
-		vfprintf(logs, fmt, list);
-		fflush(logs);
-	}
-}
-
-void set_cfg_option(char *opt_string)
-{
-	char *sep, *sep2, szSec1024, szKey1024, szVal1024;
-	sep = strchr(opt_string, ':');
-	if (!sep) {
-		fprintf(stderr, "Badly formatted option %s - expected Section:Name=Value\n", opt_string);
-		return;
-	}
-	{
-		const size_t sepIdx = sep - opt_string;
-		strncpy(szSec, opt_string, sepIdx);
-		szSecsepIdx = 0;
-	}
-	sep ++;
-	sep2 = strchr(sep, '=');
-	if (!sep2) {
-		fprintf(stderr, "Badly formatted option %s - expected Section:Name=Value\n", opt_string);
-		return;
-	}
-	{
-		const size_t sepIdx = sep2 - sep;
-		strncpy(szKey, sep, sepIdx);
-		szKeysepIdx = 0;
-		strcpy(szVal, sep2+1);
-	}
-
-	if (!stricmp(szKey, "*")) {
-		if (stricmp(szVal, "null")) {
-			fprintf(stderr, "Badly formatted option %s - expected Section:*=null\n", opt_string);
-			return;
-		}
-		gf_opts_del_section(szSec);
-		return;
-	}
-
-	if (!stricmp(szVal, "null")) {
-		szVal0=0;
-	}
-	gf_opts_set_key(szSec, szKey, szVal0 ? szVal : NULL);
-}
-
-
-static void on_progress_null(const void *_ptr, const char *_title, u64 done, u64 total)
-{
-}
-#ifdef GPAC_CONFIG_IOS
-int SDL_main (int argc, char *argv)
-#else
-int main (int argc, char *argv)
-#endif
-{
-	const char *str;
-	char *ext;
-	u32 i;
-	u32 url_idx_plus_1 = 0;
-	u32 simulation_time = 0;
-	Bool auto_exit = 0;
-	Bool use_gui = 0;
-    GF_MemTrackerType mem_track = GF_MemTrackerNone;
-	Bool logs_set = GF_FALSE;
-	char *url_arg, *the_cfg;
-	const char *logs_settings = NULL;
-	GF_SystemRTInfo rti;
-	FILE *logfile = NULL;
-	/*by default use current dir*/
-	strcpy(the_url, ".");
-
-	memset(&user, 0, sizeof(GF_User));
-
-	url_arg = the_cfg = NULL;
-
-#ifdef GPAC_MEMORY_TRACKING
-	for (i=1; i<argc; i++) {
-		char *arg = argvi;
-		if (!strcmp(arg, "-mem-track") || !strcmp(arg, "-mem-track-stack")) {
-            mem_track = !strcmp(arg, "-mem-track-stack") ? GF_MemTrackerBackTrace : GF_MemTrackerSimple;
-		}
-	}
-#endif
-
-	gf_sys_init(mem_track, NULL);
-	gf_set_progress_callback(NULL, on_progress_null);
-    
-	for (i=1; i<argc; i++) {
-		char *arg = argvi;
-		if (arg0 != '-') {
-			url_arg = arg;
-			url_idx_plus_1 = i+1;
-		}
-		else if (!strcmp(arg, "-logs")) {
-			logs_settings = argvi+1;
-			i++;
-		}
-		else if (!strcmp(arg, "-lf")) {
-			logfile = gf_fopen(argvi+1, "wt");
-			gf_log_set_callback(logfile, on_gpac_log);
-			i++;
-		}
-#ifndef GPAC_MEMORY_TRACKING
-		else if (!strcmp(arg, "-mem-track") || !strcmp(arg, "-mem-track-stack")) {
-			fprintf(stderr, "WARNING - GPAC not compiled with Memory Tracker - ignoring \"%s\"\n", arg);
-		}
-#endif
-		else if (!strcmp(arg, "-no-audio")) no_audio = GF_TRUE;
-		else if (!strcmp(arg, "-bench")) bench_mode = 1;
-		else if (!strcmp(arg, "-vbench")) bench_mode = 2;
-		else if (!strcmp(arg, "-sbench")) bench_mode = 3;
-		else if (!strcmp(arg, "-gui") || !strcmp(arg, "-guid")) use_gui = 1;
-		else if (!strcmp(arg, "-opt")) {
-			set_cfg_option(argvi+1);
-			i++;
-		}
-		else if (!strcmp(arg, "-run-for")) {
-			simulation_time = atoi(argvi+1);
-			i++;
-		}
- 	}
-
-	if (logs_settings) {
-		if (gf_log_set_tools_levels(logs_settings, GF_TRUE) != GF_OK) {
-			return 1;
-		}
-		logs_set = GF_TRUE;
-	}
-
-	if (!logs_set)
-		gf_log_set_tools_levels( gf_opts_get_key("core", "logs"), GF_TRUE);
-
-	gf_opts_set_key("filter@compositor", "ogl", "hybrid");
-
-	if (!logfile) {
-		const char *opt = gf_opts_get_key("core", "log-file");
-		if (opt) {
-			logfile = gf_fopen(opt, "wt");
-			if (logfile)
-				gf_log_set_callback(logfile, on_gpac_log);
-		}
-	}
-
-	gf_sys_get_rti(500, &rti, GF_RTI_SYSTEM_MEMORY_ONLY);
-	memory_at_gpac_startup = rti.physical_memory_avail;
-
-	init_w = forced_width;
-	init_h = forced_height;
-/*
-	GF_LOG(GF_LOG_INFO, GF_LOG_APP, ("Loading modules\n" ));
-	str = gf_opts_get_key("core", "mod-dirs");
-
-	user.modules = gf_modules_new((const char *) str, cfg_file);
-	if (user.modules) i = gf_modules_get_count(user.modules);
-	if (!i || !user.modules) {
-		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) gf_fclose(logfile);
-		return 1;
-	}
-	GF_LOG(GF_LOG_INFO, GF_LOG_APP, ("Modules Loaded (%d found in %s)\n", i, str));
-*/
-//	url_arg="$IOS_DOCS/NBA_score_table_2_hd.mp4#LIVE360TV";
-
-	if (url_arg && !strncmp(url_arg, "$IOS_DOCS", 9)) {
-		char *path = (char *) gf_opts_get_key("General", "iOSDocumentsDir");
-		if (path) {
-			strcpy(the_url, path);
-			path = strchr(url_arg, '/');
-			if (path) {
-				strcat(the_url, path+1);
-				url_arg = the_url;
-				argvurl_idx_plus_1 - 1 = url_arg;
-			}
-		}
-	}
-	gf_sys_set_args(argc, (const char **) argv);
-
-	user.EventProc = GPAC_EventProc;
-	/*dummy in this case (global vars) but MUST be non-NULL*/
-	//user.opaque = user.modules;
-	if (no_audio) gf_opts_set_key("temp", "no-audio", "yes");
-
-	if (bench_mode) {
-		//gf_cfg_discard_changes(user.config);
-		auto_exit = GF_TRUE;
-		if (bench_mode!=2) {
-			gf_opts_set_key("filter@compositor", "ogl", "off");
-		} else {
-			gf_opts_set_key("core", "disable-vsync", "yes");
-		}
-	}
-
-
-	GF_LOG(GF_LOG_INFO, GF_LOG_APP, ("Loading GPAC Terminal\n"));
-	term = gf_term_new(&user);
-	if (!term) {
-		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) gf_fclose(logfile);
-		return 1;
-	}
-	GF_LOG(GF_LOG_INFO, GF_LOG_APP, ("Terminal Loaded\n"));
-
-	if (bench_mode) {
-		display_rti = 2;
-		gf_term_set_option(term, GF_OPT_VIDEO_BENCH, (bench_mode==3) ? 2 : 1);
-		if (bench_mode==1) bench_mode=2;
-	}
-
-	/*check audio output*/
-	str = gf_opts_get_key("core", "audio-output");
-	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_opts_get_key("General", "NoMIMETypeFetch");
-	no_mime_check = (str && !stricmp(str, "yes")) ? 1 : 0;
-
-	str = gf_opts_get_key("core", "proxy-on");
-	if (str && !strcmp(str, "yes")) {
-		str = gf_opts_get_key("core", "proxy-name");
-		if (str) GF_LOG(GF_LOG_INFO, GF_LOG_APP, ("HTTP Proxy %s enabled\n", str));
-	}
-
-	Run = 1;
-
-	ext = url_arg ? strrchr(url_arg, '.') : NULL;
-	if (ext && (!stricmp(ext, ".m3u") || !stricmp(ext, ".pls"))) {
-		char pl_pathGF_MAX_PATH;
-		GF_Err e = GF_OK;
-		fprintf(stderr, "Opening Playlist %s\n", url_arg);
-
-		strcpy(pl_path, url_arg);
-		/*this is not clean, we need to have a plugin handle playlist for ourselves*/
-		if (!strncmp("http:", url_arg, 5)) {
-#ifdef FILTER_FIXME
-			GF_DownloadSession *sess = gf_dm_sess_new(term->downloader, url_arg, GF_NETIO_SESSION_NOT_THREADED, NULL, NULL, &e);
-			if (sess) {
-				e = gf_dm_sess_process(sess);
-				if (!e) strcpy(pl_path, gf_dm_sess_get_cache_name(sess));
-				gf_dm_sess_del(sess);
-			}
-#endif
-
-		}
-
-		playlist = e ? NULL : gf_fopen(pl_path, "rt");
-		if (playlist) {
-			request_next_playlist_item = GF_TRUE;
-		} else {
-			if (e)
-				fprintf(stderr, "Failed to open playlist %s: %s\n", url_arg, gf_error_to_string(e) );
-
-			fprintf(stderr, "Hit 'h' for help\n\n");
-		}
-	} else if (!use_gui && url_arg) {
-		gf_term_connect(term, url_arg);
-	} else {
-		str = gf_opts_get_key("General", "StartupFile");
-		if (str) {
-			if (!url_arg) {
-				sprintf(the_url, "MP4Client %s", gf_gpac_version() );
-			}
-			gf_term_connect(term, str);
-			startup_file = 1;
-		}
-	}
-
-	/*force fullscreen*/
-	gf_term_set_option(term, GF_OPT_FULLSCREEN, 1);
-
-	if (bench_mode) {
-		rti_update_time_ms = 500;
-		bench_mode_start = gf_sys_clock();
-	}
-
-	while (Run) {
-		if (restart) {
-			restart = 0;
-			gf_term_play_from_time(term, 0, 0);
-		}
-
-		if (request_next_playlist_item) {
-			char szPathGF_MAX_PATH;
-
-			request_next_playlist_item=0;
-			gf_term_disconnect(term);
-
-			if (fscanf(playlist, "%1023s", szPath) == EOF) {
-				fprintf(stderr, "No more items - exiting\n");
-				Run = 0;
-			} else if (szPath0 == '#') {
-				request_next_playlist_item = GF_TRUE;
-			} else {
-				fprintf(stderr, "Opening URL %s\n", szPath);
-				gf_term_connect_with_path(term, szPath, url_arg);
-			}
-		}
-
-		if (display_rti) UpdateRTInfo(NULL);
-		if (not_threaded) {
-			//printf("gf_term_process_step from run loop\n");
-			gf_term_process_step(term);
-			if (auto_exit && gf_term_get_option(term, GF_OPT_IS_OVER)) {
-				Run = 0;
-			}
-		} else {
-			gf_sleep(rti_update_time_ms);
-		}
-		/*sim time*/
-		if (simulation_time && (gf_term_get_time_in_ms(term)>simulation_time)) {
-			Run = 0;
-		}
-	}
-
-	if (bench_mode) {
-		PrintAVInfo(GF_TRUE);
-	}
-
-	gf_term_disconnect(term);
-
-	if (gyro_dev) {
-		sensor_stop(gyro_dev);
-	}
-
-	GF_LOG(GF_LOG_INFO, GF_LOG_APP, ("Deleting terminal... "));
-	gf_term_del(term);
-	GF_LOG(GF_LOG_INFO, GF_LOG_APP, ("OK\n"));
-
-	GF_LOG(GF_LOG_INFO, GF_LOG_APP, ("GPAC cleanup ...\n"));
-	//gf_modules_del(user.modules);
-	//gf_cfg_del(cfg_file);
-
-	if (gyro_dev) {
-		sensor_destroy(&gyro_dev);
-	}
-
-#ifdef GPAC_MEMORY_TRACKING
-	if (mem_track && (gf_memory_size() || gf_file_handles_count() )) {
-		gf_memory_print();
-	}
-#endif
-
-	gf_sys_close();
-	if (rti_logs) gf_fclose(rti_logs);
-	if (logfile) gf_fclose(logfile);
-	if (playlist) gf_fclose(playlist);
-
-	exit(0);
-	return 0;
-}
-
-static GF_ObjectManager *video_odm = NULL;
-static GF_ObjectManager *audio_odm = NULL;
-static GF_ObjectManager *scene_odm = NULL;
-static u32 last_odm_count = 0;
-void PrintAVInfo(Bool final)
-{
-	GF_MediaInfo a_odi, v_odi, s_odi;
-	u32 tot_time;
-
-	if (scene_odm) {
-		GF_ObjectManager *root_odm = gf_term_get_root_object(term);
-		u32 count = gf_term_get_object_count(term, root_odm);
-		if (last_odm_count != count) {
-			last_odm_count = count;
-			scene_odm = NULL;
-		}
-	}
-	if (!video_odm && !audio_odm && !scene_odm) {
-		u32 count, i;
-		GF_ObjectManager *root_odm = gf_term_get_root_object(term);
-		if (!root_odm) return;
-
-		if (gf_term_get_object_info(term, root_odm, &v_odi)==GF_OK) {
-			if (!scene_odm  && (v_odi.generated_scene== 0)) {
-				scene_odm = root_odm;
-			}
-		}
-
-		count = gf_term_get_object_count(term, root_odm);
-		for (i=0; i<count; i++) {
-			GF_ObjectManager *odm = gf_term_get_object(term, root_odm, i);
-			if (!odm) break;
-			if (gf_term_get_object_info(term, odm, &v_odi) == GF_OK) {
-				if (!video_odm && (v_odi.od_type == GF_STREAM_VISUAL) && (v_odi.raw_media || (v_odi.cb_max_count>1) || v_odi.direct_video_memory) ) {
-					video_odm = odm;
-				}
-				else if (!audio_odm && (v_odi.od_type == GF_STREAM_AUDIO)) {
-					audio_odm = odm;
-				}
-				else if (!scene_odm && (v_odi.od_type == GF_STREAM_SCENE)) {
-					scene_odm = odm;
-				}
-			}
-		}
-	}
-
-	if (video_odm) {
-		if (gf_term_get_object_info(term, video_odm, &v_odi)!= GF_OK) {
-			video_odm = NULL;
-			return;
-		}
-	} else {
-		memset(&v_odi, 0, sizeof(v_odi));
-	}
-	if (audio_odm) {
-		gf_term_get_object_info(term, audio_odm, &a_odi);
-	} else {
-		memset(&a_odi, 0, sizeof(a_odi));
-	}
-	if (!video_odm && scene_odm) {
-		gf_term_get_object_info(term, scene_odm, &s_odi);
-	} else {
-		memset(&s_odi, 0, sizeof(s_odi));
-	}
-
-	if (final) {
-		tot_time = gf_sys_clock() - bench_mode_start;
-		fprintf(stderr, "                                                                                     \r");
-		fprintf(stderr, "************** Bench Mode Done in %d ms ********************\n", tot_time);
-		if (bench_mode==3) fprintf(stderr, "** Systems layer only (no decoding) **\n");
-
-		if (!video_odm) {
-			u32 nb_frames_drawn;
-			Double FPS = gf_term_get_simulation_frame_rate(term, &nb_frames_drawn);
-			fprintf(stderr, "Drawn %d frames FPS %.2f (simulation FPS %.2f) - duration %d ms\n", nb_frames_drawn, ((Float)nb_frames_drawn*1000)/tot_time,(Float) FPS, gf_term_get_time_in_ms(term)  );
-		}
-	}
-	if (video_odm) {
-		fprintf(stderr, "%s %dx%d sar=%d:%d duration %.2fs\n", v_odi.codec_name, v_odi.width, v_odi.height, v_odi.par ? (v_odi.par>>16)&0xFF : 1, v_odi.par ? (v_odi.par)&0xFF : 1, v_odi.duration);
-		if (final) {
-			u32 dec_run_time = v_odi.last_frame_time - v_odi.first_frame_time;
-			if (!dec_run_time) dec_run_time = 1;
-			if (v_odi.duration) fprintf(stderr, "%d%% ", (u32) (100*v_odi.current_time / v_odi.duration ) );
-			fprintf(stderr, "%d frames FPS %.2f (max %d us/f) rate avg %d max %d", v_odi.nb_dec_frames, ((Float)v_odi.nb_dec_frames*1000) / dec_run_time, v_odi.max_dec_time, (u32) v_odi.avg_bitrate/1000, (u32) v_odi.max_bitrate/1000);
-			if (v_odi.nb_dropped) {
-				fprintf(stderr, " (Error during bench: %d frames drop)", v_odi.nb_dropped);
-			}
-			fprintf(stderr, "\n");
-		}
-	}
-	if (audio_odm) {
-		fprintf(stderr, "%s SR %d num channels %d fmt %s duration %.2fs\n", a_odi.codec_name, a_odi.sample_rate, a_odi.num_channels, gf_audio_fmt_name(a_odi.afmt), a_odi.duration);
-		if (final) {
-			u32 dec_run_time = a_odi.last_frame_time - a_odi.first_frame_time;
-			if (!dec_run_time) dec_run_time = 1;
-			if (a_odi.duration) fprintf(stderr, "%d%% ", (u32) (100*a_odi.current_time / a_odi.duration ) );
-			fprintf(stderr, "%d frames (ms/f %.2f avg %.2f max) rate avg %d max %d", a_odi.nb_dec_frames, ((Float)dec_run_time)/a_odi.nb_dec_frames, a_odi.max_dec_time/1000.0, (u32) a_odi.avg_bitrate/1000, (u32) a_odi.max_bitrate/1000);
-			if (a_odi.nb_dropped) {
-				fprintf(stderr, " (Error during bench: %d frames drop)", a_odi.nb_dropped);
-			}
-			fprintf(stderr, "\n");
-		}
-	}
-	if (scene_odm) {
-		u32 w, h;
-		gf_term_get_visual_output_size(term, &w, &h);
-		fprintf(stderr, "%s scene size %dx%d rastered to %dx%d duration %.2fs\n", s_odi.codec_name ? s_odi.codec_name : "", s_odi.width, s_odi.height, w, h, s_odi.duration);
-		if (final) {
-			if (s_odi.nb_dec_frames>2 && s_odi.total_dec_time) {
-				u32 dec_run_time = s_odi.last_frame_time - s_odi.first_frame_time;
-				if (!dec_run_time) dec_run_time = 1;
-				fprintf(stderr, "%d frames FPS %.2f (max %d us/f) rate avg %d max %d", s_odi.nb_dec_frames, ((Float)s_odi.nb_dec_frames*1000) / dec_run_time, s_odi.max_dec_time, (u32) s_odi.avg_bitrate/1000, (u32) s_odi.max_bitrate/1000);
-				fprintf(stderr, "\n");
-			} else {
-				u32 nb_frames_drawn;
-				Double FPS;
-				gf_term_get_simulation_frame_rate(term, &nb_frames_drawn);
-				tot_time = gf_sys_clock() - bench_mode_start;
-				FPS = gf_term_get_framerate(term, 0);
-				fprintf(stderr, "%d frames FPS %.2f (abs %.2f)\n", nb_frames_drawn, (1000.0*nb_frames_drawn / tot_time), FPS);
-			}
-		}
-	}
-	if (final) {
-		fprintf(stderr, "**********************************************************\n\n");
-		return;
-	}
-
-	if (video_odm) {
-		u32 dec_run_time = v_odi.last_frame_time - v_odi.first_frame_time;
-		if (!dec_run_time) dec_run_time = 1;
-		tot_time = v_odi.last_frame_time - v_odi.first_frame_time;
-		if (!tot_time) tot_time=1;
-		if (v_odi.duration) fprintf(stderr, "%d%% ", (u32) (100*v_odi.current_time / v_odi.duration ) );
-		fprintf(stderr, "%d f FPS %.2f (max %d us/f) rate avg %d max %d", v_odi.nb_dec_frames, ((Float)v_odi.nb_dec_frames*1000) / dec_run_time, v_odi.max_dec_time, (u32) v_odi.avg_bitrate/1000, (u32) v_odi.max_bitrate/1000);
-	}
-	else if (scene_odm) {
-		if (s_odi.nb_dec_frames>2 && s_odi.total_dec_time) {
-			u32 dec_run_time = s_odi.last_frame_time - s_odi.first_frame_time;
-			if (!dec_run_time) dec_run_time = 1;
-			fprintf(stderr, "%d frames FPS %.2f (max %d us/f) rate avg %d max %d", s_odi.nb_dec_frames, ((Float)s_odi.nb_dec_frames*1000) / dec_run_time, s_odi.max_dec_time, (u32) s_odi.avg_bitrate/1000, (u32) s_odi.max_bitrate/1000);
-			fprintf(stderr, "\n");
-		} else {
-			u32 nb_frames_drawn;
-			Double FPS;
-			gf_term_get_simulation_frame_rate(term, &nb_frames_drawn);
-			tot_time = gf_sys_clock() - bench_mode_start;
-			FPS = gf_term_get_framerate(term, 0);
-			fprintf(stderr, "%d frames FPS %.2f (abs %.2f)\n", nb_frames_drawn, (1000.0*nb_frames_drawn / tot_time), FPS);
-		}
-	}
-	else if (audio_odm) {
-		gf_term_get_object_info(term, audio_odm, &a_odi);
-		tot_time = a_odi.last_frame_time - a_odi.first_frame_time;
-		if (!tot_time) tot_time=1;
-		if (a_odi.duration) fprintf(stderr, "%d%% ", (u32) (100*a_odi.current_time / a_odi.duration ) );
-		fprintf(stderr, "%d frames (ms/f %.2f avg %.2f max)", a_odi.nb_dec_frames, ((Float)tot_time)/a_odi.nb_dec_frames, a_odi.max_dec_time/1000.0);
-	}
-}
-

gpac-2.2.1.tar.gz/applications/deprecated/player_api Deleted

gpac-2.2.1.tar.gz/applications/deprecated/player_api/main.c Deleted

@@ -1,112 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Romain Bouqueau
- *			Copyright (c) Romain Bouqueau 2015
- *					All rights reserved
- *
- *  This file is part of GPAC - sample GPAC player API usage
- *
- */
-
-#include <stdio.h>
-#include <gpac/terminal.h>
-#include <gpac/options.h> //for GF_OPT_* and GF_STATE_*
-
-volatile Bool connected = GF_FALSE;
-
-static Bool play_pause_seek_gettime(GF_Terminal *term, const char *fn)
-{
-	u32 time;
-	const u32 target_time_in_ms = 10000;
-
-	//play
-	connected = GF_FALSE;
-	gf_term_connect_from_time(term, fn, 0, GF_FALSE);
-	while (!connected) gf_sleep(1);
-
-	//seek to target_time_in_ms
-	gf_term_play_from_time(term, target_time_in_ms, GF_FALSE);
-	gf_term_set_option(term, GF_OPT_PLAY_STATE, GF_STATE_STEP_PAUSE);
-	time = gf_term_get_time_in_ms(term);
-	assert(time == target_time_in_ms);
-
-	//seek to 0
-	connected = GF_FALSE;
-	gf_term_play_from_time(term, 0, GF_FALSE);
-	while (!connected) gf_sleep(1);
-	time = gf_term_get_time_in_ms(term);
-	assert(time == 0);
-
-	return GF_TRUE;
-}
-
-Bool GPAC_EventProc(void *ptr, GF_Event *evt)
-{
-	switch (evt->type) {
-	case GF_EVENT_CONNECT:
-		connected = GF_TRUE;
-		break;
-	default:
-		break;
-	}
-
-	return GF_FALSE;
-}
-
-static Bool player_foreach(int argc, char **argv)
-{
-	int i;
-	GF_User user;
-	GF_Terminal *term;
-	GF_Config *cfg_file;
-	cfg_file = gf_cfg_init("GPAC.cfg", NULL);
-	user.modules = gf_modules_new(NULL, cfg_file);
-	user.config = cfg_file;
-	user.EventProc = GPAC_EventProc;
-	term = gf_term_new(&user);
-	if (!term)
-		return GF_FALSE;
-
-	for (i=1; i<argc; ++i) {
-		Bool res = play_pause_seek_gettime(term, argvi);
-		if (res == GF_FALSE) {
-			fprintf(stderr, "Failure with input %d: \"%s\"\n", i, argvi);
-			return GF_FALSE;
-		}
-	}
-
-	gf_term_disconnect(term);
-	gf_term_del(term);
-	gf_modules_del(user.modules);
-	gf_cfg_del(cfg_file);
-
-	return GF_TRUE;
-}
-
-int main(int argc, char **argv)
-{
-	int ret = 0;
-
-	if (argc < 2) {
-		fprintf(stderr, "USAGE: %s file1 file2 ... filen\n", argv0);
-		ret = 1;
-		goto exit;
-	}
-
-#ifdef GPAC_MEMORY_TRACKING
-	gf_sys_init(GF_MemTrackerSimple);
-#else
-	gf_sys_init(GF_MemTrackerNone);
-#endif
-	gf_log_set_tool_level(GF_LOG_ALL, GF_LOG_WARNING);
-
-	if (!player_foreach(argc, argv)) {
-		ret = 1;
-		goto exit;
-	}
-
-exit:
-	gf_sys_close();
-	return ret;
-}

gpac-2.2.1.tar.gz/extra_lib/include Deleted

gpac-2.2.1.tar.gz/extra_lib/include/DTAPI.h Deleted

@@ -1,9809 +0,0 @@
-//*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#* DTAPI.h *#*#*#*#*#*#*#*#*#* (C) 2000-2018 DekTec
-//
-// DTAPI - C++ API for DekTec PCI/PCI-Express cards, USB adapters and network devices
-//
-
-#ifndef __DTAPI_H
-#define __DTAPI_H
-
-// DTAPI version
-#define DTAPI_VERSION_MAJOR        5
-#define DTAPI_VERSION_MINOR        30
-#define DTAPI_VERSION_BUGFIX       0
-#define DTAPI_VERSION_BUILD        108
-
-//-.-.-.-.-.-.-.-.-.-.-.-.- 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
-
-// Macro used to mark functions as deprecated. Using deprecated functions will generate
-// a compiler warning, pushing API users to stop using these functions.
-#ifdef __GNUC__
-#define DTAPI_DEPRECATED(func, msg)  func __attribute__ ((deprecated))
-#elif defined(_MSC_VER)
-#define DTAPI_DEPRECATED(func, msg)  __declspec(deprecated(msg)) func
-#else
-#define DTAPI_DEPRECATED(func, msg) func
-#endif
-
-//.-.-.-.-.-.-.-.-.-.-.- Unsupported Visual Studio Versions -.-.-.-.-.-.-.-.-.-.-.-.-.-.-
-
-#ifdef _MSC_VER
-#if (_MSC_VER<1500)
-    #pragma message("ERROR: This version of Visual Studio is not supported") 
-#endif
-#if (_MSC_VER==1500)
-    #pragma message("WARNING: Visual Studio 2008 support will be deprecated in 2018") 
-#endif
-#if (_MSC_VER==1600)
-    #pragma message("WARNING: Visual Studio 2010 support will be deprecated in 2018") 
-#endif
-#endif
-
-//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- Support Types -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
-
-#ifdef _WIN32
-    typedef unsigned __int64 __uint64;
-#else
-    typedef signed long long __int64;
-    typedef unsigned long long __uint64;
-#endif
-
-// All DTAPI code lives in namespace Dtapi
-namespace Dtapi
-{
-
-//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- Forward declarations -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
-
-class AdvDemod;
-class DtaPlusDevice;
-class DtAtsc3Pars;
-class DtDemodPars;
-class DtDevice;
-class DtDvbT2Pars;
-class DteDevice;
-class DtMxAudioService;
-class DtMxAudioChannel;
-class DtOutpChannel;
-class DtSdiUtility;
-class FrameBufImpl;
-class IDevice;
-class IDtDemodEvent;
-class InpChannel;
-class IXpMutex;
-class MplpHelper;
-class OutpChannel;
-class SdiMatrixImpl;
-class AvInputStatus;
-struct DtAtscStreamSelPars;
-struct DtAtsc3DemodL1Data;
-struct DtAtsc3TxIdInfo;
-struct DtAtsc3StreamSelPars;
-struct DtDabEnsembleInfo;
-struct DtDabEtiStreamSelPars;
-struct DtDabStreamSelPars;
-struct DtDabTransmitterIdInfo;
-struct DtDemodParsAtsc3;
-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 DtDvbCidPars;
-struct DtDvbS2ModStatus;
-struct DtDvbS2ModCod;
-struct DtDvbS2Pars;
-struct DtDemodParsDvbS2Adv;
-struct DtDvbTStreamSelPars;
-struct DtDvbTTpsInfo;
-struct DtDvbT2DemodL1Data;
-struct DtDvbT2ModStatus;
-struct DtDvbT2StreamSelPars;
-struct DtDvbT2TransmitterIdInfo;
-struct DtFractionInt;
-struct DtIsdbtStreamSelPars;
-struct DtIsdbTmmPars;
-struct DtPar;
-struct DtPlpInpPars;
-struct DtQamStreamSelPars;
-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 = 4;
-
-public:
-    DtCaps();
-    DtCaps(int BitNr);
-    DtCaps(__int64 F1, __int64 F2, __int64 F3,  __int64 F4);
-
-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;
-    bool  operator < (const DtCaps& Caps) const;
-    bool  operator > (const DtCaps& Caps) const;
-    __int64  operator  (const int n) const;
-    DtCaps  operator ~ () const;
-    // Implementation data
-private:
-    __int64  m_FlagsDTCAPS_SIZE;
-};
-
-// Capabilities
-#define DTAPI_CAP_EMPTY        Dtapi::DtCaps()   // DtCaps without any capability flags
-
-// Capability group APPS - Applications
-#define DTAPI_CAP_C2X         Dtapi::DtCaps(0)   // C2Xpert
-#define DTAPI_CAP_DP          Dtapi::DtCaps(1)   // DtGrabber+ and DtTV
-#define DTAPI_CAP_DTTV        Dtapi::DtCaps(2)   // DtTV
-#define DTAPI_CAP_E           Dtapi::DtCaps(3)   // DtEncode
-#define DTAPI_CAP_J           Dtapi::DtCaps(4)   // DtJitter
-#define DTAPI_CAP_J2K         Dtapi::DtCaps(5)   // J2K engine
-#define DTAPI_CAP_MR          Dtapi::DtCaps(6)   // MuxXpert runtime
-#define DTAPI_CAP_MS          Dtapi::DtCaps(7)   // MuxXpert SDK
-#define DTAPI_CAP_MX          Dtapi::DtCaps(8)   // MuxXpert
-#define DTAPI_CAP_RC          Dtapi::DtCaps(9)   // StreamXpress remote control
-#define DTAPI_CAP_RX          Dtapi::DtCaps(10)  // RFXpert
-#define DTAPI_CAP_SL          Dtapi::DtCaps(11)  // StreamXpert Lite
-#define DTAPI_CAP_SP          Dtapi::DtCaps(12)  // StreamXpress stream player
-#define DTAPI_CAP_SPNIC       Dtapi::DtCaps(13)  // StreamXpress through local NIC
-#define DTAPI_CAP_SX          Dtapi::DtCaps(14)  // StreamXpert analyzer
-#define DTAPI_CAP_SXNIC       Dtapi::DtCaps(15)  // StreamXpert via local NIC (dongled)
-#define DTAPI_CAP_SY          Dtapi::DtCaps(16)  // SdEye
-#define DTAPI_CAP_T2X         Dtapi::DtCaps(17)  // T2Xpert
-#define DTAPI_CAP_VR          Dtapi::DtCaps(18)  // VF-REC
-#define DTAPI_CAP_VRDGL       Dtapi::DtCaps(19)  // VF-REC (dongled)
-#define DTAPI_CAP_XP          Dtapi::DtCaps(20)  // Xpect
-#define DTAPI_CAP_XPRT        Dtapi::DtCaps(21)  // Advanced RF measurement
-
-// Capability group AUDENC - Supported audio standards
-#define DTAPI_CAP_ENC_AAC     Dtapi::DtCaps(22)  // AAC audio encoder
-#define DTAPI_CAP_ENC_AC3     Dtapi::DtCaps(23)  // AC3 audio encoder
-#define DTAPI_CAP_ENC_AG      Dtapi::DtCaps(24)  // GOLD for audio encoder
-#define DTAPI_CAP_ENC_AG2     Dtapi::DtCaps(25)  // GOLD for two audio encoders
-#define DTAPI_CAP_ENC_MP1L2   Dtapi::DtCaps(26)  // MPEG1-layer II audio encoder
-
-// Capability group BOOLIO - Boolean I/O capabilities
-#define DTAPI_CAP_BW          Dtapi::DtCaps(27)  // DEPRECATED, do not use
-#define DTAPI_CAP_FAILSAFE    Dtapi::DtCaps(28)  // A fail-over relay is available
-#define DTAPI_CAP_FRACMODE    Dtapi::DtCaps(29)  // Fractional mode is supported
-#define DTAPI_CAP_GENLOCKED   Dtapi::DtCaps(30)  // Locked to a genlock reference
-#define DTAPI_CAP_GENREF      Dtapi::DtCaps(31)  // Genlock reference input
-#define DTAPI_CAP_SWS2APSK    Dtapi::DtCaps(32)  // DVB-S2 APSK mode
-
-// Capability group DEMODPROPS - Demodulation properties
-#define DTAPI_CAP_ANTPWR      Dtapi::DtCaps(33)  // Antenna power
-#define DTAPI_CAP_LNB         Dtapi::DtCaps(34)  // LNB
-#define DTAPI_CAP_RX_ADV      Dtapi::DtCaps(35)  // Advanced demodulation
-#define DTAPI_CAP_RX_ADV_A3   Dtapi::DtCaps(36)  // Basic and ATSC3 advanced demodulation
-#define DTAPI_CAP_RX_ADV_BASIC Dtapi::DtCaps(37) // Basic advanced demodulation
-#define DTAPI_CAP_RX_ADV_T2   Dtapi::DtCaps(38)  // Basic and DVB-T2 advanced demodulation
-
-// Capability group FREQBAND - Frequency band
-#define DTAPI_CAP_LBAND       Dtapi::DtCaps(39)  // L-band 950-2150MHz
-#define DTAPI_CAP_VHF         Dtapi::DtCaps(40)  // VHF-band 47-470MHz
-#define DTAPI_CAP_UHF         Dtapi::DtCaps(41)  // UHF-band 400-862MHz
-
-// Capability group HDMISTD - HDMI standard
-#define DTAPI_CAP_HDMI1_4     Dtapi::DtCaps(42)  // HDMI 1.4
-#define DTAPI_CAP_HDMI2_0     Dtapi::DtCaps(43)  // HDMI 2.0
-
-// Capability group IODIR - I/O direction
-#define DTAPI_CAP_DISABLED    Dtapi::DtCaps(44)  // Port is disabled
-#define DTAPI_CAP_INPUT       Dtapi::DtCaps(45)  // Uni-directional input
-#define DTAPI_CAP_INTINPUT    Dtapi::DtCaps(46)  // Internal input port
-#define DTAPI_CAP_MONITOR     Dtapi::DtCaps(47)  // Monitor of input or output
-#define DTAPI_CAP_OUTPUT      Dtapi::DtCaps(48)  // Uni-directional output
-
-// Subcapabilities of IODIR, DTAPI_CAP_INPUT
-#define DTAPI_CAP_SHAREDANT   Dtapi::DtCaps(49)  // Get antenna signal from another port
-
-// Subcapabilities of IODIR, DTAPI_CAP_OUTPUT
-#define DTAPI_CAP_DBLBUF      Dtapi::DtCaps(50)  // Double buffered output
-#define DTAPI_CAP_LOOPS2L3    Dtapi::DtCaps(51)  // Loop-through of DVB-S2 in L3-frames
-#define DTAPI_CAP_LOOPS2TS    Dtapi::DtCaps(52)  // Loop-through of an DVB-S(2) input
-#define DTAPI_CAP_LOOPTHR     Dtapi::DtCaps(53)  // Loop-through of another input
-
-// Capability group IOPROPS - Miscellaneous I/O properties
-#define DTAPI_CAP_ASIPOL      Dtapi::DtCaps(54)  // ASI output signal can be inverted
-#define DTAPI_CAP_GENREFSLAVE Dtapi::DtCaps(55)  // Slaved genlock reference
-#define DTAPI_CAP_HUFFMAN     Dtapi::DtCaps(56)  // Huffman coding for SDI
-#define DTAPI_CAP_IPPAIR      Dtapi::DtCaps(57)  // Network port supports failover
-#define DTAPI_CAP_L3MODE      Dtapi::DtCaps(58)  // L3-frame mode
-#define DTAPI_CAP_MATRIX      Dtapi::DtCaps(59)  // Matrix API support
-#define DTAPI_CAP_MATRIX2     Dtapi::DtCaps(60)  // High-level Matrix API support
-#define DTAPI_CAP_RAWASI      Dtapi::DtCaps(61)  // Raw ASI
-#define DTAPI_CAP_SDI10BNBO   Dtapi::DtCaps(62)  // 10-bit network byte order
-#define DTAPI_CAP_SDITIME     Dtapi::DtCaps(63)  // SDI timestamping
-#define DTAPI_CAP_TIMESTAMP64 Dtapi::DtCaps(64)  // 64-bit timestamping
-#define DTAPI_CAP_TRPMODE     Dtapi::DtCaps(65)  // Transparent mode
-#define DTAPI_CAP_TS          Dtapi::DtCaps(66)  // MPEG-2 transport stream
-#define DTAPI_CAP_TXONTIME    Dtapi::DtCaps(67)  // Transmit on timestamp
-#define DTAPI_CAP_VIRTUAL     Dtapi::DtCaps(68)  // Virtual port, no physical connection
-
-// Capability group IOSTD - I/O standard
-#define DTAPI_CAP_12GSDI      Dtapi::DtCaps(69)  // 12G-SDI
-#define DTAPI_CAP_3GSDI       Dtapi::DtCaps(70)  // 3G-SDI
-#define DTAPI_CAP_6GSDI       Dtapi::DtCaps(71)  // 6G-SDI
-#define DTAPI_CAP_ASI         Dtapi::DtCaps(72)  // DVB-ASI transport stream
-#define DTAPI_CAP_AVENC       Dtapi::DtCaps(73)  // Audio/video encoder
-#define DTAPI_CAP_DEMOD       Dtapi::DtCaps(74)  // Demodulation
-#define DTAPI_CAP_GPSTIME     Dtapi::DtCaps(75)  // 1PPS and 10MHz GPS-clock input
-#define DTAPI_CAP_HDMI        Dtapi::DtCaps(76)  // HDMI
-#define DTAPI_CAP_HDSDI       Dtapi::DtCaps(77)  // HD-SDI
-#define DTAPI_CAP_IFADC       Dtapi::DtCaps(78)  // IF A/D converter
-#define DTAPI_CAP_IP          Dtapi::DtCaps(79)  // Transport stream over IP
-#define DTAPI_CAP_MOD         Dtapi::DtCaps(80)  // Modulator output
-#define DTAPI_CAP_PHASENOISE  Dtapi::DtCaps(81)  // Phase noise injection
-#define DTAPI_CAP_RS422       Dtapi::DtCaps(82)  // RS422 port
-#define DTAPI_CAP_SDIRX       Dtapi::DtCaps(83)  // SDI receiver
-#define DTAPI_CAP_SDI         Dtapi::DtCaps(84)  // SD-SDI
-#define DTAPI_CAP_SPI         Dtapi::DtCaps(85)  // DVB-SPI transport stream
-#define DTAPI_CAP_SPISDI      Dtapi::DtCaps(86)  // SD-SDI on a parallel port
-
-// Subcapabilities of IOSTD, DTAPI_CAP_12GSDI
-#define DTAPI_CAP_2160P50     Dtapi::DtCaps(87)  // 2160p/50 lvl A
-#define DTAPI_CAP_2160P50B    Dtapi::DtCaps(88)  // 2160p/50 lvl B
-#define DTAPI_CAP_2160P59_94  Dtapi::DtCaps(89)  // 2160p/59.94 lvl A
-#define DTAPI_CAP_2160P59_94B Dtapi::DtCaps(90)  // 2160p/59.94 lvl B
-#define DTAPI_CAP_2160P60     Dtapi::DtCaps(91)  // 2160p/60 lvl A
-#define DTAPI_CAP_2160P60B    Dtapi::DtCaps(92)  // 2160p/60 lvl B
-
-// Subcapabilities of IOSTD, DTAPI_CAP_3GSDI
-#define DTAPI_CAP_1080P50     Dtapi::DtCaps(93)  // 1080p/50 lvl A
-#define DTAPI_CAP_1080P50B    Dtapi::DtCaps(94)  // 1080p/50 lvl B
-#define DTAPI_CAP_1080P59_94  Dtapi::DtCaps(95)  // 1080p/59.94 lvl A
-#define DTAPI_CAP_1080P59_94B Dtapi::DtCaps(96)  // 1080p/59.94 lvl B
-#define DTAPI_CAP_1080P60     Dtapi::DtCaps(97)  // 1080p/60 lvl A
-#define DTAPI_CAP_1080P60B    Dtapi::DtCaps(98)  // 1080p/60 lvl B
-
-// Subcapabilities of IOSTD, DTAPI_CAP_6GSDI
-#define DTAPI_CAP_2160P23_98  Dtapi::DtCaps(99)  // 2160p/23.98
-#define DTAPI_CAP_2160P24     Dtapi::DtCaps(100) // 2160p/24
-#define DTAPI_CAP_2160P25     Dtapi::DtCaps(101) // 2160p/25
-#define DTAPI_CAP_2160P29_97  Dtapi::DtCaps(102) // 2160p/29.97
-#define DTAPI_CAP_2160P30     Dtapi::DtCaps(103) // 2160p/30
-
-// Subcapabilities of IOSTD, DTAPI_CAP_HDSDI
-#define DTAPI_CAP_1080I50     Dtapi::DtCaps(104) // 1080i/50
-#define DTAPI_CAP_1080I59_94  Dtapi::DtCaps(105) // 1080i/59.94
-#define DTAPI_CAP_1080I60     Dtapi::DtCaps(106) // 1080i/60
-#define DTAPI_CAP_1080P23_98  Dtapi::DtCaps(107) // 1080p/23.98
-#define DTAPI_CAP_1080P24     Dtapi::DtCaps(108) // 1080p/24
-#define DTAPI_CAP_1080P25     Dtapi::DtCaps(109) // 1080p/25
-#define DTAPI_CAP_1080P29_97  Dtapi::DtCaps(110) // 1080p/29.97
-#define DTAPI_CAP_1080P30     Dtapi::DtCaps(111) // 1080p/30
-#define DTAPI_CAP_1080PSF23_98 Dtapi::DtCaps(112) // 1080psf/23.98
-#define DTAPI_CAP_1080PSF24   Dtapi::DtCaps(113) // 1080psf/24
-#define DTAPI_CAP_1080PSF25   Dtapi::DtCaps(114) // 1080psf/25
-#define DTAPI_CAP_1080PSF29_97 Dtapi::DtCaps(115) // 1080psf/29.97
-#define DTAPI_CAP_1080PSF30   Dtapi::DtCaps(116) // 1080psf/30
-#define DTAPI_CAP_720P23_98   Dtapi::DtCaps(117) // 720p/23.98
-#define DTAPI_CAP_720P24      Dtapi::DtCaps(118) // 720p/24
-#define DTAPI_CAP_720P25      Dtapi::DtCaps(119) // 720p/25
-#define DTAPI_CAP_720P29_97   Dtapi::DtCaps(120) // 720p/29.97
-#define DTAPI_CAP_720P30      Dtapi::DtCaps(121) // 720p/30
-#define DTAPI_CAP_720P50      Dtapi::DtCaps(122) // 720p/50
-#define DTAPI_CAP_720P59_94   Dtapi::DtCaps(123) // 720p/59.94
-#define DTAPI_CAP_720P60      Dtapi::DtCaps(124) // 720p/60
-
-// Subcapabilities of IOSTD, DTAPI_CAP_SDI
-#define DTAPI_CAP_525I59_94   Dtapi::DtCaps(125) // 525i/59.94
-#define DTAPI_CAP_625I50      Dtapi::DtCaps(126) // 625i/50
-
-// Subcapabilities of IOSTD, DTAPI_CAP_SPISDI
-#define DTAPI_CAP_SPI525I59_94 Dtapi::DtCaps(127) // SPI 525i/59.94
-#define DTAPI_CAP_SPI625I50   Dtapi::DtCaps(128) // SPI 625i/50
-
-// Capability group PWRMODE - Power mode
-#define DTAPI_CAP_MODHQ       Dtapi::DtCaps(129) // High-quality modulation
-#define DTAPI_CAP_LOWPWR      Dtapi::DtCaps(130) // Low-power mode
-
-// Capability group MODSTD - Modulation standards
-#define DTAPI_CAP_TX_ATSC     Dtapi::DtCaps(131) // ATSC 8-VSB modulation
-#define DTAPI_CAP_TX_ATSC3    Dtapi::DtCaps(132) // ATSC3.0 modulation
-#define DTAPI_CAP_TX_CMMB     Dtapi::DtCaps(133) // CMMB modulation
-#define DTAPI_CAP_TX_DAB      Dtapi::DtCaps(134) // DAB modulation
-#define DTAPI_CAP_TX_DTMB     Dtapi::DtCaps(135) // DTMB modulation
-#define DTAPI_CAP_TX_DVBC2    Dtapi::DtCaps(136) // DVB-C2 modulation
-#define DTAPI_CAP_TX_DVBS     Dtapi::DtCaps(137) // DVB-S modulation
-#define DTAPI_CAP_TX_DVBS2    Dtapi::DtCaps(138) // DVB-S2 modulation
-#define DTAPI_CAP_TX_DVBS2X   Dtapi::DtCaps(139) // DVB-S2X modulation
-#define DTAPI_CAP_TX_DVBT     Dtapi::DtCaps(140) // DVB-T modulation
-#define DTAPI_CAP_TX_DVBT2    Dtapi::DtCaps(141) // DVB-T2 modulation
-#define DTAPI_CAP_TX_GOLD     Dtapi::DtCaps(142) // GOLD for modulators
-#define DTAPI_CAP_TX_HW8CH    Dtapi::DtCaps(143) // Eight-channel HW modulation
-#define DTAPI_CAP_TX_IQ       Dtapi::DtCaps(144) // I/Q sample modulation
-#define DTAPI_CAP_TX_ISDBS    Dtapi::DtCaps(145) // ISDB-S modulation
-#define DTAPI_CAP_TX_ISDBS3   Dtapi::DtCaps(146) // ISDB-S3 modulation
-#define DTAPI_CAP_TX_ISDBT    Dtapi::DtCaps(147) // ISDB-T modulation
-#define DTAPI_CAP_TX_ISDBTMM  Dtapi::DtCaps(148) // ISDB-Tmm modulation
-#define DTAPI_CAP_TX_MH       Dtapi::DtCaps(149) // ATSC-MH modulation
-#define DTAPI_CAP_TX_QAMA     Dtapi::DtCaps(150) // QAM-A modulation
-#define DTAPI_CAP_TX_QAMB     Dtapi::DtCaps(151) // QAM-B modulation
-#define DTAPI_CAP_TX_QAMC     Dtapi::DtCaps(152) // QAM-C modulation
-#define DTAPI_CAP_TX_SWMC     Dtapi::DtCaps(153) // SW multi-channel modulation
-#define DTAPI_CAP_TX_T2MI     Dtapi::DtCaps(154) // T2MI transmission
-#define DTAPI_CAP_TX_T2SPLP   Dtapi::DtCaps(155) // DVB-T2 single PLP modulation
-
-// Capability group MODPROPS - Modulation properties
-#define DTAPI_CAP_ADJLVL      Dtapi::DtCaps(156) // Adjustable output level
-#define DTAPI_CAP_CM          Dtapi::DtCaps(157) // Channel simulation
-#define DTAPI_CAP_CW          Dtapi::DtCaps(158) // Continuous wave
-#define DTAPI_CAP_DIGIQ       Dtapi::DtCaps(159) // Digital I/Q sample output
-#define DTAPI_CAP_DVBCID      Dtapi::DtCaps(160) // DVB carrier ID 
-#define DTAPI_CAP_IF          Dtapi::DtCaps(161) // IF output
-#define DTAPI_CAP_MUTE        Dtapi::DtCaps(162) // Mute RF output signal
-#define DTAPI_CAP_ROLLOFF     Dtapi::DtCaps(163) // Adjustable roll-off factor
-#define DTAPI_CAP_S2APSK      Dtapi::DtCaps(164) // DVB-S2 16-APSK/32-APSK
-#define DTAPI_CAP_SNR         Dtapi::DtCaps(165) // AWGN insertion
-#define DTAPI_CAP_TX_16MHZ    Dtapi::DtCaps(166) // 16MHz bandwidth mode
-#define DTAPI_CAP_TX_SFN      Dtapi::DtCaps(167) // SNF operation
-
-// Capability group RFCLKSEL - RF clock source selection
-#define DTAPI_CAP_RFCLKEXT    Dtapi::DtCaps(168) // External RF clock input
-#define DTAPI_CAP_RFCLKINT    Dtapi::DtCaps(169) // Internal RF clock reference
-
-// Capability group RXSTD - Receiver standards
-#define DTAPI_CAP_RX_ATSC     Dtapi::DtCaps(170) // ATSC 8-VSB reception
-#define DTAPI_CAP_RX_ATSC3    Dtapi::DtCaps(171) // ATSC3.0 reception
-#define DTAPI_CAP_RX_CMMB     Dtapi::DtCaps(172) // CMMB reception
-#define DTAPI_CAP_RX_DAB      Dtapi::DtCaps(173) // DAB reception
-#define DTAPI_CAP_RX_DTMB     Dtapi::DtCaps(174) // DTMB reception
-#define DTAPI_CAP_RX_DVBC2    Dtapi::DtCaps(175) // DVB-C2 reception
-#define DTAPI_CAP_RX_DVBS     Dtapi::DtCaps(176) // DVB-S reception
-#define DTAPI_CAP_RX_DVBS2    Dtapi::DtCaps(177) // DVB-S2 reception
-#define DTAPI_CAP_RX_DVBT     Dtapi::DtCaps(178) // DVB-T reception
-#define DTAPI_CAP_RX_DVBT2    Dtapi::DtCaps(179) // DVB-T2 reception
-#define DTAPI_CAP_RX_GOLD     Dtapi::DtCaps(180) // GOLD for receivers
-#define DTAPI_CAP_RX_IQ       Dtapi::DtCaps(181) // I/Q sample reception
-#define DTAPI_CAP_RX_ISDBS    Dtapi::DtCaps(182) // ISDB-S reception
-#define DTAPI_CAP_RX_ISDBT    Dtapi::DtCaps(183) // ISDB-T reception
-#define DTAPI_CAP_RX_MH       Dtapi::DtCaps(184) // ATSC-MH reception
-#define DTAPI_CAP_RX_QAMA     Dtapi::DtCaps(185) // QAM-A reception
-#define DTAPI_CAP_RX_QAMB     Dtapi::DtCaps(186) // QAM-B reception
-#define DTAPI_CAP_RX_QAMC     Dtapi::DtCaps(187) // QAM-C reception
-#define DTAPI_CAP_RX_T2MI     Dtapi::DtCaps(188) // T2MI reception
-
-// Capability group SPICLKSEL - Parallel port clock source selection
-#define DTAPI_CAP_SPICLKEXT   Dtapi::DtCaps(189) // External clock input
-#define DTAPI_CAP_SPICLKINT   Dtapi::DtCaps(190) // Internal clock reference
-
-// Capability group SPIMODE - Parallel port mode
-#define DTAPI_CAP_SPIFIXEDCLK Dtapi::DtCaps(191) // SPI fixed clock with valid signal
-#define DTAPI_CAP_SPIDVBMODE  Dtapi::DtCaps(192) // SPI DVB mode
-#define DTAPI_CAP_SPISER8B    Dtapi::DtCaps(193) // SPI serial 8-bit mode
-#define DTAPI_CAP_SPISER10B   Dtapi::DtCaps(194) // SPI serial 10-bit mode
-
-// Capability group SPISTD - Parallel port I/O standard
-#define DTAPI_CAP_SPILVDS1    Dtapi::DtCaps(195) // LVDS1
-#define DTAPI_CAP_SPILVDS2    Dtapi::DtCaps(196) // LVDS2
-#define DTAPI_CAP_SPILVTTL    Dtapi::DtCaps(197) // LVTTL
-
-// Capability group TSRATESEL - Transport-stream rate selection
-#define DTAPI_CAP_EXTTSRATE   Dtapi::DtCaps(198) // External TS rate clock input
-#define DTAPI_CAP_EXTRATIO    Dtapi::DtCaps(199) // External TS rate clock with ratio
-#define DTAPI_CAP_INTTSRATE   Dtapi::DtCaps(200) // Internal TS rate clock reference
-#define DTAPI_CAP_LOCK2INP    Dtapi::DtCaps(201) // Lock TS rate to input port
-
-// Capability group VIDENC - Supported video standards
-#define DTAPI_CAP_ENC_H264    Dtapi::DtCaps(202) // H.264 video encoder
-#define DTAPI_CAP_ENC_MP2V    Dtapi::DtCaps(203) // MPEG2 video encoder
-
-//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- 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*/, int3  /*OldParXtra3*/,
-                 __int64 /*NewFreqHz*/, int  /*NewModType*/, int3  /*NewParXtra3*/) {}
-};
-
-
-// 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_FwPackageVersion;        // Firmware package version (-1 if not applicable)
-    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_Ip4;         // IP address (only valid for DTE-31xx devices)
-    unsigned char  m_IpV6MAX_IPV6_ADDR16;
-                                    // IP address (only valid for DTE-31xx devices)
-    unsigned char  m_MacAddr6;    // 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
-};
-
-//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- struct DtDvbCidPars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
-//
-// Structure for specifying the DVB channel identification for satellite (DVB-S2)
-// ETSI TS 103 129
-//
-struct DtDvbCidPars
-{
-    bool  m_Enable;             // Enable DVB-CID signalling
-    bool  m_MuteDvbS2;          // Mute the satellite signal
-    bool  m_OverrideGuid;       // Use user specified GUID.
-    unsigned int  m_GuidHigh;   // DVB-CID Global Unique Identifier MSBs
-    unsigned int  m_GuidLow;    // DVB-CID Global Unique Identifier LSBs
-   
-    // CID content. Key: Content ID (0...31); Value: Content information (24-bit)
-    // Content ID 0 (carrier ID format) shall have the value 0x0001
-    std::map<int, int>  m_Content;
-
-    DtDvbCidPars() : m_MuteDvbS2(false), m_OverrideGuid(false) {};
-    DTAPI_RESULT  CheckValidity();
-    DTAPI_RESULT  GetGuid(DtDevice* pDevice, int PortNr=1);
-};
-
-//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- 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_IOCONFIG      0x00000010
-#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
-
-//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtFractionInt -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
-//
-// A rational number, expressed as the quotient of two integers
-//
-struct DtFractionInt
-{
-    int  m_Num, m_Den;
-    DtFractionInt()                  { m_Num = 0;  m_Den = 1; }
-    DtFractionInt(int Num, int Den)  { m_Num = Num;  m_Den = Den; }
-};
-
-
-//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- 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_Ip4;         // IP V4 address (TS-over-IP functions only)
-    unsigned char  m_IpV6MAX_IPV6_ADDR16;
-                                    // IP V6 address (TS-over-IP functions only)
-    unsigned char  m_MacAddr6;    // 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_ParXtra2;          // 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_ParXtra0 = m_ParXtra1 = -1;
-    }
-    DtIoConfig(int  Port, int  Group)
-    {
-        m_Port = Port;
-        m_Group = Group;
-        m_Value = m_SubValue = -1;
-        m_ParXtra0 = m_ParXtra1 = -1;
-    }
-};
-
-// I/O configuration groups
-#define DTAPI_IOCONFIG_IODIR       0             // I/O direction
-#define DTAPI_IOCONFIG_IOSTD       1             // I/O standard
-#define DTAPI_IOCONFIG_PWRMODE     2             // Power mode
-#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             // DEPRECATED, do not use
-#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 boolean I/O configuration options
-#define DTAPI_IOCONFIG_TRUE        14            // Turn I/O capability on
-#define DTAPI_IOCONFIG_FALSE       15            // Turn I/O capability off
-
-// Values for group IO_CONFIG_IODIR (I/O direction)
-#define DTAPI_IOCONFIG_DISABLED    16            // Port is disabled
-#define DTAPI_IOCONFIG_INPUT       17            // Uni-directional input
-#define DTAPI_IOCONFIG_INTINPUT    18            // Internal input port
-#define DTAPI_IOCONFIG_MONITOR     19            // Monitor of input or output
-#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_12GSDI      26            // 12G-SDI
-#define DTAPI_IOCONFIG_3GSDI       27            // 3G-SDI
-#define DTAPI_IOCONFIG_6GSDI       28            // 6G-SDI
-#define DTAPI_IOCONFIG_ASI         29            // DVB-ASI transport stream
-#define DTAPI_IOCONFIG_AVENC       30            // Audio/video encoder
-#define DTAPI_IOCONFIG_DEMOD       31            // Demodulation
-#define DTAPI_IOCONFIG_GPSTIME     32            // 1PPS and 10MHz GPS-clock input
-#define DTAPI_IOCONFIG_HDMI        33            // HDMI
-#define DTAPI_IOCONFIG_HDSDI       34            // HD-SDI
-#define DTAPI_IOCONFIG_IFADC       35            // IF A/D converter
-#define DTAPI_IOCONFIG_IP          36            // Transport stream over IP
-#define DTAPI_IOCONFIG_MOD         37            // Modulator output
-#define DTAPI_IOCONFIG_PHASENOISE  38            // Phase noise injection
-#define DTAPI_IOCONFIG_RS422       39            // RS422 port
-#define DTAPI_IOCONFIG_SDIRX       40            // SDI receiver
-#define DTAPI_IOCONFIG_SDI         41            // SD-SDI
-#define DTAPI_IOCONFIG_SPI         42            // DVB-SPI transport stream
-#define DTAPI_IOCONFIG_SPISDI      43            // SD-SDI on a parallel port
-
-// SubValues for group DTAPI_IOCONFIG_IOSTD, value DTAPI_IOCONFIG_12GSDI
-#define DTAPI_IOCONFIG_2160P50     44            // 2160p/50 lvl A
-#define DTAPI_IOCONFIG_2160P50B    45            // 2160p/50 lvl B
-#define DTAPI_IOCONFIG_2160P59_94  46            // 2160p/59.94 lvl A
-#define DTAPI_IOCONFIG_2160P59_94B 47            // 2160p/59.94 lvl B
-#define DTAPI_IOCONFIG_2160P60     48            // 2160p/60 lvl A
-#define DTAPI_IOCONFIG_2160P60B    49            // 2160p/60 lvl B
-
-// SubValues for group DTAPI_IOCONFIG_IOSTD, value DTAPI_IOCONFIG_3GSDI
-#define DTAPI_IOCONFIG_1080P50     50            // 1080p/50 lvl A
-#define DTAPI_IOCONFIG_1080P50B    51            // 1080p/50 lvl B
-#define DTAPI_IOCONFIG_1080P59_94  52            // 1080p/59.94 lvl A
-#define DTAPI_IOCONFIG_1080P59_94B 53            // 1080p/59.94 lvl B
-#define DTAPI_IOCONFIG_1080P60     54            // 1080p/60 lvl A
-#define DTAPI_IOCONFIG_1080P60B    55            // 1080p/60 lvl B
-
-// SubValues for group DTAPI_IOCONFIG_IOSTD, value DTAPI_IOCONFIG_6GSDI
-#define DTAPI_IOCONFIG_2160P23_98  56            // 2160p/23.98
-#define DTAPI_IOCONFIG_2160P24     57            // 2160p/24
-#define DTAPI_IOCONFIG_2160P25     58            // 2160p/25
-#define DTAPI_IOCONFIG_2160P29_97  59            // 2160p/29.97
-#define DTAPI_IOCONFIG_2160P30     60            // 2160p/30
-
-// SubValues for group DTAPI_IOCONFIG_IOSTD, value DTAPI_IOCONFIG_HDSDI
-#define DTAPI_IOCONFIG_1080I50     61            // 1080i/50
-#define DTAPI_IOCONFIG_1080I59_94  62            // 1080i/59.94
-#define DTAPI_IOCONFIG_1080I60     63            // 1080i/60
-#define DTAPI_IOCONFIG_1080P23_98  64            // 1080p/23.98
-#define DTAPI_IOCONFIG_1080P24     65            // 1080p/24
-#define DTAPI_IOCONFIG_1080P25     66            // 1080p/25
-#define DTAPI_IOCONFIG_1080P29_97  67            // 1080p/29.97
-#define DTAPI_IOCONFIG_1080P30     68            // 1080p/30
-#define DTAPI_IOCONFIG_1080PSF23_98 69           // 1080psf/23.98
-#define DTAPI_IOCONFIG_1080PSF24   70            // 1080psf/24
-#define DTAPI_IOCONFIG_1080PSF25   71            // 1080psf/25
-#define DTAPI_IOCONFIG_1080PSF29_97 72           // 1080psf/29.97
-#define DTAPI_IOCONFIG_1080PSF30   73            // 1080psf/30
-#define DTAPI_IOCONFIG_720P23_98   74            // 720p/23.98
-#define DTAPI_IOCONFIG_720P24      75            // 720p/24
-#define DTAPI_IOCONFIG_720P25      76            // 720p/25
-#define DTAPI_IOCONFIG_720P29_97   77            // 720p/29.97
-#define DTAPI_IOCONFIG_720P30      78            // 720p/30
-#define DTAPI_IOCONFIG_720P50      79            // 720p/50
-#define DTAPI_IOCONFIG_720P59_94   80            // 720p/59.94
-#define DTAPI_IOCONFIG_720P60      81            // 720p/60
-
-// SubValues for group DTAPI_IOCONFIG_IOSTD, value DTAPI_IOCONFIG_SDI
-#define DTAPI_IOCONFIG_525I59_94   82            // 525i/59.94
-#define DTAPI_IOCONFIG_625I50      83            // 625i/50
-
-// SubValues for group DTAPI_IOCONFIG_IOSTD, value DTAPI_IOCONFIG_SPISDI
-#define DTAPI_IOCONFIG_SPI525I59_94 84           // SPI 525i/59.94
-#define DTAPI_IOCONFIG_SPI625I50   85            // SPI 625i/50
-
-// Values for group IO_CONFIG_PWRMODE (Power mode)
-#define DTAPI_IOCONFIG_MODHQ       86            // High-quality modulation
-#define DTAPI_IOCONFIG_LOWPWR      87            // Low-power mode
-
-// Values for group IO_CONFIG_RFCLKSEL (RF clock source selection)
-#define DTAPI_IOCONFIG_RFCLKEXT    88            // External RF clock input
-#define DTAPI_IOCONFIG_RFCLKINT    89            // Internal RF clock reference
-
-// Values for group IO_CONFIG_SPICLKSEL (Parallel port clock source selection)
-#define DTAPI_IOCONFIG_SPICLKEXT   90            // External clock input
-#define DTAPI_IOCONFIG_SPICLKINT   91            // Internal clock reference
-
-// Values for group IO_CONFIG_SPIMODE (Parallel port mode)
-#define DTAPI_IOCONFIG_SPIFIXEDCLK 92            // SPI fixed clock with valid signal
-#define DTAPI_IOCONFIG_SPIDVBMODE  93            // SPI DVB mode
-#define DTAPI_IOCONFIG_SPISER8B    94            // SPI serial 8-bit mode
-#define DTAPI_IOCONFIG_SPISER10B   95            // SPI serial 10-bit mode
-
-// Values for group IO_CONFIG_SPISTD (Parallel port I/O standard)
-#define DTAPI_IOCONFIG_SPILVDS1    96            // LVDS1
-#define DTAPI_IOCONFIG_SPILVDS2    97            // LVDS2
-#define DTAPI_IOCONFIG_SPILVTTL    98            // LVTTL
-
-// Values for group IO_CONFIG_TSRATESEL (Transport-stream rate selection)
-#define DTAPI_IOCONFIG_EXTTSRATE   99            // External TS rate clock input
-#define DTAPI_IOCONFIG_EXTRATIO    100           // External TS rate clock with ratio
-#define DTAPI_IOCONFIG_INTTSRATE   101           // Internal TS rate clock reference
-#define DTAPI_IOCONFIG_LOCK2INP    102           // 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
-};
-//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtIqDirectPars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
-//
-// Direct-IQ Modulation Parameters
-//
-struct DtIqDirectPars
-{
-    DtFractionInt  m_SampleRate;    // Sample rate
-    int  m_IqPacking;               // IQ-Packing;  None, Auto, 10- or 12-bit packing  
-    int  m_ChanFilter;              // Channel filter
-    int  m_Interpolation;           // Interpolation method
-
-    
-public:
-    DTAPI_RESULT  CheckValidity(void);
-};
-
-
-//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- 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), m_B15Mode(false) {}
-
-    bool  m_DoMux;                  // Hierarchical multiplexing yes/no
-    
-    // Parameters for when m_DoMux==false
-    bool  m_B15Mode;                // ARIB B.15 mode (true) or TMCC in sync bytes (false)
-
-    // Parameters for when m_DoMux==true
-    int   m_Emergency;              // Switch-on control for emergency broadcast
-    int   m_RelTs2TsId8;          // Relative TS to TS-ID mapping
-    // Slot to relative TS mapping
-    int   m_Slot2RelTsDTAPI_ISDBS_SLOTS_PER_FRAME;
-    // Modulation parameters per hierarchical layer
-    DtIsdbsLayerPars  m_LayerPars4;
-
-    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
-
-//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtIsdbS3Pars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
-//
-// ISDB-S3 parameters
-//
-struct DtIsdbS3Pars
-{
-    DtIsdbS3Pars() : m_SymRate(33756100){}
-    int  m_SymRate;                 // Symbol rate in baud
-
-    DTAPI_RESULT  CheckValidity(void);
-    bool  operator == (DtIsdbS3Pars& Rhs);
-    bool  operator != (DtIsdbS3Pars& Rhs);
-};
-
-//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- 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_LayerPars3;
-
-    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_LayerPars3;
-
-    // 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
-    
-    // Single Frequency Network parameters
-    int  m_SfnMode;                 // SFN-operation mode DTAPI_SFN_MODE_XXXX
-    int  m_SfnTimeOffset;           // SFN time offset in nano seconds
-    int  m_SfnAllowedTimeDiff;      // Maximum allowed time difference in nano-seconds
-
-    // 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
-    DtFractionInt  m_TsRate;        // Transport-stream rate in bps
-
-    // Channel modelling per output channel
-    bool  m_IsCmEnableDTAPI_MAX_OUTPUTS;
-                                    // Channel modelling is enabled yes/no
-    DtCmPars  m_CmParsDTAPI_MAX_OUTPUTS;
-                                    // Channel modelling parameters
-
-    bool  m_IsChanAttenEnable;      // Channel attenuation is enable yes/no
-    double m_ChanAtten;             // Channel attenuation
-
-    // Custom roll-off roll
-    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
-    double  m_RfFreqHz;             // RF frequency in Hz
-    unsigned char  m_S2PlHdrScrSeq12;
-                                    // DVB-S2 PL header scrambling sequence
-    DtDvbCidPars  m_DvbCidPars;     // DVB carrier identification for satellite
-    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
-    DtAtsc3Pars*  pAtsc3Pars()    { return (DtAtsc3Pars*)m_pXtraPars; }
-    DtCmmbPars*  pCmmbPars()    { return (DtCmmbPars*)m_pXtraPars; }
-    DtDvbC2Pars*  pDvbC2Pars()  { return (DtDvbC2Pars*)m_pXtraPars; }
-    DtDvbS2Pars*  pDvbS2Pars()  { return (DtDvbS2Pars*)m_pXtraPars; }
-    DtDvbT2Pars*  pDvbT2Pars()  { return (DtDvbT2Pars*)m_pXtraPars; }
-    DtIqDirectPars*  pIqDirectPars()  { return (DtIqDirectPars*)m_pXtraPars; }
-    DtIsdbsPars*  pIsdbsPars()  { return (DtIsdbsPars*)m_pXtraPars; }
-    DtIsdbS3Pars*  pIsdbS3Pars()  { return (DtIsdbS3Pars*)m_pXtraPars; }
-    DtIsdbtPars*  pIsdbtPars()  { return (DtIsdbtPars*)m_pXtraPars; }
-    DtIsdbTmmPars*  pIsdbTmmPars()  { return (DtIsdbTmmPars*)m_pXtraPars; }
-
-    // Predicates
-    bool  HasSymRate();
-    bool  IsAdtbT(), IsAdtbtDtmb(), IsAtsc(), IsAtsc3(), IsAtscMh(), IsCmmb();
-    bool  IsChanAttenEnable(), IsCmEnable(int i=0);
-    bool  IsDab(), IsDtmb(), IsDvbC2(), IsDvbCidEnable(), IsDvbS(), IsDvbS2();
-    bool  IsDvbS2Apsk(), IsDvbS2L3(), IsDvbS2X(), IsDvbS2XL3(), IsDvbS2Mux();
-    bool  IsDvbT(), IsDvbT2(), IsIqDirect(), IsIsdbS(), IsIsdbS3(), IsIsdbT(), IsIsdbTmm();
-    bool  IsModTypeSet(), IsOfdm(), IsQam(), IsQamA(), IsQamB(), IsQamC(), IsQamAC();
-    bool  IsRoEnable(), IsSfnEnable(), 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_IdXtra4;               // 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
-
-
-//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtPhaseNoisePars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
-//
-// Structure for specifying the phase noise parameters
-//
-struct DtPhaseNoisePars
-{
-    DtFractionInt  m_SampleRate;
-};
-
-//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- 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
-};
-
-//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtSdiIpFrameStat -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
-//
-// Header placed in front of all SDI frames when the option DTAPI_RXMODE_SDI_STAT is used
-// with SDI over IP
-//
-struct DtSdiIpFrameStat
-{
-    unsigned int  m_FrameCount;     // SDI frame counter
-    unsigned int  m_Timestamp;      // RTP timestamp first IP packet this frame
-    unsigned int  m_MinIpat;        // Min. IPAT of all IP packets this frame
-    unsigned int  m_MaxIpat;        // Max. IPAT of all IP packets this frame
-    __int64  m_Reserved1;
-    __int64  m_Reserved2;
-};
-
-//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- 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, STAT_VT_DAB_TXID,
-        STAT_VT_ATSC3_L1, STAT_VT_DVBT2_TXID, STAT_VT_ATSC3_TXID
-    };
-
-
-    DTAPI_RESULT  m_Result;         // Result of retrieving the statistic
-    int  m_StatisticId;             // Identifies the statistic: DTAPI_STAT_XXX
-    int  m_IdXtra4;               // 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, STAT_VT_RS_STATS,
-                                    // STAT_VT_DAB_TXID, STAT_VT_ATSC3_L1,
-                                    // STAT_VT_DVBT2_TXID, STAT_VT_ATSC3_TXID
-    };
-    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(DtAtsc3DemodL1Data*& pValue);
-    DTAPI_RESULT  GetValue(DtAtsc3TxIdInfo*& pValue);
-    DTAPI_RESULT  GetValue(DtDabEnsembleInfo*& pValue);
-    DTAPI_RESULT  GetValue(DtDabTransmitterIdInfo*& pValue);
-    DTAPI_RESULT  GetValue(DtDvbC2DemodL1Part2Data*& pValue);
-    DTAPI_RESULT  GetValue(DtDvbC2DemodL1PlpSigData*& pValue);
-    DTAPI_RESULT  GetValue(DtDvbTTpsInfo*& pValue);
-    DTAPI_RESULT  GetValue(DtDvbT2DemodL1Data*& pValue);
-    DTAPI_RESULT  GetValue(DtDvbT2TransmitterIdInfo*& 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(DtAtsc3DemodL1Data& pValue);
-    DTAPI_RESULT  SetValue(DtAtsc3TxIdInfo& pValue);
-    DTAPI_RESULT  SetValue(DtDabEnsembleInfo& pValue);
-    DTAPI_RESULT  SetValue(DtDabTransmitterIdInfo& pValue);
-    DTAPI_RESULT  SetValue(DtDvbC2DemodL1Part2Data& Value);
-    DTAPI_RESULT  SetValue(DtDvbC2DemodL1PlpSigData& Value);
-    DTAPI_RESULT  SetValue(DtDvbTTpsInfo& pValue);
-    DTAPI_RESULT  SetValue(DtDvbT2DemodL1Data& Value);
-    DTAPI_RESULT  SetValue(DtDvbT2TransmitterIdInfo& 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_ATSC3_L1B_ERR    0x01F        // Count L1-Basic error count
-#define DTAPI_STAT_ATSC3_L1D_ERR    0x020        // Count L1-Detail error count
-#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
-#define DTAPI_STAT_TEMP_ENCODER     0x017        // Encoder chip temperature
-#define DTAPI_STAT_VID_STATUS       0x018        // Status of video input
-#define DTAPI_STAT_VID_FRAMES_CAPT  0x019        // Number of video frames captured
-#define DTAPI_STAT_VID_FRAMES_ENC   0x01A        // Number of video frames encoded
-#define DTAPI_STAT_VID_BYTES_ENC    0x01B        // Number of video bytes encoded
-#define DTAPI_STAT_AUD_SAMPLES_ENC  0x01C        // Number of audio samples encoded
-#define DTAPI_STAT_AUD_FRAMES_ENC   0x01D        // Number of audio frames encoded
-#define DTAPI_STAT_MUX_NUM_BYTES    0x01E        // Number of bytes multiplexed
-
-// 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_ATSC3_L1DATA     0x30D        // ATSC3 Layer-1 data
-#define DTAPI_STAT_ATSC3_TXID_INFO  0x30F        // ATSC3 transmitter ID information
-#define DTAPI_STAT_DAB_TXID_INFO    0x30C        // DAB transmitter ID information
-#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_DVBT2_TXID_INFO  0x30E        // DVB-T2 transmitter ID information
-#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
-
-//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtIpQosStats -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
-//
-// Quality-of-Service related statistics for SDI/TS-over-IP channels, measured over a
-// certain period of time (the "time period").
-//
-// If the mode is "Seamless Protection Switching of IP Datagrams" (SMPTE 2022-7 mode), 
-// QoS statistics are maintained for path 1, path 2, and for the reconstructed stream.
-// If the mode is not SMPTE 2022-7 ("single-path" mode), the QoS statistics are stored
-// in the members for path 1.
-//
-// This structure is contained in the DtIpStat structure, once with the statistics 
-// measured over the last second, and once with statistics measured over the last minute.
-//
-struct DtIpQosStats
-{
-    // Packet Error Rate (PER) for path 1, path 2 and for the reconstructed stream.
-    // The PER is the number of lost IP packets per second.
-    double  m_Per1, m_Per2, m_PerAfterFec;
-
-    // Delay factor in microseconds for path 1 and path 2.
-    // The delay factor is an indication of the jitter of the IP stream. It is defined
-    // as the maximum difference between the actual arrival time of a UDP/RTP packet
-    // and the ideal (jitterless) arrival time of that packet.
-    double  m_DelayFactor1, m_DelayFactor2;
-
-    // The skew is the minimal and maximal difference over the time period 
-    // (1 sec or 1 minute) in arrival time between IP packets on path 1 and on path 2.
-    // If m_Skew is positive, path 1 has a longer delay than path 2; if m_Skew is
-    // negative, path 2 has the longer delay.
-    // Note: PD as defined in SMPTE 2022-7 is the absolute value of m_Skew.
-    double  m_MinSkew;                 // Min. Skew between path 1 and path 2
-    double  m_MaxSkew;                 // Max. Skew between path 1 and path 2
-
-    //Inter Packet arrival time of Ip packet per port over time period (1 sec or 1 minute)
-    double  m_MinIpat1, m_MinIpat2;    // Min. IPAT path1 and path2
-    double  m_MaxIpat1, m_MaxIpat2;    // Max. IPAT path1 and path2
-};
-
-//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-. DtIpProfile -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
-//
-// Structure for describing the IP transmission "profile". It defines the maximum
-// bitrate and (in SMPTE 2022-7 mode only) the maximum skew between path 1 and path 2.
-// DtIpProfile is used to dimension buffer sizes at the receiver.
-//
-struct DtIpProfile
-{
-    // m_Profile defines the maximum bitrate and the maximum path skew.
-    // Member variables m_MaxBitrate and m_MaxSkew are used only if m_Profile is
-    // DTAPI_IP_USER_DEFINED, otherwise m_Profile implicitly sets their values.
-    int  m_Profile;                 // IP transmission profile
-
-    // m_MaxBitrate is used for single paths and in SMPTE 2022-7 mode.
-    unsigned int  m_MaxBitrate;     // Maximum bitrate in bps
-
-    // m_MaxSkew is used only in SMPTE 2022-7 mode. It defines the maximum skew
-    // between the two IP transmission paths.
-    int  m_MaxSkew;                 // Maximum skew between path 1 and path 2 in ms
-
-    // Set the video standard to transmit/receive. 
-    int  m_VideoStandard;           // DTAPI_VIDSTD_ defines.
-
-public:
-    DtIpProfile&  operator = (const DtIpProfile&);
-    bool  operator == (const DtIpProfile&) const;
-    bool  operator != (const DtIpProfile&) const;
-};
-
-// IP tranmission profile (DtIpProfile::m_Profile)
-#define DTAPI_IP_PROF_NOT_DEFINED   0            // Not defined
-#define DTAPI_IP_USER_DEFINED       1            // Use m_MaxBitrate and m_MaxSkew
-// LBR (Low Bit Rate) profiles
-#define DTAPI_IP_LBR_LOW_SKEW       2            // m_MaxSkew=10ms, m_MaxBitrate=10Mbps
-#define DTAPI_IP_LBR_MODERATE_SKEW  3            // m_MaxSkew=50ms, m_MaxBitrate=10Mbps
-#define DTAPI_IP_LBR_HIGH_SKEW      4            // m_MaxSkew=450ms, m_MaxBitrate=10Mbps
-// SBR (Slower Bit Rate) profiles
-#define DTAPI_IP_SBR_LOW_SKEW       5            // m_MaxSkew=10ms, m_MaxBitrate=270Mbps
-#define DTAPI_IP_SBR_MODERATE_SKEW  6            // m_MaxSkew=50ms, m_MaxBitrate=270Mbps
-#define DTAPI_IP_SBR_HIGH_SKEW      7            // m_MaxSkew=450ms, m_MaxBitrate=270Mbps
-// HBR (High Bit Rate) profiles
-#define DTAPI_IP_HBR_LOW_SKEW       5            // m_MaxSkew=10ms, m_MaxBitrate=3Gbps
-#define DTAPI_IP_HBR_MODERATE_SKEW  6            // m_MaxSkew=50ms, m_MaxBitrate=3Gbps
-#define DTAPI_IP_HBR_HIGH_SKEW      7            // m_MaxSkew=150ms, m_MaxBitrate=3Gbps
-
-//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtIpPars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
-//
-// Structure for storing SDI/TS-over-IP parameters
-//
-struct DtIpPars2;
-struct DtIpPars
-{
-public:
-    // Primary link
-    unsigned char  m_Ip16;        // IP address (IPv4/IPv6)
-    unsigned short  m_Port;         // Port number
-    unsigned char  m_SrcFltIp16;  // 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 (path 2 in SMPTE 2022-7 mode)
-    unsigned char  m_Ip216;       // IP address (IPv4/IPv6)
-    unsigned short  m_Port2;        // Port number
-    unsigned char  m_SrcFltIp216; // 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;              // Number of transport packets 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;              // 'D' = #rows in FEC matrix
-    int  m_FecNumCols;              // 'L' = #columns in FEC matrix
-
-    // Control and status flags: DTAPI_IP_V4, DTAPI_IP_V6, DTAPI_IP_TX_MANSRCPORT
-    int  m_Flags;
-
-    // Seamless Protection Switching of IP Datagrams (SMPTE 2022-7)
-
-    // Transmission- or reception mode. It determines whether "seamless protection
-    // switching of IP datagrams" according to SMPTE 2022-7 is applied.
-    //  DTAPI_IP_NORMAL     Default value for non-redundant Rx or Tx.
-    //  DTAPI_IP_TX_2022_7  Apply SMPTE 2022-7 for Tx. IP packets will be duplicated to
-    //                      path 1 (primary link) and path 2 (redundant link)
-    //  DTAPI_IP_RX_2022_7  Apply SMPTE 2022-7 for Rx. IP packets from path 1 and path 2
-    //                      will be seamlessly combined into a single logical stream.
-    int  m_Mode;
-
-    // The IP transmission profile determines the maximum bitrate and the maximum skew
-    // between transmission path 1 and path 2.
-    DtIpProfile  m_IpProfile;
-public:
-    DtIpPars();
-    ~DtIpPars();
-    void operator=(const DtIpPars2& IpPars);
-    bool  operator == (const DtIpPars&) const;
-    bool  operator != (const DtIpPars&) const;
-};
-
-// Legacy
-#define DtTsIpPars  DtIpPars
-
-typedef struct _DtIpSrcFlt
-{
-public:
-    unsigned char  m_SrcFltIp16;  // Source filter: IP address (IPv4/IPv6)
-    unsigned short  m_SrcFltPort;   // Source filter: port number
-} DtIpSrcFlt;
-
-//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtIpPars2 -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
-//
-// Structure for storing SDI/TS-over-IP parameters
-//
-struct DtIpPars2
-{
-public:
-    // Primary link
-    unsigned char  m_Ip16;        // IP address (IPv4/IPv6)
-    unsigned short  m_Port;         // Port number
-    unsigned char  m_Gateway16;   // Override default gateway
-    std::vector<DtIpSrcFlt>  m_SrcFlt;
-                                    // Source filter
-    int  m_VlanId;                  // VLAN ID
-    int  m_VlanPriority;            // VLAN priority
-
-    // Redundant link (path 2 in SMPTE 2022-7 mode)
-    unsigned char  m_Ip216;       // IP address (IPv4/IPv6)
-    unsigned short  m_Port2;        // Port number
-    unsigned char  m_Gateway216;  // Override default gateway
-    std::vector<DtIpSrcFlt>  m_SrcFlt2;
-                                    // Source filter
-    
-    int  m_VlanId2;                 // VLAN ID
-    int  m_VlanPriority2;           // VLAN priority
-
-    int  m_TimeToLive;              // Time-to-Live setting for IP Tx
-    int  m_NumTpPerIp;              // Number of transport packets 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;              // 'D' = #rows in FEC matrix
-    int  m_FecNumCols;              // 'L' = #columns in FEC matrix
-
-    // Control and status flags: DTAPI_IP_V4, DTAPI_IP_V6, DTAPI_IP_TX_MANSRCPORT
-    int  m_Flags;
-
-    // Seamless Protection Switching of IP Datagrams (SMPTE 2022-7)
-
-    // Transmission- or reception mode. It determines whether "seamless protection
-    // switching of IP datagrams" according to SMPTE 2022-7 is applied.
-    //  DTAPI_IP_NORMAL     Default value for non-redundant Rx or Tx.
-    //  DTAPI_IP_TX_2022_7  Apply SMPTE 2022-7 for Tx. IP packets will be duplicated to
-    //                      path 1 (primary link) and path 2 (redundant link)
-    //  DTAPI_IP_RX_2022_7  Apply SMPTE 2022-7 for Rx. IP packets from path 1 and path 2
-    //                      will be seamlessly combined into a single logical stream.
-    int  m_Mode;
-
-    // The IP transmission profile determines the maximum bitrate and the maximum skew
-    // between transmission path 1 and path 2.
-    DtIpProfile  m_IpProfile;
-public:
-    DtIpPars2();
-    ~DtIpPars2();
-    void Init();
-    void operator=(const DtIpPars& IpPars);
-};
-
-// 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
-#define DTAPI_FEC_2D_M1_B           3            // Mode1: FECdT = DVBdT + .5 * DVBdT (BLOCK)
-#define DTAPI_FEC_2D_M2_B           4            // Mode2: FECdT = DVBdT (BLOCK)
-
-// Optional control/status flags (DtIpPars::m_Flags)
-#define DTAPI_IP_V4                 0x00
-#define DTAPI_IP_V6                 0x01
-#define DTAPI_IP_TX_MANSRCPORT      0x10
-#define DTAPI_IP_RX_DIFFSRCPORTFEC  0x20
-
-// Transmission/reception mode (DtIpPars::m_Mode)
-#define DTAPI_IP_NORMAL             0
-#define DTAPI_IP_TX_2022_7          1            // Dual-path SMPTE 2022-7 transmission
-#define DTAPI_IP_RX_2022_7          2            // Dual-path SMPTE 2022-7 reception
-// Legacy definitions
-#define DTAPI_IP_TX_DBLBUF          DTAPI_IP_TX_2022_7
-#define DTAPI_IP_RX_DBLBUF          DTAPI_IP_RX_2022_7
-
-// 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 the IP statistics for an SDI/TS-over-IP channel.
-//
-// Counters start at zero, but counters are not reset after being read.
-// Counter wraps must be handled by the application.
-//
-// If the mode is "Seamless Protection Switching of IP Datagrams" (SMPTE 2022-7 mode), 
-// counters are maintained for path 1, path 2, and for the reconstructed stream.
-// If this mode is not active, only path 1 counters are valid.
-//
-struct DtIpStat
-{
-    // Total number of received or transmitted IP packets.This is the number of IP packets
-    // that the stream should contain, so lost packets are included in this counter.
-    unsigned int  m_TotNumIpPackets;
-
-    // Number of IP packets lost before and after FEC.
-    // In SMPTE 2022-7 mode, these counters apply to the reconstructed stream.
-    unsigned int  m_LostIpPacketsBeforeFec, m_LostIpPacketsAfterFec;
-
-    // Counters for the number of received and number of lost IP packets for path 1
-    // and for path 2.
-    //  m_NumIpPacketsLost1 = m_TotNumIpPackets - m_NumIpPacketsReceived1
-    //  m_NumIpPacketsLost2 = m_TotNumIpPackets - m_NumIpPacketsReceived2
-    unsigned int  m_NumIpPacketsReceived1, m_NumIpPacketsReceived2;
-    unsigned int  m_NumIpPacketsLost1, m_NumIpPacketsLost2;
-
-    // QoS statistics measured over the last second, and over the last minute.
-    DtIpQosStats  m_QosStatsLastSec, m_QosStatsLastMin;
-}; 
-
-// 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
-    int  m_LinkStd;                 // Link standard
-    bool  m_IsHd;                   // true: is an HD format: false: is SD format
-    bool  m_Is4k;                   // true: is a 4k resolution
-
-    int  m_VidWidth;                // Width in pixels
-    int  m_VidHeight;               // Height in number of lines
-
-    // NOTE: for 4k the following members describe the properties of a single link
-    bool  m_IsInterlaced;           // Is interlaced
-    int  m_NumLines;                // Number of lines per frame
-    double  m_Fps;                  // Frame rate
-    double  m_Pps;                  // Picture rate
-    bool  m_IsFractional;           // Fractional frame rate
-        
-    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
-
-    // Utility predicates
-    bool  IsFrameRate(double R) { return R-1e-3<m_Fps && m_Fps<R+1e-3; }
-};
-
-//+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+ 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;
-    DtDemodParsAtsc3*  Atsc3() 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, IsAtsc3() const, IsDab() const, IsDvbC2() const, IsDvbS() const, 
-        IsDvbS2() const, IsDvbT() const,IsDvbT2() const, IsIq() const, IsIq2131() const,
-        IsIsdbt() const,  IsQam() const, IsQamAC() const, IsQamB() 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
-};
-
-//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDemodParsAtsc3 -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
-//
-// Demodulation parameters for modulation type DTAPI_MOD_ATSC3
-//
-struct DtDemodParsAtsc3
-{
-    int  m_Bandwidth;               // Bandwidth,  See DTAPI_ATSC3_xMHZ
-    bool  m_AlpLenIncludesAhSi;     // If true ALP payload length includes additional 
-                                    // header for signaling information; default false
-                                    // (2016 spec, Korean mode, non standard)
-    DtDemodParsAtsc3() :  m_AlpLenIncludesAhSi(false) {}
-};
-//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- 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
-    bool m_ScanL1Part2Data;         // Scan on each tune for full L1Part2Data
-};
-
-//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- 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  ATSC3.0 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)
-
-    // Serialisation
-    DTAPI_RESULT  FromXml(const std::wstring& XmlString);
-    DTAPI_RESULT  ToXml(std::wstring& XmlString);
-};
-
-//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- 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 
-
-    // Serialisation
-    DTAPI_RESULT  FromXml(const std::wstring& XmlString);
-    DTAPI_RESULT  ToXml(std::wstring& XmlString);
-};
-
-//+=+=+=+=+=+=+=+=+ Demodulator Blindscan and Spectrum scan definitions +=+=+=+=+=+=+=+=+=
-
-//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- 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
-};
-
-//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtBsProgess -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
-//
-// Structure describing the progress of an asynchronous BlindScan.
-// Used by asynchronous DtInpChannel::BlindScan to return current state and the 
-// transmitters found by scanning a frequency band using the DtBsProgressFunc callback.
-//
-struct DtBsProgress
-{
-    enum BsEvent
-    {
-        BS_STEP,                // One frequency step is completed
-        BS_CANCELLED,           // Blindscan is cancelled
-        BS_DONE                 // Blindscan is completed
-    };
-
-    __int64  m_FreqHz;          // Center frequency found
-    DtDemodPars  m_DemodPars;   // Demodulator parameters found for this transmitter
-    BsEvent  m_ProgressEvent;   // Progress event
-    bool  m_ChannelFound;       // If set, the channel is found on the transmitter 
-                                // frequency
-    DTAPI_RESULT  m_Result;     // Result of the blindscan
-
-    // Serialisation
-    DTAPI_RESULT  FromXml(const std::wstring& XmlString);
-    DTAPI_RESULT  ToXml(std::wstring& XmlString);
-
-public:
-    DtBsProgress();
-    ~DtBsProgress();
-};
-
-// Function to receive asynchronous progess.
-typedef void  DtBsProgressFunc(DtBsProgress& Progress, void* pOpaque);
-
-//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtRfLevel -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
-//
-// Structure describing a RF-level on a frequency. 
-// Used by DtInpChannel::SpectrumScan to return the RF-levels found by scanning a
-// frequency band.
-//
-struct DtRfLevel
-{  
-    __int64  m_FreqHz;          // Center frequency of the RF level
-    int  m_RfLevel;             // RF level found in units of 0.1dBmV
-};
-
-//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtSpsProgress -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
-//
-// Structure describing the progress of an asynchronous SpectrumScan.
-// Used by DtInpChannel::SpectrumScan to return current state and the RF-Levels 
-// found by scanning a frequency band using the DtSpsProgressFunc callback.
-//
-struct DtSpsProgress
-{
-    enum SpsEvent
-    {
-        SPS_STEP,               // One frequency step is completed
-        SPS_CANCELLED,          // SpectrumScan is cancelled
-        SPS_DONE                // SpectrumScan is completed
-    };
-
-    DtRfLevel  m_DtRfLevel;     // A single level
-    SpsEvent  m_ProgressEvent;  // Progress event
-    DTAPI_RESULT  m_Result;     // Result of the spectrumscan
-    
-    //Serialisation
-    DTAPI_RESULT  FromXml(const std::wstring& XmlString);
-    DTAPI_RESULT  ToXml(std::wstring& XmlString);
- 
-public:
-    DtSpsProgress();
-    ~DtSpsProgress();
-};
-
-// Function to receive asynchronous spectrum scan progess.
-typedef void  DtSpsProgressFunc(DtSpsProgress& Progress, void* pOpaque);
-
-//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtAspectRatio -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
-// Aspect ratio
-enum DtAspectRatio
-{
-    DT_AR_UNKNOWN,              // Unknown aspect ratio
-    DT_AR_4_3,                  // 4x3
-    DT_AR_16_9,                 // 16x9
-    DT_AR_14_9                  // 14x9
-};
-
-//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- struct DtDetVidStd -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
-//
-// Structure with information about the detected video standard on the input. Returned
-// by DtDevice::DetectVidStd(). This function is only available on ports with the
-// DTAPI_CAP_MATRIX2, DTAPI_CAP_SDIRX or DTAPI_CAP_HDMI capability.
-//
-struct DtDetVidStd
-{
-    int  m_VidStd;                  // Detected video standard
-    int  m_LinkStd;                 // Detected link standard
-    int  m_LinkNr;                  // Link number, -1 for single-link standards
-    unsigned int  m_Vpid;           // Raw VPID extracted from stream, 0 if not available
-    unsigned int  m_Vpid2;          // Raw VPID from link 2, only for 3G level B signals
-    DtAspectRatio  m_AspectRatio;   // Picture Aspect Ratio
-};
-
-//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- enum DtAudChanContent -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
-enum DtAudChanContent
-{
-    DT_AUDCHANCONT_UNKNOWN,         // Channel content is unknown or not defined yet
-    DT_AUDCHANCONT_PCM,             // Channel carries PCM samples
-    DT_AUDCHANCONT_DATA,            // Channel carries data
-    DT_AUDCHANCONT_UNSUPPORTED,     // Content detection is not supported
-};
-//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- struct DtAudChanStatus -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
-//
-struct DtAudChanStatus
-{
-    int  m_ChanIdx;                 // Channel index in underlying audio/video stream
-    bool  m_IsAsynchronous;         // Is channel asynchronous wrt video clock?
-    int  m_SampleRate;              // Audio sample rate
-    DtAudChanContent  m_Content;    // Channel content
-    int  m_StatusWordNumValid;      // Number of valid bytes in m_ChanStat
-    unsigned char  m_ChanStat24;  // Raw channel-status word data
-
-    bool operator == (const DtAudChanStatus&) const;
-    bool operator != (const DtAudChanStatus& Rhs) const { return !(*this==Rhs); }
-};
-
-//.-.-.-.-.-.-.-.-.-.- Audio encoding parameters - Enumeration types -.-.-.-.-.-.-.-.-.-.-
-
-// Audio encoding standard
-enum DtAudEncStd
-{
-    DT_AUDENCSTD_UNKNOWN,           // Unknown or not defined yet
-    DT_AUDENCSTD_AAC,               // AAC (AAC-LC or HE-AAC)
-    DT_AUDENCSTD_AC3,               // Dolby AC-3
-    DT_AUDENCSTD_DOLBY_E,           // Dolby E (currently pass-through mode only)
-    DT_AUDENCSTD_EAC3,              // Dolby E-AC-3 (currently pass-through mode only)
-    DT_AUDENCSTD_MP1LII,            // MPEG-1 Layer II
-    DT_AUDENCSTD_PCM                // PCM samples (SMPTE 302M)
-};
-
-//-.-.-.-.-.-.-.-.-.-.-.-.-.- struct DtDolbyECompleteMetadata -.-.-.-.-.-.-.-.-.-.-.-.-.-.
-//
-struct DtDolbyECompleteMetadata
-{
-    int  m_ProgramConfig;
-    int  m_FrameRateCode;
-    int  m_PitchShiftCode;
-    unsigned char  m_SmpteTimeCode8;
-    std::vector<unsigned char>  m_DescriptionText;
-
-    bool operator == (const DtDolbyECompleteMetadata&) const;
-    bool operator != (const DtDolbyECompleteMetadata& Rhs) const { return !(*this==Rhs); }
-};
-
-//-.-.-.-.-.-.-.-.-.-.-.-.-.- struct DtDolbyEEssentialMetadata -.-.-.-.-.-.-.-.-.-.-.-.-.-
-//
-struct DtDolbyEEssentialMetadata
-{
-    int  m_ProgramConfig;
-    int  m_FrameRateCode;
-    int  m_PitchShiftCode;
-
-    bool operator == (const DtDolbyEEssentialMetadata&) const;
-    bool operator != (const DtDolbyEEssentialMetadata& Rhs) const 
-                                                                 { return !(*this==Rhs); }
-};
-
-//.-.-.-.-.-.-.-.-.-.-.-.- struct DtDolbyDigitalCompleteMetadata -.-.-.-.-.-.-.-.-.-.-.-.-
-//
-struct DtDolbyDigitalCompleteMetadata
-{
-    int  m_ProgramId;               // Program id
-    int  m_Datarate;                // Intended bitrate
-    int  m_BsMod;                   // Bitstream mode
-    int  m_AcMod;                   // Audio coding mode
-    int  m_CMixLev;                 // Center mix level
-    int  m_SurMixLev;               // Surround mix level
-    int  m_DSurMod;                 // Dolby surround mode
-    bool  m_LfeOn;                  // Enable Low Frequency Effect (LFE) channel
-    int  m_DialNorm;                // Dialog normalization
-    bool  m_LangCodeE;              // Language code exists
-    int  m_LangCode;                // Language code
-    bool  m_AudProdIE;              // Audio production info exists
-    int  m_MixLevel;                // Mixing level
-    int  m_RoomTyp;                 // Room type
-    bool  m_CopyrightB;             // Copyright flag
-    bool  m_OrigBs;                 // Original bitstream flag
-    bool  m_Xbsi1e;                 // Enable alternative bitstream syntax
-    int  m_DMixMod;                 // Preferred stereo downmix mode
-    int  m_LtrtCMixLev;             // Lt/Rt center mix level
-    int  m_LtrtSurMixLev;           // Lt/Rt surround mix level
-    int  m_LoroCMixLev;             // Lo/Ro center mix level
-    int  m_LoroSurMixLev;           // Lo/Ro surround mix level
-    bool  m_Xbsi2e;                 // Extended bitstream indicator
-    int  m_DSurExMod;               // Dolby surround EX mode
-    int  m_DHeadPhonMod;            // Dolby headphone mode
-    int  m_AdConvTyp;               // A/D converter type
-    bool  m_HpFOn;                  // Enable DC filter
-    bool  m_BwLpfOn;                // Enable bandwidth filter
-    bool  m_LfeLpfOn;               // Enable LFE lowpass filter
-    bool  m_Sur90On;                // Enable 90-degree phase shift for surround
-    bool  m_SurAtton;               // 3dB surround attenuation flag
-    bool  m_RfPremphOn;             // Enable digital deemphasis
-    bool  m_ComprE;                 // Compression control word exists
-    int  m_Compr1;                  // RF compression profile
-    bool  m_DynRngE;                // Enable normal compression
-    int  m_DynRng1;                 // Dynamic range control 1
-    int  m_DynRng2;                 // Dynamic range control 2
-    int  m_DynRng3;                 // Dynamic range control 3
-    int  m_DynRng4;                 // Dynamic range control 4
-
-    bool operator == (const DtDolbyDigitalCompleteMetadata&) const;
-    bool operator != (const DtDolbyDigitalCompleteMetadata& Rhs) const 
-                                                                 { return !(*this==Rhs); }
-};
-
-//.-.-.-.-.-.-.-.-.-.-.-.- struct DtDolbyDigitalEssentialMetadata -.-.-.-.-.-.-.-.-.-.-.-.
-//
-struct DtDolbyDigitalEssentialMetadata
-{
-    int  m_ProgramId;               // Program id
-    int  m_Datarate;                // Intended bitrate
-    int  m_BsMod;                   // Bitstream mode
-    int  m_AcMod;                   // Audio coding mode
-    bool  m_LfeOn;                  // Enable Low Frequency Effect (LFE) channel
-    int  m_DialNorm;                // Dialog normalization
-    bool  m_ComprE;                 // Compression control word exists
-    int  m_Compr2;                  // Global compression profile
-    bool  m_DynRngE;                // Enable normal compression
-    int  m_DynRng5;                 // Dynamic range control 5
-    int  m_DynRng6;                 // Dynamic range control 6
-    int  m_DynRng7;                 // Dynamic range control 7
-    int  m_DynRng8;                 // Dynamic range control 8
-
-    bool operator == (const DtDolbyDigitalEssentialMetadata&) const;
-    bool operator != (const DtDolbyDigitalEssentialMetadata& Rhs) const 
-                                                                 { return !(*this==Rhs); }
-};
-
-
-//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- struct DtRdd6Data -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
-//
-struct DtRdd6Data
-{
-    int  m_FirstChannelIdx;         // Derived from ST2020 SDID. Can be -1 for unknown
-    bool  m_DECompleteValid;
-    DtDolbyECompleteMetadata  m_DEComplete;
-    bool  m_DEEssentialValid;
-    DtDolbyEEssentialMetadata  m_DEEssential;
-    bool  m_DDCompleteValid;
-    DtDolbyDigitalCompleteMetadata  m_DDComplete;
-    bool  m_DDEssentialValid;
-    DtDolbyDigitalEssentialMetadata  m_DDEssential;
-
-    bool operator == (const DtRdd6Data&) const;
-    bool operator != (const DtRdd6Data& Rhs) const { return !(*this==Rhs); }
-};
-
-//+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=
-//=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+ 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 int  FwPackageVersion();
-    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 Ip4);
-    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  ClearGpsErrors();
-    virtual DTAPI_RESULT  Detach(void);
-    virtual DTAPI_RESULT  DetectIoStd(int  Port, int& Value, int& SubValue);
-    DTAPI_DEPRECATED(virtual DTAPI_RESULT  DetectVidStd(int  Port, DtDetVidStd& Info),
-              "Deprecated (will be removed!): Use DtAvInputStatus::DetectVidStd instead");
-    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  GetFirmwareVariant(int& FirmwareVariant);
-    virtual DTAPI_RESULT  GetFirmwareVersion(int& FirmwareVersion);
-    virtual DTAPI_RESULT  GetFwPackageVersion(int& FwPackVersion);
-    virtual DTAPI_RESULT  GetTemperature(int TempSens, int& Temp);
-    virtual DTAPI_RESULT  GetGenlockState(int& State, int& RefVidStd);
-    virtual DTAPI_RESULT  GetGenlockState(int& State);
-    virtual DTAPI_RESULT  GetGpsStatus(int& Status, int& Error);
-    virtual DTAPI_RESULT  GetGpsTime(int& GpsTime);
-    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  GetNumLicensePoints(DtAudEncStd, int& NumPoints);
-    virtual DTAPI_RESULT  GetNumLicensePoints(DtAudEncStd AudEncStd, int PortNr, 
-                                  int& NumPoints, int& NumUsedPoints, int& NumFreePoints);
-    virtual DTAPI_RESULT  GetNwSpeed(int Port, bool& Enable, int& Speed);
-    virtual DTAPI_RESULT  GetPowerStatus(int& Status);
-    virtual DTAPI_RESULT  GetRefClkCnt(int& RefClkCnt);
-    virtual DTAPI_RESULT  GetRefClkCnt(__uint64& RefClkCnt);
-    virtual DTAPI_RESULT  GetRefClkCnt(int& RefClkCnt, int& RefClkFreqHz);
-    virtual DTAPI_RESULT  GetRefClkCnt(__uint64& 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);
-    static  DTAPI_RESULT  RebootFirmware(__int64 SerialNumber);
-    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);
-    static  DTAPI_RESULT  SetFirmwareVariant(__int64 SerialNumber, int FwVariant, 
-                                                                    bool CheckOnly=false);
-    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  SetLicenseFromFile(const std::wstring& LicFilename, 
-                                                                        bool Force=false);
-    virtual DTAPI_RESULT  SetLicenseFromString(const std::wstring& LicString,
-                                                                        bool Force=false);
-    virtual DTAPI_RESULT  SetNwSpeed(int Port, bool Enable, int Speed);
-    virtual DTAPI_RESULT  SetVcxoState(bool Enable, int Value);
-    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
-#define DTAPI_ATTR_NUM_TEMP_SENS    20
-
-// 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 serial number in canonical form (e.g. "2180.000.022")
-#define DTAPI_DVC2STR_SN              2
-// String conversion - Device type number (e.g. "DTA-100", "DTA-102")
-#define DTAPI_HWF2STR_TYPE_NMB        0
-// String conversion - Device type number + optional port (e.g. "DTA-124 port 1"). Port
-// no is only added for bidirectional ports and/or when there is more than one port
-// configured with the same direction.
-#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
-// String conversion - Device type number + port (e.g. "DTA-124 port 1"). Port no is
-// always added
-#define DTAPI_HWF2STR_TYPE_AND_PORT2  5
-// String conversion - Device serial number in canonical form (e.g. "2180.000.022")
-#define DTAPI_HWF2STR_SN              6
-
-// Current genlock state
-#define DTAPI_GENL_NO_REF           1
-#define DTAPI_GENL_LOCKING          2
-#define DTAPI_GENL_LOCKED           3
-
-// Status and error flags for GPS-Synchronisation
-#define DTAPI_GPS_1PPS_SYNC         0x000001
-#define DTAPI_GPS_10MHZ_SYNC        0x000002
-#define DTAPI_GPS_1PPS_ERROR        0x000001
-#define DTAPI_GPS_10MHZ_OUT_RANGE   0x000002
-#define DTAPI_GPS_10MHZ_NO_SIGNAL   0x000004
-
-// 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
-
-// Status and error flags for power status
-#define DTAPI_POWER_STATUS_OK           0
-#define DTAPI_POWER_EXT_12V_ABSENT      0x000001
-
-//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- 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=-1, __int64 EndFreqHz=-1);
-    DTAPI_RESULT  BlindScan(DtBsProgressFunc* pCallback, void* pOpaque,
-                                   const DtDemodPars& DemodPars, 
-                                   __int64 FreqHzSteps=10000000LL, __int64 StartFreqHz=-1, 
-                                   __int64 EndFreqHz=-1);
-    DTAPI_RESULT  CancelBlindScan();
-    DTAPI_RESULT  CancelSpectrumScan();
-    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  GetIpPars(DtIpPars2* 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(DtAtsc3StreamSelPars& StreamSel);
-    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  SetFifoSize(int FifoSize);
-    DTAPI_RESULT  SetIoConfig(int Group, int Value, int SubValue = -1,
-                                            __int64 ParXtra0 = -1, __int64 ParXtra1 = -1);
-    DTAPI_RESULT  SetIpPars(DtIpPars* pIpPars);
-    DTAPI_RESULT  SetIpPars(DtIpPars2* pIpPars);
-    DTAPI_RESULT  SetPars(int Count, DtPar* pPars); 
-    DTAPI_RESULT  SetRxControl(int RxControl);
-    DTAPI_RESULT  SetRxMode(int RxMode);
-    DTAPI_RESULT  SetStreamSelection(DtAtsc3StreamSelPars& StreamSel);
-    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  StatisticsPollingEnable(bool Enable);
-    DTAPI_RESULT  SetTuningMode(int  Mode);
-    DTAPI_RESULT  SetTunerFrequency(__int64 FreqHz, int TunerId=-1);
-    DTAPI_RESULT  SpectrumScan(DtSpsProgressFunc* pCallback, void* pOpaque, int ScanType,
-                                   __int64 FreqHzSteps=1000000LL, __int64 StartFreqHz=-1L,
-                                   __int64 EndFreqHz=-1L);
-    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
-#define DTAPI_RXMODE_SDI_STAT       0x00020000
-
-// 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/238 specific
-#define DTAPI_TUNING_NORMAL         0           // Standard tuning mode
-#define DTAPI_TUNING_INDEPENDENT    1           // Multiple tuners, tuned independently
-
-// Tuner ID - DTU-236A/238 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  ClearSfnErrors();
-    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, int SubChan=0);
-    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  GetIpPars(DtIpPars2* 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  GetRfControl(int& RfFreq, int& LockStatus);
-    virtual DTAPI_RESULT  GetRfControl(double& RfFreq, int& LockStatus);
-    virtual DTAPI_RESULT  GetSfnMaxTimeDiff(int& TimeDiff);
-    virtual DTAPI_RESULT  GetSfnModDelay(int& ModDelay);
-    virtual DTAPI_RESULT  GetSfnStatus(int& Status, int& Error);
-    virtual DTAPI_RESULT  GetSpiClk(int& SpiClk);
-    virtual DTAPI_RESULT  GetTargetId(int& Present, int& TargetId);
-    virtual DTAPI_RESULT  GetTsRateBps(int& TsRate);
-    virtual DTAPI_RESULT  GetTsRateBps(DtFractionInt& 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  SetIpPars(DtIpPars2* pIpPars);
-    virtual DTAPI_RESULT  SetIsdbtCaptFile(void* IsdbtFile);
-    virtual DTAPI_RESULT  SetModControl(DtAtsc3Pars&);
-    virtual DTAPI_RESULT  SetModControl(DtCmmbPars&);
-    virtual DTAPI_RESULT  SetModControl(DtDvbC2Pars&);
-    virtual DTAPI_RESULT  SetModControl(DtDvbCidPars&);
-    virtual DTAPI_RESULT  SetModControl(DtDvbS2Pars&);
-    virtual DTAPI_RESULT  SetModControl(DtDvbT2Pars&);
-    virtual DTAPI_RESULT  SetModControl(DtIqDirectPars&);
-    virtual DTAPI_RESULT  SetModControl(DtIsdbsPars&);
-    virtual DTAPI_RESULT  SetModControl(DtIsdbS3Pars&);
-    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  SetMultiModConfig(int NumSubChan, int FreqSpacing);
-    virtual DTAPI_RESULT  SetOutputLevel(int LeveldBm);
-    virtual DTAPI_RESULT  SetPhaseNoiseControl(DtPhaseNoisePars& PnPars);
-    virtual DTAPI_RESULT  SetPower(int Power);
-    virtual DTAPI_RESULT  SetRfControl(__int64 RfFreq);
-    virtual DTAPI_RESULT  SetRfControl(double RfFreq);
-    virtual DTAPI_RESULT  SetRfControl(int RfFreq);
-    virtual DTAPI_RESULT  SetRfMode(int RfMode);
-    virtual DTAPI_RESULT  SetRfMode(int Sel, int Mode);
-    virtual DTAPI_RESULT  SetSfnAllowedTimeDiff(int TimeDiff);
-    virtual DTAPI_RESULT  SetSfnControl(int SnfMode, int TimeOffset);
-    virtual DTAPI_RESULT  SetSnr(int Mode, int Snr);
-    virtual DTAPI_RESULT  SetSpiClk(int SpiClk);
-    virtual DTAPI_RESULT  SetTsRateBps(int TsRate);
-    virtual DTAPI_RESULT  SetTsRateBps(DtFractionInt 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, int SubChan=0);
-    // 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  ClearSfnErrors();
-    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, int SubChan=0);
-    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  GetRfControl(int& RfFreq, int& LockStatus);
-    virtual DTAPI_RESULT  GetRfControl(double& RfFreq, int& LockStatus);
-    virtual DTAPI_RESULT  GetSfnMaxTimeDiff(int& TimeDiff);
-    virtual DTAPI_RESULT  GetSfnModDelay(int& ModDelay);
-    virtual DTAPI_RESULT  GetSfnStatus(int& Status, int& Error);
-    virtual DTAPI_RESULT  GetSpiClk(int& SpiClk);
-    virtual DTAPI_RESULT  GetTargetId(int& Present, int& TargetId);
-    virtual DTAPI_RESULT  GetTsRateBps(int& TsRate);
-    virtual DTAPI_RESULT  GetTsRateBps(DtFractionInt& 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  SetIpPars(DtIpPars2* pIpPars);
-    virtual DTAPI_RESULT  SetIsdbtCaptFile(void* IsdbtFile);
-    virtual DTAPI_RESULT  SetModControl(DtAtsc3Pars&);
-    virtual DTAPI_RESULT  SetModControl(DtCmmbPars&);
-    virtual DTAPI_RESULT  SetModControl(DtDvbC2Pars&);
-    virtual DTAPI_RESULT  SetModControl(DtDvbCidPars&);
-    virtual DTAPI_RESULT  SetModControl(DtDvbS2Pars&);
-    virtual DTAPI_RESULT  SetModControl(DtDvbT2Pars&);
-    virtual DTAPI_RESULT  SetModControl(DtIqDirectPars&);
-    virtual DTAPI_RESULT  SetModControl(DtIsdbsPars&);
-    virtual DTAPI_RESULT  SetModControl(DtIsdbS3Pars&);
-    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  SetMultiModConfig(int NumSubChan, int FreqSpacing);
-    virtual DTAPI_RESULT  SetOutputLevel(int LeveldBm);
-    virtual DTAPI_RESULT  SetPhaseNoiseControl(DtPhaseNoisePars& PnPars);
-    virtual DTAPI_RESULT  SetPower(int Power);
-    virtual DTAPI_RESULT  SetRfControl(__int64 RfFreq);
-    virtual DTAPI_RESULT  SetRfControl(double RfFreq);
-    virtual DTAPI_RESULT  SetRfControl(int RfFreq);
-    virtual DTAPI_RESULT  SetRfMode(int RfMode);
-    virtual DTAPI_RESULT  SetRfMode(int Sel, int Mode);
-    virtual DTAPI_RESULT  SetSfnAllowedTimeDiff(int TimeDiff);
-    virtual DTAPI_RESULT  SetSfnControl(int SnfMode, int TimeOffset);
-    virtual DTAPI_RESULT  SetSnr(int Mode, int Snr);
-    virtual DTAPI_RESULT  SetSpiClk(int SpiClk);
-    virtual DTAPI_RESULT  SetTsRateBps(int TsRate);
-    virtual DTAPI_RESULT  SetTsRateBps(DtFractionInt 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, int SubChan=0);
-    // 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);
-    virtual DTAPI_RESULT  WriteMplpPacket(int FifoIdx, char* pPacket, int PacketSize, 
-                                                                 DtFractionInt  Duration);
-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
-
-// Receiver 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
-
-// Single Frequency Network status andd error flags
-#define DTAPI_SFN_IN_SYNC           0x0001
-#define DTAPI_SFN_TOO_EARLY_ERR     0x0001
-#define DTAPI_SFN_TOO_LATE_ERR      0x0002
-#define DTAPI_SFN_ABSTIME_ERR       0x0004
-#define DTAPI_SFN_DISCTIME_ERR      0x0008
-#define DTAPI_SFN_NOTIME_ERR        0x0010
-#define DTAPI_SFN_START_ERR         0x0020
-
-// Single Frequency operation mode
-#define DTAPI_SFN_MODE_DISABLED     0x0000
-#define DTAPI_SFN_MODE_AT_1PPS      0x0001
-#define DTAPI_SFN_MODE_IQPCK        0x0002
-#define DTAPI_SFN_MODE_DVBT_MIP     0x0003
-#define DTAPI_SFN_MODE_T2MI         0x0004
-
-// Transmit status flags
-#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_ATSC3             69           // ATSC 3.0
-#define DTAPI_MOD_ISDBS3            70           // ISDB-S3
-#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_NONE      0x00300000   // Interleaver mode none (non-standard)
-#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 - ISDB-S - Input stream
-#define DTAPI_MOD_ISDBS_STREAMTYPE_RAW   0x00    // Raw stream with TMCC in sync bytes
-#define DTAPI_MOD_ISDBS_STREAMTYPE_B15   0x01    // TMCC data following each TS packet
-#define DTAPI_MOD_ISDBS_STREAMTYPE_AUTO  0x07    // Default (raw) isdb-s input stream
-#define DTAPI_MOD_ISDBS_STREAMTYPE_MASK  0x07    // Mask for input stream type
-
-// 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_PCKD        0x00000002   // IQ-samples are already packed
-#define DTAPI_MOD_IQPCK_12B         0x00000003   // IQ-samples packed in 12-bit
-#define DTAPI_MOD_IQPCK_10B         0x00000004   // 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) and
-//                         Low pass filters 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_3         0x00000200   // 3% roll-off for ISDB-S3
-#define DTAPI_MOD_ROLLOFF_5         0x00000300   // 5% roll-off for DVB-S2X
-#define DTAPI_MOD_ROLLOFF_10        0x00000400   // 10% roll-off for DVB-S2X
-#define DTAPI_MOD_ROLLOFF_15        0x00000500   // 15% roll-off for DVB-S2X
-#define DTAPI_MOD_ROLLOFF_20        0x00000600   // 20% roll-off for DVB-S2
-#define DTAPI_MOD_ROLLOFF_25        0x00000700   // 25% roll-off for DVB-S2
-#define DTAPI_MOD_ROLLOFF_35        0x00000800   // 35% roll-off for DVB-S/S2
-// Pre-defined low pass filters
-#define DTAPI_MOD_LPF_0_614         0x00000900   // Passband up to samplerate*0.614,
-                                                 // used for 2MHz CMMB
-#define DTAPI_MOD_LPF_0_686         0x00000A00   // Passband up to samplerate*0.686,
-                                                 // used for ISDB-T/Tmm/Tsb
-#define DTAPI_MOD_LPF_0_754         0x00000B00   // Passband up to samplerate*0.754,
-                                                 // used for 8MHz CMMB, DAB
-#define DTAPI_MOD_LPF_0_833         0x00000C00   // Passband up to samplerate*0.833,
-                                                 // used for DVB-C2/T/T2
-#define DTAPI_MOD_LPF_0_850         0x00000D00   // Passband up to samplerate*0.850,
-                                                 // used for DVB-T2 extended bandwidth and
-                                                 // ATSC 3.0
-#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
-
-
-//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- class DtAvInputStatus -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
-//
-class DtAvInputStatus
-{
-public:
-    DtAvInputStatus();
-    virtual ~DtAvInputStatus();
-private:
-    // No implementation is provided for the copy constructor
-    DtAvInputStatus(const DtAvInputStatus&);
-    DtAvInputStatus&  operator = (const DtAvInputStatus&);
-
-public:
-    DtHwFuncDesc  m_HwFuncDesc;     // Hardware function descriptor
-
-                                    // Convenience functions
-public:
-    int  Category()             { return m_HwFuncDesc.m_DvcDesc.m_Category; }
-    int  FirmwareVersion()      { return m_HwFuncDesc.m_DvcDesc.m_FirmwareVersion; }
-    bool  IsAttached()          { return m_pInp != NULL; }
-    int  TypeNumber()           { 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);
-    DTAPI_RESULT  Detach();
-    DTAPI_RESULT  DetectVidStd(DtDetVidStd& Info);
-    DTAPI_RESULT  GetAudChanStatus(std::vector<DtAudChanStatus>& AudChns);
-    DTAPI_RESULT  GetDolbyMetadata(std::vector<DtRdd6Data>& Metadata);
-
-    // Encapsulated data
-private:
-    void*  m_pDetachLockCount;
-    AvInputStatus*  m_pInp;
-
-    // Private helper functions
-private:
-    DTAPI_RESULT  DetachLock();
-    DTAPI_RESULT  DetachUnlock();
-};
-
-//+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+ 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_TS             0
-#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_1080P29_97     DTAPI_IOCONFIG_1080P29_97
-#define DTAPI_VIDSTD_1080P30        DTAPI_IOCONFIG_1080P30
-#define DTAPI_VIDSTD_1080PSF23_98   DTAPI_IOCONFIG_1080PSF23_98
-#define DTAPI_VIDSTD_1080PSF24      DTAPI_IOCONFIG_1080PSF24
-#define DTAPI_VIDSTD_1080PSF25      DTAPI_IOCONFIG_1080PSF25
-#define DTAPI_VIDSTD_1080PSF29_97   DTAPI_IOCONFIG_1080PSF29_97
-#define DTAPI_VIDSTD_1080PSF30      DTAPI_IOCONFIG_1080PSF30
-#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_1080P50B       DTAPI_IOCONFIG_1080P50B
-#define DTAPI_VIDSTD_1080P59_94     DTAPI_IOCONFIG_1080P59_94
-#define DTAPI_VIDSTD_1080P59_94B    DTAPI_IOCONFIG_1080P59_94B
-#define DTAPI_VIDSTD_1080P60        DTAPI_IOCONFIG_1080P60
-#define DTAPI_VIDSTD_1080P60B       DTAPI_IOCONFIG_1080P60B
-#define DTAPI_VIDSTD_2160P50        DTAPI_IOCONFIG_2160P50
-#define DTAPI_VIDSTD_2160P50B       DTAPI_IOCONFIG_2160P50B
-#define DTAPI_VIDSTD_2160P59_94     DTAPI_IOCONFIG_2160P59_94
-#define DTAPI_VIDSTD_2160P59_94B    DTAPI_IOCONFIG_2160P59_94B
-#define DTAPI_VIDSTD_2160P60        DTAPI_IOCONFIG_2160P60
-#define DTAPI_VIDSTD_2160P60B       DTAPI_IOCONFIG_2160P60B
-#define DTAPI_VIDSTD_2160P23_98     DTAPI_IOCONFIG_2160P23_98
-#define DTAPI_VIDSTD_2160P24        DTAPI_IOCONFIG_2160P24
-#define DTAPI_VIDSTD_2160P25        DTAPI_IOCONFIG_2160P25
-#define DTAPI_VIDSTD_2160P29_97     DTAPI_IOCONFIG_2160P29_97
-#define DTAPI_VIDSTD_2160P30        DTAPI_IOCONFIG_2160P30
-
-
-// The video standards above map 1-to-1 to an IOConfig value. The video formats below
-// are used for multi-link video standards. Start at a high value to make sure there
-// is no overlap.
-#define DTAPI_VIDSTD_BASE           1000
-#define DTAPI_VIDSTD_480P59_94      (DTAPI_VIDSTD_BASE + 0)
-#define DTAPI_VIDSTD_525P59_94      (DTAPI_VIDSTD_BASE + 1)
-#define DTAPI_VIDSTD_625P50         (DTAPI_VIDSTD_BASE + 2)
-
-// Video link standards.
-#define DTAPI_VIDLNK_4K_SMPTE425    0            // 4K mapping according to SMPTE 425
-#define DTAPI_VIDLNK_4K_SMPTE425B   1            // 4K mapping acc. to SMPTE 425 annex B
-#define DTAPI_VIDLNK_4K_SMPTE2081   2            // 4K over one 6G port
-#define DTAPI_VIDLNK_4K_SMPTE2082   3            // 4K over one 12G port
-
-// 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_0           0x01
-#define DTAPI_SDI_LUM_0             0x02
-#define DTAPI_SDI_CHROM_1           0x04
-#define DTAPI_SDI_LUM_1             0x08
-#define DTAPI_SDI_CHROM_MASK        (DTAPI_SDI_CHROM_0 | DTAPI_SDI_CHROM_1)
-#define DTAPI_SDI_LUM_MASK          (DTAPI_SDI_LUM_0 | DTAPI_SDI_LUM_1)
-#define DTAPI_SDI_STREAM_MASK       (DTAPI_SDI_CHROM_MASK | DTAPI_SDI_LUM_MASK)
-// Old names
-#define DTAPI_SDI_CHROM             DTAPI_SDI_CHROM_0
-#define DTAPI_SDI_LUM               DTAPI_SDI_LUM_0
-
-// 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
-    int  m_Line;                    // Line number in which packet was found
-
-    // 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, PT_ANC2 };
-
-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; } 
-
-    virtual DtFrameBufTrPars*  Clone() = 0;
-
-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();
-
-    DtFrameBufTrParsVideo*  Clone();
-
-public:
-    int  m_Field;               // Field to transfer (DTAPI_SDI_FIELD*)
-    int  m_Scaling;             // Scaling mode (DTAPI_SCALING_*)
-    int  m_Stride;              // -1 means no stride
-    int  m_SymFlt;              // Symbol filter mode (DTAPI_SYMFLT_*)
-};
-
-//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtFrameBufTrParsAnc -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
-//
-class DtFrameBufTrParsAnc : public DtFrameBufTrPars
-{
-public:
-    DtFrameBufTrParsAnc(int  HancVanc, int  AncFlt=DTAPI_ANCFLT_OFF);
-    virtual ~DtFrameBufTrParsAnc();
-
-    DtFrameBufTrParsAnc*  Clone();
-
-public:
-    int  m_HancVanc;            // HANC or VANC
-    int  m_AncFlt;              // Anc filter mode (DTAPI_ANCFLT_*)
-};
-
-//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtFrameBufTrParsRaw -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
-//
-class DtFrameBufTrParsRaw : public DtFrameBufTrPars
-{
-public:
-    DtFrameBufTrParsRaw(int  SymFlt=DTAPI_SYMFLT_ALL, int  Stride=-1);
-    virtual ~DtFrameBufTrParsRaw();
-
-    DtFrameBufTrParsRaw*  Clone();
-
-public:
-    int  m_SymFlt;              // Symbol filter mode
-    int  m_Stride;              // -1 means no stride
-};
-
-//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- 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  Status24,
-                                                          int  Channels, int  AudioGroup);
-    // Old declaration of the AncAddPacket function. The AncPacket class has been extended
-    // with a new m_Line member.
-    DTAPI_DEPRECATED(virtual DTAPI_RESULT  AncAddPacket(__int64 Frame,
-                                                     AncPacket&  AncPacket,
-                                                     int Line, int HancVanc, int Stream),
-                     "Deprecated (will be removed!): use overloaded AncAddPacket without "
-                     "line argument, use AncPacket::m_Line instead");
-    virtual DTAPI_RESULT  AncAddPacket(__int64 Frame, AncPacket&  AncPacket,
-                                                                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
-};
-
-//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- 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_OK_PENDING            2
-#define DTAPI_OK_PARTIAL_DEV        3
-#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)
-#define DTAPI_E_SFN_NOT_SUPPORTED   (DTAPI_E + 196)
-#define DTAPI_E_SFN_INVALID_MODE    (DTAPI_E + 197)
-#define DTAPI_E_SFN_INVALID_OFFSET  (DTAPI_E + 198)
-#define DTAPI_E_SFN_DISABLED        (DTAPI_E + 199)
-#define DTAPI_E_SFN_INVALID_TIMEDIFF (DTAPI_E + 200)
-#define DTAPI_E_NO_GPSCLKREF        (DTAPI_E + 201)
-#define DTAPI_E_NO_GPSSYNC          (DTAPI_E + 202)
-#define DTAPI_E_INVALID_PROFILE     (DTAPI_E + 203)
-#define DTAPI_E_INVALID_LINKSTD     (DTAPI_E + 204)
-#define DTAPI_E_FRAMERATE_MISMATCH  (DTAPI_E + 205)
-#define DTAPI_E_CID_INVALID_ID      (DTAPI_E + 206)
-#define DTAPI_E_CID_INVALID_INFO    (DTAPI_E + 207)
-#define DTAPI_E_CID_INVALID_FORMAT  (DTAPI_E + 208)
-#define DTAPI_E_CID_NOT_SUPPORTED   (DTAPI_E + 209)
-#define DTAPI_E_INVALID_SAMPRATE    (DTAPI_E + 210)
-#define DTAPI_E_MULTIMOD_UNSUP      (DTAPI_E + 211)
-#define DTAPI_E_NUM_CHAN            (DTAPI_E + 212)
-#define DTAPI_E_INVALID_TIME        (DTAPI_E + 213)
-#define DTAPI_E_INVALID_LINK        (DTAPI_E + 214)
-#define DTAPI_E_TUNING              (DTAPI_E + 215)
-#define DTAPI_E_BUSY                (DTAPI_E + 216)
-#define DTAPI_E_ENC_TYPE_NOTSET     (DTAPI_E + 217)
-#define DTAPI_E_INITIALIZING        (DTAPI_E + 218)
-#define DTAPI_E_INVALID_ENC_TYPE    (DTAPI_E + 219)
-#define DTAPI_E_LICENSE             (DTAPI_E + 220)
-#define DTAPI_E_NO_ENCODER          (DTAPI_E + 221)
-#define DTAPI_E_NO_POWER            (DTAPI_E + 222)
-#define DTAPI_E_PASSTHROUGH_INV     (DTAPI_E + 223)
-#define DTAPI_E_PASSTHROUGH_ONLY    (DTAPI_E + 224)
-#define DTAPI_E_RX_RATE_OVF         (DTAPI_E + 225)
-#define DTAPI_E_IN_ERROR_STATE      (DTAPI_E + 226)
-#define DTAPI_E_XML_SYNTAX          (DTAPI_E + 227)
-#define DTAPI_E_XML_ELEM            (DTAPI_E + 228)
-#define DTAPI_E_FAN_FAIL            (DTAPI_E + 229)
-#define DTAPI_E_RESTART_REQD        (DTAPI_E + 230)
-#define DTAPI_E_TOO_MANY_SEGM       (DTAPI_E + 231)
-#define DTAPI_E_FILE_OPEN           (DTAPI_E + 232)
-#define DTAPI_E_INVALID_EAS         (DTAPI_E + 233)
-#define DTAPI_E_INVALID_CRED        (DTAPI_E + 234)
-#define DTAPI_E_INVALID_PARITY      (DTAPI_E + 235)
-#define DTAPI_E_INVALID_PAPR        (DTAPI_E + 236)
-#define DTAPI_E_INVALID_FRAMEMODE   (DTAPI_E + 237)
-#define DTAPI_E_INVALID_FRAMELENGTH (DTAPI_E + 238)
-#define DTAPI_E_NUM_SUBFRAMES       (DTAPI_E + 239)
-#define DTAPI_E_PILOT_BOOST         (DTAPI_E + 240)
-#define DTAPI_E_NUM_SYMBOLS         (DTAPI_E + 241)
-#define DTAPI_E_INVALID_LAYER       (DTAPI_E + 242)
-#define DTAPI_E_INVALID_CODERATE    (DTAPI_E + 243)
-#define DTAPI_E_INVALID_FECTYPE     (DTAPI_E + 244)
-#define DTAPI_E_INVALID_NUM_INPUTS  (DTAPI_E + 245)
-#define DTAPI_E_INVALID_VERSION     (DTAPI_E + 246)
-#define DTAPI_E_INVALID_LDM_LEVEL   (DTAPI_E + 247)
-#define DTAPI_E_INVALID_MISO        (DTAPI_E + 248)
-#define DTAPI_E_INVALID_PLP_TYPE    (DTAPI_E + 249)
-#define DTAPI_E_NUM_SUBSLICES       (DTAPI_E + 250)
-#define DTAPI_E_SUBSLICE_INTERVAL   (DTAPI_E + 251)
-#define DTAPI_E_INVALID_HTI_PARS    (DTAPI_E + 252)
-#define DTAPI_E_PREAMBLE_PAR_COMBI  (DTAPI_E + 253)
-#define DTAPI_E_INVALID_PLP_SIZE    (DTAPI_E + 254)
-#define DTAPI_E_INVALID_PLP_START   (DTAPI_E + 255)
-#define DTAPI_E_INVALID_PLP_REF     (DTAPI_E + 256)
-#define DTAPI_E_INVALID_TXID_INJ    (DTAPI_E + 257)
-#define DTAPI_E_INVALID_TXID        (DTAPI_E + 258)
-#define DTAPI_E_INVALID_BSID        (DTAPI_E + 259)
-#define DTAPI_E_INVALID_BONDING     (DTAPI_E + 260)
-
-//+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=
-//=+=+=+=+=+=+=+=+ 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_SdtLoopData168;
-
-public:
-    // Methods
-    void  Init(void);
-
-    // Operators
-    bool  operator == (DtBigTsSplitPars& TsSplitPars);
-    bool  operator != (DtBigTsSplitPars& TsSplitPars);
-    bool  IsEqual(DtBigTsSplitPars& TsSplitPars);
-};
-
-struct DtPlpInpPars
-{
-    // PLP input data types
-    enum InDataType 
-    {
-        TS188,                      // 188-byte TS packets 
-        TS204,                      // 204-byte TS packets
-        GSE,                        // Generic Stream Encapsulation
-        ALP,                        // ATSC 3.0 Link-layer Protocol packets
-        TLVIS3                      // TLV-packets; used for ISDB-S3 5810 byte packets
-    };
-
-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, TS204 byte, GSE or ALP packets
-    DtBigTsSplitPars  m_BigTsSplit; // Big TS splitting (optional)
-
-public:
-    // Methods
-    void  Init(int Idx=0, InDataType DataType=TS188);
-
-    // Operators
-    bool  operator == (DtPlpInpPars& PlpInPars);
-    bool  operator != (DtPlpInpPars& PlpInPars);
-    bool  IsEqual(DtPlpInpPars& PlpInPars);
-
-    // Serialization
-    DTAPI_RESULT  FromXml(const std::wstring& XmlString, const std::wstring& Root); 
-    DTAPI_RESULT  ToXml(const std::wstring& Root, std::wstring& XmlString);
-};
-
-// 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);
-
-//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtQamStreamSelPars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
-//
-// This structure specifies the selection parameters for a QAM transport stream
-//
-struct DtQamStreamSelPars
-{
-    // No selection parameters yet
-};
-
-//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- 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);
-    // Serialisation
-    DTAPI_RESULT  FromXml(const std::wstring& XmlString, const std::wstring& Root); 
-    DTAPI_RESULT  ToXml(const std::wstring& Root, std::wstring& XmlString);
-};
-
-//+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+ ATSC 3.0 Parameters +=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=
-
-// Maxima
-#define DTAPI_ATSC3_NUM_PLP_MAX     64          // Maximum number of PLPs
-#define DTAPI_ATSC3_NUM_RF_MAX      7           // Maximum number of RF output signals
-// PLP IDs
-#define DTAPI_ATSC3_PLP_ID_AUTO     -2          // Automatic PLP selection
-// Bandwidth
-#define DTAPI_ATSC3_6MHZ            0           // 6 MHz
-#define DTAPI_ATSC3_7MHZ            1           // 7 MHz
-#define DTAPI_ATSC3_8MHZ            2           // 8 MHz
-#define DTAPI_ATSC3_GT8MHZ          3           // Greater than 8 MHz
-// Guard interval
-#define DTAPI_ATSC3_GI_1_192        1           // GI1_192 
-#define DTAPI_ATSC3_GI_2_384        2           // GI3_384
-#define DTAPI_ATSC3_GI_3_512        3           // GI3_512
-#define DTAPI_ATSC3_GI_4_768        4           // GI4_768
-#define DTAPI_ATSC3_GI_5_1024       5           // GI5_1024
-#define DTAPI_ATSC3_GI_6_1536       6           // GI6_1536   
-#define DTAPI_ATSC3_GI_7_2048       7           // GI7_2048 
-#define DTAPI_ATSC3_GI_8_2432       8           // GI8_2432 
-#define DTAPI_ATSC3_GI_9_3072       9           // GI9_3072 
-#define DTAPI_ATSC3_GI_10_3648      10          // GI10_3648
-#define DTAPI_ATSC3_GI_11_4096      11          // GI11_4096
-#define DTAPI_ATSC3_GI_12_4864      12          // GI12_4864
-// Scattered pilot patterns for SISO and MIMO
-#define DTAPI_ATSC3_PP_3_2          0           // SP3_2 / MP3_2
-#define DTAPI_ATSC3_PP_3_4          1           // SP3_4 / MP3_4    
-#define DTAPI_ATSC3_PP_4_2          2           // SP4_2 / MP4_2  
-#define DTAPI_ATSC3_PP_4_4          3           // SP4_4 / MP4_4  
-#define DTAPI_ATSC3_PP_6_2          4           // SP6_2 / MP6_2  
-#define DTAPI_ATSC3_PP_6_4          5           // SP6_4 / MP6_4  
-#define DTAPI_ATSC3_PP_8_2          6           // SP8_2 / MP8_2  
-#define DTAPI_ATSC3_PP_8_4          7           // SP8_4 / MP8_4  
-#define DTAPI_ATSC3_PP_12_2         8           // SP12_2 / MP12_2  
-#define DTAPI_ATSC3_PP_12_4         9           // SP12_4 / MP12_4  
-#define DTAPI_ATSC3_PP_16_2         10          // SP16_2 / MP16_2  
-#define DTAPI_ATSC3_PP_16_4         11          // SP16_4 / MP16_4  
-#define DTAPI_ATSC3_PP_24_2         12          // SP24_2 / MP24_2  
-#define DTAPI_ATSC3_PP_24_4         13          // SP24_4 / MP24_4  
-#define DTAPI_ATSC3_PP_32_2         14          // SP32_2 / MP32_2  
-#define DTAPI_ATSC3_PP_32_4         15          // SP32_4 / MP32_4  
-// Preamble pilot
-#define DTAPI_ATSC3_PP_DX_3         0           // DX=3
-#define DTAPI_ATSC3_PP_DX_4         1           // DX=4
-#define DTAPI_ATSC3_PP_DX_6         2           // DX=6
-#define DTAPI_ATSC3_PP_DX_8         3           // DX=8
-#define DTAPI_ATSC3_PP_DX_12        4           // DX=12
-#define DTAPI_ATSC3_PP_DX_16        5           // DX=16
-#define DTAPI_ATSC3_PP_DX_24        6           // DX=24
-#define DTAPI_ATSC3_PP_DX_32        7           // DX=32
-// Modulation - constellation
-#define DTAPI_ATSC3_QPSK            0           // QPSK
-#define DTAPI_ATSC3_QAM16           1           // 16-QAM
-#define DTAPI_ATSC3_QAM64           2           // 64-QAM
-#define DTAPI_ATSC3_QAM256          3           // 256-QAM
-#define DTAPI_ATSC3_QAM1024         4           // 1024-QAM
-#define DTAPI_ATSC3_QAM4096         5           // 4096-QAM
-// Code rate
-#define DTAPI_ATSC3_COD_2_15        0           // 2/15 
-#define DTAPI_ATSC3_COD_3_15        1           // 3/15 
-#define DTAPI_ATSC3_COD_4_15        2           // 4/15 
-#define DTAPI_ATSC3_COD_5_15        3           // 5/15 
-#define DTAPI_ATSC3_COD_6_15        4           // 6/15 
-#define DTAPI_ATSC3_COD_7_15        5           // 7/15 
-#define DTAPI_ATSC3_COD_8_15        6           // 8/15 
-#define DTAPI_ATSC3_COD_9_15        7           // 9/15 
-#define DTAPI_ATSC3_COD_10_15       8           // 10/15
-#define DTAPI_ATSC3_COD_11_15       9           // 11/15
-#define DTAPI_ATSC3_COD_12_15       10          // 12/15
-#define DTAPI_ATSC3_COD_13_15       11          // 13/15
-
-// PLP FEC type 
-// Inner code
-#define DTAPI_ATSC3_LDPC_16K        0           // 16K LDPC
-#define DTAPI_ATSC3_LDPC_64K        1           // 64K LDPC
-// Outer code
-#define DTAPI_ATSC3_OUTER_BCH       0           // BCH
-#define DTAPI_ATSC3_OUTER_CRC       1           // CRC
-#define DTAPI_ATSC3_OUTER_NONE      2           // None
-
-// ATSC 3.0 Layer
-#define DTAPI_ATSC3_LAYER_CORE      0           // Core layer
-#define DTAPI_ATSC3_LAYER_ENHANCED  1           // Enhanced layer
-// Time interleaving mode
-#define DTAPI_ATSC3_TIMODE_NONE     0           // No time interleaving mode
-#define DTAPI_ATSC3_TIMODE_CTI      1           // Convolutional time interleaving 
-#define DTAPI_ATSC3_TIMODE_HTI      2           // Hybrid time interleaving 
-// PLP-type
-#define DTAPI_ATSC3_PLPTYPE_NONDISP 0           // Non-dispersed PLP-type
-#define DTAPI_ATSC3_PLPTYPE_DISP    1           // Dispersed PLP-type
-// Convolutional time interleaver depth
-#define DTAPI_ATSC3_CTIDEPTH_512    0           // 512 rows
-#define DTAPI_ATSC3_CTIDEPTH_724    1           // 724 rows
-#define DTAPI_ATSC3_CTIDEPTH_887    2           // 887 rows or 1254 if extended IL
-#define DTAPI_ATSC3_CTIDEPTH_1024   3           // 1024 rows or 1448 if extended IL
-// MISO
-#define DTAPI_ATSC3_MISO_NONE       0           // No MISO
-#define DTAPI_ATSC3_MISO_64         1           // MISO with 64 coefficients
-#define DTAPI_ATSC3_MISO_256        2           // MISO with 256 coefficients
-// FFT size
-#define DTAPI_ATSC3_FFT_8K          0           // 8K FFT
-#define DTAPI_ATSC3_FFT_16K         1           // 16K FFT
-#define DTAPI_ATSC3_FFT_32K         2           // 32K FFT
-// TXID injection level
-#define DTAPI_ATSC3_TXID_INJ_OFF    0           // Tx-ID injection off
-#define DTAPI_ATSC3_TXID_INJ_45DB   1           // Tx-ID injection 45dB below preamble
-#define DTAPI_ATSC3_TXID_INJ_42DB   2           // Tx-ID injection 42dB below preamble
-#define DTAPI_ATSC3_TXID_INJ_39DB   3           // Tx-ID injection 39dB below preamble
-#define DTAPI_ATSC3_TXID_INJ_36DB   4           // Tx-ID injection 36dB below preamble
-#define DTAPI_ATSC3_TXID_INJ_33DB   5           // Tx-ID injection 33dB below preamble
-#define DTAPI_ATSC3_TXID_INJ_30DB   6           // Tx-ID injection 30dB below preamble
-#define DTAPI_ATSC3_TXID_INJ_27DB   7           // Tx-ID injection 27dB below preamble
-#define DTAPI_ATSC3_TXID_INJ_24DB   8           // Tx-ID injection 24dB below preamble
-#define DTAPI_ATSC3_TXID_INJ_21DB   9           // Tx-ID injection 21dB below preamble
-#define DTAPI_ATSC3_TXID_INJ_18DB   10          // Tx-ID injection 18dB below preamble
-#define DTAPI_ATSC3_TXID_INJ_15DB   11          // Tx-ID injection 15dB below preamble
-#define DTAPI_ATSC3_TXID_INJ_12DB   12          // Tx-ID injection 12dB below preamble
-#define DTAPI_ATSC3_TXID_INJ_9DB    13          // Tx-ID injection 9dB below preamble
-// PAPR - Peak to Average Power Reduction
-#define DTAPI_ATSC3_PAPR_NONE       0           // None
-#define DTAPI_ATSC3_PAPR_TR         1           // TR - PAPR using reserved carriers
-#define DTAPI_ATSC3_PAPR_ACE        2           // ACE - Active Constellation Extension
-#define DTAPI_ATSC3_PAPR_ACE_TR     3           // ACE and TR
-// Time information flag
-#define DTAPI_ATSC3_TIME_NONE       0           // No time information
-#define DTAPI_ATSC3_TIME_MS         1           // Time information with ms precision
-#define DTAPI_ATSC3_TIME_US         2           // Time information with us precision
-#define DTAPI_ATSC3_TIME_NS         3           // Time information with ns precision
-// Frame length mode
-#define DTAPI_ATSC3_ALIGN_TIME      0           // Frame length is time-aligned 
-#define DTAPI_ATSC3_ALIGN_SYMBOL    1           // Frame length is symbol-aligned 
-
-//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-. DtAtscStreamSelPars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
-//
-// This structure specifies the selection parameters for an ATSC stream
-//
-struct DtAtscStreamSelPars
-{
-    // No selection parameters yet
-};
-
-//+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+ ATSC 3.0 Modulation  +=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+
-
-// ATSC 3.0  Test points
-enum {
-    DTAPI_ATSC3_TP04,   // Before baseband framer
-    DTAPI_ATSC3_TP05,   // After baseband framer
-    DTAPI_ATSC3_TP06,   // After scrambler
-    DTAPI_ATSC3_TP07,   // After BCH
-    DTAPI_ATSC3_TP08,   // After LDPC
-    DTAPI_ATSC3_TP09,   // After bit interleaver
-    DTAPI_ATSC3_TP10,   // After QAM mapper
-    DTAPI_ATSC3_TP14,   // After time interleaver
-    DTAPI_ATSC3_TP15,   // After framing
-    DTAPI_ATSC3_TP21,   // After pilot and data framer
-    DTAPI_ATSC3_TP22,   // After MISO
-    DTAPI_ATSC3_TP26,   // Final
-
-    DTAPI_ATSC3_TP30,   // L1 static data
-    DTAPI_ATSC3_TP31,   // After scrambling
-    DTAPI_ATSC3_TP32,   // After BCH
-    DTAPI_ATSC3_TP34,   // After LDPC
-    DTAPI_ATSC3_TP37,   // After zero removal
-    DTAPI_ATSC3_TP39,   // After mapper
-
-    DTAPI_ATSC3_TP40,   // L1 dynamic data
-    DTAPI_ATSC3_TP42,   // After scrambling
-    DTAPI_ATSC3_TP43,   // After BCH
-    DTAPI_ATSC3_TP45,   // After LDPC
-    DTAPI_ATSC3_TP48,   // After zero removal
-    DTAPI_ATSC3_TP50,   // After mapper
-
-    DTAPI_ATSC3_TP_COUNT,
-};
-
-// ATSC 3 test points
-extern const int DTAPI_ATSC3_TESTPOINTSDTAPI_ATSC3_TP_COUNT;
-
-
-//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtAtsc3PlpPars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
-//
-// Class for specifying the PLP parameters
-//
-class DtAtsc3PlpPars
-{
-public:
-    int  m_Id;                  // PLP-ID: 0..63
-    bool  m_LlsFlag;            // PLP carries LLS signaling
-    int  m_Layer;               // Core/Enhanced layer: DTAPI_ATSC3_LAYER_x
-    int  m_Modulation;          // Modulation, see DTAPI_ATSC3_QAMx
-    int  m_CodeRate;            // Code rate, see DTAPI_ATSC3_COD_x
-    int  m_FecCodeLength;       // FEC LDPC code length, see DTAPI_ATSC3_LDPC_x   
-    int  m_FecOuterCode;        // FEC outer code type, see DTAPI_ATSC3_OUTER_x  
-    int  m_LdmInjectLevel;      // LDM injection level (only used in enhanced layer)
-                                // value <  10  gives injection level of -value/2.0 dB
-                                // value >= 10  gives injection level of 5.0-value dB
-    bool  m_BbFrameCounter;     // Enable BB-frame counter
-
-    // Folowing parameters are only used in core layer
-    int  m_PlpType;             // L1D_plp_type; PLP-type, see DTAPI_ATSC3_PLPTYPE_x
-    int  m_NumSubslices;        // Number of subslices: 1...16384, if PlpType is dispersed
-    int  m_SubsliceInterval;    // Interval: 1.. 2^24-1, if PlpType is dispersed
-    int  m_TiMode;              // Time interleaver mode, see DTAPI_ATSC3_TIMODE_x
-    int  m_CtiDepth;            // Convolutional time interleaver depth, 
-                                // see DTAPI_ATSC3_CTIDEPTH_xx, if TiMode=CTI
-    bool  m_TiExtInterleaving;  // Enable extended interleaving
-
-    // HTI interleaving parameters (only applicable if TiMode=HTI)
-    bool  m_HtiInterSubframe;   // Enable inter-subframe interleaving 
-    int  m_HtiNumTiBlocks;      // If inter-subframe interleaving is disabled: the
-                                // number of TI blocks per interleaving frame.
-                                // If inter-subframe interleaving is enabled:
-                                // the number of subframes over which cells from 
-                                // one TI block are carried. Range: 1..16
-    int  m_HtiNumFecBlocksMax;  // The maximum number of FEC blocks per interleaving frame
-                                // for the current PLP: 1..4096
-    bool  m_HtiCellInterleaver; // Enable the cell-interleaver
-
-    // Channel bonding (only signaliing)
-    int  m_NumChannelBonded;    // Number of frequencies, not including the present 
-                                // channel, involved in channel bonding of this PLP:
-                                // 0..m_NumRf
-    int  m_BondedRfIdDTAPI_ATSC3_NUM_RF_MAX+1;  // The RF-id(s) that are used for
-                                // channel bonding with this PLP
-
-    // Scheduling parameters
-    int  m_CoreLayerPlpId;      // If enhanced layer, the PLP ID of the corresponding 
-                                // core layer. Currently the enhanced layer is scheduled
-                                // with the same number of cells as the core layer.
-    int  m_HtiNumFecBlocks;     // Used when TiMode = HTI and core layer.
-                                // The number of FEC blocks per subframe, 
-                                // range: 1..m_HtiNumFecBlocksMax 
-    int  m_PlpSize;             // For core layer: used when TiMode = NONE or CTI. 
-                                // The number of cells per subframe, -1 means to use the
-                                // full subframe.
-                                // For enhanced layer: -1 means the complete size of the
-                                // first core PLP (identified by m_CoreLayerPlpId).
-                                // Otherwise it is the number of cells of the 
-                                // enhanced layer PLP.
-    int  m_PlpStart;            // If -1, plp_start is automatically set by allocating
-                                // PLPs by increasing PLP index assuming each PLP uses
-                                // m_PlpSize cells (plp_type=non-dispersed) or
-                                // ceil(m_PlpSize/m_NumSubslices) cells
-                                // (plp_type=dispersed). 
-                                // For complex FDM allocations the previous automatic
-                                // algorithm is not sufficient so m_PlpStart must be set
-                                // manually. 
-                                // For  enhanced layer: It is defined as the starting 
-                                // cell counting from the start of core PLP 
-                                // (identified by m_CoreLayerPlpId).                           
-public:
-    DtAtsc3PlpPars();
-    void  Init(int PlpId = 0);
-    bool  IsEqual(DtAtsc3PlpPars& PlpPars);
-    bool  operator == (DtAtsc3PlpPars& PlpPars);
-    bool  operator != (DtAtsc3PlpPars& PlpPars);
-};
-
-//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtAtsc3SubframePars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
-//
-// Class for specifying the subframe parameters
-//
-class DtAtsc3SubframePars
-{
-public:
-    int  m_Miso;                // MISO type, see DTAPI_ATSC3_MISO_x 
-    int  m_MisoNumTx;           // Number of MISO transmitters: 2, 3 or 4
-    int  m_MisoTxIndex;         // MISO tranmitter index, range: 0..m_MisoNumTx-1
-    int  m_FftSize;             // FFT-size, see DTAPI_ATSC3_FFT_x
-    int  m_ReducedCarriers;     // Carrier reduction coefficient, range 0..4
-    int  m_GuardInterval;       // Guard interval see DTAPI_ATSC3_GI_x
-    int  m_PilotPattern;        // Pilot pattern, see DTAPI_ATSC3_PP_x
-    int   m_PilotBoost;         // Pilot power boost: 0..4 
-    bool  m_SbsFirst;           // First symbol of the subframe is a 
-                                // subframe boundary symbol
-    bool  m_SbsLast;            // Last symbol of the subframe is a 
-                                // subframe boundary symbol
-    int  m_NumOfdmSymbols;      // Number of payload OFDM symbols including 
-                                // first and last boundary symbols
-    bool  m_FreqInterleaver;    // Enable frequency interleaver
-    // PLPs 
-    std::vector<DtAtsc3PlpPars>  m_Plps;   
-public:
-    DtAtsc3SubframePars();
-    void  Init();
-    bool  IsEqual(DtAtsc3SubframePars& SubframePars);
-    bool  operator == (DtAtsc3SubframePars& SubframePars);
-    bool  operator != (DtAtsc3SubframePars& SubframePars);
-};
-
-//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtAtsc3Pars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
-//
-// Class for specifying the ATSC 3.0 modulation parameters
-//
-class DtAtsc3Pars
-{
-public:
-    // System parameters
-    int  m_Bandwidth;           // Bandwidth
-    
-    // Bootstrap parameters
-    int  m_MinorVersion;        // Bootstrap minor version 0..7
-    int  m_EasWakeup;           // Emergency alert wake up field, 0..3
-    
-    // Preamble (L1-Basic and L1-Detail) parameters 
-    int  m_PreambleFftSize;     // Preamble FFT size see DTAPI_ATSC3_FFT_x
-    int  m_PreambleGuardInterval; // Preamble guard interval, see See DTAPI_ATSC3_GI_x
-    int  m_PreamblePilotDx;     // Preamble pilot pattern Dx, see DTAPI_ATSC3_PP_DX_x
-    int  m_PreambleReducedCarriers; // Preamble carrier reduction coefficient, range 0..4
-    int  m_L1BasicFecMode;      // L1-Basic FEC-type mode 1..7
-    int  m_L1DetailFecMode;     // L1 Detail FEC-type mode: 1..7
-    int  m_L1DetailAddParity;   // L1-Detail aditional parity mode K: 0, 1 or 2
-    int  m_L1DetailVersion;     // L1-Detail version 0 or 1
-
-    int  m_TxIdInjectLevelCode; // Tx-ID injection level see DTAPI_ATSC3_TXIDLVL_xx
-    int  m_TxIdAddress;         // Tx-ID address: 0..8191
-  
-    // Time information seconds elapsed since the PTP epoch on 1st January 1970
-    int   m_TimeInfoFlag;       // Generation of time information: None, Millisecond, 
-                                // Microsecond, Nanosecond precission, 
-                                // see DTAPI_ATSC3_TIME_x
-    int  m_TimeSeconds;         // Initial seconds component
-    int  m_TimeNanoseconds;     // Initial nanoseconds component
-    bool  m_LlsFlag;            // One or more PLPs carry low level signaling
-    int  m_Papr;                // PAPR mode, see DTAPI_ATSC3_PAPR_x
-
-    // Frame parameters
-    int  m_FrameLengthMode;     // Frame length mode,time or frame aligned see
-                                // DTAPI_ATSC3_ALIGN_x
-    int  m_FrameLength;         // If the frame length mode is time aligned 
-                                // the framelength in units of 5ms
-
-    // Channel bonding
-    int  m_NumRf;               // Number of frequencies involved in channel
-                                // bonding
-    int  m_BondedBsIdDTAPI_ATSC3_NUM_RF_MAX; 
-                                // Broadcast Stream IDs of the bonded channels
-    int  m_BsId;                // Broadcast Stream ID or -1 if not valid
-
-    // Subframe parameters
-    std::vector<DtAtsc3SubframePars>  m_Subframes; 
-    
-    // PLP input
-    int  m_NumPlpInputs;            // Number of PLPs
-    DtPlpInpPars  m_PlpInputsDTAPI_ATSC3_NUM_PLP_MAX;  // PLP inputs (Optional)
-
-    DtVirtualOutPars  m_VirtOutput; // Virtual Output parameters(Optional) 
-    DtTestPointOutPars  m_TpOutput; // Test point data output parameters (Optional)
-
-public:
-    DtAtsc3Pars();
-    DTAPI_RESULT  CheckValidity(void);
-    DTAPI_RESULT  CheckValidity(int& SubframeIdx, int& PlpIdx);
-    DTAPI_RESULT  GetParamInfo(struct DtAtsc3ParamInfo& Atsc3Info);
-    void Init();
-    void  SetDefaultPars(void);
-    bool  IsEqual(DtAtsc3Pars& Atsc3Pars);
-    bool  operator == (DtAtsc3Pars& Atsc3Pars);
-    bool  operator != (DtAtsc3Pars& Atsc3Pars);
-    // Serialisation
-    DTAPI_RESULT  FromXml(const std::wstring& XmlString); 
-    DTAPI_RESULT  ToXml(std::wstring& XmlString);
-};
-
-//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtAtsc3PlpInfo -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
-//
-struct DtAtsc3PlpInfo
-{
-    int  m_BbFramerate;             // Frame rate in BB-frames per second
-    int  m_PlpBitrate;              // PLP bitrate in bits per second, excluding the
-                                    // bbframe header, assuming a two byte position field.
-};
-
-//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtAtsc3SubframeInfo -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
-//
-struct DtAtsc3SubframeInfo
-{
-    int  m_TotalNumDataCells;       // Total number of data cells available for PLPs
-                                    // including the preamble PLP cells for the first
-                                    // subframe
-    int  m_NumCellsInDataSym;       // Number of cells in data symbols
-    int  m_NumCellsInSbsSym;        // number of cells in SBS symbols
-    std::vector<DtAtsc3PlpInfo> m_Plps;  // PLP information
-};
-
-
-//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtAtsc3ParamInfo -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
-//
-struct DtAtsc3ParamInfo 
-{
-    int  m_L1BasicNumDataCells;     // Number of L1-Basic data cells
-    int  m_L1DetailNumDataCells;    // Number of L1-Detail data cells
-    int  m_L1DetailNumBytes;        // Number of L1-Detail data cells
-    int  m_PreambleNumSymbols;      // Number of preamble symbols
-    int  m_NumCellsInFirstPreamble; // Number of cells in the first preamble symbol
-    int  m_NumCellsInNextPreamble;  // Number of cells in the next preamble symbol
-    int  m_NumPlpCellsInPreambles;  // Number of cells in the preamble available for PLPs
-    int  m_FrameLength;             // Framelength in #samples, including bootstrap
-                                 
-    std::vector<DtAtsc3SubframeInfo> m_Subframes;   // Subframe information
-};
-
-//=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+ ATSC 3.0 Demodulation  +=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=
-
-//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtAtsc3DemodL1PlpData -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
-//
-// ATSC3 PLP demodulation info from L1 Detail
-//
-struct DtAtsc3DemodL1PlpData
-{
-    int  m_Id;                  // L1D_plp_id; PLP-ID: 0..63
-    bool  m_LlsFlag;            // L1D_plp_lls_flag; PLP carrying LLS signalling
-    int  m_Layer;               // L1D_plp_layer; Core/Enhanced layer: DTAPI_ATSC3_LAYER_x
-    int  m_Start;               // L1D_plp_start; index of the PLP's first data cell
-    int  m_Size;                // L1D_plp_size; number of data cells allocated
-    int  m_ScramblerType;       // L1D_plp_scrambler_type;  0 
-    int  m_FecCodeLength;       // L1D_plp_fec_type (code length), see DTAPI_ATSC3_LDPC_x   
-    int  m_FecOuterCode;        // L1D_plp_fec_type (outer type), see DTAPI_ATSC3_OUTER_x  
-    int  m_Modulation;          // L1D_plp_mod; modulation, see DTAPI_ATSC3_QAMx
-    int  m_CodeRate;            // L1D_plp_cod; code rate, see DTAPI_ATSC3_COD_x
-    int  m_TiMode;              // L1D_plp_TI_mode; time interleaver mode,
-                                // see DTAPI_ATSC3_TIMODE_x
-    int  m_FecFrameStart;       // L1D_plp_fecframe_start; start position
-    int  m_CtiFecFrameStart;    // L1D_plp_CTI_fecframe_start; start position of the 
-                                // first complete FEC frame for the current PLP leaving 
-                                // the CTI in the current or subsequent subframes 
-    int  m_NumChannelBonded;    // Number of channels bonded (0 = no channel bounding) 
-    int  m_ChannelBondingFormat;  // Channel bonding format
-    int  m_BondedRfIdDTAPI_ATSC3_NUM_RF_MAX + 1;  // Bonded RF-IDs
-
-    // .....
-    int  m_PlpType;             // L1D_plp_type; PLP-type, see DTAPI_ATSC3_PLPTYPE_x
-    int  m_NumSubslices;        // L1D_plp_num_subslices+1; Number of subslices 1...16384 
-                                // valid if plp_type=1
-    int  m_SubsliceInterval;    // L1D_plp_subslice_interval+1; 1.. 2^24-1, valid if plp_type=1
-    bool  m_TiExtInterleaving;  // L1D_plp_TI_extended_interleaving, extended IL is used
-    int  m_CtiDepth;            // L1D_plp_CTI_depth; convolutional time interleaver
-                                // depth, see DTAPI_ATSC3_CTIDEPTH_x
-    int   m_CtiStartRow;        // L1D_plp_CTI_start_row; position of the interleaver 
-                                // selector at the start of the subframe
-
-    // HTI interleaving parameters (only applicable if TiMode=HTI)
-    bool  m_HtiInterSubframe;   // L1D_plp_HTI_inter_subframe; inter-subframe interleaving
-                                // is used.
-    int  m_HtiNumTiBlocks;      // L1D_plp_HTI_num_ti_blocks; If inter-subframe 
-                                // interleaving is disabled: the number of TI blocks per 
-                                // interleaving frame.
-                                // If inter-subframe interleaving is enabled:
-                                // the number of subframes over which cells from 
-                                // one TI block are carried. Range: 1..16
-    int  m_HtiNumFecBlocksMax;  // L1D_plp_HTI_num_fec_blocks_max+1; The maximum number of 
-                                // FEC blocks per interleaving frame for the current
-                                // PLP: 1..4096
-    int  m_HtiNumFecBlocks16; // L1D_plp_HTI_num_fec_blocks+1; the number of FEC blocks
-                                // contained in the interleaving frames for the current
-                                // PLP
-    bool m_HtiCellInterleaver;  // L1D_plp_HTI_cell_interleaver;  cell-interleaver is used
-
-    int   m_LdmInjectLevel;     // L1D_plp_ldm_injection_level;
-                                // InjectLevel <  10 : InjectLevel/2.0 dB
-                                // InjectLevel >= 10 : InjectLevel - 5.0 dB
-};
-//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtAtsc3DemodL1SubframeData -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
-//
-// ATSC3 Subframe demodulation info from L1 Detail
-//
-struct DtAtsc3DemodL1SubframeData
-{
-    bool  m_Mimo;               // L1D_mimo; MIMO is used
-    int  m_Miso;                // L1D_miso; MISO type, see DTAPI_ATSC3_MISO_x 
-    int  m_FftSize;             // L1D_fft_size; FFT-size, see DTAPI_ATSC3_FFT_x
-    int  m_ReducedCarriers;     // L1D_reduced_carriers; carrier reduction coefficient,
-                                // range 0..4
-    int  m_GuardInterval;       // L1D_guard_interval; guard interval see DTAPI_ATSC3_GI_x
-    int  m_NumOfdmSymbols;      // L1D_num_ofdm_symbols +1; number of data payload 
-                                // OFDM symbols
-    int  m_PilotPattern;        // L1D_scattered_pilot_pattern; pilot pattern, see
-                                // DTAPI_ATSC3_PP_x
-    int   m_PilotBoost;         // L1D_scattered_pilot_boost; pilot power boost: 0..4 
-    bool  m_SbsFirst;           // L1D_sbs_first; first symbol of the subframe is a 
-                                // subframe boundary symbol
-    bool  m_SbsLast;            // L1D_sbs_last; last symbol of the subframe is a 
-                                // subframe boundary symbol
-    int  m_Multiplex;           // L1D_subframe_multiplex - 0=subframes time division
-                                // multiplexed, 1=not yet used
-    bool  m_FreqInterleaver;    // L1D_frequency_interleaver - Frequency interleaver
-                                // enabled flag
-    int  m_SbsNumNullCells;     // L1D_sbs_null_cells - The number of null cells in the
-                                // subframe boundary symbol(s)
-   std::vector<DtAtsc3DemodL1PlpData>  m_Plps;  // PLPs          
-};
-//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtAtsc3DemodL1BasicData -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
-//
-// ATSC3 demodulation info from L1 Basic
-//
-struct DtAtsc3DemodL1BasicData
-{
-    int  m_Version;             // L1B_version; version: 0
-    int  m_MimoScatPilotEnc;    // L1B_mimo_scattered_pilot_encoding - 0=No MIMO or Walsh
-                                // 1=Null pilots
-    bool  m_LlsFlag;            // L1B_lls_flag - One or more PLPs carrying LLS 
-    int   m_TimeInfoFlag;       // L1B_time_info_flag - Time information is present,
-                                // see DTAPI_ATSC3_TIME_x
-    bool  m_ReturnChannelFlag;  // L1B_return_channel_flag - DRC is supported
-    int  m_Papr;                // L1B_papr; PAPR mode, see DTAPI_ATSC3_PAPR_x
-    int  m_FrameLengthMode;     // L1B_frame_length_mode; Frame alignment, see
-                                // DTAPI_ATSC3_ALIGN_x
-    int  m_FrameLength;         // L1B_frame_length, if framelength is time-aligned
-                                // time period = L1B_frame_length × 5 ms
-    int  m_ExcessSamples;       // L1B_excess_samples_per_symbol; if framelength is 
-                                // time-aligned, the number of excess samples included
-                                // in the guard interval of each non-Preamble OFDM symbol 
-    int  m_TimeOffset;          // L1B_time_offset - if m_FrameLengthMode=symbol-aligned,
-                                // the number of sample periods between the nearest 
-                                // preceding or coincident millisecond boundary and the
-                                // leading edge of the frame
-    int  m_AdditionalSamples;   // L1B_additional_samples - if m_FrameLengthMode=
-                                // symbol-aligned, the number of additional samples added
-                                // at the end of a frame.
-    int  m_NumSubframes;        // L1B_num_subframes +1; number of subframes: 1..256
-    // L1-Basic parameters for L1-Detail
-    int  m_PreambleNumSymbols;  // L1B_preamble_num_symbols +1; number of Preamble 
-                                // OFDM symbols
-    int  m_PreambleReducedCarriers; // L1B_preamble_reduced_carriers - Carrier
-                                // reduction coefficient range 0..4
-    int  m_L1DetailContentTag;  // L1B_L1_Detail_content_tag; incremented whenever
-                                // L1-Detail contents is modified, 0..3
-    int  m_L1DetailSize;        // L1B_L1_Detail_size_bytes; size of L1-Detail (in bytes)
-    int  m_L1DetailFecMode;     // L1B_L1_Detail_fec_type; FEC Type Mode: 1..7
-    int  m_L1DetailAddParity;   // L1B_L1_Detail_additional_parity_mode;
-                                // additional parity mode K, 0, 1 or 2
-    int  m_L1DetailNumCells;    // L1B_L1_Detail_total_cells; size (in OFDM cells) of
-                                // coded and modulated L1-Detail + additional parity bits
-                                // of the next frame
-    // L1-Basic information for the first subframe
-    bool  m_FirstSubMimo;       // L1B_first_sub_mimo; MIMO is used
-    int  m_FirstSubMiso;        // L1B_first_sub_miso; MISO type, see DTAPI_ATSC3_MISO_x 
-    int  m_FirstSubFftSize;     // L1B_first_sub_fft_size; FFT-size, see DTAPI_ATSC3_FFT_x
-    int  m_FirstSubReducedCarriers; // L1B_first_sub_reduced_carriers; carrier reduction
-                                // coefficient range: 0..4
-    int  m_FirstSubGuardInterval; // L1B_first_sub_guard_interval; guard interval, 
-                                // see DTAPI_ATSC3_GI_x
-    int  m_FirstSubNumOfdmSymbols; // L1B_first_sub_num_ofdm_symbols +1; number of 
-                                // data payload OFDM symbols
-    int  m_FirstSubPilotPattern; // L1B_first_sub_scattered_pilot_pattern; pilot pattern,
-                                // see DTAPI_ATSC3_PP_x
-    int  m_FirstSubPilotBoost;  // L1B_first_sub_scattered_pilot_boost; pilot power
-                                // boost, 0..4 
-    bool  m_FirstSubSbsFirst;   // L1B_first_sub_sbs_first; first symbol of the subframe 
-                                // is a subframe boundary symbol
-    bool  m_FirstSubSbsLast;    // L1B_first_sub_sbs_last; last symbol of the subframe is
-                                // a subframe boundary symbol
-};
-//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtAtsc3DemodL1DetailData -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
-//
-// ATSC3  L1-Detail
-//
-struct DtAtsc3DemodL1DetailData
-{
-    int  m_Version;             // L1D_version; version: 0
-    int  m_NumRf;               // L1D_num_rf; number of frequencies involved in channel
-                                // bonding
-    int  m_BondedBsIdDTAPI_ATSC3_NUM_RF_MAX;   // L1D_bonded_bsid of the bonded channels
-    int  m_BsId;                // Broadcast Stream ID or -1 if not valid
-
-    // Time information seconds elapsed since the PTP epoch on 1st January 1970
-    int  m_TimeSec;             // L1D_time_sec; seconds component
-    int  m_TimeMillisec;        // L1D_time_msec; milliseconds component 
-    int  m_TimeMicrosec;        // L1D_time_usec; microseconds component 
-    int  m_TimeNanosec;         // L1D_time_nsec; nanoseconds component
-    __int64  m_AgeOfTimeInfo;   // The age of the time information in nanoseconds
-    // Note: L1 basic first_sub are copied in the first subframe
-    std::vector<DtAtsc3DemodL1SubframeData> m_Subframes;    // Subframes
-};
-//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtAtsc3DemodBootstrapData -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
-//
-// ATSC3  Bootstrap data
-//
-struct DtAtsc3DemodBootstrapData
-{
-    int  m_MinorVersion;        // Bootstrap minor version: 0..7
-    int  m_NumSymbols;          // Number of bootstrap symbols
-    int  m_EasWakeup;           // Emergency alert signal wake-up field: 0..3
-    int  m_MinTimeToNext;       // Minimum time interval to next frame: 0..31 
-    int  m_SystemBandwidth;     // System bandwidth of the post bootstrap signal
-    int  m_BsrCoefficient;      // bsr coefficient; sampe rate bootstrap = (N+16)*0.384MHz
-                                // 0-127
-    int  m_PreambleStructure;   // Preample structure, see ATSC PHY standard Annex H
-    // Parameters derived from the m_PreambleStructure
-    int  m_L1BasicFecMode;      // L1-Basic FEC type mode: 1..7
-    int  m_PreambleFftSize;     // Preamble FFT size, see DTAPI_ATSC3_FFT_x
-    int  m_PreambleGuardInterval; // Preamble guard interval, see See DTAPI_ATSC3_GI_x
-    int  m_PreamblePilotDx;     // Preamble pilot pattern Dx, see DTAPI_ATSC3_PP_DX_x
-};
-//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtAtsc3DemodL1Data -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
-//
-// Struct for storing the ATSC 3.0 layer 1 data
-//
-struct DtAtsc3DemodL1Data
-{
-    DtAtsc3DemodBootstrapData  m_Bootstrap; // Bootstrap data
-    DtAtsc3DemodL1BasicData  m_L1Basic;     // L1-Basic data
-    DtAtsc3DemodL1DetailData  m_L1Detail;   // L1-Detail data
-};
-//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtAtsc3StreamSelPars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
-//
-// This structure specifies the selection parameters for an ATSC 3.0 stream
-//
-struct DtAtsc3StreamSelPars
-{
-    int  m_PlpId;                   // ID of the data PLP
-};
-
-//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtAtsc3TxId -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
-struct DtAtsc3TxId
-{
-    int  m_TxIdAddress;             // Transmitter identification address
-    double  m_LeveldB;              // Level expressed in dB relative to the ATSC3 
-                                    // symbol power
-};
-
-//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtAtsc3TxIdInfo -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
-//
-// Information about a ATSC 3.0 transmitter identification
-//
-struct DtAtsc3TxIdInfo
-{
-    __int64  m_ProgressCount;                   // Scan progress counter
-    std::vector<DtAtsc3TxId>  m_TxIds;          // Transmitters sorted in decreasing
-                                                // relative power
-};
-
-//=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+ 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
-};
-
-//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDabTransmitterId -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
-struct DtDabTransmitterId
-{
-    int  m_TxMainId;                // Transmitter main identifier; 
-                                    // 0...5 (for transmission mode 3) otherwise 0...69
-    int  m_TxSubId;                 // Transmitter sub-identifier; 0...23
-    double  m_RelativePowerdB;      // Transmitter power, relative to total power
-};
-
-
-//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDabTransmitterIdInfo -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
-//
-// Information about a DAB transmitter identification
-//
-struct DtDabTransmitterIdInfo
-{
-    std::vector<DtDabTransmitterId>  m_Transmitters;
-};
-//=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+ 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_C2Version - DVB-C2 specification version
-#define DTAPI_DVBC2_VERSION_1_2_1   0            // DVB-C2 version 1.2.1
-#define DTAPI_DVBC2_VERSION_1_3_1   1            // DVB-C2 version 1.3.1
-// m_GseLabelType - DVB-C2 GSE Label size
-#define DTAPI_DVBC2_GSE_LABEL_6BYTE 0           // 6 Byte GSE label
-#define DTAPI_DVBC2_GSE_LABEL_3BYTE 1           // 3 Byte GSE label
-#define DTAPI_DVBC2_GSE_LABEL_NONE  2           // No GSE label
-// 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_TESTPOINTSDTAPI_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;
-    bool m_EarlyWarningSystem;      // Early warning system
-
-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
-{
-    int  m_Ccm;                     // ACM/CMM bit in the BBframe header 0 or 1
-    // Mode adaptation layer: TS input
-    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
-    // Mode adaptation layer: GSE input
-    int  m_GseLabelType;            // GSE-label type. See DTAPI_DVBC2_GSE_LABEL_XXX
-    // Modulation parameters
-    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_PayloadType;             // PLP payload type: DTAPI_DVBC2_PAYLOAD_XXX
-    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
-    bool m_EarlyWarningSystem;      // Early warning system
-    int  m_C2Version;               // DVB-C2 Version
-    int  m_L1TiMode;                // L1 time interleaving mode. See DVBC2_L1TIMODE_x
-
-    // Data slices parameters
-    int  m_NumDSlices;              // Number of data slices
-    DtDvbC2DSlicePars  m_DSlicesDTAPI_DVBC2_NUM_DSLICE_MAX;
-
-    // Notches
-    int  m_NumNotches;              // Number of notches
-    DtDvbC2NotchPars  m_NotchesDTAPI_DVBC2_NUM_NOTCH_MAX;
-    
-    // PLP input
-    int  m_NumPlpInputs;            // Number of PLPs
-    DtPlpInpPars  m_PlpInputsDTAPI_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
-    bool m_EarlyWarningSystem;      // Early warning system
-    int  m_C2Version;               // DVB-C2 Version
-
-    // 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_PlpInputsDTAPI_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_TESTPOINTSDTAPI_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
-    bool  m_PlpMute;                // If true the PLP data cells are muted
-
-    // IDs of the other PLPs in the in-band signaling
-    int  m_NumOtherPlpInBand;       // Number of other PLPs in m_OtherPlpInBand
-    int  m_OtherPlpInBandDTAPI_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_RfChanFreqsDTAPI_DVBT2_NUM_RF_MAX;
-                                    // Channel frequencis
-    int  m_StartRfIdx;              // First used RF channel
-
-    // PLPs
-    int  m_NumPlps;                 // Number of PLPs
-    DtDvbT2PlpPars  m_PlpsDTAPI_DVBT2_NUM_PLP_MAX;
-                                    // PLP parameters
-    DtPlpInpPars  m_PlpInputsDTAPI_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_FefComponent1;
-
-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);
-};
-//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDvbT2TransmitterId -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
-struct DtDvbT2TransmitterId
-{
-    int  m_TxId;                    // Transmitter identifier; 
-    double  m_RelativePowerdB;      // Transmitter power, relative to total power
-};
-
-
-//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtDvbT2TransmitterIdInfo -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
-//
-// Information about identified DVB-T2 transmitters
-//
-struct DtDvbT2TransmitterIdInfo
-{
-    std::vector<DtDvbT2TransmitterId>  m_Transmitters;
-};
-
-//=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+ 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_TssDTAPI_ISDBT_NUM_TS_MAX;
-    DtPlpInpPars  m_TsInputsDTAPI_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_ATSC,                    // ATSC stream
-    STREAM_ATSC3,                   // ATSC 3.0 stream (ALP packets)
-    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_DVBC2_GSE,               // DVB-C2 stream GSE-packets
-    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_QAM,                     // QAM stream
-    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
-    STREAM_TXID_IMPRESP             // Impulse reponse of Tx-ID
-};
-
-//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- 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 carrier or PLP-ID
-    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
-
-    // Serialisation
-    DTAPI_RESULT  FromXml(const std::wstring& XmlString);
-    DTAPI_RESULT  ToXml(std::wstring& XmlString);
-};
-
-//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- 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
-};
-
-//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtTxIdImpRespPars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
-//
-// This structure specifies the parameters for an transmitter identification
-// impulse-response stream
-//
-struct DtTxIdImpRespPars
-{
-    int  m_Period;                  // Minimum period between callbacks in ms
-    int  m_TxIdAddress;             // Selected Tx-ID address: 0..8191
-    int  m_AveragePeriod;           // In 8192 samples Tx-ID sequences. 
-                                    // Increase it to lower noise.
-};
-
-
-//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- 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
-        DtAtscStreamSelPars  m_Atsc;
-        DtAtsc3StreamSelPars  m_Atsc3;
-        DtQamStreamSelPars  m_Qam;
-        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;
-        DtTxIdImpRespPars   m_TxIdImpResp;
-    } 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);
-};
-
-//+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=
-//+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+ MATRIX CONFIGURATION +=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+
-//+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=
-
-//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- enum DtMxPixelFormat -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
-//
-enum DtMxPixelFormat
-{
-    DT_PXFMT_UYVY422_8B,        // Packed CbYCrY, 8 bits per symbol
-    DT_PXFMT_UYVY422_10B,       // Packed CbYCrY, 10 bits per symbol
-    DT_PXFMT_UYVY422_16B,       // Packed CbYCrY, 16 bits per symbol (10 significant bits)
-    DT_PXFMT_UYVY422_10B_NBO,   // Packed CbYCrY, 10 bits per symbol, network byte order
-    DT_PXFMT_YUYV422_8B,        // Packed YCbYCr, symbol swap of DT_PXFMT_UYVY422_8B
-    DT_PXFMT_YUYV422_10B,       // Packed YCbYCr, symbol swap of DT_PXFMT_UYVY422_10B
-    DT_PXFMT_YUYV422_16B,       // Packed YCbYCr, symbol swap of DT_PXFMT_UYVY422_16B
-    DT_PXFMT_Y_8B,              // Luminance plane only, 8 bits per symbol
-    DT_PXFMT_Y_16B,             // Luminance plane only, 16 bits per symbol (10 sign bits)
-    DT_PXFMT_YUV422P_8B,        // Planar YUV, 3 planes, 1 Cb & 1 Cr sample per 2 Y. 8BPS
-    DT_PXFMT_YUV422P_16B,       // Planar YUV, 3 planes, 1 Cb & 1 Cr sample per 2 Y. 16BPS
-    DT_PXFMT_YUV422P2_8B,       // Planar YUV, 2 planes, Y plane + Cb+Cr plane. 8BPS
-    DT_PXFMT_YUV422P2_16B,      // Planar YUV, 2 planes, Y plane + Cb+Cr plane. 16BPS
-    DT_PXFMT_YUV420P2_8B,       // Planar YUV, 2 planes, Y plane + Cb+Cr plane with
-                                // 2x2 sub-sampling. 8BPS. Also called NV12
-    DT_PXFMT_BGR_8B,            // Packed RGB data. First B, then G, then R. 8 bits per ch
-    DT_PXFMT_BGRX_8B,           // Packed RGB data with a 4th dummy byte per pixel. Not
-                                // yet supported.
-    DT_PXFMT_V210,              // Packed CbYCrY, 3 10-bit symbols per 32-bit
-    // Likely future extensions:
-    //DT_PXFMT_YUV420P,           // Planar YUV, 3 planes, 1 Cb & 1 Cr sample per 2x2 Y.This
-                                // is often used as decoder input/output.
-    //DT_PXFMT_RGB_P,             // Planar RGB data
-
-    DT_PXFMT_INVALID = -1,
-};
-
-//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- class DtMxVideoConfig -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
-//
-class DtMxVideoConfig
-{
-public:
-    // m_StartLine1 / m_NumLines1 are for field 1, m_StartLine2 / m_NumLines2 are for
-    // field 2. For progressive input m_StartLine2 / m_NumLines2 are ignored.
-    // If no video input is required set m_NumLines1 and m_NumLines2 to 0.
-    int  m_StartLine1;          // 1st line to transfer (1-based relative to 1st field)
-    int  m_NumLines1;           // #lines to transfer (-1 for all lines)
-    
-    int  m_StartLine2;          // 1st line to transfer (1-based relative to 2nd field)
-    int  m_NumLines2;           // #lines to transfer (-1 for all lines)
-
-    int  m_Scaling;             // Scaling mode (OFF, 1/4, 1/16). DTAPI_SCALING_*
-    int  m_LineAlignment;       // -1 if all symbols should directly follow eachother,
-                                // otherwise the minimum alignment each line should
-                                // have. DTAPI will chose the stride internally, usually
-                                // n*m_LineAlignment for smallest n where the stride is
-                                // equal or longer than the required number of bytes per
-                                // line. DTAPI is allowed to pick larger stride for
-                                // performance reasons.
-                                // Common values will be -1 (no alignment), 1 (align
-                                // each line at byte-boundary) and 16 (sse2 alignment).
-    int  m_BufAlignment;        // Minimal byte alignment for the video buffers. Defaults
-                                // to -1 in which case DTAPI will pick an alignment.
-                                // Must be a multiple of 2.
-    DtMxPixelFormat  m_PixelFormat; // Pixel format
-    bool  m_UserBuffer;         // When set to true the callback function is responsible
-                                // for allocating the video sample buffers. When set to
-                                // false the framework will allocate the buffers. Defaults
-                                // to false.
-
-    DtMxVideoConfig();
-};
-
-
-//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- class DtMxRawConfigSdi -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
-//
-class DtMxRawConfigSdi
-{
-public:
-    DtMxPixelFormat  m_PixelFormat; // Pixel format. Allowed are: UYVY422 or YUYV422
-    int  m_StartLine;           // 1st line to transfer (1-based)
-    int  m_NumLines;            // #lines to transfer (-1 for all lines)
-    int  m_LineAlignment;       // See DtMxVideoConfig::m_LineAlignment
-};
-
-//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- enum DtMxRawDataType -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
-//
-enum DtMxRawDataType
-{
-    DT_RAWDATA_SDI,
-};
-
-//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- class DtMxRawConfig -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
-//
-class DtMxRawConfig
-{
-public:
-    DtMxRawDataType  m_Type;    // Indicates which of the fields below is valid.
-
-    union {
-        DtMxRawConfigSdi  m_Sdi;
-    };
-
-    DtMxRawConfig();
-};
-
-//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- enum DtMuxAudioSampleType -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
-//
-enum DtMxAudioSampleType
-{
-    DT_AUDIO_SAMPLE_PCM,        // 32-bit PCM samples
-    DT_AUDIO_SAMPLE_AES3,       // AES samples
-    DT_AUDIO_SAMPLE_S337,       // 32-bit SMPTE-337 data-burst samples
-};
-
-//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- enum DtMxOutputMode -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
-//
-enum DtMxOutputMode
-{
-    DT_OUTPUT_MODE_ADD,
-    DT_OUTPUT_MODE_COPY,
-    DT_OUTPUT_MODE_DROP,
-};
-
-//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- class DtMxAudioConfig -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
-//
-class DtMxAudioConfig
-{
-public:
-    int  m_Index;               // Identifies the corresponding audio channel.
-    bool  m_DeEmbed;            // If true, decode the input to data buffers per stream.
-                                // m_DeEmbed is ignored for output rows.
-    DtMxOutputMode  m_OutputMode;  
-                                // DROP: Audio group is not generated at output, whether
-                                //       or not it was available at input. Data buffers
-                                //       are available read-only if m_DeEmbed is true.
-                                // COPY: Output for this group is directly copied from
-                                //       input, timing stays the same. Data buffers are
-                                //       available read-only if m_DeEmbed is true. For
-                                //       output rows this has the same effect as DROP: no
-                                //       generated output.
-                                // ADD:  Output is generated by framework from data
-                                //       buffers filled by callback. Data buffers are
-                                //       initialized with input data if m_DeEmbed is
-                                //       true, otherwise they're initially empty.
-                                // m_OutputMode is ignored for input rows.
-    DtMxAudioSampleType  m_Format; // Inidicate whether to (de-)embed PCM samples or
-                                // AES subframes. Dolby E can be (de-)embedded as
-                                // AES samples.
-
-    DtMxAudioConfig();
-};
-
-//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- enum DtMxAuxDataType -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
-//
-enum DtMxAuxDataType
-{
-    DT_AUXDATA_SDI,
-};
-
-//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- class DtMxAuxObjConfig -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
-//
-class DtMxAuxObjConfig
-{
-public:
-    bool  m_DeEmbed;            // If true, decode this AuxData object. m_DeEmbed is
-                                // ignored for output rows.
-    DtMxOutputMode  m_OutputMode;          
-                                // DROP: AuxData object is not generated at output no
-                                //       matter whether or not it was available at the
-                                //       input. AuxData object is available read-only if
-                                //       m_DeEmbed is true.
-                                // COPY: The embedded AuxData of this type in the input
-                                //       frame, if present, is copied one-to-one to the
-                                //       output, without re-embedding. If m_DeEmbed is
-                                //       true the data will be available in the callback.
-                                // ADD:  Output is generated by framework from data
-                                //       buffers filled by callback. Data buffers are
-                                //       initialized with input data if m_DeEmbed is
-                                //       true, otherwise they're initially empty.
-};
-
-//-.-.-.-.-.-.-.-.-.-.-.-.-.- class DtMxAuxObjConfigVideoIndex -.-.-.-.-.-.-.-.-.-.-.-.-.-
-//
-class DtMxAuxObjConfigVideoIndex : public DtMxAuxObjConfig
-{
-public:
-    static const int  LINE1_DEFAULT_525 = 11;
-    static const int  LINE2_DEFAULT_525 = 274;
-    static const int  LINE1_DEFAULT_625 = 19;
-    static const int  LINE2_DEFAULT_625 = 332;
-
-public:
-    int  m_Line1;               // Line in field 1 to extract or insert the video-index
-                                // from/to. Valid lines are:
-                                // - 525: 1..16 (default=11)
-                                // - 625: 1..22 (default=19)
-                                // NOTE: -1, means use default
-    int  m_Line2;               // Line in field 2 to extract or insert the video-index
-                                // from/to. Valid lines are:
-                                // - 525: 263..279 (default=274)
-                                // - 625: 313..35 (default=332)
-                                // NOTE: -1, means use default
-};
-
-//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- class DtMxAuxConfigSdi -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
-//
-class DtMxAuxConfigSdi
-{
-public:
-    typedef std::vector<std::pair<unsigned int, unsigned int> >  VpidList;
-
-    DtMxAuxObjConfig  m_AncPackets;  // Settings for ancillary data packets
-    DtMxAuxObjConfigVideoIndex  m_VideoIndex;
-                                     // Settings for (deprecated SD only) video index data
-    DtMxAuxObjConfig  m_Wss;         // Settings for (SD only) Wide Screen Signaling
-    DtMxAuxObjConfig  m_Line21;      // Settings for (SD only) analog CEA-608 line 21 data
-    DtMxAuxObjConfig  m_Teletext;    // Settings for (PAL only) teletext
-    VpidList  m_Vpid;                // VPID(s) to insert in output signal
-    bool  m_DisableVpidProcessing;   // If true, user must add VPID ancillary data
-    //DtMxAuxObjConfig  m_Rp188;
-    //DtMxAuxObjConfig  m_Vitc;
-    //DtMxAuxObjConfig  m_Eia608;
-    //DtMxAuxObjConfig  m_Eia708;
-    DtMxAuxConfigSdi();
-};
-
-//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- class DtMxAuxDataConfig -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
-//
-class DtMxAuxDataConfig
-{
-public:
-    bool  m_DeEmbedAll;         // De-embed all auxdata. Defaults to false.
-    DtMxAuxDataType  m_DataType; // Indicates which of the following objects is valid.
-
-    DtMxAuxConfigSdi  m_Sdi;    // SDI-specific settings. Valid only if
-                                // m_DataType==DT_AUXDATA_SDI
-
-    DtMxAuxDataConfig();
-};
-
-
-//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- class DtMxRowConfig -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
-//
-class DtMxRowConfig
-{
-    // Constants
-public:
-    static const int  MAX_NUM_AUDIO_CHANNELS = 16; // Max. # audio channels supported
-
-public:
-    DtMxRowConfig();
-    virtual ~DtMxRowConfig();
-
-public:
-    bool  m_Enable;             // Global flag to enable/disable to the complete row.
-                                // When disabled input rows will not provide data and all
-                                // output ports will generate black frames.
-                                // Wnen set to false all further configuration below
-                                // is not taken into account.
-
-    int  m_RowSize;             // Number of frame buffers available in the callback
-                                // function.
-
-    void*  m_pOpaq;             // Opaque user pointer. Framework itself will not change
-                                // this value. This can be used if the row configuration
-                                // is changed dynamically to detect the change. It can
-                                // also be used to change the function  of the callback
-                                // frame-synchronous without implementing any locks
-                                // on the user-side.
-
-    // Each matrix row operates either in RAW mode or in "parsed data" mode. This means
-    // that m_RawDataEnable is mutually exclusive with m_VideoEnable, m_AudioEnable
-    // and m_AuxDataEnable.
-
-    // Raw data
-    bool  m_RawDataEnable;      // Enable raw data processing. m_RawData is ignored when
-                                // set to false. Defaults to false.
-    DtMxRawConfig  m_RawData;   // Configuration of raw input/output data.
-
-    // Video
-    bool  m_VideoEnable;        // Enables video processing. m_Video is ignored when set
-                                // to false. Defaults to true.
-    DtMxVideoConfig  m_Video;   // Configuration of video input/output.
-
-    // Audio
-    bool  m_AudioEnable;        // Enables audio processing. m_AudioGen and m_Audio are 
-                                // ignored when set to false. Defaults to true.
-    DtMxAudioConfig  m_AudioDef; // Default audio settings, can be used to de-embed all
-                                // channels. These settings are used as defaults for
-                                // all channels and can be overriden on a per-channel
-                                // basis by the m_Audio vector.
-    std::vector<DtMxAudioConfig>  m_Audio; // Configuration for each audio channel
-
-    // AUX data
-    bool  m_AuxDataEnable;      // Enables auxiliary data processing. m_AuxData is ignored
-                                // when set to false. Defaults to false.
-    DtMxAuxDataConfig  m_AuxData; // Configuration of aux data input/output.
-};
-
-
-//+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=
-//+=+=+=+=+=+=+=+=+=+=+=+=+=+ MATRIX CALLBACK DATA STRUCTURES +=+=+=+=+=+=+=+=+=+=+=+=+=+=
-//+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=
-
-//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- class DtMxRawDataSdi -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
-//
-class DtMxRawDataSdi
-{
-public:
-    unsigned char*  m_pBuf;
-    int  m_BufSize;
-    int  m_Stride;              // Size of each line in bytes
-    int  m_StartLine;           // 1st line in buffer (1-based)
-    int  m_NumLines;            // #lines to transfer (-1 for all lines)
-    // Informational
-    DtMxPixelFormat  m_PixelFormat;  // Pixel format. Can be UYVY422 or YUVY422
-    int  m_Width;               // Width in pixels
-    int  m_Height;              // Height in pixels
-};
-
-//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- class DtMxRawData -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
-//
-class DtMxRawData
-{
-public:
-    DtMxRawDataType  m_Type;    // Indicates which of the fields below is valid.
-
-    union {
-        DtMxRawDataSdi  m_Sdi;
-    };
-};
-
-//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- class DtMxVideoPlaneBuf -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
-//
-class DtMxVideoPlaneBuf
-{
-public:
-    unsigned char*  m_pBuf;     // Pointer to buffer
-    int  m_BufSize;             // Total size in bytes of buffer
-    int  m_Stride;              // Size of each line in bytes
-    int  m_StartLine;           // 1st line in buffer (1-based)
-    int  m_NumLines;            // Number of lines. Usually equal to
-                                // DtMxVideoBuf::m_Height but might vary for some
-                                // pixel formats, for 4:2:0 planar for example both
-                                // chrominancy planes have m_NumLines twice as small
-                                // as DtMatrixVideoBuf::m_Height.
-
-    DtMxVideoPlaneBuf();
-};
-
-//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- enum DtMxVidPattern -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
-//
-enum DtMxVidPattern
-{
-    DT_VIDPAT_BLACK_FRAME,
-    DT_VIDPAT_RED_FRAME,
-    DT_VIDPAT_GREEN_FRAME,
-    DT_VIDPAT_BLUE_FRAME,
-    DT_VIDPAT_WHITE_FRAME,
-};
-
-//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- class DtMxVideoBuf -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
-//
-class DtMxVideoBuf
-{
-public:
-    DtMxVideoPlaneBuf  m_Planes3;
-    int  m_NumPlanes;           // The number of planes directly depends on the pixel
-                                // format chosen.
-    DtMxPixelFormat  m_PixelFormat; // See DtMxVideoConfig::m_PixelFormat
-    int  m_Scaling;             // Scaling mode (OFF, 1/4, 1/16). DTAPI_SCALING_*
-    int  m_Width;               // Width in pixels
-    int  m_Height;              // Height in pixels
-
-    // Initialize the video buffers with a specific pattern in an efficient way. Can
-    // be used by the callback function for output rows if no useful data is available.
-    // Framework does not do this automatically because in normal operation it'd be
-    // a waste of resources to initialize buffers that will be overwritten later anyway.
-    DTAPI_RESULT  InitBuf(DtMxVidPattern  Pattern);
-    
-    DtMxVideoBuf();
-};
-
-//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- class DtMxSdVideoIndex -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
-//
-class DtMxSdVideoIndex
-{
-public:
-    //-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- enum ScanningSystem -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
-    //
-    enum ScanningSystem
-    {
-        SCS_NO_INFORMATION = 0,
-        SCS_525_5994_4X3   = 1,
-        SCS_625_50_4X3     = 2,
-        SCS_525_5994_16X9  = 5,
-        SCS_625_50_16X9    = 6,
-    };
-
-    // -.-.-.-.-.-.-.-.-.-.-.-.-.- enum ActiveFormatDescriptor -.-.-.-.-.-.-.-.-.-.-.-.-.-
-    //
-    enum ActiveFormatDescriptor
-    {
-        AFD_NO_INFOMATION = 0,
-        AFD_BOX_16_9_TOP=2,
-        AFD_BOX_14_9_TOP=3,
-        AFD_BOX_LARGER_THAN_16_9_CENTER=4,
-        AFD_SAME_AS_CODED=8,
-        AFD_4_3_CENTER=9,
-        AFD_16_9_CENTER=10,
-        AFD_14_9_CENTER=11,
-        AFD_4_3_SHOT_AND_PROTECT_14_9= 13,
-        AFD_16_9_SHOT_AND_PROTECT_14_9 = 14,
-        AFD_14_9_SHOT_AND_PROTECT_4_3 = 15,
-    };
-
-    //-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- enum SignalForm -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
-    //
-    enum SignalForm
-    {
-        SF_NO_INFORMATION = 0,
-        SF_RGB            = 1,
-        SF_YCbCr          = 2,
-        SF_YUV            = 3,
-        SF_MONOCHROME     = 4,
-        SF_NTSC           = 5,
-        SF_PAL            = 6,
-        SF_PAL_M          = 7,
-        SF_SECAM          = 8,
-    };
-    //.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- enum SamplingStructure -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
-    //
-    enum SamplingStructure
-    {
-        SAS_NO_INFORMATION   = 0,
-        SAS_420              = 1,
-        SAS_422              = 2,
-        SAS_4224_MAIN        = 3,
-        SAS_4224_SUB         = 4,
-        SAS_444_MAIN         = 5,
-        SAS_444_SUB          = 6,
-        SAS_4444_MAIN        = 7,
-        SAS_4444_SUB         = 8,
-        SAS_422P_MAIN        = 9,
-        SAS_422P_SUB         = 10,
-        SAS_420P             = 11,
-        SAS_844_MAIN         = 12,
-        SAS_844_SUB          = 13,
-        SAS_4224_SINGLE_LINK = 14,
-    };
-
-    //-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- enum ColorField -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
-    //
-    enum ColorField
-    {
-        CF_NO_INFORMATION  = 0,
-        CF_COLOR_FIELD_1   = 1,
-        CF_COLOR_FIELD_2   = 2,
-        CF_COLOR_FIELD_3   = 3,
-        CF_COLOR_FIELD_4   = 4,
-        CF_COLOR_FIELD_5   = 5,
-        CF_COLOR_FIELD_6   = 6,
-        CF_COLOR_FIELD_7   = 7,
-        CF_COLOR_FIELD_8   = 8,
-    };
-
-    //.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- enum VideoFieldsRates -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
-    //
-    enum VideoFieldsRates
-    {
-        VFR_NO_INFORMATION     = 0,
-        VFR_FIELD1_SCAN1_2SCAN = 1,
-        VFR_FIELD2_SCAN2_2SCAN = 2,
-        VFR_FIELD1_SCAN1_3SCAN = 3,
-        VFR_FIELD2_SCAN2_3SCAN = 4,
-        VFR_FIELD1_SCAN3_3SCAN = 5,
-        VFR_FIELD2_SCAN1_2SCAN = 6,
-        VFR_FIELD1_SCAN2_2SCAN = 7,
-        VFR_FIELD2_SCAN1_3SCAN = 8,
-        VFR_FIELD1_SCAN2_3SCAN = 9,
-        VFR_FIELD2_SCAN3_3SCAN = 10,
-    };
-
-    // Get or set the scanning system
-    DTAPI_RESULT  GetScanningSystem(ScanningSystem&  ScanSystem);
-    DTAPI_RESULT  SetScanningSystem(ScanningSystem  ScanSystem);
-    // Get or set the active-fomat-descriptor
-    DTAPI_RESULT  GetAfd(ActiveFormatDescriptor&  Afd);
-    DTAPI_RESULT  SetAfd(ActiveFormatDescriptor  Afd);
-    // Get or set the signal form
-    DTAPI_RESULT  GetSignalForm(SignalForm&  Form);
-    DTAPI_RESULT  SetSignalForm(SignalForm  Form);
-    // Get or set the sampling structure
-    DTAPI_RESULT  GetSamplingStructure(SamplingStructure&  Structure);
-    DTAPI_RESULT  SetSamplingStructure(SamplingStructure  Structure);
-    // Get or set the pand and scan data
-    DTAPI_RESULT  GetPanAndScan(int& Pan, int& Tilt, int& Zoom, bool& X, bool& Y, bool& Z);
-    DTAPI_RESULT  SetPanAndScan(int Pan, int Tilt, int Zoom, bool X, bool Y, bool Z);
-    // Get or set the color field
-    DTAPI_RESULT  GetColorField(ColorField&  Cf);
-    DTAPI_RESULT  SetColorField(ColorField  Cf);
-    // Get or set the video fields and film frames
-    DTAPI_RESULT  GetVideoFieldsFilmRates(VideoFieldsRates&  Vfr);
-    DTAPI_RESULT  SetVideoFieldsFilmRates(VideoFieldsRates  Vfr);
-    // Get or set the film frame rate as percentage of nominal rate (1%-254%)
-    // 0=no information, 255=still frame
-    DTAPI_RESULT  GetFilmFrameRate(int&  Ffr);
-    DTAPI_RESULT  SetFilmFrameRate(int  Ffr);
-
-    void  UpdateCrcs();
-
-    unsigned char m_Data90;   // Raw video index data
-    bool  m_Valid;              // True if m_Data contains valid data
-    int  m_Line;                // Line number in which the video index was found
-
-    DtMxSdVideoIndex();
-};
-
-//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- class DtMxSdWss -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
-//
-class DtMxSdWss
-{
-public:
-    enum WssType
-    {
-        WSS_INVALID,
-        WSS_PAL,
-        WSS_NTSC,
-    };
-
-    enum  AspectRatioFormat
-    {
-        ARF_4_3_FULL,
-        ARF_4_3_BOX,
-        ARF_16_9_FULL,
-        ARF_16_9_BOX,
-        ARF_16_9_BOX_TOP,
-        ARF_16_9_ANAMORPHIC,
-        ARF_14_9_BOX,
-        ARF_14_9_BOX_TOP,
-        ARF_14_9_FULL,
-        ARF_GREATER_16_9_BOX,
-    };
-
-    // Get or set the aspect ratio
-    DTAPI_RESULT  GetAspectRatio(DtAspectRatio&  Ratio);
-    DTAPI_RESULT  GetAspectRatioFormat(AspectRatioFormat&  Ratio);
-    //DTAPI_RESULT  SetAspectRatioFormat(AspectRatioFormat  Ratio);
-
-    // Get or set the 'subtitles within Teletext' bit
-    DTAPI_RESULT  GetTeletextSubtitles(bool&  Subtitles);
-    //DTAPI_RESULT  SetTeletextSubtitles(bool  Subtitles);
-
-    WssType  m_Type;            // Encoding of data in m_Data
-    int  m_Data;                // Raw data
-    int  m_NumBitsValid;        // The number of bits in m_Data that contain valid data
-
-    DtMxSdWss();
-};
-
-//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- class DtMxLine21 -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
-//
-class DtMxLine21
-{
-public:
-    unsigned char  m_Data2;   // Raw data including parity bit
-    bool  m_Valid;              // True if m_Data contains valid data
-
-    DtMxLine21();
-};
-
-//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- class DtMxTeletextPacket -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
-//
-class DtMxTeletextPacket
-{
-public:
-    int  m_Line;                // Line the teletext packet was found
-    unsigned char  m_Data42;  // Raw packet data (excl. clock run-in and framing code)
-};
-
-//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- class DtMxAuxData -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
-//
-class DtMxAuxData
-{
-public:
-    // Teletext
-    // Closed captioning
-
-    DtMxSdVideoIndex  m_VidIndex2;
-    DtMxSdWss  m_Wss2;
-    DtMxLine21  m_Line212;
-    std::vector<DtMxTeletextPacket>  m_Teletext;
-
-    // Other anc data
-    bool  m_AncTimeCodeValid;
-    __int64  m_AncTimeCode;
-};
-
-//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtMxAncPacket -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
-//
-class DtMxAncPacket
-{
-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
-    int  m_Line;                    // Line number in which packet was found
-
-    // Operations
-public:
-    int  Type() const  { return (m_Did & 0x80)==0 ? 2 : 1; }
-
-public:
-    DtMxAncPacket();
-    virtual ~DtMxAncPacket();
-private:
-    DtMxAncPacket(const DtMxAncPacket&);
-};
-
-//-.-.-.-.-.-.-.-.-.-.-.-.-.-.- class DtMxAudioChannelStatus -.-.-.-.-.-.-.-.-.-.-.-.-.-.-
-//
-class DtMxAudioChannelStatus
-{
-public:
-    // Get or set the sampling rate in Hz.
-    DTAPI_RESULT  GetSampleRate(int& SampleRate);
-    DTAPI_RESULT  SetSampleRate(int SampleRate);
-    // Get or set whether the channel contains linear audio PCM data or something else.
-    DTAPI_RESULT  GetPcmAudio(bool&  IsPcm);
-    DTAPI_RESULT  SetPcmAudio(bool  IsPcm);
-    // Get or set the the significant and maximum number of bits
-    DTAPI_RESULT  GetPcmNumBits(int&  NumBits, int&  NumAuxBits);
-    DTAPI_RESULT  SetPcmNumBits(int  NumBits, int  NumAuxBits=0);
-
-    unsigned char m_Data24;   // Raw AES3 channel-status word data.
-    bool  m_Valid;              // True, if channel status word has been initialised
-
-    DtMxAudioChannelStatus();
-    virtual ~DtMxAudioChannelStatus();
-};
-
-//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- class DtMxAudioChannel -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
-//
-class DtMxAudioChannel
-{
-public:
-    int  m_Index;                   // Index of this channel in underlaying AV format.
-    bool  m_Present;                // True if this channel was actually present in the
-                                    // input frame.
-    int  m_Service;                 // Index in m_Services vector for the service this
-                                    // channel is a part of.
-    
-    unsigned int*  m_pBuf;          // Buffer with audio samples
-    int  m_BufSizeSamples;          // Total size of buffer (in #samples)
-    int  m_NumValidSamples;         // Number of valid samples inside buffer
-    
-    DtMxAudioChannelStatus  m_Status;  // AES3 status word;
-
-    const int  m_NumSamplesHint;    // Suggested number of audio samples for this frame. 
-                                    // This is based on the audio frame number.
-    const DtMxAudioSampleType  m_Format;  // Format of audio samples: PCM32 or AES
-
-    // Constructor, destructor
-public:
-    DtMxAudioChannel();
-    virtual ~DtMxAudioChannel();
-    DtMxAudioChannel&  operator = (const DtMxAudioChannel& Other);
-};
-
-//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- enum DtMxAudioServiceType -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
-//
-enum DtMxAudioServiceType
-{
-    DT_AUDIOSERVICE_UNKNOWN,
-    DT_AUDIOSERVICE_MONO,
-    DT_AUDIOSERVICE_DUAL_MONO,
-    DT_AUDIOSERVICE_STEREO,
-    DT_AUDIOSERVICE_5_1,
-};
-
-//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- class DtFixedVector -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
-//
-// Represents a vector which has a fixed size (i.e. cannot add or remove elements)
-//
-template<typename T>
-class DtFixedVector
-{
-    // Operations
-public:
-    bool  empty() const { return m_Data.empty(); }
-    size_t  size() const { return m_Data.size(); }
-    T& operator(size_t  n) { return m_Datan; }
-protected:
-    // Cast to a "normal" std::vector. NOTE: Intended for internal DTAPI use only
-    inline operator typename std::vector<T>& () { return m_Data; }
-    inline DtFixedVector&  operator = (const DtFixedVector&  Oth)
-    {
-        this->m_Data = Oth.m_Data;
-        return *this;
-    }
-    
-    // Data / Attributes
-private:
-    std::vector<T>  m_Data;     // Actual std::vector with the data
-
-    // Constructor / Desstructor
-public:
-    DtFixedVector() {}
-    virtual ~DtFixedVector() {}
-protected:
-    DtFixedVector(size_t  Size) { m_Data.resize(Size); }
-    DtFixedVector(const DtFixedVector&  Oth) { *this= Oth; }
-
-    // Friends
-private:
-    friend class  MxFrameImpl;
-    friend class  MxCommonData;
-    friend class  MxDecData;
-    friend class  MxActionAncEnc;
-    friend class  MxActionAncDec;
-    friend class  MxProcessImpl;
-};
-
-//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- class DtMxAudioService -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
-//
-class DtMxAudioService
-{
-public:
-    bool  m_Valid;                    // Indicates whether or not this is a valid entry
-    DtMxAudioServiceType  m_ServiceType; // Type of service: mono, stereo, 5.1 etc.
-    std::vector<int>  m_Channels;     // Indices of channels that are part of this service
-    int  m_PcmNumBits;                // For PCM samples only: number of significant bits
-    bool  m_ContainsData;             // For AES only: true if data, false if PCM samples
-    int  m_SampleRate;                // Sample rate of audio channels
-    const int  m_SamplesInFrame;      // Number of samples in the current frame
-    //double  m_SamplePhase;            // Phase of the first audio sample
-    int  m_AudioFrameNumber;          // Indicates where we are in the audio frame 
-                                      // sequence frame 
-
-    // Constructor, destructor
-public:
-    DtMxAudioService();
-    DtMxAudioService&  operator = (const DtMxAudioService& Other);
-};
-
-//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- class DtMxAudioData -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
-//
-class DtMxAudioData
-{
-public:
-    DtFixedVector<DtMxAudioChannel>  m_Channels;
-    DtFixedVector<DtMxAudioService>  m_Services;
-
-    // Utility function to make the AES3 status word consistent with the members in this
-    // struct. It's recommended to call this after modifying any members to make sure
-    // the final output is consistent.
-    DTAPI_RESULT  InitChannelStatus();
-    DTAPI_RESULT  InitChannelStatus(const DtMxAudioService&  Service);
-
-    DTAPI_RESULT  AddAudio(const DtMxAudioService&, unsigned char* pSamples, 
-                                                         int& NumSamples, int SampleSize);
-    DTAPI_RESULT  GetAudio(const DtMxAudioService&, unsigned char* pSamples, 
-                                                         int& NumSamples, int SampleSize);
-};
-
-//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- enum DtMxFrameStatus -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
-//
-enum DtMxFrameStatus
-{
-    DT_FRMSTATUS_OK,               // Frame has been received and decoded without problems
-    DT_FRMSTATUS_SKIPPED,          // Row has been received and decoded but the callback
-                                   // function was never called. This will only be set
-                                   // for historic buffers, never for the current
-                                   // frame buffer.
-    DT_FRMSTATUS_DISABLED,         // Row has been disabled, buffers not available.
-    DT_FRMSTATUS_DUPLICATE,        // Frame data is duplicated from previous frame
-                                   // because the input was too slow.
-    DT_FRMSTATUS_LATE,             // Frame data was dropped because the input data
-                                   // arrived too late. Data is not available. Later
-                                   // frames will report NO_SIGNAL is the input signal
-                                   // is lost or will return to OK if the frame was
-                                   // dropped due to too high CPU load.
-    DT_FRMSTATUS_NO_SIGNAL,        // No signal at input port. Frame data not available.
-    DT_FRMSTATUS_WRONG_VIDSTD,     // Unconfigured video signal at input. Frame data
-                                   // not available.
-    DT_FRMSTATUS_DEV_DISCONNECTED, // Input (usb) device has been disconnected. Frame data
-                                   // not available.
-    DT_FRMSTATUS_ERROR_INTERNAL,   // Internal error. Frame data is not available.
-};
-static const DtMxFrameStatus  DTAPI_DEPRECATED(DT_FRMSTATUS_DROPPED,
-      "Deprecated (will be removed!): Use DT_FRMSTATUS_LATE instead") = DT_FRMSTATUS_LATE;
-
-//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- class DtMxFrame -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
-//
-// Data buffers for a single frame. Can be used for input, for output or be shared
-// between input and output.
-//
-class DtMxFrame
-{
-public:
-    const DtMxRowConfig*  const m_Config;
-                                    // Row configuration at the time the frame processing
-                                    // was started by the HLM.
-
-    // Status of this frame. DT_FRMSTATUS_DISABLED overrules all other status fields.
-    // For output-only rows this will always be DT_FRMSTATUS_OK or DT_FRMSTATUS_DISABLED.
-    // For input/output and output-only rows the data buffers requested will always be 
-    // available if m_Status is not DT_FRMSTATUS_DISABLED.
-    DtMxFrameStatus  m_Status;
-
-    // Configured video standard, or for fixed-rate rows the actual received rate.
-    // For fixed rate output rows this has to be set by callback.
-    int  m_VidStd;
-
-    // For input and input/output rows this can contain a pointer to the data of an input
-    // frame that was received before this frame but not processed to maintain clock sync.
-    // Normally this is a NULL pointer, but if the input is faster than the HLM clock
-    // occasionally a frame needs to be dropped to keep the system in sync. By providing
-    // a pointer to the data of the dropped frame the callback might be able to prevent
-    // audio hickups.
-    // For each frame processed by the callback function there will be at most one
-    // dropped frame due to different clocks, so this->m_DroppedFrame->m_DroppedFrame is
-    // always NULL.
-    DtMxFrame*  m_DroppedFrame;
-
-    bool  m_InpPhaseValid;      // True if m_InpPhase contains a valid value.
-    double  m_InpPhase;         // Phase of this input relative to the HLM clock source.
-                                // In a genlocked system this should be approximately
-                                // zero. In a non-genlocked system the HLM will try
-                                // to keep it between -1.25 and 0.05. A frame drop will
-                                // increase this value by 1.
-
-    bool  m_InLock;             // Output only: true if output is in sync with genlock
-
-    bool  m_RawTimestampValid;  // True if m_RawTimestamp is valid
-    __int64  m_RawTimestamp;    // 64-bit timestamp of the arrival of the SDI frame.
-                                // Timestamps created by different hardware devices have
-                                // no relation to eachother.
-
-    // Raw data buffer
-    bool  m_RawDataValid;       // True, if the raw data is valid; False if invalid
-    DtMxRawData  m_RawData;
-    // Video buffers for field 1 and 2
-    bool  m_VideoValid;         // True, if the video data is valid; False if invalid
-    DtMxVideoBuf  m_Video2;
-    // Audio data
-    bool  m_AudioValid;         // True, if the audio data is valid; False if invalid
-    DtMxAudioData  m_Audio;
-    // Auxiliary data
-    bool  m_AuxDataValid;       // True, if the aux data is valid; False if invalid
-    DtMxAuxData  m_AuxData;
-
-    // Access functions for raw ANC packets
-    virtual DTAPI_RESULT  AncAddPacket(DtMxAncPacket&  AncPacket, int HancVanc,
-                                                             int Stream, int Link=-1) = 0;
-    virtual DTAPI_RESULT  AncDelPacket(int Did, int Sdid, int StartLine,
-                       int NumLines, int HancVanc, int Stream, int Mode, int Link=-1) = 0;
-    virtual DTAPI_RESULT  AncGetPacket(int Did, int Sdid, DtMxAncPacket*, int& NumPackets,
-                                                   int HancVanc, int Stream, int Link=-1,
-                                                   int StartLine=-1, int NumLines=-1) = 0;
-    
-    // Constructor, destructor
-protected:
-    DtMxFrame();
-    virtual ~DtMxFrame();
-private:
-    // No implementation is provided for the copy constructor or for operator=
-    DtMxFrame(const DtMxFrame&);
-    DtMxFrame&  operator = (const DtMxFrame&);
-};
-
-//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- class DtMxRowData -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
-//
-class DtMxRowData
-{
-public:
-    // Pointer to current frame. This is the only read/write buffer, all other buffers
-    // are read-only.
-    DtMxFrame*  m_CurFrame;
-
-    // m_Hist.size() == RowSize-1
-    // m_Hist0 is the previous frame, m_Hist1 the one before that etc.
-    std::vector<const DtMxFrame*>  m_Hist;
-};
-
-//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- class DtMxData -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
-//
-// Top-level data class for the user callback function.
-//
-class DtMxData
-{
-public:
-    __int64  m_Frame;           // Frame counter. Increases by 1 for every frame the
-                                // matrix clock source processes.
-    int  m_Phase;               // Current phase (0..NumPhases-1). Each callback function
-                                // can run up to NumPhases time in parallel, each of them
-                                // will be called with a different value in m_Phase.
-    int  m_NumSkippedFrames;    // Error counter, will normally be 0. If due to a timeout
-                                // the matrix API has to skip the callback processing of
-                                // a number of frames, it'll indicate it here in the data
-                                // of the next processed frame.
-    DtFixedVector<DtMxRowData>  m_Rows; // Data per row
-    
-    // Constructor, destructor
-public:
-    DtMxData();
-    virtual ~DtMxData();
-};
-
-//+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=
-//=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+ MATRIX CONTROL +=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=
-//+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=
-
-//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- class DtMxPort -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
-//
-// The DtMxPort is used as abstraction for one logical input or output. Often this
-// maps 1-to-1 to one physical output port, but other mappings are possible as well.
-// 4K-video over SDI can be transported over 4x3G links for example, creating
-// a 1 logical to 4 physical ports mapping.
-//
-// Example for single-port:
-// Matrix.AttachToInput(0, DtMxPort(&Dvc, 1));
-// 
-// Example for 4K (Assuming DtDevice Dvc; which is attached to DTA-2174):
-// DtMxPort  Port4k(DTAPI_VIDSTD_2160P60, DTAPI_LINK_4K_SMPTE425);
-// Port4k.AddPhysicalPort(&Dvc, 1);
-// Port4k.AddPhysicalPort(&Dvc, 2);
-// Port4k.AddPhysicalPort(&Dvc, 3);
-// Port4k.AddPhysicalPort(&Dvc, 4);
-// Matrix.AttachToOutput(0, Port4k, 3);
-//
-// 3G over 1x3G-SDI link:
-// DtMxPort  Port3G1(DTAPI_VIDSTD_1080P60);
-// Port3G1.AddPhysicalPort(&Dvc, 1);
-// Alternatively "DtMxPort  Port3G;" is enough, VidStd can be determined
-// from the IoConfig.
-//
-// 3G over 2xHD-SDI links (NOT SUPPORTED):
-// DtMxPort  Port3G2(DTAPI_VIDSTD_1080P60, DTAPI_LINK_3G_SMPTE372);
-// Port3G2.AddPhysicalPort(&Dvc, 1);
-// Port3G2.AddPhysicalPort(&Dvc, 2);
-//
-// After Matrix.AttachToInput() / Matrix.AttachToOutput() it's completely transparent
-// whether Port3G1 or Port3G2 is used. Both support exactly the same data and filtering,
-// the matrix API will take care of splitting over 1 or multiple physical links.
-//
-class DtMxPort
-{
-public:
-    // 1. Constructor that doesn't link to a physical port yet.
-    DtMxPort();
-    // 2. Constructor that links to a single physical port. Video standard and
-    // link standard are not explicitly set and will be determined from IOConfig.
-    DtMxPort(DtDevice*, int  Port, int  ClockPriority=0, int  PixelOffset=0);
-    // 3. Constructor that initializes the object for a multi-link structure.
-    DtMxPort(int  VidStd, int  LinkStd);
-    // 4. Copy constructor
-    DtMxPort(const DtMxPort&);
-    // Destructor
-    virtual ~DtMxPort();
-    // Assignment operator
-    DtMxPort& operator = (const DtMxPort&);
-    
-    DTAPI_RESULT  AddPhysicalPort(DtDevice*, int  Port, int  ClockPriority=0, 
-                                                                      int  PixelOffset=0);
-
-private:
-    class MxPortImpl*  m_pImpl;
-    friend class DtMxProcess;
-};
-
-//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtMxProcFrameFunc -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
-//
-// Signature of a user-defined matrix callback function.
-//
-typedef void  DtMxProcFrameFunc(DtMxData* pData, void* pOpaque);
-
-//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtMxVidBufFreeCallback -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
-//
-// Signature of callback function that will be called by the HLM to free user-provided
-// video buffers.
-//
-typedef void  DtMxVidBufFreeCallback(void* pMem, void* pOpaque);
-
-//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- enum DtMxClockMode -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
-//
-enum DtMxClockMode
-{
-    DT_MXCLOCK_AUTO,            // Default, HLM internally picks a device as clock source
-    DT_MXCLOCK_PCR_TIME_ACC,    // HLM changes internal clock source based on PCR samples
-                                // provided by user. Each PCR sample is accurately
-                                // timestamped (by using transparent input mode on
-                                // a DekTec device).
-    DT_MXCLOCK_PCR_TIME_IP,     // HLM changes internal clock source based on PCR samples
-                                // provided by user. The PCR samples do not have an
-                                // accurate timestamp, so HLM will adjust the internal
-                                // clock very slowly.
-    DT_MXCLOCK_SW_FIFO,         // User provides timestamped Fifo-loads. HLM controls the
-                                // clock so that the average fifo load remains the same.
-};
-
-//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- class DtMxSchedulingArgs -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
-//
-class DtMxSchedulingArgs
-{
-public:
-    // List of cores that are allowed to run threads in this group. Leave empty
-    // to allow the threads to run on all cores.
-    std::vector<int>  m_Affinity;
-    // Linux-only: Scheduling policy for threads part of this group. Currently
-    // only SCHED_OTHER, SCHED_FIFO and SCHED_RR are supported
-    int  m_SchedPolicy;
-    // OS-specific thread priority.
-    // Windows: THREAD_PRIORITY_*
-    // Linux with SCHED_FIFO or SCHED_RR: 1..99 (higher is higher priority)
-    // Linux with SCHED_OTHER: -20..19 (lower value is higher priority)
-    int  m_SchedPrio;
-};
-
-//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- class DtMxThreadScheduling -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
-//
-class DtMxThreadScheduling
-{
-public:
-    // Scheduling settings for threads in the events group. Those threads have low CPU
-    // usage but need to react very quickly to various events. They shall have the
-    // highest priority of all threads in the system.
-    // Default priority windows: THREAD_PRIORITY_TIME_CRITICAL
-    // Default priority linux: SCHED_FIFO 80
-    DtMxSchedulingArgs  m_EventThreads;
-    // The worker threads are CPU intensive but can tolerate a bit more scheduling latency
-    // than the event threads. In general those threads should be run at a fairly high
-    // priority to make sure no frames are dropped.
-    // Default priority windows: THREAD_PRIORITY_HIGHEST
-    // Default priority linux: SCHED_FIFO 20
-    DtMxSchedulingArgs  m_WorkerThreads;
-    // The callback threads are the ones that run the callback functions. The priority
-    // of these threads depends on the kind of work the callback does. It should not
-    // be higher than the priority of the worker threads.
-    // Default priority windows: THREAD_PRIORITY_ABOVE_NORMAL
-    // Default priority linux: SCHED_OTHER -10
-    DtMxSchedulingArgs  m_CallbackThreads;
-
-public:
-    DtMxThreadScheduling();
-};
-
-//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- class DtMxProcess -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
-//
-class DtMxProcess
-{
-public:
-    // The matrix process has 2 states: IDLE and RUNNING. You can switch between those
-    // states by calling Start() and Stop(). Most functions can only be called in IDLE and
-    // will return immediately with an error if called in RUN mode.
-
-    // Register a new callback function that will be called by the framework whenever
-    // a new frame is ready for processing.
-    DTAPI_RESULT  AddMatrixCbFunc(DtMxProcFrameFunc* pFunc, void* pOpaque);
-
-    // Reset complete matrix process. The following things will be done:
-    // 1. Detach all attached ports.
-    // 2. Set NumPhases to default value.
-    // 3. Clear any configuration done via SetRowConfig()
-    // 4. Set end-to-end delay to default.
-    // 5. Remove all callbacks.
-    DTAPI_RESULT  Reset();
-    
-    // The matrix can have any number of rows (limited by system resources). Row numbers
-    // start with 0 and go up to N-1 (where N=number of rows). Rows can be attached to
-    // ports in any order, it's not required to start with row 0.
-    // Each row can be attached to:
-    // - 1 input port
-    // - 1 or more output ports
-    // - 1 input port and 1 or more output ports
-    DTAPI_RESULT  AttachRowToInput(int Row, const DtMxPort& Port);
-    DTAPI_RESULT  AttachRowToOutput(int Row, const DtMxPort& Port, int ExtraOutDelay=0);
-
-    // Change the way the HLM clock source is controlled.
-    DTAPI_RESULT  SetClockControl(DtMxClockMode, DtDevice* pDvc=NULL, int AvgFifoLoad=-1);
-
-    // Can be called by the user while the matrix process is running. HLM will keep
-    // track of a number of these samples and will adjust it's clock source so the
-    // output rate is matched to the provided samples.
-    DTAPI_RESULT  NewClockSample(__int64 PcrOrFifoLoad, int RefClkCnt);
-    
-    // Changes the number of phases. Global setting per matrix.
-    DTAPI_RESULT  SetNumPhases(int NumPhases);
-
-    // SetRowConfig sets the configuration and validates if it is possible valid. Not all
-    // errors can be caught at this time since some depend on the video standard (for
-    // example DtMxVideoConfig::m_NumLines1 if not equal to -1).
-    // SetRowConfig(Row) is only valid after AttachToInput(Row)/AttachToOutput(Row) has
-    // been called and will return an error otherwise.
-    DTAPI_RESULT  SetRowConfig(int Row, const DtMxRowConfig& Config);
-
-    // Function to change the video standard for all ports attached to the given row.
-    DTAPI_RESULT  SetVidStd(int Row, int VidStd);
-
-    // Set a callback function the framework can use to free user-provided video buffers.
-    DTAPI_RESULT  SetVidBufFreeCb(DtMxVidBufFreeCallback* pFunc);
-
-    // Get the minimum/default end-to-end delay. CbFrames will be an approximation
-    // of the time the user callback function has relative to the time of a complete
-    // frame. GetDefEndToEndDelay() will return a value: CbFrames >= NumPhases.
-    // GetMinEndToEndDelay() will return a value: NumPhases-1 < CbFrames <= NumPhases.
-    DTAPI_RESULT  GetMinEndToEndDelay(int& Delay, double& CbFrames);
-    DTAPI_RESULT  GetDefEndToEndDelay(int& Delay, double& CbFrames);
-    DTAPI_RESULT  SetEndToEndDelay(int Delay);
-
-    // Makes sure the configuration of all rows and global matrix settings is consistent.
-    // If it is, start the matrix process.
-    DTAPI_RESULT  Start();
-    // Stop a runnig matrix process and return to IDLE.
-    DTAPI_RESULT  Stop();
-
-    DTAPI_RESULT  SetThreadScheduling(const DtMxThreadScheduling& Scheduling);
-
-    //TODO: add function to initialize "error-frame" for input/output and output rows.
-    // This error-frame can be played out during the first few frames when there is
-    // no data available yet and when the input is stalled and configuration requests it.
-    
-    // Print profiling information collected while the matrix was running
-    DTAPI_RESULT  PrintProfilingInfo();
-    
-    // Implementation data
-private:
-    class MxProcessImpl*  m_pImpl;
-
-    // Constructor, destructor
-public:
-    DtMxProcess();
-    ~DtMxProcess();
-private:
-    // No implementation is provided for the copy constructor or for operator=
-    DtMxProcess(const DtMxProcess&);
-    DtMxProcess& operator = (const DtMxProcess&);
-};
-
-//+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=
-//+=+=+=+=+=+=+=+=+=+=+=+=+ ENCODING & DECODING CONTROL CLASSES +=+=+=+=+=+=+=+=+=+=+=+=+=
-//+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=
-
-//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- RESULT CODES -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
-
-// Result codes for methods used in encoder and decoder control
-enum DtEncResult
-{
-    DT_ENC_OK,                      // All is fine
-    DT_ENC_E_AUDBITRATETOOLOW,      // Bitrate too low for selected audio service type
-    DT_ENC_E_AUDBITRATETOOHIGH,     // Bitrate too high for selected audio service type
-    DT_ENC_E_EXC_NUMAAC,            // #AAC services too high
-    DT_ENC_E_EXC_NUMDOLBYE,         // #DolbyE services too high
-    DT_ENC_E_EXC_NUMNONSURROUND,    // #Non-surround services too high
-    DT_ENC_E_EXC_NUMSURROUND,       // #Surround services too high
-    DT_ENC_E_INV_AACPAR,            // Invalid AAC parameter
-    DT_ENC_E_INV_AFDBARMODE,        // Invalid AFD/BAR mode
-    DT_ENC_E_INV_ASPECTRATIO,       // Invalid aspect ratio
-    DT_ENC_E_INV_AUDBITRATE,        // Invalid audio service bitrate
-    DT_ENC_E_INV_AUDCHANCONFIG,     // Invalid audio channel configuration
-    DT_ENC_E_INV_AUDCHANIDX,        // Invalid channel index
-    DT_ENC_E_INV_AUDDELAY,          // Invalid audio delay
-    DT_ENC_E_INV_AUDENCSTD,         // Invalid audio-encoding standard
-    DT_ENC_E_INV_AUDPID,            // Invalid audio PID
-    DT_ENC_E_INV_AUDSAMPLERATE,     // Invalid audio sample rate
-    DT_ENC_E_INV_AUDSVCCONFIG,      // Invalid audio service configuration
-    DT_ENC_E_INV_AUDSVCTYPE,        // Invalid audio service type
-    DT_ENC_E_INV_BITPERSAMPLE,      // Invalid #bits per audio sample
-    DT_ENC_E_INV_BITRATE_PCM,       // Embedded PCM samples bitrate out of range
-    DT_ENC_E_INV_BITRATE_TS,        // TS bitrate out of valid range
-    DT_ENC_E_INV_BITRATE_VID,       // Video bitrate out of valid range
-    DT_ENC_E_INV_CCMODE,            // Invalid closed captions mode
-    DT_ENC_E_INV_CCSOURCE,          // Invalid closed captions source
-    DT_ENC_E_INV_CODINGMODE,        // Invalid coding mode
-    DT_ENC_E_INV_DOLBYMETADATA,     // Invalid Dolby metadata
-    DT_ENC_E_INV_DUPLICATEPIDS,     // One or more duplicate PIDs used
-    DT_ENC_E_INV_END2ENDDELAY,      // The end-to-end delay is invalid
-    DT_ENC_E_INV_ENTROPYENC,        // The entropy encoding (e.g. CABAC/CAVLC) is invalid
-    DT_ENC_E_INV_FRAMERATE,         // The frame rate is invalid
-    DT_ENC_E_INV_FRAMESIZE,         // The frame size is invalid
-    DT_ENC_E_INV_HEAACE2EDELAY,     // The end-to-end delay is invalid for HE-AAC
-    DT_ENC_E_INV_GOPSIZE,           // Invalid GOP size
-    DT_ENC_E_INV_IDRFREQ,           // Invalid IDR frequency
-    DT_ENC_E_INV_ILIMAGE,           // Invalid input loss image
-    DT_ENC_E_INV_INTRADCPREC,       // Invalid DC precision
-    DT_ENC_E_INV_INTRAVLCFMT,       // Invalid intra VLC format
-    DT_ENC_E_INV_LEVEL,             // Invalid level
-    DT_ENC_E_INV_NUMBPICTURES,      // Invalid #B pictures between I/P pictures
-    DT_ENC_E_INV_NUMCHANNELS,       // Invalid number of (audio) channels
-    DT_ENC_E_INV_PATITV,            // Invalid PAT interval
-    DT_ENC_E_INV_PIXDEPTH,          // Invalid pixel depth
-    DT_ENC_E_INV_PMTITV,            // Invalid PMT interval
-    DT_ENC_E_INV_PMTPID,            // Invalid PMT PID
-    DT_ENC_E_INV_PCRITV,            // Invalid PCR interval
-    DT_ENC_E_INV_PCRPID,            // Invalid PCR PID
-    DT_ENC_E_INV_PROFILE,           // Invalid profile
-    DT_ENC_E_INV_QSCALETYPE,        // Invalid type of quantization scale
-    DT_ENC_E_INV_QUANTTABLE,        // Invalid quantization table
-    DT_ENC_E_INV_RESCALEHOR,        // Invalid rescaled horizontal resolution
-    DT_ENC_E_INV_SOURCEPORT,        // Invalid source port selection
-    DT_ENC_E_INV_STREAMID,          // Invalid stream ID
-    DT_ENC_E_INV_TELECINE,          // Invalid inverse telecine operation
-    DT_ENC_E_INV_TRANSBLOCKSIZE,    // Invalid transform block size (8x8 tranform)
-    DT_ENC_E_INV_TSID,              // Invalid TS ID
-    DT_ENC_E_INV_TYPE,              // Type number is not valid encoding hardware
-    DT_ENC_E_INV_UVSAMPLING,        // Invalid chroma sampling
-    DT_ENC_E_INV_VBVDELAY,          // Invalid VBV delay
-    DT_ENC_E_INV_VIDENCSTD,         // Invalid video-encoding standard
-    DT_ENC_E_INV_VIDPID,            // Invalid video PID
-    DT_ENC_E_INV_VIDSTD,            // Invalid video standard
-    DT_ENC_E_INV_VOLUMEADJUST,      // Invalid volume adjustment
-    DT_ENC_E_PASSTHROUGHONLY,       // Standard is only supported in passthrough mode
-    DT_ENC_E_TYPE_NOT_SET,          // No type number has been set
-    DT_ENC_E_UNSUP_PRF_LVL          // Unsupported profile level combination
-};
-
-// Convert DT_ENC result code to string for debugging purposes
-const char*  DtEncResult2Str(DtEncResult);
-
-// Video encoder status (see also DTAPI_STAT_VID_STATUS)
-#define DTAPI_VIDSTATUS_IDLE         0           // Not encoding
-#define DTAPI_VIDSTATUS_OK           1           // Encoding
-#define DTAPI_VIDSTATUS_SYNCLOSS     2           // Lost input synchronisation
-#define DTAPI_VIDSTATUS_ERROR        -1          // Unknown encoding error
-
-//=+=+=+=+=+=+=+=+=+=+=+=+=+=+ ENCODING PARAMETERS BASE CLASS +=+=+=+=+=+=+=+=+=+=+=+=+=+=
-
-//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtEncParsBase -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
-//
-// Base class for encoder parameter classes that are dependent on the encoder type.
-//
-class DtEncParsBase
-{
-public:
-    // Public methods
-    bool  IsEncTypeValid() const;
-    int  GetEncType() const { return m_EncType; }
-
-protected:
-    DTAPI_RESULT  SetEncType(int EncType);
-
-    // Constructor, destructor 
-    DtEncParsBase(int EncType=-1);
-    ~DtEncParsBase() {}
-
-protected:
-    int  m_EncType;                 // DekTec type number of encoder card (e.g. 2180)
-};
-
-//=+=+=+=+=+=+=+=+=+=+=+=+=+=+ ANCILLARY ENCODING PARAMETERS +=+=+=+=+=+=+=+=+=+=+=+=+=+=+
-
-//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtEncAncPars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
-//
-// Encoding/embedding parameters for data that is not audio or video.
-//
-class DtEncAncPars : public DtEncParsBase
-{
-public:
-    // AFD/BAR insertion mode
-    enum AfdBarMode 
-    {
-        AFDBAR_NONE,                // Do not extract/insert AFD/BAR
-        AFDBAR_WHENNEEDED,          // Insert/extract AFD/BAR as needed
-        AFDBAR_ALWAYS               // Always extract/insert AFD/BAR
-    };
-
-    // Closed caption extraction and processing mode
-    enum CcMode 
-    {
-        CC_DISABLE,                 // Do not extract/insert captions
-        CC_ALL,                     // Extract/insert all captions
-        CC_608B,                    // Extract/insert EIA608B field 1 and EIA608B field 2
-        CC_608B_FLD1,               // Extract/insert EIA608B field 1
-        CC_608B_FLD2,               // Extract/insert EIA608B field 2
-        CC_708B                     // Extract/insert EIA708B
-    };
-
-    // Closed caption capture source
-    enum CcSource 
-    {
-        CS_NONE,                    // Closed captions not used
-        CS_VANC,                    // Closed caption data taken from VANC
-        CS_WAVEFORM,                // For SD only: Decode waveform in line 21
-        CS_ALL                      // Either VANC or line 21
-    };
-
-    // VBI format
-    enum VbiFormat 
-    {
-        VBI_MSB,                    // VBI input in MSB
-        VBI_LSB                     // VBI input in LSB
-    };
-
-    // Parameters
-    AfdBarMode  m_AfdBarMode;       // AFD/BAR insertion mode
-    CcMode  m_CcMode;               // Closed caption extraction and processing mode
-    CcSource  m_CcSource;           // Closed caption source
-    VbiFormat  m_VbiFormat;         // VBI input in MSB or LSB
-    bool  m_VideoIndex;             // Enable/disable video index processing
-    bool  m_Vitc;                   // Enable/disable VITC
-
-    // Public methods
-    DtEncResult  CheckValidity() const;
-    DTAPI_RESULT  SetDefaultPars();
-    DTAPI_RESULT  SetEncType(int EncType);
-
-    // Constructor, destructor, operators
-    DtEncAncPars(int EncType=-1);
-    bool  operator == (const DtEncAncPars&) const;
-    bool  operator != (const DtEncAncPars&) const;
-};
-
-//=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+ AUDIO ENCODING PARAMETERS +=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+
-
-//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtEncAudParsStdBase -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
-//
-// Base class for encoding parameters specific to an audio encoding standard.
-//
-class DtEncAudParsStdBase : public DtEncParsBase
-{
-public:
-    // Public methods
-    virtual DtEncResult  CheckValidity() const = 0;
-    virtual DTAPI_RESULT  SetDefaultPars() = 0;
-    virtual  DTAPI_RESULT  SetEncType(int EncType) 
-                                            { return DtEncParsBase::SetEncType(EncType); }
-    // Undocumented public methods for DTAPI-internal usage
-    void  SetAudSvcParsPtr(class DtEncAudPars* pSvcPars) { m_pSvcPars = pSvcPars; }
-
-    // Constructor / Destructor
-    DtEncAudParsStdBase(int EncType=-1) : DtEncParsBase(EncType), m_pSvcPars(NULL) {}
-    virtual ~DtEncAudParsStdBase() {}
-
-protected:
-    // Pointer back to DtEncAudPars, so that e.g m_Bitrate can be accessed
-    class DtEncAudPars*  m_pSvcPars;
-};
-
-//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtEncAudParsAac -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
-//
-// AAC audio encoding parameters
-//
-class DtEncAudParsAac : public DtEncAudParsStdBase
-{
-public:
-    // AAC container format
-    enum AacFmt
-    {
-        CF_ADTS,                    // Audio Data Transport Stream (ADTS) format
-        CF_LATM                     // Low Overhead Audio Transport Multiplex (LATM)
-    };
-
-    // AAC container format
-    enum AacProfile
-    {
-        AAC_LC,                     // Low Complexity profile (AAC-LC)
-        AAC_HE,                     // High Efficiency profile (HE-AAC)
-        AAC_HEv2                    // High Efficiency version 2 profile (HE-AAC)
-    };
-
-    // AAC version
-    enum AacVersion
-    {
-        AAC_MP4,                    // MPEG-4 AAC
-        AAC_MP2                     // MPEG-2 AAC
-    };
-
-    // AAC parameters
-    AacFmt  m_ContainerFormat;      // Container format: CF_ADTS or CF_LATM
-    AacProfile  m_Profile;          // Encoder profile 
-    bool  m_Crc;                    // Add CRC to data packets 
-    AacVersion  m_Version;          // MPEG-2 or MPEG-4 AAC
-    bool  m_LowLoad;                // Use low-load encoding algorithm 
-
-    // Public methods
-    DtEncResult  CheckValidity() const;
-
-    // Undocumented public methods for DTAPI-internal usage
-    DTAPI_RESULT  SetDefaultPars();
-    
-    // Constructor, destructor
-    DtEncAudParsAac(int EncType=-1);
-    bool  operator == (const DtEncAudParsAac&) const;
-    bool  operator != (const DtEncAudParsAac&) const;
-};
-
-//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtEncAudParsAc3 -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
-//
-// AC-3 audio encoding parameters
-//
-class DtEncAudParsAc3 : public DtEncAudParsStdBase
-{
-public:
-    bool  m_LfeOn;                  // Enable Low Frequency Effect (LFE) channel
-    bool  m_LfeLpfOn;               // Enable LFE lowpass filter
-    bool  m_DynRangeCtrl1;          // Enable normal compression
-    bool  m_DynRangeCtrl2;          // Enable secondary compression
-    bool  m_SurDelay;               // Enable surround channel delay
-    int  m_DialNorm;                // Dialog normalization
-    bool  m_HpFOn;                  // Enable DC filter
-    int  m_CompChar;                // Global compression profile
-    int  m_DComp;                   // Line mode profile
-    int  m_D2Comp;                  // Line mode profile for second channel
-    int  m_CComp;                   // RF mode profile
-    int  m_C2Comp;                  // RF mode profile for second channel
-    bool  m_RfPremphOn;             // Enable digital deemphasis
-    bool  m_BwLpfOn;                // Enable bandwidth filter
-    bool  m_Sur90On;                // Enable 90-degree phase shift for surround
-    bool  m_XbsiE;                  // Enabled extended bitstream information
-    int  m_DHeadPhonMod;            // Dolby headphone mode
-    int  m_AdConvTyp;               // A/D converter type
-    int  m_MixLevel;                // Mixing level
-    bool  m_CopyrightB;             // Copyright flag
-    bool  m_OrigBs;                 // Original bitstream flag
-    int  m_BsMod;                   // Bitstream mode
-    int  m_RoomTyp;                 // Room type
-    int  m_DSurMod;                 // Dolby surround mode
-    bool  m_AdvDrc;                 // Enable advanced DRC
-    int  m_CMixLev;                 // Center mix level
-    int  m_SurMixLev;               // Surround mix level
-    int  m_DMixMod;                 // Preferred stereo downmix mode
-    int  m_LtrtCMixLev;             // Lt/Rt center mix level
-    int  m_LtrtSurMixLev;           // Lt/Rt surround mix level
-    int  m_LoroCMixLev;             // Lo/Ro center mix level
-    int  m_LoroSurMixLev;           // Lo/Ro surround mix level
-    int  m_DSurExMod;               // Dolby surround EX mode
-    bool  m_SurAtton;               // 3dB surround attenuation flag
-    bool  m_AudProdIE;              // Audio production info exists
-
-    // Public methods
-    DtEncResult  CheckValidity() const;
-
-    // Undocumented public methods for DTAPI-internal usage
-    DTAPI_RESULT  SetDefaultPars();
-    
-    // Constructor, destructor
-    DtEncAudParsAc3(int EncType=-1);
-    bool  operator == (const DtEncAudParsAc3&) const;
-    bool  operator != (const DtEncAudParsAc3&) const;
-};
-
-//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtEncAudParsMp1LII -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
-//
-// MPEG-1 layer II audio encoding parameters
-//
-class DtEncAudParsMp1LII : public DtEncAudParsStdBase
-{
-public:
-    // MPEG 1 layer II parameters
-    bool  m_Crc;                    // Add CRC to data packets 
-
-    // Public methods
-    DtEncResult  CheckValidity() const;
-
-    // Undocumented public methods for DTAPI-internal usage
-    DTAPI_RESULT  SetDefaultPars();
-    
-    // Constructor, destructor
-    DtEncAudParsMp1LII(int EncType=-1);
-    bool  operator == (const DtEncAudParsMp1LII&) const;
-    bool  operator != (const DtEncAudParsMp1LII&) const;
-};
-
-//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtEncAudParsPcm -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
-//
-// PCM direct mapping into MPEG-2 transport stream according to SMPTE 302M
-//
-class DtEncAudParsPcm : public DtEncAudParsStdBase
-{
-public:
-    // PCM mapping parameters
-    int  m_BitPerSample;            // #bits per sample: 16, 20 or 24 
-
-    // Public methods
-    DtEncResult  CheckValidity() const;
-
-    // Undocumented public methods for DTAPI-internal usage
-    DTAPI_RESULT  SetDefaultPars();
-    
-    // Constructor, destructor
-    DtEncAudParsPcm(int EncType=-1);
-    bool  operator == (const DtEncAudParsPcm&) const;
-    bool  operator != (const DtEncAudParsPcm&) const;
-};
-
-//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtEncAudPars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
-//
-// Class for specifying the encoding parameters for a single audio service.
-// It consists of:
-//  - Parameters specifying the audio channels (forming the audio service) to encode
-//  - Audio encoding parameters for this audio service
-//
-class DtEncAudPars : public DtEncParsBase
-{
-public:
-    // Audio service type
-    enum AudServiceType
-    {
-        SVC_DUAL_MONO,              // Dual mono
-        SVC_MONO,                   // Mono
-        SVC_PASSTHROUGH,            // Pass-through mode
-        SVC_STEREO,                 // Stereo
-        SVC_SURROUND_5_1            // 5.1 surround
-    };
-
-    bool  m_Enable;                 // Enable/disable this instance of DtEncAudPars.
-                                    // If disabled, all remaining parameters are ignored.
-
-    // Audio input configuration
-    std::vector<int>  m_AudChans;   // Audio channels (left+right stream of audio samples)
-                                    // included in the audio service
-
-    // Generic (standard-independent) audio-encoding parameters
-    int  m_Bitrate;                 // Bitrate of encoded audio service
-    int  m_Delay;                   // Audio delay in milliseconds
-    int  m_SampleRate;              // Sample rate: 32000, 44100, 48000
-
-    // Advanced generic audio-encoding parameters
-    bool  m_AlignedPes;             // Enable aligned PES
-    bool  m_VolumeAdjust;           // Enable volume adjustment
-    double  m_VolumeAdjustdB;       // Volume adjustment in dB
-
-public:
-     // Public methods
-    DtEncResult  CheckValidity(int SourcePort=-1) const;
-    DtAudEncStd  GetAudEncStd() const { return m_AudEncStd; }
-    AudServiceType  GetSvcType() const { return m_SvcType; }
-    DTAPI_RESULT  SetAudEncStd(DtAudEncStd, AudServiceType);
-    DTAPI_RESULT  SetEncType(int EncType);  
-    int  TpRate(int FrameRate) const;
-
-    // Methods to get a pointer to the encoding parameters for a specific audio
-    // encoding standard
-    DtEncAudParsAac*  Aac() const;
-    DtEncAudParsAc3*  Ac3() const;
-    DtEncAudParsMp1LII*  Mp1LII() const;
-    DtEncAudParsPcm*  Pcm() const;
-
-    // pParsAudEncStd() can be used for calling generic methods that are independent
-    // of the current Audio encoding standard.
-    DtEncAudParsStdBase*  ParsForAudEncStd() const { return m_pPars; }
-
-    // Undocumented public methods for DTAPI-internal usage
-    int  ReqNumLicPoints() const;
-    DTAPI_RESULT  SetDefaultPars(DtAudEncStd, AudServiceType);
-    DTAPI_RESULT  SetDefaultCommonPars(DtAudEncStd);
-
-    // Constructor, destructor, operators
-    DtEncAudPars(int EncType=-1);
-    DtEncAudPars(const DtEncAudPars&);
-    virtual ~DtEncAudPars();
-    DtEncAudPars&  operator = (const DtEncAudPars&);
-    bool  operator == (const DtEncAudPars&) const;
-    bool  operator != (const DtEncAudPars&) const;
-    // Serialisation
-    DTAPI_RESULT  FromXml(const std::wstring&); 
-    DTAPI_RESULT  ToXml(std::wstring&);
-
-private:
-    DtAudEncStd  m_AudEncStd;       // Audio encoding standard
-    AudServiceType  m_SvcType;      // Service type: SVC_STEREO, ...
-    DtEncAudParsStdBase*  m_pPars;  // Audio encoding parameters, specific to AAC, AC-3, 
-                                    // AES, MPEG-2 audio
-};
-
-//=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+ MULTIPLEXER PARAMETERS +=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=
-
-//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtEncMuxPars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
-//
-// Multiplexing parameters for encoders
-//
-class DtEncMuxPars : public DtEncParsBase
-{
-public:
-    // Elementary stream parameters
-    struct EsPars
-    {
-        int  m_Pid;                 // PID of the elementary stream; if disabled: -1
-        int  m_StreamId;            // Stream ID of the elementary stream
-        
-        // Operators
-        EsPars&  operator = (const EsPars&);
-        bool  operator == (const EsPars&) const;
-        bool  operator != (const EsPars&) const;
-
-        // Constructor
-        EsPars(int Pid=-1, int StreamId=-1) : m_Pid(Pid), m_StreamId(StreamId) {}
-    };
-
-    // Overall (elementary-stream independent) parameters
-    int  m_Bitrate;                 // Transport stream output bitrate
-    int  m_TsId;                    // Transport stream ID
-
-    // Elementary stream parameters: PIDs and stream IDs
-    int  m_PcrPid;                  // PCR PID
-    int  m_PmtPid;                  // PMT PID
-    EsPars  m_VidEsPars;            // Elementary stream parameters for encoded video
-
-    // Elementary stream parameters (PID, stream ID) for encoded audio.
-    // This vector gets sized in SetEncType.
-    std::vector<EsPars>  m_AudEsPars;
-
-    // Scheduling intervals
-    int  m_PatInterval;             // PAT interval in ms
-    int  m_PmtInterval;             // PMT interval in ms
-    int  m_PcrInterval;             // PCR interval in ms
-
-    // Methods
-    DtEncResult  CheckValidity(bool SkipRateChecks=false) const;
-    int  NumAudEsPars() const;
-    DTAPI_RESULT  SetEncType(int EncType);
-
-    // Constructor, destructor, operators
-    DtEncMuxPars(int EncType=-1);
-    DtEncMuxPars&  operator = (const DtEncMuxPars&);
-    bool  operator == (const DtEncMuxPars&) const;
-    bool  operator != (const DtEncMuxPars&) const;
-};
-
-//=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+ VIDEO ENCODING PARAMETERS +=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+
-
-//.-.-.-.-.-.-.-.-.-.- Video encoding parameters - Enumeration types -.-.-.-.-.-.-.-.-.-.-
-
-// Video encoding standard
-enum DtVidEncStd
-{
-    DT_VIDENCSTD_UNKNOWN,           // Unknown or not defined yet
-    DT_VIDENCSTD_MP2V,              // MPEG-2 video
-    DT_VIDENCSTD_H264,              // H.264 (AVC)
-    DT_VIDENCSTD_H265               // H.265 (HEVC)
-};
-
-//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtEncVidParsStdBase -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
-//
-// Base class for encoding parameters specific to a video encoding standard.
-// This class is specialized for MPEG-2 video, H.264 and (later on) for H.265.
-//
-class DtEncVidParsStdBase : public DtEncParsBase
-{
-public:
-    DtEncVidParsStdBase(int EncType=-1) : DtEncParsBase(EncType) {}
-    virtual ~DtEncVidParsStdBase() {};
-    virtual DtEncResult  CheckValidity(bool SkipRateChecks=false) const = 0;
-    virtual int  GetVideoBitrate() const { return -1; }
-    virtual int  GetVideoGopNumBPictures() const { return -1; }
-    virtual DTAPI_RESULT  SetEncType(int EncType) 
-                                            { return DtEncParsBase::SetEncType(EncType); }
-};
-
-//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtEncVidParsMp2V -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
-//
-// MPEG-2 video encoding parameters
-//
-class DtEncVidParsMp2V : public DtEncVidParsStdBase
-{
-public:
-    // MPEG-2 video - Profile
-    enum Mp2VProfile
-    {
-        PROFILE_SIMPLE,             // Simple profile
-        PROFILE_MAIN,               // Main profile
-        PROFILE_HIGH,               // High profile
-        PROFILE_422P                // 422P profile
-    };
-
-    // MPEG-2 video - Level
-    enum Mp2VLevel
-    {
-        LEVEL_AUTO,                 // Automatic
-        LEVEL_HIGH,                 // High level
-        LEVEL_HIGH1440,             // High 1440 level
-        LEVEL_MAIN                  // Main level
-    };
-
-    // Intra-VLC format
-    enum IntraVlcFormat
-    {
-        IV_ALTERNATE,               // Alternate intra-VLC format
-        IV_MPEG1                    // MPEG-1 intra-VLC format
-    };
-
-    // Quantization scale
-    enum QScaleType
-    {
-        QS_LINEAR,                  // Linear quantization scale
-        QS_NONLINEAR                // Non-linear quantization scale
-    };
-
-    // Top-level parameters
-    Mp2VProfile  m_Profile;         // MPEG-2 video profile: PROFILE_MAIN, ...
-    Mp2VLevel  m_Level;             // MPEG-2 video level: LEVEL_MAIN, ...
-    int  m_Bitrate;                 // Bitrate of the encoded video stream
-    int  m_VbvDelayMax;             // Maximum VBV delay in milliseconds
-
-    // GOP related parameters
-    bool  m_ClosedGop;              // If true, use closed GOPs
-    int  m_GopSize;                 // The size of each GOP in frames
-    int  m_GopNumBPictures;         // Number of B pictures (-1=auto)
-
-    // Specialized MPEG-2 video encoding parameters
-    bool  m_AlternateScan;          // Use alternate scan pattern for VLC coefficients
-    int  m_IntraDcPrecision;        // Number of bits used for intra-DC values: 8..11
-    IntraVlcFormat  m_IntraVlcFmt;  // Format to use for intra-vlc: MPEG-1, alternate
-    QScaleType  m_QScaleType;       // Type of quantization scale: linear, non-linear
-    bool  m_LowDelayFlag;           // Set the low delay flag (no B pictures)
-
-    // MPEG-2 video encoding parameters specific to the Magnum D7Pro
-    bool  m_AdaptiveQuantization;   // Enable adaptive quantization
-    int  m_IdrFrequency;            // Frequency of IDRs relative to I frames
-                                    // 0=every I-frame, 1=every 2nd I-frame, etc
-    int  m_QuantizationTable;       // Quantization table to use (0=use Magnum default)
-
-    // Public methods
-    DtEncResult  CheckValidity(bool SkipRateChecks=false) const;
-
-    // Undocumented public methods for DTAPI-internal usage
-    void  SetVidParsPtr(class DtEncVidPars* pVidPars) { m_pVidPars = pVidPars; }
-
-    // Constructor, destructor
-    DtEncVidParsMp2V(int EncType=-1);
-    bool  operator == (const DtEncVidParsMp2V&) const;
-    bool  operator != (const DtEncVidParsMp2V&) const;
-
-private:
-    // Pointer back to top-level video encoding parameters
-    class DtEncVidPars*  m_pVidPars;
-};
-
-//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtEncVidParsH264 -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
-//
-// H.264 video encoding parameters
-//
-class DtEncVidParsH264 : public DtEncVidParsStdBase
-{
-public:
-    // H.264 - Profile
-    enum H264Profile
-    {
-        PROFILE_CONSTRAINED_BASE,   // Constrained Baseline profile
-        PROFILE_MAIN,               // Main profile
-        PROFILE_HIGH,               // High profile
-        PROFILE_AVCI50,             // AVC-I 50 profile
-        PROFILE_AVCI100             // AVC-I 100 profile
-    };
-
-    // H.264 - Level
-    enum H264Level
-    {
-        LEVEL_AUTO,                 // Automatic
-        LEVEL_1,                    // Level 1
-        LEVEL_1_1,                  // Level 1.1
-        LEVEL_1_2,                  // Level 1.2
-        LEVEL_1_3,                  // Level 1.3
-        LEVEL_2,                    // Level 2
-        LEVEL_2_1,                  // Level 2.1
-        LEVEL_2_2,                  // Level 2.2
-        LEVEL_3,                    // Level 3
-        LEVEL_3_1,                  // Level 3.1
-        LEVEL_3_2,                  // Level 3.2
-        LEVEL_4,                    // Level 4
-        LEVEL_4_1,                  // Level 4.1
-        LEVEL_4_2,                  // Level 4.2
-        LEVEL_5,                    // Level 5
-        LEVEL_5_1                   // Level 5.1
-    };
-
-    // Generic
-    H264Profile  m_Profile;         // H.264 profile: PROFILE_MAIN, ...
-    H264Level  m_Level;             // H.264 level: LEVEL_1_0, ...
-    int  m_Bitrate;                 // Bitrate of the encoded video stream
-    int  m_VbvDelayMax;             // Maximum VBV delay in milliseconds
-
-    // GOP parameters
-    bool  m_ClosedGop;              // Use closed GOPs
-    int  m_GopSize;                 // GOP size in #frames (-1=auto)
-    int  m_GopNumBPictures;         // Number of B pictures (-1=auto)
-
-    // Specialized H.264 encoding parameters
-    bool  m_8x8Transform;           // Enable 8x8 transforms
-    bool  m_Cabac;                  // Enable CABAC, use CAVLC otherwise
-
-    // H.264 video encoding parameters, specific to the Magnum D7Pro
-
-    // Coding mode
-    enum CodingMode
-    {
-        CM_AUTO,                    // Automatic
-        CM_FRAME,                   // Frame, for progressive content
-        CM_FIELD,                   // Field, for interlaced content
-        CM_MBAFF                    // MBAFF, for interlaced content
-    };
-
-    bool  m_AdaptiveQuantization;   // Enable adaptive quantization
-    bool  m_ChromaScalingList;      // Enable chroma scaling list
-    CodingMode  m_CodingMode;       // Coding mode: CM_FRAME, ... 
-    int  m_IdrFrequency;            // Frequency of IDRs relative to I frames
-                                    // 0=every I-frame, 1=every 2nd I-frame, etc
-    bool  m_IntraScoreAvg;          // Use averaged intra score to compute QP increase
-    int  m_QuantizationTable;       // Quantization table to use (0=use Magnum default)
-    bool  m_WeightedPrediction;     // Enable weighted prediction
-
-    // Public methods
-    DtEncResult  CheckValidity(bool SkipRateChecks=false) const;
-
-    // Undocumented public methods for DTAPI-internal usage
-    void  SetVidParsPtr(class DtEncVidPars* pVidPars) { m_pVidPars = pVidPars; }
-
-    // Constructor, destructor
-    DtEncVidParsH264(int EncType=-1);
-    bool  operator == (const DtEncVidParsH264&) const;
-    bool  operator != (const DtEncVidParsH264&) const;
-
-private:
-    // Pointer back to top-level video encoding parameters
-    class DtEncVidPars*  m_pVidPars;
-};
-
-//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtEncVidPars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
-//
-// Top-level video encoding parameters class, consisting of:
-//  - Parameters related to preprocessing of the video, before encoding
-//  - Video encoding parameters
-//
-class DtEncVidPars : public DtEncParsBase
-{
-public:
-    // Image inserted at the encoder input when the input signal is lost
-    enum InpLossImage
-    {
-        IL_BLACKFRAME,              // Black frames
-        IL_COLORBARS                // Color bars
-    };
-
-    // Image inserted at the encoder input when the input signal is lost
-    enum UvSampling
-    {
-        UV_420,                     // 4:2:0
-        UV_422                      // 4:2:2
-    };
-
-    // Video input settings (not related to encoding)
-    DtAspectRatio  m_AspectRatio;   // Aspect ratio: 4x3, 16x9 or 14x9
-    bool  m_Dithering;              // Use dithering to reduce 10-bit input data to 8 bits
-    int  m_HorResolutionRescaled;   // Horizontal resolution after rescaling
-    InpLossImage  m_InpLossImage;   // Image to encode when input sync is lossed: 
-                                    // black frames or color bars
-    bool  m_InvTelecineDetect;      // Enable inverse telecine operation
-    int  m_PixelDepth;              // Number of bits per pixel
-    UvSampling  m_UvSampling;       // Chroma subsampling: 4:2:0 or 4:2:2
-    int  m_VidStd;                  // Video standard: DTAPI_VIDSTD_XXX
-
-    // System parameter, but strongly connected to video encoding parameters
-    int  m_EndToEndDelay;           // End-to-end delay in ms
-
-    // Public methods
-    DtEncResult  CheckValidity(bool SkipRateChecks=false) const;
-    DtVidEncStd  GetVidEncStd() const { return m_VidEncStd; }
-    DtEncResult  SetDefaultsForProfileLevel(DtEncVidParsH264::H264Profile, 
-                                                             DtEncVidParsH264::H264Level);
-    DtEncResult  SetDefaultsForProfileLevel(DtEncVidParsMp2V::Mp2VProfile, 
-                                                             DtEncVidParsMp2V::Mp2VLevel);
-    DTAPI_RESULT  SetEncType(int EncType);
-    DTAPI_RESULT  SetVidEncStd(DtVidEncStd);
-    int  TpRate(int PcrInterval) const;
-
-    static DTAPI_RESULT  Es2TpRate(int PcrInterval, int VidStd, int EsRate, int& TpRate);
-    static DTAPI_RESULT  Tp2EsRate(int PcrInterval, int VidStd, int TpRate, int& EsRate);
-
-    // Methods to get a pointer to the encoding parameters for the selected video
-    // encoding standard.
-    DtEncVidParsH264*  H264() const;// H.264 video encoding parameters
-    DtEncVidParsMp2V*  Mp2V() const;// MPEG-2 video encoding parameters
-    
-    // Undocumented public methods for DTAPI-internal usage
-    DTAPI_RESULT  SetDefaultCommonPars(int VidStd);
-    DTAPI_RESULT  SetDefaultPars(DtVidEncStd, int VidStd, bool ApplyVidEncStd);
-    // pParsVidEncStd() can be used for calling generic methods that are independent
-    // of the current video encoding standard.
-    DtEncVidParsStdBase*  ParsForVidEncStd();
-
-    // Constructor, destructor, operators
-    DtEncVidPars(int EncType=-1);
-    DtEncVidPars(const DtEncVidPars&);
-    virtual ~DtEncVidPars();
-    DtEncVidPars&  operator = (const DtEncVidPars&);
-    bool  operator == (const DtEncVidPars&) const;
-    bool  operator != (const DtEncVidPars&) const;
-
-private:
-    DtVidEncStd  m_VidEncStd;       // Video encoding standard
-    DtEncVidParsStdBase*  m_pPars;  // Video encoding parameters, specific to MPEG-2
-                                    // video, H.264, H.265
-    DTAPI_RESULT  SetDefaultPars(); // Set default encoding parameters for 1080i50, H.264
-};
-
-
-
-//=+=+=+=+=+=+=+=+=+=+=+=+=+ TOP-LEVEL ENCODER CONTROL CLASSES +=+=+=+=+=+=+=+=+=+=+=+=+=+
-
-//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtEncPars -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
-//
-// Top-level class for representing encoding parameters.
-//
-class DtEncPars : public DtEncParsBase
-{
-public:
-    int  m_SourcePort;              // Physical port number of encoder source
-                                    // DTA-2180: 1=SDI 2=HDMI
-    DtEncAncPars  m_AncPars;        // Ancillary encoding/embedding parameters
-    DtEncMuxPars  m_MuxPars;        // Multiplexing/"system" parameters
-    DtEncVidPars  m_VidPars;        // Video encoding parameters
-
-    // Audio encoding parameters per audio service. This vector gets sized in SetEncType.
-    std::vector<DtEncAudPars>  m_AudPars;
-   
-    // Methods
-    DtEncResult  CheckValidity(bool SkipRateChecks=false) const;
-    int  MinTsRate() const;
-    int  NumAudPars() const;
-    DTAPI_RESULT  ReqNumLicPoints(DtAudEncStd, int& NumPoints) const;
-    DTAPI_RESULT  SetEncType(int EncType);
-    DTAPI_RESULT  SetVidEncDefaultPars(DtVidEncStd, int VidStd);
-
-    static DTAPI_RESULT  IsSeamless(const DtEncPars&, const DtEncPars&, bool& Seamless);
-
-    // Constructor, destructor, operators
-    DtEncPars(int EncType=-1);
-    DtEncPars(const DtEncPars&);
-    virtual ~DtEncPars();
-    DtEncPars&  operator = (const DtEncPars&);
-    bool  operator == (const DtEncPars&) const;
-    bool  operator != (const DtEncPars&) const;
-       
-    // Serialisation
-    DTAPI_RESULT  FromXml(const std::wstring&); 
-    DTAPI_RESULT  ToXml(std::wstring&);
-};
-
-//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtEncControl -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
-//
-// Top-level class for controlling encoder hardware.
-// This version of the DTAPI supports the DTA-2180 and DTA-2182.
-//
-class DtEncControl
-{
-public:
-    // The 'control state' of the underlying encoder hardware and/or firmware
-    enum OpState
-    {
-        OS_BOOTING,                 // Encoder is booting
-        OS_INIT,                    // Encoder is initializing
-        OS_IDLE,                    // Encoder is initialized, but not encoding
-        OS_RUN,                     // Encoder is running
-        OS_ERROR,                   // Encoder is in an error state 
-        OS_FAN_FAIL,                // Fan is failing
-        OS_NO_POWER                 // Power is not connected to the encoder
-    };
-
-    // Public members
-    DtHwFuncDesc  m_HwFuncDesc;     // Hardware function descriptor
-
-    // Public methods
-    DTAPI_RESULT  GetEncPars(DtEncPars&);
-    DTAPI_RESULT  GetOperationalState(OpState&);
-    DTAPI_RESULT  GetSourcePort(int& Port);
-    DTAPI_RESULT  IsSeamless(const DtEncPars&, bool& Seamless);
-    DTAPI_RESULT  Reboot();
-    DTAPI_RESULT  SetEncPars(const DtEncPars&);
-    DTAPI_RESULT  SetOperationalState(const OpState&);
-    DTAPI_RESULT  WaitForInitialized(int TimeOut);
-
-    // General member functions for top-level hardware abstraction classes
-    DTAPI_RESULT  AttachToPort(DtDevice*, int Port, bool ProbeOnly=false);
-    DTAPI_RESULT  Detach();
-    DTAPI_RESULT  GetCodecVersion(DtAudEncStd, std::wstring&);
-    DTAPI_RESULT  GetCodecVersion(DtVidEncStd, std::wstring&);
-    DTAPI_RESULT  GetDescriptor(DtHwFuncDesc&);
-    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  GetStatistics(int Count, DtStatistic*);
-    DTAPI_RESULT  GetStatistic(int Type, int& Statistic);
-    DTAPI_RESULT  GetStatistic(int Type, double& Statistic);
-    DTAPI_RESULT  GetStatistic(int Type, bool& Statistic);
-    DTAPI_RESULT  GetSupportedStatistics(int& Count, DtStatistic*);
-    DTAPI_RESULT  SetIoConfig(int Group, int Value, int SubValue,
-                                                      __int64 ParXtra0, __int64 ParXtra1);
-
-    // Convenience functions
-    int  Category() { return m_HwFuncDesc.m_DvcDesc.m_Category; }
-    int  FirmwareVersion() { return m_HwFuncDesc.m_DvcDesc.m_FirmwareVersion; }
-    bool  IsAttached() { return m_pEnc != NULL; }
-    int  TypeNumber() { return m_HwFuncDesc.m_DvcDesc.m_TypeNumber; }
-    bool  HasCaps(const DtCaps Caps) const { return ((m_HwFuncDesc.m_Flags&Caps)==Caps); }
-
-    // Undocumented public methods for DTAPI-internal usage
-    DTAPI_RESULT  EnableSettingsVerification(bool Enable);
-    DTAPI_RESULT  GetEncVersion(int& Major, int& Minor, int& BugFix, int& Build);
-
-    // Constructor, destructor, operators
-    DtEncControl();
-    virtual ~DtEncControl();
-    // Disable copy assignment by not providing an implementation for the copy constructor
-private:
-    DtEncControl(const DtEncControl&);
-    DtEncControl&  operator = (const DtEncControl&);
-
-    // Encapsulated data
-protected:
-    class EncControl*  m_pEnc;      // Encoder-control implementation object
-    IXpMutex*  m_pMTLock;           // Multi-threading lock for get/control functions
-    void*  m_pDetachLockCount;
-    int  m_Port;
-    bool  m_WantToDetach;
-    
-// Protected internal helper functions
-protected:
-    DTAPI_RESULT  DetachLock();
-    DTAPI_RESULT  DetachUnlock();
-    DTAPI_RESULT  ControlAccessLock();
-    DTAPI_RESULT  ControlAccessUnlock();
-};
-
-//+=+=+=+=+=+=+=+=+=+=+=+=+=+ HDMI output port control/status +=+=+=+=+=+=+=+=+=+=+=+=+=+=
-
-//-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- struct DtHdmiVidStd -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
-//
-// Structure specifying the video standard on the HDMI port
-//
-struct DtHdmiVidStd
-{
-    int  m_VidStd;                  // Video standard
-    DtAspectRatio  m_AspectRatio;   // Picture Aspect Ratio
-};
-
-//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- DtHdmiTxStatus -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
-//
-//
-struct DtHdmiTxStatus
-{
-    bool  m_MonDetected;                    // True if a monitor is detected
-    bool  m_EdidError;                      // True if an error in the EDID was detected
-    bool  m_SupportHdmi;                    // True if HDMI VSDB (IEEE 0xc03) is available
-    bool  m_SupportYCbCr444;                // True if YCbCr 4:4:4 is supported
-    bool  m_SupportYCbCr422;                // True if YCbCr 4:2:2 is supported
-    bool  m_SupportBasicAudio;              // True if basic audio is supported
-    bool  m_SupportScDc;                    // True if Status and Control Data Channel
-                                            // (SCDC) is supported
-    bool  m_SupportHdr;                     // True if HDR is supported
-    bool  m_ColorimetryForced;              // True if user set the Colorimetry values
-    bool  m_ForceTestPicture;               // True if user forced the test picture
-    bool  m_UsingTestPicture;               // True if test picture is used
-    bool  m_ForceMonitorDetected;           // True if user forced monitor detected
-    bool  m_DisableEdidCheck;               // True if user forced the selected format
-                                            // (ignore EDID check)
-    bool  m_DisableHdmiOutput;              // True if user disabled HDMI output
-    bool  m_ForcedEdid;                     // True if EDID is set by application
-    DtHdmiVidStd  m_UsedVidStd;             // Video standard used 
-    DtHdmiVidStd  m_SelectedVidStd;         // Video standard selected
-    int  m_UsedVidMod;                      // DTAPI_HDMI_VIDMOD_xx video mode used
-    int  m_SelectedVidMod;                  // DTAPI_HDMI_VIDMOD_xx video mode selected
-    // HDR support
-    int  m_SupportedEotf;                   // Supported Electro-Optical Transfer Function
-    int  m_SupportedStaticMetadataDescr;    // Supported Static Metadata Descriptor
-    // Monitor range limits
-    bool  m_SupportMonitorRangeLimits;      // True if monitor range limits are set
-    int  m_MaxPixelClk;                     // Maximum pixel rate clock in MHz
-    int  m_MinVRate;                        // Minimum vertical rate; For interlaced = Field rate
-    int  m_MaxVRate;                        // Maximum vertical rate; interlaced = Field rate
-    int  m_MinHRate;                        // Minimum horizontal rate
-    int  m_MaxHRate;                        // Maximum horizontal rate
-    std::vector<DtHdmiVidStd>  m_MonSupportedVidStd;
-                                            // Vector of supported video standards 
-    //__int64  m_MonSupportedAudio;         // Currently not used
-    unsigned int  m_StateMask;              // State of the HDMI Tx output port
-};
-
-#define DTAPI_HDMI_VIDMOD_YCBCR_422     0
-#define DTAPI_HDMI_VIDMOD_YCBCR_444     1
-#define DTAPI_HDMI_VIDMOD_RGB_444       2
-#define DTAPI_HDMI_VIDMOD_UNKNOWN       -1
-
-//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- class DtAvOutput -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
-//
-//
-
-class AvOutput;
-class DtAvOutput
-{
-public:
-    DtAvOutput();
-    virtual ~DtAvOutput();
-private:
-    // No implementation is provided for the copy constructor
-    DtAvOutput(const DtAvOutput&);
-    DtAvOutput&  operator = (const DtAvOutput&);
-
-public:
-    DtHwFuncDesc  m_HwFuncDesc;     // Hardware function descriptor
-
-                                    // Convenience functions
-public:
-    int  Category()             { return m_HwFuncDesc.m_DvcDesc.m_Category; }
-    int  FirmwareVersion()      { return m_HwFuncDesc.m_DvcDesc.m_FirmwareVersion; }
-    bool  IsAttached()          { return m_pOutp != NULL; }
-    int  TypeNumber()           { 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);
-    DTAPI_RESULT  Detach();
-    DTAPI_RESULT  DisableHdmiEdidCheck(bool Disable);
-    DTAPI_RESULT  DisableHdmiOutput(bool Disable);
-    DTAPI_RESULT  ForceHdmiTestPicture(bool Enable);
-    DTAPI_RESULT  GetHdmiStatus(DtHdmiTxStatus& Status);
-    DTAPI_RESULT  SetHdmiVideoMode(int VidMod);
-    DTAPI_RESULT  SetHdmiColorimetry(int Colorimetry, int ExtendedColorimetry);
-    DTAPI_RESULT  GetHdmiColorimetry(int& Colorimetry, int& ExtendedColorimetry);
-    DTAPI_RESULT  SetHdmiAudioChannel(int AudioCh1, int AudioCh2);
-    DTAPI_RESULT  GetHdmiAudioChannel(int& AudioCh1, int& AudioCh2);
-
-    // Encapsulated data
-private:
-    void*  m_pDetachLockCount;
-protected:
-    AvOutput*  m_pOutp;
-
-    // Private helper functions
-private:
-    DTAPI_RESULT  DetachLock();
-    DTAPI_RESULT  DetachUnlock();
-};
-
-//.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.- 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(const DtDeviceDesc* pDvcDesc, int StringType,
-                                                           char* pString, int StringSize);
-DTAPI_RESULT  DtapiDtDeviceDesc2String(const DtDeviceDesc* pDvcDesc, int StringType, 
-                                                        wchar_t* pString, int StringSize);
-DTAPI_RESULT  DtapiDtHwFuncDesc2String(DtHwFuncDesc* pHwFunc, int StringType, 
-                                                           char* pString, int StringSize);
-DTAPI_RESULT  DtapiDtHwFuncDesc2String(DtHwFuncDesc* pHwFunc, int StringType, 
-                                                        wchar_t* pString, int StringSize);
-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(DtIpPars2& IpPars,
-                                                  const char* pDstIp, const char* pSrcIp);
-DTAPI_RESULT  DtapiInitDtIpParsFromIpString(DtIpPars& IpPars,
-                                            const wchar_t* pDstIp, const wchar_t* pSrcIp);
-DTAPI_RESULT  DtapiInitDtIpParsFromIpString(DtIpPars2& 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, DtFractionInt TsRate);
-DTAPI_RESULT  DtapiModPars2SymRate(int& SymRate, int ModType, int ParXtra0,
-                                 int ParXtra1, int ParXtra2, void* pXtraPars, int TsRate);
-DTAPI_RESULT  DtapiModPars2SymRate(int& SymRate, int ModType, int ParXtra0,
-                       int ParXtra1, int ParXtra2, void* pXtraPars, DtFractionInt TsRate);
-DTAPI_RESULT  DtapiModPars2TsRate(int& TsRate, int ModType, int ParXtra0,
-                                            int ParXtra1, int ParXtra2, int SymRate = -1);
-DTAPI_RESULT  DtapiModPars2TsRate(DtFractionInt& TsRate, int ModType, int ParXtra0,
-                                            int ParXtra1, int ParXtra2, int SymRate = -1);
-DTAPI_RESULT  DtapiModPars2TsRate(int& TsRate, DtDvbC2Pars&, int PlpIdx = 0);
-DTAPI_RESULT  DtapiModPars2TsRate(DtFractionInt& TsRate, DtDvbC2Pars&, int PlpIdx = 0);
-DTAPI_RESULT  DtapiModPars2TsRate(int& TsRate, DtDvbS2Pars&, int PlpIdx = 0);
-DTAPI_RESULT  DtapiModPars2TsRate(DtFractionInt& TsRate, DtDvbS2Pars&, int PlpIdx = 0);
-DTAPI_RESULT  DtapiModPars2TsRate(int& TsRate, DtDvbT2Pars&, int PlpIdx = 0);
-DTAPI_RESULT  DtapiModPars2TsRate(DtFractionInt& TsRate, DtDvbT2Pars&, int PlpIdx = 0);
-DTAPI_RESULT  DtapiModPars2TsRate(int& TsRate, DtIsdbTmmPars&, int TsIdx = 0);
-DTAPI_RESULT  DtapiModPars2TsRate(DtFractionInt& TsRate, DtIsdbTmmPars&, int TsIdx = 0);
-DTAPI_RESULT  DtapiModPars2TsRate(int& TsRate, int ModType, int ParXtra0,
-                                int ParXtra1, int ParXtra2, void* pXtraPars, int SymRate);
-DTAPI_RESULT  DtapiModPars2TsRate(DtFractionInt& 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  DtapiGetVidStdInfo(int VidStd, int  LinkStd, DtVidStdInfo& Info);
-DTAPI_RESULT  DtapiIoStd2VidStd(int Value, int SubValue, int& VidStd);
-DTAPI_RESULT  DtapiIoStd2VidStd(int Value, int SubValue, int& VidStd, int& LinkStd);
-DTAPI_RESULT  DtapiVidStd2IoStd(int VidStd, int& Value, int& SubValue);
-DTAPI_RESULT  DtapiVidStd2IoStd(int VidStd, int  LinkStd, int& Value, int& SubValue);
-const char*  DtapiVidStd2Str(int VidStd);
-const char*  DtapiLinkStd2Str(int LinkStd);
-const char*  DtapiMxFrameStatus2Str(DtMxFrameStatus  Status);
-
-} // namespace Dtapi
-
-#ifndef _NO_USING_NAMESPACE_DTAPI
-using namespace Dtapi;
-#endif
-
-#endif //#ifndef __DTAPI_H

gpac-2.2.1.tar.gz/extra_lib/include/OpenSVCDecoder Deleted

gpac-2.2.1.tar.gz/extra_lib/include/OpenSVCDecoder/ControlLayer.h Deleted

@@ -1,45 +0,0 @@
-/*****************************************************************************
-   *
-   *  SVC4DSP developped in IETR image lab
-   *
-   *
-   *
-   *              Médéric BLESTEL <mblestel@insa-rennes.Fr>
-   *              Mickael RAULET <mraulet@insa-rennes.Fr>
-   *              http://www.ietr.org/
-   *
-   *
-   *
-   *
-   *
-   * This library 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 of the License, or (at your option) any later version.
-   *
-   * This library 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; if not, write to the Free Software
-   * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-   *
-   *
-   * $Id$
-   *
-   **************************************************************************/
-
-#define WINEXPORT
-
-#ifdef TCPMP
-#ifndef POCKET_PC
-#include "windows.h"
-#undef WINEXPORT
-#define WINEXPORT WINAPI
-#endif
-#endif
-
-
-void getLayer(int *num_layer);

gpac-2.2.1.tar.gz/extra_lib/include/OpenSVCDecoder/ParseAU.h Deleted

@@ -1,39 +0,0 @@
-/*****************************************************************************
-*
-*  SVC4DSP developped in IETR image lab
-*
-*
-*
-*              Médéric BLESTEL <mblestel@insa-rennes.Fr>
-*              Mickael RAULET <mraulet@insa-rennes.Fr>
-*              http://www.ietr.org/
-*
-*
-*
-*
-*
-* This library 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 of the License, or (at your option) any later version.
-*
-* This library 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; if not, write to the Free Software
-* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-*
-*
-* $Id$
-*
-**************************************************************************/
-
-
-
-void ParseAuPlayers(void *PlayerStruct, const unsigned char *buf, int buf_size, int nal_length_size, int is_avc);
-int GetDqIdMax(const unsigned char *buf, int buf_size, int nal_length_size, int *DqidTable, int is_avc);
-int Geth264NalSize(const unsigned char *buf, int buf_size, int *bufindex);
-

gpac-2.2.1.tar.gz/extra_lib/include/OpenSVCDecoder/SVCDecoder_ietr_api.h Deleted

@@ -1,144 +0,0 @@
-/*****************************************************************************
-*
-*  SVC4DSP developped in IETR image lab
-*
-*
-*
-*              Médéric BLESTEL <mblestel@insa-rennes.Fr>
-*              Mickael RAULET <mraulet@insa-rennes.Fr>
-*              http://www.ietr.org/
-*
-*
-*
-*
-*
-* This library 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 of the License, or (at your option) any later version.
-*
-* This library 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; if not, write to the Free Software
-* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-*
-*
-* $Id$
-*
-**************************************************************************/
-
-#ifndef _SVCDecoder_ietr_api_h
-#define _SVCDecoder_ietr_api_h
-
-
-#include "SvcInterface.h"
-
-
-enum {
-	SVC_STATUS_ERROR	= -1,
-	SVC_STATUS_OK	    = 0,	// no error and no frame ready
-	SVC_IMAGE_READY     = 1,	// no error and image ready
-	SVC_GHOST_IMAGE		= 2		// no image for chosen layer but image could be ready for other layers
-};
-
-
-/*======================================================================================================
-int SVCDecoder_init();
-This method initializes the internal resources of the decoder
-@return SVC_STATUS_OK if creation is successful
-======================================================================================================*/
-int SVCDecoder_init(void **PlayerStruct);
-
-
-/*======================================================================================================
-void UpdateLayer(int *DqIdTable, int *CurrDqId, int MaxDqId, int Command);
-Use this method to change of quality, spatial or temporal scalability during the 
-decoding process.
-The DqIdTable specifies the DqId of each layer present into the stream.
-CurrDqId specifies the DqId of the current layer.
-MaxDqId specifies the maximal DqId present into the access unit.
-Command specifies the action to execute:
-0: To switch down of spatial or quality scalability
-1: To switch up of spatial or quality scalability 
-2: To switch up to the layer with the higthest DqId
-3: To switch down of temporal scalability
-4: To switch up of temporal scalability
-@return nothing
-=======================================================================================================*/
-void UpdateLayer(int *DqIdTable, int *CurrDqId, int *TemporalCom, int *TemporalId, int MaxDqId, int Command);
-
-
-
-/*======================================================================================================
-void SetCommandLayer(int *Command, int DqIdMax, int CurrDqId, int *TemporalCom, int TemporalId);
-Use this method to generate the right command for the SVC decoder.
-The Command is a 4 size table given to the decoder.
-DqIdMax specifies the maximal DqId present into the access unit.
-CurrDqId specifies the DqId of the current layer.
-TemporalCom is the command to use concerning the temporal scalability.
-0 -> do nothing
-1 -> decode a lower temporal scalability.
-2 -> decode a highter temporal scalability.
-3 -> define a specific temporal scalability. (use TemporalId variable to set).
-@return nothing
-=======================================================================================================*/
-void SetCommandLayer(int *Command, int DqIdMax, int CurrDqId, int *TemporalCom, int TemporalId);
-
-
-/*======================================================================================================
-int decodeNAL(	unsigned char* nal, int nal_length, OPENSVCFRAME *Frame, int DqIdMax);
-Use this method to give a new NAL Unit to the decoder. The NAL content (no start code)
-is stored at the address given by the argument pNAL and the length of the NAL is provided 
-by the argument nal_length. Memory of this nal buffer is managed by the application.
-If the function returns the code SVC_IMAGE_READY, this means that an image is ready and in this case, 
-the arguments *Frame has been updated by the decoder and the image plans are contained at 
-the addresses pY, PU, pV.
-The image stored at these location is an image centered in a rectangle of size (*pWidth + 32, *pHeight + 32)
-for Y and ((*pWidth + 32) / 2, (*pHeight + 32) / 2)) for U and V.
-Memory of these image buffers is managed by the decoder.
-In case of a SVC stream, the largest DqIq of the Access Unit should be given.
-
-@param nal is the address of the buffer that contains the NAL unit
-@param nal_length is the size of NAL Unit data
-@param Frame Contains all parameters from the displayed picture
-@param DQIdMax is the largest DQId of the current access unit
-@return SVC_STATUS_OK or SVC_STATUS_ERROR or SVC_IMAGE_READY or SVC_GHOST_IMAGE
-======================================================================================================*/
-int decodeNAL(void *PlayerStruct, unsigned char* nal, int nal_length, OPENSVCFRAME *Frame, int *LayerCommand); 
-
-
-/*======================================================================================================
-int SVCDecoder_close();
-This method releases the internal resources of the decoder
-@return SVC_STATUS_OK if creation is successfull
-=======================================================================================================*/
-int SVCDecoder_close(void *PlayerStruct);
-
-/*======================================================================================================
-int  GetDqIdMax(const unsigned char *buf, int buf_size, int nal_length_size, int *DqidTable, int is_avc);
-This method return the max DqId commputed into the access unit.
-This method should be called once in each access unit.
-@param buf is the input data to decode
-@param buf_size is the size of access unit
-@param nal_length_size is the start code length
-@param DqidTable is a table in which all DqId will be stored.
-@param is_avc indicates if the stream contained SVC NAL.
-=======================================================================================================*/
-int GetDqIdMax(const unsigned char *buf, int buf_size, int nal_length_size, int *DqidTable, int is_avc);
-
-
-/*======================================================================================================
-void ParseAuPlayers(void *PlayerStruct, const unsigned char *buf, int buf_size, int nal_length_size, int is_avc;
-This method parses the first access unit in order to configure the decoder.
-This method has to be done once by video.
-@param buf is the input data to decode
-@param buf_size is the size of access unit
-@param nal_length_size is the start code length
-@param is_avc indicates if the stream contained SVC NAL.
-=======================================================================================================*/
-void ParseAuPlayers(void *PlayerStruct, const unsigned char *buf, int buf_size, int nal_length_size, int is_avc);
-#endif	// SVCDecoder_ietr_api

gpac-2.2.1.tar.gz/extra_lib/include/OpenSVCDecoder/SvcInterface.h Deleted

@@ -1,60 +0,0 @@
-/*****************************************************************************
-*
-*  SVC4DSP developped in IETR image lab
-*
-*
-*
-*              Médéric BLESTEL <mblestel@insa-rennes.Fr>
-*              Mickael RAULET <mraulet@insa-rennes.Fr>
-*              http://www.ietr.org/
-*
-*
-*
-*
-*
-* This library 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 of the License, or (at your option) any later version.
-*
-* This library 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; if not, write to the Free Software
-* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-*
-*
-* $Id$
-*
-**************************************************************************/
-
-#ifndef SVCINTERFACE_H
-#define SVCINTERFACE_H
-
-#define QoE_
-
-#ifdef QoE
-#include "SvcToQoE.h"
-#endif
-
-
-typedef struct{
-
-	int Width;				//Output frame width
-	int Height;				//Output frame height
-	int Address;
-	unsigned char* pY1;	//Output frame Y
-	unsigned char* pU1;	//Output frame U
-	unsigned char* pV1;	//Output frame V
-
-#ifdef QoE
-	SVCTOQOE *QoEData1;	//QoE structure
-#endif
-
-} OPENSVCFRAME;
-
-
-#endif

gpac-2.2.1.tar.gz/extra_lib/include/a52dec Deleted

gpac-2.2.1.tar.gz/extra_lib/include/a52dec/a52.h Deleted

@@ -1,62 +0,0 @@
-/*
- * a52.h
- * Copyright (C) 2000-2002 Michel Lespinasse <walken@zoy.org>
- * Copyright (C) 1999-2000 Aaron Holtzman <aholtzma@ess.engr.uvic.ca>
- *
- * This file is part of a52dec, a free ATSC A-52 stream decoder.
- * See http://liba52.sourceforge.net/ for updates.
- *
- * a52dec is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * a52dec 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#ifndef A52_H
-#define A52_H
-
-#ifndef LIBA52_DOUBLE
-typedef float sample_t;
-#else
-typedef double sample_t;
-#endif
-
-typedef struct a52_state_s a52_state_t;
-
-#define A52_CHANNEL 0
-#define A52_MONO 1
-#define A52_STEREO 2
-#define A52_3F 3
-#define A52_2F1R 4
-#define A52_3F1R 5
-#define A52_2F2R 6
-#define A52_3F2R 7
-#define A52_CHANNEL1 8
-#define A52_CHANNEL2 9
-#define A52_DOLBY 10
-#define A52_CHANNEL_MASK 15
-
-#define A52_LFE 16
-#define A52_ADJUST_LEVEL 32
-
-a52_state_t * a52_init (uint32_t mm_accel);
-sample_t * a52_samples (a52_state_t * state);
-int a52_syncinfo (uint8_t * buf, int * flags,
-		  int * sample_rate, int * bit_rate);
-int a52_frame (a52_state_t * state, uint8_t * buf, int * flags,
-	       sample_t * level, sample_t bias);
-void a52_dynrng (a52_state_t * state,
-		 sample_t (* call) (sample_t, void *), void * data);
-int a52_block (a52_state_t * state);
-void a52_free (a52_state_t * state);
-
-#endif /* A52_H */

gpac-2.2.1.tar.gz/extra_lib/include/a52dec/mm_accel.h Deleted

@@ -1,37 +0,0 @@
-/*
- * mm_accel.h
- * Copyright (C) 2000-2002 Michel Lespinasse <walken@zoy.org>
- * Copyright (C) 1999-2000 Aaron Holtzman <aholtzma@ess.engr.uvic.ca>
- *
- * This file is part of a52dec, a free ATSC A-52 stream decoder.
- * See http://liba52.sourceforge.net/ for updates.
- *
- * a52dec is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * a52dec 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#ifndef MM_ACCEL_H
-#define MM_ACCEL_H
-
-/* generic accelerations */
-#define MM_ACCEL_DJBFFT		0x00000001
-
-/* x86 accelerations */
-#define MM_ACCEL_X86_MMX	0x80000000
-#define MM_ACCEL_X86_3DNOW	0x40000000
-#define MM_ACCEL_X86_MMXEXT	0x20000000
-
-uint32_t mm_accel (void);
-
-#endif /* MM_ACCEL_H */

gpac-2.2.1.tar.gz/extra_lib/include/avcap Deleted

gpac-2.2.1.tar.gz/extra_lib/include/avcap/CaptureDevice.h Deleted

@@ -1,189 +0,0 @@
-/*
- * (c) 2005, 2008 Nico Pranke <Nico.Pranke@googlemail.com>, Robin Luedtke <RobinLu@gmx.de>
- *
- * This file is part of avcap.
- *
- * avcap is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * avcap 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with avcap.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/* avcap is free for non-commercial use.
- * To use it in commercial endeavors, please contact Nico Pranke <Nico.Pranke@googlemail.com>
- */
-
-
-#ifndef CAPTUREDEVICE_H_
-#define CAPTUREDEVICE_H_
-
-#include <string>
-#include <list>
-
-#include "avcap-export.h"
-#include "DeviceDescriptor.h"
-
-//! This is the namespace which contains all classes of the avcap-library.
-
-namespace avcap
-{
-	// forward declarations
-	class ConnectorManager;
-	class ControlManager;
-	class CaptureManager;
-	class DeviceDescriptor;
-	class FormatManager;
-
-	/*! \brief This class is an abstraction of a video capture device.
-	 *
-	 * It is the main entry point for an application to access the functionality of
-	 * a capture device, i.e. to query capabilities and settings of the device, to
-	 * manipulate them and to capture the video.
-	 *
-	 * The access to the functionality of a capture device is divided into different domains and is
-	 * provided by so called managers. See the documentation of the various Manager-classes for
-	 * the details of their usage. The managers and their responsibilities are:
-	 *
-	 * <ul>
-	 * <li> CaptureManager: start/stop capture and register a capture-handler </li>
-	 * <li> ConnectorManager: query available inputs/outputs of the device and get/set them</li>
-	 * <li> ControlManager: query available controls of the device and get/set their values </li>
-	 * <li> FormatManager: query and get/set available formats,
-	 * 	their properties and resolutions associated with them </li>
-	 * </ul>
-	 *
-	 * CaptureDevice-classes implementing the back-end for a certain capture-API must derive from this class and
-	 * implement the abstract methods to provide the API-specific manager-classes.
-	 * However, if you want to use avcap only, you can use one of the following implementations,
-	 * representing the supported, existing devices (depending on the operating system avcap has
-	 * been build on, not all of them may be available and/or not all methods of their managers are implemented):
-	 *
-	 * <ul>
-	 * <li> V4L2_Device (Linux): devices that are supported by a Video4Linux2-API driver
-	 * (Requires read/write access to the /dev/video* -file of the device)</li>
-	 * <li> V4L1_Device (Linux): devices that are supported by a Video4Linux-API driver
-	 * (Requires read/write access to the /dev/video* -file of the device)</li>
-	 * <li> AVC_Device (Linux): support for AV/C-Devices (e.g. DV-Cams).
-	 * (Requires: libiec61883, libavc1394, librom1394, libraw1394 and read/write access to /dev/raw1394)</li>
-	 * <li> QT_Device (MAC OS X): capture from a device using the QuickTime SampleGrabber </li>
-	 * <li> DS_Device (Win32): capture from a device using a DirectShow filter-graph</li>
-	 * </ul>
-	 *
-	 * A concrete CaptureDevice-object must not be created manually. A unique instance can be obtained by calling
-	 * the method DeviceDescriptor::getDevice() between successive calls to DeviceDescriptor::open() and close().
-	 * All available DeviceDescriptors representing the capture devices found on a system can be obtained by calling
-	 * DeviceCollector::instance()->getDeviceList(). The CaptureDevice-object is owned by the DeviceDescriptor,
-	 * so you must not delete the CaptureDevice instance.
-	 *
-	 */
-
-	class AVCAP_Export CaptureDevice
-	{
-	public:
-		//! Constructor
-		inline CaptureDevice()
-			{}
-
-		//! Destructor
-		virtual inline ~CaptureDevice()
-			{}
-
-		//! Return the descriptor of the device.
-		/*! \return The DeviceDescriptor-object.*/
-		virtual const DeviceDescriptor* getDescriptor() = 0;
-
-		//! Use this manager to start/stop capturing and to register a user defined CaptureHandler.
-		/*! \return The VidCapManager.*/
-		virtual CaptureManager* getVidCapMgr() = 0;
-
-		//! Use this manager to query available audio/video inputs/outputs and to select them.
-		/*! \return The ConnectorManager. */
-		virtual ConnectorManager* getConnectorMgr() = 0;
-
-		/*! Use this manager to query and to adjust the available controls of the device (e.g.
-		 * brightness, contrast, saturation...).
-		 * \return The ControlManager. */
-		virtual ControlManager*	getControlMgr() = 0;
-
-		//! Use this manager to query the available formats, video standards and resolutions to select the desired ones.
-		/*! \return The FormatManager. */
-		virtual FormatManager* getFormatMgr() = 0;
-
-	private:
-		//! Open the device and do initialization. May fail, if already opened before.
-		/*! This method creates the managers. Don't use them before open() has been called.
-		 * \return 0 if successful, -1 else
-		 * */
-		virtual int open() = 0;
-
-		//! Close the device and do cleanup.
-		/*! All IOBuffers received by a capture-CallbackHandler should have called their
-		 * release()-method, before close() is called to ensure propper cleanup. Usually this is guaranteed,
-		 * if the buffer is released in the context of the capture-thread from within handleCapture().
-		 * All managers are destroyed by this method and are thus not available anymore after calling close().
-		 * \return 0 if successful, -1 else */
-		virtual int close() = 0;
-	};
-}
-
-#endif // CAPTUREDEVICE_H_
-
-/*! \mainpage avcap-library
- *
- * \section intro Introduction
- *
- * The avcap-library is a cross-API, cross-platform simple and easy to use C++
- * video capture library. It's aim is to provide a unified API for
- * Linux, Windows and Mac OS X to capture video from appropriate hardware. It hides the
- * system specific quirks and issues of different API's used on different systems to access video
- * capture hardware and hopefully helps to write portable capture-applications.
- *
- * \subsection linux Linux
- * Under GNU/Linux the avcap-library supports Video4Linux-Devices, Video4Linux2-Devices and AV/C-Devices (e.g.
- * DV-Cams) as capture sources. Note that you need read/write permission to the /dev/video* files
- * to use V4L(2)-Devices. Usually it is sufficient, if the user is a member of the group that owns this files
- * (usually group 'video'). To capture from AV/C-Devices the user needs read/write permission to /dev/raw1394. Membership
- * in the group 'disk' should be sufficient here.
- *
- * \subsection windows Win32 (Implementation by Robin Luedtke, Nico Pranke)
- * The Windows-version is basically a class wrapper for the DirectShow API and thus
- * supports only devices with a WDM (Windows driver model) or an old VFW (Video for
- * windows) compliant capture device driver. Understanding the avcap Win32 implementation
- * may be a little difficult because of the following reasons:
- * First, DirectShow is based on the Windows COM (component object model), second,
- * in some cases, DirectShow is a little confusing (e.g. some DirectShow functions have a strange behavior -- workarounds
- * are inevitable).
- * In addition to this, VFW, WDM and even WDM devices itself are handled differently by DirectShow.
- * Third, some important documentation is missing in the DirectShow documentation.\n \n
- *
- * \subsection mac Mac OS X
- *
- * The implementation for Darwin uses the QuickTime SequenceGrabber-Component and has been tested with the built-in
- * iSight, various USB-cams and DV-Cams.
- *
- * \section install Building and Installation
- *
- * See the INSTALL file.
- *
- * \section Usage
- *
- * For an example on how to use the avcap-library take a look at the captest-program and read the documentation of
- * class CaptureDevice to have a good starting point.
- *
- * \section licence Licence
- *
- * (c) 2005-2008 Nico Pranke <Nico.Pranke@googlemail.com>, Win32 implementation by Robin Luedtke <RobinLu@gmx.de> \n\n
- *
- * For non-commercial use, avcap is distributed under the GNU General Public License version 2. Refer to the file "COPYING" for details.
- *
- * For commercial use, please contact Nico Pranke <Nico.Pranke@googlemail.com> for licensing.
-*/
-

gpac-2.2.1.tar.gz/extra_lib/include/avcap/CaptureHandler.h Deleted

@@ -1,58 +0,0 @@
-/*
- * (c) 2005, 2008 Nico Pranke <Nico.Pranke@googlemail.com>, Robin Luedtke <RobinLu@gmx.de> 
- *
- * This file is part of avcap.
- *
- * avcap is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * avcap 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with avcap.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/* avcap is free for non-commercial use.
- * To use it in commercial endeavors, please contact Nico Pranke <Nico.Pranke@googlemail.com>
- */
-
-#ifndef CAPTUREHANDLER_H_
-#define CAPTUREHANDLER_H_
-
-#include "avcap-export.h"
-
-namespace avcap
-{
-	//! Abstract base class for capture handlers.
-
-	/*! If an application wants to capture data, it must implement a CaptureHandler and must register it
-	 * with the VidCapManager of the CaptureDevice. The VidCapManager will call handleCaptureEvent() 
-	 * always a new frame has been captured. If the buffer isn't used  
-	 * anymore the IOBuffer::release() method must be called in order to enable the
-	 * VidCapManager to reuse or release the buffer. */
-
-	class AVCAP_Export CaptureHandler
-	{
-	public:
-		//! Consturctor
-		inline CaptureHandler() 
-			{}
-			
-		//! Destructor
-		virtual inline ~CaptureHandler() 
-			{}
-		
-		//! This method is called if a new frame has been captured by the VidCapManager.
-		/*! If the buffer isn't used anymore, then the method IOBuffer::release() must be
-		 * called. 
-		 * \param io_buf The buffer containing the captured frame. */
-		virtual void handleCaptureEvent(class IOBuffer* io_buf) = 0;
-	};
-}
-
-#endif // CAPTUREHANDLER_H_

gpac-2.2.1.tar.gz/extra_lib/include/avcap/CaptureManager.h Deleted

@@ -1,132 +0,0 @@
-/*
- * (c) 2005, 2008 Nico Pranke <Nico.Pranke@googlemail.com>, Robin Luedtke <RobinLu@gmx.de> 
- *
- * This file is part of avcap.
- *
- * avcap is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * avcap 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with avcap.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/* avcap is free for non-commercial use.
- * To use it in commercial endeavors, please contact Nico Pranke <Nico.Pranke@googlemail.com>
- */
-
-#ifndef CAPTUREMANAGER_H_
-#define CAPTUREMANAGER_H_
-
-#if !defined(_MSC_VER) && !defined(USE_PREBUILD_LIBS)
-# include "avcap-config.h"
-#endif
-
-#include "avcap-export.h"
-
-namespace avcap
-{
-	class CaptureHandler;
-	class IOBuffer;
-	
-	//! Abstract interface to access capture related tasks of a CaptureDevice.
-	
-	/*! An implementation of this class is provided by the API-specific CaptureDevice. 
-	 * The CaptureManager can be used by applications to register a CaptureHandler and
-	 * to start/stop the capture. There is only one CaptureHandler at the same time.
-	 * To distribute the captured data to more than one interested sink is the responsibility 
-	 * of the application. */
-	
-	class AVCAP_Export CaptureManager
-	{
-	public:
-		enum
-		{
-			MAX_BUFFERS = 32,	//!< The maximum number of IOBuffers.
-			DEFAULT_BUFFERS = 16	//!< The default number of used IOBuffers.
-		};
-		
-			
-#ifdef AVCAP_LINUX
-		enum IOMethod
-		{
-			IO_METHOD_NOCAP = 0,
-	        IO_METHOD_READ,
-	        IO_METHOD_MMAP,
-	        IO_METHOD_USERPTR,
-		};
-#endif
-
-	private:
-		CaptureHandler*	mCaptureHandler;
-		
-	public:
-		//! Constructor
-		inline CaptureManager() : mCaptureHandler(0)
-			{}
-		
-		//! Destructor
-		virtual inline ~CaptureManager()
-			{}
-		
-		//! Do basic initialization after startup.
-		virtual int init() = 0;
-		
-		//! Called before object destruction.
-		virtual int destroy() = 0;
-		
-		//! Start capturing data.
-		virtual int startCapture() = 0;
-		
-		//! Stop capturing data.
-		virtual int stopCapture() = 0;
-		
-		//! Register a capture handler.
-		/*! Only one capture handler can be registered at the same time.
-		 * The handlers CaptureHandler::handleCaptureEvent() method will be called,
-		 * if new data has been captured. The ownership of the handler remains at the caller.
-		 * He is responsible for removing and deleting the handler. 
-		 * \param handler The capture handler implementation.*/
-		virtual inline void registerCaptureHandler(CaptureHandler *handler) 
-			{ mCaptureHandler = handler; }
-
-		//! Remove the current capture handler.
-		/*! If a capture handler was registered before, then this handler will not be 
-		 * notified anymore if data has been captured. */ 
-		virtual inline void removeCaptureHandler()
-			{ mCaptureHandler = 0; }
-		
-		//! Get the current CaptureHandler.
-		/*! Return the capture handler currently registered with registerCaptureHandler()
-		 * or 0, if no handler was registered before.
-		 * \return pointer to the capture handler */ 
-		virtual inline CaptureHandler* getCaptureHandler()
-			{ return mCaptureHandler; }
-		
-		//! Returns the number of IOBuffers currently available.
-		/*! The CaptureManager usually waits to capture the next frame until an IOBuffer is available.
-		 * The application is reponsible to release the IOBuffers to make it available to the capture manager.
-		 * \return the number of IOBuffers. */
-		virtual int getNumIOBuffers() = 0;
-		
-	private:
-		//! Dequeue the next buffer.
-		/*! \return the next buffer with captured data. */
-		virtual IOBuffer* dequeue() = 0;
-
-		//! Enqueue a buffer.
-		/*! \param buf the buffer that isn't used by the application anymore and that can be reused now. 
-		 * \return 0 success, -1 on failure*/
-		virtual int enqueue(IOBuffer* buf) = 0;
-
-		friend class IOBuffer;
-	};
-};
-
-#endif // CAPTUREMANAGER_H_

gpac-2.2.1.tar.gz/extra_lib/include/avcap/Connector.h Deleted

@@ -1,121 +0,0 @@
-/*
- * (c) 2005, 2008 Nico Pranke <Nico.Pranke@googlemail.com>, Robin Luedtke <RobinLu@gmx.de> 
- *
- * This file is part of avcap.
- *
- * avcap is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * avcap 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with avcap.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/* avcap is free for non-commercial use.
- * To use it in commercial endeavors, please contact Nico Pranke <Nico.Pranke@googlemail.com>
- */
-
-
-#ifndef CONNECTOR_H_
-#define CONNECTOR_H_
-
-#if !defined(_MSC_VER) && !defined(USE_PREBUILD_LIBS)
-# include "avcap-config.h"
-#endif
-
-#ifdef AVCAP_LINUX
-# include <linux/types.h>
-# ifdef AVCAP_HAVE_V4L2
-#  include <linux/videodev2.h>
-# else
-#  include <linux/videodev.h>
-# endif
-#endif
-
-#include <string>
-#include <list>
-
-#include "avcap-export.h"
-
-namespace avcap
-{	
-	// forward declaration
-	class DeviceDescriptor;
-	class Tuner;
-	
-	//! This class is the abstraction of a video/audio input or output.
-	
-	/*! It is used to describe available inputs and outputs of a device and 
-	 * to select them by means of the API-dependent CaptureDevices implementation of the ConnectorManager. 
-	 * The ConnectorManager queries all available connectors of a device and 
-	 * provides methods to set and get the currently used ones.
-	 */
-	 
-	class AVCAP_Export Connector
-	{
-	public:
-#ifdef AVCAP_LINUX
-		enum
-		{
-			INPUT_TYPE_TUNER = V4L2_INPUT_TYPE_TUNER
-		};
-#endif
-		
-	protected:
-		DeviceDescriptor*	mDeviceDescriptor;
-		int					mIndex;
-		int					mAudioset;
-		int					mType;
-		std::string			mName;
-		
-	public:
-		//! The Constructor. Objects of this class are created by the ConnectorManager.
-		inline Connector(DeviceDescriptor *dd, int index, const std::string& name, int type=0, int audioset=0):
-			mDeviceDescriptor(dd), mIndex(index), mAudioset(audioset), mType(type), mName(name)
-			{}
-
-		//! The Destructor. 
-		virtual inline ~Connector() 
-			{}
-
-		//! Returns the unique index of the connector.
-		/*! \return The index. */
-		inline int getIndex() const 
-			{ return mIndex; }
-		
-		//! Get mapping of audio inputs to video inputs.
-		/*! For devices which provide audio and video capturing, 
-		 * video inputs can correspond to zero or more audio inputs. The audio inputs 
-		 * are numbered from 0 to N-1, N <= 32. Each bit of the audioset corresponds
-		 * to one input. For details, see the Video4Linux2 API Documentation.
-		 * \n\n<b>Win32:</b> A video connector can correspond to only one audio connector
-		 * (only one bit can be set at a time). */
-		inline int getAudioset() const 
-			{ return mAudioset; }
-		
-		//! Get the tuner associated with the Connector.
-		/*! If a tuner is associated whith the connector (e.g. for TV-Tuner cards), then this method returns
-		 * an object of class Tuner to access the tuner specific functionality.
-		 * \return object of class Tuner or 0 if there is no tuner. */
-		virtual inline Tuner* getTuner() 
-			{ return 0; }
-		
-		//! Provides a textual description of the connector. 
-		/*! \return connector name. */
-		inline const std::string& getName() const 
-			{ return mName; }
-		
-		//! Test, whether a tuner is associated with the connector or not.
-		/*! \return true, if tuner is associated, false otherwise. */
-		virtual inline bool hasTuner() const 
-			{ return false; }
-	};
-};
-
-#endif // CONNECTOR_H_

gpac-2.2.1.tar.gz/extra_lib/include/avcap/ConnectorManager.h Deleted

@@ -1,151 +0,0 @@
-/*
- * (c) 2005, 2008 Nico Pranke <Nico.Pranke@googlemail.com>, Robin Luedtke <RobinLu@gmx.de> 
- *
- * This file is part of avcap.
- *
- * avcap is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * avcap 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with avcap.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/* avcap is free for non-commercial use.
- * To use it in commercial endeavors, please contact Nico Pranke <Nico.Pranke@googlemail.com>
- */
-
-
-#ifndef CONNECTORMANAGER_H_
-#define CONNECTORMANAGER_H_
-
-#include <list>
-
-#include "Connector.h"
-#include "Manager.h"
-#include "avcap-export.h"
-
-namespace avcap
-{	
-class DeviceCollector;
-
-	//! This class is the interface to query and select the available video/audio inputs/outputs.
-	 
-	/*! This class manages STL-lists of objects of class Connector which describe 
-	 * an input or output of a capture device. Applications can get these lists and get/set
- 	 * the currently used connector of a special type. The methods to deal
-	 * with outputs are only of partial interest for capturing but have been added
-	 * for completeness.
-	 * Application must use the API-dependent CaptureDevice-object to get an ConnectorManager.
-	 * The default implementations of the mehtods in this class are a noop.
-	 */
-
-	class AVCAP_Export ConnectorManager: public Manager<Connector>
-	{	
-	protected:
-		// Connector Lists
-		ListType		mVideoInputs;
-		ListType		mAudioInputs;
-		ListType		mVideoOutputs;
-		ListType		mAudioOutputs;
-		
-	public:		
-		//! Construct the manager and query for available inputs and outputs for audio and video.
-		/*! The manager is usualy created by an CaptureDevice object.
-		 * \param dd The DeviceDescriptor to acces the device. */
-		ConnectorManager(DeviceDescriptor *dd);
-
-		//! The destructor. */
-		virtual ~ConnectorManager() = 0;
-		
-		//! Returns the Connector describing the currently used video input.
-		/*! The default-implementation returns 0. 
-		 * \return video input connector.*/
-		virtual inline Connector* getVideoInput()
-			{ return 0; }
-
-		//! Sets the currently used video input.
-		/*! The default-implementation is a noop and returns -1. 
-		 * \param c The connector to use for the video input.
-		 * \return 0, if succesful, -1 else*/
-		virtual inline int setVideoInput(Connector* c)
-			{ return -1; }
-			
-		//! Returns the Connector describing the currently used audio input. 
-		/*! The default-implementation returns 0. 
-		 * \return audio input connector.*/
-		virtual inline Connector* getAudioInput()
-			{ return 0; }
-
-		//! Sets the currently used audio input.
-		/*! The default-implementation is a noop and returns -1. 
-		 * \param c The connector to use for the audio input.
-		 * \return 0, if succesful, -1 else*/
-		virtual inline int setAudioInput(Connector* c)
-			{ return -1; }
-		
-		//! Returns the Connector describing the currently used video output.
-		/*! The default-implementation returns 0. 
-		 * \return video output connector.*/
-		virtual inline Connector* getVideoOutput()
-			{ return 0; }
-		
-		//! Sets the currently used video output.
-		/*! The default-implementation is a noop and returns -1. 
-		 * \param c The connector to use for the video input.
-		 * \return 0, if succesful, -1 else*/
-		virtual inline int setVideoOutput(Connector* c)
-			{ return -1; }
-			
-		//! Returns the Connector describing the currently used audio output. 
-		/*! The default-implementation returns 0. 
-		 * \return audio output connector.*/		
-		virtual inline Connector* getAudioOutput()
-			{ return 0; }
-
-		//! Sets the currently used audio output.
-		/*! The default-implementation is a noop and returns -1. 
-		 * \param c The connector to use for the audio output.
-		 * \return 0, if succesful, -1 else*/
-		virtual inline int setAudioOutput(Connector* c)
-			{ return -1; }
-
-		//! Get the list of available video inputs of the device.
-		/*! \return STL-list of pointers to objects of type 
-		 * Connector describing the available video inputs. */
-		inline const ListType& getVideoInputList() const 
-			{ return mVideoInputs; }
-		
-		//! Get the list of available audio inputs of the device.
-		/*! \return STL-list of pointers to objects of type 
-		 * Connector describing the available audio inputs. */		
-		inline const ListType& getAudioInputList() const 
-			{ return mAudioInputs; }	
-
-		//! Get the list of available video outputs of the device.
-		/*! \return STL-list of pointers to objects of type 
-		 * Connector describing the available video outputs. */
-		inline const ListType& getVideoOutputList() const 
-			{ return mVideoOutputs; }	
-
-		//! Get the list of available audio outputs of the device.
-		/*! \return STL-list of pointers to objects of type 
-		 * Connector describing the available audio outputs. */
-		inline const ListType& getAudioOutputList() const 
-			{ return mAudioOutputs; }
-
-		//! This method is called after creation to query for video/audio in- and outputs.
-		virtual void query() = 0;
-
-	private:
-		void clearList(ConnectorManager::ListType& list);
-	};
-}
-
-#endif //CONNECTORMANAGER_H_

gpac-2.2.1.tar.gz/extra_lib/include/avcap/ControlManager.h Deleted

@@ -1,82 +0,0 @@
-/*
- * (c) 2005, 2008 Nico Pranke <Nico.Pranke@googlemail.com>, Robin Luedtke <RobinLu@gmx.de> 
- *
- * This file is part of avcap.
- *
- * avcap is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * avcap 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with avcap.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/* avcap is free for non-commercial use.
- * To use it in commercial endeavors, please contact Nico Pranke <Nico.Pranke@googlemail.com>
- */
-
-#ifndef CONTROLMANAGER_H_
-#define CONTROLMANAGER_H_
-
-#include <string>
-#include <list>
-
-#include "Control_avcap.h"
-#include "Manager.h"
-#include "avcap-export.h"
-
-namespace avcap
-{
-	//! Abstract base for classes that manage the controls of a capture device.
-	
-	/*! Devices have typically a number of user-setable controls (e.g. brightness, hue,...).
-	 * The number of controls, the type and possible values will vary from device to device.
-	 * The ControlManager queries for available controls, their type and valid values.
-	 * It provides a STL-List of Control-derived objects which represents the functonality of a
-	 * device control. The concrete ControlManager may not be instantiated
-	 * by the application but can be obtained from the CaptureDevice object. */
-	
-	class AVCAP_Export ControlManager:public Manager<Control>
-	{
-	protected:
-		ListType mControls;
-	
-	public:
-		//! The constructor. 
-		/*! \param dd The device descriptor to access the device. */
-		ControlManager(DeviceDescriptor *dd);
-	
-		//! The destructor.
-		virtual ~ControlManager() = 0;
-	
-		//! Find a control by name.
-		/*! \param name The name of the control to find.
-		 * \return Pointer to the control or 0, if no control was found. */
-		Control* getControl(const std::string& name);
-	
-		//! Find a control by id.
-		/*! \param id The id of the control to find.
-		 * \return Pointer to the control or 0, if no control was found. */
-		Control* getControl(int id);
-	
-		//! Returns the STL-list of Control objects.
-		/*! \return The control list. */
-		inline const ListType& getControlList() 
-			{ return (const ListType&) mControls; }
-	
-		//! Reset all controls to their default values,i.e. calls the reset()-method of all managed controls.
-		/*! \return 0 if successful, -1 else */
-		virtual int resetAll();
-	
-		virtual void query() = 0;
-	};
-}
-
-
-#endif //CONTROLMANAGER_H_

gpac-2.2.1.tar.gz/extra_lib/include/avcap/Control_avcap.h Deleted

@@ -1,206 +0,0 @@
-/*
- * (c) 2005, 2008 Nico Pranke <Nico.Pranke@googlemail.com>, Robin Luedtke <RobinLu@gmx.de> 
- *
- * This file is part of avcap.
- *
- * avcap is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * avcap 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with avcap.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/* avcap is free for non-commercial use.
- * To use it in commercial endeavors, please contact Nico Pranke <Nico.Pranke@googlemail.com>
- */
-
-#ifndef CONTROL_H_
-#define CONTROL_H_
-
-#include <string>
-#include <list>
-
-#include "avcap-export.h"
-#include "Interval.h"
-
-namespace avcap {
-// forward declaration
-class DeviceDescriptor;
-
-	//! Abstract Base class for all device controls.
-	
-	/*! Capture devices possess various controls (e.g. hue, saturation,...) of different type.
-	 * This class provides the interface that all controls share. Objects 
-	 * derived from this class are managed by a ControlManager which is 
-	 * obtained by the concrete CaptureDevice object. 
-	 * A concrete control may expose an extended interface to provide additional functionality. 
-	 * Applications can use the getType()-method or RTTI to determine the type of the concrete control. */
-
-	class AVCAP_Export Control
-	{
-	public:
-		enum Type {
-			INTEGER_CONTROL = 0,
-			BOOL_CONTROL,
-			BUTTON_CONTROL,
-			MENU_CONTROL,
-			CTRLCLASS_CONTROL,
-			USERDEFINED_CONTROL
-		};
-		
-	private:
-		Type mType;
-		
-	public:
-		//! Constructor
-		Control(Type t): mType(t)
-			{}
-	
-		//! Destructor
-		virtual ~Control() 
-			{}
-		
-		//! Get the unique identifier of the control.
-		/*! \return id */
-		virtual int getId() const = 0;
-	
-		//! Get the default value of the control.
-		/*! \return default value */
-		virtual int getDefaultValue() const = 0;
-	
-		//! Get the name of the control.
-		/*! \return control name */
-		virtual const std::string& getName() const = 0;
-	
-		//! Set the new value of the control.
-		/*!  \param val : The new value.
-		 * \return 0, if successful, -1 else */
-		virtual int setValue(int val) = 0;
-	
-		//! Get the current value of the control.
-		/*!  \return the value */
-		virtual int getValue() const = 0;
-	
-		//! Set the  value of the control to the default value.
-		/*!  \return 0, if successful, -1 else */
-		virtual int reset() = 0;
-		
-		//! Return the type of the control.
-		/* \return type */  
-		virtual inline Type getType() const 
-			{ return mType; }
-		
-	private:
-		Control() 
-			{}
-	};
-	
-	//! Abstraction of an Integer-valued control.
-	/*! Such controls additionally provide information about the range and step of it's values. */
-	
-	class AVCAP_Export IntegerControl: public Control
-	{
-	public:
-		IntegerControl(): Control(Control::INTEGER_CONTROL)
-			{}
-		
-		virtual ~IntegerControl() 
-			{}
-		
-		//! Get the interval describing the range and step of valid values for this control.
-		/*! \return interval */
-		virtual const Interval& getInterval() const = 0; 
-	};
-	
-	//! Abstraction of a boolean-like control.
-	/*! Such controls provide no additional information. */
-	
-	class AVCAP_Export BoolControl: public Control
-	{
-	public:
-		BoolControl(): Control(Control::BOOL_CONTROL)
-			{}
-		
-		virtual ~BoolControl() 
-			{}	
-	};
-
-	//! Abstraction of a button-like control.
-	/*! Such controls provide a convinience-method to trigger the buttons action. */
-
-	class AVCAP_Export ButtonControl: public Control
-	{
-	public:
-		ButtonControl(): Control(Control::BUTTON_CONTROL)
-			{}
-		
-		virtual ~ButtonControl() 
-			{}
-		
-		//! Push the button. 
-		/*! \return 0, if successful, -1 else */
-		virtual int push() = 0;
-	};
-
-	//! Abstraction of a control describing the class of the successive controls.
-	/*! The sole purpose of such a control is to provide a name for the class of the controls
-	 * following in the control-list. This name can be used for example to group the controls 
-	 * in a 'tabbed' user-interface (See V4L2-API spec, Extended Controls).  */
-	
-	class AVCAP_Export CtrlClassControl: public Control
-	{
-	public:
-		CtrlClassControl(): Control(Control::CTRLCLASS_CONTROL)
-			{}
-		
-		virtual ~CtrlClassControl() 
-			{}
-	};
-
-	
-	//! A menu item.
-	struct MenuItem
-	{
-		//! The name of the item.
-		std::string name;
-		
-		//! The index to identify the item.
-		int index;
-
-	public:
-		//! The constructor.
-		inline MenuItem(const std::string& n, int i):
-			name(n), index(i)
-			{}
-	};
-
-	//! Abstraction of a menu-like control.
-	/*! These controls provide a list of items, the user can chose from. */
-	
-	class AVCAP_Export MenuControl: public Control
-	{
-	public:
-		//! Type of the item list.
-		typedef std::list<MenuItem*> ItemList;
-
-	public:
-		MenuControl(): Control(Control::MENU_CONTROL)
-			{}
-		
-		virtual ~MenuControl() 
-			{}
-		
-		//! Returns the STL-list of menu items associated with this control.
-		/*! \return the menu items. */
-		virtual const ItemList& getItemList () = 0;
-	};
-}
-
-#endif // CONTROL_H_

gpac-2.2.1.tar.gz/extra_lib/include/avcap/DeviceCollector.h Deleted

@@ -1,131 +0,0 @@
-/*
- * (c) 2005, 2008 Nico Pranke <Nico.Pranke@googlemail.com>, Robin Luedtke <RobinLu@gmx.de> 
- *
- * This file is part of avcap.
- *
- * avcap is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * avcap 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with avcap.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/* avcap is free for non-commercial use.
- * To use it in commercial endeavors, please contact Nico Pranke <Nico.Pranke@googlemail.com>
- */
-
-#ifndef DEVICECOLLECTOR_H_
-#define DEVICECOLLECTOR_H_
-
-#include <list>
-#include <string>
-
-#include "singleton.h"
-
-#if !defined(_MSC_VER) && !defined(USE_PREBUILD_LIBS)
-# include "avcap-config.h"
-#endif
-
-#include "avcap-export.h"
-
-namespace avcap
-{
-class DeviceDescriptor;
-class CaptureDevice;
-
-	//! This singleton queries the capture devices available on the system and provides a factory-method to create CaptureDevice-objects.
-	
-	/*! This class tests during instantiation (i.e. the first call to it's instance()-method), 
-	 * which capture devices are available on the system
-	 * and provides an STL-list of DeviceDescriptor objects describing these devices.  
-	 * 
-	 * The following strategy to find capture devices in the system is applied:
-	 *  
-	 * <b>Linux:</b>
-	 * <UL> 
-	 * <LI>All /dev/video* nodes are tested by default. </LI>
-	 * <LI>If avcap has been compiled with HAS_AVC_SUPPORT defined, all IEEE 1394 AV/C-devices are tested. </LI>
-	 * <LI>IEEE1394 digital camera support is planned but currently not implemented. 
-	 * </UL>
-	 * <b>Win32:</b>
-	 * <UL> 
-	 * <LI>All devices in the CLSID_VideoInputDeviceCategory category (see DirectShow documentation) are tested.</LI>
-	 * </UL>
-	 * <b>Darwin:</b>
-	 * <UL> 
-	 * <LI>All devices of the SequenceGrabber-Component device-list are tested.</LI>
-	 * </UL>
-	 * 
-	 * Access the singleton instance via DEVICE_COLLECTOR::instance().
-	 **/
-	
-	class AVCAP_Export DeviceCollector
-	{
-	public:
-		//! List type of the DeviceDescriptor object list.
-		typedef std::list<DeviceDescriptor*> DeviceList;
-	
-	private:
-		DeviceList mDeviceList;
-	
-	public:
-		//! Constructor
-		DeviceCollector();
-		
-		//! Destructor
-		virtual ~DeviceCollector();
-	
-		//! Returns the STL-list of DeviceDescriptor objects describing available capture devices.
-		/*! \return The descriptor list.*/
-		inline const DeviceList& getDeviceList() const 
-			{ return (const DeviceList&) mDeviceList; }
-	
-		//! Linux only! Test, if the device with the given name can be opened and is a V4L1 or V4L2 capture device or not. 
-		/*! If it is, a new DeviceDescriptor-object is created 
-		 * and stored in the device list, managed by the collector. 
-		 * \param name : the name of a device node (e.g. /dev/video0) 
-		 * \return true, if it is a V4L1-device, false else*/
-		bool testDevice(const std::string& name);
-	
-	private:
-	
-#ifdef AVCAP_LINUX
-		void query_V4L1_Devices();
-		
-		void query_V4L2_Devices();
-		
-		void query_ieee1394_Devices();
-		
-		int test_V4L1_Device(const std::string& name);
-		
-		int test_V4L2_Device(const std::string& name);
-#endif
-
-#ifdef AVCAP_OSX
-		void query_QT_Devices();
-#endif
-
-#ifdef AVCAP_WINDOWS
-		void query_DS_Devices();
-		
-		int test_DS_Device(const std::string& name);
-		
-		bool getInstalledDeviceIDs(std::list<std::string> &UniqueDeviceIDList);
-
-#endif
-};
-
-//! The DeviceCollector singleton. Access the singleton instance via DEVICE_COLLECTOR::instance().
-typedef Singleton<DeviceCollector> DEVICE_COLLECTOR;
-}
-
-/* \todo Add Linux-support for IEEE 1394 digital cameras. */
-
-#endif // DEVICECOLLECTOR_H_

gpac-2.2.1.tar.gz/extra_lib/include/avcap/DeviceDescriptor.h Deleted

@@ -1,196 +0,0 @@
-/*
- * (c) 2005, 2008 Nico Pranke <Nico.Pranke@googlemail.com>, Robin Luedtke <RobinLu@gmx.de>
- *
- * This file is part of avcap.
- *
- * avcap is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * avcap 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with avcap.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/* avcap is free for non-commercial use.
- * To use it in commercial endeavors, please contact Nico Pranke <Nico.Pranke@googlemail.com>
- */
-
-
-#ifndef DEVICEDESCRIPTOR_H_
-#define DEVICEDESCRIPTOR_H_
-
-#include <iostream>
-#include <string>
-
-#if !defined(_MSC_VER) && !defined(USE_PREBUILD_LIBS)
-# include "avcap-config.h"
-#endif
-
-#include "avcap-export.h"
-
-// IVTV driver name
-#define DRIVER_IVTV	"ivtv"
-
-namespace avcap
-{
-class CaptureDevice;
-
-	//! Objects of classes derived from this abstract base uniquely identify a capture device in a system.
-
-	/*! It is used as an system independent description of a capture device.
-	 * It provides the interface to access information about a device and the device itself.
-	 * Special devices must inherit this class, e.g. V4L2_DeviceDescriptor or AVC_DeviceDescriptor.
-	 * A list of objects derived from this class (one for each device) is provided
-	 * by the DeviceCollector-singleton, which tries
-	 * to determine all capture devices available on the system, so applications
-	 * don't have to instantiate objects of these class explicitly. Objects of this
-	 * class can be used to create a concrete CaptureDevice object by calling DEVICE_COLLECTOR::instance()->createDevice().
-	 * The class must be implemented for a concrete capture API/OS.
-	 */
-
-	class AVCAP_Export DeviceDescriptor
-	{
-	public:
-#ifdef AVCAP_LINUX
-		typedef int DEV_HANDLE_T;
-#endif
-
-#ifdef AVCAP_OSX
-		typedef int DEV_HANDLE_T;
-#endif
-
-#ifdef _WIN32
-		//! <b>Win32:</b> Platform dependent device handle type for windows. (represents the DirectShow capture filter (always casted to a IBaseFilter COM-Interface).
-		/* To get the complete created filter graph call GetFilterGraphFromFilter()
-		 declared in the "HelpFunc.h" header file. */
-		typedef void* DEV_HANDLE_T;
-#endif
-
-	private:
-		const static std::string mEmptyString;
-
-	public:
-		//! Constructor
-		DeviceDescriptor();
-
-		//! Destructor
-		virtual ~DeviceDescriptor() = 0;
-
-		//! Open the underlying device.
-		/*! The CaptureDevice-Object returned by getDevice(), which is actually used to perform
-		 * capturing is not valid before open() is called.
-		 * \return 0 success, -1 on failure, e.g. open() has been already called before
-		 */
-		virtual int open() = 0;
-
-		//! Close the underlying device.
-		/*! The CaptureDevice-Object returned by getDevice(), which is actually used to perform
-		 * capturing, is not valid after close() is called.
-		 * \return 0 success, -1 failure
-		 */
-		virtual int close() = 0;
-
-		//! Returns the unique identifier of the device.
-		/*! \return unique identifier of device */
-		virtual const std::string& getName() const = 0;
-
-		//! Returns the name of the driver.
-		/*! The default implementation returns an empty string.
-		 * \return driver */
-		virtual inline const std::string& getDriver() const
-			{ return mEmptyString; }
-
-		//! Returns the name of the device
-		/*! The default implementation returns an empty string.
-		 * \return name of the card */
-		virtual inline const std::string& getCard() const
-			{ return mEmptyString; }
-
-		//! Returns a textual description of the device.
-		/*! The default implementation returns an empty string.
-		 * \return name */
-		virtual inline const std::string& getInfo() const
-			{ return mEmptyString; }
-
-		//! Returns the version number of the driver.
-		/*! The default implementation returns 0.
-		 * \return version. */
-		virtual inline int getVersion() const
-			{ return 0; }
-
-		//! Returns the version number of the driver as string.
-		/*! The default implementation returns an empty string.
-		 * \return version string. */
-		virtual inline const std::string& getVersionString() const
-			{ return mEmptyString; }
-
-		//! Returns the API-specific device handle used to reference the device.
-		/*! \return the device handle */
-		virtual const DEV_HANDLE_T getHandle() const = 0;
-
-		//! Device is an audio/video device. The default implementation returns false.
-		virtual inline bool isAVDev() const
-			{ return false; }
-
-		//! Device is capable to capture some data. The default implementation returns false.
-		virtual inline bool isVideoCaptureDev() const
-			{ return false; }
-
-		//! Device is a VBI device. The default implementation returns false.
-		virtual inline bool isVBIDev() const
-			{ return false; }
-
-		//! Device has a tuner. The default implementation returns false.
-		virtual inline bool isTuner() const
-			{ return false; }
-
-		//! Device is an audio device. The default implementation returns false.
-		virtual inline bool isAudioDev() const
-			{ return false; }
-
-		//! Device is a radio device. The default implementation returns false.
-		virtual inline bool isRadioDev() const
-			{ return false; }
-
-		//! Device supports video overlay. The default implementation returns false.
-		virtual inline bool isOverlayDev() const
-			{ return false; }
-
-		//! Device supports read/write IO-methods (linux specific, see V4L2 API Docu for further details).
-		/*!  The default implementation returns false. */
-		virtual inline bool isRWDev () const
-			{ return false; }
-
-		//! Device supports asynchroneous IO-methods (linux specific, see V4L2 API Docu for further details).
-		/*! The default implementation returns false. */
-		virtual inline bool isAsyncIODev() const
-			{ return false; }
-
-		//! Device supports memory mapping IO-methods (linux specific, see V4L2 API Docu for further details).
-		/*! The default implementation returns false. */
-		virtual inline bool isStreamingDev() const
-			{ return false; }
-
-		//! Factory-method to create a API-dependent CaptureDevice-object.
-		/*! Applications must not create their own
-		 * instances of a CaptureDevice but use this method to access the proper
-		 * API-dependent unique device-object. You can use this object anywhere between
-		 * successive calls to open() and close(), i.e. it is not valid before open() and not after close().
-		 * The ownership of the object remains at the descriptor, so the caller
-		 * must not delete the object after usage.
-		 * Only one CaptureDevice-object will be created for each DeviceDescriptor, so
-		 * multiple calls to getDevice() will always return the same object instance.
-		 *
-		 * \return the CaptureDevice-instance or 0, if not available. */
-		virtual CaptureDevice* getDevice() = 0;
-	};
-}
-
-
-#endif //DEVICEDESCRIPTOR_H_

gpac-2.2.1.tar.gz/extra_lib/include/avcap/FormatManager.h Deleted

@@ -1,314 +0,0 @@
-/*
- * (c) 2005, 2008 Nico Pranke <Nico.Pranke@googlemail.com>, Robin Luedtke <RobinLu@gmx.de>
- *
- * This file is part of avcap.
- *
- * avcap is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * avcap 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with avcap.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/* avcap is free for non-commercial use.
- * To use it in commercial endeavors, please contact Nico Pranke <Nico.Pranke@googlemail.com>
- */
-
-#ifndef FORMATMANAGER_H_
-#define FORMATMANAGER_H_
-
-#include <list>
-#include <string>
-
-#if !defined(_MSC_VER) && !defined(USE_PREBUILD_LIBS)
-# include <stdint.h>
-# include "avcap-config.h"
-#endif
-
-#include "Manager.h"
-#include "avcap-export.h"
-
-#ifdef AVCAP_LINUX
-# include <linux/types.h>
-# ifdef AVCAP_HAVE_V4L2
-#  include <linux/videodev2.h>
-# else
-#  include <linux/videodev.h>
-# endif
-#endif // AVCAP_LINUX
-
-#ifdef _WIN32
-typedef unsigned int uint32_t;
-#endif
-
-/* taken from linux/videodev2.h but all FormatManagers use these fourcc-codes*/
-
-#define FOURCC(a,b,c,d)\
-        (((uint32_t)(a)<<0)|((uint32_t)(b)<<8)|((uint32_t)(c)<<16)|((uint32_t)(d)<<24))
-
-#define PIX_FMT_RGB332  FOURCC('R','G','B','1') /*  8  RGB-3-3-2     */
-#define PIX_FMT_RGB555  FOURCC('R','G','B','O') /* 16  RGB-5-5-5     */
-#define PIX_FMT_RGB565  FOURCC('R','G','B','P') /* 16  RGB-5-6-5     */
-#define PIX_FMT_RGB555X FOURCC('R','G','B','Q') /* 16  RGB-5-5-5 BE  */
-#define PIX_FMT_RGB565X FOURCC('R','G','B','R') /* 16  RGB-5-6-5 BE  */
-#define PIX_FMT_BGR24   FOURCC('B','G','R','3') /* 24  BGR-8-8-8     */
-#define PIX_FMT_RGB24   FOURCC('R','G','B','3') /* 24  RGB-8-8-8     */
-#define PIX_FMT_BGR32   FOURCC('B','G','R','4') /* 32  BGR-8-8-8-8   */
-#define PIX_FMT_RGB32   FOURCC('R','G','B','4') /* 32  RGB-8-8-8-8   */
-#define PIX_FMT_GREY    FOURCC('G','R','E','Y') /*  8  Greyscale     */
-#define PIX_FMT_YVU410  FOURCC('Y','V','U','9') /*  9  YVU 4:1:0     */
-#define PIX_FMT_YVU420  FOURCC('Y','V','1','2') /* 12  YVU 4:2:0     */
-#define PIX_FMT_YUYV    FOURCC('Y','U','Y','V') /* 16  YUV 4:2:2     */
-#define PIX_FMT_UYVY    FOURCC('U','Y','V','Y') /* 16  YUV 4:2:2     */
-#define PIX_FMT_YUV422P FOURCC('4','2','2','P') /* 16  YVU422 planar */
-#define PIX_FMT_YUV411P FOURCC('4','1','1','P') /* 16  YVU411 planar */
-#define PIX_FMT_Y41P    FOURCC('Y','4','1','P') /* 12  YUV 4:1:1     */
-
-/* two planes -- one Y, one Cr + Cb interleaved  */
-#define PIX_FMT_NV12    FOURCC('N','V','1','2') /* 12  Y/CbCr 4:2:0  */
-#define PIX_FMT_NV21    FOURCC('N','V','2','1') /* 12  Y/CrCb 4:2:0  */
-
-/*  The following formats are not defined in the V4L2 specification */
-#define PIX_FMT_YUV410  FOURCC('Y','U','V','9') /*  9  YUV 4:1:0     */
-#define PIX_FMT_YUV420  FOURCC('Y','U','1','2') /* 12  YUV 4:2:0     */
-#define PIX_FMT_I420	FOURCC('I','4','2','0') /* 12  identical to YU12 */
-#define PIX_FMT_YYUV    FOURCC('Y','Y','U','V') /* 16  YUV 4:2:2     */
-#define PIX_FMT_HI240   FOURCC('H','I','2','4') /*  8  8-bit color   */
-#define PIX_FMT_HM12    FOURCC('H','M','1','2') /*  8  YUV 4:1:1 16x16 macroblocks */
-
-/* see http://www.siliconimaging.com/RGB%20Bayer.htm */
-#define PIX_FMT_SBGGR8  FOURCC('B','A','8','1') /*  8  BGBG.. GRGR.. */
-
-/* compressed formats */
-#define PIX_FMT_MJPEG    FOURCC('M','J','P','G') /* Motion-JPEG   */
-#define PIX_FMT_JPEG     FOURCC('J','P','E','G') /* JFIF JPEG     */
-#define PIX_FMT_DV       FOURCC('d','v','s','d') /* 1394          */
-#define PIX_FMT_MPEG     FOURCC('M','P','E','G') /* MPEG-1/2/4    */
-
-/*  Vendor-specific formats   */
-#define PIX_FMT_WNVA     FOURCC('W','N','V','A') /* Winnov hw compress */
-#define PIX_FMT_SN9C10X  FOURCC('S','9','1','0') /* SN9C10x compression */
-#define PIX_FMT_PWC1     FOURCC('P','W','C','1') /* pwc older webcam */
-#define PIX_FMT_PWC2     FOURCC('P','W','C','2') /* pwc newer webcam */
-#define PIX_FMT_ET61X251 FOURCC('E','6','2','5') /* ET61X251 compression */
-
-namespace avcap
-{
-class DeviceDescriptor;
-
-	//! Description of the video standard.
-	struct AVCAP_Export VideoStandard
-	{
-#ifdef AVCAP_LINUX
-		typedef v4l2_std_id	STANDARD_ID_T;
-		enum {
-			PAL = V4L2_STD_PAL_B,
-			NTSC = V4L2_STD_NTSC_M,
-			SECAM = V4L2_STD_SECAM_B
-		};
-#endif
-
-#if defined (_WIN32) || defined (AVCAP_OSX)
-		typedef unsigned int STANDARD_ID_T;
-#endif
-
-
-		std::string		name; 	//!< The name of the standard.
-		STANDARD_ID_T	id;		//!< A unique identifier.
-
-		//! Constructor
-		VideoStandard(const std::string& n, STANDARD_ID_T i):
-			name(n),
-			id(i)
-			{};
-	};
-
-	//! The Resolution consists of a width and a height.
-	struct AVCAP_Export Resolution {
-		int width, height;
-
-		Resolution(int w, int h):
-			width(w),
-			height(h)
-			{}
-	};
-
-	//! Description of a video format.
-	class AVCAP_Export Format
-	{
-	public:
-		typedef std::list<Resolution*> ResolutionList_t;
-	private:
-		std::string mName;		// A textual description.
-		uint32_t mFourcc;		// The Four Character Code of the format.
-		ResolutionList_t	mResList;
-
-#ifdef _WIN32
-		void *mediatype;		/* stores DirectShow-specific format description (only used internaly).
-								 *< It is always casted to a AM_MEDIA_TYPE
-								 * DirectShow structure; see DirectShow documentation */
-#endif
-
-	public:
-		//! Constructor
-		inline Format(const std::string& n, uint32_t f):
-			mName(n), mFourcc(f)
-			{}
-
-		//! Destructor
-		virtual ~Format();
-
-		//! Get the name of the format.
-		/*! \return name */
-		inline const std::string& getName() const
-			{ return mName; }
-
-		//! Get the four character code of the format (see: www.fourcc.org).
-		/*! \return fourcc */
-		inline uint32_t getFourcc() const
-			{ return mFourcc; }
-
-		//! Return a list of resolutions that are supported for this format.
-		/*! \return the resolutions.*/
-		inline const ResolutionList_t& getResolutionList() const
-			{ return mResList; }
-
-		void addResolution(int w, int h);
-
-#ifdef _WIN32
-		void* getMediaType() { return mediatype; }
-
-		void setMediaType(void* mt) { mediatype = mt; }
-#endif
-	};
-
-	//! Abstract base for classes that query and manage available formats, video-standards and resolutions of a capture device.
-
-	/*! This class queries the formats, video-standards and resolutions provided by the device
-	 * and allows applications to set them.
-	 * The class provides a STL-list of Format-objects.
-	 * Actualy changing the format may be deferred by the concrete implementation until it
-	 * is really necessary, e.g. the capture begins, because advising the driver
-	 * to change the format can be a quite time-consuming operation.
-	 * Most of the methods in this class are implemented as a noop and are
-	 * reimplemented by the derived class for a concrete capture API/OS, if the method is applicable.
-	 */
-
-	class AVCAP_Export FormatManager: public Manager<Format>
-	{
-	public:
-		typedef std::list<VideoStandard*>	VideoStandardList;
-
-	protected:
-		ListType		mFormats;
-		int				mWidth;
-		int				mHeight;
-		int 			mBytesPerLine;
-#if defined(AVCAP_LINUX) || defined (AVCAP_OSX)
-		unsigned int	mCurrentFormat;
-#endif
-#ifdef _WIN32
-		void			*mCurrentFormat;		// Always casted to a AM_MEDIA_TYPE DirectShow structure
-#endif
-		unsigned long	mImageSize;
-		bool			mModified;
-		VideoStandardList	mStandards;
-
-	public:
-		//! The constructor. */
-		FormatManager(DeviceDescriptor *dd);
-
-		//! The destructor. */
-		virtual ~FormatManager();
-
-		//! Returns the STL-list of Format objects describing the available formats.
-		/*! \return The format list.*/
-		virtual inline const ListType& getFormatList() const
-			{ return (const ListType&) mFormats; }
-
-		//! Set the format to capture.
-		/*! \param fmt The new format.
-		 * \return 0, if successful, -1 else */
-		virtual int setFormat(Format *fmt);
-
-		//! Set the format to capture.
-		/*! \param fourcc The four character code of the new format.
-		 * \return 0, if successful, -1 else */
-		virtual int setFormat(uint32_t fourcc);
-
-		//! Get the current format.
-		/*! \return The format. */
-		virtual Format* getFormat();
-
-		//! Set the image with and height.
-		/*! \param w : width
-		 * \param h : height
-		 * \return 0, if successful, -1 else */
-		virtual int setResolution(int w, int h);
-
-		//! Set the number of used bytes per scanline, if possible.
-		/*! \param bpl
-		 * \return 0, if successful, -1 else */
-		virtual int setBytesPerLine(int bpl);
-
-		//! Returns the image with.
-		/*! \return width*/
-		virtual int getWidth();
-
-		//! Returns the image height.
-		/*! \return height*/
-		virtual int getHeight();
-
-		//! Returns the bytes per line.
-		/*! \return bpl*/
-		virtual int getBytesPerLine();
-
-		//! Flushes the format, i.e. the driver is advised to apply the current format settings.
-		/*! \return  0, if successful, -1 else */
-		virtual int flush();
-
-		//! The number of bytes that an image of the current size requires to be stored in memory, including padding.
-		/*! \return size */
-		virtual size_t getImageSize();
-
-		//! Set the framerate.
-		/*! The default implementation returns -1
-		 * \param fps : the number of frames per second.
-		 * \return 0 if successful, -1 on failure */
-		virtual int setFramerate(int fps);
-
-		//! Get the current framerate.
-		/*! The default implementation returns -1
-		 *! \return the frames per second */
-		virtual int getFramerate();
-
-		//! Get the STL-list of avaliable video standards described by VideoStandard objects.
-		/*! \return standards list*/
-		virtual inline const VideoStandardList& getVideoStandardList() const
-			{ return (const VideoStandardList&) mStandards; }
-
-		//! Get the currently used video standard.
-		/*! The default implementation returns 0
-		 * \return the current standard or 0, if not applicable */
-		virtual const VideoStandard* getVideoStandard();
-
-		//! Set the video standard to use.
-		/*! Attention: not all video standards can be set in conjunction with each connector and format.
-		 * The default implementation returns -1
-		 * \param std The new video standard.
-		 * \return 0, if successful, -1 else */
-		virtual int setVideoStandard(const VideoStandard* std);
-
-		virtual void query() = 0;
-	};
-};
-#endif //FORMATMANAGER_H_
-
-

gpac-2.2.1.tar.gz/extra_lib/include/avcap/IOBuffer.h Deleted

@@ -1,135 +0,0 @@
-/*
- * (c) 2005, 2008 Nico Pranke <Nico.Pranke@googlemail.com>, Robin Luedtke <RobinLu@gmx.de> 
- *
- * This file is part of avcap.
- *
- * avcap is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * avcap 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with avcap.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/* avcap is free for non-commercial use.
- * To use it in commercial endeavors, please contact Nico Pranke <Nico.Pranke@googlemail.com>
- */
-
-
-#ifndef IOBUFFER_H_
-#define IOBUFFER_H_
-
-
-#include <sys/types.h>
-#include <time.h>
-#include <iostream>
-
-#if !defined(_MSC_VER) && !defined(USE_PREBUILD_LIBS)
-# include <sys/time.h>
-# include "avcap-config.h"
-#endif
-
-#ifdef _WIN32
-# include <windows.h>
-#endif
-
-#include "CaptureManager.h"
-#include "avcap-export.h"
-
-namespace avcap
-{
-	//! The buffer to store captured data.
-	
-	/*! The class contains the captured data and provides additional information,
-	 * e.g. sequence number, valid bytes and a capture timestamp. The data in the buffer
-	 * may not correspond exactly to one frame, e.g. if the captured data is part 
-	 * of a stream (e.g. MPEG).
-	 * */
-	 
-	class AVCAP_Export IOBuffer
-	{
-	public:
-		
-		//! Use-state of the buffer
-		enum State
-		{
-			STATE_USED = 0,		//!> currently used
-			STATE_UNUSED,		//!> currently unused
-		};
-		
-	private:
-		CaptureManager *mMgr;
-		void*			mPtr;
-		size_t			mSize;
-		int				mIndex;
-		int				mState;
-		long 			mSequence;
-		size_t			mValid;
-		struct timeval 	mTimestamp;
-		
-	public:
-		
-		//! Constructor
-		IOBuffer(CaptureManager* mgr, void* ptr, size_t size, int index = 0);
-		virtual ~IOBuffer();
-
-		//! Get the pointer to the frame data.
-		/*! \return the captured data. */
-		inline void* getPtr() const
-			{ return mPtr; }
-		
-		//! Returns the maximum number of bytes the buffer can contain.
-		/*! \return Size of buffer in bytes. */
-		inline size_t getSize() const
-			{ return mSize; }
-		
-		//! Return the sequence number of the frame. 
-		/*! \return Sequence number */
-		inline long getSequence() const 
-			{ return mSequence; }
-		
-		//! Returns the number of valid bytes in the buffer.
-		/*! \return Number of valid bytes */
-		inline size_t getValidBytes() const 
-			{ return mValid; }
-		
-		//! Returns a timestamp in milliseconds. 
-		/*! \return timestamp */
-		unsigned long getTimestamp();
-
-		//! Must be called by the application after the buffer isn't used anymore to to enable its reutilization.
-		void release();
-		
-		//! Get the index of the buffer.
-		/*! \return the buffer index. */
-		inline int getIndex() const 
-			{ return mIndex; } 
-
-		//! Set the state of the buffer.
-		/*! This method should not be used by applications.
-		 *! \param state : the new state */
-		inline void setState(State state) 
-			{ mState = state; }
-
-		//! Get the buffer usage state.
-		/*! \return the current buffer state. */
-		inline State getState() const 
-			{ return (State) mState; }
-		
-		//! Set buffer parameters.
-		/*! This method should not be used by applications. 
-		 * \param valid : number of valid bytes in buffer
-		 * \param state : the current buffer state
-		 * \param ts : the timestamp the data was captured
-		 * \param seq : the sequence number of the captured data */
-		void setParams(const size_t valid, State state, struct timeval &ts, int seq);
-	};
-}
-
-#endif // IOBUFFER_H_

gpac-2.2.1.tar.gz/extra_lib/include/avcap/Interval.h Deleted

@@ -1,56 +0,0 @@
-/*
- * (c) 2005, 2008 Nico Pranke <Nico.Pranke@googlemail.com>, Robin Luedtke <RobinLu@gmx.de> 
- *
- * This file is part of avcap.
- *
- * avcap is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * avcap 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with avcap.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/* avcap is free for non-commercial use.
- * To use it in commercial endeavors, please contact Nico Pranke <Nico.Pranke@googlemail.com>
- */
-
-
-#ifndef INTERVAL_H_
-#define INTERVAL_H_
-
-#include "avcap-export.h"
-
-namespace avcap
-{
-	//! An integer interval used by some Control-types.
-	class AVCAP_Export Interval
-	{
-	public:
-		//! The minimal value.
-		int min;
-
-		//! The maximal value.
-		int max;
-		
-		//! The increment.
-		int step;
-		
-		//! The Constructor.
-		Interval( int min_, int max_, int step_ )
-		{
-			min = min_;
-			max = max_;
-			step = step_;
-		};
-	};
-};
-
-#endif // INTERVAL_H_
-

gpac-2.2.1.tar.gz/extra_lib/include/avcap/Manager.h Deleted

@@ -1,67 +0,0 @@
-/*
- * (c) 2005, 2008 Nico Pranke <Nico.Pranke@googlemail.com>, Robin Luedtke <RobinLu@gmx.de> 
- *
- * This file is part of avcap.
- *
- * avcap is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * avcap 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with avcap.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/* avcap is free for non-commercial use.
- * To use it in commercial endeavors, please contact Nico Pranke <Nico.Pranke@googlemail.com>
- */
-
-
-#ifndef MANAGER_H_
-#define MANAGER_H_
-
-#include <list>
-#include <iostream>
-
-namespace avcap
-{
-	class DeviceDescriptor;
-	
-	//! Abstract base class for Managers. 
-	
-	/*! Classes that provide access to specific aspects of 
-	 * a device derive from this class. Managers usualy manage a number of 
-	 * objects of a specific type that abstract these aspects.
-	 * The template parameter is used to define a STL list-type to 
-	 * store these objects.*/
-	 
-	template<class T>
-	class Manager
-	{
-	public:
-		//! The STL list-type to store the managed objects.
-		typedef std::list<T*>	ListType;
-		
-	protected:
-		DeviceDescriptor	*mDeviceDescriptor;
-		
-	public:
-		inline Manager(DeviceDescriptor* dd):
-			mDeviceDescriptor(dd) 
-			{}
-			
-		virtual ~Manager() 
-			{}
-		
-		/*! Called during initialisation by the CaptureDevice to query for 
-		 * the objects that the implementation of this class manages. */
-		virtual void query() = 0;		
-	};
-}
-
-#endif // MANAGER_H_

gpac-2.2.1.tar.gz/extra_lib/include/avcap/ProbeValues.h Deleted

@@ -1,51 +0,0 @@
-/*
- * (c) 2005, 2008 Nico Pranke <Nico.Pranke@googlemail.com>, Robin Luedtke <RobinLu@gmx.de> 
- *
- * This file is part of avcap.
- *
- * avcap is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * avcap 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with avcap.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/* avcap is free for non-commercial use.
- * To use it in commercial endeavors, please contact Nico Pranke <Nico.Pranke@googlemail.com>
- */
-
-
-#ifndef PROBEVALUES_H
-#define PROBEVALUES_H
- 
-namespace avcap {
-
-//! Standard resolutions to probe, if querying resolutions is not supported by the API/device
-static int NumResolutions = 13;
-static unsigned int Resolutions2 = 
-{
-	{640, 480},
-	{640, 360},
-	{352, 288}, 
-	{352, 240}, 
-	{320, 240}, 
-	{176, 144},
-	{160, 120},
-	{80, 60},
-	{720, 480},
-	{720, 576},
-	{800, 600},
-	{1280, 1024},
-	{1600, 1200}
-};
-
-}
-
-#endif

gpac-2.2.1.tar.gz/extra_lib/include/avcap/Tuner_avcap.h Deleted

@@ -1,188 +0,0 @@
-/*
- * (c) 2005, 2008 Nico Pranke <Nico.Pranke@googlemail.com>, Robin Luedtke <RobinLu@gmx.de> 
- *
- * This file is part of avcap.
- *
- * avcap is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * avcap 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with avcap.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/* avcap is free for non-commercial use.
- * To use it in commercial endeavors, please contact Nico Pranke <Nico.Pranke@googlemail.com>
- */
-
-#ifndef TUNER_H_
-#define TUNER_H_
-
-#include <string>
-
-#include "avcap-export.h"
-
-namespace avcap
-{
-	class DeviceDescriptor;
-	
-	//! Interface of a tuner.
-	
-	/*! This class provides access to the tuner functionality of TV or Radio-cards.
-	 * Applications can adjust things like frequency, audio mode etc. 
-	 * Applications don't create Tuner objects themselfes but get them from the Connector
-	 * the tuner is associated with. The connector in turn can be obtained from the 
-	 * ConnectorManager of the CaptureDevice.
-	 **/
-	 
-	class AVCAP_Export Tuner
-	{
-	private:
-	public:
-		virtual inline ~Tuner()
-			{}
-		
-		//! Determine whether the tuner is able to receive radio frequencies. 
-		/*! The default implementation returns false.
-		 * \return true if radio tuner, false else */
-		virtual inline bool isRadioTuner() const 
-			{ return false; }
-
-		//! Determine whether the tuner is able to receive TV frequencies.
-		/*! The default implementation returns false.
-		 * \return true if TV tuner, false else */
-		virtual inline bool isTVTuner() const 
-			{ return false; };
-
-		//! Set the audio mode to stereo.
-		/*! The default implementation is noop and returns -1.
-		 * \return 0, if successful, -1 else. */		
-		virtual inline int setStereo()  
-			{ return -1; }
-
-		//! Set the audio mode to mono.
-		/*! Default implementation is noop and return -1.
-		 * \return 0, if successful, -1 else. */		
-		virtual inline int setMono() 
-			{ return -1; }
-		
-		//! Set the audio mode to secondary audio program (SAP).
-		/*! The default implementation is noop and returns -1.
-		 * \return 0, if successful, -1 else. */		
-		virtual inline int setSAP() 
-			{ return -1; }
-		
-		//! Set the audio mode to language 1.
-		/*! The default implementation is noop and returns -1.
-		 * \return 0, if successful, -1 else. */		
-		virtual inline int setLang1() 
-			{ return -1; }
-
-		//! Set the audio mode to language 2.
-		/*! The default implementation is noop and returns -1.
-		 * \return 0, if successful, -1 else. */		
-		virtual inline int setLang2() 
-			{ return -1; }
-
-		//! Returns the current frequency in MHz.
-		/*! The default implementation is noop and returns -1.
-		 * \return tuner frequency */
-		virtual inline double getFreq() const 
-			{ return -1.0f; }
-
-		//! Returns the step with in which the frequency can be increased or decreased.
-		/*! The default implementation is noop and returns -1.
-		 * \return frequency step width*/
-		virtual inline double getFreqStep() const
-			{ return -1.0f; }
-		
-		//! Returns the minimum possible frequency in MHz which can be applied to the tuner. 
-		/*! The default implementation is noop and returns -1.
-		 * \return minimal tuner frequency */
-		virtual inline double getMinFreq() const
-			{ return -1.0f; }
-
-		//! Returns the maximum possible frequency in MHz which can be applied to the tuner. 
-		/*! The default implementation is noop and returns -1.
-		 * \return maximal tuner frequency */
-		virtual inline double getMaxFreq() const
-			{ return -1.0f; }
-		
-		//! Returns the tuner name. 
-		/*! Default implementation returns an empty string.
-		 * \return tuner name */
-		virtual inline const std::string getName() const
-			{ return ""; }
-		
-		//! This method tries to readjust and to fine-tune the frequency by means of the current AFC-value.
-		/*! The default implementation is noop and returns -1.
-		 * \return 0, if successful, -1 else. */
-		virtual inline int finetune(int maxsteps) 
-			{ return -1; }
-		
-		//! Get the current automatic frequency control (AFC) value.  
-		/*! If the afc value is negative, the frequency is too low, if positive it is too high. 
-		 *! The default implementation is noop and returns -1.
-		 * \return afc */
-		virtual inline int getAFCValue() const
-			{ return -1; }
-		
-		//! Return the strength of the signal. 
-		/*! The default implementation is noop and returns -1.
-		 * \return signal strength */
-		virtual inline int getSignalStrength() const
-			{ return -1; }
-		
-		//! Increase the frequency a step corresponding to getFreqStep(). 
-		/*! The default implementation is noop and returns -1.
-		 * \return 0, if successful, -1 else. */
-		virtual inline int increaseFreq() 
-			{ return 0; }
-		
-		//! Decrease the frequency a step corresponding to getFreqStep(). 
-		/*! The default implementation is noop and returns -1.
-		 * \return 0, if successful, -1 else. */		
-		virtual inline int decreaseFreq() 
-			{ return 0; }
-		
-		//! Set the new frequency. The frequency is given in MHz.
-		/*! The default implementation is noop and returns -1.
-		 * \param f The new frequency.
-		 * \return 0, if successful, -1 else. */
-		virtual inline int setFreq(double f) 
-			{ return -1; }
-	};
-	
-	/*! Known european terrestric analog TV channels. They must be multiplied by 10^6 
-	 * to obtain the frequency in Hz. */
-	static const double TV_Channels = 
-	{
-		48.25, 55.25, 62.25, 175.25, 182.25, 189.25, 196.25, 203.25, 210.25, 217.25, 224.25, 471.25, 479.25, 487.25,
-	 495.25, 503.25, 511.25, 519.25, 527.25, 535.25, 543.25, 551.25, 559.25, 567.25, 575.25, 583.25, 591.25,
-	 599.25, 607.25, 615.25, 623.25, 631.25, 639.25, 647.25, 655.25, 663.25, 671.25, 679.25, 687.25, 695.25,
-	 703.25, 711.25, 719.25, 727.25, 735.25, 743.25, 751.25, 759.25, 767.25, 775.25, 783.25, 791.25, 799.25,
-	 807.25, 815.25, 823.25, 831.25, 839.25, 847.25, 855.25
-	};
-
-	/*! The number of TV channels */	
-	static const int TV_Num_Channels = 60;
-
-	/*! Some german analog radio channels. They must be multiplied by 10^6 
-	 * to obtain the frequency in Hz. */
-	static const double Radio_Channels = 
-	{
-		102.4, 102.0
-	};
-
-	/*! The number of radio channels */	
-	static const int Radio_Num_Channels = 2;
-	
-}
-
-#endif // TUNER_H_

gpac-2.2.1.tar.gz/extra_lib/include/avcap/avcap-export.h Deleted

@@ -1,43 +0,0 @@
-/*
- * (c) 2005, 2008 Nico Pranke <Nico.Pranke@googlemail.com>, Robin Luedtke <RobinLu@gmx.de> 
- *
- * This file is part of avcap.
- *
- * avcap is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * avcap 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with avcap.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/* avcap is free for non-commercial use.
- * To use it in commercial endeavors, please contact Nico Pranke <Nico.Pranke@googlemail.com>
- */
-
-
-#ifndef AVCAP_EXPORT_H
-#define AVCAP_EXPORT_H
-
-#if !defined(_MSC_VER) && !defined(USE_PREBUILD_LIBS)
-#include "avcap-config.h"
-#endif
-
-#ifdef AVCAP_WINDOWS
-# if defined AVCAP_EXPORTS
-#   define AVCAP_Export __declspec(dllexport)
-# else /* AVCAP_BUILD_DLL */
-#   define AVCAP_Export /*__declspec(dllimport)*/
-# endif
-#else
-#define AVCAP_Export 
-#endif
-
-#endif /* AVCAP_EXPORT_H */
-

gpac-2.2.1.tar.gz/extra_lib/include/avcap/avcap.h Deleted

@@ -1,45 +0,0 @@
-/*
- * (c) 2005, 2008 Nico Pranke <Nico.Pranke@googlemail.com>, Robin Luedtke <RobinLu@gmx.de> 
- *
- * This file is part of avcap.
- *
- * avcap is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * avcap 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with avcap.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/* avcap is free for non-commercial use.
- * To use it in commercial endeavors, please contact Nico Pranke <Nico.Pranke@googlemail.com>
- */
-
-
-#ifndef AVCAP_H
-#define AVCAP_H
-
-#if !defined(_MSC_VER) && !defined(USE_PREBUILD_LIBS)
-# include "avcap-config.h"
-#endif
-#include "avcap/DeviceCollector.h"
-#include "avcap/DeviceDescriptor.h"
-#include "avcap/CaptureDevice.h"
-#include "avcap/FormatManager.h"
-#include "avcap/CaptureHandler.h"
-#include "avcap/CaptureManager.h"
-#include "avcap/Control_avcap.h"
-#include "avcap/ControlManager.h"
-#include "avcap/Connector.h"
-#include "avcap/ConnectorManager.h"
-#include "avcap/IOBuffer.h"
-#include "avcap/Tuner_avcap.h"
-#include "avcap/log.h"
-
-#endif

gpac-2.2.1.tar.gz/extra_lib/include/avcap/linux Deleted

gpac-2.2.1.tar.gz/extra_lib/include/avcap/linux/AVC_ConnectorManager.h Deleted

@@ -1,61 +0,0 @@
-/*
- * (c) 2005, 2008 Nico Pranke <Nico.Pranke@googlemail.com>, Robin Luedtke <RobinLu@gmx.de> 
- *
- * This file is part of avcap.
- *
- * avcap is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * avcap 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with avcap.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/* avcap is free for non-commercial use.
- * To use it in commercial endeavors, please contact Nico Pranke <Nico.Pranke@googlemail.com>
- */
-
-#ifdef HAS_AVC_SUPPORT
-
-#ifndef AVC_CONNECTORMANAGER_H_
-#define AVC_CONNECTORMANAGER_H_
-
-#include <list>
-
-#include "ConnectorManager.h"
-
-namespace avcap
-{	
-	class AVC_DeviceDescriptor;
-	
-	//! \brief This class implements the ConnectorManager for AV/C-devices. 
-	
-	/*! Such devices don't have Connectors the user could chose. So the query()
-	 * method is a noop. */
-	
-	class AVC_ConnectorManager: public ConnectorManager
-	{	
-	public:
-		
-		inline AVC_ConnectorManager(AVC_DeviceDescriptor *dd): 
-			ConnectorManager((DeviceDescriptor*) dd)
-			{}
-		
-		virtual inline ~AVC_ConnectorManager()
-			{}
-		
-		inline void query()
-			{}
-	};
-}
-
-#endif // AVC_CONNECTORMANAGER_H_
-
-#endif	// HAS_AVC_SUPPORT
-

gpac-2.2.1.tar.gz/extra_lib/include/avcap/linux/AVC_ControlManager.h Deleted

@@ -1,59 +0,0 @@
-/*
- * (c) 2005, 2008 Nico Pranke <Nico.Pranke@googlemail.com>, Robin Luedtke <RobinLu@gmx.de> 
- *
- * This file is part of avcap.
- *
- * avcap is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * avcap 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with avcap.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/* avcap is free for non-commercial use.
- * To use it in commercial endeavors, please contact Nico Pranke <Nico.Pranke@googlemail.com>
- */
-
-
-#ifdef HAS_AVC_SUPPORT
-
-#ifndef AVC_CONTROLMANAGER_H_
-#define AVC_CONTROLMANAGER_H_
-
-#include <string>
-#include <list>
-
-#include "ControlManager.h"
-
-namespace avcap
-{
-	//! Implementation of the ControlManager for AV/C-devices. 
-	/*! These devices have usually no controls, so there the query method is a noop. */
-	 
-	class AVC_ControlManager:public ControlManager
-	{
-	public:
-		//! The constructor. 
-		/*! \param dd The device descriptor to access the device. */
-		inline AVC_ControlManager(AVC_DeviceDescriptor *dd):
-			ControlManager((DeviceDescriptor*) dd)
-			{}
-		
-		//! The destructor.
-		virtual inline ~AVC_ControlManager() 
-			{}
-		
-		virtual inline void query()
-			{}
-	};
-};
-
-#endif // AVC_CONTROLMANAGER_H_
-#endif

gpac-2.2.1.tar.gz/extra_lib/include/avcap/linux/AVC_Device.h Deleted

@@ -1,103 +0,0 @@
-/*
- * (c) 2005, 2008 Nico Pranke <Nico.Pranke@googlemail.com>, Robin Luedtke <RobinLu@gmx.de>
- *
- * This file is part of avcap.
- *
- * avcap is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * avcap 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with avcap.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/* avcap is free for non-commercial use.
- * To use it in commercial endeavors, please contact Nico Pranke <Nico.Pranke@googlemail.com>
- */
-
-
-#ifdef HAS_AVC_SUPPORT
-
-#ifndef AVC_DEVICE_H_
-#define AVC_DEVICE_H_
-
-#include <string>
-#include <list>
-
-#include "DeviceDescriptor.h"
-#include "CaptureDevice.h"
-#include "AVC_FormatManager.h"
-
-namespace avcap
-{
-	// forward declarations
-	class AVC_DeviceDescriptor;
-	class AVC_VidCapManager;
-	class AVC_ConnectorManager;
-	class AVC_ControlManager;
-
-	//! Implementation of the CaptureDevice for IEEE 1394 AV/C-devices under linux.
-
-	/*! Such devices don't have controls, various resolutions, extensions, or connectors.
-	 * So the implementation of the methods rely mostly on the default implementations or are
-	 * implemented as noop.
-	 *
-	 * Note: If capturing from AV/C-devices is enabled, avcap depends on
-	 * libiec61883, libavc1394, librom1394, libraw1394
-	 * Furthermore the user requires read/write access to /dev/raw1394.
-	 *
-	 * AV/C-support is enabled by the configure-script, if the neccessary libs and developement-headers
-	 * are found on the system.
-	 *
-	 * The AV/C-support is based on dvgrab (http://www.kinodv.org), which is released under the GPLv2.
-	 */
-
-	class AVC_Device : public CaptureDevice
-	{
-	public:
-
-	private:
-		AVC_DeviceDescriptor*	mDeviceDescriptor;
-		AVC_FormatManager*		mFormatMgr;
-		AVC_VidCapManager*		mVidCapMgr;
-		AVC_ConnectorManager*	mConnectorMgr;
-		AVC_ControlManager*		mControlMgr;
-
-	public:
-		//! Constructor
-		AVC_Device(AVC_DeviceDescriptor* dd);
-
-		//! Destructor
-		virtual ~AVC_Device();
-
-		inline const DeviceDescriptor* getDescriptor()
-			{ return mDeviceDescriptor; }
-
-		inline CaptureManager* getVidCapMgr()
-			{ return (CaptureManager*) mVidCapMgr; }
-
-		inline ConnectorManager* getConnectorMgr()
-			{ return (ConnectorManager*) mConnectorMgr; }
-
-		inline ControlManager* getControlMgr()
-			{ return (ControlManager*) mControlMgr; }
-
-		inline FormatManager* getFormatMgr()
-			{ return (FormatManager*) mFormatMgr; }
-
-	private:
-		int open();
-
-		int close();
-	};
-}
-
-#endif // AVC_DEVICE_H_
-#endif // HAS_AVC_SUPPORT
-

gpac-2.2.1.tar.gz/extra_lib/include/avcap/linux/AVC_DeviceDescriptor.h Deleted

@@ -1,103 +0,0 @@
-/*
- * (c) 2005, 2008 Nico Pranke <Nico.Pranke@googlemail.com>, Robin Luedtke <RobinLu@gmx.de>
- *
- * This file is part of avcap.
- *
- * avcap is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * avcap 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with avcap.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/* avcap is free for non-commercial use.
- * To use it in commercial endeavors, please contact Nico Pranke <Nico.Pranke@googlemail.com>
- */
-
-
-#ifndef AVC_DEVICEDESCRIPTOR_H_
-#define AVC_DEVICEDESCRIPTOR_H_
-
-#ifdef HAS_AVC_SUPPORT
-
-#include <iostream>
-#include <libavc1394/rom1394.h>
-
-#include "DeviceDescriptor.h"
-
-namespace avcap
-{
-class CaptureDevice;
-class AVC_Device;
-
-	//! This class implements a descriptor for a IEEE 1394 AV/C capture device under linux (e.g. a DV-Camera).
-
-	class AVC_DeviceDescriptor : public DeviceDescriptor
-	{
-	private:
-		std::string mName;
-		std::string mGUIDString;
-		std::string mInfo;
-		std::string	mDriver;
-
-		octlet_t	mGUID;
-		static int	mDevCount;
-		AVC_Device*	mDevice;
-
-	public:
-		//! This constructor uses a numerical global unique identifier to represent a IEEE 1394 capture device (e.g. a firewire DV-Cam).
-		/*! \param guid The unique identifier of device.*/
-		AVC_DeviceDescriptor(const octlet_t guid);
-
-		//! The destructor */
-		virtual ~AVC_DeviceDescriptor();
-
-		int open();
-
-		int close();
-
-		//! Returns the unique identifier of the device. AV/C-devices get the name
-		/*! "AV/C_n", where n is the number of the device in the system starting with 1.
-		 * So the 3rd device found has the name AV/C_3.
-		 * \return unique identifier of device */
-		inline const std::string& getName() const
-			{ return mName; }
-
-		virtual inline const std::string& getInfo() const
-			{ return mInfo; }
-
-		virtual inline const std::string& getDriver() const
-			{ return mDriver; }
-
-		virtual inline const std::string& getCard() const
-			{ return mGUIDString; }
-
-		//! There is no handle associated with a AV/C-device. So this method always returns -1.
-		inline const DEV_HANDLE_T getHandle() const
-			{ return -1; }
-
-		//! Device is an audio/video device. Always returns true.
-		inline bool isAVDev() const
-			{ return true; }
-
-		//! Device is capable to capture some data. Always returns true.
-		inline bool isVideoCaptureDev() const
-			{ return true; }
-
-		inline octlet_t& getGUID()
-			{ return mGUID; }
-
-		virtual CaptureDevice* getDevice();
-	};
-}
-
-#endif // AVC_DEVICEDESCRIPTOR_H_
-#endif // HAS_DVLIBS
-

gpac-2.2.1.tar.gz/extra_lib/include/avcap/linux/AVC_FormatManager.h Deleted

@@ -1,69 +0,0 @@
-/*
- * (c) 2005, 2008 Nico Pranke <Nico.Pranke@googlemail.com>, Robin Luedtke <RobinLu@gmx.de> 
- *
- * This file is part of avcap.
- *
- * avcap is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * avcap 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with avcap.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/* avcap is free for non-commercial use.
- * To use it in commercial endeavors, please contact Nico Pranke <Nico.Pranke@googlemail.com>
- */
-
-
-#ifdef HAS_AVC_SUPPORT
-
-#ifndef AVC_FORMATMANAGER_H_
-#define AVC_FORMATMANAGER_H_
-
-#include "FormatManager.h"
-
-namespace avcap
-{
-	class AVC_DeviceDescriptor;
-	
-	//! Implementation of the FormatManager for AV/C devices. 
-	  
-	/*! DV-Cams usually provide only a fixed resolution (PAL: 720x576, NTSC: 720x480)
-	 * YUV-format and no choice of video standards.
-	 * Additionally, this manager provides RGB.*/
-	 
-	class AVC_FormatManager: public FormatManager
-	{
-	private:
-		bool mIsPal;
-		
-	public:
-		AVC_FormatManager(AVC_DeviceDescriptor *dd);
-		
-		virtual ~AVC_FormatManager();
-		
-		//! Set the image with. 
-		/*! For AV/C -devices the reolution is fixed and thus can't be realy modified.
-		 * \param w: width
-		 * \param h: height
-		 * \return 0, if the desired resolution matches the native resolution, -1 else*/
-		int setResolution(int w, int h);
-
-		//! Get the current framerate. Setting the framerate is not possible.
-		/*! \return 25 for PAL, 30 for NTSC(this is a little bit inaccurate, since the proper NTSC-frame rate is 29.97 fps)*/
-		inline int getFramerate() { return mIsPal ? 25 : 30; }
-		
-		void query();
-	};
-};
-#endif // AVC_FORMATMANAGER_H_
-
-#endif // HAS_AVC_SUPPORT
-

gpac-2.2.1.tar.gz/extra_lib/include/avcap/linux/AVC_Reader.h Deleted

@@ -1,74 +0,0 @@
-/*
- * (c) 2005, 2008 Nico Pranke <Nico.Pranke@googlemail.com>, Robin Luedtke <RobinLu@gmx.de> 
- *
- * This file is part of avcap.
- *
- * avcap is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * avcap 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with avcap.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/* avcap is free for non-commercial use.
- * To use it in commercial endeavors, please contact Nico Pranke <Nico.Pranke@googlemail.com>
- */
-
-#ifdef HAS_AVC_SUPPORT
-
-#ifndef AVC_READER_H_
-#define AVC_READER_H_
-
-#include <list>
-
-#include "ieee1394io.h"
-
-namespace avcap
-{
-class AVC_VidCapManager;
-class AVC_FormatManager;
-class IOBuffer;
-
-	//! AVC_Reader, used by the AVC_VidCapManager.
-	
-	class AVC_Reader : public iec61883Reader
-	{
-		typedef std::list<IOBuffer*>	BufferList_t;
-		
-		
-		AVC_VidCapManager* mVidCapMgr;
-		AVC_FormatManager*	mFormatMgr;
-		CaptureHandler*		mCaptureHandler;
-	
-		BufferList_t	mBuffers;
-		long			mSequence;
-		int				mAvailableBuffers;
-		
-	public:
-		AVC_Reader(AVC_VidCapManager* cap_mgr, AVC_FormatManager* fmt_mgr, int port, int channel, int num_bufs);
-		
-		virtual ~AVC_Reader();
-	
-		void registerCaptureHandler(CaptureHandler *handler);
-	
-		void removeCaptureHandler();
-		
-		virtual void TriggerAction();
-		
-		void enqueue(IOBuffer* io_buf);
-		
-		inline int getNumIOBuffers() 
-			{ return mAvailableBuffers; }
-	
-	};	
-}
-
-#endif // AVC_READER_H_
-#endif

gpac-2.2.1.tar.gz/extra_lib/include/avcap/linux/AVC_VidCapManager.h Deleted

@@ -1,102 +0,0 @@
-/*
- * (c) 2005, 2008 Nico Pranke <Nico.Pranke@googlemail.com>, Robin Luedtke <RobinLu@gmx.de> 
- *
- * This file is part of avcap.
- *
- * avcap is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * avcap 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with avcap.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/* avcap is free for non-commercial use.
- * To use it in commercial endeavors, please contact Nico Pranke <Nico.Pranke@googlemail.com>
- */
-
-
-#ifdef HAS_AVC_SUPPORT
-
-#ifndef AVC_VIDCAPMANAGER_H_
-#define AVC_VIDCAPMANAGER_H_
-
-#include "avcap-config.h"
-
-#include <sys/types.h>
-#include <list>
-#include <time.h>
-
-#include "CaptureManager.h"
-
-namespace avcap
-{
-	class AVC_DeviceDescriptor;
-	class AVC_FormatManager;
-	class IOBuffer;
-	class CaptureHandler;
-	class AVC_Reader;
-	class iec61883Connection;
-	
-	//! The IEEE 1394 AV/C video capture manager.
-	
-	/*! This class is used to capture video data from a AV/C-Device (e.g. DV-Cams) connected 
-	 * to the computer via IEEE 1394 (aka Firewire or iLink) under Linux. 
-	*/
-	class AVC_VidCapManager: public CaptureManager
-	{
-	public:
-		enum
-		{
-			MAX_BUFFERS = 32,	//!< The maximum number of IOBuffers.
-			DEFAULT_BUFFERS = 8	//!< The default number of used IOBuffers.
-		};
-		
-	private:
-		typedef std::list<IOBuffer*> IOBufList;
-		
-		AVC_DeviceDescriptor	*mDeviceDescriptor;
-		AVC_FormatManager		*mFormatMgr;
-		AVC_Reader				*mReader;
-		iec61883Connection		*mConnection;
-		
-		IOBufList			mBuffers;
-		int					mNumBufs;
-		int 				mSequence;
-
-	public:
-	
-		AVC_VidCapManager(AVC_DeviceDescriptor* dd, AVC_FormatManager* fmt_mgr, int nbufs = DEFAULT_BUFFERS);
-		
-		virtual ~AVC_VidCapManager();
-		
-		int init();
-		
-		int destroy();
-		
-		int startCapture();
-
-		int stopCapture();
-		
-		void registerCaptureHandler(CaptureHandler *handler); 
-
-		void removeCaptureHandler(); 
-		
-		virtual int getNumIOBuffers();
-
-	private:
-		virtual IOBuffer* dequeue();
-
-		virtual int enqueue(IOBuffer* buf);
-	};
-}
-#endif // AVC_VIDCAPMANAGER_H_
-
-#endif // HAS_AVC_SUPPORT
-

gpac-2.2.1.tar.gz/extra_lib/include/avcap/linux/V4L1_Connector.h Deleted

@@ -1,62 +0,0 @@
-/*
- * (c) 2005, 2008 Nico Pranke <Nico.Pranke@googlemail.com>, Robin Luedtke <RobinLu@gmx.de> 
- *
- * This file is part of avcap.
- *
- * avcap is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * avcap 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with avcap.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/* avcap is free for non-commercial use.
- * To use it in commercial endeavors, please contact Nico Pranke <Nico.Pranke@googlemail.com>
- */
-
-
-#ifndef V4L1_CONNECTOR_H_
-#define V4L1_CONNECTOR_H_
-
-#include <linux/types.h>
-
-#include <string>
-#include <list>
-
-#include "Connector.h"
-
-#ifdef AVCAP_HAVE_V4L2
-#include <linux/videodev2.h>
-#else
-#include <linux/videodev.h>
-#endif
-
-namespace avcap
-{	
-	// forward declaration
-	class V4L1_DeviceDescriptor;
-	class Tuner;
-	
-	//! Implementation of the Connector for a Video4Linux1 device. 
-
-	class V4L1_Connector : public Connector
-	{
-	public:
-		//! The Constructor. Objects should be instantiated only by the ConnectorManager.
-		inline V4L1_Connector(V4L1_DeviceDescriptor *dd, int index, const std::string& name, int type=0):
-			Connector(dd, index, name, type)
-			{}
-		
-		virtual inline ~V4L1_Connector()
-			{}			
-	};
-}
-
-#endif // V4L1_CONNECTOR_H_

gpac-2.2.1.tar.gz/extra_lib/include/avcap/linux/V4L1_ConnectorManager.h Deleted

@@ -1,65 +0,0 @@
-/*
- * (c) 2005, 2008 Nico Pranke <Nico.Pranke@googlemail.com>, Robin Luedtke <RobinLu@gmx.de> 
- *
- * This file is part of avcap.
- *
- * avcap is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * avcap 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with avcap.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/* avcap is free for non-commercial use.
- * To use it in commercial endeavors, please contact Nico Pranke <Nico.Pranke@googlemail.com>
- */
-
-
-#ifndef V4L1_CONNECTORMANAGER_H_
-#define V4L1_CONNECTORMANAGER_H_
-
-#include <list>
-
-#include "ConnectorManager.h"
-
-#ifdef AVCAP_HAVE_V4L2
-#include <linux/videodev2.h>
-#else
-#include <linux/videodev.h>
-#endif
-
-namespace avcap
-{	
-	class V4L1_DeviceDescriptor;
-	
-	//! Implementation of the ConnectorManager for Video4Linux2-devices. */
-	
-	class V4L1_ConnectorManager: public ConnectorManager
-	{	
-	private:
-		Connector*	mCurrentVideoInput;
-		
-	public:
-		V4L1_ConnectorManager(V4L1_DeviceDescriptor *dd);
-		
-		virtual ~V4L1_ConnectorManager();
-		
-		Connector* getVideoInput();
-
-		int setVideoInput(Connector* c);
-		
-		void query();
-	
-	private:
-		Connector* findByIndex(const ListType& l, int index);
-	};
-}
-
-#endif // V4L1_CONNECTORMANAGER_H_

gpac-2.2.1.tar.gz/extra_lib/include/avcap/linux/V4L1_Control.h Deleted

@@ -1,88 +0,0 @@
-/*
- * (c) 2005, 2008 Nico Pranke <Nico.Pranke@googlemail.com>, Robin Luedtke <RobinLu@gmx.de> 
- *
- * This file is part of avcap.
- *
- * avcap is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * avcap 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with avcap.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/* avcap is free for non-commercial use.
- * To use it in commercial endeavors, please contact Nico Pranke <Nico.Pranke@googlemail.com>
- */
-
-#ifndef V4L1_CONTROL_H_
-#define V4L1_CONTROL_H_
-
-#include <string>
-#include <list>
-
-#include "Control_avcap.h"
-
-namespace avcap
-{
-	// forward declaration
-	class V4L1_DeviceDescriptor;
-	
-	//! Implementation of a V4L1-Control.
-
-	/*! The V4L1 API supprots only controls for brightness, hue, colour, contrast, depth and whiteness.
-	 * They are all integer values between 0 and 65535.*/
-	 
-	class V4L1_Control: public IntegerControl
-	{
-	public:
-		enum Ctrl {
-			BRIGHTNESS = 0,
-			HUE,
-			COLOUR,
-			CONTRAST,
-			WHITENESS,
-			DEPTH
-		};
-	
-	private:	
-		static std::string mNames6;
-		
-		V4L1_DeviceDescriptor*	mDescriptor;
-		Ctrl	mType;
-		int		mDefaultValue;
-		Interval mInterval;
-		
-	public:
-		V4L1_Control(V4L1_DeviceDescriptor* dd, Ctrl type,  __u16 def);
-
-		virtual inline ~V4L1_Control()
-			{}
-		
-		virtual inline int getId() const
-			{ return mType; }
-		
-		virtual inline int getDefaultValue() const
-			{ return mDefaultValue; }
-		
-		virtual const std::string& getName() const;
-		
-		virtual int setValue(int val);
-
-		virtual int getValue() const;
-		
-		virtual int reset();
-
-		virtual inline const Interval& getInterval() const 
-			{ return mInterval; }
-	};
-}
-
-#endif // V4L1_CONTROL_H_
-

gpac-2.2.1.tar.gz/extra_lib/include/avcap/linux/V4L1_ControlManager.h Deleted

@@ -1,49 +0,0 @@
-/*
- * (c) 2005, 2008 Nico Pranke <Nico.Pranke@googlemail.com>, Robin Luedtke <RobinLu@gmx.de> 
- *
- * This file is part of avcap.
- *
- * avcap is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * avcap 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with avcap.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/* avcap is free for non-commercial use.
- * To use it in commercial endeavors, please contact Nico Pranke <Nico.Pranke@googlemail.com>
- */
-
-#ifndef V4L1_CONTROLMANAGER_H_
-#define V4L1_CONTROLMANAGER_H_
-
-#include <string>
-#include <list>
-
-#include "ControlManager.h"
-
-namespace avcap
-{
-	class V4L1_DeviceDescriptor;
-	
-	//! Implementation of the ControlManager for Video4Linux2 devices.
-	
-	class V4L1_ControlManager:public ControlManager
-	{
-	public:
-		V4L1_ControlManager(V4L1_DeviceDescriptor *dd);
-		
-		virtual ~V4L1_ControlManager();
-	
-		void query();
-	};
-}
-
-#endif // V4L1_CONTROLMANAGER_H_

gpac-2.2.1.tar.gz/extra_lib/include/avcap/linux/V4L1_Device.h Deleted

@@ -1,83 +0,0 @@
-/*
- * (c) 2005, 2008 Nico Pranke <Nico.Pranke@googlemail.com>, Robin Luedtke <RobinLu@gmx.de>
- *
- * This file is part of avcap.
- *
- * avcap is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * avcap 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with avcap.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/* avcap is free for non-commercial use.
- * To use it in commercial endeavors, please contact Nico Pranke <Nico.Pranke@googlemail.com>
- */
-
-#ifndef V4L1_DEVICE_H_
-#define V4L1_DEVICE_H_
-
-#include <string>
-#include <list>
-
-#include "V4L1_DeviceDescriptor.h"
-#include "CaptureDevice.h"
-
-namespace avcap
-{
-	// forward declarations
-	class V4L1_ConnectorManager;
-	class V4L1_ControlManager;
-	class V4L1_VidCapManager;
-	class V4L1_DeviceDescriptor;
-	class V4L1_FormatManager;
-
-	//! Implementation of the CaptureDevice interface for Video4Linux2 devices. */
-
-	class V4L1_Device : public CaptureDevice
-	{
-	public:
-
-	private:
-		V4L1_VidCapManager		*mVidCapMgr;
-		V4L1_ConnectorManager	*mConnectorMgr;
-		V4L1_ControlManager		*mControlMgr;
-		V4L1_FormatManager		*mFormatMgr;
-		V4L1_DeviceDescriptor	*mDeviceDescriptor;
-
-	public:
-		V4L1_Device(V4L1_DeviceDescriptor* dd);
-
-		virtual ~V4L1_Device();
-
-		inline const DeviceDescriptor* getDescriptor()
-			{ return mDeviceDescriptor; }
-
-		inline CaptureManager* getVidCapMgr()
-			{ return (CaptureManager*) mVidCapMgr; }
-
-		inline ConnectorManager* getConnectorMgr()
-			{ return (ConnectorManager*) mConnectorMgr; }
-
-		inline ControlManager*	getControlMgr()
-			{ return (ControlManager*) mControlMgr; }
-
-		inline FormatManager* getFormatMgr()
-			{ return (FormatManager*) mFormatMgr; }
-
-	private:
-		int open();
-
-		int close();
-	};
-}
-
-#endif //V4L1_DEVICE_H_
-

gpac-2.2.1.tar.gz/extra_lib/include/avcap/linux/V4L1_DeviceDescriptor.h Deleted

gpac-2.2.1.tar.gz/extra_lib/include/avcap/linux/V4L1_FormatManager.h Deleted

@@ -1,107 +0,0 @@
-/*
- * (c) 2005, 2008 Nico Pranke <Nico.Pranke@googlemail.com>, Robin Luedtke <RobinLu@gmx.de> 
- *
- * This file is part of avcap.
- *
- * avcap is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * avcap 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with avcap.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/* avcap is free for non-commercial use.
- * To use it in commercial endeavors, please contact Nico Pranke <Nico.Pranke@googlemail.com>.
- */
-
-
-#ifndef V4L1_FORMATMANAGER_H_
-#define V4L1_FORMATMANAGER_H_
-
-#include <linux/videodev.h>
-
-#include "FormatManager.h"
-
-namespace avcap
-{
-	class V4L1_DeviceDescriptor;
-	
-	//! This class implements the FormatManager for Video4Linux2 devices. */
-	/*! This CaptureManager starts an own thread to capture data. 
-	 * The access to the internal buffer-list is synchronized, so \c release() can be called
-	 * from any thread at any time.
-	 */
-		 
-	class V4L1_FormatManager: public FormatManager
-	{
-	private:
-		struct fmtdesc {
-			char	description32;
-			__u16	palette;
-			__u32	fourcc;
-			float	sizefactor;
-		};
-		
-		static const int mNumDescriptors = 18; 
-
-		static const fmtdesc mDescriptorsmNumDescriptors;
-		
-		bool mIsOVFX2;
-		
-	public:
-		V4L1_FormatManager(V4L1_DeviceDescriptor *dd);
-		
-		virtual ~V4L1_FormatManager();
-		
-		int setFormat(Format *fmt);
-		
-		int setFormat(unsigned int fourcc);
-
-		Format* getFormat();
-		
-		int setResolution(int w, int h);
-		
-		int setBytesPerLine(int bpl);
-
-		int getWidth();
-
-		int getHeight();
-		
-		int getBytesPerLine();
-
-		int flush();
-
-		size_t getImageSize();
-
-		const VideoStandard* getVideoStandard();
-
-		int setVideoStandard(const VideoStandard* std);
-		
-		//! Setting the frame-rate is currently only possible for some philips-cams
-		int setFramerate(int fps);
-		
-		int getFramerate();
-
-		__u16 getPalette();
-		
-		void query();
-
-	private:
-		int getParams();
-
-		void queryResolutions();
-		
-		__u16 getPalette(__u32 fourcc);
-		
-		int updateDimensions();
-	};
-}
-
-#endif //V4L1_FORMATMANAGER_H_

gpac-2.2.1.tar.gz/extra_lib/include/avcap/linux/V4L1_VidCapManager.h Deleted

@@ -1,111 +0,0 @@
-/*
- * (c) 2005, 2008 Nico Pranke <Nico.Pranke@googlemail.com>, Robin Luedtke <RobinLu@gmx.de> 
- *
- * This file is part of avcap.
- *
- * avcap is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * avcap 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with avcap.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/* avcap is free for non-commercial use.
- * To use it in commercial endeavors, please contact Nico Pranke <Nico.Pranke@googlemail.com>.
- */
-
-
-#ifndef V4L1_VIDCAPMANAGER_H_
-#define V4L1_VIDCAPMANAGER_H_
-
-#include <sys/types.h>
-#include <list>
-#include <time.h>
-
-#include "CaptureManager.h"
-
-namespace avcap
-{
-	class V4L1_DeviceDescriptor;
-	class V4L1_FormatManager;
-	class IOBuffer;
-	class CaptureHandler;
-
-	//! The Video4Linux2-API video capture manager.
-
-	class V4L1_VidCapManager: public CaptureManager
-	{
-	private:
-		typedef std::list<IOBuffer*> IOBufList_t;
-		typedef std::list<int>		 IndexList_t;
-				
-		V4L1_DeviceDescriptor	*mDeviceDescriptor;
-		V4L1_FormatManager		*mFormatMgr;
-		
-		IOBufList_t			mBuffers;
-		IndexList_t			mCaptureIndices;
-		
-		int					mNumBufs;
-		int					mMethod;
-		int					mState;
-
-		pthread_t*			mThread;
-		int					mFinish;
-		pthread_mutex_t		mLock;
-		timeval				mStartTime;
-
-		long 				mSequence;
-
-		unsigned char*		mVideobuf;
-		size_t				mVideobufSize;
-		int					mWidth;
-		int					mHeight;
-		unsigned int		mPalette;
-		int					mAvailableBuffers;
-		
-	public:
-	
-		V4L1_VidCapManager(V4L1_DeviceDescriptor* dd, V4L1_FormatManager* fmt_mgr, int nbufs = DEFAULT_BUFFERS);
-		
-		virtual ~V4L1_VidCapManager();
-		
-		int init();
-		
-		int destroy();
-		
-		int startCapture();
-
-		int stopCapture();
-		
-		int getNumIOBuffers();
-		
-	private:
-		int start_read();
-
-		int start_mmap();
-
-		int stop_read();
-		
-		int stop_mmap();
-
-		IOBuffer* dequeue();
-		
-		int enqueue(IOBuffer* buf);
-		
-		IOBuffer* findBuffer(int index);
-		
-		static void run(void* mgr);
-		
-		void clearBuffers();
-		
-		int getUsedBufferCount();
-	};
-};
-#endif // V4L1_VIDCAPMANAGER_H_

gpac-2.2.1.tar.gz/extra_lib/include/avcap/linux/V4L2_BoolControl.h Deleted

@@ -1,68 +0,0 @@
-/*
- * (c) 2005, 2008 Nico Pranke <Nico.Pranke@googlemail.com>, Robin Luedtke <RobinLu@gmx.de> 
- *
- * This file is part of avcap.
- *
- * avcap is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * avcap 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with avcap.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/* avcap is free for non-commercial use.
- * To use it in commercial endeavors, please contact Nico Pranke <Nico.Pranke@googlemail.com>.
- */
-
-#ifndef V4L2_BOOLCONTROL_H_
-#define V4L2_BOOLCONTROL_H_
-
-#include "V4L2_ControlBase.h"
-
-namespace avcap
-{
-	class V4L2_DeviceDescriptor;
-
-	//! A control for a Video4Linux2 device with one of the two values true (1) or false (0).
-	
-	class V4L2_BoolControl: public BoolControl
-	{
-	private:
-		V4L2_ControlBase	mControlBase;
-		
-	public:
-		inline V4L2_BoolControl(V4L2_DeviceDescriptor *dd, struct v4l2_queryctrl* query):
-			mControlBase(dd, query)
-			{}
-
-		virtual inline ~V4L2_BoolControl()
-			{}
-		
-		virtual inline int getId() const
-			{ return mControlBase.getId(); }
-	
-		virtual inline int getDefaultValue() const
-			{ return mControlBase.getDefaultValue(); }
-	
-		virtual inline const std::string& getName() const
-			{ return mControlBase.getName(); }
-	
-		virtual inline int setValue(int val)
-			{ return mControlBase.setValue(val); }
-	
-		virtual inline int getValue() const
-			{ return mControlBase.getValue(); }
-		
-		virtual inline int reset()
-			{ return mControlBase.reset(); }
-	};
-}
-
-#endif // V4L2_BOOLCONTROL_H_

gpac-2.2.1.tar.gz/extra_lib/include/avcap/linux/V4L2_ButtonControl.h Deleted

@@ -1,72 +0,0 @@
-/*
- * (c) 2005, 2008 Nico Pranke <Nico.Pranke@googlemail.com>, Robin Luedtke <RobinLu@gmx.de> 
- *
- * This file is part of avcap.
- *
- * avcap is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * avcap 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with avcap.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/* avcap is free for non-commercial use.
- * To use it in commercial endeavors, please contact Nico Pranke <Nico.Pranke@googlemail.com>.
- */
-
-
-#ifndef V4L2_BUTTONCONTROL_H_
-#define V4L2_BUTTONCONTROL_H_
-
-#include "V4L2_ControlBase.h"
-
-namespace avcap
-{
-	class V4L2_DeviceDescriptor;
-	
-	//! A control for a Video4Linux2 device that performs an action when set, independently from the value.
-	
-	class V4L2_ButtonControl: public ButtonControl
-	{
-	private:
-		V4L2_ControlBase	mControlBase;
-
-	public:
-		inline V4L2_ButtonControl(V4L2_DeviceDescriptor *dd, struct v4l2_queryctrl* query): 
-			mControlBase(dd, query)
-			{}
-
-		virtual inline ~V4L2_ButtonControl()
-			{}
-		
-		virtual inline int push()
-			{ return setValue(0); }
-		
-		virtual inline int getId() const
-			{ return mControlBase.getId(); }
-	
-		virtual inline int getDefaultValue() const
-			{ return mControlBase.getDefaultValue(); }
-	
-		virtual inline const std::string& getName() const
-			{ return mControlBase.getName(); }
-	
-		virtual inline int setValue(int val)
-			{ return mControlBase.setValue(val); }
-	
-		virtual inline int getValue() const
-			{ return mControlBase.getValue(); }
-		
-		virtual inline int reset() 
-			{ return mControlBase.reset(); }
-	};
-}
-
-#endif // V4L2_BUTTONCONTROL_H_

gpac-2.2.1.tar.gz/extra_lib/include/avcap/linux/V4L2_Connector.h Deleted

@@ -1,67 +0,0 @@
-/*
- * (c) 2005, 2008 Nico Pranke <Nico.Pranke@googlemail.com>, Robin Luedtke <RobinLu@gmx.de> 
- *
- * This file is part of avcap.
- *
- * avcap is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * avcap 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with avcap.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/* avcap is free for non-commercial use.
- * To use it in commercial endeavors, please contact Nico Pranke <Nico.Pranke@googlemail.com>.
- */
-
-
-#ifndef V4L2_CONNECTOR_H_
-#define V4L2_CONNECTOR_H_
-
-#include <linux/types.h>
-
-#include <string>
-#include <list>
-
-#include "Connector.h"
-
-#ifdef AVCAP_HAVE_V4L2
-#include <linux/videodev2.h>
-#else
-#include <linux/videodev.h>
-#endif
-
-namespace avcap
-{	
-	// forward declaration
-	class V4L2_DeviceDescriptor;
-	class Tuner;
-	
-	//! This class implements Connector (a video/audio input or output) for a Video4Linux2 device.
-	 
-	class V4L2_Connector : public Connector
-	{
-	private:
-		Tuner*				mTuner;
-		
-	public:
-		V4L2_Connector(V4L2_DeviceDescriptor *dd, int index, const std::string& name, int type=0, int audioset=0, int tuner=0);			
-
-		virtual ~V4L2_Connector();
-
-		inline Tuner* getTuner()
-			{ return mTuner; }
-				
-		inline bool hasTuner() const
-			{ return mType & INPUT_TYPE_TUNER; }
-	};
-}
-
-#endif // V4L2_CONNECTOR_H_

gpac-2.2.1.tar.gz/extra_lib/include/avcap/linux/V4L2_ConnectorManager.h Deleted

@@ -1,69 +0,0 @@
-/*
- * (c) 2005, 2008 Nico Pranke <Nico.Pranke@googlemail.com>, Robin Luedtke <RobinLu@gmx.de> 
- *
- * This file is part of avcap.
- *
- * avcap is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * avcap 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with avcap.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/* avcap is free for non-commercial use.
- * To use it in commercial endeavors, please contact Nico Pranke <Nico.Pranke@googlemail.com>.
- */
-
-
-#ifndef V4L2_CONNECTORMANAGER_H_
-#define V4L2_CONNECTORMANAGER_H_
-
-#include <list>
-
-#include "ConnectorManager.h"
-
-namespace avcap
-{	
-	class V4L2_DeviceDescriptor;
-	
-	//! This class implements the ConnectorManager for Video4Linux2-devices.
-	
-	class V4L2_ConnectorManager: public ConnectorManager
-	{	
-	public:
-	
-		V4L2_ConnectorManager(V4L2_DeviceDescriptor *dd);
-
-		virtual ~V4L2_ConnectorManager();
-		
-		Connector* getVideoInput();
-
-		int setVideoInput(Connector* c);
-		
-		Connector* getAudioInput();
-
-		int setAudioInput(Connector* c);
-		
-		Connector* getVideoOutput();
-		
-		int setVideoOutput(Connector* c);
-		
-		Connector* getAudioOutput();
-		
-		int setAudioOutput(Connector* c);
-
-		void query();
-	
-	private:
-		Connector* findByIndex(const ListType& l, int index);
-	};
-}
-
-#endif // V4L2_CONNECTORMANAGER_H_

gpac-2.2.1.tar.gz/extra_lib/include/avcap/linux/V4L2_ControlBase.h Deleted

@@ -1,91 +0,0 @@
-/*
- * (c) 2005, 2008 Nico Pranke <Nico.Pranke@googlemail.com>, Robin Luedtke <RobinLu@gmx.de> 
- *
- * This file is part of avcap.
- *
- * avcap is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * avcap 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with avcap.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/* avcap is free for non-commercial use.
- * To use it in commercial endeavors, please contact Nico Pranke <Nico.Pranke@googlemail.com>.
- */
-
-#ifndef V4L2_CONTROLBASE_H_
-#define V4L2_CONTROLBASE_H_
-
-#include <string>
-#include <list>
-
-#if !defined(_MSC_VER) && !defined(USE_PREBUILD_LIBS)
-# include "avcap-config.h"
-#endif
-
-#ifdef AVCAP_HAVE_V4L2
-#include <linux/videodev2.h>
-#else
-#include <linux/videodev.h>
-#endif
-
-namespace avcap
-{
-	// forward declaration
-	class V4L2_DeviceDescriptor;
-	
-	//! Basic implementation of a device control for a Video4Linux2 device.
-	
-	/*! Implements common methods of V4L2-controls. */
-	
-	class V4L2_ControlBase
-	{
-	protected:
-		V4L2_DeviceDescriptor	*mDeviceDescriptor;
-		int	mId;
-		int mValue;
-	
-	private:
-		std::string	mName;
-		int mDefaultValue;
-		int mFlags;
-
-	public:
-		V4L2_ControlBase(V4L2_DeviceDescriptor *dd, struct v4l2_queryctrl* query);
-
-		virtual ~V4L2_ControlBase();
-
-		inline int getId() const
-			{ return mId; }
-
-		inline int getDefaultValue() const
-			{ return mDefaultValue; }
-		
-		inline const std::string& getName() const 
-			{ return mName; }
-		
-		virtual int setValue(int val);
-
-		virtual int getValue() const;
-		
-		virtual int reset();
-		
-		//! Return the flags of the v4l2_queryctrl structure associated with the control.
-		__u32 getFlags() const { return mFlags; }
-		
-	protected:
-		// updates the value of the control
-		int update();
-	};
-}
-
-#endif // V4L2_CONTROLBASE_H_
-

gpac-2.2.1.tar.gz/extra_lib/include/avcap/linux/V4L2_ControlManager.h Deleted

@@ -1,55 +0,0 @@
-/*
- * (c) 2005, 2008 Nico Pranke <Nico.Pranke@googlemail.com>, Robin Luedtke <RobinLu@gmx.de> 
- *
- * This file is part of avcap.
- *
- * avcap is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * avcap 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with avcap.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/* avcap is free for non-commercial use.
- * To use it in commercial endeavors, please contact Nico Pranke <Nico.Pranke@googlemail.com>.
- */
-
-
-#ifndef V4L2_CONTROLMANAGER_H_
-#define V4L2_CONTROLMANAGER_H_
-
-#include <string>
-#include <list>
-
-#include "ControlManager.h"
-
-namespace avcap
-{
-	class V4L2_DeviceDescriptor;
-	
-	//! Implementation of the ControlManager for Video4Linux2 devices.
-	
-	class V4L2_ControlManager:public ControlManager
-	{
-	public:
-		V4L2_ControlManager(V4L2_DeviceDescriptor *dd);
-		
-		virtual ~V4L2_ControlManager();
-	
-		void query();
-		
-	private:
-		void query(int start_id, int end_id);
-		
-		bool queryExtended();
-	};
-}
-
-#endif // V4L2_CONTROLMANAGER_H_

gpac-2.2.1.tar.gz/extra_lib/include/avcap/linux/V4L2_CtrlClassControl.h Deleted

@@ -1,68 +0,0 @@
-/*
- * (c) 2005, 2008 Nico Pranke <Nico.Pranke@googlemail.com>, Robin Luedtke <RobinLu@gmx.de> 
- *
- * This file is part of avcap.
- *
- * avcap is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * avcap 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with avcap.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/* avcap is free for non-commercial use.
- * To use it in commercial endeavors, please contact Nico Pranke <Nico.Pranke@googlemail.com>.
- */
-
-#ifndef V4L2_CTRLCLASS_CONTROL_H_
-#define V4L2_CTRLCLASS_CONTROL_H_
-
-#include "V4L2_ControlBase.h"
-
-namespace avcap
-{
-	class V4L2_DeviceDescriptor;
-
-	//! A control for a Video4Linux2 device naming the control-class of the subsequent enumerated controls.
-	
-	class V4L2_CtrlClassControl: public CtrlClassControl
-	{
-	private:
-		V4L2_ControlBase	mControlBase;
-		
-	public:
-		inline V4L2_CtrlClassControl(V4L2_DeviceDescriptor *dd, struct v4l2_queryctrl* query):
-			mControlBase(dd, query)
-			{}
-
-		virtual inline ~V4L2_CtrlClassControl()
-			{}
-		
-		virtual inline int getId() const
-			{ return mControlBase.getId(); }
-	
-		virtual inline int getDefaultValue() const
-			{ return 0; }
-	
-		virtual inline const std::string& getName() const
-			{ return mControlBase.getName(); }
-	
-		virtual inline int setValue(int val)
-			{ return 0; }
-	
-		virtual inline int getValue() const
-			{ return 0; }
-		
-		virtual inline int reset()
-			{ return 0; }
-	};
-}
-
-#endif // V4L2_CTRLCLASS_CONTROL_H_

gpac-2.2.1.tar.gz/extra_lib/include/avcap/linux/V4L2_Device.h Deleted

@@ -1,84 +0,0 @@
-/*
- * (c) 2005, 2008 Nico Pranke <Nico.Pranke@googlemail.com>, Robin Luedtke <RobinLu@gmx.de>
- *
- * This file is part of avcap.
- *
- * avcap is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * avcap 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with avcap.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/* avcap is free for non-commercial use.
- * To use it in commercial endeavors, please contact Nico Pranke <Nico.Pranke@googlemail.com>.
- */
-
-
-#ifndef V4L2_DEVICE_H_
-#define V4L2_DEVICE_H_
-
-#include <string>
-#include <list>
-
-#include "V4L2_DeviceDescriptor.h"
-#include "CaptureDevice.h"
-
-namespace avcap
-{
-	// forward declarations
-	class V4L2_ConnectorManager;
-	class V4L2_ControlManager;
-	class V4L2_VidCapManager;
-	class V4L2_DeviceDescriptor;
-	class V4L2_FormatManager;
-
-	//! Implementation of the CaptureDevice for Video4Linux2 devices. */
-
-	class V4L2_Device : public CaptureDevice
-	{
-	public:
-
-	private:
-		V4L2_VidCapManager		*mVidCapMgr;
-		V4L2_ConnectorManager	*mConnectorMgr;
-		V4L2_ControlManager		*mControlMgr;
-		V4L2_FormatManager		*mFormatMgr;
-		V4L2_DeviceDescriptor	*mDeviceDescriptor;
-
-	public:
-		V4L2_Device(V4L2_DeviceDescriptor* dd);
-
-		virtual ~V4L2_Device();
-
-		inline const DeviceDescriptor* getDescriptor()
-			{ return mDeviceDescriptor; }
-
-		inline CaptureManager* getVidCapMgr()
-			{ return (CaptureManager*) mVidCapMgr; }
-
-		inline ConnectorManager* getConnectorMgr()
-			{ return (ConnectorManager*) mConnectorMgr; }
-
-		inline ControlManager*	getControlMgr()
-			{ return (ControlManager*) mControlMgr; }
-
-		inline FormatManager* getFormatMgr()
-			{ return (FormatManager*) mFormatMgr; }
-
-	private:
-		int open();
-
-		int close();
-	};
-}
-
-#endif // V4L2_DEVICE_H_
-

gpac-2.2.1.tar.gz/extra_lib/include/avcap/linux/V4L2_DeviceDescriptor.h Deleted

@@ -1,112 +0,0 @@
-/*
- * (c) 2005, 2008 Nico Pranke <Nico.Pranke@googlemail.com>, Robin Luedtke <RobinLu@gmx.de>
- *
- * This file is part of avcap.
- *
- * avcap is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * avcap 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with avcap.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/* avcap is free for non-commercial use.
- * To use it in commercial endeavors, please contact Nico Pranke <Nico.Pranke@googlemail.com>.
- */
-
-#ifndef V4L2_DEVICEDESCRIPTOR_H_
-#define V4L2_DEVICEDESCRIPTOR_H_
-
-#include <string>
-
-#include "DeviceDescriptor.h"
-
-// IVTV driver name
-#define DRIVER_IVTV	"ivtv"
-
-namespace avcap
-{
-class CaptureDevice;
-class V4L2_Device;
-
-	//! This class uniquely identifies a Video4Linux2 capture device.
-
-	class V4L2_DeviceDescriptor : public DeviceDescriptor
-	{
-	private:
-		std::string	mName;
-		std::string mDriver;
-		std::string mCard;
-		std::string mInfo;
-		std::string mVersionString;
-
-		int mVersion;
-		int mCapabilities;
-
-		DEV_HANDLE_T 	mHandle;
-		bool 			mValid;
-		V4L2_Device*	mDevice;
-
-	public:
-		V4L2_DeviceDescriptor(const std::string &name);
-
-		virtual ~V4L2_DeviceDescriptor();
-
-		virtual CaptureDevice* getDevice();
-
-		int open();
-
-		int close();
-
-		virtual const std::string& getName() const;
-
-		inline const std::string& getDriver() const
-			{ return mDriver; }
-
-		inline const std::string& getCard() const
-			{ return mCard; }
-
-		inline const std::string& getInfo() const
-			{ return mInfo; }
-
-		inline int getVersion() const
-			{ return mVersion; }
-
-		const std::string& getVersionString() const;
-
-		inline const DEV_HANDLE_T getHandle() const
-			{ return mHandle; }
-
-		bool isAVDev() const;
-
-		bool isVideoCaptureDev() const;
-
-		bool isVBIDev() const;
-
-		bool isTuner() const;
-
-		bool isAudioDev() const;
-
-		bool isRadioDev() const;
-
-		bool isOverlayDev() const;
-
-		bool isRWDev () const;
-
-		bool isAsyncIODev() const;
-
-		bool isStreamingDev() const;
-
-	private:
-		bool queryCapabilities();
-	};
-}
-
-#endif // V4L2_DEVICEDESCRIPTOR_H_

gpac-2.2.1.tar.gz/extra_lib/include/avcap/linux/V4L2_FormatManager.h Deleted

@@ -1,85 +0,0 @@
-/*
- * (c) 2005, 2008 Nico Pranke <Nico.Pranke@googlemail.com>, Robin Luedtke <RobinLu@gmx.de> 
- *
- * This file is part of avcap.
- *
- * avcap is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * avcap 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with avcap.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/* avcap is free for non-commercial use.
- * To use it in commercial endeavors, please contact Nico Pranke <Nico.Pranke@googlemail.com>.
- */
-
-#ifndef V4L2_FORMATMANAGER_H_
-#define V4L2_FORMATMANAGER_H_
-
-#include "FormatManager.h"
-
-namespace avcap
-{
-	class V4L2_DeviceDescriptor;
-	
-	//! This class implements the FormatManager for Video4Linux2 devices. */
-	
-	class V4L2_FormatManager: public FormatManager
-	{
-	
-	public:
-		V4L2_FormatManager(V4L2_DeviceDescriptor *dd);
-		
-		virtual ~V4L2_FormatManager();
-		
-		int setFormat(Format *fmt);
-		
-		int setFormat(unsigned int fourcc);
-
-		Format* getFormat();
-		
-		int setResolution(int w, int h);
-
-		int setBytesPerLine(int bpl);
-
-		int getWidth();
-
-		int getHeight();
-		
-		int getBytesPerLine();
-		
-		int flush();
-
-		size_t getImageSize();
-		
-		const VideoStandard* getVideoStandard();
-
-		int setVideoStandard(const VideoStandard* std);
-		
-		int setFramerate(int fps);
-		
-		int getFramerate();
-		
-		void query();
-
-	private:
-		int tryFormat();
-		
-		int getParams();
-		
-		void queryVideoStandards();
-		
-		void queryResolutions(Format* f);
-	
-	};
-}
-
-#endif // V4L2_FORMATMANAGER_H_

gpac-2.2.1.tar.gz/extra_lib/include/avcap/linux/V4L2_IntControl.h Deleted

@@ -1,75 +0,0 @@
-/*
- * (c) 2005, 2008 Nico Pranke <Nico.Pranke@googlemail.com>, Robin Luedtke <RobinLu@gmx.de> 
- *
- * This file is part of avcap.
- *
- * avcap is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * avcap 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with avcap.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/* avcap is free for non-commercial use.
- * To use it in commercial endeavors, please contact Nico Pranke <Nico.Pranke@googlemail.com>.
- */
-
-
-#ifndef V4L2_INTCONTROL_H_
-#define V4L2_INTCONTROL_H_
-
-#include "V4L2_ControlBase.h"
-
-namespace avcap
-{
-	class V4L2_DeviceDescriptor;
-	
-	//! Implementation of an integer valued control for Video4Linux2 devices.
-	 
-	class V4L2_IntControl: public IntegerControl
-	{
-	private:
-		V4L2_ControlBase	mControlBase;
-		Interval			mInterval;
-		
-	public:
-		inline V4L2_IntControl(V4L2_DeviceDescriptor *dd, struct v4l2_queryctrl* query):
-			mControlBase(dd, query),
-			mInterval(query->minimum, query->maximum, query->step)
-			{}
-
-		virtual inline ~V4L2_IntControl()
-			{}
-		
-		inline const Interval& getInterval() const 
-			{ return mInterval; }
-
-		virtual inline int getId() const
-			{ return mControlBase.getId(); }
-	
-		virtual inline int getDefaultValue() const
-			{ return mControlBase.getDefaultValue(); }
-	
-		virtual inline const std::string& getName() const
-			{ return mControlBase.getName(); }
-	
-		virtual inline int setValue(int val)
-			{ return mControlBase.setValue(val); }
-	
-		virtual inline int getValue() const
-			{ return mControlBase.getValue(); }
-		
-		virtual inline int reset() 
-			{ return mControlBase.reset(); }
-
-	};
-}
-
-#endif // V4L2_INTCONTROL_H_

gpac-2.2.1.tar.gz/extra_lib/include/avcap/linux/V4L2_MenuControl.h Deleted

@@ -1,77 +0,0 @@
-/*
- * (c) 2005, 2008 Nico Pranke <Nico.Pranke@googlemail.com>, Robin Luedtke <RobinLu@gmx.de> 
- *
- * This file is part of avcap.
- *
- * avcap is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * avcap 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with avcap.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/* avcap is free for non-commercial use.
- * To use it in commercial endeavors, please contact Nico Pranke <Nico.Pranke@googlemail.com>.
- */
-
-#ifndef V4L2_MENUCONTROL_H_
-#define V4L2_MENUCONTROL_H_
-
-#include "V4L2_ControlBase.h"
-#include "Control_avcap.h"
-
-namespace avcap
-{
-	// forward declaration
-	class V4L2_DeviceDescriptor;
-	
-	//! A Control for a Video4Linux2 device which has various menu-like items to choose from.
-	
-	class V4L2_MenuControl: public MenuControl
-	{
-	private:
-		V4L2_ControlBase	mControlBase;
-		ItemList 			mMenuItems;
-		V4L2_DeviceDescriptor*	mDeviceDescriptor;
-		
-	public:
-		//! The constructor.
-		V4L2_MenuControl(V4L2_DeviceDescriptor *dd, struct v4l2_queryctrl* query);
-
-		//! The destructor.
-		virtual ~V4L2_MenuControl();
-	
-		virtual inline int getId() const
-			{ return mControlBase.getId(); }
-	
-		virtual inline int getDefaultValue() const
-			{ return mControlBase.getDefaultValue(); }
-	
-		virtual inline const std::string& getName() const
-			{ return mControlBase.getName(); }
-	
-		virtual inline int setValue(int val)
-			{ return mControlBase.setValue(val); }
-	
-		virtual inline int getValue() const
-			{ return mControlBase.getValue(); }
-		
-		virtual inline int reset() 
-			{ return mControlBase.reset(); }
-
-		virtual inline const ItemList& getItemList () 
-			{ return mMenuItems; }
-
-	private:
-		void queryMenuItems();
-	};
-}
-
-#endif //V4L2_MENUCONTROL_H_

gpac-2.2.1.tar.gz/extra_lib/include/avcap/linux/V4L2_Tuner.h Deleted

@@ -1,124 +0,0 @@
-/*
- * (c) 2005, 2008 Nico Pranke <Nico.Pranke@googlemail.com>, Robin Luedtke <RobinLu@gmx.de> 
- *
- * This file is part of avcap.
- *
- * avcap is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * avcap 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with avcap.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/* avcap is free for non-commercial use.
- * To use it in commercial endeavors, please contact Nico Pranke <Nico.Pranke@googlemail.com>.
- */
-
-
-#ifndef V4L2_TUNER_H_
-#define V4L2_TUNER_H_
-
-#include <linux/types.h>
-#include <sys/types.h>
-#include <string>
-
-#include "Tuner_avcap.h"
-#ifdef AVCAP_HAVE_V4L2
-#include <linux/videodev2.h>
-#else
-#include <linux/videodev.h>
-#endif
-
-namespace avcap
-{
-	class V4L2_DeviceDescriptor;
-	
-	//! Implementation of the Tuner class for Video4Linux2 -devices.
-	
-	class V4L2_Tuner: public Tuner
-	{
-	private:
-
-		enum {
-			TUNER_RADIO = V4L2_TUNER_RADIO,
-			TUNER_ANALOG_TV = V4L2_TUNER_ANALOG_TV,
-		};
-		
-		enum {
-			TUNER_CAP_LOW = V4L2_TUNER_CAP_LOW
-		};
-
-		typedef __u32	     uint;
-
-	private:
-		V4L2_DeviceDescriptor*	mDeviceDescriptor;
-		int			mIndex;
-		std::string	mName;
-		int			mType;
-		int			mCapabilities;
-		uint 		mRangeHigh;
-		uint 		mRangeLow;
-		double		mStep;
-		
-	public:
-		V4L2_Tuner(V4L2_DeviceDescriptor *dd, int index, const std::string &name, int type, int caps, uint high, uint low);
-		virtual ~V4L2_Tuner();
-		
-		inline bool isRadioTuner() const 
-			{ return mType & TUNER_RADIO; }
-
-		inline bool isTVTuner() const 
-			{ return mType & TUNER_ANALOG_TV; };
-
-		int setStereo();
-
-		int setMono();
-		
-		int setSAP();
-		
-		int setLang1();
-
-		int setLang2();
-
-		double getFreq() const;
-
-		inline double getFreqStep() const 
-			{ return mStep; }
-		
-		inline double getMinFreq() const 
-			{ return mRangeLow*mStep; }
-
-		inline double getMaxFreq() const 
-			{ return mRangeHigh*mStep; }
-		
-		inline const std::string getName() const
-			{ return mName; }
-		
-		int finetune(int maxsteps);
-		
-		int getAFCValue() const;
-		
-		int getSignalStrength() const;
-		
-		int increaseFreq();
-		
-		int decreaseFreq();		
-		
-		int setFreq(double f);
-		
-	private:
-		int setAudioMode(int mode);
-
-		int getAudioMode();
-	};
-}
-
-#endif // V4L2_TUNER_H_
-

gpac-2.2.1.tar.gz/extra_lib/include/avcap/linux/V4L2_VidCapManager.h Deleted

@@ -1,125 +0,0 @@
-/*
- * (c) 2005, 2008 Nico Pranke <Nico.Pranke@googlemail.com>, Robin Luedtke <RobinLu@gmx.de> 
- *
- * This file is part of avcap.
- *
- * avcap is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * avcap 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with avcap.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/* avcap is free for non-commercial use.
- * To use it in commercial endeavors, please contact Nico Pranke <Nico.Pranke@googlemail.com>.
- */
-
-
-#ifndef V4L2_VIDCAPMANAGER_H_
-#define V4L2_VIDCAPMANAGER_H_
-
-#include <sys/types.h>
-#include <list>
-#include <time.h>
-
-#include "CaptureManager.h"
-
-namespace avcap
-{
-	class V4L2_DeviceDescriptor;
-	class FormatManager;
-	class IOBuffer;
-	class CaptureHandler;
-
-	//! The Video4Linux2-API video capture manager.
-	
-	/*! This class can be used to capture video data from a V4L2 video device. 
-	 * The manager creates a defined number 
-	 * of IOBuffers and permanently reuses them to store the captured data. 
-	 * Since the number of these buffers is finite, it is important that applications 
-	 * call IOBuffer::release() as soon as they don't need the data anymore. The
-	 * access to the internal buffer-list is synchronized, so \c release() can be called
-	 * from any thread at any time.
-	 * Typical applications don't create objects of this class directly. They obtain
-	 * an instance from CaptureDevice. */
-	 
-	class V4L2_VidCapManager: public CaptureManager
-	{
-	public:
-		enum
-		{
-			MAX_BUFFERS = 32,	//!< The maximum number of IOBuffers.
-			DEFAULT_BUFFERS = 16	//!< The default number of used IOBuffers.
-		};
-		
-		enum IOMethod
-		{
-			IO_METHOD_NOCAP = 0,
-	        IO_METHOD_READ,
-	        IO_METHOD_MMAP,
-	        IO_METHOD_USERPTR,
-		};
-
-	private:
-		typedef std::list<IOBuffer*> IOBufList;
-		
-		V4L2_DeviceDescriptor	*mDeviceDescriptor;
-		FormatManager		*mFormatMgr;
-
-		IOBufList			mBuffers;
-		int					mNumBufs;
-		int					mMethod;
-		int					mState;
-		pthread_t*			mThread;
-		int 				mFinish;
-		pthread_mutex_t		mLock;
-		timeval				mStartTime;
-
-		int 				mSequence;
-		int					mDTNumerator;
-		int					mDTDenominator;
-		int					mAvailableBuffers;
-	
-	public:
-		V4L2_VidCapManager(V4L2_DeviceDescriptor* dd, FormatManager* fmt_mgr, int nbufs = DEFAULT_BUFFERS);
-		
-		virtual ~V4L2_VidCapManager();
-		
-		int init();
-		
-		int destroy();
-		
-		int startCapture();
-
-		int stopCapture();
-		
-		int getNumIOBuffers();
-
-	private:
-		int start_read();
-		int start_mmap();
-		int start_userptr();
-
-		int stop_read();
-		int stop_mmap();
-		int stop_userptr();
-
-		IOBuffer* dequeue();
-		int enqueue(IOBuffer* buf);
-		
-		IOBuffer* findBuffer(int index);
-		static void run(void* mgr);
-		
-		void clearBuffers();
-		int getUsedBufferCount();
-	};
-}
-
-#endif // V4L2_VIDCAPMANAGER_H_

gpac-2.2.1.tar.gz/extra_lib/include/avcap/linux/error.h Deleted

@@ -1,44 +0,0 @@
-/*
-* error.h Error handling
-* Copyright (C) 2000 - 2002 Arne Schirmacher <arne@schirmacher.de>
-*
-* This program is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation; either version 2 of the License, or
-* (at your option) any later version.
-*
-* This program 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 General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software Foundation,
-* Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-*/
-
-#ifdef HAS_AVC_SUPPORT
-
-#ifndef _ERROR_H
-#define _ERROR_H 1
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-#define fail_neg(eval)  real_fail_neg  (eval, #eval, __ASSERT_FUNCTION, __FILE__, __LINE__)
-#define fail_null(eval) real_fail_null (eval, #eval, __ASSERT_FUNCTION, __FILE__, __LINE__)
-#define fail_if(eval)   real_fail_if   (eval, #eval, __ASSERT_FUNCTION, __FILE__, __LINE__)
-
-	void real_fail_neg ( int eval, const char * eval_str, const char * func, const char * file, int line );
-	void real_fail_null ( const void * eval, const char * eval_str, const char * func, const char * file, int line );
-	void real_fail_if ( bool eval, const char * eval_str, const char * func, const char * file, int line );
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-#endif
-

gpac-2.2.1.tar.gz/extra_lib/include/avcap/linux/frame.h Deleted

@@ -1,161 +0,0 @@
-/*
-* frame.h -- utilities for process digital video frames
-* Copyright (C) 2000 Arne Schirmacher <arne@schirmacher.de>
-*
-* This program is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation; either version 2 of the License, or
-* (at your option) any later version.
-*
-* This program 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 General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software Foundation,
-* Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-*/
-
-#ifdef HAS_AVC_SUPPORT
-#define HAVE_LIBDV
-
-#ifndef _FRAME_H
-#define _FRAME_H 1
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <time.h>
-#include <string>
-using std::string;
-
-#include <libdv/dv.h>
-#include <libdv/dv_types.h>
-#define DV_AUDIO_MAX_SAMPLES 1944
-
-#define FRAME_MAX_WIDTH 720
-#define FRAME_MAX_HEIGHT 576
-
-namespace avcap
-{
-	
-typedef struct Pack
-{
-	/// the five bytes of a packet
-	unsigned char data 5 ;
-}
-Pack;
-
-typedef struct TimeCode
-{
-	int hour;
-	int min;
-	int sec;
-	int frame;
-}
-TimeCode;
-
-
-typedef struct AudioInfo
-{
-	int frames;
-	int frequency;
-	int samples;
-	int channels;
-	int quantization;
-}
-AudioInfo;
-
-
-class VideoInfo
-{
-public:
-	int width;
-	int height;
-	bool isPAL;
-	TimeCode timeCode;
-	struct tm	recDate;
-
-	VideoInfo();
-
-	//    string GetTimeCodeString();
-	//    string GetRecDateString();
-}
-;
-
-
-class Frame
-{
-public:
-	/// enough space to hold a PAL frame
-	unsigned char data 144000 ;
-	/// the number of bytes written to the frame
-	int bytesInFrame;
-#ifdef HAVE_LIBDV
-
-	dv_decoder_t *decoder;
-#endif
-
-	int16_t *audio_buffers 4 ;
-
-public:
-	Frame();
-	~Frame();
-
-	bool GetSSYBPack( int packNum, Pack &pack ) const;
-	bool GetVAUXPack( int packNum, Pack &pack ) const;
-	bool GetAAUXPack( int packNum, Pack &pack ) const;
-	bool GetTimeCode( TimeCode &timeCode ) const;
-	bool GetRecordingDate( struct tm &recDate ) const;
-	string GetRecordingDate( void ) const;
-	bool GetAudioInfo( AudioInfo &info ) const;
-	bool GetVideoInfo( VideoInfo &info ) const;
-	int GetFrameSize( void ) const;
-	float GetFrameRate() const;
-	bool IsPAL( void ) const;
-	bool IsNewRecording( void ) const;
-	bool IsNormalSpeed() const;
-	bool IsComplete( void ) const;
-	int ExtractAudio( void *sound ) const;
-	void ExtractHeader( void );
-
-#ifdef HAVE_LIBDV
-
-	void SetPreferredQuality( );
-	int ExtractAudio( int16_t **channels ) const;
-	int ExtractRGB( void *rgb );
-	int ExtractPreviewRGB( void *rgb );
-	int ExtractYUV( void *yuv );
-	int ExtractPreviewYUV( void *yuv );
-	bool IsWide( void ) const;
-	int GetWidth();
-	int GetHeight();
-	void SetRecordingDate( time_t *datetime, int frame );
-	void SetTimeCode( int frame );
-#endif
-
-	void Deinterlace( void *image, int bpp );
-
-private:
-#ifndef HAVE_LIBDV
-	/// flag for initializing the lookup maps once at startup
-	static bool maps_initialized;
-	/// lookup tables for collecting the shuffled audio data
-	static int palmap_ch1 2000 ;
-	static int palmap_ch2 2000 ;
-	static int palmap_2ch1 2000 ;
-	static int palmap_2ch2 2000 ;
-	static int ntscmap_ch1 2000 ;
-	static int ntscmap_ch2 2000 ;
-	static int ntscmap_2ch1 2000 ;
-	static int ntscmap_2ch2 2000 ;
-	static short compmap 4096 ;
-#endif
-};
-
-}
-
-#endif
-#endif

gpac-2.2.1.tar.gz/extra_lib/include/avcap/linux/ieee1394io.h Deleted

@@ -1,188 +0,0 @@
-/*
-* ieee1394io.cc -- asynchronously grabbing DV data
-* Copyright (C) 2000 Arne Schirmacher <arne@schirmacher.de>
-*
-* This program is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation; either version 2 of the License, or
-* (at your option) any later version.
-*
-* This program 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 General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software Foundation,
-* Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-*/
-
-#ifdef HAS_AVC_SUPPORT
-
-#ifndef _IEEE1394IO_H
-#define _IEEE1394IO_H 1
-
-#include <libraw1394/raw1394.h>
-#include <libraw1394/csr.h>
-#include <libiec61883/iec61883.h>
-
-
-#include <string>
-using std::string;
-#include <deque>
-using std::deque;
-
-namespace avcap
-{
-	
-class Frame;
-
-class IEEE1394Reader
-{
-protected:
-	/// the number of frames that had to be thrown away because
-	/// our inFrames queue did not contain available frames
-	int droppedFrames;
-
-	/// the number of frames that are tainted because they are incomplete -
-	/// a packet was dropped
-	int incompleteFrames;
-
-	/// a pointer to the frame which is currently been transmitted
-	Frame	*currentFrame;
-
-	/// a list of empty frames
-	deque < Frame* > inFrames;
-
-	/// a list of already received frames
-	deque < Frame* > outFrames;
-
-public:
-
-	IEEE1394Reader( int channel = 63, int frames = 5 );
-	virtual ~IEEE1394Reader();
-
-	// Mutex protected public methods
-	virtual bool StartThread( void ) = 0;
-	virtual void StopThread( void ) = 0;
-	Frame* GetFrame( void );
-	
-	void DoneWithFrame( Frame* );
-	int GetDroppedFrames( void );
-	int GetIncompleteFrames( void );
-	int GetOutQueueSize( void )
-	{
-		return outFrames.size();
-	}
-	int GetInQueueSize( void )
-	{
-		return inFrames.size();
-	}
-
-	// These two public methods are not mutex protected
-	virtual bool Open( void ) = 0;
-	virtual void Close( void ) = 0;
-
-	bool WaitForAction( int seconds = 0 );
-	virtual void TriggerAction( );
-
-	virtual bool StartReceive( void ) = 0;
-	virtual void StopReceive( void ) = 0;
-
-protected:
-	/// the iso channel we listen to (typically == 63)
-	int	channel;
-
-	/// contains information about our thread after calling StartThread
-	pthread_t thread;
-
-	/// this mutex protects capture related variables that could possibly
-	/// accessed from two threads at the same time
-	pthread_mutex_t mutex;
-
-	// This condition and mutex are used to indicate when new frames are
-	// received
-	pthread_mutex_t condition_mutex;
-	pthread_cond_t condition;
-
-	/// A state variable for starting and stopping thread
-	bool isRunning;
-
-	void Flush( void );
-};
-
-
-typedef void (*BusResetHandler)( void* );
-typedef void* BusResetHandlerData;
-
-class CaptureHandler;
-
-class iec61883Reader: public IEEE1394Reader
-{
-private:
-
-	/// the interface card to use (typically == 0)
-	int	m_port;
-
-	/// the handle to libraw1394
-	raw1394handle_t m_handle;
-
-	/// the handle to libiec61883
-	iec61883_dv_fb_t m_iec61883dv;
-
-	BusResetHandler m_resetHandler;
-	const void* m_resetHandlerData;
-
-	CaptureHandler* m_captureHandler;
-	
-public:
-	iec61883Reader( int port = 0, int channel = 63, int buffers = 5, 
-		BusResetHandler = 0, BusResetHandlerData = 0 );
-	~iec61883Reader();
-
-	bool Open( void );
-	void Close( void );
-	bool StartReceive( void );
-	void StopReceive( void );
-	bool StartThread( void );
-	void StopThread( void );
-	int Handler( int length, int complete, unsigned char *data );
-	void *Thread();
-	void ResetHandler( void );
-		
-
-private:
-	static int ResetHandlerProxy( raw1394handle_t handle, unsigned int generation );
-	static int HandlerProxy( unsigned char *data, int length, int complete, 
-		void *callback_data );
-	static void* ThreadProxy( void *arg );
-};
-
-
-class iec61883Connection
-{
-private:
-	raw1394handle_t m_handle;
-	nodeid_t m_node;
-	int m_channel;
-	int m_bandwidth;
-	int m_outputPort;
-	int m_inputPort;
-
-public:
-
-	iec61883Connection( int port, int node );
-	~iec61883Connection();
-
-	static void CheckConsistency( int port, int node );
-	int GetChannel( void ) const
-	{
-		return m_channel;
-	}
-	int Reconnect( void );
-};
-
-}
-
-#endif
-#endif

gpac-2.2.1.tar.gz/extra_lib/include/avcap/linux/ivtv.h Deleted

@@ -1,397 +0,0 @@
-/*
-    Public ivtv API header
-    Copyright (C) 2003-2004  Kevin Thayer <nufan_wfk at yahoo.com>
-
-    VBI portions:
-    Copyright (C) 2004  Hans Verkuil <hverkuil@xs4all.nl>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program 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 General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#ifndef LINUX_IVTV_H
-#define LINUX_IVTV_H
-
-// 00 = Program stream
-// 01 = Transport stream
-// 02 = MPEG1 stream
-// 10 or 0a = DVD stream
-// 11 or 0b = VCD stream
-// 12 or 0c = SVCD stream
-// 13 or 0d = DVD-Special 1
-// 14 or 0e = DVD-Special 2
-
-/* Stream types */
-#define IVTV_STREAM_PS		0
-#define IVTV_STREAM_TS		1
-#define IVTV_STREAM_MPEG1	2
-#define IVTV_STREAM_PES_AV	3
-#define IVTV_STREAM_PES_V	5
-#define IVTV_STREAM_PES_A	7
-#define IVTV_STREAM_DVD		10
-#define IVTV_STREAM_VCD		11
-#define IVTV_STREAM_SVCD	12
-#define IVTV_STREAM_DVD_S1	13
-#define IVTV_STREAM_DVD_S2	14
-
-#define IVTV_SLICED_TELETEXT_B 	(1 << 0)
-#define IVTV_SLICED_CAPTION_625	(1 << 1)
-#define IVTV_SLICED_CAPTION_525	(1 << 2)
-#define IVTV_SLICED_WSS_625	(1 << 3)
-#define IVTV_SLICED_VPS		(1 << 4)
-
-struct ivtv_sliced_vbi_format {
-	unsigned long service_set;	/* one or more of the IVTV_SLICED_ defines */
-	unsigned long packet_size; 	/* the size in bytes of the ivtv_sliced_data packet */
-	unsigned long io_size;		/* maximum number of bytes passed by one read() call */
-	unsigned long reserved;
-};
-
-/* This structure is the same as the proposed v4l2_sliced_data structure */
-/* id is one of the VBI_SLICED_ flags. */
-struct ivtv_sliced_data {
-	unsigned long id;
-	unsigned long line;
-	unsigned char data;
-};
-
-/* The four bit VBI data type found in the embedded VBI data of an
-   MPEG stream has one of the following values: */
-#define VBI_TYPE_TELETEXT 	0x1 	// Teletext (uses lines 6-22 for PAL, 10-21 for NTSC)
-#define VBI_TYPE_CC 		0x4 	// Closed Captions (line 21 NTSC, line 22 PAL)
-#define VBI_TYPE_WSS 		0x5 	// Wide Screen Signal (line 20 NTSC, line 23 PAL)
-#define VBI_TYPE_VPS 		0x7 	// Video Programming System (PAL) (line 16)
-
-/* These data types are not (yet?) used but are already reserved
-   for future use. */
-#ifdef IVTV_INTERNAL
-#define VBI_TYPE_NABST 		0x2 	// NABST (NTSC)
-#define VBI_TYPE_MOJI 		0x3 	// MOJI (NTSC)
-#define VBI_TYPE_VITC 		0x6 	// Vertical Interval Time Code
-#define VBI_TYPE_GEMSTAR2X 	0x7 	// Gemstar TV Guide (NTSC)
-#define VBI_TYPE_GEMSTAR1X 	0x8 	// Gemstar TV Guide (NTSC)
-#endif
-
-/* device ioctls should use the range 29-199 */
-#define IVTV_IOC_START_DECODE      _IOW ('@', 29, struct ivtv_cfg_start_decode)
-#define IVTV_IOC_STOP_DECODE       _IOW ('@', 30, struct ivtv_cfg_stop_decode)
-#define IVTV_IOC_G_SPEED           _IOR ('@', 31, struct ivtv_speed)
-#define IVTV_IOC_S_SPEED           _IOW ('@', 32, struct ivtv_speed)
-#define IVTV_IOC_DEC_STEP          _IOW ('@', 33, int)
-#define IVTV_IOC_DEC_FLUSH         _IOW ('@', 34, int)
-#define IVTV_IOC_S_VBI_MODE    	   _IOWR('@', 35, struct ivtv_sliced_vbi_format)
-#define IVTV_IOC_G_VBI_MODE    	   _IOR ('@', 36, struct ivtv_sliced_vbi_format)
-#define IVTV_IOC_PLAY     	   _IO  ('@', 37)
-#define IVTV_IOC_PAUSE    	   _IO  ('@', 38)
-#define IVTV_IOC_FRAMESYNC	   _IOR ('@', 39, struct ivtv_ioctl_framesync)
-#define IVTV_IOC_GET_TIMING	   _IOR ('@', 40, struct ivtv_ioctl_framesync)
-#define IVTV_IOC_S_SLOW_FAST       _IOW ('@', 41, struct ivtv_slow_fast)
-#define IVTV_IOC_S_START_DECODE    _IOW ('@', 42, struct ivtv_cfg_start_decode)
-#define IVTV_IOC_S_STOP_DECODE     _IOW ('@', 43, struct ivtv_cfg_stop_decode)
-#define IVTV_IOC_GET_FB            _IOR ('@', 44, int)
-#define IVTV_IOC_G_CODEC           _IOR ('@', 48, struct ivtv_ioctl_codec)
-#define IVTV_IOC_S_CODEC           _IOW ('@', 49, struct ivtv_ioctl_codec)
-#define IVTV_IOC_S_GOP_END         _IOWR('@', 50, int)
-#define IVTV_IOC_S_VBI_PASSTHROUGH _IOW ('@', 51, int)
-#define IVTV_IOC_G_VBI_PASSTHROUGH _IOR ('@', 52, int)
-#define IVTV_IOC_PASSTHROUGH       _IOW ('@', 53, int)
-#define IVTV_IOC_S_VBI_EMBED       _IOW ('@', 54, int)
-#define IVTV_IOC_G_VBI_EMBED       _IOR ('@', 55, int)
-#define IVTV_IOC_PAUSE_ENCODE      _IO  ('@', 56)
-#define IVTV_IOC_RESUME_ENCODE     _IO  ('@', 57)
-
-#define PACK_ME __attribute__((packed))
-// Note: You only append to this structure, you never reorder the members,
-// you never play tricks with its alignment, you never change the size of
-// anything.
-#define IVTV_DRIVER_INFO_MAX_COMMENT_LENGTH 100
-struct ivtv_driver_info {
-	uint32_t size;    // size of this structure
-	uint32_t version; // version bits 31-16 = major, 15-8 = minor,
-					  // 7-0 = patchlevel
-	char commentIVTV_DRIVER_INFO_MAX_COMMENT_LENGTH;
-} PACK_ME;
-
-#define IVTV_DRIVER_INFO_V1_SIZE 108
-
-#define IVTV_IOC_G_DRIVER_INFO _IOWR('@', 100, struct ivtv_driver_info *)
-
-// Version info
-// Note: never use the _INTERNAL versions of these macros
-
-// Internal version macros, don't use these
-#define IVTV_VERSION_NUMBER_INTERNAL(name) name##_version_int
-#define IVTV_VERSION_STRING_INTERNAL(name) name##_version_string
-#define IVTV_VERSION_COMMENT_INTERNAL(name) name##_comment_string
-
-#define IVTV_VERSION_EXTERN_NUMBER_INTERNAL(name) \
-	extern uint32_t IVTV_VERSION_NUMBER_INTERNAL(name)
-#define IVTV_VERSION_EXTERN_STRING_INTERNAL(name) \
-	extern const char * const IVTV_VERSION_STRING_INTERNAL(name)
-#define IVTV_VERSION_EXTERN_COMMENT_INTERNAL(name) \
-	extern const char * const IVTV_VERSION_COMMENT_INTERNAL(name)
-
-#define IVTV_VERSION_MAJOR_INTERNAL(name) \
-	(0xFF & (IVTV_VERSION_NUMBER_INTERNAL(name) >> 16))
-#define IVTV_VERSION_MINOR_INTERNAL(name) \
-	(0xFF & (IVTV_VERSION_NUMBER_INTERNAL(name) >> 8))
-#define IVTV_VERSION_PATCHLEVEL_INTERNAL(name) \
-	(0xFF & (IVTV_VERSION_NUMBER_INTERNAL(name)))
-
-// External version macros
-#define IVTV_VERSION_NUMBER(name) IVTV_VERSION_NUMBER_INTERNAL(name)
-#define IVTV_VERSION_STRING(name) IVTV_VERSION_STRING_INTERNAL(name)
-#define IVTV_VERSION_COMMENT(name) IVTV_VERSION_COMMENT_INTERNAL(name)
-#define IVTV_VERSION_EXTERN_NUMBER(name) \
-	IVTV_VERSION_EXTERN_NUMBER_INTERNAL(name)
-#define IVTV_VERSION_EXTERN_STRING(name) \
-	IVTV_VERSION_EXTERN_STRING_INTERNAL(name)
-#define IVTV_VERSION_EXTERN_COMMENT(name) \
-	IVTV_VERSION_EXTERN_COMMENT_INTERNAL(name)
-
-#define IVTV_VERSION_INFO_NAME ivtv_rev
-
-IVTV_VERSION_EXTERN_NUMBER(IVTV_VERSION_INFO_NAME);
-IVTV_VERSION_EXTERN_STRING(IVTV_VERSION_INFO_NAME);
-IVTV_VERSION_EXTERN_COMMENT(IVTV_VERSION_INFO_NAME);
-
-/* Custom v4l controls */
-#ifndef V4L2_CID_PRIVATE_BASE
-#define V4L2_CID_PRIVATE_BASE			0x08000000
-#endif
-
-#define V4L2_CID_IVTV_FREQ      	(V4L2_CID_PRIVATE_BASE)
-#define V4L2_CID_IVTV_ENC       	(V4L2_CID_PRIVATE_BASE + 1)
-#define V4L2_CID_IVTV_BITRATE   	(V4L2_CID_PRIVATE_BASE + 2)
-#define V4L2_CID_IVTV_MONO      	(V4L2_CID_PRIVATE_BASE + 3)
-#define V4L2_CID_IVTV_JOINT     	(V4L2_CID_PRIVATE_BASE + 4)
-#define V4L2_CID_IVTV_EMPHASIS  	(V4L2_CID_PRIVATE_BASE + 5)
-#define V4L2_CID_IVTV_CRC       	(V4L2_CID_PRIVATE_BASE + 6)
-#define V4L2_CID_IVTV_COPYRIGHT 	(V4L2_CID_PRIVATE_BASE + 7)
-#define V4L2_CID_IVTV_GEN       	(V4L2_CID_PRIVATE_BASE + 8)
-
-#define V4L2_CID_IVTV_DEC_SMOOTH_FF	(V4L2_CID_PRIVATE_BASE + 9)
-#define V4L2_CID_IVTV_DEC_FR_MASK	(V4L2_CID_PRIVATE_BASE + 10)
-#define V4L2_CID_IVTV_DEC_SP_MUTE	(V4L2_CID_PRIVATE_BASE + 11)
-#define V4L2_CID_IVTV_DEC_FR_FIELD	(V4L2_CID_PRIVATE_BASE + 12)
-#define V4L2_CID_IVTV_DEC_AUD_SKIP	(V4L2_CID_PRIVATE_BASE + 13)
-#define V4L2_CID_IVTV_DEC_NUM_BUFFERS	(V4L2_CID_PRIVATE_BASE + 14)
-#define V4L2_CID_IVTV_DEC_PREBUFFER	(V4L2_CID_PRIVATE_BASE + 15)
-
-struct ivtv_ioctl_framesync {
-	uint32_t frame;
-	uint64_t pts;
-	uint64_t scr;
-};
-
-struct ivtv_speed {
-	int scale;	/* 1-?? (50 for now) */
-	int smooth;	/* Smooth mode when in slow/fast mode */
-	int speed;	/* 0 = slow, 1 = fast */
-	int direction;	/* 0 = forward, 1 = reverse (not supportd */
-	int fr_mask;	/* 0 = I, 1 = I,P, 2 = I,P,B    2 = default!*/
-	int b_per_gop;	/* frames per GOP (reverse only) */
-	int aud_mute;	/* Mute audio while in slow/fast mode */
-	int fr_field;	/* 1 = show every field, 0 = show every frame */
-	int mute;	/* # of audio frames to mute on playback resume */
-};
-
-struct ivtv_slow_fast {
-	int speed; /* 0 = slow, 1 = fast */
-	int scale; /* 1-?? (50 for now) */
-};      
-
-struct ivtv_cfg_start_decode {
-	uint32_t     gop_offset;	/*Frames in GOP to skip before starting */
-	uint32_t     muted_audio_frames;/* #of audio frames to mute */
-};
-
-struct ivtv_cfg_stop_decode {
-	int		hide_last; /* 1 = show black after stop,
-				      0 = show last frame */
-	uint64_t	pts_stop; /* PTS to stop at */
-};
-
-
-/* For use with IVTV_IOC_G_CODEC and IVTV_IOC_S_CODEC */
-struct ivtv_ioctl_codec {
-        uint32_t aspect;
-        uint32_t audio_bitmask;
-        uint32_t bframes;
-        uint32_t bitrate_mode;
-        uint32_t bitrate;
-        uint32_t bitrate_peak;
-        uint32_t dnr_mode;
-        uint32_t dnr_spatial;
-        uint32_t dnr_temporal;
-        uint32_t dnr_type;
-        uint32_t framerate;	/* read only, ignored on write */
-        uint32_t framespergop;	/* read only, ignored on write */
-        uint32_t gop_closure;
-        uint32_t pulldown;
-        uint32_t stream_type;
-};
-
-
-/* Framebuffer external API */
-
-struct ivtvfb_ioctl_state_info {
-  unsigned long status;
-  unsigned long alpha;
-};
-
-struct ivtvfb_ioctl_blt_copy_args {
-  int x, y, width, height, source_offset, source_stride;
-};
-
-struct ivtvfb_ioctl_blt_fill_args {
-    int rasterop, alpha_mode, alpha_mask, width, height, x, y;
-    unsigned int destPixelMask, colour;
-
-};
-
-struct ivtvfb_ioctl_dma_host_to_ivtv_args {
-  void* source;
-  unsigned long dest_offset;
-  int count;
-};
-
-struct ivtvfb_ioctl_get_frame_buffer {
-  void* mem;
-  int   size;
-  int   sizex;
-  int   sizey;
-};
-
-struct ivtv_osd_coords {
-  unsigned long offset;
-  unsigned long max_offset;
-  int pixel_stride;
-  int lines;
-  int x;
-  int y;
-};
-
-struct rectangle {
-  int x0;
-  int y0;
-  int x1;
-  int y1;
-};
-
-/* Framebuffer ioctls should use the range 1 - 28 */
-#define IVTVFB_IOCTL_GET_STATE          _IOR('@', 1, struct ivtvfb_ioctl_state_info)
-#define IVTVFB_IOCTL_SET_STATE          _IOW('@', 2, struct ivtvfb_ioctl_state_info)
-#define IVTVFB_IOCTL_PREP_FRAME         _IOW('@', 3, struct ivtvfb_ioctl_dma_host_to_ivtv_args)
-#define IVTVFB_IOCTL_BLT_COPY           _IOW('@', 4, struct ivtvfb_ioctl_blt_copy_args)
-#define IVTVFB_IOCTL_GET_ACTIVE_BUFFER  _IOR('@', 5, struct ivtv_osd_coords)
-#define IVTVFB_IOCTL_SET_ACTIVE_BUFFER  _IOW('@', 6, struct ivtv_osd_coords)
-#define IVTVFB_IOCTL_GET_FRAME_BUFFER   _IOR('@', 7, struct ivtvfb_ioctl_get_frame_buffer)
-#define IVTVFB_IOCTL_BLT_FILL           _IOW('@', 8, struct ivtvfb_ioctl_blt_fill_args)
-#define IVTVFB_IOCTL_PREP_FRAME_BUF     _IOW('@', 9, struct ivtvfb_ioctl_dma_host_to_ivtv_args)
-#define IVTVFB_IOCTL_PREP_FRAME_YUV     _IOW('@', 10, struct ivtvfb_ioctl_dma_host_to_ivtv_args)
-
-#define IVTVFB_STATUS_ENABLED           (1 << 0)
-#define IVTVFB_STATUS_GLOBAL_ALPHA      (1 << 1)
-#define IVTVFB_STATUS_LOCAL_ALPHA       (1 << 2)
-#define IVTVFB_STATUS_FLICKER_REDUCTION (1 << 3)
-
-#ifdef IVTV_INTERNAL
-/* Do not use these structures and ioctls in code that you want to release.
-   Only to be used for testing and by the utilities ivtvctl, ivtvfbctl and fwapi. */
-
-#define IVTV_MBOX_MAX_DATA 16
-
-struct ivtv_ioctl_fwapi {
-	uint32_t cmd;
-	uint32_t result;
-	int32_t args;
-	uint32_t dataIVTV_MBOX_MAX_DATA;
-};
-
-struct ivtv_ioctl_event {
-        uint32_t type;
-        uint32_t mbox;
-	struct ivtv_ioctl_fwapi api;
-};
-
-struct ivtv_saa71xx_reg {
-	unsigned char reg;
-	unsigned char val;
-};
-
-struct ivtv_itvc_reg {
-	uint32_t reg;
-	uint32_t val;
-};
-
-struct ivtv_msp_matrix {
-	int input;
-	int output;
-};
-
-/* Debug flags */
-#define IVTV_DEBUG_ERR   (1 << 0)
-#define IVTV_DEBUG_INFO  (1 << 1)
-#define IVTV_DEBUG_API   (1 << 2)
-#define IVTV_DEBUG_DMA   (1 << 3)
-#define IVTV_DEBUG_IOCTL (1 << 4)
-#define IVTV_DEBUG_I2C   (1 << 5)
-#define IVTV_DEBUG_IRQ   (1 << 6)
-#define IVTV_DEBUG_DEC   (1 << 7)
-
-/* BLT RasterOps */
-#define IVTV_BLT_RASTER_ZERO		0
-#define IVTV_BLT_RASTER_NOTDEST_AND_NOTSRC	1
-#define IVTV_BLT_RASTER_NOTDEST_AND_SRC	2
-#define IVTV_BLT_RASTER_NOTDEST		3
-#define IVTV_BLT_RASTER_DEST_AND_NOTSRC	4
-#define IVTV_BLT_RASTER_NOTSRC		5
-#define IVTV_BLT_RASTER_DEST_XOR_SRC	6
-#define IVTV_BLT_RASTER_NOTDEST_OR_NOTSRC	7
-/* #define IVTV_BLT_RASTER_NOTDEST_AND_NOTSRC	8 */ /* Same as 1 */
-#define IVTV_BLT_RASTER_DEST_XNOR_SRC	9
-#define IVTV_BLT_RASTER_SRC			10
-#define IVTV_BLT_RASTER_NOTDEST_OR_SRC	11
-#define IVTV_BLT_RASTER_DEST		12
-#define IVTV_BLT_RASTER_DEST_OR_NOTSRC	13
-#define IVTV_BLT_RASTER_DEST_OR_SRC		14
-#define IVTV_BLT_RASTER_ONE			15
-
-/* BLT Alpha blending */
-
-#define IVTV_BLT_ALPHABLEND_SRC		0x01
-#define IVTV_BLT_ALPHABLEND_DEST	0x10
-#define IVTV_BLT_ALPHABLEND_DEST_X_SRC	0x11 /* dest x src +1 , = zero if both zero */
-
-
-/* Internal ioctls should use the range 200-255 */
-#define IVTV_IOC_S_DEBUG_LEVEL     _IOWR('@', 200, int)
-#define IVTV_IOC_G_DEBUG_LEVEL     _IOR ('@', 201, int)
-#define IVTV_IOC_RELOAD_FW         _IO  ('@', 202)
-#define IVTV_IOC_ZCOUNT            _IO  ('@', 203) 
-#define IVTV_IOC_FWAPI             _IOWR('@', 204, struct ivtv_ioctl_fwapi)
-#define IVTV_IOC_EVENT_SETUP       _IOWR('@', 205, struct ivtv_ioctl_event)
-#define IVTV_IOC_G_SAA7115_REG     _IOWR('@', 206, struct ivtv_saa71xx_reg)
-#define IVTV_IOC_S_SAA7115_REG     _IOW ('@', 207, struct ivtv_saa71xx_reg)
-#define IVTV_IOC_G_SAA7127_REG     _IOWR('@', 208, struct ivtv_saa71xx_reg)
-#define IVTV_IOC_S_SAA7127_REG     _IOW ('@', 209, struct ivtv_saa71xx_reg)
-#define IVTV_IOC_S_MSP_MATRIX      _IOW ('@', 210, struct ivtv_msp_matrix)
-#define IVTV_IOC_G_ITVC_REG        _IOWR('@', 211, struct ivtv_itvc_reg)
-#define IVTV_IOC_S_ITVC_REG        _IOW ('@', 212, struct ivtv_itvc_reg)
-
-#endif
-
-#endif
-

gpac-2.2.1.tar.gz/extra_lib/include/avcap/linux/pwc-ioctl.h Deleted

@@ -1,329 +0,0 @@
-#ifndef PWC_IOCTL_H
-#define PWC_IOCTL_H
-
-/* (C) 2001-2004 Nemosoft Unv.
-   (C) 2004-2006 Luc Saillard (luc@saillard.org)
-
-   NOTE: this version of pwc is an unofficial (modified) release of pwc & pcwx
-   driver and thus may have bugs that are not present in the original version.
-   Please send bug reports and support requests to <luc@saillard.org>.
-   The decompression routines have been implemented by reverse-engineering the
-   Nemosoft binary pwcx module. Caveat emptor.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-
-   This program 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 General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*/
-
-/* This is pwc-ioctl.h belonging to PWC 10.0.10
-   It contains structures and defines to communicate from user space
-   directly to the driver.
- */
-
-/*
-   Changes
-   2001/08/03  Alvarado   Added ioctl constants to access methods for
-                          changing white balance and red/blue gains
-   2002/12/15  G. H. Fernandez-Toribio   VIDIOCGREALSIZE
-   2003/12/13  Nemosft Unv. Some modifications to make interfacing to
-               PWCX easier
-   2006/01/01  Luc Saillard Add raw format definition
- */
-
-/* These are private ioctl() commands, specific for the Philips webcams.
-   They contain functions not found in other webcams, and settings not
-   specified in the Video4Linux API.
-
-   The #define names are built up like follows:
-   VIDIOC		VIDeo IOCtl prefix
-         PWC		Philps WebCam
-            G           optional: Get
-            S           optional: Set
-             ... 	the function
- */
-
-#include <linux/types.h>
-#include <linux/version.h>
-
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 10)
-/* Compatibility for older kernel */
-typedef __u16 __le16;
-#endif
-
- /* Enumeration of image sizes */
-#define PSZ_SQCIF	0x00
-#define PSZ_QSIF	0x01
-#define PSZ_QCIF	0x02
-#define PSZ_SIF		0x03
-#define PSZ_CIF		0x04
-#define PSZ_VGA		0x05
-#define PSZ_MAX		6
-
-
-/* The frame rate is encoded in the video_window.flags parameter using
-   the upper 16 bits, since some flags are defined nowadays. The following
-   defines provide a mask and shift to filter out this value.
-   This value can also be passing using the private flag when using v4l2 and
-   VIDIOC_S_FMT ioctl.
-
-   In 'Snapshot' mode the camera freezes its automatic exposure and colour
-   balance controls.
- */
-#define PWC_FPS_SHIFT		16
-#define PWC_FPS_MASK		0x00FF0000
-#define PWC_FPS_FRMASK		0x003F0000
-#define PWC_FPS_SNAPSHOT	0x00400000
-#define PWC_QLT_MASK		0x03000000
-#define PWC_QLT_SHIFT		24
-
-
-/* structure for transferring x & y coordinates */
-struct pwc_coord
-{
-	int x, y;		/* guess what */
-	int size;		/* size, or offset */
-};
-
-
-/* Used with VIDIOCPWCPROBE */
-struct pwc_probe
-{
-	char name32;
-	int type;
-};
-
-struct pwc_serial
-{
-	char serial30;	/* String with serial number. Contains terminating 0 */
-};
-	
-/* pwc_whitebalance.mode values */
-#define PWC_WB_INDOOR		0
-#define PWC_WB_OUTDOOR		1
-#define PWC_WB_FL		2
-#define PWC_WB_MANUAL		3
-#define PWC_WB_AUTO		4
-
-/* Used with VIDIOCPWCSGAWB (Auto White Balance). 
-   Set mode to one of the PWC_WB_* values above.
-   *red and *blue are the respective gains of these colour components inside 
-   the camera; range 0..65535
-   When 'mode' == PWC_WB_MANUAL, 'manual_red' and 'manual_blue' are set or read; 
-   otherwise undefined.
-   'read_red' and 'read_blue' are read-only.
-*/   
-struct pwc_whitebalance
-{
-	int mode;
-	int manual_red, manual_blue;	/* R/W */
-	int read_red, read_blue;	/* R/O */
-};
-
-/* 
-   'control_speed' and 'control_delay' are used in automatic whitebalance mode,
-   and tell the camera how fast it should react to changes in lighting, and 
-   with how much delay. Valid values are 0..65535.
-*/
-struct pwc_wb_speed
-{
-	int control_speed;
-	int control_delay;
-
-};
-
-/* Used with VIDIOCPWCSGLED */
-struct pwc_leds
-{
-	int led_on;			/* Led on-time; range = 0..25000 */
-	int led_off;			/* Led off-time; range = 0..25000  */
-};
-
-/* Image size (used with GREALSIZE) */
-struct pwc_imagesize
-{
-	int width;
-	int height;
-};
-
-/* Defines and structures for Motorized Pan & Tilt */
-#define PWC_MPT_PAN		0x01
-#define PWC_MPT_TILT		0x02
-#define PWC_MPT_TIMEOUT		0x04 /* for status */
-
-/* Set angles; when absolute != 0, the angle is absolute and the 
-   driver calculates the relative offset for you. This can only
-   be used with VIDIOCPWCSANGLE; VIDIOCPWCGANGLE always returns
-   absolute angles.
- */   
-struct pwc_mpt_angles
-{
-	int absolute;		/* write-only */
-	int pan;		/* degrees * 100 */
-	int tilt;		/* degress * 100 */
-};
-
-/* Range of angles of the camera, both horizontally and vertically.
- */
-struct pwc_mpt_range
-{
-	int pan_min, pan_max;		/* degrees * 100 */
-	int tilt_min, tilt_max;
-};
-
-struct pwc_mpt_status
-{
-	int status;
-	int time_pan;
-	int time_tilt;
-};
-
-
-/* This is used for out-of-kernel decompression. With it, you can get
-   all the necessary information to initialize and use the decompressor
-   routines in standalone applications.
- */   
-struct pwc_video_command
-{
-	int type;		/* camera type (645, 675, 730, etc.) */
-	int release;		/* release number */
-
-        int size;		/* one of PSZ_* */
-        int alternate;
-	int command_len;	/* length of USB video command */
-	unsigned char command_buf13;	/* Actual USB video command */
-	int bandlength;		/* >0 = compressed */
-	int frame_size;		/* Size of one (un)compressed frame */
-};
-
-/* Flags for PWCX subroutines. Not all modules honour all flags. */
-#define PWCX_FLAG_PLANAR	0x0001
-#define PWCX_FLAG_BAYER		0x0008
-
-
-/* IOCTL definitions */
-
- /* Restore user settings */
-#define VIDIOCPWCRUSER		_IO('v', 192)
- /* Save user settings */
-#define VIDIOCPWCSUSER		_IO('v', 193)
- /* Restore factory settings */
-#define VIDIOCPWCFACTORY	_IO('v', 194)
-
- /* You can manipulate the compression factor. A compression preference of 0
-    means use uncompressed modes when available; 1 is low compression, 2 is
-    medium and 3 is high compression preferred. Of course, the higher the
-    compression, the lower the bandwidth used but more chance of artefacts
-    in the image. The driver automatically chooses a higher compression when
-    the preferred mode is not available.
-  */
- /* Set preferred compression quality (0 = uncompressed, 3 = highest compression) */
-#define VIDIOCPWCSCQUAL		_IOW('v', 195, int)
- /* Get preferred compression quality */
-#define VIDIOCPWCGCQUAL		_IOR('v', 195, int)
-
-
-/* Retrieve serial number of camera */
-#define VIDIOCPWCGSERIAL	_IOR('v', 198, struct pwc_serial)
-
- /* This is a probe function; since so many devices are supported, it
-    becomes difficult to include all the names in programs that want to
-    check for the enhanced Philips stuff. So in stead, try this PROBE;
-    it returns a structure with the original name, and the corresponding
-    Philips type.
-    To use, fill the structure with zeroes, call PROBE and if that succeeds,
-    compare the name with that returned from VIDIOCGCAP; they should be the
-    same. If so, you can be assured it is a Philips (OEM) cam and the type
-    is valid.
- */
-#define VIDIOCPWCPROBE		_IOR('v', 199, struct pwc_probe)
-
- /* Set AGC (Automatic Gain Control); int < 0 = auto, 0..65535 = fixed */
-#define VIDIOCPWCSAGC		_IOW('v', 200, int)
- /* Get AGC; int < 0 = auto; >= 0 = fixed, range 0..65535 */
-#define VIDIOCPWCGAGC		_IOR('v', 200, int)
- /* Set shutter speed; int < 0 = auto; >= 0 = fixed, range 0..65535 */
-#define VIDIOCPWCSSHUTTER	_IOW('v', 201, int)
-
- /* Color compensation (Auto White Balance) */
-#define VIDIOCPWCSAWB           _IOW('v', 202, struct pwc_whitebalance)
-#define VIDIOCPWCGAWB           _IOR('v', 202, struct pwc_whitebalance)
-
- /* Auto WB speed */
-#define VIDIOCPWCSAWBSPEED	_IOW('v', 203, struct pwc_wb_speed)
-#define VIDIOCPWCGAWBSPEED	_IOR('v', 203, struct pwc_wb_speed)
-
- /* LEDs on/off/blink; int range 0..65535 */
-#define VIDIOCPWCSLED           _IOW('v', 205, struct pwc_leds)
-#define VIDIOCPWCGLED           _IOR('v', 205, struct pwc_leds)
-
-  /* Contour (sharpness); int < 0 = auto, 0..65536 = fixed */
-#define VIDIOCPWCSCONTOUR	_IOW('v', 206, int)
-#define VIDIOCPWCGCONTOUR	_IOR('v', 206, int)
-
-  /* Backlight compensation; 0 = off, otherwise on */
-#define VIDIOCPWCSBACKLIGHT	_IOW('v', 207, int)
-#define VIDIOCPWCGBACKLIGHT	_IOR('v', 207, int)
-
-  /* Flickerless mode; = 0 off, otherwise on */
-#define VIDIOCPWCSFLICKER	_IOW('v', 208, int)
-#define VIDIOCPWCGFLICKER	_IOR('v', 208, int)  
-
-  /* Dynamic noise reduction; 0 off, 3 = high noise reduction */
-#define VIDIOCPWCSDYNNOISE	_IOW('v', 209, int)
-#define VIDIOCPWCGDYNNOISE	_IOR('v', 209, int)
-
- /* Real image size as used by the camera; tells you whether or not there's a gray border around the image */
-#define VIDIOCPWCGREALSIZE	_IOR('v', 210, struct pwc_imagesize)
-
- /* Motorized pan & tilt functions */ 
-#define VIDIOCPWCMPTRESET	_IOW('v', 211, int)
-#define VIDIOCPWCMPTGRANGE	_IOR('v', 211, struct pwc_mpt_range)
-#define VIDIOCPWCMPTSANGLE	_IOW('v', 212, struct pwc_mpt_angles)
-#define VIDIOCPWCMPTGANGLE	_IOR('v', 212, struct pwc_mpt_angles)
-#define VIDIOCPWCMPTSTATUS	_IOR('v', 213, struct pwc_mpt_status)
-
- /* Get the USB set-video command; needed for initializing libpwcx */
-#define VIDIOCPWCGVIDCMD	_IOR('v', 215, struct pwc_video_command)
-struct pwc_table_init_buffer {
-   int len;
-   char *buffer;
-
-};
-#define VIDIOCPWCGVIDTABLE	_IOR('v', 216, struct pwc_table_init_buffer)
-
-/*
- * This is private command used when communicating with v4l2.
- * In the future all private ioctl will be remove/replace to 
- * use interface offer by v4l2.
- */
-
-#define V4L2_CID_PRIVATE_SAVE_USER       (V4L2_CID_PRIVATE_BASE + 0)
-#define V4L2_CID_PRIVATE_RESTORE_USER    (V4L2_CID_PRIVATE_BASE + 1)
-#define V4L2_CID_PRIVATE_RESTORE_FACTORY (V4L2_CID_PRIVATE_BASE + 2)
-#define V4L2_CID_PRIVATE_COLOUR_MODE     (V4L2_CID_PRIVATE_BASE + 3)
-#define V4L2_CID_PRIVATE_AUTOCONTOUR     (V4L2_CID_PRIVATE_BASE + 4)
-#define V4L2_CID_PRIVATE_CONTOUR         (V4L2_CID_PRIVATE_BASE + 5)
-#define V4L2_CID_PRIVATE_BACKLIGHT       (V4L2_CID_PRIVATE_BASE + 6)
-#define V4L2_CID_PRIVATE_FLICKERLESS     (V4L2_CID_PRIVATE_BASE + 7)
-#define V4L2_CID_PRIVATE_NOISE_REDUCTION (V4L2_CID_PRIVATE_BASE + 8)
-
-struct pwc_raw_frame {
-   __le16 type;		/* type of the webcam */
-   __le16 vbandlength;	/* Size of 4lines compressed (used by the decompressor) */
-   __u8   cmd4;	/* the four byte of the command (in case of nala,
-			   only the first 3 bytes is filled) */
-   __u8   rawframe0;	/* frame_size = H/4*vbandlength */
-} __attribute__ ((packed));
-
-
-#endif

gpac-2.2.1.tar.gz/extra_lib/include/avcap/linux/raw1394util.h Deleted

gpac-2.2.1.tar.gz/extra_lib/include/avcap/linux/uvc_compat.h Deleted

@@ -1,129 +0,0 @@
-#ifndef _UVC_COMPAT_H
-#define _UVC_COMPAT_H
-
-#include <linux/version.h>
-
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18)
-/*
- * Extended control API
- */
-struct v4l2_ext_control
-{
-	__u32 id;
-	__u32 reserved22;
-	union {
-		__s32 value;
-		__s64 value64;
-		void *reserved;
-	};
-} __attribute__ ((packed));
-
-struct v4l2_ext_controls
-{
-	__u32 ctrl_class;
-	__u32 count;
-	__u32 error_idx;
-	__u32 reserved2;
-	struct v4l2_ext_control *controls;
-};
-
-/* Values for ctrl_class field */
-#define V4L2_CTRL_CLASS_USER		0x00980000	/* Old-style 'user' controls */
-#define V4L2_CTRL_CLASS_MPEG		0x00990000	/* MPEG-compression controls */
-
-#define V4L2_CTRL_ID_MASK		(0x0fffffff)
-#define V4L2_CTRL_ID2CLASS(id)		((id) & 0x0fff0000UL)
-#define V4L2_CTRL_DRIVER_PRIV(id)	(((id) & 0xffff) >= 0x1000)
-
-/* User-class control IDs defined by V4L2 */
-#undef	V4L2_CID_BASE
-#define V4L2_CID_BASE			(V4L2_CTRL_CLASS_USER | 0x900)
-#define V4L2_CID_USER_BASE		V4L2_CID_BASE
-#define V4L2_CID_USER_CLASS		(V4L2_CTRL_CLASS_USER | 1)
-	
-#define VIDIOC_G_EXT_CTRLS		_IOWR ('V', 71, struct v4l2_ext_controls)
-#define VIDIOC_S_EXT_CTRLS		_IOWR ('V', 72, struct v4l2_ext_controls)
-#define VIDIOC_TRY_EXT_CTRLS		_IOWR ('V', 73, struct v4l2_ext_controls)
-
-#endif
-
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)
-/*
- * Frame size and frame rate enumeration
- *
- * Included in Linux 2.6.19
- */
-enum v4l2_frmsizetypes
-{
-	V4L2_FRMSIZE_TYPE_DISCRETE	= 1,
-	V4L2_FRMSIZE_TYPE_CONTINUOUS	= 2,
-	V4L2_FRMSIZE_TYPE_STEPWISE	= 3,
-};
-
-struct v4l2_frmsize_discrete
-{
-	__u32			width;		/* Frame width pixel */
-	__u32			height;		/* Frame height pixel */
-};
-
-struct v4l2_frmsize_stepwise
-{
-	__u32			min_width;	/* Minimum frame width pixel */
-	__u32			max_width;	/* Maximum frame width pixel */
-	__u32			step_width;	/* Frame width step size pixel */
-	__u32			min_height;	/* Minimum frame height pixel */
-	__u32			max_height;	/* Maximum frame height pixel */
-	__u32			step_height;	/* Frame height step size pixel */
-};
-
-struct v4l2_frmsizeenum
-{
-	__u32			index;		/* Frame size number */
-	__u32			pixel_format;	/* Pixel format */
-	__u32			type;		/* Frame size type the device supports. */
-
-        union {					/* Frame size */
-		struct v4l2_frmsize_discrete	discrete;
-		struct v4l2_frmsize_stepwise	stepwise;
-	};
-
-	__u32   reserved2;			/* Reserved space for future use */
-};
-
-enum v4l2_frmivaltypes
-{
-	V4L2_FRMIVAL_TYPE_DISCRETE	= 1,
-	V4L2_FRMIVAL_TYPE_CONTINUOUS	= 2,
-	V4L2_FRMIVAL_TYPE_STEPWISE	= 3,
-};
-
-struct v4l2_frmival_stepwise
-{
-	struct v4l2_fract	min;		/* Minimum frame interval s */
-	struct v4l2_fract	max;		/* Maximum frame interval s */
-	struct v4l2_fract	step;		/* Frame interval step size s */
-};
-
-struct v4l2_frmivalenum
-{
-	__u32			index;		/* Frame format index */
-	__u32			pixel_format;	/* Pixel format */
-	__u32			width;		/* Frame width */
-	__u32			height;		/* Frame height */
-	__u32			type;		/* Frame interval type the device supports. */
-
-	union {					/* Frame interval */
-		struct v4l2_fract		discrete;
-		struct v4l2_frmival_stepwise	stepwise;
-	};
-
-	__u32	reserved2;			/* Reserved space for future use */
-};
-
-#define VIDIOC_ENUM_FRAMESIZES		_IOWR ('V', 74, struct v4l2_frmsizeenum)
-#define VIDIOC_ENUM_FRAMEINTERVALS	_IOWR ('V', 75, struct v4l2_frmivalenum)
-#endif
-
-
-#endif /* _UVC_COMPAT_H */
-

gpac-2.2.1.tar.gz/extra_lib/include/avcap/log.h Deleted

@@ -1,44 +0,0 @@
-/*
- * (c) 2005, 2008 Nico Pranke <Nico.Pranke@googlemail.com>, Robin Luedtke <RobinLu@gmx.de> 
- *
- * This file is part of avcap.
- *
- * avcap is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * avcap 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with avcap.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/* avcap is free for non-commercial use.
- * To use it in commercial endeavors, please contact Nico Pranke <Nico.Pranke@googlemail.com>
- */
-
-#ifndef AVCAP_LOG_H
-#define AVCAP_LOG_H
-
-#include <sstream>
-#include <iostream>
-
-static inline void logDebug(const std::string& msg)
-{
-#ifdef DEBUG
-	std::cerr<<msg<<std::endl;
-#endif 
-}
-
-static inline void logDebug(const std::string& msg, int err)
-{
-#ifdef DEBUG
-	std::cerr<<msg<<" "<<err<<std::endl;
-#endif 
-}
-
-#endif

gpac-2.2.1.tar.gz/extra_lib/include/avcap/osx Deleted

gpac-2.2.1.tar.gz/extra_lib/include/avcap/osx/QT_ConnectorManager.h Deleted

@@ -1,53 +0,0 @@
-/*
- * (c) 2005, 2008 Nico Pranke <Nico.Pranke@googlemail.com>, Robin Luedtke <RobinLu@gmx.de> 
- *
- * This file is part of avcap.
- *
- * avcap is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * avcap 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with avcap.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/* avcap is free for non-commercial use.
- * To use it in commercial endeavors, please contact Nico Pranke <Nico.Pranke@googlemail.com>.
- */
-
-
-#ifndef QT_CONNECTORMANAGER_H
-#define QT_CONNECTORMANAGER_H
-
-#include <list>
-
-#include "ConnectorManager.h"
-
-namespace avcap
-{	
-	class QT_DeviceDescriptor;
-	
-	//! This class implements the ConnectorManager for QuickTime-devices. 
-	
-	/*! Such devices don't have Connectors the user could chose. So the abstract
-	 * methods are implemented as noops. */
-	
-	class QT_ConnectorManager: public ConnectorManager
-	{	
-	public:
-	
-		QT_ConnectorManager(QT_DeviceDescriptor *dd);
-		
-		virtual ~QT_ConnectorManager();
-		void query();
-	};
-}
-
-#endif // QT_CONNECTORMANAGER_H
-

gpac-2.2.1.tar.gz/extra_lib/include/avcap/osx/QT_Control.h Deleted

@@ -1,89 +0,0 @@
-/*
- * (c) 2005, 2008 Nico Pranke <Nico.Pranke@googlemail.com>, Robin Luedtke <RobinLu@gmx.de> 
- *
- * This file is part of avcap.
- *
- * avcap is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * avcap 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with avcap.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/* avcap is free for non-commercial use.
- * To use it in commercial endeavors, please contact Nico Pranke <Nico.Pranke@googlemail.com>.
- */
-
-#ifndef QT_CONTROL_H_
-#define QT_CONTROL_H_
-
-#include <string>
-#include <list>
-
-#include "Control_avcap.h"
-
-namespace avcap
-{
-	// forward declaration
-	class QT_DeviceDescriptor;
-	
-	//! Implementation of a Control for the QuickTime-implementation of CaptureDevice.
-
-	/*! The QT API supports only controls for brightness, hue, colour, contrast, depth and whiteness.
-	 * They are all integer values between 0 and 65535.*/
-	 
-	class QT_Control: public IntegerControl
-	{
-	public:
-		enum Ctrl {
-			BRIGHTNESS = 0,
-			BLACKLEVEL,
-			WHITELEVEL,
-			HUE,
-			CONTRAST,
-			SATURATION,
-			SHARPNESS
-		};
-	
-	private:	
-		static std::string mNames7;
-		
-		QT_DeviceDescriptor*	mDescriptor;
-		Ctrl					mType;
-		unsigned short			mDefaultValue;
-		Interval				mInterval;
-		
-	public:
-		QT_Control(QT_DeviceDescriptor* dd, Ctrl type);
-
-		virtual inline ~QT_Control()
-			{}
-		
-		virtual inline int getId() const 
-			{ return mType; }
-
-		virtual inline int getDefaultValue() const
-			{ return mDefaultValue; }
-
-		virtual const std::string& getName() const;
-		
-		virtual int setValue(int val);
-
-		virtual int getValue() const;
-		
-		virtual int reset();
-		
-		virtual inline const Interval& getInterval() const 
-			{ return mInterval; }
-	};
-}
-
-#endif // QT_CONTROL_H_
-

gpac-2.2.1.tar.gz/extra_lib/include/avcap/osx/QT_ControlManager.h Deleted

@@ -1,53 +0,0 @@
-/*
- * (c) 2005, 2008 Nico Pranke <Nico.Pranke@googlemail.com>, Robin Luedtke <RobinLu@gmx.de> 
- *
- * This file is part of avcap.
- *
- * avcap is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * avcap 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with avcap.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/* avcap is free for non-commercial use.
- * To use it in commercial endeavors, please contact Nico Pranke <Nico.Pranke@googlemail.com>.
- */
-
-
-#ifndef QT_CONTROLMANAGER_H
-#define QT_CONTROLMANAGER_H
-
-#include <string>
-#include <list>
-
-#include "ControlManager.h"
-
-namespace avcap
-{
-
-class QT_DeviceDescriptor;
-
-	//! Implementation of the ControlManager for the QuickTime-implementation of CaptureDevice.
-	 
-	class QT_ControlManager: public ControlManager
-	{
-	public:
-
-		QT_ControlManager(QT_DeviceDescriptor *dd);
-		
-		virtual ~QT_ControlManager();
-		
-		virtual void query();
-	};
-}
-
-#endif // QT_CONTROLMANAGER_H
-

gpac-2.2.1.tar.gz/extra_lib/include/avcap/osx/QT_Device.h Deleted

@@ -1,83 +0,0 @@
-/*
- * (c) 2005, 2008 Nico Pranke <Nico.Pranke@googlemail.com>, Robin Luedtke <RobinLu@gmx.de>
- *
- * This file is part of avcap.
- *
- * avcap is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * avcap 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with avcap.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/* avcap is free for non-commercial use.
- * To use it in commercial endeavors, please contact Nico Pranke <Nico.Pranke@googlemail.com>.
- */
-
-#ifndef QT_DEVICE_H
-#define QT_DEVICE_H
-
-#include <string>
-#include <list>
-
-#include "DeviceDescriptor.h"
-#include "CaptureDevice.h"
-#include "QT_FormatManager.h"
-
-namespace avcap
-{
-	// forward declarations
-	class QT_DeviceDescriptor;
-	class QT_VidCapManager;
-	class QT_ConnectorManager;
-	class QT_ControlManager;
-
-	//! Implementation of the CaptureDevice for QuickTime.
-
-	class QT_Device : public CaptureDevice
-	{
-	public:
-
-	private:
-		QT_DeviceDescriptor*	mDeviceDescriptor;
-		QT_FormatManager*		mFormatMgr;
-		QT_VidCapManager*		mVidCapMgr;
-		QT_ConnectorManager*	mConnectorMgr;
-		QT_ControlManager*		mControlMgr;
-
-	public:
-		QT_Device(QT_DeviceDescriptor* dd);
-
-		virtual ~QT_Device();
-
-		inline const DeviceDescriptor* getDescriptor()
-			{ return (const DeviceDescriptor*) mDeviceDescriptor; }
-
-		inline CaptureManager* getVidCapMgr()
-			{ return (CaptureManager*) mVidCapMgr; }
-
-		inline ConnectorManager* getConnectorMgr()
-			{ return (ConnectorManager*) mConnectorMgr; }
-
-		inline ControlManager*	getControlMgr()
-			{ return (ControlManager*) mControlMgr; }
-
-		inline FormatManager* getFormatMgr()
-			{ return (FormatManager*) mFormatMgr; }
-
-	private:
-		int open();
-
-		int close();
-	};
-}
-
-#endif // QT_DEVICE_H
-

gpac-2.2.1.tar.gz/extra_lib/include/avcap/osx/QT_DeviceDescriptor.h Deleted

@@ -1,103 +0,0 @@
-/*
- * (c) 2005, 2008 Nico Pranke <Nico.Pranke@googlemail.com>, Robin Luedtke <RobinLu@gmx.de>
- *
- * This file is part of avcap.
- *
- * avcap is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * avcap 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with avcap.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/* avcap is free for non-commercial use.
- * To use it in commercial endeavors, please contact Nico Pranke <Nico.Pranke@googlemail.com>.
- */
-
-
-#ifndef QT_DEVICEDESCRIPTOR_H_
-#define QT_DEVICEDESCRIPTOR_H_
-
-#include <iostream>
-#include <string>
-
-#include "DeviceDescriptor.h"
-#include <QuickTime/QuickTime.h>
-
-namespace avcap
-{
-class CaptureDevice;
-class QT_Device;
-
-	//! Implementation of the DeviceDescriptor for QuickTime.
-
-	class QT_DeviceDescriptor : public DeviceDescriptor
-	{
-	public:
-
-	private:
-		SeqGrabComponent mGrabber;
-		SGChannel		 mChannel;
-		VideoDigitizerComponent mDigitizer;
-		DigitizerInfo			mDigiInfo;
-
-		int				 mDeviceID;
-		int				 mInputID;
-		bool			 mValid;
-
-		std::string		 mName;
-		std::string		 mDriver;
-		QT_Device*		 mDevice;
-
-	public:
-		QT_DeviceDescriptor(int device, int input, const std::string& dev_name, const std::string& driver_name,
-			SeqGrabComponent current_grabber, SGChannel current_channel);
-
-		QT_DeviceDescriptor();
-
-		virtual ~QT_DeviceDescriptor();
-
-		virtual CaptureDevice* getDevice();
-
-		virtual int open();
-
-		virtual int close();
-
-		virtual const std::string& getName() const;
-
-		virtual const std::string& getDriver() const;
-
-		bool isVideoCaptureDev() const;
-
-		virtual inline const DEV_HANDLE_T getHandle() const
-			{ return 0; }
-
-		//! Get the SequenceGrabber-Component.
-		/*! \return the SequenceGrabber-Component. */
-		inline SeqGrabComponent getGrabber(void)
-			{ return mGrabber; }
-
-		//! Get the SequenceGrabber-Channel associated with the device.
-		/*! \return the SequenceGrabber-Channel. */
-		inline SGChannel getChannel(void)
-			{ return mChannel; }
-
-		//! Get the VideoDigitizer associated with the device.
-		/*! \return the VideoDigitizer. */
-		inline VideoDigitizerComponent getDigitizer(void)
-			{ return mDigitizer; }
-
-	private:
-		bool queryCapabilities(SeqGrabComponent current_grabber, SGChannel current_channel);
-
-	};
-}
-
-#endif // QT_DEVICEDESCRIPTOR_H_

gpac-2.2.1.tar.gz/extra_lib/include/avcap/osx/QT_DeviceEnumerator.h Deleted

@@ -1,58 +0,0 @@
-/*
- * (c) 2005, 2008 Nico Pranke <Nico.Pranke@googlemail.com>, Robin Luedtke <RobinLu@gmx.de> 
- *
- * This file is part of avcap.
- *
- * avcap is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * avcap 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with avcap.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/* avcap is free for non-commercial use.
- * To use it in commercial endeavors, please contact Nico Pranke <Nico.Pranke@googlemail.com>.
- */
-
-
-#ifndef QT_DEVICEENUMERATOR_H_
-#define QT_DEVICEENUMERATOR_H_
-
-#include <QuickTime/QuickTime.h>
-
-#include "DeviceCollector.h"
-#include "QT_DeviceDescriptor.h"
-
-namespace avcap
-{
-	//! This special DeviceDescriptor is used by the DeviceCollector to enumerate QuickTime capture-devices.
-
-	class QT_DeviceEnumerator: public QT_DeviceDescriptor
-	{
-	private:
-		SGDeviceList	mDeviceList;
-		
-	public:
-		QT_DeviceEnumerator();
-		virtual ~QT_DeviceEnumerator();
-		
-		//! Use this method to populate a DeviceList with the descriptors of the Devices found on the system.
-		/*! \param dev_list : the list that is filled with DeviceDescriptor-objects.
-		 * \return 0 on success, -1 else */ 
-		int findDevices(DeviceCollector::DeviceList& dev_list);
-		
-		virtual int open();
-		
-		virtual int close();
-	};	
-}
-
-#endif // QT_DEVICEENUMERATOR_H_
-

gpac-2.2.1.tar.gz/extra_lib/include/avcap/osx/QT_FormatManager.h Deleted

@@ -1,92 +0,0 @@
-/*
- * (c) 2005, 2008 Nico Pranke <Nico.Pranke@googlemail.com>, Robin Luedtke <RobinLu@gmx.de> 
- *
- * This file is part of avcap.
- *
- * avcap is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * avcap 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with avcap.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/* avcap is free for non-commercial use.
- * To use it in commercial endeavors, please contact Nico Pranke <Nico.Pranke@googlemail.com>.
- */
-
-#ifndef QT_FORMATMANAGER_H
-#define QT_FORMATMANAGER_H
-
-#include <stdint.h>
-#include <QuickTime/QuickTime.h>
-
-#include "FormatManager.h"
-
-namespace avcap
-{
-	class QT_DeviceDescriptor;
-	
-	//! Implementation of the FormatManager for the QuickTime-implementation of CaptureDevice.
-	
-	/*! This FormatManager supports at most one format, so setting the format is not realy neccessary. */
-	
-	class QT_FormatManager: public FormatManager
-	{
-	private:
-		QT_DeviceDescriptor*	mQTDeviceDescriptor;
-		GWorldPtr				mGWorld;
-		Rect					mCurrentBounds;
-		bool					mNeedsDecompression;
-		
-	public:
-		QT_FormatManager(QT_DeviceDescriptor *dd);
-		
-		virtual ~QT_FormatManager();
-		
-		int setFormat(Format *fmt);
-		
-		int setFormat(uint32_t fourcc);
-
-		Format* getFormat();
-		
-		int setResolution(int w, int h);
-
-		int getWidth();
-
-		int getHeight();
-		
-		size_t getImageSize();
-				
-		int setFramerate(int fps);
-		
-		int getFramerate();
-		
-		void query();
-		
-	private:
-		
-		int probeResolutions(Format* fmt);
-
-		int checkResolution(int w, int h);
-
-		int updateGWorld(const Rect* bounds);
-
-		static uint32_t OSType2Fourcc(OSType pixel_format);
-		
-		static OSType Fourcc2OSType(uint32_t fourcc);
-
-		inline bool needsDecompression() const 
-			{ return mNeedsDecompression; }
-
-		friend class QT_VidCapManager;
-	};
-}
-
-#endif // QT_FORMATMANAGER_H

gpac-2.2.1.tar.gz/extra_lib/include/avcap/osx/QT_VidCapManager.h Deleted

@@ -1,122 +0,0 @@
-/*
- * (c) 2005, 2008 Nico Pranke <Nico.Pranke@googlemail.com>, Robin Luedtke <RobinLu@gmx.de> 
- *
- * This file is part of avcap.
- *
- * avcap is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * avcap 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with avcap.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/* avcap is free for non-commercial use.
- * To use it in commercial endeavors, please contact Nico Pranke <Nico.Pranke@googlemail.com>.
- */
-
-#ifndef QT_VIDCAPMANAGER_H_
-#define QT_VIDCAPMANAGER_H_
-
-#include <sys/types.h>
-#include <list>
-#include <time.h>
-#include <pthread.h>
-
-#include <QuickTime/QuickTime.h>
-
-#include "CaptureManager.h"
-
-namespace avcap
-{
-	class QT_DeviceDescriptor;
-	class QT_FormatManager;
-	class IOBuffer;
-	class CaptureHandler;
-	
-	//! Implementation of the CaptureManager for the QuickTime-implementation of a CaptureDevice.
-
-	/*! This CaptureManager captures the data in an ow thread. 
-	 * Decompression is performed, if neccessary (e.g. for DV-Cams). */
-	
-	class QT_VidCapManager: public CaptureManager
-	{
-	public:
-
-	private:		
-		typedef std::list<IOBuffer*> IOBufList_t;
-
-		QT_DeviceDescriptor	*mQTDeviceDescriptor;
-		QT_FormatManager	*mFormatMgr;
-		IOBufList_t			mBuffers;
-		TimeScale			mTimeScale;
-		TimeScale			mLastTime;
-		pthread_t*			mThread;
-		pthread_mutex_t		mLock;
-		int					mFinish;
-		long 				mSequence;
-		int					mNumBufs;
-		int					mAvailableBuffers;
-		ICMDecompressionSessionRef	mDecompSession;
-
-	public:
-		QT_VidCapManager(QT_DeviceDescriptor* dd, QT_FormatManager* fmt_mgr, int nbufs);
-		
-		virtual ~QT_VidCapManager();
-		
-		int init();
-		
-		int destroy();
-		
-		int startCapture();
-
-		int stopCapture();
-		
-		virtual IOBuffer* dequeue();
-
-		virtual int enqueue(IOBuffer* buf);
-		
-		virtual int getNumIOBuffers();
-		
-	private:
-		int startCaptureImpl();
-		
-		int stopCaptureImpl();
-
-		void notifyCaptureHandler(void* data, size_t length, size_t bytes_per_row, TimeValue time);
-
-		int poll();
-
-		struct timespec getPollTimespec(double fps);
-
-		int decompressData(void* data, long length, TimeValue timeValue);
-
-		static OSErr captureCallback(SGChannel ch, Ptr data, long data_len, long * offset, 
-			long ch_ref_con, TimeValue time_value, short write_type, long priv);
-
-		OSErr captureCallbackImpl(SGChannel ch, Ptr data, long data_len, long * offset, 
-			long ch_ref_con, TimeValue time_value, short write_type);
-
-		int createDecompSession();
-		
-		static void* threadFunc(void* arg);
-	
-		static void decompTrackingCallback(void *decompressionTrackingRefCon, OSStatus result,
-			ICMDecompressionTrackingFlags decompressionTrackingFlags, CVPixelBufferRef pixelBuffer,
-			TimeValue64 displayTime, TimeValue64 displayDuration, ICMValidTimeFlags validTimeFlags,
-			void *reserved,	void *sourceFrameRefCon );
-
-		void threadFuncImpl();
-		
-		void clearBuffers();
-	};
-}
-
-#endif // QT_VIDCAPMANAGER_H
-

gpac-2.2.1.tar.gz/extra_lib/include/avcap/osx/avcap-config.h Deleted

@@ -1,264 +0,0 @@
-#ifndef _AVCAP_CONFIG_H
-#define _AVCAP_CONFIG_H 1
- 
-/* avcap-config.h. Generated automatically at end of configure. */
-/* config.h.  Generated from config.h.in by configure.  */
-/* config.h.in.  Generated from configure.in by autoheader.  */
-
-/* Define to 1 if you have the `alarm' function. */
-#ifndef AVCAP_HAVE_ALARM 
-#define AVCAP_HAVE_ALARM  1 
-#endif
-
-/* Define to 1 if you have the <dlfcn.h> header file. */
-#ifndef AVCAP_HAVE_DLFCN_H 
-#define AVCAP_HAVE_DLFCN_H  1 
-#endif
-
-/* Define to 1 if you have the <fcntl.h> header file. */
-#ifndef AVCAP_HAVE_FCNTL_H 
-#define AVCAP_HAVE_FCNTL_H  1 
-#endif
-
-/* Define to 1 if you have the <float.h> header file. */
-#ifndef AVCAP_HAVE_FLOAT_H 
-#define AVCAP_HAVE_FLOAT_H  1 
-#endif
-
-/* Define to 1 if you have the `getpagesize' function. */
-#ifndef AVCAP_HAVE_GETPAGESIZE 
-#define AVCAP_HAVE_GETPAGESIZE  1 
-#endif
-
-/* Define to 1 if you have the `gettimeofday' function. */
-#ifndef AVCAP_HAVE_GETTIMEOFDAY 
-#define AVCAP_HAVE_GETTIMEOFDAY  1 
-#endif
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#ifndef AVCAP_HAVE_INTTYPES_H 
-#define AVCAP_HAVE_INTTYPES_H  1 
-#endif
-
-/* Define to 1 if you have the <limits.h> header file. */
-#ifndef AVCAP_HAVE_LIMITS_H 
-#define AVCAP_HAVE_LIMITS_H  1 
-#endif
-
-/* Define to 1 if your system has a GNU libc compatible `malloc' function, and
-   to 0 otherwise. */
-#ifndef AVCAP_HAVE_MALLOC 
-#define AVCAP_HAVE_MALLOC  1 
-#endif
-
-/* Define to 1 if you have the <memory.h> header file. */
-#ifndef AVCAP_HAVE_MEMORY_H 
-#define AVCAP_HAVE_MEMORY_H  1 
-#endif
-
-/* Define to 1 if you have the `memset' function. */
-#ifndef AVCAP_HAVE_MEMSET 
-#define AVCAP_HAVE_MEMSET  1 
-#endif
-
-/* Define to 1 if you have a working `mmap' system call. */
-#ifndef AVCAP_HAVE_MMAP 
-#define AVCAP_HAVE_MMAP  1 
-#endif
-
-/* Define to 1 if you have the `munmap' function. */
-#ifndef AVCAP_HAVE_MUNMAP 
-#define AVCAP_HAVE_MUNMAP  1 
-#endif
-
-/* Define to 1 if you have the `pow' function. */
-#ifndef AVCAP_HAVE_POW 
-#define AVCAP_HAVE_POW  1 
-#endif
-
-/* Define to 1 if you have the `select' function. */
-#ifndef AVCAP_HAVE_SELECT 
-#define AVCAP_HAVE_SELECT  1 
-#endif
-
-/* Define to 1 if you have the `sqrt' function. */
-#ifndef AVCAP_HAVE_SQRT 
-#define AVCAP_HAVE_SQRT  1 
-#endif
-
-/* Define to 1 if `stat' has the bug that it succeeds when given the
-   zero-length file name argument. */
-/* #undef HAVE_STAT_EMPTY_STRING_BUG */
-
-/* Define to 1 if stdbool.h conforms to C99. */
-#ifndef AVCAP_HAVE_STDBOOL_H 
-#define AVCAP_HAVE_STDBOOL_H  1 
-#endif
-
-/* Define to 1 if you have the <stddef.h> header file. */
-#ifndef AVCAP_HAVE_STDDEF_H 
-#define AVCAP_HAVE_STDDEF_H  1 
-#endif
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#ifndef AVCAP_HAVE_STDINT_H 
-#define AVCAP_HAVE_STDINT_H  1 
-#endif
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#ifndef AVCAP_HAVE_STDLIB_H 
-#define AVCAP_HAVE_STDLIB_H  1 
-#endif
-
-/* Define to 1 if you have the `strerror' function. */
-#ifndef AVCAP_HAVE_STRERROR 
-#define AVCAP_HAVE_STRERROR  1 
-#endif
-
-/* Define to 1 if you have the <strings.h> header file. */
-#ifndef AVCAP_HAVE_STRINGS_H 
-#define AVCAP_HAVE_STRINGS_H  1 
-#endif
-
-/* Define to 1 if you have the <string.h> header file. */
-#ifndef AVCAP_HAVE_STRING_H 
-#define AVCAP_HAVE_STRING_H  1 
-#endif
-
-/* Define to 1 if you have the <sys/ioctl.h> header file. */
-#ifndef AVCAP_HAVE_SYS_IOCTL_H 
-#define AVCAP_HAVE_SYS_IOCTL_H  1 
-#endif
-
-/* Define to 1 if you have the <sys/select.h> header file. */
-#ifndef AVCAP_HAVE_SYS_SELECT_H 
-#define AVCAP_HAVE_SYS_SELECT_H  1 
-#endif
-
-/* Define to 1 if you have the <sys/socket.h> header file. */
-#ifndef AVCAP_HAVE_SYS_SOCKET_H 
-#define AVCAP_HAVE_SYS_SOCKET_H  1 
-#endif
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#ifndef AVCAP_HAVE_SYS_STAT_H 
-#define AVCAP_HAVE_SYS_STAT_H  1 
-#endif
-
-/* Define to 1 if you have the <sys/time.h> header file. */
-#ifndef AVCAP_HAVE_SYS_TIME_H 
-#define AVCAP_HAVE_SYS_TIME_H  1 
-#endif
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#ifndef AVCAP_HAVE_SYS_TYPES_H 
-#define AVCAP_HAVE_SYS_TYPES_H  1 
-#endif
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#ifndef AVCAP_HAVE_UNISTD_H 
-#define AVCAP_HAVE_UNISTD_H  1 
-#endif
-
-/* Define to 1 if the system has the type `_Bool'. */
-/* #undef HAVE__BOOL */
-
-/* Compile avcap for Linux */
-/* #undef LINUX */
-
-/* Define to 1 if `lstat' dereferences a symlink specified with a trailing
-   slash. */
-/* #undef LSTAT_FOLLOWS_SLASHED_SYMLINK */
-
-/* Compile avcap for Mac OS X */
-#ifndef AVCAP_OSX 
-#define AVCAP_OSX  1 
-#endif
-
-/* Name of package */
-#ifndef AVCAP_PACKAGE 
-#define AVCAP_PACKAGE  "avcap" 
-#endif
-
-/* Define to the address where bug reports for this package should be sent. */
-#ifndef AVCAP_PACKAGE_BUGREPORT 
-#define AVCAP_PACKAGE_BUGREPORT  "Nico.Pranke@googlemail.com" 
-#endif
-
-/* Define to the full name of this package. */
-#ifndef AVCAP_PACKAGE_NAME 
-#define AVCAP_PACKAGE_NAME  "A video capture library" 
-#endif
-
-/* Define to the full name and version of this package. */
-#ifndef AVCAP_PACKAGE_STRING 
-#define AVCAP_PACKAGE_STRING  "A video capture library 0.1.9" 
-#endif
-
-/* Define to the one symbol short name of this package. */
-#ifndef AVCAP_PACKAGE_TARNAME 
-#define AVCAP_PACKAGE_TARNAME  "avcap" 
-#endif
-
-/* Define to the version of this package. */
-#ifndef AVCAP_PACKAGE_VERSION 
-#define AVCAP_PACKAGE_VERSION  "0.1.9" 
-#endif
-
-/* Define to the type of arg 1 for `select'. */
-#ifndef AVCAP_SELECT_TYPE_ARG1 
-#define AVCAP_SELECT_TYPE_ARG1  int 
-#endif
-
-/* Define to the type of args 2, 3 and 4 for `select'. */
-#ifndef AVCAP_SELECT_TYPE_ARG234 
-#define AVCAP_SELECT_TYPE_ARG234  (fd_set *) 
-#endif
-
-/* Define to the type of arg 5 for `select'. */
-#ifndef AVCAP_SELECT_TYPE_ARG5 
-#define AVCAP_SELECT_TYPE_ARG5  (struct timeval *) 
-#endif
-
-/* Define to 1 if you have the ANSI C header files. */
-#ifndef AVCAP_STDC_HEADERS 
-#define AVCAP_STDC_HEADERS  1 
-#endif
-
-/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
-#ifndef AVCAP_TIME_WITH_SYS_TIME 
-#define AVCAP_TIME_WITH_SYS_TIME  1 
-#endif
-
-/* Define to 1 if your <sys/time.h> declares `struct tm'. */
-/* #undef TM_IN_SYS_TIME */
-
-/* Version number of package */
-#ifndef AVCAP_VERSION 
-#define AVCAP_VERSION  "0.1.9" 
-#endif
-
-/* Compile avcap for Windows */
-/* #undef WINDOWS */
-
-/* Define to empty if `const' does not conform to ANSI C. */
-/* #undef const */
-
-/* Define to `__inline__' or `__inline' if that's what the C compiler
-   calls it, or to nothing if 'inline' is not supported under any name.  */
-#ifndef __cplusplus
-/* #undef inline */
-#endif
-
-/* Define to rpl_malloc if the replacement function should be used. */
-/* #undef malloc */
-
-/* Define to `unsigned int' if <sys/types.h> does not define. */
-/* #undef size_t */
-
-/* Define to empty if the keyword `volatile' does not work. Warning: valid
-   code using `volatile' can become incorrect without. Disable with care. */
-/* #undef volatile */
- 
-/* once: _AVCAP_CONFIG_H */
-#endif

gpac-2.2.1.tar.gz/extra_lib/include/avcap/singleton.h Deleted

@@ -1,57 +0,0 @@
-/*
- * (c) 2005, 2008 Nico Pranke <Nico.Pranke@googlemail.com>, Robin Luedtke <RobinLu@gmx.de> 
- *
- * This file is part of avcap.
- *
- * avcap is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * avcap 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with avcap.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/* avcap is free for non-commercial use.
- * To use it in commercial endeavors, please contact Nico Pranke <Nico.Pranke@googlemail.com>
- */
-
-#ifndef SINGLETON_H_
-#define SINGLETON_H_
-
-
-
-namespace avcap 
-{
-	//! Base for classes that implement the singleton pattern. 
-	
-	/*! There are lots of more spohisticated approaches to implement 
-	 * a singleton but this simple approach is sufficient here.  */
-	template <class T>
-	class Singleton
-	{
-	public:
-	  
-		//! Get the global instance of the singleton.
-		static T& instance() 
-		{
-			static T _instance;
-			return _instance;
-		}
-	  
-	private:
-	
-		Singleton();	// ctor hidden
-		~Singleton();	// dtor hidden
-		Singleton(Singleton const&);	// copy ctor hidden
-		Singleton& operator=(Singleton const&);	// assign op hidden
-	};
-}
-
-#endif // SINGLETON_H_
-

gpac-2.2.1.tar.gz/extra_lib/include/avcap/windows Deleted

gpac-2.2.1.tar.gz/extra_lib/include/avcap/windows/Crossbar.h Deleted

@@ -1,123 +0,0 @@
-/*
- * (c) 2005, 2008 Nico Pranke <Nico.Pranke@googlemail.com>, Robin Luedtke <RobinLu@gmx.de> 
- *
- * This file is part of avcap.
- *
- * avcap is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * avcap 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with avcap.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/* avcap is free for non-commercial use.
- * To use it in commercial endeavors, please contact Nico Pranke <Nico.Pranke@googlemail.com>.
- */
-
-
-#ifndef CROSSBAR_H_
-#define CROSSBAR_H_
-
-#include <DShow.h>
-
-#include "avcap-export.h"
-
-namespace avcap
-{
-	struct AVCAP_Export STConnector
-	{
-		std::string NameOfConnector;
-		LONG PhysicalType;
-		bool IsAudioConnector;
-		bool IsVideoConnector;
-		bool IsRouted;
-	
-		IAMCrossbar *Crossbar;
-		long PinIndexOfCrossbar;
-		int AudioSet; 
-		
-		/* Video inputs correspond to zero or max. one audio input. 
-		 The pins are numbered from 0 to N-1, N <= 32.
-		 Each bit set is the index of a audio pin on the 
-		 same crossbar corresponding to the selected video pin.
-		 AudioSet only used for video input pins. */
-	
-		int PinIndex; // Independent PinIndex
-	};
-	
-	struct AVCAP_Export STRouting
-	{
-		long OutputPinIndex;
-		IPin *OutputPin;
-		long RelatedInPinIndex;
-		IPin *RelatedInputPin;
-		IAMCrossbar *Crossbar;
-		int CrossbarIndex; // Zero based index
-		bool HasConnector;
-	};
-	
-	//! A class for controlling DirectShow video crossbars.
-	
-	/*! This class creates a single object which encapsulates all connected
-	 *	crossbars, enumerates all unique inputs which can be reached from
-	 *  a given starting downstream filter.
-	 *  
-	 *  The class supports an arbitrarily complex graph of crossbars, 
-	 *  which can be cascaded and disjoint, that is not all inputs need 
-	 *  to traverse the same set of crossbars.
-	 *  
-	 *  Given a starting filter (typically the capture filter), the class 
-	 *  recursively traces upstream searching for all viable inputs.  
-	 *  An input is considered viable if it is either: 
-	 * 
-	 *  - unconnected
-	 *  - connects to a DirectShow filter which does not support IAMCrossbar 
-	 * COM-Interface.	
-	 * */
-	
-	class AVCAP_Export CCrossbar
-	{
-	public:
-		CCrossbar(ICaptureGraphBuilder2 *CaptureGraphBuilder);
-		~CCrossbar(void);
-	
-		/*! Searches upstrean for all available crossbars in the filter graph, 
-		 * starting from a given filter.
-		 * \param StartFilter Filter to start search from.
-		 * \return The number of crossbars found in the filter graph, -1 else. */
-		int FindAllCrossbarsAndConnectors(IBaseFilter *StartFilter);
-		std::list<STConnector*>& GetInputConnectorList();
-	
-		/*! Gets the currently selected video input connector.
-		 * \param Connector Connector data */
-		bool GetCurrentVideoInput(STConnector *Connector);
-	
-		/*! Gets the currently selected audio input connector.
-		 * \param Connector Connector data */
-		bool GetCurrentAudioInput(STConnector *Connector);
-	
-		/*! Sets the input connector.
-		 * \param PinIndex Pin index */
-		bool SetInput(int PinIndex);
-	
-	private:
-		QzCComPtr<ICaptureGraphBuilder2> m_CaptureBuilder;
-		std::list<IAMCrossbar*> m_CrossbarList;
-		std::list<STRouting*> m_RoutingList;
-		std::list<STConnector*> m_InputConnectorList;
-	
-		HRESULT GetCrossbarIPinAtIndex(IAMCrossbar *pXbar, LONG PinIndex,
-				BOOL IsInputPin, IPin ** ppPin);
-		void StringFromPinType(std::string &PinName, long lType);
-		void DeleteAllLists();
-	};
-}
-
-#endif // CROSSBAR_H_

gpac-2.2.1.tar.gz/extra_lib/include/avcap/windows/DS_Connector.h Deleted

@@ -1,74 +0,0 @@
-/*
- * (c) 2005, 2008 Nico Pranke <Nico.Pranke@googlemail.com>, Robin Luedtke <RobinLu@gmx.de> 
- *
- * This file is part of avcap.
- *
- * avcap is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * avcap 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with avcap.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/* avcap is free for non-commercial use.
- * To use it in commercial endeavors, please contact Nico Pranke <Nico.Pranke@googlemail.com>.
- */
-
-
-#ifndef DSCONNECTOR_H_
-#define DSCONNECTOR_H_
-
-#include <string>
-#include <list>
-
-#include "Connector.h"
-#include "DeviceDescriptor.h"
-#include "avcap-export.h"
-
-namespace avcap
-{
-// forward declaration
-class DS_DeviceDescriptor;
-class DS_Tuner;
-
-	//! Implementation of the Connector for DirectShow.
-
-
-	class AVCAP_Export DS_Connector : public Connector
-	{
-	public:
-	
-#pragma warning( disable : 4800 )
-		enum {
-			INPUT_TYPE_TUNER = 0x00010000 // CAP_TUNERDEVICE --> see "HelpFunc.h" file
-		};
-	
-	protected:
-		DS_DeviceDescriptor* 	mDSDeviceDescriptor;
-		int 					mIndex;
-		int 					mAudioset;
-		int						mType;
-		std::string 			mName;
-		DS_Tuner* 				mTuner;
-	
-	public:
-		/*! The Constructor.  */
-		DS_Connector(DS_DeviceDescriptor *dd, int index, const std::string& name,
-				int type=0, int audioset=0, int tuner=0);
-	
-		/*! The Destructor. */
-		virtual ~DS_Connector();
-	
-		bool hasTuner() const
-			{ return mType & INPUT_TYPE_TUNER; }
-	};
-}
-
-#endif // DSConnector_H_

gpac-2.2.1.tar.gz/extra_lib/include/avcap/windows/DS_ConnectorManager.h Deleted

@@ -1,91 +0,0 @@
-/*
- * (c) 2005, 2008 Nico Pranke <Nico.Pranke@googlemail.com>, Robin Luedtke <RobinLu@gmx.de> 
- *
- * This file is part of avcap.
- *
- * avcap is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * avcap 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with avcap.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/* avcap is free for non-commercial use.
- * To use it in commercial endeavors, please contact Nico Pranke <Nico.Pranke@googlemail.com>.
- */
-
-
-#ifndef DSCONNECTORMANAGER_H_
-#define DSCONNECTORMANAGER_H_
-
-#include <list>
-
-#include "Connector.h"
-#include "ConnectorManager.h"
-#include "avcap-export.h"
-
-class IPin;
-class IBaseFilter;
-
-namespace avcap
-{
-class DS_DeviceDescriptor;
-class DS_Connector;
-
-	//! DirectShow implementation of the ConnectorManager.
-
-	class AVCAP_Export DS_ConnectorManager : public ConnectorManager
-	{
-	private:
-		void*					mCrossbar;
-		DS_DeviceDescriptor* 	mDSDeviceDescriptor;
-	
-	public:
-	
-		/*! Construct the manager and query for available inputs and outputs for audio and video.
-		 * The manager is usualy created by an CaptureDevice object.
-		 * \param dd The DeviceDescriptor to acces the device. */
-		DS_ConnectorManager(DS_DeviceDescriptor *dd);
-	
-		/*! The destructor. */
-		virtual ~DS_ConnectorManager();
-	
-		Connector* getVideoInput();
-		int setVideoInput(Connector* c);
-	
-		Connector* getAudioInput();
-		int setAudioInput(Connector* c);
-	
-		Connector* getVideoOutput();
-		int setVideoOutput(Connector* c);
-	
-		Connector* getAudioOutput();
-		int setAudioOutput(Connector* c);
-	
-		void query();
-	
-	private:
-	
-		int setConnector(bool IsVideoConnector, Connector* c);
-		
-		Connector* getConnector(bool IsVideoConnector);
-		
-		Connector* findByIndex(const ListType& l, int index);
-	
-		void getIPinFromConnector(Connector *con, IPin **ConnectorPin,
-				IBaseFilter *CaptureFilter);
-		
-		bool removeAllFilters(IPin *OutputPinToStart);
-		
-		bool getPinCategory(IPin *Pin, GUID *PinCategory);
-	};
-}
-
-#endif // DSCONNECTORMANAGER_H_

gpac-2.2.1.tar.gz/extra_lib/include/avcap/windows/DS_Control.h Deleted

@@ -1,185 +0,0 @@
-/*
- * (c) 2005, 2008 Nico Pranke <Nico.Pranke@googlemail.com>, Robin Luedtke <RobinLu@gmx.de> 
- *
- * This file is part of avcap.
- *
- * avcap is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * avcap 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with avcap.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/* avcap is free for non-commercial use.
- * To use it in commercial endeavors, please contact Nico Pranke <Nico.Pranke@googlemail.com>.
- */
-
-
-#ifndef DSCONTROL_H_
-#define DSCONTROL_H_
-
-#include <string>
-
-#include "Control_avcap.h"
-#include "Interval.h"
-#include "avcap-export.h"
-
-namespace avcap
-{
-class DS_DeviceDescriptor;
-
-	//! Implementation of the Control-class for DirectShow.
-
-	class AVCAP_Export DS_Control
-	{
-	public:
-		enum Ctrl_Type
-		{
-			CTRL_TYPE_INTEGER = 1,
-			CTRL_TYPE_BOOLEAN = 2,
-		};
-	
-		enum DShowInterface
-		{
-			IAM_VIDEOPROCAMP = 1,
-			IAM_CAMERACONTROL = 2,
-		};
-	
-		//! Helper-class to query control-properties
-		
-		struct Query_Ctrl
-		{
-			unsigned int 	id;
-			Ctrl_Type 		type;
-			std::string 	name;
-			
-			long minimum;
-			long maximum;
-			long step;
-			long default_value;
-			long flags;
-			long property;
-	
-			DS_Control::DShowInterface DShowInterfaceType;
-		};
-	
-	private:
-		DShowInterface 	mDShowInterfaceType;
-		long			mProperty;
-		int 			mId;
-		int 			mValue;
-		std::string 	mName;
-		int 			mDefaultValue;
-		int 			mFlags;
-		bool 			mInitialized;
-	
-	protected:
-		DS_DeviceDescriptor* mDSDeviceDescriptor;
-	
-	public:
-		DS_Control(DS_DeviceDescriptor *dd, Query_Ctrl* query);
-		virtual ~DS_Control();
-	
-		inline int getId() const
-			{ return mId; }
-	
-		inline int getDefaultValue() const
-			{ return mDefaultValue; }
-	
-		inline const std::string& getName() const
-			{ return mName;	}
-	
-		int setValue(int val);
-	
-		int getValue() const;
-	
-		int reset();
-		
-	private:
-		int update();
-
-		int retrieveValue();
-	};
-	
-	//! DirectShow integer valued control.
-	
-	class DS_IntControl : public IntegerControl
-	{
-	private:
-		Interval 	mInterval;
-		DS_Control	mControlBase;
-		
-	public:
-		inline DS_IntControl(DS_DeviceDescriptor *dd, struct DS_Control::Query_Ctrl* query) :
-			mInterval(query->minimum, query->maximum, query->step),
-			mControlBase(dd, query)
-			{}
-	
-		virtual inline ~DS_IntControl()
-			{}
-	
-		inline const Interval& getInterval() const 
-			{ return mInterval; }
-
-		virtual inline int getId() const
-			{ return mControlBase.getId(); }
-	
-		virtual inline int getDefaultValue() const
-			{ return mControlBase.getDefaultValue(); }
-	
-		virtual inline const std::string& getName() const
-			{ return mControlBase.getName(); }
-	
-		virtual inline int setValue(int val)
-			{ return mControlBase.setValue(val); }
-	
-		virtual inline int getValue() const
-			{ return mControlBase.getValue(); }
-		
-		virtual inline int reset() 
-			{ return mControlBase.reset(); }
-	};
-	
-	//! DirectShow boolean control.
-
-	class DS_BoolControl : public BoolControl
-	{
-	private:
-		DS_Control	mControlBase;
-
-	public:
-		inline DS_BoolControl(DS_DeviceDescriptor *dd, struct DS_Control::Query_Ctrl* query) :
-			mControlBase(dd, query)
-			{}
-	
-		virtual inline ~DS_BoolControl()
-			{}
-		
-		virtual inline int getId() const
-			{ return mControlBase.getId(); }
-	
-		virtual inline int getDefaultValue() const
-			{ return mControlBase.getDefaultValue(); }
-	
-		virtual inline const std::string& getName() const
-			{ return mControlBase.getName(); }
-	
-		virtual inline int setValue(int val)
-			{ return mControlBase.setValue(val); }
-	
-		virtual inline int getValue() const
-			{ return mControlBase.getValue(); }
-		
-		virtual inline int reset() 
-			{ return mControlBase.reset(); }
-	};
-}
-
-#endif // DSCONTROL_H_

gpac-2.2.1.tar.gz/extra_lib/include/avcap/windows/DS_ControlManager.h Deleted

@@ -1,80 +0,0 @@
-/*
- * (c) 2005, 2008 Nico Pranke <Nico.Pranke@googlemail.com>, Robin Luedtke <RobinLu@gmx.de> 
- *
- * This file is part of avcap.
- *
- * avcap is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * avcap 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with avcap.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/* avcap is free for non-commercial use.
- * To use it in commercial endeavors, please contact Nico Pranke <Nico.Pranke@googlemail.com>.
- */
-
-
-#ifndef DSCONTROLMANAGER_H_
-#define DSCONTROLMANAGER_H_
-
-#include <string>
-#include <list>
-
-#include "ControlManager.h"
-#include "DS_Control.h"
-#include "avcap-export.h"
-
-namespace avcap
-{
-class DS_DeviceDescriptor;
-	
-	//! DirectShow ControlManager implementation.
-
-	/*! DirectShow doesn't provide any methods to enumerate driver- 
-	* specific controls like V4L2 does. 
-	* There are only few DirectShow COM-Interfaces (e.g. IAMExtTransport (for 
-	* Firewire or other external devices), IAMVideoControl, IAMVideoCompression, IAMVideoProcAmp, 
-	* IAMCameraControl --> see DirectShow documentation), the capture device DirectShow filter
-	* (only WDM capture devices) can expose to support the setting of global properties. The most 
-	* important settings are covered by these DirectShow COM-Interfaces. 
-	* In the future, DirectShow will provide more COM-Interfaces.
-	* 
-	* The DirectShow COM-Interfaces IAMVideoProcAmp and IAMCameraControl have been already 
-	* implemented in the avcap-library.
-	* 
-	* Most WDM capture devices and \b all VFW capture devices have their own driver-supplied dialog 
-	* boxes with user-setable controls on it, that can't be set programmatically. */
-	
-	class AVCAP_Export DS_ControlManager : public ControlManager
-	{
-	private:
-		DS_DeviceDescriptor* mDSDeviceDescriptor;
-	
-	public:
-		DS_ControlManager(DS_DeviceDescriptor *dd);
-	
-		virtual ~DS_ControlManager();
-	
-		Control* getControl(const std::string& name);
-	
-		Control* getControl(int id);
-	
-		const ListType& getControlList()
-			{ return (const ListType&) mControls; }
-		
-		void query();
-	
-	private:
-		void query(int start_id, int end_id);
-	};
-}
-
-#endif

gpac-2.2.1.tar.gz/extra_lib/include/avcap/windows/DS_Device.h Deleted

@@ -1,82 +0,0 @@
-/*
- * (c) 2005, 2008 Nico Pranke <Nico.Pranke@googlemail.com>, Robin Luedtke <RobinLu@gmx.de>
- *
- * This file is part of avcap.
- *
- * avcap is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * avcap 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with avcap.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/* avcap is free for non-commercial use.
- * To use it in commercial endeavors, please contact Nico Pranke <Nico.Pranke@googlemail.com>.
- */
-
-
-#ifndef DSDEVICE_H_
-#define DSDEVICE_H_
-
-#include <string>
-#include <list>
-
-#include "DS_DeviceDescriptor.h"
-#include "CaptureDevice.h"
-#include "avcap-export.h"
-
-namespace avcap
-{
-// forward declarations
-class DS_ConnectorManager;
-class DS_ControlManager;
-class DS_VidCapManager;
-class DS_DeviceDescriptor;
-class DS_FormatManager;
-
-	//! Implementation of the CaptureDevice for DirectShow.
-
-	class AVCAP_Export DS_Device : public CaptureDevice
-	{
-	private:
-		DS_VidCapManager*		mVidCapMgr;
-		DS_ConnectorManager*	mConnectorMgr;
-		DS_ControlManager*		mControlMgr;
-		DS_FormatManager*		mFormatMgr;
-		DS_DeviceDescriptor*	mDSDeviceDescriptor;
-
-	public:
-		DS_Device(DS_DeviceDescriptor* dd);
-
-		virtual ~DS_Device();
-
-		inline const DeviceDescriptor* getDescriptor()
-			{ return (const DeviceDescriptor*) mDSDeviceDescriptor;	}
-
-		inline CaptureManager* getVidCapMgr()
-			{ return (CaptureManager*) mVidCapMgr; }
-
-		inline ConnectorManager* getConnectorMgr()
-			{ return (ConnectorManager*) mConnectorMgr;	}
-
-		inline ControlManager* getControlMgr()
-			{ return (ControlManager*) mControlMgr;	}
-
-		inline FormatManager* getFormatMgr()
-			{ return (FormatManager*)mFormatMgr; }
-
-	private:
-		int open();
-
-		int close();
-	};
-}
-
-#endif // DSDEVICE_H_

gpac-2.2.1.tar.gz/extra_lib/include/avcap/windows/DS_DeviceDescriptor.h Deleted

@@ -1,131 +0,0 @@
-/*
- * (c) 2005, 2008 Nico Pranke <Nico.Pranke@googlemail.com>, Robin Luedtke <RobinLu@gmx.de>
- *
- * This file is part of avcap.
- *
- * avcap is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * avcap 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with avcap.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/* avcap is free for non-commercial use.
- * To use it in commercial endeavors, please contact Nico Pranke <Nico.Pranke@googlemail.com>.
- */
-
-
-#ifndef DSDEVICEDESCRIPTOR_H_
-#define DSDEVICEDESCRIPTOR_H_
-
-#include <iostream>
-#include <string>
-#include <DShow.h>
-
-#include "DeviceDescriptor.h"
-#include "avcap-export.h"
-
-class IBaseFilter;
-
-namespace avcap
-{
-class CaptureDevice;
-class DS_Device;
-
-	//! Implementation of the DeviceDescriptor for DirectShow.
-
-	class AVCAP_Export DS_DeviceDescriptor : public DeviceDescriptor
-	{
-	public:
-		// Used by AddToRot() and RemoveFromRot() for spying on
-		// filter graph with GraphEdit software
-		unsigned long mRegister; // For debugging purpose
-
-	private:
-		std::string mName;
-		std::string mCard;
-		std::string mInfo;
-
-		int 			mCapabilities;
-		DEV_HANDLE_T 	mHandle;
-		bool 			mValid;
-		bool			mIsOpen;
-		DS_Device*		mDevice;
-
-	public:
-		DS_DeviceDescriptor(const std::string &card);
-
-		virtual ~DS_DeviceDescriptor();
-
-		virtual CaptureDevice* getDevice();
-
-		int open();
-
-		int close();
-
-		virtual inline const std::string& getName() const
-			{ return mName; }
-
-		// implementation of pure virtual method
-		inline const DEV_HANDLE_T getHandle() const
-			{ return mHandle; }
-
-		// but non-const access is needed by the device-class
-		inline DEV_HANDLE_T getHandle()
-			{ return mHandle; }
-
-		bool isAVDev() const;
-
-		bool isVideoCaptureDev() const;
-
-		bool isVBIDev() const;
-
-		bool isTuner() const;
-
-		bool isAudioDev() const;
-
-		bool isRadioDev() const;
-
-		bool isOverlayDev() const;
-
-		//! Device is a VFW (Video for Windows) device.
-		/*! \return true VFW device, else false */
-		bool isVfWDevice() const;
-
-	private:
-		bool queryCapabilities();
-
-		void findDevice(std::string &UniqueDeviceID, IBaseFilter **CaptureFilter,
-				std::string &DeviceName, std::string &DeviceInfo,
-				bool *IsVideoDevice=NULL, bool *IsAudioDevice=NULL);
-
-		bool createCaptureFilterGraph(std::string &UniqueDeviceID,
-				IBaseFilter *CaptureFilter);
-
-		bool getInfosFromDevice(IBaseFilter *CaptureFilter, int *Capabilities,
-				std::string &Card, std::string &Info);
-
-		bool findOverlaySupport(IBaseFilter *CaptureFilter, int *Capabilities);
-
-		bool findVBISupport(IBaseFilter *CaptureFilter, int *Capabilities);
-
-		bool findTunerRadioSupport(IBaseFilter *CaptureFilter, int *Capabilities);
-
-		bool isAudioOrVideoDevice(IBaseFilter *CaptureFilter, int *Capabilities);
-
-		HRESULT addToRot(IUnknown *pUnkGraph, DWORD *pdwRegister);
-
-		void removeFromRot(DWORD pdwRegister);
-
-		friend class DS_Device;
-	};
-}
-
-#endif // DSEVICEDESCRIPTOR_H_

gpac-2.2.1.tar.gz/extra_lib/include/avcap/windows/DS_FormatManager.h Deleted

@@ -1,101 +0,0 @@
-/*
- * (c) 2005, 2008 Nico Pranke <Nico.Pranke@googlemail.com>, Robin Luedtke <RobinLu@gmx.de> 
- *
- * This file is part of avcap.
- *
- * avcap is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * avcap 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with avcap.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/* avcap is free for non-commercial use.
- * To use it in commercial endeavors, please contact Nico Pranke <Nico.Pranke@googlemail.com>.
- */
-
-#ifndef DSFORMATMANAGER_H_
-#define DSFORMATMANAGER_H_
-
-#include <list>
-#include <string>
-#include <Dshow.h>
-
-#ifndef _MSC_VER
-# include <stdint.h>
-#endif
-
-#include "FormatManager.h"
-#include "avcap-export.h"
-
-class IBaseFilter;
-class IPin;
-
-namespace avcap
-{
-class DS_DeviceDescriptor;
-
-	//! Implementation of the FormatManager for DirectShow.
-	
-	/*! A capture device that still uses a VFW (Video for Windows)
-	* driver can select the available formats only by using the VFW driver-supplied dialog box.
-	* But GUI-related stuff is out of the scope of this library. */
-	
-	class AVCAP_Export DS_FormatManager : public FormatManager
-	{
-	private:
-		DS_DeviceDescriptor* mDSDeviceDescriptor;
-		int			   mFrameRate;
-
-	public:
-		DS_FormatManager(DS_DeviceDescriptor *dd);
-
-		virtual ~DS_FormatManager();
-	
-		virtual int setFormat(Format *fmt);
-	
-		virtual Format* getFormat();
-	
-		virtual int setResolution(int w, int h);
-	
-		virtual int getWidth();
-	
-		virtual int getHeight();
-	
-		virtual int getBytesPerLine();
-	
-		virtual int setFramerate(int fps);
-
-		virtual int getFramerate();
-
-		virtual int flush();
-	
-		virtual size_t getImageSize();
-	
-		virtual const VideoStandard* getVideoStandard();
-	
-		virtual int setVideoStandard(const VideoStandard* std);
-	
-		virtual void query();
-	
-	private:
-		int getParams();
-		
-		void queryVideoStandards();
-	
-		bool getVideoInfoHeader(AM_MEDIA_TYPE *MediaType,
-				VIDEOINFOHEADER *VideoInfoHeader);
-		
-		bool getCurrentConnectedVideoPin(IBaseFilter *CaptureFilter,
-				IPin **VideoPin);
-	};
-}
-
-#endif // DSFORMATMANAGER_H_

gpac-2.2.1.tar.gz/extra_lib/include/avcap/windows/DS_Tuner.h Deleted

@@ -1,134 +0,0 @@
-/*
- * (c) 2005, 2008 Nico Pranke <Nico.Pranke@googlemail.com>, Robin Luedtke <RobinLu@gmx.de> 
- *
- * This file is part of avcap.
- *
- * avcap is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * avcap 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with avcap.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/* avcap is free for non-commercial use.
- * To use it in commercial endeavors, please contact Nico Pranke <Nico.Pranke@googlemail.com>.
- */
-
-
-#ifndef DSTUNER_H_
-#define DSTUNER_H_
-
-#include <string>
-
-#include "Tuner_avcap.h"
-#include "avcap-export.h"
-
-class IAMTVAudio;
-class IAMTVTuner;
-class IBaseFilter;
-
-namespace avcap
-{
-class DS_DeviceDescriptor;
-
-	//! Implementation of the Tuner-class for DirectShow.
-	  
-	/*! This implementation uses the PROPSETID_TUNER property-set which is defined in 
-	 * the library kstvtuner.ax which can not be linked with gcc. 
-	 * It thus can not be used under mingw, but only if build with Visual-C++.
-	 * So the mingw-build library misses this tuner-implentation.
-	 * 
-	 * There are only three states of signal strength:
-	 * signal present, signal not present, signal not determined. Because of this limitation
-	 * the method getAFCValue() is not implemented.
-	 */
-	
-	class AVCAP_Export DS_Tuner : public Tuner
-	{
-	private:
-	
-#pragma warning( disable : 4800 )
-
-		enum
-		{
-			TUNER_RADIO = 0x00080000, // CAP_RADIO --> see "HelpFunc.h" file
-			TUNER_ANALOG_TV = 0x00020000 // CAP_TUNER --> see "HelpFunc.h" file
-		};
-	
-		int 			mIndex;
-		std::string 	mName;
-		int 			mType;
-		int 			mCapabilities;
-		unsigned int 	mRangeHigh;
-		unsigned int 	mRangeLow;
-		double 			mStep;
-		double 			mFreq;
-	
-	private:
-		DS_DeviceDescriptor* mDSDeviceDescriptor;
-	
-	public:
-		DS_Tuner(DS_DeviceDescriptor *dd, int index, const std::string &name,
-				int type, int caps, unsigned int high, unsigned int low);
-		
-		virtual ~DS_Tuner();
-	
-		inline bool isRadioTuner() const
-			{ return mType & TUNER_RADIO; }
-	
-		inline bool isTVTuner() const
-			{ return mType & TUNER_ANALOG_TV; }
-	
-		int setStereo();
-	
-		int setMono();
-	
-		int setSAP();
-	
-		int setLang1();
-	
-		int setLang2();
-	
-		double getFreq() const;
-	
-		inline double getFreqStep() const
-			{ return mStep; }
-	
-		inline double getMinFreq() const
-			{ return mRangeLow*mStep; }
-	
-		inline double getMaxFreq() const
-			{ return mRangeHigh*mStep; }
-	
-		const std::string getName() const
-			{ return mName; }
-	
-		int getSignalStrength() const;
-	
-		int increaseFreq();
-	
-		int decreaseFreq();
-	
-		int setFreq(double f);
-	
-	private:
-		int setAudioMode(int mode);
-		
-		int getAudioMode();
-	
-		bool getIAMTVTunerInterfaceFromFilter(IBaseFilter *Filter,
-			IAMTVTuner **Tuner) const;
-
-		bool getIAMTVAudioInterfaceFromFilter(IBaseFilter *Filter,
-			IAMTVAudio **Audio);
-	};
-}
-
-#endif // DSTUNER_H_

gpac-2.2.1.tar.gz/extra_lib/include/avcap/windows/DS_VidCapManager.h Deleted

@@ -1,98 +0,0 @@
-/*
- * (c) 2005, 2008 Nico Pranke <Nico.Pranke@googlemail.com>, Robin Luedtke <RobinLu@gmx.de> 
- *
- * This file is part of avcap.
- *
- * avcap is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * avcap 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with avcap.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/* avcap is free for non-commercial use.
- * To use it in commercial endeavors, please contact Nico Pranke <Nico.Pranke@googlemail.com>.
- */
-
-
-#ifndef DSVIDCAPMANAGER_H_
-#define DSVIDCAPMANAGER_H_
-
-#include <list>
-
-#include "CaptureManager.h"
-#include "SampleGrabberCallback.h"
-#include "avcap-export.h"
-
-namespace avcap
-{
-class DS_DeviceDescriptor;
-class DS_FormatManager;
-class IOBuffer;
-class CaptureHandler;
-class SampleGrabberCallback;
-
-	//! Implementation of the CaptureManager for DirectShow.
-
-	class AVCAP_Export DS_VidCapManager : public CaptureManager
-	{
-	private:
-		typedef std::list<IOBuffer*> IOBufList;
-		
-		DS_DeviceDescriptor*	mDSDeviceDescriptor;
-		SampleGrabberCallback*	mGrabberCallback;
-		HANDLE					mLock;
-		int 					mSequence;
-		int 					mNumBuffers;
-
-	public:
-		DS_VidCapManager(DS_DeviceDescriptor* dd, DS_FormatManager* fmt_mgr,
-				int nbufs = DEFAULT_BUFFERS);
-	
-		virtual ~DS_VidCapManager();
-	
-		int init();
-	
-		int destroy();
-	
-		int startCapture();
-	
-		int stopCapture();
-		
-		int getNumIOBuffers();
-	
-	private:
-		IOBuffer* dequeue();
-
-		int enqueue(IOBuffer* buf);
-	
-		friend class IOBuffer;
-		friend class SampleGrabberCallback;
-	};
-
-	class MutexGuard
-	{
-	private:
-		HANDLE	mLock;
-		
-	public:
-		inline MutexGuard(HANDLE lock) : 
-			mLock(lock)
-			{ WaitForSingleObject(mLock, INFINITE); }
-			
-		inline virtual ~MutexGuard()
-			{ ReleaseMutex(mLock); }
-	private:
-		inline MutexGuard()
-			{}
-	};
-}
-
-#endif // DSVIDCAPMANAGER_H_

gpac-2.2.1.tar.gz/extra_lib/include/avcap/windows/FormatNames.h Deleted

@@ -1,356 +0,0 @@
-/*
- * (c) 2005, 2008 Nico Pranke <Nico.Pranke@googlemail.com>, Robin Luedtke <RobinLu@gmx.de> 
- *
- * This file is part of avcap.
- *
- * avcap is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * avcap 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with avcap.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/* avcap is free for non-commercial use.
- * To use it in commercial endeavors, please contact Nico Pranke <Nico.Pranke@googlemail.com>.
- */
-
-
-#ifndef FORMATNAMES_H_
-#define FORMATNAMES_H_
-
-#include <string>
-#include <uuids.h>
-
-void GetVideoFormatName(const GUID* guid, std::string& FormatName)
-{
-	// list creation date:05/27/2005 - taken from DirectShow documentation
-
-	// Uncompressed RGB video subtypes
-	if (*guid==MEDIASUBTYPE_ARGB1555) {
-		FormatName="RGB 555 with alpha channel";
-		return;
-	}
-	if (*guid==MEDIASUBTYPE_ARGB4444) {
-		FormatName="16-bit RGB with alpha channel; 4 bits per channel";
-		return;
-	}
-	if (*guid==MEDIASUBTYPE_ARGB32) {
-		FormatName="RGB 32 with alpha channel";
-		return;
-	}
-	if (*guid==MEDIASUBTYPE_A2R10G10B10) {
-		FormatName
-				="32-bit RGB with alpha channel; 10 bits per RGB channel plus 2 bits for alpha";
-		return;
-	}
-	if (*guid==MEDIASUBTYPE_A2B10G10R10) {
-		FormatName
-				="32-bit RGB with alpha channel; 10 bits per RGB channel plus 2 bits for alpha";
-		return;
-	}
-	if (*guid==MEDIASUBTYPE_RGB1) {
-		FormatName="RGB, 1 bit per pixel (bpp), palettized";
-		return;
-	}
-	if (*guid==MEDIASUBTYPE_RGB4) {
-		FormatName="RGB, 4 bpp, palettized";
-		return;
-	}
-	if (*guid==MEDIASUBTYPE_RGB8) {
-		FormatName="RGB, 8 bpp";
-		return;
-	}
-	if (*guid==MEDIASUBTYPE_RGB555) {
-		FormatName="RGB 555, 16 bpp";
-		return;
-	}
-	if (*guid==MEDIASUBTYPE_RGB565) {
-		FormatName="RGB 565, 16 bpp";
-		return;
-	}
-	if (*guid==MEDIASUBTYPE_RGB24) {
-		FormatName="RGB, 24 bpp";
-		return;
-	}
-	if (*guid==MEDIASUBTYPE_RGB32) {
-		FormatName="RGB, 32 bpp";
-		return;
-	}
-
-	// DV video subtypes
-	if (*guid==MEDIASUBTYPE_dvsl) {
-		FormatName="DV, 12.5 Mbps SD-DVCR 525-60 or SD-DVCR 625-50";
-		return;
-	}
-	if (*guid==MEDIASUBTYPE_dvsd) {
-		FormatName="DV, 25 Mbps SDL-DVCR 525-60 or SDL-DVCR 625-50";
-		return;
-	}
-	if (*guid==MEDIASUBTYPE_dvhd) {
-		FormatName="DV, 50 Mbps HD-DVCR 1125-60 or HD-DVCR 1250-50";
-		return;
-	}
-	if (*guid==MEDIASUBTYPE_dv25) {
-		FormatName="DV, 25 Mbps DVCPRO 25 (525-60 or 625-50)";
-		return;
-	}
-	if (*guid==MEDIASUBTYPE_dv50) {
-		FormatName="DV, 50 Mbps DVCPRO 50 (525-60 or 625-50)";
-		return;
-	}
-	if (*guid==MEDIASUBTYPE_dvh1) {
-		FormatName="DV, 100 Mbps DVCPRO 100 (1080/60i, 1080/50i, or 720/60P)";
-		return;
-	}
-
-	// YUV video subtypes
-	if (*guid==MEDIASUBTYPE_AYUV) {
-		FormatName="4:4:4 YUV formats";
-		return;
-	}
-	if (*guid==MEDIASUBTYPE_UYVY) {
-		FormatName="UYVY (packed 4:2:2)";
-		return;
-	}
-	if (*guid==MEDIASUBTYPE_Y411) {
-		FormatName="Y411 (packed 4:1:1)";
-		return;
-	}
-	if (*guid==MEDIASUBTYPE_Y41P) {
-		FormatName="Y41P (packed 4:1:1)";
-		return;
-	}
-	if (*guid==MEDIASUBTYPE_Y211) {
-		FormatName="Y211";
-		return;
-	}
-	if (*guid==MEDIASUBTYPE_YUY2) {
-		FormatName="YUYV (packed 4:2:2)";
-		return;
-	}
-	if (*guid==MEDIASUBTYPE_YVYU) {
-		FormatName="YVYU (packed 4:2:2)";
-		return;
-	}
-	if (*guid==MEDIASUBTYPE_YUYV) {
-		FormatName="YUYV (packed 4:2:2)(Used by Canopus; FOURCC 'YUYV')";
-		return;
-	}
-	if (*guid==MEDIASUBTYPE_IF09) {
-		FormatName="Indeo YVU9";
-		return;
-	}
-	if (*guid==MEDIASUBTYPE_IYUV) {
-		FormatName="IYUV";
-		return;
-	}
-	/*
-	if (*guid==MEDIASUBTYPE_I420) {
-		FormatName="I420";
-		return;
-	}
-	*/
-	if (*guid==MEDIASUBTYPE_YV12) {
-		FormatName="YV12";
-		return;
-	}
-	if (*guid==MEDIASUBTYPE_YVU9) {
-		FormatName="YVU9";
-		return;
-	}
-
-	// Miscellaneous video subtypes
-	if (*guid==MEDIASUBTYPE_CFCC) {
-		FormatName="MJPG format produced by some cards. (FOURCC 'CFCC')";
-		return;
-	}
-	if (*guid==MEDIASUBTYPE_CLJR) {
-		FormatName="Cirrus Logic CLJR format. (FOURCC 'CLJR')";
-		return;
-	}
-	if (*guid==MEDIASUBTYPE_CPLA) {
-		FormatName="Cinepak UYVY format. (FOURCC 'CPLA')";
-		return;
-	}
-	if (*guid==MEDIASUBTYPE_CLPL) {
-		FormatName
-				="A YUV format supported by some Cirrus Logic drivers. (FOURCC 'CLPL')";
-		return;
-	}
-	if (*guid==MEDIASUBTYPE_IJPG) {
-		FormatName="Intergraph JPEG format. (FOURCC 'IJPG')";
-		return;
-	}
-	if (*guid==MEDIASUBTYPE_MDVF) {
-		FormatName="A DV encoding format. (FOURCC 'MDVF')";
-		return;
-	}
-	if (*guid==MEDIASUBTYPE_MJPG) {
-		FormatName="Motion JPEG (MJPG) compressed video. (FOURCC 'MJPG')";
-		return;
-	}
-	if (*guid==MEDIASUBTYPE_MPEG1Packet) {
-		FormatName="MPEG1 Video Packet";
-		return;
-	}
-	if (*guid==MEDIASUBTYPE_MPEG1Payload) {
-		FormatName="MPEG1 Video Payload";
-		return;
-	}
-	if (*guid==MEDIASUBTYPE_Overlay) {
-		FormatName="Video delivered using hardware overlay";
-		return;
-	}
-	if (*guid==MEDIASUBTYPE_Plum) {
-		FormatName="Plum MJPG format. (FOURCC 'Plum')";
-		return;
-	}
-	if (*guid==MEDIASUBTYPE_QTJpeg) {
-		FormatName="QuickTime JPEG compressed data";
-		return;
-	}
-	if (*guid==MEDIASUBTYPE_QTMovie) {
-		FormatName="Apple® QuickTime® compression";
-		return;
-	}
-	if (*guid==MEDIASUBTYPE_QTRle) {
-		FormatName="QuickTime RLE compressed data";
-		return;
-	}
-	if (*guid==MEDIASUBTYPE_QTRpza) {
-		FormatName="QuickTime RPZA compressed data";
-		return;
-	}
-	if (*guid==MEDIASUBTYPE_QTSmc) {
-		FormatName="QuickTime SMC compressed data";
-		return;
-	}
-	if (*guid==MEDIASUBTYPE_TVMJ) {
-		FormatName="TrueVision MJPG format. (FOURCC 'TVMJ')";
-		return;
-	}
-	if (*guid==MEDIASUBTYPE_VPVBI) {
-		FormatName="Video port vertical blanking interval (VBI) data";
-		return;
-	}
-	if (*guid==MEDIASUBTYPE_VPVideo) {
-		FormatName="Video port video data";
-		return;
-	}
-	if (*guid==MEDIASUBTYPE_WAKE) {
-		FormatName="MJPG format produced by some cards. (FOURCC 'WAKE')";
-		return;
-	}
-
-	if (*guid==MEDIASUBTYPE_MPEG1Video) {
-		FormatName="MPEG1 Video";
-		return;
-	}
-	if (*guid==MEDIASUBTYPE_MPEG2_VIDEO) {
-		FormatName="MPEG2 Video";
-		return;
-	}
-
-	FormatName="Unknown format type!";
-	return;
-}
-
-void GetVideoStandardName(ULONG VideoStandard,
-		std::list<avcap::VideoStandard*>& VidStandard)
-{
-	// list creation date:05/27/2005 - taken from DirectShow documentation
-
-	if (VideoStandard & AnalogVideo_None) {
-		avcap::VideoStandard *vidSt=new avcap::VideoStandard("Digital sensor", 0);
-		VidStandard.push_back(vidSt);
-	}
-	if (VideoStandard & AnalogVideo_NTSC_M) {
-		avcap::VideoStandard *vidSt=new avcap::VideoStandard("NTSC (M) standard, 7.5 IRE black", 0x1);
-		VidStandard.push_back(vidSt);
-	}
-	if (VideoStandard & AnalogVideo_NTSC_M_J) {
-		avcap::VideoStandard *vidSt=new avcap::VideoStandard("NTSC (M) standard, 0 IRE black (Japan)", 0x2);
-		VidStandard.push_back(vidSt);
-	}
-	if (VideoStandard & AnalogVideo_NTSC_433) {
-		avcap::VideoStandard *vidSt=new avcap::VideoStandard("NTSC-433", 0x4);
-		VidStandard.push_back(vidSt);
-	}
-	if (VideoStandard & AnalogVideo_PAL_B) {
-		avcap::VideoStandard *vidSt=new avcap::VideoStandard("PAL-B standard", 0x10);
-		VidStandard.push_back(vidSt);
-	}
-	if (VideoStandard & AnalogVideo_PAL_D) {
-		avcap::VideoStandard *vidSt=new avcap::VideoStandard("PAL (D) standard", 0x20);
-		VidStandard.push_back(vidSt);
-	}
-	if (VideoStandard & AnalogVideo_PAL_G) {
-		avcap::VideoStandard *vidSt=new avcap::VideoStandard("PAL (G) standard", 0x40);
-		VidStandard.push_back(vidSt);
-	}
-	if (VideoStandard & AnalogVideo_PAL_H) {
-		avcap::VideoStandard *vidSt=new avcap::VideoStandard("PAL (H) standard", 0x80);
-		VidStandard.push_back(vidSt);
-	}
-	if (VideoStandard & AnalogVideo_PAL_I) {
-		avcap::VideoStandard *vidSt=new avcap::VideoStandard("PAL (I) standard", 0x100);
-		VidStandard.push_back(vidSt);
-	}
-	if (VideoStandard & AnalogVideo_PAL_M) {
-		avcap::VideoStandard *vidSt=new avcap::VideoStandard("PAL (M) standard", 0x200);
-		VidStandard.push_back(vidSt);
-	}
-	if (VideoStandard & AnalogVideo_PAL_N) {
-		avcap::VideoStandard *vidSt=new avcap::VideoStandard("PAL (N) standard", 0x400);
-		VidStandard.push_back(vidSt);
-	}
-	if (VideoStandard & AnalogVideo_PAL_60) {
-		avcap::VideoStandard *vidSt=new avcap::VideoStandard("PAL-60 standard", 0x800);
-		VidStandard.push_back(vidSt);
-	}
-	if (VideoStandard & AnalogVideo_SECAM_B) {
-		avcap::VideoStandard *vidSt=new avcap::VideoStandard("SECAM (B) standard", 0x1000);
-		VidStandard.push_back(vidSt);
-	}
-	if (VideoStandard & AnalogVideo_SECAM_D) {
-		avcap::VideoStandard *vidSt=new avcap::VideoStandard("SECAM (D) standard", 0x2000);
-		VidStandard.push_back(vidSt);
-	}
-	if (VideoStandard & AnalogVideo_SECAM_G) {
-		avcap::VideoStandard *vidSt=new avcap::VideoStandard("SECAM (G) standard", 0x4000);
-		VidStandard.push_back(vidSt);
-	}
-	if (VideoStandard & AnalogVideo_SECAM_H) {
-		avcap::VideoStandard *vidSt=new avcap::VideoStandard("SECAM (H) standard", 0x8000);
-		VidStandard.push_back(vidSt);
-	}
-	if (VideoStandard & AnalogVideo_SECAM_K) {
-		avcap::VideoStandard *vidSt=new avcap::VideoStandard("SECAM (K) standard", 0x10000);
-		VidStandard.push_back(vidSt);
-	}
-	if (VideoStandard & AnalogVideo_SECAM_K1) {
-		avcap::VideoStandard *vidSt=new avcap::VideoStandard("SECAM (K1) standard", 0x20000);
-		VidStandard.push_back(vidSt);
-	}
-	if (VideoStandard & AnalogVideo_SECAM_L) {
-		avcap::VideoStandard *vidSt=new avcap::VideoStandard("SECAM (L) standard", 0x40000);
-		VidStandard.push_back(vidSt);
-	}
-	if (VideoStandard & AnalogVideo_SECAM_L1) {
-		avcap::VideoStandard *vidSt=new avcap::VideoStandard("SECAM (L1) standard", 0x80000);
-		VidStandard.push_back(vidSt);
-	}
-	if (VideoStandard & AnalogVideo_PAL_N_COMBO) {
-		avcap::VideoStandard *vidSt=new avcap::VideoStandard("Combination (N) PAL standard (Argentina)", 0x100000);
-		VidStandard.push_back(vidSt);
-	}
-}
-
-#endif // FORMATNAMES_H_

gpac-2.2.1.tar.gz/extra_lib/include/avcap/windows/HelpFunc.h Deleted

@@ -1,410 +0,0 @@
-/*
- * (c) 2005, 2008 Nico Pranke <Nico.Pranke@googlemail.com>, Robin Luedtke <RobinLu@gmx.de> 
- *
- * This file is part of avcap.
- *
- * avcap is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * avcap 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with avcap.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/* avcap is free for non-commercial use.
- * To use it in commercial endeavors, please contact Nico Pranke <Nico.Pranke@googlemail.com>.
- */
-
-
-#ifndef HELPFUNC_H_
-#define HELPFUNC_H_
-
-#include <list>
-#include <math.h>
-#include <string>
-
-#include <DShow.h> // DirectShow
-#include <mtype.h> // DeleteMediaType() function
-#include <qedit.h> // CLSID_NullRenderer/CLSID_ISampleGrabber definitions
-#include <winnls.h>
-
-#ifndef __STREAMS__
-# include <streams.h>
-#endif
-
-// Some definitions
-#define VIDEO_SAMPLEGRABBER_FILTER_NAME L"SampleGrabber Video"
-#define AUDIO_SAMPLEGRABBER_FILTER_NAME L"SampleGrabber Audio"
-
-#define CAP_VIDEO_CAPTURE  0x00000001  /* Is a video capture device */
-#define CAP_VIDEO_OUTPUT   0x00000002  /* Is a video output device */
-#define CAP_VIDEO_OVERLAY  0x00000004  /* Can do video overlay */
-#define CAP_VBI_CAPTURE    0x00000010  /* Is a VBI capture device */
-
-#define CAP_TUNERDEVICE	   0x00010000  /* Has radio tuner or tv tuner */
-#define CAP_TUNER          0x00020000  /* Has a tuner */
-#define CAP_AUDIO_CAPTURE  0x00040000  /* Has audio support */
-#define CAP_RADIO		   0x00080000  /* Is a radio device */
-
-// Helper Functions -> see end of file
-static inline void DeleteList(std::list<IPin*> &PinList);
-
-static inline void DeleteList(std::list<IBaseFilter*> &AudioCaptureFilterList);
-
-static inline void DeleteList(std::list<AM_MEDIA_TYPE*> &MediaTypeList);
-
-static inline void EnumMediaTypesOnPin(IPin *Pin,
-		std::list<AM_MEDIA_TYPE*> &MediaTypeList);
-
-static inline void EnumPinsOnFilter(IBaseFilter *Filter,
-		std::list<IPin*> &PinList);
-
-static inline bool GetFilterGraphFromFilter(IBaseFilter *Filter,
-		IGraphBuilder **FilterGraph,
-		ICaptureGraphBuilder2 **CaptureGraphBuilder=NULL);
-
-static inline char* WChar2Char(const wchar_t* szWChar);
-
-static inline bool FindTunerRadioSupport(IBaseFilter *CaptureFilter,
-		int *Capabilities);
-
-static inline bool RenderStream(IUnknown *FilterOrPinToRender,
-		bool RenderVideo, bool RenderAudio);
-
-static inline bool GetInstalledDeviceIDs(
-		std::list<std::string> &UniqueDeviceIDList);
-
-static inline std::string bstr2string(BSTR bstr);
-
-static inline std::string bstr2string(BSTR bstr)
-{
-
-	int length = ((DWORD*) bstr)0;
-	wchar_t* wchar_data = (wchar_t*) (((DWORD*) bstr) );
-
-	int converted_length = WideCharToMultiByte(CP_ACP, 0, wchar_data, -1, 0, 0,
-			0, 0);
-	char* char_data = new charconverted_length;
-	WideCharToMultiByte(CP_ACP, 0, wchar_data, -1, char_data, converted_length,
-			0, 0);
-	std::string res = char_data;
-	delete char_data;
-	return res;
-}
-
-//######################### DEBUG FUNCTIONS - MAKE THE FILTERGRAPH VISIBLE IN GRPAHEDIT ###################
-
-static inline void EnumMediaTypesOnPin(IPin *Pin,
-		std::list<AM_MEDIA_TYPE*> &MediaTypeList)
-{
-	QzCComPtr<IEnumMediaTypes> EnumMediaTypes;
-	if (Pin->EnumMediaTypes(&EnumMediaTypes)==S_OK) {
-		AM_MEDIA_TYPE *MediaType=NULL;
-		while (EnumMediaTypes->Next(1, &MediaType, NULL) == S_OK) {
-			MediaTypeList.push_back(MediaType);
-		}
-	}
-}
-
-static inline void EnumPinsOnFilter(IBaseFilter *Filter,
-		std::list<IPin*> &PinList)
-{
-	QzCComPtr<IEnumPins> EnumPins;
-	IPin *Pin=NULL;
-	if (Filter->EnumPins(&EnumPins)==S_OK) {
-		while (EnumPins->Next(1, &Pin, 0) == S_OK) {
-			PinList.push_back(Pin);
-		}
-	}
-}
-
-static inline bool GetFilterGraphFromFilter(IBaseFilter *Filter,
-		IGraphBuilder **FilterGraph,
-		ICaptureGraphBuilder2 **CaptureGraphBuilder)
-{
-	if (Filter==NULL) {
-		return false;
-	}
-	// Get the FilterGraph from the Filter
-	FILTER_INFO FilterInfo;
-	if (FAILED(Filter->QueryFilterInfo(&FilterInfo))) {
-		return false;
-	}
-	if (FilterInfo.pGraph==NULL) {
-		return false;
-	}
-	if (FAILED(FilterInfo.pGraph->QueryInterface(IID_IGraphBuilder,
-			(void**) &*FilterGraph))) {
-		return false;
-	}
-	// Get the CaptureGraphBuilder2
-	// CaptureGraphBuilder is useful for building many kinds of custom filter graphs, not only capture graphs
-	if (CaptureGraphBuilder!=NULL) {
-		if (FAILED(CoCreateInstance(CLSID_CaptureGraphBuilder2, NULL,
-				CLSCTX_INPROC_SERVER, IID_ICaptureGraphBuilder2,
-				(void**)&*CaptureGraphBuilder))) {
-			return false;
-		}
-		if (FAILED((*CaptureGraphBuilder)->SetFiltergraph(*FilterGraph))) {
-			return false;
-		}
-	}
-
-	return true;
-}
-
-static inline char* WChar2Char(const wchar_t* szWChar)
-{
-	if (szWChar == NULL) {
-		return NULL;
-	}
-	char* szChar = NULL;
-	size_t size = 0;
-	if ((size = wcstombs(0, szWChar, 0)) == -1) {
-		return NULL;
-	}
-	szChar = new charsize + 1;
-	szCharsize = 0;
-	wcstombs(szChar, szWChar, size);
-	return szChar;
-}
-
-static inline bool FindTunerRadioSupport(IBaseFilter *CaptureFilter,
-		int *Capabilities)
-{
-	if (CaptureFilter==NULL) {
-		return false;
-	}
-
-	// Get the CaptureBuilderGraph COM-Interface from CaptureFilter
-	QzCComPtr<ICaptureGraphBuilder2> CaptureGraphBuilder;
-	QzCComPtr<IGraphBuilder> FilterGraph;
-	if (!GetFilterGraphFromFilter(CaptureFilter, &FilterGraph,
-			&CaptureGraphBuilder)) {
-		return false;
-	}
-
-	// Look for the tuner, radio
-	QzCComPtr<IAMTVTuner> Tuner;
-	if (SUCCEEDED(CaptureGraphBuilder->FindInterface(&LOOK_UPSTREAM_ONLY, NULL,
-			CaptureFilter, IID_IAMTVTuner, (void**)&Tuner))) {
-		long lModes = 0;
-		HRESULT hr = Tuner->GetAvailableModes(&lModes);
-		if (SUCCEEDED(hr) && (lModes & AMTUNER_MODE_FM_RADIO)) {
-			*Capabilities |= CAP_RADIO;
-		}
-		if (SUCCEEDED(hr) && (lModes & AMTUNER_MODE_TV)) {
-			*Capabilities |= CAP_TUNER;
-		}
-	}
-
-	return true;
-}
-
-static inline void GetInstalledAudioDevices(
-		std::list<IBaseFilter*> &AudioCaptureFilterList)
-{
-	// Enumerate the audio category
-	std::list<CLSID> EnumCategoriesList;
-	EnumCategoriesList.push_back(CLSID_AudioInputDeviceCategory);
-
-	for (std::list<CLSID>::iterator EnumCategoriesListIter=
-			EnumCategoriesList.begin(); EnumCategoriesListIter
-			!=EnumCategoriesList.end(); EnumCategoriesListIter++) {
-		// Create the System Device Enumerator.
-		HRESULT hr;
-		ICreateDevEnum *SysDevEnum = NULL;
-		if (FAILED(CoCreateInstance(CLSID_SystemDeviceEnum, NULL,
-				CLSCTX_INPROC_SERVER, IID_ICreateDevEnum, (void **)&SysDevEnum))) {
-			return;
-		}
-
-		// Obtain a class enumerator for the device capture category.
-		IEnumMoniker *EnumCat = NULL;
-		hr = SysDevEnum->CreateClassEnumerator(*EnumCategoriesListIter,
-				&EnumCat, 0);
-
-		if (hr == S_OK) {
-			// Enumerate the monikers.
-			IMoniker *Moniker = NULL;
-			ULONG Fetched;
-			while (EnumCat->Next(1, &Moniker, &Fetched) == S_OK) {
-				IBaseFilter *AudioCaptureFilter=NULL;
-				if (SUCCEEDED(Moniker->BindToObject(0, 0, IID_IBaseFilter,
-						(void**)&AudioCaptureFilter))) {
-					AudioCaptureFilterList.push_back(AudioCaptureFilter);
-				}
-				else {
-					if (AudioCaptureFilter!=NULL) {
-						AudioCaptureFilter->Release();
-					}
-				}
-				Moniker->Release();
-			}
-			EnumCat->Release();
-		}
-		SysDevEnum->Release();
-	}
-}
-
-static inline bool RenderStream(IUnknown *FilterOrPinToRender,
-		bool RenderVideo, bool RenderAudio)
-{
-	QzCComPtr<IGraphBuilder> FilterGraph;
-	QzCComPtr<ICaptureGraphBuilder2> CaptureGraphBuilder;
-
-	// Get the IGraphBuilder and CaptureGraphBuilder2 interfaces from pin or filter
-	QzCComPtr<IPin> Pin;
-	bool IsPin=false;
-	if (SUCCEEDED(FilterOrPinToRender->QueryInterface(IID_IPin, (void**)&Pin))) // It's a pin
-	{
-		PIN_INFO PinInfo;
-		Pin->QueryPinInfo(&PinInfo);
-		IsPin=true;
-
-		if (!GetFilterGraphFromFilter(PinInfo.pFilter, &FilterGraph,
-				&CaptureGraphBuilder)) {
-			return false;
-		}
-	}
-	else // It's a filter
-	{
-		if (!GetFilterGraphFromFilter((IBaseFilter*)FilterOrPinToRender,
-				&FilterGraph, &CaptureGraphBuilder)) {
-			return false;
-		}
-	}
-
-	//if(SUCCEEDED(CaptureGraphBuilder->RenderStream(&PIN_CATEGORY_CAPTURE, &MEDIATYPE_Interleaved, CaptureFilter, NULL, NullRendererVideo))){return true;}
-
-	// Build complete filter graph
-	if (RenderVideo) {
-		// Add NullRenderer filters because we want to set formats with IAMStreamConfig COM-Interface while the complete
-		// filtergraph is connected. NullRenderer filters and the samplegrabber filter accept all formats.
-		QzCComPtr<IBaseFilter> RendererVideo;
-		if (FAILED(CoCreateInstance(CLSID_NullRenderer, 0,
-				CLSCTX_INPROC_SERVER, IID_IBaseFilter, (void**)&RendererVideo))) {
-			return false;
-		}
-		if (FAILED(FilterGraph->AddFilter(RendererVideo,L"Video Null Renderer" ))) {return false;}
-		QzCComPtr<IBaseFilter> SampleGrabberVideo;
-		if(FAILED(CoCreateInstance(CLSID_SampleGrabber, 0, CLSCTX_INPROC_SERVER, IID_IBaseFilter, (void**)&SampleGrabberVideo))) {return false;}
-		if(FAILED(FilterGraph->AddFilter(SampleGrabberVideo, VIDEO_SAMPLEGRABBER_FILTER_NAME))) {return false;}
-		// Set the video samplegrabber
-		QzCComPtr<ISampleGrabber> SampleGrabber;
-		if(FAILED(SampleGrabberVideo->QueryInterface(IID_ISampleGrabber, (void**)&SampleGrabber))) {return false;}
-		AM_MEDIA_TYPE mt;
-		mt.majortype=MEDIATYPE_Video;
-		mt.subtype=GUID_NULL;
-		mt.pUnk=NULL;
-		mt.cbFormat=0;
-		if(FAILED(SampleGrabber->SetMediaType(&mt))) {return false;}
-		//render the pin or filter
-		if(FAILED(CaptureGraphBuilder->RenderStream(&PIN_CATEGORY_CAPTURE, &MEDIATYPE_Video, FilterOrPinToRender, SampleGrabberVideo, RendererVideo))) {return false;}
-	}
-
-	if(RenderAudio)
-	{
-		// Add NullRenderer filters because we want to set formats with IAMStreamConfig COM-Interface while the complete
-		// filtergraph is connected. NullRenderer filters and the SampleGrabber filter accept all formats.
-		QzCComPtr<IBaseFilter> RendererAudio;
-		CoCreateInstance(CLSID_NullRenderer, 0, CLSCTX_INPROC_SERVER, IID_IBaseFilter, (void**)&RendererAudio); //CLSID_DSoundRender for DirectSound Filter
-		FilterGraph->AddFilter(RendererAudio, L"Audio Null Renderer");
-		QzCComPtr<IBaseFilter> SampleGrabberAudio;
-		CoCreateInstance(CLSID_SampleGrabber, 0, CLSCTX_INPROC_SERVER, IID_IBaseFilter, (void**)&SampleGrabberAudio);
-		FilterGraph->AddFilter(SampleGrabberAudio, AUDIO_SAMPLEGRABBER_FILTER_NAME);
-		// Set the audio samplegrabber filter
-		QzCComPtr<ISampleGrabber> SampleGrabber;
-		SampleGrabberAudio->QueryInterface(IID_ISampleGrabber, (void**)&SampleGrabber);
-		AM_MEDIA_TYPE mt;
-		mt.majortype=MEDIATYPE_Audio;
-		mt.subtype=GUID_NULL;
-		mt.pUnk=NULL;
-		mt.cbFormat=0;
-		SampleGrabber->SetMediaType(&mt);
-
-		//Render Audio
-		if(IsPin) //if we should render a pin
-		{
-			HRESULT hr=CaptureGraphBuilder->RenderStream(&PIN_CATEGORY_CAPTURE, &MEDIATYPE_Audio, FilterOrPinToRender, SampleGrabberAudio, RendererAudio);
-			if(hr!=S_OK) {return false;}
-		}
-		// If we should render a filter
-
-		else if(FAILED(CaptureGraphBuilder->RenderStream(&PIN_CATEGORY_CAPTURE, &MEDIATYPE_Audio, FilterOrPinToRender, SampleGrabberAudio, RendererAudio)))
-		{
-			/* The avcap library doesn't provide full audio support at this time. There are only some basic audio
-			 functions implemented (not implemented: audio capture functions, ...)*/
-
-			/* Some notes about DirectShow and audio capture
-			 - Old VFW driver based capture devices don't support audio.
-			 - New WDM driver based capture devices can support audio:
-			 1. The capture filter has audio output pins which have to be connected to a sound rendering DirectShow filter
-			 2. The capture filter has crossbar support and the audio output pins are on the crossbar and have to
-			 be connected to a sound rendering DirectShow filter.
-			 3. Many capture devices (e.g. tv tuner cards) don't provide direct audio support. They have audio
-			 connectors which have to be connected to a soundcard by cable. The soundcard takes up the
-			 capture process of the audio data. In this case, a soundcard capture DirectShow filter is needed.
-			 What we do if the function above fails?? We insert a audio capture DirectShow filter in the filtergraph
-			 and connect it to the sound rendering DirectShow filter. What can we do if multiple soundcards
-			 are installed - which audio capture DirectShow filter should we use?? Normally the user has to choose the
-			 audio capture DirectShow filter. But because of the uncomplete audio implementation of the avcap library 
-			 we use the first audio capture DirectShow Filter we'll find in the system. */
-
-			/* TODO: Complete the audio functionality */
-
-			std::list<IBaseFilter*> AudioCaptureFilterList;
-			GetInstalledAudioDevices(AudioCaptureFilterList);
-			for(std::list<IBaseFilter*>::iterator Iter=AudioCaptureFilterList.begin(); Iter!=AudioCaptureFilterList.end(); Iter++)
-			{
-				FilterGraph->AddFilter((*Iter), L"AudioCaptureFilter");
-				if(SUCCEEDED(CaptureGraphBuilder->RenderStream(NULL, &MEDIATYPE_Audio, (*Iter), SampleGrabberAudio, RendererAudio)))
-				{
-					break;
-				}
-				FilterGraph->RemoveFilter((*Iter));
-			}
-			DeleteList(AudioCaptureFilterList);
-		}
-	}
-
-	return true;
-}
-
-static inline void DeleteList(std::list<IPin*> &PinList)
-{
-	for (std::list<IPin*>::iterator Iter=PinList.begin(); Iter!=PinList.end(); Iter++) {
-		if ((*Iter)!=NULL) {
-			(*Iter)->Release();
-		}
-	}
-	PinList.clear();
-}
-
-static inline void DeleteList(std::list<IBaseFilter*> &AudioCaptureFilterList)
-{
-	for (std::list<IBaseFilter*>::iterator Iter=AudioCaptureFilterList.begin(); Iter
-			!=AudioCaptureFilterList.end(); Iter++) {
-		if ((*Iter)!=NULL) {
-			(*Iter)->Release();
-		}
-	}
-	AudioCaptureFilterList.clear();
-}
-
-static inline void DeleteList(std::list<AM_MEDIA_TYPE*> &MediaTypeList)
-{
-	for (std::list<AM_MEDIA_TYPE*>::iterator Iter=MediaTypeList.begin(); Iter
-			!=MediaTypeList.end(); Iter++) {
-		DeleteMediaType(*Iter);
-	}
-	MediaTypeList.clear();
-}
-
-#endif

gpac-2.2.1.tar.gz/extra_lib/include/avcap/windows/SampleGrabberCallback.h Deleted

@@ -1,86 +0,0 @@
-/*
- * (c) 2005, 2008 Nico Pranke <Nico.Pranke@googlemail.com>, Robin Luedtke <RobinLu@gmx.de> 
- *
- * This file is part of avcap.
- *
- * avcap is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * avcap 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with avcap.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/* avcap is free for non-commercial use.
- * To use it in commercial endeavors, please contact Nico Pranke <Nico.Pranke@googlemail.com>.
- */
-
-#ifndef SAMPLEGRABBER_H_
-#define SAMPLEGRABBER_H_
-
-#include "QEdit.h"
-
-#include "IOBuffer.h"
-#include "avcap-export.h"
-
-namespace avcap
-{
-class DS_VidCapManager;
-
-	//! Data capture handler for DirectShow devices.
-	
-	/*! Each time new data arrives, the method
-	 * SampleCB() is called and delivers the data to the video capture 
-	 * manager set by the SetVideoCaptureManager() method.*/
-
-	class AVCAP_Export SampleGrabberCallback : public ISampleGrabberCB
-	{
-	private:
-		DS_VidCapManager* 	mVidCapMngr;
-		ISampleGrabber* 	mSampleGrabberFilter;
-		HANDLE&				mLock;
-
-	public:
-		SampleGrabberCallback(HANDLE& lock);
-		
-		~SampleGrabberCallback();
-	
-		/*! Sets the video capture manager. 
-		 * New data will be delivered to the video capture manager.
-		 * \param vidCapManager The video capture manager. */
-		void SetVideoCaptureManager(DS_VidCapManager *vidCapManager);
-	
-		/*! Sets the samplegrabber filter. 
-		 * Needed to get some information (e.g. currently used format).
-		 * \param SampleGrabberFilter The samplegrabber filter. */
-		void SetSampleGrabberFilter(ISampleGrabber *SampleGrabberFilter);
-	
-		/* Fake referance counting - This is safe because the application 
-		 * creates the object on the stack, and the object remains in scope 
-		 * throughout the lifetime of the filter graph.*/
-		STDMETHODIMP_(ULONG) AddRef() 
-			{ return 1; }
-		
-		STDMETHODIMP_(ULONG) Release() 
-			{ return 2; }
-
-		STDMETHODIMP QueryInterface(REFIID riid, void **ppvObject);
-	
-		/*! New data (captured data) arrives here and will be
-		 * delivered to the video capture manager set 
-		 * by the SetVideoCaptureManager() method. */
-		STDMETHODIMP SampleCB(double Time, IMediaSample *pSample);
-
-		STDMETHODIMP BufferCB(double Time, BYTE *pBuffer, long BufferLen);
-	
-		friend class IOBuffer;
-	};
-}
-
-#endif // SAMPLEGRABBER_H_

gpac-2.2.1.tar.gz/extra_lib/include/faad.h Deleted

@@ -1,35 +0,0 @@
-/*
-** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding
-** Copyright (C) 2003-2005 M. Bakker, Nero AG, http://www.nero.com
-**  
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-** 
-** This program 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 General Public License for more details.
-** 
-** You should have received a copy of the GNU General Public License
-** along with this program; if not, write to the Free Software 
-** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-**
-** Any non-GPL usage of this software or parts of this software is strictly
-** forbidden.
-**
-** The "appropriate copyright message" mentioned in section 2c of the GPLv2
-** must read: "Code from FAAD2 is copyright (c) Nero AG, www.nero.com"
-**
-** Commercial non-GPL licensing of this software is possible.
-** For more info contact Nero AG through Mpeg4AAClicense@nero.com.
-**
-** $Id: faad.h,v 1.2 2008-12-02 18:04:42 jeanlf Exp $
-**/
-
-/* warn people for update */
-//#pragma message("please update faad2 include filename and function names!")
-
-/* Backwards compatible link */
-#include "neaacdec.h"

gpac-2.2.1.tar.gz/extra_lib/include/freetype Deleted

gpac-2.2.1.tar.gz/extra_lib/include/freetype/freetype Deleted

gpac-2.2.1.tar.gz/extra_lib/include/freetype/freetype/cache Deleted

gpac-2.2.1.tar.gz/extra_lib/include/freetype/freetype/cache/ftccache.h Deleted

@@ -1,304 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  ftccache.h                                                             */
-/*                                                                         */
-/*    FreeType internal cache interface (specification).                   */
-/*                                                                         */
-/*  Copyright 2000-2001, 2002 by                                           */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef __FTCCACHE_H__
-#define __FTCCACHE_H__
-
-
-/* define to allow cache lookup inlining */
-#define  FTC_CACHE_USE_INLINE
-
-
-FT_BEGIN_HEADER
-
-  /* handle to cache object */
-  typedef struct FTC_CacheRec_*  FTC_Cache;
-
-  /* handle to cache class */
-  typedef const struct FTC_Cache_ClassRec_*  FTC_Cache_Class;
-
-  /* handle to cache node family */
-  typedef struct FTC_FamilyRec_*  FTC_Family;
-
-  /* handle to cache root query */
-  typedef struct FTC_QueryRec_*  FTC_Query;
-
-
-  /*************************************************************************/
-  /*************************************************************************/
-  /*****                                                               *****/
-  /*****                   CACHE NODE DEFINITIONS                      *****/
-  /*****                                                               *****/
-  /*************************************************************************/
-  /*************************************************************************/
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* Each cache controls one or more cache nodes.  Each node is part of    */
-  /* the global_lru list of the manager.  Its `data' field however is used */
-  /* as a reference count for now.                                         */
-  /*                                                                       */
-  /* A node can be anything, depending on the type of information held by  */
-  /* the cache.  It can be an individual glyph image, a set of bitmaps     */
-  /* glyphs for a given size, some metrics, etc.                           */
-  /*                                                                       */
-  /*************************************************************************/
-
-  /* structure size should be 20 bytes on 32-bits machines */
-  typedef struct  FTC_NodeRec_
-  {
-    FTC_Node   mru_next;     /* circular mru list pointer           */
-    FTC_Node   mru_prev;     /* circular mru list pointer           */
-    FTC_Node   link;         /* used for hashing                    */
-    FT_UInt32  hash;         /* used for hashing too                */
-    FT_UShort  fam_index;    /* index of family the node belongs to */
-    FT_Short   ref_count;    /* reference count for this node       */
-
-  } FTC_NodeRec;
-
-
-#define FTC_NODE( x )    ( (FTC_Node)(x) )
-#define FTC_NODE_P( x )  ( (FTC_Node*)(x) )
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* These functions are exported so that they can be called from          */
-  /* user-provided cache classes; otherwise, they are really part of the   */
-  /* cache sub-system internals.                                           */
-  /*                                                                       */
-
-  /* can be used as a FTC_Node_DoneFunc */
-  FT_EXPORT( void )
-  ftc_node_done( FTC_Node   node,
-                 FTC_Cache  cache );
-
-  /* reserved for manager's use */
-  FT_EXPORT( void )
-  ftc_node_destroy( FTC_Node     node,
-                    FTC_Manager  manager );
-
-
-  /*************************************************************************/
-  /*************************************************************************/
-  /*****                                                               *****/
-  /*****                   CACHE QUERY DEFINITIONS                     *****/
-  /*****                                                               *****/
-  /*************************************************************************/
-  /*************************************************************************/
-
-  /* A structure modelling a cache node query.  The following fields must  */
-  /* all be set by the @FTC_Family_CompareFunc method of a cache's family  */
-  /* list.                                                                 */
-  /*                                                                       */
-  typedef struct  FTC_QueryRec_
-  {
-    FTC_Family  family;
-    FT_UFast    hash;
-
-  } FTC_QueryRec;
-
-
-#define FTC_QUERY( x )    ( (FTC_Query)(x) )
-#define FTC_QUERY_P( x )  ( (FTC_Query*)(x) )
-
-
-  /*************************************************************************/
-  /*************************************************************************/
-  /*****                                                               *****/
-  /*****                   CACHE FAMILY DEFINITIONS                    *****/
-  /*****                                                               *****/
-  /*************************************************************************/
-  /*************************************************************************/
-
-  typedef struct  FTC_FamilyRec_
-  {
-    FT_LruNodeRec  lru;
-    FTC_Cache      cache;
-    FT_UInt        num_nodes;
-    FT_UInt        fam_index;
-
-  } FTC_FamilyRec;
-
-
-#define FTC_FAMILY( x )    ( (FTC_Family)(x) )
-#define FTC_FAMILY_P( x )  ( (FTC_Family*)(x) )
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* These functions are exported so that they can be called from          */
-  /* user-provided cache classes; otherwise, they are really part of the   */
-  /* cache sub-system internals.                                           */
-  /*                                                                       */
-
-  /* must be called by any FTC_Node_InitFunc routine */
-  FT_EXPORT( FT_Error )
-  ftc_family_init( FTC_Family  family,
-                   FTC_Query   query,
-                   FTC_Cache   cache );
-
-
-  /* can be used as a FTC_Family_DoneFunc; otherwise, must be called */
-  /* by any family finalizer function                                */
-  FT_EXPORT( void )
-  ftc_family_done( FTC_Family  family );
-
-
-  /*************************************************************************/
-  /*************************************************************************/
-  /*****                                                               *****/
-  /*****                       CACHE DEFINITIONS                       *****/
-  /*****                                                               *****/
-  /*************************************************************************/
-  /*************************************************************************/
-
-  /* each cache really implements a dynamic hash table to manage its nodes */
-  typedef struct  FTC_CacheRec_
-  {
-    FTC_Manager          manager;
-    FT_Memory            memory;
-    FTC_Cache_Class      clazz;
-
-    FT_UInt              cache_index;  /* in manager's table         */
-    FT_Pointer           cache_data;   /* used by cache node methods */
-
-    FT_UFast             p;
-    FT_UFast             mask;
-    FT_Long              slack;
-    FTC_Node*            buckets;
-
-    FT_LruList_ClassRec  family_class;
-    FT_LruList           families;
-
-  } FTC_CacheRec;
-
-
-#define FTC_CACHE( x )    ( (FTC_Cache)(x) )
-#define FTC_CACHE_P( x )  ( (FTC_Cache*)(x) )
-
-
-  /* initialize a given cache */
-  typedef FT_Error
-  (*FTC_Cache_InitFunc)( FTC_Cache  cache );
-
-  /* clear a cache */
-  typedef void
-  (*FTC_Cache_ClearFunc)( FTC_Cache  cache );
-
-  /* finalize a given cache */
-  typedef void
-  (*FTC_Cache_DoneFunc)( FTC_Cache  cache );
-
-
-  typedef FT_Error
-  (*FTC_Family_InitFunc)( FTC_Family  family,
-                          FTC_Query   query,
-                          FTC_Cache   cache );
-
-  typedef FT_Int
-  (*FTC_Family_CompareFunc)( FTC_Family  family,
-                             FTC_Query   query );
-
-  typedef void
-  (*FTC_Family_DoneFunc)( FTC_Family  family,
-                          FTC_Cache   cache );
-
-  /* initialize a new cache node */
-  typedef FT_Error
-  (*FTC_Node_InitFunc)( FTC_Node    node,
-                        FT_Pointer  type,
-                        FTC_Cache   cache );
-
-  /* compute the weight of a given cache node */
-  typedef FT_ULong
-  (*FTC_Node_WeightFunc)( FTC_Node   node,
-                          FTC_Cache  cache );
-
-  /* compare a node to a given key pair */
-  typedef FT_Bool
-  (*FTC_Node_CompareFunc)( FTC_Node    node,
-                           FT_Pointer  key,
-                           FTC_Cache   cache );
-
-  /* finalize a given cache node */
-  typedef void
-  (*FTC_Node_DoneFunc)( FTC_Node   node,
-                        FTC_Cache  cache );
-
-
-  typedef struct  FTC_Cache_ClassRec_
-  {
-    FT_UInt                 cache_size;
-    FTC_Cache_InitFunc      cache_init;
-    FTC_Cache_ClearFunc     cache_clear;
-    FTC_Cache_DoneFunc      cache_done;
-
-    FT_UInt                 family_size;
-    FTC_Family_InitFunc     family_init;
-    FTC_Family_CompareFunc  family_compare;
-    FTC_Family_DoneFunc     family_done;
-
-    FT_UInt                 node_size;
-    FTC_Node_InitFunc       node_init;
-    FTC_Node_WeightFunc     node_weight;
-    FTC_Node_CompareFunc    node_compare;
-    FTC_Node_DoneFunc       node_done;
-
-  } FTC_Cache_ClassRec;
-
-
-  /* */
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* These functions are exported so that they can be called from          */
-  /* user-provided cache classes; otherwise, they are really part of the   */
-  /* cache sub-system internals.                                           */
-  /*                                                                       */
-
-  /* can be used directly as FTC_Cache_DoneFunc(), or called by custom */
-  /* cache finalizers                                                  */
-  FT_EXPORT( void )
-  ftc_cache_done( FTC_Cache  cache );
-
-  /* can be used directly as FTC_Cache_ClearFunc(), or called by custom */
-  /* cache clear routines                                               */
-  FT_EXPORT( void )
-  ftc_cache_clear( FTC_Cache  cache );
-
-  /* initalize the hash table within the cache */
-  FT_EXPORT( FT_Error )
-  ftc_cache_init( FTC_Cache  cache );
-
-  /* can be called when the key's hash value has been computed */
-  FT_EXPORT( FT_Error )
-  ftc_cache_lookup( FTC_Cache  cache,
-                    FTC_Query  query,
-                    FTC_Node  *anode );
-
- /* */
-
-FT_END_HEADER
-
-
-#endif /* __FTCCACHE_H__ */
-
-
-/* END */

gpac-2.2.1.tar.gz/extra_lib/include/freetype/freetype/cache/ftccmap.h Deleted

@@ -1,216 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  ftccmap.h                                                              */
-/*                                                                         */
-/*    FreeType charmap cache (specification).                              */
-/*                                                                         */
-/*  Copyright 2000-2001, 2003 by                                           */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef __FTCCMAP_H__
-#define __FTCCMAP_H__
-
-#include <ft2build.h>
-#include FT_CACHE_H
-
-
-FT_BEGIN_HEADER
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Section>                                                             */
-  /*    cache_subsystem                                                    */
-  /*                                                                       */
-  /*************************************************************************/
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* @type:                                                                */
-  /*    FTC_CMapCache                                                      */
-  /*                                                                       */
-  /* @description:                                                         */
-  /*    An opaque handle used to manager a charmap cache.  This cache is   */
-  /*    to hold character codes -> glyph indices mappings.                 */
-  /*                                                                       */
-  typedef struct FTC_CMapCacheRec_*  FTC_CMapCache;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* @type:                                                                */
-  /*    FTC_CMapDesc                                                       */
-  /*                                                                       */
-  /* @description:                                                         */
-  /*    A handle to an @FTC_CMapDescRec structure used to describe a given */
-  /*    charmap in a charmap cache.                                        */
-  /*                                                                       */
-  /*    Each @FTC_CMapDesc describes which charmap (of which @FTC_FaceID)  */
-  /*    we want to use in @FTC_CMapCache_Lookup.                           */
-  /*                                                                       */
-  typedef struct FTC_CMapDescRec_*  FTC_CMapDesc;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* @enum:                                                                */
-  /*    FTC_CMapType                                                       */
-  /*                                                                       */
-  /* @description:                                                         */
-  /*    The list of valid @FTC_CMapDesc types.  They indicate how we want  */
-  /*    to address a charmap within an @FTC_FaceID.                        */
-  /*                                                                       */
-  /* @values:                                                              */
-  /*    FTC_CMAP_BY_INDEX ::                                               */
-  /*      Address a charmap by its index in the corresponding @FT_Face.    */
-  /*                                                                       */
-  /*    FTC_CMAP_BY_ENCODING ::                                            */
-  /*      Use a @FT_Face charmap that corresponds to a given encoding.     */
-  /*                                                                       */
-  /*    FTC_CMAP_BY_ID ::                                                  */
-  /*      Use an @FT_Face charmap that corresponds to a given              */
-  /*      (platform,encoding) ID.  See @FTC_CMapIdRec.                     */
-  /*                                                                       */
-  typedef enum  FTC_CMapType_
-  {
-    FTC_CMAP_BY_INDEX    = 0,
-    FTC_CMAP_BY_ENCODING = 1,
-    FTC_CMAP_BY_ID       = 2
-
-  } FTC_CMapType;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* @struct:                                                              */
-  /*    FTC_CMapIdRec                                                      */
-  /*                                                                       */
-  /* @description:                                                         */
-  /*    A short structure to identify a charmap by a (platform,encoding)   */
-  /*    pair of values.                                                    */
-  /*                                                                       */
-  /* @fields:                                                              */
-  /*    platform :: The platform ID.                                       */
-  /*                                                                       */
-  /*    encoding :: The encoding ID.                                       */
-  /*                                                                       */
-  typedef struct  FTC_CMapIdRec_
-  {
-    FT_UInt  platform;
-    FT_UInt  encoding;
-
-  } FTC_CMapIdRec;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* @struct:                                                              */
-  /*    FTC_CMapDescRec                                                    */
-  /*                                                                       */
-  /* @description:                                                         */
-  /*    A structure to describe a given charmap to @FTC_CMapCache.         */
-  /*                                                                       */
-  /* @fields:                                                              */
-  /*    face_id    :: @FTC_FaceID of the face this charmap belongs to.     */
-  /*                                                                       */
-  /*    type       :: The type of charmap, see @FTC_CMapType.              */
-  /*                                                                       */
-  /*    u.index    :: For @FTC_CMAP_BY_INDEX types, this is the charmap    */
-  /*                  index (within a @FT_Face) we want to use.            */
-  /*                                                                       */
-  /*    u.encoding :: For @FTC_CMAP_BY_ENCODING types, this is the charmap */
-  /*                  encoding we want to use. see @FT_Encoding.           */
-  /*                                                                       */
-  /*    u.id       :: For @FTC_CMAP_BY_ID types, this is the               */
-  /*                  (platform,encoding) pair we want to use. see         */
-  /*                  @FTC_CMapIdRec and @FT_CharMapRec.                   */
-  /*                                                                       */
-  typedef struct  FTC_CMapDescRec_
-  {
-    FTC_FaceID    face_id;
-    FTC_CMapType  type;
-
-    union
-    {
-      FT_UInt        index;
-      FT_Encoding    encoding;
-      FTC_CMapIdRec  id;
-
-    } u;
-
-  } FTC_CMapDescRec;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* @function:                                                            */
-  /*    FTC_CMapCache_New                                                  */
-  /*                                                                       */
-  /* @description:                                                         */
-  /*    Creates a new charmap cache.                                       */
-  /*                                                                       */
-  /* @input:                                                               */
-  /*    manager :: A handle to the cache manager.                          */
-  /*                                                                       */
-  /* @output:                                                              */
-  /*    acache  :: A new cache handle.  NULL in case of error.             */
-  /*                                                                       */
-  /* @return:                                                              */
-  /*    FreeType error code.  0 means success.                             */
-  /*                                                                       */
-  /* @note:                                                                */
-  /*    Like all other caches, this one will be destroyed with the cache   */
-  /*    manager.                                                           */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FTC_CMapCache_New( FTC_Manager     manager,
-                     FTC_CMapCache  *acache );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* @function:                                                            */
-  /*    FTC_CMapCache_Lookup                                               */
-  /*                                                                       */
-  /* @description:                                                         */
-  /*    Translates a character code into a glyph index, using the charmap  */
-  /*    cache.                                                             */
-  /*                                                                       */
-  /* @input:                                                               */
-  /*    cache     :: A charmap cache handle.                               */
-  /*                                                                       */
-  /*    cmap_desc :: A charmap descriptor handle.                          */
-  /*                                                                       */
-  /*    char_code :: The character code (in the corresponding charmap).    */
-  /*                                                                       */
-  /* @return:                                                              */
-  /*    Glyph index.  0 means "no glyph".                                  */
-  /*                                                                       */
-  /* @note:                                                                */
-  /*    This function doesn't return @FTC_Node handles, since there is no  */
-  /*    real use for them with typical uses of charmaps.                   */
-  /*                                                                       */
-  FT_EXPORT( FT_UInt )
-  FTC_CMapCache_Lookup( FTC_CMapCache  cache,
-                        FTC_CMapDesc   cmap_desc,
-                        FT_UInt32      char_code );
-
-  /* */
-
-
-FT_END_HEADER
-
-
-#endif /* __FTCCMAP_H__ */
-
-
-/* END */

gpac-2.2.1.tar.gz/extra_lib/include/freetype/freetype/cache/ftcglyph.h Deleted

@@ -1,191 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  ftcglyph.h                                                             */
-/*                                                                         */
-/*    FreeType abstract glyph cache (specification).                       */
-/*                                                                         */
-/*  Copyright 2000-2001, 2003 by                                           */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* Important: The functions defined in this file are only used to        */
-  /*            implement an abstract glyph cache class.  You need to      */
-  /*            provide additional logic to implement a complete cache.    */
-  /*            For example, see `ftcimage.h' and `ftcimage.c' which       */
-  /*            implement a FT_Glyph cache based on this code.             */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-  /*********                                                       *********/
-  /*********             WARNING, THIS IS BETA CODE.               *********/
-  /*********                                                       *********/
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-
-
-#ifndef __FTCGLYPH_H__
-#define __FTCGLYPH_H__
-
-
-#include <ft2build.h>
-#include FT_CACHE_H
-#include FT_CACHE_MANAGER_H
-
-
-FT_BEGIN_HEADER
-
-
-  /* each glyph set is characterized by a "glyph set type" which must be */
-  /* defined by sub-classes                                              */
-  typedef struct FTC_GlyphFamilyRec_*  FTC_GlyphFamily;
-
-  /* handle to a glyph cache node */
-  typedef struct FTC_GlyphNodeRec_*  FTC_GlyphNode;
-
-
-  /* size should be 24 + chunk size on 32-bit machines;                 */
-  /* note that the node's hash is ((gfam->hash << 16) | glyph_index) -- */
-  /* this _must_ be set properly by the glyph node initializer          */
-  /*                                                                    */
-  typedef struct  FTC_GlyphNodeRec_
-  {
-    FTC_NodeRec   node;
-    FT_UShort     item_count;
-    FT_UShort     item_start;
-
-  } FTC_GlyphNodeRec;
-
-
-#define FTC_GLYPH_NODE( x )    ( (FTC_GlyphNode)(x) )
-#define FTC_GLYPH_NODE_P( x )  ( (FTC_GlyphNode*)(x) )
-
-
-  typedef struct  FTC_GlyphQueryRec_
-  {
-    FTC_QueryRec  query;
-    FT_UInt       gindex;
-
-  } FTC_GlyphQueryRec, *FTC_GlyphQuery;
-
-
-#define FTC_GLYPH_QUERY( x )  ( (FTC_GlyphQuery)(x) )
-
-
-  /* a glyph set is used to categorize glyphs of a given type */
-  typedef struct  FTC_GlyphFamilyRec_
-  {
-    FTC_FamilyRec  family;
-    FT_UInt32      hash;
-    FT_UInt        item_total;   /* total number of glyphs in family */
-    FT_UInt        item_count;   /* number of glyph items per node   */
-
-  } FTC_GlyphFamilyRec;
-
-
-#define FTC_GLYPH_FAMILY( x )         ( (FTC_GlyphFamily)(x) )
-#define FTC_GLYPH_FAMILY_P( x )       ( (FTC_GlyphFamily*)(x) )
-
-#define FTC_GLYPH_FAMILY_MEMORY( x )  FTC_FAMILY(x)->cache->memory
-
-
-  /* each glyph node contains a 'chunk' of glyph items; */
-  /* translate a glyph index into a chunk index         */
-#define FTC_GLYPH_FAMILY_CHUNK( gfam, gindex )                  \
-          ( ( gindex ) / FTC_GLYPH_FAMILY( gfam )->item_count )
-
-  /* find a glyph index's chunk, and return its start index */
-#define FTC_GLYPH_FAMILY_START( gfam, gindex )       \
-          ( FTC_GLYPH_FAMILY_CHUNK( gfam, gindex ) * \
-            FTC_GLYPH_FAMILY( gfam )->item_count )
-
-  /* compute a glyph request's hash value */
-#define FTC_GLYPH_FAMILY_HASH( gfam, gindex )                          \
-          ( (FT_UFast)(                                                \
-              ( FTC_GLYPH_FAMILY( gfam )->hash << 16 ) |               \
-              ( FTC_GLYPH_FAMILY_CHUNK( gfam, gindex ) & 0xFFFFU ) ) )
-
-  /* must be called in an FTC_Family_CompareFunc to update the query */
-  /* whenever a glyph set is matched in the lookup, or when it       */
-  /* is created                                                      */
-#define FTC_GLYPH_FAMILY_FOUND( gfam, gquery )                            \
-          do                                                              \
-          {                                                               \
-            FTC_QUERY( gquery )->family = FTC_FAMILY( gfam );             \
-            FTC_QUERY( gquery )->hash =                                   \
-              FTC_GLYPH_FAMILY_HASH( gfam,                                \
-                                     FTC_GLYPH_QUERY( gquery )->gindex ); \
-          } while ( 0 )
-
-  /* retrieve glyph index of glyph node */
-#define FTC_GLYPH_NODE_GINDEX( x )                                  \
-          ( (FT_UInt)( FTC_GLYPH_NODE( x )->node.hash & 0xFFFFU ) )
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* These functions are exported so that they can be called from          */
-  /* user-provided cache classes; otherwise, they are really part of the   */
-  /* cache sub-system internals.                                           */
-  /*                                                                       */
-
-  /* must be called by derived FTC_Node_InitFunc routines */
-  FT_EXPORT( void )
-  ftc_glyph_node_init( FTC_GlyphNode    node,
-                       FT_UInt          gindex,  /* glyph index for node */
-                       FTC_GlyphFamily  gfam );
-
-  /* returns TRUE iff the query's glyph index correspond to the node;  */
-  /* this assumes that the "family" and "hash" fields of the query are */
-  /* already correctly set                                             */
-  FT_EXPORT( FT_Bool )
-  ftc_glyph_node_compare( FTC_GlyphNode   gnode,
-                          FTC_GlyphQuery  gquery );
-
-  /* must be called by derived FTC_Node_DoneFunc routines */
-  FT_EXPORT( void )
-  ftc_glyph_node_done( FTC_GlyphNode  node,
-                       FTC_Cache      cache );
-
-
-  /* must be called by derived FTC_Family_InitFunc; */
-  /* calls "ftc_family_init"                        */
-  FT_EXPORT( FT_Error )
-  ftc_glyph_family_init( FTC_GlyphFamily  gfam,
-                         FT_UInt32        hash,
-                         FT_UInt          item_count,
-                         FT_UInt          item_total,
-                         FTC_GlyphQuery   gquery,
-                         FTC_Cache        cache );
-
-  FT_EXPORT( void )
-  ftc_glyph_family_done( FTC_GlyphFamily  gfam );
-
-
-  /* */
- 
-FT_END_HEADER
-
-
-#endif /* __FTCGLYPH_H__ */
-
-
-/* END */

gpac-2.2.1.tar.gz/extra_lib/include/freetype/freetype/cache/ftcimage.h Deleted

@@ -1,313 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  ftcimage.h                                                             */
-/*                                                                         */
-/*    FreeType Image cache (specification).                                */
-/*                                                                         */
-/*  Copyright 2000-2001, 2002, 2003 by                                     */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* Each image cache really manages FT_Glyph objects.                     */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-#ifndef __FTCIMAGE_H__
-#define __FTCIMAGE_H__
-
-
-#include <ft2build.h>
-#include FT_CACHE_H
-
-
-FT_BEGIN_HEADER
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Section>                                                             */
-  /*    cache_subsystem                                                    */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-  /*****                                                               *****/
-  /*****                       IMAGE CACHE OBJECT                      *****/
-  /*****                                                               *****/
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-
-
- /**************************************************************************
-  *
-  * @struct:
-  *   FTC_ImageTypeRec
-  *
-  * @description:
-  *   A simple structure used to describe the type of glyph image to be
-  *   loaded into the cache.
-  *
-  * @fields:
-  *   font  :: An @FTC_FontRec used to describe the glyph's face and size.
-  *
-  *   flags :: The load flags to be applied when loading the glyph; see
-  *            the @FT_LOAD_XXX constants for details.
-  *
-  * @note:
-  *   This type completely replaces the @FTC_Image_Desc structure which is
-  *   now obsolete.
-  */
-  typedef struct  FTC_ImageTypeRec_
-  {
-    FTC_FontRec  font;
-    FT_Int32     flags;
-
-  } FTC_ImageTypeRec;
-
-  typedef struct FTC_ImageTypeRec_*   FTC_ImageType;
-
- /* */
-
-#define FTC_IMAGE_TYPE_COMPARE( d1, d2 )                    \
-          ( FTC_FONT_COMPARE( &(d1)->font, &(d2)->font ) && \
-            (d1)->flags == (d2)->flags                   )
-
-#define FTC_IMAGE_TYPE_HASH( d )                    \
-          (FT_UFast)( FTC_FONT_HASH( &(d)->font ) ^ \
-                      ( (d)->flags << 4 )         )
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Type>                                                                */
-  /*    FTC_ImageCache                                                     */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A handle to an glyph image cache object.  They are designed to     */
-  /*    hold many distinct glyph images while not exceeding a certain      */
-  /*    memory threshold.                                                  */
-  /*                                                                       */
-  typedef struct FTC_ImageCacheRec_*  FTC_ImageCache;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FTC_ImageCache_New                                                 */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Creates a new glyph image cache.                                   */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    manager :: The parent manager for the image cache.                 */
-  /*                                                                       */
-  /* <Output>                                                              */
-  /*    acache  :: A handle to the new glyph image cache object.           */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0 means success.                             */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FTC_ImageCache_New( FTC_Manager      manager,
-                      FTC_ImageCache  *acache );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FTC_ImageCache_Lookup                                              */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Retrieves a given glyph image from a glyph image cache.            */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    cache  :: A handle to the source glyph image cache.                */
-  /*                                                                       */
-  /*    type   :: A pointer to a glyph image type descriptor.              */
-  /*                                                                       */
-  /*    gindex :: The glyph index to retrieve.                             */
-  /*                                                                       */
-  /* <Output>                                                              */
-  /*    aglyph :: The corresponding @FT_Glyph object.  0 in case of        */
-  /*              failure.                                                 */
-  /*                                                                       */
-  /*    anode  :: Used to return the address of of the corresponding cache */
-  /*              node after incrementing its reference count (see note    */
-  /*              below).                                                  */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0 means success.                             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    The returned glyph is owned and managed by the glyph image cache.  */
-  /*    Never try to transform or discard it manually!  You can however    */
-  /*    create a copy with @FT_Glyph_Copy and modify the new one.          */
-  /*                                                                       */
-  /*    If "anode" is _not_ NULL, it receives the address of the cache     */
-  /*    node containing the glyph image, after increasing its reference    */
-  /*    count.  This ensures that the node (as well as the FT_Glyph) will  */
-  /*    always be kept in the cache until you call @FTC_Node_Unref to      */
-  /*    "release" it.                                                      */
-  /*                                                                       */
-  /*    If "anode" is NULL, the cache node is left unchanged, which means  */
-  /*    that the FT_Glyph could be flushed out of the cache on the next    */
-  /*    call to one of the caching sub-system APIs.  Don't assume that it  */
-  /*    is persistent!                                                     */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FTC_ImageCache_Lookup( FTC_ImageCache  cache,
-                         FTC_ImageType   type,
-                         FT_UInt         gindex,
-                         FT_Glyph       *aglyph,
-                         FTC_Node       *anode );
-
-  /* */
-
-#define ftc_image_format( x )  ( (x) & 7 )
-
-
-#define ftc_image_format_bitmap    0x0000
-#define ftc_image_format_outline   0x0001
-
-#define ftc_image_format_mask      0x000F
-
-#define ftc_image_flag_monochrome  0x0010
-#define ftc_image_flag_unhinted    0x0020
-#define ftc_image_flag_autohinted  0x0040
-#define ftc_image_flag_unscaled    0x0080
-#define ftc_image_flag_no_sbits    0x0100
-
-  /* monochrome bitmap */
-#define ftc_image_mono             ftc_image_format_bitmap | \
-                                   ftc_image_flag_monochrome
-
-  /* anti-aliased bitmap */
-#define ftc_image_grays            ftc_image_format_bitmap
-
-  /* scaled outline */
-#define ftc_image_outline          ftc_image_format_outline
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    FTC_Image_Desc                                                     */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    THIS TYPE IS DEPRECATED.  Use @FTC_ImageTypeRec instead.           */
-  /*                                                                       */
-  /*    A simple structure used to describe a given glyph image category.  */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    font       :: An @FTC_FontRec used to describe the glyph's face    */
-  /*                  and size.                                            */
-  /*                                                                       */
-  /*    image_type :: The glyph image's type.                              */
-  /*                                                                       */
-  typedef struct  FTC_Image_Desc_
-  {
-    FTC_FontRec  font;
-    FT_UInt      image_type;
-
-  } FTC_Image_Desc;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Type>                                                                */
-  /*    FTC_Image_Cache                                                    */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    THIS TYPE IS DEPRECATED.  Use @FTC_ImageCache instead.             */
-  /*                                                                       */
-  typedef FTC_ImageCache  FTC_Image_Cache;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FTC_Image_Cache_New                                                */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    THIS FUNCTION IS DEPRECATED.  Use @FTC_ImageCache_New instead.     */
-  /*                                                                       */
-  /*    Creates a new glyph image cache.                                   */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    manager :: The parent manager for the image cache.                 */
-  /*                                                                       */
-  /* <Output>                                                              */
-  /*    acache  :: A handle to the new glyph image cache object.           */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0 means success.                             */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FTC_Image_Cache_New( FTC_Manager       manager,
-                       FTC_Image_Cache  *acache );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FTC_Image_Cache_Lookup                                             */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    THIS FUNCTION IS DEPRECATED.  Use @FTC_ImageCache_Lookup instead.  */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    cache  :: A handle to the source glyph image cache.                */
-  /*                                                                       */
-  /*    desc   :: A pointer to a glyph image descriptor.                   */
-  /*                                                                       */
-  /*    gindex :: The glyph index to retrieve.                             */
-  /*                                                                       */
-  /* <Output>                                                              */
-  /*    aglyph :: The corresponding @FT_Glyph object.  0 in case of        */
-  /*              failure.                                                 */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0 means success.                             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    The returned glyph is owned and managed by the glyph image cache.  */
-  /*    Never try to transform or discard it manually!  You can however    */
-  /*    create a copy with @FT_Glyph_Copy and modify the new one.          */
-  /*                                                                       */
-  /*    Because the glyph image cache limits the total amount of memory    */
-  /*    taken by the glyphs it holds, the returned glyph might disappear   */
-  /*    on a later invocation of this function!  It is a cache after       */
-  /*    all...                                                             */
-  /*                                                                       */
-  /*    Use this function to "lock" the glyph as long as it is needed.     */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FTC_Image_Cache_Lookup( FTC_Image_Cache  cache,
-                          FTC_Image_Desc*  desc,
-                          FT_UInt          gindex,
-                          FT_Glyph        *aglyph );
-
- /* */
-
-FT_END_HEADER
-
-
-#endif /* __FTCIMAGE_H__ */
-
-
-/* END */

gpac-2.2.1.tar.gz/extra_lib/include/freetype/freetype/cache/ftcmanag.h Deleted

@@ -1,244 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  ftcmanag.h                                                             */
-/*                                                                         */
-/*    FreeType Cache Manager (specification).                              */
-/*                                                                         */
-/*  Copyright 2000-2001 by                                                 */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* A cache manager is in charge of the following:                        */
-  /*                                                                       */
-  /*  - Maintain a mapping between generic FTC_FaceIDs and live FT_Face    */
-  /*    objects.  The mapping itself is performed through a user-provided  */
-  /*    callback.  However, the manager maintains a small cache of FT_Face */
-  /*    and FT_Size objects in order to speed up things considerably.      */
-  /*                                                                       */
-  /*  - Manage one or more cache objects.  Each cache is in charge of      */
-  /*    holding a varying number of `cache nodes'.  Each cache node        */
-  /*    represents a minimal amount of individually accessible cached      */
-  /*    data.  For example, a cache node can be an FT_Glyph image          */
-  /*    containing a vector outline, or some glyph metrics, or anything    */
-  /*    else.                                                              */
-  /*                                                                       */
-  /*    Each cache node has a certain size in bytes that is added to the   */
-  /*    total amount of `cache memory' within the manager.                 */
-  /*                                                                       */
-  /*    All cache nodes are located in a global LRU list, where the oldest */
-  /*    node is at the tail of the list.                                   */
-  /*                                                                       */
-  /*    Each node belongs to a single cache, and includes a reference      */
-  /*    count to avoid destroying it (due to caching).                     */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-  /*********                                                       *********/
-  /*********             WARNING, THIS IS BETA CODE.               *********/
-  /*********                                                       *********/
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-
-
-#ifndef __FTCMANAG_H__
-#define __FTCMANAG_H__
-
-
-#include <ft2build.h>
-#include FT_CACHE_H
-#include FT_CACHE_INTERNAL_LRU_H
-#include FT_CACHE_INTERNAL_CACHE_H
-
-
-FT_BEGIN_HEADER
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Section>                                                             */
-  /*    cache_subsystem                                                    */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-#define FTC_MAX_FACES_DEFAULT  2
-#define FTC_MAX_SIZES_DEFAULT  4
-#define FTC_MAX_BYTES_DEFAULT  200000L  /* ~200kByte by default */
-
-  /* maximum number of caches registered in a single manager */
-#define FTC_MAX_CACHES         16
-
-
-  typedef struct  FTC_FamilyEntryRec_
-  {
-    FTC_Family  family;
-    FTC_Cache   cache;
-    FT_UInt     index;
-    FT_UInt     link;
-
-  } FTC_FamilyEntryRec, *FTC_FamilyEntry;
-
-
-#define FTC_FAMILY_ENTRY_NONE  ( (FT_UInt)-1 )
-
-
-  typedef struct  FTC_FamilyTableRec_
-  {
-    FT_UInt          count;
-    FT_UInt          size;
-    FTC_FamilyEntry  entries;
-    FT_UInt          free;
-  
-  } FTC_FamilyTableRec, *FTC_FamilyTable;
-
-
-  FT_EXPORT( FT_Error )
-  ftc_family_table_alloc( FTC_FamilyTable   table,
-                          FT_Memory         memory,
-                          FTC_FamilyEntry  *aentry );
-
-  FT_EXPORT( void )
-  ftc_family_table_free( FTC_FamilyTable  table,
-                         FT_UInt          idx );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    FTC_ManagerRec                                                     */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    The cache manager structure.                                       */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    library      :: A handle to a FreeType library instance.           */
-  /*                                                                       */
-  /*    faces_list   :: The lru list of @FT_Face objects in the cache.     */
-  /*                                                                       */
-  /*    sizes_list   :: The lru list of @FT_Size objects in the cache.     */
-  /*                                                                       */
-  /*    max_weight   :: The maximum cache pool weight.                     */
-  /*                                                                       */
-  /*    cur_weight   :: The current cache pool weight.                     */
-  /*                                                                       */
-  /*    num_nodes    :: The current number of nodes in the manager.        */
-  /*                                                                       */
-  /*    nodes_list   :: The global lru list of all cache nodes.            */
-  /*                                                                       */
-  /*    caches       :: A table of installed/registered cache objects.     */
-  /*                                                                       */
-  /*    request_data :: User-provided data passed to the requester.        */
-  /*                                                                       */
-  /*    request_face :: User-provided function used to implement a mapping */
-  /*                    between abstract @FTC_FaceID values and real       */
-  /*                    @FT_Face objects.                                  */
-  /*                                                                       */
-  /*    families     :: Global table of families.                          */
-  /*                                                                       */
-  typedef struct  FTC_ManagerRec_
-  {
-    FT_Library          library;
-    FT_LruList          faces_list;
-    FT_LruList          sizes_list;
-
-    FT_ULong            max_weight;
-    FT_ULong            cur_weight;
-    
-    FT_UInt             num_nodes;
-    FTC_Node            nodes_list;
-    
-    FTC_Cache           cachesFTC_MAX_CACHES;
-
-    FT_Pointer          request_data;
-    FTC_Face_Requester  request_face;
-
-    FTC_FamilyTableRec  families;
-
-  } FTC_ManagerRec;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FTC_Manager_Compress                                               */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    This function is used to check the state of the cache manager if   */
-  /*    its `num_bytes' field is greater than its `max_bytes' field.  It   */
-  /*    will flush as many old cache nodes as possible (ignoring cache     */
-  /*    nodes with a non-zero reference count).                            */
-  /*                                                                       */
-  /* <InOut>                                                               */
-  /*    manager :: A handle to the cache manager.                          */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    Client applications should not call this function directly.  It is */
-  /*    normally invoked by specific cache implementations.                */
-  /*                                                                       */
-  /*    The reason this function is exported is to allow client-specific   */
-  /*    cache classes.                                                     */
-  /*                                                                       */
-  FT_EXPORT( void )
-  FTC_Manager_Compress( FTC_Manager  manager );
-
-
-  /* this must be used internally for the moment */
-  FT_EXPORT( FT_Error )
-  FTC_Manager_Register_Cache( FTC_Manager      manager,
-                              FTC_Cache_Class  clazz,
-                              FTC_Cache       *acache );
-
-
-  /* can be called to increment a node's reference count */
-  FT_EXPORT( void )
-  FTC_Node_Ref( FTC_Node     node,
-                FTC_Manager  manager );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FTC_Node_Unref                                                     */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Decrement a cache node's internal reference count.  When the count */
-  /*    reaches 0, it is not destroyed but becomes eligible for subsequent */
-  /*    cache flushes.                                                     */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    node    :: The cache node handle.                                  */
-  /*                                                                       */
-  /*    manager :: The cache manager handle.                               */
-  /*                                                                       */
-  FT_EXPORT( void )
-  FTC_Node_Unref( FTC_Node     node,
-                  FTC_Manager  manager );
-
- /* */
-
-FT_END_HEADER
-
-
-#endif /* __FTCMANAG_H__ */
-
-
-/* END */

gpac-2.2.1.tar.gz/extra_lib/include/freetype/freetype/cache/ftcsbits.h Deleted

@@ -1,275 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  ftcsbits.h                                                             */
-/*                                                                         */
-/*    A small-bitmap cache (specification).                                */
-/*                                                                         */
-/*  Copyright 2000-2001, 2002 by                                           */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef __FTCSBITS_H__
-#define __FTCSBITS_H__
-
-
-#include <ft2build.h>
-#include FT_CACHE_H
-#include FT_CACHE_IMAGE_H
-
-
-FT_BEGIN_HEADER
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Section>                                                             */
-  /*    cache_subsystem                                                    */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Type>                                                                */
-  /*    FTC_SBit                                                           */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A handle to a small bitmap descriptor.  See the @FTC_SBitRec       */
-  /*    structure for details.                                             */
-  /*                                                                       */
-  typedef struct FTC_SBitRec_*  FTC_SBit;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    FTC_SBitRec                                                        */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A very compact structure used to describe a small glyph bitmap.    */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    width     :: The bitmap width in pixels.                           */
-  /*                                                                       */
-  /*    height    :: The bitmap height in pixels.                          */
-  /*                                                                       */
-  /*    left      :: The horizontal distance from the pen position to the  */
-  /*                 left bitmap border (a.k.a. `left side bearing', or    */
-  /*                 `lsb').                                               */
-  /*                                                                       */
-  /*    top       :: The vertical distance from the pen position (on the   */
-  /*                 baseline) to the upper bitmap border (a.k.a. `top     */
-  /*                 side bearing').  The distance is positive for upwards */
-  /*                 Y coordinates.                                        */
-  /*                                                                       */
-  /*    format    :: The format of the glyph bitmap (monochrome or gray).  */
-  /*                                                                       */
-  /*    max_grays :: Maximum gray level value (in the range 1 to 255).     */
-  /*                                                                       */
-  /*    pitch     :: The number of bytes per bitmap line.  May be positive */
-  /*                 or negative.                                          */
-  /*                                                                       */
-  /*    xadvance  :: The horizontal advance width in pixels.               */
-  /*                                                                       */
-  /*    yadvance  :: The vertical advance height in pixels.                */
-  /*                                                                       */
-  /*    buffer   :: A pointer to the bitmap pixels.                        */
-  /*                                                                       */
-  typedef struct  FTC_SBitRec_
-  {
-    FT_Byte   width;
-    FT_Byte   height;
-    FT_Char   left;
-    FT_Char   top;
-
-    FT_Byte   format;
-    FT_Byte   max_grays;
-    FT_Short  pitch;
-    FT_Char   xadvance;
-    FT_Char   yadvance;
-
-    FT_Byte*  buffer;
-
-  } FTC_SBitRec;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Type>                                                                */
-  /*    FTC_SBitCache                                                      */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A handle to a small bitmap cache.  These are special cache objects */
-  /*    used to store small glyph bitmaps (and anti-aliased pixmaps) in a  */
-  /*    much more efficient way than the traditional glyph image cache     */
-  /*    implemented by @FTC_ImageCache.                                    */
-  /*                                                                       */
-  typedef struct FTC_SBitCacheRec_*  FTC_SBitCache;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Type>                                                                */
-  /*    FTC_SBit_Cache                                                     */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    DEPRECATED.  Use @FTC_SBitCache instead.                           */
-  /*                                                                       */
-  typedef FTC_SBitCache  FTC_SBit_Cache;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FTC_SBitCache_New                                                  */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Creates a new cache to store small glyph bitmaps.                  */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    manager :: A handle to the source cache manager.                   */
-  /*                                                                       */
-  /* <Output>                                                              */
-  /*    acache  :: A handle to the new sbit cache.  NULL in case of error. */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0 means success.                             */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FTC_SBitCache_New( FTC_Manager     manager,
-                     FTC_SBitCache  *acache );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FTC_SBitCache_Lookup                                               */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Looks up a given small glyph bitmap in a given sbit cache and      */
-  /*    "lock" it to prevent its flushing from the cache until needed      */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    cache  :: A handle to the source sbit cache.                       */
-  /*                                                                       */
-  /*    type   :: A pointer to the glyph image type descriptor.            */
-  /*                                                                       */
-  /*    gindex :: The glyph index.                                         */
-  /*                                                                       */
-  /* <Output>                                                              */
-  /*    sbit   :: A handle to a small bitmap descriptor.                   */
-  /*                                                                       */
-  /*    anode  :: Used to return the address of of the corresponding cache */
-  /*              node after incrementing its reference count (see note    */
-  /*              below).                                                  */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0 means success.                             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    The small bitmap descriptor and its bit buffer are owned by the    */
-  /*    cache and should never be freed by the application.  They might    */
-  /*    as well disappear from memory on the next cache lookup, so don't   */
-  /*    treat them as persistent data.                                     */
-  /*                                                                       */
-  /*    The descriptor's `buffer' field is set to 0 to indicate a missing  */
-  /*    glyph bitmap.                                                      */
-  /*                                                                       */
-  /*    If "anode" is _not_ NULL, it receives the address of the cache     */
-  /*    node containing the bitmap, after increasing its reference count.  */
-  /*    This ensures that the node (as well as the image) will always be   */
-  /*    kept in the cache until you call @FTC_Node_Unref to "release" it.  */
-  /*                                                                       */
-  /*    If "anode" is NULL, the cache node is left unchanged, which means  */
-  /*    that the bitmap could be flushed out of the cache on the next      */
-  /*    call to one of the caching sub-system APIs.  Don't assume that it  */
-  /*    is persistent!                                                     */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FTC_SBitCache_Lookup( FTC_SBitCache    cache,
-                        FTC_ImageType    type,
-                        FT_UInt          gindex,
-                        FTC_SBit        *sbit,
-                        FTC_Node        *anode );
-
-
-  /* */
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FTC_SBit_Cache_New                                                 */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    DEPRECATED.  Use @FTC_SBitCache_New instead.                       */
-  /*                                                                       */
-  /*    Creates a new cache to store small glyph bitmaps.                  */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    manager :: A handle to the source cache manager.                   */
-  /*                                                                       */
-  /* <Output>                                                              */
-  /*    acache  :: A handle to the new sbit cache.  NULL in case of error. */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0 means success.                             */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FTC_SBit_Cache_New( FTC_Manager      manager,
-                      FTC_SBit_Cache  *acache );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FTC_SBit_Cache_Lookup                                              */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    DEPRECATED.  Use @FTC_SBitCache_Lookup instead.                    */
-  /*                                                                       */
-  /*    Looks up a given small glyph bitmap in a given sbit cache.         */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    cache  :: A handle to the source sbit cache.                       */
-  /*                                                                       */
-  /*    desc   :: A pointer to the glyph image descriptor.                 */
-  /*                                                                       */
-  /*    gindex :: The glyph index.                                         */
-  /*                                                                       */
-  /* <Output>                                                              */
-  /*    sbit   :: A handle to a small bitmap descriptor.                   */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0 means success.                             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    The small bitmap descriptor and its bit buffer are owned by the    */
-  /*    cache and should never be freed by the application.  They might    */
-  /*    as well disappear from memory on the next cache lookup, so don't   */
-  /*    treat them as persistent data.                                     */
-  /*                                                                       */
-  /*    The descriptor's `buffer' field is set to 0 to indicate a missing  */
-  /*    glyph bitmap.                                                      */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FTC_SBit_Cache_Lookup( FTC_SBit_Cache   cache,
-                         FTC_Image_Desc*  desc,
-                         FT_UInt          gindex,
-                         FTC_SBit        *sbit );
-
-
-FT_END_HEADER
-
-#endif /* __FTCSBITS_H__ */
-
-
-/* END */

gpac-2.2.1.tar.gz/extra_lib/include/freetype/freetype/cache/ftlru.h Deleted

@@ -1,208 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  ftlru.h                                                                */
-/*                                                                         */
-/*    Simple LRU list-cache (specification).                               */
-/*                                                                         */
-/*  Copyright 2000-2001, 2003 by                                           */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* An LRU is a list that cannot hold more than a certain number of       */
-  /* elements (`max_elements').  All elements in the list are sorted in    */
-  /* least-recently-used order, i.e., the `oldest' element is at the tail  */
-  /* of the list.                                                          */
-  /*                                                                       */
-  /* When doing a lookup (either through `Lookup()' or `Lookup_Node()'),   */
-  /* the list is searched for an element with the corresponding key.  If   */
-  /* it is found, the element is moved to the head of the list and is      */
-  /* returned.                                                             */
-  /*                                                                       */
-  /* If no corresponding element is found, the lookup routine will try to  */
-  /* obtain a new element with the relevant key.  If the list is already   */
-  /* full, the oldest element from the list is discarded and replaced by a */
-  /* new one; a new element is added to the list otherwise.                */
-  /*                                                                       */
-  /* Note that it is possible to pre-allocate the element list nodes.      */
-  /* This is handy if `max_elements' is sufficiently small, as it saves    */
-  /* allocations/releases during the lookup process.                       */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-  /*********                                                       *********/
-  /*********             WARNING, THIS IS BETA CODE.               *********/
-  /*********                                                       *********/
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-
-
-#ifndef __FTLRU_H__
-#define __FTLRU_H__
-
-
-#include <ft2build.h>
-#include FT_FREETYPE_H
-
-#ifdef FREETYPE_H
-#error "freetype.h of FreeType 1 has been loaded!"
-#error "Please fix the directory search order for header files"
-#error "so that freetype.h of FreeType 2 is found first."
-#endif
-
-
-FT_BEGIN_HEADER
-
-
-  /* generic list key type */
-  typedef FT_Pointer  FT_LruKey;
-
-  /* a list list handle */
-  typedef struct FT_LruListRec_*  FT_LruList;
-
-  /* a list class handle */
-  typedef const struct FT_LruList_ClassRec_*  FT_LruList_Class;
-
-  /* a list node handle */
-  typedef struct FT_LruNodeRec_*  FT_LruNode;
-
-  /* the list node structure */
-  typedef struct  FT_LruNodeRec_
-  {
-    FT_LruNode  next;
-    FT_LruKey   key;
-
-  } FT_LruNodeRec;
-
-
-  /* the list structure */
-  typedef struct  FT_LruListRec_
-  {
-    FT_Memory         memory;
-    FT_LruList_Class  clazz;
-    FT_LruNode        nodes;
-    FT_UInt           max_nodes;
-    FT_UInt           num_nodes;
-    FT_Pointer        data;
-
-  } FT_LruListRec;
-
-
-  /* initialize a list list */
-  typedef FT_Error
-  (*FT_LruList_InitFunc)( FT_LruList  list );
-
-  /* finalize a list list */
-  typedef void
-  (*FT_LruList_DoneFunc)( FT_LruList  list );
-
-  /* this method is used to initialize a new list element node */
-  typedef FT_Error
-  (*FT_LruNode_InitFunc)( FT_LruNode  node,
-                          FT_LruKey   key,
-                          FT_Pointer  data );
-
-  /* this method is used to finalize a given list element node */
-  typedef void
-  (*FT_LruNode_DoneFunc)( FT_LruNode  node,
-                          FT_Pointer  data );
-
-  /* If defined, this method is called when the list if full        */
-  /* during the lookup process -- it is used to change the contents */
-  /* of a list element node instead of calling `done_element()',    */
-  /* then `init_element()'.  Set it to 0 for default behaviour.     */
-  typedef FT_Error
-  (*FT_LruNode_FlushFunc)( FT_LruNode  node,
-                           FT_LruKey   new_key,
-                           FT_Pointer  data );
-
-  /* If defined, this method is used to compare a list element node */
-  /* with a given key during a lookup.  If set to 0, the `key'      */
-  /* fields will be directly compared instead.                      */
-  typedef FT_Bool
-  (*FT_LruNode_CompareFunc)( FT_LruNode  node,
-                             FT_LruKey   key,
-                             FT_Pointer  data );
-
-  /* A selector is used to indicate whether a given list element node */
-  /* is part of a selection for FT_LruList_Remove_Selection().  The   */
-  /* functrion must return true (i.e., non-null) to indicate that the */
-  /* node is part of it.                                              */
-  typedef FT_Bool
-  (*FT_LruNode_SelectFunc)( FT_LruNode  node,
-                            FT_Pointer  data,
-                            FT_Pointer  list_data );
-
-  /* LRU class */
-  typedef struct  FT_LruList_ClassRec_
-  {
-    FT_UInt                 list_size;
-    FT_LruList_InitFunc     list_init;      /* optional */
-    FT_LruList_DoneFunc     list_done;      /* optional */
-
-    FT_UInt                 node_size;
-    FT_LruNode_InitFunc     node_init;     /* MANDATORY */
-    FT_LruNode_DoneFunc     node_done;     /* optional  */
-    FT_LruNode_FlushFunc    node_flush;    /* optional  */
-    FT_LruNode_CompareFunc  node_compare;  /* optional  */
-
-  } FT_LruList_ClassRec;
-
-
-  /* The following functions must be exported in the case where */
-  /* applications would want to write their own cache classes.  */
-
-  FT_EXPORT( FT_Error )
-  FT_LruList_New( FT_LruList_Class  clazz,
-                  FT_UInt           max_elements,
-                  FT_Pointer        user_data,
-                  FT_Memory         memory,
-                  FT_LruList       *alist );
-
-  FT_EXPORT( void )
-  FT_LruList_Reset( FT_LruList  list );
-
-  FT_EXPORT( void )
-  FT_LruList_Destroy ( FT_LruList  list );
-
-  FT_EXPORT( FT_Error )
-  FT_LruList_Lookup( FT_LruList  list,
-                     FT_LruKey   key,
-                     FT_LruNode *anode );
-
-  FT_EXPORT( void )
-  FT_LruList_Remove( FT_LruList  list,
-                     FT_LruNode  node );
-
-  FT_EXPORT( void )
-  FT_LruList_Remove_Selection( FT_LruList             list,
-                               FT_LruNode_SelectFunc  select_func,
-                               FT_Pointer             select_data );
-
- /* */
-
-FT_END_HEADER
-
-
-#endif /* __FTLRU_H__ */
-
-
-/* END */

gpac-2.2.1.tar.gz/extra_lib/include/freetype/freetype/config Deleted

gpac-2.2.1.tar.gz/extra_lib/include/freetype/freetype/config/ftconfig.h Deleted

@@ -1,340 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  ftconfig.h                                                             */
-/*                                                                         */
-/*    ANSI-specific configuration file (specification only).               */
-/*                                                                         */
-/*  Copyright 1996-2001, 2002, 2003 by                                     */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* This header file contains a number of macro definitions that are used */
-  /* by the rest of the engine.  Most of the macros here are automatically */
-  /* determined at compile time, and you should not need to change it to   */
-  /* port FreeType, except to compile the library with a non-ANSI          */
-  /* compiler.                                                             */
-  /*                                                                       */
-  /* Note however that if some specific modifications are needed, we       */
-  /* advise you to place a modified copy in your build directory.          */
-  /*                                                                       */
-  /* The build directory is usually `freetype/builds/<system>', and        */
-  /* contains system-specific files that are always included first when    */
-  /* building the library.                                                 */
-  /*                                                                       */
-  /* This ANSI version should stay in `include/freetype/config'.           */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-#ifndef __FTCONFIG_H__
-#define __FTCONFIG_H__
-
-#include <ft2build.h>
-#include FT_CONFIG_OPTIONS_H
-#include FT_CONFIG_STANDARD_LIBRARY_H
-
-FT_BEGIN_HEADER
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /*               PLATFORM-SPECIFIC CONFIGURATION MACROS                  */
-  /*                                                                       */
-  /* These macros can be toggled to suit a specific system.  The current   */
-  /* ones are defaults used to compile FreeType in an ANSI C environment   */
-  /* (16bit compilers are also supported).  Copy this file to your own     */
-  /* `freetype/builds/<system>' directory, and edit it to port the engine. */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-  /* The number of bytes in an `int' type.  */
-#if   FT_UINT_MAX == 0xFFFFFFFFUL
-#define FT_SIZEOF_INT  4
-#elif FT_UINT_MAX == 0xFFFFU
-#define FT_SIZEOF_INT  2
-#elif FT_UINT_MAX > 0xFFFFFFFFU && FT_UINT_MAX == 0xFFFFFFFFFFFFFFFFU
-#define FT_SIZEOF_INT  8
-#else
-#error "Unsupported number of bytes in `int' type!"
-#endif
-
-  /* The number of bytes in a `long' type.  */
-#if   FT_ULONG_MAX == 0xFFFFFFFFUL
-#define FT_SIZEOF_LONG  4
-#elif FT_ULONG_MAX > 0xFFFFFFFFU && FT_ULONG_MAX == 0xFFFFFFFFFFFFFFFFU
-#define FT_SIZEOF_LONG  8
-#else
-#error "Unsupported number of bytes in `long' type!"
-#endif
-
-
-  /* Preferred alignment of data */
-#define FT_ALIGNMENT  8
-
-
-  /* FT_UNUSED is a macro used to indicate that a given parameter is not  */
-  /* used -- this is only used to get rid of unpleasant compiler warnings */
-#ifndef FT_UNUSED
-#define FT_UNUSED( arg )  ( (arg) = (arg) )
-#endif
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /*                     AUTOMATIC CONFIGURATION MACROS                    */
-  /*                                                                       */
-  /* These macros are computed from the ones defined above.  Don't touch   */
-  /* their definition, unless you know precisely what you are doing.  No   */
-  /* porter should need to mess with them.                                 */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* Mac support                                                           */
-  /*                                                                       */
-  /*   This is the only necessary change, so it is defined here instead    */
-  /*   providing a new configuration file.                                 */
-  /*                                                                       */
-#if ( defined( __APPLE__ ) && !defined( DARWIN_NO_CARBON ) ) || \
-    ( defined( __MWERKS__ ) && defined( macintosh )        )
-#define FT_MACINTOSH 1
-#endif
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* IntN types                                                            */
-  /*                                                                       */
-  /*   Used to guarantee the size of some specific integers.               */
-  /*                                                                       */
-  typedef signed short    FT_Int16;
-  typedef unsigned short  FT_UInt16;
-
-#if FT_SIZEOF_INT == 4
-
-  typedef signed int      FT_Int32;
-  typedef unsigned int    FT_UInt32;
-
-#elif FT_SIZEOF_LONG == 4
-
-  typedef signed long     FT_Int32;
-  typedef unsigned long   FT_UInt32;
-
-#else
-#error "no 32bit type found -- please check your configuration files"
-#endif
-
-  /* look up an integer type that is at least 32 bits */
-#if FT_SIZEOF_INT >= 4
-
-  typedef int            FT_Fast;
-  typedef unsigned int   FT_UFast;
-
-#elif FT_SIZEOF_LONG >= 4
-
-  typedef long           FT_Fast;
-  typedef unsigned long  FT_UFast;
-
-#endif
-
-
-  /* determine whether we have a 64-bit int type for platforms without */
-  /* Autoconf                                                          */
-#if FT_SIZEOF_LONG == 8
-
-  /* FT_LONG64 must be defined if a 64-bit type is available */
-#define FT_LONG64
-#define FT_INT64  long
-
-#elif defined( _MSC_VER ) && _MSC_VER >= 900  /* Visual C++ (and Intel C++) */
-
-  /* this compiler provides the __int64 type */
-#define FT_LONG64
-#define FT_INT64  __int64
-
-#elif defined( __BORLANDC__ )  /* Borland C++ */
-
-  /* XXXX: We should probably check the value of __BORLANDC__ in order */
-  /*       to test the compiler version.                               */
-
-  /* this compiler provides the __int64 type */
-#define FT_LONG64
-#define FT_INT64  __int64
-
-#elif defined( __WATCOMC__ )   /* Watcom C++ */
-
-  /* Watcom doesn't provide 64-bit data types */
-
-#elif defined( __MWERKS__ )    /* Metrowerks CodeWarrior */
-
-#define FT_LONG64
-#define FT_INT64  long long int
-
-#elif defined( __GNUC__ )
-
-  /* GCC provides the "long long" type */
-#define FT_LONG64
-#define FT_INT64  long long int
-
-#endif /* FT_SIZEOF_LONG == 8 */
-
-
-#define FT_BEGIN_STMNT  do {
-#define FT_END_STMNT    } while ( 0 )
-#define FT_DUMMY_STMNT  FT_BEGIN_STMNT FT_END_STMNT
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* A 64-bit data type will create compilation problems if you compile    */
-  /* in strict ANSI mode.  To avoid them, we disable their use if          */
-  /* __STDC__ is defined.  You can however ignore this rule by             */
-  /* defining the FT_CONFIG_OPTION_FORCE_INT64 configuration macro.        */
-  /*                                                                       */
-#if defined( FT_LONG64 ) && !defined( FT_CONFIG_OPTION_FORCE_INT64 )
-
-#ifdef __STDC__
-
-  /* undefine the 64-bit macros in strict ANSI compilation mode */
-#undef FT_LONG64
-#undef FT_INT64
-
-#endif /* __STDC__ */
-
-#endif /* FT_LONG64 && !FT_CONFIG_OPTION_FORCE_INT64 */
-
-
-#ifdef FT_MAKE_OPTION_SINGLE_OBJECT
-
-#define FT_LOCAL( x )      static  x
-#define FT_LOCAL_DEF( x )  static  x
-
-#else
-
-#ifdef __cplusplus
-#define FT_LOCAL( x )      extern "C"  x
-#define FT_LOCAL_DEF( x )  extern "C"  x
-#else
-#define FT_LOCAL( x )      extern  x
-#define FT_LOCAL_DEF( x )  x
-#endif
-
-#endif /* FT_MAKE_OPTION_SINGLE_OBJECT */
-
-
-#ifndef FT_BASE
-
-#ifdef __cplusplus
-#define FT_BASE( x )  extern "C"  x
-#else
-#define FT_BASE( x )  extern  x
-#endif
-
-#endif /* !FT_BASE */
-
-
-#ifndef FT_BASE_DEF
-
-#ifdef __cplusplus
-#define FT_BASE_DEF( x )  extern "C"  x
-#else
-#define FT_BASE_DEF( x )  extern  x
-#endif
-
-#endif /* !FT_BASE_DEF */
-
-
-#ifndef FT_EXPORT
-
-#ifdef __cplusplus
-#define FT_EXPORT( x )  extern "C"  x
-#else
-#define FT_EXPORT( x )  extern  x
-#endif
-
-#endif /* !FT_EXPORT */
-
-
-#ifndef FT_EXPORT_DEF
-
-#ifdef __cplusplus
-#define FT_EXPORT_DEF( x )  extern "C"  x
-#else
-#define FT_EXPORT_DEF( x )  extern  x
-#endif
-
-#endif /* !FT_EXPORT_DEF */
-
-
-#ifndef FT_EXPORT_VAR
-
-#ifdef __cplusplus
-#define FT_EXPORT_VAR( x )  extern "C"  x
-#else
-#define FT_EXPORT_VAR( x )  extern  x
-#endif
-
-#endif /* !FT_EXPORT_VAR */
-
-  /* The following macros are needed to compile the library with a   */
-  /* C++ compiler and with 16bit compilers.                          */
-  /*                                                                 */
-
-  /* This is special.  Within C++, you must specify `extern "C"' for */
-  /* functions which are used via function pointers, and you also    */
-  /* must do that for structures which contain function pointers to  */
-  /* assure C linkage -- it's not possible to have (local) anonymous */
-  /* functions which are accessed by (global) function pointers.     */
-  /*                                                                 */
-  /*                                                                 */
-  /* FT_CALLBACK_DEF is used to _define_ a callback function.        */
-  /*                                                                 */
-  /* FT_CALLBACK_TABLE is used to _declare_ a constant variable that */
-  /* contains pointers to callback functions.                        */
-  /*                                                                 */
-  /* FT_CALLBACK_TABLE_DEF is used to _define_ a constant variable   */
-  /* that contains pointers to callback functions.                   */
-  /*                                                                 */
-  /*                                                                 */
-  /* Some 16bit compilers have to redefine these macros to insert    */
-  /* the infamous `_cdecl' or `__fastcall' declarations.             */
-  /*                                                                 */
-#ifndef FT_CALLBACK_DEF
-#ifdef __cplusplus
-#define FT_CALLBACK_DEF( x )  extern "C"  x
-#else
-#define FT_CALLBACK_DEF( x )  static  x
-#endif
-#endif /* FT_CALLBACK_DEF */
-
-#ifndef FT_CALLBACK_TABLE
-#ifdef __cplusplus
-#define FT_CALLBACK_TABLE      extern "C"
-#define FT_CALLBACK_TABLE_DEF  extern "C"
-#else
-#define FT_CALLBACK_TABLE      extern
-#define FT_CALLBACK_TABLE_DEF  /* nothing */
-#endif
-#endif /* FT_CALLBACK_TABLE */
-
-
-FT_END_HEADER
-
-
-#endif /* __FTCONFIG_H__ */
-
-
-/* END */

gpac-2.2.1.tar.gz/extra_lib/include/freetype/freetype/config/ftheader.h Deleted

@@ -1,537 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  ftheader.h                                                             */
-/*                                                                         */
-/*    Build macros of the FreeType 2 library.                              */
-/*                                                                         */
-/*  Copyright 1996-2001, 2002 by                                           */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-#ifndef __FT_HEADER_H__
-#define __FT_HEADER_H__
-
-  /*@***********************************************************************/
-  /*                                                                       */
-  /* <Macro>                                                               */
-  /*    FT_BEGIN_HEADER                                                    */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    This macro is used in association with @FT_END_HEADER in header    */
-  /*    files to ensure that the declarations within are properly          */
-  /*    encapsulated in an `extern "C" { .. }' block when included from a  */
-  /*    C++ compiler.                                                      */
-  /*                                                                       */
-#ifdef __cplusplus
-#define FT_BEGIN_HEADER  extern "C" {
-#else
-#define FT_BEGIN_HEADER  /* nothing */
-#endif
-
-
-  /*@***********************************************************************/
-  /*                                                                       */
-  /* <Macro>                                                               */
-  /*    FT_END_HEADER                                                      */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    This macro is used in association with @FT_BEGIN_HEADER in header  */
-  /*    files to ensure that the declarations within are properly          */
-  /*    encapsulated in an `extern "C" { .. }' block when included from a  */
-  /*    C++ compiler.                                                      */
-  /*                                                                       */
-#ifdef __cplusplus
-#define FT_END_HEADER  }
-#else
-#define FT_END_HEADER  /* nothing */
-#endif
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* Aliases for the FreeType 2 public and configuration files.            */
-  /*                                                                       */
-  /*************************************************************************/
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Section>                                                             */
-  /*    header_file_macros                                                 */
-  /*                                                                       */
-  /* <Title>                                                               */
-  /*    Header File Macros                                                 */
-  /*                                                                       */
-  /* <Abstract>                                                            */
-  /*    Macro definitions used to #include specific header files.          */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    The following macros are defined to the name of specific           */
-  /*    FreeType 2 header files.  They can be used directly in #include    */
-  /*    statements as in:                                                  */
-  /*                                                                       */
-  /*    {                                                                  */
-  /*      #include FT_FREETYPE_H                                           */
-  /*      #include FT_MULTIPLE_MASTERS_H                                   */
-  /*      #include FT_GLYPH_H                                              */
-  /*    }                                                                  */
-  /*                                                                       */
-  /*    There are several reasons why we are now using macros to name      */
-  /*    public header files.  The first one is that such macros are not    */
-  /*    limited to the infamous 8.3 naming rule required by DOS (and       */
-  /*    `FT_MULTIPLE_MASTERS_H' is a lot more meaningful than `ftmm.h').   */
-  /*                                                                       */
-  /*    The second reason is that is allows for more flexibility in the    */
-  /*    way FreeType 2 is installed on a given system.                     */
-  /*                                                                       */
-  /*************************************************************************/
-
-  /* configuration files */
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* @macro:                                                               */
-  /*    FT_CONFIG_CONFIG_H                                                 */
-  /*                                                                       */
-  /* @description:                                                         */
-  /*    A macro used in #include statements to name the file containing    */
-  /*    FreeType 2 configuration data.                                     */
-  /*                                                                       */
-#ifndef FT_CONFIG_CONFIG_H
-#define FT_CONFIG_CONFIG_H  <freetype/config/ftconfig.h>
-#endif
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* @macro:                                                               */
-  /*    FT_CONFIG_STANDARD_LIBRARY_H                                       */
-  /*                                                                       */
-  /* @description:                                                         */
-  /*    A macro used in #include statements to name the file containing    */
-  /*    FreeType 2 configuration data.                                     */
-  /*                                                                       */
-#ifndef FT_CONFIG_STANDARD_LIBRARY_H
-#define FT_CONFIG_STANDARD_LIBRARY_H  <freetype/config/ftstdlib.h>
-#endif
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* @macro:                                                               */
-  /*    FT_CONFIG_OPTIONS_H                                                */
-  /*                                                                       */
-  /* @description:                                                         */
-  /*    A macro used in #include statements to name the file containing    */
-  /*    FreeType 2 project-specific configuration options.                 */
-  /*                                                                       */
-#ifndef FT_CONFIG_OPTIONS_H
-#define FT_CONFIG_OPTIONS_H  <freetype/config/ftoption.h>
-#endif
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* @macro:                                                               */
-  /*    FT_CONFIG_MODULES_H                                                */
-  /*                                                                       */
-  /* @description:                                                         */
-  /*    A macro used in #include statements to name the file containing    */
-  /*    the list of FreeType 2 modules that are statically linked to new   */
-  /*    library instances in @FT_Init_FreeType.                            */
-  /*                                                                       */
-#ifndef FT_CONFIG_MODULES_H
-#define FT_CONFIG_MODULES_H  <freetype/config/ftmodule.h>
-#endif
-
-  /* public headers */
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* @macro:                                                               */
-  /*    FT_FREETYPE_H                                                      */
-  /*                                                                       */
-  /* @description:                                                         */
-  /*    A macro used in #include statements to name the file containing    */
-  /*    the base FreeType 2 API.                                           */
-  /*                                                                       */
-#define FT_FREETYPE_H  <freetype/freetype.h>
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* @macro:                                                               */
-  /*    FT_ERRORS_H                                                        */
-  /*                                                                       */
-  /* @description:                                                         */
-  /*    A macro used in #include statements to name the file containing    */
-  /*    the list of FreeType 2 error codes (and messages).                 */
-  /*                                                                       */
-  /*    It is included by @FT_FREETYPE_H.                                  */
-  /*                                                                       */
-#define FT_ERRORS_H  <freetype/fterrors.h>
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* @macro:                                                               */
-  /*    FT_MODULE_ERRORS_H                                                 */
-  /*                                                                       */
-  /* @description:                                                         */
-  /*    A macro used in #include statements to name the file containing    */
-  /*    the list of FreeType 2 module error offsets (and messages).        */
-  /*                                                                       */
-#define FT_MODULE_ERRORS_H  <freetype/ftmoderr.h>
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* @macro:                                                               */
-  /*    FT_SYSTEM_H                                                        */
-  /*                                                                       */
-  /* @description:                                                         */
-  /*    A macro used in #include statements to name the file containing    */
-  /*    the FreeType 2 interface to low-level operations (i.e. memory      */
-  /*    management and stream i/o).                                        */
-  /*                                                                       */
-  /*    It is included by @FT_FREETYPE_H.                                  */
-  /*                                                                       */
-#define FT_SYSTEM_H  <freetype/ftsystem.h>
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* @macro:                                                               */
-  /*    FT_IMAGE_H                                                         */
-  /*                                                                       */
-  /* @description:                                                         */
-  /*    A macro used in #include statements to name the file containing    */
-  /*    types definitions related to glyph images (i.e. bitmaps, outlines, */
-  /*    scan-converter parameters).                                        */
-  /*                                                                       */
-  /*    It is included by @FT_FREETYPE_H.                                  */
-  /*                                                                       */
-#define FT_IMAGE_H  <freetype/ftimage.h>
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* @macro:                                                               */
-  /*    FT_TYPES_H                                                         */
-  /*                                                                       */
-  /* @description:                                                         */
-  /*    A macro used in #include statements to name the file containing    */
-  /*    the basic data types defined by FreeType 2.                        */
-  /*                                                                       */
-  /*    It is included by @FT_FREETYPE_H.                                  */
-  /*                                                                       */
-#define FT_TYPES_H  <freetype/fttypes.h>
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* @macro:                                                               */
-  /*    FT_LIST_H                                                          */
-  /*                                                                       */
-  /* @description:                                                         */
-  /*    A macro used in #include statements to name the file containing    */
-  /*    the list management API of FreeType 2.                             */
-  /*                                                                       */
-  /*    (Most applications will never need to include this file.)          */
-  /*                                                                       */
-#define FT_LIST_H  <freetype/ftlist.h>
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* @macro:                                                               */
-  /*    FT_OUTLINE_H                                                       */
-  /*                                                                       */
-  /* @description:                                                         */
-  /*    A macro used in #include statements to name the file containing    */
-  /*    the scalable outline management API of FreeType 2.                 */
-  /*                                                                       */
-#define FT_OUTLINE_H  <freetype/ftoutln.h>
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* @macro:                                                               */
-  /*    FT_SIZES_H                                                         */
-  /*                                                                       */
-  /* @description:                                                         */
-  /*    A macro used in #include statements to name the file containing    */
-  /*    the API used to manage multiple @FT_Size objects per face.         */
-  /*                                                                       */
-#define FT_SIZES_H  <freetype/ftsizes.h>
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* @macro:                                                               */
-  /*    FT_MODULE_H                                                        */
-  /*                                                                       */
-  /* @description:                                                         */
-  /*    A macro used in #include statements to name the file containing    */
-  /*    the module management API of FreeType 2.                           */
-  /*                                                                       */
-#define FT_MODULE_H  <freetype/ftmodapi.h>
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* @macro:                                                               */
-  /*    FT_RENDER_H                                                        */
-  /*                                                                       */
-  /* @description:                                                         */
-  /*    A macro used in #include statements to name the file containing    */
-  /*    the renderer module management API of FreeType 2.                  */
-  /*                                                                       */
-#define FT_RENDER_H  <freetype/ftrender.h>
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* @macro:                                                               */
-  /*    FT_TYPE1_TABLES_H                                                  */
-  /*                                                                       */
-  /* @description:                                                         */
-  /*    A macro used in #include statements to name the file containing    */
-  /*    the types and API specific to the Type 1 format.                   */
-  /*                                                                       */
-#define FT_TYPE1_TABLES_H  <freetype/t1tables.h>
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* @macro:                                                               */
-  /*    FT_TRUETYPE_IDS_H                                                  */
-  /*                                                                       */
-  /* @description:                                                         */
-  /*    A macro used in #include statements to name the file containing    */
-  /*    the enumeration values used to identify name strings, languages,   */
-  /*    encodings, etc.  This file really contains a _large_ set of        */
-  /*    constant macro definitions, taken from the TrueType and OpenType   */
-  /*    specifications.                                                    */
-  /*                                                                       */
-#define FT_TRUETYPE_IDS_H  <freetype/ttnameid.h>
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* @macro:                                                               */
-  /*    FT_TRUETYPE_TABLES_H                                               */
-  /*                                                                       */
-  /* @description:                                                         */
-  /*    A macro used in #include statements to name the file containing    */
-  /*    the types and API specific to the TrueType (as well as OpenType)   */
-  /*    format.                                                            */
-  /*                                                                       */
-#define FT_TRUETYPE_TABLES_H  <freetype/tttables.h>
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* @macro:                                                               */
-  /*    FT_TRUETYPE_TAGS_H                                                 */
-  /*                                                                       */
-  /* @description:                                                         */
-  /*    A macro used in #include statements to name the file containing    */
-  /*    the definitions of TrueType 4-byte `tags' used to identify blocks  */
-  /*    in SFNT-based font formats (i.e. TrueType and OpenType).           */
-  /*                                                                       */
-#define FT_TRUETYPE_TAGS_H  <freetype/tttags.h>
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* @macro:                                                               */
-  /*    FT_BDF_H                                                           */
-  /*                                                                       */
-  /* @description:                                                         */
-  /*    A macro used in #include statements to name the file containing    */
-  /*    the definitions of an API to access BDF-specific strings from a    */
-  /*    face.                                                              */
-  /*                                                                       */
-#define FT_BDF_H  <freetype/ftbdf.h>
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* @macro:                                                               */
-  /*    FT_GZIP_H                                                          */
-  /*                                                                       */
-  /* @description:                                                         */
-  /*    A macro used in #include statements to name the file containing    */
-  /*    the definitions of an API to support for gzip-compressed files.    */
-  /*                                                                       */
-#define FT_GZIP_H  <freetype/ftgzip.h>
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* @macro:                                                               */
-  /*    FT_WINFONTS_H                                                      */
-  /*                                                                       */
-  /* @description:                                                         */
-  /*    A macro used in #include statements to name the file containing    */
-  /*    the definitions of an API to support Windows .FNT files            */
-  /*                                                                       */
-#define FT_WINFONTS_H   <freetype/ftwinfnt.h>
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* @macro:                                                               */
-  /*    FT_GLYPH_H                                                         */
-  /*                                                                       */
-  /* @description:                                                         */
-  /*    A macro used in #include statements to name the file containing    */
-  /*    the API of the optional glyph management component.                */
-  /*                                                                       */
-#define FT_GLYPH_H  <freetype/ftglyph.h>
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* @macro:                                                               */
-  /*    FT_BBOX_H                                                          */
-  /*                                                                       */
-  /* @description:                                                         */
-  /*    A macro used in #include statements to name the file containing    */
-  /*    the API of the optional exact bounding box computation routines.   */
-  /*                                                                       */
-#define FT_BBOX_H  <freetype/ftbbox.h>
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* @macro:                                                               */
-  /*    FT_CACHE_H                                                         */
-  /*                                                                       */
-  /* @description:                                                         */
-  /*    A macro used in #include statements to name the file containing    */
-  /*    the API of the optional FreeType 2 cache sub-system.               */
-  /*                                                                       */
-#define FT_CACHE_H  <freetype/ftcache.h>
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* @macro:                                                               */
-  /*    FT_CACHE_IMAGE_H                                                   */
-  /*                                                                       */
-  /* @description:                                                         */
-  /*    A macro used in #include statements to name the file containing    */
-  /*    the `glyph image' API of the FreeType 2 cache sub-system.          */
-  /*                                                                       */
-  /*    It is used to define a cache for @FT_Glyph elements.  You can also */
-  /*    see the API defined in @FT_CACHE_SMALL_BITMAPS_H if you only need  */
-  /*    to store small glyph bitmaps, as it will use less memory.          */
-  /*                                                                       */
-#define FT_CACHE_IMAGE_H  <freetype/cache/ftcimage.h>
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* @macro:                                                               */
-  /*    FT_CACHE_SMALL_BITMAPS_H                                           */
-  /*                                                                       */
-  /* @description:                                                         */
-  /*    A macro used in #include statements to name the file containing    */
-  /*    the `small bitmaps' API of the FreeType 2 cache sub-system.        */
-  /*                                                                       */
-  /*    It is used to define a cache for small glyph bitmaps in a          */
-  /*    relatively memory-efficient way.  You can also use the API defined */
-  /*    in @FT_CACHE_IMAGE_H if you want to cache arbitrary glyph images,  */
-  /*    including scalable outlines.                                       */
-  /*                                                                       */
-#define FT_CACHE_SMALL_BITMAPS_H  <freetype/cache/ftcsbits.h>
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* @macro:                                                               */
-  /*    FT_CACHE_CHARMAP_H                                                 */
-  /*                                                                       */
-  /* @description:                                                         */
-  /*    A macro used in #include statements to name the file containing    */
-  /*    the `charmap' API of the FreeType 2 cache sub-system.              */
-  /*                                                                       */
-#define FT_CACHE_CHARMAP_H  <freetype/cache/ftccmap.h>
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* @macro:                                                               */
-  /*    FT_MAC_H                                                           */
-  /*                                                                       */
-  /* @description:                                                         */
-  /*    A macro used in #include statements to name the file containing    */
-  /*    the Macintosh-specific FreeType 2 API. The latter is used to       */
-  /*    access fonts embedded in resource forks.                           */
-  /*                                                                       */
-  /*    This header file must be explicitly included by client             */
-  /*    applications compiled on the Mac (note that the base API still     */
-  /*    works though).                                                     */
-  /*                                                                       */
-#define FT_MAC_H  <freetype/ftmac.h>
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* @macro:                                                               */
-  /*    FT_MULTIPLE_MASTERS_H                                              */
-  /*                                                                       */
-  /* @description:                                                         */
-  /*    A macro used in #include statements to name the file containing    */
-  /*    the optional multiple-masters management API of FreeType 2.        */
-  /*                                                                       */
-#define FT_MULTIPLE_MASTERS_H  <freetype/ftmm.h>
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* @macro:                                                               */
-  /*    FT_SFNT_NAMES_H                                                    */
-  /*                                                                       */
-  /* @description:                                                         */
-  /*    A macro used in #include statements to name the file containing    */
-  /*    the optional FreeType 2 API used to access embedded `name' strings */
-  /*    in SFNT-based font formats (i.e. TrueType and OpenType).           */
-  /*                                                                       */
-#define FT_SFNT_NAMES_H  <freetype/ftsnames.h>
-
-  /* */
-
-#define FT_TRIGONOMETRY_H          <freetype/fttrigon.h>
-#define FT_STROKER_H               <freetype/ftstroke.h>
-#define FT_SYNTHESIS_H             <freetype/ftsynth.h>
-#define FT_ERROR_DEFINITIONS_H     <freetype/fterrdef.h>
-
-#define FT_CACHE_MANAGER_H         <freetype/cache/ftcmanag.h>
-
-#define FT_CACHE_INTERNAL_LRU_H    <freetype/cache/ftlru.h>
-#define FT_CACHE_INTERNAL_GLYPH_H  <freetype/cache/ftcglyph.h>
-#define FT_CACHE_INTERNAL_CACHE_H  <freetype/cache/ftccache.h>
-
-#define FT_XFREE86_H               <freetype/ftxf86.h>
-
-#define FT_INCREMENTAL_H           <freetype/ftincrem.h>
-
-#define FT_TRUETYPE_UNPATENTED_H   <freetype/ttunpat.h>
-
-  /* now include internal headers definitions from <freetype/internal/...> */
-
-#define  FT_INTERNAL_INTERNAL_H    <freetype/internal/internal.h>
-#include FT_INTERNAL_INTERNAL_H
-
-
-#endif /* __FT2_BUILD_H__ */
-
-
-/* END */

gpac-2.2.1.tar.gz/extra_lib/include/freetype/freetype/config/ftmodule.h Deleted

gpac-2.2.1.tar.gz/extra_lib/include/freetype/freetype/config/ftoption.h Deleted

@@ -1,530 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  ftoption.h                                                             */
-/*                                                                         */
-/*    User-selectable configuration macros (specification only).           */
-/*                                                                         */
-/*  Copyright 1996-2001, 2002, 2003 by                                     */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef __FTOPTION_H__
-#define __FTOPTION_H__
-
-
-#include <ft2build.h>
-
-
-FT_BEGIN_HEADER
-
-  /*************************************************************************/
-  /*                                                                       */
-  /*                 USER-SELECTABLE CONFIGURATION MACROS                  */
-  /*                                                                       */
-  /* This file contains the default configuration macro definitions for    */
-  /* a standard build of the FreeType library.  There are three ways to    */
-  /* use this file to build project-specific versions of the library:      */
-  /*                                                                       */
-  /*  - You can modify this file by hand, but this is not recommended in   */
-  /*    cases where you would like to build several versions of the        */
-  /*    library from a single source directory.                            */
-  /*                                                                       */
-  /*  - You can put a copy of this file in your build directory, more      */
-  /*    precisely in "$BUILD/freetype/config/ftoption.h", where "$BUILD"   */
-  /*    is the name of a directory that is included _before_ the FreeType  */
-  /*    include path during compilation.                                   */
-  /*                                                                       */
-  /*    The default FreeType Makefiles and Jamfiles use the build          */
-  /*    directory "builds/<system>" by default, but you can easily change  */
-  /*    that for your own projects.                                        */
-  /*                                                                       */
-  /*  - Copy the file <ft2build.h> to "$BUILD/ft2build.h" and modify it    */
-  /*    slightly to pre-define the macro FT_CONFIG_OPTIONS_H used to       */
-  /*    locate this file during the build.  For example,                   */
-  /*                                                                       */
-  /*      #define FT_CONFIG_OPTIONS_H  <myftoptions.h>                     */
-  /*      #include <freetype/config/ftheader.h>                            */
-  /*                                                                       */
-  /*    will use "$BUILD/myftoptions.h" instead of this file for macro     */
-  /*    definitions.                                                       */
-  /*                                                                       */
-  /*    Note also that you can similarly pre-define the macro              */
-  /*    FT_CONFIG_MODULES_H used to locate the file listing of the modules */
-  /*    that are statically linked to the library at compile time.  By     */
-  /*    default, this file is <freetype/config/ftmodule.h>.                */
-  /*                                                                       */
-  /*  We highly recommend using the third method whenever possible.        */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-  /*************************************************************************/
-  /*************************************************************************/
-  /****                                                                 ****/
-  /**** G E N E R A L   F R E E T Y P E   2   C O N F I G U R A T I O N ****/
-  /****                                                                 ****/
-  /*************************************************************************/
-  /*************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* Many compilers provide a non-ANSI 64-bit data type that can be used   */
-  /* by FreeType to speed up some computations.  However, this will create */
-  /* some problems when compiling the library in strict ANSI mode.         */
-  /*                                                                       */
-  /* For this reason, the use of 64-bit integers is normally disabled when */
-  /* the __STDC__ macro is defined.  You can however disable this by       */
-  /* defining the macro FT_CONFIG_OPTION_FORCE_INT64 here.                 */
-  /*                                                                       */
-  /* For most compilers, this will only create compilation warnings when   */
-  /* building the library.                                                 */
-  /*                                                                       */
-  /* ObNote: The compiler-specific 64-bit integers are detected in the     */
-  /*         file "ftconfig.h" either statically or through the            */
-  /*         `configure' script on supported platforms.                    */
-  /*                                                                       */
-#undef  FT_CONFIG_OPTION_FORCE_INT64
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* Gzip-compressed file support.                                         */
-  /*                                                                       */
-  /*   FreeType now handles font files that have been compressed with the  */
-  /*   'gzip' program.  This is mostly used to parse many of the PCF files */
-  /*   that come with XFree86.  The implementation uses `zlib' to          */
-  /*   partially uncompress the file on the fly (see src/base/ftgzip.c).   */
-  /*                                                                       */
-  /*   Define this macro if you want to enable this "feature".  Note that  */
-  /*   this will however force you to link the zlib to any program that    */
-  /*   also uses FreeType.                                                 */
-  /*                                                                       */
-#define FT_CONFIG_OPTION_USE_ZLIB
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* ZLib library selection                                                */
-  /*                                                                       */
-  /*   This macro is only used when FT_CONFIG_OPTION_USE_ZLIB is defined.  */
-  /*   It allows FreeType's "ftgzip" component to link to the system's     */
-  /*   installation of the ZLib library.  This is useful on systems like   */
-  /*   Unix or VMS where it generally is already available.                */
-  /*                                                                       */
-  /*   If you let it undefined, the component will use its own copy        */
-  /*   of the zlib sources instead.  These have been modified to be        */
-  /*   included directly within the component and *not* export external    */
-  /*   function names.  This allows you to link any program with FreeType  */
-  /*   _and_ ZLib without linking conflicts.                               */
-  /*                                                                       */
-  /*   Do not #undef this macro here since the build system might define   */
-  /*   it for certain configurations only.                                 */
-  /*                                                                       */
-/* #define  FT_CONFIG_OPTION_SYSTEM_ZLIB */
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* DLL export compilation                                                */
-  /*                                                                       */
-  /*   When compiling FreeType as a DLL, some systems/compilers need a     */
-  /*   special keyword in front OR after the return type of function       */
-  /*   declarations.                                                       */
-  /*                                                                       */
-  /*   Two macros are used within the FreeType source code to define       */
-  /*   exported library functions: FT_EXPORT and FT_EXPORT_DEF.            */
-  /*                                                                       */
-  /*     FT_EXPORT( return_type )                                          */
-  /*                                                                       */
-  /*       is used in a function declaration, as in                        */
-  /*                                                                       */
-  /*         FT_EXPORT( FT_Error )                                         */
-  /*         FT_Init_FreeType( FT_Library*  alibrary );                    */
-  /*                                                                       */
-  /*                                                                       */
-  /*     FT_EXPORT_DEF( return_type )                                      */
-  /*                                                                       */
-  /*       is used in a function definition, as in                         */
-  /*                                                                       */
-  /*         FT_EXPORT_DEF( FT_Error )                                     */
-  /*         FT_Init_FreeType( FT_Library*  alibrary )                     */
-  /*         {                                                             */
-  /*           ... some code ...                                           */
-  /*           return FT_Err_Ok;                                           */
-  /*         }                                                             */
-  /*                                                                       */
-  /*   You can provide your own implementation of FT_EXPORT and            */
-  /*   FT_EXPORT_DEF here if you want.  If you leave them undefined, they  */
-  /*   will be later automatically defined as `extern return_type' to      */
-  /*   allow normal compilation.                                           */
-  /*                                                                       */
-  /*   Do not #undef these macros here since the build system might define */
-  /*   them for certain configurations only.                               */
-  /*                                                                       */
-/* #define  FT_EXPORT(x)       extern x */
-/* #define  FT_EXPORT_DEF(x)   x */
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* Glyph Postscript Names handling                                       */
-  /*                                                                       */
-  /*   By default, FreeType 2 is compiled with the `PSNames' module.  This */
-  /*   module is in charge of converting a glyph name string into a        */
-  /*   Unicode value, or return a Macintosh standard glyph name for the    */
-  /*   use with the TrueType `post' table.                                 */
-  /*                                                                       */
-  /*   Undefine this macro if you do not want `PSNames' compiled in your   */
-  /*   build of FreeType.  This has the following effects:                 */
-  /*                                                                       */
-  /*   - The TrueType driver will provide its own set of glyph names,      */
-  /*     if you build it to support postscript names in the TrueType       */
-  /*     `post' table.                                                     */
-  /*                                                                       */
-  /*   - The Type 1 driver will not be able to synthetize a Unicode        */
-  /*     charmap out of the glyphs found in the fonts.                     */
-  /*                                                                       */
-  /*   You would normally undefine this configuration macro when building  */
-  /*   a version of FreeType that doesn't contain a Type 1 or CFF driver.  */
-  /*                                                                       */
-#define FT_CONFIG_OPTION_POSTSCRIPT_NAMES
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* Postscript Names to Unicode Values support                            */
-  /*                                                                       */
-  /*   By default, FreeType 2 is built with the `PSNames' module compiled  */
-  /*   in.  Among other things, the module is used to convert a glyph name */
-  /*   into a Unicode value.  This is especially useful in order to        */
-  /*   synthetize on the fly a Unicode charmap from the CFF/Type 1 driver  */
-  /*   through a big table named the `Adobe Glyph List' (AGL).             */
-  /*                                                                       */
-  /*   Undefine this macro if you do not want the Adobe Glyph List         */
-  /*   compiled in your `PSNames' module.  The Type 1 driver will not be   */
-  /*   able to synthetize a Unicode charmap out of the glyphs found in the */
-  /*   fonts.                                                              */
-  /*                                                                       */
-#define FT_CONFIG_OPTION_ADOBE_GLYPH_LIST
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* Support for Mac fonts                                                 */
-  /*                                                                       */
-  /*   Define this macro if you want support for outline fonts in Mac      */
-  /*   format (mac dfont, mac resource, macbinary containing a mac         */
-  /*   resource) on non-Mac platforms.                                     */
-  /*                                                                       */
-  /*   Note that the `FOND' resource isn't checked.                        */
-  /*                                                                       */
-#define FT_CONFIG_OPTION_MAC_FONTS
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* Allow the use of FT_Incremental_Interface to load typefaces that      */
-  /* contain no glyph data, but supply it via a callback function.         */
-  /* This allows FreeType to be used with the PostScript language, using   */
-  /* the GhostScript interpreter.                                          */
-  /*                                                                       */
-/* #define FT_CONFIG_OPTION_INCREMENTAL */
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* The size in bytes of the render pool used by the scan-line converter  */
-  /* to do all of its work.                                                */
-  /*                                                                       */
-  /* This must be greater than 4KByte.                                     */
-  /*                                                                       */
-#define FT_RENDER_POOL_SIZE  16384L
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* FT_MAX_MODULES                                                        */
-  /*                                                                       */
-  /*   The maximum number of modules that can be registered in a single    */
-  /*   FreeType library object.  32 is the default.                        */
-  /*                                                                       */
-#define FT_MAX_MODULES  32
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* Debug level                                                           */
-  /*                                                                       */
-  /*   FreeType can be compiled in debug or trace mode.  In debug mode,    */
-  /*   errors are reported through the `ftdebug' component.  In trace      */
-  /*   mode, additional messages are sent to the standard output during    */
-  /*   execution.                                                          */
-  /*                                                                       */
-  /*   Define FT_DEBUG_LEVEL_ERROR to build the library in debug mode.     */
-  /*   Define FT_DEBUG_LEVEL_TRACE to build it in trace mode.              */
-  /*                                                                       */
-  /*   Don't define any of these macros to compile in `release' mode!      */
-  /*                                                                       */
-  /*   Do not #undef these macros here since the build system might define */
-  /*   them for certain configurations only.                               */
-  /*                                                                       */
-/* #define FT_DEBUG_LEVEL_ERROR */
-/* #define FT_DEBUG_LEVEL_TRACE */
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* Memory Debugging                                                      */
-  /*                                                                       */
-  /*   FreeType now comes with an integrated memory debugger that is       */
-  /*   capable of detecting simple errors like memory leaks or double      */
-  /*   deletes.  To compile it within your build of the library, you       */
-  /*   should define FT_DEBUG_MEMORY here.                                 */
-  /*                                                                       */
-  /*   Note that the memory debugger is only activated at runtime when     */
-  /*   when the _environment_ variable "FT2_DEBUG_MEMORY" is defined also! */
-  /*                                                                       */
-  /*   Do not #undef this macro here since the build system might define   */
-  /*   it for certain configurations only.                                 */
-  /*                                                                       */
-/* #define FT_DEBUG_MEMORY */
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* Module errors                                                         */
-  /*                                                                       */
-  /*   If this macro is set (which is _not_ the default), the higher byte  */
-  /*   of an error code gives the module in which the error has occurred,  */
-  /*   while the lower byte is the real error code.                        */
-  /*                                                                       */
-  /*   Setting this macro makes sense for debugging purposes only, since   */
-  /*   it would break source compatibility of certain programs that use    */
-  /*   FreeType 2.                                                         */
-  /*                                                                       */
-  /*   More details can be found in the files ftmoderr.h and fterrors.h.   */
-  /*                                                                       */
-#undef FT_CONFIG_OPTION_USE_MODULE_ERRORS
-
-
-
-  /*************************************************************************/
-  /*************************************************************************/
-  /****                                                                 ****/
-  /****        S F N T   D R I V E R    C O N F I G U R A T I O N       ****/
-  /****                                                                 ****/
-  /*************************************************************************/
-  /*************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* Define TT_CONFIG_OPTION_EMBEDDED_BITMAPS if you want to support       */
-  /* embedded bitmaps in all formats using the SFNT module (namely         */
-  /* TrueType & OpenType).                                                 */
-  /*                                                                       */
-#define TT_CONFIG_OPTION_EMBEDDED_BITMAPS
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* Define TT_CONFIG_OPTION_POSTSCRIPT_NAMES if you want to be able to    */
-  /* load and enumerate the glyph Postscript names in a TrueType or        */
-  /* OpenType file.                                                        */
-  /*                                                                       */
-  /* Note that when you do not compile the `PSNames' module by undefining  */
-  /* the above FT_CONFIG_OPTION_POSTSCRIPT_NAMES, the `sfnt' module will   */
-  /* contain additional code used to read the PS Names table from a font.  */
-  /*                                                                       */
-  /* (By default, the module uses `PSNames' to extract glyph names.)       */
-  /*                                                                       */
-#define TT_CONFIG_OPTION_POSTSCRIPT_NAMES
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* Define TT_CONFIG_OPTION_SFNT_NAMES if your applications need to       */
-  /* access the internal name table in a SFNT-based format like TrueType   */
-  /* or OpenType.  The name table contains various strings used to         */
-  /* describe the font, like family name, copyright, version, etc.  It     */
-  /* does not contain any glyph name though.                               */
-  /*                                                                       */
-  /* Accessing SFNT names is done through the functions declared in        */
-  /* `freetype/ftnames.h'.                                                 */
-  /*                                                                       */
-#define TT_CONFIG_OPTION_SFNT_NAMES
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* TrueType CMap support                                                 */
-  /*                                                                       */
-  /*   Here you can fine-tune which TrueType CMap table format shall be    */
-  /*   supported.                                                          */
-#define TT_CONFIG_CMAP_FORMAT_0
-#define TT_CONFIG_CMAP_FORMAT_2
-#define TT_CONFIG_CMAP_FORMAT_4
-#define TT_CONFIG_CMAP_FORMAT_6
-#define TT_CONFIG_CMAP_FORMAT_8
-#define TT_CONFIG_CMAP_FORMAT_10
-#define TT_CONFIG_CMAP_FORMAT_12
-
-
-  /*************************************************************************/
-  /*************************************************************************/
-  /****                                                                 ****/
-  /****    T R U E T Y P E   D R I V E R    C O N F I G U R A T I O N   ****/
-  /****                                                                 ****/
-  /*************************************************************************/
-  /*************************************************************************/
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* Define TT_CONFIG_OPTION_BYTECODE_INTERPRETER if you want to compile   */
-  /* a bytecode interpreter in the TrueType driver.  Note that there are   */
-  /* important patent issues related to the use of the interpreter.        */
-  /*                                                                       */
-  /* By undefining this, you will only compile the code necessary to load  */
-  /* TrueType glyphs without hinting.                                      */
-  /*                                                                       */
-  /*   Do not #undef this macro here, since the build system might         */
-  /*   define it for certain configurations only.                          */
-  /*                                                                       */
-/* #define  TT_CONFIG_OPTION_BYTECODE_INTERPRETER */
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* Define TT_CONFIG_OPTION_UNPATENTED_HINTING (in addition to            */
-  /* TT_CONFIG_OPTION_BYTECODE_INTERPRETER) to compile the unpatented      */
-  /* work-around hinting system.  Note that for the moment, the algorithm  */
-  /* is only used when selected at runtime through the parameter tag       */
-  /* FT_PARAM_TAG_UNPATENTED_HINTING; or when the debug hook               */
-  /* FT_DEBUG_HOOK_UNPATENTED_HINTING is globally actived                  */
-  /*                                                                       */
-#define TT_CONFIG_OPTION_UNPATENTED_HINTING
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* Define TT_CONFIG_OPTION_INTERPRETER_SWITCH to compile the TrueType    */
-  /* bytecode interpreter with a huge switch statement, rather than a call */
-  /* table.  This results in smaller and faster code for a number of       */
-  /* architectures.                                                        */
-  /*                                                                       */
-  /* Note however that on some compiler/processor combinations, undefining */
-  /* this macro will generate faster, though larger, code.                 */
-  /*                                                                       */
-#define TT_CONFIG_OPTION_INTERPRETER_SWITCH
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* Define TT_CONFIG_OPTION_COMPONENT_OFFSET_SCALED to compile the        */
-  /* TrueType glyph loader to use Apple's definition of how to handle      */
-  /* component offsets in composite glyphs.                                */
-  /*                                                                       */
-  /* Apple and MS disagree on the default behavior of component offsets    */
-  /* in composites.  Apple says that they should be scaled by the scale    */
-  /* factors in the transformation matrix (roughly, it's more complex)     */
-  /* while MS says they should not.  OpenType defines two bits in the      */
-  /* composite flags array which can be used to disambiguate, but old      */
-  /* fonts will not have them.                                             */
-  /*                                                                       */
-  /*   http://partners.adobe.com/asn/developer/opentype/glyf.html          */
-  /*   http://fonts.apple.com/TTRefMan/RM06/Chap6glyf.html                 */
-  /*                                                                       */
-#undef TT_CONFIG_OPTION_COMPONENT_OFFSET_SCALED
-
-
-  /*************************************************************************/
-  /*************************************************************************/
-  /****                                                                 ****/
-  /****      T Y P E 1   D R I V E R    C O N F I G U R A T I O N       ****/
-  /****                                                                 ****/
-  /*************************************************************************/
-  /*************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* T1_MAX_DICT_DEPTH is the maximal depth of nest dictionaries and       */
-  /* arrays in the Type 1 stream (see t1load.c).  A minimum of 4 is        */
-  /* required.                                                             */
-  /*                                                                       */
-#define T1_MAX_DICT_DEPTH  5
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* T1_MAX_SUBRS_CALLS details the maximum number of nested sub-routine   */
-  /* calls during glyph loading.                                           */
-  /*                                                                       */
-#define T1_MAX_SUBRS_CALLS  16
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* T1_MAX_CHARSTRING_OPERANDS is the charstring stack's capacity.  A     */
-  /* minimum of 16 is required.                                            */
-  /*                                                                       */
-  /* The Chinese font MingTiEG-Medium (CNS 11643 character set) needs 256. */
-  /*                                                                       */
-#define T1_MAX_CHARSTRINGS_OPERANDS  256
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* Define this configuration macro if you want to prevent the            */
-  /* compilation of `t1afm', which is in charge of reading Type 1 AFM      */
-  /* files into an existing face.  Note that if set, the T1 driver will be */
-  /* unable to produce kerning distances.                                  */
-  /*                                                                       */
-#undef T1_CONFIG_OPTION_NO_AFM
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* Define this configuration macro if you want to prevent the            */
-  /* compilation of the Multiple Masters font support in the Type 1        */
-  /* driver.                                                               */
-  /*                                                                       */
-#undef T1_CONFIG_OPTION_NO_MM_SUPPORT
-
- /* */
-
-/*
- * The FT_CONFIG_OPTION_CHESTER_XXXX macros are used to toggle some recent
- * improvements to the auto-hinter contributed by David Chester.  They will
- * most likely disappear completely in the next release.  For now, you
- * should always keep them defined.
- *
- */
-#define  FT_CONFIG_OPTION_CHESTER_HINTS
-
-#ifdef   FT_CONFIG_OPTION_CHESTER_HINTS
-
-#define  FT_CONFIG_CHESTER_SMALL_F
-#define  FT_CONFIG_CHESTER_ASCENDER
-#define  FT_CONFIG_CHESTER_SERIF
-#define  FT_CONFIG_CHESTER_STEM
-#define  FT_CONFIG_CHESTER_BLUE_SCALE
-
-#endif /* FT_CONFIG_OPTION_CHESTER_HINTS */
-
-FT_END_HEADER
-
-
-#endif /* __FTOPTION_H__ */
-
-
-/* END */

gpac-2.2.1.tar.gz/extra_lib/include/freetype/freetype/config/ftstdlib.h Deleted

@@ -1,147 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  ftstdlib.h                                                             */
-/*                                                                         */
-/*    ANSI-specific library and header configuration file (specification   */
-/*    only).                                                               */
-/*                                                                         */
-/*  Copyright 2002, 2003 by                                                */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* This file is used to group all #includes to the ANSI C library that   */
-  /* FreeType normally requires.  It also defines macros to rename the     */
-  /* standard functions within the FreeType source code.                   */
-  /*                                                                       */
-  /* Load a file which defines __FTSTDLIB_H__ before this one to override  */
-  /* it.                                                                   */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-#ifndef __FTSTDLIB_H__
-#define __FTSTDLIB_H__
-
-
-  /**********************************************************************/
-  /*                                                                    */
-  /*                           integer limits                           */
-  /*                                                                    */
-  /* UINT_MAX and ULONG_MAX are used to automatically compute the size  */
-  /* of `int' and `long' in bytes at compile-time.  So far, this works  */
-  /* for all platforms the library has been tested on.                  */
-  /*                                                                    */
-  /* Note that on the extremely rare platforms that do not provide      */
-  /* integer types that are _exactly_ 16 and 32 bits wide (e.g. some    */
-  /* old Crays where `int' is 36 bits), we do not make any guarantee    */
-  /* about the correct behaviour of FT2 with all fonts.                 */
-  /*                                                                    */
-  /* In these case, "ftconfig.h" will refuse to compile anyway with a   */
-  /* message like "couldn't find 32-bit type" or something similar.     */
-  /*                                                                    */
-  /* IMPORTANT NOTE: We do not define aliases for heap management and   */
-  /*                 i/o routines (i.e. malloc/free/fopen/fread/...)    */
-  /*                 since these functions should all be encapsulated   */
-  /*                 by platform-specific implementations of            */
-  /*                 "ftsystem.c".                                      */
-  /*                                                                    */
-  /**********************************************************************/
-
-
-#include <limits.h>
-
-#define FT_UINT_MAX   UINT_MAX
-#define FT_ULONG_MAX  ULONG_MAX
-
-
-  /**********************************************************************/
-  /*                                                                    */
-  /*                 character and string processing                    */
-  /*                                                                    */
-  /**********************************************************************/
-
-
-#include <ctype.h>
-
-#define ft_isalnum   isalnum
-#define ft_isupper   isupper
-#define ft_islower   islower
-#define ft_isdigit   isdigit
-#define ft_isxdigit  isxdigit
-
-
-#include <string.h>
-
-#define ft_strlen   strlen
-#define ft_strcat   strcat
-#define ft_strcmp   strcmp
-#define ft_strncmp  strncmp
-#define ft_memcpy   memcpy
-#define ft_strcpy   strcpy
-#define ft_strncpy  strncpy
-#define ft_memset   memset
-#define ft_memmove  memmove
-#define ft_memcmp   memcmp
-
-#include <stdio.h>
-
-#define ft_sprintf  sprintf
-
-
-  /**********************************************************************/
-  /*                                                                    */
-  /*                             sorting                                */
-  /*                                                                    */
-  /**********************************************************************/
-
-
-#include <stdlib.h>
-
-#define ft_qsort  qsort
-#define ft_exit   exit    /* only used to exit from unhandled exceptions */
-
-#define ft_atoi   atoi
-
-
-  /**********************************************************************/
-  /*                                                                    */
-  /*                         execution control                          */
-  /*                                                                    */
-  /**********************************************************************/
-
-
-#include <setjmp.h>
-
-#define ft_jmp_buf  jmp_buf   /* note: this cannot be a typedef since */
-                              /*       jmp_buf is defined as a macro  */
-                              /*       on certain platforms           */
-
-#define ft_setjmp   setjmp    /* same thing here */
-#define ft_longjmp  longjmp   /* "               */
-
-/*avoids warning..*/
-#include <stddef.h>
-#ifndef offsetof
-#define offsetof(s,m) ((size_t)&(((s*)0)->m))
-#endif
-
-  /* the following is only used for debugging purposes, i.e. when */
-  /* FT_DEBUG_LEVEL_ERROR or FT_DEBUG_LEVEL_TRACE are defined     */
-  /*                                                              */
-#include <stdarg.h>
-
-
-#endif /* __FTSTDLIB_H__ */
-
-
-/* END */

gpac-2.2.1.tar.gz/extra_lib/include/freetype/freetype/freetype.h Deleted

@@ -1,2986 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  freetype.h                                                             */
-/*                                                                         */
-/*    FreeType high-level API and common types (specification only).       */
-/*                                                                         */
-/*  Copyright 1996-2001, 2002, 2003 by                                     */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef FT_FREETYPE_H
-#error "`ft2build.h' hasn't been included yet!"
-#error "Please always use macros to include FreeType header files."
-#error "Example:"
-#error "  #include <ft2build.h>"
-#error "  #include FT_FREETYPE_H"
-#endif
-
-
-#ifndef __FREETYPE_H__
-#define __FREETYPE_H__
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* The `raster' component duplicates some of the declarations in         */
-  /* freetype.h for stand-alone use if _FREETYPE_ isn't defined.           */
-  /*                                                                       */
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* The FREETYPE_MAJOR and FREETYPE_MINOR macros are used to version the  */
-  /* new FreeType design, which is able to host several kinds of font      */
-  /* drivers.  It starts at 2.0.                                           */
-  /*                                                                       */
-#define FREETYPE_MAJOR 2
-#define FREETYPE_MINOR 1
-#define FREETYPE_PATCH 7
-
-
-#include <ft2build.h>
-#include FT_CONFIG_CONFIG_H
-#include FT_ERRORS_H
-#include FT_TYPES_H
-
-
-FT_BEGIN_HEADER
-
-
-  /*************************************************************************/
-  /*************************************************************************/
-  /*                                                                       */
-  /*                        B A S I C   T Y P E S                          */
-  /*                                                                       */
-  /*************************************************************************/
-  /*************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Section>                                                             */
-  /*    base_interface                                                     */
-  /*                                                                       */
-  /* <Title>                                                               */
-  /*    Base Interface                                                     */
-  /*                                                                       */
-  /* <Abstract>                                                            */
-  /*    The FreeType 2 base font interface.                                */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    This section describes the public high-level API of FreeType 2.    */
-  /*                                                                       */
-  /* <Order>                                                               */
-  /*    FT_Library                                                         */
-  /*    FT_Face                                                            */
-  /*    FT_Size                                                            */
-  /*    FT_GlyphSlot                                                       */
-  /*    FT_CharMap                                                         */
-  /*    FT_Encoding                                                        */
-  /*                                                                       */
-  /*    FT_FaceRec                                                         */
-  /*                                                                       */
-  /*    FT_FACE_FLAG_SCALABLE                                              */
-  /*    FT_FACE_FLAG_FIXED_SIZES                                           */
-  /*    FT_FACE_FLAG_FIXED_WIDTH                                           */
-  /*    FT_FACE_FLAG_HORIZONTAL                                            */
-  /*    FT_FACE_FLAG_VERTICAL                                              */
-  /*    FT_FACE_FLAG_SFNT                                                  */
-  /*    FT_FACE_FLAG_KERNING                                               */
-  /*    FT_FACE_FLAG_MULTIPLE_MASTERS                                      */
-  /*    FT_FACE_FLAG_GLYPH_NAMES                                           */
-  /*    FT_FACE_FLAG_EXTERNAL_STREAM                                       */
-  /*    FT_FACE_FLAG_FAST_GLYPHS                                           */
-  /*                                                                       */
-  /*    FT_STYLE_FLAG_BOLD                                                 */
-  /*    FT_STYLE_FLAG_ITALIC                                               */
-  /*                                                                       */
-  /*    FT_SizeRec                                                         */
-  /*    FT_Size_Metrics                                                    */
-  /*                                                                       */
-  /*    FT_GlyphSlotRec                                                    */
-  /*    FT_Glyph_Metrics                                                   */
-  /*    FT_SubGlyph                                                        */
-  /*                                                                       */
-  /*    FT_Bitmap_Size                                                     */
-  /*                                                                       */
-  /*    FT_Init_FreeType                                                   */
-  /*    FT_Done_FreeType                                                   */
-  /*    FT_Library_Version                                                 */
-  /*                                                                       */
-  /*    FT_New_Face                                                        */
-  /*    FT_Done_Face                                                       */
-  /*    FT_New_Memory_Face                                                 */
-  /*    FT_Open_Face                                                       */
-  /*    FT_Open_Args                                                       */
-  /*    FT_Parameter                                                       */
-  /*    FT_Attach_File                                                     */
-  /*    FT_Attach_Stream                                                   */
-  /*                                                                       */
-  /*    FT_Set_Char_Size                                                   */
-  /*    FT_Set_Pixel_Sizes                                                 */
-  /*    FT_Set_Transform                                                   */
-  /*    FT_Load_Glyph                                                      */
-  /*    FT_Get_Char_Index                                                  */
-  /*    FT_Get_Name_Index                                                  */
-  /*    FT_Load_Char                                                       */
-  /*                                                                       */
-  /*    FT_OPEN_MEMORY                                                     */
-  /*    FT_OPEN_STREAM                                                     */
-  /*    FT_OPEN_PATHNAME                                                   */
-  /*    FT_OPEN_DRIVER                                                     */
-  /*    FT_OPEN_PARAMS                                                     */
-  /*                                                                       */
-  /*    FT_LOAD_DEFAULT                                                    */
-  /*    FT_LOAD_RENDER                                                     */
-  /*    FT_LOAD_MONOCHROME                                                 */
-  /*    FT_LOAD_LINEAR_DESIGN                                              */
-  /*    FT_LOAD_NO_SCALE                                                   */
-  /*    FT_LOAD_NO_HINTING                                                 */
-  /*    FT_LOAD_NO_BITMAP                                                  */
-  /*    FT_LOAD_CROP_BITMAP                                                */
-  /*                                                                       */
-  /*    FT_LOAD_VERTICAL_LAYOUT                                            */
-  /*    FT_LOAD_IGNORE_TRANSFORM                                           */
-  /*    FT_LOAD_IGNORE_GLOBAL_ADVANCE_WIDTH                                */
-  /*    FT_LOAD_FORCE_AUTOHINT                                             */
-  /*    FT_LOAD_NO_RECURSE                                                 */
-  /*    FT_LOAD_PEDANTIC                                                   */
-  /*                                                                       */
-  /*    FT_LOAD_TARGET_NORMAL                                              */
-  /*    FT_LOAD_TARGET_LIGHT                                               */
-  /*    FT_LOAD_TARGET_MONO                                                */
-  /*    FT_LOAD_TARGET_LCD                                                 */
-  /*    FT_LOAD_TARGET_LCD_V                                               */
-  /*                                                                       */
-  /*    FT_Render_Glyph                                                    */
-  /*    FT_Render_Mode                                                     */
-  /*    FT_Get_Kerning                                                     */
-  /*    FT_Kerning_Mode                                                    */
-  /*    FT_Get_Glyph_Name                                                  */
-  /*    FT_Get_Postscript_Name                                             */
-  /*                                                                       */
-  /*    FT_CharMapRec                                                      */
-  /*    FT_Select_Charmap                                                  */
-  /*    FT_Set_Charmap                                                     */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    FT_Glyph_Metrics                                                   */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A structure used to model the metrics of a single glyph.  The      */
-  /*    values are expressed in 26.6 fractional pixel format; if the flag  */
-  /*    FT_LOAD_NO_SCALE is used, values are returned in font units        */
-  /*    instead.                                                           */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    width        :: The glyph's width.                                 */
-  /*                                                                       */
-  /*    height       :: The glyph's height.                                */
-  /*                                                                       */
-  /*    horiBearingX :: Horizontal left side bearing.                      */
-  /*                                                                       */
-  /*    horiBearingY :: Horizontal top side bearing.                       */
-  /*                                                                       */
-  /*    horiAdvance  :: Horizontal advance width.                          */
-  /*                                                                       */
-  /*    vertBearingX :: Vertical left side bearing.                        */
-  /*                                                                       */
-  /*    vertBearingY :: Vertical top side bearing.                         */
-  /*                                                                       */
-  /*    vertAdvance  :: Vertical advance height.                           */
-  /*                                                                       */
-  typedef struct  FT_Glyph_Metrics_
-  {
-    FT_Pos  width;         /* glyph width  */
-    FT_Pos  height;        /* glyph height */
-
-    FT_Pos  horiBearingX;  /* left side bearing in horizontal layouts */
-    FT_Pos  horiBearingY;  /* top side bearing in horizontal layouts  */
-    FT_Pos  horiAdvance;   /* advance width for horizontal layout     */
-
-    FT_Pos  vertBearingX;  /* left side bearing in vertical layouts */
-    FT_Pos  vertBearingY;  /* top side bearing in vertical layouts  */
-    FT_Pos  vertAdvance;   /* advance height for vertical layout    */
-
-  } FT_Glyph_Metrics;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    FT_Bitmap_Size                                                     */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    This structure models the size of a bitmap strike (i.e., a bitmap  */
-  /*    instance of the font for a given resolution) in a fixed-size font  */
-  /*    face.  It is used for the `available_sizes' field of the           */
-  /*    @FT_FaceRec structure.                                             */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    height :: The (vertical) baseline-to-baseline distance in pixels.  */
-  /*              It makes most sense to define the height of a bitmap     */
-  /*              font in this way.                                        */
-  /*                                                                       */
-  /*    width  :: The average width of the font (in pixels).  Since the    */
-  /*              algorithms to compute this value are different for the   */
-  /*              various bitmap formats, it can only give an additional   */
-  /*              hint if the `height' value isn't sufficient to select    */
-  /*              the proper font.  For monospaced fonts the average width */
-  /*              is the same as the maximum width.                        */
-  /*                                                                       */
-  /*    size   :: The point size in 26.6 fractional format this font shall */
-  /*              represent (for a given vertical resolution).             */
-  /*                                                                       */
-  /*    x_ppem :: The horizontal ppem value (in 26.6 fractional format).   */
-  /*                                                                       */
-  /*    y_ppem :: The vertical ppem value (in 26.6 fractional format).     */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    The values in this structure are taken from the bitmap font.  If   */
-  /*    the font doesn't provide a parameter it is set to zero to indicate */
-  /*    that the information is not available.                             */
-  /*                                                                       */
-  /*    The following formula converts from dpi to ppem:                   */
-  /*                                                                       */
-  /*      ppem = size * dpi / 72                                           */
-  /*                                                                       */
-  /*    where `size' is in points.                                         */
-  /*                                                                       */
-  /*    Windows FNT:                                                       */
-  /*      The `size', `x_ppem', and `y_ppem' parameters are not reliable:  */
-  /*      There exist fonts (e.g. app850.fon) which have a wrong size for  */
-  /*      some subfonts; since FNT files don't contain ppem but dpi values */
-  /*      the computed x_ppem and y_ppem numbers are thus wrong also.      */
-  /*                                                                       */
-  /*    TrueType embedded bitmaps:                                         */
-  /*      `size', `width', and `height' values are not contained in the    */
-  /*      bitmap strike itself.  They are computed from the global font    */
-  /*      parameters.                                                      */
-  /*                                                                       */
-  typedef struct  FT_Bitmap_Size_
-  {
-    FT_Short  height;
-    FT_Short  width;
-
-    FT_Pos    size;
-
-    FT_Pos    x_ppem;
-    FT_Pos    y_ppem;
-
-  } FT_Bitmap_Size;
-
-
-  /*************************************************************************/
-  /*************************************************************************/
-  /*                                                                       */
-  /*                     O B J E C T   C L A S S E S                       */
-  /*                                                                       */
-  /*************************************************************************/
-  /*************************************************************************/
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Type>                                                                */
-  /*    FT_Library                                                         */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A handle to a FreeType library instance.  Each `library' is        */
-  /*    completely independent from the others; it is the `root' of a set  */
-  /*    of objects like fonts, faces, sizes, etc.                          */
-  /*                                                                       */
-  /*    It also embeds a memory manager (see @FT_Memory), as well as a     */
-  /*    scan-line converter object (see @FT_Raster).                       */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    Library objects are normally created by @FT_Init_FreeType, and     */
-  /*    destroyed with @FT_Done_FreeType.                                  */
-  /*                                                                       */
-  typedef struct FT_LibraryRec_  *FT_Library;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Type>                                                                */
-  /*    FT_Module                                                          */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A handle to a given FreeType module object.  Each module can be a  */
-  /*    font driver, a renderer, or anything else that provides services   */
-  /*    to the formers.                                                    */
-  /*                                                                       */
-  typedef struct FT_ModuleRec_*  FT_Module;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Type>                                                                */
-  /*    FT_Driver                                                          */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A handle to a given FreeType font driver object.  Each font driver */
-  /*    is a special module capable of creating faces from font files.     */
-  /*                                                                       */
-  typedef struct FT_DriverRec_*  FT_Driver;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Type>                                                                */
-  /*    FT_Renderer                                                        */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A handle to a given FreeType renderer.  A renderer is a special    */
-  /*    module in charge of converting a glyph image to a bitmap, when     */
-  /*    necessary.  Each renderer supports a given glyph image format, and */
-  /*    one or more target surface depths.                                 */
-  /*                                                                       */
-  typedef struct FT_RendererRec_*  FT_Renderer;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Type>                                                                */
-  /*    FT_Face                                                            */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A handle to a given typographic face object.  A face object models */
-  /*    a given typeface, in a given style.                                */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    Each face object also owns a single @FT_GlyphSlot object, as well  */
-  /*    as one or more @FT_Size objects.                                   */
-  /*                                                                       */
-  /*    Use @FT_New_Face or @FT_Open_Face to create a new face object from */
-  /*    a given filepathname or a custom input stream.                     */
-  /*                                                                       */
-  /*    Use @FT_Done_Face to destroy it (along with its slot and sizes).   */
-  /*                                                                       */
-  /* <Also>                                                                */
-  /*    The @FT_FaceRec details the publicly accessible fields of a given  */
-  /*    face object.                                                       */
-  /*                                                                       */
-  typedef struct FT_FaceRec_*  FT_Face;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Type>                                                                */
-  /*    FT_Size                                                            */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A handle to a given size object.  Such an object models the data   */
-  /*    that depends on the current _resolution_ and _character size_ in a */
-  /*    given @FT_Face.                                                    */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    Each face object owns one or more sizes.  There is however a       */
-  /*    single _active_ size for the face at any time that will be used by */
-  /*    functions like @FT_Load_Glyph, @FT_Get_Kerning, etc.               */
-  /*                                                                       */
-  /*    You can use the @FT_Activate_Size API to change the current        */
-  /*    active size of any given face.                                     */
-  /*                                                                       */
-  /* <Also>                                                                */
-  /*    The @FT_SizeRec structure details the publicly accessible fields   */
-  /*    of a given face object.                                            */
-  /*                                                                       */
-  typedef struct FT_SizeRec_*  FT_Size;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Type>                                                                */
-  /*    FT_GlyphSlot                                                       */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A handle to a given `glyph slot'.  A slot is a container where it  */
-  /*    is possible to load any one of the glyphs contained in its parent  */
-  /*    face.                                                              */
-  /*                                                                       */
-  /*    In other words, each time you call @FT_Load_Glyph or               */
-  /*    @FT_Load_Char, the slot's content is erased by the new glyph data, */
-  /*    i.e. the glyph's metrics, its image (bitmap or outline), and       */
-  /*    other control information.                                         */
-  /*                                                                       */
-  /* <Also>                                                                */
-  /*    @FT_GlyphSlotRec details the publicly accessible glyph fields.     */
-  /*                                                                       */
-  typedef struct FT_GlyphSlotRec_*  FT_GlyphSlot;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Type>                                                                */
-  /*    FT_CharMap                                                         */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A handle to a given character map.  A charmap is used to translate */
-  /*    character codes in a given encoding into glyph indexes for its     */
-  /*    parent's face.  Some font formats may provide several charmaps per */
-  /*    font.                                                              */
-  /*                                                                       */
-  /*    Each face object owns zero or more charmaps, but only one of them  */
-  /*    can be "active" and used by @FT_Get_Char_Index or @FT_Load_Char.   */
-  /*                                                                       */
-  /*    The list of available charmaps in a face is available through the  */
-  /*    "face->num_charmaps" and "face->charmaps" fields of @FT_FaceRec.   */
-  /*                                                                       */
-  /*    The currently active charmap is available as "face->charmap".      */
-  /*    You should call @FT_Set_Charmap to change it.                      */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    When a new face is created (either through @FT_New_Face or         */
-  /*    @FT_Open_Face), the library looks for a Unicode charmap within     */
-  /*    the list and automatically activates it.                           */
-  /*                                                                       */
-  /* <Also>                                                                */
-  /*    The @FT_CharMapRec details the publicly accessible fields of a     */
-  /*    given character map.                                               */
-  /*                                                                       */
-  typedef struct FT_CharMapRec_*  FT_CharMap;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Macro>                                                               */
-  /*    FT_ENC_TAG                                                         */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    This macro converts four letter tags into an unsigned long.  It is */
-  /*    used to define "encoding" identifiers (see @FT_Encoding).          */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    Since many 16bit compilers don't like 32bit enumerations, you      */
-  /*    should redefine this macro in case of problems to something like   */
-  /*    this:                                                              */
-  /*                                                                       */
-  /*      #define FT_ENC_TAG( value, a, b, c, d )  (value)                 */
-  /*                                                                       */
-  /*    to get a simple enumeration without assigning special numbers.     */
-  /*                                                                       */
-
-#ifndef FT_ENC_TAG
-#define FT_ENC_TAG( value, a, b, c, d )         \
-          value = ( ( (FT_UInt32)(a) << 24 ) |  \
-                    ( (FT_UInt32)(b) << 16 ) |  \
-                    ( (FT_UInt32)(c) <<  8 ) |  \
-                      (FT_UInt32)(d)         )
-
-#endif /* FT_ENC_TAG */
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Enum>                                                                */
-  /*    FT_Encoding                                                        */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    An enumeration used to specify encodings supported by charmaps.    */
-  /*    Used in the @FT_Select_Charmap API function.                       */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    Because of 32-bit charcodes defined in Unicode (i.e., surrogates), */
-  /*    all character codes must be expressed as FT_Longs.                 */
-  /*                                                                       */
-  /*    The values of this type correspond to specific character           */
-  /*    repertories (i.e. charsets), and not to text encoding methods      */
-  /*    (like UTF-8, UTF-16, GB2312_EUC, etc.).                            */
-  /*                                                                       */
-  /*    Other encodings might be defined in the future.                    */
-  /*                                                                       */
-  /* <Values>                                                              */
-  /*   FT_ENCODING_NONE ::                                                 */
-  /*     The encoding value 0 is reserved.                                 */
-  /*                                                                       */
-  /*   FT_ENCODING_UNICODE ::                                              */
-  /*     Corresponds to the Unicode character set.  This value covers      */
-  /*     all versions of the Unicode repertoire, including ASCII and       */
-  /*     Latin-1.  Most fonts include a Unicode charmap, but not all       */
-  /*     of them.                                                          */
-  /*                                                                       */
-  /*   FT_ENCODING_MS_SYMBOL ::                                            */
-  /*     Corresponds to the Microsoft Symbol encoding, used to encode      */
-  /*     mathematical symbols in the 32..255 character code range.  For    */
-  /*     more information, see `http://www.ceviz.net/symbol.htm'.          */
-  /*                                                                       */
-  /*   FT_ENCODING_SJIS ::                                                 */
-  /*     Corresponds to Japanese SJIS encoding.  More info at              */
-  /*     at `http://langsupport.japanreference.com/encoding.shtml'.        */
-  /*     See note on multi-byte encodings below.                           */
-  /*                                                                       */
-  /*   FT_ENCODING_GB2312 ::                                               */
-  /*     Corresponds to an encoding system for Simplified Chinese as used  */
-  /*     used in mainland China.                                           */
-  /*                                                                       */
-  /*   FT_ENCODING_BIG5 ::                                                 */
-  /*     Corresponds to an encoding system for Traditional Chinese as used */
-  /*     in Taiwan and Hong Kong.                                          */
-  /*                                                                       */
-  /*   FT_ENCODING_WANSUNG ::                                              */
-  /*     Corresponds to the Korean encoding system known as Wansung.       */
-  /*     For more information see                                          */
-  /*     `http://www.microsoft.com/typography/unicode/949.txt'.            */
-  /*                                                                       */
-  /*   FT_ENCODING_JOHAB ::                                                */
-  /*     The Korean standard character set (KS C-5601-1992), which         */
-  /*     corresponds to MS Windows code page 1361.  This character set     */
-  /*     includes all possible Hangeul character combinations.             */
-  /*                                                                       */
-  /*   FT_ENCODING_ADOBE_LATIN_1 ::                                        */
-  /*     Corresponds to a Latin-1 encoding as defined in a Type 1          */
-  /*     Postscript font.  It is limited to 256 character codes.           */
-  /*                                                                       */
-  /*   FT_ENCODING_ADOBE_STANDARD ::                                       */
-  /*     Corresponds to the Adobe Standard encoding, as found in Type 1,   */
-  /*     CFF, and OpenType/CFF fonts.  It is limited to 256 character      */
-  /*     codes.                                                            */
-  /*                                                                       */
-  /*   FT_ENCODING_ADOBE_EXPERT ::                                         */
-  /*     Corresponds to the Adobe Expert encoding, as found in Type 1,     */
-  /*     CFF, and OpenType/CFF fonts.  It is limited to 256 character      */
-  /*     codes.                                                            */
-  /*                                                                       */
-  /*   FT_ENCODING_ADOBE_CUSTOM ::                                         */
-  /*     Corresponds to a custom encoding, as found in Type 1, CFF, and    */
-  /*     OpenType/CFF fonts.  It is limited to 256 character codes.        */
-  /*                                                                       */
-  /*   FT_ENCODING_APPLE_ROMAN ::                                          */
-  /*     Corresponds to the 8-bit Apple roman encoding.  Many TrueType and */
-  /*     OpenType fonts contain a charmap for this encoding, since older   */
-  /*     versions of Mac OS are able to use it.                            */
-  /*                                                                       */
-  /*   FT_ENCODING_OLD_LATIN_2 ::                                          */
-  /*     This value is deprecated and was never used nor reported by       */
-  /*     FreeType.  Don't use or test for it.                              */
-  /*                                                                       */
-  /*   FT_ENCODING_MS_SJIS ::                                              */
-  /*     Same as FT_ENCODING_SJIS.  Deprecated.                            */
-  /*                                                                       */
-  /*   FT_ENCODING_MS_GB2312 ::                                            */
-  /*     Same as FT_ENCODING_GB2312.  Deprecated.                          */
-  /*                                                                       */
-  /*   FT_ENCODING_MS_BIG5 ::                                              */
-  /*     Same as FT_ENCODING_BIG5.  Deprecated.                            */
-  /*                                                                       */
-  /*   FT_ENCODING_MS_WANSUNG ::                                           */
-  /*     Same as FT_ENCODING_WANSUNG.  Deprecated.                         */
-  /*                                                                       */
-  /*   FT_ENCODING_MS_JOHAB ::                                             */
-  /*     Same as FT_ENCODING_JOHAB.  Deprecated.                           */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*   By default, FreeType automatically synthetizes a Unicode charmap    */
-  /*   for Postscript fonts, using their glyph names dictionaries.         */
-  /*   However, it will also report the encodings defined explicitly in    */
-  /*   the font file, for the cases when they are needed, with the Adobe   */
-  /*   values as well.                                                     */
-  /*                                                                       */
-  typedef enum  FT_Encoding_
-  {
-    FT_ENC_TAG( FT_ENCODING_NONE, 0, 0, 0, 0 ),
-
-    FT_ENC_TAG( FT_ENCODING_MS_SYMBOL,  's', 'y', 'm', 'b' ),
-    FT_ENC_TAG( FT_ENCODING_UNICODE,    'u', 'n', 'i', 'c' ),
-
-    FT_ENC_TAG( FT_ENCODING_SJIS,    's', 'j', 'i', 's' ),
-    FT_ENC_TAG( FT_ENCODING_GB2312,  'g', 'b', ' ', ' ' ),
-    FT_ENC_TAG( FT_ENCODING_BIG5,    'b', 'i', 'g', '5' ),
-    FT_ENC_TAG( FT_ENCODING_WANSUNG, 'w', 'a', 'n', 's' ),
-    FT_ENC_TAG( FT_ENCODING_JOHAB,   'j', 'o', 'h', 'a' ),
-
-    /* for backwards compatibility */
-    FT_ENCODING_MS_SJIS    = FT_ENCODING_SJIS,
-    FT_ENCODING_MS_GB2312  = FT_ENCODING_GB2312,
-    FT_ENCODING_MS_BIG5    = FT_ENCODING_BIG5,
-    FT_ENCODING_MS_WANSUNG = FT_ENCODING_WANSUNG,
-    FT_ENCODING_MS_JOHAB   = FT_ENCODING_JOHAB,
-
-    FT_ENC_TAG( FT_ENCODING_ADOBE_STANDARD, 'A', 'D', 'O', 'B' ),
-    FT_ENC_TAG( FT_ENCODING_ADOBE_EXPERT,   'A', 'D', 'B', 'E' ),
-    FT_ENC_TAG( FT_ENCODING_ADOBE_CUSTOM,   'A', 'D', 'B', 'C' ),
-    FT_ENC_TAG( FT_ENCODING_ADOBE_LATIN_1,  'l', 'a', 't', '1' ),
-
-    FT_ENC_TAG( FT_ENCODING_OLD_LATIN_2, 'l', 'a', 't', '2' ),
-
-    FT_ENC_TAG( FT_ENCODING_APPLE_ROMAN, 'a', 'r', 'm', 'n' )
-
-  } FT_Encoding;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Enum>                                                                */
-  /*    ft_encoding_xxx                                                    */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    These constants are deprecated; use the corresponding @FT_Encoding */
-  /*    values instead.                                                    */
-  /*                                                                       */
-  /* <Values>                                                              */
-  /*   ft_encoding_none    :: see @FT_ENCODING_NONE                        */
-  /*   ft_encoding_unicode :: see @FT_ENCODING_UNICODE                     */
-  /*   ft_encoding_latin_2 :: see @FT_ENCODING_OLD_LATIN_2                 */
-  /*   ft_encoding_symbol  :: see @FT_ENCODING_MS_SYMBOL                   */
-  /*   ft_encoding_sjis    :: see @FT_ENCODING_SJIS                        */
-  /*   ft_encoding_gb2312  :: see @FT_ENCODING_GB2312                      */
-  /*   ft_encoding_big5    :: see @FT_ENCODING_BIG5                        */
-  /*   ft_encoding_wansung :: see @FT_ENCODING_WANSUNG                     */
-  /*   ft_encoding_johab   :: see @FT_ENCODING_JOHAB                       */
-  /*                                                                       */
-  /*   ft_encoding_adobe_standard :: see @FT_ENCODING_ADOBE_STANDARD       */
-  /*   ft_encoding_adobe_expert   :: see @FT_ENCODING_ADOBE_EXPERT         */
-  /*   ft_encoding_adobe_custom   :: see @FT_ENCODING_ADOBE_CUSTOM         */
-  /*   ft_encoding_latin_1        :: see @FT_ENCODING_ADOBE_LATIN_1        */
-  /*                                                                       */
-  /*   ft_encoding_apple_roman    :: see @FT_ENCODING_APPLE_ROMAN          */
-  /*                                                                       */
-#define ft_encoding_none            FT_ENCODING_NONE
-#define ft_encoding_unicode         FT_ENCODING_UNICODE
-#define ft_encoding_symbol          FT_ENCODING_MS_SYMBOL
-#define ft_encoding_latin_1         FT_ENCODING_ADOBE_LATIN_1
-#define ft_encoding_latin_2         FT_ENCODING_OLD_LATIN_2
-#define ft_encoding_sjis            FT_ENCODING_SJIS
-#define ft_encoding_gb2312          FT_ENCODING_GB2312
-#define ft_encoding_big5            FT_ENCODING_BIG5
-#define ft_encoding_wansung         FT_ENCODING_WANSUNG
-#define ft_encoding_johab           FT_ENCODING_JOHAB
-
-#define ft_encoding_adobe_standard  FT_ENCODING_ADOBE_STANDARD
-#define ft_encoding_adobe_expert    FT_ENCODING_ADOBE_EXPERT
-#define ft_encoding_adobe_custom    FT_ENCODING_ADOBE_CUSTOM
-#define ft_encoding_apple_roman     FT_ENCODING_APPLE_ROMAN
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    FT_CharMapRec                                                      */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    The base charmap structure.                                        */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    face        :: A handle to the parent face object.                 */
-  /*                                                                       */
-  /*    encoding    :: An @FT_Encoding tag identifying the charmap.  Use   */
-  /*                   this with @FT_Select_Charmap.                       */
-  /*                                                                       */
-  /*    platform_id :: An ID number describing the platform for the        */
-  /*                   following encoding ID.  This comes directly from    */
-  /*                   the TrueType specification and should be emulated   */
-  /*                   for other formats.                                  */
-  /*                                                                       */
-  /*    encoding_id :: A platform specific encoding number.  This also     */
-  /*                   comes from the TrueType specification and should be */
-  /*                   emulated similarly.                                 */
-  /*                                                                       */
-  typedef struct  FT_CharMapRec_
-  {
-    FT_Face      face;
-    FT_Encoding  encoding;
-    FT_UShort    platform_id;
-    FT_UShort    encoding_id;
-
-  } FT_CharMapRec;
-
-
-  /*************************************************************************/
-  /*************************************************************************/
-  /*                                                                       */
-  /*                 B A S E   O B J E C T   C L A S S E S                 */
-  /*                                                                       */
-  /*************************************************************************/
-  /*************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Type>                                                                */
-  /*    FT_Face_Internal                                                   */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    An opaque handle to an FT_Face_InternalRec structure, used to      */
-  /*    model private data of a given @FT_Face object.                     */
-  /*                                                                       */
-  /*    This structure might change between releases of FreeType 2 and is  */
-  /*    not generally available to client applications.                    */
-  /*                                                                       */
-  typedef struct FT_Face_InternalRec_*  FT_Face_Internal;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    FT_FaceRec                                                         */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    FreeType root face class structure.  A face object models the      */
-  /*    resolution and point-size independent data found in a font file.   */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    num_faces           :: In the case where the face is located in a  */
-  /*                           collection (i.e., a file which embeds       */
-  /*                           several faces), this is the total number of */
-  /*                           faces found in the resource.  1 by default. */
-  /*                                                                       */
-  /*    face_index          :: The index of the face in its font file.     */
-  /*                           Usually, this is 0 for all normal font      */
-  /*                           formats.  It can be more in the case of     */
-  /*                           collections (which embed several fonts in a */
-  /*                           single resource/file).                      */
-  /*                                                                       */
-  /*    face_flags          :: A set of bit flags that give important      */
-  /*                           information about the face; see the         */
-  /*                           @FT_FACE_FLAG_XXX constants for details.    */
-  /*                                                                       */
-  /*    style_flags         :: A set of bit flags indicating the style of  */
-  /*                           the face (i.e., italic, bold, underline,    */
-  /*                           etc).  See the @FT_STYLE_FLAG_XXX           */
-  /*                           constants.                                  */
-  /*                                                                       */
-  /*    num_glyphs          :: The total number of glyphs in the face.     */
-  /*                                                                       */
-  /*    family_name         :: The face's family name.  This is an ASCII   */
-  /*                           string, usually in English, which describes */
-  /*                           the typeface's family (like `Times New      */
-  /*                           Roman', `Bodoni', `Garamond', etc).  This   */
-  /*                           is a least common denominator used to list  */
-  /*                           fonts.  Some formats (TrueType & OpenType)  */
-  /*                           provide localized and Unicode versions of   */
-  /*                           this string.  Applications should use the   */
-  /*                           format specific interface to access them.   */
-  /*                                                                       */
-  /*    style_name          :: The face's style name.  This is an ASCII    */
-  /*                           string, usually in English, which describes */
-  /*                           the typeface's style (like `Italic',        */
-  /*                           `Bold', `Condensed', etc).  Not all font    */
-  /*                           formats provide a style name, so this field */
-  /*                           is optional, and can be set to NULL.  As    */
-  /*                           for `family_name', some formats provide     */
-  /*                           localized/Unicode versions of this string.  */
-  /*                           Applications should use the format specific */
-  /*                           interface to access them.                   */
-  /*                                                                       */
-  /*    num_fixed_sizes     :: The number of fixed sizes available in this */
-  /*                           face.  This should be set to 0 for scalable */
-  /*                           fonts, unless its face includes a set of    */
-  /*                           glyphs (called a `strike') for the          */
-  /*                           specified sizes.                            */
-  /*                                                                       */
-  /*    available_sizes     :: An array of sizes specifying the available  */
-  /*                           bitmap/graymap sizes that are contained in  */
-  /*                           in the font face.  Should be set to NULL if */
-  /*                           the field `num_fixed_sizes' is set to 0.    */
-  /*                                                                       */
-  /*    num_charmaps        :: The total number of character maps in the   */
-  /*                           face.                                       */
-  /*                                                                       */
-  /*    charmaps            :: A table of pointers to the face's charmaps. */
-  /*                           Used to scan the list of available charmaps */
-  /*                           -- this table might change after a call to  */
-  /*                           @FT_Attach_File or @FT_Attach_Stream (e.g.  */
-  /*                           if used to hook an additional encoding or   */
-  /*                           CMap to the face object).                   */
-  /*                                                                       */
-  /*    generic             :: A field reserved for client uses.  See the  */
-  /*                           @FT_Generic type description.               */
-  /*                                                                       */
-  /*    bbox                :: The font bounding box.  Coordinates are     */
-  /*                           expressed in font units (see units_per_EM). */
-  /*                           The box is large enough to contain any      */
-  /*                           glyph from the font.  Thus, bbox.yMax can   */
-  /*                           be seen as the `maximal ascender',          */
-  /*                           bbox.yMin as the `minimal descender', and   */
-  /*                           the maximal glyph width is given by         */
-  /*                           `bbox.xMax-bbox.xMin' (not to be confused   */
-  /*                           with the maximal _advance_width_).  Only    */
-  /*                           relevant for scalable formats.              */
-  /*                                                                       */
-  /*    units_per_EM        :: The number of font units per EM square for  */
-  /*                           this face.  This is typically 2048 for      */
-  /*                           TrueType fonts, 1000 for Type1 fonts, and   */
-  /*                           should be set to the (unrealistic) value 1  */
-  /*                           for fixed-sizes fonts.  Only relevant for   */
-  /*                           scalable formats.                           */
-  /*                                                                       */
-  /*    ascender            :: The face's ascender is the vertical         */
-  /*                           distance from the baseline to the topmost   */
-  /*                           point of any glyph in the face.  This       */
-  /*                           field's value is positive, expressed in     */
-  /*                           font units.  Some font designs use a value  */
-  /*                           different from `bbox.yMax'.  Only relevant  */
-  /*                           for scalable formats.                       */
-  /*                                                                       */
-  /*    descender           :: The face's descender is the vertical        */
-  /*                           distance from the baseline to the           */
-  /*                           bottommost point of any glyph in the face.  */
-  /*                           This field's value is *negative* for values */
-  /*                           below the baseline.  It is expressed in     */
-  /*                           font units.  Some font designs use a value  */
-  /*                           different from `bbox.yMin'.  Only relevant  */
-  /*                           for scalable formats.                       */
-  /*                                                                       */
-  /*    height              :: The face's height is the vertical distance  */
-  /*                           from one baseline to the next when writing  */
-  /*                           several lines of text.  Its value is always */
-  /*                           positive, expressed in font units.  The     */
-  /*                           value can be computed as                    */
-  /*                           `ascender+descender+line_gap' where the     */
-  /*                           value of `line_gap' is also called          */
-  /*                           `external leading'.  Only relevant for      */
-  /*                           scalable formats.                           */
-  /*                                                                       */
-  /*    max_advance_width   :: The maximal advance width, in font units,   */
-  /*                           for all glyphs in this face.  This can be   */
-  /*                           used to make word wrapping computations     */
-  /*                           faster.  Only relevant for scalable         */
-  /*                           formats.                                    */
-  /*                                                                       */
-  /*    max_advance_height  :: The maximal advance height, in font units,  */
-  /*                           for all glyphs in this face.  This is only  */
-  /*                           relevant for vertical layouts, and should   */
-  /*                           be set to the `height' for fonts that do    */
-  /*                           not provide vertical metrics.  Only         */
-  /*                           relevant for scalable formats.              */
-  /*                                                                       */
-  /*    underline_position  :: The position, in font units, of the         */
-  /*                           underline line for this face.  It's the     */
-  /*                           center of the underlining stem.  Only       */
-  /*                           relevant for scalable formats.              */
-  /*                                                                       */
-  /*    underline_thickness :: The thickness, in font units, of the        */
-  /*                           underline for this face.  Only relevant for */
-  /*                           scalable formats.                           */
-  /*                                                                       */
-  /*    glyph               :: The face's associated glyph slot(s).  This  */
-  /*                           object is created automatically with a new  */
-  /*                           face object.  However, certain kinds of     */
-  /*                           applications (mainly tools like converters) */
-  /*                           can need more than one slot to ease their   */
-  /*                           task.                                       */
-  /*                                                                       */
-  /*    size                :: The current active size for this face.      */
-  /*                                                                       */
-  /*    charmap             :: The current active charmap for this face.   */
-  /*                                                                       */
-  typedef struct  FT_FaceRec_
-  {
-    FT_Long           num_faces;
-    FT_Long           face_index;
-
-    FT_Long           face_flags;
-    FT_Long           style_flags;
-
-    FT_Long           num_glyphs;
-
-    FT_String*        family_name;
-    FT_String*        style_name;
-
-    FT_Int            num_fixed_sizes;
-    FT_Bitmap_Size*   available_sizes;
-
-    FT_Int            num_charmaps;
-    FT_CharMap*       charmaps;
-
-    FT_Generic        generic;
-
-    /*# the following are only relevant to scalable outlines */
-    FT_BBox           bbox;
-
-    FT_UShort         units_per_EM;
-    FT_Short          ascender;
-    FT_Short          descender;
-    FT_Short          height;
-
-    FT_Short          max_advance_width;
-    FT_Short          max_advance_height;
-
-    FT_Short          underline_position;
-    FT_Short          underline_thickness;
-
-    FT_GlyphSlot      glyph;
-    FT_Size           size;
-    FT_CharMap        charmap;
-
-    /*@private begin */
-
-    FT_Driver         driver;
-    FT_Memory         memory;
-    FT_Stream         stream;
-
-    FT_ListRec        sizes_list;
-
-    FT_Generic        autohint;
-    void*             extensions;
-
-    FT_Face_Internal  internal;
-
-    /*@private end */
-
-  } FT_FaceRec;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Enum>                                                                */
-  /*    FT_FACE_FLAG_XXX                                                   */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A list of bit flags used in the 'face_flags' field of the          */
-  /*    @FT_FaceRec structure.  They inform client applications of         */
-  /*    properties of the corresponding face.                              */
-  /*                                                                       */
-  /* <Values>                                                              */
-  /*    FT_FACE_FLAG_SCALABLE ::                                           */
-  /*      Indicates that the face provides vectorial outlines.  This       */
-  /*      doesn't prevent embedded bitmaps, i.e., a face can have both     */
-  /*      this bit and @FT_FACE_FLAG_FIXED_SIZES set.                      */
-  /*                                                                       */
-  /*    FT_FACE_FLAG_FIXED_SIZES ::                                        */
-  /*      Indicates that the face contains `fixed sizes', i.e., bitmap     */
-  /*      strikes for some given pixel sizes.  See the `num_fixed_sizes'   */
-  /*      and `available_sizes' fields of @FT_FaceRec.                     */
-  /*                                                                       */
-  /*    FT_FACE_FLAG_FIXED_WIDTH ::                                        */
-  /*      Indicates that the face contains fixed-width characters (like    */
-  /*      Courier, Lucido, MonoType, etc.).                                */
-  /*                                                                       */
-  /*    FT_FACE_FLAG_SFNT ::                                               */
-  /*      Indicates that the face uses the `sfnt' storage scheme.  For     */
-  /*      now, this means TrueType and OpenType.                           */
-  /*                                                                       */
-  /*    FT_FACE_FLAG_HORIZONTAL ::                                         */
-  /*      Indicates that the face contains horizontal glyph metrics.  This */
-  /*      should be set for all common formats.                            */
-  /*                                                                       */
-  /*    FT_FACE_FLAG_VERTICAL ::                                           */
-  /*      Indicates that the face contains vertical glyph metrics.  This   */
-  /*      is only available in some formats, not all of them.              */
-  /*                                                                       */
-  /*    FT_FACE_FLAG_KERNING ::                                            */
-  /*      Indicates that the face contains kerning information.  If set,   */
-  /*      the kerning distance can be retrieved through the function       */
-  /*      @FT_Get_Kerning.  Note that if unset, this function will always  */
-  /*      return the vector (0,0).                                         */
-  /*                                                                       */
-  /*    FT_FACE_FLAG_FAST_GLYPHS ::                                        */
-  /*      THIS FLAG IS DEPRECATED.  DO NOT USE OR TEST IT.                 */
-  /*                                                                       */
-  /*    FT_FACE_FLAG_MULTIPLE_MASTERS ::                                   */
-  /*      Indicates that the font contains multiple masters and is capable */
-  /*      of interpolating between them.  See the multiple-masters         */
-  /*      specific API for details.                                        */
-  /*                                                                       */
-  /*    FT_FACE_FLAG_GLYPH_NAMES ::                                        */
-  /*      Indicates that the font contains glyph names that can be         */
-  /*      retrieved through @FT_Get_Glyph_Name.  Note that some TrueType   */
-  /*      fonts contain broken glyph name tables.  Use the function        */
-  /*      @FT_Has_PS_Glyph_Names when needed.                              */
-  /*                                                                       */
-  /*    FT_FACE_FLAG_EXTERNAL_STREAM ::                                    */
-  /*      Used internally by FreeType to indicate that a face's stream was */
-  /*      provided by the client application and should not be destroyed   */
-  /*      when @FT_Done_Face is called.  Don't read or test this flag.     */
-  /*                                                                       */
-#define FT_FACE_FLAG_SCALABLE          ( 1L <<  0 )
-#define FT_FACE_FLAG_FIXED_SIZES       ( 1L <<  1 )
-#define FT_FACE_FLAG_FIXED_WIDTH       ( 1L <<  2 )
-#define FT_FACE_FLAG_SFNT              ( 1L <<  3 )
-#define FT_FACE_FLAG_HORIZONTAL        ( 1L <<  4 )
-#define FT_FACE_FLAG_VERTICAL          ( 1L <<  5 )
-#define FT_FACE_FLAG_KERNING           ( 1L <<  6 )
-#define FT_FACE_FLAG_FAST_GLYPHS       ( 1L <<  7 )
-#define FT_FACE_FLAG_MULTIPLE_MASTERS  ( 1L <<  8 )
-#define FT_FACE_FLAG_GLYPH_NAMES       ( 1L <<  9 )
-#define FT_FACE_FLAG_EXTERNAL_STREAM   ( 1L << 10 )
-
-  /* */
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* @macro:                                                               */
-  /*    FT_HAS_HORIZONTAL( face )                                          */
-  /*                                                                       */
-  /* @description:                                                         */
-  /*    A macro that returns true whenever a face object contains          */
-  /*    horizontal metrics (this is true for all font formats though).     */
-  /*                                                                       */
-  /* @also:                                                                */
-  /*    @FT_HAS_VERTICAL can be used to check for vertical metrics.        */
-  /*                                                                       */
-#define FT_HAS_HORIZONTAL( face ) \
-          ( face->face_flags & FT_FACE_FLAG_HORIZONTAL )
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* @macro:                                                               */
-  /*    FT_HAS_VERTICAL( face )                                            */
-  /*                                                                       */
-  /* @description:                                                         */
-  /*    A macro that returns true whenever a face object contains vertical */
-  /*    metrics.                                                           */
-  /*                                                                       */
-#define FT_HAS_VERTICAL( face ) \
-          ( face->face_flags & FT_FACE_FLAG_VERTICAL )
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* @macro:                                                               */
-  /*    FT_HAS_KERNING( face )                                             */
-  /*                                                                       */
-  /* @description:                                                         */
-  /*    A macro that returns true whenever a face object contains kerning  */
-  /*    data that can be accessed with @FT_Get_Kerning.                    */
-  /*                                                                       */
-#define FT_HAS_KERNING( face ) \
-          ( face->face_flags & FT_FACE_FLAG_KERNING )
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* @macro:                                                               */
-  /*    FT_IS_SCALABLE( face )                                             */
-  /*                                                                       */
-  /* @description:                                                         */
-  /*    A macro that returns true whenever a face object contains a        */
-  /*    scalable font face (true for TrueType, Type 1, CID, and            */
-  /*    OpenType/CFF font formats.                                         */
-  /*                                                                       */
-#define FT_IS_SCALABLE( face ) \
-          ( face->face_flags & FT_FACE_FLAG_SCALABLE )
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* @macro:                                                               */
-  /*    FT_IS_SFNT( face )                                                 */
-  /*                                                                       */
-  /* @description:                                                         */
-  /*    A macro that returns true whenever a face object contains a font   */
-  /*    whose format is based on the SFNT storage scheme.  This usually    */
-  /*    means: TrueType fonts, OpenType fonts, as well as SFNT-based       */
-  /*    embedded bitmap fonts.                                             */
-  /*                                                                       */
-  /*    If this macro is true, all functions defined in @FT_SFNT_NAMES_H   */
-  /*    and @FT_TRUETYPE_TABLES_H are available.                           */
-  /*                                                                       */
-#define FT_IS_SFNT( face ) \
-          ( face->face_flags & FT_FACE_FLAG_SFNT )
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* @macro:                                                               */
-  /*    FT_IS_FIXED_WIDTH( face )                                          */
-  /*                                                                       */
-  /* @description:                                                         */
-  /*    A macro that returns true whenever a face object contains a font   */
-  /*    face that contains fixed-width (or "monospace", "fixed-pitch",     */
-  /*    etc.) glyphs.                                                      */
-  /*                                                                       */
-#define FT_IS_FIXED_WIDTH( face ) \
-          ( face->face_flags & FT_FACE_FLAG_FIXED_WIDTH )
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* @macro:                                                               */
-  /*    FT_HAS_FIXED_SIZES( face )                                         */
-  /*                                                                       */
-  /* @description:                                                         */
-  /*    A macro that returns true whenever a face object contains some     */
-  /*    embedded bitmaps.  See the `available_sizes' field of the          */
-  /*    @FT_FaceRec structure.                                             */
-  /*                                                                       */
-#define FT_HAS_FIXED_SIZES( face ) \
-          ( face->face_flags & FT_FACE_FLAG_FIXED_SIZES )
-
-
-   /* */
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* @macro:                                                               */
-  /*    FT_HAS_FAST_GLYPHS( face )                                         */
-  /*                                                                       */
-  /* @description:                                                         */
-  /*    Deprecated; indicates that the face contains so-called "fast"      */
-  /*    glyph bitmaps.                                                     */
-  /*                                                                       */
-#define FT_HAS_FAST_GLYPHS( face ) \
-          ( face->face_flags & FT_FACE_FLAG_FAST_GLYPHS )
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* @macro:                                                               */
-  /*    FT_HAS_GLYPH_NAMES( face )                                         */
-  /*                                                                       */
-  /* @description:                                                         */
-  /*    A macro that returns true whenever a face object contains some     */
-  /*    glyph names that can be accessed through @FT_Get_Glyph_Name.       */
-  /*                                                                       */
-#define FT_HAS_GLYPH_NAMES( face ) \
-          ( face->face_flags & FT_FACE_FLAG_GLYPH_NAMES )
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* @macro:                                                               */
-  /*    FT_HAS_MULTIPLE_MASTERS( face )                                    */
-  /*                                                                       */
-  /* @description:                                                         */
-  /*    A macro that returns true whenever a face object contains some     */
-  /*    multiple masters.  The functions provided by                       */
-  /*    @FT_MULTIPLE_MASTERS_H are then available to choose the exact      */
-  /*    design you want.                                                   */
-  /*                                                                       */
-#define FT_HAS_MULTIPLE_MASTERS( face ) \
-          ( face->face_flags & FT_FACE_FLAG_MULTIPLE_MASTERS )
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Constant>                                                            */
-  /*    FT_STYLE_FLAG_XXX                                                  */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A list of bit-flags used to indicate the style of a given face.    */
-  /*    These are used in the `style_flags' field of @FT_FaceRec.          */
-  /*                                                                       */
-  /* <Values>                                                              */
-  /*    FT_STYLE_FLAG_ITALIC ::                                            */
-  /*      Indicates that a given face is italicized.                       */
-  /*                                                                       */
-  /*    FT_STYLE_FLAG_BOLD ::                                              */
-  /*      Indicates that a given face is bold.                             */
-  /*                                                                       */
-#define FT_STYLE_FLAG_ITALIC  ( 1 << 0 )
-#define FT_STYLE_FLAG_BOLD    ( 1 << 1 )
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Type>                                                                */
-  /*    FT_Size_Internal                                                   */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    An opaque handle to an FT_Size_InternalRec structure, used to      */
-  /*    model private data of a given FT_Size object.                      */
-  /*                                                                       */
-  typedef struct FT_Size_InternalRec_*  FT_Size_Internal;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    FT_Size_Metrics                                                    */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    The size metrics structure returned scaled important distances for */
-  /*    a given size object.                                               */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    x_ppem       :: The character width, expressed in integer pixels.  */
-  /*                    This is the width of the EM square expressed in    */
-  /*                    pixels, hence the term `ppem' (pixels per EM).     */
-  /*                                                                       */
-  /*    y_ppem       :: The character height, expressed in integer pixels. */
-  /*                    This is the height of the EM square expressed in   */
-  /*                    pixels, hence the term `ppem' (pixels per EM).     */
-  /*                                                                       */
-  /*    x_scale      :: A simple 16.16 fixed point format coefficient used */
-  /*                    to scale horizontal distances expressed in font    */
-  /*                    units to fractional (26.6) pixel coordinates.      */
-  /*                                                                       */
-  /*    y_scale      :: A simple 16.16 fixed point format coefficient used */
-  /*                    to scale vertical distances expressed in font      */
-  /*                    units to fractional (26.6) pixel coordinates.      */
-  /*                                                                       */
-  /*    ascender     :: The ascender, expressed in 26.6 fixed point        */
-  /*                    pixels.  Positive for ascenders above the          */
-  /*                    baseline.                                          */
-  /*                                                                       */
-  /*    descender    :: The descender, expressed in 26.6 fixed point       */
-  /*                    pixels.  Negative for descenders below the         */
-  /*                    baseline.                                          */
-  /*                                                                       */
-  /*    height       :: The text height, expressed in 26.6 fixed point     */
-  /*                    pixels.  Always positive.                          */
-  /*                                                                       */
-  /*    max_advance  :: Maximum horizontal advance, expressed in 26.6      */
-  /*                    fixed point pixels.  Always positive.              */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    For scalable fonts, the values of `ascender', `descender', and     */
-  /*    `height' are scaled versions of `face->ascender',                  */
-  /*    `face->descender', and `face->height', respectively.               */
-  /*                                                                       */
-  /*    Unfortunately, due to glyph hinting, these values might not be     */
-  /*    exact for certain fonts.  They thus must be treated as unreliable  */
-  /*    with an error margin of at least one pixel!                        */
-  /*                                                                       */
-  /*    Indeed, the only way to get the exact pixel ascender and descender */
-  /*    is to render _all_ glyphs.  As this would be a definite            */
-  /*    performance hit, it is up to client applications to perform such   */
-  /*    computations.                                                      */
-  /*                                                                       */
-  typedef struct  FT_Size_Metrics_
-  {
-    FT_UShort  x_ppem;      /* horizontal pixels per EM               */
-    FT_UShort  y_ppem;      /* vertical pixels per EM                 */
-
-    FT_Fixed   x_scale;     /* two scales used to convert font units  */
-    FT_Fixed   y_scale;     /* to 26.6 frac. pixel coordinates        */
-
-    FT_Pos     ascender;    /* ascender in 26.6 frac. pixels          */
-    FT_Pos     descender;   /* descender in 26.6 frac. pixels         */
-    FT_Pos     height;      /* text height in 26.6 frac. pixels       */
-    FT_Pos     max_advance; /* max horizontal advance, in 26.6 pixels */
-
-  } FT_Size_Metrics;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    FT_SizeRec                                                         */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    FreeType root size class structure.  A size object models the      */
-  /*    resolution and pointsize dependent data of a given face.           */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    face    :: Handle to the parent face object.                       */
-  /*                                                                       */
-  /*    generic :: A typeless pointer, which is unused by the FreeType     */
-  /*               library or any of its drivers.  It can be used by       */
-  /*               client applications to link their own data to each size */
-  /*               object.                                                 */
-  /*                                                                       */
-  /*    metrics :: Metrics for this size object.  This field is read-only. */
-  /*                                                                       */
-  typedef struct  FT_SizeRec_
-  {
-    FT_Face           face;      /* parent face object              */
-    FT_Generic        generic;   /* generic pointer for client uses */
-    FT_Size_Metrics   metrics;   /* size metrics                    */
-    FT_Size_Internal  internal;
-
-  } FT_SizeRec;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    FT_SubGlyph                                                        */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    The subglyph structure is an internal object used to describe      */
-  /*    subglyphs (for example, in the case of composites).                */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    The subglyph implementation is not part of the high-level API,     */
-  /*    hence the forward structure declaration.                           */
-  /*                                                                       */
-  typedef struct FT_SubGlyphRec_*  FT_SubGlyph;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Type>                                                                */
-  /*    FT_Slot_Internal                                                   */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    An opaque handle to an FT_Slot_InternalRec structure, used to      */
-  /*    model private data of a given FT_GlyphSlot object.                 */
-  /*                                                                       */
-  typedef struct FT_Slot_InternalRec_*  FT_Slot_Internal;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    FT_GlyphSlotRec                                                    */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    FreeType root glyph slot class structure.  A glyph slot is a       */
-  /*    container where individual glyphs can be loaded, be they           */
-  /*    vectorial or bitmap/graymaps.                                      */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    library           :: A handle to the FreeType library instance     */
-  /*                         this slot belongs to.                         */
-  /*                                                                       */
-  /*    face              :: A handle to the parent face object.           */
-  /*                                                                       */
-  /*    next              :: In some cases (like some font tools), several */
-  /*                         glyph slots per face object can be a good     */
-  /*                         thing.  As this is rare, the glyph slots are  */
-  /*                         listed through a direct, single-linked list   */
-  /*                         using its `next' field.                       */
-  /*                                                                       */
-  /*    generic           :: A typeless pointer which is unused by the     */
-  /*                         FreeType library or any of its drivers.  It   */
-  /*                         can be used by client applications to link    */
-  /*                         their own data to each glyph slot object.     */
-  /*                                                                       */
-  /*    metrics           :: The metrics of the last loaded glyph in the   */
-  /*                         slot.  The returned values depend on the last */
-  /*                         load flags (see the @FT_Load_Glyph API        */
-  /*                         function) and can be expressed either in 26.6 */
-  /*                         fractional pixels or font units.              */
-  /*                                                                       */
-  /*                         Note that even when the glyph image is        */
-  /*                         transformed, the metrics are not.             */
-  /*                                                                       */
-  /*    linearHoriAdvance :: For scalable formats only, this field holds   */
-  /*                         the linearly scaled horizontal advance width  */
-  /*                         for the glyph (i.e. the scaled and unhinted   */
-  /*                         value of the hori advance).  This can be      */
-  /*                         important to perform correct WYSIWYG layout.  */
-  /*                                                                       */
-  /*                         Note that this value is expressed by default  */
-  /*                         in 16.16 pixels. However, when the glyph is   */
-  /*                         loaded with the FT_LOAD_LINEAR_DESIGN flag,   */
-  /*                         this field contains simply the value of the   */
-  /*                         advance in original font units.               */
-  /*                                                                       */
-  /*    linearVertAdvance :: For scalable formats only, this field holds   */
-  /*                         the linearly scaled vertical advance height   */
-  /*                         for the glyph.  See linearHoriAdvance for     */
-  /*                         comments.                                     */
-  /*                                                                       */
-  /*    advance           :: This is the transformed advance width for the */
-  /*                         glyph.                                        */
-  /*                                                                       */
-  /*    format            :: This field indicates the format of the image  */
-  /*                         contained in the glyph slot.  Typically       */
-  /*                         FT_GLYPH_FORMAT_BITMAP,                       */
-  /*                         FT_GLYPH_FORMAT_OUTLINE, and                  */
-  /*                         FT_GLYPH_FORMAT_COMPOSITE, but others are     */
-  /*                         possible.                                     */
-  /*                                                                       */
-  /*    bitmap            :: This field is used as a bitmap descriptor     */
-  /*                         when the slot format is                       */
-  /*                         FT_GLYPH_FORMAT_BITMAP.  Note that the        */
-  /*                         address and content of the bitmap buffer can  */
-  /*                         change between calls of @FT_Load_Glyph and a  */
-  /*                         few other functions.                          */
-  /*                                                                       */
-  /*    bitmap_left       :: This is the bitmap's left bearing expressed   */
-  /*                         in integer pixels.  Of course, this is only   */
-  /*                         valid if the format is                        */
-  /*                         FT_GLYPH_FORMAT_BITMAP.                       */
-  /*                                                                       */
-  /*    bitmap_top        :: This is the bitmap's top bearing expressed in */
-  /*                         integer pixels.  Remember that this is the    */
-  /*                         distance from the baseline to the top-most    */
-  /*                         glyph scanline, upwards y-coordinates being   */
-  /*                         *positive*.                                   */
-  /*                                                                       */
-  /*    outline           :: The outline descriptor for the current glyph  */
-  /*                         image if its format is                        */
-  /*                         FT_GLYPH_FORMAT_OUTLINE.                      */
-  /*                                                                       */
-  /*    num_subglyphs     :: The number of subglyphs in a composite glyph. */
-  /*                         This field is only valid for the composite    */
-  /*                         glyph format that should normally only be     */
-  /*                         loaded with the @FT_LOAD_NO_RECURSE flag.     */
-  /*                         For now this is internal to FreeType.         */
-  /*                                                                       */
-  /*    subglyphs         :: An array of subglyph descriptors for          */
-  /*                         composite glyphs.  There are `num_subglyphs'  */
-  /*                         elements in there.  Currently internal to     */
-  /*                         FreeType.                                     */
-  /*                                                                       */
-  /*    control_data      :: Certain font drivers can also return the      */
-  /*                         control data for a given glyph image (e.g.    */
-  /*                         TrueType bytecode, Type 1 charstrings, etc.). */
-  /*                         This field is a pointer to such data.         */
-  /*                                                                       */
-  /*    control_len       :: This is the length in bytes of the control    */
-  /*                         data.                                         */
-  /*                                                                       */
-  /*    other             :: Really wicked formats can use this pointer to */
-  /*                         present their own glyph image to client apps. */
-  /*                         Note that the app will need to know about the */
-  /*                         image format.                                 */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    If @FT_Load_Glyph is called with default flags (see                */
-  /*    @FT_LOAD_DEFAULT) the glyph image is loaded in the glyph slot in   */
-  /*    its native format (e.g. a vectorial outline for TrueType and       */
-  /*    Type 1 formats).                                                   */
-  /*                                                                       */
-  /*    This image can later be converted into a bitmap by calling         */
-  /*    @FT_Render_Glyph.  This function finds the current renderer for    */
-  /*    the native image's format then invokes it.                         */
-  /*                                                                       */
-  /*    The renderer is in charge of transforming the native image through */
-  /*    the slot's face transformation fields, then convert it into a      */
-  /*    bitmap that is returned in `slot->bitmap'.                         */
-  /*                                                                       */
-  /*    Note that `slot->bitmap_left' and `slot->bitmap_top' are also used */
-  /*    to specify the position of the bitmap relative to the current pen  */
-  /*    position (e.g. coordinates 0,0 on the baseline).  Of course,     */
-  /*    `slot->format' is also changed to `FT_GLYPH_FORMAT_BITMAP' .       */
-  /*                                                                       */
-  typedef struct  FT_GlyphSlotRec_
-  {
-    FT_Library        library;
-    FT_Face           face;
-    FT_GlyphSlot      next;
-    FT_UInt           reserved;       /* retained for binary compatibility */
-    FT_Generic        generic;
-
-    FT_Glyph_Metrics  metrics;
-    FT_Fixed          linearHoriAdvance;
-    FT_Fixed          linearVertAdvance;
-    FT_Vector         advance;
-
-    FT_Glyph_Format   format;
-
-    FT_Bitmap         bitmap;
-    FT_Int            bitmap_left;
-    FT_Int            bitmap_top;
-
-    FT_Outline        outline;
-
-    FT_UInt           num_subglyphs;
-    FT_SubGlyph       subglyphs;
-
-    void*             control_data;
-    long              control_len;
-
-    void*             other;
-
-    FT_Slot_Internal  internal;
-
-  } FT_GlyphSlotRec;
-
-
-  /*************************************************************************/
-  /*************************************************************************/
-  /*                                                                       */
-  /*                         F U N C T I O N S                             */
-  /*                                                                       */
-  /*************************************************************************/
-  /*************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Init_FreeType                                                   */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Initializes a new FreeType library object.  The set of modules     */
-  /*    that are registered by this function is determined at build time.  */
-  /*                                                                       */
-  /* <Output>                                                              */
-  /*    alibrary :: A handle to a new library object.                      */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0 means success.                             */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_Init_FreeType( FT_Library  *alibrary );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Library_Version                                                 */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Return the version of the FreeType library being used.  This is    */
-  /*    useful when dynamically linking to the library, since one cannot   */
-  /*    use the macros FT_FREETYPE_MAJOR, FT_FREETYPE_MINOR, and           */
-  /*    FT_FREETYPE_PATCH.                                                 */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    library :: A source library handle.                                */
-  /*                                                                       */
-  /* <Output>                                                              */
-  /*    amajor :: The major version number.                                */
-  /*                                                                       */
-  /*    aminor :: The minor version number.                                */
-  /*                                                                       */
-  /*    apatch :: The patch version number.                                */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    The reason why this function takes a 'library' argument is because */
-  /*    certain programs implement library initialization in a custom way  */
-  /*    that doesn't use `FT_Init_FreeType'.                               */
-  /*                                                                       */
-  /*    In such cases, the library version might not be available before   */
-  /*    the library object has been created.                               */
-  /*                                                                       */
-  FT_EXPORT( void )
-  FT_Library_Version( FT_Library   library,
-                      FT_Int      *amajor,
-                      FT_Int      *aminor,
-                      FT_Int      *apatch );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Done_FreeType                                                   */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Destroys a given FreeType library object and all of its childs,    */
-  /*    including resources, drivers, faces, sizes, etc.                   */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    library :: A handle to the target library object.                  */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0 means success.                             */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_Done_FreeType( FT_Library  library );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Enum>                                                                */
-  /*    FT_OPEN_XXX                                                        */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A list of bit-field constants used within the `flags' field of the */
-  /*    @FT_Open_Args structure.                                           */
-  /*                                                                       */
-  /* <Values>                                                              */
-  /*    FT_OPEN_MEMORY      :: This is a memory-based stream.              */
-  /*                                                                       */
-  /*    FT_OPEN_STREAM      :: Copy the stream from the `stream' field.    */
-  /*                                                                       */
-  /*    FT_OPEN_PATHNAME    :: Create a new input stream from a C          */
-  /*                           path name.                                  */
-  /*                                                                       */
-  /*    FT_OPEN_DRIVER      :: Use the `driver' field.                     */
-  /*                                                                       */
-  /*    FT_OPEN_PARAMS      :: Use the `num_params' & `params' field.      */
-  /*                                                                       */
-  /*    ft_open_memory      :: Deprecated; use @FT_OPEN_MEMORY instead.    */
-  /*                                                                       */
-  /*    ft_open_stream      :: Deprecated; use @FT_OPEN_STREAM instead.    */
-  /*                                                                       */
-  /*    ft_open_pathname    :: Deprecated; use @FT_OPEN_PATHNAME instead.  */
-  /*                                                                       */
-  /*    ft_open_driver      :: Deprecated; use @FT_OPEN_DRIVER instead.    */
-  /*                                                                       */
-  /*    ft_open_params      :: Deprecated; use @FT_OPEN_PARAMS instead.    */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    The `FT_OPEN_MEMORY', `FT_OPEN_STREAM', and `FT_OPEN_PATHNAME'     */
-  /*    flags are mutually exclusive.                                      */
-  /*                                                                       */
-#define FT_OPEN_MEMORY    0x1
-#define FT_OPEN_STREAM    0x2
-#define FT_OPEN_PATHNAME  0x4
-#define FT_OPEN_DRIVER    0x8
-#define FT_OPEN_PARAMS    0x10
-
-#define ft_open_memory    FT_OPEN_MEMORY     /* deprecated */
-#define ft_open_stream    FT_OPEN_STREAM     /* deprecated */
-#define ft_open_pathname  FT_OPEN_PATHNAME   /* deprecated */
-#define ft_open_driver    FT_OPEN_DRIVER     /* deprecated */
-#define ft_open_params    FT_OPEN_PARAMS     /* deprecated */
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    FT_Parameter                                                       */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A simple structure used to pass more or less generic parameters    */
-  /*    to @FT_Open_Face.                                                  */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    tag  :: A 4-byte identification tag.                               */
-  /*                                                                       */
-  /*    data :: A pointer to the parameter data.                           */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    The id and function of parameters are driver-specific.             */
-  /*                                                                       */
-  typedef struct  FT_Parameter_
-  {
-    FT_ULong    tag;
-    FT_Pointer  data;
-
-  } FT_Parameter;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    FT_Open_Args                                                       */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A structure used to indicate how to open a new font file/stream.   */
-  /*    A pointer to such a structure can be used as a parameter for the   */
-  /*    functions @FT_Open_Face and @FT_Attach_Stream.                     */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    flags       :: A set of bit flags indicating how to use the        */
-  /*                   structure.                                          */
-  /*                                                                       */
-  /*    memory_base :: The first byte of the file in memory.               */
-  /*                                                                       */
-  /*    memory_size :: The size in bytes of the file in memory.            */
-  /*                                                                       */
-  /*    pathname    :: A pointer to an 8-bit file pathname.                */
-  /*                                                                       */
-  /*    stream      :: A handle to a source stream object.                 */
-  /*                                                                       */
-  /*    driver      :: This field is exclusively used by @FT_Open_Face;    */
-  /*                   it simply specifies the font driver to use to open  */
-  /*                   the face.  If set to 0, FreeType will try to load   */
-  /*                   the face with each one of the drivers in its list.  */
-  /*                                                                       */
-  /*    num_params  :: The number of extra parameters.                     */
-  /*                                                                       */
-  /*    params      :: Extra parameters passed to the font driver when     */
-  /*                   opening a new face.                                 */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    The stream type is determined by the contents of `flags' which     */
-  /*    are tested in the following order by @FT_Open_Face:                */
-  /*                                                                       */
-  /*    If the `FT_OPEN_MEMORY' bit is set, assume that this is a          */
-  /*    memory file of `memory_size' bytes,located at `memory_address'.    */
-  /*                                                                       */
-  /*    Otherwise, if the `FT_OPEN_STREAM' bit is set, assume that a       */
-  /*    custom input stream `stream' is used.                              */
-  /*                                                                       */
-  /*    Otherwise, if the `FT_OPEN_PATHNAME' bit is set, assume that this  */
-  /*    is a normal file and use `pathname' to open it.                    */
-  /*                                                                       */
-  /*    If the `FT_OPEN_DRIVER' bit is set, @FT_Open_Face will only try to */
-  /*    open the file with the driver whose handler is in `driver'.        */
-  /*                                                                       */
-  /*    If the `FT_OPEN_PARAMS' bit is set, the parameters given by        */
-  /*    `num_params' and `params' will be used.  They are ignored          */
-  /*    otherwise.                                                         */
-  /*                                                                       */
-  typedef struct  FT_Open_Args_
-  {
-    FT_UInt         flags;
-    const FT_Byte*  memory_base;
-    FT_Long         memory_size;
-    FT_String*      pathname;
-    FT_Stream       stream;
-    FT_Module       driver;
-    FT_Int          num_params;
-    FT_Parameter*   params;
-
-  } FT_Open_Args;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_New_Face                                                        */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Creates a new face object from a given resource and typeface index */
-  /*    using a pathname to the font file.                                 */
-  /*                                                                       */
-  /* <InOut>                                                               */
-  /*    library    :: A handle to the library resource.                    */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    pathname   :: A path to the font file.                             */
-  /*                                                                       */
-  /*    face_index :: The index of the face within the resource.  The      */
-  /*                  first face has index 0.                              */
-  /* <Output>                                                              */
-  /*    aface      :: A handle to a new face object.                       */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0 means success.                             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    Unlike FreeType 1.x, this function automatically creates a glyph   */
-  /*    slot for the face object which can be accessed directly through    */
-  /*    `face->glyph'.                                                     */
-  /*                                                                       */
-  /*    @FT_New_Face can be used to determine and/or check the font format */
-  /*    of a given font resource.  If the `face_index' field is negative,  */
-  /*    the function will _not_ return any face handle in `aface'.  Its    */
-  /*    return value should be 0 if the font format is recognized, or      */
-  /*    non-zero otherwise.                                                */
-  /*                                                                       */
-  /*    Each new face object created with this function also owns a        */
-  /*    default @FT_Size object, accessible as `face->size'.               */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_New_Face( FT_Library   library,
-               const char*  filepathname,
-               FT_Long      face_index,
-               FT_Face     *aface );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_New_Memory_Face                                                 */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Creates a new face object from a given resource and typeface index */
-  /*    using a font file already loaded into memory.                      */
-  /*                                                                       */
-  /* <InOut>                                                               */
-  /*    library    :: A handle to the library resource.                    */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    file_base  :: A pointer to the beginning of the font data.         */
-  /*                                                                       */
-  /*    file_size  :: The size of the memory chunk used by the font data.  */
-  /*                                                                       */
-  /*    face_index :: The index of the face within the resource.  The      */
-  /*                  first face has index 0.                              */
-  /* <Output>                                                              */
-  /*    aface      :: A handle to a new face object.                       */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0 means success.                             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    The font data bytes are used _directly_ by the @FT_Face object.    */
-  /*    This means that they are not copied, and that the client is        */
-  /*    responsible for releasing/destroying them _after_ the              */
-  /*    corresponding call to @FT_Done_Face .                              */
-  /*                                                                       */
-  /*    Unlike FreeType 1.x, this function automatically creates a glyph   */
-  /*    slot for the face object which can be accessed directly through    */
-  /*    `face->glyph'.                                                     */
-  /*                                                                       */
-  /*    @FT_New_Memory_Face can be used to determine and/or check the font */
-  /*    format of a given font resource.  If the `face_index' field is     */
-  /*    negative, the function will _not_ return any face handle in        */
-  /*    `aface'.  Its return value should be 0 if the font format is       */
-  /*    recognized, or non-zero otherwise.                                 */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_New_Memory_Face( FT_Library      library,
-                      const FT_Byte*  file_base,
-                      FT_Long         file_size,
-                      FT_Long         face_index,
-                      FT_Face        *aface );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Open_Face                                                       */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Opens a face object from a given resource and typeface index using */
-  /*    an `FT_Open_Args' structure.  If the face object doesn't exist, it */
-  /*    will be created.                                                   */
-  /*                                                                       */
-  /* <InOut>                                                               */
-  /*    library    :: A handle to the library resource.                    */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    args       :: A pointer to an `FT_Open_Args' structure which must  */
-  /*                  be filled by the caller.                             */
-  /*                                                                       */
-  /*    face_index :: The index of the face within the resource.  The      */
-  /*                  first face has index 0.                              */
-  /* <Output>                                                              */
-  /*    aface      :: A handle to a new face object.                       */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0 means success.                             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    Unlike FreeType 1.x, this function automatically creates a glyph   */
-  /*    slot for the face object which can be accessed directly through    */
-  /*    `face->glyph'.                                                     */
-  /*                                                                       */
-  /*    @FT_Open_Face can be used to determine and/or check the font      */
-  /*    format of a given font resource.  If the `face_index' field is     */
-  /*    negative, the function will _not_ return any face handle in        */
-  /*    `*face'.  Its return value should be 0 if the font format is       */
-  /*    recognized, or non-zero otherwise.                                 */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_Open_Face( FT_Library           library,
-                const FT_Open_Args*  args,
-                FT_Long              face_index,
-                FT_Face             *aface );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Attach_File                                                     */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    `Attaches' a given font file to an existing face.  This is usually */
-  /*    to read additional information for a single face object.  For      */
-  /*    example, it is used to read the AFM files that come with Type 1    */
-  /*    fonts in order to add kerning data and other metrics.              */
-  /*                                                                       */
-  /* <InOut>                                                               */
-  /*    face         :: The target face object.                            */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    filepathname :: An 8-bit pathname naming the `metrics' file.       */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0 means success.                             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    If your font file is in memory, or if you want to provide your     */
-  /*    own input stream object, use @FT_Attach_Stream.                    */
-  /*                                                                       */
-  /*    The meaning of the `attach' action (i.e., what really happens when */
-  /*    the new file is read) is not fixed by FreeType itself.  It really  */
-  /*    depends on the font format (and thus the font driver).             */
-  /*                                                                       */
-  /*    Client applications are expected to know what they are doing       */
-  /*    when invoking this function.  Most drivers simply do not implement */
-  /*    file attachments.                                                  */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_Attach_File( FT_Face      face,
-                  const char*  filepathname );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Attach_Stream                                                   */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    This function is similar to @FT_Attach_File with the exception     */
-  /*    that it reads the attachment from an arbitrary stream.             */
-  /*                                                                       */
-  /* <InOut>                                                               */
-  /*    face       :: The target face object.                              */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    parameters :: A pointer to an FT_Open_Args structure used to       */
-  /*                  describe the input stream to FreeType.               */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0 means success.                             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    The meaning of the `attach' (i.e. what really happens when the     */
-  /*    new file is read) is not fixed by FreeType itself.  It really      */
-  /*    depends on the font format (and thus the font driver).             */
-  /*                                                                       */
-  /*    Client applications are expected to know what they are doing       */
-  /*    when invoking this function.  Most drivers simply do not implement */
-  /*    file attachments.                                                  */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_Attach_Stream( FT_Face        face,
-                    FT_Open_Args*  parameters );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Done_Face                                                       */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Discards a given face object, as well as all of its child slots    */
-  /*    and sizes.                                                         */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    face :: A handle to a target face object.                          */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0 means success.                             */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_Done_Face( FT_Face  face );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Set_Char_Size                                                   */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Sets the character dimensions of a given face object.  The         */
-  /*    `char_width' and `char_height' values are used for the width and   */
-  /*    height, respectively, expressed in 26.6 fractional points.         */
-  /*                                                                       */
-  /*    If the horizontal or vertical resolution values are zero, a        */
-  /*    default value of 72dpi is used.  Similarly, if one of the          */
-  /*    character dimensions is zero, its value is set equal to the other. */
-  /*                                                                       */
-  /* <InOut>                                                               */
-  /*    face            :: A handle to a target face object.               */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    char_width      :: The character width, in 26.6 fractional points. */
-  /*                                                                       */
-  /*    char_height     :: The character height, in 26.6 fractional        */
-  /*                       points.                                         */
-  /*                                                                       */
-  /*    horz_resolution :: The horizontal resolution.                      */
-  /*                                                                       */
-  /*    vert_resolution :: The vertical resolution.                        */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0 means success.                             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    When dealing with fixed-size faces (i.e., non-scalable formats),   */
-  /*    @FT_Set_Pixel_Sizes provides a more convenient interface.          */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_Set_Char_Size( FT_Face     face,
-                    FT_F26Dot6  char_width,
-                    FT_F26Dot6  char_height,
-                    FT_UInt     horz_resolution,
-                    FT_UInt     vert_resolution );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Set_Pixel_Sizes                                                 */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Sets the character dimensions of a given face object.  The width   */
-  /*    and height are expressed in integer pixels.                        */
-  /*                                                                       */
-  /*    If one of the character dimensions is zero, its value is set equal */
-  /*    to the other.                                                      */
-  /*                                                                       */
-  /* <InOut>                                                               */
-  /*    face         :: A handle to the target face object.                */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    pixel_width  :: The character width, in integer pixels.            */
-  /*                                                                       */
-  /*    pixel_height :: The character height, in integer pixels.           */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0 means success.                             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    The values of `pixel_width' and `pixel_height' correspond to the   */
-  /*    pixel values of the _typographic_ character size, which are NOT    */
-  /*    necessarily the same as the dimensions of the glyph `bitmap        */
-  /*    cells'.                                                            */
-  /*                                                                       */
-  /*    The `character size' is really the size of an abstract square      */
-  /*    called the `EM', used to design the font.  However, depending      */
-  /*    on the font design, glyphs will be smaller or greater than the     */
-  /*    EM.                                                                */
-  /*                                                                       */
-  /*    This means that setting the pixel size to, say, 8x8 doesn't        */
-  /*    guarantee in any way that you will get glyph bitmaps that all fit  */
-  /*    within an 8x8 cell (sometimes even far from it).                   */
-  /*                                                                       */
-  /*    For bitmap fonts, `pixel_height' usually is a reliable value for   */
-  /*    the height of the bitmap cell.  Drivers for bitmap font formats    */
-  /*    which contain a single bitmap strike only (BDF, PCF, FNT) ignore   */
-  /*    `pixel_width'.                                                     */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_Set_Pixel_Sizes( FT_Face  face,
-                      FT_UInt  pixel_width,
-                      FT_UInt  pixel_height );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Load_Glyph                                                      */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A function used to load a single glyph within a given glyph slot,  */
-  /*    for a given size.                                                  */
-  /*                                                                       */
-  /* <InOut>                                                               */
-  /*    face        :: A handle to the target face object where the glyph  */
-  /*                   will be loaded.                                     */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    glyph_index :: The index of the glyph in the font file.            */
-  /*                                                                       */
-  /*    load_flags  :: A flag indicating what to load for this glyph.  The */
-  /*                   @FT_LOAD_XXX constants can be used to control the   */
-  /*                   glyph loading process (e.g., whether the outline    */
-  /*                   should be scaled, whether to load bitmaps or not,   */
-  /*                   whether to hint the outline, etc).                  */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0 means success.                             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    If the glyph image is not a bitmap, and if the bit flag            */
-  /*    FT_LOAD_IGNORE_TRANSFORM is unset, the glyph image will be         */
-  /*    transformed with the information passed to a previous call to      */
-  /*    @FT_Set_Transform.                                                 */
-  /*                                                                       */
-  /*    Note that this also transforms the `face.glyph.advance' field, but */
-  /*    *not* the values in `face.glyph.metrics'.                          */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_Load_Glyph( FT_Face   face,
-                 FT_UInt   glyph_index,
-                 FT_Int32  load_flags );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Load_Char                                                       */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A function used to load a single glyph within a given glyph slot,  */
-  /*    for a given size, according to its character code.                 */
-  /*                                                                       */
-  /* <InOut>                                                               */
-  /*    face        :: A handle to a target face object where the glyph    */
-  /*                   will be loaded.                                     */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    char_code   :: The glyph's character code, according to the        */
-  /*                   current charmap used in the face.                   */
-  /*                                                                       */
-  /*    load_flags  :: A flag indicating what to load for this glyph.  The */
-  /*                   @FT_LOAD_XXX constants can be used to control the   */
-  /*                   glyph loading process (e.g., whether the outline    */
-  /*                   should be scaled, whether to load bitmaps or not,   */
-  /*                   whether to hint the outline, etc).                  */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0 means success.                             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    If the face has no current charmap, or if the character code       */
-  /*    is not defined in the charmap, this function will return an        */
-  /*    error.                                                             */
-  /*                                                                       */
-  /*    If the glyph image is not a bitmap, and if the bit flag            */
-  /*    FT_LOAD_IGNORE_TRANSFORM is unset, the glyph image will be         */
-  /*    transformed with the information passed to a previous call to      */
-  /*    @FT_Set_Transform.                                                 */
-  /*                                                                       */
-  /*    Note that this also transforms the `face.glyph.advance' field, but */
-  /*    *not* the values in `face.glyph.metrics'.                          */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_Load_Char( FT_Face   face,
-                FT_ULong  char_code,
-                FT_Int32  load_flags );
-
-
- /***************************************************************************
-  *
-  * @enum:
-  *   FT_LOAD_XXX
-  *
-  * @description:
-  *   A list of bit-field constants, used with @FT_Load_Glyph to indicate
-  *   what kind of operations to perform during glyph loading.
-  *
-  * @values:
-  *   FT_LOAD_DEFAULT ::
-  *     Corresponding to 0, this value is used a default glyph load.  In this
-  *     case, the following will happen:
-  *
-  *     1. FreeType looks for a bitmap for the glyph corresponding to the
-  *        face's current size.  If one is found, the function returns.  The
-  *        bitmap data can be accessed from the glyph slot (see note below).
-  *
-  *     2. If no embedded bitmap is searched or found, FreeType looks for a
-  *        scalable outline.  If one is found, it is loaded from the font
-  *        file, scaled to device pixels, then "hinted" to the pixel grid in
-  *        order to optimize it.  The outline data can be accessed from the
-  *        glyph slot (see note below).
-  *
-  *     Note that by default, the glyph loader doesn't render outlines into
-  *     bitmaps.  The following flags are used to modify this default
-  *     behaviour to more specific and useful cases.
-  *
-  *   FT_LOAD_NO_SCALE ::
-  *     Don't scale the vector outline being loaded to 26.6 fractional
-  *     pixels, but kept in font units.  Note that this also disables
-  *     hinting and the loading of embedded bitmaps.  You should only use it
-  *     when you want to retrieve the original glyph outlines in font units.
-  *
-  *   FT_LOAD_NO_HINTING ::
-  *     Don't hint glyph outlines after their scaling to device pixels.
-  *     This generally generates "blurrier" glyphs in anti-aliased modes.
-  *
-  *     This flag is ignored if @FT_LOAD_NO_SCALE is set.
-  *
-  *   FT_LOAD_RENDER ::
-  *     Render the glyph outline immediately into a bitmap before the glyph
-  *     loader returns.  By default, the glyph is rendered for the
-  *     @FT_RENDER_MODE_NORMAL mode, which corresponds to 8-bit anti-aliased
-  *     bitmaps using 256 opacity levels.  You can use either
-  *     @FT_LOAD_TARGET_MONO or @FT_LOAD_MONOCHROME to render 1-bit
-  *     monochrome bitmaps.
-  *
-  *     This flag is ignored if @FT_LOAD_NO_SCALE is set.
-  *
-  *   FT_LOAD_NO_BITMAP ::
-  *     Don't look for bitmaps when loading the glyph.  Only scalable
-  *     outlines will be loaded when available, and scaled, hinted, or
-  *     rendered depending on other bit flags.
-  *
-  *     This does not prevent you from rendering outlines to bitmaps
-  *     with @FT_LOAD_RENDER, however.
-  *
-  *   FT_LOAD_VERTICAL_LAYOUT ::
-  *     Prepare the glyph image for vertical text layout.  This basically
-  *     means that `face.glyph.advance' will correspond to the vertical
-  *     advance height (instead of the default horizontal advance width),
-  *     and that the glyph image will be translated to match the vertical
-  *     bearings positions.
-  *
-  *   FT_LOAD_FORCE_AUTOHINT ::
-  *     Force the use of the FreeType auto-hinter when a glyph outline is
-  *     loaded.  You shouldn't need this in a typical application, since it
-  *     is mostly used to experiment with its algorithm.
-  *
-  *   FT_LOAD_CROP_BITMAP ::
-  *     Indicates that the glyph loader should try to crop the bitmap (i.e.,
-  *     remove all space around its black bits) when loading it.  This is
-  *     only useful when loading embedded bitmaps in certain fonts, since
-  *     bitmaps rendered with @FT_LOAD_RENDER are always cropped by default.
-  *
-  *   FT_LOAD_PEDANTIC ::
-  *     Indicates that the glyph loader should perform pedantic
-  *     verifications during glyph loading, rejecting invalid fonts.  This
-  *     is mostly used to detect broken glyphs in fonts.  By default,
-  *     FreeType tries to handle broken fonts also.
-  *
-  *   FT_LOAD_IGNORE_GLOBAL_ADVANCE_WIDTH ::
-  *     Indicates that the glyph loader should ignore the global advance
-  *     width defined in the font.  As far as we know, this is only used by
-  *     the X-TrueType font server, in order to deal correctly with the
-  *     incorrect metrics contained in DynaLab's TrueType CJK fonts.
-  *
-  *   FT_LOAD_NO_RECURSE ::
-  *     This flag is only used internally.  It merely indicates that the
-  *     glyph loader should not load composite glyphs recursively.  Instead,
-  *     it should set the `num_subglyph' and `subglyphs' values of the glyph
-  *     slot accordingly, and set "glyph->format" to
-  *     @FT_GLYPH_FORMAT_COMPOSITE.
-  *
-  *     The description of sub-glyphs is not available to client
-  *     applications for now.
-  *
-  *   FT_LOAD_IGNORE_TRANSFORM ::
-  *     Indicates that the glyph loader should not try to transform the
-  *     loaded glyph image.  This doesn't prevent scaling, hinting, or
-  *     rendering.
-  *
-  *   FT_LOAD_MONOCHROME ::
-  *     This flag is used with @FT_LOAD_RENDER to indicate that you want
-  *     to render a 1-bit monochrome glyph bitmap from a vectorial outline.
-  *
-  *     Note that this has no effect on the hinting algorithm used by the
-  *     glyph loader.  You should better use @FT_LOAD_TARGET_MONO if you
-  *     want to render monochrome-optimized glyph images instead.
-  *
-  *   FT_LOAD_LINEAR_DESIGN ::
-  *     Return the linearly scaled metrics expressed in original font units
-  *     instead of the default 16.16 pixel values.
-  *
-  *   FT_LOAD_NO_AUTOHINT ::
-  *     Indicates that the auto-hinter should never be used to hint glyph
-  *     outlines.  This doesn't prevent native format-specific hinters from
-  *     being used.  This can be important for certain fonts where unhinted
-  *     output is better than auto-hinted one.
-  */
-#define FT_LOAD_DEFAULT                      0x0
-#define FT_LOAD_NO_SCALE                     0x1
-#define FT_LOAD_NO_HINTING                   0x2
-#define FT_LOAD_RENDER                       0x4
-#define FT_LOAD_NO_BITMAP                    0x8
-#define FT_LOAD_VERTICAL_LAYOUT              0x10
-#define FT_LOAD_FORCE_AUTOHINT               0x20
-#define FT_LOAD_CROP_BITMAP                  0x40
-#define FT_LOAD_PEDANTIC                     0x80
-#define FT_LOAD_IGNORE_GLOBAL_ADVANCE_WIDTH  0x200
-#define FT_LOAD_NO_RECURSE                   0x400
-#define FT_LOAD_IGNORE_TRANSFORM             0x800
-#define FT_LOAD_MONOCHROME                   0x1000
-#define FT_LOAD_LINEAR_DESIGN                0x2000
-
-  /* temporary hack! */
-#define FT_LOAD_SBITS_ONLY                   0x4000
-#define FT_LOAD_NO_AUTOHINT                  0x8000U
-
-  /* */
-
-
-#define FT_LOAD_TARGET_( x )      ( (FT_Int32)( (x) & 15 ) << 16 )
-#define FT_LOAD_TARGET_MODE( x )  ( (FT_Render_Mode)( ( (x) >> 16 ) & 15 ) )
-
-
- /***************************************************************************
-  *
-  * @enum:
-  *   FT_LOAD_TARGET_XXX
-  *
-  * @description:
-  *   A list of load targets.  XXX
-  *
-  * @values:
-  *   FT_LOAD_TARGET_NORMAL ::
-  *     XXX
-  *
-  *   FT_LOAD_TARGET_LIGHT ::
-  *     XXX
-  *
-  *   FT_LOAD_TARGET_MONO ::
-  *     XXX
-  *
-  *   FT_LOAD_TARGET_LCD ::
-  *     XXX
-  *
-  *   FT_LOAD_TARGET_LCD_V ::
-  *     XXX
-  */
-
-#define FT_LOAD_TARGET_NORMAL     FT_LOAD_TARGET_( FT_RENDER_MODE_NORMAL )
-#define FT_LOAD_TARGET_LIGHT      FT_LOAD_TARGET_( FT_RENDER_MODE_LIGHT  )
-#define FT_LOAD_TARGET_MONO       FT_LOAD_TARGET_( FT_RENDER_MODE_MONO   )
-#define FT_LOAD_TARGET_LCD        FT_LOAD_TARGET_( FT_RENDER_MODE_LCD    )
-#define FT_LOAD_TARGET_LCD_V      FT_LOAD_TARGET_( FT_RENDER_MODE_LCD_V  )
-
-  /* */
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Set_Transform                                                   */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A function used to set the transformation that is applied to glyph */
-  /*    images just before they are converted to bitmaps in a glyph slot   */
-  /*    when @FT_Render_Glyph is called.                                   */
-  /*                                                                       */
-  /* <InOut>                                                               */
-  /*    face   :: A handle to the source face object.                      */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    matrix :: A pointer to the transformation's 2x2 matrix.  Use 0 for */
-  /*              the identity matrix.                                     */
-  /*    delta  :: A pointer to the translation vector.  Use 0 for the null */
-  /*              vector.                                                  */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    The transformation is only applied to scalable image formats after */
-  /*    the glyph has been loaded.  It means that hinting is unaltered by  */
-  /*    the transformation and is performed on the character size given in */
-  /*    the last call to @FT_Set_Char_Size or @FT_Set_Pixel_Sizes.         */
-  /*                                                                       */
-  FT_EXPORT( void )
-  FT_Set_Transform( FT_Face     face,
-                    FT_Matrix*  matrix,
-                    FT_Vector*  delta );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Enum>                                                                */
-  /*    FT_Render_Mode                                                     */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    An enumeration type that lists the render modes supported by       */
-  /*    FreeType 2.  Each mode corresponds to a specific type of scanline  */
-  /*    conversion performed on the outline, as well as specific           */
-  /*    hinting optimizations.                                             */
-  /*                                                                       */
-  /*    For bitmap fonts the `bitmap->pixel_mode' field in the             */
-  /*    @FT_GlyphSlotRec structure gives the format of the returned        */
-  /*    bitmap.                                                            */
-  /*                                                                       */
-  /* <Values>                                                              */
-  /*    FT_RENDER_MODE_NORMAL ::                                           */
-  /*      This is the default render mode; it corresponds to 8-bit         */
-  /*      anti-aliased bitmaps, using 256 levels of opacity.               */
-  /*                                                                       */
-  /*    FT_RENDER_MODE_LIGHT ::                                            */
-  /*      This is similar to @FT_RENDER_MODE_NORMAL, except that this      */
-  /*      changes the hinting to prevent stem width quantization.  This    */
-  /*      results in glyph shapes that are more similar to the original,   */
-  /*      while being a bit more fuzzy ("better shapes", instead of        */
-  /*      "better contrast" if you want :-).                               */
-  /*                                                                       */
-  /*    FT_RENDER_MODE_MONO ::                                             */
-  /*      This mode corresponds to 1-bit bitmaps.                          */
-  /*                                                                       */
-  /*    FT_RENDER_MODE_LCD ::                                              */
-  /*      This mode corresponds to horizontal RGB/BGR sub-pixel displays,  */
-  /*      like LCD-screens.  It produces 8-bit bitmaps that are 3 times    */
-  /*      the width of the original glyph outline in pixels, and which use */
-  /*      the @FT_PIXEL_MODE_LCD mode.                                     */
-  /*                                                                       */
-  /*    FT_RENDER_MODE_LCD_V ::                                            */
-  /*      This mode corresponds to vertical RGB/BGR sub-pixel displays     */
-  /*      (like PDA screens, rotated LCD displays, etc.).  It produces     */
-  /*      8-bit bitmaps that are 3 times the height of the original        */
-  /*      glyph outline in pixels and use the @FT_PIXEL_MODE_LCD_V mode.   */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*   The LCD-optimized glyph bitmaps produced by FT_Render_Glyph are     */
-  /*   _not filtered_ to reduce color-fringes.  It is up to the caller to  */
-  /*   perform this pass.                                                  */
-  /*                                                                       */
-  typedef enum  FT_Render_Mode_
-  {
-    FT_RENDER_MODE_NORMAL = 0,
-    FT_RENDER_MODE_LIGHT,
-    FT_RENDER_MODE_MONO,
-    FT_RENDER_MODE_LCD,
-    FT_RENDER_MODE_LCD_V,
-
-    FT_RENDER_MODE_MAX
-
-  } FT_Render_Mode;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Enum>                                                                */
-  /*    ft_render_mode_xxx                                                 */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    These constats are deprecated.  Use the corresponding              */
-  /*    @FT_Render_Mode values instead.                                    */
-  /*                                                                       */
-  /* <Values>                                                              */
-  /*   ft_render_mode_normal :: see @FT_RENDER_MODE_NORMAL                 */
-  /*   ft_render_mode_mono   :: see @FT_RENDER_MODE_MONO                   */
-  /*                                                                       */
-#define ft_render_mode_normal  FT_RENDER_MODE_NORMAL
-#define ft_render_mode_mono    FT_RENDER_MODE_MONO
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Render_Glyph                                                    */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Converts a given glyph image to a bitmap.  It does so by           */
-  /*    inspecting the glyph image format, find the relevant renderer, and */
-  /*    invoke it.                                                         */
-  /*                                                                       */
-  /* <InOut>                                                               */
-  /*    slot        :: A handle to the glyph slot containing the image to  */
-  /*                   convert.                                            */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    render_mode :: This is the render mode used to render the glyph    */
-  /*                   image into a bitmap.  See FT_Render_Mode for a list */
-  /*                   of possible values.                                 */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0 means success.                             */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_Render_Glyph( FT_GlyphSlot    slot,
-                   FT_Render_Mode  render_mode );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Enum>                                                                */
-  /*    FT_Kerning_Mode                                                    */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    An enumeration used to specify which kerning values to return in   */
-  /*    @FT_Get_Kerning.                                                   */
-  /*                                                                       */
-  /* <Values>                                                              */
-  /*    FT_KERNING_DEFAULT  :: Return scaled and grid-fitted kerning       */
-  /*                           distances (value is 0).                     */
-  /*                                                                       */
-  /*    FT_KERNING_UNFITTED :: Return scaled but un-grid-fitted kerning    */
-  /*                           distances.                                  */
-  /*                                                                       */
-  /*    FT_KERNING_UNSCALED :: Return the kerning vector in original font  */
-  /*                           units.                                      */
-  /*                                                                       */
-  typedef enum  FT_Kerning_Mode_
-  {
-    FT_KERNING_DEFAULT  = 0,
-    FT_KERNING_UNFITTED,
-    FT_KERNING_UNSCALED
-
-  } FT_Kerning_Mode;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Const>                                                               */
-  /*    ft_kerning_default                                                 */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    This constant is deprecated.  Please use @FT_KERNING_DEFAULT       */
-  /*    instead.                                                           */
-  /*                                                                       */
-#define ft_kerning_default   FT_KERNING_DEFAULT
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Const>                                                               */
-  /*    ft_kerning_unfitted                                                */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    This constant is deprecated.  Please use @FT_KERNING_UNFITTED      */
-  /*    instead.                                                           */
-  /*                                                                       */
-#define ft_kerning_unfitted  FT_KERNING_UNFITTED
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Const>                                                               */
-  /*    ft_kerning_unscaled                                                */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    This constant is deprecated.  Please use @FT_KERNING_UNSCALED      */
-  /*    instead.                                                           */
-  /*                                                                       */
-#define ft_kerning_unscaled  FT_KERNING_UNSCALED
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Get_Kerning                                                     */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Returns the kerning vector between two glyphs of a same face.      */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    face        :: A handle to a source face object.                   */
-  /*                                                                       */
-  /*    left_glyph  :: The index of the left glyph in the kern pair.       */
-  /*                                                                       */
-  /*    right_glyph :: The index of the right glyph in the kern pair.      */
-  /*                                                                       */
-  /*    kern_mode   :: See @FT_Kerning_Mode for more information.          */
-  /*                   Determines the scale/dimension of the returned      */
-  /*                   kerning vector.                                     */
-  /*                                                                       */
-  /* <Output>                                                              */
-  /*    akerning    :: The kerning vector.  This is in font units for      */
-  /*                   scalable formats, and in pixels for fixed-sizes     */
-  /*                   formats.                                            */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0 means success.                             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    Only horizontal layouts (left-to-right & right-to-left) are        */
-  /*    supported by this method.  Other layouts, or more sophisticated    */
-  /*    kernings, are out of the scope of this API function -- they can be */
-  /*    implemented through format-specific interfaces.                    */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_Get_Kerning( FT_Face     face,
-                  FT_UInt     left_glyph,
-                  FT_UInt     right_glyph,
-                  FT_UInt     kern_mode,
-                  FT_Vector  *akerning );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Get_Glyph_Name                                                  */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Retrieves the ASCII name of a given glyph in a face.  This only    */
-  /*    works for those faces where FT_HAS_GLYPH_NAME(face) returns true.  */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    face        :: A handle to a source face object.                   */
-  /*                                                                       */
-  /*    glyph_index :: The glyph index.                                    */
-  /*                                                                       */
-  /*    buffer_max  :: The maximal number of bytes available in the        */
-  /*                   buffer.                                             */
-  /*                                                                       */
-  /* <Output>                                                              */
-  /*    buffer      :: A pointer to a target buffer where the name will be */
-  /*                   copied to.                                          */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0 means success.                             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    An error is returned if the face doesn't provide glyph names or if */
-  /*    the glyph index is invalid.  In all cases of failure, the first    */
-  /*    byte of `buffer' will be set to 0 to indicate an empty name.       */
-  /*                                                                       */
-  /*    The glyph name is truncated to fit within the buffer if it is too  */
-  /*    long.  The returned string is always zero-terminated.              */
-  /*                                                                       */
-  /*    This function is not compiled within the library if the config     */
-  /*    macro FT_CONFIG_OPTION_NO_GLYPH_NAMES is defined in                */
-  /*    `include/freetype/config/ftoptions.h'                              */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_Get_Glyph_Name( FT_Face     face,
-                     FT_UInt     glyph_index,
-                     FT_Pointer  buffer,
-                     FT_UInt     buffer_max );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Get_Postscript_Name                                             */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Retrieves the ASCII Postscript name of a given face, if available. */
-  /*    This should only work with Postscript and TrueType fonts.          */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    face :: A handle to the source face object.                        */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    A pointer to the face's Postscript name.  NULL if un-available.    */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    The returned pointer is owned by the face and will be destroyed    */
-  /*    with it.                                                           */
-  /*                                                                       */
-  FT_EXPORT( const char* )
-  FT_Get_Postscript_Name( FT_Face  face );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Select_Charmap                                                  */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Selects a given charmap by its encoding tag (as listed in          */
-  /*    `freetype.h').                                                     */
-  /*                                                                       */
-  /* <InOut>                                                               */
-  /*    face     :: A handle to the source face object.                    */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    encoding :: A handle to the selected charmap.                      */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0 means success.                             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    This function will return an error if no charmap in the face       */
-  /*    corresponds to the encoding queried here.                          */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_Select_Charmap( FT_Face      face,
-                     FT_Encoding  encoding );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Set_Charmap                                                     */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Selects a given charmap for character code to glyph index          */
-  /*    decoding.                                                          */
-  /*                                                                       */
-  /* <InOut>                                                               */
-  /*    face    :: A handle to the source face object.                     */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    charmap :: A handle to the selected charmap.                       */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0 means success.                             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    This function will return an error if the charmap is not part of   */
-  /*    the face (i.e., if it is not listed in the face->charmaps        */
-  /*    table).                                                            */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_Set_Charmap( FT_Face     face,
-                  FT_CharMap  charmap );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Get_Char_Index                                                  */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Returns the glyph index of a given character code.  This function  */
-  /*    uses a charmap object to do the translation.                       */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    face     :: A handle to the source face object.                    */
-  /*                                                                       */
-  /*    charcode :: The character code.                                    */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    The glyph index.  0 means `undefined character code'.              */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    FreeType computes its own glyph indices which are not necessarily  */
-  /*    the same as used in the font in case the font is based on glyph    */
-  /*    indices.  Reason for this behaviour is to assure that index 0 is   */
-  /*    never used, representing the missing glyph.                        */
-  /*                                                                       */
-  FT_EXPORT( FT_UInt )
-  FT_Get_Char_Index( FT_Face   face,
-                     FT_ULong  charcode );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Get_First_Char                                                  */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    This function is used to return the first character code in the    */
-  /*    current charmap of a given face.  It will also return the          */
-  /*    corresponding glyph index.                                         */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    face    :: A handle to the source face object.                     */
-  /*                                                                       */
-  /* <Output>                                                              */
-  /*    agindex :: Glyph index of first character code.  0 if charmap is   */
-  /*               empty.                                                  */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    The charmap's first character code.                                */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    You should use this function with @FT_Get_Next_Char to be able to  */
-  /*    parse all character codes available in a given charmap.  The code  */
-  /*    should look like this:                                             */
-  /*                                                                       */
-  /*    {                                                                  */
-  /*      FT_ULong  charcode;                                              */
-  /*      FT_UInt   gindex;                                                */
-  /*                                                                       */
-  /*                                                                       */
-  /*      charcode = FT_Get_First_Char( face, &gindex );                   */
-  /*      while ( gindex != 0 )                                            */
-  /*      {                                                                */
-  /*        ... do something with (charcode,gindex) pair ...               */
-  /*                                                                       */
-  /*        charcode = FT_Get_Next_Char( face, charcode, &gindex );        */
-  /*      }                                                                */
-  /*    }                                                                  */
-  /*                                                                       */
-  /*    Note that `*agindex' will be set to 0 if the charmap is empty.     */
-  /*    The result itself can be 0 in two cases: if the charmap is empty   */
-  /*    or when the value 0 is the first valid character code.             */
-  /*                                                                       */
-  FT_EXPORT( FT_ULong )
-  FT_Get_First_Char( FT_Face   face,
-                     FT_UInt  *agindex );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Get_Next_Char                                                   */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    This function is used to return the next character code in the     */
-  /*    current charmap of a given face following the value 'char_code',   */
-  /*    as well as the corresponding glyph index.                          */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    face      :: A handle to the source face object.                   */
-  /*    char_code :: The starting character code.                          */
-  /*                                                                       */
-  /* <Output>                                                              */
-  /*    agindex   :: Glyph index of first character code.  0 if charmap    */
-  /*                 is empty.                                             */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    The charmap's next character code.                                 */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    You should use this function with @FT_Get_First_Char to walk       */
-  /*    through all character codes available in a given charmap.  See     */
-  /*    the note for this function for a simple code example.              */
-  /*                                                                       */
-  /*    Note that `*agindex' will be set to 0 when there are no more codes */
-  /*    in the charmap.                                                    */
-  /*                                                                       */
-  FT_EXPORT( FT_ULong )
-  FT_Get_Next_Char( FT_Face    face,
-                    FT_ULong   char_code,
-                    FT_UInt   *agindex );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Get_Name_Index                                                  */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Returns the glyph index of a given glyph name.  This function uses */
-  /*    driver specific objects to do the translation.                     */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    face       :: A handle to the source face object.                  */
-  /*                                                                       */
-  /*    glyph_name :: The glyph name.                                      */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    The glyph index.  0 means `undefined character code'.              */
-  /*                                                                       */
-  FT_EXPORT( FT_UInt )
-  FT_Get_Name_Index( FT_Face     face,
-                     FT_String*  glyph_name );
-
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Section>                                                             */
-  /*    computations                                                       */
-  /*                                                                       */
-  /* <Title>                                                               */
-  /*    Computations                                                       */
-  /*                                                                       */
-  /* <Abstract>                                                            */
-  /*    Crunching fixed numbers and vectors                                */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    This section contains various functions used to perform            */
-  /*    computations on 16.16 fixed-float numbers or 2d vectors.           */
-  /*                                                                       */
-  /* <Order>                                                               */
-  /*    FT_MulDiv                                                          */
-  /*    FT_MulFix                                                          */
-  /*    FT_DivFix                                                          */
-  /*    FT_RoundFix                                                        */
-  /*    FT_CeilFix                                                         */
-  /*    FT_FloorFix                                                        */
-  /*    FT_Vector_Transform                                                */
-  /*    FT_Matrix_Multiply                                                 */
-  /*    FT_Matrix_Invert                                                   */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_MulDiv                                                          */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A very simple function used to perform the computation `(a*b)/c'   */
-  /*    with maximal accuracy (it uses a 64-bit intermediate integer       */
-  /*    whenever necessary).                                               */
-  /*                                                                       */
-  /*    This function isn't necessarily as fast as some processor specific */
-  /*    operations, but is at least completely portable.                   */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    a :: The first multiplier.                                         */
-  /*    b :: The second multiplier.                                        */
-  /*    c :: The divisor.                                                  */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    The result of `(a*b)/c'.  This function never traps when trying to */
-  /*    divide by zero; it simply returns `MaxInt' or `MinInt' depending   */
-  /*    on the signs of `a' and `b'.                                       */
-  /*                                                                       */
-  FT_EXPORT( FT_Long )
-  FT_MulDiv( FT_Long  a,
-             FT_Long  b,
-             FT_Long  c );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_MulFix                                                          */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A very simple function used to perform the computation             */
-  /*    `(a*b)/0x10000' with maximal accuracy.  Most of the time this is   */
-  /*    used to multiply a given value by a 16.16 fixed float factor.      */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    a :: The first multiplier.                                         */
-  /*    b :: The second multiplier.  Use a 16.16 factor here whenever      */
-  /*         possible (see note below).                                    */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    The result of `(a*b)/0x10000'.                                     */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    This function has been optimized for the case where the absolute   */
-  /*    value of `a' is less than 2048, and `b' is a 16.16 scaling factor. */
-  /*    As this happens mainly when scaling from notional units to         */
-  /*    fractional pixels in FreeType, it resulted in noticeable speed     */
-  /*    improvements between versions 2.x and 1.x.                         */
-  /*                                                                       */
-  /*    As a conclusion, always try to place a 16.16 factor as the         */
-  /*    _second_ argument of this function; this can make a great          */
-  /*    difference.                                                        */
-  /*                                                                       */
-  FT_EXPORT( FT_Long )
-  FT_MulFix( FT_Long  a,
-             FT_Long  b );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_DivFix                                                          */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A very simple function used to perform the computation             */
-  /*    `(a*0x10000)/b' with maximal accuracy.  Most of the time, this is  */
-  /*    used to divide a given value by a 16.16 fixed float factor.        */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    a :: The first multiplier.                                         */
-  /*    b :: The second multiplier.  Use a 16.16 factor here whenever      */
-  /*         possible (see note below).                                    */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    The result of `(a*0x10000)/b'.                                     */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    The optimization for FT_DivFix() is simple: If (a << 16) fits in   */
-  /*    32 bits, then the division is computed directly.  Otherwise, we    */
-  /*    use a specialized version of @FT_MulDiv.                           */
-  /*                                                                       */
-  FT_EXPORT( FT_Long )
-  FT_DivFix( FT_Long  a,
-             FT_Long  b );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_RoundFix                                                        */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A very simple function used to round a 16.16 fixed number.         */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    a :: The number to be rounded.                                     */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    The result of `(a + 0x8000) & -0x10000'.                           */
-  /*                                                                       */
-  FT_EXPORT( FT_Fixed )
-  FT_RoundFix( FT_Fixed  a );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_CeilFix                                                         */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A very simple function used to compute the ceiling function of a   */
-  /*    16.16 fixed number.                                                */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    a :: The number for which the ceiling function is to be computed.  */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    The result of `(a + 0x10000 - 1) & -0x10000'.                      */
-  /*                                                                       */
-  FT_EXPORT( FT_Fixed )
-  FT_CeilFix( FT_Fixed  a );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_FloorFix                                                        */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A very simple function used to compute the floor function of a     */
-  /*    16.16 fixed number.                                                */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    a :: The number for which the floor function is to be computed.    */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    The result of `a & -0x10000'.                                      */
-  /*                                                                       */
-  FT_EXPORT( FT_Fixed )
-  FT_FloorFix( FT_Fixed  a );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Vector_Transform                                                */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Transforms a single vector through a 2x2 matrix.                   */
-  /*                                                                       */
-  /* <InOut>                                                               */
-  /*    vector :: The target vector to transform.                          */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    matrix :: A pointer to the source 2x2 matrix.                      */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    The result is undefined if either `vector' or `matrix' is invalid. */
-  /*                                                                       */
-  FT_EXPORT( void )
-  FT_Vector_Transform( FT_Vector*  vec,
-                       FT_Matrix*  matrix );
-
-
-  /* */
-
-
-FT_END_HEADER
-
-#endif /* __FREETYPE_H__ */
-
-
-/* END */

gpac-2.2.1.tar.gz/extra_lib/include/freetype/freetype/ftbbox.h Deleted

@@ -1,89 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  ftbbox.h                                                               */
-/*                                                                         */
-/*    FreeType exact bbox computation (specification).                     */
-/*                                                                         */
-/*  Copyright 1996-2001, 2003 by                                           */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* This component has a _single_ role: to compute exact outline bounding */
-  /* boxes.                                                                */
-  /*                                                                       */
-  /* It is separated from the rest of the engine for various technical     */
-  /* reasons.  It may well be integrated in `ftoutln' later.               */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-#ifndef __FTBBOX_H__
-#define __FTBBOX_H__
-
-
-#include <ft2build.h>
-#include FT_FREETYPE_H
-
-#ifdef FREETYPE_H
-#error "freetype.h of FreeType 1 has been loaded!"
-#error "Please fix the directory search order for header files"
-#error "so that freetype.h of FreeType 2 is found first."
-#endif
-
-
-FT_BEGIN_HEADER
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Section>                                                             */
-  /*    outline_processing                                                 */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Outline_Get_BBox                                                */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Computes the exact bounding box of an outline.  This is slower     */
-  /*    than computing the control box.  However, it uses an advanced      */
-  /*    algorithm which returns _very_ quickly when the two boxes          */
-  /*    coincide.  Otherwise, the outline Bezier arcs are walked over to   */
-  /*    extract their extrema.                                             */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    outline :: A pointer to the source outline.                        */
-  /*                                                                       */
-  /* <Output>                                                              */
-  /*    abbox   :: The outline's exact bounding box.                       */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0 means success.                             */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_Outline_Get_BBox( FT_Outline*  outline,
-                       FT_BBox     *abbox );
-
-
-  /* */
-
-
-FT_END_HEADER
-
-#endif /* __FTBBOX_H__ */
-
-
-/* END */

gpac-2.2.1.tar.gz/extra_lib/include/freetype/freetype/ftbdf.h Deleted

@@ -1,200 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  ftbdf.h                                                                */
-/*                                                                         */
-/*    FreeType API for accessing BDF-specific strings (specification).     */
-/*                                                                         */
-/*  Copyright 2002, 2003 by                                                */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef __FTBDF_H__
-#define __FTBDF_H__
-
-#include <ft2build.h>
-#include FT_FREETYPE_H
-
-#ifdef FREETYPE_H
-#error "freetype.h of FreeType 1 has been loaded!"
-#error "Please fix the directory search order for header files"
-#error "so that freetype.h of FreeType 2 is found first."
-#endif
-
-
-FT_BEGIN_HEADER
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Section>                                                             */
-  /*    bdf_fonts                                                          */
-  /*                                                                       */
-  /* <Title>                                                               */
-  /*    BDF Fonts                                                          */
-  /*                                                                       */
-  /* <Abstract>                                                            */
-  /*    BDF-specific APIs                                                  */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    This section contains the declaration of BDF-specific functions.   */
-  /*                                                                       */
-  /*************************************************************************/
-
-
- /**********************************************************************
-  *
-  * @enum:
-  *    FT_PropertyType
-  *
-  * @description:
-  *    A list of BDF property types.
-  *
-  * @values:
-  *    BDF_PROPERTY_TYPE_NONE ::
-  *      Value 0 is used to indicate a missing property.
-  *
-  *    BDF_PROPERTY_TYPE_ATOM ::
-  *      Property is a string atom.
-  *
-  *    BDF_PROPERTY_TYPE_INTEGER ::
-  *      Property is a 32-bit signed integer.
-  *
-  *    BDF_PROPERTY_TYPE_CARDINAL ::
-  *      Property is a 32-bit unsigned integer.
-  */
-  typedef enum  BDF_PropertyType_
-  {
-    BDF_PROPERTY_TYPE_NONE     = 0,
-    BDF_PROPERTY_TYPE_ATOM     = 1,
-    BDF_PROPERTY_TYPE_INTEGER  = 2,
-    BDF_PROPERTY_TYPE_CARDINAL = 3
-
-  } BDF_PropertyType;
-
-
- /**********************************************************************
-  *
-  * @type:
-  *    BDF_Property
-  *
-  * @description:
-  *    A handle to a @BDF_PropertyRec structure to model a given
-  *    BDF/PCF property.
-  */
-  typedef struct BDF_PropertyRec_*  BDF_Property;
-
-
- /**********************************************************************
-  *
-  * @struct:
-  *    BDF_PropertyRec
-  *
-  * @description:
-  *    This structure models a given BDF/PCF property.
-  *
-  * @fields:
-  *    type ::
-  *      The property type.
-  *
-  *    u.atom ::
-  *      The atom string, if type is @BDF_PROPERTY_TYPE_ATOM.
-  *
-  *    u.integer ::
-  *      A signed integer, if type is @BDF_PROPERTY_TYPE_INTEGER.
-  *
-  *    u.cardinal ::
-  *      An unsigned integer, if type is @BDF_PROPERTY_TYPE_CARDINAL.
-  */
-  typedef struct  BDF_PropertyRec_
-  {
-    BDF_PropertyType  type;
-    union {
-      const char*     atom;
-      FT_Int32        integer;
-      FT_UInt32       cardinal;
-
-    } u;
-
-  } BDF_PropertyRec;
-
-
- /**********************************************************************
-  *
-  * @function:
-  *    FT_Get_BDF_Charset_ID
-  *
-  * @description:
-  *    Retrieves a BDF font character set identity, according to
-  *    the BDF specification.
-  *
-  * @input:
-  *    face ::
-  *       A handle to the input face.
-  *
-  * @output:
-  *    acharset_encoding ::
-  *       Charset encoding, as a C string, owned by the face.
-  *
-  *    acharset_registry ::
-  *       Charset registry, as a C string, owned by the face.
-  *
-  * @return:
-  *   FreeType error code.  0 means success.
-  *
-  * @note:
-  *   This function only works with BDF faces, returning an error otherwise.
-  */
-  FT_EXPORT( FT_Error )
-  FT_Get_BDF_Charset_ID( FT_Face       face,
-                         const char*  *acharset_encoding,
-                         const char*  *acharset_registry );
-
-
- /**********************************************************************
-  *
-  * @function:
-  *    FT_Get_BDF_Property
-  *
-  * @description:
-  *    Retrieves a BDF property from a BDF or PCF font file.
-  *
-  * @input:
-  *    face :: A handle to the input face.
-  *
-  *    name :: The property name.
-  *
-  * @output:
-  *    aproperty :: The property.
-  *
-  * @return:
-  *   FreeType error code.  0 means success.
-  *
-  * @note:
-  *   This function works with BDF _and_ PCF fonts.  It returns an error
-  *   otherwise.  It also returns an error if the property is not in the
-  *   font.
-  *
-  *   In case of error, "aproperty->type" is always set to
-  *   @BDF_PROPERTY_TYPE_NONE.
-  */
-  FT_EXPORT( FT_Error )
-  FT_Get_BDF_Property( FT_Face           face,
-                       const char*       prop_name,
-                       BDF_PropertyRec  *aproperty );
-
- /* */
-
-FT_END_HEADER
-
-#endif /* __FTBDF_H__ */
-
-
-/* END */

gpac-2.2.1.tar.gz/extra_lib/include/freetype/freetype/ftcache.h Deleted

@@ -1,414 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  ftcache.h                                                              */
-/*                                                                         */
-/*    FreeType Cache subsystem (specification).                            */
-/*                                                                         */
-/*  Copyright 1996-2001, 2002, 2003 by                                     */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-  /*********                                                       *********/
-  /*********             WARNING, THIS IS BETA CODE.               *********/
-  /*********                                                       *********/
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-
-
-#ifndef __FTCACHE_H__
-#define __FTCACHE_H__
-
-
-#include <ft2build.h>
-#include FT_GLYPH_H
-
-
-FT_BEGIN_HEADER
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Section>                                                             */
-  /*    cache_subsystem                                                    */
-  /*                                                                       */
-  /* <Title>                                                               */
-  /*    Cache Sub-System                                                   */
-  /*                                                                       */
-  /* <Abstract>                                                            */
-  /*    How to cache face, size, and glyph data with FreeType 2.           */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*   This section describes the FreeType 2 cache sub-system which is     */
-  /*   stile in beta.                                                      */
-  /*                                                                       */
-  /* <Order>                                                               */
-  /*   FTC_Manager                                                         */
-  /*   FTC_FaceID                                                          */
-  /*   FTC_Face_Requester                                                  */
-  /*                                                                       */
-  /*   FTC_Manager_New                                                     */
-  /*   FTC_Manager_Lookup_Face                                             */
-  /*   FTC_Manager_Lookup_Size                                             */
-  /*                                                                       */
-  /*   FTC_Node                                                            */
-  /*   FTC_Node_Ref                                                        */
-  /*   FTC_Node_Unref                                                      */
-  /*                                                                       */
-  /*   FTC_Font                                                            */
-  /*   FTC_ImageCache                                                      */
-  /*   FTC_ImageCache_New                                                  */
-  /*   FTC_ImageCache_Lookup                                               */
-  /*                                                                       */
-  /*   FTC_SBit                                                            */
-  /*   FTC_SBitCache                                                       */
-  /*   FTC_SBitCache_New                                                   */
-  /*   FTC_SBitCache_Lookup                                                */
-  /*                                                                       */
-  /*                                                                       */
-  /*   FTC_Image_Desc                                                      */
-  /*   FTC_Image_Cache                                                     */
-  /*   FTC_Image_Cache_Lookup                                              */
-  /*                                                                       */
-  /*   FTC_SBit_Cache                                                      */
-  /*   FTC_SBit_Cache_Lookup                                               */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-  /*****                                                               *****/
-  /*****                    BASIC TYPE DEFINITIONS                     *****/
-  /*****                                                               *****/
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Type>                                                                */
-  /*    FTC_FaceID                                                         */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A generic pointer type that is used to identity face objects.  The */
-  /*    contents of such objects is application-dependent.                 */
-  /*                                                                       */
-  typedef FT_Pointer  FTC_FaceID;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <FuncType>                                                            */
-  /*    FTC_Face_Requester                                                 */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A callback function provided by client applications.  It is used   */
-  /*    to translate a given @FTC_FaceID into a new valid @FT_Face object. */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    face_id :: The face ID to resolve.                                 */
-  /*                                                                       */
-  /*    library :: A handle to a FreeType library object.                  */
-  /*                                                                       */
-  /*    data    :: Application-provided request data.                      */
-  /*                                                                       */
-  /* <Output>                                                              */
-  /*    aface   :: A new @FT_Face handle.                                  */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0 means success.                             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    The face requester should not perform funny things on the returned */
-  /*    face object, like creating a new @FT_Size for it, or setting a     */
-  /*    transformation through @FT_Set_Transform!                          */
-  /*                                                                       */
-  typedef FT_Error
-  (*FTC_Face_Requester)( FTC_FaceID  face_id,
-                         FT_Library  library,
-                         FT_Pointer  request_data,
-                         FT_Face*    aface );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    FTC_FontRec                                                        */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A simple structure used to describe a given `font' to the cache    */
-  /*    manager.  Note that a `font' is the combination of a given face    */
-  /*    with a given character size.                                       */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    face_id    :: The ID of the face to use.                           */
-  /*                                                                       */
-  /*    pix_width  :: The character width in integer pixels.               */
-  /*                                                                       */
-  /*    pix_height :: The character height in integer pixels.              */
-  /*                                                                       */
-  typedef struct  FTC_FontRec_
-  {
-    FTC_FaceID  face_id;
-    FT_UShort   pix_width;
-    FT_UShort   pix_height;
-
-  } FTC_FontRec;
-
-
-  /* */
-
-
-#define FTC_FONT_COMPARE( f1, f2 )                  \
-          ( (f1)->face_id    == (f2)->face_id    && \
-            (f1)->pix_width  == (f2)->pix_width  && \
-            (f1)->pix_height == (f2)->pix_height )
-
-#define FT_POINTER_TO_ULONG( p )  ((FT_ULong)(FT_Pointer)(p))
-
-#define FTC_FACE_ID_HASH( i )                              \
-          ((FT_UInt32)(( FT_POINTER_TO_ULONG( i ) >> 3 ) ^ \
-                       ( FT_POINTER_TO_ULONG( i ) << 7 ) ) )
-
-#define FTC_FONT_HASH( f )                              \
-          (FT_UInt32)( FTC_FACE_ID_HASH((f)->face_id) ^ \
-                       ((f)->pix_width << 8)          ^ \
-                       ((f)->pix_height)              )
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Type>                                                                */
-  /*    FTC_Font                                                           */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A simple handle to an @FTC_FontRec structure.                      */
-  /*                                                                       */
-  typedef FTC_FontRec*  FTC_Font;
-
-
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-  /*****                                                               *****/
-  /*****                      CACHE MANAGER OBJECT                     *****/
-  /*****                                                               *****/
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Type>                                                                */
-  /*    FTC_Manager                                                        */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    This object is used to cache one or more @FT_Face objects, along   */
-  /*    with corresponding @FT_Size objects.                               */
-  /*                                                                       */
-  typedef struct FTC_ManagerRec_*  FTC_Manager;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Type>                                                                */
-  /*    FTC_Node                                                           */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    An opaque handle to a cache node object.  Each cache node is       */
-  /*    reference-counted.  A node with a count of 0 might be flushed      */
-  /*    out of a full cache whenever a lookup request is performed.        */
-  /*                                                                       */
-  /*    If you lookup nodes, you have the ability to "acquire" them, i.e., */
-  /*    to increment their reference count.  This will prevent the node    */
-  /*    from being flushed out of the cache until you explicitly "release" */
-  /*    it (see @FTC_Node_Unref).                                          */
-  /*                                                                       */
-  /*    See also @FTC_SBitCache_Lookup and @FTC_ImageCache_Lookup.         */
-  /*                                                                       */
-  typedef struct FTC_NodeRec_*  FTC_Node;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FTC_Manager_New                                                    */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Creates a new cache manager.                                       */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    library   :: The parent FreeType library handle to use.            */
-  /*                                                                       */
-  /*    max_faces :: Maximum number of faces to keep alive in manager.     */
-  /*                 Use 0 for defaults.                                   */
-  /*                                                                       */
-  /*    max_sizes :: Maximum number of sizes to keep alive in manager.     */
-  /*                 Use 0 for defaults.                                   */
-  /*                                                                       */
-  /*    max_bytes :: Maximum number of bytes to use for cached data.       */
-  /*                 Use 0 for defaults.                                   */
-  /*                                                                       */
-  /*    requester :: An application-provided callback used to translate    */
-  /*                 face IDs into real @FT_Face objects.                  */
-  /*                                                                       */
-  /*    req_data  :: A generic pointer that is passed to the requester     */
-  /*                 each time it is called (see @FTC_Face_Requester).     */
-  /*                                                                       */
-  /* <Output>                                                              */
-  /*    amanager  :: A handle to a new manager object.  0 in case of       */
-  /*                 failure.                                              */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0 means success.                             */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FTC_Manager_New( FT_Library          library,
-                   FT_UInt             max_faces,
-                   FT_UInt             max_sizes,
-                   FT_ULong            max_bytes,
-                   FTC_Face_Requester  requester,
-                   FT_Pointer          req_data,
-                   FTC_Manager        *amanager );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FTC_Manager_Reset                                                  */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Empties a given cache manager.  This simply gets rid of all the    */
-  /*    currently cached @FT_Face and @FT_Size objects within the manager. */
-  /*                                                                       */
-  /* <InOut>                                                               */
-  /*    manager :: A handle to the manager.                                */
-  /*                                                                       */
-  FT_EXPORT( void )
-  FTC_Manager_Reset( FTC_Manager  manager );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FTC_Manager_Done                                                   */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Destroys a given manager after emptying it.                        */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    manager :: A handle to the target cache manager object.            */
-  /*                                                                       */
-  FT_EXPORT( void )
-  FTC_Manager_Done( FTC_Manager  manager );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FTC_Manager_Lookup_Face                                            */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Retrieves the @FT_Face object that corresponds to a given face ID  */
-  /*    through a cache manager.                                           */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    manager :: A handle to the cache manager.                          */
-  /*                                                                       */
-  /*    face_id :: The ID of the face object.                              */
-  /*                                                                       */
-  /* <Output>                                                              */
-  /*    aface   :: A handle to the face object.                            */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0 means success.                             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    The returned @FT_Face object is always owned by the manager.  You  */
-  /*    should never try to discard it yourself.                           */
-  /*                                                                       */
-  /*    The @FT_Face object doesn't necessarily have a current size object */
-  /*    (i.e., face->size can be 0).  If you need a specific `font size',  */
-  /*    use @FTC_Manager_Lookup_Size instead.                              */
-  /*                                                                       */
-  /*    Never change the face's transformation matrix (i.e., never call    */
-  /*    the @FT_Set_Transform function) on a returned face!  If you need   */
-  /*    to transform glyphs, do it yourself after glyph loading.           */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FTC_Manager_Lookup_Face( FTC_Manager  manager,
-                           FTC_FaceID   face_id,
-                           FT_Face     *aface );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FTC_Manager_Lookup_Size                                            */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Retrieves the @FT_Face and @FT_Size objects that correspond to a   */
-  /*    given font.                                                        */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    manager :: A handle to the cache manager.                          */
-  /*                                                                       */
-  /*    font    :: The font to use.                                        */
-  /*                                                                       */
-  /* <Output>                                                              */
-  /*    aface   :: A pointer to the handle of the face object.  Set it to  */
-  /*               zero if you don't need it.                              */
-  /*                                                                       */
-  /*    asize   :: A pointer to the handle of the size object.  Set it to  */
-  /*               zero if you don't need it.                              */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0 means success.                             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    The returned @FT_Face object is always owned by the manager.  You  */
-  /*    should never try to discard it yourself.                           */
-  /*                                                                       */
-  /*    Never change the face's transformation matrix (i.e., never call    */
-  /*    the @FT_Set_Transform function) on a returned face!  If you need   */
-  /*    to transform glyphs, do it yourself after glyph loading.           */
-  /*                                                                       */
-  /*    Similarly, the returned @FT_Size object is always owned by the     */
-  /*    manager.  You should never try to discard it, and never change its */
-  /*    settings with @FT_Set_Pixel_Sizes or @FT_Set_Char_Size!            */
-  /*                                                                       */
-  /*    The returned size object is the face's current size, which means   */
-  /*    that you can call @FT_Load_Glyph with the face if you need to.     */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FTC_Manager_Lookup_Size( FTC_Manager  manager,
-                           FTC_Font     font,
-                           FT_Face     *aface,
-                           FT_Size     *asize );
-
-
-FT_END_HEADER
-
-#endif /* __FTCACHE_H__ */
-
-
-/* END */

gpac-2.2.1.tar.gz/extra_lib/include/freetype/freetype/ftchapters.h Deleted

@@ -1,69 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/* <Chapter>                                                               */
-/*    core_api                                                             */
-/*                                                                         */
-/* <Title>                                                                 */
-/*    Core API                                                             */
-/*                                                                         */
-/* <Sections>                                                              */
-/*    basic_types                                                          */
-/*    base_interface                                                       */
-/*    glyph_management                                                     */
-/*    mac_specific                                                         */
-/*    sizes_management                                                     */
-/*    header_file_macros                                                   */
-/*                                                                         */
-/***************************************************************************/
-
-/***************************************************************************/
-/*                                                                         */
-/* <Chapter>                                                               */
-/*    format_specific                                                      */
-/*                                                                         */
-/* <Title>                                                                 */
-/*    Format-Specific API                                                  */
-/*                                                                         */
-/* <Sections>                                                              */
-/*    multiple_masters                                                     */
-/*    truetype_tables                                                      */
-/*    type1_tables                                                         */
-/*    sfnt_names                                                           */
-/*    bdf_fonts                                                            */
-/*    pfr_fonts                                                            */
-/*                                                                         */
-/***************************************************************************/
-
-
-/***************************************************************************/
-/*                                                                         */
-/* <Chapter>                                                               */
-/*    cache_subsystem                                                      */
-/*                                                                         */
-/* <Title>                                                                 */
-/*    Cache Sub-System                                                     */
-/*                                                                         */
-/* <Sections>                                                              */
-/*    cache_subsystem                                                      */
-/*                                                                         */
-/***************************************************************************/
-
-
-/***************************************************************************/
-/*                                                                         */
-/* <Chapter>                                                               */
-/*    support_api                                                          */
-/*                                                                         */
-/* <Title>                                                                 */
-/*    Support API                                                          */
-/*                                                                         */
-/* <Sections>                                                              */
-/*    computations                                                         */
-/*    list_processing                                                      */
-/*    outline_processing                                                   */
-/*    raster                                                               */
-/*    system_interface                                                     */
-/*    module_management                                                    */
-/*                                                                         */
-/***************************************************************************/
-

gpac-2.2.1.tar.gz/extra_lib/include/freetype/freetype/fterrdef.h Deleted

@@ -1,229 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  fterrdef.h                                                             */
-/*                                                                         */
-/*    FreeType error codes (specification).                                */
-/*                                                                         */
-/*  Copyright 2002 by                                                      */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-  /*******************************************************************/
-  /*******************************************************************/
-  /*****                                                         *****/
-  /*****                LIST OF ERROR CODES/MESSAGES             *****/
-  /*****                                                         *****/
-  /*******************************************************************/
-  /*******************************************************************/
-
-
-  /* You need to define both FT_ERRORDEF_ and FT_NOERRORDEF_ before */
-  /* including this file.                                           */
-
-
-  /* generic errors */
-
-  FT_NOERRORDEF_( Ok,                                        0x00, \
-                  "no error" )
-
-  FT_ERRORDEF_( Cannot_Open_Resource,                        0x01, \
-                "cannot open resource" )
-  FT_ERRORDEF_( Unknown_File_Format,                         0x02, \
-                "unknown file format" )
-  FT_ERRORDEF_( Invalid_File_Format,                         0x03, \
-                "broken file" )
-  FT_ERRORDEF_( Invalid_Version,                             0x04, \
-                "invalid FreeType version" )
-  FT_ERRORDEF_( Lower_Module_Version,                        0x05, \
-                "module version is too low" )
-  FT_ERRORDEF_( Invalid_Argument,                            0x06, \
-                "invalid argument" )
-  FT_ERRORDEF_( Unimplemented_Feature,                       0x07, \
-                "unimplemented feature" )
-  FT_ERRORDEF_( Invalid_Table,                               0x08, \
-                "broken table" )
-  FT_ERRORDEF_( Invalid_Offset,                              0x09, \
-                "broken offset within table" )
-
-  /* glyph/character errors */
-
-  FT_ERRORDEF_( Invalid_Glyph_Index,                         0x10, \
-                "invalid glyph index" )
-  FT_ERRORDEF_( Invalid_Character_Code,                      0x11, \
-                "invalid character code" )
-  FT_ERRORDEF_( Invalid_Glyph_Format,                        0x12, \
-                "unsupported glyph image format" )
-  FT_ERRORDEF_( Cannot_Render_Glyph,                         0x13, \
-                "cannot render this glyph format" )
-  FT_ERRORDEF_( Invalid_Outline,                             0x14, \
-                "invalid outline" )
-  FT_ERRORDEF_( Invalid_Composite,                           0x15, \
-                "invalid composite glyph" )
-  FT_ERRORDEF_( Too_Many_Hints,                              0x16, \
-                "too many hints" )
-  FT_ERRORDEF_( Invalid_Pixel_Size,                          0x17, \
-                "invalid pixel size" )
-
-  /* handle errors */
-
-  FT_ERRORDEF_( Invalid_Handle,                              0x20, \
-                "invalid object handle" )
-  FT_ERRORDEF_( Invalid_Library_Handle,                      0x21, \
-                "invalid library handle" )
-  FT_ERRORDEF_( Invalid_Driver_Handle,                       0x22, \
-                "invalid module handle" )
-  FT_ERRORDEF_( Invalid_Face_Handle,                         0x23, \
-                "invalid face handle" )
-  FT_ERRORDEF_( Invalid_Size_Handle,                         0x24, \
-                "invalid size handle" )
-  FT_ERRORDEF_( Invalid_Slot_Handle,                         0x25, \
-                "invalid glyph slot handle" )
-  FT_ERRORDEF_( Invalid_CharMap_Handle,                      0x26, \
-                "invalid charmap handle" )
-  FT_ERRORDEF_( Invalid_Cache_Handle,                        0x27, \
-                "invalid cache manager handle" )
-  FT_ERRORDEF_( Invalid_Stream_Handle,                       0x28, \
-                "invalid stream handle" )
-
-  /* driver errors */
-
-  FT_ERRORDEF_( Too_Many_Drivers,                            0x30, \
-                "too many modules" )
-  FT_ERRORDEF_( Too_Many_Extensions,                         0x31, \
-                "too many extensions" )
-
-  /* memory errors */
-
-  FT_ERRORDEF_( Out_Of_Memory,                               0x40, \
-                "out of memory" )
-  FT_ERRORDEF_( Unlisted_Object,                             0x41, \
-                "unlisted object" )
-
-  /* stream errors */
-
-  FT_ERRORDEF_( Cannot_Open_Stream,                          0x51, \
-                "cannot open stream" )
-  FT_ERRORDEF_( Invalid_Stream_Seek,                         0x52, \
-                "invalid stream seek" )
-  FT_ERRORDEF_( Invalid_Stream_Skip,                         0x53, \
-                "invalid stream skip" )
-  FT_ERRORDEF_( Invalid_Stream_Read,                         0x54, \
-                "invalid stream read" )
-  FT_ERRORDEF_( Invalid_Stream_Operation,                    0x55, \
-                "invalid stream operation" )
-  FT_ERRORDEF_( Invalid_Frame_Operation,                     0x56, \
-                "invalid frame operation" )
-  FT_ERRORDEF_( Nested_Frame_Access,                         0x57, \
-                "nested frame access" )
-  FT_ERRORDEF_( Invalid_Frame_Read,                          0x58, \
-                "invalid frame read" )
-
-  /* raster errors */
-
-  FT_ERRORDEF_( Raster_Uninitialized,                        0x60, \
-                "raster uninitialized" )
-  FT_ERRORDEF_( Raster_Corrupted,                            0x61, \
-                "raster corrupted" )
-  FT_ERRORDEF_( Raster_Overflow,                             0x62, \
-                "raster overflow" )
-  FT_ERRORDEF_( Raster_Negative_Height,                      0x63, \
-                "negative height while rastering" )
-
-  /* cache errors */
-
-  FT_ERRORDEF_( Too_Many_Caches,                             0x70, \
-                "too many registered caches" )
-
-  /* TrueType and SFNT errors */
-
-  FT_ERRORDEF_( Invalid_Opcode,                              0x80, \
-                "invalid opcode" )
-  FT_ERRORDEF_( Too_Few_Arguments,                           0x81, \
-                "too few arguments" )
-  FT_ERRORDEF_( Stack_Overflow,                              0x82, \
-                "stack overflow" )
-  FT_ERRORDEF_( Code_Overflow,                               0x83, \
-                "code overflow" )
-  FT_ERRORDEF_( Bad_Argument,                                0x84, \
-                "bad argument" )
-  FT_ERRORDEF_( Divide_By_Zero,                              0x85, \
-                "division by zero" )
-  FT_ERRORDEF_( Invalid_Reference,                           0x86, \
-                "invalid reference" )
-  FT_ERRORDEF_( Debug_OpCode,                                0x87, \
-                "found debug opcode" )
-  FT_ERRORDEF_( ENDF_In_Exec_Stream,                         0x88, \
-                "found ENDF opcode in execution stream" )
-  FT_ERRORDEF_( Nested_DEFS,                                 0x89, \
-                "nested DEFS" )
-  FT_ERRORDEF_( Invalid_CodeRange,                           0x8A, \
-                "invalid code range" )
-  FT_ERRORDEF_( Execution_Too_Long,                          0x8B, \
-                "execution context too long" )
-  FT_ERRORDEF_( Too_Many_Function_Defs,                      0x8C, \
-                "too many function definitions" )
-  FT_ERRORDEF_( Too_Many_Instruction_Defs,                   0x8D, \
-                "too many instruction definitions" )
-  FT_ERRORDEF_( Table_Missing,                               0x8E, \
-                "SFNT font table missing" )
-  FT_ERRORDEF_( Horiz_Header_Missing,                        0x8F, \
-                "horizontal header (hhea) table missing" )
-  FT_ERRORDEF_( Locations_Missing,                           0x90, \
-                "locations (loca) table missing" )
-  FT_ERRORDEF_( Name_Table_Missing,                          0x91, \
-                "name table missing" )
-  FT_ERRORDEF_( CMap_Table_Missing,                          0x92, \
-                "character map (cmap) table missing" )
-  FT_ERRORDEF_( Hmtx_Table_Missing,                          0x93, \
-                "horizontal metrics (hmtx) table missing" )
-  FT_ERRORDEF_( Post_Table_Missing,                          0x94, \
-                "PostScript (post) table missing" )
-  FT_ERRORDEF_( Invalid_Horiz_Metrics,                       0x95, \
-                "invalid horizontal metrics" )
-  FT_ERRORDEF_( Invalid_CharMap_Format,                      0x96, \
-                "invalid character map (cmap) format" )
-  FT_ERRORDEF_( Invalid_PPem,                                0x97, \
-                "invalid ppem value" )
-  FT_ERRORDEF_( Invalid_Vert_Metrics,                        0x98, \
-                "invalid vertical metrics" )
-  FT_ERRORDEF_( Could_Not_Find_Context,                      0x99, \
-                "could not find context" )
-  FT_ERRORDEF_( Invalid_Post_Table_Format,                   0x9A, \
-                "invalid PostScript (post) table format" )
-  FT_ERRORDEF_( Invalid_Post_Table,                          0x9B, \
-                "invalid PostScript (post) table" )
-
-  /* CFF, CID, and Type 1 errors */
-
-  FT_ERRORDEF_( Syntax_Error,                                0xA0, \
-                "opcode syntax error" )
-  FT_ERRORDEF_( Stack_Underflow,                             0xA1, \
-                "argument stack underflow" )
-
-  /* BDF errors */
-
-  FT_ERRORDEF_( Missing_Startfont_Field,                     0xB0, \
-                "`STARTFONT' field missing" )
-  FT_ERRORDEF_( Missing_Font_Field,                          0xB1, \
-                "`FONT' field missing" )
-  FT_ERRORDEF_( Missing_Size_Field,                          0xB2, \
-                "`SIZE' field missing" )
-  FT_ERRORDEF_( Missing_Chars_Field,                         0xB3, \
-                "`CHARS' field missing" )
-  FT_ERRORDEF_( Missing_Startchar_Field,                     0xB4, \
-                "`STARTCHAR' field missing" )
-  FT_ERRORDEF_( Missing_Encoding_Field,                      0xB5, \
-                "`ENCODING' field missing" )
-  FT_ERRORDEF_( Missing_Bbx_Field,                           0xB6, \
-                "`BBX' field missing" )
-
-
-/* END */

gpac-2.2.1.tar.gz/extra_lib/include/freetype/freetype/fterrors.h Deleted

@@ -1,207 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  fterrors.h                                                             */
-/*                                                                         */
-/*    FreeType error code handling (specification).                        */
-/*                                                                         */
-/*  Copyright 1996-2001, 2002 by                                           */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* This special header file is used to define the handling of FT2        */
-  /* enumeration constants.  It can also be used to generate error message */
-  /* strings with a small macro trick explained below.                     */
-  /*                                                                       */
-  /* I - Error Formats                                                     */
-  /* -----------------                                                     */
-  /*                                                                       */
-  /*   Since release 2.1, the error constants have changed.  The lower     */
-  /*   byte of the error value gives the "generic" error code, while the   */
-  /*   higher byte indicates in which module the error occurred.           */
-  /*                                                                       */
-  /*   You can use the macro FT_ERROR_BASE(x) macro to extract the generic */
-  /*   error code from an FT_Error value.                                  */
-  /*                                                                       */
-  /*   The configuration macro FT_CONFIG_OPTION_USE_MODULE_ERRORS can be   */
-  /*   undefined in ftoption.h in order to make the higher byte always     */
-  /*   zero, in case you need to be compatible with previous versions of   */
-  /*   FreeType 2.                                                         */
-  /*                                                                       */
-  /*                                                                       */
-  /* II - Error Message strings                                            */
-  /* --------------------------                                            */
-  /*                                                                       */
-  /*   The error definitions below are made through special macros that    */
-  /*   allow client applications to build a table of error message strings */
-  /*   if they need it.  The strings are not included in a normal build of */
-  /*   FreeType 2 to save space (most client applications do not use       */
-  /*   them).                                                              */
-  /*                                                                       */
-  /*   To do so, you have to define the following macros before including  */
-  /*   this file:                                                          */
-  /*                                                                       */
-  /*   FT_ERROR_START_LIST ::                                              */
-  /*     This macro is called before anything else to define the start of  */
-  /*     the error list.  It is followed by several FT_ERROR_DEF calls     */
-  /*     (see below).                                                      */
-  /*                                                                       */
-  /*   FT_ERROR_DEF( e, v, s ) ::                                          */
-  /*     This macro is called to define one single error.                  */
-  /*     `e' is the error code identifier (e.g. FT_Err_Invalid_Argument).  */
-  /*     `v' is the error numerical value.                                 */
-  /*     `s' is the corresponding error string.                            */
-  /*                                                                       */
-  /*   FT_ERROR_END_LIST ::                                                */
-  /*     This macro ends the list.                                         */
-  /*                                                                       */
-  /*   Additionally, you have to undefine __FTERRORS_H__ before #including */
-  /*   this file.                                                          */
-  /*                                                                       */
-  /*   Here is a simple example:                                           */
-  /*                                                                       */
-  /*     {                                                                 */
-  /*       #undef __FTERRORS_H__                                           */
-  /*       #define FT_ERRORDEF( e, v, s )  { e, s },                       */
-  /*       #define FT_ERROR_START_LIST     {                               */
-  /*       #define FT_ERROR_END_LIST       { 0, 0 } };                     */
-  /*                                                                       */
-  /*       const struct                                                    */
-  /*       {                                                               */
-  /*         int          err_code;                                        */
-  /*         const char*  err_msg                                          */
-  /*       } ft_errors =                                                 */
-  /*                                                                       */
-  /*       #include FT_ERRORS_H                                            */
-  /*     }                                                                 */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-#ifndef __FTERRORS_H__
-#define __FTERRORS_H__
-
-
-  /* include module base error codes */
-#include FT_MODULE_ERRORS_H
-
-
-  /*******************************************************************/
-  /*******************************************************************/
-  /*****                                                         *****/
-  /*****                       SETUP MACROS                      *****/
-  /*****                                                         *****/
-  /*******************************************************************/
-  /*******************************************************************/
-
-
-#undef  FT_NEED_EXTERN_C
-
-#undef  FT_ERR_XCAT
-#undef  FT_ERR_CAT
-
-#define FT_ERR_XCAT( x, y )  x ## y
-#define FT_ERR_CAT( x, y )   FT_ERR_XCAT( x, y )
-
-
-  /* FT_ERR_PREFIX is used as a prefix for error identifiers. */
-  /* By default, we use `FT_Err_'.                            */
-  /*                                                          */
-#ifndef FT_ERR_PREFIX
-#define FT_ERR_PREFIX  FT_Err_
-#endif
-
-
-  /* FT_ERR_BASE is used as the base for module-specific errors. */
-  /*                                                             */
-#ifdef FT_CONFIG_OPTION_USE_MODULE_ERRORS
-
-#ifndef FT_ERR_BASE
-#define FT_ERR_BASE  FT_Mod_Err_Base
-#endif
-
-#else
-
-#undef FT_ERR_BASE
-#define FT_ERR_BASE  0
-
-#endif /* FT_CONFIG_OPTION_USE_MODULE_ERRORS */
-
-
-  /* If FT_ERRORDEF is not defined, we need to define a simple */
-  /* enumeration type.                                         */
-  /*                                                           */
-#ifndef FT_ERRORDEF
-
-#define FT_ERRORDEF( e, v, s )  e = v,
-#define FT_ERROR_START_LIST     enum {
-#define FT_ERROR_END_LIST       FT_ERR_CAT( FT_ERR_PREFIX, Max ) };
-
-#ifdef __cplusplus
-#define FT_NEED_EXTERN_C
-  extern "C" {
-#endif
-
-#endif /* !FT_ERRORDEF */
-
-
-  /* this macro is used to define an error */
-#define FT_ERRORDEF_( e, v, s )   \
-          FT_ERRORDEF( FT_ERR_CAT( FT_ERR_PREFIX, e ), v + FT_ERR_BASE, s )
-
-  /* this is only used for FT_Err_Ok, which must be 0! */
-#define FT_NOERRORDEF_( e, v, s ) \
-          FT_ERRORDEF( FT_ERR_CAT( FT_ERR_PREFIX, e ), v, s )
-
-
-#ifdef FT_ERROR_START_LIST
-  FT_ERROR_START_LIST
-#endif
-
-
-  /* no include the error codes */
-#include FT_ERROR_DEFINITIONS_H
-
-
-#ifdef FT_ERROR_END_LIST
-  FT_ERROR_END_LIST
-#endif
-
-
-  /*******************************************************************/
-  /*******************************************************************/
-  /*****                                                         *****/
-  /*****                      SIMPLE CLEANUP                     *****/
-  /*****                                                         *****/
-  /*******************************************************************/
-  /*******************************************************************/
-
-#ifdef FT_NEED_EXTERN_C
-  }
-#endif
-
-#undef FT_ERROR_START_LIST
-#undef FT_ERROR_END_LIST
-
-#undef FT_ERRORDEF
-#undef FT_ERRORDEF_
-#undef FT_NOERRORDEF_
-
-#undef FT_NEED_EXTERN_C
-#undef FT_ERR_PREFIX
-#undef FT_ERR_BASE
-#undef FT_ERR_CONCAT
-
-#endif /* __FTERRORS_H__ */
-
-
-/* END */

gpac-2.2.1.tar.gz/extra_lib/include/freetype/freetype/ftglyph.h Deleted

@@ -1,566 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  ftglyph.h                                                              */
-/*                                                                         */
-/*    FreeType convenience functions to handle glyphs (specification).     */
-/*                                                                         */
-/*  Copyright 1996-2001, 2002, 2003 by                                     */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* This file contains the definition of several convenience functions    */
-  /* that can be used by client applications to easily retrieve glyph      */
-  /* bitmaps and outlines from a given face.                               */
-  /*                                                                       */
-  /* These functions should be optional if you are writing a font server   */
-  /* or text layout engine on top of FreeType.  However, they are pretty   */
-  /* handy for many other simple uses of the library.                      */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-#ifndef __FTGLYPH_H__
-#define __FTGLYPH_H__
-
-
-#include <ft2build.h>
-#include FT_FREETYPE_H
-
-#ifdef FREETYPE_H
-#error "freetype.h of FreeType 1 has been loaded!"
-#error "Please fix the directory search order for header files"
-#error "so that freetype.h of FreeType 2 is found first."
-#endif
-
-
-FT_BEGIN_HEADER
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Section>                                                             */
-  /*    glyph_management                                                   */
-  /*                                                                       */
-  /* <Title>                                                               */
-  /*    Glyph Management                                                   */
-  /*                                                                       */
-  /* <Abstract>                                                            */
-  /*    Generic interface to manage individual glyph data.                 */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    This section contains definitions used to manage glyph data        */
-  /*    through generic FT_Glyph objects.  Each of them can contain a      */
-  /*    bitmap, a vector outline, or even images in other formats.         */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-  /* forward declaration to a private type */
-  typedef struct FT_Glyph_Class_  FT_Glyph_Class;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Type>                                                                */
-  /*    FT_Glyph                                                           */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Handle to an object used to model generic glyph images.  It is a   */
-  /*    pointer to the @FT_GlyphRec structure and can contain a glyph      */
-  /*    bitmap or pointer.                                                 */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    Glyph objects are not owned by the library.  You must thus release */
-  /*    them manually (through @FT_Done_Glyph) _before_ calling            */
-  /*    @FT_Done_FreeType.                                                 */
-  /*                                                                       */
-  typedef struct FT_GlyphRec_*  FT_Glyph;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    FT_GlyphRec                                                        */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    The root glyph structure contains a given glyph image plus its     */
-  /*    advance width in 16.16 fixed float format.                         */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    library :: A handle to the FreeType library object.                */
-  /*                                                                       */
-  /*    clazz   :: A pointer to the glyph's class.  Private.               */
-  /*                                                                       */
-  /*    format  :: The format of the glyph's image.                        */
-  /*                                                                       */
-  /*    advance :: A 16.16 vector that gives the glyph's advance width.    */
-  /*                                                                       */
-  typedef struct  FT_GlyphRec_
-  {
-    FT_Library             library;
-    const FT_Glyph_Class*  clazz;
-    FT_Glyph_Format        format;
-    FT_Vector              advance;
-
-  } FT_GlyphRec;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Type>                                                                */
-  /*    FT_BitmapGlyph                                                     */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A handle to an object used to model a bitmap glyph image.  This is */
-  /*    a sub-class of @FT_Glyph, and a pointer to @FT_BitmapGlyphRec.     */
-  /*                                                                       */
-  typedef struct FT_BitmapGlyphRec_*  FT_BitmapGlyph;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    FT_BitmapGlyphRec                                                  */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A structure used for bitmap glyph images.  This really is a        */
-  /*    `sub-class' of `FT_GlyphRec'.                                      */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    root   :: The root FT_Glyph fields.                                */
-  /*                                                                       */
-  /*    left   :: The left-side bearing, i.e., the horizontal distance     */
-  /*              from the current pen position to the left border of the  */
-  /*              glyph bitmap.                                            */
-  /*                                                                       */
-  /*    top    :: The top-side bearing, i.e., the vertical distance from   */
-  /*              the current pen position to the top border of the glyph  */
-  /*              bitmap.  This distance is positive for upwards-y!        */
-  /*                                                                       */
-  /*    bitmap :: A descriptor for the bitmap.                             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    You can typecast FT_Glyph to FT_BitmapGlyph if you have            */
-  /*    glyph->format == FT_GLYPH_FORMAT_BITMAP.  This lets you access     */
-  /*    the bitmap's contents easily.                                      */
-  /*                                                                       */
-  /*    The corresponding pixel buffer is always owned by the BitmapGlyph  */
-  /*    and is thus created and destroyed with it.                         */
-  /*                                                                       */
-  typedef struct  FT_BitmapGlyphRec_
-  {
-    FT_GlyphRec  root;
-    FT_Int       left;
-    FT_Int       top;
-    FT_Bitmap    bitmap;
-
-  } FT_BitmapGlyphRec;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Type>                                                                */
-  /*    FT_OutlineGlyph                                                    */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A handle to an object used to model an outline glyph image.  This  */
-  /*    is a sub-class of @FT_Glyph, and a pointer to @FT_OutlineGlyphRec. */
-  /*                                                                       */
-  typedef struct FT_OutlineGlyphRec_*  FT_OutlineGlyph;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    FT_OutlineGlyphRec                                                 */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A structure used for outline (vectorial) glyph images.  This       */
-  /*    really is a `sub-class' of `FT_GlyphRec'.                          */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    root    :: The root FT_Glyph fields.                               */
-  /*                                                                       */
-  /*    outline :: A descriptor for the outline.                           */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    You can typecast FT_Glyph to FT_OutlineGlyph if you have           */
-  /*    glyph->format == FT_GLYPH_FORMAT_OUTLINE.  This lets you access    */
-  /*    the outline's content easily.                                      */
-  /*                                                                       */
-  /*    As the outline is extracted from a glyph slot, its coordinates are */
-  /*    expressed normally in 26.6 pixels, unless the flag                 */
-  /*    FT_LOAD_NO_SCALE was used in FT_Load_Glyph() or FT_Load_Char().    */
-  /*                                                                       */
-  /*    The outline's tables are always owned by the object and are        */
-  /*    destroyed with it.                                                 */
-  /*                                                                       */
-  typedef struct  FT_OutlineGlyphRec_
-  {
-    FT_GlyphRec  root;
-    FT_Outline   outline;
-
-  } FT_OutlineGlyphRec;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Get_Glyph                                                       */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A function used to extract a glyph image from a slot.              */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    slot   :: A handle to the source glyph slot.                       */
-  /*                                                                       */
-  /* <Output>                                                              */
-  /*    aglyph :: A handle to the glyph object.                            */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0 means success.                             */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_Get_Glyph( FT_GlyphSlot  slot,
-                FT_Glyph     *aglyph );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Glyph_Copy                                                      */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A function used to copy a glyph image.  Note that the created      */
-  /*    @FT_Glyph object must be released with @FT_Done_Glyph.             */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    source :: A handle to the source glyph object.                     */
-  /*                                                                       */
-  /* <Output>                                                              */
-  /*    target :: A handle to the target glyph object.  0 in case of       */
-  /*              error.                                                   */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0 means success.                             */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_Glyph_Copy( FT_Glyph   source,
-                 FT_Glyph  *target );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Glyph_Transform                                                 */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Transforms a glyph image if its format is scalable.                */
-  /*                                                                       */
-  /* <InOut>                                                               */
-  /*    glyph  :: A handle to the target glyph object.                     */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    matrix :: A pointer to a 2x2 matrix to apply.                      */
-  /*                                                                       */
-  /*    delta  :: A pointer to a 2d vector to apply.  Coordinates are      */
-  /*              expressed in 1/64th of a pixel.                          */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code (the glyph format is not scalable if it is     */
-  /*    not zero).                                                         */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    The 2x2 transformation matrix is also applied to the glyph's       */
-  /*    advance vector.                                                    */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_Glyph_Transform( FT_Glyph    glyph,
-                      FT_Matrix*  matrix,
-                      FT_Vector*  delta );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Enum>                                                                */
-  /*    FT_Glyph_BBox_Mode                                                 */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    The mode how the values of @FT_Glyph_Get_CBox are returned.        */
-  /*                                                                       */
-  /* <Values>                                                              */
-  /*    FT_GLYPH_BBOX_UNSCALED ::                                          */
-  /*      Return unscaled font units.                                      */
-  /*                                                                       */
-  /*    FT_GLYPH_BBOX_SUBPIXELS ::                                         */
-  /*      Return unfitted 26.6 coordinates.                                */
-  /*                                                                       */
-  /*    FT_GLYPH_BBOX_GRIDFIT ::                                           */
-  /*      Return grid-fitted 26.6 coordinates.                             */
-  /*                                                                       */
-  /*    FT_GLYPH_BBOX_TRUNCATE ::                                          */
-  /*      Return coordinates in integer pixels.                            */
-  /*                                                                       */
-  /*    FT_GLYPH_BBOX_PIXELS ::                                            */
-  /*      Return grid-fitted pixel coordinates.                            */
-  /*                                                                       */
-  typedef enum  FT_Glyph_BBox_Mode_
-  {
-    FT_GLYPH_BBOX_UNSCALED  = 0,
-    FT_GLYPH_BBOX_SUBPIXELS = 0,
-    FT_GLYPH_BBOX_GRIDFIT   = 1,
-    FT_GLYPH_BBOX_TRUNCATE  = 2,
-    FT_GLYPH_BBOX_PIXELS    = 3
-
-  } FT_Glyph_BBox_Mode;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Enum>                                                                */
-  /*    ft_glyph_bbox_xxx                                                  */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    These constants are deprecated.  Use the corresponding             */
-  /*    @FT_Glyph_BBox_Mode values instead.                                */
-  /*                                                                       */
-  /* <Values>                                                              */
-  /*   ft_glyph_bbox_unscaled  :: see @FT_GLYPH_BBOX_UNSCALED              */
-  /*   ft_glyph_bbox_subpixels :: see @FT_GLYPH_BBOX_SUBPIXELS             */
-  /*   ft_glyph_bbox_gridfit   :: see @FT_GLYPH_BBOX_GRIDFIT               */
-  /*   ft_glyph_bbox_truncate  :: see @FT_GLYPH_BBOX_TRUNCATE              */
-  /*   ft_glyph_bbox_pixels    :: see @FT_GLYPH_BBOX_PIXELS                */
-  /*                                                                       */
-#define ft_glyph_bbox_unscaled   FT_GLYPH_BBOX_UNSCALED
-#define ft_glyph_bbox_subpixels  FT_GLYPH_BBOX_SUBPIXELS
-#define ft_glyph_bbox_gridfit    FT_GLYPH_BBOX_GRIDFIT
-#define ft_glyph_bbox_truncate   FT_GLYPH_BBOX_TRUNCATE
-#define ft_glyph_bbox_pixels     FT_GLYPH_BBOX_PIXELS
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Glyph_Get_CBox                                                  */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Returns a glyph's `control box'.  The control box encloses all the */
-  /*    outline's points, including Bezier control points.  Though it      */
-  /*    coincides with the exact bounding box for most glyphs, it can be   */
-  /*    slightly larger in some situations (like when rotating an outline  */
-  /*    which contains Bezier outside arcs).                               */
-  /*                                                                       */
-  /*    Computing the control box is very fast, while getting the bounding */
-  /*    box can take much more time as it needs to walk over all segments  */
-  /*    and arcs in the outline.  To get the latter, you can use the       */
-  /*    `ftbbox' component which is dedicated to this single task.         */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    glyph :: A handle to the source glyph object.                      */
-  /*                                                                       */
-  /*    mode  :: The mode which indicates how to interpret the returned    */
-  /*             bounding box values.                                      */
-  /*                                                                       */
-  /* <Output>                                                              */
-  /*    acbox :: The glyph coordinate bounding box.  Coordinates are       */
-  /*             expressed in 1/64th of pixels if it is grid-fitted.       */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    Coordinates are relative to the glyph origin, using the Y-upwards  */
-  /*    convention.                                                        */
-  /*                                                                       */
-  /*    If the glyph has been loaded with FT_LOAD_NO_SCALE, `bbox_mode'    */
-  /*    must be set to `FT_GLYPH_BBOX_UNSCALED' to get unscaled font       */
-  /*    units in 26.6 pixel format.  The value `FT_GLYPH_BBOX_SUBPIXELS'   */
-  /*    is another name for this constant.                                 */
-  /*                                                                       */
-  /*    Note that the maximum coordinates are exclusive, which means that  */
-  /*    one can compute the width and height of the glyph image (be it in  */
-  /*    integer or 26.6 pixels) as:                                        */
-  /*                                                                       */
-  /*      width  = bbox.xMax - bbox.xMin;                                  */
-  /*      height = bbox.yMax - bbox.yMin;                                  */
-  /*                                                                       */
-  /*    Note also that for 26.6 coordinates, if `bbox_mode' is set to      */
-  /*    `FT_GLYPH_BBOX_GRIDFIT', the coordinates will also be grid-fitted, */
-  /*    which corresponds to:                                              */
-  /*                                                                       */
-  /*      bbox.xMin = FLOOR(bbox.xMin);                                    */
-  /*      bbox.yMin = FLOOR(bbox.yMin);                                    */
-  /*      bbox.xMax = CEILING(bbox.xMax);                                  */
-  /*      bbox.yMax = CEILING(bbox.yMax);                                  */
-  /*                                                                       */
-  /*    To get the bbox in pixel coordinates, set `bbox_mode' to           */
-  /*    `FT_GLYPH_BBOX_TRUNCATE'.                                          */
-  /*                                                                       */
-  /*    To get the bbox in grid-fitted pixel coordinates, set `bbox_mode'  */
-  /*    to `FT_GLYPH_BBOX_PIXELS'.                                         */
-  /*                                                                       */
-  FT_EXPORT( void )
-  FT_Glyph_Get_CBox( FT_Glyph  glyph,
-                     FT_UInt   bbox_mode,
-                     FT_BBox  *acbox );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Glyph_To_Bitmap                                                 */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Converts a given glyph object to a bitmap glyph object.            */
-  /*                                                                       */
-  /* <InOut>                                                               */
-  /*    the_glyph   :: A pointer to a handle to the target glyph.          */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    render_mode :: An enumeration that describe how the data is        */
-  /*                   rendered.                                           */
-  /*                                                                       */
-  /*    origin      :: A pointer to a vector used to translate the glyph   */
-  /*                   image before rendering.  Can be 0 (if no            */
-  /*                   translation).  The origin is expressed in           */
-  /*                   26.6 pixels.                                        */
-  /*                                                                       */
-  /*    destroy     :: A boolean that indicates that the original glyph    */
-  /*                   image should be destroyed by this function.  It is  */
-  /*                   never destroyed in case of error.                   */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0 means success.                             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    The glyph image is translated with the `origin' vector before      */
-  /*    rendering.                                                         */
-  /*                                                                       */
-  /*    The first parameter is a pointer to a FT_Glyph handle, that will   */
-  /*    be replaced by this function.  Typically, you would use (omitting  */
-  /*    error handling):                                                   */
-  /*                                                                       */
-  /*                                                                       */
-  /*      {                                                                */
-  /*        FT_Glyph        glyph;                                         */
-  /*        FT_BitmapGlyph  glyph_bitmap;                                  */
-  /*                                                                       */
-  /*                                                                       */
-  /*        // load glyph                                                  */
-  /*        error = FT_Load_Char( face, glyph_index, FT_LOAD_DEFAUT );     */
-  /*                                                                       */
-  /*        // extract glyph image                                         */
-  /*        error = FT_Get_Glyph( face->glyph, &glyph );                   */
-  /*                                                                       */
-  /*        // convert to a bitmap (default render mode + destroy old)     */
-  /*        if ( glyph->format != FT_GLYPH_FORMAT_BITMAP )                 */
-  /*        {                                                              */
-  /*          error = FT_Glyph_To_Bitmap( &glyph, FT_RENDER_MODE_DEFAULT,  */
-  /*                                      0, 1 );                          */
-  /*          if ( error ) // glyph unchanged                              */
-  /*            ...                                                        */
-  /*        }                                                              */
-  /*                                                                       */
-  /*        // access bitmap content by typecasting                        */
-  /*        glyph_bitmap = (FT_BitmapGlyph)glyph;                          */
-  /*                                                                       */
-  /*        // do funny stuff with it, like blitting/drawing               */
-  /*        ...                                                            */
-  /*                                                                       */
-  /*        // discard glyph image (bitmap or not)                         */
-  /*        FT_Done_Glyph( glyph );                                        */
-  /*      }                                                                */
-  /*                                                                       */
-  /*                                                                       */
-  /*    This function will always fail if the glyph's format isn't         */
-  /*    scalable.                                                          */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_Glyph_To_Bitmap( FT_Glyph*       the_glyph,
-                      FT_Render_Mode  render_mode,
-                      FT_Vector*      origin,
-                      FT_Bool         destroy );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Done_Glyph                                                      */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Destroys a given glyph.                                            */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    glyph :: A handle to the target glyph object.                      */
-  /*                                                                       */
-  FT_EXPORT( void )
-  FT_Done_Glyph( FT_Glyph  glyph );
-
-
-  /* other helpful functions */
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Section>                                                             */
-  /*    computations                                                       */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Matrix_Multiply                                                 */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Performs the matrix operation `b = a*b'.                           */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    a :: A pointer to matrix `a'.                                      */
-  /*                                                                       */
-  /* <InOut>                                                               */
-  /*    b :: A pointer to matrix `b'.                                      */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    The result is undefined if either `a' or `b' is zero.              */
-  /*                                                                       */
-  FT_EXPORT( void )
-  FT_Matrix_Multiply( const FT_Matrix*  a,
-                      FT_Matrix*  b );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Matrix_Invert                                                   */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Inverts a 2x2 matrix.  Returns an error if it can't be inverted.   */
-  /*                                                                       */
-  /* <InOut>                                                               */
-  /*    matrix :: A pointer to the target matrix.  Remains untouched in    */
-  /*              case of error.                                           */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0 means success.                             */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_Matrix_Invert( FT_Matrix*  matrix );
-
-
-  /* */
-
-
-FT_END_HEADER
-
-#endif /* __FTGLYPH_H__ */
-
-
-/* END */

gpac-2.2.1.tar.gz/extra_lib/include/freetype/freetype/ftgzip.h Deleted

@@ -1,100 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  ftgzip.h                                                               */
-/*                                                                         */
-/*    Gzip-compressed stream support.                                      */
-/*                                                                         */
-/*  Copyright 2002, 2003 by                                                */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef __FTGZIP_H__
-#define __FTGZIP_H__
-
-#include <ft2build.h>
-#include FT_FREETYPE_H
-
-#ifdef FREETYPE_H
-#error "freetype.h of FreeType 1 has been loaded!"
-#error "Please fix the directory search order for header files"
-#error "so that freetype.h of FreeType 2 is found first."
-#endif
-
-
-FT_BEGIN_HEADER
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Section>                                                             */
-  /*    gzip                                                               */
-  /*                                                                       */
-  /* <Title>                                                               */
-  /*    GZIP Streams                                                       */
-  /*                                                                       */
-  /* <Abstract>                                                            */
-  /*    Using gzip-compressed font files                                   */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    This section contains the declaration of Gzip-specific functions.  */
-  /*                                                                       */
-  /*************************************************************************/
-
-
- /************************************************************************
-  *
-  * @function:
-  *   FT_Stream_OpenGzip
-  *
-  * @description:
-  *   Open a new stream to parse gzip-compressed font files.  This is
-  *   mainly used to support the compressed *.pcf.gz fonts that come
-  *   with XFree86.
-  *
-  * @input:
-  *   stream :: The target embedding stream.
-  *
-  *   source :: The source stream.
-  *
-  * @return:
-  *   FreeType error code.  0 means success.
-  *
-  * @note:
-  *   The source stream must be opened _before_ calling this function.
-  *
-  *   Calling the internal function FT_Stream_Close on the new stream will
-  *   *not* call FT_Stream_Close on the source stream.  None of the stream
-  *   objects will be released to the heap.
-  *
-  *   The stream implementation is very basic and resets the decompression
-  *   process each time seeking backwards is needed within the stream.
-  *
-  *   In certain builds of the library, gzip compression recognition is
-  *   automatically handled when calling @FT_New_Face or @FT_Open_Face.
-  *   This means that if no font driver is capable of handling the raw
-  *   compressed file, the library will try to open a gzipped stream from
-  *   it and re-open the face with it.
-  *
-  *   This function may return "FT_Err_Unimplemented" if your build of
-  *   FreeType was not compiled with zlib support.
-  */
-  FT_EXPORT( FT_Error )
-  FT_Stream_OpenGzip( FT_Stream  stream,
-                      FT_Stream  source );
-
- /* */
-
-
-FT_END_HEADER
-
-#endif /* __FTGZIP_H__ */
-
-
-/* END */

gpac-2.2.1.tar.gz/extra_lib/include/freetype/freetype/ftimage.h Deleted

@@ -1,1236 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  ftimage.h                                                              */
-/*                                                                         */
-/*    FreeType glyph image formats and default raster interface            */
-/*    (specification).                                                     */
-/*                                                                         */
-/*  Copyright 1996-2001, 2002, 2003 by                                     */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* Note: A `raster' is simply a scan-line converter, used to render      */
-  /*       FT_Outlines into FT_Bitmaps.                                    */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-#ifndef __FTIMAGE_H__
-#define __FTIMAGE_H__
-
-
-/* _STANDALONE_ is from ftgrays.c */
-#ifndef _STANDALONE_
-#include <ft2build.h>
-#endif
-
-
-FT_BEGIN_HEADER
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Section>                                                             */
-  /*    basic_types                                                        */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Type>                                                                */
-  /*    FT_Pos                                                             */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    The type FT_Pos is a 32-bit integer used to store vectorial        */
-  /*    coordinates.  Depending on the context, these can represent        */
-  /*    distances in integer font units, or 16,16, or 26.6 fixed float     */
-  /*    pixel coordinates.                                                 */
-  /*                                                                       */
-  typedef signed long  FT_Pos;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    FT_Vector                                                          */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A simple structure used to store a 2D vector; coordinates are of   */
-  /*    the FT_Pos type.                                                   */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    x :: The horizontal coordinate.                                    */
-  /*    y :: The vertical coordinate.                                      */
-  /*                                                                       */
-  typedef struct  FT_Vector_
-  {
-    FT_Pos  x;
-    FT_Pos  y;
-
-  } FT_Vector;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    FT_BBox                                                            */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A structure used to hold an outline's bounding box, i.e., the      */
-  /*    coordinates of its extrema in the horizontal and vertical          */
-  /*    directions.                                                        */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    xMin :: The horizontal minimum (left-most).                        */
-  /*                                                                       */
-  /*    yMin :: The vertical minimum (bottom-most).                        */
-  /*                                                                       */
-  /*    xMax :: The horizontal maximum (right-most).                       */
-  /*                                                                       */
-  /*    yMax :: The vertical maximum (top-most).                           */
-  /*                                                                       */
-  typedef struct  FT_BBox_
-  {
-    FT_Pos  xMin, yMin;
-    FT_Pos  xMax, yMax;
-
-  } FT_BBox;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Enum>                                                                */
-  /*    FT_Pixel_Mode                                                      */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    An enumeration type used to describe the format of pixels in a     */
-  /*    given bitmap.  Note that additional formats may be added in the    */
-  /*    future.                                                            */
-  /*                                                                       */
-  /* <Values>                                                              */
-  /*    FT_PIXEL_MODE_NONE ::                                              */
-  /*      Value 0 is reserved.                                             */
-  /*                                                                       */
-  /*    FT_PIXEL_MODE_MONO ::                                              */
-  /*      A monochrome bitmap, using 1 bit per pixel.  Note that pixels    */
-  /*      are stored in most-significant order (MSB), which means that     */
-  /*      the left-most pixel in a byte has value 128.                     */
-  /*                                                                       */
-  /*    FT_PIXEL_MODE_GRAY ::                                              */
-  /*      An 8-bit bitmap, generally used to represent anti-aliased glyph  */
-  /*      images.  Each pixel is stored in one byte.  Note that the number */
-  /*      of value "gray" levels is stored in the `num_bytes' field of     */
-  /*      the @FT_Bitmap structure (it generally is 256).                  */
-  /*                                                                       */
-  /*    FT_PIXEL_MODE_GRAY2 ::                                             */
-  /*      A 2-bit/pixel bitmap, used to represent embedded anti-aliased    */
-  /*      bitmaps in font files according to the OpenType specification.   */
-  /*      We haven't found a single font using this format, however.       */
-  /*                                                                       */
-  /*    FT_PIXEL_MODE_GRAY4 ::                                             */
-  /*      A 4-bit/pixel bitmap, used to represent embedded anti-aliased    */
-  /*      bitmaps in font files according to the OpenType specification.   */
-  /*      We haven't found a single font using this format, however.       */
-  /*                                                                       */
-  /*    FT_PIXEL_MODE_LCD ::                                               */
-  /*      An 8-bit bitmap, used to represent RGB or BGR decimated glyph    */
-  /*      images used for display on LCD displays; the bitmap's width is   */
-  /*      three times wider than the original glyph image.  See also       */
-  /*      @FT_RENDER_MODE_LCD.                                             */
-  /*                                                                       */
-  /*    FT_PIXEL_MODE_LCD_V ::                                             */
-  /*      An 8-bit bitmap, used to represent RGB or BGR decimated glyph    */
-  /*      images used for display on rotated LCD displays; the bitmap's    */
-  /*      height is three times taller than the original glyph image.      */
-  /*      See also @FT_RENDER_MODE_LCD_V.                                  */
-  /*                                                                       */
-  typedef enum  FT_Pixel_Mode_
-  {
-    FT_PIXEL_MODE_NONE = 0,
-    FT_PIXEL_MODE_MONO,
-    FT_PIXEL_MODE_GRAY,
-    FT_PIXEL_MODE_GRAY2,
-    FT_PIXEL_MODE_GRAY4,
-    FT_PIXEL_MODE_LCD,
-    FT_PIXEL_MODE_LCD_V,
-
-    FT_PIXEL_MODE_MAX      /* do not remove */
-
-  } FT_Pixel_Mode;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Enum>                                                                */
-  /*    ft_pixel_mode_xxx                                                  */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A list of deprecated constants.  Use the corresponding             */
-  /*    @FT_Pixel_Mode values instead.                                     */
-  /*                                                                       */
-  /* <Values>                                                              */
-  /*    ft_pixel_mode_none  :: see @FT_PIXEL_MODE_NONE                     */
-  /*    ft_pixel_mode_mono  :: see @FT_PIXEL_MODE_MONO                     */
-  /*    ft_pixel_mode_grays :: see @FT_PIXEL_MODE_GRAY                     */
-  /*    ft_pixel_mode_pal2  :: see @FT_PIXEL_MODE_GRAY2                    */
-  /*    ft_pixel_mode_pal4  :: see @FT_PIXEL_MODE_GRAY4                    */
-  /*                                                                       */
-#define ft_pixel_mode_none   FT_PIXEL_MODE_NONE
-#define ft_pixel_mode_mono   FT_PIXEL_MODE_MONO
-#define ft_pixel_mode_grays  FT_PIXEL_MODE_GRAY
-#define ft_pixel_mode_pal2   FT_PIXEL_MODE_GRAY2
-#define ft_pixel_mode_pal4   FT_PIXEL_MODE_GRAY4
-
- /* */
-
-#if 0
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Enum>                                                                */
-  /*    FT_Palette_Mode                                                    */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    THIS TYPE IS DEPRECATED.  DO NOT USE IT!                           */
-  /*                                                                       */
-  /*    An enumeration type used to describe the format of a bitmap        */
-  /*    palette, used with ft_pixel_mode_pal4 and ft_pixel_mode_pal8.      */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    ft_palette_mode_rgb  :: The palette is an array of 3-bytes RGB     */
-  /*                            records.                                   */
-  /*                                                                       */
-  /*    ft_palette_mode_rgba :: The palette is an array of 4-bytes RGBA    */
-  /*                            records.                                   */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    As ft_pixel_mode_pal2, pal4 and pal8 are currently unused by       */
-  /*    FreeType, these types are not handled by the library itself.       */
-  /*                                                                       */
-  typedef enum  FT_Palette_Mode_
-  {
-    ft_palette_mode_rgb = 0,
-    ft_palette_mode_rgba,
-
-    ft_palettte_mode_max   /* do not remove */
-
-  } FT_Palette_Mode;
-
-  /* */
-
-#endif
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    FT_Bitmap                                                          */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A structure used to describe a bitmap or pixmap to the raster.     */
-  /*    Note that we now manage pixmaps of various depths through the      */
-  /*    `pixel_mode' field.                                                */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    rows         :: The number of bitmap rows.                         */
-  /*                                                                       */
-  /*    width        :: The number of pixels in bitmap row.                */
-  /*                                                                       */
-  /*    pitch        :: The pitch's absolute value is the number of bytes  */
-  /*                    taken by one bitmap row, including padding.        */
-  /*                    However, the pitch is positive when the bitmap has */
-  /*                    a `down' flow, and negative when it has an `up'    */
-  /*                    flow.  In all cases, the pitch is an offset to add */
-  /*                    to a bitmap pointer in order to go down one row.   */
-  /*                                                                       */
-  /*    buffer       :: A typeless pointer to the bitmap buffer.  This     */
-  /*                    value should be aligned on 32-bit boundaries in    */
-  /*                    most cases.                                        */
-  /*                                                                       */
-  /*    num_grays    :: This field is only used with                       */
-  /*                    `FT_PIXEL_MODE_GRAY'; it gives the number of gray  */
-  /*                    levels used in the bitmap.                         */
-  /*                                                                       */
-  /*    pixel_mode   :: The pixel mode, i.e., how pixel bits are stored.   */
-  /*                    See @FT_Pixel_Mode for possible values.            */
-  /*                                                                       */
-  /*    palette_mode :: This field is only used with paletted pixel modes; */
-  /*                    it indicates how the palette is stored.            */
-  /*                                                                       */
-  /*    palette      :: A typeless pointer to the bitmap palette; only     */
-  /*                    used for paletted pixel modes.                     */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*   For now, the only pixel mode supported by FreeType are mono and     */
-  /*   grays.  However, drivers might be added in the future to support    */
-  /*   more `colorful' options.                                            */
-  /*                                                                       */
-  /*   When using pixel modes pal2, pal4 and pal8 with a void `palette'    */
-  /*   field, a gray pixmap with respectively 4, 16, and 256 levels of     */
-  /*   gray is assumed.  This, in order to be compatible with some         */
-  /*   embedded bitmap formats defined in the TrueType specification.      */
-  /*                                                                       */
-  /*   Note that no font was found presenting such embedded bitmaps, so    */
-  /*   this is currently completely unhandled by the library.              */
-  /*                                                                       */
-  typedef struct  FT_Bitmap_
-  {
-    int             rows;
-    int             width;
-    int             pitch;
-    unsigned char*  buffer;
-    short           num_grays;
-    char            pixel_mode;
-    char            palette_mode;
-    void*           palette;
-
-  } FT_Bitmap;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Section>                                                             */
-  /*    outline_processing                                                 */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    FT_Outline                                                         */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    This structure is used to describe an outline to the scan-line     */
-  /*    converter.                                                         */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    n_contours :: The number of contours in the outline.               */
-  /*                                                                       */
-  /*    n_points   :: The number of points in the outline.                 */
-  /*                                                                       */
-  /*    points     :: A pointer to an array of `n_points' FT_Vector        */
-  /*                  elements, giving the outline's point coordinates.    */
-  /*                                                                       */
-  /*    tags       :: A pointer to an array of `n_points' chars, giving    */
-  /*                  each outline point's type.  If bit 0 is unset, the   */
-  /*                  point is `off' the curve, i.e. a Bezier control      */
-  /*                  point, while it is `on' when set.                    */
-  /*                                                                       */
-  /*                  Bit 1 is meaningful for `off' points only.  If set,  */
-  /*                  it indicates a third-order Bezier arc control point; */
-  /*                  and a second-order control point if unset.           */
-  /*                                                                       */
-  /*    contours   :: An array of `n_contours' shorts, giving the end      */
-  /*                  point of each contour within the outline.  For       */
-  /*                  example, the first contour is defined by the points  */
-  /*                  `0' to `contours0', the second one is defined by   */
-  /*                  the points `contours0+1' to `contours1', etc.    */
-  /*                                                                       */
-  /*    flags      :: A set of bit flags used to characterize the outline  */
-  /*                  and give hints to the scan-converter and hinter on   */
-  /*                  how to convert/grid-fit it.  See FT_Outline_Flags.   */
-  /*                                                                       */
-  typedef struct  FT_Outline_
-  {
-    short       n_contours;      /* number of contours in glyph        */
-    short       n_points;        /* number of points in the glyph      */
-
-    FT_Vector*  points;          /* the outline's points               */
-    char*       tags;            /* the points flags                   */
-    short*      contours;        /* the contour end points             */
-
-    int         flags;           /* outline masks                      */
-
-  } FT_Outline;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Enum>                                                                */
-  /*   FT_OUTLINE_FLAGS                                                    */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A list of bit-field constants use for the flags in an outline's    */
-  /*    `flags' field.                                                     */
-  /*                                                                       */
-  /* <Values>                                                              */
-  /*    FT_OUTLINE_NONE           :: Value 0 is reserved.                  */
-  /*                                                                       */
-  /*    FT_OUTLINE_OWNER          :: If set, this flag indicates that the  */
-  /*                                 outline's field arrays (i.e.          */
-  /*                                 `points', `flags' & `contours') are   */
-  /*                                 `owned' by the outline object, and    */
-  /*                                 should thus be freed when it is       */
-  /*                                 destroyed.                            */
-  /*                                                                       */
-  /*   FT_OUTLINE_EVEN_ODD_FILL   :: By default, outlines are filled using */
-  /*                                 the non-zero winding rule.  If set to */
-  /*                                 1, the outline will be filled using   */
-  /*                                 the even-odd fill rule (only works    */
-  /*                                 with the smooth raster).              */
-  /*                                                                       */
-  /*   FT_OUTLINE_REVERSE_FILL    :: By default, outside contours of an    */
-  /*                                 outline are oriented in clock-wise    */
-  /*                                 direction, as defined in the TrueType */
-  /*                                 specification.  This flag is set if   */
-  /*                                 the outline uses the opposite         */
-  /*                                 direction (typically for Type 1       */
-  /*                                 fonts).  This flag is ignored by the  */
-  /*                                 scan-converter.  However, it is very  */
-  /*                                 important for the auto-hinter.        */
-  /*                                                                       */
-  /*   FT_OUTLINE_IGNORE_DROPOUTS :: By default, the scan converter will   */
-  /*                                 try to detect drop-outs in an outline */
-  /*                                 and correct the glyph bitmap to       */
-  /*                                 ensure consistent shape continuity.   */
-  /*                                 If set, this flag hints the scan-line */
-  /*                                 converter to ignore such cases.       */
-  /*                                                                       */
-  /*   FT_OUTLINE_HIGH_PRECISION  :: This flag indicates that the          */
-  /*                                 scan-line converter should try to     */
-  /*                                 convert this outline to bitmaps with  */
-  /*                                 the highest possible quality.  It is  */
-  /*                                 typically set for small character     */
-  /*                                 sizes.  Note that this is only a      */
-  /*                                 hint, that might be completely        */
-  /*                                 ignored by a given scan-converter.    */
-  /*                                                                       */
-  /*   FT_OUTLINE_SINGLE_PASS     :: This flag is set to force a given     */
-  /*                                 scan-converter to only use a single   */
-  /*                                 pass over the outline to render a     */
-  /*                                 bitmap glyph image.  Normally, it is  */
-  /*                                 set for very large character sizes.   */
-  /*                                 It is only a hint, that might be      */
-  /*                                 completely ignored by a given         */
-  /*                                 scan-converter.                       */
-  /*                                                                       */
-#define FT_OUTLINE_NONE             0x0
-#define FT_OUTLINE_OWNER            0x1
-#define FT_OUTLINE_EVEN_ODD_FILL    0x2
-#define FT_OUTLINE_REVERSE_FILL     0x4
-#define FT_OUTLINE_IGNORE_DROPOUTS  0x8
-
-#define FT_OUTLINE_HIGH_PRECISION   0x100
-#define FT_OUTLINE_SINGLE_PASS      0x200
-
-
- /*************************************************************************
-  *
-  * @enum:
-  *   ft_outline_flags
-  *
-  * @description:
-  *   These constants are deprecated.  Please use the corresponding
-  *   @FT_OUTLINE_FLAGS values.
-  *
-  * @values:
-  *   ft_outline_none            :: See @FT_OUTLINE_NONE.
-  *   ft_outline_owner           :: See @FT_OUTLINE_OWNER.
-  *   ft_outline_even_odd_fill   :: See @FT_OUTLINE_EVEN_ODD_FILL.
-  *   ft_outline_reverse_fill    :: See @FT_OUTLINE_REVERSE_FILL.
-  *   ft_outline_ignore_dropouts :: See @FT_OUTLINE_IGNORE_DROPOUTS.
-  *   ft_outline_high_precision  :: See @FT_OUTLINE_HIGH_PRECISION.
-  *   ft_outline_single_pass     :: See @FT_OUTLINE_SINGLE_PASS.
-  */
-#define ft_outline_none             FT_OUTLINE_NONE
-#define ft_outline_owner            FT_OUTLINE_OWNER
-#define ft_outline_even_odd_fill    FT_OUTLINE_EVEN_ODD_FILL
-#define ft_outline_reverse_fill     FT_OUTLINE_REVERSE_FILL
-#define ft_outline_ignore_dropouts  FT_OUTLINE_IGNORE_DROPOUTS
-#define ft_outline_high_precision   FT_OUTLINE_HIGH_PRECISION
-#define ft_outline_single_pass      FT_OUTLINE_SINGLE_PASS
-
-  /* */
-
-#define FT_CURVE_TAG( flag )  ( flag & 3 )
-
-#define FT_CURVE_TAG_ON           1
-#define FT_CURVE_TAG_CONIC        0
-#define FT_CURVE_TAG_CUBIC        2
-
-#define FT_CURVE_TAG_TOUCH_X      8  /* reserved for the TrueType hinter */
-#define FT_CURVE_TAG_TOUCH_Y     16  /* reserved for the TrueType hinter */
-
-#define FT_CURVE_TAG_TOUCH_BOTH  ( FT_CURVE_TAG_TOUCH_X | \
-                                   FT_CURVE_TAG_TOUCH_Y )
-
-#define  FT_Curve_Tag_On       FT_CURVE_TAG_ON
-#define  FT_Curve_Tag_Conic    FT_CURVE_TAG_CONIC
-#define  FT_Curve_Tag_Cubic    FT_CURVE_TAG_CUBIC
-#define  FT_Curve_Tag_Touch_X  FT_CURVE_TAG_TOUCH_X
-#define  FT_Curve_Tag_Touch_Y  FT_CURVE_TAG_TOUCH_Y
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <FuncType>                                                            */
-  /*    FT_Outline_MoveToFunc                                              */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A function pointer type used to describe the signature of a `move  */
-  /*    to' function during outline walking/decomposition.                 */
-  /*                                                                       */
-  /*    A `move to' is emitted to start a new contour in an outline.       */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    to   :: A pointer to the target point of the `move to'.            */
-  /*                                                                       */
-  /*    user :: A typeless pointer which is passed from the caller of the  */
-  /*            decomposition function.                                    */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    Error code.  0 means success.                                      */
-  /*                                                                       */
-  typedef int
-  (*FT_Outline_MoveToFunc)( FT_Vector*  to,
-                            void*       user );
-
-#define FT_Outline_MoveTo_Func  FT_Outline_MoveToFunc
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <FuncType>                                                            */
-  /*    FT_Outline_LineToFunc                                              */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A function pointer type used to describe the signature of a `line  */
-  /*    to' function during outline walking/decomposition.                 */
-  /*                                                                       */
-  /*    A `line to' is emitted to indicate a segment in the outline.       */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    to   :: A pointer to the target point of the `line to'.            */
-  /*                                                                       */
-  /*    user :: A typeless pointer which is passed from the caller of the  */
-  /*            decomposition function.                                    */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    Error code.  0 means success.                                      */
-  /*                                                                       */
-  typedef int
-  (*FT_Outline_LineToFunc)( FT_Vector*  to,
-                            void*       user );
-
-#define  FT_Outline_LineTo_Func  FT_Outline_LineToFunc
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <FuncType>                                                            */
-  /*    FT_Outline_ConicToFunc                                             */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A function pointer type use to describe the signature of a `conic  */
-  /*    to' function during outline walking/decomposition.                 */
-  /*                                                                       */
-  /*    A `conic to' is emitted to indicate a second-order Bezier arc in   */
-  /*    the outline.                                                       */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    control :: An intermediate control point between the last position */
-  /*               and the new target in `to'.                             */
-  /*                                                                       */
-  /*    to      :: A pointer to the target end point of the conic arc.     */
-  /*                                                                       */
-  /*    user    :: A typeless pointer which is passed from the caller of   */
-  /*               the decomposition function.                             */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    Error code.  0 means success.                                      */
-  /*                                                                       */
-  typedef int
-  (*FT_Outline_ConicToFunc)( FT_Vector*  control,
-                             FT_Vector*  to,
-                             void*       user );
-
-#define  FT_Outline_ConicTo_Func  FT_Outline_ConicToFunc
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <FuncType>                                                            */
-  /*    FT_Outline_CubicToFunc                                             */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A function pointer type used to describe the signature of a `cubic */
-  /*    to' function during outline walking/decomposition.                 */
-  /*                                                                       */
-  /*    A `cubic to' is emitted to indicate a third-order Bezier arc.      */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    control1 :: A pointer to the first Bezier control point.           */
-  /*                                                                       */
-  /*    control2 :: A pointer to the second Bezier control point.          */
-  /*                                                                       */
-  /*    to       :: A pointer to the target end point.                     */
-  /*                                                                       */
-  /*    user     :: A typeless pointer which is passed from the caller of  */
-  /*                the decomposition function.                            */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    Error code.  0 means success.                                      */
-  /*                                                                       */
-  typedef int
-  (*FT_Outline_CubicToFunc)( FT_Vector*  control1,
-                             FT_Vector*  control2,
-                             FT_Vector*  to,
-                             void*       user );
-
-#define  FT_Outline_CubicTo_Func  FT_Outline_CubicToFunc
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    FT_Outline_Funcs                                                   */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A structure to hold various function pointers used during outline  */
-  /*    decomposition in order to emit segments, conic, and cubic Beziers, */
-  /*    as well as `move to' and `close to' operations.                    */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    move_to  :: The `move to' emitter.                                 */
-  /*                                                                       */
-  /*    line_to  :: The segment emitter.                                   */
-  /*                                                                       */
-  /*    conic_to :: The second-order Bezier arc emitter.                   */
-  /*                                                                       */
-  /*    cubic_to :: The third-order Bezier arc emitter.                    */
-  /*                                                                       */
-  /*    shift    :: The shift that is applied to coordinates before they   */
-  /*                are sent to the emitter.                               */
-  /*                                                                       */
-  /*    delta    :: The delta that is applied to coordinates before they   */
-  /*                are sent to the emitter, but after the shift.          */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    The point coordinates sent to the emitters are the transformed     */
-  /*    version of the original coordinates (this is important for high    */
-  /*    accuracy during scan-conversion).  The transformation is simple:   */
-  /*                                                                       */
-  /*      x' = (x << shift) - delta                                        */
-  /*      y' = (x << shift) - delta                                        */
-  /*                                                                       */
-  /*    Set the value of `shift' and `delta' to 0 to get the original      */
-  /*    point coordinates.                                                 */
-  /*                                                                       */
-  typedef struct  FT_Outline_Funcs_
-  {
-    FT_Outline_MoveToFunc   move_to;
-    FT_Outline_LineToFunc   line_to;
-    FT_Outline_ConicToFunc  conic_to;
-    FT_Outline_CubicToFunc  cubic_to;
-
-    int                     shift;
-    FT_Pos                  delta;
-
-  } FT_Outline_Funcs;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Section>                                                             */
-  /*    basic_types                                                        */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Macro>                                                               */
-  /*    FT_IMAGE_TAG                                                       */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    This macro converts four letter tags into an unsigned long.        */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    Since many 16bit compilers don't like 32bit enumerations, you      */
-  /*    should redefine this macro in case of problems to something like   */
-  /*    this:                                                              */
-  /*                                                                       */
-  /*      #define FT_IMAGE_TAG( value, _x1, _x2, _x3, _x4 )  (value)       */
-  /*                                                                       */
-  /*    to get a simple enumeration without assigning special numbers.     */
-  /*                                                                       */
-#ifndef FT_IMAGE_TAG
-#define FT_IMAGE_TAG( value, _x1, _x2, _x3, _x4 )  \
-          value = ( ( (unsigned long)_x1 << 24 ) | \
-                    ( (unsigned long)_x2 << 16 ) | \
-                    ( (unsigned long)_x3 << 8  ) | \
-                      (unsigned long)_x4         )
-#endif /* FT_IMAGE_TAG */
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Enum>                                                                */
-  /*    FT_Glyph_Format                                                    */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    An enumeration type used to describe the format of a given glyph   */
-  /*    image.  Note that this version of FreeType only supports two image */
-  /*    formats, even though future font drivers will be able to register  */
-  /*    their own format.                                                  */
-  /*                                                                       */
-  /* <Values>                                                              */
-  /*    FT_GLYPH_FORMAT_NONE ::                                            */
-  /*      The value 0 is reserved and does describe a glyph format.        */
-  /*                                                                       */
-  /*    FT_GLYPH_FORMAT_COMPOSITE ::                                       */
-  /*      The glyph image is a composite of several other images.  This    */
-  /*      format is _only_ used with @FT_LOAD_NO_RECURSE, and is used to   */
-  /*      report compound glyphs (like accented characters).               */
-  /*                                                                       */
-  /*    FT_GLYPH_FORMAT_BITMAP ::                                          */
-  /*      The glyph image is a bitmap, and can be described as an          */
-  /*      @FT_Bitmap.  You generally need to access the `bitmap' field of  */
-  /*      the @FT_GlyphSlotRec structure to read it.                       */
-  /*                                                                       */
-  /*    FT_GLYPH_FORMAT_OUTLINE ::                                         */
-  /*      The glyph image is a vertorial outline made of line segments     */
-  /*      and Bezier arcs; it can be described as an @FT_Outline; you      */
-  /*      generally want to access the `outline' field of the              */
-  /*      @FT_GlyphSlotRec structure to read it.                           */
-  /*                                                                       */
-  /*    FT_GLYPH_FORMAT_PLOTTER ::                                         */
-  /*      The glyph image is a vectorial path with no inside/outside       */
-  /*      contours.  Some Type 1 fonts, like those in the Hershey family,  */
-  /*      contain glyphs in this format.  These are described as           */
-  /*      @FT_Outline, but FreeType isn't currently capable of rendering   */
-  /*      them correctly.                                                  */
-  /*                                                                       */
-  typedef enum  FT_Glyph_Format_
-  {
-    FT_IMAGE_TAG( FT_GLYPH_FORMAT_NONE, 0, 0, 0, 0 ),
-
-    FT_IMAGE_TAG( FT_GLYPH_FORMAT_COMPOSITE, 'c', 'o', 'm', 'p' ),
-    FT_IMAGE_TAG( FT_GLYPH_FORMAT_BITMAP,    'b', 'i', 't', 's' ),
-    FT_IMAGE_TAG( FT_GLYPH_FORMAT_OUTLINE,   'o', 'u', 't', 'l' ),
-    FT_IMAGE_TAG( FT_GLYPH_FORMAT_PLOTTER,   'p', 'l', 'o', 't' )
-
-  } FT_Glyph_Format;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Enum>                                                                */
-  /*    ft_glyph_format_xxx                                                */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A list of decprecated constants.  Use the corresponding            */
-  /*    @FT_Glyph_Format values instead.                                   */
-  /*                                                                       */
-  /* <Values>                                                              */
-  /*    ft_glyph_format_none      :: see @FT_GLYPH_FORMAT_NONE             */
-  /*    ft_glyph_format_composite :: see @FT_GLYPH_FORMAT_COMPOSITE        */
-  /*    ft_glyph_format_bitmap    :: see @FT_GLYPH_FORMAT_BITMAP           */
-  /*    ft_glyph_format_outline   :: see @FT_GLYPH_FORMAT_OUTLINE          */
-  /*    ft_glyph_format_plotter   :: see @FT_GLYPH_FORMAT_PLOTTER          */
-  /*                                                                       */
-#define ft_glyph_format_none       FT_GLYPH_FORMAT_NONE
-#define ft_glyph_format_composite  FT_GLYPH_FORMAT_COMPOSITE
-#define ft_glyph_format_bitmap     FT_GLYPH_FORMAT_BITMAP
-#define ft_glyph_format_outline    FT_GLYPH_FORMAT_OUTLINE
-#define ft_glyph_format_plotter    FT_GLYPH_FORMAT_PLOTTER
-
-
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-  /*****                                                               *****/
-  /*****            R A S T E R   D E F I N I T I O N S                *****/
-  /*****                                                               *****/
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* A raster is a scan converter, in charge of rendering an outline into  */
-  /* a a bitmap.  This section contains the public API for rasters.        */
-  /*                                                                       */
-  /* Note that in FreeType 2, all rasters are now encapsulated within      */
-  /* specific modules called `renderers'.  See `freetype/ftrender.h' for   */
-  /* more details on renderers.                                            */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Section>                                                             */
-  /*    raster                                                             */
-  /*                                                                       */
-  /* <Title>                                                               */
-  /*    Scanline converter                                                 */
-  /*                                                                       */
-  /* <Abstract>                                                            */
-  /*    How vectorial outlines are converted into bitmaps and pixmaps.     */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    This section contains technical definitions.                       */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Type>                                                                */
-  /*    FT_Raster                                                          */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A handle (pointer) to a raster object.  Each object can be used    */
-  /*    independently to convert an outline into a bitmap or pixmap.       */
-  /*                                                                       */
-  typedef struct FT_RasterRec_*  FT_Raster;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    FT_Span                                                            */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A structure used to model a single span of gray (or black) pixels  */
-  /*    when rendering a monochrome or anti-aliased bitmap.                */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    x        :: The span's horizontal start position.                  */
-  /*                                                                       */
-  /*    len      :: The span's length in pixels.                           */
-  /*                                                                       */
-  /*    coverage :: The span color/coverage, ranging from 0 (background)   */
-  /*                to 255 (foreground).  Only used for anti-aliased       */
-  /*                rendering.                                             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    This structure is used by the span drawing callback type named     */
-  /*    FT_SpanFunc which takes the y-coordinate of the span as a          */
-  /*    a parameter.                                                       */
-  /*                                                                       */
-  /*    The coverage value is always between 0 and 255, even if the number */
-  /*    of gray levels have been set through FT_Set_Gray_Levels().         */
-  /*                                                                       */
-  typedef struct  FT_Span_
-  {
-    short           x;
-    unsigned short  len;
-    unsigned char   coverage;
-
-  } FT_Span;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <FuncType>                                                            */
-  /*    FT_SpanFunc                                                        */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A function used as a call-back by the anti-aliased renderer in     */
-  /*    order to let client applications draw themselves the gray pixel    */
-  /*    spans on each scan line.                                           */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    y     :: The scanline's y-coordinate.                              */
-  /*                                                                       */
-  /*    count :: The number of spans to draw on this scanline.             */
-  /*                                                                       */
-  /*    spans :: A table of `count' spans to draw on the scanline.         */
-  /*                                                                       */
-  /*    user  :: User-supplied data that is passed to the callback.        */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    This callback allows client applications to directly render the    */
-  /*    gray spans of the anti-aliased bitmap to any kind of surfaces.     */
-  /*                                                                       */
-  /*    This can be used to write anti-aliased outlines directly to a      */
-  /*    given background bitmap, and even perform translucency.            */
-  /*                                                                       */
-  /*    Note that the `count' field cannot be greater than a fixed value   */
-  /*    defined by the FT_MAX_GRAY_SPANS configuration macro in            */
-  /*    ftoption.h.  By default, this value is set to 32, which means that */
-  /*    if there are more than 32 spans on a given scanline, the callback  */
-  /*    will be called several times with the same `y' parameter in order  */
-  /*    to draw all callbacks.                                             */
-  /*                                                                       */
-  /*    Otherwise, the callback is only called once per scan-line, and     */
-  /*    only for those scanlines that do have `gray' pixels on them.       */
-  /*                                                                       */
-  typedef void
-  (*FT_SpanFunc)( int       y,
-                  int       count,
-                  FT_Span*  spans,
-                  void*     user );
-
-#define FT_Raster_Span_Func   FT_SpanFunc
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <FuncType>                                                            */
-  /*    FT_Raster_BitTest_Func                                             */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    THIS TYPE IS DEPRECATED.  DO NOT USE IT.                           */
-  /*                                                                       */
-  /*    A function used as a call-back by the monochrome scan-converter    */
-  /*    to test whether a given target pixel is already set to the drawing */
-  /*    `color'.  These tests are crucial to implement drop-out control    */
-  /*    per-se the TrueType spec.                                          */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    y     :: The pixel's y-coordinate.                                 */
-  /*                                                                       */
-  /*    x     :: The pixel's x-coordinate.                                 */
-  /*                                                                       */
-  /*    user  :: User-supplied data that is passed to the callback.        */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*   1 if the pixel is `set', 0 otherwise.                               */
-  /*                                                                       */
-  typedef int
-  (*FT_Raster_BitTest_Func)( int    y,
-                             int    x,
-                             void*  user );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <FuncType>                                                            */
-  /*    FT_Raster_BitSet_Func                                              */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    THIS TYPE IS DEPRECATED.  DO NOT USE IT.                           */
-  /*                                                                       */
-  /*    A function used as a call-back by the monochrome scan-converter    */
-  /*    to set an individual target pixel.  This is crucial to implement   */
-  /*    drop-out control according to the TrueType specification.          */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    y     :: The pixel's y-coordinate.                                 */
-  /*                                                                       */
-  /*    x     :: The pixel's x-coordinate.                                 */
-  /*                                                                       */
-  /*    user  :: User-supplied data that is passed to the callback.        */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    1 if the pixel is `set', 0 otherwise.                              */
-  /*                                                                       */
-  typedef void
-  (*FT_Raster_BitSet_Func)( int    y,
-                            int    x,
-                            void*  user );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Enum>                                                                */
-  /*    FT_RASTER_FLAG_XXX                                                 */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A list of bit flag constants as used in the `flags' field of a     */
-  /*    @FT_Raster_Params structure.                                       */
-  /*                                                                       */
-  /* <Values>                                                              */
-  /*    FT_RASTER_FLAG_DEFAULT :: This value is 0.                         */
-  /*                                                                       */
-  /*    FT_RASTER_FLAG_AA      :: This flag is set to indicate that an     */
-  /*                              anti-aliased glyph image should be       */
-  /*                              generated.  Otherwise, it will be        */
-  /*                              monochrome (1-bit).                      */
-  /*                                                                       */
-  /*    FT_RASTER_FLAG_DIRECT  :: This flag is set to indicate direct      */
-  /*                              rendering.  In this mode, client         */
-  /*                              applications must provide their own span */
-  /*                              callback.  This lets them directly       */
-  /*                              draw or compose over an existing bitmap. */
-  /*                              If this bit is not set, the target       */
-  /*                              pixmap's buffer _must_ be zeroed before  */
-  /*                              rendering.                               */
-  /*                                                                       */
-  /*                              Note that for now, direct rendering is   */
-  /*                              only possible with anti-aliased glyphs.  */
-  /*                                                                       */
-  /*    FT_RASTER_FLAG_CLIP    :: This flag is only used in direct         */
-  /*                              rendering mode.  If set, the output will */
-  /*                              be clipped to a box specified in the     */
-  /*                              "clip_box" field of the FT_Raster_Params */
-  /*                              structure.                               */
-  /*                                                                       */
-  /*                              Note that by default, the glyph bitmap   */
-  /*                              is clipped to the target pixmap, except  */
-  /*                              in direct rendering mode where all spans */
-  /*                              are generated if no clipping box is set. */
-  /*                                                                       */
-#define FT_RASTER_FLAG_DEFAULT  0x0
-#define FT_RASTER_FLAG_AA       0x1
-#define FT_RASTER_FLAG_DIRECT   0x2
-#define FT_RASTER_FLAG_CLIP     0x4
-
-  /* deprecated */
-#define ft_raster_flag_default  FT_RASTER_FLAG_DEFAULT
-#define ft_raster_flag_aa       FT_RASTER_FLAG_AA
-#define ft_raster_flag_direct   FT_RASTER_FLAG_DIRECT
-#define ft_raster_flag_clip     FT_RASTER_FLAG_CLIP
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    FT_Raster_Params                                                   */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A structure to hold the arguments used by a raster's render        */
-  /*    function.                                                          */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    target      :: The target bitmap.                                  */
-  /*                                                                       */
-  /*    source      :: A pointer to the source glyph image (e.g. an        */
-  /*                   FT_Outline).                                        */
-  /*                                                                       */
-  /*    flags       :: The rendering flags.                                */
-  /*                                                                       */
-  /*    gray_spans  :: The gray span drawing callback.                     */
-  /*                                                                       */
-  /*    black_spans :: The black span drawing callback.                    */
-  /*                                                                       */
-  /*    bit_test    :: The bit test callback.  UNIMPLEMENTED!              */
-  /*                                                                       */
-  /*    bit_set     :: The bit set callback.  UNIMPLEMENTED!               */
-  /*                                                                       */
-  /*    user        :: User-supplied data that is passed to each drawing   */
-  /*                   callback.                                           */
-  /*                                                                       */
-  /*    clip_box    :: An optional clipping box.  It is only used in       */
-  /*                   direct rendering mode.  Note that coordinates here  */
-  /*                   should be expressed in _integer_ pixels (and not in */
-  /*                   26.6 fixed-point units).                            */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    An anti-aliased glyph bitmap is drawn if the FT_RASTER_FLAG_AA bit */
-  /*    flag is set in the `flags' field, otherwise a monochrome bitmap    */
-  /*    will be generated.                                                 */
-  /*                                                                       */
-  /*    If the FT_RASTER_FLAG_DIRECT bit flag is set in `flags', the       */
-  /*    raster will call the `gray_spans' callback to draw gray pixel      */
-  /*    spans, in the case of an aa glyph bitmap, it will call             */
-  /*    `black_spans', and `bit_test' and `bit_set' in the case of a       */
-  /*    monochrome bitmap.  This allows direct composition over a          */
-  /*    pre-existing bitmap through user-provided callbacks to perform the */
-  /*    span drawing/composition.                                          */
-  /*                                                                       */
-  /*    Note that the `bit_test' and `bit_set' callbacks are required when */
-  /*    rendering a monochrome bitmap, as they are crucial to implement    */
-  /*    correct drop-out control as defined in the TrueType specification. */
-  /*                                                                       */
-  typedef struct  FT_Raster_Params_
-  {
-    FT_Bitmap*              target;
-    void*                   source;
-    int                     flags;
-    FT_SpanFunc             gray_spans;
-    FT_SpanFunc             black_spans;
-    FT_Raster_BitTest_Func  bit_test;     /* doesn't work! */
-    FT_Raster_BitSet_Func   bit_set;      /* doesn't work! */
-    void*                   user;
-    FT_BBox                 clip_box;
-
-  } FT_Raster_Params;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <FuncType>                                                            */
-  /*    FT_Raster_NewFunc                                                  */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A function used to create a new raster object.                     */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    memory :: A handle to the memory allocator.                        */
-  /*                                                                       */
-  /* <Output>                                                              */
-  /*    raster :: A handle to the new raster object.                       */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    Error code.  0 means success.                                      */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    The `memory' parameter is a typeless pointer in order to avoid     */
-  /*    un-wanted dependencies on the rest of the FreeType code.  In       */
-  /*    practice, it is a FT_Memory, i.e., a handle to the standard        */
-  /*    FreeType memory allocator.  However, this field can be completely  */
-  /*    ignored by a given raster implementation.                          */
-  /*                                                                       */
-  typedef int
-  (*FT_Raster_NewFunc)( void*       memory,
-                        FT_Raster*  raster );
-
-#define  FT_Raster_New_Func    FT_Raster_NewFunc
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <FuncType>                                                            */
-  /*    FT_Raster_DoneFunc                                                 */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A function used to destroy a given raster object.                  */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    raster :: A handle to the raster object.                           */
-  /*                                                                       */
-  typedef void
-  (*FT_Raster_DoneFunc)( FT_Raster  raster );
-
-#define  FT_Raster_Done_Func   FT_Raster_DoneFunc
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <FuncType>                                                            */
-  /*    FT_Raster_ResetFunc                                                */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    FreeType provides an area of memory called the `render pool',      */
-  /*    available to all registered rasters.  This pool can be freely used */
-  /*    during a given scan-conversion but is shared by all rasters.  Its  */
-  /*    content is thus transient.                                         */
-  /*                                                                       */
-  /*    This function is called each time the render pool changes, or just */
-  /*    after a new raster object is created.                              */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    raster    :: A handle to the new raster object.                    */
-  /*                                                                       */
-  /*    pool_base :: The address in memory of the render pool.             */
-  /*                                                                       */
-  /*    pool_size :: The size in bytes of the render pool.                 */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    Rasters can ignore the render pool and rely on dynamic memory      */
-  /*    allocation if they want to (a handle to the memory allocator is    */
-  /*    passed to the raster constructor).  However, this is not           */
-  /*    recommended for efficiency purposes.                               */
-  /*                                                                       */
-  typedef void
-  (*FT_Raster_ResetFunc)( FT_Raster       raster,
-                          unsigned char*  pool_base,
-                          unsigned long   pool_size );
-
-#define  FT_Raster_Reset_Func   FT_Raster_ResetFunc
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <FuncType>                                                            */
-  /*    FT_Raster_SetModeFunc                                              */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    This function is a generic facility to change modes or attributes  */
-  /*    in a given raster.  This can be used for debugging purposes, or    */
-  /*    simply to allow implementation-specific `features' in a given      */
-  /*    raster module.                                                     */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    raster :: A handle to the new raster object.                       */
-  /*                                                                       */
-  /*    mode   :: A 4-byte tag used to name the mode or property.          */
-  /*                                                                       */
-  /*    args   :: A pointer to the new mode/property to use.               */
-  /*                                                                       */
-  typedef int
-  (*FT_Raster_SetModeFunc)( FT_Raster      raster,
-                            unsigned long  mode,
-                            void*          args );
-
-#define  FT_Raster_Set_Mode_Func  FT_Raster_SetModeFunc
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <FuncType>                                                            */
-  /*    FT_Raster_RenderFunc                                               */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*   Invokes a given raster to scan-convert a given glyph image into a   */
-  /*   target bitmap.                                                      */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    raster :: A handle to the raster object.                           */
-  /*                                                                       */
-  /*    params :: A pointer to a FT_Raster_Params structure used to store  */
-  /*              the rendering parameters.                                */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    Error code.  0 means success.                                      */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    The exact format of the source image depends on the raster's glyph */
-  /*    format defined in its FT_Raster_Funcs structure.  It can be an     */
-  /*    FT_Outline or anything else in order to support a large array of   */
-  /*    glyph formats.                                                     */
-  /*                                                                       */
-  /*    Note also that the render function can fail and return a           */
-  /*    FT_Err_Unimplemented_Feature error code if the raster used does    */
-  /*    not support direct composition.                                    */
-  /*                                                                       */
-  /*    XXX: For now, the standard raster doesn't support direct           */
-  /*         composition but this should change for the final release (see */
-  /*         the files demos/src/ftgrays.c and demos/src/ftgrays2.c for    */
-  /*         examples of distinct implementations which support direct     */
-  /*         composition).                                                 */
-  /*                                                                       */
-  typedef int
-  (*FT_Raster_RenderFunc)( FT_Raster          raster,
-                           FT_Raster_Params*  params );
-
-#define  FT_Raster_Render_Func    FT_Raster_RenderFunc
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    FT_Raster_Funcs                                                    */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*   A structure used to describe a given raster class to the library.   */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    glyph_format  :: The supported glyph format for this raster.       */
-  /*                                                                       */
-  /*    raster_new    :: The raster constructor.                           */
-  /*                                                                       */
-  /*    raster_reset  :: Used to reset the render pool within the raster.  */
-  /*                                                                       */
-  /*    raster_render :: A function to render a glyph into a given bitmap. */
-  /*                                                                       */
-  /*    raster_done   :: The raster destructor.                            */
-  /*                                                                       */
-  typedef struct  FT_Raster_Funcs_
-  {
-    FT_Glyph_Format         glyph_format;
-    FT_Raster_NewFunc       raster_new;
-    FT_Raster_ResetFunc     raster_reset;
-    FT_Raster_SetModeFunc   raster_set_mode;
-    FT_Raster_RenderFunc    raster_render;
-    FT_Raster_DoneFunc      raster_done;
-
-  } FT_Raster_Funcs;
-
-
-  /* */
-
-
-FT_END_HEADER
-
-#endif /* __FTIMAGE_H__ */
-
-
-/* END */

gpac-2.2.1.tar.gz/extra_lib/include/freetype/freetype/ftincrem.h Deleted

@@ -1,292 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  ftincrem.h                                                             */
-/*                                                                         */
-/*    FreeType incremental loading (specification).                        */
-/*                                                                         */
-/*  Copyright 2002, 2003 by                                                */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef __FTINCREM_H__
-#define __FTINCREM_H__
-
-#include <ft2build.h>
-#include FT_FREETYPE_H
-
-#ifdef FREETYPE_H
-#error "freetype.h of FreeType 1 has been loaded!"
-#error "Please fix the directory search order for header files"
-#error "so that freetype.h of FreeType 2 is found first."
-#endif
-
-
-FT_BEGIN_HEADER
-
-
- /***************************************************************************
-  *
-  * @type:
-  *   FT_Incremental
-  *
-  * @description:
-  *   An opaque type describing a user-provided object used to implement
-  *   "incremental" glyph loading within FreeType.  This is used to support
-  *   embedded fonts in certain environments (e.g. Postscript interpreters),
-  *   where the glyph data isn't in the font file, or must be overridden by
-  *   different values.
-  *
-  * @note:
-  *   It is up to client applications to create and implement @FT_Incremental
-  *   objects, as long as they provide implementations for the methods
-  *   @FT_Incremental_GetGlyphDataFunc, @FT_Incremental_FreeGlyphDataFunc
-  *   and @FT_Incremental_GetGlyphMetricsFunc.
-  *
-  *   See the description of @FT_Incremental_InterfaceRec to understand how
-  *   to use incremental objects with FreeType.
-  */
-  typedef struct FT_IncrementalRec_*  FT_Incremental;
-
-
- /***************************************************************************
-  *
-  * @struct:
-  *   FT_Incremental_Metrics
-  *
-  * @description:
-  *   A small structure used to contain the basic glyph metrics returned
-  *   by the @FT_Incremental_GetGlyphMetricsFunc method.
-  *
-  * @fields:
-  *   bearing_x ::
-  *     Left bearing, in font units.
-  *
-  *   bearing_y ::
-  *     Top bearing, in font units.
-  *
-  *   advance ::
-  *     Glyph advance, in font units.
-  *
-  * @note:
-  *   These correspond to horizontal or vertical metrics depending on the
-  *   value of the 'vertical' argument to the function
-  *   @FT_Incremental_GetGlyphMetricsFunc.
-  */
-  typedef struct  FT_Incremental_MetricsRec_
-  {
-    FT_Long  bearing_x;
-    FT_Long  bearing_y;
-    FT_Long  advance;
-
-  } FT_Incremental_MetricsRec, *FT_Incremental_Metrics;
-
-
- /***************************************************************************
-  *
-  * @type:
-  *   FT_Incremental_GetGlyphDataFunc
-  *
-  * @description:
-  *   A function called by FreeType to access a given glyph's data bytes
-  *   during @FT_Load_Glyph or @FT_Load_Char if incremental loading is
-  *   enabled.
-  *
-  *   Note that the format of the glyph's data bytes depends on the font
-  *   file format.  For TrueType, it must correspond to the raw bytes within
-  *   the 'glyf' table.  For Postscript formats, it must correspond to the
-  *   *unencrypted* charstring bytes, without any 'lenIV' header.  It is
-  *   undefined for any other format.
-  *
-  * @input:
-  *   incremental ::
-  *     Handle to an opaque @FT_Incremental handle provided by the client
-  *     application.
-  *
-  *   glyph_index ::
-  *     Index of relevant glyph.
-  *
-  * @output:
-  *   adata ::
-  *     A structure describing the returned glyph data bytes (which will be
-  *     accessed as a read-only byte block).
-  *
-  * @return:
-  *   FreeType error code.  0 means success.
-  *
-  * @note:
-  *   If this function returns succesfully the method
-  *   @FT_Incremental_FreeGlyphDataFunc will be called later to release
-  *   the data bytes.
-  *
-  *   Nested calls to @FT_Incremental_GetGlyphDataFunc can happen for
-  *   compound glyphs.
-  */
-  typedef FT_Error
-  (*FT_Incremental_GetGlyphDataFunc)( FT_Incremental  incremental,
-                                      FT_UInt         glyph_index,
-                                      FT_Data*        adata );
-
-
- /***************************************************************************
-  *
-  * @type:
-  *   FT_Incremental_FreeGlyphDataFunc
-  *
-  * @description:
-  *   A function used to release the glyph data bytes returned by a
-  *   successful call to @FT_Incremental_GetGlyphDataFunc.
-  *
-  * @input:
-  *   incremental ::
-  *     A handle to an opaque @FT_Incremental handle provided by the client
-  *     application.
-  *
-  *   data ::
-  *     A structure describing the glyph data bytes (which will be accessed
-  *     as a read-only byte block).
-  */
-  typedef void
-  (*FT_Incremental_FreeGlyphDataFunc)( FT_Incremental  incremental,
-                                       FT_Data*        data );
-
-
- /***************************************************************************
-  *
-  * @type:
-  *   FT_Incremental_GetGlyphMetricsFunc
-  *
-  * @description:
-  *   A function used to retrieve the basic metrics of a given glyph index
-  *   before accessing its data.  This is necessary because, in certain
-  *   formats like TrueType, the metrics are stored in a different place from
-  *   the glyph images proper.
-  *
-  * @input:
-  *   incremental ::
-  *     A handle to an opaque @FT_Incremental handle provided by the client
-  *     application.
-  *
-  *   glyph_index ::
-  *     Index of relevant glyph.
-  *
-  *   vertical ::
-  *     If true, return vertical metrics.
-  *
-  *   ametrics ::
-  *     This parameter is used for both input and output.
-  *     The original glyph metrics, if any, in font units.  If metrics are
-  *     not available all the values must be set to zero.
-  *
-  * @output:
-  *   ametrics ::
-  *     The replacement glyph metrics in font units.
-  *
-  */
-  typedef FT_Error
-  (*FT_Incremental_GetGlyphMetricsFunc)
-                      ( FT_Incremental              incremental,
-                        FT_UInt                     glyph_index,
-                        FT_Bool                     vertical,
-                        FT_Incremental_MetricsRec  *ametrics );
-
-
-  /**************************************************************************
-   *
-   * @struct:
-   *   FT_Incremental_FuncsRec
-   * 
-   * @description:
-   *   A table of functions for accessing fonts that load data
-   *   incrementally.  Used in @FT_Incremental_InterfaceRec.
-   * 
-   * @fields:
-   *   get_glyph_data ::
-   *     The function to get glyph data.  Must not be null.
-   *
-   *   free_glyph_data ::
-   *     The function to release glyph data.  Must not be null.
-   *
-   *   get_glyph_metrics ::
-   *     The function to get glyph metrics.  May be null if the font does
-   *     not provide overriding glyph metrics. 
-   */
-  typedef struct  FT_Incremental_FuncsRec_
-  {
-    FT_Incremental_GetGlyphDataFunc     get_glyph_data;
-    FT_Incremental_FreeGlyphDataFunc    free_glyph_data;
-    FT_Incremental_GetGlyphMetricsFunc  get_glyph_metrics;
-
-  } FT_Incremental_FuncsRec;
-
-
- /***************************************************************************
-  *
-  * @struct:
-  *   FT_Incremental_InterfaceRec
-  *
-  * @description:
-  *   A structure to be used with @FT_Open_Face to indicate that the user
-  *   wants to support incremental glyph loading.  You should use it with
-  *   @FT_PARAM_TAG_INCREMENTAL as in the following example:
-  *
-  *     {
-  *       FT_Incremental_InterfaceRec  inc_int;
-  *       FT_Parameter                 parameter;
-  *       FT_Open_Args                 open_args;
-  *
-  *
-  *       // set up incremental descriptor
-  *       inc_int.funcs  = my_funcs;
-  *       inc_int.object = my_object;
-  *
-  *       // set up optional parameter
-  *       parameter.tag  = FT_PARAM_TAG_INCREMENTAL;
-  *       parameter.data = &inc_int;
-  *
-  *       // set up FT_Open_Args structure
-  *       open_args.flags      = FT_OPEN_PATHNAME | FT_OPEN_PARAMS;
-  *       open_args.pathname   = my_font_pathname;
-  *       open_args.num_params = 1;
-  *       open_args.params     = &parameter; // we use one optional argument
-  *
-  *       // open the font
-  *       error = FT_Open_Face( library, &open_args, index, &face );
-  *       ...
-  *     }
-  */
-  typedef struct  FT_Incremental_InterfaceRec_
-  {
-    const FT_Incremental_FuncsRec*  funcs;
-    FT_Incremental                  object;
-  
-  } FT_Incremental_InterfaceRec;
-
-
- /***************************************************************************
-  *
-  * @constant:
-  *   FT_PARAM_TAG_INCREMENTAL
-  *
-  * @description:
-  *   A constant used as the tag of @FT_Parameter structures to indicate
-  *   an incremental loading object to be used by FreeType.
-  *
-  */
-#define FT_PARAM_TAG_INCREMENTAL  FT_MAKE_TAG( 'i', 'n', 'c', 'r' )
-
- /* */  
-
-FT_END_HEADER
-
-#endif /* __FTINCREM_H__ */
-
-
-/* END */

gpac-2.2.1.tar.gz/extra_lib/include/freetype/freetype/ftlist.h Deleted

@@ -1,274 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  ftlist.h                                                               */
-/*                                                                         */
-/*    Generic list support for FreeType (specification).                   */
-/*                                                                         */
-/*  Copyright 1996-2001, 2003 by                                           */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /*  This file implements functions relative to list processing.  Its     */
-  /*  data structures are defined in `freetype.h'.                         */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-#ifndef __FTLIST_H__
-#define __FTLIST_H__
-
-
-#include <ft2build.h>
-#include FT_FREETYPE_H
-
-#ifdef FREETYPE_H
-#error "freetype.h of FreeType 1 has been loaded!"
-#error "Please fix the directory search order for header files"
-#error "so that freetype.h of FreeType 2 is found first."
-#endif
-
-
-FT_BEGIN_HEADER
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Section>                                                             */
-  /*    list_processing                                                    */
-  /*                                                                       */
-  /* <Title>                                                               */
-  /*    List Processing                                                    */
-  /*                                                                       */
-  /* <Abstract>                                                            */
-  /*    Simple management of lists.                                        */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    This section contains various definitions related to list          */
-  /*    processing using doubly-linked nodes.                              */
-  /*                                                                       */
-  /* <Order>                                                               */
-  /*    FT_List                                                            */
-  /*    FT_ListNode                                                        */
-  /*    FT_ListRec                                                         */
-  /*    FT_ListNodeRec                                                     */
-  /*                                                                       */
-  /*    FT_List_Add                                                        */
-  /*    FT_List_Insert                                                     */
-  /*    FT_List_Find                                                       */
-  /*    FT_List_Remove                                                     */
-  /*    FT_List_Up                                                         */
-  /*    FT_List_Iterate                                                    */
-  /*    FT_List_Iterator                                                   */
-  /*    FT_List_Finalize                                                   */
-  /*    FT_List_Destructor                                                 */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_List_Find                                                       */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Finds the list node for a given listed object.                     */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    list :: A pointer to the parent list.                              */
-  /*    data :: The address of the listed object.                          */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    List node.  NULL if it wasn't found.                               */
-  /*                                                                       */
-  FT_EXPORT( FT_ListNode )
-  FT_List_Find( FT_List  list,
-                void*    data );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_List_Add                                                        */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Appends an element to the end of a list.                           */
-  /*                                                                       */
-  /* <InOut>                                                               */
-  /*    list :: A pointer to the parent list.                              */
-  /*    node :: The node to append.                                        */
-  /*                                                                       */
-  FT_EXPORT( void )
-  FT_List_Add( FT_List      list,
-               FT_ListNode  node );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_List_Insert                                                     */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Inserts an element at the head of a list.                          */
-  /*                                                                       */
-  /* <InOut>                                                               */
-  /*    list :: A pointer to parent list.                                  */
-  /*    node :: The node to insert.                                        */
-  /*                                                                       */
-  FT_EXPORT( void )
-  FT_List_Insert( FT_List      list,
-                  FT_ListNode  node );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_List_Remove                                                     */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Removes a node from a list.  This function doesn't check whether   */
-  /*    the node is in the list!                                           */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    node :: The node to remove.                                        */
-  /*                                                                       */
-  /* <InOut>                                                               */
-  /*    list :: A pointer to the parent list.                              */
-  /*                                                                       */
-  FT_EXPORT( void )
-  FT_List_Remove( FT_List      list,
-                  FT_ListNode  node );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_List_Up                                                         */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Moves a node to the head/top of a list.  Used to maintain LRU      */
-  /*    lists.                                                             */
-  /*                                                                       */
-  /* <InOut>                                                               */
-  /*    list :: A pointer to the parent list.                              */
-  /*    node :: The node to move.                                          */
-  /*                                                                       */
-  FT_EXPORT( void )
-  FT_List_Up( FT_List      list,
-              FT_ListNode  node );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <FuncType>                                                            */
-  /*    FT_List_Iterator                                                   */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    An FT_List iterator function which is called during a list parse   */
-  /*    by FT_List_Iterate().                                              */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    node :: The current iteration list node.                           */
-  /*                                                                       */
-  /*    user :: A typeless pointer passed to FT_List_Iterate().            */
-  /*            Can be used to point to the iteration's state.             */
-  /*                                                                       */
-  typedef FT_Error
-  (*FT_List_Iterator)( FT_ListNode  node,
-                       void*        user );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_List_Iterate                                                    */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Parses a list and calls a given iterator function on each element. */
-  /*    Note that parsing is stopped as soon as one of the iterator calls  */
-  /*    returns a non-zero value.                                          */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    list     :: A handle to the list.                                  */
-  /*    iterator :: An interator function, called on each node of the      */
-  /*                list.                                                  */
-  /*    user     :: A user-supplied field which is passed as the second    */
-  /*                argument to the iterator.                              */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    The result (a FreeType error code) of the last iterator call.      */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_List_Iterate( FT_List           list,
-                   FT_List_Iterator  iterator,
-                   void*             user );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <FuncType>                                                            */
-  /*    FT_List_Destructor                                                 */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    An FT_List iterator function which is called during a list         */
-  /*    finalization by FT_List_Finalize() to destroy all elements in a    */
-  /*    given list.                                                        */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    system :: The current system object.                               */
-  /*                                                                       */
-  /*    data   :: The current object to destroy.                           */
-  /*                                                                       */
-  /*    user   :: A typeless pointer passed to FT_List_Iterate().  It can  */
-  /*              be used to point to the iteration's state.               */
-  /*                                                                       */
-  typedef void
-  (*FT_List_Destructor)( FT_Memory  memory,
-                         void*      data,
-                         void*      user );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_List_Finalize                                                   */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Destroys all elements in the list as well as the list itself.      */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    list    :: A handle to the list.                                   */
-  /*                                                                       */
-  /*    destroy :: A list destructor that will be applied to each element  */
-  /*               of the list.                                            */
-  /*                                                                       */
-  /*    memory  :: The current memory object which handles deallocation.   */
-  /*                                                                       */
-  /*    user    :: A user-supplied field which is passed as the last       */
-  /*               argument to the destructor.                             */
-  /*                                                                       */
-  FT_EXPORT( void )
-  FT_List_Finalize( FT_List             list,
-                    FT_List_Destructor  destroy,
-                    FT_Memory           memory,
-                    void*               user );
-
-
-  /* */
-
-
-FT_END_HEADER
-
-#endif /* __FTLIST_H__ */
-
-
-/* END */

gpac-2.2.1.tar.gz/extra_lib/include/freetype/freetype/ftmac.h Deleted

@@ -1,128 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  ftmac.h                                                                */
-/*                                                                         */
-/*    Additional Mac-specific API.                                         */
-/*                                                                         */
-/*  Copyright 1996-2001 by                                                 */
-/*  Just van Rossum, David Turner, Robert Wilhelm, and Werner Lemberg.     */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-/***************************************************************************/
-/*                                                                         */
-/* NOTE: Include this file after <freetype/freetype.h> and after the       */
-/*       Mac-specific <Types.h> header (or any other Mac header that       */
-/*       includes <Types.h>); we use Handle type.                          */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef __FTMAC_H__
-#define __FTMAC_H__
-
-
-#include <ft2build.h>
-
-
-FT_BEGIN_HEADER
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Section>                                                             */
-  /*    mac_specific                                                       */
-  /*                                                                       */
-  /* <Title>                                                               */
-  /*    Mac-Specific Interface                                             */
-  /*                                                                       */
-  /* <Abstract>                                                            */
-  /*    Only available on the Macintosh.                                   */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    The following definitions are only available if FreeType is        */
-  /*    compiled on a Macintosh.                                           */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_New_Face_From_FOND                                              */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Creates a new face object from an FOND resource.                   */
-  /*                                                                       */
-  /* <InOut>                                                               */
-  /*    library    :: A handle to the library resource.                    */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    fond       :: An FOND resource.                                    */
-  /*                                                                       */
-  /*    face_index :: Only supported for the -1 `sanity check' special     */
-  /*                  case.                                                */
-  /*                                                                       */
-  /* <Output>                                                              */
-  /*    aface      :: A handle to a new face object.                       */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0 means success.                             */
-  /*                                                                       */
-  /* <Notes>                                                               */
-  /*    This function can be used to create FT_Face abjects from fonts     */
-  /*    that are installed in the system like so:                          */
-  /*                                                                       */
-  /*    {                                                                  */
-  /*      fond = GetResource( 'FOND', fontName );                          */
-  /*      error = FT_New_Face_From_FOND( library, fond, 0, &face );        */
-  /*    }                                                                  */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_New_Face_From_FOND( FT_Library  library,
-                         Handle      fond,
-                         FT_Long     face_index,
-                         FT_Face    *aface );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_GetFile_From_Mac_Name                                           */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Returns an FSSpec for the disk file containing the named font.     */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    fontName   :: Mac OS name of the font (eg. Times New Roman Bold).  */
-  /*                                                                       */
-  /* <Output>                                                              */
-  /*    pathSpec   :: FSSpec to the file.  For passing to @FT_New_Face.    */
-  /*                                                                       */
-  /*    face_index :: Index of the face.  For passing to @FT_New_Face.     */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0 means success.                             */
-  /*                                                                       */
-  FT_EXPORT_DEF( FT_Error )
-  FT_GetFile_From_Mac_Name( char*     fontName, 
-                            FSSpec*   pathSpec,
-                            FT_Long*  face_index );
-
-  /* */
-
-
-FT_END_HEADER
-
-
-#endif /* __FTMAC_H__ */
-
-
-/* END */

gpac-2.2.1.tar.gz/extra_lib/include/freetype/freetype/ftmm.h Deleted

@@ -1,188 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  ftmm.h                                                                 */
-/*                                                                         */
-/*    FreeType Multiple Master font interface (specification).             */
-/*                                                                         */
-/*  Copyright 1996-2001 by                                                 */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef __FTMM_H__
-#define __FTMM_H__
-
-
-#include <ft2build.h>
-#include FT_TYPE1_TABLES_H
-
-
-FT_BEGIN_HEADER
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Section>                                                             */
-  /*    multiple_masters                                                   */
-  /*                                                                       */
-  /* <Title>                                                               */
-  /*    Multiple Masters                                                   */
-  /*                                                                       */
-  /* <Abstract>                                                            */
-  /*    How to manage Multiple Masters fonts.                              */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    The following types and functions are used to manage Multiple      */
-  /*    Master fonts, i.e. the selection of specific design instances by   */
-  /*    setting design axis coordinates.                                   */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    FT_MM_Axis                                                         */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A simple structure used to model a given axis in design space for  */
-  /*    Multiple Masters fonts.                                            */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    name    :: The axis's name.                                        */
-  /*                                                                       */
-  /*    minimum :: The axis's minimum design coordinate.                   */
-  /*                                                                       */
-  /*    maximum :: The axis's maximum design coordinate.                   */
-  /*                                                                       */
-  typedef struct  FT_MM_Axis_
-  {
-    FT_String*  name;
-    FT_Long     minimum;
-    FT_Long     maximum;
-
-  } FT_MM_Axis;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    FT_Multi_Master                                                    */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A structure used to model the axes and space of a Multiple Masters */
-  /*    font.                                                              */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    num_axis    :: Number of axes.  Cannot exceed 4.                   */
-  /*                                                                       */
-  /*    num_designs :: Number of designs; should ne normally 2^num_axis    */
-  /*                   even though the Type 1 specification strangely      */
-  /*                   allows for intermediate designs to be present. This */
-  /*                   number cannot exceed 16.                            */
-  /*                                                                       */
-  /*    axis        :: A table of axis descriptors.                        */
-  /*                                                                       */
-  typedef struct  FT_Multi_Master_
-  {
-    FT_UInt     num_axis;
-    FT_UInt     num_designs;
-    FT_MM_Axis  axisT1_MAX_MM_AXIS;
-
-  } FT_Multi_Master;
-
-  /* */
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Get_Multi_Master                                                */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Retrieves the Multiple Master descriptor of a given font.          */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    face    :: A handle to the source face.                            */
-  /*                                                                       */
-  /* <Output>                                                              */
-  /*    amaster :: The Multiple Masters descriptor.                        */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0 means success.                             */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_Get_Multi_Master( FT_Face           face,
-                       FT_Multi_Master  *amaster );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Set_MM_Design_Coordinates                                       */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    For Multiple Masters fonts, choose an interpolated font design     */
-  /*    through design coordinates.                                        */
-  /*                                                                       */
-  /* <InOut>                                                               */
-  /*    face       :: A handle to the source face.                         */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    num_coords :: The number of design coordinates (must be equal to   */
-  /*                  the number of axes in the font).                     */
-  /*                                                                       */
-  /*    coords     :: An array of design coordinates.                      */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0 means success.                             */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_Set_MM_Design_Coordinates( FT_Face   face,
-                                FT_UInt   num_coords,
-                                FT_Long*  coords );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Set_MM_Blend_Coordinates                                        */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    For Multiple Masters fonts, choose an interpolated font design     */
-  /*    through normalized blend coordinates.                              */
-  /*                                                                       */
-  /* <InOut>                                                               */
-  /*    face       :: A handle to the source face.                         */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    num_coords :: The number of design coordinates (must be equal to   */
-  /*                  the number of axes in the font).                     */
-  /*                                                                       */
-  /*    coords     :: The design coordinates array (each element must be   */
-  /*                  between 0 and 1.0).                                  */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0 means success.                             */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_Set_MM_Blend_Coordinates( FT_Face    face,
-                               FT_UInt    num_coords,
-                               FT_Fixed*  coords );
-
-
-  /* */
-
-
-FT_END_HEADER
-
-#endif /* __FTMM_H__ */
-
-
-/* END */

gpac-2.2.1.tar.gz/extra_lib/include/freetype/freetype/ftmoderr.h Deleted

@@ -1,153 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  ftmoderr.h                                                             */
-/*                                                                         */
-/*    FreeType module error offsets (specification).                       */
-/*                                                                         */
-/*  Copyright 2001, 2002, 2003 by                                          */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* This file is used to define the FreeType module error offsets.        */
-  /*                                                                       */
-  /* The lower byte gives the error code, the higher byte gives the        */
-  /* module.  The base module has error offset 0.  For example, the error  */
-  /* `FT_Err_Invalid_File_Format' has value 0x003, the error               */
-  /* `TT_Err_Invalid_File_Format' has value 0xF03, the error               */
-  /* `T1_Err_Invalid_File_Format' has value 0x1003, etc.                   */
-  /*                                                                       */
-  /* Undefine the macro FT_CONFIG_OPTION_USE_MODULE_ERRORS in ftoption.h   */
-  /* to make the higher byte always zero (disabling the module error       */
-  /* mechanism).                                                           */
-  /*                                                                       */
-  /* It can also be used to create a module error message table easily     */
-  /* with something like                                                   */
-  /*                                                                       */
-  /*   {                                                                   */
-  /*     #undef __FTMODERR_H__                                             */
-  /*     #define FT_MODERRDEF( e, v, s )  { FT_Mod_Err_ ## e, s },         */
-  /*     #define FT_MODERR_START_LIST     {                                */
-  /*     #define FT_MODERR_END_LIST       { 0, 0 } };                      */
-  /*                                                                       */
-  /*     const struct                                                      */
-  /*     {                                                                 */
-  /*       int          mod_err_offset;                                    */
-  /*       const char*  mod_err_msg                                        */
-  /*     } ft_mod_errors =                                               */
-  /*                                                                       */
-  /*     #include FT_MODULE_ERRORS_H                                       */
-  /*   }                                                                   */
-  /*                                                                       */
-  /* To use such a table, all errors must be ANDed with 0xFF00 to remove   */
-  /* the error code.                                                       */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-#ifndef __FTMODERR_H__
-#define __FTMODERR_H__
-
-
-  /*******************************************************************/
-  /*******************************************************************/
-  /*****                                                         *****/
-  /*****                       SETUP MACROS                      *****/
-  /*****                                                         *****/
-  /*******************************************************************/
-  /*******************************************************************/
-
-
-#undef  FT_NEED_EXTERN_C
-
-#ifndef FT_MODERRDEF
-
-#ifdef FT_CONFIG_OPTION_USE_MODULE_ERRORS
-#define FT_MODERRDEF( e, v, s )  FT_Mod_Err_ ## e = v,
-#else
-#define FT_MODERRDEF( e, v, s )  FT_Mod_Err_ ## e = 0,
-#endif
-
-#define FT_MODERR_START_LIST  enum {
-#define FT_MODERR_END_LIST    FT_Mod_Err_Max };
-
-#ifdef __cplusplus
-#define FT_NEED_EXTERN_C
-  extern "C" {
-#endif
-
-#endif /* !FT_MODERRDEF */
-
-
-  /*******************************************************************/
-  /*******************************************************************/
-  /*****                                                         *****/
-  /*****               LIST MODULE ERROR BASES                   *****/
-  /*****                                                         *****/
-  /*******************************************************************/
-  /*******************************************************************/
-
-
-#ifdef FT_MODERR_START_LIST
-  FT_MODERR_START_LIST
-#endif
-
-
-  FT_MODERRDEF( Base,      0x000, "base module" )
-  FT_MODERRDEF( Autohint,  0x100, "autohinter module" )
-  FT_MODERRDEF( BDF,       0x200, "BDF module" )
-  FT_MODERRDEF( Cache,     0x300, "cache module" )
-  FT_MODERRDEF( CFF,       0x400, "CFF module" )
-  FT_MODERRDEF( CID,       0x500, "CID module" )
-  FT_MODERRDEF( Gzip,      0x600, "Gzip module" )
-  FT_MODERRDEF( PCF,       0x700, "PCF module" )
-  FT_MODERRDEF( PFR,       0x800, "PFR module" )
-  FT_MODERRDEF( PSaux,     0x900, "PS auxiliary module" )
-  FT_MODERRDEF( PShinter,  0xA00, "PS hinter module" )
-  FT_MODERRDEF( PSnames,   0xB00, "PS names module" )
-  FT_MODERRDEF( Raster,    0xC00, "raster module" )
-  FT_MODERRDEF( SFNT,      0xD00, "SFNT module" )
-  FT_MODERRDEF( Smooth,    0xE00, "smooth raster module" )
-  FT_MODERRDEF( TrueType,  0xF00, "TrueType module" )
-  FT_MODERRDEF( Type1,    0x1000, "Type 1 module" )
-  FT_MODERRDEF( Type42,   0x1100, "Type 42 module" )
-  FT_MODERRDEF( Winfonts, 0x1200, "Windows FON/FNT module" )
-
-
-#ifdef FT_MODERR_END_LIST
-  FT_MODERR_END_LIST
-#endif
-
-
-  /*******************************************************************/
-  /*******************************************************************/
-  /*****                                                         *****/
-  /*****                      CLEANUP                            *****/
-  /*****                                                         *****/
-  /*******************************************************************/
-  /*******************************************************************/
-
-
-#ifdef FT_NEED_EXTERN_C
-  }
-#endif
-
-#undef FT_MODERR_START_LIST
-#undef FT_MODERR_END_LIST
-#undef FT_MODERRDEF
-#undef FT_NEED_EXTERN_C
-
-
-#endif /* __FTMODERR_H__ */
-
-
-/* END */

gpac-2.2.1.tar.gz/extra_lib/include/freetype/freetype/ftmodule.h Deleted

@@ -1,314 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  ftmodule.h                                                             */
-/*                                                                         */
-/*    FreeType modules public interface (specification).                   */
-/*                                                                         */
-/*  Copyright 1996-2001, 2002, 2003 by                                     */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef __FTMODULE_H__
-#define __FTMODULE_H__
-
-
-#include <ft2build.h>
-#include FT_FREETYPE_H
-
-
-FT_BEGIN_HEADER
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Section>                                                             */
-  /*    module_management                                                  */
-  /*                                                                       */
-  /* <Title>                                                               */
-  /*    Module Management                                                  */
-  /*                                                                       */
-  /* <Abstract>                                                            */
-  /*    How to add, upgrade, and remove modules from FreeType.             */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    The definitions below are used to manage modules within FreeType.  */
-  /*    Modules can be added, upgraded, and removed at runtime.            */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-  /* module bit flags */
-#define FT_MODULE_FONT_DRIVER         1  /* this module is a font driver  */
-#define FT_MODULE_RENDERER            2  /* this module is a renderer     */
-#define FT_MODULE_HINTER              4  /* this module is a glyph hinter */
-#define FT_MODULE_STYLER              8  /* this module is a styler       */
-
-#define FT_MODULE_DRIVER_SCALABLE     0x100   /* the driver supports      */
-                                              /* scalable fonts           */
-#define FT_MODULE_DRIVER_NO_OUTLINES  0x200   /* the driver does not      */
-                                              /* support vector outlines  */
-#define FT_MODULE_DRIVER_HAS_HINTER   0x400   /* the driver provides its  */
-                                              /* own hinter               */
-
-
-  /* deprecated values */
-#define ft_module_font_driver         FT_MODULE_FONT_DRIVER
-#define ft_module_renderer            FT_MODULE_RENDERER
-#define ft_module_hinter              FT_MODULE_HINTER
-#define ft_module_styler              FT_MODULE_STYLER
-
-#define ft_module_driver_scalable     FT_MODULE_DRIVER_SCALABLE
-#define ft_module_driver_no_outlines  FT_MODULE_DRIVER_NO_OUTLINES
-#define ft_module_driver_has_hinter   FT_MODULE_DRIVER_HAS_HINTER
-
-
-  typedef void
-  (*FT_Module_Interface)( void );
-
-  typedef FT_Error
-  (*FT_Module_Constructor)( FT_Module  module );
-
-  typedef void
-  (*FT_Module_Destructor)( FT_Module  module );
-
-  typedef FT_Module_Interface
-  (*FT_Module_Requester)( FT_Module    module,
-                          const char*  name );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    FT_Module_Class                                                    */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    The module class descriptor.                                       */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    module_flags      :: Bit flags describing the module.              */
-  /*                                                                       */
-  /*    module_size       :: The size of one module object/instance in     */
-  /*                         bytes.                                        */
-  /*                                                                       */
-  /*    module_name       :: The name of the module.                       */
-  /*                                                                       */
-  /*    module_version    :: The version, as a 16.16 fixed number          */
-  /*                         (major.minor).                                */
-  /*                                                                       */
-  /*    module_requires   :: The version of FreeType this module requires  */
-  /*                         (starts at version 2.0, i.e 0x20000)          */
-  /*                                                                       */
-  /*    module_init       :: A function used to initialize (not create) a  */
-  /*                         new module object.                            */
-  /*                                                                       */
-  /*    module_done       :: A function used to finalize (not destroy) a   */
-  /*                         given module object                           */
-  /*                                                                       */
-  /*    get_interface     :: Queries a given module for a specific         */
-  /*                         interface by name.                            */
-  /*                                                                       */
-  typedef struct  FT_Module_Class_
-  {
-    FT_ULong               module_flags;
-    FT_Long                module_size;
-    const FT_String*       module_name;
-    FT_Fixed               module_version;
-    FT_Fixed               module_requires;
-
-    const void*            module_interface;
-
-    FT_Module_Constructor  module_init;
-    FT_Module_Destructor   module_done;
-    FT_Module_Requester    get_interface;
-
-  } FT_Module_Class;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Add_Module                                                      */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Adds a new module to a given library instance.                     */
-  /*                                                                       */
-  /* <InOut>                                                               */
-  /*    library :: A handle to the library object.                         */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    clazz   :: A pointer to class descriptor for the module.           */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0 means success.                             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    An error will be returned if a module already exists by that name, */
-  /*    or if the module requires a version of FreeType that is too great. */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_Add_Module( FT_Library              library,
-                 const FT_Module_Class*  clazz );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Get_Module                                                      */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Finds a module by its name.                                        */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    library     :: A handle to the library object.                     */
-  /*                                                                       */
-  /*    module_name :: The module's name (as an ASCII string).             */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    A module handle.  0 if none was found.                             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    You should better be familiar with FreeType internals to know      */
-  /*    which module to look for :-)                                       */
-  /*                                                                       */
-  FT_EXPORT( FT_Module )
-  FT_Get_Module( FT_Library   library,
-                 const char*  module_name );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Remove_Module                                                   */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Removes a given module from a library instance.                    */
-  /*                                                                       */
-  /* <InOut>                                                               */
-  /*    library :: A handle to a library object.                           */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    module  :: A handle to a module object.                            */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0 means success.                             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    The module object is destroyed by the function in case of success. */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_Remove_Module( FT_Library  library,
-                    FT_Module   module );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_New_Library                                                     */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    This function is used to create a new FreeType library instance    */
-  /*    from a given memory object.  It is thus possible to use libraries  */
-  /*    with distinct memory allocators within the same program.           */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    memory   :: A handle to the original memory object.                */
-  /*                                                                       */
-  /* <Output>                                                              */
-  /*    alibrary :: A pointer to handle of a new library object.           */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0 means success.                             */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_New_Library( FT_Memory    memory,
-                  FT_Library  *alibrary );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Done_Library                                                    */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Discards a given library object.  This closes all drivers and      */
-  /*    discards all resource objects.                                     */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    library :: A handle to the target library.                         */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0 means success.                             */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_Done_Library( FT_Library  library );
-
-
-
-  typedef void
-  (*FT_DebugHook_Func)( void*  arg );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Set_Debug_Hook                                                  */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Sets a debug hook function for debugging the interpreter of a font */
-  /*    format.                                                            */
-  /*                                                                       */
-  /* <InOut>                                                               */
-  /*    library    :: A handle to the library object.                      */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    hook_index :: The index of the debug hook.  You should use the     */
-  /*                  values defined in ftobjs.h, e.g.                     */
-  /*                  FT_DEBUG_HOOK_TRUETYPE.                              */
-  /*                                                                       */
-  /*    debug_hook :: The function used to debug the interpreter.          */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    Currently, four debug hook slots are available, but only two (for  */
-  /*    the TrueType and the Type 1 interpreter) are defined.              */
-  /*                                                                       */
-  FT_EXPORT( void )
-  FT_Set_Debug_Hook( FT_Library         library,
-                     FT_UInt            hook_index,
-                     FT_DebugHook_Func  debug_hook );
-
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Add_Default_Modules                                             */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Adds the set of default drivers to a given library object.         */
-  /*    This is only useful when you create a library object with          */
-  /*    FT_New_Library() (usually to plug a custom memory manager).        */
-  /*                                                                       */
-  /* <InOut>                                                               */
-  /*    library :: A handle to a new library object.                       */
-  /*                                                                       */
-  FT_EXPORT( void )
-  FT_Add_Default_Modules( FT_Library  library );
-
-
-  /* */
-
-
-FT_END_HEADER
-
-#endif /* __FTMODULE_H__ */
-
-
-/* END */

gpac-2.2.1.tar.gz/extra_lib/include/freetype/freetype/ftoutln.h Deleted

@@ -1,472 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  ftoutln.h                                                              */
-/*                                                                         */
-/*    Support for the FT_Outline type used to store glyph shapes of        */
-/*    most scalable font formats (specification).                          */
-/*                                                                         */
-/*  Copyright 1996-2001, 2002, 2003 by                                     */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef __FTOUTLN_H__
-#define __FTOUTLN_H__
-
-
-#include <ft2build.h>
-#include FT_FREETYPE_H
-
-#ifdef FREETYPE_H
-#error "freetype.h of FreeType 1 has been loaded!"
-#error "Please fix the directory search order for header files"
-#error "so that freetype.h of FreeType 2 is found first."
-#endif
-
-
-FT_BEGIN_HEADER
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Section>                                                             */
-  /*    outline_processing                                                 */
-  /*                                                                       */
-  /* <Title>                                                               */
-  /*    Outline Processing                                                 */
-  /*                                                                       */
-  /* <Abstract>                                                            */
-  /*    Functions to create, transform, and render vectorial glyph images. */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    This section contains routines used to create and destroy scalable */
-  /*    glyph images known as `outlines'.  These can also be measured,     */
-  /*    transformed, and converted into bitmaps and pixmaps.               */
-  /*                                                                       */
-  /* <Order>                                                               */
-  /*    FT_Outline                                                         */
-  /*    FT_OUTLINE_FLAGS                                                   */
-  /*    FT_Outline_New                                                     */
-  /*    FT_Outline_Done                                                    */
-  /*    FT_Outline_Copy                                                    */
-  /*    FT_Outline_Translate                                               */
-  /*    FT_Outline_Transform                                               */
-  /*    FT_Outline_Reverse                                                 */
-  /*    FT_Outline_Check                                                   */
-  /*                                                                       */
-  /*    FT_Outline_Get_CBox                                                */
-  /*    FT_Outline_Get_BBox                                                */
-  /*                                                                       */
-  /*    FT_Outline_Get_Bitmap                                              */
-  /*    FT_Outline_Render                                                  */
-  /*                                                                       */
-  /*    FT_Outline_Decompose                                               */
-  /*    FT_Outline_Funcs                                                   */
-  /*    FT_Outline_MoveTo_Func                                             */
-  /*    FT_Outline_LineTo_Func                                             */
-  /*    FT_Outline_ConicTo_Func                                            */
-  /*    FT_Outline_CubicTo_Func                                            */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Outline_Decompose                                               */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Walks over an outline's structure to decompose it into individual  */
-  /*    segments and Bezier arcs.  This function is also able to emit      */
-  /*    `move to' and `close to' operations to indicate the start and end  */
-  /*    of new contours in the outline.                                    */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    outline        :: A pointer to the source target.                  */
-  /*                                                                       */
-  /*    func_interface :: A table of `emitters', i.e,. function pointers   */
-  /*                      called during decomposition to indicate path     */
-  /*                      operations.                                      */
-  /*                                                                       */
-  /* <InOut>                                                               */
-  /*    user           :: A typeless pointer which is passed to each       */
-  /*                      emitter during the decomposition.  It can be     */
-  /*                      used to store the state during the               */
-  /*                      decomposition.                                   */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0 means sucess.                              */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_Outline_Decompose( FT_Outline*              outline,
-                        const FT_Outline_Funcs*  func_interface,
-                        void*                    user );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Outline_New                                                     */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Creates a new outline of a given size.                             */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    library     :: A handle to the library object from where the       */
-  /*                   outline is allocated.  Note however that the new    */
-  /*                   outline will NOT necessarily be FREED, when         */
-  /*                   destroying the library, by FT_Done_FreeType().      */
-  /*                                                                       */
-  /*    numPoints   :: The maximal number of points within the outline.    */
-  /*                                                                       */
-  /*    numContours :: The maximal number of contours within the outline.  */
-  /*                                                                       */
-  /* <Output>                                                              */
-  /*    anoutline   :: A handle to the new outline.  NULL in case of       */
-  /*                   error.                                              */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0 means success.                             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    The reason why this function takes a `library' parameter is simply */
-  /*    to use the library's memory allocator.                             */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_Outline_New( FT_Library   library,
-                  FT_UInt      numPoints,
-                  FT_Int       numContours,
-                  FT_Outline  *anoutline );
-
-
-  FT_EXPORT( FT_Error )
-  FT_Outline_New_Internal( FT_Memory    memory,
-                           FT_UInt      numPoints,
-                           FT_Int       numContours,
-                           FT_Outline  *anoutline );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Outline_Done                                                    */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Destroys an outline created with FT_Outline_New().                 */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    library :: A handle of the library object used to allocate the     */
-  /*               outline.                                                */
-  /*                                                                       */
-  /*    outline :: A pointer to the outline object to be discarded.        */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0 means success.                             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    If the outline's `owner' field is not set, only the outline        */
-  /*    descriptor will be released.                                       */
-  /*                                                                       */
-  /*    The reason why this function takes an `library' parameter is       */
-  /*    simply to use FT_Free().                                           */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_Outline_Done( FT_Library   library,
-                   FT_Outline*  outline );
-
-
-  FT_EXPORT( FT_Error )
-  FT_Outline_Done_Internal( FT_Memory    memory,
-                            FT_Outline*  outline );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Outline_Check                                                   */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Check the contents of an outline descriptor.                       */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    outline :: A handle to a source outline.                           */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0 means success.                             */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_Outline_Check( FT_Outline*  outline );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Outline_Get_CBox                                                */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Returns an outline's `control box'.  The control box encloses all  */
-  /*    the outline's points, including Bezier control points.  Though it  */
-  /*    coincides with the exact bounding box for most glyphs, it can be   */
-  /*    slightly larger in some situations (like when rotating an outline  */
-  /*    which contains Bezier outside arcs).                               */
-  /*                                                                       */
-  /*    Computing the control box is very fast, while getting the bounding */
-  /*    box can take much more time as it needs to walk over all segments  */
-  /*    and arcs in the outline.  To get the latter, you can use the       */
-  /*    `ftbbox' component which is dedicated to this single task.         */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    outline :: A pointer to the source outline descriptor.             */
-  /*                                                                       */
-  /* <Output>                                                              */
-  /*    acbox   :: The outline's control box.                              */
-  /*                                                                       */
-  FT_EXPORT( void )
-  FT_Outline_Get_CBox( FT_Outline*  outline,
-                       FT_BBox     *acbox );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Outline_Translate                                               */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Applies a simple translation to the points of an outline.          */
-  /*                                                                       */
-  /* <InOut>                                                               */
-  /*    outline :: A pointer to the target outline descriptor.             */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    xOffset :: The horizontal offset.                                  */
-  /*                                                                       */
-  /*    yOffset :: The vertical offset.                                    */
-  /*                                                                       */
-  FT_EXPORT( void )
-  FT_Outline_Translate( FT_Outline*  outline,
-                        FT_Pos       xOffset,
-                        FT_Pos       yOffset );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Outline_Copy                                                    */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Copies an outline into another one.  Both objects must have the    */
-  /*    same sizes (number of points & number of contours) when this       */
-  /*    function is called.                                                */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    source :: A handle to the source outline.                          */
-  /*                                                                       */
-  /* <Output>                                                              */
-  /*    target :: A handle to the target outline.                          */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0 means success.                             */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_Outline_Copy( FT_Outline*  source,
-                   FT_Outline  *target );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Outline_Transform                                               */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Applies a simple 2x2 matrix to all of an outline's points.  Useful */
-  /*    for applying rotations, slanting, flipping, etc.                   */
-  /*                                                                       */
-  /* <InOut>                                                               */
-  /*    outline :: A pointer to the target outline descriptor.             */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    matrix  :: A pointer to the transformation matrix.                 */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    You can use FT_Outline_Translate() if you need to translate the    */
-  /*    outline's points.                                                  */
-  /*                                                                       */
-  FT_EXPORT( void )
-  FT_Outline_Transform( FT_Outline*  outline,
-                        FT_Matrix*   matrix );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Outline_Reverse                                                 */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Reverses the drawing direction of an outline.  This is used to     */
-  /*    ensure consistent fill conventions for mirrored glyphs.            */
-  /*                                                                       */
-  /* <InOut>                                                               */
-  /*    outline :: A pointer to the target outline descriptor.             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    This functions toggles the bit flag `FT_OUTLINE_REVERSE_FILL' in   */
-  /*    the outline's `flags' field.                                       */
-  /*                                                                       */
-  /*    It shouldn't be used by a normal client application, unless it     */
-  /*    knows what it is doing.                                            */
-  /*                                                                       */
-  FT_EXPORT( void )
-  FT_Outline_Reverse( FT_Outline*  outline );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Outline_Get_Bitmap                                              */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Renders an outline within a bitmap.  The outline's image is simply */
-  /*    OR-ed to the target bitmap.                                        */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    library :: A handle to a FreeType library object.                  */
-  /*                                                                       */
-  /*    outline :: A pointer to the source outline descriptor.             */
-  /*                                                                       */
-  /* <Output>                                                              */
-  /*    abitmap :: A pointer to the target bitmap descriptor.              */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0 means success.                             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    This function does NOT CREATE the bitmap, it only renders an       */
-  /*    outline image within the one you pass to it!                       */
-  /*                                                                       */
-  /*    It will use the raster correponding to the default glyph format.   */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_Outline_Get_Bitmap( FT_Library   library,
-                         FT_Outline*  outline,
-                         FT_Bitmap   *abitmap );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Outline_Render                                                  */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Renders an outline within a bitmap using the current scan-convert. */
-  /*    This functions uses an FT_Raster_Params structure as an argument,  */
-  /*    allowing advanced features like direct composition, translucency,  */
-  /*    etc.                                                               */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    library :: A handle to a FreeType library object.                  */
-  /*                                                                       */
-  /*    outline :: A pointer to the source outline descriptor.             */
-  /*                                                                       */
-  /* <InOut>                                                               */
-  /*    params  :: A pointer to a FT_Raster_Params structure used to       */
-  /*               describe the rendering operation.                       */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0 means success.                             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    You should know what you are doing and how FT_Raster_Params works  */
-  /*    to use this function.                                              */
-  /*                                                                       */
-  /*    The field `params.source' will be set to `outline' before the scan */
-  /*    converter is called, which means that the value you give to it is  */
-  /*    actually ignored.                                                  */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_Outline_Render( FT_Library         library,
-                     FT_Outline*        outline,
-                     FT_Raster_Params*  params );
-
-
- /**************************************************************************
-  *
-  * @enum:
-  *   FT_Orientation
-  *  
-  * @description:
-  *   A list of values used to describe an outline's contour orientation.
-  *
-  *   The TrueType and Postscript specifications use different conventions
-  *   to determine whether outline contours should be filled or unfilled.
-  *   
-  * @values:
-  *   FT_ORIENTATION_TRUETYPE ::
-  *     According to the TrueType specification, clockwise contours must
-  *     be filled, and counter-clockwise ones must be unfilled.
-  *
-  *   FT_ORIENTATION_POSTSCRIPT ::
-  *     According to the Postscript specification, counter-clockwise contours
-  *     must be filled, and clockwise ones must be unfilled.
-  *
-  *   FT_ORIENTATION_FILL_RIGHT ::
-  *     This is identical to @FT_ORIENTATION_TRUETYPE, but is used to
-  *     remember that in TrueType, everything that is to the right of
-  *     the drawing direction of a contour must be filled.
-  *
-  *   FT_ORIENTATION_FILL_LEFT ::
-  *     This is identical to @FT_ORIENTATION_POSTSCRIPT, but is used to
-  *     remember that in Postscript, everything that is to the left of
-  *     the drawing direction of a contour must be filled.
-  */
-  typedef enum
-  {
-    FT_ORIENTATION_TRUETYPE   = 0,
-    FT_ORIENTATION_POSTSCRIPT = 1,
-    FT_ORIENTATION_FILL_RIGHT = FT_ORIENTATION_TRUETYPE,
-    FT_ORIENTATION_FILL_LEFT  = FT_ORIENTATION_POSTSCRIPT
-  
-  } FT_Orientation;
-
-
- /**************************************************************************
-  *
-  * @function:
-  *   FT_Outline_Get_Orientation
-  *  
-  * @description:
-  *   This function analyzes a glyph outline and tries to compute its
-  *   fill orientation (see @FT_Orientation).  This is done by computing
-  *   the direction of each global horizontal and/or vertical extrema
-  *   within the outline.
-  *
-  *   Note that this will return @FT_ORIENTATION_TRUETYPE for empty
-  *   outlines.
-  *
-  * @input:
-  *   outline ::
-  *     A handle to the source outline.
-  *
-  * @return:
-  *   The orientation.
-  *
-  */
-  FT_EXPORT( FT_Orientation )
-  FT_Outline_Get_Orientation( FT_Outline*  outline );
-
-
-  /* */
-
-
-FT_END_HEADER
-
-#endif /* __FTOUTLN_H__ */
-
-
-/* END */

gpac-2.2.1.tar.gz/extra_lib/include/freetype/freetype/ftpfr.h Deleted

@@ -1,172 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  ftpfr.h                                                                */
-/*                                                                         */
-/*    FreeType API for accessing PFR-specific data (specification only).   */
-/*                                                                         */
-/*  Copyright 2002, 2003 by                                                */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef __FTPFR_H__
-#define __FTPFR_H__
-
-#include <ft2build.h>
-#include FT_FREETYPE_H
-
-#ifdef FREETYPE_H
-#error "freetype.h of FreeType 1 has been loaded!"
-#error "Please fix the directory search order for header files"
-#error "so that freetype.h of FreeType 2 is found first."
-#endif
-
-
-FT_BEGIN_HEADER
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Section>                                                             */
-  /*    pfr_fonts                                                          */
-  /*                                                                       */
-  /* <Title>                                                               */
-  /*    PFR Fonts                                                          */
-  /*                                                                       */
-  /* <Abstract>                                                            */
-  /*    PFR/TrueDoc specific APIs                                          */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    This section contains the declaration of PFR-specific functions.   */
-  /*                                                                       */
-  /*************************************************************************/
-
-
- /**********************************************************************
-  *
-  * @function:
-  *    FT_Get_PFR_Metrics
-  *
-  * @description:
-  *    Return the outline and metrics resolutions of a given PFR face.
-  *
-  * @input:
-  *    face :: Handle to the input face.  It can be a non-PFR face.
-  *
-  * @output:
-  *    aoutline_resolution ::
-  *      Outline resolution.  This is equivalent to `face->units_per_EM'.
-  *      Optional (parameter can be NULL).
-  *
-  *    ametrics_resolution ::
-  *      Metrics resolution.  This is equivalent to `outline_resolution'
-  *      for non-PFR fonts.  Optional (parameter can be NULL).
-  *
-  *    ametrics_x_scale ::
-  *      A 16.16 fixed-point number used to scale distance expressed
-  *      in metrics units to device sub-pixels.  This is equivalent to
-  *      `face->size->x_scale', but for metrics only.  Optional (parameter
-  *      can be NULL)
-  *
-  *    ametrics_y_scale ::
-  *      Same as `ametrics_x_scale' but for the vertical direction.
-  *      optional (parameter can be NULL)
-  *
-  * @return:
-  *    FreeType error code.  0 means success.
-  *
-  * @note:
-  *   If the input face is not a PFR, this function will return an error.
-  *   However, in all cases, it will return valid values.
-  */
-  FT_EXPORT( FT_Error )
-  FT_Get_PFR_Metrics( FT_Face    face,
-                      FT_UInt   *aoutline_resolution,
-                      FT_UInt   *ametrics_resolution,
-                      FT_Fixed  *ametrics_x_scale,
-                      FT_Fixed  *ametrics_y_scale );
-
-
- /**********************************************************************
-  *
-  * @function:
-  *    FT_Get_PFR_Kerning
-  *
-  * @description:
-  *    Return the kerning pair corresponding to two glyphs in a PFR face.
-  *    The distance is expressed in metrics units, unlike the result of
-  *    @FT_Get_Kerning.
-  *
-  * @input:
-  *    face  :: A handle to the input face.
-  *
-  *    left  :: Index of the left glyph.
-  *
-  *    right :: Index of the right glyph.
-  *
-  * @output:
-  *    avector :: A kerning vector.
-  *
-  * @return:
-  *    FreeType error code.  0 means success.
-  *
-  * @note:
-  *    This function always return distances in original PFR metrics
-  *    units.  This is unlike @FT_Get_Kerning with the @FT_KERNING_UNSCALED
-  *    mode, which always returns distances converted to outline units.
-  *
-  *    You can use the value of the `x_scale' and `y_scale' parameters
-  *    returned by @FT_Get_PFR_Metrics to scale these to device sub-pixels.
-  */
-  FT_EXPORT( FT_Error )
-  FT_Get_PFR_Kerning( FT_Face     face,
-                      FT_UInt     left,
-                      FT_UInt     right,
-                      FT_Vector  *avector );
-
-
- /**********************************************************************
-  *
-  * @function:
-  *    FT_Get_PFR_Advance
-  *
-  * @description:
-  *    Return a given glyph advance, expressed in original metrics units,
-  *    from a PFR font.
-  *
-  * @input:
-  *    face   :: A handle to the input face.
-  *
-  *    gindex :: The glyph index.
-  *
-  * @output:
-  *    aadvance :: The glyph advance in metrics units.
-  *
-  * @return:
-  *    FreeType error code.  0 means success.
-  *
-  * @note:
-  *    You can use the `x_scale' or `y_scale' results of @FT_Get_PFR_Metrics
-  *    to convert the advance to device sub-pixels (i.e. 1/64th of pixels).
-  */
-  FT_EXPORT( FT_Error )
-  FT_Get_PFR_Advance( FT_Face   face,
-                      FT_UInt   gindex,
-                      FT_Pos   *aadvance );
-
- /* */
-
-
-FT_END_HEADER
-
-#endif /* __FTBDF_H__ */
-
-
-/* END */

gpac-2.2.1.tar.gz/extra_lib/include/freetype/freetype/ftrender.h Deleted

@@ -1,229 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  ftrender.h                                                             */
-/*                                                                         */
-/*    FreeType renderer modules public interface (specification).          */
-/*                                                                         */
-/*  Copyright 1996-2001 by                                                 */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef __FTRENDER_H__
-#define __FTRENDER_H__
-
-
-#include <ft2build.h>
-#include FT_MODULE_H
-#include FT_GLYPH_H
-
-
-FT_BEGIN_HEADER
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Section>                                                             */
-  /*    module_management                                                  */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-  /* create a new glyph object */
-  typedef FT_Error
-  (*FT_Glyph_InitFunc)( FT_Glyph      glyph,
-                        FT_GlyphSlot  slot );
-
-  /* destroys a given glyph object */
-  typedef void
-  (*FT_Glyph_DoneFunc)( FT_Glyph  glyph );
-
-  typedef void
-  (*FT_Glyph_TransformFunc)( FT_Glyph    glyph,
-                             FT_Matrix*  matrix,
-                             FT_Vector*  delta );
-
-  typedef void
-  (*FT_Glyph_GetBBoxFunc)( FT_Glyph  glyph,
-                           FT_BBox*  abbox );
-
-  typedef FT_Error
-  (*FT_Glyph_CopyFunc)( FT_Glyph   source,
-                        FT_Glyph   target );
-
-  typedef FT_Error
-  (*FT_Glyph_PrepareFunc)( FT_Glyph      glyph,
-                           FT_GlyphSlot  slot );
-
-/* deprecated */
-#define FT_Glyph_Init_Func       FT_Glyph_InitFunc
-#define FT_Glyph_Done_Func       FT_Glyph_DoneFunc
-#define FT_Glyph_Transform_Func  FT_Glyph_TransformFunc
-#define FT_Glyph_BBox_Func       FT_Glyph_GetBBoxFunc
-#define FT_Glyph_Copy_Func       FT_Glyph_CopyFunc
-#define FT_Glyph_Prepare_Func    FT_Glyph_PrepareFunc
-
-
-  struct  FT_Glyph_Class_
-  {
-    FT_Long                 glyph_size;
-    FT_Glyph_Format         glyph_format;
-    FT_Glyph_InitFunc       glyph_init;
-    FT_Glyph_DoneFunc       glyph_done;
-    FT_Glyph_CopyFunc       glyph_copy;
-    FT_Glyph_TransformFunc  glyph_transform;
-    FT_Glyph_GetBBoxFunc    glyph_bbox;
-    FT_Glyph_PrepareFunc    glyph_prepare;
-  };
-
-
-  typedef FT_Error
-  (*FT_Renderer_RenderFunc)( FT_Renderer   renderer,
-                             FT_GlyphSlot  slot,
-                             FT_UInt       mode,
-                             FT_Vector*    origin );
-
-  typedef FT_Error
-  (*FT_Renderer_TransformFunc)( FT_Renderer   renderer,
-                                FT_GlyphSlot  slot,
-                                FT_Matrix*    matrix,
-                                FT_Vector*    delta );
-
-
-  typedef void
-  (*FT_Renderer_GetCBoxFunc)( FT_Renderer   renderer,
-                              FT_GlyphSlot  slot,
-                              FT_BBox*      cbox );
-
-
-  typedef FT_Error
-  (*FT_Renderer_SetModeFunc)( FT_Renderer  renderer,
-                              FT_ULong     mode_tag,
-                              FT_Pointer   mode_ptr );
-
-/* deprecated identifiers */
-#define FTRenderer_render  FT_Renderer_RenderFunc
-#define FTRenderer_transform  FT_Renderer_TransformFunc
-#define FTRenderer_getCBox  FT_Renderer_GetCBoxFunc
-#define FTRenderer_setMode  FT_Renderer_SetModeFunc
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    FT_Renderer_Class                                                  */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    The renderer module class descriptor.                              */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    root         :: The root FT_Module_Class fields.                   */
-  /*                                                                       */
-  /*    glyph_format :: The glyph image format this renderer handles.      */
-  /*                                                                       */
-  /*    render_glyph :: A method used to render the image that is in a     */
-  /*                    given glyph slot into a bitmap.                    */
-  /*                                                                       */
-  /*    set_mode     :: A method used to pass additional parameters.       */
-  /*                                                                       */
-  /*    raster_class :: For `FT_GLYPH_FORMAT_OUTLINE' renderers only, this */
-  /*                    is a pointer to its raster's class.                */
-  /*                                                                       */
-  /*    raster       :: For `FT_GLYPH_FORMAT_OUTLINE' renderers only. this */
-  /*                    is a pointer to the corresponding raster object,   */
-  /*                    if any.                                            */
-  /*                                                                       */
-  typedef struct  FT_Renderer_Class_
-  {
-    FT_Module_Class       root;
-
-    FT_Glyph_Format       glyph_format;
-
-    FT_Renderer_RenderFunc     render_glyph;
-    FT_Renderer_TransformFunc  transform_glyph;
-    FT_Renderer_GetCBoxFunc    get_glyph_cbox;
-    FT_Renderer_SetModeFunc    set_mode;
-
-    FT_Raster_Funcs*           raster_class;
-
-  } FT_Renderer_Class;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Get_Renderer                                                    */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Retrieves the current renderer for a given glyph format.           */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    library :: A handle to the library object.                         */
-  /*                                                                       */
-  /*    format  :: The glyph format.                                       */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    A renderer handle.  0 if none found.                               */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    An error will be returned if a module already exists by that name, */
-  /*    or if the module requires a version of FreeType that is too great. */
-  /*                                                                       */
-  /*    To add a new renderer, simply use FT_Add_Module().  To retrieve a  */
-  /*    renderer by its name, use FT_Get_Module().                         */
-  /*                                                                       */
-  FT_EXPORT( FT_Renderer )
-  FT_Get_Renderer( FT_Library       library,
-                   FT_Glyph_Format  format );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Set_Renderer                                                    */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Sets the current renderer to use, and set additional mode.         */
-  /*                                                                       */
-  /* <InOut>                                                               */
-  /*    library    :: A handle to the library object.                      */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    renderer   :: A handle to the renderer object.                     */
-  /*                                                                       */
-  /*    num_params :: The number of additional parameters.                 */
-  /*                                                                       */
-  /*    parameters :: Additional parameters.                               */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0 means success.                             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    In case of success, the renderer will be used to convert glyph     */
-  /*    images in the renderer's known format into bitmaps.                */
-  /*                                                                       */
-  /*    This doesn't change the current renderer for other formats.        */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_Set_Renderer( FT_Library     library,
-                   FT_Renderer    renderer,
-                   FT_UInt        num_params,
-                   FT_Parameter*  parameters );
-
-
-  /* */
-
-
-FT_END_HEADER
-
-#endif /* __FTRENDER_H__ */
-
-
-/* END */

gpac-2.2.1.tar.gz/extra_lib/include/freetype/freetype/ftsizes.h Deleted

@@ -1,159 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  ftsizes.h                                                              */
-/*                                                                         */
-/*    FreeType size objects management (specification).                    */
-/*                                                                         */
-/*  Copyright 1996-2001, 2003 by                                           */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* Typical application would normally not need to use these functions.   */
-  /* However, they have been placed in a public API for the rare cases     */
-  /* where they are needed.                                                */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-#ifndef __FTSIZES_H__
-#define __FTSIZES_H__
-
-
-#include <ft2build.h>
-#include FT_FREETYPE_H
-
-#ifdef FREETYPE_H
-#error "freetype.h of FreeType 1 has been loaded!"
-#error "Please fix the directory search order for header files"
-#error "so that freetype.h of FreeType 2 is found first."
-#endif
-
-
-FT_BEGIN_HEADER
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Section>                                                             */
-  /*    sizes_management                                                   */
-  /*                                                                       */
-  /* <Title>                                                               */
-  /*    Size management                                                    */
-  /*                                                                       */
-  /* <Abstract>                                                            */
-  /*    Managing multiple sizes per face                                   */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    When creating a new face object (e.g. with @FT_New_Face), an       */
-  /*    @FT_Size object is automatically created and used to store all     */
-  /*    pixel-size dependent information, available in the "face->size"    */
-  /*    field.                                                             */
-  /*                                                                       */
-  /*    It is however possible to create more sizes for a given face,      */
-  /*    mostly in order to manage several character pixel sizes of the     */
-  /*    same font family and style.  See @FT_New_Size and @FT_Done_Size.   */
-  /*                                                                       */
-  /*    Note that @FT_Set_Pixel_Sizes and @FT_Set_Char_Size only           */
-  /*    modify the contents of the current "active" size; you thus need    */
-  /*    to use @FT_Activate_Size to change it.                             */
-  /*                                                                       */
-  /*    99% of applications won't need the functions provided here,        */
-  /*    especially if they use the caching sub-system, so be cautious      */
-  /*    when using these.                                                  */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_New_Size                                                        */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Creates a new size object from a given face object.                */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    face :: A handle to a parent face object.                          */
-  /*                                                                       */
-  /* <Output>                                                              */
-  /*    asize :: A handle to a new size object.                            */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0 means success.                             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    You need to call @FT_Activate_Size in order to select the new size */
-  /*    for upcoming calls to @FT_Set_Pixel_Sizes, @FT_Set_Char_Size,      */
-  /*    @FT_Load_Glyph, @FT_Load_Char, etc.                                */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_New_Size( FT_Face   face,
-               FT_Size*  size );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Done_Size                                                       */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Discards a given size object.  Note that @FT_Done_Face             */
-  /*    automatically discards all size objects allocated with             */
-  /*    @FT_New_Size.                                                      */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    size :: A handle to a target size object.                          */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0 means success.                             */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_Done_Size( FT_Size  size );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Activate_Size                                                   */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Even though it is possible to create several size objects for a    */
-  /*    given face (see @FT_New_Size for details), functions like          */
-  /*    @FT_Load_Glyph or @FT_Load_Char only use the last-created one to   */
-  /*    determine the "current character pixel size".                      */
-  /*                                                                       */
-  /*    This function can be used to "activate" a previously created size  */
-  /*    object.                                                            */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    size :: A handle to a target size object.                          */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0 means success.                             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    If "face" is the size's parent face object, this function changes  */
-  /*    the value of "face->size" to the input size handle.                */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_Activate_Size( FT_Size  size );
-
-  /* */
-
-
-FT_END_HEADER
-
-#endif /* __FTSIZES_H__ */
-
-
-/* END */

gpac-2.2.1.tar.gz/extra_lib/include/freetype/freetype/ftsnames.h Deleted

@@ -1,167 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  ftsnames.h                                                             */
-/*                                                                         */
-/*    Simple interface to access SFNT name tables (which are used          */
-/*    to hold font names, copyright info, notices, etc.) (specification).  */
-/*                                                                         */
-/*    This is _not_ used to retrieve glyph names!                          */
-/*                                                                         */
-/*  Copyright 1996-2001, 2002, 2003 by                                     */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef __FT_SFNT_NAMES_H__
-#define __FT_SFNT_NAMES_H__
-
-
-#include <ft2build.h>
-#include FT_FREETYPE_H
-
-#ifdef FREETYPE_H
-#error "freetype.h of FreeType 1 has been loaded!"
-#error "Please fix the directory search order for header files"
-#error "so that freetype.h of FreeType 2 is found first."
-#endif
-
-
-FT_BEGIN_HEADER
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Section>                                                             */
-  /*    sfnt_names                                                         */
-  /*                                                                       */
-  /* <Title>                                                               */
-  /*    SFNT Names                                                         */
-  /*                                                                       */
-  /* <Abstract>                                                            */
-  /*    Access the names embedded in TrueType and OpenType files.          */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    The TrueType and OpenType specification allow the inclusion of     */
-  /*    a special `names table' in font files.  This table contains        */
-  /*    textual (and internationalized) information regarding the font,    */
-  /*    like family name, copyright, version, etc.                         */
-  /*                                                                       */
-  /*    The definitions below are used to access them if available.        */
-  /*                                                                       */
-  /*    Note that this has nothing to do with glyph names!                 */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    FT_SfntName                                                        */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A structure used to model an SFNT `name' table entry.              */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    platform_id :: The platform ID for `string'.                       */
-  /*                                                                       */
-  /*    encoding_id :: The encoding ID for `string'.                       */
-  /*                                                                       */
-  /*    language_id :: The language ID for `string'.                       */
-  /*                                                                       */
-  /*    name_id     :: An identifier for `string'.                         */
-  /*                                                                       */
-  /*    string      :: The `name' string.  Note that its format differs    */
-  /*                   depending on the (platform,encoding) pair. It can   */
-  /*                   be a Pascal String, a UTF-16 one, etc..             */
-  /*                                                                       */
-  /*                   Generally speaking, the string is not               */
-  /*                   zero-terminated. Please refer to the TrueType       */
-  /*                   specification for details..                         */
-  /*                                                                       */
-  /*    string_len  :: The length of `string' in bytes.                    */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    Possible values for `platform_id', `encoding_id', `language_id',   */
-  /*    and `name_id' are given in the file `ttnameid.h'.  For details     */
-  /*    please refer to the TrueType or OpenType specification.            */
-  /*                                                                       */
-  typedef struct  FT_SfntName_
-  {
-    FT_UShort  platform_id;
-    FT_UShort  encoding_id;
-    FT_UShort  language_id;
-    FT_UShort  name_id;
-
-    FT_Byte*   string;      /* this string is *not* null-terminated! */
-    FT_UInt    string_len;  /* in bytes */
-
-  } FT_SfntName;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Get_Sfnt_Name_Count                                             */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Retrieves the number of name strings in the SFNT `name' table.     */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    face :: A handle to the source face.                               */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    The number of strings in the `name' table.                         */
-  /*                                                                       */
-  FT_EXPORT( FT_UInt )
-  FT_Get_Sfnt_Name_Count( FT_Face  face );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Get_Sfnt_Name                                                   */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Retrieves a string of the SFNT `name' table for a given index.     */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    face  :: A handle to the source face.                              */
-  /*                                                                       */
-  /*    idx   :: The index of the `name' string.                           */
-  /*                                                                       */
-  /* <Output>                                                              */
-  /*    aname :: The indexed FT_SfntName structure.                        */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0 means success.                             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    The `string' array returned in the `aname' structure is not        */
-  /*    null-terminated.                                                   */
-  /*                                                                       */
-  /*    Use FT_Get_Sfnt_Name_Count() to get the total number of available  */
-  /*    `name' table entries, then do a loop until you get the right       */
-  /*    platform, encoding, and name ID.                                   */
-  /*                                                                       */
-  FT_EXPORT( FT_Error )
-  FT_Get_Sfnt_Name( FT_Face       face,
-                    FT_UInt       idx,
-                    FT_SfntName  *aname );
-
-
-  /* */
-
-
-FT_END_HEADER
-
-#endif /* __FT_SFNT_NAMES_H__ */
-
-
-/* END */

gpac-2.2.1.tar.gz/extra_lib/include/freetype/freetype/ftstroker.h Deleted

@@ -1,139 +0,0 @@
-#ifndef __FT_STROKER_H__
-#define __FT_STROKER_H__
-
-#include <ft2build.h>
-#include FT_OUTLINE_H
-
-FT_BEGIN_HEADER
-
-/*@*************************************************************
- *
- * @type: FT_Stroker
- *
- * @description:
- *    opaque handler to a path stroker object
- */
-  typedef struct FT_StrokerRec_*    FT_Stroker;
-
-
-/*@*************************************************************
- *
- * @enum: FT_Stroker_LineJoin
- *
- * @description:
- *    these values determine how two joining lines are rendered
- *    in a stroker.
- *
- * @values:
- *    FT_STROKER_LINEJOIN_ROUND ::
- *      used to render rounded line joins. circular arcs are used
- *      to join two lines smoothly
- *
- *    FT_STROKER_LINEJOIN_BEVEL ::
- *      used to render beveled line joins; i.e. the two joining lines
- *      are extended until they intersect
- *
- *    FT_STROKER_LINEJOIN_MITER ::
- *      same as beveled rendering, except that an additional line
- *      break is added if the angle between the two joining lines
- *      is too closed (this is useful to avoid unpleasant spikes
- *      in beveled rendering).
- */
-  typedef enum
-  {
-    FT_STROKER_LINEJOIN_ROUND = 0,
-    FT_STROKER_LINEJOIN_BEVEL,
-    FT_STROKER_LINEJOIN_MITER
-
-  } FT_Stroker_LineJoin;
-
-
-/*@*************************************************************
- *
- * @enum: FT_Stroker_LineCap
- *
- * @description:
- *    these values determine how the end of opened sub-paths are
- *    rendered in a stroke
- *
- * @values:
- *    FT_STROKER_LINECAP_BUTT ::
- *      the end of lines is rendered as a full stop on the last
- *      point itself
- *
- *    FT_STROKER_LINECAP_ROUND ::
- *      the end of lines is rendered as a half-circle around the
- *      last point
- *
- *    FT_STROKER_LINECAP_SQUARE ::
- *      the end of lines is rendered as a square around the
- *      last point
- */
-  typedef enum
-  {
-    FT_STROKER_LINECAP_BUTT = 0,
-    FT_STROKER_LINECAP_ROUND,
-    FT_STROKER_LINECAP_SQUARE
-
-  } FT_Stroker_LineCap;
-
- /* */
-
-  FT_EXPORT( FT_Error )
-  FT_Stroker_New( FT_Memory    memory,
-                  FT_Stroker  *astroker );
-
-  FT_EXPORT( void )
-  FT_Stroker_Set( FT_Stroker           stroker,
-                  FT_Fixed             radius,
-                  FT_Stroker_LineCap   line_cap,
-                  FT_Stroker_LineJoin  line_join,
-                  FT_Fixed             miter_limit );
-
-
-  FT_EXPORT( FT_Error )
-  FT_Stroker_ParseOutline( FT_Stroker   stroker,
-                           FT_Outline*  outline,
-                           FT_Bool      opened );
-
-  FT_EXPORT( FT_Error )
-  FT_Stroker_BeginSubPath( FT_Stroker  stroker,
-                           FT_Vector*  to,
-                           FT_Bool     open );
-
-  FT_EXPORT( FT_Error )
-  FT_Stroker_EndSubPath( FT_Stroker  stroker );
-
-
-  FT_EXPORT( FT_Error )
-  FT_Stroker_LineTo( FT_Stroker  stroker,
-                     FT_Vector*  to );
-
-  FT_EXPORT( FT_Error )
-  FT_Stroker_ConicTo( FT_Stroker  stroker,
-                      FT_Vector*  control,
-                      FT_Vector*  to );
-
-  FT_EXPORT( FT_Error )
-  FT_Stroker_CubicTo( FT_Stroker  stroker,
-                      FT_Vector*  control1,
-                      FT_Vector*  control2,
-                      FT_Vector*  to );
-
-
-  FT_EXPORT( FT_Error )
-  FT_Stroker_GetCounts( FT_Stroker  stroker,
-                        FT_UInt    *anum_points,
-                        FT_UInt    *anum_contours );
-
-  FT_EXPORT( void )
-  FT_Stroker_Export( FT_Stroker   stroker,
-                     FT_Outline*  outline );
-
-  FT_EXPORT( void )
-  FT_Stroker_Done( FT_Stroker  stroker );
-
-
-FT_END_HEADER
-
-#endif /* __FT_STROKER_H__ */

gpac-2.2.1.tar.gz/extra_lib/include/freetype/freetype/ftsynth.h Deleted

@@ -1,71 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  ftsynth.h                                                              */
-/*                                                                         */
-/*    FreeType synthesizing code for emboldening and slanting              */
-/*    (specification).                                                     */
-/*                                                                         */
-/*  Copyright 2000-2001, 2003 by                                           */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-  /*********                                                       *********/
-  /*********        WARNING, THIS IS ALPHA CODE, THIS API          *********/
-  /*********    IS DUE TO CHANGE UNTIL STRICTLY NOTIFIED BY THE    *********/
-  /*********            FREETYPE DEVELOPMENT TEAM                  *********/
-  /*********                                                       *********/
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-
-
-#ifndef __FTSYNTH_H__
-#define __FTSYNTH_H__
-
-
-#include <ft2build.h>
-#include FT_FREETYPE_H
-
-#ifdef FREETYPE_H
-#error "freetype.h of FreeType 1 has been loaded!"
-#error "Please fix the directory search order for header files"
-#error "so that freetype.h of FreeType 2 is found first."
-#endif
-
-
-FT_BEGIN_HEADER
-
-
-  /* This code is completely experimental -- use with care! */
-  /* It will probably be completely rewritten in the future */
-  /* or even integrated into the library.                   */
-  FT_EXPORT( void )
-  FT_GlyphSlot_Embolden( FT_GlyphSlot  slot );
-
-
-  FT_EXPORT( void )
-  FT_GlyphSlot_Oblique( FT_GlyphSlot  slot );
-
- /* */
-
-FT_END_HEADER
-
-#endif /* __FTSYNTH_H__ */
-
-
-/* END */

gpac-2.2.1.tar.gz/extra_lib/include/freetype/freetype/ftsysio.h Deleted

@@ -1,195 +0,0 @@
-#ifndef __FT_SYSTEM_IO_H__
-#define __FT_SYSTEM_IO_H__
-
- /************************************************************************/
- /************************************************************************/
- /*****                                                              *****/
- /*****    NOTE: THE CONTENT OF THIS FILE IS NOT CURRENTLY USED      *****/
- /*****          IN NORMAL BUILDS.  CONSIDER IT EXPERIMENTAL.        *****/
- /*****                                                              *****/
- /************************************************************************/
- /************************************************************************/
-
-
- /********************************************************************
-  *
-  *  designing custom streams is a bit different now
-  *
-  *
-  *
-  *
-  *
-  *
-  *
-  *
-  *
-  *
-  *
-  *
-  *
-  *
-  *
-  *
-  *
-  *
-  *
-  *
-  *
-  *
-  *
-  *
-  */
-
-#include <ft2build.h>
-#include FT_INTERNAL_OBJECT_H
-
-FT_BEGIN_HEADER
-
- /*@*******************************************************************
-  *
-  * @type: FT_Stream
-  *
-  * @description:
-  *   handle to an input stream object. These are also @FT_Object handles
-  */
-  typedef struct FT_StreamRec_*    FT_Stream;
-
-
- /*@*******************************************************************
-  *
-  * @type: FT_Stream_Class
-  *
-  * @description:
-  *   opaque handle to a @FT_Stream_ClassRec class structure describing
-  *   the methods of input streams
-  */
-  typedef const struct FT_Stream_ClassRec_*   FT_Stream_Class;
-
-
- /*@*******************************************************************
-  *
-  * @functype: FT_Stream_ReadFunc
-  *
-  * @description:
-  *   a method used to read bytes from an input stream into memory
-  *
-  * @input:
-  *   stream  :: target stream handle
-  *   buffer  :: target buffer address
-  *   size    :: number of bytes to read
-  *
-  * @return:
-  *   number of bytes effectively read. Must be <= 'size'.
-  */
-  typedef FT_ULong  (*FT_Stream_ReadFunc)( FT_Stream   stream,
-                                           FT_Byte*    buffer,
-                                           FT_ULong    size );
-
-
- /*@*******************************************************************
-  *
-  * @functype: FT_Stream_SeekFunc
-  *
-  * @description:
-  *   a method used to seek to a new position within a stream
-  *
-  * @input:
-  *   stream  :: target stream handle
-  *   pos     :: new read position, from start of stream
-  *
-  * @return:
-  *   error code. 0 means success
-  */
-  typedef FT_Error  (*FT_Stream_SeekFunc)( FT_Stream   stream,
-                                           FT_ULong    pos );
-
-
- /*@*******************************************************************
-  *
-  * @struct: FT_Stream_ClassRec
-  *
-  * @description:
-  *   a structure used to describe an input stream class
-  *
-  * @input:
-  *   clazz       :: root @FT_ClassRec fields
-  *   stream_read :: stream byte read method
-  *   stream_seek :: stream seek method
-  */
-  typedef struct FT_Stream_ClassRec_
-  {
-    FT_ClassRec          clazz;
-    FT_Stream_ReadFunc   stream_read;
-    FT_Stream_SeekFunc   stream_seek;
-
-  } FT_Stream_ClassRec;
-
- /* */
-
-#define  FT_STREAM_CLASS(x)        ((FT_Stream_Class)(x))
-#define  FT_STREAM_CLASS__READ(x)  FT_STREAM_CLASS(x)->stream_read
-#define  FT_STREAM_CLASS__SEEK(x)  FT_STREAM_CLASS(x)->stream_seek;
-
- /*@*******************************************************************
-  *
-  * @struct: FT_StreamRec
-  *
-  * @description:
-  *   the input stream object structure. See @FT_Stream_ClassRec for
-  *   its class descriptor
-  *
-  * @fields:
-  *   object      :: root @FT_ObjectRec fields
-  *   size        :: size of stream in bytes (0 if unknown)
-  *   pos         :: current position within stream
-  *   base        :: for memory-based streams, the address of the stream's
-  *                  first data byte in memory. NULL otherwise
-  *
-  *   cursor      :: the current cursor position within an input stream
-  *                  frame. Only valid within a FT_FRAME_ENTER .. FT_FRAME_EXIT
-  *                  block; NULL otherwise
-  *
-  *   limit       :: the current frame limit within a FT_FRAME_ENTER ..
-  *                  FT_FRAME_EXIT block. NULL otherwise
-  */
-  typedef struct FT_StreamRec_
-  {
-    FT_ObjectRec        object;
-    FT_ULong            size;
-    FT_ULong            pos;
-    const FT_Byte*      base;
-    const FT_Byte*      cursor;
-    const FT_Byte*      limit;
-
-  } FT_StreamRec;
-
- /* some useful macros */
-#define  FT_STREAM(x)    ((FT_Stream)(x))
-#define  FT_STREAM_P(x)  ((FT_Stream*)(x))
-
-#define  FT_STREAM__READ(x)  FT_STREAM_CLASS__READ(FT_OBJECT__CLASS(x))
-#define  FT_STREAM__SEEK(x)  FT_STREAM_CLASS__SEEK(FT_OBJECT__CLASS(x))
-
-#define  FT_STREAM_IS_BASED(x)  ( FT_STREAM(x)->base != NULL )
-
- /* */
-
- /* create new memory-based stream */
-  FT_BASE( FT_Error )   ft_stream_new_memory( const FT_Byte*  stream_base,
-                                              FT_ULong        stream_size,
-                                              FT_Memory       memory,
-                                              FT_Stream      *astream );
-
-  FT_BASE( FT_Error )   ft_stream_new_iso( const char*  pathanme,
-                                           FT_Memory    memory,
-                                           FT_Stream   *astream );
-
-
- /* handle to default stream class implementation for a given build */
- /* this is used by "FT_New_Face"                                   */
- /*                                                                 */
-  FT_APIVAR( FT_Type )   ft_stream_default_type;
-
-FT_END_HEADER
-
-#endif /* __FT_SYSTEM_STREAM_H__ */

gpac-2.2.1.tar.gz/extra_lib/include/freetype/freetype/ftsysmem.h Deleted

@@ -1,202 +0,0 @@
-#ifndef __FT_SYSTEM_MEMORY_H__
-#define __FT_SYSTEM_MEMORY_H__
-
-#include <ft2build.h>
-
-FT_BEGIN_HEADER
-
- /************************************************************************/
- /************************************************************************/
- /*****                                                              *****/
- /*****    NOTE: THE CONTENT OF THIS FILE IS NOT CURRENTLY USED      *****/
- /*****          IN NORMAL BUILDS.  CONSIDER IT EXPERIMENTAL.        *****/
- /*****                                                              *****/
- /************************************************************************/
- /************************************************************************/
-
-
- /*@**********************************************************************
-  *
-  * @type: FT_Memory
-  *
-  * @description:
-  *   opaque handle to a memory manager handle. Note that since FreeType
-  *   2.2, the memory manager structure FT_MemoryRec is hidden to client
-  *   applications.
-  *
-  *   however, you can still define custom allocators easily using the
-  *   @ft_memory_new API
-  */
-  typedef struct FT_MemoryRec_*   FT_Memory;
-
-
- /*@**********************************************************************
-  *
-  * @functype: FT_Memory_AllocFunc
-  *
-  * @description:
-  *   a function used to allocate a block of memory.
-  *
-  * @input:
-  *   size     :: size of blocks in bytes. Always > 0 !!
-  *   mem_data :: memory-manager specific optional argument
-  *               (see @ft_memory_new)
-  *
-  * @return:
-  *   address of new block. NULL in case of memory exhaustion
-  */
-  typedef FT_Pointer  (*FT_Memory_AllocFunc)( FT_ULong   size,
-                                              FT_Pointer mem_data );
-
-
- /*@**********************************************************************
-  *
-  * @functype: FT_Memory_FreeFunc
-  *
-  * @description:
-  *   a function used to release a block of memory created through
-  *   @FT_Memory_AllocFunc or @FT_Memory_ReallocFunc
-  *
-  * @input:
-  *   block    :: address of target memory block. cannot be NULL !!
-  *   mem_data :: memory-manager specific optional argument
-  *               (see @ft_memory_new)
-  */
-  typedef void        (*FT_Memory_FreeFunc) ( FT_Pointer  block,
-                                              FT_Pointer  mem_data );
-
-
- /*@**********************************************************************
-  *
-  * @functype: FT_Memory_ReallocFunc
-  *
-  * @description:
-  *   a function used to reallocate a memory block.
-  *
-  * @input:
-  *   block    :: address of target memory block. cannot be NULL !!
-  *   new_size :: new requested size in bytes
-  *   cur_size :: current block size in bytes
-  *   mem_data :: memory-manager specific optional argument
-  *               (see @ft_memory_new)
-  */
-  typedef FT_Pointer  (*FT_Memory_ReallocFunc)( FT_Pointer   block,
-                                                FT_ULong     new_size,
-                                                FT_ULong     cur_size,
-                                                FT_Pointer   mem_data );
-
-
- /*@**********************************************************************
-  *
-  * @functype: FT_Memory_CreateFunc
-  *
-  * @description:
-  *   a function used to create a @FT_Memory object to model a
-  *   memory manager
-  *
-  * @input:
-  *   size      :: size of memory manager structure in bytes
-  *   init_data :: optional initialisation argument
-  *
-  * @output:
-  *   amem_data :: memory-manager specific argument to block management
-  *                routines.
-  *
-  * @return:
-  *   handle to new memory manager object. NULL in case of failure
-  */
-  typedef FT_Pointer  (*FT_Memory_CreateFunc)( FT_UInt     size,
-                                               FT_Pointer  init_data,
-                                               FT_Pointer *amem_data );
-
-
- /*@**********************************************************************
-  *
-  * @functype: FT_Memory_DestroyFunc
-  *
-  * @description:
-  *   a function used to destroy a given @FT_Memory manager
-  *
-  * @input:
-  *   memory   :: target memory manager handle
-  *   mem_data :: option manager-specific argument
-  */
-  typedef void        (*FT_Memory_DestroyFunc)( FT_Memory  memory,
-                                                FT_Pointer mem_data );
-
-
- /*@**********************************************************************
-  *
-  * @struct: FT_Memory_FuncsRec
-  *
-  * @description:
-  *   a function used to hold all methods of a given memory manager
-  *   implementation.
-  *
-  * @fields:
-  *   mem_alloc   :: block allocation routine
-  *   mem_free    :: block release routine
-  *   mem_realloc :: block re-allocation routine
-  *   mem_create  :: manager creation routine
-  *   mem_destroy :: manager destruction routine
-  */
-  typedef struct FT_Memory_FuncsRec_
-  {
-    FT_Memory_AllocFunc     mem_alloc;
-    FT_Memory_FreeFunc      mem_free;
-    FT_Memory_ReallocFunc   mem_realloc;
-    FT_Memory_CreateFunc    mem_create;
-    FT_Memory_DestroyFunc   mem_destroy;
-
-  } FT_Memory_FuncsRec, *FT_Memory_Funcs;
-
-
- /*@**********************************************************************
-  *
-  * @type: FT_Memory_Funcs
-  *
-  * @description:
-  *   a pointer to a constant @FT_Memory_FuncsRec structure used to
-  *   describe a given memory manager implementation.
-  */
-  typedef const FT_Memory_FuncsRec*  FT_Memory_Funcs;
-
-
- /*@**********************************************************************
-  *
-  * @function: ft_memory_new
-  *
-  * @description:
-  *   create a new memory manager, given a set of memory methods
-  *
-  * @input:
-  *   mem_funcs     :: handle to memory manager implementation descriptor
-  *   mem_init_data :: optional initialisation argument, passed to
-  *                    @FT_Memory_CreateFunc
-  *
-  * @return:
-  *   new memory manager handle. NULL in case of failure
-  */
-  FT_BASE( FT_Memory )
-  ft_memory_new( FT_Memory_Funcs  mem_funcs,
-                 FT_Pointer       mem_init_data );
-
-
- /*@**********************************************************************
-  *
-  * @function: ft_memory_destroy
-  *
-  * @description:
-  *   destroy a given memory manager
-  *
-  * @input:
-  *   memory :: handle to target memory manager
-  */
-  FT_BASE( void )
-  ft_memory_destroy( FT_Memory  memory );
-
-/* */
-
-FT_END_HEADER
-
-#endif /* __FT_SYSTEM_MEMORY_H__ */

gpac-2.2.1.tar.gz/extra_lib/include/freetype/freetype/ftsystem.h Deleted

@@ -1,309 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  ftsystem.h                                                             */
-/*                                                                         */
-/*    FreeType low-level system interface definition (specification).      */
-/*                                                                         */
-/*  Copyright 1996-2001, 2002 by                                           */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef __FTSYSTEM_H__
-#define __FTSYSTEM_H__
-
-
-#include <ft2build.h>
-
-
-FT_BEGIN_HEADER
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Section>                                                             */
-  /*    system_interface                                                   */
-  /*                                                                       */
-  /* <Title>                                                               */
-  /*    System Interface                                                   */
-  /*                                                                       */
-  /* <Abstract>                                                            */
-  /*    How FreeType manages memory and i/o.                               */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    This section contains various definitions related to memory        */
-  /*    management and i/o access.  You need to understand this            */
-  /*    information if you want to use a custom memory manager or you own  */
-  /*    input i/o streams.                                                 */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /*                  M E M O R Y   M A N A G E M E N T                    */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* @type:                                                                */
-  /*    FT_Memory                                                          */
-  /*                                                                       */
-  /* @description:                                                         */
-  /*    A handle to a given memory manager object, defined with a          */
-  /*    @FT_MemoryRec structure.                                           */
-  /*                                                                       */
-  typedef struct FT_MemoryRec_*  FT_Memory;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* @functype:                                                            */
-  /*    FT_Alloc_Func                                                      */
-  /*                                                                       */
-  /* @description:                                                         */
-  /*    A function used to allocate `size' bytes from `memory'.            */
-  /*                                                                       */
-  /* @input:                                                               */
-  /*    memory :: A handle to the source memory manager.                   */
-  /*                                                                       */
-  /*    size   :: The size in bytes to allocate.                           */
-  /*                                                                       */
-  /* @return:                                                              */
-  /*    Address of new memory block.  0 in case of failure.                */
-  /*                                                                       */
-  typedef void*
-  (*FT_Alloc_Func)( FT_Memory  memory,
-                    long       size );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* @functype:                                                            */
-  /*    FT_Free_Func                                                       */
-  /*                                                                       */
-  /* @description:                                                         */
-  /*    A function used to release a given block of memory.                */
-  /*                                                                       */
-  /* @input:                                                               */
-  /*    memory :: A handle to the source memory manager.                   */
-  /*                                                                       */
-  /*    block  :: The address of the target memory block.                  */
-  /*                                                                       */
-  typedef void
-  (*FT_Free_Func)( FT_Memory  memory,
-                   void*      block );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* @functype:                                                            */
-  /*    FT_Realloc_Func                                                    */
-  /*                                                                       */
-  /* @description:                                                         */
-  /*    a function used to re-allocate a given block of memory.            */
-  /*                                                                       */
-  /* @input:                                                               */
-  /*    memory   :: A handle to the source memory manager.                 */
-  /*                                                                       */
-  /*    cur_size :: The block's current size in bytes.                     */
-  /*                                                                       */
-  /*    new_size :: The block's requested new size.                        */
-  /*                                                                       */
-  /*    block    :: The block's current address.                           */
-  /*                                                                       */
-  /* @return:                                                              */
-  /*    New block address.  0 in case of memory shortage.                  */
-  /*                                                                       */
-  /* @note:                                                                */
-  /*   In case of error, the old block must still be available.            */
-  /*                                                                       */
-  typedef void*
-  (*FT_Realloc_Func)( FT_Memory  memory,
-                      long       cur_size,
-                      long       new_size,
-                      void*      block );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* @struct:                                                              */
-  /*    FT_MemoryRec                                                       */
-  /*                                                                       */
-  /* @description:                                                         */
-  /*    A structure used to describe a given memory manager to FreeType 2. */
-  /*                                                                       */
-  /* @fields:                                                              */
-  /*    user    :: A generic typeless pointer for user data.               */
-  /*                                                                       */
-  /*    alloc   :: A pointer type to an allocation function.               */
-  /*                                                                       */
-  /*    free    :: A pointer type to an memory freeing function.           */
-  /*                                                                       */
-  /*    realloc :: A pointer type to a reallocation function.              */
-  /*                                                                       */
-  struct  FT_MemoryRec_
-  {
-    void*            user;
-    FT_Alloc_Func    alloc;
-    FT_Free_Func     free;
-    FT_Realloc_Func  realloc;
-  };
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /*                       I / O   M A N A G E M E N T                     */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* @type:                                                                */
-  /*    FT_Stream                                                          */
-  /*                                                                       */
-  /* @description:                                                         */
-  /*    A handle to an input stream.                                       */
-  /*                                                                       */
-  typedef struct FT_StreamRec_*  FT_Stream;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* @struct:                                                              */
-  /*    FT_StreamDesc                                                      */
-  /*                                                                       */
-  /* @description:                                                         */
-  /*    A union type used to store either a long or a pointer.  This is    */
-  /*    used to store a file descriptor or a FILE* in an input stream.     */
-  /*                                                                       */
-  typedef union  FT_StreamDesc_
-  {
-    long   value;
-    void*  pointer;
-
-  } FT_StreamDesc;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* @functype:                                                            */
-  /*    FT_Stream_IoFunc                                                   */
-  /*                                                                       */
-  /* @description:                                                         */
-  /*    A function used to seek and read data from a given input stream.   */
-  /*                                                                       */
-  /* @input:                                                               */
-  /*    stream :: A handle to the source stream.                           */
-  /*                                                                       */
-  /*    offset :: The offset of read in stream (always from start).        */
-  /*                                                                       */
-  /*    buffer :: The address of the read buffer.                          */
-  /*                                                                       */
-  /*    count  :: The number of bytes to read from the stream.             */
-  /*                                                                       */
-  /* @return:                                                              */
-  /*    The number of bytes effectively read by the stream.                */
-  /*                                                                       */
-  /* @note:                                                                */
-  /*    This function might be called to perform a seek or skip operation  */
-  /*    with a `count' of 0.                                               */
-  /*                                                                       */
-  typedef unsigned long
-  (*FT_Stream_IoFunc)( FT_Stream       stream,
-                       unsigned long   offset,
-                       unsigned char*  buffer,
-                       unsigned long   count );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* @functype:                                                            */
-  /*    FT_Stream_CloseFunc                                                */
-  /*                                                                       */
-  /* @description:                                                         */
-  /*    A function used to close a given input stream.                     */
-  /*                                                                       */
-  /* @input:                                                               */
-  /*   stream :: A handle to the target stream.                            */
-  /*                                                                       */
-  typedef void
-  (*FT_Stream_CloseFunc)( FT_Stream  stream );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* @struct:                                                              */
-  /*    FT_StreamRec                                                       */
-  /*                                                                       */
-  /* @description:                                                         */
-  /*   A structure used to describe an input stream.                       */
-  /*                                                                       */
-  /* @input:                                                               */
-  /*   base       :: For memory-based streams, this is the address of the  */
-  /*                 first stream byte in memory.  This field should       */
-  /*                 always be set to NULL for disk-based streams.         */
-  /*                                                                       */
-  /*   size       :: The stream size in bytes.                             */
-  /*                                                                       */
-  /*   pos        :: The current position within the stream.               */
-  /*                                                                       */
-  /*   descriptor :: This field is a union that can hold an integer or a   */
-  /*                 pointer.  It is used by stream implementations to     */
-  /*                 store file descriptors or FILE* pointers.             */
-  /*                                                                       */
-  /*   pathname   :: This field is completely ignored by FreeType.         */
-  /*                 However, it is often useful during debugging to use   */
-  /*                 it to store the stream's filename (where available).  */
-  /*                                                                       */
-  /*   read       :: The stream's input function.                          */
-  /*                                                                       */
-  /*   close      :: The stream;s close function.                          */
-  /*                                                                       */
-  /*   memory     :: The memory manager to use to preload frames.  This is */
-  /*                 set internally by FreeType and shouldn't be touched   */
-  /*                 by stream implementations.                            */
-  /*                                                                       */
-  /*   cursor     :: This field is set and used internally by FreeType     */
-  /*                 when parsing frames.                                  */
-  /*                                                                       */
-  /*   limit      :: This field is set and used internally by FreeType     */
-  /*                 when parsing frames.                                  */
-  /*                                                                       */
-  typedef struct  FT_StreamRec_
-  {
-    unsigned char*       base;
-    unsigned long        size;
-    unsigned long        pos;
-
-    FT_StreamDesc        descriptor;
-    FT_StreamDesc        pathname;
-    FT_Stream_IoFunc     read;
-    FT_Stream_CloseFunc  close;
-
-    FT_Memory            memory;
-    unsigned char*       cursor;
-    unsigned char*       limit;
-
-  } FT_StreamRec;
-
-
-  /* */
-
-
-FT_END_HEADER
-
-#endif /* __FTSYSTEM_H__ */
-
-
-/* END */

gpac-2.2.1.tar.gz/extra_lib/include/freetype/freetype/fttrigon.h Deleted

@@ -1,315 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  fttrigon.h                                                             */
-/*                                                                         */
-/*    FreeType trigonometric functions (specification).                    */
-/*                                                                         */
-/*  Copyright 2001, 2003 by                                                */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef __FTTRIGON_H__
-#define __FTTRIGON_H__
-
-#include FT_FREETYPE_H
-
-#ifdef FREETYPE_H
-#error "freetype.h of FreeType 1 has been loaded!"
-#error "Please fix the directory search order for header files"
-#error "so that freetype.h of FreeType 2 is found first."
-#endif
-
-
-FT_BEGIN_HEADER
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* @section:                                                             */
-  /*   computations                                                        */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* @type:                                                                */
-  /*    FT_Angle                                                           */
-  /*                                                                       */
-  /* @description:                                                         */
-  /*    This type is used to model angle values in FreeType.  Note that    */
-  /*    the angle is a 16.16 fixed float value expressed in degrees.       */
-  /*                                                                       */
-  typedef FT_Fixed  FT_Angle;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* @macro:                                                               */
-  /*    FT_ANGLE_PI                                                        */
-  /*                                                                       */
-  /* @description:                                                         */
-  /*   The angle pi expressed in @FT_Angle units.                          */
-  /*                                                                       */
-#define FT_ANGLE_PI  ( 180L << 16 )
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* @macro:                                                               */
-  /*    FT_ANGLE_2PI                                                       */
-  /*                                                                       */
-  /* @description:                                                         */
-  /*    The angle 2*pi expressed in @FT_Angle units.                       */
-  /*                                                                       */
-#define FT_ANGLE_2PI  ( FT_ANGLE_PI * 2 )
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* @macro:                                                               */
-  /*    FT_ANGLE_PI2                                                       */
-  /*                                                                       */
-  /* @description:                                                         */
-  /*    The angle pi/2 expressed in @FT_Angle units.                       */
-  /*                                                                       */
-#define FT_ANGLE_PI2  ( FT_ANGLE_PI / 2 )
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* @macro:                                                               */
-  /*    FT_ANGLE_PI4                                                       */
-  /*                                                                       */
-  /* @description:                                                         */
-  /*    The angle pi/4 expressed in @FT_Angle units.                       */
-  /*                                                                       */
-#define FT_ANGLE_PI4  ( FT_ANGLE_PI / 4 )
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* @function:                                                            */
-  /*    FT_Sin                                                             */
-  /*                                                                       */
-  /* @description:                                                         */
-  /*    Return the sinus of a given angle in fixed point format.           */
-  /*                                                                       */
-  /* @input:                                                               */
-  /*    angle :: The input angle.                                          */
-  /*                                                                       */
-  /* @return:                                                              */
-  /*    The sinus value.                                                   */
-  /*                                                                       */
-  /* @note:                                                                */
-  /*    If you need both the sinus and cosinus for a given angle, use the  */
-  /*    function @FT_Vector_Unit.                                          */
-  /*                                                                       */
-  FT_EXPORT( FT_Fixed )
-  FT_Sin( FT_Angle  angle );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* @function:                                                            */
-  /*    FT_Cos                                                             */
-  /*                                                                       */
-  /* @description:                                                         */
-  /*    Return the cosinus of a given angle in fixed point format.         */
-  /*                                                                       */
-  /* @input:                                                               */
-  /*    angle :: The input angle.                                          */
-  /*                                                                       */
-  /* @return:                                                              */
-  /*    The cosinus value.                                                 */
-  /*                                                                       */
-  /* @note:                                                                */
-  /*    If you need both the sinus and cosinus for a given angle, use the  */
-  /*    function @FT_Vector_Unit.                                          */
-  /*                                                                       */
-  FT_EXPORT( FT_Fixed )
-  FT_Cos( FT_Angle  angle );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* @function:                                                            */
-  /*    FT_Tan                                                             */
-  /*                                                                       */
-  /* @description:                                                         */
-  /*    Return the tangent of a given angle in fixed point format.         */
-  /*                                                                       */
-  /* @input:                                                               */
-  /*    angle :: The input angle.                                          */
-  /*                                                                       */
-  /* @return:                                                              */
-  /*    The tangent value.                                                 */
-  /*                                                                       */
-  FT_EXPORT( FT_Fixed )
-  FT_Tan( FT_Angle  angle );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* @function:                                                            */
-  /*    FT_Atan2                                                           */
-  /*                                                                       */
-  /* @description:                                                         */
-  /*    Return the arc-tangent corresponding to a given vector (x,y) in    */
-  /*    the 2d plane.                                                      */
-  /*                                                                       */
-  /* @input:                                                               */
-  /*    x :: The horizontal vector coordinate.                             */
-  /*                                                                       */
-  /*    y :: The vertical vector coordinate.                               */
-  /*                                                                       */
-  /* @return:                                                              */
-  /*    The arc-tangent value (i.e. angle).                                */
-  /*                                                                       */
-  FT_EXPORT( FT_Angle )
-  FT_Atan2( FT_Fixed  x,
-            FT_Fixed  y );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* @function:                                                            */
-  /*    FT_Angle_Diff                                                      */
-  /*                                                                       */
-  /* @description:                                                         */
-  /*    Return the difference between two angles.  The result is always    */
-  /*    constrained to the -PI..PI interval.                             */
-  /*                                                                       */
-  /* @input:                                                               */
-  /*    angle1 :: First angle.                                             */
-  /*                                                                       */
-  /*    angle2 :: Second angle.                                            */
-  /*                                                                       */
-  /* @return:                                                              */
-  /*    Contrainted value of `value2-value1'.                              */
-  /*                                                                       */
-  FT_EXPORT( FT_Angle )
-  FT_Angle_Diff( FT_Angle  angle1,
-                 FT_Angle  angle2 );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* @function:                                                            */
-  /*    FT_Vector_Unit                                                     */
-  /*                                                                       */
-  /* @description:                                                         */
-  /*    Return the unit vector corresponding to a given angle.  After the  */
-  /*    call, the value of `vec.x' will be `sin(angle)', and the value of  */
-  /*    `vec.y' will be `cos(angle)'.                                      */
-  /*                                                                       */
-  /*    This function is useful to retrieve both the sinus and cosinus of  */
-  /*    a given angle quickly.                                             */
-  /*                                                                       */
-  /* @output:                                                              */
-  /*    vec   :: The address of target vector.                             */
-  /*                                                                       */
-  /* @input:                                                               */
-  /*    angle :: The address of angle.                                     */
-  /*                                                                       */
-  FT_EXPORT( void )
-  FT_Vector_Unit( FT_Vector*  vec,
-                  FT_Angle    angle );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* @function:                                                            */
-  /*    FT_Vector_Rotate                                                   */
-  /*                                                                       */
-  /* @description:                                                         */
-  /*    Rotate a vector by a given angle.                                  */
-  /*                                                                       */
-  /* @inout:                                                               */
-  /*    vec   :: The address of target vector.                             */
-  /*                                                                       */
-  /* @input:                                                               */
-  /*    angle :: The address of angle.                                     */
-  /*                                                                       */
-  FT_EXPORT( void )
-  FT_Vector_Rotate( FT_Vector*  vec,
-                    FT_Angle    angle );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* @function:                                                            */
-  /*   FT_Vector_Length                                                    */
-  /*                                                                       */
-  /* @description:                                                         */
-  /*   Return the length of a given vector.                                */
-  /*                                                                       */
-  /* @input:                                                               */
-  /*   vec :: The address of target vector.                                */
-  /*                                                                       */
-  /* @return:                                                              */
-  /*   The vector length, expressed in the same units that the original    */
-  /*   vector coordinates.                                                 */
-  /*                                                                       */
-  FT_EXPORT( FT_Fixed )
-  FT_Vector_Length( FT_Vector*  vec );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* @function:                                                            */
-  /*    FT_Vector_Polarize                                                 */
-  /*                                                                       */
-  /* @description:                                                         */
-  /*    Compute both the length and angle of a given vector.               */
-  /*                                                                       */
-  /* @input:                                                               */
-  /*    vec    :: The address of source vector.                            */
-  /*                                                                       */
-  /* @output:                                                              */
-  /*    length :: The vector length.                                       */
-  /*    angle  :: The vector angle.                                        */
-  /*                                                                       */
-  FT_EXPORT( void )
-  FT_Vector_Polarize( FT_Vector*  vec,
-                      FT_Fixed   *length,
-                      FT_Angle   *angle );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* @function:                                                            */
-  /*    FT_Vector_From_Polar                                               */
-  /*                                                                       */
-  /* @description:                                                         */
-  /*    Compute vector coordinates from a length and angle.                */
-  /*                                                                       */
-  /* @output:                                                              */
-  /*    vec    :: The address of source vector.                            */
-  /*                                                                       */
-  /* @input:                                                               */
-  /*    length :: The vector length.                                       */
-  /*    angle  :: The vector angle.                                        */
-  /*                                                                       */
-  FT_EXPORT( void )
-  FT_Vector_From_Polar( FT_Vector*  vec,
-                        FT_Fixed    length,
-                        FT_Angle    angle );
-
-  /* */
-
-
-FT_END_HEADER
-
-#endif /* __FTTRIGON_H__ */
-
-
-/* END */

gpac-2.2.1.tar.gz/extra_lib/include/freetype/freetype/fttypes.h Deleted

@@ -1,558 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  fttypes.h                                                              */
-/*                                                                         */
-/*    FreeType simple types definitions (specification only).              */
-/*                                                                         */
-/*  Copyright 1996-2001 by                                                 */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef __FTTYPES_H__
-#define __FTTYPES_H__
-
-
-#include <ft2build.h>
-#include FT_CONFIG_CONFIG_H
-#include FT_SYSTEM_H
-#include FT_IMAGE_H
-
-#include <stddef.h>
-
-
-FT_BEGIN_HEADER
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Section>                                                             */
-  /*    basic_types                                                        */
-  /*                                                                       */
-  /* <Title>                                                               */
-  /*    Basic Data Types                                                   */
-  /*                                                                       */
-  /* <Abstract>                                                            */
-  /*    The basic data types defined by the library.                       */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    This section contains the basic data types defined by FreeType 2,  */
-  /*    ranging from simple scalar types to bitmap descriptors.  More      */
-  /*    font-specific structures are defined in a different section.       */
-  /*                                                                       */
-  /* <Order>                                                               */
-  /*    FT_Byte                                                            */
-  /*    FT_Char                                                            */
-  /*    FT_Int                                                             */
-  /*    FT_UInt                                                            */
-  /*    FT_Short                                                           */
-  /*    FT_UShort                                                          */
-  /*    FT_Long                                                            */
-  /*    FT_ULong                                                           */
-  /*    FT_Bool                                                            */
-  /*    FT_Offset                                                          */
-  /*    FT_PtrDist                                                         */
-  /*    FT_String                                                          */
-  /*    FT_Error                                                           */
-  /*    FT_Fixed                                                           */
-  /*    FT_Pointer                                                         */
-  /*    FT_Pos                                                             */
-  /*    FT_Vector                                                          */
-  /*    FT_BBox                                                            */
-  /*    FT_Matrix                                                          */
-  /*    FT_FWord                                                           */
-  /*    FT_UFWord                                                          */
-  /*    FT_F2Dot14                                                         */
-  /*    FT_UnitVector                                                      */
-  /*    FT_F26Dot6                                                         */
-  /*                                                                       */
-  /*                                                                       */
-  /*    FT_Generic                                                         */
-  /*    FT_Generic_Finalizer                                               */
-  /*                                                                       */
-  /*    FT_Bitmap                                                          */
-  /*    FT_Pixel_Mode                                                      */
-  /*    FT_Palette_Mode                                                    */
-  /*    FT_Glyph_Format                                                    */
-  /*    FT_IMAGE_TAG                                                       */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Type>                                                                */
-  /*    FT_Bool                                                            */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A typedef of unsigned char, used for simple booleans.              */
-  /*                                                                       */
-  typedef unsigned char  FT_Bool;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Type>                                                                */
-  /*    FT_FWord                                                           */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A signed 16-bit integer used to store a distance in original font  */
-  /*    units.                                                             */
-  /*                                                                       */
-  typedef signed short  FT_FWord;   /* distance in FUnits */
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Type>                                                                */
-  /*    FT_UFWord                                                          */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    An unsigned 16-bit integer used to store a distance in original    */
-  /*    font units.                                                        */
-  /*                                                                       */
-  typedef unsigned short  FT_UFWord;  /* unsigned distance */
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Type>                                                                */
-  /*    FT_Char                                                            */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A simple typedef for the _signed_ char type.                       */
-  /*                                                                       */
-  typedef signed char  FT_Char;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Type>                                                                */
-  /*    FT_Byte                                                            */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A simple typedef for the _unsigned_ char type.                     */
-  /*                                                                       */
-  typedef unsigned char  FT_Byte;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Type>                                                                */
-  /*    FT_String                                                          */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A simple typedef for the char type, usually used for strings.      */
-  /*                                                                       */
-  typedef char  FT_String;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Type>                                                                */
-  /*    FT_Short                                                           */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A typedef for signed short.                                        */
-  /*                                                                       */
-  typedef signed short  FT_Short;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Type>                                                                */
-  /*    FT_UShort                                                          */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A typedef for unsigned short.                                      */
-  /*                                                                       */
-  typedef unsigned short  FT_UShort;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Type>                                                                */
-  /*    FT_Int                                                             */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A typedef for the int type.                                        */
-  /*                                                                       */
-  typedef int  FT_Int;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Type>                                                                */
-  /*    FT_UInt                                                            */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A typedef for the unsigned int type.                               */
-  /*                                                                       */
-  typedef unsigned int  FT_UInt;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Type>                                                                */
-  /*    FT_Long                                                            */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A typedef for signed long.                                         */
-  /*                                                                       */
-  typedef signed long  FT_Long;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Type>                                                                */
-  /*    FT_ULong                                                           */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A typedef for unsigned long.                                       */
-  /*                                                                       */
-  typedef unsigned long  FT_ULong;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Type>                                                                */
-  /*    FT_F2Dot14                                                         */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A signed 2.14 fixed float type used for unit vectors.              */
-  /*                                                                       */
-  typedef signed short  FT_F2Dot14;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Type>                                                                */
-  /*    FT_F26Dot6                                                         */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A signed 26.6 fixed float type used for vectorial pixel            */
-  /*    coordinates.                                                       */
-  /*                                                                       */
-  typedef signed long  FT_F26Dot6;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Type>                                                                */
-  /*    FT_Fixed                                                           */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    This type is used to store 16.16 fixed float values, like scales   */
-  /*    or matrix coefficients.                                            */
-  /*                                                                       */
-  typedef signed long  FT_Fixed;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Type>                                                                */
-  /*    FT_Error                                                           */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    The FreeType error code type.  A value of 0 is always interpreted  */
-  /*    as a successful operation.                                         */
-  /*                                                                       */
-  typedef int  FT_Error;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Type>                                                                */
-  /*    FT_Pointer                                                         */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A simple typedef for a typeless pointer.                           */
-  /*                                                                       */
-  typedef void*  FT_Pointer;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Type>                                                                */
-  /*    FT_Offset                                                          */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    This is equivalent to the ANSI C `size_t' type, i.e. the largest   */
-  /*    _unsigned_ integer type used to express a file size or position,   */
-  /*    or a memory block size.                                            */
-  /*                                                                       */
-  typedef size_t  FT_Offset;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Type>                                                                */
-  /*    FT_PtrDist                                                         */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    This is equivalent to the ANSI C `ptrdiff_t' type, i.e. the        */
-  /*    largest _signed_ integer type used to express the distance         */
-  /*    between two pointers.                                              */
-  /*                                                                       */
-  typedef size_t  FT_PtrDist;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    FT_UnitVector                                                      */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A simple structure used to store a 2D vector unit vector.  Uses    */
-  /*    FT_F2Dot14 types.                                                  */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    x :: Horizontal coordinate.                                        */
-  /*                                                                       */
-  /*    y :: Vertical coordinate.                                          */
-  /*                                                                       */
-  typedef struct  FT_UnitVector_
-  {
-    FT_F2Dot14  x;
-    FT_F2Dot14  y;
-
-  } FT_UnitVector;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    FT_Matrix                                                          */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A simple structure used to store a 2x2 matrix.  Coefficients are   */
-  /*    in 16.16 fixed float format.  The computation performed is:        */
-  /*                                                                       */
-  /*       {                                                               */
-  /*          x' = x*xx + y*xy                                             */
-  /*          y' = x*yx + y*yy                                             */
-  /*       }                                                               */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    xx :: Matrix coefficient.                                          */
-  /*                                                                       */
-  /*    xy :: Matrix coefficient.                                          */
-  /*                                                                       */
-  /*    yx :: Matrix coefficient.                                          */
-  /*                                                                       */
-  /*    yy :: Matrix coefficient.                                          */
-  /*                                                                       */
-  typedef struct  FT_Matrix_
-  {
-    FT_Fixed  xx, xy;
-    FT_Fixed  yx, yy;
-
-  } FT_Matrix;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    FT_Data	                                                           */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Read-only binary data represented as a pointer and a length.       */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    pointer :: The data.                                               */
-  /*                                                                       */
-  /*    length  :: The length of the data in bytes.                        */
-  /*                                                                       */
-  typedef struct  FT_Data_
-  {
-    const FT_Byte*  pointer;
-    FT_Int          length;
-
-  } FT_Data;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <FuncType>                                                            */
-  /*    FT_Generic_Finalizer                                               */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Describes a function used to destroy the `client' data of any      */
-  /*    FreeType object.  See the description of the FT_Generic type for   */
-  /*    details of usage.                                                  */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    The address of the FreeType object which is under finalization.    */
-  /*    Its client data is accessed through its `generic' field.           */
-  /*                                                                       */
-  typedef void  (*FT_Generic_Finalizer)(void*  object);
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    FT_Generic                                                         */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Client applications often need to associate their own data to a    */
-  /*    variety of FreeType core objects.  For example, a text layout API  */
-  /*    might want to associate a glyph cache to a given size object.      */
-  /*                                                                       */
-  /*    Most FreeType object contains a `generic' field, of type           */
-  /*    FT_Generic, which usage is left to client applications and font    */
-  /*    servers.                                                           */
-  /*                                                                       */
-  /*    It can be used to store a pointer to client-specific data, as well */
-  /*    as the address of a `finalizer' function, which will be called by  */
-  /*    FreeType when the object is destroyed (for example, the previous   */
-  /*    client example would put the address of the glyph cache destructor */
-  /*    in the `finalizer' field).                                         */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    data      :: A typeless pointer to any client-specified data. This */
-  /*                 field is completely ignored by the FreeType library.  */
-  /*                                                                       */
-  /*    finalizer :: A pointer to a `generic finalizer' function, which    */
-  /*                 will be called when the object is destroyed.  If this */
-  /*                 field is set to NULL, no code will be called.         */
-  /*                                                                       */
-  typedef struct  FT_Generic_
-  {
-    void*                 data;
-    FT_Generic_Finalizer  finalizer;
-
-  } FT_Generic;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Macro>                                                               */
-  /*    FT_MAKE_TAG                                                        */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    This macro converts four letter tags which are used to label       */
-  /*    TrueType tables into an unsigned long to be used within FreeType.  */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    The produced values *must* be 32bit integers.  Don't redefine this */
-  /*    macro.                                                             */
-  /*                                                                       */
-#define FT_MAKE_TAG( _x1, _x2, _x3, _x4 ) \
-          ( ( (FT_ULong)_x1 << 24 ) |     \
-            ( (FT_ULong)_x2 << 16 ) |     \
-            ( (FT_ULong)_x3 <<  8 ) |     \
-              (FT_ULong)_x4         )
-
-
-  /*************************************************************************/
-  /*************************************************************************/
-  /*                                                                       */
-  /*                    L I S T   M A N A G E M E N T                      */
-  /*                                                                       */
-  /*************************************************************************/
-  /*************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Section>                                                             */
-  /*    list_processing                                                    */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Type>                                                                */
-  /*    FT_ListNode                                                        */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*     Many elements and objects in FreeType are listed through a        */
-  /*     FT_List record (see FT_ListRec).  As its name suggests, a         */
-  /*     FT_ListNode is a handle to a single list element.                 */
-  /*                                                                       */
-  typedef struct FT_ListNodeRec_*  FT_ListNode;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Type>                                                                */
-  /*    FT_List                                                            */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A handle to a list record (see FT_ListRec).                        */
-  /*                                                                       */
-  typedef struct FT_ListRec_*  FT_List;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    FT_ListNodeRec                                                     */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A structure used to hold a single list element.                    */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    prev :: The previous element in the list.  NULL if first.          */
-  /*                                                                       */
-  /*    next :: The next element in the list.  NULL if last.               */
-  /*                                                                       */
-  /*    data :: A typeless pointer to the listed object.                   */
-  /*                                                                       */
-  typedef struct  FT_ListNodeRec_
-  {
-    FT_ListNode  prev;
-    FT_ListNode  next;
-    void*        data;
-
-  } FT_ListNodeRec;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    FT_ListRec                                                         */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A structure used to hold a simple doubly-linked list.  These are   */
-  /*    used in many parts of FreeType.                                    */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    head :: The head (first element) of doubly-linked list.            */
-  /*                                                                       */
-  /*    tail :: The tail (last element) of doubly-linked list.             */
-  /*                                                                       */
-  typedef struct  FT_ListRec_
-  {
-    FT_ListNode  head;
-    FT_ListNode  tail;
-
-  } FT_ListRec;
-
-
-  /* */
-
-#define FT_IS_EMPTY( list )  ( (list).head == 0 )
-
-  /* return base error code (without module-specific prefix) */
-#define FT_ERROR_BASE( x )    ( (x) & 0xFF )
-
-  /* return module error code */
-#define FT_ERROR_MODULE( x )  ( (x) & 0xFF00U )
-
-#define FT_BOOL( x )  ( (FT_Bool)( x ) )
-
-FT_END_HEADER
-
-#endif /* __FTTYPES_H__ */
-
-
-/* END */

gpac-2.2.1.tar.gz/extra_lib/include/freetype/freetype/ftwinfnt.h Deleted

@@ -1,135 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  ftwinfnt.h                                                             */
-/*                                                                         */
-/*    FreeType API for accessing Windows fnt-specific data.                */
-/*                                                                         */
-/*  Copyright 2003 by                                                      */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef __FTWINFNT_H__
-#define __FTWINFNT_H__
-
-#include <ft2build.h>
-#include FT_FREETYPE_H
-
-#ifdef FREETYPE_H
-#error "freetype.h of FreeType 1 has been loaded!"
-#error "Please fix the directory search order for header files"
-#error "so that freetype.h of FreeType 2 is found first."
-#endif
-
-
-FT_BEGIN_HEADER
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Section>                                                             */
-  /*    winfnt_fonts                                                       */
-  /*                                                                       */
-  /* <Title>                                                               */
-  /*    Window FNT Fonts                                                   */
-  /*                                                                       */
-  /* <Abstract>                                                            */
-  /*    Windows FNT specific APIs                                          */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    This section contains the declaration of Windows FNT specific      */
-  /*    functions.                                                         */
-  /*                                                                       */
-  /*************************************************************************/
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    FT_WinFNT_HeaderRec_                                               */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Windows FNT Header info.                                           */
-  /*                                                                       */
-  typedef struct  FT_WinFNT_HeaderRec_
-  {
-    FT_UShort  version;
-    FT_ULong   file_size;
-    FT_Byte    copyright60;
-    FT_UShort  file_type;
-    FT_UShort  nominal_point_size;
-    FT_UShort  vertical_resolution;
-    FT_UShort  horizontal_resolution;
-    FT_UShort  ascent;
-    FT_UShort  internal_leading;
-    FT_UShort  external_leading;
-    FT_Byte    italic;
-    FT_Byte    underline;
-    FT_Byte    strike_out;
-    FT_UShort  weight;
-    FT_Byte    charset;
-    FT_UShort  pixel_width;
-    FT_UShort  pixel_height;
-    FT_Byte    pitch_and_family;
-    FT_UShort  avg_width;
-    FT_UShort  max_width;
-    FT_Byte    first_char;
-    FT_Byte    last_char;
-    FT_Byte    default_char;
-    FT_Byte    break_char;
-    FT_UShort  bytes_per_row;
-    FT_ULong   device_offset;
-    FT_ULong   face_name_offset;
-    FT_ULong   bits_pointer;
-    FT_ULong   bits_offset;
-    FT_Byte    reserved;
-    FT_ULong   flags;
-    FT_UShort  A_space;
-    FT_UShort  B_space;
-    FT_UShort  C_space;
-    FT_UShort  color_table_offset;
-    FT_ULong   reserved14;
-
-  } FT_WinFNT_HeaderRec, *FT_WinFNT_Header;
-
-
- /**********************************************************************
-  *
-  * @function:
-  *    FT_Get_WinFNT_Header
-  *
-  * @description:
-  *    Retrieve a Windows FNT font info header.
-  *
-  * @input:
-  *    face    :: A handle to the input face.
-  *
-  * @output:
-  *    aheader :: The WinFNT header.
-  *
-  * @return:
-  *   FreeType error code.  0 means success.
-  *
-  * @note:
-  *   This function only works with Windows FNT faces, returning an error
-  *   otherwise.
-  */
-  FT_EXPORT( FT_Error )
-  FT_Get_WinFNT_Header( FT_Face               face,
-                        FT_WinFNT_HeaderRec  *aheader );
-
-
- /* */
-
-FT_END_HEADER
-
-#endif /* __FTWINFNT_H__ */
-
-
-/* END */

gpac-2.2.1.tar.gz/extra_lib/include/freetype/freetype/ftxf86.h Deleted

@@ -1,60 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  ftxf86.h                                                               */
-/*                                                                         */
-/*    Support functions for X11.                                           */
-/*                                                                         */
-/*  Copyright 2002, 2003 by                                                */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef __FTXF86_H__
-#define __FTXF86_H__
-
-#include <ft2build.h>
-#include FT_FREETYPE_H
-
-#ifdef FREETYPE_H
-#error "freetype.h of FreeType 1 has been loaded!"
-#error "Please fix the directory search order for header files"
-#error "so that freetype.h of FreeType 2 is found first."
-#endif
-
-
-FT_BEGIN_HEADER
-
-  /* this comment is intentionally disabled for now, to prevent this       */
-  /* function from appearing in the API Reference.                         */
-
-  /*@***********************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Get_X11_Font_Format                                             */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Return a string describing the format of a given face as an X11    */
-  /*    FONT_PROPERTY.  It should only be used by the FreeType 2 font      */
-  /*    backend of the XFree86 font server.                                */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    face :: Input face handle.                                         */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    Font format string.  NULL in case of error.                        */
-  /*                                                                       */
-  FT_EXPORT_DEF( const char* )
-  FT_Get_X11_Font_Format( FT_Face  face );
-
- /* */
-
-FT_END_HEADER
-
-#endif /* __FTXF86_H__ */

gpac-2.2.1.tar.gz/extra_lib/include/freetype/freetype/internal Deleted

gpac-2.2.1.tar.gz/extra_lib/include/freetype/freetype/internal/autohint.h Deleted

@@ -1,205 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  autohint.h                                                             */
-/*                                                                         */
-/*    High-level `autohint' module-specific interface (specification).     */
-/*                                                                         */
-/*  Copyright 1996-2001, 2002 by                                           */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* The auto-hinter is used to load and automatically hint glyphs if a    */
-  /* format-specific hinter isn't available.                               */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-#ifndef __AUTOHINT_H__
-#define __AUTOHINT_H__
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* A small technical note regarding automatic hinting in order to        */
-  /* clarify this module interface.                                        */
-  /*                                                                       */
-  /* An automatic hinter might compute two kinds of data for a given face: */
-  /*                                                                       */
-  /* - global hints: Usually some metrics that describe global properties  */
-  /*                 of the face.  It is computed by scanning more or less */
-  /*                 agressively the glyphs in the face, and thus can be   */
-  /*                 very slow to compute (even if the size of global      */
-  /*                 hints is really small).                               */
-  /*                                                                       */
-  /* - glyph hints:  These describe some important features of the glyph   */
-  /*                 outline, as well as how to align them.  They are      */
-  /*                 generally much faster to compute than global hints.   */
-  /*                                                                       */
-  /* The current FreeType auto-hinter does a pretty good job while         */
-  /* performing fast computations for both global and glyph hints.         */
-  /* However, we might be interested in introducing more complex and       */
-  /* powerful algorithms in the future, like the one described in the John */
-  /* D. Hobby paper, which unfortunately requires a lot more horsepower.   */
-  /*                                                                       */
-  /* Because a sufficiently sophisticated font management system would     */
-  /* typically implement an LRU cache of opened face objects to reduce     */
-  /* memory usage, it is a good idea to be able to avoid recomputing       */
-  /* global hints every time the same face is re-opened.                   */
-  /*                                                                       */
-  /* We thus provide the ability to cache global hints outside of the face */
-  /* object, in order to speed up font re-opening time.  Of course, this   */
-  /* feature is purely optional, so most client programs won't even notice */
-  /* it.                                                                   */
-  /*                                                                       */
-  /* I initially thought that it would be a good idea to cache the glyph   */
-  /* hints too.  However, my general idea now is that if you really need   */
-  /* to cache these too, you are simply in need of a new font format,      */
-  /* where all this information could be stored within the font file and   */
-  /* decoded on the fly.                                                   */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-#include <ft2build.h>
-#include FT_FREETYPE_H
-
-
-FT_BEGIN_HEADER
-
-
-  typedef struct FT_AutoHinterRec_  *FT_AutoHinter;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <FuncType>                                                            */
-  /*    FT_AutoHinter_GlobalGetFunc                                        */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Retrieves the global hints computed for a given face object the    */
-  /*    resulting data is dissociated from the face and will survive a     */
-  /*    call to FT_Done_Face().  It must be discarded through the API      */
-  /*    FT_AutoHinter_GlobalDoneFunc().                                    */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    hinter        :: A handle to the source auto-hinter.               */
-  /*                                                                       */
-  /*    face          :: A handle to the source face object.               */
-  /*                                                                       */
-  /* <Output>                                                              */
-  /*    global_hints  :: A typeless pointer to the global hints.           */
-  /*                                                                       */
-  /*    global_len    :: The size in bytes of the global hints.            */
-  /*                                                                       */
-  typedef void
-  (*FT_AutoHinter_GlobalGetFunc)( FT_AutoHinter  hinter,
-                                  FT_Face        face,
-                                  void**         global_hints,
-                                  long*          global_len );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <FuncType>                                                            */
-  /*    FT_AutoHinter_GlobalDoneFunc                                       */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Discards the global hints retrieved through                        */
-  /*    FT_AutoHinter_GlobalGetFunc().  This is the only way these hints   */
-  /*    are freed from memory.                                             */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    hinter :: A handle to the auto-hinter module.                      */
-  /*                                                                       */
-  /*    global :: A pointer to retrieved global hints to discard.          */
-  /*                                                                       */
-  typedef void
-  (*FT_AutoHinter_GlobalDoneFunc)( FT_AutoHinter  hinter,
-                                   void*          global );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <FuncType>                                                            */
-  /*    FT_AutoHinter_GlobalResetFunc                                      */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    This function is used to recompute the global metrics in a given   */
-  /*    font.  This is useful when global font data changes (e.g. Multiple */
-  /*    Masters fonts where blend coordinates change).                     */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    hinter :: A handle to the source auto-hinter.                      */
-  /*                                                                       */
-  /*    face   :: A handle to the face.                                    */
-  /*                                                                       */
-  typedef void
-  (*FT_AutoHinter_GlobalResetFunc)( FT_AutoHinter  hinter,
-                                    FT_Face        face );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <FuncType>                                                            */
-  /*    FT_AutoHinter_GlyphLoadFunc                                        */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    This function is used to load, scale, and automatically hint a     */
-  /*    glyph from a given face.                                           */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    face        :: A handle to the face.                               */
-  /*                                                                       */
-  /*    glyph_index :: The glyph index.                                    */
-  /*                                                                       */
-  /*    load_flags  :: The load flags.                                     */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    This function is capable of loading composite glyphs by hinting    */
-  /*    each sub-glyph independently (which improves quality).             */
-  /*                                                                       */
-  /*    It will call the font driver with FT_Load_Glyph(), with            */
-  /*    FT_LOAD_NO_SCALE set.                                              */
-  /*                                                                       */
-  typedef FT_Error
-  (*FT_AutoHinter_GlyphLoadFunc)( FT_AutoHinter  hinter,
-                                  FT_GlyphSlot   slot,
-                                  FT_Size        size,
-                                  FT_UInt        glyph_index,
-                                  FT_Int32       load_flags );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    FT_AutoHinter_ServiceRec                                           */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    The auto-hinter module's interface.                                */
-  /*                                                                       */
-  typedef struct  FT_AutoHinter_ServiceRec_
-  {
-    FT_AutoHinter_GlobalResetFunc  reset_face;
-    FT_AutoHinter_GlobalGetFunc    get_global_hints;
-    FT_AutoHinter_GlobalDoneFunc   done_global_hints;
-    FT_AutoHinter_GlyphLoadFunc    load_glyph;
-
-  } FT_AutoHinter_ServiceRec, *FT_AutoHinter_Service;
-
-
-FT_END_HEADER
-
-#endif /* __AUTOHINT_H__ */
-
-
-/* END */

gpac-2.2.1.tar.gz/extra_lib/include/freetype/freetype/internal/bdftypes.h Deleted

@@ -1,58 +0,0 @@
-/*  bdftypes.h
-
-  FreeType font driver for bdf fonts
-
-  Copyright (C) 2001, 2002 by
-  Francesco Zappa Nardelli
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-*/
-
-#ifndef __BDFTYPES_H__
-#define __BDFTYPES_H__
-
-#include <ft2build.h>
-#include FT_FREETYPE_H
-#include FT_BDF_H
-
-
-FT_BEGIN_HEADER
-
-
-  typedef struct  BDF_Public_FaceRec_
-  {
-    FT_FaceRec  root;
-
-    char*       charset_encoding;
-    char*       charset_registry;
-
-  } BDF_Public_FaceRec, *BDF_Public_Face;
-
-
-  typedef FT_Error  (*BDF_GetPropertyFunc)( FT_Face           face,
-                                            const char*       prop_name,
-                                            BDF_PropertyRec  *aproperty );
-
-FT_END_HEADER
-
-
-#endif  /* __BDFTYPES_H__ */
-
-
-/* END */

gpac-2.2.1.tar.gz/extra_lib/include/freetype/freetype/internal/cfftypes.h Deleted

@@ -1,256 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  cfftypes.h                                                             */
-/*                                                                         */
-/*    Basic OpenType/CFF type definitions and interface (specification     */
-/*    only).                                                               */
-/*                                                                         */
-/*  Copyright 1996-2001, 2002, 2003 by                                     */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef __CFFTYPES_H__
-#define __CFFTYPES_H__
-
-
-#include <ft2build.h>
-#include FT_FREETYPE_H
-
-
-FT_BEGIN_HEADER
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    CFF_IndexRec                                                       */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A structure used to model a CFF Index table.                       */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    stream      :: The source input stream.                            */
-  /*                                                                       */
-  /*    count       :: The number of elements in the index.                */
-  /*                                                                       */
-  /*    off_size    :: The size in bytes of object offsets in index.       */
-  /*                                                                       */
-  /*    data_offset :: The position of first data byte in the index's      */
-  /*                   bytes.                                              */
-  /*                                                                       */
-  /*    offsets     :: A table of element offsets in the index.            */
-  /*                                                                       */
-  /*    bytes       :: If the index is loaded in memory, its bytes.        */
-  /*                                                                       */
-  typedef struct  CFF_IndexRec_
-  {
-    FT_Stream  stream;
-    FT_UInt    count;
-    FT_Byte    off_size;
-    FT_ULong   data_offset;
-
-    FT_ULong*  offsets;
-    FT_Byte*   bytes;
-
-  } CFF_IndexRec, *CFF_Index;
-
-
-  typedef struct  CFF_EncodingRec_
-  {
-    FT_UInt     format;
-    FT_ULong    offset;
-
-    FT_UInt     count;
-    FT_UShort   sids 256;  /* avoid dynamic allocations */
-    FT_UShort   codes256;
-
-  } CFF_EncodingRec, *CFF_Encoding;
-
-
-  typedef struct  CFF_CharsetRec_
-  {
-
-    FT_UInt     format;
-    FT_ULong    offset;
-
-    FT_UShort*  sids;
-
-  } CFF_CharsetRec, *CFF_Charset;
-
-
-  typedef struct  CFF_FontRecDictRec_
-  {
-    FT_UInt    version;
-    FT_UInt    notice;
-    FT_UInt    copyright;
-    FT_UInt    full_name;
-    FT_UInt    family_name;
-    FT_UInt    weight;
-    FT_Bool    is_fixed_pitch;
-    FT_Fixed   italic_angle;
-    FT_Fixed   underline_position;
-    FT_Fixed   underline_thickness;
-    FT_Int     paint_type;
-    FT_Int     charstring_type;
-    FT_Matrix  font_matrix;
-    FT_UShort  units_per_em;
-    FT_Vector  font_offset;
-    FT_ULong   unique_id;
-    FT_BBox    font_bbox;
-    FT_Pos     stroke_width;
-    FT_ULong   charset_offset;
-    FT_ULong   encoding_offset;
-    FT_ULong   charstrings_offset;
-    FT_ULong   private_offset;
-    FT_ULong   private_size;
-    FT_Long    synthetic_base;
-    FT_UInt    embedded_postscript;
-    FT_UInt    base_font_name;
-    FT_UInt    postscript;
-
-    /* these should only be used for the top-level font dictionary */
-    FT_UInt    cid_registry;
-    FT_UInt    cid_ordering;
-    FT_ULong   cid_supplement;
-
-    FT_Long    cid_font_version;
-    FT_Long    cid_font_revision;
-    FT_Long    cid_font_type;
-    FT_Long    cid_count;
-    FT_ULong   cid_uid_base;
-    FT_ULong   cid_fd_array_offset;
-    FT_ULong   cid_fd_select_offset;
-    FT_UInt    cid_font_name;
-
-  } CFF_FontRecDictRec, *CFF_FontRecDict;
-
-
-  typedef struct  CFF_PrivateRec_
-  {
-    FT_Byte   num_blue_values;
-    FT_Byte   num_other_blues;
-    FT_Byte   num_family_blues;
-    FT_Byte   num_family_other_blues;
-
-    FT_Pos    blue_values14;
-    FT_Pos    other_blues10;
-    FT_Pos    family_blues14;
-    FT_Pos    family_other_blues10;
-
-    FT_Fixed  blue_scale;
-    FT_Pos    blue_shift;
-    FT_Pos    blue_fuzz;
-    FT_Pos    standard_width;
-    FT_Pos    standard_height;
-
-    FT_Byte   num_snap_widths;
-    FT_Byte   num_snap_heights;
-    FT_Pos    snap_widths13;
-    FT_Pos    snap_heights13;
-    FT_Bool   force_bold;
-    FT_Fixed  force_bold_threshold;
-    FT_Int    lenIV;
-    FT_Int    language_group;
-    FT_Fixed  expansion_factor;
-    FT_Long   initial_random_seed;
-    FT_ULong  local_subrs_offset;
-    FT_Pos    default_width;
-    FT_Pos    nominal_width;
-
-  } CFF_PrivateRec, *CFF_Private;
-
-
-  typedef struct  CFF_FDSelectRec_
-  {
-    FT_Byte   format;
-    FT_UInt   range_count;
-
-    /* that's the table, taken from the file `as is' */
-    FT_Byte*  data;
-    FT_UInt   data_size;
-
-    /* small cache for format 3 only */
-    FT_UInt   cache_first;
-    FT_UInt   cache_count;
-    FT_Byte   cache_fd;
-
-  } CFF_FDSelectRec, *CFF_FDSelect;
-
-
-  /* A SubFont packs a font dict and a private dict together.  They are */
-  /* needed to support CID-keyed CFF fonts.                             */
-  typedef struct  CFF_SubFontRec_
-  {
-    CFF_FontRecDictRec  font_dict;
-    CFF_PrivateRec      private_dict;
-
-    CFF_IndexRec        local_subrs_index;
-    FT_UInt             num_local_subrs;
-    FT_Byte**           local_subrs;
-
-  } CFF_SubFontRec, *CFF_SubFont;
-
-
-  /* maximum number of sub-fonts in a CID-keyed file */
-#define CFF_MAX_CID_FONTS  16
-
-
-  typedef struct  CFF_FontRec_
-  {
-    FT_Stream        stream;
-    FT_Memory        memory;
-    FT_UInt          num_faces;
-    FT_UInt          num_glyphs;
-
-    FT_Byte          version_major;
-    FT_Byte          version_minor;
-    FT_Byte          header_size;
-    FT_Byte          absolute_offsize;
-
-
-    CFF_IndexRec     name_index;
-    CFF_IndexRec     top_dict_index;
-    CFF_IndexRec     string_index;
-    CFF_IndexRec     global_subrs_index;
-
-    CFF_EncodingRec  encoding;
-    CFF_CharsetRec   charset;
-
-    CFF_IndexRec     charstrings_index;
-    CFF_IndexRec     font_dict_index;
-    CFF_IndexRec     private_index;
-    CFF_IndexRec     local_subrs_index;
-
-    FT_String*       font_name;
-    FT_UInt          num_global_subrs;
-    FT_Byte**        global_subrs;
-
-    CFF_SubFontRec   top_font;
-    FT_UInt          num_subfonts;
-    CFF_SubFont      subfontsCFF_MAX_CID_FONTS;
-
-    CFF_FDSelectRec  fd_select;
-
-    /* interface to PostScript hinter */
-    void*            pshinter;
-
-    /* interface to Postscript Names service */
-    void*            psnames;
-
-  } CFF_FontRec, *CFF_Font;
-
-
-FT_END_HEADER
-
-#endif /* __CFFTYPES_H__ */
-
-
-/* END */

gpac-2.2.1.tar.gz/extra_lib/include/freetype/freetype/internal/fnttypes.h Deleted

@@ -1,104 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  fnttypes.h                                                             */
-/*                                                                         */
-/*    Basic Windows FNT/FON type definitions and interface (specification  */
-/*    only).                                                               */
-/*                                                                         */
-/*  Copyright 1996-2001, 2002, 2003 by                                     */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef __FNTTYPES_H__
-#define __FNTTYPES_H__
-
-
-#include <ft2build.h>
-#include FT_FREETYPE_H
-#include FT_WINFONTS_H
-
-
-FT_BEGIN_HEADER
-
-
-  typedef struct  WinMZ_HeaderRec_
-  {
-    FT_UShort  magic;
-    /* skipped content */
-    FT_UShort  lfanew;
-
-  } WinMZ_HeaderRec;
-
-
-  typedef struct  WinNE_HeaderRec_
-  {
-    FT_UShort  magic;
-    /* skipped content */
-    FT_UShort  resource_tab_offset;
-    FT_UShort  rname_tab_offset;
-
-  } WinNE_HeaderRec;
-
-
-  typedef struct  WinNameInfoRec_
-  {
-    FT_UShort  offset;
-    FT_UShort  length;
-    FT_UShort  flags;
-    FT_UShort  id;
-    FT_UShort  handle;
-    FT_UShort  usage;
-
-  } WinNameInfoRec;
-
-
-  typedef struct  WinResourceInfoRec_
-  {
-    FT_UShort  type_id;
-    FT_UShort  count;
-
-  } WinResourceInfoRec;
-
-
-#define WINFNT_MZ_MAGIC  0x5A4D
-#define WINFNT_NE_MAGIC  0x454E
-
-
-  typedef struct  FNT_FontRec_
-  {
-    FT_ULong             offset;
-    FT_Int               size_shift;
-
-    FT_WinFNT_HeaderRec  header;
-
-    FT_Byte*             fnt_frame;
-    FT_ULong             fnt_size;
-
-  } FNT_FontRec, *FNT_Font;
-
-
-  typedef struct  FNT_FaceRec_
-  {
-    FT_FaceRec     root;
-    FNT_Font       font;
-
-    FT_CharMap     charmap_handle;
-    FT_CharMapRec  charmap;  /* a single charmap per face */
-
-  } FNT_FaceRec, *FNT_Face;
-
-
-FT_END_HEADER
-
-#endif /* __FNTTYPES_H__ */
-
-
-/* END */

gpac-2.2.1.tar.gz/extra_lib/include/freetype/freetype/internal/ftcalc.h Deleted

@@ -1,77 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  ftcalc.h                                                               */
-/*                                                                         */
-/*    Arithmetic computations (specification).                             */
-/*                                                                         */
-/*  Copyright 1996-2001, 2002 by                                           */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef __FTCALC_H__
-#define __FTCALC_H__
-
-
-#include <ft2build.h>
-#include FT_FREETYPE_H
-
-
-FT_BEGIN_HEADER
-
-
-  FT_EXPORT( FT_Int32 )  FT_SqrtFixed( FT_Int32  x );
-
-
-#define SQRT_32( x )  FT_Sqrt32( x )
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Sqrt32                                                          */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Computes the square root of an Int32 integer (which will be        */
-  /*    handled as an unsigned long value).                                */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    x :: The value to compute the root for.                            */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    The result of `sqrt(x)'.                                           */
-  /*                                                                       */
-  FT_EXPORT( FT_Int32 )
-  FT_Sqrt32( FT_Int32  x );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* FT_MulDiv() and FT_MulFix() are declared in freetype.h.               */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-#define INT_TO_F26DOT6( x )    ( (FT_Long)(x) << 6  )
-#define INT_TO_F2DOT14( x )    ( (FT_Long)(x) << 14 )
-#define INT_TO_FIXED( x )      ( (FT_Long)(x) << 16 )
-#define F2DOT14_TO_FIXED( x )  ( (FT_Long)(x) << 2  )
-#define FLOAT_TO_FIXED( x )    ( (FT_Long)( x * 65536.0 ) )
-
-#define ROUND_F26DOT6( x )     ( x >= 0 ? (    ( (x) + 32 ) & -64 )     \
-                                        : ( -( ( 32 - (x) ) & -64 ) ) )
-
-
-FT_END_HEADER
-
-#endif /* __FTCALC_H__ */
-
-
-/* END */

gpac-2.2.1.tar.gz/extra_lib/include/freetype/freetype/internal/ftcore.h Deleted

@@ -1,185 +0,0 @@
-#ifndef __FT_CORE_H__
-#define __FT_CORE_H__
-
-#include <ft2build.h>
-#include FT_TYPES_H
-#include FT_SYSTEM_MEMORY_H
-
-FT_BEGIN_HEADER
-
- /**************************************************************************/
- /**************************************************************************/
- /*****                                                                *****/
- /*****                  C L E A N U P   S T A C K                     *****/
- /*****                                                                *****/
- /**************************************************************************/
- /**************************************************************************/
-
-
- /************************************************************************
-  *
-  * @functype: FT_CleanupFunc
-  *
-  * @description:
-  *   a function used to cleanup a given item on the cleanup stack
-  *
-  * @input:
-  *   item      :: target item pointer
-  *   item_data :: optional argument to cleanup routine
-  */
-  typedef void  (*FT_CleanupFunc)( FT_Pointer  item,
-                                   FT_Pointer  item_data );
-
-
-
- /************************************************************************
-  *
-  * @type: FT_XHandler
-  *
-  * @description:
-  *   handle to an exception-handler structure for the FreeType
-  *   exception sub-system
-  *
-  * @note:
-  *   exception handlers are allocated on the stack within a
-  *   @FT_XTRY macro. Do not try to access them directly.
-  */
-  typedef struct FT_XHandlerRec_*  FT_XHandler;
-
-
-/* the size of a cleanup chunk in bytes is FT_CLEANUP_CHUNK_SIZE*12 + 4 */
-/* this must be a small power of 2 whenever possible..                  */
-/*                                                                      */
-/* with a value of 5, we have a byte size of 64 bytes per chunk..       */
-/*                                                                      */
-#define  FT_CLEANUP_CHUNK_SIZE   5
-
-
-
-  typedef struct FT_CleanupItemRec_
-  {
-    FT_Pointer      item;
-    FT_CleanupFunc  item_func;
-    FT_Pointer      item_data;
-
-  } FT_CleanupItemRec;
-
-
-  typedef struct FT_CleanupChunkRec_*   FT_CleanupChunk;
-
-  typedef struct FT_CleanupChunkRec_
-  {
-    FT_CleanupChunk    link;
-    FT_CleanupItemRec  items FT_CLEANUP_CHUNK_SIZE ;
-
-  } FT_CleanupChunkRec;
-
-
-  typedef struct FT_CleanupStackRec_
-  {
-    FT_CleanupItem     top;
-    FT_CleanupItem     limit;
-    FT_CleanupChunk    chunk;
-    FT_CleanupChunkRec chunk_0;  /* avoids stupid dynamic allocation */
-    FT_Memory          memory;
-
-  } FT_CleanupStackRec, *FT_CleanupStack;
-
-
-  FT_BASE( void )
-  ft_cleanup_stack_push( FT_CleanupStack  stack,
-                         FT_Pointer       item,
-                         FT_CleanupFunc   item_func,
-                         FT_Pointer       item_data );
-
-  FT_BASE( void )
-  ft_cleanup_stack_pop( FT_CleanupStack   stack,
-                        FT_Int            destroy );
-
-  FT_BASE( FT_CleanupItem )
-  ft_cleanup_stack_peek( FT_CleanupStack  stack );
-
-  FT_BASE( void )
-  ft_cleanup_throw( FT_CleanupStack  stack,
-                    FT_Error         error );
-
-
-
- /**************************************************************************/
- /**************************************************************************/
- /*****                                                                *****/
- /*****                 M E M O R Y   M A N A G E R                    *****/
- /*****                                                                *****/
- /**************************************************************************/
- /**************************************************************************/
-
-  typedef struct FT_MemoryRec_
-  {
-    FT_Memory_AllocFunc     mem_alloc;   /* shortcut to funcs->mem_alloc */
-    FT_Memory_FreeFunc      mem_free;    /* shortcut to funcs->mem_free  */
-    FT_Pointer              mem_data;
-    const FT_Memory_Funcs   mem_funcs;
-
-    FT_CleanupStackRec      cleanup_stack;
-    FT_Pointer              meta_class;
-
-  } FT_MemoryRec;
-
-
-#define  FT_MEMORY(x)  ((FT_Memory)(x))
-#define  FT_MEMORY__ALLOC(x)       FT_MEMORY(x)->mem_alloc
-#define  FT_MEMORY__FREE(x)        FT_MEMORY(x)->mem_free
-#define  FT_MEMORY__REALLOC(x)     FT_MEMORY(x)->mem_funcs->mem_realloc
-#define  FT_MEMORY__CLEANUP(x)     (&FT_MEMORY(x)->cleanup_stack)
-#define  FT_MEMORY__META_CLASS(x)  ((FT_MetaClass)(FT_MEMORY(x)->meta_class))
-
-
- /**************************************************************************/
- /**************************************************************************/
- /*****                                                                *****/
- /*****             E X C E P T I O N   H A N D L I N G                *****/
- /*****                                                                *****/
- /**************************************************************************/
- /**************************************************************************/
-
-
- /************************************************************************
-  *
-  * @struct: FT_XHandlerRec
-  *
-  * @description:
-  *   exception handler structure
-  *
-  * @fields:
-  *   previous   :: previous handler in chain.
-  *   jum_buffer :: processor state used by setjmp/longjmp to implement
-  *                 exception control transfer
-  *   error      :: exception error code
-  *   mark       :: top of cleanup stack when @FT_XTRY is used
-  */
-  typedef struct FT_XHandlerRec_
-  {
-    FT_XHandler        previous;
-    ft_jmp_buf         jump_buffer;
-    volatile FT_Error  error;
-    FT_Pointer         mark;
-
-  } FT_XHandlerRec;
-
-  FT_BASE( void )
-  ft_xhandler_enter( FT_XHandler  xhandler,
-                     FT_Memory    memory );
-
-  FT_BASE( void )
-  ft_xhandler_exit( FT_XHandler  xhandler );
-
-
-
-
-
-
-
-
-FT_END_HEADER
-
-#endif /* __FT_CORE_H__ */

gpac-2.2.1.tar.gz/extra_lib/include/freetype/freetype/internal/ftdebug.h Deleted

@@ -1,196 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  ftdebug.h                                                              */
-/*                                                                         */
-/*    Debugging and logging component (specification).                     */
-/*                                                                         */
-/*  Copyright 1996-2001, 2002 by                                           */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/*                                                                         */
-/*  IMPORTANT: A description of FreeType's debugging support can be        */
-/*             found in "docs/DEBUG.TXT".  Read it if you need to use or   */
-/*             understand this code.                                       */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef __FTDEBUG_H__
-#define __FTDEBUG_H__
-
-
-#include <ft2build.h>
-#include FT_CONFIG_CONFIG_H
-
-
-FT_BEGIN_HEADER
-
-
-  /* force the definition of FT_DEBUG_LEVEL_ERROR if FT_DEBUG_LEVEL_TRACE */
-  /* is already defined; this simplifies the following #ifdefs            */
-  /*                                                                      */
-#ifdef FT_DEBUG_LEVEL_TRACE
-#undef  FT_DEBUG_LEVEL_ERROR
-#define FT_DEBUG_LEVEL_ERROR
-#endif
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* Define the trace enums as well as the trace levels array when they    */
-  /* are needed.                                                           */
-  /*                                                                       */
-  /*************************************************************************/
-
-#ifdef FT_DEBUG_LEVEL_TRACE
-
-#define FT_TRACE_DEF( x )  trace_ ## x ,
-
-  /* defining the enumeration */
-  typedef enum
-  {
-#include FT_INTERNAL_TRACE_H
-    trace_count
-
-  } FT_Trace;
-
-
-  /* defining the array of trace levels, provided by `src/base/ftdebug.c' */
-  extern int  ft_trace_levelstrace_count;
-
-#undef FT_TRACE_DEF
-
-#endif /* FT_DEBUG_LEVEL_TRACE */
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* Define the FT_TRACE macro                                             */
-  /*                                                                       */
-  /* IMPORTANT!                                                            */
-  /*                                                                       */
-  /* Each component must define the macro FT_COMPONENT to a valid FT_Trace */
-  /* value before using any TRACE macro.                                   */
-  /*                                                                       */
-  /*************************************************************************/
-
-#ifdef FT_DEBUG_LEVEL_TRACE
-
-#define FT_TRACE( level, varformat )                      \
-          do                                              \
-          {                                               \
-            if ( ft_trace_levelsFT_COMPONENT >= level ) \
-              FT_Message varformat;                       \
-          } while ( 0 )
-
-#else /* !FT_DEBUG_LEVEL_TRACE */
-
-#define FT_TRACE( level, varformat )  do ; while ( 0 )      /* nothing */
-
-#endif /* !FT_DEBUG_LEVEL_TRACE */
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* You need two opening resp. closing parentheses!                       */
-  /*                                                                       */
-  /* Example: FT_TRACE0(( "Value is %i", foo ))                            */
-  /*                                                                       */
-  /*************************************************************************/
-
-#define FT_TRACE0( varformat )  FT_TRACE( 0, varformat )
-#define FT_TRACE1( varformat )  FT_TRACE( 1, varformat )
-#define FT_TRACE2( varformat )  FT_TRACE( 2, varformat )
-#define FT_TRACE3( varformat )  FT_TRACE( 3, varformat )
-#define FT_TRACE4( varformat )  FT_TRACE( 4, varformat )
-#define FT_TRACE5( varformat )  FT_TRACE( 5, varformat )
-#define FT_TRACE6( varformat )  FT_TRACE( 6, varformat )
-#define FT_TRACE7( varformat )  FT_TRACE( 7, varformat )
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /*  Define the FT_ERROR macro                                            */
-  /*                                                                       */
-  /*************************************************************************/
-
-#ifdef FT_DEBUG_LEVEL_ERROR
-
-#define FT_ERROR( varformat )  FT_Message  varformat
-
-#else  /* !FT_DEBUG_LEVEL_ERROR */
-
-#define FT_ERROR( varformat )  do ; while ( 0 )      /* nothing */
-
-#endif /* !FT_DEBUG_LEVEL_ERROR */
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* Define the FT_ASSERT macro                                            */
-  /*                                                                       */
-  /*************************************************************************/
-
-#ifdef FT_DEBUG_LEVEL_ERROR
-
-#define FT_ASSERT( condition )                                      \
-          do                                                        \
-          {                                                         \
-            if ( !( condition ) )                                   \
-              FT_Panic( "assertion failed on line %d of file %s\n", \
-                        __LINE__, __FILE__ );                       \
-          } while ( 0 )
-
-#else /* !FT_DEBUG_LEVEL_ERROR */
-
-#define FT_ASSERT( condition )  do ; while ( 0 )
-
-#endif /* !FT_DEBUG_LEVEL_ERROR */
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /*  Define 'FT_Message' and 'FT_Panic' when needed                       */
-  /*                                                                       */
-  /*************************************************************************/
-
-#ifdef FT_DEBUG_LEVEL_ERROR
-
-#include "stdio.h"  /* for vprintf() */
-
-  /* print a message */
-  FT_EXPORT( void )
-  FT_Message( const char*  fmt, ... );
-
-  /* print a message and exit */
-  FT_EXPORT( void )
-  FT_Panic( const char*  fmt, ... );
-
-#endif /* FT_DEBUG_LEVEL_ERROR */
-
-
-  FT_BASE( void )
-  ft_debug_init( void );
-
-
-#if defined( _MSC_VER )      /* Visual C++ (and Intel C++) */
-
-  /* we disable the warning `conditional expression is constant' here */
-  /* in order to compile cleanly with the maximum level of warnings   */
-#pragma warning( disable : 4127 )
-
-#endif /* _MSC_VER */
-
-
-FT_END_HEADER
-
-#endif /* __FTDEBUG_H__ */
-
-
-/* END */

gpac-2.2.1.tar.gz/extra_lib/include/freetype/freetype/internal/ftdriver.h Deleted

@@ -1,202 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  ftdriver.h                                                             */
-/*                                                                         */
-/*    FreeType font driver interface (specification).                      */
-/*                                                                         */
-/*  Copyright 1996-2001, 2002, 2003 by                                     */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef __FTDRIVER_H__
-#define __FTDRIVER_H__
-
-
-#include <ft2build.h>
-#include FT_MODULE_H
-
-
-FT_BEGIN_HEADER
-
-
-  typedef FT_Error
-  (*FT_Face_InitFunc)( FT_Stream      stream,
-                       FT_Face        face,
-                       FT_Int         typeface_index,
-                       FT_Int         num_params,
-                       FT_Parameter*  parameters );
-
-  typedef void
-  (*FT_Face_DoneFunc)( FT_Face  face );
-
-
-  typedef FT_Error
-  (*FT_Size_InitFunc)( FT_Size  size );
-
-  typedef void
-  (*FT_Size_DoneFunc)( FT_Size  size );
-
-
-  typedef FT_Error
-  (*FT_Slot_InitFunc)( FT_GlyphSlot  slot );
-
-  typedef void
-  (*FT_Slot_DoneFunc)( FT_GlyphSlot  slot );
-
-
-  typedef FT_Error
-  (*FT_Size_ResetPointsFunc)( FT_Size     size,
-                              FT_F26Dot6  char_width,
-                              FT_F26Dot6  char_height,
-                              FT_UInt     horz_resolution,
-                              FT_UInt     vert_resolution );
-
-  typedef FT_Error
-  (*FT_Size_ResetPixelsFunc)( FT_Size  size,
-                              FT_UInt  pixel_width,
-                              FT_UInt  pixel_height );
-
-  typedef FT_Error
-  (*FT_Slot_LoadFunc)( FT_GlyphSlot  slot,
-                       FT_Size       size,
-                       FT_UInt       glyph_index,
-                       FT_Int32      load_flags );
-
-
-  typedef FT_UInt
-  (*FT_CharMap_CharIndexFunc)( FT_CharMap  charmap,
-                               FT_Long     charcode );
-
-  typedef FT_Long
-  (*FT_CharMap_CharNextFunc)( FT_CharMap  charmap,
-                              FT_Long     charcode );
-
-  typedef FT_Error
-  (*FT_Face_GetKerningFunc)( FT_Face     face,
-                             FT_UInt     left_glyph,
-                             FT_UInt     right_glyph,
-                             FT_Vector*  kerning );
-
-
-  typedef FT_Error
-  (*FT_Face_AttachFunc)( FT_Face    face,
-                         FT_Stream  stream );
-
-
-  typedef FT_Error
-  (*FT_Face_GetAdvancesFunc)( FT_Face     face,
-                              FT_UInt     first,
-                              FT_UInt     count,
-                              FT_Bool     vertical,
-                              FT_UShort*  advances );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    FT_Driver_ClassRec                                                 */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    The font driver class.  This structure mostly contains pointers to */
-  /*    driver methods.                                                    */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    root             :: The parent module.                             */
-  /*                                                                       */
-  /*    face_object_size :: The size of a face object in bytes.            */
-  /*                                                                       */
-  /*    size_object_size :: The size of a size object in bytes.            */
-  /*                                                                       */
-  /*    slot_object_size :: The size of a glyph object in bytes.           */
-  /*                                                                       */
-  /*    init_face        :: The format-specific face constructor.          */
-  /*                                                                       */
-  /*    done_face        :: The format-specific face destructor.           */
-  /*                                                                       */
-  /*    init_size        :: The format-specific size constructor.          */
-  /*                                                                       */
-  /*    done_size        :: The format-specific size destructor.           */
-  /*                                                                       */
-  /*    init_slot        :: The format-specific slot constructor.          */
-  /*                                                                       */
-  /*    done_slot        :: The format-specific slot destructor.           */
-  /*                                                                       */
-  /*    set_char_sizes   :: A handle to a function used to set the new     */
-  /*                        character size in points + resolution.  Can be */
-  /*                        set to 0 to indicate default behaviour.        */
-  /*                                                                       */
-  /*    set_pixel_sizes  :: A handle to a function used to set the new     */
-  /*                        character size in pixels.  Can be set to 0 to  */
-  /*                        indicate default behaviour.                    */
-  /*                                                                       */
-  /*    load_glyph       :: A function handle to load a given glyph image  */
-  /*                        in a slot.  This field is mandatory!           */
-  /*                                                                       */
-  /*    get_char_index   :: A function handle to return the glyph index of */
-  /*                        a given character for a given charmap.  This   */
-  /*                        field is mandatory!                            */
-  /*                                                                       */
-  /*    get_kerning      :: A function handle to return the unscaled       */
-  /*                        kerning for a given pair of glyphs.  Can be    */
-  /*                        set to 0 if the format doesn't support         */
-  /*                        kerning.                                       */
-  /*                                                                       */
-  /*    attach_file      :: This function handle is used to read           */
-  /*                        additional data for a face from another        */
-  /*                        file/stream.  For example, this can be used to */
-  /*                        add data from AFM or PFM files on a Type 1     */
-  /*                        face, or a CIDMap on a CID-keyed face.         */
-  /*                                                                       */
-  /*    get_advances     :: A function handle used to return the advances  */
-  /*                        of 'count' glyphs, starting at `index'.  the   */
-  /*                        `vertical' flags must be set when vertical     */
-  /*                        advances are queried.  The advances buffer is  */
-  /*                        caller-allocated.                              */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    Most function pointers, with the exception of `load_glyph' and     */
-  /*    `get_char_index' can be set to 0 to indicate a default behaviour.  */
-  /*                                                                       */
-  typedef struct  FT_Driver_ClassRec_
-  {
-    FT_Module_Class           root;
-
-    FT_Long                   face_object_size;
-    FT_Long                   size_object_size;
-    FT_Long                   slot_object_size;
-
-    FT_Face_InitFunc          init_face;
-    FT_Face_DoneFunc          done_face;
-
-    FT_Size_InitFunc          init_size;
-    FT_Size_DoneFunc          done_size;
-
-    FT_Slot_InitFunc          init_slot;
-    FT_Slot_DoneFunc          done_slot;
-
-    FT_Size_ResetPointsFunc   set_char_sizes;
-    FT_Size_ResetPixelsFunc   set_pixel_sizes;
-
-    FT_Slot_LoadFunc          load_glyph;
-
-    FT_Face_GetKerningFunc    get_kerning;
-    FT_Face_AttachFunc        attach_file;
-    FT_Face_GetAdvancesFunc   get_advances;
-
-  } FT_Driver_ClassRec, *FT_Driver_Class;
-
-
-FT_END_HEADER
-
-#endif /* __FTDRIVER_H__ */
-
-
-/* END */

gpac-2.2.1.tar.gz/extra_lib/include/freetype/freetype/internal/ftexcept.h Deleted

@@ -1,79 +0,0 @@
-#ifndef __FT_EXCEPT_H__
-#define __FT_EXCEPT_H__
-
-#include <ft2build.h>
-#include FT_INTERNAL_OBJECTS_H
-
-FT_BEGIN_HEADER
-
-
-
- /* I can't find a better place for this for now */
-
-
-/* the size of a cleanup chunk in bytes is FT_CLEANUP_CHUNK_SIZE*12 + 4 */
-/* this must be a small power of 2 whenever possible..                  */
-/*                                                                      */
-/* with a value of 5, we have a byte size of 64 bytes per chunk..       */
-/*                                                                      */
-#define  FT_CLEANUP_CHUNK_SIZE   5
-
-
-
-  typedef struct FT_CleanupItemRec_
-  {
-    FT_Pointer      item;
-    FT_CleanupFunc  item_func;
-    FT_Pointer      item_data;
-
-  } FT_CleanupItemRec;
-
-  typedef struct FT_CleanupChunkRec_*   FT_CleanupChunk;
-  
-  typedef struct FT_CleanupChunkRec_
-  {
-    FT_CleanupChunk    link;
-    FT_CleanupItemRec  items FT_CLEANUP_CHUNK_SIZE ;
-
-  } FT_CleanupChunkRec;
-
-
-  typedef struct FT_CleanupStackRec_
-  {
-    FT_CleanupItem     top;
-    FT_CleanupItem     limit;
-    FT_CleanupChunk    chunk;
-    FT_CleanupChunkRec chunk_0;  /* avoids stupid dynamic allocation */
-    FT_Memory          memory;
-
-  } FT_CleanupStackRec, *FT_CleanupStack;
-
-
-  FT_BASE( void )
-  ft_cleanup_stack_push( FT_CleanupStack  stack,
-                         FT_Pointer       item,
-                         FT_CleanupFunc   item_func,
-                         FT_Pointer       item_data );
-
-  FT_BASE( void )
-  ft_cleanup_stack_pop( FT_CleanupStack   stack,
-                        FT_Int            destroy );
-
-  FT_BASE( FT_CleanupItem )
-  ft_cleanup_stack_peek( FT_CleanupStack  stack );
-
-  FT_BASE( void )
-  ft_xhandler_enter( FT_XHandler  xhandler,
-                     FT_Memory    memory );                         
-
-  FT_BASE( void )
-  ft_xhandler_exit( FT_XHandler  xhandler );
-
-
-  FT_BASE( void )
-  ft_cleanup_throw( FT_CleanupStack  stack,
-                    FT_Error         error );
-
-FT_END_HEADER
-
-#endif /* __FT_EXCEPT_H__ */

gpac-2.2.1.tar.gz/extra_lib/include/freetype/freetype/internal/ftgloadr.h Deleted

@@ -1,147 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  ftgloadr.h                                                             */
-/*                                                                         */
-/*    The FreeType glyph loader (specification).                           */
-/*                                                                         */
-/*  Copyright 2002, 2003 by                                                */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg                       */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef __FTGLOADR_H__
-#define __FTGLOADR_H__
-
-
-#include <ft2build.h>
-#include FT_FREETYPE_H
-
-
-FT_BEGIN_HEADER
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    FT_GlyphLoader                                                     */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    The glyph loader is an internal object used to load several glyphs */
-  /*    together (for example, in the case of composites).                 */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    The glyph loader implementation is not part of the high-level API, */
-  /*    hence the forward structure declaration.                           */
-  /*                                                                       */
-  typedef struct FT_GlyphLoaderRec_*  FT_GlyphLoader ;
-
-
-#define FT_SUBGLYPH_FLAG_ARGS_ARE_WORDS          1
-#define FT_SUBGLYPH_FLAG_ARGS_ARE_XY_VALUES      2
-#define FT_SUBGLYPH_FLAG_ROUND_XY_TO_GRID        4
-#define FT_SUBGLYPH_FLAG_SCALE                   8
-#define FT_SUBGLYPH_FLAG_XY_SCALE             0x40
-#define FT_SUBGLYPH_FLAG_2X2                  0x80
-#define FT_SUBGLYPH_FLAG_USE_MY_METRICS      0x200
-
-
-  typedef struct  FT_SubGlyphRec_
-  {
-    FT_Int     index;
-    FT_UShort  flags;
-    FT_Int     arg1;
-    FT_Int     arg2;
-    FT_Matrix  transform;
-    
-  } FT_SubGlyphRec;
-
-
-  typedef struct  FT_GlyphLoadRec_
-  {
-    FT_Outline   outline;       /* outline             */
-    FT_Vector*   extra_points;  /* extra points table  */
-    FT_UInt      num_subglyphs; /* number of subglyphs */
-    FT_SubGlyph  subglyphs;     /* subglyphs           */
-
-  } FT_GlyphLoadRec, *FT_GlyphLoad;
-
-
-  typedef struct  FT_GlyphLoaderRec_
-  {
-    FT_Memory        memory;
-    FT_UInt          max_points;
-    FT_UInt          max_contours;
-    FT_UInt          max_subglyphs;
-    FT_Bool          use_extra;
-
-    FT_GlyphLoadRec  base;
-    FT_GlyphLoadRec  current;
-
-    void*            other;            /* for possible future extension? */
-
-  } FT_GlyphLoaderRec;
-
-
-  /* create new empty glyph loader */
-  FT_BASE( FT_Error )
-  FT_GlyphLoader_New( FT_Memory        memory,
-                      FT_GlyphLoader  *aloader );
-
-  /* add an extra points table to a glyph loader */
-  FT_BASE( FT_Error )
-  FT_GlyphLoader_CreateExtra( FT_GlyphLoader  loader );
-
-  /* destroy a glyph loader */
-  FT_BASE( void )
-  FT_GlyphLoader_Done( FT_GlyphLoader  loader );
-
-  /* reset a glyph loader (frees everything int it) */
-  FT_BASE( void )
-  FT_GlyphLoader_Reset( FT_GlyphLoader  loader );
-
-  /* rewind a glyph loader */
-  FT_BASE( void )
-  FT_GlyphLoader_Rewind( FT_GlyphLoader  loader );
-
-  /* check that there is enough room to add 'n_points' and 'n_contours' */
-  /* to the glyph loader                                                */
-  FT_BASE( FT_Error )
-  FT_GlyphLoader_CheckPoints( FT_GlyphLoader  loader,
-                              FT_UInt         n_points,
-                              FT_UInt         n_contours );
-
-  /* check that there is enough room to add 'n_subs' sub-glyphs to */
-  /* a glyph loader                                                */
-  FT_BASE( FT_Error )
-  FT_GlyphLoader_CheckSubGlyphs( FT_GlyphLoader  loader,
-                                 FT_UInt         n_subs );
-
-  /* prepare a glyph loader, i.e. empty the current glyph */
-  FT_BASE( void )
-  FT_GlyphLoader_Prepare( FT_GlyphLoader  loader );
-
-  /* add the current glyph to the base glyph */
-  FT_BASE( void )
-  FT_GlyphLoader_Add( FT_GlyphLoader  loader );
-
-  /* copy points from one glyph loader to another */
-  FT_BASE( FT_Error )
-  FT_GlyphLoader_CopyPoints( FT_GlyphLoader  target,
-                             FT_GlyphLoader  source );
-
- /* */
-
-
-FT_END_HEADER
-
-#endif /* __FTGLOADR_H__ */
-
-
-/* END */

gpac-2.2.1.tar.gz/extra_lib/include/freetype/freetype/internal/fthash.h Deleted

@@ -1,502 +0,0 @@
-/******************************************************************
- *
- *  fthash.h  - fast dynamic hash tables
- *
- *  Copyright 2002 by
- *  David Turner, Robert Wilhelm, and Werner Lemberg
- *
- *  This file is part of the FreeType project, and may only be used,
- *  modified, and distributed under the terms of the FreeType project
- *  license, LICENSE.TXT.  By continuing to use, modify, or distribute
- *  this file you indicate that you have read the license and
- *  understand and accept it fully.
- *
- *
- *  This header is used to define dynamic hash tables as described
- *  by the article "Main-Memory Linear Hashing - Some Enhancements
- *  of Larson's Algorithm" by Mikael Petterson.
- *
- *  Basically, linear hashing prevents big "stalls" during
- *  resizes of the buckets array by only splitting one bucket
- *  at a time. This ensures excellent response time even when
- *  the table is frequently resized..
- *
- *
- *  Note that the use of the FT_Hash type is rather unusual in order
- *  to be as generic and efficient as possible. See the comments in the
- *  following definitions for more details.
- */
-
-#ifndef __FT_HASH_H__
-#define __FT_HASH_H__
-
-#include <ft2build.h>
-#include FT_TYPES_H
-
-FT_BEGIN_HEADER
-
- /***********************************************************
-  *
-  * @type: FT_Hash
-  *
-  * @description:
-  *   handle to a @FT_HashRec structure used to model a
-  *   dynamic hash table
-  */
-  typedef struct FT_HashRec_*      FT_Hash;
-
-
- /***********************************************************
-  *
-  * @type: FT_HashNode
-  *
-  * @description:
-  *   handle to a @FT_HashNodeRec structure used to model a
-  *   single node of a hash table
-  */
-  typedef struct FT_HashNodeRec_*  FT_HashNode;
-
-
- /***********************************************************
-  *
-  * @type: FT_HashLookup
-  *
-  * @description:
-  *   handle to a @FT_HashNode pointer. This is returned by
-  *   the @ft_hash_lookup function and can later be used by
-  *   @ft_hash_add or @ft_hash_remove
-  */
-  typedef FT_HashNode*     FT_HashLookup;
-
-
- /***********************************************************
-  *
-  * @type: FT_Hash_EqualFunc
-  *
-  * @description:
-  *   a function used to compare two nodes of the hash table
-  *
-  * @input:
-  *   node1 :: handle to first node
-  *   node2 :: handle to second node
-  *
-  * @return:
-  *   1 iff the 'keys' in 'node1' and 'node2' are identical.
-  *   0 otherwise.
-  */
-  typedef FT_Int  (*FT_Hash_EqualFunc)( FT_HashNode  node1,
-                                        FT_HashNode  node2 );
-
-
- /***********************************************************
-  *
-  * @struct: FT_HashRec
-  *
-  * @description:
-  *   a structure used to model a dynamic hash table.
-  *
-  * @fields:
-  *   memory       :: memory manager used to allocate
-  *                   the buckets array and the hash nodes
-  *
-  *   buckets      :: array of hash buckets
-  *
-  *   node_size    :: size of node in bytes
-  *   node_compare :: a function used to compare two nodes
-  *   node_hash    :: a function used to compute the hash
-  *                   value of a given node
-  *   p            ::
-  *   mask         ::
-  *   slack        ::
-  *
-  * @note:
-  *   'p', 'mask' and 'slack' are control values managed by
-  *   the hash table. Do not try to interpret them directly.
-  *
-  *   You can grab the hash table size by calling
-  *   '@ft_hash_get_size'.
-  */
-  typedef struct FT_HashRec_
-  {
-    FT_HashNode*         buckets;
-    FT_UInt              p;
-    FT_UInt              mask;  /* really maxp-1 */
-    FT_Long              slack;
-    FT_Hash_EqualFunc    node_equal;
-    FT_Memory            memory;
-
-  } FT_HashRec;
-
-
- /***********************************************************
-  *
-  * @struct: FT_HashNodeRec
-  *
-  * @description:
-  *   a structure used to model the root fields of a dynamic
-  *   hash table node.
-  *
-  *   it's up to client applications to "sub-class" this
-  *   structure to add relevant (key,value) definitions
-  *
-  * @fields:
-  *   link :: pointer to next node in bucket's collision list
-  *   hash :: 32-bit hash value for this node
-  *
-  * @note:
-  *   it's up to client applications to "sub-class" this structure
-  *   to add relevant (key,value) type definitions. For example,
-  *   if we want to build a "string -> int" mapping, we could use
-  *   something like:
-  *
-  *   {
-  *     typedef struct MyNodeRec_
-  *     {
-  *       FT_HashNodeRec  hnode;
-  *       const char*     key;
-  *       int             value;
-  *
-  *     } MyNodeRec, *MyNode;
-  *   }
-  *
-  */
-  typedef struct FT_HashNodeRec_
-  {
-    FT_HashNode  link;
-    FT_UInt32    hash;
-
-  } FT_HashNodeRec;
-
-
- /****************************************************************
-  *
-  * @function: ft_hash_init
-  *
-  * @description:
-  *   initialize a dynamic hash table
-  *
-  * @input:
-  *   table      :: handle to target hash table structure
-  *   node_equal :: node comparison function
-  *   memory     :: memory manager handle used to allocate the
-  *                 buckets array within the hash table
-  *
-  * @return:
-  *   error code. 0 means success
-  *
-  * @note:
-  *   the node comparison function should only compare node _keys_
-  *   and ignore values !! with good hashing computation (which the
-  *   user must perform itself), the comparison function should be
-  *   pretty seldom called.
-  *
-  *   here is a simple example:
-  *
-  *   {
-  *     static int my_equal( MyNode  node1,
-  *                          MyNode  node2 )
-  *     {
-  *       // compare keys of 'node1' and 'node2'
-  *       return (strcmp( node1->key, node2->key ) == 0);
-  *     }
-  *
-  *     ....
-  *
-  *     ft_hash_init( &hash, (FT_Hash_EqualFunc) my_compare, memory );
-  *     ....
-  *   }
-  */
-  FT_BASE( FT_Error )
-  ft_hash_init( FT_Hash              table,
-                FT_Hash_EqualFunc  compare,
-                FT_Memory            memory );
-
-
- /****************************************************************
-  *
-  * @function: ft_hash_lookup
-  *
-  * @description:
-  *   search a hash table to find a node corresponding to a given
-  *   key.
-  *
-  * @input:
-  *   table   :: handle to target hash table structure
-  *   keynode :: handle to a reference hash node that will be
-  *              only used for key comparisons with the table's
-  *              elements
-  *
-  * @return:
-  *   a pointer-to-hash-node value, which must be used as followed:
-  *
-  *   - if '*result' is NULL, the key wasn't found in the hash
-  *     table. The value of 'result' can be used to add new elements
-  *     through @ft_hash_add however..
-  *
-  *   - if '*result' is not NULL, it's a handle to the first table
-  *     node that corresponds to the search key. The value of 'result'
-  *     can be used to remove this element through @ft_hash_remove
-  *
-  * @note:
-  *   here is an example:
-  *
-  *   {
-  *     // maps a string to an integer with a hash table
-  *     // returns -1 in case of failure
-  *     //
-  *     int  my_lookup( FT_Hash      table,
-  *                     const char*  key )
-  *     {
-  *       MyNode*    pnode;
-  *       MyNodeRec  noderec;
-  *
-  *       // set-up key node. It's 'hash' and 'key' fields must
-  *       // be set correctly.. we ignore 'link' and 'value'
-  *       //
-  *       noderec.hnode.hash = strhash( key );
-  *       noderec.key        = key;
-  *
-  *       // perform search - return value
-  *       //
-  *       pnode = (MyNode) ft_hash_lookup( table, &noderec );
-  *       if ( *pnode )
-  *       {
-  *         // we found it
-  *         return (*pnode)->value;
-  *       }
-  *       return -1;
-  *     }
-  *   }
-  */
-  FT_BASE_DEF( FT_HashLookup )
-  ft_hash_lookup( FT_Hash      table,
-                  FT_HashNode  keynode );
-
-
- /****************************************************************
-  *
-  * @function: ft_hash_add
-  *
-  * @description:
-  *   add a new node to a dynamic hash table. the user must
-  *   call @ft_hash_lookup and allocate a new node before calling
-  *   this function.
-  *
-  * @input:
-  *   table    :: hash table handle
-  *   lookup   :: pointer-to-hash-node value returned by @ft_hash_lookup
-  *   new_node :: handle to new hash node. All its fields must be correctly
-  *               set, including 'hash'.
-  *
-  * @return:
-  *   error code. 0 means success
-  *
-  * @note:
-  *   this function should always be used _after_ a call to @ft_hash_lookup
-  *   that returns a pointer to a NULL  handle. Here's an example:
-  *
-  *   {
-  *     // sets the value corresponding to a given string key
-  *     //
-  *     void  my_set( FT_Hash      table,
-  *                   const char*  key,
-  *                   int          value )
-  *     {
-  *       MyNode*    pnode;
-  *       MyNodeRec  noderec;
-  *       MyNode     node;
-  *
-  *       // set-up key node. It's 'hash' and 'key' fields must
-  *       // be set correctly..
-  *       noderec.hnode.hash = strhash( key );
-  *       noderec.key        = key;
-  *
-  *       // perform search - return value
-  *       pnode = (MyNode) ft_hash_lookup( table, &noderec );
-  *       if ( *pnode )
-  *       {
-  *         // we found it, simply replace the value in the node
-  *         (*pnode)->value = value;
-  *         return;
-  *       }
-  *
-  *       // allocate a new node - and set it up
-  *       node = (MyNode) malloc( sizeof(*node) );
-  *       if ( node == NULL ) .....
-  *
-  *       node->hnode.hash = noderec.hnode.hash;
-  *       node->key        = key;
-  *       node->value      = value;
-  *
-  *       // add it to the hash table
-  *       error = ft_hash_add( table, pnode, node );
-  *       if (error) ....
-  *     }
-  */
-  FT_BASE( FT_Error )
-  ft_hash_add( FT_Hash        table,
-               FT_HashLookup  lookup,
-               FT_HashNode    new_node );
-
-
- /****************************************************************
-  *
-  * @function: ft_hash_remove
-  *
-  * @description:
-  *   try to remove the node corresponding to a given key from
-  *   a hash table. This must be called after @ft_hash_lookup
-  *
-  * @input:
-  *   table   :: hash table handle
-  *   lookup  :: pointer-to-hash-node value returned by @ft_hash_lookup
-  *
-  * @note:
-  *   this function doesn't free the node itself !! Here's an example:
-  *
-  *   {
-  *     // sets the value corresponding to a given string key
-  *     //
-  *     void  my_remove( FT_Hash      table,
-  *                      const char*  key )
-  *     {
-  *       MyNodeRec  noderec;
-  *       MyNode     node;
-  *
-  *       noderec.hnode.hash = strhash(key);
-  *       noderec.key        = key;
-  *       node               = &noderec;
-  *
-  *       pnode = ft_hash_lookup( table, &noderec );
-  *       node  = *pnode;
-  *       if ( node != NULL )
-  *       {
-  *         error = ft_hash_remove( table, pnode );
-  *         if ( !error )
-  *           free( node );
-  *       }
-  *     }
-  *   }
-  */
-  FT_BASE( FT_Error )
-  ft_hash_remove( FT_Hash        table,
-                  FT_HashLookup  lookup );
-
-
-
- /****************************************************************
-  *
-  * @function: ft_hash_get_size
-  *
-  * @description:
-  *   return the number of elements in a given hash table
-  *
-  * @input:
-  *   table   :: handle to target hash table structure
-  *
-  * @return:
-  *   number of elements. 0 if empty
-  */
-  FT_BASE( FT_UInt )
-  ft_hash_get_size( FT_Hash  table );
-
-
-
- /****************************************************************
-  *
-  * @functype: FT_Hash_ForeachFunc
-  *
-  * @description:
-  *   a function used to iterate over all elements of a given
-  *   hash table
-  *
-  * @input:
-  *   node :: handle to target @FT_HashNodeRec node structure
-  *   data :: optional argument to iteration routine
-  *
-  * @also:  @ft_hash_foreach
-  */
-  typedef void  (*FT_Hash_ForeachFunc)( const FT_HashNode  node,
-                                        const FT_Pointer   data );
-
-
- /****************************************************************
-  *
-  * @function: ft_hash_foreach
-  *
-  * @description:
-  *   parse over all elements in a hash table
-  *
-  * @input:
-  *   table        :: handle to target hash table structure
-  *   foreach_func :: iteration routine called for each element
-  *   foreach_data :: optional argument to the iteration routine
-  *
-  * @note:
-  *   this function is often used to release all elements from a
-  *   hash table. See the example given for @ft_hash_done
-  */
-  FT_BASE( void )
-  ft_hash_foreach( FT_Hash              table,
-                   FT_Hash_ForeachFunc  foreach_func,
-                   const FT_Pointer     foreach_data );
-
-
-
- /****************************************************************
-  *
-  * @function: ft_hash_done
-  *
-  * @description:
-  *   finalize a given hash table
-  *
-  * @input:
-  *   table     :: handle to target hash table structure
-  *   node_func :: optional iteration function pointer. this
-  *                can be used to destroy all nodes explicitely
-  *   node_data :: optional argument to the node iterator
-  *
-  * @note:
-  *   this function simply frees the hash table's buckets.
-  *   you probably will need to call @ft_hash_foreach to
-  *   destroy all its elements before @ft_hash_done, as in
-  *   the following example:
-  *
-  *   {
-  *     static void  my_node_clear( const MyNode  node )
-  *     {
-  *       free( node );
-  *     }
-  *
-  *     static void  my_done( FT_Hash  table )
-  *     {
-  *       ft_hash_done( table, (FT_Hash_ForeachFunc) my_node_clear, NULL );
-  *     }
-  *   }
-  */
-  FT_BASE( void )
-  ft_hash_done( FT_Hash              table,
-                FT_Hash_ForeachFunc  item_func,
-                const FT_Pointer     item_data );
-
- /* */
-
- /* compute bucket index from hash value in a dynamic hash table */
- /* this is only used to break encapsulation to speed lookups in */
- /* the FreeType cache manager !!                                */
- /*                                                              */
-
-#define  FT_HASH_COMPUTE_INDEX(_table,_hash,_index)                  \
-             {                                                       \
-               FT_UInt  _mask  = (_table)->mask;                     \
-               FT_UInt  _hash0 = (_hash);                            \
-                                                                     \
-               (_index) = (FT_UInt)( (_hash0) & _mask ) );           \
-               if ( (_index) < (_table)->p )                         \
-                 (_index) = (FT_uInt)( (_hash0) & ( 2*_mask+1 ) );   \
-             }
-
-
-FT_END_HEADER
-
-#endif /* __FT_HASH_H__ */

gpac-2.2.1.tar.gz/extra_lib/include/freetype/freetype/internal/ftmemory.h Deleted

@@ -1,293 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  ftmemory.h                                                             */
-/*                                                                         */
-/*    The FreeType memory management macros (specification).               */
-/*                                                                         */
-/*  Copyright 1996-2001, 2002 by                                           */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg                       */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef __FTMEMORY_H__
-#define __FTMEMORY_H__
-
-
-#include <ft2build.h>
-#include FT_CONFIG_CONFIG_H
-#include FT_TYPES_H
-
-
-FT_BEGIN_HEADER
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Macro>                                                               */
-  /*    FT_SET_ERROR                                                       */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    This macro is used to set an implicit `error' variable to a given  */
-  /*    expression's value (usually a function call), and convert it to a  */
-  /*    boolean which is set whenever the value is != 0.                   */
-  /*                                                                       */
-#undef  FT_SET_ERROR
-#define FT_SET_ERROR( expression ) \
-          ( ( error = (expression) ) != 0 )
-
-
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-  /****                                                                 ****/
-  /****                                                                 ****/
-  /****                           M E M O R Y                           ****/
-  /****                                                                 ****/
-  /****                                                                 ****/
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-
-#ifdef FT_DEBUG_MEMORY
-
-  FT_BASE( FT_Error )
-  FT_Alloc_Debug( FT_Memory    memory,
-                  FT_Long      size,
-                  void*       *P,
-                  const char*  file_name,
-                  FT_Long      line_no );
-
-  FT_BASE( FT_Error )
-  FT_Realloc_Debug( FT_Memory    memory,
-                    FT_Long      current,
-                    FT_Long      size,
-                    void*       *P,
-                    const char*  file_name,
-                    FT_Long      line_no );
-
-  FT_BASE( void )
-  FT_Free_Debug( FT_Memory    memory,
-                 FT_Pointer   block,
-                 const char*  file_name,
-                 FT_Long      line_no );
-
-#endif
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Alloc                                                           */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Allocates a new block of memory.  The returned area is always      */
-  /*    zero-filled; this is a strong convention in many FreeType parts.   */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    memory :: A handle to a given `memory object' which handles        */
-  /*              allocation.                                              */
-  /*                                                                       */
-  /*    size   :: The size in bytes of the block to allocate.              */
-  /*                                                                       */
-  /* <Output>                                                              */
-  /*    P      :: A pointer to the fresh new block.  It should be set to   */
-  /*              NULL if `size' is 0, or in case of error.                */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0 means success.                             */
-  /*                                                                       */
-  FT_BASE( FT_Error )
-  FT_Alloc( FT_Memory  memory,
-            FT_Long    size,
-            void*     *P );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Realloc                                                         */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Reallocates a block of memory pointed to by `*P' to `Size' bytes   */
-  /*    from the heap, possibly changing `*P'.                             */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    memory  :: A handle to a given `memory object' which handles       */
-  /*               reallocation.                                           */
-  /*                                                                       */
-  /*    current :: The current block size in bytes.                        */
-  /*                                                                       */
-  /*    size    :: The new block size in bytes.                            */
-  /*                                                                       */
-  /* <InOut>                                                               */
-  /*    P       :: A pointer to the fresh new block.  It should be set to  */
-  /*               NULL if `size' is 0, or in case of error.               */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0 means success.                             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    All callers of FT_Realloc() _must_ provide the current block size  */
-  /*    as well as the new one.                                            */
-  /*                                                                       */
-  FT_BASE( FT_Error )
-  FT_Realloc( FT_Memory  memory,
-              FT_Long    current,
-              FT_Long    size,
-              void*     *P );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Free                                                            */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Releases a given block of memory allocated through FT_Alloc().     */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    memory :: A handle to a given `memory object' which handles        */
-  /*              memory deallocation                                      */
-  /*                                                                       */
-  /*    P      :: This is the _address_ of a _pointer_ which points to the */
-  /*              allocated block.  It is always set to NULL on exit.      */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    If P or *P is NULL, this function should return successfully.      */
-  /*    This is a strong convention within all of FreeType and its         */
-  /*    drivers.                                                           */
-  /*                                                                       */
-  FT_BASE( void )
-  FT_Free( FT_Memory  memory,
-           void*     *P );
-
-
-#define FT_MEM_SET( dest, byte, count )     ft_memset( dest, byte, count )
-
-#define FT_MEM_COPY( dest, source, count )  ft_memcpy( dest, source, count )
-
-#define FT_MEM_MOVE( dest, source, count )  ft_memmove( dest, source, count )
-
-
-#define FT_MEM_ZERO( dest, count )  FT_MEM_SET( dest, 0, count )
-
-#define FT_ZERO( p )                FT_MEM_ZERO( p, sizeof ( *(p) ) )
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* We first define FT_MEM_ALLOC, FT_MEM_REALLOC, and FT_MEM_FREE.  All   */
-  /* macros use an _implicit_ `memory' parameter to access the current     */
-  /* memory allocator.                                                     */
-  /*                                                                       */
-
-#ifdef FT_DEBUG_MEMORY
-
-#define FT_MEM_ALLOC( _pointer_, _size_ )                            \
-          FT_Alloc_Debug( memory, _size_,                            \
-                          (void**)&(_pointer_), __FILE__, __LINE__ )
-
-#define FT_MEM_REALLOC( _pointer_, _current_, _size_ )                 \
-          FT_Realloc_Debug( memory, _current_, _size_,                 \
-                            (void**)&(_pointer_), __FILE__, __LINE__ )
-
-#define FT_MEM_FREE( _pointer_ )                                            \
-          FT_Free_Debug( memory, (void**)&(_pointer_), __FILE__, __LINE__ )
-
-
-#else  /* !FT_DEBUG_MEMORY */
-
-
-#define FT_MEM_ALLOC( _pointer_, _size_ )                  \
-          FT_Alloc( memory, _size_, (void**)&(_pointer_) )
-
-#define FT_MEM_FREE( _pointer_ )                  \
-          FT_Free( memory, (void**)&(_pointer_) )
-
-#define FT_MEM_REALLOC( _pointer_, _current_, _size_ )                  \
-          FT_Realloc( memory, _current_, _size_, (void**)&(_pointer_) )
-
-
-#endif /* !FT_DEBUG_MEMORY */
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* The following functions macros expect that their pointer argument is  */
-  /* _typed_ in order to automatically compute array element sizes.        */
-  /*                                                                       */
-
-#define FT_MEM_NEW( _pointer_ )                               \
-          FT_MEM_ALLOC( _pointer_, sizeof ( *(_pointer_) ) )
-
-#define FT_MEM_NEW_ARRAY( _pointer_, _count_ )                           \
-          FT_MEM_ALLOC( _pointer_, (_count_) * sizeof ( *(_pointer_) ) )
-
-#define FT_MEM_RENEW_ARRAY( _pointer_, _old_, _new_ )                    \
-          FT_MEM_REALLOC( _pointer_, (_old_) * sizeof ( *(_pointer_) ),  \
-                                     (_new_) * sizeof ( *(_pointer_) ) )
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* the following macros are obsolete but kept for compatibility reasons  */
-  /*                                                                       */
-
-#define FT_MEM_ALLOC_ARRAY( _pointer_, _count_, _type_ )           \
-          FT_MEM_ALLOC( _pointer_, (_count_) * sizeof ( _type_ ) )
-
-#define FT_MEM_REALLOC_ARRAY( _pointer_, _old_, _new_, _type_ )    \
-          FT_MEM_REALLOC( _pointer_, (_old_) * sizeof ( _type ),   \
-                                     (_new_) * sizeof ( _type_ ) )
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* The following macros are variants of their FT_MEM_XXXX equivalents;   */
-  /* they are used to set an _implicit_ `error' variable and return TRUE   */
-  /* if an error occured (i.e. if 'error != 0').                           */
-  /*                                                                       */
-
-#define FT_ALLOC( _pointer_, _size_ )                       \
-          FT_SET_ERROR( FT_MEM_ALLOC( _pointer_, _size_ ) )
-
-#define FT_REALLOC( _pointer_, _current_, _size_ )                       \
-          FT_SET_ERROR( FT_MEM_REALLOC( _pointer_, _current_, _size_ ) )
-
-#define FT_FREE( _pointer_ )       \
-          FT_MEM_FREE( _pointer_ )
-
-#define FT_NEW( _pointer_ )  \
-          FT_SET_ERROR( FT_MEM_NEW( _pointer_ ) )
-
-#define FT_NEW_ARRAY( _pointer_, _count_ )  \
-          FT_SET_ERROR( FT_MEM_NEW_ARRAY( _pointer_, _count_ ) )
-
-#define FT_RENEW_ARRAY( _pointer_, _old_, _new_ )   \
-          FT_SET_ERROR( FT_MEM_RENEW_ARRAY( _pointer_, _old_, _new_ ) )
-
-#define FT_ALLOC_ARRAY( _pointer_, _count_, _type_ )                    \
-          FT_SET_ERROR( FT_MEM_ALLOC( _pointer_,                        \
-                                      (_count_) * sizeof ( _type_ ) ) )
-
-#define FT_REALLOC_ARRAY( _pointer_, _old_, _new_, _type_ )             \
-          FT_SET_ERROR( FT_MEM_REALLOC( _pointer_,                      \
-                                        (_old_) * sizeof ( _type_ ),    \
-                                        (_new_) * sizeof ( _type_ ) ) )
-
- /* */
-
-
-FT_END_HEADER
-
-#endif /* __FTMEMORY_H__ */
-
-
-/* END */

gpac-2.2.1.tar.gz/extra_lib/include/freetype/freetype/internal/ftobject.h Deleted

@@ -1,533 +0,0 @@
-#ifndef __FT_OBJECT_H__
-#define __FT_OBJECT_H__
-
-#include <ft2build.h>
-#include FT_FREETYPE_H
-
-FT_BEGIN_HEADER
-
- /**************************************************************
-  *
-  * @type: FT_Object
-  *
-  * @description:
-  *   handle to a FreeType Object. See @FT_ObjectRec
-  */
-  typedef struct FT_ObjectRec_*        FT_Object;
-
-
- /**************************************************************
-  *
-  * @type: FT_Class
-  *
-  * @description:
-  *   handle to a constant class handle to a FreeType Object.
-  *
-  *   Note that a class is itself a @FT_Object and are dynamically
-  *   allocated on the heap.
-  *
-  * @also:
-  *  @FT_ClassRec, @FT_Object, @FT_ObjectRec, @FT_Type, @FT_TypeRec
-  */
-  typedef const struct FT_ClassRec_*   FT_Class;
-
-
- /**************************************************************
-  *
-  * @type: FT_Type
-  *
-  * @description:
-  *   handle to a constant structure (of type @FT_TypeRec) used
-  *   to describe a given @FT_Class type to the FreeType object
-  *   sub-system.
-  */
-  typedef const struct FT_TypeRec_*    FT_Type;
-
-
-
- /**************************************************************
-  *
-  * @struct: FT_ObjectRec
-  *
-  * @description:
-  *   a structure describing the root fields of all @FT_Object
-  *   class instances in FreeType
-  *
-  * @fields:
-  *   clazz     :: handle to the object's class
-  *   ref_count :: object's reference count. Starts at 1
-  */
-  typedef struct FT_ObjectRec_
-  {
-    FT_Class  clazz;
-    FT_Int    ref_count;
-
-  } FT_ObjectRec;
-
-
- /**************************************************************
-  *
-  * @macro: FT_OBJECT (x)
-  *
-  * @description:
-  *   a useful macro to type-cast anything to a @FT_Object
-  *   handle. No check performed..
-  */
-#define  FT_OBJECT(x)    ((FT_Object)(x))
-
-
- /**************************************************************
-  *
-  * @macro: FT_OBJECT_P (x)
-  *
-  * @description:
-  *   a useful macro to type-cast anything to a pointer to
-  *   @FT_Object handle.
-  */
-#define  FT_OBJECT_P(x)  ((FT_Object*)(x))
-
-
- /**************************************************************
-  *
-  * @macro: FT_OBJECT__CLASS (obj)
-  *
-  * @description:
-  *   a useful macro to return the class of any object
-  */
-#define  FT_OBJECT__CLASS(x)      FT_OBJECT(x)->clazz
-
-
- /**************************************************************
-  *
-  * @macro: FT_OBJECT__REF_COUNT (obj)
-  *
-  * @description:
-  *   a useful macro to return the reference count of any object
-  */
-#define  FT_OBJECT__REF_COUNT(x)  FT_OBJECT(x)->ref_count
-
-
- /**************************************************************
-  *
-  * @macro: FT_OBJECT__MEMORY (obj)
-  *
-  * @description:
-  *   a useful macro to return a handle to the memory manager
-  *   used to allocate a given object
-  */
-#define  FT_OBJECT__MEMORY(x)     FT_CLASS__MEMORY(FT_OBJECT(x)->clazz)
-
-
- /**************************************************************
-  *
-  * @macro: FT_OBJECT__LIBRARY (obj)
-  *
-  * @description:
-  *   a useful macro to return a handle to the library handle
-  *   that owns the object
-  */
-#define  FT_OBJECT__LIBRARY(x)    FT_CLASS__LIBRARY(FT_OBJECT(x)->clazz)
-
-
- /**************************************************************
-  *
-  * @functype: FT_Object_InitFunc
-  *
-  * @description:
-  *   a function used to initialize a new object
-  *
-  * @input:
-  *   object    :: target object handle
-  *   init_data :: optional pointer to initialization data
-  *
-  * @return:
-  *   error code. 0 means success
-  */
-  typedef FT_Error  (*FT_Object_InitFunc)( FT_Object   object,
-                                           FT_Pointer  init_data );
-
- /**************************************************************
-  *
-  * @functype: FT_Object_DoneFunc
-  *
-  * @description:
-  *   a function used to finalize a given object
-  *
-  * @input:
-  *   object    :: handle to target object
-  */
-  typedef void  (*FT_Object_DoneFunc)( FT_Object   object );
-
-
- /**************************************************************
-  *
-  * @struct: FT_ClassRec
-  *
-  * @description:
-  *   a structure used to describe a given object class within
-  *   FreeType
-  *
-  * @fields:
-  *   object   :: root @FT_ObjectRec fields, since each class is
-  *               itself an object. (it's an instance of the
-  *               "metaclass", a special object of the FreeType
-  *               object sub-system.)
-  *
-  *   magic    :: a 32-bit magic number used for decoding
-  *   super    :: pointer to super class
-  *   type     :: the @FT_Type descriptor of this class
-  *   memory   :: the current memory manager handle
-  *   library  :: the current library handle
-  *   info     :: an opaque pointer to class-specific information
-  *               managed by the FreeType object sub-system
-  *
-  *   class_done :: the class destructor function
-  *
-  *   obj_size :: size of class instances in bytes
-  *   obj_init :: class instance constructor
-  *   obj_done :: class instance destructor
-  */
-  typedef struct FT_ClassRec_
-  {
-    FT_ObjectRec        object;
-    FT_UInt32           magic;
-    FT_Class            super;
-    FT_Type             type;
-    FT_Memory           memory;
-    FT_Library          library;
-    FT_Pointer          info;
-
-    FT_Object_DoneFunc  class_done;
-
-    FT_UInt             obj_size;
-    FT_Object_InitFunc  obj_init;
-    FT_Object_DoneFunc  obj_done;
-
-  } FT_ClassRec;
-
-
- /**************************************************************
-  *
-  * @macro: FT_CLASS (x)
-  *
-  * @description:
-  *   a useful macro to convert anything to a class handle
-  *   without checks
-  */
-#define  FT_CLASS(x)    ((FT_Class)(x))
-
-
- /**************************************************************
-  *
-  * @macro: FT_CLASS_P (x)
-  *
-  * @description:
-  *   a useful macro to convert anything to a pointer to a class
-  *   handle without checks
-  */
-#define  FT_CLASS_P(x)  ((FT_Class*)(x))
-
-
- /**************************************************************
-  *
-  * @macro: FT_CLASS__MEMORY (clazz)
-  *
-  * @description:
-  *   a useful macro to return the memory manager handle of a
-  *   given class
-  */
-#define  FT_CLASS__MEMORY(x)   FT_CLASS(x)->memory
-
-
- /**************************************************************
-  *
-  * @macro: FT_CLASS__LIBRARY (clazz)
-  *
-  * @description:
-  *   a useful macro to return the library handle of a
-  *   given class
-  */
-#define  FT_CLASS__LIBRARY(x)  FT_CLASS(x)->library
-
-
-
- /**************************************************************
-  *
-  * @macro: FT_CLASS__TYPE (clazz)
-  *
-  * @description:
-  *   a useful macro to return the type of a given class
-  *   given class
-  */
-#define  FT_CLASS__TYPE(x)     FT_CLASS(x)->type
-
- /* */
-#define  FT_CLASS__INFO(x)     FT_CLASS(x)->info
-#define  FT_CLASS__MAGIC(x)    FT_CLASS(x)->magic
-
-
- /**************************************************************
-  *
-  * @struct: FT_TypeRec
-  *
-  * @description:
-  *   a structure used to describe a given class to the FreeType
-  *   object sub-system.
-  *
-  * @fields:
-  *   name       :: class name. only used for debugging
-  *   super      :: type of super-class. NULL if none
-  *
-  *   class_size :: size of class structure in bytes
-  *   class_init :: class constructor
-  *   class_done :: class finalizer
-  *
-  *   obj_size   :: instance size in bytes
-  *   obj_init   :: instance constructor. can be NULL
-  *   obj_done   :: instance destructor. can be NULL
-  *
-  * @note:
-  *   if 'obj_init' is NULL, the class will use it's parent
-  *   constructor, if any
-  *
-  *   if 'obj_done' is NULL, the class will use it's parent
-  *   finalizer, if any
-  *
-  *   the object sub-system allocates a new class, copies
-  *   the content of its super-class into the new structure,
-  *   _then_ calls 'clazz_init'.
-  *
-  *   'class_init' and 'class_done' can be NULL, in which case
-  *   the parent's class constructor and destructor wil be used
-  */
-  typedef struct FT_TypeRec_
-  {
-    const char*         name;
-    FT_Type             super;
-
-    FT_UInt             class_size;
-    FT_Object_InitFunc  class_init;
-    FT_Object_DoneFunc  class_done;
-
-    FT_UInt             obj_size;
-    FT_Object_InitFunc  obj_init;
-    FT_Object_DoneFunc  obj_done;
-
-  } FT_TypeRec;
-
-
- /**************************************************************
-  *
-  * @macro: FT_TYPE (x)
-  *
-  * @description:
-  *   a useful macro to convert anything to a class type handle
-  *   without checks
-  */
-#define  FT_TYPE(x)  ((FT_Type)(x))
-
-
- /**************************************************************
-  *
-  * @function: ft_object_check
-  *
-  * @description:
-  *   checks that a handle points to a valid @FT_Object
-  *
-  * @input:
-  *   obj :: handle/pointer
-  *
-  * @return:
-  *   1 iff the handle points to a valid object. 0 otherwise
-  */
-  FT_BASE( FT_Int )
-  ft_object_check( FT_Pointer  obj );
-
-
- /**************************************************************
-  *
-  * @function: ft_object_is_a
-  *
-  * @description:
-  *   checks that a handle points to a valid @FT_Object that
-  *   is an instance of a given class (or of any of its sub-classes)
-  *
-  * @input:
-  *   obj   :: handle/pointer
-  *   clazz :: class handle to check
-  *
-  * @return:
-  *   1 iff the handle points to a valid 'clazz' instance. 0
-  *   otherwise.
-  */
-  FT_BASE( FT_Int )
-  ft_object_is_a( FT_Pointer  obj,
-                  FT_Class    clazz );
-
-
- /**************************************************************
-  *
-  * @function: ft_object_create
-  *
-  * @description:
-  *   create a new object (class instance)
-  *
-  * @output:
-  *   aobject   :: new object handle. NULL in case of error
-  *
-  * @input:
-  *   clazz     :: object's class pointer
-  *   init_data :: optional pointer to initialization data
-  *
-  * @return:
-  *   error code. 0 means success
-  */
-  FT_BASE( FT_Error )
-  ft_object_create( FT_Object  *aobject,
-                    FT_Class    clazz,
-                    FT_Pointer  init_data );
-
-
- /**************************************************************
-  *
-  * @function: ft_object_create_from_type
-  *
-  * @description:
-  *   create a new object (class instance) from a @FT_Type
-  *
-  * @output:
-  *   aobject   :: new object handle. NULL in case of error
-  *
-  * @input:
-  *   type      :: object's type descriptor
-  *   init_data :: optional pointer to initialization data
-  *
-  * @return:
-  *   error code. 0 means success
-  *
-  * @note:
-  *   this function is slower than @ft_object_create
-  *
-  *   this is equivalent to calling @ft_class_from_type followed by
-  *   @ft_object_create
-  */
-  FT_BASE( FT_Error )
-  ft_object_create_from_type( FT_Object  *aobject,
-                              FT_Type     type,
-                              FT_Pointer  init_data,
-                              FT_Library  library );
-
-
-
- /**************************************************************
-  *
-  * @macro FT_OBJ_CREATE (object,class,init)
-  *
-  * @description:
-  *   a convenient macro used to create new objects. see
-  *   @ft_object_create for details
-  */
-#define  FT_OBJ_CREATE( _obj, _clazz, _init )   \
-               ft_object_create( FT_OBJECT_P(&(_obj)), _clazz, _init )
-
-
- /**************************************************************
-  *
-  * @macro FT_CREATE (object,class,init)
-  *
-  * @description:
-  *   a convenient macro used to create new objects. It also
-  *   sets an _implicit_ local variable named "error" to the error
-  *   code returned by the object constructor.
-  */
-#define  FT_CREATE( _obj, _clazz, _init )  \
-             FT_SET_ERROR( FT_OBJ_CREATE( _obj, _clazz, _init ) )
-
- /**************************************************************
-  *
-  * @macro FT_OBJ_CREATE_FROM_TYPE (object,type,init)
-  *
-  * @description:
-  *   a convenient macro used to create new objects. see
-  *   @ft_object_create_from_type for details
-  */
-#define  FT_OBJ_CREATE_FROM_TYPE( _obj, _type, _init, _lib )   \
-               ft_object_create_from_type( FT_OBJECT_P(&(_obj)), _type, _init, _lib )
-
-
- /**************************************************************
-  *
-  * @macro FT_CREATE_FROM_TYPE (object,type,init)
-  *
-  * @description:
-  *   a convenient macro used to create new objects. It also
-  *   sets an _implicit_ local variable named "error" to the error
-  *   code returned by the object constructor.
-  */
-#define  FT_CREATE_FROM_TYPE( _obj, _type, _init, _lib )  \
-             FT_SET_ERROR( FT_OBJ_CREATE_FROM_TYPE( _obj, _type, _init, _lib ) )
-
-
- /* */
-
- /**************************************************************
-  *
-  * @function: ft_class_from_type
-  *
-  * @description:
-  *   retrieves the class object corresponding to a given type
-  *   descriptor. The class is created when needed
-  *
-  * @output:
-  *   aclass  :: handle to corresponding class object. NULL in
-  *              case of error
-  *
-  * @input:
-  *   type    :: type descriptor handle
-  *   library :: library handle
-  *
-  * @return:
-  *   error code. 0 means success
-  */
-  FT_BASE( FT_Error )
-  ft_class_from_type( FT_Class   *aclass,
-                      FT_Type     type,
-                      FT_Library  library );
-
-
- /* */
-
-#include FT_INTERNAL_HASH_H
-
-  typedef struct FT_ClassHNodeRec_*  FT_ClassHNode;
-
-  typedef struct FT_ClassHNodeRec_
-  {
-    FT_HashNodeRec  hnode;
-    FT_Type         type;
-    FT_Class        clazz;
-
-  } FT_ClassHNodeRec;
-
-  typedef struct FT_MetaClassRec_
-  {
-    FT_ClassRec   clazz;         /* the meta-class is a class itself */
-    FT_HashRec    type_to_class; /* the type => class hash table */
-
-  } FT_MetaClassRec, *FT_MetaClass;
-
-
- /* initialize meta class */
-  FT_BASE( FT_Error )
-  ft_metaclass_init( FT_MetaClass  meta,
-                     FT_Library    library );
-
- /* finalize meta class - destroy all registered class objects */
-  FT_BASE( void )
-  ft_metaclass_done( FT_MetaClass  meta );
-
- /* */
-
-FT_END_HEADER
-
-#endif /* __FT_OBJECT_H__ */

gpac-2.2.1.tar.gz/extra_lib/include/freetype/freetype/internal/ftobjs.h Deleted

@@ -1,845 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  ftobjs.h                                                               */
-/*                                                                         */
-/*    The FreeType private base classes (specification).                   */
-/*                                                                         */
-/*  Copyright 1996-2001, 2002, 2003 by                                     */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /*  This file contains the definition of all internal FreeType classes.  */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-#ifndef __FTOBJS_H__
-#define __FTOBJS_H__
-
-#include <ft2build.h>
-#include FT_CONFIG_STANDARD_LIBRARY_H   /* for ft_setjmp and ft_longjmp */
-#include FT_RENDER_H
-#include FT_SIZES_H
-#include FT_INTERNAL_MEMORY_H
-#include FT_INTERNAL_GLYPH_LOADER_H
-#include FT_INTERNAL_DRIVER_H
-#include FT_INTERNAL_AUTOHINT_H
-#include FT_INTERNAL_SERVICE_H
-
-#ifdef FT_CONFIG_OPTION_INCREMENTAL
-#include FT_INCREMENTAL_H
-#endif
-
-
-FT_BEGIN_HEADER
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* Some generic definitions.                                             */
-  /*                                                                       */
-#ifndef TRUE
-#define TRUE  1
-#endif
-
-#ifndef FALSE
-#define FALSE  0
-#endif
-
-#ifndef NULL
-#define NULL  (void*)0
-#endif
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* The min and max functions missing in C.  As usual, be careful not to  */
-  /* write things like MIN( a++, b++ ) to avoid side effects.              */
-  /*                                                                       */
-#ifndef MIN
-#define MIN( a, b )  ( (a) < (b) ? (a) : (b) )
-#endif
-
-#ifndef MAX
-#define MAX( a, b )  ( (a) > (b) ? (a) : (b) )
-#endif
-
-#ifndef ABS
-#define ABS( a )     ( (a) < 0 ? -(a) : (a) )
-#endif
-
-
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-  /****                                                                 ****/
-  /****                                                                 ****/
-  /****                    V A L I D A T I O N                          ****/
-  /****                                                                 ****/
-  /****                                                                 ****/
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-
-  /* handle to a validation object */
-  typedef struct FT_ValidatorRec_*  FT_Validator;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* There are three distinct validation levels defined here:              */
-  /*                                                                       */
-  /* FT_VALIDATE_DEFAULT ::                                                */
-  /*   A table that passes this validation level can be used reliably by   */
-  /*   FreeType.  It generally means that all offsets have been checked to */
-  /*   prevent out-of-bound reads, array counts are correct, etc.          */
-  /*                                                                       */
-  /* FT_VALIDATE_TIGHT ::                                                  */
-  /*   A table that passes this validation level can be used reliably and  */
-  /*   doesn't contain invalid data.  For example, a charmap table that    */
-  /*   returns invalid glyph indices will not pass, even though it can     */
-  /*   be used with FreeType in default mode (the library will simply      */
-  /*   return an error later when trying to load the glyph).               */
-  /*                                                                       */
-  /*   It also check that fields that must be a multiple of 2, 4, or 8     */
-  /*   don't have incorrect values, etc.                                   */
-  /*                                                                       */
-  /* FT_VALIDATE_PARANOID ::                                               */
-  /*   Only for font debugging.  Checks that a table follows the           */
-  /*   specification by 100%.  Very few fonts will be able to pass this    */
-  /*   level anyway but it can be useful for certain tools like font       */
-  /*   editors/converters.                                                 */
-  /*                                                                       */
-  typedef enum  FT_ValidationLevel_
-  {
-    FT_VALIDATE_DEFAULT = 0,
-    FT_VALIDATE_TIGHT,
-    FT_VALIDATE_PARANOID
-
-  } FT_ValidationLevel;
-
-
-  /* validator structure */
-  typedef struct  FT_ValidatorRec_
-  {
-    const FT_Byte*      base;        /* address of table in memory       */
-    const FT_Byte*      limit;       /* `base' + sizeof(table) in memory */
-    FT_ValidationLevel  level;       /* validation level                 */
-    FT_Error            error;       /* error returned. 0 means success  */
-
-    ft_jmp_buf          jump_buffer; /* used for exception handling      */
-
-  } FT_ValidatorRec;
-
-
-#define FT_VALIDATOR( x )  ((FT_Validator)( x ))
-
-
-  FT_BASE( void )
-  ft_validator_init( FT_Validator        valid,
-                     const FT_Byte*      base,
-                     const FT_Byte*      limit,
-                     FT_ValidationLevel  level );
-
-  FT_BASE( FT_Int )
-  ft_validator_run( FT_Validator  valid );
-
-  /* Sets the error field in a validator, then calls `longjmp' to return */
-  /* to high-level caller.  Using `setjmp/longjmp' avoids many stupid    */
-  /* error checks within the validation routines.                        */
-  /*                                                                     */
-  FT_BASE( void )
-  ft_validator_error( FT_Validator  valid,
-                      FT_Error      error );
-
-
-  /* Calls ft_validate_error.  Assumes that the `valid' local variable */
-  /* holds a pointer to the current validator object.                  */
-  /*                                                                   */
-#define FT_INVALID( _error )  ft_validator_error( valid, _error )
-
-  /* called when a broken table is detected */
-#define FT_INVALID_TOO_SHORT  FT_INVALID( FT_Err_Invalid_Table )
-
-  /* called when an invalid offset is detected */
-#define FT_INVALID_OFFSET     FT_INVALID( FT_Err_Invalid_Offset )
-
-  /* called when an invalid format/value is detected */
-#define FT_INVALID_FORMAT     FT_INVALID( FT_Err_Invalid_Table )
-
-  /* called when an invalid glyph index is detected */
-#define FT_INVALID_GLYPH_ID   FT_INVALID( FT_Err_Invalid_Glyph_Index )
-
-  /* called when an invalid field value is detected */
-#define FT_INVALID_DATA       FT_INVALID( FT_Err_Invalid_Table )
-
-
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-  /****                                                                 ****/
-  /****                                                                 ****/
-  /****                       C H A R M A P S                           ****/
-  /****                                                                 ****/
-  /****                                                                 ****/
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-
-  /* handle to internal charmap object */
-  typedef struct FT_CMapRec_*              FT_CMap;
-
-  /* handle to charmap class structure */
-  typedef const struct FT_CMap_ClassRec_*  FT_CMap_Class;
-
-  /* internal charmap object structure */
-  typedef struct  FT_CMapRec_
-  {
-    FT_CharMapRec  charmap;
-    FT_CMap_Class  clazz;
-
-  } FT_CMapRec;
-
-  /* typecase any pointer to a charmap handle */
-#define FT_CMAP( x )              ((FT_CMap)( x ))
-
-  /* obvious macros */
-#define FT_CMAP_PLATFORM_ID( x )  FT_CMAP( x )->charmap.platform_id
-#define FT_CMAP_ENCODING_ID( x )  FT_CMAP( x )->charmap.encoding_id
-#define FT_CMAP_ENCODING( x )     FT_CMAP( x )->charmap.encoding
-#define FT_CMAP_FACE( x )         FT_CMAP( x )->charmap.face
-
-
-  /* class method definitions */
-  typedef FT_Error
-  (*FT_CMap_InitFunc)( FT_CMap     cmap,
-                       FT_Pointer  init_data );
-
-  typedef void
-  (*FT_CMap_DoneFunc)( FT_CMap  cmap );
-
-  typedef FT_UInt
-  (*FT_CMap_CharIndexFunc)( FT_CMap    cmap,
-                            FT_UInt32  char_code );
-
-  typedef FT_UInt
-  (*FT_CMap_CharNextFunc)( FT_CMap     cmap,
-                           FT_UInt32  *achar_code );
-
-
-  typedef struct  FT_CMap_ClassRec_
-  {
-    FT_ULong               size;
-    FT_CMap_InitFunc       init;
-    FT_CMap_DoneFunc       done;
-    FT_CMap_CharIndexFunc  char_index;
-    FT_CMap_CharNextFunc   char_next;
-
-  } FT_CMap_ClassRec;
-
-
-  /* create a new charmap and add it to charmap->face */
-  FT_BASE( FT_Error )
-  FT_CMap_New( FT_CMap_Class  clazz,
-               FT_Pointer     init_data,
-               FT_CharMap     charmap,
-               FT_CMap       *acmap );
-
-  /* destroy a charmap (don't remove it from face's list though) */
-  FT_BASE( void )
-  FT_CMap_Done( FT_CMap  cmap );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    FT_Face_InternalRec                                                */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    This structure contains the internal fields of each FT_Face        */
-  /*    object.  These fields may change between different releases of     */
-  /*    FreeType.                                                          */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    max_points ::                                                      */
-  /*      The maximal number of points used to store the vectorial outline */
-  /*      of any glyph in this face.  If this value cannot be known in     */
-  /*      advance, or if the face isn't scalable, this should be set to 0. */
-  /*      Only relevant for scalable formats.                              */
-  /*                                                                       */
-  /*    max_contours ::                                                    */
-  /*      The maximal number of contours used to store the vectorial       */
-  /*      outline of any glyph in this face.  If this value cannot be      */
-  /*      known in advance, or if the face isn't scalable, this should be  */
-  /*      set to 0.  Only relevant for scalable formats.                   */
-  /*                                                                       */
-  /*    transform_matrix ::                                                */
-  /*      A 2x2 matrix of 16.16 coefficients used to transform glyph       */
-  /*      outlines after they are loaded from the font.  Only used by the  */
-  /*      convenience functions.                                           */
-  /*                                                                       */
-  /*    transform_delta ::                                                 */
-  /*      A translation vector used to transform glyph outlines after they */
-  /*      are loaded from the font.  Only used by the convenience          */
-  /*      functions.                                                       */
-  /*                                                                       */
-  /*    transform_flags ::                                                 */
-  /*      Some flags used to classify the transform.  Only used by the     */
-  /*      convenience functions.                                           */
-  /*                                                                       */
-  /*    services ::                                                        */
-  /*      A cache for frequently used services.  It should be only         */
-  /*      accessed with the macro `FT_FACE_LOOKUP_SERVICE'.                */
-  /*                                                                       */
-  /*    incremental_interface ::                                           */
-  /*      If non-null, the interface through which glyph data and metrics  */
-  /*      are loaded incrementally for faces that do not provide all of    */
-  /*      this data when first opened.  This field exists only if          */
-  /*      @FT_CONFIG_OPTION_INCREMENTAL is defined.                        */
-  /*                                                                       */
-  typedef struct  FT_Face_InternalRec_
-  {
-    FT_UShort           max_points;
-    FT_Short            max_contours;
-
-    FT_Matrix           transform_matrix;
-    FT_Vector           transform_delta;
-    FT_Int              transform_flags;
-
-    FT_ServiceCacheRec  services;
-
-#ifdef FT_CONFIG_OPTION_INCREMENTAL
-    FT_Incremental_InterfaceRec*  incremental_interface;
-#endif
-
-  } FT_Face_InternalRec;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    FT_Slot_InternalRec                                                */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    This structure contains the internal fields of each FT_GlyphSlot   */
-  /*    object.  These fields may change between different releases of     */
-  /*    FreeType.                                                          */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    loader            :: The glyph loader object used to load outlines */
-  /*                         into the glyph slot.                          */
-  /*                                                                       */
-  /*    flags             :: Possible values are zero or                   */
-  /*                         FT_GLYPH_OWN_BITMAP.  The latter indicates    */
-  /*                         that the FT_GlyphSlot structure owns the      */
-  /*                         bitmap buffer.                                */
-  /*                                                                       */
-  /*    glyph_transformed :: Boolean.  Set to TRUE when the loaded glyph   */
-  /*                         must be transformed through a specific        */
-  /*                         font transformation.  This is _not_ the same  */
-  /*                         as the face transform set through             */
-  /*                         FT_Set_Transform().                           */
-  /*                                                                       */
-  /*    glyph_matrix      :: The 2x2 matrix corresponding to the glyph     */
-  /*                         transformation, if necessary.                 */
-  /*                                                                       */
-  /*    glyph_delta       :: The 2d translation vector corresponding to    */
-  /*                         the glyph transformation, if necessary.       */
-  /*                                                                       */
-  /*    glyph_hints       :: Format-specific glyph hints management.       */
-  /*                                                                       */
-
-#define FT_GLYPH_OWN_BITMAP  0x1
-
-  typedef struct  FT_Slot_InternalRec_
-  {
-    FT_GlyphLoader  loader;
-    FT_UInt         flags;
-    FT_Bool         glyph_transformed;
-    FT_Matrix       glyph_matrix;
-    FT_Vector       glyph_delta;
-    void*           glyph_hints;
-
-  } FT_GlyphSlot_InternalRec;
-
-
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-  /****                                                                 ****/
-  /****                                                                 ****/
-  /****                         M O D U L E S                           ****/
-  /****                                                                 ****/
-  /****                                                                 ****/
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    FT_ModuleRec                                                       */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A module object instance.                                          */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    clazz   :: A pointer to the module's class.                        */
-  /*                                                                       */
-  /*    library :: A handle to the parent library object.                  */
-  /*                                                                       */
-  /*    memory  :: A handle to the memory manager.                         */
-  /*                                                                       */
-  /*    generic :: A generic structure for user-level extensibility (?).   */
-  /*                                                                       */
-  typedef struct  FT_ModuleRec_
-  {
-    FT_Module_Class*  clazz;
-    FT_Library        library;
-    FT_Memory         memory;
-    FT_Generic        generic;
-
-  } FT_ModuleRec;
-
-
-  /* typecast an object to a FT_Module */
-#define FT_MODULE( x )          ((FT_Module)( x ))
-#define FT_MODULE_CLASS( x )    FT_MODULE( x )->clazz
-#define FT_MODULE_LIBRARY( x )  FT_MODULE( x )->library
-#define FT_MODULE_MEMORY( x )   FT_MODULE( x )->memory
-
-
-#define FT_MODULE_IS_DRIVER( x )  ( FT_MODULE_CLASS( x )->module_flags & \
-                                    FT_MODULE_FONT_DRIVER )
-
-#define FT_MODULE_IS_RENDERER( x )  ( FT_MODULE_CLASS( x )->module_flags & \
-                                      FT_MODULE_RENDERER )
-
-#define FT_MODULE_IS_HINTER( x )  ( FT_MODULE_CLASS( x )->module_flags & \
-                                    FT_MODULE_HINTER )
-
-#define FT_MODULE_IS_STYLER( x )  ( FT_MODULE_CLASS( x )->module_flags & \
-                                    FT_MODULE_STYLER )
-
-#define FT_DRIVER_IS_SCALABLE( x )  ( FT_MODULE_CLASS( x )->module_flags & \
-                                      FT_MODULE_DRIVER_SCALABLE )
-
-#define FT_DRIVER_USES_OUTLINES( x )  !( FT_MODULE_CLASS( x )->module_flags & \
-                                         FT_MODULE_DRIVER_NO_OUTLINES )
-
-#define FT_DRIVER_HAS_HINTER( x )  ( FT_MODULE_CLASS( x )->module_flags & \
-                                     FT_MODULE_DRIVER_HAS_HINTER )
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Get_Module_Interface                                            */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Finds a module and returns its specific interface as a typeless    */
-  /*    pointer.                                                           */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    library     :: A handle to the library object.                     */
-  /*                                                                       */
-  /*    module_name :: The module's name (as an ASCII string).             */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    A module-specific interface if available, 0 otherwise.             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    You should better be familiar with FreeType internals to know      */
-  /*    which module to look for, and what its interface is :-)            */
-  /*                                                                       */
-  FT_BASE( const void* )
-  FT_Get_Module_Interface( FT_Library   library,
-                           const char*  mod_name );
-
-  FT_BASE( FT_Pointer )
-  ft_module_get_service( FT_Module    module,
-                         const char*  service_id );
-
- /* */
-
-
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-  /****                                                                 ****/
-  /****                                                                 ****/
-  /****               FACE, SIZE & GLYPH SLOT OBJECTS                   ****/
-  /****                                                                 ****/
-  /****                                                                 ****/
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-
-  /* a few macros used to perform easy typecasts with minimal brain damage */
-
-#define FT_FACE( x )          ((FT_Face)(x))
-#define FT_SIZE( x )          ((FT_Size)(x))
-#define FT_SLOT( x )          ((FT_GlyphSlot)(x))
-
-#define FT_FACE_DRIVER( x )   FT_FACE( x )->driver
-#define FT_FACE_LIBRARY( x )  FT_FACE_DRIVER( x )->root.library
-#define FT_FACE_MEMORY( x )   FT_FACE( x )->memory
-#define FT_FACE_STREAM( x )   FT_FACE( x )->stream
-
-#define FT_SIZE_FACE( x )     FT_SIZE( x )->face
-#define FT_SLOT_FACE( x )     FT_SLOT( x )->face
-
-#define FT_FACE_SLOT( x )     FT_FACE( x )->glyph
-#define FT_FACE_SIZE( x )     FT_FACE( x )->size
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_New_GlyphSlot                                                   */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    It is sometimes useful to have more than one glyph slot for a      */
-  /*    given face object.  This function is used to create additional     */
-  /*    slots.  All of them are automatically discarded when the face is   */
-  /*    destroyed.                                                         */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    face  :: A handle to a parent face object.                         */
-  /*                                                                       */
-  /* <Output>                                                              */
-  /*    aslot :: A handle to a new glyph slot object.                      */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0 means success.                             */
-  /*                                                                       */
-  FT_BASE( FT_Error )
-  FT_New_GlyphSlot( FT_Face        face,
-                    FT_GlyphSlot  *aslot );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Done_GlyphSlot                                                  */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Destroys a given glyph slot.  Remember however that all slots are  */
-  /*    automatically destroyed with its parent.  Using this function is   */
-  /*    not always mandatory.                                              */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    slot :: A handle to a target glyph slot.                           */
-  /*                                                                       */
-  FT_BASE( void )
-  FT_Done_GlyphSlot( FT_GlyphSlot  slot );
-
- /* */
-
- /*
-  * Free the bitmap of a given glyphslot when needed
-  * (i.e., only when it was allocated with ft_glyphslot_alloc_bitmap).
-  */
-  FT_BASE( void )
-  ft_glyphslot_free_bitmap( FT_GlyphSlot  slot );
-
-
- /*
-  * Allocate a new bitmap buffer in a glyph slot.
-  */
-  FT_BASE( FT_Error )
-  ft_glyphslot_alloc_bitmap( FT_GlyphSlot  slot,
-                             FT_ULong      size );
-
-
- /*
-  * Set the bitmap buffer in a glyph slot to a given pointer.
-  * The buffer will not be freed by a later call to ft_glyphslot_free_bitmap.
-  */
-  FT_BASE( void )
-  ft_glyphslot_set_bitmap( FT_GlyphSlot  slot,
-                           FT_Byte*      buffer );
-
-
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-  /****                                                                 ****/
-  /****                                                                 ****/
-  /****                        R E N D E R E R S                        ****/
-  /****                                                                 ****/
-  /****                                                                 ****/
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-
-
-#define FT_RENDERER( x )      ((FT_Renderer)( x ))
-#define FT_GLYPH( x )         ((FT_Glyph)( x ))
-#define FT_BITMAP_GLYPH( x )  ((FT_BitmapGlyph)( x ))
-#define FT_OUTLINE_GLYPH( x ) ((FT_OutlineGlyph)( x ))
-
-
-  typedef struct  FT_RendererRec_
-  {
-    FT_ModuleRec            root;
-    FT_Renderer_Class*      clazz;
-    FT_Glyph_Format         glyph_format;
-    FT_Glyph_Class          glyph_class;
-
-    FT_Raster               raster;
-    FT_Raster_Render_Func   raster_render;
-    FT_Renderer_RenderFunc  render;
-
-  } FT_RendererRec;
-
-
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-  /****                                                                 ****/
-  /****                                                                 ****/
-  /****                    F O N T   D R I V E R S                      ****/
-  /****                                                                 ****/
-  /****                                                                 ****/
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-
-
-  /* typecast a module into a driver easily */
-#define FT_DRIVER( x )        ((FT_Driver)(x))
-
-  /* typecast a module as a driver, and get its driver class */
-#define FT_DRIVER_CLASS( x )  FT_DRIVER( x )->clazz
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    FT_DriverRec                                                       */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    The root font driver class.  A font driver is responsible for      */
-  /*    managing and loading font files of a given format.                 */
-  /*                                                                       */
-  /*  <Fields>                                                             */
-  /*     root         :: Contains the fields of the root module class.     */
-  /*                                                                       */
-  /*     clazz        :: A pointer to the font driver's class.  Note that  */
-  /*                     this is NOT root.clazz.  `class' wasn't used      */
-  /*                     as it is a reserved word in C++.                  */
-  /*                                                                       */
-  /*     faces_list   :: The list of faces currently opened by this        */
-  /*                     driver.                                           */
-  /*                                                                       */
-  /*     extensions   :: A typeless pointer to the driver's extensions     */
-  /*                     registry, if they are supported through the       */
-  /*                     configuration macro FT_CONFIG_OPTION_EXTENSIONS.  */
-  /*                                                                       */
-  /*     glyph_loader :: The glyph loader for all faces managed by this    */
-  /*                     driver.  This object isn't defined for unscalable */
-  /*                     formats.                                          */
-  /*                                                                       */
-  typedef struct  FT_DriverRec_
-  {
-    FT_ModuleRec     root;
-    FT_Driver_Class  clazz;
-
-    FT_ListRec       faces_list;
-    void*            extensions;
-
-    FT_GlyphLoader   glyph_loader;
-
-  } FT_DriverRec;
-
-
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-  /****                                                                 ****/
-  /****                                                                 ****/
-  /****                       L I B R A R I E S                         ****/
-  /****                                                                 ****/
-  /****                                                                 ****/
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-
-
-/* this hook is used by the TrueType debugger. It must be set to an alternate
- * truetype bytecode interpreter function
- */
-#define FT_DEBUG_HOOK_TRUETYPE            0
-
-
-/* set this debug hook to a non-null pointer to force unpatented hinting
- * for all faces when both TT_CONFIG_OPTION_BYTECODE_INTERPRETER and
- * TT_CONFIG_OPTION_UNPATENTED_HINTING are defined. this is only used
- * during debugging
- */
-#define FT_DEBUG_HOOK_UNPATENTED_HINTING  1
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    FT_LibraryRec                                                      */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    The FreeType library class.  This is the root of all FreeType      */
-  /*    data.  Use FT_New_Library() to create a library object, and        */
-  /*    FT_Done_Library() to discard it and all child objects.             */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    memory           :: The library's memory object.  Manages memory   */
-  /*                        allocation.                                    */
-  /*                                                                       */
-  /*    generic          :: Client data variable.  Used to extend the      */
-  /*                        Library class by higher levels and clients.    */
-  /*                                                                       */
-  /*    version_major    :: The major version number of the library.       */
-  /*                                                                       */
-  /*    version_minor    :: The minor version number of the library.       */
-  /*                                                                       */
-  /*    version_patch    :: The current patch level of the library.        */
-  /*                                                                       */
-  /*    num_modules      :: The number of modules currently registered     */
-  /*                        within this library.  This is set to 0 for new */
-  /*                        libraries.  New modules are added through the  */
-  /*                        FT_Add_Module() API function.                  */
-  /*                                                                       */
-  /*    modules          :: A table used to store handles to the currently */
-  /*                        registered modules. Note that each font driver */
-  /*                        contains a list of its opened faces.           */
-  /*                                                                       */
-  /*    renderers        :: The list of renderers currently registered     */
-  /*                        within the library.                            */
-  /*                                                                       */
-  /*    cur_renderer     :: The current outline renderer.  This is a       */
-  /*                        shortcut used to avoid parsing the list on     */
-  /*                        each call to FT_Outline_Render().  It is a     */
-  /*                        handle to the current renderer for the         */
-  /*                        FT_GLYPH_FORMAT_OUTLINE format.                */
-  /*                                                                       */
-  /*    auto_hinter      :: XXX                                            */
-  /*                                                                       */
-  /*    raster_pool      :: The raster object's render pool.  This can     */
-  /*                        ideally be changed dynamically at run-time.    */
-  /*                                                                       */
-  /*    raster_pool_size :: The size of the render pool in bytes.          */
-  /*                                                                       */
-  /*    debug_hooks      :: XXX                                            */
-  /*                                                                       */
-  typedef struct  FT_LibraryRec_
-  {
-    FT_Memory          memory;           /* library's memory manager */
-
-    FT_Generic         generic;
-
-    FT_Int             version_major;
-    FT_Int             version_minor;
-    FT_Int             version_patch;
-
-    FT_UInt            num_modules;
-    FT_Module          modulesFT_MAX_MODULES;  /* module objects  */
-
-    FT_ListRec         renderers;        /* list of renderers        */
-    FT_Renderer        cur_renderer;     /* current outline renderer */
-    FT_Module          auto_hinter;
-
-    FT_Byte*           raster_pool;      /* scan-line conversion */
-                                         /* render pool          */
-    FT_ULong           raster_pool_size; /* size of render pool in bytes */
-
-    FT_DebugHook_Func  debug_hooks4;
-
-  } FT_LibraryRec;
-
-
-  FT_BASE( FT_Renderer )
-  FT_Lookup_Renderer( FT_Library       library,
-                      FT_Glyph_Format  format,
-                      FT_ListNode*     node );
-
-  FT_BASE( FT_Error )
-  FT_Render_Glyph_Internal( FT_Library      library,
-                            FT_GlyphSlot    slot,
-                            FT_Render_Mode  render_mode );
-
-  typedef const char*
-  (*FT_Face_GetPostscriptNameFunc)( FT_Face  face );
-
-  typedef FT_Error
-  (*FT_Face_GetGlyphNameFunc)( FT_Face     face,
-                               FT_UInt     glyph_index,
-                               FT_Pointer  buffer,
-                               FT_UInt     buffer_max );
-
-  typedef FT_UInt
-  (*FT_Face_GetGlyphNameIndexFunc)( FT_Face     face,
-                                    FT_String*  glyph_name );
-
-
-#ifndef FT_CONFIG_OPTION_NO_DEFAULT_SYSTEM
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_New_Memory                                                      */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Creates a new memory object.                                       */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    A pointer to the new memory object.  0 in case of error.           */
-  /*                                                                       */
-  FT_EXPORT( FT_Memory )
-  FT_New_Memory( void );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Done_Memory                                                     */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Discards memory manager.                                           */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    memory :: A handle to the memory manager.                          */
-  /*                                                                       */
-  FT_EXPORT( void )
-  FT_Done_Memory( FT_Memory  memory );
-
-#endif /* !FT_CONFIG_OPTION_NO_DEFAULT_SYSTEM */
-
-
-  /* Define default raster's interface.  The default raster is located in  */
-  /* `src/base/ftraster.c'.                                                */
-  /*                                                                       */
-  /* Client applications can register new rasters through the              */
-  /* FT_Set_Raster() API.                                                  */
-
-#ifndef FT_NO_DEFAULT_RASTER
-  FT_EXPORT_VAR( FT_Raster_Funcs )  ft_default_raster;
-#endif
-
-
-FT_END_HEADER
-
-#endif /* __FTOBJS_H__ */
-
-
-/* END */

gpac-2.2.1.tar.gz/extra_lib/include/freetype/freetype/internal/ftserv.h Deleted

@@ -1,259 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  ftserv.h                                                               */
-/*                                                                         */
-/*    The FreeType services (specification only).                          */
-/*                                                                         */
-/*  Copyright 2003 by                                                      */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-  /*************************************************************************/
-  /*                                                                       */
-  /*  Each module can export one or more `services'.  Each service is      */
-  /*  identified by a constant string and modeled by a pointer; the latter */
-  /*  generally corresponds to a structure containing function pointers.   */
-  /*                                                                       */
-  /*  Note that a service's data cannot be a mere function pointer because */
-  /*  in C it is possible that function pointers might be implemented      */
-  /*  differently than data pointers (e.g. 48 bits instead of 32).         */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-#ifndef __FTSERV_H__
-#define __FTSERV_H__
-
-
-FT_BEGIN_HEADER
-
-
-  /*
-   * @macro:
-   *   FT_FACE_FIND_SERVICE
-   *
-   * @description:
-   *   This macro is used to look up a service from a face's driver module.
-   *
-   * @input:
-   *   face ::
-   *     The source face handle.
-   *
-   *   id ::
-   *     A string describing the service as defined in the service's
-   *     header files (e.g. FT_SERVICE_ID_MULTI_MASTERS which expands to
-   *     `multi-masters').  It is automatically prefixed with
-   *     `FT_SERVICE_ID_'.
-   *
-   * @output:
-   *   ptr ::
-   *     A variable that receives the service pointer.  Will be NULL
-   *     if not found.
-   */
-#define FT_FACE_FIND_SERVICE( face, ptr, id )                               \
-  FT_BEGIN_STMNT                                                            \
-    FT_Module    module = FT_MODULE( FT_FACE(face)->driver );               \
-    /* the strange cast is to allow C++ compilation */                      \
-    FT_Pointer*  Pptr   = (FT_Pointer*) &(ptr);                             \
-                                                                            \
-                                                                            \
-    *Pptr = NULL;                                                           \
-    if ( module->clazz->get_interface )                                     \
-      *Pptr = module->clazz->get_interface( module, FT_SERVICE_ID_ ## id ); \
-  FT_END_STMNT
-
-
-  /*
-   * @macro:
-   *   FT_FACE_FIND_GLOBAL_SERVICE
-   *
-   * @description:
-   *   This macro is used to look up a service from all modules.
-   *
-   * @input:
-   *   face ::
-   *     The source face handle.
-   *
-   *   id ::
-   *     A string describing the service as defined in the service's
-   *     header files (e.g. FT_SERVICE_ID_MULTI_MASTERS which expands to
-   *     `multi-masters').  It is automatically prefixed with
-   *     `FT_SERVICE_ID_'.
-   *
-   * @output:
-   *   ptr ::
-   *     A variable that receives the service pointer.  Will be NULL
-   *     if not found.
-   */
-#define FT_FACE_FIND_GLOBAL_SERVICE( face, ptr, id )               \
-  FT_BEGIN_STMNT                                                   \
-    FT_Module    module = FT_MODULE( FT_FACE(face)->driver );      \
-    /* the strange cast is to allow C++ compilation */             \
-    FT_Pointer*  Pptr   = (FT_Pointer*) &(ptr);                    \
-                                                                   \
-                                                                   \
-    *Pptr = ft_module_get_service( module, FT_SERVICE_ID_ ## id ); \
-  FT_END_STMNT
-
-
-  /*************************************************************************/
-  /*************************************************************************/
-  /*****                                                               *****/
-  /*****         S E R V I C E   D E S C R I P T O R S                 *****/
-  /*****                                                               *****/
-  /*************************************************************************/
-  /*************************************************************************/
-
-  /*
-   *  The following structure is used to _describe_ a given service
-   *  to the library.  This is useful to build simple static service lists.
-   */
-  typedef struct  FT_ServiceDescRec_
-  {
-    const char*  serv_id;     /* service name         */
-    const void*  serv_data;   /* service pointer/data */
-
-  } FT_ServiceDescRec;
-
-  typedef const FT_ServiceDescRec*  FT_ServiceDesc;
-
-
-  /*
-   *  Parse a list of FT_ServiceDescRec descriptors and look for
-   *  a specific service by ID.  Note that the last element in the
-   *  array must be { NULL, NULL }, and that the function should
-   *  return NULL if the service isn't available.
-   *
-   *  This function can be used by modules to implement their
-   *  `get_service' method.
-   */
-  FT_BASE( FT_Pointer )
-  ft_service_list_lookup( FT_ServiceDesc  service_descriptors,
-                          const char*     service_id );
-
-
-  /*************************************************************************/
-  /*************************************************************************/
-  /*****                                                               *****/
-  /*****             S E R V I C E S   C A C H E                       *****/
-  /*****                                                               *****/
-  /*************************************************************************/
-  /*************************************************************************/
-
-  /*
-   *  This structure is used to store a cache for several frequently used
-   *  services.  It is the type of `face->internal->services'.  You
-   *  should only use FT_FACE_LOOKUP_SERVICE to access it.
-   *
-   *  All fields should have the type FT_Pointer to relax compilation
-   *  dependencies.  We assume the developer isn't completely stupid.
-   *
-   *  Each field must be named `service_XXXX' where `XXX' corresponds to
-   *  the correct FT_SERVICE_ID_XXXX macro.  See the definition of
-   *  FT_FACE_LOOKUP_SERVICE below how this is implemented.
-   *
-   */
-  typedef struct  FT_ServiceCacheRec_
-  {
-    FT_Pointer  service_POSTSCRIPT_FONT_NAME;
-    FT_Pointer  service_MULTI_MASTERS;
-    FT_Pointer  service_GLYPH_DICT;
-    FT_Pointer  service_PFR_METRICS;
-    FT_Pointer  service_WINFNT;
-
-  } FT_ServiceCacheRec, *FT_ServiceCache;
-
-
-  /*
-   *  A magic number used within the services cache.
-   */
-#define FT_SERVICE_UNAVAILABLE  ((FT_Pointer)-2)  /* magic number */
-
-
-  /*
-   * @macro:
-   *   FT_FACE_LOOKUP_SERVICE
-   *
-   * @description:
-   *   This macro is used to lookup a service from a face's driver module
-   *   using its cache.
-   *
-   * @input:
-   *   face::
-   *     The source face handle containing the cache.
-   *
-   *   field ::
-   *     The field name in the cache.
-   *
-   *   id ::
-   *     The service ID.
-   *
-   * @output:
-   *   ptr ::
-   *     A variable receiving the service data.  NULL if not available.
-   */
-#define FT_FACE_LOOKUP_SERVICE( face, ptr, id )                  \
-  FT_BEGIN_STMNT                                                 \
-    /* the strange cast is to allow C++ compilation */           \
-    FT_Pointer*  pptr = (FT_Pointer*)&(ptr);                     \
-    FT_Pointer   svc;                                            \
-                                                                 \
-                                                                 \
-    svc = FT_FACE(face)->internal->services. service_ ## id ;    \
-    if ( svc == FT_SERVICE_UNAVAILABLE )                         \
-      svc = NULL;                                                \
-    else if ( svc == NULL )                                      \
-    {                                                            \
-      FT_FACE_FIND_SERVICE( face, svc, id );                     \
-                                                                 \
-      FT_FACE(face)->internal->services. service_ ## id =        \
-        (FT_Pointer)( svc != NULL ? svc                          \
-                                  : FT_SERVICE_UNAVAILABLE );    \
-    }                                                            \
-    *pptr = svc;                                                 \
-  FT_END_STMNT
-
-
-  /*
-   *  A macro used to define new service structure types.
-   */
-
-#define FT_DEFINE_SERVICE( name )            \
-  typedef struct FT_Service_ ## name ## Rec_ \
-    FT_Service_ ## name ## Rec ;             \
-  typedef struct FT_Service_ ## name ## Rec_ \
-    const * FT_Service_ ## name ;            \
-  struct FT_Service_ ## name ## Rec_
-
-  /* */
-
-  /*
-   *  The header files containing the services.
-   */
-
-#define FT_SERVICE_MULTIPLE_MASTERS_H  <freetype/internal/services/svmm.h>
-#define FT_SERVICE_POSTSCRIPT_NAME_H   <freetype/internal/services/svpostnm.h>
-#define FT_SERVICE_POSTSCRIPT_CMAPS_H  <freetype/internal/services/svpscmap.h>
-#define FT_SERVICE_POSTSCRIPT_INFO_H   <freetype/internal/services/svpsinfo.h>
-#define FT_SERVICE_GLYPH_DICT_H        <freetype/internal/services/svgldict.h>
-#define FT_SERVICE_BDF_H               <freetype/internal/services/svbdf.h>
-#define FT_SERVICE_XFREE86_NAME_H      <freetype/internal/services/svxf86nm.h>
-#define FT_SERVICE_SFNT_H              <freetype/internal/services/svsfnt.h>
-#define FT_SERVICE_PFR_H               <freetype/internal/services/svpfr.h>
-#define FT_SERVICE_WINFNT_H            <freetype/internal/services/svwinfnt.h>
-
- /* */
-
-FT_END_HEADER
-
-#endif /* __FTSERV_H__ */
-
-
-/* END */

gpac-2.2.1.tar.gz/extra_lib/include/freetype/freetype/internal/ftstream.h Deleted

@@ -1,498 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  ftstream.h                                                             */
-/*                                                                         */
-/*    Stream handling (specification).                                     */
-/*                                                                         */
-/*  Copyright 1996-2001, 2002 by                                           */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef __FTSTREAM_H__
-#define __FTSTREAM_H__
-
-
-#include <ft2build.h>
-#include FT_SYSTEM_H
-#include FT_INTERNAL_OBJECTS_H
-
-
-FT_BEGIN_HEADER
-
-
-  /* format of an 8-bit frame_op value:           */
-  /*                                              */
-  /* bit  76543210                                */
-  /*      xxxxxxes                                */
-  /*                                              */
-  /* s is set to 1 if the value is signed.        */
-  /* e is set to 1 if the value is little-endian. */
-  /* xxx is a command.                            */
-
-#define FT_FRAME_OP_SHIFT         2
-#define FT_FRAME_OP_SIGNED        1
-#define FT_FRAME_OP_LITTLE        2
-#define FT_FRAME_OP_COMMAND( x )  ( x >> FT_FRAME_OP_SHIFT )
-
-#define FT_MAKE_FRAME_OP( command, little, sign ) \
-          ( ( command << FT_FRAME_OP_SHIFT ) | ( little << 1 ) | sign )
-
-#define FT_FRAME_OP_END    0
-#define FT_FRAME_OP_START  1  /* start a new frame     */
-#define FT_FRAME_OP_BYTE   2  /* read 1-byte value     */
-#define FT_FRAME_OP_SHORT  3  /* read 2-byte value     */
-#define FT_FRAME_OP_LONG   4  /* read 4-byte value     */
-#define FT_FRAME_OP_OFF3   5  /* read 3-byte value     */
-#define FT_FRAME_OP_BYTES  6  /* read a bytes sequence */
-
-
-  typedef enum  FT_Frame_Op_
-  {
-    ft_frame_end       = 0,
-    ft_frame_start     = FT_MAKE_FRAME_OP( FT_FRAME_OP_START, 0, 0 ),
-
-    ft_frame_byte      = FT_MAKE_FRAME_OP( FT_FRAME_OP_BYTE,  0, 0 ),
-    ft_frame_schar     = FT_MAKE_FRAME_OP( FT_FRAME_OP_BYTE,  0, 1 ),
-
-    ft_frame_ushort_be = FT_MAKE_FRAME_OP( FT_FRAME_OP_SHORT, 0, 0 ),
-    ft_frame_short_be  = FT_MAKE_FRAME_OP( FT_FRAME_OP_SHORT, 0, 1 ),
-    ft_frame_ushort_le = FT_MAKE_FRAME_OP( FT_FRAME_OP_SHORT, 1, 0 ),
-    ft_frame_short_le  = FT_MAKE_FRAME_OP( FT_FRAME_OP_SHORT, 1, 1 ),
-
-    ft_frame_ulong_be  = FT_MAKE_FRAME_OP( FT_FRAME_OP_LONG, 0, 0 ),
-    ft_frame_long_be   = FT_MAKE_FRAME_OP( FT_FRAME_OP_LONG, 0, 1 ),
-    ft_frame_ulong_le  = FT_MAKE_FRAME_OP( FT_FRAME_OP_LONG, 1, 0 ),
-    ft_frame_long_le   = FT_MAKE_FRAME_OP( FT_FRAME_OP_LONG, 1, 1 ),
-
-    ft_frame_uoff3_be  = FT_MAKE_FRAME_OP( FT_FRAME_OP_OFF3, 0, 0 ),
-    ft_frame_off3_be   = FT_MAKE_FRAME_OP( FT_FRAME_OP_OFF3, 0, 1 ),
-    ft_frame_uoff3_le  = FT_MAKE_FRAME_OP( FT_FRAME_OP_OFF3, 1, 0 ),
-    ft_frame_off3_le   = FT_MAKE_FRAME_OP( FT_FRAME_OP_OFF3, 1, 1 ),
-
-    ft_frame_bytes     = FT_MAKE_FRAME_OP( FT_FRAME_OP_BYTES, 0, 0 ),
-    ft_frame_skip      = FT_MAKE_FRAME_OP( FT_FRAME_OP_BYTES, 0, 1 )
-
-  } FT_Frame_Op;
-
-
-  typedef struct  FT_Frame_Field_
-  {
-    FT_Byte    value;
-    FT_Byte    size;
-    FT_UShort  offset;
-
-  } FT_Frame_Field;
-
-
-  /* Construct an FT_Frame_Field out of a structure type and a field name. */
-  /* The structure type must be set in the FT_STRUCTURE macro before       */
-  /* calling the FT_FRAME_START() macro.                                   */
-  /*                                                                       */
-#define FT_FIELD_SIZE( f ) \
-          (FT_Byte)sizeof ( ((FT_STRUCTURE*)0)->f )
-
-#define FT_FIELD_SIZE_DELTA( f ) \
-          (FT_Byte)sizeof ( ((FT_STRUCTURE*)0)->f0 )
-
-#define FT_FIELD_OFFSET( f ) \
-          (FT_UShort)( offsetof( FT_STRUCTURE, f ) )
-
-#define FT_FRAME_FIELD( frame_op, field ) \
-          {                               \
-            frame_op,                     \
-            FT_FIELD_SIZE( field ),       \
-            FT_FIELD_OFFSET( field )      \
-          }
-
-#define FT_MAKE_EMPTY_FIELD( frame_op )  { frame_op, 0, 0 }
-
-#define FT_FRAME_START( size )   { ft_frame_start, 0, size }
-#define FT_FRAME_END             { ft_frame_end, 0, 0 }
-
-#define FT_FRAME_LONG( f )       FT_FRAME_FIELD( ft_frame_long_be, f )
-#define FT_FRAME_ULONG( f )      FT_FRAME_FIELD( ft_frame_ulong_be, f )
-#define FT_FRAME_SHORT( f )      FT_FRAME_FIELD( ft_frame_short_be, f )
-#define FT_FRAME_USHORT( f )     FT_FRAME_FIELD( ft_frame_ushort_be, f )
-#define FT_FRAME_OFF3( f )       FT_FRAME_FIELD( ft_frame_off3_be, f )
-#define FT_FRAME_UOFF3( f )      FT_FRAME_FIELD( ft_frame_uoff3_be, f )
-#define FT_FRAME_BYTE( f )       FT_FRAME_FIELD( ft_frame_byte, f )
-#define FT_FRAME_CHAR( f )       FT_FRAME_FIELD( ft_frame_schar, f )
-
-#define FT_FRAME_LONG_LE( f )    FT_FRAME_FIELD( ft_frame_long_le, f )
-#define FT_FRAME_ULONG_LE( f )   FT_FRAME_FIELD( ft_frame_ulong_le, f )
-#define FT_FRAME_SHORT_LE( f )   FT_FRAME_FIELD( ft_frame_short_le, f )
-#define FT_FRAME_USHORT_LE( f )  FT_FRAME_FIELD( ft_frame_ushort_le, f )
-#define FT_FRAME_OFF3_LE( f )    FT_FRAME_FIELD( ft_frame_off3_le, f )
-#define FT_FRAME_UOFF3_LE( f )   FT_FRAME_FIELD( ft_frame_uoff3_le, f )
-
-#define FT_FRAME_SKIP_LONG       { ft_frame_long_be, 0, 0 }
-#define FT_FRAME_SKIP_SHORT      { ft_frame_short_be, 0, 0 }
-#define FT_FRAME_SKIP_BYTE       { ft_frame_byte, 0, 0 }
-
-#define FT_FRAME_BYTES( field, count ) \
-          {                            \
-            ft_frame_bytes,            \
-            count,                     \
-            FT_FIELD_OFFSET( field )   \
-          }
-
-#define FT_FRAME_SKIP_BYTES( count )  { ft_frame_skip, count, 0 }
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* Integer extraction macros -- the `buffer' parameter must ALWAYS be of */
-  /* type `char*' or equivalent (1-byte elements).                         */
-  /*                                                                       */
-
-#define FT_BYTE_( p, i )  ( ((const FT_Byte*)(p))(i) )
-#define FT_INT8_( p, i )  ( ((const FT_Char*)(p))(i) )
-
-#define FT_INT16( x )   ( (FT_Int16)(x)  )
-#define FT_UINT16( x )  ( (FT_UInt16)(x) )
-#define FT_INT32( x )   ( (FT_Int32)(x)  )
-#define FT_UINT32( x )  ( (FT_UInt32)(x) )
-
-#define FT_BYTE_I16( p, i, s )  ( FT_INT16(  FT_BYTE_( p, i ) ) << (s) )
-#define FT_BYTE_U16( p, i, s )  ( FT_UINT16( FT_BYTE_( p, i ) ) << (s) )
-#define FT_BYTE_I32( p, i, s )  ( FT_INT32(  FT_BYTE_( p, i ) ) << (s) )
-#define FT_BYTE_U32( p, i, s )  ( FT_UINT32( FT_BYTE_( p, i ) ) << (s) )
-
-#define FT_INT8_I16( p, i, s )  ( FT_INT16(  FT_INT8_( p, i ) ) << (s) )
-#define FT_INT8_U16( p, i, s )  ( FT_UINT16( FT_INT8_( p, i ) ) << (s) )
-#define FT_INT8_I32( p, i, s )  ( FT_INT32(  FT_INT8_( p, i ) ) << (s) )
-#define FT_INT8_U32( p, i, s )  ( FT_UINT32( FT_INT8_( p, i ) ) << (s) )
-
-
-#define FT_PEEK_SHORT( p )  FT_INT16( FT_INT8_I16( p, 0, 8) | \
-                                      FT_BYTE_I16( p, 1, 0) )
-
-#define FT_PEEK_USHORT( p )  FT_UINT16( FT_BYTE_U16( p, 0, 8 ) | \
-                                        FT_BYTE_U16( p, 1, 0 ) )
-
-#define FT_PEEK_LONG( p )  FT_INT32( FT_INT8_I32( p, 0, 24 ) | \
-                                     FT_BYTE_I32( p, 1, 16 ) | \
-                                     FT_BYTE_I32( p, 2,  8 ) | \
-                                     FT_BYTE_I32( p, 3,  0 ) )
-
-#define FT_PEEK_ULONG( p )  FT_UINT32( FT_BYTE_U32( p, 0, 24 ) | \
-                                       FT_BYTE_U32( p, 1, 16 ) | \
-                                       FT_BYTE_U32( p, 2,  8 ) | \
-                                       FT_BYTE_U32( p, 3,  0 ) )
-
-#define FT_PEEK_OFF3( p )  FT_INT32( FT_INT8_I32( p, 0, 16 ) | \
-                                     FT_BYTE_I32( p, 1,  8 ) | \
-                                     FT_BYTE_I32( p, 2,  0 ) )
-
-#define FT_PEEK_UOFF3( p )  FT_UINT32( FT_BYTE_U32( p, 0, 16 ) | \
-                                       FT_BYTE_U32( p, 1,  8 ) | \
-                                       FT_BYTE_U32( p, 2,  0 ) )
-
-#define FT_PEEK_SHORT_LE( p )  FT_INT16( FT_INT8_I16( p, 1, 8 ) | \
-                                         FT_BYTE_I16( p, 0, 0 ) )
-
-#define FT_PEEK_USHORT_LE( p )  FT_UINT16( FT_BYTE_U16( p, 1, 8 ) |  \
-                                           FT_BYTE_U16( p, 0, 0 ) )
-
-#define FT_PEEK_LONG_LE( p )  FT_INT32( FT_INT8_I32( p, 3, 24 ) | \
-                                        FT_BYTE_I32( p, 2, 16 ) | \
-                                        FT_BYTE_I32( p, 1,  8 ) | \
-                                        FT_BYTE_I32( p, 0,  0 ) )
-
-#define FT_PEEK_ULONG_LE( p )  FT_UINT32( FT_BYTE_U32( p, 3, 24 ) | \
-                                          FT_BYTE_U32( p, 2, 16 ) | \
-                                          FT_BYTE_U32( p, 1,  8 ) | \
-                                          FT_BYTE_U32( p, 0,  0 ) )
-
-#define FT_PEEK_OFF3_LE( p )  FT_INT32( FT_INT8_I32( p, 2, 16 ) | \
-                                        FT_BYTE_I32( p, 1,  8 ) | \
-                                        FT_BYTE_I32( p, 0,  0 ) )
-
-#define FT_PEEK_UOFF3_LE( p )  FT_UINT32( FT_BYTE_U32( p, 2, 16 ) | \
-                                          FT_BYTE_U32( p, 1,  8 ) | \
-                                          FT_BYTE_U32( p, 0,  0 ) )
-
-
-#define FT_NEXT_CHAR( buffer )       \
-          ( (signed char)*buffer++ )
-
-#define FT_NEXT_BYTE( buffer )         \
-          ( (unsigned char)*buffer++ )
-
-#define FT_NEXT_SHORT( buffer )                                   \
-          ( (short)( buffer += 2, FT_PEEK_SHORT( buffer - 2 ) ) )
-
-#define FT_NEXT_USHORT( buffer )                                            \
-          ( (unsigned short)( buffer += 2, FT_PEEK_USHORT( buffer - 2 ) ) )
-
-#define FT_NEXT_OFF3( buffer )                                  \
-          ( (long)( buffer += 3, FT_PEEK_OFF3( buffer - 3 ) ) )
-
-#define FT_NEXT_UOFF3( buffer )                                           \
-          ( (unsigned long)( buffer += 3, FT_PEEK_UOFF3( buffer - 3 ) ) )
-
-#define FT_NEXT_LONG( buffer )                                  \
-          ( (long)( buffer += 4, FT_PEEK_LONG( buffer - 4 ) ) )
-
-#define FT_NEXT_ULONG( buffer )                                           \
-          ( (unsigned long)( buffer += 4, FT_PEEK_ULONG( buffer - 4 ) ) )
-
-
-#define FT_NEXT_SHORT_LE( buffer )                                   \
-          ( (short)( buffer += 2, FT_PEEK_SHORT_LE( buffer - 2 ) ) )
-
-#define FT_NEXT_USHORT_LE( buffer )                                            \
-          ( (unsigned short)( buffer += 2, FT_PEEK_USHORT_LE( buffer - 2 ) ) )
-
-#define FT_NEXT_OFF3_LE( buffer )                                  \
-          ( (long)( buffer += 3, FT_PEEK_OFF3_LE( buffer - 3 ) ) )
-
-#define FT_NEXT_UOFF3_LE( buffer )                                           \
-          ( (unsigned long)( buffer += 3, FT_PEEK_UOFF3_LE( buffer - 3 ) ) )
-
-#define FT_NEXT_LONG_LE( buffer )                                  \
-          ( (long)( buffer += 4, FT_PEEK_LONG_LE( buffer - 4 ) ) )
-
-#define FT_NEXT_ULONG_LE( buffer )                                           \
-          ( (unsigned long)( buffer += 4, FT_PEEK_ULONG_LE( buffer - 4 ) ) )
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* Each GET_xxxx() macro uses an implicit `stream' variable.             */
-  /*                                                                       */
-#define FT_GET_MACRO( func, type )        ( (type)func( stream ) )
-
-#define FT_GET_CHAR()       FT_GET_MACRO( FT_Stream_GetChar, FT_Char )
-#define FT_GET_BYTE()       FT_GET_MACRO( FT_Stream_GetChar, FT_Byte )
-#define FT_GET_SHORT()      FT_GET_MACRO( FT_Stream_GetShort, FT_Short )
-#define FT_GET_USHORT()     FT_GET_MACRO( FT_Stream_GetShort, FT_UShort )
-#define FT_GET_OFF3()       FT_GET_MACRO( FT_Stream_GetOffset, FT_Long )
-#define FT_GET_UOFF3()      FT_GET_MACRO( FT_Stream_GetOffset, FT_ULong )
-#define FT_GET_LONG()       FT_GET_MACRO( FT_Stream_GetLong, FT_Long )
-#define FT_GET_ULONG()      FT_GET_MACRO( FT_Stream_GetLong, FT_ULong )
-#define FT_GET_TAG4()       FT_GET_MACRO( FT_Stream_GetLong, FT_ULong )
-
-#define FT_GET_SHORT_LE()   FT_GET_MACRO( FT_Stream_GetShortLE, FT_Short )
-#define FT_GET_USHORT_LE()  FT_GET_MACRO( FT_Stream_GetShortLE, FT_UShort )
-#define FT_GET_LONG_LE()    FT_GET_MACRO( FT_Stream_GetLongLE, FT_Long )
-#define FT_GET_ULONG_LE()   FT_GET_MACRO( FT_Stream_GetLongLE, FT_ULong )
-
-#define FT_READ_MACRO( func, type, var )        \
-          ( var = (type)func( stream, &error ), \
-            error != FT_Err_Ok )
-
-#define FT_READ_BYTE( var )       FT_READ_MACRO( FT_Stream_ReadChar, FT_Byte, var )
-#define FT_READ_CHAR( var )       FT_READ_MACRO( FT_Stream_ReadChar, FT_Char, var )
-#define FT_READ_SHORT( var )      FT_READ_MACRO( FT_Stream_ReadShort, FT_Short, var )
-#define FT_READ_USHORT( var )     FT_READ_MACRO( FT_Stream_ReadShort, FT_UShort, var )
-#define FT_READ_OFF3( var )       FT_READ_MACRO( FT_Stream_ReadOffset, FT_Long, var )
-#define FT_READ_UOFF3( var )      FT_READ_MACRO( FT_Stream_ReadOffset, FT_ULong, var )
-#define FT_READ_LONG( var )       FT_READ_MACRO( FT_Stream_ReadLong, FT_Long, var )
-#define FT_READ_ULONG( var )      FT_READ_MACRO( FT_Stream_ReadLong, FT_ULong, var )
-
-#define FT_READ_SHORT_LE( var )   FT_READ_MACRO( FT_Stream_ReadShortLE, FT_Short, var )
-#define FT_READ_USHORT_LE( var )  FT_READ_MACRO( FT_Stream_ReadShortLE, FT_UShort, var )
-#define FT_READ_LONG_LE( var )    FT_READ_MACRO( FT_Stream_ReadLongLE, FT_Long, var )
-#define FT_READ_ULONG_LE( var )   FT_READ_MACRO( FT_Stream_ReadLongLE, FT_ULong, var )
-
-
-#ifndef FT_CONFIG_OPTION_NO_DEFAULT_SYSTEM
-
-  /* initialize a stream for reading a regular system stream */
-  FT_EXPORT( FT_Error )
-  FT_Stream_Open( FT_Stream    stream,
-                  const char*  filepathname );
-
-#endif /* FT_CONFIG_OPTION_NO_DEFAULT_SYSTEM */
-
-
-  /* initialize a stream for reading in-memory data */
-  FT_BASE( void )
-  FT_Stream_OpenMemory( FT_Stream       stream,
-                        const FT_Byte*  base,
-                        FT_ULong        size );
-
-  /* close a stream (does not destroy the stream structure) */
-  FT_BASE( void )
-  FT_Stream_Close( FT_Stream  stream );
-
-
-  /* seek within a stream. position is relative to start of stream */
-  FT_BASE( FT_Error )
-  FT_Stream_Seek( FT_Stream  stream,
-                  FT_ULong   pos );
-
-  /* skip bytes in a stream */
-  FT_BASE( FT_Error )
-  FT_Stream_Skip( FT_Stream  stream,
-                  FT_Long    distance );
-
-  /* return current stream position */
-  FT_BASE( FT_Long )
-  FT_Stream_Pos( FT_Stream  stream );
-
-  /* read bytes from a stream into a user-allocated buffer, returns an */
-  /* error if not all bytes could be read.                             */
-  FT_BASE( FT_Error )
-  FT_Stream_Read( FT_Stream  stream,
-                  FT_Byte*   buffer,
-                  FT_ULong   count );
-
-  /* read bytes from a stream at a given position */
-  FT_BASE( FT_Error )
-  FT_Stream_ReadAt( FT_Stream  stream,
-                    FT_ULong   pos,
-                    FT_Byte*   buffer,
-                    FT_ULong   count );
-
-  /* Enter a frame of `count' consecutive bytes in a stream.  Returns an */
-  /* error if the frame could not be read/accessed.  The caller can use  */
-  /* the FT_Stream_Get_XXX functions to retrieve frame data without      */
-  /* error checks.                                                       */
-  /*                                                                     */
-  /* You must _always_ call FT_Stream_ExitFrame() once you have entered  */
-  /* a stream frame!                                                     */
-  /*                                                                     */
-  FT_BASE( FT_Error )
-  FT_Stream_EnterFrame( FT_Stream  stream,
-                        FT_ULong   count );
-
-  /* exit a stream frame */
-  FT_BASE( void )
-  FT_Stream_ExitFrame( FT_Stream  stream );
-
-  /* Extract a stream frame.  If the stream is disk-based, a heap block */
-  /* is allocated and the frame bytes are read into it.  If the stream  */
-  /* is memory-based, this function simply set a pointer to the data.   */
-  /*                                                                    */
-  /* Useful to optimize access to memory-based streams transparently.   */
-  /*                                                                    */
-  /* All extracted frames must be `freed` with a call to the function   */
-  /* FT_Stream_ReleaseFrame().                                          */
-  /*                                                                    */
-  FT_BASE( FT_Error )
-  FT_Stream_ExtractFrame( FT_Stream  stream,
-                          FT_ULong   count,
-                          FT_Byte**  pbytes );
-
-  /* release an extract frame (see FT_Stream_ExtractFrame) */
-  FT_BASE( void )
-  FT_Stream_ReleaseFrame( FT_Stream  stream,
-                          FT_Byte**  pbytes );
-
-  /* read a byte from an entered frame */
-  FT_BASE( FT_Char )
-  FT_Stream_GetChar( FT_Stream  stream );
-
-  /* read a 16-bit big-endian integer from an entered frame */
-  FT_BASE( FT_Short )
-  FT_Stream_GetShort( FT_Stream  stream );
-
-  /* read a 24-bit big-endian integer from an entered frame */
-  FT_BASE( FT_Long )
-  FT_Stream_GetOffset( FT_Stream  stream );
-
-  /* read a 32-bit big-endian integer from an entered frame */
-  FT_BASE( FT_Long )
-  FT_Stream_GetLong( FT_Stream  stream );
-
-  /* read a 16-bit little-endian integer from an entered frame */
-  FT_BASE( FT_Short )
-  FT_Stream_GetShortLE( FT_Stream  stream );
-
-  /* read a 32-bit little-endian integer from an entered frame */
-  FT_BASE( FT_Long )
-  FT_Stream_GetLongLE( FT_Stream  stream );
-
-
-  /* read a byte from a stream */
-  FT_BASE( FT_Char )
-  FT_Stream_ReadChar( FT_Stream  stream,
-                      FT_Error*  error );
-
-  /* read a 16-bit big-endian integer from a stream */
-  FT_BASE( FT_Short )
-  FT_Stream_ReadShort( FT_Stream  stream,
-                       FT_Error*  error );
-
-  /* read a 24-bit big-endian integer from a stream */
-  FT_BASE( FT_Long )
-  FT_Stream_ReadOffset( FT_Stream  stream,
-                        FT_Error*  error );
-
-  /* read a 32-bit big-endian integer from a stream */
-  FT_BASE( FT_Long )
-  FT_Stream_ReadLong( FT_Stream  stream,
-                      FT_Error*  error );
-
-  /* read a 16-bit little-endian integer from a stream */
-  FT_BASE( FT_Short )
-  FT_Stream_ReadShortLE( FT_Stream  stream,
-                         FT_Error*  error );
-
-  /* read a 32-bit little-endian integer from a stream */
-  FT_BASE( FT_Long )
-  FT_Stream_ReadLongLE( FT_Stream  stream,
-                        FT_Error*  error );
-
-  /* Read a structure from a stream.  The structure must be described */
-  /* by an array of FT_Frame_Field records.                           */
-  FT_BASE( FT_Error )
-  FT_Stream_ReadFields( FT_Stream              stream,
-                        const FT_Frame_Field*  fields,
-                        void*                  structure );
-
-
-#define FT_STREAM_POS()           \
-          FT_Stream_Pos( stream )
-
-#define FT_STREAM_SEEK( position )                           \
-          FT_SET_ERROR( FT_Stream_Seek( stream, position ) )
-
-#define FT_STREAM_SKIP( distance )                           \
-          FT_SET_ERROR( FT_Stream_Skip( stream, distance ) )
-
-#define FT_STREAM_READ( buffer, count )                   \
-          FT_SET_ERROR( FT_Stream_Read( stream,           \
-                                        (FT_Byte*)buffer, \
-                                        count ) )
-
-#define FT_STREAM_READ_AT( position, buffer, count )         \
-          FT_SET_ERROR( FT_Stream_ReadAt( stream,            \
-                                           position,         \
-                                           (FT_Byte*)buffer, \
-                                           count ) )
-
-#define FT_STREAM_READ_FIELDS( fields, object )                          \
-          FT_SET_ERROR( FT_Stream_ReadFields( stream, fields, object ) )
-
-
-#define FT_FRAME_ENTER( size )                                 \
-          FT_SET_ERROR( FT_Stream_EnterFrame( stream, size ) )
-
-#define FT_FRAME_EXIT()                 \
-          FT_Stream_ExitFrame( stream )
-
-#define FT_FRAME_EXTRACT( size, bytes )                                 \
-          FT_SET_ERROR( FT_Stream_ExtractFrame( stream, size,           \
-                                                (FT_Byte**)&(bytes) ) )
-
-#define FT_FRAME_RELEASE( bytes )                               \
-          FT_Stream_ReleaseFrame( stream, (FT_Byte**)&(bytes) )
-
-
-FT_END_HEADER
-
-#endif /* __FTSTREAM_H__ */
-
-
-/* END */

gpac-2.2.1.tar.gz/extra_lib/include/freetype/freetype/internal/fttrace.h Deleted

@@ -1,106 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  fttrace.h                                                              */
-/*                                                                         */
-/*    Tracing handling (specification only).                               */
-/*                                                                         */
-/*  Copyright 2002 by                                                      */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-/* definitions of trace levels for FreeType 2 */
-
-/* the first level must always be `trace_any' */
-FT_TRACE_DEF( any )
-
-/* base components */
-FT_TRACE_DEF( calc )      /* calculations            (ftcalc.c)   */
-FT_TRACE_DEF( memory )    /* memory manager          (ftobjs.c)   */
-FT_TRACE_DEF( stream )    /* stream manager          (ftstream.c) */
-FT_TRACE_DEF( io )        /* i/o interface           (ftsystem.c) */
-FT_TRACE_DEF( list )      /* list management         (ftlist.c)   */
-FT_TRACE_DEF( init )      /* initialization          (ftinit.c)   */
-FT_TRACE_DEF( objs )      /* base objects            (ftobjs.c)   */
-FT_TRACE_DEF( outline )   /* outline management      (ftoutln.c)  */
-FT_TRACE_DEF( glyph )     /* glyph management        (ftglyph.c)  */
-
-FT_TRACE_DEF( raster )    /* monochrome rasterizer   (ftraster.c) */
-FT_TRACE_DEF( smooth )    /* anti-aliasing raster    (ftgrays.c)  */
-FT_TRACE_DEF( mm )        /* MM interface            (ftmm.c)     */
-
-/* Cache sub-system */
-FT_TRACE_DEF( cache )     /* cache sub-system        (ftcache.c, etc..) */
-
-/* SFNT driver components */
-FT_TRACE_DEF( sfobjs )    /*  SFNT object handler     (sfobjs.c)   */
-FT_TRACE_DEF( ttcmap )    /* charmap handler         (ttcmap.c)    */
-FT_TRACE_DEF( ttload )    /* basic TrueType tables   (ttload.c)    */
-FT_TRACE_DEF( ttpost )    /* PS table processing     (ttpost.c)   */
-FT_TRACE_DEF( ttsbit )    /* TrueType sbit handling  (ttsbit.c)   */
-
-/* TrueType driver components */
-FT_TRACE_DEF( ttdriver )  /* TT font driver          (ttdriver.c) */
-FT_TRACE_DEF( ttgload )   /* TT glyph loader         (ttgload.c)  */
-FT_TRACE_DEF( ttinterp )  /* bytecode interpreter    (ttinterp.c) */
-FT_TRACE_DEF( ttobjs )    /* TT objects manager      (ttobjs.c)   */
-FT_TRACE_DEF( ttpload )   /* TT data/program loader  (ttpload.c)  */
-
-/* Type 1 driver components */
-FT_TRACE_DEF( t1driver )
-FT_TRACE_DEF( t1gload )
-FT_TRACE_DEF( t1hint )
-FT_TRACE_DEF( t1load )
-FT_TRACE_DEF( t1objs )
-FT_TRACE_DEF( t1parse )
-
-/* PostScript helper module `psaux' */
-FT_TRACE_DEF( t1decode )
-FT_TRACE_DEF( psobjs )
-
-/* PostScript hinting module `pshinter' */
-FT_TRACE_DEF( pshrec )
-FT_TRACE_DEF( pshalgo1 )
-FT_TRACE_DEF( pshalgo2 )
-
-/* Type 2 driver components */
-FT_TRACE_DEF( cffdriver )
-FT_TRACE_DEF( cffgload )
-FT_TRACE_DEF( cffload )
-FT_TRACE_DEF( cffobjs )
-FT_TRACE_DEF( cffparse )
-
-/* Type 42 driver component */
-FT_TRACE_DEF( t42 )
-
-/* CID driver components */
-FT_TRACE_DEF( cidafm )
-FT_TRACE_DEF( ciddriver )
-FT_TRACE_DEF( cidgload )
-FT_TRACE_DEF( cidload )
-FT_TRACE_DEF( cidobjs )
-FT_TRACE_DEF( cidparse )
-
-/* Windows fonts component */
-FT_TRACE_DEF( winfnt )
-
-/* PCF fonts components */
-FT_TRACE_DEF( pcfdriver )
-FT_TRACE_DEF( pcfread )
-
-/* BDF fonts component */
-FT_TRACE_DEF( bdfdriver )
-FT_TRACE_DEF( bdflib )
-
-/* PFR fonts component */
-FT_TRACE_DEF( pfr )
-
-
-/* END */

gpac-2.2.1.tar.gz/extra_lib/include/freetype/freetype/internal/internal.h Deleted

@@ -1,48 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  internal.h                                                             */
-/*                                                                         */
-/*    Internal header files (specification only).                          */
-/*                                                                         */
-/*  Copyright 1996-2001, 2002 by                                           */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* This file is automatically included by `ft2build.h'.                  */
-  /* Do not include it manually!                                           */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-#define FT_INTERNAL_OBJECTS_H             <freetype/internal/ftobjs.h>
-#define FT_INTERNAL_STREAM_H              <freetype/internal/ftstream.h>
-#define FT_INTERNAL_MEMORY_H              <freetype/internal/ftmemory.h>
-#define FT_INTERNAL_DEBUG_H               <freetype/internal/ftdebug.h>
-#define FT_INTERNAL_CALC_H                <freetype/internal/ftcalc.h>
-#define FT_INTERNAL_DRIVER_H              <freetype/internal/ftdriver.h>
-#define FT_INTERNAL_TRACE_H               <freetype/internal/fttrace.h>
-#define FT_INTERNAL_GLYPH_LOADER_H        <freetype/internal/ftgloadr.h>
-#define FT_INTERNAL_SFNT_H                <freetype/internal/sfnt.h>
-#define FT_INTERNAL_SERVICE_H             <freetype/internal/ftserv.h>
-
-#define FT_INTERNAL_TRUETYPE_TYPES_H      <freetype/internal/tttypes.h>
-#define FT_INTERNAL_TYPE1_TYPES_H         <freetype/internal/t1types.h>
-
-#define FT_INTERNAL_POSTSCRIPT_AUX_H      <freetype/internal/psaux.h>
-#define FT_INTERNAL_POSTSCRIPT_HINTS_H    <freetype/internal/pshints.h>
-#define FT_INTERNAL_POSTSCRIPT_GLOBALS_H  <freetype/internal/psglobal.h>
-
-#define FT_INTERNAL_AUTOHINT_H            <freetype/internal/autohint.h>
-
-
-/* END */

gpac-2.2.1.tar.gz/extra_lib/include/freetype/freetype/internal/pcftypes.h Deleted

@@ -1,56 +0,0 @@
-/*  pcftypes.h
-
-  FreeType font driver for pcf fonts
-
-  Copyright (C) 2000, 2001, 2002 by
-  Francesco Zappa Nardelli
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-*/
-
-
-#ifndef __PCFTYPES_H__
-#define __PCFTYPES_H__
-
-
-#include <ft2build.h>
-#include FT_FREETYPE_H
-
-
-FT_BEGIN_HEADER
-
-
-  typedef struct  PCF_Public_FaceRec_
-  {
-    FT_FaceRec    root;
-    FT_StreamRec  gzip_stream;
-    FT_Stream     gzip_source;
-
-    char*         charset_encoding;
-    char*         charset_registry;
-
-  } PCF_Public_FaceRec, *PCF_Public_Face;
-
-
-FT_END_HEADER
-
-#endif  /* __PCFTYPES_H__ */
-
-
-/* END */

gpac-2.2.1.tar.gz/extra_lib/include/freetype/freetype/internal/pfr.h Deleted

@@ -1,60 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  pfr.h                                                                  */
-/*                                                                         */
-/*    Internal PFR service functions (specification only).                 */
-/*                                                                         */
-/*  Copyright 2002, 2003 by                                                */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef __PFR_H__
-#define __PFR_H__
-
-#include <ft2build.h>
-#include FT_FREETYPE_H
-
-
-FT_BEGIN_HEADER
-
-  typedef FT_Error  (*FT_PFR_GetMetricsFunc)( FT_Face    face,
-                                              FT_UInt   *aoutline,
-                                              FT_UInt   *ametrics,
-                                              FT_Fixed  *ax_scale,
-                                              FT_Fixed  *ay_scale );
-
-  typedef FT_Error  (*FT_PFR_GetKerningFunc)( FT_Face     face,
-                                              FT_UInt     left,
-                                              FT_UInt     right,
-                                              FT_Vector  *avector );
-
-  typedef FT_Error  (*FT_PFR_GetAdvanceFunc)( FT_Face   face,
-                                              FT_UInt   gindex,
-                                              FT_Pos   *aadvance );
-
-
-  typedef struct  FT_PFR_ServiceRec_
-  {
-    FT_PFR_GetMetricsFunc  get_metrics;
-    FT_PFR_GetKerningFunc  get_kerning;
-    FT_PFR_GetAdvanceFunc  get_advance;
-
-  } FT_PFR_ServiceRec, *FT_PFR_Service;
-
-#define FT_PFR_SERVICE_NAME  "pfr"
-
-
-FT_END_HEADER
-
-#endif /* __PFR_H__ */
-
-
-/* END */

gpac-2.2.1.tar.gz/extra_lib/include/freetype/freetype/internal/psaux.h Deleted

@@ -1,733 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  psaux.h                                                                */
-/*                                                                         */
-/*    Auxiliary functions and data structures related to PostScript fonts  */
-/*    (specification).                                                     */
-/*                                                                         */
-/*  Copyright 1996-2001, 2002, 2003 by                                     */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef __PSAUX_H__
-#define __PSAUX_H__
-
-
-#include <ft2build.h>
-#include FT_INTERNAL_OBJECTS_H
-#include FT_INTERNAL_TYPE1_TYPES_H
-#include FT_SERVICE_POSTSCRIPT_CMAPS_H
-
-
-FT_BEGIN_HEADER
-
-
-  /*************************************************************************/
-  /*************************************************************************/
-  /*****                                                               *****/
-  /*****                             T1_TABLE                          *****/
-  /*****                                                               *****/
-  /*************************************************************************/
-  /*************************************************************************/
-
-
-  typedef struct PS_TableRec_*              PS_Table;
-  typedef const struct PS_Table_FuncsRec_*  PS_Table_Funcs;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    PS_Table_FuncsRec                                                  */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A set of function pointers to manage PS_Table objects.             */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    table_init    :: Used to initialize a table.                       */
-  /*                                                                       */
-  /*    table_done    :: Finalizes resp. destroy a given table.            */
-  /*                                                                       */
-  /*    table_add     :: Adds a new object to a table.                     */
-  /*                                                                       */
-  /*    table_release :: Releases table data, then finalizes it.           */
-  /*                                                                       */
-  typedef struct  PS_Table_FuncsRec_
-  {
-    FT_Error
-    (*init)( PS_Table   table,
-             FT_Int     count,
-             FT_Memory  memory );
-
-    void
-    (*done)( PS_Table  table );
-
-    FT_Error
-    (*add)( PS_Table    table,
-            FT_Int      idx,
-            void*       object,
-            FT_PtrDist  length );
-
-    void
-    (*release)( PS_Table  table );
-
-  } PS_Table_FuncsRec;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    PS_TableRec                                                        */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A PS_Table is a simple object used to store an array of objects in */
-  /*    a single memory block.                                             */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    block     :: The address in memory of the growheap's block.  This  */
-  /*                 can change between two object adds, due to            */
-  /*                 reallocation.                                         */
-  /*                                                                       */
-  /*    cursor    :: The current top of the grow heap within its block.    */
-  /*                                                                       */
-  /*    capacity  :: The current size of the heap block.  Increments by    */
-  /*                 1kByte chunks.                                        */
-  /*                                                                       */
-  /*    max_elems :: The maximum number of elements in table.              */
-  /*                                                                       */
-  /*    num_elems :: The current number of elements in table.              */
-  /*                                                                       */
-  /*    elements  :: A table of element addresses within the block.        */
-  /*                                                                       */
-  /*    lengths   :: A table of element sizes within the block.            */
-  /*                                                                       */
-  /*    memory    :: The object used for memory operations                 */
-  /*                 (alloc/realloc).                                      */
-  /*                                                                       */
-  /*    funcs     :: A table of method pointers for this object.           */
-  /*                                                                       */
-  typedef struct  PS_TableRec_
-  {
-    FT_Byte*           block;          /* current memory block           */
-    FT_Offset          cursor;         /* current cursor in memory block */
-    FT_Offset          capacity;       /* current size of memory block   */
-    FT_Long            init;
-
-    FT_Int             max_elems;
-    FT_Int             num_elems;
-    FT_Byte**          elements;       /* addresses of table elements */
-    FT_Int*            lengths;        /* lengths of table elements   */
-
-    FT_Memory          memory;
-    PS_Table_FuncsRec  funcs;
-
-  } PS_TableRec;
-
-
-  /*************************************************************************/
-  /*************************************************************************/
-  /*****                                                               *****/
-  /*****                       T1 FIELDS & TOKENS                      *****/
-  /*****                                                               *****/
-  /*************************************************************************/
-  /*************************************************************************/
-
-  typedef struct PS_ParserRec_*  PS_Parser;
-
-  typedef struct T1_TokenRec_*   T1_Token;
-
-  typedef struct T1_FieldRec_*   T1_Field;
-
-
-  /* simple enumeration type used to identify token types */
-  typedef enum  T1_TokenType_
-  {
-    T1_TOKEN_TYPE_NONE = 0,
-    T1_TOKEN_TYPE_ANY,
-    T1_TOKEN_TYPE_STRING,
-    T1_TOKEN_TYPE_ARRAY,
-
-    /* do not remove */
-    T1_TOKEN_TYPE_MAX
-
-  } T1_TokenType;
-
-
-  /* a simple structure used to identify tokens */
-  typedef struct  T1_TokenRec_
-  {
-    FT_Byte*      start;   /* first character of token in input stream */
-    FT_Byte*      limit;   /* first character after the token          */
-    T1_TokenType  type;    /* type of token                            */
-
-  } T1_TokenRec;
-
-
-  /* enumeration type used to identify object fields */
-  typedef enum  T1_FieldType_
-  {
-    T1_FIELD_TYPE_NONE = 0,
-    T1_FIELD_TYPE_BOOL,
-    T1_FIELD_TYPE_INTEGER,
-    T1_FIELD_TYPE_FIXED,
-    T1_FIELD_TYPE_FIXED_1000,
-    T1_FIELD_TYPE_STRING,
-    T1_FIELD_TYPE_KEY,
-    T1_FIELD_TYPE_BBOX,
-    T1_FIELD_TYPE_INTEGER_ARRAY,
-    T1_FIELD_TYPE_FIXED_ARRAY,
-    T1_FIELD_TYPE_CALLBACK,
-
-    /* do not remove */
-    T1_FIELD_TYPE_MAX
-
-  } T1_FieldType;
-
-
-  typedef enum  T1_FieldLocation_
-  {
-    T1_FIELD_LOCATION_CID_INFO,
-    T1_FIELD_LOCATION_FONT_DICT,
-    T1_FIELD_LOCATION_FONT_INFO,
-    T1_FIELD_LOCATION_PRIVATE,
-    T1_FIELD_LOCATION_BBOX,
-
-    /* do not remove */
-    T1_FIELD_LOCATION_MAX
-
-  } T1_FieldLocation;
-
-
-  typedef void
-  (*T1_Field_ParseFunc)( FT_Face     face,
-                         FT_Pointer  parser );
-
-
-  /* structure type used to model object fields */
-  typedef struct  T1_FieldRec_
-  {
-    const char*         ident;        /* field identifier               */
-    T1_FieldLocation    location;
-    T1_FieldType        type;         /* type of field                  */
-    T1_Field_ParseFunc  reader;
-    FT_UInt             offset;       /* offset of field in object      */
-    FT_Byte             size;         /* size of field in bytes         */
-    FT_UInt             array_max;    /* maximal number of elements for */
-                                      /* array                          */
-    FT_UInt             count_offset; /* offset of element count for    */
-                                      /* arrays                         */
-  } T1_FieldRec;
-
-
-#define T1_NEW_SIMPLE_FIELD( _ident, _type, _fname ) \
-          {                                          \
-            _ident, T1CODE, _type,                   \
-            0,                                       \
-            FT_FIELD_OFFSET( _fname ),               \
-            FT_FIELD_SIZE( _fname ),                 \
-            0, 0                                     \
-          },
-
-#define T1_NEW_CALLBACK_FIELD( _ident, _reader )    \
-          {                                         \
-            _ident, T1CODE, T1_FIELD_TYPE_CALLBACK, \
-            (T1_Field_ParseFunc)_reader,            \
-            0, 0,                                   \
-            0, 0                                    \
-          },
-
-#define T1_NEW_TABLE_FIELD( _ident, _type, _fname, _max ) \
-          {                                               \
-            _ident, T1CODE, _type,                        \
-            0,                                            \
-            FT_FIELD_OFFSET( _fname ),                    \
-            FT_FIELD_SIZE_DELTA( _fname ),                \
-            _max,                                         \
-            FT_FIELD_OFFSET( num_ ## _fname )             \
-          },
-
-#define T1_NEW_TABLE_FIELD2( _ident, _type, _fname, _max ) \
-          {                                                \
-            _ident, T1CODE, _type,                         \
-            0,                                             \
-            FT_FIELD_OFFSET( _fname ),                     \
-            FT_FIELD_SIZE_DELTA( _fname ),                 \
-            _max, 0                                        \
-          },
-
-
-#define T1_FIELD_BOOL( _ident, _fname )                             \
-          T1_NEW_SIMPLE_FIELD( _ident, T1_FIELD_TYPE_BOOL, _fname )
-
-#define T1_FIELD_NUM( _ident, _fname )                                 \
-          T1_NEW_SIMPLE_FIELD( _ident, T1_FIELD_TYPE_INTEGER, _fname )
-
-#define T1_FIELD_FIXED( _ident, _fname )                             \
-          T1_NEW_SIMPLE_FIELD( _ident, T1_FIELD_TYPE_FIXED, _fname )
-
-#define T1_FIELD_FIXED_1000( _ident, _fname )                             \
-          T1_NEW_SIMPLE_FIELD( _ident, T1_FIELD_TYPE_FIXED_1000, _fname )
-
-#define T1_FIELD_STRING( _ident, _fname )                             \
-          T1_NEW_SIMPLE_FIELD( _ident, T1_FIELD_TYPE_STRING, _fname )
-
-#define T1_FIELD_KEY( _ident, _fname )                             \
-          T1_NEW_SIMPLE_FIELD( _ident, T1_FIELD_TYPE_KEY, _fname )
-
-#define T1_FIELD_BBOX( _ident, _fname )                             \
-          T1_NEW_SIMPLE_FIELD( _ident, T1_FIELD_TYPE_BBOX, _fname )
-
-
-#define T1_FIELD_NUM_TABLE( _ident, _fname, _fmax )                \
-          T1_NEW_TABLE_FIELD( _ident, T1_FIELD_TYPE_INTEGER_ARRAY, \
-                              _fname, _fmax )
-
-#define T1_FIELD_FIXED_TABLE( _ident, _fname, _fmax )            \
-          T1_NEW_TABLE_FIELD( _ident, T1_FIELD_TYPE_FIXED_ARRAY, \
-                              _fname, _fmax )
-
-#define T1_FIELD_NUM_TABLE2( _ident, _fname, _fmax )                \
-          T1_NEW_TABLE_FIELD2( _ident, T1_FIELD_TYPE_INTEGER_ARRAY, \
-                               _fname, _fmax )
-
-#define T1_FIELD_FIXED_TABLE2( _ident, _fname, _fmax )            \
-          T1_NEW_TABLE_FIELD2( _ident, T1_FIELD_TYPE_FIXED_ARRAY, \
-                               _fname, _fmax )
-
-#define T1_FIELD_CALLBACK( _ident, _name )       \
-          T1_NEW_CALLBACK_FIELD( _ident, _name )
-
-
-  /*************************************************************************/
-  /*************************************************************************/
-  /*****                                                               *****/
-  /*****                            T1 PARSER                          *****/
-  /*****                                                               *****/
-  /*************************************************************************/
-  /*************************************************************************/
-
-  typedef const struct PS_Parser_FuncsRec_*  PS_Parser_Funcs;
-
-  typedef struct  PS_Parser_FuncsRec_
-  {
-    void
-    (*init)( PS_Parser  parser,
-             FT_Byte*   base,
-             FT_Byte*   limit,
-             FT_Memory  memory );
-
-    void
-    (*done)( PS_Parser  parser );
-
-    void
-    (*skip_spaces)( PS_Parser  parser );
-    void
-    (*skip_PS_token)( PS_Parser  parser );
-
-    FT_Long
-    (*to_int)( PS_Parser  parser );
-    FT_Fixed
-    (*to_fixed)( PS_Parser  parser,
-                 FT_Int     power_ten );
-
-    FT_Error
-    (*to_bytes)( PS_Parser  parser,
-                 FT_Byte*   bytes,
-                 FT_Long    max_bytes,
-                 FT_Long*   pnum_bytes,
-                 FT_Bool    delimiters );
-
-    FT_Int
-    (*to_coord_array)( PS_Parser  parser,
-                       FT_Int     max_coords,
-                       FT_Short*  coords );
-    FT_Int
-    (*to_fixed_array)( PS_Parser  parser,
-                       FT_Int     max_values,
-                       FT_Fixed*  values,
-                       FT_Int     power_ten );
-
-    void
-    (*to_token)( PS_Parser  parser,
-                 T1_Token   token );
-    void
-    (*to_token_array)( PS_Parser  parser,
-                       T1_Token   tokens,
-                       FT_UInt    max_tokens,
-                       FT_Int*    pnum_tokens );
-
-    FT_Error
-    (*load_field)( PS_Parser       parser,
-                   const T1_Field  field,
-                   void**          objects,
-                   FT_UInt         max_objects,
-                   FT_ULong*       pflags );
-
-    FT_Error
-    (*load_field_table)( PS_Parser       parser,
-                         const T1_Field  field,
-                         void**          objects,
-                         FT_UInt         max_objects,
-                         FT_ULong*       pflags );
-
-  } PS_Parser_FuncsRec;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    PS_ParserRec                                                       */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A PS_Parser is an object used to parse a Type 1 font very quickly. */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    cursor :: The current position in the text.                        */
-  /*                                                                       */
-  /*    base   :: Start of the processed text.                             */
-  /*                                                                       */
-  /*    limit  :: End of the processed text.                               */
-  /*                                                                       */
-  /*    error  :: The last error returned.                                 */
-  /*                                                                       */
-  /*    memory :: The object used for memory operations (alloc/realloc).   */
-  /*                                                                       */
-  /*    funcs  :: A table of functions for the parser.                     */
-  /*                                                                       */
-  typedef struct  PS_ParserRec_
-  {
-    FT_Byte*   cursor;
-    FT_Byte*   base;
-    FT_Byte*   limit;
-    FT_Error   error;
-    FT_Memory  memory;
-
-    PS_Parser_FuncsRec  funcs;
-
-  } PS_ParserRec;
-
-
-  /*************************************************************************/
-  /*************************************************************************/
-  /*****                                                               *****/
-  /*****                         T1 BUILDER                            *****/
-  /*****                                                               *****/
-  /*************************************************************************/
-  /*************************************************************************/
-
-
-  typedef struct T1_BuilderRec_*  T1_Builder;
-
-
-  typedef FT_Error
-  (*T1_Builder_Check_Points_Func)( T1_Builder  builder,
-                                   FT_Int      count );
-
-  typedef void
-  (*T1_Builder_Add_Point_Func)( T1_Builder  builder,
-                                FT_Pos      x,
-                                FT_Pos      y,
-                                FT_Byte     flag );
-
-  typedef FT_Error
-  (*T1_Builder_Add_Point1_Func)( T1_Builder  builder,
-                                 FT_Pos      x,
-                                 FT_Pos      y );
-
-  typedef FT_Error
-  (*T1_Builder_Add_Contour_Func)( T1_Builder  builder );
-
-  typedef FT_Error
-  (*T1_Builder_Start_Point_Func)( T1_Builder  builder,
-                                  FT_Pos      x,
-                                  FT_Pos      y );
-
-  typedef void
-  (*T1_Builder_Close_Contour_Func)( T1_Builder  builder );
-
-
-  typedef const struct T1_Builder_FuncsRec_*  T1_Builder_Funcs;
-
-  typedef struct  T1_Builder_FuncsRec_
-  {
-    void
-    (*init)( T1_Builder    builder,
-             FT_Face       face,
-             FT_Size       size,
-             FT_GlyphSlot  slot,
-             FT_Bool       hinting );
-
-    void
-    (*done)( T1_Builder   builder );
-
-    T1_Builder_Check_Points_Func   check_points;
-    T1_Builder_Add_Point_Func      add_point;
-    T1_Builder_Add_Point1_Func     add_point1;
-    T1_Builder_Add_Contour_Func    add_contour;
-    T1_Builder_Start_Point_Func    start_point;
-    T1_Builder_Close_Contour_Func  close_contour;
-
-  } T1_Builder_FuncsRec;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Structure>                                                           */
-  /*    T1_BuilderRec                                                      */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*     A structure used during glyph loading to store its outline.       */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    memory       :: The current memory object.                         */
-  /*                                                                       */
-  /*    face         :: The current face object.                           */
-  /*                                                                       */
-  /*    glyph        :: The current glyph slot.                            */
-  /*                                                                       */
-  /*    loader       :: XXX                                                */
-  /*                                                                       */
-  /*    base         :: The base glyph outline.                            */
-  /*                                                                       */
-  /*    current      :: The current glyph outline.                         */
-  /*                                                                       */
-  /*    max_points   :: maximum points in builder outline                  */
-  /*                                                                       */
-  /*    max_contours :: Maximal number of contours in builder outline.     */
-  /*                                                                       */
-  /*    last         :: The last point position.                           */
-  /*                                                                       */
-  /*    scale_x      :: The horizontal scale (FUnits to sub-pixels).       */
-  /*                                                                       */
-  /*    scale_y      :: The vertical scale (FUnits to sub-pixels).         */
-  /*                                                                       */
-  /*    pos_x        :: The horizontal translation (if composite glyph).   */
-  /*                                                                       */
-  /*    pos_y        :: The vertical translation (if composite glyph).     */
-  /*                                                                       */
-  /*    left_bearing :: The left side bearing point.                       */
-  /*                                                                       */
-  /*    advance      :: The horizontal advance vector.                     */
-  /*                                                                       */
-  /*    bbox         :: Unused.                                            */
-  /*                                                                       */
-  /*    path_begun   :: A flag which indicates that a new path has begun.  */
-  /*                                                                       */
-  /*    load_points  :: If this flag is not set, no points are loaded.     */
-  /*                                                                       */
-  /*    no_recurse   :: Set but not used.                                  */
-  /*                                                                       */
-  /*    error        :: An error code that is only used to report memory   */
-  /*                    allocation problems.                               */
-  /*                                                                       */
-  /*    metrics_only :: A boolean indicating that we only want to compute  */
-  /*                    the metrics of a given glyph, not load all of its  */
-  /*                    points.                                            */
-  /*                                                                       */
-  /*    funcs        :: An array of function pointers for the builder.     */
-  /*                                                                       */
-  typedef struct  T1_BuilderRec_
-  {
-    FT_Memory       memory;
-    FT_Face         face;
-    FT_GlyphSlot    glyph;
-    FT_GlyphLoader  loader;
-    FT_Outline*     base;
-    FT_Outline*     current;
-
-    FT_Vector       last;
-
-    FT_Fixed        scale_x;
-    FT_Fixed        scale_y;
-
-    FT_Pos          pos_x;
-    FT_Pos          pos_y;
-
-    FT_Vector       left_bearing;
-    FT_Vector       advance;
-
-    FT_BBox         bbox;          /* bounding box */
-    FT_Bool         path_begun;
-    FT_Bool         load_points;
-    FT_Bool         no_recurse;
-    FT_Bool         shift;
-
-    FT_Error        error;         /* only used for memory errors */
-    FT_Bool         metrics_only;
-
-    void*           hints_funcs;    /* hinter-specific */
-    void*           hints_globals;  /* hinter-specific */
-
-    T1_Builder_FuncsRec  funcs;
-
-  } T1_BuilderRec;
-
-
-  /*************************************************************************/
-  /*************************************************************************/
-  /*****                                                               *****/
-  /*****                         T1 DECODER                            *****/
-  /*****                                                               *****/
-  /*************************************************************************/
-  /*************************************************************************/
-
-#if 0
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* T1_MAX_SUBRS_CALLS details the maximum number of nested sub-routine   */
-  /* calls during glyph loading.                                           */
-  /*                                                                       */
-#define T1_MAX_SUBRS_CALLS  8
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* T1_MAX_CHARSTRING_OPERANDS is the charstring stack's capacity.  A     */
-  /* minimum of 16 is required.                                            */
-  /*                                                                       */
-#define T1_MAX_CHARSTRINGS_OPERANDS  32
-
-#endif /* 0 */
-
-
-  typedef struct  T1_Decoder_ZoneRec_
-  {
-    FT_Byte*  cursor;
-    FT_Byte*  base;
-    FT_Byte*  limit;
-
-  } T1_Decoder_ZoneRec, *T1_Decoder_Zone;
-
-
-  typedef struct T1_DecoderRec_*              T1_Decoder;
-  typedef const struct T1_Decoder_FuncsRec_*  T1_Decoder_Funcs;
-
-
-  typedef FT_Error
-  (*T1_Decoder_Callback)( T1_Decoder  decoder,
-                          FT_UInt     glyph_index );
-
-
-  typedef struct  T1_Decoder_FuncsRec_
-  {
-    FT_Error
-    (*init)( T1_Decoder           decoder,
-             FT_Face              face,
-             FT_Size              size,
-             FT_GlyphSlot         slot,
-             FT_Byte**            glyph_names,
-             PS_Blend             blend,
-             FT_Bool              hinting,
-             FT_Render_Mode       hint_mode,
-             T1_Decoder_Callback  callback );
-
-    void
-    (*done)( T1_Decoder  decoder );
-
-    FT_Error
-    (*parse_charstrings)( T1_Decoder  decoder,
-                          FT_Byte*    base,
-                          FT_UInt     len );
-
-  } T1_Decoder_FuncsRec;
-
-
-  typedef struct  T1_DecoderRec_
-  {
-    T1_BuilderRec        builder;
-
-    FT_Long              stackT1_MAX_CHARSTRINGS_OPERANDS;
-    FT_Long*             top;
-
-    T1_Decoder_ZoneRec   zonesT1_MAX_SUBRS_CALLS + 1;
-    T1_Decoder_Zone      zone;
-
-    FT_Service_PsCMaps   psnames;      /* for seac */
-    FT_UInt              num_glyphs;
-    FT_Byte**            glyph_names;
-
-    FT_Int               lenIV;        /* internal for sub routine calls */
-    FT_UInt              num_subrs;
-    FT_Byte**            subrs;
-    FT_Int*              subrs_len;    /* array of subrs length (optional) */
-
-    FT_Matrix            font_matrix;
-    FT_Vector            font_offset;
-
-    FT_Int               flex_state;
-    FT_Int               num_flex_vectors;
-    FT_Vector            flex_vectors7;
-
-    PS_Blend             blend;       /* for multiple master support */
-
-    FT_Render_Mode       hint_mode;
-
-    T1_Decoder_Callback  parse_callback;
-    T1_Decoder_FuncsRec  funcs;
-
-  } T1_DecoderRec;
-
-
-  /*************************************************************************/
-  /*************************************************************************/
-  /*****                                                               *****/
-  /*****                     TYPE1 CHARMAPS                            *****/
-  /*****                                                               *****/
-  /*************************************************************************/
-  /*************************************************************************/
-
-  typedef const struct T1_CMap_ClassesRec_*  T1_CMap_Classes;
-
-  typedef struct T1_CMap_ClassesRec_
-  {
-    FT_CMap_Class  standard;
-    FT_CMap_Class  expert;
-    FT_CMap_Class  custom;
-    FT_CMap_Class  unicode;
-
-  } T1_CMap_ClassesRec;
-
-
-  /*************************************************************************/
-  /*************************************************************************/
-  /*****                                                               *****/
-  /*****                        PSAux Module Interface                 *****/
-  /*****                                                               *****/
-  /*************************************************************************/
-  /*************************************************************************/
-
-  typedef struct  PSAux_ServiceRec_
-  {
-    /* don't use `PS_Table_Funcs' and friends to avoid compiler warnings */
-    const PS_Table_FuncsRec*    ps_table_funcs;
-    const PS_Parser_FuncsRec*   ps_parser_funcs;
-    const T1_Builder_FuncsRec*  t1_builder_funcs;
-    const T1_Decoder_FuncsRec*  t1_decoder_funcs;
-
-    void
-    (*t1_decrypt)( FT_Byte*   buffer,
-                   FT_Offset  length,
-                   FT_UShort  seed );
-
-    T1_CMap_Classes  t1_cmap_classes;
-
-  } PSAux_ServiceRec, *PSAux_Service;
-
-  /* backwards-compatible type definition */
-  typedef PSAux_ServiceRec   PSAux_Interface;
-
-FT_END_HEADER
-
-#endif /* __PSAUX_H__ */
-
-
-/* END */

gpac-2.2.1.tar.gz/extra_lib/include/freetype/freetype/internal/pshints.h Deleted

@@ -1,626 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  pshints.h                                                              */
-/*                                                                         */
-/*    Interface to Postscript-specific (Type 1 and Type 2) hints           */
-/*    recorders (specification only).  These are used to support native    */
-/*    T1/T2 hints in the "type1", "cid" and "cff" font drivers.            */
-/*                                                                         */
-/*  Copyright 2001, 2002, 2003 by                                          */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef __PSHINTS_H__
-#define __PSHINTS_H__
-
-
-#include <ft2build.h>
-#include FT_FREETYPE_H
-#include FT_TYPE1_TABLES_H
-
-
-FT_BEGIN_HEADER
-
-
-  /*************************************************************************/
-  /*************************************************************************/
-  /*****                                                               *****/
-  /*****               INTERNAL REPRESENTATION OF GLOBALS              *****/
-  /*****                                                               *****/
-  /*************************************************************************/
-  /*************************************************************************/
-
-  typedef struct PSH_GlobalsRec_*  PSH_Globals;
-
-  typedef FT_Error
-  (*PSH_Globals_NewFunc)( FT_Memory     memory,
-                          T1_Private*   private_dict,
-                          PSH_Globals*  aglobals );
-
-  typedef FT_Error
-  (*PSH_Globals_SetScaleFunc)( PSH_Globals  globals,
-                               FT_Fixed     x_scale,
-                               FT_Fixed     y_scale,
-                               FT_Fixed     x_delta,
-                               FT_Fixed     y_delta );
-
-  typedef void
-  (*PSH_Globals_DestroyFunc)( PSH_Globals  globals );
-
-
-  typedef struct  PSH_Globals_FuncsRec_
-  {
-    PSH_Globals_NewFunc       create;
-    PSH_Globals_SetScaleFunc  set_scale;
-    PSH_Globals_DestroyFunc   destroy;
-
-  } PSH_Globals_FuncsRec, *PSH_Globals_Funcs;
-
-
-  /*************************************************************************/
-  /*************************************************************************/
-  /*****                                                               *****/
-  /*****                  PUBLIC TYPE 1 HINTS RECORDER                 *****/
-  /*****                                                               *****/
-  /*************************************************************************/
-  /*************************************************************************/
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* @type:                                                                */
-  /*    T1_Hints                                                           */
-  /*                                                                       */
-  /* @description:                                                         */
-  /*    This is a handle to an opaque structure used to record glyph hints */
-  /*    from a Type 1 character glyph character string.                    */
-  /*                                                                       */
-  /*    The methods used to operate on this object are defined by the      */
-  /*    @T1_Hints_FuncsRec structure.  Recording glyph hints is normally   */
-  /*    achieved through the following scheme:                             */
-  /*                                                                       */
-  /*    - Open a new hint recording session by calling the "open" method.  */
-  /*      This will rewind the recorder and prepare it for new input.      */
-  /*                                                                       */
-  /*    - For each hint found in the glyph charstring, call the            */
-  /*      corresponding method ("stem", "stem3", or "reset").  Note that   */
-  /*      these functions do not return an error code.                     */
-  /*                                                                       */
-  /*    - Close the recording session by calling the "close" method.  It   */
-  /*      will return an error code if the hints were invalid or something */
-  /*      strange happened (e.g. memory shortage).                         */
-  /*                                                                       */
-  /*    The hints accumulated in the object can later be used by the       */
-  /*    PostScript hinter.                                                 */
-  /*                                                                       */
-  typedef struct T1_HintsRec_*  T1_Hints;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* @type:                                                                */
-  /*    T1_Hints_Funcs                                                     */
-  /*                                                                       */
-  /* @description:                                                         */
-  /*    A pointer to the @T1_Hints_FuncsRec structure that defines the     */
-  /*    API of a given @T1_Hints object.                                   */
-  /*                                                                       */
-  typedef const struct T1_Hints_FuncsRec_*  T1_Hints_Funcs;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* @functype:                                                            */
-  /*    T1_Hints_OpenFunc                                                  */
-  /*                                                                       */
-  /* @description:                                                         */
-  /*    A method of the @T1_Hints class used to prepare it for a new       */
-  /*    Type 1 hints recording session.                                    */
-  /*                                                                       */
-  /* @input:                                                               */
-  /*    hints :: A handle to the Type 1 hints recorder.                    */
-  /*                                                                       */
-  /* @note:                                                                */
-  /*    You should always call the @T1_Hints_CloseFunc method in order to  */
-  /*    close an opened recording session.                                 */
-  /*                                                                       */
-  typedef void
-  (*T1_Hints_OpenFunc)( T1_Hints  hints );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* @functype:                                                            */
-  /*    T1_Hints_SetStemFunc                                               */
-  /*                                                                       */
-  /* @description:                                                         */
-  /*    A method of the @T1_Hints class used to record a new horizontal or */
-  /*    vertical stem.  This corresponds to the Type 1 "hstem" and "vstem" */
-  /*    operators.                                                         */
-  /*                                                                       */
-  /* @input:                                                               */
-  /*    hints     :: A handle to the Type 1 hints recorder.                */
-  /*                                                                       */
-  /*    dimension :: 0 for horizontal stems (hstem), 1 for vertical ones   */
-  /*                 (vstem).                                              */
-  /*                                                                       */
-  /*    coords    :: Array of 2 integers, used as (position,length) stem   */
-  /*                 descriptor.                                           */
-  /*                                                                       */
-  /* @note:                                                                */
-  /*    Use vertical coordinates (y) for horizontal stems (dim=0).  Use    */
-  /*    horizontal coordinates (x) for vertical stems (dim=1).             */
-  /*                                                                       */
-  /*    "coords0" is the absolute stem position (lowest coordinate);     */
-  /*    "coords1" is the length.                                         */
-  /*                                                                       */
-  /*    The length can be negative, in which case it must be either -20 or */
-  /*    -21.  It will be interpreted as a "ghost" stem, according to       */
-  /*    Type 1 specification.                                              */
-  /*                                                                       */
-  /*    If the length is -21 (corresponding to a bottom ghost stem), then  */
-  /*    the real stem position is "coords0+coords1".                   */
-  /*                                                                       */
-  typedef void
-  (*T1_Hints_SetStemFunc)( T1_Hints  hints,
-                           FT_UInt   dimension,
-                           FT_Long*  coords );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* @functype:                                                            */
-  /*    T1_Hints_SetStem3Func                                              */
-  /*                                                                       */
-  /* @description:                                                         */
-  /*    A method of the @T1_Hints class used to record three               */
-  /*    counter-controlled horizontal or vertical stems at once.           */
-  /*                                                                       */
-  /* @input:                                                               */
-  /*    hints     :: A handle to the Type 1 hints recorder.                */
-  /*                                                                       */
-  /*    dimension :: 0 for horizontal stems, 1 for vertical ones.          */
-  /*                                                                       */
-  /*    coords    :: An array of 6 integers, holding 3 (position,length)   */
-  /*                 pairs for the counter-controlled stems.               */
-  /*                                                                       */
-  /* @note:                                                                */
-  /*    Use vertical coordinates (y) for horizontal stems (dim=0).  Use    */
-  /*    horizontal coordinates (x) for vertical stems (dim=1).             */
-  /*                                                                       */
-  /*    The lengths cannot be negative (ghost stems are never              */
-  /*    counter-controlled).                                               */
-  /*                                                                       */
-  typedef void
-  (*T1_Hints_SetStem3Func)( T1_Hints  hints,
-                            FT_UInt   dimension,
-                            FT_Long*  coords );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* @functype:                                                            */
-  /*    T1_Hints_ResetFunc                                                 */
-  /*                                                                       */
-  /* @description:                                                         */
-  /*    A method of the @T1_Hints class used to reset the stems hints in a */
-  /*    recording session.                                                 */
-  /*                                                                       */
-  /* @input:                                                               */
-  /*    hints     :: A handle to the Type 1 hints recorder.                */
-  /*                                                                       */
-  /*    end_point :: The index of the last point in the input glyph in     */
-  /*                 which the previously defined hints apply.             */
-  /*                                                                       */
-  typedef void
-  (*T1_Hints_ResetFunc)( T1_Hints  hints,
-                         FT_UInt   end_point );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* @functype:                                                            */
-  /*    T1_Hints_CloseFunc                                                 */
-  /*                                                                       */
-  /* @description:                                                         */
-  /*    A method of the @T1_Hints class used to close a hint recording     */
-  /*    session.                                                           */
-  /*                                                                       */
-  /* @input:                                                               */
-  /*    hints     :: A handle to the Type 1 hints recorder.                */
-  /*                                                                       */
-  /*    end_point :: The index of the last point in the input glyph.       */
-  /*                                                                       */
-  /* @return:                                                              */
-  /*    FreeType error code.  0 means success.                             */
-  /*                                                                       */
-  /* @note:                                                                */
-  /*    The error code will be set to indicate that an error occured       */
-  /*    during the recording session.                                      */
-  /*                                                                       */
-  typedef FT_Error
-  (*T1_Hints_CloseFunc)( T1_Hints  hints,
-                         FT_UInt   end_point );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* @functype:                                                            */
-  /*    T1_Hints_ApplyFunc                                                 */
-  /*                                                                       */
-  /* @description:                                                         */
-  /*    A method of the @T1_Hints class used to apply hints to the         */
-  /*    corresponding glyph outline.  Must be called once all hints have   */
-  /*    been recorded.                                                     */
-  /*                                                                       */
-  /* @input:                                                               */
-  /*   hints     :: A handle to the Type 1 hints recorder.                 */
-  /*                                                                       */
-  /*   outline   :: A pointer to the target outline descriptor.            */
-  /*                                                                       */
-  /*   globals   :: The hinter globals for this font.                      */
-  /*                                                                       */
-  /*   hint_mode :: Hinting information.                                   */
-  /*                                                                       */
-  /* @return:                                                              */
-  /*   FreeType error code.  0 means success.                              */
-  /*                                                                       */
-  /* @note:                                                                */
-  /*    On input, all points within the outline are in font coordinates.   */
-  /*    On output, they are in 1/64th of pixels.                           */
-  /*                                                                       */
-  /*    The scaling transformation is taken from the "globals" object      */
-  /*    which must correspond to the same font as the glyph.               */
-  /*                                                                       */
-  typedef FT_Error
-  (*T1_Hints_ApplyFunc)( T1_Hints        hints,
-                         FT_Outline*     outline,
-                         PSH_Globals     globals,
-                         FT_Render_Mode  hint_mode );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* @struct:                                                              */
-  /*    T1_Hints_FuncsRec                                                  */
-  /*                                                                       */
-  /* @description:                                                         */
-  /*    The structure used to provide the API to @T1_Hints objects.        */
-  /*                                                                       */
-  /* @fields:                                                              */
-  /*    hints :: A handle to the T1 Hints recorder.                        */
-  /*                                                                       */
-  /*    open  :: The function to open a recording session.                 */
-  /*                                                                       */
-  /*    close :: The function to close a recording session.                */
-  /*                                                                       */
-  /*    stem  :: The function to set a simple stem.                        */
-  /*                                                                       */
-  /*    stem3 :: The function to set counter-controlled stems.             */
-  /*                                                                       */
-  /*    reset :: The function to reset stem hints.                         */
-  /*                                                                       */
-  /*    apply :: The function to apply the hints to the corresponding      */
-  /*             glyph outline.                                            */
-  /*                                                                       */
-  typedef struct  T1_Hints_FuncsRec_
-  {
-    T1_Hints               hints;
-    T1_Hints_OpenFunc      open;
-    T1_Hints_CloseFunc     close;
-    T1_Hints_SetStemFunc   stem;
-    T1_Hints_SetStem3Func  stem3;
-    T1_Hints_ResetFunc     reset;
-    T1_Hints_ApplyFunc     apply;
-
-  } T1_Hints_FuncsRec;
-
-
-  /*************************************************************************/
-  /*************************************************************************/
-  /*****                                                               *****/
-  /*****                  PUBLIC TYPE 2 HINTS RECORDER                 *****/
-  /*****                                                               *****/
-  /*************************************************************************/
-  /*************************************************************************/
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* @type:                                                                */
-  /*    T2_Hints                                                           */
-  /*                                                                       */
-  /* @description:                                                         */
-  /*    This is a handle to an opaque structure used to record glyph hints */
-  /*    from a Type 2 character glyph character string.                    */
-  /*                                                                       */
-  /*    The methods used to operate on this object are defined by the      */
-  /*    @T2_Hints_FuncsRec structure.  Recording glyph hints is normally   */
-  /*    achieved through the following scheme:                             */
-  /*                                                                       */
-  /*    - Open a new hint recording session by calling the "open" method.  */
-  /*      This will rewind the recorder and prepare it for new input.      */
-  /*                                                                       */
-  /*    - For each hint found in the glyph charstring, call the            */
-  /*      corresponding method ("stems", "hintmask", "counters").  Note    */
-  /*      that these functions do not return an error code.                */
-  /*                                                                       */
-  /*    - Close the recording session by calling the "close" method.  It   */
-  /*      will return an error code if the hints were invalid or something */
-  /*      strange happened (e.g. memory shortage).                         */
-  /*                                                                       */
-  /*    The hints accumulated in the object can later be used by the       */
-  /*    Postscript hinter.                                                 */
-  /*                                                                       */
-  typedef struct T2_HintsRec_*  T2_Hints;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* @type:                                                                */
-  /*    T2_Hints_Funcs                                                     */
-  /*                                                                       */
-  /* @description:                                                         */
-  /*    A pointer to the @T2_Hints_FuncsRec structure that defines the API */
-  /*    of a given @T2_Hints object.                                       */
-  /*                                                                       */
-  typedef const struct T2_Hints_FuncsRec_*  T2_Hints_Funcs;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* @functype:                                                            */
-  /*    T2_Hints_OpenFunc                                                  */
-  /*                                                                       */
-  /* @description:                                                         */
-  /*    A method of the @T2_Hints class used to prepare it for a new       */
-  /*    Type 2 hints recording session.                                    */
-  /*                                                                       */
-  /* @input:                                                               */
-  /*    hints :: A handle to the Type 2 hints recorder.                    */
-  /*                                                                       */
-  /* @note:                                                                */
-  /*    You should always call the @T2_Hints_CloseFunc method in order to  */
-  /*    close an opened recording session.                                 */
-  /*                                                                       */
-  typedef void
-  (*T2_Hints_OpenFunc)( T2_Hints  hints );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* @functype:                                                            */
-  /*    T2_Hints_StemsFunc                                                 */
-  /*                                                                       */
-  /* @description:                                                         */
-  /*    A method of the @T2_Hints class used to set the table of stems in  */
-  /*    either the vertical or horizontal dimension.  Equivalent to the    */
-  /*    "hstem", "vstem", "hstemhm", and "vstemhm" Type 2 operators.       */
-  /*                                                                       */
-  /* @input:                                                               */
-  /*    hints     :: A handle to the Type 2 hints recorder.                */
-  /*                                                                       */
-  /*    dimension :: 0 for horizontal stems (hstem), 1 for vertical ones   */
-  /*                 (vstem).                                              */
-  /*                                                                       */
-  /*    count     :: The number of stems.                                  */
-  /*                                                                       */
-  /*    coords    :: An array of "count" (position,length) pairs.          */
-  /*                                                                       */
-  /* @note:                                                                */
-  /*    Use vertical coordinates (y) for horizontal stems (dim=0).  Use    */
-  /*    horizontal coordinates (x) for vertical stems (dim=1).             */
-  /*                                                                       */
-  /*    There are "2*count" elements in the "coords" aray.  Each even      */
-  /*    element is an absolute position in font units, each odd element is */
-  /*    a length in font units.                                            */
-  /*                                                                       */
-  /*    A length can be negative, in which case it must be either -20 or   */
-  /*    -21.  It will be interpreted as a "ghost" stem, according to the   */
-  /*    Type 1 specification.                                              */
-  /*                                                                       */
-  typedef void
-  (*T2_Hints_StemsFunc)( T2_Hints   hints,
-                         FT_UInt    dimension,
-                         FT_UInt    count,
-                         FT_Fixed*  coordinates );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* @functype:                                                            */
-  /*    T2_Hints_MaskFunc                                                  */
-  /*                                                                       */
-  /* @description:                                                         */
-  /*    A method of the @T2_Hints class used to set a given hintmask       */
-  /*    (this corresponds to the "hintmask" Type 2 operator).              */
-  /*                                                                       */
-  /* @input:                                                               */
-  /*    hints     :: A handle to the Type 2 hints recorder.                */
-  /*                                                                       */
-  /*    end_point :: The glyph index of the last point to which the        */
-  /*                 previously defined/activated hints apply.             */
-  /*                                                                       */
-  /*    bit_count :: The number of bits in the hint mask.                  */
-  /*                                                                       */
-  /*    bytes     :: An array of bytes modelling the hint mask.            */
-  /*                                                                       */
-  /* @note:                                                                */
-  /*    If the hintmask starts the charstring (before any glyph point      */
-  /*    definition), the value of "end_point" should be 0.                 */
-  /*                                                                       */
-  /*    "bit_count" is the number of meaningful bits in the "bytes" array; */
-  /*    it must be equal to the total number of hints defined so far       */
-  /*    (i.e. horizontal+verticals).                                       */
-  /*                                                                       */
-  /*    The "bytes" array can come directly from the Type 2 charstring and */
-  /*    respects the same format.                                          */
-  /*                                                                       */
-  typedef void
-  (*T2_Hints_MaskFunc)( T2_Hints        hints,
-                        FT_UInt         end_point,
-                        FT_UInt         bit_count,
-                        const FT_Byte*  bytes );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* @functype:                                                            */
-  /*    T2_Hints_CounterFunc                                               */
-  /*                                                                       */
-  /* @description:                                                         */
-  /*    A method of the @T2_Hints class used to set a given counter mask   */
-  /*    (this corresponds to the "hintmask" Type 2 operator).              */
-  /*                                                                       */
-  /* @input:                                                               */
-  /*    hints     :: A handle to the Type 2 hints recorder.                */
-  /*                                                                       */
-  /*    end_point :: A glyph index of the last point to which the          */
-  /*                 previously defined/active hints apply.                */
-  /*                                                                       */
-  /*    bit_count :: The number of bits in the hint mask.                  */
-  /*                                                                       */
-  /*    bytes     :: An array of bytes modelling the hint mask.            */
-  /*                                                                       */
-  /* @note:                                                                */
-  /*    If the hintmask starts the charstring (before any glyph point      */
-  /*    definition), the value of "end_point" should be 0.                 */
-  /*                                                                       */
-  /*    "bit_count" is the number of meaningful bits in the "bytes" array; */
-  /*    it must be equal to the total number of hints defined so far       */
-  /*    (i.e. horizontal+verticals).                                       */
-  /*                                                                       */
-  /*    The "bytes" array can come directly from the Type 2 charstring and */
-  /*    respects the same format.                                          */
-  /*                                                                       */
-  typedef void
-  (*T2_Hints_CounterFunc)( T2_Hints        hints,
-                           FT_UInt         bit_count,
-                           const FT_Byte*  bytes );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* @functype:                                                            */
-  /*    T2_Hints_CloseFunc                                                 */
-  /*                                                                       */
-  /* @description:                                                         */
-  /*    A method of the @T2_Hints class used to close a hint recording     */
-  /*    session.                                                           */
-  /*                                                                       */
-  /* @input:                                                               */
-  /*    hints     :: A handle to the Type 2 hints recorder.                */
-  /*                                                                       */
-  /*    end_point :: The index of the last point in the input glyph.       */
-  /*                                                                       */
-  /* @return:                                                              */
-  /*    FreeType error code.  0 means success.                             */
-  /*                                                                       */
-  /* @note:                                                                */
-  /*    The error code will be set to indicate that an error occured       */
-  /*    during the recording session.                                      */
-  /*                                                                       */
-  typedef FT_Error
-  (*T2_Hints_CloseFunc)( T2_Hints  hints,
-                         FT_UInt   end_point );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* @functype:                                                            */
-  /*    T2_Hints_ApplyFunc                                                 */
-  /*                                                                       */
-  /* @description:                                                         */
-  /*    A method of the @T2_Hints class used to apply hints to the         */
-  /*    corresponding glyph outline.  Must be called after the "close"     */
-  /*    method.                                                            */
-  /*                                                                       */
-  /* @input:                                                               */
-  /*    hints     :: A handle to the Type 2 hints recorder.                */
-  /*                                                                       */
-  /*    outline   :: A pointer to the target outline descriptor.           */
-  /*                                                                       */
-  /*    globals   :: The hinter globals for this font.                     */
-  /*                                                                       */
-  /*    hint_mode :: Hinting information.                                  */
-  /*                                                                       */
-  /* @return:                                                              */
-  /*   FreeType error code.  0 means success.                              */
-  /*                                                                       */
-  /* @note:                                                                */
-  /*    On input, all points within the outline are in font coordinates.   */
-  /*    On output, they are in 1/64th of pixels.                           */
-  /*                                                                       */
-  /*    The scaling transformation is taken from the "globals" object      */
-  /*    which must correspond to the same font than the glyph.             */
-  /*                                                                       */
-  typedef FT_Error
-  (*T2_Hints_ApplyFunc)( T2_Hints        hints,
-                         FT_Outline*     outline,
-                         PSH_Globals     globals,
-                         FT_Render_Mode  hint_mode );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* @struct:                                                              */
-  /*    T2_Hints_FuncsRec                                                  */
-  /*                                                                       */
-  /* @description:                                                         */
-  /*    The structure used to provide the API to @T2_Hints objects.        */
-  /*                                                                       */
-  /* @fields:                                                              */
-  /*    hints    :: A handle to the T2 hints recorder object.              */
-  /*                                                                       */
-  /*    open     :: The function to open a recording session.              */
-  /*                                                                       */
-  /*    close    :: The function to close a recording session.             */
-  /*                                                                       */
-  /*    stems    :: The function to set the dimension's stems table.       */
-  /*                                                                       */
-  /*    hintmask :: The function to set hint masks.                        */
-  /*                                                                       */
-  /*    counter  :: The function to set counter masks.                     */
-  /*                                                                       */
-  /*    apply    :: The function to apply the hints on the corresponding   */
-  /*                glyph outline.                                         */
-  /*                                                                       */
-  typedef struct  T2_Hints_FuncsRec_
-  {
-    T2_Hints              hints;
-    T2_Hints_OpenFunc     open;
-    T2_Hints_CloseFunc    close;
-    T2_Hints_StemsFunc    stems;
-    T2_Hints_MaskFunc     hintmask;
-    T2_Hints_CounterFunc  counter;
-    T2_Hints_ApplyFunc    apply;
-
-  } T2_Hints_FuncsRec;
-
-
-  /* */
-
-
-  typedef struct  PSHinter_Interface_
-  {
-    PSH_Globals_Funcs  (*get_globals_funcs)( FT_Module  module );
-    T1_Hints_Funcs     (*get_t1_funcs)     ( FT_Module  module );
-    T2_Hints_Funcs     (*get_t2_funcs)     ( FT_Module  module );
-
-  } PSHinter_Interface;
-
-  typedef PSHinter_Interface*  PSHinter_Service;
-
-
-FT_END_HEADER
-
-#endif /* __PSHINTS_H__ */
-
-
-/* END */

gpac-2.2.1.tar.gz/extra_lib/include/freetype/freetype/internal/psnames.h Deleted

@@ -1,241 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  psnames.h                                                              */
-/*                                                                         */
-/*    High-level interface for the `PSNames' module (in charge of          */
-/*    various functions related to Postscript glyph names conversion).     */
-/*                                                                         */
-/*  Copyright 1996-2001, 2002 by                                           */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef __PSNAMES_H__
-#define __PSNAMES_H__
-
-
-#include <ft2build.h>
-#include FT_FREETYPE_H
-
-
-FT_BEGIN_HEADER
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <FuncType>                                                            */
-  /*    PS_Unicode_Value_Func                                              */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A function used to return the Unicode index corresponding to a     */
-  /*    given glyph name.                                                  */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    glyph_name :: The glyph name.                                      */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    The Unicode character index resp. the non-Unicode value 0xFFFF if  */
-  /*    the glyph name has no known Unicode meaning.                       */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    This function is able to map several different glyph names to the  */
-  /*    same Unicode value, according to the rules defined in the Adobe    */
-  /*    Glyph List table.                                                  */
-  /*                                                                       */
-  /*    This function will not be compiled if the configuration macro      */
-  /*    FT_CONFIG_OPTION_ADOBE_GLYPH_LIST is undefined.                    */
-  /*                                                                       */
-  typedef FT_UInt32
-  (*PS_Unicode_Value_Func)( const char*  glyph_name );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <FuncType>                                                            */
-  /*    PS_Unicode_Index_Func                                              */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A function used to return the glyph index corresponding to a given */
-  /*    Unicode value.                                                     */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    num_glyphs  :: The number of glyphs in the face.                   */
-  /*                                                                       */
-  /*    glyph_names :: An array of glyph name pointers.                    */
-  /*                                                                       */
-  /*    unicode     :: The Unicode value.                                  */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    The glyph index resp. 0xFFFF if no glyph corresponds to this       */
-  /*    Unicode value.                                                     */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    This function is able to recognize several glyph names per Unicode */
-  /*    value, according to the Adobe Glyph List.                          */
-  /*                                                                       */
-  /*    This function will not be compiled if the configuration macro      */
-  /*    FT_CONFIG_OPTION_ADOBE_GLYPH_LIST is undefined.                    */
-  /*                                                                       */
-  typedef FT_UInt
-  (*PS_Unicode_Index_Func)( FT_UInt       num_glyphs,
-                            const char**  glyph_names,
-                            FT_ULong      unicode );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <FuncType>                                                            */
-  /*    PS_Macintosh_Name_Func                                             */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A function used to return the glyph name corresponding to an Apple */
-  /*    glyph name index.                                                  */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    name_index :: The index of the Mac name.                           */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    The glyph name, or 0 if the index is invalid.                      */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    This function will not be compiled if the configuration macro      */
-  /*    FT_CONFIG_OPTION_POSTSCRIPT_NAMES is undefined.                    */
-  /*                                                                       */
-  typedef const char*
-  (*PS_Macintosh_Name_Func)( FT_UInt  name_index );
-
-
-  typedef const char*
-  (*PS_Adobe_Std_Strings_Func)( FT_UInt  string_index );
-
-
-  typedef struct  PS_UniMap_
-  {
-    FT_UInt  unicode;
-    FT_UInt  glyph_index;
-
-  } PS_UniMap;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    PS_Unicodes                                                        */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A simple table used to map Unicode values to glyph indices.  It is */
-  /*    built by the PS_Build_Unicodes table according to the glyphs       */
-  /*    present in a font file.                                            */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    num_codes :: The number of glyphs in the font that match a given   */
-  /*                 Unicode value.                                        */
-  /*                                                                       */
-  /*    unicodes  :: An array of unicode values, sorted in increasing      */
-  /*                 order.                                                */
-  /*                                                                       */
-  /*    gindex    :: An array of glyph indices, corresponding to each      */
-  /*                 Unicode value.                                        */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    Use the function PS_Lookup_Unicode() to retrieve the glyph index   */
-  /*    corresponding to a given Unicode character code.                   */
-  /*                                                                       */
-  typedef struct  PS_Unicodes_
-  {
-    FT_UInt     num_maps;
-    PS_UniMap*  maps;
-
-  } PS_Unicodes;
-
-
-  typedef FT_Error
-  (*PS_Build_Unicodes_Func)( FT_Memory     memory,
-                             FT_UInt       num_glyphs,
-                             const char**  glyph_names,
-                             PS_Unicodes*  unicodes );
-
-  typedef FT_UInt
-  (*PS_Lookup_Unicode_Func)( PS_Unicodes*  unicodes,
-                             FT_UInt       unicode );
-
-  typedef FT_ULong
-  (*PS_Next_Unicode_Func)( PS_Unicodes*  unicodes,
-                           FT_ULong      unicode );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    PSNames_Interface                                                  */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    This structure defines the PSNames interface.                      */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    unicode_value         :: A function used to convert a glyph name   */
-  /*                             into a Unicode character code.            */
-  /*                                                                       */
-  /*    build_unicodes        :: A function which builds up the Unicode    */
-  /*                             mapping table.                            */
-  /*                                                                       */
-  /*    lookup_unicode        :: A function used to return the glyph index */
-  /*                             corresponding to a given Unicode          */
-  /*                             character.                                */
-  /*                                                                       */
-  /*    macintosh_name        :: A function used to return the standard    */
-  /*                             Apple glyph Postscript name corresponding */
-  /*                             to a given string index (used by the      */
-  /*                             TrueType `post' table).                   */
-  /*                                                                       */
-  /*    adobe_std_strings     :: A function that returns a pointer to a    */
-  /*                             Adobe Standard String for a given SID.    */
-  /*                                                                       */
-  /*    adobe_std_encoding    :: A table of 256 unsigned shorts that maps  */
-  /*                             character codes in the Adobe Standard     */
-  /*                             Encoding to SIDs.                         */
-  /*                                                                       */
-  /*    adobe_expert_encoding :: A table of 256 unsigned shorts that maps  */
-  /*                             character codes in the Adobe Expert       */
-  /*                             Encoding to SIDs.                         */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    `unicode_value' and `unicode_index' will be set to 0 if the        */
-  /*    configuration macro FT_CONFIG_OPTION_ADOBE_GLYPH_LIST is           */
-  /*    undefined.                                                         */
-  /*                                                                       */
-  /*    `macintosh_name' will be set to 0 if the configuration macro       */
-  /*    FT_CONFIG_OPTION_POSTSCRIPT_NAMES is undefined.                    */
-  /*                                                                       */
-  typedef struct  PSNames_Interface_
-  {
-    PS_Unicode_Value_Func      unicode_value;
-    PS_Build_Unicodes_Func     build_unicodes;
-    PS_Lookup_Unicode_Func     lookup_unicode;
-    PS_Macintosh_Name_Func     macintosh_name;
-
-    PS_Adobe_Std_Strings_Func  adobe_std_strings;
-    const unsigned short*      adobe_std_encoding;
-    const unsigned short*      adobe_expert_encoding;
-
-    PS_Next_Unicode_Func       next_unicode;
-
-  } PSNames_Interface;
-
-
-  typedef PSNames_Interface*  PSNames_Service;
-
-
-FT_END_HEADER
-
-#endif /* __PSNAMES_H__ */
-
-
-/* END */

gpac-2.2.1.tar.gz/extra_lib/include/freetype/freetype/internal/services Deleted

gpac-2.2.1.tar.gz/extra_lib/include/freetype/freetype/internal/services/svbdf.h Deleted

@@ -1,57 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  svbdf.h                                                                */
-/*                                                                         */
-/*    The FreeType BDF services (specification).                           */
-/*                                                                         */
-/*  Copyright 2003 by                                                      */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef __SVBDF_H__
-#define __SVBDF_H__
-
-#include FT_BDF_H
-#include FT_INTERNAL_SERVICE_H
-
-
-FT_BEGIN_HEADER
-
-
-#define FT_SERVICE_ID_BDF  "bdf"
-
-  typedef FT_Error
-  (*FT_BDF_GetCharsetIdFunc)( FT_Face       face,
-                              const char*  *acharset_encoding,
-                              const char*  *acharset_registry );
-
-  typedef FT_Error
-  (*FT_BDF_GetPropertyFunc)( FT_Face           face,
-                             const char*       prop_name,
-                             BDF_PropertyRec  *aproperty );
-
-
-  FT_DEFINE_SERVICE( BDF )
-  {
-    FT_BDF_GetCharsetIdFunc  get_charset_id;
-    FT_BDF_GetPropertyFunc   get_property;
-  };
-
-  /* */
-
-
-FT_END_HEADER
-
-
-#endif /* __SVBDF_H__ */
-
-
-/* END */

gpac-2.2.1.tar.gz/extra_lib/include/freetype/freetype/internal/services/svgldict.h Deleted

@@ -1,60 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  svgldict.h                                                             */
-/*                                                                         */
-/*    The FreeType glyph dictionary services (specification).              */
-/*                                                                         */
-/*  Copyright 2003 by                                                      */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef __SVGLDICT_H__
-#define __SVGLDICT_H__
-
-#include FT_INTERNAL_SERVICE_H
-
-
-FT_BEGIN_HEADER
-
-
-  /*
-   *  A service used to retrieve glyph names, as well as to find the
-   *  index of a given glyph name in a font.
-   *
-   */
-
-#define FT_SERVICE_ID_GLYPH_DICT  "glyph-dict"
-
-
-  typedef FT_Error
-  (*FT_GlyphDict_GetNameFunc)( FT_Face     face,
-                               FT_UInt     glyph_index,
-                               FT_Pointer  buffer,
-                               FT_UInt     buffer_max );
-
-  typedef FT_UInt
-  (*FT_GlyphDict_NameIndexFunc)( FT_Face     face,
-                                 FT_String*  glyph_name );
-
-
-  FT_DEFINE_SERVICE( GlyphDict )
-  {
-    FT_GlyphDict_GetNameFunc    get_name;
-    FT_GlyphDict_NameIndexFunc  name_index;  /* optional */
-  };
-
-  /* */
-
-
-FT_END_HEADER
-
-
-#endif /* __SVGLDICT_H__ */

gpac-2.2.1.tar.gz/extra_lib/include/freetype/freetype/internal/services/svmm.h Deleted

@@ -1,68 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  svmm.h                                                                 */
-/*                                                                         */
-/*    The FreeType Multiple Masters services (specification).              */
-/*                                                                         */
-/*  Copyright 2003 by                                                      */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef __SVMM_H__
-#define __SVMM_H__
-
-#include FT_INTERNAL_SERVICE_H
-
-
-FT_BEGIN_HEADER
-
-
-  /*
-   *  A service used to manage multiple-masters data in a given face.
-   *
-   *  See the related APIs in `ftmm.h' (FT_MULTIPLE_MASTERS_H).
-   *
-   */
-
-#define FT_SERVICE_ID_MULTI_MASTERS  "multi-masters"
-
-
-  typedef FT_Error
-  (*FT_Get_MM_Func)( FT_Face           face,
-                     FT_Multi_Master*  master );
-
-  typedef FT_Error
-  (*FT_Set_MM_Design_Func)( FT_Face   face,
-                            FT_UInt   num_coords,
-                            FT_Long*  coords );
-
-  typedef FT_Error
-  (*FT_Set_MM_Blend_Func)( FT_Face   face,
-                           FT_UInt   num_coords,
-                           FT_Long*  coords );
-
-
-  FT_DEFINE_SERVICE( MultiMasters )
-  {
-    FT_Get_MM_Func         get_mm;
-    FT_Set_MM_Design_Func  set_mm_design;
-    FT_Set_MM_Blend_Func   set_mm_blend;
-  };
-
-  /* */
-
-
-FT_END_HEADER
-
-#endif /* __SVMM_H__ */
-
-
-/* END */

gpac-2.2.1.tar.gz/extra_lib/include/freetype/freetype/internal/services/svpfr.h Deleted

@@ -1,65 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  svpfr.h                                                                */
-/*                                                                         */
-/*    Internal PFR service functions (specification).                      */
-/*                                                                         */
-/*  Copyright 2003 by                                                      */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef __SVPFR_H__
-#define __SVPFR_H__
-
-#include FT_INTERNAL_SERVICE_H
-
-
-FT_BEGIN_HEADER
-
-
-#define FT_SERVICE_ID_PFR_METRICS  "pfr-metrics"
-
-
-  typedef FT_Error
-  (*FT_PFR_GetMetricsFunc)( FT_Face    face,
-                            FT_UInt   *aoutline,
-                            FT_UInt   *ametrics,
-                            FT_Fixed  *ax_scale,
-                            FT_Fixed  *ay_scale );
-
-  typedef FT_Error
-  (*FT_PFR_GetKerningFunc)( FT_Face     face,
-                            FT_UInt     left,
-                            FT_UInt     right,
-                            FT_Vector  *avector );
-
-  typedef FT_Error
-  (*FT_PFR_GetAdvanceFunc)( FT_Face   face,
-                            FT_UInt   gindex,
-                            FT_Pos   *aadvance );
-
-
-  FT_DEFINE_SERVICE( PfrMetrics )
-  {
-    FT_PFR_GetMetricsFunc  get_metrics;
-    FT_PFR_GetKerningFunc  get_kerning;
-    FT_PFR_GetAdvanceFunc  get_advance;
-
-  };
-
- /* */
-
-FT_END_HEADER
-
-#endif /* __SVPFR_H__ */
-
-
-/* END */

gpac-2.2.1.tar.gz/extra_lib/include/freetype/freetype/internal/services/svpostnm.h Deleted

@@ -1,58 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  svpostnm.h                                                             */
-/*                                                                         */
-/*    The FreeType PostScript name services (specification).               */
-/*                                                                         */
-/*  Copyright 2003 by                                                      */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef __SVPOSTNM_H__
-#define __SVPOSTNM_H__
-
-#include FT_INTERNAL_SERVICE_H
-
-
-FT_BEGIN_HEADER
-
-  /*
-   *  A trivial service used to retrieve the PostScript name of a given
-   *  font when available.  The `get_name' field should never be NULL.
-   *
-   *  The correponding function can return NULL to indicate that the
-   *  PostScript name is not available.
-   *
-   *  The name is owned by the face and will be destroyed with it.
-   */
-
-#define FT_SERVICE_ID_POSTSCRIPT_FONT_NAME  "postscript-font-name"
-
-
-  typedef const char*
-  (*FT_PsName_GetFunc)( FT_Face  face );
-
-
-  FT_DEFINE_SERVICE( PsFontName )
-  {
-    FT_PsName_GetFunc  get_ps_font_name;
-  };
-
-  /* */
-
-
-FT_END_HEADER
-
-
-#endif /* __SVPOSTNM_H__ */
-
-
-/* END */

gpac-2.2.1.tar.gz/extra_lib/include/freetype/freetype/internal/services/svpscmap.h Deleted

@@ -1,113 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  svpscmap.h                                                             */
-/*                                                                         */
-/*    The FreeType PostScript charmap service (specification).             */
-/*                                                                         */
-/*  Copyright 2003 by                                                      */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef __SVPSCMAP_H__
-#define __SVPSCMAP_H__
-
-
-FT_BEGIN_HEADER
-
-
-#define FT_SERVICE_ID_POSTSCRIPT_CMAPS  "postscript-cmaps"
-
-
-  /*
-   *  Adobe glyph name to unicode value
-   */
-  typedef FT_UInt32
-  (*PS_Unicode_ValueFunc)( const char*  glyph_name );
-
-  /*
-   *  Unicode value to Adobe glyph name index.  0xFFFF if not found.
-   */
-  typedef FT_UInt
-  (*PS_Unicode_Index_Func)( FT_UInt       num_glyphs,
-                            const char**  glyph_names,
-                            FT_ULong      unicode );
-
-  /*
-   *  Macintosh name id to glyph name.  NULL if invalid index.
-   */
-  typedef const char*
-  (*PS_Macintosh_Name_Func)( FT_UInt  name_index );
-
-  /*
-   *  Adobe standard string ID to glyph name.  NULL if invalid index.
-   */
-  typedef const char*
-  (*PS_Adobe_Std_Strings_Func)( FT_UInt  string_index );
-
-  /*
-   *  Simple unicode -> glyph index charmap built from font glyph names
-   *  table.
-   */
-  typedef struct  PS_UniMap_
-  {
-    FT_UInt  unicode;
-    FT_UInt  glyph_index;
-
-  } PS_UniMap;
-
-
-  typedef struct  PS_Unicodes_
-  {
-    FT_UInt     num_maps;
-    PS_UniMap*  maps;
-
-  } PS_Unicodes;
-
-
-  typedef FT_Error
-  (*PS_Unicodes_InitFunc)( FT_Memory     memory,
-                           FT_UInt       num_glyphs,
-                           const char**  glyph_names,
-                           PS_Unicodes*  unicodes );
-
-  typedef FT_UInt
-  (*PS_Unicodes_CharIndexFunc)( PS_Unicodes*  unicodes,
-                                FT_UInt       unicode );
-
-  typedef FT_ULong
-  (*PS_Unicodes_CharNextFunc)( PS_Unicodes*  unicodes,
-                               FT_ULong      unicode );
-
-
-  FT_DEFINE_SERVICE( PsCMaps )
-  {
-    PS_Unicode_ValueFunc       unicode_value;
-
-    PS_Unicodes_InitFunc       unicodes_init;
-    PS_Unicodes_CharIndexFunc  unicodes_char_index;
-    PS_Unicodes_CharNextFunc   unicodes_char_next;
-
-    PS_Macintosh_Name_Func     macintosh_name;
-    PS_Adobe_Std_Strings_Func  adobe_std_strings;
-    const unsigned short*      adobe_std_encoding;
-    const unsigned short*      adobe_expert_encoding;
-  };
-
-  /* */
-
-
-FT_END_HEADER
-
-
-#endif /* __SVPSCMAP_H__ */
-
-
-/* END */

gpac-2.2.1.tar.gz/extra_lib/include/freetype/freetype/internal/services/svpsinfo.h Deleted

@@ -1,55 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  svpsinfo.h                                                             */
-/*                                                                         */
-/*    The FreeType PostScript info service (specification).                */
-/*                                                                         */
-/*  Copyright 2003 by                                                      */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef __SVPSINFO_H__
-#define __SVPSINFO_H__
-
-#include FT_INTERNAL_SERVICE_H
-#include FT_INTERNAL_TYPE1_TYPES_H
-
-
-FT_BEGIN_HEADER
-
-
-#define FT_SERVICE_ID_POSTSCRIPT_INFO  "postscript-info"
-
-
-  typedef FT_Error
-  (*PS_GetFontInfoFunc)( FT_Face          face,
-                         PS_FontInfoRec*  afont_info );
-
-  typedef FT_Int
-  (*PS_HasGlyphNamesFunc)( FT_Face   face );
-
-
-  FT_DEFINE_SERVICE( PsInfo )
-  {
-    PS_GetFontInfoFunc    ps_get_font_info;
-    PS_HasGlyphNamesFunc  ps_has_glyph_names;
-  };
-
-  /* */
-
-
-FT_END_HEADER
-
-
-#endif /* __SVPSINFO_H__ */
-
-
-/* END */

gpac-2.2.1.tar.gz/extra_lib/include/freetype/freetype/internal/services/svsfnt.h Deleted

@@ -1,69 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  svsfnt.h                                                               */
-/*                                                                         */
-/*    The FreeType PostScript name services (specification).               */
-/*                                                                         */
-/*  Copyright 2003 by                                                      */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef __SVSFNT_H__
-#define __SVSFNT_H__
-
-#include FT_INTERNAL_SERVICE_H
-#include FT_TRUETYPE_TABLES_H
-
-
-FT_BEGIN_HEADER
-
-
-  /*
-   *  SFNT table loading service.
-   */
-
-#define FT_SERVICE_ID_SFNT_TABLE  "sfnt-table"
-
-
-  /*
-   * Used to implement FT_Load_Sfnt_Table().
-   */
-  typedef FT_Error
-  (*FT_SFNT_TableLoadFunc)( FT_Face    face,
-                            FT_ULong   tag,
-                            FT_Long    offset,
-                            FT_Byte*   buffer,
-                            FT_ULong*  length );
-
-  /*
-   * Used to implement FT_Get_Sfnt_Table().
-   */
-  typedef void*
-  (*FT_SFNT_TableGetFunc)( FT_Face      face,
-                           FT_Sfnt_Tag  tag );
-
- 
-  FT_DEFINE_SERVICE( SFNT_Table )
-  {
-    FT_SFNT_TableLoadFunc  load_table;
-    FT_SFNT_TableGetFunc   get_table;
-  };
-
-  /* */
-
- 
-FT_END_HEADER
-
-
-#endif /* __SVSFNT_H__ */
-
-
-/* END */

gpac-2.2.1.tar.gz/extra_lib/include/freetype/freetype/internal/services/svwinfnt.h Deleted

@@ -1,50 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  svwinfnt.h                                                             */
-/*                                                                         */
-/*    The FreeType Windows FNT/FONT service (specification).               */
-/*                                                                         */
-/*  Copyright 2003 by                                                      */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef __SVWINFNT_H__
-#define __SVWINFNT_H__
-
-#include FT_INTERNAL_SERVICE_H
-#include FT_WINFONTS_H
-
-
-FT_BEGIN_HEADER
-
-
-#define FT_SERVICE_ID_WINFNT  "winfonts"
-
-  typedef FT_Error
-  (*FT_WinFnt_GetHeaderFunc)( FT_Face               face,
-                              FT_WinFNT_HeaderRec  *aheader );
-
-
-  FT_DEFINE_SERVICE( WinFnt )
-  {
-    FT_WinFnt_GetHeaderFunc  get_header;
-  };
-
-  /* */
-
-
-FT_END_HEADER
-
-
-#endif /* __SVWINFNT_H__ */
-
-
-/* END */

gpac-2.2.1.tar.gz/extra_lib/include/freetype/freetype/internal/services/svxf86nm.h Deleted

@@ -1,55 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  svxf86nm.h                                                             */
-/*                                                                         */
-/*    The FreeType XFree86 services (specification only).                  */
-/*                                                                         */
-/*  Copyright 2003 by                                                      */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef __SVXF86NM_H__
-#define __SVXF86NM_H__
-
-#include FT_INTERNAL_SERVICE_H
-
-
-FT_BEGIN_HEADER
-
-
-  /*
-   *  A trivial service used to return the name of a face's font driver,
-   *  according to the XFree86 nomenclature.  Note that the service data
-   *  is a simple constant string pointer.
-   */
-
-#define FT_SERVICE_ID_XF86_NAME  "xf86-driver-name"
-
-#define FT_XF86_FORMAT_TRUETYPE  "TrueType"
-#define FT_XF86_FORMAT_TYPE_1    "Type 1"
-#define FT_XF86_FORMAT_BDF       "BDF"
-#define FT_XF86_FORMAT_PCF       "PCF"
-#define FT_XF86_FORMAT_TYPE_42   "Type 42"
-#define FT_XF86_FORMAT_CID       "CID Type 1"
-#define FT_XF86_FORMAT_CFF       "CFF"
-#define FT_XF86_FORMAT_PFR       "PFR"
-#define FT_XF86_FORMAT_WINFNT    "Windows FNT"
-
-  /* */
-
- 
-FT_END_HEADER
-
-
-#endif /* __SVXF86NM_H__ */
-
-
-/* END */

gpac-2.2.1.tar.gz/extra_lib/include/freetype/freetype/internal/sfnt.h Deleted

@@ -1,529 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  sfnt.h                                                                 */
-/*                                                                         */
-/*    High-level `sfnt' driver interface (specification).                  */
-/*                                                                         */
-/*  Copyright 1996-2001, 2002, 2003 by                                     */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef __SFNT_H__
-#define __SFNT_H__
-
-
-#include <ft2build.h>
-#include FT_INTERNAL_DRIVER_H
-#include FT_INTERNAL_TRUETYPE_TYPES_H
-
-
-FT_BEGIN_HEADER
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <FuncType>                                                            */
-  /*    TT_Init_Face_Func                                                  */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    First part of the SFNT face object initialization.  This will find */
-  /*    the face in a SFNT file or collection, and load its format tag in  */
-  /*    face->format_tag.                                                  */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    stream     :: The input stream.                                    */
-  /*                                                                       */
-  /*    face       :: A handle to the target face object.                  */
-  /*                                                                       */
-  /*    face_index :: The index of the TrueType font, if we are opening a  */
-  /*                  collection.                                          */
-  /*                                                                       */
-  /*    num_params :: The number of additional parameters.                 */
-  /*                                                                       */
-  /*    params     :: Optional additional parameters.                      */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0 means success.                             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    The stream cursor must be at the font file's origin.               */
-  /*                                                                       */
-  /*    This function recognizes fonts embedded in a `TrueType             */
-  /*    collection'.                                                       */
-  /*                                                                       */
-  /*    Once the format tag has been validated by the font driver, it      */
-  /*    should then call the TT_Load_Face_Func() callback to read the rest */
-  /*    of the SFNT tables in the object.                                  */
-  /*                                                                       */
-  typedef FT_Error
-  (*TT_Init_Face_Func)( FT_Stream      stream,
-                        TT_Face        face,
-                        FT_Int         face_index,
-                        FT_Int         num_params,
-                        FT_Parameter*  params );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <FuncType>                                                            */
-  /*    TT_Load_Face_Func                                                  */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Second part of the SFNT face object initialization.  This will     */
-  /*    load the common SFNT tables (head, OS/2, maxp, metrics, etc.) in   */
-  /*    the face object.                                                   */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    stream     :: The input stream.                                    */
-  /*                                                                       */
-  /*    face       :: A handle to the target face object.                  */
-  /*                                                                       */
-  /*    face_index :: The index of the TrueType font, if we are opening a  */
-  /*                  collection.                                          */
-  /*                                                                       */
-  /*    num_params :: The number of additional parameters.                 */
-  /*                                                                       */
-  /*    params     :: Optional additional parameters.                      */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0 means success.                             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    This function must be called after TT_Init_Face_Func().            */
-  /*                                                                       */
-  typedef FT_Error
-  (*TT_Load_Face_Func)( FT_Stream      stream,
-                        TT_Face        face,
-                        FT_Int         face_index,
-                        FT_Int         num_params,
-                        FT_Parameter*  params );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <FuncType>                                                            */
-  /*    TT_Done_Face_Func                                                  */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A callback used to delete the common SFNT data from a face.        */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    face :: A handle to the target face object.                        */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    This function does NOT destroy the face object.                    */
-  /*                                                                       */
-  typedef void
-  (*TT_Done_Face_Func)( TT_Face  face );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <FuncType>                                                            */
-  /*    TT_Load_SFNT_HeaderRec_Func                                        */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Loads the header of a SFNT font file.  Supports collections.       */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    face       :: A handle to the target face object.                  */
-  /*                                                                       */
-  /*    stream     :: The input stream.                                    */
-  /*                                                                       */
-  /*    face_index :: The index of the TrueType font, if we are opening a  */
-  /*                  collection.                                          */
-  /*                                                                       */
-  /* <Output>                                                              */
-  /*    sfnt       :: The SFNT header.                                     */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0 means success.                             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    The stream cursor must be at the font file's origin.               */
-  /*                                                                       */
-  /*    This function recognizes fonts embedded in a `TrueType             */
-  /*    collection'.                                                       */
-  /*                                                                       */
-  /*    This function checks that the header is valid by looking at the    */
-  /*    values of `search_range', `entry_selector', and `range_shift'.     */
-  /*                                                                       */
-  typedef FT_Error
-  (*TT_Load_SFNT_HeaderRec_Func)( TT_Face      face,
-                                  FT_Stream    stream,
-                                  FT_Long      face_index,
-                                  SFNT_Header  sfnt );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <FuncType>                                                            */
-  /*    TT_Load_Directory_Func                                             */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Loads the table directory into a face object.                      */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    face      :: A handle to the target face object.                   */
-  /*                                                                       */
-  /*    stream    :: The input stream.                                     */
-  /*                                                                       */
-  /*    sfnt      :: The SFNT header.                                      */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0 means success.                             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    The stream cursor must be on the first byte after the 4-byte font  */
-  /*    format tag.  This is the case just after a call to                 */
-  /*    TT_Load_Format_Tag().                                              */
-  /*                                                                       */
-  typedef FT_Error
-  (*TT_Load_Directory_Func)( TT_Face      face,
-                             FT_Stream    stream,
-                             SFNT_Header  sfnt );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <FuncType>                                                            */
-  /*    TT_Load_Any_Func                                                   */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Loads any font table into client memory.                           */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    face   :: The face object to look for.                             */
-  /*                                                                       */
-  /*    tag    :: The tag of table to load.  Use the value 0 if you want   */
-  /*              to access the whole font file, else set this parameter   */
-  /*              to a valid TrueType table tag that you can forge with    */
-  /*              the MAKE_TT_TAG macro.                                   */
-  /*                                                                       */
-  /*    offset :: The starting offset in the table (or the file if         */
-  /*              tag == 0).                                               */
-  /*                                                                       */
-  /*    length :: The address of the decision variable:                    */
-  /*                                                                       */
-  /*                If length == NULL:                                     */
-  /*                  Loads the whole table.  Returns an error if          */
-  /*                  `offset' == 0!                                       */
-  /*                                                                       */
-  /*                If *length == 0:                                       */
-  /*                  Exits immediately; returning the length of the given */
-  /*                  table or of the font file, depending on the value of */
-  /*                  `tag'.                                               */
-  /*                                                                       */
-  /*                If *length != 0:                                       */
-  /*                  Loads the next `length' bytes of table or font,      */
-  /*                  starting at offset `offset' (in table or font too).  */
-  /*                                                                       */
-  /* <Output>                                                              */
-  /*    buffer :: The address of target buffer.                            */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    TrueType error code.  0 means success.                             */
-  /*                                                                       */
-  typedef FT_Error
-  (*TT_Load_Any_Func)( TT_Face    face,
-                       FT_ULong   tag,
-                       FT_Long    offset,
-                       FT_Byte   *buffer,
-                       FT_ULong*  length );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <FuncType>                                                            */
-  /*    TT_Load_SBit_Image_Func                                            */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Loads a given glyph sbit image from the font resource.  This also  */
-  /*    returns its metrics.                                               */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    face        :: The target face object.                             */
-  /*                                                                       */
-  /*    x_ppem      :: The horizontal resolution in points per EM.         */
-  /*                                                                       */
-  /*    y_ppem      :: The vertical resolution in points per EM.           */
-  /*                                                                       */
-  /*    glyph_index :: The current glyph index.                            */
-  /*                                                                       */
-  /*    stream      :: The input stream.                                   */
-  /*                                                                       */
-  /* <Output>                                                              */
-  /*    amap        :: The target pixmap.                                  */
-  /*                                                                       */
-  /*    ametrics    :: A big sbit metrics structure for the glyph image.   */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0 means success.  Returns an error if no     */
-  /*    glyph sbit exists for the index.                                   */
-  /*                                                                       */
-  /*  <Note>                                                               */
-  /*    The `map.buffer' field is always freed before the glyph is loaded. */
-  /*                                                                       */
-  typedef FT_Error
-  (*TT_Load_SBit_Image_Func)( TT_Face              face,
-                              FT_ULong             strike_index,
-                              FT_UInt              glyph_index,
-                              FT_UInt              load_flags,
-                              FT_Stream            stream,
-                              FT_Bitmap           *amap,
-                              TT_SBit_MetricsRec  *ametrics );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <FuncType>                                                            */
-  /*    TT_Set_SBit_Strike_Func                                            */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Selects an sbit strike for given horizontal and vertical ppem      */
-  /*    values.                                                            */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    face          :: The target face object.                           */
-  /*                                                                       */
-  /*    x_ppem        :: The horizontal resolution in points per EM.       */
-  /*                                                                       */
-  /*    y_ppem        :: The vertical resolution in points per EM.         */
-  /*                                                                       */
-  /* <Output>                                                              */
-  /*    astrike_index :: The index of the sbit strike.                     */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0 means success.  Returns an error if no     */
-  /*    sbit strike exists for the selected ppem values.                   */
-  /*                                                                       */
-  typedef FT_Error
-  (*TT_Set_SBit_Strike_Func)( TT_Face    face,
-                              FT_Int     x_ppem,
-                              FT_Int     y_ppem,
-                              FT_ULong  *astrike_index );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <FuncType>                                                            */
-  /*    TT_Get_PS_Name_Func                                                */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Gets the PostScript glyph name of a glyph.                         */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    idx  :: The glyph index.                                           */
-  /*                                                                       */
-  /*    PSname :: The address of a string pointer.  Will be NULL in case   */
-  /*              of error, otherwise it is a pointer to the glyph name.   */
-  /*                                                                       */
-  /*              You must not modify the returned string!                 */
-  /*                                                                       */
-  /* <Output>                                                              */
-  /*    FreeType error code.  0 means success.                             */
-  /*                                                                       */
-  typedef FT_Error
-  (*TT_Get_PS_Name_Func)( TT_Face      face,
-                          FT_UInt      idx,
-                          FT_String**  PSname );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <FuncType>                                                            */
-  /*    TT_Load_Metrics_Func                                               */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Loads the horizontal or vertical header in a face object.          */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    face     :: A handle to the target face object.                    */
-  /*                                                                       */
-  /*    stream   :: The input stream.                                      */
-  /*                                                                       */
-  /*    vertical :: A boolean flag.  If set, load vertical metrics.        */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0 means success.                             */
-  /*                                                                       */
-  typedef FT_Error
-  (*TT_Load_Metrics_Func)( TT_Face    face,
-                           FT_Stream  stream,
-                           FT_Bool    vertical );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <FuncType>                                                            */
-  /*    TT_CharMap_Load_Func                                               */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Loads a given TrueType character map into memory.                  */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    face   :: A handle to the parent face object.                      */
-  /*                                                                       */
-  /*    stream :: A handle to the current stream object.                   */
-  /*                                                                       */
-  /* <InOut>                                                               */
-  /*    cmap   :: A pointer to a cmap object.                              */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0 means success.                             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    The function assumes that the stream is already in use (i.e.,      */
-  /*    opened).  In case of error, all partially allocated tables are     */
-  /*    released.                                                          */
-  /*                                                                       */
-  typedef FT_Error
-  (*TT_CharMap_Load_Func)( TT_Face       face,
-                           TT_CMapTable  cmap,
-                           FT_Stream     input );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <FuncType>                                                            */
-  /*    TT_CharMap_Free_Func                                               */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Destroys a character mapping table.                                */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    face :: A handle to the parent face object.                        */
-  /*                                                                       */
-  /*    cmap :: A handle to a cmap object.                                 */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0 means success.                             */
-  /*                                                                       */
-  typedef FT_Error
-  (*TT_CharMap_Free_Func)( TT_Face       face,
-                           TT_CMapTable  cmap );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <FuncType>                                                            */
-  /*    TT_Load_Table_Func                                                 */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Loads a given TrueType table.                                      */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    face   :: A handle to the target face object.                      */
-  /*                                                                       */
-  /*    stream :: The input stream.                                        */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0 means success.                             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    The function will use `face->goto_table' to seek the stream to     */
-  /*    the start of the table.                                            */
-  /*                                                                       */
-  typedef FT_Error
-  (*TT_Load_Table_Func)( TT_Face    face,
-                         FT_Stream  stream );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <FuncType>                                                            */
-  /*    TT_Free_Table_Func                                                 */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Frees a given TrueType table.                                      */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    face :: A handle to the target face object.                        */
-  /*                                                                       */
-  typedef void
-  (*TT_Free_Table_Func)( TT_Face  face );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    SFNT_Interface                                                     */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    This structure holds pointers to the functions used to load and    */
-  /*    free the basic tables that are required in a `sfnt' font file.     */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    Check the various xxx_Func() descriptions for details.             */
-  /*                                                                       */
-  typedef struct  SFNT_Interface_
-  {
-    TT_Loader_GotoTableFunc      goto_table;
-
-    TT_Init_Face_Func            init_face;
-    TT_Load_Face_Func            load_face;
-    TT_Done_Face_Func            done_face;
-    FT_Module_Requester          get_interface;
-
-    TT_Load_Any_Func             load_any;
-    TT_Load_SFNT_HeaderRec_Func  load_sfnt_header;
-    TT_Load_Directory_Func       load_directory;
-
-    /* these functions are called by `load_face' but they can also  */
-    /* be called from external modules, if there is a need to do so */
-    TT_Load_Table_Func           load_header;
-    TT_Load_Metrics_Func         load_metrics;
-    TT_Load_Table_Func           load_charmaps;
-    TT_Load_Table_Func           load_max_profile;
-    TT_Load_Table_Func           load_os2;
-    TT_Load_Table_Func           load_psnames;
-
-    TT_Load_Table_Func           load_names;
-    TT_Free_Table_Func           free_names;
-
-    /* optional tables */
-    TT_Load_Table_Func           load_hdmx;
-    TT_Free_Table_Func           free_hdmx;
-
-    TT_Load_Table_Func           load_kerning;
-    TT_Load_Table_Func           load_gasp;
-    TT_Load_Table_Func           load_pclt;
-
-    /* see `ttload.h' */
-    TT_Load_Table_Func           load_bitmap_header;
-
-    /* see `ttsbit.h' */
-    TT_Set_SBit_Strike_Func      set_sbit_strike;
-    TT_Load_Table_Func           load_sbits;
-    TT_Load_SBit_Image_Func      load_sbit_image;
-    TT_Free_Table_Func           free_sbits;
-
-    /* see `ttpost.h' */
-    TT_Get_PS_Name_Func          get_psname;
-    TT_Free_Table_Func           free_psnames;
-
-    /* see `ttcmap.h' */
-    TT_CharMap_Load_Func         load_charmap;
-    TT_CharMap_Free_Func         free_charmap;
-
-  } SFNT_Interface;
-
-
-  /* transitional */
-  typedef SFNT_Interface*   SFNT_Service;
-
-
-FT_END_HEADER
-
-#endif /* __SFNT_H__ */
-
-
-/* END */

gpac-2.2.1.tar.gz/extra_lib/include/freetype/freetype/internal/t1types.h Deleted

@@ -1,200 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  t1types.h                                                              */
-/*                                                                         */
-/*    Basic Type1/Type2 type definitions and interface (specification      */
-/*    only).                                                               */
-/*                                                                         */
-/*  Copyright 1996-2001, 2002, 2003 by                                     */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef __T1TYPES_H__
-#define __T1TYPES_H__
-
-
-#include <ft2build.h>
-#include FT_TYPE1_TABLES_H
-#include FT_INTERNAL_POSTSCRIPT_HINTS_H
-#include FT_INTERNAL_SERVICE_H
-#include FT_SERVICE_POSTSCRIPT_CMAPS_H
-
-
-FT_BEGIN_HEADER
-
-
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-  /***                                                                   ***/
-  /***                                                                   ***/
-  /***              REQUIRED TYPE1/TYPE2 TABLES DEFINITIONS              ***/
-  /***                                                                   ***/
-  /***                                                                   ***/
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    T1_EncodingRec                                                     */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A structure modeling a custom encoding.                            */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    num_chars  :: The number of character codes in the encoding.       */
-  /*                  Usually 256.                                         */
-  /*                                                                       */
-  /*    code_first :: The lowest valid character code in the encoding.     */
-  /*                                                                       */
-  /*    code_last  :: The highest valid character code in the encoding.    */
-  /*                                                                       */
-  /*    char_index :: An array of corresponding glyph indices.             */
-  /*                                                                       */
-  /*    char_name  :: An array of corresponding glyph names.               */
-  /*                                                                       */
-  typedef struct  T1_EncodingRecRec_
-  {
-    FT_Int       num_chars;
-    FT_Int       code_first;
-    FT_Int       code_last;
-
-    FT_UShort*   char_index;
-    FT_String**  char_name;
-
-  } T1_EncodingRec, *T1_Encoding;
-
-
-  typedef enum  T1_EncodingType_
-  {
-    T1_ENCODING_TYPE_NONE = 0,
-    T1_ENCODING_TYPE_ARRAY,
-    T1_ENCODING_TYPE_STANDARD,
-    T1_ENCODING_TYPE_ISOLATIN1,
-    T1_ENCODING_TYPE_EXPERT
-
-  } T1_EncodingType;
-
-
-  typedef struct  T1_FontRec_
-  {
-    PS_FontInfoRec   font_info;         /* font info dictionary */
-    PS_PrivateRec    private_dict;      /* private dictionary   */
-    FT_String*       font_name;         /* top-level dictionary */
-
-    T1_EncodingType  encoding_type;
-    T1_EncodingRec   encoding;
-
-    FT_Byte*         subrs_block;
-    FT_Byte*         charstrings_block;
-    FT_Byte*         glyph_names_block;
-
-    FT_Int           num_subrs;
-    FT_Byte**        subrs;
-    FT_Int*          subrs_len;
-
-    FT_Int           num_glyphs;
-    FT_String**      glyph_names;       /* array of glyph names       */
-    FT_Byte**        charstrings;       /* array of glyph charstrings */
-    FT_Int*          charstrings_len;
-
-    FT_Byte          paint_type;
-    FT_Byte          font_type;
-    FT_Matrix        font_matrix;
-    FT_Vector        font_offset;
-    FT_BBox          font_bbox;
-    FT_Long          font_id;
-
-    FT_Fixed         stroke_width;
-
-  } T1_FontRec, *T1_Font;
-
-
-  typedef struct  CID_SubrsRec_
-  {
-    FT_UInt    num_subrs;
-    FT_Byte**  code;
-
-  } CID_SubrsRec, *CID_Subrs;
-
-
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-  /***                                                                   ***/
-  /***                                                                   ***/
-  /***                ORIGINAL T1_FACE CLASS DEFINITION                  ***/
-  /***                                                                   ***/
-  /***                                                                   ***/
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* This structure/class is defined here because it is common to the      */
-  /* following formats: TTF, OpenType-TT, and OpenType-CFF.                */
-  /*                                                                       */
-  /* Note, however, that the classes TT_Size, TT_GlyphSlot, and TT_CharMap */
-  /* are not shared between font drivers, and are thus defined normally in */
-  /* `ttobjs.h'.                                                           */
-  /*                                                                       */
-  /*************************************************************************/
-
-  typedef struct T1_FaceRec_*   T1_Face;
-  typedef struct CID_FaceRec_*  CID_Face;
-
-
-  typedef struct  T1_FaceRec_
-  {
-    FT_FaceRec     root;
-    T1_FontRec     type1;
-    const void*    psnames;
-    const void*    psaux;
-    const void*    afm_data;
-    FT_CharMapRec  charmaprecs2;
-    FT_CharMap     charmaps2;
-    PS_Unicodes    unicode_map;
-
-    /* support for Multiple Masters fonts */
-    PS_Blend       blend;
-
-    /* since FT 2.1 - interface to PostScript hinter */
-    const void*    pshinter;
-
-  } T1_FaceRec;
-
-
-  typedef struct  CID_FaceRec_
-  {
-    FT_FaceRec       root;
-    void*            psnames;
-    void*            psaux;
-    CID_FaceInfoRec  cid;
-    void*            afm_data;
-    CID_Subrs        subrs;
-
-    /* since FT 2.1 - interface to PostScript hinter */
-    void*            pshinter;
-
-  } CID_FaceRec;
-
-
-FT_END_HEADER
-
-#endif /* __T1TYPES_H__ */
-
-
-/* END */

gpac-2.2.1.tar.gz/extra_lib/include/freetype/freetype/internal/t42types.h Deleted

@@ -1,55 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  t42types.h                                                             */
-/*                                                                         */
-/*    Type 42 font data types (specification only).                        */
-/*                                                                         */
-/*  Copyright 2002 by Roberto Alameda.                                     */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef __T42TYPES_H__
-#define __T42TYPES_H__
-
-
-#include <ft2build.h>
-#include FT_FREETYPE_H
-#include FT_TYPE1_TABLES_H
-#include FT_INTERNAL_TYPE1_TYPES_H
-#include FT_INTERNAL_POSTSCRIPT_NAMES_H
-#include FT_INTERNAL_POSTSCRIPT_HINTS_H
-
-
-FT_BEGIN_HEADER
-
-
-  typedef struct  T42_FaceRec_
-  {
-    FT_FaceRec     root;
-    T1_FontRec     type1;
-    const void*    psnames;
-    const void*    psaux;
-    const void*    afm_data;
-    FT_Byte*       ttf_data;
-    FT_ULong       ttf_size;
-    FT_Face        ttf_face;
-    FT_CharMapRec  charmaprecs2;
-    FT_CharMap     charmaps2;
-    PS_Unicodes    unicode_map;
-
-  } T42_FaceRec, *T42_Face;
-
-
-FT_END_HEADER
-
-#endif /* __T1TYPES_H__ */
-
-
-/* END */

gpac-2.2.1.tar.gz/extra_lib/include/freetype/freetype/internal/tttypes.h Deleted

@@ -1,1678 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  tttypes.h                                                              */
-/*                                                                         */
-/*    Basic SFNT/TrueType type definitions and interface (specification    */
-/*    only).                                                               */
-/*                                                                         */
-/*  Copyright 1996-2001, 2002 by                                           */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef __TTTYPES_H__
-#define __TTTYPES_H__
-
-
-#include <ft2build.h>
-#include FT_TRUETYPE_TABLES_H
-#include FT_INTERNAL_OBJECTS_H
-
-
-FT_BEGIN_HEADER
-
-
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-  /***                                                                   ***/
-  /***                                                                   ***/
-  /***             REQUIRED TRUETYPE/OPENTYPE TABLES DEFINITIONS         ***/
-  /***                                                                   ***/
-  /***                                                                   ***/
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    TTC_HeaderRec                                                      */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    TrueType collection header.  This table contains the offsets of    */
-  /*    the font headers of each distinct TrueType face in the file.       */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    tag     :: Must be `ttc ' to indicate a TrueType collection.       */
-  /*                                                                       */
-  /*    version :: The version number.                                     */
-  /*                                                                       */
-  /*    count   :: The number of faces in the collection.  The             */
-  /*               specification says this should be an unsigned long, but */
-  /*               we use a signed long since we need the value -1 for     */
-  /*               specific purposes.                                      */
-  /*                                                                       */
-  /*    offsets :: The offsets of the font headers, one per face.          */
-  /*                                                                       */
-  typedef struct  TTC_HeaderRec_
-  {
-    FT_ULong   tag;
-    FT_Fixed   version;
-    FT_Long    count;
-    FT_ULong*  offsets;
-
-  } TTC_HeaderRec;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    SFNT_HeaderRec                                                     */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    SFNT file format header.                                           */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    format_tag     :: The font format tag.                             */
-  /*                                                                       */
-  /*    num_tables     :: The number of tables in file.                    */
-  /*                                                                       */
-  /*    search_range   :: Must be `16 * (max power of 2 <= num_tables)'.   */
-  /*                                                                       */
-  /*    entry_selector :: Must be log2 of `search_range / 16'.             */
-  /*                                                                       */
-  /*    range_shift    :: Must be `num_tables * 16 - search_range'.        */
-  /*                                                                       */
-  typedef struct  SFNT_HeaderRec_
-  {
-    FT_ULong   format_tag;
-    FT_UShort  num_tables;
-    FT_UShort  search_range;
-    FT_UShort  entry_selector;
-    FT_UShort  range_shift;
-
-    FT_ULong   offset;  /* not in file */
-
-  } SFNT_HeaderRec, *SFNT_Header;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    TT_TableDirRec                                                     */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    This structure models a TrueType table directory.  It is used to   */
-  /*    access the various tables of the font face.                        */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    version       :: The version number; starts with 0x00010000.       */
-  /*                                                                       */
-  /*    numTables     :: The number of tables.                             */
-  /*                                                                       */
-  /*    searchRange   :: Unused.                                           */
-  /*                                                                       */
-  /*    entrySelector :: Unused.                                           */
-  /*                                                                       */
-  /*    rangeShift    :: Unused.                                           */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    This structure is only used during font opening.                   */
-  /*                                                                       */
-  typedef struct  TT_TableDirRec_
-  {
-    FT_Fixed   version;        /* should be 0x10000 */
-    FT_UShort  numTables;      /* number of tables  */
-
-    FT_UShort  searchRange;    /* These parameters are only used  */
-    FT_UShort  entrySelector;  /* for a dichotomy search in the   */
-    FT_UShort  rangeShift;     /* directory.  We ignore them.     */
-
-  } TT_TableDirRec;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    TT_TableRec                                                        */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    This structure describes a given table of a TrueType font.         */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    Tag      :: A four-bytes tag describing the table.                 */
-  /*                                                                       */
-  /*    CheckSum :: The table checksum.  This value can be ignored.        */
-  /*                                                                       */
-  /*    Offset   :: The offset of the table from the start of the TrueType */
-  /*                font in its resource.                                  */
-  /*                                                                       */
-  /*    Length   :: The table length (in bytes).                           */
-  /*                                                                       */
-  typedef struct  TT_TableRec_
-  {
-    FT_ULong  Tag;        /*        table type */
-    FT_ULong  CheckSum;   /*    table checksum */
-    FT_ULong  Offset;     /* table file offset */
-    FT_ULong  Length;     /*      table length */
-
-  } TT_TableRec, *TT_Table;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    TT_CMapDirRec                                                      */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    This structure describes the directory of the `cmap' table,        */
-  /*    containing the font's character mappings table.                    */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    tableVersionNumber :: The version number.                          */
-  /*                                                                       */
-  /*    numCMaps           :: The number of charmaps in the font.          */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    This structure is only used during font loading.                   */
-  /*                                                                       */
-  typedef struct  TT_CMapDirRec_
-  {
-    FT_UShort  tableVersionNumber;
-    FT_UShort  numCMaps;
-
-  } TT_CMapDirRec, *TT_CMapDir;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    TT_CMapDirEntryRec                                                 */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    This structure describes a charmap in a TrueType font.             */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    platformID :: An ID used to specify for which platform this        */
-  /*                  charmap is defined (FreeType manages all platforms). */
-  /*                                                                       */
-  /*    encodingID :: A platform-specific ID used to indicate which source */
-  /*                  encoding is used in this charmap.                    */
-  /*                                                                       */
-  /*    offset     :: The offset of the charmap relative to the start of   */
-  /*                  the `cmap' table.                                    */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    This structure is only used during font loading.                   */
-  /*                                                                       */
-  typedef struct  TT_CMapDirEntryRec_
-  {
-    FT_UShort  platformID;
-    FT_UShort  platformEncodingID;
-    FT_Long    offset;
-
-  } TT_CMapDirEntryRec, *TT_CMapDirEntry;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    TT_LongMetricsRec                                                  */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A structure modeling the long metrics of the `hmtx' and `vmtx'     */
-  /*    TrueType tables.  The values are expressed in font units.          */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    advance :: The advance width or height for the glyph.              */
-  /*                                                                       */
-  /*    bearing :: The left-side or top-side bearing for the glyph.        */
-  /*                                                                       */
-  typedef struct  TT_LongMetricsRec_
-  {
-    FT_UShort  advance;
-    FT_Short   bearing;
-
-  } TT_LongMetricsRec, *TT_LongMetrics;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Type>                                                                */
-  /*    TT_ShortMetrics                                                    */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A simple type to model the short metrics of the `hmtx' and `vmtx'  */
-  /*    tables.                                                            */
-  /*                                                                       */
-  typedef FT_Short  TT_ShortMetrics;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    TT_NameEntryRec                                                    */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A structure modeling TrueType name records.  Name records are used */
-  /*    to store important strings like family name, style name,           */
-  /*    copyright, etc. in _localized_ versions (i.e., language, encoding, */
-  /*    etc).                                                              */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    platformID   :: The ID of the name's encoding platform.            */
-  /*                                                                       */
-  /*    encodingID   :: The platform-specific ID for the name's encoding.  */
-  /*                                                                       */
-  /*    languageID   :: The platform-specific ID for the name's language.  */
-  /*                                                                       */
-  /*    nameID       :: The ID specifying what kind of name this is.       */
-  /*                                                                       */
-  /*    stringLength :: The length of the string in bytes.                 */
-  /*                                                                       */
-  /*    stringOffset :: The offset to the string in the `name' table.      */
-  /*                                                                       */
-  /*    string       :: A pointer to the string's bytes.  Note that these  */
-  /*                    are usually UTF-16 encoded characters.             */
-  /*                                                                       */
-  typedef struct  TT_NameEntryRec_
-  {
-    FT_UShort  platformID;
-    FT_UShort  encodingID;
-    FT_UShort  languageID;
-    FT_UShort  nameID;
-    FT_UShort  stringLength;
-    FT_ULong   stringOffset;
-
-    /* this last field is not defined in the spec */
-    /* but used by the FreeType engine            */
-
-    FT_Byte*   string;
-
-  } TT_NameEntryRec, *TT_NameEntry;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    TT_NameTableRec                                                    */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A structure modeling the TrueType name table.                      */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    format         :: The format of the name table.                    */
-  /*                                                                       */
-  /*    numNameRecords :: The number of names in table.                    */
-  /*                                                                       */
-  /*    storageOffset  :: The offset of the name table in the `name'       */
-  /*                      TrueType table.                                  */
-  /*                                                                       */
-  /*    names          :: An array of name records.                        */
-  /*                                                                       */
-  /*    stream         :: the file's input stream.                         */
-  /*                                                                       */
-  typedef struct  TT_NameTableRec_
-  {
-    FT_UShort         format;
-    FT_UInt           numNameRecords;
-    FT_UInt           storageOffset;
-    TT_NameEntryRec*  names;
-    FT_Stream         stream;
-
-  } TT_NameTableRec, *TT_NameTable;
-
-
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-  /***                                                                   ***/
-  /***                                                                   ***/
-  /***             OPTIONAL TRUETYPE/OPENTYPE TABLES DEFINITIONS         ***/
-  /***                                                                   ***/
-  /***                                                                   ***/
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    TT_GaspRangeRec                                                    */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A tiny structure used to model a gasp range according to the       */
-  /*    TrueType specification.                                            */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    maxPPEM  :: The maximum ppem value to which `gaspFlag' applies.    */
-  /*                                                                       */
-  /*    gaspFlag :: A flag describing the grid-fitting and anti-aliasing   */
-  /*                modes to be used.                                      */
-  /*                                                                       */
-  typedef struct  TT_GaspRangeRec_
-  {
-    FT_UShort  maxPPEM;
-    FT_UShort  gaspFlag;
-
-  } TT_GaspRangeRec, *TT_GaspRange;
-
-
-#define TT_GASP_GRIDFIT  0x01
-#define TT_GASP_DOGRAY   0x02
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    TT_GaspRec                                                         */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A structure modeling the TrueType `gasp' table used to specify     */
-  /*    grid-fitting and anti-aliasing behaviour.                          */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    version    :: The version number.                                  */
-  /*                                                                       */
-  /*    numRanges  :: The number of gasp ranges in table.                  */
-  /*                                                                       */
-  /*    gaspRanges :: An array of gasp ranges.                             */
-  /*                                                                       */
-  typedef struct  TT_Gasp_
-  {
-    FT_UShort     version;
-    FT_UShort     numRanges;
-    TT_GaspRange  gaspRanges;
-
-  } TT_GaspRec;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    TT_HdmxEntryRec                                                    */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A small structure used to model the pre-computed widths of a given */
-  /*    size.  They are found in the `hdmx' table.                         */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    ppem      :: The pixels per EM value at which these metrics apply. */
-  /*                                                                       */
-  /*    max_width :: The maximum advance width for this metric.            */
-  /*                                                                       */
-  /*    widths    :: An array of widths.  Note: These are 8-bit bytes.     */
-  /*                                                                       */
-  typedef struct  TT_HdmxEntryRec_
-  {
-    FT_Byte   ppem;
-    FT_Byte   max_width;
-    FT_Byte*  widths;
-
-  } TT_HdmxEntryRec, *TT_HdmxEntry;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    TT_HdmxRec                                                         */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A structure used to model the `hdmx' table, which contains         */
-  /*    pre-computed widths for a set of given sizes/dimensions.           */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    version     :: The version number.                                 */
-  /*                                                                       */
-  /*    num_records :: The number of hdmx records.                         */
-  /*                                                                       */
-  /*    records     :: An array of hdmx records.                           */
-  /*                                                                       */
-  typedef struct  TT_HdmxRec_
-  {
-    FT_UShort     version;
-    FT_Short      num_records;
-    TT_HdmxEntry  records;
-
-  } TT_HdmxRec, *TT_Hdmx;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    TT_Kern0_PairRec                                                   */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A structure used to model a kerning pair for the kerning table     */
-  /*    format 0.  The engine now loads this table if it finds one in the  */
-  /*    font file.                                                         */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    left  :: The index of the left glyph in pair.                      */
-  /*                                                                       */
-  /*    right :: The index of the right glyph in pair.                     */
-  /*                                                                       */
-  /*    value :: The kerning distance.  A positive value spaces the        */
-  /*             glyphs, a negative one makes them closer.                 */
-  /*                                                                       */
-  typedef struct  TT_Kern0_PairRec_
-  {
-    FT_UShort  left;   /* index of left  glyph in pair */
-    FT_UShort  right;  /* index of right glyph in pair */
-    FT_FWord   value;  /* kerning value                */
-
-  } TT_Kern0_PairRec, *TT_Kern0_Pair;
-
-
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-  /***                                                                   ***/
-  /***                                                                   ***/
-  /***                    EMBEDDED BITMAPS SUPPORT                       ***/
-  /***                                                                   ***/
-  /***                                                                   ***/
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    TT_SBit_MetricsRec                                                 */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A structure used to hold the big metrics of a given glyph bitmap   */
-  /*    in a TrueType or OpenType font.  These are usually found in the    */
-  /*    `EBDT' (Microsoft) or `bloc' (Apple) table.                        */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    height       :: The glyph height in pixels.                        */
-  /*                                                                       */
-  /*    width        :: The glyph width in pixels.                         */
-  /*                                                                       */
-  /*    horiBearingX :: The horizontal left bearing.                       */
-  /*                                                                       */
-  /*    horiBearingY :: The horizontal top bearing.                        */
-  /*                                                                       */
-  /*    horiAdvance  :: The horizontal advance.                            */
-  /*                                                                       */
-  /*    vertBearingX :: The vertical left bearing.                         */
-  /*                                                                       */
-  /*    vertBearingY :: The vertical top bearing.                          */
-  /*                                                                       */
-  /*    vertAdvance  :: The vertical advance.                              */
-  /*                                                                       */
-  typedef struct  TT_SBit_MetricsRec_
-  {
-    FT_Byte  height;
-    FT_Byte  width;
-
-    FT_Char  horiBearingX;
-    FT_Char  horiBearingY;
-    FT_Byte  horiAdvance;
-
-    FT_Char  vertBearingX;
-    FT_Char  vertBearingY;
-    FT_Byte  vertAdvance;
-
-  } TT_SBit_MetricsRec, *TT_SBit_Metrics;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    TT_SBit_SmallMetricsRec                                            */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A structure used to hold the small metrics of a given glyph bitmap */
-  /*    in a TrueType or OpenType font.  These are usually found in the    */
-  /*    `EBDT' (Microsoft) or the `bdat' (Apple) table.                    */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    height   :: The glyph height in pixels.                            */
-  /*                                                                       */
-  /*    width    :: The glyph width in pixels.                             */
-  /*                                                                       */
-  /*    bearingX :: The left-side bearing.                                 */
-  /*                                                                       */
-  /*    bearingY :: The top-side bearing.                                  */
-  /*                                                                       */
-  /*    advance  :: The advance width or height.                           */
-  /*                                                                       */
-  typedef struct  TT_SBit_Small_Metrics_
-  {
-    FT_Byte  height;
-    FT_Byte  width;
-
-    FT_Char  bearingX;
-    FT_Char  bearingY;
-    FT_Byte  advance;
-
-  } TT_SBit_SmallMetricsRec, *TT_SBit_SmallMetrics;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    TT_SBit_LineMetricsRec                                             */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A structure used to describe the text line metrics of a given      */
-  /*    bitmap strike, for either a horizontal or vertical layout.         */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    ascender                :: The ascender in pixels.                 */
-  /*                                                                       */
-  /*    descender               :: The descender in pixels.                */
-  /*                                                                       */
-  /*    max_width               :: The maximum glyph width in pixels.      */
-  /*                                                                       */
-  /*    caret_slope_enumerator  :: Rise of the caret slope, typically set  */
-  /*                               to 1 for non-italic fonts.              */
-  /*                                                                       */
-  /*    caret_slope_denominator :: Rise of the caret slope, typically set  */
-  /*                               to 0 for non-italic fonts.              */
-  /*                                                                       */
-  /*    caret_offset            :: Offset in pixels to move the caret for  */
-  /*                               proper positioning.                     */
-  /*                                                                       */
-  /*    min_origin_SB           :: Minimum of horiBearingX (resp.          */
-  /*                               vertBearingY).                          */
-  /*    min_advance_SB          :: Minimum of                              */
-  /*                                                                       */
-  /*                                 horizontal advance -                  */
-  /*                                   ( horiBearingX + width )            */
-  /*                                                                       */
-  /*                               resp.                                   */
-  /*                                                                       */
-  /*                                 vertical advance -                    */
-  /*                                   ( vertBearingY + height )           */
-  /*                                                                       */
-  /*    max_before_BL           :: Maximum of horiBearingY (resp.          */
-  /*                               vertBearingY).                          */
-  /*                                                                       */
-  /*    min_after_BL            :: Minimum of                              */
-  /*                                                                       */
-  /*                                 horiBearingY - height                 */
-  /*                                                                       */
-  /*                               resp.                                   */
-  /*                                                                       */
-  /*                                 vertBearingX - width                  */
-  /*                                                                       */
-  /*    pads                    :: Unused (to make the size of the record  */
-  /*                               a multiple of 32 bits.                  */
-  /*                                                                       */
-  typedef struct  TT_SBit_LineMetricsRec_
-  {
-    FT_Char  ascender;
-    FT_Char  descender;
-    FT_Byte  max_width;
-    FT_Char  caret_slope_numerator;
-    FT_Char  caret_slope_denominator;
-    FT_Char  caret_offset;
-    FT_Char  min_origin_SB;
-    FT_Char  min_advance_SB;
-    FT_Char  max_before_BL;
-    FT_Char  min_after_BL;
-    FT_Char  pads2;
-
-  } TT_SBit_LineMetricsRec, *TT_SBit_LineMetrics;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    TT_SBit_RangeRec                                                   */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A TrueType/OpenType subIndexTable as defined in the `EBLC'         */
-  /*    (Microsoft) or `bloc' (Apple) tables.                              */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    first_glyph   :: The first glyph index in the range.               */
-  /*                                                                       */
-  /*    last_glyph    :: The last glyph index in the range.                */
-  /*                                                                       */
-  /*    index_format  :: The format of index table.  Valid values are 1    */
-  /*                     to 5.                                             */
-  /*                                                                       */
-  /*    image_format  :: The format of `EBDT' image data.                  */
-  /*                                                                       */
-  /*    image_offset  :: The offset to image data in `EBDT'.               */
-  /*                                                                       */
-  /*    image_size    :: For index formats 2 and 5.  This is the size in   */
-  /*                     bytes of each glyph bitmap.                       */
-  /*                                                                       */
-  /*    big_metrics   :: For index formats 2 and 5.  This is the big       */
-  /*                     metrics for each glyph bitmap.                    */
-  /*                                                                       */
-  /*    num_glyphs    :: For index formats 4 and 5.  This is the number of */
-  /*                     glyphs in the code array.                         */
-  /*                                                                       */
-  /*    glyph_offsets :: For index formats 1 and 3.                        */
-  /*                                                                       */
-  /*    glyph_codes   :: For index formats 4 and 5.                        */
-  /*                                                                       */
-  /*    table_offset  :: The offset of the index table in the `EBLC'       */
-  /*                     table.  Only used during strike loading.          */
-  /*                                                                       */
-  typedef struct  TT_SBit_RangeRec
-  {
-    FT_UShort           first_glyph;
-    FT_UShort           last_glyph;
-
-    FT_UShort           index_format;
-    FT_UShort           image_format;
-    FT_ULong            image_offset;
-
-    FT_ULong            image_size;
-    TT_SBit_MetricsRec  metrics;
-    FT_ULong            num_glyphs;
-
-    FT_ULong*           glyph_offsets;
-    FT_UShort*          glyph_codes;
-
-    FT_ULong            table_offset;
-
-  } TT_SBit_RangeRec, *TT_SBit_Range;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    TT_SBit_StrikeRec                                                  */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A structure used describe a given bitmap strike in the `EBLC'      */
-  /*    (Microsoft) or `bloc' (Apple) tables.                              */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*   num_index_ranges :: The number of index ranges.                     */
-  /*                                                                       */
-  /*   index_ranges     :: An array of glyph index ranges.                 */
-  /*                                                                       */
-  /*   color_ref        :: Unused.  `color_ref' is put in for future       */
-  /*                       enhancements, but these fields are already      */
-  /*                       in use by other platforms (e.g. Newton).        */
-  /*                       For details, please see                         */
-  /*                                                                       */
-  /*                         http://fonts.apple.com/                       */
-  /*                                TTRefMan/RM06/Chap6bloc.html           */
-  /*                                                                       */
-  /*   hori             :: The line metrics for horizontal layouts.        */
-  /*                                                                       */
-  /*   vert             :: The line metrics for vertical layouts.          */
-  /*                                                                       */
-  /*   start_glyph      :: The lowest glyph index for this strike.         */
-  /*                                                                       */
-  /*   end_glyph        :: The highest glyph index for this strike.        */
-  /*                                                                       */
-  /*   x_ppem           :: The number of horizontal pixels per EM.         */
-  /*                                                                       */
-  /*   y_ppem           :: The number of vertical pixels per EM.           */
-  /*                                                                       */
-  /*   bit_depth        :: The bit depth.  Valid values are 1, 2, 4,       */
-  /*                       and 8.                                          */
-  /*                                                                       */
-  /*   flags            :: Is this a vertical or horizontal strike?  For   */
-  /*                       details, please see                             */
-  /*                                                                       */
-  /*                         http://fonts.apple.com/                       */
-  /*                                TTRefMan/RM06/Chap6bloc.html           */
-  /*                                                                       */
-  typedef struct  TT_SBit_StrikeRec_
-  {
-    FT_Int                  num_ranges;
-    TT_SBit_Range           sbit_ranges;
-    FT_ULong                ranges_offset;
-
-    FT_ULong                color_ref;
-
-    TT_SBit_LineMetricsRec  hori;
-    TT_SBit_LineMetricsRec  vert;
-
-    FT_UShort               start_glyph;
-    FT_UShort               end_glyph;
-
-    FT_Byte                 x_ppem;
-    FT_Byte                 y_ppem;
-
-    FT_Byte                 bit_depth;
-    FT_Char                 flags;
-
-  } TT_SBit_StrikeRec, *TT_SBit_Strike;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    TT_SBit_ComponentRec                                               */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A simple structure to describe a compound sbit element.            */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    glyph_code :: The element's glyph index.                           */
-  /*                                                                       */
-  /*    x_offset   :: The element's left bearing.                          */
-  /*                                                                       */
-  /*    y_offset   :: The element's top bearing.                           */
-  /*                                                                       */
-  typedef struct  TT_SBit_ComponentRec_
-  {
-    FT_UShort  glyph_code;
-    FT_Char    x_offset;
-    FT_Char    y_offset;
-
-  } TT_SBit_ComponentRec, *TT_SBit_Component;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    TT_SBit_ScaleRec                                                   */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A structure used describe a given bitmap scaling table, as defined */
-  /*    in the `EBSC' table.                                               */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    hori              :: The horizontal line metrics.                  */
-  /*                                                                       */
-  /*    vert              :: The vertical line metrics.                    */
-  /*                                                                       */
-  /*    x_ppem            :: The number of horizontal pixels per EM.       */
-  /*                                                                       */
-  /*    y_ppem            :: The number of vertical pixels per EM.         */
-  /*                                                                       */
-  /*    x_ppem_substitute :: Substitution x_ppem value.                    */
-  /*                                                                       */
-  /*    y_ppem_substitute :: Substitution y_ppem value.                    */
-  /*                                                                       */
-  typedef struct  TT_SBit_ScaleRec_
-  {
-    TT_SBit_LineMetricsRec  hori;
-    TT_SBit_LineMetricsRec  vert;
-
-    FT_Byte                 x_ppem;
-    FT_Byte                 y_ppem;
-
-    FT_Byte                 x_ppem_substitute;
-    FT_Byte                 y_ppem_substitute;
-
-  } TT_SBit_ScaleRec, *TT_SBit_Scale;
-
-
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-  /***                                                                   ***/
-  /***                                                                   ***/
-  /***                  POSTSCRIPT GLYPH NAMES SUPPORT                   ***/
-  /***                                                                   ***/
-  /***                                                                   ***/
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    TT_Post_20Rec                                                      */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Postscript names sub-table, format 2.0.  Stores the PS name of     */
-  /*    each glyph in the font face.                                       */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    num_glyphs    :: The number of named glyphs in the table.          */
-  /*                                                                       */
-  /*    num_names     :: The number of PS names stored in the table.       */
-  /*                                                                       */
-  /*    glyph_indices :: The indices of the glyphs in the names arrays.    */
-  /*                                                                       */
-  /*    glyph_names   :: The PS names not in Mac Encoding.                 */
-  /*                                                                       */
-  typedef struct  TT_Post_20Rec_
-  {
-    FT_UShort   num_glyphs;
-    FT_UShort   num_names;
-    FT_UShort*  glyph_indices;
-    FT_Char**   glyph_names;
-
-  } TT_Post_20Rec, *TT_Post_20;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    TT_Post_25Rec                                                      */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Postscript names sub-table, format 2.5.  Stores the PS name of     */
-  /*    each glyph in the font face.                                       */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    num_glyphs :: The number of glyphs in the table.                   */
-  /*                                                                       */
-  /*    offsets    :: An array of signed offsets in a normal Mac           */
-  /*                  Postscript name encoding.                            */
-  /*                                                                       */
-  typedef struct  TT_Post_25_
-  {
-    FT_UShort  num_glyphs;
-    FT_Char*   offsets;
-
-  } TT_Post_25Rec, *TT_Post_25;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    TT_Post_NamesRec                                                   */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Postscript names table, either format 2.0 or 2.5.                  */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    loaded    :: A flag to indicate whether the PS names are loaded.   */
-  /*                                                                       */
-  /*    format_20 :: The sub-table used for format 2.0.                    */
-  /*                                                                       */
-  /*    format_25 :: The sub-table used for format 2.5.                    */
-  /*                                                                       */
-  typedef struct  TT_Post_NamesRec_
-  {
-    FT_Bool  loaded;
-
-    union
-    {
-      TT_Post_20Rec  format_20;
-      TT_Post_25Rec  format_25;
-
-    } names;
-
-  } TT_Post_NamesRec, *TT_Post_Names;
-
-
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-  /***                                                                   ***/
-  /***                                                                   ***/
-  /***                  TRUETYPE CHARMAPS SUPPORT                        ***/
-  /***                                                                   ***/
-  /***                                                                   ***/
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-
-
-  /* format 0 */
-
-  typedef struct  TT_CMap0_
-  {
-    FT_ULong  language;       /* for Mac fonts (originally ushort) */
-
-    FT_Byte*  glyphIdArray;
-
-  } TT_CMap0Rec, *TT_CMap0;
-
-
-  /* format 2 */
-
-  typedef struct  TT_CMap2SubHeaderRec_
-  {
-    FT_UShort  firstCode;      /* first valid low byte         */
-    FT_UShort  entryCount;     /* number of valid low bytes    */
-    FT_Short   idDelta;        /* delta value to glyphIndex    */
-    FT_UShort  idRangeOffset;  /* offset from here to 1st code */
-
-  } TT_CMap2SubHeaderRec, *TT_CMap2SubHeader;
-
-
-  typedef struct  TT_CMap2Rec_
-  {
-    FT_ULong            language;     /* for Mac fonts (originally ushort) */
-
-    FT_UShort*          subHeaderKeys;  /* high byte mapping table     */
-                                        /* value = subHeader index * 8 */
-    TT_CMap2SubHeader   subHeaders;
-    FT_UShort*          glyphIdArray;
-    FT_UShort           numGlyphId;   /* control value */
-
-  } TT_CMap2Rec, *TT_CMap2;
-
-
-  /* format 4 */
-
-  typedef struct  TT_CMap4Segment_
-  {
-    FT_UShort  endCount;
-    FT_UShort  startCount;
-    FT_Short   idDelta;
-    FT_UShort  idRangeOffset;
-
-  } TT_CMap4SegmentRec, *TT_CMap4Segment;
-
-
-  typedef struct  TT_CMap4Rec_
-  {
-    FT_ULong         language;       /* for Mac fonts (originally ushort) */
-
-    FT_UShort        segCountX2;     /* number of segments * 2            */
-    FT_UShort        searchRange;    /* these parameters can be used      */
-    FT_UShort        entrySelector;  /* for a binary search               */
-    FT_UShort        rangeShift;
-
-    TT_CMap4Segment  segments;
-    FT_UShort*       glyphIdArray;
-    FT_UShort        numGlyphId;     /* control value */
-
-    TT_CMap4Segment  last_segment;   /* last used segment; this is a small  */
-                                     /* cache to potentially increase speed */
-  } TT_CMap4Rec, *TT_CMap4;
-
-
-  /* format 6 */
-
-  typedef struct  TT_CMap6_
-  {
-    FT_ULong    language;       /* for Mac fonts (originally ushort)     */
-
-    FT_UShort   firstCode;      /* first character code of subrange      */
-    FT_UShort   entryCount;     /* number of character codes in subrange */
-
-    FT_UShort*  glyphIdArray;
-
-  } TT_CMap6Rec, *TT_CMap6;
-
-
-  /* auxiliary table for format 8 and 12 */
-
-  typedef struct  TT_CMapGroupRec_
-  {
-    FT_ULong  startCharCode;
-    FT_ULong  endCharCode;
-    FT_ULong  startGlyphID;
-
-  } TT_CMapGroupRec, *TT_CMapGroup;
-
-
-  /* FreeType handles format 8 and 12 identically.  It is not necessary to
-     cover mixed 16bit and 32bit codes since FreeType always uses FT_ULong
-     for input character codes -- converting Unicode surrogates to 32bit
-     character codes must be done by the application.                      */
-
-  typedef struct  TT_CMap8_12Rec_
-  {
-    FT_ULong      language;        /* for Mac fonts */
-
-    FT_ULong      nGroups;
-    TT_CMapGroup  groups;
-
-    TT_CMapGroup  last_group;      /* last used group; this is a small    */
-                                   /* cache to potentially increase speed */
-  } TT_CMap8_12Rec, *TT_CMap8_12;
-
-
-  /* format 10 */
-
-  typedef struct  TT_CMap10Rec_
-  {
-    FT_ULong    language;           /* for Mac fonts */
-
-    FT_ULong    startCharCode;      /* first character covered */
-    FT_ULong    numChars;           /* number of characters covered */
-
-    FT_UShort*  glyphs;
-
-  } TT_CMap10Rec, *TT_CMap10;
-
-
-  typedef struct TT_CMapTableRec_*  TT_CMapTable;
-
-
-  typedef FT_UInt
-  (*TT_CharMap_Func)( TT_CMapTable  charmap,
-                      FT_ULong      char_code );
-
-  typedef FT_ULong
-  (*TT_CharNext_Func)( TT_CMapTable  charmap,
-                       FT_ULong      char_code );
-
-
-  /* charmap table */
-  typedef struct  TT_CMapTableRec_
-  {
-    FT_UShort  platformID;
-    FT_UShort  platformEncodingID;
-    FT_UShort  format;
-    FT_ULong   length;          /* must be ulong for formats 8, 10, and 12 */
-
-    FT_Bool    loaded;
-    FT_ULong   offset;
-
-    union
-    {
-      TT_CMap0Rec     cmap0;
-      TT_CMap2Rec     cmap2;
-      TT_CMap4Rec     cmap4;
-      TT_CMap6Rec     cmap6;
-      TT_CMap8_12Rec  cmap8_12;
-      TT_CMap10Rec    cmap10;
-    } c;
-
-    TT_CharMap_Func   get_index;
-    TT_CharNext_Func  get_next_char;
-
-  } TT_CMapTableRec;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    TT_CharMapRec                                                      */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    The TrueType character map object type.                            */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    root :: The parent character map structure.                        */
-  /*                                                                       */
-  /*    cmap :: The used character map.                                    */
-  /*                                                                       */
-  typedef struct  TT_CharMapRec_
-  {
-    FT_CharMapRec    root;
-    TT_CMapTableRec  cmap;
-
-  } TT_CharMapRec;
-
-
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-  /***                                                                   ***/
-  /***                                                                   ***/
-  /***                  ORIGINAL TT_FACE CLASS DEFINITION                ***/
-  /***                                                                   ***/
-  /***                                                                   ***/
-  /*************************************************************************/
-  /*************************************************************************/
-  /*************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* This structure/class is defined here because it is common to the      */
-  /* following formats: TTF, OpenType-TT, and OpenType-CFF.                */
-  /*                                                                       */
-  /* Note, however, that the classes TT_Size, TT_GlyphSlot, and TT_CharMap */
-  /* are not shared between font drivers, and are thus defined in          */
-  /* `ttobjs.h'.                                                           */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Type>                                                                */
-  /*    TT_Face                                                            */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A handle to a TrueType face/font object.  A TT_Face encapsulates   */
-  /*    the resolution and scaling independent parts of a TrueType font    */
-  /*    resource.                                                          */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    The TT_Face structure is also used as a `parent class' for the     */
-  /*    OpenType-CFF class (T2_Face).                                      */
-  /*                                                                       */
-  typedef struct TT_FaceRec_*  TT_Face;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Type>                                                                */
-  /*    TT_CharMap                                                         */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A handle to a TrueType character mapping object.                   */
-  /*                                                                       */
-  typedef struct TT_CharMapRec_*  TT_CharMap;
-
-
-  /* a function type used for the truetype bytecode interpreter hooks */
-  typedef FT_Error
-  (*TT_Interpreter)( void*  exec_context );
-
-  /* forward declaration */
-  typedef struct TT_LoaderRec_*  TT_Loader;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <FuncType>                                                            */
-  /*    TT_Loader_GotoTableFunc                                            */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Seeks a stream to the start of a given TrueType table.             */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    face   :: A handle to the target face object.                      */
-  /*                                                                       */
-  /*    tag    :: A 4-byte tag used to name the table.                     */
-  /*                                                                       */
-  /*    stream :: The input stream.                                        */
-  /*                                                                       */
-  /* <Output>                                                              */
-  /*    length :: The length of the table in bytes.  Set to 0 if not       */
-  /*              needed.                                                  */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0 means success.                             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    The stream cursor must be at the font file's origin.               */
-  /*                                                                       */
-  typedef FT_Error
-  (*TT_Loader_GotoTableFunc)( TT_Face    face,
-                              FT_ULong   tag,
-                              FT_Stream  stream,
-                              FT_ULong*  length );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <FuncType>                                                            */
-  /*    TT_Loader_StartGlyphFunc                                           */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Seeks a stream to the start of a given glyph element, and opens a  */
-  /*    frame for it.                                                      */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    loader      :: The current TrueType glyph loader object.           */
-  /*                                                                       */
-  /*    glyph index :: The index of the glyph to access.                   */
-  /*                                                                       */
-  /*    offset      :: The offset of the glyph according to the            */
-  /*                   `locations' table.                                  */
-  /*                                                                       */
-  /*    byte_count  :: The size of the frame in bytes.                     */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0 means success.                             */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    This function is normally equivalent to FT_STREAM_SEEK(offset)     */
-  /*    followed by FT_FRAME_ENTER(byte_count) with the loader's stream,   */
-  /*    but alternative formats (e.g. compressed ones) might use something */
-  /*    different.                                                         */
-  /*                                                                       */
-  typedef FT_Error
-  (*TT_Loader_StartGlyphFunc)( TT_Loader  loader,
-                               FT_UInt    glyph_index,
-                               FT_ULong   offset,
-                               FT_UInt    byte_count );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <FuncType>                                                            */
-  /*    TT_Loader_ReadGlyphFunc                                            */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Reads one glyph element (its header, a simple glyph, or a          */
-  /*    composite) from the loader's current stream frame.                 */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    loader :: The current TrueType glyph loader object.                */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    FreeType error code.  0 means success.                             */
-  /*                                                                       */
-  typedef FT_Error
-  (*TT_Loader_ReadGlyphFunc)( TT_Loader  loader );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <FuncType>                                                            */
-  /*    TT_Loader_EndGlyphFunc                                             */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Closes the current loader stream frame for the glyph.              */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    loader :: The current TrueType glyph loader object.                */
-  /*                                                                       */
-  typedef void
-  (*TT_Loader_EndGlyphFunc)( TT_Loader  loader );
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /*                         TrueType Face Type                            */
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    TT_Face                                                            */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    The TrueType face class.  These objects model the resolution and   */
-  /*    point-size independent data found in a TrueType font file.         */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    root                 :: The base FT_Face structure, managed by the */
-  /*                            base layer.                                */
-  /*                                                                       */
-  /*    ttc_header           :: The TrueType collection header, used when  */
-  /*                            the file is a `ttc' rather than a `ttf'.   */
-  /*                            For ordinary font files, the field         */
-  /*                            `ttc_header.count' is set to 0.            */
-  /*                                                                       */
-  /*    format_tag           :: The font format tag.                       */
-  /*                                                                       */
-  /*    num_tables           :: The number of TrueType tables in this font */
-  /*                            file.                                      */
-  /*                                                                       */
-  /*    dir_tables           :: The directory of TrueType tables for this  */
-  /*                            font file.                                 */
-  /*                                                                       */
-  /*    header               :: The font's font header (`head' table).     */
-  /*                            Read on font opening.                      */
-  /*                                                                       */
-  /*    horizontal           :: The font's horizontal header (`hhea'       */
-  /*                            table).  This field also contains the      */
-  /*                            associated horizontal metrics table        */
-  /*                            (`hmtx').                                  */
-  /*                                                                       */
-  /*    max_profile          :: The font's maximum profile table.  Read on */
-  /*                            font opening.  Note that some maximum      */
-  /*                            values cannot be taken directly from this  */
-  /*                            table.  We thus define additional fields   */
-  /*                            below to hold the computed maxima.         */
-  /*                                                                       */
-  /*    max_components       :: The maximum number of glyph components     */
-  /*                            required to load any composite glyph from  */
-  /*                            this font.  Used to size the load stack.   */
-  /*                                                                       */
-  /*    vertical_info        :: A boolean which is set when the font file  */
-  /*                            contains vertical metrics.  If not, the    */
-  /*                            value of the `vertical' field is           */
-  /*                            undefined.                                 */
-  /*                                                                       */
-  /*    vertical             :: The font's vertical header (`vhea' table). */
-  /*                            This field also contains the associated    */
-  /*                            vertical metrics table (`vmtx'), if found. */
-  /*                            IMPORTANT: The contents of this field is   */
-  /*                            undefined if the `verticalInfo' field is   */
-  /*                            unset.                                     */
-  /*                                                                       */
-  /*    num_names            :: The number of name records within this     */
-  /*                            TrueType font.                             */
-  /*                                                                       */
-  /*    name_table           :: The table of name records (`name').        */
-  /*                                                                       */
-  /*    os2                  :: The font's OS/2 table (`OS/2').            */
-  /*                                                                       */
-  /*    postscript           :: The font's PostScript table (`post'        */
-  /*                            table).  The PostScript glyph names are    */
-  /*                            not loaded by the driver on face opening.  */
-  /*                            See the `ttpost' module for more details.  */
-  /*                                                                       */
-  /*    cmap_table           :: Address of the face's `cmap' SFNT table    */
-  /*                            in memory (it's an extracted frame).       */
-  /*                                                                       */
-  /*    cmap_size            :: The size in bytes of the `cmap_table'      */
-  /*                            described above.                           */
-  /*                                                                       */
-  /*    num_charmaps         :: The number of character mappings in the    */
-  /*                            font.                                      */
-  /*                                                                       */
-  /*    charmaps             :: The array of charmap objects for this font */
-  /*                            file.  Note that this field is a typeless  */
-  /*                            pointer.  The Reason is that the format of */
-  /*                            charmaps varies with the underlying font   */
-  /*                            format and cannot be determined here.      */
-  /*                                                                       */
-  /*    goto_table           :: A function called by each TrueType table   */
-  /*                            loader to position a stream's cursor to    */
-  /*                            the start of a given table according to    */
-  /*                            its tag.  It defaults to TT_Goto_Face but  */
-  /*                            can be different for strange formats (e.g. */
-  /*                            Type 42).                                  */
-  /*                                                                       */
-  /*    access_glyph_frame   :: A function used to access the frame of a   */
-  /*                            given glyph within the face's font file.   */
-  /*                                                                       */
-  /*    forget_glyph_frame   :: A function used to forget the frame of a   */
-  /*                            given glyph when all data has been loaded. */
-  /*                                                                       */
-  /*    read_glyph_header    :: A function used to read a glyph header.    */
-  /*                            It must be called between an `access' and  */
-  /*                            `forget'.                                  */
-  /*                                                                       */
-  /*    read_simple_glyph    :: A function used to read a simple glyph.    */
-  /*                            It must be called after the header was     */
-  /*                            read, and before the `forget'.             */
-  /*                                                                       */
-  /*    read_composite_glyph :: A function used to read a composite glyph. */
-  /*                            It must be called after the header was     */
-  /*                            read, and before the `forget'.             */
-  /*                                                                       */
-  /*    sfnt                 :: A pointer to the SFNT service.             */
-  /*                                                                       */
-  /*    psnames              :: A pointer to the PostScript names service. */
-  /*                                                                       */
-  /*    hdmx                 :: The face's horizontal device metrics       */
-  /*                            (`hdmx' table).  This table is optional in */
-  /*                            TrueType/OpenType fonts.                   */
-  /*                                                                       */
-  /*    gasp                 :: The grid-fitting and scaling properties    */
-  /*                            table (`gasp').  This table is optional in */
-  /*                            TrueType/OpenType fonts.                   */
-  /*                                                                       */
-  /*    pclt                 :: The `pclt' SFNT table.                     */
-  /*                                                                       */
-  /*    num_sbit_strikes     :: The number of sbit strikes, i.e., bitmap   */
-  /*                            sizes, embedded in this font.              */
-  /*                                                                       */
-  /*    sbit_strikes         :: An array of sbit strikes embedded in this  */
-  /*                            font.  This table is optional in a         */
-  /*                            TrueType/OpenType font.                    */
-  /*                                                                       */
-  /*    num_sbit_scales      :: The number of sbit scales for this font.   */
-  /*                                                                       */
-  /*    sbit_scales          :: Array of sbit scales embedded in this      */
-  /*                            font.  This table is optional in a         */
-  /*                            TrueType/OpenType font.                    */
-  /*                                                                       */
-  /*    postscript_names     :: A table used to store the Postscript names */
-  /*                            of  the glyphs for this font.  See the     */
-  /*                            file  `ttconfig.h' for comments on the     */
-  /*                            TT_CONFIG_OPTION_POSTSCRIPT_NAMES option.  */
-  /*                                                                       */
-  /*    num_locations        :: The number of glyph locations in this      */
-  /*                            TrueType file.  This should be             */
-  /*                            identical to the number of glyphs.         */
-  /*                            Ignored for Type 2 fonts.                  */
-  /*                                                                       */
-  /*    glyph_locations      :: An array of longs.  These are offsets to   */
-  /*                            glyph data within the `glyf' table.        */
-  /*                            Ignored for Type 2 font faces.             */
-  /*                                                                       */
-  /*    font_program_size    :: Size in bytecodes of the face's font       */
-  /*                            program.  0 if none defined.  Ignored for  */
-  /*                            Type 2 fonts.                              */
-  /*                                                                       */
-  /*    font_program         :: The face's font program (bytecode stream)  */
-  /*                            executed at load time, also used during    */
-  /*                            glyph rendering.  Comes from the `fpgm'    */
-  /*                            table.  Ignored for Type 2 font fonts.     */
-  /*                                                                       */
-  /*    cvt_program_size     :: The size in bytecodes of the face's cvt    */
-  /*                            program.  Ignored for Type 2 fonts.        */
-  /*                                                                       */
-  /*    cvt_program          :: The face's cvt program (bytecode stream)   */
-  /*                            executed each time an instance/size is     */
-  /*                            changed/reset.  Comes from the `prep'      */
-  /*                            table.  Ignored for Type 2 fonts.          */
-  /*                                                                       */
-  /*    cvt_size             :: Size of the control value table (in        */
-  /*                            entries).   Ignored for Type 2 fonts.      */
-  /*                                                                       */
-  /*    cvt                  :: The face's original control value table.   */
-  /*                            Coordinates are expressed in unscaled font */
-  /*                            units.  Comes from the `cvt ' table.       */
-  /*                            Ignored for Type 2 fonts.                  */
-  /*                                                                       */
-  /*    num_kern_pairs       :: The number of kerning pairs present in the */
-  /*                            font file.  The engine only loads the      */
-  /*                            first horizontal format 0 kern table it    */
-  /*                            finds in the font file.  Ignored for       */
-  /*                            Type 2 fonts.                              */
-  /*                                                                       */
-  /*    kern_table_index     :: The index of the kerning table in the font */
-  /*                            kerning directory.  Ignored for Type 2     */
-  /*                            fonts.                                     */
-  /*                                                                       */
-  /*    interpreter          :: A pointer to the TrueType bytecode         */
-  /*                            interpreters field is also used to hook    */
-  /*                            the debugger in `ttdebug'.                 */
-  /*                                                                       */
-  /*    unpatented_hinting   :: If true, use only unpatented methods in    */
-  /*                            the bytecode interpreter.                  */
-  /*                                                                       */
-  /*    extra                :: Reserved for third-party font drivers.     */
-  /*                                                                       */
-  typedef struct  TT_FaceRec_
-  {
-    FT_FaceRec            root;
-
-    TTC_HeaderRec         ttc_header;
-
-    FT_ULong              format_tag;
-    FT_UShort             num_tables;
-    TT_Table              dir_tables;
-
-    TT_Header             header;       /* TrueType header table          */
-    TT_HoriHeader         horizontal;   /* TrueType horizontal header     */
-
-    TT_MaxProfile         max_profile;
-    FT_ULong              max_components;
-
-    FT_Bool               vertical_info;
-    TT_VertHeader         vertical;     /* TT Vertical header, if present */
-
-    FT_UShort             num_names;    /* number of name records  */
-    TT_NameTableRec       name_table;   /* name table              */
-
-    TT_OS2                os2;          /* TrueType OS/2 table            */
-    TT_Postscript         postscript;   /* TrueType Postscript table      */
-
-    FT_Byte*              cmap_table;   /* extracted 'cmap' table */
-    FT_ULong              cmap_size;
-
-    TT_Loader_GotoTableFunc   goto_table;
-
-    TT_Loader_StartGlyphFunc  access_glyph_frame;
-    TT_Loader_EndGlyphFunc    forget_glyph_frame;
-    TT_Loader_ReadGlyphFunc   read_glyph_header;
-    TT_Loader_ReadGlyphFunc   read_simple_glyph;
-    TT_Loader_ReadGlyphFunc   read_composite_glyph;
-
-    /* a typeless pointer to the SFNT_Interface table used to load */
-    /* the basic TrueType tables in the face object                */
-    void*                 sfnt;
-
-    /* a typeless pointer to the FT_Service_PsCMapsRec table used to */
-    /* handle glyph names <-> unicode & Mac values                   */
-    void*                 psnames;
-
-
-    /***********************************************************************/
-    /*                                                                     */
-    /* Optional TrueType/OpenType tables                                   */
-    /*                                                                     */
-    /***********************************************************************/
-
-    /* horizontal device metrics */
-    TT_HdmxRec            hdmx;
-
-    /* grid-fitting and scaling table */
-    TT_GaspRec            gasp;                 /* the `gasp' table */
-
-    /* PCL 5 table */
-    TT_PCLT               pclt;
-
-    /* embedded bitmaps support */
-    FT_ULong              num_sbit_strikes;
-    TT_SBit_Strike        sbit_strikes;
-
-    FT_ULong              num_sbit_scales;
-    TT_SBit_Scale         sbit_scales;
-
-    /* postscript names table */
-    TT_Post_NamesRec      postscript_names;
-
-
-    /***********************************************************************/
-    /*                                                                     */
-    /* TrueType-specific fields (ignored by the OTF-Type2 driver)          */
-    /*                                                                     */
-    /***********************************************************************/
-
-    /* the glyph locations */
-    FT_UShort             num_locations;
-    FT_Long*              glyph_locations;
-
-    /* the font program, if any */
-    FT_ULong              font_program_size;
-    FT_Byte*              font_program;
-
-    /* the cvt program, if any */
-    FT_ULong              cvt_program_size;
-    FT_Byte*              cvt_program;
-
-    /* the original, unscaled, control value table */
-    FT_ULong              cvt_size;
-    FT_Short*             cvt;
-
-    /* the format 0 kerning table, if any */
-    FT_Int                num_kern_pairs;
-    FT_Int                kern_table_index;
-    TT_Kern0_Pair         kern_pairs;
-
-    /* A pointer to the bytecode interpreter to use.  This is also */
-    /* used to hook the debugger for the `ttdebug' utility.        */
-    TT_Interpreter        interpreter;
-
-#ifdef TT_CONFIG_OPTION_UNPATENTED_HINTING
-    /* Use unpatented hinting only. */
-    FT_Bool               unpatented_hinting;
-#endif
-
-    /***********************************************************************/
-    /*                                                                     */
-    /* Other tables or fields. This is used by derivative formats like     */
-    /* OpenType.                                                           */
-    /*                                                                     */
-    /***********************************************************************/
-
-    FT_Generic            extra;
-
-    const char*           postscript_name;
-
-  } TT_FaceRec;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /*  <Struct>                                                             */
-  /*     TT_GlyphZoneRec                                                   */
-  /*                                                                       */
-  /*  <Description>                                                        */
-  /*     A glyph zone is used to load, scale and hint glyph outline        */
-  /*     coordinates.                                                      */
-  /*                                                                       */
-  /*  <Fields>                                                             */
-  /*     memory       :: A handle to the memory manager.                   */
-  /*                                                                       */
-  /*     max_points   :: The maximal size in points of the zone.           */
-  /*                                                                       */
-  /*     max_contours :: Max size in links contours of thez one.           */
-  /*                                                                       */
-  /*     n_points     :: The current number of points in the zone.         */
-  /*                                                                       */
-  /*     n_contours   :: The current number of contours in the zone.       */
-  /*                                                                       */
-  /*     org          :: The original glyph coordinates (font              */
-  /*                     units/scaled).                                    */
-  /*                                                                       */
-  /*     cur          :: The current glyph coordinates (scaled/hinted).    */
-  /*                                                                       */
-  /*     tags         :: The point control tags.                           */
-  /*                                                                       */
-  /*     contours     :: The contours end points.                          */
-  /*                                                                       */
-  typedef struct  TT_GlyphZoneRec_
-  {
-    FT_Memory   memory;
-    FT_UShort   max_points;
-    FT_UShort   max_contours;
-    FT_UShort   n_points;   /* number of points in zone    */
-    FT_Short    n_contours; /* number of contours          */
-
-    FT_Vector*  org;        /* original point coordinates  */
-    FT_Vector*  cur;        /* current point coordinates   */
-
-    FT_Byte*    tags;       /* current touch flags         */
-    FT_UShort*  contours;   /* contour end points          */
-
-  } TT_GlyphZoneRec, *TT_GlyphZone;
-
-
-  /* handle to execution context */
-  typedef struct TT_ExecContextRec_*  TT_ExecContext;
-
-  /* glyph loader structure */
-  typedef struct  TT_LoaderRec_
-  {
-    FT_Face          face;
-    FT_Size          size;
-    FT_GlyphSlot     glyph;
-    FT_GlyphLoader   gloader;
-
-    FT_ULong         load_flags;
-    FT_UInt          glyph_index;
-
-    FT_Stream        stream;
-    FT_Int           byte_len;
-
-    FT_Short         n_contours;
-    FT_BBox          bbox;
-    FT_Int           left_bearing;
-    FT_Int           advance;
-    FT_Int           linear;
-    FT_Bool          linear_def;
-    FT_Bool          preserve_pps;
-    FT_Vector        pp1;
-    FT_Vector        pp2;
-
-    FT_ULong         glyf_offset;
-
-    /* the zone where we load our glyphs */
-    TT_GlyphZoneRec  base;
-    TT_GlyphZoneRec  zone;
-
-    TT_ExecContext   exec;
-    FT_Byte*         instructions;
-    FT_ULong         ins_pos;
-
-    /* for possible extensibility in other formats */
-    void*            other;
-
-  } TT_LoaderRec;
-
-
-FT_END_HEADER
-
-#endif /* __TTTYPES_H__ */
-
-
-/* END */

gpac-2.2.1.tar.gz/extra_lib/include/freetype/freetype/t1tables.h Deleted

@@ -1,397 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  t1tables.h                                                             */
-/*                                                                         */
-/*    Basic Type 1/Type 2 tables definitions and interface (specification  */
-/*    only).                                                               */
-/*                                                                         */
-/*  Copyright 1996-2001, 2002, 2003 by                                     */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef __T1TABLES_H__
-#define __T1TABLES_H__
-
-
-#include <ft2build.h>
-#include FT_FREETYPE_H
-
-#ifdef FREETYPE_H
-#error "freetype.h of FreeType 1 has been loaded!"
-#error "Please fix the directory search order for header files"
-#error "so that freetype.h of FreeType 2 is found first."
-#endif
-
-
-FT_BEGIN_HEADER
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Section>                                                             */
-  /*    type1_tables                                                       */
-  /*                                                                       */
-  /* <Title>                                                               */
-  /*    Type 1 Tables                                                      */
-  /*                                                                       */
-  /* <Abstract>                                                            */
-  /*    Type 1 (PostScript) specific font tables.                          */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    This section contains the definition of Type 1-specific tables,    */
-  /*    including structures related to other PostScript font formats.     */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-  /* Note that we separate font data in PS_FontInfoRec and PS_PrivateRec */
-  /* structures in order to support Multiple Master fonts.               */
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    PS_FontInfoRec                                                     */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A structure used to model a Type1/Type2 FontInfo dictionary.  Note */
-  /*    that for Multiple Master fonts, each instance has its own          */
-  /*    FontInfo.                                                          */
-  /*                                                                       */
-  typedef struct  PS_FontInfoRec
-  {
-    FT_String*  version;
-    FT_String*  notice;
-    FT_String*  full_name;
-    FT_String*  family_name;
-    FT_String*  weight;
-    FT_Long     italic_angle;
-    FT_Bool     is_fixed_pitch;
-    FT_Short    underline_position;
-    FT_UShort   underline_thickness;
-
-  } PS_FontInfoRec, *PS_FontInfo;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    T1_FontInfo                                                        */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    This type is equivalent to @PS_FontInfoRec.  It is deprecated but  */
-  /*    kept to maintain source compatibility between various versions of  */
-  /*    FreeType.                                                          */
-  /*                                                                       */
-  typedef PS_FontInfoRec  T1_FontInfo;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    PS_PrivateRec                                                      */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A structure used to model a Type1/Type2 private dictionary.  Note  */
-  /*    that for Multiple Master fonts, each instance has its own Private  */
-  /*    dictionary.                                                        */
-  /*                                                                       */
-  typedef struct  PS_PrivateRec_
-  {
-    FT_Int     unique_id;
-    FT_Int     lenIV;
-
-    FT_Byte    num_blue_values;
-    FT_Byte    num_other_blues;
-    FT_Byte    num_family_blues;
-    FT_Byte    num_family_other_blues;
-
-    FT_Short   blue_values14;
-    FT_Short   other_blues10;
-
-    FT_Short   family_blues      14;
-    FT_Short   family_other_blues10;
-
-    FT_Fixed   blue_scale;
-    FT_Int     blue_shift;
-    FT_Int     blue_fuzz;
-
-    FT_UShort  standard_width1;
-    FT_UShort  standard_height1;
-
-    FT_Byte    num_snap_widths;
-    FT_Byte    num_snap_heights;
-    FT_Bool    force_bold;
-    FT_Bool    round_stem_up;
-
-    FT_Short   snap_widths 13;  /* including std width  */
-    FT_Short   snap_heights13;  /* including std height */
-
-    FT_Long    language_group;
-    FT_Long    password;
-
-    FT_Short   min_feature2;
-
-  } PS_PrivateRec, *PS_Private;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    T1_Private                                                         */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*   This type is equivalent to @PS_PrivateRec.  It is deprecated but    */
-  /*   kept to maintain source compatibility between various versions of   */
-  /*   FreeType.                                                           */
-  /*                                                                       */
-  typedef PS_PrivateRec  T1_Private;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Enum>                                                                */
-  /*    T1_Blend_Flags                                                     */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A set of flags used to indicate which fields are present in a      */
-  /*    given blen dictionary (font info or private).  Used to support     */
-  /*    Multiple Masters fonts.                                            */
-  /*                                                                       */
-  typedef enum
-  {
-    /*# required fields in a FontInfo blend dictionary */
-    T1_BLEND_UNDERLINE_POSITION = 0,
-    T1_BLEND_UNDERLINE_THICKNESS,
-    T1_BLEND_ITALIC_ANGLE,
-
-    /*# required fields in a Private blend dictionary */
-    T1_BLEND_BLUE_VALUES,
-    T1_BLEND_OTHER_BLUES,
-    T1_BLEND_STANDARD_WIDTH,
-    T1_BLEND_STANDARD_HEIGHT,
-    T1_BLEND_STEM_SNAP_WIDTHS,
-    T1_BLEND_STEM_SNAP_HEIGHTS,
-    T1_BLEND_BLUE_SCALE,
-    T1_BLEND_BLUE_SHIFT,
-    T1_BLEND_FAMILY_BLUES,
-    T1_BLEND_FAMILY_OTHER_BLUES,
-    T1_BLEND_FORCE_BOLD,
-
-    /*# never remove */
-    T1_BLEND_MAX
-
-  } T1_Blend_Flags;
-
-
-  /*# backwards compatible definitions */
-#define t1_blend_underline_position   T1_BLEND_UNDERLINE_POSITION
-#define t1_blend_underline_thickness  T1_BLEND_UNDERLINE_THICKNESS
-#define t1_blend_italic_angle         T1_BLEND_ITALIC_ANGLE
-#define t1_blend_blue_values          T1_BLEND_BLUE_VALUES
-#define t1_blend_other_blues          T1_BLEND_OTHER_BLUES
-#define t1_blend_standard_widths      T1_BLEND_STANDARD_WIDTH
-#define t1_blend_standard_height      T1_BLEND_STANDARD_HEIGHT
-#define t1_blend_stem_snap_widths     T1_BLEND_STEM_SNAP_WIDTHS
-#define t1_blend_stem_snap_heights    T1_BLEND_STEM_SNAP_HEIGHTS
-#define t1_blend_blue_scale           T1_BLEND_BLUE_SCALE
-#define t1_blend_blue_shift           T1_BLEND_BLUE_SHIFT
-#define t1_blend_family_blues         T1_BLEND_FAMILY_BLUES
-#define t1_blend_family_other_blues   T1_BLEND_FAMILY_OTHER_BLUES
-#define t1_blend_force_bold           T1_BLEND_FORCE_BOLD
-#define t1_blend_max                  T1_BLEND_MAX
-
-
-  /* maximum number of Multiple Masters designs, as defined in the spec */
-#define T1_MAX_MM_DESIGNS     16
-
-  /* maximum number of Multiple Masters axes, as defined in the spec */
-#define T1_MAX_MM_AXIS        4
-
-  /* maximum number of elements in a design map */
-#define T1_MAX_MM_MAP_POINTS  20
-
-
-  /* this structure is used to store the BlendDesignMap entry for an axis */
-  typedef struct  PS_DesignMap_
-  {
-    FT_Byte    num_points;
-    FT_Fixed*  design_points;
-    FT_Fixed*  blend_points;
-
-  } PS_DesignMapRec, *PS_DesignMap;
-
-  /* backwards-compatible definition */
-  typedef PS_DesignMapRec  T1_DesignMap;
-
-
-  typedef struct  PS_BlendRec_
-  {
-    FT_UInt          num_designs;
-    FT_UInt          num_axis;
-
-    FT_String*       axis_namesT1_MAX_MM_AXIS;
-    FT_Fixed*        design_posT1_MAX_MM_DESIGNS;
-    PS_DesignMapRec  design_mapT1_MAX_MM_AXIS;
-
-    FT_Fixed*        weight_vector;
-    FT_Fixed*        default_weight_vector;
-
-    PS_FontInfo      font_infosT1_MAX_MM_DESIGNS + 1;
-    PS_Private       privates  T1_MAX_MM_DESIGNS + 1;
-
-    FT_ULong         blend_bitflags;
-
-    FT_BBox*         bboxes    T1_MAX_MM_DESIGNS + 1;
-
-  } PS_BlendRec, *PS_Blend;
-
-
-  /* backwards-compatible definition */
-  typedef PS_BlendRec  T1_Blend;
-
-
-  typedef struct  CID_FaceDictRec_
-  {
-    PS_PrivateRec  private_dict;
-
-    FT_UInt        len_buildchar;
-    FT_Fixed       forcebold_threshold;
-    FT_Pos         stroke_width;
-    FT_Fixed       expansion_factor;
-
-    FT_Byte        paint_type;
-    FT_Byte        font_type;
-    FT_Matrix      font_matrix;
-    FT_Vector      font_offset;
-
-    FT_UInt        num_subrs;
-    FT_ULong       subrmap_offset;
-    FT_Int         sd_bytes;
-
-  } CID_FaceDictRec, *CID_FaceDict;
-
-
-  /* backwards-compatible definition */
-  typedef CID_FaceDictRec  CID_FontDict;
-
-
-  typedef struct  CID_FaceInfoRec_
-  {
-    FT_String*      cid_font_name;
-    FT_Fixed        cid_version;
-    FT_Int          cid_font_type;
-
-    FT_String*      registry;
-    FT_String*      ordering;
-    FT_Int          supplement;
-
-    PS_FontInfoRec  font_info;
-    FT_BBox         font_bbox;
-    FT_ULong        uid_base;
-
-    FT_Int          num_xuid;
-    FT_ULong        xuid16;
-
-    FT_ULong        cidmap_offset;
-    FT_Int          fd_bytes;
-    FT_Int          gd_bytes;
-    FT_ULong        cid_count;
-
-    FT_Int          num_dicts;
-    CID_FaceDict    font_dicts;
-
-    FT_ULong        data_offset;
-
-  } CID_FaceInfoRec, *CID_FaceInfo;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    CID_Info                                                           */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*   This type is equivalent to CID_FaceInfoRec.  It is deprecated but   */
-  /*   kept to maintain source compatibility between various versions of   */
-  /*   FreeType.                                                           */
-  /*                                                                       */
-  typedef CID_FaceInfoRec  CID_Info;
-
-  /* */
-
-
- /************************************************************************
-  *
-  * @function:
-  *    FT_Has_PS_Glyph_Names
-  *
-  * @description:
-  *    Return true if a given face provides reliable Postscript glyph
-  *    names.  This is similar to using the @FT_HAS_GLYPH_NAMES macro,
-  *    except that certain fonts (mostly TrueType) contain incorrect
-  *    glyph name tables.
-  *
-  *    When this function returns true, the caller is sure that the glyph
-  *    names returned by @FT_Get_Glyph_Name are reliable.
-  *
-  * @input:
-  *    face ::
-  *       face handle
-  *
-  * @return:
-  *    Boolean.  True if glyph names are reliable.
-  */
-  FT_EXPORT( FT_Int )
-  FT_Has_PS_Glyph_Names( FT_Face  face );
-
-
- /************************************************************************
-  *
-  * @function:
-  *    FT_Get_PS_Font_Info
-  *
-  * @description:
-  *    Retrieve the @PS_FontInfoRec structure corresponding to a given
-  *    Postscript font.
-  *
-  * @input:
-  *    face ::
-  *       Postscript face handle.
-  *
-  * @output:
-  *    afont_info ::
-  *       Output font info structure pointer.
-  *
-  * @return:
-  *    FreeType error code.  0 means success.
-  *
-  * @note:
-  *    The string pointers within the font info structure are owned by
-  *    the face and don't need to be freed by the caller.
-  *
-  *    If the font's format is not Postscript-based, this function will
-  *    return the FT_Err_Invalid_Argument error code.
-  */
-  FT_EXPORT( FT_Error )
-  FT_Get_PS_Font_Info( FT_Face          face,
-                       PS_FontInfoRec  *afont_info );
-
- /* */
-
-
-
-FT_END_HEADER
-
-#endif /* __T1TABLES_H__ */
-
-
-/* END */

gpac-2.2.1.tar.gz/extra_lib/include/freetype/freetype/ttnameid.h Deleted

@@ -1,1075 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  ttnameid.h                                                             */
-/*                                                                         */
-/*    TrueType name ID definitions (specification only).                   */
-/*                                                                         */
-/*  Copyright 1996-2002, 2003 by                                           */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef __TTNAMEID_H__
-#define __TTNAMEID_H__
-
-
-#include <ft2build.h>
-
-
-FT_BEGIN_HEADER
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* Possible values for the `platform' identifier code in the name        */
-  /* records of the TTF `name' table.                                      */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-  /***********************************************************************
-   *
-   * @enum:
-   *   TT_PLATFORM_XXX
-   *
-   * @description:
-   *   A list of valid values for the `platform_id' identifier code in
-   *   @FT_CharMapRec and @FT_SfntName structures.
-   *
-   * @values:
-   *   TT_PLATFORM_APPLE_UNICODE ::
-   *     Used by Apple to indicate a Unicode character map and/or name entry.
-   *     See @TT_APPLE_ID_XXX for corresponding `encoding_id' values.  Note
-   *     that name entries in this format are coded as big-endian UCS-2
-   *     character codes _only_.
-   *
-   *   TT_PLATFORM_MACINTOSH ::
-   *     Used by Apple to indicate a MacOS-specific charmap and/or name entry.
-   *     See @TT_MAC_ID_XXX for corresponding `encoding_id' values.  Note that
-   *     most TrueType fonts contain an Apple roman charmap to be usable on
-   *     MacOS systems (even if they contain a Microsoft charmap as well).
-   *
-   *   TT_PLATFORM_ISO ::
-   *     This value was used to specify Unicode charmaps.  It is however
-   *     now deprecated.  See @TT_ISO_ID_XXX for a list of corresponding
-   *     `encoding_id' values.
-   *
-   *   TT_PLATFORM_MICROSOFT ::
-   *     Used by Microsoft to indicate Windows-specific charmaps.  See
-   *     @TT_MS_ID_XXX for a list of corresponding `encoding_id' values.
-   *     Note that most fonts contain a Unicode charmap using
-   *     (@TT_PLATFORM_MICROSOFT, @TT_MS_ID_UNICODE_CS).
-   *
-   *   TT_PLATFORM_CUSTOM ::
-   *     Used to indicate application-specific charmaps.
-   *
-   *   TT_PLATFORM_ADOBE ::
-   *     This value isn't part of any font format specification, but is used
-   *     by FreeType to report Adobe-specific charmaps in an @FT_CharMapRec
-   *     structure.  See @TT_ADOBE_ID_XXX.
-   */
-
-#define TT_PLATFORM_APPLE_UNICODE  0
-#define TT_PLATFORM_MACINTOSH      1
-#define TT_PLATFORM_ISO            2 /* deprecated */
-#define TT_PLATFORM_MICROSOFT      3
-#define TT_PLATFORM_CUSTOM         4
-#define TT_PLATFORM_ADOBE          7 /* artificial */
-
-
-  /***********************************************************************
-   *
-   * @enum:
-   *   TT_APPLE_ID_XXX
-   *
-   * @description:
-   *   A list of valid values for the `encoding_id' for
-   *   @TT_PLATFORM_APPLE_UNICODE charmaps and name entries.
-   *
-   * @values:
-   *   TT_APPLE_ID_DEFAULT ::
-   *     Unicode version 1.0.
-   *   TT_APPLE_ID_UNICODE_1_1 ::
-   *     Unicode 1.1; specifies Hangul characters starting at U+34xx.
-   *   TT_APPLE_ID_ISO_10646 ::
-   *     Deprecated (identical to preceding.)
-   *   TT_APPLE_ID_UNICODE_2_0 ::
-   *     Unicode 2.0 and beyond (UTF-16 BMP only.)
-   *   TT_APPLE_ID_UNICODE_32 ::
-   *     Unicode 3.1 and beyond, using UTF-32
-   */
-
-#define TT_APPLE_ID_DEFAULT      0 /* Unicode 1.0 */
-#define TT_APPLE_ID_UNICODE_1_1  1 /* specify Hangul at U+34xx */
-#define TT_APPLE_ID_ISO_10646    2 /* deprecated */
-#define TT_APPLE_ID_UNICODE_2_0  3 /* or later */
-#define TT_APPLE_ID_UNICODE_32   4 /* 2.0 or later, full repertoire */
-
-
-  /***********************************************************************
-   *
-   * @enum:
-   *   TT_MAC_ID_XXX
-   *
-   * @description:
-   *   A list of valid values for the `encoding_id' for
-   *   @TT_PLATFORM_MACINTOSH charmaps and name entries.
-   *
-   * @values:
-   *   TT_MAC_ID_ROMAN ::
-   *   TT_MAC_ID_JAPANESE ::
-   *   TT_MAC_ID_TRADITIONAL_CHINESE ::
-   *   TT_MAC_ID_KOREAN ::
-   *   TT_MAC_ID_ARABIC ::
-   *   TT_MAC_ID_HEBREW ::
-   *   TT_MAC_ID_GREEK ::
-   *   TT_MAC_ID_RUSSIAN ::
-   *   TT_MAC_ID_RSYMBOL ::
-   *   TT_MAC_ID_DEVANAGARI ::
-   *   TT_MAC_ID_GURMUKHI ::
-   *   TT_MAC_ID_GUJARATI ::
-   *   TT_MAC_ID_ORIYA ::
-   *   TT_MAC_ID_BENGALI ::
-   *   TT_MAC_ID_TAMIL ::
-   *   TT_MAC_ID_TELUGU ::
-   *   TT_MAC_ID_KANNADA ::
-   *   TT_MAC_ID_MALAYALAM ::
-   *   TT_MAC_ID_SINHALESE ::
-   *   TT_MAC_ID_BURMESE ::
-   *   TT_MAC_ID_KHMER ::
-   *   TT_MAC_ID_THAI ::
-   *   TT_MAC_ID_LAOTIAN ::
-   *   TT_MAC_ID_GEORGIAN ::
-   *   TT_MAC_ID_ARMENIAN ::
-   *   TT_MAC_ID_MALDIVIAN ::
-   *   TT_MAC_ID_SIMPLIFIED_CHINESE ::
-   *   TT_MAC_ID_TIBETAN ::
-   *   TT_MAC_ID_MONGOLIAN ::
-   *   TT_MAC_ID_GEEZ ::
-   *   TT_MAC_ID_SLAVIC ::
-   *   TT_MAC_ID_VIETNAMESE ::
-   *   TT_MAC_ID_SINDHI ::
-   *   TT_MAC_ID_UNINTERP ::
-   */
-
-#define TT_MAC_ID_ROMAN                 0
-#define TT_MAC_ID_JAPANESE              1
-#define TT_MAC_ID_TRADITIONAL_CHINESE   2
-#define TT_MAC_ID_KOREAN                3
-#define TT_MAC_ID_ARABIC                4
-#define TT_MAC_ID_HEBREW                5
-#define TT_MAC_ID_GREEK                 6
-#define TT_MAC_ID_RUSSIAN               7
-#define TT_MAC_ID_RSYMBOL               8
-#define TT_MAC_ID_DEVANAGARI            9
-#define TT_MAC_ID_GURMUKHI             10
-#define TT_MAC_ID_GUJARATI             11
-#define TT_MAC_ID_ORIYA                12
-#define TT_MAC_ID_BENGALI              13
-#define TT_MAC_ID_TAMIL                14
-#define TT_MAC_ID_TELUGU               15
-#define TT_MAC_ID_KANNADA              16
-#define TT_MAC_ID_MALAYALAM            17
-#define TT_MAC_ID_SINHALESE            18
-#define TT_MAC_ID_BURMESE              19
-#define TT_MAC_ID_KHMER                20
-#define TT_MAC_ID_THAI                 21
-#define TT_MAC_ID_LAOTIAN              22
-#define TT_MAC_ID_GEORGIAN             23
-#define TT_MAC_ID_ARMENIAN             24
-#define TT_MAC_ID_MALDIVIAN            25
-#define TT_MAC_ID_SIMPLIFIED_CHINESE   25
-#define TT_MAC_ID_TIBETAN              26
-#define TT_MAC_ID_MONGOLIAN            27
-#define TT_MAC_ID_GEEZ                 28
-#define TT_MAC_ID_SLAVIC               29
-#define TT_MAC_ID_VIETNAMESE           30
-#define TT_MAC_ID_SINDHI               31
-#define TT_MAC_ID_UNINTERP             32
-
-
-  /***********************************************************************
-   *
-   * @enum:
-   *   TT_ISO_ID_XXX
-   *
-   * @description:
-   *   A list of valid values for the `encoding_id' for
-   *   @TT_PLATFORM_ISO charmaps and name entries.
-   *
-   *   Their use is now deprecated.
-   *
-   * @values:
-   *   TT_ISO_ID_7BIT_ASCII ::
-   *     ASCII.
-   *   TT_ISO_ID_10646 ::
-   *     ISO/10646.
-   *   TT_ISO_ID_8859_1 ::
-   *     Also known as Latin-1.
-   */
-
-#define TT_ISO_ID_7BIT_ASCII  0
-#define TT_ISO_ID_10646       1
-#define TT_ISO_ID_8859_1      2
-
-
-  /***********************************************************************
-   *
-   * @enum:
-   *   TT_MS_ID_XXX
-   *
-   * @description:
-   *   A list of valid values for the `encoding_id' for
-   *   @TT_PLATFORM_MICROSOFT charmaps and name entries.
-   *
-   * @values:
-   *   TT_MS_ID_SYMBOL_CS ::
-   *     Corresponds to Microsoft symbol encoding. See
-   *     @FT_ENCODING_MS_SYMBOL.
-   *
-   *   TT_MS_ID_UNICODE_CS ::
-   *     Corresponds to a Microsoft WGL4 charmap, matching Unicode.  See
-   *     @FT_ENCODING_UNICODE.
-   *
-   *   TT_MS_ID_SJIS ::
-   *     Corresponds to SJIS Japanese encoding.  See @FT_ENCODING_SJIS.
-   *
-   *   TT_MS_ID_GB2312 ::
-   *     Corresponds to Simplified Chinese as used in Mainland China.  See
-   *     @FT_ENCODING_GB2312.
-   *
-   *   TT_MS_ID_BIG_5 ::
-   *     Corresponds to Traditional Chinese as used in Taiwan and Hong Kong.
-   *     See @FT_ENCODING_BIG5.
-   *
-   *   TT_MS_ID_WANSUNG ::
-   *     Corresponds to Korean Wansung encoding.  See @FT_ENCODING_WANSUNG.
-   *
-   *   TT_MS_ID_JOHAB ::
-   *     Corresponds to Johab encoding.  See @FT_ENCODING_JOHAB.
-   *
-   *   TT_MS_ID_UCS_4 ::
-   *     Corresponds to UCS-4 or UTF-32 charmaps.  This has been added to
-   *     the OpenType specification version 1.4 (mid-2001.)
-   */
-
-#define TT_MS_ID_SYMBOL_CS    0
-#define TT_MS_ID_UNICODE_CS   1
-#define TT_MS_ID_SJIS         2
-#define TT_MS_ID_GB2312       3
-#define TT_MS_ID_BIG_5        4
-#define TT_MS_ID_WANSUNG      5
-#define TT_MS_ID_JOHAB        6
-#define TT_MS_ID_UCS_4       10
-
-
-  /***********************************************************************
-   *
-   * @enum:
-   *   TT_ADOBE_ID_XXX
-   *
-   * @description:
-   *   A list of valid values for the `encoding_id' for
-   *   @TT_PLATFORM_ADOBE charmaps.  This is a FreeType-specific extension!
-   *
-   * @values:
-   *   TT_ADOBE_ID_STANDARD ::
-   *     Adobe standard encoding.
-   *   TT_ADOBE_ID_EXPERT ::
-   *     Adobe expert encoding.
-   *   TT_ADOBE_ID_CUSTOM ::
-   *     Adobe custom encoding.
-   */
-
-#define TT_ADOBE_ID_STANDARD  0
-#define TT_ADOBE_ID_EXPERT    1
-#define TT_ADOBE_ID_CUSTOM    2
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* Possible values of the language identifier field in the name records  */
-  /* of the TTF `name' table if the `platform' identifier code is          */
-  /* TT_PLATFORM_MACINTOSH.                                                */
-  /*                                                                       */
-  /* The canonical source for the Apple assigned Language ID's is at       */
-  /*                                                                       */
-  /*   http://fonts.apple.com/TTRefMan/RM06/Chap6name.html                 */
-  /*                                                                       */
-#define TT_MAC_LANGID_ENGLISH                       0
-#define TT_MAC_LANGID_FRENCH                        1
-#define TT_MAC_LANGID_GERMAN                        2
-#define TT_MAC_LANGID_ITALIAN                       3
-#define TT_MAC_LANGID_DUTCH                         4
-#define TT_MAC_LANGID_SWEDISH                       5
-#define TT_MAC_LANGID_SPANISH                       6
-#define TT_MAC_LANGID_DANISH                        7
-#define TT_MAC_LANGID_PORTUGUESE                    8
-#define TT_MAC_LANGID_NORWEGIAN                     9
-#define TT_MAC_LANGID_HEBREW                       10
-#define TT_MAC_LANGID_JAPANESE                     11
-#define TT_MAC_LANGID_ARABIC                       12
-#define TT_MAC_LANGID_FINNISH                      13
-#define TT_MAC_LANGID_GREEK                        14
-#define TT_MAC_LANGID_ICELANDIC                    15
-#define TT_MAC_LANGID_MALTESE                      16
-#define TT_MAC_LANGID_TURKISH                      17
-#define TT_MAC_LANGID_CROATIAN                     18
-#define TT_MAC_LANGID_CHINESE_TRADITIONAL          19
-#define TT_MAC_LANGID_URDU                         20
-#define TT_MAC_LANGID_HINDI                        21
-#define TT_MAC_LANGID_THAI                         22
-#define TT_MAC_LANGID_KOREAN                       23
-#define TT_MAC_LANGID_LITHUANIAN                   24
-#define TT_MAC_LANGID_POLISH                       25
-#define TT_MAC_LANGID_HUNGARIAN                    26
-#define TT_MAC_LANGID_ESTONIAN                     27
-#define TT_MAC_LANGID_LETTISH                      28
-#define TT_MAC_LANGID_SAAMISK                      29
-#define TT_MAC_LANGID_FAEROESE                     30
-#define TT_MAC_LANGID_FARSI                        31
-#define TT_MAC_LANGID_RUSSIAN                      32
-#define TT_MAC_LANGID_CHINESE_SIMPLIFIED           33
-#define TT_MAC_LANGID_FLEMISH                      34
-#define TT_MAC_LANGID_IRISH                        35
-#define TT_MAC_LANGID_ALBANIAN                     36
-#define TT_MAC_LANGID_ROMANIAN                     37
-#define TT_MAC_LANGID_CZECH                        38
-#define TT_MAC_LANGID_SLOVAK                       39
-#define TT_MAC_LANGID_SLOVENIAN                    40
-#define TT_MAC_LANGID_YIDDISH                      41
-#define TT_MAC_LANGID_SERBIAN                      42
-#define TT_MAC_LANGID_MACEDONIAN                   43
-#define TT_MAC_LANGID_BULGARIAN                    44
-#define TT_MAC_LANGID_UKRAINIAN                    45
-#define TT_MAC_LANGID_BYELORUSSIAN                 46
-#define TT_MAC_LANGID_UZBEK                        47
-#define TT_MAC_LANGID_KAZAKH                       48
-#define TT_MAC_LANGID_AZERBAIJANI                  49
-#define TT_MAC_LANGID_AZERBAIJANI_CYRILLIC_SCRIPT  49
-#define TT_MAC_LANGID_AZERBAIJANI_ARABIC_SCRIPT    50
-#define TT_MAC_LANGID_ARMENIAN                     51
-#define TT_MAC_LANGID_GEORGIAN                     52
-#define TT_MAC_LANGID_MOLDAVIAN                    53
-#define TT_MAC_LANGID_KIRGHIZ                      54
-#define TT_MAC_LANGID_TAJIKI                       55
-#define TT_MAC_LANGID_TURKMEN                      56
-#define TT_MAC_LANGID_MONGOLIAN                    57
-#define TT_MAC_LANGID_MONGOLIAN_MONGOLIAN_SCRIPT   57
-#define TT_MAC_LANGID_MONGOLIAN_CYRILLIC_SCRIPT    58
-#define TT_MAC_LANGID_PASHTO                       59
-#define TT_MAC_LANGID_KURDISH                      60
-#define TT_MAC_LANGID_KASHMIRI                     61
-#define TT_MAC_LANGID_SINDHI                       62
-#define TT_MAC_LANGID_TIBETAN                      63
-#define TT_MAC_LANGID_NEPALI                       64
-#define TT_MAC_LANGID_SANSKRIT                     65
-#define TT_MAC_LANGID_MARATHI                      66
-#define TT_MAC_LANGID_BENGALI                      67
-#define TT_MAC_LANGID_ASSAMESE                     68
-#define TT_MAC_LANGID_GUJARATI                     69
-#define TT_MAC_LANGID_PUNJABI                      70
-#define TT_MAC_LANGID_ORIYA                        71
-#define TT_MAC_LANGID_MALAYALAM                    72
-#define TT_MAC_LANGID_KANNADA                      73
-#define TT_MAC_LANGID_TAMIL                        74
-#define TT_MAC_LANGID_TELUGU                       75
-#define TT_MAC_LANGID_SINHALESE                    76
-#define TT_MAC_LANGID_BURMESE                      77
-#define TT_MAC_LANGID_KHMER                        78
-#define TT_MAC_LANGID_LAO                          79
-#define TT_MAC_LANGID_VIETNAMESE                   80
-#define TT_MAC_LANGID_INDONESIAN                   81
-#define TT_MAC_LANGID_TAGALOG                      82
-#define TT_MAC_LANGID_MALAY_ROMAN_SCRIPT           83
-#define TT_MAC_LANGID_MALAY_ARABIC_SCRIPT          84
-#define TT_MAC_LANGID_AMHARIC                      85
-#define TT_MAC_LANGID_TIGRINYA                     86
-#define TT_MAC_LANGID_GALLA                        87
-#define TT_MAC_LANGID_SOMALI                       88
-#define TT_MAC_LANGID_SWAHILI                      89
-#define TT_MAC_LANGID_RUANDA                       90
-#define TT_MAC_LANGID_RUNDI                        91
-#define TT_MAC_LANGID_CHEWA                        92
-#define TT_MAC_LANGID_MALAGASY                     93
-#define TT_MAC_LANGID_ESPERANTO                    94
-#define TT_MAC_LANGID_WELSH                       128
-#define TT_MAC_LANGID_BASQUE                      129
-#define TT_MAC_LANGID_CATALAN                     130
-#define TT_MAC_LANGID_LATIN                       131
-#define TT_MAC_LANGID_QUECHUA                     132
-#define TT_MAC_LANGID_GUARANI                     133
-#define TT_MAC_LANGID_AYMARA                      134
-#define TT_MAC_LANGID_TATAR                       135
-#define TT_MAC_LANGID_UIGHUR                      136
-#define TT_MAC_LANGID_DZONGKHA                    137
-#define TT_MAC_LANGID_JAVANESE                    138
-#define TT_MAC_LANGID_SUNDANESE                   139
-
-
-#if 0  /* these seem to be errors that have been dropped */
-
-#define TT_MAC_LANGID_SCOTTISH_GAELIC             140
-#define TT_MAC_LANGID_IRISH_GAELIC                141
-
-#endif
-
-
-  /* The following codes are new as of 2000-03-10 */
-#define TT_MAC_LANGID_GALICIAN                    140
-#define TT_MAC_LANGID_AFRIKAANS                   141
-#define TT_MAC_LANGID_BRETON                      142
-#define TT_MAC_LANGID_INUKTITUT                   143
-#define TT_MAC_LANGID_SCOTTISH_GAELIC             144
-#define TT_MAC_LANGID_MANX_GAELIC                 145
-#define TT_MAC_LANGID_IRISH_GAELIC                146
-#define TT_MAC_LANGID_TONGAN                      147
-#define TT_MAC_LANGID_GREEK_POLYTONIC             148
-#define TT_MAC_LANGID_GREELANDIC                  149
-#define TT_MAC_LANGID_AZERBAIJANI_ROMAN_SCRIPT    150
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* Possible values of the language identifier field in the name records  */
-  /* of the TTF `name' table if the `platform' identifier code is          */
-  /* TT_PLATFORM_MICROSOFT.                                                */
-  /*                                                                       */
-  /* The canonical source for the MS assigned LCID's used to be at         */
-  /*                                                                       */
-  /*   http://www.microsoft.com/typography/OTSPEC/lcid-cp.txt              */
-  /*                                                                       */
-  /* Now (2002-11-15), the Microsoft site directs to                       */
-  /*                                                                       */
-  /*   http://www.microsoft.com/globaldev/reference/loclanghome.asp        */
-  /*   http://support.microsoft.com/support/kb/articles/Q224/8/04.ASP      */
-  /*                                                                       */
-#define TT_MS_LANGID_ARABIC_SAUDI_ARABIA               0x0401
-#define TT_MS_LANGID_ARABIC_IRAQ                       0x0801
-#define TT_MS_LANGID_ARABIC_EGYPT                      0x0c01
-#define TT_MS_LANGID_ARABIC_LIBYA                      0x1001
-#define TT_MS_LANGID_ARABIC_ALGERIA                    0x1401
-#define TT_MS_LANGID_ARABIC_MOROCCO                    0x1801
-#define TT_MS_LANGID_ARABIC_TUNISIA                    0x1c01
-#define TT_MS_LANGID_ARABIC_OMAN                       0x2001
-#define TT_MS_LANGID_ARABIC_YEMEN                      0x2401
-#define TT_MS_LANGID_ARABIC_SYRIA                      0x2801
-#define TT_MS_LANGID_ARABIC_JORDAN                     0x2c01
-#define TT_MS_LANGID_ARABIC_LEBANON                    0x3001
-#define TT_MS_LANGID_ARABIC_KUWAIT                     0x3401
-#define TT_MS_LANGID_ARABIC_UAE                        0x3801
-#define TT_MS_LANGID_ARABIC_BAHRAIN                    0x3c01
-#define TT_MS_LANGID_ARABIC_QATAR                      0x4001
-#define TT_MS_LANGID_BULGARIAN_BULGARIA                0x0402
-#define TT_MS_LANGID_CATALAN_SPAIN                     0x0403
-#define TT_MS_LANGID_CHINESE_TAIWAN                    0x0404
-#define TT_MS_LANGID_CHINESE_PRC                       0x0804
-#define TT_MS_LANGID_CHINESE_HONG_KONG                 0x0c04
-#define TT_MS_LANGID_CHINESE_SINGAPORE                 0x1004
-
-#if 1  /* this used to be this value (and it still is in many places) */
-#define TT_MS_LANGID_CHINESE_MACAU                     0x1404
-#else  /* but beware, Microsoft may change its mind...
-          the most recent Word reference has the following: */
-#define TT_MS_LANGID_CHINESE_MACAU  TT_MS_LANGID_CHINESE_HONG_KONG
-#endif
-
-#define TT_MS_LANGID_CZECH_CZECH_REPUBLIC              0x0405
-#define TT_MS_LANGID_DANISH_DENMARK                    0x0406
-#define TT_MS_LANGID_GERMAN_GERMANY                    0x0407
-#define TT_MS_LANGID_GERMAN_SWITZERLAND                0x0807
-#define TT_MS_LANGID_GERMAN_AUSTRIA                    0x0c07
-#define TT_MS_LANGID_GERMAN_LUXEMBOURG                 0x1007
-#define TT_MS_LANGID_GERMAN_LIECHTENSTEI               0x1407
-#define TT_MS_LANGID_GREEK_GREECE                      0x0408
-#define TT_MS_LANGID_ENGLISH_UNITED_STATES             0x0409
-#define TT_MS_LANGID_ENGLISH_UNITED_KINGDOM            0x0809
-#define TT_MS_LANGID_ENGLISH_AUSTRALIA                 0x0c09
-#define TT_MS_LANGID_ENGLISH_CANADA                    0x1009
-#define TT_MS_LANGID_ENGLISH_NEW_ZEALAND               0x1409
-#define TT_MS_LANGID_ENGLISH_IRELAND                   0x1809
-#define TT_MS_LANGID_ENGLISH_SOUTH_AFRICA              0x1c09
-#define TT_MS_LANGID_ENGLISH_JAMAICA                   0x2009
-#define TT_MS_LANGID_ENGLISH_CARIBBEAN                 0x2409
-#define TT_MS_LANGID_ENGLISH_BELIZE                    0x2809
-#define TT_MS_LANGID_ENGLISH_TRINIDAD                  0x2c09
-#define TT_MS_LANGID_ENGLISH_ZIMBABWE                  0x3009
-#define TT_MS_LANGID_ENGLISH_PHILIPPINES               0x3409
-#define TT_MS_LANGID_SPANISH_SPAIN_TRADITIONAL_SORT    0x040a
-#define TT_MS_LANGID_SPANISH_MEXICO                    0x080a
-#define TT_MS_LANGID_SPANISH_SPAIN_INTERNATIONAL_SORT  0x0c0a
-#define TT_MS_LANGID_SPANISH_GUATEMALA                 0x100a
-#define TT_MS_LANGID_SPANISH_COSTA_RICA                0x140a
-#define TT_MS_LANGID_SPANISH_PANAMA                    0x180a
-#define TT_MS_LANGID_SPANISH_DOMINICAN_REPUBLIC        0x1c0a
-#define TT_MS_LANGID_SPANISH_VENEZUELA                 0x200a
-#define TT_MS_LANGID_SPANISH_COLOMBIA                  0x240a
-#define TT_MS_LANGID_SPANISH_PERU                      0x280a
-#define TT_MS_LANGID_SPANISH_ARGENTINA                 0x2c0a
-#define TT_MS_LANGID_SPANISH_ECUADOR                   0x300a
-#define TT_MS_LANGID_SPANISH_CHILE                     0x340a
-#define TT_MS_LANGID_SPANISH_URUGUAY                   0x380a
-#define TT_MS_LANGID_SPANISH_PARAGUAY                  0x3c0a
-#define TT_MS_LANGID_SPANISH_BOLIVIA                   0x400a
-#define TT_MS_LANGID_SPANISH_EL_SALVADOR               0x440a
-#define TT_MS_LANGID_SPANISH_HONDURAS                  0x480a
-#define TT_MS_LANGID_SPANISH_NICARAGUA                 0x4c0a
-#define TT_MS_LANGID_SPANISH_PUERTO_RICO               0x500a
-#define TT_MS_LANGID_FINNISH_FINLAND                   0x040b
-#define TT_MS_LANGID_FRENCH_FRANCE                     0x040c
-#define TT_MS_LANGID_FRENCH_BELGIUM                    0x080c
-#define TT_MS_LANGID_FRENCH_CANADA                     0x0c0c
-#define TT_MS_LANGID_FRENCH_SWITZERLAND                0x100c
-#define TT_MS_LANGID_FRENCH_LUXEMBOURG                 0x140c
-#define TT_MS_LANGID_FRENCH_MONACO                     0x180c
-#define TT_MS_LANGID_HEBREW_ISRAEL                     0x040d
-#define TT_MS_LANGID_HUNGARIAN_HUNGARY                 0x040e
-#define TT_MS_LANGID_ICELANDIC_ICELAND                 0x040f
-#define TT_MS_LANGID_ITALIAN_ITALY                     0x0410
-#define TT_MS_LANGID_ITALIAN_SWITZERLAND               0x0810
-#define TT_MS_LANGID_JAPANESE_JAPAN                    0x0411
-#define TT_MS_LANGID_KOREAN_EXTENDED_WANSUNG_KOREA     0x0412
-#define TT_MS_LANGID_KOREAN_JOHAB_KOREA                0x0812
-#define TT_MS_LANGID_DUTCH_NETHERLANDS                 0x0413
-#define TT_MS_LANGID_DUTCH_BELGIUM                     0x0813
-#define TT_MS_LANGID_NORWEGIAN_NORWAY_BOKMAL           0x0414
-#define TT_MS_LANGID_NORWEGIAN_NORWAY_NYNORSK          0x0814
-#define TT_MS_LANGID_POLISH_POLAND                     0x0415
-#define TT_MS_LANGID_PORTUGUESE_BRAZIL                 0x0416
-#define TT_MS_LANGID_PORTUGUESE_PORTUGAL               0x0816
-#define TT_MS_LANGID_RHAETO_ROMANIC_SWITZERLAND        0x0417
-#define TT_MS_LANGID_ROMANIAN_ROMANIA                  0x0418
-#define TT_MS_LANGID_MOLDAVIAN_MOLDAVIA                0x0818
-#define TT_MS_LANGID_RUSSIAN_RUSSIA                    0x0419
-#define TT_MS_LANGID_RUSSIAN_MOLDAVIA                  0x0819
-#define TT_MS_LANGID_CROATIAN_CROATIA                  0x041a
-#define TT_MS_LANGID_SERBIAN_SERBIA_LATIN              0x081a
-#define TT_MS_LANGID_SERBIAN_SERBIA_CYRILLIC           0x0c1a
-#define TT_MS_LANGID_SLOVAK_SLOVAKIA                   0x041b
-#define TT_MS_LANGID_ALBANIAN_ALBANIA                  0x041c
-#define TT_MS_LANGID_SWEDISH_SWEDEN                    0x041d
-#define TT_MS_LANGID_SWEDISH_FINLAND                   0x081d
-#define TT_MS_LANGID_THAI_THAILAND                     0x041e
-#define TT_MS_LANGID_TURKISH_TURKEY                    0x041f
-#define TT_MS_LANGID_URDU_PAKISTAN                     0x0420
-#define TT_MS_LANGID_INDONESIAN_INDONESIA              0x0421
-#define TT_MS_LANGID_UKRAINIAN_UKRAINE                 0x0422
-#define TT_MS_LANGID_BELARUSIAN_BELARUS                0x0423
-#define TT_MS_LANGID_SLOVENE_SLOVENIA                  0x0424
-#define TT_MS_LANGID_ESTONIAN_ESTONIA                  0x0425
-#define TT_MS_LANGID_LATVIAN_LATVIA                    0x0426
-#define TT_MS_LANGID_LITHUANIAN_LITHUANIA              0x0427
-#define TT_MS_LANGID_CLASSIC_LITHUANIAN_LITHUANIA      0x0827
-
-#if 0  /* this seems to be an error that have been dropped */
-#define TT_MS_LANGID_MAORI_NEW_ZEALAND                 0x0428
-#endif
-
-#define TT_MS_LANGID_FARSI_IRAN                        0x0429
-#define TT_MS_LANGID_VIETNAMESE_VIET_NAM               0x042a
-#define TT_MS_LANGID_ARMENIAN_ARMENIA                  0x042b
-#define TT_MS_LANGID_AZERI_AZERBAIJAN_LATIN            0x042c
-#define TT_MS_LANGID_AZERI_AZERBAIJAN_CYRILLIC         0x082c
-#define TT_MS_LANGID_BASQUE_SPAIN                      0x042d
-#define TT_MS_LANGID_SORBIAN_GERMANY                   0x042e
-#define TT_MS_LANGID_MACEDONIAN_MACEDONIA              0x042f
-#define TT_MS_LANGID_SUTU_SOUTH_AFRICA                 0x0430
-#define TT_MS_LANGID_TSONGA_SOUTH_AFRICA               0x0431
-#define TT_MS_LANGID_TSWANA_SOUTH_AFRICA               0x0432
-#define TT_MS_LANGID_VENDA_SOUTH_AFRICA                0x0433
-#define TT_MS_LANGID_XHOSA_SOUTH_AFRICA                0x0434
-#define TT_MS_LANGID_ZULU_SOUTH_AFRICA                 0x0435
-#define TT_MS_LANGID_AFRIKAANS_SOUTH_AFRICA            0x0436
-#define TT_MS_LANGID_GEORGIAN_GEORGIA                  0x0437
-#define TT_MS_LANGID_FAEROESE_FAEROE_ISLANDS           0x0438
-#define TT_MS_LANGID_HINDI_INDIA                       0x0439
-#define TT_MS_LANGID_MALTESE_MALTA                     0x043a
-#define TT_MS_LANGID_SAAMI_LAPONIA                     0x043b
-
-#if 0 /* this seems to be a previous invertion */
-#define TT_MS_LANGID_IRISH_GAELIC_IRELAND              0x043c
-#define TT_MS_LANGID_SCOTTISH_GAELIC_UNITED_KINGDOM    0x083c
-#else
-#define TT_MS_LANGID_SCOTTISH_GAELIC_UNITED_KINGDOM    0x083c
-#define TT_MS_LANGID_IRISH_GAELIC_IRELAND              0x043c
-#endif
-
-#define TT_MS_LANGID_MALAY_MALAYSIA                    0x043e
-#define TT_MS_LANGID_MALAY_BRUNEI_DARUSSALAM           0x083e
-#define TT_MS_LANGID_KAZAK_KAZAKSTAN                   0x043f
-#define TT_MS_LANGID_SWAHILI_KENYA                     0x0441
-#define TT_MS_LANGID_UZBEK_UZBEKISTAN_LATIN            0x0443
-#define TT_MS_LANGID_UZBEK_UZBEKISTAN_CYRILLIC         0x0843
-#define TT_MS_LANGID_TATAR_TATARSTAN                   0x0444
-#define TT_MS_LANGID_BENGALI_INDIA                     0x0445
-#define TT_MS_LANGID_PUNJABI_INDIA                     0x0446
-#define TT_MS_LANGID_GUJARATI_INDIA                    0x0447
-#define TT_MS_LANGID_ORIYA_INDIA                       0x0448
-#define TT_MS_LANGID_TAMIL_INDIA                       0x0449
-#define TT_MS_LANGID_TELUGU_INDIA                      0x044a
-#define TT_MS_LANGID_KANNADA_INDIA                     0x044b
-#define TT_MS_LANGID_MALAYALAM_INDIA                   0x044c
-#define TT_MS_LANGID_ASSAMESE_INDIA                    0x044d
-#define TT_MS_LANGID_MARATHI_INDIA                     0x044e
-#define TT_MS_LANGID_SANSKRIT_INDIA                    0x044f
-#define TT_MS_LANGID_KONKANI_INDIA                     0x0457
-
-  /* new as of 2001-01-01 */
-#define TT_MS_LANGID_ARABIC_GENERAL                    0x0001
-#define TT_MS_LANGID_CHINESE_GENERAL                   0x0004
-#define TT_MS_LANGID_ENGLISH_GENERAL                   0x0009
-#define TT_MS_LANGID_FRENCH_WEST_INDIES                0x1c0c
-#define TT_MS_LANGID_FRENCH_REUNION                    0x200c
-#define TT_MS_LANGID_FRENCH_CONGO                      0x240c
-  /* which was formerly: */
-#define TT_MS_LANGID_FRENCH_ZAIRE  TT_MS_LANGID_FRENCH_CONGO
-
-#define TT_MS_LANGID_FRENCH_SENEGAL                    0x280c
-#define TT_MS_LANGID_FRENCH_CAMEROON                   0x2c0c
-#define TT_MS_LANGID_FRENCH_COTE_D_IVOIRE              0x300c
-#define TT_MS_LANGID_FRENCH_MALI                       0x340c
-#define TT_MS_LANGID_BOSNIAN_BOSNIA_HERZEGOVINA        0x101a
-#define TT_MS_LANGID_URDU_INDIA                        0x0820
-#define TT_MS_LANGID_TAJIK_TAJIKISTAN                  0x0428
-#define TT_MS_LANGID_YIDDISH_GERMANY                   0x043d
-#define TT_MS_LANGID_KIRGHIZ_KIRGHIZSTAN               0x0440
-  /* alias declared in Windows 2000 */
-#define TT_MS_LANGID_KIRGHIZ_KIRGHIZ_REPUBLIC \
-          TT_MS_LANGID_KIRGHIZ_KIRGHIZSTAN
-
-#define TT_MS_LANGID_TURKMEN_TURKMENISTAN              0x0442
-#define TT_MS_LANGID_MONGOLIAN_MONGOLIA /* Cyrillic */ 0x0450
-
-  /* the following seems to be inconsistent;
-     here is the current "official" way: */
-#define TT_MS_LANGID_TIBETAN_BHUTAN                    0x0451
-  /* and here is what is used by Passport SDK */
-#define TT_MS_LANGID_TIBETAN_CHINA                     0x0451
-#define TT_MS_LANGID_DZONGHKA_BHUTAN                   0x0851
-  /* end of inconsistency */
-
-#define TT_MS_LANGID_WELSH_WALES                       0x0452
-#define TT_MS_LANGID_KHMER_CAMBODIA                    0x0453
-#define TT_MS_LANGID_LAO_LAOS                          0x0454
-#define TT_MS_LANGID_BURMESE_MYANMAR                   0x0455
-#define TT_MS_LANGID_GALICIAN_SPAIN                    0x0456
-#define TT_MS_LANGID_MANIPURI_INDIA                    0x0458
-#define TT_MS_LANGID_SINDHI_INDIA                      0x0459
-  /* the following one is only encountered in Microsoft RTF specification */
-#define TT_MS_LANGID_KASHMIRI_PAKISTAN                 0x0460
-  /* the following one is not in the Passport list, looks like an omission */
-#define TT_MS_LANGID_KASHMIRI_INDIA                    0x0860
-#define TT_MS_LANGID_NEPALI_NEPAL                      0x0461
-#define TT_MS_LANGID_NEPALI_INDIA                      0x0861
-#define TT_MS_LANGID_FRISIAN_NETHERLANDS               0x0462
-
-  /* new as of 2001-03-01 (from Office Xp) */
-#define TT_MS_LANGID_ENGLISH_HONG_KONG                 0x3c09
-#define TT_MS_LANGID_ENGLISH_INDIA                     0x4009
-#define TT_MS_LANGID_ENGLISH_MALAYSIA                  0x4409
-#define TT_MS_LANGID_ENGLISH_SINGAPORE                 0x4809
-#define TT_MS_LANGID_SYRIAC_SYRIA                      0x045a
-#define TT_MS_LANGID_SINHALESE_SRI_LANKA               0x045b
-#define TT_MS_LANGID_CHEROKEE_UNITED_STATES            0x045c
-#define TT_MS_LANGID_INUKTITUT_CANADA                  0x045d
-#define TT_MS_LANGID_AMHARIC_ETHIOPIA                  0x045e
-#define TT_MS_LANGID_TAMAZIGHT_MOROCCO                 0x045f
-#define TT_MS_LANGID_TAMAZIGHT_MOROCCO_LATIN           0x085f
-#define TT_MS_LANGID_PASHTO_AFGHANISTAN                0x0463
-#define TT_MS_LANGID_FILIPINO_PHILIPPINES              0x0464
-#define TT_MS_LANGID_DHIVEHI_MALDIVES                  0x0465
-  /* alias declared in Windows 2000 */
-#define TT_MS_LANGID_DIVEHI_MALDIVES  TT_MS_LANGID_DHIVEHI_MALDIVES
-  /* for language codes from 0x0466 to 0x0471 see below */
-#define TT_MS_LANGID_OROMO_ETHIOPIA                    0x0472
-#define TT_MS_LANGID_TIGRIGNA_ETHIOPIA                 0x0473
-#define TT_MS_LANGID_TIGRIGNA_ERYTHREA                 0x0873
-  /* also spelled in the `Passport SDK' list as: */
-#define TT_MS_LANGID_TIGRIGNA_ERYTREA  TT_MS_LANGID_TIGRIGNA_ERYTHREA
-
-  /* New additions from Windows Xp/Passport SDK 2001-11-10. */
-
-  /* don't ask what this one means... It is commented out currently. */
-#if 0
-#define TT_MS_LANGID_GREEK_GREECE2                     0x2008
-#endif
-
-#define TT_MS_LANGID_SPANISH_UNITED_STATES             0x540a
-  /* The following two IDs blatantly violate MS specs by using a */
-  /* sublanguage > 0x1F.                                         */
-#define TT_MS_LANGID_SPANISH_LATIN_AMERICA             0xE40aU
-#define TT_MS_LANGID_FRENCH_NORTH_AFRICA               0xE40cU
-
-#define TT_MS_LANGID_FRENCH_MOROCCO                    0x380c
-#define TT_MS_LANGID_FRENCH_HAITI                      0x3c0c
-#define TT_MS_LANGID_BENGALI_BANGLADESH                0x0845
-#define TT_MS_LANGID_PUNJABI_ARABIC_PAKISTAN           0x0846
-#define TT_MS_LANGID_MONGOLIAN_MONGOLIA_MONGOLIAN      0x0850
-#define TT_MS_LANGID_EDO_NIGERIA                       0x0466
-#define TT_MS_LANGID_FULFULDE_NIGERIA                  0x0467
-#define TT_MS_LANGID_HAUSA_NIGERIA                     0x0468
-#define TT_MS_LANGID_IBIBIO_NIGERIA                    0x0469
-#define TT_MS_LANGID_YORUBA_NIGERIA                    0x046a
-  /* language codes from 0x046b to 0x046f are (still) unknown. */
-#define TT_MS_LANGID_IGBO_NIGERIA                      0x0470
-#define TT_MS_LANGID_KANURI_NIGERIA                    0x0471
-#define TT_MS_LANGID_GUARANI_PARAGUAY                  0x0474
-#define TT_MS_LANGID_HAWAIIAN_UNITED_STATES            0x0475
-#define TT_MS_LANGID_LATIN                             0x0476
-#define TT_MS_LANGID_SOMALI_SOMALIA                    0x0477
-  /* Note: Yi does not have a (proper) ISO 639-2 code, since it is mostly */
-  /*       not written (but OTOH the peculiar writing system is worth     */
-  /*       studying).                                                     */
-#define TT_MS_LANGID_YI_CHINA                          0x0478
-#define TT_MS_LANGID_PAPIAMENTU_NETHERLANDS_ANTILLES   0x0479
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* Possible values of the `name' identifier field in the name records of */
-  /* the TTF `name' table.  These values are platform independent.         */
-  /*                                                                       */
-#define TT_NAME_ID_COPYRIGHT            0
-#define TT_NAME_ID_FONT_FAMILY          1
-#define TT_NAME_ID_FONT_SUBFAMILY       2
-#define TT_NAME_ID_UNIQUE_ID            3
-#define TT_NAME_ID_FULL_NAME            4
-#define TT_NAME_ID_VERSION_STRING       5
-#define TT_NAME_ID_PS_NAME              6
-#define TT_NAME_ID_TRADEMARK            7
-
-  /* the following values are from the OpenType spec */
-#define TT_NAME_ID_MANUFACTURER         8
-#define TT_NAME_ID_DESIGNER             9
-#define TT_NAME_ID_DESCRIPTION          10
-#define TT_NAME_ID_VENDOR_URL           11
-#define TT_NAME_ID_DESIGNER_URL         12
-#define TT_NAME_ID_LICENSE              13
-#define TT_NAME_ID_LICENSE_URL          14
-  /* number 15 is reserved */
-#define TT_NAME_ID_PREFERRED_FAMILY     16
-#define TT_NAME_ID_PREFERRED_SUBFAMILY  17
-#define TT_NAME_ID_MAC_FULL_NAME        18
-
-  /* The following code is new as of 2000-01-21 */
-#define TT_NAME_ID_SAMPLE_TEXT          19
-
-  /* This is new in OpenType 1.3 */
-#define TT_NAME_ID_CID_FINDFONT_NAME    20
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* Bit mask values for the Unicode Ranges from the TTF `OS2 ' table.     */
-  /*                                                                       */
-  /* Updated 02-Jul-2000.                                                  */
-  /*                                                                       */
-
-  /* General Scripts Area */
-
-  /* Bit  0   Basic Latin */
-#define TT_UCR_BASIC_LATIN                     (1L <<  0) /* U+0020-U+007E */
-  /* Bit  1   C1 Controls and Latin-1 Supplement */
-#define TT_UCR_LATIN1_SUPPLEMENT               (1L <<  1) /* U+0080-U+00FF */
-  /* Bit  2   Latin Extended-A */
-#define TT_UCR_LATIN_EXTENDED_A                (1L <<  2) /* U+0100-U+017F */
-  /* Bit  3   Latin Extended-B */
-#define TT_UCR_LATIN_EXTENDED_B                (1L <<  3) /* U+0180-U+024F */
-  /* Bit  4   IPA Extensions */
-#define TT_UCR_IPA_EXTENSIONS                  (1L <<  4) /* U+0250-U+02AF */
-  /* Bit  5   Spacing Modifier Letters */
-#define TT_UCR_SPACING_MODIFIER                (1L <<  5) /* U+02B0-U+02FF */
-  /* Bit  6   Combining Diacritical Marks */
-#define TT_UCR_COMBINING_DIACRITICS            (1L <<  6) /* U+0300-U+036F */
-  /* Bit  7   Greek and Coptic */
-#define TT_UCR_GREEK                           (1L <<  7) /* U+0370-U+03FF */
-  /* Bit  8 is reserved (was: Greek Symbols and Coptic) */
-  /* Bit  9   Cyrillic               + */
-  /*          Cyrillic Supplementary   */
-#define TT_UCR_CYRILLIC                        (1L <<  9) /* U+0400-U+04FF */
-                                                          /* U+0500-U+052F */
-  /* Bit 10   Armenian */
-#define TT_UCR_ARMENIAN                        (1L << 10) /* U+0530-U+058F */
-  /* Bit 11   Hebrew */
-#define TT_UCR_HEBREW                          (1L << 11) /* U+0590-U+05FF */
-  /* Bit 12 is reserved (was: Hebrew Extended) */
-  /* Bit 13   Arabic */
-#define TT_UCR_ARABIC                          (1L << 13) /* U+0600-U+06FF */
-  /* Bit 14 is reserved (was: Arabic Extended) */
-  /* Bit 15   Devanagari */
-#define TT_UCR_DEVANAGARI                      (1L << 15) /* U+0900-U+097F */
-  /* Bit 16   Bengali */
-#define TT_UCR_BENGALI                         (1L << 16) /* U+0980-U+09FF */
-  /* Bit 17   Gurmukhi */
-#define TT_UCR_GURMUKHI                        (1L << 17) /* U+0A00-U+0A7F */
-  /* Bit 18   Gujarati */
-#define TT_UCR_GUJARATI                        (1L << 18) /* U+0A80-U+0AFF */
-  /* Bit 19   Oriya */
-#define TT_UCR_ORIYA                           (1L << 19) /* U+0B00-U+0B7F */
-  /* Bit 20   Tamil */
-#define TT_UCR_TAMIL                           (1L << 20) /* U+0B80-U+0BFF */
-  /* Bit 21   Telugu */
-#define TT_UCR_TELUGU                          (1L << 21) /* U+0C00-U+0C7F */
-  /* Bit 22   Kannada */
-#define TT_UCR_KANNADA                         (1L << 22) /* U+0C80-U+0CFF */
-  /* Bit 23   Malayalam */
-#define TT_UCR_MALAYALAM                       (1L << 23) /* U+0D00-U+0D7F */
-  /* Bit 24   Thai */
-#define TT_UCR_THAI                            (1L << 24) /* U+0E00-U+0E7F */
-  /* Bit 25   Lao */
-#define TT_UCR_LAO                             (1L << 25) /* U+0E80-U+0EFF */
-  /* Bit 26   Georgian */
-#define TT_UCR_GEORGIAN                        (1L << 26) /* U+10A0-U+10FF */
-  /* Bit 27 is reserved (was Georgian Extended) */
-  /* Bit 28   Hangul Jamo */
-#define TT_UCR_HANGUL_JAMO                     (1L << 28) /* U+1100-U+11FF */
-  /* Bit 29   Latin Extended Additional */
-#define TT_UCR_LATIN_EXTENDED_ADDITIONAL       (1L << 29) /* U+1E00-U+1EFF */
-  /* Bit 30   Greek Extended */
-#define TT_UCR_GREEK_EXTENDED                  (1L << 30) /* U+1F00-U+1FFF */
-
-  /* Symbols Area */
-
-  /* Bit 31   General Punctuation */
-#define TT_UCR_GENERAL_PUNCTUATION             (1L << 31) /* U+2000-U+206F */
-  /* Bit 32   Superscripts And Subscripts */
-#define TT_UCR_SUPERSCRIPTS_SUBSCRIPTS         (1L <<  0) /* U+2070-U+209F */
-  /* Bit 33   Currency Symbols */
-#define TT_UCR_CURRENCY_SYMBOLS                (1L <<  1) /* U+20A0-U+20CF */
-  /* Bit 34   Combining Diacritical Marks For Symbols */
-#define TT_UCR_COMBINING_DIACRITICS_SYMB       (1L <<  2) /* U+20D0-U+20FF */
-  /* Bit 35   Letterlike Symbols */
-#define TT_UCR_LETTERLIKE_SYMBOLS              (1L <<  3) /* U+2100-U+214F */
-  /* Bit 36   Number Forms */
-#define TT_UCR_NUMBER_FORMS                    (1L <<  4) /* U+2150-U+218F */
-  /* Bit 37   Arrows                + */
-  /*          Supplemental Arrows-A + */
-  /*          Supplemental Arrows-B   */
-#define TT_UCR_ARROWS                          (1L <<  5) /* U+2190-U+21FF */
-                                                          /* U+27F0-U+27FF */
-                                                          /* U+2900-U+297F */
-  /* Bit 38   Mathematical Operators               + */
-  /*          Supplemental Mathematical Operators  + */
-  /*          Miscellaneous Mathematical Symbols-A + */
-  /*          Miscellaneous Mathematical Symbols-B   */
-#define TT_UCR_MATHEMATICAL_OPERATORS          (1L <<  6) /* U+2200-U+22FF */
-                                                          /* U+2A00-U+2AFF */
-                                                          /* U+27C0-U+27EF */
-                                                          /* U+2980-U+29FF */
-  /* Bit 39 Miscellaneous Technical */
-#define TT_UCR_MISCELLANEOUS_TECHNICAL         (1L <<  7) /* U+2300-U+23FF */
-  /* Bit 40   Control Pictures */
-#define TT_UCR_CONTROL_PICTURES                (1L <<  8) /* U+2400-U+243F */
-  /* Bit 41   Optical Character Recognition */
-#define TT_UCR_OCR                             (1L <<  9) /* U+2440-U+245F */
-  /* Bit 42   Enclosed Alphanumerics */
-#define TT_UCR_ENCLOSED_ALPHANUMERICS          (1L << 10) /* U+2460-U+24FF */
-  /* Bit 43   Box Drawing */
-#define TT_UCR_BOX_DRAWING                     (1L << 11) /* U+2500-U+257F */
-  /* Bit 44   Block Elements */
-#define TT_UCR_BLOCK_ELEMENTS                  (1L << 12) /* U+2580-U+259F */
-  /* Bit 45   Geometric Shapes */
-#define TT_UCR_GEOMETRIC_SHAPES                (1L << 13) /* U+25A0-U+25FF */
-  /* Bit 46   Miscellaneous Symbols */
-#define TT_UCR_MISCELLANEOUS_SYMBOLS           (1L << 14) /* U+2600-U+26FF */
-  /* Bit 47   Dingbats */
-#define TT_UCR_DINGBATS                        (1L << 15) /* U+2700-U+27BF */
-
-  /* CJK Phonetics and Symbols Area */
-
-  /* Bit 48   CJK Symbols and Punctuation */
-#define TT_UCR_CJK_SYMBOLS                     (1L << 16) /* U+3000-U+303F */
-  /* Bit 49   Hiragana */
-#define TT_UCR_HIRAGANA                        (1L << 17) /* U+3040-U+309F */
-  /* Bit 50   Katakana                     + */
-  /*          Katakana Phonetic Extensions   */
-#define TT_UCR_KATAKANA                        (1L << 18) /* U+30A0-U+30FF */
-                                                          /* U+31F0-U+31FF */
-  /* Bit 51   Bopomofo          + */
-  /*          Bopomofo Extended   */
-#define TT_UCR_BOPOMOFO                        (1L << 19) /* U+3100-U+312F */
-                                                          /* U+31A0-U+31BF */
-  /* Bit 52   Hangul Compatibility Jamo */
-#define TT_UCR_HANGUL_COMPATIBILITY_JAMO       (1L << 20) /* U+3130-U+318F */
-  /* Bit 53   Kanbun */
-#define TT_UCR_CJK_MISC                        (1L << 21) /* U+3190-U+319F */
-#define TT_UCR_KANBUN  TT_UCR_CJK_MISC
-  /* Bit 54   Enclosed CJK Letters and Months */
-#define TT_UCR_ENCLOSED_CJK_LETTERS_MONTHS     (1L << 22) /* U+3200-U+32FF */
-  /* Bit 55   CJK Compatibility */
-#define TT_UCR_CJK_COMPATIBILITY               (1L << 23) /* U+3300-U+33FF */
-
-  /* Hangul Syllables Area */
-
-  /* Bit 56   Hangul */
-#define TT_UCR_HANGUL                          (1L << 24) /* U+AC00-U+D7A3 */
-
-  /* Surrogates Area */
-
-  /* Bit 57   High Surrogates             + */
-  /*          High Private Use Surrogates + */
-  /*          Low Surrogates                */
-#define TT_UCR_SURROGATES                      (1L << 25) /* U+D800-U+DB7F */
-                                                          /* U+DB80-U+DBFF */
-                                                          /* U+DC00-U+DFFF */
-  /* According to OpenType specs v.1.3+, setting bit 57 implies that there */
-  /* is at least one codepoint beyond the Basic Multilingual Plane that is */
-  /* supported by this font.  So it really means:            >= U+10000    */
-
-  /* Bit 58 is reserved for Unicode SubRanges */
-
-  /* CJK Ideographs Area */
-
-  /* Bit 59   CJK Unified Ideographs             + */
-  /*          CJK Radicals Supplement            + */
-  /*          Kangxi Radicals                    + */
-  /*          Ideographic Description Characters + */
-  /*          CJK Unified Ideographs Extension A   */
-  /*          CJK Unified Ideographs Extension A + */
-  /*          CJK Unified Ideographs Extension B + */
-  /*          Kanbun                               */
-#define TT_UCR_CJK_UNIFIED_IDEOGRAPHS          (1L << 27) /* U+4E00-U+9FFF */
-                                                          /* U+2E80-U+2EFF */
-                                                          /* U+2F00-U+2FDF */
-                                                          /* U+2FF0-U+2FFF */
-                                                          /* U+3400-U+4DB5 */
-                                                          /*U+20000-U+2A6DF*/
-                                                          /* U+3190-U+319F */
-
-  /* Private Use Area */
-
-  /* Bit 60   Private Use */
-#define TT_UCR_PRIVATE_USE                     (1L << 28) /* U+E000-U+F8FF */
-
-  /* Compatibility Area and Specials */
-
-  /* Bit 61   CJK Compatibility Ideographs            + */
-  /*          CJK Compatibility Ideographs Supplement   */
-#define TT_UCR_CJK_COMPATIBILITY_IDEOGRAPHS    (1L << 29) /* U+F900-U+FAFF */
-                                                          /*U+2F800-U+2FA1F*/
-  /* Bit 62   Alphabetic Presentation Forms */
-#define TT_UCR_ALPHABETIC_PRESENTATION_FORMS   (1L << 30) /* U+FB00-U+FB4F */
-  /* Bit 63   Arabic Presentation Forms-A */
-#define TT_UCR_ARABIC_PRESENTATIONS_A          (1L << 31) /* U+FB50-U+FDFF */
-  /* Bit 64   Combining Half Marks */
-#define TT_UCR_COMBINING_HALF_MARKS            (1L <<  0) /* U+FE20-U+FE2F */
-  /* Bit 65   CJK Compatibility Forms */
-#define TT_UCR_CJK_COMPATIBILITY_FORMS         (1L <<  1) /* U+FE30-U+FE4F */
-  /* Bit 66   Small Form Variants */
-#define TT_UCR_SMALL_FORM_VARIANTS             (1L <<  2) /* U+FE50-U+FE6F */
-  /* Bit 67   Arabic Presentation Forms-B */
-#define TT_UCR_ARABIC_PRESENTATIONS_B          (1L <<  3) /* U+FE70-U+FEFE */
-  /* Bit 68   Halfwidth and Fullwidth Forms */
-#define TT_UCR_HALFWIDTH_FULLWIDTH_FORMS       (1L <<  4) /* U+FF00-U+FFEF */
-  /* Bit 69   Specials */
-#define TT_UCR_SPECIALS                        (1L <<  5) /* U+FFF0-U+FFFD */
-  /* Bit 70   Tibetan */
-#define TT_UCR_TIBETAN                         (1L <<  6) /* U+0F00-U+0FFF */
-  /* Bit 71   Syriac */
-#define TT_UCR_SYRIAC                          (1L <<  7) /* U+0700-U+074F */
-  /* Bit 72   Thaana */
-#define TT_UCR_THAANA                          (1L <<  8) /* U+0780-U+07BF */
-  /* Bit 73   Sinhala */
-#define TT_UCR_SINHALA                         (1L <<  9) /* U+0D80-U+0DFF */
-  /* Bit 74   Myanmar */
-#define TT_UCR_MYANMAR                         (1L << 10) /* U+1000-U+109F */
-  /* Bit 75   Ethiopic */
-#define TT_UCR_ETHIOPIC                        (1L << 11) /* U+1200-U+137F */
-  /* Bit 76   Cherokee */
-#define TT_UCR_CHEROKEE                        (1L << 12) /* U+13A0-U+13FF */
-  /* Bit 77   Unified Canadian Aboriginal Syllabics */
-#define TT_UCR_CANADIAN_ABORIGINAL_SYLLABICS   (1L << 13) /* U+1400-U+167F */
-  /* Bit 78   Ogham */
-#define TT_UCR_OGHAM                           (1L << 14) /* U+1680-U+169F */
-  /* Bit 79   Runic */
-#define TT_UCR_RUNIC                           (1L << 15) /* U+16A0-U+16FF */
-  /* Bit 80   Khmer */
-#define TT_UCR_KHMER                           (1L << 16) /* U+1780-U+17FF */
-  /* Bit 81   Mongolian */
-#define TT_UCR_MONGOLIAN                       (1L << 17) /* U+1800-U+18AF */
-  /* Bit 82   Braille Patterns */
-#define TT_UCR_BRAILLE                         (1L << 18) /* U+2800-U+28FF */
-  /* Bit 83   Yi Syllables + */
-  /*          Yi Radicals    */
-#define TT_UCR_YI                              (1L << 19) /* U+A000-U+A48F */
-                                                          /* U+A490-U+A4CF */
-  /* Bit 84   Tagalog  + */
-  /*          Hanunoo  + */
-  /*          Buhid    + */
-  /*          Tagbanwa   */
-#define TT_UCR_PHILIPPINE                      (1L << 20) /* U+1700-U+171F */
-                                                          /* U+1720-U+173F */
-                                                          /* U+1740-U+175F */
-                                                          /* U+1760-U+177F */
-  /* Bit 85   Old Italic */
-#define TT_UCR_OLD_ITALIC                      (1L << 21) /*U+10300-U+1032F*/
-  /* Bit 86   Gothic */
-#define TT_UCR_GOTHIC                          (1L << 22) /*U+10330-U+1034F*/
-  /* Bit 87   Deseret */
-#define TT_UCR_DESERET                         (1L << 23) /*U+10400-U+1044F*/
-  /* Bit 88   Byzantine Musical Symbols + */
-  /*          Musical Symbols             */
-#define TT_UCR_MUSICAL_SYMBOLS                 (1L << 24) /*U+1D000-U+1D0FF*/
-                                                          /*U+1D100-U+1D1FF*/
-  /* Bit 89   Mathematical Alphanumeric Symbols */
-#define TT_UCR_MATH_ALPHANUMERIC_SYMBOLS       (1L << 25) /*U+1D400-U+1D7FF*/
-  /* Bit 90   Private Use (plane 15) + */
-  /*          Private Use (plane 16)   */
-#define TT_UCR_PRIVATE_USE_SUPPLEMENTARY       (1L << 26) /*U+F0000-U+FFFFD*/
-                                                        /*U+100000-U+10FFFD*/
-  /* Bit 91   Variation Selectors */
-#define TT_UCR_VARIATION_SELECTORS             (1L << 27) /* U+FE00-U+FE0F */
-  /* Bit 92   Tags */
-#define TT_UCR_TAGS                            (1L << 28) /*U+E0000-U+E007F*/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* Some compilers have a very limited length of identifiers.             */
-  /*                                                                       */
-#if defined( __TURBOC__ ) && __TURBOC__ < 0x0410 || defined( __PACIFIC__ )
-#define HAVE_LIMIT_ON_IDENTS
-#endif
-
-
-#ifndef HAVE_LIMIT_ON_IDENTS
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* Here some alias #defines in order to be clearer.                      */
-  /*                                                                       */
-  /* These are not always #defined to stay within the 31 character limit   */
-  /* which some compilers have.                                            */
-  /*                                                                       */
-  /* Credits go to Dave Hoo <dhoo@flash.net> for pointing out that modern  */
-  /* Borland compilers (read: from BC++ 3.1 on) can increase this limit.   */
-  /* If you get a warning with such a compiler, use the -i40 switch.       */
-  /*                                                                       */
-#define TT_UCR_ARABIC_PRESENTATION_FORMS_A      \
-         TT_UCR_ARABIC_PRESENTATIONS_A
-#define TT_UCR_ARABIC_PRESENTATION_FORMS_B      \
-         TT_UCR_ARABIC_PRESENTATIONS_B
-
-#define TT_UCR_COMBINING_DIACRITICAL_MARKS      \
-         TT_UCR_COMBINING_DIACRITICS
-#define TT_UCR_COMBINING_DIACRITICAL_MARKS_SYMB \
-         TT_UCR_COMBINING_DIACRITICS_SYMB
-
-
-#endif /* !HAVE_LIMIT_ON_IDENTS */
-
-
-FT_END_HEADER
-
-#endif /* __TTNAMEID_H__ */
-
-
-/* END */

gpac-2.2.1.tar.gz/extra_lib/include/freetype/freetype/tttables.h Deleted

@@ -1,674 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  tttables.h                                                             */
-/*                                                                         */
-/*    Basic SFNT/TrueType tables definitions and interface                 */
-/*    (specification only).                                                */
-/*                                                                         */
-/*  Copyright 1996-2001, 2002, 2003 by                                     */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef __TTTABLES_H__
-#define __TTTABLES_H__
-
-
-#include <ft2build.h>
-#include FT_FREETYPE_H
-
-#ifdef FREETYPE_H
-#error "freetype.h of FreeType 1 has been loaded!"
-#error "Please fix the directory search order for header files"
-#error "so that freetype.h of FreeType 2 is found first."
-#endif
-
-
-FT_BEGIN_HEADER
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Section>                                                             */
-  /*    truetype_tables                                                    */
-  /*                                                                       */
-  /* <Title>                                                               */
-  /*    TrueType Tables                                                    */
-  /*                                                                       */
-  /* <Abstract>                                                            */
-  /*    TrueType-specific table types and functions.                       */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    This section contains the definition of TrueType-specific tables   */
-  /*    as well as some routines used to access and process them.          */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    TT_Header                                                          */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A structure used to model a TrueType font header table.  All       */
-  /*    fields follow the TrueType specification.                          */
-  /*                                                                       */
-  typedef struct  TT_Header_
-  {
-    FT_Fixed   Table_Version;
-    FT_Fixed   Font_Revision;
-
-    FT_Long    CheckSum_Adjust;
-    FT_Long    Magic_Number;
-
-    FT_UShort  Flags;
-    FT_UShort  Units_Per_EM;
-
-    FT_Long    Created 2;
-    FT_Long    Modified2;
-
-    FT_Short   xMin;
-    FT_Short   yMin;
-    FT_Short   xMax;
-    FT_Short   yMax;
-
-    FT_UShort  Mac_Style;
-    FT_UShort  Lowest_Rec_PPEM;
-
-    FT_Short   Font_Direction;
-    FT_Short   Index_To_Loc_Format;
-    FT_Short   Glyph_Data_Format;
-
-  } TT_Header;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    TT_HoriHeader                                                      */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A structure used to model a TrueType horizontal header, the `hhea' */
-  /*    table, as well as the corresponding horizontal metrics table,      */
-  /*    i.e., the `hmtx' table.                                            */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    Version                :: The table version.                       */
-  /*                                                                       */
-  /*    Ascender               :: The font's ascender, i.e., the distance  */
-  /*                              from the baseline to the top-most of all */
-  /*                              glyph points found in the font.          */
-  /*                                                                       */
-  /*                              This value is invalid in many fonts, as  */
-  /*                              it is usually set by the font designer,  */
-  /*                              and often reflects only a portion of the */
-  /*                              glyphs found in the font (maybe ASCII).  */
-  /*                                                                       */
-  /*                              You should use the `sTypoAscender' field */
-  /*                              of the OS/2 table instead if you want    */
-  /*                              the correct one.                         */
-  /*                                                                       */
-  /*    Descender              :: The font's descender, i.e., the distance */
-  /*                              from the baseline to the bottom-most of  */
-  /*                              all glyph points found in the font.  It  */
-  /*                              is negative.                             */
-  /*                                                                       */
-  /*                              This value is invalid in many fonts, as  */
-  /*                              it is usually set by the font designer,  */
-  /*                              and often reflects only a portion of the */
-  /*                              glyphs found in the font (maybe ASCII).  */
-  /*                                                                       */
-  /*                              You should use the `sTypoDescender'      */
-  /*                              field of the OS/2 table instead if you   */
-  /*                              want the correct one.                    */
-  /*                                                                       */
-  /*    Line_Gap               :: The font's line gap, i.e., the distance  */
-  /*                              to add to the ascender and descender to  */
-  /*                              get the BTB, i.e., the                   */
-  /*                              baseline-to-baseline distance for the    */
-  /*                              font.                                    */
-  /*                                                                       */
-  /*    advance_Width_Max      :: This field is the maximum of all advance */
-  /*                              widths found in the font.  It can be     */
-  /*                              used to compute the maximum width of an  */
-  /*                              arbitrary string of text.                */
-  /*                                                                       */
-  /*    min_Left_Side_Bearing  :: The minimum left side bearing of all     */
-  /*                              glyphs within the font.                  */
-  /*                                                                       */
-  /*    min_Right_Side_Bearing :: The minimum right side bearing of all    */
-  /*                              glyphs within the font.                  */
-  /*                                                                       */
-  /*    xMax_Extent            :: The maximum horizontal extent (i.e., the */
-  /*                              `width' of a glyph's bounding box) for   */
-  /*                              all glyphs in the font.                  */
-  /*                                                                       */
-  /*    caret_Slope_Rise       :: The rise coefficient of the cursor's     */
-  /*                              slope of the cursor (slope=rise/run).    */
-  /*                                                                       */
-  /*    caret_Slope_Run        :: The run coefficient of the cursor's      */
-  /*                              slope.                                   */
-  /*                                                                       */
-  /*    Reserved               :: 10 reserved bytes.                       */
-  /*                                                                       */
-  /*    metric_Data_Format     :: Always 0.                                */
-  /*                                                                       */
-  /*    number_Of_HMetrics     :: Number of HMetrics entries in the `hmtx' */
-  /*                              table -- this value can be smaller than  */
-  /*                              the total number of glyphs in the font.  */
-  /*                                                                       */
-  /*    long_metrics           :: A pointer into the `hmtx' table.         */
-  /*                                                                       */
-  /*    short_metrics          :: A pointer into the `hmtx' table.         */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    IMPORTANT: The TT_HoriHeader and TT_VertHeader structures should   */
-  /*               be identical except for the names of their fields which */
-  /*               are different.                                          */
-  /*                                                                       */
-  /*               This ensures that a single function in the `ttload'     */
-  /*               module is able to read both the horizontal and vertical */
-  /*               headers.                                                */
-  /*                                                                       */
-  typedef struct  TT_HoriHeader_
-  {
-    FT_Fixed   Version;
-    FT_Short   Ascender;
-    FT_Short   Descender;
-    FT_Short   Line_Gap;
-
-    FT_UShort  advance_Width_Max;      /* advance width maximum */
-
-    FT_Short   min_Left_Side_Bearing;  /* minimum left-sb       */
-    FT_Short   min_Right_Side_Bearing; /* minimum right-sb      */
-    FT_Short   xMax_Extent;            /* xmax extents          */
-    FT_Short   caret_Slope_Rise;
-    FT_Short   caret_Slope_Run;
-    FT_Short   caret_Offset;
-
-    FT_Short   Reserved4;
-
-    FT_Short   metric_Data_Format;
-    FT_UShort  number_Of_HMetrics;
-
-    /* The following fields are not defined by the TrueType specification */
-    /* but they are used to connect the metrics header to the relevant    */
-    /* `HMTX' table.                                                      */
-
-    void*      long_metrics;
-    void*      short_metrics;
-
-  } TT_HoriHeader;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    TT_VertHeader                                                      */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A structure used to model a TrueType vertical header, the `vhea'   */
-  /*    table, as well as the corresponding vertical metrics table, i.e.,  */
-  /*    the `vmtx' table.                                                  */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    Version                 :: The table version.                      */
-  /*                                                                       */
-  /*    Ascender                :: The font's ascender, i.e., the distance */
-  /*                               from the baseline to the top-most of    */
-  /*                               all glyph points found in the font.     */
-  /*                                                                       */
-  /*                               This value is invalid in many fonts, as */
-  /*                               it is usually set by the font designer, */
-  /*                               and often reflects only a portion of    */
-  /*                               the glyphs found in the font (maybe     */
-  /*                               ASCII).                                 */
-  /*                                                                       */
-  /*                               You should use the `sTypoAscender'      */
-  /*                               field of the OS/2 table instead if you  */
-  /*                               want the correct one.                   */
-  /*                                                                       */
-  /*    Descender               :: The font's descender, i.e., the         */
-  /*                               distance from the baseline to the       */
-  /*                               bottom-most of all glyph points found   */
-  /*                               in the font.  It is negative.           */
-  /*                                                                       */
-  /*                               This value is invalid in many fonts, as */
-  /*                               it is usually set by the font designer, */
-  /*                               and often reflects only a portion of    */
-  /*                               the glyphs found in the font (maybe     */
-  /*                               ASCII).                                 */
-  /*                                                                       */
-  /*                               You should use the `sTypoDescender'     */
-  /*                               field of the OS/2 table instead if you  */
-  /*                               want the correct one.                   */
-  /*                                                                       */
-  /*    Line_Gap                :: The font's line gap, i.e., the distance */
-  /*                               to add to the ascender and descender to */
-  /*                               get the BTB, i.e., the                  */
-  /*                               baseline-to-baseline distance for the   */
-  /*                               font.                                   */
-  /*                                                                       */
-  /*    advance_Height_Max      :: This field is the maximum of all        */
-  /*                               advance heights found in the font.  It  */
-  /*                               can be used to compute the maximum      */
-  /*                               height of an arbitrary string of text.  */
-  /*                                                                       */
-  /*    min_Top_Side_Bearing    :: The minimum top side bearing of all     */
-  /*                               glyphs within the font.                 */
-  /*                                                                       */
-  /*    min_Bottom_Side_Bearing :: The minimum bottom side bearing of all  */
-  /*                               glyphs within the font.                 */
-  /*                                                                       */
-  /*    yMax_Extent             :: The maximum vertical extent (i.e., the  */
-  /*                               `height' of a glyph's bounding box) for */
-  /*                               all glyphs in the font.                 */
-  /*                                                                       */
-  /*    caret_Slope_Rise        :: The rise coefficient of the cursor's    */
-  /*                               slope of the cursor (slope=rise/run).   */
-  /*                                                                       */
-  /*    caret_Slope_Run         :: The run coefficient of the cursor's     */
-  /*                               slope.                                  */
-  /*                                                                       */
-  /*    caret_Offset            :: The cursor's offset for slanted fonts.  */
-  /*                               This value is `reserved' in vmtx        */
-  /*                               version 1.0.                            */
-  /*                                                                       */
-  /*    Reserved                :: 8 reserved bytes.                       */
-  /*                                                                       */
-  /*    metric_Data_Format      :: Always 0.                               */
-  /*                                                                       */
-  /*    number_Of_HMetrics      :: Number of VMetrics entries in the       */
-  /*                               `vmtx' table -- this value can be       */
-  /*                               smaller than the total number of glyphs */
-  /*                               in the font.                            */
-  /*                                                                       */
-  /*    long_metrics           :: A pointer into the `vmtx' table.         */
-  /*                                                                       */
-  /*    short_metrics          :: A pointer into the `vmtx' table.         */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    IMPORTANT: The TT_HoriHeader and TT_VertHeader structures should   */
-  /*               be identical except for the names of their fields which */
-  /*               are different.                                          */
-  /*                                                                       */
-  /*               This ensures that a single function in the `ttload'     */
-  /*               module is able to read both the horizontal and vertical */
-  /*               headers.                                                */
-  /*                                                                       */
-  typedef struct  TT_VertHeader_
-  {
-    FT_Fixed   Version;
-    FT_Short   Ascender;
-    FT_Short   Descender;
-    FT_Short   Line_Gap;
-
-    FT_UShort  advance_Height_Max;      /* advance height maximum */
-
-    FT_Short   min_Top_Side_Bearing;    /* minimum left-sb or top-sb       */
-    FT_Short   min_Bottom_Side_Bearing; /* minimum right-sb or bottom-sb   */
-    FT_Short   yMax_Extent;             /* xmax or ymax extents            */
-    FT_Short   caret_Slope_Rise;
-    FT_Short   caret_Slope_Run;
-    FT_Short   caret_Offset;
-
-    FT_Short   Reserved4;
-
-    FT_Short   metric_Data_Format;
-    FT_UShort  number_Of_VMetrics;
-
-    /* The following fields are not defined by the TrueType specification */
-    /* but they're used to connect the metrics header to the relevant     */
-    /* `HMTX' or `VMTX' table.                                            */
-
-    void*      long_metrics;
-    void*      short_metrics;
-
-  } TT_VertHeader;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    TT_OS2                                                             */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A structure used to model a TrueType OS/2 table. This is the long  */
-  /*    table version.  All fields comply to the TrueType specification.   */
-  /*                                                                       */
-  /*    Note that we now support old Mac fonts which do not include an     */
-  /*    OS/2 table.  In this case, the `version' field is always set to    */
-  /*    0xFFFF.                                                            */
-  /*                                                                       */
-  typedef struct  TT_OS2_
-  {
-    FT_UShort  version;                /* 0x0001 - more or 0xFFFF */
-    FT_Short   xAvgCharWidth;
-    FT_UShort  usWeightClass;
-    FT_UShort  usWidthClass;
-    FT_Short   fsType;
-    FT_Short   ySubscriptXSize;
-    FT_Short   ySubscriptYSize;
-    FT_Short   ySubscriptXOffset;
-    FT_Short   ySubscriptYOffset;
-    FT_Short   ySuperscriptXSize;
-    FT_Short   ySuperscriptYSize;
-    FT_Short   ySuperscriptXOffset;
-    FT_Short   ySuperscriptYOffset;
-    FT_Short   yStrikeoutSize;
-    FT_Short   yStrikeoutPosition;
-    FT_Short   sFamilyClass;
-
-    FT_Byte    panose10;
-
-    FT_ULong   ulUnicodeRange1;        /* Bits 0-31   */
-    FT_ULong   ulUnicodeRange2;        /* Bits 32-63  */
-    FT_ULong   ulUnicodeRange3;        /* Bits 64-95  */
-    FT_ULong   ulUnicodeRange4;        /* Bits 96-127 */
-
-    FT_Char    achVendID4;
-
-    FT_UShort  fsSelection;
-    FT_UShort  usFirstCharIndex;
-    FT_UShort  usLastCharIndex;
-    FT_Short   sTypoAscender;
-    FT_Short   sTypoDescender;
-    FT_Short   sTypoLineGap;
-    FT_UShort  usWinAscent;
-    FT_UShort  usWinDescent;
-
-    /* only version 1 tables: */
-
-    FT_ULong   ulCodePageRange1;       /* Bits 0-31   */
-    FT_ULong   ulCodePageRange2;       /* Bits 32-63  */
-
-    /* only version 2 tables: */
-
-    FT_Short   sxHeight;
-    FT_Short   sCapHeight;
-    FT_UShort  usDefaultChar;
-    FT_UShort  usBreakChar;
-    FT_UShort  usMaxContext;
-
-  } TT_OS2;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    TT_Postscript                                                      */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A structure used to model a TrueType Postscript table.  All fields */
-  /*    comply to the TrueType table.  This structure does not reference   */
-  /*    the Postscript glyph names, which can be nevertheless accessed     */
-  /*    with the `ttpost' module.                                          */
-  /*                                                                       */
-  typedef struct  TT_Postscript_
-  {
-    FT_Fixed  FormatType;
-    FT_Fixed  italicAngle;
-    FT_Short  underlinePosition;
-    FT_Short  underlineThickness;
-    FT_ULong  isFixedPitch;
-    FT_ULong  minMemType42;
-    FT_ULong  maxMemType42;
-    FT_ULong  minMemType1;
-    FT_ULong  maxMemType1;
-
-    /* Glyph names follow in the file, but we don't   */
-    /* load them by default.  See the ttpost.c file.  */
-
-  } TT_Postscript;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    TT_PCLT                                                            */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    A structure used to model a TrueType PCLT table.  All fields       */
-  /*    comply to the TrueType table.                                      */
-  /*                                                                       */
-  typedef struct  TT_PCLT_
-  {
-    FT_Fixed   Version;
-    FT_ULong   FontNumber;
-    FT_UShort  Pitch;
-    FT_UShort  xHeight;
-    FT_UShort  Style;
-    FT_UShort  TypeFamily;
-    FT_UShort  CapHeight;
-    FT_UShort  SymbolSet;
-    FT_Char    TypeFace16;
-    FT_Char    CharacterComplement8;
-    FT_Char    FileName6;
-    FT_Char    StrokeWeight;
-    FT_Char    WidthType;
-    FT_Byte    SerifStyle;
-    FT_Byte    Reserved;
-
-  } TT_PCLT;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Struct>                                                              */
-  /*    TT_MaxProfile                                                      */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    The maximum profile is a table containing many max values which    */
-  /*    can be used to pre-allocate arrays.  This ensures that no memory   */
-  /*    allocation occurs during a glyph load.                             */
-  /*                                                                       */
-  /* <Fields>                                                              */
-  /*    version               :: The version number.                       */
-  /*                                                                       */
-  /*    numGlyphs             :: The number of glyphs in this TrueType     */
-  /*                             font.                                     */
-  /*                                                                       */
-  /*    maxPoints             :: The maximum number of points in a         */
-  /*                             non-composite TrueType glyph.  See also   */
-  /*                             the structure element                     */
-  /*                             `maxCompositePoints'.                     */
-  /*                                                                       */
-  /*    maxContours           :: The maximum number of contours in a       */
-  /*                             non-composite TrueType glyph.  See also   */
-  /*                             the structure element                     */
-  /*                             `maxCompositeContours'.                   */
-  /*                                                                       */
-  /*    maxCompositePoints    :: The maximum number of points in a         */
-  /*                             composite TrueType glyph.  See also the   */
-  /*                             structure element `maxPoints'.            */
-  /*                                                                       */
-  /*    maxCompositeContours  :: The maximum number of contours in a       */
-  /*                             composite TrueType glyph.  See also the   */
-  /*                             structure element `maxContours'.          */
-  /*                                                                       */
-  /*    maxZones              :: The maximum number of zones used for      */
-  /*                             glyph hinting.                            */
-  /*                                                                       */
-  /*    maxTwilightPoints     :: The maximum number of points in the       */
-  /*                             twilight zone used for glyph hinting.     */
-  /*                                                                       */
-  /*    maxStorage            :: The maximum number of elements in the     */
-  /*                             storage area used for glyph hinting.      */
-  /*                                                                       */
-  /*    maxFunctionDefs       :: The maximum number of function            */
-  /*                             definitions in the TrueType bytecode for  */
-  /*                             this font.                                */
-  /*                                                                       */
-  /*    maxInstructionDefs    :: The maximum number of instruction         */
-  /*                             definitions in the TrueType bytecode for  */
-  /*                             this font.                                */
-  /*                                                                       */
-  /*    maxStackElements      :: The maximum number of stack elements used */
-  /*                             during bytecode interpretation.           */
-  /*                                                                       */
-  /*    maxSizeOfInstructions :: The maximum number of TrueType opcodes    */
-  /*                             used for glyph hinting.                   */
-  /*                                                                       */
-  /*    maxComponentElements  :: An obscure value related to composite     */
-  /*                             glyphs definitions.                       */
-  /*                                                                       */
-  /*    maxComponentDepth     :: An obscure value related to composite     */
-  /*                             glyphs definitions.  Probably the maximum */
-  /*                             number of simple glyphs in a composite.   */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    This structure is only used during font loading.                   */
-  /*                                                                       */
-  typedef struct  TT_MaxProfile_
-  {
-    FT_Fixed   version;
-    FT_UShort  numGlyphs;
-    FT_UShort  maxPoints;
-    FT_UShort  maxContours;
-    FT_UShort  maxCompositePoints;
-    FT_UShort  maxCompositeContours;
-    FT_UShort  maxZones;
-    FT_UShort  maxTwilightPoints;
-    FT_UShort  maxStorage;
-    FT_UShort  maxFunctionDefs;
-    FT_UShort  maxInstructionDefs;
-    FT_UShort  maxStackElements;
-    FT_UShort  maxSizeOfInstructions;
-    FT_UShort  maxComponentElements;
-    FT_UShort  maxComponentDepth;
-
-  } TT_MaxProfile;
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Enum>                                                                */
-  /*    FT_Sfnt_Tag                                                        */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    An enumeration used to specify the index of an SFNT table.         */
-  /*    Used in the @FT_Get_Sfnt_Table API function.                       */
-  /*                                                                       */
-  typedef enum
-  {
-    ft_sfnt_head = 0,
-    ft_sfnt_maxp = 1,
-    ft_sfnt_os2  = 2,
-    ft_sfnt_hhea = 3,
-    ft_sfnt_vhea = 4,
-    ft_sfnt_post = 5,
-    ft_sfnt_pclt = 6,
-
-    sfnt_max   /* internal end mark */
-
-  } FT_Sfnt_Tag;
-
-  /* */
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* <Function>                                                            */
-  /*    FT_Get_Sfnt_Table                                                  */
-  /*                                                                       */
-  /* <Description>                                                         */
-  /*    Returns a pointer to a given SFNT table within a face.             */
-  /*                                                                       */
-  /* <Input>                                                               */
-  /*    face :: A handle to the source.                                    */
-  /*                                                                       */
-  /*    tag  :: The index of the SFNT table.                               */
-  /*                                                                       */
-  /* <Return>                                                              */
-  /*    A type-less pointer to the table.  This will be 0 in case of       */
-  /*    error, or if the corresponding table was not found *OR* loaded     */
-  /*    from the file.                                                     */
-  /*                                                                       */
-  /* <Note>                                                                */
-  /*    The table is owned by the face object and disappears with it.      */
-  /*                                                                       */
-  /*    This function is only useful to access SFNT tables that are loaded */
-  /*    by the sfnt/truetype/opentype drivers.  See @FT_Sfnt_Tag for a     */
-  /*    list.                                                              */
-  /*                                                                       */
-  FT_EXPORT( void* )
-  FT_Get_Sfnt_Table( FT_Face      face,
-                     FT_Sfnt_Tag  tag );
-
-
- /**************************************************************************
-  *
-  * <Function>
-  *    FT_Load_Sfnt_Table
-  *
-  * <Description>
-  *   Loads any font table into client memory.
-  *
-  * <Input>
-  *   face   :: A handle to the source face.
-  *
-  *   tag    :: The 4-byte tag of the table to load.  Use the value 0 if
-  *             you want to access the whole font file.  Otherwise, you can
-  *             use one of the definitions found in the @FT_TRUETYPE_TAGS_H
-  *             file, or forge a new one with @FT_MAKE_TAG.
-  *              
-  *   offset :: The starting offset in the table (or file if tag == 0).
-  *
-  * <Output>
-  *   buffer :: The target buffer address.  The client must ensure that
-  *             the memory array is big enough to hold the data.
-  *
-  * <InOut>
-  *   length :: If the `length' parameter is NULL, then try to load the whole
-  *             table.  Return an error code if it fails.
-  *
-  *             Else, if `*length' is 0, exit immediately while returning
-  *             the table's (or file) full size in it.
-  *
-  *             Else the number of bytes to read from the table or file,
-  *             from the starting offset.
-  *
-  * <Return>
-  *   FreeType error code.  0 means success.
-  *
-  * <Note>
-  *   If you need to determine the table's length you should first call this
-  *   function with `*length' set to 0, as in the following example:
-  *
-  *   {
-  *     FT_ULong  length = 0;
-  *
-  *
-  *     error = FT_Load_Sfnt_Table( face, tag, 0, NULL, &length );
-  *     if ( error ) { ... table does not exist ... }
-  *
-  *     buffer = malloc( length );
-  *     if ( buffer == NULL ) { ... not enough memory ... }
-  *
-  *     error = FT_Load_Sfnt_Table( face,tag, 0, buffer, &length );
-  *     if ( error ) { ... could not load table ... }
-  *   }
-  */
-  FT_EXPORT( FT_Error )
-  FT_Load_Sfnt_Table( FT_Face    face,
-                      FT_ULong   tag,
-                      FT_Long    offset,
-                      FT_Byte*   buffer,
-                      FT_ULong*  length );
-
-  /* */
-
-
-FT_END_HEADER
-
-#endif /* __TTTABLES_H__ */
-
-
-/* END */

gpac-2.2.1.tar.gz/extra_lib/include/freetype/freetype/tttags.h Deleted

@@ -1,80 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  tttags.h                                                               */
-/*                                                                         */
-/*    Tags for TrueType tables (specification only).                       */
-/*                                                                         */
-/*  Copyright 1996-2001 by                                                 */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef __TTAGS_H__
-#define __TTAGS_H__
-
-
-#include <ft2build.h>
-#include FT_FREETYPE_H
-
-#ifdef FREETYPE_H
-#error "freetype.h of FreeType 1 has been loaded!"
-#error "Please fix the directory search order for header files"
-#error "so that freetype.h of FreeType 2 is found first."
-#endif
-
-
-FT_BEGIN_HEADER
-
-
-#define TTAG_cmap  FT_MAKE_TAG( 'c', 'm', 'a', 'p' )
-#define TTAG_cvt   FT_MAKE_TAG( 'c', 'v', 't', ' ' )
-#define TTAG_CFF   FT_MAKE_TAG( 'C', 'F', 'F', ' ' )
-#define TTAG_DSIG  FT_MAKE_TAG( 'D', 'S', 'I', 'G' )
-#define TTAG_bhed  FT_MAKE_TAG( 'b', 'h', 'e', 'd' )
-#define TTAG_bdat  FT_MAKE_TAG( 'b', 'd', 'a', 't' )
-#define TTAG_bloc  FT_MAKE_TAG( 'b', 'l', 'o', 'c' )
-#define TTAG_EBDT  FT_MAKE_TAG( 'E', 'B', 'D', 'T' )
-#define TTAG_EBLC  FT_MAKE_TAG( 'E', 'B', 'L', 'C' )
-#define TTAG_EBSC  FT_MAKE_TAG( 'E', 'B', 'S', 'C' )
-#define TTAG_fpgm  FT_MAKE_TAG( 'f', 'p', 'g', 'm' )
-#define TTAG_fvar  FT_MAKE_TAG( 'f', 'v', 'a', 'r' )
-#define TTAG_gasp  FT_MAKE_TAG( 'g', 'a', 's', 'p' )
-#define TTAG_glyf  FT_MAKE_TAG( 'g', 'l', 'y', 'f' )
-#define TTAG_GSUB  FT_MAKE_TAG( 'G', 'S', 'U', 'B' )
-#define TTAG_hdmx  FT_MAKE_TAG( 'h', 'd', 'm', 'x' )
-#define TTAG_head  FT_MAKE_TAG( 'h', 'e', 'a', 'd' )
-#define TTAG_hhea  FT_MAKE_TAG( 'h', 'h', 'e', 'a' )
-#define TTAG_hmtx  FT_MAKE_TAG( 'h', 'm', 't', 'x' )
-#define TTAG_kern  FT_MAKE_TAG( 'k', 'e', 'r', 'n' )
-#define TTAG_loca  FT_MAKE_TAG( 'l', 'o', 'c', 'a' )
-#define TTAG_LTSH  FT_MAKE_TAG( 'L', 'T', 'S', 'H' )
-#define TTAG_maxp  FT_MAKE_TAG( 'm', 'a', 'x', 'p' )
-#define TTAG_MMSD  FT_MAKE_TAG( 'M', 'M', 'S', 'D' )
-#define TTAG_MMFX  FT_MAKE_TAG( 'M', 'M', 'F', 'X' )
-#define TTAG_name  FT_MAKE_TAG( 'n', 'a', 'm', 'e' )
-#define TTAG_OS2   FT_MAKE_TAG( 'O', 'S', '/', '2' )
-#define TTAG_OTTO  FT_MAKE_TAG( 'O', 'T', 'T', 'O' )
-#define TTAG_PCLT  FT_MAKE_TAG( 'P', 'C', 'L', 'T' )
-#define TTAG_post  FT_MAKE_TAG( 'p', 'o', 's', 't' )
-#define TTAG_prep  FT_MAKE_TAG( 'p', 'r', 'e', 'p' )
-#define TTAG_true  FT_MAKE_TAG( 't', 'r', 'u', 'e' )
-#define TTAG_ttc   FT_MAKE_TAG( 't', 't', 'c', ' ' )
-#define TTAG_ttcf  FT_MAKE_TAG( 't', 't', 'c', 'f' )
-#define TTAG_VDMX  FT_MAKE_TAG( 'V', 'D', 'M', 'X' )
-#define TTAG_vhea  FT_MAKE_TAG( 'v', 'h', 'e', 'a' )
-#define TTAG_vmtx  FT_MAKE_TAG( 'v', 'm', 't', 'x' )
-
-
-FT_END_HEADER
-
-#endif /* __TTAGS_H__ */
-
-
-/* END */

gpac-2.2.1.tar.gz/extra_lib/include/freetype/ft2build.h Deleted

@@ -1,39 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  ft2build.h                                                             */
-/*                                                                         */
-/*    FreeType 2 build and setup macros.                                   */
-/*    (Generic version)                                                    */
-/*                                                                         */
-/*  Copyright 1996-2001 by                                                 */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* This file corresponds to the default "ft2build.h" file for            */
-  /* FreeType 2.  It uses the "freetype" include root.                     */
-  /*                                                                       */
-  /* Note that specific platforms might use a different configuration.     */
-  /* See builds/unix/ft2unix.h for an example.                             */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-#ifndef __FT2_BUILD_GENERIC_H__
-#define __FT2_BUILD_GENERIC_H__
-
-#include <freetype/config/ftheader.h>
-
-#endif /* __FT2_BUILD_GENERIC_H__ */
-
-
-/* END */

gpac-2.2.1.tar.gz/extra_lib/include/jpeg Deleted

gpac-2.2.1.tar.gz/extra_lib/include/jpeg/jconfig.h Deleted

@@ -1,64 +0,0 @@
-/* jconfig.h.  Generated automatically by configure.  */
-/* jconfig.cfg --- source file edited by configure script */
-/* see jconfig.doc for explanations */
-
-#ifdef _WIN32_WCE
-#define HAVE_PROTOTYPES
-#define HAVE_UNSIGNED_CHAR
-#define HAVE_UNSIGNED_SHORT
-#define HAVE_STDDEF_H
-#define HAVE_STDLIB_H
-
-#ifndef __RPCNDR_H__
-typedef unsigned char boolean;
-#endif
-#define HAVE_BOOLEAN		/* prevent jmorecfg.h from redefining it */
-#else
-#undef HAVE_PROTOTYPES
-#undef HAVE_UNSIGNED_CHAR
-#undef HAVE_UNSIGNED_SHORT
-#undef HAVE_STDDEF_H
-#undef HAVE_STDLIB_H
-#endif
-
-#undef void
-#undef const
-#undef CHAR_IS_UNSIGNED
-#undef NEED_BSD_STRINGS
-#undef NEED_SYS_TYPES_H
-#undef NEED_FAR_POINTERS
-#undef NEED_SHORT_EXTERNAL_NAMES
-/* Define this if you get warnings about undefined structures. */
-#undef INCOMPLETE_TYPES_BROKEN
-
-
-#ifdef JPEG_INTERNALS
-
-#undef RIGHT_SHIFT_IS_UNSIGNED
-#undef INLINE
-/* These are for configuring the JPEG memory manager. */
-#undef DEFAULT_MAX_MEM
-#undef NO_MKTEMP
-
-#ifdef __MINGW32__ 	 
-#define INLINE __inline__
-#endif //__MINGW32__ 	 
-
-#endif /* JPEG_INTERNALS */
-
-#ifdef JPEG_CJPEG_DJPEG
-
-#define BMP_SUPPORTED		/* BMP image file format */
-#define GIF_SUPPORTED		/* GIF image file format */
-#define PPM_SUPPORTED		/* PBMPLUS PPM/PGM image file format */
-#undef RLE_SUPPORTED		/* Utah RLE image file format */
-#define TARGA_SUPPORTED		/* Targa image file format */
-
-#undef TWO_FILE_COMMANDLINE
-#undef NEED_SIGNAL_CATCHER
-#undef DONT_USE_B_MODE
-
-/* Define this if you want percent-done progress reports from cjpeg/djpeg. */
-#undef PROGRESS_REPORT
-
-#endif /* JPEG_CJPEG_DJPEG */

gpac-2.2.1.tar.gz/extra_lib/include/jpeg/jmorecfg.h Deleted

@@ -1,368 +0,0 @@
-/*
- * jmorecfg.h
- *
- * Copyright (C) 1991-1997, Thomas G. Lane.
- * This file is part of the Independent JPEG Group's software.
- * For conditions of distribution and use, see the accompanying README file.
- *
- * This file contains additional configuration options that customize the
- * JPEG software for special applications or support machine-dependent
- * optimizations.  Most users will not need to touch this file.
- */
-
-
-/*
- * Define BITS_IN_JSAMPLE as either
- *   8   for 8-bit sample values (the usual setting)
- *   12  for 12-bit sample values
- * Only 8 and 12 are legal data precisions for lossy JPEG according to the
- * JPEG standard, and the IJG code does not support anything else!
- * We do not support run-time selection of data precision, sorry.
- */
-
-#define BITS_IN_JSAMPLE  8	/* use 8 or 12 */
-
-
-/*
- * Maximum number of components (color channels) allowed in JPEG image.
- * To meet the letter of the JPEG spec, set this to 255.  However, darn
- * few applications need more than 4 channels (maybe 5 for CMYK + alpha
- * mask).  We recommend 10 as a reasonable compromise; use 4 if you are
- * really short on memory.  (Each allowed component costs a hundred or so
- * bytes of storage, whether actually used in an image or not.)
- */
-
-#define MAX_COMPONENTS  10	/* maximum number of image components */
-
-
-/*
- * Basic data types.
- * You may need to change these if you have a machine with unusual data
- * type sizes; for example, "char" not 8 bits, "short" not 16 bits,
- * or "long" not 32 bits.  We don't care whether "int" is 16 or 32 bits,
- * but it had better be at least 16.
- */
-
-/* Representation of a single sample (pixel element value).
- * We frequently allocate large arrays of these, so it's important to keep
- * them small.  But if you have memory to burn and access to char or short
- * arrays is very slow on your hardware, you might want to change these.
- */
-
-#if BITS_IN_JSAMPLE == 8
-/* JSAMPLE should be the smallest type that will hold the values 0..255.
- * You can use a signed char by having GETJSAMPLE mask it with 0xFF.
- */
-
-#ifdef HAVE_UNSIGNED_CHAR
-
-typedef unsigned char JSAMPLE;
-#define GETJSAMPLE(value)  ((int) (value))
-
-#else /* not HAVE_UNSIGNED_CHAR */
-
-typedef char JSAMPLE;
-#ifdef CHAR_IS_UNSIGNED
-#define GETJSAMPLE(value)  ((int) (value))
-#else
-#define GETJSAMPLE(value)  ((int) (value) & 0xFF)
-#endif /* CHAR_IS_UNSIGNED */
-
-#endif /* HAVE_UNSIGNED_CHAR */
-
-#define MAXJSAMPLE	255
-#define CENTERJSAMPLE	128
-
-#endif /* BITS_IN_JSAMPLE == 8 */
-
-
-#if BITS_IN_JSAMPLE == 12
-/* JSAMPLE should be the smallest type that will hold the values 0..4095.
- * On nearly all machines "short" will do nicely.
- */
-
-typedef short JSAMPLE;
-#define GETJSAMPLE(value)  ((int) (value))
-
-#define MAXJSAMPLE	4095
-#define CENTERJSAMPLE	2048
-
-#endif /* BITS_IN_JSAMPLE == 12 */
-
-
-/* Representation of a DCT frequency coefficient.
- * This should be a signed value of at least 16 bits; "short" is usually OK.
- * Again, we allocate large arrays of these, but you can change to int
- * if you have memory to burn and "short" is really slow.
- */
-
-typedef short JCOEF;
-
-
-/* Compressed datastreams are represented as arrays of JOCTET.
- * These must be EXACTLY 8 bits wide, at least once they are written to
- * external storage.  Note that when using the stdio data source/destination
- * managers, this is also the data type passed to fread/fwrite.
- */
-
-#ifdef HAVE_UNSIGNED_CHAR
-
-typedef unsigned char JOCTET;
-#define GETJOCTET(value)  (value)
-
-#else /* not HAVE_UNSIGNED_CHAR */
-
-typedef char JOCTET;
-#ifdef CHAR_IS_UNSIGNED
-#define GETJOCTET(value)  (value)
-#else
-#define GETJOCTET(value)  ((value) & 0xFF)
-#endif /* CHAR_IS_UNSIGNED */
-
-#endif /* HAVE_UNSIGNED_CHAR */
-
-
-/* These typedefs are used for various table entries and so forth.
- * They must be at least as wide as specified; but making them too big
- * won't cost a huge amount of memory, so we don't provide special
- * extraction code like we did for JSAMPLE.  (In other words, these
- * typedefs live at a different point on the speed/space tradeoff curve.)
- */
-
-/* UINT8 must hold at least the values 0..255. */
-
-#ifdef HAVE_UNSIGNED_CHAR
-typedef unsigned char UINT8;
-#else /* not HAVE_UNSIGNED_CHAR */
-#ifdef CHAR_IS_UNSIGNED
-typedef char UINT8;
-#else /* not CHAR_IS_UNSIGNED */
-typedef short UINT8;
-#endif /* CHAR_IS_UNSIGNED */
-#endif /* HAVE_UNSIGNED_CHAR */
-
-/* UINT16 must hold at least the values 0..65535. */
-
-#ifdef HAVE_UNSIGNED_SHORT
-typedef unsigned short UINT16;
-#else /* not HAVE_UNSIGNED_SHORT */
-typedef unsigned int UINT16;
-#endif /* HAVE_UNSIGNED_SHORT */
-
-/* INT16 must hold at least the values -32768..32767. */
-
-#ifndef XMD_H			/* X11/xmd.h correctly defines INT16 */
-typedef short INT16;
-#endif
-
-/* INT32 must hold at least signed 32-bit values. */
-
-#ifndef XMD_H			/* X11/xmd.h correctly defines INT32 */
-#ifndef INT32
-typedef long INT32;
-#endif
-#endif
-
-/* Datatype used for image dimensions.  The JPEG standard only supports
- * images up to 64K*64K due to 16-bit fields in SOF markers.  Therefore
- * "unsigned int" is sufficient on all machines.  However, if you need to
- * handle larger images and you don't mind deviating from the spec, you
- * can change this datatype.
- */
-
-typedef unsigned int JDIMENSION;
-
-#define JPEG_MAX_DIMENSION  65500L  /* a tad under 64K to prevent overflows */
-
-
-/* These macros are used in all function definitions and extern declarations.
- * You could modify them if you need to change function linkage conventions;
- * in particular, you'll need to do that to make the library a Windows DLL.
- * Another application is to make all functions global for use with debuggers
- * or code profilers that require it.
- */
-
-/* a function called through method pointers: */
-#define METHODDEF(type)		static type
-/* a function used only in its module: */
-#define LOCAL(type)		static type
-/* a function referenced thru EXTERNs: */
-#define GLOBAL(type)		type
-/* a reference to a GLOBAL function: */
-#define EXTERN(type)		extern type
-
-
-/* This macro is used to declare a "method", that is, a function pointer.
- * We want to supply prototype parameters if the compiler can cope.
- * Note that the arglist parameter must be parenthesized!
- * Again, you can customize this if you need special linkage keywords.
- */
-
-#ifdef HAVE_PROTOTYPES
-#define JMETHOD(type,methodname,arglist)  type (*methodname) arglist
-#else
-#define JMETHOD(type,methodname,arglist)  type (*methodname) ()
-#endif
-
-
-/* Here is the pseudo-keyword for declaring pointers that must be "far"
- * on 80x86 machines.  Most of the specialized coding for 80x86 is handled
- * by just saying "FAR *" where such a pointer is needed.  In a few places
- * explicit coding is needed; see uses of the NEED_FAR_POINTERS symbol.
- */
-
-#ifdef NEED_FAR_POINTERS
-#define FAR  far
-#else
-#ifdef FAR
-#undef FAR
-#endif
-#define FAR
-#endif
-
-
-/*
- * On a few systems, type boolean and/or its values FALSE, TRUE may appear
- * in standard header files.  Or you may have conflicts with application-
- * specific header files that you want to include together with these files.
- * Defining HAVE_BOOLEAN before including jpeglib.h should make it work.
- */
-
-#ifndef HAVE_BOOLEAN
-typedef int boolean;
-#endif
-#ifndef FALSE			/* in case these macros already exist */
-#define FALSE	0		/* values of boolean */
-#endif
-#ifndef TRUE
-#define TRUE	1
-#endif
-
-
-/*
- * The remaining options affect code selection within the JPEG library,
- * but they don't need to be visible to most applications using the library.
- * To minimize application namespace pollution, the symbols won't be
- * defined unless JPEG_INTERNALS or JPEG_INTERNAL_OPTIONS has been defined.
- */
-
-#ifdef JPEG_INTERNALS
-#define JPEG_INTERNAL_OPTIONS
-#endif
-
-#ifdef JPEG_INTERNAL_OPTIONS
-
-
-/*
- * These defines indicate whether to include various optional functions.
- * Undefining some of these symbols will produce a smaller but less capable
- * library.  Note that you can leave certain source files out of the
- * compilation/linking process if you've #undef'd the corresponding symbols.
- * (You may HAVE to do that if your compiler doesn't like null source files.)
- */
-
-/* Arithmetic coding is unsupported for legal reasons.  Complaints to IBM. */
-
-/* Capability options common to encoder and decoder: */
-
-#define DCT_ISLOW_SUPPORTED	/* slow but accurate integer algorithm */
-#define DCT_IFAST_SUPPORTED	/* faster, less accurate integer method */
-#define DCT_FLOAT_SUPPORTED	/* floating-point: accurate, fast on fast HW */
-
-/* Encoder capability options: */
-
-#undef  C_ARITH_CODING_SUPPORTED    /* Arithmetic coding back end? */
-#define C_MULTISCAN_FILES_SUPPORTED /* Multiple-scan JPEG files? */
-#define C_PROGRESSIVE_SUPPORTED	    /* Progressive JPEG? (Requires MULTISCAN)*/
-#define ENTROPY_OPT_SUPPORTED	    /* Optimization of entropy coding parms? */
-/* Note: if you selected 12-bit data precision, it is dangerous to turn off
- * ENTROPY_OPT_SUPPORTED.  The standard Huffman tables are only good for 8-bit
- * precision, so jchuff.c normally uses entropy optimization to compute
- * usable tables for higher precision.  If you don't want to do optimization,
- * you'll have to supply different default Huffman tables.
- * The exact same statements apply for progressive JPEG: the default tables
- * don't work for progressive mode.  (This may get fixed, however.)
- */
-#define INPUT_SMOOTHING_SUPPORTED   /* Input image smoothing option? */
-
-/* Decoder capability options: */
-
-#undef  D_ARITH_CODING_SUPPORTED    /* Arithmetic coding back end? */
-#define D_MULTISCAN_FILES_SUPPORTED /* Multiple-scan JPEG files? */
-#define D_PROGRESSIVE_SUPPORTED	    /* Progressive JPEG? (Requires MULTISCAN)*/
-#define SAVE_MARKERS_SUPPORTED	    /* jpeg_save_markers() needed? */
-#define BLOCK_SMOOTHING_SUPPORTED   /* Block smoothing? (Progressive only) */
-#define IDCT_SCALING_SUPPORTED	    /* Output rescaling via IDCT? */
-#undef  UPSAMPLE_SCALING_SUPPORTED  /* Output rescaling at upsample stage? */
-#define UPSAMPLE_MERGING_SUPPORTED  /* Fast path for sloppy upsampling? */
-#define QUANT_1PASS_SUPPORTED	    /* 1-pass color quantization? */
-#define QUANT_2PASS_SUPPORTED	    /* 2-pass color quantization? */
-
-/* more capability options later, no doubt */
-
-
-/*
- * Ordering of RGB data in scanlines passed to or from the application.
- * If your application wants to deal with data in the order B,G,R, just
- * change these macros.  You can also deal with formats such as R,G,B,X
- * (one extra byte per pixel) by changing RGB_PIXELSIZE.  Note that changing
- * the offsets will also change the order in which colormap data is organized.
- * RESTRICTIONS:
- * 1. The sample applications cjpeg,djpeg do NOT support modified RGB formats.
- * 2. These macros only affect RGB<=>YCbCr color conversion, so they are not
- *    useful if you are using JPEG color spaces other than YCbCr or grayscale.
- * 3. The color quantizer modules will not behave desirably if RGB_PIXELSIZE
- *    is not 3 (they don't understand about dummy color components!).  So you
- *    can't use color quantization if you change that value.
- */
-
-#define RGB_RED		0	/* Offset of Red in an RGB scanline element */
-#define RGB_GREEN	1	/* Offset of Green */
-#define RGB_BLUE	2	/* Offset of Blue */
-#define RGB_PIXELSIZE	3	/* JSAMPLEs per RGB scanline element */
-
-
-/* Definitions for speed-related optimizations. */
-
-
-/* If your compiler supports inline functions, define INLINE
- * as the inline keyword; otherwise define it as empty.
- */
-
-#ifndef INLINE
-#ifdef __GNUC__			/* for instance, GNU C knows about inline */
-#define INLINE __inline__
-#endif
-#ifndef INLINE
-#define INLINE			/* default is to define it as empty */
-#endif
-#endif
-
-
-/* On some machines (notably 68000 series) "int" is 32 bits, but multiplying
- * two 16-bit shorts is faster than multiplying two ints.  Define MULTIPLIER
- * as short on such a machine.  MULTIPLIER must be at least 16 bits wide.
- */
-
-#ifndef MULTIPLIER
-#define MULTIPLIER  int		/* type for fastest integer multiply */
-#endif
-
-
-/* FAST_FLOAT should be either float or double, whichever is done faster
- * by your compiler.  (Note that this type is only used in the floating point
- * DCT routines, so it only matters if you've defined DCT_FLOAT_SUPPORTED.)
- * Typically, float is faster in ANSI C compilers, while double is faster in
- * pre-ANSI compilers (because they insist on converting to double anyway).
- * The code below therefore chooses float if we have ANSI-style prototypes.
- */
-
-#ifndef FAST_FLOAT
-#ifdef HAVE_PROTOTYPES
-#define FAST_FLOAT  float
-#else
-#define FAST_FLOAT  double
-#endif
-#endif
-
-#endif /* JPEG_INTERNAL_OPTIONS */

gpac-2.2.1.tar.gz/extra_lib/include/jpeg/jpeglib.h Deleted

@@ -1,1096 +0,0 @@
-/*
- * jpeglib.h
- *
- * Copyright (C) 1991-1998, Thomas G. Lane.
- * This file is part of the Independent JPEG Group's software.
- * For conditions of distribution and use, see the accompanying README file.
- *
- * This file defines the application interface for the JPEG library.
- * Most applications using the library need only include this file,
- * and perhaps jerror.h if they want to know the exact error codes.
- */
-
-#ifndef JPEGLIB_H
-#define JPEGLIB_H
-
-/*
- * First we include the configuration files that record how this
- * installation of the JPEG library is set up.  jconfig.h can be
- * generated automatically for many systems.  jmorecfg.h contains
- * manual configuration options that most people need not worry about.
- */
-
-#ifndef JCONFIG_INCLUDED	/* in case jinclude.h already did */
-#include "jconfig.h"		/* widely used configuration options */
-#endif
-#include "jmorecfg.h"		/* seldom changed options */
-
-
-/* Version ID for the JPEG library.
- * Might be useful for tests like "#if JPEG_LIB_VERSION >= 60".
- */
-
-#define JPEG_LIB_VERSION  62	/* Version 6b */
-
-
-/* Various constants determining the sizes of things.
- * All of these are specified by the JPEG standard, so don't change them
- * if you want to be compatible.
- */
-
-#define DCTSIZE		    8	/* The basic DCT block is 8x8 samples */
-#define DCTSIZE2	    64	/* DCTSIZE squared; # of elements in a block */
-#define NUM_QUANT_TBLS      4	/* Quantization tables are numbered 0..3 */
-#define NUM_HUFF_TBLS       4	/* Huffman tables are numbered 0..3 */
-#define NUM_ARITH_TBLS      16	/* Arith-coding tables are numbered 0..15 */
-#define MAX_COMPS_IN_SCAN   4	/* JPEG limit on # of components in one scan */
-#define MAX_SAMP_FACTOR     4	/* JPEG limit on sampling factors */
-/* Unfortunately, some bozo at Adobe saw no reason to be bound by the standard;
- * the PostScript DCT filter can emit files with many more than 10 blocks/MCU.
- * If you happen to run across such a file, you can up D_MAX_BLOCKS_IN_MCU
- * to handle it.  We even let you do this from the jconfig.h file.  However,
- * we strongly discourage changing C_MAX_BLOCKS_IN_MCU; just because Adobe
- * sometimes emits noncompliant files doesn't mean you should too.
- */
-#define C_MAX_BLOCKS_IN_MCU   10 /* compressor's limit on blocks per MCU */
-#ifndef D_MAX_BLOCKS_IN_MCU
-#define D_MAX_BLOCKS_IN_MCU   10 /* decompressor's limit on blocks per MCU */
-#endif
-
-
-/* Data structures for images (arrays of samples and of DCT coefficients).
- * On 80x86 machines, the image arrays are too big for near pointers,
- * but the pointer arrays can fit in near memory.
- */
-
-typedef JSAMPLE FAR *JSAMPROW;	/* ptr to one image row of pixel samples. */
-typedef JSAMPROW *JSAMPARRAY;	/* ptr to some rows (a 2-D sample array) */
-typedef JSAMPARRAY *JSAMPIMAGE;	/* a 3-D sample array: top index is color */
-
-typedef JCOEF JBLOCKDCTSIZE2;	/* one block of coefficients */
-typedef JBLOCK FAR *JBLOCKROW;	/* pointer to one row of coefficient blocks */
-typedef JBLOCKROW *JBLOCKARRAY;		/* a 2-D array of coefficient blocks */
-typedef JBLOCKARRAY *JBLOCKIMAGE;	/* a 3-D array of coefficient blocks */
-
-typedef JCOEF FAR *JCOEFPTR;	/* useful in a couple of places */
-
-
-/* Types for JPEG compression parameters and working tables. */
-
-
-/* DCT coefficient quantization tables. */
-
-typedef struct {
-  /* This array gives the coefficient quantizers in natural array order
-   * (not the zigzag order in which they are stored in a JPEG DQT marker).
-   * CAUTION: IJG versions prior to v6a kept this array in zigzag order.
-   */
-  UINT16 quantvalDCTSIZE2;	/* quantization step for each coefficient */
-  /* This field is used only during compression.  It's initialized FALSE when
-   * the table is created, and set TRUE when it's been output to the file.
-   * You could suppress output of a table by setting this to TRUE.
-   * (See jpeg_suppress_tables for an example.)
-   */
-  boolean sent_table;		/* TRUE when table has been output */
-} JQUANT_TBL;
-
-
-/* Huffman coding tables. */
-
-typedef struct {
-  /* These two fields directly represent the contents of a JPEG DHT marker */
-  UINT8 bits17;		/* bitsk = # of symbols with codes of */
-				/* length k bits; bits0 is unused */
-  UINT8 huffval256;		/* The symbols, in order of incr code length */
-  /* This field is used only during compression.  It's initialized FALSE when
-   * the table is created, and set TRUE when it's been output to the file.
-   * You could suppress output of a table by setting this to TRUE.
-   * (See jpeg_suppress_tables for an example.)
-   */
-  boolean sent_table;		/* TRUE when table has been output */
-} JHUFF_TBL;
-
-
-/* Basic info about one component (color channel). */
-
-typedef struct {
-  /* These values are fixed over the whole image. */
-  /* For compression, they must be supplied by parameter setup; */
-  /* for decompression, they are read from the SOF marker. */
-  int component_id;		/* identifier for this component (0..255) */
-  int component_index;		/* its index in SOF or cinfo->comp_info */
-  int h_samp_factor;		/* horizontal sampling factor (1..4) */
-  int v_samp_factor;		/* vertical sampling factor (1..4) */
-  int quant_tbl_no;		/* quantization table selector (0..3) */
-  /* These values may vary between scans. */
-  /* For compression, they must be supplied by parameter setup; */
-  /* for decompression, they are read from the SOS marker. */
-  /* The decompressor output side may not use these variables. */
-  int dc_tbl_no;		/* DC entropy table selector (0..3) */
-  int ac_tbl_no;		/* AC entropy table selector (0..3) */
-  
-  /* Remaining fields should be treated as private by applications. */
-  
-  /* These values are computed during compression or decompression startup: */
-  /* Component's size in DCT blocks.
-   * Any dummy blocks added to complete an MCU are not counted; therefore
-   * these values do not depend on whether a scan is interleaved or not.
-   */
-  JDIMENSION width_in_blocks;
-  JDIMENSION height_in_blocks;
-  /* Size of a DCT block in samples.  Always DCTSIZE for compression.
-   * For decompression this is the size of the output from one DCT block,
-   * reflecting any scaling we choose to apply during the IDCT step.
-   * Values of 1,2,4,8 are likely to be supported.  Note that different
-   * components may receive different IDCT scalings.
-   */
-  int DCT_scaled_size;
-  /* The downsampled dimensions are the component's actual, unpadded number
-   * of samples at the main buffer (preprocessing/compression interface), thus
-   * downsampled_width = ceil(image_width * Hi/Hmax)
-   * and similarly for height.  For decompression, IDCT scaling is included, so
-   * downsampled_width = ceil(image_width * Hi/Hmax * DCT_scaled_size/DCTSIZE)
-   */
-  JDIMENSION downsampled_width;	 /* actual width in samples */
-  JDIMENSION downsampled_height; /* actual height in samples */
-  /* This flag is used only for decompression.  In cases where some of the
-   * components will be ignored (eg grayscale output from YCbCr image),
-   * we can skip most computations for the unused components.
-   */
-  boolean component_needed;	/* do we need the value of this component? */
-
-  /* These values are computed before starting a scan of the component. */
-  /* The decompressor output side may not use these variables. */
-  int MCU_width;		/* number of blocks per MCU, horizontally */
-  int MCU_height;		/* number of blocks per MCU, vertically */
-  int MCU_blocks;		/* MCU_width * MCU_height */
-  int MCU_sample_width;		/* MCU width in samples, MCU_width*DCT_scaled_size */
-  int last_col_width;		/* # of non-dummy blocks across in last MCU */
-  int last_row_height;		/* # of non-dummy blocks down in last MCU */
-
-  /* Saved quantization table for component; NULL if none yet saved.
-   * See jdinput.c comments about the need for this information.
-   * This field is currently used only for decompression.
-   */
-  JQUANT_TBL * quant_table;
-
-  /* Private per-component storage for DCT or IDCT subsystem. */
-  void * dct_table;
-} jpeg_component_info;
-
-
-/* The script for encoding a multiple-scan file is an array of these: */
-
-typedef struct {
-  int comps_in_scan;		/* number of components encoded in this scan */
-  int component_indexMAX_COMPS_IN_SCAN; /* their SOF/comp_info indexes */
-  int Ss, Se;			/* progressive JPEG spectral selection parms */
-  int Ah, Al;			/* progressive JPEG successive approx. parms */
-} jpeg_scan_info;
-
-/* The decompressor can save APPn and COM markers in a list of these: */
-
-typedef struct jpeg_marker_struct FAR * jpeg_saved_marker_ptr;
-
-struct jpeg_marker_struct {
-  jpeg_saved_marker_ptr next;	/* next in list, or NULL */
-  UINT8 marker;			/* marker code: JPEG_COM, or JPEG_APP0+n */
-  unsigned int original_length;	/* # bytes of data in the file */
-  unsigned int data_length;	/* # bytes of data saved at data */
-  JOCTET FAR * data;		/* the data contained in the marker */
-  /* the marker length word is not counted in data_length or original_length */
-};
-
-/* Known color spaces. */
-
-typedef enum {
-	JCS_UNKNOWN,		/* error/unspecified */
-	JCS_GRAYSCALE,		/* monochrome */
-	JCS_RGB,		/* red/green/blue */
-	JCS_YCbCr,		/* Y/Cb/Cr (also known as YUV) */
-	JCS_CMYK,		/* C/M/Y/K */
-	JCS_YCCK		/* Y/Cb/Cr/K */
-} J_COLOR_SPACE;
-
-/* DCT/IDCT algorithm options. */
-
-typedef enum {
-	JDCT_ISLOW,		/* slow but accurate integer algorithm */
-	JDCT_IFAST,		/* faster, less accurate integer method */
-	JDCT_FLOAT		/* floating-point: accurate, fast on fast HW */
-} J_DCT_METHOD;
-
-#ifndef JDCT_DEFAULT		/* may be overridden in jconfig.h */
-#define JDCT_DEFAULT  JDCT_ISLOW
-#endif
-#ifndef JDCT_FASTEST		/* may be overridden in jconfig.h */
-#define JDCT_FASTEST  JDCT_IFAST
-#endif
-
-/* Dithering options for decompression. */
-
-typedef enum {
-	JDITHER_NONE,		/* no dithering */
-	JDITHER_ORDERED,	/* simple ordered dither */
-	JDITHER_FS		/* Floyd-Steinberg error diffusion dither */
-} J_DITHER_MODE;
-
-
-/* Common fields between JPEG compression and decompression master structs. */
-
-#define jpeg_common_fields \
-  struct jpeg_error_mgr * err;	/* Error handler module */\
-  struct jpeg_memory_mgr * mem;	/* Memory manager module */\
-  struct jpeg_progress_mgr * progress; /* Progress monitor, or NULL if none */\
-  void * client_data;		/* Available for use by application */\
-  boolean is_decompressor;	/* So common code can tell which is which */\
-  int global_state		/* For checking call sequence validity */
-
-/* Routines that are to be used by both halves of the library are declared
- * to receive a pointer to this structure.  There are no actual instances of
- * jpeg_common_struct, only of jpeg_compress_struct and jpeg_decompress_struct.
- */
-struct jpeg_common_struct {
-  jpeg_common_fields;		/* Fields common to both master struct types */
-  /* Additional fields follow in an actual jpeg_compress_struct or
-   * jpeg_decompress_struct.  All three structs must agree on these
-   * initial fields!  (This would be a lot cleaner in C++.)
-   */
-};
-
-typedef struct jpeg_common_struct * j_common_ptr;
-typedef struct jpeg_compress_struct * j_compress_ptr;
-typedef struct jpeg_decompress_struct * j_decompress_ptr;
-
-
-/* Master record for a compression instance */
-
-struct jpeg_compress_struct {
-  jpeg_common_fields;		/* Fields shared with jpeg_decompress_struct */
-
-  /* Destination for compressed data */
-  struct jpeg_destination_mgr * dest;
-
-  /* Description of source image --- these fields must be filled in by
-   * outer application before starting compression.  in_color_space must
-   * be correct before you can even call jpeg_set_defaults().
-   */
-
-  JDIMENSION image_width;	/* input image width */
-  JDIMENSION image_height;	/* input image height */
-  int input_components;		/* # of color components in input image */
-  J_COLOR_SPACE in_color_space;	/* colorspace of input image */
-
-  double input_gamma;		/* image gamma of input image */
-
-  /* Compression parameters --- these fields must be set before calling
-   * jpeg_start_compress().  We recommend calling jpeg_set_defaults() to
-   * initialize everything to reasonable defaults, then changing anything
-   * the application specifically wants to change.  That way you won't get
-   * burnt when new parameters are added.  Also note that there are several
-   * helper routines to simplify changing parameters.
-   */
-
-  int data_precision;		/* bits of precision in image data */
-
-  int num_components;		/* # of color components in JPEG image */
-  J_COLOR_SPACE jpeg_color_space; /* colorspace of JPEG image */
-
-  jpeg_component_info * comp_info;
-  /* comp_infoi describes component that appears i'th in SOF */
-  
-  JQUANT_TBL * quant_tbl_ptrsNUM_QUANT_TBLS;
-  /* ptrs to coefficient quantization tables, or NULL if not defined */
-  
-  JHUFF_TBL * dc_huff_tbl_ptrsNUM_HUFF_TBLS;
-  JHUFF_TBL * ac_huff_tbl_ptrsNUM_HUFF_TBLS;
-  /* ptrs to Huffman coding tables, or NULL if not defined */
-  
-  UINT8 arith_dc_LNUM_ARITH_TBLS; /* L values for DC arith-coding tables */
-  UINT8 arith_dc_UNUM_ARITH_TBLS; /* U values for DC arith-coding tables */
-  UINT8 arith_ac_KNUM_ARITH_TBLS; /* Kx values for AC arith-coding tables */
-
-  int num_scans;		/* # of entries in scan_info array */
-  const jpeg_scan_info * scan_info; /* script for multi-scan file, or NULL */
-  /* The default value of scan_info is NULL, which causes a single-scan
-   * sequential JPEG file to be emitted.  To create a multi-scan file,
-   * set num_scans and scan_info to point to an array of scan definitions.
-   */
-
-  boolean raw_data_in;		/* TRUE=caller supplies downsampled data */
-  boolean arith_code;		/* TRUE=arithmetic coding, FALSE=Huffman */
-  boolean optimize_coding;	/* TRUE=optimize entropy encoding parms */
-  boolean CCIR601_sampling;	/* TRUE=first samples are cosited */
-  int smoothing_factor;		/* 1..100, or 0 for no input smoothing */
-  J_DCT_METHOD dct_method;	/* DCT algorithm selector */
-
-  /* The restart interval can be specified in absolute MCUs by setting
-   * restart_interval, or in MCU rows by setting restart_in_rows
-   * (in which case the correct restart_interval will be figured
-   * for each scan).
-   */
-  unsigned int restart_interval; /* MCUs per restart, or 0 for no restart */
-  int restart_in_rows;		/* if > 0, MCU rows per restart interval */
-
-  /* Parameters controlling emission of special markers. */
-
-  boolean write_JFIF_header;	/* should a JFIF marker be written? */
-  UINT8 JFIF_major_version;	/* What to write for the JFIF version number */
-  UINT8 JFIF_minor_version;
-  /* These three values are not used by the JPEG code, merely copied */
-  /* into the JFIF APP0 marker.  density_unit can be 0 for unknown, */
-  /* 1 for dots/inch, or 2 for dots/cm.  Note that the pixel aspect */
-  /* ratio is defined by X_density/Y_density even when density_unit=0. */
-  UINT8 density_unit;		/* JFIF code for pixel size units */
-  UINT16 X_density;		/* Horizontal pixel density */
-  UINT16 Y_density;		/* Vertical pixel density */
-  boolean write_Adobe_marker;	/* should an Adobe marker be written? */
-  
-  /* State variable: index of next scanline to be written to
-   * jpeg_write_scanlines().  Application may use this to control its
-   * processing loop, e.g., "while (next_scanline < image_height)".
-   */
-
-  JDIMENSION next_scanline;	/* 0 .. image_height-1  */
-
-  /* Remaining fields are known throughout compressor, but generally
-   * should not be touched by a surrounding application.
-   */
-
-  /*
-   * These fields are computed during compression startup
-   */
-  boolean progressive_mode;	/* TRUE if scan script uses progressive mode */
-  int max_h_samp_factor;	/* largest h_samp_factor */
-  int max_v_samp_factor;	/* largest v_samp_factor */
-
-  JDIMENSION total_iMCU_rows;	/* # of iMCU rows to be input to coef ctlr */
-  /* The coefficient controller receives data in units of MCU rows as defined
-   * for fully interleaved scans (whether the JPEG file is interleaved or not).
-   * There are v_samp_factor * DCTSIZE sample rows of each component in an
-   * "iMCU" (interleaved MCU) row.
-   */
-  
-  /*
-   * These fields are valid during any one scan.
-   * They describe the components and MCUs actually appearing in the scan.
-   */
-  int comps_in_scan;		/* # of JPEG components in this scan */
-  jpeg_component_info * cur_comp_infoMAX_COMPS_IN_SCAN;
-  /* *cur_comp_infoi describes component that appears i'th in SOS */
-  
-  JDIMENSION MCUs_per_row;	/* # of MCUs across the image */
-  JDIMENSION MCU_rows_in_scan;	/* # of MCU rows in the image */
-  
-  int blocks_in_MCU;		/* # of DCT blocks per MCU */
-  int MCU_membershipC_MAX_BLOCKS_IN_MCU;
-  /* MCU_membershipi is index in cur_comp_info of component owning */
-  /* i'th block in an MCU */
-
-  int Ss, Se, Ah, Al;		/* progressive JPEG parameters for scan */
-
-  /*
-   * Links to compression subobjects (methods and private variables of modules)
-   */
-  struct jpeg_comp_master * master;
-  struct jpeg_c_main_controller * main;
-  struct jpeg_c_prep_controller * prep;
-  struct jpeg_c_coef_controller * coef;
-  struct jpeg_marker_writer * marker;
-  struct jpeg_color_converter * cconvert;
-  struct jpeg_downsampler * downsample;
-  struct jpeg_forward_dct * fdct;
-  struct jpeg_entropy_encoder * entropy;
-  jpeg_scan_info * script_space; /* workspace for jpeg_simple_progression */
-  int script_space_size;
-};
-
-
-/* Master record for a decompression instance */
-
-struct jpeg_decompress_struct {
-  jpeg_common_fields;		/* Fields shared with jpeg_compress_struct */
-
-  /* Source of compressed data */
-  struct jpeg_source_mgr * src;
-
-  /* Basic description of image --- filled in by jpeg_read_header(). */
-  /* Application may inspect these values to decide how to process image. */
-
-  JDIMENSION image_width;	/* nominal image width (from SOF marker) */
-  JDIMENSION image_height;	/* nominal image height */
-  int num_components;		/* # of color components in JPEG image */
-  J_COLOR_SPACE jpeg_color_space; /* colorspace of JPEG image */
-
-  /* Decompression processing parameters --- these fields must be set before
-   * calling jpeg_start_decompress().  Note that jpeg_read_header() initializes
-   * them to default values.
-   */
-
-  J_COLOR_SPACE out_color_space; /* colorspace for output */
-
-  unsigned int scale_num, scale_denom; /* fraction by which to scale image */
-
-  double output_gamma;		/* image gamma wanted in output */
-
-  boolean buffered_image;	/* TRUE=multiple output passes */
-  boolean raw_data_out;		/* TRUE=downsampled data wanted */
-
-  J_DCT_METHOD dct_method;	/* IDCT algorithm selector */
-  boolean do_fancy_upsampling;	/* TRUE=apply fancy upsampling */
-  boolean do_block_smoothing;	/* TRUE=apply interblock smoothing */
-
-  boolean quantize_colors;	/* TRUE=colormapped output wanted */
-  /* the following are ignored if not quantize_colors: */
-  J_DITHER_MODE dither_mode;	/* type of color dithering to use */
-  boolean two_pass_quantize;	/* TRUE=use two-pass color quantization */
-  int desired_number_of_colors;	/* max # colors to use in created colormap */
-  /* these are significant only in buffered-image mode: */
-  boolean enable_1pass_quant;	/* enable future use of 1-pass quantizer */
-  boolean enable_external_quant;/* enable future use of external colormap */
-  boolean enable_2pass_quant;	/* enable future use of 2-pass quantizer */
-
-  /* Description of actual output image that will be returned to application.
-   * These fields are computed by jpeg_start_decompress().
-   * You can also use jpeg_calc_output_dimensions() to determine these values
-   * in advance of calling jpeg_start_decompress().
-   */
-
-  JDIMENSION output_width;	/* scaled image width */
-  JDIMENSION output_height;	/* scaled image height */
-  int out_color_components;	/* # of color components in out_color_space */
-  int output_components;	/* # of color components returned */
-  /* output_components is 1 (a colormap index) when quantizing colors;
-   * otherwise it equals out_color_components.
-   */
-  int rec_outbuf_height;	/* min recommended height of scanline buffer */
-  /* If the buffer passed to jpeg_read_scanlines() is less than this many rows
-   * high, space and time will be wasted due to unnecessary data copying.
-   * Usually rec_outbuf_height will be 1 or 2, at most 4.
-   */
-
-  /* When quantizing colors, the output colormap is described by these fields.
-   * The application can supply a colormap by setting colormap non-NULL before
-   * calling jpeg_start_decompress; otherwise a colormap is created during
-   * jpeg_start_decompress or jpeg_start_output.
-   * The map has out_color_components rows and actual_number_of_colors columns.
-   */
-  int actual_number_of_colors;	/* number of entries in use */
-  JSAMPARRAY colormap;		/* The color map as a 2-D pixel array */
-
-  /* State variables: these variables indicate the progress of decompression.
-   * The application may examine these but must not modify them.
-   */
-
-  /* Row index of next scanline to be read from jpeg_read_scanlines().
-   * Application may use this to control its processing loop, e.g.,
-   * "while (output_scanline < output_height)".
-   */
-  JDIMENSION output_scanline;	/* 0 .. output_height-1  */
-
-  /* Current input scan number and number of iMCU rows completed in scan.
-   * These indicate the progress of the decompressor input side.
-   */
-  int input_scan_number;	/* Number of SOS markers seen so far */
-  JDIMENSION input_iMCU_row;	/* Number of iMCU rows completed */
-
-  /* The "output scan number" is the notional scan being displayed by the
-   * output side.  The decompressor will not allow output scan/row number
-   * to get ahead of input scan/row, but it can fall arbitrarily far behind.
-   */
-  int output_scan_number;	/* Nominal scan number being displayed */
-  JDIMENSION output_iMCU_row;	/* Number of iMCU rows read */
-
-  /* Current progression status.  coef_bitsci indicates the precision
-   * with which component c's DCT coefficient i (in zigzag order) is known.
-   * It is -1 when no data has yet been received, otherwise it is the point
-   * transform (shift) value for the most recent scan of the coefficient
-   * (thus, 0 at completion of the progression).
-   * This pointer is NULL when reading a non-progressive file.
-   */
-  int (*coef_bits)DCTSIZE2;	/* -1 or current Al value for each coef */
-
-  /* Internal JPEG parameters --- the application usually need not look at
-   * these fields.  Note that the decompressor output side may not use
-   * any parameters that can change between scans.
-   */
-
-  /* Quantization and Huffman tables are carried forward across input
-   * datastreams when processing abbreviated JPEG datastreams.
-   */
-
-  JQUANT_TBL * quant_tbl_ptrsNUM_QUANT_TBLS;
-  /* ptrs to coefficient quantization tables, or NULL if not defined */
-
-  JHUFF_TBL * dc_huff_tbl_ptrsNUM_HUFF_TBLS;
-  JHUFF_TBL * ac_huff_tbl_ptrsNUM_HUFF_TBLS;
-  /* ptrs to Huffman coding tables, or NULL if not defined */
-
-  /* These parameters are never carried across datastreams, since they
-   * are given in SOF/SOS markers or defined to be reset by SOI.
-   */
-
-  int data_precision;		/* bits of precision in image data */
-
-  jpeg_component_info * comp_info;
-  /* comp_infoi describes component that appears i'th in SOF */
-
-  boolean progressive_mode;	/* TRUE if SOFn specifies progressive mode */
-  boolean arith_code;		/* TRUE=arithmetic coding, FALSE=Huffman */
-
-  UINT8 arith_dc_LNUM_ARITH_TBLS; /* L values for DC arith-coding tables */
-  UINT8 arith_dc_UNUM_ARITH_TBLS; /* U values for DC arith-coding tables */
-  UINT8 arith_ac_KNUM_ARITH_TBLS; /* Kx values for AC arith-coding tables */
-
-  unsigned int restart_interval; /* MCUs per restart interval, or 0 for no restart */
-
-  /* These fields record data obtained from optional markers recognized by
-   * the JPEG library.
-   */
-  boolean saw_JFIF_marker;	/* TRUE iff a JFIF APP0 marker was found */
-  /* Data copied from JFIF marker; only valid if saw_JFIF_marker is TRUE: */
-  UINT8 JFIF_major_version;	/* JFIF version number */
-  UINT8 JFIF_minor_version;
-  UINT8 density_unit;		/* JFIF code for pixel size units */
-  UINT16 X_density;		/* Horizontal pixel density */
-  UINT16 Y_density;		/* Vertical pixel density */
-  boolean saw_Adobe_marker;	/* TRUE iff an Adobe APP14 marker was found */
-  UINT8 Adobe_transform;	/* Color transform code from Adobe marker */
-
-  boolean CCIR601_sampling;	/* TRUE=first samples are cosited */
-
-  /* Aside from the specific data retained from APPn markers known to the
-   * library, the uninterpreted contents of any or all APPn and COM markers
-   * can be saved in a list for examination by the application.
-   */
-  jpeg_saved_marker_ptr marker_list; /* Head of list of saved markers */
-
-  /* Remaining fields are known throughout decompressor, but generally
-   * should not be touched by a surrounding application.
-   */
-
-  /*
-   * These fields are computed during decompression startup
-   */
-  int max_h_samp_factor;	/* largest h_samp_factor */
-  int max_v_samp_factor;	/* largest v_samp_factor */
-
-  int min_DCT_scaled_size;	/* smallest DCT_scaled_size of any component */
-
-  JDIMENSION total_iMCU_rows;	/* # of iMCU rows in image */
-  /* The coefficient controller's input and output progress is measured in
-   * units of "iMCU" (interleaved MCU) rows.  These are the same as MCU rows
-   * in fully interleaved JPEG scans, but are used whether the scan is
-   * interleaved or not.  We define an iMCU row as v_samp_factor DCT block
-   * rows of each component.  Therefore, the IDCT output contains
-   * v_samp_factor*DCT_scaled_size sample rows of a component per iMCU row.
-   */
-
-  JSAMPLE * sample_range_limit; /* table for fast range-limiting */
-
-  /*
-   * These fields are valid during any one scan.
-   * They describe the components and MCUs actually appearing in the scan.
-   * Note that the decompressor output side must not use these fields.
-   */
-  int comps_in_scan;		/* # of JPEG components in this scan */
-  jpeg_component_info * cur_comp_infoMAX_COMPS_IN_SCAN;
-  /* *cur_comp_infoi describes component that appears i'th in SOS */
-
-  JDIMENSION MCUs_per_row;	/* # of MCUs across the image */
-  JDIMENSION MCU_rows_in_scan;	/* # of MCU rows in the image */
-
-  int blocks_in_MCU;		/* # of DCT blocks per MCU */
-  int MCU_membershipD_MAX_BLOCKS_IN_MCU;
-  /* MCU_membershipi is index in cur_comp_info of component owning */
-  /* i'th block in an MCU */
-
-  int Ss, Se, Ah, Al;		/* progressive JPEG parameters for scan */
-
-  /* This field is shared between entropy decoder and marker parser.
-   * It is either zero or the code of a JPEG marker that has been
-   * read from the data source, but has not yet been processed.
-   */
-  int unread_marker;
-
-  /*
-   * Links to decompression subobjects (methods, private variables of modules)
-   */
-  struct jpeg_decomp_master * master;
-  struct jpeg_d_main_controller * main;
-  struct jpeg_d_coef_controller * coef;
-  struct jpeg_d_post_controller * post;
-  struct jpeg_input_controller * inputctl;
-  struct jpeg_marker_reader * marker;
-  struct jpeg_entropy_decoder * entropy;
-  struct jpeg_inverse_dct * idct;
-  struct jpeg_upsampler * upsample;
-  struct jpeg_color_deconverter * cconvert;
-  struct jpeg_color_quantizer * cquantize;
-};
-
-
-/* "Object" declarations for JPEG modules that may be supplied or called
- * directly by the surrounding application.
- * As with all objects in the JPEG library, these structs only define the
- * publicly visible methods and state variables of a module.  Additional
- * private fields may exist after the public ones.
- */
-
-
-/* Error handler object */
-
-struct jpeg_error_mgr {
-  /* Error exit handler: does not return to caller */
-  JMETHOD(void, error_exit, (j_common_ptr cinfo));
-  /* Conditionally emit a trace or warning message */
-  JMETHOD(void, emit_message, (j_common_ptr cinfo, int msg_level));
-  /* Routine that actually outputs a trace or error message */
-  JMETHOD(void, output_message, (j_common_ptr cinfo));
-  /* Format a message string for the most recent JPEG error or message */
-  JMETHOD(void, format_message, (j_common_ptr cinfo, char * buffer));
-#define JMSG_LENGTH_MAX  200	/* recommended size of format_message buffer */
-  /* Reset error state variables at start of a new image */
-  JMETHOD(void, reset_error_mgr, (j_common_ptr cinfo));
-  
-  /* The message ID code and any parameters are saved here.
-   * A message can have one string parameter or up to 8 int parameters.
-   */
-  int msg_code;
-#define JMSG_STR_PARM_MAX  80
-  union {
-    int i8;
-    char sJMSG_STR_PARM_MAX;
-  } msg_parm;
-  
-  /* Standard state variables for error facility */
-  
-  int trace_level;		/* max msg_level that will be displayed */
-  
-  /* For recoverable corrupt-data errors, we emit a warning message,
-   * but keep going unless emit_message chooses to abort.  emit_message
-   * should count warnings in num_warnings.  The surrounding application
-   * can check for bad data by seeing if num_warnings is nonzero at the
-   * end of processing.
-   */
-  long num_warnings;		/* number of corrupt-data warnings */
-
-  /* These fields point to the table(s) of error message strings.
-   * An application can change the table pointer to switch to a different
-   * message list (typically, to change the language in which errors are
-   * reported).  Some applications may wish to add additional error codes
-   * that will be handled by the JPEG library error mechanism; the second
-   * table pointer is used for this purpose.
-   *
-   * First table includes all errors generated by JPEG library itself.
-   * Error code 0 is reserved for a "no such error string" message.
-   */
-  const char * const * jpeg_message_table; /* Library errors */
-  int last_jpeg_message;    /* Table contains strings 0..last_jpeg_message */
-  /* Second table can be added by application (see cjpeg/djpeg for example).
-   * It contains strings numbered first_addon_message..last_addon_message.
-   */
-  const char * const * addon_message_table; /* Non-library errors */
-  int first_addon_message;	/* code for first string in addon table */
-  int last_addon_message;	/* code for last string in addon table */
-};
-
-
-/* Progress monitor object */
-
-struct jpeg_progress_mgr {
-  JMETHOD(void, progress_monitor, (j_common_ptr cinfo));
-
-  long pass_counter;		/* work units completed in this pass */
-  long pass_limit;		/* total number of work units in this pass */
-  int completed_passes;		/* passes completed so far */
-  int total_passes;		/* total number of passes expected */
-};
-
-
-/* Data destination object for compression */
-
-struct jpeg_destination_mgr {
-  JOCTET * next_output_byte;	/* => next byte to write in buffer */
-  size_t free_in_buffer;	/* # of byte spaces remaining in buffer */
-
-  JMETHOD(void, init_destination, (j_compress_ptr cinfo));
-  JMETHOD(boolean, empty_output_buffer, (j_compress_ptr cinfo));
-  JMETHOD(void, term_destination, (j_compress_ptr cinfo));
-};
-
-
-/* Data source object for decompression */
-
-struct jpeg_source_mgr {
-  const JOCTET * next_input_byte; /* => next byte to read from buffer */
-  size_t bytes_in_buffer;	/* # of bytes remaining in buffer */
-
-  JMETHOD(void, init_source, (j_decompress_ptr cinfo));
-  JMETHOD(boolean, fill_input_buffer, (j_decompress_ptr cinfo));
-  JMETHOD(void, skip_input_data, (j_decompress_ptr cinfo, long num_bytes));
-  JMETHOD(boolean, resync_to_restart, (j_decompress_ptr cinfo, int desired));
-  JMETHOD(void, term_source, (j_decompress_ptr cinfo));
-};
-
-
-/* Memory manager object.
- * Allocates "small" objects (a few K total), "large" objects (tens of K),
- * and "really big" objects (virtual arrays with backing store if needed).
- * The memory manager does not allow individual objects to be freed; rather,
- * each created object is assigned to a pool, and whole pools can be freed
- * at once.  This is faster and more convenient than remembering exactly what
- * to free, especially where malloc()/free() are not too speedy.
- * NB: alloc routines never return NULL.  They exit to error_exit if not
- * successful.
- */
-
-#define JPOOL_PERMANENT	0	/* lasts until master record is destroyed */
-#define JPOOL_IMAGE	1	/* lasts until done with image/datastream */
-#define JPOOL_NUMPOOLS	2
-
-typedef struct jvirt_sarray_control * jvirt_sarray_ptr;
-typedef struct jvirt_barray_control * jvirt_barray_ptr;
-
-
-struct jpeg_memory_mgr {
-  /* Method pointers */
-  JMETHOD(void *, alloc_small, (j_common_ptr cinfo, int pool_id,
-				size_t sizeofobject));
-  JMETHOD(void FAR *, alloc_large, (j_common_ptr cinfo, int pool_id,
-				     size_t sizeofobject));
-  JMETHOD(JSAMPARRAY, alloc_sarray, (j_common_ptr cinfo, int pool_id,
-				     JDIMENSION samplesperrow,
-				     JDIMENSION numrows));
-  JMETHOD(JBLOCKARRAY, alloc_barray, (j_common_ptr cinfo, int pool_id,
-				      JDIMENSION blocksperrow,
-				      JDIMENSION numrows));
-  JMETHOD(jvirt_sarray_ptr, request_virt_sarray, (j_common_ptr cinfo,
-						  int pool_id,
-						  boolean pre_zero,
-						  JDIMENSION samplesperrow,
-						  JDIMENSION numrows,
-						  JDIMENSION maxaccess));
-  JMETHOD(jvirt_barray_ptr, request_virt_barray, (j_common_ptr cinfo,
-						  int pool_id,
-						  boolean pre_zero,
-						  JDIMENSION blocksperrow,
-						  JDIMENSION numrows,
-						  JDIMENSION maxaccess));
-  JMETHOD(void, realize_virt_arrays, (j_common_ptr cinfo));
-  JMETHOD(JSAMPARRAY, access_virt_sarray, (j_common_ptr cinfo,
-					   jvirt_sarray_ptr ptr,
-					   JDIMENSION start_row,
-					   JDIMENSION num_rows,
-					   boolean writable));
-  JMETHOD(JBLOCKARRAY, access_virt_barray, (j_common_ptr cinfo,
-					    jvirt_barray_ptr ptr,
-					    JDIMENSION start_row,
-					    JDIMENSION num_rows,
-					    boolean writable));
-  JMETHOD(void, free_pool, (j_common_ptr cinfo, int pool_id));
-  JMETHOD(void, self_destruct, (j_common_ptr cinfo));
-
-  /* Limit on memory allocation for this JPEG object.  (Note that this is
-   * merely advisory, not a guaranteed maximum; it only affects the space
-   * used for virtual-array buffers.)  May be changed by outer application
-   * after creating the JPEG object.
-   */
-  long max_memory_to_use;
-
-  /* Maximum allocation request accepted by alloc_large. */
-  long max_alloc_chunk;
-};
-
-
-/* Routine signature for application-supplied marker processing methods.
- * Need not pass marker code since it is stored in cinfo->unread_marker.
- */
-typedef JMETHOD(boolean, jpeg_marker_parser_method, (j_decompress_ptr cinfo));
-
-
-/* Declarations for routines called by application.
- * The JPP macro hides prototype parameters from compilers that can't cope.
- * Note JPP requires double parentheses.
- */
-
-#ifdef HAVE_PROTOTYPES
-#define JPP(arglist)	arglist
-#else
-#define JPP(arglist)	()
-#endif
-
-
-/* Short forms of external names for systems with brain-damaged linkers.
- * We shorten external names to be unique in the first six letters, which
- * is good enough for all known systems.
- * (If your compiler itself needs names to be unique in less than 15 
- * characters, you are out of luck.  Get a better compiler.)
- */
-
-#ifdef NEED_SHORT_EXTERNAL_NAMES
-#define jpeg_std_error		jStdError
-#define jpeg_CreateCompress	jCreaCompress
-#define jpeg_CreateDecompress	jCreaDecompress
-#define jpeg_destroy_compress	jDestCompress
-#define jpeg_destroy_decompress	jDestDecompress
-#define jpeg_stdio_dest		jStdDest
-#define jpeg_stdio_src		jStdSrc
-#define jpeg_set_defaults	jSetDefaults
-#define jpeg_set_colorspace	jSetColorspace
-#define jpeg_default_colorspace	jDefColorspace
-#define jpeg_set_quality	jSetQuality
-#define jpeg_set_linear_quality	jSetLQuality
-#define jpeg_add_quant_table	jAddQuantTable
-#define jpeg_quality_scaling	jQualityScaling
-#define jpeg_simple_progression	jSimProgress
-#define jpeg_suppress_tables	jSuppressTables
-#define jpeg_alloc_quant_table	jAlcQTable
-#define jpeg_alloc_huff_table	jAlcHTable
-#define jpeg_start_compress	jStrtCompress
-#define jpeg_write_scanlines	jWrtScanlines
-#define jpeg_finish_compress	jFinCompress
-#define jpeg_write_raw_data	jWrtRawData
-#define jpeg_write_marker	jWrtMarker
-#define jpeg_write_m_header	jWrtMHeader
-#define jpeg_write_m_byte	jWrtMByte
-#define jpeg_write_tables	jWrtTables
-#define jpeg_read_header	jReadHeader
-#define jpeg_start_decompress	jStrtDecompress
-#define jpeg_read_scanlines	jReadScanlines
-#define jpeg_finish_decompress	jFinDecompress
-#define jpeg_read_raw_data	jReadRawData
-#define jpeg_has_multiple_scans	jHasMultScn
-#define jpeg_start_output	jStrtOutput
-#define jpeg_finish_output	jFinOutput
-#define jpeg_input_complete	jInComplete
-#define jpeg_new_colormap	jNewCMap
-#define jpeg_consume_input	jConsumeInput
-#define jpeg_calc_output_dimensions	jCalcDimensions
-#define jpeg_save_markers	jSaveMarkers
-#define jpeg_set_marker_processor	jSetMarker
-#define jpeg_read_coefficients	jReadCoefs
-#define jpeg_write_coefficients	jWrtCoefs
-#define jpeg_copy_critical_parameters	jCopyCrit
-#define jpeg_abort_compress	jAbrtCompress
-#define jpeg_abort_decompress	jAbrtDecompress
-#define jpeg_abort		jAbort
-#define jpeg_destroy		jDestroy
-#define jpeg_resync_to_restart	jResyncRestart
-#endif /* NEED_SHORT_EXTERNAL_NAMES */
-
-
-/* Default error-management setup */
-EXTERN(struct jpeg_error_mgr *) jpeg_std_error
-	JPP((struct jpeg_error_mgr * err));
-
-/* Initialization of JPEG compression objects.
- * jpeg_create_compress() and jpeg_create_decompress() are the exported
- * names that applications should call.  These expand to calls on
- * jpeg_CreateCompress and jpeg_CreateDecompress with additional information
- * passed for version mismatch checking.
- * NB: you must set up the error-manager BEFORE calling jpeg_create_xxx.
- */
-#define jpeg_create_compress(cinfo) \
-    jpeg_CreateCompress((cinfo), JPEG_LIB_VERSION, \
-			(size_t) sizeof(struct jpeg_compress_struct))
-#define jpeg_create_decompress(cinfo) \
-    jpeg_CreateDecompress((cinfo), JPEG_LIB_VERSION, \
-			  (size_t) sizeof(struct jpeg_decompress_struct))
-EXTERN(void) jpeg_CreateCompress JPP((j_compress_ptr cinfo,
-				      int version, size_t structsize));
-EXTERN(void) jpeg_CreateDecompress JPP((j_decompress_ptr cinfo,
-					int version, size_t structsize));
-/* Destruction of JPEG compression objects */
-EXTERN(void) jpeg_destroy_compress JPP((j_compress_ptr cinfo));
-EXTERN(void) jpeg_destroy_decompress JPP((j_decompress_ptr cinfo));
-
-/* Standard data source and destination managers: stdio streams. */
-/* Caller is responsible for opening the file before and closing after. */
-EXTERN(void) jpeg_stdio_dest JPP((j_compress_ptr cinfo, FILE * outfile));
-EXTERN(void) jpeg_stdio_src JPP((j_decompress_ptr cinfo, FILE * infile));
-
-/* Default parameter setup for compression */
-EXTERN(void) jpeg_set_defaults JPP((j_compress_ptr cinfo));
-/* Compression parameter setup aids */
-EXTERN(void) jpeg_set_colorspace JPP((j_compress_ptr cinfo,
-				      J_COLOR_SPACE colorspace));
-EXTERN(void) jpeg_default_colorspace JPP((j_compress_ptr cinfo));
-EXTERN(void) jpeg_set_quality JPP((j_compress_ptr cinfo, int quality,
-				   boolean force_baseline));
-EXTERN(void) jpeg_set_linear_quality JPP((j_compress_ptr cinfo,
-					  int scale_factor,
-					  boolean force_baseline));
-EXTERN(void) jpeg_add_quant_table JPP((j_compress_ptr cinfo, int which_tbl,
-				       const unsigned int *basic_table,
-				       int scale_factor,
-				       boolean force_baseline));
-EXTERN(int) jpeg_quality_scaling JPP((int quality));
-EXTERN(void) jpeg_simple_progression JPP((j_compress_ptr cinfo));
-EXTERN(void) jpeg_suppress_tables JPP((j_compress_ptr cinfo,
-				       boolean suppress));
-EXTERN(JQUANT_TBL *) jpeg_alloc_quant_table JPP((j_common_ptr cinfo));
-EXTERN(JHUFF_TBL *) jpeg_alloc_huff_table JPP((j_common_ptr cinfo));
-
-/* Main entry points for compression */
-EXTERN(void) jpeg_start_compress JPP((j_compress_ptr cinfo,
-				      boolean write_all_tables));
-EXTERN(JDIMENSION) jpeg_write_scanlines JPP((j_compress_ptr cinfo,
-					     JSAMPARRAY scanlines,
-					     JDIMENSION num_lines));
-EXTERN(void) jpeg_finish_compress JPP((j_compress_ptr cinfo));
-
-/* Replaces jpeg_write_scanlines when writing raw downsampled data. */
-EXTERN(JDIMENSION) jpeg_write_raw_data JPP((j_compress_ptr cinfo,
-					    JSAMPIMAGE data,
-					    JDIMENSION num_lines));
-
-/* Write a special marker.  See libjpeg.doc concerning safe usage. */
-EXTERN(void) jpeg_write_marker
-	JPP((j_compress_ptr cinfo, int marker,
-	     const JOCTET * dataptr, unsigned int datalen));
-/* Same, but piecemeal. */
-EXTERN(void) jpeg_write_m_header
-	JPP((j_compress_ptr cinfo, int marker, unsigned int datalen));
-EXTERN(void) jpeg_write_m_byte
-	JPP((j_compress_ptr cinfo, int val));
-
-/* Alternate compression function: just write an abbreviated table file */
-EXTERN(void) jpeg_write_tables JPP((j_compress_ptr cinfo));
-
-/* Decompression startup: read start of JPEG datastream to see what's there */
-EXTERN(int) jpeg_read_header JPP((j_decompress_ptr cinfo,
-				  boolean require_image));
-/* Return value is one of: */
-#define JPEG_SUSPENDED		0 /* Suspended due to lack of input data */
-#define JPEG_HEADER_OK		1 /* Found valid image datastream */
-#define JPEG_HEADER_TABLES_ONLY	2 /* Found valid table-specs-only datastream */
-/* If you pass require_image = TRUE (normal case), you need not check for
- * a TABLES_ONLY return code; an abbreviated file will cause an error exit.
- * JPEG_SUSPENDED is only possible if you use a data source module that can
- * give a suspension return (the stdio source module doesn't).
- */
-
-/* Main entry points for decompression */
-EXTERN(boolean) jpeg_start_decompress JPP((j_decompress_ptr cinfo));
-EXTERN(JDIMENSION) jpeg_read_scanlines JPP((j_decompress_ptr cinfo,
-					    JSAMPARRAY scanlines,
-					    JDIMENSION max_lines));
-EXTERN(boolean) jpeg_finish_decompress JPP((j_decompress_ptr cinfo));
-
-/* Replaces jpeg_read_scanlines when reading raw downsampled data. */
-EXTERN(JDIMENSION) jpeg_read_raw_data JPP((j_decompress_ptr cinfo,
-					   JSAMPIMAGE data,
-					   JDIMENSION max_lines));
-
-/* Additional entry points for buffered-image mode. */
-EXTERN(boolean) jpeg_has_multiple_scans JPP((j_decompress_ptr cinfo));
-EXTERN(boolean) jpeg_start_output JPP((j_decompress_ptr cinfo,
-				       int scan_number));
-EXTERN(boolean) jpeg_finish_output JPP((j_decompress_ptr cinfo));
-EXTERN(boolean) jpeg_input_complete JPP((j_decompress_ptr cinfo));
-EXTERN(void) jpeg_new_colormap JPP((j_decompress_ptr cinfo));
-EXTERN(int) jpeg_consume_input JPP((j_decompress_ptr cinfo));
-/* Return value is one of: */
-/* #define JPEG_SUSPENDED	0    Suspended due to lack of input data */
-#define JPEG_REACHED_SOS	1 /* Reached start of new scan */
-#define JPEG_REACHED_EOI	2 /* Reached end of image */
-#define JPEG_ROW_COMPLETED	3 /* Completed one iMCU row */
-#define JPEG_SCAN_COMPLETED	4 /* Completed last iMCU row of a scan */
-
-/* Precalculate output dimensions for current decompression parameters. */
-EXTERN(void) jpeg_calc_output_dimensions JPP((j_decompress_ptr cinfo));
-
-/* Control saving of COM and APPn markers into marker_list. */
-EXTERN(void) jpeg_save_markers
-	JPP((j_decompress_ptr cinfo, int marker_code,
-	     unsigned int length_limit));
-
-/* Install a special processing method for COM or APPn markers. */
-EXTERN(void) jpeg_set_marker_processor
-	JPP((j_decompress_ptr cinfo, int marker_code,
-	     jpeg_marker_parser_method routine));
-
-/* Read or write raw DCT coefficients --- useful for lossless transcoding. */
-EXTERN(jvirt_barray_ptr *) jpeg_read_coefficients JPP((j_decompress_ptr cinfo));
-EXTERN(void) jpeg_write_coefficients JPP((j_compress_ptr cinfo,
-					  jvirt_barray_ptr * coef_arrays));
-EXTERN(void) jpeg_copy_critical_parameters JPP((j_decompress_ptr srcinfo,
-						j_compress_ptr dstinfo));
-
-/* If you choose to abort compression or decompression before completing
- * jpeg_finish_(de)compress, then you need to clean up to release memory,
- * temporary files, etc.  You can just call jpeg_destroy_(de)compress
- * if you're done with the JPEG object, but if you want to clean it up and
- * reuse it, call this:
- */
-EXTERN(void) jpeg_abort_compress JPP((j_compress_ptr cinfo));
-EXTERN(void) jpeg_abort_decompress JPP((j_decompress_ptr cinfo));
-
-/* Generic versions of jpeg_abort and jpeg_destroy that work on either
- * flavor of JPEG object.  These may be more convenient in some places.
- */
-EXTERN(void) jpeg_abort JPP((j_common_ptr cinfo));
-EXTERN(void) jpeg_destroy JPP((j_common_ptr cinfo));
-
-/* Default restart-marker-resync procedure for use by data source modules */
-EXTERN(boolean) jpeg_resync_to_restart JPP((j_decompress_ptr cinfo,
-					    int desired));
-
-
-/* These marker codes are exported since applications and data source modules
- * are likely to want to use them.
- */
-
-#define JPEG_RST0	0xD0	/* RST0 marker code */
-#define JPEG_EOI	0xD9	/* EOI marker code */
-#define JPEG_APP0	0xE0	/* APP0 marker code */
-#define JPEG_COM	0xFE	/* COM marker code */
-
-
-/* If we have a brain-damaged compiler that emits warnings (or worse, errors)
- * for structure definitions that are never filled in, keep it quiet by
- * supplying dummy definitions for the various substructures.
- */
-
-#ifdef INCOMPLETE_TYPES_BROKEN
-#ifndef JPEG_INTERNALS		/* will be defined in jpegint.h */
-struct jvirt_sarray_control { long dummy; };
-struct jvirt_barray_control { long dummy; };
-struct jpeg_comp_master { long dummy; };
-struct jpeg_c_main_controller { long dummy; };
-struct jpeg_c_prep_controller { long dummy; };
-struct jpeg_c_coef_controller { long dummy; };
-struct jpeg_marker_writer { long dummy; };
-struct jpeg_color_converter { long dummy; };
-struct jpeg_downsampler { long dummy; };
-struct jpeg_forward_dct { long dummy; };
-struct jpeg_entropy_encoder { long dummy; };
-struct jpeg_decomp_master { long dummy; };
-struct jpeg_d_main_controller { long dummy; };
-struct jpeg_d_coef_controller { long dummy; };
-struct jpeg_d_post_controller { long dummy; };
-struct jpeg_input_controller { long dummy; };
-struct jpeg_marker_reader { long dummy; };
-struct jpeg_entropy_decoder { long dummy; };
-struct jpeg_inverse_dct { long dummy; };
-struct jpeg_upsampler { long dummy; };
-struct jpeg_color_deconverter { long dummy; };
-struct jpeg_color_quantizer { long dummy; };
-#endif /* JPEG_INTERNALS */
-#endif /* INCOMPLETE_TYPES_BROKEN */
-
-
-/*
- * The JPEG library modules define JPEG_INTERNALS before including this file.
- * The internal structure declarations are read only when that is true.
- * Applications using the library should not include jpegint.h, but may wish
- * to include jerror.h.
- */
-
-#ifdef JPEG_INTERNALS
-#include "jpegint.h"		/* fetch private declarations */
-#include "jerror.h"		/* fetch error codes too */
-#endif
-
-#endif /* JPEGLIB_H */

gpac-2.2.1.tar.gz/extra_lib/include/libavcodec Deleted

gpac-2.2.1.tar.gz/extra_lib/include/libavcodec/ac3_parser.h Deleted

@@ -1,36 +0,0 @@
-/*
- * AC-3 parser prototypes
- * Copyright (c) 2003 Fabrice Bellard
- * Copyright (c) 2003 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 AVCODEC_AC3_PARSER_H
-#define AVCODEC_AC3_PARSER_H
-
-#include <stddef.h>
-#include <stdint.h>
-
-/**
- * Extract the bitstream ID and the frame size from AC-3 data.
- */
-int av_ac3_parse_header(const uint8_t *buf, size_t size,
-                        uint8_t *bitstream_id, uint16_t *frame_size);
-
-
-#endif /* AVCODEC_AC3_PARSER_H */

gpac-2.2.1.tar.gz/extra_lib/include/libavcodec/adts_parser.h Deleted

@@ -1,37 +0,0 @@
-/*
- * 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_ADTS_PARSER_H
-#define AVCODEC_ADTS_PARSER_H
-
-#include <stddef.h>
-#include <stdint.h>
-
-#define AV_AAC_ADTS_HEADER_SIZE 7
-
-/**
- * Extract the number of samples and frames from AAC data.
- * @paramin  buf     pointer to AAC data buffer
- * @paramout samples Pointer to where number of samples is written
- * @paramout frames  Pointer to where number of frames is written
- * @return Returns 0 on success, error code on failure.
- */
-int av_adts_header_parse(const uint8_t *buf, uint32_t *samples,
-                         uint8_t *frames);
-
-#endif /* AVCODEC_ADTS_PARSER_H */

gpac-2.2.1.tar.gz/extra_lib/include/libavcodec/avcodec.h Deleted

@@ -1,3155 +0,0 @@
-/*
- * copyright (c) 2001 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 AVCODEC_AVCODEC_H
-#define AVCODEC_AVCODEC_H
-
-/**
- * @file
- * @ingroup libavc
- * Libavcodec external API header
- */
-
-#include "libavutil/samplefmt.h"
-#include "libavutil/attributes.h"
-#include "libavutil/avutil.h"
-#include "libavutil/buffer.h"
-#include "libavutil/dict.h"
-#include "libavutil/frame.h"
-#include "libavutil/log.h"
-#include "libavutil/pixfmt.h"
-#include "libavutil/rational.h"
-
-#include "codec.h"
-#include "codec_desc.h"
-#include "codec_par.h"
-#include "codec_id.h"
-#include "defs.h"
-#include "packet.h"
-#include "version.h"
-
-/**
- * @defgroup libavc libavcodec
- * 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
- * @{
- * @}
- * @}
- */
-
-/**
- * @ingroup libavc
- * @defgroup lavc_encdec send/receive encoding and decoding API overview
- * @{
- *
- * The avcodec_send_packet()/avcodec_receive_frame()/avcodec_send_frame()/
- * avcodec_receive_packet() functions provide an encode/decode API, which
- * decouples input and output.
- *
- * The API is very similar for encoding/decoding and audio/video, and works as
- * follows:
- * - Set up and open the AVCodecContext as usual.
- * - Send valid input:
- *   - For decoding, call avcodec_send_packet() to give the decoder raw
- *     compressed data in an AVPacket.
- *   - For encoding, call avcodec_send_frame() to give the encoder an AVFrame
- *     containing uncompressed audio or video.
- *
- *   In both cases, it is recommended that AVPackets and AVFrames are
- *   refcounted, or libavcodec might have to copy the input data. (libavformat
- *   always returns refcounted AVPackets, and av_frame_get_buffer() allocates
- *   refcounted AVFrames.)
- * - Receive output in a loop. Periodically call one of the avcodec_receive_*()
- *   functions and process their output:
- *   - For decoding, call avcodec_receive_frame(). On success, it will return
- *     an AVFrame containing uncompressed audio or video data.
- *   - For encoding, call avcodec_receive_packet(). On success, it will return
- *     an AVPacket with a compressed frame.
- *
- *   Repeat this call until it returns AVERROR(EAGAIN) or an error. The
- *   AVERROR(EAGAIN) return value means that new input data is required to
- *   return new output. In this case, continue with sending input. For each
- *   input frame/packet, the codec will typically return 1 output frame/packet,
- *   but it can also be 0 or more than 1.
- *
- * At the beginning of decoding or encoding, the codec might accept multiple
- * input frames/packets without returning a frame, until its internal buffers
- * are filled. This situation is handled transparently if you follow the steps
- * outlined above.
- *
- * In theory, sending input can result in EAGAIN - this should happen only if
- * not all output was received. You can use this to structure alternative decode
- * or encode loops other than the one suggested above. For example, you could
- * try sending new input on each iteration, and try to receive output if that
- * returns EAGAIN.
- *
- * End of stream situations. These require "flushing" (aka draining) the codec,
- * as the codec might buffer multiple frames or packets internally for
- * performance or out of necessity (consider B-frames).
- * This is handled as follows:
- * - Instead of valid input, send NULL to the avcodec_send_packet() (decoding)
- *   or avcodec_send_frame() (encoding) functions. This will enter draining
- *   mode.
- * - Call avcodec_receive_frame() (decoding) or avcodec_receive_packet()
- *   (encoding) in a loop until AVERROR_EOF is returned. The functions will
- *   not return AVERROR(EAGAIN), unless you forgot to enter draining mode.
- * - Before decoding can be resumed again, the codec has to be reset with
- *   avcodec_flush_buffers().
- *
- * Using the API as outlined above is highly recommended. But it is also
- * possible to call functions outside of this rigid schema. For example, you can
- * call avcodec_send_packet() repeatedly without calling
- * avcodec_receive_frame(). In this case, avcodec_send_packet() will succeed
- * until the codec's internal buffer has been filled up (which is typically of
- * size 1 per output frame, after initial input), and then reject input with
- * AVERROR(EAGAIN). Once it starts rejecting input, you have no choice but to
- * read at least some output.
- *
- * Not all codecs will follow a rigid and predictable dataflow; the only
- * guarantee is that an AVERROR(EAGAIN) return value on a send/receive call on
- * one end implies that a receive/send call on the other end will succeed, or
- * at least will not fail with AVERROR(EAGAIN). In general, no codec will
- * permit unlimited buffering of input or output.
- *
- * A codec is not allowed to return AVERROR(EAGAIN) for both sending and receiving. This
- * would be an invalid state, which could put the codec user into an endless
- * loop. The API has no concept of time either: it cannot happen that trying to
- * do avcodec_send_packet() results in AVERROR(EAGAIN), but a repeated call 1 second
- * later accepts the packet (with no other receive/flush API calls involved).
- * The API is a strict state machine, and the passage of time is not supposed
- * to influence it. Some timing-dependent behavior might still be deemed
- * acceptable in certain cases. But it must never result in both send/receive
- * returning EAGAIN at the same time at any point. It must also absolutely be
- * avoided that the current state is "unstable" and can "flip-flop" between
- * the send/receive APIs allowing progress. For example, it's not allowed that
- * the codec randomly decides that it actually wants to consume a packet now
- * instead of returning a frame, after it just returned AVERROR(EAGAIN) on an
- * avcodec_send_packet() call.
- * @}
- */
-
-/**
- * @defgroup lavc_core Core functions/structures.
- * @ingroup libavc
- *
- * Basic definitions, functions for querying libavcodec capabilities,
- * allocating core structures, etc.
- * @{
- */
-
-/**
- * @ingroup lavc_encoding
- * minimum encoding buffer size
- * Used to avoid some checks during header writing.
- */
-#define AV_INPUT_BUFFER_MIN_SIZE 16384
-
-/**
- * @ingroup lavc_encoding
- */
-typedef struct RcOverride{
-    int start_frame;
-    int end_frame;
-    int qscale; // If this is 0 then quality_factor will be used instead.
-    float quality_factor;
-} RcOverride;
-
-/* 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 AV_CODEC_FLAG_UNALIGNED       (1 <<  0)
-/**
- * Use fixed qscale.
- */
-#define AV_CODEC_FLAG_QSCALE          (1 <<  1)
-/**
- * 4 MV per MB allowed / advanced prediction for H.263.
- */
-#define AV_CODEC_FLAG_4MV             (1 <<  2)
-/**
- * Output even those frames that might be corrupted.
- */
-#define AV_CODEC_FLAG_OUTPUT_CORRUPT  (1 <<  3)
-/**
- * Use qpel MC.
- */
-#define AV_CODEC_FLAG_QPEL            (1 <<  4)
-/**
- * Don't output frames whose parameters differ from first
- * decoded frame in stream.
- */
-#define AV_CODEC_FLAG_DROPCHANGED     (1 <<  5)
-/**
- * Use internal 2pass ratecontrol in first pass mode.
- */
-#define AV_CODEC_FLAG_PASS1           (1 <<  9)
-/**
- * Use internal 2pass ratecontrol in second pass mode.
- */
-#define AV_CODEC_FLAG_PASS2           (1 << 10)
-/**
- * loop filter.
- */
-#define AV_CODEC_FLAG_LOOP_FILTER     (1 << 11)
-/**
- * Only decode/encode grayscale.
- */
-#define AV_CODEC_FLAG_GRAY            (1 << 13)
-/**
- * error? variables will be set during encoding.
- */
-#define AV_CODEC_FLAG_PSNR            (1 << 15)
-#if FF_API_FLAG_TRUNCATED
-/**
- * Input bitstream might be truncated at a random location
- * instead of only at frame boundaries.
- *
- * @deprecated use codec parsers for packetizing input
- */
-#define AV_CODEC_FLAG_TRUNCATED       (1 << 16)
-#endif
-/**
- * Use interlaced DCT.
- */
-#define AV_CODEC_FLAG_INTERLACED_DCT  (1 << 18)
-/**
- * Force low delay.
- */
-#define AV_CODEC_FLAG_LOW_DELAY       (1 << 19)
-/**
- * Place global headers in extradata instead of every keyframe.
- */
-#define AV_CODEC_FLAG_GLOBAL_HEADER   (1 << 22)
-/**
- * Use only bitexact stuff (except (I)DCT).
- */
-#define AV_CODEC_FLAG_BITEXACT        (1 << 23)
-/* Fx : Flag for H.263+ extra options */
-/**
- * H.263 advanced intra coding / MPEG-4 AC prediction
- */
-#define AV_CODEC_FLAG_AC_PRED         (1 << 24)
-/**
- * interlaced motion estimation
- */
-#define AV_CODEC_FLAG_INTERLACED_ME   (1 << 29)
-#define AV_CODEC_FLAG_CLOSED_GOP      (1U << 31)
-
-/**
- * Allow non spec compliant speedup tricks.
- */
-#define AV_CODEC_FLAG2_FAST           (1 <<  0)
-/**
- * Skip bitstream encoding.
- */
-#define AV_CODEC_FLAG2_NO_OUTPUT      (1 <<  2)
-/**
- * Place global headers at every keyframe instead of in extradata.
- */
-#define AV_CODEC_FLAG2_LOCAL_HEADER   (1 <<  3)
-
-/**
- * timecode is in drop frame format. DEPRECATED!!!!
- */
-#define AV_CODEC_FLAG2_DROP_FRAME_TIMECODE (1 << 13)
-
-/**
- * Input bitstream might be truncated at a packet boundaries
- * instead of only at frame boundaries.
- */
-#define AV_CODEC_FLAG2_CHUNKS         (1 << 15)
-/**
- * Discard cropping information from SPS.
- */
-#define AV_CODEC_FLAG2_IGNORE_CROP    (1 << 16)
-
-/**
- * Show all frames before the first keyframe
- */
-#define AV_CODEC_FLAG2_SHOW_ALL       (1 << 22)
-/**
- * Export motion vectors through frame side data
- */
-#define AV_CODEC_FLAG2_EXPORT_MVS     (1 << 28)
-/**
- * Do not skip samples and export skip information as frame side data
- */
-#define AV_CODEC_FLAG2_SKIP_MANUAL    (1 << 29)
-/**
- * Do not reset ASS ReadOrder field on flush (subtitles decoding)
- */
-#define AV_CODEC_FLAG2_RO_FLUSH_NOOP  (1 << 30)
-
-/* Unsupported options :
- *              Syntax Arithmetic coding (SAC)
- *              Reference Picture Selection
- *              Independent Segment Decoding */
-/* /Fx */
-/* codec capabilities */
-
-/* Exported side data.
-   These flags can be passed in AVCodecContext.export_side_data before initialization.
-*/
-/**
- * Export motion vectors through frame side data
- */
-#define AV_CODEC_EXPORT_DATA_MVS         (1 << 0)
-/**
- * Export encoder Producer Reference Time through packet side data
- */
-#define AV_CODEC_EXPORT_DATA_PRFT        (1 << 1)
-/**
- * Decoding only.
- * Export the AVVideoEncParams structure through frame side data.
- */
-#define AV_CODEC_EXPORT_DATA_VIDEO_ENC_PARAMS (1 << 2)
-/**
- * Decoding only.
- * Do not apply film grain, export it instead.
- */
-#define AV_CODEC_EXPORT_DATA_FILM_GRAIN (1 << 3)
-
-/**
- * The decoder will keep a reference to the frame and may reuse it later.
- */
-#define AV_GET_BUFFER_FLAG_REF (1 << 0)
-
-/**
- * The encoder will keep a reference to the packet and may reuse it later.
- */
-#define AV_GET_ENCODE_BUFFER_FLAG_REF (1 << 0)
-
-struct AVCodecInternal;
-
-/**
- * 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.
- * You can use AVOptions (av_opt* / av_set/get*()) to access these fields from user
- * applications.
- * The name string for AVOptions options matches the associated command line
- * parameter name and can be found in libavcodec/options_table.h
- * The AVOption/command line parameter names differ in some cases from the C
- * structure field names for historic reasons or brevity.
- * sizeof(AVCodecContext) must not be used outside libav*.
- */
-typedef struct AVCodecContext {
-    /**
-     * information on struct for av_log
-     * - 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;
-    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;
-
-    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.
-     * - decoding: Set by user, may be overwritten by libavcodec
-     *             if this info is available in the stream
-     */
-    int64_t bit_rate;
-
-    /**
-     * number of bits the bitstream is allowed to diverge from the reference.
-     *           the reference can be CBR (for CBR pass1) or VBR (for pass2)
-     * - encoding: Set by user; unused for constant quantizer encoding.
-     * - decoding: unused
-     */
-    int bit_rate_tolerance;
-
-    /**
-     * 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;
-
-    /**
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int compression_level;
-#define FF_COMPRESSION_DEFAULT -1
-
-    /**
-     * AV_CODEC_FLAG_*.
-     * - encoding: Set by user.
-     * - decoding: Set by user.
-     */
-    int flags;
-
-    /**
-     * AV_CODEC_FLAG2_*
-     * - encoding: Set by user.
-     * - decoding: Set by user.
-     */
-    int flags2;
-
-    /**
-     * some codecs need / can use extradata like Huffman tables.
-     * MJPEG: Huffman tables
-     * rv10: additional flags
-     * MPEG-4: global headers (they can be in the bitstream or here)
-     * The allocated memory should be AV_INPUT_BUFFER_PADDING_SIZE bytes larger
-     * 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.
-     * Must be allocated with the av_malloc() family of functions.
-     * - encoding: Set/allocated/freed by libavcodec.
-     * - decoding: Set/allocated/freed by user.
-     */
-    uint8_t *extradata;
-    int extradata_size;
-
-    /**
-     * This is the fundamental unit of time (in seconds) in terms
-     * of which frame timestamps are represented. For fixed-fps content,
-     * timebase should be 1/framerate and timestamp increments should be
-     * identically 1.
-     * This often, but not always is the inverse of the frame rate or field rate
-     * for video. 1/time_base is not the average frame rate if the frame rate is not
-     * constant.
-     *
-     * Like containers, elementary streams also can store timestamps, 1/time_base
-     * is the unit in which these timestamps are specified.
-     * As example of such codec time base see ISO/IEC 14496-2:2001(E)
-     * vop_time_increment_resolution and fixed_vop_rate
-     * (fixed_vop_rate == 0 implies that it is different from the framerate)
-     *
-     * - encoding: MUST be set by user.
-     * - decoding: the use of this field for decoding is deprecated.
-     *             Use framerate instead.
-     */
-    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 field is unused (see initial_padding).
-     *
-     *   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.
-     *
-     * @note Those fields may not match the values of the last
-     * AVFrame output by avcodec_receive_frame() due frame
-     * reordering.
-     *
-     * - encoding: MUST be set by user.
-     * - 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 while parsing the data.
-     */
-    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.
-     *
-     * @note Those field may not match the value of the last
-     * AVFrame output by avcodec_receive_frame() due frame
-     * reordering.
-     *
-     * - 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 while parsing the data.
-     */
-    int coded_width, coded_height;
-
-    /**
-     * the number of pictures in a group of pictures, or 0 for intra_only
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int gop_size;
-
-    /**
-     * 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.
-     *
-     * @note This field may not match the value of the last
-     * AVFrame output by avcodec_receive_frame() due frame
-     * reordering.
-     *
-     * - encoding: Set by user.
-     * - decoding: Set by user if known, overridden by libavcodec while
-     *             parsing the data.
-     */
-    enum AVPixelFormat pix_fmt;
-
-    /**
-     * 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.
-     * In that mode instead of pixel data, AVFrame points to
-     * a structure specific to the acceleration API. The application
-     * reads the structure and can change some fields to indicate progress
-     * or mark state.
-     * - encoding: unused
-     * - decoding: Set by user.
-     * @param height the height of the slice
-     * @param y the y position of the slice
-     * @param type 1->top field, 2->bottom field, 3->frame
-     * @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 offsetAV_NUM_DATA_POINTERS,
-                            int y, int type, int height);
-
-    /**
-     * Callback to negotiate the pixel format. Decoding only, may be set by the
-     * caller before avcodec_open2().
-     *
-     * Called by some decoders to select the pixel format that will be used for
-     * the output frames. This is mainly used to set up hardware acceleration,
-     * then the provided format list contains the corresponding hwaccel pixel
-     * formats alongside the "software" one. The software pixel format may also
-     * be retrieved from \ref sw_pix_fmt.
-     *
-     * This callback will be called when the coded frame properties (such as
-     * resolution, pixel format, etc.) change and more than one output format is
-     * supported for those new properties. If a hardware pixel format is chosen
-     * and initialization for it fails, the callback may be called again
-     * immediately.
-     *
-     * This callback may be called from different threads if the decoder is
-     * multi-threaded, but not from more than one thread simultaneously.
-     *
-     * @param fmt list of formats which may be used in the current
-     *            configuration, terminated by AV_PIX_FMT_NONE.
-     * @warning Behavior is undefined if the callback returns a value other
-     *          than one of the formats in fmt or AV_PIX_FMT_NONE.
-     * @return the chosen format or AV_PIX_FMT_NONE
-     */
-    enum AVPixelFormat (*get_format)(struct AVCodecContext *s, const enum AVPixelFormat * fmt);
-
-    /**
-     * maximum number of B-frames between non-B-frames
-     * Note: The output will be delayed by max_b_frames+1 relative to the input.
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int max_b_frames;
-
-    /**
-     * qscale factor between IP and B-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).
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    float b_quant_factor;
-
-    /**
-     * qscale offset between IP and B-frames
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    float b_quant_offset;
-
-    /**
-     * 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.
-     * - decoding: Set by libavcodec.
-     */
-    int has_b_frames;
-
-    /**
-     * 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).
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    float i_quant_factor;
-
-    /**
-     * qscale offset between P and I-frames
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    float i_quant_offset;
-
-    /**
-     * luminance masking (0-> disabled)
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    float lumi_masking;
-
-    /**
-     * temporary complexity masking (0-> disabled)
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    float temporal_cplx_masking;
-
-    /**
-     * spatial complexity masking (0-> disabled)
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    float spatial_cplx_masking;
-
-    /**
-     * p block masking (0-> disabled)
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    float p_masking;
-
-    /**
-     * darkness masking (0-> disabled)
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    float dark_masking;
-
-    /**
-     * 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;
-
-    /**
-     * 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.
-     * - encoding: Set by user.
-     * - decoding: Set by libavcodec.
-     */
-    AVRational sample_aspect_ratio;
-
-    /**
-     * motion estimation comparison function
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int me_cmp;
-    /**
-     * subpixel motion estimation comparison function
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int me_sub_cmp;
-    /**
-     * macroblock comparison function (not supported yet)
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int mb_cmp;
-    /**
-     * interlaced DCT comparison function
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int ildct_cmp;
-#define FF_CMP_SAD          0
-#define FF_CMP_SSE          1
-#define FF_CMP_SATD         2
-#define FF_CMP_DCT          3
-#define FF_CMP_PSNR         4
-#define FF_CMP_BIT          5
-#define FF_CMP_RD           6
-#define FF_CMP_ZERO         7
-#define FF_CMP_VSAD         8
-#define FF_CMP_VSSE         9
-#define FF_CMP_NSSE         10
-#define FF_CMP_W53          11
-#define FF_CMP_W97          12
-#define FF_CMP_DCTMAX       13
-#define FF_CMP_DCT264       14
-#define FF_CMP_MEDIAN_SAD   15
-#define FF_CMP_CHROMA       256
-
-    /**
-     * ME diamond size & shape
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int dia_size;
-
-    /**
-     * amount of previous MV predictors (2a+1 x 2a+1 square)
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int last_predictor_count;
-
-    /**
-     * motion estimation prepass comparison function
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int me_pre_cmp;
-
-    /**
-     * ME prepass diamond size & shape
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int pre_dia_size;
-
-    /**
-     * subpel ME quality
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int me_subpel_quality;
-
-    /**
-     * maximum motion estimation search range in subpel units
-     * If 0 then no limit.
-     *
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int me_range;
-
-    /**
-     * slice flags
-     * - encoding: unused
-     * - decoding: Set by user.
-     */
-    int slice_flags;
-#define SLICE_FLAG_CODED_ORDER    0x0001 ///< draw_horiz_band() is called in coded order instead of display
-#define SLICE_FLAG_ALLOW_FIELD    0x0002 ///< allow draw_horiz_band() with field slices (MPEG-2 field pics)
-#define SLICE_FLAG_ALLOW_PLANE    0x0004 ///< allow draw_horiz_band() with 1 component at a time (SVQ1)
-
-    /**
-     * macroblock decision mode
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int mb_decision;
-#define FF_MB_DECISION_SIMPLE 0        ///< uses mb_cmp
-#define FF_MB_DECISION_BITS   1        ///< chooses the one which needs the fewest bits
-#define FF_MB_DECISION_RD     2        ///< rate distortion
-
-    /**
-     * custom intra quantization matrix
-     * Must be allocated with the av_malloc() family of functions, and will be freed in
-     * avcodec_free_context().
-     * - encoding: Set/allocated by user, freed by libavcodec. Can be NULL.
-     * - decoding: Set/allocated/freed by libavcodec.
-     */
-    uint16_t *intra_matrix;
-
-    /**
-     * custom inter quantization matrix
-     * Must be allocated with the av_malloc() family of functions, and will be freed in
-     * avcodec_free_context().
-     * - encoding: Set/allocated by user, freed by libavcodec. Can be NULL.
-     * - decoding: Set/allocated/freed by libavcodec.
-     */
-    uint16_t *inter_matrix;
-
-    /**
-     * precision of the intra DC coefficient - 8
-     * - encoding: Set by user.
-     * - decoding: Set by libavcodec
-     */
-    int intra_dc_precision;
-
-    /**
-     * Number of macroblock rows at the top which are skipped.
-     * - encoding: unused
-     * - decoding: Set by user.
-     */
-    int skip_top;
-
-    /**
-     * Number of macroblock rows at the bottom which are skipped.
-     * - encoding: unused
-     * - decoding: Set by user.
-     */
-    int skip_bottom;
-
-    /**
-     * minimum MB Lagrange multiplier
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int mb_lmin;
-
-    /**
-     * maximum MB Lagrange multiplier
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int mb_lmax;
-
-    /**
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int bidir_refine;
-
-    /**
-     * minimum GOP size
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int keyint_min;
-
-    /**
-     * number of reference frames
-     * - encoding: Set by user.
-     * - decoding: Set by lavc.
-     */
-    int refs;
-
-    /**
-     * Note: Value depends upon the compare function used for fullpel ME.
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int mv0_threshold;
-
-    /**
-     * Chromaticity coordinates of the source primaries.
-     * - encoding: Set by user
-     * - decoding: Set by libavcodec
-     */
-    enum AVColorPrimaries color_primaries;
-
-    /**
-     * Color Transfer Characteristic.
-     * - encoding: Set by user
-     * - decoding: Set by libavcodec
-     */
-    enum AVColorTransferCharacteristic color_trc;
-
-    /**
-     * YUV colorspace type.
-     * - encoding: Set by user
-     * - decoding: Set by libavcodec
-     */
-    enum AVColorSpace colorspace;
-
-    /**
-     * 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;
-
-    /** 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
-
-    /**
-     * audio sample format
-     * - encoding: Set by user.
-     * - decoding: Set by libavcodec.
-     */
-    enum AVSampleFormat sample_fmt;  ///< sample format
-
-    /* The following data should not be initialized. */
-    /**
-     * 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 AV_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 frame_size;
-
-    /**
-     * 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 frame_number;
-
-    /**
-     * number of bytes per packet if constant and known or 0
-     * Used by some WAV based audio codecs.
-     */
-    int block_align;
-
-    /**
-     * Audio cutoff bandwidth (0 means "automatic")
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int cutoff;
-
-    /**
-     * Audio channel layout.
-     * - encoding: set by user.
-     * - decoding: set by user, may be overwritten by libavcodec.
-     */
-    uint64_t channel_layout;
-
-    /**
-     * Request decoder to use this channel layout if it can (0 for default)
-     * - encoding: unused
-     * - decoding: Set by user.
-     */
-    uint64_t request_channel_layout;
-
-    /**
-     * Type of service that the audio stream conveys.
-     * - encoding: Set by user.
-     * - decoding: Set by libavcodec.
-     */
-    enum AVAudioServiceType audio_service_type;
-
-    /**
-     * desired sample format
-     * - encoding: Not used.
-     * - decoding: Set by user.
-     * Decoder will decode to this format if it can.
-     */
-    enum AVSampleFormat request_sample_fmt;
-
-    /**
-     * 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 extended_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 AV_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, 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 linesize0 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.
-     */
-    int (*get_buffer2)(struct AVCodecContext *s, AVFrame *frame, int flags);
-
-    /* - 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
-     */
-    int qmax;
-
-    /**
-     * maximum quantizer difference between frames
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int max_qdiff;
-
-    /**
-     * decoder bitstream buffer size
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int rc_buffer_size;
-
-    /**
-     * ratecontrol override, see RcOverride
-     * - encoding: Allocated/set/freed by user.
-     * - decoding: unused
-     */
-    int rc_override_count;
-    RcOverride *rc_override;
-
-    /**
-     * maximum bitrate
-     * - encoding: Set by user.
-     * - decoding: Set by user, may be overwritten by libavcodec.
-     */
-    int64_t rc_max_rate;
-
-    /**
-     * minimum bitrate
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int64_t rc_min_rate;
-
-    /**
-     * 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.
-     */
-    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 rc_initial_buffer_occupancy;
-
-    /**
-     * trellis RD quantization
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    int trellis;
-
-    /**
-     * 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;
-
-    /**
-     * 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_XVID_ILACE       4
-#define FF_BUG_UMP4             8
-#define FF_BUG_NO_PADDING       16
-#define FF_BUG_AMV              32
-#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_IEDGE           32768
-
-    /**
-     * strictly follow the standard (MPEG-4, ...).
-     * - 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)
-     */
-    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.
-
-    /**
-     * error concealment flags
-     * - encoding: unused
-     * - decoding: Set by user.
-     */
-    int error_concealment;
-#define FF_EC_GUESS_MVS   1
-#define FF_EC_DEBLOCK     2
-#define FF_EC_FAVOR_INTER 256
-
-    /**
-     * 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_DCT_COEFF   0x00000040
-#define FF_DEBUG_SKIP        0x00000080
-#define FF_DEBUG_STARTCODE   0x00000100
-#define FF_DEBUG_ER          0x00000400
-#define FF_DEBUG_MMCO        0x00000800
-#define FF_DEBUG_BUGS        0x00001000
-#define FF_DEBUG_BUFFERS     0x00008000
-#define FF_DEBUG_THREADS     0x00010000
-#define FF_DEBUG_GREEN_MD    0x00800000
-#define FF_DEBUG_NOMC        0x01000000
-
-    /**
-     * Error recognition; may misdetect some more or less valid parts as errors.
-     * - encoding: Set by user.
-     * - decoding: Set by user.
-     */
-    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
-
-
-    /**
-     * opaque 64-bit number (generally a PTS) that will be reordered and
-     * output in AVFrame.reordered_opaque
-     * - encoding: Set by libavcodec to the reordered_opaque of the input
-     *             frame corresponding to the last returned packet. Only
-     *             supported by encoders with the
-     *             AV_CODEC_CAP_ENCODER_REORDERED_OPAQUE capability.
-     * - decoding: Set by user.
-     */
-    int64_t reordered_opaque;
-
-    /**
-     * Hardware accelerator in use
-     * - encoding: unused.
-     * - decoding: Set by libavcodec
-     */
-    const struct AVHWAccel *hwaccel;
-
-    /**
-     * Hardware accelerator context.
-     * For some hardware accelerators, a global context needs to be
-     * provided by the user. In that case, this holds display-dependent
-     * data FFmpeg cannot instantiate itself. Please refer to the
-     * FFmpeg HW accelerator documentation to know how to fill this.
-     * - encoding: unused
-     * - decoding: Set by user
-     */
-    void *hwaccel_context;
-
-    /**
-     * error
-     * - encoding: Set by libavcodec if flags & AV_CODEC_FLAG_PSNR.
-     * - decoding: unused
-     */
-    uint64_t errorAV_NUM_DATA_POINTERS;
-
-    /**
-     * 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_ALTIVEC 5
-#define FF_DCT_FAAN    6
-
-    /**
-     * 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_ARM           7
-#define FF_IDCT_ALTIVEC       8
-#define FF_IDCT_SIMPLEARM     10
-#define FF_IDCT_XVID          14
-#define FF_IDCT_SIMPLEARMV5TE 16
-#define FF_IDCT_SIMPLEARMV6   17
-#define FF_IDCT_FAAN          20
-#define FF_IDCT_SIMPLENEON    22
-#define FF_IDCT_NONE          24 /* Used by XvMC to extract IDCT coefficients with FF_IDCT_PERM_NONE */
-#define FF_IDCT_SIMPLEAUTO    128
-
-    /**
-     * bits per sample/pixel from the demuxer (needed for huffyuv).
-     * - encoding: Set by libavcodec.
-     * - decoding: Set by user.
-     */
-     int bits_per_coded_sample;
-
-    /**
-     * Bits per sample/pixel of internal libavcodec pixel/sample format.
-     * - encoding: set by user.
-     * - decoding: set by libavcodec.
-     */
-    int bits_per_raw_sample;
-
-    /**
-     * low resolution decoding, 1-> 1/2 size, 2->1/4 size
-     * - encoding: unused
-     * - decoding: Set by user.
-     */
-     int lowres;
-
-    /**
-     * 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;
-
-#if FF_API_THREAD_SAFE_CALLBACKS
-    /**
-     * 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.
-     *
-     * @deprecated the custom get_buffer2() callback should always be
-     *   thread-safe. Thread-unsafe get_buffer2() implementations will be
-     *   invalid starting with LIBAVCODEC_VERSION_MAJOR=60; in other words,
-     *   libavcodec will behave as if this field was always set to 1.
-     *   Callers that want to be forward compatible with future libavcodec
-     *   versions should wrap access to this field in
-     *     #if LIBAVCODEC_VERSION_MAJOR < 60
-     */
-    attribute_deprecated
-    int thread_safe_callbacks;
-#endif
-
-    /**
-     * 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.
-     * 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.
-     * Also see avcodec_thread_init and e.g. the --enable-pthread configure option.
-     * @param c context passed also to func
-     * @param count the number of things to execute
-     * @param arg2 argument passed unchanged to func
-     * @param ret return values of executed functions, must have space for "count" values. May be NULL.
-     * @param func function that will be called count times, with jobnr from 0 to count-1.
-     *             threadnr will be in the range 0 to c->thread_count-1 < MAX_THREADS and so that no
-     *             two instances of func executing at the same time will have the same threadnr.
-     * @return always 0 currently, but code should handle a future improvement where when any call to func
-     *         returns < 0 no further calls to func may be done and < 0 is returned.
-     * - encoding: Set by libavcodec, user can override.
-     * - decoding: Set by libavcodec, user can override.
-     */
-    int (*execute2)(struct AVCodecContext *c, int (*func)(struct AVCodecContext *c2, void *arg, int jobnr, int threadnr), void *arg2, int *ret, int count);
-
-    /**
-     * noise vs. sse weight for the nsse comparison function
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-     int nsse_weight;
-
-    /**
-     * profile
-     * - encoding: Set by user.
-     * - decoding: Set by libavcodec.
-     */
-     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_DNXHD         0
-#define FF_PROFILE_DNXHR_LB      1
-#define FF_PROFILE_DNXHR_SQ      2
-#define FF_PROFILE_DNXHR_HQ      3
-#define FF_PROFILE_DNXHR_HQX     4
-#define FF_PROFILE_DNXHR_444     5
-
-#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_DTS_EXPRESS 70
-
-#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_MULTIVIEW_HIGH       118
-#define FF_PROFILE_H264_HIGH_422             122
-#define FF_PROFILE_H264_HIGH_422_INTRA       (122|FF_PROFILE_H264_INTRA)
-#define FF_PROFILE_H264_STEREO_HIGH          128
-#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   1
-#define FF_PROFILE_JPEG2000_CSTREAM_RESTRICTION_1   2
-#define FF_PROFILE_JPEG2000_CSTREAM_NO_RESTRICTION  32768
-#define FF_PROFILE_JPEG2000_DCINEMA_2K              3
-#define FF_PROFILE_JPEG2000_DCINEMA_4K              4
-
-#define FF_PROFILE_VP9_0                            0
-#define FF_PROFILE_VP9_1                            1
-#define FF_PROFILE_VP9_2                            2
-#define FF_PROFILE_VP9_3                            3
-
-#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
-
-#define FF_PROFILE_VVC_MAIN_10                      1
-#define FF_PROFILE_VVC_MAIN_10_444                 33
-
-#define FF_PROFILE_AV1_MAIN                         0
-#define FF_PROFILE_AV1_HIGH                         1
-#define FF_PROFILE_AV1_PROFESSIONAL                 2
-
-#define FF_PROFILE_MJPEG_HUFFMAN_BASELINE_DCT            0xc0
-#define FF_PROFILE_MJPEG_HUFFMAN_EXTENDED_SEQUENTIAL_DCT 0xc1
-#define FF_PROFILE_MJPEG_HUFFMAN_PROGRESSIVE_DCT         0xc2
-#define FF_PROFILE_MJPEG_HUFFMAN_LOSSLESS                0xc3
-#define FF_PROFILE_MJPEG_JPEG_LS                         0xf7
-
-#define FF_PROFILE_SBC_MSBC                         1
-
-#define FF_PROFILE_PRORES_PROXY     0
-#define FF_PROFILE_PRORES_LT        1
-#define FF_PROFILE_PRORES_STANDARD  2
-#define FF_PROFILE_PRORES_HQ        3
-#define FF_PROFILE_PRORES_4444      4
-#define FF_PROFILE_PRORES_XQ        5
-
-#define FF_PROFILE_ARIB_PROFILE_A 0
-#define FF_PROFILE_ARIB_PROFILE_C 1
-
-#define FF_PROFILE_KLVA_SYNC 0
-#define FF_PROFILE_KLVA_ASYNC 1
-
-    /**
-     * level
-     * - encoding: Set by user.
-     * - decoding: Set by libavcodec.
-     */
-     int level;
-#define FF_LEVEL_UNKNOWN -99
-
-    /**
-     * Skip loop filtering for selected frames.
-     * - encoding: unused
-     * - decoding: Set by user.
-     */
-    enum AVDiscard skip_loop_filter;
-
-    /**
-     * 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.
-     */
-    enum AVDiscard skip_frame;
-
-    /**
-     * 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;
-
-    /**
-     * Audio only. The number of "priming" samples (padding) inserted by the
-     * encoder at the beginning of the audio. I.e. this number of leading
-     * decoded samples must be discarded by the caller to get the original audio
-     * without leading padding.
-     *
-     * - decoding: unused
-     * - encoding: Set by libavcodec. 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
-     *             -initial_padding.
-     */
-    int initial_padding;
-
-    /**
-     * - decoding: For codecs that store a framerate value in the compressed
-     *             bitstream, the decoder may export it here. { 0, 1} when
-     *             unknown.
-     * - encoding: May be used to signal the framerate of CFR content to an
-     *             encoder.
-     */
-    AVRational framerate;
-
-    /**
-     * Nominal unaccelerated pixel format, see AV_PIX_FMT_xxx.
-     * - encoding: unused.
-     * - decoding: Set by libavcodec before calling get_format()
-     */
-    enum AVPixelFormat sw_pix_fmt;
-
-    /**
-     * Timebase in which pkt_dts/pts and AVPacket.dts/pts are.
-     * - encoding unused.
-     * - decoding set by user.
-     */
-    AVRational pkt_timebase;
-
-    /**
-     * AVCodecDescriptor
-     * - encoding: unused.
-     * - decoding: set by libavcodec.
-     */
-    const AVCodecDescriptor *codec_descriptor;
-
-    /**
-     * 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
-#define FF_SUB_CHARENC_MODE_IGNORE       2  ///< neither convert the subtitles, nor check them for valid UTF-8
-
-    /**
-     * 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).
-     *
-     * - decoding: set by user
-     * - encoding: unused
-     */
-    int skip_alpha;
-
-    /**
-     * Number of samples to skip after a discontinuity
-     * - decoding: unused
-     * - encoding: set by libavcodec
-     */
-    int seek_preroll;
-
-#if FF_API_DEBUG_MV
-    /**
-     * @deprecated unused
-     */
-    attribute_deprecated
-    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
-     * - encoding: Set by user, can be NULL.
-     * - decoding: unused.
-     */
-    uint16_t *chroma_intra_matrix;
-
-    /**
-     * dump format separator.
-     * can be ", " or "\n      " or anything else
-     * - encoding: Set by user.
-     * - decoding: Set by user.
-     */
-    uint8_t *dump_separator;
-
-    /**
-     * ',' separated list of allowed decoders.
-     * If NULL then all are allowed
-     * - encoding: unused
-     * - decoding: set by user
-     */
-    char *codec_whitelist;
-
-    /**
-     * Properties of the stream that gets decoded
-     * - encoding: unused
-     * - decoding: set by libavcodec
-     */
-    unsigned properties;
-#define FF_CODEC_PROPERTY_LOSSLESS        0x00000001
-#define FF_CODEC_PROPERTY_CLOSED_CAPTIONS 0x00000002
-#define FF_CODEC_PROPERTY_FILM_GRAIN      0x00000004
-
-    /**
-     * Additional data associated with the entire coded stream.
-     *
-     * - decoding: unused
-     * - encoding: may be set by libavcodec after avcodec_open2().
-     */
-    AVPacketSideData *coded_side_data;
-    int            nb_coded_side_data;
-
-    /**
-     * A reference to the AVHWFramesContext describing the input (for encoding)
-     * or output (decoding) frames. The reference is set by the caller and
-     * afterwards owned (and freed) by libavcodec - it should never be read by
-     * the caller after being set.
-     *
-     * - decoding: This field should be set by the caller from the get_format()
-     *             callback. The previous reference (if any) will always be
-     *             unreffed by libavcodec before the get_format() call.
-     *
-     *             If the default get_buffer2() is used with a hwaccel pixel
-     *             format, then this AVHWFramesContext will be used for
-     *             allocating the frame buffers.
-     *
-     * - encoding: For hardware encoders configured to use a hwaccel pixel
-     *             format, this field should be set by the caller to a reference
-     *             to the AVHWFramesContext describing input frames.
-     *             AVHWFramesContext.format must be equal to
-     *             AVCodecContext.pix_fmt.
-     *
-     *             This field should be set before avcodec_open2() is called.
-     */
-    AVBufferRef *hw_frames_ctx;
-
-#if FF_API_SUB_TEXT_FORMAT
-    /**
-     * @deprecated unused
-     */
-    attribute_deprecated
-    int sub_text_format;
-#define FF_SUB_TEXT_FMT_ASS              0
-#endif
-
-    /**
-     * Audio only. The amount of padding (in samples) appended by the encoder to
-     * the end of the audio. I.e. this number of decoded samples must be
-     * discarded by the caller from the end of the stream to get the original
-     * audio without any trailing padding.
-     *
-     * - decoding: unused
-     * - encoding: unused
-     */
-    int trailing_padding;
-
-    /**
-     * The number of pixels per image to maximally accept.
-     *
-     * - decoding: set by user
-     * - encoding: set by user
-     */
-    int64_t max_pixels;
-
-    /**
-     * A reference to the AVHWDeviceContext describing the device which will
-     * be used by a hardware encoder/decoder.  The reference is set by the
-     * caller and afterwards owned (and freed) by libavcodec.
-     *
-     * This should be used if either the codec device does not require
-     * hardware frames or any that are used are to be allocated internally by
-     * libavcodec.  If the user wishes to supply any of the frames used as
-     * encoder input or decoder output then hw_frames_ctx should be used
-     * instead.  When hw_frames_ctx is set in get_format() for a decoder, this
-     * field will be ignored while decoding the associated stream segment, but
-     * may again be used on a following one after another get_format() call.
-     *
-     * For both encoders and decoders this field should be set before
-     * avcodec_open2() is called and must not be written to thereafter.
-     *
-     * Note that some decoders may require this field to be set initially in
-     * order to support hw_frames_ctx at all - in that case, all frames
-     * contexts used must be created on the same device.
-     */
-    AVBufferRef *hw_device_ctx;
-
-    /**
-     * Bit set of AV_HWACCEL_FLAG_* flags, which affect hardware accelerated
-     * decoding (if active).
-     * - encoding: unused
-     * - decoding: Set by user (either before avcodec_open2(), or in the
-     *             AVCodecContext.get_format callback)
-     */
-    int hwaccel_flags;
-
-    /**
-     * Video decoding only. Certain video codecs support cropping, meaning that
-     * only a sub-rectangle of the decoded frame is intended for display.  This
-     * option controls how cropping is handled by libavcodec.
-     *
-     * When set to 1 (the default), libavcodec will apply cropping internally.
-     * I.e. it will modify the output frame width/height fields and offset the
-     * data pointers (only by as much as possible while preserving alignment, or
-     * by the full amount if the AV_CODEC_FLAG_UNALIGNED flag is set) so that
-     * the frames output by the decoder refer only to the cropped area. The
-     * crop_* fields of the output frames will be zero.
-     *
-     * When set to 0, the width/height fields of the output frames will be set
-     * to the coded dimensions and the crop_* fields will describe the cropping
-     * rectangle. Applying the cropping is left to the caller.
-     *
-     * @warning When hardware acceleration with opaque output frames is used,
-     * libavcodec is unable to apply cropping from the top/left border.
-     *
-     * @note when this option is set to zero, the width/height fields of the
-     * AVCodecContext and output AVFrames have different meanings. The codec
-     * context fields store display dimensions (with the coded dimensions in
-     * coded_width/height), while the frame fields store the coded dimensions
-     * (with the display dimensions being determined by the crop_* fields).
-     */
-    int apply_cropping;
-
-    /*
-     * Video decoding only.  Sets the number of extra hardware frames which
-     * the decoder will allocate for use by the caller.  This must be set
-     * before avcodec_open2() is called.
-     *
-     * Some hardware decoders require all frames that they will use for
-     * output to be defined in advance before decoding starts.  For such
-     * decoders, the hardware frame pool must therefore be of a fixed size.
-     * The extra frames set here are on top of any number that the decoder
-     * needs internally in order to operate normally (for example, frames
-     * used as reference pictures).
-     */
-    int extra_hw_frames;
-
-    /**
-     * The percentage of damaged samples to discard a frame.
-     *
-     * - decoding: set by user
-     * - encoding: unused
-     */
-    int discard_damaged_percentage;
-
-    /**
-     * The number of samples per frame to maximally accept.
-     *
-     * - decoding: set by user
-     * - encoding: set by user
-     */
-    int64_t max_samples;
-
-    /**
-     * Bit set of AV_CODEC_EXPORT_DATA_* flags, which affects the kind of
-     * metadata exported in frame, packet, or coded stream side data by
-     * decoders and encoders.
-     *
-     * - decoding: set by user
-     * - encoding: set by user
-     */
-    int export_side_data;
-
-    /**
-     * This callback is called at the beginning of each packet to get a data
-     * buffer for it.
-     *
-     * The following field will be set in the packet before this callback is
-     * called:
-     * - size
-     * This callback must use the above value to calculate the required buffer size,
-     * which must padded by at least AV_INPUT_BUFFER_PADDING_SIZE bytes.
-     *
-     * In some specific cases, the encoder may not use the entire buffer allocated by this
-     * callback. This will be reflected in the size value in the packet once returned by
-     * avcodec_receive_packet().
-     *
-     * This callback must fill the following fields in the packet:
-     * - data: alignment requirements for AVPacket apply, if any. Some architectures and
-     *   encoders may benefit from having aligned data.
-     * - buf: must contain a pointer to an AVBufferRef structure. The packet's
-     *   data pointer must be contained in it. See: av_buffer_create(), av_buffer_alloc(),
-     *   and av_buffer_ref().
-     *
-     * If AV_CODEC_CAP_DR1 is not set then get_encode_buffer() must call
-     * avcodec_default_get_encode_buffer() instead of providing a buffer allocated by
-     * some other means.
-     *
-     * The flags field may contain a combination of AV_GET_ENCODE_BUFFER_FLAG_ flags.
-     * They may be used for example to hint what use the buffer may get after being
-     * created.
-     * Implementations of this callback may ignore flags they don't understand.
-     * If AV_GET_ENCODE_BUFFER_FLAG_REF is set in flags then the packet may be reused
-     * (read and/or written to if it is writable) later by libavcodec.
-     *
-     * This callback must be thread-safe, as when frame threading is used, it may
-     * be called from multiple threads simultaneously.
-     *
-     * @see avcodec_default_get_encode_buffer()
-     *
-     * - encoding: Set by libavcodec, user can override.
-     * - decoding: unused
-     */
-    int (*get_encode_buffer)(struct AVCodecContext *s, AVPacket *pkt, int flags);
-} AVCodecContext;
-
-struct MpegEncContext;
-
-/**
- * @defgroup lavc_hwaccel AVHWAccel
- *
- * @note  Nothing in this structure should be accessed by the user.  At some
- *        point in future it will not be externally visible at all.
- *
- * @{
- */
-typedef struct AVHWAccel {
-    /**
-     * Name of the hardware accelerated codec.
-     * The name is globally unique among encoders and among decoders (but an
-     * encoder and a decoder can share the same name).
-     */
-    const char *name;
-
-    /**
-     * Type of codec implemented by the hardware accelerator.
-     *
-     * See AVMEDIA_TYPE_xxx
-     */
-    enum AVMediaType type;
-
-    /**
-     * Codec implemented by the hardware accelerator.
-     *
-     * See AV_CODEC_ID_xxx
-     */
-    enum AVCodecID id;
-
-    /**
-     * Supported pixel format.
-     *
-     * Only hardware accelerated formats are supported here.
-     */
-    enum AVPixelFormat pix_fmt;
-
-    /**
-     * Hardware accelerated codec capabilities.
-     * see AV_HWACCEL_CODEC_CAP_*
-     */
-    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.
-     *****************************************************************
-     */
-
-    /**
-     * 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
-     * be parsed at this point. This function is mandatory.
-     *
-     * Note that buf can be NULL along with buf_size set to 0.
-     * Otherwise, this means the whole frame is available at this point.
-     *
-     * @param avctx the codec context
-     * @param buf the frame data buffer base
-     * @param buf_size the size of the frame in bytes
-     * @return zero if successful, a negative value otherwise
-     */
-    int (*start_frame)(AVCodecContext *avctx, const uint8_t *buf, uint32_t buf_size);
-
-    /**
-     * Callback for parameter data (SPS/PPS/VPS etc).
-     *
-     * Useful for hardware decoders which keep persistent state about the
-     * video parameters, and need to receive any changes to update that state.
-     *
-     * @param avctx the codec context
-     * @param type the nal unit type
-     * @param buf the nal unit data buffer
-     * @param buf_size the size of the nal unit in bytes
-     * @return zero if successful, a negative value otherwise
-     */
-    int (*decode_params)(AVCodecContext *avctx, int type, const uint8_t *buf, uint32_t buf_size);
-
-    /**
-     * Callback for each slice.
-     *
-     * 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
-     * @param buf_size the size of the slice in bytes
-     * @return zero if successful, a negative value otherwise
-     */
-    int (*decode_slice)(AVCodecContext *avctx, const uint8_t *buf, uint32_t buf_size);
-
-    /**
-     * Called at the end of each frame or field picture.
-     *
-     * The whole picture is parsed at this point and can now be sent
-     * to the hardware accelerator. This function is mandatory.
-     *
-     * @param avctx the codec context
-     * @return zero if successful, a negative value otherwise
-     */
-    int (*end_frame)(AVCodecContext *avctx);
-
-    /**
-     * 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_reconstruct_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;
-
-    /**
-     * Internal hwaccel capabilities.
-     */
-    int caps_internal;
-
-    /**
-     * Fill the given hw_frames context with current codec parameters. Called
-     * from get_format. Refer to avcodec_get_hw_frames_parameters() for
-     * details.
-     *
-     * This CAN be called before AVHWAccel.init is called, and you must assume
-     * that avctx->hwaccel_priv_data is invalid.
-     */
-    int (*frame_params)(AVCodecContext *avctx, AVBufferRef *hw_frames_ctx);
-} AVHWAccel;
-
-/**
- * HWAccel is experimental and is thus avoided in favor of non experimental
- * codecs
- */
-#define AV_HWACCEL_CODEC_CAP_EXPERIMENTAL 0x0200
-
-/**
- * Hardware acceleration should be used for decoding even if the codec level
- * used is unknown or higher than the maximum supported level reported by the
- * hardware driver.
- *
- * It's generally a good idea to pass this flag unless you have a specific
- * reason not to, as hardware tends to under-report supported levels.
- */
-#define AV_HWACCEL_FLAG_IGNORE_LEVEL (1 << 0)
-
-/**
- * Hardware acceleration can output YUV pixel formats with a different chroma
- * sampling than 4:2:0 and/or other than 8 bits per component.
- */
-#define AV_HWACCEL_FLAG_ALLOW_HIGH_DEPTH (1 << 1)
-
-/**
- * Hardware acceleration should still be attempted for decoding when the
- * codec profile does not match the reported capabilities of the hardware.
- *
- * For example, this can be used to try to decode baseline profile H.264
- * streams in hardware - it will often succeed, because many streams marked
- * as baseline profile actually conform to constrained baseline profile.
- *
- * @warning If the stream is actually not supported then the behaviour is
- *          undefined, and may include returning entirely incorrect output
- *          while indicating success.
- */
-#define AV_HWACCEL_FLAG_ALLOW_PROFILE_MISMATCH (1 << 2)
-
-/**
- * @}
- */
-
-enum AVSubtitleType {
-    SUBTITLE_NONE,
-
-    SUBTITLE_BITMAP,                ///< A bitmap, pict will be set
-
-    /**
-     * Plain text, the text field must be set by the decoder and is
-     * authoritative. ass and pict fields may contain approximations.
-     */
-    SUBTITLE_TEXT,
-
-    /**
-     * Formatted text, the ass field must be set by the decoder and is
-     * authoritative. pict and text fields may contain approximations.
-     */
-    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
-    int w;         ///< width            of pict, undefined when pict is not set
-    int h;         ///< height           of pict, undefined when pict is not set
-    int nb_colors; ///< number of colors in pict, undefined when pict is not set
-
-    /**
-     * data+linesize for the bitmap of this subtitle.
-     * Can be set for text/ass as well once they are rendered.
-     */
-    uint8_t *data4;
-    int linesize4;
-
-    enum AVSubtitleType type;
-
-    char *text;                     ///< 0 terminated plain UTF-8 text
-
-    /**
-     * 0 terminated ASS/SSA compatible event line.
-     * The presentation of this is unaffected by the other values in this
-     * struct.
-     */
-    char *ass;
-
-    int flags;
-} AVSubtitleRect;
-
-typedef struct AVSubtitle {
-    uint16_t format; /* 0 = graphics */
-    uint32_t start_display_time; /* relative to packet pts, in ms */
-    uint32_t end_display_time; /* relative to packet pts, in ms */
-    unsigned num_rects;
-    AVSubtitleRect **rects;
-    int64_t pts;    ///< Same as packet pts, in AV_TIME_BASE
-} AVSubtitle;
-
-/**
- * Return the LIBAVCODEC_VERSION_INT constant.
- */
-unsigned avcodec_version(void);
-
-/**
- * Return the libavcodec build-time configuration.
- */
-const char *avcodec_configuration(void);
-
-/**
- * Return the libavcodec license.
- */
-const char *avcodec_license(void);
-
-/**
- * Allocate an AVCodecContext and set its fields to default values. The
- * resulting struct should be freed with avcodec_free_context().
- *
- * @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.
- */
-AVCodecContext *avcodec_alloc_context3(const AVCodec *codec);
-
-/**
- * Free the codec context and everything associated with it and write NULL to
- * the provided pointer.
- */
-void avcodec_free_context(AVCodecContext **avctx);
-
-/**
- * Get the AVClass for AVCodecContext. It can be used in combination with
- * AV_OPT_SEARCH_FAKE_OBJ for examining options.
- *
- * @see av_opt_find().
- */
-const AVClass *avcodec_get_class(void);
-
-#if FF_API_GET_FRAME_CLASS
-/**
- * @deprecated This function should not be used.
- */
-attribute_deprecated
-const AVClass *avcodec_get_frame_class(void);
-#endif
-
-/**
- * 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);
-
-/**
- * Fill the parameters struct based on the values from the supplied codec
- * context. Any allocated fields in par are freed and replaced with duplicates
- * of the corresponding fields in codec.
- *
- * @return >= 0 on success, a negative AVERROR code on failure
- */
-int avcodec_parameters_from_context(AVCodecParameters *par,
-                                    const AVCodecContext *codec);
-
-/**
- * Fill the codec context based on the values from the supplied codec
- * parameters. Any allocated fields in codec that have a corresponding field in
- * par are freed and replaced with duplicates of the corresponding field in par.
- * Fields in codec that do not have a counterpart in par are not touched.
- *
- * @return >= 0 on success, a negative AVERROR code on failure.
- */
-int avcodec_parameters_to_context(AVCodecContext *codec,
-                                  const AVCodecParameters *par);
-
-/**
- * Initialize the AVCodecContext to use the given AVCodec. Prior to using this
- * function the context has to be allocated with avcodec_alloc_context3().
- *
- * 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!
- *
- * @note Always call this function before using decoding routines (such as
- * @ref avcodec_receive_frame()).
- *
- * @code
- * 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
- *              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().
- */
-int avcodec_open2(AVCodecContext *avctx, const AVCodec *codec, AVDictionary **options);
-
-/**
- * Close a given AVCodecContext and free all the data associated with it
- * (but not the AVCodecContext itself).
- *
- * Calling this function on an AVCodecContext that hasn't been opened will free
- * the codec-specific data allocated in avcodec_alloc_context3() with a non-NULL
- * codec. Subsequent calls will do nothing.
- *
- * @note Do not use this function. Use avcodec_free_context() to destroy a
- * codec context (either open or closed). Opening and closing a codec context
- * multiple times is not supported anymore -- use multiple codec contexts
- * instead.
- */
-int avcodec_close(AVCodecContext *avctx);
-
-/**
- * Free all allocated data in the given subtitle struct.
- *
- * @param sub AVSubtitle to free.
- */
-void avsubtitle_free(AVSubtitle *sub);
-
-/**
- * @}
- */
-
-/**
- * @addtogroup lavc_decoding
- * @{
- */
-
-/**
- * The default callback for AVCodecContext.get_buffer2(). It is made public so
- * it can be called by custom get_buffer2() implementations for decoders without
- * AV_CODEC_CAP_DR1 set.
- */
-int avcodec_default_get_buffer2(AVCodecContext *s, AVFrame *frame, int flags);
-
-/**
- * The default callback for AVCodecContext.get_encode_buffer(). It is made public so
- * it can be called by custom get_encode_buffer() implementations for encoders without
- * AV_CODEC_CAP_DR1 set.
- */
-int avcodec_default_get_encode_buffer(AVCodecContext *s, AVPacket *pkt, int flags);
-
-/**
- * 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 AV_CODEC_CAP_DR1 has been opened.
- */
-void avcodec_align_dimensions(AVCodecContext *s, int *width, int *height);
-
-/**
- * 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_aligni.
- *
- * May only be used if a codec with AV_CODEC_CAP_DR1 has been opened.
- */
-void avcodec_align_dimensions2(AVCodecContext *s, int *width, int *height,
-                               int linesize_alignAV_NUM_DATA_POINTERS);
-
-/**
- * Converts AVChromaLocation to swscale x/y chroma position.
- *
- * 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_enum_to_chroma_pos(int *xpos, int *ypos, enum AVChromaLocation pos);
-
-/**
- * Converts swscale x/y chroma position to AVChromaLocation.
- *
- * 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
- */
-enum AVChromaLocation avcodec_chroma_pos_to_enum(int xpos, int ypos);
-
-/**
- * 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 AV_CODEC_CAP_DR1 is not available for subtitle codecs. This is for
- * simplicity, because the performance difference is expected 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 AV_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 AV_CODEC_CAP_DELAY, then no subtitles will be returned.
- *
- * @note The AVCodecContext MUST have been opened with @ref avcodec_open2()
- * before packets may be fed to the decoder.
- *
- * @param avctx the codec context
- * @paramout sub The preallocated AVSubtitle in which the decoded subtitle will be stored,
- *                 must be freed with avsubtitle_free if *got_sub_ptr is set.
- * @paramin,out got_sub_ptr Zero if no subtitle could be decompressed, otherwise, it is nonzero.
- * @paramin avpkt The input AVPacket containing the input buffer.
- */
-int avcodec_decode_subtitle2(AVCodecContext *avctx, AVSubtitle *sub,
-                            int *got_sub_ptr,
-                            AVPacket *avpkt);
-
-/**
- * Supply raw packet data as input to a decoder.
- *
- * Internally, this call will copy relevant AVCodecContext fields, which can
- * influence decoding per-packet, and apply them when the packet is actually
- * decoded. (For example AVCodecContext.skip_frame, which might direct the
- * decoder to drop the frame contained by the packet sent with this function.)
- *
- * @warning The input buffer, avpkt->data must be AV_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.
- *
- * @note The AVCodecContext MUST have been opened with @ref avcodec_open2()
- *       before packets may be fed to the decoder.
- *
- * @param avctx codec context
- * @paramin avpkt The input AVPacket. Usually, this will be a single video
- *                  frame, or several complete audio frames.
- *                  Ownership of the packet remains with the caller, and the
- *                  decoder will not write to the packet. The decoder may create
- *                  a reference to the packet data (or copy it if the packet is
- *                  not reference-counted).
- *                  Unlike with older APIs, the packet is always fully consumed,
- *                  and if it contains multiple frames (e.g. some audio codecs),
- *                  will require you to call avcodec_receive_frame() multiple
- *                  times afterwards before you can send a new packet.
- *                  It can be NULL (or an AVPacket with data set to NULL and
- *                  size set to 0); in this case, it is considered a flush
- *                  packet, which signals the end of the stream. Sending the
- *                  first flush packet will return success. Subsequent ones are
- *                  unnecessary and will return AVERROR_EOF. If the decoder
- *                  still has frames buffered, it will return them after sending
- *                  a flush packet.
- *
- * @return 0 on success, otherwise negative error code:
- *      AVERROR(EAGAIN):   input is not accepted in the current state - user
- *                         must read output with avcodec_receive_frame() (once
- *                         all output is read, the packet should be resent, and
- *                         the call will not fail with EAGAIN).
- *      AVERROR_EOF:       the decoder has been flushed, and no new packets can
- *                         be sent to it (also returned if more than 1 flush
- *                         packet is sent)
- *      AVERROR(EINVAL):   codec not opened, it is an encoder, or requires flush
- *      AVERROR(ENOMEM):   failed to add packet to internal queue, or similar
- *      other errors: legitimate decoding errors
- */
-int avcodec_send_packet(AVCodecContext *avctx, const AVPacket *avpkt);
-
-/**
- * Return decoded output data from a decoder.
- *
- * @param avctx codec context
- * @param frame This will be set to a reference-counted video or audio
- *              frame (depending on the decoder type) allocated by the
- *              decoder. Note that the function will always call
- *              av_frame_unref(frame) before doing anything else.
- *
- * @return
- *      0:                 success, a frame was returned
- *      AVERROR(EAGAIN):   output is not available in this state - user must try
- *                         to send new input
- *      AVERROR_EOF:       the decoder has been fully flushed, and there will be
- *                         no more output frames
- *      AVERROR(EINVAL):   codec not opened, or it is an encoder
- *      AVERROR_INPUT_CHANGED:   current decoded frame has changed parameters
- *                               with respect to first decoded frame. Applicable
- *                               when flag AV_CODEC_FLAG_DROPCHANGED is set.
- *      other negative values: legitimate decoding errors
- */
-int avcodec_receive_frame(AVCodecContext *avctx, AVFrame *frame);
-
-/**
- * Supply a raw video or audio frame to the encoder. Use avcodec_receive_packet()
- * to retrieve buffered output packets.
- *
- * @param avctx     codec context
- * @paramin frame AVFrame containing the raw audio or video frame to be encoded.
- *                  Ownership of the frame remains with the caller, and the
- *                  encoder will not write to the frame. The encoder may create
- *                  a reference to the frame data (or copy it if the frame is
- *                  not reference-counted).
- *                  It can be NULL, in which case it is considered a flush
- *                  packet.  This signals the end of the stream. If the encoder
- *                  still has packets buffered, it will return them after this
- *                  call. Once flushing mode has been entered, additional flush
- *                  packets are ignored, and sending frames will return
- *                  AVERROR_EOF.
- *
- *                  For audio:
- *                  If AV_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.
- * @return 0 on success, otherwise negative error code:
- *      AVERROR(EAGAIN):   input is not accepted in the current state - user
- *                         must read output with avcodec_receive_packet() (once
- *                         all output is read, the packet should be resent, and
- *                         the call will not fail with EAGAIN).
- *      AVERROR_EOF:       the encoder has been flushed, and no new frames can
- *                         be sent to it
- *      AVERROR(EINVAL):   codec not opened, it is a decoder, or requires flush
- *      AVERROR(ENOMEM):   failed to add packet to internal queue, or similar
- *      other errors: legitimate encoding errors
- */
-int avcodec_send_frame(AVCodecContext *avctx, const AVFrame *frame);
-
-/**
- * Read encoded data from the encoder.
- *
- * @param avctx codec context
- * @param avpkt This will be set to a reference-counted packet allocated by the
- *              encoder. Note that the function will always call
- *              av_packet_unref(avpkt) before doing anything else.
- * @return 0 on success, otherwise negative error code:
- *      AVERROR(EAGAIN):   output is not available in the current state - user
- *                         must try to send input
- *      AVERROR_EOF:       the encoder has been fully flushed, and there will be
- *                         no more output packets
- *      AVERROR(EINVAL):   codec not opened, or it is a decoder
- *      other errors: legitimate encoding errors
- */
-int avcodec_receive_packet(AVCodecContext *avctx, AVPacket *avpkt);
-
-/**
- * Create and return a AVHWFramesContext with values adequate for hardware
- * decoding. This is meant to get called from the get_format callback, and is
- * a helper for preparing a AVHWFramesContext for AVCodecContext.hw_frames_ctx.
- * This API is for decoding with certain hardware acceleration modes/APIs only.
- *
- * The returned AVHWFramesContext is not initialized. The caller must do this
- * with av_hwframe_ctx_init().
- *
- * Calling this function is not a requirement, but makes it simpler to avoid
- * codec or hardware API specific details when manually allocating frames.
- *
- * Alternatively to this, an API user can set AVCodecContext.hw_device_ctx,
- * which sets up AVCodecContext.hw_frames_ctx fully automatically, and makes
- * it unnecessary to call this function or having to care about
- * AVHWFramesContext initialization at all.
- *
- * There are a number of requirements for calling this function:
- *
- * - It must be called from get_format with the same avctx parameter that was
- *   passed to get_format. Calling it outside of get_format is not allowed, and
- *   can trigger undefined behavior.
- * - The function is not always supported (see description of return values).
- *   Even if this function returns successfully, hwaccel initialization could
- *   fail later. (The degree to which implementations check whether the stream
- *   is actually supported varies. Some do this check only after the user's
- *   get_format callback returns.)
- * - The hw_pix_fmt must be one of the choices suggested by get_format. If the
- *   user decides to use a AVHWFramesContext prepared with this API function,
- *   the user must return the same hw_pix_fmt from get_format.
- * - The device_ref passed to this function must support the given hw_pix_fmt.
- * - After calling this API function, it is the user's responsibility to
- *   initialize the AVHWFramesContext (returned by the out_frames_ref parameter),
- *   and to set AVCodecContext.hw_frames_ctx to it. If done, this must be done
- *   before returning from get_format (this is implied by the normal
- *   AVCodecContext.hw_frames_ctx API rules).
- * - The AVHWFramesContext parameters may change every time time get_format is
- *   called. Also, AVCodecContext.hw_frames_ctx is reset before get_format. So
- *   you are inherently required to go through this process again on every
- *   get_format call.
- * - It is perfectly possible to call this function without actually using
- *   the resulting AVHWFramesContext. One use-case might be trying to reuse a
- *   previously initialized AVHWFramesContext, and calling this API function
- *   only to test whether the required frame parameters have changed.
- * - Fields that use dynamically allocated values of any kind must not be set
- *   by the user unless setting them is explicitly allowed by the documentation.
- *   If the user sets AVHWFramesContext.free and AVHWFramesContext.user_opaque,
- *   the new free callback must call the potentially set previous free callback.
- *   This API call may set any dynamically allocated fields, including the free
- *   callback.
- *
- * The function will set at least the following fields on AVHWFramesContext
- * (potentially more, depending on hwaccel API):
- *
- * - All fields set by av_hwframe_ctx_alloc().
- * - Set the format field to hw_pix_fmt.
- * - Set the sw_format field to the most suited and most versatile format. (An
- *   implication is that this will prefer generic formats over opaque formats
- *   with arbitrary restrictions, if possible.)
- * - Set the width/height fields to the coded frame size, rounded up to the
- *   API-specific minimum alignment.
- * - Only _if_ the hwaccel requires a pre-allocated pool: set the initial_pool_size
- *   field to the number of maximum reference surfaces possible with the codec,
- *   plus 1 surface for the user to work (meaning the user can safely reference
- *   at most 1 decoded surface at a time), plus additional buffering introduced
- *   by frame threading. If the hwaccel does not require pre-allocation, the
- *   field is left to 0, and the decoder will allocate new surfaces on demand
- *   during decoding.
- * - Possibly AVHWFramesContext.hwctx fields, depending on the underlying
- *   hardware API.
- *
- * Essentially, out_frames_ref returns the same as av_hwframe_ctx_alloc(), but
- * with basic frame parameters set.
- *
- * The function is stateless, and does not change the AVCodecContext or the
- * device_ref AVHWDeviceContext.
- *
- * @param avctx The context which is currently calling get_format, and which
- *              implicitly contains all state needed for filling the returned
- *              AVHWFramesContext properly.
- * @param device_ref A reference to the AVHWDeviceContext describing the device
- *                   which will be used by the hardware decoder.
- * @param hw_pix_fmt The hwaccel format you are going to return from get_format.
- * @param out_frames_ref On success, set to a reference to an _uninitialized_
- *                       AVHWFramesContext, created from the given device_ref.
- *                       Fields will be set to values required for decoding.
- *                       Not changed if an error is returned.
- * @return zero on success, a negative value on error. The following error codes
- *         have special semantics:
- *      AVERROR(ENOENT): the decoder does not support this functionality. Setup
- *                       is always manual, or it is a decoder which does not
- *                       support setting AVCodecContext.hw_frames_ctx at all,
- *                       or it is a software format.
- *      AVERROR(EINVAL): it is known that hardware decoding is not supported for
- *                       this configuration, or the device_ref is not supported
- *                       for the hwaccel referenced by hw_pix_fmt.
- */
-int avcodec_get_hw_frames_parameters(AVCodecContext *avctx,
-                                     AVBufferRef *device_ref,
-                                     enum AVPixelFormat hw_pix_fmt,
-                                     AVBufferRef **out_frames_ref);
-
-
-
-/**
- * @defgroup lavc_parsing Frame parsing
- * @{
- */
-
-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
-};
-
-typedef struct AVCodecParserContext {
-    void *priv_data;
-    const struct AVCodecParser *parser;
-    int64_t frame_offset; /* offset of the current frame */
-    int64_t cur_offset; /* current offset
-                           (incremented by each av_parser_parse()) */
-    int64_t next_frame_offset; /* offset of the next frame */
-    /* video info */
-    int pict_type; /* XXX: Put it back in AVCodecContext. */
-    /**
-     * This field is used for proper frame duration computation in lavf.
-     * It signals, how much longer the frame duration of the current frame
-     * is compared to normal frame duration.
-     *
-     * frame_duration = (1 + repeat_pict) * time_base
-     *
-     * It is used by codecs like H.264 to display telecined material.
-     */
-    int repeat_pict; /* XXX: Put it back in AVCodecContext. */
-    int64_t pts;     /* pts of the current frame */
-    int64_t dts;     /* dts of the current frame */
-
-    /* private data */
-    int64_t last_pts;
-    int64_t last_dts;
-    int fetch_timestamp;
-
-#define AV_PARSER_PTS_NB 4
-    int cur_frame_start_index;
-    int64_t cur_frame_offsetAV_PARSER_PTS_NB;
-    int64_t cur_frame_ptsAV_PARSER_PTS_NB;
-    int64_t cur_frame_dtsAV_PARSER_PTS_NB;
-
-    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_endAV_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 AV_PICTURE_TYPE_I picture type as key frames
-     * will be used.
-     */
-    int key_frame;
-
-    // Timestamp generation support:
-    /**
-     * Synchronization point for start of timestamp generation.
-     *
-     * Set to >0 for sync point, 0 for no sync point and <0 for undefined
-     * (default).
-     *
-     * For example, this corresponds to presence of H.264 buffering period
-     * SEI message.
-     */
-    int dts_sync_point;
-
-    /**
-     * Offset of the current timestamp against last timestamp sync point in
-     * units of AVCodecContext.time_base.
-     *
-     * Set to INT_MIN when dts_sync_point unused. Otherwise, it must
-     * contain a valid timestamp offset.
-     *
-     * Note that the timestamp of sync point has usually a nonzero
-     * dts_ref_dts_delta, which refers to the previous sync point. Offset of
-     * the next frame after timestamp sync point will be usually 1.
-     *
-     * For example, this corresponds to H.264 cpb_removal_delay.
-     */
-    int dts_ref_dts_delta;
-
-    /**
-     * Presentation delay of current frame in units of AVCodecContext.time_base.
-     *
-     * Set to INT_MIN when dts_sync_point unused. Otherwise, it must
-     * contain valid non-negative timestamp delta (presentation time of a frame
-     * must not lie in the past).
-     *
-     * This delay represents the difference between decoding and presentation
-     * time of the frame.
-     *
-     * For example, this corresponds to H.264 dpb_output_delay.
-     */
-    int pts_dts_delta;
-
-    /**
-     * Position of the packet in file.
-     *
-     * Analogous to cur_frame_pts/dts
-     */
-    int64_t cur_frame_posAV_PARSER_PTS_NB;
-
-    /**
-     * Byte position of currently parsed frame in stream.
-     */
-    int64_t pos;
-
-    /**
-     * 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;
-
-    /**
-     * Dimensions of the decoded video intended for presentation.
-     */
-    int width;
-    int height;
-
-    /**
-     * Dimensions of the coded video.
-     */
-    int coded_width;
-    int coded_height;
-
-    /**
-     * The format of the coded data, corresponds to enum AVPixelFormat for video
-     * and for enum AVSampleFormat for audio.
-     *
-     * Note that a decoder can have considerable freedom in how exactly it
-     * decodes the data, so the format reported here might be different from the
-     * one returned by a decoder.
-     */
-    int format;
-} AVCodecParserContext;
-
-typedef struct AVCodecParser {
-    int codec_ids7; /* several codec IDs are permitted */
-    int priv_data_size;
-    int (*parser_init)(AVCodecParserContext *s);
-    /* This callback never returns an error, a negative value means that
-     * the frame start was in a previous packet. */
-    int (*parser_parse)(AVCodecParserContext *s,
-                        AVCodecContext *avctx,
-                        const uint8_t **poutbuf, int *poutbuf_size,
-                        const uint8_t *buf, int buf_size);
-    void (*parser_close)(AVCodecParserContext *s);
-    int (*split)(AVCodecContext *avctx, const uint8_t *buf, int buf_size);
-} AVCodecParser;
-
-/**
- * Iterate over all registered codec parsers.
- *
- * @param opaque a pointer where libavcodec will store the iteration state. Must
- *               point to NULL to start the iteration.
- *
- * @return the next registered codec parser or NULL when the iteration is
- *         finished
- */
-const AVCodecParser *av_parser_iterate(void **opaque);
-
-AVCodecParserContext *av_parser_init(int codec_id);
-
-/**
- * Parse a packet.
- *
- * @param s             parser context.
- * @param avctx         codec context.
- * @param poutbuf       set to pointer to parsed buffer or NULL if not yet finished.
- * @param poutbuf_size  set to size of parsed buffer or zero if not yet finished.
- * @param buf           input buffer.
- * @param buf_size      buffer size in bytes without the padding. I.e. the full buffer
-                        size is assumed to be buf_size + AV_INPUT_BUFFER_PADDING_SIZE.
-                        To signal EOF, this should be 0 (so that the last frame
-                        can be output).
- * @param pts           input presentation timestamp.
- * @param dts           input decoding timestamp.
- * @param pos           input byte position in stream.
- * @return the number of bytes of the input bitstream used.
- *
- * Example:
- * @code
- *   while(in_len){
- *       len = av_parser_parse2(myparser, AVCodecContext, &data, &size,
- *                                        in_data, in_len,
- *                                        pts, dts, pos);
- *       in_data += len;
- *       in_len  -= len;
- *
- *       if(size)
- *          decode_frame(data, size);
- *   }
- * @endcode
- */
-int av_parser_parse2(AVCodecParserContext *s,
-                     AVCodecContext *avctx,
-                     uint8_t **poutbuf, int *poutbuf_size,
-                     const uint8_t *buf, int buf_size,
-                     int64_t pts, int64_t dts,
-                     int64_t pos);
-
-void av_parser_close(AVCodecParserContext *s);
-
-/**
- * @}
- * @}
- */
-
-/**
- * @addtogroup lavc_encoding
- * @{
- */
-
-int avcodec_encode_subtitle(AVCodecContext *avctx, uint8_t *buf, int buf_size,
-                            const AVSubtitle *sub);
-
-
-/**
- * @}
- */
-
-/**
- * @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.
- * @{
- */
-
-/**
- * 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);
-
-/**
- * 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.
- *
- *
- * @paramin pix_fmt_list AV_PIX_FMT_NONE terminated array of pixel formats to choose from
- * @paramin src_pix_fmt source pixel format
- * @paramin has_alpha Whether the source pixel format alpha channel is used.
- * @paramout 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);
-
-enum AVPixelFormat avcodec_default_get_format(struct AVCodecContext *s, const enum AVPixelFormat * fmt);
-
-/**
- * @}
- */
-
-void avcodec_string(char *buf, int buf_size, AVCodecContext *enc, int encode);
-
-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->linesize0.
- * @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 codec state / flush internal buffers. Should be called
- * e.g. when seeking or when switching to a different stream.
- *
- * @note for decoders, this function just releases any references the decoder
- * might keep internally, but the caller's references remain valid.
- *
- * @note for encoders, this function will only do something if the encoder
- * declares support for AV_CODEC_CAP_ENCODER_FLUSH. When called, the encoder
- * will drain any remaining packets, and can then be re-used for a different
- * stream (as opposed to sending a null frame which will leave the encoder
- * in a permanent EOF state after draining). This can be desirable if the
- * cost of tearing down and replacing the encoder instance is high.
- */
-void avcodec_flush_buffers(AVCodecContext *avctx);
-
-/**
- * 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);
-
-/* memory */
-
-/**
- * Same behaviour av_fast_malloc but the buffer has additional
- * AV_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.
- */
-void av_fast_padded_malloc(void *ptr, unsigned int *size, size_t min_size);
-
-/**
- * Same behaviour av_fast_padded_malloc except that buffer will always
- * be 0-initialized after call.
- */
-void av_fast_padded_mallocz(void *ptr, unsigned int *size, size_t min_size);
-
-/**
- * @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);
-
-/**
- * @}
- */
-
-#endif /* AVCODEC_AVCODEC_H */

gpac-2.2.1.tar.gz/extra_lib/include/libavcodec/avdct.h Deleted

@@ -1,88 +0,0 @@
-/*
- * 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_AVDCT_H
-#define AVCODEC_AVDCT_H
-
-#include "libavutil/opt.h"
-
-/**
- * AVDCT context.
- * @note function pointers can be NULL if the specific features have been
- *       disabled at build time.
- */
-typedef struct AVDCT {
-    const AVClass *av_class;
-
-    void (*idct)(int16_t *block /* align 16 */);
-
-    /**
-     * IDCT input permutation.
-     * Several optimized IDCTs need a permutated input (relative to the
-     * normal order of the reference IDCT).
-     * This permutation must be performed before the idct_put/add.
-     * Note, normally this can be merged with the zigzag/alternate scan<br>
-     * An example to avoid confusion:
-     * - (->decode coeffs -> zigzag reorder -> dequant -> reference IDCT -> ...)
-     * - (x -> reference DCT -> reference IDCT -> x)
-     * - (x -> reference DCT -> simple_mmx_perm = idct_permutation
-     *    -> simple_idct_mmx -> x)
-     * - (-> decode coeffs -> zigzag reorder -> simple_mmx_perm -> dequant
-     *    -> simple_idct_mmx -> ...)
-     */
-    uint8_t idct_permutation64;
-
-    void (*fdct)(int16_t *block /* align 16 */);
-
-
-    /**
-     * DCT algorithm.
-     * must use AVOptions to set this field.
-     */
-    int dct_algo;
-
-    /**
-     * IDCT algorithm.
-     * must use AVOptions to set this field.
-     */
-    int idct_algo;
-
-    void (*get_pixels)(int16_t *block /* align 16 */,
-                       const uint8_t *pixels /* align 8 */,
-                       ptrdiff_t line_size);
-
-    int bits_per_sample;
-
-    void (*get_pixels_unaligned)(int16_t *block /* align 16 */,
-                       const uint8_t *pixels,
-                       ptrdiff_t line_size);
-} AVDCT;
-
-/**
- * Allocates a AVDCT context.
- * This needs to be initialized with avcodec_dct_init() after optionally
- * configuring it with AVOptions.
- *
- * To free it use av_free()
- */
-AVDCT *avcodec_dct_alloc(void);
-int avcodec_dct_init(AVDCT *);
-
-const AVClass *avcodec_dct_get_class(void);
-
-#endif /* AVCODEC_AVDCT_H */

gpac-2.2.1.tar.gz/extra_lib/include/libavcodec/avfft.h Deleted

@@ -1,118 +0,0 @@
-/*
- * 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-2.2.1.tar.gz/extra_lib/include/libavcodec/bsf.h Deleted

@@ -1,317 +0,0 @@
-/*
- * Bitstream filters public API
- *
- * 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_BSF_H
-#define AVCODEC_BSF_H
-
-#include "libavutil/dict.h"
-#include "libavutil/log.h"
-#include "libavutil/rational.h"
-
-#include "codec_id.h"
-#include "codec_par.h"
-#include "packet.h"
-
-/**
- * @addtogroup lavc_core
- * @{
- */
-
-/**
- * The bitstream filter state.
- *
- * This struct must be allocated with av_bsf_alloc() and freed with
- * av_bsf_free().
- *
- * The fields in the struct will only be changed (by the caller or by the
- * filter) as described in their documentation, and are to be considered
- * immutable otherwise.
- */
-typedef struct AVBSFContext {
-    /**
-     * A class for logging and AVOptions
-     */
-    const AVClass *av_class;
-
-    /**
-     * The bitstream filter this context is an instance of.
-     */
-    const struct AVBitStreamFilter *filter;
-
-    /**
-     * Opaque filter-specific private data. If filter->priv_class is non-NULL,
-     * this is an AVOptions-enabled struct.
-     */
-    void *priv_data;
-
-    /**
-     * Parameters of the input stream. This field is allocated in
-     * av_bsf_alloc(), it needs to be filled by the caller before
-     * av_bsf_init().
-     */
-    AVCodecParameters *par_in;
-
-    /**
-     * Parameters of the output stream. This field is allocated in
-     * av_bsf_alloc(), it is set by the filter in av_bsf_init().
-     */
-    AVCodecParameters *par_out;
-
-    /**
-     * The timebase used for the timestamps of the input packets. Set by the
-     * caller before av_bsf_init().
-     */
-    AVRational time_base_in;
-
-    /**
-     * The timebase used for the timestamps of the output packets. Set by the
-     * filter in av_bsf_init().
-     */
-    AVRational time_base_out;
-} AVBSFContext;
-
-typedef struct AVBitStreamFilter {
-    const char *name;
-
-    /**
-     * A list of codec ids supported by the filter, terminated by
-     * AV_CODEC_ID_NONE.
-     * May be NULL, in that case the bitstream filter works with any codec id.
-     */
-    const enum AVCodecID *codec_ids;
-
-    /**
-     * A class for the private data, used to declare bitstream filter private
-     * AVOptions. This field is NULL for bitstream filters that do not declare
-     * any options.
-     *
-     * If this field is non-NULL, the first member of the filter private data
-     * must be a pointer to AVClass, which will be set by libavcodec generic
-     * code to this class.
-     */
-    const AVClass *priv_class;
-
-    /*****************************************************************
-     * 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;
-    int (*init)(AVBSFContext *ctx);
-    int (*filter)(AVBSFContext *ctx, AVPacket *pkt);
-    void (*close)(AVBSFContext *ctx);
-    void (*flush)(AVBSFContext *ctx);
-} AVBitStreamFilter;
-
-/**
- * @return a bitstream filter with the specified name or NULL if no such
- *         bitstream filter exists.
- */
-const AVBitStreamFilter *av_bsf_get_by_name(const char *name);
-
-/**
- * Iterate over all registered bitstream filters.
- *
- * @param opaque a pointer where libavcodec will store the iteration state. Must
- *               point to NULL to start the iteration.
- *
- * @return the next registered bitstream filter or NULL when the iteration is
- *         finished
- */
-const AVBitStreamFilter *av_bsf_iterate(void **opaque);
-
-/**
- * Allocate a context for a given bitstream filter. The caller must fill in the
- * context parameters as described in the documentation and then call
- * av_bsf_init() before sending any data to the filter.
- *
- * @param filter the filter for which to allocate an instance.
- * @param ctx a pointer into which the pointer to the newly-allocated context
- *            will be written. It must be freed with av_bsf_free() after the
- *            filtering is done.
- *
- * @return 0 on success, a negative AVERROR code on failure
- */
-int av_bsf_alloc(const AVBitStreamFilter *filter, AVBSFContext **ctx);
-
-/**
- * Prepare the filter for use, after all the parameters and options have been
- * set.
- */
-int av_bsf_init(AVBSFContext *ctx);
-
-/**
- * Submit a packet for filtering.
- *
- * After sending each packet, the filter must be completely drained by calling
- * av_bsf_receive_packet() repeatedly until it returns AVERROR(EAGAIN) or
- * AVERROR_EOF.
- *
- * @param pkt the packet to filter. The bitstream filter will take ownership of
- * the packet and reset the contents of pkt. pkt is not touched if an error occurs.
- * If pkt is empty (i.e. NULL, or pkt->data is NULL and pkt->side_data_elems zero),
- * it signals the end of the stream (i.e. no more non-empty packets will be sent;
- * sending more empty packets does nothing) and will cause the filter to output
- * any packets it may have buffered internally.
- *
- * @return 0 on success. AVERROR(EAGAIN) if packets need to be retrieved from the
- * filter (using av_bsf_receive_packet()) before new input can be consumed. Another
- * negative AVERROR value if an error occurs.
- */
-int av_bsf_send_packet(AVBSFContext *ctx, AVPacket *pkt);
-
-/**
- * Retrieve a filtered packet.
- *
- * @paramout pkt this struct will be filled with the contents of the filtered
- *                 packet. It is owned by the caller and must be freed using
- *                 av_packet_unref() when it is no longer needed.
- *                 This parameter should be "clean" (i.e. freshly allocated
- *                 with av_packet_alloc() or unreffed with av_packet_unref())
- *                 when this function is called. If this function returns
- *                 successfully, the contents of pkt will be completely
- *                 overwritten by the returned data. On failure, pkt is not
- *                 touched.
- *
- * @return 0 on success. AVERROR(EAGAIN) if more packets need to be sent to the
- * filter (using av_bsf_send_packet()) to get more output. AVERROR_EOF if there
- * will be no further output from the filter. Another negative AVERROR value if
- * an error occurs.
- *
- * @note one input packet may result in several output packets, so after sending
- * a packet with av_bsf_send_packet(), this function needs to be called
- * repeatedly until it stops returning 0. It is also possible for a filter to
- * output fewer packets than were sent to it, so this function may return
- * AVERROR(EAGAIN) immediately after a successful av_bsf_send_packet() call.
- */
-int av_bsf_receive_packet(AVBSFContext *ctx, AVPacket *pkt);
-
-/**
- * Reset the internal bitstream filter state. Should be called e.g. when seeking.
- */
-void av_bsf_flush(AVBSFContext *ctx);
-
-/**
- * Free a bitstream filter context and everything associated with it; write NULL
- * into the supplied pointer.
- */
-void av_bsf_free(AVBSFContext **ctx);
-
-/**
- * Get the AVClass for AVBSFContext. It can be used in combination with
- * AV_OPT_SEARCH_FAKE_OBJ for examining options.
- *
- * @see av_opt_find().
- */
-const AVClass *av_bsf_get_class(void);
-
-/**
- * Structure for chain/list of bitstream filters.
- * Empty list can be allocated by av_bsf_list_alloc().
- */
-typedef struct AVBSFList AVBSFList;
-
-/**
- * Allocate empty list of bitstream filters.
- * The list must be later freed by av_bsf_list_free()
- * or finalized by av_bsf_list_finalize().
- *
- * @return Pointer to @ref AVBSFList on success, NULL in case of failure
- */
-AVBSFList *av_bsf_list_alloc(void);
-
-/**
- * Free list of bitstream filters.
- *
- * @param lst Pointer to pointer returned by av_bsf_list_alloc()
- */
-void av_bsf_list_free(AVBSFList **lst);
-
-/**
- * Append bitstream filter to the list of bitstream filters.
- *
- * @param lst List to append to
- * @param bsf Filter context to be appended
- *
- * @return >=0 on success, negative AVERROR in case of failure
- */
-int av_bsf_list_append(AVBSFList *lst, AVBSFContext *bsf);
-
-/**
- * Construct new bitstream filter context given it's name and options
- * and append it to the list of bitstream filters.
- *
- * @param lst      List to append to
- * @param bsf_name Name of the bitstream filter
- * @param options  Options for the bitstream filter, can be set to NULL
- *
- * @return >=0 on success, negative AVERROR in case of failure
- */
-int av_bsf_list_append2(AVBSFList *lst, const char * bsf_name, AVDictionary **options);
-/**
- * Finalize list of bitstream filters.
- *
- * This function will transform @ref AVBSFList to single @ref AVBSFContext,
- * so the whole chain of bitstream filters can be treated as single filter
- * freshly allocated by av_bsf_alloc().
- * If the call is successful, @ref AVBSFList structure is freed and lst
- * will be set to NULL. In case of failure, caller is responsible for
- * freeing the structure by av_bsf_list_free()
- *
- * @param      lst Filter list structure to be transformed
- * @paramout bsf Pointer to be set to newly created @ref AVBSFContext structure
- *                 representing the chain of bitstream filters
- *
- * @return >=0 on success, negative AVERROR in case of failure
- */
-int av_bsf_list_finalize(AVBSFList **lst, AVBSFContext **bsf);
-
-/**
- * Parse string describing list of bitstream filters and create single
- * @ref AVBSFContext describing the whole chain of bitstream filters.
- * Resulting @ref AVBSFContext can be treated as any other @ref AVBSFContext freshly
- * allocated by av_bsf_alloc().
- *
- * @param      str String describing chain of bitstream filters in format
- *                 `bsf1=opt1=val1:opt2=val2,bsf2`
- * @paramout bsf Pointer to be set to newly created @ref AVBSFContext structure
- *                 representing the chain of bitstream filters
- *
- * @return >=0 on success, negative AVERROR in case of failure
- */
-int av_bsf_list_parse_str(const char *str, AVBSFContext **bsf);
-
-/**
- * Get null/pass-through bitstream filter.
- *
- * @paramout bsf Pointer to be set to new instance of pass-through bitstream filter
- *
- * @return
- */
-int av_bsf_get_null_filter(AVBSFContext **bsf);
-
-/**
- * @}
- */
-
-#endif // AVCODEC_BSF_H

gpac-2.2.1.tar.gz/extra_lib/include/libavcodec/codec.h Deleted

@@ -1,497 +0,0 @@
-/*
- * AVCodec public API
- *
- * 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_CODEC_H
-#define AVCODEC_CODEC_H
-
-#include <stdint.h>
-
-#include "libavutil/avutil.h"
-#include "libavutil/hwcontext.h"
-#include "libavutil/log.h"
-#include "libavutil/pixfmt.h"
-#include "libavutil/rational.h"
-#include "libavutil/samplefmt.h"
-
-#include "libavcodec/codec_id.h"
-#include "libavcodec/version.h"
-
-/**
- * @addtogroup lavc_core
- * @{
- */
-
-/**
- * Decoder can use draw_horiz_band callback.
- */
-#define AV_CODEC_CAP_DRAW_HORIZ_BAND     (1 <<  0)
-/**
- * Codec uses get_buffer() or get_encode_buffer() for allocating buffers and
- * supports custom allocators.
- * If not set, it might not use get_buffer() or get_encode_buffer() at all, or
- * use operations that assume the buffer was allocated by
- * avcodec_default_get_buffer2 or avcodec_default_get_encode_buffer.
- */
-#define AV_CODEC_CAP_DR1                 (1 <<  1)
-#if FF_API_FLAG_TRUNCATED
-/**
- * @deprecated Use parsers to always send proper frames.
- */
-#define AV_CODEC_CAP_TRUNCATED           (1 <<  3)
-#endif
-/**
- * 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 AV_CODEC_CAP_DELAY               (1 <<  5)
-/**
- * Codec can be fed a final frame with a smaller size.
- * This can be used to prevent truncation of the last audio samples.
- */
-#define AV_CODEC_CAP_SMALL_LAST_FRAME    (1 <<  6)
-
-/**
- * Codec can output multiple frames per AVPacket
- * Normally demuxers return one frame at a time, demuxers which do not do
- * are connected to a parser to split what they return into proper frames.
- * This flag is reserved to the very rare category of codecs which have a
- * bitstream that cannot be split into frames without timeconsuming
- * operations like full decoding. Demuxers carrying such bitstreams thus
- * may return multiple frames in a packet. This has many disadvantages like
- * prohibiting stream copy in many cases thus it should only be considered
- * as a last resort.
- */
-#define AV_CODEC_CAP_SUBFRAMES           (1 <<  8)
-/**
- * Codec is experimental and is thus avoided in favor of non experimental
- * encoders
- */
-#define AV_CODEC_CAP_EXPERIMENTAL        (1 <<  9)
-/**
- * Codec should fill in channel configuration and samplerate instead of container
- */
-#define AV_CODEC_CAP_CHANNEL_CONF        (1 << 10)
-/**
- * Codec supports frame-level multithreading.
- */
-#define AV_CODEC_CAP_FRAME_THREADS       (1 << 12)
-/**
- * Codec supports slice-based (or partition-based) multithreading.
- */
-#define AV_CODEC_CAP_SLICE_THREADS       (1 << 13)
-/**
- * Codec supports changed parameters at any point.
- */
-#define AV_CODEC_CAP_PARAM_CHANGE        (1 << 14)
-/**
- * Codec supports multithreading through a method other than slice- or
- * frame-level multithreading. Typically this marks wrappers around
- * multithreading-capable external libraries.
- */
-#define AV_CODEC_CAP_OTHER_THREADS       (1 << 15)
-#if FF_API_AUTO_THREADS
-#define AV_CODEC_CAP_AUTO_THREADS        AV_CODEC_CAP_OTHER_THREADS
-#endif
-/**
- * Audio encoder supports receiving a different number of samples in each call.
- */
-#define AV_CODEC_CAP_VARIABLE_FRAME_SIZE (1 << 16)
-/**
- * Decoder is not a preferred choice for probing.
- * This indicates that the decoder is not a good choice for probing.
- * It could for example be an expensive to spin up hardware decoder,
- * or it could simply not provide a lot of useful information about
- * the stream.
- * A decoder marked with this flag should only be used as last resort
- * choice for probing.
- */
-#define AV_CODEC_CAP_AVOID_PROBING       (1 << 17)
-
-#if FF_API_UNUSED_CODEC_CAPS
-/**
- * Deprecated and unused. Use AVCodecDescriptor.props instead
- */
-#define AV_CODEC_CAP_INTRA_ONLY       0x40000000
-/**
- * Deprecated and unused. Use AVCodecDescriptor.props instead
- */
-#define AV_CODEC_CAP_LOSSLESS         0x80000000
-#endif
-
-/**
- * Codec is backed by a hardware implementation. Typically used to
- * identify a non-hwaccel hardware decoder. For information about hwaccels, use
- * avcodec_get_hw_config() instead.
- */
-#define AV_CODEC_CAP_HARDWARE            (1 << 18)
-
-/**
- * Codec is potentially backed by a hardware implementation, but not
- * necessarily. This is used instead of AV_CODEC_CAP_HARDWARE, if the
- * implementation provides some sort of internal fallback.
- */
-#define AV_CODEC_CAP_HYBRID              (1 << 19)
-
-/**
- * This codec takes the reordered_opaque field from input AVFrames
- * and returns it in the corresponding field in AVCodecContext after
- * encoding.
- */
-#define AV_CODEC_CAP_ENCODER_REORDERED_OPAQUE (1 << 20)
-
-/**
- * This encoder can be flushed using avcodec_flush_buffers(). If this flag is
- * not set, the encoder must be closed and reopened to ensure that no frames
- * remain pending.
- */
-#define AV_CODEC_CAP_ENCODER_FLUSH   (1 << 21)
-
-/**
- * AVProfile.
- */
-typedef struct AVProfile {
-    int profile;
-    const char *name; ///< short name for the profile
-} AVProfile;
-
-typedef struct AVCodecDefault AVCodecDefault;
-
-struct AVCodecContext;
-struct AVSubtitle;
-struct AVPacket;
-
-/**
- * AVCodec.
- */
-typedef struct AVCodec {
-    /**
-     * Name of the codec implementation.
-     * The name is globally unique among encoders and among decoders (but an
-     * encoder and a decoder can share the same name).
-     * 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 AVCodecID id;
-    /**
-     * Codec capabilities.
-     * see AV_CODEC_CAP_*
-     */
-    int capabilities;
-    uint8_t max_lowres;                     ///< maximum value for lowres supported by the decoder
-    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
-    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}
-
-    /**
-     * Group name of the codec implementation.
-     * This is a short symbolic name of the wrapper backing this codec. A
-     * wrapper uses some kind of external implementation for the codec, such
-     * as an external library, or a codec implementation provided by the OS or
-     * the hardware.
-     * If this field is NULL, this is a builtin, libavcodec native codec.
-     * If non-NULL, this will be the suffix in AVCodec.name in most cases
-     * (usually AVCodec.name will be of the form "<codec_name>_<wrapper_name>").
-     */
-    const char *wrapper_name;
-
-    /*****************************************************************
-     * 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.
-     *****************************************************************
-     */
-    /**
-     * Internal codec capabilities.
-     * See FF_CODEC_CAP_* in internal.h
-     */
-    int caps_internal;
-
-    int priv_data_size;
-    /**
-     * @name Frame-level threading support functions
-     * @{
-     */
-    /**
-     * 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)(struct AVCodecContext *dst, const struct AVCodecContext *src);
-
-    /**
-     * Copy variables back to the user-facing context
-     */
-    int (*update_thread_context_for_user)(struct AVCodecContext *dst, const struct AVCodecContext *src);
-    /** @} */
-
-    /**
-     * Private codec-specific defaults.
-     */
-    const AVCodecDefault *defaults;
-
-    /**
-     * Initialize codec static data, called from av_codec_iterate().
-     *
-     * This is not intended for time consuming operations as it is
-     * run for every codec regardless of that codec being used.
-     */
-    void (*init_static_data)(struct AVCodec *codec);
-
-    int (*init)(struct AVCodecContext *);
-    int (*encode_sub)(struct AVCodecContext *, uint8_t *buf, int buf_size,
-                      const struct AVSubtitle *sub);
-    /**
-     * Encode data to an AVPacket.
-     *
-     * @param      avctx          codec context
-     * @param      avpkt          output AVPacket
-     * @paramin  frame          AVFrame containing the raw data to be encoded
-     * @paramout 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)(struct AVCodecContext *avctx, struct AVPacket *avpkt,
-                   const struct AVFrame *frame, int *got_packet_ptr);
-    /**
-     * Decode picture or subtitle data.
-     *
-     * @param      avctx          codec context
-     * @param      outdata        codec type dependent output struct
-     * @paramout got_frame_ptr  decoder sets to 0 or 1 to indicate that a
-     *                            non-empty frame or subtitle was returned in
-     *                            outdata.
-     * @paramin  avpkt          AVPacket containing the data to be decoded
-     * @return amount of bytes read from the packet on success, negative error
-     *         code on failure
-     */
-    int (*decode)(struct AVCodecContext *avctx, void *outdata,
-                  int *got_frame_ptr, struct AVPacket *avpkt);
-    int (*close)(struct AVCodecContext *);
-    /**
-     * Encode API with decoupled frame/packet dataflow. This function is called
-     * to get one output packet. It should call ff_encode_get_frame() to obtain
-     * input data.
-     */
-    int (*receive_packet)(struct AVCodecContext *avctx, struct AVPacket *avpkt);
-
-    /**
-     * Decode API with decoupled packet/frame dataflow. This function is called
-     * to get one output frame. It should call ff_decode_get_packet() to obtain
-     * input data.
-     */
-    int (*receive_frame)(struct AVCodecContext *avctx, struct AVFrame *frame);
-    /**
-     * Flush buffers.
-     * Will be called when seeking
-     */
-    void (*flush)(struct AVCodecContext *);
-
-    /**
-     * Decoding only, a comma-separated list of bitstream filters to apply to
-     * packets before decoding.
-     */
-    const char *bsfs;
-
-    /**
-     * Array of pointers to hardware configurations supported by the codec,
-     * or NULL if no hardware supported.  The array is terminated by a NULL
-     * pointer.
-     *
-     * The user can only access this field via avcodec_get_hw_config().
-     */
-    const struct AVCodecHWConfigInternal *const *hw_configs;
-
-    /**
-     * List of supported codec_tags, terminated by FF_CODEC_TAGS_END.
-     */
-    const uint32_t *codec_tags;
-} AVCodec;
-
-/**
- * Iterate over all registered codecs.
- *
- * @param opaque a pointer where libavcodec will store the iteration state. Must
- *               point to NULL to start the iteration.
- *
- * @return the next registered codec or NULL when the iteration is
- *         finished
- */
-const AVCodec *av_codec_iterate(void **opaque);
-
-/**
- * Find a registered decoder with a matching codec ID.
- *
- * @param id AVCodecID of the requested decoder
- * @return A decoder if one was found, NULL otherwise.
- */
-const AVCodec *avcodec_find_decoder(enum AVCodecID id);
-
-/**
- * Find a registered decoder with the specified name.
- *
- * @param name name of the requested decoder
- * @return A decoder if one was found, NULL otherwise.
- */
-const AVCodec *avcodec_find_decoder_by_name(const char *name);
-
-/**
- * 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.
- */
-const 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.
- */
-const AVCodec *avcodec_find_encoder_by_name(const char *name);
-/**
- * @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 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);
-
-enum {
-    /**
-     * The codec supports this format via the hw_device_ctx interface.
-     *
-     * When selecting this format, AVCodecContext.hw_device_ctx should
-     * have been set to a device of the specified type before calling
-     * avcodec_open2().
-     */
-    AV_CODEC_HW_CONFIG_METHOD_HW_DEVICE_CTX = 0x01,
-    /**
-     * The codec supports this format via the hw_frames_ctx interface.
-     *
-     * When selecting this format for a decoder,
-     * AVCodecContext.hw_frames_ctx should be set to a suitable frames
-     * context inside the get_format() callback.  The frames context
-     * must have been created on a device of the specified type.
-     *
-     * When selecting this format for an encoder,
-     * AVCodecContext.hw_frames_ctx should be set to the context which
-     * will be used for the input frames before calling avcodec_open2().
-     */
-    AV_CODEC_HW_CONFIG_METHOD_HW_FRAMES_CTX = 0x02,
-    /**
-     * The codec supports this format by some internal method.
-     *
-     * This format can be selected without any additional configuration -
-     * no device or frames context is required.
-     */
-    AV_CODEC_HW_CONFIG_METHOD_INTERNAL      = 0x04,
-    /**
-     * The codec supports this format by some ad-hoc method.
-     *
-     * Additional settings and/or function calls are required.  See the
-     * codec-specific documentation for details.  (Methods requiring
-     * this sort of configuration are deprecated and others should be
-     * used in preference.)
-     */
-    AV_CODEC_HW_CONFIG_METHOD_AD_HOC        = 0x08,
-};
-
-typedef struct AVCodecHWConfig {
-    /**
-     * For decoders, a hardware pixel format which that decoder may be
-     * able to decode to if suitable hardware is available.
-     *
-     * For encoders, a pixel format which the encoder may be able to
-     * accept.  If set to AV_PIX_FMT_NONE, this applies to all pixel
-     * formats supported by the codec.
-     */
-    enum AVPixelFormat pix_fmt;
-    /**
-     * Bit set of AV_CODEC_HW_CONFIG_METHOD_* flags, describing the possible
-     * setup methods which can be used with this configuration.
-     */
-    int methods;
-    /**
-     * The device type associated with the configuration.
-     *
-     * Must be set for AV_CODEC_HW_CONFIG_METHOD_HW_DEVICE_CTX and
-     * AV_CODEC_HW_CONFIG_METHOD_HW_FRAMES_CTX, otherwise unused.
-     */
-    enum AVHWDeviceType device_type;
-} AVCodecHWConfig;
-
-/**
- * Retrieve supported hardware configurations for a codec.
- *
- * Values of index from zero to some maximum return the indexed configuration
- * descriptor; all other values return NULL.  If the codec does not support
- * any hardware configurations then it will always return NULL.
- */
-const AVCodecHWConfig *avcodec_get_hw_config(const AVCodec *codec, int index);
-
-/**
- * @}
- */
-
-#endif /* AVCODEC_CODEC_H */

gpac-2.2.1.tar.gz/extra_lib/include/libavcodec/codec_desc.h Deleted

@@ -1,128 +0,0 @@
-/*
- * Codec descriptors public API
- *
- * 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_CODEC_DESC_H
-#define AVCODEC_CODEC_DESC_H
-
-#include "libavutil/avutil.h"
-
-#include "codec_id.h"
-
-/**
- * @addtogroup lavc_core
- * @{
- */
-
-/**
- * This struct describes the properties of a single codec described by an
- * AVCodecID.
- * @see avcodec_descriptor_get()
- */
-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;
-    /**
-     * 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;
-    /**
-     * If non-NULL, an array of profiles recognized for this codec.
-     * Terminated with FF_PROFILE_UNKNOWN.
-     */
-    const struct AVProfile *profiles;
-} AVCodecDescriptor;
-
-/**
- * Codec uses only intra compression.
- * Video and audio 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)
-
-/**
- * @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_CODEC_DESC_H

gpac-2.2.1.tar.gz/extra_lib/include/libavcodec/codec_id.h Deleted

@@ -1,629 +0,0 @@
-/*
- * Codec IDs
- *
- * 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_CODEC_ID_H
-#define AVCODEC_CODEC_ID_H
-
-#include "libavutil/avutil.h"
-#include "libavutil/samplefmt.h"
-
-/**
- * @addtogroup lavc_core
- * @{
- */
-
-/**
- * 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.
- * There may be slight deviations from the principle due to implementation
- * details.
- *
- * If you add a codec ID to this list, add it so that
- * 1. no value of an existing codec ID changes (that would break ABI),
- * 2. it is as close as possible to similar codecs
- *
- * After adding new codec IDs, do not forget to add an entry to the codec
- * descriptor list and bump libavcodec minor version.
- */
-enum AVCodecID {
-    AV_CODEC_ID_NONE,
-
-    /* video codecs */
-    AV_CODEC_ID_MPEG1VIDEO,
-    AV_CODEC_ID_MPEG2VIDEO, ///< preferred ID for MPEG-1/2 video decoding
-    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,
-#define AV_CODEC_ID_IFF_BYTERUN1 AV_CODEC_ID_IFF_ILBM
-    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,
-    AV_CODEC_ID_G2M,
-    AV_CODEC_ID_WEBP,
-    AV_CODEC_ID_HNM4_VIDEO,
-    AV_CODEC_ID_HEVC,
-#define AV_CODEC_ID_H265 AV_CODEC_ID_HEVC
-    AV_CODEC_ID_FIC,
-    AV_CODEC_ID_ALIAS_PIX,
-    AV_CODEC_ID_BRENDER_PIX,
-    AV_CODEC_ID_PAF_VIDEO,
-    AV_CODEC_ID_EXR,
-    AV_CODEC_ID_VP7,
-    AV_CODEC_ID_SANM,
-    AV_CODEC_ID_SGIRLE,
-    AV_CODEC_ID_MVC1,
-    AV_CODEC_ID_MVC2,
-    AV_CODEC_ID_HQX,
-    AV_CODEC_ID_TDSC,
-    AV_CODEC_ID_HQ_HQA,
-    AV_CODEC_ID_HAP,
-    AV_CODEC_ID_DDS,
-    AV_CODEC_ID_DXV,
-    AV_CODEC_ID_SCREENPRESSO,
-    AV_CODEC_ID_RSCC,
-    AV_CODEC_ID_AVS2,
-    AV_CODEC_ID_PGX,
-    AV_CODEC_ID_AVS3,
-    AV_CODEC_ID_MSP2,
-    AV_CODEC_ID_VVC,
-#define AV_CODEC_ID_H266 AV_CODEC_ID_VVC
-    AV_CODEC_ID_Y41P,
-    AV_CODEC_ID_AVRP,
-    AV_CODEC_ID_012V,
-    AV_CODEC_ID_AVUI,
-    AV_CODEC_ID_AYUV,
-    AV_CODEC_ID_TARGA_Y216,
-    AV_CODEC_ID_V308,
-    AV_CODEC_ID_V408,
-    AV_CODEC_ID_YUV4,
-    AV_CODEC_ID_AVRN,
-    AV_CODEC_ID_CPIA,
-    AV_CODEC_ID_XFACE,
-    AV_CODEC_ID_SNOW,
-    AV_CODEC_ID_SMVJPEG,
-    AV_CODEC_ID_APNG,
-    AV_CODEC_ID_DAALA,
-    AV_CODEC_ID_CFHD,
-    AV_CODEC_ID_TRUEMOTION2RT,
-    AV_CODEC_ID_M101,
-    AV_CODEC_ID_MAGICYUV,
-    AV_CODEC_ID_SHEERVIDEO,
-    AV_CODEC_ID_YLC,
-    AV_CODEC_ID_PSD,
-    AV_CODEC_ID_PIXLET,
-    AV_CODEC_ID_SPEEDHQ,
-    AV_CODEC_ID_FMVC,
-    AV_CODEC_ID_SCPR,
-    AV_CODEC_ID_CLEARVIDEO,
-    AV_CODEC_ID_XPM,
-    AV_CODEC_ID_AV1,
-    AV_CODEC_ID_BITPACKED,
-    AV_CODEC_ID_MSCC,
-    AV_CODEC_ID_SRGC,
-    AV_CODEC_ID_SVG,
-    AV_CODEC_ID_GDV,
-    AV_CODEC_ID_FITS,
-    AV_CODEC_ID_IMM4,
-    AV_CODEC_ID_PROSUMER,
-    AV_CODEC_ID_MWSC,
-    AV_CODEC_ID_WCMV,
-    AV_CODEC_ID_RASC,
-    AV_CODEC_ID_HYMT,
-    AV_CODEC_ID_ARBC,
-    AV_CODEC_ID_AGM,
-    AV_CODEC_ID_LSCR,
-    AV_CODEC_ID_VP4,
-    AV_CODEC_ID_IMM5,
-    AV_CODEC_ID_MVDV,
-    AV_CODEC_ID_MVHA,
-    AV_CODEC_ID_CDTOONS,
-    AV_CODEC_ID_MV30,
-    AV_CODEC_ID_NOTCHLC,
-    AV_CODEC_ID_PFM,
-    AV_CODEC_ID_MOBICLIP,
-    AV_CODEC_ID_PHOTOCD,
-    AV_CODEC_ID_IPU,
-    AV_CODEC_ID_ARGO,
-    AV_CODEC_ID_CRI,
-    AV_CODEC_ID_SIMBIOSIS_IMX,
-    AV_CODEC_ID_SGA_VIDEO,
-    AV_CODEC_ID_GEM,
-
-    /* various PCM "codecs" */
-    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,
-    AV_CODEC_ID_PCM_S32LE_PLANAR,
-    AV_CODEC_ID_PCM_S16BE_PLANAR,
-    AV_CODEC_ID_PCM_S64LE,
-    AV_CODEC_ID_PCM_S64BE,
-    AV_CODEC_ID_PCM_F16LE,
-    AV_CODEC_ID_PCM_F24LE,
-    AV_CODEC_ID_PCM_VIDC,
-    AV_CODEC_ID_PCM_SGA,
-
-    /* various ADPCM codecs */
-    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,
-    AV_CODEC_ID_ADPCM_AFC,
-    AV_CODEC_ID_ADPCM_IMA_OKI,
-    AV_CODEC_ID_ADPCM_DTK,
-    AV_CODEC_ID_ADPCM_IMA_RAD,
-    AV_CODEC_ID_ADPCM_G726LE,
-    AV_CODEC_ID_ADPCM_THP_LE,
-    AV_CODEC_ID_ADPCM_PSX,
-    AV_CODEC_ID_ADPCM_AICA,
-    AV_CODEC_ID_ADPCM_IMA_DAT4,
-    AV_CODEC_ID_ADPCM_MTAF,
-    AV_CODEC_ID_ADPCM_AGM,
-    AV_CODEC_ID_ADPCM_ARGO,
-    AV_CODEC_ID_ADPCM_IMA_SSI,
-    AV_CODEC_ID_ADPCM_ZORK,
-    AV_CODEC_ID_ADPCM_IMA_APM,
-    AV_CODEC_ID_ADPCM_IMA_ALP,
-    AV_CODEC_ID_ADPCM_IMA_MTF,
-    AV_CODEC_ID_ADPCM_IMA_CUNNING,
-    AV_CODEC_ID_ADPCM_IMA_MOFLEX,
-    AV_CODEC_ID_ADPCM_IMA_ACORN,
-
-    /* AMR */
-    AV_CODEC_ID_AMR_NB = 0x12000,
-    AV_CODEC_ID_AMR_WB,
-
-    /* RealAudio codecs*/
-    AV_CODEC_ID_RA_144 = 0x13000,
-    AV_CODEC_ID_RA_288,
-
-    /* various DPCM codecs */
-    AV_CODEC_ID_ROQ_DPCM = 0x14000,
-    AV_CODEC_ID_INTERPLAY_DPCM,
-    AV_CODEC_ID_XAN_DPCM,
-    AV_CODEC_ID_SOL_DPCM,
-    AV_CODEC_ID_SDX2_DPCM,
-    AV_CODEC_ID_GREMLIN_DPCM,
-    AV_CODEC_ID_DERF_DPCM,
-
-    /* audio codecs */
-    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,
-    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,
-    AV_CODEC_ID_COMFORT_NOISE,
-    AV_CODEC_ID_TAK,
-    AV_CODEC_ID_METASOUND,
-    AV_CODEC_ID_PAF_AUDIO,
-    AV_CODEC_ID_ON2AVC,
-    AV_CODEC_ID_DSS_SP,
-    AV_CODEC_ID_CODEC2,
-    AV_CODEC_ID_FFWAVESYNTH,
-    AV_CODEC_ID_SONIC,
-    AV_CODEC_ID_SONIC_LS,
-    AV_CODEC_ID_EVRC,
-    AV_CODEC_ID_SMV,
-    AV_CODEC_ID_DSD_LSBF,
-    AV_CODEC_ID_DSD_MSBF,
-    AV_CODEC_ID_DSD_LSBF_PLANAR,
-    AV_CODEC_ID_DSD_MSBF_PLANAR,
-    AV_CODEC_ID_4GV,
-    AV_CODEC_ID_INTERPLAY_ACM,
-    AV_CODEC_ID_XMA1,
-    AV_CODEC_ID_XMA2,
-    AV_CODEC_ID_DST,
-    AV_CODEC_ID_ATRAC3AL,
-    AV_CODEC_ID_ATRAC3PAL,
-    AV_CODEC_ID_DOLBY_E,
-    AV_CODEC_ID_APTX,
-    AV_CODEC_ID_APTX_HD,
-    AV_CODEC_ID_SBC,
-    AV_CODEC_ID_ATRAC9,
-    AV_CODEC_ID_HCOM,
-    AV_CODEC_ID_ACELP_KELVIN,
-    AV_CODEC_ID_MPEGH_3D_AUDIO,
-    AV_CODEC_ID_SIREN,
-    AV_CODEC_ID_HCA,
-    AV_CODEC_ID_FASTAUDIO,
-    AV_CODEC_ID_MSNSIREN,
-
-    /* subtitle codecs */
-    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,
-    AV_CODEC_ID_EIA_608,
-    AV_CODEC_ID_JACOSUB,
-    AV_CODEC_ID_SAMI,
-    AV_CODEC_ID_REALTEXT,
-    AV_CODEC_ID_STL,
-    AV_CODEC_ID_SUBVIEWER1,
-    AV_CODEC_ID_SUBVIEWER,
-    AV_CODEC_ID_SUBRIP,
-    AV_CODEC_ID_WEBVTT,
-    AV_CODEC_ID_MPL2,
-    AV_CODEC_ID_VPLAYER,
-    AV_CODEC_ID_PJS,
-    AV_CODEC_ID_ASS,
-    AV_CODEC_ID_HDMV_TEXT_SUBTITLE,
-    AV_CODEC_ID_TTML,
-    AV_CODEC_ID_ARIB_CAPTION,
-
-    /* other specific kind of codecs (generally used for attachments) */
-    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_SCTE_35, ///< Contain timestamp estimated through PCR of program stream.
-    AV_CODEC_ID_EPG,
-    AV_CODEC_ID_BINTEXT,
-    AV_CODEC_ID_XBIN,
-    AV_CODEC_ID_IDF,
-    AV_CODEC_ID_OTF,
-    AV_CODEC_ID_SMPTE_KLV,
-    AV_CODEC_ID_DVD_NAV,
-    AV_CODEC_ID_TIMED_ID3,
-    AV_CODEC_ID_BIN_DATA,
-
-
-    AV_CODEC_ID_PROBE = 0x19000, ///< codec_id is not known (like AV_CODEC_ID_NONE) but lavf should attempt to identify it
-
-    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.
-    AV_CODEC_ID_WRAPPED_AVFRAME = 0x21001, ///< Passthrough codec, AVFrames wrapped in AVPacket
-};
-
-/**
- * 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 codec bits per sample.
- *
- * @paramin 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 codec bits per sample.
- * Only return non-zero if the bits per sample is exactly correct, not an
- * approximation.
- *
- * @paramin 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 a name for the specified profile, if available.
- *
- * @param codec_id the ID of the codec to which the requested profile belongs
- * @param profile the profile value for which a name is requested
- * @return A name for the profile if found, NULL otherwise.
- *
- * @note unlike av_get_profile_name(), which searches a list of profiles
- *       supported by a specific decoder or encoder implementation, this
- *       function searches the list of profiles from the AVCodecDescriptor
- */
-const char *avcodec_profile_name(enum AVCodecID codec_id, int profile);
-
-/**
- * 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);
-
-/**
- * @}
- */
-
-#endif // AVCODEC_CODEC_ID_H

gpac-2.2.1.tar.gz/extra_lib/include/libavcodec/codec_par.h Deleted

@@ -1,234 +0,0 @@
-/*
- * Codec parameters public API
- *
- * 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_CODEC_PAR_H
-#define AVCODEC_CODEC_PAR_H
-
-#include <stdint.h>
-
-#include "libavutil/avutil.h"
-#include "libavutil/rational.h"
-#include "libavutil/pixfmt.h"
-
-#include "codec_id.h"
-
-/**
- * @addtogroup lavc_core
- */
-
-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
-};
-
-/**
- * This struct describes the properties of an encoded stream.
- *
- * sizeof(AVCodecParameters) is not a part of the public ABI, this struct must
- * be allocated with avcodec_parameters_alloc() and freed with
- * avcodec_parameters_free().
- */
-typedef struct AVCodecParameters {
-    /**
-     * General type of the encoded data.
-     */
-    enum AVMediaType codec_type;
-    /**
-     * Specific type of the encoded data (the codec used).
-     */
-    enum AVCodecID   codec_id;
-    /**
-     * Additional information about the codec (corresponds to the AVI FOURCC).
-     */
-    uint32_t         codec_tag;
-
-    /**
-     * Extra binary data needed for initializing the decoder, codec-dependent.
-     *
-     * Must be allocated with av_malloc() and will be freed by
-     * avcodec_parameters_free(). The allocated size of extradata must be at
-     * least extradata_size + AV_INPUT_BUFFER_PADDING_SIZE, with the padding
-     * bytes zeroed.
-     */
-    uint8_t *extradata;
-    /**
-     * Size of the extradata content in bytes.
-     */
-    int      extradata_size;
-
-    /**
-     * - video: the pixel format, the value corresponds to enum AVPixelFormat.
-     * - audio: the sample format, the value corresponds to enum AVSampleFormat.
-     */
-    int format;
-
-    /**
-     * The average bitrate of the encoded data (in bits per second).
-     */
-    int64_t bit_rate;
-
-    /**
-     * The number of bits per sample in the codedwords.
-     *
-     * This is basically the bitrate per sample. It is mandatory for a bunch of
-     * formats to actually decode them. It's the number of bits for one sample in
-     * the actual coded bitstream.
-     *
-     * This could be for example 4 for ADPCM
-     * For PCM formats this matches bits_per_raw_sample
-     * Can be 0
-     */
-    int bits_per_coded_sample;
-
-    /**
-     * This is the number of valid bits in each output sample. If the
-     * sample format has more bits, the least significant bits are additional
-     * padding bits, which are always 0. Use right shifts to reduce the sample
-     * to its actual size. For example, audio formats with 24 bit samples will
-     * have bits_per_raw_sample set to 24, and format set to AV_SAMPLE_FMT_S32.
-     * To get the original sample use "(int32_t)sample >> 8"."
-     *
-     * For ADPCM this might be 12 or 16 or similar
-     * Can be 0
-     */
-    int bits_per_raw_sample;
-
-    /**
-     * Codec-specific bitstream restrictions that the stream conforms to.
-     */
-    int profile;
-    int level;
-
-    /**
-     * Video only. The dimensions of the video frame in pixels.
-     */
-    int width;
-    int height;
-
-    /**
-     * Video only. The aspect ratio (width / height) which a single pixel
-     * should have when displayed.
-     *
-     * When the aspect ratio is unknown / undefined, the numerator should be
-     * set to 0 (the denominator may have any value).
-     */
-    AVRational sample_aspect_ratio;
-
-    /**
-     * Video only. The order of the fields in interlaced video.
-     */
-    enum AVFieldOrder                  field_order;
-
-    /**
-     * Video only. Additional colorspace characteristics.
-     */
-    enum AVColorRange                  color_range;
-    enum AVColorPrimaries              color_primaries;
-    enum AVColorTransferCharacteristic color_trc;
-    enum AVColorSpace                  color_space;
-    enum AVChromaLocation              chroma_location;
-
-    /**
-     * Video only. Number of delayed frames.
-     */
-    int video_delay;
-
-    /**
-     * Audio only. The channel layout bitmask. May be 0 if the channel layout is
-     * unknown or unspecified, otherwise the number of bits set must be equal to
-     * the channels field.
-     */
-    uint64_t channel_layout;
-    /**
-     * Audio only. The number of audio channels.
-     */
-    int      channels;
-    /**
-     * Audio only. The number of audio samples per second.
-     */
-    int      sample_rate;
-    /**
-     * Audio only. The number of bytes per coded audio frame, required by some
-     * formats.
-     *
-     * Corresponds to nBlockAlign in WAVEFORMATEX.
-     */
-    int      block_align;
-    /**
-     * Audio only. Audio frame size, if known. Required by some formats to be static.
-     */
-    int      frame_size;
-
-    /**
-     * Audio only. The amount of padding (in samples) inserted by the encoder at
-     * the beginning of the audio. I.e. this number of leading decoded samples
-     * must be discarded by the caller to get the original audio without leading
-     * padding.
-     */
-    int initial_padding;
-    /**
-     * Audio only. The amount of padding (in samples) appended by the encoder to
-     * the end of the audio. I.e. this number of decoded samples must be
-     * discarded by the caller from the end of the stream to get the original
-     * audio without any trailing padding.
-     */
-    int trailing_padding;
-    /**
-     * Audio only. Number of samples to skip after a discontinuity.
-     */
-    int seek_preroll;
-} AVCodecParameters;
-
-/**
- * Allocate a new AVCodecParameters and set its fields to default values
- * (unknown/invalid/0). The returned struct must be freed with
- * avcodec_parameters_free().
- */
-AVCodecParameters *avcodec_parameters_alloc(void);
-
-/**
- * Free an AVCodecParameters instance and everything associated with it and
- * write NULL to the supplied pointer.
- */
-void avcodec_parameters_free(AVCodecParameters **par);
-
-/**
- * Copy the contents of src to dst. Any allocated fields in dst are freed and
- * replaced with newly allocated duplicates of the corresponding fields in src.
- *
- * @return >= 0 on success, a negative AVERROR code on failure.
- */
-int avcodec_parameters_copy(AVCodecParameters *dst, const AVCodecParameters *src);
-
-/**
- * This function is the same as av_get_audio_frame_duration(), except it works
- * with AVCodecParameters instead of an AVCodecContext.
- */
-int av_get_audio_frame_duration2(AVCodecParameters *par, int frame_bytes);
-
-/**
- * @}
- */
-
-#endif // AVCODEC_CODEC_PAR_H

gpac-2.2.1.tar.gz/extra_lib/include/libavcodec/d3d11va.h Deleted

@@ -1,112 +0,0 @@
-/*
- * Direct3D11 HW acceleration
- *
- * copyright (c) 2009 Laurent Aimar
- * copyright (c) 2015 Steve Lhomme
- *
- * 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_D3D11VA_H
-#define AVCODEC_D3D11VA_H
-
-/**
- * @file
- * @ingroup lavc_codec_hwaccel_d3d11va
- * Public libavcodec D3D11VA header.
- */
-
-#if !defined(_WIN32_WINNT) || _WIN32_WINNT < 0x0602
-#undef _WIN32_WINNT
-#define _WIN32_WINNT 0x0602
-#endif
-
-#include <stdint.h>
-#include <d3d11.h>
-
-/**
- * @defgroup lavc_codec_hwaccel_d3d11va Direct3D11
- * @ingroup lavc_codec_hwaccel
- *
- * @{
- */
-
-#define FF_DXVA2_WORKAROUND_SCALING_LIST_ZIGZAG 1 ///< Work around for Direct3D11 and old UVD/UVD+ ATI video cards
-#define FF_DXVA2_WORKAROUND_INTEL_CLEARVIDEO    2 ///< Work around for Direct3D11 and old Intel GPUs with ClearVideo interface
-
-/**
- * This structure is used to provides the necessary configurations and data
- * to the Direct3D11 FFmpeg HWAccel implementation.
- *
- * The application must make it available as AVCodecContext.hwaccel_context.
- *
- * Use av_d3d11va_alloc_context() exclusively to allocate an AVD3D11VAContext.
- */
-typedef struct AVD3D11VAContext {
-    /**
-     * D3D11 decoder object
-     */
-    ID3D11VideoDecoder *decoder;
-
-    /**
-      * D3D11 VideoContext
-      */
-    ID3D11VideoContext *video_context;
-
-    /**
-     * D3D11 configuration used to create the decoder
-     */
-    D3D11_VIDEO_DECODER_CONFIG *cfg;
-
-    /**
-     * The number of surface in the surface array
-     */
-    unsigned surface_count;
-
-    /**
-     * The array of Direct3D surfaces used to create the decoder
-     */
-    ID3D11VideoDecoderOutputView **surface;
-
-    /**
-     * A bit field configuring the workarounds needed for using the decoder
-     */
-    uint64_t workaround;
-
-    /**
-     * Private to the FFmpeg AVHWAccel implementation
-     */
-    unsigned report_id;
-
-    /**
-      * Mutex to access video_context
-      */
-    HANDLE  context_mutex;
-} AVD3D11VAContext;
-
-/**
- * Allocate an AVD3D11VAContext.
- *
- * @return Newly-allocated AVD3D11VAContext or NULL on failure.
- */
-AVD3D11VAContext *av_d3d11va_alloc_context(void);
-
-/**
- * @}
- */
-
-#endif /* AVCODEC_D3D11VA_H */

gpac-2.2.1.tar.gz/extra_lib/include/libavcodec/defs.h Deleted

@@ -1,170 +0,0 @@
-/*
- *
- * 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_DEFS_H
-#define AVCODEC_DEFS_H
-
-/**
- * @file
- * @ingroup libavc
- * Misc types and constants that do not belong anywhere else.
- */
-
-#include <stdint.h>
-#include <stdlib.h>
-
-/**
- * @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.<br>
- * Note: If the first 23 bits of the additional bytes are not 0, then damaged
- * MPEG bitstreams could cause overread and segfault.
- */
-#define AV_INPUT_BUFFER_PADDING_SIZE 64
-
-/**
- * @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_NONINTRA= 24, ///< discard all non intra frames
-    AVDISCARD_NONKEY  = 32, ///< discard all frames except keyframes
-    AVDISCARD_ALL     = 48, ///< discard all
-};
-
-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
-};
-
-/**
- * Pan Scan area.
- * This specifies the area which should be displayed.
- * Note there may be multiple such areas for one frame.
- */
-typedef struct AVPanScan {
-    /**
-     * id
-     * - encoding: Set by user.
-     * - decoding: Set by libavcodec.
-     */
-    int id;
-
-    /**
-     * width and height in 1/16 pel
-     * - encoding: Set by user.
-     * - decoding: Set by libavcodec.
-     */
-    int width;
-    int height;
-
-    /**
-     * position of the top left corner in 1/16 pel for up to 3 fields/frames
-     * - encoding: Set by user.
-     * - decoding: Set by libavcodec.
-     */
-    int16_t position32;
-} AVPanScan;
-
-/**
- * This structure describes the bitrate properties of an encoded bitstream. It
- * roughly corresponds to a subset the VBV parameters for MPEG-2 or HRD
- * parameters for H.264/HEVC.
- */
-typedef struct AVCPBProperties {
-    /**
-     * Maximum bitrate of the stream, in bits per second.
-     * Zero if unknown or unspecified.
-     */
-    int64_t max_bitrate;
-    /**
-     * Minimum bitrate of the stream, in bits per second.
-     * Zero if unknown or unspecified.
-     */
-    int64_t min_bitrate;
-    /**
-     * Average bitrate of the stream, in bits per second.
-     * Zero if unknown or unspecified.
-     */
-    int64_t avg_bitrate;
-
-    /**
-     * The size of the buffer to which the ratecontrol is applied, in bits.
-     * Zero if unknown or unspecified.
-     */
-    int64_t buffer_size;
-
-    /**
-     * The delay between the time the packet this structure is associated with
-     * is received and the time when it should be decoded, in periods of a 27MHz
-     * clock.
-     *
-     * UINT64_MAX when unknown or unspecified.
-     */
-    uint64_t vbv_delay;
-} AVCPBProperties;
-
-/**
- * Allocate a CPB properties structure and initialize its fields to default
- * values.
- *
- * @param size if non-NULL, the size of the allocated struct will be written
- *             here. This is useful for embedding it in side data.
- *
- * @return the newly allocated struct or NULL on failure
- */
-AVCPBProperties *av_cpb_properties_alloc(size_t *size);
-
-/**
- * This structure supplies correlation between a packet timestamp and a wall clock
- * production time. The definition follows the Producer Reference Time ('prft')
- * as defined in ISO/IEC 14496-12
- */
-typedef struct AVProducerReferenceTime {
-    /**
-     * A UTC timestamp, in microseconds, since Unix epoch (e.g, av_gettime()).
-     */
-    int64_t wallclock;
-    int flags;
-} AVProducerReferenceTime;
-
-/**
- * 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
- * @return number of bytes written to the buffer.
- */
-unsigned int av_xiphlacing(unsigned char *s, unsigned int v);
-
-#endif // AVCODEC_DEFS_H

gpac-2.2.1.tar.gz/extra_lib/include/libavcodec/dirac.h Deleted

@@ -1,131 +0,0 @@
-/*
- * Copyright (C) 2007 Marco Gerards <marco@gnu.org>
- * Copyright (C) 2009 David Conrad
- * Copyright (C) 2011 Jordi Ortiz
- *
- * 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_DIRAC_H
-#define AVCODEC_DIRAC_H
-
-/**
- * @file
- * Interface to Dirac Decoder/Encoder
- * @author Marco Gerards <marco@gnu.org>
- * @author David Conrad
- * @author Jordi Ortiz
- */
-
-#include "avcodec.h"
-
-/**
- * The spec limits the number of wavelet decompositions to 4 for both
- * level 1 (VC-2) and 128 (long-gop default).
- * 5 decompositions is the maximum before >16-bit buffers are needed.
- * Schroedinger allows this for DD 9,7 and 13,7 wavelets only, limiting
- * the others to 4 decompositions (or 3 for the fidelity filter).
- *
- * We use this instead of MAX_DECOMPOSITIONS to save some memory.
- */
-#define MAX_DWT_LEVELS 5
-
-/**
- * Parse code values:
- *
- * Dirac Specification ->
- * 9.6.1  Table 9.1
- *
- * VC-2 Specification  ->
- * 10.4.1 Table 10.1
- */
-
-enum DiracParseCodes {
-    DIRAC_PCODE_SEQ_HEADER      = 0x00,
-    DIRAC_PCODE_END_SEQ         = 0x10,
-    DIRAC_PCODE_AUX             = 0x20,
-    DIRAC_PCODE_PAD             = 0x30,
-    DIRAC_PCODE_PICTURE_CODED   = 0x08,
-    DIRAC_PCODE_PICTURE_RAW     = 0x48,
-    DIRAC_PCODE_PICTURE_LOW_DEL = 0xC8,
-    DIRAC_PCODE_PICTURE_HQ      = 0xE8,
-    DIRAC_PCODE_INTER_NOREF_CO1 = 0x0A,
-    DIRAC_PCODE_INTER_NOREF_CO2 = 0x09,
-    DIRAC_PCODE_INTER_REF_CO1   = 0x0D,
-    DIRAC_PCODE_INTER_REF_CO2   = 0x0E,
-    DIRAC_PCODE_INTRA_REF_CO    = 0x0C,
-    DIRAC_PCODE_INTRA_REF_RAW   = 0x4C,
-    DIRAC_PCODE_INTRA_REF_PICT  = 0xCC,
-    DIRAC_PCODE_MAGIC           = 0x42424344,
-};
-
-typedef struct DiracVersionInfo {
-    int major;
-    int minor;
-} DiracVersionInfo;
-
-typedef struct AVDiracSeqHeader {
-    unsigned width;
-    unsigned height;
-    uint8_t chroma_format;          ///< 0: 444  1: 422  2: 420
-
-    uint8_t interlaced;
-    uint8_t top_field_first;
-
-    uint8_t frame_rate_index;       ///< index into dirac_frame_rate
-    uint8_t aspect_ratio_index;     ///< index into dirac_aspect_ratio
-
-    uint16_t clean_width;
-    uint16_t clean_height;
-    uint16_t clean_left_offset;
-    uint16_t clean_right_offset;
-
-    uint8_t pixel_range_index;      ///< index into dirac_pixel_range_presets
-    uint8_t color_spec_index;       ///< index into dirac_color_spec_presets
-
-    int profile;
-    int level;
-
-    AVRational framerate;
-    AVRational sample_aspect_ratio;
-
-    enum AVPixelFormat pix_fmt;
-    enum AVColorRange color_range;
-    enum AVColorPrimaries color_primaries;
-    enum AVColorTransferCharacteristic color_trc;
-    enum AVColorSpace colorspace;
-
-    DiracVersionInfo version;
-    int bit_depth;
-} AVDiracSeqHeader;
-
-/**
- * Parse a Dirac sequence header.
- *
- * @param dsh this function will allocate and fill an AVDiracSeqHeader struct
- *            and write it into this pointer. The caller must free it with
- *            av_free().
- * @param buf the data buffer
- * @param buf_size the size of the data buffer in bytes
- * @param log_ctx if non-NULL, this function will log errors here
- * @return 0 on success, a negative AVERROR code on failure
- */
-int av_dirac_parse_sequence_header(AVDiracSeqHeader **dsh,
-                                   const uint8_t *buf, size_t buf_size,
-                                   void *log_ctx);
-
-#endif /* AVCODEC_DIRAC_H */

gpac-2.2.1.tar.gz/extra_lib/include/libavcodec/dv_profile.h Deleted

@@ -1,82 +0,0 @@
-/*
- * 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"
-
-/* 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       sar2;                /* 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_samples3;  /* min amount of audio samples */
-                                            /* for 48kHz, 44.1kHz and 32kHz */
-    int              audio_samples_dist5; /* 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;
-
-/**
- * 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);
-
-/**
- * Get a DV profile for the provided stream parameters.
- * The frame rate is used as a best-effort parameter.
- */
-const AVDVProfile *av_dv_codec_profile2(int width, int height, enum AVPixelFormat pix_fmt, AVRational frame_rate);
-
-#endif /* AVCODEC_DV_PROFILE_H */

gpac-2.2.1.tar.gz/extra_lib/include/libavcodec/dxva2.h Deleted

@@ -1,93 +0,0 @@
-/*
- * 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_DXVA2_H
-#define AVCODEC_DXVA2_H
-
-/**
- * @file
- * @ingroup lavc_codec_hwaccel_dxva2
- * Public libavcodec DXVA2 header.
- */
-
-#if !defined(_WIN32_WINNT) || _WIN32_WINNT < 0x0602
-#undef _WIN32_WINNT
-#define _WIN32_WINNT 0x0602
-#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_DXVA2_H */

gpac-2.2.1.tar.gz/extra_lib/include/libavcodec/jni.h Deleted

@@ -1,46 +0,0 @@
-/*
- * JNI public API functions
- *
- * Copyright (c) 2015-2016 Matthieu Bouron <matthieu.bouron stupeflix.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 AVCODEC_JNI_H
-#define AVCODEC_JNI_H
-
-/*
- * Manually set a Java virtual machine which will be used to retrieve the JNI
- * environment. Once a Java VM is set it cannot be changed afterwards, meaning
- * you can call multiple times av_jni_set_java_vm with the same Java VM pointer
- * however it will error out if you try to set a different Java VM.
- *
- * @param vm Java virtual machine
- * @param log_ctx context used for logging, can be NULL
- * @return 0 on success, < 0 otherwise
- */
-int av_jni_set_java_vm(void *vm, void *log_ctx);
-
-/*
- * Get the Java virtual machine which has been set with av_jni_set_java_vm.
- *
- * @param vm Java virtual machine
- * @return a pointer to the Java virtual machine
- */
-void *av_jni_get_java_vm(void *log_ctx);
-
-#endif /* AVCODEC_JNI_H */

gpac-2.2.1.tar.gz/extra_lib/include/libavcodec/mediacodec.h Deleted

@@ -1,101 +0,0 @@
-/*
- * Android MediaCodec public API
- *
- * Copyright (c) 2016 Matthieu Bouron <matthieu.bouron stupeflix.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 AVCODEC_MEDIACODEC_H
-#define AVCODEC_MEDIACODEC_H
-
-#include "libavcodec/avcodec.h"
-
-/**
- * This structure holds a reference to a android/view/Surface object that will
- * be used as output by the decoder.
- *
- */
-typedef struct AVMediaCodecContext {
-
-    /**
-     * android/view/Surface object reference.
-     */
-    void *surface;
-
-} AVMediaCodecContext;
-
-/**
- * Allocate and initialize a MediaCodec context.
- *
- * When decoding with MediaCodec is finished, the caller must free the
- * MediaCodec context with av_mediacodec_default_free.
- *
- * @return a pointer to a newly allocated AVMediaCodecContext on success, NULL otherwise
- */
-AVMediaCodecContext *av_mediacodec_alloc_context(void);
-
-/**
- * Convenience function that sets up the MediaCodec context.
- *
- * @param avctx codec context
- * @param ctx MediaCodec context to initialize
- * @param surface reference to an android/view/Surface
- * @return 0 on success, < 0 otherwise
- */
-int av_mediacodec_default_init(AVCodecContext *avctx, AVMediaCodecContext *ctx, void *surface);
-
-/**
- * This function must be called to free the MediaCodec context initialized with
- * av_mediacodec_default_init().
- *
- * @param avctx codec context
- */
-void av_mediacodec_default_free(AVCodecContext *avctx);
-
-/**
- * Opaque structure representing a MediaCodec buffer to render.
- */
-typedef struct MediaCodecBuffer AVMediaCodecBuffer;
-
-/**
- * Release a MediaCodec buffer and render it to the surface that is associated
- * with the decoder. This function should only be called once on a given
- * buffer, once released the underlying buffer returns to the codec, thus
- * subsequent calls to this function will have no effect.
- *
- * @param buffer the buffer to render
- * @param render 1 to release and render the buffer to the surface or 0 to
- * discard the buffer
- * @return 0 on success, < 0 otherwise
- */
-int av_mediacodec_release_buffer(AVMediaCodecBuffer *buffer, int render);
-
-/**
- * Release a MediaCodec buffer and render it at the given time to the surface
- * that is associated with the decoder. The timestamp must be within one second
- * of the current java/lang/System#nanoTime() (which is implemented using
- * CLOCK_MONOTONIC on Android). See the Android MediaCodec documentation
- * of android/media/MediaCodec#releaseOutputBuffer(int,long) for more details.
- *
- * @param buffer the buffer to render
- * @param time timestamp in nanoseconds of when to render the buffer
- * @return 0 on success, < 0 otherwise
- */
-int av_mediacodec_render_buffer_at_time(AVMediaCodecBuffer *buffer, int64_t time);
-
-#endif /* AVCODEC_MEDIACODEC_H */

gpac-2.2.1.tar.gz/extra_lib/include/libavcodec/packet.h Deleted

@@ -1,725 +0,0 @@
-/*
- * AVPacket public API
- *
- * 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_PACKET_H
-#define AVCODEC_PACKET_H
-
-#include <stddef.h>
-#include <stdint.h>
-
-#include "libavutil/attributes.h"
-#include "libavutil/buffer.h"
-#include "libavutil/dict.h"
-#include "libavutil/rational.h"
-
-#include "libavcodec/version.h"
-
-/**
- * @defgroup lavc_packet AVPacket
- *
- * Types and functions for working with AVPacket.
- * @{
- */
-enum AVPacketSideDataType {
-    /**
-     * An AV_PKT_DATA_PALETTE side data packet contains exactly AVPALETTE_SIZE
-     * bytes worth of palette. This side data signals that a new palette is
-     * present.
-     */
-    AV_PKT_DATA_PALETTE,
-
-    /**
-     * The AV_PKT_DATA_NEW_EXTRADATA is used to notify the codec or the format
-     * that the extradata buffer was changed and the receiving side should
-     * act upon it appropriately. The new extradata is embedded in the side
-     * data buffer and should be immediately used for processing the current
-     * frame or packet.
-     */
-    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,
-
-    /**
-     * This side data should be associated with an audio stream and corresponds
-     * to enum AVAudioServiceType.
-     */
-    AV_PKT_DATA_AUDIO_SERVICE_TYPE,
-
-    /**
-     * This side data contains quality related information from the encoder.
-     * @code
-     * u32le quality factor of the compressed frame. Allowed range is between 1 (good) and FF_LAMBDA_MAX (bad).
-     * u8    picture type
-     * u8    error count
-     * u16   reserved
-     * u64leerror count sum of squared differences between encoder in and output
-     * @endcode
-     */
-    AV_PKT_DATA_QUALITY_STATS,
-
-    /**
-     * This side data contains an integer value representing the stream index
-     * of a "fallback" track.  A fallback track indicates an alternate
-     * track to use when the current track can not be decoded for some reason.
-     * e.g. no decoder available for codec.
-     */
-    AV_PKT_DATA_FALLBACK_TRACK,
-
-    /**
-     * This side data corresponds to the AVCPBProperties struct.
-     */
-    AV_PKT_DATA_CPB_PROPERTIES,
-
-    /**
-     * 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,
-
-    /**
-     * 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,
-
-    /**
-     * MPEGTS stream ID as uint8_t, this is required to pass the stream ID
-     * information from the demuxer to the corresponding muxer.
-     */
-    AV_PKT_DATA_MPEGTS_STREAM_ID,
-
-    /**
-     * Mastering display metadata (based on SMPTE-2086:2014). This metadata
-     * should be associated with a video stream and contains data in the form
-     * of the AVMasteringDisplayMetadata struct.
-     */
-    AV_PKT_DATA_MASTERING_DISPLAY_METADATA,
-
-    /**
-     * This side data should be associated with a video stream and corresponds
-     * to the AVSphericalMapping structure.
-     */
-    AV_PKT_DATA_SPHERICAL,
-
-    /**
-     * Content light level (based on CTA-861.3). This metadata should be
-     * associated with a video stream and contains data in the form of the
-     * AVContentLightMetadata struct.
-     */
-    AV_PKT_DATA_CONTENT_LIGHT_LEVEL,
-
-    /**
-     * ATSC A53 Part 4 Closed Captions. This metadata should be associated with
-     * a video stream. A53 CC bitstream is stored as uint8_t in AVPacketSideData.data.
-     * The number of bytes of CC data is AVPacketSideData.size.
-     */
-    AV_PKT_DATA_A53_CC,
-
-    /**
-     * This side data is encryption initialization data.
-     * The format is not part of ABI, use av_encryption_init_info_* methods to
-     * access.
-     */
-    AV_PKT_DATA_ENCRYPTION_INIT_INFO,
-
-    /**
-     * This side data contains encryption info for how to decrypt the packet.
-     * The format is not part of ABI, use av_encryption_info_* methods to access.
-     */
-    AV_PKT_DATA_ENCRYPTION_INFO,
-
-    /**
-     * Active Format Description data consisting of a single byte as specified
-     * in ETSI TS 101 154 using AVActiveFormatDescription enum.
-     */
-    AV_PKT_DATA_AFD,
-
-    /**
-     * Producer Reference Time data corresponding to the AVProducerReferenceTime struct,
-     * usually exported by some encoders (on demand through the prft flag set in the
-     * AVCodecContext export_side_data field).
-     */
-    AV_PKT_DATA_PRFT,
-
-    /**
-     * ICC profile data consisting of an opaque octet buffer following the
-     * format described by ISO 15076-1.
-     */
-    AV_PKT_DATA_ICC_PROFILE,
-
-    /**
-     * DOVI configuration
-     * ref:
-     * dolby-vision-bitstreams-within-the-iso-base-media-file-format-v2.1.2, section 2.2
-     * dolby-vision-bitstreams-in-mpeg-2-transport-stream-multiplex-v1.2, section 3.3
-     * Tags are stored in struct AVDOVIDecoderConfigurationRecord.
-     */
-    AV_PKT_DATA_DOVI_CONF,
-
-    /**
-     * Timecode which conforms to SMPTE ST 12-1:2014. The data is an array of 4 uint32_t
-     * where the first uint32_t describes how many (1-3) of the other timecodes are used.
-     * The timecode format is described in the documentation of av_timecode_get_smpte_from_framenum()
-     * function in libavutil/timecode.h.
-     */
-    AV_PKT_DATA_S12M_TIMECODE,
-
-    /**
-     * HDR10+ dynamic metadata associated with a video frame. The metadata is in
-     * the form of the AVDynamicHDRPlus struct and contains
-     * information for color volume transform - application 4 of
-     * SMPTE 2094-40:2016 standard.
-     */
-    AV_PKT_DATA_DYNAMIC_HDR10_PLUS,
-
-    /**
-     * The number of side data types.
-     * This is not part of the public API/ABI in the sense that it may
-     * change when new side data types are added.
-     * This must stay the last enum value.
-     * If its value becomes huge, some code using it
-     * needs to be updated as it assumes it to be smaller than other limits.
-     */
-    AV_PKT_DATA_NB
-};
-
-#define AV_PKT_DATA_QUALITY_FACTOR AV_PKT_DATA_QUALITY_STATS //DEPRECATED
-
-typedef struct AVPacketSideData {
-    uint8_t *data;
-    size_t   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. Encoders are allowed to output empty
- * packets, with no compressed data, containing only side data
- * (e.g. to update some stream parameters at the end of encoding).
- *
- * The semantics of data ownership depends on the buf field.
- * If it is set, the packet data is dynamically allocated and is
- * valid indefinitely until a call to av_packet_unref() reduces the
- * reference count to 0.
- *
- * If the buf field is not set av_packet_ref() would make a copy instead
- * of increasing the reference count.
- *
- * The side data is always allocated with av_malloc(), copied by
- * av_packet_ref() and freed by av_packet_unref().
- *
- * sizeof(AVPacket) being a part of the public ABI is deprecated. once
- * av_init_packet() is removed, new packets will only be able to be allocated
- * with av_packet_alloc(), and new fields may be added to the end of the struct
- * with a minor bump.
- *
- * @see av_packet_alloc
- * @see av_packet_ref
- * @see av_packet_unref
- */
-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.
-     * pts MUST be larger or equal to dts as presentation cannot happen before
-     * decompression, unless one wants to view hex dumps. Some formats misuse
-     * the terms dts and pts/cts to mean something different. Such timestamps
-     * must be converted to true pts/dts before they are stored in AVPacket.
-     */
-    int64_t pts;
-    /**
-     * Decompression timestamp in AVStream->time_base units; the time at which
-     * the packet is decompressed.
-     * Can be AV_NOPTS_VALUE if it is not stored in the file.
-     */
-    int64_t dts;
-    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.
-     */
-    int64_t duration;
-
-    int64_t pos;                            ///< byte position in stream, -1 if unknown
-
-    /**
-     * for some private data of the user
-     */
-    void *opaque;
-
-    /**
-     * AVBufferRef for free use by the API user. FFmpeg will never check the
-     * contents of the buffer ref. FFmpeg calls av_buffer_unref() on it when
-     * the packet is unreferenced. av_packet_copy_props() calls create a new
-     * reference with av_buffer_ref() for the target packet's opaque_ref field.
-     *
-     * This is unrelated to the opaque field, although it serves a similar
-     * purpose.
-     */
-    AVBufferRef *opaque_ref;
-
-    /**
-     * Time base of the packet's timestamps.
-     * In the future, this field may be set on packets output by encoders or
-     * demuxers, but its value will be by default ignored on input to decoders
-     * or muxers.
-     */
-    AVRational time_base;
-} AVPacket;
-
-#if FF_API_INIT_PACKET
-attribute_deprecated
-typedef struct AVPacketList {
-    AVPacket pkt;
-    struct AVPacketList *next;
-} AVPacketList;
-#endif
-
-#define AV_PKT_FLAG_KEY     0x0001 ///< The packet contains a keyframe
-#define AV_PKT_FLAG_CORRUPT 0x0002 ///< The packet content is corrupted
-/**
- * Flag is used to discard packets which are required to maintain valid
- * decoder state but are not required for output and should be dropped
- * after decoding.
- **/
-#define AV_PKT_FLAG_DISCARD   0x0004
-/**
- * The packet comes from a trusted source.
- *
- * Otherwise-unsafe constructs such as arbitrary pointers to data
- * outside the packet may be followed.
- */
-#define AV_PKT_FLAG_TRUSTED   0x0008
-/**
- * Flag is used to indicate packets that contain frames that can
- * be discarded by the decoder.  I.e. Non-reference frames.
- */
-#define AV_PKT_FLAG_DISPOSABLE 0x0010
-
-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,
-};
-
-/**
- * Allocate an AVPacket and set its fields to default values.  The resulting
- * struct must be freed using av_packet_free().
- *
- * @return An AVPacket filled with default values or NULL on failure.
- *
- * @note this only allocates the AVPacket itself, not the data buffers. Those
- * must be allocated through other means such as av_new_packet.
- *
- * @see av_new_packet
- */
-AVPacket *av_packet_alloc(void);
-
-/**
- * Create a new packet that references the same data as src.
- *
- * This is a shortcut for av_packet_alloc()+av_packet_ref().
- *
- * @return newly created AVPacket on success, NULL on error.
- *
- * @see av_packet_alloc
- * @see av_packet_ref
- */
-AVPacket *av_packet_clone(const AVPacket *src);
-
-/**
- * Free the packet, if the packet is reference counted, it will be
- * unreferenced first.
- *
- * @param pkt packet to be freed. The pointer will be set to NULL.
- * @note passing NULL is a no-op.
- */
-void av_packet_free(AVPacket **pkt);
-
-#if FF_API_INIT_PACKET
-/**
- * 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
- *
- * @see av_packet_alloc
- * @see av_packet_unref
- *
- * @deprecated This function is deprecated. Once it's removed,
-               sizeof(AVPacket) will not be a part of the ABI anymore.
- */
-attribute_deprecated
-void av_init_packet(AVPacket *pkt);
-#endif
-
-/**
- * Allocate the payload of a packet and initialize its fields with
- * default values.
- *
- * @param pkt packet
- * @param size wanted payload size
- * @return 0 if OK, AVERROR_xxx otherwise
- */
-int av_new_packet(AVPacket *pkt, int size);
-
-/**
- * Reduce packet size, correctly zeroing padding
- *
- * @param pkt packet
- * @param size new size
- */
-void av_shrink_packet(AVPacket *pkt, int size);
-
-/**
- * Increase packet size, correctly zeroing padding
- *
- * @param pkt packet
- * @param grow_by number of bytes by which to increase the size of the packet
- */
-int av_grow_packet(AVPacket *pkt, int grow_by);
-
-/**
- * Initialize a reference-counted packet from av_malloc()ed data.
- *
- * @param pkt packet to be initialized. This function will set the data, size,
- *        and buf 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 + AV_INPUT_BUFFER_PADDING_SIZE.
- *
- * @return 0 on success, a negative AVERROR on error
- */
-int av_packet_from_data(AVPacket *pkt, uint8_t *data, int size);
-
-/**
- * Allocate new information of a packet.
- *
- * @param pkt packet
- * @param type side information type
- * @param size side information size
- * @return pointer to fresh allocated data or NULL otherwise
- */
-uint8_t* av_packet_new_side_data(AVPacket *pkt, enum AVPacketSideDataType type,
-                                 size_t size);
-
-/**
- * Wrap an existing array as a packet side data.
- *
- * @param pkt packet
- * @param type side information type
- * @param data the side data array. It must be allocated with the av_malloc()
- *             family of functions. The ownership of the data is transferred to
- *             pkt.
- * @param size side information size
- * @return a non-negative number on success, a negative AVERROR code on
- *         failure. On failure, the packet is unchanged and the data remains
- *         owned by the caller.
- */
-int av_packet_add_side_data(AVPacket *pkt, enum AVPacketSideDataType type,
-                            uint8_t *data, size_t size);
-
-/**
- * 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
- */
-int av_packet_shrink_side_data(AVPacket *pkt, enum AVPacketSideDataType type,
-                               size_t size);
-
-/**
- * Get side information from packet.
- *
- * @param pkt packet
- * @param type desired side information type
- * @param size If supplied, *size will be set to the size of the side data
- *             or to zero if the desired side data is not present.
- * @return pointer to data if present or NULL otherwise
- */
-uint8_t* av_packet_get_side_data(const AVPacket *pkt, enum AVPacketSideDataType type,
-                                 size_t *size);
-
-const char *av_packet_side_data_name(enum AVPacketSideDataType type);
-
-/**
- * Pack a dictionary for use in side_data.
- *
- * @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, size_t *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
- */
-int av_packet_unpack_dictionary(const uint8_t *data, size_t size,
-                                AVDictionary **dict);
-
-/**
- * Convenience function to free all the side data stored.
- * All the other fields stay untouched.
- *
- * @param pkt packet
- */
-void av_packet_free_side_data(AVPacket *pkt);
-
-/**
- * Setup a new reference to the data described by a given packet
- *
- * 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. Will be completely overwritten.
- * @param src Source packet
- *
- * @return 0 on success, a negative AVERROR on error. On error, dst
- *         will be blank (as if returned by av_packet_alloc()).
- */
-int av_packet_ref(AVPacket *dst, const AVPacket *src);
-
-/**
- * Wipe the packet.
- *
- * Unreference the buffer referenced by the packet and reset the
- * remaining packet fields to their default values.
- *
- * @param pkt The packet to be unreferenced.
- */
-void av_packet_unref(AVPacket *pkt);
-
-/**
- * Move every field in src to dst and reset src.
- *
- * @see av_packet_unref
- *
- * @param src Source packet, will be reset
- * @param dst Destination packet
- */
-void av_packet_move_ref(AVPacket *dst, AVPacket *src);
-
-/**
- * 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);
-
-/**
- * Ensure the data described by a given packet is reference counted.
- *
- * @note This function does not ensure that the reference will be writable.
- *       Use av_packet_make_writable instead for that purpose.
- *
- * @see av_packet_ref
- * @see av_packet_make_writable
- *
- * @param pkt packet whose data should be made reference counted.
- *
- * @return 0 on success, a negative AVERROR on error. On failure, the
- *         packet is unchanged.
- */
-int av_packet_make_refcounted(AVPacket *pkt);
-
-/**
- * Create a writable reference for the data described by a given packet,
- * avoiding data copy if possible.
- *
- * @param pkt Packet whose data should be made writable.
- *
- * @return 0 on success, a negative AVERROR on failure. On failure, the
- *         packet is unchanged.
- */
-int av_packet_make_writable(AVPacket *pkt);
-
-/**
- * Convert valid timing fields (timestamps / durations) in a packet from one
- * timebase to another. Timestamps with unknown values (AV_NOPTS_VALUE) will be
- * ignored.
- *
- * @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
- */
-void av_packet_rescale_ts(AVPacket *pkt, AVRational tb_src, AVRational tb_dst);
-
-/**
- * @}
- */
-
-#endif // AVCODEC_PACKET_H

gpac-2.2.1.tar.gz/extra_lib/include/libavcodec/qsv.h Deleted

@@ -1,107 +0,0 @@
-/*
- * Intel MediaSDK QSV public API
- *
- * 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_QSV_H
-#define AVCODEC_QSV_H
-
-#include <mfx/mfxvideo.h>
-
-#include "libavutil/buffer.h"
-
-/**
- * This struct is used for communicating QSV parameters between libavcodec and
- * the caller. It is managed by the caller and must be assigned to
- * AVCodecContext.hwaccel_context.
- * - decoding: hwaccel_context must be set on return from the get_format()
- *             callback
- * - encoding: hwaccel_context must be set before avcodec_open2()
- */
-typedef struct AVQSVContext {
-    /**
-     * If non-NULL, the session to use for encoding or decoding.
-     * Otherwise, libavcodec will try to create an internal session.
-     */
-    mfxSession session;
-
-    /**
-     * The IO pattern to use.
-     */
-    int iopattern;
-
-    /**
-     * Extra buffers to pass to encoder or decoder initialization.
-     */
-    mfxExtBuffer **ext_buffers;
-    int         nb_ext_buffers;
-
-    /**
-     * Encoding only. If this field is set to non-zero by the caller, libavcodec
-     * will create an mfxExtOpaqueSurfaceAlloc extended buffer and pass it to
-     * the encoder initialization. This only makes sense if iopattern is also
-     * set to MFX_IOPATTERN_IN_OPAQUE_MEMORY.
-     *
-     * The number of allocated opaque surfaces will be the sum of the number
-     * required by the encoder and the user-provided value nb_opaque_surfaces.
-     * The array of the opaque surfaces will be exported to the caller through
-     * the opaque_surfaces field.
-     */
-    int opaque_alloc;
-
-    /**
-     * Encoding only, and only if opaque_alloc is set to non-zero. Before
-     * calling avcodec_open2(), the caller should set this field to the number
-     * of extra opaque surfaces to allocate beyond what is required by the
-     * encoder.
-     *
-     * On return from avcodec_open2(), this field will be set by libavcodec to
-     * the total number of allocated opaque surfaces.
-     */
-    int nb_opaque_surfaces;
-
-    /**
-     * Encoding only, and only if opaque_alloc is set to non-zero. On return
-     * from avcodec_open2(), this field will be used by libavcodec to export the
-     * array of the allocated opaque surfaces to the caller, so they can be
-     * passed to other parts of the pipeline.
-     *
-     * The buffer reference exported here is owned and managed by libavcodec,
-     * the callers should make their own reference with av_buffer_ref() and free
-     * it with av_buffer_unref() when it is no longer needed.
-     *
-     * The buffer data is an nb_opaque_surfaces-sized array of mfxFrameSurface1.
-     */
-    AVBufferRef *opaque_surfaces;
-
-    /**
-     * Encoding only, and only if opaque_alloc is set to non-zero. On return
-     * from avcodec_open2(), this field will be set to the surface type used in
-     * the opaque allocation request.
-     */
-    int opaque_alloc_type;
-} AVQSVContext;
-
-/**
- * Allocate a new context.
- *
- * It must be freed by the caller with av_free().
- */
-AVQSVContext *av_qsv_alloc_context(void);
-
-#endif /* AVCODEC_QSV_H */

gpac-2.2.1.tar.gz/extra_lib/include/libavcodec/vdpau.h Deleted

@@ -1,157 +0,0 @@
-/*
- * 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 "libavutil/avconfig.h"
-#include "libavutil/attributes.h"
-
-#include "avcodec.h"
-
-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;
-
-    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);
-
-/**
- * Associate a VDPAU device with a codec context for hardware acceleration.
- * This function is meant to be called from the get_format() codec callback,
- * or earlier. It can also be called after avcodec_flush_buffers() to change
- * the underlying VDPAU device mid-stream (e.g. to recover from non-transparent
- * display preemption).
- *
- * @note get_format() must return AV_PIX_FMT_VDPAU if this function completes
- * successfully.
- *
- * @param avctx decoding context whose get_format() callback is invoked
- * @param device VDPAU device handle to use for hardware acceleration
- * @param get_proc_address VDPAU device driver
- * @param flags zero of more OR'd AV_HWACCEL_FLAG_* flags
- *
- * @return 0 on success, an AVERROR code on failure.
- */
-int av_vdpau_bind_context(AVCodecContext *avctx, VdpDevice device,
-                          VdpGetProcAddress *get_proc_address, unsigned flags);
-
-/**
- * Gets the parameters to create an adequate VDPAU video surface for the codec
- * context using VDPAU hardware decoding acceleration.
- *
- * @note Behavior is undefined if the context was not successfully bound to a
- * VDPAU device using av_vdpau_bind_context().
- *
- * @param avctx the codec context being used for decoding the stream
- * @param type storage space for the VDPAU video surface chroma type
- *              (or NULL to ignore)
- * @param width storage space for the VDPAU video surface pixel width
- *              (or NULL to ignore)
- * @param height storage space for the VDPAU video surface pixel height
- *              (or NULL to ignore)
- *
- * @return 0 on success, a negative AVERROR code on failure.
- */
-int av_vdpau_get_surface_parameters(AVCodecContext *avctx, VdpChromaType *type,
-                                    uint32_t *width, uint32_t *height);
-
-/**
- * Allocate an AVVDPAUContext.
- *
- * @return Newly-allocated AVVDPAUContext or NULL on failure.
- */
-AVVDPAUContext *av_vdpau_alloc_context(void);
-
-/* @}*/
-
-#endif /* AVCODEC_VDPAU_H */

gpac-2.2.1.tar.gz/extra_lib/include/libavcodec/version.h Deleted

@@ -1,67 +0,0 @@
-/*
- * 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  59
-#define LIBAVCODEC_VERSION_MINOR  18
-#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.
- *
- * @note, when bumping the major version it is recommended to manually
- * disable each FF_API_* in its own commit instead of disabling them all
- * at once through the bump. This improves the git bisect-ability of the change.
- */
-
-#define FF_API_OPENH264_SLICE_MODE (LIBAVCODEC_VERSION_MAJOR < 60)
-#define FF_API_OPENH264_CABAC      (LIBAVCODEC_VERSION_MAJOR < 60)
-#define FF_API_UNUSED_CODEC_CAPS   (LIBAVCODEC_VERSION_MAJOR < 60)
-#define FF_API_THREAD_SAFE_CALLBACKS (LIBAVCODEC_VERSION_MAJOR < 60)
-#define FF_API_DEBUG_MV          (LIBAVCODEC_VERSION_MAJOR < 60)
-#define FF_API_GET_FRAME_CLASS     (LIBAVCODEC_VERSION_MAJOR < 60)
-#define FF_API_AUTO_THREADS        (LIBAVCODEC_VERSION_MAJOR < 60)
-#define FF_API_INIT_PACKET         (LIBAVCODEC_VERSION_MAJOR < 60)
-#define FF_API_AVCTX_TIMEBASE    (LIBAVCODEC_VERSION_MAJOR < 60)
-#define FF_API_MPEGVIDEO_OPTS      (LIBAVCODEC_VERSION_MAJOR < 60)
-#define FF_API_FLAG_TRUNCATED      (LIBAVCODEC_VERSION_MAJOR < 60)
-#define FF_API_SUB_TEXT_FORMAT     (LIBAVCODEC_VERSION_MAJOR < 60)
-
-#endif /* AVCODEC_VERSION_H */

gpac-2.2.1.tar.gz/extra_lib/include/libavcodec/videotoolbox.h Deleted

@@ -1,127 +0,0 @@
-/*
- * Videotoolbox hardware acceleration
- *
- * copyright (c) 2012 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_VIDEOTOOLBOX_H
-#define AVCODEC_VIDEOTOOLBOX_H
-
-/**
- * @file
- * @ingroup lavc_codec_hwaccel_videotoolbox
- * Public libavcodec Videotoolbox header.
- */
-
-#include <stdint.h>
-
-#define Picture QuickdrawPicture
-#include <VideoToolbox/VideoToolbox.h>
-#undef Picture
-
-#include "libavcodec/avcodec.h"
-
-/**
- * This struct holds all the information that needs to be passed
- * between the caller and libavcodec for initializing Videotoolbox decoding.
- * Its size is not a part of the public ABI, it must be allocated with
- * av_videotoolbox_alloc_context() and freed with av_free().
- */
-typedef struct AVVideotoolboxContext {
-    /**
-     * Videotoolbox decompression session object.
-     * Created and freed the caller.
-     */
-    VTDecompressionSessionRef session;
-
-    /**
-     * The output callback that must be passed to the session.
-     * Set by av_videottoolbox_default_init()
-     */
-    VTDecompressionOutputCallback output_callback;
-
-    /**
-     * CVPixelBuffer Format Type that Videotoolbox will use for decoded frames.
-     * set by the caller. If this is set to 0, then no specific format is
-     * requested from the decoder, and its native format is output.
-     */
-    OSType cv_pix_fmt_type;
-
-    /**
-     * CoreMedia Format Description that Videotoolbox will use to create the decompression session.
-     * Set by the caller.
-     */
-    CMVideoFormatDescriptionRef cm_fmt_desc;
-
-    /**
-     * CoreMedia codec type that Videotoolbox will use to create the decompression session.
-     * Set by the caller.
-     */
-    int cm_codec_type;
-} AVVideotoolboxContext;
-
-/**
- * Allocate and initialize a Videotoolbox context.
- *
- * This function should be called from the get_format() callback when the caller
- * selects the AV_PIX_FMT_VIDETOOLBOX format. The caller must then create
- * the decoder object (using the output callback provided by libavcodec) that
- * will be used for Videotoolbox-accelerated decoding.
- *
- * When decoding with Videotoolbox is finished, the caller must destroy the decoder
- * object and free the Videotoolbox context using av_free().
- *
- * @return the newly allocated context or NULL on failure
- */
-AVVideotoolboxContext *av_videotoolbox_alloc_context(void);
-
-/**
- * This is a convenience function that creates and sets up the Videotoolbox context using
- * an internal implementation.
- *
- * @param avctx the corresponding codec context
- *
- * @return >= 0 on success, a negative AVERROR code on failure
- */
-int av_videotoolbox_default_init(AVCodecContext *avctx);
-
-/**
- * This is a convenience function that creates and sets up the Videotoolbox context using
- * an internal implementation.
- *
- * @param avctx the corresponding codec context
- * @param vtctx the Videotoolbox context to use
- *
- * @return >= 0 on success, a negative AVERROR code on failure
- */
-int av_videotoolbox_default_init2(AVCodecContext *avctx, AVVideotoolboxContext *vtctx);
-
-/**
- * This function must be called to free the Videotoolbox context initialized with
- * av_videotoolbox_default_init().
- *
- * @param avctx the corresponding codec context
- */
-void av_videotoolbox_default_free(AVCodecContext *avctx);
-
-/**
- * @}
- */
-
-#endif /* AVCODEC_VIDEOTOOLBOX_H */

gpac-2.2.1.tar.gz/extra_lib/include/libavcodec/vorbis_parser.h Deleted

@@ -1,74 +0,0 @@
-/*
- * 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 public API for Vorbis parsing
- *
- * Determines the duration for each packet.
- */
-
-#ifndef AVCODEC_VORBIS_PARSER_H
-#define AVCODEC_VORBIS_PARSER_H
-
-#include <stdint.h>
-
-typedef struct AVVorbisParseContext AVVorbisParseContext;
-
-/**
- * Allocate and initialize the Vorbis parser using headers in the extradata.
- */
-AVVorbisParseContext *av_vorbis_parse_init(const uint8_t *extradata,
-                                           int extradata_size);
-
-/**
- * Free the parser and everything associated with it.
- */
-void av_vorbis_parse_free(AVVorbisParseContext **s);
-
-#define VORBIS_FLAG_HEADER  0x00000001
-#define VORBIS_FLAG_COMMENT 0x00000002
-#define VORBIS_FLAG_SETUP   0x00000004
-
-/**
- * Get the duration for a Vorbis packet.
- *
- * If @p flags is @c NULL,
- * special frames are considered invalid.
- *
- * @param s        Vorbis parser context
- * @param buf      buffer containing a Vorbis frame
- * @param buf_size size of the buffer
- * @param flags    flags for special frames
- */
-int av_vorbis_parse_frame_flags(AVVorbisParseContext *s, const uint8_t *buf,
-                                int buf_size, int *flags);
-
-/**
- * Get the duration for a Vorbis packet.
- *
- * @param s        Vorbis parser context
- * @param buf      buffer containing a Vorbis frame
- * @param buf_size size of the buffer
- */
-int av_vorbis_parse_frame(AVVorbisParseContext *s, const uint8_t *buf,
-                          int buf_size);
-
-void av_vorbis_parse_reset(AVVorbisParseContext *s);
-
-#endif /* AVCODEC_VORBIS_PARSER_H */

gpac-2.2.1.tar.gz/extra_lib/include/libavcodec/xvmc.h Deleted

@@ -1,170 +0,0 @@
-/*
- * 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) */
-
-struct attribute_deprecated 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-2.2.1.tar.gz/extra_lib/include/libavdevice Deleted

gpac-2.2.1.tar.gz/extra_lib/include/libavdevice/avdevice.h Deleted

@@ -1,521 +0,0 @@
-/*
- * 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 AVDEVICE_AVDEVICE_H
-#define AVDEVICE_AVDEVICE_H
-
-#include "version.h"
-
-/**
- * @file
- * @ingroup lavd
- * Main libavdevice API header
- */
-
-/**
- * @defgroup lavd libavdevice
- * Special devices muxing/demuxing library.
- *
- * Libavdevice is a complementary library to @ref libavf "libavformat". It
- * provides various "special" platform-specific muxers and demuxers, e.g. for
- * grabbing devices, audio capture and playback etc. As a consequence, the
- * (de)muxers in libavdevice are of the AVFMT_NOFILE type (they use their own
- * I/O functions). The filename passed to avformat_open_input() often does not
- * refer to an actually existing file, but has some special device-specific
- * meaning - e.g. for xcbgrab it is the display name.
- *
- * To use libavdevice, simply call avdevice_register_all() to register all
- * compiled muxers and demuxers. They all use standard libavformat API.
- *
- * @{
- */
-
-#include "libavutil/log.h"
-#include "libavutil/opt.h"
-#include "libavutil/dict.h"
-#include "libavformat/avformat.h"
-
-/**
- * Return the LIBAVDEVICE_VERSION_INT constant.
- */
-unsigned avdevice_version(void);
-
-/**
- * Return the libavdevice build-time configuration.
- */
-const char *avdevice_configuration(void);
-
-/**
- * Return the libavdevice license.
- */
-const char *avdevice_license(void);
-
-/**
- * Initialize libavdevice and register all the input and output devices.
- */
-void avdevice_register_all(void);
-
-/**
- * Audio input devices iterator.
- *
- * If d is NULL, returns the first registered input audio/video device,
- * if d is non-NULL, returns the next registered input audio/video device after d
- * or NULL if d is the last one.
- */
-const AVInputFormat *av_input_audio_device_next(const AVInputFormat  *d);
-
-/**
- * Video input devices iterator.
- *
- * If d is NULL, returns the first registered input audio/video device,
- * if d is non-NULL, returns the next registered input audio/video device after d
- * or NULL if d is the last one.
- */
-const AVInputFormat *av_input_video_device_next(const AVInputFormat  *d);
-
-/**
- * Audio output devices iterator.
- *
- * If d is NULL, returns the first registered output audio/video device,
- * if d is non-NULL, returns the next registered output audio/video device after d
- * or NULL if d is the last one.
- */
-const AVOutputFormat *av_output_audio_device_next(const AVOutputFormat *d);
-
-/**
- * Video output devices iterator.
- *
- * If d is NULL, returns the first registered output audio/video device,
- * if d is non-NULL, returns the next registered output audio/video device after d
- * or NULL if d is the last one.
- */
-const AVOutputFormat *av_output_video_device_next(const AVOutputFormat *d);
-
-typedef struct AVDeviceRect {
-    int x;      /**< x coordinate of top left corner */
-    int y;      /**< y coordinate of top left corner */
-    int width;  /**< width */
-    int height; /**< height */
-} AVDeviceRect;
-
-/**
- * Message types used by avdevice_app_to_dev_control_message().
- */
-enum AVAppToDevMessageType {
-    /**
-     * Dummy message.
-     */
-    AV_APP_TO_DEV_NONE = MKBETAG('N','O','N','E'),
-
-    /**
-     * Window size change message.
-     *
-     * Message is sent to the device every time the application changes the size
-     * of the window device renders to.
-     * Message should also be sent right after window is created.
-     *
-     * data: AVDeviceRect: new window size.
-     */
-    AV_APP_TO_DEV_WINDOW_SIZE = MKBETAG('G','E','O','M'),
-
-    /**
-     * Repaint request message.
-     *
-     * Message is sent to the device when window has to be repainted.
-     *
-     * data: AVDeviceRect: area required to be repainted.
-     *       NULL: whole area is required to be repainted.
-     */
-    AV_APP_TO_DEV_WINDOW_REPAINT = MKBETAG('R','E','P','A'),
-
-    /**
-     * Request pause/play.
-     *
-     * Application requests pause/unpause playback.
-     * Mostly usable with devices that have internal buffer.
-     * By default devices are not paused.
-     *
-     * data: NULL
-     */
-    AV_APP_TO_DEV_PAUSE        = MKBETAG('P', 'A', 'U', ' '),
-    AV_APP_TO_DEV_PLAY         = MKBETAG('P', 'L', 'A', 'Y'),
-    AV_APP_TO_DEV_TOGGLE_PAUSE = MKBETAG('P', 'A', 'U', 'T'),
-
-    /**
-     * Volume control message.
-     *
-     * Set volume level. It may be device-dependent if volume
-     * is changed per stream or system wide. Per stream volume
-     * change is expected when possible.
-     *
-     * data: double: new volume with range of 0.0 - 1.0.
-     */
-    AV_APP_TO_DEV_SET_VOLUME = MKBETAG('S', 'V', 'O', 'L'),
-
-    /**
-     * Mute control messages.
-     *
-     * Change mute state. It may be device-dependent if mute status
-     * is changed per stream or system wide. Per stream mute status
-     * change is expected when possible.
-     *
-     * data: NULL.
-     */
-    AV_APP_TO_DEV_MUTE        = MKBETAG(' ', 'M', 'U', 'T'),
-    AV_APP_TO_DEV_UNMUTE      = MKBETAG('U', 'M', 'U', 'T'),
-    AV_APP_TO_DEV_TOGGLE_MUTE = MKBETAG('T', 'M', 'U', 'T'),
-
-    /**
-     * Get volume/mute messages.
-     *
-     * Force the device to send AV_DEV_TO_APP_VOLUME_LEVEL_CHANGED or
-     * AV_DEV_TO_APP_MUTE_STATE_CHANGED command respectively.
-     *
-     * data: NULL.
-     */
-    AV_APP_TO_DEV_GET_VOLUME = MKBETAG('G', 'V', 'O', 'L'),
-    AV_APP_TO_DEV_GET_MUTE   = MKBETAG('G', 'M', 'U', 'T'),
-};
-
-/**
- * Message types used by avdevice_dev_to_app_control_message().
- */
-enum AVDevToAppMessageType {
-    /**
-     * Dummy message.
-     */
-    AV_DEV_TO_APP_NONE = MKBETAG('N','O','N','E'),
-
-    /**
-     * Create window buffer message.
-     *
-     * Device requests to create a window buffer. Exact meaning is device-
-     * and application-dependent. Message is sent before rendering first
-     * frame and all one-shot initializations should be done here.
-     * Application is allowed to ignore preferred window buffer size.
-     *
-     * @note: Application is obligated to inform about window buffer size
-     *        with AV_APP_TO_DEV_WINDOW_SIZE message.
-     *
-     * data: AVDeviceRect: preferred size of the window buffer.
-     *       NULL: no preferred size of the window buffer.
-     */
-    AV_DEV_TO_APP_CREATE_WINDOW_BUFFER = MKBETAG('B','C','R','E'),
-
-    /**
-     * Prepare window buffer message.
-     *
-     * Device requests to prepare a window buffer for rendering.
-     * Exact meaning is device- and application-dependent.
-     * Message is sent before rendering of each frame.
-     *
-     * data: NULL.
-     */
-    AV_DEV_TO_APP_PREPARE_WINDOW_BUFFER = MKBETAG('B','P','R','E'),
-
-    /**
-     * Display window buffer message.
-     *
-     * Device requests to display a window buffer.
-     * Message is sent when new frame is ready to be displayed.
-     * Usually buffers need to be swapped in handler of this message.
-     *
-     * data: NULL.
-     */
-    AV_DEV_TO_APP_DISPLAY_WINDOW_BUFFER = MKBETAG('B','D','I','S'),
-
-    /**
-     * Destroy window buffer message.
-     *
-     * Device requests to destroy a window buffer.
-     * Message is sent when device is about to be destroyed and window
-     * buffer is not required anymore.
-     *
-     * data: NULL.
-     */
-    AV_DEV_TO_APP_DESTROY_WINDOW_BUFFER = MKBETAG('B','D','E','S'),
-
-    /**
-     * Buffer fullness status messages.
-     *
-     * Device signals buffer overflow/underflow.
-     *
-     * data: NULL.
-     */
-    AV_DEV_TO_APP_BUFFER_OVERFLOW = MKBETAG('B','O','F','L'),
-    AV_DEV_TO_APP_BUFFER_UNDERFLOW = MKBETAG('B','U','F','L'),
-
-    /**
-     * Buffer readable/writable.
-     *
-     * Device informs that buffer is readable/writable.
-     * When possible, device informs how many bytes can be read/write.
-     *
-     * @warning Device may not inform when number of bytes than can be read/write changes.
-     *
-     * data: int64_t: amount of bytes available to read/write.
-     *       NULL: amount of bytes available to read/write is not known.
-     */
-    AV_DEV_TO_APP_BUFFER_READABLE = MKBETAG('B','R','D',' '),
-    AV_DEV_TO_APP_BUFFER_WRITABLE = MKBETAG('B','W','R',' '),
-
-    /**
-     * Mute state change message.
-     *
-     * Device informs that mute state has changed.
-     *
-     * data: int: 0 for not muted state, non-zero for muted state.
-     */
-    AV_DEV_TO_APP_MUTE_STATE_CHANGED = MKBETAG('C','M','U','T'),
-
-    /**
-     * Volume level change message.
-     *
-     * Device informs that volume level has changed.
-     *
-     * data: double: new volume with range of 0.0 - 1.0.
-     */
-    AV_DEV_TO_APP_VOLUME_LEVEL_CHANGED = MKBETAG('C','V','O','L'),
-};
-
-/**
- * Send control message from application to device.
- *
- * @param s         device context.
- * @param type      message type.
- * @param data      message data. Exact type depends on message type.
- * @param data_size size of message data.
- * @return >= 0 on success, negative on error.
- *         AVERROR(ENOSYS) when device doesn't implement handler of the message.
- */
-int avdevice_app_to_dev_control_message(struct AVFormatContext *s,
-                                        enum AVAppToDevMessageType type,
-                                        void *data, size_t data_size);
-
-/**
- * Send control message from device to application.
- *
- * @param s         device context.
- * @param type      message type.
- * @param data      message data. Can be NULL.
- * @param data_size size of message data.
- * @return >= 0 on success, negative on error.
- *         AVERROR(ENOSYS) when application doesn't implement handler of the message.
- */
-int avdevice_dev_to_app_control_message(struct AVFormatContext *s,
-                                        enum AVDevToAppMessageType type,
-                                        void *data, size_t data_size);
-
-#if FF_API_DEVICE_CAPABILITIES
-/**
- * Following API allows user to probe device capabilities (supported codecs,
- * pixel formats, sample formats, resolutions, channel counts, etc).
- * It is build on top op AVOption API.
- * Queried capabilities make it possible to set up converters of video or audio
- * parameters that fit to the device.
- *
- * List of capabilities that can be queried:
- *  - Capabilities valid for both audio and video devices:
- *    - codec:          supported audio/video codecs.
- *                      type: AV_OPT_TYPE_INT (AVCodecID value)
- *  - Capabilities valid for audio devices:
- *    - sample_format:  supported sample formats.
- *                      type: AV_OPT_TYPE_INT (AVSampleFormat value)
- *    - sample_rate:    supported sample rates.
- *                      type: AV_OPT_TYPE_INT
- *    - channels:       supported number of channels.
- *                      type: AV_OPT_TYPE_INT
- *    - channel_layout: supported channel layouts.
- *                      type: AV_OPT_TYPE_INT64
- *  - Capabilities valid for video devices:
- *    - pixel_format:   supported pixel formats.
- *                      type: AV_OPT_TYPE_INT (AVPixelFormat value)
- *    - window_size:    supported window sizes (describes size of the window size presented to the user).
- *                      type: AV_OPT_TYPE_IMAGE_SIZE
- *    - frame_size:     supported frame sizes (describes size of provided video frames).
- *                      type: AV_OPT_TYPE_IMAGE_SIZE
- *    - fps:            supported fps values
- *                      type: AV_OPT_TYPE_RATIONAL
- *
- * Value of the capability may be set by user using av_opt_set() function
- * and AVDeviceCapabilitiesQuery object. Following queries will
- * limit results to the values matching already set capabilities.
- * For example, setting a codec may impact number of formats or fps values
- * returned during next query. Setting invalid value may limit results to zero.
- *
- * Example of the usage basing on opengl output device:
- *
- * @code
- *  AVFormatContext *oc = NULL;
- *  AVDeviceCapabilitiesQuery *caps = NULL;
- *  AVOptionRanges *ranges;
- *  int ret;
- *
- *  if ((ret = avformat_alloc_output_context2(&oc, NULL, "opengl", NULL)) < 0)
- *      goto fail;
- *  if (avdevice_capabilities_create(&caps, oc, NULL) < 0)
- *      goto fail;
- *
- *  //query codecs
- *  if (av_opt_query_ranges(&ranges, caps, "codec", AV_OPT_MULTI_COMPONENT_RANGE)) < 0)
- *      goto fail;
- *  //pick codec here and set it
- *  av_opt_set(caps, "codec", AV_CODEC_ID_RAWVIDEO, 0);
- *
- *  //query format
- *  if (av_opt_query_ranges(&ranges, caps, "pixel_format", AV_OPT_MULTI_COMPONENT_RANGE)) < 0)
- *      goto fail;
- *  //pick format here and set it
- *  av_opt_set(caps, "pixel_format", AV_PIX_FMT_YUV420P, 0);
- *
- *  //query and set more capabilities
- *
- * fail:
- *  //clean up code
- *  avdevice_capabilities_free(&query, oc);
- *  avformat_free_context(oc);
- * @endcode
- */
-
-/**
- * Structure describes device capabilities.
- *
- * It is used by devices in conjunction with av_device_capabilities AVOption table
- * to implement capabilities probing API based on AVOption API. Should not be used directly.
- */
-typedef struct AVDeviceCapabilitiesQuery {
-    const AVClass *av_class;
-    AVFormatContext *device_context;
-    enum AVCodecID codec;
-    enum AVSampleFormat sample_format;
-    enum AVPixelFormat pixel_format;
-    int sample_rate;
-    int channels;
-    int64_t channel_layout;
-    int window_width;
-    int window_height;
-    int frame_width;
-    int frame_height;
-    AVRational fps;
-} AVDeviceCapabilitiesQuery;
-
-/**
- * AVOption table used by devices to implement device capabilities API. Should not be used by a user.
- */
-attribute_deprecated
-extern const AVOption av_device_capabilities;
-
-/**
- * Initialize capabilities probing API based on AVOption API.
- *
- * avdevice_capabilities_free() must be called when query capabilities API is
- * not used anymore.
- *
- * @paramout caps      Device capabilities data. Pointer to a NULL pointer must be passed.
- * @param s              Context of the device.
- * @param device_options An AVDictionary filled with device-private options.
- *                       On return this parameter will be destroyed and replaced with a dict
- *                       containing options that were not found. May be NULL.
- *                       The same options must be passed later to avformat_write_header() for output
- *                       devices or avformat_open_input() for input devices, or at any other place
- *                       that affects device-private options.
- *
- * @return >= 0 on success, negative otherwise.
- */
-attribute_deprecated
-int avdevice_capabilities_create(AVDeviceCapabilitiesQuery **caps, AVFormatContext *s,
-                                 AVDictionary **device_options);
-
-/**
- * Free resources created by avdevice_capabilities_create()
- *
- * @param caps Device capabilities data to be freed.
- * @param s    Context of the device.
- */
-attribute_deprecated
-void avdevice_capabilities_free(AVDeviceCapabilitiesQuery **caps, AVFormatContext *s);
-#endif
-
-/**
- * Structure describes basic parameters of the device.
- */
-typedef struct AVDeviceInfo {
-    char *device_name;                   /**< device name, format depends on device */
-    char *device_description;            /**< human friendly name */
-    enum AVMediaType *media_types;       /**< array indicating what media types(s), if any, a device can provide. If null, cannot provide any */
-    int nb_media_types;                  /**< length of media_types array, 0 if device cannot provide any media types */
-} AVDeviceInfo;
-
-/**
- * List of devices.
- */
-typedef struct AVDeviceInfoList {
-    AVDeviceInfo **devices;              /**< list of autodetected devices */
-    int nb_devices;                      /**< number of autodetected devices */
-    int default_device;                  /**< index of default device or -1 if no default */
-} AVDeviceInfoList;
-
-/**
- * List devices.
- *
- * Returns available device names and their parameters.
- *
- * @note: Some devices may accept system-dependent device names that cannot be
- *        autodetected. The list returned by this function cannot be assumed to
- *        be always completed.
- *
- * @param s                device context.
- * @paramout device_list list of autodetected devices.
- * @return count of autodetected devices, negative on error.
- */
-int avdevice_list_devices(struct AVFormatContext *s, AVDeviceInfoList **device_list);
-
-/**
- * Convenient function to free result of avdevice_list_devices().
- *
- * @param devices device list to be freed.
- */
-void avdevice_free_list_devices(AVDeviceInfoList **device_list);
-
-/**
- * List devices.
- *
- * Returns available device names and their parameters.
- * These are convinient wrappers for avdevice_list_devices().
- * Device context is allocated and deallocated internally.
- *
- * @param device           device format. May be NULL if device name is set.
- * @param device_name      device name. May be NULL if device format is set.
- * @param device_options   An AVDictionary filled with device-private options. May be NULL.
- *                         The same options must be passed later to avformat_write_header() for output
- *                         devices or avformat_open_input() for input devices, or at any other place
- *                         that affects device-private options.
- * @paramout device_list list of autodetected devices
- * @return count of autodetected devices, negative on error.
- * @note device argument takes precedence over device_name when both are set.
- */
-int avdevice_list_input_sources(const AVInputFormat *device, const char *device_name,
-                                AVDictionary *device_options, AVDeviceInfoList **device_list);
-int avdevice_list_output_sinks(const AVOutputFormat *device, const char *device_name,
-                               AVDictionary *device_options, AVDeviceInfoList **device_list);
-
-/**
- * @}
- */
-
-#endif /* AVDEVICE_AVDEVICE_H */

gpac-2.2.1.tar.gz/extra_lib/include/libavdevice/version.h Deleted

@@ -1,51 +0,0 @@
-/*
- * 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 AVDEVICE_VERSION_H
-#define AVDEVICE_VERSION_H
-
-/**
- * @file
- * @ingroup lavd
- * Libavdevice version macros
- */
-
-#include "libavutil/version.h"
-
-#define LIBAVDEVICE_VERSION_MAJOR  59
-#define LIBAVDEVICE_VERSION_MINOR   4
-#define LIBAVDEVICE_VERSION_MICRO 100
-
-#define LIBAVDEVICE_VERSION_INT AV_VERSION_INT(LIBAVDEVICE_VERSION_MAJOR, \
-                                               LIBAVDEVICE_VERSION_MINOR, \
-                                               LIBAVDEVICE_VERSION_MICRO)
-#define LIBAVDEVICE_VERSION     AV_VERSION(LIBAVDEVICE_VERSION_MAJOR, \
-                                           LIBAVDEVICE_VERSION_MINOR, \
-                                           LIBAVDEVICE_VERSION_MICRO)
-#define LIBAVDEVICE_BUILD       LIBAVDEVICE_VERSION_INT
-
-#define LIBAVDEVICE_IDENT       "Lavd" AV_STRINGIFY(LIBAVDEVICE_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.
- */
-#define FF_API_DEVICE_CAPABILITIES (LIBAVDEVICE_VERSION_MAJOR < 60)
-
-#endif /* AVDEVICE_VERSION_H */

gpac-2.2.1.tar.gz/extra_lib/include/libavfilter Deleted

gpac-2.2.1.tar.gz/extra_lib/include/libavfilter/avfilter.h Deleted

@@ -1,1186 +0,0 @@
-/*
- * filter layer
- * Copyright (c) 2007 Bobby Bingham
- *
- * 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 AVFILTER_AVFILTER_H
-#define AVFILTER_AVFILTER_H
-
-/**
- * @file
- * @ingroup lavfi
- * Main libavfilter public API header
- */
-
-/**
- * @defgroup lavfi libavfilter
- * Graph-based frame editing library.
- *
- * @{
- */
-
-#include <stddef.h>
-
-#include "libavutil/attributes.h"
-#include "libavutil/avutil.h"
-#include "libavutil/buffer.h"
-#include "libavutil/dict.h"
-#include "libavutil/frame.h"
-#include "libavutil/log.h"
-#include "libavutil/samplefmt.h"
-#include "libavutil/pixfmt.h"
-#include "libavutil/rational.h"
-
-#include "libavfilter/version.h"
-
-/**
- * Return the LIBAVFILTER_VERSION_INT constant.
- */
-unsigned avfilter_version(void);
-
-/**
- * Return the libavfilter build-time configuration.
- */
-const char *avfilter_configuration(void);
-
-/**
- * Return the libavfilter license.
- */
-const char *avfilter_license(void);
-
-typedef struct AVFilterContext AVFilterContext;
-typedef struct AVFilterLink    AVFilterLink;
-typedef struct AVFilterPad     AVFilterPad;
-typedef struct AVFilterFormats AVFilterFormats;
-typedef struct AVFilterChannelLayouts AVFilterChannelLayouts;
-
-#if FF_API_PAD_COUNT
-/**
- * Get the number of elements in an AVFilter's inputs or outputs array.
- *
- * @deprecated Use avfilter_filter_pad_count() instead.
- */
-attribute_deprecated
-int avfilter_pad_count(const AVFilterPad *pads);
-#endif
-
-/**
- * Get the name of an AVFilterPad.
- *
- * @param pads an array of AVFilterPads
- * @param pad_idx index of the pad in the array; it is the caller's
- *                responsibility to ensure the index is valid
- *
- * @return name of the pad_idx'th pad in pads
- */
-const char *avfilter_pad_get_name(const AVFilterPad *pads, int pad_idx);
-
-/**
- * Get the type of an AVFilterPad.
- *
- * @param pads an array of AVFilterPads
- * @param pad_idx index of the pad in the array; it is the caller's
- *                responsibility to ensure the index is valid
- *
- * @return type of the pad_idx'th pad in pads
- */
-enum AVMediaType avfilter_pad_get_type(const AVFilterPad *pads, int pad_idx);
-
-/**
- * The number of the filter inputs is not determined just by AVFilter.inputs.
- * The filter might add additional inputs during initialization depending on the
- * options supplied to it.
- */
-#define AVFILTER_FLAG_DYNAMIC_INPUTS        (1 << 0)
-/**
- * The number of the filter outputs is not determined just by AVFilter.outputs.
- * The filter might add additional outputs during initialization depending on
- * the options supplied to it.
- */
-#define AVFILTER_FLAG_DYNAMIC_OUTPUTS       (1 << 1)
-/**
- * The filter supports multithreading by splitting frames into multiple parts
- * and processing them concurrently.
- */
-#define AVFILTER_FLAG_SLICE_THREADS         (1 << 2)
-/**
- * The filter is a "metadata" filter - it does not modify the frame data in any
- * way. It may only affect the metadata (i.e. those fields copied by
- * av_frame_copy_props()).
- *
- * More precisely, this means:
- * - video: the data of any frame output by the filter must be exactly equal to
- *   some frame that is received on one of its inputs. Furthermore, all frames
- *   produced on a given output must correspond to frames received on the same
- *   input and their order must be unchanged. Note that the filter may still
- *   drop or duplicate the frames.
- * - audio: the data produced by the filter on any of its outputs (viewed e.g.
- *   as an array of interleaved samples) must be exactly equal to the data
- *   received by the filter on one of its inputs.
- */
-#define AVFILTER_FLAG_METADATA_ONLY         (1 << 3)
-/**
- * Some filters support a generic "enable" expression option that can be used
- * to enable or disable a filter in the timeline. Filters supporting this
- * option have this flag set. When the enable expression is false, the default
- * no-op filter_frame() function is called in place of the filter_frame()
- * callback defined on each input pad, thus the frame is passed unchanged to
- * the next filters.
- */
-#define AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC  (1 << 16)
-/**
- * Same as AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC, except that the filter will
- * have its filter_frame() callback(s) called as usual even when the enable
- * expression is false. The filter will disable filtering within the
- * filter_frame() callback(s) itself, for example executing code depending on
- * the AVFilterContext->is_disabled value.
- */
-#define AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL (1 << 17)
-/**
- * Handy mask to test whether the filter supports or no the timeline feature
- * (internally or generically).
- */
-#define AVFILTER_FLAG_SUPPORT_TIMELINE (AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL)
-
-/**
- * Filter definition. This defines the pads a filter contains, and all the
- * callback functions used to interact with the filter.
- */
-typedef struct AVFilter {
-    /**
-     * Filter name. Must be non-NULL and unique among filters.
-     */
-    const char *name;
-
-    /**
-     * A description of the filter. May be NULL.
-     *
-     * You should use the NULL_IF_CONFIG_SMALL() macro to define it.
-     */
-    const char *description;
-
-    /**
-     * List of static inputs.
-     *
-     * NULL if there are no (static) inputs. Instances of filters with
-     * AVFILTER_FLAG_DYNAMIC_INPUTS set may have more inputs than present in
-     * this list.
-     */
-    const AVFilterPad *inputs;
-
-    /**
-     * List of static outputs.
-     *
-     * NULL if there are no (static) outputs. Instances of filters with
-     * AVFILTER_FLAG_DYNAMIC_OUTPUTS set may have more outputs than present in
-     * this list.
-     */
-    const AVFilterPad *outputs;
-
-    /**
-     * A class for the private data, used to declare filter private AVOptions.
-     * This field is NULL for filters that do not declare any options.
-     *
-     * If this field is non-NULL, the first member of the filter private data
-     * must be a pointer to AVClass, which will be set by libavfilter generic
-     * code to this class.
-     */
-    const AVClass *priv_class;
-
-    /**
-     * A combination of AVFILTER_FLAG_*
-     */
-    int flags;
-
-    /*****************************************************************
-     * All fields below this line are not part of the public API. They
-     * may not be used outside of libavfilter and can be changed and
-     * removed at will.
-     * New public fields should be added right above.
-     *****************************************************************
-     */
-
-    /**
-     * The number of entries in the list of inputs.
-     */
-    uint8_t nb_inputs;
-
-    /**
-     * The number of entries in the list of outputs.
-     */
-    uint8_t nb_outputs;
-
-    /**
-     * This field determines the state of the formats union.
-     * It is an enum FilterFormatsState value.
-     */
-    uint8_t formats_state;
-
-    /**
-     * Filter pre-initialization function
-     *
-     * This callback will be called immediately after the filter context is
-     * allocated, to allow allocating and initing sub-objects.
-     *
-     * If this callback is not NULL, the uninit callback will be called on
-     * allocation failure.
-     *
-     * @return 0 on success,
-     *         AVERROR code on failure (but the code will be
-     *           dropped and treated as ENOMEM by the calling code)
-     */
-    int (*preinit)(AVFilterContext *ctx);
-
-    /**
-     * Filter initialization function.
-     *
-     * This callback will be called only once during the filter lifetime, after
-     * all the options have been set, but before links between filters are
-     * established and format negotiation is done.
-     *
-     * Basic filter initialization should be done here. Filters with dynamic
-     * inputs and/or outputs should create those inputs/outputs here based on
-     * provided options. No more changes to this filter's inputs/outputs can be
-     * done after this callback.
-     *
-     * This callback must not assume that the filter links exist or frame
-     * parameters are known.
-     *
-     * @ref AVFilter.uninit "uninit" is guaranteed to be called even if
-     * initialization fails, so this callback does not have to clean up on
-     * failure.
-     *
-     * @return 0 on success, a negative AVERROR on failure
-     */
-    int (*init)(AVFilterContext *ctx);
-
-    /**
-     * Should be set instead of @ref AVFilter.init "init" by the filters that
-     * want to pass a dictionary of AVOptions to nested contexts that are
-     * allocated during init.
-     *
-     * On return, the options dict should be freed and replaced with one that
-     * contains all the options which could not be processed by this filter (or
-     * with NULL if all the options were processed).
-     *
-     * Otherwise the semantics is the same as for @ref AVFilter.init "init".
-     */
-    int (*init_dict)(AVFilterContext *ctx, AVDictionary **options);
-
-    /**
-     * Filter uninitialization function.
-     *
-     * Called only once right before the filter is freed. Should deallocate any
-     * memory held by the filter, release any buffer references, etc. It does
-     * not need to deallocate the AVFilterContext.priv memory itself.
-     *
-     * This callback may be called even if @ref AVFilter.init "init" was not
-     * called or failed, so it must be prepared to handle such a situation.
-     */
-    void (*uninit)(AVFilterContext *ctx);
-
-    /**
-     * The state of the following union is determined by formats_state.
-     * See the documentation of enum FilterFormatsState in internal.h.
-     */
-    union {
-        /**
-         * Query formats supported by the filter on its inputs and outputs.
-         *
-         * This callback is called after the filter is initialized (so the inputs
-         * and outputs are fixed), shortly before the format negotiation. This
-         * callback may be called more than once.
-         *
-         * This callback must set AVFilterLink.outcfg.formats on every input link
-         * and AVFilterLink.incfg.formats on every output link to a list of
-         * pixel/sample formats that the filter supports on that link. For audio
-         * links, this filter must also set @ref AVFilterLink.incfg.samplerates
-         * "in_samplerates" / @ref AVFilterLink.outcfg.samplerates "out_samplerates"
-         * and @ref AVFilterLink.incfg.channel_layouts "in_channel_layouts" /
-         * @ref AVFilterLink.outcfg.channel_layouts "out_channel_layouts" analogously.
-         *
-         * This callback must never be NULL if the union is in this state.
-         *
-         * @return zero on success, a negative value corresponding to an
-         * AVERROR code otherwise
-         */
-        int (*query_func)(AVFilterContext *);
-        /**
-         * A pointer to an array of admissible pixel formats delimited
-         * by AV_PIX_FMT_NONE. The generic code will use this list
-         * to indicate that this filter supports each of these pixel formats,
-         * provided that all inputs and outputs use the same pixel format.
-         *
-         * This list must never be NULL if the union is in this state.
-         * The type of all inputs and outputs of filters using this must
-         * be AVMEDIA_TYPE_VIDEO.
-         */
-        const enum AVPixelFormat *pixels_list;
-        /**
-         * Analogous to pixels, but delimited by AV_SAMPLE_FMT_NONE
-         * and restricted to filters that only have AVMEDIA_TYPE_AUDIO
-         * inputs and outputs.
-         *
-         * In addition to that the generic code will mark all inputs
-         * and all outputs as supporting all sample rates and every
-         * channel count and channel layout, as long as all inputs
-         * and outputs use the same sample rate and channel count/layout.
-         */
-        const enum AVSampleFormat *samples_list;
-        /**
-         * Equivalent to { pix_fmt, AV_PIX_FMT_NONE } as pixels_list.
-         */
-        enum AVPixelFormat  pix_fmt;
-        /**
-         * Equivalent to { sample_fmt, AV_SAMPLE_FMT_NONE } as samples_list.
-         */
-        enum AVSampleFormat sample_fmt;
-    } formats;
-
-    int priv_size;      ///< size of private data to allocate for the filter
-
-    int flags_internal; ///< Additional flags for avfilter internal use only.
-
-    /**
-     * Make the filter instance process a command.
-     *
-     * @param cmd    the command to process, for handling simplicity all commands must be alphanumeric only
-     * @param arg    the argument for the command
-     * @param res    a buffer with size res_size where the filter(s) can return a response. This must not change when the command is not supported.
-     * @param flags  if AVFILTER_CMD_FLAG_FAST is set and the command would be
-     *               time consuming then a filter should treat it like an unsupported command
-     *
-     * @returns >=0 on success otherwise an error code.
-     *          AVERROR(ENOSYS) on unsupported commands
-     */
-    int (*process_command)(AVFilterContext *, const char *cmd, const char *arg, char *res, int res_len, int flags);
-
-    /**
-     * Filter activation function.
-     *
-     * Called when any processing is needed from the filter, instead of any
-     * filter_frame and request_frame on pads.
-     *
-     * The function must examine inlinks and outlinks and perform a single
-     * step of processing. If there is nothing to do, the function must do
-     * nothing and not return an error. If more steps are or may be
-     * possible, it must use ff_filter_set_ready() to schedule another
-     * activation.
-     */
-    int (*activate)(AVFilterContext *ctx);
-} AVFilter;
-
-/**
- * Get the number of elements in an AVFilter's inputs or outputs array.
- */
-unsigned avfilter_filter_pad_count(const AVFilter *filter, int is_output);
-
-/**
- * Process multiple parts of the frame concurrently.
- */
-#define AVFILTER_THREAD_SLICE (1 << 0)
-
-typedef struct AVFilterInternal AVFilterInternal;
-
-/** An instance of a filter */
-struct AVFilterContext {
-    const AVClass *av_class;        ///< needed for av_log() and filters common options
-
-    const AVFilter *filter;         ///< the AVFilter of which this is an instance
-
-    char *name;                     ///< name of this filter instance
-
-    AVFilterPad   *input_pads;      ///< array of input pads
-    AVFilterLink **inputs;          ///< array of pointers to input links
-    unsigned    nb_inputs;          ///< number of input pads
-
-    AVFilterPad   *output_pads;     ///< array of output pads
-    AVFilterLink **outputs;         ///< array of pointers to output links
-    unsigned    nb_outputs;         ///< number of output pads
-
-    void *priv;                     ///< private data for use by the filter
-
-    struct AVFilterGraph *graph;    ///< filtergraph this filter belongs to
-
-    /**
-     * Type of multithreading being allowed/used. A combination of
-     * AVFILTER_THREAD_* flags.
-     *
-     * May be set by the caller before initializing the filter to forbid some
-     * or all kinds of multithreading for this filter. The default is allowing
-     * everything.
-     *
-     * When the filter is initialized, this field is combined using bit AND with
-     * AVFilterGraph.thread_type to get the final mask used for determining
-     * allowed threading types. I.e. a threading type needs to be set in both
-     * to be allowed.
-     *
-     * After the filter is initialized, libavfilter sets this field to the
-     * threading type that is actually used (0 for no multithreading).
-     */
-    int thread_type;
-
-    /**
-     * An opaque struct for libavfilter internal use.
-     */
-    AVFilterInternal *internal;
-
-    struct AVFilterCommand *command_queue;
-
-    char *enable_str;               ///< enable expression string
-    void *enable;                   ///< parsed expression (AVExpr*)
-    double *var_values;             ///< variable values for the enable expression
-    int is_disabled;                ///< the enabled state from the last expression evaluation
-
-    /**
-     * For filters which will create hardware frames, sets the device the
-     * filter should create them in.  All other filters will ignore this field:
-     * in particular, a filter which consumes or processes hardware frames will
-     * instead use the hw_frames_ctx field in AVFilterLink to carry the
-     * hardware context information.
-     */
-    AVBufferRef *hw_device_ctx;
-
-    /**
-     * Max number of threads allowed in this filter instance.
-     * If <= 0, its value is ignored.
-     * Overrides global number of threads set per filter graph.
-     */
-    int nb_threads;
-
-    /**
-     * Ready status of the filter.
-     * A non-0 value means that the filter needs activating;
-     * a higher value suggests a more urgent activation.
-     */
-    unsigned ready;
-
-    /**
-     * Sets the number of extra hardware frames which the filter will
-     * allocate on its output links for use in following filters or by
-     * the caller.
-     *
-     * Some hardware filters require all frames that they will use for
-     * output to be defined in advance before filtering starts.  For such
-     * filters, any hardware frame pools used for output must therefore be
-     * of fixed size.  The extra frames set here are on top of any number
-     * that the filter needs internally in order to operate normally.
-     *
-     * This field must be set before the graph containing this filter is
-     * configured.
-     */
-    int extra_hw_frames;
-};
-
-/**
- * Lists of formats / etc. supported by an end of a link.
- *
- * This structure is directly part of AVFilterLink, in two copies:
- * one for the source filter, one for the destination filter.
-
- * These lists are used for negotiating the format to actually be used,
- * which will be loaded into the format and channel_layout members of
- * AVFilterLink, when chosen.
- */
-typedef struct AVFilterFormatsConfig {
-
-    /**
-     * List of supported formats (pixel or sample).
-     */
-    AVFilterFormats *formats;
-
-    /**
-     * Lists of supported sample rates, only for audio.
-     */
-    AVFilterFormats  *samplerates;
-
-    /**
-     * Lists of supported channel layouts, only for audio.
-     */
-    AVFilterChannelLayouts  *channel_layouts;
-
-} AVFilterFormatsConfig;
-
-/**
- * A link between two filters. This contains pointers to the source and
- * destination filters between which this link exists, and the indexes of
- * the pads involved. In addition, this link also contains the parameters
- * which have been negotiated and agreed upon between the filter, such as
- * image dimensions, format, etc.
- *
- * Applications must not normally access the link structure directly.
- * Use the buffersrc and buffersink API instead.
- * In the future, access to the header may be reserved for filters
- * implementation.
- */
-struct AVFilterLink {
-    AVFilterContext *src;       ///< source filter
-    AVFilterPad *srcpad;        ///< output pad on the source filter
-
-    AVFilterContext *dst;       ///< dest filter
-    AVFilterPad *dstpad;        ///< input pad on the dest filter
-
-    enum AVMediaType type;      ///< filter media type
-
-    /* These parameters apply only to video */
-    int w;                      ///< agreed upon image width
-    int h;                      ///< agreed upon image height
-    AVRational sample_aspect_ratio; ///< agreed upon sample aspect ratio
-    /* These parameters apply only to audio */
-    uint64_t channel_layout;    ///< channel layout of current buffer (see libavutil/channel_layout.h)
-    int sample_rate;            ///< samples per second
-
-    int format;                 ///< agreed upon media format
-
-    /**
-     * Define the time base used by the PTS of the frames/samples
-     * which will pass through this link.
-     * During the configuration stage, each filter is supposed to
-     * change only the output timebase, while the timebase of the
-     * input link is assumed to be an unchangeable property.
-     */
-    AVRational time_base;
-
-    /*****************************************************************
-     * All fields below this line are not part of the public API. They
-     * may not be used outside of libavfilter and can be changed and
-     * removed at will.
-     * New public fields should be added right above.
-     *****************************************************************
-     */
-
-    /**
-     * Lists of supported formats / etc. supported by the input filter.
-     */
-    AVFilterFormatsConfig incfg;
-
-    /**
-     * Lists of supported formats / etc. supported by the output filter.
-     */
-    AVFilterFormatsConfig outcfg;
-
-    /** stage of the initialization of the link properties (dimensions, etc) */
-    enum {
-        AVLINK_UNINIT = 0,      ///< not started
-        AVLINK_STARTINIT,       ///< started, but incomplete
-        AVLINK_INIT             ///< complete
-    } init_state;
-
-    /**
-     * Graph the filter belongs to.
-     */
-    struct AVFilterGraph *graph;
-
-    /**
-     * Current timestamp of the link, as defined by the most recent
-     * frame(s), in link time_base units.
-     */
-    int64_t current_pts;
-
-    /**
-     * Current timestamp of the link, as defined by the most recent
-     * frame(s), in AV_TIME_BASE units.
-     */
-    int64_t current_pts_us;
-
-    /**
-     * Index in the age array.
-     */
-    int age_index;
-
-    /**
-     * Frame rate of the stream on the link, or 1/0 if unknown or variable;
-     * if left to 0/0, will be automatically copied from the first input
-     * of the source filter if it exists.
-     *
-     * Sources should set it to the best estimation of the real frame rate.
-     * If the source frame rate is unknown or variable, set this to 1/0.
-     * Filters should update it if necessary depending on their function.
-     * Sinks can use it to set a default output frame rate.
-     * It is similar to the r_frame_rate field in AVStream.
-     */
-    AVRational frame_rate;
-
-    /**
-     * Minimum number of samples to filter at once. If filter_frame() is
-     * called with fewer samples, it will accumulate them in fifo.
-     * This field and the related ones must not be changed after filtering
-     * has started.
-     * If 0, all related fields are ignored.
-     */
-    int min_samples;
-
-    /**
-     * Maximum number of samples to filter at once. If filter_frame() is
-     * called with more samples, it will split them.
-     */
-    int max_samples;
-
-    /**
-     * Number of channels.
-     */
-    int channels;
-
-    /**
-     * Number of past frames sent through the link.
-     */
-    int64_t frame_count_in, frame_count_out;
-
-    /**
-     * Number of past samples sent through the link.
-     */
-    int64_t sample_count_in, sample_count_out;
-
-    /**
-     * A pointer to a FFFramePool struct.
-     */
-    void *frame_pool;
-
-    /**
-     * True if a frame is currently wanted on the output of this filter.
-     * Set when ff_request_frame() is called by the output,
-     * cleared when a frame is filtered.
-     */
-    int frame_wanted_out;
-
-    /**
-     * For hwaccel pixel formats, this should be a reference to the
-     * AVHWFramesContext describing the frames.
-     */
-    AVBufferRef *hw_frames_ctx;
-
-#ifndef FF_INTERNAL_FIELDS
-
-    /**
-     * Internal structure members.
-     * The fields below this limit are internal for libavfilter's use
-     * and must in no way be accessed by applications.
-     */
-    char reserved0xF000;
-
-#else /* FF_INTERNAL_FIELDS */
-
-    /**
-     * Queue of frames waiting to be filtered.
-     */
-    FFFrameQueue fifo;
-
-    /**
-     * If set, the source filter can not generate a frame as is.
-     * The goal is to avoid repeatedly calling the request_frame() method on
-     * the same link.
-     */
-    int frame_blocked_in;
-
-    /**
-     * Link input status.
-     * If not zero, all attempts of filter_frame will fail with the
-     * corresponding code.
-     */
-    int status_in;
-
-    /**
-     * Timestamp of the input status change.
-     */
-    int64_t status_in_pts;
-
-    /**
-     * Link output status.
-     * If not zero, all attempts of request_frame will fail with the
-     * corresponding code.
-     */
-    int status_out;
-
-#endif /* FF_INTERNAL_FIELDS */
-
-};
-
-/**
- * Link two filters together.
- *
- * @param src    the source filter
- * @param srcpad index of the output pad on the source filter
- * @param dst    the destination filter
- * @param dstpad index of the input pad on the destination filter
- * @return       zero on success
- */
-int avfilter_link(AVFilterContext *src, unsigned srcpad,
-                  AVFilterContext *dst, unsigned dstpad);
-
-/**
- * Free the link in *link, and set its pointer to NULL.
- */
-void avfilter_link_free(AVFilterLink **link);
-
-/**
- * Negotiate the media format, dimensions, etc of all inputs to a filter.
- *
- * @param filter the filter to negotiate the properties for its inputs
- * @return       zero on successful negotiation
- */
-int avfilter_config_links(AVFilterContext *filter);
-
-#define AVFILTER_CMD_FLAG_ONE   1 ///< Stop once a filter understood the command (for target=all for example), fast filters are favored automatically
-#define AVFILTER_CMD_FLAG_FAST  2 ///< Only execute command when its fast (like a video out that supports contrast adjustment in hw)
-
-/**
- * Make the filter instance process a command.
- * It is recommended to use avfilter_graph_send_command().
- */
-int avfilter_process_command(AVFilterContext *filter, const char *cmd, const char *arg, char *res, int res_len, int flags);
-
-/**
- * Iterate over all registered filters.
- *
- * @param opaque a pointer where libavfilter will store the iteration state. Must
- *               point to NULL to start the iteration.
- *
- * @return the next registered filter or NULL when the iteration is
- *         finished
- */
-const AVFilter *av_filter_iterate(void **opaque);
-
-/**
- * Get a filter definition matching the given name.
- *
- * @param name the filter name to find
- * @return     the filter definition, if any matching one is registered.
- *             NULL if none found.
- */
-const AVFilter *avfilter_get_by_name(const char *name);
-
-
-/**
- * Initialize a filter with the supplied parameters.
- *
- * @param ctx  uninitialized filter context to initialize
- * @param args Options to initialize the filter with. This must be a
- *             ':'-separated list of options in the 'key=value' form.
- *             May be NULL if the options have been set directly using the
- *             AVOptions API or there are no options that need to be set.
- * @return 0 on success, a negative AVERROR on failure
- */
-int avfilter_init_str(AVFilterContext *ctx, const char *args);
-
-/**
- * Initialize a filter with the supplied dictionary of options.
- *
- * @param ctx     uninitialized filter context to initialize
- * @param options An AVDictionary filled with options for this filter. On
- *                return this parameter will be destroyed and replaced with
- *                a dict containing options that were not found. This dictionary
- *                must be freed by the caller.
- *                May be NULL, then this function is equivalent to
- *                avfilter_init_str() with the second parameter set to NULL.
- * @return 0 on success, a negative AVERROR on failure
- *
- * @note This function and avfilter_init_str() do essentially the same thing,
- * the difference is in manner in which the options are passed. It is up to the
- * calling code to choose whichever is more preferable. The two functions also
- * behave differently when some of the provided options are not declared as
- * supported by the filter. In such a case, avfilter_init_str() will fail, but
- * this function will leave those extra options in the options AVDictionary and
- * continue as usual.
- */
-int avfilter_init_dict(AVFilterContext *ctx, AVDictionary **options);
-
-/**
- * Free a filter context. This will also remove the filter from its
- * filtergraph's list of filters.
- *
- * @param filter the filter to free
- */
-void avfilter_free(AVFilterContext *filter);
-
-/**
- * Insert a filter in the middle of an existing link.
- *
- * @param link the link into which the filter should be inserted
- * @param filt the filter to be inserted
- * @param filt_srcpad_idx the input pad on the filter to connect
- * @param filt_dstpad_idx the output pad on the filter to connect
- * @return     zero on success
- */
-int avfilter_insert_filter(AVFilterLink *link, AVFilterContext *filt,
-                           unsigned filt_srcpad_idx, unsigned filt_dstpad_idx);
-
-/**
- * @return AVClass for AVFilterContext.
- *
- * @see av_opt_find().
- */
-const AVClass *avfilter_get_class(void);
-
-typedef struct AVFilterGraphInternal AVFilterGraphInternal;
-
-/**
- * A function pointer passed to the @ref AVFilterGraph.execute callback to be
- * executed multiple times, possibly in parallel.
- *
- * @param ctx the filter context the job belongs to
- * @param arg an opaque parameter passed through from @ref
- *            AVFilterGraph.execute
- * @param jobnr the index of the job being executed
- * @param nb_jobs the total number of jobs
- *
- * @return 0 on success, a negative AVERROR on error
- */
-typedef int (avfilter_action_func)(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs);
-
-/**
- * A function executing multiple jobs, possibly in parallel.
- *
- * @param ctx the filter context to which the jobs belong
- * @param func the function to be called multiple times
- * @param arg the argument to be passed to func
- * @param ret a nb_jobs-sized array to be filled with return values from each
- *            invocation of func
- * @param nb_jobs the number of jobs to execute
- *
- * @return 0 on success, a negative AVERROR on error
- */
-typedef int (avfilter_execute_func)(AVFilterContext *ctx, avfilter_action_func *func,
-                                    void *arg, int *ret, int nb_jobs);
-
-typedef struct AVFilterGraph {
-    const AVClass *av_class;
-    AVFilterContext **filters;
-    unsigned nb_filters;
-
-    char *scale_sws_opts; ///< sws options to use for the auto-inserted scale filters
-
-    /**
-     * Type of multithreading allowed for filters in this graph. A combination
-     * of AVFILTER_THREAD_* flags.
-     *
-     * May be set by the caller at any point, the setting will apply to all
-     * filters initialized after that. The default is allowing everything.
-     *
-     * When a filter in this graph is initialized, this field is combined using
-     * bit AND with AVFilterContext.thread_type to get the final mask used for
-     * determining allowed threading types. I.e. a threading type needs to be
-     * set in both to be allowed.
-     */
-    int thread_type;
-
-    /**
-     * Maximum number of threads used by filters in this graph. May be set by
-     * the caller before adding any filters to the filtergraph. Zero (the
-     * default) means that the number of threads is determined automatically.
-     */
-    int nb_threads;
-
-    /**
-     * Opaque object for libavfilter internal use.
-     */
-    AVFilterGraphInternal *internal;
-
-    /**
-     * Opaque user data. May be set by the caller to an arbitrary value, e.g. to
-     * be used from callbacks like @ref AVFilterGraph.execute.
-     * Libavfilter will not touch this field in any way.
-     */
-    void *opaque;
-
-    /**
-     * This callback may be set by the caller immediately after allocating the
-     * graph and before adding any filters to it, to provide a custom
-     * multithreading implementation.
-     *
-     * If set, filters with slice threading capability will call this callback
-     * to execute multiple jobs in parallel.
-     *
-     * If this field is left unset, libavfilter will use its internal
-     * implementation, which may or may not be multithreaded depending on the
-     * platform and build options.
-     */
-    avfilter_execute_func *execute;
-
-    char *aresample_swr_opts; ///< swr options to use for the auto-inserted aresample filters, Access ONLY through AVOptions
-
-    /**
-     * Private fields
-     *
-     * The following fields are for internal use only.
-     * Their type, offset, number and semantic can change without notice.
-     */
-
-    AVFilterLink **sink_links;
-    int sink_links_count;
-
-    unsigned disable_auto_convert;
-} AVFilterGraph;
-
-/**
- * Allocate a filter graph.
- *
- * @return the allocated filter graph on success or NULL.
- */
-AVFilterGraph *avfilter_graph_alloc(void);
-
-/**
- * Create a new filter instance in a filter graph.
- *
- * @param graph graph in which the new filter will be used
- * @param filter the filter to create an instance of
- * @param name Name to give to the new instance (will be copied to
- *             AVFilterContext.name). This may be used by the caller to identify
- *             different filters, libavfilter itself assigns no semantics to
- *             this parameter. May be NULL.
- *
- * @return the context of the newly created filter instance (note that it is
- *         also retrievable directly through AVFilterGraph.filters or with
- *         avfilter_graph_get_filter()) on success or NULL on failure.
- */
-AVFilterContext *avfilter_graph_alloc_filter(AVFilterGraph *graph,
-                                             const AVFilter *filter,
-                                             const char *name);
-
-/**
- * Get a filter instance identified by instance name from graph.
- *
- * @param graph filter graph to search through.
- * @param name filter instance name (should be unique in the graph).
- * @return the pointer to the found filter instance or NULL if it
- * cannot be found.
- */
-AVFilterContext *avfilter_graph_get_filter(AVFilterGraph *graph, const char *name);
-
-/**
- * Create and add a filter instance into an existing graph.
- * The filter instance is created from the filter filt and inited
- * with the parameter args. opaque is currently ignored.
- *
- * In case of success put in *filt_ctx the pointer to the created
- * filter instance, otherwise set *filt_ctx to NULL.
- *
- * @param name the instance name to give to the created filter instance
- * @param graph_ctx the filter graph
- * @return a negative AVERROR error code in case of failure, a non
- * negative value otherwise
- */
-int avfilter_graph_create_filter(AVFilterContext **filt_ctx, const AVFilter *filt,
-                                 const char *name, const char *args, void *opaque,
-                                 AVFilterGraph *graph_ctx);
-
-/**
- * Enable or disable automatic format conversion inside the graph.
- *
- * Note that format conversion can still happen inside explicitly inserted
- * scale and aresample filters.
- *
- * @param flags  any of the AVFILTER_AUTO_CONVERT_* constants
- */
-void avfilter_graph_set_auto_convert(AVFilterGraph *graph, unsigned flags);
-
-enum {
-    AVFILTER_AUTO_CONVERT_ALL  =  0, /**< all automatic conversions enabled */
-    AVFILTER_AUTO_CONVERT_NONE = -1, /**< all automatic conversions disabled */
-};
-
-/**
- * Check validity and configure all the links and formats in the graph.
- *
- * @param graphctx the filter graph
- * @param log_ctx context used for logging
- * @return >= 0 in case of success, a negative AVERROR code otherwise
- */
-int avfilter_graph_config(AVFilterGraph *graphctx, void *log_ctx);
-
-/**
- * Free a graph, destroy its links, and set *graph to NULL.
- * If *graph is NULL, do nothing.
- */
-void avfilter_graph_free(AVFilterGraph **graph);
-
-/**
- * A linked-list of the inputs/outputs of the filter chain.
- *
- * This is mainly useful for avfilter_graph_parse() / avfilter_graph_parse2(),
- * where it is used to communicate open (unlinked) inputs and outputs from and
- * to the caller.
- * This struct specifies, per each not connected pad contained in the graph, the
- * filter context and the pad index required for establishing a link.
- */
-typedef struct AVFilterInOut {
-    /** unique name for this input/output in the list */
-    char *name;
-
-    /** filter context associated to this input/output */
-    AVFilterContext *filter_ctx;
-
-    /** index of the filt_ctx pad to use for linking */
-    int pad_idx;
-
-    /** next input/input in the list, NULL if this is the last */
-    struct AVFilterInOut *next;
-} AVFilterInOut;
-
-/**
- * Allocate a single AVFilterInOut entry.
- * Must be freed with avfilter_inout_free().
- * @return allocated AVFilterInOut on success, NULL on failure.
- */
-AVFilterInOut *avfilter_inout_alloc(void);
-
-/**
- * Free the supplied list of AVFilterInOut and set *inout to NULL.
- * If *inout is NULL, do nothing.
- */
-void avfilter_inout_free(AVFilterInOut **inout);
-
-/**
- * Add a graph described by a string to a graph.
- *
- * @note The caller must provide the lists of inputs and outputs,
- * which therefore must be known before calling the function.
- *
- * @note The inputs parameter describes inputs of the already existing
- * part of the graph; i.e. from the point of view of the newly created
- * part, they are outputs. Similarly the outputs parameter describes
- * outputs of the already existing filters, which are provided as
- * inputs to the parsed filters.
- *
- * @param graph   the filter graph where to link the parsed graph context
- * @param filters string to be parsed
- * @param inputs  linked list to the inputs of the graph
- * @param outputs linked list to the outputs of the graph
- * @return zero on success, a negative AVERROR code on error
- */
-int avfilter_graph_parse(AVFilterGraph *graph, const char *filters,
-                         AVFilterInOut *inputs, AVFilterInOut *outputs,
-                         void *log_ctx);
-
-/**
- * Add a graph described by a string to a graph.
- *
- * In the graph filters description, if the input label of the first
- * filter is not specified, "in" is assumed; if the output label of
- * the last filter is not specified, "out" is assumed.
- *
- * @param graph   the filter graph where to link the parsed graph context
- * @param filters string to be parsed
- * @param inputs  pointer to a linked list to the inputs of the graph, may be NULL.
- *                If non-NULL, *inputs is updated to contain the list of open inputs
- *                after the parsing, should be freed with avfilter_inout_free().
- * @param outputs pointer to a linked list to the outputs of the graph, may be NULL.
- *                If non-NULL, *outputs is updated to contain the list of open outputs
- *                after the parsing, should be freed with avfilter_inout_free().
- * @return non negative on success, a negative AVERROR code on error
- */
-int avfilter_graph_parse_ptr(AVFilterGraph *graph, const char *filters,
-                             AVFilterInOut **inputs, AVFilterInOut **outputs,
-                             void *log_ctx);
-
-/**
- * Add a graph described by a string to a graph.
- *
- * @paramin  graph   the filter graph where to link the parsed graph context
- * @paramin  filters string to be parsed
- * @paramout inputs  a linked list of all free (unlinked) inputs of the
- *                     parsed graph will be returned here. It is to be freed
- *                     by the caller using avfilter_inout_free().
- * @paramout outputs a linked list of all free (unlinked) outputs of the
- *                     parsed graph will be returned here. It is to be freed by the
- *                     caller using avfilter_inout_free().
- * @return zero on success, a negative AVERROR code on error
- *
- * @note This function returns the inputs and outputs that are left
- * unlinked after parsing the graph and the caller then deals with
- * them.
- * @note This function makes no reference whatsoever to already
- * existing parts of the graph and the inputs parameter will on return
- * contain inputs of the newly parsed part of the graph.  Analogously
- * the outputs parameter will contain outputs of the newly created
- * filters.
- */
-int avfilter_graph_parse2(AVFilterGraph *graph, const char *filters,
-                          AVFilterInOut **inputs,
-                          AVFilterInOut **outputs);
-
-/**
- * Send a command to one or more filter instances.
- *
- * @param graph  the filter graph
- * @param target the filter(s) to which the command should be sent
- *               "all" sends to all filters
- *               otherwise it can be a filter or filter instance name
- *               which will send the command to all matching filters.
- * @param cmd    the command to send, for handling simplicity all commands must be alphanumeric only
- * @param arg    the argument for the command
- * @param res    a buffer with size res_size where the filter(s) can return a response.
- *
- * @returns >=0 on success otherwise an error code.
- *              AVERROR(ENOSYS) on unsupported commands
- */
-int avfilter_graph_send_command(AVFilterGraph *graph, const char *target, const char *cmd, const char *arg, char *res, int res_len, int flags);
-
-/**
- * Queue a command for one or more filter instances.
- *
- * @param graph  the filter graph
- * @param target the filter(s) to which the command should be sent
- *               "all" sends to all filters
- *               otherwise it can be a filter or filter instance name
- *               which will send the command to all matching filters.
- * @param cmd    the command to sent, for handling simplicity all commands must be alphanumeric only
- * @param arg    the argument for the command
- * @param ts     time at which the command should be sent to the filter
- *
- * @note As this executes commands after this function returns, no return code
- *       from the filter is provided, also AVFILTER_CMD_FLAG_ONE is not supported.
- */
-int avfilter_graph_queue_command(AVFilterGraph *graph, const char *target, const char *cmd, const char *arg, int flags, double ts);
-
-
-/**
- * Dump a graph into a human-readable string representation.
- *
- * @param graph    the graph to dump
- * @param options  formatting options; currently ignored
- * @return  a string, or NULL in case of memory allocation failure;
- *          the string must be freed using av_free
- */
-char *avfilter_graph_dump(AVFilterGraph *graph, const char *options);
-
-/**
- * Request a frame on the oldest sink link.
- *
- * If the request returns AVERROR_EOF, try the next.
- *
- * Note that this function is not meant to be the sole scheduling mechanism
- * of a filtergraph, only a convenience function to help drain a filtergraph
- * in a balanced way under normal circumstances.
- *
- * Also note that AVERROR_EOF does not mean that frames did not arrive on
- * some of the sinks during the process.
- * When there are multiple sink links, in case the requested link
- * returns an EOF, this may cause a filter to flush pending frames
- * which are sent to another sink link, although unrequested.
- *
- * @return  the return value of ff_request_frame(),
- *          or AVERROR_EOF if all links returned AVERROR_EOF
- */
-int avfilter_graph_request_oldest(AVFilterGraph *graph);
-
-/**
- * @}
- */
-
-#endif /* AVFILTER_AVFILTER_H */

gpac-2.2.1.tar.gz/extra_lib/include/libavfilter/buffersink.h Deleted

@@ -1,205 +0,0 @@
-/*
- * 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 AVFILTER_BUFFERSINK_H
-#define AVFILTER_BUFFERSINK_H
-
-/**
- * @file
- * @ingroup lavfi_buffersink
- * memory buffer sink API for audio and video
- */
-
-#include "avfilter.h"
-
-/**
- * @defgroup lavfi_buffersink Buffer sink API
- * @ingroup lavfi
- * @{
- *
- * The buffersink and abuffersink filters are there to connect filter graphs
- * to applications. They have a single input, connected to the graph, and no
- * output. Frames must be extracted using av_buffersink_get_frame() or
- * av_buffersink_get_samples().
- *
- * The format negotiated by the graph during configuration can be obtained
- * using the accessor functions:
- * - av_buffersink_get_time_base(),
- * - av_buffersink_get_format(),
- * - av_buffersink_get_frame_rate(),
- * - av_buffersink_get_w(),
- * - av_buffersink_get_h(),
- * - av_buffersink_get_sample_aspect_ratio(),
- * - av_buffersink_get_channels(),
- * - av_buffersink_get_channel_layout(),
- * - av_buffersink_get_sample_rate().
- *
- * The format can be constrained by setting options, using av_opt_set() and
- * related functions with the AV_OPT_SEARCH_CHILDREN flag.
- *  - pix_fmts (int list),
- *  - sample_fmts (int list),
- *  - sample_rates (int list),
- *  - channel_layouts (int64_t),
- *  - channel_counts (int list),
- *  - all_channel_counts (bool).
- * Most of these options are of type binary, and should be set using
- * av_opt_set_int_list() or av_opt_set_bin(). If they are not set, all
- * corresponding formats are accepted.
- *
- * As a special case, if neither channel_layouts nor channel_counts is set,
- * all valid channel layouts are accepted, but channel counts without a
- * layout are not, unless all_channel_counts is set.
- * Also, channel_layouts must not contain a channel layout already accepted
- * by a value in channel_counts; for example, if channel_counts contains 2,
- * then channel_layouts must not contain stereo.
- */
-
-/**
- * Get a frame with filtered data from sink and put it in frame.
- *
- * @param ctx    pointer to a buffersink or abuffersink filter context.
- * @param frame  pointer to an allocated frame that will be filled with data.
- *               The data must be freed using av_frame_unref() / av_frame_free()
- * @param flags  a combination of AV_BUFFERSINK_FLAG_* flags
- *
- * @return  >= 0 in for success, a negative AVERROR code for failure.
- */
-int av_buffersink_get_frame_flags(AVFilterContext *ctx, AVFrame *frame, int flags);
-
-/**
- * Tell av_buffersink_get_buffer_ref() to read video/samples buffer
- * reference, but not remove it from the buffer. This is useful if you
- * need only to read a video/samples buffer, without to fetch it.
- */
-#define AV_BUFFERSINK_FLAG_PEEK 1
-
-/**
- * Tell av_buffersink_get_buffer_ref() not to request a frame from its input.
- * If a frame is already buffered, it is read (and removed from the buffer),
- * but if no frame is present, return AVERROR(EAGAIN).
- */
-#define AV_BUFFERSINK_FLAG_NO_REQUEST 2
-
-#if FF_API_BUFFERSINK_ALLOC
-/**
- * Deprecated and unused struct to use for initializing a buffersink context.
- */
-typedef struct AVBufferSinkParams {
-    const enum AVPixelFormat *pixel_fmts; ///< list of allowed pixel formats, terminated by AV_PIX_FMT_NONE
-} AVBufferSinkParams;
-
-/**
- * Create an AVBufferSinkParams structure.
- *
- * Must be freed with av_free().
- */
-attribute_deprecated
-AVBufferSinkParams *av_buffersink_params_alloc(void);
-
-/**
- * Deprecated and unused struct to use for initializing an abuffersink context.
- */
-typedef struct AVABufferSinkParams {
-    const enum AVSampleFormat *sample_fmts; ///< list of allowed sample formats, terminated by AV_SAMPLE_FMT_NONE
-    const int64_t *channel_layouts;         ///< list of allowed channel layouts, terminated by -1
-    const int *channel_counts;              ///< list of allowed channel counts, terminated by -1
-    int all_channel_counts;                 ///< if not 0, accept any channel count or layout
-    int *sample_rates;                      ///< list of allowed sample rates, terminated by -1
-} AVABufferSinkParams;
-
-/**
- * Create an AVABufferSinkParams structure.
- *
- * Must be freed with av_free().
- */
-attribute_deprecated
-AVABufferSinkParams *av_abuffersink_params_alloc(void);
-#endif
-
-/**
- * Set the frame size for an audio buffer sink.
- *
- * All calls to av_buffersink_get_buffer_ref will return a buffer with
- * exactly the specified number of samples, or AVERROR(EAGAIN) if there is
- * not enough. The last buffer at EOF will be padded with 0.
- */
-void av_buffersink_set_frame_size(AVFilterContext *ctx, unsigned frame_size);
-
-/**
- * @defgroup lavfi_buffersink_accessors Buffer sink accessors
- * Get the properties of the stream
- * @{
- */
-
-enum AVMediaType av_buffersink_get_type                (const AVFilterContext *ctx);
-AVRational       av_buffersink_get_time_base           (const AVFilterContext *ctx);
-int              av_buffersink_get_format              (const AVFilterContext *ctx);
-
-AVRational       av_buffersink_get_frame_rate          (const AVFilterContext *ctx);
-int              av_buffersink_get_w                   (const AVFilterContext *ctx);
-int              av_buffersink_get_h                   (const AVFilterContext *ctx);
-AVRational       av_buffersink_get_sample_aspect_ratio (const AVFilterContext *ctx);
-
-int              av_buffersink_get_channels            (const AVFilterContext *ctx);
-uint64_t         av_buffersink_get_channel_layout      (const AVFilterContext *ctx);
-int              av_buffersink_get_sample_rate         (const AVFilterContext *ctx);
-
-AVBufferRef *    av_buffersink_get_hw_frames_ctx       (const AVFilterContext *ctx);
-
-/** @} */
-
-/**
- * Get a frame with filtered data from sink and put it in frame.
- *
- * @param ctx pointer to a context of a buffersink or abuffersink AVFilter.
- * @param frame pointer to an allocated frame that will be filled with data.
- *              The data must be freed using av_frame_unref() / av_frame_free()
- *
- * @return
- *         - >= 0 if a frame was successfully returned.
- *         - AVERROR(EAGAIN) if no frames are available at this point; more
- *           input frames must be added to the filtergraph to get more output.
- *         - AVERROR_EOF if there will be no more output frames on this sink.
- *         - A different negative AVERROR code in other failure cases.
- */
-int av_buffersink_get_frame(AVFilterContext *ctx, AVFrame *frame);
-
-/**
- * Same as av_buffersink_get_frame(), but with the ability to specify the number
- * of samples read. This function is less efficient than
- * av_buffersink_get_frame(), because it copies the data around.
- *
- * @param ctx pointer to a context of the abuffersink AVFilter.
- * @param frame pointer to an allocated frame that will be filled with data.
- *              The data must be freed using av_frame_unref() / av_frame_free()
- *              frame will contain exactly nb_samples audio samples, except at
- *              the end of stream, when it can contain less than nb_samples.
- *
- * @return The return codes have the same meaning as for
- *         av_buffersink_get_frame().
- *
- * @warning do not mix this function with av_buffersink_get_frame(). Use only one or
- * the other with a single sink, not both.
- */
-int av_buffersink_get_samples(AVFilterContext *ctx, AVFrame *frame, int nb_samples);
-
-/**
- * @}
- */
-
-#endif /* AVFILTER_BUFFERSINK_H */

gpac-2.2.1.tar.gz/extra_lib/include/libavfilter/buffersrc.h Deleted

@@ -1,209 +0,0 @@
-/*
- * 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 AVFILTER_BUFFERSRC_H
-#define AVFILTER_BUFFERSRC_H
-
-/**
- * @file
- * @ingroup lavfi_buffersrc
- * Memory buffer source API.
- */
-
-#include "avfilter.h"
-
-/**
- * @defgroup lavfi_buffersrc Buffer source API
- * @ingroup lavfi
- * @{
- */
-
-enum {
-
-    /**
-     * Do not check for format changes.
-     */
-    AV_BUFFERSRC_FLAG_NO_CHECK_FORMAT = 1,
-
-    /**
-     * Immediately push the frame to the output.
-     */
-    AV_BUFFERSRC_FLAG_PUSH = 4,
-
-    /**
-     * Keep a reference to the frame.
-     * If the frame if reference-counted, create a new reference; otherwise
-     * copy the frame data.
-     */
-    AV_BUFFERSRC_FLAG_KEEP_REF = 8,
-
-};
-
-/**
- * Get the number of failed requests.
- *
- * A failed request is when the request_frame method is called while no
- * frame is present in the buffer.
- * The number is reset when a frame is added.
- */
-unsigned av_buffersrc_get_nb_failed_requests(AVFilterContext *buffer_src);
-
-/**
- * This structure contains the parameters describing the frames that will be
- * passed to this filter.
- *
- * It should be allocated with av_buffersrc_parameters_alloc() and freed with
- * av_free(). All the allocated fields in it remain owned by the caller.
- */
-typedef struct AVBufferSrcParameters {
-    /**
-     * video: the pixel format, value corresponds to enum AVPixelFormat
-     * audio: the sample format, value corresponds to enum AVSampleFormat
-     */
-    int format;
-    /**
-     * The timebase to be used for the timestamps on the input frames.
-     */
-    AVRational time_base;
-
-    /**
-     * Video only, the display dimensions of the input frames.
-     */
-    int width, height;
-
-    /**
-     * Video only, the sample (pixel) aspect ratio.
-     */
-    AVRational sample_aspect_ratio;
-
-    /**
-     * Video only, the frame rate of the input video. This field must only be
-     * set to a non-zero value if input stream has a known constant framerate
-     * and should be left at its initial value if the framerate is variable or
-     * unknown.
-     */
-    AVRational frame_rate;
-
-    /**
-     * Video with a hwaccel pixel format only. This should be a reference to an
-     * AVHWFramesContext instance describing the input frames.
-     */
-    AVBufferRef *hw_frames_ctx;
-
-    /**
-     * Audio only, the audio sampling rate in samples per second.
-     */
-    int sample_rate;
-
-    /**
-     * Audio only, the audio channel layout
-     */
-    uint64_t channel_layout;
-} AVBufferSrcParameters;
-
-/**
- * Allocate a new AVBufferSrcParameters instance. It should be freed by the
- * caller with av_free().
- */
-AVBufferSrcParameters *av_buffersrc_parameters_alloc(void);
-
-/**
- * Initialize the buffersrc or abuffersrc filter with the provided parameters.
- * This function may be called multiple times, the later calls override the
- * previous ones. Some of the parameters may also be set through AVOptions, then
- * whatever method is used last takes precedence.
- *
- * @param ctx an instance of the buffersrc or abuffersrc filter
- * @param param the stream parameters. The frames later passed to this filter
- *              must conform to those parameters. All the allocated fields in
- *              param remain owned by the caller, libavfilter will make internal
- *              copies or references when necessary.
- * @return 0 on success, a negative AVERROR code on failure.
- */
-int av_buffersrc_parameters_set(AVFilterContext *ctx, AVBufferSrcParameters *param);
-
-/**
- * Add a frame to the buffer source.
- *
- * @param ctx   an instance of the buffersrc filter
- * @param frame frame to be added. If the frame is reference counted, this
- * function will make a new reference to it. Otherwise the frame data will be
- * copied.
- *
- * @return 0 on success, a negative AVERROR on error
- *
- * This function is equivalent to av_buffersrc_add_frame_flags() with the
- * AV_BUFFERSRC_FLAG_KEEP_REF flag.
- */
-av_warn_unused_result
-int av_buffersrc_write_frame(AVFilterContext *ctx, const AVFrame *frame);
-
-/**
- * Add a frame to the buffer source.
- *
- * @param ctx   an instance of the buffersrc filter
- * @param frame frame to be added. If the frame is reference counted, this
- * function will take ownership of the reference(s) and reset the frame.
- * Otherwise the frame data will be copied. If this function returns an error,
- * the input frame is not touched.
- *
- * @return 0 on success, a negative AVERROR on error.
- *
- * @note the difference between this function and av_buffersrc_write_frame() is
- * that av_buffersrc_write_frame() creates a new reference to the input frame,
- * while this function takes ownership of the reference passed to it.
- *
- * This function is equivalent to av_buffersrc_add_frame_flags() without the
- * AV_BUFFERSRC_FLAG_KEEP_REF flag.
- */
-av_warn_unused_result
-int av_buffersrc_add_frame(AVFilterContext *ctx, AVFrame *frame);
-
-/**
- * Add a frame to the buffer source.
- *
- * By default, if the frame is reference-counted, this function will take
- * ownership of the reference(s) and reset the frame. This can be controlled
- * using the flags.
- *
- * If this function returns an error, the input frame is not touched.
- *
- * @param buffer_src  pointer to a buffer source context
- * @param frame       a frame, or NULL to mark EOF
- * @param flags       a combination of AV_BUFFERSRC_FLAG_*
- * @return            >= 0 in case of success, a negative AVERROR code
- *                    in case of failure
- */
-av_warn_unused_result
-int av_buffersrc_add_frame_flags(AVFilterContext *buffer_src,
-                                 AVFrame *frame, int flags);
-
-/**
- * Close the buffer source after EOF.
- *
- * This is similar to passing NULL to av_buffersrc_add_frame_flags()
- * except it takes the timestamp of the EOF, i.e. the timestamp of the end
- * of the last frame.
- */
-int av_buffersrc_close(AVFilterContext *ctx, int64_t pts, unsigned flags);
-
-/**
- * @}
- */
-
-#endif /* AVFILTER_BUFFERSRC_H */

gpac-2.2.1.tar.gz/extra_lib/include/libavfilter/version.h Deleted

@@ -1,57 +0,0 @@
-/*
- * 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 AVFILTER_VERSION_H
-#define AVFILTER_VERSION_H
-
-/**
- * @file
- * @ingroup lavfi
- * Libavfilter version macros
- */
-
-#include "libavutil/version.h"
-
-#define LIBAVFILTER_VERSION_MAJOR   8
-#define LIBAVFILTER_VERSION_MINOR  24
-#define LIBAVFILTER_VERSION_MICRO 100
-
-
-#define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \
-                                               LIBAVFILTER_VERSION_MINOR, \
-                                               LIBAVFILTER_VERSION_MICRO)
-#define LIBAVFILTER_VERSION     AV_VERSION(LIBAVFILTER_VERSION_MAJOR,   \
-                                           LIBAVFILTER_VERSION_MINOR,   \
-                                           LIBAVFILTER_VERSION_MICRO)
-#define LIBAVFILTER_BUILD       LIBAVFILTER_VERSION_INT
-
-#define LIBAVFILTER_IDENT       "Lavfi" AV_STRINGIFY(LIBAVFILTER_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.
- */
-
-#define FF_API_SWS_PARAM_OPTION             (LIBAVFILTER_VERSION_MAJOR < 9)
-#define FF_API_BUFFERSINK_ALLOC             (LIBAVFILTER_VERSION_MAJOR < 9)
-#define FF_API_PAD_COUNT                    (LIBAVFILTER_VERSION_MAJOR < 9)
-
-#endif /* AVFILTER_VERSION_H */

gpac-2.2.1.tar.gz/extra_lib/include/libavformat Deleted

gpac-2.2.1.tar.gz/extra_lib/include/libavformat/avformat.h Deleted

@@ -1,2893 +0,0 @@
-/*
- * copyright (c) 2001 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 AVFORMAT_AVFORMAT_H
-#define AVFORMAT_AVFORMAT_H
-
-/**
- * @file
- * @ingroup libavf
- * Main libavformat public API header
- */
-
-/**
- * @defgroup libavf libavformat
- * 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).
- * 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
- * input/output formats using the  av_demuxer_iterate / av_muxer_iterate() 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
- * It is possible to configure lavf 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.
- *
- * @section urls
- * URL strings in libavformat are made of a scheme/protocol, a ':', and a
- * scheme specific string. URLs without a scheme and ':' used for local files
- * are supported but deprecated. "file:" should be used for local files.
- *
- * It is important that the scheme string is not taken from untrusted
- * sources without checks.
- *
- * Note that some schemes/protocols are quite powerful, allowing access to
- * both local and remote files, parts of them, concatenations of them, local
- * audio and video devices and so on.
- *
- * @{
- *
- * @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, which
- * is passed to avformat_open_input(), as in the following code:
- * @code
- * const char    *url = "file: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_send_packet() 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.
- *
- * A packet returned by av_read_frame() is always reference-counted,
- * i.e. AVPacket.buf is set and the user may keep it indefinitely.
- * The packet must be freed with av_packet_unref() 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.codecpar "stream codec parameters" information, such as the
- *   codec @ref AVCodecParameters.codec_type "type", @ref AVCodecParameters.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).
- * - It is advised to manually initialize only the relevant fields in
- *   AVCodecParameters, rather than using @ref avcodec_parameters_copy() during
- *   remuxing: there is no guarantee that the codec context values remain valid
- *   for both input and output format contexts.
- * - 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
- * @{
- * @section lavf_io_dirlist Directory listing
- * The directory listing API makes it possible to list files on remote servers.
- *
- * Some of possible use cases:
- * - an "open file" dialog to choose files from a remote location,
- * - a recursive media finder providing a player with an ability to play all
- * files from a given directory.
- *
- * @subsection lavf_io_dirlist_open Opening a directory
- * At first, a directory needs to be opened by calling avio_open_dir()
- * supplied with a URL and, optionally, ::AVDictionary containing
- * protocol-specific parameters. The function returns zero or positive
- * integer and allocates AVIODirContext on success.
- *
- * @code
- * AVIODirContext *ctx = NULL;
- * if (avio_open_dir(&ctx, "smb://example.com/some_dir", NULL) < 0) {
- *     fprintf(stderr, "Cannot open directory.\n");
- *     abort();
- * }
- * @endcode
- *
- * This code tries to open a sample directory using smb protocol without
- * any additional parameters.
- *
- * @subsection lavf_io_dirlist_read Reading entries
- * Each directory's entry (i.e. file, another directory, anything else
- * within ::AVIODirEntryType) is represented by AVIODirEntry.
- * Reading consecutive entries from an opened AVIODirContext is done by
- * repeatedly calling avio_read_dir() on it. Each call returns zero or
- * positive integer if successful. Reading can be stopped right after the
- * NULL entry has been read -- it means there are no entries left to be
- * read. The following code reads all entries from a directory associated
- * with ctx and prints their names to standard output.
- * @code
- * AVIODirEntry *entry = NULL;
- * for (;;) {
- *     if (avio_read_dir(ctx, &entry) < 0) {
- *         fprintf(stderr, "Cannot list directory.\n");
- *         abort();
- *     }
- *     if (!entry)
- *         break;
- *     printf("%s\n", entry->name);
- *     avio_free_directory_entry(&entry);
- * }
- * @endcode
- * @}
- *
- * @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
- * @{
- * @}
- * @}
- */
-
-#include <time.h>
-#include <stdio.h>  /* FILE */
-
-#include "libavcodec/codec.h"
-#include "libavcodec/codec_par.h"
-#include "libavcodec/defs.h"
-#include "libavcodec/packet.h"
-
-#include "libavutil/dict.h"
-#include "libavutil/log.h"
-
-#include "avio.h"
-#include "libavformat/version.h"
-
-struct AVFormatContext;
-struct AVStream;
-
-struct AVDeviceInfoList;
-struct AVDeviceCapabilitiesQuery;
-
-/**
- * @defgroup metadata_api Public Metadata API
- * @{
- * @ingroup libavf
- * The metadata API allows libavformat to export metadata tags to a client
- * 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:
- * -  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.
- * -  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.
- * -  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.
- *    -  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.
- *    -  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_frame(), 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
- *
- * Look in the examples section for an application example how to use the Metadata API.
- *
- * @}
- */
-
-/* packet functions */
-
-
-/**
- * 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(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);
-
-/*************************************************/
-/* input/output formats */
-
-struct AVCodecTag;
-
-/**
- * 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 */
-    const char *mime_type; /**< mime_type, when known. */
-} AVProbeData;
-
-#define AVPROBE_SCORE_RETRY (AVPROBE_SCORE_MAX/4)
-#define AVPROBE_SCORE_STREAM_RETRY (AVPROBE_SCORE_MAX/4-1)
-
-#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 avio_open, no opened file should be provided by the caller.
-#define AVFMT_NOFILE        0x0001
-#define AVFMT_NEEDNUMBER    0x0002 /**< Needs '%d' in filename. */
-/**
- * The muxer/demuxer is experimental and should be used with caution.
- *
- * - demuxers: will not be selected automatically by probing, must be specified
- *             explicitly.
- */
-#define AVFMT_EXPERIMENTAL  0x0004
-#define AVFMT_SHOW_IDS      0x0008 /**< Show format stream IDs numbers. */
-#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. 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. */
-#define AVFMT_TS_NONSTRICT 0x20000 /**< 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;
-    /**
-     * 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;
-    const char *mime_type;
-    const char *extensions; /**< comma-separated filename extensions */
-    /* output support */
-    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_GLOBALHEADER, AVFMT_NOTIMESTAMPS, AVFMT_VARIABLE_FPS,
-     * AVFMT_NODIMENSIONS, AVFMT_NOSTREAMS, AVFMT_ALLOW_FLUSH,
-     * AVFMT_TS_NONSTRICT, AVFMT_TS_NEGATIVE
-     */
-    int flags;
-
-    /**
-     * List of supported codec_id-codec_tag pairs, ordered by "better
-     * choice first". The arrays are all terminated by AV_CODEC_ID_NONE.
-     */
-    const struct AVCodecTag * const *codec_tag;
-
-
-    const AVClass *priv_class; ///< AVClass for the private context
-
-    /*****************************************************************
-     * 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.
-     *****************************************************************
-     */
-    /**
-     * size of private data so that it can be allocated in the wrapper
-     */
-    int priv_data_size;
-
-    /**
-     * Internal flags. See FF_FMT_FLAG_* in internal.h.
-     */
-    int flags_internal;
-
-    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 *);
-    /**
-     * A format-specific function for interleavement.
-     * If unset, packets will be interleaved by dts.
-     *
-     * @param s           An AVFormatContext for output. pkt will be added to
-     *                    resp. taken from its packet buffer.
-     * @paramin,out pkt A packet to be interleaved if has_packet is set;
-     *                    also used to return packets. If no packet is returned
-     *                    (e.g. on error), pkt is blank on return.
-     * @param flush       1 if no further packets are available as input and
-     *                    all remaining packets should be output.
-     * @param has_packet  If set, pkt contains a packet to be interleaved
-     *                    on input; otherwise pkt is blank on input.
-     * @return 1 if a packet was output, 0 if no packet could be output,
-     *         < 0 if an error occurred
-     */
-    int (*interleave_packet)(struct AVFormatContext *s, AVPacket *pkt,
-                             int flush, int has_packet);
-    /**
-     * 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);
-    enum AVCodecID data_codec; /**< default data codec */
-    /**
-     * Initialize format. May allocate data here, and set any AVFormatContext or
-     * AVStream parameters that need to be set before packets are sent.
-     * This method must not write output.
-     *
-     * Return 0 if streams were fully configured, 1 if not, negative AVERROR on failure
-     *
-     * Any allocations made here must be freed in deinit().
-     */
-    int (*init)(struct AVFormatContext *);
-    /**
-     * Deinitialize format. If present, this is called whenever the muxer is being
-     * destroyed, regardless of whether or not the header has been written.
-     *
-     * If a trailer is being written, this is called after write_trailer().
-     *
-     * This is called if init() fails as well.
-     */
-    void (*deinit)(struct AVFormatContext *);
-    /**
-     * Set up any necessary bitstream filtering and extract any extra data needed
-     * for the global header.
-     *
-     * @note pkt might have been directly forwarded by a meta-muxer; therefore
-     *       pkt->stream_index as well as the pkt's timebase might be invalid.
-     * Return 0 if more packets from this stream must be checked; 1 if not.
-     */
-    int (*check_bitstream)(struct AVFormatContext *s, struct AVStream *st,
-                           const AVPacket *pkt);
-} 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;
-
-    /**
-     * Can use flags: AVFMT_NOFILE, AVFMT_NEEDNUMBER, AVFMT_SHOW_IDS,
-     * AVFMT_NOTIMESTAMPS, 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.
-     *****************************************************************
-     */
-    /**
-     * 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;
-
-    /**
-     * Internal flags. See FF_FMT_FLAG_* in internal.h.
-     */
-    int flags_internal;
-
-    /**
-     * 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)(const AVProbeData *);
-
-    /**
-     * Read the format header and initialize the AVFormatContext
-     * structure. Return 0 if OK. '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.
-     *         Upon returning an error, pkt must be unreferenced by the caller.
-     */
-    int (*read_packet)(struct AVFormatContext *, AVPacket *pkt);
-
-    /**
-     * Close the stream. The AVFormatContext and AVStreams are not
-     * freed by this function
-     */
-    int (*read_close)(struct AVFormatContext *);
-
-    /**
-     * Seek to a given timestamp relative to the frames in
-     * stream component stream_index.
-     * @param stream_index Must not be -1.
-     * @param flags Selects which direction should be preferred if no exact
-     *              match is available.
-     * @return >= 0 on success (but not necessarily the new offset)
-     */
-    int (*read_seek)(struct AVFormatContext *,
-                     int stream_index, int64_t timestamp, int flags);
-
-    /**
-     * Get the next timestamp in streamstream_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);
-
-    /**
-     * Start/resume playing - only meaningful if using a network-based format
-     * (RTSP).
-     */
-    int (*read_play)(struct AVFormatContext *);
-
-    /**
-     * Pause playing - only meaningful if using a network-based format
-     * (RTSP).
-     */
-    int (*read_pause)(struct AVFormatContext *);
-
-    /**
-     * 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);
-
-    /**
-     * Returns device list with it properties.
-     * @see avdevice_list_devices() for more details.
-     */
-    int (*get_device_list)(struct AVFormatContext *s, struct AVDeviceInfoList *device_list);
-
-} 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,   /**< 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;        /**<
-                               * 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
-#define AVINDEX_DISCARD_FRAME  0x0002    /**
-                                          * Flag is used to indicate which frame should be discarded after decoding.
-                                          */
-    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).
-    int min_distance;         /**< Minimum distance between this and the previous keyframe, used to avoid unneeded searching. */
-} AVIndexEntry;
-
-/**
- * The stream should be chosen by default among other streams of the same type,
- * unless the user has explicitly specified otherwise.
- */
-#define AV_DISPOSITION_DEFAULT              (1 << 0)
-/**
- * The stream is not in original language.
- *
- * @note AV_DISPOSITION_ORIGINAL is the inverse of this disposition. At most
- *       one of them should be set in properly tagged streams.
- * @note This disposition may apply to any stream type, not just audio.
- */
-#define AV_DISPOSITION_DUB                  (1 << 1)
-/**
- * The stream is in original language.
- *
- * @see the notes for AV_DISPOSITION_DUB
- */
-#define AV_DISPOSITION_ORIGINAL             (1 << 2)
-/**
- * The stream is a commentary track.
- */
-#define AV_DISPOSITION_COMMENT              (1 << 3)
-/**
- * The stream contains song lyrics.
- */
-#define AV_DISPOSITION_LYRICS               (1 << 4)
-/**
- * The stream contains karaoke audio.
- */
-#define AV_DISPOSITION_KARAOKE              (1 << 5)
-
-/**
- * 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               (1 << 6)
-/**
- * The stream is intended for hearing impaired audiences.
- */
-#define AV_DISPOSITION_HEARING_IMPAIRED     (1 << 7)
-/**
- * The stream is intended for visually impaired audiences.
- */
-#define AV_DISPOSITION_VISUAL_IMPAIRED      (1 << 8)
-/**
- * The audio stream contains music and sound effects without voice.
- */
-#define AV_DISPOSITION_CLEAN_EFFECTS        (1 << 9)
-/**
- * The stream is stored in the file as an attached picture/"cover art" (e.g.
- * APIC frame in ID3v2). The first (usually only) 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         (1 << 10)
-/**
- * The stream is sparse, and contains thumbnail images, often corresponding
- * to chapter markers. Only ever used with AV_DISPOSITION_ATTACHED_PIC.
- */
-#define AV_DISPOSITION_TIMED_THUMBNAILS     (1 << 11)
-
-/**
- * The subtitle stream contains captions, providing a transcription and possibly
- * a translation of audio. Typically intended for hearing-impaired audiences.
- */
-#define AV_DISPOSITION_CAPTIONS             (1 << 16)
-/**
- * The subtitle stream contains a textual description of the video content.
- * Typically intended for visually-impaired audiences or for the cases where the
- * video cannot be seen.
- */
-#define AV_DISPOSITION_DESCRIPTIONS         (1 << 17)
-/**
- * The subtitle stream contains time-aligned metadata that is not intended to be
- * directly presented to the user.
- */
-#define AV_DISPOSITION_METADATA             (1 << 18)
-/**
- * The audio stream is intended to be mixed with another stream before
- * presentation.
- * Corresponds to mix_type=0 in mpegts.
- */
-#define AV_DISPOSITION_DEPENDENT            (1 << 19)
-/**
- * The video stream contains still images.
- */
-#define AV_DISPOSITION_STILL_IMAGE          (1 << 20)
-
-/**
- * @return The AV_DISPOSITION_* flag corresponding to disp or a negative error
- *         code if disp does not correspond to a known stream disposition.
- */
-int av_disposition_from_string(const char *disp);
-
-/**
- * @param disposition a combination of AV_DISPOSITION_* values
- * @return The string description corresponding to the lowest set bit in
- *         disposition. NULL when the lowest set bit does not correspond
- *         to a known disposition or when disposition is 0.
- */
-const char *av_disposition_to_string(int disposition);
-
-/**
- * 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
- * version bump.
- * sizeof(AVStream) must not be used outside libav*.
- */
-typedef struct AVStream {
-#if FF_API_AVSTREAM_CLASS
-    /**
-     * A class for @ref avoptions. Set on stream creation.
-     */
-    const AVClass *av_class;
-#endif
-
-    int index;    /**< stream index in AVFormatContext */
-    /**
-     * Format-specific stream ID.
-     * decoding: set by libavformat
-     * encoding: set by the user, replaced by libavformat if left unset
-     */
-    int id;
-
-    void *priv_data;
-
-    /**
-     * This is the fundamental unit of time (in seconds) in terms
-     * 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;
-
-    /**
-     * 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).
-     * @note The ASF header does NOT contain a correct start_time the ASF
-     * 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
-     * a bitrate, this value will be estimated from bitrate and file size.
-     *
-     * Encoding: May be set by the caller before avformat_write_header() to
-     * provide a hint to the muxer about the estimated duration.
-     */
-    int64_t duration;
-
-    int64_t nb_frames;                 ///< number of frames in this stream if known or 0
-
-    /**
-     * Stream disposition - a combination of AV_DISPOSITION_* flags.
-     * - demuxing: set by libavformat when creating the stream or in
-     *             avformat_find_stream_info().
-     * - muxing: may be set by the caller before avformat_write_header().
-     */
-    int disposition;
-
-    enum AVDiscard discard; ///< Selects which packets can be discarded at will and do not need to be demuxed.
-
-    /**
-     * sample aspect ratio (0 if unknown)
-     * - encoding: Set by user.
-     * - decoding: Set by libavformat.
-     */
-    AVRational sample_aspect_ratio;
-
-    AVDictionary *metadata;
-
-    /**
-     * 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 indicating events happening on the stream, a combination of
-     * AVSTREAM_EVENT_FLAG_*.
-     *
-     * - demuxing: may be set by the demuxer in avformat_open_input(),
-     *   avformat_find_stream_info() and av_read_frame(). Flags must be cleared
-     *   by the user once the event has been handled.
-     * - muxing: may be set by the user after avformat_write_header(). to
-     *   indicate a user-triggered event.  The muxer will clear the flags for
-     *   events it has handled in av_interleaved_write_frame().
-     */
-    int event_flags;
-/**
- * - demuxing: the demuxer read new metadata from the file and updated
- *     AVStream.metadata accordingly
- * - muxing: the user updated AVStream.metadata and wishes the muxer to write
- *     it into the file
- */
-#define AVSTREAM_EVENT_FLAG_METADATA_UPDATED 0x0001
-/**
- * - demuxing: new packets for this stream were read from the file. This
- *   event is informational only and does not guarantee that new packets
- *   for this stream will necessarily be returned from av_read_frame().
- */
-#define AVSTREAM_EVENT_FLAG_NEW_PACKETS (1 << 1)
-
-    /**
-     * 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.
-     */
-    AVRational r_frame_rate;
-
-    /**
-     * Codec parameters associated with this stream. Allocated and freed by
-     * libavformat in avformat_new_stream() and avformat_free_context()
-     * respectively.
-     *
-     * - demuxing: filled by libavformat on stream creation or in
-     *             avformat_find_stream_info()
-     * - muxing: filled by the caller before avformat_write_header()
-     */
-    AVCodecParameters *codecpar;
-
-    /**
-     * Number of bits in timestamps. Used for wrapping control.
-     *
-     * - demuxing: set by libavformat
-     * - muxing: set by libavformat
-     *
-     */
-    int pts_wrap_bits;
-} AVStream;
-
-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
-
-/**
- * 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(AVProgram) must not be used outside libav*.
- */
-typedef struct AVProgram {
-    int            id;
-    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;
-    AVDictionary *metadata;
-
-    int program_num;
-    int pmt_pid;
-    int pcr_pid;
-    int pmt_version;
-
-    /*****************************************************************
-     * 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
-                                         (streams are added dynamically) */
-#define AVFMTCTX_UNSEEKABLE    0x0002 /**< signal that the stream is definitely
-                                         not seekable, and attempts to call the
-                                         seek function will fail. For some
-                                         network protocols (e.g. HLS), this can
-                                         change dynamically at runtime. */
-
-typedef struct AVChapter {
-    int64_t 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
-    AVDictionary *metadata;
-} AVChapter;
-
-
-/**
- * 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);
-
-typedef int (*AVOpenCallback)(struct AVFormatContext *s, AVIOContext **pb, const char *url, int flags,
-                              const AVIOInterruptCB *int_cb, AVDictionary **options);
-
-/**
- * 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)
-};
-
-/**
- * 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*, use
- * avformat_alloc_context() to create an AVFormatContext.
- *
- * Fields can be accessed through AVOptions (av_opt*),
- * the name string used matches the associated command line parameter name and
- * can be found in libavformat/options_table.h.
- * The AVOption/command line parameter names differ in some cases from the C
- * structure field names for historic reasons or brevity.
- */
-typedef struct AVFormatContext {
-    /**
-     * 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().
-     */
-    const struct AVInputFormat *iformat;
-
-    /**
-     * The output container format.
-     *
-     * Muxing only, must be set by the caller before avformat_write_header().
-     */
-    const 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;
-
-    /**
-     * 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 */
-    /**
-     * Flags signalling stream properties. A combination of AVFMTCTX_*.
-     * Set by libavformat.
-     */
-    int ctx_flags;
-
-    /**
-     * 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;
-
-    /**
-     * input or output URL. Unlike the old filename field, this field has no
-     * length restriction.
-     *
-     * - demuxing: set by avformat_open_input(), initialized to an empty
-     *             string if url parameter was NULL in avformat_open_input().
-     * - muxing: may be set by the caller before calling avformat_write_header()
-     *           (or avformat_init_output() if that is called first) to a string
-     *           which is freeable by av_free(). Set to an empty string if it
-     *           was NULL in avformat_init_output().
-     *
-     * Freed by libavformat in avformat_free_context().
-     */
-    char *url;
-
-    /**
-     * 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;
-
-    /**
-     * 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;
-
-    /**
-     * 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.
-     */
-    int64_t bit_rate;
-
-    unsigned int packet_size;
-    int max_delay;
-
-    /**
-     * 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.
-#define AVFMT_FLAG_NONBLOCK     0x0004 ///< Do not block when reading packets from input.
-#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_SORT_DTS    0x10000 ///< try to interleave outputted packets by dts (using this flag can slow demuxing down)
-#if FF_API_LAVF_PRIV_OPT
-#define AVFMT_FLAG_PRIV_OPT    0x20000 ///< Enable use of private options by delaying codec open (deprecated, does nothing)
-#endif
-#define AVFMT_FLAG_FAST_SEEK   0x80000 ///< Enable fast, but inaccurate seeks for some formats
-#define AVFMT_FLAG_SHORTEST   0x100000 ///< Stop muxing when the shortest stream stops.
-#define AVFMT_FLAG_AUTO_BSF   0x200000 ///< Add bitstream filters as requested by the muxer
-
-    /**
-     * Maximum number of bytes read from input in order to determine stream
-     * properties. Used when reading the global header and in
-     * avformat_find_stream_info().
-     *
-     * Demuxing only, set by the caller before avformat_open_input().
-     *
-     * @note this is \e not  used for determining the \ref AVInputFormat
-     *       "input format"
-     * @sa format_probesize
-     */
-    int64_t probesize;
-
-    /**
-     * 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().
-     * Can be set to 0 to let avformat choose using a heuristic.
-     */
-    int64_t max_analyze_duration;
-
-    const uint8_t *key;
-    int keylen;
-
-    unsigned int nb_programs;
-    AVProgram **programs;
-
-    /**
-     * Forced video codec_id.
-     * Demuxing: Set by user.
-     */
-    enum AVCodecID video_codec_id;
-
-    /**
-     * Forced audio codec_id.
-     * Demuxing: Set by user.
-     */
-    enum AVCodecID audio_codec_id;
-
-    /**
-     * Forced subtitle codec_id.
-     * Demuxing: Set by user.
-     */
-    enum AVCodecID subtitle_codec_id;
-
-    /**
-     * Maximum amount of memory in bytes to use for the index of each stream.
-     * If the index exceeds this size, entries will be discarded as
-     * needed to maintain a smaller size. This can lead to slower or less
-     * accurate seeking (depends on demuxer).
-     * Demuxers for which a full in-memory index is mandatory will ignore
-     * this.
-     * - muxing: unused
-     * - demuxing: set by user
-     */
-    unsigned int max_index_size;
-
-    /**
-     * Maximum amount of memory in bytes to use for buffering frames
-     * obtained from realtime capture devices.
-     */
-    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 indicating events happening on the file, a combination of
-     * AVFMT_EVENT_FLAG_*.
-     *
-     * - demuxing: may be set by the demuxer in avformat_open_input(),
-     *   avformat_find_stream_info() and av_read_frame(). Flags must be cleared
-     *   by the user once the event has been handled.
-     * - muxing: may be set by the user after avformat_write_header() to
-     *   indicate a user-triggered event.  The muxer will clear the flags for
-     *   events it has handled in av_interleaved_write_frame().
-     */
-    int event_flags;
-/**
- * - demuxing: the demuxer read new metadata from the file and updated
- *   AVFormatContext.metadata accordingly
- * - muxing: the user updated AVFormatContext.metadata and wishes the muxer to
- *   write it into the file
- */
-#define AVFMT_EVENT_FLAG_METADATA_UPDATED 0x0001
-
-    /**
-     * Maximum number of packets to read while waiting for the first timestamp.
-     * Decoding only.
-     */
-    int max_ts_probe;
-
-    /**
-     * Avoid negative timestamps during muxing.
-     * Any value of the AVFMT_AVOID_NEG_TS_* constants.
-     * Note, this only works when using av_interleaved_write_frame. (interleave_packet_per_dts is in use)
-     * - muxing: Set by user
-     * - demuxing: unused
-     */
-    int avoid_negative_ts;
-#define AVFMT_AVOID_NEG_TS_AUTO             -1 ///< Enabled when required by target format
-#define AVFMT_AVOID_NEG_TS_MAKE_NON_NEGATIVE 1 ///< Shift timestamps so they are non negative
-#define AVFMT_AVOID_NEG_TS_MAKE_ZERO         2 ///< Shift timestamps so that they start at 0
-
-    /**
-     * 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
-     * - 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
-     * - 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
-     * - 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
-     */
-    int use_wallclock_as_timestamps;
-
-    /**
-     * avio flags, used to force AVIO_FLAG_DIRECT.
-     * - encoding: unused
-     * - decoding: Set by user
-     */
-    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
-     */
-    enum AVDurationEstimationMethod duration_estimation_method;
-
-    /**
-     * Skip initial bytes when opening stream
-     * - encoding: unused
-     * - decoding: Set by user
-     */
-    int64_t skip_initial_bytes;
-
-    /**
-     * Correct single timestamp overflows
-     * - encoding: unused
-     * - decoding: Set by user
-     */
-    unsigned int correct_ts_overflow;
-
-    /**
-     * Force seeking to any (also non key) frames.
-     * - encoding: unused
-     * - decoding: Set by user
-     */
-    int seek2any;
-
-    /**
-     * Flush the I/O context after each packet.
-     * - encoding: Set by user
-     * - 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
-     */
-    int probe_score;
-
-    /**
-     * Maximum number of bytes read from input in order to identify the
-     * \ref AVInputFormat "input format". Only used when the format is not set
-     * explicitly by the caller.
-     *
-     * Demuxing only, set by the caller before avformat_open_input().
-     *
-     * @sa probesize
-     */
-    int format_probesize;
-
-    /**
-     * ',' separated list of allowed decoders.
-     * If NULL then all are allowed
-     * - encoding: unused
-     * - decoding: set by user
-     */
-    char *codec_whitelist;
-
-    /**
-     * ',' separated list of allowed demuxers.
-     * If NULL then all are allowed
-     * - encoding: unused
-     * - decoding: set by user
-     */
-    char *format_whitelist;
-
-    /**
-     * 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
-     */
-    const 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
-     */
-    const 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
-     */
-    const AVCodec *subtitle_codec;
-
-    /**
-     * Forced data codec.
-     * This allows forcing a specific decoder, even when there are multiple with
-     * the same codec_id.
-     * Demuxing: Set by user
-     */
-    const AVCodec *data_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.
-     */
-    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
-     */
-    int64_t output_ts_offset;
-
-    /**
-     * dump format separator.
-     * can be ", " or "\n      " or anything else
-     * - muxing: Set by user.
-     * - demuxing: Set by user.
-     */
-    uint8_t *dump_separator;
-
-    /**
-     * Forced Data codec_id.
-     * Demuxing: Set by user.
-     */
-    enum AVCodecID data_codec_id;
-
-    /**
-     * ',' separated list of allowed protocols.
-     * - encoding: unused
-     * - decoding: set by user
-     */
-    char *protocol_whitelist;
-
-    /**
-     * A callback for opening new IO streams.
-     *
-     * Whenever a muxer or a demuxer needs to open an IO stream (typically from
-     * avformat_open_input() for demuxers, but for certain formats can happen at
-     * other times as well), it will call this callback to obtain an IO context.
-     *
-     * @param s the format context
-     * @param pb on success, the newly opened IO context should be returned here
-     * @param url the url to open
-     * @param flags a combination of AVIO_FLAG_*
-     * @param options a dictionary of additional options, with the same
-     *                semantics as in avio_open2()
-     * @return 0 on success, a negative AVERROR code on failure
-     *
-     * @note Certain muxers and demuxers do nesting, i.e. they open one or more
-     * additional internal format contexts. Thus the AVFormatContext pointer
-     * passed to this callback may be different from the one facing the caller.
-     * It will, however, have the same 'opaque' field.
-     */
-    int (*io_open)(struct AVFormatContext *s, AVIOContext **pb, const char *url,
-                   int flags, AVDictionary **options);
-
-    /**
-     * A callback for closing the streams opened with AVFormatContext.io_open().
-     */
-    void (*io_close)(struct AVFormatContext *s, AVIOContext *pb);
-
-    /**
-     * ',' separated list of disallowed protocols.
-     * - encoding: unused
-     * - decoding: set by user
-     */
-    char *protocol_blacklist;
-
-    /**
-     * The maximum number of streams.
-     * - encoding: unused
-     * - decoding: set by user
-     */
-    int max_streams;
-
-    /**
-     * Skip duration calcuation in estimate_timings_from_pts.
-     * - encoding: unused
-     * - decoding: set by user
-     */
-    int skip_estimate_duration_from_pts;
-
-    /**
-     * Maximum number of packets that can be probed
-     * - encoding: unused
-     * - decoding: set by user
-     */
-    int max_probe_packets;
-
-    /**
-     * A callback for closing the streams opened with AVFormatContext.io_open().
-     *
-     * Using this is preferred over io_close, because this can return an error.
-     * Therefore this callback is used instead of io_close by the generic
-     * libavformat code if io_close is NULL or the default.
-     *
-     * @param s the format context
-     * @param pb IO context to be closed and freed
-     * @return 0 on success, a negative AVERROR code on failure
-     */
-    int (*io_close2)(struct AVFormatContext *s, AVIOContext *pb);
-} AVFormatContext;
-
-/**
- * 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);
-
-/**
- * @defgroup lavf_core Core functions
- * @ingroup libavf
- *
- * Functions for querying libavformat capabilities, allocating core structures,
- * etc.
- * @{
- */
-
-/**
- * Return the LIBAVFORMAT_VERSION_INT constant.
- */
-unsigned avformat_version(void);
-
-/**
- * Return the libavformat build-time configuration.
- */
-const char *avformat_configuration(void);
-
-/**
- * Return the libavformat license.
- */
-const char *avformat_license(void);
-
-/**
- * Do global initialization of network libraries. This is optional,
- * and not recommended anymore.
- *
- * This functions only exists to work around thread-safety issues
- * with older GnuTLS or OpenSSL libraries. If libavformat is linked
- * to newer versions of those libraries, or if you do not use them,
- * calling this function is unnecessary. Otherwise, you need to call
- * this function before any other threads using them are started.
- *
- * This function will be deprecated once support for older GnuTLS and
- * OpenSSL libraries is removed, and this function has no purpose
- * anymore.
- */
-int avformat_network_init(void);
-
-/**
- * Undo the initialization done by avformat_network_init. Call it only
- * once for each time you called avformat_network_init.
- */
-int avformat_network_deinit(void);
-
-/**
- * Iterate over all registered muxers.
- *
- * @param opaque a pointer where libavformat will store the iteration state. Must
- *               point to NULL to start the iteration.
- *
- * @return the next registered muxer or NULL when the iteration is
- *         finished
- */
-const AVOutputFormat *av_muxer_iterate(void **opaque);
-
-/**
- * Iterate over all registered demuxers.
- *
- * @param opaque a pointer where libavformat will store the iteration state. Must
- *               point to NULL to start the iteration.
- *
- * @return the next registered demuxer or NULL when the iteration is
- *         finished
- */
-const AVInputFormat *av_demuxer_iterate(void **opaque);
-
-/**
- * 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_opt_find().
- */
-const AVClass *avformat_get_class(void);
-
-/**
- * Get the AVClass for AVStream. It can be used in combination with
- * AV_OPT_SEARCH_FAKE_OBJ for examining options.
- *
- * @see av_opt_find().
- */
-const AVClass *av_stream_get_class(void);
-
-/**
- * Add a new stream to a media file.
- *
- * 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 avformat_free_context() to clean up the allocation
- * by avformat_new_stream().
- *
- * @param s media file handle
- * @param c unused, does nothing
- *
- * @return newly created stream or NULL on error.
- */
-AVStream *avformat_new_stream(AVFormatContext *s, const AVCodec *c);
-
-/**
- * Wrap an existing array as stream side data.
- *
- * @param st stream
- * @param type side information type
- * @param data the side data array. It must be allocated with the av_malloc()
- *             family of functions. The ownership of the data is transferred to
- *             st.
- * @param size side information size
- * @return zero on success, a negative AVERROR code on failure. On failure,
- *         the stream is unchanged and the data remains owned by the caller.
- */
-int av_stream_add_side_data(AVStream *st, enum AVPacketSideDataType type,
-                            uint8_t *data, size_t size);
-
-/**
- * Allocate new information from stream.
- *
- * @param stream stream
- * @param type desired side information type
- * @param size side information size
- * @return pointer to fresh allocated data or NULL otherwise
- */
-uint8_t *av_stream_new_side_data(AVStream *stream,
-                                 enum AVPacketSideDataType type, size_t size);
-/**
- * Get side information from stream.
- *
- * @param stream stream
- * @param type desired side information type
- * @param size If supplied, *size will be set to the size of the side data
- *             or to zero if the desired side data is not present.
- * @return pointer to data if present or NULL otherwise
- */
-uint8_t *av_stream_get_side_data(const AVStream *stream,
-                                 enum AVPacketSideDataType type, size_t *size);
-
-AVProgram *av_new_program(AVFormatContext *s, int 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, const AVOutputFormat *oformat,
-                                   const char *format_name, const char *filename);
-
-/**
- * @addtogroup lavf_decoding
- * @{
- */
-
-/**
- * Find AVInputFormat based on the short name of the input format.
- */
-const AVInputFormat *av_find_input_format(const char *short_name);
-
-/**
- * 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.
- */
-const AVInputFormat *av_probe_input_format(const AVProbeData *pd, int is_opened);
-
-/**
- * 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.
- */
-const AVInputFormat *av_probe_input_format2(const AVProbeData *pd,
-                                            int is_opened, int *score_max);
-
-/**
- * Guess the file format.
- *
- * @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.
- */
-const AVInputFormat *av_probe_input_format3(const AVProbeData *pd,
-                                            int is_opened, int *score_ret);
-
-/**
- * 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 url the url 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
- */
-int av_probe_input_buffer2(AVIOContext *pb, const AVInputFormat **fmt,
-                           const char *url, void *logctx,
-                           unsigned int offset, unsigned int max_probe_size);
-
-/**
- * Like av_probe_input_buffer2() but returns 0 on success
- */
-int av_probe_input_buffer(AVIOContext *pb, const AVInputFormat **fmt,
-                          const char *url, void *logctx,
-                          unsigned int offset, unsigned int max_probe_size);
-
-/**
- * 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 url URL 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 *url,
-                        const AVInputFormat *fmt, AVDictionary **options);
-
-/**
- * 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);
-
-void av_program_add_stream_index(AVFormatContext *ac, int progid, unsigned int idx);
-
-/**
- * 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,
-                        const AVCodec **decoder_ret,
-                        int flags);
-
-/**
- * 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.
- *
- * On success, the returned packet is reference-counted (pkt->buf is set) and
- * valid indefinitely. The packet must be freed with av_packet_unref() 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
- * provide them). pkt->pts can be AV_NOPTS_VALUE if the video format
- * has B-frames, so it is better to rely on pkt->dts if you do not
- * decompress the payload.
- *
- * @return 0 if OK, < 0 on error or end of file. On error, pkt will be blank
- *         (as if it came from av_packet_alloc()).
- *
- * @note pkt will be initialized, so it may be uninitialized, but it must not
- *       contain data that needs to be freed.
- */
-int av_read_frame(AVFormatContext *s, AVPacket *pkt);
-
-/**
- * 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.
- * @param timestamp Timestamp in AVStream.time_base units
- *        or, if no stream is specified, in AV_TIME_BASE units.
- * @param flags flags which select direction and seeking mode
- * @return >= 0 on success
- */
-int av_seek_frame(AVFormatContext *s, int stream_index, int64_t timestamp,
-                  int flags);
-
-/**
- * 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.
- *
- * If flags contain AVSEEK_FLAG_BYTE, then all timestamps are in bytes and
- * are the file position (this may not be supported by all demuxers).
- * If flags contain AVSEEK_FLAG_FRAME, then all timestamps are in frames
- * in the stream with stream_index (this may not be supported by all demuxers).
- * Otherwise all timestamps are in units of the stream selected by stream_index
- * 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
- * @param max_ts largest acceptable timestamp
- * @param flags flags
- * @return >=0 on success, error code otherwise
- *
- * @note This is part of the new seek API which is still under construction.
- */
-int avformat_seek_file(AVFormatContext *s, int stream_index, int64_t min_ts, int64_t ts, int64_t max_ts, int flags);
-
-/**
- * Discard all internally buffered data. This can be useful when dealing with
- * discontinuities in the byte stream. Generally works only with formats that
- * can resync. This includes headerless formats like MPEG-TS/TS but should also
- * work with NUT, Ogg and in a limited way AVI for example.
- *
- * The set of streams, the detected duration, stream parameters and codecs do
- * not change when calling this function. If you want a complete reset, it's
- * better to open a new AVFormatContext.
- *
- * This does not flush the AVIOContext (s->pb). If necessary, call
- * avio_flush(s->pb) before calling this function.
- *
- * @param s media file handle
- * @return >=0 on success, error code otherwise
- */
-int avformat_flush(AVFormatContext *s);
-
-/**
- * Start playing a network-based stream (e.g. RTSP stream) at the
- * current position.
- */
-int av_read_play(AVFormatContext *s);
-
-/**
- * Pause a network-based stream (e.g. RTSP stream).
- *
- * Use av_read_play() to resume it.
- */
-int av_read_pause(AVFormatContext *s);
-
-/**
- * Close an opened input AVFormatContext. Free it and all its contents
- * and set *s to NULL.
- */
-void avformat_close_input(AVFormatContext **s);
-/**
- * @}
- */
-
-#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
-
-/**
- * @addtogroup lavf_encoding
- * @{
- */
-
-#define AVSTREAM_INIT_IN_WRITE_HEADER 0 ///< stream parameters initialized in avformat_write_header
-#define AVSTREAM_INIT_IN_INIT_OUTPUT  1 ///< stream parameters initialized in avformat_init_output
-
-/**
- * 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 AVSTREAM_INIT_IN_WRITE_HEADER on success if the codec had not already been fully initialized in avformat_init,
- *         AVSTREAM_INIT_IN_INIT_OUTPUT  on success if the codec had already been fully initialized in avformat_init,
- *         negative AVERROR on failure.
- *
- * @see av_opt_find, av_dict_set, avio_open, av_oformat_next, avformat_init_output.
- */
-av_warn_unused_result
-int avformat_write_header(AVFormatContext *s, AVDictionary **options);
-
-/**
- * Allocate the stream private data and initialize the codec, but do not write the header.
- * May optionally be used before avformat_write_header to initialize stream parameters
- * before actually writing the header.
- * If using this function, do not pass the same options to avformat_write_header.
- *
- * @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 AVSTREAM_INIT_IN_WRITE_HEADER on success if the codec requires avformat_write_header to fully initialize,
- *         AVSTREAM_INIT_IN_INIT_OUTPUT  on success if the codec has been fully initialized,
- *         negative AVERROR on failure.
- *
- * @see av_opt_find, av_dict_set, avio_open, av_oformat_next, avformat_write_header.
- */
-av_warn_unused_result
-int avformat_init_output(AVFormatContext *s, AVDictionary **options);
-
-/**
- * Write a packet to an output media file.
- *
- * 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).
- *            <br>
- *            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.
- *            <br>
- *            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".
- *            <br>
- *            The timestamps (@ref AVPacket.pts "pts", @ref AVPacket.dts "dts")
- *            must be set to correct values in the stream's timebase (unless the
- *            output format is flagged with the AVFMT_NOTIMESTAMPS flag, then
- *            they can be set to AV_NOPTS_VALUE).
- *            The dts for subsequent packets passed to this function must be strictly
- *            increasing when compared in their respective timebases (unless the
- *            output format is flagged with the AVFMT_TS_NONSTRICT, then they
- *            merely have to be nondecreasing).  @ref AVPacket.duration
- *            "duration") should also be set if known.
- * @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_write_frame(AVFormatContext *s, AVPacket *pkt);
-
-/**
- * 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, usually ordered by
- * increasing dts. Callers doing their own interleaving should call
- * av_write_frame() instead of this function.
- *
- * Using this function instead of av_write_frame() can give muxers advance
- * knowledge of future packets, improving e.g. the behaviour of the mp4
- * muxer for VFR content in fragmenting mode.
- *
- * @param s media file handle
- * @param pkt The packet containing the data to be written.
- *            <br>
- *            If the packet is reference-counted, this function will take
- *            ownership of this reference and unreference it later when it sees
- *            fit. If the packet is not reference-counted, libavformat will
- *            make a copy.
- *            The returned packet will be blank (as if returned from
- *            av_packet_alloc()), even on error.
- *            <br>
- *            This parameter can be NULL (at any time, not just at the end), to
- *            flush the interleaving queues.
- *            <br>
- *            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".
- *            <br>
- *            The timestamps (@ref AVPacket.pts "pts", @ref AVPacket.dts "dts")
- *            must be set to correct values in the stream's timebase (unless the
- *            output format is flagged with the AVFMT_NOTIMESTAMPS flag, then
- *            they can be set to AV_NOPTS_VALUE).
- *            The dts for subsequent packets in one stream must be strictly
- *            increasing (unless the output format is flagged with the
- *            AVFMT_TS_NONSTRICT, then they merely have to be nondecreasing).
- *            @ref AVPacket.duration "duration" should also be set if known.
- *
- * @return 0 on success, a negative AVERROR on error.
- *
- * @see av_write_frame(), AVFormatContext.max_interleave_delta
- */
-int av_interleaved_write_frame(AVFormatContext *s, AVPacket *pkt);
-
-/**
- * Write an uncoded frame to an output media file.
- *
- * The frame must be correctly interleaved according to the container
- * specification; if not, av_interleaved_write_uncoded_frame() must be used.
- *
- * See av_interleaved_write_uncoded_frame() for details.
- */
-int av_write_uncoded_frame(AVFormatContext *s, int stream_index,
-                           AVFrame *frame);
-
-/**
- * Write an uncoded frame to an output media file.
- *
- * If the muxer supports it, this function makes it possible 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
- */
-int av_interleaved_write_uncoded_frame(AVFormatContext *s, int stream_index,
-                                       AVFrame *frame);
-
-/**
- * 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);
-
-/**
- * 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_trailer(AVFormatContext *s);
-
-/**
- * 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.
- *
- * @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
- */
-const 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(const 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
- * @paramout dts   DTS of the last packet output for the stream, in stream
- *                   time_base units
- * @paramout 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
- * @{
- *
- * Miscellaneous utility functions related to both muxing and demuxing
- * (or neither).
- */
-
-/**
- * Send 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
- *
- * @see av_hex_dump_log, av_pkt_dump2, av_pkt_dump_log2
- */
-void av_hex_dump(FILE *f, const uint8_t *buf, int size);
-
-/**
- * Send a nice hexadecimal dump of a buffer 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 buf buffer
- * @param size buffer size
- *
- * @see av_hex_dump, av_pkt_dump2, av_pkt_dump_log2
- */
-void av_hex_dump_log(void *avcl, int level, const uint8_t *buf, int size);
-
-/**
- * Send a nice dump of a packet to the specified file 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 st AVStream that the packet belongs to
- */
-void av_pkt_dump2(FILE *f, const AVPacket *pkt, int dump_payload, const AVStream *st);
-
-
-/**
- * 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
- */
-void av_pkt_dump_log2(void *avcl, int level, const AVPacket *pkt, int dump_payload,
-                      const AVStream *st);
-
-/**
- * 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
- */
-enum AVCodecID av_codec_get_id(const struct AVCodecTag * const *tags, unsigned int tag);
-
-/**
- * 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
- */
-unsigned int av_codec_get_tag(const struct AVCodecTag * const *tags, enum AVCodecID id);
-
-/**
- * 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);
-
-int av_find_default_stream_index(AVFormatContext *s);
-
-/**
- * Get the index for a specific timestamp.
- *
- * @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 av_index_search_timestamp(AVStream *st, int64_t timestamp, int flags);
-
-/**
- * Get the index entry count for the given AVStream.
- *
- * @param st stream
- * @return the number of index entries in the stream
- */
-int avformat_index_get_entries_count(const AVStream *st);
-
-/**
- * Get the AVIndexEntry corresponding to the given index.
- *
- * @param st          Stream containing the requested AVIndexEntry.
- * @param idx         The desired index.
- * @return A pointer to the requested AVIndexEntry if it exists, NULL otherwise.
- *
- * @note The pointer returned by this function is only guaranteed to be valid
- *       until any function that takes the stream or the parent AVFormatContext
- *       as input argument is called.
- */
-const AVIndexEntry *avformat_index_get_entry(AVStream *st, int idx);
-
-/**
- * Get the AVIndexEntry corresponding to the given timestamp.
- *
- * @param st          Stream containing the requested AVIndexEntry.
- * @param timestamp   Timestamp to retrieve the index entry for.
- * @param flags       If AVSEEK_FLAG_BACKWARD then the returned entry 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 A pointer to the requested AVIndexEntry if it exists, NULL otherwise.
- *
- * @note The pointer returned by this function is only guaranteed to be valid
- *       until any function that takes the stream or the parent AVFormatContext
- *       as input argument is called.
- */
-const AVIndexEntry *avformat_index_get_entry_from_timestamp(AVStream *st,
-                                                            int64_t wanted_timestamp,
-                                                            int flags);
-/**
- * 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);
-
-
-#define AV_FRAME_FILENAME_FLAGS_MULTIPLE 1 ///< Allow multiple %d
-
-/**
- * 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 '%%'.
- *
- * @param buf destination buffer
- * @param buf_size destination buffer size
- * @param path numbered sequence string
- * @param number frame number
- * @param flags AV_FRAME_FILENAME_FLAGS_*
- * @return 0 if OK, -1 on format error
- */
-int av_get_frame_filename2(char *buf, int buf_size,
-                          const char *path, int number, int flags);
-
-int av_get_frame_filename(char *buf, int buf_size,
-                          const char *path, int number);
-
-/**
- * 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
- */
-int av_filename_number_test(const char *filename);
-
-/**
- * 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
- *           multiple AVStreams (one AVStream per RTP stream). Otherwise,
- *           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 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 av_sdp_create(AVFormatContext *ac, int n_files, char *buf, int size);
-
-/**
- * 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);
-
-enum AVTimebaseSource {
-    AVFMT_TBCF_AUTO = -1,
-    AVFMT_TBCF_DECODER,
-    AVFMT_TBCF_DEMUXER,
-#if FF_API_R_FRAME_RATE
-    AVFMT_TBCF_R_FRAMERATE,
-#endif
-};
-
-/**
- * Transfer internal timing information from one stream to another.
- *
- * This function is useful when doing stream copy.
- *
- * @param ofmt     target output format for ost
- * @param ost      output stream which needs timings copy and adjustments
- * @param ist      reference input stream to copy timings from
- * @param copy_tb  define from where the stream codec timebase needs to be imported
- */
-int avformat_transfer_internal_stream_timing_info(const AVOutputFormat *ofmt,
-                                                  AVStream *ost, const AVStream *ist,
-                                                  enum AVTimebaseSource copy_tb);
-
-/**
- * Get the internal codec timebase from a stream.
- *
- * @param st  input stream to extract the timebase from
- */
-AVRational av_stream_get_codec_timebase(const AVStream *st);
-
-/**
- * @}
- */
-
-#endif /* AVFORMAT_AVFORMAT_H */

gpac-2.2.1.tar.gz/extra_lib/include/libavformat/avio.h Deleted

@@ -1,835 +0,0 @@
-/*
- * copyright (c) 2001 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 AVFORMAT_AVIO_H
-#define AVFORMAT_AVIO_H
-
-/**
- * @file
- * @ingroup lavf_io
- * Buffered I/O operations
- */
-
-#include <stdint.h>
-
-#include "libavutil/common.h"
-#include "libavutil/dict.h"
-#include "libavutil/log.h"
-
-#include "libavformat/version.h"
-
-/**
- * Seeking works like for a local file.
- */
-#define AVIO_SEEKABLE_NORMAL (1 << 0)
-
-/**
- * Seeking by timestamp with avio_seek_time() is possible.
- */
-#define AVIO_SEEKABLE_TIME   (1 << 1)
-
-/**
- * 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.
- *
- * 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.
- */
-typedef struct AVIOInterruptCB {
-    int (*callback)(void*);
-    void *opaque;
-} AVIOInterruptCB;
-
-/**
- * Directory entry types.
- */
-enum AVIODirEntryType {
-    AVIO_ENTRY_UNKNOWN,
-    AVIO_ENTRY_BLOCK_DEVICE,
-    AVIO_ENTRY_CHARACTER_DEVICE,
-    AVIO_ENTRY_DIRECTORY,
-    AVIO_ENTRY_NAMED_PIPE,
-    AVIO_ENTRY_SYMBOLIC_LINK,
-    AVIO_ENTRY_SOCKET,
-    AVIO_ENTRY_FILE,
-    AVIO_ENTRY_SERVER,
-    AVIO_ENTRY_SHARE,
-    AVIO_ENTRY_WORKGROUP,
-};
-
-/**
- * Describes single entry of the directory.
- *
- * Only name and type fields are guaranteed be set.
- * Rest of fields are protocol or/and platform dependent and might be unknown.
- */
-typedef struct AVIODirEntry {
-    char *name;                           /**< Filename */
-    int type;                             /**< Type of the entry */
-    int utf8;                             /**< Set to 1 when name is encoded with UTF-8, 0 otherwise.
-                                               Name can be encoded with UTF-8 even though 0 is set. */
-    int64_t size;                         /**< File size in bytes, -1 if unknown. */
-    int64_t modification_timestamp;       /**< Time of last modification in microseconds since unix
-                                               epoch, -1 if unknown. */
-    int64_t access_timestamp;             /**< Time of last access in microseconds since unix epoch,
-                                               -1 if unknown. */
-    int64_t status_change_timestamp;      /**< Time of last status change in microseconds since unix
-                                               epoch, -1 if unknown. */
-    int64_t user_id;                      /**< User ID of owner, -1 if unknown. */
-    int64_t group_id;                     /**< Group ID of owner, -1 if unknown. */
-    int64_t filemode;                     /**< Unix file mode, -1 if unknown. */
-} AVIODirEntry;
-
-typedef struct AVIODirContext {
-    struct URLContext *url_context;
-} AVIODirContext;
-
-/**
- * Different data types that can be returned via the AVIO
- * write_data_type callback.
- */
-enum AVIODataMarkerType {
-    /**
-     * Header data; this needs to be present for the stream to be decodeable.
-     */
-    AVIO_DATA_MARKER_HEADER,
-    /**
-     * A point in the output bytestream where a decoder can start decoding
-     * (i.e. a keyframe). A demuxer/decoder given the data flagged with
-     * AVIO_DATA_MARKER_HEADER, followed by any AVIO_DATA_MARKER_SYNC_POINT,
-     * should give decodeable results.
-     */
-    AVIO_DATA_MARKER_SYNC_POINT,
-    /**
-     * A point in the output bytestream where a demuxer can start parsing
-     * (for non self synchronizing bytestream formats). That is, any
-     * non-keyframe packet start point.
-     */
-    AVIO_DATA_MARKER_BOUNDARY_POINT,
-    /**
-     * This is any, unlabelled data. It can either be a muxer not marking
-     * any positions at all, it can be an actual boundary/sync point
-     * that the muxer chooses not to mark, or a later part of a packet/fragment
-     * that is cut into multiple write callbacks due to limited IO buffer size.
-     */
-    AVIO_DATA_MARKER_UNKNOWN,
-    /**
-     * Trailer data, which doesn't contain actual content, but only for
-     * finalizing the output file.
-     */
-    AVIO_DATA_MARKER_TRAILER,
-    /**
-     * A point in the output bytestream where the underlying AVIOContext might
-     * flush the buffer depending on latency or buffering requirements. Typically
-     * means the end of a packet.
-     */
-    AVIO_DATA_MARKER_FLUSH_POINT,
-};
-
-/**
- * Bytestream IO Context.
- * New public fields can be added with minor version bumps.
- * Removal, reordering and changes to existing public fields require
- * a major version bump.
- * sizeof(AVIOContext) must not be used outside libav*.
- *
- * @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;
-
-    /*
-     * The following shows the relationship between buffer, buf_ptr,
-     * buf_ptr_max, buf_end, buf_size, and pos, when reading and when writing
-     * (since AVIOContext is used for both):
-     *
-     **********************************************************************************
-     *                                   READING
-     **********************************************************************************
-     *
-     *                            |              buffer_size              |
-     *                            |---------------------------------------|
-     *                            |                                       |
-     *
-     *                         buffer          buf_ptr       buf_end
-     *                            +---------------+-----------------------+
-     *                            |/ / / / / / / /|/ / / / / / /|         |
-     *  read buffer:              |/ / consumed / | to be read /|         |
-     *                            |/ / / / / / / /|/ / / / / / /|         |
-     *                            +---------------+-----------------------+
-     *
-     *                                                         pos
-     *              +-------------------------------------------+-----------------+
-     *  input file: |                                           |                 |
-     *              +-------------------------------------------+-----------------+
-     *
-     *
-     **********************************************************************************
-     *                                   WRITING
-     **********************************************************************************
-     *
-     *                             |          buffer_size                 |
-     *                             |--------------------------------------|
-     *                             |                                      |
-     *
-     *                                                buf_ptr_max
-     *                          buffer                 (buf_ptr)       buf_end
-     *                             +-----------------------+--------------+
-     *                             |/ / / / / / / / / / / /|              |
-     *  write buffer:              | / / to be flushed / / |              |
-     *                             |/ / / / / / / / / / / /|              |
-     *                             +-----------------------+--------------+
-     *                               buf_ptr can be in this
-     *                               due to a backward seek
-     *
-     *                            pos
-     *               +-------------+----------------------------------------------+
-     *  output file: |             |                                              |
-     *               +-------------+----------------------------------------------+
-     *
-     */
-    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 eof_reached;        /**< true if was unable to read due to error or eof */
-    int error;              /**< contains the error code or 0 if no error happened */
-    int write_flag;         /**< true if open for writing */
-    int max_packet_size;
-    int min_packet_size;    /**< Try to buffer at least this amount of data
-                                 before flushing it. */
-    unsigned long checksum;
-    unsigned char *checksum_ptr;
-    unsigned long (*update_checksum)(unsigned long checksum, const uint8_t *buf, unsigned int size);
-    /**
-     * 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;
-
-    /**
-     * 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;
-
-    /**
-     * ',' separated list of allowed protocols.
-     */
-    const char *protocol_whitelist;
-
-    /**
-     * ',' separated list of disallowed protocols.
-     */
-    const char *protocol_blacklist;
-
-    /**
-     * A callback that is used instead of write_packet.
-     */
-    int (*write_data_type)(void *opaque, uint8_t *buf, int buf_size,
-                           enum AVIODataMarkerType type, int64_t time);
-    /**
-     * If set, don't call write_data_type separately for AVIO_DATA_MARKER_BOUNDARY_POINT,
-     * but ignore them and treat them as AVIO_DATA_MARKER_UNKNOWN (to avoid needlessly
-     * small chunks of data returned from the callback).
-     */
-    int ignore_boundary_point;
-
-#if FF_API_AVIOCONTEXT_WRITTEN
-    /**
-     * @deprecated field utilized privately by libavformat. For a public
-     *             statistic of how many bytes were written out, see
-     *             AVIOContext::bytes_written.
-     */
-    attribute_deprecated
-    int64_t written;
-#endif
-
-    /**
-     * Maximum reached position before a backward seek in the write buffer,
-     * used keeping track of already written data for a later flush.
-     */
-    unsigned char *buf_ptr_max;
-
-    /**
-     * Read-only statistic of bytes read for this AVIOContext.
-     */
-    int64_t bytes_read;
-
-    /**
-     * Read-only statistic of bytes written for this AVIOContext.
-     */
-    int64_t bytes_written;
-} AVIOContext;
-
-/**
- * Return the name of the protocol that will handle the passed URL.
- *
- * NULL is returned if no protocol could be found for the given URL.
- *
- * @return Name of the protocol or NULL.
- */
-const char *avio_find_protocol_name(const char *url);
-
-/**
- * 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.
- *
- * @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 avio_check(const char *url, int flags);
-
-/**
- * Open directory for reading.
- *
- * @param s       directory read context. Pointer to a NULL pointer must be passed.
- * @param url     directory to be listed.
- * @param options A dictionary filled with protocol-private options. On return
- *                this parameter will be destroyed and replaced with a dictionary
- *                containing options that were not found. May be NULL.
- * @return >=0 on success or negative on error.
- */
-int avio_open_dir(AVIODirContext **s, const char *url, AVDictionary **options);
-
-/**
- * Get next directory entry.
- *
- * Returned entry must be freed with avio_free_directory_entry(). In particular
- * it may outlive AVIODirContext.
- *
- * @param s         directory read context.
- * @paramout next next entry or NULL when no more entries.
- * @return >=0 on success or negative on error. End of list is not considered an
- *             error.
- */
-int avio_read_dir(AVIODirContext *s, AVIODirEntry **next);
-
-/**
- * Close directory.
- *
- * @note Entries created using avio_read_dir() are not deleted and must be
- * freeded with avio_free_directory_entry().
- *
- * @param s         directory read context.
- * @return >=0 on success or negative on error.
- */
-int avio_close_dir(AVIODirContext **s);
-
-/**
- * Free entry allocated by avio_read_dir().
- *
- * @param entry entry to be freed.
- */
-void avio_free_directory_entry(AVIODirEntry **entry);
-
-/**
- * Allocate and initialize an AVIOContext for buffered I/O. It must be later
- * freed with avio_context_free().
- *
- * @param buffer Memory block for input/output operations via AVIOContext.
- *        The buffer must be allocated with av_malloc() and friends.
- *        It may be freed and replaced with a new buffer by libavformat.
- *        AVIOContext.buffer holds the buffer currently in use,
- *        which must be later freed with av_free().
- * @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.
- *                     For stream protocols, must never return 0 but rather
- *                     a proper AVERROR code.
- * @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.
- */
-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));
-
-/**
- * Free the supplied IO context and everything associated with it.
- *
- * @param s Double pointer to the IO context. This function will write NULL
- * into s.
- */
-void avio_context_free(AVIOContext **s);
-
-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);
-
-/**
- * Write a NULL-terminated string.
- * @return number of bytes written.
- */
-int avio_put_str(AVIOContext *s, const char *str);
-
-/**
- * Convert an UTF-8 string to UTF-16LE and write it.
- * @param s the AVIOContext
- * @param str NULL-terminated UTF-8 string
- *
- * @return number of bytes written.
- */
-int avio_put_str16le(AVIOContext *s, const char *str);
-
-/**
- * Convert an UTF-8 string to UTF-16BE and write it.
- * @param s the AVIOContext
- * @param str NULL-terminated UTF-8 string
- *
- * @return number of bytes written.
- */
-int avio_put_str16be(AVIOContext *s, const char *str);
-
-/**
- * Mark the written bytestream as a specific type.
- *
- * Zero-length ranges are omitted from the output.
- *
- * @param time the stream time the current bytestream pos corresponds to
- *             (in AV_TIME_BASE units), or AV_NOPTS_VALUE if unknown or not
- *             applicable
- * @param type the kind of data written starting at the current pos
- */
-void avio_write_marker(AVIOContext *s, int64_t time, enum AVIODataMarkerType type);
-
-/**
- * ORing this as the "whence" parameter to a seek function causes it to
- * return the filesize without seeking anywhere. Supporting this is optional.
- * If it is not supported then the seek function will return <0.
- */
-#define AVSEEK_SIZE 0x10000
-
-/**
- * Passing this flag as the "whence" parameter to a seek function causes it to
- * 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
-
-/**
- * fseek() equivalent for AVIOContext.
- * @return new position or AVERROR.
- */
-int64_t avio_seek(AVIOContext *s, int64_t offset, int whence);
-
-/**
- * Skip given number of bytes forward
- * @return new position or AVERROR.
- */
-int64_t avio_skip(AVIOContext *s, int64_t offset);
-
-/**
- * ftell() equivalent for AVIOContext.
- * @return position or AVERROR.
- */
-static av_always_inline int64_t avio_tell(AVIOContext *s)
-{
-    return avio_seek(s, 0, SEEK_CUR);
-}
-
-/**
- * Get the filesize.
- * @return filesize or AVERROR
- */
-int64_t avio_size(AVIOContext *s);
-
-/**
- * Similar to feof() but also returns nonzero on read errors.
- * @return non zero if and only if at end of file or a read error happened when reading.
- */
-int avio_feof(AVIOContext *s);
-
-/**
- * Writes a formatted string to the context.
- * @return number of bytes written, < 0 on error.
- */
-int avio_printf(AVIOContext *s, const char *fmt, ...) av_printf_format(2, 3);
-
-/**
- * Write a NULL terminated array of strings to the context.
- * Usually you don't need to use this function directly but its macro wrapper,
- * avio_print.
- */
-void avio_print_string_array(AVIOContext *s, const char *strings);
-
-/**
- * Write strings (const char *) to the context.
- * This is a convenience macro around avio_print_string_array and it
- * automatically creates the string array from the variable argument list.
- * For simple string concatenations this function is more performant than using
- * avio_printf since it does not need a temporary buffer.
- */
-#define avio_print(s, ...) \
-    avio_print_string_array(s, (const char*){__VA_ARGS__, NULL})
-
-/**
- * Force flushing of buffered data.
- *
- * For write streams, force the buffered data to be immediately written to the output,
- * without to wait to fill the internal buffer.
- *
- * For read streams, discard all currently buffered data, and advance the
- * reported file position to that of the underlying stream. This does not
- * read new data, and does not perform any seeks.
- */
-void avio_flush(AVIOContext *s);
-
-/**
- * Read size bytes from AVIOContext into buf.
- * @return number of bytes read or AVERROR
- */
-int avio_read(AVIOContext *s, unsigned char *buf, int size);
-
-/**
- * Read size bytes from AVIOContext into buf. Unlike avio_read(), this is allowed
- * to read fewer bytes than requested. The missing bytes can be read in the next
- * call. This always tries to read at least 1 byte.
- * Useful to reduce latency in certain cases.
- * @return number of bytes read or AVERROR
- */
-int avio_read_partial(AVIOContext *s, unsigned char *buf, int size);
-
-/**
- * @name Functions for reading from AVIOContext
- * @{
- *
- * @note return 0 if EOF, so you cannot use it if EOF handling is
- *       necessary
- */
-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);
-/**
- * @}
- */
-
-/**
- * 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 avio_get_str(AVIOContext *pb, int maxlen, char *buf, int buflen);
-
-/**
- * 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);
-
-
-/**
- * @name URL open modes
- * The flags argument to avio_open must be one of the following
- * constants, optionally ORed with other flags.
- * @{
- */
-#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 */
-/**
- * @}
- */
-
-/**
- * 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.
- */
-#define AVIO_FLAG_NONBLOCK 8
-
-/**
- * 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
-
-/**
- * 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 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 avio_open(AVIOContext **s, const char *url, int flags);
-
-/**
- * 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 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
- * @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 avio_open2(AVIOContext **s, const char *url, int flags,
-               const AVIOInterruptCB *int_cb, AVDictionary **options);
-
-/**
- * Close the resource accessed by the AVIOContext s and free it.
- * This function can only be used if s was opened by avio_open().
- *
- * The internal buffer is automatically flushed before closing the
- * resource.
- *
- * @return 0 on success, an AVERROR < 0 on error.
- * @see avio_closep
- */
-int avio_close(AVIOContext *s);
-
-/**
- * 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().
- *
- * The internal buffer is automatically flushed before closing the
- * resource.
- *
- * @return 0 on success, an AVERROR < 0 on error.
- * @see avio_close
- */
-int avio_closep(AVIOContext **s);
-
-
-/**
- * Open a write only memory stream.
- *
- * @param s new IO context
- * @return zero if no error.
- */
-int avio_open_dyn_buf(AVIOContext **s);
-
-/**
- * Return the written size and a pointer to the buffer.
- * The AVIOContext stream is left intact.
- * The buffer must NOT be freed.
- * No padding is added to the buffer.
- *
- * @param s IO context
- * @param pbuffer pointer to a byte buffer
- * @return the length of the byte buffer
- */
-int avio_get_dyn_buf(AVIOContext *s, uint8_t **pbuffer);
-
-/**
- * Return the written size and a pointer to the buffer. The buffer
- * must be freed with av_free().
- * Padding of AV_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 avio_close_dyn_buf(AVIOContext *s, uint8_t **pbuffer);
-
-/**
- * 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);
-
-/**
- * Get AVClass by names of available protocols.
- *
- * @return A AVClass of input protocol name or NULL
- */
-const AVClass *avio_protocol_get_class(const char *name);
-
-/**
- * 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);
-
-/**
- * Accept and allocate a client context on a server context.
- * @param  s the server context
- * @param  c the client context, must be unallocated
- * @return   >= 0 on success or a negative value corresponding
- *           to an AVERROR on failure
- */
-int avio_accept(AVIOContext *s, AVIOContext **c);
-
-/**
- * Perform one step of the protocol handshake to accept a new client.
- * This function must be called on a client returned by avio_accept() before
- * using it as a read/write context.
- * It is separate from avio_accept() because it may block.
- * A step of the handshake is defined by places where the application may
- * decide to change the proceedings.
- * For example, on a protocol with a request header and a reply header, each
- * one can constitute a step because the application may use the parameters
- * from the request to change parameters in the reply; or each individual
- * chunk of the request can constitute a step.
- * If the handshake is already finished, avio_handshake() does nothing and
- * returns 0 immediately.
- *
- * @param  c the client context to perform the handshake on
- * @return   0   on a complete and successful handshake
- *           > 0 if the handshake progressed, but is not complete
- *           < 0 for an AVERROR code
- */
-int avio_handshake(AVIOContext *c);
-#endif /* AVFORMAT_AVIO_H */

gpac-2.2.1.tar.gz/extra_lib/include/libavformat/version.h Deleted

@@ -1,67 +0,0 @@
-/*
- * 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"
-
-// Major bumping may affect Ticket5467, 5421, 5451(compatibility with Chromium)
-// Also please add any ticket numbers that you believe might be affected here
-#define LIBAVFORMAT_VERSION_MAJOR  59
-#define LIBAVFORMAT_VERSION_MINOR  16
-#define LIBAVFORMAT_VERSION_MICRO 100
-
-#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.
- *
- * @note, when bumping the major version it is recommended to manually
- * disable each FF_API_* in its own commit instead of disabling them all
- * at once through the bump. This improves the git bisect-ability of the change.
- *
- */
-#define FF_API_LAVF_PRIV_OPT            (LIBAVFORMAT_VERSION_MAJOR < 60)
-#define FF_API_COMPUTE_PKT_FIELDS2      (LIBAVFORMAT_VERSION_MAJOR < 60)
-#define FF_API_AVIOCONTEXT_WRITTEN      (LIBAVFORMAT_VERSION_MAJOR < 60)
-#define FF_HLS_TS_OPTIONS               (LIBAVFORMAT_VERSION_MAJOR < 60)
-#define FF_API_AVSTREAM_CLASS           (LIBAVFORMAT_VERSION_MAJOR > 59)
-#define FF_HTTP_CACHE_REDIRECT_DEFAULT  (LIBAVFORMAT_VERSION_MAJOR < 60)
-
-
-#define FF_API_R_FRAME_RATE            1
-#endif /* AVFORMAT_VERSION_H */

gpac-2.2.1.tar.gz/extra_lib/include/libavutil Deleted

gpac-2.2.1.tar.gz/extra_lib/include/libavutil/adler32.h Deleted

@@ -1,63 +0,0 @@
-/*
- * 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
- */
-
-/**
- * @file
- * @ingroup lavu_adler32
- * Public header for Adler-32 hash function implementation.
- */
-
-#ifndef AVUTIL_ADLER32_H
-#define AVUTIL_ADLER32_H
-
-#include <stddef.h>
-#include <stdint.h>
-#include "attributes.h"
-
-/**
- * @defgroup lavu_adler32 Adler-32
- * @ingroup lavu_hash
- * Adler-32 hash function implementation.
- *
- * @{
- */
-
-typedef uint32_t AVAdler;
-
-/**
- * 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
- */
-AVAdler av_adler32_update(AVAdler adler, const uint8_t *buf,
-                          size_t len) av_pure;
-
-/**
- * @}
- */
-
-#endif /* AVUTIL_ADLER32_H */

gpac-2.2.1.tar.gz/extra_lib/include/libavutil/aes.h Deleted

@@ -1,64 +0,0 @@
-/*
- * 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"
-
-/**
- * @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-2.2.1.tar.gz/extra_lib/include/libavutil/aes_ctr.h Deleted

@@ -1,87 +0,0 @@
-/*
- * AES-CTR cipher
- * Copyright (c) 2015 Eran Kornblau <erankor at gmail dot 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_AES_CTR_H
-#define AVUTIL_AES_CTR_H
-
-#include <stdint.h>
-
-#include "attributes.h"
-
-#define AES_CTR_KEY_SIZE (16)
-#define AES_CTR_IV_SIZE (8)
-
-struct AVAESCTR;
-
-/**
- * Allocate an AVAESCTR context.
- */
-struct AVAESCTR *av_aes_ctr_alloc(void);
-
-/**
- * Initialize an AVAESCTR context.
- * @param key encryption key, must have a length of AES_CTR_KEY_SIZE
- */
-int av_aes_ctr_init(struct AVAESCTR *a, const uint8_t *key);
-
-/**
- * Release an AVAESCTR context.
- */
-void av_aes_ctr_free(struct AVAESCTR *a);
-
-/**
- * Process a buffer using a previously initialized context.
- * @param dst destination array, can be equal to src
- * @param src source array, can be equal to dst
- * @param size the size of src and dst
- */
-void av_aes_ctr_crypt(struct AVAESCTR *a, uint8_t *dst, const uint8_t *src, int size);
-
-/**
- * Get the current iv
- */
-const uint8_t* av_aes_ctr_get_iv(struct AVAESCTR *a);
-
-/**
- * Generate a random iv
- */
-void av_aes_ctr_set_random_iv(struct AVAESCTR *a);
-
-/**
- * Forcefully change the 8-byte iv
- */
-void av_aes_ctr_set_iv(struct AVAESCTR *a, const uint8_t* iv);
-
-/**
- * Forcefully change the "full" 16-byte iv, including the counter
- */
-void av_aes_ctr_set_full_iv(struct AVAESCTR *a, const uint8_t* iv);
-
-/**
- * Increment the top 64 bit of the iv (performed after each frame)
- */
-void av_aes_ctr_increment_iv(struct AVAESCTR *a);
-
-/**
- * @}
- */
-
-#endif /* AVUTIL_AES_CTR_H */

gpac-2.2.1.tar.gz/extra_lib/include/libavutil/attributes.h Deleted

@@ -1,173 +0,0 @@
-/*
- * 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
- * Macro definitions for various function/variable attributes
- */
-
-#ifndef AVUTIL_ATTRIBUTES_H
-#define AVUTIL_ATTRIBUTES_H
-
-#ifdef __GNUC__
-#    define AV_GCC_VERSION_AT_LEAST(x,y) (__GNUC__ > (x) || __GNUC__ == (x) && __GNUC_MINOR__ >= (y))
-#    define AV_GCC_VERSION_AT_MOST(x,y)  (__GNUC__ < (x) || __GNUC__ == (x) && __GNUC_MINOR__ <= (y))
-#else
-#    define AV_GCC_VERSION_AT_LEAST(x,y) 0
-#    define AV_GCC_VERSION_AT_MOST(x,y)  0
-#endif
-
-#ifdef __has_builtin
-#    define AV_HAS_BUILTIN(x) __has_builtin(x)
-#else
-#    define AV_HAS_BUILTIN(x) 0
-#endif
-
-#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_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,4)
-#    define av_warn_unused_result __attribute__((warn_unused_result))
-#else
-#    define av_warn_unused_result
-#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
-
-#if AV_GCC_VERSION_AT_LEAST(3,1) || defined(__clang__)
-#    define av_pure __attribute__((pure))
-#else
-#    define av_pure
-#endif
-
-#if AV_GCC_VERSION_AT_LEAST(2,6) || defined(__clang__)
-#    define av_const __attribute__((const))
-#else
-#    define av_const
-#endif
-
-#if AV_GCC_VERSION_AT_LEAST(4,3) || defined(__clang__)
-#    define av_cold __attribute__((cold))
-#else
-#    define av_cold
-#endif
-
-#if AV_GCC_VERSION_AT_LEAST(4,1) && !defined(__llvm__)
-#    define av_flatten __attribute__((flatten))
-#else
-#    define av_flatten
-#endif
-
-#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
-
-#if defined(__GNUC__) || defined(__clang__)
-#    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) || defined(__clang__)
-#    define av_used __attribute__((used))
-#else
-#    define av_used
-#endif
-
-#if AV_GCC_VERSION_AT_LEAST(3,3) || defined(__clang__)
-#   define av_alias __attribute__((may_alias))
-#else
-#   define av_alias
-#endif
-
-#if (defined(__GNUC__) || defined(__clang__)) && !defined(__INTEL_COMPILER)
-#    define av_uninit(x) x=x
-#else
-#    define av_uninit(x) x
-#endif
-
-#if defined(__GNUC__) || defined(__clang__)
-#    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) || defined(__clang__)
-#    define av_noreturn __attribute__((noreturn))
-#else
-#    define av_noreturn
-#endif
-
-#endif /* AVUTIL_ATTRIBUTES_H */

gpac-2.2.1.tar.gz/extra_lib/include/libavutil/audio_fifo.h Deleted

@@ -1,187 +0,0 @@
-/*
- * 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
- */
-av_warn_unused_result
-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);
-
-/**
- * Peek 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 peek
- * @return            number of samples actually peek, or negative AVERROR code
- *                    on failure. The number of samples actually peek 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_peek(AVAudioFifo *af, void **data, int nb_samples);
-
-/**
- * Peek 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 peek
- * @param offset      offset from current read position
- * @return            number of samples actually peek, or negative AVERROR code
- *                    on failure. The number of samples actually peek 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_peek_at(AVAudioFifo *af, void **data, int nb_samples, int offset);
-
-/**
- * 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-2.2.1.tar.gz/extra_lib/include/libavutil/avassert.h Deleted

@@ -1,75 +0,0 @@
-/*
- * 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 speed loss.
- */
-#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)
-#define av_assert2_fpu() av_assert0_fpu()
-#else
-#define av_assert2(cond) ((void)0)
-#define av_assert2_fpu() ((void)0)
-#endif
-
-/**
- * Assert that floating point operations can be executed.
- *
- * This will av_assert0() that the cpu is not in MMX state on X86
- */
-void av_assert0_fpu(void);
-
-#endif /* AVUTIL_AVASSERT_H */

gpac-2.2.1.tar.gz/extra_lib/include/libavutil/avconfig.h Deleted

gpac-2.2.1.tar.gz/extra_lib/include/libavutil/avstring.h Deleted

@@ -1,437 +0,0 @@
-/*
- * 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"
-#include "version.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 && si; 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);
-
-#if FF_API_D2STR
-/**
- * Convert a number to an av_malloced string.
- * @deprecated  use av_asprintf() with "%f" or a more specific format
- */
-attribute_deprecated
-char *av_d2str(double d);
-#endif
-
-/**
- * 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.
- */
-static inline av_const int av_isdigit(int c)
-{
-    return c >= '0' && c <= '9';
-}
-
-/**
- * Locale-independent conversion of ASCII isgraph.
- */
-static inline av_const int av_isgraph(int c)
-{
-    return c > 32 && c < 127;
-}
-
-/**
- * Locale-independent conversion of ASCII isspace.
- */
-static inline av_const int av_isspace(int c)
-{
-    return c == ' ' || c == '\f' || c == '\n' || c == '\r' || c == '\t' ||
-           c == '\v';
-}
-
-/**
- * Locale-independent conversion of ASCII characters to uppercase.
- */
-static inline av_const int av_toupper(int c)
-{
-    if (c >= 'a' && c <= 'z')
-        c ^= 0x20;
-    return c;
-}
-
-/**
- * Locale-independent conversion of ASCII characters to lowercase.
- */
-static inline av_const int av_tolower(int c)
-{
-    if (c >= 'A' && c <= 'Z')
-        c ^= 0x20;
-    return c;
-}
-
-/**
- * Locale-independent conversion of ASCII isxdigit.
- */
-static inline av_const int av_isxdigit(int c)
-{
-    c = av_tolower(c);
-    return av_isdigit(c) || (c >= 'a' && c <= 'f');
-}
-
-/**
- * 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);
-
-/**
- * Locale-independent strings replace.
- * @note This means only ASCII-range characters are replace
- */
-char *av_strireplace(const char *str, const char *from, const char *to);
-
-/**
- * Thread safe basename.
- * @param path the string to parse, on DOS both \ and / are considered separators.
- * @return pointer to the basename substring.
- * If path does not contain a slash, the function returns a copy of path.
- * If path is a NULL pointer or points to an empty string, a pointer
- * to a string "." is returned.
- */
-const char *av_basename(const char *path);
-
-/**
- * Thread safe dirname.
- * @param path the string to parse, on DOS both \ and / are considered separators.
- * @return A pointer to a string that's the parent directory of path.
- * If path is a NULL pointer or points to an empty string, a pointer
- * to a string "." is returned.
- * @note the function may modify the contents of the path, so copies should be passed.
- */
-const char *av_dirname(char *path);
-
-/**
- * Match instances of a name in a comma-separated list of names.
- * List entries are checked from the start to the end of the names list,
- * the first match ends further processing. If an entry prefixed with '-'
- * matches, then 0 is returned. The "ALL" list entry is considered to
- * match all 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);
-
-/**
- * Append path component to the existing path.
- * Path separator '/' is placed between when needed.
- * Resulting string have to be freed with av_free().
- * @param path      base path
- * @param component component to be appended
- * @return new path or NULL on error.
- */
-char *av_append_path_component(const char *path, const char *component);
-
-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.
-    AV_ESCAPE_MODE_XML,       ///< Use XML non-markup character data 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 (1 << 0)
-
-/**
- * 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 (1 << 1)
-
-/**
- * Within AV_ESCAPE_MODE_XML, additionally escape single quotes for single
- * quoted attributes.
- */
-#define AV_ESCAPE_FLAG_XML_SINGLE_QUOTES (1 << 2)
-
-/**
- * Within AV_ESCAPE_MODE_XML, additionally escape double quotes for double
- * quoted attributes.
- */
-#define AV_ESCAPE_FLAG_XML_DOUBLE_QUOTES (1 << 3)
-
-
-/**
- * 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()
- */
-av_warn_unused_result
-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
- */
-av_warn_unused_result
-int av_utf8_decode(int32_t *codep, const uint8_t **bufp, const uint8_t *buf_end,
-                   unsigned int flags);
-
-/**
- * Check if a name is in a list.
- * @returns 0 if not found, or the 1 based index where it has been found in the
- *            list.
- */
-int av_match_list(const char *name, const char *list, char separator);
-
-/**
- * See libc sscanf manual for more information.
- * Locale-independent sscanf implementation.
- */
-int av_sscanf(const char *string, const char *format, ...);
-
-/**
- * @}
- */
-
-#endif /* AVUTIL_AVSTRING_H */

gpac-2.2.1.tar.gz/extra_lib/include/libavutil/avutil.h Deleted

@@ -1,365 +0,0 @@
-/*
- * 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_AVUTIL_H
-#define AVUTIL_AVUTIL_H
-
-/**
- * @file
- * @ingroup lavu
- * Convenience header that includes @ref lavu "libavutil"'s core.
- */
-
-/**
- * @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
- * <em>LIBRARYNAME_VERSION_{MAJOR,MINOR,MICRO}</em> 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.
- */
-
-/**
- * @defgroup lavu libavutil
- * Common code shared across all FFmpeg libraries.
- *
- * @note
- * libavutil is designed to be modular. In most cases, in order to use the
- * functions provided by one component of libavutil you must explicitly include
- * the specific header containing that feature. If you are only using
- * media-related components, you could simply include libavutil/avutil.h, which
- * brings in most of the "core" components.
- *
- * @{
- *
- * @defgroup lavu_crypto Crypto and Hashing
- *
- * @{
- * @}
- *
- * @defgroup lavu_math Mathematics
- * @{
- *
- * @}
- *
- * @defgroup lavu_string String Manipulation
- *
- * @{
- *
- * @}
- *
- * @defgroup lavu_mem Memory Management
- *
- * @{
- *
- * @}
- *
- * @defgroup lavu_data Data Structures
- * @{
- *
- * @}
- *
- * @defgroup lavu_video Video related
- *
- * @{
- *
- * @}
- *
- * @defgroup lavu_audio Audio related
- *
- * @{
- *
- * @}
- *
- * @defgroup lavu_error Error Codes
- *
- * @{
- *
- * @}
- *
- * @defgroup lavu_log Logging Facility
- *
- * @{
- *
- * @}
- *
- * @defgroup lavu_misc Other
- *
- * @{
- *
- * @defgroup preproc_misc Preprocessor String Macros
- *
- * @{
- *
- * @}
- *
- * @defgroup version_utils Library Version Macros
- *
- * @{
- *
- * @}
- */
-
-
-/**
- * @addtogroup lavu_ver
- * @{
- */
-
-/**
- * Return the LIBAVUTIL_VERSION_INT constant.
- */
-unsigned avutil_version(void);
-
-/**
- * Return an informative version string. This usually is the actual release
- * version number or a git commit description. This string has no fixed format
- * and can change any time. It should never be parsed by code.
- */
-const char *av_version_info(void);
-
-/**
- * Return the libavutil build-time configuration.
- */
-const char *avutil_configuration(void);
-
-/**
- * Return the libavutil license.
- */
-const char *avutil_license(void);
-
-/**
- * @}
- */
-
-/**
- * @addtogroup lavu_media Media Type
- * @brief Media Type
- */
-
-enum AVMediaType {
-    AVMEDIA_TYPE_UNKNOWN = -1,  ///< Usually treated as AVMEDIA_TYPE_DATA
-    AVMEDIA_TYPE_VIDEO,
-    AVMEDIA_TYPE_AUDIO,
-    AVMEDIA_TYPE_DATA,          ///< Opaque data information usually continuous
-    AVMEDIA_TYPE_SUBTITLE,
-    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 MPEG-4
-    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.
- *
- * @paramin 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 "rational.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);
-
-#define AV_FOURCC_MAX_STRING_SIZE 32
-
-#define av_fourcc2str(fourcc) av_fourcc_make_string((charAV_FOURCC_MAX_STRING_SIZE){0}, fourcc)
-
-/**
- * Fill the provided buffer with a string containing a FourCC (four-character
- * code) representation.
- *
- * @param buf    a buffer with size in bytes of at least AV_FOURCC_MAX_STRING_SIZE
- * @param fourcc the fourcc to represent
- * @return the buffer in input
- */
-char *av_fourcc_make_string(char *buf, uint32_t fourcc);
-
-/**
- * @}
- * @}
- */
-
-#endif /* AVUTIL_AVUTIL_H */

gpac-2.2.1.tar.gz/extra_lib/include/libavutil/base64.h Deleted

@@ -1,72 +0,0 @@
-/*
- * 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, that is AV_BASE64_DECODE_SIZE(strlen(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);
-
-/**
- * Calculate the output size in bytes needed to decode a base64 string
- * with length x to a data buffer.
- */
-#define AV_BASE64_DECODE_SIZE(x) ((x) * 3LL / 4)
-
-/**
- * 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-2.2.1.tar.gz/extra_lib/include/libavutil/blowfish.h Deleted

@@ -1,82 +0,0 @@
-/*
- * 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 pAV_BF_ROUNDS + 2;
-    uint32_t s4256;
-} AVBlowfish;
-
-/**
- * Allocate an AVBlowfish context.
- */
-AVBlowfish *av_blowfish_alloc(void);
-
-/**
- * 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-2.2.1.tar.gz/extra_lib/include/libavutil/bprint.h Deleted

@@ -1,219 +0,0 @@
-/*
- * 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(name, size, ...) \
-struct ff_pad_helper_##name { __VA_ARGS__ }; \
-typedef struct name { \
-    __VA_ARGS__ \
-    char reserved_paddingsize - sizeof(struct ff_pad_helper_##name); \
-} name;
-
-/**
- * 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 buf512".
- *
- * 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.
- */
-
-FF_PAD_STRUCTURE(AVBPrint, 1024,
-    char *str;         /**< string so far */
-    unsigned len;      /**< length so far */
-    unsigned size;     /**< allocated memory */
-    unsigned size_max; /**< maximum allocated memory */
-    char reserved_internal_buffer1;
-)
-
-/**
- * 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.
- *
- * @paramin  buf          buffer structure
- * @paramin  size         required size
- * @paramout mem          pointer to the memory area
- * @paramout 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(const 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.
- *
- * @argout 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-2.2.1.tar.gz/extra_lib/include/libavutil/bswap.h Deleted

@@ -1,109 +0,0 @@
-/*
- * 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((uint32_t) 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-2.2.1.tar.gz/extra_lib/include/libavutil/buffer.h Deleted

@@ -1,322 +0,0 @@
-/*
- * 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 <stddef.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.
-     */
-    size_t   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(size_t size);
-
-/**
- * Same as av_buffer_alloc(), except the returned buffer will be initialized
- * to zero.
- */
-AVBufferRef *av_buffer_allocz(size_t 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, size_t 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(const 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, size_t size);
-
-/**
- * Ensure dst refers to the same data as src.
- *
- * When *dst is already equivalent to src, do nothing. Otherwise unreference dst
- * and replace it with a new reference to src.
- *
- * @param dst Pointer to either a valid buffer reference or NULL. On success,
- *            this will point to a buffer reference equivalent to src. On
- *            failure, dst will be left untouched.
- * @param src A buffer reference to replace dst with. May be NULL, then this
- *            function is equivalent to av_buffer_unref(dst).
- * @return 0 on success
- *         AVERROR(ENOMEM) on memory allocation failure.
- */
-int av_buffer_replace(AVBufferRef **dst, const AVBufferRef *src);
-
-/**
- * @}
- */
-
-/**
- * @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(size_t size, AVBufferRef* (*alloc)(size_t size));
-
-/**
- * Allocate and initialize a buffer pool with a more complex allocator.
- *
- * @param size size of each buffer in this pool
- * @param opaque arbitrary user data used by the allocator
- * @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()).
- * @param pool_free a function that will be called immediately before the pool
- *                  is freed. I.e. after av_buffer_pool_uninit() is called
- *                  by the caller and all the frames are returned to the pool
- *                  and freed. It is intended to uninitialize the user opaque
- *                  data. May be NULL.
- * @return newly created buffer pool on success, NULL on error.
- */
-AVBufferPool *av_buffer_pool_init2(size_t size, void *opaque,
-                                   AVBufferRef* (*alloc)(void *opaque, size_t size),
-                                   void (*pool_free)(void *opaque));
-
-/**
- * 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.
- */
-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);
-
-/**
- * Query the original opaque parameter of an allocated buffer in the pool.
- *
- * @param ref a buffer reference to a buffer returned by av_buffer_pool_get.
- * @return the opaque parameter set by the buffer allocator function of the
- *         buffer pool.
- *
- * @note the opaque parameter of ref is used by the buffer pool implementation,
- * therefore you have to use this function to access the original opaque
- * parameter of an allocated buffer.
- */
-void *av_buffer_pool_buffer_get_opaque(const AVBufferRef *ref);
-
-/**
- * @}
- */
-
-#endif /* AVUTIL_BUFFER_H */

gpac-2.2.1.tar.gz/extra_lib/include/libavutil/camellia.h Deleted

@@ -1,70 +0,0 @@
-/*
- * An implementation of the CAMELLIA algorithm as mentioned in RFC3713
- * Copyright (c) 2014 Supraja Meedinti
- *
- * 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_CAMELLIA_H
-#define AVUTIL_CAMELLIA_H
-
-#include <stdint.h>
-
-
-/**
-  * @file
-  * @brief Public header for libavutil CAMELLIA algorithm
-  * @defgroup lavu_camellia CAMELLIA
-  * @ingroup lavu_crypto
-  * @{
-  */
-
-extern const int av_camellia_size;
-
-struct AVCAMELLIA;
-
-/**
-  * Allocate an AVCAMELLIA context
-  * To free the struct: av_free(ptr)
-  */
-struct AVCAMELLIA *av_camellia_alloc(void);
-
-/**
-  * Initialize an AVCAMELLIA context.
-  *
-  * @param ctx an AVCAMELLIA context
-  * @param key a key of 16, 24, 32 bytes used for encryption/decryption
-  * @param key_bits number of keybits: possible are 128, 192, 256
- */
-int av_camellia_init(struct AVCAMELLIA *ctx, const uint8_t *key, int key_bits);
-
-/**
-  * Encrypt or decrypt a buffer using a previously initialized context
-  *
-  * @param ctx an AVCAMELLIA context
-  * @param dst destination array, can be equal to src
-  * @param src source array, can be equal to dst
-  * @param count number of 16 byte blocks
-  * @paran iv initialization vector for CBC mode, NULL for ECB mode
-  * @param decrypt 0 for encryption, 1 for decryption
- */
-void av_camellia_crypt(struct AVCAMELLIA *ctx, uint8_t *dst, const uint8_t *src, int count, uint8_t* iv, int decrypt);
-
-/**
- * @}
- */
-#endif /* AVUTIL_CAMELLIA_H */

gpac-2.2.1.tar.gz/extra_lib/include/libavutil/cast5.h Deleted

@@ -1,80 +0,0 @@
-/*
- * An implementation of the CAST128 algorithm as mentioned in RFC2144
- * Copyright (c) 2014 Supraja Meedinti
- *
- * 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_CAST5_H
-#define AVUTIL_CAST5_H
-
-#include <stdint.h>
-
-
-/**
-  * @file
-  * @brief Public header for libavutil CAST5 algorithm
-  * @defgroup lavu_cast5 CAST5
-  * @ingroup lavu_crypto
-  * @{
-  */
-
-extern const int av_cast5_size;
-
-struct AVCAST5;
-
-/**
-  * Allocate an AVCAST5 context
-  * To free the struct: av_free(ptr)
-  */
-struct AVCAST5 *av_cast5_alloc(void);
-/**
-  * Initialize an AVCAST5 context.
-  *
-  * @param ctx an AVCAST5 context
-  * @param key a key of 5,6,...16 bytes used for encryption/decryption
-  * @param key_bits number of keybits: possible are 40,48,...,128
-  * @return 0 on success, less than 0 on failure
- */
-int av_cast5_init(struct AVCAST5 *ctx, const uint8_t *key, int key_bits);
-
-/**
-  * Encrypt or decrypt a buffer using a previously initialized context, ECB mode only
-  *
-  * @param ctx an AVCAST5 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 decrypt 0 for encryption, 1 for decryption
- */
-void av_cast5_crypt(struct AVCAST5 *ctx, uint8_t *dst, const uint8_t *src, int count, int decrypt);
-
-/**
-  * Encrypt or decrypt a buffer using a previously initialized context
-  *
-  * @param ctx an AVCAST5 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, NULL for ECB mode
-  * @param decrypt 0 for encryption, 1 for decryption
- */
-void av_cast5_crypt2(struct AVCAST5 *ctx, uint8_t *dst, const uint8_t *src, int count, uint8_t *iv, int decrypt);
-/**
- * @}
- */
-#endif /* AVUTIL_CAST5_H */

gpac-2.2.1.tar.gz/extra_lib/include/libavutil/channel_layout.h Deleted

@@ -1,238 +0,0 @@
-/*
- * 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
-#define AV_CH_TOP_SIDE_LEFT          0x0000001000000000ULL
-#define AV_CH_TOP_SIDE_RIGHT         0x0000002000000000ULL
-#define AV_CH_BOTTOM_FRONT_CENTER    0x0000004000000000ULL
-#define AV_CH_BOTTOM_FRONT_LEFT      0x0000008000000000ULL
-#define AV_CH_BOTTOM_FRONT_RIGHT     0x0000010000000000ULL
-
-/** 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_HEXADECAGONAL     (AV_CH_LAYOUT_OCTAGONAL|AV_CH_WIDE_LEFT|AV_CH_WIDE_RIGHT|AV_CH_TOP_BACK_LEFT|AV_CH_TOP_BACK_RIGHT|AV_CH_TOP_BACK_CENTER|AV_CH_TOP_FRONT_CENTER|AV_CH_TOP_FRONT_LEFT|AV_CH_TOP_FRONT_RIGHT)
-#define AV_CH_LAYOUT_STEREO_DOWNMIX    (AV_CH_STEREO_LEFT|AV_CH_STEREO_RIGHT)
-#define AV_CH_LAYOUT_22POINT2          (AV_CH_LAYOUT_5POINT1_BACK|AV_CH_FRONT_LEFT_OF_CENTER|AV_CH_FRONT_RIGHT_OF_CENTER|AV_CH_BACK_CENTER|AV_CH_LOW_FREQUENCY_2|AV_CH_SIDE_LEFT|AV_CH_SIDE_RIGHT|AV_CH_TOP_FRONT_LEFT|AV_CH_TOP_FRONT_RIGHT|AV_CH_TOP_FRONT_CENTER|AV_CH_TOP_CENTER|AV_CH_TOP_BACK_LEFT|AV_CH_TOP_BACK_RIGHT|AV_CH_TOP_SIDE_LEFT|AV_CH_TOP_SIDE_RIGHT|AV_CH_TOP_BACK_CENTER|AV_CH_BOTTOM_FRONT_CENTER|AV_CH_BOTTOM_FRONT_LEFT|AV_CH_BOTTOM_FRONT_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, 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).
- *
- * Example: "stereo+FC" = "2c+FC" = "2c+1c" = "0x7"
- */
-uint64_t av_get_channel_layout(const char *name);
-
-/**
- * Return a channel layout and the number of channels based on the specified name.
- *
- * This function is similar to (@see av_get_channel_layout), but can also parse
- * unknown channel layout specifications.
- *
- * @paramin  name             channel layout specification string
- * @paramout channel_layout   parsed channel layout (0 if unknown)
- * @paramout nb_channels      number of channels
- *
- * @return 0 on success, AVERROR(EINVAL) if the parsing fails.
- */
-int av_get_extended_channel_layout(const char *name, uint64_t* channel_layout, int* nb_channels);
-
-/**
- * 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.
- *
- * @paramin  index   index in an internal list, starting at 0
- * @paramout layout  channel layout mask
- * @paramout 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-2.2.1.tar.gz/extra_lib/include/libavutil/common.h Deleted

@@ -1,579 +0,0 @@
-/*
- * 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
- * common internal and external API header
- */
-
-#ifndef AVUTIL_COMMON_H
-#define AVUTIL_COMMON_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 "macros.h"
-#include "version.h"
-
-//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))
-/* Fast a/(1<<b) rounded toward +inf. Assume a>=0 and b>=0 */
-#define AV_CEIL_RSHIFT(a,b) (!av_builtin_constant_p(b) ? -((-(a)) >> (b)) \
-                                                       : ((a) + (1<<(b)) - 1) >> (b))
-/* Backwards compat. */
-#define FF_CEIL_RSHIFT AV_CEIL_RSHIFT
-
-#define FFUDIV(a,b) (((a)>0 ?(a):(a)-(b)+1) / (b))
-#define FFUMOD(a,b) ((a)-(b)*FFUDIV(a,b))
-
-/**
- * Absolute value, Note, INT_MIN / INT64_MIN result in undefined behavior as they
- * are not representable as absolute values of their type. This is the same
- * as with *abs()
- * @see FFNABS()
- */
-#define FFABS(a) ((a) >= 0 ? (a) : (-(a)))
-#define FFSIGN(a) ((a) > 0 ? 1 : -1)
-
-/**
- * Negative Absolute value.
- * this works for all integers of all types.
- * As with many macros, this evaluates its argument twice, it thus must not have
- * a sideeffect, that is FFNABS(x++) has undefined behavior.
- */
-#define FFNABS(a) ((a) <= 0 ? (a) : (-(a)))
-
-/**
- * Unsigned Absolute value.
- * This takes the absolute value of a signed int and returns it as a unsigned.
- * This also works with INT_MIN which would otherwise not be representable
- * As with many macros, this evaluates its argument twice.
- */
-#define FFABSU(a) ((a) <= 0 ? -(unsigned)(a) : (unsigned)(a))
-#define FFABS64U(a) ((a) <= 0 ? -(uint64_t)(a) : (uint64_t)(a))
-
-/* misc math functions */
-
-#ifdef HAVE_AV_CONFIG_H
-#   include "config.h"
-#   include "intmath.h"
-#endif
-
-#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_intp2
-#   define av_clip_intp2    av_clip_intp2_c
-#endif
-#ifndef av_clip_uintp2
-#   define av_clip_uintp2   av_clip_uintp2_c
-#endif
-#ifndef av_mod_uintp2
-#   define av_mod_uintp2    av_mod_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_sat_sub32
-#   define av_sat_sub32     av_sat_sub32_c
-#endif
-#ifndef av_sat_dsub32
-#   define av_sat_dsub32    av_sat_dsub32_c
-#endif
-#ifndef av_sat_add64
-#   define av_sat_add64     av_sat_add64_c
-#endif
-#ifndef av_sat_sub64
-#   define av_sat_sub64     av_sat_sub64_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
-#ifndef av_parity
-#   define av_parity        av_parity_c
-#endif
-
-#ifndef av_log2
-av_const int av_log2(unsigned v);
-#endif
-
-#ifndef av_log2_16bit
-av_const int av_log2_16bit(unsigned v);
-#endif
-
-/**
- * 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 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;
-}
-
-/**
- * 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 av_always_inline av_const int64_t av_clip64_c(int64_t a, int64_t amin, int64_t 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;
-}
-
-/**
- * Clip a signed integer value into the 0-255 range.
- * @param a value to clip
- * @return clipped value
- */
-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+0x80U) & ~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+0x8000U) & ~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 into the -(2^p),(2^p-1) range.
- * @param  a value to clip
- * @param  p bit position to clip at
- * @return clipped value
- */
-static av_always_inline av_const int av_clip_intp2_c(int a, int p)
-{
-    if (((unsigned)a + (1 << p)) & ~((2 << p) - 1))
-        return (a >> 31) ^ ((1 << p) - 1);
-    else
-        return 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;
-}
-
-/**
- * Clear high bits from an unsigned integer starting with specific bit position
- * @param  a value to clip
- * @param  p bit position to clip at
- * @return clipped value
- */
-static av_always_inline av_const unsigned av_mod_uintp2_c(unsigned a, unsigned p)
-{
-    return a & ((1U << p) - 1);
-}
-
-/**
- * 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 sat(a + sat(2*b)) with signed saturation
- */
-static av_always_inline int av_sat_dadd32_c(int a, int b)
-{
-    return av_sat_add32(a, av_sat_add32(b, b));
-}
-
-/**
- * Subtract two signed 32-bit values with saturation.
- *
- * @param  a one value
- * @param  b another value
- * @return difference with signed saturation
- */
-static av_always_inline int av_sat_sub32_c(int a, int b)
-{
-    return av_clipl_int32((int64_t)a - b);
-}
-
-/**
- * Subtract a doubled value from another value with saturation at both stages.
- *
- * @param  a first value
- * @param  b value doubled and subtracted from a
- * @return difference sat(a - sat(2*b)) with signed saturation
- */
-static av_always_inline int av_sat_dsub32_c(int a, int b)
-{
-    return av_sat_sub32(a, av_sat_add32(b, b));
-}
-
-/**
- * Add two signed 64-bit values with saturation.
- *
- * @param  a one value
- * @param  b another value
- * @return sum with signed saturation
- */
-static av_always_inline int64_t av_sat_add64_c(int64_t a, int64_t b) {
-#if (!defined(__INTEL_COMPILER) && AV_GCC_VERSION_AT_LEAST(5,1)) || AV_HAS_BUILTIN(__builtin_add_overflow)
-    int64_t tmp;
-    return !__builtin_add_overflow(a, b, &tmp) ? tmp : (tmp < 0 ? INT64_MAX : INT64_MIN);
-#else
-    int64_t s = a+(uint64_t)b;
-    if ((int64_t)(a^b | ~s^b) >= 0)
-        return INT64_MAX ^ (b >> 63);
-    return s;
-#endif
-}
-
-/**
- * Subtract two signed 64-bit values with saturation.
- *
- * @param  a one value
- * @param  b another value
- * @return difference with signed saturation
- */
-static av_always_inline int64_t av_sat_sub64_c(int64_t a, int64_t b) {
-#if (!defined(__INTEL_COMPILER) && AV_GCC_VERSION_AT_LEAST(5,1)) || AV_HAS_BUILTIN(__builtin_sub_overflow)
-    int64_t tmp;
-    return !__builtin_sub_overflow(a, b, &tmp) ? tmp : (tmp < 0 ? INT64_MAX : INT64_MIN);
-#else
-    if (b <= 0 && a >= INT64_MAX + b)
-        return INT64_MAX;
-    if (b >= 0 && a <= INT64_MIN + b)
-        return INT64_MIN;
-    return a - b;
-#endif
-}
-
-/**
- * Clip a float value into the amin-amax range.
- * If a is nan or -inf amin will be returned.
- * If a is +inf amax will be returned.
- * @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 av_always_inline av_const float av_clipf_c(float a, float amin, float amax)
-{
-#if defined(HAVE_AV_CONFIG_H) && defined(ASSERT_LEVEL) && ASSERT_LEVEL >= 2
-    if (amin > amax) abort();
-#endif
-    return FFMIN(FFMAX(a, amin), amax);
-}
-
-/**
- * Clip a double value into the amin-amax range.
- * If a is nan or -inf amin will be returned.
- * If a is +inf amax will be returned.
- * @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 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
-    return FFMIN(FFMAX(a, amin), amax);
-}
-
-/** Compute ceil(log2(x)).
- * @param x value used to compute ceil(log2(x))
- * @return computed ceiling of log2(x)
- */
-static av_always_inline av_const int av_ceil_log2_c(int x)
-{
-    return av_log2((x - 1U) << 1);
-}
-
-/**
- * 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));
-}
-
-static av_always_inline av_const int av_parity_c(uint32_t v)
-{
-    return av_popcount(v) & 1;
-}
-
-/**
- * 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++, or if you want to make sure
- *                 that *ptr stops at the end of a NULL terminated string then
- *                 *ptr ? *ptr++ : 0
- * @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);\
-    {\
-        uint32_t top = (val & 128) >> 1;\
-        if ((val & 0xc0) == 0x80 || val >= 0xFE)\
-            {ERROR}\
-        while (val & top) {\
-            unsigned int tmp = (GET_BYTE) - 128;\
-            if(tmp>>6)\
-                {ERROR}\
-            val= (val<<6) + tmp;\
-            top <<= 5;\
-        }\
-        val &= (top << 1) - 1;\
-    }
-
-/**
- * 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);\
-    {\
-        unsigned int hi = val - 0xD800;\
-        if (hi < 0x800) {\
-            val = (GET_16BIT) - 0xDC00;\
-            if (val > 0x3FFU || hi > 0x3FFU)\
-                {ERROR}\
-            val += (hi<<10) + 0x10000;\
-        }\
-    }\
-
-/**
- * @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
- * 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.
- * 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
- * 7 times in the general case, depending on the length of the converted
- * Unicode character.
- */
-#define PUT_UTF8(val, tmp, PUT_BYTE)\
-    {\
-        int bytes, shift;\
-        uint32_t in = val;\
-        if (in < 0x80) {\
-            tmp = in;\
-            PUT_BYTE\
-        } else {\
-            bytes = (av_log2(in) + 4) / 5;\
-            shift = (bytes - 1) * 6;\
-            tmp = (256 - (256 >> bytes)) | (in >> shift);\
-            PUT_BYTE\
-            while (shift >= 6) {\
-                shift -= 6;\
-                tmp = 0x80 | ((in >> shift) & 0x3f);\
-                PUT_BYTE\
-            }\
-        }\
-    }
-
-/**
- * @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
- * 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
- * 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.
- */
-#define PUT_UTF16(val, tmp, PUT_16BIT)\
-    {\
-        uint32_t in = val;\
-        if (in < 0x10000) {\
-            tmp = in;\
-            PUT_16BIT\
-        } else {\
-            tmp = 0xD800 | ((in - 0x10000) >> 10);\
-            PUT_16BIT\
-            tmp = 0xDC00 | ((in - 0x10000) & 0x3FF);\
-            PUT_16BIT\
-        }\
-    }\
-
-
-
-#include "mem.h"
-
-#ifdef HAVE_AV_CONFIG_H
-#    include "internal.h"
-#endif /* HAVE_AV_CONFIG_H */
-
-#endif /* AVUTIL_COMMON_H */

gpac-2.2.1.tar.gz/extra_lib/include/libavutil/cpu.h Deleted

@@ -1,123 +0,0 @@
-/*
- * 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 <stddef.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_SSSE3SLOW 0x4000000 ///< SSSE3 supported, but usually not faster
-#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_AESNI       0x80000 ///< Advanced Encryption Standard functions
-#define AV_CPU_FLAG_AVX          0x4000 ///< AVX functions: requires OS support even if YMM registers aren't used
-#define AV_CPU_FLAG_AVXSLOW   0x8000000 ///< AVX supported, but slow when using YMM registers (e.g. Bulldozer)
-#define AV_CPU_FLAG_XOP          0x0400 ///< Bulldozer XOP functions
-#define AV_CPU_FLAG_FMA4         0x0800 ///< Bulldozer FMA4 functions
-#define AV_CPU_FLAG_CMOV         0x1000 ///< supports cmov instruction
-#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_AVX512     0x100000 ///< AVX-512 functions: requires OS support even if YMM/ZMM registers aren't used
-#define AV_CPU_FLAG_SLOW_GATHER  0x2000000 ///< CPU has slow gathers.
-
-#define AV_CPU_FLAG_ALTIVEC      0x0001 ///< standard
-#define AV_CPU_FLAG_VSX          0x0002 ///< ISA 2.06
-#define AV_CPU_FLAG_POWER8       0x0004 ///< ISA 2.07
-
-#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_VFP_VM       (1 << 7) ///< VFPv2 vector mode, deprecated in ARMv7-A and unavailable in various CPUs implementations
-#define AV_CPU_FLAG_SETEND       (1 <<16)
-
-#define AV_CPU_FLAG_MMI          (1 << 0)
-#define AV_CPU_FLAG_MSA          (1 << 1)
-
-//Loongarch SIMD extension.
-#define AV_CPU_FLAG_LSX          (1 << 0)
-#define AV_CPU_FLAG_LASX         (1 << 1)
-
-/**
- * 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 an 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);
-
-/**
- * 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);
-
-/**
- * Overrides cpu count detection and forces the specified count.
- * Count < 1 disables forcing of specific count.
- */
-void av_cpu_force_count(int count);
-
-/**
- * Get the maximum data alignment that may be required by FFmpeg.
- *
- * Note that this is affected by the build configuration and the CPU flags mask,
- * so e.g. if the CPU supports AVX, but libavutil has been built with
- * --disable-avx or the AV_CPU_FLAG_AVX flag has been disabled through
- *  av_set_cpu_flags_mask(), then this function will behave as if AVX is not
- *  present.
- */
-size_t av_cpu_max_align(void);
-
-#endif /* AVUTIL_CPU_H */

gpac-2.2.1.tar.gz/extra_lib/include/libavutil/crc.h Deleted

@@ -1,99 +0,0 @@
-/*
- * 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
- * @ingroup lavu_crc32
- * Public header for CRC hash function implementation.
- */
-
-#ifndef AVUTIL_CRC_H
-#define AVUTIL_CRC_H
-
-#include <stdint.h>
-#include <stddef.h>
-#include "attributes.h"
-
-/**
- * @defgroup lavu_crc32 CRC
- * @ingroup lavu_hash
- * CRC (Cyclic Redundancy Check) hash function implementation.
- *
- * This module supports numerous CRC polynomials, in addition to the most
- * widely used CRC-32-IEEE. See @ref AVCRCId for a list of available
- * polynomials.
- *
- * @{
- */
-
-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,
-    AV_CRC_8_EBU,
-    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-2.2.1.tar.gz/extra_lib/include/libavutil/des.h Deleted

@@ -1,77 +0,0 @@
-/*
- * DES encryption/decryption
- * Copyright (c) 2007 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_DES_H
-#define AVUTIL_DES_H
-
-#include <stdint.h>
-
-/**
- * @defgroup lavu_des DES
- * @ingroup lavu_crypto
- * @{
- */
-
-typedef struct AVDES {
-    uint64_t round_keys316;
-    int triple_des;
-} AVDES;
-
-/**
- * Allocate an AVDES context.
- */
-AVDES *av_des_alloc(void);
-
-/**
- * @brief Initializes an AVDES context.
- *
- * @param key_bits must be 64 or 192
- * @param decrypt 0 for encryption/CBC-MAC, 1 for decryption
- * @return zero on success, negative value otherwise
- */
-int av_des_init(struct AVDES *d, const uint8_t *key, int key_bits, int decrypt);
-
-/**
- * @brief Encrypts / decrypts using the DES algorithm.
- *
- * @param count number of 8 byte blocks
- * @param dst destination array, can be equal to src, must be 8-byte aligned
- * @param src source array, can be equal to dst, must be 8-byte aligned, may be NULL
- * @param iv initialization vector for CBC mode, if NULL then ECB will be used,
- *           must be 8-byte aligned
- * @param decrypt 0 for encryption, 1 for decryption
- */
-void av_des_crypt(struct AVDES *d, uint8_t *dst, const uint8_t *src, int count, uint8_t *iv, int decrypt);
-
-/**
- * @brief Calculates CBC-MAC using the DES algorithm.
- *
- * @param count number of 8 byte blocks
- * @param dst destination array, can be equal to src, must be 8-byte aligned
- * @param src source array, can be equal to dst, must be 8-byte aligned, may be NULL
- */
-void av_des_mac(struct AVDES *d, uint8_t *dst, const uint8_t *src, int count);
-
-/**
- * @}
- */
-
-#endif /* AVUTIL_DES_H */

gpac-2.2.1.tar.gz/extra_lib/include/libavutil/detection_bbox.h Deleted

@@ -1,107 +0,0 @@
-/*
- * 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_DETECTION_BBOX_H
-#define AVUTIL_DETECTION_BBOX_H
-
-#include "rational.h"
-#include "avassert.h"
-#include "frame.h"
-
-typedef struct AVDetectionBBox {
-    /**
-     * Distance in pixels from the left/top edge of the frame,
-     * together with width and height, defining the bounding box.
-     */
-    int x;
-    int y;
-    int w;
-    int h;
-
-#define AV_DETECTION_BBOX_LABEL_NAME_MAX_SIZE 64
-
-    /**
-     * Detect result with confidence
-     */
-    char detect_labelAV_DETECTION_BBOX_LABEL_NAME_MAX_SIZE;
-    AVRational detect_confidence;
-
-    /**
-     * At most 4 classifications based on the detected bounding box.
-     * For example, we can get max 4 different attributes with 4 different
-     * DNN models on one bounding box.
-     * classify_count is zero if no classification.
-     */
-#define AV_NUM_DETECTION_BBOX_CLASSIFY 4
-    uint32_t classify_count;
-    char classify_labelsAV_NUM_DETECTION_BBOX_CLASSIFYAV_DETECTION_BBOX_LABEL_NAME_MAX_SIZE;
-    AVRational classify_confidencesAV_NUM_DETECTION_BBOX_CLASSIFY;
-} AVDetectionBBox;
-
-typedef struct AVDetectionBBoxHeader {
-    /**
-     * Information about how the bounding box is generated.
-     * for example, the DNN model name.
-     */
-    char source256;
-
-    /**
-     * Number of bounding boxes in the array.
-     */
-    uint32_t nb_bboxes;
-
-    /**
-     * Offset in bytes from the beginning of this structure at which
-     * the array of bounding boxes starts.
-     */
-    size_t bboxes_offset;
-
-    /**
-     * Size of each bounding box in bytes.
-     */
-    size_t bbox_size;
-} AVDetectionBBoxHeader;
-
-/*
- * Get the bounding box at the specified {@code idx}. Must be between 0 and nb_bboxes.
- */
-static av_always_inline AVDetectionBBox *
-av_get_detection_bbox(const AVDetectionBBoxHeader *header, unsigned int idx)
-{
-    av_assert0(idx < header->nb_bboxes);
-    return (AVDetectionBBox *)((uint8_t *)header + header->bboxes_offset +
-                               idx * header->bbox_size);
-}
-
-/**
- * Allocates memory for AVDetectionBBoxHeader, plus an array of {@code nb_bboxes}
- * AVDetectionBBox, and initializes the variables.
- * Can be freed with a normal av_free() call.
- *
- * @param out_size if non-NULL, the size in bytes of the resulting data array is
- * written here.
- */
-AVDetectionBBoxHeader *av_detection_bbox_alloc(uint32_t nb_bboxes, size_t *out_size);
-
-/**
- * Allocates memory for AVDetectionBBoxHeader, plus an array of {@code nb_bboxes}
- * AVDetectionBBox, in the given AVFrame {@code frame} as AVFrameSideData of type
- * AV_FRAME_DATA_DETECTION_BBOXES and initializes the variables.
- */
-AVDetectionBBoxHeader *av_detection_bbox_create_side_data(AVFrame *frame, uint32_t nb_bboxes);
-#endif

gpac-2.2.1.tar.gz/extra_lib/include/libavutil/dict.h Deleted

@@ -1,198 +0,0 @@
-/*
- * 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>
-
-/**
- * @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. */
-#define AV_DICT_MULTIKEY       64   /**< Allow to store several equal keys in the dictionary */
-
-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(const 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.
- *
- * Warning: Adding a new entry to a dictionary invalidates all existing entries
- * previously returned with av_dict_get.
- *
- * @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 either be av_strduped or added as a new key depending on flags)
- * @param value entry value to add to *pm (will be av_strduped or added as a new key 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
- * @return 0 on success, negative AVERROR code on failure. If dst was allocated
- *           by this function, callers should free the associated memory.
- */
-int av_dict_copy(AVDictionary **dst, const AVDictionary *src, int flags);
-
-/**
- * Free all the memory allocated for an AVDictionary struct
- * and all keys and values.
- */
-void av_dict_free(AVDictionary **m);
-
-/**
- * Get dictionary entries as a string.
- *
- * Create a string containing dictionary's entries.
- * Such string may be passed back to av_dict_parse_string().
- * @note String is escaped with backslashes ('\').
- *
- * @paramin  m             dictionary
- * @paramout buffer        Pointer to buffer that will be allocated with string containg entries.
- *                           Buffer must be freed by the caller when is no longer needed.
- * @paramin  key_val_sep   character used to separate key from value
- * @paramin  pairs_sep     character used to separate two pairs from each other
- * @return                   >= 0 on success, negative on error
- * @warning Separators cannot be neither '\\' nor '\0'. They also cannot be the same.
- */
-int av_dict_get_string(const AVDictionary *m, char **buffer,
-                       const char key_val_sep, const char pairs_sep);
-
-/**
- * @}
- */
-
-#endif /* AVUTIL_DICT_H */

gpac-2.2.1.tar.gz/extra_lib/include/libavutil/display.h Deleted

@@ -1,114 +0,0 @@
-/*
- * 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
- */
-
-/**
- * @file
- * Display matrix
- */
-
-#ifndef AVUTIL_DISPLAY_H
-#define AVUTIL_DISPLAY_H
-
-#include <stdint.h>
-#include "common.h"
-
-/**
- * @addtogroup lavu_video
- * @{
- *
- * @defgroup lavu_video_display Display transformation matrix functions
- * @{
- */
-
-/**
- * @addtogroup lavu_video_display
- * 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:
- *
- * @code{.unparsed}
- *                                  | a b u |
- *   (a, b, u, c, d, v, x, y, w) -> | c d v |
- *                                  | x y w |
- * @endcode
- *
- * 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:
- *
- * @code{.unparsed}
- *               | a b u |
- *   (p, q, 1) . | c d v | = z * (p', q', 1)
- *               | x y w |
- * @endcode
- *
- * The transformation can also be more explicitly written in components as
- * follows:
- *
- * @code{.unparsed}
- *   p' = (a * p + c * q + x) / z;
- *   q' = (b * p + d * q + y) / z;
- *   z  =  u * p + v * q + w
- * @endcode
- */
-
-/**
- * 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
- *         counterclockwise. 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 matrix9);
-
-/**
- * Initialize a transformation matrix describing a pure clockwise
- * 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 matrix9, 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 matrix9, int hflip, int vflip);
-
-/**
- * @}
- * @}
- */
-
-#endif /* AVUTIL_DISPLAY_H */

gpac-2.2.1.tar.gz/extra_lib/include/libavutil/dovi_meta.h Deleted

@@ -1,236 +0,0 @@
-/*
- * Copyright (c) 2020 Vacing Fang <vacingfang@tencent.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
- * DOVI configuration
- */
-
-
-#ifndef AVUTIL_DOVI_META_H
-#define AVUTIL_DOVI_META_H
-
-#include <stdint.h>
-#include <stddef.h>
-#include "rational.h"
-
-/*
- * DOVI configuration
- * ref: dolby-vision-bitstreams-within-the-iso-base-media-file-format-v2.1.2
-        dolby-vision-bitstreams-in-mpeg-2-transport-stream-multiplex-v1.2
- * @code
- * uint8_t  dv_version_major, the major version number that the stream complies with
- * uint8_t  dv_version_minor, the minor version number that the stream complies with
- * uint8_t  dv_profile, the Dolby Vision profile
- * uint8_t  dv_level, the Dolby Vision level
- * uint8_t  rpu_present_flag
- * uint8_t  el_present_flag
- * uint8_t  bl_present_flag
- * uint8_t  dv_bl_signal_compatibility_id
- * @endcode
- *
- * @note The struct must be allocated with av_dovi_alloc() and
- *       its size is not a part of the public ABI.
- */
-typedef struct AVDOVIDecoderConfigurationRecord {
-    uint8_t dv_version_major;
-    uint8_t dv_version_minor;
-    uint8_t dv_profile;
-    uint8_t dv_level;
-    uint8_t rpu_present_flag;
-    uint8_t el_present_flag;
-    uint8_t bl_present_flag;
-    uint8_t dv_bl_signal_compatibility_id;
-} AVDOVIDecoderConfigurationRecord;
-
-/**
- * Allocate a AVDOVIDecoderConfigurationRecord structure and initialize its
- * fields to default values.
- *
- * @return the newly allocated struct or NULL on failure
- */
-AVDOVIDecoderConfigurationRecord *av_dovi_alloc(size_t *size);
-
-/**
- * Dolby Vision RPU data header.
- *
- * @note sizeof(AVDOVIRpuDataHeader) is not part of the public ABI.
- */
-typedef struct AVDOVIRpuDataHeader {
-    uint8_t rpu_type;
-    uint16_t rpu_format;
-    uint8_t vdr_rpu_profile;
-    uint8_t vdr_rpu_level;
-    uint8_t chroma_resampling_explicit_filter_flag;
-    uint8_t coef_data_type; /* informative, lavc always converts to fixed */
-    uint8_t coef_log2_denom;
-    uint8_t vdr_rpu_normalized_idc;
-    uint8_t bl_video_full_range_flag;
-    uint8_t bl_bit_depth; /* 8, 16 */
-    uint8_t el_bit_depth; /* 8, 16 */
-    uint8_t vdr_bit_depth; /* 8, 16 */
-    uint8_t spatial_resampling_filter_flag;
-    uint8_t el_spatial_resampling_filter_flag;
-    uint8_t disable_residual_flag;
-} AVDOVIRpuDataHeader;
-
-enum AVDOVIMappingMethod {
-    AV_DOVI_MAPPING_POLYNOMIAL = 0,
-    AV_DOVI_MAPPING_MMR = 1,
-};
-
-/**
- * Coefficients of a piece-wise function. The pieces of the function span the
- * value ranges between two adjacent pivot values.
- */
-#define AV_DOVI_MAX_PIECES 8
-typedef struct AVDOVIReshapingCurve {
-    uint8_t num_pivots;                         /* 2, 9 */
-    uint16_t pivotsAV_DOVI_MAX_PIECES + 1;    /* sorted ascending */
-    enum AVDOVIMappingMethod mapping_idcAV_DOVI_MAX_PIECES;
-    /* AV_DOVI_MAPPING_POLYNOMIAL */
-    uint8_t poly_orderAV_DOVI_MAX_PIECES;     /* 1, 2 */
-    int64_t poly_coefAV_DOVI_MAX_PIECES3;   /* x^0, x^1, x^2 */
-    /* AV_DOVI_MAPPING_MMR */
-    uint8_t mmr_orderAV_DOVI_MAX_PIECES;      /* 1, 3 */
-    int64_t mmr_constantAV_DOVI_MAX_PIECES;
-    int64_t mmr_coefAV_DOVI_MAX_PIECES3/* order - 1 */7;
-} AVDOVIReshapingCurve;
-
-enum AVDOVINLQMethod {
-    AV_DOVI_NLQ_NONE = -1,
-    AV_DOVI_NLQ_LINEAR_DZ = 0,
-};
-
-/**
- * Coefficients of the non-linear inverse quantization. For the interpretation
- * of these, see ETSI GS CCM 001.
- */
-typedef struct AVDOVINLQParams {
-    uint16_t nlq_offset;
-    uint64_t vdr_in_max;
-    /* AV_DOVI_NLQ_LINEAR_DZ */
-    uint64_t linear_deadzone_slope;
-    uint64_t linear_deadzone_threshold;
-} AVDOVINLQParams;
-
-/**
- * Dolby Vision RPU data mapping parameters.
- *
- * @note sizeof(AVDOVIDataMapping) is not part of the public ABI.
- */
-typedef struct AVDOVIDataMapping {
-    uint8_t vdr_rpu_id;
-    uint8_t mapping_color_space;
-    uint8_t mapping_chroma_format_idc;
-    AVDOVIReshapingCurve curves3; /* per component */
-
-    /* Non-linear inverse quantization */
-    enum AVDOVINLQMethod nlq_method_idc;
-    uint32_t num_x_partitions;
-    uint32_t num_y_partitions;
-    AVDOVINLQParams nlq3; /* per component */
-} AVDOVIDataMapping;
-
-/**
- * Dolby Vision RPU colorspace metadata parameters.
- *
- * @note sizeof(AVDOVIColorMetadata) is not part of the public ABI.
- */
-typedef struct AVDOVIColorMetadata {
-    uint8_t dm_metadata_id;
-    uint8_t scene_refresh_flag;
-
-    /**
-     * Coefficients of the custom Dolby Vision IPT-PQ matrices. These are to be
-     * used instead of the matrices indicated by the frame's colorspace tags.
-     * The output of rgb_to_lms_matrix is to be fed into a BT.2020 LMS->RGB
-     * matrix based on a Hunt-Pointer-Estevez transform, but without any
-     * crosstalk. (See the definition of the ICtCp colorspace for more
-     * information.)
-     */
-    AVRational ycc_to_rgb_matrix9; /* before PQ linearization */
-    AVRational ycc_to_rgb_offset3; /* input offset of neutral value */
-    AVRational rgb_to_lms_matrix9; /* after PQ linearization */
-
-    /**
-     * Extra signal metadata (see Dolby patents for more info).
-     */
-    uint16_t signal_eotf;
-    uint16_t signal_eotf_param0;
-    uint16_t signal_eotf_param1;
-    uint32_t signal_eotf_param2;
-    uint8_t signal_bit_depth;
-    uint8_t signal_color_space;
-    uint8_t signal_chroma_format;
-    uint8_t signal_full_range_flag; /* 0, 3 */
-    uint16_t source_min_pq;
-    uint16_t source_max_pq;
-    uint16_t source_diagonal;
-} AVDOVIColorMetadata;
-
-/**
- * Combined struct representing a combination of header, mapping and color
- * metadata, for attaching to frames as side data.
- *
- * @note The struct must be allocated with av_dovi_metadata_alloc() and
- *       its size is not a part of the public ABI.
- */
-
-typedef struct AVDOVIMetadata {
-    /**
-     * Offset in bytes from the beginning of this structure at which the
-     * respective structs start.
-     */
-    size_t header_offset;   /* AVDOVIRpuDataHeader */
-    size_t mapping_offset;  /* AVDOVIDataMapping */
-    size_t color_offset;    /* AVDOVIColorMetadata */
-} AVDOVIMetadata;
-
-static av_always_inline AVDOVIRpuDataHeader *
-av_dovi_get_header(const AVDOVIMetadata *data)
-{
-    return (AVDOVIRpuDataHeader *)((uint8_t *) data + data->header_offset);
-}
-
-static av_always_inline AVDOVIDataMapping *
-av_dovi_get_mapping(const AVDOVIMetadata *data)
-{
-    return (AVDOVIDataMapping *)((uint8_t *) data + data->mapping_offset);
-}
-
-static av_always_inline AVDOVIColorMetadata *
-av_dovi_get_color(const AVDOVIMetadata *data)
-{
-    return (AVDOVIColorMetadata *)((uint8_t *) data + data->color_offset);
-}
-
-/**
- * Allocate an AVDOVIMetadata structure and initialize its
- * fields to default values.
- *
- * @param size If this parameter is non-NULL, the size in bytes of the
- *             allocated struct will be written here on success
- *
- * @return the newly allocated struct or NULL on failure
- */
-AVDOVIMetadata *av_dovi_metadata_alloc(size_t *size);
-
-#endif /* AVUTIL_DOVI_META_H */

gpac-2.2.1.tar.gz/extra_lib/include/libavutil/downmix_info.h Deleted

@@ -1,115 +0,0 @@
-/*
- * 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-2.2.1.tar.gz/extra_lib/include/libavutil/encryption_info.h Deleted

@@ -1,205 +0,0 @@
-/**
- * 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_ENCRYPTION_INFO_H
-#define AVUTIL_ENCRYPTION_INFO_H
-
-#include <stddef.h>
-#include <stdint.h>
-
-typedef struct AVSubsampleEncryptionInfo {
-    /** The number of bytes that are clear. */
-    unsigned int bytes_of_clear_data;
-
-    /**
-     * The number of bytes that are protected.  If using pattern encryption,
-     * the pattern applies to only the protected bytes; if not using pattern
-     * encryption, all these bytes are encrypted.
-     */
-    unsigned int bytes_of_protected_data;
-} AVSubsampleEncryptionInfo;
-
-/**
- * This describes encryption info for a packet.  This contains frame-specific
- * info for how to decrypt the packet before passing it to the decoder.
- *
- * The size of this struct is not part of the public ABI.
- */
-typedef struct AVEncryptionInfo {
-    /** The fourcc encryption scheme, in big-endian byte order. */
-    uint32_t scheme;
-
-    /**
-     * Only used for pattern encryption.  This is the number of 16-byte blocks
-     * that are encrypted.
-     */
-    uint32_t crypt_byte_block;
-
-    /**
-     * Only used for pattern encryption.  This is the number of 16-byte blocks
-     * that are clear.
-     */
-    uint32_t skip_byte_block;
-
-    /**
-     * The ID of the key used to encrypt the packet.  This should always be
-     * 16 bytes long, but may be changed in the future.
-     */
-    uint8_t *key_id;
-    uint32_t key_id_size;
-
-    /**
-     * The initialization vector.  This may have been zero-filled to be the
-     * correct block size.  This should always be 16 bytes long, but may be
-     * changed in the future.
-     */
-    uint8_t *iv;
-    uint32_t iv_size;
-
-    /**
-     * An array of subsample encryption info specifying how parts of the sample
-     * are encrypted.  If there are no subsamples, then the whole sample is
-     * encrypted.
-     */
-    AVSubsampleEncryptionInfo *subsamples;
-    uint32_t subsample_count;
-} AVEncryptionInfo;
-
-/**
- * This describes info used to initialize an encryption key system.
- *
- * The size of this struct is not part of the public ABI.
- */
-typedef struct AVEncryptionInitInfo {
-    /**
-     * A unique identifier for the key system this is for, can be NULL if it
-     * is not known.  This should always be 16 bytes, but may change in the
-     * future.
-     */
-    uint8_t* system_id;
-    uint32_t system_id_size;
-
-    /**
-     * An array of key IDs this initialization data is for.  All IDs are the
-     * same length.  Can be NULL if there are no known key IDs.
-     */
-    uint8_t** key_ids;
-    /** The number of key IDs. */
-    uint32_t num_key_ids;
-    /**
-     * The number of bytes in each key ID.  This should always be 16, but may
-     * change in the future.
-     */
-    uint32_t key_id_size;
-
-    /**
-     * Key-system specific initialization data.  This data is copied directly
-     * from the file and the format depends on the specific key system.  This
-     * can be NULL if there is no initialization data; in that case, there
-     * will be at least one key ID.
-     */
-    uint8_t* data;
-    uint32_t data_size;
-
-    /**
-     * An optional pointer to the next initialization info in the list.
-     */
-    struct AVEncryptionInitInfo *next;
-} AVEncryptionInitInfo;
-
-/**
- * Allocates an AVEncryptionInfo structure and sub-pointers to hold the given
- * number of subsamples.  This will allocate pointers for the key ID, IV,
- * and subsample entries, set the size members, and zero-initialize the rest.
- *
- * @param subsample_count The number of subsamples.
- * @param key_id_size The number of bytes in the key ID, should be 16.
- * @param iv_size The number of bytes in the IV, should be 16.
- *
- * @return The new AVEncryptionInfo structure, or NULL on error.
- */
-AVEncryptionInfo *av_encryption_info_alloc(uint32_t subsample_count, uint32_t key_id_size, uint32_t iv_size);
-
-/**
- * Allocates an AVEncryptionInfo structure with a copy of the given data.
- * @return The new AVEncryptionInfo structure, or NULL on error.
- */
-AVEncryptionInfo *av_encryption_info_clone(const AVEncryptionInfo *info);
-
-/**
- * Frees the given encryption info object.  This MUST NOT be used to free the
- * side-data data pointer, that should use normal side-data methods.
- */
-void av_encryption_info_free(AVEncryptionInfo *info);
-
-/**
- * Creates a copy of the AVEncryptionInfo that is contained in the given side
- * data.  The resulting object should be passed to av_encryption_info_free()
- * when done.
- *
- * @return The new AVEncryptionInfo structure, or NULL on error.
- */
-AVEncryptionInfo *av_encryption_info_get_side_data(const uint8_t *side_data, size_t side_data_size);
-
-/**
- * Allocates and initializes side data that holds a copy of the given encryption
- * info.  The resulting pointer should be either freed using av_free or given
- * to av_packet_add_side_data().
- *
- * @return The new side-data pointer, or NULL.
- */
-uint8_t *av_encryption_info_add_side_data(
-      const AVEncryptionInfo *info, size_t *side_data_size);
-
-
-/**
- * Allocates an AVEncryptionInitInfo structure and sub-pointers to hold the
- * given sizes.  This will allocate pointers and set all the fields.
- *
- * @return The new AVEncryptionInitInfo structure, or NULL on error.
- */
-AVEncryptionInitInfo *av_encryption_init_info_alloc(
-    uint32_t system_id_size, uint32_t num_key_ids, uint32_t key_id_size, uint32_t data_size);
-
-/**
- * Frees the given encryption init info object.  This MUST NOT be used to free
- * the side-data data pointer, that should use normal side-data methods.
- */
-void av_encryption_init_info_free(AVEncryptionInitInfo* info);
-
-/**
- * Creates a copy of the AVEncryptionInitInfo that is contained in the given
- * side data.  The resulting object should be passed to
- * av_encryption_init_info_free() when done.
- *
- * @return The new AVEncryptionInitInfo structure, or NULL on error.
- */
-AVEncryptionInitInfo *av_encryption_init_info_get_side_data(
-    const uint8_t* side_data, size_t side_data_size);
-
-/**
- * Allocates and initializes side data that holds a copy of the given encryption
- * init info.  The resulting pointer should be either freed using av_free or
- * given to av_packet_add_side_data().
- *
- * @return The new side-data pointer, or NULL.
- */
-uint8_t *av_encryption_init_info_add_side_data(
-    const AVEncryptionInitInfo *info, size_t *side_data_size);
-
-#endif /* AVUTIL_ENCRYPTION_INFO_H */

gpac-2.2.1.tar.gz/extra_lib/include/libavutil/error.h Deleted

@@ -1,128 +0,0 @@
-/*
- * 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
- * error code definitions
- */
-
-#ifndef AVUTIL_ERROR_H
-#define AVUTIL_ERROR_H
-
-#include <errno.h>
-#include <stddef.h>
-
-#include "macros.h"
-
-/**
- * @addtogroup lavu_error
- *
- * @{
- */
-
-
-/* error handling */
-#if EDOM > 0
-#define AVERROR(e) (-(e))   ///< Returns a negative error code from a POSIX error code, to return from library functions.
-#define AVUNERROR(e) (-(e)) ///< Returns a POSIX error code from a library function error return value.
-#else
-/* Some platforms have E* and errno already negated. */
-#define AVERROR(e) (e)
-#define AVUNERROR(e) (e)
-#endif
-
-#define FFERRTAG(a, b, c, d) (-(int)MKTAG(a, b, c, d))
-
-#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_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)
-/* HTTP & RTSP errors */
-#define AVERROR_HTTP_BAD_REQUEST   FFERRTAG(0xF8,'4','0','0')
-#define AVERROR_HTTP_UNAUTHORIZED  FFERRTAG(0xF8,'4','0','1')
-#define AVERROR_HTTP_FORBIDDEN     FFERRTAG(0xF8,'4','0','3')
-#define AVERROR_HTTP_NOT_FOUND     FFERRTAG(0xF8,'4','0','4')
-#define AVERROR_HTTP_OTHER_4XX     FFERRTAG(0xF8,'4','X','X')
-#define AVERROR_HTTP_SERVER_ERROR  FFERRTAG(0xF8,'5','X','X')
-
-#define AV_ERROR_MAX_STRING_SIZE 64
-
-/**
- * Put a description of the AVERROR code errnum in errbuf.
- * In case of failure the global variable errno is set to indicate the
- * 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 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((charAV_ERROR_MAX_STRING_SIZE){0}, AV_ERROR_MAX_STRING_SIZE, errnum)
-
-/**
- * @}
- */
-
-#endif /* AVUTIL_ERROR_H */

gpac-2.2.1.tar.gz/extra_lib/include/libavutil/eval.h Deleted

@@ -1,137 +0,0 @@
-/*
- * 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);
-
-/**
- * Track the presence of variables and their number of occurrences in a parsed expression
- *
- * @param counter a zero-initialized array where the count of each variable will be stored
- * @param size size of array
- * @return 0 on success, a negative value indicates that no expression or array was passed
- * or size was zero
- */
-int av_expr_count_vars(AVExpr *e, unsigned *counter, int size);
-
-/**
- * Track the presence of user provided functions and their number of occurrences
- * in a parsed expression.
- *
- * @param counter a zero-initialized array where the count of each function will be stored
- *                if you passed 5 functions with 2 arguments to av_expr_parse()
- *                then for arg=2 this will use upto 5 entries.
- * @param size size of array
- * @param arg number of arguments the counted functions have
- * @return 0 on success, a negative value indicates that no expression or array was passed
- * or size was zero
- */
-int av_expr_count_func(AVExpr *e, unsigned *counter, int size, int arg);
-
-/**
- * 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 by
- * 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-2.2.1.tar.gz/extra_lib/include/libavutil/ffversion.h Deleted

gpac-2.2.1.tar.gz/extra_lib/include/libavutil/fifo.h Deleted

@@ -1,179 +0,0 @@
-/*
- * 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(const 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(const AVFifoBuffer *f);
-
-/**
- * Feed data at specific position from an AVFifoBuffer to a user-supplied callback.
- * Similar as av_fifo_gereric_read but without discarding data.
- * @param f AVFifoBuffer to read from
- * @param offset offset from current read position
- * @param buf_size number of bytes to read
- * @param func generic read function
- * @param dest data destination
- */
-int av_fifo_generic_peek_at(AVFifoBuffer *f, void *dest, int offset, int buf_size, void (*func)(void*, void*, int));
-
-/**
- * Feed data from an AVFifoBuffer to a user-supplied callback.
- * Similar as av_fifo_gereric_read but without discarding data.
- * @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_peek(AVFifoBuffer *f, void *dest, int buf_size, void (*func)(void*, void*, int));
-
-/**
- * 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-2.2.1.tar.gz/extra_lib/include/libavutil/file.h Deleted

@@ -1,71 +0,0 @@
-/*
- * 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.
- * Unlike mmap this function succeeds with zero sized files, in this
- * case *bufptr will be set to NULL and *size will be set to 0.
- * 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
- */
-av_warn_unused_result
-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 negative value corresponding to an
- * AVERROR code 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.
- * @deprecated as fd numbers cannot be passed saftely between libs on some platforms
- */
-int av_tempfile(const char *prefix, char **filename, int log_offset, void *log_ctx);
-
-#endif /* AVUTIL_FILE_H */

gpac-2.2.1.tar.gz/extra_lib/include/libavutil/film_grain_params.h Deleted

@@ -1,260 +0,0 @@
-/*
- * 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_FILM_GRAIN_PARAMS_H
-#define AVUTIL_FILM_GRAIN_PARAMS_H
-
-#include "frame.h"
-
-enum AVFilmGrainParamsType {
-    AV_FILM_GRAIN_PARAMS_NONE = 0,
-
-    /**
-     * The union is valid when interpreted as AVFilmGrainAOMParams (codec.aom)
-     */
-    AV_FILM_GRAIN_PARAMS_AV1,
-
-    /**
-     * The union is valid when interpreted as AVFilmGrainH274Params (codec.h274)
-     */
-    AV_FILM_GRAIN_PARAMS_H274,
-};
-
-/**
- * This structure describes how to handle film grain synthesis for AOM codecs.
- *
- * @note The struct must be allocated as part of AVFilmGrainParams using
- *       av_film_grain_params_alloc(). Its size is not a part of the public ABI.
- */
-typedef struct AVFilmGrainAOMParams {
-    /**
-     * Number of points, and the scale and value for each point of the
-     * piecewise linear scaling function for the uma plane.
-     */
-    int num_y_points;
-    uint8_t y_points142 /* value, scaling */;
-
-    /**
-     * Signals whether to derive the chroma scaling function from the luma.
-     * Not equivalent to copying the luma values and scales.
-     */
-    int chroma_scaling_from_luma;
-
-    /**
-     * If chroma_scaling_from_luma is set to 0, signals the chroma scaling
-     * function parameters.
-     */
-    int num_uv_points2 /* cb, cr */;
-    uint8_t uv_points2 /* cb, cr */102 /* value, scaling */;
-
-    /**
-     * Specifies the shift applied to the chroma components. For AV1, its within
-     * 8; 11 and determines the range and quantization of the film grain.
-     */
-    int scaling_shift;
-
-    /**
-     * Specifies the auto-regression lag.
-     */
-    int ar_coeff_lag;
-
-    /**
-     * Luma auto-regression coefficients. The number of coefficients is given by
-     * 2 * ar_coeff_lag * (ar_coeff_lag + 1).
-     */
-    int8_t ar_coeffs_y24;
-
-    /**
-     * Chroma auto-regression coefficients. The number of coefficients is given by
-     * 2 * ar_coeff_lag * (ar_coeff_lag + 1) + !!num_y_points.
-     */
-    int8_t ar_coeffs_uv2 /* cb, cr */25;
-
-    /**
-     * Specifies the range of the auto-regressive coefficients. Values of 6,
-     * 7, 8 and so on represent a range of -2, 2), -1, 1), -0.5, 0.5) and
-     * so on. For AV1 must be between 6 and 9.
-     */
-    int ar_coeff_shift;
-
-    /**
-     * Signals the down shift applied to the generated gaussian numbers during
-     * synthesis.
-     */
-    int grain_scale_shift;
-
-    /**
-     * Specifies the luma/chroma multipliers for the index to the component
-     * scaling function.
-     */
-    int uv_mult2 /* cb, cr */;
-    int uv_mult_luma2 /* cb, cr */;
-
-    /**
-     * Offset used for component scaling function. For AV1 its a 9-bit value
-     * with a range -256, 255
-     */
-    int uv_offset2 /* cb, cr */;
-
-    /**
-     * Signals whether to overlap film grain blocks.
-     */
-    int overlap_flag;
-
-    /**
-     * Signals to clip to limited color levels after film grain application.
-     */
-    int limit_output_range;
-} AVFilmGrainAOMParams;
-
-/**
- * This structure describes how to handle film grain synthesis for codecs using
- * the ITU-T H.274 Versatile suplemental enhancement information message.
- *
- * @note The struct must be allocated as part of AVFilmGrainParams using
- *       av_film_grain_params_alloc(). Its size is not a part of the public ABI.
- */
-typedef struct AVFilmGrainH274Params {
-    /**
-     * Specifies the film grain simulation mode.
-     * 0 = Frequency filtering, 1 = Auto-regression
-     */
-    int model_id;
-
-    /**
-     * Specifies the bit depth used for the luma component.
-     */
-    int bit_depth_luma;
-
-    /**
-     * Specifies the bit depth used for the chroma components.
-     */
-    int bit_depth_chroma;
-
-    enum AVColorRange                  color_range;
-    enum AVColorPrimaries              color_primaries;
-    enum AVColorTransferCharacteristic color_trc;
-    enum AVColorSpace                  color_space;
-
-    /**
-     * Specifies the blending mode used to blend the simulated film grain
-     * with the decoded images.
-     *
-     * 0 = Additive, 1 = Multiplicative
-     */
-    int blending_mode_id;
-
-    /**
-     * Specifies a scale factor used in the film grain characterization equations.
-     */
-    int log2_scale_factor;
-
-    /**
-     * Indicates if the modelling of film grain for a given component is present.
-     */
-    int component_model_present3 /* y, cb, cr */;
-
-    /**
-     * Specifies the number of intensity intervals for which a specific set of
-     * model values has been estimated, with a range of 1, 256.
-     */
-    uint16_t num_intensity_intervals3 /* y, cb, cr */;
-
-    /**
-     * Specifies the number of model values present for each intensity interval
-     * in which the film grain has been modelled, with a range of 1, 6.
-     */
-    uint8_t num_model_values3 /* y, cb, cr */;
-
-    /**
-     * Specifies the lower ounds of each intensity interval for whichthe set of
-     * model values applies for the component.
-     */
-    uint8_t intensity_interval_lower_bound3 /* y, cb, cr */256 /* intensity interval */;
-
-    /**
-     * Specifies the upper bound of each intensity interval for which the set of
-     * model values applies for the component.
-     */
-    uint8_t intensity_interval_upper_bound3 /* y, cb, cr */256 /* intensity interval */;
-
-    /**
-     * Specifies the model values for the component for each intensity interval.
-     * - When model_id == 0, the following applies:
-     *     For comp_model_valuey, the range of values is 0, 2^bit_depth_luma - 1
-     *     For comp_model_valuecb..cr, the range of values is 0, 2^bit_depth_chroma - 1
-     * - Otherwise, the following applies:
-     *     For comp_model_valuey, the range of values is -2^(bit_depth_luma - 1), 2^(bit_depth_luma - 1) - 1
-     *     For comp_model_valuecb..cr, the range of values is -2^(bit_depth_chroma - 1), 2^(bit_depth_chroma - 1) - 1
-     */
-    int16_t comp_model_value3 /* y, cb, cr */256 /* intensity interval */6 /* model value */;
-} AVFilmGrainH274Params;
-
-/**
- * This structure describes how to handle film grain synthesis in video
- * for specific codecs. Must be present on every frame where film grain is
- * meant to be synthesised for correct presentation.
- *
- * @note The struct must be allocated with av_film_grain_params_alloc() and
- *       its size is not a part of the public ABI.
- */
-typedef struct AVFilmGrainParams {
-    /**
-     * Specifies the codec for which this structure is valid.
-     */
-    enum AVFilmGrainParamsType type;
-
-    /**
-     * Seed to use for the synthesis process, if the codec allows for it.
-     *
-     * @note For H.264, this refers to `pic_offset` as defined in
-     *       SMPTE RDD 5-2006.
-     */
-    uint64_t seed;
-
-    /**
-     * Additional fields may be added both here and in any structure included.
-     * If a codec's film grain structure differs slightly over another
-     * codec's, fields within may change meaning depending on the type.
-     */
-    union {
-        AVFilmGrainAOMParams aom;
-        AVFilmGrainH274Params h274;
-    } codec;
-} AVFilmGrainParams;
-
-/**
- * Allocate an AVFilmGrainParams structure and set its fields to
- * default values. The resulting struct can be freed using av_freep().
- * If size is not NULL it will be set to the number of bytes allocated.
- *
- * @return An AVFilmGrainParams filled with default values or NULL
- *         on failure.
- */
-AVFilmGrainParams *av_film_grain_params_alloc(size_t *size);
-
-/**
- * Allocate a complete AVFilmGrainParams and add it to the frame.
- *
- * @param frame The frame which side data is added to.
- *
- * @return The AVFilmGrainParams structure to be filled by caller.
- */
-AVFilmGrainParams *av_film_grain_params_create_side_data(AVFrame *frame);
-
-#endif /* AVUTIL_FILM_GRAIN_PARAMS_H */

gpac-2.2.1.tar.gz/extra_lib/include/libavutil/frame.h Deleted

@@ -1,926 +0,0 @@
-/*
- * 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 <stddef.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,
-    /**
-     * Recommmends skipping the specified number of samples. This is exported
-     * only if the "skip_manual" AVOption is set in libavcodec.
-     * This has the same format as AV_PKT_DATA_SKIP_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_FRAME_DATA_SKIP_SAMPLES,
-    /**
-     * This side data must be associated with an audio frame and corresponds to
-     * enum AVAudioServiceType defined in avcodec.h.
-     */
-    AV_FRAME_DATA_AUDIO_SERVICE_TYPE,
-    /**
-     * Mastering display metadata associated with a video frame. The payload is
-     * an AVMasteringDisplayMetadata type and contains information about the
-     * mastering display color volume.
-     */
-    AV_FRAME_DATA_MASTERING_DISPLAY_METADATA,
-    /**
-     * The GOP timecode in 25 bit timecode format. Data format is 64-bit integer.
-     * This is set on the first frame of a GOP that has a temporal reference of 0.
-     */
-    AV_FRAME_DATA_GOP_TIMECODE,
-
-    /**
-     * The data represents the AVSphericalMapping structure defined in
-     * libavutil/spherical.h.
-     */
-    AV_FRAME_DATA_SPHERICAL,
-
-    /**
-     * Content light level (based on CTA-861.3). This payload contains data in
-     * the form of the AVContentLightMetadata struct.
-     */
-    AV_FRAME_DATA_CONTENT_LIGHT_LEVEL,
-
-    /**
-     * The data contains an ICC profile as an opaque octet buffer following the
-     * format described by ISO 15076-1 with an optional name defined in the
-     * metadata key entry "name".
-     */
-    AV_FRAME_DATA_ICC_PROFILE,
-
-    /**
-     * Timecode which conforms to SMPTE ST 12-1. The data is an array of 4 uint32_t
-     * where the first uint32_t describes how many (1-3) of the other timecodes are used.
-     * The timecode format is described in the documentation of av_timecode_get_smpte_from_framenum()
-     * function in libavutil/timecode.h.
-     */
-    AV_FRAME_DATA_S12M_TIMECODE,
-
-    /**
-     * HDR dynamic metadata associated with a video frame. The payload is
-     * an AVDynamicHDRPlus type and contains information for color
-     * volume transform - application 4 of SMPTE 2094-40:2016 standard.
-     */
-    AV_FRAME_DATA_DYNAMIC_HDR_PLUS,
-
-    /**
-     * Regions Of Interest, the data is an array of AVRegionOfInterest type, the number of
-     * array element is implied by AVFrameSideData.size / AVRegionOfInterest.self_size.
-     */
-    AV_FRAME_DATA_REGIONS_OF_INTEREST,
-
-    /**
-     * Encoding parameters for a video frame, as described by AVVideoEncParams.
-     */
-    AV_FRAME_DATA_VIDEO_ENC_PARAMS,
-
-    /**
-     * User data unregistered metadata associated with a video frame.
-     * This is the H.2645 UDU SEI message, and shouldn't be used for any other purpose
-     * The data is stored as uint8_t in AVFrameSideData.data which is 16 bytes of
-     * uuid_iso_iec_11578 followed by AVFrameSideData.size - 16 bytes of user_data_payload_byte.
-     */
-    AV_FRAME_DATA_SEI_UNREGISTERED,
-
-    /**
-     * Film grain parameters for a frame, described by AVFilmGrainParams.
-     * Must be present for every frame which should have film grain applied.
-     */
-    AV_FRAME_DATA_FILM_GRAIN_PARAMS,
-
-    /**
-     * Bounding boxes for object detection and classification,
-     * as described by AVDetectionBBoxHeader.
-     */
-    AV_FRAME_DATA_DETECTION_BBOXES,
-
-    /**
-     * Dolby Vision RPU raw data, suitable for passing to x265
-     * or other libraries. Array of uint8_t, with NAL emulation
-     * bytes intact.
-     */
-    AV_FRAME_DATA_DOVI_RPU_BUFFER,
-
-    /**
-     * Parsed Dolby Vision metadata, suitable for passing to a software
-     * implementation. The payload is the AVDOVIMetadata struct defined in
-     * libavutil/dovi_meta.h.
-     */
-    AV_FRAME_DATA_DOVI_METADATA,
-};
-
-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,
-};
-
-
-/**
- * Structure to hold side data for an AVFrame.
- *
- * sizeof(AVFrameSideData) is not a part of the public ABI, so new fields may be added
- * to the end with a minor bump.
- */
-typedef struct AVFrameSideData {
-    enum AVFrameSideDataType type;
-    uint8_t *data;
-    size_t   size;
-    AVDictionary *metadata;
-    AVBufferRef *buf;
-} AVFrameSideData;
-
-/**
- * Structure describing a single Region Of Interest.
- *
- * When multiple regions are defined in a single side-data block, they
- * should be ordered from most to least important - some encoders are only
- * capable of supporting a limited number of distinct regions, so will have
- * to truncate the list.
- *
- * When overlapping regions are defined, the first region containing a given
- * area of the frame applies.
- */
-typedef struct AVRegionOfInterest {
-    /**
-     * Must be set to the size of this data structure (that is,
-     * sizeof(AVRegionOfInterest)).
-     */
-    uint32_t self_size;
-    /**
-     * Distance in pixels from the top edge of the frame to the top and
-     * bottom edges and from the left edge of the frame to the left and
-     * right edges of the rectangle defining this region of interest.
-     *
-     * The constraints on a region are encoder dependent, so the region
-     * actually affected may be slightly larger for alignment or other
-     * reasons.
-     */
-    int top;
-    int bottom;
-    int left;
-    int right;
-    /**
-     * Quantisation offset.
-     *
-     * Must be in the range -1 to +1.  A value of zero indicates no quality
-     * change.  A negative value asks for better quality (less quantisation),
-     * while a positive value asks for worse quality (greater quantisation).
-     *
-     * The range is calibrated so that the extreme values indicate the
-     * largest possible offset - if the rest of the frame is encoded with the
-     * worst possible quality, an offset of -1 indicates that this region
-     * should be encoded with the best possible quality anyway.  Intermediate
-     * values are then interpolated in some codec-dependent way.
-     *
-     * For example, in 10-bit H.264 the quantisation parameter varies between
-     * -12 and 51.  A typical qoffset value of -1/10 therefore indicates that
-     * this region should be encoded with a QP around one-tenth of the full
-     * range better than the rest of the frame.  So, if most of the frame
-     * were to be encoded with a QP of around 30, this region would get a QP
-     * of around 24 (an offset of approximately -1/10 * (51 - -12) = -6.3).
-     * An extreme value of -1 would indicate that this region should be
-     * encoded with the best possible quality regardless of the treatment of
-     * the rest of the frame - that is, should be encoded at a QP of -12.
-     */
-    AVRational qoffset;
-} AVRegionOfInterest;
-
-/**
- * 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.buf0 != 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.
- *
- * Fields can be accessed through AVOptions, the name string used, matches the
- * C structure field name for fields accessible through AVOptions. The AVClass
- * for AVFrame can be obtained from avcodec_get_frame_class()
- */
-typedef struct AVFrame {
-#define AV_NUM_DATA_POINTERS 8
-    /**
-     * pointer to the picture/channel planes.
-     * This might be different from the first allocated byte. For video,
-     * it could even point to the end of the image data.
-     *
-     * All pointers in data and extended_data must point into one of the
-     * AVBufferRef in buf or extended_buf.
-     *
-     * 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.
-     *
-     * NOTE: Pointers not needed by the format MUST be set to NULL.
-     *
-     * @attention In case of video, the data pointers can point to the
-     * end of image data in order to reverse line order, when used in
-     * combination with negative values in the linesize array.
-     */
-    uint8_t *dataAV_NUM_DATA_POINTERS;
-
-    /**
-     * For video, a positive or negative value, which is typically indicating
-     * the size in bytes of each picture line, but it can also be:
-     * - the negative byte size of lines for vertical flipping
-     *   (with datan pointing to the end of the data
-     * - a positive or negative multiple of the byte size as for accessing
-     *   even and odd fields of a frame (possibly flipped)
-     *
-     * For audio, only linesize0 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.
-     *
-     * @attention In case of video, line size values can be negative to achieve
-     * a vertically inverted iteration over image lines.
-     */
-    int linesizeAV_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
-     * linesize0 contains the size of each channel buffer.
-     * For packed audio, there is just one data pointer, and linesize0
-     * 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;
-
-    /**
-     * @name Video dimensions
-     * Video frames only. The coded dimensions (in pixels) of the video frame,
-     * i.e. the size of the rectangle that contains some well-defined values.
-     *
-     * @note The part of the frame intended for display/presentation is further
-     * restricted by the @ref cropping "Cropping rectangle".
-     * @{
-     */
-    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;
-
-    /**
-     * 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;
-
-    /**
-     * 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;
-
-    /**
-     * Time base for the timestamps in this frame.
-     * In the future, this field may be set on frames output by decoders or
-     * filters, but its value will be by default ignored on input to encoders
-     * or filters.
-     */
-    AVRational time_base;
-
-    /**
-     * 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;
-
-    /**
-     * for some private data of the user
-     */
-    void *opaque;
-
-    /**
-     * 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;
-
-    /**
-     * reordered opaque 64 bits (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
-     */
-    int64_t reordered_opaque;
-
-    /**
-     * 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. All the pointers in
-     * data and extended_data must point inside one of the buffers in buf or
-     * extended_buf. This array must be filled contiguously -- if bufi is
-     * non-NULL then bufj must also be non-NULL for all j < i.
-     *
-     * 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 *bufAV_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
- * @ingroup lavu_frame
- * Flags describing additional frame properties.
- *
- * @{
- */
-
-/**
- * The frame data may be corrupted, e.g. due to decoding errors.
- */
-#define AV_FRAME_FLAG_CORRUPT       (1 << 0)
-/**
- * A flag to mark the frames which need to be decoded, but shouldn't be output.
- */
-#define AV_FRAME_FLAG_DISCARD   (1 << 2)
-/**
- * @}
- */
-
-    /**
-     * Frame flags, a combination of @ref lavu_frame_flags
-     */
-    int flags;
-
-    /**
-     * MPEG vs JPEG YUV range.
-     * - encoding: Set by user
-     * - decoding: Set by libavcodec
-     */
-    enum AVColorRange color_range;
-
-    enum AVColorPrimaries color_primaries;
-
-    enum AVColorTransferCharacteristic color_trc;
-
-    /**
-     * YUV colorspace type.
-     * - 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
-     * - 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
-     * - encoding: unused
-     * - decoding: Read by user.
-     */
-    int64_t pkt_pos;
-
-    /**
-     * duration of the corresponding packet, expressed in
-     * AVStream->time_base units, 0 if unknown.
-     * - encoding: unused
-     * - decoding: Read by user.
-     */
-    int64_t pkt_duration;
-
-    /**
-     * metadata.
-     * - 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.
-     * - 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
-#define FF_DECODE_ERROR_CONCEALMENT_ACTIVE  4
-#define FF_DECODE_ERROR_DECODE_SLICES       8
-
-    /**
-     * number of audio channels, only used for audio.
-     * - encoding: unused
-     * - decoding: Read by user.
-     */
-    int channels;
-
-    /**
-     * size of the corresponding packet containing the compressed
-     * frame.
-     * It is set to a negative value if unknown.
-     * - encoding: unused
-     * - decoding: set by libavcodec, read by user.
-     */
-    int pkt_size;
-
-    /**
-     * For hwaccel-format frames, this should be a reference to the
-     * AVHWFramesContext describing the frame.
-     */
-    AVBufferRef *hw_frames_ctx;
-
-    /**
-     * AVBufferRef for free use by the API user. FFmpeg will never check the
-     * contents of the buffer ref. FFmpeg calls av_buffer_unref() on it when
-     * the frame is unreferenced. av_frame_copy_props() calls create a new
-     * reference with av_buffer_ref() for the target frame's opaque_ref field.
-     *
-     * This is unrelated to the opaque field, although it serves a similar
-     * purpose.
-     */
-    AVBufferRef *opaque_ref;
-
-    /**
-     * @anchor cropping
-     * @name Cropping
-     * Video frames only. The number of pixels to discard from the the
-     * top/bottom/left/right border of the frame to obtain the sub-rectangle of
-     * the frame intended for presentation.
-     * @{
-     */
-    size_t crop_top;
-    size_t crop_bottom;
-    size_t crop_left;
-    size_t crop_right;
-    /**
-     * @}
-     */
-
-    /**
-     * AVBufferRef for internal use by a single libav* library.
-     * Must not be used to transfer data between libraries.
-     * Has to be NULL when ownership of the frame leaves the respective library.
-     *
-     * Code outside the FFmpeg libs should never check or change the contents of the buffer ref.
-     *
-     * FFmpeg calls av_buffer_unref() on it when the frame is unreferenced.
-     * av_frame_copy_props() calls create a new reference with av_buffer_ref()
-     * for the target frame's private_ref field.
-     */
-    AVBufferRef *private_ref;
-} AVFrame;
-
-
-#if FF_API_COLORSPACE_NAME
-/**
- * Get the name of a colorspace.
- * @return a static string identifying the colorspace; can be NULL.
- * @deprecated use av_color_space_name()
- */
-attribute_deprecated
-const char *av_get_colorspace_name(enum AVColorSpace val);
-#endif
-/**
- * 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.
- *
- * @warning: dst MUST have been either unreferenced with av_frame_unref(dst),
- *           or newly allocated with av_frame_alloc() before calling this
- *           function, or undefined behavior will occur.
- *
- * @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 everything contained in src to dst and reset src.
- *
- * @warning: dst is not unreferenced, but directly overwritten without reading
- *           or deallocating its contents. Call av_frame_unref(dst) manually
- *           before calling this function to ensure that no memory is leaked.
- */
-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.
- *
- * @warning: if frame already has been allocated, calling this function will
- *           leak memory. In addition, undefined behavior can occur in certain
- *           cases.
- *
- * @param frame frame in which to store the new buffers.
- * @param align Required buffer size alignment. If equal to 0, alignment will be
- *              chosen automatically for the current CPU. It is highly
- *              recommended to pass 0 here unless you know what you are doing.
- *
- * @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,
-                                        size_t size);
-
-/**
- * Add a new side data to a frame from an existing AVBufferRef
- *
- * @param frame a frame to which the side data should be added
- * @param type  the type of the added side data
- * @param buf   an AVBufferRef to add as side data. The ownership of
- *              the reference is transferred to the frame.
- *
- * @return newly added side data on success, NULL on error. On failure
- *         the frame is unchanged and the AVBufferRef remains owned by
- *         the caller.
- */
-AVFrameSideData *av_frame_new_side_data_from_buf(AVFrame *frame,
-                                                 enum AVFrameSideDataType type,
-                                                 AVBufferRef *buf);
-
-/**
- * @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);
-
-/**
- * Remove and free all side data instances of the given type.
- */
-void av_frame_remove_side_data(AVFrame *frame, enum AVFrameSideDataType type);
-
-
-/**
- * Flags for frame cropping.
- */
-enum {
-    /**
-     * Apply the maximum possible cropping, even if it requires setting the
-     * AVFrame.data entries to unaligned pointers. Passing unaligned data
-     * to FFmpeg API is generally not allowed, and causes undefined behavior
-     * (such as crashes). You can pass unaligned data only to FFmpeg APIs that
-     * are explicitly documented to accept it. Use this flag only if you
-     * absolutely know what you are doing.
-     */
-    AV_FRAME_CROP_UNALIGNED     = 1 << 0,
-};
-
-/**
- * Crop the given video AVFrame according to its crop_left/crop_top/crop_right/
- * crop_bottom fields. If cropping is successful, the function will adjust the
- * data pointers and the width/height fields, and set the crop fields to 0.
- *
- * In all cases, the cropping boundaries will be rounded to the inherent
- * alignment of the pixel format. In some cases, such as for opaque hwaccel
- * formats, the left/top cropping is ignored. The crop fields are set to 0 even
- * if the cropping was rounded or ignored.
- *
- * @param frame the frame which should be cropped
- * @param flags Some combination of AV_FRAME_CROP_* flags, or 0.
- *
- * @return >= 0 on success, a negative AVERROR on error. If the cropping fields
- * were invalid, AVERROR(ERANGE) is returned, and nothing is changed.
- */
-int av_frame_apply_cropping(AVFrame *frame, int flags);
-
-/**
- * @return a string identifying the side data type
- */
-const char *av_frame_side_data_name(enum AVFrameSideDataType type);
-
-/**
- * @}
- */
-
-#endif /* AVUTIL_FRAME_H */

gpac-2.2.1.tar.gz/extra_lib/include/libavutil/hash.h Deleted

@@ -1,264 +0,0 @@
-/*
- * 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
- */
-
-/**
- * @file
- * @ingroup lavu_hash_generic
- * Generic hashing API
- */
-
-#ifndef AVUTIL_HASH_H
-#define AVUTIL_HASH_H
-
-#include <stddef.h>
-#include <stdint.h>
-
-/**
- * @defgroup lavu_hash Hash Functions
- * @ingroup lavu_crypto
- * Hash functions useful in multimedia.
- *
- * Hash functions are widely used in multimedia, from error checking and
- * concealment to internal regression testing. libavutil has efficient
- * implementations of a variety of hash functions that may be useful for
- * FFmpeg and other multimedia applications.
- *
- * @{
- *
- * @defgroup lavu_hash_generic Generic Hashing API
- * An abstraction layer for all hash functions supported by libavutil.
- *
- * If your application needs to support a wide range of different hash
- * functions, then the Generic Hashing API is for you. It provides a generic,
- * reusable API for @ref lavu_hash "all hash functions" implemented in libavutil.
- * If you just need to use one particular hash function, use the @ref lavu_hash
- * "individual hash" directly.
- *
- * @section Sample Code
- *
- * A basic template for using the Generic Hashing API follows:
- *
- * @code
- * struct AVHashContext *ctx = NULL;
- * const char *hash_name = NULL;
- * uint8_t *output_buf = NULL;
- *
- * // Select from a string returned by av_hash_names()
- * hash_name = ...;
- *
- * // Allocate a hash context
- * ret = av_hash_alloc(&ctx, hash_name);
- * if (ret < 0)
- *     return ret;
- *
- * // Initialize the hash context
- * av_hash_init(ctx);
- *
- * // Update the hash context with data
- * while (data_left) {
- *     av_hash_update(ctx, data, size);
- * }
- *
- * // Now we have no more data, so it is time to finalize the hash and get the
- * // output. But we need to first allocate an output buffer. Note that you can
- * // use any memory allocation function, including malloc(), not just
- * // av_malloc().
- * output_buf = av_malloc(av_hash_get_size(ctx));
- * if (!output_buf)
- *     return AVERROR(ENOMEM);
- *
- * // Finalize the hash context.
- * // You can use any of the av_hash_final*() functions provided, for other
- * // output formats. If you do so, be sure to adjust the memory allocation
- * // above. See the function documentation below for the exact amount of extra
- * // memory needed.
- * av_hash_final(ctx, output_buffer);
- *
- * // Free the context
- * av_hash_freep(&ctx);
- * @endcode
- *
- * @section Hash Function-Specific Information
- * If the CRC32 hash is selected, the #AV_CRC_32_IEEE polynomial will be
- * used.
- *
- * If the Murmur3 hash is selected, the default seed will be used. See @ref
- * lavu_murmur3_seedinfo "Murmur3" for more information.
- *
- * @{
- */
-
-/**
- * @example ffhash.c
- * This example is a simple command line application that takes one or more
- * arguments. It demonstrates a typical use of the hashing API with allocation,
- * initialization, updating, and finalizing.
- */
-
-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 after a call to this function; you must
- * call av_hash_init() to do so.
- */
-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.
- *
- * @paramin i  Index of the hash algorithm, starting from 0
- * @return       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 for
- * the output buffer and are fine with not supporting hashes newly added to
- * libavutil without recompilation.
- *
- * @warning
- * Adding new hashes with larger sizes, and increasing the macro while doing
- * so, will not be considered an ABI change. To prevent your code from
- * overflowing a buffer, either dynamically allocate the output buffer with
- * av_hash_get_size(), or limit your use of the Hashing API to hashes that are
- * already in FFmpeg during the time of compilation.
- */
-#define AV_HASH_MAX_SIZE 64
-
-/**
- * Get the size of the resulting hash value in bytes.
- *
- * The maximum value this function will currently return is available as macro
- * #AV_HASH_MAX_SIZE.
- *
- * @paramin     ctx Hash context
- * @return            Size of the hash value in bytes
- */
-int av_hash_get_size(const struct AVHashContext *ctx);
-
-/**
- * Initialize or reset a hash context.
- *
- * @paramin,out ctx Hash context
- */
-void av_hash_init(struct AVHashContext *ctx);
-
-/**
- * Update a hash context with additional data.
- *
- * @paramin,out ctx Hash context
- * @paramin     src Data to be added to the hash context
- * @paramin     len Size of the additional data
- */
-void av_hash_update(struct AVHashContext *ctx, const uint8_t *src, size_t len);
-
-/**
- * Finalize a hash context and compute the actual hash value.
- *
- * The minimum size of `dst` buffer is given by av_hash_get_size() or
- * #AV_HASH_MAX_SIZE. The use of the latter macro is discouraged.
- *
- * It is not safe to update or finalize a hash context again, if it has already
- * been finalized.
- *
- * @paramin,out ctx Hash context
- * @paramout    dst Where the final hash value will be stored
- *
- * @see av_hash_final_bin() provides an alternative API
- */
-void av_hash_final(struct AVHashContext *ctx, uint8_t *dst);
-
-/**
- * Finalize a hash context and store the actual hash value in a buffer.
- *
- * It is not safe to update or finalize a hash context again, if it has already
- * been finalized.
- *
- * If `size` is smaller than the hash size (given by av_hash_get_size()), the
- * hash is truncated; if size is larger, the buffer is padded with 0.
- *
- * @paramin,out ctx  Hash context
- * @paramout    dst  Where the final hash value will be stored
- * @paramin     size Number of bytes to write to `dst`
- */
-void av_hash_final_bin(struct AVHashContext *ctx, uint8_t *dst, int size);
-
-/**
- * Finalize a hash context and store the hexadecimal representation of the
- * actual hash value as a string.
- *
- * It is not safe to update or finalize a hash context again, if it has already
- * been finalized.
- *
- * The string is always 0-terminated.
- *
- * If `size` is smaller than `2 * hash_size + 1`, where `hash_size` is the
- * value returned by av_hash_get_size(), the string will be truncated.
- *
- * @paramin,out ctx  Hash context
- * @paramout    dst  Where the string will be stored
- * @paramin     size Maximum number of bytes to write to `dst`
- */
-void av_hash_final_hex(struct AVHashContext *ctx, uint8_t *dst, int size);
-
-/**
- * Finalize a hash context and store the Base64 representation of the
- * actual hash value as a string.
- *
- * It is not safe to update or finalize a hash context again, if it has already
- * been finalized.
- *
- * The string is always 0-terminated.
- *
- * If `size` is smaller than AV_BASE64_SIZE(hash_size), where `hash_size` is
- * the value returned by av_hash_get_size(), the string will be truncated.
- *
- * @paramin,out ctx  Hash context
- * @paramout    dst  Where the final hash value will be stored
- * @paramin     size Maximum number of bytes to write to `dst`
- */
-void av_hash_final_b64(struct AVHashContext *ctx, uint8_t *dst, int size);
-
-/**
- * Free hash context and set hash context pointer to `NULL`.
- *
- * @paramin,out ctx  Pointer to hash context
- */
-void av_hash_freep(struct AVHashContext **ctx);
-
-/**
- * @}
- * @}
- */
-
-#endif /* AVUTIL_HASH_H */

gpac-2.2.1.tar.gz/extra_lib/include/libavutil/hdr_dynamic_metadata.h Deleted

@@ -1,343 +0,0 @@
-/*
- * Copyright (c) 2018 Mohammad Izadi <moh.izadi at 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_HDR_DYNAMIC_METADATA_H
-#define AVUTIL_HDR_DYNAMIC_METADATA_H
-
-#include "frame.h"
-#include "rational.h"
-
-/**
- * Option for overlapping elliptical pixel selectors in an image.
- */
-enum AVHDRPlusOverlapProcessOption {
-    AV_HDR_PLUS_OVERLAP_PROCESS_WEIGHTED_AVERAGING = 0,
-    AV_HDR_PLUS_OVERLAP_PROCESS_LAYERING = 1,
-};
-
-/**
- * Represents the percentile at a specific percentage in
- * a distribution.
- */
-typedef struct AVHDRPlusPercentile {
-    /**
-     * The percentage value corresponding to a specific percentile linearized
-     * RGB value in the processing window in the scene. The value shall be in
-     * the range of 0 to100, inclusive.
-     */
-    uint8_t percentage;
-
-    /**
-     * The linearized maxRGB value at a specific percentile in the processing
-     * window in the scene. The value shall be in the range of 0 to 1, inclusive
-     * and in multiples of 0.00001.
-     */
-    AVRational percentile;
-} AVHDRPlusPercentile;
-
-/**
- * Color transform parameters at a processing window in a dynamic metadata for
- * SMPTE 2094-40.
- */
-typedef struct AVHDRPlusColorTransformParams {
-    /**
-     * The relative x coordinate of the top left pixel of the processing
-     * window. The value shall be in the range of 0 and 1, inclusive and
-     * in multiples of 1/(width of Picture - 1). The value 1 corresponds
-     * to the absolute coordinate of width of Picture - 1. The value for
-     * first processing window shall be 0.
-     */
-    AVRational window_upper_left_corner_x;
-
-    /**
-     * The relative y coordinate of the top left pixel of the processing
-     * window. The value shall be in the range of 0 and 1, inclusive and
-     * in multiples of 1/(height of Picture - 1). The value 1 corresponds
-     * to the absolute coordinate of height of Picture - 1. The value for
-     * first processing window shall be 0.
-     */
-    AVRational window_upper_left_corner_y;
-
-    /**
-     * The relative x coordinate of the bottom right pixel of the processing
-     * window. The value shall be in the range of 0 and 1, inclusive and
-     * in multiples of 1/(width of Picture - 1). The value 1 corresponds
-     * to the absolute coordinate of width of Picture - 1. The value for
-     * first processing window shall be 1.
-     */
-    AVRational window_lower_right_corner_x;
-
-    /**
-     * The relative y coordinate of the bottom right pixel of the processing
-     * window. The value shall be in the range of 0 and 1, inclusive and
-     * in multiples of 1/(height of Picture - 1). The value 1 corresponds
-     * to the absolute coordinate of height of Picture - 1. The value for
-     * first processing window shall be 1.
-     */
-    AVRational window_lower_right_corner_y;
-
-    /**
-     * The x coordinate of the center position of the concentric internal and
-     * external ellipses of the elliptical pixel selector in the processing
-     * window. The value shall be in the range of 0 to (width of Picture - 1),
-     * inclusive and in multiples of 1 pixel.
-     */
-    uint16_t center_of_ellipse_x;
-
-    /**
-     * The y coordinate of the center position of the concentric internal and
-     * external ellipses of the elliptical pixel selector in the processing
-     * window. The value shall be in the range of 0 to (height of Picture - 1),
-     * inclusive and in multiples of 1 pixel.
-     */
-    uint16_t center_of_ellipse_y;
-
-    /**
-     * The clockwise rotation angle in degree of arc with respect to the
-     * positive direction of the x-axis of the concentric internal and external
-     * ellipses of the elliptical pixel selector in the processing window. The
-     * value shall be in the range of 0 to 180, inclusive and in multiples of 1.
-     */
-    uint8_t rotation_angle;
-
-    /**
-     * The semi-major axis value of the internal ellipse of the elliptical pixel
-     * selector in amount of pixels in the processing window. The value shall be
-     * in the range of 1 to 65535, inclusive and in multiples of 1 pixel.
-     */
-    uint16_t semimajor_axis_internal_ellipse;
-
-    /**
-     * The semi-major axis value of the external ellipse of the elliptical pixel
-     * selector in amount of pixels in the processing window. The value
-     * shall not be less than semimajor_axis_internal_ellipse of the current
-     * processing window. The value shall be in the range of 1 to 65535,
-     * inclusive and in multiples of 1 pixel.
-     */
-    uint16_t semimajor_axis_external_ellipse;
-
-    /**
-     * The semi-minor axis value of the external ellipse of the elliptical pixel
-     * selector in amount of pixels in the processing window. The value shall be
-     * in the range of 1 to 65535, inclusive and in multiples of 1 pixel.
-     */
-    uint16_t semiminor_axis_external_ellipse;
-
-    /**
-     * Overlap process option indicates one of the two methods of combining
-     * rendered pixels in the processing window in an image with at least one
-     * elliptical pixel selector. For overlapping elliptical pixel selectors
-     * in an image, overlap_process_option shall have the same value.
-     */
-    enum AVHDRPlusOverlapProcessOption overlap_process_option;
-
-    /**
-     * The maximum of the color components of linearized RGB values in the
-     * processing window in the scene. The values should be in the range of 0 to
-     * 1, inclusive and in multiples of 0.00001. maxscl 0 , maxscl 1 , and
-     * maxscl 2  are corresponding to R, G, B color components respectively.
-     */
-    AVRational maxscl3;
-
-    /**
-     * The average of linearized maxRGB values in the processing window in the
-     * scene. The value should be in the range of 0 to 1, inclusive and in
-     * multiples of 0.00001.
-     */
-    AVRational average_maxrgb;
-
-    /**
-     * The number of linearized maxRGB values at given percentiles in the
-     * processing window in the scene. The maximum value shall be 15.
-     */
-    uint8_t num_distribution_maxrgb_percentiles;
-
-    /**
-     * The linearized maxRGB values at given percentiles in the
-     * processing window in the scene.
-     */
-    AVHDRPlusPercentile distribution_maxrgb15;
-
-    /**
-     * The fraction of selected pixels in the image that contains the brightest
-     * pixel in the scene. The value shall be in the range of 0 to 1, inclusive
-     * and in multiples of 0.001.
-     */
-    AVRational fraction_bright_pixels;
-
-    /**
-     * This flag indicates that the metadata for the tone mapping function in
-     * the processing window is present (for value of 1).
-     */
-    uint8_t tone_mapping_flag;
-
-    /**
-     * The x coordinate of the separation point between the linear part and the
-     * curved part of the tone mapping function. The value shall be in the range
-     * of 0 to 1, excluding 0 and in multiples of 1/4095.
-     */
-    AVRational knee_point_x;
-
-    /**
-     * The y coordinate of the separation point between the linear part and the
-     * curved part of the tone mapping function. The value shall be in the range
-     * of 0 to 1, excluding 0 and in multiples of 1/4095.
-     */
-    AVRational knee_point_y;
-
-    /**
-     * The number of the intermediate anchor parameters of the tone mapping
-     * function in the processing window. The maximum value shall be 15.
-     */
-    uint8_t num_bezier_curve_anchors;
-
-    /**
-     * The intermediate anchor parameters of the tone mapping function in the
-     * processing window in the scene. The values should be in the range of 0
-     * to 1, inclusive and in multiples of 1/1023.
-     */
-    AVRational bezier_curve_anchors15;
-
-    /**
-     * This flag shall be equal to 0 in bitstreams conforming to this version of
-     * this Specification. Other values are reserved for future use.
-     */
-    uint8_t color_saturation_mapping_flag;
-
-    /**
-     * The color saturation gain in the processing window in the scene. The
-     * value shall be in the range of 0 to 63/8, inclusive and in multiples of
-     * 1/8. The default value shall be 1.
-     */
-    AVRational color_saturation_weight;
-} AVHDRPlusColorTransformParams;
-
-/**
- * This struct represents dynamic metadata for color volume transform -
- * application 4 of SMPTE 2094-40:2016 standard.
- *
- * To be used as payload of a AVFrameSideData or AVPacketSideData with the
- * appropriate type.
- *
- * @note The struct should be allocated with
- * av_dynamic_hdr_plus_alloc() and its size is not a part of
- * the public ABI.
- */
-typedef struct AVDynamicHDRPlus {
-    /**
-     * Country code by Rec. ITU-T T.35 Annex A. The value shall be 0xB5.
-     */
-    uint8_t itu_t_t35_country_code;
-
-    /**
-     * Application version in the application defining document in ST-2094
-     * suite. The value shall be set to 0.
-     */
-    uint8_t application_version;
-
-    /**
-     * The number of processing windows. The value shall be in the range
-     * of 1 to 3, inclusive.
-     */
-    uint8_t num_windows;
-
-    /**
-     * The color transform parameters for every processing window.
-     */
-    AVHDRPlusColorTransformParams params3;
-
-    /**
-     * The nominal maximum display luminance of the targeted system display,
-     * in units of 0.0001 candelas per square metre. The value shall be in
-     * the range of 0 to 10000, inclusive.
-     */
-    AVRational targeted_system_display_maximum_luminance;
-
-    /**
-     * This flag shall be equal to 0 in bit streams conforming to this version
-     * of this Specification. The value 1 is reserved for future use.
-     */
-    uint8_t targeted_system_display_actual_peak_luminance_flag;
-
-    /**
-     * The number of rows in the targeted system_display_actual_peak_luminance
-     * array. The value shall be in the range of 2 to 25, inclusive.
-     */
-    uint8_t num_rows_targeted_system_display_actual_peak_luminance;
-
-    /**
-     * The number of columns in the
-     * targeted_system_display_actual_peak_luminance array. The value shall be
-     * in the range of 2 to 25, inclusive.
-     */
-    uint8_t num_cols_targeted_system_display_actual_peak_luminance;
-
-    /**
-     * The normalized actual peak luminance of the targeted system display. The
-     * values should be in the range of 0 to 1, inclusive and in multiples of
-     * 1/15.
-     */
-    AVRational targeted_system_display_actual_peak_luminance2525;
-
-    /**
-     * This flag shall be equal to 0 in bitstreams conforming to this version of
-     * this Specification. The value 1 is reserved for future use.
-     */
-    uint8_t mastering_display_actual_peak_luminance_flag;
-
-    /**
-     * The number of rows in the mastering_display_actual_peak_luminance array.
-     * The value shall be in the range of 2 to 25, inclusive.
-     */
-    uint8_t num_rows_mastering_display_actual_peak_luminance;
-
-    /**
-     * The number of columns in the mastering_display_actual_peak_luminance
-     * array. The value shall be in the range of 2 to 25, inclusive.
-     */
-    uint8_t num_cols_mastering_display_actual_peak_luminance;
-
-    /**
-     * The normalized actual peak luminance of the mastering display used for
-     * mastering the image essence. The values should be in the range of 0 to 1,
-     * inclusive and in multiples of 1/15.
-     */
-    AVRational mastering_display_actual_peak_luminance2525;
-} AVDynamicHDRPlus;
-
-/**
- * Allocate an AVDynamicHDRPlus structure and set its fields to
- * default values. The resulting struct can be freed using av_freep().
- *
- * @return An AVDynamicHDRPlus filled with default values or NULL
- *         on failure.
- */
-AVDynamicHDRPlus *av_dynamic_hdr_plus_alloc(size_t *size);
-
-/**
- * Allocate a complete AVDynamicHDRPlus and add it to the frame.
- * @param frame The frame which side data is added to.
- *
- * @return The AVDynamicHDRPlus structure to be filled by caller or NULL
- *         on failure.
- */
-AVDynamicHDRPlus *av_dynamic_hdr_plus_create_side_data(AVFrame *frame);
-
-#endif /* AVUTIL_HDR_DYNAMIC_METADATA_H */

gpac-2.2.1.tar.gz/extra_lib/include/libavutil/hmac.h Deleted

@@ -1,99 +0,0 @@
-/*
- * 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,
-    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-2.2.1.tar.gz/extra_lib/include/libavutil/hwcontext.h Deleted

@@ -1,605 +0,0 @@
-/*
- * 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_HWCONTEXT_H
-#define AVUTIL_HWCONTEXT_H
-
-#include "buffer.h"
-#include "frame.h"
-#include "log.h"
-#include "pixfmt.h"
-
-enum AVHWDeviceType {
-    AV_HWDEVICE_TYPE_NONE,
-    AV_HWDEVICE_TYPE_VDPAU,
-    AV_HWDEVICE_TYPE_CUDA,
-    AV_HWDEVICE_TYPE_VAAPI,
-    AV_HWDEVICE_TYPE_DXVA2,
-    AV_HWDEVICE_TYPE_QSV,
-    AV_HWDEVICE_TYPE_VIDEOTOOLBOX,
-    AV_HWDEVICE_TYPE_D3D11VA,
-    AV_HWDEVICE_TYPE_DRM,
-    AV_HWDEVICE_TYPE_OPENCL,
-    AV_HWDEVICE_TYPE_MEDIACODEC,
-    AV_HWDEVICE_TYPE_VULKAN,
-};
-
-typedef struct AVHWDeviceInternal AVHWDeviceInternal;
-
-/**
- * This struct aggregates all the (hardware/vendor-specific) "high-level" state,
- * i.e. state that is not tied to a concrete processing configuration.
- * E.g., in an API that supports hardware-accelerated encoding and decoding,
- * this struct will (if possible) wrap the state that is common to both encoding
- * and decoding and from which specific instances of encoders or decoders can be
- * derived.
- *
- * This struct is reference-counted with the AVBuffer mechanism. The
- * av_hwdevice_ctx_alloc() constructor yields a reference, whose data field
- * points to the actual AVHWDeviceContext. Further objects derived from
- * AVHWDeviceContext (such as AVHWFramesContext, describing a frame pool with
- * specific properties) will hold an internal reference to it. After all the
- * references are released, the AVHWDeviceContext itself will be freed,
- * optionally invoking a user-specified callback for uninitializing the hardware
- * state.
- */
-typedef struct AVHWDeviceContext {
-    /**
-     * A class for logging. Set by av_hwdevice_ctx_alloc().
-     */
-    const AVClass *av_class;
-
-    /**
-     * Private data used internally by libavutil. Must not be accessed in any
-     * way by the caller.
-     */
-    AVHWDeviceInternal *internal;
-
-    /**
-     * This field identifies the underlying API used for hardware access.
-     *
-     * This field is set when this struct is allocated and never changed
-     * afterwards.
-     */
-    enum AVHWDeviceType type;
-
-    /**
-     * The format-specific data, allocated and freed by libavutil along with
-     * this context.
-     *
-     * Should be cast by the user to the format-specific context defined in the
-     * corresponding header (hwcontext_*.h) and filled as described in the
-     * documentation before calling av_hwdevice_ctx_init().
-     *
-     * After calling av_hwdevice_ctx_init() this struct should not be modified
-     * by the caller.
-     */
-    void *hwctx;
-
-    /**
-     * This field may be set by the caller before calling av_hwdevice_ctx_init().
-     *
-     * If non-NULL, this callback will be called when the last reference to
-     * this context is unreferenced, immediately before it is freed.
-     *
-     * @note when other objects (e.g an AVHWFramesContext) are derived from this
-     *       struct, this callback will be invoked after all such child objects
-     *       are fully uninitialized and their respective destructors invoked.
-     */
-    void (*free)(struct AVHWDeviceContext *ctx);
-
-    /**
-     * Arbitrary user data, to be used e.g. by the free() callback.
-     */
-    void *user_opaque;
-} AVHWDeviceContext;
-
-typedef struct AVHWFramesInternal AVHWFramesInternal;
-
-/**
- * This struct describes a set or pool of "hardware" frames (i.e. those with
- * data not located in normal system memory). All the frames in the pool are
- * assumed to be allocated in the same way and interchangeable.
- *
- * This struct is reference-counted with the AVBuffer mechanism and tied to a
- * given AVHWDeviceContext instance. The av_hwframe_ctx_alloc() constructor
- * yields a reference, whose data field points to the actual AVHWFramesContext
- * struct.
- */
-typedef struct AVHWFramesContext {
-    /**
-     * A class for logging.
-     */
-    const AVClass *av_class;
-
-    /**
-     * Private data used internally by libavutil. Must not be accessed in any
-     * way by the caller.
-     */
-    AVHWFramesInternal *internal;
-
-    /**
-     * A reference to the parent AVHWDeviceContext. This reference is owned and
-     * managed by the enclosing AVHWFramesContext, but the caller may derive
-     * additional references from it.
-     */
-    AVBufferRef *device_ref;
-
-    /**
-     * The parent AVHWDeviceContext. This is simply a pointer to
-     * device_ref->data provided for convenience.
-     *
-     * Set by libavutil in av_hwframe_ctx_init().
-     */
-    AVHWDeviceContext *device_ctx;
-
-    /**
-     * The format-specific data, allocated and freed automatically along with
-     * this context.
-     *
-     * Should be cast by the user to the format-specific context defined in the
-     * corresponding header (hwframe_*.h) and filled as described in the
-     * documentation before calling av_hwframe_ctx_init().
-     *
-     * After any frames using this context are created, the contents of this
-     * struct should not be modified by the caller.
-     */
-    void *hwctx;
-
-    /**
-     * This field may be set by the caller before calling av_hwframe_ctx_init().
-     *
-     * If non-NULL, this callback will be called when the last reference to
-     * this context is unreferenced, immediately before it is freed.
-     */
-    void (*free)(struct AVHWFramesContext *ctx);
-
-    /**
-     * Arbitrary user data, to be used e.g. by the free() callback.
-     */
-    void *user_opaque;
-
-    /**
-     * A pool from which the frames are allocated by av_hwframe_get_buffer().
-     * This field may be set by the caller before calling av_hwframe_ctx_init().
-     * The buffers returned by calling av_buffer_pool_get() on this pool must
-     * have the properties described in the documentation in the corresponding hw
-     * type's header (hwcontext_*.h). The pool will be freed strictly before
-     * this struct's free() callback is invoked.
-     *
-     * This field may be NULL, then libavutil will attempt to allocate a pool
-     * internally. Note that certain device types enforce pools allocated at
-     * fixed size (frame count), which cannot be extended dynamically. In such a
-     * case, initial_pool_size must be set appropriately.
-     */
-    AVBufferPool *pool;
-
-    /**
-     * Initial size of the frame pool. If a device type does not support
-     * dynamically resizing the pool, then this is also the maximum pool size.
-     *
-     * May be set by the caller before calling av_hwframe_ctx_init(). Must be
-     * set if pool is NULL and the device type does not support dynamic pools.
-     */
-    int initial_pool_size;
-
-    /**
-     * The pixel format identifying the underlying HW surface type.
-     *
-     * Must be a hwaccel format, i.e. the corresponding descriptor must have the
-     * AV_PIX_FMT_FLAG_HWACCEL flag set.
-     *
-     * Must be set by the user before calling av_hwframe_ctx_init().
-     */
-    enum AVPixelFormat format;
-
-    /**
-     * The pixel format identifying the actual data layout of the hardware
-     * frames.
-     *
-     * Must be set by the caller before calling av_hwframe_ctx_init().
-     *
-     * @note when the underlying API does not provide the exact data layout, but
-     * only the colorspace/bit depth, this field should be set to the fully
-     * planar version of that format (e.g. for 8-bit 420 YUV it should be
-     * AV_PIX_FMT_YUV420P, not AV_PIX_FMT_NV12 or anything else).
-     */
-    enum AVPixelFormat sw_format;
-
-    /**
-     * The allocated dimensions of the frames in this pool.
-     *
-     * Must be set by the user before calling av_hwframe_ctx_init().
-     */
-    int width, height;
-} AVHWFramesContext;
-
-/**
- * Look up an AVHWDeviceType by name.
- *
- * @param name String name of the device type (case-insensitive).
- * @return The type from enum AVHWDeviceType, or AV_HWDEVICE_TYPE_NONE if
- *         not found.
- */
-enum AVHWDeviceType av_hwdevice_find_type_by_name(const char *name);
-
-/** Get the string name of an AVHWDeviceType.
- *
- * @param type Type from enum AVHWDeviceType.
- * @return Pointer to a static string containing the name, or NULL if the type
- *         is not valid.
- */
-const char *av_hwdevice_get_type_name(enum AVHWDeviceType type);
-
-/**
- * Iterate over supported device types.
- *
- * @param type AV_HWDEVICE_TYPE_NONE initially, then the previous type
- *             returned by this function in subsequent iterations.
- * @return The next usable device type from enum AVHWDeviceType, or
- *         AV_HWDEVICE_TYPE_NONE if there are no more.
- */
-enum AVHWDeviceType av_hwdevice_iterate_types(enum AVHWDeviceType prev);
-
-/**
- * Allocate an AVHWDeviceContext for a given hardware type.
- *
- * @param type the type of the hardware device to allocate.
- * @return a reference to the newly created AVHWDeviceContext on success or NULL
- *         on failure.
- */
-AVBufferRef *av_hwdevice_ctx_alloc(enum AVHWDeviceType type);
-
-/**
- * Finalize the device context before use. This function must be called after
- * the context is filled with all the required information and before it is
- * used in any way.
- *
- * @param ref a reference to the AVHWDeviceContext
- * @return 0 on success, a negative AVERROR code on failure
- */
-int av_hwdevice_ctx_init(AVBufferRef *ref);
-
-/**
- * Open a device of the specified type and create an AVHWDeviceContext for it.
- *
- * This is a convenience function intended to cover the simple cases. Callers
- * who need to fine-tune device creation/management should open the device
- * manually and then wrap it in an AVHWDeviceContext using
- * av_hwdevice_ctx_alloc()/av_hwdevice_ctx_init().
- *
- * The returned context is already initialized and ready for use, the caller
- * should not call av_hwdevice_ctx_init() on it. The user_opaque/free fields of
- * the created AVHWDeviceContext are set by this function and should not be
- * touched by the caller.
- *
- * @param device_ctx On success, a reference to the newly-created device context
- *                   will be written here. The reference is owned by the caller
- *                   and must be released with av_buffer_unref() when no longer
- *                   needed. On failure, NULL will be written to this pointer.
- * @param type The type of the device to create.
- * @param device A type-specific string identifying the device to open.
- * @param opts A dictionary of additional (type-specific) options to use in
- *             opening the device. The dictionary remains owned by the caller.
- * @param flags currently unused
- *
- * @return 0 on success, a negative AVERROR code on failure.
- */
-int av_hwdevice_ctx_create(AVBufferRef **device_ctx, enum AVHWDeviceType type,
-                           const char *device, AVDictionary *opts, int flags);
-
-/**
- * Create a new device of the specified type from an existing device.
- *
- * If the source device is a device of the target type or was originally
- * derived from such a device (possibly through one or more intermediate
- * devices of other types), then this will return a reference to the
- * existing device of the same type as is requested.
- *
- * Otherwise, it will attempt to derive a new device from the given source
- * device.  If direct derivation to the new type is not implemented, it will
- * attempt the same derivation from each ancestor of the source device in
- * turn looking for an implemented derivation method.
- *
- * @param dst_ctx On success, a reference to the newly-created
- *                AVHWDeviceContext.
- * @param type    The type of the new device to create.
- * @param src_ctx A reference to an existing AVHWDeviceContext which will be
- *                used to create the new device.
- * @param flags   Currently unused; should be set to zero.
- * @return        Zero on success, a negative AVERROR code on failure.
- */
-int av_hwdevice_ctx_create_derived(AVBufferRef **dst_ctx,
-                                   enum AVHWDeviceType type,
-                                   AVBufferRef *src_ctx, int flags);
-
-/**
- * Create a new device of the specified type from an existing device.
- *
- * This function performs the same action as av_hwdevice_ctx_create_derived,
- * however, it is able to set options for the new device to be derived.
- *
- * @param dst_ctx On success, a reference to the newly-created
- *                AVHWDeviceContext.
- * @param type    The type of the new device to create.
- * @param src_ctx A reference to an existing AVHWDeviceContext which will be
- *                used to create the new device.
- * @param options Options for the new device to create, same format as in
- *                av_hwdevice_ctx_create.
- * @param flags   Currently unused; should be set to zero.
- * @return        Zero on success, a negative AVERROR code on failure.
- */
-int av_hwdevice_ctx_create_derived_opts(AVBufferRef **dst_ctx,
-                                        enum AVHWDeviceType type,
-                                        AVBufferRef *src_ctx,
-                                        AVDictionary *options, int flags);
-
-/**
- * Allocate an AVHWFramesContext tied to a given device context.
- *
- * @param device_ctx a reference to a AVHWDeviceContext. This function will make
- *                   a new reference for internal use, the one passed to the
- *                   function remains owned by the caller.
- * @return a reference to the newly created AVHWFramesContext on success or NULL
- *         on failure.
- */
-AVBufferRef *av_hwframe_ctx_alloc(AVBufferRef *device_ctx);
-
-/**
- * Finalize the context before use. This function must be called after the
- * context is filled with all the required information and before it is attached
- * to any frames.
- *
- * @param ref a reference to the AVHWFramesContext
- * @return 0 on success, a negative AVERROR code on failure
- */
-int av_hwframe_ctx_init(AVBufferRef *ref);
-
-/**
- * Allocate a new frame attached to the given AVHWFramesContext.
- *
- * @param hwframe_ctx a reference to an AVHWFramesContext
- * @param frame an empty (freshly allocated or unreffed) frame to be filled with
- *              newly allocated buffers.
- * @param flags currently unused, should be set to zero
- * @return 0 on success, a negative AVERROR code on failure
- */
-int av_hwframe_get_buffer(AVBufferRef *hwframe_ctx, AVFrame *frame, int flags);
-
-/**
- * Copy data to or from a hw surface. At least one of dst/src must have an
- * AVHWFramesContext attached.
- *
- * If src has an AVHWFramesContext attached, then the format of dst (if set)
- * must use one of the formats returned by av_hwframe_transfer_get_formats(src,
- * AV_HWFRAME_TRANSFER_DIRECTION_FROM).
- * If dst has an AVHWFramesContext attached, then the format of src must use one
- * of the formats returned by av_hwframe_transfer_get_formats(dst,
- * AV_HWFRAME_TRANSFER_DIRECTION_TO)
- *
- * dst may be "clean" (i.e. with data/buf pointers unset), in which case the
- * data buffers will be allocated by this function using av_frame_get_buffer().
- * If dst->format is set, then this format will be used, otherwise (when
- * dst->format is AV_PIX_FMT_NONE) the first acceptable format will be chosen.
- *
- * The two frames must have matching allocated dimensions (i.e. equal to
- * AVHWFramesContext.width/height), since not all device types support
- * transferring a sub-rectangle of the whole surface. The display dimensions
- * (i.e. AVFrame.width/height) may be smaller than the allocated dimensions, but
- * also have to be equal for both frames. When the display dimensions are
- * smaller than the allocated dimensions, the content of the padding in the
- * destination frame is unspecified.
- *
- * @param dst the destination frame. dst is not touched on failure.
- * @param src the source frame.
- * @param flags currently unused, should be set to zero
- * @return 0 on success, a negative AVERROR error code on failure.
- */
-int av_hwframe_transfer_data(AVFrame *dst, const AVFrame *src, int flags);
-
-enum AVHWFrameTransferDirection {
-    /**
-     * Transfer the data from the queried hw frame.
-     */
-    AV_HWFRAME_TRANSFER_DIRECTION_FROM,
-
-    /**
-     * Transfer the data to the queried hw frame.
-     */
-    AV_HWFRAME_TRANSFER_DIRECTION_TO,
-};
-
-/**
- * Get a list of possible source or target formats usable in
- * av_hwframe_transfer_data().
- *
- * @param hwframe_ctx the frame context to obtain the information for
- * @param dir the direction of the transfer
- * @param formats the pointer to the output format list will be written here.
- *                The list is terminated with AV_PIX_FMT_NONE and must be freed
- *                by the caller when no longer needed using av_free().
- *                If this function returns successfully, the format list will
- *                have at least one item (not counting the terminator).
- *                On failure, the contents of this pointer are unspecified.
- * @param flags currently unused, should be set to zero
- * @return 0 on success, a negative AVERROR code on failure.
- */
-int av_hwframe_transfer_get_formats(AVBufferRef *hwframe_ctx,
-                                    enum AVHWFrameTransferDirection dir,
-                                    enum AVPixelFormat **formats, int flags);
-
-
-/**
- * This struct describes the constraints on hardware frames attached to
- * a given device with a hardware-specific configuration.  This is returned
- * by av_hwdevice_get_hwframe_constraints() and must be freed by
- * av_hwframe_constraints_free() after use.
- */
-typedef struct AVHWFramesConstraints {
-    /**
-     * A list of possible values for format in the hw_frames_ctx,
-     * terminated by AV_PIX_FMT_NONE.  This member will always be filled.
-     */
-    enum AVPixelFormat *valid_hw_formats;
-
-    /**
-     * A list of possible values for sw_format in the hw_frames_ctx,
-     * terminated by AV_PIX_FMT_NONE.  Can be NULL if this information is
-     * not known.
-     */
-    enum AVPixelFormat *valid_sw_formats;
-
-    /**
-     * The minimum size of frames in this hw_frames_ctx.
-     * (Zero if not known.)
-     */
-    int min_width;
-    int min_height;
-
-    /**
-     * The maximum size of frames in this hw_frames_ctx.
-     * (INT_MAX if not known / no limit.)
-     */
-    int max_width;
-    int max_height;
-} AVHWFramesConstraints;
-
-/**
- * Allocate a HW-specific configuration structure for a given HW device.
- * After use, the user must free all members as required by the specific
- * hardware structure being used, then free the structure itself with
- * av_free().
- *
- * @param device_ctx a reference to the associated AVHWDeviceContext.
- * @return The newly created HW-specific configuration structure on
- *         success or NULL on failure.
- */
-void *av_hwdevice_hwconfig_alloc(AVBufferRef *device_ctx);
-
-/**
- * Get the constraints on HW frames given a device and the HW-specific
- * configuration to be used with that device.  If no HW-specific
- * configuration is provided, returns the maximum possible capabilities
- * of the device.
- *
- * @param ref a reference to the associated AVHWDeviceContext.
- * @param hwconfig a filled HW-specific configuration structure, or NULL
- *        to return the maximum possible capabilities of the device.
- * @return AVHWFramesConstraints structure describing the constraints
- *         on the device, or NULL if not available.
- */
-AVHWFramesConstraints *av_hwdevice_get_hwframe_constraints(AVBufferRef *ref,
-                                                           const void *hwconfig);
-
-/**
- * Free an AVHWFrameConstraints structure.
- *
- * @param constraints The (filled or unfilled) AVHWFrameConstraints structure.
- */
-void av_hwframe_constraints_free(AVHWFramesConstraints **constraints);
-
-
-/**
- * Flags to apply to frame mappings.
- */
-enum {
-    /**
-     * The mapping must be readable.
-     */
-    AV_HWFRAME_MAP_READ      = 1 << 0,
-    /**
-     * The mapping must be writeable.
-     */
-    AV_HWFRAME_MAP_WRITE     = 1 << 1,
-    /**
-     * The mapped frame will be overwritten completely in subsequent
-     * operations, so the current frame data need not be loaded.  Any values
-     * which are not overwritten are unspecified.
-     */
-    AV_HWFRAME_MAP_OVERWRITE = 1 << 2,
-    /**
-     * The mapping must be direct.  That is, there must not be any copying in
-     * the map or unmap steps.  Note that performance of direct mappings may
-     * be much lower than normal memory.
-     */
-    AV_HWFRAME_MAP_DIRECT    = 1 << 3,
-};
-
-/**
- * Map a hardware frame.
- *
- * This has a number of different possible effects, depending on the format
- * and origin of the src and dst frames.  On input, src should be a usable
- * frame with valid buffers and dst should be blank (typically as just created
- * by av_frame_alloc()).  src should have an associated hwframe context, and
- * dst may optionally have a format and associated hwframe context.
- *
- * If src was created by mapping a frame from the hwframe context of dst,
- * then this function undoes the mapping - dst is replaced by a reference to
- * the frame that src was originally mapped from.
- *
- * If both src and dst have an associated hwframe context, then this function
- * attempts to map the src frame from its hardware context to that of dst and
- * then fill dst with appropriate data to be usable there.  This will only be
- * possible if the hwframe contexts and associated devices are compatible -
- * given compatible devices, av_hwframe_ctx_create_derived() can be used to
- * create a hwframe context for dst in which mapping should be possible.
- *
- * If src has a hwframe context but dst does not, then the src frame is
- * mapped to normal memory and should thereafter be usable as a normal frame.
- * If the format is set on dst, then the mapping will attempt to create dst
- * with that format and fail if it is not possible.  If format is unset (is
- * AV_PIX_FMT_NONE) then dst will be mapped with whatever the most appropriate
- * format to use is (probably the sw_format of the src hwframe context).
- *
- * A return value of AVERROR(ENOSYS) indicates that the mapping is not
- * possible with the given arguments and hwframe setup, while other return
- * values indicate that it failed somehow.
- *
- * @param dst Destination frame, to contain the mapping.
- * @param src Source frame, to be mapped.
- * @param flags Some combination of AV_HWFRAME_MAP_* flags.
- * @return Zero on success, negative AVERROR code on failure.
- */
-int av_hwframe_map(AVFrame *dst, const AVFrame *src, int flags);
-
-
-/**
- * Create and initialise an AVHWFramesContext as a mapping of another existing
- * AVHWFramesContext on a different device.
- *
- * av_hwframe_ctx_init() should not be called after this.
- *
- * @param derived_frame_ctx  On success, a reference to the newly created
- *                           AVHWFramesContext.
- * @param derived_device_ctx A reference to the device to create the new
- *                           AVHWFramesContext on.
- * @param source_frame_ctx   A reference to an existing AVHWFramesContext
- *                           which will be mapped to the derived context.
- * @param flags  Some combination of AV_HWFRAME_MAP_* flags, defining the
- *               mapping parameters to apply to frames which are allocated
- *               in the derived device.
- * @return       Zero on success, negative AVERROR code on failure.
- */
-int av_hwframe_ctx_create_derived(AVBufferRef **derived_frame_ctx,
-                                  enum AVPixelFormat format,
-                                  AVBufferRef *derived_device_ctx,
-                                  AVBufferRef *source_frame_ctx,
-                                  int flags);
-
-#endif /* AVUTIL_HWCONTEXT_H */

gpac-2.2.1.tar.gz/extra_lib/include/libavutil/hwcontext_cuda.h Deleted

@@ -1,69 +0,0 @@
-/*
- * 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_HWCONTEXT_CUDA_H
-#define AVUTIL_HWCONTEXT_CUDA_H
-
-#ifndef CUDA_VERSION
-#include <cuda.h>
-#endif
-
-#include "pixfmt.h"
-
-/**
- * @file
- * An API-specific header for AV_HWDEVICE_TYPE_CUDA.
- *
- * This API supports dynamic frame pools. AVHWFramesContext.pool must return
- * AVBufferRefs whose data pointer is a CUdeviceptr.
- */
-
-typedef struct AVCUDADeviceContextInternal AVCUDADeviceContextInternal;
-
-/**
- * This struct is allocated as AVHWDeviceContext.hwctx
- */
-typedef struct AVCUDADeviceContext {
-    CUcontext cuda_ctx;
-    CUstream stream;
-    AVCUDADeviceContextInternal *internal;
-} AVCUDADeviceContext;
-
-/**
- * AVHWFramesContext.hwctx is currently not used
- */
-
-/**
- * @defgroup hwcontext_cuda Device context creation flags
- *
- * Flags for av_hwdevice_ctx_create.
- *
- * @{
- */
-
-/**
- * Use primary device context instead of creating a new one.
- */
-#define AV_CUDA_USE_PRIMARY_CONTEXT (1 << 0)
-
-/**
- * @}
- */
-
-#endif /* AVUTIL_HWCONTEXT_CUDA_H */

gpac-2.2.1.tar.gz/extra_lib/include/libavutil/hwcontext_d3d11va.h Deleted

@@ -1,178 +0,0 @@
-/*
- * 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_HWCONTEXT_D3D11VA_H
-#define AVUTIL_HWCONTEXT_D3D11VA_H
-
-/**
- * @file
- * An API-specific header for AV_HWDEVICE_TYPE_D3D11VA.
- *
- * The default pool implementation will be fixed-size if initial_pool_size is
- * set (and allocate elements from an array texture). Otherwise it will allocate
- * individual textures. Be aware that decoding requires a single array texture.
- *
- * Using sw_format==AV_PIX_FMT_YUV420P has special semantics, and maps to
- * DXGI_FORMAT_420_OPAQUE. av_hwframe_transfer_data() is not supported for
- * this format. Refer to MSDN for details.
- *
- * av_hwdevice_ctx_create() for this device type supports a key named "debug"
- * for the AVDictionary entry. If this is set to any value, the device creation
- * code will try to load various supported D3D debugging layers.
- */
-
-#include <d3d11.h>
-#include <stdint.h>
-
-/**
- * This struct is allocated as AVHWDeviceContext.hwctx
- */
-typedef struct AVD3D11VADeviceContext {
-    /**
-     * Device used for texture creation and access. This can also be used to
-     * set the libavcodec decoding device.
-     *
-     * Must be set by the user. This is the only mandatory field - the other
-     * device context fields are set from this and are available for convenience.
-     *
-     * Deallocating the AVHWDeviceContext will always release this interface,
-     * and it does not matter whether it was user-allocated.
-     */
-    ID3D11Device        *device;
-
-    /**
-     * If unset, this will be set from the device field on init.
-     *
-     * Deallocating the AVHWDeviceContext will always release this interface,
-     * and it does not matter whether it was user-allocated.
-     */
-    ID3D11DeviceContext *device_context;
-
-    /**
-     * If unset, this will be set from the device field on init.
-     *
-     * Deallocating the AVHWDeviceContext will always release this interface,
-     * and it does not matter whether it was user-allocated.
-     */
-    ID3D11VideoDevice   *video_device;
-
-    /**
-     * If unset, this will be set from the device_context field on init.
-     *
-     * Deallocating the AVHWDeviceContext will always release this interface,
-     * and it does not matter whether it was user-allocated.
-     */
-    ID3D11VideoContext  *video_context;
-
-    /**
-     * Callbacks for locking. They protect accesses to device_context and
-     * video_context calls. They also protect access to the internal staging
-     * texture (for av_hwframe_transfer_data() calls). They do NOT protect
-     * access to hwcontext or decoder state in general.
-     *
-     * If unset on init, the hwcontext implementation will set them to use an
-     * internal mutex.
-     *
-     * The underlying lock must be recursive. lock_ctx is for free use by the
-     * locking implementation.
-     */
-    void (*lock)(void *lock_ctx);
-    void (*unlock)(void *lock_ctx);
-    void *lock_ctx;
-} AVD3D11VADeviceContext;
-
-/**
- * D3D11 frame descriptor for pool allocation.
- *
- * In user-allocated pools, AVHWFramesContext.pool must return AVBufferRefs
- * with the data pointer pointing at an object of this type describing the
- * planes of the frame.
- *
- * This has no use outside of custom allocation, and AVFrame AVBufferRef do not
- * necessarily point to an instance of this struct.
- */
-typedef struct AVD3D11FrameDescriptor {
-    /**
-     * The texture in which the frame is located. The reference count is
-     * managed by the AVBufferRef, and destroying the reference will release
-     * the interface.
-     *
-     * Normally stored in AVFrame.data0.
-     */
-    ID3D11Texture2D *texture;
-
-    /**
-     * The index into the array texture element representing the frame, or 0
-     * if the texture is not an array texture.
-     *
-     * Normally stored in AVFrame.data1 (cast from intptr_t).
-     */
-    intptr_t index;
-} AVD3D11FrameDescriptor;
-
-/**
- * This struct is allocated as AVHWFramesContext.hwctx
- */
-typedef struct AVD3D11VAFramesContext {
-    /**
-     * The canonical texture used for pool allocation. If this is set to NULL
-     * on init, the hwframes implementation will allocate and set an array
-     * texture if initial_pool_size > 0.
-     *
-     * The only situation when the API user should set this is:
-     * - the user wants to do manual pool allocation (setting
-     *   AVHWFramesContext.pool), instead of letting AVHWFramesContext
-     *   allocate the pool
-     * - of an array texture
-     * - and wants it to use it for decoding
-     * - this has to be done before calling av_hwframe_ctx_init()
-     *
-     * Deallocating the AVHWFramesContext will always release this interface,
-     * and it does not matter whether it was user-allocated.
-     *
-     * This is in particular used by the libavcodec D3D11VA hwaccel, which
-     * requires a single array texture. It will create ID3D11VideoDecoderOutputView
-     * objects for each array texture element on decoder initialization.
-     */
-    ID3D11Texture2D *texture;
-
-    /**
-     * D3D11_TEXTURE2D_DESC.BindFlags used for texture creation. The user must
-     * at least set D3D11_BIND_DECODER if the frames context is to be used for
-     * video decoding.
-     * This field is ignored/invalid if a user-allocated texture is provided.
-     */
-    UINT BindFlags;
-
-    /**
-     * D3D11_TEXTURE2D_DESC.MiscFlags used for texture creation.
-     * This field is ignored/invalid if a user-allocated texture is provided.
-     */
-    UINT MiscFlags;
-
-    /**
-     * In case if texture structure member above is not NULL contains the same texture
-     * pointer for all elements and different indexes into the array texture.
-     * In case if texture structure member above is NULL, all elements contains
-     * pointers to separate non-array textures and 0 indexes.
-     * This field is ignored/invalid if a user-allocated texture is provided.
-    */
-    AVD3D11FrameDescriptor *texture_infos;
-} AVD3D11VAFramesContext;
-
-#endif /* AVUTIL_HWCONTEXT_D3D11VA_H */

gpac-2.2.1.tar.gz/extra_lib/include/libavutil/hwcontext_drm.h Deleted

@@ -1,169 +0,0 @@
-/*
- * 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_HWCONTEXT_DRM_H
-#define AVUTIL_HWCONTEXT_DRM_H
-
-#include <stddef.h>
-#include <stdint.h>
-
-/**
- * @file
- * API-specific header for AV_HWDEVICE_TYPE_DRM.
- *
- * Internal frame allocation is not currently supported - all frames
- * must be allocated by the user.  Thus AVHWFramesContext is always
- * NULL, though this may change if support for frame allocation is
- * added in future.
- */
-
-enum {
-    /**
-     * The maximum number of layers/planes in a DRM frame.
-     */
-    AV_DRM_MAX_PLANES = 4
-};
-
-/**
- * DRM object descriptor.
- *
- * Describes a single DRM object, addressing it as a PRIME file
- * descriptor.
- */
-typedef struct AVDRMObjectDescriptor {
-    /**
-     * DRM PRIME fd for the object.
-     */
-    int fd;
-    /**
-     * Total size of the object.
-     *
-     * (This includes any parts not which do not contain image data.)
-     */
-    size_t size;
-    /**
-     * Format modifier applied to the object (DRM_FORMAT_MOD_*).
-     *
-     * If the format modifier is unknown then this should be set to
-     * DRM_FORMAT_MOD_INVALID.
-     */
-    uint64_t format_modifier;
-} AVDRMObjectDescriptor;
-
-/**
- * DRM plane descriptor.
- *
- * Describes a single plane of a layer, which is contained within
- * a single object.
- */
-typedef struct AVDRMPlaneDescriptor {
-    /**
-     * Index of the object containing this plane in the objects
-     * array of the enclosing frame descriptor.
-     */
-    int object_index;
-    /**
-     * Offset within that object of this plane.
-     */
-    ptrdiff_t offset;
-    /**
-     * Pitch (linesize) of this plane.
-     */
-    ptrdiff_t pitch;
-} AVDRMPlaneDescriptor;
-
-/**
- * DRM layer descriptor.
- *
- * Describes a single layer within a frame.  This has the structure
- * defined by its format, and will contain one or more planes.
- */
-typedef struct AVDRMLayerDescriptor {
-    /**
-     * Format of the layer (DRM_FORMAT_*).
-     */
-    uint32_t format;
-    /**
-     * Number of planes in the layer.
-     *
-     * This must match the number of planes required by format.
-     */
-    int nb_planes;
-    /**
-     * Array of planes in this layer.
-     */
-    AVDRMPlaneDescriptor planesAV_DRM_MAX_PLANES;
-} AVDRMLayerDescriptor;
-
-/**
- * DRM frame descriptor.
- *
- * This is used as the data pointer for AV_PIX_FMT_DRM_PRIME frames.
- * It is also used by user-allocated frame pools - allocating in
- * AVHWFramesContext.pool must return AVBufferRefs which contain
- * an object of this type.
- *
- * The fields of this structure should be set such it can be
- * imported directly by EGL using the EGL_EXT_image_dma_buf_import
- * and EGL_EXT_image_dma_buf_import_modifiers extensions.
- * (Note that the exact layout of a particular format may vary between
- * platforms - we only specify that the same platform should be able
- * to import it.)
- *
- * The total number of planes must not exceed AV_DRM_MAX_PLANES, and
- * the order of the planes by increasing layer index followed by
- * increasing plane index must be the same as the order which would
- * be used for the data pointers in the equivalent software format.
- */
-typedef struct AVDRMFrameDescriptor {
-    /**
-     * Number of DRM objects making up this frame.
-     */
-    int nb_objects;
-    /**
-     * Array of objects making up the frame.
-     */
-    AVDRMObjectDescriptor objectsAV_DRM_MAX_PLANES;
-    /**
-     * Number of layers in the frame.
-     */
-    int nb_layers;
-    /**
-     * Array of layers in the frame.
-     */
-    AVDRMLayerDescriptor layersAV_DRM_MAX_PLANES;
-} AVDRMFrameDescriptor;
-
-/**
- * DRM device.
- *
- * Allocated as AVHWDeviceContext.hwctx.
- */
-typedef struct AVDRMDeviceContext {
-    /**
-     * File descriptor of DRM device.
-     *
-     * This is used as the device to create frames on, and may also be
-     * used in some derivation and mapping operations.
-     *
-     * If no device is required, set to -1.
-     */
-    int fd;
-} AVDRMDeviceContext;
-
-#endif /* AVUTIL_HWCONTEXT_DRM_H */

gpac-2.2.1.tar.gz/extra_lib/include/libavutil/hwcontext_dxva2.h Deleted

@@ -1,75 +0,0 @@
-/*
- * 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_HWCONTEXT_DXVA2_H
-#define AVUTIL_HWCONTEXT_DXVA2_H
-
-/**
- * @file
- * An API-specific header for AV_HWDEVICE_TYPE_DXVA2.
- *
- * Only fixed-size pools are supported.
- *
- * For user-allocated pools, AVHWFramesContext.pool must return AVBufferRefs
- * with the data pointer set to a pointer to IDirect3DSurface9.
- */
-
-#include <d3d9.h>
-#include <dxva2api.h>
-
-/**
- * This struct is allocated as AVHWDeviceContext.hwctx
- */
-typedef struct AVDXVA2DeviceContext {
-    IDirect3DDeviceManager9 *devmgr;
-} AVDXVA2DeviceContext;
-
-/**
- * This struct is allocated as AVHWFramesContext.hwctx
- */
-typedef struct AVDXVA2FramesContext {
-    /**
-     * The surface type (e.g. DXVA2_VideoProcessorRenderTarget or
-     * DXVA2_VideoDecoderRenderTarget). Must be set by the caller.
-     */
-    DWORD               surface_type;
-
-    /**
-     * The surface pool. When an external pool is not provided by the caller,
-     * this will be managed (allocated and filled on init, freed on uninit) by
-     * libavutil.
-     */
-    IDirect3DSurface9 **surfaces;
-    int              nb_surfaces;
-
-    /**
-     * Certain drivers require the decoder to be destroyed before the surfaces.
-     * To allow internally managed pools to work properly in such cases, this
-     * field is provided.
-     *
-     * If it is non-NULL, libavutil will call IDirectXVideoDecoder_Release() on
-     * it just before the internal surface pool is freed.
-     *
-     * This is for convenience only. Some code uses other methods to manage the
-     * decoder reference.
-     */
-    IDirectXVideoDecoder *decoder_to_release;
-} AVDXVA2FramesContext;
-
-#endif /* AVUTIL_HWCONTEXT_DXVA2_H */

gpac-2.2.1.tar.gz/extra_lib/include/libavutil/hwcontext_mediacodec.h Deleted

@@ -1,36 +0,0 @@
-/*
- * 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_HWCONTEXT_MEDIACODEC_H
-#define AVUTIL_HWCONTEXT_MEDIACODEC_H
-
-/**
- * MediaCodec details.
- *
- * Allocated as AVHWDeviceContext.hwctx
- */
-typedef struct AVMediaCodecDeviceContext {
-    /**
-     * android/view/Surface handle, to be filled by the user.
-     *
-     * This is the default surface used by decoders on this device.
-     */
-    void *surface;
-} AVMediaCodecDeviceContext;
-
-#endif /* AVUTIL_HWCONTEXT_MEDIACODEC_H */

gpac-2.2.1.tar.gz/extra_lib/include/libavutil/hwcontext_opencl.h Deleted

@@ -1,100 +0,0 @@
-/*
- * 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_HWCONTEXT_OPENCL_H
-#define AVUTIL_HWCONTEXT_OPENCL_H
-
-#ifdef __APPLE__
-#include <OpenCL/cl.h>
-#else
-#include <CL/cl.h>
-#endif
-
-#include "frame.h"
-
-/**
- * @file
- * API-specific header for AV_HWDEVICE_TYPE_OPENCL.
- *
- * Pools allocated internally are always dynamic, and are primarily intended
- * to be used in OpenCL-only cases.  If interoperation is required, it is
- * typically required to allocate frames in the other API and then map the
- * frames context to OpenCL with av_hwframe_ctx_create_derived().
- */
-
-/**
- * OpenCL frame descriptor for pool allocation.
- *
- * In user-allocated pools, AVHWFramesContext.pool must return AVBufferRefs
- * with the data pointer pointing at an object of this type describing the
- * planes of the frame.
- */
-typedef struct AVOpenCLFrameDescriptor {
-    /**
-     * Number of planes in the frame.
-     */
-    int nb_planes;
-    /**
-     * OpenCL image2d objects for each plane of the frame.
-     */
-    cl_mem planesAV_NUM_DATA_POINTERS;
-} AVOpenCLFrameDescriptor;
-
-/**
- * OpenCL device details.
- *
- * Allocated as AVHWDeviceContext.hwctx
- */
-typedef struct AVOpenCLDeviceContext {
-    /**
-     * The primary device ID of the device.  If multiple OpenCL devices
-     * are associated with the context then this is the one which will
-     * be used for all operations internal to FFmpeg.
-     */
-    cl_device_id device_id;
-    /**
-     * The OpenCL context which will contain all operations and frames on
-     * this device.
-     */
-    cl_context context;
-    /**
-     * The default command queue for this device, which will be used by all
-     * frames contexts which do not have their own command queue.  If not
-     * intialised by the user, a default queue will be created on the
-     * primary device.
-     */
-    cl_command_queue command_queue;
-} AVOpenCLDeviceContext;
-
-/**
- * OpenCL-specific data associated with a frame pool.
- *
- * Allocated as AVHWFramesContext.hwctx.
- */
-typedef struct AVOpenCLFramesContext {
-    /**
-     * The command queue used for internal asynchronous operations on this
-     * device (av_hwframe_transfer_data(), av_hwframe_map()).
-     *
-     * If this is not set, the command queue from the associated device is
-     * used instead.
-     */
-    cl_command_queue command_queue;
-} AVOpenCLFramesContext;
-
-#endif /* AVUTIL_HWCONTEXT_OPENCL_H */

gpac-2.2.1.tar.gz/extra_lib/include/libavutil/hwcontext_qsv.h Deleted

@@ -1,53 +0,0 @@
-/*
- * 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_HWCONTEXT_QSV_H
-#define AVUTIL_HWCONTEXT_QSV_H
-
-#include <mfx/mfxvideo.h>
-
-/**
- * @file
- * An API-specific header for AV_HWDEVICE_TYPE_QSV.
- *
- * This API does not support dynamic frame pools. AVHWFramesContext.pool must
- * contain AVBufferRefs whose data pointer points to an mfxFrameSurface1 struct.
- */
-
-/**
- * This struct is allocated as AVHWDeviceContext.hwctx
- */
-typedef struct AVQSVDeviceContext {
-    mfxSession session;
-} AVQSVDeviceContext;
-
-/**
- * This struct is allocated as AVHWFramesContext.hwctx
- */
-typedef struct AVQSVFramesContext {
-    mfxFrameSurface1 *surfaces;
-    int            nb_surfaces;
-
-    /**
-     * A combination of MFX_MEMTYPE_* describing the frame pool.
-     */
-    int frame_type;
-} AVQSVFramesContext;
-
-#endif /* AVUTIL_HWCONTEXT_QSV_H */
-

gpac-2.2.1.tar.gz/extra_lib/include/libavutil/hwcontext_vaapi.h Deleted

@@ -1,117 +0,0 @@
-/*
- * 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_HWCONTEXT_VAAPI_H
-#define AVUTIL_HWCONTEXT_VAAPI_H
-
-#include <va/va.h>
-
-/**
- * @file
- * API-specific header for AV_HWDEVICE_TYPE_VAAPI.
- *
- * Dynamic frame pools are supported, but note that any pool used as a render
- * target is required to be of fixed size in order to be be usable as an
- * argument to vaCreateContext().
- *
- * For user-allocated pools, AVHWFramesContext.pool must return AVBufferRefs
- * with the data pointer set to a VASurfaceID.
- */
-
-enum {
-    /**
-     * The quirks field has been set by the user and should not be detected
-     * automatically by av_hwdevice_ctx_init().
-     */
-    AV_VAAPI_DRIVER_QUIRK_USER_SET = (1 << 0),
-    /**
-     * The driver does not destroy parameter buffers when they are used by
-     * vaRenderPicture().  Additional code will be required to destroy them
-     * separately afterwards.
-     */
-    AV_VAAPI_DRIVER_QUIRK_RENDER_PARAM_BUFFERS = (1 << 1),
-
-    /**
-     * The driver does not support the VASurfaceAttribMemoryType attribute,
-     * so the surface allocation code will not try to use it.
-     */
-    AV_VAAPI_DRIVER_QUIRK_ATTRIB_MEMTYPE = (1 << 2),
-
-    /**
-     * The driver does not support surface attributes at all.
-     * The surface allocation code will never pass them to surface allocation,
-     * and the results of the vaQuerySurfaceAttributes() call will be faked.
-     */
-    AV_VAAPI_DRIVER_QUIRK_SURFACE_ATTRIBUTES = (1 << 3),
-};
-
-/**
- * VAAPI connection details.
- *
- * Allocated as AVHWDeviceContext.hwctx
- */
-typedef struct AVVAAPIDeviceContext {
-    /**
-     * The VADisplay handle, to be filled by the user.
-     */
-    VADisplay display;
-    /**
-     * Driver quirks to apply - this is filled by av_hwdevice_ctx_init(),
-     * with reference to a table of known drivers, unless the
-     * AV_VAAPI_DRIVER_QUIRK_USER_SET bit is already present.  The user
-     * may need to refer to this field when performing any later
-     * operations using VAAPI with the same VADisplay.
-     */
-    unsigned int driver_quirks;
-} AVVAAPIDeviceContext;
-
-/**
- * VAAPI-specific data associated with a frame pool.
- *
- * Allocated as AVHWFramesContext.hwctx.
- */
-typedef struct AVVAAPIFramesContext {
-    /**
-     * Set by the user to apply surface attributes to all surfaces in
-     * the frame pool.  If null, default settings are used.
-     */
-    VASurfaceAttrib *attributes;
-    int           nb_attributes;
-    /**
-     * The surfaces IDs of all surfaces in the pool after creation.
-     * Only valid if AVHWFramesContext.initial_pool_size was positive.
-     * These are intended to be used as the render_targets arguments to
-     * vaCreateContext().
-     */
-    VASurfaceID     *surface_ids;
-    int           nb_surfaces;
-} AVVAAPIFramesContext;
-
-/**
- * VAAPI hardware pipeline configuration details.
- *
- * Allocated with av_hwdevice_hwconfig_alloc().
- */
-typedef struct AVVAAPIHWConfig {
-    /**
-     * ID of a VAAPI pipeline configuration.
-     */
-    VAConfigID config_id;
-} AVVAAPIHWConfig;
-
-#endif /* AVUTIL_HWCONTEXT_VAAPI_H */

gpac-2.2.1.tar.gz/extra_lib/include/libavutil/hwcontext_vdpau.h Deleted

@@ -1,44 +0,0 @@
-/*
- * 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_HWCONTEXT_VDPAU_H
-#define AVUTIL_HWCONTEXT_VDPAU_H
-
-#include <vdpau/vdpau.h>
-
-/**
- * @file
- * An API-specific header for AV_HWDEVICE_TYPE_VDPAU.
- *
- * This API supports dynamic frame pools. AVHWFramesContext.pool must return
- * AVBufferRefs whose data pointer is a VdpVideoSurface.
- */
-
-/**
- * This struct is allocated as AVHWDeviceContext.hwctx
- */
-typedef struct AVVDPAUDeviceContext {
-    VdpDevice          device;
-    VdpGetProcAddress *get_proc_address;
-} AVVDPAUDeviceContext;
-
-/**
- * AVHWFramesContext.hwctx is currently not used
- */
-
-#endif /* AVUTIL_HWCONTEXT_VDPAU_H */

gpac-2.2.1.tar.gz/extra_lib/include/libavutil/hwcontext_videotoolbox.h Deleted

@@ -1,95 +0,0 @@
-/*
- * 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_HWCONTEXT_VIDEOTOOLBOX_H
-#define AVUTIL_HWCONTEXT_VIDEOTOOLBOX_H
-
-#include <stdint.h>
-
-#include <VideoToolbox/VideoToolbox.h>
-
-#include "pixfmt.h"
-
-/**
- * @file
- * An API-specific header for AV_HWDEVICE_TYPE_VIDEOTOOLBOX.
- *
- * This API supports frame allocation using a native CVPixelBufferPool
- * instead of an AVBufferPool.
- *
- * If the API user sets a custom pool, AVHWFramesContext.pool must return
- * AVBufferRefs whose data pointer is a CVImageBufferRef or CVPixelBufferRef.
- * Note that the underlying CVPixelBuffer could be retained by OS frameworks
- * depending on application usage, so it is preferable to let CoreVideo manage
- * the pool using the default implementation.
- *
- * Currently AVHWDeviceContext.hwctx and AVHWFramesContext.hwctx are always
- * NULL.
- */
-
-/**
- * Convert a VideoToolbox (actually CoreVideo) format to AVPixelFormat.
- * Returns AV_PIX_FMT_NONE if no known equivalent was found.
- */
-enum AVPixelFormat av_map_videotoolbox_format_to_pixfmt(uint32_t cv_fmt);
-
-/**
- * Convert an AVPixelFormat to a VideoToolbox (actually CoreVideo) format.
- * Returns 0 if no known equivalent was found.
- */
-uint32_t av_map_videotoolbox_format_from_pixfmt(enum AVPixelFormat pix_fmt);
-
-/**
- * Same as av_map_videotoolbox_format_from_pixfmt function, but can map and
- * return full range pixel formats via a flag.
- */
-uint32_t av_map_videotoolbox_format_from_pixfmt2(enum AVPixelFormat pix_fmt, bool full_range);
-
-/**
- * Convert an AVChromaLocation to a VideoToolbox/CoreVideo chroma location string.
- * Returns 0 if no known equivalent was found.
- */
-CFStringRef av_map_videotoolbox_chroma_loc_from_av(enum AVChromaLocation loc);
-
-/**
- * Convert an AVColorSpace to a VideoToolbox/CoreVideo color matrix string.
- * Returns 0 if no known equivalent was found.
- */
-CFStringRef av_map_videotoolbox_color_matrix_from_av(enum AVColorSpace space);
-
-/**
- * Convert an AVColorPrimaries to a VideoToolbox/CoreVideo color primaries string.
- * Returns 0 if no known equivalent was found.
- */
-CFStringRef av_map_videotoolbox_color_primaries_from_av(enum AVColorPrimaries pri);
-
-/**
- * Convert an AVColorTransferCharacteristic to a VideoToolbox/CoreVideo color transfer
- * function string.
- * Returns 0 if no known equivalent was found.
- */
-CFStringRef av_map_videotoolbox_color_trc_from_av(enum AVColorTransferCharacteristic trc);
-
-/**
- * Update a CVPixelBufferRef's metadata to based on an AVFrame.
- * Returns 0 if no known equivalent was found.
- */
-int av_vt_pixbuf_set_attachments(void *log_ctx,
-                                 CVPixelBufferRef pixbuf, const struct AVFrame *src);
-
-#endif /* AVUTIL_HWCONTEXT_VIDEOTOOLBOX_H */

gpac-2.2.1.tar.gz/extra_lib/include/libavutil/hwcontext_vulkan.h Deleted

@@ -1,281 +0,0 @@
-/*
- * 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_HWCONTEXT_VULKAN_H
-#define AVUTIL_HWCONTEXT_VULKAN_H
-
-#if defined(_WIN32) && !defined(VK_USE_PLATFORM_WIN32_KHR)
-#define VK_USE_PLATFORM_WIN32_KHR
-#endif
-#include <vulkan/vulkan.h>
-
-#include "pixfmt.h"
-#include "frame.h"
-
-/**
- * @file
- * API-specific header for AV_HWDEVICE_TYPE_VULKAN.
- *
- * For user-allocated pools, AVHWFramesContext.pool must return AVBufferRefs
- * with the data pointer set to an AVVkFrame.
- */
-
-/**
- * Main Vulkan context, allocated as AVHWDeviceContext.hwctx.
- * All of these can be set before init to change what the context uses
- */
-typedef struct AVVulkanDeviceContext {
-    /**
-     * Custom memory allocator, else NULL
-     */
-    const VkAllocationCallbacks *alloc;
-
-    /**
-     * Pointer to the instance-provided vkGetInstanceProcAddr loading function.
-     * If NULL, will pick either libvulkan or libvolk, depending on libavutil's
-     * compilation settings, and set this field.
-     */
-    PFN_vkGetInstanceProcAddr get_proc_addr;
-
-    /**
-     * Vulkan instance. Must be at least version 1.2.
-     */
-    VkInstance inst;
-
-    /**
-     * Physical device
-     */
-    VkPhysicalDevice phys_dev;
-
-    /**
-     * Active device
-     */
-    VkDevice act_dev;
-
-    /**
-     * This structure should be set to the set of features that present and enabled
-     * during device creation. When a device is created by FFmpeg, it will default to
-     * enabling all that are present of the shaderImageGatherExtended,
-     * fragmentStoresAndAtomics, shaderInt64 and vertexPipelineStoresAndAtomics features.
-     */
-    VkPhysicalDeviceFeatures2 device_features;
-
-    /**
-     * Enabled instance extensions.
-     * If supplying your own device context, set this to an array of strings, with
-     * each entry containing the specified Vulkan extension string to enable.
-     * Duplicates are possible and accepted.
-     * If no extensions are enabled, set these fields to NULL, and 0 respectively.
-     */
-    const char * const *enabled_inst_extensions;
-    int nb_enabled_inst_extensions;
-
-    /**
-     * Enabled device extensions. By default, VK_KHR_external_memory_fd,
-     * VK_EXT_external_memory_dma_buf, VK_EXT_image_drm_format_modifier,
-     * VK_KHR_external_semaphore_fd and VK_EXT_external_memory_host are enabled if found.
-     * If supplying your own device context, these fields takes the same format as
-     * the above fields, with the same conditions that duplicates are possible
-     * and accepted, and that NULL and 0 respectively means no extensions are enabled.
-     */
-    const char * const *enabled_dev_extensions;
-    int nb_enabled_dev_extensions;
-
-    /**
-     * Queue family index for graphics operations, and the number of queues
-     * enabled for it. If unavaiable, will be set to -1. Not required.
-     * av_hwdevice_create() will attempt to find a dedicated queue for each
-     * queue family, or pick the one with the least unrelated flags set.
-     * Queue indices here may overlap if a queue has to share capabilities.
-     */
-    int queue_family_index;
-    int nb_graphics_queues;
-
-    /**
-     * Queue family index for transfer operations and the number of queues
-     * enabled. Required.
-     */
-    int queue_family_tx_index;
-    int nb_tx_queues;
-
-    /**
-     * Queue family index for compute operations and the number of queues
-     * enabled. Required.
-     */
-    int queue_family_comp_index;
-    int nb_comp_queues;
-
-    /**
-     * Queue family index for video encode ops, and the amount of queues enabled.
-     * If the device doesn't support such, queue_family_encode_index will be -1.
-     * Not required.
-     */
-    int queue_family_encode_index;
-    int nb_encode_queues;
-
-    /**
-     * Queue family index for video decode ops, and the amount of queues enabled.
-     * If the device doesn't support such, queue_family_decode_index will be -1.
-     * Not required.
-     */
-    int queue_family_decode_index;
-    int nb_decode_queues;
-} AVVulkanDeviceContext;
-
-/**
- * Defines the behaviour of frame allocation.
- */
-typedef enum AVVkFrameFlags {
-    /* Unless this flag is set, autodetected flags will be OR'd based on the
-     * device and tiling during av_hwframe_ctx_init(). */
-    AV_VK_FRAME_FLAG_NONE              = (1ULL << 0),
-
-    /* Image planes will be allocated in a single VkDeviceMemory, rather
-     * than as per-plane VkDeviceMemory allocations. Required for exporting
-     * to VAAPI on Intel devices. */
-    AV_VK_FRAME_FLAG_CONTIGUOUS_MEMORY = (1ULL << 1),
-} AVVkFrameFlags;
-
-/**
- * Allocated as AVHWFramesContext.hwctx, used to set pool-specific options
- */
-typedef struct AVVulkanFramesContext {
-    /**
-     * Controls the tiling of allocated frames. If left as optimal tiling,
-     * then during av_hwframe_ctx_init() will decide based on whether the device
-     * supports DRM modifiers, or if the linear_images flag is set, otherwise
-     * will allocate optimally-tiled images.
-     */
-    VkImageTiling tiling;
-
-    /**
-     * Defines extra usage of output frames. If left as 0, the following bits
-     * are set: TRANSFER_SRC, TRANSFER_DST. SAMPLED and STORAGE.
-     */
-    VkImageUsageFlagBits usage;
-
-    /**
-     * Extension data for image creation.
-     * If VkImageDrmFormatModifierListCreateInfoEXT is present in the chain,
-     * and the device supports DRM modifiers, then images will be allocated
-     * with the specific requested DRM modifiers.
-     * Additional structures may be added at av_hwframe_ctx_init() time,
-     * which will be freed automatically on uninit(), so users need only free
-     * any structures they've allocated themselves.
-     */
-    void *create_pnext;
-
-    /**
-     * Extension data for memory allocation. Must have as many entries as
-     * the number of planes of the sw_format.
-     * This will be chained to VkExportMemoryAllocateInfo, which is used
-     * to make all pool images exportable to other APIs if the necessary
-     * extensions are present in enabled_dev_extensions.
-     */
-    void *alloc_pnextAV_NUM_DATA_POINTERS;
-
-    /**
-     * A combination of AVVkFrameFlags. Unless AV_VK_FRAME_FLAG_NONE is set,
-     * autodetected flags will be OR'd based on the device and tiling during
-     * av_hwframe_ctx_init().
-     */
-    AVVkFrameFlags flags;
-} AVVulkanFramesContext;
-
-/*
- * Frame structure, the VkFormat of the image will always match
- * the pool's sw_format.
- * All frames, imported or allocated, will be created with the
- * VK_IMAGE_CREATE_ALIAS_BIT flag set, so the memory may be aliased if needed.
- *
- * If all queue family indices in the device context are the same,
- * images will be created with the EXCLUSIVE sharing mode. Otherwise, all images
- * will be created using the CONCURRENT sharing mode.
- *
- * @note the size of this structure is not part of the ABI, to allocate
- * you must use @av_vk_frame_alloc().
- */
-typedef struct AVVkFrame {
-    /**
-     * Vulkan images to which the memory is bound to.
-     */
-    VkImage imgAV_NUM_DATA_POINTERS;
-
-    /**
-     * The same tiling must be used for all images in the frame.
-     */
-    VkImageTiling tiling;
-
-    /**
-     * Memory backing the images. Could be less than the amount of planes,
-     * in which case the offset value will indicate the binding offset of
-     * each plane in the memory.
-     */
-    VkDeviceMemory memAV_NUM_DATA_POINTERS;
-    size_t sizeAV_NUM_DATA_POINTERS;
-
-    /**
-     * OR'd flags for all memory allocated
-     */
-    VkMemoryPropertyFlagBits flags;
-
-    /**
-     * Updated after every barrier
-     */
-    VkAccessFlagBits accessAV_NUM_DATA_POINTERS;
-    VkImageLayout layoutAV_NUM_DATA_POINTERS;
-
-    /**
-     * Synchronization timeline semaphores, one for each sw_format plane.
-     * Must not be freed manually. Must be waited on at every submission using
-     * the value in sem_value, and must be signalled at every submission,
-     * using an incremented value.
-     */
-    VkSemaphore semAV_NUM_DATA_POINTERS;
-
-    /**
-     * Up to date semaphore value at which each image becomes accessible.
-     * Clients must wait on this value when submitting a command queue,
-     * and increment it when signalling.
-     */
-    uint64_t sem_valueAV_NUM_DATA_POINTERS;
-
-    /**
-     * Internal data.
-     */
-    struct AVVkFrameInternal *internal;
-
-    /**
-     * Describes the binding offset of each plane to the VkDeviceMemory.
-     */
-    ptrdiff_t offsetAV_NUM_DATA_POINTERS;
-} AVVkFrame;
-
-/**
- * Allocates a single AVVkFrame and initializes everything as 0.
- * @note Must be freed via av_free()
- */
-AVVkFrame *av_vk_frame_alloc(void);
-
-/**
- * Returns the format of each image up to the number of planes for a given sw_format.
- * Returns NULL on unsupported formats.
- */
-const VkFormat *av_vkfmt_from_pixfmt(enum AVPixelFormat p);
-
-#endif /* AVUTIL_HWCONTEXT_VULKAN_H */

gpac-2.2.1.tar.gz/extra_lib/include/libavutil/imgutils.h Deleted

@@ -1,309 +0,0 @@
-/*
- * 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_pixstepsplane 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_pixsteps4, int max_pixstep_comps4,
-                                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 linesizes4, enum AVPixelFormat pix_fmt, int width);
-
-/**
- * Fill plane sizes for an image with pixel format pix_fmt and height height.
- *
- * @param size the array to be filled with the size of each image plane
- * @param linesizes the array containing the linesize for each
- *        plane, should be filled by av_image_fill_linesizes()
- * @return >= 0 in case of success, a negative error code otherwise
- *
- * @note The linesize parameters have the type ptrdiff_t here, while they are
- *       int for av_image_fill_linesizes().
- */
-int av_image_fill_plane_sizes(size_t size4, enum AVPixelFormat pix_fmt,
-                              int height, const ptrdiff_t linesizes4);
-
-/**
- * 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 *data4, enum AVPixelFormat pix_fmt, int height,
-                           uint8_t *ptr, const int linesizes4);
-
-/**
- * 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(&pointers0).
- *
- * @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 *pointers4, int linesizes4,
-                   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 data located in uncacheable (e.g. GPU mapped) memory. Where
- * available, this function will use special functionality for reading from such
- * memory, which may result in greatly improved performance compared to plain
- * av_image_copy_plane().
- *
- * bytewidth must be contained by both absolute values of dst_linesize
- * and src_linesize, otherwise the function behavior is undefined.
- *
- * @note The linesize parameters have the type ptrdiff_t here, while they are
- *       int for av_image_copy_plane().
- * @note On x86, the linesizes currently need to be aligned to the cacheline
- *       size (i.e. 64) to get improved performance.
- */
-void av_image_copy_plane_uc_from(uint8_t       *dst, ptrdiff_t dst_linesize,
-                                 const uint8_t *src, ptrdiff_t src_linesize,
-                                 ptrdiff_t 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_data4, int dst_linesizes4,
-                   const uint8_t *src_data4, const int src_linesizes4,
-                   enum AVPixelFormat pix_fmt, int width, int height);
-
-/**
- * Copy image data located in uncacheable (e.g. GPU mapped) memory. Where
- * available, this function will use special functionality for reading from such
- * memory, which may result in greatly improved performance compared to plain
- * av_image_copy().
- *
- * The data pointers and the linesizes must be aligned to the maximum required
- * by the CPU architecture.
- *
- * @note The linesize parameters have the type ptrdiff_t here, while they are
- *       int for av_image_copy().
- * @note On x86, the linesizes currently need to be aligned to the cacheline
- *       size (i.e. 64) to get improved performance.
- */
-void av_image_copy_uc_from(uint8_t *dst_data4,       const ptrdiff_t dst_linesizes4,
-                           const uint8_t *src_data4, const ptrdiff_t src_linesizes4,
-                           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 == NULL 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_linesize  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_data4, int dst_linesize4,
-                         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 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 assumed linesize alignment
- * @return the buffer size in bytes, a negative error code in case of failure
- */
-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_linesize  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_data4, const int src_linesize4,
-                            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 dimension of an image is valid, meaning that all
- * bytes of a plane of an image with the specified pix_fmt can be addressed
- * with a signed int.
- *
- * @param w the width of the picture
- * @param h the height of the picture
- * @param max_pixels the maximum number of pixels the user wants to accept
- * @param pix_fmt the pixel format, can be AV_PIX_FMT_NONE if unknown.
- * @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_size2(unsigned int w, unsigned int h, int64_t max_pixels, enum AVPixelFormat pix_fmt, 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);
-
-/**
- * Overwrite the image data with black. This is suitable for filling a
- * sub-rectangle of an image, meaning the padding between the right most pixel
- * and the left most pixel on the next line will not be overwritten. For some
- * formats, the image size might be rounded up due to inherent alignment.
- *
- * If the pixel format has alpha, the alpha is cleared to opaque.
- *
- * This can return an error if the pixel format is not supported. Normally, all
- * non-hwaccel pixel formats should be supported.
- *
- * Passing NULL for dst_data is allowed. Then the function returns whether the
- * operation would have succeeded. (It can return an error if the pix_fmt is
- * not supported.)
- *
- * @param dst_data      data pointers to destination image
- * @param dst_linesize  linesizes for the destination image
- * @param pix_fmt       the pixel format of the image
- * @param range         the color range of the image (important for colorspaces such as YUV)
- * @param width         the width of the image in pixels
- * @param height        the height of the image in pixels
- * @return 0 if the image data was cleared, a negative AVERROR code otherwise
- */
-int av_image_fill_black(uint8_t *dst_data4, const ptrdiff_t dst_linesize4,
-                        enum AVPixelFormat pix_fmt, enum AVColorRange range,
-                        int width, int height);
-
-/**
- * @}
- */
-
-
-#endif /* AVUTIL_IMGUTILS_H */

gpac-2.2.1.tar.gz/extra_lib/include/libavutil/intfloat.h Deleted

@@ -1,77 +0,0 @@
-/*
- * 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-2.2.1.tar.gz/extra_lib/include/libavutil/intreadwrite.h Deleted

@@ -1,644 +0,0 @@
-/*
- * 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 u322;
-    uint16_t u164;
-    uint8_t  u8 8;
-    double   f64;
-    float    f322;
-} av_alias av_alias64;
-
-typedef union {
-    uint32_t u32;
-    uint16_t u162;
-    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_RWBLN(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_RWN8-64A.
- * Incorrect usage may range from abysmal performance to crash
- * depending on the platform.
- *
- * The unaligned variants are AV_RWBLN8-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_RBLXX 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_RWN helper macros to simplify definitions not provided
- * by per-arch headers.
- */
-
-#if defined(__GNUC__)
-
-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(_MSC_VER) && (defined(_M_ARM) || defined(_M_X64) || defined(_M_ARM64)) && AV_HAVE_FAST_UNALIGNED
-
-#   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, val) do {                 \
-        uint16_t d = (val);                     \
-        ((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, val) do {                 \
-        uint16_t d = (val);                     \
-        ((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, val) do {                 \
-        uint32_t d = (val);                     \
-        ((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, val) do {                 \
-        uint32_t d = (val);                     \
-        ((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, val) do {                 \
-        uint64_t d = (val);                     \
-        ((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, val) do {                 \
-        uint64_t d = (val);                     \
-        ((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_RWNA 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
-
-#if AV_HAVE_BIGENDIAN
-#   define AV_RLA(s, p)    av_bswap##s(AV_RN##s##A(p))
-#   define AV_WLA(s, p, v) AV_WN##s##A(p, av_bswap##s(v))
-#else
-#   define AV_RLA(s, p)    AV_RN##s##A(p)
-#   define AV_WLA(s, p, v) AV_WN##s##A(p, v)
-#endif
-
-#ifndef AV_RL64A
-#   define AV_RL64A(p) AV_RLA(64, p)
-#endif
-#ifndef AV_WL64A
-#   define AV_WL64A(p, v) AV_WLA(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-2.2.1.tar.gz/extra_lib/include/libavutil/lfg.h Deleted

@@ -1,80 +0,0 @@
-/*
- * 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
-
-#include <stdint.h>
-
-/**
- * Context structure for the Lagged Fibonacci PRNG.
- * The exact layout, types and content of this struct may change and should
- * not be accessed directly. Only its sizeof() is guranteed to stay the same
- * to allow easy instanciation.
- */
-typedef struct AVLFG {
-    unsigned int state64;
-    int index;
-} AVLFG;
-
-void av_lfg_init(AVLFG *c, unsigned int seed);
-
-/**
- * Seed the state of the ALFG using binary data.
- *
- * Return value: 0 on success, negative value (AVERROR) on failure.
- */
-int av_lfg_init_from_data(AVLFG *c, const uint8_t *data, unsigned int length);
-
-/**
- * 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){
-    unsigned a = c->statec->index & 63 = c->state(c->index-24) & 63 + c->state(c->index-55) & 63;
-    c->index += 1U;
-    return a;
-}
-
-/**
- * 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;
-    a = c->statec->index & 63 = 2*a*b+a+b;
-    c->index += 1U;
-    return a;
-}
-
-/**
- * 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 out2);
-
-#endif /* AVUTIL_LFG_H */

gpac-2.2.1.tar.gz/extra_lib/include/libavutil/log.h Deleted

@@ -1,387 +0,0 @@
-/*
- * 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_LOG_H
-#define AVUTIL_LOG_H
-
-#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;
-
-/**
- * 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 AVClass {
-    /**
-     * The name of the class; usually it is the same name as the
-     * context structure type to which the AVClass is associated.
-     */
-    const char* class_name;
-
-    /**
-     * A pointer to a function which returns the name of a context
-     * instance ctx associated with the class.
-     */
-    const char* (*item_name)(void* ctx);
-
-    /**
-     * a pointer to the first option specified in the class if any or NULL
-     *
-     * @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;
-
-    /**
-     * 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);
-
-    /**
-     * Return next AVOptions-enabled child or NULL
-     */
-    void* (*child_next)(void *obj, void *prev);
-
-    /**
-     * Iterate over the AVClasses corresponding to potential AVOptions-enabled
-     * children.
-     *
-     * @param iter pointer to opaque iteration state. The caller must initialize
-     *             *iter to NULL before the first call.
-     * @return AVClass for the next AVOptions-enabled child or NULL if there are
-     *         no more such children.
-     *
-     * @note The difference between child_next and this is that child_next
-     *       iterates over _already existing_ objects, while child_class_iterate
-     *       iterates over _all possible_ children.
-     */
-    const struct AVClass* (*child_class_iterate)(void **iter);
-} AVClass;
-
-/**
- * @addtogroup lavu_log
- *
- * @{
- *
- * @defgroup lavu_log_constants Logging Constants
- *
- * @{
- */
-
-/**
- * Print no output.
- */
-#define AV_LOG_QUIET    -8
-
-/**
- * Something went really wrong and we will crash now.
- */
-#define AV_LOG_PANIC     0
-
-/**
- * Something went wrong and recovery is not possible.
- * For example, no header was found for a format which depends
- * on headers or an illegal combination of parameters is used.
- */
-#define AV_LOG_FATAL     8
-
-/**
- * Something went wrong and cannot losslessly be recovered.
- * However, not all future data is affected.
- */
-#define AV_LOG_ERROR    16
-
-/**
- * Something somehow does not look correct. This may or may not
- * lead to problems. An example would be the use of '-vstrict -2'.
- */
-#define AV_LOG_WARNING  24
-
-/**
- * Standard information.
- */
-#define AV_LOG_INFO     32
-
-/**
- * Detailed information.
- */
-#define AV_LOG_VERBOSE  40
-
-/**
- * Stuff which is only useful for libav* developers.
- */
-#define AV_LOG_DEBUG    48
-
-/**
- * Extremely verbose debugging, useful for libav* development.
- */
-#define AV_LOG_TRACE    56
-
-#define AV_LOG_MAX_OFFSET (AV_LOG_TRACE - AV_LOG_QUIET)
-
-/**
- * @}
- */
-
-/**
- * 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 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 or NULL if general log.
- * @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.
- */
-void av_log(void *avcl, int level, const char *fmt, ...) av_printf_format(3, 4);
-
-/**
- * Send the specified message to the log once with the initial_level and then with
- * the subsequent_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
- *
- * @param avcl A pointer to an arbitrary struct of which the first field is a
- *        pointer to an AVClass struct or NULL if general log.
- * @param initial_level importance level of the message expressed using a @ref
- *        lavu_log_constants "Logging Constant" for the first occurance.
- * @param subsequent_level importance level of the message expressed using a @ref
- *        lavu_log_constants "Logging Constant" after the first occurance.
- * @param fmt The format string (printf-compatible) that specifies how
- *        subsequent arguments are converted to output.
- * @param state a variable to keep trak of if a message has already been printed
- *        this must be initialized to 0 before the first use. The same state
- *        must not be accessed by 2 Threads simultaneously.
- */
-void av_log_once(void* avcl, int initial_level, int subsequent_level, int *state, const char *fmt, ...) av_printf_format(5, 6);
-
-
-/**
- * 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 formatted 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);
-
-/**
- * Format a line of log the same way as the default callback.
- * @param line          buffer to receive the formatted line;
- *                      may be NULL if line_size is 0
- * @param line_size     size of the buffer; at most line_size-1 characters will
- *                      be written to the buffer, plus one null terminator
- * @param print_prefix  used to store whether the prefix must be printed;
- *                      must point to a persistent integer initially set to 1
- * @return Returns a negative value if an error occurred, otherwise returns
- *         the number of characters that would have been written for a
- *         sufficiently large buffer, not including the terminating null
- *         character. If the return value is not less than line_size, it means
- *         that the log message was truncated to fit the buffer.
- */
-int av_log_format_line2(void *ptr, int level, const char *fmt, va_list vl,
-                        char *line, int line_size, int *print_prefix);
-
-/**
- * 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-2.2.1.tar.gz/extra_lib/include/libavutil/lzo.h Deleted

@@ -1,66 +0,0 @@
-/*
- * 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-2.2.1.tar.gz/extra_lib/include/libavutil/macros.h Deleted

@@ -1,80 +0,0 @@
-/*
- * 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
-
-#include "libavutil/avconfig.h"
-
-#if AV_HAVE_BIGENDIAN
-#   define AV_NE(be, le) (be)
-#else
-#   define AV_NE(be, le) (le)
-#endif
-
-/**
- * Comparator.
- * For two numerical expressions x and y, gives 1 if x > y, -1 if x < y, and 0
- * if x == y. This is useful for instance in a qsort comparator callback.
- * Furthermore, compilers are able to optimize this to branchless code, and
- * there is no risk of overflow with signed types.
- * As with many macros, this evaluates its argument multiple times, it thus
- * must not have a side-effect.
- */
-#define FFDIFFSIGN(x,y) (((x)>(y)) - ((x)<(y)))
-
-#define FFMAX(a,b) ((a) > (b) ? (a) : (b))
-#define FFMAX3(a,b,c) FFMAX(FFMAX(a,b),c)
-#define FFMIN(a,b) ((a) > (b) ? (b) : (a))
-#define FFMIN3(a,b,c) FFMIN(FFMIN(a,b),c)
-
-#define FFSWAP(type,a,b) do{type SWAP_tmp= b; b= a; a= SWAP_tmp;}while(0)
-#define FF_ARRAY_ELEMS(a) (sizeof(a) / sizeof((a)0))
-
-#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))
-
-/**
- * @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)
-
-#define FFALIGN(x, a) (((x)+(a)-1)&~((a)-1))
-
-#endif /* AVUTIL_MACROS_H */

gpac-2.2.1.tar.gz/extra_lib/include/libavutil/mastering_display_metadata.h Deleted

@@ -1,128 +0,0 @@
-/*
- * Copyright (c) 2016 Neil Birkbeck <neil.birkbeck@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_MASTERING_DISPLAY_METADATA_H
-#define AVUTIL_MASTERING_DISPLAY_METADATA_H
-
-#include "frame.h"
-#include "rational.h"
-
-
-/**
- * Mastering display metadata capable of representing the color volume of
- * the display used to master the content (SMPTE 2086:2014).
- *
- * To be used as payload of a AVFrameSideData or AVPacketSideData with the
- * appropriate type.
- *
- * @note The struct should be allocated with av_mastering_display_metadata_alloc()
- *       and its size is not a part of the public ABI.
- */
-typedef struct AVMasteringDisplayMetadata {
-    /**
-     * CIE 1931 xy chromaticity coords of color primaries (r, g, b order).
-     */
-    AVRational display_primaries32;
-
-    /**
-     * CIE 1931 xy chromaticity coords of white point.
-     */
-    AVRational white_point2;
-
-    /**
-     * Min luminance of mastering display (cd/m^2).
-     */
-    AVRational min_luminance;
-
-    /**
-     * Max luminance of mastering display (cd/m^2).
-     */
-    AVRational max_luminance;
-
-    /**
-     * Flag indicating whether the display primaries (and white point) are set.
-     */
-    int has_primaries;
-
-    /**
-     * Flag indicating whether the luminance (min_ and max_) have been set.
-     */
-    int has_luminance;
-
-} AVMasteringDisplayMetadata;
-
-/**
- * Allocate an AVMasteringDisplayMetadata structure and set its fields to
- * default values. The resulting struct can be freed using av_freep().
- *
- * @return An AVMasteringDisplayMetadata filled with default values or NULL
- *         on failure.
- */
-AVMasteringDisplayMetadata *av_mastering_display_metadata_alloc(void);
-
-/**
- * Allocate a complete AVMasteringDisplayMetadata and add it to the frame.
- *
- * @param frame The frame which side data is added to.
- *
- * @return The AVMasteringDisplayMetadata structure to be filled by caller.
- */
-AVMasteringDisplayMetadata *av_mastering_display_metadata_create_side_data(AVFrame *frame);
-
-/**
- * Content light level needed by to transmit HDR over HDMI (CTA-861.3).
- *
- * To be used as payload of a AVFrameSideData or AVPacketSideData with the
- * appropriate type.
- *
- * @note The struct should be allocated with av_content_light_metadata_alloc()
- *       and its size is not a part of the public ABI.
- */
-typedef struct AVContentLightMetadata {
-    /**
-     * Max content light level (cd/m^2).
-     */
-    unsigned MaxCLL;
-
-    /**
-     * Max average light level per frame (cd/m^2).
-     */
-    unsigned MaxFALL;
-} AVContentLightMetadata;
-
-/**
- * Allocate an AVContentLightMetadata structure and set its fields to
- * default values. The resulting struct can be freed using av_freep().
- *
- * @return An AVContentLightMetadata filled with default values or NULL
- *         on failure.
- */
-AVContentLightMetadata *av_content_light_metadata_alloc(size_t *size);
-
-/**
- * Allocate a complete AVContentLightMetadata and add it to the frame.
- *
- * @param frame The frame which side data is added to.
- *
- * @return The AVContentLightMetadata structure to be filled by caller.
- */
-AVContentLightMetadata *av_content_light_metadata_create_side_data(AVFrame *frame);
-
-#endif /* AVUTIL_MASTERING_DISPLAY_METADATA_H */

gpac-2.2.1.tar.gz/extra_lib/include/libavutil/mathematics.h Deleted

@@ -1,243 +0,0 @@
-/*
- * copyright (c) 2005-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
- */
-
-/**
- * @file
- * @addtogroup lavu_math
- * Mathematical utilities for working with timestamp and time base.
- */
-
-#ifndef AVUTIL_MATHEMATICS_H
-#define AVUTIL_MATHEMATICS_H
-
-#include <stdint.h>
-#include <math.h>
-#include "attributes.h"
-#include "rational.h"
-#include "intfloat.h"
-
-#ifndef M_E
-#define M_E            2.7182818284590452354   /* e */
-#endif
-#ifndef M_LN2
-#define M_LN2          0.69314718055994530942  /* log_e 2 */
-#endif
-#ifndef M_LN10
-#define M_LN10         2.30258509299404568402  /* log_e 10 */
-#endif
-#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
-#ifndef M_SQRT2
-#define M_SQRT2        1.41421356237309504880  /* sqrt(2) */
-#endif
-#ifndef NAN
-#define NAN            av_int2float(0x7fc00000)
-#endif
-#ifndef INFINITY
-#define INFINITY       av_int2float(0x7f800000)
-#endif
-
-/**
- * @addtogroup lavu_math
- *
- * @{
- */
-
-/**
- * Rounding methods.
- */
-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.
-    /**
-     * Flag telling rescaling functions to pass `INT64_MIN`/`MAX` through
-     * unchanged, avoiding special cases for #AV_NOPTS_VALUE.
-     *
-     * Unlike other values of the enumeration AVRounding, this value is a
-     * bitmask that must be used in conjunction with another value of the
-     * enumeration through a bitwise OR, in order to set behavior for normal
-     * cases.
-     *
-     * @code{.c}
-     * av_rescale_rnd(3, 1, 2, AV_ROUND_UP | AV_ROUND_PASS_MINMAX);
-     * // Rescaling 3:
-     * //     Calculating 3 * 1 / 2
-     * //     3 / 2 is rounded up to 2
-     * //     => 2
-     *
-     * av_rescale_rnd(AV_NOPTS_VALUE, 1, 2, AV_ROUND_UP | AV_ROUND_PASS_MINMAX);
-     * // Rescaling AV_NOPTS_VALUE:
-     * //     AV_NOPTS_VALUE == INT64_MIN
-     * //     AV_NOPTS_VALUE is passed through
-     * //     => AV_NOPTS_VALUE
-     * @endcode
-     */
-    AV_ROUND_PASS_MINMAX = 8192,
-};
-
-/**
- * Compute the greatest common divisor of two integer operands.
- *
- * @param a,b Operands
- * @return GCD of a and b up to sign; if a >= 0 and b >= 0, return value is >= 0;
- * if a == 0 and b == 0, returns 0.
- */
-int64_t av_const av_gcd(int64_t a, int64_t b);
-
-/**
- * Rescale a 64-bit integer with rounding to nearest.
- *
- * The operation is mathematically equivalent to `a * b / c`, but writing that
- * directly can overflow.
- *
- * This function is equivalent to av_rescale_rnd() with #AV_ROUND_NEAR_INF.
- *
- * @see av_rescale_rnd(), av_rescale_q(), av_rescale_q_rnd()
- */
-int64_t av_rescale(int64_t a, int64_t b, int64_t c) av_const;
-
-/**
- * Rescale a 64-bit integer with specified rounding.
- *
- * The operation is mathematically equivalent to `a * b / c`, but writing that
- * directly can overflow, and does not support different rounding methods.
- * If the result is not representable then INT64_MIN is returned.
- *
- * @see av_rescale(), av_rescale_q(), av_rescale_q_rnd()
- */
-int64_t av_rescale_rnd(int64_t a, int64_t b, int64_t c, enum AVRounding rnd) av_const;
-
-/**
- * Rescale a 64-bit integer by 2 rational numbers.
- *
- * The operation is mathematically equivalent to `a * bq / cq`.
- *
- * This function is equivalent to av_rescale_q_rnd() with #AV_ROUND_NEAR_INF.
- *
- * @see av_rescale(), av_rescale_rnd(), av_rescale_q_rnd()
- */
-int64_t av_rescale_q(int64_t a, AVRational bq, AVRational cq) av_const;
-
-/**
- * Rescale a 64-bit integer by 2 rational numbers with specified rounding.
- *
- * The operation is mathematically equivalent to `a * bq / cq`.
- *
- * @see av_rescale(), av_rescale_rnd(), av_rescale_q()
- */
-int64_t av_rescale_q_rnd(int64_t a, AVRational bq, AVRational cq,
-                         enum AVRounding rnd) av_const;
-
-/**
- * Compare two timestamps each in its own time base.
- *
- * @return One of the following values:
- *         - -1 if `ts_a` is before `ts_b`
- *         - 1 if `ts_a` is after `ts_b`
- *         - 0 if they represent the same position
- *
- * @warning
- * The result of the function is undefined if one of the timestamps is outside
- * the `int64_t` range when represented in the other's timebase.
- */
-int av_compare_ts(int64_t ts_a, AVRational tb_a, int64_t ts_b, AVRational tb_b);
-
-/**
- * Compare the remainders of two integer operands divided by a common divisor.
- *
- * In other words, compare the least significant `log2(mod)` bits of integers
- * `a` and `b`.
- *
- * @code{.c}
- * av_compare_mod(0x11, 0x02, 0x10) < 0 // since 0x11 % 0x10  (0x1) < 0x02 % 0x10  (0x2)
- * av_compare_mod(0x11, 0x02, 0x20) > 0 // since 0x11 % 0x20 (0x11) > 0x02 % 0x20 (0x02)
- * @endcode
- *
- * @param a,b Operands
- * @param mod Divisor; must be a power of 2
- * @return
- *         - a negative value if `a % mod < b % mod`
- *         - a positive value if `a % mod > b % mod`
- *         - zero             if `a % mod == b % mod`
- */
-int64_t av_compare_mod(uint64_t a, uint64_t b, uint64_t mod);
-
-/**
- * Rescale a timestamp while preserving known durations.
- *
- * This function is designed to be called per audio packet to scale the input
- * timestamp to a different time base. Compared to a simple av_rescale_q()
- * call, this function is robust against possible inconsistent frame durations.
- *
- * The `last` parameter is a state variable that must be preserved for all
- * subsequent calls for the same stream. For the first call, `*last` should be
- * initialized to #AV_NOPTS_VALUE.
- *
- * @paramin     in_tb    Input time base
- * @paramin     in_ts    Input timestamp
- * @paramin     fs_tb    Duration time base; typically this is finer-grained
- *                         (greater) than `in_tb` and `out_tb`
- * @paramin     duration Duration till the next call to this function (i.e.
- *                         duration of the current packet/frame)
- * @paramin,out last     Pointer to a timestamp expressed in terms of
- *                         `fs_tb`, acting as a state variable
- * @paramin     out_tb   Output timebase
- * @return        Timestamp expressed in terms of `out_tb`
- *
- * @note In the context of this function, "duration" is in term of samples, not
- *       seconds.
- */
-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.
- *
- * @paramin ts     Input timestamp
- * @paramin ts_tb  Input timestamp time base
- * @paramin inc    Value to be added
- * @paramin inc_tb Time base of `inc`
- */
-int64_t av_add_stable(AVRational ts_tb, int64_t ts, AVRational inc_tb, int64_t inc);
-
-
-/**
- * @}
- */
-
-#endif /* AVUTIL_MATHEMATICS_H */

gpac-2.2.1.tar.gz/extra_lib/include/libavutil/md5.h Deleted

@@ -1,89 +0,0 @@
-/*
- * 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
- * @ingroup lavu_md5
- * Public header for MD5 hash function implementation.
- */
-
-#ifndef AVUTIL_MD5_H
-#define AVUTIL_MD5_H
-
-#include <stddef.h>
-#include <stdint.h>
-
-#include "attributes.h"
-
-/**
- * @defgroup lavu_md5 MD5
- * @ingroup lavu_hash
- * MD5 hash function implementation.
- *
- * @{
- */
-
-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, size_t 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, size_t len);
-
-/**
- * @}
- */
-
-#endif /* AVUTIL_MD5_H */

gpac-2.2.1.tar.gz/extra_lib/include/libavutil/mem.h Deleted

@@ -1,697 +0,0 @@
-/*
- * 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
- * @ingroup lavu_mem
- * Memory handling functions
- */
-
-#ifndef AVUTIL_MEM_H
-#define AVUTIL_MEM_H
-
-#include <limits.h>
-#include <stdint.h>
-
-#include "attributes.h"
-#include "avutil.h"
-#include "version.h"
-
-/**
- * @addtogroup lavu_mem
- * Utilities for manipulating memory.
- *
- * FFmpeg has several applications of memory that are not required of a typical
- * program. For example, the computing-heavy components like video decoding and
- * encoding can be sped up significantly through the use of aligned memory.
- *
- * However, for each of FFmpeg's applications of memory, there might not be a
- * recognized or standardized API for that specific use. Memory alignment, for
- * instance, varies wildly depending on operating systems, architectures, and
- * compilers. Hence, this component of @ref libavutil is created to make
- * dealing with memory consistently possible on all platforms.
- *
- * @{
- */
-
-#if FF_API_DECLARE_ALIGNED
-/**
- *
- * @defgroup lavu_mem_macros Alignment Macros
- * Helper macros for declaring aligned variables.
- * @{
- */
-
-/**
- * @def DECLARE_ALIGNED(n,t,v)
- * Declare a variable that is aligned in memory.
- *
- * @code{.c}
- * DECLARE_ALIGNED(16, uint16_t, aligned_int) = 42;
- * DECLARE_ALIGNED(32, uint8_t, aligned_array)128;
- *
- * // The default-alignment equivalent would be
- * uint16_t aligned_int = 42;
- * uint8_t aligned_array128;
- * @endcode
- *
- * @param n Minimum alignment in bytes
- * @param t Type of the variable (or array element)
- * @param v Name of the variable
- */
-
-/**
- * @def DECLARE_ASM_ALIGNED(n,t,v)
- * Declare an aligned variable appropriate for use in inline assembly code.
- *
- * @code{.c}
- * DECLARE_ASM_ALIGNED(16, uint64_t, pw_08) = UINT64_C(0x0008000800080008);
- * @endcode
- *
- * @param n Minimum alignment in bytes
- * @param t Type of the variable (or array element)
- * @param v Name of the variable
- */
-
-/**
- * @def DECLARE_ASM_CONST(n,t,v)
- * Declare a static constant aligned variable appropriate for use in inline
- * assembly code.
- *
- * @code{.c}
- * DECLARE_ASM_CONST(16, uint64_t, pw_08) = UINT64_C(0x0008000800080008);
- * @endcode
- *
- * @param n Minimum alignment in bytes
- * @param t Type of the variable (or array element)
- * @param v Name of the variable
- */
-
-#if defined(__INTEL_COMPILER) && __INTEL_COMPILER < 1110 || defined(__SUNPRO_C)
-    #define DECLARE_ALIGNED(n,t,v)      t __attribute__ ((aligned (n))) v
-    #define DECLARE_ASM_ALIGNED(n,t,v)  t __attribute__ ((aligned (n))) v
-    #define DECLARE_ASM_CONST(n,t,v)    const t __attribute__ ((aligned (n))) v
-#elif defined(__DJGPP__)
-    #define DECLARE_ALIGNED(n,t,v)      t __attribute__ ((aligned (FFMIN(n, 16)))) v
-    #define DECLARE_ASM_ALIGNED(n,t,v)  t av_used __attribute__ ((aligned (FFMIN(n, 16)))) v
-    #define DECLARE_ASM_CONST(n,t,v)    static const t av_used __attribute__ ((aligned (FFMIN(n, 16)))) v
-#elif defined(__GNUC__) || defined(__clang__)
-    #define DECLARE_ALIGNED(n,t,v)      t __attribute__ ((aligned (n))) v
-    #define DECLARE_ASM_ALIGNED(n,t,v)  t av_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_ALIGNED(n,t,v)  __declspec(align(n)) t v
-    #define DECLARE_ASM_CONST(n,t,v)    __declspec(align(n)) static const t v
-#else
-    #define DECLARE_ALIGNED(n,t,v)      t v
-    #define DECLARE_ASM_ALIGNED(n,t,v)  t v
-    #define DECLARE_ASM_CONST(n,t,v)    static const t v
-#endif
-
-/**
- * @}
- */
-#endif
-
-/**
- * @defgroup lavu_mem_attrs Function Attributes
- * Function attributes applicable to memory handling functions.
- *
- * These function attributes can help compilers emit more useful warnings, or
- * generate better code.
- * @{
- */
-
-/**
- * @def av_malloc_attrib
- * Function attribute denoting a malloc-like function.
- *
- * @see <a href="https://gcc.gnu.org/onlinedocs/gcc/Common-Function-Attributes.html#index-g_t_0040code_007bmalloc_007d-function-attribute-3251">Function attribute `malloc` in GCC's documentation</a>
- */
-
-#if AV_GCC_VERSION_AT_LEAST(3,1)
-    #define av_malloc_attrib __attribute__((__malloc__))
-#else
-    #define av_malloc_attrib
-#endif
-
-/**
- * @def av_alloc_size(...)
- * Function attribute used on a function that allocates memory, whose size is
- * given by the specified parameter(s).
- *
- * @code{.c}
- * void *av_malloc(size_t size) av_alloc_size(1);
- * void *av_calloc(size_t nmemb, size_t size) av_alloc_size(1, 2);
- * @endcode
- *
- * @param ... One or two parameter indexes, separated by a comma
- *
- * @see <a href="https://gcc.gnu.org/onlinedocs/gcc/Common-Function-Attributes.html#index-g_t_0040code_007balloc_005fsize_007d-function-attribute-3220">Function attribute `alloc_size` in GCC's documentation</a>
- */
-
-#if AV_GCC_VERSION_AT_LEAST(4,3)
-    #define av_alloc_size(...) __attribute__((alloc_size(__VA_ARGS__)))
-#else
-    #define av_alloc_size(...)
-#endif
-
-/**
- * @}
- */
-
-/**
- * @defgroup lavu_mem_funcs Heap Management
- * Functions responsible for allocating, freeing, and copying memory.
- *
- * All memory allocation functions have a built-in upper limit of `INT_MAX`
- * bytes. This may be changed with av_max_alloc(), although exercise extreme
- * caution when doing so.
- *
- * @{
- */
-
-/**
- * Allocate a memory block 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, or `NULL` if the block cannot
- *         be allocated
- * @see av_mallocz()
- */
-void *av_malloc(size_t size) av_malloc_attrib av_alloc_size(1);
-
-/**
- * Allocate a memory block with alignment suitable for all memory accesses
- * (including vectors if available on the CPU) and 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, or `NULL` if it cannot be allocated
- * @see av_malloc()
- */
-void *av_mallocz(size_t size) av_malloc_attrib av_alloc_size(1);
-
-/**
- * Allocate a memory block for an array with av_malloc().
- *
- * The allocated memory will have size `size * nmemb` bytes.
- *
- * @param nmemb Number of element
- * @param size  Size of a single element
- * @return Pointer to the allocated block, or `NULL` if the block cannot
- *         be allocated
- * @see av_malloc()
- */
-av_alloc_size(1, 2) void *av_malloc_array(size_t nmemb, size_t size);
-
-/**
- * Allocate a memory block for an array with av_mallocz().
- *
- * The allocated memory will have size `size * nmemb` bytes.
- *
- * @param nmemb Number of elements
- * @param size  Size of the single element
- * @return Pointer to the allocated block, or `NULL` if the block cannot
- *         be allocated
- *
- * @see av_mallocz()
- * @see av_malloc_array()
- */
-void *av_calloc(size_t nmemb, size_t size) av_malloc_attrib av_alloc_size(1, 2);
-
-#if FF_API_AV_MALLOCZ_ARRAY
-/**
- * @deprecated use av_calloc()
- */
-attribute_deprecated
-void *av_mallocz_array(size_t nmemb, size_t size) av_malloc_attrib av_alloc_size(1, 2);
-#endif
-
-/**
- * Allocate, reallocate, or free 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`. Otherwise, expand or
- * shrink that block of memory according to `size`.
- *
- * @param ptr  Pointer to a memory block already allocated with
- *             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 Unlike av_malloc(), the returned pointer is not guaranteed to be
- *          correctly aligned.
- * @see av_fast_realloc()
- * @see av_reallocp()
- */
-void *av_realloc(void *ptr, size_t size) av_alloc_size(2);
-
-/**
- * Allocate, reallocate, or free a block of memory through a pointer to a
- * pointer.
- *
- * If `*ptr` is `NULL` and `size` > 0, allocate a new block. If `size` is
- * zero, free the memory block pointed to by `*ptr`. Otherwise, expand or
- * shrink that block of memory according to `size`.
- *
- * @paramin,out ptr  Pointer to a pointer to a memory block already allocated
- *                     with av_realloc(), or a pointer to `NULL`. The pointer
- *                     is updated on success, or freed on failure.
- * @paramin     size Size in bytes for the memory block to be allocated or
- *                     reallocated
- *
- * @return Zero on success, an AVERROR error code on failure
- *
- * @warning Unlike av_malloc(), the allocated memory is not guaranteed to be
- *          correctly aligned.
- */
-av_warn_unused_result
-int av_reallocp(void *ptr, size_t size);
-
-/**
- * Allocate, reallocate, or free a block of memory.
- *
- * This function does the same thing as av_realloc(), except:
- * - It takes two size arguments and allocates `nelem * elsize` bytes,
- *   after checking 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
- *   @code{.c}
- *   buf = realloc(buf);
- *   if (!buf)
- *       return -1;
- *   @endcode
- *   pattern.
- */
-void *av_realloc_f(void *ptr, size_t nelem, size_t elsize);
-
-/**
- * Allocate, reallocate, or free 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 in the array
- * @param size  Size of the single element of the array
- *
- * @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 Unlike av_malloc(), the allocated memory is not guaranteed to be
- *          correctly aligned.
- * @see av_reallocp_array()
- */
-av_alloc_size(2, 3) void *av_realloc_array(void *ptr, size_t nmemb, size_t size);
-
-/**
- * Allocate, reallocate, or free 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`.
- *
- * @paramin,out ptr   Pointer to a pointer to a memory block already
- *                      allocated with av_realloc(), or a pointer to `NULL`.
- *                      The pointer is updated on success, or freed on failure.
- * @paramin     nmemb Number of elements
- * @paramin     size  Size of the single element
- *
- * @return Zero on success, an AVERROR error code on failure
- *
- * @warning Unlike av_malloc(), the allocated memory is not guaranteed to be
- *          correctly aligned.
- */
-int av_reallocp_array(void *ptr, size_t nmemb, size_t size);
-
-/**
- * Reallocate the given buffer if it is not large enough, otherwise do nothing.
- *
- * If the given buffer is `NULL`, then a new uninitialized buffer is allocated.
- *
- * If the given buffer is not large enough, and reallocation fails, `NULL` is
- * returned and `*size` is set to 0, but the original buffer is not changed or
- * freed.
- *
- * A typical use pattern follows:
- *
- * @code{.c}
- * uint8_t *buf = ...;
- * uint8_t *new_buf = av_fast_realloc(buf, &current_size, size_needed);
- * if (!new_buf) {
- *     // Allocation failed; clean up original buffer
- *     av_freep(&buf);
- *     return AVERROR(ENOMEM);
- * }
- * @endcode
- *
- * @paramin,out ptr      Already allocated buffer, or `NULL`
- * @paramin,out size     Pointer to the size of buffer `ptr`. `*size` is
- *                         updated to the new allocated size, in particular 0
- *                         in case of failure.
- * @paramin     min_size Desired minimal size of buffer `ptr`
- * @return `ptr` if the buffer is large enough, a pointer to newly reallocated
- *         buffer if the buffer was not large enough, or `NULL` in case of
- *         error
- * @see av_realloc()
- * @see av_fast_malloc()
- */
-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.
- *
- * `*ptr` is allowed to be `NULL`, in which case allocation always happens if
- * `size_needed` is greater than 0.
- *
- * @code{.c}
- * uint8_t *buf = ...;
- * av_fast_malloc(&buf, &current_size, size_needed);
- * if (!buf) {
- *     // Allocation failed; buf already freed
- *     return AVERROR(ENOMEM);
- * }
- * @endcode
- *
- * @paramin,out ptr      Pointer to pointer to an already allocated buffer.
- *                         `*ptr` will be overwritten with pointer to new
- *                         buffer on success or `NULL` on failure
- * @paramin,out size     Pointer to the size of buffer `*ptr`. `*size` is
- *                         updated to the new allocated size, in particular 0
- *                         in case of failure.
- * @paramin     min_size Desired minimal size of buffer `*ptr`
- * @see av_realloc()
- * @see av_fast_mallocz()
- */
-void av_fast_malloc(void *ptr, unsigned int *size, size_t min_size);
-
-/**
- * Allocate and clear a buffer, reusing the given one if large enough.
- *
- * Like av_fast_malloc(), but all newly allocated space is initially cleared.
- * Reused buffer is not cleared.
- *
- * `*ptr` is allowed to be `NULL`, in which case allocation always happens if
- * `size_needed` is greater than 0.
- *
- * @paramin,out ptr      Pointer to pointer to an already allocated buffer.
- *                         `*ptr` will be overwritten with pointer to new
- *                         buffer on success or `NULL` on failure
- * @paramin,out size     Pointer to the size of buffer `*ptr`. `*size` is
- *                         updated to the new allocated size, in particular 0
- *                         in case of failure.
- * @paramin     min_size Desired minimal size of buffer `*ptr`
- * @see av_fast_malloc()
- */
-void av_fast_mallocz(void *ptr, unsigned int *size, size_t min_size);
-
-/**
- * Free a memory block which has been allocated with a function of av_malloc()
- * or av_realloc() family.
- *
- * @param ptr Pointer to the memory block which should be freed.
- *
- * @note `ptr = NULL` is explicitly allowed.
- * @note It is recommended that you use av_freep() instead, to prevent leaving
- *       behind dangling pointers.
- * @see av_freep()
- */
-void av_free(void *ptr);
-
-/**
- * Free a memory block which has been allocated with a function of av_malloc()
- * or av_realloc() family, and set the pointer pointing to it to `NULL`.
- *
- * @code{.c}
- * uint8_t *buf = av_malloc(16);
- * av_free(buf);
- * // buf now contains a dangling pointer to freed memory, and accidental
- * // dereference of buf will result in a use-after-free, which may be a
- * // security risk.
- *
- * uint8_t *buf = av_malloc(16);
- * av_freep(&buf);
- * // buf is now NULL, and accidental dereference will only result in a
- * // NULL-pointer dereference.
- * @endcode
- *
- * @param ptr Pointer to the pointer to the memory block which should be freed
- * @note `*ptr = NULL` is safe and leads to no action.
- * @see av_free()
- */
-void av_freep(void *ptr);
-
-/**
- * Duplicate a string.
- *
- * @param s String to be duplicated
- * @return Pointer to a newly-allocated string containing a
- *         copy of `s` or `NULL` if the string cannot be allocated
- * @see av_strndup()
- */
-char *av_strdup(const char *s) av_malloc_attrib;
-
-/**
- * Duplicate a substring of a string.
- *
- * @param s   String to be duplicated
- * @param len Maximum length of the resulting string (not counting the
- *            terminating byte)
- * @return Pointer to a newly-allocated string containing a
- *         substring of `s` or `NULL` if the string cannot be allocated
- */
-char *av_strndup(const char *s, size_t len) av_malloc_attrib;
-
-/**
- * Duplicate a buffer with av_malloc().
- *
- * @param p    Buffer to be duplicated
- * @param size Size in bytes of the buffer copied
- * @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);
-
-/**
- * Overlapping memcpy() implementation.
- *
- * @param dst  Destination buffer
- * @param back Number of bytes back to start copying (i.e. the initial size of
- *             the overlapping window); must be > 0
- * @param cnt  Number of bytes to copy; must be >= 0
- *
- * @note `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);
-
-/**
- * @}
- */
-
-/**
- * @defgroup lavu_mem_dynarray Dynamic Array
- *
- * Utilities to make an array grow when needed.
- *
- * Sometimes, the programmer would want to have an array that can grow when
- * needed. The libavutil dynamic array utilities fill that need.
- *
- * libavutil supports two systems of appending elements onto a dynamically
- * allocated array, the first one storing the pointer to the value in the
- * array, and the second storing the value directly. In both systems, the
- * caller is responsible for maintaining a variable containing the length of
- * the array, as well as freeing of the array after use.
- *
- * The first system stores pointers to values in a block of dynamically
- * allocated memory. Since only pointers are stored, the function does not need
- * to know the size of the type. Both av_dynarray_add() and
- * av_dynarray_add_nofree() implement this system.
- *
- * @code
- * type **array = NULL; //< an array of pointers to values
- * int    nb    = 0;    //< a variable to keep track of the length of the array
- *
- * type to_be_added  = ...;
- * type to_be_added2 = ...;
- *
- * av_dynarray_add(&array, &nb, &to_be_added);
- * if (nb == 0)
- *     return AVERROR(ENOMEM);
- *
- * av_dynarray_add(&array, &nb, &to_be_added2);
- * if (nb == 0)
- *     return AVERROR(ENOMEM);
- *
- * // Now:
- * //  nb           == 2
- * // &to_be_added  == array0
- * // &to_be_added2 == array1
- *
- * av_freep(&array);
- * @endcode
- *
- * The second system stores the value directly in a block of memory. As a
- * result, the function has to know the size of the type. av_dynarray2_add()
- * implements this mechanism.
- *
- * @code
- * type *array = NULL; //< an array of values
- * int   nb    = 0;    //< a variable to keep track of the length of the array
- *
- * type to_be_added  = ...;
- * type to_be_added2 = ...;
- *
- * type *addr = av_dynarray2_add((void **)&array, &nb, sizeof(*array), NULL);
- * if (!addr)
- *     return AVERROR(ENOMEM);
- * memcpy(addr, &to_be_added, sizeof(to_be_added));
- *
- * // Shortcut of the above.
- * type *addr = av_dynarray2_add((void **)&array, &nb, sizeof(*array),
- *                               (const void *)&to_be_added2);
- * if (!addr)
- *     return AVERROR(ENOMEM);
- *
- * // Now:
- * //  nb           == 2
- * //  to_be_added  == array0
- * //  to_be_added2 == array1
- *
- * av_freep(&array);
- * @endcode
- *
- * @{
- */
-
-/**
- * Add the pointer to 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.
- *
- * @paramin,out tab_ptr Pointer to the array to grow
- * @paramin,out nb_ptr  Pointer to the number of elements in the array
- * @paramin     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.
- *
- * @return >=0 on success, negative otherwise
- * @see av_dynarray_add(), av_dynarray2_add()
- */
-av_warn_unused_result
-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.
- *
- * @paramin,out tab_ptr   Pointer to the array to grow
- * @paramin,out nb_ptr    Pointer to the number of elements in the array
- * @paramin     elem_size Size in bytes of an element in the array
- * @paramin     elem_data Pointer to the data of the element to add. If
- *                          `NULL`, the space of the newly added element is
- *                          allocated but left uninitialized.
- *
- * @return Pointer to the data of the element to copy in the newly allocated
- *         space
- * @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);
-
-/**
- * @}
- */
-
-/**
- * @defgroup lavu_mem_misc Miscellaneous Functions
- *
- * Other functions related to memory allocation.
- *
- * @{
- */
-
-/**
- * Multiply two `size_t` values checking for overflow.
- *
- * @paramin  a,b Operands of multiplication
- * @paramout r   Pointer to the result of the operation
- * @return 0 on success, AVERROR(EINVAL) on overflow
- */
-int av_size_mult(size_t a, size_t b, size_t *r);
-
-/**
- * Set the maximum size that may be allocated in one block.
- *
- * The value specified with this function is effective for all libavutil's @ref
- * lavu_mem_funcs "heap management functions."
- *
- * By default, the max value is defined as `INT_MAX`.
- *
- * @param max Value to be set as the new maximum size
- *
- * @warning Exercise extreme caution when using this function. Don't touch
- *          this if you do not understand the full consequence of doing so.
- */
-void av_max_alloc(size_t max);
-
-/**
- * @}
- * @}
- */
-
-#endif /* AVUTIL_MEM_H */

gpac-2.2.1.tar.gz/extra_lib/include/libavutil/motion_vector.h Deleted

@@ -1,57 +0,0 @@
-/*
- * 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;
-    /**
-     * Motion vector
-     * src_x = dst_x + motion_x / motion_scale
-     * src_y = dst_y + motion_y / motion_scale
-     */
-    int32_t motion_x, motion_y;
-    uint16_t motion_scale;
-} AVMotionVector;
-
-#endif /* AVUTIL_MOTION_VECTOR_H */

gpac-2.2.1.tar.gz/extra_lib/include/libavutil/murmur3.h Deleted

@@ -1,115 +0,0 @@
-/*
- * 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
- */
-
-/**
- * @file
- * @ingroup lavu_murmur3
- * Public header for MurmurHash3 hash function implementation.
- */
-
-#ifndef AVUTIL_MURMUR3_H
-#define AVUTIL_MURMUR3_H
-
-#include <stddef.h>
-#include <stdint.h>
-
-/**
- * @defgroup lavu_murmur3 Murmur3
- * @ingroup lavu_hash
- * MurmurHash3 hash function implementation.
- *
- * MurmurHash3 is a non-cryptographic hash function, of which three
- * incompatible versions were created by its inventor Austin Appleby:
- *
- * - 32-bit output
- * - 128-bit output for 32-bit platforms
- * - 128-bit output for 64-bit platforms
- *
- * FFmpeg only implements the last variant: 128-bit output designed for 64-bit
- * platforms. Even though the hash function was designed for 64-bit platforms,
- * the function in reality works on 32-bit systems too, only with reduced
- * performance.
- *
- * @anchor lavu_murmur3_seedinfo
- * By design, MurmurHash3 requires a seed to operate. In response to this,
- * libavutil provides two functions for hash initiation, one that requires a
- * seed (av_murmur3_init_seeded()) and one that uses a fixed arbitrary integer
- * as the seed, and therefore does not (av_murmur3_init()).
- *
- * To make hashes comparable, you should provide the same seed for all calls to
- * this hash function -- if you are supplying one yourself, that is.
- *
- * @{
- */
-
-/**
- * Allocate an AVMurMur3 hash context.
- *
- * @return Uninitialized hash context or `NULL` in case of error
- */
-struct AVMurMur3 *av_murmur3_alloc(void);
-
-/**
- * Initialize or reinitialize an AVMurMur3 hash context with a seed.
- *
- * @paramout c    Hash context
- * @paramin  seed Random seed
- *
- * @see av_murmur3_init()
- * @see @ref lavu_murmur3_seedinfo "Detailed description" on a discussion of
- * seeds for MurmurHash3.
- */
-void av_murmur3_init_seeded(struct AVMurMur3 *c, uint64_t seed);
-
-/**
- * Initialize or reinitialize an AVMurMur3 hash context.
- *
- * Equivalent to av_murmur3_init_seeded() with a built-in seed.
- *
- * @paramout c    Hash context
- *
- * @see av_murmur3_init_seeded()
- * @see @ref lavu_murmur3_seedinfo "Detailed description" on a discussion of
- * seeds for MurmurHash3.
- */
-void av_murmur3_init(struct AVMurMur3 *c);
-
-/**
- * Update hash context with new data.
- *
- * @paramout c    Hash context
- * @paramin  src  Input data to update hash with
- * @paramin  len  Number of bytes to read from `src`
- */
-void av_murmur3_update(struct AVMurMur3 *c, const uint8_t *src, size_t len);
-
-/**
- * Finish hashing and output digest value.
- *
- * @paramin,out c    Hash context
- * @paramout    dst  Buffer where output digest value is stored
- */
-void av_murmur3_final(struct AVMurMur3 *c, uint8_t dst16);
-
-/**
- * @}
- */
-
-#endif /* AVUTIL_MURMUR3_H */

gpac-2.2.1.tar.gz/extra_lib/include/libavutil/opt.h Deleted

@@ -1,879 +0,0 @@
-/*
- * 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 {
- *     const 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_mallocz(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_iterate() 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_iterate(void **iter)
- *      {
- *          const AVClass *c = *iter ? NULL : &child_class;
- *          *iter = (void*)(uintptr_t)c;
- *          return c;
- *      }
- *      @endcode
- *      Putting child_next() and child_class_iterate() 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_iterate() are needed. The distinction is that child_next()
- *      iterates over actually existing objects, while child_class_iterate()
- *      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_iterate() 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_iterate() 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 makes it possible 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_UINT64,
-    AV_OPT_TYPE_CONST,
-    AV_OPT_TYPE_IMAGE_SIZE, ///< offset must point to two consecutive integers
-    AV_OPT_TYPE_PIXEL_FMT,
-    AV_OPT_TYPE_SAMPLE_FMT,
-    AV_OPT_TYPE_VIDEO_RATE, ///< offset must point to AVRational
-    AV_OPT_TYPE_DURATION,
-    AV_OPT_TYPE_COLOR,
-    AV_OPT_TYPE_CHANNEL_LAYOUT,
-    AV_OPT_TYPE_BOOL,
-};
-
-/**
- * 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
-#define AV_OPT_FLAG_AUDIO_PARAM     8
-#define AV_OPT_FLAG_VIDEO_PARAM     16
-#define AV_OPT_FLAG_SUBTITLE_PARAM  32
-/**
- * The option is intended 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_BSF_PARAM       (1<<8) ///< a generic parameter which can be set by the user for bit stream filtering
-#define AV_OPT_FLAG_RUNTIME_PARAM   (1<<15) ///< a generic parameter which can be set by the user at runtime
-#define AV_OPT_FLAG_FILTERING_PARAM (1<<16) ///< a generic parameter which can be set by the user for filtering
-#define AV_OPT_FLAG_DEPRECATED      (1<<17) ///< set if option is deprecated, users should refer to AVOption.help text for more information
-#define AV_OPT_FLAG_CHILD_CONSTS    (1<<18) ///< set if option constants can also reside in child objects
-//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 *range3; //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++)
-     *         rangecomponent_index = ranges->rangeranges->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;
-
-/**
- * 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);
-
-/**
- * Set the values of all AVOption fields to their default values. Only these
- * AVOption fields for which (opt->flags & mask) == flags will have their
- * default applied to s.
- *
- * @param s an AVOption-enabled struct (its first member must be a pointer to AVClass)
- * @param mask combination of AV_OPT_FLAG_*
- * @param flags combination of AV_OPT_FLAG_*
- */
-void av_opt_set_defaults2(void *s, int mask, int flags);
-
-/**
- * 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_opt_set() 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   (1 << 0) /**< 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   (1 << 1)
-
-/**
- *  In av_opt_get, return NULL if the option has a pointer type and is set to NULL,
- *  rather than returning an empty string.
- */
-#define AV_OPT_ALLOW_NULL (1 << 2)
-
-/**
- *  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 (1 << 12)
-
-/**
- * Look for an option in an object. Consider only options which
- * have all the specified flags set.
- *
- * @paramin 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.
- * @paramin name The name of the option to look for.
- * @paramin 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_opt_set(). 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.
- *
- * @paramin 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.
- * @paramin name The name of the option to look for.
- * @paramin 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_*.
- * @paramout 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(const 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 iter a pointer where iteration state is stored.
- * @return AVClass corresponding to next potential child or NULL
- */
-const AVClass *av_opt_child_class_iterate(const AVClass *parent, void **iter);
-
-/**
- * @defgroup opt_set_funcs Option setting functions
- * @{
- * Those functions set the field of obj with the given name to value.
- *
- * @paramin obj A struct whose first element is a pointer to an AVClass.
- * @paramin name the name of the field to set
- * @paramin 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.
- * If the field is of a dictionary type, it has to be a ':' separated list of
- * key=value parameters. Values containing ':' special characters must be
- * escaped.
- * @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.
- *
- * @paramin obj a struct whose first element is a pointer to an AVClass.
- * @paramin name name of the option to get.
- * @paramin 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.
- * @paramout 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
- *
- * @note if AV_OPT_ALLOW_NULL is set in search_flags in av_opt_get, and the
- * option is of type AV_OPT_TYPE_STRING, AV_OPT_TYPE_BINARY or AV_OPT_TYPE_DICT
- * and is set to NULL, *out_val will be set to NULL instead of an allocated
- * empty string.
- */
-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);
-/**
- * @paramout 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);
-
-/**
- * Copy options from src object into dest object.
- *
- * The underlying AVClass of both src and dest must coincide. The guarantee
- * below does not apply if this is not fulfilled.
- *
- * Options that require memory allocation (e.g. string or binary) are malloc'ed in dest object.
- * Original memory allocated for such options is freed unless both src and dest options points to the same memory.
- *
- * Even on error it is guaranteed that allocated options from src and dest
- * no longer alias each other afterwards; in particular calling av_opt_free()
- * on both src and dest is safe afterwards if dest has been memdup'ed from src.
- *
- * @param dest Object to copy from
- * @param src  Object to copy into
- * @return 0 on success, negative on error
- */
-int av_opt_copy(void *dest, const 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);
-
-/**
- * Check if given option is set to its default value.
- *
- * Options o must belong to the obj. This function must not be called to check child's options state.
- * @see av_opt_is_set_to_default_by_name().
- *
- * @param obj  AVClass object to check option on
- * @param o    option to be checked
- * @return     >0 when option is set to its default,
- *              0 when option is not set its default,
- *             <0 on error
- */
-int av_opt_is_set_to_default(void *obj, const AVOption *o);
-
-/**
- * Check if given option is set to its default value.
- *
- * @param obj          AVClass object to check option on
- * @param name         option name
- * @param search_flags combination of AV_OPT_SEARCH_*
- * @return             >0 when option is set to its default,
- *                     0 when option is not set its default,
- *                     <0 on error
- */
-int av_opt_is_set_to_default_by_name(void *obj, const char *name, int search_flags);
-
-
-#define AV_OPT_SERIALIZE_SKIP_DEFAULTS              0x00000001  ///< Serialize options that are not set to default values only.
-#define AV_OPT_SERIALIZE_OPT_FLAGS_EXACT            0x00000002  ///< Serialize options that exactly match opt_flags only.
-
-/**
- * Serialize object's options.
- *
- * Create a string containing object's serialized options.
- * Such string may be passed back to av_opt_set_from_string() in order to restore option values.
- * A key/value or pairs separator occurring in the serialized value or
- * name string are escaped through the av_escape() function.
- *
- * @paramin  obj           AVClass object to serialize
- * @paramin  opt_flags     serialize options with all the specified flags set (AV_OPT_FLAG)
- * @paramin  flags         combination of AV_OPT_SERIALIZE_* flags
- * @paramout buffer        Pointer to buffer that will be allocated with string containg serialized options.
- *                           Buffer must be freed by the caller when is no longer needed.
- * @paramin  key_val_sep   character used to separate key from value
- * @paramin  pairs_sep     character used to separate two pairs from each other
- * @return                   >= 0 on success, negative on error
- * @warning Separators cannot be neither '\\' nor '\0'. They also cannot be the same.
- */
-int av_opt_serialize(void *obj, int opt_flags, int flags, char **buffer,
-                     const char key_val_sep, const char pairs_sep);
-/**
- * @}
- */
-
-#endif /* AVUTIL_OPT_H */

gpac-2.2.1.tar.gz/extra_lib/include/libavutil/parseutils.h Deleted

@@ -1,193 +0,0 @@
-/*
- * 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.
- *
- * @paramin,out q pointer to the AVRational which will contain the ratio
- * @paramin str the string to parse: it has to be a string in the format
- * num:den, a float number or an expression
- * @paramin max the maximum allowed numerator and denominator
- * @paramin log_offset log level offset which is applied to the log
- * level of log_ctx
- * @paramin 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.
- *
- * @paramin,out width_ptr pointer to the variable which will contain the detected
- * width value
- * @paramin,out height_ptr pointer to the variable which will contain the detected
- * height value
- * @paramin 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.
- *
- * @paramin,out rate pointer to the AVRational which will contain the detected
- * frame rate
- * @paramin 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|#RRGGBBAA 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);
-
-/**
- * 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);
-
-/**
- * Simplified version of strptime
- *
- * 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().
- *
- * The supported input field descriptors are listed below.
- * - %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'
- * - %T: alias for '%H:%M:%S'
- * - %%: a literal '%'
- *
- * @return a pointer to the first character not processed in this function
- *         call. In case the input string contains more characters than
- *         required by the format string the return value points right after
- *         the last consumed input character. In case the whole input string
- *         is consumed the return value points to the null byte at the end of
- *         the string. On failure NULL is returned.
- */
-char *av_small_strptime(const char *p, const char *fmt, struct tm *dt);
-
-/**
- * Convert the decomposed UTC time in tm to a time_t value.
- */
-time_t av_timegm(struct tm *tm);
-
-#endif /* AVUTIL_PARSEUTILS_H */

gpac-2.2.1.tar.gz/extra_lib/include/libavutil/pixdesc.h Deleted

@@ -1,410 +0,0 @@
-/*
- * 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.
-     */
-    int plane;
-
-    /**
-     * Number of elements between 2 horizontally consecutive pixels.
-     * Elements are bits for bitstream formats, bytes otherwise.
-     */
-    int step;
-
-    /**
-     * Number of elements before the component of the first pixel.
-     * Elements are bits for bitstream formats, bytes otherwise.
-     */
-    int offset;
-
-    /**
-     * Number of least significant bits that must be shifted away
-     * to get the value.
-     */
-    int shift;
-
-    /**
-     * Number of bits in the component.
-     */
-    int depth;
-} 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 = AV_CEIL_RSHIFT(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;
-
-    /**
-     * Amount to shift the luma height right to find the chroma height.
-     * For YV12 this is 1 for example.
-     * chroma_height= AV_CEIL_RSHIFT(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;
-
-    /**
-     * Combination of AV_PIX_FMT_FLAG_... flags.
-     */
-    uint64_t flags;
-
-    /**
-     * Parameters that describe how pixels are packed.
-     * 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.
-     *
-     * If present, the Alpha channel is always the last component.
-     */
-    AVComponentDescriptor comp4;
-
-    /**
-     * 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 data1, 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 has an alpha channel. This is set on all formats that
- * support alpha in some way, including AV_PIX_FMT_PAL8. The alpha is always
- * straight, never pre-multiplied.
- *
- * If a codec or a filter does not support alpha, it should set all alpha to
- * opaque, or use the equivalent pixel formats without alpha component, e.g.
- * AV_PIX_FMT_RGB0 (or AV_PIX_FMT_RGB24 etc.) instead of AV_PIX_FMT_RGBA.
- */
-#define AV_PIX_FMT_FLAG_ALPHA        (1 << 7)
-
-/**
- * The pixel format is following a Bayer pattern
- */
-#define AV_PIX_FMT_FLAG_BAYER        (1 << 8)
-
-/**
- * The pixel format contains IEEE-754 floating point values. Precision (double,
- * single, or half) should be determined by the pixel size (64, 32, or 16 bits).
- */
-#define AV_PIX_FMT_FLAG_FLOAT        (1 << 9)
-
-/**
- * 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.
- *
- * @paramin  pix_fmt the pixel format
- * @paramout h_shift store log2_chroma_w (horizontal/width shift)
- * @paramout v_shift store log2_chroma_h (vertical/height shift)
- *
- * @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);
-
-/**
- * @return the name for provided color range or NULL if unknown.
- */
-const char *av_color_range_name(enum AVColorRange range);
-
-/**
- * @return the AVColorRange value for name or an AVError if not found.
- */
-int av_color_range_from_name(const char *name);
-
-/**
- * @return the name for provided color primaries or NULL if unknown.
- */
-const char *av_color_primaries_name(enum AVColorPrimaries primaries);
-
-/**
- * @return the AVColorPrimaries value for name or an AVError if not found.
- */
-int av_color_primaries_from_name(const char *name);
-
-/**
- * @return the name for provided color transfer or NULL if unknown.
- */
-const char *av_color_transfer_name(enum AVColorTransferCharacteristic transfer);
-
-/**
- * @return the AVColorTransferCharacteristic value for name or an AVError if not found.
- */
-int av_color_transfer_from_name(const char *name);
-
-/**
- * @return the name for provided color space or NULL if unknown.
- */
-const char *av_color_space_name(enum AVColorSpace space);
-
-/**
- * @return the AVColorSpace value for name or an AVError if not found.
- */
-int av_color_space_from_name(const char *name);
-
-/**
- * @return the name for provided chroma location or NULL if unknown.
- */
-const char *av_chroma_location_name(enum AVChromaLocation location);
-
-/**
- * @return the AVChromaLocation value for name or an AVError if not found.
- */
-int av_chroma_location_from_name(const char *name);
-
-/**
- * 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);
-
-/**
- * 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 data1 to dst, rather than the palette indexes in
- * data0. The behavior is undefined if the format is not paletted.
- * @param dst_element_size size of elements in dst array (2 or 4 byte)
- */
-void av_read_image_line2(void *dst, const uint8_t *data4,
-                        const int linesize4, const AVPixFmtDescriptor *desc,
-                        int x, int y, int c, int w, int read_pal_component,
-                        int dst_element_size);
-
-void av_read_image_line(uint16_t *dst, const uint8_t *data4,
-                        const int linesize4, 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
- * @param src_element_size size of elements in src array (2 or 4 byte)
- */
-void av_write_image_line2(const void *src, uint8_t *data4,
-                         const int linesize4, const AVPixFmtDescriptor *desc,
-                         int x, int y, int c, int w, int src_element_size);
-
-void av_write_image_line(const uint16_t *src, uint8_t *data4,
-                         const int linesize4, const AVPixFmtDescriptor *desc,
-                         int x, int y, int c, int w);
-
-/**
- * Utility function to swap the endianness of a pixel format.
- *
- * @paramin  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.
- *
- * @paramin dst_pix_fmt destination pixel format
- * @paramin src_pix_fmt source pixel format
- * @paramin 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.
- *
- * @paramin dst_pix_fmt destination pixel format
- * @paramin src_pix_fmt source pixel format
- * @paramin 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-2.2.1.tar.gz/extra_lib/include/libavutil/pixelutils.h Deleted

@@ -1,52 +0,0 @@
-/*
- * 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(src1x - src2x)
- */
-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-2.2.1.tar.gz/extra_lib/include/libavutil/pixfmt.h Deleted

@@ -1,627 +0,0 @@
-/*
- * 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_PIXFMT_H
-#define AVUTIL_PIXFMT_H
-
-/**
- * @file
- * pixel format definitions
- */
-
-#include "libavutil/avconfig.h"
-#include "version.h"
-
-#define AVPALETTE_SIZE 1024
-#define AVPALETTE_COUNT 256
-
-/**
- * Pixel format.
- *
- * @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.
- *
- * @note
- * If the resolution is not a multiple of the chroma subsampling factor
- * then the chroma plane resolution must be rounded up.
- *
- * @par
- * When the pixel format is palettized RGB32 (AV_PIX_FMT_PAL8), the palettized
- * image data is stored in AVFrame.data0. The palette is transported in
- * AVFrame.data1, is 1024 bytes long (256 4-byte entries) and is
- * formatted the same as in AV_PIX_FMT_RGB32 described above (i.e., it is
- * also endian-specific). Note also that the individual RGB32 palette
- * components stored in AVFrame.data1 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 8 bits per pixel formats, an RGB32 palette is in data1 like
- * for pal8. This palette is filled in automatically by the function
- * allocating the picture.
- */
-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 bits with AV_PIX_FMT_RGB32 palette
-    AV_PIX_FMT_YUVJ420P,  ///< planar YUV 4:2:0, 12bpp, full scale (JPEG), deprecated in favor of AV_PIX_FMT_YUV420P and setting color_range
-    AV_PIX_FMT_YUVJ422P,  ///< planar YUV 4:2:2, 16bpp, full scale (JPEG), deprecated in favor of AV_PIX_FMT_YUV422P and setting color_range
-    AV_PIX_FMT_YUVJ444P,  ///< planar YUV 4:4:4, 24bpp, full scale (JPEG), deprecated in favor of AV_PIX_FMT_YUV444P and setting color_range
-    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 AV_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)
-    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)1X 5R 5G 5B(lsb), big-endian   , X=unused/undefined
-    AV_PIX_FMT_RGB555LE,  ///< packed RGB 5:5:5, 16bpp, (msb)1X 5R 5G 5B(lsb), little-endian, X=unused/undefined
-
-    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)1X 5B 5G 5R(lsb), big-endian   , X=unused/undefined
-    AV_PIX_FMT_BGR555LE,  ///< packed BGR 5:5:5, 16bpp, (msb)1X 5B 5G 5R(lsb), little-endian, X=unused/undefined
-
-    /**
-     *  Hardware acceleration through VA-API, data3 contains a
-     *  VASurfaceID.
-     */
-    AV_PIX_FMT_VAAPI,
-
-    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
-    AV_PIX_FMT_DXVA2_VLD,    ///< HW decoding through DXVA2, Picture.data3 contains a LPDIRECT3DSURFACE9 pointer
-
-    AV_PIX_FMT_RGB444LE,  ///< packed RGB 4:4:4, 16bpp, (msb)4X 4R 4G 4B(lsb), little-endian, X=unused/undefined
-    AV_PIX_FMT_RGB444BE,  ///< packed RGB 4:4:4, 16bpp, (msb)4X 4R 4G 4B(lsb), big-endian,    X=unused/undefined
-    AV_PIX_FMT_BGR444LE,  ///< packed BGR 4:4:4, 16bpp, (msb)4X 4B 4G 4R(lsb), little-endian, X=unused/undefined
-    AV_PIX_FMT_BGR444BE,  ///< packed BGR 4:4:4, 16bpp, (msb)4X 4B 4G 4R(lsb), big-endian,    X=unused/undefined
-    AV_PIX_FMT_YA8,       ///< 8 bits gray, 8 bits 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_GBRP,      ///< planar GBR 4:4:4 24bpp
-    AV_PIX_FMT_GBR24P = AV_PIX_FMT_GBRP, // alias for #AV_PIX_FMT_GBRP
-    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
-    AV_PIX_FMT_YUVA422P,  ///< planar YUV 4:2:2 24bpp, (1 Cr & Cb sample per 2x1 Y & A samples)
-    AV_PIX_FMT_YUVA444P,  ///< 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.data3 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
-
-    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
-
-    AV_PIX_FMT_YVYU422,   ///< packed YUV 4:2:2, 16bpp, Y0 Cr Y1 Cb
-
-    AV_PIX_FMT_YA16BE,       ///< 16 bits gray, 16 bits alpha (big-endian)
-    AV_PIX_FMT_YA16LE,       ///< 16 bits gray, 16 bits alpha (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
-    /**
-     *  HW acceleration through QSV, data3 contains a pointer to the
-     *  mfxFrameSurface1 structure.
-     */
-    AV_PIX_FMT_QSV,
-    /**
-     * HW acceleration though MMAL, data3 contains a pointer to the
-     * MMAL_BUFFER_HEADER_T structure.
-     */
-    AV_PIX_FMT_MMAL,
-
-    AV_PIX_FMT_D3D11VA_VLD,  ///< HW decoding through Direct3D11 via old API, Picture.data3 contains a ID3D11VideoDecoderOutputView pointer
-
-    /**
-     * HW acceleration through CUDA. datai contain CUdeviceptr pointers
-     * exactly as for system memory frames.
-     */
-    AV_PIX_FMT_CUDA,
-
-    AV_PIX_FMT_0RGB,        ///< packed RGB 8:8:8, 32bpp, XRGBXRGB...   X=unused/undefined
-    AV_PIX_FMT_RGB0,        ///< packed RGB 8:8:8, 32bpp, RGBXRGBX...   X=unused/undefined
-    AV_PIX_FMT_0BGR,        ///< packed BGR 8:8:8, 32bpp, XBGRXBGR...   X=unused/undefined
-    AV_PIX_FMT_BGR0,        ///< packed BGR 8:8:8, 32bpp, BGRXBGRX...   X=unused/undefined
-
-    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_YUVJ411P,    ///< planar YUV 4:1:1, 12bpp, (1 Cr & Cb sample per 4x1 Y samples) full scale (JPEG), deprecated in favor of AV_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
-
-    AV_PIX_FMT_XVMC,///< XVideo Motion Acceleration via common packet passing
-
-    AV_PIX_FMT_YUV440P10LE, ///< planar YUV 4:4:0,20bpp, (1 Cr & Cb sample per 1x2 Y samples), little-endian
-    AV_PIX_FMT_YUV440P10BE, ///< planar YUV 4:4:0,20bpp, (1 Cr & Cb sample per 1x2 Y samples), big-endian
-    AV_PIX_FMT_YUV440P12LE, ///< planar YUV 4:4:0,24bpp, (1 Cr & Cb sample per 1x2 Y samples), little-endian
-    AV_PIX_FMT_YUV440P12BE, ///< planar YUV 4:4:0,24bpp, (1 Cr & Cb sample per 1x2 Y samples), big-endian
-    AV_PIX_FMT_AYUV64LE,    ///< packed AYUV 4:4:4,64bpp (1 Cr & Cb sample per 1x1 Y & A samples), little-endian
-    AV_PIX_FMT_AYUV64BE,    ///< packed AYUV 4:4:4,64bpp (1 Cr & Cb sample per 1x1 Y & A samples), big-endian
-
-    AV_PIX_FMT_VIDEOTOOLBOX, ///< hardware decoding through Videotoolbox
-
-    AV_PIX_FMT_P010LE, ///< like NV12, with 10bpp per component, data in the high bits, zeros in the low bits, little-endian
-    AV_PIX_FMT_P010BE, ///< like NV12, with 10bpp per component, data in the high bits, zeros in the low bits, big-endian
-
-    AV_PIX_FMT_GBRAP12BE,  ///< planar GBR 4:4:4:4 48bpp, big-endian
-    AV_PIX_FMT_GBRAP12LE,  ///< planar GBR 4:4:4:4 48bpp, little-endian
-
-    AV_PIX_FMT_GBRAP10BE,  ///< planar GBR 4:4:4:4 40bpp, big-endian
-    AV_PIX_FMT_GBRAP10LE,  ///< planar GBR 4:4:4:4 40bpp, little-endian
-
-    AV_PIX_FMT_MEDIACODEC, ///< hardware decoding through MediaCodec
-
-    AV_PIX_FMT_GRAY12BE,   ///<        Y        , 12bpp, big-endian
-    AV_PIX_FMT_GRAY12LE,   ///<        Y        , 12bpp, little-endian
-    AV_PIX_FMT_GRAY10BE,   ///<        Y        , 10bpp, big-endian
-    AV_PIX_FMT_GRAY10LE,   ///<        Y        , 10bpp, little-endian
-
-    AV_PIX_FMT_P016LE, ///< like NV12, with 16bpp per component, little-endian
-    AV_PIX_FMT_P016BE, ///< like NV12, with 16bpp per component, big-endian
-
-    /**
-     * Hardware surfaces for Direct3D11.
-     *
-     * This is preferred over the legacy AV_PIX_FMT_D3D11VA_VLD. The new D3D11
-     * hwaccel API and filtering support AV_PIX_FMT_D3D11 only.
-     *
-     * data0 contains a ID3D11Texture2D pointer, and data1 contains the
-     * texture array index of the frame as intptr_t if the ID3D11Texture2D is
-     * an array texture (or always 0 if it's a normal texture).
-     */
-    AV_PIX_FMT_D3D11,
-
-    AV_PIX_FMT_GRAY9BE,   ///<        Y        , 9bpp, big-endian
-    AV_PIX_FMT_GRAY9LE,   ///<        Y        , 9bpp, little-endian
-
-    AV_PIX_FMT_GBRPF32BE,  ///< IEEE-754 single precision planar GBR 4:4:4,     96bpp, big-endian
-    AV_PIX_FMT_GBRPF32LE,  ///< IEEE-754 single precision planar GBR 4:4:4,     96bpp, little-endian
-    AV_PIX_FMT_GBRAPF32BE, ///< IEEE-754 single precision planar GBRA 4:4:4:4, 128bpp, big-endian
-    AV_PIX_FMT_GBRAPF32LE, ///< IEEE-754 single precision planar GBRA 4:4:4:4, 128bpp, little-endian
-
-    /**
-     * DRM-managed buffers exposed through PRIME buffer sharing.
-     *
-     * data0 points to an AVDRMFrameDescriptor.
-     */
-    AV_PIX_FMT_DRM_PRIME,
-    /**
-     * Hardware surfaces for OpenCL.
-     *
-     * datai contain 2D image objects (typed in C as cl_mem, used
-     * in OpenCL as image2d_t) for each plane of the surface.
-     */
-    AV_PIX_FMT_OPENCL,
-
-    AV_PIX_FMT_GRAY14BE,   ///<        Y        , 14bpp, big-endian
-    AV_PIX_FMT_GRAY14LE,   ///<        Y        , 14bpp, little-endian
-
-    AV_PIX_FMT_GRAYF32BE,  ///< IEEE-754 single precision Y, 32bpp, big-endian
-    AV_PIX_FMT_GRAYF32LE,  ///< IEEE-754 single precision Y, 32bpp, little-endian
-
-    AV_PIX_FMT_YUVA422P12BE, ///< planar YUV 4:2:2,24bpp, (1 Cr & Cb sample per 2x1 Y samples), 12b alpha, big-endian
-    AV_PIX_FMT_YUVA422P12LE, ///< planar YUV 4:2:2,24bpp, (1 Cr & Cb sample per 2x1 Y samples), 12b alpha, little-endian
-    AV_PIX_FMT_YUVA444P12BE, ///< planar YUV 4:4:4,36bpp, (1 Cr & Cb sample per 1x1 Y samples), 12b alpha, big-endian
-    AV_PIX_FMT_YUVA444P12LE, ///< planar YUV 4:4:4,36bpp, (1 Cr & Cb sample per 1x1 Y samples), 12b alpha, little-endian
-
-    AV_PIX_FMT_NV24,      ///< planar YUV 4:4:4, 24bpp, 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_NV42,      ///< as above, but U and V bytes are swapped
-
-    /**
-     * Vulkan hardware images.
-     *
-     * data0 points to an AVVkFrame
-     */
-    AV_PIX_FMT_VULKAN,
-
-    AV_PIX_FMT_Y210BE,    ///< packed YUV 4:2:2 like YUYV422, 20bpp, data in the high bits, big-endian
-    AV_PIX_FMT_Y210LE,    ///< packed YUV 4:2:2 like YUYV422, 20bpp, data in the high bits, little-endian
-
-    AV_PIX_FMT_X2RGB10LE, ///< packed RGB 10:10:10, 30bpp, (msb)2X 10R 10G 10B(lsb), little-endian, X=unused/undefined
-    AV_PIX_FMT_X2RGB10BE, ///< packed RGB 10:10:10, 30bpp, (msb)2X 10R 10G 10B(lsb), big-endian, X=unused/undefined
-    AV_PIX_FMT_X2BGR10LE, ///< packed BGR 10:10:10, 30bpp, (msb)2X 10B 10G 10R(lsb), little-endian, X=unused/undefined
-    AV_PIX_FMT_X2BGR10BE, ///< packed BGR 10:10:10, 30bpp, (msb)2X 10B 10G 10R(lsb), big-endian, X=unused/undefined
-
-    AV_PIX_FMT_P210BE,      ///< interleaved chroma YUV 4:2:2, 20bpp, data in the high bits, big-endian
-    AV_PIX_FMT_P210LE,      ///< interleaved chroma YUV 4:2:2, 20bpp, data in the high bits, little-endian
-
-    AV_PIX_FMT_P410BE,      ///< interleaved chroma YUV 4:4:4, 30bpp, data in the high bits, big-endian
-    AV_PIX_FMT_P410LE,      ///< interleaved chroma YUV 4:4:4, 30bpp, data in the high bits, little-endian
-
-    AV_PIX_FMT_P216BE,      ///< interleaved chroma YUV 4:2:2, 32bpp, big-endian
-    AV_PIX_FMT_P216LE,      ///< interleaved chroma YUV 4:2:2, 32bpp, liddle-endian
-
-    AV_PIX_FMT_P416BE,      ///< interleaved chroma YUV 4:4:4, 48bpp, big-endian
-    AV_PIX_FMT_P416LE,      ///< interleaved chroma YUV 4:4:4, 48bpp, little-endian
-
-    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 AV_HAVE_BIGENDIAN
-#   define AV_PIX_FMT_NE(be, le) AV_PIX_FMT_##be
-#else
-#   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_GRAY9  AV_PIX_FMT_NE(GRAY9BE,  GRAY9LE)
-#define AV_PIX_FMT_GRAY10 AV_PIX_FMT_NE(GRAY10BE, GRAY10LE)
-#define AV_PIX_FMT_GRAY12 AV_PIX_FMT_NE(GRAY12BE, GRAY12LE)
-#define AV_PIX_FMT_GRAY14 AV_PIX_FMT_NE(GRAY14BE, GRAY14LE)
-#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_YUV440P10 AV_PIX_FMT_NE(YUV440P10BE, YUV440P10LE)
-#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_YUV440P12 AV_PIX_FMT_NE(YUV440P12BE, YUV440P12LE)
-#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_GBRAP10   AV_PIX_FMT_NE(GBRAP10BE,   GBRAP10LE)
-#define AV_PIX_FMT_GBRAP12   AV_PIX_FMT_NE(GBRAP12BE,   GBRAP12LE)
-#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_GBRPF32    AV_PIX_FMT_NE(GBRPF32BE,  GBRPF32LE)
-#define AV_PIX_FMT_GBRAPF32   AV_PIX_FMT_NE(GBRAPF32BE, GBRAPF32LE)
-
-#define AV_PIX_FMT_GRAYF32    AV_PIX_FMT_NE(GRAYF32BE, GRAYF32LE)
-
-#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_YUVA422P12 AV_PIX_FMT_NE(YUVA422P12BE, YUVA422P12LE)
-#define AV_PIX_FMT_YUVA444P12 AV_PIX_FMT_NE(YUVA444P12BE, YUVA444P12LE)
-#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)
-#define AV_PIX_FMT_AYUV64     AV_PIX_FMT_NE(AYUV64BE, AYUV64LE)
-#define AV_PIX_FMT_P010       AV_PIX_FMT_NE(P010BE,  P010LE)
-#define AV_PIX_FMT_P016       AV_PIX_FMT_NE(P016BE,  P016LE)
-
-#define AV_PIX_FMT_Y210       AV_PIX_FMT_NE(Y210BE,  Y210LE)
-#define AV_PIX_FMT_X2RGB10    AV_PIX_FMT_NE(X2RGB10BE, X2RGB10LE)
-#define AV_PIX_FMT_X2BGR10    AV_PIX_FMT_NE(X2BGR10BE, X2BGR10LE)
-
-#define AV_PIX_FMT_P210       AV_PIX_FMT_NE(P210BE, P210LE)
-#define AV_PIX_FMT_P410       AV_PIX_FMT_NE(P410BE, P410LE)
-#define AV_PIX_FMT_P216       AV_PIX_FMT_NE(P216BE, P216LE)
-#define AV_PIX_FMT_P416       AV_PIX_FMT_NE(P416BE, P416LE)
-
-/**
-  * Chromaticity coordinates of the source primaries.
-  * These values match the ones defined by ISO/IEC 23091-2_2019 subclause 8.1 and ITU-T H.273.
-  */
-enum AVColorPrimaries {
-    AVCOL_PRI_RESERVED0   = 0,
-    AVCOL_PRI_BT709       = 1,  ///< also ITU-R BT1361 / IEC 61966-2-4 / SMPTE RP 177 Annex B
-    AVCOL_PRI_UNSPECIFIED = 2,
-    AVCOL_PRI_RESERVED    = 3,
-    AVCOL_PRI_BT470M      = 4,  ///< also FCC Title 47 Code of Federal Regulations 73.682 (a)(20)
-
-    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,  ///< identical to above, also called "SMPTE C" even though it uses D65
-    AVCOL_PRI_FILM        = 8,  ///< colour filters using Illuminant C
-    AVCOL_PRI_BT2020      = 9,  ///< ITU-R BT2020
-    AVCOL_PRI_SMPTE428    = 10, ///< SMPTE ST 428-1 (CIE 1931 XYZ)
-    AVCOL_PRI_SMPTEST428_1 = AVCOL_PRI_SMPTE428,
-    AVCOL_PRI_SMPTE431    = 11, ///< SMPTE ST 431-2 (2011) / DCI P3
-    AVCOL_PRI_SMPTE432    = 12, ///< SMPTE ST 432-1 (2010) / P3 D65 / Display P3
-    AVCOL_PRI_EBU3213     = 22, ///< EBU Tech. 3213-E (nothing there) / one of JEDEC P22 group phosphors
-    AVCOL_PRI_JEDEC_P22   = AVCOL_PRI_EBU3213,
-    AVCOL_PRI_NB                ///< Not part of ABI
-};
-
-/**
- * Color Transfer Characteristic.
- * These values match the ones defined by ISO/IEC 23091-2_2019 subclause 8.2.
- */
-enum AVColorTransferCharacteristic {
-    AVCOL_TRC_RESERVED0    = 0,
-    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_SMPTE2084    = 16, ///< SMPTE ST 2084 for 10-, 12-, 14- and 16-bit systems
-    AVCOL_TRC_SMPTEST2084  = AVCOL_TRC_SMPTE2084,
-    AVCOL_TRC_SMPTE428     = 17, ///< SMPTE ST 428-1
-    AVCOL_TRC_SMPTEST428_1 = AVCOL_TRC_SMPTE428,
-    AVCOL_TRC_ARIB_STD_B67 = 18, ///< ARIB STD-B67, known as "Hybrid log-gamma"
-    AVCOL_TRC_NB                 ///< Not part of ABI
-};
-
-/**
- * YUV colorspace type.
- * These values match the ones defined by ISO/IEC 23091-2_2019 subclause 8.3.
- */
-enum AVColorSpace {
-    AVCOL_SPC_RGB         = 0,  ///< order of coefficients is actually GBR, also IEC 61966-2-1 (sRGB), YZX and ST 428-1
-    AVCOL_SPC_BT709       = 1,  ///< also ITU-R BT1361 / IEC 61966-2-4 xvYCC709 / derived in SMPTE RP 177 Annex B
-    AVCOL_SPC_UNSPECIFIED = 2,
-    AVCOL_SPC_RESERVED    = 3,  ///< reserved for future use by ITU-T and ISO/IEC just like 15-255 are
-    AVCOL_SPC_FCC         = 4,  ///< FCC Title 47 Code of Federal Regulations 73.682 (a)(20)
-    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,  ///< derived from 170M primaries and D65 white point, 170M is derived from BT470 System M's primaries
-    AVCOL_SPC_YCGCO       = 8,  ///< used by Dirac / VC-2 and H.264 FRext, see ITU-T SG16
-    AVCOL_SPC_YCOCG       = AVCOL_SPC_YCGCO,
-    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_SMPTE2085   = 11, ///< SMPTE 2085, Y'D'zD'x
-    AVCOL_SPC_CHROMA_DERIVED_NCL = 12, ///< Chromaticity-derived non-constant luminance system
-    AVCOL_SPC_CHROMA_DERIVED_CL = 13, ///< Chromaticity-derived constant luminance system
-    AVCOL_SPC_ICTCP       = 14, ///< ITU-R BT.2100-0, ICtCp
-    AVCOL_SPC_NB                ///< Not part of ABI
-};
-
-/**
- * Visual content value range.
- *
- * These values are based on definitions that can be found in multiple
- * specifications, such as ITU-T BT.709 (3.4 - Quantization of RGB, luminance
- * and colour-difference signals), ITU-T BT.2020 (Table 5 - Digital
- * Representation) as well as ITU-T BT.2100 (Table 9 - Digital 10- and 12-bit
- * integer representation). At the time of writing, the BT.2100 one is
- * recommended, as it also defines the full range representation.
- *
- * Common definitions:
- *   - For RGB and luma planes such as Y in YCbCr and I in ICtCp,
- *     'E' is the original value in range of 0.0 to 1.0.
- *   - For chroma planes such as Cb,Cr and Ct,Cp, 'E' is the original
- *     value in range of -0.5 to 0.5.
- *   - 'n' is the output bit depth.
- *   - For additional definitions such as rounding and clipping to valid n
- *     bit unsigned integer range, please refer to BT.2100 (Table 9).
- */
-enum AVColorRange {
-    AVCOL_RANGE_UNSPECIFIED = 0,
-
-    /**
-     * Narrow or limited range content.
-     *
-     * - For luma planes:
-     *
-     *       (219 * E + 16) * 2^(n-8)
-     *
-     *   F.ex. the range of 16-235 for 8 bits
-     *
-     * - For chroma planes:
-     *
-     *       (224 * E + 128) * 2^(n-8)
-     *
-     *   F.ex. the range of 16-240 for 8 bits
-     */
-    AVCOL_RANGE_MPEG        = 1,
-
-    /**
-     * Full range content.
-     *
-     * - For RGB and luma planes:
-     *
-     *       (2^n - 1) * E
-     *
-     *   F.ex. the range of 0-255 for 8 bits
-     *
-     * - For chroma planes:
-     *
-     *       (2^n - 1) * E + 2^(n - 1)
-     *
-     *   F.ex. the range of 1-255 for 8 bits
-     */
-    AVCOL_RANGE_JPEG        = 2,
-    AVCOL_RANGE_NB               ///< Not part of ABI
-};
-
-/**
- * Location of chroma samples.
- *
- * Illustration showing the location of the first (top left) chroma sample of the
- * image, the left shows only luma, the right
- * shows the location of the chroma sample, the 2 could be imagined to overlay
- * each other but are drawn separately due to limitations of ASCII
- *
- *                1st 2nd       1st 2nd horizontal luma sample positions
- *                 v   v         v   v
- *                 ______        ______
- *1st luma line > |X   X ...    |3 4 X ...     X are luma samples,
- *                |             |1 2           1-6 are possible chroma positions
- *2nd luma line > |X   X ...    |5 6 X ...     0 is undefined/unknown position
- */
-enum AVChromaLocation {
-    AVCHROMA_LOC_UNSPECIFIED = 0,
-    AVCHROMA_LOC_LEFT        = 1, ///< MPEG-2/4 4:2:0, H.264 default for 4:2:0
-    AVCHROMA_LOC_CENTER      = 2, ///< MPEG-1 4:2:0, JPEG 4:2:0, H.263 4:2:0
-    AVCHROMA_LOC_TOPLEFT     = 3, ///< ITU-R 601, SMPTE 274M 296M S314M(DV 4:1:1), mpeg2 4:2:2
-    AVCHROMA_LOC_TOP         = 4,
-    AVCHROMA_LOC_BOTTOMLEFT  = 5,
-    AVCHROMA_LOC_BOTTOM      = 6,
-    AVCHROMA_LOC_NB               ///< Not part of ABI
-};
-
-#endif /* AVUTIL_PIXFMT_H */

gpac-2.2.1.tar.gz/extra_lib/include/libavutil/random_seed.h Deleted

@@ -1,43 +0,0 @@
-/*
- * 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-2.2.1.tar.gz/extra_lib/include/libavutil/rational.h Deleted

@@ -1,220 +0,0 @@
-/*
- * rational numbers
- * Copyright (c) 2003 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
- * @ingroup lavu_math_rational
- * Utilties for rational number calculation.
- * @author Michael Niedermayer <michaelni@gmx.at>
- */
-
-#ifndef AVUTIL_RATIONAL_H
-#define AVUTIL_RATIONAL_H
-
-#include <stdint.h>
-#include <limits.h>
-#include "attributes.h"
-
-/**
- * @defgroup lavu_math_rational AVRational
- * @ingroup lavu_math
- * Rational number calculation.
- *
- * While rational numbers can be expressed as floating-point numbers, the
- * conversion process is a lossy one, so are floating-point operations. On the
- * other hand, the nature of FFmpeg demands highly accurate calculation of
- * timestamps. This set of rational number utilities serves as a generic
- * interface for manipulating rational numbers as pairs of numerators and
- * denominators.
- *
- * Many of the functions that operate on AVRational's have the suffix `_q`, in
- * reference to the mathematical symbol "ℚ" (Q) which denotes the set of all
- * rational numbers.
- *
- * @{
- */
-
-/**
- * Rational number (pair of numerator and denominator).
- */
-typedef struct AVRational{
-    int num; ///< Numerator
-    int den; ///< Denominator
-} AVRational;
-
-/**
- * Create an AVRational.
- *
- * Useful for compilers that do not support compound literals.
- *
- * @note The return value is not reduced.
- * @see av_reduce()
- */
-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 One of the following values:
- *         - 0 if `a == b`
- *         - 1 if `a > b`
- *         - -1 if `a < b`
- *         - `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 (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;
-}
-
-/**
- * Convert an AVRational to a `double`.
- * @param a AVRational to convert
- * @return `a` in floating-point form
- * @see av_d2q()
- */
-static inline double av_q2d(AVRational a){
-    return a.num / (double) a.den;
-}
-
-/**
- * Reduce a fraction.
- *
- * This is useful for framerate calculations.
- *
- * @paramout dst_num Destination numerator
- * @paramout dst_den Destination denominator
- * @paramin      num Source numerator
- * @paramin      den Source denominator
- * @paramin      max Maximum allowed values for `dst_num` & `dst_den`
- * @return 1 if the operation is exact, 0 otherwise
- */
-int av_reduce(int *dst_num, int *dst_den, int64_t num, int64_t den, int64_t max);
-
-/**
- * Multiply two rationals.
- * @param b First rational
- * @param c Second rational
- * @return b*c
- */
-AVRational av_mul_q(AVRational b, AVRational c) av_const;
-
-/**
- * Divide one rational by another.
- * @param b First rational
- * @param c Second rational
- * @return b/c
- */
-AVRational av_div_q(AVRational b, AVRational c) av_const;
-
-/**
- * Add two rationals.
- * @param b First rational
- * @param c Second rational
- * @return b+c
- */
-AVRational av_add_q(AVRational b, AVRational c) av_const;
-
-/**
- * Subtract one rational from another.
- * @param b First rational
- * @param c Second rational
- * @return b-c
- */
-AVRational av_sub_q(AVRational b, AVRational c) av_const;
-
-/**
- * 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.
- *
- * In case of infinity, the returned value is expressed as `{1, 0}` or
- * `{-1, 0}` depending on the sign.
- *
- * @param d   `double` to convert
- * @param max Maximum allowed numerator and denominator
- * @return `d` in AVRational form
- * @see av_q2d()
- */
-AVRational av_d2q(double d, int max) av_const;
-
-/**
- * Find which of the two rationals is closer to another rational.
- *
- * @param q     Rational to be compared against
- * @param q1,q2 Rationals to be tested
- * @return One of the following values:
- *         - 1 if `q1` is nearer to `q` than `q2`
- *         - -1 if `q2` is nearer to `q` than `q1`
- *         - 0 if they have the same distance
- */
-int av_nearer_q(AVRational q, AVRational q1, AVRational q2);
-
-/**
- * Find the value in a list of rationals nearest a given reference rational.
- *
- * @param q      Reference rational
- * @param q_list Array of rationals terminated by `{0, 0}`
- * @return Index of the nearest value found in the array
- */
-int av_find_nearest_q_idx(AVRational q, const AVRational* q_list);
-
-/**
- * Convert an AVRational to a IEEE 32-bit `float` expressed in fixed-point
- * format.
- *
- * @param q Rational to be converted
- * @return Equivalent floating-point value, expressed as an unsigned 32-bit
- *         integer.
- * @note The returned value is platform-indepedant.
- */
-uint32_t av_q2intfloat(AVRational q);
-
-/**
- * Return the best rational so that a and b are multiple of it.
- * If the resulting denominator is larger than max_den, return def.
- */
-AVRational av_gcd_q(AVRational a, AVRational b, int max_den, AVRational def);
-
-/**
- * @}
- */
-
-#endif /* AVUTIL_RATIONAL_H */

gpac-2.2.1.tar.gz/extra_lib/include/libavutil/rc4.h Deleted

@@ -1,66 +0,0 @@
-/*
- * RC4 encryption/decryption/pseudo-random number generator
- *
- * 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_RC4_H
-#define AVUTIL_RC4_H
-
-#include <stdint.h>
-
-/**
- * @defgroup lavu_rc4 RC4
- * @ingroup lavu_crypto
- * @{
- */
-
-typedef struct AVRC4 {
-    uint8_t state256;
-    int x, y;
-} AVRC4;
-
-/**
- * Allocate an AVRC4 context.
- */
-AVRC4 *av_rc4_alloc(void);
-
-/**
- * @brief Initializes an AVRC4 context.
- *
- * @param key_bits must be a multiple of 8
- * @param decrypt 0 for encryption, 1 for decryption, currently has no effect
- * @return zero on success, negative value otherwise
- */
-int av_rc4_init(struct AVRC4 *d, const uint8_t *key, int key_bits, int decrypt);
-
-/**
- * @brief Encrypts / decrypts using the RC4 algorithm.
- *
- * @param count number of bytes
- * @param dst destination array, can be equal to src
- * @param src source array, can be equal to dst, may be NULL
- * @param iv not (yet) used for RC4, should be NULL
- * @param decrypt 0 for encryption, 1 for decryption, not (yet) used
- */
-void av_rc4_crypt(struct AVRC4 *d, uint8_t *dst, const uint8_t *src, int count, uint8_t *iv, int decrypt);
-
-/**
- * @}
- */
-
-#endif /* AVUTIL_RC4_H */

gpac-2.2.1.tar.gz/extra_lib/include/libavutil/replaygain.h Deleted

@@ -1,50 +0,0 @@
-/*
- * 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-2.2.1.tar.gz/extra_lib/include/libavutil/ripemd.h Deleted

@@ -1,83 +0,0 @@
-/*
- * 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
- */
-
-/**
- * @file
- * @ingroup lavu_ripemd
- * Public header for RIPEMD hash function implementation.
- */
-
-#ifndef AVUTIL_RIPEMD_H
-#define AVUTIL_RIPEMD_H
-
-#include <stddef.h>
-#include <stdint.h>
-
-#include "attributes.h"
-
-/**
- * @defgroup lavu_ripemd RIPEMD
- * @ingroup lavu_hash
- * RIPEMD hash function implementation.
- *
- * @{
- */
-
-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, size_t 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-2.2.1.tar.gz/extra_lib/include/libavutil/samplefmt.h Deleted

@@ -1,271 +0,0 @@
-/*
- * 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_S64,         ///< signed 64 bits
-    AV_SAMPLE_FMT_S64P,        ///< signed 64 bits, 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);
-
-/**
- * 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.
- *
- * @paramout 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.
- *
- * @paramout audio_data  array to be filled with the pointer for each channel
- * @paramout 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                 minimum size in bytes required for the buffer on success,
- *                         or a negative error code on failure
- */
-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_data0)
- * Allocated data will be initialized to silence.
- *
- * @see enum AVSampleFormat
- * The documentation for AVSampleFormat describes the data layout.
- *
- * @paramout audio_data  array to be filled with the pointer for each channel
- * @paramout 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-2.2.1.tar.gz/extra_lib/include/libavutil/sha.h Deleted

@@ -1,90 +0,0 @@
-/*
- * 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
- */
-
-/**
- * @file
- * @ingroup lavu_sha
- * Public header for SHA-1 & SHA-256 hash function implementations.
- */
-
-#ifndef AVUTIL_SHA_H
-#define AVUTIL_SHA_H
-
-#include <stddef.h>
-#include <stdint.h>
-
-#include "attributes.h"
-
-/**
- * @defgroup lavu_sha SHA
- * @ingroup lavu_hash
- * SHA-1 and SHA-256 (Secure Hash Algorithm) hash function implementations.
- *
- * This module supports the following SHA hash functions:
- *
- * - SHA-1: 160 bits
- * - SHA-224: 224 bits, as a variant of SHA-2
- * - SHA-256: 256 bits, as a variant of SHA-2
- *
- * @see For SHA-384, SHA-512, and variants thereof, see @ref lavu_sha512.
- *
- * @{
- */
-
-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 ctx     hash function context
- * @param data    input data to update hash with
- * @param len     input data length
- */
-void av_sha_update(struct AVSHA *ctx, const uint8_t *data, size_t 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-2.2.1.tar.gz/extra_lib/include/libavutil/sha512.h Deleted

@@ -1,92 +0,0 @@
-/*
- * 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
- */
-
-/**
- * @file
- * @ingroup lavu_sha512
- * Public header for SHA-512 implementation.
- */
-
-#ifndef AVUTIL_SHA512_H
-#define AVUTIL_SHA512_H
-
-#include <stddef.h>
-#include <stdint.h>
-
-#include "attributes.h"
-
-/**
- * @defgroup lavu_sha512 SHA-512
- * @ingroup lavu_hash
- * SHA-512 (Secure Hash Algorithm) hash function implementations.
- *
- * This module supports the following SHA-2 hash functions:
- *
- * - SHA-512/224: 224 bits
- * - SHA-512/256: 256 bits
- * - SHA-384: 384 bits
- * - SHA-512: 512 bits
- *
- * @see For SHA-1, SHA-256, and variants thereof, see @ref lavu_sha.
- *
- * @{
- */
-
-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, size_t 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-2.2.1.tar.gz/extra_lib/include/libavutil/spherical.h Deleted

@@ -1,232 +0,0 @@
-/*
- * Copyright (c) 2016 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
- */
-
-/**
- * @file
- * Spherical video
- */
-
-#ifndef AVUTIL_SPHERICAL_H
-#define AVUTIL_SPHERICAL_H
-
-#include <stddef.h>
-#include <stdint.h>
-
-/**
- * @addtogroup lavu_video
- * @{
- *
- * @defgroup lavu_video_spherical Spherical video mapping
- * @{
- */
-
-/**
- * @addtogroup lavu_video_spherical
- * A spherical video file contains surfaces that need to be mapped onto a
- * sphere. Depending on how the frame was converted, a different distortion
- * transformation or surface recomposition function needs to be applied before
- * the video should be mapped and displayed.
- */
-
-/**
- * Projection of the video surface(s) on a sphere.
- */
-enum AVSphericalProjection {
-    /**
-     * Video represents a sphere mapped on a flat surface using
-     * equirectangular projection.
-     */
-    AV_SPHERICAL_EQUIRECTANGULAR,
-
-    /**
-     * Video frame is split into 6 faces of a cube, and arranged on a
-     * 3x2 layout. Faces are oriented upwards for the front, left, right,
-     * and back faces. The up face is oriented so the top of the face is
-     * forwards and the down face is oriented so the top of the face is
-     * to the back.
-     */
-    AV_SPHERICAL_CUBEMAP,
-
-    /**
-     * Video represents a portion of a sphere mapped on a flat surface
-     * using equirectangular projection. The @ref bounding fields indicate
-     * the position of the current video in a larger surface.
-     */
-    AV_SPHERICAL_EQUIRECTANGULAR_TILE,
-};
-
-/**
- * This structure describes how to handle spherical videos, outlining
- * information about projection, initial layout, and any other view modifier.
- *
- * @note The struct must be allocated with av_spherical_alloc() and
- *       its size is not a part of the public ABI.
- */
-typedef struct AVSphericalMapping {
-    /**
-     * Projection type.
-     */
-    enum AVSphericalProjection projection;
-
-    /**
-     * @name Initial orientation
-     * @{
-     * There fields describe additional rotations applied to the sphere after
-     * the video frame is mapped onto it. The sphere is rotated around the
-     * viewer, who remains stationary. The order of transformation is always
-     * yaw, followed by pitch, and finally by roll.
-     *
-     * The coordinate system matches the one defined in OpenGL, where the
-     * forward vector (z) is coming out of screen, and it is equivalent to
-     * a rotation matrix of R = r_y(yaw) * r_x(pitch) * r_z(roll).
-     *
-     * A positive yaw rotates the portion of the sphere in front of the viewer
-     * toward their right. A positive pitch rotates the portion of the sphere
-     * in front of the viewer upwards. A positive roll tilts the portion of
-     * the sphere in front of the viewer to the viewer's right.
-     *
-     * These values are exported as 16.16 fixed point.
-     *
-     * See this equirectangular projection as example:
-     *
-     * @code{.unparsed}
-     *                   Yaw
-     *     -180           0           180
-     *   90 +-------------+-------------+  180
-     *      |             |             |                  up
-     * P    |             |             |                 y|    forward
-     * i    |             ^             |                  |   /z
-     * t  0 +-------------X-------------+    0 Roll        |  /
-     * c    |             |             |                  | /
-     * h    |             |             |                 0|/_____right
-     *      |             |             |                        x
-     *  -90 +-------------+-------------+ -180
-     *
-     * X - the default camera center
-     * ^ - the default up vector
-     * @endcode
-     */
-    int32_t yaw;   ///< Rotation around the up vector -180, 180.
-    int32_t pitch; ///< Rotation around the right vector -90, 90.
-    int32_t roll;  ///< Rotation around the forward vector -180, 180.
-    /**
-     * @}
-     */
-
-    /**
-     * @name Bounding rectangle
-     * @anchor bounding
-     * @{
-     * These fields indicate the location of the current tile, and where
-     * it should be mapped relative to the original surface. They are
-     * exported as 0.32 fixed point, and can be converted to classic
-     * pixel values with av_spherical_bounds().
-     *
-     * @code{.unparsed}
-     *      +----------------+----------+
-     *      |                |bound_top |
-     *      |            +--------+     |
-     *      | bound_left |tile    |     |
-     *      +<---------->|        |<--->+bound_right
-     *      |            +--------+     |
-     *      |                |          |
-     *      |    bound_bottom|          |
-     *      +----------------+----------+
-     * @endcode
-     *
-     * If needed, the original video surface dimensions can be derived
-     * by adding the current stream or frame size to the related bounds,
-     * like in the following example:
-     *
-     * @code{c}
-     *     original_width  = tile->width  + bound_left + bound_right;
-     *     original_height = tile->height + bound_top  + bound_bottom;
-     * @endcode
-     *
-     * @note These values are valid only for the tiled equirectangular
-     *       projection type (@ref AV_SPHERICAL_EQUIRECTANGULAR_TILE),
-     *       and should be ignored in all other cases.
-     */
-    uint32_t bound_left;   ///< Distance from the left edge
-    uint32_t bound_top;    ///< Distance from the top edge
-    uint32_t bound_right;  ///< Distance from the right edge
-    uint32_t bound_bottom; ///< Distance from the bottom edge
-    /**
-     * @}
-     */
-
-    /**
-     * Number of pixels to pad from the edge of each cube face.
-     *
-     * @note This value is valid for only for the cubemap projection type
-     *       (@ref AV_SPHERICAL_CUBEMAP), and should be ignored in all other
-     *       cases.
-     */
-    uint32_t padding;
-} AVSphericalMapping;
-
-/**
- * Allocate a AVSphericalVideo structure and initialize its fields to default
- * values.
- *
- * @return the newly allocated struct or NULL on failure
- */
-AVSphericalMapping *av_spherical_alloc(size_t *size);
-
-/**
- * Convert the @ref bounding fields from an AVSphericalVideo
- * from 0.32 fixed point to pixels.
- *
- * @param map    The AVSphericalVideo map to read bound values from.
- * @param width  Width of the current frame or stream.
- * @param height Height of the current frame or stream.
- * @param left   Pixels from the left edge.
- * @param top    Pixels from the top edge.
- * @param right  Pixels from the right edge.
- * @param bottom Pixels from the bottom edge.
- */
-void av_spherical_tile_bounds(const AVSphericalMapping *map,
-                              size_t width, size_t height,
-                              size_t *left, size_t *top,
-                              size_t *right, size_t *bottom);
-
-/**
- * Provide a human-readable name of a given AVSphericalProjection.
- *
- * @param projection The input AVSphericalProjection.
- *
- * @return The name of the AVSphericalProjection, or "unknown".
- */
-const char *av_spherical_projection_name(enum AVSphericalProjection projection);
-
-/**
- * Get the AVSphericalProjection form a human-readable name.
- *
- * @param name The input string.
- *
- * @return The AVSphericalProjection value, or -1 if not found.
- */
-int av_spherical_from_name(const char *name);
-/**
- * @}
- * @}
- */
-
-#endif /* AVUTIL_SPHERICAL_H */

gpac-2.2.1.tar.gz/extra_lib/include/libavutil/stereo3d.h Deleted

@@ -1,233 +0,0 @@
-/*
- * 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
- */
-
-/**
- * @file
- * Stereoscopic video
- */
-
-#ifndef AVUTIL_STEREO3D_H
-#define AVUTIL_STEREO3D_H
-
-#include <stdint.h>
-
-#include "frame.h"
-
-/**
- * @addtogroup lavu_video
- * @{
- *
- * @defgroup lavu_video_stereo3d Stereo3D types and functions
- * @{
- */
-
-/**
- * @addtogroup lavu_video_stereo3d
- * A stereoscopic video file consists in multiple views embedded in a single
- * frame, usually describing two views of a scene. This file describes all
- * possible codec-independent view arrangements.
- * */
-
-/**
- * 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.
-     *
-     * @code{.unparsed}
-     *    LLLLRRRR
-     *    LLLLRRRR
-     *    LLLLRRRR
-     *    ...
-     * @endcode
-     */
-    AV_STEREO3D_SIDEBYSIDE,
-
-    /**
-     * Views are on top of each other.
-     *
-     * @code{.unparsed}
-     *    LLLLLLLL
-     *    LLLLLLLL
-     *    RRRRRRRR
-     *    RRRRRRRR
-     * @endcode
-     */
-    AV_STEREO3D_TOPBOTTOM,
-
-    /**
-     * Views are alternated temporally.
-     *
-     * @code{.unparsed}
-     *     frame0   frame1   frame2   ...
-     *    LLLLLLLL RRRRRRRR LLLLLLLL
-     *    LLLLLLLL RRRRRRRR LLLLLLLL
-     *    LLLLLLLL RRRRRRRR LLLLLLLL
-     *    ...      ...      ...
-     * @endcode
-     */
-    AV_STEREO3D_FRAMESEQUENCE,
-
-    /**
-     * Views are packed in a checkerboard-like structure per pixel.
-     *
-     * @code{.unparsed}
-     *    LRLRLRLR
-     *    RLRLRLRL
-     *    LRLRLRLR
-     *    ...
-     * @endcode
-     */
-    AV_STEREO3D_CHECKERBOARD,
-
-    /**
-     * Views are next to each other, but when upscaling
-     * apply a checkerboard pattern.
-     *
-     * @code{.unparsed}
-     *     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
-     * @endcode
-     */
-    AV_STEREO3D_SIDEBYSIDE_QUINCUNX,
-
-    /**
-     * Views are packed per line, as if interlaced.
-     *
-     * @code{.unparsed}
-     *    LLLLLLLL
-     *    RRRRRRRR
-     *    LLLLLLLL
-     *    ...
-     * @endcode
-     */
-    AV_STEREO3D_LINES,
-
-    /**
-     * Views are packed per column.
-     *
-     * @code{.unparsed}
-     *    LRLRLRLR
-     *    LRLRLRLR
-     *    LRLRLRLR
-     *    ...
-     * @endcode
-     */
-    AV_STEREO3D_COLUMNS,
-};
-
-/**
- * List of possible view types.
- */
-enum AVStereo3DView {
-    /**
-     * Frame contains two packed views.
-     */
-    AV_STEREO3D_VIEW_PACKED,
-
-    /**
-     * Frame contains only the left view.
-     */
-    AV_STEREO3D_VIEW_LEFT,
-
-    /**
-     * Frame contains only the right view.
-     */
-    AV_STEREO3D_VIEW_RIGHT,
-};
-
-/**
- * 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;
-
-    /**
-     * Determines which views are packed.
-     */
-    enum AVStereo3DView view;
-} 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);
-
-/**
- * Provide a human-readable name of a given stereo3d type.
- *
- * @param type The input stereo3d type value.
- *
- * @return The name of the stereo3d value, or "unknown".
- */
-const char *av_stereo3d_type_name(unsigned int type);
-
-/**
- * Get the AVStereo3DType form a human-readable name.
- *
- * @param name The input string.
- *
- * @return The AVStereo3DType value, or -1 if not found.
- */
-int av_stereo3d_from_name(const char *name);
-
-/**
- * @}
- * @}
- */
-
-#endif /* AVUTIL_STEREO3D_H */

gpac-2.2.1.tar.gz/extra_lib/include/libavutil/tea.h Deleted

@@ -1,71 +0,0 @@
-/*
- * A 32-bit implementation of the TEA algorithm
- * Copyright (c) 2015 Vesselin Bontchev
- *
- * 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_TEA_H
-#define AVUTIL_TEA_H
-
-#include <stdint.h>
-
-/**
- * @file
- * @brief Public header for libavutil TEA algorithm
- * @defgroup lavu_tea TEA
- * @ingroup lavu_crypto
- * @{
- */
-
-extern const int av_tea_size;
-
-struct AVTEA;
-
-/**
-  * Allocate an AVTEA context
-  * To free the struct: av_free(ptr)
-  */
-struct AVTEA *av_tea_alloc(void);
-
-/**
- * Initialize an AVTEA context.
- *
- * @param ctx an AVTEA context
- * @param key a key of 16 bytes used for encryption/decryption
- * @param rounds the number of rounds in TEA (64 is the "standard")
- */
-void av_tea_init(struct AVTEA *ctx, const uint8_t key16, int rounds);
-
-/**
- * Encrypt or decrypt a buffer using a previously initialized context.
- *
- * @param ctx an AVTEA 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_tea_crypt(struct AVTEA *ctx, uint8_t *dst, const uint8_t *src,
-                  int count, uint8_t *iv, int decrypt);
-
-/**
- * @}
- */
-
-#endif /* AVUTIL_TEA_H */

gpac-2.2.1.tar.gz/extra_lib/include/libavutil/threadmessage.h Deleted

@@ -1,115 +0,0 @@
-/*
- * 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_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_send(AVThreadMessageQueue *mq,
-                                          int err);
-
-/**
- * Set the receiving 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_recv(AVThreadMessageQueue *mq,
-                                          int err);
-
-/**
- * Set the optional free message callback function which will be called if an
- * operation is removing messages from the queue.
- */
-void av_thread_message_queue_set_free_func(AVThreadMessageQueue *mq,
-                                           void (*free_func)(void *msg));
-
-/**
- * Return the current number of messages in the queue.
- *
- * @return the current number of messages or AVERROR(ENOSYS) if lavu was built
- *         without thread support
- */
-int av_thread_message_queue_nb_elems(AVThreadMessageQueue *mq);
-
-/**
- * Flush the message queue
- *
- * This function is mostly equivalent to reading and free-ing every message
- * except that it will be done in a single operation (no lock/unlock between
- * reads).
- */
-void av_thread_message_flush(AVThreadMessageQueue *mq);
-
-#endif /* AVUTIL_THREADMESSAGE_H */

gpac-2.2.1.tar.gz/extra_lib/include/libavutil/time.h Deleted

@@ -1,56 +0,0 @@
-/*
- * 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.
- * The returned values may not be monotonic on platforms where a monotonic
- * clock is not available.
- */
-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-2.2.1.tar.gz/extra_lib/include/libavutil/timecode.h Deleted

@@ -1,199 +0,0 @@
-/*
- * 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 23
-
-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, multiples of 30
- * @return         adjusted frame number
- * @warning        adjustment is only valid for multiples of NTSC 29.97
- */
-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
- *
- * See SMPTE ST 314M-2005 Sec 4.4.2.2.1 "Time code pack (TC)"
- * the format description as follows:
- * bits 0-5:   hours, in BCD(6bits)
- * bits 6:     BGF1
- * bits 7:     BGF2 (NTSC) or FIELD (PAL)
- * bits 8-14:  minutes, in BCD(7bits)
- * bits 15:    BGF0 (NTSC) or BGF2 (PAL)
- * bits 16-22: seconds, in BCD(7bits)
- * bits 23:    FIELD (NTSC) or BGF0 (PAL)
- * bits 24-29: frames, in BCD(6bits)
- * bits 30:    drop  frame flag (0: non drop,    1: drop)
- * bits 31:    color frame flag (0: unsync mode, 1: sync mode)
- * @note BCD numbers (6 or 7 bits): 4 or 5 lower bits for units, 2 higher bits for tens.
- * @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) and binary group flags (BGF) bits are set to zero.
- */
-uint32_t av_timecode_get_smpte_from_framenum(const AVTimecode *tc, int framenum);
-
-/**
- * Convert sei info to SMPTE 12M binary representation.
- *
- * @param rate     frame rate in rational form
- * @param drop     drop flag
- * @param hh       hour
- * @param mm       minute
- * @param ss       second
- * @param ff       frame number
- * @return         the SMPTE binary representation
- */
-uint32_t av_timecode_get_smpte(AVRational rate, int drop, int hh, int mm, int ss, int ff);
-
-/**
- * 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.
- *
- * In contrast to av_timecode_make_smpte_tc_string this function supports 50/60
- * fps timecodes by using the field bit.
- *
- * @param buf        destination buffer, must be at least AV_TIMECODE_STR_SIZE long
- * @param rate       frame rate of the timecode
- * @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
- * @param skip_field prevent the use of a field flag when it is known the field
- *                   bit is arbitrary (e.g. because it is used as PC flag)
- * @return           the buf parameter
- */
-char *av_timecode_make_smpte_tc_string2(char *buf, AVRational rate, uint32_t tcsmpte, int prevent_df, int skip_field);
-
-/**
- * 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);
-
-/**
- * Init a timecode struct from the passed timecode components.
- *
- * @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 hh          hours
- * @param mm          minutes
- * @param ss          seconds
- * @param ff          frames
- * @return            0 on success, AVERROR otherwise
- */
-int av_timecode_init_from_components(AVTimecode *tc, AVRational rate, int flags, int hh, int mm, int ss, int ff, 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-2.2.1.tar.gz/extra_lib/include/libavutil/timestamp.h Deleted

@@ -1,78 +0,0 @@
-/*
- * 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((charAV_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((charAV_TS_MAX_STRING_SIZE){0}, ts, tb)
-
-#endif /* AVUTIL_TIMESTAMP_H */

gpac-2.2.1.tar.gz/extra_lib/include/libavutil/tree.h Deleted

@@ -1,137 +0,0 @@
-/*
- * 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
- * A tree container.
- * @author Michael Niedermayer <michaelni@gmx.at>
- */
-
-#ifndef AVUTIL_TREE_H
-#define AVUTIL_TREE_H
-
-#include "attributes.h"
-
-/**
- * @addtogroup lavu_tree AVTree
- * @ingroup lavu_data
- *
- * Low-complexity tree container
- *
- * Insertion, removal, finding equal, largest which is smaller than and
- * smallest which is larger than, all have O(log n) worst-case complexity.
- * @{
- */
-
-
-struct AVTreeNode;
-extern const int av_tree_node_size;
-
-/**
- * Allocate an AVTreeNode.
- */
-struct AVTreeNode *av_tree_node_alloc(void);
-
-/**
- * Find an element.
- * @param root a pointer to the root node of the tree
- * @param next If next is not NULL, then next0 will contain the previous
- *             element and next1 the next element. If either does not exist,
- *             then the corresponding entry in next is unchanged.
- * @param cmp compare function used to compare elements in the tree,
- *            API identical to that of Standard C's qsort
- *            It is guaranteed that the first and only the first argument to cmp()
- *            will be the key parameter to av_tree_find(), thus it could if the
- *            user wants, be a different type (like an opaque context).
- * @return An element with cmp(key, elem) == 0 or NULL if no such element
- *         exists in the tree.
- */
-void *av_tree_find(const struct AVTreeNode *root, void *key,
-                   int (*cmp)(const void *key, const void *b), void *next2);
-
-/**
- * Insert or remove an element.
- *
- * If *next is NULL, then the supplied element will be removed if it exists.
- * If *next is non-NULL, then the supplied element will be inserted, unless
- * it already exists in the tree.
- *
- * @param rootp A pointer to a pointer to the root node of the tree; note that
- *              the root node can change during insertions, this is required
- *              to keep the tree balanced.
- * @param key  pointer to the element key to insert in the tree
- * @param next Used to allocate and free AVTreeNodes. For insertion the user
- *             must set it to an allocated and zeroed object of at least
- *             av_tree_node_size bytes size. av_tree_insert() will set it to
- *             NULL if it has been consumed.
- *             For deleting elements *next is set to NULL by the user and
- *             av_tree_insert() will set it to the AVTreeNode which was
- *             used for the removed element.
- *             This allows the use of flat arrays, which have
- *             lower overhead compared to many malloced elements.
- *             You might want to define a function like:
- *             @code
- *             void *tree_insert(struct AVTreeNode **rootp, void *key,
- *                               int (*cmp)(void *key, const void *b),
- *                               AVTreeNode **next)
- *             {
- *                 if (!*next)
- *                     *next = av_mallocz(av_tree_node_size);
- *                 return av_tree_insert(rootp, key, cmp, next);
- *             }
- *             void *tree_remove(struct AVTreeNode **rootp, void *key,
- *                               int (*cmp)(void *key, const void *b, AVTreeNode **next))
- *             {
- *                 av_freep(next);
- *                 return av_tree_insert(rootp, key, cmp, next);
- *             }
- *             @endcode
- * @param cmp compare function used to compare elements in the tree, API identical
- *            to that of Standard C's qsort
- * @return If no insertion happened, the found element; if an insertion or
- *         removal happened, then either key or NULL will be returned.
- *         Which one it is depends on the tree state and the implementation. You
- *         should make no assumptions that it's one or the other in the code.
- */
-void *av_tree_insert(struct AVTreeNode **rootp, void *key,
-                     int (*cmp)(const void *key, const void *b),
-                     struct AVTreeNode **next);
-
-void av_tree_destroy(struct AVTreeNode *t);
-
-/**
- * Apply enu(opaque, &elem) to all the elements in the tree in a given range.
- *
- * @param cmp a comparison function that returns < 0 for an element below the
- *            range, > 0 for an element above the range and == 0 for an
- *            element inside the range
- *
- * @note The cmp function should use the same ordering used to construct the
- *       tree.
- */
-void av_tree_enumerate(struct AVTreeNode *t, void *opaque,
-                       int (*cmp)(void *opaque, void *elem),
-                       int (*enu)(void *opaque, void *elem));
-
-/**
- * @}
- */
-
-#endif /* AVUTIL_TREE_H */

gpac-2.2.1.tar.gz/extra_lib/include/libavutil/twofish.h Deleted

@@ -1,70 +0,0 @@
-/*
- * An implementation of the TwoFish algorithm
- * Copyright (c) 2015 Supraja Meedinti
- *
- * 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_TWOFISH_H
-#define AVUTIL_TWOFISH_H
-
-#include <stdint.h>
-
-
-/**
-  * @file
-  * @brief Public header for libavutil TWOFISH algorithm
-  * @defgroup lavu_twofish TWOFISH
-  * @ingroup lavu_crypto
-  * @{
-  */
-
-extern const int av_twofish_size;
-
-struct AVTWOFISH;
-
-/**
-  * Allocate an AVTWOFISH context
-  * To free the struct: av_free(ptr)
-  */
-struct AVTWOFISH *av_twofish_alloc(void);
-
-/**
-  * Initialize an AVTWOFISH context.
-  *
-  * @param ctx an AVTWOFISH context
-  * @param key a key of size ranging from 1 to 32 bytes used for encryption/decryption
-  * @param key_bits number of keybits: 128, 192, 256 If less than the required, padded with zeroes to nearest valid value; return value is 0 if key_bits is 128/192/256, -1 if less than 0, 1 otherwise
- */
-int av_twofish_init(struct AVTWOFISH *ctx, const uint8_t *key, int key_bits);
-
-/**
-  * Encrypt or decrypt a buffer using a previously initialized context
-  *
-  * @param ctx an AVTWOFISH context
-  * @param dst destination array, can be equal to src
-  * @param src source array, can be equal to dst
-  * @param count number of 16 byte blocks
-  * @paran iv initialization vector for CBC mode, NULL for ECB mode
-  * @param decrypt 0 for encryption, 1 for decryption
- */
-void av_twofish_crypt(struct AVTWOFISH *ctx, uint8_t *dst, const uint8_t *src, int count, uint8_t* iv, int decrypt);
-
-/**
- * @}
- */
-#endif /* AVUTIL_TWOFISH_H */

gpac-2.2.1.tar.gz/extra_lib/include/libavutil/tx.h Deleted

@@ -1,152 +0,0 @@
-/*
- * 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_TX_H
-#define AVUTIL_TX_H
-
-#include <stdint.h>
-#include <stddef.h>
-
-typedef struct AVTXContext AVTXContext;
-
-typedef struct AVComplexFloat {
-    float re, im;
-} AVComplexFloat;
-
-typedef struct AVComplexDouble {
-    double re, im;
-} AVComplexDouble;
-
-typedef struct AVComplexInt32 {
-    int32_t re, im;
-} AVComplexInt32;
-
-enum AVTXType {
-    /**
-     * Standard complex to complex FFT with sample data type AVComplexFloat.
-     * Output is not 1/len normalized. Scaling currently unsupported.
-     * The stride parameter is ignored.
-     */
-    AV_TX_FLOAT_FFT = 0,
-
-    /**
-     * Standard MDCT with sample data type of float and a scale type of
-     * float. Length is the frame size, not the window size (which is 2x frame)
-     * For forward transforms, the stride specifies the spacing between each
-     * sample in the output array in bytes. The input must be a flat array.
-     *
-     * For inverse transforms, the stride specifies the spacing between each
-     * sample in the input array in bytes. The output will be a flat array.
-     * Stride must be a non-zero multiple of sizeof(float).
-     *
-     * NOTE: the inverse transform is half-length, meaning the output will not
-     * contain redundant data. This is what most codecs work with. To do a full
-     * inverse transform, set the AV_TX_FULL_IMDCT flag on init.
-     */
-    AV_TX_FLOAT_MDCT = 1,
-
-    /**
-     * Same as AV_TX_FLOAT_FFT with a data type of AVComplexDouble.
-     */
-    AV_TX_DOUBLE_FFT = 2,
-
-    /**
-     * Same as AV_TX_FLOAT_MDCT with data and scale type of double.
-     * Stride must be a non-zero multiple of sizeof(double).
-     */
-    AV_TX_DOUBLE_MDCT = 3,
-
-    /**
-     * Same as AV_TX_FLOAT_FFT with a data type of AVComplexInt32.
-     */
-    AV_TX_INT32_FFT = 4,
-
-    /**
-     * Same as AV_TX_FLOAT_MDCT with data type of int32_t and scale type of float.
-     * Only scale values less than or equal to 1.0 are supported.
-     * Stride must be a non-zero multiple of sizeof(int32_t).
-     */
-    AV_TX_INT32_MDCT = 5,
-};
-
-/**
- * Function pointer to a function to perform the transform.
- *
- * @note Using a different context than the one allocated during av_tx_init()
- * is not allowed.
- *
- * @param s the transform context
- * @param out the output array
- * @param in the input array
- * @param stride the input or output stride in bytes
- *
- * The out and in arrays must be aligned to the maximum required by the CPU
- * architecture unless the AV_TX_UNALIGNED flag was set in av_tx_init().
- * The stride must follow the constraints the transform type has specified.
- */
-typedef void (*av_tx_fn)(AVTXContext *s, void *out, void *in, ptrdiff_t stride);
-
-/**
- * Flags for av_tx_init()
- */
-enum AVTXFlags {
-    /**
-     * Performs an in-place transformation on the input. The output argument
-     * of av_tn_fn() MUST match the input. May be unsupported or slower for some
-     * transform types.
-     */
-    AV_TX_INPLACE = 1ULL << 0,
-
-    /**
-     * Relaxes alignment requirement for the in and out arrays of av_tx_fn().
-     * May be slower with certain transform types.
-     */
-    AV_TX_UNALIGNED = 1ULL << 1,
-
-    /**
-     * Performs a full inverse MDCT rather than leaving out samples that can be
-     * derived through symmetry. Requires an output array of 'len' floats,
-     * rather than the usual 'len/2' floats.
-     * Ignored for all transforms but inverse MDCTs.
-     */
-    AV_TX_FULL_IMDCT = 1ULL << 2,
-};
-
-/**
- * Initialize a transform context with the given configuration
- * (i)MDCTs with an odd length are currently not supported.
- *
- * @param ctx the context to allocate, will be NULL on error
- * @param tx pointer to the transform function pointer to set
- * @param type type the type of transform
- * @param inv whether to do an inverse or a forward transform
- * @param len the size of the transform in samples
- * @param scale pointer to the value to scale the output if supported by type
- * @param flags a bitmask of AVTXFlags or 0
- *
- * @return 0 on success, negative error code on failure
- */
-int av_tx_init(AVTXContext **ctx, av_tx_fn *tx, enum AVTXType type,
-               int inv, int len, const void *scale, uint64_t flags);
-
-/**
- * Frees a context and sets ctx to NULL, does nothing when ctx == NULL
- */
-void av_tx_uninit(AVTXContext **ctx);
-
-#endif /* AVUTIL_TX_H */

gpac-2.2.1.tar.gz/extra_lib/include/libavutil/version.h Deleted

@@ -1,118 +0,0 @@
-/*
- * 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
- */
-
-/**
- * @file
- * @ingroup lavu
- * Libavutil version macros
- */
-
-#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.
- *
- * The FFmpeg libraries follow a versioning sheme very similar to
- * Semantic Versioning (http://semver.org/)
- * The difference is that the component called PATCH is called MICRO in FFmpeg
- * and its value is reset to 100 instead of 0 to keep it above or equal to 100.
- * Also we do not increase MICRO for every bugfix or change in git master.
- *
- * Prior to FFmpeg 3.2 point releases did not change any lib version number to
- * avoid aliassing different git master checkouts.
- * Starting with FFmpeg 3.2, the released library versions will occupy
- * a separate MAJOR.MINOR that is not used on the master development branch.
- * That is if we branch a release of master 55.10.123 we will bump to 55.11.100
- * for the release and master will continue at 55.12.100 after it. Each new
- * point release will then bump the MICRO improving the usefulness of the lib
- * versions.
- *
- * @{
- */
-
-#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)
-
-/**
- * Extract version components from the full ::AV_VERSION_INT int as returned
- * by functions like ::avformat_version() and ::avcodec_version()
- */
-#define AV_VERSION_MAJOR(a) ((a) >> 16)
-#define AV_VERSION_MINOR(a) (((a) & 0x00FF00) >> 8)
-#define AV_VERSION_MICRO(a) ((a) & 0xFF)
-
-/**
- * @}
- */
-
-/**
- * @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  57
-#define LIBAVUTIL_VERSION_MINOR  17
-#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 lavu_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.
- *
- * @note, when bumping the major version it is recommended to manually
- * disable each FF_API_* in its own commit instead of disabling them all
- * at once through the bump. This improves the git bisect-ability of the change.
- *
- * @{
- */
-
-#define FF_API_D2STR                    (LIBAVUTIL_VERSION_MAJOR < 58)
-#define FF_API_DECLARE_ALIGNED          (LIBAVUTIL_VERSION_MAJOR < 58)
-#define FF_API_COLORSPACE_NAME          (LIBAVUTIL_VERSION_MAJOR < 58)
-#define FF_API_AV_MALLOCZ_ARRAY         (LIBAVUTIL_VERSION_MAJOR < 58)
-
-/**
- * @}
- * @}
- */
-
-#endif /* AVUTIL_VERSION_H */

gpac-2.2.1.tar.gz/extra_lib/include/libavutil/video_enc_params.h Deleted

@@ -1,171 +0,0 @@
-/*
- * 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_VIDEO_ENC_PARAMS_H
-#define AVUTIL_VIDEO_ENC_PARAMS_H
-
-#include <stddef.h>
-#include <stdint.h>
-
-#include "libavutil/avassert.h"
-#include "libavutil/frame.h"
-
-enum AVVideoEncParamsType {
-    AV_VIDEO_ENC_PARAMS_NONE = -1,
-    /**
-     * VP9 stores:
-     * - per-frame base (luma AC) quantizer index, exported as AVVideoEncParams.qp
-     * - deltas for luma DC, chroma AC and chroma DC, exported in the
-     *   corresponding entries in AVVideoEncParams.delta_qp
-     * - per-segment delta, exported as for each block as AVVideoBlockParams.delta_qp
-     *
-     * To compute the resulting quantizer index for a block:
-     * - for luma AC, add the base qp and the per-block delta_qp, saturating to
-     *   unsigned 8-bit.
-     * - for luma DC and chroma AC/DC, add the corresponding
-     *   AVVideoBlockParams.delta_qp to the luma AC index, again saturating to
-     *   unsigned 8-bit.
-     */
-    AV_VIDEO_ENC_PARAMS_VP9,
-
-    /**
-     * H.264 stores:
-     * - in PPS (per-picture):
-     *   * initial QP_Y (luma) value, exported as AVVideoEncParams.qp
-     *   * delta(s) for chroma QP values (same for both, or each separately),
-     *     exported as in the corresponding entries in AVVideoEncParams.delta_qp
-     * - per-slice QP delta, not exported directly, added to the per-MB value
-     * - per-MB delta; not exported directly; the final per-MB quantizer
-     *   parameter - QP_Y - minus the value in AVVideoEncParams.qp is exported
-     *   as AVVideoBlockParams.qp_delta.
-     */
-    AV_VIDEO_ENC_PARAMS_H264,
-
-    /*
-     * MPEG-2-compatible quantizer.
-     *
-     * Summing the frame-level qp with the per-block delta_qp gives the
-     * resulting quantizer for the block.
-     */
-    AV_VIDEO_ENC_PARAMS_MPEG2,
-};
-
-/**
- * Video encoding parameters for a given frame. This struct is allocated along
- * with an optional array of per-block AVVideoBlockParams descriptors.
- * Must be allocated with av_video_enc_params_alloc().
- */
-typedef struct AVVideoEncParams {
-    /**
-     * Number of blocks in the array.
-     *
-     * May be 0, in which case no per-block information is present. In this case
-     * the values of blocks_offset / block_size are unspecified and should not
-     * be accessed.
-     */
-    unsigned int nb_blocks;
-    /**
-     * Offset in bytes from the beginning of this structure at which the array
-     * of blocks starts.
-     */
-    size_t blocks_offset;
-    /*
-     * Size of each block in bytes. May not match sizeof(AVVideoBlockParams).
-     */
-    size_t block_size;
-
-    /**
-     * Type of the parameters (the codec they are used with).
-     */
-    enum AVVideoEncParamsType type;
-
-    /**
-     * Base quantisation parameter for the frame. The final quantiser for a
-     * given block in a given plane is obtained from this value, possibly
-     * combined with {@code delta_qp} and the per-block delta in a manner
-     * documented for each type.
-     */
-    int32_t qp;
-
-    /**
-     * Quantisation parameter offset from the base (per-frame) qp for a given
-     * plane (first index) and AC/DC coefficients (second index).
-     */
-    int32_t delta_qp42;
-} AVVideoEncParams;
-
-/**
- * Data structure for storing block-level encoding information.
- * It is allocated as a part of AVVideoEncParams and should be retrieved with
- * av_video_enc_params_block().
- *
- * sizeof(AVVideoBlockParams) is not a part of the ABI and new fields may be
- * added to it.
- */
-typedef struct AVVideoBlockParams {
-    /**
-     * Distance in luma pixels from the top-left corner of the visible frame
-     * to the top-left corner of the block.
-     * Can be negative if top/right padding is present on the coded frame.
-     */
-    int src_x, src_y;
-    /**
-     * Width and height of the block in luma pixels.
-     */
-    int w, h;
-
-    /**
-     * Difference between this block's final quantization parameter and the
-     * corresponding per-frame value.
-     */
-    int32_t delta_qp;
-} AVVideoBlockParams;
-
-/*
- * Get the block at the specified {@code idx}. Must be between 0 and nb_blocks.
- */
-static av_always_inline AVVideoBlockParams*
-av_video_enc_params_block(AVVideoEncParams *par, unsigned int idx)
-{
-    av_assert0(idx < par->nb_blocks);
-    return (AVVideoBlockParams *)((uint8_t *)par + par->blocks_offset +
-                                  idx * par->block_size);
-}
-
-/**
- * Allocates memory for AVVideoEncParams of the given type, plus an array of
- * {@code nb_blocks} AVVideoBlockParams and initializes the variables. Can be
- * freed with a normal av_free() call.
- *
- * @param out_size if non-NULL, the size in bytes of the resulting data array is
- * written here.
- */
-AVVideoEncParams *av_video_enc_params_alloc(enum AVVideoEncParamsType type,
-                                            unsigned int nb_blocks, size_t *out_size);
-
-/**
- * Allocates memory for AVEncodeInfoFrame plus an array of
- * {@code nb_blocks} AVEncodeInfoBlock in the given AVFrame {@code frame}
- * as AVFrameSideData of type AV_FRAME_DATA_VIDEO_ENC_PARAMS
- * and initializes the variables.
- */
-AVVideoEncParams*
-av_video_enc_params_create_side_data(AVFrame *frame, enum AVVideoEncParamsType type,
-                                     unsigned int nb_blocks);
-
-#endif /* AVUTIL_VIDEO_ENC_PARAMS_H */

gpac-2.2.1.tar.gz/extra_lib/include/libavutil/xtea.h Deleted

@@ -1,94 +0,0 @@
-/*
- * 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 key16;
-} AVXTEA;
-
-/**
- * Allocate an AVXTEA context.
- */
-AVXTEA *av_xtea_alloc(void);
-
-/**
- * Initialize an AVXTEA context.
- *
- * @param ctx an AVXTEA context
- * @param key a key of 16 bytes used for encryption/decryption,
- *            interpreted as big endian 32 bit numbers
- */
-void av_xtea_init(struct AVXTEA *ctx, const uint8_t key16);
-
-/**
- * Initialize an AVXTEA context.
- *
- * @param ctx an AVXTEA context
- * @param key a key of 16 bytes used for encryption/decryption,
- *            interpreted as little endian 32 bit numbers
- */
-void av_xtea_le_init(struct AVXTEA *ctx, const uint8_t key16);
-
-/**
- * Encrypt or decrypt a buffer using a previously initialized context,
- * in big endian format.
- *
- * @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);
-
-/**
- * Encrypt or decrypt a buffer using a previously initialized context,
- * in little endian format.
- *
- * @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_le_crypt(struct AVXTEA *ctx, uint8_t *dst, const uint8_t *src,
-                      int count, uint8_t *iv, int decrypt);
-
-/**
- * @}
- */
-
-#endif /* AVUTIL_XTEA_H */

gpac-2.2.1.tar.gz/extra_lib/include/libopenhevc Deleted

gpac-2.2.1.tar.gz/extra_lib/include/libopenhevc/ohconfig.h Deleted

gpac-2.2.1.tar.gz/extra_lib/include/libopenhevc/openhevc.h Deleted

@@ -1,397 +0,0 @@
-/*
- * openhevc.h wrapper to openhevc or ffmpeg
- * Copyright (c) 2012-2013 Micka�l Raulet, Wassim Hamidouche, Gildas Cocherel, Pierre Edouard Lepere
- *
- * This file is part of openhevc.
- *
- * openHevc 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.
- *
- * openhevc 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 openhevc; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef OPENHEVC_H
-#define OPENHEVC_H
-
-#define NV_VERSION  "3.0" ///< Current software version
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <stdint.h>
-#include <stdarg.h>
-#include "ohconfig.h"
-
-#if OHCONFIG_AVCBASE
-    #define OPENHEVC_HAS_AVC_BASE
-#endif
-
-#define USE_SDL 1
-
-
-typedef void* OHHandle;
-
-typedef struct OHRational{
-    int num; ///< numerator
-    int den; ///< denominator
-} OHRational;
-
-//TODO try to remove
-enum OHChromaFormat {
-    OH_YUV420 = 0,
-    OH_YUV422,
-    OH_YUV444,
-};
-
-typedef enum {
-    OH_THREAD_FRAME = 1,
-    OH_THREAD_SLICE = 2,
-    OH_THREAD_FRAMESLICE = 4
-} OHThreadType;
-
-typedef enum {
-    OH_DECODER_HEVC = 0,
-    OH_DECODER_SHVC,
-    OH_DECODER_LHVC,
-    OH_DECODER_HYBRID
-} OHDecoderType;
-
-typedef enum {
-    OHEVC_LOG_PANIC   = 0,
-    OHEVC_LOG_FATAL   = 8,
-    OHEVC_LOG_ERROR   = 16,
-    OHEVC_LOG_WARNING = 24,
-    OHEVC_LOG_INFO    = 32,
-    OHEVC_LOG_VERBOSE = 40,
-    OHEVC_LOG_DEBUG   = 48,
-    OHEVC_LOG_TRACE   = 56
-} OHEVC_LogLevel;
-
-//TODO unused
-typedef struct OHScalabilityMask {
-    uint8_t multiview;
-    uint8_t scalability;
-    uint8_t aux_picture;
-} OHScalabilityMask;
-
-
-//TODO unused
-typedef enum {
-    OH_PROFILE_MAIN = 1,
-    OH_PROFILE_MAIN10,
-    OH_PROFILE_MAIN_STILL_PICTURE,
-    OH_PROFILE_REXT,
-}OHProfile;
-
-//TODO (generic wrapper for sequence specific HEVC info (scalability mask, profile...))
-typedef struct OHInfo {
-    OHProfile profile;
-    OHScalabilityMask scal_mask;
-}OHInfo;
-
-
-//TODO Refactor
-typedef struct OHFrameInfo {
-    int         width;
-    int         height;
-    int         linesize_y;
-    int         linesize_cb;
-    int         linesize_cr;
-    int         bitdepth;
-    int         chromat_format;
-    OHRational  sample_aspect_ratio;
-    OHRational  framerate;
-    int         display_picture_number; //poc
-    int         flag; //progressive, interlaced, interlaced top field first, interlaced bottom field first.
-    int64_t     pts;
-} OHFrameInfo;
-
-
-typedef struct OHPacket {
-    /**
-     * Container for packets from different layers when using layered HEVC
-     */
-    uint8_t **pkt_list;
-    /**
-     * Sizes of each packets
-     */
-    int *pkt_size_list;
-    /**
-     * Time stamps list of each packets
-     */
-    int *pts_list;
-}OHPacket;
-
-
-typedef struct OHFrame {
-    void**       data_y_p;
-    void**       data_cb_p;
-    void**       data_cr_p;
-    OHFrameInfo  frame_par;
-} OHFrame;
-
-typedef struct OHFrame_cpy {
-    void*        data_y;
-    void*        data_cb;
-    void*        data_cr;
-    OHFrameInfo  frame_par;
-} OHFrame_cpy;
-
-
-//TODO: refactor into only one init function + comment
-/**
- * Allocate a general decoder context list for each layer (up to MAX_DECODERS)
- * Allocate a decoder context for each layers
- * Find a registered HEVC decoder matching AV_CODEC_ID_HEVC.
- * Init packets for each layer decoders
- * @param number nb_pthreads of the requested decoder
- * @param type thread_type of the threading design in use for decoding
- * @return A decoder list if a decoder of each layer were found, NULL otherwise.
- */
-OHHandle oh_init(int nb_threads, int thread_type);
-
-/**
- * Allocate a general decoder context list for each layer (up to MAX_DECODERS)
- * Allocate a decoder context for each layer
- * Find a registered H264 decoder matching AV_CODEC_ID_H264 for base layer.
- * Find a registered LHVC decoder matching AV_CODEC_ID_HEVC for other layers.
- * Init packets for each layer decoders
- * @param number nb_pthreads of the requested decoder
- * @param type thread_type of the threading design in use for decoding
- * @return A decoder list if a decoder of each layer were found, NULL otherwise.
- */
-OHHandle oh_init_lhvc(int nb_threads, int thread_type);
-
-#if OHCONFIG_AVCBASE
-/**
- * Allocate a general decoder context list for each layer (up to MAX_DECODERS)
- * Allocate a decoder context for each layer
- * Find a registered H264 decoder matching AV_CODEC_ID_H264.
- * Init packets for each decoders
- * @param number nb_threads of the requested decoder
- * @param type thread_type of the threading design in use for decoding
- * @return A decoder list if a decoder of each layer were found, NULL otherwise.
- */
-OHHandle oh_init_h264(int nb_threads, int thread_type);
-#endif
-
-/**
- * Initialize the decoders contexts for each layers.
- *
- * The different layers decoders must have been initialized prior to the call to
- * this function.
- *
- * @param oh_hdl The codec context list of current decoders to be used
- * @return one on success, a negative value on error
- */
-int oh_start(OHHandle oh_hdl);
-
-//TODO use OHPacket structure to handle lhvc, hevc and shvc into a same function
-// call
-/**
- * Decode the video frame of size pkt_size from pkt_data into picture.
- * @note The packet can be a conglomerate of NAL from different layer since
- * each NAL header contains a layer ID, each HEVC parser can ignore NALs
- * non related to its layer.
- * @param oh_hdl the codec context list of current decoders
- * @paramin pkt_data The input NAL raw data to be decoded.
- * @paramin pkt_size The input NAL raw data length in bytes.
- * @paramin pkt_pts the packet time stamp
- * @return On error a negative value is returned, otherwise the number of bytes
- * used or zero if no frame could be decompressed
- * @deprecated Use oh_send_packet() and oh_receive_frame().
- */
-int  oh_decode(OHHandle oh_hdl, const unsigned char *pkt_data,
-               int pkt_size, int64_t pkt_pts);
-
-#if OHCONFIG_AVCBASE
-/**
- * Decode the video frame of size pkt_size from pkt_data into picture, in case
- * of non HEVC base layer (LHVC)
- * @param oh_hdl the codec context list of current decoders
- * @paramin pkt_data The input NAL raw data to be decoded.
- * @paramin pkt_size The input NAL raw data length in bytes.
- * @paramin pts the packet time stamp
- * @return On error a negative value is returned, otherwise the number of bytes
- * used or zero if no frame could be decompressed
- * @deprecated Use oh_send_packet() and oh_receive_frame().
- */
-int  oh_decode_lhvc(OHHandle oh_hdl, const unsigned char *pkt_data_bl,
-                    const unsigned char *pkt_data_el, int pkt_size_bl,
-                    int pkt_size_el, int64_t pts_bl, int64_t pts_el);
-
-//TODO define an OHPacket struct to handle both lhevc and hevc case
-//TODO oh_send/receive_packet
-#endif
-
-void oh_extradata_cpy(OHHandle oh_hdl, unsigned char *extra_data,
-                      int extra_size_alloc);
-
-#if OHCONFIG_AVCBASE
-void oh_extradata_cpy_lhvc(OHHandle oh_hdl, unsigned char *extra_data_linf,
-                           unsigned char *extra_data_lsup,
-                           int extra_size_alloc_linf,
-                           int extra_size_allocl_sup);
-#endif
-
-/**
- * Flush all decoders.
- *
- * @param oh_hdl The codec context list of current decoders
- */
-void oh_flush(OHHandle oh_hdl);
-
-/**
- * Flush a decoder given its ID.
- *
- * @param oh_hdl     The codec context list of current decoders
- * @param layer_idx  The LAYER_ID of the decoder to be flushed
- */
-void oh_flush_shvc(OHHandle oh_hdl, int layer_idx);
-
-/**
- * Close and free all decoders, parsers and pictures.
- *
- * @param oh_hdl The codec context list of current decoders
- */
-void oh_close(OHHandle oh_hdl);
-
-/**
- * Update informations on the output frame
- *
- * @param oh_hdl      The codec context list of current decoders
- * @param got_picture 1 if the decoder outputed a picture, 0 otherwise
- * @param oh_frame    pointer to the output OHFrame
- */
-int  oh_output_update(OHHandle oh_hdl, int got_picture, OHFrame *oh_frame);
-
-int  oh_output_update_from_layer(OHHandle oh_hdl, OHFrame *oh_frame, int layer_id);
-
-/**
- * Update the informations on the output frame
- *
- * @param oh_hdl       The codec context list of current decoders
- * @param oh_frameinfo pointer to the output frame info to be updated
- */
-void oh_frameinfo_update(OHHandle oh_hdl, OHFrameInfo *oh_frameinfo);
-
-void oh_frameinfo_update_from_layer(OHHandle oh_hdl, OHFrameInfo *oh_frameinfo,int layer_id);
-
-
-/**
- * Reinterpret frame information for a cropped copy of a frame
- *
- * @param oh_hdl      The codec context list of current decoders
- * @param got_picture 1 if the decoder outputed a picture, 0 otherwise
- * @param oh_frame    pointer to the output OHFrame
- */
-void oh_cropped_frameinfo(OHHandle oh_hdl, OHFrameInfo *oh_frame_info);
-
-int  oh_cropped_frameinfo_from_layer(OHHandle oh_hdl, OHFrameInfo *oh_frame_info, int layer_id);
-
-/**
- * Copy and crop the ouput output to a new one
- *
- * @param oh_hdl      The codec context list of current decoders
- * @param got_picture 1 if the decoder outputed a picture, 0 otherwise
- * @param oh_frame    pointer to the output OHFrame
- */
-int oh_output_cropped_cpy(OHHandle oh_hdl, OHFrame_cpy *oh_frame);
-
-int oh_output_cropped_cpy_from_layer(OHHandle openHevcHandle, OHFrame_cpy *oh_frame, int layer_id);
-
-/**
- * Enable frame level SEI checksum for all layers
- *
- * @param oh_hdl The codec context list of current decoders
- * @param val    1 if enabled, 0 otherwise
- */
-void oh_enable_sei_checksum(OHHandle oh_hdl, int val);
-
-/**
- * Disable frame cropping SEI for all layers
- *
- * @param oh_hdl The codec context list of current decoders
- * @param val    1 if enabled, 0 otherwise
- */
-void oh_disable_cropping(OHHandle oh_hdl, int val);
-
-/**
- * Set the level of the logging output
- *
- * @param oh_hdl    The codec context list of current decoders
- * @param log_level The desired log_level
- */
-void oh_set_log_level(OHHandle oh_hdl, OHEVC_LogLevel log_level);
-
-/**
- * Enable frame level SEI checksum for
- *
- * @param oh_hdl    The codec context list of current decoders
- * @param log_level The desired log_level
- */
-void oh_set_log_callback(OHHandle oh_hdl, void (*callback)(void*, int, const char*, va_list));
-
-/**
- * Select temporal layer for HEVC streams
- *
- * @param oh_hdl The codec context list of current decoders
- * @param val    The desired temporal id
- */
-void oh_select_temporal_layer(OHHandle oh_hdl, int val);
-
-/**
- * Select the higher active layer for HEVC streams and disable decoding of all
- * upper layers
- *
- * @param oh_hdl The codec context list of current decoders
- * @param val    The desired active layer id
- */
-void oh_select_active_layer(OHHandle oh_hdl, int val);
-
-/**
- * Select view layer output for SHVC streams
- *
- * @param oh_hdl The codec context list of current decoders
- * @param val    The desired temporal id
- */
-void oh_select_view_layer(OHHandle oh_hdl, int val);
-
-#if OHCONFIG_ENCRYPTION
-void oh_set_crypto_mode(OHHandle oh_hdl, int val);
-void oh_set_crypto_key(OHHandle oh_hdl, uint8_t *val);
-#endif
-/**
- * Enable Green filters
- *
- * @param oh_hdl The codec context list of current decoders
- * @param green_param The desired green parameters
- * @param green_verbose The desired green verbose level
- */
-void oh_enable_green(OHHandle oh_hdl, const char *green_param, int green_verbose);
-
-/**
- * @return val    The current OpenHEVC version
- */
-const unsigned oh_version(OHHandle oh_hdl);
-
-unsigned openhevc_version(void);
-
-const char *openhevc_ident(void);
-const char *openhevc_configuration(void);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif // OPENHEVC_H

gpac-2.2.1.tar.gz/extra_lib/include/libopenhevc/version.h Deleted

@@ -1,46 +0,0 @@
-/*
- * 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 OPENHEVC_VERSION_H
-#define OPENHEVC_VERSION_H
-
-/**
- * @file
- * @ingroup libopenhevc
- * Libopenhevc version macros
- */
-
-#include "libavutil/version.h"
-
-#define LIBOPENHEVC_VERSION_MAJOR   1
-#define LIBOPENHEVC_VERSION_MINOR  00
-#define LIBOPENHEVC_VERSION_MICRO 000
-
-#define LIBOPENHEVC_VERSION_INT AV_VERSION_INT(LIBOPENHEVC_VERSION_MAJOR, \
-                                               LIBOPENHEVC_VERSION_MINOR, \
-                                               LIBOPENHEVC_VERSION_MICRO)
-#define LIBOPENHEVC_VERSION     AV_VERSION(LIBOPENHEVC_VERSION_MAJOR,   \
-                                           LIBOPENHEVC_VERSION_MINOR,   \
-                                           LIBOPENHEVC_VERSION_MICRO)
-#define LIBOPENHEVC_BUILD       LIBOPENHEVC_VERSION_INT
-
-#define LIBOPENHEVC_IDENT       "Loh" AV_STRINGIFY(LIBOPENHEVC_VERSION)
-
-#endif /* OPENHEVC_VERSION_H */

gpac-2.2.1.tar.gz/extra_lib/include/libswresample Deleted

gpac-2.2.1.tar.gz/extra_lib/include/libswresample/swresample.h Deleted

@@ -1,579 +0,0 @@
-/*
- * Copyright (C) 2011-2013 Michael Niedermayer (michaelni@gmx.at)
- *
- * This file is part of libswresample
- *
- * libswresample 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.
- *
- * libswresample 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 libswresample; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef SWRESAMPLE_SWRESAMPLE_H
-#define SWRESAMPLE_SWRESAMPLE_H
-
-/**
- * @file
- * @ingroup lswr
- * libswresample public header
- */
-
-/**
- * @defgroup lswr libswresample
- * @{
- *
- * Audio resampling, sample format conversion and mixing library.
- *
- * Interaction with lswr is done through SwrContext, which is
- * allocated with swr_alloc() or swr_alloc_set_opts(). It is opaque, so all parameters
- * must be set with the @ref avoptions API.
- *
- * The first thing you will need to do in order to use lswr is to allocate
- * SwrContext. This can be done with swr_alloc() or swr_alloc_set_opts(). If you
- * are using the former, you must set options through the @ref avoptions API.
- * The latter function provides the same feature, but it allows you to set some
- * common options in the same statement.
- *
- * For example the following code will setup conversion from planar float sample
- * format to interleaved signed 16-bit integer, downsampling from 48kHz to
- * 44.1kHz and downmixing from 5.1 channels to stereo (using the default mixing
- * matrix). This is using the swr_alloc() function.
- * @code
- * SwrContext *swr = swr_alloc();
- * av_opt_set_channel_layout(swr, "in_channel_layout",  AV_CH_LAYOUT_5POINT1, 0);
- * av_opt_set_channel_layout(swr, "out_channel_layout", AV_CH_LAYOUT_STEREO,  0);
- * av_opt_set_int(swr, "in_sample_rate",     48000,                0);
- * av_opt_set_int(swr, "out_sample_rate",    44100,                0);
- * av_opt_set_sample_fmt(swr, "in_sample_fmt",  AV_SAMPLE_FMT_FLTP, 0);
- * av_opt_set_sample_fmt(swr, "out_sample_fmt", AV_SAMPLE_FMT_S16,  0);
- * @endcode
- *
- * The same job can be done using swr_alloc_set_opts() as well:
- * @code
- * SwrContext *swr = swr_alloc_set_opts(NULL,  // we're allocating a new context
- *                       AV_CH_LAYOUT_STEREO,  // out_ch_layout
- *                       AV_SAMPLE_FMT_S16,    // out_sample_fmt
- *                       44100,                // out_sample_rate
- *                       AV_CH_LAYOUT_5POINT1, // in_ch_layout
- *                       AV_SAMPLE_FMT_FLTP,   // in_sample_fmt
- *                       48000,                // in_sample_rate
- *                       0,                    // log_offset
- *                       NULL);                // log_ctx
- * @endcode
- *
- * Once all values have been set, it must be initialized with swr_init(). If
- * you need to change the conversion parameters, you can change the parameters
- * using @ref AVOptions, as described above in the first example; or by using
- * swr_alloc_set_opts(), but with the first argument the allocated context.
- * You must then call swr_init() again.
- *
- * The conversion itself is done by repeatedly calling swr_convert().
- * Note that the samples may get buffered in swr if you provide insufficient
- * output space or if sample rate conversion is done, which requires "future"
- * samples. Samples that do not require future input can be retrieved at any
- * time by using swr_convert() (in_count can be set to 0).
- * At the end of conversion the resampling buffer can be flushed by calling
- * swr_convert() with NULL in and 0 in_count.
- *
- * The samples used in the conversion process can be managed with the libavutil
- * @ref lavu_sampmanip "samples manipulation" API, including av_samples_alloc()
- * function used in the following example.
- *
- * The delay between input and output, can at any time be found by using
- * swr_get_delay().
- *
- * The following code demonstrates the conversion loop assuming the parameters
- * from above and caller-defined functions get_input() and handle_output():
- * @code
- * uint8_t **input;
- * int in_samples;
- *
- * while (get_input(&input, &in_samples)) {
- *     uint8_t *output;
- *     int out_samples = av_rescale_rnd(swr_get_delay(swr, 48000) +
- *                                      in_samples, 44100, 48000, AV_ROUND_UP);
- *     av_samples_alloc(&output, NULL, 2, out_samples,
- *                      AV_SAMPLE_FMT_S16, 0);
- *     out_samples = swr_convert(swr, &output, out_samples,
- *                                      input, in_samples);
- *     handle_output(output, out_samples);
- *     av_freep(&output);
- * }
- * @endcode
- *
- * When the conversion is finished, the conversion
- * context and everything associated with it must be freed with swr_free().
- * A swr_close() function is also available, but it exists mainly for
- * compatibility with libavresample, and is not required to be called.
- *
- * There will be no memory leak if the data is not completely flushed before
- * swr_free().
- */
-
-#include <stdint.h>
-#include "libavutil/channel_layout.h"
-#include "libavutil/frame.h"
-#include "libavutil/samplefmt.h"
-
-#include "libswresample/version.h"
-
-/**
- * @name Option constants
- * These constants are used for the @ref avoptions interface for lswr.
- * @{
- *
- */
-
-#define SWR_FLAG_RESAMPLE 1 ///< Force resampling even if equal sample rate
-//TODO use int resample ?
-//long term TODO can we enable this dynamically?
-
-/** Dithering algorithms */
-enum SwrDitherType {
-    SWR_DITHER_NONE = 0,
-    SWR_DITHER_RECTANGULAR,
-    SWR_DITHER_TRIANGULAR,
-    SWR_DITHER_TRIANGULAR_HIGHPASS,
-
-    SWR_DITHER_NS = 64,         ///< not part of API/ABI
-    SWR_DITHER_NS_LIPSHITZ,
-    SWR_DITHER_NS_F_WEIGHTED,
-    SWR_DITHER_NS_MODIFIED_E_WEIGHTED,
-    SWR_DITHER_NS_IMPROVED_E_WEIGHTED,
-    SWR_DITHER_NS_SHIBATA,
-    SWR_DITHER_NS_LOW_SHIBATA,
-    SWR_DITHER_NS_HIGH_SHIBATA,
-    SWR_DITHER_NB,              ///< not part of API/ABI
-};
-
-/** Resampling Engines */
-enum SwrEngine {
-    SWR_ENGINE_SWR,             /**< SW Resampler */
-    SWR_ENGINE_SOXR,            /**< SoX Resampler */
-    SWR_ENGINE_NB,              ///< not part of API/ABI
-};
-
-/** Resampling Filter Types */
-enum SwrFilterType {
-    SWR_FILTER_TYPE_CUBIC,              /**< Cubic */
-    SWR_FILTER_TYPE_BLACKMAN_NUTTALL,   /**< Blackman Nuttall windowed sinc */
-    SWR_FILTER_TYPE_KAISER,             /**< Kaiser windowed sinc */
-};
-
-/**
- * @}
- */
-
-/**
- * The libswresample context. Unlike libavcodec and libavformat, this structure
- * is opaque. This means that if you would like to set options, you must use
- * the @ref avoptions API and cannot directly set values to members of the
- * structure.
- */
-typedef struct SwrContext SwrContext;
-
-/**
- * Get the AVClass for SwrContext. It can be used in combination with
- * AV_OPT_SEARCH_FAKE_OBJ for examining options.
- *
- * @see av_opt_find().
- * @return the AVClass of SwrContext
- */
-const AVClass *swr_get_class(void);
-
-/**
- * @name SwrContext constructor functions
- * @{
- */
-
-/**
- * Allocate SwrContext.
- *
- * If you use this function you will need to set the parameters (manually or
- * with swr_alloc_set_opts()) before calling swr_init().
- *
- * @see swr_alloc_set_opts(), swr_init(), swr_free()
- * @return NULL on error, allocated context otherwise
- */
-struct SwrContext *swr_alloc(void);
-
-/**
- * Initialize context after user parameters have been set.
- * @note The context must be configured using the AVOption API.
- *
- * @see av_opt_set_int()
- * @see av_opt_set_dict()
- *
- * @paramin,out   s Swr context to initialize
- * @return AVERROR error code in case of failure.
- */
-int swr_init(struct SwrContext *s);
-
-/**
- * Check whether an swr context has been initialized or not.
- *
- * @paramin       s Swr context to check
- * @see swr_init()
- * @return positive if it has been initialized, 0 if not initialized
- */
-int swr_is_initialized(struct SwrContext *s);
-
-/**
- * Allocate SwrContext if needed and set/reset common parameters.
- *
- * This function does not require s to be allocated with swr_alloc(). On the
- * other hand, swr_alloc() can use swr_alloc_set_opts() to set the parameters
- * on the allocated context.
- *
- * @param s               existing Swr context if available, or NULL if not
- * @param out_ch_layout   output channel layout (AV_CH_LAYOUT_*)
- * @param out_sample_fmt  output sample format (AV_SAMPLE_FMT_*).
- * @param out_sample_rate output sample rate (frequency in Hz)
- * @param in_ch_layout    input channel layout (AV_CH_LAYOUT_*)
- * @param in_sample_fmt   input sample format (AV_SAMPLE_FMT_*).
- * @param in_sample_rate  input sample rate (frequency in Hz)
- * @param log_offset      logging level offset
- * @param log_ctx         parent logging context, can be NULL
- *
- * @see swr_init(), swr_free()
- * @return NULL on error, allocated context otherwise
- */
-struct SwrContext *swr_alloc_set_opts(struct SwrContext *s,
-                                      int64_t out_ch_layout, enum AVSampleFormat out_sample_fmt, int out_sample_rate,
-                                      int64_t  in_ch_layout, enum AVSampleFormat  in_sample_fmt, int  in_sample_rate,
-                                      int log_offset, void *log_ctx);
-
-/**
- * @}
- *
- * @name SwrContext destructor functions
- * @{
- */
-
-/**
- * Free the given SwrContext and set the pointer to NULL.
- *
- * @paramin s a pointer to a pointer to Swr context
- */
-void swr_free(struct SwrContext **s);
-
-/**
- * Closes the context so that swr_is_initialized() returns 0.
- *
- * The context can be brought back to life by running swr_init(),
- * swr_init() can also be used without swr_close().
- * This function is mainly provided for simplifying the usecase
- * where one tries to support libavresample and libswresample.
- *
- * @paramin,out s Swr context to be closed
- */
-void swr_close(struct SwrContext *s);
-
-/**
- * @}
- *
- * @name Core conversion functions
- * @{
- */
-
-/** Convert audio.
- *
- * in and in_count can be set to 0 to flush the last few samples out at the
- * end.
- *
- * If more input is provided than output space, then the input will be buffered.
- * You can avoid this buffering by using swr_get_out_samples() to retrieve an
- * upper bound on the required number of output samples for the given number of
- * input samples. Conversion will run directly without copying whenever possible.
- *
- * @param s         allocated Swr context, with parameters set
- * @param out       output buffers, only the first one need be set in case of packed audio
- * @param out_count amount of space available for output in samples per channel
- * @param in        input buffers, only the first one need to be set in case of packed audio
- * @param in_count  number of input samples available in one channel
- *
- * @return number of samples output per channel, negative value on error
- */
-int swr_convert(struct SwrContext *s, uint8_t **out, int out_count,
-                                const uint8_t **in , int in_count);
-
-/**
- * Convert the next timestamp from input to output
- * timestamps are in 1/(in_sample_rate * out_sample_rate) units.
- *
- * @note There are 2 slightly differently behaving modes.
- *       @li When automatic timestamp compensation is not used, (min_compensation >= FLT_MAX)
- *              in this case timestamps will be passed through with delays compensated
- *       @li When automatic timestamp compensation is used, (min_compensation < FLT_MAX)
- *              in this case the output timestamps will match output sample numbers.
- *              See ffmpeg-resampler(1) for the two modes of compensation.
- *
- * @param sin     initialized Swr context
- * @param ptsin   timestamp for the next input sample, INT64_MIN if unknown
- * @see swr_set_compensation(), swr_drop_output(), and swr_inject_silence() are
- *      function used internally for timestamp compensation.
- * @return the output timestamp for the next output sample
- */
-int64_t swr_next_pts(struct SwrContext *s, int64_t pts);
-
-/**
- * @}
- *
- * @name Low-level option setting functions
- * These functons provide a means to set low-level options that is not possible
- * with the AVOption API.
- * @{
- */
-
-/**
- * Activate resampling compensation ("soft" compensation). This function is
- * internally called when needed in swr_next_pts().
- *
- * @paramin,out s             allocated Swr context. If it is not initialized,
- *                              or SWR_FLAG_RESAMPLE is not set, swr_init() is
- *                              called with the flag set.
- * @paramin     sample_delta  delta in PTS per sample
- * @paramin     compensation_distance number of samples to compensate for
- * @return    >= 0 on success, AVERROR error codes if:
- *            @li @c s is NULL,
- *            @li @c compensation_distance is less than 0,
- *            @li @c compensation_distance is 0 but sample_delta is not,
- *            @li compensation unsupported by resampler, or
- *            @li swr_init() fails when called.
- */
-int swr_set_compensation(struct SwrContext *s, int sample_delta, int compensation_distance);
-
-/**
- * Set a customized input channel mapping.
- *
- * @paramin,out s           allocated Swr context, not yet initialized
- * @paramin     channel_map customized input channel mapping (array of channel
- *                            indexes, -1 for a muted channel)
- * @return >= 0 on success, or AVERROR error code in case of failure.
- */
-int swr_set_channel_mapping(struct SwrContext *s, const int *channel_map);
-
-/**
- * Generate a channel mixing matrix.
- *
- * This function is the one used internally by libswresample for building the
- * default mixing matrix. It is made public just as a utility function for
- * building custom matrices.
- *
- * @param in_layout           input channel layout
- * @param out_layout          output channel layout
- * @param center_mix_level    mix level for the center channel
- * @param surround_mix_level  mix level for the surround channel(s)
- * @param lfe_mix_level       mix level for the low-frequency effects channel
- * @param rematrix_maxval     if 1.0, coefficients will be normalized to prevent
- *                            overflow. if INT_MAX, coefficients will not be
- *                            normalized.
- * @paramout matrix         mixing coefficients; matrixi + stride * o is
- *                            the weight of input channel i in output channel o.
- * @param stride              distance between adjacent input channels in the
- *                            matrix array
- * @param matrix_encoding     matrixed stereo downmix mode (e.g. dplii)
- * @param log_ctx             parent logging context, can be NULL
- * @return                    0 on success, negative AVERROR code on failure
- */
-int swr_build_matrix(uint64_t in_layout, uint64_t out_layout,
-                     double center_mix_level, double surround_mix_level,
-                     double lfe_mix_level, double rematrix_maxval,
-                     double rematrix_volume, double *matrix,
-                     int stride, enum AVMatrixEncoding matrix_encoding,
-                     void *log_ctx);
-
-/**
- * Set a customized remix matrix.
- *
- * @param s       allocated Swr context, not yet initialized
- * @param matrix  remix coefficients; matrixi + stride * o is
- *                the weight of input channel i in output channel o
- * @param stride  offset between lines of the matrix
- * @return  >= 0 on success, or AVERROR error code in case of failure.
- */
-int swr_set_matrix(struct SwrContext *s, const double *matrix, int stride);
-
-/**
- * @}
- *
- * @name Sample handling functions
- * @{
- */
-
-/**
- * Drops the specified number of output samples.
- *
- * This function, along with swr_inject_silence(), is called by swr_next_pts()
- * if needed for "hard" compensation.
- *
- * @param s     allocated Swr context
- * @param count number of samples to be dropped
- *
- * @return >= 0 on success, or a negative AVERROR code on failure
- */
-int swr_drop_output(struct SwrContext *s, int count);
-
-/**
- * Injects the specified number of silence samples.
- *
- * This function, along with swr_drop_output(), is called by swr_next_pts()
- * if needed for "hard" compensation.
- *
- * @param s     allocated Swr context
- * @param count number of samples to be dropped
- *
- * @return >= 0 on success, or a negative AVERROR code on failure
- */
-int swr_inject_silence(struct SwrContext *s, int count);
-
-/**
- * Gets the delay the next input sample will experience relative to the next output sample.
- *
- * Swresample can buffer data if more input has been provided than available
- * output space, also converting between sample rates needs a delay.
- * This function returns the sum of all such delays.
- * The exact delay is not necessarily an integer value in either input or
- * output sample rate. Especially when downsampling by a large value, the
- * output sample rate may be a poor choice to represent the delay, similarly
- * for upsampling and the input sample rate.
- *
- * @param s     swr context
- * @param base  timebase in which the returned delay will be:
- *              @li if it's set to 1 the returned delay is in seconds
- *              @li if it's set to 1000 the returned delay is in milliseconds
- *              @li if it's set to the input sample rate then the returned
- *                  delay is in input samples
- *              @li if it's set to the output sample rate then the returned
- *                  delay is in output samples
- *              @li if it's the least common multiple of in_sample_rate and
- *                  out_sample_rate then an exact rounding-free delay will be
- *                  returned
- * @returns     the delay in 1 / @c base units.
- */
-int64_t swr_get_delay(struct SwrContext *s, int64_t base);
-
-/**
- * Find an upper bound on the number of samples that the next swr_convert
- * call will output, if called with in_samples of input samples. This
- * depends on the internal state, and anything changing the internal state
- * (like further swr_convert() calls) will may change the number of samples
- * swr_get_out_samples() returns for the same number of input samples.
- *
- * @param in_samples    number of input samples.
- * @note any call to swr_inject_silence(), swr_convert(), swr_next_pts()
- *       or swr_set_compensation() invalidates this limit
- * @note it is recommended to pass the correct available buffer size
- *       to all functions like swr_convert() even if swr_get_out_samples()
- *       indicates that less would be used.
- * @returns an upper bound on the number of samples that the next swr_convert
- *          will output or a negative value to indicate an error
- */
-int swr_get_out_samples(struct SwrContext *s, int in_samples);
-
-/**
- * @}
- *
- * @name Configuration accessors
- * @{
- */
-
-/**
- * Return the @ref LIBSWRESAMPLE_VERSION_INT constant.
- *
- * This is useful to check if the build-time libswresample has the same version
- * as the run-time one.
- *
- * @returns     the unsigned int-typed version
- */
-unsigned swresample_version(void);
-
-/**
- * Return the swr build-time configuration.
- *
- * @returns     the build-time @c ./configure flags
- */
-const char *swresample_configuration(void);
-
-/**
- * Return the swr license.
- *
- * @returns     the license of libswresample, determined at build-time
- */
-const char *swresample_license(void);
-
-/**
- * @}
- *
- * @name AVFrame based API
- * @{
- */
-
-/**
- * Convert the samples in the input AVFrame and write them to the output AVFrame.
- *
- * Input and output AVFrames must have channel_layout, sample_rate and format set.
- *
- * If the output AVFrame does not have the data pointers allocated the nb_samples
- * field will be set using av_frame_get_buffer()
- * is called to allocate the frame.
- *
- * The output AVFrame can be NULL or have fewer allocated samples than required.
- * In this case, any remaining samples not written to the output will be added
- * to an internal FIFO buffer, to be returned at the next call to this function
- * or to swr_convert().
- *
- * If converting sample rate, there may be data remaining in the internal
- * resampling delay buffer. swr_get_delay() tells the number of
- * remaining samples. To get this data as output, call this function or
- * swr_convert() with NULL input.
- *
- * If the SwrContext configuration does not match the output and
- * input AVFrame settings the conversion does not take place and depending on
- * which AVFrame is not matching AVERROR_OUTPUT_CHANGED, AVERROR_INPUT_CHANGED
- * or the result of a bitwise-OR of them is returned.
- *
- * @see swr_delay()
- * @see swr_convert()
- * @see swr_get_delay()
- *
- * @param swr             audio resample context
- * @param output          output AVFrame
- * @param input           input AVFrame
- * @return                0 on success, AVERROR on failure or nonmatching
- *                        configuration.
- */
-int swr_convert_frame(SwrContext *swr,
-                      AVFrame *output, const AVFrame *input);
-
-/**
- * Configure or reconfigure the SwrContext using the information
- * provided by the AVFrames.
- *
- * The original resampling context is reset even on failure.
- * The function calls swr_close() internally if the context is open.
- *
- * @see swr_close();
- *
- * @param swr             audio resample context
- * @param output          output AVFrame
- * @param input           input AVFrame
- * @return                0 on success, AVERROR on failure.
- */
-int swr_config_frame(SwrContext *swr, const AVFrame *out, const AVFrame *in);
-
-/**
- * @}
- * @}
- */
-
-#endif /* SWRESAMPLE_SWRESAMPLE_H */

gpac-2.2.1.tar.gz/extra_lib/include/libswresample/version.h Deleted

@@ -1,45 +0,0 @@
-/*
- * Version macros.
- *
- * This file is part of libswresample
- *
- * libswresample 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.
- *
- * libswresample 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 libswresample; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef SWRESAMPLE_VERSION_H
-#define SWRESAMPLE_VERSION_H
-
-/**
- * @file
- * Libswresample version macros
- */
-
-#include "libavutil/version.h"
-
-#define LIBSWRESAMPLE_VERSION_MAJOR   4
-#define LIBSWRESAMPLE_VERSION_MINOR   3
-#define LIBSWRESAMPLE_VERSION_MICRO 100
-
-#define LIBSWRESAMPLE_VERSION_INT  AV_VERSION_INT(LIBSWRESAMPLE_VERSION_MAJOR, \
-                                                  LIBSWRESAMPLE_VERSION_MINOR, \
-                                                  LIBSWRESAMPLE_VERSION_MICRO)
-#define LIBSWRESAMPLE_VERSION      AV_VERSION(LIBSWRESAMPLE_VERSION_MAJOR, \
-                                              LIBSWRESAMPLE_VERSION_MINOR, \
-                                              LIBSWRESAMPLE_VERSION_MICRO)
-#define LIBSWRESAMPLE_BUILD        LIBSWRESAMPLE_VERSION_INT
-
-#define LIBSWRESAMPLE_IDENT        "SwR" AV_STRINGIFY(LIBSWRESAMPLE_VERSION)
-
-#endif /* SWRESAMPLE_VERSION_H */

gpac-2.2.1.tar.gz/extra_lib/include/libswscale Deleted

gpac-2.2.1.tar.gz/extra_lib/include/libswscale/swscale.h Deleted

@@ -1,425 +0,0 @@
-/*
- * Copyright (C) 2001-2011 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 SWSCALE_SWSCALE_H
-#define SWSCALE_SWSCALE_H
-
-/**
- * @file
- * @ingroup libsws
- * external API header
- */
-
-#include <stdint.h>
-
-#include "libavutil/avutil.h"
-#include "libavutil/frame.h"
-#include "libavutil/log.h"
-#include "libavutil/pixfmt.h"
-#include "version.h"
-
-/**
- * @defgroup libsws libswscale
- * Color conversion and scaling library.
- *
- * @{
- *
- * Return the LIBSWSCALE_VERSION_INT constant.
- */
-unsigned swscale_version(void);
-
-/**
- * Return the libswscale build-time configuration.
- */
-const char *swscale_configuration(void);
-
-/**
- * Return the libswscale license.
- */
-const char *swscale_license(void);
-
-/* values for the flags, the stuff on the command line is different */
-#define SWS_FAST_BILINEAR     1
-#define SWS_BILINEAR          2
-#define SWS_BICUBIC           4
-#define SWS_X                 8
-#define SWS_POINT          0x10
-#define SWS_AREA           0x20
-#define SWS_BICUBLIN       0x40
-#define SWS_GAUSS          0x80
-#define SWS_SINC          0x100
-#define SWS_LANCZOS       0x200
-#define SWS_SPLINE        0x400
-
-#define SWS_SRC_V_CHR_DROP_MASK     0x30000
-#define SWS_SRC_V_CHR_DROP_SHIFT    16
-
-#define SWS_PARAM_DEFAULT           123456
-
-#define SWS_PRINT_INFO              0x1000
-
-//the following 3 flags are not completely implemented
-//internal chrominance subsampling info
-#define SWS_FULL_CHR_H_INT    0x2000
-//input subsampling info
-#define SWS_FULL_CHR_H_INP    0x4000
-#define SWS_DIRECT_BGR        0x8000
-#define SWS_ACCURATE_RND      0x40000
-#define SWS_BITEXACT          0x80000
-#define SWS_ERROR_DIFFUSION  0x800000
-
-#define SWS_MAX_REDUCE_CUTOFF 0.002
-
-#define SWS_CS_ITU709         1
-#define SWS_CS_FCC            4
-#define SWS_CS_ITU601         5
-#define SWS_CS_ITU624         5
-#define SWS_CS_SMPTE170M      5
-#define SWS_CS_SMPTE240M      7
-#define SWS_CS_DEFAULT        5
-#define SWS_CS_BT2020         9
-
-/**
- * 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,
- * SWS_CS_DEFAULT is used.
- */
-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 SwsVector {
-    double *coeff;              ///< pointer to the list of coefficients
-    int length;                 ///< number of coefficients in the vector
-} SwsVector;
-
-// vectors can be shared
-typedef struct SwsFilter {
-    SwsVector *lumH;
-    SwsVector *lumV;
-    SwsVector *chrH;
-    SwsVector *chrV;
-} SwsFilter;
-
-struct SwsContext;
-
-/**
- * Return a positive value if pix_fmt is a supported input format, 0
- * otherwise.
- */
-int sws_isSupportedInput(enum AVPixelFormat pix_fmt);
-
-/**
- * Return a positive value if pix_fmt is a supported output format, 0
- * otherwise.
- */
-int sws_isSupportedOutput(enum AVPixelFormat pix_fmt);
-
-/**
- * @paramin  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);
-
-/**
- * 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
- */
-av_warn_unused_result
-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);
-
-/**
- * Allocate and return an SwsContext. You need it to perform
- * scaling/conversion operations using sws_scale().
- *
- * @param srcW the width of the source image
- * @param srcH the height of the source image
- * @param srcFormat the source image format
- * @param dstW the width of the destination image
- * @param dstH the height of the destination image
- * @param dstFormat the destination image format
- * @param flags specify which algorithm and options to use for rescaling
- * @param param extra parameters to tune the used scaler
- *              For SWS_BICUBIC param0 and 1 tune the shape of the basis
- *              function, param0 tunes f(1) and param1 f´(1)
- *              For SWS_GAUSS param0 tunes the exponent and thus cutoff
- *              frequency
- *              For SWS_LANCZOS param0 tunes the width of the window function
- * @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 AVPixelFormat srcFormat,
-                                  int dstW, int dstH, enum AVPixelFormat dstFormat,
-                                  int flags, SwsFilter *srcFilter,
-                                  SwsFilter *dstFilter, const double *param);
-
-/**
- * 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.
- *
- * Slices have to be provided in sequential order, either in
- * top-bottom or bottom-top order. If slices are provided in
- * non-sequential order the behavior of the function is undefined.
- *
- * @param c         the scaling context previously created with
- *                  sws_getContext()
- * @param srcSlice  the array containing the pointers to the planes of
- *                  the source slice
- * @param srcStride the array containing the strides for each plane of
- *                  the source image
- * @param srcSliceY the position in the source image of the slice to
- *                  process, that is the number (counted starting from
- *                  zero) in the image of the first row of the slice
- * @param srcSliceH the height of the source slice, that is the number
- *                  of rows in the slice
- * @param dst       the array containing the pointers to the planes of
- *                  the destination image
- * @param dstStride the array containing the strides for each plane of
- *                  the destination image
- * @return          the height of the output slice
- */
-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);
-
-/**
- * Scale source data from src and write the output to dst.
- *
- * This is merely a convenience wrapper around
- * - sws_frame_start()
- * - sws_send_slice(0, src->height)
- * - sws_receive_slice(0, dst->height)
- * - sws_frame_end()
- *
- * @param dst The destination frame. See documentation for sws_frame_start() for
- *            more details.
- * @param src The source frame.
- *
- * @return 0 on success, a negative AVERROR code on failure
- */
-int sws_scale_frame(struct SwsContext *c, AVFrame *dst, const AVFrame *src);
-
-/**
- * Initialize the scaling process for a given pair of source/destination frames.
- * Must be called before any calls to sws_send_slice() and sws_receive_slice().
- *
- * This function will retain references to src and dst, so they must both use
- * refcounted buffers (if allocated by the caller, in case of dst).
- *
- * @param dst The destination frame.
- *
- *            The data buffers may either be already allocated by the caller or
- *            left clear, in which case they will be allocated by the scaler.
- *            The latter may have performance advantages - e.g. in certain cases
- *            some output planes may be references to input planes, rather than
- *            copies.
- *
- *            Output data will be written into this frame in successful
- *            sws_receive_slice() calls.
- * @param src The source frame. The data buffers must be allocated, but the
- *            frame data does not have to be ready at this point. Data
- *            availability is then signalled by sws_send_slice().
- * @return 0 on success, a negative AVERROR code on failure
- *
- * @see sws_frame_end()
- */
-int sws_frame_start(struct SwsContext *c, AVFrame *dst, const AVFrame *src);
-
-/**
- * Finish the scaling process for a pair of source/destination frames previously
- * submitted with sws_frame_start(). Must be called after all sws_send_slice()
- * and sws_receive_slice() calls are done, before any new sws_frame_start()
- * calls.
- */
-void sws_frame_end(struct SwsContext *c);
-
-/**
- * Indicate that a horizontal slice of input data is available in the source
- * frame previously provided to sws_frame_start(). The slices may be provided in
- * any order, but may not overlap. For vertically subsampled pixel formats, the
- * slices must be aligned according to subsampling.
- *
- * @param slice_start first row of the slice
- * @param slice_height number of rows in the slice
- *
- * @return a non-negative number on success, a negative AVERROR code on failure.
- */
-int sws_send_slice(struct SwsContext *c, unsigned int slice_start,
-                   unsigned int slice_height);
-
-/**
- * Request a horizontal slice of the output data to be written into the frame
- * previously provided to sws_frame_start().
- *
- * @param slice_start first row of the slice; must be a multiple of
- *                    sws_receive_slice_alignment()
- * @param slice_height number of rows in the slice; must be a multiple of
- *                     sws_receive_slice_alignment(), except for the last slice
- *                     (i.e. when slice_start+slice_height is equal to output
- *                     frame height)
- *
- * @return a non-negative number if the data was successfully written into the output
- *         AVERROR(EAGAIN) if more input data needs to be provided before the
- *                         output can be produced
- *         another negative AVERROR code on other kinds of scaling failure
- */
-int sws_receive_slice(struct SwsContext *c, unsigned int slice_start,
-                      unsigned int slice_height);
-
-/**
- * @return alignment required for output slices requested with sws_receive_slice().
- *         Slice offsets and sizes passed to sws_receive_slice() must be
- *         multiples of the value returned from this function.
- */
-unsigned int sws_receive_slice_alignment(const struct SwsContext *c);
-
-/**
- * @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_coeffsx
- * @param inv_table the yuv2rgb coefficients describing the input yuv space, normally ff_yuv2rgb_coeffsx
- * @param brightness 16.16 fixed point brightness correction
- * @param contrast 16.16 fixed point contrast correction
- * @param saturation 16.16 fixed point saturation correction
-#if LIBSWSCALE_VERSION_MAJOR > 6
- * @return negative error code on error, non negative otherwise
-#else
- * @return -1 if not supported
-#endif
- */
-int sws_setColorspaceDetails(struct SwsContext *c, const int inv_table4,
-                             int srcRange, const int table4, int dstRange,
-                             int brightness, int contrast, int saturation);
-
-/**
-#if LIBSWSCALE_VERSION_MAJOR > 6
- * @return negative error code on error, non negative otherwise
-#else
- * @return -1 if not supported
-#endif
- */
-int sws_getColorspaceDetails(struct SwsContext *c, int **inv_table,
-                             int *srcRange, int **table, int *dstRange,
-                             int *brightness, int *contrast, int *saturation);
-
-/**
- * Allocate and return an uninitialized vector with length coefficients.
- */
-SwsVector *sws_allocVec(int length);
-
-/**
- * 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);
-
-/**
- * Scale all the coefficients of a by the scalar value.
- */
-void sws_scaleVec(SwsVector *a, double scalar);
-
-/**
- * Scale all the coefficients of a so that their sum equals height.
- */
-void sws_normalizeVec(SwsVector *a, double height);
-
-void sws_freeVec(SwsVector *a);
-
-SwsFilter *sws_getDefaultFilter(float lumaGBlur, float chromaGBlur,
-                                float lumaSharpen, float chromaSharpen,
-                                float chromaHShift, float chromaVShift,
-                                int verbose);
-void sws_freeFilter(SwsFilter *filter);
-
-/**
- * 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
- * saved in context. If that is the case, returns the current
- * context. Otherwise, frees context and gets a new context with
- * the new parameters.
- *
- * Be warned that srcFilter and dstFilter are not checked, they
- * are assumed to remain the same.
- */
-struct SwsContext *sws_getCachedContext(struct SwsContext *context,
-                                        int srcW, int srcH, enum AVPixelFormat srcFormat,
-                                        int dstW, int dstH, enum AVPixelFormat dstFormat,
-                                        int flags, SwsFilter *srcFilter,
-                                        SwsFilter *dstFilter, const double *param);
-
-/**
- * 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.
- *
- * @param src        source frame buffer
- * @param dst        destination frame buffer
- * @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, int num_pixels, const uint8_t *palette);
-
-/**
- * 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".
- *
- * @param src        source frame buffer
- * @param dst        destination frame buffer
- * @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, 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-2.2.1.tar.gz/extra_lib/include/libswscale/version.h Deleted

@@ -1,49 +0,0 @@
-/*
- * 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   6
-#define LIBSWSCALE_VERSION_MINOR   4
-#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.
- */
-
-#endif /* SWSCALE_VERSION_H */

gpac-2.2.1.tar.gz/extra_lib/include/mad.h Deleted

@@ -1,952 +0,0 @@
-/*
- * libmad - MPEG audio decoder library
- * Copyright (C) 2000-2004 Underbit Technologies, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- * If you would like to negotiate alternate licensing terms, you may do
- * so by contacting: Underbit Technologies, Inc. <info@underbit.com>
- */
-
-# ifdef __cplusplus
-extern "C" {
-# endif
-
-#ifndef _WIN32_WCE
-# define FPM_INTEL
-#else
-# define FPM_DEFAULT
-#endif
-
-
-
-# define SIZEOF_INT 4
-# define SIZEOF_LONG 4
-# define SIZEOF_LONG_LONG 8
-
-
-/* Id: version.h,v 1.24 2003/05/27 22:40:37 rob Exp */
-
-# ifndef LIBMAD_VERSION_H
-# define LIBMAD_VERSION_H
-
-# define MAD_VERSION_MAJOR	0
-# define MAD_VERSION_MINOR	15
-# define MAD_VERSION_PATCH	1
-# define MAD_VERSION_EXTRA	" (beta)"
-
-# define MAD_VERSION_STRINGIZE(str)	#str
-# define MAD_VERSION_STRING(num)	MAD_VERSION_STRINGIZE(num)
-
-# define MAD_VERSION		MAD_VERSION_STRING(MAD_VERSION_MAJOR) "."  \
-				MAD_VERSION_STRING(MAD_VERSION_MINOR) "."  \
-				MAD_VERSION_STRING(MAD_VERSION_PATCH)  \
-				MAD_VERSION_EXTRA
-
-# define MAD_PUBLISHYEAR	"2000-2003"
-# define MAD_AUTHOR		"Underbit Technologies, Inc."
-# define MAD_EMAIL		"info@underbit.com"
-
-extern char const mad_version;
-extern char const mad_copyright;
-extern char const mad_author;
-extern char const mad_build;
-
-# endif
-
-/* Id: fixed.h,v 1.36 2003/05/28 04:36:00 rob Exp */
-
-# ifndef LIBMAD_FIXED_H
-# define LIBMAD_FIXED_H
-
-# if SIZEOF_INT >= 4
-typedef   signed int mad_fixed_t;
-
-typedef   signed int mad_fixed64hi_t;
-typedef unsigned int mad_fixed64lo_t;
-# else
-typedef   signed long mad_fixed_t;
-
-typedef   signed long mad_fixed64hi_t;
-typedef unsigned long mad_fixed64lo_t;
-# endif
-
-# if defined(_MSC_VER)
-#  define mad_fixed64_t  signed __int64
-# elif 1 || defined(__GNUC__)
-#  define mad_fixed64_t  signed long long
-# endif
-
-# if defined(FPM_FLOAT)
-typedef double mad_sample_t;
-# else
-typedef mad_fixed_t mad_sample_t;
-# endif
-
-/*
- * Fixed-point format: 0xABBBBBBB
- * A == whole part      (sign + 3 bits)
- * B == fractional part (28 bits)
- *
- * Values are signed two's complement, so the effective range is:
- * 0x80000000 to 0x7fffffff
- *       -8.0 to +7.9999999962747097015380859375
- *
- * The smallest representable value is:
- * 0x00000001 == 0.0000000037252902984619140625 (i.e. about 3.725e-9)
- *
- * 28 bits of fractional accuracy represent about
- * 8.6 digits of decimal accuracy.
- *
- * Fixed-point numbers can be added or subtracted as normal
- * integers, but multiplication requires shifting the 64-bit result
- * from 56 fractional bits back to 28 (and rounding.)
- *
- * Changing the definition of MAD_F_FRACBITS is only partially
- * supported, and must be done with care.
- */
-
-# define MAD_F_FRACBITS		28
-
-# if MAD_F_FRACBITS == 28
-#  define MAD_F(x)		((mad_fixed_t) (x##L))
-# else
-#  if MAD_F_FRACBITS < 28
-#   warning "MAD_F_FRACBITS < 28"
-#   define MAD_F(x)		((mad_fixed_t)  \
-				 (((x##L) +  \
-				   (1L << (28 - MAD_F_FRACBITS - 1))) >>  \
-				  (28 - MAD_F_FRACBITS)))
-#  elif MAD_F_FRACBITS > 28
-#   error "MAD_F_FRACBITS > 28 not currently supported"
-#   define MAD_F(x)		((mad_fixed_t)  \
-				 ((x##L) << (MAD_F_FRACBITS - 28)))
-#  endif
-# endif
-
-# define MAD_F_MIN		((mad_fixed_t) -0x80000000L)
-# define MAD_F_MAX		((mad_fixed_t) +0x7fffffffL)
-
-# define MAD_F_ONE		MAD_F(0x10000000)
-
-# define mad_f_tofixed(x)	((mad_fixed_t)  \
-				 ((x) * (double) (1L << MAD_F_FRACBITS) + 0.5))
-# define mad_f_todouble(x)	((double)  \
-				 ((x) / (double) (1L << MAD_F_FRACBITS)))
-
-# define mad_f_intpart(x)	((x) >> MAD_F_FRACBITS)
-# define mad_f_fracpart(x)	((x) & ((1L << MAD_F_FRACBITS) - 1))
-				/* (x should be positive) */
-
-# define mad_f_fromint(x)	((x) << MAD_F_FRACBITS)
-
-# define mad_f_add(x, y)	((x) + (y))
-# define mad_f_sub(x, y)	((x) - (y))
-
-# if defined(FPM_FLOAT)
-#  error "FPM_FLOAT not yet supported"
-
-#  undef MAD_F
-#  define MAD_F(x)		mad_f_todouble(x)
-
-#  define mad_f_mul(x, y)	((x) * (y))
-#  define mad_f_scale64
-
-#  undef ASO_ZEROCHECK
-
-# elif defined(FPM_64BIT)
-
-/*
- * This version should be the most accurate if 64-bit types are supported by
- * the compiler, although it may not be the most efficient.
- */
-#  if defined(OPT_ACCURACY)
-#   define mad_f_mul(x, y)  \
-    ((mad_fixed_t)  \
-     ((((mad_fixed64_t) (x) * (y)) +  \
-       (1L << (MAD_F_SCALEBITS - 1))) >> MAD_F_SCALEBITS))
-#  else
-#   define mad_f_mul(x, y)  \
-    ((mad_fixed_t) (((mad_fixed64_t) (x) * (y)) >> MAD_F_SCALEBITS))
-#  endif
-
-#  define MAD_F_SCALEBITS  MAD_F_FRACBITS
-
-/* --- Intel --------------------------------------------------------------- */
-
-# elif defined(FPM_INTEL)
-
-#  if defined(_MSC_VER)
-#   pragma warning(push)
-#   pragma warning(disable: 4035)  /* no return value */
-static __forceinline
-mad_fixed_t mad_f_mul_inline(mad_fixed_t x, mad_fixed_t y)
-{
-  enum {
-    fracbits = MAD_F_FRACBITS
-  };
-
-  __asm {
-    mov eax, x
-    imul y
-    shrd eax, edx, fracbits
-  }
-
-  /* implicit return of eax */
-}
-#   pragma warning(pop)
-
-#   define mad_f_mul		mad_f_mul_inline
-#   define mad_f_scale64
-#  else
-/*
- * This Intel version is fast and accurate; the disposition of the least
- * significant bit depends on OPT_ACCURACY via mad_f_scale64().
- */
-#   define MAD_F_MLX(hi, lo, x, y)  \
-    asm ("imull %3"  \
-	 : "=a" (lo), "=d" (hi)  \
-	 : "%a" (x), "rm" (y)  \
-	 : "cc")
-
-#   if defined(OPT_ACCURACY)
-/*
- * This gives best accuracy but is not very fast.
- */
-#    define MAD_F_MLA(hi, lo, x, y)  \
-    ({ mad_fixed64hi_t __hi;  \
-       mad_fixed64lo_t __lo;  \
-       MAD_F_MLX(__hi, __lo, (x), (y));  \
-       asm ("addl %2,%0\n\t"  \
-	    "adcl %3,%1"  \
-	    : "=rm" (lo), "=rm" (hi)  \
-	    : "r" (__lo), "r" (__hi), "0" (lo), "1" (hi)  \
-	    : "cc");  \
-    })
-#   endif  /* OPT_ACCURACY */
-
-#   if defined(OPT_ACCURACY)
-/*
- * Surprisingly, this is faster than SHRD followed by ADC.
- */
-#    define mad_f_scale64(hi, lo)  \
-    ({ mad_fixed64hi_t __hi_;  \
-       mad_fixed64lo_t __lo_;  \
-       mad_fixed_t __result;  \
-       asm ("addl %4,%2\n\t"  \
-	    "adcl %5,%3"  \
-	    : "=rm" (__lo_), "=rm" (__hi_)  \
-	    : "0" (lo), "1" (hi),  \
-	      "ir" (1L << (MAD_F_SCALEBITS - 1)), "ir" (0)  \
-	    : "cc");  \
-       asm ("shrdl %3,%2,%1"  \
-	    : "=rm" (__result)  \
-	    : "0" (__lo_), "r" (__hi_), "I" (MAD_F_SCALEBITS)  \
-	    : "cc");  \
-       __result;  \
-    })
-#    else
-#    define mad_f_scale64(hi, lo)  \
-    ({ mad_fixed_t __result;  \
-       asm ("shrdl %3,%2,%1"  \
-	    : "=rm" (__result)  \
-	    : "0" (lo), "r" (hi), "I" (MAD_F_SCALEBITS)  \
-	    : "cc");  \
-       __result;  \
-    })
-#   endif  /* OPT_ACCURACY */
-
-#   define MAD_F_SCALEBITS  MAD_F_FRACBITS
-#  endif
-
-/* --- ARM ----------------------------------------------------------------- */
-
-# elif defined(FPM_ARM)
-
-/* 
- * This ARM V4 version is as accurate as FPM_64BIT but much faster. The
- * least significant bit is properly rounded at no CPU cycle cost!
- */
-# if 1
-/*
- * This is faster than the default implementation via MAD_F_MLX() and
- * mad_f_scale64().
- */
-#  define mad_f_mul(x, y)  \
-    ({ mad_fixed64hi_t __hi;  \
-       mad_fixed64lo_t __lo;  \
-       mad_fixed_t __result;  \
-       asm ("smull	%0, %1, %3, %4\n\t"  \
-	    "movs	%0, %0, lsr %5\n\t"  \
-	    "adc	%2, %0, %1, lsl %6"  \
-	    : "=&r" (__lo), "=&r" (__hi), "=r" (__result)  \
-	    : "%r" (x), "r" (y),  \
-	      "M" (MAD_F_SCALEBITS), "M" (32 - MAD_F_SCALEBITS)  \
-	    : "cc");  \
-       __result;  \
-    })
-# endif
-
-#  define MAD_F_MLX(hi, lo, x, y)  \
-    asm ("smull	%0, %1, %2, %3"  \
-	 : "=&r" (lo), "=&r" (hi)  \
-	 : "%r" (x), "r" (y))
-
-#  define MAD_F_MLA(hi, lo, x, y)  \
-    asm ("smlal	%0, %1, %2, %3"  \
-	 : "+r" (lo), "+r" (hi)  \
-	 : "%r" (x), "r" (y))
-
-#  define MAD_F_MLN(hi, lo)  \
-    asm ("rsbs	%0, %2, #0\n\t"  \
-	 "rsc	%1, %3, #0"  \
-	 : "=r" (lo), "=r" (hi)  \
-	 : "0" (lo), "1" (hi)  \
-	 : "cc")
-
-#  define mad_f_scale64(hi, lo)  \
-    ({ mad_fixed_t __result;  \
-       asm ("movs	%0, %1, lsr %3\n\t"  \
-	    "adc	%0, %0, %2, lsl %4"  \
-	    : "=&r" (__result)  \
-	    : "r" (lo), "r" (hi),  \
-	      "M" (MAD_F_SCALEBITS), "M" (32 - MAD_F_SCALEBITS)  \
-	    : "cc");  \
-       __result;  \
-    })
-
-#  define MAD_F_SCALEBITS  MAD_F_FRACBITS
-
-/* --- MIPS ---------------------------------------------------------------- */
-
-# elif defined(FPM_MIPS)
-
-/*
- * This MIPS version is fast and accurate; the disposition of the least
- * significant bit depends on OPT_ACCURACY via mad_f_scale64().
- */
-#  define MAD_F_MLX(hi, lo, x, y)  \
-    asm ("mult	%2,%3"  \
-	 : "=l" (lo), "=h" (hi)  \
-	 : "%r" (x), "r" (y))
-
-# if defined(HAVE_MADD_ASM)
-#  define MAD_F_MLA(hi, lo, x, y)  \
-    asm ("madd	%2,%3"  \
-	 : "+l" (lo), "+h" (hi)  \
-	 : "%r" (x), "r" (y))
-# elif defined(HAVE_MADD16_ASM)
-/*
- * This loses significant accuracy due to the 16-bit integer limit in the
- * multiply/accumulate instruction.
- */
-#  define MAD_F_ML0(hi, lo, x, y)  \
-    asm ("mult	%2,%3"  \
-	 : "=l" (lo), "=h" (hi)  \
-	 : "%r" ((x) >> 12), "r" ((y) >> 16))
-#  define MAD_F_MLA(hi, lo, x, y)  \
-    asm ("madd16	%2,%3"  \
-	 : "+l" (lo), "+h" (hi)  \
-	 : "%r" ((x) >> 12), "r" ((y) >> 16))
-#  define MAD_F_MLZ(hi, lo)  ((mad_fixed_t) (lo))
-# endif
-
-# if defined(OPT_SPEED)
-#  define mad_f_scale64(hi, lo)  \
-    ((mad_fixed_t) ((hi) << (32 - MAD_F_SCALEBITS)))
-#  define MAD_F_SCALEBITS  MAD_F_FRACBITS
-# endif
-
-/* --- SPARC --------------------------------------------------------------- */
-
-# elif defined(FPM_SPARC)
-
-/*
- * This SPARC V8 version is fast and accurate; the disposition of the least
- * significant bit depends on OPT_ACCURACY via mad_f_scale64().
- */
-#  define MAD_F_MLX(hi, lo, x, y)  \
-    asm ("smul %2, %3, %0\n\t"  \
-	 "rd %%y, %1"  \
-	 : "=r" (lo), "=r" (hi)  \
-	 : "%r" (x), "rI" (y))
-
-/* --- PowerPC ------------------------------------------------------------- */
-
-# elif defined(FPM_PPC)
-
-/*
- * This PowerPC version is fast and accurate; the disposition of the least
- * significant bit depends on OPT_ACCURACY via mad_f_scale64().
- */
-#  define MAD_F_MLX(hi, lo, x, y)  \
-    do {  \
-      asm ("mullw %0,%1,%2"  \
-	   : "=r" (lo)  \
-	   : "%r" (x), "r" (y));  \
-      asm ("mulhw %0,%1,%2"  \
-	   : "=r" (hi)  \
-	   : "%r" (x), "r" (y));  \
-    }  \
-    while (0)
-
-#  if defined(OPT_ACCURACY)
-/*
- * This gives best accuracy but is not very fast.
- */
-#   define MAD_F_MLA(hi, lo, x, y)  \
-    ({ mad_fixed64hi_t __hi;  \
-       mad_fixed64lo_t __lo;  \
-       MAD_F_MLX(__hi, __lo, (x), (y));  \
-       asm ("addc %0,%2,%3\n\t"  \
-	    "adde %1,%4,%5"  \
-	    : "=r" (lo), "=r" (hi)  \
-	    : "%r" (lo), "r" (__lo),  \
-	      "%r" (hi), "r" (__hi)  \
-	    : "xer");  \
-    })
-#  endif
-
-#  if defined(OPT_ACCURACY)
-/*
- * This is slower than the truncating version below it.
- */
-#   define mad_f_scale64(hi, lo)  \
-    ({ mad_fixed_t __result, __round;  \
-       asm ("rotrwi %0,%1,%2"  \
-	    : "=r" (__result)  \
-	    : "r" (lo), "i" (MAD_F_SCALEBITS));  \
-       asm ("extrwi %0,%1,1,0"  \
-	    : "=r" (__round)  \
-	    : "r" (__result));  \
-       asm ("insrwi %0,%1,%2,0"  \
-	    : "+r" (__result)  \
-	    : "r" (hi), "i" (MAD_F_SCALEBITS));  \
-       asm ("add %0,%1,%2"  \
-	    : "=r" (__result)  \
-	    : "%r" (__result), "r" (__round));  \
-       __result;  \
-    })
-#  else
-#   define mad_f_scale64(hi, lo)  \
-    ({ mad_fixed_t __result;  \
-       asm ("rotrwi %0,%1,%2"  \
-	    : "=r" (__result)  \
-	    : "r" (lo), "i" (MAD_F_SCALEBITS));  \
-       asm ("insrwi %0,%1,%2,0"  \
-	    : "+r" (__result)  \
-	    : "r" (hi), "i" (MAD_F_SCALEBITS));  \
-       __result;  \
-    })
-#  endif
-
-#  define MAD_F_SCALEBITS  MAD_F_FRACBITS
-
-/* --- Default ------------------------------------------------------------- */
-
-# elif defined(FPM_DEFAULT)
-
-/*
- * This version is the most portable but it loses significant accuracy.
- * Furthermore, accuracy is biased against the second argument, so care
- * should be taken when ordering operands.
- *
- * The scale factors are constant as this is not used with SSO.
- *
- * Pre-rounding is required to stay within the limits of compliance.
- */
-#  if defined(OPT_SPEED)
-#   define mad_f_mul(x, y)	(((x) >> 12) * ((y) >> 16))
-#  else
-#   define mad_f_mul(x, y)	((((x) + (1L << 11)) >> 12) *  \
-				 (((y) + (1L << 15)) >> 16))
-#  endif
-
-/* ------------------------------------------------------------------------- */
-
-# else
-#  error "no FPM selected"
-# endif
-
-/* default implementations */
-
-# if !defined(mad_f_mul)
-#  define mad_f_mul(x, y)  \
-    ({ register mad_fixed64hi_t __hi;  \
-       register mad_fixed64lo_t __lo;  \
-       MAD_F_MLX(__hi, __lo, (x), (y));  \
-       mad_f_scale64(__hi, __lo);  \
-    })
-# endif
-
-# if !defined(MAD_F_MLA)
-#  define MAD_F_ML0(hi, lo, x, y)	((lo)  = mad_f_mul((x), (y)))
-#  define MAD_F_MLA(hi, lo, x, y)	((lo) += mad_f_mul((x), (y)))
-#  define MAD_F_MLN(hi, lo)		((lo)  = -(lo))
-#  define MAD_F_MLZ(hi, lo)		((void) (hi), (mad_fixed_t) (lo))
-# endif
-
-# if !defined(MAD_F_ML0)
-#  define MAD_F_ML0(hi, lo, x, y)	MAD_F_MLX((hi), (lo), (x), (y))
-# endif
-
-# if !defined(MAD_F_MLN)
-#  define MAD_F_MLN(hi, lo)		((hi) = ((lo) = -(lo)) ? ~(hi) : -(hi))
-# endif
-
-# if !defined(MAD_F_MLZ)
-#  define MAD_F_MLZ(hi, lo)		mad_f_scale64((hi), (lo))
-# endif
-
-# if !defined(mad_f_scale64)
-#  if defined(OPT_ACCURACY)
-#   define mad_f_scale64(hi, lo)  \
-    ((((mad_fixed_t)  \
-       (((hi) << (32 - (MAD_F_SCALEBITS - 1))) |  \
-	((lo) >> (MAD_F_SCALEBITS - 1)))) + 1) >> 1)
-#  else
-#   define mad_f_scale64(hi, lo)  \
-    ((mad_fixed_t)  \
-     (((hi) << (32 - MAD_F_SCALEBITS)) |  \
-      ((lo) >> MAD_F_SCALEBITS)))
-#  endif
-#  define MAD_F_SCALEBITS  MAD_F_FRACBITS
-# endif
-
-/* C routines */
-
-mad_fixed_t mad_f_abs(mad_fixed_t);
-mad_fixed_t mad_f_div(mad_fixed_t, mad_fixed_t);
-
-# endif
-
-/* Id: bit.h,v 1.11 2003/05/27 22:40:36 rob Exp */
-
-# ifndef LIBMAD_BIT_H
-# define LIBMAD_BIT_H
-
-struct mad_bitptr {
-  unsigned char const *byte;
-  unsigned short cache;
-  unsigned short left;
-};
-
-void mad_bit_init(struct mad_bitptr *, unsigned char const *);
-
-# define mad_bit_finish(bitptr)		/* nothing */
-
-unsigned int mad_bit_length(struct mad_bitptr const *,
-			    struct mad_bitptr const *);
-
-# define mad_bit_bitsleft(bitptr)  ((bitptr)->left)
-unsigned char const *mad_bit_nextbyte(struct mad_bitptr const *);
-
-void mad_bit_skip(struct mad_bitptr *, unsigned int);
-unsigned long mad_bit_read(struct mad_bitptr *, unsigned int);
-void mad_bit_write(struct mad_bitptr *, unsigned int, unsigned long);
-
-unsigned short mad_bit_crc(struct mad_bitptr, unsigned int, unsigned short);
-
-# endif
-
-/* Id: timer.h,v 1.15 2003/05/27 22:40:37 rob Exp */
-
-# ifndef LIBMAD_TIMER_H
-# define LIBMAD_TIMER_H
-
-typedef struct {
-  signed long seconds;		/* whole seconds */
-  unsigned long fraction;	/* 1/MAD_TIMER_RESOLUTION seconds */
-} mad_timer_t;
-
-extern mad_timer_t const mad_timer_zero;
-
-# define MAD_TIMER_RESOLUTION	352800000UL
-
-enum mad_units {
-  MAD_UNITS_HOURS	 =    -2,
-  MAD_UNITS_MINUTES	 =    -1,
-  MAD_UNITS_SECONDS	 =     0,
-
-  /* metric units */
-
-  MAD_UNITS_DECISECONDS	 =    10,
-  MAD_UNITS_CENTISECONDS =   100,
-  MAD_UNITS_MILLISECONDS =  1000,
-
-  /* audio sample units */
-
-  MAD_UNITS_8000_HZ	 =  8000,
-  MAD_UNITS_11025_HZ	 = 11025,
-  MAD_UNITS_12000_HZ	 = 12000,
-
-  MAD_UNITS_16000_HZ	 = 16000,
-  MAD_UNITS_22050_HZ	 = 22050,
-  MAD_UNITS_24000_HZ	 = 24000,
-
-  MAD_UNITS_32000_HZ	 = 32000,
-  MAD_UNITS_44100_HZ	 = 44100,
-  MAD_UNITS_48000_HZ	 = 48000,
-
-  /* video frame/field units */
-
-  MAD_UNITS_24_FPS	 =    24,
-  MAD_UNITS_25_FPS	 =    25,
-  MAD_UNITS_30_FPS	 =    30,
-  MAD_UNITS_48_FPS	 =    48,
-  MAD_UNITS_50_FPS	 =    50,
-  MAD_UNITS_60_FPS	 =    60,
-
-  /* CD audio frames */
-
-  MAD_UNITS_75_FPS	 =    75,
-
-  /* video drop-frame units */
-
-  MAD_UNITS_23_976_FPS	 =   -24,
-  MAD_UNITS_24_975_FPS	 =   -25,
-  MAD_UNITS_29_97_FPS	 =   -30,
-  MAD_UNITS_47_952_FPS	 =   -48,
-  MAD_UNITS_49_95_FPS	 =   -50,
-  MAD_UNITS_59_94_FPS	 =   -60
-};
-
-# define mad_timer_reset(timer)	((void) (*(timer) = mad_timer_zero))
-
-int mad_timer_compare(mad_timer_t, mad_timer_t);
-
-# define mad_timer_sign(timer)	mad_timer_compare((timer), mad_timer_zero)
-
-void mad_timer_negate(mad_timer_t *);
-mad_timer_t mad_timer_abs(mad_timer_t);
-
-void mad_timer_set(mad_timer_t *, unsigned long, unsigned long, unsigned long);
-void mad_timer_add(mad_timer_t *, mad_timer_t);
-void mad_timer_multiply(mad_timer_t *, signed long);
-
-signed long mad_timer_count(mad_timer_t, enum mad_units);
-unsigned long mad_timer_fraction(mad_timer_t, unsigned long);
-void mad_timer_string(mad_timer_t, char *, char const *,
-		      enum mad_units, enum mad_units, unsigned long);
-
-# endif
-
-/* Id: stream.h,v 1.18 2003/05/27 22:40:37 rob Exp */
-
-# ifndef LIBMAD_STREAM_H
-# define LIBMAD_STREAM_H
-
-
-# define MAD_BUFFER_GUARD	8
-# define MAD_BUFFER_MDLEN	(511 + 2048 + MAD_BUFFER_GUARD)
-
-enum mad_error {
-  MAD_ERROR_NONE	   = 0x0000,	/* no error */
-
-  MAD_ERROR_BUFLEN	   = 0x0001,	/* input buffer too small (or EOF) */
-  MAD_ERROR_BUFPTR	   = 0x0002,	/* invalid (null) buffer pointer */
-
-  MAD_ERROR_NOMEM	   = 0x0031,	/* not enough memory */
-
-  MAD_ERROR_LOSTSYNC	   = 0x0101,	/* lost synchronization */
-  MAD_ERROR_BADLAYER	   = 0x0102,	/* reserved header layer value */
-  MAD_ERROR_BADBITRATE	   = 0x0103,	/* forbidden bitrate value */
-  MAD_ERROR_BADSAMPLERATE  = 0x0104,	/* reserved sample frequency value */
-  MAD_ERROR_BADEMPHASIS	   = 0x0105,	/* reserved emphasis value */
-
-  MAD_ERROR_BADCRC	   = 0x0201,	/* CRC check failed */
-  MAD_ERROR_BADBITALLOC	   = 0x0211,	/* forbidden bit allocation value */
-  MAD_ERROR_BADSCALEFACTOR = 0x0221,	/* bad scalefactor index */
-  MAD_ERROR_BADFRAMELEN	   = 0x0231,	/* bad frame length */
-  MAD_ERROR_BADBIGVALUES   = 0x0232,	/* bad big_values count */
-  MAD_ERROR_BADBLOCKTYPE   = 0x0233,	/* reserved block_type */
-  MAD_ERROR_BADSCFSI	   = 0x0234,	/* bad scalefactor selection info */
-  MAD_ERROR_BADDATAPTR	   = 0x0235,	/* bad main_data_begin pointer */
-  MAD_ERROR_BADPART3LEN	   = 0x0236,	/* bad audio data length */
-  MAD_ERROR_BADHUFFTABLE   = 0x0237,	/* bad Huffman table select */
-  MAD_ERROR_BADHUFFDATA	   = 0x0238,	/* Huffman data overrun */
-  MAD_ERROR_BADSTEREO	   = 0x0239	/* incompatible block_type for JS */
-};
-
-# define MAD_RECOVERABLE(error)	((error) & 0xff00)
-
-struct mad_stream {
-  unsigned char const *buffer;		/* input bitstream buffer */
-  unsigned char const *bufend;		/* end of buffer */
-  unsigned long skiplen;		/* bytes to skip before next frame */
-
-  int sync;				/* stream sync found */
-  unsigned long freerate;		/* free bitrate (fixed) */
-
-  unsigned char const *this_frame;	/* start of current frame */
-  unsigned char const *next_frame;	/* start of next frame */
-  struct mad_bitptr ptr;		/* current processing bit pointer */
-
-  struct mad_bitptr anc_ptr;		/* ancillary bits pointer */
-  unsigned int anc_bitlen;		/* number of ancillary bits */
-
-  unsigned char (*main_data)MAD_BUFFER_MDLEN;
-					/* Layer III main_data() */
-  unsigned int md_len;			/* bytes in main_data */
-
-  int options;				/* decoding options (see below) */
-  enum mad_error error;			/* error code (see above) */
-};
-
-enum {
-  MAD_OPTION_IGNORECRC      = 0x0001,	/* ignore CRC errors */
-  MAD_OPTION_HALFSAMPLERATE = 0x0002	/* generate PCM at 1/2 sample rate */
-# if 0  /* not yet implemented */
-  MAD_OPTION_LEFTCHANNEL    = 0x0010,	/* decode left channel only */
-  MAD_OPTION_RIGHTCHANNEL   = 0x0020,	/* decode right channel only */
-  MAD_OPTION_SINGLECHANNEL  = 0x0030	/* combine channels */
-# endif
-};
-
-void mad_stream_init(struct mad_stream *);
-void mad_stream_finish(struct mad_stream *);
-
-# define mad_stream_options(stream, opts)  \
-    ((void) ((stream)->options = (opts)))
-
-void mad_stream_buffer(struct mad_stream *,
-		       unsigned char const *, unsigned long);
-void mad_stream_skip(struct mad_stream *, unsigned long);
-
-int mad_stream_sync(struct mad_stream *);
-
-char const *mad_stream_errorstr(struct mad_stream const *);
-
-# endif
-
-/* Id: frame.h,v 1.19 2003/05/27 22:40:36 rob Exp */
-
-# ifndef LIBMAD_FRAME_H
-# define LIBMAD_FRAME_H
-
-
-enum mad_layer {
-  MAD_LAYER_I   = 1,			/* Layer I */
-  MAD_LAYER_II  = 2,			/* Layer II */
-  MAD_LAYER_III = 3			/* Layer III */
-};
-
-enum mad_mode {
-  MAD_MODE_SINGLE_CHANNEL = 0,		/* single channel */
-  MAD_MODE_DUAL_CHANNEL	  = 1,		/* dual channel */
-  MAD_MODE_JOINT_STEREO	  = 2,		/* joint (MS/intensity) stereo */
-  MAD_MODE_STEREO	  = 3		/* normal LR stereo */
-};
-
-enum mad_emphasis {
-  MAD_EMPHASIS_NONE	  = 0,		/* no emphasis */
-  MAD_EMPHASIS_50_15_US	  = 1,		/* 50/15 microseconds emphasis */
-  MAD_EMPHASIS_CCITT_J_17 = 3,		/* CCITT J.17 emphasis */
-  MAD_EMPHASIS_RESERVED   = 2		/* unknown emphasis */
-};
-
-struct mad_header {
-  enum mad_layer layer;			/* audio layer (1, 2, or 3) */
-  enum mad_mode mode;			/* channel mode (see above) */
-  int mode_extension;			/* additional mode info */
-  enum mad_emphasis emphasis;		/* de-emphasis to use (see above) */
-
-  unsigned long bitrate;		/* stream bitrate (bps) */
-  unsigned int samplerate;		/* sampling frequency (Hz) */
-
-  unsigned short crc_check;		/* frame CRC accumulator */
-  unsigned short crc_target;		/* final target CRC checksum */
-
-  int flags;				/* flags (see below) */
-  int private_bits;			/* private bits (see below) */
-
-  mad_timer_t duration;			/* audio playing time of frame */
-};
-
-struct mad_frame {
-  struct mad_header header;		/* MPEG audio header */
-
-  int options;				/* decoding options (from stream) */
-
-  mad_fixed_t sbsample23632;	/* synthesis subband filter samples */
-  mad_fixed_t (*overlap)23218;	/* Layer III block overlap data */
-};
-
-# define MAD_NCHANNELS(header)		((header)->mode ? 2 : 1)
-# define MAD_NSBSAMPLES(header)  \
-  ((header)->layer == MAD_LAYER_I ? 12 :  \
-   (((header)->layer == MAD_LAYER_III &&  \
-     ((header)->flags & MAD_FLAG_LSF_EXT)) ? 18 : 36))
-
-enum {
-  MAD_FLAG_NPRIVATE_III	= 0x0007,	/* number of Layer III private bits */
-  MAD_FLAG_INCOMPLETE	= 0x0008,	/* header but not data is decoded */
-
-  MAD_FLAG_PROTECTION	= 0x0010,	/* frame has CRC protection */
-  MAD_FLAG_COPYRIGHT	= 0x0020,	/* frame is copyright */
-  MAD_FLAG_ORIGINAL	= 0x0040,	/* frame is original (else copy) */
-  MAD_FLAG_PADDING	= 0x0080,	/* frame has additional slot */
-
-  MAD_FLAG_I_STEREO	= 0x0100,	/* uses intensity joint stereo */
-  MAD_FLAG_MS_STEREO	= 0x0200,	/* uses middle/side joint stereo */
-  MAD_FLAG_FREEFORMAT	= 0x0400,	/* uses free format bitrate */
-
-  MAD_FLAG_LSF_EXT	= 0x1000,	/* lower sampling freq. extension */
-  MAD_FLAG_MC_EXT	= 0x2000,	/* multichannel audio extension */
-  MAD_FLAG_MPEG_2_5_EXT	= 0x4000	/* MPEG 2.5 (unofficial) extension */
-};
-
-enum {
-  MAD_PRIVATE_HEADER	= 0x0100,	/* header private bit */
-  MAD_PRIVATE_III	= 0x001f	/* Layer III private bits (up to 5) */
-};
-
-void mad_header_init(struct mad_header *);
-
-# define mad_header_finish(header)  /* nothing */
-
-int mad_header_decode(struct mad_header *, struct mad_stream *);
-
-void mad_frame_init(struct mad_frame *);
-void mad_frame_finish(struct mad_frame *);
-
-int mad_frame_decode(struct mad_frame *, struct mad_stream *);
-
-void mad_frame_mute(struct mad_frame *);
-
-# endif
-
-/* Id: synth.h,v 1.14 2003/05/27 22:40:37 rob Exp */
-
-# ifndef LIBMAD_SYNTH_H
-# define LIBMAD_SYNTH_H
-
-
-struct mad_pcm {
-  unsigned int samplerate;		/* sampling frequency (Hz) */
-  unsigned short channels;		/* number of channels */
-  unsigned short length;		/* number of samples per channel */
-  mad_fixed_t samples21152;		/* PCM output samples chsample */
-};
-
-struct mad_synth {
-  mad_fixed_t filter222168;	/* polyphase filterbank outputs */
-  					/* cheopeosv */
-
-  unsigned int phase;			/* current processing phase */
-
-  struct mad_pcm pcm;			/* PCM output */
-};
-
-/* single channel PCM selector */
-enum {
-  MAD_PCM_CHANNEL_SINGLE = 0
-};
-
-/* dual channel PCM selector */
-enum {
-  MAD_PCM_CHANNEL_DUAL_1 = 0,
-  MAD_PCM_CHANNEL_DUAL_2 = 1
-};
-
-/* stereo PCM selector */
-enum {
-  MAD_PCM_CHANNEL_STEREO_LEFT  = 0,
-  MAD_PCM_CHANNEL_STEREO_RIGHT = 1
-};
-
-void mad_synth_init(struct mad_synth *);
-
-# define mad_synth_finish(synth)  /* nothing */
-
-void mad_synth_mute(struct mad_synth *);
-
-void mad_synth_frame(struct mad_synth *, struct mad_frame const *);
-
-# endif
-
-/* Id: decoder.h,v 1.16 2003/05/27 22:40:36 rob Exp */
-
-# ifndef LIBMAD_DECODER_H
-# define LIBMAD_DECODER_H
-
-
-enum mad_decoder_mode {
-  MAD_DECODER_MODE_SYNC  = 0,
-  MAD_DECODER_MODE_ASYNC
-};
-
-enum mad_flow {
-  MAD_FLOW_CONTINUE = 0x0000,	/* continue normally */
-  MAD_FLOW_STOP     = 0x0010,	/* stop decoding normally */
-  MAD_FLOW_BREAK    = 0x0011,	/* stop decoding and signal an error */
-  MAD_FLOW_IGNORE   = 0x0020	/* ignore the current frame */
-};
-
-struct mad_decoder {
-  enum mad_decoder_mode mode;
-
-  int options;
-
-  struct {
-    long pid;
-    int in;
-    int out;
-  } async;
-
-  struct {
-    struct mad_stream stream;
-    struct mad_frame frame;
-    struct mad_synth synth;
-  } *sync;
-
-  void *cb_data;
-
-  enum mad_flow (*input_func)(void *, struct mad_stream *);
-  enum mad_flow (*header_func)(void *, struct mad_header const *);
-  enum mad_flow (*filter_func)(void *,
-			       struct mad_stream const *, struct mad_frame *);
-  enum mad_flow (*output_func)(void *,
-			       struct mad_header const *, struct mad_pcm *);
-  enum mad_flow (*error_func)(void *, struct mad_stream *, struct mad_frame *);
-  enum mad_flow (*message_func)(void *, void *, unsigned int *);
-};
-
-void mad_decoder_init(struct mad_decoder *, void *,
-		      enum mad_flow (*)(void *, struct mad_stream *),
-		      enum mad_flow (*)(void *, struct mad_header const *),
-		      enum mad_flow (*)(void *,
-					struct mad_stream const *,
-					struct mad_frame *),
-		      enum mad_flow (*)(void *,
-					struct mad_header const *,
-					struct mad_pcm *),
-		      enum mad_flow (*)(void *,
-					struct mad_stream *,
-					struct mad_frame *),
-		      enum mad_flow (*)(void *, void *, unsigned int *));
-int mad_decoder_finish(struct mad_decoder *);
-
-# define mad_decoder_options(decoder, opts)  \
-    ((void) ((decoder)->options = (opts)))
-
-int mad_decoder_run(struct mad_decoder *, enum mad_decoder_mode);
-int mad_decoder_message(struct mad_decoder *, void *, unsigned int *);
-
-# endif
-
-# ifdef __cplusplus
-}
-# endif

gpac-2.2.1.tar.gz/extra_lib/include/neaacdec.h Deleted

@@ -1,255 +0,0 @@
-/*
-** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding
-** Copyright (C) 2003-2005 M. Bakker, Nero AG, http://www.nero.com
-**  
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-** 
-** This program 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 General Public License for more details.
-** 
-** You should have received a copy of the GNU General Public License
-** along with this program; if not, write to the Free Software 
-** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-**
-** Any non-GPL usage of this software or parts of this software is strictly
-** forbidden.
-**
-** The "appropriate copyright message" mentioned in section 2c of the GPLv2
-** must read: "Code from FAAD2 is copyright (c) Nero AG, www.nero.com"
-**
-** Commercial non-GPL licensing of this software is possible.
-** For more info contact Nero AG through Mpeg4AAClicense@nero.com.
-**
-** $Id: neaacdec.h,v 1.2 2008-12-02 18:04:42 jeanlf Exp $
-**/
-
-#ifndef __NEAACDEC_H__
-#define __NEAACDEC_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-
-#if 1
-/* MACROS FOR BACKWARDS COMPATIBILITY */
-/* structs */
-#define faacDecHandle                  NeAACDecHandle
-#define faacDecConfiguration           NeAACDecConfiguration
-#define faacDecConfigurationPtr        NeAACDecConfigurationPtr
-#define faacDecFrameInfo               NeAACDecFrameInfo
-/* functions */
-#define faacDecGetErrorMessage         NeAACDecGetErrorMessage
-#define faacDecSetConfiguration        NeAACDecSetConfiguration
-#define faacDecGetCurrentConfiguration NeAACDecGetCurrentConfiguration
-#define faacDecInit                    NeAACDecInit
-#define faacDecInit2                   NeAACDecInit2
-#define faacDecInitDRM                 NeAACDecInitDRM
-#define faacDecPostSeekReset           NeAACDecPostSeekReset
-#define faacDecOpen                    NeAACDecOpen
-#define faacDecClose                   NeAACDecClose
-#define faacDecDecode                  NeAACDecDecode
-#define AudioSpecificConfig            NeAACDecAudioSpecificConfig
-#endif
-
-
-#ifdef _WIN32
-  #pragma pack(push, 8)
-  #ifndef NEAACDECAPI
-    #define NEAACDECAPI __cdecl
-  #endif
-#else
-  #ifndef NEAACDECAPI
-    #define NEAACDECAPI
-  #endif
-#endif
-
-#define FAAD2_VERSION "2.6"
-
-/* object types for AAC */
-#define MAIN       1
-#define LC         2
-#define SSR        3
-#define LTP        4
-#define HE_AAC     5
-#define ER_LC     17
-#define ER_LTP    19
-#define LD        23
-#define DRM_ER_LC 27 /* special object type for DRM */
-
-/* header types */
-#define RAW        0
-#define ADIF       1
-#define ADTS       2
-
-/* SBR signalling */
-#define NO_SBR           0
-#define SBR_UPSAMPLED    1
-#define SBR_DOWNSAMPLED  2
-#define NO_SBR_UPSAMPLED 3
-
-/* library output formats */
-#define FAAD_FMT_16BIT  1
-#define FAAD_FMT_24BIT  2
-#define FAAD_FMT_32BIT  3
-#define FAAD_FMT_FLOAT  4
-#define FAAD_FMT_FIXED  FAAD_FMT_FLOAT
-#define FAAD_FMT_DOUBLE 5
-
-/* Capabilities */
-#define LC_DEC_CAP           (1<<0) /* Can decode LC */
-#define MAIN_DEC_CAP         (1<<1) /* Can decode MAIN */
-#define LTP_DEC_CAP          (1<<2) /* Can decode LTP */
-#define LD_DEC_CAP           (1<<3) /* Can decode LD */
-#define ERROR_RESILIENCE_CAP (1<<4) /* Can decode ER */
-#define FIXED_POINT_CAP      (1<<5) /* Fixed point */
-
-/* Channel definitions */
-#define FRONT_CHANNEL_CENTER (1)
-#define FRONT_CHANNEL_LEFT   (2)
-#define FRONT_CHANNEL_RIGHT  (3)
-#define SIDE_CHANNEL_LEFT    (4)
-#define SIDE_CHANNEL_RIGHT   (5)
-#define BACK_CHANNEL_LEFT    (6)
-#define BACK_CHANNEL_RIGHT   (7)
-#define BACK_CHANNEL_CENTER  (8)
-#define LFE_CHANNEL          (9)
-#define UNKNOWN_CHANNEL      (0)
-
-/* DRM channel definitions */
-#define DRMCH_MONO          1
-#define DRMCH_STEREO        2
-#define DRMCH_SBR_MONO      3
-#define DRMCH_SBR_STEREO    4
-#define DRMCH_SBR_PS_STEREO 5
-
-
-/* A decode call can eat up to FAAD_MIN_STREAMSIZE bytes per decoded channel,
-   so at least so much bytes per channel should be available in this stream */
-#define FAAD_MIN_STREAMSIZE 768 /* 6144 bits/channel */
-
-
-typedef void *NeAACDecHandle;
-
-typedef struct mp4AudioSpecificConfig
-{
-    /* Audio Specific Info */
-    unsigned char objectTypeIndex;
-    unsigned char samplingFrequencyIndex;
-    unsigned long samplingFrequency;
-    unsigned char channelsConfiguration;
-
-    /* GA Specific Info */
-    unsigned char frameLengthFlag;
-    unsigned char dependsOnCoreCoder;
-    unsigned short coreCoderDelay;
-    unsigned char extensionFlag;
-    unsigned char aacSectionDataResilienceFlag;
-    unsigned char aacScalefactorDataResilienceFlag;
-    unsigned char aacSpectralDataResilienceFlag;
-    unsigned char epConfig;
-
-    char sbr_present_flag;
-    char forceUpSampling;
-    char downSampledSBR;
-} mp4AudioSpecificConfig;
-
-typedef struct NeAACDecConfiguration
-{
-    unsigned char defObjectType;
-    unsigned long defSampleRate;
-    unsigned char outputFormat;
-    unsigned char downMatrix;
-    unsigned char useOldADTSFormat;
-    unsigned char dontUpSampleImplicitSBR;
-} NeAACDecConfiguration, *NeAACDecConfigurationPtr;
-
-typedef struct NeAACDecFrameInfo
-{
-    unsigned long bytesconsumed;
-    unsigned long samples;
-    unsigned char channels;
-    unsigned char error;
-    unsigned long samplerate;
-
-    /* SBR: 0: off, 1: on; upsample, 2: on; downsampled, 3: off; upsampled */
-    unsigned char sbr;
-
-    /* MPEG-4 ObjectType */
-    unsigned char object_type;
-
-    /* AAC header type; MP4 will be signalled as RAW also */
-    unsigned char header_type;
-
-    /* multichannel configuration */
-    unsigned char num_front_channels;
-    unsigned char num_side_channels;
-    unsigned char num_back_channels;
-    unsigned char num_lfe_channels;
-    unsigned char channel_position64;
-
-    /* PS: 0: off, 1: on */
-    unsigned char ps;
-} NeAACDecFrameInfo;
-
-char* NEAACDECAPI NeAACDecGetErrorMessage(unsigned char errcode);
-
-unsigned long NEAACDECAPI NeAACDecGetCapabilities(void);
-
-NeAACDecHandle NEAACDECAPI NeAACDecOpen(void);
-
-NeAACDecConfigurationPtr NEAACDECAPI NeAACDecGetCurrentConfiguration(NeAACDecHandle hDecoder);
-
-unsigned char NEAACDECAPI NeAACDecSetConfiguration(NeAACDecHandle hDecoder,
-                                                   NeAACDecConfigurationPtr config);
-
-/* Init the library based on info from the AAC file (ADTS/ADIF) */
-long NEAACDECAPI NeAACDecInit(NeAACDecHandle hDecoder,
-                              unsigned char *buffer,
-                              unsigned long buffer_size,
-                              unsigned long *samplerate,
-                              unsigned char *channels);
-
-/* Init the library using a DecoderSpecificInfo */
-char NEAACDECAPI NeAACDecInit2(NeAACDecHandle hDecoder, unsigned char *pBuffer,
-                               unsigned long SizeOfDecoderSpecificInfo,
-                               unsigned long *samplerate, unsigned char *channels);
-
-/* Init the library for DRM */
-char NEAACDECAPI NeAACDecInitDRM(NeAACDecHandle *hDecoder, unsigned long samplerate,
-                                 unsigned char channels);
-
-void NEAACDECAPI NeAACDecPostSeekReset(NeAACDecHandle hDecoder, long frame);
-
-void NEAACDECAPI NeAACDecClose(NeAACDecHandle hDecoder);
-
-void* NEAACDECAPI NeAACDecDecode(NeAACDecHandle hDecoder,
-                                 NeAACDecFrameInfo *hInfo,
-                                 unsigned char *buffer,
-                                 unsigned long buffer_size);
-
-void* NEAACDECAPI NeAACDecDecode2(NeAACDecHandle hDecoder,
-                                  NeAACDecFrameInfo *hInfo,
-                                  unsigned char *buffer,
-                                  unsigned long buffer_size,
-                                  void **sample_buffer,
-                                  unsigned long sample_buffer_size);
-
-char NEAACDECAPI NeAACDecAudioSpecificConfig(unsigned char *pBuffer,
-                                             unsigned long buffer_size,
-                                             mp4AudioSpecificConfig *mp4ASC);
-
-#ifdef _WIN32
-  #pragma pack(pop)
-#endif
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif

gpac-2.2.1.tar.gz/extra_lib/include/nghttp2 Deleted

gpac-2.2.1.tar.gz/extra_lib/include/nghttp2/nghttp2.h Deleted

@@ -1,5558 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2013, 2014 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#ifndef NGHTTP2_H
-#define NGHTTP2_H
-
-/* Define WIN32 when build target is Win32 API (borrowed from
-   libcurl) */
-#if (defined(_WIN32) || defined(__WIN32__)) && !defined(WIN32)
-#  define WIN32
-#endif
-
-/* Compatibility for non-Clang compilers */
-#ifndef __has_declspec_attribute
-#  define __has_declspec_attribute(x) 0
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <stdlib.h>
-#if defined(_MSC_VER) && (_MSC_VER < 1800)
-/* MSVC < 2013 does not have inttypes.h because it is not C99
-   compliant.  See compiler macros and version number in
-   https://sourceforge.net/p/predef/wiki/Compilers/ */
-#  include <stdint.h>
-#else /* !defined(_MSC_VER) || (_MSC_VER >= 1800) */
-#  include <inttypes.h>
-#endif /* !defined(_MSC_VER) || (_MSC_VER >= 1800) */
-#include <sys/types.h>
-#include <stdarg.h>
-
-#include <nghttp2/nghttp2ver.h>
-
-#ifdef NGHTTP2_STATICLIB
-#  define NGHTTP2_EXTERN
-#elif defined(WIN32) || (__has_declspec_attribute(dllexport) &&                \
-                         __has_declspec_attribute(dllimport))
-#  ifdef BUILDING_NGHTTP2
-#    define NGHTTP2_EXTERN __declspec(dllexport)
-#  else /* !BUILDING_NGHTTP2 */
-#    define NGHTTP2_EXTERN __declspec(dllimport)
-#  endif /* !BUILDING_NGHTTP2 */
-#else    /* !defined(WIN32) */
-#  ifdef BUILDING_NGHTTP2
-#    define NGHTTP2_EXTERN __attribute__((visibility("default")))
-#  else /* !BUILDING_NGHTTP2 */
-#    define NGHTTP2_EXTERN
-#  endif /* !BUILDING_NGHTTP2 */
-#endif   /* !defined(WIN32) */
-
-/**
- * @macro
- *
- * The protocol version identification string of this library
- * supports.  This identifier is used if HTTP/2 is used over TLS.
- */
-#define NGHTTP2_PROTO_VERSION_ID "h2"
-/**
- * @macro
- *
- * The length of :macro:`NGHTTP2_PROTO_VERSION_ID`.
- */
-#define NGHTTP2_PROTO_VERSION_ID_LEN 2
-
-/**
- * @macro
- *
- * The serialized form of ALPN protocol identifier this library
- * supports.  Notice that first byte is the length of following
- * protocol identifier.  This is the same wire format of `TLS ALPN
- * extension <https://tools.ietf.org/html/rfc7301>`_.  This is useful
- * to process incoming ALPN tokens in wire format.
- */
-#define NGHTTP2_PROTO_ALPN "\x2h2"
-
-/**
- * @macro
- *
- * The length of :macro:`NGHTTP2_PROTO_ALPN`.
- */
-#define NGHTTP2_PROTO_ALPN_LEN (sizeof(NGHTTP2_PROTO_ALPN) - 1)
-
-/**
- * @macro
- *
- * The protocol version identification string of this library
- * supports.  This identifier is used if HTTP/2 is used over cleartext
- * TCP.
- */
-#define NGHTTP2_CLEARTEXT_PROTO_VERSION_ID "h2c"
-
-/**
- * @macro
- *
- * The length of :macro:`NGHTTP2_CLEARTEXT_PROTO_VERSION_ID`.
- */
-#define NGHTTP2_CLEARTEXT_PROTO_VERSION_ID_LEN 3
-
-struct nghttp2_session;
-/**
- * @struct
- *
- * The primary structure to hold the resources needed for a HTTP/2
- * session.  The details of this structure are intentionally hidden
- * from the public API.
- */
-typedef struct nghttp2_session nghttp2_session;
-
-/**
- * @macro
- *
- * The age of :type:`nghttp2_info`
- */
-#define NGHTTP2_VERSION_AGE 1
-
-/**
- * @struct
- *
- * This struct is what `nghttp2_version()` returns.  It holds
- * information about the particular nghttp2 version.
- */
-typedef struct {
-  /**
-   * Age of this struct.  This instance of nghttp2 sets it to
-   * :macro:`NGHTTP2_VERSION_AGE` but a future version may bump it and
-   * add more struct fields at the bottom
-   */
-  int age;
-  /**
-   * the :macro:`NGHTTP2_VERSION_NUM` number (since age ==1)
-   */
-  int version_num;
-  /**
-   * points to the :macro:`NGHTTP2_VERSION` string (since age ==1)
-   */
-  const char *version_str;
-  /**
-   * points to the :macro:`NGHTTP2_PROTO_VERSION_ID` string this
-   * instance implements (since age ==1)
-   */
-  const char *proto_str;
-  /* -------- the above fields all exist when age == 1 */
-} nghttp2_info;
-
-/**
- * @macro
- *
- * The default weight of stream dependency.
- */
-#define NGHTTP2_DEFAULT_WEIGHT 16
-
-/**
- * @macro
- *
- * The maximum weight of stream dependency.
- */
-#define NGHTTP2_MAX_WEIGHT 256
-
-/**
- * @macro
- *
- * The minimum weight of stream dependency.
- */
-#define NGHTTP2_MIN_WEIGHT 1
-
-/**
- * @macro
- *
- * The maximum window size
- */
-#define NGHTTP2_MAX_WINDOW_SIZE ((int32_t)((1U << 31) - 1))
-
-/**
- * @macro
- *
- * The initial window size for stream level flow control.
- */
-#define NGHTTP2_INITIAL_WINDOW_SIZE ((1 << 16) - 1)
-/**
- * @macro
- *
- * The initial window size for connection level flow control.
- */
-#define NGHTTP2_INITIAL_CONNECTION_WINDOW_SIZE ((1 << 16) - 1)
-
-/**
- * @macro
- *
- * The default header table size.
- */
-#define NGHTTP2_DEFAULT_HEADER_TABLE_SIZE (1 << 12)
-
-/**
- * @macro
- *
- * The client magic string, which is the first 24 bytes byte string of
- * client connection preface.
- */
-#define NGHTTP2_CLIENT_MAGIC "PRI * HTTP/2.0\r\n\r\nSM\r\n\r\n"
-
-/**
- * @macro
- *
- * The length of :macro:`NGHTTP2_CLIENT_MAGIC`.
- */
-#define NGHTTP2_CLIENT_MAGIC_LEN 24
-
-/**
- * @macro
- *
- * The default max number of settings per SETTINGS frame
- */
-#define NGHTTP2_DEFAULT_MAX_SETTINGS 32
-
-/**
- * @enum
- *
- * Error codes used in this library.  The code range is -999, -500,
- * inclusive. The following values are defined:
- */
-typedef enum {
-  /**
-   * Invalid argument passed.
-   */
-  NGHTTP2_ERR_INVALID_ARGUMENT = -501,
-  /**
-   * Out of buffer space.
-   */
-  NGHTTP2_ERR_BUFFER_ERROR = -502,
-  /**
-   * The specified protocol version is not supported.
-   */
-  NGHTTP2_ERR_UNSUPPORTED_VERSION = -503,
-  /**
-   * Used as a return value from :type:`nghttp2_send_callback`,
-   * :type:`nghttp2_recv_callback` and
-   * :type:`nghttp2_send_data_callback` to indicate that the operation
-   * would block.
-   */
-  NGHTTP2_ERR_WOULDBLOCK = -504,
-  /**
-   * General protocol error
-   */
-  NGHTTP2_ERR_PROTO = -505,
-  /**
-   * The frame is invalid.
-   */
-  NGHTTP2_ERR_INVALID_FRAME = -506,
-  /**
-   * The peer performed a shutdown on the connection.
-   */
-  NGHTTP2_ERR_EOF = -507,
-  /**
-   * Used as a return value from
-   * :func:`nghttp2_data_source_read_callback` to indicate that data
-   * transfer is postponed.  See
-   * :func:`nghttp2_data_source_read_callback` for details.
-   */
-  NGHTTP2_ERR_DEFERRED = -508,
-  /**
-   * Stream ID has reached the maximum value.  Therefore no stream ID
-   * is available.
-   */
-  NGHTTP2_ERR_STREAM_ID_NOT_AVAILABLE = -509,
-  /**
-   * The stream is already closed; or the stream ID is invalid.
-   */
-  NGHTTP2_ERR_STREAM_CLOSED = -510,
-  /**
-   * RST_STREAM has been added to the outbound queue.  The stream is
-   * in closing state.
-   */
-  NGHTTP2_ERR_STREAM_CLOSING = -511,
-  /**
-   * The transmission is not allowed for this stream (e.g., a frame
-   * with END_STREAM flag set has already sent).
-   */
-  NGHTTP2_ERR_STREAM_SHUT_WR = -512,
-  /**
-   * The stream ID is invalid.
-   */
-  NGHTTP2_ERR_INVALID_STREAM_ID = -513,
-  /**
-   * The state of the stream is not valid (e.g., DATA cannot be sent
-   * to the stream if response HEADERS has not been sent).
-   */
-  NGHTTP2_ERR_INVALID_STREAM_STATE = -514,
-  /**
-   * Another DATA frame has already been deferred.
-   */
-  NGHTTP2_ERR_DEFERRED_DATA_EXIST = -515,
-  /**
-   * Starting new stream is not allowed (e.g., GOAWAY has been sent
-   * and/or received).
-   */
-  NGHTTP2_ERR_START_STREAM_NOT_ALLOWED = -516,
-  /**
-   * GOAWAY has already been sent.
-   */
-  NGHTTP2_ERR_GOAWAY_ALREADY_SENT = -517,
-  /**
-   * The received frame contains the invalid header block (e.g., There
-   * are duplicate header names; or the header names are not encoded
-   * in US-ASCII character set and not lower cased; or the header name
-   * is zero-length string; or the header value contains multiple
-   * in-sequence NUL bytes).
-   */
-  NGHTTP2_ERR_INVALID_HEADER_BLOCK = -518,
-  /**
-   * Indicates that the context is not suitable to perform the
-   * requested operation.
-   */
-  NGHTTP2_ERR_INVALID_STATE = -519,
-  /**
-   * The user callback function failed due to the temporal error.
-   */
-  NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE = -521,
-  /**
-   * The length of the frame is invalid, either too large or too small.
-   */
-  NGHTTP2_ERR_FRAME_SIZE_ERROR = -522,
-  /**
-   * Header block inflate/deflate error.
-   */
-  NGHTTP2_ERR_HEADER_COMP = -523,
-  /**
-   * Flow control error
-   */
-  NGHTTP2_ERR_FLOW_CONTROL = -524,
-  /**
-   * Insufficient buffer size given to function.
-   */
-  NGHTTP2_ERR_INSUFF_BUFSIZE = -525,
-  /**
-   * Callback was paused by the application
-   */
-  NGHTTP2_ERR_PAUSE = -526,
-  /**
-   * There are too many in-flight SETTING frame and no more
-   * transmission of SETTINGS is allowed.
-   */
-  NGHTTP2_ERR_TOO_MANY_INFLIGHT_SETTINGS = -527,
-  /**
-   * The server push is disabled.
-   */
-  NGHTTP2_ERR_PUSH_DISABLED = -528,
-  /**
-   * DATA or HEADERS frame for a given stream has been already
-   * submitted and has not been fully processed yet.  Application
-   * should wait for the transmission of the previously submitted
-   * frame before submitting another.
-   */
-  NGHTTP2_ERR_DATA_EXIST = -529,
-  /**
-   * The current session is closing due to a connection error or
-   * `nghttp2_session_terminate_session()` is called.
-   */
-  NGHTTP2_ERR_SESSION_CLOSING = -530,
-  /**
-   * Invalid HTTP header field was received and stream is going to be
-   * closed.
-   */
-  NGHTTP2_ERR_HTTP_HEADER = -531,
-  /**
-   * Violation in HTTP messaging rule.
-   */
-  NGHTTP2_ERR_HTTP_MESSAGING = -532,
-  /**
-   * Stream was refused.
-   */
-  NGHTTP2_ERR_REFUSED_STREAM = -533,
-  /**
-   * Unexpected internal error, but recovered.
-   */
-  NGHTTP2_ERR_INTERNAL = -534,
-  /**
-   * Indicates that a processing was canceled.
-   */
-  NGHTTP2_ERR_CANCEL = -535,
-  /**
-   * When a local endpoint expects to receive SETTINGS frame, it
-   * receives an other type of frame.
-   */
-  NGHTTP2_ERR_SETTINGS_EXPECTED = -536,
-  /**
-   * When a local endpoint receives too many settings entries
-   * in a single SETTINGS frame.
-   */
-  NGHTTP2_ERR_TOO_MANY_SETTINGS = -537,
-  /**
-   * The errors < :enum:`nghttp2_error.NGHTTP2_ERR_FATAL` mean that
-   * the library is under unexpected condition and processing was
-   * terminated (e.g., out of memory).  If application receives this
-   * error code, it must stop using that :type:`nghttp2_session`
-   * object and only allowed operation for that object is deallocate
-   * it using `nghttp2_session_del()`.
-   */
-  NGHTTP2_ERR_FATAL = -900,
-  /**
-   * Out of memory.  This is a fatal error.
-   */
-  NGHTTP2_ERR_NOMEM = -901,
-  /**
-   * The user callback function failed.  This is a fatal error.
-   */
-  NGHTTP2_ERR_CALLBACK_FAILURE = -902,
-  /**
-   * Invalid client magic (see :macro:`NGHTTP2_CLIENT_MAGIC`) was
-   * received and further processing is not possible.
-   */
-  NGHTTP2_ERR_BAD_CLIENT_MAGIC = -903,
-  /**
-   * Possible flooding by peer was detected in this HTTP/2 session.
-   * Flooding is measured by how many PING and SETTINGS frames with
-   * ACK flag set are queued for transmission.  These frames are
-   * response for the peer initiated frames, and peer can cause memory
-   * exhaustion on server side to send these frames forever and does
-   * not read network.
-   */
-  NGHTTP2_ERR_FLOODED = -904
-} nghttp2_error;
-
-/**
- * @struct
- *
- * The object representing single contiguous buffer.
- */
-typedef struct {
-  /**
-   * The pointer to the buffer.
-   */
-  uint8_t *base;
-  /**
-   * The length of the buffer.
-   */
-  size_t len;
-} nghttp2_vec;
-
-struct nghttp2_rcbuf;
-
-/**
- * @struct
- *
- * The object representing reference counted buffer.  The details of
- * this structure are intentionally hidden from the public API.
- */
-typedef struct nghttp2_rcbuf nghttp2_rcbuf;
-
-/**
- * @function
- *
- * Increments the reference count of |rcbuf| by 1.
- */
-NGHTTP2_EXTERN void nghttp2_rcbuf_incref(nghttp2_rcbuf *rcbuf);
-
-/**
- * @function
- *
- * Decrements the reference count of |rcbuf| by 1.  If the reference
- * count becomes zero, the object pointed by |rcbuf| will be freed.
- * In this case, application must not use |rcbuf| again.
- */
-NGHTTP2_EXTERN void nghttp2_rcbuf_decref(nghttp2_rcbuf *rcbuf);
-
-/**
- * @function
- *
- * Returns the underlying buffer managed by |rcbuf|.
- */
-NGHTTP2_EXTERN nghttp2_vec nghttp2_rcbuf_get_buf(nghttp2_rcbuf *rcbuf);
-
-/**
- * @function
- *
- * Returns nonzero if the underlying buffer is statically allocated,
- * and 0 otherwise. This can be useful for language bindings that wish
- * to avoid creating duplicate strings for these buffers.
- */
-NGHTTP2_EXTERN int nghttp2_rcbuf_is_static(const nghttp2_rcbuf *rcbuf);
-
-/**
- * @enum
- *
- * The flags for header field name/value pair.
- */
-typedef enum {
-  /**
-   * No flag set.
-   */
-  NGHTTP2_NV_FLAG_NONE = 0,
-  /**
-   * Indicates that this name/value pair must not be indexed ("Literal
-   * Header Field never Indexed" representation must be used in HPACK
-   * encoding).  Other implementation calls this bit as "sensitive".
-   */
-  NGHTTP2_NV_FLAG_NO_INDEX = 0x01,
-  /**
-   * This flag is set solely by application.  If this flag is set, the
-   * library does not make a copy of header field name.  This could
-   * improve performance.
-   */
-  NGHTTP2_NV_FLAG_NO_COPY_NAME = 0x02,
-  /**
-   * This flag is set solely by application.  If this flag is set, the
-   * library does not make a copy of header field value.  This could
-   * improve performance.
-   */
-  NGHTTP2_NV_FLAG_NO_COPY_VALUE = 0x04
-} nghttp2_nv_flag;
-
-/**
- * @struct
- *
- * The name/value pair, which mainly used to represent header fields.
- */
-typedef struct {
-  /**
-   * The |name| byte string.  If this struct is presented from library
-   * (e.g., :type:`nghttp2_on_frame_recv_callback`), |name| is
-   * guaranteed to be NULL-terminated.  For some callbacks
-   * (:type:`nghttp2_before_frame_send_callback`,
-   * :type:`nghttp2_on_frame_send_callback`, and
-   * :type:`nghttp2_on_frame_not_send_callback`), it may not be
-   * NULL-terminated if header field is passed from application with
-   * the flag :enum:`nghttp2_nv_flag.NGHTTP2_NV_FLAG_NO_COPY_NAME`).
-   * When application is constructing this struct, |name| is not
-   * required to be NULL-terminated.
-   */
-  uint8_t *name;
-  /**
-   * The |value| byte string.  If this struct is presented from
-   * library (e.g., :type:`nghttp2_on_frame_recv_callback`), |value|
-   * is guaranteed to be NULL-terminated.  For some callbacks
-   * (:type:`nghttp2_before_frame_send_callback`,
-   * :type:`nghttp2_on_frame_send_callback`, and
-   * :type:`nghttp2_on_frame_not_send_callback`), it may not be
-   * NULL-terminated if header field is passed from application with
-   * the flag :enum:`nghttp2_nv_flag.NGHTTP2_NV_FLAG_NO_COPY_VALUE`).
-   * When application is constructing this struct, |value| is not
-   * required to be NULL-terminated.
-   */
-  uint8_t *value;
-  /**
-   * The length of the |name|, excluding terminating NULL.
-   */
-  size_t namelen;
-  /**
-   * The length of the |value|, excluding terminating NULL.
-   */
-  size_t valuelen;
-  /**
-   * Bitwise OR of one or more of :type:`nghttp2_nv_flag`.
-   */
-  uint8_t flags;
-} nghttp2_nv;
-
-/**
- * @enum
- *
- * The frame types in HTTP/2 specification.
- */
-typedef enum {
-  /**
-   * The DATA frame.
-   */
-  NGHTTP2_DATA = 0,
-  /**
-   * The HEADERS frame.
-   */
-  NGHTTP2_HEADERS = 0x01,
-  /**
-   * The PRIORITY frame.
-   */
-  NGHTTP2_PRIORITY = 0x02,
-  /**
-   * The RST_STREAM frame.
-   */
-  NGHTTP2_RST_STREAM = 0x03,
-  /**
-   * The SETTINGS frame.
-   */
-  NGHTTP2_SETTINGS = 0x04,
-  /**
-   * The PUSH_PROMISE frame.
-   */
-  NGHTTP2_PUSH_PROMISE = 0x05,
-  /**
-   * The PING frame.
-   */
-  NGHTTP2_PING = 0x06,
-  /**
-   * The GOAWAY frame.
-   */
-  NGHTTP2_GOAWAY = 0x07,
-  /**
-   * The WINDOW_UPDATE frame.
-   */
-  NGHTTP2_WINDOW_UPDATE = 0x08,
-  /**
-   * The CONTINUATION frame.  This frame type won't be passed to any
-   * callbacks because the library processes this frame type and its
-   * preceding HEADERS/PUSH_PROMISE as a single frame.
-   */
-  NGHTTP2_CONTINUATION = 0x09,
-  /**
-   * The ALTSVC frame, which is defined in `RFC 7383
-   * <https://tools.ietf.org/html/rfc7838#section-4>`_.
-   */
-  NGHTTP2_ALTSVC = 0x0a,
-  /**
-   * The ORIGIN frame, which is defined by `RFC 8336
-   * <https://tools.ietf.org/html/rfc8336>`_.
-   */
-  NGHTTP2_ORIGIN = 0x0c
-} nghttp2_frame_type;
-
-/**
- * @enum
- *
- * The flags for HTTP/2 frames.  This enum defines all flags for all
- * frames.
- */
-typedef enum {
-  /**
-   * No flag set.
-   */
-  NGHTTP2_FLAG_NONE = 0,
-  /**
-   * The END_STREAM flag.
-   */
-  NGHTTP2_FLAG_END_STREAM = 0x01,
-  /**
-   * The END_HEADERS flag.
-   */
-  NGHTTP2_FLAG_END_HEADERS = 0x04,
-  /**
-   * The ACK flag.
-   */
-  NGHTTP2_FLAG_ACK = 0x01,
-  /**
-   * The PADDED flag.
-   */
-  NGHTTP2_FLAG_PADDED = 0x08,
-  /**
-   * The PRIORITY flag.
-   */
-  NGHTTP2_FLAG_PRIORITY = 0x20
-} nghttp2_flag;
-
-/**
- * @enum
- * The SETTINGS ID.
- */
-typedef enum {
-  /**
-   * SETTINGS_HEADER_TABLE_SIZE
-   */
-  NGHTTP2_SETTINGS_HEADER_TABLE_SIZE = 0x01,
-  /**
-   * SETTINGS_ENABLE_PUSH
-   */
-  NGHTTP2_SETTINGS_ENABLE_PUSH = 0x02,
-  /**
-   * SETTINGS_MAX_CONCURRENT_STREAMS
-   */
-  NGHTTP2_SETTINGS_MAX_CONCURRENT_STREAMS = 0x03,
-  /**
-   * SETTINGS_INITIAL_WINDOW_SIZE
-   */
-  NGHTTP2_SETTINGS_INITIAL_WINDOW_SIZE = 0x04,
-  /**
-   * SETTINGS_MAX_FRAME_SIZE
-   */
-  NGHTTP2_SETTINGS_MAX_FRAME_SIZE = 0x05,
-  /**
-   * SETTINGS_MAX_HEADER_LIST_SIZE
-   */
-  NGHTTP2_SETTINGS_MAX_HEADER_LIST_SIZE = 0x06,
-  /**
-   * SETTINGS_ENABLE_CONNECT_PROTOCOL
-   * (`RFC 8441 <https://tools.ietf.org/html/rfc8441>`_)
-   */
-  NGHTTP2_SETTINGS_ENABLE_CONNECT_PROTOCOL = 0x08
-} nghttp2_settings_id;
-/* Note: If we add SETTINGS, update the capacity of
-   NGHTTP2_INBOUND_NUM_IV as well */
-
-/**
- * @macro
- *
- * .. warning::
- *
- *   Deprecated.  The initial max concurrent streams is 0xffffffffu.
- *
- * Default maximum number of incoming concurrent streams.  Use
- * `nghttp2_submit_settings()` with
- * :enum:`nghttp2_settings_id.NGHTTP2_SETTINGS_MAX_CONCURRENT_STREAMS`
- * to change the maximum number of incoming concurrent streams.
- *
- * .. note::
- *
- *   The maximum number of outgoing concurrent streams is 100 by
- *   default.
- */
-#define NGHTTP2_INITIAL_MAX_CONCURRENT_STREAMS ((1U << 31) - 1)
-
-/**
- * @enum
- * The status codes for the RST_STREAM and GOAWAY frames.
- */
-typedef enum {
-  /**
-   * No errors.
-   */
-  NGHTTP2_NO_ERROR = 0x00,
-  /**
-   * PROTOCOL_ERROR
-   */
-  NGHTTP2_PROTOCOL_ERROR = 0x01,
-  /**
-   * INTERNAL_ERROR
-   */
-  NGHTTP2_INTERNAL_ERROR = 0x02,
-  /**
-   * FLOW_CONTROL_ERROR
-   */
-  NGHTTP2_FLOW_CONTROL_ERROR = 0x03,
-  /**
-   * SETTINGS_TIMEOUT
-   */
-  NGHTTP2_SETTINGS_TIMEOUT = 0x04,
-  /**
-   * STREAM_CLOSED
-   */
-  NGHTTP2_STREAM_CLOSED = 0x05,
-  /**
-   * FRAME_SIZE_ERROR
-   */
-  NGHTTP2_FRAME_SIZE_ERROR = 0x06,
-  /**
-   * REFUSED_STREAM
-   */
-  NGHTTP2_REFUSED_STREAM = 0x07,
-  /**
-   * CANCEL
-   */
-  NGHTTP2_CANCEL = 0x08,
-  /**
-   * COMPRESSION_ERROR
-   */
-  NGHTTP2_COMPRESSION_ERROR = 0x09,
-  /**
-   * CONNECT_ERROR
-   */
-  NGHTTP2_CONNECT_ERROR = 0x0a,
-  /**
-   * ENHANCE_YOUR_CALM
-   */
-  NGHTTP2_ENHANCE_YOUR_CALM = 0x0b,
-  /**
-   * INADEQUATE_SECURITY
-   */
-  NGHTTP2_INADEQUATE_SECURITY = 0x0c,
-  /**
-   * HTTP_1_1_REQUIRED
-   */
-  NGHTTP2_HTTP_1_1_REQUIRED = 0x0d
-} nghttp2_error_code;
-
-/**
- * @struct
- * The frame header.
- */
-typedef struct {
-  /**
-   * The length field of this frame, excluding frame header.
-   */
-  size_t length;
-  /**
-   * The stream identifier (aka, stream ID)
-   */
-  int32_t stream_id;
-  /**
-   * The type of this frame.  See `nghttp2_frame_type`.
-   */
-  uint8_t type;
-  /**
-   * The flags.
-   */
-  uint8_t flags;
-  /**
-   * Reserved bit in frame header.  Currently, this is always set to 0
-   * and application should not expect something useful in here.
-   */
-  uint8_t reserved;
-} nghttp2_frame_hd;
-
-/**
- * @union
- *
- * This union represents the some kind of data source passed to
- * :type:`nghttp2_data_source_read_callback`.
- */
-typedef union {
-  /**
-   * The integer field, suitable for a file descriptor.
-   */
-  int fd;
-  /**
-   * The pointer to an arbitrary object.
-   */
-  void *ptr;
-} nghttp2_data_source;
-
-/**
- * @enum
- *
- * The flags used to set in |data_flags| output parameter in
- * :type:`nghttp2_data_source_read_callback`.
- */
-typedef enum {
-  /**
-   * No flag set.
-   */
-  NGHTTP2_DATA_FLAG_NONE = 0,
-  /**
-   * Indicates EOF was sensed.
-   */
-  NGHTTP2_DATA_FLAG_EOF = 0x01,
-  /**
-   * Indicates that END_STREAM flag must not be set even if
-   * NGHTTP2_DATA_FLAG_EOF is set.  Usually this flag is used to send
-   * trailer fields with `nghttp2_submit_request()` or
-   * `nghttp2_submit_response()`.
-   */
-  NGHTTP2_DATA_FLAG_NO_END_STREAM = 0x02,
-  /**
-   * Indicates that application will send complete DATA frame in
-   * :type:`nghttp2_send_data_callback`.
-   */
-  NGHTTP2_DATA_FLAG_NO_COPY = 0x04
-} nghttp2_data_flag;
-
-/**
- * @functypedef
- *
- * Callback function invoked when the library wants to read data from
- * the |source|.  The read data is sent in the stream |stream_id|.
- * The implementation of this function must read at most |length|
- * bytes of data from |source| (or possibly other places) and store
- * them in |buf| and return number of data stored in |buf|.  If EOF is
- * reached, set :enum:`nghttp2_data_flag.NGHTTP2_DATA_FLAG_EOF` flag
- * in |*data_flags|.
- *
- * Sometime it is desirable to avoid copying data into |buf| and let
- * application to send data directly.  To achieve this, set
- * :enum:`nghttp2_data_flag.NGHTTP2_DATA_FLAG_NO_COPY` to
- * |*data_flags| (and possibly other flags, just like when we do
- * copy), and return the number of bytes to send without copying data
- * into |buf|.  The library, seeing
- * :enum:`nghttp2_data_flag.NGHTTP2_DATA_FLAG_NO_COPY`, will invoke
- * :type:`nghttp2_send_data_callback`.  The application must send
- * complete DATA frame in that callback.
- *
- * If this callback is set by `nghttp2_submit_request()`,
- * `nghttp2_submit_response()` or `nghttp2_submit_headers()` and
- * `nghttp2_submit_data()` with flag parameter
- * :enum:`nghttp2_flag.NGHTTP2_FLAG_END_STREAM` set, and
- * :enum:`nghttp2_data_flag.NGHTTP2_DATA_FLAG_EOF` flag is set to
- * |*data_flags|, DATA frame will have END_STREAM flag set.  Usually,
- * this is expected behaviour and all are fine.  One exception is send
- * trailer fields.  You cannot send trailer fields after sending frame
- * with END_STREAM set.  To avoid this problem, one can set
- * :enum:`nghttp2_data_flag.NGHTTP2_DATA_FLAG_NO_END_STREAM` along
- * with :enum:`nghttp2_data_flag.NGHTTP2_DATA_FLAG_EOF` to signal the
- * library not to set END_STREAM in DATA frame.  Then application can
- * use `nghttp2_submit_trailer()` to send trailer fields.
- * `nghttp2_submit_trailer()` can be called inside this callback.
- *
- * If the application wants to postpone DATA frames (e.g.,
- * asynchronous I/O, or reading data blocks for long time), it is
- * achieved by returning :enum:`nghttp2_error.NGHTTP2_ERR_DEFERRED`
- * without reading any data in this invocation.  The library removes
- * DATA frame from the outgoing queue temporarily.  To move back
- * deferred DATA frame to outgoing queue, call
- * `nghttp2_session_resume_data()`.
- *
- * By default, |length| is limited to 16KiB at maximum.  If peer
- * allows larger frames, application can enlarge transmission buffer
- * size.  See :type:`nghttp2_data_source_read_length_callback` for
- * more details.
- *
- * If the application just wants to return from
- * `nghttp2_session_send()` or `nghttp2_session_mem_send()` without
- * sending anything, return :enum:`nghttp2_error.NGHTTP2_ERR_PAUSE`.
- *
- * In case of error, there are 2 choices. Returning
- * :enum:`nghttp2_error.NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE` will
- * close the stream by issuing RST_STREAM with
- * :enum:`nghttp2_error_code.NGHTTP2_INTERNAL_ERROR`.  If a different
- * error code is desirable, use `nghttp2_submit_rst_stream()` with a
- * desired error code and then return
- * :enum:`nghttp2_error.NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE`.
- * Returning :enum:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE` will
- * signal the entire session failure.
- */
-typedef ssize_t (*nghttp2_data_source_read_callback)(
-    nghttp2_session *session, int32_t stream_id, uint8_t *buf, size_t length,
-    uint32_t *data_flags, nghttp2_data_source *source, void *user_data);
-
-/**
- * @struct
- *
- * This struct represents the data source and the way to read a chunk
- * of data from it.
- */
-typedef struct {
-  /**
-   * The data source.
-   */
-  nghttp2_data_source source;
-  /**
-   * The callback function to read a chunk of data from the |source|.
-   */
-  nghttp2_data_source_read_callback read_callback;
-} nghttp2_data_provider;
-
-/**
- * @struct
- *
- * The DATA frame.  The received data is delivered via
- * :type:`nghttp2_on_data_chunk_recv_callback`.
- */
-typedef struct {
-  nghttp2_frame_hd hd;
-  /**
-   * The length of the padding in this frame.  This includes PAD_HIGH
-   * and PAD_LOW.
-   */
-  size_t padlen;
-} nghttp2_data;
-
-/**
- * @enum
- *
- * The category of HEADERS, which indicates the role of the frame.  In
- * HTTP/2 spec, request, response, push response and other arbitrary
- * headers (e.g., trailer fields) are all called just HEADERS.  To
- * give the application the role of incoming HEADERS frame, we define
- * several categories.
- */
-typedef enum {
-  /**
-   * The HEADERS frame is opening new stream, which is analogous to
-   * SYN_STREAM in SPDY.
-   */
-  NGHTTP2_HCAT_REQUEST = 0,
-  /**
-   * The HEADERS frame is the first response headers, which is
-   * analogous to SYN_REPLY in SPDY.
-   */
-  NGHTTP2_HCAT_RESPONSE = 1,
-  /**
-   * The HEADERS frame is the first headers sent against reserved
-   * stream.
-   */
-  NGHTTP2_HCAT_PUSH_RESPONSE = 2,
-  /**
-   * The HEADERS frame which does not apply for the above categories,
-   * which is analogous to HEADERS in SPDY.  If non-final response
-   * (e.g., status 1xx) is used, final response HEADERS frame will be
-   * categorized here.
-   */
-  NGHTTP2_HCAT_HEADERS = 3
-} nghttp2_headers_category;
-
-/**
- * @struct
- *
- * The structure to specify stream dependency.
- */
-typedef struct {
-  /**
-   * The stream ID of the stream to depend on.  Specifying 0 makes
-   * stream not depend any other stream.
-   */
-  int32_t stream_id;
-  /**
-   * The weight of this dependency.
-   */
-  int32_t weight;
-  /**
-   * nonzero means exclusive dependency
-   */
-  uint8_t exclusive;
-} nghttp2_priority_spec;
-
-/**
- * @struct
- *
- * The HEADERS frame.  It has the following members:
- */
-typedef struct {
-  /**
-   * The frame header.
-   */
-  nghttp2_frame_hd hd;
-  /**
-   * The length of the padding in this frame.  This includes PAD_HIGH
-   * and PAD_LOW.
-   */
-  size_t padlen;
-  /**
-   * The priority specification
-   */
-  nghttp2_priority_spec pri_spec;
-  /**
-   * The name/value pairs.
-   */
-  nghttp2_nv *nva;
-  /**
-   * The number of name/value pairs in |nva|.
-   */
-  size_t nvlen;
-  /**
-   * The category of this HEADERS frame.
-   */
-  nghttp2_headers_category cat;
-} nghttp2_headers;
-
-/**
- * @struct
- *
- * The PRIORITY frame.  It has the following members:
- */
-typedef struct {
-  /**
-   * The frame header.
-   */
-  nghttp2_frame_hd hd;
-  /**
-   * The priority specification.
-   */
-  nghttp2_priority_spec pri_spec;
-} nghttp2_priority;
-
-/**
- * @struct
- *
- * The RST_STREAM frame.  It has the following members:
- */
-typedef struct {
-  /**
-   * The frame header.
-   */
-  nghttp2_frame_hd hd;
-  /**
-   * The error code.  See :type:`nghttp2_error_code`.
-   */
-  uint32_t error_code;
-} nghttp2_rst_stream;
-
-/**
- * @struct
- *
- * The SETTINGS ID/Value pair.  It has the following members:
- */
-typedef struct {
-  /**
-   * The SETTINGS ID.  See :type:`nghttp2_settings_id`.
-   */
-  int32_t settings_id;
-  /**
-   * The value of this entry.
-   */
-  uint32_t value;
-} nghttp2_settings_entry;
-
-/**
- * @struct
- *
- * The SETTINGS frame.  It has the following members:
- */
-typedef struct {
-  /**
-   * The frame header.
-   */
-  nghttp2_frame_hd hd;
-  /**
-   * The number of SETTINGS ID/Value pairs in |iv|.
-   */
-  size_t niv;
-  /**
-   * The pointer to the array of SETTINGS ID/Value pair.
-   */
-  nghttp2_settings_entry *iv;
-} nghttp2_settings;
-
-/**
- * @struct
- *
- * The PUSH_PROMISE frame.  It has the following members:
- */
-typedef struct {
-  /**
-   * The frame header.
-   */
-  nghttp2_frame_hd hd;
-  /**
-   * The length of the padding in this frame.  This includes PAD_HIGH
-   * and PAD_LOW.
-   */
-  size_t padlen;
-  /**
-   * The name/value pairs.
-   */
-  nghttp2_nv *nva;
-  /**
-   * The number of name/value pairs in |nva|.
-   */
-  size_t nvlen;
-  /**
-   * The promised stream ID
-   */
-  int32_t promised_stream_id;
-  /**
-   * Reserved bit.  Currently this is always set to 0 and application
-   * should not expect something useful in here.
-   */
-  uint8_t reserved;
-} nghttp2_push_promise;
-
-/**
- * @struct
- *
- * The PING frame.  It has the following members:
- */
-typedef struct {
-  /**
-   * The frame header.
-   */
-  nghttp2_frame_hd hd;
-  /**
-   * The opaque data
-   */
-  uint8_t opaque_data8;
-} nghttp2_ping;
-
-/**
- * @struct
- *
- * The GOAWAY frame.  It has the following members:
- */
-typedef struct {
-  /**
-   * The frame header.
-   */
-  nghttp2_frame_hd hd;
-  /**
-   * The last stream stream ID.
-   */
-  int32_t last_stream_id;
-  /**
-   * The error code.  See :type:`nghttp2_error_code`.
-   */
-  uint32_t error_code;
-  /**
-   * The additional debug data
-   */
-  uint8_t *opaque_data;
-  /**
-   * The length of |opaque_data| member.
-   */
-  size_t opaque_data_len;
-  /**
-   * Reserved bit.  Currently this is always set to 0 and application
-   * should not expect something useful in here.
-   */
-  uint8_t reserved;
-} nghttp2_goaway;
-
-/**
- * @struct
- *
- * The WINDOW_UPDATE frame.  It has the following members:
- */
-typedef struct {
-  /**
-   * The frame header.
-   */
-  nghttp2_frame_hd hd;
-  /**
-   * The window size increment.
-   */
-  int32_t window_size_increment;
-  /**
-   * Reserved bit.  Currently this is always set to 0 and application
-   * should not expect something useful in here.
-   */
-  uint8_t reserved;
-} nghttp2_window_update;
-
-/**
- * @struct
- *
- * The extension frame.  It has following members:
- */
-typedef struct {
-  /**
-   * The frame header.
-   */
-  nghttp2_frame_hd hd;
-  /**
-   * The pointer to extension payload.  The exact pointer type is
-   * determined by hd.type.
-   *
-   * Currently, no extension is supported.  This is a place holder for
-   * the future extensions.
-   */
-  void *payload;
-} nghttp2_extension;
-
-/**
- * @union
- *
- * This union includes all frames to pass them to various function
- * calls as nghttp2_frame type.  The CONTINUATION frame is omitted
- * from here because the library deals with it internally.
- */
-typedef union {
-  /**
-   * The frame header, which is convenient to inspect frame header.
-   */
-  nghttp2_frame_hd hd;
-  /**
-   * The DATA frame.
-   */
-  nghttp2_data data;
-  /**
-   * The HEADERS frame.
-   */
-  nghttp2_headers headers;
-  /**
-   * The PRIORITY frame.
-   */
-  nghttp2_priority priority;
-  /**
-   * The RST_STREAM frame.
-   */
-  nghttp2_rst_stream rst_stream;
-  /**
-   * The SETTINGS frame.
-   */
-  nghttp2_settings settings;
-  /**
-   * The PUSH_PROMISE frame.
-   */
-  nghttp2_push_promise push_promise;
-  /**
-   * The PING frame.
-   */
-  nghttp2_ping ping;
-  /**
-   * The GOAWAY frame.
-   */
-  nghttp2_goaway goaway;
-  /**
-   * The WINDOW_UPDATE frame.
-   */
-  nghttp2_window_update window_update;
-  /**
-   * The extension frame.
-   */
-  nghttp2_extension ext;
-} nghttp2_frame;
-
-/**
- * @functypedef
- *
- * Callback function invoked when |session| wants to send data to the
- * remote peer.  The implementation of this function must send at most
- * |length| bytes of data stored in |data|.  The |flags| is currently
- * not used and always 0. It must return the number of bytes sent if
- * it succeeds.  If it cannot send any single byte without blocking,
- * it must return :enum:`nghttp2_error.NGHTTP2_ERR_WOULDBLOCK`.  For
- * other errors, it must return
- * :enum:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE`.  The
- * |user_data| pointer is the third argument passed in to the call to
- * `nghttp2_session_client_new()` or `nghttp2_session_server_new()`.
- *
- * This callback is required if the application uses
- * `nghttp2_session_send()` to send data to the remote endpoint.  If
- * the application uses solely `nghttp2_session_mem_send()` instead,
- * this callback function is unnecessary.
- *
- * To set this callback to :type:`nghttp2_session_callbacks`, use
- * `nghttp2_session_callbacks_set_send_callback()`.
- *
- * .. note::
- *
- *   The |length| may be very small.  If that is the case, and
- *   application disables Nagle algorithm (``TCP_NODELAY``), then just
- *   writing |data| to the network stack leads to very small packet,
- *   and it is very inefficient.  An application should be responsible
- *   to buffer up small chunks of data as necessary to avoid this
- *   situation.
- */
-typedef ssize_t (*nghttp2_send_callback)(nghttp2_session *session,
-                                         const uint8_t *data, size_t length,
-                                         int flags, void *user_data);
-
-/**
- * @functypedef
- *
- * Callback function invoked when
- * :enum:`nghttp2_data_flag.NGHTTP2_DATA_FLAG_NO_COPY` is used in
- * :type:`nghttp2_data_source_read_callback` to send complete DATA
- * frame.
- *
- * The |frame| is a DATA frame to send.  The |framehd| is the
- * serialized frame header (9 bytes). The |length| is the length of
- * application data to send (this does not include padding).  The
- * |source| is the same pointer passed to
- * :type:`nghttp2_data_source_read_callback`.
- *
- * The application first must send frame header |framehd| of length 9
- * bytes.  If ``frame->data.padlen > 0``, send 1 byte of value
- * ``frame->data.padlen - 1``.  Then send exactly |length| bytes of
- * application data.  Finally, if ``frame->data.padlen > 1``, send
- * ``frame->data.padlen - 1`` bytes of zero as padding.
- *
- * The application has to send complete DATA frame in this callback.
- * If all data were written successfully, return 0.
- *
- * If it cannot send any data at all, just return
- * :enum:`nghttp2_error.NGHTTP2_ERR_WOULDBLOCK`; the library will call
- * this callback with the same parameters later (It is recommended to
- * send complete DATA frame at once in this function to deal with
- * error; if partial frame data has already sent, it is impossible to
- * send another data in that state, and all we can do is tear down
- * connection).  When data is fully processed, but application wants
- * to make `nghttp2_session_mem_send()` or `nghttp2_session_send()`
- * return immediately without processing next frames, return
- * :enum:`nghttp2_error.NGHTTP2_ERR_PAUSE`.  If application decided to
- * reset this stream, return
- * :enum:`nghttp2_error.NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE`, then
- * the library will send RST_STREAM with INTERNAL_ERROR as error code.
- * The application can also return
- * :enum:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE`, which will
- * result in connection closure.  Returning any other value is treated
- * as :enum:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE` is returned.
- */
-typedef int (*nghttp2_send_data_callback)(nghttp2_session *session,
-                                          nghttp2_frame *frame,
-                                          const uint8_t *framehd, size_t length,
-                                          nghttp2_data_source *source,
-                                          void *user_data);
-
-/**
- * @functypedef
- *
- * Callback function invoked when |session| wants to receive data from
- * the remote peer.  The implementation of this function must read at
- * most |length| bytes of data and store it in |buf|.  The |flags| is
- * currently not used and always 0.  It must return the number of
- * bytes written in |buf| if it succeeds.  If it cannot read any
- * single byte without blocking, it must return
- * :enum:`nghttp2_error.NGHTTP2_ERR_WOULDBLOCK`.  If it gets EOF
- * before it reads any single byte, it must return
- * :enum:`nghttp2_error.NGHTTP2_ERR_EOF`.  For other errors, it must
- * return :enum:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE`.
- * Returning 0 is treated as
- * :enum:`nghttp2_error.NGHTTP2_ERR_WOULDBLOCK`.  The |user_data|
- * pointer is the third argument passed in to the call to
- * `nghttp2_session_client_new()` or `nghttp2_session_server_new()`.
- *
- * This callback is required if the application uses
- * `nghttp2_session_recv()` to receive data from the remote endpoint.
- * If the application uses solely `nghttp2_session_mem_recv()`
- * instead, this callback function is unnecessary.
- *
- * To set this callback to :type:`nghttp2_session_callbacks`, use
- * `nghttp2_session_callbacks_set_recv_callback()`.
- */
-typedef ssize_t (*nghttp2_recv_callback)(nghttp2_session *session, uint8_t *buf,
-                                         size_t length, int flags,
-                                         void *user_data);
-
-/**
- * @functypedef
- *
- * Callback function invoked by `nghttp2_session_recv()` and
- * `nghttp2_session_mem_recv()` when a frame is received.  The
- * |user_data| pointer is the third argument passed in to the call to
- * `nghttp2_session_client_new()` or `nghttp2_session_server_new()`.
- *
- * If frame is HEADERS or PUSH_PROMISE, the ``nva`` and ``nvlen``
- * member of their data structure are always ``NULL`` and 0
- * respectively.  The header name/value pairs are emitted via
- * :type:`nghttp2_on_header_callback`.
- *
- * For HEADERS, PUSH_PROMISE and DATA frames, this callback may be
- * called after stream is closed (see
- * :type:`nghttp2_on_stream_close_callback`).  The application should
- * check that stream is still alive using its own stream management or
- * :func:`nghttp2_session_get_stream_user_data()`.
- *
- * Only HEADERS and DATA frame can signal the end of incoming data.
- * If ``frame->hd.flags & NGHTTP2_FLAG_END_STREAM`` is nonzero, the
- * |frame| is the last frame from the remote peer in this stream.
- *
- * This callback won't be called for CONTINUATION frames.
- * HEADERS/PUSH_PROMISE + CONTINUATIONs are treated as single frame.
- *
- * The implementation of this function must return 0 if it succeeds.
- * If nonzero value is returned, it is treated as fatal error and
- * `nghttp2_session_recv()` and `nghttp2_session_mem_recv()` functions
- * immediately return
- * :enum:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE`.
- *
- * To set this callback to :type:`nghttp2_session_callbacks`, use
- * `nghttp2_session_callbacks_set_on_frame_recv_callback()`.
- */
-typedef int (*nghttp2_on_frame_recv_callback)(nghttp2_session *session,
-                                              const nghttp2_frame *frame,
-                                              void *user_data);
-
-/**
- * @functypedef
- *
- * Callback function invoked by `nghttp2_session_recv()` and
- * `nghttp2_session_mem_recv()` when an invalid non-DATA frame is
- * received.  The error is indicated by the |lib_error_code|, which is
- * one of the values defined in :type:`nghttp2_error`.  When this
- * callback function is invoked, the library automatically submits
- * either RST_STREAM or GOAWAY frame.  The |user_data| pointer is the
- * third argument passed in to the call to
- * `nghttp2_session_client_new()` or `nghttp2_session_server_new()`.
- *
- * If frame is HEADERS or PUSH_PROMISE, the ``nva`` and ``nvlen``
- * member of their data structure are always ``NULL`` and 0
- * respectively.
- *
- * The implementation of this function must return 0 if it succeeds.
- * If nonzero is returned, it is treated as fatal error and
- * `nghttp2_session_recv()` and `nghttp2_session_mem_recv()` functions
- * immediately return
- * :enum:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE`.
- *
- * To set this callback to :type:`nghttp2_session_callbacks`, use
- * `nghttp2_session_callbacks_set_on_invalid_frame_recv_callback()`.
- */
-typedef int (*nghttp2_on_invalid_frame_recv_callback)(
-    nghttp2_session *session, const nghttp2_frame *frame, int lib_error_code,
-    void *user_data);
-
-/**
- * @functypedef
- *
- * Callback function invoked when a chunk of data in DATA frame is
- * received.  The |stream_id| is the stream ID this DATA frame belongs
- * to.  The |flags| is the flags of DATA frame which this data chunk
- * is contained.  ``(flags & NGHTTP2_FLAG_END_STREAM) != 0`` does not
- * necessarily mean this chunk of data is the last one in the stream.
- * You should use :type:`nghttp2_on_frame_recv_callback` to know all
- * data frames are received.  The |user_data| pointer is the third
- * argument passed in to the call to `nghttp2_session_client_new()` or
- * `nghttp2_session_server_new()`.
- *
- * If the application uses `nghttp2_session_mem_recv()`, it can return
- * :enum:`nghttp2_error.NGHTTP2_ERR_PAUSE` to make
- * `nghttp2_session_mem_recv()` return without processing further
- * input bytes.  The memory by pointed by the |data| is retained until
- * `nghttp2_session_mem_recv()` or `nghttp2_session_recv()` is called.
- * The application must retain the input bytes which was used to
- * produce the |data| parameter, because it may refer to the memory
- * region included in the input bytes.
- *
- * The implementation of this function must return 0 if it succeeds.
- * If nonzero is returned, it is treated as fatal error, and
- * `nghttp2_session_recv()` and `nghttp2_session_mem_recv()` functions
- * immediately return
- * :enum:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE`.
- *
- * To set this callback to :type:`nghttp2_session_callbacks`, use
- * `nghttp2_session_callbacks_set_on_data_chunk_recv_callback()`.
- */
-typedef int (*nghttp2_on_data_chunk_recv_callback)(nghttp2_session *session,
-                                                   uint8_t flags,
-                                                   int32_t stream_id,
-                                                   const uint8_t *data,
-                                                   size_t len, void *user_data);
-
-/**
- * @functypedef
- *
- * Callback function invoked just before the non-DATA frame |frame| is
- * sent.  The |user_data| pointer is the third argument passed in to
- * the call to `nghttp2_session_client_new()` or
- * `nghttp2_session_server_new()`.
- *
- * The implementation of this function must return 0 if it succeeds.
- * It can also return :enum:`nghttp2_error.NGHTTP2_ERR_CANCEL` to
- * cancel the transmission of the given frame.
- *
- * If there is a fatal error while executing this callback, the
- * implementation should return
- * :enum:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE`, which makes
- * `nghttp2_session_send()` and `nghttp2_session_mem_send()` functions
- * immediately return
- * :enum:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE`.
- *
- * If the other value is returned, it is treated as if
- * :enum:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE` is returned.
- * But the implementation should not rely on this since the library
- * may define new return value to extend its capability.
- *
- * To set this callback to :type:`nghttp2_session_callbacks`, use
- * `nghttp2_session_callbacks_set_before_frame_send_callback()`.
- */
-typedef int (*nghttp2_before_frame_send_callback)(nghttp2_session *session,
-                                                  const nghttp2_frame *frame,
-                                                  void *user_data);
-
-/**
- * @functypedef
- *
- * Callback function invoked after the frame |frame| is sent.  The
- * |user_data| pointer is the third argument passed in to the call to
- * `nghttp2_session_client_new()` or `nghttp2_session_server_new()`.
- *
- * The implementation of this function must return 0 if it succeeds.
- * If nonzero is returned, it is treated as fatal error and
- * `nghttp2_session_send()` and `nghttp2_session_mem_send()` functions
- * immediately return
- * :enum:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE`.
- *
- * To set this callback to :type:`nghttp2_session_callbacks`, use
- * `nghttp2_session_callbacks_set_on_frame_send_callback()`.
- */
-typedef int (*nghttp2_on_frame_send_callback)(nghttp2_session *session,
-                                              const nghttp2_frame *frame,
-                                              void *user_data);
-
-/**
- * @functypedef
- *
- * Callback function invoked after the non-DATA frame |frame| is not
- * sent because of the error.  The error is indicated by the
- * |lib_error_code|, which is one of the values defined in
- * :type:`nghttp2_error`.  The |user_data| pointer is the third
- * argument passed in to the call to `nghttp2_session_client_new()` or
- * `nghttp2_session_server_new()`.
- *
- * The implementation of this function must return 0 if it succeeds.
- * If nonzero is returned, it is treated as fatal error and
- * `nghttp2_session_send()` and `nghttp2_session_mem_send()` functions
- * immediately return
- * :enum:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE`.
- *
- * `nghttp2_session_get_stream_user_data()` can be used to get
- * associated data.
- *
- * To set this callback to :type:`nghttp2_session_callbacks`, use
- * `nghttp2_session_callbacks_set_on_frame_not_send_callback()`.
- */
-typedef int (*nghttp2_on_frame_not_send_callback)(nghttp2_session *session,
-                                                  const nghttp2_frame *frame,
-                                                  int lib_error_code,
-                                                  void *user_data);
-
-/**
- * @functypedef
- *
- * Callback function invoked when the stream |stream_id| is closed.
- * The reason of closure is indicated by the |error_code|.  The
- * |error_code| is usually one of :enum:`nghttp2_error_code`, but that
- * is not guaranteed.  The stream_user_data, which was specified in
- * `nghttp2_submit_request()` or `nghttp2_submit_headers()`, is still
- * available in this function.  The |user_data| pointer is the third
- * argument passed in to the call to `nghttp2_session_client_new()` or
- * `nghttp2_session_server_new()`.
- *
- * This function is also called for a stream in reserved state.
- *
- * The implementation of this function must return 0 if it succeeds.
- * If nonzero is returned, it is treated as fatal error and
- * `nghttp2_session_recv()`, `nghttp2_session_mem_recv()`,
- * `nghttp2_session_send()`, and `nghttp2_session_mem_send()`
- * functions immediately return
- * :enum:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE`.
- *
- * To set this callback to :type:`nghttp2_session_callbacks`, use
- * `nghttp2_session_callbacks_set_on_stream_close_callback()`.
- */
-typedef int (*nghttp2_on_stream_close_callback)(nghttp2_session *session,
-                                                int32_t stream_id,
-                                                uint32_t error_code,
-                                                void *user_data);
-
-/**
- * @functypedef
- *
- * Callback function invoked when the reception of header block in
- * HEADERS or PUSH_PROMISE is started.  Each header name/value pair
- * will be emitted by :type:`nghttp2_on_header_callback`.
- *
- * The ``frame->hd.flags`` may not have
- * :enum:`nghttp2_flag.NGHTTP2_FLAG_END_HEADERS` flag set, which
- * indicates that one or more CONTINUATION frames are involved.  But
- * the application does not need to care about that because the header
- * name/value pairs are emitted transparently regardless of
- * CONTINUATION frames.
- *
- * The server applications probably create an object to store
- * information about new stream if ``frame->hd.type ==
- * NGHTTP2_HEADERS`` and ``frame->headers.cat ==
- * NGHTTP2_HCAT_REQUEST``.  If |session| is configured as server side,
- * ``frame->headers.cat`` is either ``NGHTTP2_HCAT_REQUEST``
- * containing request headers or ``NGHTTP2_HCAT_HEADERS`` containing
- * trailer fields and never get PUSH_PROMISE in this callback.
- *
- * For the client applications, ``frame->hd.type`` is either
- * ``NGHTTP2_HEADERS`` or ``NGHTTP2_PUSH_PROMISE``.  In case of
- * ``NGHTTP2_HEADERS``, ``frame->headers.cat ==
- * NGHTTP2_HCAT_RESPONSE`` means that it is the first response
- * headers, but it may be non-final response which is indicated by 1xx
- * status code.  In this case, there may be zero or more HEADERS frame
- * with ``frame->headers.cat == NGHTTP2_HCAT_HEADERS`` which has
- * non-final response code and finally client gets exactly one HEADERS
- * frame with ``frame->headers.cat == NGHTTP2_HCAT_HEADERS``
- * containing final response headers (non-1xx status code).  The
- * trailer fields also has ``frame->headers.cat ==
- * NGHTTP2_HCAT_HEADERS`` which does not contain any status code.
- *
- * Returning
- * :enum:`nghttp2_error.NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE` will
- * close the stream (promised stream if frame is PUSH_PROMISE) by
- * issuing RST_STREAM with
- * :enum:`nghttp2_error_code.NGHTTP2_INTERNAL_ERROR`.  In this case,
- * :type:`nghttp2_on_header_callback` and
- * :type:`nghttp2_on_frame_recv_callback` will not be invoked.  If a
- * different error code is desirable, use
- * `nghttp2_submit_rst_stream()` with a desired error code and then
- * return :enum:`nghttp2_error.NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE`.
- * Again, use ``frame->push_promise.promised_stream_id`` as stream_id
- * parameter in `nghttp2_submit_rst_stream()` if frame is
- * PUSH_PROMISE.
- *
- * The implementation of this function must return 0 if it succeeds.
- * It can return
- * :enum:`nghttp2_error.NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE` to
- * reset the stream (promised stream if frame is PUSH_PROMISE).  For
- * critical errors, it must return
- * :enum:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE`.  If the other
- * value is returned, it is treated as if
- * :enum:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE` is returned.  If
- * :enum:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE` is returned,
- * `nghttp2_session_mem_recv()` function will immediately return
- * :enum:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE`.
- *
- * To set this callback to :type:`nghttp2_session_callbacks`, use
- * `nghttp2_session_callbacks_set_on_begin_headers_callback()`.
- */
-typedef int (*nghttp2_on_begin_headers_callback)(nghttp2_session *session,
-                                                 const nghttp2_frame *frame,
-                                                 void *user_data);
-
-/**
- * @functypedef
- *
- * Callback function invoked when a header name/value pair is received
- * for the |frame|.  The |name| of length |namelen| is header name.
- * The |value| of length |valuelen| is header value.  The |flags| is
- * bitwise OR of one or more of :type:`nghttp2_nv_flag`.
- *
- * If :enum:`nghttp2_nv_flag.NGHTTP2_NV_FLAG_NO_INDEX` is set in
- * |flags|, the receiver must not index this name/value pair when
- * forwarding it to the next hop.  More specifically, "Literal Header
- * Field never Indexed" representation must be used in HPACK encoding.
- *
- * When this callback is invoked, ``frame->hd.type`` is either
- * :enum:`nghttp2_frame_type.NGHTTP2_HEADERS` or
- * :enum:`nghttp2_frame_type.NGHTTP2_PUSH_PROMISE`.  After all header
- * name/value pairs are processed with this callback, and no error has
- * been detected, :type:`nghttp2_on_frame_recv_callback` will be
- * invoked.  If there is an error in decompression,
- * :type:`nghttp2_on_frame_recv_callback` for the |frame| will not be
- * invoked.
- *
- * Both |name| and |value| are guaranteed to be NULL-terminated.  The
- * |namelen| and |valuelen| do not include terminal NULL.  If
- * `nghttp2_option_set_no_http_messaging()` is used with nonzero
- * value, NULL character may be included in |name| or |value| before
- * terminating NULL.
- *
- * Please note that unless `nghttp2_option_set_no_http_messaging()` is
- * used, nghttp2 library does perform validation against the |name|
- * and the |value| using `nghttp2_check_header_name()` and
- * `nghttp2_check_header_value()`.  In addition to this, nghttp2
- * performs validation based on HTTP Messaging rule, which is briefly
- * explained in :ref:`http-messaging` section.
- *
- * If the application uses `nghttp2_session_mem_recv()`, it can return
- * :enum:`nghttp2_error.NGHTTP2_ERR_PAUSE` to make
- * `nghttp2_session_mem_recv()` return without processing further
- * input bytes.  The memory pointed by |frame|, |name| and |value|
- * parameters are retained until `nghttp2_session_mem_recv()` or
- * `nghttp2_session_recv()` is called.  The application must retain
- * the input bytes which was used to produce these parameters, because
- * it may refer to the memory region included in the input bytes.
- *
- * Returning
- * :enum:`nghttp2_error.NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE` will
- * close the stream (promised stream if frame is PUSH_PROMISE) by
- * issuing RST_STREAM with
- * :enum:`nghttp2_error_code.NGHTTP2_INTERNAL_ERROR`.  In this case,
- * :type:`nghttp2_on_header_callback` and
- * :type:`nghttp2_on_frame_recv_callback` will not be invoked.  If a
- * different error code is desirable, use
- * `nghttp2_submit_rst_stream()` with a desired error code and then
- * return :enum:`nghttp2_error.NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE`.
- * Again, use ``frame->push_promise.promised_stream_id`` as stream_id
- * parameter in `nghttp2_submit_rst_stream()` if frame is
- * PUSH_PROMISE.
- *
- * The implementation of this function must return 0 if it succeeds.
- * It may return :enum:`nghttp2_error.NGHTTP2_ERR_PAUSE` or
- * :enum:`nghttp2_error.NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE`.  For
- * other critical failures, it must return
- * :enum:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE`.  If the other
- * nonzero value is returned, it is treated as
- * :enum:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE`.  If
- * :enum:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE` is returned,
- * `nghttp2_session_recv()` and `nghttp2_session_mem_recv()` functions
- * immediately return
- * :enum:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE`.
- *
- * To set this callback to :type:`nghttp2_session_callbacks`, use
- * `nghttp2_session_callbacks_set_on_header_callback()`.
- *
- * .. warning::
- *
- *   Application should properly limit the total buffer size to store
- *   incoming header fields.  Without it, peer may send large number
- *   of header fields or large header fields to cause out of memory in
- *   local endpoint.  Due to how HPACK works, peer can do this
- *   effectively without using much memory on their own.
- */
-typedef int (*nghttp2_on_header_callback)(nghttp2_session *session,
-                                          const nghttp2_frame *frame,
-                                          const uint8_t *name, size_t namelen,
-                                          const uint8_t *value, size_t valuelen,
-                                          uint8_t flags, void *user_data);
-
-/**
- * @functypedef
- *
- * Callback function invoked when a header name/value pair is received
- * for the |frame|.  The |name| is header name.  The |value| is header
- * value.  The |flags| is bitwise OR of one or more of
- * :type:`nghttp2_nv_flag`.
- *
- * This callback behaves like :type:`nghttp2_on_header_callback`,
- * except that |name| and |value| are stored in reference counted
- * buffer.  If application wishes to keep these references without
- * copying them, use `nghttp2_rcbuf_incref()` to increment their
- * reference count.  It is the application's responsibility to call
- * `nghttp2_rcbuf_decref()` if they called `nghttp2_rcbuf_incref()` so
- * as not to leak memory.  If the |session| is created by
- * `nghttp2_session_server_new3()` or `nghttp2_session_client_new3()`,
- * the function to free memory is the one belongs to the mem
- * parameter.  As long as this free function alives, |name| and
- * |value| can live after |session| was destroyed.
- */
-typedef int (*nghttp2_on_header_callback2)(nghttp2_session *session,
-                                           const nghttp2_frame *frame,
-                                           nghttp2_rcbuf *name,
-                                           nghttp2_rcbuf *value, uint8_t flags,
-                                           void *user_data);
-
-/**
- * @functypedef
- *
- * Callback function invoked when a invalid header name/value pair is
- * received for the |frame|.
- *
- * The parameter and behaviour are similar to
- * :type:`nghttp2_on_header_callback`.  The difference is that this
- * callback is only invoked when a invalid header name/value pair is
- * received which is treated as stream error if this callback is not
- * set.  Only invalid regular header field are passed to this
- * callback.  In other words, invalid pseudo header field is not
- * passed to this callback.  Also header fields which includes upper
- * cased latter are also treated as error without passing them to this
- * callback.
- *
- * This callback is only considered if HTTP messaging validation is
- * turned on (which is on by default, see
- * `nghttp2_option_set_no_http_messaging()`).
- *
- * With this callback, application inspects the incoming invalid
- * field, and it also can reset stream from this callback by returning
- * :enum:`nghttp2_error.NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE`.  By
- * default, the error code is
- * :enum:`nghttp2_error_code.NGHTTP2_PROTOCOL_ERROR`.  To change the
- * error code, call `nghttp2_submit_rst_stream()` with the error code
- * of choice in addition to returning
- * :enum:`nghttp2_error.NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE`.
- *
- * If 0 is returned, the header field is ignored, and the stream is
- * not reset.
- */
-typedef int (*nghttp2_on_invalid_header_callback)(
-    nghttp2_session *session, const nghttp2_frame *frame, const uint8_t *name,
-    size_t namelen, const uint8_t *value, size_t valuelen, uint8_t flags,
-    void *user_data);
-
-/**
- * @functypedef
- *
- * Callback function invoked when a invalid header name/value pair is
- * received for the |frame|.
- *
- * The parameter and behaviour are similar to
- * :type:`nghttp2_on_header_callback2`.  The difference is that this
- * callback is only invoked when a invalid header name/value pair is
- * received which is silently ignored if this callback is not set.
- * Only invalid regular header field are passed to this callback.  In
- * other words, invalid pseudo header field is not passed to this
- * callback.  Also header fields which includes upper cased latter are
- * also treated as error without passing them to this callback.
- *
- * This callback is only considered if HTTP messaging validation is
- * turned on (which is on by default, see
- * `nghttp2_option_set_no_http_messaging()`).
- *
- * With this callback, application inspects the incoming invalid
- * field, and it also can reset stream from this callback by returning
- * :enum:`nghttp2_error.NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE`.  By
- * default, the error code is
- * :enum:`nghttp2_error_code.NGHTTP2_INTERNAL_ERROR`.  To change the
- * error code, call `nghttp2_submit_rst_stream()` with the error code
- * of choice in addition to returning
- * :enum:`nghttp2_error.NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE`.
- */
-typedef int (*nghttp2_on_invalid_header_callback2)(
-    nghttp2_session *session, const nghttp2_frame *frame, nghttp2_rcbuf *name,
-    nghttp2_rcbuf *value, uint8_t flags, void *user_data);
-
-/**
- * @functypedef
- *
- * Callback function invoked when the library asks application how
- * many padding bytes are required for the transmission of the
- * |frame|.  The application must choose the total length of payload
- * including padded bytes in range frame->hd.length, max_payloadlen,
- * inclusive.  Choosing number not in this range will be treated as
- * :enum:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE`.  Returning
- * ``frame->hd.length`` means no padding is added.  Returning
- * :enum:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE` will make
- * `nghttp2_session_send()` and `nghttp2_session_mem_send()` functions
- * immediately return
- * :enum:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE`.
- *
- * To set this callback to :type:`nghttp2_session_callbacks`, use
- * `nghttp2_session_callbacks_set_select_padding_callback()`.
- */
-typedef ssize_t (*nghttp2_select_padding_callback)(nghttp2_session *session,
-                                                   const nghttp2_frame *frame,
-                                                   size_t max_payloadlen,
-                                                   void *user_data);
-
-/**
- * @functypedef
- *
- * Callback function invoked when library wants to get max length of
- * data to send data to the remote peer.  The implementation of this
- * function should return a value in the following range.  1,
- * min(|session_remote_window_size|, |stream_remote_window_size|,
- * |remote_max_frame_size|).  If a value greater than this range is
- * returned than the max allow value will be used.  Returning a value
- * smaller than this range is treated as
- * :enum:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE`.  The
- * |frame_type| is provided for future extensibility and identifies
- * the type of frame (see :type:`nghttp2_frame_type`) for which to get
- * the length for.  Currently supported frame types are:
- * :enum:`nghttp2_frame_type.NGHTTP2_DATA`.
- *
- * This callback can be used to control the length in bytes for which
- * :type:`nghttp2_data_source_read_callback` is allowed to send to the
- * remote endpoint.  This callback is optional.  Returning
- * :enum:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE` will signal the
- * entire session failure.
- *
- * To set this callback to :type:`nghttp2_session_callbacks`, use
- * `nghttp2_session_callbacks_set_data_source_read_length_callback()`.
- */
-typedef ssize_t (*nghttp2_data_source_read_length_callback)(
-    nghttp2_session *session, uint8_t frame_type, int32_t stream_id,
-    int32_t session_remote_window_size, int32_t stream_remote_window_size,
-    uint32_t remote_max_frame_size, void *user_data);
-
-/**
- * @functypedef
- *
- * Callback function invoked when a frame header is received.  The
- * |hd| points to received frame header.
- *
- * Unlike :type:`nghttp2_on_frame_recv_callback`, this callback will
- * also be called when frame header of CONTINUATION frame is received.
- *
- * If both :type:`nghttp2_on_begin_frame_callback` and
- * :type:`nghttp2_on_begin_headers_callback` are set and HEADERS or
- * PUSH_PROMISE is received, :type:`nghttp2_on_begin_frame_callback`
- * will be called first.
- *
- * The implementation of this function must return 0 if it succeeds.
- * If nonzero value is returned, it is treated as fatal error and
- * `nghttp2_session_recv()` and `nghttp2_session_mem_recv()` functions
- * immediately return
- * :enum:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE`.
- *
- * To set this callback to :type:`nghttp2_session_callbacks`, use
- * `nghttp2_session_callbacks_set_on_begin_frame_callback()`.
- */
-typedef int (*nghttp2_on_begin_frame_callback)(nghttp2_session *session,
-                                               const nghttp2_frame_hd *hd,
-                                               void *user_data);
-
-/**
- * @functypedef
- *
- * Callback function invoked when chunk of extension frame payload is
- * received.  The |hd| points to frame header.  The received
- * chunk is |data| of length |len|.
- *
- * The implementation of this function must return 0 if it succeeds.
- *
- * To abort processing this extension frame, return
- * :enum:`nghttp2_error.NGHTTP2_ERR_CANCEL`.
- *
- * If fatal error occurred, application should return
- * :enum:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE`.  In this case,
- * `nghttp2_session_recv()` and `nghttp2_session_mem_recv()` functions
- * immediately return
- * :enum:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE`.  If the other
- * values are returned, currently they are treated as
- * :enum:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE`.
- */
-typedef int (*nghttp2_on_extension_chunk_recv_callback)(
-    nghttp2_session *session, const nghttp2_frame_hd *hd, const uint8_t *data,
-    size_t len, void *user_data);
-
-/**
- * @functypedef
- *
- * Callback function invoked when library asks the application to
- * unpack extension payload from its wire format.  The extension
- * payload has been passed to the application using
- * :type:`nghttp2_on_extension_chunk_recv_callback`.  The frame header
- * is already unpacked by the library and provided as |hd|.
- *
- * To receive extension frames, the application must tell desired
- * extension frame type to the library using
- * `nghttp2_option_set_user_recv_extension_type()`.
- *
- * The implementation of this function may store the pointer to the
- * created object as a result of unpacking in |*payload|, and returns
- * 0.  The pointer stored in |*payload| is opaque to the library, and
- * the library does not own its pointer.  |*payload| is initialized as
- * ``NULL``.  The |*payload| is available as ``frame->ext.payload`` in
- * :type:`nghttp2_on_frame_recv_callback`.  Therefore if application
- * can free that memory inside :type:`nghttp2_on_frame_recv_callback`
- * callback.  Of course, application has a liberty not ot use
- * |*payload|, and do its own mechanism to process extension frames.
- *
- * To abort processing this extension frame, return
- * :enum:`nghttp2_error.NGHTTP2_ERR_CANCEL`.
- *
- * If fatal error occurred, application should return
- * :enum:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE`.  In this case,
- * `nghttp2_session_recv()` and `nghttp2_session_mem_recv()` functions
- * immediately return
- * :enum:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE`.  If the other
- * values are returned, currently they are treated as
- * :enum:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE`.
- */
-typedef int (*nghttp2_unpack_extension_callback)(nghttp2_session *session,
-                                                 void **payload,
-                                                 const nghttp2_frame_hd *hd,
-                                                 void *user_data);
-
-/**
- * @functypedef
- *
- * Callback function invoked when library asks the application to pack
- * extension payload in its wire format.  The frame header will be
- * packed by library.  Application must pack payload only.
- * ``frame->ext.payload`` is the object passed to
- * `nghttp2_submit_extension()` as payload parameter.  Application
- * must pack extension payload to the |buf| of its capacity |len|
- * bytes.  The |len| is at least 16KiB.
- *
- * The implementation of this function should return the number of
- * bytes written into |buf| when it succeeds.
- *
- * To abort processing this extension frame, return
- * :enum:`nghttp2_error.NGHTTP2_ERR_CANCEL`, and
- * :type:`nghttp2_on_frame_not_send_callback` will be invoked.
- *
- * If fatal error occurred, application should return
- * :enum:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE`.  In this case,
- * `nghttp2_session_send()` and `nghttp2_session_mem_send()` functions
- * immediately return
- * :enum:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE`.  If the other
- * values are returned, currently they are treated as
- * :enum:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE`.  If the return
- * value is strictly larger than |len|, it is treated as
- * :enum:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE`.
- */
-typedef ssize_t (*nghttp2_pack_extension_callback)(nghttp2_session *session,
-                                                   uint8_t *buf, size_t len,
-                                                   const nghttp2_frame *frame,
-                                                   void *user_data);
-
-/**
- * @functypedef
- *
- * Callback function invoked when library provides the error message
- * intended for human consumption.  This callback is solely for
- * debugging purpose.  The |msg| is typically NULL-terminated string
- * of length |len|.  |len| does not include the sentinel NULL
- * character.
- *
- * This function is deprecated.  The new application should use
- * :type:`nghttp2_error_callback2`.
- *
- * The format of error message may change between nghttp2 library
- * versions.  The application should not depend on the particular
- * format.
- *
- * Normally, application should return 0 from this callback.  If fatal
- * error occurred while doing something in this callback, application
- * should return :enum:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE`.
- * In this case, library will return immediately with return value
- * :enum:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE`.  Currently, if
- * nonzero value is returned from this callback, they are treated as
- * :enum:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE`, but application
- * should not rely on this details.
- */
-typedef int (*nghttp2_error_callback)(nghttp2_session *session, const char *msg,
-                                      size_t len, void *user_data);
-
-/**
- * @functypedef
- *
- * Callback function invoked when library provides the error code, and
- * message.  This callback is solely for debugging purpose.
- * |lib_error_code| is one of error code defined in
- * :enum:`nghttp2_error`.  The |msg| is typically NULL-terminated
- * string of length |len|, and intended for human consumption.  |len|
- * does not include the sentinel NULL character.
- *
- * The format of error message may change between nghttp2 library
- * versions.  The application should not depend on the particular
- * format.
- *
- * Normally, application should return 0 from this callback.  If fatal
- * error occurred while doing something in this callback, application
- * should return :enum:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE`.
- * In this case, library will return immediately with return value
- * :enum:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE`.  Currently, if
- * nonzero value is returned from this callback, they are treated as
- * :enum:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE`, but application
- * should not rely on this details.
- */
-typedef int (*nghttp2_error_callback2)(nghttp2_session *session,
-                                       int lib_error_code, const char *msg,
-                                       size_t len, void *user_data);
-
-struct nghttp2_session_callbacks;
-
-/**
- * @struct
- *
- * Callback functions for :type:`nghttp2_session`.  The details of
- * this structure are intentionally hidden from the public API.
- */
-typedef struct nghttp2_session_callbacks nghttp2_session_callbacks;
-
-/**
- * @function
- *
- * Initializes |*callbacks_ptr| with NULL values.
- *
- * The initialized object can be used when initializing multiple
- * :type:`nghttp2_session` objects.
- *
- * When the application finished using this object, it can use
- * `nghttp2_session_callbacks_del()` to free its memory.
- *
- * This function returns 0 if it succeeds, or one of the following
- * negative error codes:
- *
- * :enum:`nghttp2_error.NGHTTP2_ERR_NOMEM`
- *     Out of memory.
- */
-NGHTTP2_EXTERN int
-nghttp2_session_callbacks_new(nghttp2_session_callbacks **callbacks_ptr);
-
-/**
- * @function
- *
- * Frees any resources allocated for |callbacks|.  If |callbacks| is
- * ``NULL``, this function does nothing.
- */
-NGHTTP2_EXTERN void
-nghttp2_session_callbacks_del(nghttp2_session_callbacks *callbacks);
-
-/**
- * @function
- *
- * Sets callback function invoked when a session wants to send data to
- * the remote peer.  This callback is not necessary if the application
- * uses solely `nghttp2_session_mem_send()` to serialize data to
- * transmit.
- */
-NGHTTP2_EXTERN void nghttp2_session_callbacks_set_send_callback(
-    nghttp2_session_callbacks *cbs, nghttp2_send_callback send_callback);
-
-/**
- * @function
- *
- * Sets callback function invoked when the a session wants to receive
- * data from the remote peer.  This callback is not necessary if the
- * application uses solely `nghttp2_session_mem_recv()` to process
- * received data.
- */
-NGHTTP2_EXTERN void nghttp2_session_callbacks_set_recv_callback(
-    nghttp2_session_callbacks *cbs, nghttp2_recv_callback recv_callback);
-
-/**
- * @function
- *
- * Sets callback function invoked by `nghttp2_session_recv()` and
- * `nghttp2_session_mem_recv()` when a frame is received.
- */
-NGHTTP2_EXTERN void nghttp2_session_callbacks_set_on_frame_recv_callback(
-    nghttp2_session_callbacks *cbs,
-    nghttp2_on_frame_recv_callback on_frame_recv_callback);
-
-/**
- * @function
- *
- * Sets callback function invoked by `nghttp2_session_recv()` and
- * `nghttp2_session_mem_recv()` when an invalid non-DATA frame is
- * received.
- */
-NGHTTP2_EXTERN void
-nghttp2_session_callbacks_set_on_invalid_frame_recv_callback(
-    nghttp2_session_callbacks *cbs,
-    nghttp2_on_invalid_frame_recv_callback on_invalid_frame_recv_callback);
-
-/**
- * @function
- *
- * Sets callback function invoked when a chunk of data in DATA frame
- * is received.
- */
-NGHTTP2_EXTERN void nghttp2_session_callbacks_set_on_data_chunk_recv_callback(
-    nghttp2_session_callbacks *cbs,
-    nghttp2_on_data_chunk_recv_callback on_data_chunk_recv_callback);
-
-/**
- * @function
- *
- * Sets callback function invoked before a non-DATA frame is sent.
- */
-NGHTTP2_EXTERN void nghttp2_session_callbacks_set_before_frame_send_callback(
-    nghttp2_session_callbacks *cbs,
-    nghttp2_before_frame_send_callback before_frame_send_callback);
-
-/**
- * @function
- *
- * Sets callback function invoked after a frame is sent.
- */
-NGHTTP2_EXTERN void nghttp2_session_callbacks_set_on_frame_send_callback(
-    nghttp2_session_callbacks *cbs,
-    nghttp2_on_frame_send_callback on_frame_send_callback);
-
-/**
- * @function
- *
- * Sets callback function invoked when a non-DATA frame is not sent
- * because of an error.
- */
-NGHTTP2_EXTERN void nghttp2_session_callbacks_set_on_frame_not_send_callback(
-    nghttp2_session_callbacks *cbs,
-    nghttp2_on_frame_not_send_callback on_frame_not_send_callback);
-
-/**
- * @function
- *
- * Sets callback function invoked when the stream is closed.
- */
-NGHTTP2_EXTERN void nghttp2_session_callbacks_set_on_stream_close_callback(
-    nghttp2_session_callbacks *cbs,
-    nghttp2_on_stream_close_callback on_stream_close_callback);
-
-/**
- * @function
- *
- * Sets callback function invoked when the reception of header block
- * in HEADERS or PUSH_PROMISE is started.
- */
-NGHTTP2_EXTERN void nghttp2_session_callbacks_set_on_begin_headers_callback(
-    nghttp2_session_callbacks *cbs,
-    nghttp2_on_begin_headers_callback on_begin_headers_callback);
-
-/**
- * @function
- *
- * Sets callback function invoked when a header name/value pair is
- * received.  If both
- * `nghttp2_session_callbacks_set_on_header_callback()` and
- * `nghttp2_session_callbacks_set_on_header_callback2()` are used to
- * set callbacks, the latter has the precedence.
- */
-NGHTTP2_EXTERN void nghttp2_session_callbacks_set_on_header_callback(
-    nghttp2_session_callbacks *cbs,
-    nghttp2_on_header_callback on_header_callback);
-
-/**
- * @function
- *
- * Sets callback function invoked when a header name/value pair is
- * received.
- */
-NGHTTP2_EXTERN void nghttp2_session_callbacks_set_on_header_callback2(
-    nghttp2_session_callbacks *cbs,
-    nghttp2_on_header_callback2 on_header_callback2);
-
-/**
- * @function
- *
- * Sets callback function invoked when a invalid header name/value
- * pair is received.  If both
- * `nghttp2_session_callbacks_set_on_invalid_header_callback()` and
- * `nghttp2_session_callbacks_set_on_invalid_header_callback2()` are
- * used to set callbacks, the latter takes the precedence.
- */
-NGHTTP2_EXTERN void nghttp2_session_callbacks_set_on_invalid_header_callback(
-    nghttp2_session_callbacks *cbs,
-    nghttp2_on_invalid_header_callback on_invalid_header_callback);
-
-/**
- * @function
- *
- * Sets callback function invoked when a invalid header name/value
- * pair is received.
- */
-NGHTTP2_EXTERN void nghttp2_session_callbacks_set_on_invalid_header_callback2(
-    nghttp2_session_callbacks *cbs,
-    nghttp2_on_invalid_header_callback2 on_invalid_header_callback2);
-
-/**
- * @function
- *
- * Sets callback function invoked when the library asks application
- * how many padding bytes are required for the transmission of the
- * given frame.
- */
-NGHTTP2_EXTERN void nghttp2_session_callbacks_set_select_padding_callback(
-    nghttp2_session_callbacks *cbs,
-    nghttp2_select_padding_callback select_padding_callback);
-
-/**
- * @function
- *
- * Sets callback function determine the length allowed in
- * :type:`nghttp2_data_source_read_callback`.
- */
-NGHTTP2_EXTERN void
-nghttp2_session_callbacks_set_data_source_read_length_callback(
-    nghttp2_session_callbacks *cbs,
-    nghttp2_data_source_read_length_callback data_source_read_length_callback);
-
-/**
- * @function
- *
- * Sets callback function invoked when a frame header is received.
- */
-NGHTTP2_EXTERN void nghttp2_session_callbacks_set_on_begin_frame_callback(
-    nghttp2_session_callbacks *cbs,
-    nghttp2_on_begin_frame_callback on_begin_frame_callback);
-
-/**
- * @function
- *
- * Sets callback function invoked when
- * :enum:`nghttp2_data_flag.NGHTTP2_DATA_FLAG_NO_COPY` is used in
- * :type:`nghttp2_data_source_read_callback` to avoid data copy.
- */
-NGHTTP2_EXTERN void nghttp2_session_callbacks_set_send_data_callback(
-    nghttp2_session_callbacks *cbs,
-    nghttp2_send_data_callback send_data_callback);
-
-/**
- * @function
- *
- * Sets callback function invoked when the library asks the
- * application to pack extension frame payload in wire format.
- */
-NGHTTP2_EXTERN void nghttp2_session_callbacks_set_pack_extension_callback(
-    nghttp2_session_callbacks *cbs,
-    nghttp2_pack_extension_callback pack_extension_callback);
-
-/**
- * @function
- *
- * Sets callback function invoked when the library asks the
- * application to unpack extension frame payload from wire format.
- */
-NGHTTP2_EXTERN void nghttp2_session_callbacks_set_unpack_extension_callback(
-    nghttp2_session_callbacks *cbs,
-    nghttp2_unpack_extension_callback unpack_extension_callback);
-
-/**
- * @function
- *
- * Sets callback function invoked when chunk of extension frame
- * payload is received.
- */
-NGHTTP2_EXTERN void
-nghttp2_session_callbacks_set_on_extension_chunk_recv_callback(
-    nghttp2_session_callbacks *cbs,
-    nghttp2_on_extension_chunk_recv_callback on_extension_chunk_recv_callback);
-
-/**
- * @function
- *
- * Sets callback function invoked when library tells error message to
- * the application.
- *
- * This function is deprecated.  The new application should use
- * `nghttp2_session_callbacks_set_error_callback2()`.
- *
- * If both :type:`nghttp2_error_callback` and
- * :type:`nghttp2_error_callback2` are set, the latter takes
- * precedence.
- */
-NGHTTP2_EXTERN void nghttp2_session_callbacks_set_error_callback(
-    nghttp2_session_callbacks *cbs, nghttp2_error_callback error_callback);
-
-/**
- * @function
- *
- * Sets callback function invoked when library tells error code, and
- * message to the application.
- *
- * If both :type:`nghttp2_error_callback` and
- * :type:`nghttp2_error_callback2` are set, the latter takes
- * precedence.
- */
-NGHTTP2_EXTERN void nghttp2_session_callbacks_set_error_callback2(
-    nghttp2_session_callbacks *cbs, nghttp2_error_callback2 error_callback2);
-
-/**
- * @functypedef
- *
- * Custom memory allocator to replace malloc().  The |mem_user_data|
- * is the mem_user_data member of :type:`nghttp2_mem` structure.
- */
-typedef void *(*nghttp2_malloc)(size_t size, void *mem_user_data);
-
-/**
- * @functypedef
- *
- * Custom memory allocator to replace free().  The |mem_user_data| is
- * the mem_user_data member of :type:`nghttp2_mem` structure.
- */
-typedef void (*nghttp2_free)(void *ptr, void *mem_user_data);
-
-/**
- * @functypedef
- *
- * Custom memory allocator to replace calloc().  The |mem_user_data|
- * is the mem_user_data member of :type:`nghttp2_mem` structure.
- */
-typedef void *(*nghttp2_calloc)(size_t nmemb, size_t size, void *mem_user_data);
-
-/**
- * @functypedef
- *
- * Custom memory allocator to replace realloc().  The |mem_user_data|
- * is the mem_user_data member of :type:`nghttp2_mem` structure.
- */
-typedef void *(*nghttp2_realloc)(void *ptr, size_t size, void *mem_user_data);
-
-/**
- * @struct
- *
- * Custom memory allocator functions and user defined pointer.  The
- * |mem_user_data| member is passed to each allocator function.  This
- * can be used, for example, to achieve per-session memory pool.
- *
- * In the following example code, ``my_malloc``, ``my_free``,
- * ``my_calloc`` and ``my_realloc`` are the replacement of the
- * standard allocators ``malloc``, ``free``, ``calloc`` and
- * ``realloc`` respectively::
- *
- *     void *my_malloc_cb(size_t size, void *mem_user_data) {
- *       return my_malloc(size);
- *     }
- *
- *     void my_free_cb(void *ptr, void *mem_user_data) { my_free(ptr); }
- *
- *     void *my_calloc_cb(size_t nmemb, size_t size, void *mem_user_data) {
- *       return my_calloc(nmemb, size);
- *     }
- *
- *     void *my_realloc_cb(void *ptr, size_t size, void *mem_user_data) {
- *       return my_realloc(ptr, size);
- *     }
- *
- *     void session_new() {
- *       nghttp2_session *session;
- *       nghttp2_session_callbacks *callbacks;
- *       nghttp2_mem mem = {NULL, my_malloc_cb, my_free_cb, my_calloc_cb,
- *                          my_realloc_cb};
- *
- *       ...
- *
- *       nghttp2_session_client_new3(&session, callbacks, NULL, NULL, &mem);
- *
- *       ...
- *     }
- */
-typedef struct {
-  /**
-   * An arbitrary user supplied data.  This is passed to each
-   * allocator function.
-   */
-  void *mem_user_data;
-  /**
-   * Custom allocator function to replace malloc().
-   */
-  nghttp2_malloc malloc;
-  /**
-   * Custom allocator function to replace free().
-   */
-  nghttp2_free free;
-  /**
-   * Custom allocator function to replace calloc().
-   */
-  nghttp2_calloc calloc;
-  /**
-   * Custom allocator function to replace realloc().
-   */
-  nghttp2_realloc realloc;
-} nghttp2_mem;
-
-struct nghttp2_option;
-
-/**
- * @struct
- *
- * Configuration options for :type:`nghttp2_session`.  The details of
- * this structure are intentionally hidden from the public API.
- */
-typedef struct nghttp2_option nghttp2_option;
-
-/**
- * @function
- *
- * Initializes |*option_ptr| with default values.
- *
- * When the application finished using this object, it can use
- * `nghttp2_option_del()` to free its memory.
- *
- * This function returns 0 if it succeeds, or one of the following
- * negative error codes:
- *
- * :enum:`nghttp2_error.NGHTTP2_ERR_NOMEM`
- *     Out of memory.
- */
-NGHTTP2_EXTERN int nghttp2_option_new(nghttp2_option **option_ptr);
-
-/**
- * @function
- *
- * Frees any resources allocated for |option|.  If |option| is
- * ``NULL``, this function does nothing.
- */
-NGHTTP2_EXTERN void nghttp2_option_del(nghttp2_option *option);
-
-/**
- * @function
- *
- * This option prevents the library from sending WINDOW_UPDATE for a
- * connection automatically.  If this option is set to nonzero, the
- * library won't send WINDOW_UPDATE for DATA until application calls
- * `nghttp2_session_consume()` to indicate the consumed amount of
- * data.  Don't use `nghttp2_submit_window_update()` for this purpose.
- * By default, this option is set to zero.
- */
-NGHTTP2_EXTERN void
-nghttp2_option_set_no_auto_window_update(nghttp2_option *option, int val);
-
-/**
- * @function
- *
- * This option sets the SETTINGS_MAX_CONCURRENT_STREAMS value of
- * remote endpoint as if it is received in SETTINGS frame.  Without
- * specifying this option, the maximum number of outgoing concurrent
- * streams is initially limited to 100 to avoid issues when the local
- * endpoint submits lots of requests before receiving initial SETTINGS
- * frame from the remote endpoint, since sending them at once to the
- * remote endpoint could lead to rejection of some of the requests.
- * This value will be overwritten when the local endpoint receives
- * initial SETTINGS frame from the remote endpoint, either to the
- * value advertised in SETTINGS_MAX_CONCURRENT_STREAMS or to the
- * default value (unlimited) if none was advertised.
- */
-NGHTTP2_EXTERN void
-nghttp2_option_set_peer_max_concurrent_streams(nghttp2_option *option,
-                                               uint32_t val);
-
-/**
- * @function
- *
- * By default, nghttp2 library, if configured as server, requires
- * first 24 bytes of client magic byte string (MAGIC).  In most cases,
- * this will simplify the implementation of server.  But sometimes
- * server may want to detect the application protocol based on first
- * few bytes on clear text communication.
- *
- * If this option is used with nonzero |val|, nghttp2 library does not
- * handle MAGIC.  It still checks following SETTINGS frame.  This
- * means that applications should deal with MAGIC by themselves.
- *
- * If this option is not used or used with zero value, if MAGIC does
- * not match :macro:`NGHTTP2_CLIENT_MAGIC`, `nghttp2_session_recv()`
- * and `nghttp2_session_mem_recv()` will return error
- * :enum:`nghttp2_error.NGHTTP2_ERR_BAD_CLIENT_MAGIC`, which is fatal
- * error.
- */
-NGHTTP2_EXTERN void
-nghttp2_option_set_no_recv_client_magic(nghttp2_option *option, int val);
-
-/**
- * @function
- *
- * By default, nghttp2 library enforces subset of HTTP Messaging rules
- * described in `HTTP/2 specification, section 8
- * <https://tools.ietf.org/html/rfc7540#section-8>`_.  See
- * :ref:`http-messaging` section for details.  For those applications
- * who use nghttp2 library as non-HTTP use, give nonzero to |val| to
- * disable this enforcement.  Please note that disabling this feature
- * does not change the fundamental client and server model of HTTP.
- * That is, even if the validation is disabled, only client can send
- * requests.
- */
-NGHTTP2_EXTERN void nghttp2_option_set_no_http_messaging(nghttp2_option *option,
-                                                         int val);
-
-/**
- * @function
- *
- * RFC 7540 does not enforce any limit on the number of incoming
- * reserved streams (in RFC 7540 terms, streams in reserved (remote)
- * state).  This only affects client side, since only server can push
- * streams.  Malicious server can push arbitrary number of streams,
- * and make client's memory exhausted.  This option can set the
- * maximum number of such incoming streams to avoid possible memory
- * exhaustion.  If this option is set, and pushed streams are
- * automatically closed on reception, without calling user provided
- * callback, if they exceed the given limit.  The default value is
- * 200.  If session is configured as server side, this option has no
- * effect.  Server can control the number of streams to push.
- */
-NGHTTP2_EXTERN void
-nghttp2_option_set_max_reserved_remote_streams(nghttp2_option *option,
-                                               uint32_t val);
-
-/**
- * @function
- *
- * Sets extension frame type the application is willing to handle with
- * user defined callbacks (see
- * :type:`nghttp2_on_extension_chunk_recv_callback` and
- * :type:`nghttp2_unpack_extension_callback`).  The |type| is
- * extension frame type, and must be strictly greater than 0x9.
- * Otherwise, this function does nothing.  The application can call
- * this function multiple times to set more than one frame type to
- * receive.  The application does not have to call this function if it
- * just sends extension frames.
- */
-NGHTTP2_EXTERN void
-nghttp2_option_set_user_recv_extension_type(nghttp2_option *option,
-                                            uint8_t type);
-
-/**
- * @function
- *
- * Sets extension frame type the application is willing to receive
- * using builtin handler.  The |type| is the extension frame type to
- * receive, and must be strictly greater than 0x9.  Otherwise, this
- * function does nothing.  The application can call this function
- * multiple times to set more than one frame type to receive.  The
- * application does not have to call this function if it just sends
- * extension frames.
- *
- * If same frame type is passed to both
- * `nghttp2_option_set_builtin_recv_extension_type()` and
- * `nghttp2_option_set_user_recv_extension_type()`, the latter takes
- * precedence.
- */
-NGHTTP2_EXTERN void
-nghttp2_option_set_builtin_recv_extension_type(nghttp2_option *option,
-                                               uint8_t type);
-
-/**
- * @function
- *
- * This option prevents the library from sending PING frame with ACK
- * flag set automatically when PING frame without ACK flag set is
- * received.  If this option is set to nonzero, the library won't send
- * PING frame with ACK flag set in the response for incoming PING
- * frame.  The application can send PING frame with ACK flag set using
- * `nghttp2_submit_ping()` with :enum:`nghttp2_flag.NGHTTP2_FLAG_ACK`
- * as flags parameter.
- */
-NGHTTP2_EXTERN void nghttp2_option_set_no_auto_ping_ack(nghttp2_option *option,
-                                                        int val);
-
-/**
- * @function
- *
- * This option sets the maximum length of header block (a set of
- * header fields per one HEADERS frame) to send.  The length of a
- * given set of header fields is calculated using
- * `nghttp2_hd_deflate_bound()`.  The default value is 64KiB.  If
- * application attempts to send header fields larger than this limit,
- * the transmission of the frame fails with error code
- * :enum:`nghttp2_error.NGHTTP2_ERR_FRAME_SIZE_ERROR`.
- */
-NGHTTP2_EXTERN void
-nghttp2_option_set_max_send_header_block_length(nghttp2_option *option,
-                                                size_t val);
-
-/**
- * @function
- *
- * This option sets the maximum dynamic table size for deflating
- * header fields.  The default value is 4KiB.  In HTTP/2, receiver of
- * deflated header block can specify maximum dynamic table size.  The
- * actual maximum size is the minimum of the size receiver specified
- * and this option value.
- */
-NGHTTP2_EXTERN void
-nghttp2_option_set_max_deflate_dynamic_table_size(nghttp2_option *option,
-                                                  size_t val);
-
-/**
- * @function
- *
- * This option prevents the library from retaining closed streams to
- * maintain the priority tree.  If this option is set to nonzero,
- * applications can discard closed stream completely to save memory.
- */
-NGHTTP2_EXTERN void nghttp2_option_set_no_closed_streams(nghttp2_option *option,
-                                                         int val);
-
-/**
- * @function
- *
- * This function sets the maximum number of outgoing SETTINGS ACK and
- * PING ACK frames retained in :type:`nghttp2_session` object.  If
- * more than those frames are retained, the peer is considered to be
- * misbehaving and session will be closed.  The default value is 1000.
- */
-NGHTTP2_EXTERN void nghttp2_option_set_max_outbound_ack(nghttp2_option *option,
-                                                        size_t val);
-
-/**
- * @function
- *
- * This function sets the maximum number of SETTINGS entries per
- * SETTINGS frame that will be accepted. If more than those entries
- * are received, the peer is considered to be misbehaving and session
- * will be closed. The default value is 32.
- */
-NGHTTP2_EXTERN void nghttp2_option_set_max_settings(nghttp2_option *option,
-                                                    size_t val);
-
-/**
- * @function
- *
- * Initializes |*session_ptr| for client use.  The all members of
- * |callbacks| are copied to |*session_ptr|.  Therefore |*session_ptr|
- * does not store |callbacks|.  The |user_data| is an arbitrary user
- * supplied data, which will be passed to the callback functions.
- *
- * The :type:`nghttp2_send_callback` must be specified.  If the
- * application code uses `nghttp2_session_recv()`, the
- * :type:`nghttp2_recv_callback` must be specified.  The other members
- * of |callbacks| can be ``NULL``.
- *
- * If this function fails, |*session_ptr| is left untouched.
- *
- * This function returns 0 if it succeeds, or one of the following
- * negative error codes:
- *
- * :enum:`nghttp2_error.NGHTTP2_ERR_NOMEM`
- *     Out of memory.
- */
-NGHTTP2_EXTERN int
-nghttp2_session_client_new(nghttp2_session **session_ptr,
-                           const nghttp2_session_callbacks *callbacks,
-                           void *user_data);
-
-/**
- * @function
- *
- * Initializes |*session_ptr| for server use.  The all members of
- * |callbacks| are copied to |*session_ptr|. Therefore |*session_ptr|
- * does not store |callbacks|.  The |user_data| is an arbitrary user
- * supplied data, which will be passed to the callback functions.
- *
- * The :type:`nghttp2_send_callback` must be specified.  If the
- * application code uses `nghttp2_session_recv()`, the
- * :type:`nghttp2_recv_callback` must be specified.  The other members
- * of |callbacks| can be ``NULL``.
- *
- * If this function fails, |*session_ptr| is left untouched.
- *
- * This function returns 0 if it succeeds, or one of the following
- * negative error codes:
- *
- * :enum:`nghttp2_error.NGHTTP2_ERR_NOMEM`
- *     Out of memory.
- */
-NGHTTP2_EXTERN int
-nghttp2_session_server_new(nghttp2_session **session_ptr,
-                           const nghttp2_session_callbacks *callbacks,
-                           void *user_data);
-
-/**
- * @function
- *
- * Like `nghttp2_session_client_new()`, but with additional options
- * specified in the |option|.
- *
- * The |option| can be ``NULL`` and the call is equivalent to
- * `nghttp2_session_client_new()`.
- *
- * This function does not take ownership |option|.  The application is
- * responsible for freeing |option| if it finishes using the object.
- *
- * The library code does not refer to |option| after this function
- * returns.
- *
- * This function returns 0 if it succeeds, or one of the following
- * negative error codes:
- *
- * :enum:`nghttp2_error.NGHTTP2_ERR_NOMEM`
- *     Out of memory.
- */
-NGHTTP2_EXTERN int
-nghttp2_session_client_new2(nghttp2_session **session_ptr,
-                            const nghttp2_session_callbacks *callbacks,
-                            void *user_data, const nghttp2_option *option);
-
-/**
- * @function
- *
- * Like `nghttp2_session_server_new()`, but with additional options
- * specified in the |option|.
- *
- * The |option| can be ``NULL`` and the call is equivalent to
- * `nghttp2_session_server_new()`.
- *
- * This function does not take ownership |option|.  The application is
- * responsible for freeing |option| if it finishes using the object.
- *
- * The library code does not refer to |option| after this function
- * returns.
- *
- * This function returns 0 if it succeeds, or one of the following
- * negative error codes:
- *
- * :enum:`nghttp2_error.NGHTTP2_ERR_NOMEM`
- *     Out of memory.
- */
-NGHTTP2_EXTERN int
-nghttp2_session_server_new2(nghttp2_session **session_ptr,
-                            const nghttp2_session_callbacks *callbacks,
-                            void *user_data, const nghttp2_option *option);
-
-/**
- * @function
- *
- * Like `nghttp2_session_client_new2()`, but with additional custom
- * memory allocator specified in the |mem|.
- *
- * The |mem| can be ``NULL`` and the call is equivalent to
- * `nghttp2_session_client_new2()`.
- *
- * This function does not take ownership |mem|.  The application is
- * responsible for freeing |mem|.
- *
- * The library code does not refer to |mem| pointer after this
- * function returns, so the application can safely free it.
- *
- * This function returns 0 if it succeeds, or one of the following
- * negative error codes:
- *
- * :enum:`nghttp2_error.NGHTTP2_ERR_NOMEM`
- *     Out of memory.
- */
-NGHTTP2_EXTERN int nghttp2_session_client_new3(
-    nghttp2_session **session_ptr, const nghttp2_session_callbacks *callbacks,
-    void *user_data, const nghttp2_option *option, nghttp2_mem *mem);
-
-/**
- * @function
- *
- * Like `nghttp2_session_server_new2()`, but with additional custom
- * memory allocator specified in the |mem|.
- *
- * The |mem| can be ``NULL`` and the call is equivalent to
- * `nghttp2_session_server_new2()`.
- *
- * This function does not take ownership |mem|.  The application is
- * responsible for freeing |mem|.
- *
- * The library code does not refer to |mem| pointer after this
- * function returns, so the application can safely free it.
- *
- * This function returns 0 if it succeeds, or one of the following
- * negative error codes:
- *
- * :enum:`nghttp2_error.NGHTTP2_ERR_NOMEM`
- *     Out of memory.
- */
-NGHTTP2_EXTERN int nghttp2_session_server_new3(
-    nghttp2_session **session_ptr, const nghttp2_session_callbacks *callbacks,
-    void *user_data, const nghttp2_option *option, nghttp2_mem *mem);
-
-/**
- * @function
- *
- * Frees any resources allocated for |session|.  If |session| is
- * ``NULL``, this function does nothing.
- */
-NGHTTP2_EXTERN void nghttp2_session_del(nghttp2_session *session);
-
-/**
- * @function
- *
- * Sends pending frames to the remote peer.
- *
- * This function retrieves the highest prioritized frame from the
- * outbound queue and sends it to the remote peer.  It does this as
- * many times as possible until the user callback
- * :type:`nghttp2_send_callback` returns
- * :enum:`nghttp2_error.NGHTTP2_ERR_WOULDBLOCK`, the outbound queue
- * becomes empty or flow control is triggered (remote window size
- * becomes depleted or maximum number of concurrent streams is
- * reached).  This function calls several callback functions which are
- * passed when initializing the |session|.  Here is the simple time
- * chart which tells when each callback is invoked:
- *
- * 1. Get the next frame to send from outbound queue.
- *
- * 2. Prepare transmission of the frame.
- *
- * 3. If the control frame cannot be sent because some preconditions
- *    are not met (e.g., request HEADERS cannot be sent after GOAWAY),
- *    :type:`nghttp2_on_frame_not_send_callback` is invoked.  Abort
- *    the following steps.
- *
- * 4. If the frame is HEADERS, PUSH_PROMISE or DATA,
- *    :type:`nghttp2_select_padding_callback` is invoked.
- *
- * 5. If the frame is request HEADERS, the stream is opened here.
- *
- * 6. :type:`nghttp2_before_frame_send_callback` is invoked.
- *
- * 7. If :enum:`nghttp2_error.NGHTTP2_ERR_CANCEL` is returned from
- *    :type:`nghttp2_before_frame_send_callback`, the current frame
- *    transmission is canceled, and
- *    :type:`nghttp2_on_frame_not_send_callback` is invoked.  Abort
- *    the following steps.
- *
- * 8. :type:`nghttp2_send_callback` is invoked one or more times to
- *    send the frame.
- *
- * 9. :type:`nghttp2_on_frame_send_callback` is invoked.
- *
- * 10. If the transmission of the frame triggers closure of the
- *     stream, the stream is closed and
- *     :type:`nghttp2_on_stream_close_callback` is invoked.
- *
- * This function returns 0 if it succeeds, or one of the following
- * negative error codes:
- *
- * :enum:`nghttp2_error.NGHTTP2_ERR_NOMEM`
- *     Out of memory.
- * :enum:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE`
- *     The callback function failed.
- */
-NGHTTP2_EXTERN int nghttp2_session_send(nghttp2_session *session);
-
-/**
- * @function
- *
- * Returns the serialized data to send.
- *
- * This function behaves like `nghttp2_session_send()` except that it
- * does not use :type:`nghttp2_send_callback` to transmit data.
- * Instead, it assigns the pointer to the serialized data to the
- * |*data_ptr| and returns its length.  The other callbacks are called
- * in the same way as they are in `nghttp2_session_send()`.
- *
- * If no data is available to send, this function returns 0.
- *
- * This function may not return all serialized data in one invocation.
- * To get all data, call this function repeatedly until it returns 0
- * or one of negative error codes.
- *
- * The assigned |*data_ptr| is valid until the next call of
- * `nghttp2_session_mem_send()` or `nghttp2_session_send()`.
- *
- * The caller must send all data before sending the next chunk of
- * data.
- *
- * This function returns the length of the data pointed by the
- * |*data_ptr| if it succeeds, or one of the following negative error
- * codes:
- *
- * :enum:`nghttp2_error.NGHTTP2_ERR_NOMEM`
- *     Out of memory.
- *
- * .. note::
- *
- *   This function may produce very small byte string.  If that is the
- *   case, and application disables Nagle algorithm (``TCP_NODELAY``),
- *   then writing this small chunk leads to very small packet, and it
- *   is very inefficient.  An application should be responsible to
- *   buffer up small chunks of data as necessary to avoid this
- *   situation.
- */
-NGHTTP2_EXTERN ssize_t nghttp2_session_mem_send(nghttp2_session *session,
-                                                const uint8_t **data_ptr);
-
-/**
- * @function
- *
- * Receives frames from the remote peer.
- *
- * This function receives as many frames as possible until the user
- * callback :type:`nghttp2_recv_callback` returns
- * :enum:`nghttp2_error.NGHTTP2_ERR_WOULDBLOCK`.  This function calls
- * several callback functions which are passed when initializing the
- * |session|.  Here is the simple time chart which tells when each
- * callback is invoked:
- *
- * 1. :type:`nghttp2_recv_callback` is invoked one or more times to
- *    receive frame header.
- *
- * 2. When frame header is received,
- *    :type:`nghttp2_on_begin_frame_callback` is invoked.
- *
- * 3. If the frame is DATA frame:
- *
- *    1. :type:`nghttp2_recv_callback` is invoked to receive DATA
- *       payload. For each chunk of data,
- *       :type:`nghttp2_on_data_chunk_recv_callback` is invoked.
- *
- *    2. If one DATA frame is completely received,
- *       :type:`nghttp2_on_frame_recv_callback` is invoked.  If the
- *       reception of the frame triggers the closure of the stream,
- *       :type:`nghttp2_on_stream_close_callback` is invoked.
- *
- * 4. If the frame is the control frame:
- *
- *    1. :type:`nghttp2_recv_callback` is invoked one or more times to
- *       receive whole frame.
- *
- *    2. If the received frame is valid, then following actions are
- *       taken.  If the frame is either HEADERS or PUSH_PROMISE,
- *       :type:`nghttp2_on_begin_headers_callback` is invoked.  Then
- *       :type:`nghttp2_on_header_callback` is invoked for each header
- *       name/value pair.  For invalid header field,
- *       :type:`nghttp2_on_invalid_header_callback` is called.  After
- *       all name/value pairs are emitted successfully,
- *       :type:`nghttp2_on_frame_recv_callback` is invoked.  For other
- *       frames, :type:`nghttp2_on_frame_recv_callback` is invoked.
- *       If the reception of the frame triggers the closure of the
- *       stream, :type:`nghttp2_on_stream_close_callback` is invoked.
- *
- *    3. If the received frame is unpacked but is interpreted as
- *       invalid, :type:`nghttp2_on_invalid_frame_recv_callback` is
- *       invoked.
- *
- * This function returns 0 if it succeeds, or one of the following
- * negative error codes:
- *
- * :enum:`nghttp2_error.NGHTTP2_ERR_EOF`
- *     The remote peer did shutdown on the connection.
- * :enum:`nghttp2_error.NGHTTP2_ERR_NOMEM`
- *     Out of memory.
- * :enum:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE`
- *     The callback function failed.
- * :enum:`nghttp2_error.NGHTTP2_ERR_BAD_CLIENT_MAGIC`
- *     Invalid client magic was detected.  This error only returns
- *     when |session| was configured as server and
- *     `nghttp2_option_set_no_recv_client_magic()` is not used with
- *     nonzero value.
- * :enum:`nghttp2_error.NGHTTP2_ERR_FLOODED`
- *     Flooding was detected in this HTTP/2 session, and it must be
- *     closed.  This is most likely caused by misbehaviour of peer.
- */
-NGHTTP2_EXTERN int nghttp2_session_recv(nghttp2_session *session);
-
-/**
- * @function
- *
- * Processes data |in| as an input from the remote endpoint.  The
- * |inlen| indicates the number of bytes in the |in|.
- *
- * This function behaves like `nghttp2_session_recv()` except that it
- * does not use :type:`nghttp2_recv_callback` to receive data; the
- * |in| is the only data for the invocation of this function.  If all
- * bytes are processed, this function returns.  The other callbacks
- * are called in the same way as they are in `nghttp2_session_recv()`.
- *
- * In the current implementation, this function always tries to
- * processes all input data unless either an error occurs or
- * :enum:`nghttp2_error.NGHTTP2_ERR_PAUSE` is returned from
- * :type:`nghttp2_on_header_callback` or
- * :type:`nghttp2_on_data_chunk_recv_callback`.  If
- * :enum:`nghttp2_error.NGHTTP2_ERR_PAUSE` is used, the return value
- * includes the number of bytes which was used to produce the data or
- * frame for the callback.
- *
- * This function returns the number of processed bytes, or one of the
- * following negative error codes:
- *
- * :enum:`nghttp2_error.NGHTTP2_ERR_NOMEM`
- *     Out of memory.
- * :enum:`nghttp2_error.NGHTTP2_ERR_CALLBACK_FAILURE`
- *     The callback function failed.
- * :enum:`nghttp2_error.NGHTTP2_ERR_BAD_CLIENT_MAGIC`
- *     Invalid client magic was detected.  This error only returns
- *     when |session| was configured as server and
- *     `nghttp2_option_set_no_recv_client_magic()` is not used with
- *     nonzero value.
- * :enum:`nghttp2_error.NGHTTP2_ERR_FLOODED`
- *     Flooding was detected in this HTTP/2 session, and it must be
- *     closed.  This is most likely caused by misbehaviour of peer.
- */
-NGHTTP2_EXTERN ssize_t nghttp2_session_mem_recv(nghttp2_session *session,
-                                                const uint8_t *in,
-                                                size_t inlen);
-
-/**
- * @function
- *
- * Puts back previously deferred DATA frame in the stream |stream_id|
- * to the outbound queue.
- *
- * This function returns 0 if it succeeds, or one of the following
- * negative error codes:
- *
- * :enum:`nghttp2_error.NGHTTP2_ERR_INVALID_ARGUMENT`
- *     The stream does not exist; or no deferred data exist.
- * :enum:`nghttp2_error.NGHTTP2_ERR_NOMEM`
- *     Out of memory.
- */
-NGHTTP2_EXTERN int nghttp2_session_resume_data(nghttp2_session *session,
-                                               int32_t stream_id);
-
-/**
- * @function
- *
- * Returns nonzero value if |session| wants to receive data from the
- * remote peer.
- *
- * If both `nghttp2_session_want_read()` and
- * `nghttp2_session_want_write()` return 0, the application should
- * drop the connection.
- */
-NGHTTP2_EXTERN int nghttp2_session_want_read(nghttp2_session *session);
-
-/**
- * @function
- *
- * Returns nonzero value if |session| wants to send data to the remote
- * peer.
- *
- * If both `nghttp2_session_want_read()` and
- * `nghttp2_session_want_write()` return 0, the application should
- * drop the connection.
- */
-NGHTTP2_EXTERN int nghttp2_session_want_write(nghttp2_session *session);
-
-/**
- * @function
- *
- * Returns stream_user_data for the stream |stream_id|.  The
- * stream_user_data is provided by `nghttp2_submit_request()`,
- * `nghttp2_submit_headers()` or
- * `nghttp2_session_set_stream_user_data()`.  Unless it is set using
- * `nghttp2_session_set_stream_user_data()`, if the stream is
- * initiated by the remote endpoint, stream_user_data is always
- * ``NULL``.  If the stream does not exist, this function returns
- * ``NULL``.
- */
-NGHTTP2_EXTERN void *
-nghttp2_session_get_stream_user_data(nghttp2_session *session,
-                                     int32_t stream_id);
-
-/**
- * @function
- *
- * Sets the |stream_user_data| to the stream denoted by the
- * |stream_id|.  If a stream user data is already set to the stream,
- * it is replaced with the |stream_user_data|.  It is valid to specify
- * ``NULL`` in the |stream_user_data|, which nullifies the associated
- * data pointer.
- *
- * It is valid to set the |stream_user_data| to the stream reserved by
- * PUSH_PROMISE frame.
- *
- * This function returns 0 if it succeeds, or one of following
- * negative error codes:
- *
- * :enum:`nghttp2_error.NGHTTP2_ERR_INVALID_ARGUMENT`
- *     The stream does not exist
- */
-NGHTTP2_EXTERN int
-nghttp2_session_set_stream_user_data(nghttp2_session *session,
-                                     int32_t stream_id, void *stream_user_data);
-
-/**
- * @function
- *
- * Sets |user_data| to |session|, overwriting the existing user data
- * specified in `nghttp2_session_client_new()`, or
- * `nghttp2_session_server_new()`.
- */
-NGHTTP2_EXTERN void nghttp2_session_set_user_data(nghttp2_session *session,
-                                                  void *user_data);
-
-/**
- * @function
- *
- * Returns the number of frames in the outbound queue.  This does not
- * include the deferred DATA frames.
- */
-NGHTTP2_EXTERN size_t
-nghttp2_session_get_outbound_queue_size(nghttp2_session *session);
-
-/**
- * @function
- *
- * Returns the number of DATA payload in bytes received without
- * WINDOW_UPDATE transmission for the stream |stream_id|.  The local
- * (receive) window size can be adjusted by
- * `nghttp2_submit_window_update()`.  This function takes into account
- * that and returns effective data length.  In particular, if the
- * local window size is reduced by submitting negative
- * window_size_increment with `nghttp2_submit_window_update()`, this
- * function returns the number of bytes less than actually received.
- *
- * This function returns -1 if it fails.
- */
-NGHTTP2_EXTERN int32_t nghttp2_session_get_stream_effective_recv_data_length(
-    nghttp2_session *session, int32_t stream_id);
-
-/**
- * @function
- *
- * Returns the local (receive) window size for the stream |stream_id|.
- * The local window size can be adjusted by
- * `nghttp2_submit_window_update()`.  This function takes into account
- * that and returns effective window size.
- *
- * This function does not take into account the amount of received
- * data from the remote endpoint.  Use
- * `nghttp2_session_get_stream_local_window_size()` to know the amount
- * of data the remote endpoint can send without receiving stream level
- * WINDOW_UPDATE frame.  Note that each stream is still subject to the
- * connection level flow control.
- *
- * This function returns -1 if it fails.
- */
-NGHTTP2_EXTERN int32_t nghttp2_session_get_stream_effective_local_window_size(
-    nghttp2_session *session, int32_t stream_id);
-
-/**
- * @function
- *
- * Returns the amount of flow-controlled payload (e.g., DATA) that the
- * remote endpoint can send without receiving stream level
- * WINDOW_UPDATE frame.  It is also subject to the connection level
- * flow control.  So the actual amount of data to send is
- * min(`nghttp2_session_get_stream_local_window_size()`,
- * `nghttp2_session_get_local_window_size()`).
- *
- * This function returns -1 if it fails.
- */
-NGHTTP2_EXTERN int32_t nghttp2_session_get_stream_local_window_size(
-    nghttp2_session *session, int32_t stream_id);
-
-/**
- * @function
- *
- * Returns the number of DATA payload in bytes received without
- * WINDOW_UPDATE transmission for a connection.  The local (receive)
- * window size can be adjusted by `nghttp2_submit_window_update()`.
- * This function takes into account that and returns effective data
- * length.  In particular, if the local window size is reduced by
- * submitting negative window_size_increment with
- * `nghttp2_submit_window_update()`, this function returns the number
- * of bytes less than actually received.
- *
- * This function returns -1 if it fails.
- */
-NGHTTP2_EXTERN int32_t
-nghttp2_session_get_effective_recv_data_length(nghttp2_session *session);
-
-/**
- * @function
- *
- * Returns the local (receive) window size for a connection.  The
- * local window size can be adjusted by
- * `nghttp2_submit_window_update()`.  This function takes into account
- * that and returns effective window size.
- *
- * This function does not take into account the amount of received
- * data from the remote endpoint.  Use
- * `nghttp2_session_get_local_window_size()` to know the amount of
- * data the remote endpoint can send without receiving
- * connection-level WINDOW_UPDATE frame.  Note that each stream is
- * still subject to the stream level flow control.
- *
- * This function returns -1 if it fails.
- */
-NGHTTP2_EXTERN int32_t
-nghttp2_session_get_effective_local_window_size(nghttp2_session *session);
-
-/**
- * @function
- *
- * Returns the amount of flow-controlled payload (e.g., DATA) that the
- * remote endpoint can send without receiving connection level
- * WINDOW_UPDATE frame.  Note that each stream is still subject to the
- * stream level flow control (see
- * `nghttp2_session_get_stream_local_window_size()`).
- *
- * This function returns -1 if it fails.
- */
-NGHTTP2_EXTERN int32_t
-nghttp2_session_get_local_window_size(nghttp2_session *session);
-
-/**
- * @function
- *
- * Returns the remote window size for a given stream |stream_id|.
- *
- * This is the amount of flow-controlled payload (e.g., DATA) that the
- * local endpoint can send without stream level WINDOW_UPDATE.  There
- * is also connection level flow control, so the effective size of
- * payload that the local endpoint can actually send is
- * min(`nghttp2_session_get_stream_remote_window_size()`,
- * `nghttp2_session_get_remote_window_size()`).
- *
- * This function returns -1 if it fails.
- */
-NGHTTP2_EXTERN int32_t nghttp2_session_get_stream_remote_window_size(
-    nghttp2_session *session, int32_t stream_id);
-
-/**
- * @function
- *
- * Returns the remote window size for a connection.
- *
- * This function always succeeds.
- */
-NGHTTP2_EXTERN int32_t
-nghttp2_session_get_remote_window_size(nghttp2_session *session);
-
-/**
- * @function
- *
- * Returns 1 if local peer half closed the given stream |stream_id|.
- * Returns 0 if it did not.  Returns -1 if no such stream exists.
- */
-NGHTTP2_EXTERN int
-nghttp2_session_get_stream_local_close(nghttp2_session *session,
-                                       int32_t stream_id);
-
-/**
- * @function
- *
- * Returns 1 if remote peer half closed the given stream |stream_id|.
- * Returns 0 if it did not.  Returns -1 if no such stream exists.
- */
-NGHTTP2_EXTERN int
-nghttp2_session_get_stream_remote_close(nghttp2_session *session,
-                                        int32_t stream_id);
-
-/**
- * @function
- *
- * Returns the current dynamic table size of HPACK inflater, including
- * the overhead 32 bytes per entry described in RFC 7541.
- */
-NGHTTP2_EXTERN size_t
-nghttp2_session_get_hd_inflate_dynamic_table_size(nghttp2_session *session);
-
-/**
- * @function
- *
- * Returns the current dynamic table size of HPACK deflater including
- * the overhead 32 bytes per entry described in RFC 7541.
- */
-NGHTTP2_EXTERN size_t
-nghttp2_session_get_hd_deflate_dynamic_table_size(nghttp2_session *session);
-
-/**
- * @function
- *
- * Signals the session so that the connection should be terminated.
- *
- * The last stream ID is the minimum value between the stream ID of a
- * stream for which :type:`nghttp2_on_frame_recv_callback` was called
- * most recently and the last stream ID we have sent to the peer
- * previously.
- *
- * The |error_code| is the error code of this GOAWAY frame.  The
- * pre-defined error code is one of :enum:`nghttp2_error_code`.
- *
- * After the transmission, both `nghttp2_session_want_read()` and
- * `nghttp2_session_want_write()` return 0.
- *
- * This function should be called when the connection should be
- * terminated after sending GOAWAY.  If the remaining streams should
- * be processed after GOAWAY, use `nghttp2_submit_goaway()` instead.
- *
- * This function returns 0 if it succeeds, or one of the following
- * negative error codes:
- *
- * :enum:`nghttp2_error.NGHTTP2_ERR_NOMEM`
- *     Out of memory.
- */
-NGHTTP2_EXTERN int nghttp2_session_terminate_session(nghttp2_session *session,
-                                                     uint32_t error_code);
-
-/**
- * @function
- *
- * Signals the session so that the connection should be terminated.
- *
- * This function behaves like `nghttp2_session_terminate_session()`,
- * but the last stream ID can be specified by the application for fine
- * grained control of stream.  The HTTP/2 specification does not allow
- * last_stream_id to be increased.  So the actual value sent as
- * last_stream_id is the minimum value between the given
- * |last_stream_id| and the last_stream_id we have previously sent to
- * the peer.
- *
- * The |last_stream_id| is peer's stream ID or 0.  So if |session| is
- * initialized as client, |last_stream_id| must be even or 0.  If
- * |session| is initialized as server, |last_stream_id| must be odd or
- * 0.
- *
- * This function returns 0 if it succeeds, or one of the following
- * negative error codes:
- *
- * :enum:`nghttp2_error.NGHTTP2_ERR_NOMEM`
- *     Out of memory.
- * :enum:`nghttp2_error.NGHTTP2_ERR_INVALID_ARGUMENT`
- *     The |last_stream_id| is invalid.
- */
-NGHTTP2_EXTERN int nghttp2_session_terminate_session2(nghttp2_session *session,
-                                                      int32_t last_stream_id,
-                                                      uint32_t error_code);
-
-/**
- * @function
- *
- * Signals to the client that the server started graceful shutdown
- * procedure.
- *
- * This function is only usable for server.  If this function is
- * called with client side session, this function returns
- * :enum:`nghttp2_error.NGHTTP2_ERR_INVALID_STATE`.
- *
- * To gracefully shutdown HTTP/2 session, server should call this
- * function to send GOAWAY with last_stream_id (1u << 31) - 1.  And
- * after some delay (e.g., 1 RTT), send another GOAWAY with the stream
- * ID that the server has some processing using
- * `nghttp2_submit_goaway()`.  See also
- * `nghttp2_session_get_last_proc_stream_id()`.
- *
- * Unlike `nghttp2_submit_goaway()`, this function just sends GOAWAY
- * and does nothing more.  This is a mere indication to the client
- * that session shutdown is imminent.  The application should call
- * `nghttp2_submit_goaway()` with appropriate last_stream_id after
- * this call.
- *
- * If one or more GOAWAY frame have been already sent by either
- * `nghttp2_submit_goaway()` or `nghttp2_session_terminate_session()`,
- * this function has no effect.
- *
- * This function returns 0 if it succeeds, or one of the following
- * negative error codes:
- *
- * :enum:`nghttp2_error.NGHTTP2_ERR_NOMEM`
- *     Out of memory.
- * :enum:`nghttp2_error.NGHTTP2_ERR_INVALID_STATE`
- *     The |session| is initialized as client.
- */
-NGHTTP2_EXTERN int nghttp2_submit_shutdown_notice(nghttp2_session *session);
-
-/**
- * @function
- *
- * Returns the value of SETTINGS |id| notified by a remote endpoint.
- * The |id| must be one of values defined in
- * :enum:`nghttp2_settings_id`.
- */
-NGHTTP2_EXTERN uint32_t nghttp2_session_get_remote_settings(
-    nghttp2_session *session, nghttp2_settings_id id);
-
-/**
- * @function
- *
- * Returns the value of SETTINGS |id| of local endpoint acknowledged
- * by the remote endpoint.  The |id| must be one of the values defined
- * in :enum:`nghttp2_settings_id`.
- */
-NGHTTP2_EXTERN uint32_t nghttp2_session_get_local_settings(
-    nghttp2_session *session, nghttp2_settings_id id);
-
-/**
- * @function
- *
- * Tells the |session| that next stream ID is |next_stream_id|.  The
- * |next_stream_id| must be equal or greater than the value returned
- * by `nghttp2_session_get_next_stream_id()`.
- *
- * This function returns 0 if it succeeds, or one of the following
- * negative error codes:
- *
- * :enum:`nghttp2_error.NGHTTP2_ERR_INVALID_ARGUMENT`
- *     The |next_stream_id| is strictly less than the value
- *     `nghttp2_session_get_next_stream_id()` returns; or
- *     |next_stream_id| is invalid (e.g., even integer for client, or
- *     odd integer for server).
- */
-NGHTTP2_EXTERN int nghttp2_session_set_next_stream_id(nghttp2_session *session,
-                                                      int32_t next_stream_id);
-
-/**
- * @function
- *
- * Returns the next outgoing stream ID.  Notice that return type is
- * uint32_t.  If we run out of stream ID for this session, this
- * function returns 1 << 31.
- */
-NGHTTP2_EXTERN uint32_t
-nghttp2_session_get_next_stream_id(nghttp2_session *session);
-
-/**
- * @function
- *
- * Tells the |session| that |size| bytes for a stream denoted by
- * |stream_id| were consumed by application and are ready to
- * WINDOW_UPDATE.  The consumed bytes are counted towards both
- * connection and stream level WINDOW_UPDATE (see
- * `nghttp2_session_consume_connection()` and
- * `nghttp2_session_consume_stream()` to update consumption
- * independently).  This function is intended to be used without
- * automatic window update (see
- * `nghttp2_option_set_no_auto_window_update()`).
- *
- * This function returns 0 if it succeeds, or one of the following
- * negative error codes:
- *
- * :enum:`nghttp2_error.NGHTTP2_ERR_NOMEM`
- *     Out of memory.
- * :enum:`nghttp2_error.NGHTTP2_ERR_INVALID_ARGUMENT`
- *     The |stream_id| is 0.
- * :enum:`nghttp2_error.NGHTTP2_ERR_INVALID_STATE`
- *     Automatic WINDOW_UPDATE is not disabled.
- */
-NGHTTP2_EXTERN int nghttp2_session_consume(nghttp2_session *session,
-                                           int32_t stream_id, size_t size);
-
-/**
- * @function
- *
- * Like `nghttp2_session_consume()`, but this only tells library that
- * |size| bytes were consumed only for connection level.  Note that
- * HTTP/2 maintains connection and stream level flow control windows
- * independently.
- *
- * This function returns 0 if it succeeds, or one of the following
- * negative error codes:
- *
- * :enum:`nghttp2_error.NGHTTP2_ERR_NOMEM`
- *     Out of memory.
- * :enum:`nghttp2_error.NGHTTP2_ERR_INVALID_STATE`
- *     Automatic WINDOW_UPDATE is not disabled.
- */
-NGHTTP2_EXTERN int nghttp2_session_consume_connection(nghttp2_session *session,
-                                                      size_t size);
-
-/**
- * @function
- *
- * Like `nghttp2_session_consume()`, but this only tells library that
- * |size| bytes were consumed only for stream denoted by |stream_id|.
- * Note that HTTP/2 maintains connection and stream level flow control
- * windows independently.
- *
- * This function returns 0 if it succeeds, or one of the following
- * negative error codes:
- *
- * :enum:`nghttp2_error.NGHTTP2_ERR_NOMEM`
- *     Out of memory.
- * :enum:`nghttp2_error.NGHTTP2_ERR_INVALID_ARGUMENT`
- *     The |stream_id| is 0.
- * :enum:`nghttp2_error.NGHTTP2_ERR_INVALID_STATE`
- *     Automatic WINDOW_UPDATE is not disabled.
- */
-NGHTTP2_EXTERN int nghttp2_session_consume_stream(nghttp2_session *session,
-                                                  int32_t stream_id,
-                                                  size_t size);
-
-/**
- * @function
- *
- * Changes priority of existing stream denoted by |stream_id|.  The
- * new priority specification is |pri_spec|.
- *
- * The priority is changed silently and instantly, and no PRIORITY
- * frame will be sent to notify the peer of this change.  This
- * function may be useful for server to change the priority of pushed
- * stream.
- *
- * If |session| is initialized as server, and ``pri_spec->stream_id``
- * points to the idle stream, the idle stream is created if it does
- * not exist.  The created idle stream will depend on root stream
- * (stream 0) with weight 16.
- *
- * Otherwise, if stream denoted by ``pri_spec->stream_id`` is not
- * found, we use default priority instead of given |pri_spec|.  That
- * is make stream depend on root stream with weight 16.
- *
- * This function returns 0 if it succeeds, or one of the following
- * negative error codes:
- *
- * :enum:`nghttp2_error.NGHTTP2_ERR_NOMEM`
- *     Out of memory.
- * :enum:`nghttp2_error.NGHTTP2_ERR_INVALID_ARGUMENT`
- *     Attempted to depend on itself; or no stream exist for the given
- *     |stream_id|; or |stream_id| is 0
- */
-NGHTTP2_EXTERN int
-nghttp2_session_change_stream_priority(nghttp2_session *session,
-                                       int32_t stream_id,
-                                       const nghttp2_priority_spec *pri_spec);
-
-/**
- * @function
- *
- * Creates idle stream with the given |stream_id|, and priority
- * |pri_spec|.
- *
- * The stream creation is done without sending PRIORITY frame, which
- * means that peer does not know about the existence of this idle
- * stream in the local endpoint.
- *
- * RFC 7540 does not disallow the use of creation of idle stream with
- * odd or even stream ID regardless of client or server.  So this
- * function can create odd or even stream ID regardless of client or
- * server.  But probably it is a bit safer to use the stream ID the
- * local endpoint can initiate (in other words, use odd stream ID for
- * client, and even stream ID for server), to avoid potential
- * collision from peer's instruction.  Also we can use
- * `nghttp2_session_set_next_stream_id()` to avoid to open created
- * idle streams accidentally if we follow this recommendation.
- *
- * If |session| is initialized as server, and ``pri_spec->stream_id``
- * points to the idle stream, the idle stream is created if it does
- * not exist.  The created idle stream will depend on root stream
- * (stream 0) with weight 16.
- *
- * Otherwise, if stream denoted by ``pri_spec->stream_id`` is not
- * found, we use default priority instead of given |pri_spec|.  That
- * is make stream depend on root stream with weight 16.
- *
- * This function returns 0 if it succeeds, or one of the following
- * negative error codes:
- *
- * :enum:`nghttp2_error.NGHTTP2_ERR_NOMEM`
- *     Out of memory.
- * :enum:`nghttp2_error.NGHTTP2_ERR_INVALID_ARGUMENT`
- *     Attempted to depend on itself; or stream denoted by |stream_id|
- *     already exists; or |stream_id| cannot be used to create idle
- *     stream (in other words, local endpoint has already opened
- *     stream ID greater than or equal to the given stream ID; or
- *     |stream_id| is 0
- */
-NGHTTP2_EXTERN int
-nghttp2_session_create_idle_stream(nghttp2_session *session, int32_t stream_id,
-                                   const nghttp2_priority_spec *pri_spec);
-
-/**
- * @function
- *
- * Performs post-process of HTTP Upgrade request.  This function can
- * be called from both client and server, but the behavior is very
- * different in each other.
- *
- * .. warning::
- *
- *   This function is deprecated in favor of
- *   `nghttp2_session_upgrade2()`, because this function lacks the
- *   parameter to tell the library the request method used in the
- *   original HTTP request.  This information is required for client
- *   to validate actual response body length against content-length
- *   header field (see `nghttp2_option_set_no_http_messaging()`).  If
- *   HEAD is used in request, the length of response body must be 0
- *   regardless of value included in content-length header field.
- *
- * If called from client side, the |settings_payload| must be the
- * value sent in ``HTTP2-Settings`` header field and must be decoded
- * by base64url decoder.  The |settings_payloadlen| is the length of
- * |settings_payload|.  The |settings_payload| is unpacked and its
- * setting values will be submitted using `nghttp2_submit_settings()`.
- * This means that the client application code does not need to submit
- * SETTINGS by itself.  The stream with stream ID=1 is opened and the
- * |stream_user_data| is used for its stream_user_data.  The opened
- * stream becomes half-closed (local) state.
- *
- * If called from server side, the |settings_payload| must be the
- * value received in ``HTTP2-Settings`` header field and must be
- * decoded by base64url decoder.  The |settings_payloadlen| is the
- * length of |settings_payload|.  It is treated as if the SETTINGS
- * frame with that payload is received.  Thus, callback functions for
- * the reception of SETTINGS frame will be invoked.  The stream with
- * stream ID=1 is opened.  The |stream_user_data| is ignored.  The
- * opened stream becomes half-closed (remote).
- *
- * This function returns 0 if it succeeds, or one of the following
- * negative error codes:
- *
- * :enum:`nghttp2_error.NGHTTP2_ERR_NOMEM`
- *     Out of memory.
- * :enum:`nghttp2_error.NGHTTP2_ERR_INVALID_ARGUMENT`
- *     The |settings_payload| is badly formed.
- * :enum:`nghttp2_error.NGHTTP2_ERR_PROTO`
- *     The stream ID 1 is already used or closed; or is not available.
- */
-NGHTTP2_EXTERN int nghttp2_session_upgrade(nghttp2_session *session,
-                                           const uint8_t *settings_payload,
-                                           size_t settings_payloadlen,
-                                           void *stream_user_data);
-
-/**
- * @function
- *
- * Performs post-process of HTTP Upgrade request.  This function can
- * be called from both client and server, but the behavior is very
- * different in each other.
- *
- * If called from client side, the |settings_payload| must be the
- * value sent in ``HTTP2-Settings`` header field and must be decoded
- * by base64url decoder.  The |settings_payloadlen| is the length of
- * |settings_payload|.  The |settings_payload| is unpacked and its
- * setting values will be submitted using `nghttp2_submit_settings()`.
- * This means that the client application code does not need to submit
- * SETTINGS by itself.  The stream with stream ID=1 is opened and the
- * |stream_user_data| is used for its stream_user_data.  The opened
- * stream becomes half-closed (local) state.
- *
- * If called from server side, the |settings_payload| must be the
- * value received in ``HTTP2-Settings`` header field and must be
- * decoded by base64url decoder.  The |settings_payloadlen| is the
- * length of |settings_payload|.  It is treated as if the SETTINGS
- * frame with that payload is received.  Thus, callback functions for
- * the reception of SETTINGS frame will be invoked.  The stream with
- * stream ID=1 is opened.  The |stream_user_data| is ignored.  The
- * opened stream becomes half-closed (remote).
- *
- * If the request method is HEAD, pass nonzero value to
- * |head_request|.  Otherwise, pass 0.
- *
- * This function returns 0 if it succeeds, or one of the following
- * negative error codes:
- *
- * :enum:`nghttp2_error.NGHTTP2_ERR_NOMEM`
- *     Out of memory.
- * :enum:`nghttp2_error.NGHTTP2_ERR_INVALID_ARGUMENT`
- *     The |settings_payload| is badly formed.
- * :enum:`nghttp2_error.NGHTTP2_ERR_PROTO`
- *     The stream ID 1 is already used or closed; or is not available.
- */
-NGHTTP2_EXTERN int nghttp2_session_upgrade2(nghttp2_session *session,
-                                            const uint8_t *settings_payload,
-                                            size_t settings_payloadlen,
-                                            int head_request,
-                                            void *stream_user_data);
-
-/**
- * @function
- *
- * Serializes the SETTINGS values |iv| in the |buf|.  The size of the
- * |buf| is specified by |buflen|.  The number of entries in the |iv|
- * array is given by |niv|.  The required space in |buf| for the |niv|
- * entries is ``6*niv`` bytes and if the given buffer is too small, an
- * error is returned.  This function is used mainly for creating a
- * SETTINGS payload to be sent with the ``HTTP2-Settings`` header
- * field in an HTTP Upgrade request.  The data written in |buf| is NOT
- * base64url encoded and the application is responsible for encoding.
- *
- * This function returns the number of bytes written in |buf|, or one
- * of the following negative error codes:
- *
- * :enum:`nghttp2_error.NGHTTP2_ERR_INVALID_ARGUMENT`
- *     The |iv| contains duplicate settings ID or invalid value.
- *
- * :enum:`nghttp2_error.NGHTTP2_ERR_INSUFF_BUFSIZE`
- *     The provided |buflen| size is too small to hold the output.
- */
-NGHTTP2_EXTERN ssize_t nghttp2_pack_settings_payload(
-    uint8_t *buf, size_t buflen, const nghttp2_settings_entry *iv, size_t niv);
-
-/**
- * @function
- *
- * Returns string describing the |lib_error_code|.  The
- * |lib_error_code| must be one of the :enum:`nghttp2_error`.
- */
-NGHTTP2_EXTERN const char *nghttp2_strerror(int lib_error_code);
-
-/**
- * @function
- *
- * Returns string representation of HTTP/2 error code |error_code|
- * (e.g., ``PROTOCOL_ERROR`` is returned if ``error_code ==
- * NGHTTP2_PROTOCOL_ERROR``).  If string representation is unknown for
- * given |error_code|, this function returns string ``unknown``.
- */
-NGHTTP2_EXTERN const char *nghttp2_http2_strerror(uint32_t error_code);
-
-/**
- * @function
- *
- * Initializes |pri_spec| with the |stream_id| of the stream to depend
- * on with |weight| and its exclusive flag.  If |exclusive| is
- * nonzero, exclusive flag is set.
- *
- * The |weight| must be in :macro:`NGHTTP2_MIN_WEIGHT`,
- * :macro:`NGHTTP2_MAX_WEIGHT`, inclusive.
- */
-NGHTTP2_EXTERN void nghttp2_priority_spec_init(nghttp2_priority_spec *pri_spec,
-                                               int32_t stream_id,
-                                               int32_t weight, int exclusive);
-
-/**
- * @function
- *
- * Initializes |pri_spec| with the default values.  The default values
- * are: stream_id = 0, weight = :macro:`NGHTTP2_DEFAULT_WEIGHT` and
- * exclusive = 0.
- */
-NGHTTP2_EXTERN void
-nghttp2_priority_spec_default_init(nghttp2_priority_spec *pri_spec);
-
-/**
- * @function
- *
- * Returns nonzero if the |pri_spec| is filled with default values.
- */
-NGHTTP2_EXTERN int
-nghttp2_priority_spec_check_default(const nghttp2_priority_spec *pri_spec);
-
-/**
- * @function
- *
- * Submits HEADERS frame and optionally one or more DATA frames.
- *
- * The |pri_spec| is priority specification of this request.  ``NULL``
- * means the default priority (see
- * `nghttp2_priority_spec_default_init()`).  To specify the priority,
- * use `nghttp2_priority_spec_init()`.  If |pri_spec| is not ``NULL``,
- * this function will copy its data members.
- *
- * The ``pri_spec->weight`` must be in :macro:`NGHTTP2_MIN_WEIGHT`,
- * :macro:`NGHTTP2_MAX_WEIGHT`, inclusive.  If ``pri_spec->weight``
- * is strictly less than :macro:`NGHTTP2_MIN_WEIGHT`, it becomes
- * :macro:`NGHTTP2_MIN_WEIGHT`.  If it is strictly greater than
- * :macro:`NGHTTP2_MAX_WEIGHT`, it becomes
- * :macro:`NGHTTP2_MAX_WEIGHT`.
- *
- * The |nva| is an array of name/value pair :type:`nghttp2_nv` with
- * |nvlen| elements.  The application is responsible to include
- * required pseudo-header fields (header field whose name starts with
- * ":") in |nva| and must place pseudo-headers before regular header
- * fields.
- *
- * This function creates copies of all name/value pairs in |nva|.  It
- * also lower-cases all names in |nva|.  The order of elements in
- * |nva| is preserved.  For header fields with
- * :enum:`nghttp2_nv_flag.NGHTTP2_NV_FLAG_NO_COPY_NAME` and
- * :enum:`nghttp2_nv_flag.NGHTTP2_NV_FLAG_NO_COPY_VALUE` are set,
- * header field name and value are not copied respectively.  With
- * :enum:`nghttp2_nv_flag.NGHTTP2_NV_FLAG_NO_COPY_NAME`, application
- * is responsible to pass header field name in lowercase.  The
- * application should maintain the references to them until
- * :type:`nghttp2_on_frame_send_callback` or
- * :type:`nghttp2_on_frame_not_send_callback` is called.
- *
- * HTTP/2 specification has requirement about header fields in the
- * request HEADERS.  See the specification for more details.
- *
- * If |data_prd| is not ``NULL``, it provides data which will be sent
- * in subsequent DATA frames.  In this case, a method that allows
- * request message bodies
- * (https://tools.ietf.org/html/rfc7231#section-4) must be specified
- * with ``:method`` key in |nva| (e.g. ``POST``).  This function does
- * not take ownership of the |data_prd|.  The function copies the
- * members of the |data_prd|.  If |data_prd| is ``NULL``, HEADERS have
- * END_STREAM set.  The |stream_user_data| is data associated to the
- * stream opened by this request and can be an arbitrary pointer,
- * which can be retrieved later by
- * `nghttp2_session_get_stream_user_data()`.
- *
- * This function returns assigned stream ID if it succeeds, or one of
- * the following negative error codes:
- *
- * :enum:`nghttp2_error.NGHTTP2_ERR_NOMEM`
- *     Out of memory.
- * :enum:`nghttp2_error.NGHTTP2_ERR_STREAM_ID_NOT_AVAILABLE`
- *     No stream ID is available because maximum stream ID was
- *     reached.
- * :enum:`nghttp2_error.NGHTTP2_ERR_INVALID_ARGUMENT`
- *     Trying to depend on itself (new stream ID equals
- *     ``pri_spec->stream_id``).
- * :enum:`nghttp2_error.NGHTTP2_ERR_PROTO`
- *     The |session| is server session.
- *
- * .. warning::
- *
- *   This function returns assigned stream ID if it succeeds.  But
- *   that stream is not created yet.  The application must not submit
- *   frame to that stream ID before
- *   :type:`nghttp2_before_frame_send_callback` is called for this
- *   frame.  This means `nghttp2_session_get_stream_user_data()` does
- *   not work before the callback.  But
- *   `nghttp2_session_set_stream_user_data()` handles this situation
- *   specially, and it can set data to a stream during this period.
- *
- */
-NGHTTP2_EXTERN int32_t nghttp2_submit_request(
-    nghttp2_session *session, const nghttp2_priority_spec *pri_spec,
-    const nghttp2_nv *nva, size_t nvlen, const nghttp2_data_provider *data_prd,
-    void *stream_user_data);
-
-/**
- * @function
- *
- * Submits response HEADERS frame and optionally one or more DATA
- * frames against the stream |stream_id|.
- *
- * The |nva| is an array of name/value pair :type:`nghttp2_nv` with
- * |nvlen| elements.  The application is responsible to include
- * required pseudo-header fields (header field whose name starts with
- * ":") in |nva| and must place pseudo-headers before regular header
- * fields.
- *
- * This function creates copies of all name/value pairs in |nva|.  It
- * also lower-cases all names in |nva|.  The order of elements in
- * |nva| is preserved.  For header fields with
- * :enum:`nghttp2_nv_flag.NGHTTP2_NV_FLAG_NO_COPY_NAME` and
- * :enum:`nghttp2_nv_flag.NGHTTP2_NV_FLAG_NO_COPY_VALUE` are set,
- * header field name and value are not copied respectively.  With
- * :enum:`nghttp2_nv_flag.NGHTTP2_NV_FLAG_NO_COPY_NAME`, application
- * is responsible to pass header field name in lowercase.  The
- * application should maintain the references to them until
- * :type:`nghttp2_on_frame_send_callback` or
- * :type:`nghttp2_on_frame_not_send_callback` is called.
- *
- * HTTP/2 specification has requirement about header fields in the
- * response HEADERS.  See the specification for more details.
- *
- * If |data_prd| is not ``NULL``, it provides data which will be sent
- * in subsequent DATA frames.  This function does not take ownership
- * of the |data_prd|.  The function copies the members of the
- * |data_prd|.  If |data_prd| is ``NULL``, HEADERS will have
- * END_STREAM flag set.
- *
- * This method can be used as normal HTTP response and push response.
- * When pushing a resource using this function, the |session| must be
- * configured using `nghttp2_session_server_new()` or its variants and
- * the target stream denoted by the |stream_id| must be reserved using
- * `nghttp2_submit_push_promise()`.
- *
- * To send non-final response headers (e.g., HTTP status 101), don't
- * use this function because this function half-closes the outbound
- * stream.  Instead, use `nghttp2_submit_headers()` for this purpose.
- *
- * This function returns 0 if it succeeds, or one of the following
- * negative error codes:
- *
- * :enum:`nghttp2_error.NGHTTP2_ERR_NOMEM`
- *     Out of memory.
- * :enum:`nghttp2_error.NGHTTP2_ERR_INVALID_ARGUMENT`
- *     The |stream_id| is 0.
- * :enum:`nghttp2_error.NGHTTP2_ERR_DATA_EXIST`
- *     DATA or HEADERS has been already submitted and not fully
- *     processed yet.  Normally, this does not happen, but when
- *     application wrongly calls `nghttp2_submit_response()` twice,
- *     this may happen.
- * :enum:`nghttp2_error.NGHTTP2_ERR_PROTO`
- *     The |session| is client session.
- *
- * .. warning::
- *
- *   Calling this function twice for the same stream ID may lead to
- *   program crash.  It is generally considered to a programming error
- *   to commit response twice.
- */
-NGHTTP2_EXTERN int
-nghttp2_submit_response(nghttp2_session *session, int32_t stream_id,
-                        const nghttp2_nv *nva, size_t nvlen,
-                        const nghttp2_data_provider *data_prd);
-
-/**
- * @function
- *
- * Submits trailer fields HEADERS against the stream |stream_id|.
- *
- * The |nva| is an array of name/value pair :type:`nghttp2_nv` with
- * |nvlen| elements.  The application must not include pseudo-header
- * fields (headers whose names starts with ":") in |nva|.
- *
- * This function creates copies of all name/value pairs in |nva|.  It
- * also lower-cases all names in |nva|.  The order of elements in
- * |nva| is preserved.  For header fields with
- * :enum:`nghttp2_nv_flag.NGHTTP2_NV_FLAG_NO_COPY_NAME` and
- * :enum:`nghttp2_nv_flag.NGHTTP2_NV_FLAG_NO_COPY_VALUE` are set,
- * header field name and value are not copied respectively.  With
- * :enum:`nghttp2_nv_flag.NGHTTP2_NV_FLAG_NO_COPY_NAME`, application
- * is responsible to pass header field name in lowercase.  The
- * application should maintain the references to them until
- * :type:`nghttp2_on_frame_send_callback` or
- * :type:`nghttp2_on_frame_not_send_callback` is called.
- *
- * For server, trailer fields must follow response HEADERS or response
- * DATA without END_STREAM flat set.  The library does not enforce
- * this requirement, and applications should do this for themselves.
- * If `nghttp2_submit_trailer()` is called before any response HEADERS
- * submission (usually by `nghttp2_submit_response()`), the content of
- * |nva| will be sent as response headers, which will result in error.
- *
- * This function has the same effect with `nghttp2_submit_headers()`,
- * with flags = :enum:`nghttp2_flag.NGHTTP2_FLAG_END_STREAM` and both
- * pri_spec and stream_user_data to NULL.
- *
- * To submit trailer fields after `nghttp2_submit_response()` is
- * called, the application has to specify
- * :type:`nghttp2_data_provider` to `nghttp2_submit_response()`.
- * Inside of :type:`nghttp2_data_source_read_callback`, when setting
- * :enum:`nghttp2_data_flag.NGHTTP2_DATA_FLAG_EOF`, also set
- * :enum:`nghttp2_data_flag.NGHTTP2_DATA_FLAG_NO_END_STREAM`.  After
- * that, the application can send trailer fields using
- * `nghttp2_submit_trailer()`.  `nghttp2_submit_trailer()` can be used
- * inside :type:`nghttp2_data_source_read_callback`.
- *
- * This function returns 0 if it succeeds and |stream_id| is -1.
- * Otherwise, this function returns 0 if it succeeds, or one of the
- * following negative error codes:
- *
- * :enum:`nghttp2_error.NGHTTP2_ERR_NOMEM`
- *     Out of memory.
- * :enum:`nghttp2_error.NGHTTP2_ERR_INVALID_ARGUMENT`
- *     The |stream_id| is 0.
- */
-NGHTTP2_EXTERN int nghttp2_submit_trailer(nghttp2_session *session,
-                                          int32_t stream_id,
-                                          const nghttp2_nv *nva, size_t nvlen);
-
-/**
- * @function
- *
- * Submits HEADERS frame. The |flags| is bitwise OR of the
- * following values:
- *
- * * :enum:`nghttp2_flag.NGHTTP2_FLAG_END_STREAM`
- *
- * If |flags| includes :enum:`nghttp2_flag.NGHTTP2_FLAG_END_STREAM`,
- * this frame has END_STREAM flag set.
- *
- * The library handles the CONTINUATION frame internally and it
- * correctly sets END_HEADERS to the last sequence of the PUSH_PROMISE
- * or CONTINUATION frame.
- *
- * If the |stream_id| is -1, this frame is assumed as request (i.e.,
- * request HEADERS frame which opens new stream).  In this case, the
- * assigned stream ID will be returned.  Otherwise, specify stream ID
- * in |stream_id|.
- *
- * The |pri_spec| is priority specification of this request.  ``NULL``
- * means the default priority (see
- * `nghttp2_priority_spec_default_init()`).  To specify the priority,
- * use `nghttp2_priority_spec_init()`.  If |pri_spec| is not ``NULL``,
- * this function will copy its data members.
- *
- * The ``pri_spec->weight`` must be in :macro:`NGHTTP2_MIN_WEIGHT`,
- * :macro:`NGHTTP2_MAX_WEIGHT`, inclusive.  If ``pri_spec->weight``
- * is strictly less than :macro:`NGHTTP2_MIN_WEIGHT`, it becomes
- * :macro:`NGHTTP2_MIN_WEIGHT`.  If it is strictly greater than
- * :macro:`NGHTTP2_MAX_WEIGHT`, it becomes :macro:`NGHTTP2_MAX_WEIGHT`.
- *
- * The |nva| is an array of name/value pair :type:`nghttp2_nv` with
- * |nvlen| elements.  The application is responsible to include
- * required pseudo-header fields (header field whose name starts with
- * ":") in |nva| and must place pseudo-headers before regular header
- * fields.
- *
- * This function creates copies of all name/value pairs in |nva|.  It
- * also lower-cases all names in |nva|.  The order of elements in
- * |nva| is preserved.  For header fields with
- * :enum:`nghttp2_nv_flag.NGHTTP2_NV_FLAG_NO_COPY_NAME` and
- * :enum:`nghttp2_nv_flag.NGHTTP2_NV_FLAG_NO_COPY_VALUE` are set,
- * header field name and value are not copied respectively.  With
- * :enum:`nghttp2_nv_flag.NGHTTP2_NV_FLAG_NO_COPY_NAME`, application
- * is responsible to pass header field name in lowercase.  The
- * application should maintain the references to them until
- * :type:`nghttp2_on_frame_send_callback` or
- * :type:`nghttp2_on_frame_not_send_callback` is called.
- *
- * The |stream_user_data| is a pointer to an arbitrary data which is
- * associated to the stream this frame will open.  Therefore it is
- * only used if this frame opens streams, in other words, it changes
- * stream state from idle or reserved to open.
- *
- * This function is low-level in a sense that the application code can
- * specify flags directly.  For usual HTTP request,
- * `nghttp2_submit_request()` is useful.  Likewise, for HTTP response,
- * prefer `nghttp2_submit_response()`.
- *
- * This function returns newly assigned stream ID if it succeeds and
- * |stream_id| is -1.  Otherwise, this function returns 0 if it
- * succeeds, or one of the following negative error codes:
- *
- * :enum:`nghttp2_error.NGHTTP2_ERR_NOMEM`
- *     Out of memory.
- * :enum:`nghttp2_error.NGHTTP2_ERR_STREAM_ID_NOT_AVAILABLE`
- *     No stream ID is available because maximum stream ID was
- *     reached.
- * :enum:`nghttp2_error.NGHTTP2_ERR_INVALID_ARGUMENT`
- *     The |stream_id| is 0; or trying to depend on itself (stream ID
- *     equals ``pri_spec->stream_id``).
- * :enum:`nghttp2_error.NGHTTP2_ERR_DATA_EXIST`
- *     DATA or HEADERS has been already submitted and not fully
- *     processed yet.  This happens if stream denoted by |stream_id|
- *     is in reserved state.
- * :enum:`nghttp2_error.NGHTTP2_ERR_PROTO`
- *     The |stream_id| is -1, and |session| is server session.
- *
- * .. warning::
- *
- *   This function returns assigned stream ID if it succeeds and
- *   |stream_id| is -1.  But that stream is not opened yet.  The
- *   application must not submit frame to that stream ID before
- *   :type:`nghttp2_before_frame_send_callback` is called for this
- *   frame.
- *
- */
-NGHTTP2_EXTERN int32_t nghttp2_submit_headers(
-    nghttp2_session *session, uint8_t flags, int32_t stream_id,
-    const nghttp2_priority_spec *pri_spec, const nghttp2_nv *nva, size_t nvlen,
-    void *stream_user_data);
-
-/**
- * @function
- *
- * Submits one or more DATA frames to the stream |stream_id|.  The
- * data to be sent are provided by |data_prd|.  If |flags| contains
- * :enum:`nghttp2_flag.NGHTTP2_FLAG_END_STREAM`, the last DATA frame
- * has END_STREAM flag set.
- *
- * This function does not take ownership of the |data_prd|.  The
- * function copies the members of the |data_prd|.
- *
- * This function returns 0 if it succeeds, or one of the following
- * negative error codes:
- *
- * :enum:`nghttp2_error.NGHTTP2_ERR_NOMEM`
- *     Out of memory.
- * :enum:`nghttp2_error.NGHTTP2_ERR_DATA_EXIST`
- *     DATA or HEADERS has been already submitted and not fully
- *     processed yet.
- * :enum:`nghttp2_error.NGHTTP2_ERR_INVALID_ARGUMENT`
- *     The |stream_id| is 0.
- * :enum:`nghttp2_error.NGHTTP2_ERR_STREAM_CLOSED`
- *     The stream was already closed; or the |stream_id| is invalid.
- *
- * .. note::
- *
- *   Currently, only one DATA or HEADERS is allowed for a stream at a
- *   time.  Submitting these frames more than once before first DATA
- *   or HEADERS is finished results in
- *   :enum:`nghttp2_error.NGHTTP2_ERR_DATA_EXIST` error code.  The
- *   earliest callback which tells that previous frame is done is
- *   :type:`nghttp2_on_frame_send_callback`.  In side that callback,
- *   new data can be submitted using `nghttp2_submit_data()`.  Of
- *   course, all data except for last one must not have
- *   :enum:`nghttp2_flag.NGHTTP2_FLAG_END_STREAM` flag set in |flags|.
- *   This sounds a bit complicated, and we recommend to use
- *   `nghttp2_submit_request()` and `nghttp2_submit_response()` to
- *   avoid this cascading issue.  The experience shows that for HTTP
- *   use, these two functions are enough to implement both client and
- *   server.
- */
-NGHTTP2_EXTERN int nghttp2_submit_data(nghttp2_session *session, uint8_t flags,
-                                       int32_t stream_id,
-                                       const nghttp2_data_provider *data_prd);
-
-/**
- * @function
- *
- * Submits PRIORITY frame to change the priority of stream |stream_id|
- * to the priority specification |pri_spec|.
- *
- * The |flags| is currently ignored and should be
- * :enum:`nghttp2_flag.NGHTTP2_FLAG_NONE`.
- *
- * The |pri_spec| is priority specification of this request.  ``NULL``
- * is not allowed for this function. To specify the priority, use
- * `nghttp2_priority_spec_init()`.  This function will copy its data
- * members.
- *
- * The ``pri_spec->weight`` must be in :macro:`NGHTTP2_MIN_WEIGHT`,
- * :macro:`NGHTTP2_MAX_WEIGHT`, inclusive.  If ``pri_spec->weight``
- * is strictly less than :macro:`NGHTTP2_MIN_WEIGHT`, it becomes
- * :macro:`NGHTTP2_MIN_WEIGHT`.  If it is strictly greater than
- * :macro:`NGHTTP2_MAX_WEIGHT`, it becomes
- * :macro:`NGHTTP2_MAX_WEIGHT`.
- *
- * This function returns 0 if it succeeds, or one of the following
- * negative error codes:
- *
- * :enum:`nghttp2_error.NGHTTP2_ERR_NOMEM`
- *     Out of memory.
- * :enum:`nghttp2_error.NGHTTP2_ERR_INVALID_ARGUMENT`
- *     The |stream_id| is 0; or the |pri_spec| is NULL; or trying to
- *     depend on itself.
- */
-NGHTTP2_EXTERN int
-nghttp2_submit_priority(nghttp2_session *session, uint8_t flags,
-                        int32_t stream_id,
-                        const nghttp2_priority_spec *pri_spec);
-
-/**
- * @function
- *
- * Submits RST_STREAM frame to cancel/reject the stream |stream_id|
- * with the error code |error_code|.
- *
- * The pre-defined error code is one of :enum:`nghttp2_error_code`.
- *
- * The |flags| is currently ignored and should be
- * :enum:`nghttp2_flag.NGHTTP2_FLAG_NONE`.
- *
- * This function returns 0 if it succeeds, or one of the following
- * negative error codes:
- *
- * :enum:`nghttp2_error.NGHTTP2_ERR_NOMEM`
- *     Out of memory.
- * :enum:`nghttp2_error.NGHTTP2_ERR_INVALID_ARGUMENT`
- *     The |stream_id| is 0.
- */
-NGHTTP2_EXTERN int nghttp2_submit_rst_stream(nghttp2_session *session,
-                                             uint8_t flags, int32_t stream_id,
-                                             uint32_t error_code);
-
-/**
- * @function
- *
- * Stores local settings and submits SETTINGS frame.  The |iv| is the
- * pointer to the array of :type:`nghttp2_settings_entry`.  The |niv|
- * indicates the number of :type:`nghttp2_settings_entry`.
- *
- * The |flags| is currently ignored and should be
- * :enum:`nghttp2_flag.NGHTTP2_FLAG_NONE`.
- *
- * This function does not take ownership of the |iv|.  This function
- * copies all the elements in the |iv|.
- *
- * While updating individual stream's local window size, if the window
- * size becomes strictly larger than NGHTTP2_MAX_WINDOW_SIZE,
- * RST_STREAM is issued against such a stream.
- *
- * SETTINGS with :enum:`nghttp2_flag.NGHTTP2_FLAG_ACK` is
- * automatically submitted by the library and application could not
- * send it at its will.
- *
- * This function returns 0 if it succeeds, or one of the following
- * negative error codes:
- *
- * :enum:`nghttp2_error.NGHTTP2_ERR_INVALID_ARGUMENT`
- *     The |iv| contains invalid value (e.g., initial window size
- *     strictly greater than (1 << 31) - 1.
- * :enum:`nghttp2_error.NGHTTP2_ERR_NOMEM`
- *     Out of memory.
- */
-NGHTTP2_EXTERN int nghttp2_submit_settings(nghttp2_session *session,
-                                           uint8_t flags,
-                                           const nghttp2_settings_entry *iv,
-                                           size_t niv);
-
-/**
- * @function
- *
- * Submits PUSH_PROMISE frame.
- *
- * The |flags| is currently ignored.  The library handles the
- * CONTINUATION frame internally and it correctly sets END_HEADERS to
- * the last sequence of the PUSH_PROMISE or CONTINUATION frame.
- *
- * The |stream_id| must be client initiated stream ID.
- *
- * The |nva| is an array of name/value pair :type:`nghttp2_nv` with
- * |nvlen| elements.  The application is responsible to include
- * required pseudo-header fields (header field whose name starts with
- * ":") in |nva| and must place pseudo-headers before regular header
- * fields.
- *
- * This function creates copies of all name/value pairs in |nva|.  It
- * also lower-cases all names in |nva|.  The order of elements in
- * |nva| is preserved.  For header fields with
- * :enum:`nghttp2_nv_flag.NGHTTP2_NV_FLAG_NO_COPY_NAME` and
- * :enum:`nghttp2_nv_flag.NGHTTP2_NV_FLAG_NO_COPY_VALUE` are set,
- * header field name and value are not copied respectively.  With
- * :enum:`nghttp2_nv_flag.NGHTTP2_NV_FLAG_NO_COPY_NAME`, application
- * is responsible to pass header field name in lowercase.  The
- * application should maintain the references to them until
- * :type:`nghttp2_on_frame_send_callback` or
- * :type:`nghttp2_on_frame_not_send_callback` is called.
- *
- * The |promised_stream_user_data| is a pointer to an arbitrary data
- * which is associated to the promised stream this frame will open and
- * make it in reserved state.  It is available using
- * `nghttp2_session_get_stream_user_data()`.  The application can
- * access it in :type:`nghttp2_before_frame_send_callback` and
- * :type:`nghttp2_on_frame_send_callback` of this frame.
- *
- * The client side is not allowed to use this function.
- *
- * To submit response headers and data, use
- * `nghttp2_submit_response()`.
- *
- * This function returns assigned promised stream ID if it succeeds,
- * or one of the following negative error codes:
- *
- * :enum:`nghttp2_error.NGHTTP2_ERR_NOMEM`
- *     Out of memory.
- * :enum:`nghttp2_error.NGHTTP2_ERR_PROTO`
- *     This function was invoked when |session| is initialized as
- *     client.
- * :enum:`nghttp2_error.NGHTTP2_ERR_STREAM_ID_NOT_AVAILABLE`
- *     No stream ID is available because maximum stream ID was
- *     reached.
- * :enum:`nghttp2_error.NGHTTP2_ERR_INVALID_ARGUMENT`
- *     The |stream_id| is 0; The |stream_id| does not designate stream
- *     that peer initiated.
- * :enum:`nghttp2_error.NGHTTP2_ERR_STREAM_CLOSED`
- *     The stream was already closed; or the |stream_id| is invalid.
- *
- * .. warning::
- *
- *   This function returns assigned promised stream ID if it succeeds.
- *   As of 1.16.0, stream object for pushed resource is created when
- *   this function succeeds.  In that case, the application can submit
- *   push response for the promised frame.
- *
- *   In 1.15.0 or prior versions, pushed stream is not opened yet when
- *   this function succeeds.  The application must not submit frame to
- *   that stream ID before :type:`nghttp2_before_frame_send_callback`
- *   is called for this frame.
- *
- */
-NGHTTP2_EXTERN int32_t nghttp2_submit_push_promise(
-    nghttp2_session *session, uint8_t flags, int32_t stream_id,
-    const nghttp2_nv *nva, size_t nvlen, void *promised_stream_user_data);
-
-/**
- * @function
- *
- * Submits PING frame.  You don't have to send PING back when you
- * received PING frame.  The library automatically submits PING frame
- * in this case.
- *
- * The |flags| is bitwise OR of 0 or more of the following value.
- *
- * * :enum:`nghttp2_flag.NGHTTP2_FLAG_ACK`
- *
- * Unless `nghttp2_option_set_no_auto_ping_ack()` is used, the |flags|
- * should be :enum:`nghttp2_flag.NGHTTP2_FLAG_NONE`.
- *
- * If the |opaque_data| is non ``NULL``, then it should point to the 8
- * bytes array of memory to specify opaque data to send with PING
- * frame.  If the |opaque_data| is ``NULL``, zero-cleared 8 bytes will
- * be sent as opaque data.
- *
- * This function returns 0 if it succeeds, or one of the following
- * negative error codes:
- *
- * :enum:`nghttp2_error.NGHTTP2_ERR_NOMEM`
- *     Out of memory.
- */
-NGHTTP2_EXTERN int nghttp2_submit_ping(nghttp2_session *session, uint8_t flags,
-                                       const uint8_t *opaque_data);
-
-/**
- * @function
- *
- * Submits GOAWAY frame with the last stream ID |last_stream_id| and
- * the error code |error_code|.
- *
- * The pre-defined error code is one of :enum:`nghttp2_error_code`.
- *
- * The |flags| is currently ignored and should be
- * :enum:`nghttp2_flag.NGHTTP2_FLAG_NONE`.
- *
- * The |last_stream_id| is peer's stream ID or 0.  So if |session| is
- * initialized as client, |last_stream_id| must be even or 0.  If
- * |session| is initialized as server, |last_stream_id| must be odd or
- * 0.
- *
- * The HTTP/2 specification says last_stream_id must not be increased
- * from the value previously sent.  So the actual value sent as
- * last_stream_id is the minimum value between the given
- * |last_stream_id| and the last_stream_id previously sent to the
- * peer.
- *
- * If the |opaque_data| is not ``NULL`` and |opaque_data_len| is not
- * zero, those data will be sent as additional debug data.  The
- * library makes a copy of the memory region pointed by |opaque_data|
- * with the length |opaque_data_len|, so the caller does not need to
- * keep this memory after the return of this function.  If the
- * |opaque_data_len| is 0, the |opaque_data| could be ``NULL``.
- *
- * After successful transmission of GOAWAY, following things happen.
- * All incoming streams having strictly more than |last_stream_id| are
- * closed.  All incoming HEADERS which starts new stream are simply
- * ignored.  After all active streams are handled, both
- * `nghttp2_session_want_read()` and `nghttp2_session_want_write()`
- * return 0 and the application can close session.
- *
- * This function returns 0 if it succeeds, or one of the following
- * negative error codes:
- *
- * :enum:`nghttp2_error.NGHTTP2_ERR_NOMEM`
- *     Out of memory.
- * :enum:`nghttp2_error.NGHTTP2_ERR_INVALID_ARGUMENT`
- *     The |opaque_data_len| is too large; the |last_stream_id| is
- *     invalid.
- */
-NGHTTP2_EXTERN int nghttp2_submit_goaway(nghttp2_session *session,
-                                         uint8_t flags, int32_t last_stream_id,
-                                         uint32_t error_code,
-                                         const uint8_t *opaque_data,
-                                         size_t opaque_data_len);
-
-/**
- * @function
- *
- * Returns the last stream ID of a stream for which
- * :type:`nghttp2_on_frame_recv_callback` was invoked most recently.
- * The returned value can be used as last_stream_id parameter for
- * `nghttp2_submit_goaway()` and
- * `nghttp2_session_terminate_session2()`.
- *
- * This function always succeeds.
- */
-NGHTTP2_EXTERN int32_t
-nghttp2_session_get_last_proc_stream_id(nghttp2_session *session);
-
-/**
- * @function
- *
- * Returns nonzero if new request can be sent from local endpoint.
- *
- * This function return 0 if request is not allowed for this session.
- * There are several reasons why request is not allowed.  Some of the
- * reasons are: session is server; stream ID has been spent; GOAWAY
- * has been sent or received.
- *
- * The application can call `nghttp2_submit_request()` without
- * consulting this function.  In that case, `nghttp2_submit_request()`
- * may return error.  Or, request is failed to sent, and
- * :type:`nghttp2_on_stream_close_callback` is called.
- */
-NGHTTP2_EXTERN int
-nghttp2_session_check_request_allowed(nghttp2_session *session);
-
-/**
- * @function
- *
- * Returns nonzero if |session| is initialized as server side session.
- */
-NGHTTP2_EXTERN int
-nghttp2_session_check_server_session(nghttp2_session *session);
-
-/**
- * @function
- *
- * Submits WINDOW_UPDATE frame.
- *
- * The |flags| is currently ignored and should be
- * :enum:`nghttp2_flag.NGHTTP2_FLAG_NONE`.
- *
- * The |stream_id| is the stream ID to send this WINDOW_UPDATE.  To
- * send connection level WINDOW_UPDATE, specify 0 to |stream_id|.
- *
- * If the |window_size_increment| is positive, the WINDOW_UPDATE with
- * that value as window_size_increment is queued.  If the
- * |window_size_increment| is larger than the received bytes from the
- * remote endpoint, the local window size is increased by that
- * difference.  If the sole purpose is to increase the local window
- * size, consider to use `nghttp2_session_set_local_window_size()`.
- *
- * If the |window_size_increment| is negative, the local window size
- * is decreased by -|window_size_increment|.  If automatic
- * WINDOW_UPDATE is enabled
- * (`nghttp2_option_set_no_auto_window_update()`), and the library
- * decided that the WINDOW_UPDATE should be submitted, then
- * WINDOW_UPDATE is queued with the current received bytes count.  If
- * the sole purpose is to decrease the local window size, consider to
- * use `nghttp2_session_set_local_window_size()`.
- *
- * If the |window_size_increment| is 0, the function does nothing and
- * returns 0.
- *
- * This function returns 0 if it succeeds, or one of the following
- * negative error codes:
- *
- * :enum:`nghttp2_error.NGHTTP2_ERR_FLOW_CONTROL`
- *     The local window size overflow or gets negative.
- * :enum:`nghttp2_error.NGHTTP2_ERR_NOMEM`
- *     Out of memory.
- */
-NGHTTP2_EXTERN int nghttp2_submit_window_update(nghttp2_session *session,
-                                                uint8_t flags,
-                                                int32_t stream_id,
-                                                int32_t window_size_increment);
-
-/**
- * @function
- *
- * Set local window size (local endpoints's window size) to the given
- * |window_size| for the given stream denoted by |stream_id|.  To
- * change connection level window size, specify 0 to |stream_id|.  To
- * increase window size, this function may submit WINDOW_UPDATE frame
- * to transmission queue.
- *
- * The |flags| is currently ignored and should be
- * :enum:`nghttp2_flag.NGHTTP2_FLAG_NONE`.
- *
- * This sounds similar to `nghttp2_submit_window_update()`, but there
- * are 2 differences.  The first difference is that this function
- * takes the absolute value of window size to set, rather than the
- * delta.  To change the window size, this may be easier to use since
- * the application just declares the intended window size, rather than
- * calculating delta.  The second difference is that
- * `nghttp2_submit_window_update()` affects the received bytes count
- * which has not acked yet.  By the specification of
- * `nghttp2_submit_window_update()`, to strictly increase the local
- * window size, we have to submit delta including all received bytes
- * count, which might not be desirable in some cases.  On the other
- * hand, this function does not affect the received bytes count.  It
- * just sets the local window size to the given value.
- *
- * This function returns 0 if it succeeds, or one of the following
- * negative error codes:
- *
- * :enum:`nghttp2_error.NGHTTP2_ERR_INVALID_ARGUMENT`
- *     The |stream_id| is negative.
- * :enum:`nghttp2_error.NGHTTP2_ERR_NOMEM`
- *     Out of memory.
- */
-NGHTTP2_EXTERN int
-nghttp2_session_set_local_window_size(nghttp2_session *session, uint8_t flags,
-                                      int32_t stream_id, int32_t window_size);
-
-/**
- * @function
- *
- * Submits extension frame.
- *
- * Application can pass arbitrary frame flags and stream ID in |flags|
- * and |stream_id| respectively.  The |payload| is opaque pointer, and
- * it can be accessible though ``frame->ext.payload`` in
- * :type:`nghttp2_pack_extension_callback`.  The library will not own
- * passed |payload| pointer.
- *
- * The application must set :type:`nghttp2_pack_extension_callback`
- * using `nghttp2_session_callbacks_set_pack_extension_callback()`.
- *
- * The application should retain the memory pointed by |payload| until
- * the transmission of extension frame is done (which is indicated by
- * :type:`nghttp2_on_frame_send_callback`), or transmission fails
- * (which is indicated by :type:`nghttp2_on_frame_not_send_callback`).
- * If application does not touch this memory region after packing it
- * into a wire format, application can free it inside
- * :type:`nghttp2_pack_extension_callback`.
- *
- * The standard HTTP/2 frame cannot be sent with this function, so
- * |type| must be strictly grater than 0x9.  Otherwise, this function
- * will fail with error code
- * :enum:`nghttp2_error.NGHTTP2_ERR_INVALID_ARGUMENT`.
- *
- * This function returns 0 if it succeeds, or one of the following
- * negative error codes:
- *
- * :enum:`nghttp2_error.NGHTTP2_ERR_INVALID_STATE`
- *     If :type:`nghttp2_pack_extension_callback` is not set.
- * :enum:`nghttp2_error.NGHTTP2_ERR_INVALID_ARGUMENT`
- *     If  |type| specifies  standard  HTTP/2 frame  type.  The  frame
- *     types  in the  rage 0x0,  0x9, both  inclusive, are  standard
- *     HTTP/2 frame type, and cannot be sent using this function.
- * :enum:`nghttp2_error.NGHTTP2_ERR_NOMEM`
- *     Out of memory
- */
-NGHTTP2_EXTERN int nghttp2_submit_extension(nghttp2_session *session,
-                                            uint8_t type, uint8_t flags,
-                                            int32_t stream_id, void *payload);
-
-/**
- * @struct
- *
- * The payload of ALTSVC frame.  ALTSVC frame is a non-critical
- * extension to HTTP/2.  If this frame is received, and
- * `nghttp2_option_set_user_recv_extension_type()` is not set, and
- * `nghttp2_option_set_builtin_recv_extension_type()` is set for
- * :enum:`nghttp2_frame_type.NGHTTP2_ALTSVC`,
- * ``nghttp2_extension.payload`` will point to this struct.
- *
- * It has the following members:
- */
-typedef struct {
-  /**
-   * The pointer to origin which this alternative service is
-   * associated with.  This is not necessarily NULL-terminated.
-   */
-  uint8_t *origin;
-  /**
-   * The length of the |origin|.
-   */
-  size_t origin_len;
-  /**
-   * The pointer to Alt-Svc field value contained in ALTSVC frame.
-   * This is not necessarily NULL-terminated.
-   */
-  uint8_t *field_value;
-  /**
-   * The length of the |field_value|.
-   */
-  size_t field_value_len;
-} nghttp2_ext_altsvc;
-
-/**
- * @function
- *
- * Submits ALTSVC frame.
- *
- * ALTSVC frame is a non-critical extension to HTTP/2, and defined in
- * `RFC 7383 <https://tools.ietf.org/html/rfc7838#section-4>`_.
- *
- * The |flags| is currently ignored and should be
- * :enum:`nghttp2_flag.NGHTTP2_FLAG_NONE`.
- *
- * The |origin| points to the origin this alternative service is
- * associated with.  The |origin_len| is the length of the origin.  If
- * |stream_id| is 0, the origin must be specified.  If |stream_id| is
- * not zero, the origin must be empty (in other words, |origin_len|
- * must be 0).
- *
- * The ALTSVC frame is only usable from server side.  If this function
- * is invoked with client side session, this function returns
- * :enum:`nghttp2_error.NGHTTP2_ERR_INVALID_STATE`.
- *
- * This function returns 0 if it succeeds, or one of the following
- * negative error codes:
- *
- * :enum:`nghttp2_error.NGHTTP2_ERR_NOMEM`
- *     Out of memory
- * :enum:`nghttp2_error.NGHTTP2_ERR_INVALID_STATE`
- *     The function is called from client side session
- * :enum:`nghttp2_error.NGHTTP2_ERR_INVALID_ARGUMENT`
- *     The sum of |origin_len| and |field_value_len| is larger than
- *     16382; or |origin_len| is 0 while |stream_id| is 0; or
- *     |origin_len| is not 0 while |stream_id| is not 0.
- */
-NGHTTP2_EXTERN int nghttp2_submit_altsvc(nghttp2_session *session,
-                                         uint8_t flags, int32_t stream_id,
-                                         const uint8_t *origin,
-                                         size_t origin_len,
-                                         const uint8_t *field_value,
-                                         size_t field_value_len);
-
-/**
- * @struct
- *
- * The single entry of an origin.
- */
-typedef struct {
-  /**
-   * The pointer to origin.  No validation is made against this field
-   * by the library.  This is not necessarily NULL-terminated.
-   */
-  uint8_t *origin;
-  /**
-   * The length of the |origin|.
-   */
-  size_t origin_len;
-} nghttp2_origin_entry;
-
-/**
- * @struct
- *
- * The payload of ORIGIN frame.  ORIGIN frame is a non-critical
- * extension to HTTP/2 and defined by `RFC 8336
- * <https://tools.ietf.org/html/rfc8336>`_.
- *
- * If this frame is received, and
- * `nghttp2_option_set_user_recv_extension_type()` is not set, and
- * `nghttp2_option_set_builtin_recv_extension_type()` is set for
- * :enum:`nghttp2_frame_type.NGHTTP2_ORIGIN`,
- * ``nghttp2_extension.payload`` will point to this struct.
- *
- * It has the following members:
- */
-typedef struct {
-  /**
-   * The number of origins contained in |ov|.
-   */
-  size_t nov;
-  /**
-   * The pointer to the array of origins contained in ORIGIN frame.
-   */
-  nghttp2_origin_entry *ov;
-} nghttp2_ext_origin;
-
-/**
- * @function
- *
- * Submits ORIGIN frame.
- *
- * ORIGIN frame is a non-critical extension to HTTP/2 and defined by
- * `RFC 8336 <https://tools.ietf.org/html/rfc8336>`_.
- *
- * The |flags| is currently ignored and should be
- * :enum:`nghttp2_flag.NGHTTP2_FLAG_NONE`.
- *
- * The |ov| points to the array of origins.  The |nov| specifies the
- * number of origins included in |ov|.  This function creates copies
- * of all elements in |ov|.
- *
- * The ORIGIN frame is only usable by a server.  If this function is
- * invoked with client side session, this function returns
- * :enum:`nghttp2_error.NGHTTP2_ERR_INVALID_STATE`.
- *
- * :enum:`nghttp2_error.NGHTTP2_ERR_NOMEM`
- *     Out of memory
- * :enum:`nghttp2_error.NGHTTP2_ERR_INVALID_STATE`
- *     The function is called from client side session.
- * :enum:`nghttp2_error.NGHTTP2_ERR_INVALID_ARGUMENT`
- *     There are too many origins, or an origin is too large to fit
- *     into a default frame payload.
- */
-NGHTTP2_EXTERN int nghttp2_submit_origin(nghttp2_session *session,
-                                         uint8_t flags,
-                                         const nghttp2_origin_entry *ov,
-                                         size_t nov);
-
-/**
- * @function
- *
- * Compares ``lhs->name`` of length ``lhs->namelen`` bytes and
- * ``rhs->name`` of length ``rhs->namelen`` bytes.  Returns negative
- * integer if ``lhs->name`` is found to be less than ``rhs->name``; or
- * returns positive integer if ``lhs->name`` is found to be greater
- * than ``rhs->name``; or returns 0 otherwise.
- */
-NGHTTP2_EXTERN int nghttp2_nv_compare_name(const nghttp2_nv *lhs,
-                                           const nghttp2_nv *rhs);
-
-/**
- * @function
- *
- * A helper function for dealing with NPN in client side or ALPN in
- * server side.  The |in| contains peer's protocol list in preferable
- * order.  The format of |in| is length-prefixed and not
- * null-terminated.  For example, ``h2`` and
- * ``http/1.1`` stored in |in| like this::
- *
- *     in0 = 2
- *     in1..2 = "h2"
- *     in3 = 8
- *     in4..11 = "http/1.1"
- *     inlen = 12
- *
- * The selection algorithm is as follows:
- *
- * 1. If peer's list contains HTTP/2 protocol the library supports,
- *    it is selected and returns 1. The following step is not taken.
- *
- * 2. If peer's list contains ``http/1.1``, this function selects
- *    ``http/1.1`` and returns 0.  The following step is not taken.
- *
- * 3. This function selects nothing and returns -1 (So called
- *    non-overlap case).  In this case, |out| and |outlen| are left
- *    untouched.
- *
- * Selecting ``h2`` means that ``h2`` is written into |*out| and its
- * length (which is 2) is assigned to |*outlen|.
- *
- * For ALPN, refer to https://tools.ietf.org/html/rfc7301
- *
- * See http://technotes.googlecode.com/git/nextprotoneg.html for more
- * details about NPN.
- *
- * For NPN, to use this method you should do something like::
- *
- *     static int select_next_proto_cb(SSL* ssl,
- *                                     unsigned char **out,
- *                                     unsigned char *outlen,
- *                                     const unsigned char *in,
- *                                     unsigned int inlen,
- *                                     void *arg)
- *     {
- *         int rv;
- *         rv = nghttp2_select_next_protocol(out, outlen, in, inlen);
- *         if (rv == -1) {
- *             return SSL_TLSEXT_ERR_NOACK;
- *         }
- *         if (rv == 1) {
- *             ((MyType*)arg)->http2_selected = 1;
- *         }
- *         return SSL_TLSEXT_ERR_OK;
- *     }
- *     ...
- *     SSL_CTX_set_next_proto_select_cb(ssl_ctx, select_next_proto_cb, my_obj);
- *
- */
-NGHTTP2_EXTERN int nghttp2_select_next_protocol(unsigned char **out,
-                                                unsigned char *outlen,
-                                                const unsigned char *in,
-                                                unsigned int inlen);
-
-/**
- * @function
- *
- * Returns a pointer to a nghttp2_info struct with version information
- * about the run-time library in use.  The |least_version| argument
- * can be set to a 24 bit numerical value for the least accepted
- * version number and if the condition is not met, this function will
- * return a ``NULL``.  Pass in 0 to skip the version checking.
- */
-NGHTTP2_EXTERN nghttp2_info *nghttp2_version(int least_version);
-
-/**
- * @function
- *
- * Returns nonzero if the :type:`nghttp2_error` library error code
- * |lib_error| is fatal.
- */
-NGHTTP2_EXTERN int nghttp2_is_fatal(int lib_error_code);
-
-/**
- * @function
- *
- * Returns nonzero if HTTP header field name |name| of length |len| is
- * valid according to http://tools.ietf.org/html/rfc7230#section-3.2
- *
- * Because this is a header field name in HTTP2, the upper cased alphabet
- * is treated as error.
- */
-NGHTTP2_EXTERN int nghttp2_check_header_name(const uint8_t *name, size_t len);
-
-/**
- * @function
- *
- * Returns nonzero if HTTP header field value |value| of length |len|
- * is valid according to
- * http://tools.ietf.org/html/rfc7230#section-3.2
- */
-NGHTTP2_EXTERN int nghttp2_check_header_value(const uint8_t *value, size_t len);
-
-/**
- * @function
- *
- * Returns nonzero if the |value| which is supposed to the value of
- * :authority or host header field is valid according to
- * https://tools.ietf.org/html/rfc3986#section-3.2
- *
- * |value| is valid if it merely consists of the allowed characters.
- * In particular, it does not check whether |value| follows the syntax
- * of authority.
- */
-NGHTTP2_EXTERN int nghttp2_check_authority(const uint8_t *value, size_t len);
-
-/* HPACK API */
-
-struct nghttp2_hd_deflater;
-
-/**
- * @struct
- *
- * HPACK deflater object.
- */
-typedef struct nghttp2_hd_deflater nghttp2_hd_deflater;
-
-/**
- * @function
- *
- * Initializes |*deflater_ptr| for deflating name/values pairs.
- *
- * The |max_deflate_dynamic_table_size| is the upper bound of header
- * table size the deflater will use.
- *
- * If this function fails, |*deflater_ptr| is left untouched.
- *
- * This function returns 0 if it succeeds, or one of the following
- * negative error codes:
- *
- * :enum:`nghttp2_error.NGHTTP2_ERR_NOMEM`
- *     Out of memory.
- */
-NGHTTP2_EXTERN int
-nghttp2_hd_deflate_new(nghttp2_hd_deflater **deflater_ptr,
-                       size_t max_deflate_dynamic_table_size);
-
-/**
- * @function
- *
- * Like `nghttp2_hd_deflate_new()`, but with additional custom memory
- * allocator specified in the |mem|.
- *
- * The |mem| can be ``NULL`` and the call is equivalent to
- * `nghttp2_hd_deflate_new()`.
- *
- * This function does not take ownership |mem|.  The application is
- * responsible for freeing |mem|.
- *
- * The library code does not refer to |mem| pointer after this
- * function returns, so the application can safely free it.
- */
-NGHTTP2_EXTERN int
-nghttp2_hd_deflate_new2(nghttp2_hd_deflater **deflater_ptr,
-                        size_t max_deflate_dynamic_table_size,
-                        nghttp2_mem *mem);
-
-/**
- * @function
- *
- * Deallocates any resources allocated for |deflater|.
- */
-NGHTTP2_EXTERN void nghttp2_hd_deflate_del(nghttp2_hd_deflater *deflater);
-
-/**
- * @function
- *
- * Changes header table size of the |deflater| to
- * |settings_max_dynamic_table_size| bytes.  This may trigger eviction
- * in the dynamic table.
- *
- * The |settings_max_dynamic_table_size| should be the value received
- * in SETTINGS_HEADER_TABLE_SIZE.
- *
- * The deflater never uses more memory than
- * ``max_deflate_dynamic_table_size`` bytes specified in
- * `nghttp2_hd_deflate_new()`.  Therefore, if
- * |settings_max_dynamic_table_size| >
- * ``max_deflate_dynamic_table_size``, resulting maximum table size
- * becomes ``max_deflate_dynamic_table_size``.
- *
- * This function returns 0 if it succeeds, or one of the following
- * negative error codes:
- *
- * :enum:`nghttp2_error.NGHTTP2_ERR_NOMEM`
- *     Out of memory.
- */
-NGHTTP2_EXTERN int
-nghttp2_hd_deflate_change_table_size(nghttp2_hd_deflater *deflater,
-                                     size_t settings_max_dynamic_table_size);
-
-/**
- * @function
- *
- * Deflates the |nva|, which has the |nvlen| name/value pairs, into
- * the |buf| of length |buflen|.
- *
- * If |buf| is not large enough to store the deflated header block,
- * this function fails with
- * :enum:`nghttp2_error.NGHTTP2_ERR_INSUFF_BUFSIZE`.  The caller
- * should use `nghttp2_hd_deflate_bound()` to know the upper bound of
- * buffer size required to deflate given header name/value pairs.
- *
- * Once this function fails, subsequent call of this function always
- * returns :enum:`nghttp2_error.NGHTTP2_ERR_HEADER_COMP`.
- *
- * After this function returns, it is safe to delete the |nva|.
- *
- * This function returns the number of bytes written to |buf| if it
- * succeeds, or one of the following negative error codes:
- *
- * :enum:`nghttp2_error.NGHTTP2_ERR_NOMEM`
- *     Out of memory.
- * :enum:`nghttp2_error.NGHTTP2_ERR_HEADER_COMP`
- *     Deflation process has failed.
- * :enum:`nghttp2_error.NGHTTP2_ERR_INSUFF_BUFSIZE`
- *     The provided |buflen| size is too small to hold the output.
- */
-NGHTTP2_EXTERN ssize_t nghttp2_hd_deflate_hd(nghttp2_hd_deflater *deflater,
-                                             uint8_t *buf, size_t buflen,
-                                             const nghttp2_nv *nva,
-                                             size_t nvlen);
-
-/**
- * @function
- *
- * Deflates the |nva|, which has the |nvlen| name/value pairs, into
- * the |veclen| size of buf vector |vec|.  The each size of buffer
- * must be set in len field of :type:`nghttp2_vec`.  If and only if
- * one chunk is filled up completely, next chunk will be used.  If
- * |vec| is not large enough to store the deflated header block, this
- * function fails with
- * :enum:`nghttp2_error.NGHTTP2_ERR_INSUFF_BUFSIZE`.  The caller
- * should use `nghttp2_hd_deflate_bound()` to know the upper bound of
- * buffer size required to deflate given header name/value pairs.
- *
- * Once this function fails, subsequent call of this function always
- * returns :enum:`nghttp2_error.NGHTTP2_ERR_HEADER_COMP`.
- *
- * After this function returns, it is safe to delete the |nva|.
- *
- * This function returns the number of bytes written to |vec| if it
- * succeeds, or one of the following negative error codes:
- *
- * :enum:`nghttp2_error.NGHTTP2_ERR_NOMEM`
- *     Out of memory.
- * :enum:`nghttp2_error.NGHTTP2_ERR_HEADER_COMP`
- *     Deflation process has failed.
- * :enum:`nghttp2_error.NGHTTP2_ERR_INSUFF_BUFSIZE`
- *     The provided |buflen| size is too small to hold the output.
- */
-NGHTTP2_EXTERN ssize_t nghttp2_hd_deflate_hd_vec(nghttp2_hd_deflater *deflater,
-                                                 const nghttp2_vec *vec,
-                                                 size_t veclen,
-                                                 const nghttp2_nv *nva,
-                                                 size_t nvlen);
-
-/**
- * @function
- *
- * Returns an upper bound on the compressed size after deflation of
- * |nva| of length |nvlen|.
- */
-NGHTTP2_EXTERN size_t nghttp2_hd_deflate_bound(nghttp2_hd_deflater *deflater,
-                                               const nghttp2_nv *nva,
-                                               size_t nvlen);
-
-/**
- * @function
- *
- * Returns the number of entries that header table of |deflater|
- * contains.  This is the sum of the number of static table and
- * dynamic table, so the return value is at least 61.
- */
-NGHTTP2_EXTERN
-size_t nghttp2_hd_deflate_get_num_table_entries(nghttp2_hd_deflater *deflater);
-
-/**
- * @function
- *
- * Returns the table entry denoted by |idx| from header table of
- * |deflater|.  The |idx| is 1-based, and idx=1 returns first entry of
- * static table.  idx=62 returns first entry of dynamic table if it
- * exists.  Specifying idx=0 is error, and this function returns NULL.
- * If |idx| is strictly greater than the number of entries the tables
- * contain, this function returns NULL.
- */
-NGHTTP2_EXTERN
-const nghttp2_nv *
-nghttp2_hd_deflate_get_table_entry(nghttp2_hd_deflater *deflater, size_t idx);
-
-/**
- * @function
- *
- * Returns the used dynamic table size, including the overhead 32
- * bytes per entry described in RFC 7541.
- */
-NGHTTP2_EXTERN
-size_t nghttp2_hd_deflate_get_dynamic_table_size(nghttp2_hd_deflater *deflater);
-
-/**
- * @function
- *
- * Returns the maximum dynamic table size.
- */
-NGHTTP2_EXTERN
-size_t
-nghttp2_hd_deflate_get_max_dynamic_table_size(nghttp2_hd_deflater *deflater);
-
-struct nghttp2_hd_inflater;
-
-/**
- * @struct
- *
- * HPACK inflater object.
- */
-typedef struct nghttp2_hd_inflater nghttp2_hd_inflater;
-
-/**
- * @function
- *
- * Initializes |*inflater_ptr| for inflating name/values pairs.
- *
- * If this function fails, |*inflater_ptr| is left untouched.
- *
- * This function returns 0 if it succeeds, or one of the following
- * negative error codes:
- *
- * :enum:`nghttp2_error.NGHTTP2_ERR_NOMEM`
- *     Out of memory.
- */
-NGHTTP2_EXTERN int nghttp2_hd_inflate_new(nghttp2_hd_inflater **inflater_ptr);
-
-/**
- * @function
- *
- * Like `nghttp2_hd_inflate_new()`, but with additional custom memory
- * allocator specified in the |mem|.
- *
- * The |mem| can be ``NULL`` and the call is equivalent to
- * `nghttp2_hd_inflate_new()`.
- *
- * This function does not take ownership |mem|.  The application is
- * responsible for freeing |mem|.
- *
- * The library code does not refer to |mem| pointer after this
- * function returns, so the application can safely free it.
- */
-NGHTTP2_EXTERN int nghttp2_hd_inflate_new2(nghttp2_hd_inflater **inflater_ptr,
-                                           nghttp2_mem *mem);
-
-/**
- * @function
- *
- * Deallocates any resources allocated for |inflater|.
- */
-NGHTTP2_EXTERN void nghttp2_hd_inflate_del(nghttp2_hd_inflater *inflater);
-
-/**
- * @function
- *
- * Changes header table size in the |inflater|.  This may trigger
- * eviction in the dynamic table.
- *
- * The |settings_max_dynamic_table_size| should be the value
- * transmitted in SETTINGS_HEADER_TABLE_SIZE.
- *
- * This function must not be called while header block is being
- * inflated.  In other words, this function must be called after
- * initialization of |inflater|, but before calling
- * `nghttp2_hd_inflate_hd2()`, or after
- * `nghttp2_hd_inflate_end_headers()`.  Otherwise,
- * `NGHTTP2_ERR_INVALID_STATE` was returned.
- *
- * This function returns 0 if it succeeds, or one of the following
- * negative error codes:
- *
- * :enum:`nghttp2_error.NGHTTP2_ERR_NOMEM`
- *     Out of memory.
- * :enum:`nghttp2_error.NGHTTP2_ERR_INVALID_STATE`
- *     The function is called while header block is being inflated.
- *     Probably, application missed to call
- *     `nghttp2_hd_inflate_end_headers()`.
- */
-NGHTTP2_EXTERN int
-nghttp2_hd_inflate_change_table_size(nghttp2_hd_inflater *inflater,
-                                     size_t settings_max_dynamic_table_size);
-
-/**
- * @enum
- *
- * The flags for header inflation.
- */
-typedef enum {
-  /**
-   * No flag set.
-   */
-  NGHTTP2_HD_INFLATE_NONE = 0,
-  /**
-   * Indicates all headers were inflated.
-   */
-  NGHTTP2_HD_INFLATE_FINAL = 0x01,
-  /**
-   * Indicates a header was emitted.
-   */
-  NGHTTP2_HD_INFLATE_EMIT = 0x02
-} nghttp2_hd_inflate_flag;
-
-/**
- * @function
- *
- * .. warning::
- *
- *   Deprecated.  Use `nghttp2_hd_inflate_hd2()` instead.
- *
- * Inflates name/value block stored in |in| with length |inlen|.  This
- * function performs decompression.  For each successful emission of
- * header name/value pair,
- * :enum:`nghttp2_hd_inflate_flag.NGHTTP2_HD_INFLATE_EMIT` is set in
- * |*inflate_flags| and name/value pair is assigned to the |nv_out|
- * and the function returns.  The caller must not free the members of
- * |nv_out|.
- *
- * The |nv_out| may include pointers to the memory region in the |in|.
- * The caller must retain the |in| while the |nv_out| is used.
- *
- * The application should call this function repeatedly until the
- * ``(*inflate_flags) & NGHTTP2_HD_INFLATE_FINAL`` is nonzero and
- * return value is non-negative.  This means the all input values are
- * processed successfully.  Then the application must call
- * `nghttp2_hd_inflate_end_headers()` to prepare for the next header
- * block input.
- *
- * The caller can feed complete compressed header block.  It also can
- * feed it in several chunks.  The caller must set |in_final| to
- * nonzero if the given input is the last block of the compressed
- * header.
- *
- * This function returns the number of bytes processed if it succeeds,
- * or one of the following negative error codes:
- *
- * :enum:`nghttp2_error.NGHTTP2_ERR_NOMEM`
- *     Out of memory.
- * :enum:`nghttp2_error.NGHTTP2_ERR_HEADER_COMP`
- *     Inflation process has failed.
- * :enum:`nghttp2_error.NGHTTP2_ERR_BUFFER_ERROR`
- *     The header field name or value is too large.
- *
- * Example follows::
- *
- *     int inflate_header_block(nghttp2_hd_inflater *hd_inflater,
- *                              uint8_t *in, size_t inlen, int final)
- *     {
- *         ssize_t rv;
- *
- *         for(;;) {
- *             nghttp2_nv nv;
- *             int inflate_flags = 0;
- *
- *             rv = nghttp2_hd_inflate_hd(hd_inflater, &nv, &inflate_flags,
- *                                        in, inlen, final);
- *
- *             if(rv < 0) {
- *                 fprintf(stderr, "inflate failed with error code %zd", rv);
- *                 return -1;
- *             }
- *
- *             in += rv;
- *             inlen -= rv;
- *
- *             if(inflate_flags & NGHTTP2_HD_INFLATE_EMIT) {
- *                 fwrite(nv.name, nv.namelen, 1, stderr);
- *                 fprintf(stderr, ": ");
- *                 fwrite(nv.value, nv.valuelen, 1, stderr);
- *                 fprintf(stderr, "\n");
- *             }
- *             if(inflate_flags & NGHTTP2_HD_INFLATE_FINAL) {
- *                 nghttp2_hd_inflate_end_headers(hd_inflater);
- *                 break;
- *             }
- *             if((inflate_flags & NGHTTP2_HD_INFLATE_EMIT) == 0 &&
- *                inlen == 0) {
- *                break;
- *             }
- *         }
- *
- *         return 0;
- *     }
- *
- */
-NGHTTP2_EXTERN ssize_t nghttp2_hd_inflate_hd(nghttp2_hd_inflater *inflater,
-                                             nghttp2_nv *nv_out,
-                                             int *inflate_flags, uint8_t *in,
-                                             size_t inlen, int in_final);
-
-/**
- * @function
- *
- * Inflates name/value block stored in |in| with length |inlen|.  This
- * function performs decompression.  For each successful emission of
- * header name/value pair,
- * :enum:`nghttp2_hd_inflate_flag.NGHTTP2_HD_INFLATE_EMIT` is set in
- * |*inflate_flags| and name/value pair is assigned to the |nv_out|
- * and the function returns.  The caller must not free the members of
- * |nv_out|.
- *
- * The |nv_out| may include pointers to the memory region in the |in|.
- * The caller must retain the |in| while the |nv_out| is used.
- *
- * The application should call this function repeatedly until the
- * ``(*inflate_flags) & NGHTTP2_HD_INFLATE_FINAL`` is nonzero and
- * return value is non-negative.  If that happens, all given input
- * data (|inlen| bytes) are processed successfully.  Then the
- * application must call `nghttp2_hd_inflate_end_headers()` to prepare
- * for the next header block input.
- *
- * In other words, if |in_final| is nonzero, and this function returns
- * |inlen|, you can assert that
- * :enum:`nghttp2_hd_inflate_final.NGHTTP2_HD_INFLATE_FINAL` is set in
- * |*inflate_flags|.
- *
- * The caller can feed complete compressed header block.  It also can
- * feed it in several chunks.  The caller must set |in_final| to
- * nonzero if the given input is the last block of the compressed
- * header.
- *
- * This function returns the number of bytes processed if it succeeds,
- * or one of the following negative error codes:
- *
- * :enum:`nghttp2_error.NGHTTP2_ERR_NOMEM`
- *     Out of memory.
- * :enum:`nghttp2_error.NGHTTP2_ERR_HEADER_COMP`
- *     Inflation process has failed.
- * :enum:`nghttp2_error.NGHTTP2_ERR_BUFFER_ERROR`
- *     The header field name or value is too large.
- *
- * Example follows::
- *
- *     int inflate_header_block(nghttp2_hd_inflater *hd_inflater,
- *                              uint8_t *in, size_t inlen, int final)
- *     {
- *         ssize_t rv;
- *
- *         for(;;) {
- *             nghttp2_nv nv;
- *             int inflate_flags = 0;
- *
- *             rv = nghttp2_hd_inflate_hd2(hd_inflater, &nv, &inflate_flags,
- *                                         in, inlen, final);
- *
- *             if(rv < 0) {
- *                 fprintf(stderr, "inflate failed with error code %zd", rv);
- *                 return -1;
- *             }
- *
- *             in += rv;
- *             inlen -= rv;
- *
- *             if(inflate_flags & NGHTTP2_HD_INFLATE_EMIT) {
- *                 fwrite(nv.name, nv.namelen, 1, stderr);
- *                 fprintf(stderr, ": ");
- *                 fwrite(nv.value, nv.valuelen, 1, stderr);
- *                 fprintf(stderr, "\n");
- *             }
- *             if(inflate_flags & NGHTTP2_HD_INFLATE_FINAL) {
- *                 nghttp2_hd_inflate_end_headers(hd_inflater);
- *                 break;
- *             }
- *             if((inflate_flags & NGHTTP2_HD_INFLATE_EMIT) == 0 &&
- *                inlen == 0) {
- *                break;
- *             }
- *         }
- *
- *         return 0;
- *     }
- *
- */
-NGHTTP2_EXTERN ssize_t nghttp2_hd_inflate_hd2(nghttp2_hd_inflater *inflater,
-                                              nghttp2_nv *nv_out,
-                                              int *inflate_flags,
-                                              const uint8_t *in, size_t inlen,
-                                              int in_final);
-
-/**
- * @function
- *
- * Signals the end of decompression for one header block.
- *
- * This function returns 0 if it succeeds. Currently this function
- * always succeeds.
- */
-NGHTTP2_EXTERN int
-nghttp2_hd_inflate_end_headers(nghttp2_hd_inflater *inflater);
-
-/**
- * @function
- *
- * Returns the number of entries that header table of |inflater|
- * contains.  This is the sum of the number of static table and
- * dynamic table, so the return value is at least 61.
- */
-NGHTTP2_EXTERN
-size_t nghttp2_hd_inflate_get_num_table_entries(nghttp2_hd_inflater *inflater);
-
-/**
- * @function
- *
- * Returns the table entry denoted by |idx| from header table of
- * |inflater|.  The |idx| is 1-based, and idx=1 returns first entry of
- * static table.  idx=62 returns first entry of dynamic table if it
- * exists.  Specifying idx=0 is error, and this function returns NULL.
- * If |idx| is strictly greater than the number of entries the tables
- * contain, this function returns NULL.
- */
-NGHTTP2_EXTERN
-const nghttp2_nv *
-nghttp2_hd_inflate_get_table_entry(nghttp2_hd_inflater *inflater, size_t idx);
-
-/**
- * @function
- *
- * Returns the used dynamic table size, including the overhead 32
- * bytes per entry described in RFC 7541.
- */
-NGHTTP2_EXTERN
-size_t nghttp2_hd_inflate_get_dynamic_table_size(nghttp2_hd_inflater *inflater);
-
-/**
- * @function
- *
- * Returns the maximum dynamic table size.
- */
-NGHTTP2_EXTERN
-size_t
-nghttp2_hd_inflate_get_max_dynamic_table_size(nghttp2_hd_inflater *inflater);
-
-struct nghttp2_stream;
-
-/**
- * @struct
- *
- * The structure to represent HTTP/2 stream.  The details of this
- * structure are intentionally hidden from the public API.
- */
-typedef struct nghttp2_stream nghttp2_stream;
-
-/**
- * @function
- *
- * Returns pointer to :type:`nghttp2_stream` object denoted by
- * |stream_id|.  If stream was not found, returns NULL.
- *
- * Returns imaginary root stream (see
- * `nghttp2_session_get_root_stream()`) if 0 is given in |stream_id|.
- *
- * Unless |stream_id| == 0, the returned pointer is valid until next
- * call of `nghttp2_session_send()`, `nghttp2_session_mem_send()`,
- * `nghttp2_session_recv()`, and `nghttp2_session_mem_recv()`.
- */
-NGHTTP2_EXTERN nghttp2_stream *
-nghttp2_session_find_stream(nghttp2_session *session, int32_t stream_id);
-
-/**
- * @enum
- *
- * State of stream as described in RFC 7540.
- */
-typedef enum {
-  /**
-   * idle state.
-   */
-  NGHTTP2_STREAM_STATE_IDLE = 1,
-  /**
-   * open state.
-   */
-  NGHTTP2_STREAM_STATE_OPEN,
-  /**
-   * reserved (local) state.
-   */
-  NGHTTP2_STREAM_STATE_RESERVED_LOCAL,
-  /**
-   * reserved (remote) state.
-   */
-  NGHTTP2_STREAM_STATE_RESERVED_REMOTE,
-  /**
-   * half closed (local) state.
-   */
-  NGHTTP2_STREAM_STATE_HALF_CLOSED_LOCAL,
-  /**
-   * half closed (remote) state.
-   */
-  NGHTTP2_STREAM_STATE_HALF_CLOSED_REMOTE,
-  /**
-   * closed state.
-   */
-  NGHTTP2_STREAM_STATE_CLOSED
-} nghttp2_stream_proto_state;
-
-/**
- * @function
- *
- * Returns state of |stream|.  The root stream retrieved by
- * `nghttp2_session_get_root_stream()` will have stream state
- * :enum:`nghttp2_stream_proto_state.NGHTTP2_STREAM_STATE_IDLE`.
- */
-NGHTTP2_EXTERN nghttp2_stream_proto_state
-nghttp2_stream_get_state(nghttp2_stream *stream);
-
-/**
- * @function
- *
- * Returns root of dependency tree, which is imaginary stream with
- * stream ID 0.  The returned pointer is valid until |session| is
- * freed by `nghttp2_session_del()`.
- */
-NGHTTP2_EXTERN nghttp2_stream *
-nghttp2_session_get_root_stream(nghttp2_session *session);
-
-/**
- * @function
- *
- * Returns the parent stream of |stream| in dependency tree.  Returns
- * NULL if there is no such stream.
- */
-NGHTTP2_EXTERN nghttp2_stream *
-nghttp2_stream_get_parent(nghttp2_stream *stream);
-
-NGHTTP2_EXTERN int32_t nghttp2_stream_get_stream_id(nghttp2_stream *stream);
-
-/**
- * @function
- *
- * Returns the next sibling stream of |stream| in dependency tree.
- * Returns NULL if there is no such stream.
- */
-NGHTTP2_EXTERN nghttp2_stream *
-nghttp2_stream_get_next_sibling(nghttp2_stream *stream);
-
-/**
- * @function
- *
- * Returns the previous sibling stream of |stream| in dependency tree.
- * Returns NULL if there is no such stream.
- */
-NGHTTP2_EXTERN nghttp2_stream *
-nghttp2_stream_get_previous_sibling(nghttp2_stream *stream);
-
-/**
- * @function
- *
- * Returns the first child stream of |stream| in dependency tree.
- * Returns NULL if there is no such stream.
- */
-NGHTTP2_EXTERN nghttp2_stream *
-nghttp2_stream_get_first_child(nghttp2_stream *stream);
-
-/**
- * @function
- *
- * Returns dependency weight to the parent stream of |stream|.
- */
-NGHTTP2_EXTERN int32_t nghttp2_stream_get_weight(nghttp2_stream *stream);
-
-/**
- * @function
- *
- * Returns the sum of the weight for |stream|'s children.
- */
-NGHTTP2_EXTERN int32_t
-nghttp2_stream_get_sum_dependency_weight(nghttp2_stream *stream);
-
-/**
- * @functypedef
- *
- * Callback function invoked when the library outputs debug logging.
- * The function is called with arguments suitable for ``vfprintf(3)``
- *
- * The debug output is only enabled if the library is built with
- * ``DEBUGBUILD`` macro defined.
- */
-typedef void (*nghttp2_debug_vprintf_callback)(const char *format,
-                                               va_list args);
-
-/**
- * @function
- *
- * Sets a debug output callback called by the library when built with
- * ``DEBUGBUILD`` macro defined.  If this option is not used, debug
- * log is written into standard error output.
- *
- * For builds without ``DEBUGBUILD`` macro defined, this function is
- * noop.
- *
- * Note that building with ``DEBUGBUILD`` may cause significant
- * performance penalty to libnghttp2 because of extra processing.  It
- * should be used for debugging purpose only.
- *
- * .. Warning::
- *
- *   Building with ``DEBUGBUILD`` may cause significant performance
- *   penalty to libnghttp2 because of extra processing.  It should be
- *   used for debugging purpose only.  We write this two times because
- *   this is important.
- */
-NGHTTP2_EXTERN void nghttp2_set_debug_vprintf_callback(
-    nghttp2_debug_vprintf_callback debug_vprintf_callback);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* NGHTTP2_H */

gpac-2.2.1.tar.gz/extra_lib/include/nghttp2/nghttp2ver.h Deleted

@@ -1,42 +0,0 @@
-/*
- * nghttp2 - HTTP/2 C Library
- *
- * Copyright (c) 2012, 2013 Tatsuhiro Tsujikawa
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#ifndef NGHTTP2VER_H
-#define NGHTTP2VER_H
-
-/**
- * @macro
- * Version number of the nghttp2 library release
- */
-#define NGHTTP2_VERSION "1.43.90"
-
-/**
- * @macro
- * Numerical representation of the version number of the nghttp2 library
- * release. This is a 24 bit number with 8 bits for major number, 8 bits
- * for minor and 8 bits for patch. Version 1.2.3 becomes 0x010203.
- */
-#define NGHTTP2_VERSION_NUM 0x012b5a
-
-#endif /* NGHTTP2VER_H */

gpac-2.2.1.tar.gz/extra_lib/include/ogg Deleted

gpac-2.2.1.tar.gz/extra_lib/include/ogg/ogg.h Deleted

@@ -1,202 +0,0 @@
-/********************************************************************
- *                                                                  *
- * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE.   *
- * USE, DISTRIBUTION AND REPRODUCTION OF THIS LIBRARY SOURCE IS     *
- * GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE *
- * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.       *
- *                                                                  *
- * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2002             *
- * by the Xiph.Org Foundation http://www.xiph.org/                  *
- *                                                                  *
- ********************************************************************
-
- function: toplevel libogg include
- last mod: $Id: ogg.h,v 1.2 2008-12-02 18:04:43 jeanlf Exp $
-
- ********************************************************************/
-#ifndef _OGG_H
-#define _OGG_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <ogg/os_types.h>
-
-typedef struct {
-  long endbyte;
-  int  endbit;
-
-  unsigned char *buffer;
-  unsigned char *ptr;
-  long storage;
-} oggpack_buffer;
-
-/* ogg_page is used to encapsulate the data in one Ogg bitstream page *****/
-
-typedef struct {
-  unsigned char *header;
-  long header_len;
-  unsigned char *body;
-  long body_len;
-} ogg_page;
-
-/* ogg_stream_state contains the current encode/decode state of a logical
-   Ogg bitstream **********************************************************/
-
-typedef struct {
-  unsigned char   *body_data;    /* bytes from packet bodies */
-  long    body_storage;          /* storage elements allocated */
-  long    body_fill;             /* elements stored; fill mark */
-  long    body_returned;         /* elements of fill returned */
-
-
-  int     *lacing_vals;      /* The values that will go to the segment table */
-  ogg_int64_t *granule_vals; /* granulepos values for headers. Not compact
-				this way, but it is simple coupled to the
-				lacing fifo */
-  long    lacing_storage;
-  long    lacing_fill;
-  long    lacing_packet;
-  long    lacing_returned;
-
-  unsigned char    header282;      /* working space for header encode */
-  int              header_fill;
-
-  int     e_o_s;          /* set when we have buffered the last packet in the
-                             logical bitstream */
-  int     b_o_s;          /* set after we've written the initial page
-                             of a logical bitstream */
-  long    serialno;
-  long    pageno;
-  ogg_int64_t  packetno;      /* sequence number for decode; the framing
-                             knows where there's a hole in the data,
-                             but we need coupling so that the codec
-                             (which is in a seperate abstraction
-                             layer) also knows about the gap */
-  ogg_int64_t   granulepos;
-
-} ogg_stream_state;
-
-/* ogg_packet is used to encapsulate the data and metadata belonging
-   to a single raw Ogg/Vorbis packet *************************************/
-
-typedef struct {
-  unsigned char *packet;
-  long  bytes;
-  long  b_o_s;
-  long  e_o_s;
-
-  ogg_int64_t  granulepos;
-  
-  ogg_int64_t  packetno;     /* sequence number for decode; the framing
-				knows where there's a hole in the data,
-				but we need coupling so that the codec
-				(which is in a seperate abstraction
-				layer) also knows about the gap */
-} ogg_packet;
-
-typedef struct {
-  unsigned char *data;
-  int storage;
-  int fill;
-  int returned;
-
-  int unsynced;
-  int headerbytes;
-  int bodybytes;
-} ogg_sync_state;
-
-/* Ogg BITSTREAM PRIMITIVES: bitstream ************************/
-
-extern void  oggpack_writeinit(oggpack_buffer *b);
-extern void  oggpack_writetrunc(oggpack_buffer *b,long bits);
-extern void  oggpack_writealign(oggpack_buffer *b);
-extern void  oggpack_writecopy(oggpack_buffer *b,void *source,long bits);
-extern void  oggpack_reset(oggpack_buffer *b);
-extern void  oggpack_writeclear(oggpack_buffer *b);
-extern void  oggpack_readinit(oggpack_buffer *b,unsigned char *buf,int bytes);
-extern void  oggpack_write(oggpack_buffer *b,unsigned long value,int bits);
-extern long  oggpack_look(oggpack_buffer *b,int bits);
-extern long  oggpack_look1(oggpack_buffer *b);
-extern void  oggpack_adv(oggpack_buffer *b,int bits);
-extern void  oggpack_adv1(oggpack_buffer *b);
-extern long  oggpack_read(oggpack_buffer *b,int bits);
-extern long  oggpack_read1(oggpack_buffer *b);
-extern long  oggpack_bytes(oggpack_buffer *b);
-extern long  oggpack_bits(oggpack_buffer *b);
-extern unsigned char *oggpack_get_buffer(oggpack_buffer *b);
-
-extern void  oggpackB_writeinit(oggpack_buffer *b);
-extern void  oggpackB_writetrunc(oggpack_buffer *b,long bits);
-extern void  oggpackB_writealign(oggpack_buffer *b);
-extern void  oggpackB_writecopy(oggpack_buffer *b,void *source,long bits);
-extern void  oggpackB_reset(oggpack_buffer *b);
-extern void  oggpackB_writeclear(oggpack_buffer *b);
-extern void  oggpackB_readinit(oggpack_buffer *b,unsigned char *buf,int bytes);
-extern void  oggpackB_write(oggpack_buffer *b,unsigned long value,int bits);
-extern long  oggpackB_look(oggpack_buffer *b,int bits);
-extern long  oggpackB_look1(oggpack_buffer *b);
-extern void  oggpackB_adv(oggpack_buffer *b,int bits);
-extern void  oggpackB_adv1(oggpack_buffer *b);
-extern long  oggpackB_read(oggpack_buffer *b,int bits);
-extern long  oggpackB_read1(oggpack_buffer *b);
-extern long  oggpackB_bytes(oggpack_buffer *b);
-extern long  oggpackB_bits(oggpack_buffer *b);
-extern unsigned char *oggpackB_get_buffer(oggpack_buffer *b);
-
-/* Ogg BITSTREAM PRIMITIVES: encoding **************************/
-
-extern int      ogg_stream_packetin(ogg_stream_state *os, ogg_packet *op);
-extern int      ogg_stream_pageout(ogg_stream_state *os, ogg_page *og);
-extern int      ogg_stream_flush(ogg_stream_state *os, ogg_page *og);
-
-/* Ogg BITSTREAM PRIMITIVES: decoding **************************/
-
-extern int      ogg_sync_init(ogg_sync_state *oy);
-extern int      ogg_sync_clear(ogg_sync_state *oy);
-extern int      ogg_sync_reset(ogg_sync_state *oy);
-extern int	ogg_sync_destroy(ogg_sync_state *oy);
-
-extern char    *ogg_sync_buffer(ogg_sync_state *oy, long size);
-extern int      ogg_sync_wrote(ogg_sync_state *oy, long bytes);
-extern long     ogg_sync_pageseek(ogg_sync_state *oy,ogg_page *og);
-extern int      ogg_sync_pageout(ogg_sync_state *oy, ogg_page *og);
-extern int      ogg_stream_pagein(ogg_stream_state *os, ogg_page *og);
-extern int      ogg_stream_packetout(ogg_stream_state *os,ogg_packet *op);
-extern int      ogg_stream_packetpeek(ogg_stream_state *os,ogg_packet *op);
-
-/* Ogg BITSTREAM PRIMITIVES: general ***************************/
-
-extern int      ogg_stream_init(ogg_stream_state *os,int serialno);
-extern int      ogg_stream_clear(ogg_stream_state *os);
-extern int      ogg_stream_reset(ogg_stream_state *os);
-extern int      ogg_stream_reset_serialno(ogg_stream_state *os,int serialno);
-extern int      ogg_stream_destroy(ogg_stream_state *os);
-extern int      ogg_stream_eos(ogg_stream_state *os);
-
-extern void     ogg_page_checksum_set(ogg_page *og);
-
-extern int      ogg_page_version(ogg_page *og);
-extern int      ogg_page_continued(ogg_page *og);
-extern int      ogg_page_bos(ogg_page *og);
-extern int      ogg_page_eos(ogg_page *og);
-extern ogg_int64_t  ogg_page_granulepos(ogg_page *og);
-extern int      ogg_page_serialno(ogg_page *og);
-extern long     ogg_page_pageno(ogg_page *og);
-extern int      ogg_page_packets(ogg_page *og);
-
-extern void     ogg_packet_clear(ogg_packet *op);
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif  /* _OGG_H */
-
-
-
-
-
-

gpac-2.2.1.tar.gz/extra_lib/include/ogg/os_types.h Deleted

@@ -1,127 +0,0 @@
-/********************************************************************
- *                                                                  *
- * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE.   *
- * USE, DISTRIBUTION AND REPRODUCTION OF THIS LIBRARY SOURCE IS     *
- * GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE *
- * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.       *
- *                                                                  *
- * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2002             *
- * by the Xiph.Org Foundation http://www.xiph.org/                  *
- *                                                                  *
- ********************************************************************
-
- function: #ifdef jail to whip a few platforms into the UNIX ideal.
- last mod: $Id: os_types.h,v 1.2 2008-12-02 18:04:43 jeanlf Exp $
-
- ********************************************************************/
-#ifndef _OS_TYPES_H
-#define _OS_TYPES_H
-
-/* make it easy on the folks that want to compile the libs with a
-   different malloc than stdlib */
-#define _ogg_malloc  malloc
-#define _ogg_calloc  calloc
-#define _ogg_realloc realloc
-#define _ogg_free    free
-
-#if defined(_WIN32) 
-
-#  if defined(__CYGWIN__)
-#    include <_G_config.h>
-     typedef _G_int64_t ogg_int64_t;
-     typedef _G_int32_t ogg_int32_t;
-     typedef _G_uint32_t ogg_uint32_t;
-     typedef _G_int16_t ogg_int16_t;
-     typedef _G_uint16_t ogg_uint16_t;
-#  elif defined(__MINGW32__)
-     typedef short ogg_int16_t;                                                                             
-     typedef unsigned short ogg_uint16_t;                                                                   
-     typedef int ogg_int32_t;                                                                               
-     typedef unsigned int ogg_uint32_t;                                                                     
-     typedef long long ogg_int64_t;                                                                         
-     typedef unsigned long long ogg_uint64_t;  
-#  elif defined(__MWERKS__)
-     typedef long long ogg_int64_t;
-     typedef int ogg_int32_t;
-     typedef unsigned int ogg_uint32_t;
-     typedef short ogg_int16_t;
-     typedef unsigned short ogg_uint16_t;
-#  else
-     /* MSVC/Borland */
-     typedef __int64 ogg_int64_t;
-     typedef __int32 ogg_int32_t;
-     typedef unsigned __int32 ogg_uint32_t;
-     typedef __int16 ogg_int16_t;
-     typedef unsigned __int16 ogg_uint16_t;
-#  endif
-
-#elif defined(__MACOS__)
-
-#  include <sys/types.h>
-   typedef SInt16 ogg_int16_t;
-   typedef UInt16 ogg_uint16_t;
-   typedef SInt32 ogg_int32_t;
-   typedef UInt32 ogg_uint32_t;
-   typedef SInt64 ogg_int64_t;
-
-#elif defined(__MACOSX__) /* MacOS X Framework build */
-
-#  include <sys/types.h>
-   typedef int16_t ogg_int16_t;
-   typedef u_int16_t ogg_uint16_t;
-   typedef int32_t ogg_int32_t;
-   typedef u_int32_t ogg_uint32_t;
-   typedef int64_t ogg_int64_t;
-
-#elif defined(__BEOS__)
-
-   /* Be */
-#  include <inttypes.h>
-   typedef int16_t ogg_int16_t;
-   typedef u_int16_t ogg_uint16_t;
-   typedef int32_t ogg_int32_t;
-   typedef u_int32_t ogg_uint32_t;
-   typedef int64_t ogg_int64_t;
-
-#elif defined (__EMX__)
-
-   /* OS/2 GCC */
-   typedef short ogg_int16_t;
-   typedef unsigned short ogg_uint16_t;
-   typedef int ogg_int32_t;
-   typedef unsigned int ogg_uint32_t;
-   typedef long long ogg_int64_t;
-
-#elif defined (DJGPP)
-
-   /* DJGPP */
-   typedef short ogg_int16_t;
-   typedef int ogg_int32_t;
-   typedef unsigned int ogg_uint32_t;
-   typedef long long ogg_int64_t;
-
-#elif defined(R5900)
-
-   /* PS2 EE */
-   typedef long ogg_int64_t;
-   typedef int ogg_int32_t;
-   typedef unsigned ogg_uint32_t;
-   typedef short ogg_int16_t;
-
-#elif defined(__SYMBIAN32__)
-
-   /* Symbian GCC */
-   typedef signed short ogg_int16_t;
-   typedef unsigned short ogg_uint16_t;
-   typedef signed int ogg_int32_t;
-   typedef unsigned int ogg_uint32_t;
-   typedef long long int ogg_int64_t;
-
-#else
-
-#  include <sys/types.h>
-#  include <ogg/config_types.h>
-
-#endif
-
-#endif  /* _OS_TYPES_H */

gpac-2.2.1.tar.gz/extra_lib/include/openjpeg Deleted

gpac-2.2.1.tar.gz/extra_lib/include/openjpeg/openjpeg.h Deleted

@@ -1,911 +0,0 @@
- /*
- * Copyright (c) 2002-2007, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
- * Copyright (c) 2002-2007, Professor Benoit Macq
- * Copyright (c) 2001-2003, David Janssens
- * Copyright (c) 2002-2003, Yannick Verschueren
- * Copyright (c) 2003-2007, Francois-Olivier Devaux and Antonin Descampe
- * Copyright (c) 2005, Herve Drolon, FreeImage Team
- * Copyright (c) 2006-2007, Parvatha Elangovan
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS `AS IS'
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-#ifndef OPENJPEG_H
-#define OPENJPEG_H
-
-#define OPENJPEG_VERSION "1.3.0"
-
-/* 
-==========================================================
-   Compiler directives
-==========================================================
-*/
-
-#if defined(OPJ_STATIC) || !(defined(WIN32) || defined(__WIN32__))
-#define OPJ_API
-#define OPJ_CALLCONV
-#else
-#define OPJ_CALLCONV __stdcall
-/*
-The following ifdef block is the standard way of creating macros which make exporting 
-from a DLL simpler. All files within this DLL are compiled with the OPJ_EXPORTS
-symbol defined on the command line. this symbol should not be defined on any project
-that uses this DLL. This way any other project whose source files include this file see 
-OPJ_API functions as being imported from a DLL, wheras this DLL sees symbols
-defined with this macro as being exported.
-*/
-#ifdef OPJ_EXPORTS
-#define OPJ_API __declspec(dllexport)
-#else
-#define OPJ_API __declspec(dllimport)
-#endif /* OPJ_EXPORTS */
-#endif /* !OPJ_STATIC || !WIN32 */
-
-#ifndef __cplusplus
-#if defined(HAVE_STDBOOL_H)
-/*
-The C language implementation does correctly provide the standard header
-file "stdbool.h".
- */
-#include <stdbool.h>
-#else
-/*
-The C language implementation does not provide the standard header file
-"stdbool.h" as required by ISO/IEC 9899:1999.  Try to compensate for this
-braindamage below.
-*/
-#if !defined(bool)
-#define	bool	int
-#endif
-#if !defined(true)
-#define true	1
-#endif
-#if !defined(false)
-#define	false	0
-#endif
-#endif
-#endif /* __cplusplus */
-
-/* 
-==========================================================
-   Useful constant definitions
-==========================================================
-*/
-
-#define OPJ_PATH_LEN 4096 /**< Maximum allowed size for filenames */
-
-#define J2K_MAXRLVLS 33					/**< Number of maximum resolution level authorized */
-#define J2K_MAXBANDS (3*J2K_MAXRLVLS-2)	/**< Number of maximum sub-band linked to number of resolution level */
-
-/* UniPG>> */
-#define JPWL_MAX_NO_TILESPECS	16 /**< Maximum number of tile parts expected by JPWL: increase at your will */
-#define JPWL_MAX_NO_PACKSPECS	16 /**< Maximum number of packet parts expected by JPWL: increase at your will */
-#define JPWL_MAX_NO_MARKERS	512 /**< Maximum number of JPWL markers: increase at your will */
-#define JPWL_PRIVATEINDEX_NAME "jpwl_index_privatefilename" /**< index file name used when JPWL is on */
-#define JPWL_EXPECTED_COMPONENTS 3 /**< Expect this number of components, so you'll find better the first EPB */
-#define JPWL_MAXIMUM_TILES 8192 /**< Expect this maximum number of tiles, to avoid some crashes */
-#define JPWL_MAXIMUM_HAMMING 2 /**< Expect this maximum number of bit errors in marker id's */
-#define JPWL_MAXIMUM_EPB_ROOM 65450 /**< Expect this maximum number of bytes for composition of EPBs */
-/* <<UniPG */
-
-/* 
-==========================================================
-   enum definitions
-==========================================================
-*/
-/** 
-Rsiz Capabilities
-*/
-typedef enum RSIZ_CAPABILITIES {
-	STD_RSIZ = 0,		/** Standard JPEG2000 profile*/
-	CINEMA2K = 3,		/** Profile name for a 2K image*/
-	CINEMA4K = 4		/** Profile name for a 4K image*/
-} OPJ_RSIZ_CAPABILITIES;
-
-/** 
-Digital cinema operation mode 
-*/
-typedef enum CINEMA_MODE {
-	OFF = 0,					/** Not Digital Cinema*/
-	CINEMA2K_24 = 1,	/** 2K Digital Cinema at 24 fps*/
-	CINEMA2K_48 = 2,	/** 2K Digital Cinema at 48 fps*/
-	CINEMA4K_24 = 3		/** 4K Digital Cinema at 24 fps*/
-}OPJ_CINEMA_MODE;
-
-/** 
-Progression order 
-*/
-typedef enum PROG_ORDER {
-	PROG_UNKNOWN = -1,	/**< place-holder */
-	LRCP = 0,		/**< layer-resolution-component-precinct order */
-	RLCP = 1,		/**< resolution-layer-component-precinct order */
-	RPCL = 2,		/**< resolution-precinct-component-layer order */
-	PCRL = 3,		/**< precinct-component-resolution-layer order */
-	CPRL = 4		/**< component-precinct-resolution-layer order */
-} OPJ_PROG_ORDER;
-
-/**
-Supported image color spaces
-*/
-typedef enum COLOR_SPACE {
-	CLRSPC_UNKNOWN = -1,	/**< place-holder */
-	CLRSPC_SRGB = 1,		/**< sRGB */
-	CLRSPC_GRAY = 2,		/**< grayscale */
-	CLRSPC_SYCC = 3			/**< YUV */
-} OPJ_COLOR_SPACE;
-
-/**
-Supported codec
-*/
-typedef enum CODEC_FORMAT {
-	CODEC_UNKNOWN = -1,	/**< place-holder */
-	CODEC_J2K = 0,		/**< JPEG-2000 codestream : read/write */
-	CODEC_JPT = 1,		/**< JPT-stream (JPEG 2000, JPIP) : read only */
-	CODEC_JP2 = 2		/**< JPEG-2000 file format : read/write */
-} OPJ_CODEC_FORMAT;
-
-/** 
-Limit decoding to certain portions of the codestream. 
-*/
-typedef enum LIMIT_DECODING {
-	NO_LIMITATION = 0,				  /**< No limitation for the decoding. The entire codestream will de decoded */
-	LIMIT_TO_MAIN_HEADER = 1,		/**< The decoding is limited to the Main Header */
-	DECODE_ALL_BUT_PACKETS = 2	/**< Decode everything except the JPEG 2000 packets */
-} OPJ_LIMIT_DECODING;
-
-/* 
-==========================================================
-   event manager typedef definitions
-==========================================================
-*/
-
-/**
-Callback function prototype for events
-@param msg Event message
-@param client_data 
-*/
-typedef void (*opj_msg_callback) (const char *msg, void *client_data);
-
-/**
-Message handler object
-used for 
-<ul>
-<li>Error messages
-<li>Warning messages
-<li>Debugging messages
-</ul>
-*/
-typedef struct opj_event_mgr {
-	/** Error message callback if available, NULL otherwise */
-	opj_msg_callback error_handler;
-	/** Warning message callback if available, NULL otherwise */
-	opj_msg_callback warning_handler;
-	/** Debug message callback if available, NULL otherwise */
-	opj_msg_callback info_handler;
-} opj_event_mgr_t;
-
-
-/* 
-==========================================================
-   codec typedef definitions
-==========================================================
-*/
-
-/**
-Progression order changes
-*/
-typedef struct opj_poc {
-	/** Resolution num start, Component num start, given by POC */
-	int resno0, compno0;
-	/** Layer num end,Resolution num end, Component num end, given by POC */
-	int layno1, resno1, compno1;
-	/** Layer num start,Precinct num start, Precinct num end */
-	int layno0, precno0, precno1;
-	/** Progression order enum*/
-	OPJ_PROG_ORDER prg1,prg;
-	/** Progression order string*/
-	char progorder5;
-	/** Tile number */
-	int tile;
-	/** Start and end values for Tile width and height*/
-	int tx0,tx1,ty0,ty1;
-	/** Start value, initialised in pi_initialise_encode*/
-	int layS, resS, compS, prcS;
-	/** End value, initialised in pi_initialise_encode */
-	int layE, resE, compE, prcE;
-	/** Start and end values of Tile width and height, initialised in pi_initialise_encode*/
-	int txS,txE,tyS,tyE,dx,dy;
-	/** Temporary values for Tile parts, initialised in pi_create_encode */
-	int lay_t, res_t, comp_t, prc_t,tx0_t,ty0_t;
-} opj_poc_t;
-
-/**
-Compression parameters
-*/
-typedef struct opj_cparameters {
-	/** size of tile: tile_size_on = false (not in argument) or = true (in argument) */
-	bool tile_size_on;
-	/** XTOsiz */
-	int cp_tx0;
-	/** YTOsiz */
-	int cp_ty0;
-	/** XTsiz */
-	int cp_tdx;
-	/** YTsiz */
-	int cp_tdy;
-	/** allocation by rate/distortion */
-	int cp_disto_alloc;
-	/** allocation by fixed layer */
-	int cp_fixed_alloc;
-	/** add fixed_quality */
-	int cp_fixed_quality;
-	/** fixed layer */
-	int *cp_matrice;
-	/** comment for coding */
-	char *cp_comment;
-	/** csty : coding style */
-	int csty;
-	/** progression order (default LRCP) */
-	OPJ_PROG_ORDER prog_order;
-	/** progression order changes */
-	opj_poc_t POC32;
-	/** number of progression order changes (POC), default to 0 */
-	int numpocs;
-	/** number of layers */
-	int tcp_numlayers;
-	/** rates of layers */
-	float tcp_rates100;
-	/** different psnr for successive layers */
-	float tcp_distoratio100;
-	/** number of resolutions */
-	int numresolution;
-	/** initial code block width, default to 64 */
- 	int cblockw_init;
-	/** initial code block height, default to 64 */
-	int cblockh_init;
-	/** mode switch (cblk_style) */
-	int mode;
-	/** 1 : use the irreversible DWT 9-7, 0 : use lossless compression (default) */
-	int irreversible;
-	/** region of interest: affected component in 0..3, -1 means no ROI */
-	int roi_compno;
-	/** region of interest: upshift value */
-	int roi_shift;
-	/* number of precinct size specifications */
-	int res_spec;
-	/** initial precinct width */
-	int prcw_initJ2K_MAXRLVLS;
-	/** initial precinct height */
-	int prch_initJ2K_MAXRLVLS;
-
-	/**@name command line encoder parameters (not used inside the library) */
-	/*@{*/
-	/** input file name */
-	char infileOPJ_PATH_LEN;
-	/** output file name */
-	char outfileOPJ_PATH_LEN;
-	/** DEPRECATED. Index generation is now handeld with the opj_encode_with_info() function. Set to NULL */
-	int index_on;
-	/** DEPRECATED. Index generation is now handeld with the opj_encode_with_info() function. Set to NULL */
-	char indexOPJ_PATH_LEN;
-	/** subimage encoding: origin image offset in x direction */
-	int image_offset_x0;
-	/** subimage encoding: origin image offset in y direction */
-	int image_offset_y0;
-	/** subsampling value for dx */
-	int subsampling_dx;
-	/** subsampling value for dy */
-	int subsampling_dy;
-	/** input file format 0: PGX, 1: PxM, 2: BMP 3:TIF*/
-	int decod_format;
-	/** output file format 0: J2K, 1: JP2, 2: JPT */
-	int cod_format;
-	/*@}*/
-
-/* UniPG>> */
-	/**@name JPWL encoding parameters */
-	/*@{*/
-	/** enables writing of EPC in MH, thus activating JPWL */
-	bool jpwl_epc_on;
-	/** error protection method for MH (0,1,16,32,37-128) */
-	int jpwl_hprot_MH;
-	/** tile number of header protection specification (>=0) */
-	int jpwl_hprot_TPH_tilenoJPWL_MAX_NO_TILESPECS;
-	/** error protection methods for TPHs (0,1,16,32,37-128) */
-	int jpwl_hprot_TPHJPWL_MAX_NO_TILESPECS;
-	/** tile number of packet protection specification (>=0) */
-	int jpwl_pprot_tilenoJPWL_MAX_NO_PACKSPECS;
-	/** packet number of packet protection specification (>=0) */
-	int jpwl_pprot_packnoJPWL_MAX_NO_PACKSPECS;
-	/** error protection methods for packets (0,1,16,32,37-128) */
-	int jpwl_pprotJPWL_MAX_NO_PACKSPECS;
-	/** enables writing of ESD, (0=no/1/2 bytes) */
-	int jpwl_sens_size;
-	/** sensitivity addressing size (0=auto/2/4 bytes) */
-	int jpwl_sens_addr;
-	/** sensitivity range (0-3) */
-	int jpwl_sens_range;
-	/** sensitivity method for MH (-1=no,0-7) */
-	int jpwl_sens_MH;
-	/** tile number of sensitivity specification (>=0) */
-	int jpwl_sens_TPH_tilenoJPWL_MAX_NO_TILESPECS;
-	/** sensitivity methods for TPHs (-1=no,0-7) */
-	int jpwl_sens_TPHJPWL_MAX_NO_TILESPECS;
-	/*@}*/
-/* <<UniPG */
-
-	/** Digital Cinema compliance 0-not compliant, 1-compliant*/
-	OPJ_CINEMA_MODE cp_cinema;
-	/** Maximum rate for each component. If == 0, component size limitation is not considered */
-	int max_comp_size;
-	/** Profile name*/
-	OPJ_RSIZ_CAPABILITIES cp_rsiz;
-	/** Tile part generation*/
-	char tp_on;
-	/** Flag for Tile part generation*/
-	char tp_flag;
-	/** MCT (multiple component transform) */
-	char tcp_mct;
-} opj_cparameters_t;
-
-/**
-Decompression parameters
-*/
-typedef struct opj_dparameters {
-	/** 
-	Set the number of highest resolution levels to be discarded. 
-	The image resolution is effectively divided by 2 to the power of the number of discarded levels. 
-	The reduce factor is limited by the smallest total number of decomposition levels among tiles.
-	if != 0, then original dimension divided by 2^(reduce); 
-	if == 0 or not used, image is decoded to the full resolution 
-	*/
-	int cp_reduce;
-	/** 
-	Set the maximum number of quality layers to decode. 
-	If there are less quality layers than the specified number, all the quality layers are decoded.
-	if != 0, then only the first "layer" layers are decoded; 
-	if == 0 or not used, all the quality layers are decoded 
-	*/
-	int cp_layer;
-
-	/**@name command line encoder parameters (not used inside the library) */
-	/*@{*/
-	/** input file name */
-	char infileOPJ_PATH_LEN;
-	/** output file name */
-	char outfileOPJ_PATH_LEN;
-	/** input file format 0: J2K, 1: JP2, 2: JPT */
-	int decod_format;
-	/** output file format 0: PGX, 1: PxM, 2: BMP */
-	int cod_format;
-	/*@}*/
-
-/* UniPG>> */
-	/**@name JPWL decoding parameters */
-	/*@{*/
-	/** activates the JPWL correction capabilities */
-	bool jpwl_correct;
-	/** expected number of components */
-	int jpwl_exp_comps;
-	/** maximum number of tiles */
-	int jpwl_max_tiles;
-	/*@}*/
-/* <<UniPG */
-
-	/** 
-	Specify whether the decoding should be done on the entire codestream, or be limited to the main header
-	Limiting the decoding to the main header makes it possible to extract the characteristics of the codestream
-	if == NO_LIMITATION, the entire codestream is decoded; 
-	if == LIMIT_TO_MAIN_HEADER, only the main header is decoded; 
-	*/
-	OPJ_LIMIT_DECODING cp_limit_decoding;
-
-} opj_dparameters_t;
-
-/** Common fields between JPEG-2000 compression and decompression master structs. */
-
-#define opj_common_fields \
-	opj_event_mgr_t *event_mgr;	/**< pointer to the event manager */\
-	void * client_data;			/**< Available for use by application */\
-	bool is_decompressor;		/**< So common code can tell which is which */\
-	OPJ_CODEC_FORMAT codec_format;	/**< selected codec */\
-	void *j2k_handle;			/**< pointer to the J2K codec */\
-	void *jp2_handle;			/**< pointer to the JP2 codec */\
-	void *mj2_handle			/**< pointer to the MJ2 codec */
-	
-/* Routines that are to be used by both halves of the library are declared
- * to receive a pointer to this structure.  There are no actual instances of
- * opj_common_struct_t, only of opj_cinfo_t and opj_dinfo_t.
- */
-typedef struct opj_common_struct {
-  opj_common_fields;		/* Fields common to both master struct types */
-  /* Additional fields follow in an actual opj_cinfo_t or
-   * opj_dinfo_t.  All three structs must agree on these
-   * initial fields!  (This would be a lot cleaner in C++.)
-   */
-} opj_common_struct_t;
-
-typedef opj_common_struct_t * opj_common_ptr;
-
-/**
-Compression context info
-*/
-typedef struct opj_cinfo {
-	/** Fields shared with opj_dinfo_t */
-	opj_common_fields;	
-	/* other specific fields go here */
-} opj_cinfo_t;
-
-/**
-Decompression context info
-*/
-typedef struct opj_dinfo {
-	/** Fields shared with opj_cinfo_t */
-	opj_common_fields;	
-	/* other specific fields go here */
-} opj_dinfo_t;
-
-/* 
-==========================================================
-   I/O stream typedef definitions
-==========================================================
-*/
-
-/*
- * Stream open flags.
- */
-/** The stream was opened for reading. */
-#define OPJ_STREAM_READ	0x0001
-/** The stream was opened for writing. */
-#define OPJ_STREAM_WRITE 0x0002
-
-/**
-Byte input-output stream (CIO)
-*/
-typedef struct opj_cio {
-	/** codec context */
-	opj_common_ptr cinfo;
-
-	/** open mode (read/write) either OPJ_STREAM_READ or OPJ_STREAM_WRITE */
-	int openmode;
-	/** pointer to the start of the buffer */
-	unsigned char *buffer;
-	/** buffer size in bytes */
-	int length;
-
-	/** pointer to the start of the stream */
-	unsigned char *start;
-	/** pointer to the end of the stream */
-	unsigned char *end;
-	/** pointer to the current position */
-	unsigned char *bp;
-} opj_cio_t;
-
-/* 
-==========================================================
-   image typedef definitions
-==========================================================
-*/
-
-/**
-Defines a single image component
-*/
-typedef struct opj_image_comp {
-	/** XRsiz: horizontal separation of a sample of ith component with respect to the reference grid */
-	int dx;
-	/** YRsiz: vertical separation of a sample of ith component with respect to the reference grid */
-	int dy;
-	/** data width */
-	int w;
-	/** data height */
-	int h;
-	/** x component offset compared to the whole image */
-	int x0;
-	/** y component offset compared to the whole image */
-	int y0;
-	/** precision */
-	int prec;
-	/** image depth in bits */
-	int bpp;
-	/** signed (1) / unsigned (0) */
-	int sgnd;
-	/** number of decoded resolution */
-	int resno_decoded;
-	/** number of division by 2 of the out image compared to the original size of image */
-	int factor;
-	/** image component data */
-	int *data;
-} opj_image_comp_t;
-
-/** 
-Defines image data and characteristics
-*/
-typedef struct opj_image {
-	/** XOsiz: horizontal offset from the origin of the reference grid to the left side of the image area */
-	int x0;
-	/** YOsiz: vertical offset from the origin of the reference grid to the top side of the image area */
-	int y0;
-	/** Xsiz: width of the reference grid */
-	int x1;
-	/** Ysiz: height of the reference grid */
-	int y1;
-	/** number of components in the image */
-	int numcomps;
-	/** color space: sRGB, Greyscale or YUV */
-	OPJ_COLOR_SPACE color_space;
-	/** image components */
-	opj_image_comp_t *comps;
-} opj_image_t;
-
-/**
-Component parameters structure used by the opj_image_create function
-*/
-typedef struct opj_image_comptparm {
-	/** XRsiz: horizontal separation of a sample of ith component with respect to the reference grid */
-	int dx;
-	/** YRsiz: vertical separation of a sample of ith component with respect to the reference grid */
-	int dy;
-	/** data width */
-	int w;
-	/** data height */
-	int h;
-	/** x component offset compared to the whole image */
-	int x0;
-	/** y component offset compared to the whole image */
-	int y0;
-	/** precision */
-	int prec;
-	/** image depth in bits */
-	int bpp;
-	/** signed (1) / unsigned (0) */
-	int sgnd;
-} opj_image_cmptparm_t;
-
-/* 
-==========================================================
-   Information on the JPEG 2000 codestream
-==========================================================
-*/
-
-/**
-Index structure : Information concerning a packet inside tile
-*/
-typedef struct opj_packet_info {
-	/** packet start position (including SOP marker if it exists) */
-	int start_pos;
-	/** end of packet header position (including EPH marker if it exists)*/
-	int end_ph_pos;
-	/** packet end position */
-	int end_pos;
-	/** packet distorsion */
-	double disto;
-} opj_packet_info_t;
-
-/**
-Index structure : Information concerning tile-parts
-*/
-typedef struct opj_tp_info {
-	/** start position of tile part */
-	int tp_start_pos;
-	/** end position of tile part header */
-	int tp_end_header;
-	/** end position of tile part */
-	int tp_end_pos;
-	/** start packet of tile part */
-	int tp_start_pack;
-	/** number of packets of tile part */
-	int tp_numpacks;
-} opj_tp_info_t;
-
-/**
-Index structure : information regarding tiles 
-*/
-typedef struct opj_tile_info {
-	/** value of thresh for each layer by tile cfr. Marcela   */
-	double *thresh;
-	/** number of tile */
-	int tileno;
-	/** start position */
-	int start_pos;
-	/** end position of the header */
-	int end_header;
-	/** end position */
-	int end_pos;
-	/** precinct number for each resolution level (width) */
-	int pw33;
-	/** precinct number for each resolution level (height) */
-	int ph33;
-	/** precinct size (in power of 2), in X for each resolution level */
-	int pdx33;
-	/** precinct size (in power of 2), in Y for each resolution level */
-	int pdy33;
-	/** information concerning packets inside tile */
-	opj_packet_info_t *packet;
-	/** add fixed_quality */
-	int numpix;
-	/** add fixed_quality */
-	double distotile;
-	/** number of tile parts */
-	int num_tps;
-	/** information concerning tile parts */
-	opj_tp_info_t *tp;
-} opj_tile_info_t;
-
-/* UniPG>> */
-/**
-Marker structure
-*/
-typedef struct opj_marker_info_t {
-	/** marker type */
-	unsigned short int type;
-	/** position in codestream */
-	int pos;
-	/** length, marker val included */
-	int len;
-} opj_marker_info_t;
-/* <<UniPG */
-
-/**
-Index structure of the codestream
-*/
-typedef struct opj_codestream_info {
-	/** maximum distortion reduction on the whole image (add for Marcela) */
-	double D_max;
-	/** packet number */
-	int packno;
-	/** writing the packet in the index with t2_encode_packets */
-	int index_write;
-	/** image width */
-	int image_w;
-	/** image height */
-	int image_h;
-	/** progression order */
-	OPJ_PROG_ORDER prog;
-	/** tile size in x */
-	int tile_x;
-	/** tile size in y */
-	int tile_y;
-	/** */
-	int tile_Ox;
-	/** */
-	int tile_Oy;
-	/** number of tiles in X */
-	int tw;
-	/** number of tiles in Y */
-	int th;
-	/** component numbers */
-	int numcomps;
-	/** number of layer */
-	int numlayers;
-	/** number of decomposition for each component */
-	int *numdecompos;
-/* UniPG>> */
-	/** number of markers */
-	int marknum;
-	/** list of markers */
-	opj_marker_info_t *marker;
-	/** actual size of markers array */
-	int maxmarknum;
-/* <<UniPG */
-	/** main header position */
-	int main_head_start;
-	/** main header position */
-	int main_head_end;
-	/** codestream's size */
-	int codestream_size;
-	/** information regarding tiles inside image */
-	opj_tile_info_t *tile;
-} opj_codestream_info_t;
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-/* 
-==========================================================
-   openjpeg version
-==========================================================
-*/
-
-OPJ_API const char * OPJ_CALLCONV opj_version(void);
-
-/* 
-==========================================================
-   image functions definitions
-==========================================================
-*/
-
-/**
-Create an image
-@param numcmpts number of components
-@param cmptparms components parameters
-@param clrspc image color space
-@return returns a new image structure if successful, returns NULL otherwise
-*/
-OPJ_API opj_image_t* OPJ_CALLCONV opj_image_create(int numcmpts, opj_image_cmptparm_t *cmptparms, OPJ_COLOR_SPACE clrspc);
-
-/**
-Deallocate any resources associated with an image
-@param image image to be destroyed
-*/
-OPJ_API void OPJ_CALLCONV opj_image_destroy(opj_image_t *image);
-
-/* 
-==========================================================
-   stream functions definitions
-==========================================================
-*/
-
-/**
-Open and allocate a memory stream for read / write. 
-On reading, the user must provide a buffer containing encoded data. The buffer will be 
-wrapped by the returned CIO handle. 
-On writing, buffer parameters must be set to 0: a buffer will be allocated by the library 
-to contain encoded data. 
-@param cinfo Codec context info
-@param buffer Reading: buffer address. Writing: NULL
-@param length Reading: buffer length. Writing: 0
-@return Returns a CIO handle if successful, returns NULL otherwise
-*/
-OPJ_API opj_cio_t* OPJ_CALLCONV opj_cio_open(opj_common_ptr cinfo, unsigned char *buffer, int length);
-
-/**
-Close and free a CIO handle
-@param cio CIO handle to free
-*/
-OPJ_API void OPJ_CALLCONV opj_cio_close(opj_cio_t *cio);
-
-/**
-Get position in byte stream
-@param cio CIO handle
-@return Returns the position in bytes
-*/
-OPJ_API int OPJ_CALLCONV cio_tell(opj_cio_t *cio);
-/**
-Set position in byte stream
-@param cio CIO handle
-@param pos Position, in number of bytes, from the beginning of the stream
-*/
-OPJ_API void OPJ_CALLCONV cio_seek(opj_cio_t *cio, int pos);
-
-/* 
-==========================================================
-   event manager functions definitions
-==========================================================
-*/
-
-OPJ_API opj_event_mgr_t* OPJ_CALLCONV opj_set_event_mgr(opj_common_ptr cinfo, opj_event_mgr_t *event_mgr, void *context);
-
-/* 
-==========================================================
-   codec functions definitions
-==========================================================
-*/
-/**
-Creates a J2K/JPT/JP2 decompression structure
-@param format Decoder to select
-@return Returns a handle to a decompressor if successful, returns NULL otherwise
-*/
-OPJ_API opj_dinfo_t* OPJ_CALLCONV opj_create_decompress(OPJ_CODEC_FORMAT format);
-/**
-Destroy a decompressor handle
-@param dinfo decompressor handle to destroy
-*/
-OPJ_API void OPJ_CALLCONV opj_destroy_decompress(opj_dinfo_t *dinfo);
-/**
-Set decoding parameters to default values
-@param parameters Decompression parameters
-*/
-OPJ_API void OPJ_CALLCONV opj_set_default_decoder_parameters(opj_dparameters_t *parameters);
-/**
-Setup the decoder decoding parameters using user parameters.
-Decoding parameters are returned in j2k->cp. 
-@param dinfo decompressor handle
-@param parameters decompression parameters
-*/
-OPJ_API void OPJ_CALLCONV opj_setup_decoder(opj_dinfo_t *dinfo, opj_dparameters_t *parameters);
-/**
-Decode an image from a JPEG-2000 codestream 
-@param dinfo decompressor handle
-@param cio Input buffer stream
-@return Returns a decoded image if successful, returns NULL otherwise
-*/
-OPJ_API opj_image_t* OPJ_CALLCONV opj_decode(opj_dinfo_t *dinfo, opj_cio_t *cio);
-
-/**
-Decode an image from a JPEG-2000 codestream and extract the codestream information
-@param dinfo decompressor handle
-@param cio Input buffer stream
-@param cstr_info Codestream information structure if needed afterwards, NULL otherwise
-@return Returns a decoded image if successful, returns NULL otherwise
-*/
-OPJ_API opj_image_t* OPJ_CALLCONV opj_decode_with_info(opj_dinfo_t *dinfo, opj_cio_t *cio, opj_codestream_info_t *cstr_info);
-/**
-Creates a J2K/JP2 compression structure
-@param format Coder to select
-@return Returns a handle to a compressor if successful, returns NULL otherwise
-*/
-OPJ_API opj_cinfo_t* OPJ_CALLCONV opj_create_compress(OPJ_CODEC_FORMAT format);
-/**
-Destroy a compressor handle
-@param cinfo compressor handle to destroy
-*/
-OPJ_API void OPJ_CALLCONV opj_destroy_compress(opj_cinfo_t *cinfo);
-/**
-Set encoding parameters to default values, that means : 
-<ul>
-<li>Lossless
-<li>1 tile
-<li>Size of precinct : 2^15 x 2^15 (means 1 precinct)
-<li>Size of code-block : 64 x 64
-<li>Number of resolutions: 6
-<li>No SOP marker in the codestream
-<li>No EPH marker in the codestream
-<li>No sub-sampling in x or y direction
-<li>No mode switch activated
-<li>Progression order: LRCP
-<li>No index file
-<li>No ROI upshifted
-<li>No offset of the origin of the image
-<li>No offset of the origin of the tiles
-<li>Reversible DWT 5-3
-</ul>
-@param parameters Compression parameters
-*/
-OPJ_API void OPJ_CALLCONV opj_set_default_encoder_parameters(opj_cparameters_t *parameters);
-/**
-Setup the encoder parameters using the current image and using user parameters. 
-@param cinfo Compressor handle
-@param parameters Compression parameters
-@param image Input filled image
-*/
-OPJ_API void OPJ_CALLCONV opj_setup_encoder(opj_cinfo_t *cinfo, opj_cparameters_t *parameters, opj_image_t *image);
-/**
-Encode an image into a JPEG-2000 codestream
-@param cinfo compressor handle
-@param cio Output buffer stream
-@param image Image to encode
-@param index Depreacted -> Set to NULL. To extract index, used opj_encode_wci()
-@return Returns true if successful, returns false otherwise
-*/
-OPJ_API bool OPJ_CALLCONV opj_encode(opj_cinfo_t *cinfo, opj_cio_t *cio, opj_image_t *image, char *index);
-/**
-Encode an image into a JPEG-2000 codestream and extract the codestream information
-@param cinfo compressor handle
-@param cio Output buffer stream
-@param image Image to encode
-@param cstr_info Codestream information structure if needed afterwards, NULL otherwise
-@return Returns true if successful, returns false otherwise
-*/
-OPJ_API bool OPJ_CALLCONV opj_encode_with_info(opj_cinfo_t *cinfo, opj_cio_t *cio, opj_image_t *image, opj_codestream_info_t *cstr_info);
-/**
-Destroy Codestream information after compression or decompression
-@param cstr_info Codestream information structure
-*/
-OPJ_API void OPJ_CALLCONV opj_destroy_cstr_info(opj_codestream_info_t *cstr_info);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* OPENJPEG_H */

gpac-2.2.1.tar.gz/extra_lib/include/openssl Deleted

gpac-2.2.1.tar.gz/extra_lib/include/openssl/__DECC_INCLUDE_EPILOGUE.H Deleted

gpac-2.2.1.tar.gz/extra_lib/include/openssl/__DECC_INCLUDE_PROLOGUE.H Deleted

gpac-2.2.1.tar.gz/extra_lib/include/openssl/aes.h Deleted

@@ -1,92 +0,0 @@
-/*
- * Copyright 2002-2016 The OpenSSL Project Authors. All Rights Reserved.
- *
- * Licensed under the OpenSSL license (the "License").  You may not use
- * this file except in compliance with the License.  You can obtain a copy
- * in the file LICENSE in the source distribution or at
- * https://www.openssl.org/source/license.html
- */
-
-#ifndef HEADER_AES_H
-# define HEADER_AES_H
-
-# include <openssl/opensslconf.h>
-
-# include <stddef.h>
-# ifdef  __cplusplus
-extern "C" {
-# endif
-
-# define AES_ENCRYPT     1
-# define AES_DECRYPT     0
-
-/*
- * Because array size can't be a const in C, the following two are macros.
- * Both sizes are in bytes.
- */
-# define AES_MAXNR 14
-# define AES_BLOCK_SIZE 16
-
-/* This should be a hidden type, but EVP requires that the size be known */
-struct aes_key_st {
-# ifdef AES_LONG
-    unsigned long rd_key4 * (AES_MAXNR + 1);
-# else
-    unsigned int rd_key4 * (AES_MAXNR + 1);
-# endif
-    int rounds;
-};
-typedef struct aes_key_st AES_KEY;
-
-const char *AES_options(void);
-
-int AES_set_encrypt_key(const unsigned char *userKey, const int bits,
-                        AES_KEY *key);
-int AES_set_decrypt_key(const unsigned char *userKey, const int bits,
-                        AES_KEY *key);
-
-void AES_encrypt(const unsigned char *in, unsigned char *out,
-                 const AES_KEY *key);
-void AES_decrypt(const unsigned char *in, unsigned char *out,
-                 const AES_KEY *key);
-
-void AES_ecb_encrypt(const unsigned char *in, unsigned char *out,
-                     const AES_KEY *key, const int enc);
-void AES_cbc_encrypt(const unsigned char *in, unsigned char *out,
-                     size_t length, const AES_KEY *key,
-                     unsigned char *ivec, const int enc);
-void AES_cfb128_encrypt(const unsigned char *in, unsigned char *out,
-                        size_t length, const AES_KEY *key,
-                        unsigned char *ivec, int *num, const int enc);
-void AES_cfb1_encrypt(const unsigned char *in, unsigned char *out,
-                      size_t length, const AES_KEY *key,
-                      unsigned char *ivec, int *num, const int enc);
-void AES_cfb8_encrypt(const unsigned char *in, unsigned char *out,
-                      size_t length, const AES_KEY *key,
-                      unsigned char *ivec, int *num, const int enc);
-void AES_ofb128_encrypt(const unsigned char *in, unsigned char *out,
-                        size_t length, const AES_KEY *key,
-                        unsigned char *ivec, int *num);
-/* NB: the IV is _two_ blocks long */
-void AES_ige_encrypt(const unsigned char *in, unsigned char *out,
-                     size_t length, const AES_KEY *key,
-                     unsigned char *ivec, const int enc);
-/* NB: the IV is _four_ blocks long */
-void AES_bi_ige_encrypt(const unsigned char *in, unsigned char *out,
-                        size_t length, const AES_KEY *key,
-                        const AES_KEY *key2, const unsigned char *ivec,
-                        const int enc);
-
-int AES_wrap_key(AES_KEY *key, const unsigned char *iv,
-                 unsigned char *out,
-                 const unsigned char *in, unsigned int inlen);
-int AES_unwrap_key(AES_KEY *key, const unsigned char *iv,
-                   unsigned char *out,
-                   const unsigned char *in, unsigned int inlen);
-
-
-# ifdef  __cplusplus
-}
-# endif
-
-#endif

gpac-2.2.1.tar.gz/extra_lib/include/openssl/applink.c Deleted

@@ -1,138 +0,0 @@
-/*
- * Copyright 2004-2016 The OpenSSL Project Authors. All Rights Reserved.
- *
- * Licensed under the OpenSSL license (the "License").  You may not use
- * this file except in compliance with the License.  You can obtain a copy
- * in the file LICENSE in the source distribution or at
- * https://www.openssl.org/source/license.html
- */
-
-#define APPLINK_STDIN   1
-#define APPLINK_STDOUT  2
-#define APPLINK_STDERR  3
-#define APPLINK_FPRINTF 4
-#define APPLINK_FGETS   5
-#define APPLINK_FREAD   6
-#define APPLINK_FWRITE  7
-#define APPLINK_FSETMOD 8
-#define APPLINK_FEOF    9
-#define APPLINK_FCLOSE  10      /* should not be used */
-
-#define APPLINK_FOPEN   11      /* solely for completeness */
-#define APPLINK_FSEEK   12
-#define APPLINK_FTELL   13
-#define APPLINK_FFLUSH  14
-#define APPLINK_FERROR  15
-#define APPLINK_CLEARERR 16
-#define APPLINK_FILENO  17      /* to be used with below */
-
-#define APPLINK_OPEN    18      /* formally can't be used, as flags can vary */
-#define APPLINK_READ    19
-#define APPLINK_WRITE   20
-#define APPLINK_LSEEK   21
-#define APPLINK_CLOSE   22
-#define APPLINK_MAX     22      /* always same as last macro */
-
-#ifndef APPMACROS_ONLY
-# include <stdio.h>
-# include <io.h>
-# include <fcntl.h>
-
-static void *app_stdin(void)
-{
-    return stdin;
-}
-
-static void *app_stdout(void)
-{
-    return stdout;
-}
-
-static void *app_stderr(void)
-{
-    return stderr;
-}
-
-static int app_feof(FILE *fp)
-{
-    return feof(fp);
-}
-
-static int app_ferror(FILE *fp)
-{
-    return ferror(fp);
-}
-
-static void app_clearerr(FILE *fp)
-{
-    clearerr(fp);
-}
-
-static int app_fileno(FILE *fp)
-{
-    return _fileno(fp);
-}
-
-static int app_fsetmod(FILE *fp, char mod)
-{
-    return _setmode(_fileno(fp), mod == 'b' ? _O_BINARY : _O_TEXT);
-}
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-__declspec(dllexport)
-void **
-# if defined(__BORLANDC__)
-/*
- * __stdcall appears to be the only way to get the name
- * decoration right with Borland C. Otherwise it works
- * purely incidentally, as we pass no parameters.
- */
-__stdcall
-# else
-__cdecl
-# endif
-OPENSSL_Applink(void)
-{
-    static int once = 1;
-    static void *OPENSSL_ApplinkTableAPPLINK_MAX + 1 =
-        { (void *)APPLINK_MAX };
-
-    if (once) {
-        OPENSSL_ApplinkTableAPPLINK_STDIN = app_stdin;
-        OPENSSL_ApplinkTableAPPLINK_STDOUT = app_stdout;
-        OPENSSL_ApplinkTableAPPLINK_STDERR = app_stderr;
-        OPENSSL_ApplinkTableAPPLINK_FPRINTF = fprintf;
-        OPENSSL_ApplinkTableAPPLINK_FGETS = fgets;
-        OPENSSL_ApplinkTableAPPLINK_FREAD = fread;
-        OPENSSL_ApplinkTableAPPLINK_FWRITE = fwrite;
-        OPENSSL_ApplinkTableAPPLINK_FSETMOD = app_fsetmod;
-        OPENSSL_ApplinkTableAPPLINK_FEOF = app_feof;
-        OPENSSL_ApplinkTableAPPLINK_FCLOSE = fclose;
-
-        OPENSSL_ApplinkTableAPPLINK_FOPEN = fopen;
-        OPENSSL_ApplinkTableAPPLINK_FSEEK = fseek;
-        OPENSSL_ApplinkTableAPPLINK_FTELL = ftell;
-        OPENSSL_ApplinkTableAPPLINK_FFLUSH = fflush;
-        OPENSSL_ApplinkTableAPPLINK_FERROR = app_ferror;
-        OPENSSL_ApplinkTableAPPLINK_CLEARERR = app_clearerr;
-        OPENSSL_ApplinkTableAPPLINK_FILENO = app_fileno;
-
-        OPENSSL_ApplinkTableAPPLINK_OPEN = _open;
-        OPENSSL_ApplinkTableAPPLINK_READ = _read;
-        OPENSSL_ApplinkTableAPPLINK_WRITE = _write;
-        OPENSSL_ApplinkTableAPPLINK_LSEEK = _lseek;
-        OPENSSL_ApplinkTableAPPLINK_CLOSE = _close;
-
-        once = 0;
-    }
-
-    return OPENSSL_ApplinkTable;
-}
-
-#ifdef __cplusplus
-}
-#endif
-#endif

gpac-2.2.1.tar.gz/extra_lib/include/openssl/asn1.h Deleted

@@ -1,1099 +0,0 @@
-/*
- * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
- *
- * Licensed under the OpenSSL license (the "License").  You may not use
- * this file except in compliance with the License.  You can obtain a copy
- * in the file LICENSE in the source distribution or at
- * https://www.openssl.org/source/license.html
- */
-
-#ifndef HEADER_ASN1_H
-# define HEADER_ASN1_H
-
-# include <time.h>
-# include <openssl/e_os2.h>
-# include <openssl/opensslconf.h>
-# include <openssl/bio.h>
-# include <openssl/stack.h>
-# include <openssl/safestack.h>
-
-# include <openssl/symhacks.h>
-
-# include <openssl/ossl_typ.h>
-# if OPENSSL_API_COMPAT < 0x10100000L
-#  include <openssl/bn.h>
-# endif
-
-# ifdef OPENSSL_BUILD_SHLIBCRYPTO
-#  undef OPENSSL_EXTERN
-#  define OPENSSL_EXTERN OPENSSL_EXPORT
-# endif
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-# define V_ASN1_UNIVERSAL                0x00
-# define V_ASN1_APPLICATION              0x40
-# define V_ASN1_CONTEXT_SPECIFIC         0x80
-# define V_ASN1_PRIVATE                  0xc0
-
-# define V_ASN1_CONSTRUCTED              0x20
-# define V_ASN1_PRIMITIVE_TAG            0x1f
-# define V_ASN1_PRIMATIVE_TAG            0x1f
-
-# define V_ASN1_APP_CHOOSE               -2/* let the recipient choose */
-# define V_ASN1_OTHER                    -3/* used in ASN1_TYPE */
-# define V_ASN1_ANY                      -4/* used in ASN1 template code */
-
-# define V_ASN1_UNDEF                    -1
-/* ASN.1 tag values */
-# define V_ASN1_EOC                      0
-# define V_ASN1_BOOLEAN                  1 /**/
-# define V_ASN1_INTEGER                  2
-# define V_ASN1_BIT_STRING               3
-# define V_ASN1_OCTET_STRING             4
-# define V_ASN1_NULL                     5
-# define V_ASN1_OBJECT                   6
-# define V_ASN1_OBJECT_DESCRIPTOR        7
-# define V_ASN1_EXTERNAL                 8
-# define V_ASN1_REAL                     9
-# define V_ASN1_ENUMERATED               10
-# define V_ASN1_UTF8STRING               12
-# define V_ASN1_SEQUENCE                 16
-# define V_ASN1_SET                      17
-# define V_ASN1_NUMERICSTRING            18 /**/
-# define V_ASN1_PRINTABLESTRING          19
-# define V_ASN1_T61STRING                20
-# define V_ASN1_TELETEXSTRING            20/* alias */
-# define V_ASN1_VIDEOTEXSTRING           21 /**/
-# define V_ASN1_IA5STRING                22
-# define V_ASN1_UTCTIME                  23
-# define V_ASN1_GENERALIZEDTIME          24 /**/
-# define V_ASN1_GRAPHICSTRING            25 /**/
-# define V_ASN1_ISO64STRING              26 /**/
-# define V_ASN1_VISIBLESTRING            26/* alias */
-# define V_ASN1_GENERALSTRING            27 /**/
-# define V_ASN1_UNIVERSALSTRING          28 /**/
-# define V_ASN1_BMPSTRING                30
-
-/*
- * NB the constants below are used internally by ASN1_INTEGER
- * and ASN1_ENUMERATED to indicate the sign. They are *not* on
- * the wire tag values.
- */
-
-# define V_ASN1_NEG                      0x100
-# define V_ASN1_NEG_INTEGER              (2 | V_ASN1_NEG)
-# define V_ASN1_NEG_ENUMERATED           (10 | V_ASN1_NEG)
-
-/* For use with d2i_ASN1_type_bytes() */
-# define B_ASN1_NUMERICSTRING    0x0001
-# define B_ASN1_PRINTABLESTRING  0x0002
-# define B_ASN1_T61STRING        0x0004
-# define B_ASN1_TELETEXSTRING    0x0004
-# define B_ASN1_VIDEOTEXSTRING   0x0008
-# define B_ASN1_IA5STRING        0x0010
-# define B_ASN1_GRAPHICSTRING    0x0020
-# define B_ASN1_ISO64STRING      0x0040
-# define B_ASN1_VISIBLESTRING    0x0040
-# define B_ASN1_GENERALSTRING    0x0080
-# define B_ASN1_UNIVERSALSTRING  0x0100
-# define B_ASN1_OCTET_STRING     0x0200
-# define B_ASN1_BIT_STRING       0x0400
-# define B_ASN1_BMPSTRING        0x0800
-# define B_ASN1_UNKNOWN          0x1000
-# define B_ASN1_UTF8STRING       0x2000
-# define B_ASN1_UTCTIME          0x4000
-# define B_ASN1_GENERALIZEDTIME  0x8000
-# define B_ASN1_SEQUENCE         0x10000
-/* For use with ASN1_mbstring_copy() */
-# define MBSTRING_FLAG           0x1000
-# define MBSTRING_UTF8           (MBSTRING_FLAG)
-# define MBSTRING_ASC            (MBSTRING_FLAG|1)
-# define MBSTRING_BMP            (MBSTRING_FLAG|2)
-# define MBSTRING_UNIV           (MBSTRING_FLAG|4)
-# define SMIME_OLDMIME           0x400
-# define SMIME_CRLFEOL           0x800
-# define SMIME_STREAM            0x1000
-    struct X509_algor_st;
-DEFINE_STACK_OF(X509_ALGOR)
-
-# define ASN1_STRING_FLAG_BITS_LEFT 0x08/* Set if 0x07 has bits left value */
-/*
- * This indicates that the ASN1_STRING is not a real value but just a place
- * holder for the location where indefinite length constructed data should be
- * inserted in the memory buffer
- */
-# define ASN1_STRING_FLAG_NDEF 0x010
-
-/*
- * This flag is used by the CMS code to indicate that a string is not
- * complete and is a place holder for content when it had all been accessed.
- * The flag will be reset when content has been written to it.
- */
-
-# define ASN1_STRING_FLAG_CONT 0x020
-/*
- * This flag is used by ASN1 code to indicate an ASN1_STRING is an MSTRING
- * type.
- */
-# define ASN1_STRING_FLAG_MSTRING 0x040
-/* String is embedded and only content should be freed */
-# define ASN1_STRING_FLAG_EMBED 0x080
-/* This is the base type that holds just about everything :-) */
-struct asn1_string_st {
-    int length;
-    int type;
-    unsigned char *data;
-    /*
-     * The value of the following field depends on the type being held.  It
-     * is mostly being used for BIT_STRING so if the input data has a
-     * non-zero 'unused bits' value, it will be handled correctly
-     */
-    long flags;
-};
-
-/*
- * ASN1_ENCODING structure: this is used to save the received encoding of an
- * ASN1 type. This is useful to get round problems with invalid encodings
- * which can break signatures.
- */
-
-typedef struct ASN1_ENCODING_st {
-    unsigned char *enc;         /* DER encoding */
-    long len;                   /* Length of encoding */
-    int modified;               /* set to 1 if 'enc' is invalid */
-} ASN1_ENCODING;
-
-/* Used with ASN1 LONG type: if a long is set to this it is omitted */
-# define ASN1_LONG_UNDEF 0x7fffffffL
-
-# define STABLE_FLAGS_MALLOC     0x01
-/*
- * A zero passed to ASN1_STRING_TABLE_new_add for the flags is interpreted
- * as "don't change" and STABLE_FLAGS_MALLOC is always set. By setting
- * STABLE_FLAGS_MALLOC only we can clear the existing value. Use the alias
- * STABLE_FLAGS_CLEAR to reflect this.
- */
-# define STABLE_FLAGS_CLEAR      STABLE_FLAGS_MALLOC
-# define STABLE_NO_MASK          0x02
-# define DIRSTRING_TYPE  \
- (B_ASN1_PRINTABLESTRING|B_ASN1_T61STRING|B_ASN1_BMPSTRING|B_ASN1_UTF8STRING)
-# define PKCS9STRING_TYPE (DIRSTRING_TYPE|B_ASN1_IA5STRING)
-
-typedef struct asn1_string_table_st {
-    int nid;
-    long minsize;
-    long maxsize;
-    unsigned long mask;
-    unsigned long flags;
-} ASN1_STRING_TABLE;
-
-DEFINE_STACK_OF(ASN1_STRING_TABLE)
-
-/* size limits: this stuff is taken straight from RFC2459 */
-
-# define ub_name                         32768
-# define ub_common_name                  64
-# define ub_locality_name                128
-# define ub_state_name                   128
-# define ub_organization_name            64
-# define ub_organization_unit_name       64
-# define ub_title                        64
-# define ub_email_address                128
-
-/*
- * Declarations for template structures: for full definitions see asn1t.h
- */
-typedef struct ASN1_TEMPLATE_st ASN1_TEMPLATE;
-typedef struct ASN1_TLC_st ASN1_TLC;
-/* This is just an opaque pointer */
-typedef struct ASN1_VALUE_st ASN1_VALUE;
-
-/* Declare ASN1 functions: the implement macro in in asn1t.h */
-
-# define DECLARE_ASN1_FUNCTIONS(type) DECLARE_ASN1_FUNCTIONS_name(type, type)
-
-# define DECLARE_ASN1_ALLOC_FUNCTIONS(type) \
-        DECLARE_ASN1_ALLOC_FUNCTIONS_name(type, type)
-
-# define DECLARE_ASN1_FUNCTIONS_name(type, name) \
-        DECLARE_ASN1_ALLOC_FUNCTIONS_name(type, name) \
-        DECLARE_ASN1_ENCODE_FUNCTIONS(type, name, name)
-
-# define DECLARE_ASN1_FUNCTIONS_fname(type, itname, name) \
-        DECLARE_ASN1_ALLOC_FUNCTIONS_name(type, name) \
-        DECLARE_ASN1_ENCODE_FUNCTIONS(type, itname, name)
-
-# define DECLARE_ASN1_ENCODE_FUNCTIONS(type, itname, name) \
-        type *d2i_##name(type **a, const unsigned char **in, long len); \
-        int i2d_##name(type *a, unsigned char **out); \
-        DECLARE_ASN1_ITEM(itname)
-
-# define DECLARE_ASN1_ENCODE_FUNCTIONS_const(type, name) \
-        type *d2i_##name(type **a, const unsigned char **in, long len); \
-        int i2d_##name(const type *a, unsigned char **out); \
-        DECLARE_ASN1_ITEM(name)
-
-# define DECLARE_ASN1_NDEF_FUNCTION(name) \
-        int i2d_##name##_NDEF(name *a, unsigned char **out);
-
-# define DECLARE_ASN1_FUNCTIONS_const(name) \
-        DECLARE_ASN1_ALLOC_FUNCTIONS(name) \
-        DECLARE_ASN1_ENCODE_FUNCTIONS_const(name, name)
-
-# define DECLARE_ASN1_ALLOC_FUNCTIONS_name(type, name) \
-        type *name##_new(void); \
-        void name##_free(type *a);
-
-# define DECLARE_ASN1_PRINT_FUNCTION(stname) \
-        DECLARE_ASN1_PRINT_FUNCTION_fname(stname, stname)
-
-# define DECLARE_ASN1_PRINT_FUNCTION_fname(stname, fname) \
-        int fname##_print_ctx(BIO *out, stname *x, int indent, \
-                                         const ASN1_PCTX *pctx);
-
-# define D2I_OF(type) type *(*)(type **,const unsigned char **,long)
-# define I2D_OF(type) int (*)(type *,unsigned char **)
-# define I2D_OF_const(type) int (*)(const type *,unsigned char **)
-
-# define CHECKED_D2I_OF(type, d2i) \
-    ((d2i_of_void*) (1 ? d2i : ((D2I_OF(type))0)))
-# define CHECKED_I2D_OF(type, i2d) \
-    ((i2d_of_void*) (1 ? i2d : ((I2D_OF(type))0)))
-# define CHECKED_NEW_OF(type, xnew) \
-    ((void *(*)(void)) (1 ? xnew : ((type *(*)(void))0)))
-# define CHECKED_PTR_OF(type, p) \
-    ((void*) (1 ? p : (type*)0))
-# define CHECKED_PPTR_OF(type, p) \
-    ((void**) (1 ? p : (type**)0))
-
-# define TYPEDEF_D2I_OF(type) typedef type *d2i_of_##type(type **,const unsigned char **,long)
-# define TYPEDEF_I2D_OF(type) typedef int i2d_of_##type(type *,unsigned char **)
-# define TYPEDEF_D2I2D_OF(type) TYPEDEF_D2I_OF(type); TYPEDEF_I2D_OF(type)
-
-TYPEDEF_D2I2D_OF(void);
-
-/*-
- * The following macros and typedefs allow an ASN1_ITEM
- * to be embedded in a structure and referenced. Since
- * the ASN1_ITEM pointers need to be globally accessible
- * (possibly from shared libraries) they may exist in
- * different forms. On platforms that support it the
- * ASN1_ITEM structure itself will be globally exported.
- * Other platforms will export a function that returns
- * an ASN1_ITEM pointer.
- *
- * To handle both cases transparently the macros below
- * should be used instead of hard coding an ASN1_ITEM
- * pointer in a structure.
- *
- * The structure will look like this:
- *
- * typedef struct SOMETHING_st {
- *      ...
- *      ASN1_ITEM_EXP *iptr;
- *      ...
- * } SOMETHING;
- *
- * It would be initialised as e.g.:
- *
- * SOMETHING somevar = {...,ASN1_ITEM_ref(X509),...};
- *
- * and the actual pointer extracted with:
- *
- * const ASN1_ITEM *it = ASN1_ITEM_ptr(somevar.iptr);
- *
- * Finally an ASN1_ITEM pointer can be extracted from an
- * appropriate reference with: ASN1_ITEM_rptr(X509). This
- * would be used when a function takes an ASN1_ITEM * argument.
- *
- */
-
-# ifndef OPENSSL_EXPORT_VAR_AS_FUNCTION
-
-/* ASN1_ITEM pointer exported type */
-typedef const ASN1_ITEM ASN1_ITEM_EXP;
-
-/* Macro to obtain ASN1_ITEM pointer from exported type */
-#  define ASN1_ITEM_ptr(iptr) (iptr)
-
-/* Macro to include ASN1_ITEM pointer from base type */
-#  define ASN1_ITEM_ref(iptr) (&(iptr##_it))
-
-#  define ASN1_ITEM_rptr(ref) (&(ref##_it))
-
-#  define DECLARE_ASN1_ITEM(name) \
-        OPENSSL_EXTERN const ASN1_ITEM name##_it;
-
-# else
-
-/*
- * Platforms that can't easily handle shared global variables are declared as
- * functions returning ASN1_ITEM pointers.
- */
-
-/* ASN1_ITEM pointer exported type */
-typedef const ASN1_ITEM *ASN1_ITEM_EXP (void);
-
-/* Macro to obtain ASN1_ITEM pointer from exported type */
-#  define ASN1_ITEM_ptr(iptr) (iptr())
-
-/* Macro to include ASN1_ITEM pointer from base type */
-#  define ASN1_ITEM_ref(iptr) (iptr##_it)
-
-#  define ASN1_ITEM_rptr(ref) (ref##_it())
-
-#  define DECLARE_ASN1_ITEM(name) \
-        const ASN1_ITEM * name##_it(void);
-
-# endif
-
-/* Parameters used by ASN1_STRING_print_ex() */
-
-/*
- * These determine which characters to escape: RFC2253 special characters,
- * control characters and MSB set characters
- */
-
-# define ASN1_STRFLGS_ESC_2253           1
-# define ASN1_STRFLGS_ESC_CTRL           2
-# define ASN1_STRFLGS_ESC_MSB            4
-
-/*
- * This flag determines how we do escaping: normally RC2253 backslash only,
- * set this to use backslash and quote.
- */
-
-# define ASN1_STRFLGS_ESC_QUOTE          8
-
-/* These three flags are internal use only. */
-
-/* Character is a valid PrintableString character */
-# define CHARTYPE_PRINTABLESTRING        0x10
-/* Character needs escaping if it is the first character */
-# define CHARTYPE_FIRST_ESC_2253         0x20
-/* Character needs escaping if it is the last character */
-# define CHARTYPE_LAST_ESC_2253          0x40
-
-/*
- * NB the internal flags are safely reused below by flags handled at the top
- * level.
- */
-
-/*
- * If this is set we convert all character strings to UTF8 first
- */
-
-# define ASN1_STRFLGS_UTF8_CONVERT       0x10
-
-/*
- * If this is set we don't attempt to interpret content: just assume all
- * strings are 1 byte per character. This will produce some pretty odd
- * looking output!
- */
-
-# define ASN1_STRFLGS_IGNORE_TYPE        0x20
-
-/* If this is set we include the string type in the output */
-# define ASN1_STRFLGS_SHOW_TYPE          0x40
-
-/*
- * This determines which strings to display and which to 'dump' (hex dump of
- * content octets or DER encoding). We can only dump non character strings or
- * everything. If we don't dump 'unknown' they are interpreted as character
- * strings with 1 octet per character and are subject to the usual escaping
- * options.
- */
-
-# define ASN1_STRFLGS_DUMP_ALL           0x80
-# define ASN1_STRFLGS_DUMP_UNKNOWN       0x100
-
-/*
- * These determine what 'dumping' does, we can dump the content octets or the
- * DER encoding: both use the RFC2253 #XXXXX notation.
- */
-
-# define ASN1_STRFLGS_DUMP_DER           0x200
-
-/*
- * This flag specifies that RC2254 escaping shall be performed.
- */
-#define ASN1_STRFLGS_ESC_2254           0x400
-
-/*
- * All the string flags consistent with RFC2253, escaping control characters
- * isn't essential in RFC2253 but it is advisable anyway.
- */
-
-# define ASN1_STRFLGS_RFC2253    (ASN1_STRFLGS_ESC_2253 | \
-                                ASN1_STRFLGS_ESC_CTRL | \
-                                ASN1_STRFLGS_ESC_MSB | \
-                                ASN1_STRFLGS_UTF8_CONVERT | \
-                                ASN1_STRFLGS_DUMP_UNKNOWN | \
-                                ASN1_STRFLGS_DUMP_DER)
-
-DEFINE_STACK_OF(ASN1_INTEGER)
-
-DEFINE_STACK_OF(ASN1_GENERALSTRING)
-
-DEFINE_STACK_OF(ASN1_UTF8STRING)
-
-typedef struct asn1_type_st {
-    int type;
-    union {
-        char *ptr;
-        ASN1_BOOLEAN boolean;
-        ASN1_STRING *asn1_string;
-        ASN1_OBJECT *object;
-        ASN1_INTEGER *integer;
-        ASN1_ENUMERATED *enumerated;
-        ASN1_BIT_STRING *bit_string;
-        ASN1_OCTET_STRING *octet_string;
-        ASN1_PRINTABLESTRING *printablestring;
-        ASN1_T61STRING *t61string;
-        ASN1_IA5STRING *ia5string;
-        ASN1_GENERALSTRING *generalstring;
-        ASN1_BMPSTRING *bmpstring;
-        ASN1_UNIVERSALSTRING *universalstring;
-        ASN1_UTCTIME *utctime;
-        ASN1_GENERALIZEDTIME *generalizedtime;
-        ASN1_VISIBLESTRING *visiblestring;
-        ASN1_UTF8STRING *utf8string;
-        /*
-         * set and sequence are left complete and still contain the set or
-         * sequence bytes
-         */
-        ASN1_STRING *set;
-        ASN1_STRING *sequence;
-        ASN1_VALUE *asn1_value;
-    } value;
-} ASN1_TYPE;
-
-DEFINE_STACK_OF(ASN1_TYPE)
-
-typedef STACK_OF(ASN1_TYPE) ASN1_SEQUENCE_ANY;
-
-DECLARE_ASN1_ENCODE_FUNCTIONS_const(ASN1_SEQUENCE_ANY, ASN1_SEQUENCE_ANY)
-DECLARE_ASN1_ENCODE_FUNCTIONS_const(ASN1_SEQUENCE_ANY, ASN1_SET_ANY)
-
-/* This is used to contain a list of bit names */
-typedef struct BIT_STRING_BITNAME_st {
-    int bitnum;
-    const char *lname;
-    const char *sname;
-} BIT_STRING_BITNAME;
-
-# define B_ASN1_TIME \
-                        B_ASN1_UTCTIME | \
-                        B_ASN1_GENERALIZEDTIME
-
-# define B_ASN1_PRINTABLE \
-                        B_ASN1_NUMERICSTRING| \
-                        B_ASN1_PRINTABLESTRING| \
-                        B_ASN1_T61STRING| \
-                        B_ASN1_IA5STRING| \
-                        B_ASN1_BIT_STRING| \
-                        B_ASN1_UNIVERSALSTRING|\
-                        B_ASN1_BMPSTRING|\
-                        B_ASN1_UTF8STRING|\
-                        B_ASN1_SEQUENCE|\
-                        B_ASN1_UNKNOWN
-
-# define B_ASN1_DIRECTORYSTRING \
-                        B_ASN1_PRINTABLESTRING| \
-                        B_ASN1_TELETEXSTRING|\
-                        B_ASN1_BMPSTRING|\
-                        B_ASN1_UNIVERSALSTRING|\
-                        B_ASN1_UTF8STRING
-
-# define B_ASN1_DISPLAYTEXT \
-                        B_ASN1_IA5STRING| \
-                        B_ASN1_VISIBLESTRING| \
-                        B_ASN1_BMPSTRING|\
-                        B_ASN1_UTF8STRING
-
-DECLARE_ASN1_FUNCTIONS_fname(ASN1_TYPE, ASN1_ANY, ASN1_TYPE)
-
-int ASN1_TYPE_get(const ASN1_TYPE *a);
-void ASN1_TYPE_set(ASN1_TYPE *a, int type, void *value);
-int ASN1_TYPE_set1(ASN1_TYPE *a, int type, const void *value);
-int ASN1_TYPE_cmp(const ASN1_TYPE *a, const ASN1_TYPE *b);
-
-ASN1_TYPE *ASN1_TYPE_pack_sequence(const ASN1_ITEM *it, void *s, ASN1_TYPE **t);
-void *ASN1_TYPE_unpack_sequence(const ASN1_ITEM *it, const ASN1_TYPE *t);
-
-ASN1_OBJECT *ASN1_OBJECT_new(void);
-void ASN1_OBJECT_free(ASN1_OBJECT *a);
-int i2d_ASN1_OBJECT(const ASN1_OBJECT *a, unsigned char **pp);
-ASN1_OBJECT *d2i_ASN1_OBJECT(ASN1_OBJECT **a, const unsigned char **pp,
-                             long length);
-
-DECLARE_ASN1_ITEM(ASN1_OBJECT)
-
-DEFINE_STACK_OF(ASN1_OBJECT)
-
-ASN1_STRING *ASN1_STRING_new(void);
-void ASN1_STRING_free(ASN1_STRING *a);
-void ASN1_STRING_clear_free(ASN1_STRING *a);
-int ASN1_STRING_copy(ASN1_STRING *dst, const ASN1_STRING *str);
-ASN1_STRING *ASN1_STRING_dup(const ASN1_STRING *a);
-ASN1_STRING *ASN1_STRING_type_new(int type);
-int ASN1_STRING_cmp(const ASN1_STRING *a, const ASN1_STRING *b);
-  /*
-   * Since this is used to store all sorts of things, via macros, for now,
-   * make its data void *
-   */
-int ASN1_STRING_set(ASN1_STRING *str, const void *data, int len);
-void ASN1_STRING_set0(ASN1_STRING *str, void *data, int len);
-int ASN1_STRING_length(const ASN1_STRING *x);
-void ASN1_STRING_length_set(ASN1_STRING *x, int n);
-int ASN1_STRING_type(const ASN1_STRING *x);
-DEPRECATEDIN_1_1_0(unsigned char *ASN1_STRING_data(ASN1_STRING *x))
-const unsigned char *ASN1_STRING_get0_data(const ASN1_STRING *x);
-
-DECLARE_ASN1_FUNCTIONS(ASN1_BIT_STRING)
-int ASN1_BIT_STRING_set(ASN1_BIT_STRING *a, unsigned char *d, int length);
-int ASN1_BIT_STRING_set_bit(ASN1_BIT_STRING *a, int n, int value);
-int ASN1_BIT_STRING_get_bit(const ASN1_BIT_STRING *a, int n);
-int ASN1_BIT_STRING_check(const ASN1_BIT_STRING *a,
-                          const unsigned char *flags, int flags_len);
-
-int ASN1_BIT_STRING_name_print(BIO *out, ASN1_BIT_STRING *bs,
-                               BIT_STRING_BITNAME *tbl, int indent);
-int ASN1_BIT_STRING_num_asc(const char *name, BIT_STRING_BITNAME *tbl);
-int ASN1_BIT_STRING_set_asc(ASN1_BIT_STRING *bs, const char *name, int value,
-                            BIT_STRING_BITNAME *tbl);
-
-DECLARE_ASN1_FUNCTIONS(ASN1_INTEGER)
-ASN1_INTEGER *d2i_ASN1_UINTEGER(ASN1_INTEGER **a, const unsigned char **pp,
-                                long length);
-ASN1_INTEGER *ASN1_INTEGER_dup(const ASN1_INTEGER *x);
-int ASN1_INTEGER_cmp(const ASN1_INTEGER *x, const ASN1_INTEGER *y);
-
-DECLARE_ASN1_FUNCTIONS(ASN1_ENUMERATED)
-
-int ASN1_UTCTIME_check(const ASN1_UTCTIME *a);
-ASN1_UTCTIME *ASN1_UTCTIME_set(ASN1_UTCTIME *s, time_t t);
-ASN1_UTCTIME *ASN1_UTCTIME_adj(ASN1_UTCTIME *s, time_t t,
-                               int offset_day, long offset_sec);
-int ASN1_UTCTIME_set_string(ASN1_UTCTIME *s, const char *str);
-int ASN1_UTCTIME_cmp_time_t(const ASN1_UTCTIME *s, time_t t);
-
-int ASN1_GENERALIZEDTIME_check(const ASN1_GENERALIZEDTIME *a);
-ASN1_GENERALIZEDTIME *ASN1_GENERALIZEDTIME_set(ASN1_GENERALIZEDTIME *s,
-                                               time_t t);
-ASN1_GENERALIZEDTIME *ASN1_GENERALIZEDTIME_adj(ASN1_GENERALIZEDTIME *s,
-                                               time_t t, int offset_day,
-                                               long offset_sec);
-int ASN1_GENERALIZEDTIME_set_string(ASN1_GENERALIZEDTIME *s, const char *str);
-int ASN1_TIME_diff(int *pday, int *psec,
-                   const ASN1_TIME *from, const ASN1_TIME *to);
-
-DECLARE_ASN1_FUNCTIONS(ASN1_OCTET_STRING)
-ASN1_OCTET_STRING *ASN1_OCTET_STRING_dup(const ASN1_OCTET_STRING *a);
-int ASN1_OCTET_STRING_cmp(const ASN1_OCTET_STRING *a,
-                          const ASN1_OCTET_STRING *b);
-int ASN1_OCTET_STRING_set(ASN1_OCTET_STRING *str, const unsigned char *data,
-                          int len);
-
-DECLARE_ASN1_FUNCTIONS(ASN1_VISIBLESTRING)
-DECLARE_ASN1_FUNCTIONS(ASN1_UNIVERSALSTRING)
-DECLARE_ASN1_FUNCTIONS(ASN1_UTF8STRING)
-DECLARE_ASN1_FUNCTIONS(ASN1_NULL)
-DECLARE_ASN1_FUNCTIONS(ASN1_BMPSTRING)
-
-int UTF8_getc(const unsigned char *str, int len, unsigned long *val);
-int UTF8_putc(unsigned char *str, int len, unsigned long value);
-
-DECLARE_ASN1_FUNCTIONS_name(ASN1_STRING, ASN1_PRINTABLE)
-
-DECLARE_ASN1_FUNCTIONS_name(ASN1_STRING, DIRECTORYSTRING)
-DECLARE_ASN1_FUNCTIONS_name(ASN1_STRING, DISPLAYTEXT)
-DECLARE_ASN1_FUNCTIONS(ASN1_PRINTABLESTRING)
-DECLARE_ASN1_FUNCTIONS(ASN1_T61STRING)
-DECLARE_ASN1_FUNCTIONS(ASN1_IA5STRING)
-DECLARE_ASN1_FUNCTIONS(ASN1_GENERALSTRING)
-DECLARE_ASN1_FUNCTIONS(ASN1_UTCTIME)
-DECLARE_ASN1_FUNCTIONS(ASN1_GENERALIZEDTIME)
-DECLARE_ASN1_FUNCTIONS(ASN1_TIME)
-
-DECLARE_ASN1_ITEM(ASN1_OCTET_STRING_NDEF)
-
-ASN1_TIME *ASN1_TIME_set(ASN1_TIME *s, time_t t);
-ASN1_TIME *ASN1_TIME_adj(ASN1_TIME *s, time_t t,
-                         int offset_day, long offset_sec);
-int ASN1_TIME_check(const ASN1_TIME *t);
-ASN1_GENERALIZEDTIME *ASN1_TIME_to_generalizedtime(const ASN1_TIME *t,
-                                                   ASN1_GENERALIZEDTIME **out);
-int ASN1_TIME_set_string(ASN1_TIME *s, const char *str);
-
-int i2a_ASN1_INTEGER(BIO *bp, const ASN1_INTEGER *a);
-int a2i_ASN1_INTEGER(BIO *bp, ASN1_INTEGER *bs, char *buf, int size);
-int i2a_ASN1_ENUMERATED(BIO *bp, const ASN1_ENUMERATED *a);
-int a2i_ASN1_ENUMERATED(BIO *bp, ASN1_ENUMERATED *bs, char *buf, int size);
-int i2a_ASN1_OBJECT(BIO *bp, const ASN1_OBJECT *a);
-int a2i_ASN1_STRING(BIO *bp, ASN1_STRING *bs, char *buf, int size);
-int i2a_ASN1_STRING(BIO *bp, const ASN1_STRING *a, int type);
-int i2t_ASN1_OBJECT(char *buf, int buf_len, const ASN1_OBJECT *a);
-
-int a2d_ASN1_OBJECT(unsigned char *out, int olen, const char *buf, int num);
-ASN1_OBJECT *ASN1_OBJECT_create(int nid, unsigned char *data, int len,
-                                const char *sn, const char *ln);
-
-int ASN1_INTEGER_get_int64(int64_t *pr, const ASN1_INTEGER *a);
-int ASN1_INTEGER_set_int64(ASN1_INTEGER *a, int64_t r);
-int ASN1_INTEGER_get_uint64(uint64_t *pr, const ASN1_INTEGER *a);
-int ASN1_INTEGER_set_uint64(ASN1_INTEGER *a, uint64_t r);
-
-int ASN1_INTEGER_set(ASN1_INTEGER *a, long v);
-long ASN1_INTEGER_get(const ASN1_INTEGER *a);
-ASN1_INTEGER *BN_to_ASN1_INTEGER(const BIGNUM *bn, ASN1_INTEGER *ai);
-BIGNUM *ASN1_INTEGER_to_BN(const ASN1_INTEGER *ai, BIGNUM *bn);
-
-int ASN1_ENUMERATED_get_int64(int64_t *pr, const ASN1_ENUMERATED *a);
-int ASN1_ENUMERATED_set_int64(ASN1_ENUMERATED *a, int64_t r);
-
-
-int ASN1_ENUMERATED_set(ASN1_ENUMERATED *a, long v);
-long ASN1_ENUMERATED_get(const ASN1_ENUMERATED *a);
-ASN1_ENUMERATED *BN_to_ASN1_ENUMERATED(const BIGNUM *bn, ASN1_ENUMERATED *ai);
-BIGNUM *ASN1_ENUMERATED_to_BN(const ASN1_ENUMERATED *ai, BIGNUM *bn);
-
-/* General */
-/* given a string, return the correct type, max is the maximum length */
-int ASN1_PRINTABLE_type(const unsigned char *s, int max);
-
-unsigned long ASN1_tag2bit(int tag);
-
-/* SPECIALS */
-int ASN1_get_object(const unsigned char **pp, long *plength, int *ptag,
-                    int *pclass, long omax);
-int ASN1_check_infinite_end(unsigned char **p, long len);
-int ASN1_const_check_infinite_end(const unsigned char **p, long len);
-void ASN1_put_object(unsigned char **pp, int constructed, int length,
-                     int tag, int xclass);
-int ASN1_put_eoc(unsigned char **pp);
-int ASN1_object_size(int constructed, int length, int tag);
-
-/* Used to implement other functions */
-void *ASN1_dup(i2d_of_void *i2d, d2i_of_void *d2i, void *x);
-
-# define ASN1_dup_of(type,i2d,d2i,x) \
-    ((type*)ASN1_dup(CHECKED_I2D_OF(type, i2d), \
-                     CHECKED_D2I_OF(type, d2i), \
-                     CHECKED_PTR_OF(type, x)))
-
-# define ASN1_dup_of_const(type,i2d,d2i,x) \
-    ((type*)ASN1_dup(CHECKED_I2D_OF(const type, i2d), \
-                     CHECKED_D2I_OF(type, d2i), \
-                     CHECKED_PTR_OF(const type, x)))
-
-void *ASN1_item_dup(const ASN1_ITEM *it, void *x);
-
-/* ASN1 alloc/free macros for when a type is only used internally */
-
-# define M_ASN1_new_of(type) (type *)ASN1_item_new(ASN1_ITEM_rptr(type))
-# define M_ASN1_free_of(x, type) \
-                ASN1_item_free(CHECKED_PTR_OF(type, x), ASN1_ITEM_rptr(type))
-
-# ifndef OPENSSL_NO_STDIO
-void *ASN1_d2i_fp(void *(*xnew) (void), d2i_of_void *d2i, FILE *in, void **x);
-
-#  define ASN1_d2i_fp_of(type,xnew,d2i,in,x) \
-    ((type*)ASN1_d2i_fp(CHECKED_NEW_OF(type, xnew), \
-                        CHECKED_D2I_OF(type, d2i), \
-                        in, \
-                        CHECKED_PPTR_OF(type, x)))
-
-void *ASN1_item_d2i_fp(const ASN1_ITEM *it, FILE *in, void *x);
-int ASN1_i2d_fp(i2d_of_void *i2d, FILE *out, void *x);
-
-#  define ASN1_i2d_fp_of(type,i2d,out,x) \
-    (ASN1_i2d_fp(CHECKED_I2D_OF(type, i2d), \
-                 out, \
-                 CHECKED_PTR_OF(type, x)))
-
-#  define ASN1_i2d_fp_of_const(type,i2d,out,x) \
-    (ASN1_i2d_fp(CHECKED_I2D_OF(const type, i2d), \
-                 out, \
-                 CHECKED_PTR_OF(const type, x)))
-
-int ASN1_item_i2d_fp(const ASN1_ITEM *it, FILE *out, void *x);
-int ASN1_STRING_print_ex_fp(FILE *fp, const ASN1_STRING *str, unsigned long flags);
-# endif
-
-int ASN1_STRING_to_UTF8(unsigned char **out, const ASN1_STRING *in);
-
-void *ASN1_d2i_bio(void *(*xnew) (void), d2i_of_void *d2i, BIO *in, void **x);
-
-#  define ASN1_d2i_bio_of(type,xnew,d2i,in,x) \
-    ((type*)ASN1_d2i_bio( CHECKED_NEW_OF(type, xnew), \
-                          CHECKED_D2I_OF(type, d2i), \
-                          in, \
-                          CHECKED_PPTR_OF(type, x)))
-
-void *ASN1_item_d2i_bio(const ASN1_ITEM *it, BIO *in, void *x);
-int ASN1_i2d_bio(i2d_of_void *i2d, BIO *out, unsigned char *x);
-
-#  define ASN1_i2d_bio_of(type,i2d,out,x) \
-    (ASN1_i2d_bio(CHECKED_I2D_OF(type, i2d), \
-                  out, \
-                  CHECKED_PTR_OF(type, x)))
-
-#  define ASN1_i2d_bio_of_const(type,i2d,out,x) \
-    (ASN1_i2d_bio(CHECKED_I2D_OF(const type, i2d), \
-                  out, \
-                  CHECKED_PTR_OF(const type, x)))
-
-int ASN1_item_i2d_bio(const ASN1_ITEM *it, BIO *out, void *x);
-int ASN1_UTCTIME_print(BIO *fp, const ASN1_UTCTIME *a);
-int ASN1_GENERALIZEDTIME_print(BIO *fp, const ASN1_GENERALIZEDTIME *a);
-int ASN1_TIME_print(BIO *fp, const ASN1_TIME *a);
-int ASN1_STRING_print(BIO *bp, const ASN1_STRING *v);
-int ASN1_STRING_print_ex(BIO *out, const ASN1_STRING *str, unsigned long flags);
-int ASN1_buf_print(BIO *bp, const unsigned char *buf, size_t buflen, int off);
-int ASN1_bn_print(BIO *bp, const char *number, const BIGNUM *num,
-                  unsigned char *buf, int off);
-int ASN1_parse(BIO *bp, const unsigned char *pp, long len, int indent);
-int ASN1_parse_dump(BIO *bp, const unsigned char *pp, long len, int indent,
-                    int dump);
-const char *ASN1_tag2str(int tag);
-
-/* Used to load and write Netscape format cert */
-
-int ASN1_UNIVERSALSTRING_to_string(ASN1_UNIVERSALSTRING *s);
-
-int ASN1_TYPE_set_octetstring(ASN1_TYPE *a, unsigned char *data, int len);
-int ASN1_TYPE_get_octetstring(const ASN1_TYPE *a, unsigned char *data, int max_len);
-int ASN1_TYPE_set_int_octetstring(ASN1_TYPE *a, long num,
-                                  unsigned char *data, int len);
-int ASN1_TYPE_get_int_octetstring(const ASN1_TYPE *a, long *num,
-                                  unsigned char *data, int max_len);
-
-void *ASN1_item_unpack(const ASN1_STRING *oct, const ASN1_ITEM *it);
-
-ASN1_STRING *ASN1_item_pack(void *obj, const ASN1_ITEM *it,
-                            ASN1_OCTET_STRING **oct);
-
-void ASN1_STRING_set_default_mask(unsigned long mask);
-int ASN1_STRING_set_default_mask_asc(const char *p);
-unsigned long ASN1_STRING_get_default_mask(void);
-int ASN1_mbstring_copy(ASN1_STRING **out, const unsigned char *in, int len,
-                       int inform, unsigned long mask);
-int ASN1_mbstring_ncopy(ASN1_STRING **out, const unsigned char *in, int len,
-                        int inform, unsigned long mask,
-                        long minsize, long maxsize);
-
-ASN1_STRING *ASN1_STRING_set_by_NID(ASN1_STRING **out,
-                                    const unsigned char *in, int inlen,
-                                    int inform, int nid);
-ASN1_STRING_TABLE *ASN1_STRING_TABLE_get(int nid);
-int ASN1_STRING_TABLE_add(int, long, long, unsigned long, unsigned long);
-void ASN1_STRING_TABLE_cleanup(void);
-
-/* ASN1 template functions */
-
-/* Old API compatible functions */
-ASN1_VALUE *ASN1_item_new(const ASN1_ITEM *it);
-void ASN1_item_free(ASN1_VALUE *val, const ASN1_ITEM *it);
-ASN1_VALUE *ASN1_item_d2i(ASN1_VALUE **val, const unsigned char **in,
-                          long len, const ASN1_ITEM *it);
-int ASN1_item_i2d(ASN1_VALUE *val, unsigned char **out, const ASN1_ITEM *it);
-int ASN1_item_ndef_i2d(ASN1_VALUE *val, unsigned char **out,
-                       const ASN1_ITEM *it);
-
-void ASN1_add_oid_module(void);
-void ASN1_add_stable_module(void);
-
-ASN1_TYPE *ASN1_generate_nconf(const char *str, CONF *nconf);
-ASN1_TYPE *ASN1_generate_v3(const char *str, X509V3_CTX *cnf);
-int ASN1_str2mask(const char *str, unsigned long *pmask);
-
-/* ASN1 Print flags */
-
-/* Indicate missing OPTIONAL fields */
-# define ASN1_PCTX_FLAGS_SHOW_ABSENT             0x001
-/* Mark start and end of SEQUENCE */
-# define ASN1_PCTX_FLAGS_SHOW_SEQUENCE           0x002
-/* Mark start and end of SEQUENCE/SET OF */
-# define ASN1_PCTX_FLAGS_SHOW_SSOF               0x004
-/* Show the ASN1 type of primitives */
-# define ASN1_PCTX_FLAGS_SHOW_TYPE               0x008
-/* Don't show ASN1 type of ANY */
-# define ASN1_PCTX_FLAGS_NO_ANY_TYPE             0x010
-/* Don't show ASN1 type of MSTRINGs */
-# define ASN1_PCTX_FLAGS_NO_MSTRING_TYPE         0x020
-/* Don't show field names in SEQUENCE */
-# define ASN1_PCTX_FLAGS_NO_FIELD_NAME           0x040
-/* Show structure names of each SEQUENCE field */
-# define ASN1_PCTX_FLAGS_SHOW_FIELD_STRUCT_NAME  0x080
-/* Don't show structure name even at top level */
-# define ASN1_PCTX_FLAGS_NO_STRUCT_NAME          0x100
-
-int ASN1_item_print(BIO *out, ASN1_VALUE *ifld, int indent,
-                    const ASN1_ITEM *it, const ASN1_PCTX *pctx);
-ASN1_PCTX *ASN1_PCTX_new(void);
-void ASN1_PCTX_free(ASN1_PCTX *p);
-unsigned long ASN1_PCTX_get_flags(const ASN1_PCTX *p);
-void ASN1_PCTX_set_flags(ASN1_PCTX *p, unsigned long flags);
-unsigned long ASN1_PCTX_get_nm_flags(const ASN1_PCTX *p);
-void ASN1_PCTX_set_nm_flags(ASN1_PCTX *p, unsigned long flags);
-unsigned long ASN1_PCTX_get_cert_flags(const ASN1_PCTX *p);
-void ASN1_PCTX_set_cert_flags(ASN1_PCTX *p, unsigned long flags);
-unsigned long ASN1_PCTX_get_oid_flags(const ASN1_PCTX *p);
-void ASN1_PCTX_set_oid_flags(ASN1_PCTX *p, unsigned long flags);
-unsigned long ASN1_PCTX_get_str_flags(const ASN1_PCTX *p);
-void ASN1_PCTX_set_str_flags(ASN1_PCTX *p, unsigned long flags);
-
-ASN1_SCTX *ASN1_SCTX_new(int (*scan_cb) (ASN1_SCTX *ctx));
-void ASN1_SCTX_free(ASN1_SCTX *p);
-const ASN1_ITEM *ASN1_SCTX_get_item(ASN1_SCTX *p);
-const ASN1_TEMPLATE *ASN1_SCTX_get_template(ASN1_SCTX *p);
-unsigned long ASN1_SCTX_get_flags(ASN1_SCTX *p);
-void ASN1_SCTX_set_app_data(ASN1_SCTX *p, void *data);
-void *ASN1_SCTX_get_app_data(ASN1_SCTX *p);
-
-const BIO_METHOD *BIO_f_asn1(void);
-
-BIO *BIO_new_NDEF(BIO *out, ASN1_VALUE *val, const ASN1_ITEM *it);
-
-int i2d_ASN1_bio_stream(BIO *out, ASN1_VALUE *val, BIO *in, int flags,
-                        const ASN1_ITEM *it);
-int PEM_write_bio_ASN1_stream(BIO *out, ASN1_VALUE *val, BIO *in, int flags,
-                              const char *hdr, const ASN1_ITEM *it);
-int SMIME_write_ASN1(BIO *bio, ASN1_VALUE *val, BIO *data, int flags,
-                     int ctype_nid, int econt_nid,
-                     STACK_OF(X509_ALGOR) *mdalgs, const ASN1_ITEM *it);
-ASN1_VALUE *SMIME_read_ASN1(BIO *bio, BIO **bcont, const ASN1_ITEM *it);
-int SMIME_crlf_copy(BIO *in, BIO *out, int flags);
-int SMIME_text(BIO *in, BIO *out);
-
-/* BEGIN ERROR CODES */
-/*
- * The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
-
-int ERR_load_ASN1_strings(void);
-
-/* Error codes for the ASN1 functions. */
-
-/* Function codes. */
-# define ASN1_F_A2D_ASN1_OBJECT                           100
-# define ASN1_F_A2I_ASN1_INTEGER                          102
-# define ASN1_F_A2I_ASN1_STRING                           103
-# define ASN1_F_APPEND_EXP                                176
-# define ASN1_F_ASN1_BIT_STRING_SET_BIT                   183
-# define ASN1_F_ASN1_CB                                   177
-# define ASN1_F_ASN1_CHECK_TLEN                           104
-# define ASN1_F_ASN1_COLLECT                              106
-# define ASN1_F_ASN1_D2I_EX_PRIMITIVE                     108
-# define ASN1_F_ASN1_D2I_FP                               109
-# define ASN1_F_ASN1_D2I_READ_BIO                         107
-# define ASN1_F_ASN1_DIGEST                               184
-# define ASN1_F_ASN1_DO_ADB                               110
-# define ASN1_F_ASN1_DO_LOCK                              233
-# define ASN1_F_ASN1_DUP                                  111
-# define ASN1_F_ASN1_EX_C2I                               204
-# define ASN1_F_ASN1_FIND_END                             190
-# define ASN1_F_ASN1_GENERALIZEDTIME_ADJ                  216
-# define ASN1_F_ASN1_GENERATE_V3                          178
-# define ASN1_F_ASN1_GET_INT64                            224
-# define ASN1_F_ASN1_GET_OBJECT                           114
-# define ASN1_F_ASN1_GET_UINT64                           225
-# define ASN1_F_ASN1_I2D_BIO                              116
-# define ASN1_F_ASN1_I2D_FP                               117
-# define ASN1_F_ASN1_ITEM_D2I_FP                          206
-# define ASN1_F_ASN1_ITEM_DUP                             191
-# define ASN1_F_ASN1_ITEM_EMBED_D2I                       120
-# define ASN1_F_ASN1_ITEM_EMBED_NEW                       121
-# define ASN1_F_ASN1_ITEM_I2D_BIO                         192
-# define ASN1_F_ASN1_ITEM_I2D_FP                          193
-# define ASN1_F_ASN1_ITEM_PACK                            198
-# define ASN1_F_ASN1_ITEM_SIGN                            195
-# define ASN1_F_ASN1_ITEM_SIGN_CTX                        220
-# define ASN1_F_ASN1_ITEM_UNPACK                          199
-# define ASN1_F_ASN1_ITEM_VERIFY                          197
-# define ASN1_F_ASN1_MBSTRING_NCOPY                       122
-# define ASN1_F_ASN1_OBJECT_NEW                           123
-# define ASN1_F_ASN1_OUTPUT_DATA                          214
-# define ASN1_F_ASN1_PCTX_NEW                             205
-# define ASN1_F_ASN1_SCTX_NEW                             221
-# define ASN1_F_ASN1_SIGN                                 128
-# define ASN1_F_ASN1_STR2TYPE                             179
-# define ASN1_F_ASN1_STRING_GET_INT64                     227
-# define ASN1_F_ASN1_STRING_GET_UINT64                    230
-# define ASN1_F_ASN1_STRING_SET                           186
-# define ASN1_F_ASN1_STRING_TABLE_ADD                     129
-# define ASN1_F_ASN1_STRING_TO_BN                         228
-# define ASN1_F_ASN1_STRING_TYPE_NEW                      130
-# define ASN1_F_ASN1_TEMPLATE_EX_D2I                      132
-# define ASN1_F_ASN1_TEMPLATE_NEW                         133
-# define ASN1_F_ASN1_TEMPLATE_NOEXP_D2I                   131
-# define ASN1_F_ASN1_TIME_ADJ                             217
-# define ASN1_F_ASN1_TYPE_GET_INT_OCTETSTRING             134
-# define ASN1_F_ASN1_TYPE_GET_OCTETSTRING                 135
-# define ASN1_F_ASN1_UTCTIME_ADJ                          218
-# define ASN1_F_ASN1_VERIFY                               137
-# define ASN1_F_B64_READ_ASN1                             209
-# define ASN1_F_B64_WRITE_ASN1                            210
-# define ASN1_F_BIO_NEW_NDEF                              208
-# define ASN1_F_BITSTR_CB                                 180
-# define ASN1_F_BN_TO_ASN1_STRING                         229
-# define ASN1_F_C2I_ASN1_BIT_STRING                       189
-# define ASN1_F_C2I_ASN1_INTEGER                          194
-# define ASN1_F_C2I_ASN1_OBJECT                           196
-# define ASN1_F_C2I_IBUF                                  226
-# define ASN1_F_C2I_UINT64_INT                            101
-# define ASN1_F_COLLECT_DATA                              140
-# define ASN1_F_D2I_ASN1_OBJECT                           147
-# define ASN1_F_D2I_ASN1_UINTEGER                         150
-# define ASN1_F_D2I_AUTOPRIVATEKEY                        207
-# define ASN1_F_D2I_PRIVATEKEY                            154
-# define ASN1_F_D2I_PUBLICKEY                             155
-# define ASN1_F_DO_TCREATE                                222
-# define ASN1_F_I2D_ASN1_BIO_STREAM                       211
-# define ASN1_F_I2D_DSA_PUBKEY                            161
-# define ASN1_F_I2D_EC_PUBKEY                             181
-# define ASN1_F_I2D_PRIVATEKEY                            163
-# define ASN1_F_I2D_PUBLICKEY                             164
-# define ASN1_F_I2D_RSA_PUBKEY                            165
-# define ASN1_F_LONG_C2I                                  166
-# define ASN1_F_OID_MODULE_INIT                           174
-# define ASN1_F_PARSE_TAGGING                             182
-# define ASN1_F_PKCS5_PBE2_SET_IV                         167
-# define ASN1_F_PKCS5_PBE2_SET_SCRYPT                     231
-# define ASN1_F_PKCS5_PBE_SET                             202
-# define ASN1_F_PKCS5_PBE_SET0_ALGOR                      215
-# define ASN1_F_PKCS5_PBKDF2_SET                          219
-# define ASN1_F_PKCS5_SCRYPT_SET                          232
-# define ASN1_F_SMIME_READ_ASN1                           212
-# define ASN1_F_SMIME_TEXT                                213
-# define ASN1_F_STBL_MODULE_INIT                          223
-# define ASN1_F_UINT32_C2I                                105
-# define ASN1_F_UINT64_C2I                                112
-# define ASN1_F_X509_CRL_ADD0_REVOKED                     169
-# define ASN1_F_X509_INFO_NEW                             170
-# define ASN1_F_X509_NAME_ENCODE                          203
-# define ASN1_F_X509_NAME_EX_D2I                          158
-# define ASN1_F_X509_NAME_EX_NEW                          171
-# define ASN1_F_X509_PKEY_NEW                             173
-
-/* Reason codes. */
-# define ASN1_R_ADDING_OBJECT                             171
-# define ASN1_R_ASN1_PARSE_ERROR                          203
-# define ASN1_R_ASN1_SIG_PARSE_ERROR                      204
-# define ASN1_R_AUX_ERROR                                 100
-# define ASN1_R_BAD_OBJECT_HEADER                         102
-# define ASN1_R_BMPSTRING_IS_WRONG_LENGTH                 214
-# define ASN1_R_BN_LIB                                    105
-# define ASN1_R_BOOLEAN_IS_WRONG_LENGTH                   106
-# define ASN1_R_BUFFER_TOO_SMALL                          107
-# define ASN1_R_CIPHER_HAS_NO_OBJECT_IDENTIFIER           108
-# define ASN1_R_CONTEXT_NOT_INITIALISED                   217
-# define ASN1_R_DATA_IS_WRONG                             109
-# define ASN1_R_DECODE_ERROR                              110
-# define ASN1_R_DEPTH_EXCEEDED                            174
-# define ASN1_R_DIGEST_AND_KEY_TYPE_NOT_SUPPORTED         198
-# define ASN1_R_ENCODE_ERROR                              112
-# define ASN1_R_ERROR_GETTING_TIME                        173
-# define ASN1_R_ERROR_LOADING_SECTION                     172
-# define ASN1_R_ERROR_SETTING_CIPHER_PARAMS               114
-# define ASN1_R_EXPECTING_AN_INTEGER                      115
-# define ASN1_R_EXPECTING_AN_OBJECT                       116
-# define ASN1_R_EXPLICIT_LENGTH_MISMATCH                  119
-# define ASN1_R_EXPLICIT_TAG_NOT_CONSTRUCTED              120
-# define ASN1_R_FIELD_MISSING                             121
-# define ASN1_R_FIRST_NUM_TOO_LARGE                       122
-# define ASN1_R_HEADER_TOO_LONG                           123
-# define ASN1_R_ILLEGAL_BITSTRING_FORMAT                  175
-# define ASN1_R_ILLEGAL_BOOLEAN                           176
-# define ASN1_R_ILLEGAL_CHARACTERS                        124
-# define ASN1_R_ILLEGAL_FORMAT                            177
-# define ASN1_R_ILLEGAL_HEX                               178
-# define ASN1_R_ILLEGAL_IMPLICIT_TAG                      179
-# define ASN1_R_ILLEGAL_INTEGER                           180
-# define ASN1_R_ILLEGAL_NEGATIVE_VALUE                    226
-# define ASN1_R_ILLEGAL_NESTED_TAGGING                    181
-# define ASN1_R_ILLEGAL_NULL                              125
-# define ASN1_R_ILLEGAL_NULL_VALUE                        182
-# define ASN1_R_ILLEGAL_OBJECT                            183
-# define ASN1_R_ILLEGAL_OPTIONAL_ANY                      126
-# define ASN1_R_ILLEGAL_OPTIONS_ON_ITEM_TEMPLATE          170
-# define ASN1_R_ILLEGAL_PADDING                           221
-# define ASN1_R_ILLEGAL_TAGGED_ANY                        127
-# define ASN1_R_ILLEGAL_TIME_VALUE                        184
-# define ASN1_R_ILLEGAL_ZERO_CONTENT                      222
-# define ASN1_R_INTEGER_NOT_ASCII_FORMAT                  185
-# define ASN1_R_INTEGER_TOO_LARGE_FOR_LONG                128
-# define ASN1_R_INVALID_BIT_STRING_BITS_LEFT              220
-# define ASN1_R_INVALID_BMPSTRING_LENGTH                  129
-# define ASN1_R_INVALID_DIGIT                             130
-# define ASN1_R_INVALID_MIME_TYPE                         205
-# define ASN1_R_INVALID_MODIFIER                          186
-# define ASN1_R_INVALID_NUMBER                            187
-# define ASN1_R_INVALID_OBJECT_ENCODING                   216
-# define ASN1_R_INVALID_SCRYPT_PARAMETERS                 227
-# define ASN1_R_INVALID_SEPARATOR                         131
-# define ASN1_R_INVALID_STRING_TABLE_VALUE                218
-# define ASN1_R_INVALID_UNIVERSALSTRING_LENGTH            133
-# define ASN1_R_INVALID_UTF8STRING                        134
-# define ASN1_R_INVALID_VALUE                             219
-# define ASN1_R_LIST_ERROR                                188
-# define ASN1_R_MIME_NO_CONTENT_TYPE                      206
-# define ASN1_R_MIME_PARSE_ERROR                          207
-# define ASN1_R_MIME_SIG_PARSE_ERROR                      208
-# define ASN1_R_MISSING_EOC                               137
-# define ASN1_R_MISSING_SECOND_NUMBER                     138
-# define ASN1_R_MISSING_VALUE                             189
-# define ASN1_R_MSTRING_NOT_UNIVERSAL                     139
-# define ASN1_R_MSTRING_WRONG_TAG                         140
-# define ASN1_R_NESTED_ASN1_STRING                        197
-# define ASN1_R_NON_HEX_CHARACTERS                        141
-# define ASN1_R_NOT_ASCII_FORMAT                          190
-# define ASN1_R_NOT_ENOUGH_DATA                           142
-# define ASN1_R_NO_CONTENT_TYPE                           209
-# define ASN1_R_NO_MATCHING_CHOICE_TYPE                   143
-# define ASN1_R_NO_MULTIPART_BODY_FAILURE                 210
-# define ASN1_R_NO_MULTIPART_BOUNDARY                     211
-# define ASN1_R_NO_SIG_CONTENT_TYPE                       212
-# define ASN1_R_NULL_IS_WRONG_LENGTH                      144
-# define ASN1_R_OBJECT_NOT_ASCII_FORMAT                   191
-# define ASN1_R_ODD_NUMBER_OF_CHARS                       145
-# define ASN1_R_SECOND_NUMBER_TOO_LARGE                   147
-# define ASN1_R_SEQUENCE_LENGTH_MISMATCH                  148
-# define ASN1_R_SEQUENCE_NOT_CONSTRUCTED                  149
-# define ASN1_R_SEQUENCE_OR_SET_NEEDS_CONFIG              192
-# define ASN1_R_SHORT_LINE                                150
-# define ASN1_R_SIG_INVALID_MIME_TYPE                     213
-# define ASN1_R_STREAMING_NOT_SUPPORTED                   202
-# define ASN1_R_STRING_TOO_LONG                           151
-# define ASN1_R_STRING_TOO_SHORT                          152
-# define ASN1_R_THE_ASN1_OBJECT_IDENTIFIER_IS_NOT_KNOWN_FOR_THIS_MD 154
-# define ASN1_R_TIME_NOT_ASCII_FORMAT                     193
-# define ASN1_R_TOO_LARGE                                 223
-# define ASN1_R_TOO_LONG                                  155
-# define ASN1_R_TOO_SMALL                                 224
-# define ASN1_R_TYPE_NOT_CONSTRUCTED                      156
-# define ASN1_R_TYPE_NOT_PRIMITIVE                        195
-# define ASN1_R_UNEXPECTED_EOC                            159
-# define ASN1_R_UNIVERSALSTRING_IS_WRONG_LENGTH           215
-# define ASN1_R_UNKNOWN_FORMAT                            160
-# define ASN1_R_UNKNOWN_MESSAGE_DIGEST_ALGORITHM          161
-# define ASN1_R_UNKNOWN_OBJECT_TYPE                       162
-# define ASN1_R_UNKNOWN_PUBLIC_KEY_TYPE                   163
-# define ASN1_R_UNKNOWN_SIGNATURE_ALGORITHM               199
-# define ASN1_R_UNKNOWN_TAG                               194
-# define ASN1_R_UNSUPPORTED_ANY_DEFINED_BY_TYPE           164
-# define ASN1_R_UNSUPPORTED_PUBLIC_KEY_TYPE               167
-# define ASN1_R_UNSUPPORTED_TYPE                          196
-# define ASN1_R_WRONG_INTEGER_TYPE                        225
-# define ASN1_R_WRONG_PUBLIC_KEY_TYPE                     200
-# define ASN1_R_WRONG_TAG                                 168
-
-# ifdef  __cplusplus
-}
-# endif
-#endif

gpac-2.2.1.tar.gz/extra_lib/include/openssl/asn1_mac.h Deleted

gpac-2.2.1.tar.gz/extra_lib/include/openssl/asn1t.h Deleted

@@ -1,929 +0,0 @@
-/*
- * Copyright 2000-2016 The OpenSSL Project Authors. All Rights Reserved.
- *
- * Licensed under the OpenSSL license (the "License").  You may not use
- * this file except in compliance with the License.  You can obtain a copy
- * in the file LICENSE in the source distribution or at
- * https://www.openssl.org/source/license.html
- */
-
-#ifndef HEADER_ASN1T_H
-# define HEADER_ASN1T_H
-
-# include <stddef.h>
-# include <openssl/e_os2.h>
-# include <openssl/asn1.h>
-
-# ifdef OPENSSL_BUILD_SHLIBCRYPTO
-#  undef OPENSSL_EXTERN
-#  define OPENSSL_EXTERN OPENSSL_EXPORT
-# endif
-
-/* ASN1 template defines, structures and functions */
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-# ifndef OPENSSL_EXPORT_VAR_AS_FUNCTION
-
-/* Macro to obtain ASN1_ADB pointer from a type (only used internally) */
-#  define ASN1_ADB_ptr(iptr) ((const ASN1_ADB *)(iptr))
-
-/* Macros for start and end of ASN1_ITEM definition */
-
-#  define ASN1_ITEM_start(itname) \
-        OPENSSL_GLOBAL const ASN1_ITEM itname##_it = {
-
-#  define static_ASN1_ITEM_start(itname) \
-        static const ASN1_ITEM itname##_it = {
-
-#  define ASN1_ITEM_end(itname)                 \
-                };
-
-# else
-
-/* Macro to obtain ASN1_ADB pointer from a type (only used internally) */
-#  define ASN1_ADB_ptr(iptr) ((const ASN1_ADB *)(iptr()))
-
-/* Macros for start and end of ASN1_ITEM definition */
-
-#  define ASN1_ITEM_start(itname) \
-        const ASN1_ITEM * itname##_it(void) \
-        { \
-                static const ASN1_ITEM local_it = {
-
-#  define static_ASN1_ITEM_start(itname) \
-        static ASN1_ITEM_start(itname)
-
-#  define ASN1_ITEM_end(itname) \
-                }; \
-        return &local_it; \
-        }
-
-# endif
-
-/* Macros to aid ASN1 template writing */
-
-# define ASN1_ITEM_TEMPLATE(tname) \
-        static const ASN1_TEMPLATE tname##_item_tt
-
-# define ASN1_ITEM_TEMPLATE_END(tname) \
-        ;\
-        ASN1_ITEM_start(tname) \
-                ASN1_ITYPE_PRIMITIVE,\
-                -1,\
-                &tname##_item_tt,\
-                0,\
-                NULL,\
-                0,\
-                #tname \
-        ASN1_ITEM_end(tname)
-# define static_ASN1_ITEM_TEMPLATE_END(tname) \
-        ;\
-        static_ASN1_ITEM_start(tname) \
-                ASN1_ITYPE_PRIMITIVE,\
-                -1,\
-                &tname##_item_tt,\
-                0,\
-                NULL,\
-                0,\
-                #tname \
-        ASN1_ITEM_end(tname)
-
-/* This is a ASN1 type which just embeds a template */
-
-/*-
- * This pair helps declare a SEQUENCE. We can do:
- *
- *      ASN1_SEQUENCE(stname) = {
- *              ... SEQUENCE components ...
- *      } ASN1_SEQUENCE_END(stname)
- *
- *      This will produce an ASN1_ITEM called stname_it
- *      for a structure called stname.
- *
- *      If you want the same structure but a different
- *      name then use:
- *
- *      ASN1_SEQUENCE(itname) = {
- *              ... SEQUENCE components ...
- *      } ASN1_SEQUENCE_END_name(stname, itname)
- *
- *      This will create an item called itname_it using
- *      a structure called stname.
- */
-
-# define ASN1_SEQUENCE(tname) \
-        static const ASN1_TEMPLATE tname##_seq_tt
-
-# define ASN1_SEQUENCE_END(stname) ASN1_SEQUENCE_END_name(stname, stname)
-
-# define static_ASN1_SEQUENCE_END(stname) static_ASN1_SEQUENCE_END_name(stname, stname)
-
-# define ASN1_SEQUENCE_END_name(stname, tname) \
-        ;\
-        ASN1_ITEM_start(tname) \
-                ASN1_ITYPE_SEQUENCE,\
-                V_ASN1_SEQUENCE,\
-                tname##_seq_tt,\
-                sizeof(tname##_seq_tt) / sizeof(ASN1_TEMPLATE),\
-                NULL,\
-                sizeof(stname),\
-                #stname \
-        ASN1_ITEM_end(tname)
-
-# define static_ASN1_SEQUENCE_END_name(stname, tname) \
-        ;\
-        static_ASN1_ITEM_start(tname) \
-                ASN1_ITYPE_SEQUENCE,\
-                V_ASN1_SEQUENCE,\
-                tname##_seq_tt,\
-                sizeof(tname##_seq_tt) / sizeof(ASN1_TEMPLATE),\
-                NULL,\
-                sizeof(stname),\
-                #stname \
-        ASN1_ITEM_end(tname)
-
-# define ASN1_NDEF_SEQUENCE(tname) \
-        ASN1_SEQUENCE(tname)
-
-# define ASN1_NDEF_SEQUENCE_cb(tname, cb) \
-        ASN1_SEQUENCE_cb(tname, cb)
-
-# define ASN1_SEQUENCE_cb(tname, cb) \
-        static const ASN1_AUX tname##_aux = {NULL, 0, 0, 0, cb, 0}; \
-        ASN1_SEQUENCE(tname)
-
-# define ASN1_BROKEN_SEQUENCE(tname) \
-        static const ASN1_AUX tname##_aux = {NULL, ASN1_AFLG_BROKEN, 0, 0, 0, 0}; \
-        ASN1_SEQUENCE(tname)
-
-# define ASN1_SEQUENCE_ref(tname, cb) \
-        static const ASN1_AUX tname##_aux = {NULL, ASN1_AFLG_REFCOUNT, offsetof(tname, references), offsetof(tname, lock), cb, 0}; \
-        ASN1_SEQUENCE(tname)
-
-# define ASN1_SEQUENCE_enc(tname, enc, cb) \
-        static const ASN1_AUX tname##_aux = {NULL, ASN1_AFLG_ENCODING, 0, 0, cb, offsetof(tname, enc)}; \
-        ASN1_SEQUENCE(tname)
-
-# define ASN1_NDEF_SEQUENCE_END(tname) \
-        ;\
-        ASN1_ITEM_start(tname) \
-                ASN1_ITYPE_NDEF_SEQUENCE,\
-                V_ASN1_SEQUENCE,\
-                tname##_seq_tt,\
-                sizeof(tname##_seq_tt) / sizeof(ASN1_TEMPLATE),\
-                NULL,\
-                sizeof(tname),\
-                #tname \
-        ASN1_ITEM_end(tname)
-# define static_ASN1_NDEF_SEQUENCE_END(tname) \
-        ;\
-        static_ASN1_ITEM_start(tname) \
-                ASN1_ITYPE_NDEF_SEQUENCE,\
-                V_ASN1_SEQUENCE,\
-                tname##_seq_tt,\
-                sizeof(tname##_seq_tt) / sizeof(ASN1_TEMPLATE),\
-                NULL,\
-                sizeof(tname),\
-                #tname \
-        ASN1_ITEM_end(tname)
-
-# define ASN1_BROKEN_SEQUENCE_END(stname) ASN1_SEQUENCE_END_ref(stname, stname)
-# define static_ASN1_BROKEN_SEQUENCE_END(stname) \
-        static_ASN1_SEQUENCE_END_ref(stname, stname)
-
-# define ASN1_SEQUENCE_END_enc(stname, tname) ASN1_SEQUENCE_END_ref(stname, tname)
-
-# define ASN1_SEQUENCE_END_cb(stname, tname) ASN1_SEQUENCE_END_ref(stname, tname)
-# define static_ASN1_SEQUENCE_END_cb(stname, tname) static_ASN1_SEQUENCE_END_ref(stname, tname)
-
-# define ASN1_SEQUENCE_END_ref(stname, tname) \
-        ;\
-        ASN1_ITEM_start(tname) \
-                ASN1_ITYPE_SEQUENCE,\
-                V_ASN1_SEQUENCE,\
-                tname##_seq_tt,\
-                sizeof(tname##_seq_tt) / sizeof(ASN1_TEMPLATE),\
-                &tname##_aux,\
-                sizeof(stname),\
-                #stname \
-        ASN1_ITEM_end(tname)
-# define static_ASN1_SEQUENCE_END_ref(stname, tname) \
-        ;\
-        static_ASN1_ITEM_start(tname) \
-                ASN1_ITYPE_SEQUENCE,\
-                V_ASN1_SEQUENCE,\
-                tname##_seq_tt,\
-                sizeof(tname##_seq_tt) / sizeof(ASN1_TEMPLATE),\
-                &tname##_aux,\
-                sizeof(stname),\
-                #stname \
-        ASN1_ITEM_end(tname)
-
-# define ASN1_NDEF_SEQUENCE_END_cb(stname, tname) \
-        ;\
-        ASN1_ITEM_start(tname) \
-                ASN1_ITYPE_NDEF_SEQUENCE,\
-                V_ASN1_SEQUENCE,\
-                tname##_seq_tt,\
-                sizeof(tname##_seq_tt) / sizeof(ASN1_TEMPLATE),\
-                &tname##_aux,\
-                sizeof(stname),\
-                #stname \
-        ASN1_ITEM_end(tname)
-
-/*-
- * This pair helps declare a CHOICE type. We can do:
- *
- *      ASN1_CHOICE(chname) = {
- *              ... CHOICE options ...
- *      ASN1_CHOICE_END(chname)
- *
- *      This will produce an ASN1_ITEM called chname_it
- *      for a structure called chname. The structure
- *      definition must look like this:
- *      typedef struct {
- *              int type;
- *              union {
- *                      ASN1_SOMETHING *opt1;
- *                      ASN1_SOMEOTHER *opt2;
- *              } value;
- *      } chname;
- *
- *      the name of the selector must be 'type'.
- *      to use an alternative selector name use the
- *      ASN1_CHOICE_END_selector() version.
- */
-
-# define ASN1_CHOICE(tname) \
-        static const ASN1_TEMPLATE tname##_ch_tt
-
-# define ASN1_CHOICE_cb(tname, cb) \
-        static const ASN1_AUX tname##_aux = {NULL, 0, 0, 0, cb, 0}; \
-        ASN1_CHOICE(tname)
-
-# define ASN1_CHOICE_END(stname) ASN1_CHOICE_END_name(stname, stname)
-
-# define static_ASN1_CHOICE_END(stname) static_ASN1_CHOICE_END_name(stname, stname)
-
-# define ASN1_CHOICE_END_name(stname, tname) ASN1_CHOICE_END_selector(stname, tname, type)
-
-# define static_ASN1_CHOICE_END_name(stname, tname) static_ASN1_CHOICE_END_selector(stname, tname, type)
-
-# define ASN1_CHOICE_END_selector(stname, tname, selname) \
-        ;\
-        ASN1_ITEM_start(tname) \
-                ASN1_ITYPE_CHOICE,\
-                offsetof(stname,selname) ,\
-                tname##_ch_tt,\
-                sizeof(tname##_ch_tt) / sizeof(ASN1_TEMPLATE),\
-                NULL,\
-                sizeof(stname),\
-                #stname \
-        ASN1_ITEM_end(tname)
-
-# define static_ASN1_CHOICE_END_selector(stname, tname, selname) \
-        ;\
-        static_ASN1_ITEM_start(tname) \
-                ASN1_ITYPE_CHOICE,\
-                offsetof(stname,selname) ,\
-                tname##_ch_tt,\
-                sizeof(tname##_ch_tt) / sizeof(ASN1_TEMPLATE),\
-                NULL,\
-                sizeof(stname),\
-                #stname \
-        ASN1_ITEM_end(tname)
-
-# define ASN1_CHOICE_END_cb(stname, tname, selname) \
-        ;\
-        ASN1_ITEM_start(tname) \
-                ASN1_ITYPE_CHOICE,\
-                offsetof(stname,selname) ,\
-                tname##_ch_tt,\
-                sizeof(tname##_ch_tt) / sizeof(ASN1_TEMPLATE),\
-                &tname##_aux,\
-                sizeof(stname),\
-                #stname \
-        ASN1_ITEM_end(tname)
-
-/* This helps with the template wrapper form of ASN1_ITEM */
-
-# define ASN1_EX_TEMPLATE_TYPE(flags, tag, name, type) { \
-        (flags), (tag), 0,\
-        #name, ASN1_ITEM_ref(type) }
-
-/* These help with SEQUENCE or CHOICE components */
-
-/* used to declare other types */
-
-# define ASN1_EX_TYPE(flags, tag, stname, field, type) { \
-        (flags), (tag), offsetof(stname, field),\
-        #field, ASN1_ITEM_ref(type) }
-
-/* implicit and explicit helper macros */
-
-# define ASN1_IMP_EX(stname, field, type, tag, ex) \
-                ASN1_EX_TYPE(ASN1_TFLG_IMPLICIT | ex, tag, stname, field, type)
-
-# define ASN1_EXP_EX(stname, field, type, tag, ex) \
-                ASN1_EX_TYPE(ASN1_TFLG_EXPLICIT | ex, tag, stname, field, type)
-
-/* Any defined by macros: the field used is in the table itself */
-
-# ifndef OPENSSL_EXPORT_VAR_AS_FUNCTION
-#  define ASN1_ADB_OBJECT(tblname) { ASN1_TFLG_ADB_OID, -1, 0, #tblname, (const ASN1_ITEM *)&(tblname##_adb) }
-#  define ASN1_ADB_INTEGER(tblname) { ASN1_TFLG_ADB_INT, -1, 0, #tblname, (const ASN1_ITEM *)&(tblname##_adb) }
-# else
-#  define ASN1_ADB_OBJECT(tblname) { ASN1_TFLG_ADB_OID, -1, 0, #tblname, tblname##_adb }
-#  define ASN1_ADB_INTEGER(tblname) { ASN1_TFLG_ADB_INT, -1, 0, #tblname, tblname##_adb }
-# endif
-/* Plain simple type */
-# define ASN1_SIMPLE(stname, field, type) ASN1_EX_TYPE(0,0, stname, field, type)
-/* Embedded simple type */
-# define ASN1_EMBED(stname, field, type) ASN1_EX_TYPE(ASN1_TFLG_EMBED,0, stname, field, type)
-
-/* OPTIONAL simple type */
-# define ASN1_OPT(stname, field, type) ASN1_EX_TYPE(ASN1_TFLG_OPTIONAL, 0, stname, field, type)
-# define ASN1_OPT_EMBED(stname, field, type) ASN1_EX_TYPE(ASN1_TFLG_OPTIONAL|ASN1_TFLG_EMBED, 0, stname, field, type)
-
-/* IMPLICIT tagged simple type */
-# define ASN1_IMP(stname, field, type, tag) ASN1_IMP_EX(stname, field, type, tag, 0)
-# define ASN1_IMP_EMBED(stname, field, type, tag) ASN1_IMP_EX(stname, field, type, tag, ASN1_TFLG_EMBED)
-
-/* IMPLICIT tagged OPTIONAL simple type */
-# define ASN1_IMP_OPT(stname, field, type, tag) ASN1_IMP_EX(stname, field, type, tag, ASN1_TFLG_OPTIONAL)
-# define ASN1_IMP_OPT_EMBED(stname, field, type, tag) ASN1_IMP_EX(stname, field, type, tag, ASN1_TFLG_OPTIONAL|ASN1_TFLG_EMBED)
-
-/* Same as above but EXPLICIT */
-
-# define ASN1_EXP(stname, field, type, tag) ASN1_EXP_EX(stname, field, type, tag, 0)
-# define ASN1_EXP_EMBED(stname, field, type, tag) ASN1_EXP_EX(stname, field, type, tag, ASN1_TFLG_EMBED)
-# define ASN1_EXP_OPT(stname, field, type, tag) ASN1_EXP_EX(stname, field, type, tag, ASN1_TFLG_OPTIONAL)
-# define ASN1_EXP_OPT_EMBED(stname, field, type, tag) ASN1_EXP_EX(stname, field, type, tag, ASN1_TFLG_OPTIONAL|ASN1_TFLG_EMBED)
-
-/* SEQUENCE OF type */
-# define ASN1_SEQUENCE_OF(stname, field, type) \
-                ASN1_EX_TYPE(ASN1_TFLG_SEQUENCE_OF, 0, stname, field, type)
-
-/* OPTIONAL SEQUENCE OF */
-# define ASN1_SEQUENCE_OF_OPT(stname, field, type) \
-                ASN1_EX_TYPE(ASN1_TFLG_SEQUENCE_OF|ASN1_TFLG_OPTIONAL, 0, stname, field, type)
-
-/* Same as above but for SET OF */
-
-# define ASN1_SET_OF(stname, field, type) \
-                ASN1_EX_TYPE(ASN1_TFLG_SET_OF, 0, stname, field, type)
-
-# define ASN1_SET_OF_OPT(stname, field, type) \
-                ASN1_EX_TYPE(ASN1_TFLG_SET_OF|ASN1_TFLG_OPTIONAL, 0, stname, field, type)
-
-/* Finally compound types of SEQUENCE, SET, IMPLICIT, EXPLICIT and OPTIONAL */
-
-# define ASN1_IMP_SET_OF(stname, field, type, tag) \
-                        ASN1_IMP_EX(stname, field, type, tag, ASN1_TFLG_SET_OF)
-
-# define ASN1_EXP_SET_OF(stname, field, type, tag) \
-                        ASN1_EXP_EX(stname, field, type, tag, ASN1_TFLG_SET_OF)
-
-# define ASN1_IMP_SET_OF_OPT(stname, field, type, tag) \
-                        ASN1_IMP_EX(stname, field, type, tag, ASN1_TFLG_SET_OF|ASN1_TFLG_OPTIONAL)
-
-# define ASN1_EXP_SET_OF_OPT(stname, field, type, tag) \
-                        ASN1_EXP_EX(stname, field, type, tag, ASN1_TFLG_SET_OF|ASN1_TFLG_OPTIONAL)
-
-# define ASN1_IMP_SEQUENCE_OF(stname, field, type, tag) \
-                        ASN1_IMP_EX(stname, field, type, tag, ASN1_TFLG_SEQUENCE_OF)
-
-# define ASN1_IMP_SEQUENCE_OF_OPT(stname, field, type, tag) \
-                        ASN1_IMP_EX(stname, field, type, tag, ASN1_TFLG_SEQUENCE_OF|ASN1_TFLG_OPTIONAL)
-
-# define ASN1_EXP_SEQUENCE_OF(stname, field, type, tag) \
-                        ASN1_EXP_EX(stname, field, type, tag, ASN1_TFLG_SEQUENCE_OF)
-
-# define ASN1_EXP_SEQUENCE_OF_OPT(stname, field, type, tag) \
-                        ASN1_EXP_EX(stname, field, type, tag, ASN1_TFLG_SEQUENCE_OF|ASN1_TFLG_OPTIONAL)
-
-/* EXPLICIT using indefinite length constructed form */
-# define ASN1_NDEF_EXP(stname, field, type, tag) \
-                        ASN1_EXP_EX(stname, field, type, tag, ASN1_TFLG_NDEF)
-
-/* EXPLICIT OPTIONAL using indefinite length constructed form */
-# define ASN1_NDEF_EXP_OPT(stname, field, type, tag) \
-                        ASN1_EXP_EX(stname, field, type, tag, ASN1_TFLG_OPTIONAL|ASN1_TFLG_NDEF)
-
-/* Macros for the ASN1_ADB structure */
-
-# define ASN1_ADB(name) \
-        static const ASN1_ADB_TABLE name##_adbtbl
-
-# ifndef OPENSSL_EXPORT_VAR_AS_FUNCTION
-
-#  define ASN1_ADB_END(name, flags, field, adb_cb, def, none) \
-        ;\
-        static const ASN1_ADB name##_adb = {\
-                flags,\
-                offsetof(name, field),\
-                adb_cb,\
-                name##_adbtbl,\
-                sizeof(name##_adbtbl) / sizeof(ASN1_ADB_TABLE),\
-                def,\
-                none\
-        }
-
-# else
-
-#  define ASN1_ADB_END(name, flags, field, adb_cb, def, none) \
-        ;\
-        static const ASN1_ITEM *name##_adb(void) \
-        { \
-        static const ASN1_ADB internal_adb = \
-                {\
-                flags,\
-                offsetof(name, field),\
-                adb_cb,\
-                name##_adbtbl,\
-                sizeof(name##_adbtbl) / sizeof(ASN1_ADB_TABLE),\
-                def,\
-                none\
-                }; \
-                return (const ASN1_ITEM *) &internal_adb; \
-        } \
-        void dummy_function(void)
-
-# endif
-
-# define ADB_ENTRY(val, template) {val, template}
-
-# define ASN1_ADB_TEMPLATE(name) \
-        static const ASN1_TEMPLATE name##_tt
-
-/*
- * This is the ASN1 template structure that defines a wrapper round the
- * actual type. It determines the actual position of the field in the value
- * structure, various flags such as OPTIONAL and the field name.
- */
-
-struct ASN1_TEMPLATE_st {
-    unsigned long flags;        /* Various flags */
-    long tag;                   /* tag, not used if no tagging */
-    unsigned long offset;       /* Offset of this field in structure */
-    const char *field_name;     /* Field name */
-    ASN1_ITEM_EXP *item;        /* Relevant ASN1_ITEM or ASN1_ADB */
-};
-
-/* Macro to extract ASN1_ITEM and ASN1_ADB pointer from ASN1_TEMPLATE */
-
-# define ASN1_TEMPLATE_item(t) (t->item_ptr)
-# define ASN1_TEMPLATE_adb(t) (t->item_ptr)
-
-typedef struct ASN1_ADB_TABLE_st ASN1_ADB_TABLE;
-typedef struct ASN1_ADB_st ASN1_ADB;
-
-struct ASN1_ADB_st {
-    unsigned long flags;        /* Various flags */
-    unsigned long offset;       /* Offset of selector field */
-    int (*adb_cb)(long *psel);  /* Application callback */
-    const ASN1_ADB_TABLE *tbl;  /* Table of possible types */
-    long tblcount;              /* Number of entries in tbl */
-    const ASN1_TEMPLATE *default_tt; /* Type to use if no match */
-    const ASN1_TEMPLATE *null_tt; /* Type to use if selector is NULL */
-};
-
-struct ASN1_ADB_TABLE_st {
-    long value;                 /* NID for an object or value for an int */
-    const ASN1_TEMPLATE tt;     /* item for this value */
-};
-
-/* template flags */
-
-/* Field is optional */
-# define ASN1_TFLG_OPTIONAL      (0x1)
-
-/* Field is a SET OF */
-# define ASN1_TFLG_SET_OF        (0x1 << 1)
-
-/* Field is a SEQUENCE OF */
-# define ASN1_TFLG_SEQUENCE_OF   (0x2 << 1)
-
-/*
- * Special case: this refers to a SET OF that will be sorted into DER order
- * when encoded *and* the corresponding STACK will be modified to match the
- * new order.
- */
-# define ASN1_TFLG_SET_ORDER     (0x3 << 1)
-
-/* Mask for SET OF or SEQUENCE OF */
-# define ASN1_TFLG_SK_MASK       (0x3 << 1)
-
-/*
- * These flags mean the tag should be taken from the tag field. If EXPLICIT
- * then the underlying type is used for the inner tag.
- */
-
-/* IMPLICIT tagging */
-# define ASN1_TFLG_IMPTAG        (0x1 << 3)
-
-/* EXPLICIT tagging, inner tag from underlying type */
-# define ASN1_TFLG_EXPTAG        (0x2 << 3)
-
-# define ASN1_TFLG_TAG_MASK      (0x3 << 3)
-
-/* context specific IMPLICIT */
-# define ASN1_TFLG_IMPLICIT      ASN1_TFLG_IMPTAG|ASN1_TFLG_CONTEXT
-
-/* context specific EXPLICIT */
-# define ASN1_TFLG_EXPLICIT      ASN1_TFLG_EXPTAG|ASN1_TFLG_CONTEXT
-
-/*
- * If tagging is in force these determine the type of tag to use. Otherwise
- * the tag is determined by the underlying type. These values reflect the
- * actual octet format.
- */
-
-/* Universal tag */
-# define ASN1_TFLG_UNIVERSAL     (0x0<<6)
-/* Application tag */
-# define ASN1_TFLG_APPLICATION   (0x1<<6)
-/* Context specific tag */
-# define ASN1_TFLG_CONTEXT       (0x2<<6)
-/* Private tag */
-# define ASN1_TFLG_PRIVATE       (0x3<<6)
-
-# define ASN1_TFLG_TAG_CLASS     (0x3<<6)
-
-/*
- * These are for ANY DEFINED BY type. In this case the 'item' field points to
- * an ASN1_ADB structure which contains a table of values to decode the
- * relevant type
- */
-
-# define ASN1_TFLG_ADB_MASK      (0x3<<8)
-
-# define ASN1_TFLG_ADB_OID       (0x1<<8)
-
-# define ASN1_TFLG_ADB_INT       (0x1<<9)
-
-/*
- * This flag when present in a SEQUENCE OF, SET OF or EXPLICIT causes
- * indefinite length constructed encoding to be used if required.
- */
-
-# define ASN1_TFLG_NDEF          (0x1<<11)
-
-/* Field is embedded and not a pointer */
-# define ASN1_TFLG_EMBED         (0x1 << 12)
-
-/* This is the actual ASN1 item itself */
-
-struct ASN1_ITEM_st {
-    char itype;                 /* The item type, primitive, SEQUENCE, CHOICE
-                                 * or extern */
-    long utype;                 /* underlying type */
-    const ASN1_TEMPLATE *templates; /* If SEQUENCE or CHOICE this contains
-                                     * the contents */
-    long tcount;                /* Number of templates if SEQUENCE or CHOICE */
-    const void *funcs;          /* functions that handle this type */
-    long size;                  /* Structure size (usually) */
-    const char *sname;          /* Structure name */
-};
-
-/*-
- * These are values for the itype field and
- * determine how the type is interpreted.
- *
- * For PRIMITIVE types the underlying type
- * determines the behaviour if items is NULL.
- *
- * Otherwise templates must contain a single
- * template and the type is treated in the
- * same way as the type specified in the template.
- *
- * For SEQUENCE types the templates field points
- * to the members, the size field is the
- * structure size.
- *
- * For CHOICE types the templates field points
- * to each possible member (typically a union)
- * and the 'size' field is the offset of the
- * selector.
- *
- * The 'funcs' field is used for application
- * specific functions.
- *
- * The EXTERN type uses a new style d2i/i2d.
- * The new style should be used where possible
- * because it avoids things like the d2i IMPLICIT
- * hack.
- *
- * MSTRING is a multiple string type, it is used
- * for a CHOICE of character strings where the
- * actual strings all occupy an ASN1_STRING
- * structure. In this case the 'utype' field
- * has a special meaning, it is used as a mask
- * of acceptable types using the B_ASN1 constants.
- *
- * NDEF_SEQUENCE is the same as SEQUENCE except
- * that it will use indefinite length constructed
- * encoding if requested.
- *
- */
-
-# define ASN1_ITYPE_PRIMITIVE            0x0
-
-# define ASN1_ITYPE_SEQUENCE             0x1
-
-# define ASN1_ITYPE_CHOICE               0x2
-
-# define ASN1_ITYPE_EXTERN               0x4
-
-# define ASN1_ITYPE_MSTRING              0x5
-
-# define ASN1_ITYPE_NDEF_SEQUENCE        0x6
-
-/*
- * Cache for ASN1 tag and length, so we don't keep re-reading it for things
- * like CHOICE
- */
-
-struct ASN1_TLC_st {
-    char valid;                 /* Values below are valid */
-    int ret;                    /* return value */
-    long plen;                  /* length */
-    int ptag;                   /* class value */
-    int pclass;                 /* class value */
-    int hdrlen;                 /* header length */
-};
-
-/* Typedefs for ASN1 function pointers */
-typedef int ASN1_ex_d2i(ASN1_VALUE **pval, const unsigned char **in, long len,
-                        const ASN1_ITEM *it, int tag, int aclass, char opt,
-                        ASN1_TLC *ctx);
-
-typedef int ASN1_ex_i2d(ASN1_VALUE **pval, unsigned char **out,
-                        const ASN1_ITEM *it, int tag, int aclass);
-typedef int ASN1_ex_new_func(ASN1_VALUE **pval, const ASN1_ITEM *it);
-typedef void ASN1_ex_free_func(ASN1_VALUE **pval, const ASN1_ITEM *it);
-
-typedef int ASN1_ex_print_func(BIO *out, ASN1_VALUE **pval,
-                               int indent, const char *fname,
-                               const ASN1_PCTX *pctx);
-
-typedef int ASN1_primitive_i2c(ASN1_VALUE **pval, unsigned char *cont,
-                               int *putype, const ASN1_ITEM *it);
-typedef int ASN1_primitive_c2i(ASN1_VALUE **pval, const unsigned char *cont,
-                               int len, int utype, char *free_cont,
-                               const ASN1_ITEM *it);
-typedef int ASN1_primitive_print(BIO *out, ASN1_VALUE **pval,
-                                 const ASN1_ITEM *it, int indent,
-                                 const ASN1_PCTX *pctx);
-
-typedef struct ASN1_EXTERN_FUNCS_st {
-    void *app_data;
-    ASN1_ex_new_func *asn1_ex_new;
-    ASN1_ex_free_func *asn1_ex_free;
-    ASN1_ex_free_func *asn1_ex_clear;
-    ASN1_ex_d2i *asn1_ex_d2i;
-    ASN1_ex_i2d *asn1_ex_i2d;
-    ASN1_ex_print_func *asn1_ex_print;
-} ASN1_EXTERN_FUNCS;
-
-typedef struct ASN1_PRIMITIVE_FUNCS_st {
-    void *app_data;
-    unsigned long flags;
-    ASN1_ex_new_func *prim_new;
-    ASN1_ex_free_func *prim_free;
-    ASN1_ex_free_func *prim_clear;
-    ASN1_primitive_c2i *prim_c2i;
-    ASN1_primitive_i2c *prim_i2c;
-    ASN1_primitive_print *prim_print;
-} ASN1_PRIMITIVE_FUNCS;
-
-/*
- * This is the ASN1_AUX structure: it handles various miscellaneous
- * requirements. For example the use of reference counts and an informational
- * callback. The "informational callback" is called at various points during
- * the ASN1 encoding and decoding. It can be used to provide minor
- * customisation of the structures used. This is most useful where the
- * supplied routines *almost* do the right thing but need some extra help at
- * a few points. If the callback returns zero then it is assumed a fatal
- * error has occurred and the main operation should be abandoned. If major
- * changes in the default behaviour are required then an external type is
- * more appropriate.
- */
-
-typedef int ASN1_aux_cb(int operation, ASN1_VALUE **in, const ASN1_ITEM *it,
-                        void *exarg);
-
-typedef struct ASN1_AUX_st {
-    void *app_data;
-    int flags;
-    int ref_offset;             /* Offset of reference value */
-    int ref_lock;               /* Lock type to use */
-    ASN1_aux_cb *asn1_cb;
-    int enc_offset;             /* Offset of ASN1_ENCODING structure */
-} ASN1_AUX;
-
-/* For print related callbacks exarg points to this structure */
-typedef struct ASN1_PRINT_ARG_st {
-    BIO *out;
-    int indent;
-    const ASN1_PCTX *pctx;
-} ASN1_PRINT_ARG;
-
-/* For streaming related callbacks exarg points to this structure */
-typedef struct ASN1_STREAM_ARG_st {
-    /* BIO to stream through */
-    BIO *out;
-    /* BIO with filters appended */
-    BIO *ndef_bio;
-    /* Streaming I/O boundary */
-    unsigned char **boundary;
-} ASN1_STREAM_ARG;
-
-/* Flags in ASN1_AUX */
-
-/* Use a reference count */
-# define ASN1_AFLG_REFCOUNT      1
-/* Save the encoding of structure (useful for signatures) */
-# define ASN1_AFLG_ENCODING      2
-/* The Sequence length is invalid */
-# define ASN1_AFLG_BROKEN        4
-
-/* operation values for asn1_cb */
-
-# define ASN1_OP_NEW_PRE         0
-# define ASN1_OP_NEW_POST        1
-# define ASN1_OP_FREE_PRE        2
-# define ASN1_OP_FREE_POST       3
-# define ASN1_OP_D2I_PRE         4
-# define ASN1_OP_D2I_POST        5
-# define ASN1_OP_I2D_PRE         6
-# define ASN1_OP_I2D_POST        7
-# define ASN1_OP_PRINT_PRE       8
-# define ASN1_OP_PRINT_POST      9
-# define ASN1_OP_STREAM_PRE      10
-# define ASN1_OP_STREAM_POST     11
-# define ASN1_OP_DETACHED_PRE    12
-# define ASN1_OP_DETACHED_POST   13
-
-/* Macro to implement a primitive type */
-# define IMPLEMENT_ASN1_TYPE(stname) IMPLEMENT_ASN1_TYPE_ex(stname, stname, 0)
-# define IMPLEMENT_ASN1_TYPE_ex(itname, vname, ex) \
-                                ASN1_ITEM_start(itname) \
-                                        ASN1_ITYPE_PRIMITIVE, V_##vname, NULL, 0, NULL, ex, #itname \
-                                ASN1_ITEM_end(itname)
-
-/* Macro to implement a multi string type */
-# define IMPLEMENT_ASN1_MSTRING(itname, mask) \
-                                ASN1_ITEM_start(itname) \
-                                        ASN1_ITYPE_MSTRING, mask, NULL, 0, NULL, sizeof(ASN1_STRING), #itname \
-                                ASN1_ITEM_end(itname)
-
-# define IMPLEMENT_EXTERN_ASN1(sname, tag, fptrs) \
-        ASN1_ITEM_start(sname) \
-                ASN1_ITYPE_EXTERN, \
-                tag, \
-                NULL, \
-                0, \
-                &fptrs, \
-                0, \
-                #sname \
-        ASN1_ITEM_end(sname)
-
-/* Macro to implement standard functions in terms of ASN1_ITEM structures */
-
-# define IMPLEMENT_ASN1_FUNCTIONS(stname) IMPLEMENT_ASN1_FUNCTIONS_fname(stname, stname, stname)
-
-# define IMPLEMENT_ASN1_FUNCTIONS_name(stname, itname) IMPLEMENT_ASN1_FUNCTIONS_fname(stname, itname, itname)
-
-# define IMPLEMENT_ASN1_FUNCTIONS_ENCODE_name(stname, itname) \
-                        IMPLEMENT_ASN1_FUNCTIONS_ENCODE_fname(stname, itname, itname)
-
-# define IMPLEMENT_STATIC_ASN1_ALLOC_FUNCTIONS(stname) \
-                IMPLEMENT_ASN1_ALLOC_FUNCTIONS_pfname(static, stname, stname, stname)
-
-# define IMPLEMENT_ASN1_ALLOC_FUNCTIONS(stname) \
-                IMPLEMENT_ASN1_ALLOC_FUNCTIONS_fname(stname, stname, stname)
-
-# define IMPLEMENT_ASN1_ALLOC_FUNCTIONS_pfname(pre, stname, itname, fname) \
-        pre stname *fname##_new(void) \
-        { \
-                return (stname *)ASN1_item_new(ASN1_ITEM_rptr(itname)); \
-        } \
-        pre void fname##_free(stname *a) \
-        { \
-                ASN1_item_free((ASN1_VALUE *)a, ASN1_ITEM_rptr(itname)); \
-        }
-
-# define IMPLEMENT_ASN1_ALLOC_FUNCTIONS_fname(stname, itname, fname) \
-        stname *fname##_new(void) \
-        { \
-                return (stname *)ASN1_item_new(ASN1_ITEM_rptr(itname)); \
-        } \
-        void fname##_free(stname *a) \
-        { \
-                ASN1_item_free((ASN1_VALUE *)a, ASN1_ITEM_rptr(itname)); \
-        }
-
-# define IMPLEMENT_ASN1_FUNCTIONS_fname(stname, itname, fname) \
-        IMPLEMENT_ASN1_ENCODE_FUNCTIONS_fname(stname, itname, fname) \
-        IMPLEMENT_ASN1_ALLOC_FUNCTIONS_fname(stname, itname, fname)
-
-# define IMPLEMENT_ASN1_ENCODE_FUNCTIONS_fname(stname, itname, fname) \
-        stname *d2i_##fname(stname **a, const unsigned char **in, long len) \
-        { \
-                return (stname *)ASN1_item_d2i((ASN1_VALUE **)a, in, len, ASN1_ITEM_rptr(itname));\
-        } \
-        int i2d_##fname(stname *a, unsigned char **out) \
-        { \
-                return ASN1_item_i2d((ASN1_VALUE *)a, out, ASN1_ITEM_rptr(itname));\
-        }
-
-# define IMPLEMENT_ASN1_NDEF_FUNCTION(stname) \
-        int i2d_##stname##_NDEF(stname *a, unsigned char **out) \
-        { \
-                return ASN1_item_ndef_i2d((ASN1_VALUE *)a, out, ASN1_ITEM_rptr(stname));\
-        }
-
-# define IMPLEMENT_STATIC_ASN1_ENCODE_FUNCTIONS(stname) \
-        static stname *d2i_##stname(stname **a, \
-                                   const unsigned char **in, long len) \
-        { \
-                return (stname *)ASN1_item_d2i((ASN1_VALUE **)a, in, len, \
-                                               ASN1_ITEM_rptr(stname)); \
-        } \
-        static int i2d_##stname(stname *a, unsigned char **out) \
-        { \
-                return ASN1_item_i2d((ASN1_VALUE *)a, out, \
-                                     ASN1_ITEM_rptr(stname)); \
-        }
-
-/*
- * This includes evil casts to remove const: they will go away when full ASN1
- * constification is done.
- */
-# define IMPLEMENT_ASN1_ENCODE_FUNCTIONS_const_fname(stname, itname, fname) \
-        stname *d2i_##fname(stname **a, const unsigned char **in, long len) \
-        { \
-                return (stname *)ASN1_item_d2i((ASN1_VALUE **)a, in, len, ASN1_ITEM_rptr(itname));\
-        } \
-        int i2d_##fname(const stname *a, unsigned char **out) \
-        { \
-                return ASN1_item_i2d((ASN1_VALUE *)a, out, ASN1_ITEM_rptr(itname));\
-        }
-
-# define IMPLEMENT_ASN1_DUP_FUNCTION(stname) \
-        stname * stname##_dup(stname *x) \
-        { \
-        return ASN1_item_dup(ASN1_ITEM_rptr(stname), x); \
-        }
-
-# define IMPLEMENT_ASN1_PRINT_FUNCTION(stname) \
-        IMPLEMENT_ASN1_PRINT_FUNCTION_fname(stname, stname, stname)
-
-# define IMPLEMENT_ASN1_PRINT_FUNCTION_fname(stname, itname, fname) \
-        int fname##_print_ctx(BIO *out, stname *x, int indent, \
-                                                const ASN1_PCTX *pctx) \
-        { \
-                return ASN1_item_print(out, (ASN1_VALUE *)x, indent, \
-                        ASN1_ITEM_rptr(itname), pctx); \
-        }
-
-# define IMPLEMENT_ASN1_FUNCTIONS_const(name) \
-                IMPLEMENT_ASN1_FUNCTIONS_const_fname(name, name, name)
-
-# define IMPLEMENT_ASN1_FUNCTIONS_const_fname(stname, itname, fname) \
-        IMPLEMENT_ASN1_ENCODE_FUNCTIONS_const_fname(stname, itname, fname) \
-        IMPLEMENT_ASN1_ALLOC_FUNCTIONS_fname(stname, itname, fname)
-
-/* external definitions for primitive types */
-
-DECLARE_ASN1_ITEM(ASN1_BOOLEAN)
-DECLARE_ASN1_ITEM(ASN1_TBOOLEAN)
-DECLARE_ASN1_ITEM(ASN1_FBOOLEAN)
-DECLARE_ASN1_ITEM(ASN1_SEQUENCE)
-DECLARE_ASN1_ITEM(CBIGNUM)
-DECLARE_ASN1_ITEM(BIGNUM)
-DECLARE_ASN1_ITEM(LONG)
-DECLARE_ASN1_ITEM(ZLONG)
-
-DEFINE_STACK_OF(ASN1_VALUE)
-
-/* Functions used internally by the ASN1 code */
-
-int ASN1_item_ex_new(ASN1_VALUE **pval, const ASN1_ITEM *it);
-void ASN1_item_ex_free(ASN1_VALUE **pval, const ASN1_ITEM *it);
-
-int ASN1_item_ex_d2i(ASN1_VALUE **pval, const unsigned char **in, long len,
-                     const ASN1_ITEM *it, int tag, int aclass, char opt,
-                     ASN1_TLC *ctx);
-
-int ASN1_item_ex_i2d(ASN1_VALUE **pval, unsigned char **out,
-                     const ASN1_ITEM *it, int tag, int aclass);
-
-#ifdef  __cplusplus
-}
-#endif
-#endif

gpac-2.2.1.tar.gz/extra_lib/include/openssl/async.h Deleted

@@ -1,98 +0,0 @@
-/*
- * Copyright 2015-2016 The OpenSSL Project Authors. All Rights Reserved.
- *
- * Licensed under the OpenSSL license (the "License").  You may not use
- * this file except in compliance with the License.  You can obtain a copy
- * in the file LICENSE in the source distribution or at
- * https://www.openssl.org/source/license.html
- */
-
-#include <stdlib.h>
-
-#ifndef HEADER_ASYNC_H
-# define HEADER_ASYNC_H
-
-#if defined(_WIN32)
-# if defined(BASETYPES) || defined(_WINDEF_H)
-/* application has to include <windows.h> to use this */
-#define OSSL_ASYNC_FD       HANDLE
-#define OSSL_BAD_ASYNC_FD   INVALID_HANDLE_VALUE
-# endif
-#else
-#define OSSL_ASYNC_FD       int
-#define OSSL_BAD_ASYNC_FD   -1
-#endif
-
-
-# ifdef  __cplusplus
-extern "C" {
-# endif
-
-typedef struct async_job_st ASYNC_JOB;
-typedef struct async_wait_ctx_st ASYNC_WAIT_CTX;
-
-#define ASYNC_ERR      0
-#define ASYNC_NO_JOBS  1
-#define ASYNC_PAUSE    2
-#define ASYNC_FINISH   3
-
-int ASYNC_init_thread(size_t max_size, size_t init_size);
-void ASYNC_cleanup_thread(void);
-
-#ifdef OSSL_ASYNC_FD
-ASYNC_WAIT_CTX *ASYNC_WAIT_CTX_new(void);
-void ASYNC_WAIT_CTX_free(ASYNC_WAIT_CTX *ctx);
-int ASYNC_WAIT_CTX_set_wait_fd(ASYNC_WAIT_CTX *ctx, const void *key,
-                               OSSL_ASYNC_FD fd,
-                               void *custom_data,
-                               void (*cleanup)(ASYNC_WAIT_CTX *, const void *,
-                                               OSSL_ASYNC_FD, void *));
-int ASYNC_WAIT_CTX_get_fd(ASYNC_WAIT_CTX *ctx, const void *key,
-                        OSSL_ASYNC_FD *fd, void **custom_data);
-int ASYNC_WAIT_CTX_get_all_fds(ASYNC_WAIT_CTX *ctx, OSSL_ASYNC_FD *fd,
-                               size_t *numfds);
-int ASYNC_WAIT_CTX_get_changed_fds(ASYNC_WAIT_CTX *ctx, OSSL_ASYNC_FD *addfd,
-                                   size_t *numaddfds, OSSL_ASYNC_FD *delfd,
-                                   size_t *numdelfds);
-int ASYNC_WAIT_CTX_clear_fd(ASYNC_WAIT_CTX *ctx, const void *key);
-#endif
-
-int ASYNC_is_capable(void);
-
-int ASYNC_start_job(ASYNC_JOB **job, ASYNC_WAIT_CTX *ctx, int *ret,
-                    int (*func)(void *), void *args, size_t size);
-int ASYNC_pause_job(void);
-
-ASYNC_JOB *ASYNC_get_current_job(void);
-ASYNC_WAIT_CTX *ASYNC_get_wait_ctx(ASYNC_JOB *job);
-void ASYNC_block_pause(void);
-void ASYNC_unblock_pause(void);
-
-/* BEGIN ERROR CODES */
-/*
- * The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
-
-int ERR_load_ASYNC_strings(void);
-
-/* Error codes for the ASYNC functions. */
-
-/* Function codes. */
-# define ASYNC_F_ASYNC_CTX_NEW                            100
-# define ASYNC_F_ASYNC_INIT_THREAD                        101
-# define ASYNC_F_ASYNC_JOB_NEW                            102
-# define ASYNC_F_ASYNC_PAUSE_JOB                          103
-# define ASYNC_F_ASYNC_START_FUNC                         104
-# define ASYNC_F_ASYNC_START_JOB                          105
-
-/* Reason codes. */
-# define ASYNC_R_FAILED_TO_SET_POOL                       101
-# define ASYNC_R_FAILED_TO_SWAP_CONTEXT                   102
-# define ASYNC_R_INIT_FAILED                              105
-# define ASYNC_R_INVALID_POOL_SIZE                        103
-
-# ifdef  __cplusplus
-}
-# endif
-#endif

gpac-2.2.1.tar.gz/extra_lib/include/openssl/bio.h Deleted

@@ -1,850 +0,0 @@
-/*
- * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
- *
- * Licensed under the OpenSSL license (the "License").  You may not use
- * this file except in compliance with the License.  You can obtain a copy
- * in the file LICENSE in the source distribution or at
- * https://www.openssl.org/source/license.html
- */
-
-#ifndef HEADER_BIO_H
-# define HEADER_BIO_H
-
-# include <openssl/e_os2.h>
-
-# ifndef OPENSSL_NO_STDIO
-#  include <stdio.h>
-# endif
-# include <stdarg.h>
-
-# include <openssl/crypto.h>
-
-# ifndef OPENSSL_NO_SCTP
-#  include <openssl/e_os2.h>
-# endif
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-/* There are the classes of BIOs */
-# define BIO_TYPE_DESCRIPTOR     0x0100 /* socket, fd, connect or accept */
-# define BIO_TYPE_FILTER         0x0200
-# define BIO_TYPE_SOURCE_SINK    0x0400
-
-/* These are the 'types' of BIOs */
-# define BIO_TYPE_NONE             0
-# define BIO_TYPE_MEM            ( 1|BIO_TYPE_SOURCE_SINK)
-# define BIO_TYPE_FILE           ( 2|BIO_TYPE_SOURCE_SINK)
-
-# define BIO_TYPE_FD             ( 4|BIO_TYPE_SOURCE_SINK|BIO_TYPE_DESCRIPTOR)
-# define BIO_TYPE_SOCKET         ( 5|BIO_TYPE_SOURCE_SINK|BIO_TYPE_DESCRIPTOR)
-# define BIO_TYPE_NULL           ( 6|BIO_TYPE_SOURCE_SINK)
-# define BIO_TYPE_SSL            ( 7|BIO_TYPE_FILTER)
-# define BIO_TYPE_MD             ( 8|BIO_TYPE_FILTER)
-# define BIO_TYPE_BUFFER         ( 9|BIO_TYPE_FILTER)
-# define BIO_TYPE_CIPHER         (10|BIO_TYPE_FILTER)
-# define BIO_TYPE_BASE64         (11|BIO_TYPE_FILTER)
-# define BIO_TYPE_CONNECT        (12|BIO_TYPE_SOURCE_SINK|BIO_TYPE_DESCRIPTOR)
-# define BIO_TYPE_ACCEPT         (13|BIO_TYPE_SOURCE_SINK|BIO_TYPE_DESCRIPTOR)
-
-# define BIO_TYPE_NBIO_TEST      (16|BIO_TYPE_FILTER)/* server proxy BIO */
-# define BIO_TYPE_NULL_FILTER    (17|BIO_TYPE_FILTER)
-# define BIO_TYPE_BIO            (19|BIO_TYPE_SOURCE_SINK)/* half a BIO pair */
-# define BIO_TYPE_LINEBUFFER     (20|BIO_TYPE_FILTER)
-# define BIO_TYPE_DGRAM          (21|BIO_TYPE_SOURCE_SINK|BIO_TYPE_DESCRIPTOR)
-# define BIO_TYPE_ASN1           (22|BIO_TYPE_FILTER)
-# define BIO_TYPE_COMP           (23|BIO_TYPE_FILTER)
-# ifndef OPENSSL_NO_SCTP
-#  define BIO_TYPE_DGRAM_SCTP    (24|BIO_TYPE_SOURCE_SINK|BIO_TYPE_DESCRIPTOR)
-# endif
-
-#define BIO_TYPE_START           128
-
-/*
- * BIO_FILENAME_READ|BIO_CLOSE to open or close on free.
- * BIO_set_fp(in,stdin,BIO_NOCLOSE);
- */
-# define BIO_NOCLOSE             0x00
-# define BIO_CLOSE               0x01
-
-/*
- * These are used in the following macros and are passed to BIO_ctrl()
- */
-# define BIO_CTRL_RESET          1/* opt - rewind/zero etc */
-# define BIO_CTRL_EOF            2/* opt - are we at the eof */
-# define BIO_CTRL_INFO           3/* opt - extra tit-bits */
-# define BIO_CTRL_SET            4/* man - set the 'IO' type */
-# define BIO_CTRL_GET            5/* man - get the 'IO' type */
-# define BIO_CTRL_PUSH           6/* opt - internal, used to signify change */
-# define BIO_CTRL_POP            7/* opt - internal, used to signify change */
-# define BIO_CTRL_GET_CLOSE      8/* man - set the 'close' on free */
-# define BIO_CTRL_SET_CLOSE      9/* man - set the 'close' on free */
-# define BIO_CTRL_PENDING        10/* opt - is their more data buffered */
-# define BIO_CTRL_FLUSH          11/* opt - 'flush' buffered output */
-# define BIO_CTRL_DUP            12/* man - extra stuff for 'duped' BIO */
-# define BIO_CTRL_WPENDING       13/* opt - number of bytes still to write */
-# define BIO_CTRL_SET_CALLBACK   14/* opt - set callback function */
-# define BIO_CTRL_GET_CALLBACK   15/* opt - set callback function */
-
-# define BIO_CTRL_SET_FILENAME   30/* BIO_s_file special */
-
-/* dgram BIO stuff */
-# define BIO_CTRL_DGRAM_CONNECT       31/* BIO dgram special */
-# define BIO_CTRL_DGRAM_SET_CONNECTED 32/* allow for an externally connected
-                                         * socket to be passed in */
-# define BIO_CTRL_DGRAM_SET_RECV_TIMEOUT 33/* setsockopt, essentially */
-# define BIO_CTRL_DGRAM_GET_RECV_TIMEOUT 34/* getsockopt, essentially */
-# define BIO_CTRL_DGRAM_SET_SEND_TIMEOUT 35/* setsockopt, essentially */
-# define BIO_CTRL_DGRAM_GET_SEND_TIMEOUT 36/* getsockopt, essentially */
-
-# define BIO_CTRL_DGRAM_GET_RECV_TIMER_EXP 37/* flag whether the last */
-# define BIO_CTRL_DGRAM_GET_SEND_TIMER_EXP 38/* I/O operation tiemd out */
-
-/* #ifdef IP_MTU_DISCOVER */
-# define BIO_CTRL_DGRAM_MTU_DISCOVER       39/* set DF bit on egress packets */
-/* #endif */
-
-# define BIO_CTRL_DGRAM_QUERY_MTU          40/* as kernel for current MTU */
-# define BIO_CTRL_DGRAM_GET_FALLBACK_MTU   47
-# define BIO_CTRL_DGRAM_GET_MTU            41/* get cached value for MTU */
-# define BIO_CTRL_DGRAM_SET_MTU            42/* set cached value for MTU.
-                                              * want to use this if asking
-                                              * the kernel fails */
-
-# define BIO_CTRL_DGRAM_MTU_EXCEEDED       43/* check whether the MTU was
-                                              * exceed in the previous write
-                                              * operation */
-
-# define BIO_CTRL_DGRAM_GET_PEER           46
-# define BIO_CTRL_DGRAM_SET_PEER           44/* Destination for the data */
-
-# define BIO_CTRL_DGRAM_SET_NEXT_TIMEOUT   45/* Next DTLS handshake timeout
-                                              * to adjust socket timeouts */
-# define BIO_CTRL_DGRAM_SET_DONT_FRAG      48
-
-# define BIO_CTRL_DGRAM_GET_MTU_OVERHEAD   49
-
-# define BIO_CTRL_DGRAM_SET_PEEK_MODE      50
-
-# ifndef OPENSSL_NO_SCTP
-/* SCTP stuff */
-#  define BIO_CTRL_DGRAM_SCTP_SET_IN_HANDSHAKE    50
-#  define BIO_CTRL_DGRAM_SCTP_ADD_AUTH_KEY                51
-#  define BIO_CTRL_DGRAM_SCTP_NEXT_AUTH_KEY               52
-#  define BIO_CTRL_DGRAM_SCTP_AUTH_CCS_RCVD               53
-#  define BIO_CTRL_DGRAM_SCTP_GET_SNDINFO         60
-#  define BIO_CTRL_DGRAM_SCTP_SET_SNDINFO         61
-#  define BIO_CTRL_DGRAM_SCTP_GET_RCVINFO         62
-#  define BIO_CTRL_DGRAM_SCTP_SET_RCVINFO         63
-#  define BIO_CTRL_DGRAM_SCTP_GET_PRINFO                  64
-#  define BIO_CTRL_DGRAM_SCTP_SET_PRINFO                  65
-#  define BIO_CTRL_DGRAM_SCTP_SAVE_SHUTDOWN               70
-# endif
-
-/* modifiers */
-# define BIO_FP_READ             0x02
-# define BIO_FP_WRITE            0x04
-# define BIO_FP_APPEND           0x08
-# define BIO_FP_TEXT             0x10
-
-# define BIO_FLAGS_READ          0x01
-# define BIO_FLAGS_WRITE         0x02
-# define BIO_FLAGS_IO_SPECIAL    0x04
-# define BIO_FLAGS_RWS (BIO_FLAGS_READ|BIO_FLAGS_WRITE|BIO_FLAGS_IO_SPECIAL)
-# define BIO_FLAGS_SHOULD_RETRY  0x08
-# ifndef BIO_FLAGS_UPLINK
-/*
- * "UPLINK" flag denotes file descriptors provided by application. It
- * defaults to 0, as most platforms don't require UPLINK interface.
- */
-#  define BIO_FLAGS_UPLINK        0
-# endif
-
-# define BIO_FLAGS_BASE64_NO_NL  0x100
-
-/*
- * This is used with memory BIOs:
- * BIO_FLAGS_MEM_RDONLY means we shouldn't free up or change the data in any way;
- * BIO_FLAGS_NONCLEAR_RST means we shouldn't clear data on reset.
- */
-# define BIO_FLAGS_MEM_RDONLY    0x200
-# define BIO_FLAGS_NONCLEAR_RST  0x400
-
-typedef union bio_addr_st BIO_ADDR;
-typedef struct bio_addrinfo_st BIO_ADDRINFO;
-
-int BIO_get_new_index(void);
-void BIO_set_flags(BIO *b, int flags);
-int BIO_test_flags(const BIO *b, int flags);
-void BIO_clear_flags(BIO *b, int flags);
-
-# define BIO_get_flags(b) BIO_test_flags(b, ~(0x0))
-# define BIO_set_retry_special(b) \
-                BIO_set_flags(b, (BIO_FLAGS_IO_SPECIAL|BIO_FLAGS_SHOULD_RETRY))
-# define BIO_set_retry_read(b) \
-                BIO_set_flags(b, (BIO_FLAGS_READ|BIO_FLAGS_SHOULD_RETRY))
-# define BIO_set_retry_write(b) \
-                BIO_set_flags(b, (BIO_FLAGS_WRITE|BIO_FLAGS_SHOULD_RETRY))
-
-/* These are normally used internally in BIOs */
-# define BIO_clear_retry_flags(b) \
-                BIO_clear_flags(b, (BIO_FLAGS_RWS|BIO_FLAGS_SHOULD_RETRY))
-# define BIO_get_retry_flags(b) \
-                BIO_test_flags(b, (BIO_FLAGS_RWS|BIO_FLAGS_SHOULD_RETRY))
-
-/* These should be used by the application to tell why we should retry */
-# define BIO_should_read(a)              BIO_test_flags(a, BIO_FLAGS_READ)
-# define BIO_should_write(a)             BIO_test_flags(a, BIO_FLAGS_WRITE)
-# define BIO_should_io_special(a)        BIO_test_flags(a, BIO_FLAGS_IO_SPECIAL)
-# define BIO_retry_type(a)               BIO_test_flags(a, BIO_FLAGS_RWS)
-# define BIO_should_retry(a)             BIO_test_flags(a, BIO_FLAGS_SHOULD_RETRY)
-
-/*
- * The next three are used in conjunction with the BIO_should_io_special()
- * condition.  After this returns true, BIO *BIO_get_retry_BIO(BIO *bio, int
- * *reason); will walk the BIO stack and return the 'reason' for the special
- * and the offending BIO. Given a BIO, BIO_get_retry_reason(bio) will return
- * the code.
- */
-/*
- * Returned from the SSL bio when the certificate retrieval code had an error
- */
-# define BIO_RR_SSL_X509_LOOKUP          0x01
-/* Returned from the connect BIO when a connect would have blocked */
-# define BIO_RR_CONNECT                  0x02
-/* Returned from the accept BIO when an accept would have blocked */
-# define BIO_RR_ACCEPT                   0x03
-
-/* These are passed by the BIO callback */
-# define BIO_CB_FREE     0x01
-# define BIO_CB_READ     0x02
-# define BIO_CB_WRITE    0x03
-# define BIO_CB_PUTS     0x04
-# define BIO_CB_GETS     0x05
-# define BIO_CB_CTRL     0x06
-
-/*
- * The callback is called before and after the underling operation, The
- * BIO_CB_RETURN flag indicates if it is after the call
- */
-# define BIO_CB_RETURN   0x80
-# define BIO_CB_return(a) ((a)|BIO_CB_RETURN)
-# define BIO_cb_pre(a)   (!((a)&BIO_CB_RETURN))
-# define BIO_cb_post(a)  ((a)&BIO_CB_RETURN)
-
-typedef long (*BIO_callback_fn)(BIO *b, int oper, const char *argp, int argi,
-                                long argl, long ret);
-BIO_callback_fn BIO_get_callback(const BIO *b);
-void BIO_set_callback(BIO *b, BIO_callback_fn callback);
-char *BIO_get_callback_arg(const BIO *b);
-void BIO_set_callback_arg(BIO *b, char *arg);
-
-typedef struct bio_method_st BIO_METHOD;
-
-const char *BIO_method_name(const BIO *b);
-int BIO_method_type(const BIO *b);
-
-typedef void bio_info_cb(BIO *, int, const char *, int, long, long);
-
-DEFINE_STACK_OF(BIO)
-
-/* Prefix and suffix callback in ASN1 BIO */
-typedef int asn1_ps_func (BIO *b, unsigned char **pbuf, int *plen,
-                          void *parg);
-
-# ifndef OPENSSL_NO_SCTP
-/* SCTP parameter structs */
-struct bio_dgram_sctp_sndinfo {
-    uint16_t snd_sid;
-    uint16_t snd_flags;
-    uint32_t snd_ppid;
-    uint32_t snd_context;
-};
-
-struct bio_dgram_sctp_rcvinfo {
-    uint16_t rcv_sid;
-    uint16_t rcv_ssn;
-    uint16_t rcv_flags;
-    uint32_t rcv_ppid;
-    uint32_t rcv_tsn;
-    uint32_t rcv_cumtsn;
-    uint32_t rcv_context;
-};
-
-struct bio_dgram_sctp_prinfo {
-    uint16_t pr_policy;
-    uint32_t pr_value;
-};
-# endif
-
-/*
- * #define BIO_CONN_get_param_hostname BIO_ctrl
- */
-
-# define BIO_C_SET_CONNECT                       100
-# define BIO_C_DO_STATE_MACHINE                  101
-# define BIO_C_SET_NBIO                          102
-/* # define BIO_C_SET_PROXY_PARAM                   103 */
-# define BIO_C_SET_FD                            104
-# define BIO_C_GET_FD                            105
-# define BIO_C_SET_FILE_PTR                      106
-# define BIO_C_GET_FILE_PTR                      107
-# define BIO_C_SET_FILENAME                      108
-# define BIO_C_SET_SSL                           109
-# define BIO_C_GET_SSL                           110
-# define BIO_C_SET_MD                            111
-# define BIO_C_GET_MD                            112
-# define BIO_C_GET_CIPHER_STATUS                 113
-# define BIO_C_SET_BUF_MEM                       114
-# define BIO_C_GET_BUF_MEM_PTR                   115
-# define BIO_C_GET_BUFF_NUM_LINES                116
-# define BIO_C_SET_BUFF_SIZE                     117
-# define BIO_C_SET_ACCEPT                        118
-# define BIO_C_SSL_MODE                          119
-# define BIO_C_GET_MD_CTX                        120
-/* # define BIO_C_GET_PROXY_PARAM                   121 */
-# define BIO_C_SET_BUFF_READ_DATA                122/* data to read first */
-# define BIO_C_GET_CONNECT                       123
-# define BIO_C_GET_ACCEPT                        124
-# define BIO_C_SET_SSL_RENEGOTIATE_BYTES         125
-# define BIO_C_GET_SSL_NUM_RENEGOTIATES          126
-# define BIO_C_SET_SSL_RENEGOTIATE_TIMEOUT       127
-# define BIO_C_FILE_SEEK                         128
-# define BIO_C_GET_CIPHER_CTX                    129
-# define BIO_C_SET_BUF_MEM_EOF_RETURN            130/* return end of input
-                                                     * value */
-# define BIO_C_SET_BIND_MODE                     131
-# define BIO_C_GET_BIND_MODE                     132
-# define BIO_C_FILE_TELL                         133
-# define BIO_C_GET_SOCKS                         134
-# define BIO_C_SET_SOCKS                         135
-
-# define BIO_C_SET_WRITE_BUF_SIZE                136/* for BIO_s_bio */
-# define BIO_C_GET_WRITE_BUF_SIZE                137
-# define BIO_C_MAKE_BIO_PAIR                     138
-# define BIO_C_DESTROY_BIO_PAIR                  139
-# define BIO_C_GET_WRITE_GUARANTEE               140
-# define BIO_C_GET_READ_REQUEST                  141
-# define BIO_C_SHUTDOWN_WR                       142
-# define BIO_C_NREAD0                            143
-# define BIO_C_NREAD                             144
-# define BIO_C_NWRITE0                           145
-# define BIO_C_NWRITE                            146
-# define BIO_C_RESET_READ_REQUEST                147
-# define BIO_C_SET_MD_CTX                        148
-
-# define BIO_C_SET_PREFIX                        149
-# define BIO_C_GET_PREFIX                        150
-# define BIO_C_SET_SUFFIX                        151
-# define BIO_C_GET_SUFFIX                        152
-
-# define BIO_C_SET_EX_ARG                        153
-# define BIO_C_GET_EX_ARG                        154
-
-# define BIO_C_SET_CONNECT_MODE                  155
-
-# define BIO_set_app_data(s,arg)         BIO_set_ex_data(s,0,arg)
-# define BIO_get_app_data(s)             BIO_get_ex_data(s,0)
-
-# define BIO_set_nbio(b,n)             BIO_ctrl(b,BIO_C_SET_NBIO,(n),NULL)
-
-# ifndef OPENSSL_NO_SOCK
-/* IP families we support, for BIO_s_connect() and BIO_s_accept() */
-/* Note: the underlying operating system may not support some of them */
-#  define BIO_FAMILY_IPV4                         4
-#  define BIO_FAMILY_IPV6                         6
-#  define BIO_FAMILY_IPANY                        256
-
-/* BIO_s_connect() */
-#  define BIO_set_conn_hostname(b,name) BIO_ctrl(b,BIO_C_SET_CONNECT,0,(char *)name)
-#  define BIO_set_conn_port(b,port)     BIO_ctrl(b,BIO_C_SET_CONNECT,1,(char *)port)
-#  define BIO_set_conn_address(b,addr)  BIO_ctrl(b,BIO_C_SET_CONNECT,2,(char *)addr)
-#  define BIO_set_conn_ip_family(b,f)   BIO_int_ctrl(b,BIO_C_SET_CONNECT,3,f)
-#  define BIO_get_conn_hostname(b)      ((const char *)BIO_ptr_ctrl(b,BIO_C_GET_CONNECT,0))
-#  define BIO_get_conn_port(b)          ((const char *)BIO_ptr_ctrl(b,BIO_C_GET_CONNECT,1))
-#  define BIO_get_conn_address(b)       ((const BIO_ADDR *)BIO_ptr_ctrl(b,BIO_C_GET_CONNECT,2))
-#  define BIO_get_conn_ip_family(b)     BIO_ctrl(b,BIO_C_GET_CONNECT,3,NULL)
-#  define BIO_set_conn_mode(b,n)        BIO_ctrl(b,BIO_C_SET_CONNECT_MODE,(n),NULL)
-
-/* BIO_s_accept() */
-#  define BIO_set_accept_name(b,name)   BIO_ctrl(b,BIO_C_SET_ACCEPT,0,(char *)name)
-#  define BIO_set_accept_port(b,port)   BIO_ctrl(b,BIO_C_SET_ACCEPT,1,(char *)port)
-#  define BIO_get_accept_name(b)        ((const char *)BIO_ptr_ctrl(b,BIO_C_GET_ACCEPT,0))
-#  define BIO_get_accept_port(b)        ((const char *)BIO_ptr_ctrl(b,BIO_C_GET_ACCEPT,1))
-#  define BIO_get_peer_name(b)          ((const char *)BIO_ptr_ctrl(b,BIO_C_GET_ACCEPT,2))
-#  define BIO_get_peer_port(b)          ((const char *)BIO_ptr_ctrl(b,BIO_C_GET_ACCEPT,3))
-/* #define BIO_set_nbio(b,n)    BIO_ctrl(b,BIO_C_SET_NBIO,(n),NULL) */
-#  define BIO_set_nbio_accept(b,n)      BIO_ctrl(b,BIO_C_SET_ACCEPT,2,(n)?(void *)"a":NULL)
-#  define BIO_set_accept_bios(b,bio)    BIO_ctrl(b,BIO_C_SET_ACCEPT,3,(char *)bio)
-#  define BIO_set_accept_ip_family(b,f) BIO_int_ctrl(b,BIO_C_SET_ACCEPT,4,f)
-#  define BIO_get_accept_ip_family(b)   BIO_ctrl(b,BIO_C_GET_ACCEPT,4,NULL)
-
-/* Aliases kept for backward compatibility */
-#  define BIO_BIND_NORMAL                 0
-#  define BIO_BIND_REUSEADDR              BIO_SOCK_REUSEADDR
-#  define BIO_BIND_REUSEADDR_IF_UNUSED    BIO_SOCK_REUSEADDR
-#  define BIO_set_bind_mode(b,mode) BIO_ctrl(b,BIO_C_SET_BIND_MODE,mode,NULL)
-#  define BIO_get_bind_mode(b)    BIO_ctrl(b,BIO_C_GET_BIND_MODE,0,NULL)
-
-/* BIO_s_accept() and BIO_s_connect() */
-#  define BIO_do_connect(b)       BIO_do_handshake(b)
-#  define BIO_do_accept(b)        BIO_do_handshake(b)
-# endif /* OPENSSL_NO_SOCK */
-
-# define BIO_do_handshake(b)     BIO_ctrl(b,BIO_C_DO_STATE_MACHINE,0,NULL)
-
-/* BIO_s_datagram(), BIO_s_fd(), BIO_s_socket(), BIO_s_accept() and BIO_s_connect() */
-# define BIO_set_fd(b,fd,c)      BIO_int_ctrl(b,BIO_C_SET_FD,c,fd)
-# define BIO_get_fd(b,c)         BIO_ctrl(b,BIO_C_GET_FD,0,(char *)c)
-
-/* BIO_s_file() */
-# define BIO_set_fp(b,fp,c)      BIO_ctrl(b,BIO_C_SET_FILE_PTR,c,(char *)fp)
-# define BIO_get_fp(b,fpp)       BIO_ctrl(b,BIO_C_GET_FILE_PTR,0,(char *)fpp)
-
-/* BIO_s_fd() and BIO_s_file() */
-# define BIO_seek(b,ofs) (int)BIO_ctrl(b,BIO_C_FILE_SEEK,ofs,NULL)
-# define BIO_tell(b)     (int)BIO_ctrl(b,BIO_C_FILE_TELL,0,NULL)
-
-/*
- * name is cast to lose const, but might be better to route through a
- * function so we can do it safely
- */
-# ifdef CONST_STRICT
-/*
- * If you are wondering why this isn't defined, its because CONST_STRICT is
- * purely a compile-time kludge to allow const to be checked.
- */
-int BIO_read_filename(BIO *b, const char *name);
-# else
-#  define BIO_read_filename(b,name) (int)BIO_ctrl(b,BIO_C_SET_FILENAME, \
-                BIO_CLOSE|BIO_FP_READ,(char *)name)
-# endif
-# define BIO_write_filename(b,name) (int)BIO_ctrl(b,BIO_C_SET_FILENAME, \
-                BIO_CLOSE|BIO_FP_WRITE,name)
-# define BIO_append_filename(b,name) (int)BIO_ctrl(b,BIO_C_SET_FILENAME, \
-                BIO_CLOSE|BIO_FP_APPEND,name)
-# define BIO_rw_filename(b,name) (int)BIO_ctrl(b,BIO_C_SET_FILENAME, \
-                BIO_CLOSE|BIO_FP_READ|BIO_FP_WRITE,name)
-
-/*
- * WARNING WARNING, this ups the reference count on the read bio of the SSL
- * structure.  This is because the ssl read BIO is now pointed to by the
- * next_bio field in the bio.  So when you free the BIO, make sure you are
- * doing a BIO_free_all() to catch the underlying BIO.
- */
-# define BIO_set_ssl(b,ssl,c)    BIO_ctrl(b,BIO_C_SET_SSL,c,(char *)ssl)
-# define BIO_get_ssl(b,sslp)     BIO_ctrl(b,BIO_C_GET_SSL,0,(char *)sslp)
-# define BIO_set_ssl_mode(b,client)      BIO_ctrl(b,BIO_C_SSL_MODE,client,NULL)
-# define BIO_set_ssl_renegotiate_bytes(b,num) \
-        BIO_ctrl(b,BIO_C_SET_SSL_RENEGOTIATE_BYTES,num,NULL)
-# define BIO_get_num_renegotiates(b) \
-        BIO_ctrl(b,BIO_C_GET_SSL_NUM_RENEGOTIATES,0,NULL)
-# define BIO_set_ssl_renegotiate_timeout(b,seconds) \
-        BIO_ctrl(b,BIO_C_SET_SSL_RENEGOTIATE_TIMEOUT,seconds,NULL)
-
-/* defined in evp.h */
-/* #define BIO_set_md(b,md)     BIO_ctrl(b,BIO_C_SET_MD,1,(char *)md) */
-
-# define BIO_get_mem_data(b,pp)  BIO_ctrl(b,BIO_CTRL_INFO,0,(char *)pp)
-# define BIO_set_mem_buf(b,bm,c) BIO_ctrl(b,BIO_C_SET_BUF_MEM,c,(char *)bm)
-# define BIO_get_mem_ptr(b,pp)   BIO_ctrl(b,BIO_C_GET_BUF_MEM_PTR,0,(char *)pp)
-# define BIO_set_mem_eof_return(b,v) \
-                                BIO_ctrl(b,BIO_C_SET_BUF_MEM_EOF_RETURN,v,NULL)
-
-/* For the BIO_f_buffer() type */
-# define BIO_get_buffer_num_lines(b)     BIO_ctrl(b,BIO_C_GET_BUFF_NUM_LINES,0,NULL)
-# define BIO_set_buffer_size(b,size)     BIO_ctrl(b,BIO_C_SET_BUFF_SIZE,size,NULL)
-# define BIO_set_read_buffer_size(b,size) BIO_int_ctrl(b,BIO_C_SET_BUFF_SIZE,size,0)
-# define BIO_set_write_buffer_size(b,size) BIO_int_ctrl(b,BIO_C_SET_BUFF_SIZE,size,1)
-# define BIO_set_buffer_read_data(b,buf,num) BIO_ctrl(b,BIO_C_SET_BUFF_READ_DATA,num,buf)
-
-/* Don't use the next one unless you know what you are doing :-) */
-# define BIO_dup_state(b,ret)    BIO_ctrl(b,BIO_CTRL_DUP,0,(char *)(ret))
-
-# define BIO_reset(b)            (int)BIO_ctrl(b,BIO_CTRL_RESET,0,NULL)
-# define BIO_eof(b)              (int)BIO_ctrl(b,BIO_CTRL_EOF,0,NULL)
-# define BIO_set_close(b,c)      (int)BIO_ctrl(b,BIO_CTRL_SET_CLOSE,(c),NULL)
-# define BIO_get_close(b)        (int)BIO_ctrl(b,BIO_CTRL_GET_CLOSE,0,NULL)
-# define BIO_pending(b)          (int)BIO_ctrl(b,BIO_CTRL_PENDING,0,NULL)
-# define BIO_wpending(b)         (int)BIO_ctrl(b,BIO_CTRL_WPENDING,0,NULL)
-/* ...pending macros have inappropriate return type */
-size_t BIO_ctrl_pending(BIO *b);
-size_t BIO_ctrl_wpending(BIO *b);
-# define BIO_flush(b)            (int)BIO_ctrl(b,BIO_CTRL_FLUSH,0,NULL)
-# define BIO_get_info_callback(b,cbp) (int)BIO_ctrl(b,BIO_CTRL_GET_CALLBACK,0, \
-                                                   cbp)
-# define BIO_set_info_callback(b,cb) (int)BIO_callback_ctrl(b,BIO_CTRL_SET_CALLBACK,cb)
-
-/* For the BIO_f_buffer() type */
-# define BIO_buffer_get_num_lines(b) BIO_ctrl(b,BIO_CTRL_GET,0,NULL)
-
-/* For BIO_s_bio() */
-# define BIO_set_write_buf_size(b,size) (int)BIO_ctrl(b,BIO_C_SET_WRITE_BUF_SIZE,size,NULL)
-# define BIO_get_write_buf_size(b,size) (size_t)BIO_ctrl(b,BIO_C_GET_WRITE_BUF_SIZE,size,NULL)
-# define BIO_make_bio_pair(b1,b2)   (int)BIO_ctrl(b1,BIO_C_MAKE_BIO_PAIR,0,b2)
-# define BIO_destroy_bio_pair(b)    (int)BIO_ctrl(b,BIO_C_DESTROY_BIO_PAIR,0,NULL)
-# define BIO_shutdown_wr(b) (int)BIO_ctrl(b, BIO_C_SHUTDOWN_WR, 0, NULL)
-/* macros with inappropriate type -- but ...pending macros use int too: */
-# define BIO_get_write_guarantee(b) (int)BIO_ctrl(b,BIO_C_GET_WRITE_GUARANTEE,0,NULL)
-# define BIO_get_read_request(b)    (int)BIO_ctrl(b,BIO_C_GET_READ_REQUEST,0,NULL)
-size_t BIO_ctrl_get_write_guarantee(BIO *b);
-size_t BIO_ctrl_get_read_request(BIO *b);
-int BIO_ctrl_reset_read_request(BIO *b);
-
-/* ctrl macros for dgram */
-# define BIO_ctrl_dgram_connect(b,peer)  \
-                     (int)BIO_ctrl(b,BIO_CTRL_DGRAM_CONNECT,0, (char *)peer)
-# define BIO_ctrl_set_connected(b,peer) \
-         (int)BIO_ctrl(b, BIO_CTRL_DGRAM_SET_CONNECTED, 0, (char *)peer)
-# define BIO_dgram_recv_timedout(b) \
-         (int)BIO_ctrl(b, BIO_CTRL_DGRAM_GET_RECV_TIMER_EXP, 0, NULL)
-# define BIO_dgram_send_timedout(b) \
-         (int)BIO_ctrl(b, BIO_CTRL_DGRAM_GET_SEND_TIMER_EXP, 0, NULL)
-# define BIO_dgram_get_peer(b,peer) \
-         (int)BIO_ctrl(b, BIO_CTRL_DGRAM_GET_PEER, 0, (char *)peer)
-# define BIO_dgram_set_peer(b,peer) \
-         (int)BIO_ctrl(b, BIO_CTRL_DGRAM_SET_PEER, 0, (char *)peer)
-# define BIO_dgram_get_mtu_overhead(b) \
-         (unsigned int)BIO_ctrl((b), BIO_CTRL_DGRAM_GET_MTU_OVERHEAD, 0, NULL)
-
-#define BIO_get_ex_new_index(l, p, newf, dupf, freef) \
-    CRYPTO_get_ex_new_index(CRYPTO_EX_INDEX_BIO, l, p, newf, dupf, freef)
-int BIO_set_ex_data(BIO *bio, int idx, void *data);
-void *BIO_get_ex_data(BIO *bio, int idx);
-uint64_t BIO_number_read(BIO *bio);
-uint64_t BIO_number_written(BIO *bio);
-
-/* For BIO_f_asn1() */
-int BIO_asn1_set_prefix(BIO *b, asn1_ps_func *prefix,
-                        asn1_ps_func *prefix_free);
-int BIO_asn1_get_prefix(BIO *b, asn1_ps_func **pprefix,
-                        asn1_ps_func **pprefix_free);
-int BIO_asn1_set_suffix(BIO *b, asn1_ps_func *suffix,
-                        asn1_ps_func *suffix_free);
-int BIO_asn1_get_suffix(BIO *b, asn1_ps_func **psuffix,
-                        asn1_ps_func **psuffix_free);
-
-const BIO_METHOD *BIO_s_file(void);
-BIO *BIO_new_file(const char *filename, const char *mode);
-# ifndef OPENSSL_NO_STDIO
-BIO *BIO_new_fp(FILE *stream, int close_flag);
-# endif
-BIO *BIO_new(const BIO_METHOD *type);
-int BIO_free(BIO *a);
-void BIO_set_data(BIO *a, void *ptr);
-void *BIO_get_data(BIO *a);
-void BIO_set_init(BIO *a, int init);
-int BIO_get_init(BIO *a);
-void BIO_set_shutdown(BIO *a, int shut);
-int BIO_get_shutdown(BIO *a);
-void BIO_vfree(BIO *a);
-int BIO_up_ref(BIO *a);
-int BIO_read(BIO *b, void *data, int len);
-int BIO_gets(BIO *bp, char *buf, int size);
-int BIO_write(BIO *b, const void *data, int len);
-int BIO_puts(BIO *bp, const char *buf);
-int BIO_indent(BIO *b, int indent, int max);
-long BIO_ctrl(BIO *bp, int cmd, long larg, void *parg);
-long BIO_callback_ctrl(BIO *b, int cmd,
-                       void (*fp) (BIO *, int, const char *, int, long, long));
-void *BIO_ptr_ctrl(BIO *bp, int cmd, long larg);
-long BIO_int_ctrl(BIO *bp, int cmd, long larg, int iarg);
-BIO *BIO_push(BIO *b, BIO *append);
-BIO *BIO_pop(BIO *b);
-void BIO_free_all(BIO *a);
-BIO *BIO_find_type(BIO *b, int bio_type);
-BIO *BIO_next(BIO *b);
-void BIO_set_next(BIO *b, BIO *next);
-BIO *BIO_get_retry_BIO(BIO *bio, int *reason);
-int BIO_get_retry_reason(BIO *bio);
-void BIO_set_retry_reason(BIO *bio, int reason);
-BIO *BIO_dup_chain(BIO *in);
-
-int BIO_nread0(BIO *bio, char **buf);
-int BIO_nread(BIO *bio, char **buf, int num);
-int BIO_nwrite0(BIO *bio, char **buf);
-int BIO_nwrite(BIO *bio, char **buf, int num);
-
-long BIO_debug_callback(BIO *bio, int cmd, const char *argp, int argi,
-                        long argl, long ret);
-
-const BIO_METHOD *BIO_s_mem(void);
-const BIO_METHOD *BIO_s_secmem(void);
-BIO *BIO_new_mem_buf(const void *buf, int len);
-# ifndef OPENSSL_NO_SOCK
-const BIO_METHOD *BIO_s_socket(void);
-const BIO_METHOD *BIO_s_connect(void);
-const BIO_METHOD *BIO_s_accept(void);
-# endif
-const BIO_METHOD *BIO_s_fd(void);
-const BIO_METHOD *BIO_s_log(void);
-const BIO_METHOD *BIO_s_bio(void);
-const BIO_METHOD *BIO_s_null(void);
-const BIO_METHOD *BIO_f_null(void);
-const BIO_METHOD *BIO_f_buffer(void);
-const BIO_METHOD *BIO_f_linebuffer(void);
-const BIO_METHOD *BIO_f_nbio_test(void);
-# ifndef OPENSSL_NO_DGRAM
-const BIO_METHOD *BIO_s_datagram(void);
-int BIO_dgram_non_fatal_error(int error);
-BIO *BIO_new_dgram(int fd, int close_flag);
-#  ifndef OPENSSL_NO_SCTP
-const BIO_METHOD *BIO_s_datagram_sctp(void);
-BIO *BIO_new_dgram_sctp(int fd, int close_flag);
-int BIO_dgram_is_sctp(BIO *bio);
-int BIO_dgram_sctp_notification_cb(BIO *b,
-                                   void (*handle_notifications) (BIO *bio,
-                                                                 void *context,
-                                                                 void *buf),
-                                   void *context);
-int BIO_dgram_sctp_wait_for_dry(BIO *b);
-int BIO_dgram_sctp_msg_waiting(BIO *b);
-#  endif
-# endif
-
-# ifndef OPENSSL_NO_SOCK
-int BIO_sock_should_retry(int i);
-int BIO_sock_non_fatal_error(int error);
-# endif
-
-int BIO_fd_should_retry(int i);
-int BIO_fd_non_fatal_error(int error);
-int BIO_dump_cb(int (*cb) (const void *data, size_t len, void *u),
-                void *u, const char *s, int len);
-int BIO_dump_indent_cb(int (*cb) (const void *data, size_t len, void *u),
-                       void *u, const char *s, int len, int indent);
-int BIO_dump(BIO *b, const char *bytes, int len);
-int BIO_dump_indent(BIO *b, const char *bytes, int len, int indent);
-# ifndef OPENSSL_NO_STDIO
-int BIO_dump_fp(FILE *fp, const char *s, int len);
-int BIO_dump_indent_fp(FILE *fp, const char *s, int len, int indent);
-# endif
-int BIO_hex_string(BIO *out, int indent, int width, unsigned char *data,
-                   int datalen);
-
-# ifndef OPENSSL_NO_SOCK
-BIO_ADDR *BIO_ADDR_new(void);
-int BIO_ADDR_rawmake(BIO_ADDR *ap, int family,
-                     const void *where, size_t wherelen, unsigned short port);
-void BIO_ADDR_free(BIO_ADDR *);
-void BIO_ADDR_clear(BIO_ADDR *ap);
-int BIO_ADDR_family(const BIO_ADDR *ap);
-int BIO_ADDR_rawaddress(const BIO_ADDR *ap, void *p, size_t *l);
-unsigned short BIO_ADDR_rawport(const BIO_ADDR *ap);
-char *BIO_ADDR_hostname_string(const BIO_ADDR *ap, int numeric);
-char *BIO_ADDR_service_string(const BIO_ADDR *ap, int numeric);
-char *BIO_ADDR_path_string(const BIO_ADDR *ap);
-
-const BIO_ADDRINFO *BIO_ADDRINFO_next(const BIO_ADDRINFO *bai);
-int BIO_ADDRINFO_family(const BIO_ADDRINFO *bai);
-int BIO_ADDRINFO_socktype(const BIO_ADDRINFO *bai);
-int BIO_ADDRINFO_protocol(const BIO_ADDRINFO *bai);
-const BIO_ADDR *BIO_ADDRINFO_address(const BIO_ADDRINFO *bai);
-void BIO_ADDRINFO_free(BIO_ADDRINFO *bai);
-
-enum BIO_hostserv_priorities {
-    BIO_PARSE_PRIO_HOST, BIO_PARSE_PRIO_SERV
-};
-int BIO_parse_hostserv(const char *hostserv, char **host, char **service,
-                       enum BIO_hostserv_priorities hostserv_prio);
-enum BIO_lookup_type {
-    BIO_LOOKUP_CLIENT, BIO_LOOKUP_SERVER
-};
-int BIO_lookup(const char *host, const char *service,
-               enum BIO_lookup_type lookup_type,
-               int family, int socktype, BIO_ADDRINFO **res);
-int BIO_sock_error(int sock);
-int BIO_socket_ioctl(int fd, long type, void *arg);
-int BIO_socket_nbio(int fd, int mode);
-int BIO_sock_init(void);
-# if OPENSSL_API_COMPAT < 0x10100000L
-#  define BIO_sock_cleanup() while(0) continue
-# endif
-int BIO_set_tcp_ndelay(int sock, int turn_on);
-
-DEPRECATEDIN_1_1_0(struct hostent *BIO_gethostbyname(const char *name))
-DEPRECATEDIN_1_1_0(int BIO_get_port(const char *str, unsigned short *port_ptr))
-DEPRECATEDIN_1_1_0(int BIO_get_host_ip(const char *str, unsigned char *ip))
-DEPRECATEDIN_1_1_0(int BIO_get_accept_socket(char *host_port, int mode))
-DEPRECATEDIN_1_1_0(int BIO_accept(int sock, char **ip_port))
-
-union BIO_sock_info_u {
-    BIO_ADDR *addr;
-};
-enum BIO_sock_info_type {
-    BIO_SOCK_INFO_ADDRESS
-};
-int BIO_sock_info(int sock,
-                  enum BIO_sock_info_type type, union BIO_sock_info_u *info);
-
-#  define BIO_SOCK_REUSEADDR    0x01
-#  define BIO_SOCK_V6_ONLY      0x02
-#  define BIO_SOCK_KEEPALIVE    0x04
-#  define BIO_SOCK_NONBLOCK     0x08
-#  define BIO_SOCK_NODELAY      0x10
-
-int BIO_socket(int domain, int socktype, int protocol, int options);
-int BIO_connect(int sock, const BIO_ADDR *addr, int options);
-int BIO_listen(int sock, const BIO_ADDR *addr, int options);
-int BIO_accept_ex(int accept_sock, BIO_ADDR *addr, int options);
-int BIO_closesocket(int sock);
-
-BIO *BIO_new_socket(int sock, int close_flag);
-BIO *BIO_new_connect(const char *host_port);
-BIO *BIO_new_accept(const char *host_port);
-# endif /* OPENSSL_NO_SOCK*/
-
-BIO *BIO_new_fd(int fd, int close_flag);
-
-int BIO_new_bio_pair(BIO **bio1, size_t writebuf1,
-                     BIO **bio2, size_t writebuf2);
-/*
- * If successful, returns 1 and in *bio1, *bio2 two BIO pair endpoints.
- * Otherwise returns 0 and sets *bio1 and *bio2 to NULL. Size 0 uses default
- * value.
- */
-
-void BIO_copy_next_retry(BIO *b);
-
-/*
- * long BIO_ghbn_ctrl(int cmd,int iarg,char *parg);
- */
-
-# ifdef __GNUC__
-#  define __bio_h__attr__ __attribute__
-# else
-#  define __bio_h__attr__(x)
-# endif
-int BIO_printf(BIO *bio, const char *format, ...)
-__bio_h__attr__((__format__(__printf__, 2, 3)));
-int BIO_vprintf(BIO *bio, const char *format, va_list args)
-__bio_h__attr__((__format__(__printf__, 2, 0)));
-int BIO_snprintf(char *buf, size_t n, const char *format, ...)
-__bio_h__attr__((__format__(__printf__, 3, 4)));
-int BIO_vsnprintf(char *buf, size_t n, const char *format, va_list args)
-__bio_h__attr__((__format__(__printf__, 3, 0)));
-# undef __bio_h__attr__
-
-
-BIO_METHOD *BIO_meth_new(int type, const char *name);
-void BIO_meth_free(BIO_METHOD *biom);
-int (*BIO_meth_get_write(BIO_METHOD *biom)) (BIO *, const char *, int);
-int BIO_meth_set_write(BIO_METHOD *biom,
-                       int (*write) (BIO *, const char *, int));
-int (*BIO_meth_get_read(BIO_METHOD *biom)) (BIO *, char *, int);
-int BIO_meth_set_read(BIO_METHOD *biom,
-                      int (*read) (BIO *, char *, int));
-int (*BIO_meth_get_puts(BIO_METHOD *biom)) (BIO *, const char *);
-int BIO_meth_set_puts(BIO_METHOD *biom,
-                      int (*puts) (BIO *, const char *));
-int (*BIO_meth_get_gets(BIO_METHOD *biom)) (BIO *, char *, int);
-int BIO_meth_set_gets(BIO_METHOD *biom,
-                      int (*gets) (BIO *, char *, int));
-long (*BIO_meth_get_ctrl(BIO_METHOD *biom)) (BIO *, int, long, void *);
-int BIO_meth_set_ctrl(BIO_METHOD *biom,
-                      long (*ctrl) (BIO *, int, long, void *));
-int (*BIO_meth_get_create(BIO_METHOD *bion)) (BIO *);
-int BIO_meth_set_create(BIO_METHOD *biom, int (*create) (BIO *));
-int (*BIO_meth_get_destroy(BIO_METHOD *biom)) (BIO *);
-int BIO_meth_set_destroy(BIO_METHOD *biom, int (*destroy) (BIO *));
-long (*BIO_meth_get_callback_ctrl(BIO_METHOD *biom))
-                                 (BIO *, int, bio_info_cb *);
-int BIO_meth_set_callback_ctrl(BIO_METHOD *biom,
-                               long (*callback_ctrl) (BIO *, int,
-                                                      bio_info_cb *));
-
-/* BEGIN ERROR CODES */
-/*
- * The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
-
-int ERR_load_BIO_strings(void);
-
-/* Error codes for the BIO functions. */
-
-/* Function codes. */
-# define BIO_F_ACPT_STATE                                 100
-# define BIO_F_ADDR_STRINGS                               134
-# define BIO_F_BIO_ACCEPT                                 101
-# define BIO_F_BIO_ACCEPT_EX                              137
-# define BIO_F_BIO_ADDR_NEW                               144
-# define BIO_F_BIO_CALLBACK_CTRL                          131
-# define BIO_F_BIO_CONNECT                                138
-# define BIO_F_BIO_CTRL                                   103
-# define BIO_F_BIO_GETS                                   104
-# define BIO_F_BIO_GET_HOST_IP                            106
-# define BIO_F_BIO_GET_NEW_INDEX                          102
-# define BIO_F_BIO_GET_PORT                               107
-# define BIO_F_BIO_LISTEN                                 139
-# define BIO_F_BIO_LOOKUP                                 135
-# define BIO_F_BIO_MAKE_PAIR                              121
-# define BIO_F_BIO_NEW                                    108
-# define BIO_F_BIO_NEW_FILE                               109
-# define BIO_F_BIO_NEW_MEM_BUF                            126
-# define BIO_F_BIO_NREAD                                  123
-# define BIO_F_BIO_NREAD0                                 124
-# define BIO_F_BIO_NWRITE                                 125
-# define BIO_F_BIO_NWRITE0                                122
-# define BIO_F_BIO_PARSE_HOSTSERV                         136
-# define BIO_F_BIO_PUTS                                   110
-# define BIO_F_BIO_READ                                   111
-# define BIO_F_BIO_SOCKET                                 140
-# define BIO_F_BIO_SOCKET_NBIO                            142
-# define BIO_F_BIO_SOCK_INFO                              141
-# define BIO_F_BIO_SOCK_INIT                              112
-# define BIO_F_BIO_WRITE                                  113
-# define BIO_F_BUFFER_CTRL                                114
-# define BIO_F_CONN_CTRL                                  127
-# define BIO_F_CONN_STATE                                 115
-# define BIO_F_DGRAM_SCTP_READ                            132
-# define BIO_F_DGRAM_SCTP_WRITE                           133
-# define BIO_F_FILE_CTRL                                  116
-# define BIO_F_FILE_READ                                  130
-# define BIO_F_LINEBUFFER_CTRL                            129
-# define BIO_F_MEM_WRITE                                  117
-# define BIO_F_SSL_NEW                                    118
-
-/* Reason codes. */
-# define BIO_R_ACCEPT_ERROR                               100
-# define BIO_R_ADDRINFO_ADDR_IS_NOT_AF_INET               141
-# define BIO_R_AMBIGUOUS_HOST_OR_SERVICE                  129
-# define BIO_R_BAD_FOPEN_MODE                             101
-# define BIO_R_BROKEN_PIPE                                124
-# define BIO_R_CONNECT_ERROR                              103
-# define BIO_R_GETHOSTBYNAME_ADDR_IS_NOT_AF_INET          107
-# define BIO_R_GETSOCKNAME_ERROR                          132
-# define BIO_R_GETSOCKNAME_TRUNCATED_ADDRESS              133
-# define BIO_R_GETTING_SOCKTYPE                           134
-# define BIO_R_INVALID_ARGUMENT                           125
-# define BIO_R_INVALID_SOCKET                             135
-# define BIO_R_IN_USE                                     123
-# define BIO_R_LISTEN_V6_ONLY                             136
-# define BIO_R_LOOKUP_RETURNED_NOTHING                    142
-# define BIO_R_MALFORMED_HOST_OR_SERVICE                  130
-# define BIO_R_NBIO_CONNECT_ERROR                         110
-# define BIO_R_NO_ACCEPT_ADDR_OR_SERVICE_SPECIFIED        143
-# define BIO_R_NO_HOSTNAME_OR_SERVICE_SPECIFIED           144
-# define BIO_R_NO_PORT_DEFINED                            113
-# define BIO_R_NO_SUCH_FILE                               128
-# define BIO_R_NULL_PARAMETER                             115
-# define BIO_R_UNABLE_TO_BIND_SOCKET                      117
-# define BIO_R_UNABLE_TO_CREATE_SOCKET                    118
-# define BIO_R_UNABLE_TO_KEEPALIVE                        137
-# define BIO_R_UNABLE_TO_LISTEN_SOCKET                    119
-# define BIO_R_UNABLE_TO_NODELAY                          138
-# define BIO_R_UNABLE_TO_REUSEADDR                        139
-# define BIO_R_UNAVAILABLE_IP_FAMILY                      145
-# define BIO_R_UNINITIALIZED                              120
-# define BIO_R_UNKNOWN_INFO_TYPE                          140
-# define BIO_R_UNSUPPORTED_IP_FAMILY                      146
-# define BIO_R_UNSUPPORTED_METHOD                         121
-# define BIO_R_UNSUPPORTED_PROTOCOL_FAMILY                131
-# define BIO_R_WRITE_TO_READ_ONLY_BIO                     126
-# define BIO_R_WSASTARTUP                                 122
-
-# ifdef  __cplusplus
-}
-# endif
-#endif

gpac-2.2.1.tar.gz/extra_lib/include/openssl/blowfish.h Deleted

@@ -1,61 +0,0 @@
-/*
- * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
- *
- * Licensed under the OpenSSL license (the "License").  You may not use
- * this file except in compliance with the License.  You can obtain a copy
- * in the file LICENSE in the source distribution or at
- * https://www.openssl.org/source/license.html
- */
-
-#ifndef HEADER_BLOWFISH_H
-# define HEADER_BLOWFISH_H
-
-# include <openssl/opensslconf.h>
-
-# ifndef OPENSSL_NO_BF
-# include <openssl/e_os2.h>
-# ifdef  __cplusplus
-extern "C" {
-# endif
-
-# define BF_ENCRYPT      1
-# define BF_DECRYPT      0
-
-/*-
- * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
- * ! BF_LONG has to be at least 32 bits wide.                     !
- * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
- */
-# define BF_LONG unsigned int
-
-# define BF_ROUNDS       16
-# define BF_BLOCK        8
-
-typedef struct bf_key_st {
-    BF_LONG PBF_ROUNDS + 2;
-    BF_LONG S4 * 256;
-} BF_KEY;
-
-void BF_set_key(BF_KEY *key, int len, const unsigned char *data);
-
-void BF_encrypt(BF_LONG *data, const BF_KEY *key);
-void BF_decrypt(BF_LONG *data, const BF_KEY *key);
-
-void BF_ecb_encrypt(const unsigned char *in, unsigned char *out,
-                    const BF_KEY *key, int enc);
-void BF_cbc_encrypt(const unsigned char *in, unsigned char *out, long length,
-                    const BF_KEY *schedule, unsigned char *ivec, int enc);
-void BF_cfb64_encrypt(const unsigned char *in, unsigned char *out,
-                      long length, const BF_KEY *schedule,
-                      unsigned char *ivec, int *num, int enc);
-void BF_ofb64_encrypt(const unsigned char *in, unsigned char *out,
-                      long length, const BF_KEY *schedule,
-                      unsigned char *ivec, int *num);
-const char *BF_options(void);
-
-# ifdef  __cplusplus
-}
-# endif
-# endif
-
-#endif

gpac-2.2.1.tar.gz/extra_lib/include/openssl/bn.h Deleted

@@ -1,575 +0,0 @@
-/*
- * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
- *
- * Licensed under the OpenSSL license (the "License").  You may not use
- * this file except in compliance with the License.  You can obtain a copy
- * in the file LICENSE in the source distribution or at
- * https://www.openssl.org/source/license.html
- */
-
-/* ====================================================================
- * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
- *
- * Portions of the attached software ("Contribution") are developed by
- * SUN MICROSYSTEMS, INC., and are contributed to the OpenSSL project.
- *
- * The Contribution is licensed pursuant to the Eric Young open source
- * license provided above.
- *
- * The binary polynomial arithmetic software is originally written by
- * Sheueling Chang Shantz and Douglas Stebila of Sun Microsystems Laboratories.
- *
- */
-
-#ifndef HEADER_BN_H
-# define HEADER_BN_H
-
-# include <openssl/e_os2.h>
-# ifndef OPENSSL_NO_STDIO
-#  include <stdio.h>
-# endif
-# include <openssl/opensslconf.h>
-# include <openssl/ossl_typ.h>
-# include <openssl/crypto.h>
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-/*
- * 64-bit processor with LP64 ABI
- */
-# ifdef SIXTY_FOUR_BIT_LONG
-#  define BN_ULONG        unsigned long
-#  define BN_BYTES        8
-# endif
-
-/*
- * 64-bit processor other than LP64 ABI
- */
-# ifdef SIXTY_FOUR_BIT
-#  define BN_ULONG        unsigned long long
-#  define BN_BYTES        8
-# endif
-
-# ifdef THIRTY_TWO_BIT
-#  define BN_ULONG        unsigned int
-#  define BN_BYTES        4
-# endif
-
-# define BN_BITS2       (BN_BYTES * 8)
-# define BN_BITS        (BN_BITS2 * 2)
-# define BN_TBIT        ((BN_ULONG)1 << (BN_BITS2 - 1))
-
-# define BN_FLG_MALLOCED         0x01
-# define BN_FLG_STATIC_DATA      0x02
-
-/*
- * avoid leaking exponent information through timing,
- * BN_mod_exp_mont() will call BN_mod_exp_mont_consttime,
- * BN_div() will call BN_div_no_branch,
- * BN_mod_inverse() will call BN_mod_inverse_no_branch.
- */
-# define BN_FLG_CONSTTIME        0x04
-# define BN_FLG_SECURE           0x08
-
-# if OPENSSL_API_COMPAT < 0x00908000L
-/* deprecated name for the flag */
-#  define BN_FLG_EXP_CONSTTIME BN_FLG_CONSTTIME
-#  define BN_FLG_FREE            0x8000 /* used for debugging */
-# endif
-
-void BN_set_flags(BIGNUM *b, int n);
-int BN_get_flags(const BIGNUM *b, int n);
-
-/* Values for |top| in BN_rand() */
-#define BN_RAND_TOP_ANY    -1
-#define BN_RAND_TOP_ONE     0
-#define BN_RAND_TOP_TWO     1
-
-/* Values for |bottom| in BN_rand() */
-#define BN_RAND_BOTTOM_ANY  0
-#define BN_RAND_BOTTOM_ODD  1
-
-/*
- * get a clone of a BIGNUM with changed flags, for *temporary* use only (the
- * two BIGNUMs cannot be used in parallel!). Also only for *read only* use. The
- * value |dest| should be a newly allocated BIGNUM obtained via BN_new() that
- * has not been otherwise initialised or used.
- */
-void BN_with_flags(BIGNUM *dest, const BIGNUM *b, int flags);
-
-/* Wrapper function to make using BN_GENCB easier */
-int BN_GENCB_call(BN_GENCB *cb, int a, int b);
-
-BN_GENCB *BN_GENCB_new(void);
-void BN_GENCB_free(BN_GENCB *cb);
-
-/* Populate a BN_GENCB structure with an "old"-style callback */
-void BN_GENCB_set_old(BN_GENCB *gencb, void (*callback) (int, int, void *),
-                      void *cb_arg);
-
-/* Populate a BN_GENCB structure with a "new"-style callback */
-void BN_GENCB_set(BN_GENCB *gencb, int (*callback) (int, int, BN_GENCB *),
-                  void *cb_arg);
-
-void *BN_GENCB_get_arg(BN_GENCB *cb);
-
-# define BN_prime_checks 0      /* default: select number of iterations based
-                                 * on the size of the number */
-
-/*
- * number of Miller-Rabin iterations for an error rate of less than 2^-80 for
- * random 'b'-bit input, b >= 100 (taken from table 4.4 in the Handbook of
- * Applied Cryptography Menezes, van Oorschot, Vanstone; CRC Press 1996;
- * original paper: Damgaard, Landrock, Pomerance: Average case error
- * estimates for the strong probable prime test. -- Math. Comp. 61 (1993)
- * 177-194)
- */
-# define BN_prime_checks_for_size(b) ((b) >= 1300 ?  2 : \
-                                (b) >=  850 ?  3 : \
-                                (b) >=  650 ?  4 : \
-                                (b) >=  550 ?  5 : \
-                                (b) >=  450 ?  6 : \
-                                (b) >=  400 ?  7 : \
-                                (b) >=  350 ?  8 : \
-                                (b) >=  300 ?  9 : \
-                                (b) >=  250 ? 12 : \
-                                (b) >=  200 ? 15 : \
-                                (b) >=  150 ? 18 : \
-                                /* b >= 100 */ 27)
-
-# define BN_num_bytes(a) ((BN_num_bits(a)+7)/8)
-
-int BN_abs_is_word(const BIGNUM *a, const BN_ULONG w);
-int BN_is_zero(const BIGNUM *a);
-int BN_is_one(const BIGNUM *a);
-int BN_is_word(const BIGNUM *a, const BN_ULONG w);
-int BN_is_odd(const BIGNUM *a);
-
-# define BN_one(a)       (BN_set_word((a),1))
-
-void BN_zero_ex(BIGNUM *a);
-
-# if OPENSSL_API_COMPAT >= 0x00908000L
-#  define BN_zero(a)      BN_zero_ex(a)
-# else
-#  define BN_zero(a)      (BN_set_word((a),0))
-# endif
-
-const BIGNUM *BN_value_one(void);
-char *BN_options(void);
-BN_CTX *BN_CTX_new(void);
-BN_CTX *BN_CTX_secure_new(void);
-void BN_CTX_free(BN_CTX *c);
-void BN_CTX_start(BN_CTX *ctx);
-BIGNUM *BN_CTX_get(BN_CTX *ctx);
-void BN_CTX_end(BN_CTX *ctx);
-int BN_rand(BIGNUM *rnd, int bits, int top, int bottom);
-int BN_pseudo_rand(BIGNUM *rnd, int bits, int top, int bottom);
-int BN_rand_range(BIGNUM *rnd, const BIGNUM *range);
-int BN_pseudo_rand_range(BIGNUM *rnd, const BIGNUM *range);
-int BN_num_bits(const BIGNUM *a);
-int BN_num_bits_word(BN_ULONG l);
-int BN_security_bits(int L, int N);
-BIGNUM *BN_new(void);
-BIGNUM *BN_secure_new(void);
-void BN_clear_free(BIGNUM *a);
-BIGNUM *BN_copy(BIGNUM *a, const BIGNUM *b);
-void BN_swap(BIGNUM *a, BIGNUM *b);
-BIGNUM *BN_bin2bn(const unsigned char *s, int len, BIGNUM *ret);
-int BN_bn2bin(const BIGNUM *a, unsigned char *to);
-int BN_bn2binpad(const BIGNUM *a, unsigned char *to, int tolen);
-BIGNUM *BN_lebin2bn(const unsigned char *s, int len, BIGNUM *ret);
-int BN_bn2lebinpad(const BIGNUM *a, unsigned char *to, int tolen);
-BIGNUM *BN_mpi2bn(const unsigned char *s, int len, BIGNUM *ret);
-int BN_bn2mpi(const BIGNUM *a, unsigned char *to);
-int BN_sub(BIGNUM *r, const BIGNUM *a, const BIGNUM *b);
-int BN_usub(BIGNUM *r, const BIGNUM *a, const BIGNUM *b);
-int BN_uadd(BIGNUM *r, const BIGNUM *a, const BIGNUM *b);
-int BN_add(BIGNUM *r, const BIGNUM *a, const BIGNUM *b);
-int BN_mul(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, BN_CTX *ctx);
-int BN_sqr(BIGNUM *r, const BIGNUM *a, BN_CTX *ctx);
-/** BN_set_negative sets sign of a BIGNUM
- * \param  b  pointer to the BIGNUM object
- * \param  n  0 if the BIGNUM b should be positive and a value != 0 otherwise
- */
-void BN_set_negative(BIGNUM *b, int n);
-/** BN_is_negative returns 1 if the BIGNUM is negative
- * \param  a  pointer to the BIGNUM object
- * \return 1 if a < 0 and 0 otherwise
- */
-int BN_is_negative(const BIGNUM *b);
-
-int BN_div(BIGNUM *dv, BIGNUM *rem, const BIGNUM *m, const BIGNUM *d,
-           BN_CTX *ctx);
-# define BN_mod(rem,m,d,ctx) BN_div(NULL,(rem),(m),(d),(ctx))
-int BN_nnmod(BIGNUM *r, const BIGNUM *m, const BIGNUM *d, BN_CTX *ctx);
-int BN_mod_add(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, const BIGNUM *m,
-               BN_CTX *ctx);
-int BN_mod_add_quick(BIGNUM *r, const BIGNUM *a, const BIGNUM *b,
-                     const BIGNUM *m);
-int BN_mod_sub(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, const BIGNUM *m,
-               BN_CTX *ctx);
-int BN_mod_sub_quick(BIGNUM *r, const BIGNUM *a, const BIGNUM *b,
-                     const BIGNUM *m);
-int BN_mod_mul(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, const BIGNUM *m,
-               BN_CTX *ctx);
-int BN_mod_sqr(BIGNUM *r, const BIGNUM *a, const BIGNUM *m, BN_CTX *ctx);
-int BN_mod_lshift1(BIGNUM *r, const BIGNUM *a, const BIGNUM *m, BN_CTX *ctx);
-int BN_mod_lshift1_quick(BIGNUM *r, const BIGNUM *a, const BIGNUM *m);
-int BN_mod_lshift(BIGNUM *r, const BIGNUM *a, int n, const BIGNUM *m,
-                  BN_CTX *ctx);
-int BN_mod_lshift_quick(BIGNUM *r, const BIGNUM *a, int n, const BIGNUM *m);
-
-BN_ULONG BN_mod_word(const BIGNUM *a, BN_ULONG w);
-BN_ULONG BN_div_word(BIGNUM *a, BN_ULONG w);
-int BN_mul_word(BIGNUM *a, BN_ULONG w);
-int BN_add_word(BIGNUM *a, BN_ULONG w);
-int BN_sub_word(BIGNUM *a, BN_ULONG w);
-int BN_set_word(BIGNUM *a, BN_ULONG w);
-BN_ULONG BN_get_word(const BIGNUM *a);
-
-int BN_cmp(const BIGNUM *a, const BIGNUM *b);
-void BN_free(BIGNUM *a);
-int BN_is_bit_set(const BIGNUM *a, int n);
-int BN_lshift(BIGNUM *r, const BIGNUM *a, int n);
-int BN_lshift1(BIGNUM *r, const BIGNUM *a);
-int BN_exp(BIGNUM *r, const BIGNUM *a, const BIGNUM *p, BN_CTX *ctx);
-
-int BN_mod_exp(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
-               const BIGNUM *m, BN_CTX *ctx);
-int BN_mod_exp_mont(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
-                    const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx);
-int BN_mod_exp_mont_consttime(BIGNUM *rr, const BIGNUM *a, const BIGNUM *p,
-                              const BIGNUM *m, BN_CTX *ctx,
-                              BN_MONT_CTX *in_mont);
-int BN_mod_exp_mont_word(BIGNUM *r, BN_ULONG a, const BIGNUM *p,
-                         const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx);
-int BN_mod_exp2_mont(BIGNUM *r, const BIGNUM *a1, const BIGNUM *p1,
-                     const BIGNUM *a2, const BIGNUM *p2, const BIGNUM *m,
-                     BN_CTX *ctx, BN_MONT_CTX *m_ctx);
-int BN_mod_exp_simple(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
-                      const BIGNUM *m, BN_CTX *ctx);
-
-int BN_mask_bits(BIGNUM *a, int n);
-# ifndef OPENSSL_NO_STDIO
-int BN_print_fp(FILE *fp, const BIGNUM *a);
-# endif
-int BN_print(BIO *bio, const BIGNUM *a);
-int BN_reciprocal(BIGNUM *r, const BIGNUM *m, int len, BN_CTX *ctx);
-int BN_rshift(BIGNUM *r, const BIGNUM *a, int n);
-int BN_rshift1(BIGNUM *r, const BIGNUM *a);
-void BN_clear(BIGNUM *a);
-BIGNUM *BN_dup(const BIGNUM *a);
-int BN_ucmp(const BIGNUM *a, const BIGNUM *b);
-int BN_set_bit(BIGNUM *a, int n);
-int BN_clear_bit(BIGNUM *a, int n);
-char *BN_bn2hex(const BIGNUM *a);
-char *BN_bn2dec(const BIGNUM *a);
-int BN_hex2bn(BIGNUM **a, const char *str);
-int BN_dec2bn(BIGNUM **a, const char *str);
-int BN_asc2bn(BIGNUM **a, const char *str);
-int BN_gcd(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, BN_CTX *ctx);
-int BN_kronecker(const BIGNUM *a, const BIGNUM *b, BN_CTX *ctx); /* returns
-                                                                  * -2 for
-                                                                  * error */
-BIGNUM *BN_mod_inverse(BIGNUM *ret,
-                       const BIGNUM *a, const BIGNUM *n, BN_CTX *ctx);
-BIGNUM *BN_mod_sqrt(BIGNUM *ret,
-                    const BIGNUM *a, const BIGNUM *n, BN_CTX *ctx);
-
-void BN_consttime_swap(BN_ULONG swap, BIGNUM *a, BIGNUM *b, int nwords);
-
-/* Deprecated versions */
-DEPRECATEDIN_0_9_8(BIGNUM *BN_generate_prime(BIGNUM *ret, int bits, int safe,
-                                             const BIGNUM *add,
-                                             const BIGNUM *rem,
-                                             void (*callback) (int, int,
-                                                               void *),
-                                             void *cb_arg))
-DEPRECATEDIN_0_9_8(int
-                   BN_is_prime(const BIGNUM *p, int nchecks,
-                               void (*callback) (int, int, void *),
-                               BN_CTX *ctx, void *cb_arg))
-DEPRECATEDIN_0_9_8(int
-                   BN_is_prime_fasttest(const BIGNUM *p, int nchecks,
-                                        void (*callback) (int, int, void *),
-                                        BN_CTX *ctx, void *cb_arg,
-                                        int do_trial_division))
-
-/* Newer versions */
-int BN_generate_prime_ex(BIGNUM *ret, int bits, int safe, const BIGNUM *add,
-                         const BIGNUM *rem, BN_GENCB *cb);
-int BN_is_prime_ex(const BIGNUM *p, int nchecks, BN_CTX *ctx, BN_GENCB *cb);
-int BN_is_prime_fasttest_ex(const BIGNUM *p, int nchecks, BN_CTX *ctx,
-                            int do_trial_division, BN_GENCB *cb);
-
-int BN_X931_generate_Xpq(BIGNUM *Xp, BIGNUM *Xq, int nbits, BN_CTX *ctx);
-
-int BN_X931_derive_prime_ex(BIGNUM *p, BIGNUM *p1, BIGNUM *p2,
-                            const BIGNUM *Xp, const BIGNUM *Xp1,
-                            const BIGNUM *Xp2, const BIGNUM *e, BN_CTX *ctx,
-                            BN_GENCB *cb);
-int BN_X931_generate_prime_ex(BIGNUM *p, BIGNUM *p1, BIGNUM *p2, BIGNUM *Xp1,
-                              BIGNUM *Xp2, const BIGNUM *Xp, const BIGNUM *e,
-                              BN_CTX *ctx, BN_GENCB *cb);
-
-BN_MONT_CTX *BN_MONT_CTX_new(void);
-int BN_mod_mul_montgomery(BIGNUM *r, const BIGNUM *a, const BIGNUM *b,
-                          BN_MONT_CTX *mont, BN_CTX *ctx);
-int BN_to_montgomery(BIGNUM *r, const BIGNUM *a, BN_MONT_CTX *mont,
-                     BN_CTX *ctx);
-int BN_from_montgomery(BIGNUM *r, const BIGNUM *a, BN_MONT_CTX *mont,
-                       BN_CTX *ctx);
-void BN_MONT_CTX_free(BN_MONT_CTX *mont);
-int BN_MONT_CTX_set(BN_MONT_CTX *mont, const BIGNUM *mod, BN_CTX *ctx);
-BN_MONT_CTX *BN_MONT_CTX_copy(BN_MONT_CTX *to, BN_MONT_CTX *from);
-BN_MONT_CTX *BN_MONT_CTX_set_locked(BN_MONT_CTX **pmont, CRYPTO_RWLOCK *lock,
-                                    const BIGNUM *mod, BN_CTX *ctx);
-
-/* BN_BLINDING flags */
-# define BN_BLINDING_NO_UPDATE   0x00000001
-# define BN_BLINDING_NO_RECREATE 0x00000002
-
-BN_BLINDING *BN_BLINDING_new(const BIGNUM *A, const BIGNUM *Ai, BIGNUM *mod);
-void BN_BLINDING_free(BN_BLINDING *b);
-int BN_BLINDING_update(BN_BLINDING *b, BN_CTX *ctx);
-int BN_BLINDING_convert(BIGNUM *n, BN_BLINDING *b, BN_CTX *ctx);
-int BN_BLINDING_invert(BIGNUM *n, BN_BLINDING *b, BN_CTX *ctx);
-int BN_BLINDING_convert_ex(BIGNUM *n, BIGNUM *r, BN_BLINDING *b, BN_CTX *);
-int BN_BLINDING_invert_ex(BIGNUM *n, const BIGNUM *r, BN_BLINDING *b,
-                          BN_CTX *);
-
-int BN_BLINDING_is_current_thread(BN_BLINDING *b);
-void BN_BLINDING_set_current_thread(BN_BLINDING *b);
-int BN_BLINDING_lock(BN_BLINDING *b);
-int BN_BLINDING_unlock(BN_BLINDING *b);
-
-unsigned long BN_BLINDING_get_flags(const BN_BLINDING *);
-void BN_BLINDING_set_flags(BN_BLINDING *, unsigned long);
-BN_BLINDING *BN_BLINDING_create_param(BN_BLINDING *b,
-                                      const BIGNUM *e, BIGNUM *m, BN_CTX *ctx,
-                                      int (*bn_mod_exp) (BIGNUM *r,
-                                                         const BIGNUM *a,
-                                                         const BIGNUM *p,
-                                                         const BIGNUM *m,
-                                                         BN_CTX *ctx,
-                                                         BN_MONT_CTX *m_ctx),
-                                      BN_MONT_CTX *m_ctx);
-
-DEPRECATEDIN_0_9_8(void BN_set_params(int mul, int high, int low, int mont))
-DEPRECATEDIN_0_9_8(int BN_get_params(int which)) /* 0, mul, 1 high, 2 low, 3
-                                                  * mont */
-
-BN_RECP_CTX *BN_RECP_CTX_new(void);
-void BN_RECP_CTX_free(BN_RECP_CTX *recp);
-int BN_RECP_CTX_set(BN_RECP_CTX *recp, const BIGNUM *rdiv, BN_CTX *ctx);
-int BN_mod_mul_reciprocal(BIGNUM *r, const BIGNUM *x, const BIGNUM *y,
-                          BN_RECP_CTX *recp, BN_CTX *ctx);
-int BN_mod_exp_recp(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
-                    const BIGNUM *m, BN_CTX *ctx);
-int BN_div_recp(BIGNUM *dv, BIGNUM *rem, const BIGNUM *m,
-                BN_RECP_CTX *recp, BN_CTX *ctx);
-
-# ifndef OPENSSL_NO_EC2M
-
-/*
- * Functions for arithmetic over binary polynomials represented by BIGNUMs.
- * The BIGNUM::neg property of BIGNUMs representing binary polynomials is
- * ignored. Note that input arguments are not const so that their bit arrays
- * can be expanded to the appropriate size if needed.
- */
-
-/*
- * r = a + b
- */
-int BN_GF2m_add(BIGNUM *r, const BIGNUM *a, const BIGNUM *b);
-#  define BN_GF2m_sub(r, a, b) BN_GF2m_add(r, a, b)
-/*
- * r=a mod p
- */
-int BN_GF2m_mod(BIGNUM *r, const BIGNUM *a, const BIGNUM *p);
-/* r = (a * b) mod p */
-int BN_GF2m_mod_mul(BIGNUM *r, const BIGNUM *a, const BIGNUM *b,
-                    const BIGNUM *p, BN_CTX *ctx);
-/* r = (a * a) mod p */
-int BN_GF2m_mod_sqr(BIGNUM *r, const BIGNUM *a, const BIGNUM *p, BN_CTX *ctx);
-/* r = (1 / b) mod p */
-int BN_GF2m_mod_inv(BIGNUM *r, const BIGNUM *b, const BIGNUM *p, BN_CTX *ctx);
-/* r = (a / b) mod p */
-int BN_GF2m_mod_div(BIGNUM *r, const BIGNUM *a, const BIGNUM *b,
-                    const BIGNUM *p, BN_CTX *ctx);
-/* r = (a ^ b) mod p */
-int BN_GF2m_mod_exp(BIGNUM *r, const BIGNUM *a, const BIGNUM *b,
-                    const BIGNUM *p, BN_CTX *ctx);
-/* r = sqrt(a) mod p */
-int BN_GF2m_mod_sqrt(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
-                     BN_CTX *ctx);
-/* r^2 + r = a mod p */
-int BN_GF2m_mod_solve_quad(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
-                           BN_CTX *ctx);
-#  define BN_GF2m_cmp(a, b) BN_ucmp((a), (b))
-/*-
- * Some functions allow for representation of the irreducible polynomials
- * as an unsigned int, say p.  The irreducible f(t) is then of the form:
- *     t^p0 + t^p1 + ... + t^pk
- * where m = p0 > p1 > ... > pk = 0.
- */
-/* r = a mod p */
-int BN_GF2m_mod_arr(BIGNUM *r, const BIGNUM *a, const int p);
-/* r = (a * b) mod p */
-int BN_GF2m_mod_mul_arr(BIGNUM *r, const BIGNUM *a, const BIGNUM *b,
-                        const int p, BN_CTX *ctx);
-/* r = (a * a) mod p */
-int BN_GF2m_mod_sqr_arr(BIGNUM *r, const BIGNUM *a, const int p,
-                        BN_CTX *ctx);
-/* r = (1 / b) mod p */
-int BN_GF2m_mod_inv_arr(BIGNUM *r, const BIGNUM *b, const int p,
-                        BN_CTX *ctx);
-/* r = (a / b) mod p */
-int BN_GF2m_mod_div_arr(BIGNUM *r, const BIGNUM *a, const BIGNUM *b,
-                        const int p, BN_CTX *ctx);
-/* r = (a ^ b) mod p */
-int BN_GF2m_mod_exp_arr(BIGNUM *r, const BIGNUM *a, const BIGNUM *b,
-                        const int p, BN_CTX *ctx);
-/* r = sqrt(a) mod p */
-int BN_GF2m_mod_sqrt_arr(BIGNUM *r, const BIGNUM *a,
-                         const int p, BN_CTX *ctx);
-/* r^2 + r = a mod p */
-int BN_GF2m_mod_solve_quad_arr(BIGNUM *r, const BIGNUM *a,
-                               const int p, BN_CTX *ctx);
-int BN_GF2m_poly2arr(const BIGNUM *a, int p, int max);
-int BN_GF2m_arr2poly(const int p, BIGNUM *a);
-
-# endif
-
-/*
- * faster mod functions for the 'NIST primes' 0 <= a < p^2
- */
-int BN_nist_mod_192(BIGNUM *r, const BIGNUM *a, const BIGNUM *p, BN_CTX *ctx);
-int BN_nist_mod_224(BIGNUM *r, const BIGNUM *a, const BIGNUM *p, BN_CTX *ctx);
-int BN_nist_mod_256(BIGNUM *r, const BIGNUM *a, const BIGNUM *p, BN_CTX *ctx);
-int BN_nist_mod_384(BIGNUM *r, const BIGNUM *a, const BIGNUM *p, BN_CTX *ctx);
-int BN_nist_mod_521(BIGNUM *r, const BIGNUM *a, const BIGNUM *p, BN_CTX *ctx);
-
-const BIGNUM *BN_get0_nist_prime_192(void);
-const BIGNUM *BN_get0_nist_prime_224(void);
-const BIGNUM *BN_get0_nist_prime_256(void);
-const BIGNUM *BN_get0_nist_prime_384(void);
-const BIGNUM *BN_get0_nist_prime_521(void);
-
-int (*BN_nist_mod_func(const BIGNUM *p)) (BIGNUM *r, const BIGNUM *a,
-                                          const BIGNUM *field, BN_CTX *ctx);
-
-int BN_generate_dsa_nonce(BIGNUM *out, const BIGNUM *range,
-                          const BIGNUM *priv, const unsigned char *message,
-                          size_t message_len, BN_CTX *ctx);
-
-/* Primes from RFC 2409 */
-BIGNUM *BN_get_rfc2409_prime_768(BIGNUM *bn);
-BIGNUM *BN_get_rfc2409_prime_1024(BIGNUM *bn);
-
-/* Primes from RFC 3526 */
-BIGNUM *BN_get_rfc3526_prime_1536(BIGNUM *bn);
-BIGNUM *BN_get_rfc3526_prime_2048(BIGNUM *bn);
-BIGNUM *BN_get_rfc3526_prime_3072(BIGNUM *bn);
-BIGNUM *BN_get_rfc3526_prime_4096(BIGNUM *bn);
-BIGNUM *BN_get_rfc3526_prime_6144(BIGNUM *bn);
-BIGNUM *BN_get_rfc3526_prime_8192(BIGNUM *bn);
-
-# if OPENSSL_API_COMPAT < 0x10100000L
-#  define get_rfc2409_prime_768 BN_get_rfc2409_prime_768
-#  define get_rfc2409_prime_1024 BN_get_rfc2409_prime_1024
-#  define get_rfc3526_prime_1536 BN_get_rfc3526_prime_1536
-#  define get_rfc3526_prime_2048 BN_get_rfc3526_prime_2048
-#  define get_rfc3526_prime_3072 BN_get_rfc3526_prime_3072
-#  define get_rfc3526_prime_4096 BN_get_rfc3526_prime_4096
-#  define get_rfc3526_prime_6144 BN_get_rfc3526_prime_6144
-#  define get_rfc3526_prime_8192 BN_get_rfc3526_prime_8192
-# endif
-
-int BN_bntest_rand(BIGNUM *rnd, int bits, int top, int bottom);
-
-/* BEGIN ERROR CODES */
-/*
- * The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
-
-int ERR_load_BN_strings(void);
-
-/* Error codes for the BN functions. */
-
-/* Function codes. */
-# define BN_F_BNRAND                                      127
-# define BN_F_BN_BLINDING_CONVERT_EX                      100
-# define BN_F_BN_BLINDING_CREATE_PARAM                    128
-# define BN_F_BN_BLINDING_INVERT_EX                       101
-# define BN_F_BN_BLINDING_NEW                             102
-# define BN_F_BN_BLINDING_UPDATE                          103
-# define BN_F_BN_BN2DEC                                   104
-# define BN_F_BN_BN2HEX                                   105
-# define BN_F_BN_COMPUTE_WNAF                             142
-# define BN_F_BN_CTX_GET                                  116
-# define BN_F_BN_CTX_NEW                                  106
-# define BN_F_BN_CTX_START                                129
-# define BN_F_BN_DIV                                      107
-# define BN_F_BN_DIV_RECP                                 130
-# define BN_F_BN_EXP                                      123
-# define BN_F_BN_EXPAND_INTERNAL                          120
-# define BN_F_BN_GENCB_NEW                                143
-# define BN_F_BN_GENERATE_DSA_NONCE                       140
-# define BN_F_BN_GENERATE_PRIME_EX                        141
-# define BN_F_BN_GF2M_MOD                                 131
-# define BN_F_BN_GF2M_MOD_EXP                             132
-# define BN_F_BN_GF2M_MOD_MUL                             133
-# define BN_F_BN_GF2M_MOD_SOLVE_QUAD                      134
-# define BN_F_BN_GF2M_MOD_SOLVE_QUAD_ARR                  135
-# define BN_F_BN_GF2M_MOD_SQR                             136
-# define BN_F_BN_GF2M_MOD_SQRT                            137
-# define BN_F_BN_LSHIFT                                   145
-# define BN_F_BN_MOD_EXP2_MONT                            118
-# define BN_F_BN_MOD_EXP_MONT                             109
-# define BN_F_BN_MOD_EXP_MONT_CONSTTIME                   124
-# define BN_F_BN_MOD_EXP_MONT_WORD                        117
-# define BN_F_BN_MOD_EXP_RECP                             125
-# define BN_F_BN_MOD_EXP_SIMPLE                           126
-# define BN_F_BN_MOD_INVERSE                              110
-# define BN_F_BN_MOD_INVERSE_NO_BRANCH                    139
-# define BN_F_BN_MOD_LSHIFT_QUICK                         119
-# define BN_F_BN_MOD_SQRT                                 121
-# define BN_F_BN_MPI2BN                                   112
-# define BN_F_BN_NEW                                      113
-# define BN_F_BN_RAND                                     114
-# define BN_F_BN_RAND_RANGE                               122
-# define BN_F_BN_RSHIFT                                   146
-# define BN_F_BN_SET_WORDS                                144
-# define BN_F_BN_USUB                                     115
-
-/* Reason codes. */
-# define BN_R_ARG2_LT_ARG3                                100
-# define BN_R_BAD_RECIPROCAL                              101
-# define BN_R_BIGNUM_TOO_LONG                             114
-# define BN_R_BITS_TOO_SMALL                              118
-# define BN_R_CALLED_WITH_EVEN_MODULUS                    102
-# define BN_R_DIV_BY_ZERO                                 103
-# define BN_R_ENCODING_ERROR                              104
-# define BN_R_EXPAND_ON_STATIC_BIGNUM_DATA                105
-# define BN_R_INPUT_NOT_REDUCED                           110
-# define BN_R_INVALID_LENGTH                              106
-# define BN_R_INVALID_RANGE                               115
-# define BN_R_INVALID_SHIFT                               119
-# define BN_R_NOT_A_SQUARE                                111
-# define BN_R_NOT_INITIALIZED                             107
-# define BN_R_NO_INVERSE                                  108
-# define BN_R_NO_SOLUTION                                 116
-# define BN_R_PRIVATE_KEY_TOO_LARGE                       117
-# define BN_R_P_IS_NOT_PRIME                              112
-# define BN_R_TOO_MANY_ITERATIONS                         113
-# define BN_R_TOO_MANY_TEMPORARY_VARIABLES                109
-
-# ifdef  __cplusplus
-}
-# endif
-#endif

gpac-2.2.1.tar.gz/extra_lib/include/openssl/buffer.h Deleted

@@ -1,76 +0,0 @@
-/*
- * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
- *
- * Licensed under the OpenSSL license (the "License").  You may not use
- * this file except in compliance with the License.  You can obtain a copy
- * in the file LICENSE in the source distribution or at
- * https://www.openssl.org/source/license.html
- */
-
-#ifndef HEADER_BUFFER_H
-# define HEADER_BUFFER_H
-
-# include <openssl/ossl_typ.h>
-# ifndef HEADER_CRYPTO_H
-#  include <openssl/crypto.h>
-# endif
-
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-# include <stddef.h>
-
-# if !defined(NO_SYS_TYPES_H)
-#  include <sys/types.h>
-# endif
-
-/*
- * These names are outdated as of OpenSSL 1.1; a future release
- * will move them to be deprecated.
- */
-# define BUF_strdup(s) OPENSSL_strdup(s)
-# define BUF_strndup(s, size) OPENSSL_strndup(s, size)
-# define BUF_memdup(data, size) OPENSSL_memdup(data, size)
-# define BUF_strlcpy(dst, src, size)  OPENSSL_strlcpy(dst, src, size)
-# define BUF_strlcat(dst, src, size) OPENSSL_strlcat(dst, src, size)
-# define BUF_strnlen(str, maxlen) OPENSSL_strnlen(str, maxlen)
-
-struct buf_mem_st {
-    size_t length;              /* current number of bytes */
-    char *data;
-    size_t max;                 /* size of buffer */
-    unsigned long flags;
-};
-
-# define BUF_MEM_FLAG_SECURE  0x01
-
-BUF_MEM *BUF_MEM_new(void);
-BUF_MEM *BUF_MEM_new_ex(unsigned long flags);
-void BUF_MEM_free(BUF_MEM *a);
-size_t BUF_MEM_grow(BUF_MEM *str, size_t len);
-size_t BUF_MEM_grow_clean(BUF_MEM *str, size_t len);
-void BUF_reverse(unsigned char *out, const unsigned char *in, size_t siz);
-
-/* BEGIN ERROR CODES */
-/*
- * The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
-
-int ERR_load_BUF_strings(void);
-
-/* Error codes for the BUF functions. */
-
-/* Function codes. */
-# define BUF_F_BUF_MEM_GROW                               100
-# define BUF_F_BUF_MEM_GROW_CLEAN                         105
-# define BUF_F_BUF_MEM_NEW                                101
-
-/* Reason codes. */
-
-# ifdef  __cplusplus
-}
-# endif
-#endif

gpac-2.2.1.tar.gz/extra_lib/include/openssl/camellia.h Deleted

@@ -1,83 +0,0 @@
-/*
- * Copyright 2006-2016 The OpenSSL Project Authors. All Rights Reserved.
- *
- * Licensed under the OpenSSL license (the "License").  You may not use
- * this file except in compliance with the License.  You can obtain a copy
- * in the file LICENSE in the source distribution or at
- * https://www.openssl.org/source/license.html
- */
-
-#ifndef HEADER_CAMELLIA_H
-# define HEADER_CAMELLIA_H
-
-# include <openssl/opensslconf.h>
-
-# ifndef OPENSSL_NO_CAMELLIA
-# include <stddef.h>
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-# define CAMELLIA_ENCRYPT        1
-# define CAMELLIA_DECRYPT        0
-
-/*
- * Because array size can't be a const in C, the following two are macros.
- * Both sizes are in bytes.
- */
-
-/* This should be a hidden type, but EVP requires that the size be known */
-
-# define CAMELLIA_BLOCK_SIZE 16
-# define CAMELLIA_TABLE_BYTE_LEN 272
-# define CAMELLIA_TABLE_WORD_LEN (CAMELLIA_TABLE_BYTE_LEN / 4)
-
-typedef unsigned int KEY_TABLE_TYPECAMELLIA_TABLE_WORD_LEN; /* to match
-                                                               * with WORD */
-
-struct camellia_key_st {
-    union {
-        double d;               /* ensures 64-bit align */
-        KEY_TABLE_TYPE rd_key;
-    } u;
-    int grand_rounds;
-};
-typedef struct camellia_key_st CAMELLIA_KEY;
-
-int Camellia_set_key(const unsigned char *userKey, const int bits,
-                     CAMELLIA_KEY *key);
-
-void Camellia_encrypt(const unsigned char *in, unsigned char *out,
-                      const CAMELLIA_KEY *key);
-void Camellia_decrypt(const unsigned char *in, unsigned char *out,
-                      const CAMELLIA_KEY *key);
-
-void Camellia_ecb_encrypt(const unsigned char *in, unsigned char *out,
-                          const CAMELLIA_KEY *key, const int enc);
-void Camellia_cbc_encrypt(const unsigned char *in, unsigned char *out,
-                          size_t length, const CAMELLIA_KEY *key,
-                          unsigned char *ivec, const int enc);
-void Camellia_cfb128_encrypt(const unsigned char *in, unsigned char *out,
-                             size_t length, const CAMELLIA_KEY *key,
-                             unsigned char *ivec, int *num, const int enc);
-void Camellia_cfb1_encrypt(const unsigned char *in, unsigned char *out,
-                           size_t length, const CAMELLIA_KEY *key,
-                           unsigned char *ivec, int *num, const int enc);
-void Camellia_cfb8_encrypt(const unsigned char *in, unsigned char *out,
-                           size_t length, const CAMELLIA_KEY *key,
-                           unsigned char *ivec, int *num, const int enc);
-void Camellia_ofb128_encrypt(const unsigned char *in, unsigned char *out,
-                             size_t length, const CAMELLIA_KEY *key,
-                             unsigned char *ivec, int *num);
-void Camellia_ctr128_encrypt(const unsigned char *in, unsigned char *out,
-                             size_t length, const CAMELLIA_KEY *key,
-                             unsigned char ivecCAMELLIA_BLOCK_SIZE,
-                             unsigned char ecount_bufCAMELLIA_BLOCK_SIZE,
-                             unsigned int *num);
-
-# ifdef  __cplusplus
-}
-# endif
-# endif
-
-#endif

gpac-2.2.1.tar.gz/extra_lib/include/openssl/cast.h Deleted

@@ -1,53 +0,0 @@
-/*
- * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
- *
- * Licensed under the OpenSSL license (the "License").  You may not use
- * this file except in compliance with the License.  You can obtain a copy
- * in the file LICENSE in the source distribution or at
- * https://www.openssl.org/source/license.html
- */
-
-#ifndef HEADER_CAST_H
-# define HEADER_CAST_H
-
-# include <openssl/opensslconf.h>
-
-# ifndef OPENSSL_NO_CAST
-# ifdef  __cplusplus
-extern "C" {
-# endif
-
-# define CAST_ENCRYPT    1
-# define CAST_DECRYPT    0
-
-# define CAST_LONG unsigned int
-
-# define CAST_BLOCK      8
-# define CAST_KEY_LENGTH 16
-
-typedef struct cast_key_st {
-    CAST_LONG data32;
-    int short_key;              /* Use reduced rounds for short key */
-} CAST_KEY;
-
-void CAST_set_key(CAST_KEY *key, int len, const unsigned char *data);
-void CAST_ecb_encrypt(const unsigned char *in, unsigned char *out,
-                      const CAST_KEY *key, int enc);
-void CAST_encrypt(CAST_LONG *data, const CAST_KEY *key);
-void CAST_decrypt(CAST_LONG *data, const CAST_KEY *key);
-void CAST_cbc_encrypt(const unsigned char *in, unsigned char *out,
-                      long length, const CAST_KEY *ks, unsigned char *iv,
-                      int enc);
-void CAST_cfb64_encrypt(const unsigned char *in, unsigned char *out,
-                        long length, const CAST_KEY *schedule,
-                        unsigned char *ivec, int *num, int enc);
-void CAST_ofb64_encrypt(const unsigned char *in, unsigned char *out,
-                        long length, const CAST_KEY *schedule,
-                        unsigned char *ivec, int *num);
-
-# ifdef  __cplusplus
-}
-# endif
-# endif
-
-#endif

gpac-2.2.1.tar.gz/extra_lib/include/openssl/cmac.h Deleted

@@ -1,41 +0,0 @@
-/*
- * Copyright 2010-2016 The OpenSSL Project Authors. All Rights Reserved.
- *
- * Licensed under the OpenSSL license (the "License").  You may not use
- * this file except in compliance with the License.  You can obtain a copy
- * in the file LICENSE in the source distribution or at
- * https://www.openssl.org/source/license.html
- */
-
-#ifndef HEADER_CMAC_H
-# define HEADER_CMAC_H
-
-# ifndef OPENSSL_NO_CMAC
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-# include <openssl/evp.h>
-
-/* Opaque */
-typedef struct CMAC_CTX_st CMAC_CTX;
-
-CMAC_CTX *CMAC_CTX_new(void);
-void CMAC_CTX_cleanup(CMAC_CTX *ctx);
-void CMAC_CTX_free(CMAC_CTX *ctx);
-EVP_CIPHER_CTX *CMAC_CTX_get0_cipher_ctx(CMAC_CTX *ctx);
-int CMAC_CTX_copy(CMAC_CTX *out, const CMAC_CTX *in);
-
-int CMAC_Init(CMAC_CTX *ctx, const void *key, size_t keylen,
-              const EVP_CIPHER *cipher, ENGINE *impl);
-int CMAC_Update(CMAC_CTX *ctx, const void *data, size_t dlen);
-int CMAC_Final(CMAC_CTX *ctx, unsigned char *out, size_t *poutlen);
-int CMAC_resume(CMAC_CTX *ctx);
-
-#ifdef  __cplusplus
-}
-#endif
-
-# endif
-#endif

gpac-2.2.1.tar.gz/extra_lib/include/openssl/cms.h Deleted

@@ -1,512 +0,0 @@
-/*
- * Copyright 2008-2016 The OpenSSL Project Authors. All Rights Reserved.
- *
- * Licensed under the OpenSSL license (the "License").  You may not use
- * this file except in compliance with the License.  You can obtain a copy
- * in the file LICENSE in the source distribution or at
- * https://www.openssl.org/source/license.html
- */
-
-#ifndef HEADER_CMS_H
-# define HEADER_CMS_H
-
-# include <openssl/opensslconf.h>
-
-# ifndef OPENSSL_NO_CMS
-# include <openssl/x509.h>
-# include <openssl/x509v3.h>
-# ifdef __cplusplus
-extern "C" {
-# endif
-
-typedef struct CMS_ContentInfo_st CMS_ContentInfo;
-typedef struct CMS_SignerInfo_st CMS_SignerInfo;
-typedef struct CMS_CertificateChoices CMS_CertificateChoices;
-typedef struct CMS_RevocationInfoChoice_st CMS_RevocationInfoChoice;
-typedef struct CMS_RecipientInfo_st CMS_RecipientInfo;
-typedef struct CMS_ReceiptRequest_st CMS_ReceiptRequest;
-typedef struct CMS_Receipt_st CMS_Receipt;
-typedef struct CMS_RecipientEncryptedKey_st CMS_RecipientEncryptedKey;
-typedef struct CMS_OtherKeyAttribute_st CMS_OtherKeyAttribute;
-
-DEFINE_STACK_OF(CMS_SignerInfo)
-DEFINE_STACK_OF(CMS_RecipientEncryptedKey)
-DEFINE_STACK_OF(CMS_RecipientInfo)
-DEFINE_STACK_OF(CMS_RevocationInfoChoice)
-DECLARE_ASN1_FUNCTIONS(CMS_ContentInfo)
-DECLARE_ASN1_FUNCTIONS(CMS_ReceiptRequest)
-DECLARE_ASN1_PRINT_FUNCTION(CMS_ContentInfo)
-
-# define CMS_SIGNERINFO_ISSUER_SERIAL    0
-# define CMS_SIGNERINFO_KEYIDENTIFIER    1
-
-# define CMS_RECIPINFO_NONE              -1
-# define CMS_RECIPINFO_TRANS             0
-# define CMS_RECIPINFO_AGREE             1
-# define CMS_RECIPINFO_KEK               2
-# define CMS_RECIPINFO_PASS              3
-# define CMS_RECIPINFO_OTHER             4
-
-/* S/MIME related flags */
-
-# define CMS_TEXT                        0x1
-# define CMS_NOCERTS                     0x2
-# define CMS_NO_CONTENT_VERIFY           0x4
-# define CMS_NO_ATTR_VERIFY              0x8
-# define CMS_NOSIGS                      \
-                        (CMS_NO_CONTENT_VERIFY|CMS_NO_ATTR_VERIFY)
-# define CMS_NOINTERN                    0x10
-# define CMS_NO_SIGNER_CERT_VERIFY       0x20
-# define CMS_NOVERIFY                    0x20
-# define CMS_DETACHED                    0x40
-# define CMS_BINARY                      0x80
-# define CMS_NOATTR                      0x100
-# define CMS_NOSMIMECAP                  0x200
-# define CMS_NOOLDMIMETYPE               0x400
-# define CMS_CRLFEOL                     0x800
-# define CMS_STREAM                      0x1000
-# define CMS_NOCRL                       0x2000
-# define CMS_PARTIAL                     0x4000
-# define CMS_REUSE_DIGEST                0x8000
-# define CMS_USE_KEYID                   0x10000
-# define CMS_DEBUG_DECRYPT               0x20000
-# define CMS_KEY_PARAM                   0x40000
-# define CMS_ASCIICRLF                   0x80000
-
-const ASN1_OBJECT *CMS_get0_type(const CMS_ContentInfo *cms);
-
-BIO *CMS_dataInit(CMS_ContentInfo *cms, BIO *icont);
-int CMS_dataFinal(CMS_ContentInfo *cms, BIO *bio);
-
-ASN1_OCTET_STRING **CMS_get0_content(CMS_ContentInfo *cms);
-int CMS_is_detached(CMS_ContentInfo *cms);
-int CMS_set_detached(CMS_ContentInfo *cms, int detached);
-
-# ifdef HEADER_PEM_H
-DECLARE_PEM_rw_const(CMS, CMS_ContentInfo)
-# endif
-int CMS_stream(unsigned char ***boundary, CMS_ContentInfo *cms);
-CMS_ContentInfo *d2i_CMS_bio(BIO *bp, CMS_ContentInfo **cms);
-int i2d_CMS_bio(BIO *bp, CMS_ContentInfo *cms);
-
-BIO *BIO_new_CMS(BIO *out, CMS_ContentInfo *cms);
-int i2d_CMS_bio_stream(BIO *out, CMS_ContentInfo *cms, BIO *in, int flags);
-int PEM_write_bio_CMS_stream(BIO *out, CMS_ContentInfo *cms, BIO *in,
-                             int flags);
-CMS_ContentInfo *SMIME_read_CMS(BIO *bio, BIO **bcont);
-int SMIME_write_CMS(BIO *bio, CMS_ContentInfo *cms, BIO *data, int flags);
-
-int CMS_final(CMS_ContentInfo *cms, BIO *data, BIO *dcont,
-              unsigned int flags);
-
-CMS_ContentInfo *CMS_sign(X509 *signcert, EVP_PKEY *pkey,
-                          STACK_OF(X509) *certs, BIO *data,
-                          unsigned int flags);
-
-CMS_ContentInfo *CMS_sign_receipt(CMS_SignerInfo *si,
-                                  X509 *signcert, EVP_PKEY *pkey,
-                                  STACK_OF(X509) *certs, unsigned int flags);
-
-int CMS_data(CMS_ContentInfo *cms, BIO *out, unsigned int flags);
-CMS_ContentInfo *CMS_data_create(BIO *in, unsigned int flags);
-
-int CMS_digest_verify(CMS_ContentInfo *cms, BIO *dcont, BIO *out,
-                      unsigned int flags);
-CMS_ContentInfo *CMS_digest_create(BIO *in, const EVP_MD *md,
-                                   unsigned int flags);
-
-int CMS_EncryptedData_decrypt(CMS_ContentInfo *cms,
-                              const unsigned char *key, size_t keylen,
-                              BIO *dcont, BIO *out, unsigned int flags);
-
-CMS_ContentInfo *CMS_EncryptedData_encrypt(BIO *in, const EVP_CIPHER *cipher,
-                                           const unsigned char *key,
-                                           size_t keylen, unsigned int flags);
-
-int CMS_EncryptedData_set1_key(CMS_ContentInfo *cms, const EVP_CIPHER *ciph,
-                               const unsigned char *key, size_t keylen);
-
-int CMS_verify(CMS_ContentInfo *cms, STACK_OF(X509) *certs,
-               X509_STORE *store, BIO *dcont, BIO *out, unsigned int flags);
-
-int CMS_verify_receipt(CMS_ContentInfo *rcms, CMS_ContentInfo *ocms,
-                       STACK_OF(X509) *certs,
-                       X509_STORE *store, unsigned int flags);
-
-STACK_OF(X509) *CMS_get0_signers(CMS_ContentInfo *cms);
-
-CMS_ContentInfo *CMS_encrypt(STACK_OF(X509) *certs, BIO *in,
-                             const EVP_CIPHER *cipher, unsigned int flags);
-
-int CMS_decrypt(CMS_ContentInfo *cms, EVP_PKEY *pkey, X509 *cert,
-                BIO *dcont, BIO *out, unsigned int flags);
-
-int CMS_decrypt_set1_pkey(CMS_ContentInfo *cms, EVP_PKEY *pk, X509 *cert);
-int CMS_decrypt_set1_key(CMS_ContentInfo *cms,
-                         unsigned char *key, size_t keylen,
-                         const unsigned char *id, size_t idlen);
-int CMS_decrypt_set1_password(CMS_ContentInfo *cms,
-                              unsigned char *pass, ossl_ssize_t passlen);
-
-STACK_OF(CMS_RecipientInfo) *CMS_get0_RecipientInfos(CMS_ContentInfo *cms);
-int CMS_RecipientInfo_type(CMS_RecipientInfo *ri);
-EVP_PKEY_CTX *CMS_RecipientInfo_get0_pkey_ctx(CMS_RecipientInfo *ri);
-CMS_ContentInfo *CMS_EnvelopedData_create(const EVP_CIPHER *cipher);
-CMS_RecipientInfo *CMS_add1_recipient_cert(CMS_ContentInfo *cms,
-                                           X509 *recip, unsigned int flags);
-int CMS_RecipientInfo_set0_pkey(CMS_RecipientInfo *ri, EVP_PKEY *pkey);
-int CMS_RecipientInfo_ktri_cert_cmp(CMS_RecipientInfo *ri, X509 *cert);
-int CMS_RecipientInfo_ktri_get0_algs(CMS_RecipientInfo *ri,
-                                     EVP_PKEY **pk, X509 **recip,
-                                     X509_ALGOR **palg);
-int CMS_RecipientInfo_ktri_get0_signer_id(CMS_RecipientInfo *ri,
-                                          ASN1_OCTET_STRING **keyid,
-                                          X509_NAME **issuer,
-                                          ASN1_INTEGER **sno);
-
-CMS_RecipientInfo *CMS_add0_recipient_key(CMS_ContentInfo *cms, int nid,
-                                          unsigned char *key, size_t keylen,
-                                          unsigned char *id, size_t idlen,
-                                          ASN1_GENERALIZEDTIME *date,
-                                          ASN1_OBJECT *otherTypeId,
-                                          ASN1_TYPE *otherType);
-
-int CMS_RecipientInfo_kekri_get0_id(CMS_RecipientInfo *ri,
-                                    X509_ALGOR **palg,
-                                    ASN1_OCTET_STRING **pid,
-                                    ASN1_GENERALIZEDTIME **pdate,
-                                    ASN1_OBJECT **potherid,
-                                    ASN1_TYPE **pothertype);
-
-int CMS_RecipientInfo_set0_key(CMS_RecipientInfo *ri,
-                               unsigned char *key, size_t keylen);
-
-int CMS_RecipientInfo_kekri_id_cmp(CMS_RecipientInfo *ri,
-                                   const unsigned char *id, size_t idlen);
-
-int CMS_RecipientInfo_set0_password(CMS_RecipientInfo *ri,
-                                    unsigned char *pass,
-                                    ossl_ssize_t passlen);
-
-CMS_RecipientInfo *CMS_add0_recipient_password(CMS_ContentInfo *cms,
-                                               int iter, int wrap_nid,
-                                               int pbe_nid,
-                                               unsigned char *pass,
-                                               ossl_ssize_t passlen,
-                                               const EVP_CIPHER *kekciph);
-
-int CMS_RecipientInfo_decrypt(CMS_ContentInfo *cms, CMS_RecipientInfo *ri);
-int CMS_RecipientInfo_encrypt(CMS_ContentInfo *cms, CMS_RecipientInfo *ri);
-
-int CMS_uncompress(CMS_ContentInfo *cms, BIO *dcont, BIO *out,
-                   unsigned int flags);
-CMS_ContentInfo *CMS_compress(BIO *in, int comp_nid, unsigned int flags);
-
-int CMS_set1_eContentType(CMS_ContentInfo *cms, const ASN1_OBJECT *oid);
-const ASN1_OBJECT *CMS_get0_eContentType(CMS_ContentInfo *cms);
-
-CMS_CertificateChoices *CMS_add0_CertificateChoices(CMS_ContentInfo *cms);
-int CMS_add0_cert(CMS_ContentInfo *cms, X509 *cert);
-int CMS_add1_cert(CMS_ContentInfo *cms, X509 *cert);
-STACK_OF(X509) *CMS_get1_certs(CMS_ContentInfo *cms);
-
-CMS_RevocationInfoChoice *CMS_add0_RevocationInfoChoice(CMS_ContentInfo *cms);
-int CMS_add0_crl(CMS_ContentInfo *cms, X509_CRL *crl);
-int CMS_add1_crl(CMS_ContentInfo *cms, X509_CRL *crl);
-STACK_OF(X509_CRL) *CMS_get1_crls(CMS_ContentInfo *cms);
-
-int CMS_SignedData_init(CMS_ContentInfo *cms);
-CMS_SignerInfo *CMS_add1_signer(CMS_ContentInfo *cms,
-                                X509 *signer, EVP_PKEY *pk, const EVP_MD *md,
-                                unsigned int flags);
-EVP_PKEY_CTX *CMS_SignerInfo_get0_pkey_ctx(CMS_SignerInfo *si);
-EVP_MD_CTX *CMS_SignerInfo_get0_md_ctx(CMS_SignerInfo *si);
-STACK_OF(CMS_SignerInfo) *CMS_get0_SignerInfos(CMS_ContentInfo *cms);
-
-void CMS_SignerInfo_set1_signer_cert(CMS_SignerInfo *si, X509 *signer);
-int CMS_SignerInfo_get0_signer_id(CMS_SignerInfo *si,
-                                  ASN1_OCTET_STRING **keyid,
-                                  X509_NAME **issuer, ASN1_INTEGER **sno);
-int CMS_SignerInfo_cert_cmp(CMS_SignerInfo *si, X509 *cert);
-int CMS_set1_signers_certs(CMS_ContentInfo *cms, STACK_OF(X509) *certs,
-                           unsigned int flags);
-void CMS_SignerInfo_get0_algs(CMS_SignerInfo *si, EVP_PKEY **pk,
-                              X509 **signer, X509_ALGOR **pdig,
-                              X509_ALGOR **psig);
-ASN1_OCTET_STRING *CMS_SignerInfo_get0_signature(CMS_SignerInfo *si);
-int CMS_SignerInfo_sign(CMS_SignerInfo *si);
-int CMS_SignerInfo_verify(CMS_SignerInfo *si);
-int CMS_SignerInfo_verify_content(CMS_SignerInfo *si, BIO *chain);
-
-int CMS_add_smimecap(CMS_SignerInfo *si, STACK_OF(X509_ALGOR) *algs);
-int CMS_add_simple_smimecap(STACK_OF(X509_ALGOR) **algs,
-                            int algnid, int keysize);
-int CMS_add_standard_smimecap(STACK_OF(X509_ALGOR) **smcap);
-
-int CMS_signed_get_attr_count(const CMS_SignerInfo *si);
-int CMS_signed_get_attr_by_NID(const CMS_SignerInfo *si, int nid,
-                               int lastpos);
-int CMS_signed_get_attr_by_OBJ(const CMS_SignerInfo *si, const ASN1_OBJECT *obj,
-                               int lastpos);
-X509_ATTRIBUTE *CMS_signed_get_attr(const CMS_SignerInfo *si, int loc);
-X509_ATTRIBUTE *CMS_signed_delete_attr(CMS_SignerInfo *si, int loc);
-int CMS_signed_add1_attr(CMS_SignerInfo *si, X509_ATTRIBUTE *attr);
-int CMS_signed_add1_attr_by_OBJ(CMS_SignerInfo *si,
-                                const ASN1_OBJECT *obj, int type,
-                                const void *bytes, int len);
-int CMS_signed_add1_attr_by_NID(CMS_SignerInfo *si,
-                                int nid, int type,
-                                const void *bytes, int len);
-int CMS_signed_add1_attr_by_txt(CMS_SignerInfo *si,
-                                const char *attrname, int type,
-                                const void *bytes, int len);
-void *CMS_signed_get0_data_by_OBJ(CMS_SignerInfo *si, const ASN1_OBJECT *oid,
-                                  int lastpos, int type);
-
-int CMS_unsigned_get_attr_count(const CMS_SignerInfo *si);
-int CMS_unsigned_get_attr_by_NID(const CMS_SignerInfo *si, int nid,
-                                 int lastpos);
-int CMS_unsigned_get_attr_by_OBJ(const CMS_SignerInfo *si,
-                                 const ASN1_OBJECT *obj, int lastpos);
-X509_ATTRIBUTE *CMS_unsigned_get_attr(const CMS_SignerInfo *si, int loc);
-X509_ATTRIBUTE *CMS_unsigned_delete_attr(CMS_SignerInfo *si, int loc);
-int CMS_unsigned_add1_attr(CMS_SignerInfo *si, X509_ATTRIBUTE *attr);
-int CMS_unsigned_add1_attr_by_OBJ(CMS_SignerInfo *si,
-                                  const ASN1_OBJECT *obj, int type,
-                                  const void *bytes, int len);
-int CMS_unsigned_add1_attr_by_NID(CMS_SignerInfo *si,
-                                  int nid, int type,
-                                  const void *bytes, int len);
-int CMS_unsigned_add1_attr_by_txt(CMS_SignerInfo *si,
-                                  const char *attrname, int type,
-                                  const void *bytes, int len);
-void *CMS_unsigned_get0_data_by_OBJ(CMS_SignerInfo *si, ASN1_OBJECT *oid,
-                                    int lastpos, int type);
-
-# ifdef HEADER_X509V3_H
-
-int CMS_get1_ReceiptRequest(CMS_SignerInfo *si, CMS_ReceiptRequest **prr);
-CMS_ReceiptRequest *CMS_ReceiptRequest_create0(unsigned char *id, int idlen,
-                                               int allorfirst,
-                                               STACK_OF(GENERAL_NAMES)
-                                               *receiptList, STACK_OF(GENERAL_NAMES)
-                                               *receiptsTo);
-int CMS_add1_ReceiptRequest(CMS_SignerInfo *si, CMS_ReceiptRequest *rr);
-void CMS_ReceiptRequest_get0_values(CMS_ReceiptRequest *rr,
-                                    ASN1_STRING **pcid,
-                                    int *pallorfirst,
-                                    STACK_OF(GENERAL_NAMES) **plist,
-                                    STACK_OF(GENERAL_NAMES) **prto);
-# endif
-int CMS_RecipientInfo_kari_get0_alg(CMS_RecipientInfo *ri,
-                                    X509_ALGOR **palg,
-                                    ASN1_OCTET_STRING **pukm);
-STACK_OF(CMS_RecipientEncryptedKey)
-*CMS_RecipientInfo_kari_get0_reks(CMS_RecipientInfo *ri);
-
-int CMS_RecipientInfo_kari_get0_orig_id(CMS_RecipientInfo *ri,
-                                        X509_ALGOR **pubalg,
-                                        ASN1_BIT_STRING **pubkey,
-                                        ASN1_OCTET_STRING **keyid,
-                                        X509_NAME **issuer,
-                                        ASN1_INTEGER **sno);
-
-int CMS_RecipientInfo_kari_orig_id_cmp(CMS_RecipientInfo *ri, X509 *cert);
-
-int CMS_RecipientEncryptedKey_get0_id(CMS_RecipientEncryptedKey *rek,
-                                      ASN1_OCTET_STRING **keyid,
-                                      ASN1_GENERALIZEDTIME **tm,
-                                      CMS_OtherKeyAttribute **other,
-                                      X509_NAME **issuer, ASN1_INTEGER **sno);
-int CMS_RecipientEncryptedKey_cert_cmp(CMS_RecipientEncryptedKey *rek,
-                                       X509 *cert);
-int CMS_RecipientInfo_kari_set0_pkey(CMS_RecipientInfo *ri, EVP_PKEY *pk);
-EVP_CIPHER_CTX *CMS_RecipientInfo_kari_get0_ctx(CMS_RecipientInfo *ri);
-int CMS_RecipientInfo_kari_decrypt(CMS_ContentInfo *cms,
-                                   CMS_RecipientInfo *ri,
-                                   CMS_RecipientEncryptedKey *rek);
-
-int CMS_SharedInfo_encode(unsigned char **pder, X509_ALGOR *kekalg,
-                          ASN1_OCTET_STRING *ukm, int keylen);
-
-/* BEGIN ERROR CODES */
-/*
- * The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
-
-int ERR_load_CMS_strings(void);
-
-/* Error codes for the CMS functions. */
-
-/* Function codes. */
-# define CMS_F_CHECK_CONTENT                              99
-# define CMS_F_CMS_ADD0_CERT                              164
-# define CMS_F_CMS_ADD0_RECIPIENT_KEY                     100
-# define CMS_F_CMS_ADD0_RECIPIENT_PASSWORD                165
-# define CMS_F_CMS_ADD1_RECEIPTREQUEST                    158
-# define CMS_F_CMS_ADD1_RECIPIENT_CERT                    101
-# define CMS_F_CMS_ADD1_SIGNER                            102
-# define CMS_F_CMS_ADD1_SIGNINGTIME                       103
-# define CMS_F_CMS_COMPRESS                               104
-# define CMS_F_CMS_COMPRESSEDDATA_CREATE                  105
-# define CMS_F_CMS_COMPRESSEDDATA_INIT_BIO                106
-# define CMS_F_CMS_COPY_CONTENT                           107
-# define CMS_F_CMS_COPY_MESSAGEDIGEST                     108
-# define CMS_F_CMS_DATA                                   109
-# define CMS_F_CMS_DATAFINAL                              110
-# define CMS_F_CMS_DATAINIT                               111
-# define CMS_F_CMS_DECRYPT                                112
-# define CMS_F_CMS_DECRYPT_SET1_KEY                       113
-# define CMS_F_CMS_DECRYPT_SET1_PASSWORD                  166
-# define CMS_F_CMS_DECRYPT_SET1_PKEY                      114
-# define CMS_F_CMS_DIGESTALGORITHM_FIND_CTX               115
-# define CMS_F_CMS_DIGESTALGORITHM_INIT_BIO               116
-# define CMS_F_CMS_DIGESTEDDATA_DO_FINAL                  117
-# define CMS_F_CMS_DIGEST_VERIFY                          118
-# define CMS_F_CMS_ENCODE_RECEIPT                         161
-# define CMS_F_CMS_ENCRYPT                                119
-# define CMS_F_CMS_ENCRYPTEDCONTENT_INIT_BIO              120
-# define CMS_F_CMS_ENCRYPTEDDATA_DECRYPT                  121
-# define CMS_F_CMS_ENCRYPTEDDATA_ENCRYPT                  122
-# define CMS_F_CMS_ENCRYPTEDDATA_SET1_KEY                 123
-# define CMS_F_CMS_ENVELOPEDDATA_CREATE                   124
-# define CMS_F_CMS_ENVELOPEDDATA_INIT_BIO                 125
-# define CMS_F_CMS_ENVELOPED_DATA_INIT                    126
-# define CMS_F_CMS_ENV_ASN1_CTRL                          171
-# define CMS_F_CMS_FINAL                                  127
-# define CMS_F_CMS_GET0_CERTIFICATE_CHOICES               128
-# define CMS_F_CMS_GET0_CONTENT                           129
-# define CMS_F_CMS_GET0_ECONTENT_TYPE                     130
-# define CMS_F_CMS_GET0_ENVELOPED                         131
-# define CMS_F_CMS_GET0_REVOCATION_CHOICES                132
-# define CMS_F_CMS_GET0_SIGNED                            133
-# define CMS_F_CMS_MSGSIGDIGEST_ADD1                      162
-# define CMS_F_CMS_RECEIPTREQUEST_CREATE0                 159
-# define CMS_F_CMS_RECEIPT_VERIFY                         160
-# define CMS_F_CMS_RECIPIENTINFO_DECRYPT                  134
-# define CMS_F_CMS_RECIPIENTINFO_ENCRYPT                  169
-# define CMS_F_CMS_RECIPIENTINFO_KARI_ENCRYPT             178
-# define CMS_F_CMS_RECIPIENTINFO_KARI_GET0_ALG            175
-# define CMS_F_CMS_RECIPIENTINFO_KARI_GET0_ORIG_ID        173
-# define CMS_F_CMS_RECIPIENTINFO_KARI_GET0_REKS           172
-# define CMS_F_CMS_RECIPIENTINFO_KARI_ORIG_ID_CMP         174
-# define CMS_F_CMS_RECIPIENTINFO_KEKRI_DECRYPT            135
-# define CMS_F_CMS_RECIPIENTINFO_KEKRI_ENCRYPT            136
-# define CMS_F_CMS_RECIPIENTINFO_KEKRI_GET0_ID            137
-# define CMS_F_CMS_RECIPIENTINFO_KEKRI_ID_CMP             138
-# define CMS_F_CMS_RECIPIENTINFO_KTRI_CERT_CMP            139
-# define CMS_F_CMS_RECIPIENTINFO_KTRI_DECRYPT             140
-# define CMS_F_CMS_RECIPIENTINFO_KTRI_ENCRYPT             141
-# define CMS_F_CMS_RECIPIENTINFO_KTRI_GET0_ALGS           142
-# define CMS_F_CMS_RECIPIENTINFO_KTRI_GET0_SIGNER_ID      143
-# define CMS_F_CMS_RECIPIENTINFO_PWRI_CRYPT               167
-# define CMS_F_CMS_RECIPIENTINFO_SET0_KEY                 144
-# define CMS_F_CMS_RECIPIENTINFO_SET0_PASSWORD            168
-# define CMS_F_CMS_RECIPIENTINFO_SET0_PKEY                145
-# define CMS_F_CMS_SD_ASN1_CTRL                           170
-# define CMS_F_CMS_SET1_IAS                               176
-# define CMS_F_CMS_SET1_KEYID                             177
-# define CMS_F_CMS_SET1_SIGNERIDENTIFIER                  146
-# define CMS_F_CMS_SET_DETACHED                           147
-# define CMS_F_CMS_SIGN                                   148
-# define CMS_F_CMS_SIGNED_DATA_INIT                       149
-# define CMS_F_CMS_SIGNERINFO_CONTENT_SIGN                150
-# define CMS_F_CMS_SIGNERINFO_SIGN                        151
-# define CMS_F_CMS_SIGNERINFO_VERIFY                      152
-# define CMS_F_CMS_SIGNERINFO_VERIFY_CERT                 153
-# define CMS_F_CMS_SIGNERINFO_VERIFY_CONTENT              154
-# define CMS_F_CMS_SIGN_RECEIPT                           163
-# define CMS_F_CMS_STREAM                                 155
-# define CMS_F_CMS_UNCOMPRESS                             156
-# define CMS_F_CMS_VERIFY                                 157
-
-/* Reason codes. */
-# define CMS_R_ADD_SIGNER_ERROR                           99
-# define CMS_R_CERTIFICATE_ALREADY_PRESENT                175
-# define CMS_R_CERTIFICATE_HAS_NO_KEYID                   160
-# define CMS_R_CERTIFICATE_VERIFY_ERROR                   100
-# define CMS_R_CIPHER_INITIALISATION_ERROR                101
-# define CMS_R_CIPHER_PARAMETER_INITIALISATION_ERROR      102
-# define CMS_R_CMS_DATAFINAL_ERROR                        103
-# define CMS_R_CMS_LIB                                    104
-# define CMS_R_CONTENTIDENTIFIER_MISMATCH                 170
-# define CMS_R_CONTENT_NOT_FOUND                          105
-# define CMS_R_CONTENT_TYPE_MISMATCH                      171
-# define CMS_R_CONTENT_TYPE_NOT_COMPRESSED_DATA           106
-# define CMS_R_CONTENT_TYPE_NOT_ENVELOPED_DATA            107
-# define CMS_R_CONTENT_TYPE_NOT_SIGNED_DATA               108
-# define CMS_R_CONTENT_VERIFY_ERROR                       109
-# define CMS_R_CTRL_ERROR                                 110
-# define CMS_R_CTRL_FAILURE                               111
-# define CMS_R_DECRYPT_ERROR                              112
-# define CMS_R_ERROR_GETTING_PUBLIC_KEY                   113
-# define CMS_R_ERROR_READING_MESSAGEDIGEST_ATTRIBUTE      114
-# define CMS_R_ERROR_SETTING_KEY                          115
-# define CMS_R_ERROR_SETTING_RECIPIENTINFO                116
-# define CMS_R_INVALID_ENCRYPTED_KEY_LENGTH               117
-# define CMS_R_INVALID_KEY_ENCRYPTION_PARAMETER           176
-# define CMS_R_INVALID_KEY_LENGTH                         118
-# define CMS_R_MD_BIO_INIT_ERROR                          119
-# define CMS_R_MESSAGEDIGEST_ATTRIBUTE_WRONG_LENGTH       120
-# define CMS_R_MESSAGEDIGEST_WRONG_LENGTH                 121
-# define CMS_R_MSGSIGDIGEST_ERROR                         172
-# define CMS_R_MSGSIGDIGEST_VERIFICATION_FAILURE          162
-# define CMS_R_MSGSIGDIGEST_WRONG_LENGTH                  163
-# define CMS_R_NEED_ONE_SIGNER                            164
-# define CMS_R_NOT_A_SIGNED_RECEIPT                       165
-# define CMS_R_NOT_ENCRYPTED_DATA                         122
-# define CMS_R_NOT_KEK                                    123
-# define CMS_R_NOT_KEY_AGREEMENT                          181
-# define CMS_R_NOT_KEY_TRANSPORT                          124
-# define CMS_R_NOT_PWRI                                   177
-# define CMS_R_NOT_SUPPORTED_FOR_THIS_KEY_TYPE            125
-# define CMS_R_NO_CIPHER                                  126
-# define CMS_R_NO_CONTENT                                 127
-# define CMS_R_NO_CONTENT_TYPE                            173
-# define CMS_R_NO_DEFAULT_DIGEST                          128
-# define CMS_R_NO_DIGEST_SET                              129
-# define CMS_R_NO_KEY                                     130
-# define CMS_R_NO_KEY_OR_CERT                             174
-# define CMS_R_NO_MATCHING_DIGEST                         131
-# define CMS_R_NO_MATCHING_RECIPIENT                      132
-# define CMS_R_NO_MATCHING_SIGNATURE                      166
-# define CMS_R_NO_MSGSIGDIGEST                            167
-# define CMS_R_NO_PASSWORD                                178
-# define CMS_R_NO_PRIVATE_KEY                             133
-# define CMS_R_NO_PUBLIC_KEY                              134
-# define CMS_R_NO_RECEIPT_REQUEST                         168
-# define CMS_R_NO_SIGNERS                                 135
-# define CMS_R_PRIVATE_KEY_DOES_NOT_MATCH_CERTIFICATE     136
-# define CMS_R_RECEIPT_DECODE_ERROR                       169
-# define CMS_R_RECIPIENT_ERROR                            137
-# define CMS_R_SIGNER_CERTIFICATE_NOT_FOUND               138
-# define CMS_R_SIGNFINAL_ERROR                            139
-# define CMS_R_SMIME_TEXT_ERROR                           140
-# define CMS_R_STORE_INIT_ERROR                           141
-# define CMS_R_TYPE_NOT_COMPRESSED_DATA                   142
-# define CMS_R_TYPE_NOT_DATA                              143
-# define CMS_R_TYPE_NOT_DIGESTED_DATA                     144
-# define CMS_R_TYPE_NOT_ENCRYPTED_DATA                    145
-# define CMS_R_TYPE_NOT_ENVELOPED_DATA                    146
-# define CMS_R_UNABLE_TO_FINALIZE_CONTEXT                 147
-# define CMS_R_UNKNOWN_CIPHER                             148
-# define CMS_R_UNKNOWN_DIGEST_ALGORIHM                    149
-# define CMS_R_UNKNOWN_ID                                 150
-# define CMS_R_UNSUPPORTED_COMPRESSION_ALGORITHM          151
-# define CMS_R_UNSUPPORTED_CONTENT_TYPE                   152
-# define CMS_R_UNSUPPORTED_KEK_ALGORITHM                  153
-# define CMS_R_UNSUPPORTED_KEY_ENCRYPTION_ALGORITHM       179
-# define CMS_R_UNSUPPORTED_RECIPIENT_TYPE                 154
-# define CMS_R_UNSUPPORTED_RECPIENTINFO_TYPE              155
-# define CMS_R_UNSUPPORTED_TYPE                           156
-# define CMS_R_UNWRAP_ERROR                               157
-# define CMS_R_UNWRAP_FAILURE                             180
-# define CMS_R_VERIFICATION_FAILURE                       158
-# define CMS_R_WRAP_ERROR                                 159
-
-#  ifdef  __cplusplus
-}
-#  endif
-# endif
-#endif

gpac-2.2.1.tar.gz/extra_lib/include/openssl/comp.h Deleted

@@ -1,72 +0,0 @@
-/*
- * Copyright 2015-2016 The OpenSSL Project Authors. All Rights Reserved.
- *
- * Licensed under the OpenSSL license (the "License").  You may not use
- * this file except in compliance with the License.  You can obtain a copy
- * in the file LICENSE in the source distribution or at
- * https://www.openssl.org/source/license.html
- */
-
-#ifndef HEADER_COMP_H
-# define HEADER_COMP_H
-
-# include <openssl/opensslconf.h>
-
-# ifndef OPENSSL_NO_COMP
-# include <openssl/crypto.h>
-# ifdef  __cplusplus
-extern "C" {
-# endif
-
-
-
-COMP_CTX *COMP_CTX_new(COMP_METHOD *meth);
-const COMP_METHOD *COMP_CTX_get_method(const COMP_CTX *ctx);
-int COMP_CTX_get_type(const COMP_CTX* comp);
-int COMP_get_type(const COMP_METHOD *meth);
-const char *COMP_get_name(const COMP_METHOD *meth);
-void COMP_CTX_free(COMP_CTX *ctx);
-
-int COMP_compress_block(COMP_CTX *ctx, unsigned char *out, int olen,
-                        unsigned char *in, int ilen);
-int COMP_expand_block(COMP_CTX *ctx, unsigned char *out, int olen,
-                      unsigned char *in, int ilen);
-
-COMP_METHOD *COMP_zlib(void);
-
-#if OPENSSL_API_COMPAT < 0x10100000L
-#define COMP_zlib_cleanup() while(0) continue
-#endif
-
-# ifdef HEADER_BIO_H
-#  ifdef ZLIB
-const BIO_METHOD *BIO_f_zlib(void);
-#  endif
-# endif
-
-/* BEGIN ERROR CODES */
-/*
- * The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
-
-int ERR_load_COMP_strings(void);
-
-/* Error codes for the COMP functions. */
-
-/* Function codes. */
-# define COMP_F_BIO_ZLIB_FLUSH                            99
-# define COMP_F_BIO_ZLIB_NEW                              100
-# define COMP_F_BIO_ZLIB_READ                             101
-# define COMP_F_BIO_ZLIB_WRITE                            102
-
-/* Reason codes. */
-# define COMP_R_ZLIB_DEFLATE_ERROR                        99
-# define COMP_R_ZLIB_INFLATE_ERROR                        100
-# define COMP_R_ZLIB_NOT_SUPPORTED                        101
-
-#  ifdef  __cplusplus
-}
-#  endif
-# endif
-#endif

gpac-2.2.1.tar.gz/extra_lib/include/openssl/conf.h Deleted

@@ -1,217 +0,0 @@
-/*
- * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
- *
- * Licensed under the OpenSSL license (the "License").  You may not use
- * this file except in compliance with the License.  You can obtain a copy
- * in the file LICENSE in the source distribution or at
- * https://www.openssl.org/source/license.html
- */
-
-#ifndef  HEADER_CONF_H
-# define HEADER_CONF_H
-
-# include <openssl/bio.h>
-# include <openssl/lhash.h>
-# include <openssl/stack.h>
-# include <openssl/safestack.h>
-# include <openssl/e_os2.h>
-
-# include <openssl/ossl_typ.h>
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-typedef struct {
-    char *section;
-    char *name;
-    char *value;
-} CONF_VALUE;
-
-DEFINE_STACK_OF(CONF_VALUE)
-DEFINE_LHASH_OF(CONF_VALUE);
-
-struct conf_st;
-struct conf_method_st;
-typedef struct conf_method_st CONF_METHOD;
-
-struct conf_method_st {
-    const char *name;
-    CONF *(*create) (CONF_METHOD *meth);
-    int (*init) (CONF *conf);
-    int (*destroy) (CONF *conf);
-    int (*destroy_data) (CONF *conf);
-    int (*load_bio) (CONF *conf, BIO *bp, long *eline);
-    int (*dump) (const CONF *conf, BIO *bp);
-    int (*is_number) (const CONF *conf, char c);
-    int (*to_int) (const CONF *conf, char c);
-    int (*load) (CONF *conf, const char *name, long *eline);
-};
-
-/* Module definitions */
-
-typedef struct conf_imodule_st CONF_IMODULE;
-typedef struct conf_module_st CONF_MODULE;
-
-DEFINE_STACK_OF(CONF_MODULE)
-DEFINE_STACK_OF(CONF_IMODULE)
-
-/* DSO module function typedefs */
-typedef int conf_init_func (CONF_IMODULE *md, const CONF *cnf);
-typedef void conf_finish_func (CONF_IMODULE *md);
-
-# define CONF_MFLAGS_IGNORE_ERRORS       0x1
-# define CONF_MFLAGS_IGNORE_RETURN_CODES 0x2
-# define CONF_MFLAGS_SILENT              0x4
-# define CONF_MFLAGS_NO_DSO              0x8
-# define CONF_MFLAGS_IGNORE_MISSING_FILE 0x10
-# define CONF_MFLAGS_DEFAULT_SECTION     0x20
-
-int CONF_set_default_method(CONF_METHOD *meth);
-void CONF_set_nconf(CONF *conf, LHASH_OF(CONF_VALUE) *hash);
-LHASH_OF(CONF_VALUE) *CONF_load(LHASH_OF(CONF_VALUE) *conf, const char *file,
-                                long *eline);
-# ifndef OPENSSL_NO_STDIO
-LHASH_OF(CONF_VALUE) *CONF_load_fp(LHASH_OF(CONF_VALUE) *conf, FILE *fp,
-                                   long *eline);
-# endif
-LHASH_OF(CONF_VALUE) *CONF_load_bio(LHASH_OF(CONF_VALUE) *conf, BIO *bp,
-                                    long *eline);
-STACK_OF(CONF_VALUE) *CONF_get_section(LHASH_OF(CONF_VALUE) *conf,
-                                       const char *section);
-char *CONF_get_string(LHASH_OF(CONF_VALUE) *conf, const char *group,
-                      const char *name);
-long CONF_get_number(LHASH_OF(CONF_VALUE) *conf, const char *group,
-                     const char *name);
-void CONF_free(LHASH_OF(CONF_VALUE) *conf);
-#ifndef OPENSSL_NO_STDIO
-int CONF_dump_fp(LHASH_OF(CONF_VALUE) *conf, FILE *out);
-#endif
-int CONF_dump_bio(LHASH_OF(CONF_VALUE) *conf, BIO *out);
-
-DEPRECATEDIN_1_1_0(void OPENSSL_config(const char *config_name))
-
-#if OPENSSL_API_COMPAT < 0x10100000L
-# define OPENSSL_no_config() \
-    OPENSSL_init_crypto(OPENSSL_INIT_NO_LOAD_CONFIG, NULL)
-#endif
-
-/*
- * New conf code.  The semantics are different from the functions above. If
- * that wasn't the case, the above functions would have been replaced
- */
-
-struct conf_st {
-    CONF_METHOD *meth;
-    void *meth_data;
-    LHASH_OF(CONF_VALUE) *data;
-};
-
-CONF *NCONF_new(CONF_METHOD *meth);
-CONF_METHOD *NCONF_default(void);
-CONF_METHOD *NCONF_WIN32(void);
-void NCONF_free(CONF *conf);
-void NCONF_free_data(CONF *conf);
-
-int NCONF_load(CONF *conf, const char *file, long *eline);
-# ifndef OPENSSL_NO_STDIO
-int NCONF_load_fp(CONF *conf, FILE *fp, long *eline);
-# endif
-int NCONF_load_bio(CONF *conf, BIO *bp, long *eline);
-STACK_OF(CONF_VALUE) *NCONF_get_section(const CONF *conf,
-                                        const char *section);
-char *NCONF_get_string(const CONF *conf, const char *group, const char *name);
-int NCONF_get_number_e(const CONF *conf, const char *group, const char *name,
-                       long *result);
-#ifndef OPENSSL_NO_STDIO
-int NCONF_dump_fp(const CONF *conf, FILE *out);
-#endif
-int NCONF_dump_bio(const CONF *conf, BIO *out);
-
-#define NCONF_get_number(c,g,n,r) NCONF_get_number_e(c,g,n,r)
-
-/* Module functions */
-
-int CONF_modules_load(const CONF *cnf, const char *appname,
-                      unsigned long flags);
-int CONF_modules_load_file(const char *filename, const char *appname,
-                           unsigned long flags);
-void CONF_modules_unload(int all);
-void CONF_modules_finish(void);
-#if OPENSSL_API_COMPAT < 0x10100000L
-# define CONF_modules_free() while(0) continue
-#endif
-int CONF_module_add(const char *name, conf_init_func *ifunc,
-                    conf_finish_func *ffunc);
-
-const char *CONF_imodule_get_name(const CONF_IMODULE *md);
-const char *CONF_imodule_get_value(const CONF_IMODULE *md);
-void *CONF_imodule_get_usr_data(const CONF_IMODULE *md);
-void CONF_imodule_set_usr_data(CONF_IMODULE *md, void *usr_data);
-CONF_MODULE *CONF_imodule_get_module(const CONF_IMODULE *md);
-unsigned long CONF_imodule_get_flags(const CONF_IMODULE *md);
-void CONF_imodule_set_flags(CONF_IMODULE *md, unsigned long flags);
-void *CONF_module_get_usr_data(CONF_MODULE *pmod);
-void CONF_module_set_usr_data(CONF_MODULE *pmod, void *usr_data);
-
-char *CONF_get1_default_config_file(void);
-
-int CONF_parse_list(const char *list, int sep, int nospc,
-                    int (*list_cb) (const char *elem, int len, void *usr),
-                    void *arg);
-
-void OPENSSL_load_builtin_modules(void);
-
-/* BEGIN ERROR CODES */
-/*
- * The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
-
-int ERR_load_CONF_strings(void);
-
-/* Error codes for the CONF functions. */
-
-/* Function codes. */
-# define CONF_F_CONF_DUMP_FP                              104
-# define CONF_F_CONF_LOAD                                 100
-# define CONF_F_CONF_LOAD_FP                              103
-# define CONF_F_CONF_PARSE_LIST                           119
-# define CONF_F_DEF_LOAD                                  120
-# define CONF_F_DEF_LOAD_BIO                              121
-# define CONF_F_MODULE_INIT                               115
-# define CONF_F_MODULE_LOAD_DSO                           117
-# define CONF_F_MODULE_RUN                                118
-# define CONF_F_NCONF_DUMP_BIO                            105
-# define CONF_F_NCONF_DUMP_FP                             106
-# define CONF_F_NCONF_GET_NUMBER_E                        112
-# define CONF_F_NCONF_GET_SECTION                         108
-# define CONF_F_NCONF_GET_STRING                          109
-# define CONF_F_NCONF_LOAD                                113
-# define CONF_F_NCONF_LOAD_BIO                            110
-# define CONF_F_NCONF_LOAD_FP                             114
-# define CONF_F_NCONF_NEW                                 111
-# define CONF_F_STR_COPY                                  101
-
-/* Reason codes. */
-# define CONF_R_ERROR_LOADING_DSO                         110
-# define CONF_R_LIST_CANNOT_BE_NULL                       115
-# define CONF_R_MISSING_CLOSE_SQUARE_BRACKET              100
-# define CONF_R_MISSING_EQUAL_SIGN                        101
-# define CONF_R_MISSING_INIT_FUNCTION                     112
-# define CONF_R_MODULE_INITIALIZATION_ERROR               109
-# define CONF_R_NO_CLOSE_BRACE                            102
-# define CONF_R_NO_CONF                                   105
-# define CONF_R_NO_CONF_OR_ENVIRONMENT_VARIABLE           106
-# define CONF_R_NO_SECTION                                107
-# define CONF_R_NO_SUCH_FILE                              114
-# define CONF_R_NO_VALUE                                  108
-# define CONF_R_UNABLE_TO_CREATE_NEW_SECTION              103
-# define CONF_R_UNKNOWN_MODULE_NAME                       113
-# define CONF_R_VARIABLE_EXPANSION_TOO_LONG               116
-# define CONF_R_VARIABLE_HAS_NO_VALUE                     104
-
-# ifdef  __cplusplus
-}
-# endif
-#endif

gpac-2.2.1.tar.gz/extra_lib/include/openssl/conf_api.h Deleted

@@ -1,40 +0,0 @@
-/*
- * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
- *
- * Licensed under the OpenSSL license (the "License").  You may not use
- * this file except in compliance with the License.  You can obtain a copy
- * in the file LICENSE in the source distribution or at
- * https://www.openssl.org/source/license.html
- */
-
-#ifndef  HEADER_CONF_API_H
-# define HEADER_CONF_API_H
-
-# include <openssl/lhash.h>
-# include <openssl/conf.h>
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-/* Up until OpenSSL 0.9.5a, this was new_section */
-CONF_VALUE *_CONF_new_section(CONF *conf, const char *section);
-/* Up until OpenSSL 0.9.5a, this was get_section */
-CONF_VALUE *_CONF_get_section(const CONF *conf, const char *section);
-/* Up until OpenSSL 0.9.5a, this was CONF_get_section */
-STACK_OF(CONF_VALUE) *_CONF_get_section_values(const CONF *conf,
-                                               const char *section);
-
-int _CONF_add_string(CONF *conf, CONF_VALUE *section, CONF_VALUE *value);
-char *_CONF_get_string(const CONF *conf, const char *section,
-                       const char *name);
-long _CONF_get_number(const CONF *conf, const char *section,
-                      const char *name);
-
-int _CONF_new_data(CONF *conf);
-void _CONF_free_data(CONF *conf);
-
-#ifdef  __cplusplus
-}
-#endif
-#endif

gpac-2.2.1.tar.gz/extra_lib/include/openssl/crypto.h Deleted

@@ -1,463 +0,0 @@
-/*
- * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
- *
- * Licensed under the OpenSSL license (the "License").  You may not use
- * this file except in compliance with the License.  You can obtain a copy
- * in the file LICENSE in the source distribution or at
- * https://www.openssl.org/source/license.html
- */
-
-/* ====================================================================
- * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
- * ECDH support in OpenSSL originally developed by
- * SUN MICROSYSTEMS, INC., and contributed to the OpenSSL project.
- */
-
-#ifndef HEADER_CRYPTO_H
-# define HEADER_CRYPTO_H
-
-# include <stdlib.h>
-# include <time.h>
-
-# include <openssl/e_os2.h>
-
-# ifndef OPENSSL_NO_STDIO
-#  include <stdio.h>
-# endif
-
-# include <openssl/stack.h>
-# include <openssl/safestack.h>
-# include <openssl/opensslv.h>
-# include <openssl/ossl_typ.h>
-# include <openssl/opensslconf.h>
-
-# ifdef CHARSET_EBCDIC
-#  include <openssl/ebcdic.h>
-# endif
-
-/*
- * Resolve problems on some operating systems with symbol names that clash
- * one way or another
- */
-# include <openssl/symhacks.h>
-
-# if OPENSSL_API_COMPAT < 0x10100000L
-#  include <openssl/opensslv.h>
-# endif
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-# if OPENSSL_API_COMPAT < 0x10100000L
-#  define SSLeay                  OpenSSL_version_num
-#  define SSLeay_version          OpenSSL_version
-#  define SSLEAY_VERSION_NUMBER   OPENSSL_VERSION_NUMBER
-#  define SSLEAY_VERSION          OPENSSL_VERSION
-#  define SSLEAY_CFLAGS           OPENSSL_CFLAGS
-#  define SSLEAY_BUILT_ON         OPENSSL_BUILT_ON
-#  define SSLEAY_PLATFORM         OPENSSL_PLATFORM
-#  define SSLEAY_DIR              OPENSSL_DIR
-
-/*
- * Old type for allocating dynamic locks. No longer used. Use the new thread
- * API instead.
- */
-typedef struct {
-    int dummy;
-} CRYPTO_dynlock;
-
-# endif /* OPENSSL_API_COMPAT */
-
-typedef void CRYPTO_RWLOCK;
-
-CRYPTO_RWLOCK *CRYPTO_THREAD_lock_new(void);
-int CRYPTO_THREAD_read_lock(CRYPTO_RWLOCK *lock);
-int CRYPTO_THREAD_write_lock(CRYPTO_RWLOCK *lock);
-int CRYPTO_THREAD_unlock(CRYPTO_RWLOCK *lock);
-void CRYPTO_THREAD_lock_free(CRYPTO_RWLOCK *lock);
-
-int CRYPTO_atomic_add(int *val, int amount, int *ret, CRYPTO_RWLOCK *lock);
-
-/*
- * The following can be used to detect memory leaks in the library. If
- * used, it turns on malloc checking
- */
-# define CRYPTO_MEM_CHECK_OFF     0x0   /* Control only */
-# define CRYPTO_MEM_CHECK_ON      0x1   /* Control and mode bit */
-# define CRYPTO_MEM_CHECK_ENABLE  0x2   /* Control and mode bit */
-# define CRYPTO_MEM_CHECK_DISABLE 0x3   /* Control only */
-
-struct crypto_ex_data_st {
-    STACK_OF(void) *sk;
-};
-DEFINE_STACK_OF(void)
-
-/*
- * Per class, we have a STACK of function pointers.
- */
-# define CRYPTO_EX_INDEX_SSL              0
-# define CRYPTO_EX_INDEX_SSL_CTX          1
-# define CRYPTO_EX_INDEX_SSL_SESSION      2
-# define CRYPTO_EX_INDEX_X509             3
-# define CRYPTO_EX_INDEX_X509_STORE       4
-# define CRYPTO_EX_INDEX_X509_STORE_CTX   5
-# define CRYPTO_EX_INDEX_DH               6
-# define CRYPTO_EX_INDEX_DSA              7
-# define CRYPTO_EX_INDEX_EC_KEY           8
-# define CRYPTO_EX_INDEX_RSA              9
-# define CRYPTO_EX_INDEX_ENGINE          10
-# define CRYPTO_EX_INDEX_UI              11
-# define CRYPTO_EX_INDEX_BIO             12
-# define CRYPTO_EX_INDEX_APP             13
-# define CRYPTO_EX_INDEX__COUNT          14
-
-/*
- * This is the default callbacks, but we can have others as well: this is
- * needed in Win32 where the application malloc and the library malloc may
- * not be the same.
- */
-#define OPENSSL_malloc_init() \
-    CRYPTO_set_mem_functions(CRYPTO_malloc, CRYPTO_realloc, CRYPTO_free)
-
-int CRYPTO_mem_ctrl(int mode);
-
-# define OPENSSL_malloc(num) \
-        CRYPTO_malloc(num, OPENSSL_FILE, OPENSSL_LINE)
-# define OPENSSL_zalloc(num) \
-        CRYPTO_zalloc(num, OPENSSL_FILE, OPENSSL_LINE)
-# define OPENSSL_realloc(addr, num) \
-        CRYPTO_realloc(addr, num, OPENSSL_FILE, OPENSSL_LINE)
-# define OPENSSL_clear_realloc(addr, old_num, num) \
-        CRYPTO_clear_realloc(addr, old_num, num, OPENSSL_FILE, OPENSSL_LINE)
-# define OPENSSL_clear_free(addr, num) \
-        CRYPTO_clear_free(addr, num, OPENSSL_FILE, OPENSSL_LINE)
-# define OPENSSL_free(addr) \
-        CRYPTO_free(addr, OPENSSL_FILE, OPENSSL_LINE)
-# define OPENSSL_memdup(str, s) \
-        CRYPTO_memdup((str), s, OPENSSL_FILE, OPENSSL_LINE)
-# define OPENSSL_strdup(str) \
-        CRYPTO_strdup(str, OPENSSL_FILE, OPENSSL_LINE)
-# define OPENSSL_strndup(str, n) \
-        CRYPTO_strndup(str, n, OPENSSL_FILE, OPENSSL_LINE)
-# define OPENSSL_secure_malloc(num) \
-        CRYPTO_secure_malloc(num, OPENSSL_FILE, OPENSSL_LINE)
-# define OPENSSL_secure_zalloc(num) \
-        CRYPTO_secure_zalloc(num, OPENSSL_FILE, OPENSSL_LINE)
-# define OPENSSL_secure_free(addr) \
-        CRYPTO_secure_free(addr, OPENSSL_FILE, OPENSSL_LINE)
-# define OPENSSL_secure_actual_size(ptr) \
-        CRYPTO_secure_actual_size(ptr)
-
-size_t OPENSSL_strlcpy(char *dst, const char *src, size_t siz);
-size_t OPENSSL_strlcat(char *dst, const char *src, size_t siz);
-size_t OPENSSL_strnlen(const char *str, size_t maxlen);
-char *OPENSSL_buf2hexstr(const unsigned char *buffer, long len);
-unsigned char *OPENSSL_hexstr2buf(const char *str, long *len);
-int OPENSSL_hexchar2int(unsigned char c);
-
-# define OPENSSL_MALLOC_MAX_NELEMS(type)  (((1U<<(sizeof(int)*8-1))-1)/sizeof(type))
-
-unsigned long OpenSSL_version_num(void);
-const char *OpenSSL_version(int type);
-# define OPENSSL_VERSION          0
-# define OPENSSL_CFLAGS           1
-# define OPENSSL_BUILT_ON         2
-# define OPENSSL_PLATFORM         3
-# define OPENSSL_DIR              4
-# define OPENSSL_ENGINES_DIR      5
-
-int OPENSSL_issetugid(void);
-
-typedef void CRYPTO_EX_new (void *parent, void *ptr, CRYPTO_EX_DATA *ad,
-                           int idx, long argl, void *argp);
-typedef void CRYPTO_EX_free (void *parent, void *ptr, CRYPTO_EX_DATA *ad,
-                             int idx, long argl, void *argp);
-typedef int CRYPTO_EX_dup (CRYPTO_EX_DATA *to, const CRYPTO_EX_DATA *from,
-                           void *from_d, int idx, long argl, void *argp);
-__owur int CRYPTO_get_ex_new_index(int class_index, long argl, void *argp,
-                            CRYPTO_EX_new *new_func, CRYPTO_EX_dup *dup_func,
-                            CRYPTO_EX_free *free_func);
-/* No longer use an index. */
-int CRYPTO_free_ex_index(int class_index, int idx);
-
-/*
- * Initialise/duplicate/free CRYPTO_EX_DATA variables corresponding to a
- * given class (invokes whatever per-class callbacks are applicable)
- */
-int CRYPTO_new_ex_data(int class_index, void *obj, CRYPTO_EX_DATA *ad);
-int CRYPTO_dup_ex_data(int class_index, CRYPTO_EX_DATA *to,
-                       const CRYPTO_EX_DATA *from);
-
-void CRYPTO_free_ex_data(int class_index, void *obj, CRYPTO_EX_DATA *ad);
-
-/*
- * Get/set data in a CRYPTO_EX_DATA variable corresponding to a particular
- * index (relative to the class type involved)
- */
-int CRYPTO_set_ex_data(CRYPTO_EX_DATA *ad, int idx, void *val);
-void *CRYPTO_get_ex_data(const CRYPTO_EX_DATA *ad, int idx);
-
-# if OPENSSL_API_COMPAT < 0x10100000L
-/*
- * This function cleans up all "ex_data" state. It mustn't be called under
- * potential race-conditions.
- */
-# define CRYPTO_cleanup_all_ex_data() while(0) continue
-
-/*
- * The old locking functions have been removed completely without compatibility
- * macros. This is because the old functions either could not properly report
- * errors, or the returned error values were not clearly documented.
- * Replacing the locking functions with with no-ops would cause race condition
- * issues in the affected applications. It is far better for them to fail at
- * compile time.
- * On the other hand, the locking callbacks are no longer used.  Consequently,
- * the callback management functions can be safely replaced with no-op macros.
- */
-#  define CRYPTO_num_locks()            (1)
-#  define CRYPTO_set_locking_callback(func)
-#  define CRYPTO_get_locking_callback()         (NULL)
-#  define CRYPTO_set_add_lock_callback(func)
-#  define CRYPTO_get_add_lock_callback()        (NULL)
-
-/*
- * These defines where used in combination with the old locking callbacks,
- * they are not called anymore, but old code that's not called might still
- * use them.
- */
-#  define CRYPTO_LOCK             1
-#  define CRYPTO_UNLOCK           2
-#  define CRYPTO_READ             4
-#  define CRYPTO_WRITE            8
-
-/* This structure is no longer used */
-typedef struct crypto_threadid_st {
-    int dummy;
-} CRYPTO_THREADID;
-/* Only use CRYPTO_THREADID_set_numeric|pointer() within callbacks */
-#  define CRYPTO_THREADID_set_numeric(id, val)
-#  define CRYPTO_THREADID_set_pointer(id, ptr)
-#  define CRYPTO_THREADID_set_callback(threadid_func)   (0)
-#  define CRYPTO_THREADID_get_callback()                (NULL)
-#  define CRYPTO_THREADID_current(id)
-#  define CRYPTO_THREADID_cmp(a, b)                     (-1)
-#  define CRYPTO_THREADID_cpy(dest, src)
-#  define CRYPTO_THREADID_hash(id)                      (0UL)
-
-#  if OPENSSL_API_COMPAT < 0x10000000L
-#   define CRYPTO_set_id_callback(func)
-#   define CRYPTO_get_id_callback()                     (NULL)
-#   define CRYPTO_thread_id()                           (0UL)
-#  endif /* OPENSSL_API_COMPAT < 0x10000000L */
-
-#  define CRYPTO_set_dynlock_create_callback(dyn_create_function)
-#  define CRYPTO_set_dynlock_lock_callback(dyn_lock_function)
-#  define CRYPTO_set_dynlock_destroy_callback(dyn_destroy_function)
-#  define CRYPTO_get_dynlock_create_callback()          (NULL)
-#  define CRYPTO_get_dynlock_lock_callback()            (NULL)
-#  define CRYPTO_get_dynlock_destroy_callback()         (NULL)
-# endif /* OPENSSL_API_COMPAT < 0x10100000L */
-
-int CRYPTO_set_mem_functions(
-        void *(*m) (size_t, const char *, int),
-        void *(*r) (void *, size_t, const char *, int),
-        void (*f) (void *, const char *, int));
-int CRYPTO_set_mem_debug(int flag);
-void CRYPTO_get_mem_functions(
-        void *(**m) (size_t, const char *, int),
-        void *(**r) (void *, size_t, const char *, int),
-        void (**f) (void *, const char *, int));
-
-void *CRYPTO_malloc(size_t num, const char *file, int line);
-void *CRYPTO_zalloc(size_t num, const char *file, int line);
-void *CRYPTO_memdup(const void *str, size_t siz, const char *file, int line);
-char *CRYPTO_strdup(const char *str, const char *file, int line);
-char *CRYPTO_strndup(const char *str, size_t s, const char *file, int line);
-void CRYPTO_free(void *ptr, const char *file, int line);
-void CRYPTO_clear_free(void *ptr, size_t num, const char *file, int line);
-void *CRYPTO_realloc(void *addr, size_t num, const char *file, int line);
-void *CRYPTO_clear_realloc(void *addr, size_t old_num, size_t num,
-                           const char *file, int line);
-
-int CRYPTO_secure_malloc_init(size_t sz, int minsize);
-int CRYPTO_secure_malloc_done(void);
-void *CRYPTO_secure_malloc(size_t num, const char *file, int line);
-void *CRYPTO_secure_zalloc(size_t num, const char *file, int line);
-void CRYPTO_secure_free(void *ptr, const char *file, int line);
-int CRYPTO_secure_allocated(const void *ptr);
-int CRYPTO_secure_malloc_initialized(void);
-size_t CRYPTO_secure_actual_size(void *ptr);
-size_t CRYPTO_secure_used(void);
-
-void OPENSSL_cleanse(void *ptr, size_t len);
-
-# ifndef OPENSSL_NO_CRYPTO_MDEBUG
-#  define OPENSSL_mem_debug_push(info) \
-        CRYPTO_mem_debug_push(info, OPENSSL_FILE, OPENSSL_LINE)
-#  define OPENSSL_mem_debug_pop() \
-        CRYPTO_mem_debug_pop()
-int CRYPTO_mem_debug_push(const char *info, const char *file, int line);
-int CRYPTO_mem_debug_pop(void);
-
-/*-
- * Debugging functions (enabled by CRYPTO_set_mem_debug(1))
- * The flag argument has the following significance:
- *   0:   called before the actual memory allocation has taken place
- *   1:   called after the actual memory allocation has taken place
- */
-void CRYPTO_mem_debug_malloc(void *addr, size_t num, int flag,
-        const char *file, int line);
-void CRYPTO_mem_debug_realloc(void *addr1, void *addr2, size_t num, int flag,
-        const char *file, int line);
-void CRYPTO_mem_debug_free(void *addr, int flag,
-        const char *file, int line);
-
-#  ifndef OPENSSL_NO_STDIO
-int CRYPTO_mem_leaks_fp(FILE *);
-#  endif
-int CRYPTO_mem_leaks(BIO *bio);
-# endif
-
-/* die if we have to */
-ossl_noreturn void OPENSSL_die(const char *assertion, const char *file, int line);
-# if OPENSSL_API_COMPAT < 0x10100000L
-#  define OpenSSLDie(f,l,a) OPENSSL_die((a),(f),(l))
-# endif
-# define OPENSSL_assert(e) \
-    (void)((e) ? 0 : (OPENSSL_die("assertion failed: " #e, OPENSSL_FILE, OPENSSL_LINE), 1))
-
-int OPENSSL_isservice(void);
-
-int FIPS_mode(void);
-int FIPS_mode_set(int r);
-
-void OPENSSL_init(void);
-
-struct tm *OPENSSL_gmtime(const time_t *timer, struct tm *result);
-int OPENSSL_gmtime_adj(struct tm *tm, int offset_day, long offset_sec);
-int OPENSSL_gmtime_diff(int *pday, int *psec,
-                        const struct tm *from, const struct tm *to);
-
-/*
- * CRYPTO_memcmp returns zero iff the |len| bytes at |a| and |b| are equal.
- * It takes an amount of time dependent on |len|, but independent of the
- * contents of |a| and |b|. Unlike memcmp, it cannot be used to put elements
- * into a defined order as the return value when a != b is undefined, other
- * than to be non-zero.
- */
-int CRYPTO_memcmp(const volatile void * volatile in_a,
-                  const volatile void * volatile in_b,
-                  size_t len);
-
-/* Standard initialisation options */
-# define OPENSSL_INIT_NO_LOAD_CRYPTO_STRINGS 0x00000001L
-# define OPENSSL_INIT_LOAD_CRYPTO_STRINGS    0x00000002L
-# define OPENSSL_INIT_ADD_ALL_CIPHERS        0x00000004L
-# define OPENSSL_INIT_ADD_ALL_DIGESTS        0x00000008L
-# define OPENSSL_INIT_NO_ADD_ALL_CIPHERS     0x00000010L
-# define OPENSSL_INIT_NO_ADD_ALL_DIGESTS     0x00000020L
-# define OPENSSL_INIT_LOAD_CONFIG            0x00000040L
-# define OPENSSL_INIT_NO_LOAD_CONFIG         0x00000080L
-# define OPENSSL_INIT_ASYNC                  0x00000100L
-# define OPENSSL_INIT_ENGINE_RDRAND          0x00000200L
-# define OPENSSL_INIT_ENGINE_DYNAMIC         0x00000400L
-# define OPENSSL_INIT_ENGINE_OPENSSL         0x00000800L
-# define OPENSSL_INIT_ENGINE_CRYPTODEV       0x00001000L
-# define OPENSSL_INIT_ENGINE_CAPI            0x00002000L
-# define OPENSSL_INIT_ENGINE_PADLOCK         0x00004000L
-# define OPENSSL_INIT_ENGINE_AFALG           0x00008000L
-/* OPENSSL_INIT flag 0x00010000 reserved for internal use */
-/* OPENSSL_INIT flag range 0xfff00000 reserved for OPENSSL_init_ssl() */
-/* Max OPENSSL_INIT flag value is 0x80000000 */
-
-/* openssl and dasync not counted as builtin */
-# define OPENSSL_INIT_ENGINE_ALL_BUILTIN \
-    (OPENSSL_INIT_ENGINE_RDRAND | OPENSSL_INIT_ENGINE_DYNAMIC \
-    | OPENSSL_INIT_ENGINE_CRYPTODEV | OPENSSL_INIT_ENGINE_CAPI | \
-    OPENSSL_INIT_ENGINE_PADLOCK)
-
-
-/* Library initialisation functions */
-void OPENSSL_cleanup(void);
-int OPENSSL_init_crypto(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings);
-int OPENSSL_atexit(void (*handler)(void));
-void OPENSSL_thread_stop(void);
-
-/* Low-level control of initialization */
-OPENSSL_INIT_SETTINGS *OPENSSL_INIT_new(void);
-# ifndef OPENSSL_NO_STDIO
-int OPENSSL_INIT_set_config_appname(OPENSSL_INIT_SETTINGS *settings,
-                                    const char *config_file);
-# endif
-void OPENSSL_INIT_free(OPENSSL_INIT_SETTINGS *settings);
-
-# if defined(OPENSSL_THREADS) && !defined(CRYPTO_TDEBUG)
-#  if defined(_WIN32)
-#   if defined(BASETYPES) || defined(_WINDEF_H)
-/* application has to include <windows.h> in order to use this */
-typedef DWORD CRYPTO_THREAD_LOCAL;
-typedef DWORD CRYPTO_THREAD_ID;
-
-typedef LONG CRYPTO_ONCE;
-#    define CRYPTO_ONCE_STATIC_INIT 0
-#   endif
-#  else
-#   include <pthread.h>
-typedef pthread_once_t CRYPTO_ONCE;
-typedef pthread_key_t CRYPTO_THREAD_LOCAL;
-typedef pthread_t CRYPTO_THREAD_ID;
-
-#   define CRYPTO_ONCE_STATIC_INIT PTHREAD_ONCE_INIT
-#  endif
-# endif
-
-# if !defined(CRYPTO_ONCE_STATIC_INIT)
-typedef unsigned int CRYPTO_ONCE;
-typedef unsigned int CRYPTO_THREAD_LOCAL;
-typedef unsigned int CRYPTO_THREAD_ID;
-#  define CRYPTO_ONCE_STATIC_INIT 0
-# endif
-
-int CRYPTO_THREAD_run_once(CRYPTO_ONCE *once, void (*init)(void));
-
-int CRYPTO_THREAD_init_local(CRYPTO_THREAD_LOCAL *key, void (*cleanup)(void *));
-void *CRYPTO_THREAD_get_local(CRYPTO_THREAD_LOCAL *key);
-int CRYPTO_THREAD_set_local(CRYPTO_THREAD_LOCAL *key, void *val);
-int CRYPTO_THREAD_cleanup_local(CRYPTO_THREAD_LOCAL *key);
-
-CRYPTO_THREAD_ID CRYPTO_THREAD_get_current_id(void);
-int CRYPTO_THREAD_compare_id(CRYPTO_THREAD_ID a, CRYPTO_THREAD_ID b);
-
-/* BEGIN ERROR CODES */
-/*
- * The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
-
-int ERR_load_CRYPTO_strings(void);
-
-/* Error codes for the CRYPTO functions. */
-
-/* Function codes. */
-# define CRYPTO_F_CRYPTO_DUP_EX_DATA                      110
-# define CRYPTO_F_CRYPTO_FREE_EX_DATA                     111
-# define CRYPTO_F_CRYPTO_GET_EX_NEW_INDEX                 100
-# define CRYPTO_F_CRYPTO_MEMDUP                           115
-# define CRYPTO_F_CRYPTO_NEW_EX_DATA                      112
-# define CRYPTO_F_CRYPTO_SET_EX_DATA                      102
-# define CRYPTO_F_FIPS_MODE_SET                           109
-# define CRYPTO_F_GET_AND_LOCK                            113
-# define CRYPTO_F_OPENSSL_BUF2HEXSTR                      117
-# define CRYPTO_F_OPENSSL_HEXSTR2BUF                      118
-# define CRYPTO_F_OPENSSL_INIT_CRYPTO                     116
-
-/* Reason codes. */
-# define CRYPTO_R_FIPS_MODE_NOT_SUPPORTED                 101
-# define CRYPTO_R_ILLEGAL_HEX_DIGIT                       102
-# define CRYPTO_R_ODD_NUMBER_OF_DIGITS                    103
-
-# ifdef  __cplusplus
-}
-# endif
-#endif

gpac-2.2.1.tar.gz/extra_lib/include/openssl/ct.h Deleted

@@ -1,533 +0,0 @@
-/*
- * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
- *
- * Licensed under the OpenSSL license (the "License").  You may not use
- * this file except in compliance with the License.  You can obtain a copy
- * in the file LICENSE in the source distribution or at
- * https://www.openssl.org/source/license.html
- */
-
-#ifndef HEADER_CT_H
-# define HEADER_CT_H
-
-# include <openssl/opensslconf.h>
-
-# ifndef OPENSSL_NO_CT
-# include <openssl/ossl_typ.h>
-# include <openssl/safestack.h>
-# include <openssl/x509.h>
-# ifdef  __cplusplus
-extern "C" {
-# endif
-
-
-/* Minimum RSA key size, from RFC6962 */
-# define SCT_MIN_RSA_BITS 2048
-
-/* All hashes are SHA256 in v1 of Certificate Transparency */
-# define CT_V1_HASHLEN SHA256_DIGEST_LENGTH
-
-typedef enum {
-    CT_LOG_ENTRY_TYPE_NOT_SET = -1,
-    CT_LOG_ENTRY_TYPE_X509 = 0,
-    CT_LOG_ENTRY_TYPE_PRECERT = 1
-} ct_log_entry_type_t;
-
-typedef enum {
-    SCT_VERSION_NOT_SET = -1,
-    SCT_VERSION_V1 = 0
-} sct_version_t;
-
-typedef enum {
-    SCT_SOURCE_UNKNOWN,
-    SCT_SOURCE_TLS_EXTENSION,
-    SCT_SOURCE_X509V3_EXTENSION,
-    SCT_SOURCE_OCSP_STAPLED_RESPONSE
-} sct_source_t;
-
-typedef enum {
-    SCT_VALIDATION_STATUS_NOT_SET,
-    SCT_VALIDATION_STATUS_UNKNOWN_LOG,
-    SCT_VALIDATION_STATUS_VALID,
-    SCT_VALIDATION_STATUS_INVALID,
-    SCT_VALIDATION_STATUS_UNVERIFIED,
-    SCT_VALIDATION_STATUS_UNKNOWN_VERSION
-} sct_validation_status_t;
-
-DEFINE_STACK_OF(SCT)
-DEFINE_STACK_OF(CTLOG)
-
-/******************************************
- * CT policy evaluation context functions *
- ******************************************/
-
-/*
- * Creates a new, empty policy evaluation context.
- * The caller is responsible for calling CT_POLICY_EVAL_CTX_free when finished
- * with the CT_POLICY_EVAL_CTX.
- */
-CT_POLICY_EVAL_CTX *CT_POLICY_EVAL_CTX_new(void);
-
-/* Deletes a policy evaluation context and anything it owns. */
-void CT_POLICY_EVAL_CTX_free(CT_POLICY_EVAL_CTX *ctx);
-
-/* Gets the peer certificate that the SCTs are for */
-X509* CT_POLICY_EVAL_CTX_get0_cert(const CT_POLICY_EVAL_CTX *ctx);
-
-/*
- * Sets the certificate associated with the received SCTs.
- * Increments the reference count of cert.
- * Returns 1 on success, 0 otherwise.
- */
-int CT_POLICY_EVAL_CTX_set1_cert(CT_POLICY_EVAL_CTX *ctx, X509 *cert);
-
-/* Gets the issuer of the aforementioned certificate */
-X509* CT_POLICY_EVAL_CTX_get0_issuer(const CT_POLICY_EVAL_CTX *ctx);
-
-/*
- * Sets the issuer of the certificate associated with the received SCTs.
- * Increments the reference count of issuer.
- * Returns 1 on success, 0 otherwise.
- */
-int CT_POLICY_EVAL_CTX_set1_issuer(CT_POLICY_EVAL_CTX *ctx, X509 *issuer);
-
-/* Gets the CT logs that are trusted sources of SCTs */
-const CTLOG_STORE *CT_POLICY_EVAL_CTX_get0_log_store(const CT_POLICY_EVAL_CTX *ctx);
-
-/* Sets the log store that is in use. It must outlive the CT_POLICY_EVAL_CTX. */
-void CT_POLICY_EVAL_CTX_set_shared_CTLOG_STORE(CT_POLICY_EVAL_CTX *ctx,
-                                               CTLOG_STORE *log_store);
-
-/*
- * Gets the time, in milliseconds since the Unix epoch, that will be used as the
- * current time when checking whether an SCT was issued in the future.
- * Such SCTs will fail validation, as required by RFC6962.
- */
-uint64_t CT_POLICY_EVAL_CTX_get_time(const CT_POLICY_EVAL_CTX *ctx);
-
-/*
- * Sets the time to evaluate SCTs against, in milliseconds since the Unix epoch.
- * If an SCT's timestamp is after this time, it will be interpreted as having
- * been issued in the future. RFC6962 states that "TLS clients MUST reject SCTs
- * whose timestamp is in the future", so an SCT will not validate in this case.
- */
-void CT_POLICY_EVAL_CTX_set_time(CT_POLICY_EVAL_CTX *ctx, uint64_t time_in_ms);
-
-/*****************
- * SCT functions *
- *****************/
-
-/*
- * Creates a new, blank SCT.
- * The caller is responsible for calling SCT_free when finished with the SCT.
- */
-SCT *SCT_new(void);
-
-/*
- * Creates a new SCT from some base64-encoded strings.
- * The caller is responsible for calling SCT_free when finished with the SCT.
- */
-SCT *SCT_new_from_base64(unsigned char version,
-                         const char *logid_base64,
-                         ct_log_entry_type_t entry_type,
-                         uint64_t timestamp,
-                         const char *extensions_base64,
-                         const char *signature_base64);
-
-/*
- * Frees the SCT and the underlying data structures.
- */
-void SCT_free(SCT *sct);
-
-/*
- * Free a stack of SCTs, and the underlying SCTs themselves.
- * Intended to be compatible with X509V3_EXT_FREE.
- */
-void SCT_LIST_free(STACK_OF(SCT) *a);
-
-/*
- * Returns the version of the SCT.
- */
-sct_version_t SCT_get_version(const SCT *sct);
-
-/*
- * Set the version of an SCT.
- * Returns 1 on success, 0 if the version is unrecognized.
- */
-__owur int SCT_set_version(SCT *sct, sct_version_t version);
-
-/*
- * Returns the log entry type of the SCT.
- */
-ct_log_entry_type_t SCT_get_log_entry_type(const SCT *sct);
-
-/*
- * Set the log entry type of an SCT.
- * Returns 1 on success, 0 otherwise.
- */
-__owur int SCT_set_log_entry_type(SCT *sct, ct_log_entry_type_t entry_type);
-
-/*
- * Gets the ID of the log that an SCT came from.
- * Ownership of the log ID remains with the SCT.
- * Returns the length of the log ID.
- */
-size_t SCT_get0_log_id(const SCT *sct, unsigned char **log_id);
-
-/*
- * Set the log ID of an SCT to point directly to the *log_id specified.
- * The SCT takes ownership of the specified pointer.
- * Returns 1 on success, 0 otherwise.
- */
-__owur int SCT_set0_log_id(SCT *sct, unsigned char *log_id, size_t log_id_len);
-
-/*
- * Set the log ID of an SCT.
- * This makes a copy of the log_id.
- * Returns 1 on success, 0 otherwise.
- */
-__owur int SCT_set1_log_id(SCT *sct, const unsigned char *log_id,
-                           size_t log_id_len);
-
-/*
- * Returns the timestamp for the SCT (epoch time in milliseconds).
- */
-uint64_t SCT_get_timestamp(const SCT *sct);
-
-/*
- * Set the timestamp of an SCT (epoch time in milliseconds).
- */
-void SCT_set_timestamp(SCT *sct, uint64_t timestamp);
-
-/*
- * Return the NID for the signature used by the SCT.
- * For CT v1, this will be either NID_sha256WithRSAEncryption or
- * NID_ecdsa_with_SHA256 (or NID_undef if incorrect/unset).
- */
-int SCT_get_signature_nid(const SCT *sct);
-
-/*
- * Set the signature type of an SCT
- * For CT v1, this should be either NID_sha256WithRSAEncryption or
- * NID_ecdsa_with_SHA256.
- * Returns 1 on success, 0 otherwise.
- */
-__owur int SCT_set_signature_nid(SCT *sct, int nid);
-
-/*
- * Set *ext to point to the extension data for the SCT. ext must not be NULL.
- * The SCT retains ownership of this pointer.
- * Returns length of the data pointed to.
- */
-size_t SCT_get0_extensions(const SCT *sct, unsigned char **ext);
-
-/*
- * Set the extensions of an SCT to point directly to the *ext specified.
- * The SCT takes ownership of the specified pointer.
- */
-void SCT_set0_extensions(SCT *sct, unsigned char *ext, size_t ext_len);
-
-/*
- * Set the extensions of an SCT.
- * This takes a copy of the ext.
- * Returns 1 on success, 0 otherwise.
- */
-__owur int SCT_set1_extensions(SCT *sct, const unsigned char *ext,
-                               size_t ext_len);
-
-/*
- * Set *sig to point to the signature for the SCT. sig must not be NULL.
- * The SCT retains ownership of this pointer.
- * Returns length of the data pointed to.
- */
-size_t SCT_get0_signature(const SCT *sct, unsigned char **sig);
-
-/*
- * Set the signature of an SCT to point directly to the *sig specified.
- * The SCT takes ownership of the specified pointer.
- */
-void SCT_set0_signature(SCT *sct, unsigned char *sig, size_t sig_len);
-
-/*
- * Set the signature of an SCT to be a copy of the *sig specified.
- * Returns 1 on success, 0 otherwise.
- */
-__owur int SCT_set1_signature(SCT *sct, const unsigned char *sig,
-                              size_t sig_len);
-
-/*
- * The origin of this SCT, e.g. TLS extension, OCSP response, etc.
- */
-sct_source_t SCT_get_source(const SCT *sct);
-
-/*
- * Set the origin of this SCT, e.g. TLS extension, OCSP response, etc.
- * Returns 1 on success, 0 otherwise.
- */
-__owur int SCT_set_source(SCT *sct, sct_source_t source);
-
-/*
- * Returns a text string describing the validation status of |sct|.
- */
-const char *SCT_validation_status_string(const SCT *sct);
-
-/*
- * Pretty-prints an |sct| to |out|.
- * It will be indented by the number of spaces specified by |indent|.
- * If |logs| is not NULL, it will be used to lookup the CT log that the SCT came
- * from, so that the log name can be printed.
- */
-void SCT_print(const SCT *sct, BIO *out, int indent, const CTLOG_STORE *logs);
-
-/*
- * Pretty-prints an |sct_list| to |out|.
- * It will be indented by the number of spaces specified by |indent|.
- * SCTs will be delimited by |separator|.
- * If |logs| is not NULL, it will be used to lookup the CT log that each SCT
- * came from, so that the log names can be printed.
- */
-void SCT_LIST_print(const STACK_OF(SCT) *sct_list, BIO *out, int indent,
-                    const char *separator, const CTLOG_STORE *logs);
-
-/*
- * Gets the last result of validating this SCT.
- * If it has not been validated yet, returns SCT_VALIDATION_STATUS_NOT_SET.
- */
-sct_validation_status_t SCT_get_validation_status(const SCT *sct);
-
-/*
- * Validates the given SCT with the provided context.
- * Sets the "validation_status" field of the SCT.
- * Returns 1 if the SCT is valid and the signature verifies.
- * Returns 0 if the SCT is invalid or could not be verified.
- * Returns -1 if an error occurs.
- */
-__owur int SCT_validate(SCT *sct, const CT_POLICY_EVAL_CTX *ctx);
-
-/*
- * Validates the given list of SCTs with the provided context.
- * Sets the "validation_status" field of each SCT.
- * Returns 1 if there are no invalid SCTs and all signatures verify.
- * Returns 0 if at least one SCT is invalid or could not be verified.
- * Returns a negative integer if an error occurs.
- */
-__owur int SCT_LIST_validate(const STACK_OF(SCT) *scts,
-                             CT_POLICY_EVAL_CTX *ctx);
-
-
-/*********************************
- * SCT parsing and serialisation *
- *********************************/
-
-/*
- * Serialize (to TLS format) a stack of SCTs and return the length.
- * "a" must not be NULL.
- * If "pp" is NULL, just return the length of what would have been serialized.
- * If "pp" is not NULL and "*pp" is null, function will allocate a new pointer
- * for data that caller is responsible for freeing (only if function returns
- * successfully).
- * If "pp" is NULL and "*pp" is not NULL, caller is responsible for ensuring
- * that "*pp" is large enough to accept all of the serialized data.
- * Returns < 0 on error, >= 0 indicating bytes written (or would have been)
- * on success.
- */
-__owur int i2o_SCT_LIST(const STACK_OF(SCT) *a, unsigned char **pp);
-
-/*
- * Convert TLS format SCT list to a stack of SCTs.
- * If "a" or "*a" is NULL, a new stack will be created that the caller is
- * responsible for freeing (by calling SCT_LIST_free).
- * "**pp" and "*pp" must not be NULL.
- * Upon success, "*pp" will point to after the last bytes read, and a stack
- * will be returned.
- * Upon failure, a NULL pointer will be returned, and the position of "*pp" is
- * not defined.
- */
-STACK_OF(SCT) *o2i_SCT_LIST(STACK_OF(SCT) **a, const unsigned char **pp,
-                            size_t len);
-
-/*
- * Serialize (to DER format) a stack of SCTs and return the length.
- * "a" must not be NULL.
- * If "pp" is NULL, just returns the length of what would have been serialized.
- * If "pp" is not NULL and "*pp" is null, function will allocate a new pointer
- * for data that caller is responsible for freeing (only if function returns
- * successfully).
- * If "pp" is NULL and "*pp" is not NULL, caller is responsible for ensuring
- * that "*pp" is large enough to accept all of the serialized data.
- * Returns < 0 on error, >= 0 indicating bytes written (or would have been)
- * on success.
- */
-__owur int i2d_SCT_LIST(const STACK_OF(SCT) *a, unsigned char **pp);
-
-/*
- * Parses an SCT list in DER format and returns it.
- * If "a" or "*a" is NULL, a new stack will be created that the caller is
- * responsible for freeing (by calling SCT_LIST_free).
- * "**pp" and "*pp" must not be NULL.
- * Upon success, "*pp" will point to after the last bytes read, and a stack
- * will be returned.
- * Upon failure, a NULL pointer will be returned, and the position of "*pp" is
- * not defined.
- */
-STACK_OF(SCT) *d2i_SCT_LIST(STACK_OF(SCT) **a, const unsigned char **pp,
-                            long len);
-
-/*
- * Serialize (to TLS format) an |sct| and write it to |out|.
- * If |out| is null, no SCT will be output but the length will still be returned.
- * If |out| points to a null pointer, a string will be allocated to hold the
- * TLS-format SCT. It is the responsibility of the caller to free it.
- * If |out| points to an allocated string, the TLS-format SCT will be written
- * to it.
- * The length of the SCT in TLS format will be returned.
- */
-__owur int i2o_SCT(const SCT *sct, unsigned char **out);
-
-/*
- * Parses an SCT in TLS format and returns it.
- * If |psct| is not null, it will end up pointing to the parsed SCT. If it
- * already points to a non-null pointer, the pointer will be free'd.
- * |in| should be a pointer to a string containing the TLS-format SCT.
- * |in| will be advanced to the end of the SCT if parsing succeeds.
- * |len| should be the length of the SCT in |in|.
- * Returns NULL if an error occurs.
- * If the SCT is an unsupported version, only the SCT's 'sct' and 'sct_len'
- * fields will be populated (with |in| and |len| respectively).
- */
-SCT *o2i_SCT(SCT **psct, const unsigned char **in, size_t len);
-
-/********************
- * CT log functions *
- ********************/
-
-/*
- * Creates a new CT log instance with the given |public_key| and |name|.
- * Takes ownership of |public_key| but copies |name|.
- * Returns NULL if malloc fails or if |public_key| cannot be converted to DER.
- * Should be deleted by the caller using CTLOG_free when no longer needed.
- */
-CTLOG *CTLOG_new(EVP_PKEY *public_key, const char *name);
-
-/*
- * Creates a new CTLOG instance with the base64-encoded SubjectPublicKeyInfo DER
- * in |pkey_base64|. The |name| is a string to help users identify this log.
- * Returns 1 on success, 0 on failure.
- * Should be deleted by the caller using CTLOG_free when no longer needed.
- */
-int CTLOG_new_from_base64(CTLOG ** ct_log,
-                          const char *pkey_base64, const char *name);
-
-/*
- * Deletes a CT log instance and its fields.
- */
-void CTLOG_free(CTLOG *log);
-
-/* Gets the name of the CT log */
-const char *CTLOG_get0_name(const CTLOG *log);
-/* Gets the ID of the CT log */
-void CTLOG_get0_log_id(const CTLOG *log, const uint8_t **log_id,
-                       size_t *log_id_len);
-/* Gets the public key of the CT log */
-EVP_PKEY *CTLOG_get0_public_key(const CTLOG *log);
-
-/**************************
- * CT log store functions *
- **************************/
-
-/*
- * Creates a new CT log store.
- * Should be deleted by the caller using CTLOG_STORE_free when no longer needed.
- */
-CTLOG_STORE *CTLOG_STORE_new(void);
-
-/*
- * Deletes a CT log store and all of the CT log instances held within.
- */
-void CTLOG_STORE_free(CTLOG_STORE *store);
-
-/*
- * Finds a CT log in the store based on its log ID.
- * Returns the CT log, or NULL if no match is found.
- */
-const CTLOG *CTLOG_STORE_get0_log_by_id(const CTLOG_STORE *store,
-                                        const uint8_t *log_id,
-                                        size_t log_id_len);
-
-/*
- * Loads a CT log list into a |store| from a |file|.
- * Returns 1 if loading is successful, or 0 otherwise.
- */
-__owur int CTLOG_STORE_load_file(CTLOG_STORE *store, const char *file);
-
-/*
- * Loads the default CT log list into a |store|.
- * See internal/cryptlib.h for the environment variable and file path that are
- * consulted to find the default file.
- * Returns 1 if loading is successful, or 0 otherwise.
- */
-__owur int CTLOG_STORE_load_default_file(CTLOG_STORE *store);
-
-/* BEGIN ERROR CODES */
-/*
- * The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
-
-int ERR_load_CT_strings(void);
-
-/* Error codes for the CT functions. */
-
-/* Function codes. */
-# define CT_F_CTLOG_NEW                                   117
-# define CT_F_CTLOG_NEW_FROM_BASE64                       118
-# define CT_F_CTLOG_NEW_FROM_CONF                         119
-# define CT_F_CTLOG_STORE_LOAD_CTX_NEW                    122
-# define CT_F_CTLOG_STORE_LOAD_FILE                       123
-# define CT_F_CTLOG_STORE_LOAD_LOG                        130
-# define CT_F_CTLOG_STORE_NEW                             131
-# define CT_F_CT_BASE64_DECODE                            124
-# define CT_F_CT_POLICY_EVAL_CTX_NEW                      133
-# define CT_F_CT_V1_LOG_ID_FROM_PKEY                      125
-# define CT_F_I2O_SCT                                     107
-# define CT_F_I2O_SCT_LIST                                108
-# define CT_F_I2O_SCT_SIGNATURE                           109
-# define CT_F_O2I_SCT                                     110
-# define CT_F_O2I_SCT_LIST                                111
-# define CT_F_O2I_SCT_SIGNATURE                           112
-# define CT_F_SCT_CTX_NEW                                 126
-# define CT_F_SCT_CTX_VERIFY                              128
-# define CT_F_SCT_NEW                                     100
-# define CT_F_SCT_NEW_FROM_BASE64                         127
-# define CT_F_SCT_SET0_LOG_ID                             101
-# define CT_F_SCT_SET1_EXTENSIONS                         114
-# define CT_F_SCT_SET1_LOG_ID                             115
-# define CT_F_SCT_SET1_SIGNATURE                          116
-# define CT_F_SCT_SET_LOG_ENTRY_TYPE                      102
-# define CT_F_SCT_SET_SIGNATURE_NID                       103
-# define CT_F_SCT_SET_VERSION                             104
-
-/* Reason codes. */
-# define CT_R_BASE64_DECODE_ERROR                         108
-# define CT_R_INVALID_LOG_ID_LENGTH                       100
-# define CT_R_LOG_CONF_INVALID                            109
-# define CT_R_LOG_CONF_INVALID_KEY                        110
-# define CT_R_LOG_CONF_MISSING_DESCRIPTION                111
-# define CT_R_LOG_CONF_MISSING_KEY                        112
-# define CT_R_LOG_KEY_INVALID                             113
-# define CT_R_SCT_FUTURE_TIMESTAMP                        116
-# define CT_R_SCT_INVALID                                 104
-# define CT_R_SCT_INVALID_SIGNATURE                       107
-# define CT_R_SCT_LIST_INVALID                            105
-# define CT_R_SCT_LOG_ID_MISMATCH                         114
-# define CT_R_SCT_NOT_SET                                 106
-# define CT_R_SCT_UNSUPPORTED_VERSION                     115
-# define CT_R_UNRECOGNIZED_SIGNATURE_NID                  101
-# define CT_R_UNSUPPORTED_ENTRY_TYPE                      102
-# define CT_R_UNSUPPORTED_VERSION                         103
-
-#  ifdef  __cplusplus
-}
-#  endif
-# endif
-#endif

gpac-2.2.1.tar.gz/extra_lib/include/openssl/des.h Deleted

@@ -1,174 +0,0 @@
-/*
- * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
- *
- * Licensed under the OpenSSL license (the "License").  You may not use
- * this file except in compliance with the License.  You can obtain a copy
- * in the file LICENSE in the source distribution or at
- * https://www.openssl.org/source/license.html
- */
-
-#ifndef HEADER_DES_H
-# define HEADER_DES_H
-
-# include <openssl/opensslconf.h>
-
-# ifndef OPENSSL_NO_DES
-# ifdef  __cplusplus
-extern "C" {
-# endif
-# include <openssl/e_os2.h>
-
-typedef unsigned int DES_LONG;
-
-# ifdef OPENSSL_BUILD_SHLIBCRYPTO
-#  undef OPENSSL_EXTERN
-#  define OPENSSL_EXTERN OPENSSL_EXPORT
-# endif
-
-typedef unsigned char DES_cblock8;
-typedef /* const */ unsigned char const_DES_cblock8;
-/*
- * With "const", gcc 2.8.1 on Solaris thinks that DES_cblock * and
- * const_DES_cblock * are incompatible pointer types.
- */
-
-typedef struct DES_ks {
-    union {
-        DES_cblock cblock;
-        /*
-         * make sure things are correct size on machines with 8 byte longs
-         */
-        DES_LONG deslong2;
-    } ks16;
-} DES_key_schedule;
-
-# define DES_KEY_SZ      (sizeof(DES_cblock))
-# define DES_SCHEDULE_SZ (sizeof(DES_key_schedule))
-
-# define DES_ENCRYPT     1
-# define DES_DECRYPT     0
-
-# define DES_CBC_MODE    0
-# define DES_PCBC_MODE   1
-
-# define DES_ecb2_encrypt(i,o,k1,k2,e) \
-        DES_ecb3_encrypt((i),(o),(k1),(k2),(k1),(e))
-
-# define DES_ede2_cbc_encrypt(i,o,l,k1,k2,iv,e) \
-        DES_ede3_cbc_encrypt((i),(o),(l),(k1),(k2),(k1),(iv),(e))
-
-# define DES_ede2_cfb64_encrypt(i,o,l,k1,k2,iv,n,e) \
-        DES_ede3_cfb64_encrypt((i),(o),(l),(k1),(k2),(k1),(iv),(n),(e))
-
-# define DES_ede2_ofb64_encrypt(i,o,l,k1,k2,iv,n) \
-        DES_ede3_ofb64_encrypt((i),(o),(l),(k1),(k2),(k1),(iv),(n))
-
-OPENSSL_DECLARE_GLOBAL(int, DES_check_key); /* defaults to false */
-# define DES_check_key OPENSSL_GLOBAL_REF(DES_check_key)
-
-const char *DES_options(void);
-void DES_ecb3_encrypt(const_DES_cblock *input, DES_cblock *output,
-                      DES_key_schedule *ks1, DES_key_schedule *ks2,
-                      DES_key_schedule *ks3, int enc);
-DES_LONG DES_cbc_cksum(const unsigned char *input, DES_cblock *output,
-                       long length, DES_key_schedule *schedule,
-                       const_DES_cblock *ivec);
-/* DES_cbc_encrypt does not update the IV!  Use DES_ncbc_encrypt instead. */
-void DES_cbc_encrypt(const unsigned char *input, unsigned char *output,
-                     long length, DES_key_schedule *schedule,
-                     DES_cblock *ivec, int enc);
-void DES_ncbc_encrypt(const unsigned char *input, unsigned char *output,
-                      long length, DES_key_schedule *schedule,
-                      DES_cblock *ivec, int enc);
-void DES_xcbc_encrypt(const unsigned char *input, unsigned char *output,
-                      long length, DES_key_schedule *schedule,
-                      DES_cblock *ivec, const_DES_cblock *inw,
-                      const_DES_cblock *outw, int enc);
-void DES_cfb_encrypt(const unsigned char *in, unsigned char *out, int numbits,
-                     long length, DES_key_schedule *schedule,
-                     DES_cblock *ivec, int enc);
-void DES_ecb_encrypt(const_DES_cblock *input, DES_cblock *output,
-                     DES_key_schedule *ks, int enc);
-
-/*
- * This is the DES encryption function that gets called by just about every
- * other DES routine in the library.  You should not use this function except
- * to implement 'modes' of DES.  I say this because the functions that call
- * this routine do the conversion from 'char *' to long, and this needs to be
- * done to make sure 'non-aligned' memory access do not occur.  The
- * characters are loaded 'little endian'. Data is a pointer to 2 unsigned
- * long's and ks is the DES_key_schedule to use.  enc, is non zero specifies
- * encryption, zero if decryption.
- */
-void DES_encrypt1(DES_LONG *data, DES_key_schedule *ks, int enc);
-
-/*
- * This functions is the same as DES_encrypt1() except that the DES initial
- * permutation (IP) and final permutation (FP) have been left out.  As for
- * DES_encrypt1(), you should not use this function. It is used by the
- * routines in the library that implement triple DES. IP() DES_encrypt2()
- * DES_encrypt2() DES_encrypt2() FP() is the same as DES_encrypt1()
- * DES_encrypt1() DES_encrypt1() except faster :-).
- */
-void DES_encrypt2(DES_LONG *data, DES_key_schedule *ks, int enc);
-
-void DES_encrypt3(DES_LONG *data, DES_key_schedule *ks1,
-                  DES_key_schedule *ks2, DES_key_schedule *ks3);
-void DES_decrypt3(DES_LONG *data, DES_key_schedule *ks1,
-                  DES_key_schedule *ks2, DES_key_schedule *ks3);
-void DES_ede3_cbc_encrypt(const unsigned char *input, unsigned char *output,
-                          long length,
-                          DES_key_schedule *ks1, DES_key_schedule *ks2,
-                          DES_key_schedule *ks3, DES_cblock *ivec, int enc);
-void DES_ede3_cfb64_encrypt(const unsigned char *in, unsigned char *out,
-                            long length, DES_key_schedule *ks1,
-                            DES_key_schedule *ks2, DES_key_schedule *ks3,
-                            DES_cblock *ivec, int *num, int enc);
-void DES_ede3_cfb_encrypt(const unsigned char *in, unsigned char *out,
-                          int numbits, long length, DES_key_schedule *ks1,
-                          DES_key_schedule *ks2, DES_key_schedule *ks3,
-                          DES_cblock *ivec, int enc);
-void DES_ede3_ofb64_encrypt(const unsigned char *in, unsigned char *out,
-                            long length, DES_key_schedule *ks1,
-                            DES_key_schedule *ks2, DES_key_schedule *ks3,
-                            DES_cblock *ivec, int *num);
-char *DES_fcrypt(const char *buf, const char *salt, char *ret);
-char *DES_crypt(const char *buf, const char *salt);
-void DES_ofb_encrypt(const unsigned char *in, unsigned char *out, int numbits,
-                     long length, DES_key_schedule *schedule,
-                     DES_cblock *ivec);
-void DES_pcbc_encrypt(const unsigned char *input, unsigned char *output,
-                      long length, DES_key_schedule *schedule,
-                      DES_cblock *ivec, int enc);
-DES_LONG DES_quad_cksum(const unsigned char *input, DES_cblock output,
-                        long length, int out_count, DES_cblock *seed);
-int DES_random_key(DES_cblock *ret);
-void DES_set_odd_parity(DES_cblock *key);
-int DES_check_key_parity(const_DES_cblock *key);
-int DES_is_weak_key(const_DES_cblock *key);
-/*
- * DES_set_key (= set_key = DES_key_sched = key_sched) calls
- * DES_set_key_checked if global variable DES_check_key is set,
- * DES_set_key_unchecked otherwise.
- */
-int DES_set_key(const_DES_cblock *key, DES_key_schedule *schedule);
-int DES_key_sched(const_DES_cblock *key, DES_key_schedule *schedule);
-int DES_set_key_checked(const_DES_cblock *key, DES_key_schedule *schedule);
-void DES_set_key_unchecked(const_DES_cblock *key, DES_key_schedule *schedule);
-void DES_string_to_key(const char *str, DES_cblock *key);
-void DES_string_to_2keys(const char *str, DES_cblock *key1, DES_cblock *key2);
-void DES_cfb64_encrypt(const unsigned char *in, unsigned char *out,
-                       long length, DES_key_schedule *schedule,
-                       DES_cblock *ivec, int *num, int enc);
-void DES_ofb64_encrypt(const unsigned char *in, unsigned char *out,
-                       long length, DES_key_schedule *schedule,
-                       DES_cblock *ivec, int *num);
-
-# define DES_fixup_key_parity DES_set_odd_parity
-
-# ifdef  __cplusplus
-}
-# endif
-# endif
-
-#endif

gpac-2.2.1.tar.gz/extra_lib/include/openssl/dh.h Deleted

@@ -1,361 +0,0 @@
-/*
- * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
- *
- * Licensed under the OpenSSL license (the "License").  You may not use
- * this file except in compliance with the License.  You can obtain a copy
- * in the file LICENSE in the source distribution or at
- * https://www.openssl.org/source/license.html
- */
-
-#ifndef HEADER_DH_H
-# define HEADER_DH_H
-
-# include <openssl/opensslconf.h>
-
-# ifndef OPENSSL_NO_DH
-# include <openssl/e_os2.h>
-# include <openssl/bio.h>
-# include <openssl/asn1.h>
-# include <openssl/ossl_typ.h>
-# if OPENSSL_API_COMPAT < 0x10100000L
-#  include <openssl/bn.h>
-# endif
-
-# ifdef  __cplusplus
-extern "C" {
-# endif
-
-# ifndef OPENSSL_DH_MAX_MODULUS_BITS
-#  define OPENSSL_DH_MAX_MODULUS_BITS    10000
-# endif
-
-# define OPENSSL_DH_FIPS_MIN_MODULUS_BITS 1024
-
-# define DH_FLAG_CACHE_MONT_P     0x01
-
-# if OPENSSL_API_COMPAT < 0x10100000L
-/*
- * Does nothing. Previously this switched off constant time behaviour.
- */
-#  define DH_FLAG_NO_EXP_CONSTTIME 0x00
-# endif
-
-/*
- * If this flag is set the DH method is FIPS compliant and can be used in
- * FIPS mode. This is set in the validated module method. If an application
- * sets this flag in its own methods it is its responsibility to ensure the
- * result is compliant.
- */
-
-# define DH_FLAG_FIPS_METHOD                     0x0400
-
-/*
- * If this flag is set the operations normally disabled in FIPS mode are
- * permitted it is then the applications responsibility to ensure that the
- * usage is compliant.
- */
-
-# define DH_FLAG_NON_FIPS_ALLOW                  0x0400
-
-/* Already defined in ossl_typ.h */
-/* typedef struct dh_st DH; */
-/* typedef struct dh_method DH_METHOD; */
-
-DECLARE_ASN1_ITEM(DHparams)
-
-# define DH_GENERATOR_2          2
-/* #define DH_GENERATOR_3       3 */
-# define DH_GENERATOR_5          5
-
-/* DH_check error codes */
-# define DH_CHECK_P_NOT_PRIME            0x01
-# define DH_CHECK_P_NOT_SAFE_PRIME       0x02
-# define DH_UNABLE_TO_CHECK_GENERATOR    0x04
-# define DH_NOT_SUITABLE_GENERATOR       0x08
-# define DH_CHECK_Q_NOT_PRIME            0x10
-# define DH_CHECK_INVALID_Q_VALUE        0x20
-# define DH_CHECK_INVALID_J_VALUE        0x40
-
-/* DH_check_pub_key error codes */
-# define DH_CHECK_PUBKEY_TOO_SMALL       0x01
-# define DH_CHECK_PUBKEY_TOO_LARGE       0x02
-# define DH_CHECK_PUBKEY_INVALID         0x04
-
-/*
- * primes p where (p-1)/2 is prime too are called "safe"; we define this for
- * backward compatibility:
- */
-# define DH_CHECK_P_NOT_STRONG_PRIME     DH_CHECK_P_NOT_SAFE_PRIME
-
-# define d2i_DHparams_fp(fp,x) \
-    (DH *)ASN1_d2i_fp((char *(*)())DH_new, \
-                      (char *(*)())d2i_DHparams, \
-                      (fp), \
-                      (unsigned char **)(x))
-# define i2d_DHparams_fp(fp,x) \
-    ASN1_i2d_fp(i2d_DHparams,(fp), (unsigned char *)(x))
-# define d2i_DHparams_bio(bp,x) \
-    ASN1_d2i_bio_of(DH, DH_new, d2i_DHparams, bp, x)
-# define i2d_DHparams_bio(bp,x) \
-    ASN1_i2d_bio_of_const(DH,i2d_DHparams,bp,x)
-
-# define d2i_DHxparams_fp(fp,x) \
-    (DH *)ASN1_d2i_fp((char *(*)())DH_new, \
-                      (char *(*)())d2i_DHxparams, \
-                      (fp), \
-                      (unsigned char **)(x))
-# define i2d_DHxparams_fp(fp,x) \
-    ASN1_i2d_fp(i2d_DHxparams,(fp), (unsigned char *)(x))
-# define d2i_DHxparams_bio(bp,x) \
-    ASN1_d2i_bio_of(DH, DH_new, d2i_DHxparams, bp, x)
-# define i2d_DHxparams_bio(bp,x) \
-    ASN1_i2d_bio_of_const(DH, i2d_DHxparams, bp, x)
-
-DH *DHparams_dup(DH *);
-
-const DH_METHOD *DH_OpenSSL(void);
-
-void DH_set_default_method(const DH_METHOD *meth);
-const DH_METHOD *DH_get_default_method(void);
-int DH_set_method(DH *dh, const DH_METHOD *meth);
-DH *DH_new_method(ENGINE *engine);
-
-DH *DH_new(void);
-void DH_free(DH *dh);
-int DH_up_ref(DH *dh);
-int DH_bits(const DH *dh);
-int DH_size(const DH *dh);
-int DH_security_bits(const DH *dh);
-#define DH_get_ex_new_index(l, p, newf, dupf, freef) \
-    CRYPTO_get_ex_new_index(CRYPTO_EX_INDEX_DH, l, p, newf, dupf, freef)
-int DH_set_ex_data(DH *d, int idx, void *arg);
-void *DH_get_ex_data(DH *d, int idx);
-
-/* Deprecated version */
-DEPRECATEDIN_0_9_8(DH *DH_generate_parameters(int prime_len, int generator,
-                                              void (*callback) (int, int,
-                                                                void *),
-                                              void *cb_arg))
-
-/* New version */
-int DH_generate_parameters_ex(DH *dh, int prime_len, int generator,
-                              BN_GENCB *cb);
-
-int DH_check_params(const DH *dh, int *ret);
-int DH_check(const DH *dh, int *codes);
-int DH_check_pub_key(const DH *dh, const BIGNUM *pub_key, int *codes);
-int DH_generate_key(DH *dh);
-int DH_compute_key(unsigned char *key, const BIGNUM *pub_key, DH *dh);
-int DH_compute_key_padded(unsigned char *key, const BIGNUM *pub_key, DH *dh);
-DH *d2i_DHparams(DH **a, const unsigned char **pp, long length);
-int i2d_DHparams(const DH *a, unsigned char **pp);
-DH *d2i_DHxparams(DH **a, const unsigned char **pp, long length);
-int i2d_DHxparams(const DH *a, unsigned char **pp);
-# ifndef OPENSSL_NO_STDIO
-int DHparams_print_fp(FILE *fp, const DH *x);
-# endif
-int DHparams_print(BIO *bp, const DH *x);
-
-/* RFC 5114 parameters */
-DH *DH_get_1024_160(void);
-DH *DH_get_2048_224(void);
-DH *DH_get_2048_256(void);
-
-# ifndef OPENSSL_NO_CMS
-/* RFC2631 KDF */
-int DH_KDF_X9_42(unsigned char *out, size_t outlen,
-                 const unsigned char *Z, size_t Zlen,
-                 ASN1_OBJECT *key_oid,
-                 const unsigned char *ukm, size_t ukmlen, const EVP_MD *md);
-# endif
-
-void DH_get0_pqg(const DH *dh,
-                 const BIGNUM **p, const BIGNUM **q, const BIGNUM **g);
-int DH_set0_pqg(DH *dh, BIGNUM *p, BIGNUM *q, BIGNUM *g);
-void DH_get0_key(const DH *dh,
-                 const BIGNUM **pub_key, const BIGNUM **priv_key);
-int DH_set0_key(DH *dh, BIGNUM *pub_key, BIGNUM *priv_key);
-void DH_clear_flags(DH *dh, int flags);
-int DH_test_flags(const DH *dh, int flags);
-void DH_set_flags(DH *dh, int flags);
-ENGINE *DH_get0_engine(DH *d);
-long DH_get_length(const DH *dh);
-int DH_set_length(DH *dh, long length);
-
-DH_METHOD *DH_meth_new(const char *name, int flags);
-void DH_meth_free(DH_METHOD *dhm);
-DH_METHOD *DH_meth_dup(const DH_METHOD *dhm);
-const char *DH_meth_get0_name(const DH_METHOD *dhm);
-int DH_meth_set1_name(DH_METHOD *dhm, const char *name);
-int DH_meth_get_flags(DH_METHOD *dhm);
-int DH_meth_set_flags(DH_METHOD *dhm, int flags);
-void *DH_meth_get0_app_data(const DH_METHOD *dhm);
-int DH_meth_set0_app_data(DH_METHOD *dhm, void *app_data);
-int (*DH_meth_get_generate_key(const DH_METHOD *dhm)) (DH *);
-int DH_meth_set_generate_key(DH_METHOD *dhm, int (*generate_key) (DH *));
-int (*DH_meth_get_compute_key(const DH_METHOD *dhm))
-        (unsigned char *key, const BIGNUM *pub_key, DH *dh);
-int DH_meth_set_compute_key(DH_METHOD *dhm,
-        int (*compute_key) (unsigned char *key, const BIGNUM *pub_key, DH *dh));
-int (*DH_meth_get_bn_mod_exp(const DH_METHOD *dhm))
-    (const DH *, BIGNUM *, const BIGNUM *, const BIGNUM *, const BIGNUM *,
-     BN_CTX *, BN_MONT_CTX *);
-int DH_meth_set_bn_mod_exp(DH_METHOD *dhm,
-    int (*bn_mod_exp) (const DH *, BIGNUM *, const BIGNUM *, const BIGNUM *,
-                       const BIGNUM *, BN_CTX *, BN_MONT_CTX *));
-int (*DH_meth_get_init(const DH_METHOD *dhm))(DH *);
-int DH_meth_set_init(DH_METHOD *dhm, int (*init)(DH *));
-int (*DH_meth_get_finish(const DH_METHOD *dhm)) (DH *);
-int DH_meth_set_finish(DH_METHOD *dhm, int (*finish) (DH *));
-int (*DH_meth_get_generate_params(const DH_METHOD *dhm))
-        (DH *, int, int, BN_GENCB *);
-int DH_meth_set_generate_params(DH_METHOD *dhm,
-        int (*generate_params) (DH *, int, int, BN_GENCB *));
-
-
-# define EVP_PKEY_CTX_set_dh_paramgen_prime_len(ctx, len) \
-        EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_DH, EVP_PKEY_OP_PARAMGEN, \
-                        EVP_PKEY_CTRL_DH_PARAMGEN_PRIME_LEN, len, NULL)
-
-# define EVP_PKEY_CTX_set_dh_paramgen_subprime_len(ctx, len) \
-        EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_DH, EVP_PKEY_OP_PARAMGEN, \
-                        EVP_PKEY_CTRL_DH_PARAMGEN_SUBPRIME_LEN, len, NULL)
-
-# define EVP_PKEY_CTX_set_dh_paramgen_type(ctx, typ) \
-        EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_DH, EVP_PKEY_OP_PARAMGEN, \
-                        EVP_PKEY_CTRL_DH_PARAMGEN_TYPE, typ, NULL)
-
-# define EVP_PKEY_CTX_set_dh_paramgen_generator(ctx, gen) \
-        EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_DH, EVP_PKEY_OP_PARAMGEN, \
-                        EVP_PKEY_CTRL_DH_PARAMGEN_GENERATOR, gen, NULL)
-
-# define EVP_PKEY_CTX_set_dh_rfc5114(ctx, gen) \
-        EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_DHX, EVP_PKEY_OP_PARAMGEN, \
-                        EVP_PKEY_CTRL_DH_RFC5114, gen, NULL)
-
-# define EVP_PKEY_CTX_set_dhx_rfc5114(ctx, gen) \
-        EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_DHX, EVP_PKEY_OP_PARAMGEN, \
-                        EVP_PKEY_CTRL_DH_RFC5114, gen, NULL)
-
-# define EVP_PKEY_CTX_set_dh_kdf_type(ctx, kdf) \
-        EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_DHX, \
-                                EVP_PKEY_OP_DERIVE, \
-                                EVP_PKEY_CTRL_DH_KDF_TYPE, kdf, NULL)
-
-# define EVP_PKEY_CTX_get_dh_kdf_type(ctx) \
-        EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_DHX, \
-                                EVP_PKEY_OP_DERIVE, \
-                                EVP_PKEY_CTRL_DH_KDF_TYPE, -2, NULL)
-
-# define EVP_PKEY_CTX_set0_dh_kdf_oid(ctx, oid) \
-        EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_DHX, \
-                                EVP_PKEY_OP_DERIVE, \
-                                EVP_PKEY_CTRL_DH_KDF_OID, 0, (void *)oid)
-
-# define EVP_PKEY_CTX_get0_dh_kdf_oid(ctx, poid) \
-        EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_DHX, \
-                                EVP_PKEY_OP_DERIVE, \
-                                EVP_PKEY_CTRL_GET_DH_KDF_OID, 0, (void *)poid)
-
-# define EVP_PKEY_CTX_set_dh_kdf_md(ctx, md) \
-        EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_DHX, \
-                                EVP_PKEY_OP_DERIVE, \
-                                EVP_PKEY_CTRL_DH_KDF_MD, 0, (void *)md)
-
-# define EVP_PKEY_CTX_get_dh_kdf_md(ctx, pmd) \
-        EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_DHX, \
-                                EVP_PKEY_OP_DERIVE, \
-                                EVP_PKEY_CTRL_GET_DH_KDF_MD, 0, (void *)pmd)
-
-# define EVP_PKEY_CTX_set_dh_kdf_outlen(ctx, len) \
-        EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_DHX, \
-                                EVP_PKEY_OP_DERIVE, \
-                                EVP_PKEY_CTRL_DH_KDF_OUTLEN, len, NULL)
-
-# define EVP_PKEY_CTX_get_dh_kdf_outlen(ctx, plen) \
-        EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_DHX, \
-                                EVP_PKEY_OP_DERIVE, \
-                        EVP_PKEY_CTRL_GET_DH_KDF_OUTLEN, 0, (void *)plen)
-
-# define EVP_PKEY_CTX_set0_dh_kdf_ukm(ctx, p, plen) \
-        EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_DHX, \
-                                EVP_PKEY_OP_DERIVE, \
-                                EVP_PKEY_CTRL_DH_KDF_UKM, plen, (void *)p)
-
-# define EVP_PKEY_CTX_get0_dh_kdf_ukm(ctx, p) \
-        EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_DHX, \
-                                EVP_PKEY_OP_DERIVE, \
-                                EVP_PKEY_CTRL_GET_DH_KDF_UKM, 0, (void *)p)
-
-# define EVP_PKEY_CTRL_DH_PARAMGEN_PRIME_LEN     (EVP_PKEY_ALG_CTRL + 1)
-# define EVP_PKEY_CTRL_DH_PARAMGEN_GENERATOR     (EVP_PKEY_ALG_CTRL + 2)
-# define EVP_PKEY_CTRL_DH_RFC5114                (EVP_PKEY_ALG_CTRL + 3)
-# define EVP_PKEY_CTRL_DH_PARAMGEN_SUBPRIME_LEN  (EVP_PKEY_ALG_CTRL + 4)
-# define EVP_PKEY_CTRL_DH_PARAMGEN_TYPE          (EVP_PKEY_ALG_CTRL + 5)
-# define EVP_PKEY_CTRL_DH_KDF_TYPE               (EVP_PKEY_ALG_CTRL + 6)
-# define EVP_PKEY_CTRL_DH_KDF_MD                 (EVP_PKEY_ALG_CTRL + 7)
-# define EVP_PKEY_CTRL_GET_DH_KDF_MD             (EVP_PKEY_ALG_CTRL + 8)
-# define EVP_PKEY_CTRL_DH_KDF_OUTLEN             (EVP_PKEY_ALG_CTRL + 9)
-# define EVP_PKEY_CTRL_GET_DH_KDF_OUTLEN         (EVP_PKEY_ALG_CTRL + 10)
-# define EVP_PKEY_CTRL_DH_KDF_UKM                (EVP_PKEY_ALG_CTRL + 11)
-# define EVP_PKEY_CTRL_GET_DH_KDF_UKM            (EVP_PKEY_ALG_CTRL + 12)
-# define EVP_PKEY_CTRL_DH_KDF_OID                (EVP_PKEY_ALG_CTRL + 13)
-# define EVP_PKEY_CTRL_GET_DH_KDF_OID            (EVP_PKEY_ALG_CTRL + 14)
-
-/* KDF types */
-# define EVP_PKEY_DH_KDF_NONE                            1
-# ifndef OPENSSL_NO_CMS
-# define EVP_PKEY_DH_KDF_X9_42                           2
-# endif
-
-/* BEGIN ERROR CODES */
-/*
- * The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
-
-int ERR_load_DH_strings(void);
-
-/* Error codes for the DH functions. */
-
-/* Function codes. */
-# define DH_F_COMPUTE_KEY                                 102
-# define DH_F_DHPARAMS_PRINT_FP                           101
-# define DH_F_DH_BUILTIN_GENPARAMS                        106
-# define DH_F_DH_CMS_DECRYPT                              114
-# define DH_F_DH_CMS_SET_PEERKEY                          115
-# define DH_F_DH_CMS_SET_SHARED_INFO                      116
-# define DH_F_DH_METH_DUP                                 117
-# define DH_F_DH_METH_NEW                                 118
-# define DH_F_DH_METH_SET1_NAME                           119
-# define DH_F_DH_NEW_METHOD                               105
-# define DH_F_DH_PARAM_DECODE                             107
-# define DH_F_DH_PRIV_DECODE                              110
-# define DH_F_DH_PRIV_ENCODE                              111
-# define DH_F_DH_PUB_DECODE                               108
-# define DH_F_DH_PUB_ENCODE                               109
-# define DH_F_DO_DH_PRINT                                 100
-# define DH_F_GENERATE_KEY                                103
-# define DH_F_PKEY_DH_DERIVE                              112
-# define DH_F_PKEY_DH_KEYGEN                              113
-
-/* Reason codes. */
-# define DH_R_BAD_GENERATOR                               101
-# define DH_R_BN_DECODE_ERROR                             109
-# define DH_R_BN_ERROR                                    106
-# define DH_R_DECODE_ERROR                                104
-# define DH_R_INVALID_PUBKEY                              102
-# define DH_R_KDF_PARAMETER_ERROR                         112
-# define DH_R_KEYS_NOT_SET                                108
-# define DH_R_MODULUS_TOO_LARGE                           103
-# define DH_R_NO_PARAMETERS_SET                           107
-# define DH_R_NO_PRIVATE_VALUE                            100
-# define DH_R_PARAMETER_ENCODING_ERROR                    105
-# define DH_R_PEER_KEY_ERROR                              111
-# define DH_R_SHARED_INFO_ERROR                           113
-
-#  ifdef  __cplusplus
-}
-#  endif
-# endif
-#endif

gpac-2.2.1.tar.gz/extra_lib/include/openssl/dsa.h Deleted

@@ -1,283 +0,0 @@
-/*
- * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
- *
- * Licensed under the OpenSSL license (the "License").  You may not use
- * this file except in compliance with the License.  You can obtain a copy
- * in the file LICENSE in the source distribution or at
- * https://www.openssl.org/source/license.html
- */
-
-/*
- * The DSS routines are based on patches supplied by
- * Steven Schoch <schoch@sheba.arc.nasa.gov>.
- */
-
-#ifndef HEADER_DSA_H
-# define HEADER_DSA_H
-
-# include <openssl/opensslconf.h>
-
-# ifndef OPENSSL_NO_DSA
-# ifdef  __cplusplus
-extern "C" {
-# endif
-# include <openssl/e_os2.h>
-# include <openssl/bio.h>
-# include <openssl/crypto.h>
-# include <openssl/ossl_typ.h>
-# include <openssl/opensslconf.h>
-# include <openssl/bn.h>
-# if OPENSSL_API_COMPAT < 0x10100000L
-#  include <openssl/dh.h>
-# endif
-
-# ifndef OPENSSL_DSA_MAX_MODULUS_BITS
-#  define OPENSSL_DSA_MAX_MODULUS_BITS   10000
-# endif
-
-# define OPENSSL_DSA_FIPS_MIN_MODULUS_BITS 1024
-
-# define DSA_FLAG_CACHE_MONT_P   0x01
-# if OPENSSL_API_COMPAT < 0x10100000L
-/*
- * Does nothing. Previously this switched off constant time behaviour.
- */
-#  define DSA_FLAG_NO_EXP_CONSTTIME       0x00
-# endif
-
-/*
- * If this flag is set the DSA method is FIPS compliant and can be used in
- * FIPS mode. This is set in the validated module method. If an application
- * sets this flag in its own methods it is its responsibility to ensure the
- * result is compliant.
- */
-
-# define DSA_FLAG_FIPS_METHOD                    0x0400
-
-/*
- * If this flag is set the operations normally disabled in FIPS mode are
- * permitted it is then the applications responsibility to ensure that the
- * usage is compliant.
- */
-
-# define DSA_FLAG_NON_FIPS_ALLOW                 0x0400
-# define DSA_FLAG_FIPS_CHECKED                   0x0800
-
-/* Already defined in ossl_typ.h */
-/* typedef struct dsa_st DSA; */
-/* typedef struct dsa_method DSA_METHOD; */
-
-typedef struct DSA_SIG_st DSA_SIG;
-
-# define d2i_DSAparams_fp(fp,x) (DSA *)ASN1_d2i_fp((char *(*)())DSA_new, \
-                (char *(*)())d2i_DSAparams,(fp),(unsigned char **)(x))
-# define i2d_DSAparams_fp(fp,x) ASN1_i2d_fp(i2d_DSAparams,(fp), \
-                (unsigned char *)(x))
-# define d2i_DSAparams_bio(bp,x) ASN1_d2i_bio_of(DSA,DSA_new,d2i_DSAparams,bp,x)
-# define i2d_DSAparams_bio(bp,x) ASN1_i2d_bio_of_const(DSA,i2d_DSAparams,bp,x)
-
-DSA *DSAparams_dup(DSA *x);
-DSA_SIG *DSA_SIG_new(void);
-void DSA_SIG_free(DSA_SIG *a);
-int i2d_DSA_SIG(const DSA_SIG *a, unsigned char **pp);
-DSA_SIG *d2i_DSA_SIG(DSA_SIG **v, const unsigned char **pp, long length);
-void DSA_SIG_get0(const DSA_SIG *sig, const BIGNUM **pr, const BIGNUM **ps);
-int DSA_SIG_set0(DSA_SIG *sig, BIGNUM *r, BIGNUM *s);
-
-DSA_SIG *DSA_do_sign(const unsigned char *dgst, int dlen, DSA *dsa);
-int DSA_do_verify(const unsigned char *dgst, int dgst_len,
-                  DSA_SIG *sig, DSA *dsa);
-
-const DSA_METHOD *DSA_OpenSSL(void);
-
-void DSA_set_default_method(const DSA_METHOD *);
-const DSA_METHOD *DSA_get_default_method(void);
-int DSA_set_method(DSA *dsa, const DSA_METHOD *);
-const DSA_METHOD *DSA_get_method(DSA *d);
-
-DSA *DSA_new(void);
-DSA *DSA_new_method(ENGINE *engine);
-void DSA_free(DSA *r);
-/* "up" the DSA object's reference count */
-int DSA_up_ref(DSA *r);
-int DSA_size(const DSA *);
-int DSA_bits(const DSA *d);
-int DSA_security_bits(const DSA *d);
-        /* next 4 return -1 on error */
-int DSA_sign_setup(DSA *dsa, BN_CTX *ctx_in, BIGNUM **kinvp, BIGNUM **rp);
-int DSA_sign(int type, const unsigned char *dgst, int dlen,
-             unsigned char *sig, unsigned int *siglen, DSA *dsa);
-int DSA_verify(int type, const unsigned char *dgst, int dgst_len,
-               const unsigned char *sigbuf, int siglen, DSA *dsa);
-#define DSA_get_ex_new_index(l, p, newf, dupf, freef) \
-    CRYPTO_get_ex_new_index(CRYPTO_EX_INDEX_DSA, l, p, newf, dupf, freef)
-int DSA_set_ex_data(DSA *d, int idx, void *arg);
-void *DSA_get_ex_data(DSA *d, int idx);
-
-DSA *d2i_DSAPublicKey(DSA **a, const unsigned char **pp, long length);
-DSA *d2i_DSAPrivateKey(DSA **a, const unsigned char **pp, long length);
-DSA *d2i_DSAparams(DSA **a, const unsigned char **pp, long length);
-
-/* Deprecated version */
-DEPRECATEDIN_0_9_8(DSA *DSA_generate_parameters(int bits,
-                                                unsigned char *seed,
-                                                int seed_len,
-                                                int *counter_ret,
-                                                unsigned long *h_ret, void
-                                                 (*callback) (int, int,
-                                                              void *),
-                                                void *cb_arg))
-
-/* New version */
-int DSA_generate_parameters_ex(DSA *dsa, int bits,
-                               const unsigned char *seed, int seed_len,
-                               int *counter_ret, unsigned long *h_ret,
-                               BN_GENCB *cb);
-
-int DSA_generate_key(DSA *a);
-int i2d_DSAPublicKey(const DSA *a, unsigned char **pp);
-int i2d_DSAPrivateKey(const DSA *a, unsigned char **pp);
-int i2d_DSAparams(const DSA *a, unsigned char **pp);
-
-int DSAparams_print(BIO *bp, const DSA *x);
-int DSA_print(BIO *bp, const DSA *x, int off);
-# ifndef OPENSSL_NO_STDIO
-int DSAparams_print_fp(FILE *fp, const DSA *x);
-int DSA_print_fp(FILE *bp, const DSA *x, int off);
-# endif
-
-# define DSS_prime_checks 50
-/*
- * Primality test according to FIPS PUB 186-1, Appendix 2.1: 50 rounds of
- * Rabin-Miller
- */
-# define DSA_is_prime(n, callback, cb_arg) \
-        BN_is_prime(n, DSS_prime_checks, callback, NULL, cb_arg)
-
-# ifndef OPENSSL_NO_DH
-/*
- * Convert DSA structure (key or just parameters) into DH structure (be
- * careful to avoid small subgroup attacks when using this!)
- */
-DH *DSA_dup_DH(const DSA *r);
-# endif
-
-# define EVP_PKEY_CTX_set_dsa_paramgen_bits(ctx, nbits) \
-        EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_DSA, EVP_PKEY_OP_PARAMGEN, \
-                                EVP_PKEY_CTRL_DSA_PARAMGEN_BITS, nbits, NULL)
-
-# define EVP_PKEY_CTRL_DSA_PARAMGEN_BITS         (EVP_PKEY_ALG_CTRL + 1)
-# define EVP_PKEY_CTRL_DSA_PARAMGEN_Q_BITS       (EVP_PKEY_ALG_CTRL + 2)
-# define EVP_PKEY_CTRL_DSA_PARAMGEN_MD           (EVP_PKEY_ALG_CTRL + 3)
-
-void DSA_get0_pqg(const DSA *d,
-                  const BIGNUM **p, const BIGNUM **q, const BIGNUM **g);
-int DSA_set0_pqg(DSA *d, BIGNUM *p, BIGNUM *q, BIGNUM *g);
-void DSA_get0_key(const DSA *d,
-                  const BIGNUM **pub_key, const BIGNUM **priv_key);
-int DSA_set0_key(DSA *d, BIGNUM *pub_key, BIGNUM *priv_key);
-void DSA_clear_flags(DSA *d, int flags);
-int DSA_test_flags(const DSA *d, int flags);
-void DSA_set_flags(DSA *d, int flags);
-ENGINE *DSA_get0_engine(DSA *d);
-
-DSA_METHOD *DSA_meth_new(const char *name, int flags);
-void DSA_meth_free(DSA_METHOD *dsam);
-DSA_METHOD *DSA_meth_dup(const DSA_METHOD *dsam);
-const char *DSA_meth_get0_name(const DSA_METHOD *dsam);
-int DSA_meth_set1_name(DSA_METHOD *dsam, const char *name);
-int DSA_meth_get_flags(DSA_METHOD *dsam);
-int DSA_meth_set_flags(DSA_METHOD *dsam, int flags);
-void *DSA_meth_get0_app_data(const DSA_METHOD *dsam);
-int DSA_meth_set0_app_data(DSA_METHOD *dsam, void *app_data);
-DSA_SIG *(*DSA_meth_get_sign(const DSA_METHOD *dsam))
-        (const unsigned char *, int, DSA *);
-int DSA_meth_set_sign(DSA_METHOD *dsam,
-                       DSA_SIG *(*sign) (const unsigned char *, int, DSA *));
-int (*DSA_meth_get_sign_setup(const DSA_METHOD *dsam))
-        (DSA *, BN_CTX *, BIGNUM **, BIGNUM **);
-int DSA_meth_set_sign_setup(DSA_METHOD *dsam,
-        int (*sign_setup) (DSA *, BN_CTX *, BIGNUM **, BIGNUM **));
-int (*DSA_meth_get_verify(const DSA_METHOD *dsam))
-        (const unsigned char *, int , DSA_SIG *, DSA *);
-int DSA_meth_set_verify(DSA_METHOD *dsam,
-    int (*verify) (const unsigned char *, int, DSA_SIG *, DSA *));
-int (*DSA_meth_get_mod_exp(const DSA_METHOD *dsam))
-        (DSA *, BIGNUM *, const BIGNUM *, const BIGNUM *, const BIGNUM *,
-         const BIGNUM *, const BIGNUM *, BN_CTX *, BN_MONT_CTX *);
-int DSA_meth_set_mod_exp(DSA_METHOD *dsam,
-    int (*mod_exp) (DSA *, BIGNUM *, const BIGNUM *, const BIGNUM *,
-                    const BIGNUM *, const BIGNUM *, const BIGNUM *, BN_CTX *,
-                    BN_MONT_CTX *));
-int (*DSA_meth_get_bn_mod_exp(const DSA_METHOD *dsam))
-    (DSA *, BIGNUM *, const BIGNUM *, const BIGNUM *, const BIGNUM *,
-     BN_CTX *, BN_MONT_CTX *);
-int DSA_meth_set_bn_mod_exp(DSA_METHOD *dsam,
-    int (*bn_mod_exp) (DSA *, BIGNUM *, const BIGNUM *, const BIGNUM *,
-                       const BIGNUM *, BN_CTX *, BN_MONT_CTX *));
-int (*DSA_meth_get_init(const DSA_METHOD *dsam))(DSA *);
-int DSA_meth_set_init(DSA_METHOD *dsam, int (*init)(DSA *));
-int (*DSA_meth_get_finish(const DSA_METHOD *dsam)) (DSA *);
-int DSA_meth_set_finish(DSA_METHOD *dsam, int (*finish) (DSA *));
-int (*DSA_meth_get_paramgen(const DSA_METHOD *dsam))
-        (DSA *, int, const unsigned char *, int, int *, unsigned long *,
-         BN_GENCB *);
-int DSA_meth_set_paramgen(DSA_METHOD *dsam,
-        int (*paramgen) (DSA *, int, const unsigned char *, int, int *,
-                         unsigned long *, BN_GENCB *));
-int (*DSA_meth_get_keygen(const DSA_METHOD *dsam)) (DSA *);
-int DSA_meth_set_keygen(DSA_METHOD *dsam, int (*keygen) (DSA *));
-
-/* BEGIN ERROR CODES */
-/*
- * The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
-
-int ERR_load_DSA_strings(void);
-
-/* Error codes for the DSA functions. */
-
-/* Function codes. */
-# define DSA_F_DSAPARAMS_PRINT                            100
-# define DSA_F_DSAPARAMS_PRINT_FP                         101
-# define DSA_F_DSA_BUILTIN_PARAMGEN                       125
-# define DSA_F_DSA_BUILTIN_PARAMGEN2                      126
-# define DSA_F_DSA_DO_SIGN                                112
-# define DSA_F_DSA_DO_VERIFY                              113
-# define DSA_F_DSA_METH_DUP                               127
-# define DSA_F_DSA_METH_NEW                               128
-# define DSA_F_DSA_METH_SET1_NAME                         129
-# define DSA_F_DSA_NEW_METHOD                             103
-# define DSA_F_DSA_PARAM_DECODE                           119
-# define DSA_F_DSA_PRINT_FP                               105
-# define DSA_F_DSA_PRIV_DECODE                            115
-# define DSA_F_DSA_PRIV_ENCODE                            116
-# define DSA_F_DSA_PUB_DECODE                             117
-# define DSA_F_DSA_PUB_ENCODE                             118
-# define DSA_F_DSA_SIGN                                   106
-# define DSA_F_DSA_SIGN_SETUP                             107
-# define DSA_F_DSA_SIG_NEW                                102
-# define DSA_F_OLD_DSA_PRIV_DECODE                        122
-# define DSA_F_PKEY_DSA_CTRL                              120
-# define DSA_F_PKEY_DSA_KEYGEN                            121
-
-/* Reason codes. */
-# define DSA_R_BAD_Q_VALUE                                102
-# define DSA_R_BN_DECODE_ERROR                            108
-# define DSA_R_BN_ERROR                                   109
-# define DSA_R_DECODE_ERROR                               104
-# define DSA_R_INVALID_DIGEST_TYPE                        106
-# define DSA_R_INVALID_PARAMETERS                         112
-# define DSA_R_MISSING_PARAMETERS                         101
-# define DSA_R_MODULUS_TOO_LARGE                          103
-# define DSA_R_NO_PARAMETERS_SET                          107
-# define DSA_R_PARAMETER_ENCODING_ERROR                   105
-# define DSA_R_Q_NOT_PRIME                                113
-# define DSA_R_SEED_LEN_SMALL                             110
-
-#  ifdef  __cplusplus
-}
-#  endif
-# endif
-#endif

gpac-2.2.1.tar.gz/extra_lib/include/openssl/dtls1.h Deleted

@@ -1,56 +0,0 @@
-/*
- * Copyright 2005-2016 The OpenSSL Project Authors. All Rights Reserved.
- *
- * Licensed under the OpenSSL license (the "License").  You may not use
- * this file except in compliance with the License.  You can obtain a copy
- * in the file LICENSE in the source distribution or at
- * https://www.openssl.org/source/license.html
- */
-
-#ifndef HEADER_DTLS1_H
-# define HEADER_DTLS1_H
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-# define DTLS1_VERSION                   0xFEFF
-# define DTLS1_2_VERSION                 0xFEFD
-# define DTLS_MIN_VERSION                DTLS1_VERSION
-# define DTLS_MAX_VERSION                DTLS1_2_VERSION
-# define DTLS1_VERSION_MAJOR             0xFE
-
-# define DTLS1_BAD_VER                   0x0100
-
-/* Special value for method supporting multiple versions */
-# define DTLS_ANY_VERSION                0x1FFFF
-
-/* lengths of messages */
-# define DTLS1_COOKIE_LENGTH                     256
-
-# define DTLS1_RT_HEADER_LENGTH                  13
-
-# define DTLS1_HM_HEADER_LENGTH                  12
-
-# define DTLS1_HM_BAD_FRAGMENT                   -2
-# define DTLS1_HM_FRAGMENT_RETRY                 -3
-
-# define DTLS1_CCS_HEADER_LENGTH                  1
-
-# ifdef DTLS1_AD_MISSING_HANDSHAKE_MESSAGE
-#  define DTLS1_AL_HEADER_LENGTH                   7
-# else
-#  define DTLS1_AL_HEADER_LENGTH                   2
-# endif
-
-
-/* Timeout multipliers (timeout slice is defined in apps/timeouts.h */
-# define DTLS1_TMO_READ_COUNT                      2
-# define DTLS1_TMO_WRITE_COUNT                     2
-
-# define DTLS1_TMO_ALERT_COUNT                     12
-
-#ifdef  __cplusplus
-}
-#endif
-#endif

gpac-2.2.1.tar.gz/extra_lib/include/openssl/e_os2.h Deleted

@@ -1,298 +0,0 @@
-/*
- * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
- *
- * Licensed under the OpenSSL license (the "License").  You may not use
- * this file except in compliance with the License.  You can obtain a copy
- * in the file LICENSE in the source distribution or at
- * https://www.openssl.org/source/license.html
- */
-
-#ifndef HEADER_E_OS2_H
-# define HEADER_E_OS2_H
-
-# include <openssl/opensslconf.h>
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-/******************************************************************************
- * Detect operating systems.  This probably needs completing.
- * The result is that at least one OPENSSL_SYS_os macro should be defined.
- * However, if none is defined, Unix is assumed.
- **/
-
-# define OPENSSL_SYS_UNIX
-
-/* --------------------- Microsoft operating systems ---------------------- */
-
-/*
- * Note that MSDOS actually denotes 32-bit environments running on top of
- * MS-DOS, such as DJGPP one.
- */
-# if defined(OPENSSL_SYS_MSDOS)
-#  undef OPENSSL_SYS_UNIX
-# endif
-
-/*
- * For 32 bit environment, there seems to be the CygWin environment and then
- * all the others that try to do the same thing Microsoft does...
- */
-/*
- * UEFI lives here because it might be built with a Microsoft toolchain and
- * we need to avoid the false positive match on Windows.
- */
-# if defined(OPENSSL_SYS_UEFI)
-#  undef OPENSSL_SYS_UNIX
-# elif defined(OPENSSL_SYS_UWIN)
-#  undef OPENSSL_SYS_UNIX
-#  define OPENSSL_SYS_WIN32_UWIN
-# else
-#  if defined(__CYGWIN__) || defined(OPENSSL_SYS_CYGWIN)
-#   undef OPENSSL_SYS_UNIX
-#   define OPENSSL_SYS_WIN32_CYGWIN
-#  else
-#   if defined(_WIN32) || defined(OPENSSL_SYS_WIN32)
-#    undef OPENSSL_SYS_UNIX
-#    if !defined(OPENSSL_SYS_WIN32)
-#     define OPENSSL_SYS_WIN32
-#    endif
-#   endif
-#   if defined(_WIN64) || defined(OPENSSL_SYS_WIN64)
-#    undef OPENSSL_SYS_UNIX
-#    if !defined(OPENSSL_SYS_WIN64)
-#     define OPENSSL_SYS_WIN64
-#    endif
-#   endif
-#   if defined(OPENSSL_SYS_WINNT)
-#    undef OPENSSL_SYS_UNIX
-#   endif
-#   if defined(OPENSSL_SYS_WINCE)
-#    undef OPENSSL_SYS_UNIX
-#   endif
-#  endif
-# endif
-
-/* Anything that tries to look like Microsoft is "Windows" */
-# if defined(OPENSSL_SYS_WIN32) || defined(OPENSSL_SYS_WIN64) || defined(OPENSSL_SYS_WINNT) || defined(OPENSSL_SYS_WINCE)
-#  undef OPENSSL_SYS_UNIX
-#  define OPENSSL_SYS_WINDOWS
-#  ifndef OPENSSL_SYS_MSDOS
-#   define OPENSSL_SYS_MSDOS
-#  endif
-# endif
-
-/*
- * DLL settings.  This part is a bit tough, because it's up to the
- * application implementor how he or she will link the application, so it
- * requires some macro to be used.
- */
-# ifdef OPENSSL_SYS_WINDOWS
-#  ifndef OPENSSL_OPT_WINDLL
-#   if defined(_WINDLL)         /* This is used when building OpenSSL to
-                                 * indicate that DLL linkage should be used */
-#    define OPENSSL_OPT_WINDLL
-#   endif
-#  endif
-# endif
-
-/* ------------------------------- OpenVMS -------------------------------- */
-# if defined(__VMS) || defined(VMS) || defined(OPENSSL_SYS_VMS)
-#  if !defined(OPENSSL_SYS_VMS)
-#   undef OPENSSL_SYS_UNIX
-#  endif
-#  define OPENSSL_SYS_VMS
-#  if defined(__DECC)
-#   define OPENSSL_SYS_VMS_DECC
-#  elif defined(__DECCXX)
-#   define OPENSSL_SYS_VMS_DECC
-#   define OPENSSL_SYS_VMS_DECCXX
-#  else
-#   define OPENSSL_SYS_VMS_NODECC
-#  endif
-# endif
-
-/* -------------------------------- Unix ---------------------------------- */
-# ifdef OPENSSL_SYS_UNIX
-#  if defined(linux) || defined(__linux__) && !defined(OPENSSL_SYS_LINUX)
-#   define OPENSSL_SYS_LINUX
-#  endif
-#  if defined(_AIX) && !defined(OPENSSL_SYS_AIX)
-#   define OPENSSL_SYS_AIX
-#  endif
-# endif
-
-/* -------------------------------- VOS ----------------------------------- */
-# if defined(__VOS__) && !defined(OPENSSL_SYS_VOS)
-#  define OPENSSL_SYS_VOS
-#  ifdef __HPPA__
-#   define OPENSSL_SYS_VOS_HPPA
-#  endif
-#  ifdef __IA32__
-#   define OPENSSL_SYS_VOS_IA32
-#  endif
-# endif
-
-/**
- * That's it for OS-specific stuff
- *****************************************************************************/
-
-/* Specials for I/O an exit */
-# ifdef OPENSSL_SYS_MSDOS
-#  define OPENSSL_UNISTD_IO <io.h>
-#  define OPENSSL_DECLARE_EXIT extern void exit(int);
-# else
-#  define OPENSSL_UNISTD_IO OPENSSL_UNISTD
-#  define OPENSSL_DECLARE_EXIT  /* declared in unistd.h */
-# endif
-
-/*-
- * Definitions of OPENSSL_GLOBAL and OPENSSL_EXTERN, to define and declare
- * certain global symbols that, with some compilers under VMS, have to be
- * defined and declared explicitly with globaldef and globalref.
- * Definitions of OPENSSL_EXPORT and OPENSSL_IMPORT, to define and declare
- * DLL exports and imports for compilers under Win32.  These are a little
- * more complicated to use.  Basically, for any library that exports some
- * global variables, the following code must be present in the header file
- * that declares them, before OPENSSL_EXTERN is used:
- *
- * #ifdef SOME_BUILD_FLAG_MACRO
- * # undef OPENSSL_EXTERN
- * # define OPENSSL_EXTERN OPENSSL_EXPORT
- * #endif
- *
- * The default is to have OPENSSL_EXPORT, OPENSSL_EXTERN and OPENSSL_GLOBAL
- * have some generally sensible values.
- */
-
-# if defined(OPENSSL_SYS_VMS_NODECC)
-#  define OPENSSL_EXPORT globalref
-#  define OPENSSL_EXTERN globalref
-#  define OPENSSL_GLOBAL globaldef
-# elif defined(OPENSSL_SYS_WINDOWS) && defined(OPENSSL_OPT_WINDLL)
-#  define OPENSSL_EXPORT extern __declspec(dllexport)
-#  define OPENSSL_EXTERN extern __declspec(dllimport)
-#  define OPENSSL_GLOBAL
-# else
-#  define OPENSSL_EXPORT extern
-#  define OPENSSL_EXTERN extern
-#  define OPENSSL_GLOBAL
-# endif
-
-/*-
- * Macros to allow global variables to be reached through function calls when
- * required (if a shared library version requires it, for example.
- * The way it's done allows definitions like this:
- *
- *      // in foobar.c
- *      OPENSSL_IMPLEMENT_GLOBAL(int,foobar,0)
- *      // in foobar.h
- *      OPENSSL_DECLARE_GLOBAL(int,foobar);
- *      #define foobar OPENSSL_GLOBAL_REF(foobar)
- */
-# ifdef OPENSSL_EXPORT_VAR_AS_FUNCTION
-#  define OPENSSL_IMPLEMENT_GLOBAL(type,name,value)                      \
-        type *_shadow_##name(void)                                      \
-        { static type _hide_##name=value; return &_hide_##name; }
-#  define OPENSSL_DECLARE_GLOBAL(type,name) type *_shadow_##name(void)
-#  define OPENSSL_GLOBAL_REF(name) (*(_shadow_##name()))
-# else
-#  define OPENSSL_IMPLEMENT_GLOBAL(type,name,value) OPENSSL_GLOBAL type _shadow_##name=value;
-#  define OPENSSL_DECLARE_GLOBAL(type,name) OPENSSL_EXPORT type _shadow_##name
-#  define OPENSSL_GLOBAL_REF(name) _shadow_##name
-# endif
-
-# ifdef _WIN32
-#  ifdef _WIN64
-#   define ossl_ssize_t __int64
-#   define OSSL_SSIZE_MAX _I64_MAX
-#  else
-#   define ossl_ssize_t int
-#   define OSSL_SSIZE_MAX INT_MAX
-#  endif
-# endif
-
-# if defined(OPENSSL_SYS_UEFI) && !defined(ossl_ssize_t)
-#  define ossl_ssize_t INTN
-#  define OSSL_SSIZE_MAX MAX_INTN
-# endif
-
-# ifndef ossl_ssize_t
-#  define ossl_ssize_t ssize_t
-#  if defined(SSIZE_MAX)
-#   define OSSL_SSIZE_MAX SSIZE_MAX
-#  elif defined(_POSIX_SSIZE_MAX)
-#   define OSSL_SSIZE_MAX _POSIX_SSIZE_MAX
-#  endif
-# endif
-
-# ifdef DEBUG_UNUSED
-#  define __owur __attribute__((__warn_unused_result__))
-# else
-#  define __owur
-# endif
-
-/* Standard integer types */
-# if defined(OPENSSL_SYS_UEFI)
-typedef INT8 int8_t;
-typedef UINT8 uint8_t;
-typedef INT16 int16_t;
-typedef UINT16 uint16_t;
-typedef INT32 int32_t;
-typedef UINT32 uint32_t;
-typedef INT64 int64_t;
-typedef UINT64 uint64_t;
-# elif (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) || \
-     defined(__osf__) || defined(__sgi) || defined(__hpux) || \
-     defined(OPENSSL_SYS_VMS) || defined (__OpenBSD__)
-#  include <inttypes.h>
-# elif defined(_MSC_VER) && _MSC_VER<=1500
-/*
- * minimally required typdefs for systems not supporting inttypes.h or
- * stdint.h: currently just older VC++
- */
-typedef signed char int8_t;
-typedef unsigned char uint8_t;
-typedef short int16_t;
-typedef unsigned short uint16_t;
-typedef int int32_t;
-typedef unsigned int uint32_t;
-typedef __int64 int64_t;
-typedef unsigned __int64 uint64_t;
-# else
-#  include <stdint.h>
-# endif
-
-/* ossl_inline: portable inline definition usable in public headers */
-# if !defined(inline) && !defined(__cplusplus)
-#  if defined(__STDC_VERSION__) && __STDC_VERSION__>=199901L
-   /* just use inline */
-#   define ossl_inline inline
-#  elif defined(__GNUC__) && __GNUC__>=2
-#   define ossl_inline __inline__
-#  elif defined(_MSC_VER)
-  /*
-   * Visual Studio: inline is available in C++ only, however
-   * __inline is available for C, see
-   * http://msdn.microsoft.com/en-us/library/z8y1yy88.aspx
-   */
-#   define ossl_inline __inline
-#  else
-#   define ossl_inline
-#  endif
-# else
-#  define ossl_inline inline
-# endif
-
-# if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L
-#  define ossl_noreturn _Noreturn
-# elif defined(__GNUC__) && __GNUC__ >= 2
-#  define ossl_noreturn __attribute__((noreturn))
-# else
-#  define ossl_noreturn
-# endif
-
-#ifdef  __cplusplus
-}
-#endif
-#endif

gpac-2.2.1.tar.gz/extra_lib/include/openssl/ebcdic.h Deleted

gpac-2.2.1.tar.gz/extra_lib/include/openssl/ec.h Deleted

@@ -1,1576 +0,0 @@
-/*
- * Copyright 2002-2016 The OpenSSL Project Authors. All Rights Reserved.
- *
- * Licensed under the OpenSSL license (the "License").  You may not use
- * this file except in compliance with the License.  You can obtain a copy
- * in the file LICENSE in the source distribution or at
- * https://www.openssl.org/source/license.html
- */
-
-/* ====================================================================
- * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
- *
- * Portions of the attached software ("Contribution") are developed by
- * SUN MICROSYSTEMS, INC., and are contributed to the OpenSSL project.
- *
- * The Contribution is licensed pursuant to the OpenSSL open source
- * license provided above.
- *
- * The elliptic curve binary polynomial software is originally written by
- * Sheueling Chang Shantz and Douglas Stebila of Sun Microsystems Laboratories.
- *
- */
-
-#ifndef HEADER_EC_H
-# define HEADER_EC_H
-
-# include <openssl/opensslconf.h>
-
-# ifndef OPENSSL_NO_EC
-# include <openssl/asn1.h>
-# include <openssl/symhacks.h>
-# if OPENSSL_API_COMPAT < 0x10100000L
-#  include <openssl/bn.h>
-# endif
-# ifdef  __cplusplus
-extern "C" {
-# endif
-
-# ifndef OPENSSL_ECC_MAX_FIELD_BITS
-#  define OPENSSL_ECC_MAX_FIELD_BITS 661
-# endif
-
-/** Enum for the point conversion form as defined in X9.62 (ECDSA)
- *  for the encoding of a elliptic curve point (x,y) */
-typedef enum {
-        /** the point is encoded as z||x, where the octet z specifies
-         *  which solution of the quadratic equation y is  */
-    POINT_CONVERSION_COMPRESSED = 2,
-        /** the point is encoded as z||x||y, where z is the octet 0x04  */
-    POINT_CONVERSION_UNCOMPRESSED = 4,
-        /** the point is encoded as z||x||y, where the octet z specifies
-         *  which solution of the quadratic equation y is  */
-    POINT_CONVERSION_HYBRID = 6
-} point_conversion_form_t;
-
-typedef struct ec_method_st EC_METHOD;
-typedef struct ec_group_st EC_GROUP;
-typedef struct ec_point_st EC_POINT;
-typedef struct ecpk_parameters_st ECPKPARAMETERS;
-typedef struct ec_parameters_st ECPARAMETERS;
-
-/********************************************************************/
-/*               EC_METHODs for curves over GF(p)                   */
-/********************************************************************/
-
-/** Returns the basic GFp ec methods which provides the basis for the
- *  optimized methods.
- *  \return  EC_METHOD object
- */
-const EC_METHOD *EC_GFp_simple_method(void);
-
-/** Returns GFp methods using montgomery multiplication.
- *  \return  EC_METHOD object
- */
-const EC_METHOD *EC_GFp_mont_method(void);
-
-/** Returns GFp methods using optimized methods for NIST recommended curves
- *  \return  EC_METHOD object
- */
-const EC_METHOD *EC_GFp_nist_method(void);
-
-# ifndef OPENSSL_NO_EC_NISTP_64_GCC_128
-/** Returns 64-bit optimized methods for nistp224
- *  \return  EC_METHOD object
- */
-const EC_METHOD *EC_GFp_nistp224_method(void);
-
-/** Returns 64-bit optimized methods for nistp256
- *  \return  EC_METHOD object
- */
-const EC_METHOD *EC_GFp_nistp256_method(void);
-
-/** Returns 64-bit optimized methods for nistp521
- *  \return  EC_METHOD object
- */
-const EC_METHOD *EC_GFp_nistp521_method(void);
-# endif
-
-# ifndef OPENSSL_NO_EC2M
-/********************************************************************/
-/*           EC_METHOD for curves over GF(2^m)                      */
-/********************************************************************/
-
-/** Returns the basic GF2m ec method
- *  \return  EC_METHOD object
- */
-const EC_METHOD *EC_GF2m_simple_method(void);
-
-# endif
-
-/********************************************************************/
-/*                   EC_GROUP functions                             */
-/********************************************************************/
-
-/** Creates a new EC_GROUP object
- *  \param   meth  EC_METHOD to use
- *  \return  newly created EC_GROUP object or NULL in case of an error.
- */
-EC_GROUP *EC_GROUP_new(const EC_METHOD *meth);
-
-/** Frees a EC_GROUP object
- *  \param  group  EC_GROUP object to be freed.
- */
-void EC_GROUP_free(EC_GROUP *group);
-
-/** Clears and frees a EC_GROUP object
- *  \param  group  EC_GROUP object to be cleared and freed.
- */
-void EC_GROUP_clear_free(EC_GROUP *group);
-
-/** Copies EC_GROUP objects. Note: both EC_GROUPs must use the same EC_METHOD.
- *  \param  dst  destination EC_GROUP object
- *  \param  src  source EC_GROUP object
- *  \return 1 on success and 0 if an error occurred.
- */
-int EC_GROUP_copy(EC_GROUP *dst, const EC_GROUP *src);
-
-/** Creates a new EC_GROUP object and copies the copies the content
- *  form src to the newly created EC_KEY object
- *  \param  src  source EC_GROUP object
- *  \return newly created EC_GROUP object or NULL in case of an error.
- */
-EC_GROUP *EC_GROUP_dup(const EC_GROUP *src);
-
-/** Returns the EC_METHOD of the EC_GROUP object.
- *  \param  group  EC_GROUP object
- *  \return EC_METHOD used in this EC_GROUP object.
- */
-const EC_METHOD *EC_GROUP_method_of(const EC_GROUP *group);
-
-/** Returns the field type of the EC_METHOD.
- *  \param  meth  EC_METHOD object
- *  \return NID of the underlying field type OID.
- */
-int EC_METHOD_get_field_type(const EC_METHOD *meth);
-
-/** Sets the generator and it's order/cofactor of a EC_GROUP object.
- *  \param  group      EC_GROUP object
- *  \param  generator  EC_POINT object with the generator.
- *  \param  order      the order of the group generated by the generator.
- *  \param  cofactor   the index of the sub-group generated by the generator
- *                     in the group of all points on the elliptic curve.
- *  \return 1 on success and 0 if an error occurred
- */
-int EC_GROUP_set_generator(EC_GROUP *group, const EC_POINT *generator,
-                           const BIGNUM *order, const BIGNUM *cofactor);
-
-/** Returns the generator of a EC_GROUP object.
- *  \param  group  EC_GROUP object
- *  \return the currently used generator (possibly NULL).
- */
-const EC_POINT *EC_GROUP_get0_generator(const EC_GROUP *group);
-
-/** Returns the montgomery data for order(Generator)
- *  \param  group  EC_GROUP object
- *  \return the currently used montgomery data (possibly NULL).
-*/
-BN_MONT_CTX *EC_GROUP_get_mont_data(const EC_GROUP *group);
-
-/** Gets the order of a EC_GROUP
- *  \param  group  EC_GROUP object
- *  \param  order  BIGNUM to which the order is copied
- *  \param  ctx    unused
- *  \return 1 on success and 0 if an error occurred
- */
-int EC_GROUP_get_order(const EC_GROUP *group, BIGNUM *order, BN_CTX *ctx);
-
-/** Gets the order of an EC_GROUP
- *  \param  group  EC_GROUP object
- *  \return the group order
- */
-const BIGNUM *EC_GROUP_get0_order(const EC_GROUP *group);
-
-/** Gets the number of bits of the order of an EC_GROUP
- *  \param  group  EC_GROUP object
- *  \return number of bits of group order.
- */
-int EC_GROUP_order_bits(const EC_GROUP *group);
-
-/** Gets the cofactor of a EC_GROUP
- *  \param  group     EC_GROUP object
- *  \param  cofactor  BIGNUM to which the cofactor is copied
- *  \param  ctx       unused
- *  \return 1 on success and 0 if an error occurred
- */
-int EC_GROUP_get_cofactor(const EC_GROUP *group, BIGNUM *cofactor,
-                          BN_CTX *ctx);
-
-/** Gets the cofactor of an EC_GROUP
- *  \param  group  EC_GROUP object
- *  \return the group cofactor
- */
-const BIGNUM *EC_GROUP_get0_cofactor(const EC_GROUP *group);
-
-/** Sets the name of a EC_GROUP object
- *  \param  group  EC_GROUP object
- *  \param  nid    NID of the curve name OID
- */
-void EC_GROUP_set_curve_name(EC_GROUP *group, int nid);
-
-/** Returns the curve name of a EC_GROUP object
- *  \param  group  EC_GROUP object
- *  \return NID of the curve name OID or 0 if not set.
- */
-int EC_GROUP_get_curve_name(const EC_GROUP *group);
-
-void EC_GROUP_set_asn1_flag(EC_GROUP *group, int flag);
-int EC_GROUP_get_asn1_flag(const EC_GROUP *group);
-
-void EC_GROUP_set_point_conversion_form(EC_GROUP *group,
-                                        point_conversion_form_t form);
-point_conversion_form_t EC_GROUP_get_point_conversion_form(const EC_GROUP *);
-
-unsigned char *EC_GROUP_get0_seed(const EC_GROUP *x);
-size_t EC_GROUP_get_seed_len(const EC_GROUP *);
-size_t EC_GROUP_set_seed(EC_GROUP *, const unsigned char *, size_t len);
-
-/** Sets the parameter of a ec over GFp defined by y^2 = x^3 + a*x + b
- *  \param  group  EC_GROUP object
- *  \param  p      BIGNUM with the prime number
- *  \param  a      BIGNUM with parameter a of the equation
- *  \param  b      BIGNUM with parameter b of the equation
- *  \param  ctx    BN_CTX object (optional)
- *  \return 1 on success and 0 if an error occurred
- */
-int EC_GROUP_set_curve_GFp(EC_GROUP *group, const BIGNUM *p, const BIGNUM *a,
-                           const BIGNUM *b, BN_CTX *ctx);
-
-/** Gets the parameter of the ec over GFp defined by y^2 = x^3 + a*x + b
- *  \param  group  EC_GROUP object
- *  \param  p      BIGNUM for the prime number
- *  \param  a      BIGNUM for parameter a of the equation
- *  \param  b      BIGNUM for parameter b of the equation
- *  \param  ctx    BN_CTX object (optional)
- *  \return 1 on success and 0 if an error occurred
- */
-int EC_GROUP_get_curve_GFp(const EC_GROUP *group, BIGNUM *p, BIGNUM *a,
-                           BIGNUM *b, BN_CTX *ctx);
-
-# ifndef OPENSSL_NO_EC2M
-/** Sets the parameter of a ec over GF2m defined by y^2 + x*y = x^3 + a*x^2 + b
- *  \param  group  EC_GROUP object
- *  \param  p      BIGNUM with the polynomial defining the underlying field
- *  \param  a      BIGNUM with parameter a of the equation
- *  \param  b      BIGNUM with parameter b of the equation
- *  \param  ctx    BN_CTX object (optional)
- *  \return 1 on success and 0 if an error occurred
- */
-int EC_GROUP_set_curve_GF2m(EC_GROUP *group, const BIGNUM *p, const BIGNUM *a,
-                            const BIGNUM *b, BN_CTX *ctx);
-
-/** Gets the parameter of the ec over GF2m defined by y^2 + x*y = x^3 + a*x^2 + b
- *  \param  group  EC_GROUP object
- *  \param  p      BIGNUM for the polynomial defining the underlying field
- *  \param  a      BIGNUM for parameter a of the equation
- *  \param  b      BIGNUM for parameter b of the equation
- *  \param  ctx    BN_CTX object (optional)
- *  \return 1 on success and 0 if an error occurred
- */
-int EC_GROUP_get_curve_GF2m(const EC_GROUP *group, BIGNUM *p, BIGNUM *a,
-                            BIGNUM *b, BN_CTX *ctx);
-# endif
-/** Returns the number of bits needed to represent a field element
- *  \param  group  EC_GROUP object
- *  \return number of bits needed to represent a field element
- */
-int EC_GROUP_get_degree(const EC_GROUP *group);
-
-/** Checks whether the parameter in the EC_GROUP define a valid ec group
- *  \param  group  EC_GROUP object
- *  \param  ctx    BN_CTX object (optional)
- *  \return 1 if group is a valid ec group and 0 otherwise
- */
-int EC_GROUP_check(const EC_GROUP *group, BN_CTX *ctx);
-
-/** Checks whether the discriminant of the elliptic curve is zero or not
- *  \param  group  EC_GROUP object
- *  \param  ctx    BN_CTX object (optional)
- *  \return 1 if the discriminant is not zero and 0 otherwise
- */
-int EC_GROUP_check_discriminant(const EC_GROUP *group, BN_CTX *ctx);
-
-/** Compares two EC_GROUP objects
- *  \param  a    first EC_GROUP object
- *  \param  b    second EC_GROUP object
- *  \param  ctx  BN_CTX object (optional)
- *  \return 0 if the groups are equal, 1 if not, or -1 on error
- */
-int EC_GROUP_cmp(const EC_GROUP *a, const EC_GROUP *b, BN_CTX *ctx);
-
-/*
- * EC_GROUP_new_GF*() calls EC_GROUP_new() and EC_GROUP_set_GF*() after
- * choosing an appropriate EC_METHOD
- */
-
-/** Creates a new EC_GROUP object with the specified parameters defined
- *  over GFp (defined by the equation y^2 = x^3 + a*x + b)
- *  \param  p    BIGNUM with the prime number
- *  \param  a    BIGNUM with the parameter a of the equation
- *  \param  b    BIGNUM with the parameter b of the equation
- *  \param  ctx  BN_CTX object (optional)
- *  \return newly created EC_GROUP object with the specified parameters
- */
-EC_GROUP *EC_GROUP_new_curve_GFp(const BIGNUM *p, const BIGNUM *a,
-                                 const BIGNUM *b, BN_CTX *ctx);
-# ifndef OPENSSL_NO_EC2M
-/** Creates a new EC_GROUP object with the specified parameters defined
- *  over GF2m (defined by the equation y^2 + x*y = x^3 + a*x^2 + b)
- *  \param  p    BIGNUM with the polynomial defining the underlying field
- *  \param  a    BIGNUM with the parameter a of the equation
- *  \param  b    BIGNUM with the parameter b of the equation
- *  \param  ctx  BN_CTX object (optional)
- *  \return newly created EC_GROUP object with the specified parameters
- */
-EC_GROUP *EC_GROUP_new_curve_GF2m(const BIGNUM *p, const BIGNUM *a,
-                                  const BIGNUM *b, BN_CTX *ctx);
-# endif
-
-/** Creates a EC_GROUP object with a curve specified by a NID
- *  \param  nid  NID of the OID of the curve name
- *  \return newly created EC_GROUP object with specified curve or NULL
- *          if an error occurred
- */
-EC_GROUP *EC_GROUP_new_by_curve_name(int nid);
-
-/** Creates a new EC_GROUP object from an ECPARAMETERS object
- *  \param  params  pointer to the ECPARAMETERS object
- *  \return newly created EC_GROUP object with specified curve or NULL
- *          if an error occurred
- */
-EC_GROUP *EC_GROUP_new_from_ecparameters(const ECPARAMETERS *params);
-
-/** Creates an ECPARAMETERS object for the the given EC_GROUP object.
- *  \param  group   pointer to the EC_GROUP object
- *  \param  params  pointer to an existing ECPARAMETERS object or NULL
- *  \return pointer to the new ECPARAMETERS object or NULL
- *          if an error occurred.
- */
-ECPARAMETERS *EC_GROUP_get_ecparameters(const EC_GROUP *group,
-                                        ECPARAMETERS *params);
-
-/** Creates a new EC_GROUP object from an ECPKPARAMETERS object
- *  \param  params  pointer to an existing ECPKPARAMETERS object, or NULL
- *  \return newly created EC_GROUP object with specified curve, or NULL
- *          if an error occurred
- */
-EC_GROUP *EC_GROUP_new_from_ecpkparameters(const ECPKPARAMETERS *params);
-
-/** Creates an ECPKPARAMETERS object for the the given EC_GROUP object.
- *  \param  group   pointer to the EC_GROUP object
- *  \param  params  pointer to an existing ECPKPARAMETERS object or NULL
- *  \return pointer to the new ECPKPARAMETERS object or NULL
- *          if an error occurred.
- */
-ECPKPARAMETERS *EC_GROUP_get_ecpkparameters(const EC_GROUP *group,
-                                            ECPKPARAMETERS *params);
-
-/********************************************************************/
-/*               handling of internal curves                        */
-/********************************************************************/
-
-typedef struct {
-    int nid;
-    const char *comment;
-} EC_builtin_curve;
-
-/*
- * EC_builtin_curves(EC_builtin_curve *r, size_t size) returns number of all
- * available curves or zero if a error occurred. In case r is not zero,
- * nitems EC_builtin_curve structures are filled with the data of the first
- * nitems internal groups
- */
-size_t EC_get_builtin_curves(EC_builtin_curve *r, size_t nitems);
-
-const char *EC_curve_nid2nist(int nid);
-int EC_curve_nist2nid(const char *name);
-
-/********************************************************************/
-/*                    EC_POINT functions                            */
-/********************************************************************/
-
-/** Creates a new EC_POINT object for the specified EC_GROUP
- *  \param  group  EC_GROUP the underlying EC_GROUP object
- *  \return newly created EC_POINT object or NULL if an error occurred
- */
-EC_POINT *EC_POINT_new(const EC_GROUP *group);
-
-/** Frees a EC_POINT object
- *  \param  point  EC_POINT object to be freed
- */
-void EC_POINT_free(EC_POINT *point);
-
-/** Clears and frees a EC_POINT object
- *  \param  point  EC_POINT object to be cleared and freed
- */
-void EC_POINT_clear_free(EC_POINT *point);
-
-/** Copies EC_POINT object
- *  \param  dst  destination EC_POINT object
- *  \param  src  source EC_POINT object
- *  \return 1 on success and 0 if an error occurred
- */
-int EC_POINT_copy(EC_POINT *dst, const EC_POINT *src);
-
-/** Creates a new EC_POINT object and copies the content of the supplied
- *  EC_POINT
- *  \param  src    source EC_POINT object
- *  \param  group  underlying the EC_GROUP object
- *  \return newly created EC_POINT object or NULL if an error occurred
- */
-EC_POINT *EC_POINT_dup(const EC_POINT *src, const EC_GROUP *group);
-
-/** Returns the EC_METHOD used in EC_POINT object
- *  \param  point  EC_POINT object
- *  \return the EC_METHOD used
- */
-const EC_METHOD *EC_POINT_method_of(const EC_POINT *point);
-
-/** Sets a point to infinity (neutral element)
- *  \param  group  underlying EC_GROUP object
- *  \param  point  EC_POINT to set to infinity
- *  \return 1 on success and 0 if an error occurred
- */
-int EC_POINT_set_to_infinity(const EC_GROUP *group, EC_POINT *point);
-
-/** Sets the jacobian projective coordinates of a EC_POINT over GFp
- *  \param  group  underlying EC_GROUP object
- *  \param  p      EC_POINT object
- *  \param  x      BIGNUM with the x-coordinate
- *  \param  y      BIGNUM with the y-coordinate
- *  \param  z      BIGNUM with the z-coordinate
- *  \param  ctx    BN_CTX object (optional)
- *  \return 1 on success and 0 if an error occurred
- */
-int EC_POINT_set_Jprojective_coordinates_GFp(const EC_GROUP *group,
-                                             EC_POINT *p, const BIGNUM *x,
-                                             const BIGNUM *y, const BIGNUM *z,
-                                             BN_CTX *ctx);
-
-/** Gets the jacobian projective coordinates of a EC_POINT over GFp
- *  \param  group  underlying EC_GROUP object
- *  \param  p      EC_POINT object
- *  \param  x      BIGNUM for the x-coordinate
- *  \param  y      BIGNUM for the y-coordinate
- *  \param  z      BIGNUM for the z-coordinate
- *  \param  ctx    BN_CTX object (optional)
- *  \return 1 on success and 0 if an error occurred
- */
-int EC_POINT_get_Jprojective_coordinates_GFp(const EC_GROUP *group,
-                                             const EC_POINT *p, BIGNUM *x,
-                                             BIGNUM *y, BIGNUM *z,
-                                             BN_CTX *ctx);
-
-/** Sets the affine coordinates of a EC_POINT over GFp
- *  \param  group  underlying EC_GROUP object
- *  \param  p      EC_POINT object
- *  \param  x      BIGNUM with the x-coordinate
- *  \param  y      BIGNUM with the y-coordinate
- *  \param  ctx    BN_CTX object (optional)
- *  \return 1 on success and 0 if an error occurred
- */
-int EC_POINT_set_affine_coordinates_GFp(const EC_GROUP *group, EC_POINT *p,
-                                        const BIGNUM *x, const BIGNUM *y,
-                                        BN_CTX *ctx);
-
-/** Gets the affine coordinates of a EC_POINT over GFp
- *  \param  group  underlying EC_GROUP object
- *  \param  p      EC_POINT object
- *  \param  x      BIGNUM for the x-coordinate
- *  \param  y      BIGNUM for the y-coordinate
- *  \param  ctx    BN_CTX object (optional)
- *  \return 1 on success and 0 if an error occurred
- */
-int EC_POINT_get_affine_coordinates_GFp(const EC_GROUP *group,
-                                        const EC_POINT *p, BIGNUM *x,
-                                        BIGNUM *y, BN_CTX *ctx);
-
-/** Sets the x9.62 compressed coordinates of a EC_POINT over GFp
- *  \param  group  underlying EC_GROUP object
- *  \param  p      EC_POINT object
- *  \param  x      BIGNUM with x-coordinate
- *  \param  y_bit  integer with the y-Bit (either 0 or 1)
- *  \param  ctx    BN_CTX object (optional)
- *  \return 1 on success and 0 if an error occurred
- */
-int EC_POINT_set_compressed_coordinates_GFp(const EC_GROUP *group,
-                                            EC_POINT *p, const BIGNUM *x,
-                                            int y_bit, BN_CTX *ctx);
-# ifndef OPENSSL_NO_EC2M
-/** Sets the affine coordinates of a EC_POINT over GF2m
- *  \param  group  underlying EC_GROUP object
- *  \param  p      EC_POINT object
- *  \param  x      BIGNUM with the x-coordinate
- *  \param  y      BIGNUM with the y-coordinate
- *  \param  ctx    BN_CTX object (optional)
- *  \return 1 on success and 0 if an error occurred
- */
-int EC_POINT_set_affine_coordinates_GF2m(const EC_GROUP *group, EC_POINT *p,
-                                         const BIGNUM *x, const BIGNUM *y,
-                                         BN_CTX *ctx);
-
-/** Gets the affine coordinates of a EC_POINT over GF2m
- *  \param  group  underlying EC_GROUP object
- *  \param  p      EC_POINT object
- *  \param  x      BIGNUM for the x-coordinate
- *  \param  y      BIGNUM for the y-coordinate
- *  \param  ctx    BN_CTX object (optional)
- *  \return 1 on success and 0 if an error occurred
- */
-int EC_POINT_get_affine_coordinates_GF2m(const EC_GROUP *group,
-                                         const EC_POINT *p, BIGNUM *x,
-                                         BIGNUM *y, BN_CTX *ctx);
-
-/** Sets the x9.62 compressed coordinates of a EC_POINT over GF2m
- *  \param  group  underlying EC_GROUP object
- *  \param  p      EC_POINT object
- *  \param  x      BIGNUM with x-coordinate
- *  \param  y_bit  integer with the y-Bit (either 0 or 1)
- *  \param  ctx    BN_CTX object (optional)
- *  \return 1 on success and 0 if an error occurred
- */
-int EC_POINT_set_compressed_coordinates_GF2m(const EC_GROUP *group,
-                                             EC_POINT *p, const BIGNUM *x,
-                                             int y_bit, BN_CTX *ctx);
-# endif
-/** Encodes a EC_POINT object to a octet string
- *  \param  group  underlying EC_GROUP object
- *  \param  p      EC_POINT object
- *  \param  form   point conversion form
- *  \param  buf    memory buffer for the result. If NULL the function returns
- *                 required buffer size.
- *  \param  len    length of the memory buffer
- *  \param  ctx    BN_CTX object (optional)
- *  \return the length of the encoded octet string or 0 if an error occurred
- */
-size_t EC_POINT_point2oct(const EC_GROUP *group, const EC_POINT *p,
-                          point_conversion_form_t form,
-                          unsigned char *buf, size_t len, BN_CTX *ctx);
-
-/** Decodes a EC_POINT from a octet string
- *  \param  group  underlying EC_GROUP object
- *  \param  p      EC_POINT object
- *  \param  buf    memory buffer with the encoded ec point
- *  \param  len    length of the encoded ec point
- *  \param  ctx    BN_CTX object (optional)
- *  \return 1 on success and 0 if an error occurred
- */
-int EC_POINT_oct2point(const EC_GROUP *group, EC_POINT *p,
-                       const unsigned char *buf, size_t len, BN_CTX *ctx);
-
-/** Encodes an EC_POINT object to an allocated octet string
- *  \param  group  underlying EC_GROUP object
- *  \param  point  EC_POINT object
- *  \param  form   point conversion form
- *  \param  pbuf   returns pointer to allocated buffer
- *  \param  ctx    BN_CTX object (optional)
- *  \return the length of the encoded octet string or 0 if an error occurred
- */
-size_t EC_POINT_point2buf(const EC_GROUP *group, const EC_POINT *point,
-                          point_conversion_form_t form,
-                          unsigned char **pbuf, BN_CTX *ctx);
-
-/* other interfaces to point2oct/oct2point: */
-BIGNUM *EC_POINT_point2bn(const EC_GROUP *, const EC_POINT *,
-                          point_conversion_form_t form, BIGNUM *, BN_CTX *);
-EC_POINT *EC_POINT_bn2point(const EC_GROUP *, const BIGNUM *,
-                            EC_POINT *, BN_CTX *);
-char *EC_POINT_point2hex(const EC_GROUP *, const EC_POINT *,
-                         point_conversion_form_t form, BN_CTX *);
-EC_POINT *EC_POINT_hex2point(const EC_GROUP *, const char *,
-                             EC_POINT *, BN_CTX *);
-
-/********************************************************************/
-/*         functions for doing EC_POINT arithmetic                  */
-/********************************************************************/
-
-/** Computes the sum of two EC_POINT
- *  \param  group  underlying EC_GROUP object
- *  \param  r      EC_POINT object for the result (r = a + b)
- *  \param  a      EC_POINT object with the first summand
- *  \param  b      EC_POINT object with the second summand
- *  \param  ctx    BN_CTX object (optional)
- *  \return 1 on success and 0 if an error occurred
- */
-int EC_POINT_add(const EC_GROUP *group, EC_POINT *r, const EC_POINT *a,
-                 const EC_POINT *b, BN_CTX *ctx);
-
-/** Computes the double of a EC_POINT
- *  \param  group  underlying EC_GROUP object
- *  \param  r      EC_POINT object for the result (r = 2 * a)
- *  \param  a      EC_POINT object
- *  \param  ctx    BN_CTX object (optional)
- *  \return 1 on success and 0 if an error occurred
- */
-int EC_POINT_dbl(const EC_GROUP *group, EC_POINT *r, const EC_POINT *a,
-                 BN_CTX *ctx);
-
-/** Computes the inverse of a EC_POINT
- *  \param  group  underlying EC_GROUP object
- *  \param  a      EC_POINT object to be inverted (it's used for the result as well)
- *  \param  ctx    BN_CTX object (optional)
- *  \return 1 on success and 0 if an error occurred
- */
-int EC_POINT_invert(const EC_GROUP *group, EC_POINT *a, BN_CTX *ctx);
-
-/** Checks whether the point is the neutral element of the group
- *  \param  group  the underlying EC_GROUP object
- *  \param  p      EC_POINT object
- *  \return 1 if the point is the neutral element and 0 otherwise
- */
-int EC_POINT_is_at_infinity(const EC_GROUP *group, const EC_POINT *p);
-
-/** Checks whether the point is on the curve
- *  \param  group  underlying EC_GROUP object
- *  \param  point  EC_POINT object to check
- *  \param  ctx    BN_CTX object (optional)
- *  \return 1 if the point is on the curve, 0 if not, or -1 on error
- */
-int EC_POINT_is_on_curve(const EC_GROUP *group, const EC_POINT *point,
-                         BN_CTX *ctx);
-
-/** Compares two EC_POINTs
- *  \param  group  underlying EC_GROUP object
- *  \param  a      first EC_POINT object
- *  \param  b      second EC_POINT object
- *  \param  ctx    BN_CTX object (optional)
- *  \return 1 if the points are not equal, 0 if they are, or -1 on error
- */
-int EC_POINT_cmp(const EC_GROUP *group, const EC_POINT *a, const EC_POINT *b,
-                 BN_CTX *ctx);
-
-int EC_POINT_make_affine(const EC_GROUP *group, EC_POINT *point, BN_CTX *ctx);
-int EC_POINTs_make_affine(const EC_GROUP *group, size_t num,
-                          EC_POINT *points, BN_CTX *ctx);
-
-/** Computes r = generator * n + sum_{i=0}^{num-1} pi * mi
- *  \param  group  underlying EC_GROUP object
- *  \param  r      EC_POINT object for the result
- *  \param  n      BIGNUM with the multiplier for the group generator (optional)
- *  \param  num    number further summands
- *  \param  p      array of size num of EC_POINT objects
- *  \param  m      array of size num of BIGNUM objects
- *  \param  ctx    BN_CTX object (optional)
- *  \return 1 on success and 0 if an error occurred
- */
-int EC_POINTs_mul(const EC_GROUP *group, EC_POINT *r, const BIGNUM *n,
-                  size_t num, const EC_POINT *p, const BIGNUM *m,
-                  BN_CTX *ctx);
-
-/** Computes r = generator * n + q * m
- *  \param  group  underlying EC_GROUP object
- *  \param  r      EC_POINT object for the result
- *  \param  n      BIGNUM with the multiplier for the group generator (optional)
- *  \param  q      EC_POINT object with the first factor of the second summand
- *  \param  m      BIGNUM with the second factor of the second summand
- *  \param  ctx    BN_CTX object (optional)
- *  \return 1 on success and 0 if an error occurred
- */
-int EC_POINT_mul(const EC_GROUP *group, EC_POINT *r, const BIGNUM *n,
-                 const EC_POINT *q, const BIGNUM *m, BN_CTX *ctx);
-
-/** Stores multiples of generator for faster point multiplication
- *  \param  group  EC_GROUP object
- *  \param  ctx    BN_CTX object (optional)
- *  \return 1 on success and 0 if an error occurred
- */
-int EC_GROUP_precompute_mult(EC_GROUP *group, BN_CTX *ctx);
-
-/** Reports whether a precomputation has been done
- *  \param  group  EC_GROUP object
- *  \return 1 if a pre-computation has been done and 0 otherwise
- */
-int EC_GROUP_have_precompute_mult(const EC_GROUP *group);
-
-/********************************************************************/
-/*                       ASN1 stuff                                 */
-/********************************************************************/
-
-DECLARE_ASN1_ITEM(ECPKPARAMETERS)
-DECLARE_ASN1_ALLOC_FUNCTIONS(ECPKPARAMETERS)
-DECLARE_ASN1_ITEM(ECPARAMETERS)
-DECLARE_ASN1_ALLOC_FUNCTIONS(ECPARAMETERS)
-
-/*
- * EC_GROUP_get_basis_type() returns the NID of the basis type used to
- * represent the field elements
- */
-int EC_GROUP_get_basis_type(const EC_GROUP *);
-# ifndef OPENSSL_NO_EC2M
-int EC_GROUP_get_trinomial_basis(const EC_GROUP *, unsigned int *k);
-int EC_GROUP_get_pentanomial_basis(const EC_GROUP *, unsigned int *k1,
-                                   unsigned int *k2, unsigned int *k3);
-# endif
-
-# define OPENSSL_EC_EXPLICIT_CURVE  0x000
-# define OPENSSL_EC_NAMED_CURVE     0x001
-
-EC_GROUP *d2i_ECPKParameters(EC_GROUP **, const unsigned char **in, long len);
-int i2d_ECPKParameters(const EC_GROUP *, unsigned char **out);
-
-# define d2i_ECPKParameters_bio(bp,x) ASN1_d2i_bio_of(EC_GROUP,NULL,d2i_ECPKParameters,bp,x)
-# define i2d_ECPKParameters_bio(bp,x) ASN1_i2d_bio_of_const(EC_GROUP,i2d_ECPKParameters,bp,x)
-# define d2i_ECPKParameters_fp(fp,x) (EC_GROUP *)ASN1_d2i_fp(NULL, \
-                (char *(*)())d2i_ECPKParameters,(fp),(unsigned char **)(x))
-# define i2d_ECPKParameters_fp(fp,x) ASN1_i2d_fp(i2d_ECPKParameters,(fp), \
-                (unsigned char *)(x))
-
-int ECPKParameters_print(BIO *bp, const EC_GROUP *x, int off);
-# ifndef OPENSSL_NO_STDIO
-int ECPKParameters_print_fp(FILE *fp, const EC_GROUP *x, int off);
-# endif
-
-/********************************************************************/
-/*                      EC_KEY functions                            */
-/********************************************************************/
-
-/* some values for the encoding_flag */
-# define EC_PKEY_NO_PARAMETERS   0x001
-# define EC_PKEY_NO_PUBKEY       0x002
-
-/* some values for the flags field */
-# define EC_FLAG_NON_FIPS_ALLOW  0x1
-# define EC_FLAG_FIPS_CHECKED    0x2
-# define EC_FLAG_COFACTOR_ECDH   0x1000
-
-/** Creates a new EC_KEY object.
- *  \return EC_KEY object or NULL if an error occurred.
- */
-EC_KEY *EC_KEY_new(void);
-
-int EC_KEY_get_flags(const EC_KEY *key);
-
-void EC_KEY_set_flags(EC_KEY *key, int flags);
-
-void EC_KEY_clear_flags(EC_KEY *key, int flags);
-
-/** Creates a new EC_KEY object using a named curve as underlying
- *  EC_GROUP object.
- *  \param  nid  NID of the named curve.
- *  \return EC_KEY object or NULL if an error occurred.
- */
-EC_KEY *EC_KEY_new_by_curve_name(int nid);
-
-/** Frees a EC_KEY object.
- *  \param  key  EC_KEY object to be freed.
- */
-void EC_KEY_free(EC_KEY *key);
-
-/** Copies a EC_KEY object.
- *  \param  dst  destination EC_KEY object
- *  \param  src  src EC_KEY object
- *  \return dst or NULL if an error occurred.
- */
-EC_KEY *EC_KEY_copy(EC_KEY *dst, const EC_KEY *src);
-
-/** Creates a new EC_KEY object and copies the content from src to it.
- *  \param  src  the source EC_KEY object
- *  \return newly created EC_KEY object or NULL if an error occurred.
- */
-EC_KEY *EC_KEY_dup(const EC_KEY *src);
-
-/** Increases the internal reference count of a EC_KEY object.
- *  \param  key  EC_KEY object
- *  \return 1 on success and 0 if an error occurred.
- */
-int EC_KEY_up_ref(EC_KEY *key);
-
-/** Returns the EC_GROUP object of a EC_KEY object
- *  \param  key  EC_KEY object
- *  \return the EC_GROUP object (possibly NULL).
- */
-const EC_GROUP *EC_KEY_get0_group(const EC_KEY *key);
-
-/** Sets the EC_GROUP of a EC_KEY object.
- *  \param  key    EC_KEY object
- *  \param  group  EC_GROUP to use in the EC_KEY object (note: the EC_KEY
- *                 object will use an own copy of the EC_GROUP).
- *  \return 1 on success and 0 if an error occurred.
- */
-int EC_KEY_set_group(EC_KEY *key, const EC_GROUP *group);
-
-/** Returns the private key of a EC_KEY object.
- *  \param  key  EC_KEY object
- *  \return a BIGNUM with the private key (possibly NULL).
- */
-const BIGNUM *EC_KEY_get0_private_key(const EC_KEY *key);
-
-/** Sets the private key of a EC_KEY object.
- *  \param  key  EC_KEY object
- *  \param  prv  BIGNUM with the private key (note: the EC_KEY object
- *               will use an own copy of the BIGNUM).
- *  \return 1 on success and 0 if an error occurred.
- */
-int EC_KEY_set_private_key(EC_KEY *key, const BIGNUM *prv);
-
-/** Returns the public key of a EC_KEY object.
- *  \param  key  the EC_KEY object
- *  \return a EC_POINT object with the public key (possibly NULL)
- */
-const EC_POINT *EC_KEY_get0_public_key(const EC_KEY *key);
-
-/** Sets the public key of a EC_KEY object.
- *  \param  key  EC_KEY object
- *  \param  pub  EC_POINT object with the public key (note: the EC_KEY object
- *               will use an own copy of the EC_POINT object).
- *  \return 1 on success and 0 if an error occurred.
- */
-int EC_KEY_set_public_key(EC_KEY *key, const EC_POINT *pub);
-
-unsigned EC_KEY_get_enc_flags(const EC_KEY *key);
-void EC_KEY_set_enc_flags(EC_KEY *eckey, unsigned int flags);
-point_conversion_form_t EC_KEY_get_conv_form(const EC_KEY *key);
-void EC_KEY_set_conv_form(EC_KEY *eckey, point_conversion_form_t cform);
-
-#define EC_KEY_get_ex_new_index(l, p, newf, dupf, freef) \
-    CRYPTO_get_ex_new_index(CRYPTO_EX_INDEX_EC_KEY, l, p, newf, dupf, freef)
-int EC_KEY_set_ex_data(EC_KEY *key, int idx, void *arg);
-void *EC_KEY_get_ex_data(const EC_KEY *key, int idx);
-
-/* wrapper functions for the underlying EC_GROUP object */
-void EC_KEY_set_asn1_flag(EC_KEY *eckey, int asn1_flag);
-
-/** Creates a table of pre-computed multiples of the generator to
- *  accelerate further EC_KEY operations.
- *  \param  key  EC_KEY object
- *  \param  ctx  BN_CTX object (optional)
- *  \return 1 on success and 0 if an error occurred.
- */
-int EC_KEY_precompute_mult(EC_KEY *key, BN_CTX *ctx);
-
-/** Creates a new ec private (and optional a new public) key.
- *  \param  key  EC_KEY object
- *  \return 1 on success and 0 if an error occurred.
- */
-int EC_KEY_generate_key(EC_KEY *key);
-
-/** Verifies that a private and/or public key is valid.
- *  \param  key  the EC_KEY object
- *  \return 1 on success and 0 otherwise.
- */
-int EC_KEY_check_key(const EC_KEY *key);
-
-/** Indicates if an EC_KEY can be used for signing.
- *  \param  eckey  the EC_KEY object
- *  \return 1 if can can sign and 0 otherwise.
- */
-int EC_KEY_can_sign(const EC_KEY *eckey);
-
-/** Sets a public key from affine coordinates performing
- *  necessary NIST PKV tests.
- *  \param  key  the EC_KEY object
- *  \param  x    public key x coordinate
- *  \param  y    public key y coordinate
- *  \return 1 on success and 0 otherwise.
- */
-int EC_KEY_set_public_key_affine_coordinates(EC_KEY *key, BIGNUM *x,
-                                             BIGNUM *y);
-
-/** Encodes an EC_KEY public key to an allocated octet string
- *  \param  key    key to encode
- *  \param  form   point conversion form
- *  \param  pbuf   returns pointer to allocated buffer
- *  \param  ctx    BN_CTX object (optional)
- *  \return the length of the encoded octet string or 0 if an error occurred
- */
-size_t EC_KEY_key2buf(const EC_KEY *key, point_conversion_form_t form,
-                      unsigned char **pbuf, BN_CTX *ctx);
-
-/** Decodes a EC_KEY public key from a octet string
- *  \param  key    key to decode
- *  \param  buf    memory buffer with the encoded ec point
- *  \param  len    length of the encoded ec point
- *  \param  ctx    BN_CTX object (optional)
- *  \return 1 on success and 0 if an error occurred
- */
-
-int EC_KEY_oct2key(EC_KEY *key, const unsigned char *buf, size_t len,
-                   BN_CTX *ctx);
-
-/** Decodes an EC_KEY private key from an octet string
- *  \param  key    key to decode
- *  \param  buf    memory buffer with the encoded private key
- *  \param  len    length of the encoded key
- *  \return 1 on success and 0 if an error occurred
- */
-
-int EC_KEY_oct2priv(EC_KEY *key, const unsigned char *buf, size_t len);
-
-/** Encodes a EC_KEY private key to an octet string
- *  \param  key    key to encode
- *  \param  buf    memory buffer for the result. If NULL the function returns
- *                 required buffer size.
- *  \param  len    length of the memory buffer
- *  \return the length of the encoded octet string or 0 if an error occurred
- */
-
-size_t EC_KEY_priv2oct(const EC_KEY *key, unsigned char *buf, size_t len);
-
-/** Encodes an EC_KEY private key to an allocated octet string
- *  \param  eckey  key to encode
- *  \param  pbuf   returns pointer to allocated buffer
- *  \return the length of the encoded octet string or 0 if an error occurred
- */
-size_t EC_KEY_priv2buf(const EC_KEY *eckey, unsigned char **pbuf);
-
-/********************************************************************/
-/*        de- and encoding functions for SEC1 ECPrivateKey          */
-/********************************************************************/
-
-/** Decodes a private key from a memory buffer.
- *  \param  key  a pointer to a EC_KEY object which should be used (or NULL)
- *  \param  in   pointer to memory with the DER encoded private key
- *  \param  len  length of the DER encoded private key
- *  \return the decoded private key or NULL if an error occurred.
- */
-EC_KEY *d2i_ECPrivateKey(EC_KEY **key, const unsigned char **in, long len);
-
-/** Encodes a private key object and stores the result in a buffer.
- *  \param  key  the EC_KEY object to encode
- *  \param  out  the buffer for the result (if NULL the function returns number
- *               of bytes needed).
- *  \return 1 on success and 0 if an error occurred.
- */
-int i2d_ECPrivateKey(EC_KEY *key, unsigned char **out);
-
-/********************************************************************/
-/*        de- and encoding functions for EC parameters              */
-/********************************************************************/
-
-/** Decodes ec parameter from a memory buffer.
- *  \param  key  a pointer to a EC_KEY object which should be used (or NULL)
- *  \param  in   pointer to memory with the DER encoded ec parameters
- *  \param  len  length of the DER encoded ec parameters
- *  \return a EC_KEY object with the decoded parameters or NULL if an error
- *          occurred.
- */
-EC_KEY *d2i_ECParameters(EC_KEY **key, const unsigned char **in, long len);
-
-/** Encodes ec parameter and stores the result in a buffer.
- *  \param  key  the EC_KEY object with ec parameters to encode
- *  \param  out  the buffer for the result (if NULL the function returns number
- *               of bytes needed).
- *  \return 1 on success and 0 if an error occurred.
- */
-int i2d_ECParameters(EC_KEY *key, unsigned char **out);
-
-/********************************************************************/
-/*         de- and encoding functions for EC public key             */
-/*         (octet string, not DER -- hence 'o2i' and 'i2o')         */
-/********************************************************************/
-
-/** Decodes a ec public key from a octet string.
- *  \param  key  a pointer to a EC_KEY object which should be used
- *  \param  in   memory buffer with the encoded public key
- *  \param  len  length of the encoded public key
- *  \return EC_KEY object with decoded public key or NULL if an error
- *          occurred.
- */
-EC_KEY *o2i_ECPublicKey(EC_KEY **key, const unsigned char **in, long len);
-
-/** Encodes a ec public key in an octet string.
- *  \param  key  the EC_KEY object with the public key
- *  \param  out  the buffer for the result (if NULL the function returns number
- *               of bytes needed).
- *  \return 1 on success and 0 if an error occurred
- */
-int i2o_ECPublicKey(const EC_KEY *key, unsigned char **out);
-
-/** Prints out the ec parameters on human readable form.
- *  \param  bp   BIO object to which the information is printed
- *  \param  key  EC_KEY object
- *  \return 1 on success and 0 if an error occurred
- */
-int ECParameters_print(BIO *bp, const EC_KEY *key);
-
-/** Prints out the contents of a EC_KEY object
- *  \param  bp   BIO object to which the information is printed
- *  \param  key  EC_KEY object
- *  \param  off  line offset
- *  \return 1 on success and 0 if an error occurred
- */
-int EC_KEY_print(BIO *bp, const EC_KEY *key, int off);
-
-# ifndef OPENSSL_NO_STDIO
-/** Prints out the ec parameters on human readable form.
- *  \param  fp   file descriptor to which the information is printed
- *  \param  key  EC_KEY object
- *  \return 1 on success and 0 if an error occurred
- */
-int ECParameters_print_fp(FILE *fp, const EC_KEY *key);
-
-/** Prints out the contents of a EC_KEY object
- *  \param  fp   file descriptor to which the information is printed
- *  \param  key  EC_KEY object
- *  \param  off  line offset
- *  \return 1 on success and 0 if an error occurred
- */
-int EC_KEY_print_fp(FILE *fp, const EC_KEY *key, int off);
-
-# endif
-
-const EC_KEY_METHOD *EC_KEY_OpenSSL(void);
-const EC_KEY_METHOD *EC_KEY_get_default_method(void);
-void EC_KEY_set_default_method(const EC_KEY_METHOD *meth);
-const EC_KEY_METHOD *EC_KEY_get_method(const EC_KEY *key);
-int EC_KEY_set_method(EC_KEY *key, const EC_KEY_METHOD *meth);
-EC_KEY *EC_KEY_new_method(ENGINE *engine);
-
-int ECDH_KDF_X9_62(unsigned char *out, size_t outlen,
-                   const unsigned char *Z, size_t Zlen,
-                   const unsigned char *sinfo, size_t sinfolen,
-                   const EVP_MD *md);
-
-int ECDH_compute_key(void *out, size_t outlen, const EC_POINT *pub_key,
-                     const EC_KEY *ecdh,
-                     void *(*KDF) (const void *in, size_t inlen,
-                                   void *out, size_t *outlen));
-
-typedef struct ECDSA_SIG_st ECDSA_SIG;
-
-/** Allocates and initialize a ECDSA_SIG structure
- *  \return pointer to a ECDSA_SIG structure or NULL if an error occurred
- */
-ECDSA_SIG *ECDSA_SIG_new(void);
-
-/** frees a ECDSA_SIG structure
- *  \param  sig  pointer to the ECDSA_SIG structure
- */
-void ECDSA_SIG_free(ECDSA_SIG *sig);
-
-/** DER encode content of ECDSA_SIG object (note: this function modifies *pp
- *  (*pp += length of the DER encoded signature)).
- *  \param  sig  pointer to the ECDSA_SIG object
- *  \param  pp   pointer to a unsigned char pointer for the output or NULL
- *  \return the length of the DER encoded ECDSA_SIG object or 0
- */
-int i2d_ECDSA_SIG(const ECDSA_SIG *sig, unsigned char **pp);
-
-/** Decodes a DER encoded ECDSA signature (note: this function changes *pp
- *  (*pp += len)).
- *  \param  sig  pointer to ECDSA_SIG pointer (may be NULL)
- *  \param  pp   memory buffer with the DER encoded signature
- *  \param  len  length of the buffer
- *  \return pointer to the decoded ECDSA_SIG structure (or NULL)
- */
-ECDSA_SIG *d2i_ECDSA_SIG(ECDSA_SIG **sig, const unsigned char **pp, long len);
-
-/** Accessor for r and s fields of ECDSA_SIG
- *  \param  sig  pointer to ECDSA_SIG pointer
- *  \param  pr   pointer to BIGNUM pointer for r (may be NULL)
- *  \param  ps   pointer to BIGNUM pointer for s (may be NULL)
- */
-void ECDSA_SIG_get0(const ECDSA_SIG *sig, const BIGNUM **pr, const BIGNUM **ps);
-
-/** Setter for r and s fields of ECDSA_SIG
- *  \param  sig  pointer to ECDSA_SIG pointer
- *  \param  r    pointer to BIGNUM for r (may be NULL)
- *  \param  s    pointer to BIGNUM for s (may be NULL)
- */
-int ECDSA_SIG_set0(ECDSA_SIG *sig, BIGNUM *r, BIGNUM *s);
-
-/** Computes the ECDSA signature of the given hash value using
- *  the supplied private key and returns the created signature.
- *  \param  dgst      pointer to the hash value
- *  \param  dgst_len  length of the hash value
- *  \param  eckey     EC_KEY object containing a private EC key
- *  \return pointer to a ECDSA_SIG structure or NULL if an error occurred
- */
-ECDSA_SIG *ECDSA_do_sign(const unsigned char *dgst, int dgst_len,
-                         EC_KEY *eckey);
-
-/** Computes ECDSA signature of a given hash value using the supplied
- *  private key (note: sig must point to ECDSA_size(eckey) bytes of memory).
- *  \param  dgst     pointer to the hash value to sign
- *  \param  dgstlen  length of the hash value
- *  \param  kinv     BIGNUM with a pre-computed inverse k (optional)
- *  \param  rp       BIGNUM with a pre-computed rp value (optional),
- *                   see ECDSA_sign_setup
- *  \param  eckey    EC_KEY object containing a private EC key
- *  \return pointer to a ECDSA_SIG structure or NULL if an error occurred
- */
-ECDSA_SIG *ECDSA_do_sign_ex(const unsigned char *dgst, int dgstlen,
-                            const BIGNUM *kinv, const BIGNUM *rp,
-                            EC_KEY *eckey);
-
-/** Verifies that the supplied signature is a valid ECDSA
- *  signature of the supplied hash value using the supplied public key.
- *  \param  dgst      pointer to the hash value
- *  \param  dgst_len  length of the hash value
- *  \param  sig       ECDSA_SIG structure
- *  \param  eckey     EC_KEY object containing a public EC key
- *  \return 1 if the signature is valid, 0 if the signature is invalid
- *          and -1 on error
- */
-int ECDSA_do_verify(const unsigned char *dgst, int dgst_len,
-                    const ECDSA_SIG *sig, EC_KEY *eckey);
-
-/** Precompute parts of the signing operation
- *  \param  eckey  EC_KEY object containing a private EC key
- *  \param  ctx    BN_CTX object (optional)
- *  \param  kinv   BIGNUM pointer for the inverse of k
- *  \param  rp     BIGNUM pointer for x coordinate of k * generator
- *  \return 1 on success and 0 otherwise
- */
-int ECDSA_sign_setup(EC_KEY *eckey, BN_CTX *ctx, BIGNUM **kinv, BIGNUM **rp);
-
-/** Computes ECDSA signature of a given hash value using the supplied
- *  private key (note: sig must point to ECDSA_size(eckey) bytes of memory).
- *  \param  type     this parameter is ignored
- *  \param  dgst     pointer to the hash value to sign
- *  \param  dgstlen  length of the hash value
- *  \param  sig      memory for the DER encoded created signature
- *  \param  siglen   pointer to the length of the returned signature
- *  \param  eckey    EC_KEY object containing a private EC key
- *  \return 1 on success and 0 otherwise
- */
-int ECDSA_sign(int type, const unsigned char *dgst, int dgstlen,
-               unsigned char *sig, unsigned int *siglen, EC_KEY *eckey);
-
-/** Computes ECDSA signature of a given hash value using the supplied
- *  private key (note: sig must point to ECDSA_size(eckey) bytes of memory).
- *  \param  type     this parameter is ignored
- *  \param  dgst     pointer to the hash value to sign
- *  \param  dgstlen  length of the hash value
- *  \param  sig      buffer to hold the DER encoded signature
- *  \param  siglen   pointer to the length of the returned signature
- *  \param  kinv     BIGNUM with a pre-computed inverse k (optional)
- *  \param  rp       BIGNUM with a pre-computed rp value (optional),
- *                   see ECDSA_sign_setup
- *  \param  eckey    EC_KEY object containing a private EC key
- *  \return 1 on success and 0 otherwise
- */
-int ECDSA_sign_ex(int type, const unsigned char *dgst, int dgstlen,
-                  unsigned char *sig, unsigned int *siglen,
-                  const BIGNUM *kinv, const BIGNUM *rp, EC_KEY *eckey);
-
-/** Verifies that the given signature is valid ECDSA signature
- *  of the supplied hash value using the specified public key.
- *  \param  type     this parameter is ignored
- *  \param  dgst     pointer to the hash value
- *  \param  dgstlen  length of the hash value
- *  \param  sig      pointer to the DER encoded signature
- *  \param  siglen   length of the DER encoded signature
- *  \param  eckey    EC_KEY object containing a public EC key
- *  \return 1 if the signature is valid, 0 if the signature is invalid
- *          and -1 on error
- */
-int ECDSA_verify(int type, const unsigned char *dgst, int dgstlen,
-                 const unsigned char *sig, int siglen, EC_KEY *eckey);
-
-/** Returns the maximum length of the DER encoded signature
- *  \param  eckey  EC_KEY object
- *  \return numbers of bytes required for the DER encoded signature
- */
-int ECDSA_size(const EC_KEY *eckey);
-
-/********************************************************************/
-/*  EC_KEY_METHOD constructors, destructors, writers and accessors  */
-/********************************************************************/
-
-EC_KEY_METHOD *EC_KEY_METHOD_new(const EC_KEY_METHOD *meth);
-void EC_KEY_METHOD_free(EC_KEY_METHOD *meth);
-void EC_KEY_METHOD_set_init(EC_KEY_METHOD *meth,
-                            int (*init)(EC_KEY *key),
-                            void (*finish)(EC_KEY *key),
-                            int (*copy)(EC_KEY *dest, const EC_KEY *src),
-                            int (*set_group)(EC_KEY *key, const EC_GROUP *grp),
-                            int (*set_private)(EC_KEY *key,
-                                               const BIGNUM *priv_key),
-                            int (*set_public)(EC_KEY *key,
-                                              const EC_POINT *pub_key));
-
-void EC_KEY_METHOD_set_keygen(EC_KEY_METHOD *meth,
-                              int (*keygen)(EC_KEY *key));
-
-void EC_KEY_METHOD_set_compute_key(EC_KEY_METHOD *meth,
-                                   int (*ckey)(unsigned char **psec,
-                                               size_t *pseclen,
-                                               const EC_POINT *pub_key,
-                                               const EC_KEY *ecdh));
-
-void EC_KEY_METHOD_set_sign(EC_KEY_METHOD *meth,
-                            int (*sign)(int type, const unsigned char *dgst,
-                                        int dlen, unsigned char *sig,
-                                        unsigned int *siglen,
-                                        const BIGNUM *kinv, const BIGNUM *r,
-                                        EC_KEY *eckey),
-                            int (*sign_setup)(EC_KEY *eckey, BN_CTX *ctx_in,
-                                              BIGNUM **kinvp, BIGNUM **rp),
-                            ECDSA_SIG *(*sign_sig)(const unsigned char *dgst,
-                                                   int dgst_len,
-                                                   const BIGNUM *in_kinv,
-                                                   const BIGNUM *in_r,
-                                                   EC_KEY *eckey));
-
-void EC_KEY_METHOD_set_verify(EC_KEY_METHOD *meth,
-                              int (*verify)(int type, const unsigned
-                                            char *dgst, int dgst_len,
-                                            const unsigned char *sigbuf,
-                                            int sig_len, EC_KEY *eckey),
-                              int (*verify_sig)(const unsigned char *dgst,
-                                                int dgst_len,
-                                                const ECDSA_SIG *sig,
-                                                EC_KEY *eckey));
-
-void EC_KEY_METHOD_get_init(EC_KEY_METHOD *meth,
-                            int (**pinit)(EC_KEY *key),
-                            void (**pfinish)(EC_KEY *key),
-                            int (**pcopy)(EC_KEY *dest, const EC_KEY *src),
-                            int (**pset_group)(EC_KEY *key,
-                                               const EC_GROUP *grp),
-                            int (**pset_private)(EC_KEY *key,
-                                                 const BIGNUM *priv_key),
-                            int (**pset_public)(EC_KEY *key,
-                                                const EC_POINT *pub_key));
-
-void EC_KEY_METHOD_get_keygen(EC_KEY_METHOD *meth,
-                              int (**pkeygen)(EC_KEY *key));
-
-void EC_KEY_METHOD_get_compute_key(EC_KEY_METHOD *meth,
-                                   int (**pck)(unsigned char **psec,
-                                               size_t *pseclen,
-                                               const EC_POINT *pub_key,
-                                               const EC_KEY *ecdh));
-
-void EC_KEY_METHOD_get_sign(EC_KEY_METHOD *meth,
-                            int (**psign)(int type, const unsigned char *dgst,
-                                          int dlen, unsigned char *sig,
-                                          unsigned int *siglen,
-                                          const BIGNUM *kinv, const BIGNUM *r,
-                                          EC_KEY *eckey),
-                            int (**psign_setup)(EC_KEY *eckey, BN_CTX *ctx_in,
-                                                BIGNUM **kinvp, BIGNUM **rp),
-                            ECDSA_SIG *(**psign_sig)(const unsigned char *dgst,
-                                                     int dgst_len,
-                                                     const BIGNUM *in_kinv,
-                                                     const BIGNUM *in_r,
-                                                     EC_KEY *eckey));
-
-void EC_KEY_METHOD_get_verify(EC_KEY_METHOD *meth,
-                              int (**pverify)(int type, const unsigned
-                                              char *dgst, int dgst_len,
-                                              const unsigned char *sigbuf,
-                                              int sig_len, EC_KEY *eckey),
-                              int (**pverify_sig)(const unsigned char *dgst,
-                                                  int dgst_len,
-                                                  const ECDSA_SIG *sig,
-                                                  EC_KEY *eckey));
-
-# define ECParameters_dup(x) ASN1_dup_of(EC_KEY,i2d_ECParameters,d2i_ECParameters,x)
-
-# ifndef __cplusplus
-#  if defined(__SUNPRO_C)
-#   if __SUNPRO_C >= 0x520
-#    pragma error_messages (default,E_ARRAY_OF_INCOMPLETE_NONAME,E_ARRAY_OF_INCOMPLETE)
-#   endif
-#  endif
-# endif
-
-# define EVP_PKEY_CTX_set_ec_paramgen_curve_nid(ctx, nid) \
-        EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_EC, \
-                                EVP_PKEY_OP_PARAMGEN|EVP_PKEY_OP_KEYGEN, \
-                                EVP_PKEY_CTRL_EC_PARAMGEN_CURVE_NID, nid, NULL)
-
-# define EVP_PKEY_CTX_set_ec_param_enc(ctx, flag) \
-        EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_EC, \
-                                EVP_PKEY_OP_PARAMGEN|EVP_PKEY_OP_KEYGEN, \
-                                EVP_PKEY_CTRL_EC_PARAM_ENC, flag, NULL)
-
-# define EVP_PKEY_CTX_set_ecdh_cofactor_mode(ctx, flag) \
-        EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_EC, \
-                                EVP_PKEY_OP_DERIVE, \
-                                EVP_PKEY_CTRL_EC_ECDH_COFACTOR, flag, NULL)
-
-# define EVP_PKEY_CTX_get_ecdh_cofactor_mode(ctx) \
-        EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_EC, \
-                                EVP_PKEY_OP_DERIVE, \
-                                EVP_PKEY_CTRL_EC_ECDH_COFACTOR, -2, NULL)
-
-# define EVP_PKEY_CTX_set_ecdh_kdf_type(ctx, kdf) \
-        EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_EC, \
-                                EVP_PKEY_OP_DERIVE, \
-                                EVP_PKEY_CTRL_EC_KDF_TYPE, kdf, NULL)
-
-# define EVP_PKEY_CTX_get_ecdh_kdf_type(ctx) \
-        EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_EC, \
-                                EVP_PKEY_OP_DERIVE, \
-                                EVP_PKEY_CTRL_EC_KDF_TYPE, -2, NULL)
-
-# define EVP_PKEY_CTX_set_ecdh_kdf_md(ctx, md) \
-        EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_EC, \
-                                EVP_PKEY_OP_DERIVE, \
-                                EVP_PKEY_CTRL_EC_KDF_MD, 0, (void *)md)
-
-# define EVP_PKEY_CTX_get_ecdh_kdf_md(ctx, pmd) \
-        EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_EC, \
-                                EVP_PKEY_OP_DERIVE, \
-                                EVP_PKEY_CTRL_GET_EC_KDF_MD, 0, (void *)pmd)
-
-# define EVP_PKEY_CTX_set_ecdh_kdf_outlen(ctx, len) \
-        EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_EC, \
-                                EVP_PKEY_OP_DERIVE, \
-                                EVP_PKEY_CTRL_EC_KDF_OUTLEN, len, NULL)
-
-# define EVP_PKEY_CTX_get_ecdh_kdf_outlen(ctx, plen) \
-        EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_EC, \
-                                EVP_PKEY_OP_DERIVE, \
-                        EVP_PKEY_CTRL_GET_EC_KDF_OUTLEN, 0, (void *)plen)
-
-# define EVP_PKEY_CTX_set0_ecdh_kdf_ukm(ctx, p, plen) \
-        EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_EC, \
-                                EVP_PKEY_OP_DERIVE, \
-                                EVP_PKEY_CTRL_EC_KDF_UKM, plen, (void *)p)
-
-# define EVP_PKEY_CTX_get0_ecdh_kdf_ukm(ctx, p) \
-        EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_EC, \
-                                EVP_PKEY_OP_DERIVE, \
-                                EVP_PKEY_CTRL_GET_EC_KDF_UKM, 0, (void *)p)
-
-# define EVP_PKEY_CTRL_EC_PARAMGEN_CURVE_NID             (EVP_PKEY_ALG_CTRL + 1)
-# define EVP_PKEY_CTRL_EC_PARAM_ENC                      (EVP_PKEY_ALG_CTRL + 2)
-# define EVP_PKEY_CTRL_EC_ECDH_COFACTOR                  (EVP_PKEY_ALG_CTRL + 3)
-# define EVP_PKEY_CTRL_EC_KDF_TYPE                       (EVP_PKEY_ALG_CTRL + 4)
-# define EVP_PKEY_CTRL_EC_KDF_MD                         (EVP_PKEY_ALG_CTRL + 5)
-# define EVP_PKEY_CTRL_GET_EC_KDF_MD                     (EVP_PKEY_ALG_CTRL + 6)
-# define EVP_PKEY_CTRL_EC_KDF_OUTLEN                     (EVP_PKEY_ALG_CTRL + 7)
-# define EVP_PKEY_CTRL_GET_EC_KDF_OUTLEN                 (EVP_PKEY_ALG_CTRL + 8)
-# define EVP_PKEY_CTRL_EC_KDF_UKM                        (EVP_PKEY_ALG_CTRL + 9)
-# define EVP_PKEY_CTRL_GET_EC_KDF_UKM                    (EVP_PKEY_ALG_CTRL + 10)
-/* KDF types */
-# define EVP_PKEY_ECDH_KDF_NONE                          1
-# define EVP_PKEY_ECDH_KDF_X9_62                         2
-
-/* BEGIN ERROR CODES */
-/*
- * The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
-
-int ERR_load_EC_strings(void);
-
-/* Error codes for the EC functions. */
-
-/* Function codes. */
-# define EC_F_BN_TO_FELEM                                 224
-# define EC_F_D2I_ECPARAMETERS                            144
-# define EC_F_D2I_ECPKPARAMETERS                          145
-# define EC_F_D2I_ECPRIVATEKEY                            146
-# define EC_F_DO_EC_KEY_PRINT                             221
-# define EC_F_ECDH_CMS_DECRYPT                            238
-# define EC_F_ECDH_CMS_SET_SHARED_INFO                    239
-# define EC_F_ECDH_COMPUTE_KEY                            246
-# define EC_F_ECDH_SIMPLE_COMPUTE_KEY                     257
-# define EC_F_ECDSA_DO_SIGN_EX                            251
-# define EC_F_ECDSA_DO_VERIFY                             252
-# define EC_F_ECDSA_SIGN_EX                               254
-# define EC_F_ECDSA_SIGN_SETUP                            248
-# define EC_F_ECDSA_SIG_NEW                               265
-# define EC_F_ECDSA_VERIFY                                253
-# define EC_F_ECKEY_PARAM2TYPE                            223
-# define EC_F_ECKEY_PARAM_DECODE                          212
-# define EC_F_ECKEY_PRIV_DECODE                           213
-# define EC_F_ECKEY_PRIV_ENCODE                           214
-# define EC_F_ECKEY_PUB_DECODE                            215
-# define EC_F_ECKEY_PUB_ENCODE                            216
-# define EC_F_ECKEY_TYPE2PARAM                            220
-# define EC_F_ECPARAMETERS_PRINT                          147
-# define EC_F_ECPARAMETERS_PRINT_FP                       148
-# define EC_F_ECPKPARAMETERS_PRINT                        149
-# define EC_F_ECPKPARAMETERS_PRINT_FP                     150
-# define EC_F_ECP_NISTZ256_GET_AFFINE                     240
-# define EC_F_ECP_NISTZ256_MULT_PRECOMPUTE                243
-# define EC_F_ECP_NISTZ256_POINTS_MUL                     241
-# define EC_F_ECP_NISTZ256_PRE_COMP_NEW                   244
-# define EC_F_ECP_NISTZ256_WINDOWED_MUL                   242
-# define EC_F_ECX_KEY_OP                                  266
-# define EC_F_ECX_PRIV_ENCODE                             267
-# define EC_F_ECX_PUB_ENCODE                              268
-# define EC_F_EC_ASN1_GROUP2CURVE                         153
-# define EC_F_EC_ASN1_GROUP2FIELDID                       154
-# define EC_F_EC_GF2M_MONTGOMERY_POINT_MULTIPLY           208
-# define EC_F_EC_GF2M_SIMPLE_GROUP_CHECK_DISCRIMINANT     159
-# define EC_F_EC_GF2M_SIMPLE_GROUP_SET_CURVE              195
-# define EC_F_EC_GF2M_SIMPLE_OCT2POINT                    160
-# define EC_F_EC_GF2M_SIMPLE_POINT2OCT                    161
-# define EC_F_EC_GF2M_SIMPLE_POINT_GET_AFFINE_COORDINATES 162
-# define EC_F_EC_GF2M_SIMPLE_POINT_SET_AFFINE_COORDINATES 163
-# define EC_F_EC_GF2M_SIMPLE_SET_COMPRESSED_COORDINATES   164
-# define EC_F_EC_GFP_MONT_FIELD_DECODE                    133
-# define EC_F_EC_GFP_MONT_FIELD_ENCODE                    134
-# define EC_F_EC_GFP_MONT_FIELD_MUL                       131
-# define EC_F_EC_GFP_MONT_FIELD_SET_TO_ONE                209
-# define EC_F_EC_GFP_MONT_FIELD_SQR                       132
-# define EC_F_EC_GFP_MONT_GROUP_SET_CURVE                 189
-# define EC_F_EC_GFP_NISTP224_GROUP_SET_CURVE             225
-# define EC_F_EC_GFP_NISTP224_POINTS_MUL                  228
-# define EC_F_EC_GFP_NISTP224_POINT_GET_AFFINE_COORDINATES 226
-# define EC_F_EC_GFP_NISTP256_GROUP_SET_CURVE             230
-# define EC_F_EC_GFP_NISTP256_POINTS_MUL                  231
-# define EC_F_EC_GFP_NISTP256_POINT_GET_AFFINE_COORDINATES 232
-# define EC_F_EC_GFP_NISTP521_GROUP_SET_CURVE             233
-# define EC_F_EC_GFP_NISTP521_POINTS_MUL                  234
-# define EC_F_EC_GFP_NISTP521_POINT_GET_AFFINE_COORDINATES 235
-# define EC_F_EC_GFP_NIST_FIELD_MUL                       200
-# define EC_F_EC_GFP_NIST_FIELD_SQR                       201
-# define EC_F_EC_GFP_NIST_GROUP_SET_CURVE                 202
-# define EC_F_EC_GFP_SIMPLE_GROUP_CHECK_DISCRIMINANT      165
-# define EC_F_EC_GFP_SIMPLE_GROUP_SET_CURVE               166
-# define EC_F_EC_GFP_SIMPLE_MAKE_AFFINE                   102
-# define EC_F_EC_GFP_SIMPLE_OCT2POINT                     103
-# define EC_F_EC_GFP_SIMPLE_POINT2OCT                     104
-# define EC_F_EC_GFP_SIMPLE_POINTS_MAKE_AFFINE            137
-# define EC_F_EC_GFP_SIMPLE_POINT_GET_AFFINE_COORDINATES  167
-# define EC_F_EC_GFP_SIMPLE_POINT_SET_AFFINE_COORDINATES  168
-# define EC_F_EC_GFP_SIMPLE_SET_COMPRESSED_COORDINATES    169
-# define EC_F_EC_GROUP_CHECK                              170
-# define EC_F_EC_GROUP_CHECK_DISCRIMINANT                 171
-# define EC_F_EC_GROUP_COPY                               106
-# define EC_F_EC_GROUP_GET_CURVE_GF2M                     172
-# define EC_F_EC_GROUP_GET_CURVE_GFP                      130
-# define EC_F_EC_GROUP_GET_DEGREE                         173
-# define EC_F_EC_GROUP_GET_ECPARAMETERS                   261
-# define EC_F_EC_GROUP_GET_ECPKPARAMETERS                 262
-# define EC_F_EC_GROUP_GET_PENTANOMIAL_BASIS              193
-# define EC_F_EC_GROUP_GET_TRINOMIAL_BASIS                194
-# define EC_F_EC_GROUP_NEW                                108
-# define EC_F_EC_GROUP_NEW_BY_CURVE_NAME                  174
-# define EC_F_EC_GROUP_NEW_FROM_DATA                      175
-# define EC_F_EC_GROUP_NEW_FROM_ECPARAMETERS              263
-# define EC_F_EC_GROUP_NEW_FROM_ECPKPARAMETERS            264
-# define EC_F_EC_GROUP_SET_CURVE_GF2M                     176
-# define EC_F_EC_GROUP_SET_CURVE_GFP                      109
-# define EC_F_EC_GROUP_SET_GENERATOR                      111
-# define EC_F_EC_KEY_CHECK_KEY                            177
-# define EC_F_EC_KEY_COPY                                 178
-# define EC_F_EC_KEY_GENERATE_KEY                         179
-# define EC_F_EC_KEY_NEW                                  182
-# define EC_F_EC_KEY_NEW_METHOD                           245
-# define EC_F_EC_KEY_OCT2PRIV                             255
-# define EC_F_EC_KEY_PRINT                                180
-# define EC_F_EC_KEY_PRINT_FP                             181
-# define EC_F_EC_KEY_PRIV2OCT                             256
-# define EC_F_EC_KEY_SET_PUBLIC_KEY_AFFINE_COORDINATES    229
-# define EC_F_EC_KEY_SIMPLE_CHECK_KEY                     258
-# define EC_F_EC_KEY_SIMPLE_OCT2PRIV                      259
-# define EC_F_EC_KEY_SIMPLE_PRIV2OCT                      260
-# define EC_F_EC_POINTS_MAKE_AFFINE                       136
-# define EC_F_EC_POINT_ADD                                112
-# define EC_F_EC_POINT_CMP                                113
-# define EC_F_EC_POINT_COPY                               114
-# define EC_F_EC_POINT_DBL                                115
-# define EC_F_EC_POINT_GET_AFFINE_COORDINATES_GF2M        183
-# define EC_F_EC_POINT_GET_AFFINE_COORDINATES_GFP         116
-# define EC_F_EC_POINT_GET_JPROJECTIVE_COORDINATES_GFP    117
-# define EC_F_EC_POINT_INVERT                             210
-# define EC_F_EC_POINT_IS_AT_INFINITY                     118
-# define EC_F_EC_POINT_IS_ON_CURVE                        119
-# define EC_F_EC_POINT_MAKE_AFFINE                        120
-# define EC_F_EC_POINT_NEW                                121
-# define EC_F_EC_POINT_OCT2POINT                          122
-# define EC_F_EC_POINT_POINT2OCT                          123
-# define EC_F_EC_POINT_SET_AFFINE_COORDINATES_GF2M        185
-# define EC_F_EC_POINT_SET_AFFINE_COORDINATES_GFP         124
-# define EC_F_EC_POINT_SET_COMPRESSED_COORDINATES_GF2M    186
-# define EC_F_EC_POINT_SET_COMPRESSED_COORDINATES_GFP     125
-# define EC_F_EC_POINT_SET_JPROJECTIVE_COORDINATES_GFP    126
-# define EC_F_EC_POINT_SET_TO_INFINITY                    127
-# define EC_F_EC_PRE_COMP_NEW                             196
-# define EC_F_EC_WNAF_MUL                                 187
-# define EC_F_EC_WNAF_PRECOMPUTE_MULT                     188
-# define EC_F_I2D_ECPARAMETERS                            190
-# define EC_F_I2D_ECPKPARAMETERS                          191
-# define EC_F_I2D_ECPRIVATEKEY                            192
-# define EC_F_I2O_ECPUBLICKEY                             151
-# define EC_F_NISTP224_PRE_COMP_NEW                       227
-# define EC_F_NISTP256_PRE_COMP_NEW                       236
-# define EC_F_NISTP521_PRE_COMP_NEW                       237
-# define EC_F_O2I_ECPUBLICKEY                             152
-# define EC_F_OLD_EC_PRIV_DECODE                          222
-# define EC_F_OSSL_ECDH_COMPUTE_KEY                       247
-# define EC_F_OSSL_ECDSA_SIGN_SIG                         249
-# define EC_F_OSSL_ECDSA_VERIFY_SIG                       250
-# define EC_F_PKEY_ECX_DERIVE                             269
-# define EC_F_PKEY_EC_CTRL                                197
-# define EC_F_PKEY_EC_CTRL_STR                            198
-# define EC_F_PKEY_EC_DERIVE                              217
-# define EC_F_PKEY_EC_KEYGEN                              199
-# define EC_F_PKEY_EC_PARAMGEN                            219
-# define EC_F_PKEY_EC_SIGN                                218
-
-/* Reason codes. */
-# define EC_R_ASN1_ERROR                                  115
-# define EC_R_BAD_SIGNATURE                               156
-# define EC_R_BIGNUM_OUT_OF_RANGE                         144
-# define EC_R_BUFFER_TOO_SMALL                            100
-# define EC_R_COORDINATES_OUT_OF_RANGE                    146
-# define EC_R_CURVE_DOES_NOT_SUPPORT_ECDH                 160
-# define EC_R_CURVE_DOES_NOT_SUPPORT_SIGNING              159
-# define EC_R_D2I_ECPKPARAMETERS_FAILURE                  117
-# define EC_R_DECODE_ERROR                                142
-# define EC_R_DISCRIMINANT_IS_ZERO                        118
-# define EC_R_EC_GROUP_NEW_BY_NAME_FAILURE                119
-# define EC_R_FIELD_TOO_LARGE                             143
-# define EC_R_GF2M_NOT_SUPPORTED                          147
-# define EC_R_GROUP2PKPARAMETERS_FAILURE                  120
-# define EC_R_I2D_ECPKPARAMETERS_FAILURE                  121
-# define EC_R_INCOMPATIBLE_OBJECTS                        101
-# define EC_R_INVALID_ARGUMENT                            112
-# define EC_R_INVALID_COMPRESSED_POINT                    110
-# define EC_R_INVALID_COMPRESSION_BIT                     109
-# define EC_R_INVALID_CURVE                               141
-# define EC_R_INVALID_DIGEST                              151
-# define EC_R_INVALID_DIGEST_TYPE                         138
-# define EC_R_INVALID_ENCODING                            102
-# define EC_R_INVALID_FIELD                               103
-# define EC_R_INVALID_FORM                                104
-# define EC_R_INVALID_GROUP_ORDER                         122
-# define EC_R_INVALID_KEY                                 116
-# define EC_R_INVALID_OUTPUT_LENGTH                       161
-# define EC_R_INVALID_PEER_KEY                            133
-# define EC_R_INVALID_PENTANOMIAL_BASIS                   132
-# define EC_R_INVALID_PRIVATE_KEY                         123
-# define EC_R_INVALID_TRINOMIAL_BASIS                     137
-# define EC_R_KDF_PARAMETER_ERROR                         148
-# define EC_R_KEYS_NOT_SET                                140
-# define EC_R_MISSING_PARAMETERS                          124
-# define EC_R_MISSING_PRIVATE_KEY                         125
-# define EC_R_NEED_NEW_SETUP_VALUES                       157
-# define EC_R_NOT_A_NIST_PRIME                            135
-# define EC_R_NOT_IMPLEMENTED                             126
-# define EC_R_NOT_INITIALIZED                             111
-# define EC_R_NO_PARAMETERS_SET                           139
-# define EC_R_NO_PRIVATE_VALUE                            154
-# define EC_R_OPERATION_NOT_SUPPORTED                     152
-# define EC_R_PASSED_NULL_PARAMETER                       134
-# define EC_R_PEER_KEY_ERROR                              149
-# define EC_R_PKPARAMETERS2GROUP_FAILURE                  127
-# define EC_R_POINT_ARITHMETIC_FAILURE                    155
-# define EC_R_POINT_AT_INFINITY                           106
-# define EC_R_POINT_IS_NOT_ON_CURVE                       107
-# define EC_R_RANDOM_NUMBER_GENERATION_FAILED             158
-# define EC_R_SHARED_INFO_ERROR                           150
-# define EC_R_SLOT_FULL                                   108
-# define EC_R_UNDEFINED_GENERATOR                         113
-# define EC_R_UNDEFINED_ORDER                             128
-# define EC_R_UNKNOWN_GROUP                               129
-# define EC_R_UNKNOWN_ORDER                               114
-# define EC_R_UNSUPPORTED_FIELD                           131
-# define EC_R_WRONG_CURVE_PARAMETERS                      145
-# define EC_R_WRONG_ORDER                                 130
-
-#  ifdef  __cplusplus
-}
-#  endif
-# endif
-#endif

gpac-2.2.1.tar.gz/extra_lib/include/openssl/ecdh.h Deleted

gpac-2.2.1.tar.gz/extra_lib/include/openssl/ecdsa.h Deleted

gpac-2.2.1.tar.gz/extra_lib/include/openssl/engine.h Deleted

@@ -1,840 +0,0 @@
-/*
- * Copyright 2000-2016 The OpenSSL Project Authors. All Rights Reserved.
- *
- * Licensed under the OpenSSL license (the "License").  You may not use
- * this file except in compliance with the License.  You can obtain a copy
- * in the file LICENSE in the source distribution or at
- * https://www.openssl.org/source/license.html
- */
-
-/* ====================================================================
- * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
- * ECDH support in OpenSSL originally developed by
- * SUN MICROSYSTEMS, INC., and contributed to the OpenSSL project.
- */
-
-#ifndef HEADER_ENGINE_H
-# define HEADER_ENGINE_H
-
-# include <openssl/opensslconf.h>
-
-# ifndef OPENSSL_NO_ENGINE
-# if OPENSSL_API_COMPAT < 0x10100000L
-#  include <openssl/bn.h>
-#  include <openssl/rsa.h>
-#  include <openssl/dsa.h>
-#  include <openssl/dh.h>
-#  include <openssl/ec.h>
-#  include <openssl/rand.h>
-#  include <openssl/ui.h>
-#  include <openssl/err.h>
-# endif
-# include <openssl/ossl_typ.h>
-# include <openssl/symhacks.h>
-# include <openssl/x509.h>
-# ifdef  __cplusplus
-extern "C" {
-# endif
-
-/*
- * These flags are used to control combinations of algorithm (methods) by
- * bitwise "OR"ing.
- */
-# define ENGINE_METHOD_RSA               (unsigned int)0x0001
-# define ENGINE_METHOD_DSA               (unsigned int)0x0002
-# define ENGINE_METHOD_DH                (unsigned int)0x0004
-# define ENGINE_METHOD_RAND              (unsigned int)0x0008
-# define ENGINE_METHOD_CIPHERS           (unsigned int)0x0040
-# define ENGINE_METHOD_DIGESTS           (unsigned int)0x0080
-# define ENGINE_METHOD_PKEY_METHS        (unsigned int)0x0200
-# define ENGINE_METHOD_PKEY_ASN1_METHS   (unsigned int)0x0400
-# define ENGINE_METHOD_EC                (unsigned int)0x0800
-/* Obvious all-or-nothing cases. */
-# define ENGINE_METHOD_ALL               (unsigned int)0xFFFF
-# define ENGINE_METHOD_NONE              (unsigned int)0x0000
-
-/*
- * This(ese) flag(s) controls behaviour of the ENGINE_TABLE mechanism used
- * internally to control registration of ENGINE implementations, and can be
- * set by ENGINE_set_table_flags(). The "NOINIT" flag prevents attempts to
- * initialise registered ENGINEs if they are not already initialised.
- */
-# define ENGINE_TABLE_FLAG_NOINIT        (unsigned int)0x0001
-
-/* ENGINE flags that can be set by ENGINE_set_flags(). */
-/* Not used */
-/* #define ENGINE_FLAGS_MALLOCED        0x0001 */
-
-/*
- * This flag is for ENGINEs that wish to handle the various 'CMD'-related
- * control commands on their own. Without this flag, ENGINE_ctrl() handles
- * these control commands on behalf of the ENGINE using their "cmd_defns"
- * data.
- */
-# define ENGINE_FLAGS_MANUAL_CMD_CTRL    (int)0x0002
-
-/*
- * This flag is for ENGINEs who return new duplicate structures when found
- * via "ENGINE_by_id()". When an ENGINE must store state (eg. if
- * ENGINE_ctrl() commands are called in sequence as part of some stateful
- * process like key-generation setup and execution), it can set this flag -
- * then each attempt to obtain the ENGINE will result in it being copied into
- * a new structure. Normally, ENGINEs don't declare this flag so
- * ENGINE_by_id() just increments the existing ENGINE's structural reference
- * count.
- */
-# define ENGINE_FLAGS_BY_ID_COPY         (int)0x0004
-
-/*
- * This flag if for an ENGINE that does not want its methods registered as
- * part of ENGINE_register_all_complete() for example if the methods are not
- * usable as default methods.
- */
-
-# define ENGINE_FLAGS_NO_REGISTER_ALL    (int)0x0008
-
-/*
- * ENGINEs can support their own command types, and these flags are used in
- * ENGINE_CTRL_GET_CMD_FLAGS to indicate to the caller what kind of input
- * each command expects. Currently only numeric and string input is
- * supported. If a control command supports none of the _NUMERIC, _STRING, or
- * _NO_INPUT options, then it is regarded as an "internal" control command -
- * and not for use in config setting situations. As such, they're not
- * available to the ENGINE_ctrl_cmd_string() function, only raw ENGINE_ctrl()
- * access. Changes to this list of 'command types' should be reflected
- * carefully in ENGINE_cmd_is_executable() and ENGINE_ctrl_cmd_string().
- */
-
-/* accepts a 'long' input value (3rd parameter to ENGINE_ctrl) */
-# define ENGINE_CMD_FLAG_NUMERIC         (unsigned int)0x0001
-/*
- * accepts string input (cast from 'void*' to 'const char *', 4th parameter
- * to ENGINE_ctrl)
- */
-# define ENGINE_CMD_FLAG_STRING          (unsigned int)0x0002
-/*
- * Indicates that the control command takes *no* input. Ie. the control
- * command is unparameterised.
- */
-# define ENGINE_CMD_FLAG_NO_INPUT        (unsigned int)0x0004
-/*
- * Indicates that the control command is internal. This control command won't
- * be shown in any output, and is only usable through the ENGINE_ctrl_cmd()
- * function.
- */
-# define ENGINE_CMD_FLAG_INTERNAL        (unsigned int)0x0008
-
-/*
- * NB: These 3 control commands are deprecated and should not be used.
- * ENGINEs relying on these commands should compile conditional support for
- * compatibility (eg. if these symbols are defined) but should also migrate
- * the same functionality to their own ENGINE-specific control functions that
- * can be "discovered" by calling applications. The fact these control
- * commands wouldn't be "executable" (ie. usable by text-based config)
- * doesn't change the fact that application code can find and use them
- * without requiring per-ENGINE hacking.
- */
-
-/*
- * These flags are used to tell the ctrl function what should be done. All
- * command numbers are shared between all engines, even if some don't make
- * sense to some engines.  In such a case, they do nothing but return the
- * error ENGINE_R_CTRL_COMMAND_NOT_IMPLEMENTED.
- */
-# define ENGINE_CTRL_SET_LOGSTREAM               1
-# define ENGINE_CTRL_SET_PASSWORD_CALLBACK       2
-# define ENGINE_CTRL_HUP                         3/* Close and reinitialise
-                                                   * any handles/connections
-                                                   * etc. */
-# define ENGINE_CTRL_SET_USER_INTERFACE          4/* Alternative to callback */
-# define ENGINE_CTRL_SET_CALLBACK_DATA           5/* User-specific data, used
-                                                   * when calling the password
-                                                   * callback and the user
-                                                   * interface */
-# define ENGINE_CTRL_LOAD_CONFIGURATION          6/* Load a configuration,
-                                                   * given a string that
-                                                   * represents a file name
-                                                   * or so */
-# define ENGINE_CTRL_LOAD_SECTION                7/* Load data from a given
-                                                   * section in the already
-                                                   * loaded configuration */
-
-/*
- * These control commands allow an application to deal with an arbitrary
- * engine in a dynamic way. Warn: Negative return values indicate errors FOR
- * THESE COMMANDS because zero is used to indicate 'end-of-list'. Other
- * commands, including ENGINE-specific command types, return zero for an
- * error. An ENGINE can choose to implement these ctrl functions, and can
- * internally manage things however it chooses - it does so by setting the
- * ENGINE_FLAGS_MANUAL_CMD_CTRL flag (using ENGINE_set_flags()). Otherwise
- * the ENGINE_ctrl() code handles this on the ENGINE's behalf using the
- * cmd_defns data (set using ENGINE_set_cmd_defns()). This means an ENGINE's
- * ctrl() handler need only implement its own commands - the above "meta"
- * commands will be taken care of.
- */
-
-/*
- * Returns non-zero if the supplied ENGINE has a ctrl() handler. If "not",
- * then all the remaining control commands will return failure, so it is
- * worth checking this first if the caller is trying to "discover" the
- * engine's capabilities and doesn't want errors generated unnecessarily.
- */
-# define ENGINE_CTRL_HAS_CTRL_FUNCTION           10
-/*
- * Returns a positive command number for the first command supported by the
- * engine. Returns zero if no ctrl commands are supported.
- */
-# define ENGINE_CTRL_GET_FIRST_CMD_TYPE          11
-/*
- * The 'long' argument specifies a command implemented by the engine, and the
- * return value is the next command supported, or zero if there are no more.
- */
-# define ENGINE_CTRL_GET_NEXT_CMD_TYPE           12
-/*
- * The 'void*' argument is a command name (cast from 'const char *'), and the
- * return value is the command that corresponds to it.
- */
-# define ENGINE_CTRL_GET_CMD_FROM_NAME           13
-/*
- * The next two allow a command to be converted into its corresponding string
- * form. In each case, the 'long' argument supplies the command. In the
- * NAME_LEN case, the return value is the length of the command name (not
- * counting a trailing EOL). In the NAME case, the 'void*' argument must be a
- * string buffer large enough, and it will be populated with the name of the
- * command (WITH a trailing EOL).
- */
-# define ENGINE_CTRL_GET_NAME_LEN_FROM_CMD       14
-# define ENGINE_CTRL_GET_NAME_FROM_CMD           15
-/* The next two are similar but give a "short description" of a command. */
-# define ENGINE_CTRL_GET_DESC_LEN_FROM_CMD       16
-# define ENGINE_CTRL_GET_DESC_FROM_CMD           17
-/*
- * With this command, the return value is the OR'd combination of
- * ENGINE_CMD_FLAG_*** values that indicate what kind of input a given
- * engine-specific ctrl command expects.
- */
-# define ENGINE_CTRL_GET_CMD_FLAGS               18
-
-/*
- * ENGINE implementations should start the numbering of their own control
- * commands from this value. (ie. ENGINE_CMD_BASE, ENGINE_CMD_BASE + 1, etc).
- */
-# define ENGINE_CMD_BASE                         200
-
-/*
- * NB: These 2 nCipher "chil" control commands are deprecated, and their
- * functionality is now available through ENGINE-specific control commands
- * (exposed through the above-mentioned 'CMD'-handling). Code using these 2
- * commands should be migrated to the more general command handling before
- * these are removed.
- */
-
-/* Flags specific to the nCipher "chil" engine */
-# define ENGINE_CTRL_CHIL_SET_FORKCHECK          100
-        /*
-         * Depending on the value of the (long)i argument, this sets or
-         * unsets the SimpleForkCheck flag in the CHIL API to enable or
-         * disable checking and workarounds for applications that fork().
-         */
-# define ENGINE_CTRL_CHIL_NO_LOCKING             101
-        /*
-         * This prevents the initialisation function from providing mutex
-         * callbacks to the nCipher library.
-         */
-
-/*
- * If an ENGINE supports its own specific control commands and wishes the
- * framework to handle the above 'ENGINE_CMD_***'-manipulation commands on
- * its behalf, it should supply a null-terminated array of ENGINE_CMD_DEFN
- * entries to ENGINE_set_cmd_defns(). It should also implement a ctrl()
- * handler that supports the stated commands (ie. the "cmd_num" entries as
- * described by the array). NB: The array must be ordered in increasing order
- * of cmd_num. "null-terminated" means that the last ENGINE_CMD_DEFN element
- * has cmd_num set to zero and/or cmd_name set to NULL.
- */
-typedef struct ENGINE_CMD_DEFN_st {
-    unsigned int cmd_num;       /* The command number */
-    const char *cmd_name;       /* The command name itself */
-    const char *cmd_desc;       /* A short description of the command */
-    unsigned int cmd_flags;     /* The input the command expects */
-} ENGINE_CMD_DEFN;
-
-/* Generic function pointer */
-typedef int (*ENGINE_GEN_FUNC_PTR) (void);
-/* Generic function pointer taking no arguments */
-typedef int (*ENGINE_GEN_INT_FUNC_PTR) (ENGINE *);
-/* Specific control function pointer */
-typedef int (*ENGINE_CTRL_FUNC_PTR) (ENGINE *, int, long, void *,
-                                     void (*f) (void));
-/* Generic load_key function pointer */
-typedef EVP_PKEY *(*ENGINE_LOAD_KEY_PTR)(ENGINE *, const char *,
-                                         UI_METHOD *ui_method,
-                                         void *callback_data);
-typedef int (*ENGINE_SSL_CLIENT_CERT_PTR) (ENGINE *, SSL *ssl,
-                                           STACK_OF(X509_NAME) *ca_dn,
-                                           X509 **pcert, EVP_PKEY **pkey,
-                                           STACK_OF(X509) **pother,
-                                           UI_METHOD *ui_method,
-                                           void *callback_data);
-/*-
- * These callback types are for an ENGINE's handler for cipher and digest logic.
- * These handlers have these prototypes;
- *   int foo(ENGINE *e, const EVP_CIPHER **cipher, const int **nids, int nid);
- *   int foo(ENGINE *e, const EVP_MD **digest, const int **nids, int nid);
- * Looking at how to implement these handlers in the case of cipher support, if
- * the framework wants the EVP_CIPHER for 'nid', it will call;
- *   foo(e, &p_evp_cipher, NULL, nid);    (return zero for failure)
- * If the framework wants a list of supported 'nid's, it will call;
- *   foo(e, NULL, &p_nids, 0); (returns number of 'nids' or -1 for error)
- */
-/*
- * Returns to a pointer to the array of supported cipher 'nid's. If the
- * second parameter is non-NULL it is set to the size of the returned array.
- */
-typedef int (*ENGINE_CIPHERS_PTR) (ENGINE *, const EVP_CIPHER **,
-                                   const int **, int);
-typedef int (*ENGINE_DIGESTS_PTR) (ENGINE *, const EVP_MD **, const int **,
-                                   int);
-typedef int (*ENGINE_PKEY_METHS_PTR) (ENGINE *, EVP_PKEY_METHOD **,
-                                      const int **, int);
-typedef int (*ENGINE_PKEY_ASN1_METHS_PTR) (ENGINE *, EVP_PKEY_ASN1_METHOD **,
-                                           const int **, int);
-/*
- * STRUCTURE functions ... all of these functions deal with pointers to
- * ENGINE structures where the pointers have a "structural reference". This
- * means that their reference is to allowed access to the structure but it
- * does not imply that the structure is functional. To simply increment or
- * decrement the structural reference count, use ENGINE_by_id and
- * ENGINE_free. NB: This is not required when iterating using ENGINE_get_next
- * as it will automatically decrement the structural reference count of the
- * "current" ENGINE and increment the structural reference count of the
- * ENGINE it returns (unless it is NULL).
- */
-
-/* Get the first/last "ENGINE" type available. */
-ENGINE *ENGINE_get_first(void);
-ENGINE *ENGINE_get_last(void);
-/* Iterate to the next/previous "ENGINE" type (NULL = end of the list). */
-ENGINE *ENGINE_get_next(ENGINE *e);
-ENGINE *ENGINE_get_prev(ENGINE *e);
-/* Add another "ENGINE" type into the array. */
-int ENGINE_add(ENGINE *e);
-/* Remove an existing "ENGINE" type from the array. */
-int ENGINE_remove(ENGINE *e);
-/* Retrieve an engine from the list by its unique "id" value. */
-ENGINE *ENGINE_by_id(const char *id);
-
-#if OPENSSL_API_COMPAT < 0x10100000L
-# define ENGINE_load_openssl() \
-    OPENSSL_init_crypto(OPENSSL_INIT_ENGINE_OPENSSL, NULL)
-# define ENGINE_load_dynamic() \
-    OPENSSL_init_crypto(OPENSSL_INIT_ENGINE_DYNAMIC, NULL)
-# ifndef OPENSSL_NO_STATIC_ENGINE
-#  define ENGINE_load_padlock() \
-    OPENSSL_init_crypto(OPENSSL_INIT_ENGINE_PADLOCK, NULL)
-#  define ENGINE_load_capi() \
-    OPENSSL_init_crypto(OPENSSL_INIT_ENGINE_CAPI, NULL)
-#  define ENGINE_load_afalg() \
-    OPENSSL_init_crypto(OPENSSL_INIT_ENGINE_AFALG, NULL)
-# endif
-# define ENGINE_load_cryptodev() \
-    OPENSSL_init_crypto(OPENSSL_INIT_ENGINE_CRYPTODEV, NULL)
-# define ENGINE_load_rdrand() \
-    OPENSSL_init_crypto(OPENSSL_INIT_ENGINE_RDRAND, NULL)
-#endif
-void ENGINE_load_builtin_engines(void);
-
-/*
- * Get and set global flags (ENGINE_TABLE_FLAG_***) for the implementation
- * "registry" handling.
- */
-unsigned int ENGINE_get_table_flags(void);
-void ENGINE_set_table_flags(unsigned int flags);
-
-/*- Manage registration of ENGINEs per "table". For each type, there are 3
- * functions;
- *   ENGINE_register_***(e) - registers the implementation from 'e' (if it has one)
- *   ENGINE_unregister_***(e) - unregister the implementation from 'e'
- *   ENGINE_register_all_***() - call ENGINE_register_***() for each 'e' in the list
- * Cleanup is automatically registered from each table when required.
- */
-
-int ENGINE_register_RSA(ENGINE *e);
-void ENGINE_unregister_RSA(ENGINE *e);
-void ENGINE_register_all_RSA(void);
-
-int ENGINE_register_DSA(ENGINE *e);
-void ENGINE_unregister_DSA(ENGINE *e);
-void ENGINE_register_all_DSA(void);
-
-int ENGINE_register_EC(ENGINE *e);
-void ENGINE_unregister_EC(ENGINE *e);
-void ENGINE_register_all_EC(void);
-
-int ENGINE_register_DH(ENGINE *e);
-void ENGINE_unregister_DH(ENGINE *e);
-void ENGINE_register_all_DH(void);
-
-int ENGINE_register_RAND(ENGINE *e);
-void ENGINE_unregister_RAND(ENGINE *e);
-void ENGINE_register_all_RAND(void);
-
-int ENGINE_register_ciphers(ENGINE *e);
-void ENGINE_unregister_ciphers(ENGINE *e);
-void ENGINE_register_all_ciphers(void);
-
-int ENGINE_register_digests(ENGINE *e);
-void ENGINE_unregister_digests(ENGINE *e);
-void ENGINE_register_all_digests(void);
-
-int ENGINE_register_pkey_meths(ENGINE *e);
-void ENGINE_unregister_pkey_meths(ENGINE *e);
-void ENGINE_register_all_pkey_meths(void);
-
-int ENGINE_register_pkey_asn1_meths(ENGINE *e);
-void ENGINE_unregister_pkey_asn1_meths(ENGINE *e);
-void ENGINE_register_all_pkey_asn1_meths(void);
-
-/*
- * These functions register all support from the above categories. Note, use
- * of these functions can result in static linkage of code your application
- * may not need. If you only need a subset of functionality, consider using
- * more selective initialisation.
- */
-int ENGINE_register_complete(ENGINE *e);
-int ENGINE_register_all_complete(void);
-
-/*
- * Send parametrised control commands to the engine. The possibilities to
- * send down an integer, a pointer to data or a function pointer are
- * provided. Any of the parameters may or may not be NULL, depending on the
- * command number. In actuality, this function only requires a structural
- * (rather than functional) reference to an engine, but many control commands
- * may require the engine be functional. The caller should be aware of trying
- * commands that require an operational ENGINE, and only use functional
- * references in such situations.
- */
-int ENGINE_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f) (void));
-
-/*
- * This function tests if an ENGINE-specific command is usable as a
- * "setting". Eg. in an application's config file that gets processed through
- * ENGINE_ctrl_cmd_string(). If this returns zero, it is not available to
- * ENGINE_ctrl_cmd_string(), only ENGINE_ctrl().
- */
-int ENGINE_cmd_is_executable(ENGINE *e, int cmd);
-
-/*
- * This function works like ENGINE_ctrl() with the exception of taking a
- * command name instead of a command number, and can handle optional
- * commands. See the comment on ENGINE_ctrl_cmd_string() for an explanation
- * on how to use the cmd_name and cmd_optional.
- */
-int ENGINE_ctrl_cmd(ENGINE *e, const char *cmd_name,
-                    long i, void *p, void (*f) (void), int cmd_optional);
-
-/*
- * This function passes a command-name and argument to an ENGINE. The
- * cmd_name is converted to a command number and the control command is
- * called using 'arg' as an argument (unless the ENGINE doesn't support such
- * a command, in which case no control command is called). The command is
- * checked for input flags, and if necessary the argument will be converted
- * to a numeric value. If cmd_optional is non-zero, then if the ENGINE
- * doesn't support the given cmd_name the return value will be success
- * anyway. This function is intended for applications to use so that users
- * (or config files) can supply engine-specific config data to the ENGINE at
- * run-time to control behaviour of specific engines. As such, it shouldn't
- * be used for calling ENGINE_ctrl() functions that return data, deal with
- * binary data, or that are otherwise supposed to be used directly through
- * ENGINE_ctrl() in application code. Any "return" data from an ENGINE_ctrl()
- * operation in this function will be lost - the return value is interpreted
- * as failure if the return value is zero, success otherwise, and this
- * function returns a boolean value as a result. In other words, vendors of
- * 'ENGINE'-enabled devices should write ENGINE implementations with
- * parameterisations that work in this scheme, so that compliant ENGINE-based
- * applications can work consistently with the same configuration for the
- * same ENGINE-enabled devices, across applications.
- */
-int ENGINE_ctrl_cmd_string(ENGINE *e, const char *cmd_name, const char *arg,
-                           int cmd_optional);
-
-/*
- * These functions are useful for manufacturing new ENGINE structures. They
- * don't address reference counting at all - one uses them to populate an
- * ENGINE structure with personalised implementations of things prior to
- * using it directly or adding it to the builtin ENGINE list in OpenSSL.
- * These are also here so that the ENGINE structure doesn't have to be
- * exposed and break binary compatibility!
- */
-ENGINE *ENGINE_new(void);
-int ENGINE_free(ENGINE *e);
-int ENGINE_up_ref(ENGINE *e);
-int ENGINE_set_id(ENGINE *e, const char *id);
-int ENGINE_set_name(ENGINE *e, const char *name);
-int ENGINE_set_RSA(ENGINE *e, const RSA_METHOD *rsa_meth);
-int ENGINE_set_DSA(ENGINE *e, const DSA_METHOD *dsa_meth);
-int ENGINE_set_EC(ENGINE *e, const EC_KEY_METHOD *ecdsa_meth);
-int ENGINE_set_DH(ENGINE *e, const DH_METHOD *dh_meth);
-int ENGINE_set_RAND(ENGINE *e, const RAND_METHOD *rand_meth);
-int ENGINE_set_destroy_function(ENGINE *e, ENGINE_GEN_INT_FUNC_PTR destroy_f);
-int ENGINE_set_init_function(ENGINE *e, ENGINE_GEN_INT_FUNC_PTR init_f);
-int ENGINE_set_finish_function(ENGINE *e, ENGINE_GEN_INT_FUNC_PTR finish_f);
-int ENGINE_set_ctrl_function(ENGINE *e, ENGINE_CTRL_FUNC_PTR ctrl_f);
-int ENGINE_set_load_privkey_function(ENGINE *e,
-                                     ENGINE_LOAD_KEY_PTR loadpriv_f);
-int ENGINE_set_load_pubkey_function(ENGINE *e, ENGINE_LOAD_KEY_PTR loadpub_f);
-int ENGINE_set_load_ssl_client_cert_function(ENGINE *e,
-                                             ENGINE_SSL_CLIENT_CERT_PTR
-                                             loadssl_f);
-int ENGINE_set_ciphers(ENGINE *e, ENGINE_CIPHERS_PTR f);
-int ENGINE_set_digests(ENGINE *e, ENGINE_DIGESTS_PTR f);
-int ENGINE_set_pkey_meths(ENGINE *e, ENGINE_PKEY_METHS_PTR f);
-int ENGINE_set_pkey_asn1_meths(ENGINE *e, ENGINE_PKEY_ASN1_METHS_PTR f);
-int ENGINE_set_flags(ENGINE *e, int flags);
-int ENGINE_set_cmd_defns(ENGINE *e, const ENGINE_CMD_DEFN *defns);
-/* These functions allow control over any per-structure ENGINE data. */
-#define ENGINE_get_ex_new_index(l, p, newf, dupf, freef) \
-    CRYPTO_get_ex_new_index(CRYPTO_EX_INDEX_ENGINE, l, p, newf, dupf, freef)
-int ENGINE_set_ex_data(ENGINE *e, int idx, void *arg);
-void *ENGINE_get_ex_data(const ENGINE *e, int idx);
-
-#if OPENSSL_API_COMPAT < 0x10100000L
-/*
- * This function previously cleaned up anything that needs it. Auto-deinit will
- * now take care of it so it is no longer required to call this function.
- */
-# define ENGINE_cleanup() while(0) continue
-#endif
-
-/*
- * These return values from within the ENGINE structure. These can be useful
- * with functional references as well as structural references - it depends
- * which you obtained. Using the result for functional purposes if you only
- * obtained a structural reference may be problematic!
- */
-const char *ENGINE_get_id(const ENGINE *e);
-const char *ENGINE_get_name(const ENGINE *e);
-const RSA_METHOD *ENGINE_get_RSA(const ENGINE *e);
-const DSA_METHOD *ENGINE_get_DSA(const ENGINE *e);
-const EC_KEY_METHOD *ENGINE_get_EC(const ENGINE *e);
-const DH_METHOD *ENGINE_get_DH(const ENGINE *e);
-const RAND_METHOD *ENGINE_get_RAND(const ENGINE *e);
-ENGINE_GEN_INT_FUNC_PTR ENGINE_get_destroy_function(const ENGINE *e);
-ENGINE_GEN_INT_FUNC_PTR ENGINE_get_init_function(const ENGINE *e);
-ENGINE_GEN_INT_FUNC_PTR ENGINE_get_finish_function(const ENGINE *e);
-ENGINE_CTRL_FUNC_PTR ENGINE_get_ctrl_function(const ENGINE *e);
-ENGINE_LOAD_KEY_PTR ENGINE_get_load_privkey_function(const ENGINE *e);
-ENGINE_LOAD_KEY_PTR ENGINE_get_load_pubkey_function(const ENGINE *e);
-ENGINE_SSL_CLIENT_CERT_PTR ENGINE_get_ssl_client_cert_function(const ENGINE
-                                                               *e);
-ENGINE_CIPHERS_PTR ENGINE_get_ciphers(const ENGINE *e);
-ENGINE_DIGESTS_PTR ENGINE_get_digests(const ENGINE *e);
-ENGINE_PKEY_METHS_PTR ENGINE_get_pkey_meths(const ENGINE *e);
-ENGINE_PKEY_ASN1_METHS_PTR ENGINE_get_pkey_asn1_meths(const ENGINE *e);
-const EVP_CIPHER *ENGINE_get_cipher(ENGINE *e, int nid);
-const EVP_MD *ENGINE_get_digest(ENGINE *e, int nid);
-const EVP_PKEY_METHOD *ENGINE_get_pkey_meth(ENGINE *e, int nid);
-const EVP_PKEY_ASN1_METHOD *ENGINE_get_pkey_asn1_meth(ENGINE *e, int nid);
-const EVP_PKEY_ASN1_METHOD *ENGINE_get_pkey_asn1_meth_str(ENGINE *e,
-                                                          const char *str,
-                                                          int len);
-const EVP_PKEY_ASN1_METHOD *ENGINE_pkey_asn1_find_str(ENGINE **pe,
-                                                      const char *str,
-                                                      int len);
-const ENGINE_CMD_DEFN *ENGINE_get_cmd_defns(const ENGINE *e);
-int ENGINE_get_flags(const ENGINE *e);
-
-/*
- * FUNCTIONAL functions. These functions deal with ENGINE structures that
- * have (or will) be initialised for use. Broadly speaking, the structural
- * functions are useful for iterating the list of available engine types,
- * creating new engine types, and other "list" operations. These functions
- * actually deal with ENGINEs that are to be used. As such these functions
- * can fail (if applicable) when particular engines are unavailable - eg. if
- * a hardware accelerator is not attached or not functioning correctly. Each
- * ENGINE has 2 reference counts; structural and functional. Every time a
- * functional reference is obtained or released, a corresponding structural
- * reference is automatically obtained or released too.
- */
-
-/*
- * Initialise a engine type for use (or up its reference count if it's
- * already in use). This will fail if the engine is not currently operational
- * and cannot initialise.
- */
-int ENGINE_init(ENGINE *e);
-/*
- * Free a functional reference to a engine type. This does not require a
- * corresponding call to ENGINE_free as it also releases a structural
- * reference.
- */
-int ENGINE_finish(ENGINE *e);
-
-/*
- * The following functions handle keys that are stored in some secondary
- * location, handled by the engine.  The storage may be on a card or
- * whatever.
- */
-EVP_PKEY *ENGINE_load_private_key(ENGINE *e, const char *key_id,
-                                  UI_METHOD *ui_method, void *callback_data);
-EVP_PKEY *ENGINE_load_public_key(ENGINE *e, const char *key_id,
-                                 UI_METHOD *ui_method, void *callback_data);
-int ENGINE_load_ssl_client_cert(ENGINE *e, SSL *s,
-                                STACK_OF(X509_NAME) *ca_dn, X509 **pcert,
-                                EVP_PKEY **ppkey, STACK_OF(X509) **pother,
-                                UI_METHOD *ui_method, void *callback_data);
-
-/*
- * This returns a pointer for the current ENGINE structure that is (by
- * default) performing any RSA operations. The value returned is an
- * incremented reference, so it should be free'd (ENGINE_finish) before it is
- * discarded.
- */
-ENGINE *ENGINE_get_default_RSA(void);
-/* Same for the other "methods" */
-ENGINE *ENGINE_get_default_DSA(void);
-ENGINE *ENGINE_get_default_EC(void);
-ENGINE *ENGINE_get_default_DH(void);
-ENGINE *ENGINE_get_default_RAND(void);
-/*
- * These functions can be used to get a functional reference to perform
- * ciphering or digesting corresponding to "nid".
- */
-ENGINE *ENGINE_get_cipher_engine(int nid);
-ENGINE *ENGINE_get_digest_engine(int nid);
-ENGINE *ENGINE_get_pkey_meth_engine(int nid);
-ENGINE *ENGINE_get_pkey_asn1_meth_engine(int nid);
-
-/*
- * This sets a new default ENGINE structure for performing RSA operations. If
- * the result is non-zero (success) then the ENGINE structure will have had
- * its reference count up'd so the caller should still free their own
- * reference 'e'.
- */
-int ENGINE_set_default_RSA(ENGINE *e);
-int ENGINE_set_default_string(ENGINE *e, const char *def_list);
-/* Same for the other "methods" */
-int ENGINE_set_default_DSA(ENGINE *e);
-int ENGINE_set_default_EC(ENGINE *e);
-int ENGINE_set_default_DH(ENGINE *e);
-int ENGINE_set_default_RAND(ENGINE *e);
-int ENGINE_set_default_ciphers(ENGINE *e);
-int ENGINE_set_default_digests(ENGINE *e);
-int ENGINE_set_default_pkey_meths(ENGINE *e);
-int ENGINE_set_default_pkey_asn1_meths(ENGINE *e);
-
-/*
- * The combination "set" - the flags are bitwise "OR"d from the
- * ENGINE_METHOD_*** defines above. As with the "ENGINE_register_complete()"
- * function, this function can result in unnecessary static linkage. If your
- * application requires only specific functionality, consider using more
- * selective functions.
- */
-int ENGINE_set_default(ENGINE *e, unsigned int flags);
-
-void ENGINE_add_conf_module(void);
-
-/* Deprecated functions ... */
-/* int ENGINE_clear_defaults(void); */
-
-/**************************/
-/* DYNAMIC ENGINE SUPPORT */
-/**************************/
-
-/* Binary/behaviour compatibility levels */
-# define OSSL_DYNAMIC_VERSION            (unsigned long)0x00030000
-/*
- * Binary versions older than this are too old for us (whether we're a loader
- * or a loadee)
- */
-# define OSSL_DYNAMIC_OLDEST             (unsigned long)0x00030000
-
-/*
- * When compiling an ENGINE entirely as an external shared library, loadable
- * by the "dynamic" ENGINE, these types are needed. The 'dynamic_fns'
- * structure type provides the calling application's (or library's) error
- * functionality and memory management function pointers to the loaded
- * library. These should be used/set in the loaded library code so that the
- * loading application's 'state' will be used/changed in all operations. The
- * 'static_state' pointer allows the loaded library to know if it shares the
- * same static data as the calling application (or library), and thus whether
- * these callbacks need to be set or not.
- */
-typedef void *(*dyn_MEM_malloc_fn) (size_t, const char *, int);
-typedef void *(*dyn_MEM_realloc_fn) (void *, size_t, const char *, int);
-typedef void (*dyn_MEM_free_fn) (void *, const char *, int);
-typedef struct st_dynamic_MEM_fns {
-    dyn_MEM_malloc_fn malloc_fn;
-    dyn_MEM_realloc_fn realloc_fn;
-    dyn_MEM_free_fn free_fn;
-} dynamic_MEM_fns;
-/*
- * FIXME: Perhaps the memory and locking code (crypto.h) should declare and
- * use these types so we (and any other dependent code) can simplify a bit??
- */
-/* The top-level structure */
-typedef struct st_dynamic_fns {
-    void *static_state;
-    dynamic_MEM_fns mem_fns;
-} dynamic_fns;
-
-/*
- * The version checking function should be of this prototype. NB: The
- * ossl_version value passed in is the OSSL_DYNAMIC_VERSION of the loading
- * code. If this function returns zero, it indicates a (potential) version
- * incompatibility and the loaded library doesn't believe it can proceed.
- * Otherwise, the returned value is the (latest) version supported by the
- * loading library. The loader may still decide that the loaded code's
- * version is unsatisfactory and could veto the load. The function is
- * expected to be implemented with the symbol name "v_check", and a default
- * implementation can be fully instantiated with
- * IMPLEMENT_DYNAMIC_CHECK_FN().
- */
-typedef unsigned long (*dynamic_v_check_fn) (unsigned long ossl_version);
-# define IMPLEMENT_DYNAMIC_CHECK_FN() \
-        OPENSSL_EXPORT unsigned long v_check(unsigned long v); \
-        OPENSSL_EXPORT unsigned long v_check(unsigned long v) { \
-                if (v >= OSSL_DYNAMIC_OLDEST) return OSSL_DYNAMIC_VERSION; \
-                return 0; }
-
-/*
- * This function is passed the ENGINE structure to initialise with its own
- * function and command settings. It should not adjust the structural or
- * functional reference counts. If this function returns zero, (a) the load
- * will be aborted, (b) the previous ENGINE state will be memcpy'd back onto
- * the structure, and (c) the shared library will be unloaded. So
- * implementations should do their own internal cleanup in failure
- * circumstances otherwise they could leak. The 'id' parameter, if non-NULL,
- * represents the ENGINE id that the loader is looking for. If this is NULL,
- * the shared library can choose to return failure or to initialise a
- * 'default' ENGINE. If non-NULL, the shared library must initialise only an
- * ENGINE matching the passed 'id'. The function is expected to be
- * implemented with the symbol name "bind_engine". A standard implementation
- * can be instantiated with IMPLEMENT_DYNAMIC_BIND_FN(fn) where the parameter
- * 'fn' is a callback function that populates the ENGINE structure and
- * returns an int value (zero for failure). 'fn' should have prototype;
- * static int fn(ENGINE *e, const char *id);
- */
-typedef int (*dynamic_bind_engine) (ENGINE *e, const char *id,
-                                    const dynamic_fns *fns);
-# define IMPLEMENT_DYNAMIC_BIND_FN(fn) \
-        OPENSSL_EXPORT \
-        int bind_engine(ENGINE *e, const char *id, const dynamic_fns *fns); \
-        OPENSSL_EXPORT \
-        int bind_engine(ENGINE *e, const char *id, const dynamic_fns *fns) { \
-            if (ENGINE_get_static_state() == fns->static_state) goto skip_cbs; \
-            CRYPTO_set_mem_functions(fns->mem_fns.malloc_fn, \
-                                     fns->mem_fns.realloc_fn, \
-                                     fns->mem_fns.free_fn); \
-        skip_cbs: \
-            if (!fn(e, id)) return 0; \
-            return 1; }
-
-/*
- * If the loading application (or library) and the loaded ENGINE library
- * share the same static data (eg. they're both dynamically linked to the
- * same libcrypto.so) we need a way to avoid trying to set system callbacks -
- * this would fail, and for the same reason that it's unnecessary to try. If
- * the loaded ENGINE has (or gets from through the loader) its own copy of
- * the libcrypto static data, we will need to set the callbacks. The easiest
- * way to detect this is to have a function that returns a pointer to some
- * static data and let the loading application and loaded ENGINE compare
- * their respective values.
- */
-void *ENGINE_get_static_state(void);
-
-# if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(HAVE_CRYPTODEV)
-DEPRECATEDIN_1_1_0(void ENGINE_setup_bsd_cryptodev(void))
-# endif
-
-/* BEGIN ERROR CODES */
-/*
- * The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
-
-int ERR_load_ENGINE_strings(void);
-
-/* Error codes for the ENGINE functions. */
-
-/* Function codes. */
-# define ENGINE_F_DYNAMIC_CTRL                            180
-# define ENGINE_F_DYNAMIC_GET_DATA_CTX                    181
-# define ENGINE_F_DYNAMIC_LOAD                            182
-# define ENGINE_F_DYNAMIC_SET_DATA_CTX                    183
-# define ENGINE_F_ENGINE_ADD                              105
-# define ENGINE_F_ENGINE_BY_ID                            106
-# define ENGINE_F_ENGINE_CMD_IS_EXECUTABLE                170
-# define ENGINE_F_ENGINE_CTRL                             142
-# define ENGINE_F_ENGINE_CTRL_CMD                         178
-# define ENGINE_F_ENGINE_CTRL_CMD_STRING                  171
-# define ENGINE_F_ENGINE_FINISH                           107
-# define ENGINE_F_ENGINE_GET_CIPHER                       185
-# define ENGINE_F_ENGINE_GET_DIGEST                       186
-# define ENGINE_F_ENGINE_GET_FIRST                        195
-# define ENGINE_F_ENGINE_GET_LAST                         196
-# define ENGINE_F_ENGINE_GET_NEXT                         115
-# define ENGINE_F_ENGINE_GET_PKEY_ASN1_METH               193
-# define ENGINE_F_ENGINE_GET_PKEY_METH                    192
-# define ENGINE_F_ENGINE_GET_PREV                         116
-# define ENGINE_F_ENGINE_INIT                             119
-# define ENGINE_F_ENGINE_LIST_ADD                         120
-# define ENGINE_F_ENGINE_LIST_REMOVE                      121
-# define ENGINE_F_ENGINE_LOAD_PRIVATE_KEY                 150
-# define ENGINE_F_ENGINE_LOAD_PUBLIC_KEY                  151
-# define ENGINE_F_ENGINE_LOAD_SSL_CLIENT_CERT             194
-# define ENGINE_F_ENGINE_NEW                              122
-# define ENGINE_F_ENGINE_PKEY_ASN1_FIND_STR               197
-# define ENGINE_F_ENGINE_REMOVE                           123
-# define ENGINE_F_ENGINE_SET_DEFAULT_STRING               189
-# define ENGINE_F_ENGINE_SET_ID                           129
-# define ENGINE_F_ENGINE_SET_NAME                         130
-# define ENGINE_F_ENGINE_TABLE_REGISTER                   184
-# define ENGINE_F_ENGINE_UNLOCKED_FINISH                  191
-# define ENGINE_F_ENGINE_UP_REF                           190
-# define ENGINE_F_INT_CTRL_HELPER                         172
-# define ENGINE_F_INT_ENGINE_CONFIGURE                    188
-# define ENGINE_F_INT_ENGINE_MODULE_INIT                  187
-
-/* Reason codes. */
-# define ENGINE_R_ALREADY_LOADED                          100
-# define ENGINE_R_ARGUMENT_IS_NOT_A_NUMBER                133
-# define ENGINE_R_CMD_NOT_EXECUTABLE                      134
-# define ENGINE_R_COMMAND_TAKES_INPUT                     135
-# define ENGINE_R_COMMAND_TAKES_NO_INPUT                  136
-# define ENGINE_R_CONFLICTING_ENGINE_ID                   103
-# define ENGINE_R_CTRL_COMMAND_NOT_IMPLEMENTED            119
-# define ENGINE_R_DSO_FAILURE                             104
-# define ENGINE_R_DSO_NOT_FOUND                           132
-# define ENGINE_R_ENGINES_SECTION_ERROR                   148
-# define ENGINE_R_ENGINE_CONFIGURATION_ERROR              102
-# define ENGINE_R_ENGINE_IS_NOT_IN_LIST                   105
-# define ENGINE_R_ENGINE_SECTION_ERROR                    149
-# define ENGINE_R_FAILED_LOADING_PRIVATE_KEY              128
-# define ENGINE_R_FAILED_LOADING_PUBLIC_KEY               129
-# define ENGINE_R_FINISH_FAILED                           106
-# define ENGINE_R_ID_OR_NAME_MISSING                      108
-# define ENGINE_R_INIT_FAILED                             109
-# define ENGINE_R_INTERNAL_LIST_ERROR                     110
-# define ENGINE_R_INVALID_ARGUMENT                        143
-# define ENGINE_R_INVALID_CMD_NAME                        137
-# define ENGINE_R_INVALID_CMD_NUMBER                      138
-# define ENGINE_R_INVALID_INIT_VALUE                      151
-# define ENGINE_R_INVALID_STRING                          150
-# define ENGINE_R_NOT_INITIALISED                         117
-# define ENGINE_R_NOT_LOADED                              112
-# define ENGINE_R_NO_CONTROL_FUNCTION                     120
-# define ENGINE_R_NO_INDEX                                144
-# define ENGINE_R_NO_LOAD_FUNCTION                        125
-# define ENGINE_R_NO_REFERENCE                            130
-# define ENGINE_R_NO_SUCH_ENGINE                          116
-# define ENGINE_R_UNIMPLEMENTED_CIPHER                    146
-# define ENGINE_R_UNIMPLEMENTED_DIGEST                    147
-# define ENGINE_R_UNIMPLEMENTED_PUBLIC_KEY_METHOD         101
-# define ENGINE_R_VERSION_INCOMPATIBILITY                 145
-
-#  ifdef  __cplusplus
-}
-#  endif
-# endif
-#endif

gpac-2.2.1.tar.gz/extra_lib/include/openssl/err.h Deleted

@@ -1,260 +0,0 @@
-/*
- * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
- *
- * Licensed under the OpenSSL license (the "License").  You may not use
- * this file except in compliance with the License.  You can obtain a copy
- * in the file LICENSE in the source distribution or at
- * https://www.openssl.org/source/license.html
- */
-
-#ifndef HEADER_ERR_H
-# define HEADER_ERR_H
-
-# include <openssl/e_os2.h>
-
-# ifndef OPENSSL_NO_STDIO
-#  include <stdio.h>
-#  include <stdlib.h>
-# endif
-
-# include <openssl/ossl_typ.h>
-# include <openssl/bio.h>
-# include <openssl/lhash.h>
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-# ifndef OPENSSL_NO_ERR
-#  define ERR_PUT_error(a,b,c,d,e)        ERR_put_error(a,b,c,d,e)
-# else
-#  define ERR_PUT_error(a,b,c,d,e)        ERR_put_error(a,b,c,NULL,0)
-# endif
-
-# include <errno.h>
-
-# define ERR_TXT_MALLOCED        0x01
-# define ERR_TXT_STRING          0x02
-
-# define ERR_FLAG_MARK           0x01
-
-# define ERR_NUM_ERRORS  16
-typedef struct err_state_st {
-    int err_flagsERR_NUM_ERRORS;
-    unsigned long err_bufferERR_NUM_ERRORS;
-    char *err_dataERR_NUM_ERRORS;
-    int err_data_flagsERR_NUM_ERRORS;
-    const char *err_fileERR_NUM_ERRORS;
-    int err_lineERR_NUM_ERRORS;
-    int top, bottom;
-} ERR_STATE;
-
-/* library */
-# define ERR_LIB_NONE            1
-# define ERR_LIB_SYS             2
-# define ERR_LIB_BN              3
-# define ERR_LIB_RSA             4
-# define ERR_LIB_DH              5
-# define ERR_LIB_EVP             6
-# define ERR_LIB_BUF             7
-# define ERR_LIB_OBJ             8
-# define ERR_LIB_PEM             9
-# define ERR_LIB_DSA             10
-# define ERR_LIB_X509            11
-/* #define ERR_LIB_METH         12 */
-# define ERR_LIB_ASN1            13
-# define ERR_LIB_CONF            14
-# define ERR_LIB_CRYPTO          15
-# define ERR_LIB_EC              16
-# define ERR_LIB_SSL             20
-/* #define ERR_LIB_SSL23        21 */
-/* #define ERR_LIB_SSL2         22 */
-/* #define ERR_LIB_SSL3         23 */
-/* #define ERR_LIB_RSAREF       30 */
-/* #define ERR_LIB_PROXY        31 */
-# define ERR_LIB_BIO             32
-# define ERR_LIB_PKCS7           33
-# define ERR_LIB_X509V3          34
-# define ERR_LIB_PKCS12          35
-# define ERR_LIB_RAND            36
-# define ERR_LIB_DSO             37
-# define ERR_LIB_ENGINE          38
-# define ERR_LIB_OCSP            39
-# define ERR_LIB_UI              40
-# define ERR_LIB_COMP            41
-# define ERR_LIB_ECDSA           42
-# define ERR_LIB_ECDH            43
-# define ERR_LIB_STORE           44
-# define ERR_LIB_FIPS            45
-# define ERR_LIB_CMS             46
-# define ERR_LIB_TS              47
-# define ERR_LIB_HMAC            48
-/* # define ERR_LIB_JPAKE       49 */
-# define ERR_LIB_CT              50
-# define ERR_LIB_ASYNC           51
-# define ERR_LIB_KDF             52
-
-# define ERR_LIB_USER            128
-
-# define SYSerr(f,r)  ERR_PUT_error(ERR_LIB_SYS,(f),(r),OPENSSL_FILE,OPENSSL_LINE)
-# define BNerr(f,r)   ERR_PUT_error(ERR_LIB_BN,(f),(r),OPENSSL_FILE,OPENSSL_LINE)
-# define RSAerr(f,r)  ERR_PUT_error(ERR_LIB_RSA,(f),(r),OPENSSL_FILE,OPENSSL_LINE)
-# define DHerr(f,r)   ERR_PUT_error(ERR_LIB_DH,(f),(r),OPENSSL_FILE,OPENSSL_LINE)
-# define EVPerr(f,r)  ERR_PUT_error(ERR_LIB_EVP,(f),(r),OPENSSL_FILE,OPENSSL_LINE)
-# define BUFerr(f,r)  ERR_PUT_error(ERR_LIB_BUF,(f),(r),OPENSSL_FILE,OPENSSL_LINE)
-# define OBJerr(f,r)  ERR_PUT_error(ERR_LIB_OBJ,(f),(r),OPENSSL_FILE,OPENSSL_LINE)
-# define PEMerr(f,r)  ERR_PUT_error(ERR_LIB_PEM,(f),(r),OPENSSL_FILE,OPENSSL_LINE)
-# define DSAerr(f,r)  ERR_PUT_error(ERR_LIB_DSA,(f),(r),OPENSSL_FILE,OPENSSL_LINE)
-# define X509err(f,r) ERR_PUT_error(ERR_LIB_X509,(f),(r),OPENSSL_FILE,OPENSSL_LINE)
-# define ASN1err(f,r) ERR_PUT_error(ERR_LIB_ASN1,(f),(r),OPENSSL_FILE,OPENSSL_LINE)
-# define CONFerr(f,r) ERR_PUT_error(ERR_LIB_CONF,(f),(r),OPENSSL_FILE,OPENSSL_LINE)
-# define CRYPTOerr(f,r) ERR_PUT_error(ERR_LIB_CRYPTO,(f),(r),OPENSSL_FILE,OPENSSL_LINE)
-# define ECerr(f,r)   ERR_PUT_error(ERR_LIB_EC,(f),(r),OPENSSL_FILE,OPENSSL_LINE)
-# define SSLerr(f,r)  ERR_PUT_error(ERR_LIB_SSL,(f),(r),OPENSSL_FILE,OPENSSL_LINE)
-# define BIOerr(f,r)  ERR_PUT_error(ERR_LIB_BIO,(f),(r),OPENSSL_FILE,OPENSSL_LINE)
-# define PKCS7err(f,r) ERR_PUT_error(ERR_LIB_PKCS7,(f),(r),OPENSSL_FILE,OPENSSL_LINE)
-# define X509V3err(f,r) ERR_PUT_error(ERR_LIB_X509V3,(f),(r),OPENSSL_FILE,OPENSSL_LINE)
-# define PKCS12err(f,r) ERR_PUT_error(ERR_LIB_PKCS12,(f),(r),OPENSSL_FILE,OPENSSL_LINE)
-# define RANDerr(f,r) ERR_PUT_error(ERR_LIB_RAND,(f),(r),OPENSSL_FILE,OPENSSL_LINE)
-# define DSOerr(f,r) ERR_PUT_error(ERR_LIB_DSO,(f),(r),OPENSSL_FILE,OPENSSL_LINE)
-# define ENGINEerr(f,r) ERR_PUT_error(ERR_LIB_ENGINE,(f),(r),OPENSSL_FILE,OPENSSL_LINE)
-# define OCSPerr(f,r) ERR_PUT_error(ERR_LIB_OCSP,(f),(r),OPENSSL_FILE,OPENSSL_LINE)
-# define UIerr(f,r) ERR_PUT_error(ERR_LIB_UI,(f),(r),OPENSSL_FILE,OPENSSL_LINE)
-# define COMPerr(f,r) ERR_PUT_error(ERR_LIB_COMP,(f),(r),OPENSSL_FILE,OPENSSL_LINE)
-# define ECDSAerr(f,r)  ERR_PUT_error(ERR_LIB_ECDSA,(f),(r),OPENSSL_FILE,OPENSSL_LINE)
-# define ECDHerr(f,r)  ERR_PUT_error(ERR_LIB_ECDH,(f),(r),OPENSSL_FILE,OPENSSL_LINE)
-# define STOREerr(f,r) ERR_PUT_error(ERR_LIB_STORE,(f),(r),OPENSSL_FILE,OPENSSL_LINE)
-# define FIPSerr(f,r) ERR_PUT_error(ERR_LIB_FIPS,(f),(r),OPENSSL_FILE,OPENSSL_LINE)
-# define CMSerr(f,r) ERR_PUT_error(ERR_LIB_CMS,(f),(r),OPENSSL_FILE,OPENSSL_LINE)
-# define TSerr(f,r) ERR_PUT_error(ERR_LIB_TS,(f),(r),OPENSSL_FILE,OPENSSL_LINE)
-# define HMACerr(f,r) ERR_PUT_error(ERR_LIB_HMAC,(f),(r),OPENSSL_FILE,OPENSSL_LINE)
-# define CTerr(f,r) ERR_PUT_error(ERR_LIB_CT,(f),(r),OPENSSL_FILE,OPENSSL_LINE)
-# define ASYNCerr(f,r) ERR_PUT_error(ERR_LIB_ASYNC,(f),(r),OPENSSL_FILE,OPENSSL_LINE)
-# define KDFerr(f,r) ERR_PUT_error(ERR_LIB_KDF,(f),(r),OPENSSL_FILE,OPENSSL_LINE)
-
-# define ERR_PACK(l,f,r) ( \
-        (((unsigned int)(l) & 0x0FF) << 24L) | \
-        (((unsigned int)(f) & 0xFFF) << 12L) | \
-        (((unsigned int)(r) & 0xFFF)       ) )
-# define ERR_GET_LIB(l)          (int)(((l) >> 24L) & 0x0FFL)
-# define ERR_GET_FUNC(l)         (int)(((l) >> 12L) & 0xFFFL)
-# define ERR_GET_REASON(l)       (int)( (l)         & 0xFFFL)
-# define ERR_FATAL_ERROR(l)      (int)( (l)         & ERR_R_FATAL)
-
-/* OS functions */
-# define SYS_F_FOPEN             1
-# define SYS_F_CONNECT           2
-# define SYS_F_GETSERVBYNAME     3
-# define SYS_F_SOCKET            4
-# define SYS_F_IOCTLSOCKET       5
-# define SYS_F_BIND              6
-# define SYS_F_LISTEN            7
-# define SYS_F_ACCEPT            8
-# define SYS_F_WSASTARTUP        9/* Winsock stuff */
-# define SYS_F_OPENDIR           10
-# define SYS_F_FREAD             11
-# define SYS_F_GETADDRINFO       12
-# define SYS_F_GETNAMEINFO       13
-# define SYS_F_SETSOCKOPT        14
-# define SYS_F_GETSOCKOPT        15
-# define SYS_F_GETSOCKNAME       16
-# define SYS_F_GETHOSTBYNAME     17
-# define SYS_F_FFLUSH            18
-
-/* reasons */
-# define ERR_R_SYS_LIB   ERR_LIB_SYS/* 2 */
-# define ERR_R_BN_LIB    ERR_LIB_BN/* 3 */
-# define ERR_R_RSA_LIB   ERR_LIB_RSA/* 4 */
-# define ERR_R_DH_LIB    ERR_LIB_DH/* 5 */
-# define ERR_R_EVP_LIB   ERR_LIB_EVP/* 6 */
-# define ERR_R_BUF_LIB   ERR_LIB_BUF/* 7 */
-# define ERR_R_OBJ_LIB   ERR_LIB_OBJ/* 8 */
-# define ERR_R_PEM_LIB   ERR_LIB_PEM/* 9 */
-# define ERR_R_DSA_LIB   ERR_LIB_DSA/* 10 */
-# define ERR_R_X509_LIB  ERR_LIB_X509/* 11 */
-# define ERR_R_ASN1_LIB  ERR_LIB_ASN1/* 13 */
-# define ERR_R_EC_LIB    ERR_LIB_EC/* 16 */
-# define ERR_R_BIO_LIB   ERR_LIB_BIO/* 32 */
-# define ERR_R_PKCS7_LIB ERR_LIB_PKCS7/* 33 */
-# define ERR_R_X509V3_LIB ERR_LIB_X509V3/* 34 */
-# define ERR_R_ENGINE_LIB ERR_LIB_ENGINE/* 38 */
-# define ERR_R_ECDSA_LIB ERR_LIB_ECDSA/* 42 */
-
-# define ERR_R_NESTED_ASN1_ERROR                 58
-# define ERR_R_MISSING_ASN1_EOS                  63
-
-/* fatal error */
-# define ERR_R_FATAL                             64
-# define ERR_R_MALLOC_FAILURE                    (1|ERR_R_FATAL)
-# define ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED       (2|ERR_R_FATAL)
-# define ERR_R_PASSED_NULL_PARAMETER             (3|ERR_R_FATAL)
-# define ERR_R_INTERNAL_ERROR                    (4|ERR_R_FATAL)
-# define ERR_R_DISABLED                          (5|ERR_R_FATAL)
-# define ERR_R_INIT_FAIL                         (6|ERR_R_FATAL)
-# define ERR_R_PASSED_INVALID_ARGUMENT           (7)
-
-/*
- * 99 is the maximum possible ERR_R_... code, higher values are reserved for
- * the individual libraries
- */
-
-typedef struct ERR_string_data_st {
-    unsigned long error;
-    const char *string;
-} ERR_STRING_DATA;
-
-DEFINE_LHASH_OF(ERR_STRING_DATA);
-
-void ERR_put_error(int lib, int func, int reason, const char *file, int line);
-void ERR_set_error_data(char *data, int flags);
-
-unsigned long ERR_get_error(void);
-unsigned long ERR_get_error_line(const char **file, int *line);
-unsigned long ERR_get_error_line_data(const char **file, int *line,
-                                      const char **data, int *flags);
-unsigned long ERR_peek_error(void);
-unsigned long ERR_peek_error_line(const char **file, int *line);
-unsigned long ERR_peek_error_line_data(const char **file, int *line,
-                                       const char **data, int *flags);
-unsigned long ERR_peek_last_error(void);
-unsigned long ERR_peek_last_error_line(const char **file, int *line);
-unsigned long ERR_peek_last_error_line_data(const char **file, int *line,
-                                            const char **data, int *flags);
-void ERR_clear_error(void);
-char *ERR_error_string(unsigned long e, char *buf);
-void ERR_error_string_n(unsigned long e, char *buf, size_t len);
-const char *ERR_lib_error_string(unsigned long e);
-const char *ERR_func_error_string(unsigned long e);
-const char *ERR_reason_error_string(unsigned long e);
-void ERR_print_errors_cb(int (*cb) (const char *str, size_t len, void *u),
-                         void *u);
-# ifndef OPENSSL_NO_STDIO
-void ERR_print_errors_fp(FILE *fp);
-# endif
-void ERR_print_errors(BIO *bp);
-void ERR_add_error_data(int num, ...);
-void ERR_add_error_vdata(int num, va_list args);
-int ERR_load_strings(int lib, ERR_STRING_DATA str);
-int ERR_unload_strings(int lib, ERR_STRING_DATA str);
-int ERR_load_ERR_strings(void);
-
-#if OPENSSL_API_COMPAT < 0x10100000L
-# define ERR_load_crypto_strings() \
-    OPENSSL_init_crypto(OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL)
-# define ERR_free_strings() while(0) continue
-#endif
-
-DEPRECATEDIN_1_1_0(void ERR_remove_thread_state(void *))
-DEPRECATEDIN_1_0_0(void ERR_remove_state(unsigned long pid))
-ERR_STATE *ERR_get_state(void);
-
-int ERR_get_next_error_library(void);
-
-int ERR_set_mark(void);
-int ERR_pop_to_mark(void);
-
-#ifdef  __cplusplus
-}
-#endif
-
-#endif

gpac-2.2.1.tar.gz/extra_lib/include/openssl/evp.h Deleted

@@ -1,1590 +0,0 @@
-/*
- * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
- *
- * Licensed under the OpenSSL license (the "License").  You may not use
- * this file except in compliance with the License.  You can obtain a copy
- * in the file LICENSE in the source distribution or at
- * https://www.openssl.org/source/license.html
- */
-
-#ifndef HEADER_ENVELOPE_H
-# define HEADER_ENVELOPE_H
-
-# include <openssl/opensslconf.h>
-# include <openssl/ossl_typ.h>
-# include <openssl/symhacks.h>
-# include <openssl/bio.h>
-
-# define EVP_MAX_MD_SIZE                 64/* longest known is SHA512 */
-# define EVP_MAX_KEY_LENGTH              64
-# define EVP_MAX_IV_LENGTH               16
-# define EVP_MAX_BLOCK_LENGTH            32
-
-# define PKCS5_SALT_LEN                  8
-/* Default PKCS#5 iteration count */
-# define PKCS5_DEFAULT_ITER              2048
-
-# include <openssl/objects.h>
-
-# define EVP_PK_RSA      0x0001
-# define EVP_PK_DSA      0x0002
-# define EVP_PK_DH       0x0004
-# define EVP_PK_EC       0x0008
-# define EVP_PKT_SIGN    0x0010
-# define EVP_PKT_ENC     0x0020
-# define EVP_PKT_EXCH    0x0040
-# define EVP_PKS_RSA     0x0100
-# define EVP_PKS_DSA     0x0200
-# define EVP_PKS_EC      0x0400
-
-# define EVP_PKEY_NONE   NID_undef
-# define EVP_PKEY_RSA    NID_rsaEncryption
-# define EVP_PKEY_RSA2   NID_rsa
-# define EVP_PKEY_DSA    NID_dsa
-# define EVP_PKEY_DSA1   NID_dsa_2
-# define EVP_PKEY_DSA2   NID_dsaWithSHA
-# define EVP_PKEY_DSA3   NID_dsaWithSHA1
-# define EVP_PKEY_DSA4   NID_dsaWithSHA1_2
-# define EVP_PKEY_DH     NID_dhKeyAgreement
-# define EVP_PKEY_DHX    NID_dhpublicnumber
-# define EVP_PKEY_EC     NID_X9_62_id_ecPublicKey
-# define EVP_PKEY_HMAC   NID_hmac
-# define EVP_PKEY_CMAC   NID_cmac
-# define EVP_PKEY_TLS1_PRF NID_tls1_prf
-# define EVP_PKEY_HKDF   NID_hkdf
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-# define EVP_PKEY_MO_SIGN        0x0001
-# define EVP_PKEY_MO_VERIFY      0x0002
-# define EVP_PKEY_MO_ENCRYPT     0x0004
-# define EVP_PKEY_MO_DECRYPT     0x0008
-
-# ifndef EVP_MD
-EVP_MD *EVP_MD_meth_new(int md_type, int pkey_type);
-EVP_MD *EVP_MD_meth_dup(const EVP_MD *md);
-void EVP_MD_meth_free(EVP_MD *md);
-
-int EVP_MD_meth_set_input_blocksize(EVP_MD *md, int blocksize);
-int EVP_MD_meth_set_result_size(EVP_MD *md, int resultsize);
-int EVP_MD_meth_set_app_datasize(EVP_MD *md, int datasize);
-int EVP_MD_meth_set_flags(EVP_MD *md, unsigned long flags);
-int EVP_MD_meth_set_init(EVP_MD *md, int (*init)(EVP_MD_CTX *ctx));
-int EVP_MD_meth_set_update(EVP_MD *md, int (*update)(EVP_MD_CTX *ctx,
-                                                     const void *data,
-                                                     size_t count));
-int EVP_MD_meth_set_final(EVP_MD *md, int (*final)(EVP_MD_CTX *ctx,
-                                                   unsigned char *md));
-int EVP_MD_meth_set_copy(EVP_MD *md, int (*copy)(EVP_MD_CTX *to,
-                                                 const EVP_MD_CTX *from));
-int EVP_MD_meth_set_cleanup(EVP_MD *md, int (*cleanup)(EVP_MD_CTX *ctx));
-int EVP_MD_meth_set_ctrl(EVP_MD *md, int (*ctrl)(EVP_MD_CTX *ctx, int cmd,
-                                                 int p1, void *p2));
-
-int EVP_MD_meth_get_input_blocksize(const EVP_MD *md);
-int EVP_MD_meth_get_result_size(const EVP_MD *md);
-int EVP_MD_meth_get_app_datasize(const EVP_MD *md);
-unsigned long EVP_MD_meth_get_flags(const EVP_MD *md);
-int (*EVP_MD_meth_get_init(const EVP_MD *md))(EVP_MD_CTX *ctx);
-int (*EVP_MD_meth_get_update(const EVP_MD *md))(EVP_MD_CTX *ctx,
-                                                const void *data,
-                                                size_t count);
-int (*EVP_MD_meth_get_final(const EVP_MD *md))(EVP_MD_CTX *ctx,
-                                               unsigned char *md);
-int (*EVP_MD_meth_get_copy(const EVP_MD *md))(EVP_MD_CTX *to,
-                                              const EVP_MD_CTX *from);
-int (*EVP_MD_meth_get_cleanup(const EVP_MD *md))(EVP_MD_CTX *ctx);
-int (*EVP_MD_meth_get_ctrl(const EVP_MD *md))(EVP_MD_CTX *ctx, int cmd,
-                                              int p1, void *p2);
-
-/* digest can only handle a single block */
-#  define EVP_MD_FLAG_ONESHOT     0x0001
-
-/* DigestAlgorithmIdentifier flags... */
-
-#  define EVP_MD_FLAG_DIGALGID_MASK               0x0018
-
-/* NULL or absent parameter accepted. Use NULL */
-
-#  define EVP_MD_FLAG_DIGALGID_NULL               0x0000
-
-/* NULL or absent parameter accepted. Use NULL for PKCS#1 otherwise absent */
-
-#  define EVP_MD_FLAG_DIGALGID_ABSENT             0x0008
-
-/* Custom handling via ctrl */
-
-#  define EVP_MD_FLAG_DIGALGID_CUSTOM             0x0018
-
-/* Note if suitable for use in FIPS mode */
-#  define EVP_MD_FLAG_FIPS        0x0400
-
-/* Digest ctrls */
-
-#  define EVP_MD_CTRL_DIGALGID                    0x1
-#  define EVP_MD_CTRL_MICALG                      0x2
-
-/* Minimum Algorithm specific ctrl value */
-
-#  define EVP_MD_CTRL_ALG_CTRL                    0x1000
-
-# endif                         /* !EVP_MD */
-
-/* values for EVP_MD_CTX flags */
-
-# define EVP_MD_CTX_FLAG_ONESHOT         0x0001/* digest update will be
-                                                * called once only */
-# define EVP_MD_CTX_FLAG_CLEANED         0x0002/* context has already been
-                                                * cleaned */
-# define EVP_MD_CTX_FLAG_REUSE           0x0004/* Don't free up ctx->md_data
-                                                * in EVP_MD_CTX_reset */
-/*
- * FIPS and pad options are ignored in 1.0.0, definitions are here so we
- * don't accidentally reuse the values for other purposes.
- */
-
-# define EVP_MD_CTX_FLAG_NON_FIPS_ALLOW  0x0008/* Allow use of non FIPS
-                                                * digest in FIPS mode */
-
-/*
- * The following PAD options are also currently ignored in 1.0.0, digest
- * parameters are handled through EVP_DigestSign*() and EVP_DigestVerify*()
- * instead.
- */
-# define EVP_MD_CTX_FLAG_PAD_MASK        0xF0/* RSA mode to use */
-# define EVP_MD_CTX_FLAG_PAD_PKCS1       0x00/* PKCS#1 v1.5 mode */
-# define EVP_MD_CTX_FLAG_PAD_X931        0x10/* X9.31 mode */
-# define EVP_MD_CTX_FLAG_PAD_PSS         0x20/* PSS mode */
-
-# define EVP_MD_CTX_FLAG_NO_INIT         0x0100/* Don't initialize md_data */
-/*
- * Some functions such as EVP_DigestSign only finalise copies of internal
- * contexts so additional data can be included after the finalisation call.
- * This is inefficient if this functionality is not required: it is disabled
- * if the following flag is set.
- */
-# define EVP_MD_CTX_FLAG_FINALISE        0x0200
-
-EVP_CIPHER *EVP_CIPHER_meth_new(int cipher_type, int block_size, int key_len);
-EVP_CIPHER *EVP_CIPHER_meth_dup(const EVP_CIPHER *cipher);
-void EVP_CIPHER_meth_free(EVP_CIPHER *cipher);
-
-int EVP_CIPHER_meth_set_iv_length(EVP_CIPHER *cipher, int iv_len);
-int EVP_CIPHER_meth_set_flags(EVP_CIPHER *cipher, unsigned long flags);
-int EVP_CIPHER_meth_set_impl_ctx_size(EVP_CIPHER *cipher, int ctx_size);
-int EVP_CIPHER_meth_set_init(EVP_CIPHER *cipher,
-                             int (*init) (EVP_CIPHER_CTX *ctx,
-                                          const unsigned char *key,
-                                          const unsigned char *iv,
-                                          int enc));
-int EVP_CIPHER_meth_set_do_cipher(EVP_CIPHER *cipher,
-                                  int (*do_cipher) (EVP_CIPHER_CTX *ctx,
-                                                    unsigned char *out,
-                                                    const unsigned char *in,
-                                                    size_t inl));
-int EVP_CIPHER_meth_set_cleanup(EVP_CIPHER *cipher,
-                                int (*cleanup) (EVP_CIPHER_CTX *));
-int EVP_CIPHER_meth_set_set_asn1_params(EVP_CIPHER *cipher,
-                                        int (*set_asn1_parameters) (EVP_CIPHER_CTX *,
-                                                                    ASN1_TYPE *));
-int EVP_CIPHER_meth_set_get_asn1_params(EVP_CIPHER *cipher,
-                                        int (*get_asn1_parameters) (EVP_CIPHER_CTX *,
-                                                                    ASN1_TYPE *));
-int EVP_CIPHER_meth_set_ctrl(EVP_CIPHER *cipher,
-                             int (*ctrl) (EVP_CIPHER_CTX *, int type,
-                                          int arg, void *ptr));
-
-int (*EVP_CIPHER_meth_get_init(const EVP_CIPHER *cipher))(EVP_CIPHER_CTX *ctx,
-                                                          const unsigned char *key,
-                                                          const unsigned char *iv,
-                                                          int enc);
-int (*EVP_CIPHER_meth_get_do_cipher(const EVP_CIPHER *cipher))(EVP_CIPHER_CTX *ctx,
-                                                               unsigned char *out,
-                                                               const unsigned char *in,
-                                                               size_t inl);
-int (*EVP_CIPHER_meth_get_cleanup(const EVP_CIPHER *cipher))(EVP_CIPHER_CTX *);
-int (*EVP_CIPHER_meth_get_set_asn1_params(const EVP_CIPHER *cipher))(EVP_CIPHER_CTX *,
-                                                                     ASN1_TYPE *);
-int (*EVP_CIPHER_meth_get_get_asn1_params(const EVP_CIPHER *cipher))(EVP_CIPHER_CTX *,
-                                                               ASN1_TYPE *);
-int (*EVP_CIPHER_meth_get_ctrl(const EVP_CIPHER *cipher))(EVP_CIPHER_CTX *,
-                                                          int type, int arg,
-                                                          void *ptr);
-
-/* Values for cipher flags */
-
-/* Modes for ciphers */
-
-# define         EVP_CIPH_STREAM_CIPHER          0x0
-# define         EVP_CIPH_ECB_MODE               0x1
-# define         EVP_CIPH_CBC_MODE               0x2
-# define         EVP_CIPH_CFB_MODE               0x3
-# define         EVP_CIPH_OFB_MODE               0x4
-# define         EVP_CIPH_CTR_MODE               0x5
-# define         EVP_CIPH_GCM_MODE               0x6
-# define         EVP_CIPH_CCM_MODE               0x7
-# define         EVP_CIPH_XTS_MODE               0x10001
-# define         EVP_CIPH_WRAP_MODE              0x10002
-# define         EVP_CIPH_OCB_MODE               0x10003
-# define         EVP_CIPH_MODE                   0xF0007
-/* Set if variable length cipher */
-# define         EVP_CIPH_VARIABLE_LENGTH        0x8
-/* Set if the iv handling should be done by the cipher itself */
-# define         EVP_CIPH_CUSTOM_IV              0x10
-/* Set if the cipher's init() function should be called if key is NULL */
-# define         EVP_CIPH_ALWAYS_CALL_INIT       0x20
-/* Call ctrl() to init cipher parameters */
-# define         EVP_CIPH_CTRL_INIT              0x40
-/* Don't use standard key length function */
-# define         EVP_CIPH_CUSTOM_KEY_LENGTH      0x80
-/* Don't use standard block padding */
-# define         EVP_CIPH_NO_PADDING             0x100
-/* cipher handles random key generation */
-# define         EVP_CIPH_RAND_KEY               0x200
-/* cipher has its own additional copying logic */
-# define         EVP_CIPH_CUSTOM_COPY            0x400
-/* Allow use default ASN1 get/set iv */
-# define         EVP_CIPH_FLAG_DEFAULT_ASN1      0x1000
-/* Buffer length in bits not bytes: CFB1 mode only */
-# define         EVP_CIPH_FLAG_LENGTH_BITS       0x2000
-/* Note if suitable for use in FIPS mode */
-# define         EVP_CIPH_FLAG_FIPS              0x4000
-/* Allow non FIPS cipher in FIPS mode */
-# define         EVP_CIPH_FLAG_NON_FIPS_ALLOW    0x8000
-/*
- * Cipher handles any and all padding logic as well as finalisation.
- */
-# define         EVP_CIPH_FLAG_CUSTOM_CIPHER     0x100000
-# define         EVP_CIPH_FLAG_AEAD_CIPHER       0x200000
-# define         EVP_CIPH_FLAG_TLS1_1_MULTIBLOCK 0x400000
-/* Cipher can handle pipeline operations */
-# define         EVP_CIPH_FLAG_PIPELINE          0X800000
-
-/*
- * Cipher context flag to indicate we can handle wrap mode: if allowed in
- * older applications it could overflow buffers.
- */
-
-# define         EVP_CIPHER_CTX_FLAG_WRAP_ALLOW  0x1
-
-/* ctrl() values */
-
-# define         EVP_CTRL_INIT                   0x0
-# define         EVP_CTRL_SET_KEY_LENGTH         0x1
-# define         EVP_CTRL_GET_RC2_KEY_BITS       0x2
-# define         EVP_CTRL_SET_RC2_KEY_BITS       0x3
-# define         EVP_CTRL_GET_RC5_ROUNDS         0x4
-# define         EVP_CTRL_SET_RC5_ROUNDS         0x5
-# define         EVP_CTRL_RAND_KEY               0x6
-# define         EVP_CTRL_PBE_PRF_NID            0x7
-# define         EVP_CTRL_COPY                   0x8
-# define         EVP_CTRL_AEAD_SET_IVLEN         0x9
-# define         EVP_CTRL_AEAD_GET_TAG           0x10
-# define         EVP_CTRL_AEAD_SET_TAG           0x11
-# define         EVP_CTRL_AEAD_SET_IV_FIXED      0x12
-# define         EVP_CTRL_GCM_SET_IVLEN          EVP_CTRL_AEAD_SET_IVLEN
-# define         EVP_CTRL_GCM_GET_TAG            EVP_CTRL_AEAD_GET_TAG
-# define         EVP_CTRL_GCM_SET_TAG            EVP_CTRL_AEAD_SET_TAG
-# define         EVP_CTRL_GCM_SET_IV_FIXED       EVP_CTRL_AEAD_SET_IV_FIXED
-# define         EVP_CTRL_GCM_IV_GEN             0x13
-# define         EVP_CTRL_CCM_SET_IVLEN          EVP_CTRL_AEAD_SET_IVLEN
-# define         EVP_CTRL_CCM_GET_TAG            EVP_CTRL_AEAD_GET_TAG
-# define         EVP_CTRL_CCM_SET_TAG            EVP_CTRL_AEAD_SET_TAG
-# define         EVP_CTRL_CCM_SET_IV_FIXED       EVP_CTRL_AEAD_SET_IV_FIXED
-# define         EVP_CTRL_CCM_SET_L              0x14
-# define         EVP_CTRL_CCM_SET_MSGLEN         0x15
-/*
- * AEAD cipher deduces payload length and returns number of bytes required to
- * store MAC and eventual padding. Subsequent call to EVP_Cipher even
- * appends/verifies MAC.
- */
-# define         EVP_CTRL_AEAD_TLS1_AAD          0x16
-/* Used by composite AEAD ciphers, no-op in GCM, CCM... */
-# define         EVP_CTRL_AEAD_SET_MAC_KEY       0x17
-/* Set the GCM invocation field, decrypt only */
-# define         EVP_CTRL_GCM_SET_IV_INV         0x18
-
-# define         EVP_CTRL_TLS1_1_MULTIBLOCK_AAD  0x19
-# define         EVP_CTRL_TLS1_1_MULTIBLOCK_ENCRYPT      0x1a
-# define         EVP_CTRL_TLS1_1_MULTIBLOCK_DECRYPT      0x1b
-# define         EVP_CTRL_TLS1_1_MULTIBLOCK_MAX_BUFSIZE  0x1c
-
-# define         EVP_CTRL_SSL3_MASTER_SECRET             0x1d
-
-/* EVP_CTRL_SET_SBOX takes the char * specifying S-boxes */
-# define         EVP_CTRL_SET_SBOX                       0x1e
-/*
- * EVP_CTRL_SBOX_USED takes a 'size_t' and 'char *', pointing at a
- * pre-allocated buffer with specified size
- */
-# define         EVP_CTRL_SBOX_USED                      0x1f
-/* EVP_CTRL_KEY_MESH takes 'size_t' number of bytes to mesh the key after,
- * 0 switches meshing off
- */
-# define         EVP_CTRL_KEY_MESH                       0x20
-/* EVP_CTRL_BLOCK_PADDING_MODE takes the padding mode */
-# define         EVP_CTRL_BLOCK_PADDING_MODE             0x21
-
-/* Set the output buffers to use for a pipelined operation */
-# define         EVP_CTRL_SET_PIPELINE_OUTPUT_BUFS       0x22
-/* Set the input buffers to use for a pipelined operation */
-# define         EVP_CTRL_SET_PIPELINE_INPUT_BUFS        0x23
-/* Set the input buffer lengths to use for a pipelined operation */
-# define         EVP_CTRL_SET_PIPELINE_INPUT_LENS        0x24
-
-/* Padding modes */
-#define EVP_PADDING_PKCS7       1
-#define EVP_PADDING_ISO7816_4   2
-#define EVP_PADDING_ANSI923     3
-#define EVP_PADDING_ISO10126    4
-#define EVP_PADDING_ZERO        5
-
-/* RFC 5246 defines additional data to be 13 bytes in length */
-# define         EVP_AEAD_TLS1_AAD_LEN           13
-
-typedef struct {
-    unsigned char *out;
-    const unsigned char *inp;
-    size_t len;
-    unsigned int interleave;
-} EVP_CTRL_TLS1_1_MULTIBLOCK_PARAM;
-
-/* GCM TLS constants */
-/* Length of fixed part of IV derived from PRF */
-# define EVP_GCM_TLS_FIXED_IV_LEN                        4
-/* Length of explicit part of IV part of TLS records */
-# define EVP_GCM_TLS_EXPLICIT_IV_LEN                     8
-/* Length of tag for TLS */
-# define EVP_GCM_TLS_TAG_LEN                             16
-
-/* CCM TLS constants */
-/* Length of fixed part of IV derived from PRF */
-# define EVP_CCM_TLS_FIXED_IV_LEN                        4
-/* Length of explicit part of IV part of TLS records */
-# define EVP_CCM_TLS_EXPLICIT_IV_LEN                     8
-
-typedef struct evp_cipher_info_st {
-    const EVP_CIPHER *cipher;
-    unsigned char ivEVP_MAX_IV_LENGTH;
-} EVP_CIPHER_INFO;
-
-
-/* Password based encryption function */
-typedef int (EVP_PBE_KEYGEN) (EVP_CIPHER_CTX *ctx, const char *pass,
-                              int passlen, ASN1_TYPE *param,
-                              const EVP_CIPHER *cipher, const EVP_MD *md,
-                              int en_de);
-
-# ifndef OPENSSL_NO_RSA
-#  define EVP_PKEY_assign_RSA(pkey,rsa) EVP_PKEY_assign((pkey),EVP_PKEY_RSA,\
-                                        (char *)(rsa))
-# endif
-
-# ifndef OPENSSL_NO_DSA
-#  define EVP_PKEY_assign_DSA(pkey,dsa) EVP_PKEY_assign((pkey),EVP_PKEY_DSA,\
-                                        (char *)(dsa))
-# endif
-
-# ifndef OPENSSL_NO_DH
-#  define EVP_PKEY_assign_DH(pkey,dh) EVP_PKEY_assign((pkey),EVP_PKEY_DH,\
-                                        (char *)(dh))
-# endif
-
-# ifndef OPENSSL_NO_EC
-#  define EVP_PKEY_assign_EC_KEY(pkey,eckey) EVP_PKEY_assign((pkey),EVP_PKEY_EC,\
-                                        (char *)(eckey))
-# endif
-
-/* Add some extra combinations */
-# define EVP_get_digestbynid(a) EVP_get_digestbyname(OBJ_nid2sn(a))
-# define EVP_get_digestbyobj(a) EVP_get_digestbynid(OBJ_obj2nid(a))
-# define EVP_get_cipherbynid(a) EVP_get_cipherbyname(OBJ_nid2sn(a))
-# define EVP_get_cipherbyobj(a) EVP_get_cipherbynid(OBJ_obj2nid(a))
-
-int EVP_MD_type(const EVP_MD *md);
-# define EVP_MD_nid(e)                   EVP_MD_type(e)
-# define EVP_MD_name(e)                  OBJ_nid2sn(EVP_MD_nid(e))
-int EVP_MD_pkey_type(const EVP_MD *md);
-int EVP_MD_size(const EVP_MD *md);
-int EVP_MD_block_size(const EVP_MD *md);
-unsigned long EVP_MD_flags(const EVP_MD *md);
-
-const EVP_MD *EVP_MD_CTX_md(const EVP_MD_CTX *ctx);
-int (*EVP_MD_CTX_update_fn(EVP_MD_CTX *ctx))(EVP_MD_CTX *ctx,
-                                             const void *data, size_t count);
-void EVP_MD_CTX_set_update_fn(EVP_MD_CTX *ctx,
-                              int (*update) (EVP_MD_CTX *ctx,
-                                             const void *data, size_t count));
-# define EVP_MD_CTX_size(e)              EVP_MD_size(EVP_MD_CTX_md(e))
-# define EVP_MD_CTX_block_size(e)        EVP_MD_block_size(EVP_MD_CTX_md(e))
-# define EVP_MD_CTX_type(e)              EVP_MD_type(EVP_MD_CTX_md(e))
-EVP_PKEY_CTX *EVP_MD_CTX_pkey_ctx(const EVP_MD_CTX *ctx);
-void *EVP_MD_CTX_md_data(const EVP_MD_CTX *ctx);
-
-int EVP_CIPHER_nid(const EVP_CIPHER *cipher);
-# define EVP_CIPHER_name(e)              OBJ_nid2sn(EVP_CIPHER_nid(e))
-int EVP_CIPHER_block_size(const EVP_CIPHER *cipher);
-int EVP_CIPHER_impl_ctx_size(const EVP_CIPHER *cipher);
-int EVP_CIPHER_key_length(const EVP_CIPHER *cipher);
-int EVP_CIPHER_iv_length(const EVP_CIPHER *cipher);
-unsigned long EVP_CIPHER_flags(const EVP_CIPHER *cipher);
-# define EVP_CIPHER_mode(e)              (EVP_CIPHER_flags(e) & EVP_CIPH_MODE)
-
-const EVP_CIPHER *EVP_CIPHER_CTX_cipher(const EVP_CIPHER_CTX *ctx);
-int EVP_CIPHER_CTX_encrypting(const EVP_CIPHER_CTX *ctx);
-int EVP_CIPHER_CTX_nid(const EVP_CIPHER_CTX *ctx);
-int EVP_CIPHER_CTX_block_size(const EVP_CIPHER_CTX *ctx);
-int EVP_CIPHER_CTX_key_length(const EVP_CIPHER_CTX *ctx);
-int EVP_CIPHER_CTX_iv_length(const EVP_CIPHER_CTX *ctx);
-const unsigned char *EVP_CIPHER_CTX_iv(const EVP_CIPHER_CTX *ctx);
-const unsigned char *EVP_CIPHER_CTX_original_iv(const EVP_CIPHER_CTX *ctx);
-unsigned char *EVP_CIPHER_CTX_iv_noconst(EVP_CIPHER_CTX *ctx);
-unsigned char *EVP_CIPHER_CTX_buf_noconst(EVP_CIPHER_CTX *ctx);
-int EVP_CIPHER_CTX_num(const EVP_CIPHER_CTX *ctx);
-void EVP_CIPHER_CTX_set_num(EVP_CIPHER_CTX *ctx, int num);
-int EVP_CIPHER_CTX_copy(EVP_CIPHER_CTX *out, const EVP_CIPHER_CTX *in);
-void *EVP_CIPHER_CTX_get_app_data(const EVP_CIPHER_CTX *ctx);
-void EVP_CIPHER_CTX_set_app_data(EVP_CIPHER_CTX *ctx, void *data);
-void *EVP_CIPHER_CTX_get_cipher_data(const EVP_CIPHER_CTX *ctx);
-void *EVP_CIPHER_CTX_set_cipher_data(EVP_CIPHER_CTX *ctx, void *cipher_data);
-# define EVP_CIPHER_CTX_type(c)         EVP_CIPHER_type(EVP_CIPHER_CTX_cipher(c))
-# if OPENSSL_API_COMPAT < 0x10100000L
-#  define EVP_CIPHER_CTX_flags(c)       EVP_CIPHER_flags(EVP_CIPHER_CTX_cipher(c))
-# endif
-# define EVP_CIPHER_CTX_mode(c)         EVP_CIPHER_mode(EVP_CIPHER_CTX_cipher(c))
-
-# define EVP_ENCODE_LENGTH(l)    (((l+2)/3*4)+(l/48+1)*2+80)
-# define EVP_DECODE_LENGTH(l)    ((l+3)/4*3+80)
-
-# define EVP_SignInit_ex(a,b,c)          EVP_DigestInit_ex(a,b,c)
-# define EVP_SignInit(a,b)               EVP_DigestInit(a,b)
-# define EVP_SignUpdate(a,b,c)           EVP_DigestUpdate(a,b,c)
-# define EVP_VerifyInit_ex(a,b,c)        EVP_DigestInit_ex(a,b,c)
-# define EVP_VerifyInit(a,b)             EVP_DigestInit(a,b)
-# define EVP_VerifyUpdate(a,b,c)         EVP_DigestUpdate(a,b,c)
-# define EVP_OpenUpdate(a,b,c,d,e)       EVP_DecryptUpdate(a,b,c,d,e)
-# define EVP_SealUpdate(a,b,c,d,e)       EVP_EncryptUpdate(a,b,c,d,e)
-# define EVP_DigestSignUpdate(a,b,c)     EVP_DigestUpdate(a,b,c)
-# define EVP_DigestVerifyUpdate(a,b,c)   EVP_DigestUpdate(a,b,c)
-
-# ifdef CONST_STRICT
-void BIO_set_md(BIO *, const EVP_MD *md);
-# else
-#  define BIO_set_md(b,md)               BIO_ctrl(b,BIO_C_SET_MD,0,(char *)md)
-# endif
-# define BIO_get_md(b,mdp)               BIO_ctrl(b,BIO_C_GET_MD,0,(char *)mdp)
-# define BIO_get_md_ctx(b,mdcp)     BIO_ctrl(b,BIO_C_GET_MD_CTX,0,(char *)mdcp)
-# define BIO_set_md_ctx(b,mdcp)     BIO_ctrl(b,BIO_C_SET_MD_CTX,0,(char *)mdcp)
-# define BIO_get_cipher_status(b)        BIO_ctrl(b,BIO_C_GET_CIPHER_STATUS,0,NULL)
-# define BIO_get_cipher_ctx(b,c_pp)      BIO_ctrl(b,BIO_C_GET_CIPHER_CTX,0,(char *)c_pp)
-
-/*__owur*/ int EVP_Cipher(EVP_CIPHER_CTX *c,
-                          unsigned char *out,
-                          const unsigned char *in, unsigned int inl);
-
-# define EVP_add_cipher_alias(n,alias) \
-        OBJ_NAME_add((alias),OBJ_NAME_TYPE_CIPHER_METH|OBJ_NAME_ALIAS,(n))
-# define EVP_add_digest_alias(n,alias) \
-        OBJ_NAME_add((alias),OBJ_NAME_TYPE_MD_METH|OBJ_NAME_ALIAS,(n))
-# define EVP_delete_cipher_alias(alias) \
-        OBJ_NAME_remove(alias,OBJ_NAME_TYPE_CIPHER_METH|OBJ_NAME_ALIAS);
-# define EVP_delete_digest_alias(alias) \
-        OBJ_NAME_remove(alias,OBJ_NAME_TYPE_MD_METH|OBJ_NAME_ALIAS);
-
-int EVP_MD_CTX_ctrl(EVP_MD_CTX *ctx, int cmd, int p1, void *p2);
-EVP_MD_CTX *EVP_MD_CTX_new(void);
-int EVP_MD_CTX_reset(EVP_MD_CTX *ctx);
-void EVP_MD_CTX_free(EVP_MD_CTX *ctx);
-# define EVP_MD_CTX_create()     EVP_MD_CTX_new()
-# define EVP_MD_CTX_init(ctx)    EVP_MD_CTX_reset((ctx))
-# define EVP_MD_CTX_destroy(ctx) EVP_MD_CTX_free((ctx))
-__owur int EVP_MD_CTX_copy_ex(EVP_MD_CTX *out, const EVP_MD_CTX *in);
-void EVP_MD_CTX_set_flags(EVP_MD_CTX *ctx, int flags);
-void EVP_MD_CTX_clear_flags(EVP_MD_CTX *ctx, int flags);
-int EVP_MD_CTX_test_flags(const EVP_MD_CTX *ctx, int flags);
-__owur int EVP_DigestInit_ex(EVP_MD_CTX *ctx, const EVP_MD *type,
-                                 ENGINE *impl);
-__owur int EVP_DigestUpdate(EVP_MD_CTX *ctx, const void *d,
-                                size_t cnt);
-__owur int EVP_DigestFinal_ex(EVP_MD_CTX *ctx, unsigned char *md,
-                                  unsigned int *s);
-__owur int EVP_Digest(const void *data, size_t count,
-                          unsigned char *md, unsigned int *size,
-                          const EVP_MD *type, ENGINE *impl);
-
-__owur int EVP_MD_CTX_copy(EVP_MD_CTX *out, const EVP_MD_CTX *in);
-__owur int EVP_DigestInit(EVP_MD_CTX *ctx, const EVP_MD *type);
-__owur int EVP_DigestFinal(EVP_MD_CTX *ctx, unsigned char *md,
-                           unsigned int *s);
-
-#ifndef OPENSSL_NO_UI
-int EVP_read_pw_string(char *buf, int length, const char *prompt, int verify);
-int EVP_read_pw_string_min(char *buf, int minlen, int maxlen,
-                           const char *prompt, int verify);
-void EVP_set_pw_prompt(const char *prompt);
-char *EVP_get_pw_prompt(void);
-#endif
-
-__owur int EVP_BytesToKey(const EVP_CIPHER *type, const EVP_MD *md,
-                          const unsigned char *salt,
-                          const unsigned char *data, int datal, int count,
-                          unsigned char *key, unsigned char *iv);
-
-void EVP_CIPHER_CTX_set_flags(EVP_CIPHER_CTX *ctx, int flags);
-void EVP_CIPHER_CTX_clear_flags(EVP_CIPHER_CTX *ctx, int flags);
-int EVP_CIPHER_CTX_test_flags(const EVP_CIPHER_CTX *ctx, int flags);
-
-__owur int EVP_EncryptInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher,
-                           const unsigned char *key, const unsigned char *iv);
-/*__owur*/ int EVP_EncryptInit_ex(EVP_CIPHER_CTX *ctx,
-                                  const EVP_CIPHER *cipher, ENGINE *impl,
-                                  const unsigned char *key,
-                                  const unsigned char *iv);
-/*__owur*/ int EVP_EncryptUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out,
-                                 int *outl, const unsigned char *in, int inl);
-/*__owur*/ int EVP_EncryptFinal_ex(EVP_CIPHER_CTX *ctx, unsigned char *out,
-                                   int *outl);
-/*__owur*/ int EVP_EncryptFinal(EVP_CIPHER_CTX *ctx, unsigned char *out,
-                                int *outl);
-
-__owur int EVP_DecryptInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher,
-                           const unsigned char *key, const unsigned char *iv);
-/*__owur*/ int EVP_DecryptInit_ex(EVP_CIPHER_CTX *ctx,
-                                  const EVP_CIPHER *cipher, ENGINE *impl,
-                                  const unsigned char *key,
-                                  const unsigned char *iv);
-/*__owur*/ int EVP_DecryptUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out,
-                                 int *outl, const unsigned char *in, int inl);
-__owur int EVP_DecryptFinal(EVP_CIPHER_CTX *ctx, unsigned char *outm,
-                            int *outl);
-/*__owur*/ int EVP_DecryptFinal_ex(EVP_CIPHER_CTX *ctx, unsigned char *outm,
-                                   int *outl);
-
-__owur int EVP_CipherInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher,
-                          const unsigned char *key, const unsigned char *iv,
-                          int enc);
-/*__owur*/ int EVP_CipherInit_ex(EVP_CIPHER_CTX *ctx,
-                                 const EVP_CIPHER *cipher, ENGINE *impl,
-                                 const unsigned char *key,
-                                 const unsigned char *iv, int enc);
-__owur int EVP_CipherUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out,
-                            int *outl, const unsigned char *in, int inl);
-__owur int EVP_CipherFinal(EVP_CIPHER_CTX *ctx, unsigned char *outm,
-                           int *outl);
-__owur int EVP_CipherFinal_ex(EVP_CIPHER_CTX *ctx, unsigned char *outm,
-                              int *outl);
-
-__owur int EVP_SignFinal(EVP_MD_CTX *ctx, unsigned char *md, unsigned int *s,
-                         EVP_PKEY *pkey);
-
-__owur int EVP_VerifyFinal(EVP_MD_CTX *ctx, const unsigned char *sigbuf,
-                           unsigned int siglen, EVP_PKEY *pkey);
-
-/*__owur*/ int EVP_DigestSignInit(EVP_MD_CTX *ctx, EVP_PKEY_CTX **pctx,
-                                  const EVP_MD *type, ENGINE *e,
-                                  EVP_PKEY *pkey);
-__owur int EVP_DigestSignFinal(EVP_MD_CTX *ctx, unsigned char *sigret,
-                               size_t *siglen);
-
-__owur int EVP_DigestVerifyInit(EVP_MD_CTX *ctx, EVP_PKEY_CTX **pctx,
-                                const EVP_MD *type, ENGINE *e,
-                                EVP_PKEY *pkey);
-__owur int EVP_DigestVerifyFinal(EVP_MD_CTX *ctx, const unsigned char *sig,
-                                 size_t siglen);
-
-# ifndef OPENSSL_NO_RSA
-__owur int EVP_OpenInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *type,
-                        const unsigned char *ek, int ekl,
-                        const unsigned char *iv, EVP_PKEY *priv);
-__owur int EVP_OpenFinal(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl);
-
-__owur int EVP_SealInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *type,
-                        unsigned char **ek, int *ekl, unsigned char *iv,
-                        EVP_PKEY **pubk, int npubk);
-__owur int EVP_SealFinal(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl);
-# endif
-
-EVP_ENCODE_CTX *EVP_ENCODE_CTX_new(void);
-void EVP_ENCODE_CTX_free(EVP_ENCODE_CTX *ctx);
-int EVP_ENCODE_CTX_copy(EVP_ENCODE_CTX *dctx, EVP_ENCODE_CTX *sctx);
-int EVP_ENCODE_CTX_num(EVP_ENCODE_CTX *ctx);
-void EVP_EncodeInit(EVP_ENCODE_CTX *ctx);
-int EVP_EncodeUpdate(EVP_ENCODE_CTX *ctx, unsigned char *out, int *outl,
-                     const unsigned char *in, int inl);
-void EVP_EncodeFinal(EVP_ENCODE_CTX *ctx, unsigned char *out, int *outl);
-int EVP_EncodeBlock(unsigned char *t, const unsigned char *f, int n);
-
-void EVP_DecodeInit(EVP_ENCODE_CTX *ctx);
-int EVP_DecodeUpdate(EVP_ENCODE_CTX *ctx, unsigned char *out, int *outl,
-                     const unsigned char *in, int inl);
-int EVP_DecodeFinal(EVP_ENCODE_CTX *ctx, unsigned
-                    char *out, int *outl);
-int EVP_DecodeBlock(unsigned char *t, const unsigned char *f, int n);
-
-# if OPENSSL_API_COMPAT < 0x10100000L
-#  define EVP_CIPHER_CTX_init(c)      EVP_CIPHER_CTX_reset(c)
-#  define EVP_CIPHER_CTX_cleanup(c)   EVP_CIPHER_CTX_reset(c)
-# endif
-EVP_CIPHER_CTX *EVP_CIPHER_CTX_new(void);
-int EVP_CIPHER_CTX_reset(EVP_CIPHER_CTX *c);
-void EVP_CIPHER_CTX_free(EVP_CIPHER_CTX *c);
-int EVP_CIPHER_CTX_set_key_length(EVP_CIPHER_CTX *x, int keylen);
-int EVP_CIPHER_CTX_set_padding(EVP_CIPHER_CTX *c, int pad);
-int EVP_CIPHER_CTX_ctrl(EVP_CIPHER_CTX *ctx, int type, int arg, void *ptr);
-int EVP_CIPHER_CTX_rand_key(EVP_CIPHER_CTX *ctx, unsigned char *key);
-
-const BIO_METHOD *BIO_f_md(void);
-const BIO_METHOD *BIO_f_base64(void);
-const BIO_METHOD *BIO_f_cipher(void);
-const BIO_METHOD *BIO_f_reliable(void);
-__owur int BIO_set_cipher(BIO *b, const EVP_CIPHER *c, const unsigned char *k,
-                          const unsigned char *i, int enc);
-
-const EVP_MD *EVP_md_null(void);
-# ifndef OPENSSL_NO_MD2
-const EVP_MD *EVP_md2(void);
-# endif
-# ifndef OPENSSL_NO_MD4
-const EVP_MD *EVP_md4(void);
-# endif
-# ifndef OPENSSL_NO_MD5
-const EVP_MD *EVP_md5(void);
-const EVP_MD *EVP_md5_sha1(void);
-# endif
-# ifndef OPENSSL_NO_BLAKE2
-const EVP_MD *EVP_blake2b512(void);
-const EVP_MD *EVP_blake2s256(void);
-# endif
-const EVP_MD *EVP_sha1(void);
-const EVP_MD *EVP_sha224(void);
-const EVP_MD *EVP_sha256(void);
-const EVP_MD *EVP_sha384(void);
-const EVP_MD *EVP_sha512(void);
-# ifndef OPENSSL_NO_MDC2
-const EVP_MD *EVP_mdc2(void);
-# endif
-# ifndef OPENSSL_NO_RMD160
-const EVP_MD *EVP_ripemd160(void);
-# endif
-# ifndef OPENSSL_NO_WHIRLPOOL
-const EVP_MD *EVP_whirlpool(void);
-# endif
-const EVP_CIPHER *EVP_enc_null(void); /* does nothing :-) */
-# ifndef OPENSSL_NO_DES
-const EVP_CIPHER *EVP_des_ecb(void);
-const EVP_CIPHER *EVP_des_ede(void);
-const EVP_CIPHER *EVP_des_ede3(void);
-const EVP_CIPHER *EVP_des_ede_ecb(void);
-const EVP_CIPHER *EVP_des_ede3_ecb(void);
-const EVP_CIPHER *EVP_des_cfb64(void);
-#  define EVP_des_cfb EVP_des_cfb64
-const EVP_CIPHER *EVP_des_cfb1(void);
-const EVP_CIPHER *EVP_des_cfb8(void);
-const EVP_CIPHER *EVP_des_ede_cfb64(void);
-#  define EVP_des_ede_cfb EVP_des_ede_cfb64
-const EVP_CIPHER *EVP_des_ede3_cfb64(void);
-#  define EVP_des_ede3_cfb EVP_des_ede3_cfb64
-const EVP_CIPHER *EVP_des_ede3_cfb1(void);
-const EVP_CIPHER *EVP_des_ede3_cfb8(void);
-const EVP_CIPHER *EVP_des_ofb(void);
-const EVP_CIPHER *EVP_des_ede_ofb(void);
-const EVP_CIPHER *EVP_des_ede3_ofb(void);
-const EVP_CIPHER *EVP_des_cbc(void);
-const EVP_CIPHER *EVP_des_ede_cbc(void);
-const EVP_CIPHER *EVP_des_ede3_cbc(void);
-const EVP_CIPHER *EVP_desx_cbc(void);
-const EVP_CIPHER *EVP_des_ede3_wrap(void);
-/*
- * This should now be supported through the dev_crypto ENGINE. But also, why
- * are rc4 and md5 declarations made here inside a "NO_DES" precompiler
- * branch?
- */
-# endif
-# ifndef OPENSSL_NO_RC4
-const EVP_CIPHER *EVP_rc4(void);
-const EVP_CIPHER *EVP_rc4_40(void);
-#  ifndef OPENSSL_NO_MD5
-const EVP_CIPHER *EVP_rc4_hmac_md5(void);
-#  endif
-# endif
-# ifndef OPENSSL_NO_IDEA
-const EVP_CIPHER *EVP_idea_ecb(void);
-const EVP_CIPHER *EVP_idea_cfb64(void);
-#  define EVP_idea_cfb EVP_idea_cfb64
-const EVP_CIPHER *EVP_idea_ofb(void);
-const EVP_CIPHER *EVP_idea_cbc(void);
-# endif
-# ifndef OPENSSL_NO_RC2
-const EVP_CIPHER *EVP_rc2_ecb(void);
-const EVP_CIPHER *EVP_rc2_cbc(void);
-const EVP_CIPHER *EVP_rc2_40_cbc(void);
-const EVP_CIPHER *EVP_rc2_64_cbc(void);
-const EVP_CIPHER *EVP_rc2_cfb64(void);
-#  define EVP_rc2_cfb EVP_rc2_cfb64
-const EVP_CIPHER *EVP_rc2_ofb(void);
-# endif
-# ifndef OPENSSL_NO_BF
-const EVP_CIPHER *EVP_bf_ecb(void);
-const EVP_CIPHER *EVP_bf_cbc(void);
-const EVP_CIPHER *EVP_bf_cfb64(void);
-#  define EVP_bf_cfb EVP_bf_cfb64
-const EVP_CIPHER *EVP_bf_ofb(void);
-# endif
-# ifndef OPENSSL_NO_CAST
-const EVP_CIPHER *EVP_cast5_ecb(void);
-const EVP_CIPHER *EVP_cast5_cbc(void);
-const EVP_CIPHER *EVP_cast5_cfb64(void);
-#  define EVP_cast5_cfb EVP_cast5_cfb64
-const EVP_CIPHER *EVP_cast5_ofb(void);
-# endif
-# ifndef OPENSSL_NO_RC5
-const EVP_CIPHER *EVP_rc5_32_12_16_cbc(void);
-const EVP_CIPHER *EVP_rc5_32_12_16_ecb(void);
-const EVP_CIPHER *EVP_rc5_32_12_16_cfb64(void);
-#  define EVP_rc5_32_12_16_cfb EVP_rc5_32_12_16_cfb64
-const EVP_CIPHER *EVP_rc5_32_12_16_ofb(void);
-# endif
-const EVP_CIPHER *EVP_aes_128_ecb(void);
-const EVP_CIPHER *EVP_aes_128_cbc(void);
-const EVP_CIPHER *EVP_aes_128_cfb1(void);
-const EVP_CIPHER *EVP_aes_128_cfb8(void);
-const EVP_CIPHER *EVP_aes_128_cfb128(void);
-# define EVP_aes_128_cfb EVP_aes_128_cfb128
-const EVP_CIPHER *EVP_aes_128_ofb(void);
-const EVP_CIPHER *EVP_aes_128_ctr(void);
-const EVP_CIPHER *EVP_aes_128_ccm(void);
-const EVP_CIPHER *EVP_aes_128_gcm(void);
-const EVP_CIPHER *EVP_aes_128_xts(void);
-const EVP_CIPHER *EVP_aes_128_wrap(void);
-const EVP_CIPHER *EVP_aes_128_wrap_pad(void);
-# ifndef OPENSSL_NO_OCB
-const EVP_CIPHER *EVP_aes_128_ocb(void);
-# endif
-const EVP_CIPHER *EVP_aes_192_ecb(void);
-const EVP_CIPHER *EVP_aes_192_cbc(void);
-const EVP_CIPHER *EVP_aes_192_cfb1(void);
-const EVP_CIPHER *EVP_aes_192_cfb8(void);
-const EVP_CIPHER *EVP_aes_192_cfb128(void);
-# define EVP_aes_192_cfb EVP_aes_192_cfb128
-const EVP_CIPHER *EVP_aes_192_ofb(void);
-const EVP_CIPHER *EVP_aes_192_ctr(void);
-const EVP_CIPHER *EVP_aes_192_ccm(void);
-const EVP_CIPHER *EVP_aes_192_gcm(void);
-const EVP_CIPHER *EVP_aes_192_wrap(void);
-const EVP_CIPHER *EVP_aes_192_wrap_pad(void);
-# ifndef OPENSSL_NO_OCB
-const EVP_CIPHER *EVP_aes_192_ocb(void);
-# endif
-const EVP_CIPHER *EVP_aes_256_ecb(void);
-const EVP_CIPHER *EVP_aes_256_cbc(void);
-const EVP_CIPHER *EVP_aes_256_cfb1(void);
-const EVP_CIPHER *EVP_aes_256_cfb8(void);
-const EVP_CIPHER *EVP_aes_256_cfb128(void);
-# define EVP_aes_256_cfb EVP_aes_256_cfb128
-const EVP_CIPHER *EVP_aes_256_ofb(void);
-const EVP_CIPHER *EVP_aes_256_ctr(void);
-const EVP_CIPHER *EVP_aes_256_ccm(void);
-const EVP_CIPHER *EVP_aes_256_gcm(void);
-const EVP_CIPHER *EVP_aes_256_xts(void);
-const EVP_CIPHER *EVP_aes_256_wrap(void);
-const EVP_CIPHER *EVP_aes_256_wrap_pad(void);
-# ifndef OPENSSL_NO_OCB
-const EVP_CIPHER *EVP_aes_256_ocb(void);
-# endif
-const EVP_CIPHER *EVP_aes_128_cbc_hmac_sha1(void);
-const EVP_CIPHER *EVP_aes_256_cbc_hmac_sha1(void);
-const EVP_CIPHER *EVP_aes_128_cbc_hmac_sha256(void);
-const EVP_CIPHER *EVP_aes_256_cbc_hmac_sha256(void);
-# ifndef OPENSSL_NO_CAMELLIA
-const EVP_CIPHER *EVP_camellia_128_ecb(void);
-const EVP_CIPHER *EVP_camellia_128_cbc(void);
-const EVP_CIPHER *EVP_camellia_128_cfb1(void);
-const EVP_CIPHER *EVP_camellia_128_cfb8(void);
-const EVP_CIPHER *EVP_camellia_128_cfb128(void);
-#  define EVP_camellia_128_cfb EVP_camellia_128_cfb128
-const EVP_CIPHER *EVP_camellia_128_ofb(void);
-const EVP_CIPHER *EVP_camellia_128_ctr(void);
-const EVP_CIPHER *EVP_camellia_192_ecb(void);
-const EVP_CIPHER *EVP_camellia_192_cbc(void);
-const EVP_CIPHER *EVP_camellia_192_cfb1(void);
-const EVP_CIPHER *EVP_camellia_192_cfb8(void);
-const EVP_CIPHER *EVP_camellia_192_cfb128(void);
-#  define EVP_camellia_192_cfb EVP_camellia_192_cfb128
-const EVP_CIPHER *EVP_camellia_192_ofb(void);
-const EVP_CIPHER *EVP_camellia_192_ctr(void);
-const EVP_CIPHER *EVP_camellia_256_ecb(void);
-const EVP_CIPHER *EVP_camellia_256_cbc(void);
-const EVP_CIPHER *EVP_camellia_256_cfb1(void);
-const EVP_CIPHER *EVP_camellia_256_cfb8(void);
-const EVP_CIPHER *EVP_camellia_256_cfb128(void);
-#  define EVP_camellia_256_cfb EVP_camellia_256_cfb128
-const EVP_CIPHER *EVP_camellia_256_ofb(void);
-const EVP_CIPHER *EVP_camellia_256_ctr(void);
-# endif
-# ifndef OPENSSL_NO_CHACHA
-const EVP_CIPHER *EVP_chacha20(void);
-#  ifndef OPENSSL_NO_POLY1305
-const EVP_CIPHER *EVP_chacha20_poly1305(void);
-#  endif
-# endif
-
-# ifndef OPENSSL_NO_SEED
-const EVP_CIPHER *EVP_seed_ecb(void);
-const EVP_CIPHER *EVP_seed_cbc(void);
-const EVP_CIPHER *EVP_seed_cfb128(void);
-#  define EVP_seed_cfb EVP_seed_cfb128
-const EVP_CIPHER *EVP_seed_ofb(void);
-# endif
-
-# if OPENSSL_API_COMPAT < 0x10100000L
-#  define OPENSSL_add_all_algorithms_conf() \
-    OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS \
-                        | OPENSSL_INIT_ADD_ALL_DIGESTS \
-                        | OPENSSL_INIT_LOAD_CONFIG, NULL)
-#  define OPENSSL_add_all_algorithms_noconf() \
-    OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS \
-                        | OPENSSL_INIT_ADD_ALL_DIGESTS, NULL)
-
-#  ifdef OPENSSL_LOAD_CONF
-#   define OpenSSL_add_all_algorithms() \
-    OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS \
-                        | OPENSSL_INIT_ADD_ALL_DIGESTS \
-                        | OPENSSL_INIT_LOAD_CONFIG, NULL)
-#  else
-#   define OpenSSL_add_all_algorithms() \
-    OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS \
-                        | OPENSSL_INIT_ADD_ALL_DIGESTS, NULL)
-#  endif
-
-#  define OpenSSL_add_all_ciphers() \
-    OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS, NULL)
-#  define OpenSSL_add_all_digests() \
-    OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_DIGESTS, NULL)
-
-#  define EVP_cleanup() while(0) continue
-# endif
-
-int EVP_add_cipher(const EVP_CIPHER *cipher);
-int EVP_add_digest(const EVP_MD *digest);
-
-const EVP_CIPHER *EVP_get_cipherbyname(const char *name);
-const EVP_MD *EVP_get_digestbyname(const char *name);
-
-void EVP_CIPHER_do_all(void (*fn) (const EVP_CIPHER *ciph,
-                                   const char *from, const char *to, void *x),
-                       void *arg);
-void EVP_CIPHER_do_all_sorted(void (*fn)
-                               (const EVP_CIPHER *ciph, const char *from,
-                                const char *to, void *x), void *arg);
-
-void EVP_MD_do_all(void (*fn) (const EVP_MD *ciph,
-                               const char *from, const char *to, void *x),
-                   void *arg);
-void EVP_MD_do_all_sorted(void (*fn)
-                           (const EVP_MD *ciph, const char *from,
-                            const char *to, void *x), void *arg);
-
-int EVP_PKEY_decrypt_old(unsigned char *dec_key,
-                         const unsigned char *enc_key, int enc_key_len,
-                         EVP_PKEY *private_key);
-int EVP_PKEY_encrypt_old(unsigned char *enc_key,
-                         const unsigned char *key, int key_len,
-                         EVP_PKEY *pub_key);
-int EVP_PKEY_type(int type);
-int EVP_PKEY_id(const EVP_PKEY *pkey);
-int EVP_PKEY_base_id(const EVP_PKEY *pkey);
-int EVP_PKEY_bits(const EVP_PKEY *pkey);
-int EVP_PKEY_security_bits(const EVP_PKEY *pkey);
-int EVP_PKEY_size(EVP_PKEY *pkey);
-int EVP_PKEY_set_type(EVP_PKEY *pkey, int type);
-int EVP_PKEY_set_type_str(EVP_PKEY *pkey, const char *str, int len);
-int EVP_PKEY_assign(EVP_PKEY *pkey, int type, void *key);
-void *EVP_PKEY_get0(const EVP_PKEY *pkey);
-const unsigned char *EVP_PKEY_get0_hmac(const EVP_PKEY *pkey, size_t *len);
-
-# ifndef OPENSSL_NO_RSA
-struct rsa_st;
-int EVP_PKEY_set1_RSA(EVP_PKEY *pkey, struct rsa_st *key);
-struct rsa_st *EVP_PKEY_get0_RSA(EVP_PKEY *pkey);
-struct rsa_st *EVP_PKEY_get1_RSA(EVP_PKEY *pkey);
-# endif
-# ifndef OPENSSL_NO_DSA
-struct dsa_st;
-int EVP_PKEY_set1_DSA(EVP_PKEY *pkey, struct dsa_st *key);
-struct dsa_st *EVP_PKEY_get0_DSA(EVP_PKEY *pkey);
-struct dsa_st *EVP_PKEY_get1_DSA(EVP_PKEY *pkey);
-# endif
-# ifndef OPENSSL_NO_DH
-struct dh_st;
-int EVP_PKEY_set1_DH(EVP_PKEY *pkey, struct dh_st *key);
-struct dh_st *EVP_PKEY_get0_DH(EVP_PKEY *pkey);
-struct dh_st *EVP_PKEY_get1_DH(EVP_PKEY *pkey);
-# endif
-# ifndef OPENSSL_NO_EC
-struct ec_key_st;
-int EVP_PKEY_set1_EC_KEY(EVP_PKEY *pkey, struct ec_key_st *key);
-struct ec_key_st *EVP_PKEY_get0_EC_KEY(EVP_PKEY *pkey);
-struct ec_key_st *EVP_PKEY_get1_EC_KEY(EVP_PKEY *pkey);
-# endif
-
-EVP_PKEY *EVP_PKEY_new(void);
-int EVP_PKEY_up_ref(EVP_PKEY *pkey);
-void EVP_PKEY_free(EVP_PKEY *pkey);
-
-EVP_PKEY *d2i_PublicKey(int type, EVP_PKEY **a, const unsigned char **pp,
-                        long length);
-int i2d_PublicKey(EVP_PKEY *a, unsigned char **pp);
-
-EVP_PKEY *d2i_PrivateKey(int type, EVP_PKEY **a, const unsigned char **pp,
-                         long length);
-EVP_PKEY *d2i_AutoPrivateKey(EVP_PKEY **a, const unsigned char **pp,
-                             long length);
-int i2d_PrivateKey(EVP_PKEY *a, unsigned char **pp);
-
-int EVP_PKEY_copy_parameters(EVP_PKEY *to, const EVP_PKEY *from);
-int EVP_PKEY_missing_parameters(const EVP_PKEY *pkey);
-int EVP_PKEY_save_parameters(EVP_PKEY *pkey, int mode);
-int EVP_PKEY_cmp_parameters(const EVP_PKEY *a, const EVP_PKEY *b);
-
-int EVP_PKEY_cmp(const EVP_PKEY *a, const EVP_PKEY *b);
-
-int EVP_PKEY_print_public(BIO *out, const EVP_PKEY *pkey,
-                          int indent, ASN1_PCTX *pctx);
-int EVP_PKEY_print_private(BIO *out, const EVP_PKEY *pkey,
-                           int indent, ASN1_PCTX *pctx);
-int EVP_PKEY_print_params(BIO *out, const EVP_PKEY *pkey,
-                          int indent, ASN1_PCTX *pctx);
-
-int EVP_PKEY_get_default_digest_nid(EVP_PKEY *pkey, int *pnid);
-
-int EVP_PKEY_set1_tls_encodedpoint(EVP_PKEY *pkey,
-                                   const unsigned char *pt, size_t ptlen);
-size_t EVP_PKEY_get1_tls_encodedpoint(EVP_PKEY *pkey, unsigned char **ppt);
-
-int EVP_CIPHER_type(const EVP_CIPHER *ctx);
-
-/* calls methods */
-int EVP_CIPHER_param_to_asn1(EVP_CIPHER_CTX *c, ASN1_TYPE *type);
-int EVP_CIPHER_asn1_to_param(EVP_CIPHER_CTX *c, ASN1_TYPE *type);
-
-/* These are used by EVP_CIPHER methods */
-int EVP_CIPHER_set_asn1_iv(EVP_CIPHER_CTX *c, ASN1_TYPE *type);
-int EVP_CIPHER_get_asn1_iv(EVP_CIPHER_CTX *c, ASN1_TYPE *type);
-
-/* PKCS5 password based encryption */
-int PKCS5_PBE_keyivgen(EVP_CIPHER_CTX *ctx, const char *pass, int passlen,
-                       ASN1_TYPE *param, const EVP_CIPHER *cipher,
-                       const EVP_MD *md, int en_de);
-int PKCS5_PBKDF2_HMAC_SHA1(const char *pass, int passlen,
-                           const unsigned char *salt, int saltlen, int iter,
-                           int keylen, unsigned char *out);
-int PKCS5_PBKDF2_HMAC(const char *pass, int passlen,
-                      const unsigned char *salt, int saltlen, int iter,
-                      const EVP_MD *digest, int keylen, unsigned char *out);
-int PKCS5_v2_PBE_keyivgen(EVP_CIPHER_CTX *ctx, const char *pass, int passlen,
-                          ASN1_TYPE *param, const EVP_CIPHER *cipher,
-                          const EVP_MD *md, int en_de);
-
-#ifndef OPENSSL_NO_SCRYPT
-int EVP_PBE_scrypt(const char *pass, size_t passlen,
-                   const unsigned char *salt, size_t saltlen,
-                   uint64_t N, uint64_t r, uint64_t p, uint64_t maxmem,
-                   unsigned char *key, size_t keylen);
-
-int PKCS5_v2_scrypt_keyivgen(EVP_CIPHER_CTX *ctx, const char *pass,
-                             int passlen, ASN1_TYPE *param,
-                             const EVP_CIPHER *c, const EVP_MD *md, int en_de);
-#endif
-
-void PKCS5_PBE_add(void);
-
-int EVP_PBE_CipherInit(ASN1_OBJECT *pbe_obj, const char *pass, int passlen,
-                       ASN1_TYPE *param, EVP_CIPHER_CTX *ctx, int en_de);
-
-/* PBE type */
-
-/* Can appear as the outermost AlgorithmIdentifier */
-# define EVP_PBE_TYPE_OUTER      0x0
-/* Is an PRF type OID */
-# define EVP_PBE_TYPE_PRF        0x1
-/* Is a PKCS#5 v2.0 KDF */
-# define EVP_PBE_TYPE_KDF        0x2
-
-int EVP_PBE_alg_add_type(int pbe_type, int pbe_nid, int cipher_nid,
-                         int md_nid, EVP_PBE_KEYGEN *keygen);
-int EVP_PBE_alg_add(int nid, const EVP_CIPHER *cipher, const EVP_MD *md,
-                    EVP_PBE_KEYGEN *keygen);
-int EVP_PBE_find(int type, int pbe_nid, int *pcnid, int *pmnid,
-                 EVP_PBE_KEYGEN **pkeygen);
-void EVP_PBE_cleanup(void);
-int EVP_PBE_get(int *ptype, int *ppbe_nid, size_t num);
-
-# define ASN1_PKEY_ALIAS         0x1
-# define ASN1_PKEY_DYNAMIC       0x2
-# define ASN1_PKEY_SIGPARAM_NULL 0x4
-
-# define ASN1_PKEY_CTRL_PKCS7_SIGN       0x1
-# define ASN1_PKEY_CTRL_PKCS7_ENCRYPT    0x2
-# define ASN1_PKEY_CTRL_DEFAULT_MD_NID   0x3
-# define ASN1_PKEY_CTRL_CMS_SIGN         0x5
-# define ASN1_PKEY_CTRL_CMS_ENVELOPE     0x7
-# define ASN1_PKEY_CTRL_CMS_RI_TYPE      0x8
-
-# define ASN1_PKEY_CTRL_SET1_TLS_ENCPT   0x9
-# define ASN1_PKEY_CTRL_GET1_TLS_ENCPT   0xa
-
-int EVP_PKEY_asn1_get_count(void);
-const EVP_PKEY_ASN1_METHOD *EVP_PKEY_asn1_get0(int idx);
-const EVP_PKEY_ASN1_METHOD *EVP_PKEY_asn1_find(ENGINE **pe, int type);
-const EVP_PKEY_ASN1_METHOD *EVP_PKEY_asn1_find_str(ENGINE **pe,
-                                                   const char *str, int len);
-int EVP_PKEY_asn1_add0(const EVP_PKEY_ASN1_METHOD *ameth);
-int EVP_PKEY_asn1_add_alias(int to, int from);
-int EVP_PKEY_asn1_get0_info(int *ppkey_id, int *pkey_base_id,
-                            int *ppkey_flags, const char **pinfo,
-                            const char **ppem_str,
-                            const EVP_PKEY_ASN1_METHOD *ameth);
-
-const EVP_PKEY_ASN1_METHOD *EVP_PKEY_get0_asn1(const EVP_PKEY *pkey);
-EVP_PKEY_ASN1_METHOD *EVP_PKEY_asn1_new(int id, int flags,
-                                        const char *pem_str,
-                                        const char *info);
-void EVP_PKEY_asn1_copy(EVP_PKEY_ASN1_METHOD *dst,
-                        const EVP_PKEY_ASN1_METHOD *src);
-void EVP_PKEY_asn1_free(EVP_PKEY_ASN1_METHOD *ameth);
-void EVP_PKEY_asn1_set_public(EVP_PKEY_ASN1_METHOD *ameth,
-                              int (*pub_decode) (EVP_PKEY *pk,
-                                                 X509_PUBKEY *pub),
-                              int (*pub_encode) (X509_PUBKEY *pub,
-                                                 const EVP_PKEY *pk),
-                              int (*pub_cmp) (const EVP_PKEY *a,
-                                              const EVP_PKEY *b),
-                              int (*pub_print) (BIO *out,
-                                                const EVP_PKEY *pkey,
-                                                int indent, ASN1_PCTX *pctx),
-                              int (*pkey_size) (const EVP_PKEY *pk),
-                              int (*pkey_bits) (const EVP_PKEY *pk));
-void EVP_PKEY_asn1_set_private(EVP_PKEY_ASN1_METHOD *ameth,
-                               int (*priv_decode) (EVP_PKEY *pk,
-                                                   const PKCS8_PRIV_KEY_INFO
-                                                   *p8inf),
-                               int (*priv_encode) (PKCS8_PRIV_KEY_INFO *p8,
-                                                   const EVP_PKEY *pk),
-                               int (*priv_print) (BIO *out,
-                                                  const EVP_PKEY *pkey,
-                                                  int indent,
-                                                  ASN1_PCTX *pctx));
-void EVP_PKEY_asn1_set_param(EVP_PKEY_ASN1_METHOD *ameth,
-                             int (*param_decode) (EVP_PKEY *pkey,
-                                                  const unsigned char **pder,
-                                                  int derlen),
-                             int (*param_encode) (const EVP_PKEY *pkey,
-                                                  unsigned char **pder),
-                             int (*param_missing) (const EVP_PKEY *pk),
-                             int (*param_copy) (EVP_PKEY *to,
-                                                const EVP_PKEY *from),
-                             int (*param_cmp) (const EVP_PKEY *a,
-                                               const EVP_PKEY *b),
-                             int (*param_print) (BIO *out,
-                                                 const EVP_PKEY *pkey,
-                                                 int indent,
-                                                 ASN1_PCTX *pctx));
-
-void EVP_PKEY_asn1_set_free(EVP_PKEY_ASN1_METHOD *ameth,
-                            void (*pkey_free) (EVP_PKEY *pkey));
-void EVP_PKEY_asn1_set_ctrl(EVP_PKEY_ASN1_METHOD *ameth,
-                            int (*pkey_ctrl) (EVP_PKEY *pkey, int op,
-                                              long arg1, void *arg2));
-void EVP_PKEY_asn1_set_item(EVP_PKEY_ASN1_METHOD *ameth,
-                            int (*item_verify) (EVP_MD_CTX *ctx,
-                                                const ASN1_ITEM *it,
-                                                void *asn,
-                                                X509_ALGOR *a,
-                                                ASN1_BIT_STRING *sig,
-                                                EVP_PKEY *pkey),
-                            int (*item_sign) (EVP_MD_CTX *ctx,
-                                              const ASN1_ITEM *it,
-                                              void *asn,
-                                              X509_ALGOR *alg1,
-                                              X509_ALGOR *alg2,
-                                              ASN1_BIT_STRING *sig));
-
-void EVP_PKEY_asn1_set_security_bits(EVP_PKEY_ASN1_METHOD *ameth,
-                                     int (*pkey_security_bits) (const EVP_PKEY
-                                                                *pk));
-
-# define EVP_PKEY_OP_UNDEFINED           0
-# define EVP_PKEY_OP_PARAMGEN            (1<<1)
-# define EVP_PKEY_OP_KEYGEN              (1<<2)
-# define EVP_PKEY_OP_SIGN                (1<<3)
-# define EVP_PKEY_OP_VERIFY              (1<<4)
-# define EVP_PKEY_OP_VERIFYRECOVER       (1<<5)
-# define EVP_PKEY_OP_SIGNCTX             (1<<6)
-# define EVP_PKEY_OP_VERIFYCTX           (1<<7)
-# define EVP_PKEY_OP_ENCRYPT             (1<<8)
-# define EVP_PKEY_OP_DECRYPT             (1<<9)
-# define EVP_PKEY_OP_DERIVE              (1<<10)
-
-# define EVP_PKEY_OP_TYPE_SIG    \
-        (EVP_PKEY_OP_SIGN | EVP_PKEY_OP_VERIFY | EVP_PKEY_OP_VERIFYRECOVER \
-                | EVP_PKEY_OP_SIGNCTX | EVP_PKEY_OP_VERIFYCTX)
-
-# define EVP_PKEY_OP_TYPE_CRYPT \
-        (EVP_PKEY_OP_ENCRYPT | EVP_PKEY_OP_DECRYPT)
-
-# define EVP_PKEY_OP_TYPE_NOGEN \
-        (EVP_PKEY_OP_TYPE_SIG | EVP_PKEY_OP_TYPE_CRYPT | EVP_PKEY_OP_DERIVE)
-
-# define EVP_PKEY_OP_TYPE_GEN \
-                (EVP_PKEY_OP_PARAMGEN | EVP_PKEY_OP_KEYGEN)
-
-# define  EVP_PKEY_CTX_set_signature_md(ctx, md) \
-                EVP_PKEY_CTX_ctrl(ctx, -1, EVP_PKEY_OP_TYPE_SIG,  \
-                                        EVP_PKEY_CTRL_MD, 0, (void *)md)
-
-# define  EVP_PKEY_CTX_get_signature_md(ctx, pmd)        \
-                EVP_PKEY_CTX_ctrl(ctx, -1, EVP_PKEY_OP_TYPE_SIG,  \
-                                        EVP_PKEY_CTRL_GET_MD, 0, (void *)pmd)
-
-# define  EVP_PKEY_CTX_set_mac_key(ctx, key, len)        \
-                EVP_PKEY_CTX_ctrl(ctx, -1, EVP_PKEY_OP_KEYGEN,  \
-                                  EVP_PKEY_CTRL_SET_MAC_KEY, len, (void *)key)
-
-# define EVP_PKEY_CTRL_MD                1
-# define EVP_PKEY_CTRL_PEER_KEY          2
-
-# define EVP_PKEY_CTRL_PKCS7_ENCRYPT     3
-# define EVP_PKEY_CTRL_PKCS7_DECRYPT     4
-
-# define EVP_PKEY_CTRL_PKCS7_SIGN        5
-
-# define EVP_PKEY_CTRL_SET_MAC_KEY       6
-
-# define EVP_PKEY_CTRL_DIGESTINIT        7
-
-/* Used by GOST key encryption in TLS */
-# define EVP_PKEY_CTRL_SET_IV            8
-
-# define EVP_PKEY_CTRL_CMS_ENCRYPT       9
-# define EVP_PKEY_CTRL_CMS_DECRYPT       10
-# define EVP_PKEY_CTRL_CMS_SIGN          11
-
-# define EVP_PKEY_CTRL_CIPHER            12
-
-# define EVP_PKEY_CTRL_GET_MD            13
-
-# define EVP_PKEY_ALG_CTRL               0x1000
-
-# define EVP_PKEY_FLAG_AUTOARGLEN        2
-/*
- * Method handles all operations: don't assume any digest related defaults.
- */
-# define EVP_PKEY_FLAG_SIGCTX_CUSTOM     4
-
-const EVP_PKEY_METHOD *EVP_PKEY_meth_find(int type);
-EVP_PKEY_METHOD *EVP_PKEY_meth_new(int id, int flags);
-void EVP_PKEY_meth_get0_info(int *ppkey_id, int *pflags,
-                             const EVP_PKEY_METHOD *meth);
-void EVP_PKEY_meth_copy(EVP_PKEY_METHOD *dst, const EVP_PKEY_METHOD *src);
-void EVP_PKEY_meth_free(EVP_PKEY_METHOD *pmeth);
-int EVP_PKEY_meth_add0(const EVP_PKEY_METHOD *pmeth);
-
-EVP_PKEY_CTX *EVP_PKEY_CTX_new(EVP_PKEY *pkey, ENGINE *e);
-EVP_PKEY_CTX *EVP_PKEY_CTX_new_id(int id, ENGINE *e);
-EVP_PKEY_CTX *EVP_PKEY_CTX_dup(EVP_PKEY_CTX *ctx);
-void EVP_PKEY_CTX_free(EVP_PKEY_CTX *ctx);
-
-int EVP_PKEY_CTX_ctrl(EVP_PKEY_CTX *ctx, int keytype, int optype,
-                      int cmd, int p1, void *p2);
-int EVP_PKEY_CTX_ctrl_str(EVP_PKEY_CTX *ctx, const char *type,
-                          const char *value);
-
-int EVP_PKEY_CTX_str2ctrl(EVP_PKEY_CTX *ctx, int cmd, const char *str);
-int EVP_PKEY_CTX_hex2ctrl(EVP_PKEY_CTX *ctx, int cmd, const char *hex);
-
-int EVP_PKEY_CTX_get_operation(EVP_PKEY_CTX *ctx);
-void EVP_PKEY_CTX_set0_keygen_info(EVP_PKEY_CTX *ctx, int *dat, int datlen);
-
-EVP_PKEY *EVP_PKEY_new_mac_key(int type, ENGINE *e,
-                               const unsigned char *key, int keylen);
-
-void EVP_PKEY_CTX_set_data(EVP_PKEY_CTX *ctx, void *data);
-void *EVP_PKEY_CTX_get_data(EVP_PKEY_CTX *ctx);
-EVP_PKEY *EVP_PKEY_CTX_get0_pkey(EVP_PKEY_CTX *ctx);
-
-EVP_PKEY *EVP_PKEY_CTX_get0_peerkey(EVP_PKEY_CTX *ctx);
-
-void EVP_PKEY_CTX_set_app_data(EVP_PKEY_CTX *ctx, void *data);
-void *EVP_PKEY_CTX_get_app_data(EVP_PKEY_CTX *ctx);
-
-int EVP_PKEY_sign_init(EVP_PKEY_CTX *ctx);
-int EVP_PKEY_sign(EVP_PKEY_CTX *ctx,
-                  unsigned char *sig, size_t *siglen,
-                  const unsigned char *tbs, size_t tbslen);
-int EVP_PKEY_verify_init(EVP_PKEY_CTX *ctx);
-int EVP_PKEY_verify(EVP_PKEY_CTX *ctx,
-                    const unsigned char *sig, size_t siglen,
-                    const unsigned char *tbs, size_t tbslen);
-int EVP_PKEY_verify_recover_init(EVP_PKEY_CTX *ctx);
-int EVP_PKEY_verify_recover(EVP_PKEY_CTX *ctx,
-                            unsigned char *rout, size_t *routlen,
-                            const unsigned char *sig, size_t siglen);
-int EVP_PKEY_encrypt_init(EVP_PKEY_CTX *ctx);
-int EVP_PKEY_encrypt(EVP_PKEY_CTX *ctx,
-                     unsigned char *out, size_t *outlen,
-                     const unsigned char *in, size_t inlen);
-int EVP_PKEY_decrypt_init(EVP_PKEY_CTX *ctx);
-int EVP_PKEY_decrypt(EVP_PKEY_CTX *ctx,
-                     unsigned char *out, size_t *outlen,
-                     const unsigned char *in, size_t inlen);
-
-int EVP_PKEY_derive_init(EVP_PKEY_CTX *ctx);
-int EVP_PKEY_derive_set_peer(EVP_PKEY_CTX *ctx, EVP_PKEY *peer);
-int EVP_PKEY_derive(EVP_PKEY_CTX *ctx, unsigned char *key, size_t *keylen);
-
-typedef int EVP_PKEY_gen_cb(EVP_PKEY_CTX *ctx);
-
-int EVP_PKEY_paramgen_init(EVP_PKEY_CTX *ctx);
-int EVP_PKEY_paramgen(EVP_PKEY_CTX *ctx, EVP_PKEY **ppkey);
-int EVP_PKEY_keygen_init(EVP_PKEY_CTX *ctx);
-int EVP_PKEY_keygen(EVP_PKEY_CTX *ctx, EVP_PKEY **ppkey);
-
-void EVP_PKEY_CTX_set_cb(EVP_PKEY_CTX *ctx, EVP_PKEY_gen_cb *cb);
-EVP_PKEY_gen_cb *EVP_PKEY_CTX_get_cb(EVP_PKEY_CTX *ctx);
-
-int EVP_PKEY_CTX_get_keygen_info(EVP_PKEY_CTX *ctx, int idx);
-
-void EVP_PKEY_meth_set_init(EVP_PKEY_METHOD *pmeth,
-                            int (*init) (EVP_PKEY_CTX *ctx));
-
-void EVP_PKEY_meth_set_copy(EVP_PKEY_METHOD *pmeth,
-                            int (*copy) (EVP_PKEY_CTX *dst,
-                                         EVP_PKEY_CTX *src));
-
-void EVP_PKEY_meth_set_cleanup(EVP_PKEY_METHOD *pmeth,
-                               void (*cleanup) (EVP_PKEY_CTX *ctx));
-
-void EVP_PKEY_meth_set_paramgen(EVP_PKEY_METHOD *pmeth,
-                                int (*paramgen_init) (EVP_PKEY_CTX *ctx),
-                                int (*paramgen) (EVP_PKEY_CTX *ctx,
-                                                 EVP_PKEY *pkey));
-
-void EVP_PKEY_meth_set_keygen(EVP_PKEY_METHOD *pmeth,
-                              int (*keygen_init) (EVP_PKEY_CTX *ctx),
-                              int (*keygen) (EVP_PKEY_CTX *ctx,
-                                             EVP_PKEY *pkey));
-
-void EVP_PKEY_meth_set_sign(EVP_PKEY_METHOD *pmeth,
-                            int (*sign_init) (EVP_PKEY_CTX *ctx),
-                            int (*sign) (EVP_PKEY_CTX *ctx,
-                                         unsigned char *sig, size_t *siglen,
-                                         const unsigned char *tbs,
-                                         size_t tbslen));
-
-void EVP_PKEY_meth_set_verify(EVP_PKEY_METHOD *pmeth,
-                              int (*verify_init) (EVP_PKEY_CTX *ctx),
-                              int (*verify) (EVP_PKEY_CTX *ctx,
-                                             const unsigned char *sig,
-                                             size_t siglen,
-                                             const unsigned char *tbs,
-                                             size_t tbslen));
-
-void EVP_PKEY_meth_set_verify_recover(EVP_PKEY_METHOD *pmeth,
-                                      int (*verify_recover_init) (EVP_PKEY_CTX
-                                                                  *ctx),
-                                      int (*verify_recover) (EVP_PKEY_CTX
-                                                             *ctx,
-                                                             unsigned char
-                                                             *sig,
-                                                             size_t *siglen,
-                                                             const unsigned
-                                                             char *tbs,
-                                                             size_t tbslen));
-
-void EVP_PKEY_meth_set_signctx(EVP_PKEY_METHOD *pmeth,
-                               int (*signctx_init) (EVP_PKEY_CTX *ctx,
-                                                    EVP_MD_CTX *mctx),
-                               int (*signctx) (EVP_PKEY_CTX *ctx,
-                                               unsigned char *sig,
-                                               size_t *siglen,
-                                               EVP_MD_CTX *mctx));
-
-void EVP_PKEY_meth_set_verifyctx(EVP_PKEY_METHOD *pmeth,
-                                 int (*verifyctx_init) (EVP_PKEY_CTX *ctx,
-                                                        EVP_MD_CTX *mctx),
-                                 int (*verifyctx) (EVP_PKEY_CTX *ctx,
-                                                   const unsigned char *sig,
-                                                   int siglen,
-                                                   EVP_MD_CTX *mctx));
-
-void EVP_PKEY_meth_set_encrypt(EVP_PKEY_METHOD *pmeth,
-                               int (*encrypt_init) (EVP_PKEY_CTX *ctx),
-                               int (*encryptfn) (EVP_PKEY_CTX *ctx,
-                                                 unsigned char *out,
-                                                 size_t *outlen,
-                                                 const unsigned char *in,
-                                                 size_t inlen));
-
-void EVP_PKEY_meth_set_decrypt(EVP_PKEY_METHOD *pmeth,
-                               int (*decrypt_init) (EVP_PKEY_CTX *ctx),
-                               int (*decrypt) (EVP_PKEY_CTX *ctx,
-                                               unsigned char *out,
-                                               size_t *outlen,
-                                               const unsigned char *in,
-                                               size_t inlen));
-
-void EVP_PKEY_meth_set_derive(EVP_PKEY_METHOD *pmeth,
-                              int (*derive_init) (EVP_PKEY_CTX *ctx),
-                              int (*derive) (EVP_PKEY_CTX *ctx,
-                                             unsigned char *key,
-                                             size_t *keylen));
-
-void EVP_PKEY_meth_set_ctrl(EVP_PKEY_METHOD *pmeth,
-                            int (*ctrl) (EVP_PKEY_CTX *ctx, int type, int p1,
-                                         void *p2),
-                            int (*ctrl_str) (EVP_PKEY_CTX *ctx,
-                                             const char *type,
-                                             const char *value));
-
-void EVP_PKEY_meth_get_init(EVP_PKEY_METHOD *pmeth,
-                            int (**pinit) (EVP_PKEY_CTX *ctx));
-
-void EVP_PKEY_meth_get_copy(EVP_PKEY_METHOD *pmeth,
-                            int (**pcopy) (EVP_PKEY_CTX *dst,
-                                           EVP_PKEY_CTX *src));
-
-void EVP_PKEY_meth_get_cleanup(EVP_PKEY_METHOD *pmeth,
-                               void (**pcleanup) (EVP_PKEY_CTX *ctx));
-
-void EVP_PKEY_meth_get_paramgen(EVP_PKEY_METHOD *pmeth,
-                                int (**pparamgen_init) (EVP_PKEY_CTX *ctx),
-                                int (**pparamgen) (EVP_PKEY_CTX *ctx,
-                                                   EVP_PKEY *pkey));
-
-void EVP_PKEY_meth_get_keygen(EVP_PKEY_METHOD *pmeth,
-                              int (**pkeygen_init) (EVP_PKEY_CTX *ctx),
-                              int (**pkeygen) (EVP_PKEY_CTX *ctx,
-                                               EVP_PKEY *pkey));
-
-void EVP_PKEY_meth_get_sign(EVP_PKEY_METHOD *pmeth,
-                            int (**psign_init) (EVP_PKEY_CTX *ctx),
-                            int (**psign) (EVP_PKEY_CTX *ctx,
-                                           unsigned char *sig, size_t *siglen,
-                                           const unsigned char *tbs,
-                                           size_t tbslen));
-
-void EVP_PKEY_meth_get_verify(EVP_PKEY_METHOD *pmeth,
-                              int (**pverify_init) (EVP_PKEY_CTX *ctx),
-                              int (**pverify) (EVP_PKEY_CTX *ctx,
-                                               const unsigned char *sig,
-                                               size_t siglen,
-                                               const unsigned char *tbs,
-                                               size_t tbslen));
-
-void EVP_PKEY_meth_get_verify_recover(EVP_PKEY_METHOD *pmeth,
-                                      int (**pverify_recover_init) (EVP_PKEY_CTX
-                                                                    *ctx),
-                                      int (**pverify_recover) (EVP_PKEY_CTX
-                                                               *ctx,
-                                                               unsigned char
-                                                               *sig,
-                                                               size_t *siglen,
-                                                               const unsigned
-                                                               char *tbs,
-                                                               size_t tbslen));
-
-void EVP_PKEY_meth_get_signctx(EVP_PKEY_METHOD *pmeth,
-                               int (**psignctx_init) (EVP_PKEY_CTX *ctx,
-                                                      EVP_MD_CTX *mctx),
-                               int (**psignctx) (EVP_PKEY_CTX *ctx,
-                                                 unsigned char *sig,
-                                                 size_t *siglen,
-                                                 EVP_MD_CTX *mctx));
-
-void EVP_PKEY_meth_get_verifyctx(EVP_PKEY_METHOD *pmeth,
-                                 int (**pverifyctx_init) (EVP_PKEY_CTX *ctx,
-                                                          EVP_MD_CTX *mctx),
-                                 int (**pverifyctx) (EVP_PKEY_CTX *ctx,
-                                                     const unsigned char *sig,
-                                                     int siglen,
-                                                     EVP_MD_CTX *mctx));
-
-void EVP_PKEY_meth_get_encrypt(EVP_PKEY_METHOD *pmeth,
-                               int (**pencrypt_init) (EVP_PKEY_CTX *ctx),
-                               int (**pencryptfn) (EVP_PKEY_CTX *ctx,
-                                                   unsigned char *out,
-                                                   size_t *outlen,
-                                                   const unsigned char *in,
-                                                   size_t inlen));
-
-void EVP_PKEY_meth_get_decrypt(EVP_PKEY_METHOD *pmeth,
-                               int (**pdecrypt_init) (EVP_PKEY_CTX *ctx),
-                               int (**pdecrypt) (EVP_PKEY_CTX *ctx,
-                                                 unsigned char *out,
-                                                 size_t *outlen,
-                                                 const unsigned char *in,
-                                                 size_t inlen));
-
-void EVP_PKEY_meth_get_derive(EVP_PKEY_METHOD *pmeth,
-                              int (**pderive_init) (EVP_PKEY_CTX *ctx),
-                              int (**pderive) (EVP_PKEY_CTX *ctx,
-                                               unsigned char *key,
-                                               size_t *keylen));
-
-void EVP_PKEY_meth_get_ctrl(EVP_PKEY_METHOD *pmeth,
-                            int (**pctrl) (EVP_PKEY_CTX *ctx, int type, int p1,
-                                           void *p2),
-                            int (**pctrl_str) (EVP_PKEY_CTX *ctx,
-                                               const char *type,
-                                               const char *value));
-
-void EVP_add_alg_module(void);
-
-/* BEGIN ERROR CODES */
-/*
- * The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
-
-int ERR_load_EVP_strings(void);
-
-/* Error codes for the EVP functions. */
-
-/* Function codes. */
-# define EVP_F_AESNI_INIT_KEY                             165
-# define EVP_F_AES_INIT_KEY                               133
-# define EVP_F_AES_OCB_CIPHER                             169
-# define EVP_F_AES_T4_INIT_KEY                            178
-# define EVP_F_AES_WRAP_CIPHER                            170
-# define EVP_F_ALG_MODULE_INIT                            177
-# define EVP_F_CAMELLIA_INIT_KEY                          159
-# define EVP_F_CHACHA20_POLY1305_CTRL                     182
-# define EVP_F_CMLL_T4_INIT_KEY                           179
-# define EVP_F_DES_EDE3_WRAP_CIPHER                       171
-# define EVP_F_DO_SIGVER_INIT                             161
-# define EVP_F_EVP_CIPHERINIT_EX                          123
-# define EVP_F_EVP_CIPHER_CTX_COPY                        163
-# define EVP_F_EVP_CIPHER_CTX_CTRL                        124
-# define EVP_F_EVP_CIPHER_CTX_SET_KEY_LENGTH              122
-# define EVP_F_EVP_DECRYPTFINAL_EX                        101
-# define EVP_F_EVP_DECRYPTUPDATE                          166
-# define EVP_F_EVP_DIGESTINIT_EX                          128
-# define EVP_F_EVP_ENCRYPTFINAL_EX                        127
-# define EVP_F_EVP_ENCRYPTUPDATE                          167
-# define EVP_F_EVP_MD_CTX_COPY_EX                         110
-# define EVP_F_EVP_MD_SIZE                                162
-# define EVP_F_EVP_OPENINIT                               102
-# define EVP_F_EVP_PBE_ALG_ADD                            115
-# define EVP_F_EVP_PBE_ALG_ADD_TYPE                       160
-# define EVP_F_EVP_PBE_CIPHERINIT                         116
-# define EVP_F_EVP_PBE_SCRYPT                             181
-# define EVP_F_EVP_PKCS82PKEY                             111
-# define EVP_F_EVP_PKEY2PKCS8                             113
-# define EVP_F_EVP_PKEY_COPY_PARAMETERS                   103
-# define EVP_F_EVP_PKEY_CTX_CTRL                          137
-# define EVP_F_EVP_PKEY_CTX_CTRL_STR                      150
-# define EVP_F_EVP_PKEY_CTX_DUP                           156
-# define EVP_F_EVP_PKEY_DECRYPT                           104
-# define EVP_F_EVP_PKEY_DECRYPT_INIT                      138
-# define EVP_F_EVP_PKEY_DECRYPT_OLD                       151
-# define EVP_F_EVP_PKEY_DERIVE                            153
-# define EVP_F_EVP_PKEY_DERIVE_INIT                       154
-# define EVP_F_EVP_PKEY_DERIVE_SET_PEER                   155
-# define EVP_F_EVP_PKEY_ENCRYPT                           105
-# define EVP_F_EVP_PKEY_ENCRYPT_INIT                      139
-# define EVP_F_EVP_PKEY_ENCRYPT_OLD                       152
-# define EVP_F_EVP_PKEY_GET0_DH                           119
-# define EVP_F_EVP_PKEY_GET0_DSA                          120
-# define EVP_F_EVP_PKEY_GET0_EC_KEY                       131
-# define EVP_F_EVP_PKEY_GET0_HMAC                         183
-# define EVP_F_EVP_PKEY_GET0_RSA                          121
-# define EVP_F_EVP_PKEY_KEYGEN                            146
-# define EVP_F_EVP_PKEY_KEYGEN_INIT                       147
-# define EVP_F_EVP_PKEY_NEW                               106
-# define EVP_F_EVP_PKEY_PARAMGEN                          148
-# define EVP_F_EVP_PKEY_PARAMGEN_INIT                     149
-# define EVP_F_EVP_PKEY_SIGN                              140
-# define EVP_F_EVP_PKEY_SIGN_INIT                         141
-# define EVP_F_EVP_PKEY_VERIFY                            142
-# define EVP_F_EVP_PKEY_VERIFY_INIT                       143
-# define EVP_F_EVP_PKEY_VERIFY_RECOVER                    144
-# define EVP_F_EVP_PKEY_VERIFY_RECOVER_INIT               145
-# define EVP_F_EVP_SIGNFINAL                              107
-# define EVP_F_EVP_VERIFYFINAL                            108
-# define EVP_F_INT_CTX_NEW                                157
-# define EVP_F_PKCS5_PBE_KEYIVGEN                         117
-# define EVP_F_PKCS5_V2_PBE_KEYIVGEN                      118
-# define EVP_F_PKCS5_V2_PBKDF2_KEYIVGEN                   164
-# define EVP_F_PKCS5_V2_SCRYPT_KEYIVGEN                   180
-# define EVP_F_PKEY_SET_TYPE                              158
-# define EVP_F_RC2_MAGIC_TO_METH                          109
-# define EVP_F_RC5_CTRL                                   125
-
-/* Reason codes. */
-# define EVP_R_AES_KEY_SETUP_FAILED                       143
-# define EVP_R_BAD_DECRYPT                                100
-# define EVP_R_BUFFER_TOO_SMALL                           155
-# define EVP_R_CAMELLIA_KEY_SETUP_FAILED                  157
-# define EVP_R_CIPHER_PARAMETER_ERROR                     122
-# define EVP_R_COMMAND_NOT_SUPPORTED                      147
-# define EVP_R_COPY_ERROR                                 173
-# define EVP_R_CTRL_NOT_IMPLEMENTED                       132
-# define EVP_R_CTRL_OPERATION_NOT_IMPLEMENTED             133
-# define EVP_R_DATA_NOT_MULTIPLE_OF_BLOCK_LENGTH          138
-# define EVP_R_DECODE_ERROR                               114
-# define EVP_R_DIFFERENT_KEY_TYPES                        101
-# define EVP_R_DIFFERENT_PARAMETERS                       153
-# define EVP_R_ERROR_LOADING_SECTION                      165
-# define EVP_R_ERROR_SETTING_FIPS_MODE                    166
-# define EVP_R_EXPECTING_AN_HMAC_KEY                      174
-# define EVP_R_EXPECTING_AN_RSA_KEY                       127
-# define EVP_R_EXPECTING_A_DH_KEY                         128
-# define EVP_R_EXPECTING_A_DSA_KEY                        129
-# define EVP_R_EXPECTING_A_EC_KEY                         142
-# define EVP_R_FIPS_MODE_NOT_SUPPORTED                    167
-# define EVP_R_ILLEGAL_SCRYPT_PARAMETERS                  171
-# define EVP_R_INITIALIZATION_ERROR                       134
-# define EVP_R_INPUT_NOT_INITIALIZED                      111
-# define EVP_R_INVALID_DIGEST                             152
-# define EVP_R_INVALID_FIPS_MODE                          168
-# define EVP_R_INVALID_KEY                                163
-# define EVP_R_INVALID_KEY_LENGTH                         130
-# define EVP_R_INVALID_OPERATION                          148
-# define EVP_R_KEYGEN_FAILURE                             120
-# define EVP_R_MEMORY_LIMIT_EXCEEDED                      172
-# define EVP_R_MESSAGE_DIGEST_IS_NULL                     159
-# define EVP_R_METHOD_NOT_SUPPORTED                       144
-# define EVP_R_MISSING_PARAMETERS                         103
-# define EVP_R_NO_CIPHER_SET                              131
-# define EVP_R_NO_DEFAULT_DIGEST                          158
-# define EVP_R_NO_DIGEST_SET                              139
-# define EVP_R_NO_KEY_SET                                 154
-# define EVP_R_NO_OPERATION_SET                           149
-# define EVP_R_OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE   150
-# define EVP_R_OPERATON_NOT_INITIALIZED                   151
-# define EVP_R_PARTIALLY_OVERLAPPING                      162
-# define EVP_R_PRIVATE_KEY_DECODE_ERROR                   145
-# define EVP_R_PRIVATE_KEY_ENCODE_ERROR                   146
-# define EVP_R_PUBLIC_KEY_NOT_RSA                         106
-# define EVP_R_UNKNOWN_CIPHER                             160
-# define EVP_R_UNKNOWN_DIGEST                             161
-# define EVP_R_UNKNOWN_OPTION                             169
-# define EVP_R_UNKNOWN_PBE_ALGORITHM                      121
-# define EVP_R_UNSUPPORTED_ALGORITHM                      156
-# define EVP_R_UNSUPPORTED_CIPHER                         107
-# define EVP_R_UNSUPPORTED_KEYLENGTH                      123
-# define EVP_R_UNSUPPORTED_KEY_DERIVATION_FUNCTION        124
-# define EVP_R_UNSUPPORTED_KEY_SIZE                       108
-# define EVP_R_UNSUPPORTED_NUMBER_OF_ROUNDS               135
-# define EVP_R_UNSUPPORTED_PRF                            125
-# define EVP_R_UNSUPPORTED_PRIVATE_KEY_ALGORITHM          118
-# define EVP_R_UNSUPPORTED_SALT_TYPE                      126
-# define EVP_R_WRAP_MODE_NOT_ALLOWED                      170
-# define EVP_R_WRONG_FINAL_BLOCK_LENGTH                   109
-
-# ifdef  __cplusplus
-}
-# endif
-#endif

gpac-2.2.1.tar.gz/extra_lib/include/openssl/hmac.h Deleted

@@ -1,49 +0,0 @@
-/*
- * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
- *
- * Licensed under the OpenSSL license (the "License").  You may not use
- * this file except in compliance with the License.  You can obtain a copy
- * in the file LICENSE in the source distribution or at
- * https://www.openssl.org/source/license.html
- */
-
-#ifndef HEADER_HMAC_H
-# define HEADER_HMAC_H
-
-# include <openssl/opensslconf.h>
-
-# include <openssl/evp.h>
-
-# define HMAC_MAX_MD_CBLOCK      128/* largest known is SHA512 */
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-size_t HMAC_size(const HMAC_CTX *e);
-HMAC_CTX *HMAC_CTX_new(void);
-int HMAC_CTX_reset(HMAC_CTX *ctx);
-void HMAC_CTX_free(HMAC_CTX *ctx);
-
-DEPRECATEDIN_1_1_0(__owur int HMAC_Init(HMAC_CTX *ctx, const void *key, int len,
-                     const EVP_MD *md))
-
-/*__owur*/ int HMAC_Init_ex(HMAC_CTX *ctx, const void *key, int len,
-                            const EVP_MD *md, ENGINE *impl);
-/*__owur*/ int HMAC_Update(HMAC_CTX *ctx, const unsigned char *data,
-                           size_t len);
-/*__owur*/ int HMAC_Final(HMAC_CTX *ctx, unsigned char *md,
-                          unsigned int *len);
-unsigned char *HMAC(const EVP_MD *evp_md, const void *key, int key_len,
-                    const unsigned char *d, size_t n, unsigned char *md,
-                    unsigned int *md_len);
-__owur int HMAC_CTX_copy(HMAC_CTX *dctx, HMAC_CTX *sctx);
-
-void HMAC_CTX_set_flags(HMAC_CTX *ctx, unsigned long flags);
-const EVP_MD *HMAC_CTX_get_md(const HMAC_CTX *ctx);
-
-#ifdef  __cplusplus
-}
-#endif
-
-#endif

gpac-2.2.1.tar.gz/extra_lib/include/openssl/idea.h Deleted

@@ -1,64 +0,0 @@
-/*
- * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
- *
- * Licensed under the OpenSSL license (the "License").  You may not use
- * this file except in compliance with the License.  You can obtain a copy
- * in the file LICENSE in the source distribution or at
- * https://www.openssl.org/source/license.html
- */
-
-#ifndef HEADER_IDEA_H
-# define HEADER_IDEA_H
-
-# include <openssl/opensslconf.h>
-
-# ifndef OPENSSL_NO_IDEA
-# ifdef  __cplusplus
-extern "C" {
-# endif
-
-typedef unsigned int IDEA_INT;
-
-# define IDEA_ENCRYPT    1
-# define IDEA_DECRYPT    0
-
-# define IDEA_BLOCK      8
-# define IDEA_KEY_LENGTH 16
-
-typedef struct idea_key_st {
-    IDEA_INT data96;
-} IDEA_KEY_SCHEDULE;
-
-const char *IDEA_options(void);
-void IDEA_ecb_encrypt(const unsigned char *in, unsigned char *out,
-                      IDEA_KEY_SCHEDULE *ks);
-void IDEA_set_encrypt_key(const unsigned char *key, IDEA_KEY_SCHEDULE *ks);
-void IDEA_set_decrypt_key(IDEA_KEY_SCHEDULE *ek, IDEA_KEY_SCHEDULE *dk);
-void IDEA_cbc_encrypt(const unsigned char *in, unsigned char *out,
-                      long length, IDEA_KEY_SCHEDULE *ks, unsigned char *iv,
-                      int enc);
-void IDEA_cfb64_encrypt(const unsigned char *in, unsigned char *out,
-                        long length, IDEA_KEY_SCHEDULE *ks, unsigned char *iv,
-                        int *num, int enc);
-void IDEA_ofb64_encrypt(const unsigned char *in, unsigned char *out,
-                        long length, IDEA_KEY_SCHEDULE *ks, unsigned char *iv,
-                        int *num);
-void IDEA_encrypt(unsigned long *in, IDEA_KEY_SCHEDULE *ks);
-
-# if OPENSSL_API_COMPAT < 0x10100000L
-#  define idea_options          IDEA_options
-#  define idea_ecb_encrypt      IDEA_ecb_encrypt
-#  define idea_set_encrypt_key  IDEA_set_encrypt_key
-#  define idea_set_decrypt_key  IDEA_set_decrypt_key
-#  define idea_cbc_encrypt      IDEA_cbc_encrypt
-#  define idea_cfb64_encrypt    IDEA_cfb64_encrypt
-#  define idea_ofb64_encrypt    IDEA_ofb64_encrypt
-#  define idea_encrypt          IDEA_encrypt
-# endif
-
-# ifdef  __cplusplus
-}
-# endif
-# endif
-
-#endif

gpac-2.2.1.tar.gz/extra_lib/include/openssl/kdf.h Deleted

@@ -1,75 +0,0 @@
-/*
- * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
- *
- * Licensed under the OpenSSL license (the "License").  You may not use
- * this file except in compliance with the License.  You can obtain a copy
- * in the file LICENSE in the source distribution or at
- * https://www.openssl.org/source/license.html
- */
-
-#ifndef HEADER_KDF_H
-# define HEADER_KDF_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-# define EVP_PKEY_CTRL_TLS_MD       (EVP_PKEY_ALG_CTRL)
-# define EVP_PKEY_CTRL_TLS_SECRET   (EVP_PKEY_ALG_CTRL + 1)
-# define EVP_PKEY_CTRL_TLS_SEED     (EVP_PKEY_ALG_CTRL + 2)
-# define EVP_PKEY_CTRL_HKDF_MD      (EVP_PKEY_ALG_CTRL + 3)
-# define EVP_PKEY_CTRL_HKDF_SALT    (EVP_PKEY_ALG_CTRL + 4)
-# define EVP_PKEY_CTRL_HKDF_KEY     (EVP_PKEY_ALG_CTRL + 5)
-# define EVP_PKEY_CTRL_HKDF_INFO    (EVP_PKEY_ALG_CTRL + 6)
-
-# define EVP_PKEY_CTX_set_tls1_prf_md(pctx, md) \
-            EVP_PKEY_CTX_ctrl(pctx, -1, EVP_PKEY_OP_DERIVE, \
-                              EVP_PKEY_CTRL_TLS_MD, 0, (void *)md)
-
-# define EVP_PKEY_CTX_set1_tls1_prf_secret(pctx, sec, seclen) \
-            EVP_PKEY_CTX_ctrl(pctx, -1, EVP_PKEY_OP_DERIVE, \
-                              EVP_PKEY_CTRL_TLS_SECRET, seclen, (void *)sec)
-
-# define EVP_PKEY_CTX_add1_tls1_prf_seed(pctx, seed, seedlen) \
-            EVP_PKEY_CTX_ctrl(pctx, -1, EVP_PKEY_OP_DERIVE, \
-                              EVP_PKEY_CTRL_TLS_SEED, seedlen, (void *)seed)
-
-# define EVP_PKEY_CTX_set_hkdf_md(pctx, md) \
-            EVP_PKEY_CTX_ctrl(pctx, -1, EVP_PKEY_OP_DERIVE, \
-                              EVP_PKEY_CTRL_HKDF_MD, 0, (void *)md)
-
-# define EVP_PKEY_CTX_set1_hkdf_salt(pctx, salt, saltlen) \
-            EVP_PKEY_CTX_ctrl(pctx, -1, EVP_PKEY_OP_DERIVE, \
-                              EVP_PKEY_CTRL_HKDF_SALT, saltlen, (void *)salt)
-
-# define EVP_PKEY_CTX_set1_hkdf_key(pctx, key, keylen) \
-            EVP_PKEY_CTX_ctrl(pctx, -1, EVP_PKEY_OP_DERIVE, \
-                              EVP_PKEY_CTRL_HKDF_KEY, keylen, (void *)key)
-
-# define EVP_PKEY_CTX_add1_hkdf_info(pctx, info, infolen) \
-            EVP_PKEY_CTX_ctrl(pctx, -1, EVP_PKEY_OP_DERIVE, \
-                              EVP_PKEY_CTRL_HKDF_INFO, infolen, (void *)info)
-
-/* BEGIN ERROR CODES */
-/*
- * The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
-
-int ERR_load_KDF_strings(void);
-
-/* Error codes for the KDF functions. */
-
-/* Function codes. */
-# define KDF_F_PKEY_TLS1_PRF_CTRL_STR                     100
-# define KDF_F_PKEY_TLS1_PRF_DERIVE                       101
-
-/* Reason codes. */
-# define KDF_R_INVALID_DIGEST                             100
-# define KDF_R_MISSING_PARAMETER                          101
-# define KDF_R_VALUE_MISSING                              102
-
-# ifdef  __cplusplus
-}
-# endif
-#endif

gpac-2.2.1.tar.gz/extra_lib/include/openssl/lhash.h Deleted

@@ -1,217 +0,0 @@
-/*
- * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
- *
- * Licensed under the OpenSSL license (the "License").  You may not use
- * this file except in compliance with the License.  You can obtain a copy
- * in the file LICENSE in the source distribution or at
- * https://www.openssl.org/source/license.html
- */
-
-/*
- * Header for dynamic hash table routines Author - Eric Young
- */
-
-#ifndef HEADER_LHASH_H
-# define HEADER_LHASH_H
-
-# include <openssl/e_os2.h>
-# include <openssl/bio.h>
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-typedef struct lhash_node_st OPENSSL_LH_NODE;
-typedef int (*OPENSSL_LH_COMPFUNC) (const void *, const void *);
-typedef unsigned long (*OPENSSL_LH_HASHFUNC) (const void *);
-typedef void (*OPENSSL_LH_DOALL_FUNC) (void *);
-typedef void (*OPENSSL_LH_DOALL_FUNCARG) (void *, void *);
-typedef struct lhash_st OPENSSL_LHASH;
-
-/*
- * Macros for declaring and implementing type-safe wrappers for LHASH
- * callbacks. This way, callbacks can be provided to LHASH structures without
- * function pointer casting and the macro-defined callbacks provide
- * per-variable casting before deferring to the underlying type-specific
- * callbacks. NB: It is possible to place a "static" in front of both the
- * DECLARE and IMPLEMENT macros if the functions are strictly internal.
- */
-
-/* First: "hash" functions */
-# define DECLARE_LHASH_HASH_FN(name, o_type) \
-        unsigned long name##_LHASH_HASH(const void *);
-# define IMPLEMENT_LHASH_HASH_FN(name, o_type) \
-        unsigned long name##_LHASH_HASH(const void *arg) { \
-                const o_type *a = arg; \
-                return name##_hash(a); }
-# define LHASH_HASH_FN(name) name##_LHASH_HASH
-
-/* Second: "compare" functions */
-# define DECLARE_LHASH_COMP_FN(name, o_type) \
-        int name##_LHASH_COMP(const void *, const void *);
-# define IMPLEMENT_LHASH_COMP_FN(name, o_type) \
-        int name##_LHASH_COMP(const void *arg1, const void *arg2) { \
-                const o_type *a = arg1;             \
-                const o_type *b = arg2; \
-                return name##_cmp(a,b); }
-# define LHASH_COMP_FN(name) name##_LHASH_COMP
-
-/* Fourth: "doall_arg" functions */
-# define DECLARE_LHASH_DOALL_ARG_FN(name, o_type, a_type) \
-        void name##_LHASH_DOALL_ARG(void *, void *);
-# define IMPLEMENT_LHASH_DOALL_ARG_FN(name, o_type, a_type) \
-        void name##_LHASH_DOALL_ARG(void *arg1, void *arg2) { \
-                o_type *a = arg1; \
-                a_type *b = arg2; \
-                name##_doall_arg(a, b); }
-# define LHASH_DOALL_ARG_FN(name) name##_LHASH_DOALL_ARG
-
-
-# define LH_LOAD_MULT    256
-
-int OPENSSL_LH_error(OPENSSL_LHASH *lh);
-OPENSSL_LHASH *OPENSSL_LH_new(OPENSSL_LH_HASHFUNC h, OPENSSL_LH_COMPFUNC c);
-void OPENSSL_LH_free(OPENSSL_LHASH *lh);
-void *OPENSSL_LH_insert(OPENSSL_LHASH *lh, void *data);
-void *OPENSSL_LH_delete(OPENSSL_LHASH *lh, const void *data);
-void *OPENSSL_LH_retrieve(OPENSSL_LHASH *lh, const void *data);
-void OPENSSL_LH_doall(OPENSSL_LHASH *lh, OPENSSL_LH_DOALL_FUNC func);
-void OPENSSL_LH_doall_arg(OPENSSL_LHASH *lh, OPENSSL_LH_DOALL_FUNCARG func, void *arg);
-unsigned long OPENSSL_LH_strhash(const char *c);
-unsigned long OPENSSL_LH_num_items(const OPENSSL_LHASH *lh);
-unsigned long OPENSSL_LH_get_down_load(const OPENSSL_LHASH *lh);
-void OPENSSL_LH_set_down_load(OPENSSL_LHASH *lh, unsigned long down_load);
-
-# ifndef OPENSSL_NO_STDIO
-void OPENSSL_LH_stats(const OPENSSL_LHASH *lh, FILE *fp);
-void OPENSSL_LH_node_stats(const OPENSSL_LHASH *lh, FILE *fp);
-void OPENSSL_LH_node_usage_stats(const OPENSSL_LHASH *lh, FILE *fp);
-# endif
-void OPENSSL_LH_stats_bio(const OPENSSL_LHASH *lh, BIO *out);
-void OPENSSL_LH_node_stats_bio(const OPENSSL_LHASH *lh, BIO *out);
-void OPENSSL_LH_node_usage_stats_bio(const OPENSSL_LHASH *lh, BIO *out);
-
-# if OPENSSL_API_COMPAT < 0x10100000L
-#  define _LHASH OPENSSL_LHASH
-#  define LHASH_NODE OPENSSL_LH_NODE
-#  define lh_error OPENSSL_LH_error
-#  define lh_new OPENSSL_lh_new
-#  define lh_free OPENSSL_LH_free
-#  define lh_insert OPENSSL_LH_insert
-#  define lh_delete OPENSSL_LH_delete
-#  define lh_retrieve OPENSSL_LH_retrieve
-#  define lh_doall OPENSSL_LH_doall
-#  define lh_doall_arg OPENSSL_LH_doall_arg
-#  define lh_strhash OPENSSL_LH_strhash
-#  define lh_num_items OPENSSL_LH_num_items
-#  ifndef OPENSSL_NO_STDIO
-#   define lh_stats OPENSSL_LH_stats
-#   define lh_node_stats OPENSSL_LH_node_stats
-#   define lh_node_usage_stats OPENSSL_LH_node_usage_stats
-#  endif
-#  define lh_stats_bio OPENSSL_LH_stats_bio
-#  define lh_node_stats_bio OPENSSL_LH_node_stats_bio
-#  define lh_node_usage_stats_bio OPENSSL_LH_node_usage_stats_bio
-# endif
-
-/* Type checking... */
-
-# define LHASH_OF(type) struct lhash_st_##type
-
-# define DEFINE_LHASH_OF(type) \
-    LHASH_OF(type) { union lh_##type##_dummy { void* d1; unsigned long d2; int d3; } dummy; }; \
-    static ossl_inline LHASH_OF(type) * \
-        lh_##type##_new(unsigned long (*hfn)(const type *), \
-                        int (*cfn)(const type *, const type *)) \
-    { \
-        return (LHASH_OF(type) *) \
-            OPENSSL_LH_new((OPENSSL_LH_HASHFUNC)hfn, (OPENSSL_LH_COMPFUNC)cfn); \
-    } \
-    static ossl_inline void lh_##type##_free(LHASH_OF(type) *lh) \
-    { \
-        OPENSSL_LH_free((OPENSSL_LHASH *)lh); \
-    } \
-    static ossl_inline type *lh_##type##_insert(LHASH_OF(type) *lh, type *d) \
-    { \
-        return (type *)OPENSSL_LH_insert((OPENSSL_LHASH *)lh, d); \
-    } \
-    static ossl_inline type *lh_##type##_delete(LHASH_OF(type) *lh, const type *d) \
-    { \
-        return (type *)OPENSSL_LH_delete((OPENSSL_LHASH *)lh, d); \
-    } \
-    static ossl_inline type *lh_##type##_retrieve(LHASH_OF(type) *lh, const type *d) \
-    { \
-        return (type *)OPENSSL_LH_retrieve((OPENSSL_LHASH *)lh, d); \
-    } \
-    static ossl_inline int lh_##type##_error(LHASH_OF(type) *lh) \
-    { \
-        return OPENSSL_LH_error((OPENSSL_LHASH *)lh); \
-    } \
-    static ossl_inline unsigned long lh_##type##_num_items(LHASH_OF(type) *lh) \
-    { \
-        return OPENSSL_LH_num_items((OPENSSL_LHASH *)lh); \
-    } \
-    static ossl_inline void lh_##type##_node_stats_bio(const LHASH_OF(type) *lh, BIO *out) \
-    { \
-        OPENSSL_LH_node_stats_bio((const OPENSSL_LHASH *)lh, out); \
-    } \
-    static ossl_inline void lh_##type##_node_usage_stats_bio(const LHASH_OF(type) *lh, BIO *out) \
-    { \
-        OPENSSL_LH_node_usage_stats_bio((const OPENSSL_LHASH *)lh, out); \
-    } \
-    static ossl_inline void lh_##type##_stats_bio(const LHASH_OF(type) *lh, BIO *out) \
-    { \
-        OPENSSL_LH_stats_bio((const OPENSSL_LHASH *)lh, out); \
-    } \
-    static ossl_inline unsigned long lh_##type##_get_down_load(LHASH_OF(type) *lh) \
-    { \
-        return OPENSSL_LH_get_down_load((OPENSSL_LHASH *)lh); \
-    } \
-    static ossl_inline void lh_##type##_set_down_load(LHASH_OF(type) *lh, unsigned long dl) \
-    { \
-        OPENSSL_LH_set_down_load((OPENSSL_LHASH *)lh, dl); \
-    } \
-    static ossl_inline void lh_##type##_doall(LHASH_OF(type) *lh, \
-                                         void (*doall)(type *)) \
-    { \
-        OPENSSL_LH_doall((OPENSSL_LHASH *)lh, (OPENSSL_LH_DOALL_FUNC)doall); \
-    } \
-    LHASH_OF(type)
-
-#define IMPLEMENT_LHASH_DOALL_ARG_CONST(type, argtype) \
-    int_implement_lhash_doall(type, argtype, const type)
-
-#define IMPLEMENT_LHASH_DOALL_ARG(type, argtype) \
-    int_implement_lhash_doall(type, argtype, type)
-
-#define int_implement_lhash_doall(type, argtype, cbargtype) \
-    static ossl_inline void \
-        lh_##type##_doall_##argtype(LHASH_OF(type) *lh, \
-                                   void (*fn)(cbargtype *, argtype *), \
-                                   argtype *arg) \
-    { \
-        OPENSSL_LH_doall_arg((OPENSSL_LHASH *)lh, (OPENSSL_LH_DOALL_FUNCARG)fn, (void *)arg); \
-    } \
-    LHASH_OF(type)
-
-DEFINE_LHASH_OF(OPENSSL_STRING);
-# ifdef _MSC_VER
-/*
- * push and pop this warning:
- *   warning C4090: 'function': different 'const' qualifiers
- */
-#  pragma warning (push)
-#  pragma warning (disable: 4090)
-# endif
-
-DEFINE_LHASH_OF(OPENSSL_CSTRING);
-
-# ifdef _MSC_VER
-#  pragma warning (pop)
-# endif
-
-#ifdef  __cplusplus
-}
-#endif
-
-#endif

gpac-2.2.1.tar.gz/extra_lib/include/openssl/md2.h Deleted

@@ -1,44 +0,0 @@
-/*
- * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
- *
- * Licensed under the OpenSSL license (the "License").  You may not use
- * this file except in compliance with the License.  You can obtain a copy
- * in the file LICENSE in the source distribution or at
- * https://www.openssl.org/source/license.html
- */
-
-#ifndef HEADER_MD2_H
-# define HEADER_MD2_H
-
-# include <openssl/opensslconf.h>
-
-# ifndef OPENSSL_NO_MD2
-# include <stddef.h>
-# ifdef  __cplusplus
-extern "C" {
-# endif
-
-typedef unsigned char MD2_INT;
-
-# define MD2_DIGEST_LENGTH       16
-# define MD2_BLOCK               16
-
-typedef struct MD2state_st {
-    unsigned int num;
-    unsigned char dataMD2_BLOCK;
-    MD2_INT cksmMD2_BLOCK;
-    MD2_INT stateMD2_BLOCK;
-} MD2_CTX;
-
-const char *MD2_options(void);
-int MD2_Init(MD2_CTX *c);
-int MD2_Update(MD2_CTX *c, const unsigned char *data, size_t len);
-int MD2_Final(unsigned char *md, MD2_CTX *c);
-unsigned char *MD2(const unsigned char *d, size_t n, unsigned char *md);
-
-# ifdef  __cplusplus
-}
-# endif
-# endif
-
-#endif

gpac-2.2.1.tar.gz/extra_lib/include/openssl/md4.h Deleted

@@ -1,51 +0,0 @@
-/*
- * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
- *
- * Licensed under the OpenSSL license (the "License").  You may not use
- * this file except in compliance with the License.  You can obtain a copy
- * in the file LICENSE in the source distribution or at
- * https://www.openssl.org/source/license.html
- */
-
-#ifndef HEADER_MD4_H
-# define HEADER_MD4_H
-
-# include <openssl/opensslconf.h>
-
-# ifndef OPENSSL_NO_MD4
-# include <openssl/e_os2.h>
-# include <stddef.h>
-# ifdef  __cplusplus
-extern "C" {
-# endif
-
-/*-
- * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
- * ! MD4_LONG has to be at least 32 bits wide.                     !
- * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
- */
-# define MD4_LONG unsigned int
-
-# define MD4_CBLOCK      64
-# define MD4_LBLOCK      (MD4_CBLOCK/4)
-# define MD4_DIGEST_LENGTH 16
-
-typedef struct MD4state_st {
-    MD4_LONG A, B, C, D;
-    MD4_LONG Nl, Nh;
-    MD4_LONG dataMD4_LBLOCK;
-    unsigned int num;
-} MD4_CTX;
-
-int MD4_Init(MD4_CTX *c);
-int MD4_Update(MD4_CTX *c, const void *data, size_t len);
-int MD4_Final(unsigned char *md, MD4_CTX *c);
-unsigned char *MD4(const unsigned char *d, size_t n, unsigned char *md);
-void MD4_Transform(MD4_CTX *c, const unsigned char *b);
-
-# ifdef  __cplusplus
-}
-# endif
-# endif
-
-#endif

gpac-2.2.1.tar.gz/extra_lib/include/openssl/md5.h Deleted

@@ -1,50 +0,0 @@
-/*
- * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
- *
- * Licensed under the OpenSSL license (the "License").  You may not use
- * this file except in compliance with the License.  You can obtain a copy
- * in the file LICENSE in the source distribution or at
- * https://www.openssl.org/source/license.html
- */
-
-#ifndef HEADER_MD5_H
-# define HEADER_MD5_H
-
-# include <openssl/opensslconf.h>
-
-# ifndef OPENSSL_NO_MD5
-# include <openssl/e_os2.h>
-# include <stddef.h>
-# ifdef  __cplusplus
-extern "C" {
-# endif
-
-/*
- * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
- * ! MD5_LONG has to be at least 32 bits wide.                     !
- * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
- */
-# define MD5_LONG unsigned int
-
-# define MD5_CBLOCK      64
-# define MD5_LBLOCK      (MD5_CBLOCK/4)
-# define MD5_DIGEST_LENGTH 16
-
-typedef struct MD5state_st {
-    MD5_LONG A, B, C, D;
-    MD5_LONG Nl, Nh;
-    MD5_LONG dataMD5_LBLOCK;
-    unsigned int num;
-} MD5_CTX;
-
-int MD5_Init(MD5_CTX *c);
-int MD5_Update(MD5_CTX *c, const void *data, size_t len);
-int MD5_Final(unsigned char *md, MD5_CTX *c);
-unsigned char *MD5(const unsigned char *d, size_t n, unsigned char *md);
-void MD5_Transform(MD5_CTX *c, const unsigned char *b);
-# ifdef  __cplusplus
-}
-# endif
-# endif
-
-#endif

gpac-2.2.1.tar.gz/extra_lib/include/openssl/mdc2.h Deleted

@@ -1,42 +0,0 @@
-/*
- * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
- *
- * Licensed under the OpenSSL license (the "License").  You may not use
- * this file except in compliance with the License.  You can obtain a copy
- * in the file LICENSE in the source distribution or at
- * https://www.openssl.org/source/license.html
- */
-
-#ifndef HEADER_MDC2_H
-# define HEADER_MDC2_H
-
-# include <openssl/opensslconf.h>
-
-#ifndef OPENSSL_NO_MDC2
-# include <stdlib.h>
-# include <openssl/des.h>
-# ifdef  __cplusplus
-extern "C" {
-# endif
-
-# define MDC2_BLOCK              8
-# define MDC2_DIGEST_LENGTH      16
-
-typedef struct mdc2_ctx_st {
-    unsigned int num;
-    unsigned char dataMDC2_BLOCK;
-    DES_cblock h, hh;
-    int pad_type;               /* either 1 or 2, default 1 */
-} MDC2_CTX;
-
-int MDC2_Init(MDC2_CTX *c);
-int MDC2_Update(MDC2_CTX *c, const unsigned char *data, size_t len);
-int MDC2_Final(unsigned char *md, MDC2_CTX *c);
-unsigned char *MDC2(const unsigned char *d, size_t n, unsigned char *md);
-
-# ifdef  __cplusplus
-}
-# endif
-# endif
-
-#endif

gpac-2.2.1.tar.gz/extra_lib/include/openssl/modes.h Deleted

@@ -1,203 +0,0 @@
-/*
- * Copyright 2008-2016 The OpenSSL Project Authors. All Rights Reserved.
- *
- * Licensed under the OpenSSL license (the "License").  You may not use
- * this file except in compliance with the License.  You can obtain a copy
- * in the file LICENSE in the source distribution or at
- * https://www.openssl.org/source/license.html
- */
-
-#include <stddef.h>
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-typedef void (*block128_f) (const unsigned char in16,
-                            unsigned char out16, const void *key);
-
-typedef void (*cbc128_f) (const unsigned char *in, unsigned char *out,
-                          size_t len, const void *key,
-                          unsigned char ivec16, int enc);
-
-typedef void (*ctr128_f) (const unsigned char *in, unsigned char *out,
-                          size_t blocks, const void *key,
-                          const unsigned char ivec16);
-
-typedef void (*ccm128_f) (const unsigned char *in, unsigned char *out,
-                          size_t blocks, const void *key,
-                          const unsigned char ivec16,
-                          unsigned char cmac16);
-
-void CRYPTO_cbc128_encrypt(const unsigned char *in, unsigned char *out,
-                           size_t len, const void *key,
-                           unsigned char ivec16, block128_f block);
-void CRYPTO_cbc128_decrypt(const unsigned char *in, unsigned char *out,
-                           size_t len, const void *key,
-                           unsigned char ivec16, block128_f block);
-
-void CRYPTO_ctr128_encrypt(const unsigned char *in, unsigned char *out,
-                           size_t len, const void *key,
-                           unsigned char ivec16,
-                           unsigned char ecount_buf16, unsigned int *num,
-                           block128_f block);
-
-void CRYPTO_ctr128_encrypt_ctr32(const unsigned char *in, unsigned char *out,
-                                 size_t len, const void *key,
-                                 unsigned char ivec16,
-                                 unsigned char ecount_buf16,
-                                 unsigned int *num, ctr128_f ctr);
-
-void CRYPTO_ofb128_encrypt(const unsigned char *in, unsigned char *out,
-                           size_t len, const void *key,
-                           unsigned char ivec16, int *num,
-                           block128_f block);
-
-void CRYPTO_cfb128_encrypt(const unsigned char *in, unsigned char *out,
-                           size_t len, const void *key,
-                           unsigned char ivec16, int *num,
-                           int enc, block128_f block);
-void CRYPTO_cfb128_8_encrypt(const unsigned char *in, unsigned char *out,
-                             size_t length, const void *key,
-                             unsigned char ivec16, int *num,
-                             int enc, block128_f block);
-void CRYPTO_cfb128_1_encrypt(const unsigned char *in, unsigned char *out,
-                             size_t bits, const void *key,
-                             unsigned char ivec16, int *num,
-                             int enc, block128_f block);
-
-size_t CRYPTO_cts128_encrypt_block(const unsigned char *in,
-                                   unsigned char *out, size_t len,
-                                   const void *key, unsigned char ivec16,
-                                   block128_f block);
-size_t CRYPTO_cts128_encrypt(const unsigned char *in, unsigned char *out,
-                             size_t len, const void *key,
-                             unsigned char ivec16, cbc128_f cbc);
-size_t CRYPTO_cts128_decrypt_block(const unsigned char *in,
-                                   unsigned char *out, size_t len,
-                                   const void *key, unsigned char ivec16,
-                                   block128_f block);
-size_t CRYPTO_cts128_decrypt(const unsigned char *in, unsigned char *out,
-                             size_t len, const void *key,
-                             unsigned char ivec16, cbc128_f cbc);
-
-size_t CRYPTO_nistcts128_encrypt_block(const unsigned char *in,
-                                       unsigned char *out, size_t len,
-                                       const void *key,
-                                       unsigned char ivec16,
-                                       block128_f block);
-size_t CRYPTO_nistcts128_encrypt(const unsigned char *in, unsigned char *out,
-                                 size_t len, const void *key,
-                                 unsigned char ivec16, cbc128_f cbc);
-size_t CRYPTO_nistcts128_decrypt_block(const unsigned char *in,
-                                       unsigned char *out, size_t len,
-                                       const void *key,
-                                       unsigned char ivec16,
-                                       block128_f block);
-size_t CRYPTO_nistcts128_decrypt(const unsigned char *in, unsigned char *out,
-                                 size_t len, const void *key,
-                                 unsigned char ivec16, cbc128_f cbc);
-
-typedef struct gcm128_context GCM128_CONTEXT;
-
-GCM128_CONTEXT *CRYPTO_gcm128_new(void *key, block128_f block);
-void CRYPTO_gcm128_init(GCM128_CONTEXT *ctx, void *key, block128_f block);
-void CRYPTO_gcm128_setiv(GCM128_CONTEXT *ctx, const unsigned char *iv,
-                         size_t len);
-int CRYPTO_gcm128_aad(GCM128_CONTEXT *ctx, const unsigned char *aad,
-                      size_t len);
-int CRYPTO_gcm128_encrypt(GCM128_CONTEXT *ctx,
-                          const unsigned char *in, unsigned char *out,
-                          size_t len);
-int CRYPTO_gcm128_decrypt(GCM128_CONTEXT *ctx,
-                          const unsigned char *in, unsigned char *out,
-                          size_t len);
-int CRYPTO_gcm128_encrypt_ctr32(GCM128_CONTEXT *ctx,
-                                const unsigned char *in, unsigned char *out,
-                                size_t len, ctr128_f stream);
-int CRYPTO_gcm128_decrypt_ctr32(GCM128_CONTEXT *ctx,
-                                const unsigned char *in, unsigned char *out,
-                                size_t len, ctr128_f stream);
-int CRYPTO_gcm128_finish(GCM128_CONTEXT *ctx, const unsigned char *tag,
-                         size_t len);
-void CRYPTO_gcm128_tag(GCM128_CONTEXT *ctx, unsigned char *tag, size_t len);
-void CRYPTO_gcm128_release(GCM128_CONTEXT *ctx);
-
-typedef struct ccm128_context CCM128_CONTEXT;
-
-void CRYPTO_ccm128_init(CCM128_CONTEXT *ctx,
-                        unsigned int M, unsigned int L, void *key,
-                        block128_f block);
-int CRYPTO_ccm128_setiv(CCM128_CONTEXT *ctx, const unsigned char *nonce,
-                        size_t nlen, size_t mlen);
-void CRYPTO_ccm128_aad(CCM128_CONTEXT *ctx, const unsigned char *aad,
-                       size_t alen);
-int CRYPTO_ccm128_encrypt(CCM128_CONTEXT *ctx, const unsigned char *inp,
-                          unsigned char *out, size_t len);
-int CRYPTO_ccm128_decrypt(CCM128_CONTEXT *ctx, const unsigned char *inp,
-                          unsigned char *out, size_t len);
-int CRYPTO_ccm128_encrypt_ccm64(CCM128_CONTEXT *ctx, const unsigned char *inp,
-                                unsigned char *out, size_t len,
-                                ccm128_f stream);
-int CRYPTO_ccm128_decrypt_ccm64(CCM128_CONTEXT *ctx, const unsigned char *inp,
-                                unsigned char *out, size_t len,
-                                ccm128_f stream);
-size_t CRYPTO_ccm128_tag(CCM128_CONTEXT *ctx, unsigned char *tag, size_t len);
-
-typedef struct xts128_context XTS128_CONTEXT;
-
-int CRYPTO_xts128_encrypt(const XTS128_CONTEXT *ctx,
-                          const unsigned char iv16,
-                          const unsigned char *inp, unsigned char *out,
-                          size_t len, int enc);
-
-size_t CRYPTO_128_wrap(void *key, const unsigned char *iv,
-                       unsigned char *out,
-                       const unsigned char *in, size_t inlen,
-                       block128_f block);
-
-size_t CRYPTO_128_unwrap(void *key, const unsigned char *iv,
-                         unsigned char *out,
-                         const unsigned char *in, size_t inlen,
-                         block128_f block);
-size_t CRYPTO_128_wrap_pad(void *key, const unsigned char *icv,
-                           unsigned char *out, const unsigned char *in,
-                           size_t inlen, block128_f block);
-size_t CRYPTO_128_unwrap_pad(void *key, const unsigned char *icv,
-                             unsigned char *out, const unsigned char *in,
-                             size_t inlen, block128_f block);
-
-#ifndef OPENSSL_NO_OCB
-typedef struct ocb128_context OCB128_CONTEXT;
-
-typedef void (*ocb128_f) (const unsigned char *in, unsigned char *out,
-                          size_t blocks, const void *key,
-                          size_t start_block_num,
-                          unsigned char offset_i16,
-                          const unsigned char L_16,
-                          unsigned char checksum16);
-
-OCB128_CONTEXT *CRYPTO_ocb128_new(void *keyenc, void *keydec,
-                                  block128_f encrypt, block128_f decrypt,
-                                  ocb128_f stream);
-int CRYPTO_ocb128_init(OCB128_CONTEXT *ctx, void *keyenc, void *keydec,
-                       block128_f encrypt, block128_f decrypt,
-                       ocb128_f stream);
-int CRYPTO_ocb128_copy_ctx(OCB128_CONTEXT *dest, OCB128_CONTEXT *src,
-                           void *keyenc, void *keydec);
-int CRYPTO_ocb128_setiv(OCB128_CONTEXT *ctx, const unsigned char *iv,
-                        size_t len, size_t taglen);
-int CRYPTO_ocb128_aad(OCB128_CONTEXT *ctx, const unsigned char *aad,
-                      size_t len);
-int CRYPTO_ocb128_encrypt(OCB128_CONTEXT *ctx, const unsigned char *in,
-                          unsigned char *out, size_t len);
-int CRYPTO_ocb128_decrypt(OCB128_CONTEXT *ctx, const unsigned char *in,
-                          unsigned char *out, size_t len);
-int CRYPTO_ocb128_finish(OCB128_CONTEXT *ctx, const unsigned char *tag,
-                         size_t len);
-int CRYPTO_ocb128_tag(OCB128_CONTEXT *ctx, unsigned char *tag, size_t len);
-void CRYPTO_ocb128_cleanup(OCB128_CONTEXT *ctx);
-#endif                          /* OPENSSL_NO_OCB */
-
-#ifdef  __cplusplus
-}
-#endif

gpac-2.2.1.tar.gz/extra_lib/include/openssl/obj_mac.h Deleted

@@ -1,4577 +0,0 @@
-/*
- * WARNING: do not edit!
- * Generated by crypto/objects/objects.pl
- *
- * Copyright 2000-2016 The OpenSSL Project Authors. All Rights Reserved.
- * Licensed under the OpenSSL license (the "License").  You may not use
- * this file except in compliance with the License.  You can obtain a copy
- * in the file LICENSE in the source distribution or at
- * https://www.openssl.org/source/license.html
- */
-
-#define SN_undef                        "UNDEF"
-#define LN_undef                        "undefined"
-#define NID_undef                       0
-#define OBJ_undef                       0L
-
-#define SN_itu_t                "ITU-T"
-#define LN_itu_t                "itu-t"
-#define NID_itu_t               645
-#define OBJ_itu_t               0L
-
-#define NID_ccitt               404
-#define OBJ_ccitt               OBJ_itu_t
-
-#define SN_iso          "ISO"
-#define LN_iso          "iso"
-#define NID_iso         181
-#define OBJ_iso         1L
-
-#define SN_joint_iso_itu_t              "JOINT-ISO-ITU-T"
-#define LN_joint_iso_itu_t              "joint-iso-itu-t"
-#define NID_joint_iso_itu_t             646
-#define OBJ_joint_iso_itu_t             2L
-
-#define NID_joint_iso_ccitt             393
-#define OBJ_joint_iso_ccitt             OBJ_joint_iso_itu_t
-
-#define SN_member_body          "member-body"
-#define LN_member_body          "ISO Member Body"
-#define NID_member_body         182
-#define OBJ_member_body         OBJ_iso,2L
-
-#define SN_identified_organization              "identified-organization"
-#define NID_identified_organization             676
-#define OBJ_identified_organization             OBJ_iso,3L
-
-#define SN_hmac_md5             "HMAC-MD5"
-#define LN_hmac_md5             "hmac-md5"
-#define NID_hmac_md5            780
-#define OBJ_hmac_md5            OBJ_identified_organization,6L,1L,5L,5L,8L,1L,1L
-
-#define SN_hmac_sha1            "HMAC-SHA1"
-#define LN_hmac_sha1            "hmac-sha1"
-#define NID_hmac_sha1           781
-#define OBJ_hmac_sha1           OBJ_identified_organization,6L,1L,5L,5L,8L,1L,2L
-
-#define SN_certicom_arc         "certicom-arc"
-#define NID_certicom_arc                677
-#define OBJ_certicom_arc                OBJ_identified_organization,132L
-
-#define SN_international_organizations          "international-organizations"
-#define LN_international_organizations          "International Organizations"
-#define NID_international_organizations         647
-#define OBJ_international_organizations         OBJ_joint_iso_itu_t,23L
-
-#define SN_wap          "wap"
-#define NID_wap         678
-#define OBJ_wap         OBJ_international_organizations,43L
-
-#define SN_wap_wsg              "wap-wsg"
-#define NID_wap_wsg             679
-#define OBJ_wap_wsg             OBJ_wap,1L
-
-#define SN_selected_attribute_types             "selected-attribute-types"
-#define LN_selected_attribute_types             "Selected Attribute Types"
-#define NID_selected_attribute_types            394
-#define OBJ_selected_attribute_types            OBJ_joint_iso_itu_t,5L,1L,5L
-
-#define SN_clearance            "clearance"
-#define NID_clearance           395
-#define OBJ_clearance           OBJ_selected_attribute_types,55L
-
-#define SN_ISO_US               "ISO-US"
-#define LN_ISO_US               "ISO US Member Body"
-#define NID_ISO_US              183
-#define OBJ_ISO_US              OBJ_member_body,840L
-
-#define SN_X9_57                "X9-57"
-#define LN_X9_57                "X9.57"
-#define NID_X9_57               184
-#define OBJ_X9_57               OBJ_ISO_US,10040L
-
-#define SN_X9cm         "X9cm"
-#define LN_X9cm         "X9.57 CM ?"
-#define NID_X9cm                185
-#define OBJ_X9cm                OBJ_X9_57,4L
-
-#define SN_dsa          "DSA"
-#define LN_dsa          "dsaEncryption"
-#define NID_dsa         116
-#define OBJ_dsa         OBJ_X9cm,1L
-
-#define SN_dsaWithSHA1          "DSA-SHA1"
-#define LN_dsaWithSHA1          "dsaWithSHA1"
-#define NID_dsaWithSHA1         113
-#define OBJ_dsaWithSHA1         OBJ_X9cm,3L
-
-#define SN_ansi_X9_62           "ansi-X9-62"
-#define LN_ansi_X9_62           "ANSI X9.62"
-#define NID_ansi_X9_62          405
-#define OBJ_ansi_X9_62          OBJ_ISO_US,10045L
-
-#define OBJ_X9_62_id_fieldType          OBJ_ansi_X9_62,1L
-
-#define SN_X9_62_prime_field            "prime-field"
-#define NID_X9_62_prime_field           406
-#define OBJ_X9_62_prime_field           OBJ_X9_62_id_fieldType,1L
-
-#define SN_X9_62_characteristic_two_field               "characteristic-two-field"
-#define NID_X9_62_characteristic_two_field              407
-#define OBJ_X9_62_characteristic_two_field              OBJ_X9_62_id_fieldType,2L
-
-#define SN_X9_62_id_characteristic_two_basis            "id-characteristic-two-basis"
-#define NID_X9_62_id_characteristic_two_basis           680
-#define OBJ_X9_62_id_characteristic_two_basis           OBJ_X9_62_characteristic_two_field,3L
-
-#define SN_X9_62_onBasis                "onBasis"
-#define NID_X9_62_onBasis               681
-#define OBJ_X9_62_onBasis               OBJ_X9_62_id_characteristic_two_basis,1L
-
-#define SN_X9_62_tpBasis                "tpBasis"
-#define NID_X9_62_tpBasis               682
-#define OBJ_X9_62_tpBasis               OBJ_X9_62_id_characteristic_two_basis,2L
-
-#define SN_X9_62_ppBasis                "ppBasis"
-#define NID_X9_62_ppBasis               683
-#define OBJ_X9_62_ppBasis               OBJ_X9_62_id_characteristic_two_basis,3L
-
-#define OBJ_X9_62_id_publicKeyType              OBJ_ansi_X9_62,2L
-
-#define SN_X9_62_id_ecPublicKey         "id-ecPublicKey"
-#define NID_X9_62_id_ecPublicKey                408
-#define OBJ_X9_62_id_ecPublicKey                OBJ_X9_62_id_publicKeyType,1L
-
-#define OBJ_X9_62_ellipticCurve         OBJ_ansi_X9_62,3L
-
-#define OBJ_X9_62_c_TwoCurve            OBJ_X9_62_ellipticCurve,0L
-
-#define SN_X9_62_c2pnb163v1             "c2pnb163v1"
-#define NID_X9_62_c2pnb163v1            684
-#define OBJ_X9_62_c2pnb163v1            OBJ_X9_62_c_TwoCurve,1L
-
-#define SN_X9_62_c2pnb163v2             "c2pnb163v2"
-#define NID_X9_62_c2pnb163v2            685
-#define OBJ_X9_62_c2pnb163v2            OBJ_X9_62_c_TwoCurve,2L
-
-#define SN_X9_62_c2pnb163v3             "c2pnb163v3"
-#define NID_X9_62_c2pnb163v3            686
-#define OBJ_X9_62_c2pnb163v3            OBJ_X9_62_c_TwoCurve,3L
-
-#define SN_X9_62_c2pnb176v1             "c2pnb176v1"
-#define NID_X9_62_c2pnb176v1            687
-#define OBJ_X9_62_c2pnb176v1            OBJ_X9_62_c_TwoCurve,4L
-
-#define SN_X9_62_c2tnb191v1             "c2tnb191v1"
-#define NID_X9_62_c2tnb191v1            688
-#define OBJ_X9_62_c2tnb191v1            OBJ_X9_62_c_TwoCurve,5L
-
-#define SN_X9_62_c2tnb191v2             "c2tnb191v2"
-#define NID_X9_62_c2tnb191v2            689
-#define OBJ_X9_62_c2tnb191v2            OBJ_X9_62_c_TwoCurve,6L
-
-#define SN_X9_62_c2tnb191v3             "c2tnb191v3"
-#define NID_X9_62_c2tnb191v3            690
-#define OBJ_X9_62_c2tnb191v3            OBJ_X9_62_c_TwoCurve,7L
-
-#define SN_X9_62_c2onb191v4             "c2onb191v4"
-#define NID_X9_62_c2onb191v4            691
-#define OBJ_X9_62_c2onb191v4            OBJ_X9_62_c_TwoCurve,8L
-
-#define SN_X9_62_c2onb191v5             "c2onb191v5"
-#define NID_X9_62_c2onb191v5            692
-#define OBJ_X9_62_c2onb191v5            OBJ_X9_62_c_TwoCurve,9L
-
-#define SN_X9_62_c2pnb208w1             "c2pnb208w1"
-#define NID_X9_62_c2pnb208w1            693
-#define OBJ_X9_62_c2pnb208w1            OBJ_X9_62_c_TwoCurve,10L
-
-#define SN_X9_62_c2tnb239v1             "c2tnb239v1"
-#define NID_X9_62_c2tnb239v1            694
-#define OBJ_X9_62_c2tnb239v1            OBJ_X9_62_c_TwoCurve,11L
-
-#define SN_X9_62_c2tnb239v2             "c2tnb239v2"
-#define NID_X9_62_c2tnb239v2            695
-#define OBJ_X9_62_c2tnb239v2            OBJ_X9_62_c_TwoCurve,12L
-
-#define SN_X9_62_c2tnb239v3             "c2tnb239v3"
-#define NID_X9_62_c2tnb239v3            696
-#define OBJ_X9_62_c2tnb239v3            OBJ_X9_62_c_TwoCurve,13L
-
-#define SN_X9_62_c2onb239v4             "c2onb239v4"
-#define NID_X9_62_c2onb239v4            697
-#define OBJ_X9_62_c2onb239v4            OBJ_X9_62_c_TwoCurve,14L
-
-#define SN_X9_62_c2onb239v5             "c2onb239v5"
-#define NID_X9_62_c2onb239v5            698
-#define OBJ_X9_62_c2onb239v5            OBJ_X9_62_c_TwoCurve,15L
-
-#define SN_X9_62_c2pnb272w1             "c2pnb272w1"
-#define NID_X9_62_c2pnb272w1            699
-#define OBJ_X9_62_c2pnb272w1            OBJ_X9_62_c_TwoCurve,16L
-
-#define SN_X9_62_c2pnb304w1             "c2pnb304w1"
-#define NID_X9_62_c2pnb304w1            700
-#define OBJ_X9_62_c2pnb304w1            OBJ_X9_62_c_TwoCurve,17L
-
-#define SN_X9_62_c2tnb359v1             "c2tnb359v1"
-#define NID_X9_62_c2tnb359v1            701
-#define OBJ_X9_62_c2tnb359v1            OBJ_X9_62_c_TwoCurve,18L
-
-#define SN_X9_62_c2pnb368w1             "c2pnb368w1"
-#define NID_X9_62_c2pnb368w1            702
-#define OBJ_X9_62_c2pnb368w1            OBJ_X9_62_c_TwoCurve,19L
-
-#define SN_X9_62_c2tnb431r1             "c2tnb431r1"
-#define NID_X9_62_c2tnb431r1            703
-#define OBJ_X9_62_c2tnb431r1            OBJ_X9_62_c_TwoCurve,20L
-
-#define OBJ_X9_62_primeCurve            OBJ_X9_62_ellipticCurve,1L
-
-#define SN_X9_62_prime192v1             "prime192v1"
-#define NID_X9_62_prime192v1            409
-#define OBJ_X9_62_prime192v1            OBJ_X9_62_primeCurve,1L
-
-#define SN_X9_62_prime192v2             "prime192v2"
-#define NID_X9_62_prime192v2            410
-#define OBJ_X9_62_prime192v2            OBJ_X9_62_primeCurve,2L
-
-#define SN_X9_62_prime192v3             "prime192v3"
-#define NID_X9_62_prime192v3            411
-#define OBJ_X9_62_prime192v3            OBJ_X9_62_primeCurve,3L
-
-#define SN_X9_62_prime239v1             "prime239v1"
-#define NID_X9_62_prime239v1            412
-#define OBJ_X9_62_prime239v1            OBJ_X9_62_primeCurve,4L
-
-#define SN_X9_62_prime239v2             "prime239v2"
-#define NID_X9_62_prime239v2            413
-#define OBJ_X9_62_prime239v2            OBJ_X9_62_primeCurve,5L
-
-#define SN_X9_62_prime239v3             "prime239v3"
-#define NID_X9_62_prime239v3            414
-#define OBJ_X9_62_prime239v3            OBJ_X9_62_primeCurve,6L
-
-#define SN_X9_62_prime256v1             "prime256v1"
-#define NID_X9_62_prime256v1            415
-#define OBJ_X9_62_prime256v1            OBJ_X9_62_primeCurve,7L
-
-#define OBJ_X9_62_id_ecSigType          OBJ_ansi_X9_62,4L
-
-#define SN_ecdsa_with_SHA1              "ecdsa-with-SHA1"
-#define NID_ecdsa_with_SHA1             416
-#define OBJ_ecdsa_with_SHA1             OBJ_X9_62_id_ecSigType,1L
-
-#define SN_ecdsa_with_Recommended               "ecdsa-with-Recommended"
-#define NID_ecdsa_with_Recommended              791
-#define OBJ_ecdsa_with_Recommended              OBJ_X9_62_id_ecSigType,2L
-
-#define SN_ecdsa_with_Specified         "ecdsa-with-Specified"
-#define NID_ecdsa_with_Specified                792
-#define OBJ_ecdsa_with_Specified                OBJ_X9_62_id_ecSigType,3L
-
-#define SN_ecdsa_with_SHA224            "ecdsa-with-SHA224"
-#define NID_ecdsa_with_SHA224           793
-#define OBJ_ecdsa_with_SHA224           OBJ_ecdsa_with_Specified,1L
-
-#define SN_ecdsa_with_SHA256            "ecdsa-with-SHA256"
-#define NID_ecdsa_with_SHA256           794
-#define OBJ_ecdsa_with_SHA256           OBJ_ecdsa_with_Specified,2L
-
-#define SN_ecdsa_with_SHA384            "ecdsa-with-SHA384"
-#define NID_ecdsa_with_SHA384           795
-#define OBJ_ecdsa_with_SHA384           OBJ_ecdsa_with_Specified,3L
-
-#define SN_ecdsa_with_SHA512            "ecdsa-with-SHA512"
-#define NID_ecdsa_with_SHA512           796
-#define OBJ_ecdsa_with_SHA512           OBJ_ecdsa_with_Specified,4L
-
-#define OBJ_secg_ellipticCurve          OBJ_certicom_arc,0L
-
-#define SN_secp112r1            "secp112r1"
-#define NID_secp112r1           704
-#define OBJ_secp112r1           OBJ_secg_ellipticCurve,6L
-
-#define SN_secp112r2            "secp112r2"
-#define NID_secp112r2           705
-#define OBJ_secp112r2           OBJ_secg_ellipticCurve,7L
-
-#define SN_secp128r1            "secp128r1"
-#define NID_secp128r1           706
-#define OBJ_secp128r1           OBJ_secg_ellipticCurve,28L
-
-#define SN_secp128r2            "secp128r2"
-#define NID_secp128r2           707
-#define OBJ_secp128r2           OBJ_secg_ellipticCurve,29L
-
-#define SN_secp160k1            "secp160k1"
-#define NID_secp160k1           708
-#define OBJ_secp160k1           OBJ_secg_ellipticCurve,9L
-
-#define SN_secp160r1            "secp160r1"
-#define NID_secp160r1           709
-#define OBJ_secp160r1           OBJ_secg_ellipticCurve,8L
-
-#define SN_secp160r2            "secp160r2"
-#define NID_secp160r2           710
-#define OBJ_secp160r2           OBJ_secg_ellipticCurve,30L
-
-#define SN_secp192k1            "secp192k1"
-#define NID_secp192k1           711
-#define OBJ_secp192k1           OBJ_secg_ellipticCurve,31L
-
-#define SN_secp224k1            "secp224k1"
-#define NID_secp224k1           712
-#define OBJ_secp224k1           OBJ_secg_ellipticCurve,32L
-
-#define SN_secp224r1            "secp224r1"
-#define NID_secp224r1           713
-#define OBJ_secp224r1           OBJ_secg_ellipticCurve,33L
-
-#define SN_secp256k1            "secp256k1"
-#define NID_secp256k1           714
-#define OBJ_secp256k1           OBJ_secg_ellipticCurve,10L
-
-#define SN_secp384r1            "secp384r1"
-#define NID_secp384r1           715
-#define OBJ_secp384r1           OBJ_secg_ellipticCurve,34L
-
-#define SN_secp521r1            "secp521r1"
-#define NID_secp521r1           716
-#define OBJ_secp521r1           OBJ_secg_ellipticCurve,35L
-
-#define SN_sect113r1            "sect113r1"
-#define NID_sect113r1           717
-#define OBJ_sect113r1           OBJ_secg_ellipticCurve,4L
-
-#define SN_sect113r2            "sect113r2"
-#define NID_sect113r2           718
-#define OBJ_sect113r2           OBJ_secg_ellipticCurve,5L
-
-#define SN_sect131r1            "sect131r1"
-#define NID_sect131r1           719
-#define OBJ_sect131r1           OBJ_secg_ellipticCurve,22L
-
-#define SN_sect131r2            "sect131r2"
-#define NID_sect131r2           720
-#define OBJ_sect131r2           OBJ_secg_ellipticCurve,23L
-
-#define SN_sect163k1            "sect163k1"
-#define NID_sect163k1           721
-#define OBJ_sect163k1           OBJ_secg_ellipticCurve,1L
-
-#define SN_sect163r1            "sect163r1"
-#define NID_sect163r1           722
-#define OBJ_sect163r1           OBJ_secg_ellipticCurve,2L
-
-#define SN_sect163r2            "sect163r2"
-#define NID_sect163r2           723
-#define OBJ_sect163r2           OBJ_secg_ellipticCurve,15L
-
-#define SN_sect193r1            "sect193r1"
-#define NID_sect193r1           724
-#define OBJ_sect193r1           OBJ_secg_ellipticCurve,24L
-
-#define SN_sect193r2            "sect193r2"
-#define NID_sect193r2           725
-#define OBJ_sect193r2           OBJ_secg_ellipticCurve,25L
-
-#define SN_sect233k1            "sect233k1"
-#define NID_sect233k1           726
-#define OBJ_sect233k1           OBJ_secg_ellipticCurve,26L
-
-#define SN_sect233r1            "sect233r1"
-#define NID_sect233r1           727
-#define OBJ_sect233r1           OBJ_secg_ellipticCurve,27L
-
-#define SN_sect239k1            "sect239k1"
-#define NID_sect239k1           728
-#define OBJ_sect239k1           OBJ_secg_ellipticCurve,3L
-
-#define SN_sect283k1            "sect283k1"
-#define NID_sect283k1           729
-#define OBJ_sect283k1           OBJ_secg_ellipticCurve,16L
-
-#define SN_sect283r1            "sect283r1"
-#define NID_sect283r1           730
-#define OBJ_sect283r1           OBJ_secg_ellipticCurve,17L
-
-#define SN_sect409k1            "sect409k1"
-#define NID_sect409k1           731
-#define OBJ_sect409k1           OBJ_secg_ellipticCurve,36L
-
-#define SN_sect409r1            "sect409r1"
-#define NID_sect409r1           732
-#define OBJ_sect409r1           OBJ_secg_ellipticCurve,37L
-
-#define SN_sect571k1            "sect571k1"
-#define NID_sect571k1           733
-#define OBJ_sect571k1           OBJ_secg_ellipticCurve,38L
-
-#define SN_sect571r1            "sect571r1"
-#define NID_sect571r1           734
-#define OBJ_sect571r1           OBJ_secg_ellipticCurve,39L
-
-#define OBJ_wap_wsg_idm_ecid            OBJ_wap_wsg,4L
-
-#define SN_wap_wsg_idm_ecid_wtls1               "wap-wsg-idm-ecid-wtls1"
-#define NID_wap_wsg_idm_ecid_wtls1              735
-#define OBJ_wap_wsg_idm_ecid_wtls1              OBJ_wap_wsg_idm_ecid,1L
-
-#define SN_wap_wsg_idm_ecid_wtls3               "wap-wsg-idm-ecid-wtls3"
-#define NID_wap_wsg_idm_ecid_wtls3              736
-#define OBJ_wap_wsg_idm_ecid_wtls3              OBJ_wap_wsg_idm_ecid,3L
-
-#define SN_wap_wsg_idm_ecid_wtls4               "wap-wsg-idm-ecid-wtls4"
-#define NID_wap_wsg_idm_ecid_wtls4              737
-#define OBJ_wap_wsg_idm_ecid_wtls4              OBJ_wap_wsg_idm_ecid,4L
-
-#define SN_wap_wsg_idm_ecid_wtls5               "wap-wsg-idm-ecid-wtls5"
-#define NID_wap_wsg_idm_ecid_wtls5              738
-#define OBJ_wap_wsg_idm_ecid_wtls5              OBJ_wap_wsg_idm_ecid,5L
-
-#define SN_wap_wsg_idm_ecid_wtls6               "wap-wsg-idm-ecid-wtls6"
-#define NID_wap_wsg_idm_ecid_wtls6              739
-#define OBJ_wap_wsg_idm_ecid_wtls6              OBJ_wap_wsg_idm_ecid,6L
-
-#define SN_wap_wsg_idm_ecid_wtls7               "wap-wsg-idm-ecid-wtls7"
-#define NID_wap_wsg_idm_ecid_wtls7              740
-#define OBJ_wap_wsg_idm_ecid_wtls7              OBJ_wap_wsg_idm_ecid,7L
-
-#define SN_wap_wsg_idm_ecid_wtls8               "wap-wsg-idm-ecid-wtls8"
-#define NID_wap_wsg_idm_ecid_wtls8              741
-#define OBJ_wap_wsg_idm_ecid_wtls8              OBJ_wap_wsg_idm_ecid,8L
-
-#define SN_wap_wsg_idm_ecid_wtls9               "wap-wsg-idm-ecid-wtls9"
-#define NID_wap_wsg_idm_ecid_wtls9              742
-#define OBJ_wap_wsg_idm_ecid_wtls9              OBJ_wap_wsg_idm_ecid,9L
-
-#define SN_wap_wsg_idm_ecid_wtls10              "wap-wsg-idm-ecid-wtls10"
-#define NID_wap_wsg_idm_ecid_wtls10             743
-#define OBJ_wap_wsg_idm_ecid_wtls10             OBJ_wap_wsg_idm_ecid,10L
-
-#define SN_wap_wsg_idm_ecid_wtls11              "wap-wsg-idm-ecid-wtls11"
-#define NID_wap_wsg_idm_ecid_wtls11             744
-#define OBJ_wap_wsg_idm_ecid_wtls11             OBJ_wap_wsg_idm_ecid,11L
-
-#define SN_wap_wsg_idm_ecid_wtls12              "wap-wsg-idm-ecid-wtls12"
-#define NID_wap_wsg_idm_ecid_wtls12             745
-#define OBJ_wap_wsg_idm_ecid_wtls12             OBJ_wap_wsg_idm_ecid,12L
-
-#define SN_cast5_cbc            "CAST5-CBC"
-#define LN_cast5_cbc            "cast5-cbc"
-#define NID_cast5_cbc           108
-#define OBJ_cast5_cbc           OBJ_ISO_US,113533L,7L,66L,10L
-
-#define SN_cast5_ecb            "CAST5-ECB"
-#define LN_cast5_ecb            "cast5-ecb"
-#define NID_cast5_ecb           109
-
-#define SN_cast5_cfb64          "CAST5-CFB"
-#define LN_cast5_cfb64          "cast5-cfb"
-#define NID_cast5_cfb64         110
-
-#define SN_cast5_ofb64          "CAST5-OFB"
-#define LN_cast5_ofb64          "cast5-ofb"
-#define NID_cast5_ofb64         111
-
-#define LN_pbeWithMD5AndCast5_CBC               "pbeWithMD5AndCast5CBC"
-#define NID_pbeWithMD5AndCast5_CBC              112
-#define OBJ_pbeWithMD5AndCast5_CBC              OBJ_ISO_US,113533L,7L,66L,12L
-
-#define SN_id_PasswordBasedMAC          "id-PasswordBasedMAC"
-#define LN_id_PasswordBasedMAC          "password based MAC"
-#define NID_id_PasswordBasedMAC         782
-#define OBJ_id_PasswordBasedMAC         OBJ_ISO_US,113533L,7L,66L,13L
-
-#define SN_id_DHBasedMac                "id-DHBasedMac"
-#define LN_id_DHBasedMac                "Diffie-Hellman based MAC"
-#define NID_id_DHBasedMac               783
-#define OBJ_id_DHBasedMac               OBJ_ISO_US,113533L,7L,66L,30L
-
-#define SN_rsadsi               "rsadsi"
-#define LN_rsadsi               "RSA Data Security, Inc."
-#define NID_rsadsi              1
-#define OBJ_rsadsi              OBJ_ISO_US,113549L
-
-#define SN_pkcs         "pkcs"
-#define LN_pkcs         "RSA Data Security, Inc. PKCS"
-#define NID_pkcs                2
-#define OBJ_pkcs                OBJ_rsadsi,1L
-
-#define SN_pkcs1                "pkcs1"
-#define NID_pkcs1               186
-#define OBJ_pkcs1               OBJ_pkcs,1L
-
-#define LN_rsaEncryption                "rsaEncryption"
-#define NID_rsaEncryption               6
-#define OBJ_rsaEncryption               OBJ_pkcs1,1L
-
-#define SN_md2WithRSAEncryption         "RSA-MD2"
-#define LN_md2WithRSAEncryption         "md2WithRSAEncryption"
-#define NID_md2WithRSAEncryption                7
-#define OBJ_md2WithRSAEncryption                OBJ_pkcs1,2L
-
-#define SN_md4WithRSAEncryption         "RSA-MD4"
-#define LN_md4WithRSAEncryption         "md4WithRSAEncryption"
-#define NID_md4WithRSAEncryption                396
-#define OBJ_md4WithRSAEncryption                OBJ_pkcs1,3L
-
-#define SN_md5WithRSAEncryption         "RSA-MD5"
-#define LN_md5WithRSAEncryption         "md5WithRSAEncryption"
-#define NID_md5WithRSAEncryption                8
-#define OBJ_md5WithRSAEncryption                OBJ_pkcs1,4L
-
-#define SN_sha1WithRSAEncryption                "RSA-SHA1"
-#define LN_sha1WithRSAEncryption                "sha1WithRSAEncryption"
-#define NID_sha1WithRSAEncryption               65
-#define OBJ_sha1WithRSAEncryption               OBJ_pkcs1,5L
-
-#define SN_rsaesOaep            "RSAES-OAEP"
-#define LN_rsaesOaep            "rsaesOaep"
-#define NID_rsaesOaep           919
-#define OBJ_rsaesOaep           OBJ_pkcs1,7L
-
-#define SN_mgf1         "MGF1"
-#define LN_mgf1         "mgf1"
-#define NID_mgf1                911
-#define OBJ_mgf1                OBJ_pkcs1,8L
-
-#define SN_pSpecified           "PSPECIFIED"
-#define LN_pSpecified           "pSpecified"
-#define NID_pSpecified          935
-#define OBJ_pSpecified          OBJ_pkcs1,9L
-
-#define SN_rsassaPss            "RSASSA-PSS"
-#define LN_rsassaPss            "rsassaPss"
-#define NID_rsassaPss           912
-#define OBJ_rsassaPss           OBJ_pkcs1,10L
-
-#define SN_sha256WithRSAEncryption              "RSA-SHA256"
-#define LN_sha256WithRSAEncryption              "sha256WithRSAEncryption"
-#define NID_sha256WithRSAEncryption             668
-#define OBJ_sha256WithRSAEncryption             OBJ_pkcs1,11L
-
-#define SN_sha384WithRSAEncryption              "RSA-SHA384"
-#define LN_sha384WithRSAEncryption              "sha384WithRSAEncryption"
-#define NID_sha384WithRSAEncryption             669
-#define OBJ_sha384WithRSAEncryption             OBJ_pkcs1,12L
-
-#define SN_sha512WithRSAEncryption              "RSA-SHA512"
-#define LN_sha512WithRSAEncryption              "sha512WithRSAEncryption"
-#define NID_sha512WithRSAEncryption             670
-#define OBJ_sha512WithRSAEncryption             OBJ_pkcs1,13L
-
-#define SN_sha224WithRSAEncryption              "RSA-SHA224"
-#define LN_sha224WithRSAEncryption              "sha224WithRSAEncryption"
-#define NID_sha224WithRSAEncryption             671
-#define OBJ_sha224WithRSAEncryption             OBJ_pkcs1,14L
-
-#define SN_pkcs3                "pkcs3"
-#define NID_pkcs3               27
-#define OBJ_pkcs3               OBJ_pkcs,3L
-
-#define LN_dhKeyAgreement               "dhKeyAgreement"
-#define NID_dhKeyAgreement              28
-#define OBJ_dhKeyAgreement              OBJ_pkcs3,1L
-
-#define SN_pkcs5                "pkcs5"
-#define NID_pkcs5               187
-#define OBJ_pkcs5               OBJ_pkcs,5L
-
-#define SN_pbeWithMD2AndDES_CBC         "PBE-MD2-DES"
-#define LN_pbeWithMD2AndDES_CBC         "pbeWithMD2AndDES-CBC"
-#define NID_pbeWithMD2AndDES_CBC                9
-#define OBJ_pbeWithMD2AndDES_CBC                OBJ_pkcs5,1L
-
-#define SN_pbeWithMD5AndDES_CBC         "PBE-MD5-DES"
-#define LN_pbeWithMD5AndDES_CBC         "pbeWithMD5AndDES-CBC"
-#define NID_pbeWithMD5AndDES_CBC                10
-#define OBJ_pbeWithMD5AndDES_CBC                OBJ_pkcs5,3L
-
-#define SN_pbeWithMD2AndRC2_CBC         "PBE-MD2-RC2-64"
-#define LN_pbeWithMD2AndRC2_CBC         "pbeWithMD2AndRC2-CBC"
-#define NID_pbeWithMD2AndRC2_CBC                168
-#define OBJ_pbeWithMD2AndRC2_CBC                OBJ_pkcs5,4L
-
-#define SN_pbeWithMD5AndRC2_CBC         "PBE-MD5-RC2-64"
-#define LN_pbeWithMD5AndRC2_CBC         "pbeWithMD5AndRC2-CBC"
-#define NID_pbeWithMD5AndRC2_CBC                169
-#define OBJ_pbeWithMD5AndRC2_CBC                OBJ_pkcs5,6L
-
-#define SN_pbeWithSHA1AndDES_CBC                "PBE-SHA1-DES"
-#define LN_pbeWithSHA1AndDES_CBC                "pbeWithSHA1AndDES-CBC"
-#define NID_pbeWithSHA1AndDES_CBC               170
-#define OBJ_pbeWithSHA1AndDES_CBC               OBJ_pkcs5,10L
-
-#define SN_pbeWithSHA1AndRC2_CBC                "PBE-SHA1-RC2-64"
-#define LN_pbeWithSHA1AndRC2_CBC                "pbeWithSHA1AndRC2-CBC"
-#define NID_pbeWithSHA1AndRC2_CBC               68
-#define OBJ_pbeWithSHA1AndRC2_CBC               OBJ_pkcs5,11L
-
-#define LN_id_pbkdf2            "PBKDF2"
-#define NID_id_pbkdf2           69
-#define OBJ_id_pbkdf2           OBJ_pkcs5,12L
-
-#define LN_pbes2                "PBES2"
-#define NID_pbes2               161
-#define OBJ_pbes2               OBJ_pkcs5,13L
-
-#define LN_pbmac1               "PBMAC1"
-#define NID_pbmac1              162
-#define OBJ_pbmac1              OBJ_pkcs5,14L
-
-#define SN_pkcs7                "pkcs7"
-#define NID_pkcs7               20
-#define OBJ_pkcs7               OBJ_pkcs,7L
-
-#define LN_pkcs7_data           "pkcs7-data"
-#define NID_pkcs7_data          21
-#define OBJ_pkcs7_data          OBJ_pkcs7,1L
-
-#define LN_pkcs7_signed         "pkcs7-signedData"
-#define NID_pkcs7_signed                22
-#define OBJ_pkcs7_signed                OBJ_pkcs7,2L
-
-#define LN_pkcs7_enveloped              "pkcs7-envelopedData"
-#define NID_pkcs7_enveloped             23
-#define OBJ_pkcs7_enveloped             OBJ_pkcs7,3L
-
-#define LN_pkcs7_signedAndEnveloped             "pkcs7-signedAndEnvelopedData"
-#define NID_pkcs7_signedAndEnveloped            24
-#define OBJ_pkcs7_signedAndEnveloped            OBJ_pkcs7,4L
-
-#define LN_pkcs7_digest         "pkcs7-digestData"
-#define NID_pkcs7_digest                25
-#define OBJ_pkcs7_digest                OBJ_pkcs7,5L
-
-#define LN_pkcs7_encrypted              "pkcs7-encryptedData"
-#define NID_pkcs7_encrypted             26
-#define OBJ_pkcs7_encrypted             OBJ_pkcs7,6L
-
-#define SN_pkcs9                "pkcs9"
-#define NID_pkcs9               47
-#define OBJ_pkcs9               OBJ_pkcs,9L
-
-#define LN_pkcs9_emailAddress           "emailAddress"
-#define NID_pkcs9_emailAddress          48
-#define OBJ_pkcs9_emailAddress          OBJ_pkcs9,1L
-
-#define LN_pkcs9_unstructuredName               "unstructuredName"
-#define NID_pkcs9_unstructuredName              49
-#define OBJ_pkcs9_unstructuredName              OBJ_pkcs9,2L
-
-#define LN_pkcs9_contentType            "contentType"
-#define NID_pkcs9_contentType           50
-#define OBJ_pkcs9_contentType           OBJ_pkcs9,3L
-
-#define LN_pkcs9_messageDigest          "messageDigest"
-#define NID_pkcs9_messageDigest         51
-#define OBJ_pkcs9_messageDigest         OBJ_pkcs9,4L
-
-#define LN_pkcs9_signingTime            "signingTime"
-#define NID_pkcs9_signingTime           52
-#define OBJ_pkcs9_signingTime           OBJ_pkcs9,5L
-
-#define LN_pkcs9_countersignature               "countersignature"
-#define NID_pkcs9_countersignature              53
-#define OBJ_pkcs9_countersignature              OBJ_pkcs9,6L
-
-#define LN_pkcs9_challengePassword              "challengePassword"
-#define NID_pkcs9_challengePassword             54
-#define OBJ_pkcs9_challengePassword             OBJ_pkcs9,7L
-
-#define LN_pkcs9_unstructuredAddress            "unstructuredAddress"
-#define NID_pkcs9_unstructuredAddress           55
-#define OBJ_pkcs9_unstructuredAddress           OBJ_pkcs9,8L
-
-#define LN_pkcs9_extCertAttributes              "extendedCertificateAttributes"
-#define NID_pkcs9_extCertAttributes             56
-#define OBJ_pkcs9_extCertAttributes             OBJ_pkcs9,9L
-
-#define SN_ext_req              "extReq"
-#define LN_ext_req              "Extension Request"
-#define NID_ext_req             172
-#define OBJ_ext_req             OBJ_pkcs9,14L
-
-#define SN_SMIMECapabilities            "SMIME-CAPS"
-#define LN_SMIMECapabilities            "S/MIME Capabilities"
-#define NID_SMIMECapabilities           167
-#define OBJ_SMIMECapabilities           OBJ_pkcs9,15L
-
-#define SN_SMIME                "SMIME"
-#define LN_SMIME                "S/MIME"
-#define NID_SMIME               188
-#define OBJ_SMIME               OBJ_pkcs9,16L
-
-#define SN_id_smime_mod         "id-smime-mod"
-#define NID_id_smime_mod                189
-#define OBJ_id_smime_mod                OBJ_SMIME,0L
-
-#define SN_id_smime_ct          "id-smime-ct"
-#define NID_id_smime_ct         190
-#define OBJ_id_smime_ct         OBJ_SMIME,1L
-
-#define SN_id_smime_aa          "id-smime-aa"
-#define NID_id_smime_aa         191
-#define OBJ_id_smime_aa         OBJ_SMIME,2L
-
-#define SN_id_smime_alg         "id-smime-alg"
-#define NID_id_smime_alg                192
-#define OBJ_id_smime_alg                OBJ_SMIME,3L
-
-#define SN_id_smime_cd          "id-smime-cd"
-#define NID_id_smime_cd         193
-#define OBJ_id_smime_cd         OBJ_SMIME,4L
-
-#define SN_id_smime_spq         "id-smime-spq"
-#define NID_id_smime_spq                194
-#define OBJ_id_smime_spq                OBJ_SMIME,5L
-
-#define SN_id_smime_cti         "id-smime-cti"
-#define NID_id_smime_cti                195
-#define OBJ_id_smime_cti                OBJ_SMIME,6L
-
-#define SN_id_smime_mod_cms             "id-smime-mod-cms"
-#define NID_id_smime_mod_cms            196
-#define OBJ_id_smime_mod_cms            OBJ_id_smime_mod,1L
-
-#define SN_id_smime_mod_ess             "id-smime-mod-ess"
-#define NID_id_smime_mod_ess            197
-#define OBJ_id_smime_mod_ess            OBJ_id_smime_mod,2L
-
-#define SN_id_smime_mod_oid             "id-smime-mod-oid"
-#define NID_id_smime_mod_oid            198
-#define OBJ_id_smime_mod_oid            OBJ_id_smime_mod,3L
-
-#define SN_id_smime_mod_msg_v3          "id-smime-mod-msg-v3"
-#define NID_id_smime_mod_msg_v3         199
-#define OBJ_id_smime_mod_msg_v3         OBJ_id_smime_mod,4L
-
-#define SN_id_smime_mod_ets_eSignature_88               "id-smime-mod-ets-eSignature-88"
-#define NID_id_smime_mod_ets_eSignature_88              200
-#define OBJ_id_smime_mod_ets_eSignature_88              OBJ_id_smime_mod,5L
-
-#define SN_id_smime_mod_ets_eSignature_97               "id-smime-mod-ets-eSignature-97"
-#define NID_id_smime_mod_ets_eSignature_97              201
-#define OBJ_id_smime_mod_ets_eSignature_97              OBJ_id_smime_mod,6L
-
-#define SN_id_smime_mod_ets_eSigPolicy_88               "id-smime-mod-ets-eSigPolicy-88"
-#define NID_id_smime_mod_ets_eSigPolicy_88              202
-#define OBJ_id_smime_mod_ets_eSigPolicy_88              OBJ_id_smime_mod,7L
-
-#define SN_id_smime_mod_ets_eSigPolicy_97               "id-smime-mod-ets-eSigPolicy-97"
-#define NID_id_smime_mod_ets_eSigPolicy_97              203
-#define OBJ_id_smime_mod_ets_eSigPolicy_97              OBJ_id_smime_mod,8L
-
-#define SN_id_smime_ct_receipt          "id-smime-ct-receipt"
-#define NID_id_smime_ct_receipt         204
-#define OBJ_id_smime_ct_receipt         OBJ_id_smime_ct,1L
-
-#define SN_id_smime_ct_authData         "id-smime-ct-authData"
-#define NID_id_smime_ct_authData                205
-#define OBJ_id_smime_ct_authData                OBJ_id_smime_ct,2L
-
-#define SN_id_smime_ct_publishCert              "id-smime-ct-publishCert"
-#define NID_id_smime_ct_publishCert             206
-#define OBJ_id_smime_ct_publishCert             OBJ_id_smime_ct,3L
-
-#define SN_id_smime_ct_TSTInfo          "id-smime-ct-TSTInfo"
-#define NID_id_smime_ct_TSTInfo         207
-#define OBJ_id_smime_ct_TSTInfo         OBJ_id_smime_ct,4L
-
-#define SN_id_smime_ct_TDTInfo          "id-smime-ct-TDTInfo"
-#define NID_id_smime_ct_TDTInfo         208
-#define OBJ_id_smime_ct_TDTInfo         OBJ_id_smime_ct,5L
-
-#define SN_id_smime_ct_contentInfo              "id-smime-ct-contentInfo"
-#define NID_id_smime_ct_contentInfo             209
-#define OBJ_id_smime_ct_contentInfo             OBJ_id_smime_ct,6L
-
-#define SN_id_smime_ct_DVCSRequestData          "id-smime-ct-DVCSRequestData"
-#define NID_id_smime_ct_DVCSRequestData         210
-#define OBJ_id_smime_ct_DVCSRequestData         OBJ_id_smime_ct,7L
-
-#define SN_id_smime_ct_DVCSResponseData         "id-smime-ct-DVCSResponseData"
-#define NID_id_smime_ct_DVCSResponseData                211
-#define OBJ_id_smime_ct_DVCSResponseData                OBJ_id_smime_ct,8L
-
-#define SN_id_smime_ct_compressedData           "id-smime-ct-compressedData"
-#define NID_id_smime_ct_compressedData          786
-#define OBJ_id_smime_ct_compressedData          OBJ_id_smime_ct,9L
-
-#define SN_id_smime_ct_contentCollection                "id-smime-ct-contentCollection"
-#define NID_id_smime_ct_contentCollection               1058
-#define OBJ_id_smime_ct_contentCollection               OBJ_id_smime_ct,19L
-
-#define SN_id_smime_ct_authEnvelopedData                "id-smime-ct-authEnvelopedData"
-#define NID_id_smime_ct_authEnvelopedData               1059
-#define OBJ_id_smime_ct_authEnvelopedData               OBJ_id_smime_ct,23L
-
-#define SN_id_ct_asciiTextWithCRLF              "id-ct-asciiTextWithCRLF"
-#define NID_id_ct_asciiTextWithCRLF             787
-#define OBJ_id_ct_asciiTextWithCRLF             OBJ_id_smime_ct,27L
-
-#define SN_id_ct_xml            "id-ct-xml"
-#define NID_id_ct_xml           1060
-#define OBJ_id_ct_xml           OBJ_id_smime_ct,28L
-
-#define SN_id_smime_aa_receiptRequest           "id-smime-aa-receiptRequest"
-#define NID_id_smime_aa_receiptRequest          212
-#define OBJ_id_smime_aa_receiptRequest          OBJ_id_smime_aa,1L
-
-#define SN_id_smime_aa_securityLabel            "id-smime-aa-securityLabel"
-#define NID_id_smime_aa_securityLabel           213
-#define OBJ_id_smime_aa_securityLabel           OBJ_id_smime_aa,2L
-
-#define SN_id_smime_aa_mlExpandHistory          "id-smime-aa-mlExpandHistory"
-#define NID_id_smime_aa_mlExpandHistory         214
-#define OBJ_id_smime_aa_mlExpandHistory         OBJ_id_smime_aa,3L
-
-#define SN_id_smime_aa_contentHint              "id-smime-aa-contentHint"
-#define NID_id_smime_aa_contentHint             215
-#define OBJ_id_smime_aa_contentHint             OBJ_id_smime_aa,4L
-
-#define SN_id_smime_aa_msgSigDigest             "id-smime-aa-msgSigDigest"
-#define NID_id_smime_aa_msgSigDigest            216
-#define OBJ_id_smime_aa_msgSigDigest            OBJ_id_smime_aa,5L
-
-#define SN_id_smime_aa_encapContentType         "id-smime-aa-encapContentType"
-#define NID_id_smime_aa_encapContentType                217
-#define OBJ_id_smime_aa_encapContentType                OBJ_id_smime_aa,6L
-
-#define SN_id_smime_aa_contentIdentifier                "id-smime-aa-contentIdentifier"
-#define NID_id_smime_aa_contentIdentifier               218
-#define OBJ_id_smime_aa_contentIdentifier               OBJ_id_smime_aa,7L
-
-#define SN_id_smime_aa_macValue         "id-smime-aa-macValue"
-#define NID_id_smime_aa_macValue                219
-#define OBJ_id_smime_aa_macValue                OBJ_id_smime_aa,8L
-
-#define SN_id_smime_aa_equivalentLabels         "id-smime-aa-equivalentLabels"
-#define NID_id_smime_aa_equivalentLabels                220
-#define OBJ_id_smime_aa_equivalentLabels                OBJ_id_smime_aa,9L
-
-#define SN_id_smime_aa_contentReference         "id-smime-aa-contentReference"
-#define NID_id_smime_aa_contentReference                221
-#define OBJ_id_smime_aa_contentReference                OBJ_id_smime_aa,10L
-
-#define SN_id_smime_aa_encrypKeyPref            "id-smime-aa-encrypKeyPref"
-#define NID_id_smime_aa_encrypKeyPref           222
-#define OBJ_id_smime_aa_encrypKeyPref           OBJ_id_smime_aa,11L
-
-#define SN_id_smime_aa_signingCertificate               "id-smime-aa-signingCertificate"
-#define NID_id_smime_aa_signingCertificate              223
-#define OBJ_id_smime_aa_signingCertificate              OBJ_id_smime_aa,12L
-
-#define SN_id_smime_aa_smimeEncryptCerts                "id-smime-aa-smimeEncryptCerts"
-#define NID_id_smime_aa_smimeEncryptCerts               224
-#define OBJ_id_smime_aa_smimeEncryptCerts               OBJ_id_smime_aa,13L
-
-#define SN_id_smime_aa_timeStampToken           "id-smime-aa-timeStampToken"
-#define NID_id_smime_aa_timeStampToken          225
-#define OBJ_id_smime_aa_timeStampToken          OBJ_id_smime_aa,14L
-
-#define SN_id_smime_aa_ets_sigPolicyId          "id-smime-aa-ets-sigPolicyId"
-#define NID_id_smime_aa_ets_sigPolicyId         226
-#define OBJ_id_smime_aa_ets_sigPolicyId         OBJ_id_smime_aa,15L
-
-#define SN_id_smime_aa_ets_commitmentType               "id-smime-aa-ets-commitmentType"
-#define NID_id_smime_aa_ets_commitmentType              227
-#define OBJ_id_smime_aa_ets_commitmentType              OBJ_id_smime_aa,16L
-
-#define SN_id_smime_aa_ets_signerLocation               "id-smime-aa-ets-signerLocation"
-#define NID_id_smime_aa_ets_signerLocation              228
-#define OBJ_id_smime_aa_ets_signerLocation              OBJ_id_smime_aa,17L
-
-#define SN_id_smime_aa_ets_signerAttr           "id-smime-aa-ets-signerAttr"
-#define NID_id_smime_aa_ets_signerAttr          229
-#define OBJ_id_smime_aa_ets_signerAttr          OBJ_id_smime_aa,18L
-
-#define SN_id_smime_aa_ets_otherSigCert         "id-smime-aa-ets-otherSigCert"
-#define NID_id_smime_aa_ets_otherSigCert                230
-#define OBJ_id_smime_aa_ets_otherSigCert                OBJ_id_smime_aa,19L
-
-#define SN_id_smime_aa_ets_contentTimestamp             "id-smime-aa-ets-contentTimestamp"
-#define NID_id_smime_aa_ets_contentTimestamp            231
-#define OBJ_id_smime_aa_ets_contentTimestamp            OBJ_id_smime_aa,20L
-
-#define SN_id_smime_aa_ets_CertificateRefs              "id-smime-aa-ets-CertificateRefs"
-#define NID_id_smime_aa_ets_CertificateRefs             232
-#define OBJ_id_smime_aa_ets_CertificateRefs             OBJ_id_smime_aa,21L
-
-#define SN_id_smime_aa_ets_RevocationRefs               "id-smime-aa-ets-RevocationRefs"
-#define NID_id_smime_aa_ets_RevocationRefs              233
-#define OBJ_id_smime_aa_ets_RevocationRefs              OBJ_id_smime_aa,22L
-
-#define SN_id_smime_aa_ets_certValues           "id-smime-aa-ets-certValues"
-#define NID_id_smime_aa_ets_certValues          234
-#define OBJ_id_smime_aa_ets_certValues          OBJ_id_smime_aa,23L
-
-#define SN_id_smime_aa_ets_revocationValues             "id-smime-aa-ets-revocationValues"
-#define NID_id_smime_aa_ets_revocationValues            235
-#define OBJ_id_smime_aa_ets_revocationValues            OBJ_id_smime_aa,24L
-
-#define SN_id_smime_aa_ets_escTimeStamp         "id-smime-aa-ets-escTimeStamp"
-#define NID_id_smime_aa_ets_escTimeStamp                236
-#define OBJ_id_smime_aa_ets_escTimeStamp                OBJ_id_smime_aa,25L
-
-#define SN_id_smime_aa_ets_certCRLTimestamp             "id-smime-aa-ets-certCRLTimestamp"
-#define NID_id_smime_aa_ets_certCRLTimestamp            237
-#define OBJ_id_smime_aa_ets_certCRLTimestamp            OBJ_id_smime_aa,26L
-
-#define SN_id_smime_aa_ets_archiveTimeStamp             "id-smime-aa-ets-archiveTimeStamp"
-#define NID_id_smime_aa_ets_archiveTimeStamp            238
-#define OBJ_id_smime_aa_ets_archiveTimeStamp            OBJ_id_smime_aa,27L
-
-#define SN_id_smime_aa_signatureType            "id-smime-aa-signatureType"
-#define NID_id_smime_aa_signatureType           239
-#define OBJ_id_smime_aa_signatureType           OBJ_id_smime_aa,28L
-
-#define SN_id_smime_aa_dvcs_dvc         "id-smime-aa-dvcs-dvc"
-#define NID_id_smime_aa_dvcs_dvc                240
-#define OBJ_id_smime_aa_dvcs_dvc                OBJ_id_smime_aa,29L
-
-#define SN_id_smime_alg_ESDHwith3DES            "id-smime-alg-ESDHwith3DES"
-#define NID_id_smime_alg_ESDHwith3DES           241
-#define OBJ_id_smime_alg_ESDHwith3DES           OBJ_id_smime_alg,1L
-
-#define SN_id_smime_alg_ESDHwithRC2             "id-smime-alg-ESDHwithRC2"
-#define NID_id_smime_alg_ESDHwithRC2            242
-#define OBJ_id_smime_alg_ESDHwithRC2            OBJ_id_smime_alg,2L
-
-#define SN_id_smime_alg_3DESwrap                "id-smime-alg-3DESwrap"
-#define NID_id_smime_alg_3DESwrap               243
-#define OBJ_id_smime_alg_3DESwrap               OBJ_id_smime_alg,3L
-
-#define SN_id_smime_alg_RC2wrap         "id-smime-alg-RC2wrap"
-#define NID_id_smime_alg_RC2wrap                244
-#define OBJ_id_smime_alg_RC2wrap                OBJ_id_smime_alg,4L
-
-#define SN_id_smime_alg_ESDH            "id-smime-alg-ESDH"
-#define NID_id_smime_alg_ESDH           245
-#define OBJ_id_smime_alg_ESDH           OBJ_id_smime_alg,5L
-
-#define SN_id_smime_alg_CMS3DESwrap             "id-smime-alg-CMS3DESwrap"
-#define NID_id_smime_alg_CMS3DESwrap            246
-#define OBJ_id_smime_alg_CMS3DESwrap            OBJ_id_smime_alg,6L
-
-#define SN_id_smime_alg_CMSRC2wrap              "id-smime-alg-CMSRC2wrap"
-#define NID_id_smime_alg_CMSRC2wrap             247
-#define OBJ_id_smime_alg_CMSRC2wrap             OBJ_id_smime_alg,7L
-
-#define SN_id_alg_PWRI_KEK              "id-alg-PWRI-KEK"
-#define NID_id_alg_PWRI_KEK             893
-#define OBJ_id_alg_PWRI_KEK             OBJ_id_smime_alg,9L
-
-#define SN_id_smime_cd_ldap             "id-smime-cd-ldap"
-#define NID_id_smime_cd_ldap            248
-#define OBJ_id_smime_cd_ldap            OBJ_id_smime_cd,1L
-
-#define SN_id_smime_spq_ets_sqt_uri             "id-smime-spq-ets-sqt-uri"
-#define NID_id_smime_spq_ets_sqt_uri            249
-#define OBJ_id_smime_spq_ets_sqt_uri            OBJ_id_smime_spq,1L
-
-#define SN_id_smime_spq_ets_sqt_unotice         "id-smime-spq-ets-sqt-unotice"
-#define NID_id_smime_spq_ets_sqt_unotice                250
-#define OBJ_id_smime_spq_ets_sqt_unotice                OBJ_id_smime_spq,2L
-
-#define SN_id_smime_cti_ets_proofOfOrigin               "id-smime-cti-ets-proofOfOrigin"
-#define NID_id_smime_cti_ets_proofOfOrigin              251
-#define OBJ_id_smime_cti_ets_proofOfOrigin              OBJ_id_smime_cti,1L
-
-#define SN_id_smime_cti_ets_proofOfReceipt              "id-smime-cti-ets-proofOfReceipt"
-#define NID_id_smime_cti_ets_proofOfReceipt             252
-#define OBJ_id_smime_cti_ets_proofOfReceipt             OBJ_id_smime_cti,2L
-
-#define SN_id_smime_cti_ets_proofOfDelivery             "id-smime-cti-ets-proofOfDelivery"
-#define NID_id_smime_cti_ets_proofOfDelivery            253
-#define OBJ_id_smime_cti_ets_proofOfDelivery            OBJ_id_smime_cti,3L
-
-#define SN_id_smime_cti_ets_proofOfSender               "id-smime-cti-ets-proofOfSender"
-#define NID_id_smime_cti_ets_proofOfSender              254
-#define OBJ_id_smime_cti_ets_proofOfSender              OBJ_id_smime_cti,4L
-
-#define SN_id_smime_cti_ets_proofOfApproval             "id-smime-cti-ets-proofOfApproval"
-#define NID_id_smime_cti_ets_proofOfApproval            255
-#define OBJ_id_smime_cti_ets_proofOfApproval            OBJ_id_smime_cti,5L
-
-#define SN_id_smime_cti_ets_proofOfCreation             "id-smime-cti-ets-proofOfCreation"
-#define NID_id_smime_cti_ets_proofOfCreation            256
-#define OBJ_id_smime_cti_ets_proofOfCreation            OBJ_id_smime_cti,6L
-
-#define LN_friendlyName         "friendlyName"
-#define NID_friendlyName                156
-#define OBJ_friendlyName                OBJ_pkcs9,20L
-
-#define LN_localKeyID           "localKeyID"
-#define NID_localKeyID          157
-#define OBJ_localKeyID          OBJ_pkcs9,21L
-
-#define SN_ms_csp_name          "CSPName"
-#define LN_ms_csp_name          "Microsoft CSP Name"
-#define NID_ms_csp_name         417
-#define OBJ_ms_csp_name         1L,3L,6L,1L,4L,1L,311L,17L,1L
-
-#define SN_LocalKeySet          "LocalKeySet"
-#define LN_LocalKeySet          "Microsoft Local Key set"
-#define NID_LocalKeySet         856
-#define OBJ_LocalKeySet         1L,3L,6L,1L,4L,1L,311L,17L,2L
-
-#define OBJ_certTypes           OBJ_pkcs9,22L
-
-#define LN_x509Certificate              "x509Certificate"
-#define NID_x509Certificate             158
-#define OBJ_x509Certificate             OBJ_certTypes,1L
-
-#define LN_sdsiCertificate              "sdsiCertificate"
-#define NID_sdsiCertificate             159
-#define OBJ_sdsiCertificate             OBJ_certTypes,2L
-
-#define OBJ_crlTypes            OBJ_pkcs9,23L
-
-#define LN_x509Crl              "x509Crl"
-#define NID_x509Crl             160
-#define OBJ_x509Crl             OBJ_crlTypes,1L
-
-#define OBJ_pkcs12              OBJ_pkcs,12L
-
-#define OBJ_pkcs12_pbeids               OBJ_pkcs12,1L
-
-#define SN_pbe_WithSHA1And128BitRC4             "PBE-SHA1-RC4-128"
-#define LN_pbe_WithSHA1And128BitRC4             "pbeWithSHA1And128BitRC4"
-#define NID_pbe_WithSHA1And128BitRC4            144
-#define OBJ_pbe_WithSHA1And128BitRC4            OBJ_pkcs12_pbeids,1L
-
-#define SN_pbe_WithSHA1And40BitRC4              "PBE-SHA1-RC4-40"
-#define LN_pbe_WithSHA1And40BitRC4              "pbeWithSHA1And40BitRC4"
-#define NID_pbe_WithSHA1And40BitRC4             145
-#define OBJ_pbe_WithSHA1And40BitRC4             OBJ_pkcs12_pbeids,2L
-
-#define SN_pbe_WithSHA1And3_Key_TripleDES_CBC           "PBE-SHA1-3DES"
-#define LN_pbe_WithSHA1And3_Key_TripleDES_CBC           "pbeWithSHA1And3-KeyTripleDES-CBC"
-#define NID_pbe_WithSHA1And3_Key_TripleDES_CBC          146
-#define OBJ_pbe_WithSHA1And3_Key_TripleDES_CBC          OBJ_pkcs12_pbeids,3L
-
-#define SN_pbe_WithSHA1And2_Key_TripleDES_CBC           "PBE-SHA1-2DES"
-#define LN_pbe_WithSHA1And2_Key_TripleDES_CBC           "pbeWithSHA1And2-KeyTripleDES-CBC"
-#define NID_pbe_WithSHA1And2_Key_TripleDES_CBC          147
-#define OBJ_pbe_WithSHA1And2_Key_TripleDES_CBC          OBJ_pkcs12_pbeids,4L
-
-#define SN_pbe_WithSHA1And128BitRC2_CBC         "PBE-SHA1-RC2-128"
-#define LN_pbe_WithSHA1And128BitRC2_CBC         "pbeWithSHA1And128BitRC2-CBC"
-#define NID_pbe_WithSHA1And128BitRC2_CBC                148
-#define OBJ_pbe_WithSHA1And128BitRC2_CBC                OBJ_pkcs12_pbeids,5L
-
-#define SN_pbe_WithSHA1And40BitRC2_CBC          "PBE-SHA1-RC2-40"
-#define LN_pbe_WithSHA1And40BitRC2_CBC          "pbeWithSHA1And40BitRC2-CBC"
-#define NID_pbe_WithSHA1And40BitRC2_CBC         149
-#define OBJ_pbe_WithSHA1And40BitRC2_CBC         OBJ_pkcs12_pbeids,6L
-
-#define OBJ_pkcs12_Version1             OBJ_pkcs12,10L
-
-#define OBJ_pkcs12_BagIds               OBJ_pkcs12_Version1,1L
-
-#define LN_keyBag               "keyBag"
-#define NID_keyBag              150
-#define OBJ_keyBag              OBJ_pkcs12_BagIds,1L
-
-#define LN_pkcs8ShroudedKeyBag          "pkcs8ShroudedKeyBag"
-#define NID_pkcs8ShroudedKeyBag         151
-#define OBJ_pkcs8ShroudedKeyBag         OBJ_pkcs12_BagIds,2L
-
-#define LN_certBag              "certBag"
-#define NID_certBag             152
-#define OBJ_certBag             OBJ_pkcs12_BagIds,3L
-
-#define LN_crlBag               "crlBag"
-#define NID_crlBag              153
-#define OBJ_crlBag              OBJ_pkcs12_BagIds,4L
-
-#define LN_secretBag            "secretBag"
-#define NID_secretBag           154
-#define OBJ_secretBag           OBJ_pkcs12_BagIds,5L
-
-#define LN_safeContentsBag              "safeContentsBag"
-#define NID_safeContentsBag             155
-#define OBJ_safeContentsBag             OBJ_pkcs12_BagIds,6L
-
-#define SN_md2          "MD2"
-#define LN_md2          "md2"
-#define NID_md2         3
-#define OBJ_md2         OBJ_rsadsi,2L,2L
-
-#define SN_md4          "MD4"
-#define LN_md4          "md4"
-#define NID_md4         257
-#define OBJ_md4         OBJ_rsadsi,2L,4L
-
-#define SN_md5          "MD5"
-#define LN_md5          "md5"
-#define NID_md5         4
-#define OBJ_md5         OBJ_rsadsi,2L,5L
-
-#define SN_md5_sha1             "MD5-SHA1"
-#define LN_md5_sha1             "md5-sha1"
-#define NID_md5_sha1            114
-
-#define LN_hmacWithMD5          "hmacWithMD5"
-#define NID_hmacWithMD5         797
-#define OBJ_hmacWithMD5         OBJ_rsadsi,2L,6L
-
-#define LN_hmacWithSHA1         "hmacWithSHA1"
-#define NID_hmacWithSHA1                163
-#define OBJ_hmacWithSHA1                OBJ_rsadsi,2L,7L
-
-#define LN_hmacWithSHA224               "hmacWithSHA224"
-#define NID_hmacWithSHA224              798
-#define OBJ_hmacWithSHA224              OBJ_rsadsi,2L,8L
-
-#define LN_hmacWithSHA256               "hmacWithSHA256"
-#define NID_hmacWithSHA256              799
-#define OBJ_hmacWithSHA256              OBJ_rsadsi,2L,9L
-
-#define LN_hmacWithSHA384               "hmacWithSHA384"
-#define NID_hmacWithSHA384              800
-#define OBJ_hmacWithSHA384              OBJ_rsadsi,2L,10L
-
-#define LN_hmacWithSHA512               "hmacWithSHA512"
-#define NID_hmacWithSHA512              801
-#define OBJ_hmacWithSHA512              OBJ_rsadsi,2L,11L
-
-#define SN_rc2_cbc              "RC2-CBC"
-#define LN_rc2_cbc              "rc2-cbc"
-#define NID_rc2_cbc             37
-#define OBJ_rc2_cbc             OBJ_rsadsi,3L,2L
-
-#define SN_rc2_ecb              "RC2-ECB"
-#define LN_rc2_ecb              "rc2-ecb"
-#define NID_rc2_ecb             38
-
-#define SN_rc2_cfb64            "RC2-CFB"
-#define LN_rc2_cfb64            "rc2-cfb"
-#define NID_rc2_cfb64           39
-
-#define SN_rc2_ofb64            "RC2-OFB"
-#define LN_rc2_ofb64            "rc2-ofb"
-#define NID_rc2_ofb64           40
-
-#define SN_rc2_40_cbc           "RC2-40-CBC"
-#define LN_rc2_40_cbc           "rc2-40-cbc"
-#define NID_rc2_40_cbc          98
-
-#define SN_rc2_64_cbc           "RC2-64-CBC"
-#define LN_rc2_64_cbc           "rc2-64-cbc"
-#define NID_rc2_64_cbc          166
-
-#define SN_rc4          "RC4"
-#define LN_rc4          "rc4"
-#define NID_rc4         5
-#define OBJ_rc4         OBJ_rsadsi,3L,4L
-
-#define SN_rc4_40               "RC4-40"
-#define LN_rc4_40               "rc4-40"
-#define NID_rc4_40              97
-
-#define SN_des_ede3_cbc         "DES-EDE3-CBC"
-#define LN_des_ede3_cbc         "des-ede3-cbc"
-#define NID_des_ede3_cbc                44
-#define OBJ_des_ede3_cbc                OBJ_rsadsi,3L,7L
-
-#define SN_rc5_cbc              "RC5-CBC"
-#define LN_rc5_cbc              "rc5-cbc"
-#define NID_rc5_cbc             120
-#define OBJ_rc5_cbc             OBJ_rsadsi,3L,8L
-
-#define SN_rc5_ecb              "RC5-ECB"
-#define LN_rc5_ecb              "rc5-ecb"
-#define NID_rc5_ecb             121
-
-#define SN_rc5_cfb64            "RC5-CFB"
-#define LN_rc5_cfb64            "rc5-cfb"
-#define NID_rc5_cfb64           122
-
-#define SN_rc5_ofb64            "RC5-OFB"
-#define LN_rc5_ofb64            "rc5-ofb"
-#define NID_rc5_ofb64           123
-
-#define SN_ms_ext_req           "msExtReq"
-#define LN_ms_ext_req           "Microsoft Extension Request"
-#define NID_ms_ext_req          171
-#define OBJ_ms_ext_req          1L,3L,6L,1L,4L,1L,311L,2L,1L,14L
-
-#define SN_ms_code_ind          "msCodeInd"
-#define LN_ms_code_ind          "Microsoft Individual Code Signing"
-#define NID_ms_code_ind         134
-#define OBJ_ms_code_ind         1L,3L,6L,1L,4L,1L,311L,2L,1L,21L
-
-#define SN_ms_code_com          "msCodeCom"
-#define LN_ms_code_com          "Microsoft Commercial Code Signing"
-#define NID_ms_code_com         135
-#define OBJ_ms_code_com         1L,3L,6L,1L,4L,1L,311L,2L,1L,22L
-
-#define SN_ms_ctl_sign          "msCTLSign"
-#define LN_ms_ctl_sign          "Microsoft Trust List Signing"
-#define NID_ms_ctl_sign         136
-#define OBJ_ms_ctl_sign         1L,3L,6L,1L,4L,1L,311L,10L,3L,1L
-
-#define SN_ms_sgc               "msSGC"
-#define LN_ms_sgc               "Microsoft Server Gated Crypto"
-#define NID_ms_sgc              137
-#define OBJ_ms_sgc              1L,3L,6L,1L,4L,1L,311L,10L,3L,3L
-
-#define SN_ms_efs               "msEFS"
-#define LN_ms_efs               "Microsoft Encrypted File System"
-#define NID_ms_efs              138
-#define OBJ_ms_efs              1L,3L,6L,1L,4L,1L,311L,10L,3L,4L
-
-#define SN_ms_smartcard_login           "msSmartcardLogin"
-#define LN_ms_smartcard_login           "Microsoft Smartcardlogin"
-#define NID_ms_smartcard_login          648
-#define OBJ_ms_smartcard_login          1L,3L,6L,1L,4L,1L,311L,20L,2L,2L
-
-#define SN_ms_upn               "msUPN"
-#define LN_ms_upn               "Microsoft Universal Principal Name"
-#define NID_ms_upn              649
-#define OBJ_ms_upn              1L,3L,6L,1L,4L,1L,311L,20L,2L,3L
-
-#define SN_idea_cbc             "IDEA-CBC"
-#define LN_idea_cbc             "idea-cbc"
-#define NID_idea_cbc            34
-#define OBJ_idea_cbc            1L,3L,6L,1L,4L,1L,188L,7L,1L,1L,2L
-
-#define SN_idea_ecb             "IDEA-ECB"
-#define LN_idea_ecb             "idea-ecb"
-#define NID_idea_ecb            36
-
-#define SN_idea_cfb64           "IDEA-CFB"
-#define LN_idea_cfb64           "idea-cfb"
-#define NID_idea_cfb64          35
-
-#define SN_idea_ofb64           "IDEA-OFB"
-#define LN_idea_ofb64           "idea-ofb"
-#define NID_idea_ofb64          46
-
-#define SN_bf_cbc               "BF-CBC"
-#define LN_bf_cbc               "bf-cbc"
-#define NID_bf_cbc              91
-#define OBJ_bf_cbc              1L,3L,6L,1L,4L,1L,3029L,1L,2L
-
-#define SN_bf_ecb               "BF-ECB"
-#define LN_bf_ecb               "bf-ecb"
-#define NID_bf_ecb              92
-
-#define SN_bf_cfb64             "BF-CFB"
-#define LN_bf_cfb64             "bf-cfb"
-#define NID_bf_cfb64            93
-
-#define SN_bf_ofb64             "BF-OFB"
-#define LN_bf_ofb64             "bf-ofb"
-#define NID_bf_ofb64            94
-
-#define SN_id_pkix              "PKIX"
-#define NID_id_pkix             127
-#define OBJ_id_pkix             1L,3L,6L,1L,5L,5L,7L
-
-#define SN_id_pkix_mod          "id-pkix-mod"
-#define NID_id_pkix_mod         258
-#define OBJ_id_pkix_mod         OBJ_id_pkix,0L
-
-#define SN_id_pe                "id-pe"
-#define NID_id_pe               175
-#define OBJ_id_pe               OBJ_id_pkix,1L
-
-#define SN_id_qt                "id-qt"
-#define NID_id_qt               259
-#define OBJ_id_qt               OBJ_id_pkix,2L
-
-#define SN_id_kp                "id-kp"
-#define NID_id_kp               128
-#define OBJ_id_kp               OBJ_id_pkix,3L
-
-#define SN_id_it                "id-it"
-#define NID_id_it               260
-#define OBJ_id_it               OBJ_id_pkix,4L
-
-#define SN_id_pkip              "id-pkip"
-#define NID_id_pkip             261
-#define OBJ_id_pkip             OBJ_id_pkix,5L
-
-#define SN_id_alg               "id-alg"
-#define NID_id_alg              262
-#define OBJ_id_alg              OBJ_id_pkix,6L
-
-#define SN_id_cmc               "id-cmc"
-#define NID_id_cmc              263
-#define OBJ_id_cmc              OBJ_id_pkix,7L
-
-#define SN_id_on                "id-on"
-#define NID_id_on               264
-#define OBJ_id_on               OBJ_id_pkix,8L
-
-#define SN_id_pda               "id-pda"
-#define NID_id_pda              265
-#define OBJ_id_pda              OBJ_id_pkix,9L
-
-#define SN_id_aca               "id-aca"
-#define NID_id_aca              266
-#define OBJ_id_aca              OBJ_id_pkix,10L
-
-#define SN_id_qcs               "id-qcs"
-#define NID_id_qcs              267
-#define OBJ_id_qcs              OBJ_id_pkix,11L
-
-#define SN_id_cct               "id-cct"
-#define NID_id_cct              268
-#define OBJ_id_cct              OBJ_id_pkix,12L
-
-#define SN_id_ppl               "id-ppl"
-#define NID_id_ppl              662
-#define OBJ_id_ppl              OBJ_id_pkix,21L
-
-#define SN_id_ad                "id-ad"
-#define NID_id_ad               176
-#define OBJ_id_ad               OBJ_id_pkix,48L
-
-#define SN_id_pkix1_explicit_88         "id-pkix1-explicit-88"
-#define NID_id_pkix1_explicit_88                269
-#define OBJ_id_pkix1_explicit_88                OBJ_id_pkix_mod,1L
-
-#define SN_id_pkix1_implicit_88         "id-pkix1-implicit-88"
-#define NID_id_pkix1_implicit_88                270
-#define OBJ_id_pkix1_implicit_88                OBJ_id_pkix_mod,2L
-
-#define SN_id_pkix1_explicit_93         "id-pkix1-explicit-93"
-#define NID_id_pkix1_explicit_93                271
-#define OBJ_id_pkix1_explicit_93                OBJ_id_pkix_mod,3L
-
-#define SN_id_pkix1_implicit_93         "id-pkix1-implicit-93"
-#define NID_id_pkix1_implicit_93                272
-#define OBJ_id_pkix1_implicit_93                OBJ_id_pkix_mod,4L
-
-#define SN_id_mod_crmf          "id-mod-crmf"
-#define NID_id_mod_crmf         273
-#define OBJ_id_mod_crmf         OBJ_id_pkix_mod,5L
-
-#define SN_id_mod_cmc           "id-mod-cmc"
-#define NID_id_mod_cmc          274
-#define OBJ_id_mod_cmc          OBJ_id_pkix_mod,6L
-
-#define SN_id_mod_kea_profile_88                "id-mod-kea-profile-88"
-#define NID_id_mod_kea_profile_88               275
-#define OBJ_id_mod_kea_profile_88               OBJ_id_pkix_mod,7L
-
-#define SN_id_mod_kea_profile_93                "id-mod-kea-profile-93"
-#define NID_id_mod_kea_profile_93               276
-#define OBJ_id_mod_kea_profile_93               OBJ_id_pkix_mod,8L
-
-#define SN_id_mod_cmp           "id-mod-cmp"
-#define NID_id_mod_cmp          277
-#define OBJ_id_mod_cmp          OBJ_id_pkix_mod,9L
-
-#define SN_id_mod_qualified_cert_88             "id-mod-qualified-cert-88"
-#define NID_id_mod_qualified_cert_88            278
-#define OBJ_id_mod_qualified_cert_88            OBJ_id_pkix_mod,10L
-
-#define SN_id_mod_qualified_cert_93             "id-mod-qualified-cert-93"
-#define NID_id_mod_qualified_cert_93            279
-#define OBJ_id_mod_qualified_cert_93            OBJ_id_pkix_mod,11L
-
-#define SN_id_mod_attribute_cert                "id-mod-attribute-cert"
-#define NID_id_mod_attribute_cert               280
-#define OBJ_id_mod_attribute_cert               OBJ_id_pkix_mod,12L
-
-#define SN_id_mod_timestamp_protocol            "id-mod-timestamp-protocol"
-#define NID_id_mod_timestamp_protocol           281
-#define OBJ_id_mod_timestamp_protocol           OBJ_id_pkix_mod,13L
-
-#define SN_id_mod_ocsp          "id-mod-ocsp"
-#define NID_id_mod_ocsp         282
-#define OBJ_id_mod_ocsp         OBJ_id_pkix_mod,14L
-
-#define SN_id_mod_dvcs          "id-mod-dvcs"
-#define NID_id_mod_dvcs         283
-#define OBJ_id_mod_dvcs         OBJ_id_pkix_mod,15L
-
-#define SN_id_mod_cmp2000               "id-mod-cmp2000"
-#define NID_id_mod_cmp2000              284
-#define OBJ_id_mod_cmp2000              OBJ_id_pkix_mod,16L
-
-#define SN_info_access          "authorityInfoAccess"
-#define LN_info_access          "Authority Information Access"
-#define NID_info_access         177
-#define OBJ_info_access         OBJ_id_pe,1L
-
-#define SN_biometricInfo                "biometricInfo"
-#define LN_biometricInfo                "Biometric Info"
-#define NID_biometricInfo               285
-#define OBJ_biometricInfo               OBJ_id_pe,2L
-
-#define SN_qcStatements         "qcStatements"
-#define NID_qcStatements                286
-#define OBJ_qcStatements                OBJ_id_pe,3L
-
-#define SN_ac_auditEntity               "ac-auditEntity"
-#define NID_ac_auditEntity              287
-#define OBJ_ac_auditEntity              OBJ_id_pe,4L
-
-#define SN_ac_targeting         "ac-targeting"
-#define NID_ac_targeting                288
-#define OBJ_ac_targeting                OBJ_id_pe,5L
-
-#define SN_aaControls           "aaControls"
-#define NID_aaControls          289
-#define OBJ_aaControls          OBJ_id_pe,6L
-
-#define SN_sbgp_ipAddrBlock             "sbgp-ipAddrBlock"
-#define NID_sbgp_ipAddrBlock            290
-#define OBJ_sbgp_ipAddrBlock            OBJ_id_pe,7L
-
-#define SN_sbgp_autonomousSysNum                "sbgp-autonomousSysNum"
-#define NID_sbgp_autonomousSysNum               291
-#define OBJ_sbgp_autonomousSysNum               OBJ_id_pe,8L
-
-#define SN_sbgp_routerIdentifier                "sbgp-routerIdentifier"
-#define NID_sbgp_routerIdentifier               292
-#define OBJ_sbgp_routerIdentifier               OBJ_id_pe,9L
-
-#define SN_ac_proxying          "ac-proxying"
-#define NID_ac_proxying         397
-#define OBJ_ac_proxying         OBJ_id_pe,10L
-
-#define SN_sinfo_access         "subjectInfoAccess"
-#define LN_sinfo_access         "Subject Information Access"
-#define NID_sinfo_access                398
-#define OBJ_sinfo_access                OBJ_id_pe,11L
-
-#define SN_proxyCertInfo                "proxyCertInfo"
-#define LN_proxyCertInfo                "Proxy Certificate Information"
-#define NID_proxyCertInfo               663
-#define OBJ_proxyCertInfo               OBJ_id_pe,14L
-
-#define SN_tlsfeature           "tlsfeature"
-#define LN_tlsfeature           "TLS Feature"
-#define NID_tlsfeature          1020
-#define OBJ_tlsfeature          OBJ_id_pe,24L
-
-#define SN_id_qt_cps            "id-qt-cps"
-#define LN_id_qt_cps            "Policy Qualifier CPS"
-#define NID_id_qt_cps           164
-#define OBJ_id_qt_cps           OBJ_id_qt,1L
-
-#define SN_id_qt_unotice                "id-qt-unotice"
-#define LN_id_qt_unotice                "Policy Qualifier User Notice"
-#define NID_id_qt_unotice               165
-#define OBJ_id_qt_unotice               OBJ_id_qt,2L
-
-#define SN_textNotice           "textNotice"
-#define NID_textNotice          293
-#define OBJ_textNotice          OBJ_id_qt,3L
-
-#define SN_server_auth          "serverAuth"
-#define LN_server_auth          "TLS Web Server Authentication"
-#define NID_server_auth         129
-#define OBJ_server_auth         OBJ_id_kp,1L
-
-#define SN_client_auth          "clientAuth"
-#define LN_client_auth          "TLS Web Client Authentication"
-#define NID_client_auth         130
-#define OBJ_client_auth         OBJ_id_kp,2L
-
-#define SN_code_sign            "codeSigning"
-#define LN_code_sign            "Code Signing"
-#define NID_code_sign           131
-#define OBJ_code_sign           OBJ_id_kp,3L
-
-#define SN_email_protect                "emailProtection"
-#define LN_email_protect                "E-mail Protection"
-#define NID_email_protect               132
-#define OBJ_email_protect               OBJ_id_kp,4L
-
-#define SN_ipsecEndSystem               "ipsecEndSystem"
-#define LN_ipsecEndSystem               "IPSec End System"
-#define NID_ipsecEndSystem              294
-#define OBJ_ipsecEndSystem              OBJ_id_kp,5L
-
-#define SN_ipsecTunnel          "ipsecTunnel"
-#define LN_ipsecTunnel          "IPSec Tunnel"
-#define NID_ipsecTunnel         295
-#define OBJ_ipsecTunnel         OBJ_id_kp,6L
-
-#define SN_ipsecUser            "ipsecUser"
-#define LN_ipsecUser            "IPSec User"
-#define NID_ipsecUser           296
-#define OBJ_ipsecUser           OBJ_id_kp,7L
-
-#define SN_time_stamp           "timeStamping"
-#define LN_time_stamp           "Time Stamping"
-#define NID_time_stamp          133
-#define OBJ_time_stamp          OBJ_id_kp,8L
-
-#define SN_OCSP_sign            "OCSPSigning"
-#define LN_OCSP_sign            "OCSP Signing"
-#define NID_OCSP_sign           180
-#define OBJ_OCSP_sign           OBJ_id_kp,9L
-
-#define SN_dvcs         "DVCS"
-#define LN_dvcs         "dvcs"
-#define NID_dvcs                297
-#define OBJ_dvcs                OBJ_id_kp,10L
-
-#define SN_ipsec_IKE            "ipsecIKE"
-#define LN_ipsec_IKE            "ipsec Internet Key Exchange"
-#define NID_ipsec_IKE           1022
-#define OBJ_ipsec_IKE           OBJ_id_kp,17L
-
-#define SN_capwapAC             "capwapAC"
-#define LN_capwapAC             "Ctrl/provision WAP Access"
-#define NID_capwapAC            1023
-#define OBJ_capwapAC            OBJ_id_kp,18L
-
-#define SN_capwapWTP            "capwapWTP"
-#define LN_capwapWTP            "Ctrl/Provision WAP Termination"
-#define NID_capwapWTP           1024
-#define OBJ_capwapWTP           OBJ_id_kp,19L
-
-#define SN_sshClient            "secureShellClient"
-#define LN_sshClient            "SSH Client"
-#define NID_sshClient           1025
-#define OBJ_sshClient           OBJ_id_kp,21L
-
-#define SN_sshServer            "secureShellServer"
-#define LN_sshServer            "SSH Server"
-#define NID_sshServer           1026
-#define OBJ_sshServer           OBJ_id_kp,22L
-
-#define SN_sendRouter           "sendRouter"
-#define LN_sendRouter           "Send Router"
-#define NID_sendRouter          1027
-#define OBJ_sendRouter          OBJ_id_kp,23L
-
-#define SN_sendProxiedRouter            "sendProxiedRouter"
-#define LN_sendProxiedRouter            "Send Proxied Router"
-#define NID_sendProxiedRouter           1028
-#define OBJ_sendProxiedRouter           OBJ_id_kp,24L
-
-#define SN_sendOwner            "sendOwner"
-#define LN_sendOwner            "Send Owner"
-#define NID_sendOwner           1029
-#define OBJ_sendOwner           OBJ_id_kp,25L
-
-#define SN_sendProxiedOwner             "sendProxiedOwner"
-#define LN_sendProxiedOwner             "Send Proxied Owner"
-#define NID_sendProxiedOwner            1030
-#define OBJ_sendProxiedOwner            OBJ_id_kp,26L
-
-#define SN_id_it_caProtEncCert          "id-it-caProtEncCert"
-#define NID_id_it_caProtEncCert         298
-#define OBJ_id_it_caProtEncCert         OBJ_id_it,1L
-
-#define SN_id_it_signKeyPairTypes               "id-it-signKeyPairTypes"
-#define NID_id_it_signKeyPairTypes              299
-#define OBJ_id_it_signKeyPairTypes              OBJ_id_it,2L
-
-#define SN_id_it_encKeyPairTypes                "id-it-encKeyPairTypes"
-#define NID_id_it_encKeyPairTypes               300
-#define OBJ_id_it_encKeyPairTypes               OBJ_id_it,3L
-
-#define SN_id_it_preferredSymmAlg               "id-it-preferredSymmAlg"
-#define NID_id_it_preferredSymmAlg              301
-#define OBJ_id_it_preferredSymmAlg              OBJ_id_it,4L
-
-#define SN_id_it_caKeyUpdateInfo                "id-it-caKeyUpdateInfo"
-#define NID_id_it_caKeyUpdateInfo               302
-#define OBJ_id_it_caKeyUpdateInfo               OBJ_id_it,5L
-
-#define SN_id_it_currentCRL             "id-it-currentCRL"
-#define NID_id_it_currentCRL            303
-#define OBJ_id_it_currentCRL            OBJ_id_it,6L
-
-#define SN_id_it_unsupportedOIDs                "id-it-unsupportedOIDs"
-#define NID_id_it_unsupportedOIDs               304
-#define OBJ_id_it_unsupportedOIDs               OBJ_id_it,7L
-
-#define SN_id_it_subscriptionRequest            "id-it-subscriptionRequest"
-#define NID_id_it_subscriptionRequest           305
-#define OBJ_id_it_subscriptionRequest           OBJ_id_it,8L
-
-#define SN_id_it_subscriptionResponse           "id-it-subscriptionResponse"
-#define NID_id_it_subscriptionResponse          306
-#define OBJ_id_it_subscriptionResponse          OBJ_id_it,9L
-
-#define SN_id_it_keyPairParamReq                "id-it-keyPairParamReq"
-#define NID_id_it_keyPairParamReq               307
-#define OBJ_id_it_keyPairParamReq               OBJ_id_it,10L
-
-#define SN_id_it_keyPairParamRep                "id-it-keyPairParamRep"
-#define NID_id_it_keyPairParamRep               308
-#define OBJ_id_it_keyPairParamRep               OBJ_id_it,11L
-
-#define SN_id_it_revPassphrase          "id-it-revPassphrase"
-#define NID_id_it_revPassphrase         309
-#define OBJ_id_it_revPassphrase         OBJ_id_it,12L
-
-#define SN_id_it_implicitConfirm                "id-it-implicitConfirm"
-#define NID_id_it_implicitConfirm               310
-#define OBJ_id_it_implicitConfirm               OBJ_id_it,13L
-
-#define SN_id_it_confirmWaitTime                "id-it-confirmWaitTime"
-#define NID_id_it_confirmWaitTime               311
-#define OBJ_id_it_confirmWaitTime               OBJ_id_it,14L
-
-#define SN_id_it_origPKIMessage         "id-it-origPKIMessage"
-#define NID_id_it_origPKIMessage                312
-#define OBJ_id_it_origPKIMessage                OBJ_id_it,15L
-
-#define SN_id_it_suppLangTags           "id-it-suppLangTags"
-#define NID_id_it_suppLangTags          784
-#define OBJ_id_it_suppLangTags          OBJ_id_it,16L
-
-#define SN_id_regCtrl           "id-regCtrl"
-#define NID_id_regCtrl          313
-#define OBJ_id_regCtrl          OBJ_id_pkip,1L
-
-#define SN_id_regInfo           "id-regInfo"
-#define NID_id_regInfo          314
-#define OBJ_id_regInfo          OBJ_id_pkip,2L
-
-#define SN_id_regCtrl_regToken          "id-regCtrl-regToken"
-#define NID_id_regCtrl_regToken         315
-#define OBJ_id_regCtrl_regToken         OBJ_id_regCtrl,1L
-
-#define SN_id_regCtrl_authenticator             "id-regCtrl-authenticator"
-#define NID_id_regCtrl_authenticator            316
-#define OBJ_id_regCtrl_authenticator            OBJ_id_regCtrl,2L
-
-#define SN_id_regCtrl_pkiPublicationInfo                "id-regCtrl-pkiPublicationInfo"
-#define NID_id_regCtrl_pkiPublicationInfo               317
-#define OBJ_id_regCtrl_pkiPublicationInfo               OBJ_id_regCtrl,3L
-
-#define SN_id_regCtrl_pkiArchiveOptions         "id-regCtrl-pkiArchiveOptions"
-#define NID_id_regCtrl_pkiArchiveOptions                318
-#define OBJ_id_regCtrl_pkiArchiveOptions                OBJ_id_regCtrl,4L
-
-#define SN_id_regCtrl_oldCertID         "id-regCtrl-oldCertID"
-#define NID_id_regCtrl_oldCertID                319
-#define OBJ_id_regCtrl_oldCertID                OBJ_id_regCtrl,5L
-
-#define SN_id_regCtrl_protocolEncrKey           "id-regCtrl-protocolEncrKey"
-#define NID_id_regCtrl_protocolEncrKey          320
-#define OBJ_id_regCtrl_protocolEncrKey          OBJ_id_regCtrl,6L
-
-#define SN_id_regInfo_utf8Pairs         "id-regInfo-utf8Pairs"
-#define NID_id_regInfo_utf8Pairs                321
-#define OBJ_id_regInfo_utf8Pairs                OBJ_id_regInfo,1L
-
-#define SN_id_regInfo_certReq           "id-regInfo-certReq"
-#define NID_id_regInfo_certReq          322
-#define OBJ_id_regInfo_certReq          OBJ_id_regInfo,2L
-
-#define SN_id_alg_des40         "id-alg-des40"
-#define NID_id_alg_des40                323
-#define OBJ_id_alg_des40                OBJ_id_alg,1L
-
-#define SN_id_alg_noSignature           "id-alg-noSignature"
-#define NID_id_alg_noSignature          324
-#define OBJ_id_alg_noSignature          OBJ_id_alg,2L
-
-#define SN_id_alg_dh_sig_hmac_sha1              "id-alg-dh-sig-hmac-sha1"
-#define NID_id_alg_dh_sig_hmac_sha1             325
-#define OBJ_id_alg_dh_sig_hmac_sha1             OBJ_id_alg,3L
-
-#define SN_id_alg_dh_pop                "id-alg-dh-pop"
-#define NID_id_alg_dh_pop               326
-#define OBJ_id_alg_dh_pop               OBJ_id_alg,4L
-
-#define SN_id_cmc_statusInfo            "id-cmc-statusInfo"
-#define NID_id_cmc_statusInfo           327
-#define OBJ_id_cmc_statusInfo           OBJ_id_cmc,1L
-
-#define SN_id_cmc_identification                "id-cmc-identification"
-#define NID_id_cmc_identification               328
-#define OBJ_id_cmc_identification               OBJ_id_cmc,2L
-
-#define SN_id_cmc_identityProof         "id-cmc-identityProof"
-#define NID_id_cmc_identityProof                329
-#define OBJ_id_cmc_identityProof                OBJ_id_cmc,3L
-
-#define SN_id_cmc_dataReturn            "id-cmc-dataReturn"
-#define NID_id_cmc_dataReturn           330
-#define OBJ_id_cmc_dataReturn           OBJ_id_cmc,4L
-
-#define SN_id_cmc_transactionId         "id-cmc-transactionId"
-#define NID_id_cmc_transactionId                331
-#define OBJ_id_cmc_transactionId                OBJ_id_cmc,5L
-
-#define SN_id_cmc_senderNonce           "id-cmc-senderNonce"
-#define NID_id_cmc_senderNonce          332
-#define OBJ_id_cmc_senderNonce          OBJ_id_cmc,6L
-
-#define SN_id_cmc_recipientNonce                "id-cmc-recipientNonce"
-#define NID_id_cmc_recipientNonce               333
-#define OBJ_id_cmc_recipientNonce               OBJ_id_cmc,7L
-
-#define SN_id_cmc_addExtensions         "id-cmc-addExtensions"
-#define NID_id_cmc_addExtensions                334
-#define OBJ_id_cmc_addExtensions                OBJ_id_cmc,8L
-
-#define SN_id_cmc_encryptedPOP          "id-cmc-encryptedPOP"
-#define NID_id_cmc_encryptedPOP         335
-#define OBJ_id_cmc_encryptedPOP         OBJ_id_cmc,9L
-
-#define SN_id_cmc_decryptedPOP          "id-cmc-decryptedPOP"
-#define NID_id_cmc_decryptedPOP         336
-#define OBJ_id_cmc_decryptedPOP         OBJ_id_cmc,10L
-
-#define SN_id_cmc_lraPOPWitness         "id-cmc-lraPOPWitness"
-#define NID_id_cmc_lraPOPWitness                337
-#define OBJ_id_cmc_lraPOPWitness                OBJ_id_cmc,11L
-
-#define SN_id_cmc_getCert               "id-cmc-getCert"
-#define NID_id_cmc_getCert              338
-#define OBJ_id_cmc_getCert              OBJ_id_cmc,15L
-
-#define SN_id_cmc_getCRL                "id-cmc-getCRL"
-#define NID_id_cmc_getCRL               339
-#define OBJ_id_cmc_getCRL               OBJ_id_cmc,16L
-
-#define SN_id_cmc_revokeRequest         "id-cmc-revokeRequest"
-#define NID_id_cmc_revokeRequest                340
-#define OBJ_id_cmc_revokeRequest                OBJ_id_cmc,17L
-
-#define SN_id_cmc_regInfo               "id-cmc-regInfo"
-#define NID_id_cmc_regInfo              341
-#define OBJ_id_cmc_regInfo              OBJ_id_cmc,18L
-
-#define SN_id_cmc_responseInfo          "id-cmc-responseInfo"
-#define NID_id_cmc_responseInfo         342
-#define OBJ_id_cmc_responseInfo         OBJ_id_cmc,19L
-
-#define SN_id_cmc_queryPending          "id-cmc-queryPending"
-#define NID_id_cmc_queryPending         343
-#define OBJ_id_cmc_queryPending         OBJ_id_cmc,21L
-
-#define SN_id_cmc_popLinkRandom         "id-cmc-popLinkRandom"
-#define NID_id_cmc_popLinkRandom                344
-#define OBJ_id_cmc_popLinkRandom                OBJ_id_cmc,22L
-
-#define SN_id_cmc_popLinkWitness                "id-cmc-popLinkWitness"
-#define NID_id_cmc_popLinkWitness               345
-#define OBJ_id_cmc_popLinkWitness               OBJ_id_cmc,23L
-
-#define SN_id_cmc_confirmCertAcceptance         "id-cmc-confirmCertAcceptance"
-#define NID_id_cmc_confirmCertAcceptance                346
-#define OBJ_id_cmc_confirmCertAcceptance                OBJ_id_cmc,24L
-
-#define SN_id_on_personalData           "id-on-personalData"
-#define NID_id_on_personalData          347
-#define OBJ_id_on_personalData          OBJ_id_on,1L
-
-#define SN_id_on_permanentIdentifier            "id-on-permanentIdentifier"
-#define LN_id_on_permanentIdentifier            "Permanent Identifier"
-#define NID_id_on_permanentIdentifier           858
-#define OBJ_id_on_permanentIdentifier           OBJ_id_on,3L
-
-#define SN_id_pda_dateOfBirth           "id-pda-dateOfBirth"
-#define NID_id_pda_dateOfBirth          348
-#define OBJ_id_pda_dateOfBirth          OBJ_id_pda,1L
-
-#define SN_id_pda_placeOfBirth          "id-pda-placeOfBirth"
-#define NID_id_pda_placeOfBirth         349
-#define OBJ_id_pda_placeOfBirth         OBJ_id_pda,2L
-
-#define SN_id_pda_gender                "id-pda-gender"
-#define NID_id_pda_gender               351
-#define OBJ_id_pda_gender               OBJ_id_pda,3L
-
-#define SN_id_pda_countryOfCitizenship          "id-pda-countryOfCitizenship"
-#define NID_id_pda_countryOfCitizenship         352
-#define OBJ_id_pda_countryOfCitizenship         OBJ_id_pda,4L
-
-#define SN_id_pda_countryOfResidence            "id-pda-countryOfResidence"
-#define NID_id_pda_countryOfResidence           353
-#define OBJ_id_pda_countryOfResidence           OBJ_id_pda,5L
-
-#define SN_id_aca_authenticationInfo            "id-aca-authenticationInfo"
-#define NID_id_aca_authenticationInfo           354
-#define OBJ_id_aca_authenticationInfo           OBJ_id_aca,1L
-
-#define SN_id_aca_accessIdentity                "id-aca-accessIdentity"
-#define NID_id_aca_accessIdentity               355
-#define OBJ_id_aca_accessIdentity               OBJ_id_aca,2L
-
-#define SN_id_aca_chargingIdentity              "id-aca-chargingIdentity"
-#define NID_id_aca_chargingIdentity             356
-#define OBJ_id_aca_chargingIdentity             OBJ_id_aca,3L
-
-#define SN_id_aca_group         "id-aca-group"
-#define NID_id_aca_group                357
-#define OBJ_id_aca_group                OBJ_id_aca,4L
-
-#define SN_id_aca_role          "id-aca-role"
-#define NID_id_aca_role         358
-#define OBJ_id_aca_role         OBJ_id_aca,5L
-
-#define SN_id_aca_encAttrs              "id-aca-encAttrs"
-#define NID_id_aca_encAttrs             399
-#define OBJ_id_aca_encAttrs             OBJ_id_aca,6L
-
-#define SN_id_qcs_pkixQCSyntax_v1               "id-qcs-pkixQCSyntax-v1"
-#define NID_id_qcs_pkixQCSyntax_v1              359
-#define OBJ_id_qcs_pkixQCSyntax_v1              OBJ_id_qcs,1L
-
-#define SN_id_cct_crs           "id-cct-crs"
-#define NID_id_cct_crs          360
-#define OBJ_id_cct_crs          OBJ_id_cct,1L
-
-#define SN_id_cct_PKIData               "id-cct-PKIData"
-#define NID_id_cct_PKIData              361
-#define OBJ_id_cct_PKIData              OBJ_id_cct,2L
-
-#define SN_id_cct_PKIResponse           "id-cct-PKIResponse"
-#define NID_id_cct_PKIResponse          362
-#define OBJ_id_cct_PKIResponse          OBJ_id_cct,3L
-
-#define SN_id_ppl_anyLanguage           "id-ppl-anyLanguage"
-#define LN_id_ppl_anyLanguage           "Any language"
-#define NID_id_ppl_anyLanguage          664
-#define OBJ_id_ppl_anyLanguage          OBJ_id_ppl,0L
-
-#define SN_id_ppl_inheritAll            "id-ppl-inheritAll"
-#define LN_id_ppl_inheritAll            "Inherit all"
-#define NID_id_ppl_inheritAll           665
-#define OBJ_id_ppl_inheritAll           OBJ_id_ppl,1L
-
-#define SN_Independent          "id-ppl-independent"
-#define LN_Independent          "Independent"
-#define NID_Independent         667
-#define OBJ_Independent         OBJ_id_ppl,2L
-
-#define SN_ad_OCSP              "OCSP"
-#define LN_ad_OCSP              "OCSP"
-#define NID_ad_OCSP             178
-#define OBJ_ad_OCSP             OBJ_id_ad,1L
-
-#define SN_ad_ca_issuers                "caIssuers"
-#define LN_ad_ca_issuers                "CA Issuers"
-#define NID_ad_ca_issuers               179
-#define OBJ_ad_ca_issuers               OBJ_id_ad,2L
-
-#define SN_ad_timeStamping              "ad_timestamping"
-#define LN_ad_timeStamping              "AD Time Stamping"
-#define NID_ad_timeStamping             363
-#define OBJ_ad_timeStamping             OBJ_id_ad,3L
-
-#define SN_ad_dvcs              "AD_DVCS"
-#define LN_ad_dvcs              "ad dvcs"
-#define NID_ad_dvcs             364
-#define OBJ_ad_dvcs             OBJ_id_ad,4L
-
-#define SN_caRepository         "caRepository"
-#define LN_caRepository         "CA Repository"
-#define NID_caRepository                785
-#define OBJ_caRepository                OBJ_id_ad,5L
-
-#define OBJ_id_pkix_OCSP                OBJ_ad_OCSP
-
-#define SN_id_pkix_OCSP_basic           "basicOCSPResponse"
-#define LN_id_pkix_OCSP_basic           "Basic OCSP Response"
-#define NID_id_pkix_OCSP_basic          365
-#define OBJ_id_pkix_OCSP_basic          OBJ_id_pkix_OCSP,1L
-
-#define SN_id_pkix_OCSP_Nonce           "Nonce"
-#define LN_id_pkix_OCSP_Nonce           "OCSP Nonce"
-#define NID_id_pkix_OCSP_Nonce          366
-#define OBJ_id_pkix_OCSP_Nonce          OBJ_id_pkix_OCSP,2L
-
-#define SN_id_pkix_OCSP_CrlID           "CrlID"
-#define LN_id_pkix_OCSP_CrlID           "OCSP CRL ID"
-#define NID_id_pkix_OCSP_CrlID          367
-#define OBJ_id_pkix_OCSP_CrlID          OBJ_id_pkix_OCSP,3L
-
-#define SN_id_pkix_OCSP_acceptableResponses             "acceptableResponses"
-#define LN_id_pkix_OCSP_acceptableResponses             "Acceptable OCSP Responses"
-#define NID_id_pkix_OCSP_acceptableResponses            368
-#define OBJ_id_pkix_OCSP_acceptableResponses            OBJ_id_pkix_OCSP,4L
-
-#define SN_id_pkix_OCSP_noCheck         "noCheck"
-#define LN_id_pkix_OCSP_noCheck         "OCSP No Check"
-#define NID_id_pkix_OCSP_noCheck                369
-#define OBJ_id_pkix_OCSP_noCheck                OBJ_id_pkix_OCSP,5L
-
-#define SN_id_pkix_OCSP_archiveCutoff           "archiveCutoff"
-#define LN_id_pkix_OCSP_archiveCutoff           "OCSP Archive Cutoff"
-#define NID_id_pkix_OCSP_archiveCutoff          370
-#define OBJ_id_pkix_OCSP_archiveCutoff          OBJ_id_pkix_OCSP,6L
-
-#define SN_id_pkix_OCSP_serviceLocator          "serviceLocator"
-#define LN_id_pkix_OCSP_serviceLocator          "OCSP Service Locator"
-#define NID_id_pkix_OCSP_serviceLocator         371
-#define OBJ_id_pkix_OCSP_serviceLocator         OBJ_id_pkix_OCSP,7L
-
-#define SN_id_pkix_OCSP_extendedStatus          "extendedStatus"
-#define LN_id_pkix_OCSP_extendedStatus          "Extended OCSP Status"
-#define NID_id_pkix_OCSP_extendedStatus         372
-#define OBJ_id_pkix_OCSP_extendedStatus         OBJ_id_pkix_OCSP,8L
-
-#define SN_id_pkix_OCSP_valid           "valid"
-#define NID_id_pkix_OCSP_valid          373
-#define OBJ_id_pkix_OCSP_valid          OBJ_id_pkix_OCSP,9L
-
-#define SN_id_pkix_OCSP_path            "path"
-#define NID_id_pkix_OCSP_path           374
-#define OBJ_id_pkix_OCSP_path           OBJ_id_pkix_OCSP,10L
-
-#define SN_id_pkix_OCSP_trustRoot               "trustRoot"
-#define LN_id_pkix_OCSP_trustRoot               "Trust Root"
-#define NID_id_pkix_OCSP_trustRoot              375
-#define OBJ_id_pkix_OCSP_trustRoot              OBJ_id_pkix_OCSP,11L
-
-#define SN_algorithm            "algorithm"
-#define LN_algorithm            "algorithm"
-#define NID_algorithm           376
-#define OBJ_algorithm           1L,3L,14L,3L,2L
-
-#define SN_md5WithRSA           "RSA-NP-MD5"
-#define LN_md5WithRSA           "md5WithRSA"
-#define NID_md5WithRSA          104
-#define OBJ_md5WithRSA          OBJ_algorithm,3L
-
-#define SN_des_ecb              "DES-ECB"
-#define LN_des_ecb              "des-ecb"
-#define NID_des_ecb             29
-#define OBJ_des_ecb             OBJ_algorithm,6L
-
-#define SN_des_cbc              "DES-CBC"
-#define LN_des_cbc              "des-cbc"
-#define NID_des_cbc             31
-#define OBJ_des_cbc             OBJ_algorithm,7L
-
-#define SN_des_ofb64            "DES-OFB"
-#define LN_des_ofb64            "des-ofb"
-#define NID_des_ofb64           45
-#define OBJ_des_ofb64           OBJ_algorithm,8L
-
-#define SN_des_cfb64            "DES-CFB"
-#define LN_des_cfb64            "des-cfb"
-#define NID_des_cfb64           30
-#define OBJ_des_cfb64           OBJ_algorithm,9L
-
-#define SN_rsaSignature         "rsaSignature"
-#define NID_rsaSignature                377
-#define OBJ_rsaSignature                OBJ_algorithm,11L
-
-#define SN_dsa_2                "DSA-old"
-#define LN_dsa_2                "dsaEncryption-old"
-#define NID_dsa_2               67
-#define OBJ_dsa_2               OBJ_algorithm,12L
-
-#define SN_dsaWithSHA           "DSA-SHA"
-#define LN_dsaWithSHA           "dsaWithSHA"
-#define NID_dsaWithSHA          66
-#define OBJ_dsaWithSHA          OBJ_algorithm,13L
-
-#define SN_shaWithRSAEncryption         "RSA-SHA"
-#define LN_shaWithRSAEncryption         "shaWithRSAEncryption"
-#define NID_shaWithRSAEncryption                42
-#define OBJ_shaWithRSAEncryption                OBJ_algorithm,15L
-
-#define SN_des_ede_ecb          "DES-EDE"
-#define LN_des_ede_ecb          "des-ede"
-#define NID_des_ede_ecb         32
-#define OBJ_des_ede_ecb         OBJ_algorithm,17L
-
-#define SN_des_ede3_ecb         "DES-EDE3"
-#define LN_des_ede3_ecb         "des-ede3"
-#define NID_des_ede3_ecb                33
-
-#define SN_des_ede_cbc          "DES-EDE-CBC"
-#define LN_des_ede_cbc          "des-ede-cbc"
-#define NID_des_ede_cbc         43
-
-#define SN_des_ede_cfb64                "DES-EDE-CFB"
-#define LN_des_ede_cfb64                "des-ede-cfb"
-#define NID_des_ede_cfb64               60
-
-#define SN_des_ede3_cfb64               "DES-EDE3-CFB"
-#define LN_des_ede3_cfb64               "des-ede3-cfb"
-#define NID_des_ede3_cfb64              61
-
-#define SN_des_ede_ofb64                "DES-EDE-OFB"
-#define LN_des_ede_ofb64                "des-ede-ofb"
-#define NID_des_ede_ofb64               62
-
-#define SN_des_ede3_ofb64               "DES-EDE3-OFB"
-#define LN_des_ede3_ofb64               "des-ede3-ofb"
-#define NID_des_ede3_ofb64              63
-
-#define SN_desx_cbc             "DESX-CBC"
-#define LN_desx_cbc             "desx-cbc"
-#define NID_desx_cbc            80
-
-#define SN_sha          "SHA"
-#define LN_sha          "sha"
-#define NID_sha         41
-#define OBJ_sha         OBJ_algorithm,18L
-
-#define SN_sha1         "SHA1"
-#define LN_sha1         "sha1"
-#define NID_sha1                64
-#define OBJ_sha1                OBJ_algorithm,26L
-
-#define SN_dsaWithSHA1_2                "DSA-SHA1-old"
-#define LN_dsaWithSHA1_2                "dsaWithSHA1-old"
-#define NID_dsaWithSHA1_2               70
-#define OBJ_dsaWithSHA1_2               OBJ_algorithm,27L
-
-#define SN_sha1WithRSA          "RSA-SHA1-2"
-#define LN_sha1WithRSA          "sha1WithRSA"
-#define NID_sha1WithRSA         115
-#define OBJ_sha1WithRSA         OBJ_algorithm,29L
-
-#define SN_ripemd160            "RIPEMD160"
-#define LN_ripemd160            "ripemd160"
-#define NID_ripemd160           117
-#define OBJ_ripemd160           1L,3L,36L,3L,2L,1L
-
-#define SN_ripemd160WithRSA             "RSA-RIPEMD160"
-#define LN_ripemd160WithRSA             "ripemd160WithRSA"
-#define NID_ripemd160WithRSA            119
-#define OBJ_ripemd160WithRSA            1L,3L,36L,3L,3L,1L,2L
-
-#define SN_blake2b512           "BLAKE2b512"
-#define LN_blake2b512           "blake2b512"
-#define NID_blake2b512          1056
-#define OBJ_blake2b512          1L,3L,6L,1L,4L,1L,1722L,12L,2L,1L,16L
-
-#define SN_blake2s256           "BLAKE2s256"
-#define LN_blake2s256           "blake2s256"
-#define NID_blake2s256          1057
-#define OBJ_blake2s256          1L,3L,6L,1L,4L,1L,1722L,12L,2L,2L,8L
-
-#define SN_sxnet                "SXNetID"
-#define LN_sxnet                "Strong Extranet ID"
-#define NID_sxnet               143
-#define OBJ_sxnet               1L,3L,101L,1L,4L,1L
-
-#define SN_X500         "X500"
-#define LN_X500         "directory services (X.500)"
-#define NID_X500                11
-#define OBJ_X500                2L,5L
-
-#define SN_X509         "X509"
-#define NID_X509                12
-#define OBJ_X509                OBJ_X500,4L
-
-#define SN_commonName           "CN"
-#define LN_commonName           "commonName"
-#define NID_commonName          13
-#define OBJ_commonName          OBJ_X509,3L
-
-#define SN_surname              "SN"
-#define LN_surname              "surname"
-#define NID_surname             100
-#define OBJ_surname             OBJ_X509,4L
-
-#define LN_serialNumber         "serialNumber"
-#define NID_serialNumber                105
-#define OBJ_serialNumber                OBJ_X509,5L
-
-#define SN_countryName          "C"
-#define LN_countryName          "countryName"
-#define NID_countryName         14
-#define OBJ_countryName         OBJ_X509,6L
-
-#define SN_localityName         "L"
-#define LN_localityName         "localityName"
-#define NID_localityName                15
-#define OBJ_localityName                OBJ_X509,7L
-
-#define SN_stateOrProvinceName          "ST"
-#define LN_stateOrProvinceName          "stateOrProvinceName"
-#define NID_stateOrProvinceName         16
-#define OBJ_stateOrProvinceName         OBJ_X509,8L
-
-#define SN_streetAddress                "street"
-#define LN_streetAddress                "streetAddress"
-#define NID_streetAddress               660
-#define OBJ_streetAddress               OBJ_X509,9L
-
-#define SN_organizationName             "O"
-#define LN_organizationName             "organizationName"
-#define NID_organizationName            17
-#define OBJ_organizationName            OBJ_X509,10L
-
-#define SN_organizationalUnitName               "OU"
-#define LN_organizationalUnitName               "organizationalUnitName"
-#define NID_organizationalUnitName              18
-#define OBJ_organizationalUnitName              OBJ_X509,11L
-
-#define SN_title                "title"
-#define LN_title                "title"
-#define NID_title               106
-#define OBJ_title               OBJ_X509,12L
-
-#define LN_description          "description"
-#define NID_description         107
-#define OBJ_description         OBJ_X509,13L
-
-#define LN_searchGuide          "searchGuide"
-#define NID_searchGuide         859
-#define OBJ_searchGuide         OBJ_X509,14L
-
-#define LN_businessCategory             "businessCategory"
-#define NID_businessCategory            860
-#define OBJ_businessCategory            OBJ_X509,15L
-
-#define LN_postalAddress                "postalAddress"
-#define NID_postalAddress               861
-#define OBJ_postalAddress               OBJ_X509,16L
-
-#define LN_postalCode           "postalCode"
-#define NID_postalCode          661
-#define OBJ_postalCode          OBJ_X509,17L
-
-#define LN_postOfficeBox                "postOfficeBox"
-#define NID_postOfficeBox               862
-#define OBJ_postOfficeBox               OBJ_X509,18L
-
-#define LN_physicalDeliveryOfficeName           "physicalDeliveryOfficeName"
-#define NID_physicalDeliveryOfficeName          863
-#define OBJ_physicalDeliveryOfficeName          OBJ_X509,19L
-
-#define LN_telephoneNumber              "telephoneNumber"
-#define NID_telephoneNumber             864
-#define OBJ_telephoneNumber             OBJ_X509,20L
-
-#define LN_telexNumber          "telexNumber"
-#define NID_telexNumber         865
-#define OBJ_telexNumber         OBJ_X509,21L
-
-#define LN_teletexTerminalIdentifier            "teletexTerminalIdentifier"
-#define NID_teletexTerminalIdentifier           866
-#define OBJ_teletexTerminalIdentifier           OBJ_X509,22L
-
-#define LN_facsimileTelephoneNumber             "facsimileTelephoneNumber"
-#define NID_facsimileTelephoneNumber            867
-#define OBJ_facsimileTelephoneNumber            OBJ_X509,23L
-
-#define LN_x121Address          "x121Address"
-#define NID_x121Address         868
-#define OBJ_x121Address         OBJ_X509,24L
-
-#define LN_internationaliSDNNumber              "internationaliSDNNumber"
-#define NID_internationaliSDNNumber             869
-#define OBJ_internationaliSDNNumber             OBJ_X509,25L
-
-#define LN_registeredAddress            "registeredAddress"
-#define NID_registeredAddress           870
-#define OBJ_registeredAddress           OBJ_X509,26L
-
-#define LN_destinationIndicator         "destinationIndicator"
-#define NID_destinationIndicator                871
-#define OBJ_destinationIndicator                OBJ_X509,27L
-
-#define LN_preferredDeliveryMethod              "preferredDeliveryMethod"
-#define NID_preferredDeliveryMethod             872
-#define OBJ_preferredDeliveryMethod             OBJ_X509,28L
-
-#define LN_presentationAddress          "presentationAddress"
-#define NID_presentationAddress         873
-#define OBJ_presentationAddress         OBJ_X509,29L
-
-#define LN_supportedApplicationContext          "supportedApplicationContext"
-#define NID_supportedApplicationContext         874
-#define OBJ_supportedApplicationContext         OBJ_X509,30L
-
-#define SN_member               "member"
-#define NID_member              875
-#define OBJ_member              OBJ_X509,31L
-
-#define SN_owner                "owner"
-#define NID_owner               876
-#define OBJ_owner               OBJ_X509,32L
-
-#define LN_roleOccupant         "roleOccupant"
-#define NID_roleOccupant                877
-#define OBJ_roleOccupant                OBJ_X509,33L
-
-#define SN_seeAlso              "seeAlso"
-#define NID_seeAlso             878
-#define OBJ_seeAlso             OBJ_X509,34L
-
-#define LN_userPassword         "userPassword"
-#define NID_userPassword                879
-#define OBJ_userPassword                OBJ_X509,35L
-
-#define LN_userCertificate              "userCertificate"
-#define NID_userCertificate             880
-#define OBJ_userCertificate             OBJ_X509,36L
-
-#define LN_cACertificate                "cACertificate"
-#define NID_cACertificate               881
-#define OBJ_cACertificate               OBJ_X509,37L
-
-#define LN_authorityRevocationList              "authorityRevocationList"
-#define NID_authorityRevocationList             882
-#define OBJ_authorityRevocationList             OBJ_X509,38L
-
-#define LN_certificateRevocationList            "certificateRevocationList"
-#define NID_certificateRevocationList           883
-#define OBJ_certificateRevocationList           OBJ_X509,39L
-
-#define LN_crossCertificatePair         "crossCertificatePair"
-#define NID_crossCertificatePair                884
-#define OBJ_crossCertificatePair                OBJ_X509,40L
-
-#define SN_name         "name"
-#define LN_name         "name"
-#define NID_name                173
-#define OBJ_name                OBJ_X509,41L
-
-#define SN_givenName            "GN"
-#define LN_givenName            "givenName"
-#define NID_givenName           99
-#define OBJ_givenName           OBJ_X509,42L
-
-#define SN_initials             "initials"
-#define LN_initials             "initials"
-#define NID_initials            101
-#define OBJ_initials            OBJ_X509,43L
-
-#define LN_generationQualifier          "generationQualifier"
-#define NID_generationQualifier         509
-#define OBJ_generationQualifier         OBJ_X509,44L
-
-#define LN_x500UniqueIdentifier         "x500UniqueIdentifier"
-#define NID_x500UniqueIdentifier                503
-#define OBJ_x500UniqueIdentifier                OBJ_X509,45L
-
-#define SN_dnQualifier          "dnQualifier"
-#define LN_dnQualifier          "dnQualifier"
-#define NID_dnQualifier         174
-#define OBJ_dnQualifier         OBJ_X509,46L
-
-#define LN_enhancedSearchGuide          "enhancedSearchGuide"
-#define NID_enhancedSearchGuide         885
-#define OBJ_enhancedSearchGuide         OBJ_X509,47L
-
-#define LN_protocolInformation          "protocolInformation"
-#define NID_protocolInformation         886
-#define OBJ_protocolInformation         OBJ_X509,48L
-
-#define LN_distinguishedName            "distinguishedName"
-#define NID_distinguishedName           887
-#define OBJ_distinguishedName           OBJ_X509,49L
-
-#define LN_uniqueMember         "uniqueMember"
-#define NID_uniqueMember                888
-#define OBJ_uniqueMember                OBJ_X509,50L
-
-#define LN_houseIdentifier              "houseIdentifier"
-#define NID_houseIdentifier             889
-#define OBJ_houseIdentifier             OBJ_X509,51L
-
-#define LN_supportedAlgorithms          "supportedAlgorithms"
-#define NID_supportedAlgorithms         890
-#define OBJ_supportedAlgorithms         OBJ_X509,52L
-
-#define LN_deltaRevocationList          "deltaRevocationList"
-#define NID_deltaRevocationList         891
-#define OBJ_deltaRevocationList         OBJ_X509,53L
-
-#define SN_dmdName              "dmdName"
-#define NID_dmdName             892
-#define OBJ_dmdName             OBJ_X509,54L
-
-#define LN_pseudonym            "pseudonym"
-#define NID_pseudonym           510
-#define OBJ_pseudonym           OBJ_X509,65L
-
-#define SN_role         "role"
-#define LN_role         "role"
-#define NID_role                400
-#define OBJ_role                OBJ_X509,72L
-
-#define SN_X500algorithms               "X500algorithms"
-#define LN_X500algorithms               "directory services - algorithms"
-#define NID_X500algorithms              378
-#define OBJ_X500algorithms              OBJ_X500,8L
-
-#define SN_rsa          "RSA"
-#define LN_rsa          "rsa"
-#define NID_rsa         19
-#define OBJ_rsa         OBJ_X500algorithms,1L,1L
-
-#define SN_mdc2WithRSA          "RSA-MDC2"
-#define LN_mdc2WithRSA          "mdc2WithRSA"
-#define NID_mdc2WithRSA         96
-#define OBJ_mdc2WithRSA         OBJ_X500algorithms,3L,100L
-
-#define SN_mdc2         "MDC2"
-#define LN_mdc2         "mdc2"
-#define NID_mdc2                95
-#define OBJ_mdc2                OBJ_X500algorithms,3L,101L
-
-#define SN_id_ce                "id-ce"
-#define NID_id_ce               81
-#define OBJ_id_ce               OBJ_X500,29L
-
-#define SN_subject_directory_attributes         "subjectDirectoryAttributes"
-#define LN_subject_directory_attributes         "X509v3 Subject Directory Attributes"
-#define NID_subject_directory_attributes                769
-#define OBJ_subject_directory_attributes                OBJ_id_ce,9L
-
-#define SN_subject_key_identifier               "subjectKeyIdentifier"
-#define LN_subject_key_identifier               "X509v3 Subject Key Identifier"
-#define NID_subject_key_identifier              82
-#define OBJ_subject_key_identifier              OBJ_id_ce,14L
-
-#define SN_key_usage            "keyUsage"
-#define LN_key_usage            "X509v3 Key Usage"
-#define NID_key_usage           83
-#define OBJ_key_usage           OBJ_id_ce,15L
-
-#define SN_private_key_usage_period             "privateKeyUsagePeriod"
-#define LN_private_key_usage_period             "X509v3 Private Key Usage Period"
-#define NID_private_key_usage_period            84
-#define OBJ_private_key_usage_period            OBJ_id_ce,16L
-
-#define SN_subject_alt_name             "subjectAltName"
-#define LN_subject_alt_name             "X509v3 Subject Alternative Name"
-#define NID_subject_alt_name            85
-#define OBJ_subject_alt_name            OBJ_id_ce,17L
-
-#define SN_issuer_alt_name              "issuerAltName"
-#define LN_issuer_alt_name              "X509v3 Issuer Alternative Name"
-#define NID_issuer_alt_name             86
-#define OBJ_issuer_alt_name             OBJ_id_ce,18L
-
-#define SN_basic_constraints            "basicConstraints"
-#define LN_basic_constraints            "X509v3 Basic Constraints"
-#define NID_basic_constraints           87
-#define OBJ_basic_constraints           OBJ_id_ce,19L
-
-#define SN_crl_number           "crlNumber"
-#define LN_crl_number           "X509v3 CRL Number"
-#define NID_crl_number          88
-#define OBJ_crl_number          OBJ_id_ce,20L
-
-#define SN_crl_reason           "CRLReason"
-#define LN_crl_reason           "X509v3 CRL Reason Code"
-#define NID_crl_reason          141
-#define OBJ_crl_reason          OBJ_id_ce,21L
-
-#define SN_invalidity_date              "invalidityDate"
-#define LN_invalidity_date              "Invalidity Date"
-#define NID_invalidity_date             142
-#define OBJ_invalidity_date             OBJ_id_ce,24L
-
-#define SN_delta_crl            "deltaCRL"
-#define LN_delta_crl            "X509v3 Delta CRL Indicator"
-#define NID_delta_crl           140
-#define OBJ_delta_crl           OBJ_id_ce,27L
-
-#define SN_issuing_distribution_point           "issuingDistributionPoint"
-#define LN_issuing_distribution_point           "X509v3 Issuing Distribution Point"
-#define NID_issuing_distribution_point          770
-#define OBJ_issuing_distribution_point          OBJ_id_ce,28L
-
-#define SN_certificate_issuer           "certificateIssuer"
-#define LN_certificate_issuer           "X509v3 Certificate Issuer"
-#define NID_certificate_issuer          771
-#define OBJ_certificate_issuer          OBJ_id_ce,29L
-
-#define SN_name_constraints             "nameConstraints"
-#define LN_name_constraints             "X509v3 Name Constraints"
-#define NID_name_constraints            666
-#define OBJ_name_constraints            OBJ_id_ce,30L
-
-#define SN_crl_distribution_points              "crlDistributionPoints"
-#define LN_crl_distribution_points              "X509v3 CRL Distribution Points"
-#define NID_crl_distribution_points             103
-#define OBJ_crl_distribution_points             OBJ_id_ce,31L
-
-#define SN_certificate_policies         "certificatePolicies"
-#define LN_certificate_policies         "X509v3 Certificate Policies"
-#define NID_certificate_policies                89
-#define OBJ_certificate_policies                OBJ_id_ce,32L
-
-#define SN_any_policy           "anyPolicy"
-#define LN_any_policy           "X509v3 Any Policy"
-#define NID_any_policy          746
-#define OBJ_any_policy          OBJ_certificate_policies,0L
-
-#define SN_policy_mappings              "policyMappings"
-#define LN_policy_mappings              "X509v3 Policy Mappings"
-#define NID_policy_mappings             747
-#define OBJ_policy_mappings             OBJ_id_ce,33L
-
-#define SN_authority_key_identifier             "authorityKeyIdentifier"
-#define LN_authority_key_identifier             "X509v3 Authority Key Identifier"
-#define NID_authority_key_identifier            90
-#define OBJ_authority_key_identifier            OBJ_id_ce,35L
-
-#define SN_policy_constraints           "policyConstraints"
-#define LN_policy_constraints           "X509v3 Policy Constraints"
-#define NID_policy_constraints          401
-#define OBJ_policy_constraints          OBJ_id_ce,36L
-
-#define SN_ext_key_usage                "extendedKeyUsage"
-#define LN_ext_key_usage                "X509v3 Extended Key Usage"
-#define NID_ext_key_usage               126
-#define OBJ_ext_key_usage               OBJ_id_ce,37L
-
-#define SN_freshest_crl         "freshestCRL"
-#define LN_freshest_crl         "X509v3 Freshest CRL"
-#define NID_freshest_crl                857
-#define OBJ_freshest_crl                OBJ_id_ce,46L
-
-#define SN_inhibit_any_policy           "inhibitAnyPolicy"
-#define LN_inhibit_any_policy           "X509v3 Inhibit Any Policy"
-#define NID_inhibit_any_policy          748
-#define OBJ_inhibit_any_policy          OBJ_id_ce,54L
-
-#define SN_target_information           "targetInformation"
-#define LN_target_information           "X509v3 AC Targeting"
-#define NID_target_information          402
-#define OBJ_target_information          OBJ_id_ce,55L
-
-#define SN_no_rev_avail         "noRevAvail"
-#define LN_no_rev_avail         "X509v3 No Revocation Available"
-#define NID_no_rev_avail                403
-#define OBJ_no_rev_avail                OBJ_id_ce,56L
-
-#define SN_anyExtendedKeyUsage          "anyExtendedKeyUsage"
-#define LN_anyExtendedKeyUsage          "Any Extended Key Usage"
-#define NID_anyExtendedKeyUsage         910
-#define OBJ_anyExtendedKeyUsage         OBJ_ext_key_usage,0L
-
-#define SN_netscape             "Netscape"
-#define LN_netscape             "Netscape Communications Corp."
-#define NID_netscape            57
-#define OBJ_netscape            2L,16L,840L,1L,113730L
-
-#define SN_netscape_cert_extension              "nsCertExt"
-#define LN_netscape_cert_extension              "Netscape Certificate Extension"
-#define NID_netscape_cert_extension             58
-#define OBJ_netscape_cert_extension             OBJ_netscape,1L
-
-#define SN_netscape_data_type           "nsDataType"
-#define LN_netscape_data_type           "Netscape Data Type"
-#define NID_netscape_data_type          59
-#define OBJ_netscape_data_type          OBJ_netscape,2L
-
-#define SN_netscape_cert_type           "nsCertType"
-#define LN_netscape_cert_type           "Netscape Cert Type"
-#define NID_netscape_cert_type          71
-#define OBJ_netscape_cert_type          OBJ_netscape_cert_extension,1L
-
-#define SN_netscape_base_url            "nsBaseUrl"
-#define LN_netscape_base_url            "Netscape Base Url"
-#define NID_netscape_base_url           72
-#define OBJ_netscape_base_url           OBJ_netscape_cert_extension,2L
-
-#define SN_netscape_revocation_url              "nsRevocationUrl"
-#define LN_netscape_revocation_url              "Netscape Revocation Url"
-#define NID_netscape_revocation_url             73
-#define OBJ_netscape_revocation_url             OBJ_netscape_cert_extension,3L
-
-#define SN_netscape_ca_revocation_url           "nsCaRevocationUrl"
-#define LN_netscape_ca_revocation_url           "Netscape CA Revocation Url"
-#define NID_netscape_ca_revocation_url          74
-#define OBJ_netscape_ca_revocation_url          OBJ_netscape_cert_extension,4L
-
-#define SN_netscape_renewal_url         "nsRenewalUrl"
-#define LN_netscape_renewal_url         "Netscape Renewal Url"
-#define NID_netscape_renewal_url                75
-#define OBJ_netscape_renewal_url                OBJ_netscape_cert_extension,7L
-
-#define SN_netscape_ca_policy_url               "nsCaPolicyUrl"
-#define LN_netscape_ca_policy_url               "Netscape CA Policy Url"
-#define NID_netscape_ca_policy_url              76
-#define OBJ_netscape_ca_policy_url              OBJ_netscape_cert_extension,8L
-
-#define SN_netscape_ssl_server_name             "nsSslServerName"
-#define LN_netscape_ssl_server_name             "Netscape SSL Server Name"
-#define NID_netscape_ssl_server_name            77
-#define OBJ_netscape_ssl_server_name            OBJ_netscape_cert_extension,12L
-
-#define SN_netscape_comment             "nsComment"
-#define LN_netscape_comment             "Netscape Comment"
-#define NID_netscape_comment            78
-#define OBJ_netscape_comment            OBJ_netscape_cert_extension,13L
-
-#define SN_netscape_cert_sequence               "nsCertSequence"
-#define LN_netscape_cert_sequence               "Netscape Certificate Sequence"
-#define NID_netscape_cert_sequence              79
-#define OBJ_netscape_cert_sequence              OBJ_netscape_data_type,5L
-
-#define SN_ns_sgc               "nsSGC"
-#define LN_ns_sgc               "Netscape Server Gated Crypto"
-#define NID_ns_sgc              139
-#define OBJ_ns_sgc              OBJ_netscape,4L,1L
-
-#define SN_org          "ORG"
-#define LN_org          "org"
-#define NID_org         379
-#define OBJ_org         OBJ_iso,3L
-
-#define SN_dod          "DOD"
-#define LN_dod          "dod"
-#define NID_dod         380
-#define OBJ_dod         OBJ_org,6L
-
-#define SN_iana         "IANA"
-#define LN_iana         "iana"
-#define NID_iana                381
-#define OBJ_iana                OBJ_dod,1L
-
-#define OBJ_internet            OBJ_iana
-
-#define SN_Directory            "directory"
-#define LN_Directory            "Directory"
-#define NID_Directory           382
-#define OBJ_Directory           OBJ_internet,1L
-
-#define SN_Management           "mgmt"
-#define LN_Management           "Management"
-#define NID_Management          383
-#define OBJ_Management          OBJ_internet,2L
-
-#define SN_Experimental         "experimental"
-#define LN_Experimental         "Experimental"
-#define NID_Experimental                384
-#define OBJ_Experimental                OBJ_internet,3L
-
-#define SN_Private              "private"
-#define LN_Private              "Private"
-#define NID_Private             385
-#define OBJ_Private             OBJ_internet,4L
-
-#define SN_Security             "security"
-#define LN_Security             "Security"
-#define NID_Security            386
-#define OBJ_Security            OBJ_internet,5L
-
-#define SN_SNMPv2               "snmpv2"
-#define LN_SNMPv2               "SNMPv2"
-#define NID_SNMPv2              387
-#define OBJ_SNMPv2              OBJ_internet,6L
-
-#define LN_Mail         "Mail"
-#define NID_Mail                388
-#define OBJ_Mail                OBJ_internet,7L
-
-#define SN_Enterprises          "enterprises"
-#define LN_Enterprises          "Enterprises"
-#define NID_Enterprises         389
-#define OBJ_Enterprises         OBJ_Private,1L
-
-#define SN_dcObject             "dcobject"
-#define LN_dcObject             "dcObject"
-#define NID_dcObject            390
-#define OBJ_dcObject            OBJ_Enterprises,1466L,344L
-
-#define SN_mime_mhs             "mime-mhs"
-#define LN_mime_mhs             "MIME MHS"
-#define NID_mime_mhs            504
-#define OBJ_mime_mhs            OBJ_Mail,1L
-
-#define SN_mime_mhs_headings            "mime-mhs-headings"
-#define LN_mime_mhs_headings            "mime-mhs-headings"
-#define NID_mime_mhs_headings           505
-#define OBJ_mime_mhs_headings           OBJ_mime_mhs,1L
-
-#define SN_mime_mhs_bodies              "mime-mhs-bodies"
-#define LN_mime_mhs_bodies              "mime-mhs-bodies"
-#define NID_mime_mhs_bodies             506
-#define OBJ_mime_mhs_bodies             OBJ_mime_mhs,2L
-
-#define SN_id_hex_partial_message               "id-hex-partial-message"
-#define LN_id_hex_partial_message               "id-hex-partial-message"
-#define NID_id_hex_partial_message              507
-#define OBJ_id_hex_partial_message              OBJ_mime_mhs_headings,1L
-
-#define SN_id_hex_multipart_message             "id-hex-multipart-message"
-#define LN_id_hex_multipart_message             "id-hex-multipart-message"
-#define NID_id_hex_multipart_message            508
-#define OBJ_id_hex_multipart_message            OBJ_mime_mhs_headings,2L
-
-#define SN_zlib_compression             "ZLIB"
-#define LN_zlib_compression             "zlib compression"
-#define NID_zlib_compression            125
-#define OBJ_zlib_compression            OBJ_id_smime_alg,8L
-
-#define OBJ_csor                2L,16L,840L,1L,101L,3L
-
-#define OBJ_nistAlgorithms              OBJ_csor,4L
-
-#define OBJ_aes         OBJ_nistAlgorithms,1L
-
-#define SN_aes_128_ecb          "AES-128-ECB"
-#define LN_aes_128_ecb          "aes-128-ecb"
-#define NID_aes_128_ecb         418
-#define OBJ_aes_128_ecb         OBJ_aes,1L
-
-#define SN_aes_128_cbc          "AES-128-CBC"
-#define LN_aes_128_cbc          "aes-128-cbc"
-#define NID_aes_128_cbc         419
-#define OBJ_aes_128_cbc         OBJ_aes,2L
-
-#define SN_aes_128_ofb128               "AES-128-OFB"
-#define LN_aes_128_ofb128               "aes-128-ofb"
-#define NID_aes_128_ofb128              420
-#define OBJ_aes_128_ofb128              OBJ_aes,3L
-
-#define SN_aes_128_cfb128               "AES-128-CFB"
-#define LN_aes_128_cfb128               "aes-128-cfb"
-#define NID_aes_128_cfb128              421
-#define OBJ_aes_128_cfb128              OBJ_aes,4L
-
-#define SN_id_aes128_wrap               "id-aes128-wrap"
-#define NID_id_aes128_wrap              788
-#define OBJ_id_aes128_wrap              OBJ_aes,5L
-
-#define SN_aes_128_gcm          "id-aes128-GCM"
-#define LN_aes_128_gcm          "aes-128-gcm"
-#define NID_aes_128_gcm         895
-#define OBJ_aes_128_gcm         OBJ_aes,6L
-
-#define SN_aes_128_ccm          "id-aes128-CCM"
-#define LN_aes_128_ccm          "aes-128-ccm"
-#define NID_aes_128_ccm         896
-#define OBJ_aes_128_ccm         OBJ_aes,7L
-
-#define SN_id_aes128_wrap_pad           "id-aes128-wrap-pad"
-#define NID_id_aes128_wrap_pad          897
-#define OBJ_id_aes128_wrap_pad          OBJ_aes,8L
-
-#define SN_aes_192_ecb          "AES-192-ECB"
-#define LN_aes_192_ecb          "aes-192-ecb"
-#define NID_aes_192_ecb         422
-#define OBJ_aes_192_ecb         OBJ_aes,21L
-
-#define SN_aes_192_cbc          "AES-192-CBC"
-#define LN_aes_192_cbc          "aes-192-cbc"
-#define NID_aes_192_cbc         423
-#define OBJ_aes_192_cbc         OBJ_aes,22L
-
-#define SN_aes_192_ofb128               "AES-192-OFB"
-#define LN_aes_192_ofb128               "aes-192-ofb"
-#define NID_aes_192_ofb128              424
-#define OBJ_aes_192_ofb128              OBJ_aes,23L
-
-#define SN_aes_192_cfb128               "AES-192-CFB"
-#define LN_aes_192_cfb128               "aes-192-cfb"
-#define NID_aes_192_cfb128              425
-#define OBJ_aes_192_cfb128              OBJ_aes,24L
-
-#define SN_id_aes192_wrap               "id-aes192-wrap"
-#define NID_id_aes192_wrap              789
-#define OBJ_id_aes192_wrap              OBJ_aes,25L
-
-#define SN_aes_192_gcm          "id-aes192-GCM"
-#define LN_aes_192_gcm          "aes-192-gcm"
-#define NID_aes_192_gcm         898
-#define OBJ_aes_192_gcm         OBJ_aes,26L
-
-#define SN_aes_192_ccm          "id-aes192-CCM"
-#define LN_aes_192_ccm          "aes-192-ccm"
-#define NID_aes_192_ccm         899
-#define OBJ_aes_192_ccm         OBJ_aes,27L
-
-#define SN_id_aes192_wrap_pad           "id-aes192-wrap-pad"
-#define NID_id_aes192_wrap_pad          900
-#define OBJ_id_aes192_wrap_pad          OBJ_aes,28L
-
-#define SN_aes_256_ecb          "AES-256-ECB"
-#define LN_aes_256_ecb          "aes-256-ecb"
-#define NID_aes_256_ecb         426
-#define OBJ_aes_256_ecb         OBJ_aes,41L
-
-#define SN_aes_256_cbc          "AES-256-CBC"
-#define LN_aes_256_cbc          "aes-256-cbc"
-#define NID_aes_256_cbc         427
-#define OBJ_aes_256_cbc         OBJ_aes,42L
-
-#define SN_aes_256_ofb128               "AES-256-OFB"
-#define LN_aes_256_ofb128               "aes-256-ofb"
-#define NID_aes_256_ofb128              428
-#define OBJ_aes_256_ofb128              OBJ_aes,43L
-
-#define SN_aes_256_cfb128               "AES-256-CFB"
-#define LN_aes_256_cfb128               "aes-256-cfb"
-#define NID_aes_256_cfb128              429
-#define OBJ_aes_256_cfb128              OBJ_aes,44L
-
-#define SN_id_aes256_wrap               "id-aes256-wrap"
-#define NID_id_aes256_wrap              790
-#define OBJ_id_aes256_wrap              OBJ_aes,45L
-
-#define SN_aes_256_gcm          "id-aes256-GCM"
-#define LN_aes_256_gcm          "aes-256-gcm"
-#define NID_aes_256_gcm         901
-#define OBJ_aes_256_gcm         OBJ_aes,46L
-
-#define SN_aes_256_ccm          "id-aes256-CCM"
-#define LN_aes_256_ccm          "aes-256-ccm"
-#define NID_aes_256_ccm         902
-#define OBJ_aes_256_ccm         OBJ_aes,47L
-
-#define SN_id_aes256_wrap_pad           "id-aes256-wrap-pad"
-#define NID_id_aes256_wrap_pad          903
-#define OBJ_id_aes256_wrap_pad          OBJ_aes,48L
-
-#define SN_aes_128_cfb1         "AES-128-CFB1"
-#define LN_aes_128_cfb1         "aes-128-cfb1"
-#define NID_aes_128_cfb1                650
-
-#define SN_aes_192_cfb1         "AES-192-CFB1"
-#define LN_aes_192_cfb1         "aes-192-cfb1"
-#define NID_aes_192_cfb1                651
-
-#define SN_aes_256_cfb1         "AES-256-CFB1"
-#define LN_aes_256_cfb1         "aes-256-cfb1"
-#define NID_aes_256_cfb1                652
-
-#define SN_aes_128_cfb8         "AES-128-CFB8"
-#define LN_aes_128_cfb8         "aes-128-cfb8"
-#define NID_aes_128_cfb8                653
-
-#define SN_aes_192_cfb8         "AES-192-CFB8"
-#define LN_aes_192_cfb8         "aes-192-cfb8"
-#define NID_aes_192_cfb8                654
-
-#define SN_aes_256_cfb8         "AES-256-CFB8"
-#define LN_aes_256_cfb8         "aes-256-cfb8"
-#define NID_aes_256_cfb8                655
-
-#define SN_aes_128_ctr          "AES-128-CTR"
-#define LN_aes_128_ctr          "aes-128-ctr"
-#define NID_aes_128_ctr         904
-
-#define SN_aes_192_ctr          "AES-192-CTR"
-#define LN_aes_192_ctr          "aes-192-ctr"
-#define NID_aes_192_ctr         905
-
-#define SN_aes_256_ctr          "AES-256-CTR"
-#define LN_aes_256_ctr          "aes-256-ctr"
-#define NID_aes_256_ctr         906
-
-#define SN_aes_128_ocb          "AES-128-OCB"
-#define LN_aes_128_ocb          "aes-128-ocb"
-#define NID_aes_128_ocb         958
-
-#define SN_aes_192_ocb          "AES-192-OCB"
-#define LN_aes_192_ocb          "aes-192-ocb"
-#define NID_aes_192_ocb         959
-
-#define SN_aes_256_ocb          "AES-256-OCB"
-#define LN_aes_256_ocb          "aes-256-ocb"
-#define NID_aes_256_ocb         960
-
-#define SN_aes_128_xts          "AES-128-XTS"
-#define LN_aes_128_xts          "aes-128-xts"
-#define NID_aes_128_xts         913
-
-#define SN_aes_256_xts          "AES-256-XTS"
-#define LN_aes_256_xts          "aes-256-xts"
-#define NID_aes_256_xts         914
-
-#define SN_des_cfb1             "DES-CFB1"
-#define LN_des_cfb1             "des-cfb1"
-#define NID_des_cfb1            656
-
-#define SN_des_cfb8             "DES-CFB8"
-#define LN_des_cfb8             "des-cfb8"
-#define NID_des_cfb8            657
-
-#define SN_des_ede3_cfb1                "DES-EDE3-CFB1"
-#define LN_des_ede3_cfb1                "des-ede3-cfb1"
-#define NID_des_ede3_cfb1               658
-
-#define SN_des_ede3_cfb8                "DES-EDE3-CFB8"
-#define LN_des_ede3_cfb8                "des-ede3-cfb8"
-#define NID_des_ede3_cfb8               659
-
-#define OBJ_nist_hashalgs               OBJ_nistAlgorithms,2L
-
-#define SN_sha256               "SHA256"
-#define LN_sha256               "sha256"
-#define NID_sha256              672
-#define OBJ_sha256              OBJ_nist_hashalgs,1L
-
-#define SN_sha384               "SHA384"
-#define LN_sha384               "sha384"
-#define NID_sha384              673
-#define OBJ_sha384              OBJ_nist_hashalgs,2L
-
-#define SN_sha512               "SHA512"
-#define LN_sha512               "sha512"
-#define NID_sha512              674
-#define OBJ_sha512              OBJ_nist_hashalgs,3L
-
-#define SN_sha224               "SHA224"
-#define LN_sha224               "sha224"
-#define NID_sha224              675
-#define OBJ_sha224              OBJ_nist_hashalgs,4L
-
-#define OBJ_dsa_with_sha2               OBJ_nistAlgorithms,3L
-
-#define SN_dsa_with_SHA224              "dsa_with_SHA224"
-#define NID_dsa_with_SHA224             802
-#define OBJ_dsa_with_SHA224             OBJ_dsa_with_sha2,1L
-
-#define SN_dsa_with_SHA256              "dsa_with_SHA256"
-#define NID_dsa_with_SHA256             803
-#define OBJ_dsa_with_SHA256             OBJ_dsa_with_sha2,2L
-
-#define SN_hold_instruction_code                "holdInstructionCode"
-#define LN_hold_instruction_code                "Hold Instruction Code"
-#define NID_hold_instruction_code               430
-#define OBJ_hold_instruction_code               OBJ_id_ce,23L
-
-#define OBJ_holdInstruction             OBJ_X9_57,2L
-
-#define SN_hold_instruction_none                "holdInstructionNone"
-#define LN_hold_instruction_none                "Hold Instruction None"
-#define NID_hold_instruction_none               431
-#define OBJ_hold_instruction_none               OBJ_holdInstruction,1L
-
-#define SN_hold_instruction_call_issuer         "holdInstructionCallIssuer"
-#define LN_hold_instruction_call_issuer         "Hold Instruction Call Issuer"
-#define NID_hold_instruction_call_issuer                432
-#define OBJ_hold_instruction_call_issuer                OBJ_holdInstruction,2L
-
-#define SN_hold_instruction_reject              "holdInstructionReject"
-#define LN_hold_instruction_reject              "Hold Instruction Reject"
-#define NID_hold_instruction_reject             433
-#define OBJ_hold_instruction_reject             OBJ_holdInstruction,3L
-
-#define SN_data         "data"
-#define NID_data                434
-#define OBJ_data                OBJ_itu_t,9L
-
-#define SN_pss          "pss"
-#define NID_pss         435
-#define OBJ_pss         OBJ_data,2342L
-
-#define SN_ucl          "ucl"
-#define NID_ucl         436
-#define OBJ_ucl         OBJ_pss,19200300L
-
-#define SN_pilot                "pilot"
-#define NID_pilot               437
-#define OBJ_pilot               OBJ_ucl,100L
-
-#define LN_pilotAttributeType           "pilotAttributeType"
-#define NID_pilotAttributeType          438
-#define OBJ_pilotAttributeType          OBJ_pilot,1L
-
-#define LN_pilotAttributeSyntax         "pilotAttributeSyntax"
-#define NID_pilotAttributeSyntax                439
-#define OBJ_pilotAttributeSyntax                OBJ_pilot,3L
-
-#define LN_pilotObjectClass             "pilotObjectClass"
-#define NID_pilotObjectClass            440
-#define OBJ_pilotObjectClass            OBJ_pilot,4L
-
-#define LN_pilotGroups          "pilotGroups"
-#define NID_pilotGroups         441
-#define OBJ_pilotGroups         OBJ_pilot,10L
-
-#define LN_iA5StringSyntax              "iA5StringSyntax"
-#define NID_iA5StringSyntax             442
-#define OBJ_iA5StringSyntax             OBJ_pilotAttributeSyntax,4L
-
-#define LN_caseIgnoreIA5StringSyntax            "caseIgnoreIA5StringSyntax"
-#define NID_caseIgnoreIA5StringSyntax           443
-#define OBJ_caseIgnoreIA5StringSyntax           OBJ_pilotAttributeSyntax,5L
-
-#define LN_pilotObject          "pilotObject"
-#define NID_pilotObject         444
-#define OBJ_pilotObject         OBJ_pilotObjectClass,3L
-
-#define LN_pilotPerson          "pilotPerson"
-#define NID_pilotPerson         445
-#define OBJ_pilotPerson         OBJ_pilotObjectClass,4L
-
-#define SN_account              "account"
-#define NID_account             446
-#define OBJ_account             OBJ_pilotObjectClass,5L
-
-#define SN_document             "document"
-#define NID_document            447
-#define OBJ_document            OBJ_pilotObjectClass,6L
-
-#define SN_room         "room"
-#define NID_room                448
-#define OBJ_room                OBJ_pilotObjectClass,7L
-
-#define LN_documentSeries               "documentSeries"
-#define NID_documentSeries              449
-#define OBJ_documentSeries              OBJ_pilotObjectClass,9L
-
-#define SN_Domain               "domain"
-#define LN_Domain               "Domain"
-#define NID_Domain              392
-#define OBJ_Domain              OBJ_pilotObjectClass,13L
-
-#define LN_rFC822localPart              "rFC822localPart"
-#define NID_rFC822localPart             450
-#define OBJ_rFC822localPart             OBJ_pilotObjectClass,14L
-
-#define LN_dNSDomain            "dNSDomain"
-#define NID_dNSDomain           451
-#define OBJ_dNSDomain           OBJ_pilotObjectClass,15L
-
-#define LN_domainRelatedObject          "domainRelatedObject"
-#define NID_domainRelatedObject         452
-#define OBJ_domainRelatedObject         OBJ_pilotObjectClass,17L
-
-#define LN_friendlyCountry              "friendlyCountry"
-#define NID_friendlyCountry             453
-#define OBJ_friendlyCountry             OBJ_pilotObjectClass,18L
-
-#define LN_simpleSecurityObject         "simpleSecurityObject"
-#define NID_simpleSecurityObject                454
-#define OBJ_simpleSecurityObject                OBJ_pilotObjectClass,19L
-
-#define LN_pilotOrganization            "pilotOrganization"
-#define NID_pilotOrganization           455
-#define OBJ_pilotOrganization           OBJ_pilotObjectClass,20L
-
-#define LN_pilotDSA             "pilotDSA"
-#define NID_pilotDSA            456
-#define OBJ_pilotDSA            OBJ_pilotObjectClass,21L
-
-#define LN_qualityLabelledData          "qualityLabelledData"
-#define NID_qualityLabelledData         457
-#define OBJ_qualityLabelledData         OBJ_pilotObjectClass,22L
-
-#define SN_userId               "UID"
-#define LN_userId               "userId"
-#define NID_userId              458
-#define OBJ_userId              OBJ_pilotAttributeType,1L
-
-#define LN_textEncodedORAddress         "textEncodedORAddress"
-#define NID_textEncodedORAddress                459
-#define OBJ_textEncodedORAddress                OBJ_pilotAttributeType,2L
-
-#define SN_rfc822Mailbox                "mail"
-#define LN_rfc822Mailbox                "rfc822Mailbox"
-#define NID_rfc822Mailbox               460
-#define OBJ_rfc822Mailbox               OBJ_pilotAttributeType,3L
-
-#define SN_info         "info"
-#define NID_info                461
-#define OBJ_info                OBJ_pilotAttributeType,4L
-
-#define LN_favouriteDrink               "favouriteDrink"
-#define NID_favouriteDrink              462
-#define OBJ_favouriteDrink              OBJ_pilotAttributeType,5L
-
-#define LN_roomNumber           "roomNumber"
-#define NID_roomNumber          463
-#define OBJ_roomNumber          OBJ_pilotAttributeType,6L
-
-#define SN_photo                "photo"
-#define NID_photo               464
-#define OBJ_photo               OBJ_pilotAttributeType,7L
-
-#define LN_userClass            "userClass"
-#define NID_userClass           465
-#define OBJ_userClass           OBJ_pilotAttributeType,8L
-
-#define SN_host         "host"
-#define NID_host                466
-#define OBJ_host                OBJ_pilotAttributeType,9L
-
-#define SN_manager              "manager"
-#define NID_manager             467
-#define OBJ_manager             OBJ_pilotAttributeType,10L
-
-#define LN_documentIdentifier           "documentIdentifier"
-#define NID_documentIdentifier          468
-#define OBJ_documentIdentifier          OBJ_pilotAttributeType,11L
-
-#define LN_documentTitle                "documentTitle"
-#define NID_documentTitle               469
-#define OBJ_documentTitle               OBJ_pilotAttributeType,12L
-
-#define LN_documentVersion              "documentVersion"
-#define NID_documentVersion             470
-#define OBJ_documentVersion             OBJ_pilotAttributeType,13L
-
-#define LN_documentAuthor               "documentAuthor"
-#define NID_documentAuthor              471
-#define OBJ_documentAuthor              OBJ_pilotAttributeType,14L
-
-#define LN_documentLocation             "documentLocation"
-#define NID_documentLocation            472
-#define OBJ_documentLocation            OBJ_pilotAttributeType,15L
-
-#define LN_homeTelephoneNumber          "homeTelephoneNumber"
-#define NID_homeTelephoneNumber         473
-#define OBJ_homeTelephoneNumber         OBJ_pilotAttributeType,20L
-
-#define SN_secretary            "secretary"
-#define NID_secretary           474
-#define OBJ_secretary           OBJ_pilotAttributeType,21L
-
-#define LN_otherMailbox         "otherMailbox"
-#define NID_otherMailbox                475
-#define OBJ_otherMailbox                OBJ_pilotAttributeType,22L
-
-#define LN_lastModifiedTime             "lastModifiedTime"
-#define NID_lastModifiedTime            476
-#define OBJ_lastModifiedTime            OBJ_pilotAttributeType,23L
-
-#define LN_lastModifiedBy               "lastModifiedBy"
-#define NID_lastModifiedBy              477
-#define OBJ_lastModifiedBy              OBJ_pilotAttributeType,24L
-
-#define SN_domainComponent              "DC"
-#define LN_domainComponent              "domainComponent"
-#define NID_domainComponent             391
-#define OBJ_domainComponent             OBJ_pilotAttributeType,25L
-
-#define LN_aRecord              "aRecord"
-#define NID_aRecord             478
-#define OBJ_aRecord             OBJ_pilotAttributeType,26L
-
-#define LN_pilotAttributeType27         "pilotAttributeType27"
-#define NID_pilotAttributeType27                479
-#define OBJ_pilotAttributeType27                OBJ_pilotAttributeType,27L
-
-#define LN_mXRecord             "mXRecord"
-#define NID_mXRecord            480
-#define OBJ_mXRecord            OBJ_pilotAttributeType,28L
-
-#define LN_nSRecord             "nSRecord"
-#define NID_nSRecord            481
-#define OBJ_nSRecord            OBJ_pilotAttributeType,29L
-
-#define LN_sOARecord            "sOARecord"
-#define NID_sOARecord           482
-#define OBJ_sOARecord           OBJ_pilotAttributeType,30L
-
-#define LN_cNAMERecord          "cNAMERecord"
-#define NID_cNAMERecord         483
-#define OBJ_cNAMERecord         OBJ_pilotAttributeType,31L
-
-#define LN_associatedDomain             "associatedDomain"
-#define NID_associatedDomain            484
-#define OBJ_associatedDomain            OBJ_pilotAttributeType,37L
-
-#define LN_associatedName               "associatedName"
-#define NID_associatedName              485
-#define OBJ_associatedName              OBJ_pilotAttributeType,38L
-
-#define LN_homePostalAddress            "homePostalAddress"
-#define NID_homePostalAddress           486
-#define OBJ_homePostalAddress           OBJ_pilotAttributeType,39L
-
-#define LN_personalTitle                "personalTitle"
-#define NID_personalTitle               487
-#define OBJ_personalTitle               OBJ_pilotAttributeType,40L
-
-#define LN_mobileTelephoneNumber                "mobileTelephoneNumber"
-#define NID_mobileTelephoneNumber               488
-#define OBJ_mobileTelephoneNumber               OBJ_pilotAttributeType,41L
-
-#define LN_pagerTelephoneNumber         "pagerTelephoneNumber"
-#define NID_pagerTelephoneNumber                489
-#define OBJ_pagerTelephoneNumber                OBJ_pilotAttributeType,42L
-
-#define LN_friendlyCountryName          "friendlyCountryName"
-#define NID_friendlyCountryName         490
-#define OBJ_friendlyCountryName         OBJ_pilotAttributeType,43L
-
-#define SN_uniqueIdentifier             "uid"
-#define LN_uniqueIdentifier             "uniqueIdentifier"
-#define NID_uniqueIdentifier            102
-#define OBJ_uniqueIdentifier            OBJ_pilotAttributeType,44L
-
-#define LN_organizationalStatus         "organizationalStatus"
-#define NID_organizationalStatus                491
-#define OBJ_organizationalStatus                OBJ_pilotAttributeType,45L
-
-#define LN_janetMailbox         "janetMailbox"
-#define NID_janetMailbox                492
-#define OBJ_janetMailbox                OBJ_pilotAttributeType,46L
-
-#define LN_mailPreferenceOption         "mailPreferenceOption"
-#define NID_mailPreferenceOption                493
-#define OBJ_mailPreferenceOption                OBJ_pilotAttributeType,47L
-
-#define LN_buildingName         "buildingName"
-#define NID_buildingName                494
-#define OBJ_buildingName                OBJ_pilotAttributeType,48L
-
-#define LN_dSAQuality           "dSAQuality"
-#define NID_dSAQuality          495
-#define OBJ_dSAQuality          OBJ_pilotAttributeType,49L
-
-#define LN_singleLevelQuality           "singleLevelQuality"
-#define NID_singleLevelQuality          496
-#define OBJ_singleLevelQuality          OBJ_pilotAttributeType,50L
-
-#define LN_subtreeMinimumQuality                "subtreeMinimumQuality"
-#define NID_subtreeMinimumQuality               497
-#define OBJ_subtreeMinimumQuality               OBJ_pilotAttributeType,51L
-
-#define LN_subtreeMaximumQuality                "subtreeMaximumQuality"
-#define NID_subtreeMaximumQuality               498
-#define OBJ_subtreeMaximumQuality               OBJ_pilotAttributeType,52L
-
-#define LN_personalSignature            "personalSignature"
-#define NID_personalSignature           499
-#define OBJ_personalSignature           OBJ_pilotAttributeType,53L
-
-#define LN_dITRedirect          "dITRedirect"
-#define NID_dITRedirect         500
-#define OBJ_dITRedirect         OBJ_pilotAttributeType,54L
-
-#define SN_audio                "audio"
-#define NID_audio               501
-#define OBJ_audio               OBJ_pilotAttributeType,55L
-
-#define LN_documentPublisher            "documentPublisher"
-#define NID_documentPublisher           502
-#define OBJ_documentPublisher           OBJ_pilotAttributeType,56L
-
-#define SN_id_set               "id-set"
-#define LN_id_set               "Secure Electronic Transactions"
-#define NID_id_set              512
-#define OBJ_id_set              OBJ_international_organizations,42L
-
-#define SN_set_ctype            "set-ctype"
-#define LN_set_ctype            "content types"
-#define NID_set_ctype           513
-#define OBJ_set_ctype           OBJ_id_set,0L
-
-#define SN_set_msgExt           "set-msgExt"
-#define LN_set_msgExt           "message extensions"
-#define NID_set_msgExt          514
-#define OBJ_set_msgExt          OBJ_id_set,1L
-
-#define SN_set_attr             "set-attr"
-#define NID_set_attr            515
-#define OBJ_set_attr            OBJ_id_set,3L
-
-#define SN_set_policy           "set-policy"
-#define NID_set_policy          516
-#define OBJ_set_policy          OBJ_id_set,5L
-
-#define SN_set_certExt          "set-certExt"
-#define LN_set_certExt          "certificate extensions"
-#define NID_set_certExt         517
-#define OBJ_set_certExt         OBJ_id_set,7L
-
-#define SN_set_brand            "set-brand"
-#define NID_set_brand           518
-#define OBJ_set_brand           OBJ_id_set,8L
-
-#define SN_setct_PANData                "setct-PANData"
-#define NID_setct_PANData               519
-#define OBJ_setct_PANData               OBJ_set_ctype,0L
-
-#define SN_setct_PANToken               "setct-PANToken"
-#define NID_setct_PANToken              520
-#define OBJ_setct_PANToken              OBJ_set_ctype,1L
-
-#define SN_setct_PANOnly                "setct-PANOnly"
-#define NID_setct_PANOnly               521
-#define OBJ_setct_PANOnly               OBJ_set_ctype,2L
-
-#define SN_setct_OIData         "setct-OIData"
-#define NID_setct_OIData                522
-#define OBJ_setct_OIData                OBJ_set_ctype,3L
-
-#define SN_setct_PI             "setct-PI"
-#define NID_setct_PI            523
-#define OBJ_setct_PI            OBJ_set_ctype,4L
-
-#define SN_setct_PIData         "setct-PIData"
-#define NID_setct_PIData                524
-#define OBJ_setct_PIData                OBJ_set_ctype,5L
-
-#define SN_setct_PIDataUnsigned         "setct-PIDataUnsigned"
-#define NID_setct_PIDataUnsigned                525
-#define OBJ_setct_PIDataUnsigned                OBJ_set_ctype,6L
-
-#define SN_setct_HODInput               "setct-HODInput"
-#define NID_setct_HODInput              526
-#define OBJ_setct_HODInput              OBJ_set_ctype,7L
-
-#define SN_setct_AuthResBaggage         "setct-AuthResBaggage"
-#define NID_setct_AuthResBaggage                527
-#define OBJ_setct_AuthResBaggage                OBJ_set_ctype,8L
-
-#define SN_setct_AuthRevReqBaggage              "setct-AuthRevReqBaggage"
-#define NID_setct_AuthRevReqBaggage             528
-#define OBJ_setct_AuthRevReqBaggage             OBJ_set_ctype,9L
-
-#define SN_setct_AuthRevResBaggage              "setct-AuthRevResBaggage"
-#define NID_setct_AuthRevResBaggage             529
-#define OBJ_setct_AuthRevResBaggage             OBJ_set_ctype,10L
-
-#define SN_setct_CapTokenSeq            "setct-CapTokenSeq"
-#define NID_setct_CapTokenSeq           530
-#define OBJ_setct_CapTokenSeq           OBJ_set_ctype,11L
-
-#define SN_setct_PInitResData           "setct-PInitResData"
-#define NID_setct_PInitResData          531
-#define OBJ_setct_PInitResData          OBJ_set_ctype,12L
-
-#define SN_setct_PI_TBS         "setct-PI-TBS"
-#define NID_setct_PI_TBS                532
-#define OBJ_setct_PI_TBS                OBJ_set_ctype,13L
-
-#define SN_setct_PResData               "setct-PResData"
-#define NID_setct_PResData              533
-#define OBJ_setct_PResData              OBJ_set_ctype,14L
-
-#define SN_setct_AuthReqTBS             "setct-AuthReqTBS"
-#define NID_setct_AuthReqTBS            534
-#define OBJ_setct_AuthReqTBS            OBJ_set_ctype,16L
-
-#define SN_setct_AuthResTBS             "setct-AuthResTBS"
-#define NID_setct_AuthResTBS            535
-#define OBJ_setct_AuthResTBS            OBJ_set_ctype,17L
-
-#define SN_setct_AuthResTBSX            "setct-AuthResTBSX"
-#define NID_setct_AuthResTBSX           536
-#define OBJ_setct_AuthResTBSX           OBJ_set_ctype,18L
-
-#define SN_setct_AuthTokenTBS           "setct-AuthTokenTBS"
-#define NID_setct_AuthTokenTBS          537
-#define OBJ_setct_AuthTokenTBS          OBJ_set_ctype,19L
-
-#define SN_setct_CapTokenData           "setct-CapTokenData"
-#define NID_setct_CapTokenData          538
-#define OBJ_setct_CapTokenData          OBJ_set_ctype,20L
-
-#define SN_setct_CapTokenTBS            "setct-CapTokenTBS"
-#define NID_setct_CapTokenTBS           539
-#define OBJ_setct_CapTokenTBS           OBJ_set_ctype,21L
-
-#define SN_setct_AcqCardCodeMsg         "setct-AcqCardCodeMsg"
-#define NID_setct_AcqCardCodeMsg                540
-#define OBJ_setct_AcqCardCodeMsg                OBJ_set_ctype,22L
-
-#define SN_setct_AuthRevReqTBS          "setct-AuthRevReqTBS"
-#define NID_setct_AuthRevReqTBS         541
-#define OBJ_setct_AuthRevReqTBS         OBJ_set_ctype,23L
-
-#define SN_setct_AuthRevResData         "setct-AuthRevResData"
-#define NID_setct_AuthRevResData                542
-#define OBJ_setct_AuthRevResData                OBJ_set_ctype,24L
-
-#define SN_setct_AuthRevResTBS          "setct-AuthRevResTBS"
-#define NID_setct_AuthRevResTBS         543
-#define OBJ_setct_AuthRevResTBS         OBJ_set_ctype,25L
-
-#define SN_setct_CapReqTBS              "setct-CapReqTBS"
-#define NID_setct_CapReqTBS             544
-#define OBJ_setct_CapReqTBS             OBJ_set_ctype,26L
-
-#define SN_setct_CapReqTBSX             "setct-CapReqTBSX"
-#define NID_setct_CapReqTBSX            545
-#define OBJ_setct_CapReqTBSX            OBJ_set_ctype,27L
-
-#define SN_setct_CapResData             "setct-CapResData"
-#define NID_setct_CapResData            546
-#define OBJ_setct_CapResData            OBJ_set_ctype,28L
-
-#define SN_setct_CapRevReqTBS           "setct-CapRevReqTBS"
-#define NID_setct_CapRevReqTBS          547
-#define OBJ_setct_CapRevReqTBS          OBJ_set_ctype,29L
-
-#define SN_setct_CapRevReqTBSX          "setct-CapRevReqTBSX"
-#define NID_setct_CapRevReqTBSX         548
-#define OBJ_setct_CapRevReqTBSX         OBJ_set_ctype,30L
-
-#define SN_setct_CapRevResData          "setct-CapRevResData"
-#define NID_setct_CapRevResData         549
-#define OBJ_setct_CapRevResData         OBJ_set_ctype,31L
-
-#define SN_setct_CredReqTBS             "setct-CredReqTBS"
-#define NID_setct_CredReqTBS            550
-#define OBJ_setct_CredReqTBS            OBJ_set_ctype,32L
-
-#define SN_setct_CredReqTBSX            "setct-CredReqTBSX"
-#define NID_setct_CredReqTBSX           551
-#define OBJ_setct_CredReqTBSX           OBJ_set_ctype,33L
-
-#define SN_setct_CredResData            "setct-CredResData"
-#define NID_setct_CredResData           552
-#define OBJ_setct_CredResData           OBJ_set_ctype,34L
-
-#define SN_setct_CredRevReqTBS          "setct-CredRevReqTBS"
-#define NID_setct_CredRevReqTBS         553
-#define OBJ_setct_CredRevReqTBS         OBJ_set_ctype,35L
-
-#define SN_setct_CredRevReqTBSX         "setct-CredRevReqTBSX"
-#define NID_setct_CredRevReqTBSX                554
-#define OBJ_setct_CredRevReqTBSX                OBJ_set_ctype,36L
-
-#define SN_setct_CredRevResData         "setct-CredRevResData"
-#define NID_setct_CredRevResData                555
-#define OBJ_setct_CredRevResData                OBJ_set_ctype,37L
-
-#define SN_setct_PCertReqData           "setct-PCertReqData"
-#define NID_setct_PCertReqData          556
-#define OBJ_setct_PCertReqData          OBJ_set_ctype,38L
-
-#define SN_setct_PCertResTBS            "setct-PCertResTBS"
-#define NID_setct_PCertResTBS           557
-#define OBJ_setct_PCertResTBS           OBJ_set_ctype,39L
-
-#define SN_setct_BatchAdminReqData              "setct-BatchAdminReqData"
-#define NID_setct_BatchAdminReqData             558
-#define OBJ_setct_BatchAdminReqData             OBJ_set_ctype,40L
-
-#define SN_setct_BatchAdminResData              "setct-BatchAdminResData"
-#define NID_setct_BatchAdminResData             559
-#define OBJ_setct_BatchAdminResData             OBJ_set_ctype,41L
-
-#define SN_setct_CardCInitResTBS                "setct-CardCInitResTBS"
-#define NID_setct_CardCInitResTBS               560
-#define OBJ_setct_CardCInitResTBS               OBJ_set_ctype,42L
-
-#define SN_setct_MeAqCInitResTBS                "setct-MeAqCInitResTBS"
-#define NID_setct_MeAqCInitResTBS               561
-#define OBJ_setct_MeAqCInitResTBS               OBJ_set_ctype,43L
-
-#define SN_setct_RegFormResTBS          "setct-RegFormResTBS"
-#define NID_setct_RegFormResTBS         562
-#define OBJ_setct_RegFormResTBS         OBJ_set_ctype,44L
-
-#define SN_setct_CertReqData            "setct-CertReqData"
-#define NID_setct_CertReqData           563
-#define OBJ_setct_CertReqData           OBJ_set_ctype,45L
-
-#define SN_setct_CertReqTBS             "setct-CertReqTBS"
-#define NID_setct_CertReqTBS            564
-#define OBJ_setct_CertReqTBS            OBJ_set_ctype,46L
-
-#define SN_setct_CertResData            "setct-CertResData"
-#define NID_setct_CertResData           565
-#define OBJ_setct_CertResData           OBJ_set_ctype,47L
-
-#define SN_setct_CertInqReqTBS          "setct-CertInqReqTBS"
-#define NID_setct_CertInqReqTBS         566
-#define OBJ_setct_CertInqReqTBS         OBJ_set_ctype,48L
-
-#define SN_setct_ErrorTBS               "setct-ErrorTBS"
-#define NID_setct_ErrorTBS              567
-#define OBJ_setct_ErrorTBS              OBJ_set_ctype,49L
-
-#define SN_setct_PIDualSignedTBE                "setct-PIDualSignedTBE"
-#define NID_setct_PIDualSignedTBE               568
-#define OBJ_setct_PIDualSignedTBE               OBJ_set_ctype,50L
-
-#define SN_setct_PIUnsignedTBE          "setct-PIUnsignedTBE"
-#define NID_setct_PIUnsignedTBE         569
-#define OBJ_setct_PIUnsignedTBE         OBJ_set_ctype,51L
-
-#define SN_setct_AuthReqTBE             "setct-AuthReqTBE"
-#define NID_setct_AuthReqTBE            570
-#define OBJ_setct_AuthReqTBE            OBJ_set_ctype,52L
-
-#define SN_setct_AuthResTBE             "setct-AuthResTBE"
-#define NID_setct_AuthResTBE            571
-#define OBJ_setct_AuthResTBE            OBJ_set_ctype,53L
-
-#define SN_setct_AuthResTBEX            "setct-AuthResTBEX"
-#define NID_setct_AuthResTBEX           572
-#define OBJ_setct_AuthResTBEX           OBJ_set_ctype,54L
-
-#define SN_setct_AuthTokenTBE           "setct-AuthTokenTBE"
-#define NID_setct_AuthTokenTBE          573
-#define OBJ_setct_AuthTokenTBE          OBJ_set_ctype,55L
-
-#define SN_setct_CapTokenTBE            "setct-CapTokenTBE"
-#define NID_setct_CapTokenTBE           574
-#define OBJ_setct_CapTokenTBE           OBJ_set_ctype,56L
-
-#define SN_setct_CapTokenTBEX           "setct-CapTokenTBEX"
-#define NID_setct_CapTokenTBEX          575
-#define OBJ_setct_CapTokenTBEX          OBJ_set_ctype,57L
-
-#define SN_setct_AcqCardCodeMsgTBE              "setct-AcqCardCodeMsgTBE"
-#define NID_setct_AcqCardCodeMsgTBE             576
-#define OBJ_setct_AcqCardCodeMsgTBE             OBJ_set_ctype,58L
-
-#define SN_setct_AuthRevReqTBE          "setct-AuthRevReqTBE"
-#define NID_setct_AuthRevReqTBE         577
-#define OBJ_setct_AuthRevReqTBE         OBJ_set_ctype,59L
-
-#define SN_setct_AuthRevResTBE          "setct-AuthRevResTBE"
-#define NID_setct_AuthRevResTBE         578
-#define OBJ_setct_AuthRevResTBE         OBJ_set_ctype,60L
-
-#define SN_setct_AuthRevResTBEB         "setct-AuthRevResTBEB"
-#define NID_setct_AuthRevResTBEB                579
-#define OBJ_setct_AuthRevResTBEB                OBJ_set_ctype,61L
-
-#define SN_setct_CapReqTBE              "setct-CapReqTBE"
-#define NID_setct_CapReqTBE             580
-#define OBJ_setct_CapReqTBE             OBJ_set_ctype,62L
-
-#define SN_setct_CapReqTBEX             "setct-CapReqTBEX"
-#define NID_setct_CapReqTBEX            581
-#define OBJ_setct_CapReqTBEX            OBJ_set_ctype,63L
-
-#define SN_setct_CapResTBE              "setct-CapResTBE"
-#define NID_setct_CapResTBE             582
-#define OBJ_setct_CapResTBE             OBJ_set_ctype,64L
-
-#define SN_setct_CapRevReqTBE           "setct-CapRevReqTBE"
-#define NID_setct_CapRevReqTBE          583
-#define OBJ_setct_CapRevReqTBE          OBJ_set_ctype,65L
-
-#define SN_setct_CapRevReqTBEX          "setct-CapRevReqTBEX"
-#define NID_setct_CapRevReqTBEX         584
-#define OBJ_setct_CapRevReqTBEX         OBJ_set_ctype,66L
-
-#define SN_setct_CapRevResTBE           "setct-CapRevResTBE"
-#define NID_setct_CapRevResTBE          585
-#define OBJ_setct_CapRevResTBE          OBJ_set_ctype,67L
-
-#define SN_setct_CredReqTBE             "setct-CredReqTBE"
-#define NID_setct_CredReqTBE            586
-#define OBJ_setct_CredReqTBE            OBJ_set_ctype,68L
-
-#define SN_setct_CredReqTBEX            "setct-CredReqTBEX"
-#define NID_setct_CredReqTBEX           587
-#define OBJ_setct_CredReqTBEX           OBJ_set_ctype,69L
-
-#define SN_setct_CredResTBE             "setct-CredResTBE"
-#define NID_setct_CredResTBE            588
-#define OBJ_setct_CredResTBE            OBJ_set_ctype,70L
-
-#define SN_setct_CredRevReqTBE          "setct-CredRevReqTBE"
-#define NID_setct_CredRevReqTBE         589
-#define OBJ_setct_CredRevReqTBE         OBJ_set_ctype,71L
-
-#define SN_setct_CredRevReqTBEX         "setct-CredRevReqTBEX"
-#define NID_setct_CredRevReqTBEX                590
-#define OBJ_setct_CredRevReqTBEX                OBJ_set_ctype,72L
-
-#define SN_setct_CredRevResTBE          "setct-CredRevResTBE"
-#define NID_setct_CredRevResTBE         591
-#define OBJ_setct_CredRevResTBE         OBJ_set_ctype,73L
-
-#define SN_setct_BatchAdminReqTBE               "setct-BatchAdminReqTBE"
-#define NID_setct_BatchAdminReqTBE              592
-#define OBJ_setct_BatchAdminReqTBE              OBJ_set_ctype,74L
-
-#define SN_setct_BatchAdminResTBE               "setct-BatchAdminResTBE"
-#define NID_setct_BatchAdminResTBE              593
-#define OBJ_setct_BatchAdminResTBE              OBJ_set_ctype,75L
-
-#define SN_setct_RegFormReqTBE          "setct-RegFormReqTBE"
-#define NID_setct_RegFormReqTBE         594
-#define OBJ_setct_RegFormReqTBE         OBJ_set_ctype,76L
-
-#define SN_setct_CertReqTBE             "setct-CertReqTBE"
-#define NID_setct_CertReqTBE            595
-#define OBJ_setct_CertReqTBE            OBJ_set_ctype,77L
-
-#define SN_setct_CertReqTBEX            "setct-CertReqTBEX"
-#define NID_setct_CertReqTBEX           596
-#define OBJ_setct_CertReqTBEX           OBJ_set_ctype,78L
-
-#define SN_setct_CertResTBE             "setct-CertResTBE"
-#define NID_setct_CertResTBE            597
-#define OBJ_setct_CertResTBE            OBJ_set_ctype,79L
-
-#define SN_setct_CRLNotificationTBS             "setct-CRLNotificationTBS"
-#define NID_setct_CRLNotificationTBS            598
-#define OBJ_setct_CRLNotificationTBS            OBJ_set_ctype,80L
-
-#define SN_setct_CRLNotificationResTBS          "setct-CRLNotificationResTBS"
-#define NID_setct_CRLNotificationResTBS         599
-#define OBJ_setct_CRLNotificationResTBS         OBJ_set_ctype,81L
-
-#define SN_setct_BCIDistributionTBS             "setct-BCIDistributionTBS"
-#define NID_setct_BCIDistributionTBS            600
-#define OBJ_setct_BCIDistributionTBS            OBJ_set_ctype,82L
-
-#define SN_setext_genCrypt              "setext-genCrypt"
-#define LN_setext_genCrypt              "generic cryptogram"
-#define NID_setext_genCrypt             601
-#define OBJ_setext_genCrypt             OBJ_set_msgExt,1L
-
-#define SN_setext_miAuth                "setext-miAuth"
-#define LN_setext_miAuth                "merchant initiated auth"
-#define NID_setext_miAuth               602
-#define OBJ_setext_miAuth               OBJ_set_msgExt,3L
-
-#define SN_setext_pinSecure             "setext-pinSecure"
-#define NID_setext_pinSecure            603
-#define OBJ_setext_pinSecure            OBJ_set_msgExt,4L
-
-#define SN_setext_pinAny                "setext-pinAny"
-#define NID_setext_pinAny               604
-#define OBJ_setext_pinAny               OBJ_set_msgExt,5L
-
-#define SN_setext_track2                "setext-track2"
-#define NID_setext_track2               605
-#define OBJ_setext_track2               OBJ_set_msgExt,7L
-
-#define SN_setext_cv            "setext-cv"
-#define LN_setext_cv            "additional verification"
-#define NID_setext_cv           606
-#define OBJ_setext_cv           OBJ_set_msgExt,8L
-
-#define SN_set_policy_root              "set-policy-root"
-#define NID_set_policy_root             607
-#define OBJ_set_policy_root             OBJ_set_policy,0L
-
-#define SN_setCext_hashedRoot           "setCext-hashedRoot"
-#define NID_setCext_hashedRoot          608
-#define OBJ_setCext_hashedRoot          OBJ_set_certExt,0L
-
-#define SN_setCext_certType             "setCext-certType"
-#define NID_setCext_certType            609
-#define OBJ_setCext_certType            OBJ_set_certExt,1L
-
-#define SN_setCext_merchData            "setCext-merchData"
-#define NID_setCext_merchData           610
-#define OBJ_setCext_merchData           OBJ_set_certExt,2L
-
-#define SN_setCext_cCertRequired                "setCext-cCertRequired"
-#define NID_setCext_cCertRequired               611
-#define OBJ_setCext_cCertRequired               OBJ_set_certExt,3L
-
-#define SN_setCext_tunneling            "setCext-tunneling"
-#define NID_setCext_tunneling           612
-#define OBJ_setCext_tunneling           OBJ_set_certExt,4L
-
-#define SN_setCext_setExt               "setCext-setExt"
-#define NID_setCext_setExt              613
-#define OBJ_setCext_setExt              OBJ_set_certExt,5L
-
-#define SN_setCext_setQualf             "setCext-setQualf"
-#define NID_setCext_setQualf            614
-#define OBJ_setCext_setQualf            OBJ_set_certExt,6L
-
-#define SN_setCext_PGWYcapabilities             "setCext-PGWYcapabilities"
-#define NID_setCext_PGWYcapabilities            615
-#define OBJ_setCext_PGWYcapabilities            OBJ_set_certExt,7L
-
-#define SN_setCext_TokenIdentifier              "setCext-TokenIdentifier"
-#define NID_setCext_TokenIdentifier             616
-#define OBJ_setCext_TokenIdentifier             OBJ_set_certExt,8L
-
-#define SN_setCext_Track2Data           "setCext-Track2Data"
-#define NID_setCext_Track2Data          617
-#define OBJ_setCext_Track2Data          OBJ_set_certExt,9L
-
-#define SN_setCext_TokenType            "setCext-TokenType"
-#define NID_setCext_TokenType           618
-#define OBJ_setCext_TokenType           OBJ_set_certExt,10L
-
-#define SN_setCext_IssuerCapabilities           "setCext-IssuerCapabilities"
-#define NID_setCext_IssuerCapabilities          619
-#define OBJ_setCext_IssuerCapabilities          OBJ_set_certExt,11L
-
-#define SN_setAttr_Cert         "setAttr-Cert"
-#define NID_setAttr_Cert                620
-#define OBJ_setAttr_Cert                OBJ_set_attr,0L
-
-#define SN_setAttr_PGWYcap              "setAttr-PGWYcap"
-#define LN_setAttr_PGWYcap              "payment gateway capabilities"
-#define NID_setAttr_PGWYcap             621
-#define OBJ_setAttr_PGWYcap             OBJ_set_attr,1L
-
-#define SN_setAttr_TokenType            "setAttr-TokenType"
-#define NID_setAttr_TokenType           622
-#define OBJ_setAttr_TokenType           OBJ_set_attr,2L
-
-#define SN_setAttr_IssCap               "setAttr-IssCap"
-#define LN_setAttr_IssCap               "issuer capabilities"
-#define NID_setAttr_IssCap              623
-#define OBJ_setAttr_IssCap              OBJ_set_attr,3L
-
-#define SN_set_rootKeyThumb             "set-rootKeyThumb"
-#define NID_set_rootKeyThumb            624
-#define OBJ_set_rootKeyThumb            OBJ_setAttr_Cert,0L
-
-#define SN_set_addPolicy                "set-addPolicy"
-#define NID_set_addPolicy               625
-#define OBJ_set_addPolicy               OBJ_setAttr_Cert,1L
-
-#define SN_setAttr_Token_EMV            "setAttr-Token-EMV"
-#define NID_setAttr_Token_EMV           626
-#define OBJ_setAttr_Token_EMV           OBJ_setAttr_TokenType,1L
-
-#define SN_setAttr_Token_B0Prime                "setAttr-Token-B0Prime"
-#define NID_setAttr_Token_B0Prime               627
-#define OBJ_setAttr_Token_B0Prime               OBJ_setAttr_TokenType,2L
-
-#define SN_setAttr_IssCap_CVM           "setAttr-IssCap-CVM"
-#define NID_setAttr_IssCap_CVM          628
-#define OBJ_setAttr_IssCap_CVM          OBJ_setAttr_IssCap,3L
-
-#define SN_setAttr_IssCap_T2            "setAttr-IssCap-T2"
-#define NID_setAttr_IssCap_T2           629
-#define OBJ_setAttr_IssCap_T2           OBJ_setAttr_IssCap,4L
-
-#define SN_setAttr_IssCap_Sig           "setAttr-IssCap-Sig"
-#define NID_setAttr_IssCap_Sig          630
-#define OBJ_setAttr_IssCap_Sig          OBJ_setAttr_IssCap,5L
-
-#define SN_setAttr_GenCryptgrm          "setAttr-GenCryptgrm"
-#define LN_setAttr_GenCryptgrm          "generate cryptogram"
-#define NID_setAttr_GenCryptgrm         631
-#define OBJ_setAttr_GenCryptgrm         OBJ_setAttr_IssCap_CVM,1L
-
-#define SN_setAttr_T2Enc                "setAttr-T2Enc"
-#define LN_setAttr_T2Enc                "encrypted track 2"
-#define NID_setAttr_T2Enc               632
-#define OBJ_setAttr_T2Enc               OBJ_setAttr_IssCap_T2,1L
-
-#define SN_setAttr_T2cleartxt           "setAttr-T2cleartxt"
-#define LN_setAttr_T2cleartxt           "cleartext track 2"
-#define NID_setAttr_T2cleartxt          633
-#define OBJ_setAttr_T2cleartxt          OBJ_setAttr_IssCap_T2,2L
-
-#define SN_setAttr_TokICCsig            "setAttr-TokICCsig"
-#define LN_setAttr_TokICCsig            "ICC or token signature"
-#define NID_setAttr_TokICCsig           634
-#define OBJ_setAttr_TokICCsig           OBJ_setAttr_IssCap_Sig,1L
-
-#define SN_setAttr_SecDevSig            "setAttr-SecDevSig"
-#define LN_setAttr_SecDevSig            "secure device signature"
-#define NID_setAttr_SecDevSig           635
-#define OBJ_setAttr_SecDevSig           OBJ_setAttr_IssCap_Sig,2L
-
-#define SN_set_brand_IATA_ATA           "set-brand-IATA-ATA"
-#define NID_set_brand_IATA_ATA          636
-#define OBJ_set_brand_IATA_ATA          OBJ_set_brand,1L
-
-#define SN_set_brand_Diners             "set-brand-Diners"
-#define NID_set_brand_Diners            637
-#define OBJ_set_brand_Diners            OBJ_set_brand,30L
-
-#define SN_set_brand_AmericanExpress            "set-brand-AmericanExpress"
-#define NID_set_brand_AmericanExpress           638
-#define OBJ_set_brand_AmericanExpress           OBJ_set_brand,34L
-
-#define SN_set_brand_JCB                "set-brand-JCB"
-#define NID_set_brand_JCB               639
-#define OBJ_set_brand_JCB               OBJ_set_brand,35L
-
-#define SN_set_brand_Visa               "set-brand-Visa"
-#define NID_set_brand_Visa              640
-#define OBJ_set_brand_Visa              OBJ_set_brand,4L
-
-#define SN_set_brand_MasterCard         "set-brand-MasterCard"
-#define NID_set_brand_MasterCard                641
-#define OBJ_set_brand_MasterCard                OBJ_set_brand,5L
-
-#define SN_set_brand_Novus              "set-brand-Novus"
-#define NID_set_brand_Novus             642
-#define OBJ_set_brand_Novus             OBJ_set_brand,6011L
-
-#define SN_des_cdmf             "DES-CDMF"
-#define LN_des_cdmf             "des-cdmf"
-#define NID_des_cdmf            643
-#define OBJ_des_cdmf            OBJ_rsadsi,3L,10L
-
-#define SN_rsaOAEPEncryptionSET         "rsaOAEPEncryptionSET"
-#define NID_rsaOAEPEncryptionSET                644
-#define OBJ_rsaOAEPEncryptionSET                OBJ_rsadsi,1L,1L,6L
-
-#define SN_ipsec3               "Oakley-EC2N-3"
-#define LN_ipsec3               "ipsec3"
-#define NID_ipsec3              749
-
-#define SN_ipsec4               "Oakley-EC2N-4"
-#define LN_ipsec4               "ipsec4"
-#define NID_ipsec4              750
-
-#define SN_whirlpool            "whirlpool"
-#define NID_whirlpool           804
-#define OBJ_whirlpool           OBJ_iso,0L,10118L,3L,0L,55L
-
-#define SN_cryptopro            "cryptopro"
-#define NID_cryptopro           805
-#define OBJ_cryptopro           OBJ_member_body,643L,2L,2L
-
-#define SN_cryptocom            "cryptocom"
-#define NID_cryptocom           806
-#define OBJ_cryptocom           OBJ_member_body,643L,2L,9L
-
-#define SN_id_tc26              "id-tc26"
-#define NID_id_tc26             974
-#define OBJ_id_tc26             OBJ_member_body,643L,7L,1L
-
-#define SN_id_GostR3411_94_with_GostR3410_2001          "id-GostR3411-94-with-GostR3410-2001"
-#define LN_id_GostR3411_94_with_GostR3410_2001          "GOST R 34.11-94 with GOST R 34.10-2001"
-#define NID_id_GostR3411_94_with_GostR3410_2001         807
-#define OBJ_id_GostR3411_94_with_GostR3410_2001         OBJ_cryptopro,3L
-
-#define SN_id_GostR3411_94_with_GostR3410_94            "id-GostR3411-94-with-GostR3410-94"
-#define LN_id_GostR3411_94_with_GostR3410_94            "GOST R 34.11-94 with GOST R 34.10-94"
-#define NID_id_GostR3411_94_with_GostR3410_94           808
-#define OBJ_id_GostR3411_94_with_GostR3410_94           OBJ_cryptopro,4L
-
-#define SN_id_GostR3411_94              "md_gost94"
-#define LN_id_GostR3411_94              "GOST R 34.11-94"
-#define NID_id_GostR3411_94             809
-#define OBJ_id_GostR3411_94             OBJ_cryptopro,9L
-
-#define SN_id_HMACGostR3411_94          "id-HMACGostR3411-94"
-#define LN_id_HMACGostR3411_94          "HMAC GOST 34.11-94"
-#define NID_id_HMACGostR3411_94         810
-#define OBJ_id_HMACGostR3411_94         OBJ_cryptopro,10L
-
-#define SN_id_GostR3410_2001            "gost2001"
-#define LN_id_GostR3410_2001            "GOST R 34.10-2001"
-#define NID_id_GostR3410_2001           811
-#define OBJ_id_GostR3410_2001           OBJ_cryptopro,19L
-
-#define SN_id_GostR3410_94              "gost94"
-#define LN_id_GostR3410_94              "GOST R 34.10-94"
-#define NID_id_GostR3410_94             812
-#define OBJ_id_GostR3410_94             OBJ_cryptopro,20L
-
-#define SN_id_Gost28147_89              "gost89"
-#define LN_id_Gost28147_89              "GOST 28147-89"
-#define NID_id_Gost28147_89             813
-#define OBJ_id_Gost28147_89             OBJ_cryptopro,21L
-
-#define SN_gost89_cnt           "gost89-cnt"
-#define NID_gost89_cnt          814
-
-#define SN_gost89_cnt_12                "gost89-cnt-12"
-#define NID_gost89_cnt_12               975
-
-#define SN_gost89_cbc           "gost89-cbc"
-#define NID_gost89_cbc          1009
-
-#define SN_gost89_ecb           "gost89-ecb"
-#define NID_gost89_ecb          1010
-
-#define SN_gost89_ctr           "gost89-ctr"
-#define NID_gost89_ctr          1011
-
-#define SN_id_Gost28147_89_MAC          "gost-mac"
-#define LN_id_Gost28147_89_MAC          "GOST 28147-89 MAC"
-#define NID_id_Gost28147_89_MAC         815
-#define OBJ_id_Gost28147_89_MAC         OBJ_cryptopro,22L
-
-#define SN_gost_mac_12          "gost-mac-12"
-#define NID_gost_mac_12         976
-
-#define SN_id_GostR3411_94_prf          "prf-gostr3411-94"
-#define LN_id_GostR3411_94_prf          "GOST R 34.11-94 PRF"
-#define NID_id_GostR3411_94_prf         816
-#define OBJ_id_GostR3411_94_prf         OBJ_cryptopro,23L
-
-#define SN_id_GostR3410_2001DH          "id-GostR3410-2001DH"
-#define LN_id_GostR3410_2001DH          "GOST R 34.10-2001 DH"
-#define NID_id_GostR3410_2001DH         817
-#define OBJ_id_GostR3410_2001DH         OBJ_cryptopro,98L
-
-#define SN_id_GostR3410_94DH            "id-GostR3410-94DH"
-#define LN_id_GostR3410_94DH            "GOST R 34.10-94 DH"
-#define NID_id_GostR3410_94DH           818
-#define OBJ_id_GostR3410_94DH           OBJ_cryptopro,99L
-
-#define SN_id_Gost28147_89_CryptoPro_KeyMeshing         "id-Gost28147-89-CryptoPro-KeyMeshing"
-#define NID_id_Gost28147_89_CryptoPro_KeyMeshing                819
-#define OBJ_id_Gost28147_89_CryptoPro_KeyMeshing                OBJ_cryptopro,14L,1L
-
-#define SN_id_Gost28147_89_None_KeyMeshing              "id-Gost28147-89-None-KeyMeshing"
-#define NID_id_Gost28147_89_None_KeyMeshing             820
-#define OBJ_id_Gost28147_89_None_KeyMeshing             OBJ_cryptopro,14L,0L
-
-#define SN_id_GostR3411_94_TestParamSet         "id-GostR3411-94-TestParamSet"
-#define NID_id_GostR3411_94_TestParamSet                821
-#define OBJ_id_GostR3411_94_TestParamSet                OBJ_cryptopro,30L,0L
-
-#define SN_id_GostR3411_94_CryptoProParamSet            "id-GostR3411-94-CryptoProParamSet"
-#define NID_id_GostR3411_94_CryptoProParamSet           822
-#define OBJ_id_GostR3411_94_CryptoProParamSet           OBJ_cryptopro,30L,1L
-
-#define SN_id_Gost28147_89_TestParamSet         "id-Gost28147-89-TestParamSet"
-#define NID_id_Gost28147_89_TestParamSet                823
-#define OBJ_id_Gost28147_89_TestParamSet                OBJ_cryptopro,31L,0L
-
-#define SN_id_Gost28147_89_CryptoPro_A_ParamSet         "id-Gost28147-89-CryptoPro-A-ParamSet"
-#define NID_id_Gost28147_89_CryptoPro_A_ParamSet                824
-#define OBJ_id_Gost28147_89_CryptoPro_A_ParamSet                OBJ_cryptopro,31L,1L
-
-#define SN_id_Gost28147_89_CryptoPro_B_ParamSet         "id-Gost28147-89-CryptoPro-B-ParamSet"
-#define NID_id_Gost28147_89_CryptoPro_B_ParamSet                825
-#define OBJ_id_Gost28147_89_CryptoPro_B_ParamSet                OBJ_cryptopro,31L,2L
-
-#define SN_id_Gost28147_89_CryptoPro_C_ParamSet         "id-Gost28147-89-CryptoPro-C-ParamSet"
-#define NID_id_Gost28147_89_CryptoPro_C_ParamSet                826
-#define OBJ_id_Gost28147_89_CryptoPro_C_ParamSet                OBJ_cryptopro,31L,3L
-
-#define SN_id_Gost28147_89_CryptoPro_D_ParamSet         "id-Gost28147-89-CryptoPro-D-ParamSet"
-#define NID_id_Gost28147_89_CryptoPro_D_ParamSet                827
-#define OBJ_id_Gost28147_89_CryptoPro_D_ParamSet                OBJ_cryptopro,31L,4L
-
-#define SN_id_Gost28147_89_CryptoPro_Oscar_1_1_ParamSet         "id-Gost28147-89-CryptoPro-Oscar-1-1-ParamSet"
-#define NID_id_Gost28147_89_CryptoPro_Oscar_1_1_ParamSet                828
-#define OBJ_id_Gost28147_89_CryptoPro_Oscar_1_1_ParamSet                OBJ_cryptopro,31L,5L
-
-#define SN_id_Gost28147_89_CryptoPro_Oscar_1_0_ParamSet         "id-Gost28147-89-CryptoPro-Oscar-1-0-ParamSet"
-#define NID_id_Gost28147_89_CryptoPro_Oscar_1_0_ParamSet                829
-#define OBJ_id_Gost28147_89_CryptoPro_Oscar_1_0_ParamSet                OBJ_cryptopro,31L,6L
-
-#define SN_id_Gost28147_89_CryptoPro_RIC_1_ParamSet             "id-Gost28147-89-CryptoPro-RIC-1-ParamSet"
-#define NID_id_Gost28147_89_CryptoPro_RIC_1_ParamSet            830
-#define OBJ_id_Gost28147_89_CryptoPro_RIC_1_ParamSet            OBJ_cryptopro,31L,7L
-
-#define SN_id_GostR3410_94_TestParamSet         "id-GostR3410-94-TestParamSet"
-#define NID_id_GostR3410_94_TestParamSet                831
-#define OBJ_id_GostR3410_94_TestParamSet                OBJ_cryptopro,32L,0L
-
-#define SN_id_GostR3410_94_CryptoPro_A_ParamSet         "id-GostR3410-94-CryptoPro-A-ParamSet"
-#define NID_id_GostR3410_94_CryptoPro_A_ParamSet                832
-#define OBJ_id_GostR3410_94_CryptoPro_A_ParamSet                OBJ_cryptopro,32L,2L
-
-#define SN_id_GostR3410_94_CryptoPro_B_ParamSet         "id-GostR3410-94-CryptoPro-B-ParamSet"
-#define NID_id_GostR3410_94_CryptoPro_B_ParamSet                833
-#define OBJ_id_GostR3410_94_CryptoPro_B_ParamSet                OBJ_cryptopro,32L,3L
-
-#define SN_id_GostR3410_94_CryptoPro_C_ParamSet         "id-GostR3410-94-CryptoPro-C-ParamSet"
-#define NID_id_GostR3410_94_CryptoPro_C_ParamSet                834
-#define OBJ_id_GostR3410_94_CryptoPro_C_ParamSet                OBJ_cryptopro,32L,4L
-
-#define SN_id_GostR3410_94_CryptoPro_D_ParamSet         "id-GostR3410-94-CryptoPro-D-ParamSet"
-#define NID_id_GostR3410_94_CryptoPro_D_ParamSet                835
-#define OBJ_id_GostR3410_94_CryptoPro_D_ParamSet                OBJ_cryptopro,32L,5L
-
-#define SN_id_GostR3410_94_CryptoPro_XchA_ParamSet              "id-GostR3410-94-CryptoPro-XchA-ParamSet"
-#define NID_id_GostR3410_94_CryptoPro_XchA_ParamSet             836
-#define OBJ_id_GostR3410_94_CryptoPro_XchA_ParamSet             OBJ_cryptopro,33L,1L
-
-#define SN_id_GostR3410_94_CryptoPro_XchB_ParamSet              "id-GostR3410-94-CryptoPro-XchB-ParamSet"
-#define NID_id_GostR3410_94_CryptoPro_XchB_ParamSet             837
-#define OBJ_id_GostR3410_94_CryptoPro_XchB_ParamSet             OBJ_cryptopro,33L,2L
-
-#define SN_id_GostR3410_94_CryptoPro_XchC_ParamSet              "id-GostR3410-94-CryptoPro-XchC-ParamSet"
-#define NID_id_GostR3410_94_CryptoPro_XchC_ParamSet             838
-#define OBJ_id_GostR3410_94_CryptoPro_XchC_ParamSet             OBJ_cryptopro,33L,3L
-
-#define SN_id_GostR3410_2001_TestParamSet               "id-GostR3410-2001-TestParamSet"
-#define NID_id_GostR3410_2001_TestParamSet              839
-#define OBJ_id_GostR3410_2001_TestParamSet              OBJ_cryptopro,35L,0L
-
-#define SN_id_GostR3410_2001_CryptoPro_A_ParamSet               "id-GostR3410-2001-CryptoPro-A-ParamSet"
-#define NID_id_GostR3410_2001_CryptoPro_A_ParamSet              840
-#define OBJ_id_GostR3410_2001_CryptoPro_A_ParamSet              OBJ_cryptopro,35L,1L
-
-#define SN_id_GostR3410_2001_CryptoPro_B_ParamSet               "id-GostR3410-2001-CryptoPro-B-ParamSet"
-#define NID_id_GostR3410_2001_CryptoPro_B_ParamSet              841
-#define OBJ_id_GostR3410_2001_CryptoPro_B_ParamSet              OBJ_cryptopro,35L,2L
-
-#define SN_id_GostR3410_2001_CryptoPro_C_ParamSet               "id-GostR3410-2001-CryptoPro-C-ParamSet"
-#define NID_id_GostR3410_2001_CryptoPro_C_ParamSet              842
-#define OBJ_id_GostR3410_2001_CryptoPro_C_ParamSet              OBJ_cryptopro,35L,3L
-
-#define SN_id_GostR3410_2001_CryptoPro_XchA_ParamSet            "id-GostR3410-2001-CryptoPro-XchA-ParamSet"
-#define NID_id_GostR3410_2001_CryptoPro_XchA_ParamSet           843
-#define OBJ_id_GostR3410_2001_CryptoPro_XchA_ParamSet           OBJ_cryptopro,36L,0L
-
-#define SN_id_GostR3410_2001_CryptoPro_XchB_ParamSet            "id-GostR3410-2001-CryptoPro-XchB-ParamSet"
-#define NID_id_GostR3410_2001_CryptoPro_XchB_ParamSet           844
-#define OBJ_id_GostR3410_2001_CryptoPro_XchB_ParamSet           OBJ_cryptopro,36L,1L
-
-#define SN_id_GostR3410_94_a            "id-GostR3410-94-a"
-#define NID_id_GostR3410_94_a           845
-#define OBJ_id_GostR3410_94_a           OBJ_id_GostR3410_94,1L
-
-#define SN_id_GostR3410_94_aBis         "id-GostR3410-94-aBis"
-#define NID_id_GostR3410_94_aBis                846
-#define OBJ_id_GostR3410_94_aBis                OBJ_id_GostR3410_94,2L
-
-#define SN_id_GostR3410_94_b            "id-GostR3410-94-b"
-#define NID_id_GostR3410_94_b           847
-#define OBJ_id_GostR3410_94_b           OBJ_id_GostR3410_94,3L
-
-#define SN_id_GostR3410_94_bBis         "id-GostR3410-94-bBis"
-#define NID_id_GostR3410_94_bBis                848
-#define OBJ_id_GostR3410_94_bBis                OBJ_id_GostR3410_94,4L
-
-#define SN_id_Gost28147_89_cc           "id-Gost28147-89-cc"
-#define LN_id_Gost28147_89_cc           "GOST 28147-89 Cryptocom ParamSet"
-#define NID_id_Gost28147_89_cc          849
-#define OBJ_id_Gost28147_89_cc          OBJ_cryptocom,1L,6L,1L
-
-#define SN_id_GostR3410_94_cc           "gost94cc"
-#define LN_id_GostR3410_94_cc           "GOST 34.10-94 Cryptocom"
-#define NID_id_GostR3410_94_cc          850
-#define OBJ_id_GostR3410_94_cc          OBJ_cryptocom,1L,5L,3L
-
-#define SN_id_GostR3410_2001_cc         "gost2001cc"
-#define LN_id_GostR3410_2001_cc         "GOST 34.10-2001 Cryptocom"
-#define NID_id_GostR3410_2001_cc                851
-#define OBJ_id_GostR3410_2001_cc                OBJ_cryptocom,1L,5L,4L
-
-#define SN_id_GostR3411_94_with_GostR3410_94_cc         "id-GostR3411-94-with-GostR3410-94-cc"
-#define LN_id_GostR3411_94_with_GostR3410_94_cc         "GOST R 34.11-94 with GOST R 34.10-94 Cryptocom"
-#define NID_id_GostR3411_94_with_GostR3410_94_cc                852
-#define OBJ_id_GostR3411_94_with_GostR3410_94_cc                OBJ_cryptocom,1L,3L,3L
-
-#define SN_id_GostR3411_94_with_GostR3410_2001_cc               "id-GostR3411-94-with-GostR3410-2001-cc"
-#define LN_id_GostR3411_94_with_GostR3410_2001_cc               "GOST R 34.11-94 with GOST R 34.10-2001 Cryptocom"
-#define NID_id_GostR3411_94_with_GostR3410_2001_cc              853
-#define OBJ_id_GostR3411_94_with_GostR3410_2001_cc              OBJ_cryptocom,1L,3L,4L
-
-#define SN_id_GostR3410_2001_ParamSet_cc                "id-GostR3410-2001-ParamSet-cc"
-#define LN_id_GostR3410_2001_ParamSet_cc                "GOST R 3410-2001 Parameter Set Cryptocom"
-#define NID_id_GostR3410_2001_ParamSet_cc               854
-#define OBJ_id_GostR3410_2001_ParamSet_cc               OBJ_cryptocom,1L,8L,1L
-
-#define SN_id_tc26_algorithms           "id-tc26-algorithms"
-#define NID_id_tc26_algorithms          977
-#define OBJ_id_tc26_algorithms          OBJ_id_tc26,1L
-
-#define SN_id_tc26_sign         "id-tc26-sign"
-#define NID_id_tc26_sign                978
-#define OBJ_id_tc26_sign                OBJ_id_tc26_algorithms,1L
-
-#define SN_id_GostR3410_2012_256                "gost2012_256"
-#define LN_id_GostR3410_2012_256                "GOST R 34.10-2012 with 256 bit modulus"
-#define NID_id_GostR3410_2012_256               979
-#define OBJ_id_GostR3410_2012_256               OBJ_id_tc26_sign,1L
-
-#define SN_id_GostR3410_2012_512                "gost2012_512"
-#define LN_id_GostR3410_2012_512                "GOST R 34.10-2012 with 512 bit modulus"
-#define NID_id_GostR3410_2012_512               980
-#define OBJ_id_GostR3410_2012_512               OBJ_id_tc26_sign,2L
-
-#define SN_id_tc26_digest               "id-tc26-digest"
-#define NID_id_tc26_digest              981
-#define OBJ_id_tc26_digest              OBJ_id_tc26_algorithms,2L
-
-#define SN_id_GostR3411_2012_256                "md_gost12_256"
-#define LN_id_GostR3411_2012_256                "GOST R 34.11-2012 with 256 bit hash"
-#define NID_id_GostR3411_2012_256               982
-#define OBJ_id_GostR3411_2012_256               OBJ_id_tc26_digest,2L
-
-#define SN_id_GostR3411_2012_512                "md_gost12_512"
-#define LN_id_GostR3411_2012_512                "GOST R 34.11-2012 with 512 bit hash"
-#define NID_id_GostR3411_2012_512               983
-#define OBJ_id_GostR3411_2012_512               OBJ_id_tc26_digest,3L
-
-#define SN_id_tc26_signwithdigest               "id-tc26-signwithdigest"
-#define NID_id_tc26_signwithdigest              984
-#define OBJ_id_tc26_signwithdigest              OBJ_id_tc26_algorithms,3L
-
-#define SN_id_tc26_signwithdigest_gost3410_2012_256             "id-tc26-signwithdigest-gost3410-2012-256"
-#define LN_id_tc26_signwithdigest_gost3410_2012_256             "GOST R 34.10-2012 with GOST R 34.11-2012 (256 bit)"
-#define NID_id_tc26_signwithdigest_gost3410_2012_256            985
-#define OBJ_id_tc26_signwithdigest_gost3410_2012_256            OBJ_id_tc26_signwithdigest,2L
-
-#define SN_id_tc26_signwithdigest_gost3410_2012_512             "id-tc26-signwithdigest-gost3410-2012-512"
-#define LN_id_tc26_signwithdigest_gost3410_2012_512             "GOST R 34.10-2012 with GOST R 34.11-2012 (512 bit)"
-#define NID_id_tc26_signwithdigest_gost3410_2012_512            986
-#define OBJ_id_tc26_signwithdigest_gost3410_2012_512            OBJ_id_tc26_signwithdigest,3L
-
-#define SN_id_tc26_mac          "id-tc26-mac"
-#define NID_id_tc26_mac         987
-#define OBJ_id_tc26_mac         OBJ_id_tc26_algorithms,4L
-
-#define SN_id_tc26_hmac_gost_3411_2012_256              "id-tc26-hmac-gost-3411-2012-256"
-#define LN_id_tc26_hmac_gost_3411_2012_256              "HMAC GOST 34.11-2012 256 bit"
-#define NID_id_tc26_hmac_gost_3411_2012_256             988
-#define OBJ_id_tc26_hmac_gost_3411_2012_256             OBJ_id_tc26_mac,1L
-
-#define SN_id_tc26_hmac_gost_3411_2012_512              "id-tc26-hmac-gost-3411-2012-512"
-#define LN_id_tc26_hmac_gost_3411_2012_512              "HMAC GOST 34.11-2012 512 bit"
-#define NID_id_tc26_hmac_gost_3411_2012_512             989
-#define OBJ_id_tc26_hmac_gost_3411_2012_512             OBJ_id_tc26_mac,2L
-
-#define SN_id_tc26_cipher               "id-tc26-cipher"
-#define NID_id_tc26_cipher              990
-#define OBJ_id_tc26_cipher              OBJ_id_tc26_algorithms,5L
-
-#define SN_id_tc26_agreement            "id-tc26-agreement"
-#define NID_id_tc26_agreement           991
-#define OBJ_id_tc26_agreement           OBJ_id_tc26_algorithms,6L
-
-#define SN_id_tc26_agreement_gost_3410_2012_256         "id-tc26-agreement-gost-3410-2012-256"
-#define NID_id_tc26_agreement_gost_3410_2012_256                992
-#define OBJ_id_tc26_agreement_gost_3410_2012_256                OBJ_id_tc26_agreement,1L
-
-#define SN_id_tc26_agreement_gost_3410_2012_512         "id-tc26-agreement-gost-3410-2012-512"
-#define NID_id_tc26_agreement_gost_3410_2012_512                993
-#define OBJ_id_tc26_agreement_gost_3410_2012_512                OBJ_id_tc26_agreement,2L
-
-#define SN_id_tc26_constants            "id-tc26-constants"
-#define NID_id_tc26_constants           994
-#define OBJ_id_tc26_constants           OBJ_id_tc26,2L
-
-#define SN_id_tc26_sign_constants               "id-tc26-sign-constants"
-#define NID_id_tc26_sign_constants              995
-#define OBJ_id_tc26_sign_constants              OBJ_id_tc26_constants,1L
-
-#define SN_id_tc26_gost_3410_2012_512_constants         "id-tc26-gost-3410-2012-512-constants"
-#define NID_id_tc26_gost_3410_2012_512_constants                996
-#define OBJ_id_tc26_gost_3410_2012_512_constants                OBJ_id_tc26_sign_constants,2L
-
-#define SN_id_tc26_gost_3410_2012_512_paramSetTest              "id-tc26-gost-3410-2012-512-paramSetTest"
-#define LN_id_tc26_gost_3410_2012_512_paramSetTest              "GOST R 34.10-2012 (512 bit) testing parameter set"
-#define NID_id_tc26_gost_3410_2012_512_paramSetTest             997
-#define OBJ_id_tc26_gost_3410_2012_512_paramSetTest             OBJ_id_tc26_gost_3410_2012_512_constants,0L
-
-#define SN_id_tc26_gost_3410_2012_512_paramSetA         "id-tc26-gost-3410-2012-512-paramSetA"
-#define LN_id_tc26_gost_3410_2012_512_paramSetA         "GOST R 34.10-2012 (512 bit) ParamSet A"
-#define NID_id_tc26_gost_3410_2012_512_paramSetA                998
-#define OBJ_id_tc26_gost_3410_2012_512_paramSetA                OBJ_id_tc26_gost_3410_2012_512_constants,1L
-
-#define SN_id_tc26_gost_3410_2012_512_paramSetB         "id-tc26-gost-3410-2012-512-paramSetB"
-#define LN_id_tc26_gost_3410_2012_512_paramSetB         "GOST R 34.10-2012 (512 bit) ParamSet B"
-#define NID_id_tc26_gost_3410_2012_512_paramSetB                999
-#define OBJ_id_tc26_gost_3410_2012_512_paramSetB                OBJ_id_tc26_gost_3410_2012_512_constants,2L
-
-#define SN_id_tc26_digest_constants             "id-tc26-digest-constants"
-#define NID_id_tc26_digest_constants            1000
-#define OBJ_id_tc26_digest_constants            OBJ_id_tc26_constants,2L
-
-#define SN_id_tc26_cipher_constants             "id-tc26-cipher-constants"
-#define NID_id_tc26_cipher_constants            1001
-#define OBJ_id_tc26_cipher_constants            OBJ_id_tc26_constants,5L
-
-#define SN_id_tc26_gost_28147_constants         "id-tc26-gost-28147-constants"
-#define NID_id_tc26_gost_28147_constants                1002
-#define OBJ_id_tc26_gost_28147_constants                OBJ_id_tc26_cipher_constants,1L
-
-#define SN_id_tc26_gost_28147_param_Z           "id-tc26-gost-28147-param-Z"
-#define LN_id_tc26_gost_28147_param_Z           "GOST 28147-89 TC26 parameter set"
-#define NID_id_tc26_gost_28147_param_Z          1003
-#define OBJ_id_tc26_gost_28147_param_Z          OBJ_id_tc26_gost_28147_constants,1L
-
-#define SN_INN          "INN"
-#define LN_INN          "INN"
-#define NID_INN         1004
-#define OBJ_INN         OBJ_member_body,643L,3L,131L,1L,1L
-
-#define SN_OGRN         "OGRN"
-#define LN_OGRN         "OGRN"
-#define NID_OGRN                1005
-#define OBJ_OGRN                OBJ_member_body,643L,100L,1L
-
-#define SN_SNILS                "SNILS"
-#define LN_SNILS                "SNILS"
-#define NID_SNILS               1006
-#define OBJ_SNILS               OBJ_member_body,643L,100L,3L
-
-#define SN_subjectSignTool              "subjectSignTool"
-#define LN_subjectSignTool              "Signing Tool of Subject"
-#define NID_subjectSignTool             1007
-#define OBJ_subjectSignTool             OBJ_member_body,643L,100L,111L
-
-#define SN_issuerSignTool               "issuerSignTool"
-#define LN_issuerSignTool               "Signing Tool of Issuer"
-#define NID_issuerSignTool              1008
-#define OBJ_issuerSignTool              OBJ_member_body,643L,100L,112L
-
-#define SN_grasshopper_ecb              "grasshopper-ecb"
-#define NID_grasshopper_ecb             1012
-
-#define SN_grasshopper_ctr              "grasshopper-ctr"
-#define NID_grasshopper_ctr             1013
-
-#define SN_grasshopper_ofb              "grasshopper-ofb"
-#define NID_grasshopper_ofb             1014
-
-#define SN_grasshopper_cbc              "grasshopper-cbc"
-#define NID_grasshopper_cbc             1015
-
-#define SN_grasshopper_cfb              "grasshopper-cfb"
-#define NID_grasshopper_cfb             1016
-
-#define SN_grasshopper_mac              "grasshopper-mac"
-#define NID_grasshopper_mac             1017
-
-#define SN_camellia_128_cbc             "CAMELLIA-128-CBC"
-#define LN_camellia_128_cbc             "camellia-128-cbc"
-#define NID_camellia_128_cbc            751
-#define OBJ_camellia_128_cbc            1L,2L,392L,200011L,61L,1L,1L,1L,2L
-
-#define SN_camellia_192_cbc             "CAMELLIA-192-CBC"
-#define LN_camellia_192_cbc             "camellia-192-cbc"
-#define NID_camellia_192_cbc            752
-#define OBJ_camellia_192_cbc            1L,2L,392L,200011L,61L,1L,1L,1L,3L
-
-#define SN_camellia_256_cbc             "CAMELLIA-256-CBC"
-#define LN_camellia_256_cbc             "camellia-256-cbc"
-#define NID_camellia_256_cbc            753
-#define OBJ_camellia_256_cbc            1L,2L,392L,200011L,61L,1L,1L,1L,4L
-
-#define SN_id_camellia128_wrap          "id-camellia128-wrap"
-#define NID_id_camellia128_wrap         907
-#define OBJ_id_camellia128_wrap         1L,2L,392L,200011L,61L,1L,1L,3L,2L
-
-#define SN_id_camellia192_wrap          "id-camellia192-wrap"
-#define NID_id_camellia192_wrap         908
-#define OBJ_id_camellia192_wrap         1L,2L,392L,200011L,61L,1L,1L,3L,3L
-
-#define SN_id_camellia256_wrap          "id-camellia256-wrap"
-#define NID_id_camellia256_wrap         909
-#define OBJ_id_camellia256_wrap         1L,2L,392L,200011L,61L,1L,1L,3L,4L
-
-#define OBJ_ntt_ds              0L,3L,4401L,5L
-
-#define OBJ_camellia            OBJ_ntt_ds,3L,1L,9L
-
-#define SN_camellia_128_ecb             "CAMELLIA-128-ECB"
-#define LN_camellia_128_ecb             "camellia-128-ecb"
-#define NID_camellia_128_ecb            754
-#define OBJ_camellia_128_ecb            OBJ_camellia,1L
-
-#define SN_camellia_128_ofb128          "CAMELLIA-128-OFB"
-#define LN_camellia_128_ofb128          "camellia-128-ofb"
-#define NID_camellia_128_ofb128         766
-#define OBJ_camellia_128_ofb128         OBJ_camellia,3L
-
-#define SN_camellia_128_cfb128          "CAMELLIA-128-CFB"
-#define LN_camellia_128_cfb128          "camellia-128-cfb"
-#define NID_camellia_128_cfb128         757
-#define OBJ_camellia_128_cfb128         OBJ_camellia,4L
-
-#define SN_camellia_128_gcm             "CAMELLIA-128-GCM"
-#define LN_camellia_128_gcm             "camellia-128-gcm"
-#define NID_camellia_128_gcm            961
-#define OBJ_camellia_128_gcm            OBJ_camellia,6L
-
-#define SN_camellia_128_ccm             "CAMELLIA-128-CCM"
-#define LN_camellia_128_ccm             "camellia-128-ccm"
-#define NID_camellia_128_ccm            962
-#define OBJ_camellia_128_ccm            OBJ_camellia,7L
-
-#define SN_camellia_128_ctr             "CAMELLIA-128-CTR"
-#define LN_camellia_128_ctr             "camellia-128-ctr"
-#define NID_camellia_128_ctr            963
-#define OBJ_camellia_128_ctr            OBJ_camellia,9L
-
-#define SN_camellia_128_cmac            "CAMELLIA-128-CMAC"
-#define LN_camellia_128_cmac            "camellia-128-cmac"
-#define NID_camellia_128_cmac           964
-#define OBJ_camellia_128_cmac           OBJ_camellia,10L
-
-#define SN_camellia_192_ecb             "CAMELLIA-192-ECB"
-#define LN_camellia_192_ecb             "camellia-192-ecb"
-#define NID_camellia_192_ecb            755
-#define OBJ_camellia_192_ecb            OBJ_camellia,21L
-
-#define SN_camellia_192_ofb128          "CAMELLIA-192-OFB"
-#define LN_camellia_192_ofb128          "camellia-192-ofb"
-#define NID_camellia_192_ofb128         767
-#define OBJ_camellia_192_ofb128         OBJ_camellia,23L
-
-#define SN_camellia_192_cfb128          "CAMELLIA-192-CFB"
-#define LN_camellia_192_cfb128          "camellia-192-cfb"
-#define NID_camellia_192_cfb128         758
-#define OBJ_camellia_192_cfb128         OBJ_camellia,24L
-
-#define SN_camellia_192_gcm             "CAMELLIA-192-GCM"
-#define LN_camellia_192_gcm             "camellia-192-gcm"
-#define NID_camellia_192_gcm            965
-#define OBJ_camellia_192_gcm            OBJ_camellia,26L
-
-#define SN_camellia_192_ccm             "CAMELLIA-192-CCM"
-#define LN_camellia_192_ccm             "camellia-192-ccm"
-#define NID_camellia_192_ccm            966
-#define OBJ_camellia_192_ccm            OBJ_camellia,27L
-
-#define SN_camellia_192_ctr             "CAMELLIA-192-CTR"
-#define LN_camellia_192_ctr             "camellia-192-ctr"
-#define NID_camellia_192_ctr            967
-#define OBJ_camellia_192_ctr            OBJ_camellia,29L
-
-#define SN_camellia_192_cmac            "CAMELLIA-192-CMAC"
-#define LN_camellia_192_cmac            "camellia-192-cmac"
-#define NID_camellia_192_cmac           968
-#define OBJ_camellia_192_cmac           OBJ_camellia,30L
-
-#define SN_camellia_256_ecb             "CAMELLIA-256-ECB"
-#define LN_camellia_256_ecb             "camellia-256-ecb"
-#define NID_camellia_256_ecb            756
-#define OBJ_camellia_256_ecb            OBJ_camellia,41L
-
-#define SN_camellia_256_ofb128          "CAMELLIA-256-OFB"
-#define LN_camellia_256_ofb128          "camellia-256-ofb"
-#define NID_camellia_256_ofb128         768
-#define OBJ_camellia_256_ofb128         OBJ_camellia,43L
-
-#define SN_camellia_256_cfb128          "CAMELLIA-256-CFB"
-#define LN_camellia_256_cfb128          "camellia-256-cfb"
-#define NID_camellia_256_cfb128         759
-#define OBJ_camellia_256_cfb128         OBJ_camellia,44L
-
-#define SN_camellia_256_gcm             "CAMELLIA-256-GCM"
-#define LN_camellia_256_gcm             "camellia-256-gcm"
-#define NID_camellia_256_gcm            969
-#define OBJ_camellia_256_gcm            OBJ_camellia,46L
-
-#define SN_camellia_256_ccm             "CAMELLIA-256-CCM"
-#define LN_camellia_256_ccm             "camellia-256-ccm"
-#define NID_camellia_256_ccm            970
-#define OBJ_camellia_256_ccm            OBJ_camellia,47L
-
-#define SN_camellia_256_ctr             "CAMELLIA-256-CTR"
-#define LN_camellia_256_ctr             "camellia-256-ctr"
-#define NID_camellia_256_ctr            971
-#define OBJ_camellia_256_ctr            OBJ_camellia,49L
-
-#define SN_camellia_256_cmac            "CAMELLIA-256-CMAC"
-#define LN_camellia_256_cmac            "camellia-256-cmac"
-#define NID_camellia_256_cmac           972
-#define OBJ_camellia_256_cmac           OBJ_camellia,50L
-
-#define SN_camellia_128_cfb1            "CAMELLIA-128-CFB1"
-#define LN_camellia_128_cfb1            "camellia-128-cfb1"
-#define NID_camellia_128_cfb1           760
-
-#define SN_camellia_192_cfb1            "CAMELLIA-192-CFB1"
-#define LN_camellia_192_cfb1            "camellia-192-cfb1"
-#define NID_camellia_192_cfb1           761
-
-#define SN_camellia_256_cfb1            "CAMELLIA-256-CFB1"
-#define LN_camellia_256_cfb1            "camellia-256-cfb1"
-#define NID_camellia_256_cfb1           762
-
-#define SN_camellia_128_cfb8            "CAMELLIA-128-CFB8"
-#define LN_camellia_128_cfb8            "camellia-128-cfb8"
-#define NID_camellia_128_cfb8           763
-
-#define SN_camellia_192_cfb8            "CAMELLIA-192-CFB8"
-#define LN_camellia_192_cfb8            "camellia-192-cfb8"
-#define NID_camellia_192_cfb8           764
-
-#define SN_camellia_256_cfb8            "CAMELLIA-256-CFB8"
-#define LN_camellia_256_cfb8            "camellia-256-cfb8"
-#define NID_camellia_256_cfb8           765
-
-#define SN_kisa         "KISA"
-#define LN_kisa         "kisa"
-#define NID_kisa                773
-#define OBJ_kisa                OBJ_member_body,410L,200004L
-
-#define SN_seed_ecb             "SEED-ECB"
-#define LN_seed_ecb             "seed-ecb"
-#define NID_seed_ecb            776
-#define OBJ_seed_ecb            OBJ_kisa,1L,3L
-
-#define SN_seed_cbc             "SEED-CBC"
-#define LN_seed_cbc             "seed-cbc"
-#define NID_seed_cbc            777
-#define OBJ_seed_cbc            OBJ_kisa,1L,4L
-
-#define SN_seed_cfb128          "SEED-CFB"
-#define LN_seed_cfb128          "seed-cfb"
-#define NID_seed_cfb128         779
-#define OBJ_seed_cfb128         OBJ_kisa,1L,5L
-
-#define SN_seed_ofb128          "SEED-OFB"
-#define LN_seed_ofb128          "seed-ofb"
-#define NID_seed_ofb128         778
-#define OBJ_seed_ofb128         OBJ_kisa,1L,6L
-
-#define SN_hmac         "HMAC"
-#define LN_hmac         "hmac"
-#define NID_hmac                855
-
-#define SN_cmac         "CMAC"
-#define LN_cmac         "cmac"
-#define NID_cmac                894
-
-#define SN_rc4_hmac_md5         "RC4-HMAC-MD5"
-#define LN_rc4_hmac_md5         "rc4-hmac-md5"
-#define NID_rc4_hmac_md5                915
-
-#define SN_aes_128_cbc_hmac_sha1                "AES-128-CBC-HMAC-SHA1"
-#define LN_aes_128_cbc_hmac_sha1                "aes-128-cbc-hmac-sha1"
-#define NID_aes_128_cbc_hmac_sha1               916
-
-#define SN_aes_192_cbc_hmac_sha1                "AES-192-CBC-HMAC-SHA1"
-#define LN_aes_192_cbc_hmac_sha1                "aes-192-cbc-hmac-sha1"
-#define NID_aes_192_cbc_hmac_sha1               917
-
-#define SN_aes_256_cbc_hmac_sha1                "AES-256-CBC-HMAC-SHA1"
-#define LN_aes_256_cbc_hmac_sha1                "aes-256-cbc-hmac-sha1"
-#define NID_aes_256_cbc_hmac_sha1               918
-
-#define SN_aes_128_cbc_hmac_sha256              "AES-128-CBC-HMAC-SHA256"
-#define LN_aes_128_cbc_hmac_sha256              "aes-128-cbc-hmac-sha256"
-#define NID_aes_128_cbc_hmac_sha256             948
-
-#define SN_aes_192_cbc_hmac_sha256              "AES-192-CBC-HMAC-SHA256"
-#define LN_aes_192_cbc_hmac_sha256              "aes-192-cbc-hmac-sha256"
-#define NID_aes_192_cbc_hmac_sha256             949
-
-#define SN_aes_256_cbc_hmac_sha256              "AES-256-CBC-HMAC-SHA256"
-#define LN_aes_256_cbc_hmac_sha256              "aes-256-cbc-hmac-sha256"
-#define NID_aes_256_cbc_hmac_sha256             950
-
-#define SN_chacha20_poly1305            "ChaCha20-Poly1305"
-#define LN_chacha20_poly1305            "chacha20-poly1305"
-#define NID_chacha20_poly1305           1018
-
-#define SN_chacha20             "ChaCha20"
-#define LN_chacha20             "chacha20"
-#define NID_chacha20            1019
-
-#define SN_dhpublicnumber               "dhpublicnumber"
-#define LN_dhpublicnumber               "X9.42 DH"
-#define NID_dhpublicnumber              920
-#define OBJ_dhpublicnumber              OBJ_ISO_US,10046L,2L,1L
-
-#define SN_brainpoolP160r1              "brainpoolP160r1"
-#define NID_brainpoolP160r1             921
-#define OBJ_brainpoolP160r1             1L,3L,36L,3L,3L,2L,8L,1L,1L,1L
-
-#define SN_brainpoolP160t1              "brainpoolP160t1"
-#define NID_brainpoolP160t1             922
-#define OBJ_brainpoolP160t1             1L,3L,36L,3L,3L,2L,8L,1L,1L,2L
-
-#define SN_brainpoolP192r1              "brainpoolP192r1"
-#define NID_brainpoolP192r1             923
-#define OBJ_brainpoolP192r1             1L,3L,36L,3L,3L,2L,8L,1L,1L,3L
-
-#define SN_brainpoolP192t1              "brainpoolP192t1"
-#define NID_brainpoolP192t1             924
-#define OBJ_brainpoolP192t1             1L,3L,36L,3L,3L,2L,8L,1L,1L,4L
-
-#define SN_brainpoolP224r1              "brainpoolP224r1"
-#define NID_brainpoolP224r1             925
-#define OBJ_brainpoolP224r1             1L,3L,36L,3L,3L,2L,8L,1L,1L,5L
-
-#define SN_brainpoolP224t1              "brainpoolP224t1"
-#define NID_brainpoolP224t1             926
-#define OBJ_brainpoolP224t1             1L,3L,36L,3L,3L,2L,8L,1L,1L,6L
-
-#define SN_brainpoolP256r1              "brainpoolP256r1"
-#define NID_brainpoolP256r1             927
-#define OBJ_brainpoolP256r1             1L,3L,36L,3L,3L,2L,8L,1L,1L,7L
-
-#define SN_brainpoolP256t1              "brainpoolP256t1"
-#define NID_brainpoolP256t1             928
-#define OBJ_brainpoolP256t1             1L,3L,36L,3L,3L,2L,8L,1L,1L,8L
-
-#define SN_brainpoolP320r1              "brainpoolP320r1"
-#define NID_brainpoolP320r1             929
-#define OBJ_brainpoolP320r1             1L,3L,36L,3L,3L,2L,8L,1L,1L,9L
-
-#define SN_brainpoolP320t1              "brainpoolP320t1"
-#define NID_brainpoolP320t1             930
-#define OBJ_brainpoolP320t1             1L,3L,36L,3L,3L,2L,8L,1L,1L,10L
-
-#define SN_brainpoolP384r1              "brainpoolP384r1"
-#define NID_brainpoolP384r1             931
-#define OBJ_brainpoolP384r1             1L,3L,36L,3L,3L,2L,8L,1L,1L,11L
-
-#define SN_brainpoolP384t1              "brainpoolP384t1"
-#define NID_brainpoolP384t1             932
-#define OBJ_brainpoolP384t1             1L,3L,36L,3L,3L,2L,8L,1L,1L,12L
-
-#define SN_brainpoolP512r1              "brainpoolP512r1"
-#define NID_brainpoolP512r1             933
-#define OBJ_brainpoolP512r1             1L,3L,36L,3L,3L,2L,8L,1L,1L,13L
-
-#define SN_brainpoolP512t1              "brainpoolP512t1"
-#define NID_brainpoolP512t1             934
-#define OBJ_brainpoolP512t1             1L,3L,36L,3L,3L,2L,8L,1L,1L,14L
-
-#define OBJ_x9_63_scheme                1L,3L,133L,16L,840L,63L,0L
-
-#define OBJ_secg_scheme         OBJ_certicom_arc,1L
-
-#define SN_dhSinglePass_stdDH_sha1kdf_scheme            "dhSinglePass-stdDH-sha1kdf-scheme"
-#define NID_dhSinglePass_stdDH_sha1kdf_scheme           936
-#define OBJ_dhSinglePass_stdDH_sha1kdf_scheme           OBJ_x9_63_scheme,2L
-
-#define SN_dhSinglePass_stdDH_sha224kdf_scheme          "dhSinglePass-stdDH-sha224kdf-scheme"
-#define NID_dhSinglePass_stdDH_sha224kdf_scheme         937
-#define OBJ_dhSinglePass_stdDH_sha224kdf_scheme         OBJ_secg_scheme,11L,0L
-
-#define SN_dhSinglePass_stdDH_sha256kdf_scheme          "dhSinglePass-stdDH-sha256kdf-scheme"
-#define NID_dhSinglePass_stdDH_sha256kdf_scheme         938
-#define OBJ_dhSinglePass_stdDH_sha256kdf_scheme         OBJ_secg_scheme,11L,1L
-
-#define SN_dhSinglePass_stdDH_sha384kdf_scheme          "dhSinglePass-stdDH-sha384kdf-scheme"
-#define NID_dhSinglePass_stdDH_sha384kdf_scheme         939
-#define OBJ_dhSinglePass_stdDH_sha384kdf_scheme         OBJ_secg_scheme,11L,2L
-
-#define SN_dhSinglePass_stdDH_sha512kdf_scheme          "dhSinglePass-stdDH-sha512kdf-scheme"
-#define NID_dhSinglePass_stdDH_sha512kdf_scheme         940
-#define OBJ_dhSinglePass_stdDH_sha512kdf_scheme         OBJ_secg_scheme,11L,3L
-
-#define SN_dhSinglePass_cofactorDH_sha1kdf_scheme               "dhSinglePass-cofactorDH-sha1kdf-scheme"
-#define NID_dhSinglePass_cofactorDH_sha1kdf_scheme              941
-#define OBJ_dhSinglePass_cofactorDH_sha1kdf_scheme              OBJ_x9_63_scheme,3L
-
-#define SN_dhSinglePass_cofactorDH_sha224kdf_scheme             "dhSinglePass-cofactorDH-sha224kdf-scheme"
-#define NID_dhSinglePass_cofactorDH_sha224kdf_scheme            942
-#define OBJ_dhSinglePass_cofactorDH_sha224kdf_scheme            OBJ_secg_scheme,14L,0L
-
-#define SN_dhSinglePass_cofactorDH_sha256kdf_scheme             "dhSinglePass-cofactorDH-sha256kdf-scheme"
-#define NID_dhSinglePass_cofactorDH_sha256kdf_scheme            943
-#define OBJ_dhSinglePass_cofactorDH_sha256kdf_scheme            OBJ_secg_scheme,14L,1L
-
-#define SN_dhSinglePass_cofactorDH_sha384kdf_scheme             "dhSinglePass-cofactorDH-sha384kdf-scheme"
-#define NID_dhSinglePass_cofactorDH_sha384kdf_scheme            944
-#define OBJ_dhSinglePass_cofactorDH_sha384kdf_scheme            OBJ_secg_scheme,14L,2L
-
-#define SN_dhSinglePass_cofactorDH_sha512kdf_scheme             "dhSinglePass-cofactorDH-sha512kdf-scheme"
-#define NID_dhSinglePass_cofactorDH_sha512kdf_scheme            945
-#define OBJ_dhSinglePass_cofactorDH_sha512kdf_scheme            OBJ_secg_scheme,14L,3L
-
-#define SN_dh_std_kdf           "dh-std-kdf"
-#define NID_dh_std_kdf          946
-
-#define SN_dh_cofactor_kdf              "dh-cofactor-kdf"
-#define NID_dh_cofactor_kdf             947
-
-#define SN_ct_precert_scts              "ct_precert_scts"
-#define LN_ct_precert_scts              "CT Precertificate SCTs"
-#define NID_ct_precert_scts             951
-#define OBJ_ct_precert_scts             1L,3L,6L,1L,4L,1L,11129L,2L,4L,2L
-
-#define SN_ct_precert_poison            "ct_precert_poison"
-#define LN_ct_precert_poison            "CT Precertificate Poison"
-#define NID_ct_precert_poison           952
-#define OBJ_ct_precert_poison           1L,3L,6L,1L,4L,1L,11129L,2L,4L,3L
-
-#define SN_ct_precert_signer            "ct_precert_signer"
-#define LN_ct_precert_signer            "CT Precertificate Signer"
-#define NID_ct_precert_signer           953
-#define OBJ_ct_precert_signer           1L,3L,6L,1L,4L,1L,11129L,2L,4L,4L
-
-#define SN_ct_cert_scts         "ct_cert_scts"
-#define LN_ct_cert_scts         "CT Certificate SCTs"
-#define NID_ct_cert_scts                954
-#define OBJ_ct_cert_scts                1L,3L,6L,1L,4L,1L,11129L,2L,4L,5L
-
-#define SN_jurisdictionLocalityName             "jurisdictionL"
-#define LN_jurisdictionLocalityName             "jurisdictionLocalityName"
-#define NID_jurisdictionLocalityName            955
-#define OBJ_jurisdictionLocalityName            1L,3L,6L,1L,4L,1L,311L,60L,2L,1L,1L
-
-#define SN_jurisdictionStateOrProvinceName              "jurisdictionST"
-#define LN_jurisdictionStateOrProvinceName              "jurisdictionStateOrProvinceName"
-#define NID_jurisdictionStateOrProvinceName             956
-#define OBJ_jurisdictionStateOrProvinceName             1L,3L,6L,1L,4L,1L,311L,60L,2L,1L,2L
-
-#define SN_jurisdictionCountryName              "jurisdictionC"
-#define LN_jurisdictionCountryName              "jurisdictionCountryName"
-#define NID_jurisdictionCountryName             957
-#define OBJ_jurisdictionCountryName             1L,3L,6L,1L,4L,1L,311L,60L,2L,1L,3L
-
-#define SN_id_scrypt            "id-scrypt"
-#define NID_id_scrypt           973
-#define OBJ_id_scrypt           1L,3L,6L,1L,4L,1L,11591L,4L,11L
-
-#define SN_tls1_prf             "TLS1-PRF"
-#define LN_tls1_prf             "tls1-prf"
-#define NID_tls1_prf            1021
-
-#define SN_hkdf         "HKDF"
-#define LN_hkdf         "hkdf"
-#define NID_hkdf                1036
-
-#define SN_id_pkinit            "id-pkinit"
-#define NID_id_pkinit           1031
-#define OBJ_id_pkinit           1L,3L,6L,1L,5L,2L,3L
-
-#define SN_pkInitClientAuth             "pkInitClientAuth"
-#define LN_pkInitClientAuth             "PKINIT Client Auth"
-#define NID_pkInitClientAuth            1032
-#define OBJ_pkInitClientAuth            OBJ_id_pkinit,4L
-
-#define SN_pkInitKDC            "pkInitKDC"
-#define LN_pkInitKDC            "Signing KDC Response"
-#define NID_pkInitKDC           1033
-#define OBJ_pkInitKDC           OBJ_id_pkinit,5L
-
-#define SN_X25519               "X25519"
-#define NID_X25519              1034
-#define OBJ_X25519              1L,3L,101L,110L
-
-#define SN_X448         "X448"
-#define NID_X448                1035
-#define OBJ_X448                1L,3L,101L,111L
-
-#define SN_kx_rsa               "KxRSA"
-#define LN_kx_rsa               "kx-rsa"
-#define NID_kx_rsa              1037
-
-#define SN_kx_ecdhe             "KxECDHE"
-#define LN_kx_ecdhe             "kx-ecdhe"
-#define NID_kx_ecdhe            1038
-
-#define SN_kx_dhe               "KxDHE"
-#define LN_kx_dhe               "kx-dhe"
-#define NID_kx_dhe              1039
-
-#define SN_kx_ecdhe_psk         "KxECDHE-PSK"
-#define LN_kx_ecdhe_psk         "kx-ecdhe-psk"
-#define NID_kx_ecdhe_psk                1040
-
-#define SN_kx_dhe_psk           "KxDHE-PSK"
-#define LN_kx_dhe_psk           "kx-dhe-psk"
-#define NID_kx_dhe_psk          1041
-
-#define SN_kx_rsa_psk           "KxRSA_PSK"
-#define LN_kx_rsa_psk           "kx-rsa-psk"
-#define NID_kx_rsa_psk          1042
-
-#define SN_kx_psk               "KxPSK"
-#define LN_kx_psk               "kx-psk"
-#define NID_kx_psk              1043
-
-#define SN_kx_srp               "KxSRP"
-#define LN_kx_srp               "kx-srp"
-#define NID_kx_srp              1044
-
-#define SN_kx_gost              "KxGOST"
-#define LN_kx_gost              "kx-gost"
-#define NID_kx_gost             1045
-
-#define SN_auth_rsa             "AuthRSA"
-#define LN_auth_rsa             "auth-rsa"
-#define NID_auth_rsa            1046
-
-#define SN_auth_ecdsa           "AuthECDSA"
-#define LN_auth_ecdsa           "auth-ecdsa"
-#define NID_auth_ecdsa          1047
-
-#define SN_auth_psk             "AuthPSK"
-#define LN_auth_psk             "auth-psk"
-#define NID_auth_psk            1048
-
-#define SN_auth_dss             "AuthDSS"
-#define LN_auth_dss             "auth-dss"
-#define NID_auth_dss            1049
-
-#define SN_auth_gost01          "AuthGOST01"
-#define LN_auth_gost01          "auth-gost01"
-#define NID_auth_gost01         1050
-
-#define SN_auth_gost12          "AuthGOST12"
-#define LN_auth_gost12          "auth-gost12"
-#define NID_auth_gost12         1051
-
-#define SN_auth_srp             "AuthSRP"
-#define LN_auth_srp             "auth-srp"
-#define NID_auth_srp            1052
-
-#define SN_auth_null            "AuthNULL"
-#define LN_auth_null            "auth-null"
-#define NID_auth_null           1053

gpac-2.2.1.tar.gz/extra_lib/include/openssl/objects.h Deleted

@@ -1,1097 +0,0 @@
-/*
- * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
- *
- * Licensed under the OpenSSL license (the "License").  You may not use
- * this file except in compliance with the License.  You can obtain a copy
- * in the file LICENSE in the source distribution or at
- * https://www.openssl.org/source/license.html
- */
-
-#ifndef HEADER_OBJECTS_H
-# define HEADER_OBJECTS_H
-
-# define USE_OBJ_MAC
-
-# ifdef USE_OBJ_MAC
-#  include <openssl/obj_mac.h>
-# else
-#  define SN_undef                        "UNDEF"
-#  define LN_undef                        "undefined"
-#  define NID_undef                       0
-#  define OBJ_undef                       0L
-
-#  define SN_Algorithm                    "Algorithm"
-#  define LN_algorithm                    "algorithm"
-#  define NID_algorithm                   38
-#  define OBJ_algorithm                   1L,3L,14L,3L,2L
-
-#  define LN_rsadsi                       "rsadsi"
-#  define NID_rsadsi                      1
-#  define OBJ_rsadsi                      1L,2L,840L,113549L
-
-#  define LN_pkcs                         "pkcs"
-#  define NID_pkcs                        2
-#  define OBJ_pkcs                        OBJ_rsadsi,1L
-
-#  define SN_md2                          "MD2"
-#  define LN_md2                          "md2"
-#  define NID_md2                         3
-#  define OBJ_md2                         OBJ_rsadsi,2L,2L
-
-#  define SN_md5                          "MD5"
-#  define LN_md5                          "md5"
-#  define NID_md5                         4
-#  define OBJ_md5                         OBJ_rsadsi,2L,5L
-
-#  define SN_rc4                          "RC4"
-#  define LN_rc4                          "rc4"
-#  define NID_rc4                         5
-#  define OBJ_rc4                         OBJ_rsadsi,3L,4L
-
-#  define LN_rsaEncryption                "rsaEncryption"
-#  define NID_rsaEncryption               6
-#  define OBJ_rsaEncryption               OBJ_pkcs,1L,1L
-
-#  define SN_md2WithRSAEncryption         "RSA-MD2"
-#  define LN_md2WithRSAEncryption         "md2WithRSAEncryption"
-#  define NID_md2WithRSAEncryption        7
-#  define OBJ_md2WithRSAEncryption        OBJ_pkcs,1L,2L
-
-#  define SN_md5WithRSAEncryption         "RSA-MD5"
-#  define LN_md5WithRSAEncryption         "md5WithRSAEncryption"
-#  define NID_md5WithRSAEncryption        8
-#  define OBJ_md5WithRSAEncryption        OBJ_pkcs,1L,4L
-
-#  define SN_pbeWithMD2AndDES_CBC         "PBE-MD2-DES"
-#  define LN_pbeWithMD2AndDES_CBC         "pbeWithMD2AndDES-CBC"
-#  define NID_pbeWithMD2AndDES_CBC        9
-#  define OBJ_pbeWithMD2AndDES_CBC        OBJ_pkcs,5L,1L
-
-#  define SN_pbeWithMD5AndDES_CBC         "PBE-MD5-DES"
-#  define LN_pbeWithMD5AndDES_CBC         "pbeWithMD5AndDES-CBC"
-#  define NID_pbeWithMD5AndDES_CBC        10
-#  define OBJ_pbeWithMD5AndDES_CBC        OBJ_pkcs,5L,3L
-
-#  define LN_X500                         "X500"
-#  define NID_X500                        11
-#  define OBJ_X500                        2L,5L
-
-#  define LN_X509                         "X509"
-#  define NID_X509                        12
-#  define OBJ_X509                        OBJ_X500,4L
-
-#  define SN_commonName                   "CN"
-#  define LN_commonName                   "commonName"
-#  define NID_commonName                  13
-#  define OBJ_commonName                  OBJ_X509,3L
-
-#  define SN_countryName                  "C"
-#  define LN_countryName                  "countryName"
-#  define NID_countryName                 14
-#  define OBJ_countryName                 OBJ_X509,6L
-
-#  define SN_localityName                 "L"
-#  define LN_localityName                 "localityName"
-#  define NID_localityName                15
-#  define OBJ_localityName                OBJ_X509,7L
-
-/* Postal Address? PA */
-
-/* should be "ST" (rfc1327) but MS uses 'S' */
-#  define SN_stateOrProvinceName          "ST"
-#  define LN_stateOrProvinceName          "stateOrProvinceName"
-#  define NID_stateOrProvinceName         16
-#  define OBJ_stateOrProvinceName         OBJ_X509,8L
-
-#  define SN_organizationName             "O"
-#  define LN_organizationName             "organizationName"
-#  define NID_organizationName            17
-#  define OBJ_organizationName            OBJ_X509,10L
-
-#  define SN_organizationalUnitName       "OU"
-#  define LN_organizationalUnitName       "organizationalUnitName"
-#  define NID_organizationalUnitName      18
-#  define OBJ_organizationalUnitName      OBJ_X509,11L
-
-#  define SN_rsa                          "RSA"
-#  define LN_rsa                          "rsa"
-#  define NID_rsa                         19
-#  define OBJ_rsa                         OBJ_X500,8L,1L,1L
-
-#  define LN_pkcs7                        "pkcs7"
-#  define NID_pkcs7                       20
-#  define OBJ_pkcs7                       OBJ_pkcs,7L
-
-#  define LN_pkcs7_data                   "pkcs7-data"
-#  define NID_pkcs7_data                  21
-#  define OBJ_pkcs7_data                  OBJ_pkcs7,1L
-
-#  define LN_pkcs7_signed                 "pkcs7-signedData"
-#  define NID_pkcs7_signed                22
-#  define OBJ_pkcs7_signed                OBJ_pkcs7,2L
-
-#  define LN_pkcs7_enveloped              "pkcs7-envelopedData"
-#  define NID_pkcs7_enveloped             23
-#  define OBJ_pkcs7_enveloped             OBJ_pkcs7,3L
-
-#  define LN_pkcs7_signedAndEnveloped     "pkcs7-signedAndEnvelopedData"
-#  define NID_pkcs7_signedAndEnveloped    24
-#  define OBJ_pkcs7_signedAndEnveloped    OBJ_pkcs7,4L
-
-#  define LN_pkcs7_digest                 "pkcs7-digestData"
-#  define NID_pkcs7_digest                25
-#  define OBJ_pkcs7_digest                OBJ_pkcs7,5L
-
-#  define LN_pkcs7_encrypted              "pkcs7-encryptedData"
-#  define NID_pkcs7_encrypted             26
-#  define OBJ_pkcs7_encrypted             OBJ_pkcs7,6L
-
-#  define LN_pkcs3                        "pkcs3"
-#  define NID_pkcs3                       27
-#  define OBJ_pkcs3                       OBJ_pkcs,3L
-
-#  define LN_dhKeyAgreement               "dhKeyAgreement"
-#  define NID_dhKeyAgreement              28
-#  define OBJ_dhKeyAgreement              OBJ_pkcs3,1L
-
-#  define SN_des_ecb                      "DES-ECB"
-#  define LN_des_ecb                      "des-ecb"
-#  define NID_des_ecb                     29
-#  define OBJ_des_ecb                     OBJ_algorithm,6L
-
-#  define SN_des_cfb64                    "DES-CFB"
-#  define LN_des_cfb64                    "des-cfb"
-#  define NID_des_cfb64                   30
-/* IV + num */
-#  define OBJ_des_cfb64                   OBJ_algorithm,9L
-
-#  define SN_des_cbc                      "DES-CBC"
-#  define LN_des_cbc                      "des-cbc"
-#  define NID_des_cbc                     31
-/* IV */
-#  define OBJ_des_cbc                     OBJ_algorithm,7L
-
-#  define SN_des_ede                      "DES-EDE"
-#  define LN_des_ede                      "des-ede"
-#  define NID_des_ede                     32
-/* ?? */
-#  define OBJ_des_ede                     OBJ_algorithm,17L
-
-#  define SN_des_ede3                     "DES-EDE3"
-#  define LN_des_ede3                     "des-ede3"
-#  define NID_des_ede3                    33
-
-#  define SN_idea_cbc                     "IDEA-CBC"
-#  define LN_idea_cbc                     "idea-cbc"
-#  define NID_idea_cbc                    34
-#  define OBJ_idea_cbc                    1L,3L,6L,1L,4L,1L,188L,7L,1L,1L,2L
-
-#  define SN_idea_cfb64                   "IDEA-CFB"
-#  define LN_idea_cfb64                   "idea-cfb"
-#  define NID_idea_cfb64                  35
-
-#  define SN_idea_ecb                     "IDEA-ECB"
-#  define LN_idea_ecb                     "idea-ecb"
-#  define NID_idea_ecb                    36
-
-#  define SN_rc2_cbc                      "RC2-CBC"
-#  define LN_rc2_cbc                      "rc2-cbc"
-#  define NID_rc2_cbc                     37
-#  define OBJ_rc2_cbc                     OBJ_rsadsi,3L,2L
-
-#  define SN_rc2_ecb                      "RC2-ECB"
-#  define LN_rc2_ecb                      "rc2-ecb"
-#  define NID_rc2_ecb                     38
-
-#  define SN_rc2_cfb64                    "RC2-CFB"
-#  define LN_rc2_cfb64                    "rc2-cfb"
-#  define NID_rc2_cfb64                   39
-
-#  define SN_rc2_ofb64                    "RC2-OFB"
-#  define LN_rc2_ofb64                    "rc2-ofb"
-#  define NID_rc2_ofb64                   40
-
-#  define SN_sha                          "SHA"
-#  define LN_sha                          "sha"
-#  define NID_sha                         41
-#  define OBJ_sha                         OBJ_algorithm,18L
-
-#  define SN_shaWithRSAEncryption         "RSA-SHA"
-#  define LN_shaWithRSAEncryption         "shaWithRSAEncryption"
-#  define NID_shaWithRSAEncryption        42
-#  define OBJ_shaWithRSAEncryption        OBJ_algorithm,15L
-
-#  define SN_des_ede_cbc                  "DES-EDE-CBC"
-#  define LN_des_ede_cbc                  "des-ede-cbc"
-#  define NID_des_ede_cbc                 43
-
-#  define SN_des_ede3_cbc                 "DES-EDE3-CBC"
-#  define LN_des_ede3_cbc                 "des-ede3-cbc"
-#  define NID_des_ede3_cbc                44
-#  define OBJ_des_ede3_cbc                OBJ_rsadsi,3L,7L
-
-#  define SN_des_ofb64                    "DES-OFB"
-#  define LN_des_ofb64                    "des-ofb"
-#  define NID_des_ofb64                   45
-#  define OBJ_des_ofb64                   OBJ_algorithm,8L
-
-#  define SN_idea_ofb64                   "IDEA-OFB"
-#  define LN_idea_ofb64                   "idea-ofb"
-#  define NID_idea_ofb64                  46
-
-#  define LN_pkcs9                        "pkcs9"
-#  define NID_pkcs9                       47
-#  define OBJ_pkcs9                       OBJ_pkcs,9L
-
-#  define SN_pkcs9_emailAddress           "Email"
-#  define LN_pkcs9_emailAddress           "emailAddress"
-#  define NID_pkcs9_emailAddress          48
-#  define OBJ_pkcs9_emailAddress          OBJ_pkcs9,1L
-
-#  define LN_pkcs9_unstructuredName       "unstructuredName"
-#  define NID_pkcs9_unstructuredName      49
-#  define OBJ_pkcs9_unstructuredName      OBJ_pkcs9,2L
-
-#  define LN_pkcs9_contentType            "contentType"
-#  define NID_pkcs9_contentType           50
-#  define OBJ_pkcs9_contentType           OBJ_pkcs9,3L
-
-#  define LN_pkcs9_messageDigest          "messageDigest"
-#  define NID_pkcs9_messageDigest         51
-#  define OBJ_pkcs9_messageDigest         OBJ_pkcs9,4L
-
-#  define LN_pkcs9_signingTime            "signingTime"
-#  define NID_pkcs9_signingTime           52
-#  define OBJ_pkcs9_signingTime           OBJ_pkcs9,5L
-
-#  define LN_pkcs9_countersignature       "countersignature"
-#  define NID_pkcs9_countersignature      53
-#  define OBJ_pkcs9_countersignature      OBJ_pkcs9,6L
-
-#  define LN_pkcs9_challengePassword      "challengePassword"
-#  define NID_pkcs9_challengePassword     54
-#  define OBJ_pkcs9_challengePassword     OBJ_pkcs9,7L
-
-#  define LN_pkcs9_unstructuredAddress    "unstructuredAddress"
-#  define NID_pkcs9_unstructuredAddress   55
-#  define OBJ_pkcs9_unstructuredAddress   OBJ_pkcs9,8L
-
-#  define LN_pkcs9_extCertAttributes      "extendedCertificateAttributes"
-#  define NID_pkcs9_extCertAttributes     56
-#  define OBJ_pkcs9_extCertAttributes     OBJ_pkcs9,9L
-
-#  define SN_netscape                     "Netscape"
-#  define LN_netscape                     "Netscape Communications Corp."
-#  define NID_netscape                    57
-#  define OBJ_netscape                    2L,16L,840L,1L,113730L
-
-#  define SN_netscape_cert_extension      "nsCertExt"
-#  define LN_netscape_cert_extension      "Netscape Certificate Extension"
-#  define NID_netscape_cert_extension     58
-#  define OBJ_netscape_cert_extension     OBJ_netscape,1L
-
-#  define SN_netscape_data_type           "nsDataType"
-#  define LN_netscape_data_type           "Netscape Data Type"
-#  define NID_netscape_data_type          59
-#  define OBJ_netscape_data_type          OBJ_netscape,2L
-
-#  define SN_des_ede_cfb64                "DES-EDE-CFB"
-#  define LN_des_ede_cfb64                "des-ede-cfb"
-#  define NID_des_ede_cfb64               60
-
-#  define SN_des_ede3_cfb64               "DES-EDE3-CFB"
-#  define LN_des_ede3_cfb64               "des-ede3-cfb"
-#  define NID_des_ede3_cfb64              61
-
-#  define SN_des_ede_ofb64                "DES-EDE-OFB"
-#  define LN_des_ede_ofb64                "des-ede-ofb"
-#  define NID_des_ede_ofb64               62
-
-#  define SN_des_ede3_ofb64               "DES-EDE3-OFB"
-#  define LN_des_ede3_ofb64               "des-ede3-ofb"
-#  define NID_des_ede3_ofb64              63
-
-/* I'm not sure about the object ID */
-#  define SN_sha1                         "SHA1"
-#  define LN_sha1                         "sha1"
-#  define NID_sha1                        64
-#  define OBJ_sha1                        OBJ_algorithm,26L
-/* 28 Jun 1996 - eay */
-/* #define OBJ_sha1                     1L,3L,14L,2L,26L,05L <- wrong */
-
-#  define SN_sha1WithRSAEncryption        "RSA-SHA1"
-#  define LN_sha1WithRSAEncryption        "sha1WithRSAEncryption"
-#  define NID_sha1WithRSAEncryption       65
-#  define OBJ_sha1WithRSAEncryption       OBJ_pkcs,1L,5L
-
-#  define SN_dsaWithSHA                   "DSA-SHA"
-#  define LN_dsaWithSHA                   "dsaWithSHA"
-#  define NID_dsaWithSHA                  66
-#  define OBJ_dsaWithSHA                  OBJ_algorithm,13L
-
-#  define SN_dsa_2                        "DSA-old"
-#  define LN_dsa_2                        "dsaEncryption-old"
-#  define NID_dsa_2                       67
-#  define OBJ_dsa_2                       OBJ_algorithm,12L
-
-/* proposed by microsoft to RSA */
-#  define SN_pbeWithSHA1AndRC2_CBC        "PBE-SHA1-RC2-64"
-#  define LN_pbeWithSHA1AndRC2_CBC        "pbeWithSHA1AndRC2-CBC"
-#  define NID_pbeWithSHA1AndRC2_CBC       68
-#  define OBJ_pbeWithSHA1AndRC2_CBC       OBJ_pkcs,5L,11L
-
-/*
- * proposed by microsoft to RSA as pbeWithSHA1AndRC4: it is now defined
- * explicitly in PKCS#5 v2.0 as id-PBKDF2 which is something completely
- * different.
- */
-#  define LN_id_pbkdf2                    "PBKDF2"
-#  define NID_id_pbkdf2                   69
-#  define OBJ_id_pbkdf2                   OBJ_pkcs,5L,12L
-
-#  define SN_dsaWithSHA1_2                "DSA-SHA1-old"
-#  define LN_dsaWithSHA1_2                "dsaWithSHA1-old"
-#  define NID_dsaWithSHA1_2               70
-/* Got this one from 'sdn706r20.pdf' which is actually an NSA document :-) */
-#  define OBJ_dsaWithSHA1_2               OBJ_algorithm,27L
-
-#  define SN_netscape_cert_type           "nsCertType"
-#  define LN_netscape_cert_type           "Netscape Cert Type"
-#  define NID_netscape_cert_type          71
-#  define OBJ_netscape_cert_type          OBJ_netscape_cert_extension,1L
-
-#  define SN_netscape_base_url            "nsBaseUrl"
-#  define LN_netscape_base_url            "Netscape Base Url"
-#  define NID_netscape_base_url           72
-#  define OBJ_netscape_base_url           OBJ_netscape_cert_extension,2L
-
-#  define SN_netscape_revocation_url      "nsRevocationUrl"
-#  define LN_netscape_revocation_url      "Netscape Revocation Url"
-#  define NID_netscape_revocation_url     73
-#  define OBJ_netscape_revocation_url     OBJ_netscape_cert_extension,3L
-
-#  define SN_netscape_ca_revocation_url   "nsCaRevocationUrl"
-#  define LN_netscape_ca_revocation_url   "Netscape CA Revocation Url"
-#  define NID_netscape_ca_revocation_url  74
-#  define OBJ_netscape_ca_revocation_url  OBJ_netscape_cert_extension,4L
-
-#  define SN_netscape_renewal_url         "nsRenewalUrl"
-#  define LN_netscape_renewal_url         "Netscape Renewal Url"
-#  define NID_netscape_renewal_url        75
-#  define OBJ_netscape_renewal_url        OBJ_netscape_cert_extension,7L
-
-#  define SN_netscape_ca_policy_url       "nsCaPolicyUrl"
-#  define LN_netscape_ca_policy_url       "Netscape CA Policy Url"
-#  define NID_netscape_ca_policy_url      76
-#  define OBJ_netscape_ca_policy_url      OBJ_netscape_cert_extension,8L
-
-#  define SN_netscape_ssl_server_name     "nsSslServerName"
-#  define LN_netscape_ssl_server_name     "Netscape SSL Server Name"
-#  define NID_netscape_ssl_server_name    77
-#  define OBJ_netscape_ssl_server_name    OBJ_netscape_cert_extension,12L
-
-#  define SN_netscape_comment             "nsComment"
-#  define LN_netscape_comment             "Netscape Comment"
-#  define NID_netscape_comment            78
-#  define OBJ_netscape_comment            OBJ_netscape_cert_extension,13L
-
-#  define SN_netscape_cert_sequence       "nsCertSequence"
-#  define LN_netscape_cert_sequence       "Netscape Certificate Sequence"
-#  define NID_netscape_cert_sequence      79
-#  define OBJ_netscape_cert_sequence      OBJ_netscape_data_type,5L
-
-#  define SN_desx_cbc                     "DESX-CBC"
-#  define LN_desx_cbc                     "desx-cbc"
-#  define NID_desx_cbc                    80
-
-#  define SN_id_ce                        "id-ce"
-#  define NID_id_ce                       81
-#  define OBJ_id_ce                       2L,5L,29L
-
-#  define SN_subject_key_identifier       "subjectKeyIdentifier"
-#  define LN_subject_key_identifier       "X509v3 Subject Key Identifier"
-#  define NID_subject_key_identifier      82
-#  define OBJ_subject_key_identifier      OBJ_id_ce,14L
-
-#  define SN_key_usage                    "keyUsage"
-#  define LN_key_usage                    "X509v3 Key Usage"
-#  define NID_key_usage                   83
-#  define OBJ_key_usage                   OBJ_id_ce,15L
-
-#  define SN_private_key_usage_period     "privateKeyUsagePeriod"
-#  define LN_private_key_usage_period     "X509v3 Private Key Usage Period"
-#  define NID_private_key_usage_period    84
-#  define OBJ_private_key_usage_period    OBJ_id_ce,16L
-
-#  define SN_subject_alt_name             "subjectAltName"
-#  define LN_subject_alt_name             "X509v3 Subject Alternative Name"
-#  define NID_subject_alt_name            85
-#  define OBJ_subject_alt_name            OBJ_id_ce,17L
-
-#  define SN_issuer_alt_name              "issuerAltName"
-#  define LN_issuer_alt_name              "X509v3 Issuer Alternative Name"
-#  define NID_issuer_alt_name             86
-#  define OBJ_issuer_alt_name             OBJ_id_ce,18L
-
-#  define SN_basic_constraints            "basicConstraints"
-#  define LN_basic_constraints            "X509v3 Basic Constraints"
-#  define NID_basic_constraints           87
-#  define OBJ_basic_constraints           OBJ_id_ce,19L
-
-#  define SN_crl_number                   "crlNumber"
-#  define LN_crl_number                   "X509v3 CRL Number"
-#  define NID_crl_number                  88
-#  define OBJ_crl_number                  OBJ_id_ce,20L
-
-#  define SN_certificate_policies         "certificatePolicies"
-#  define LN_certificate_policies         "X509v3 Certificate Policies"
-#  define NID_certificate_policies        89
-#  define OBJ_certificate_policies        OBJ_id_ce,32L
-
-#  define SN_authority_key_identifier     "authorityKeyIdentifier"
-#  define LN_authority_key_identifier     "X509v3 Authority Key Identifier"
-#  define NID_authority_key_identifier    90
-#  define OBJ_authority_key_identifier    OBJ_id_ce,35L
-
-#  define SN_bf_cbc                       "BF-CBC"
-#  define LN_bf_cbc                       "bf-cbc"
-#  define NID_bf_cbc                      91
-#  define OBJ_bf_cbc                      1L,3L,6L,1L,4L,1L,3029L,1L,2L
-
-#  define SN_bf_ecb                       "BF-ECB"
-#  define LN_bf_ecb                       "bf-ecb"
-#  define NID_bf_ecb                      92
-
-#  define SN_bf_cfb64                     "BF-CFB"
-#  define LN_bf_cfb64                     "bf-cfb"
-#  define NID_bf_cfb64                    93
-
-#  define SN_bf_ofb64                     "BF-OFB"
-#  define LN_bf_ofb64                     "bf-ofb"
-#  define NID_bf_ofb64                    94
-
-#  define SN_mdc2                         "MDC2"
-#  define LN_mdc2                         "mdc2"
-#  define NID_mdc2                        95
-#  define OBJ_mdc2                        2L,5L,8L,3L,101L
-/* An alternative?                      1L,3L,14L,3L,2L,19L */
-
-#  define SN_mdc2WithRSA                  "RSA-MDC2"
-#  define LN_mdc2WithRSA                  "mdc2withRSA"
-#  define NID_mdc2WithRSA                 96
-#  define OBJ_mdc2WithRSA                 2L,5L,8L,3L,100L
-
-#  define SN_rc4_40                       "RC4-40"
-#  define LN_rc4_40                       "rc4-40"
-#  define NID_rc4_40                      97
-
-#  define SN_rc2_40_cbc                   "RC2-40-CBC"
-#  define LN_rc2_40_cbc                   "rc2-40-cbc"
-#  define NID_rc2_40_cbc                  98
-
-#  define SN_givenName                    "G"
-#  define LN_givenName                    "givenName"
-#  define NID_givenName                   99
-#  define OBJ_givenName                   OBJ_X509,42L
-
-#  define SN_surname                      "S"
-#  define LN_surname                      "surname"
-#  define NID_surname                     100
-#  define OBJ_surname                     OBJ_X509,4L
-
-#  define SN_initials                     "I"
-#  define LN_initials                     "initials"
-#  define NID_initials                    101
-#  define OBJ_initials                    OBJ_X509,43L
-
-#  define SN_uniqueIdentifier             "UID"
-#  define LN_uniqueIdentifier             "uniqueIdentifier"
-#  define NID_uniqueIdentifier            102
-#  define OBJ_uniqueIdentifier            OBJ_X509,45L
-
-#  define SN_crl_distribution_points      "crlDistributionPoints"
-#  define LN_crl_distribution_points      "X509v3 CRL Distribution Points"
-#  define NID_crl_distribution_points     103
-#  define OBJ_crl_distribution_points     OBJ_id_ce,31L
-
-#  define SN_md5WithRSA                   "RSA-NP-MD5"
-#  define LN_md5WithRSA                   "md5WithRSA"
-#  define NID_md5WithRSA                  104
-#  define OBJ_md5WithRSA                  OBJ_algorithm,3L
-
-#  define SN_serialNumber                 "SN"
-#  define LN_serialNumber                 "serialNumber"
-#  define NID_serialNumber                105
-#  define OBJ_serialNumber                OBJ_X509,5L
-
-#  define SN_title                        "T"
-#  define LN_title                        "title"
-#  define NID_title                       106
-#  define OBJ_title                       OBJ_X509,12L
-
-#  define SN_description                  "D"
-#  define LN_description                  "description"
-#  define NID_description                 107
-#  define OBJ_description                 OBJ_X509,13L
-
-/* CAST5 is CAST-128, I'm just sticking with the documentation */
-#  define SN_cast5_cbc                    "CAST5-CBC"
-#  define LN_cast5_cbc                    "cast5-cbc"
-#  define NID_cast5_cbc                   108
-#  define OBJ_cast5_cbc                   1L,2L,840L,113533L,7L,66L,10L
-
-#  define SN_cast5_ecb                    "CAST5-ECB"
-#  define LN_cast5_ecb                    "cast5-ecb"
-#  define NID_cast5_ecb                   109
-
-#  define SN_cast5_cfb64                  "CAST5-CFB"
-#  define LN_cast5_cfb64                  "cast5-cfb"
-#  define NID_cast5_cfb64                 110
-
-#  define SN_cast5_ofb64                  "CAST5-OFB"
-#  define LN_cast5_ofb64                  "cast5-ofb"
-#  define NID_cast5_ofb64                 111
-
-#  define LN_pbeWithMD5AndCast5_CBC       "pbeWithMD5AndCast5CBC"
-#  define NID_pbeWithMD5AndCast5_CBC      112
-#  define OBJ_pbeWithMD5AndCast5_CBC      1L,2L,840L,113533L,7L,66L,12L
-
-/*-
- * This is one sun will soon be using :-(
- * id-dsa-with-sha1 ID  ::= {
- *   iso(1) member-body(2) us(840) x9-57 (10040) x9cm(4) 3 }
- */
-#  define SN_dsaWithSHA1                  "DSA-SHA1"
-#  define LN_dsaWithSHA1                  "dsaWithSHA1"
-#  define NID_dsaWithSHA1                 113
-#  define OBJ_dsaWithSHA1                 1L,2L,840L,10040L,4L,3L
-
-#  define NID_md5_sha1                    114
-#  define SN_md5_sha1                     "MD5-SHA1"
-#  define LN_md5_sha1                     "md5-sha1"
-
-#  define SN_sha1WithRSA                  "RSA-SHA1-2"
-#  define LN_sha1WithRSA                  "sha1WithRSA"
-#  define NID_sha1WithRSA                 115
-#  define OBJ_sha1WithRSA                 OBJ_algorithm,29L
-
-#  define SN_dsa                          "DSA"
-#  define LN_dsa                          "dsaEncryption"
-#  define NID_dsa                         116
-#  define OBJ_dsa                         1L,2L,840L,10040L,4L,1L
-
-#  define SN_ripemd160                    "RIPEMD160"
-#  define LN_ripemd160                    "ripemd160"
-#  define NID_ripemd160                   117
-#  define OBJ_ripemd160                   1L,3L,36L,3L,2L,1L
-
-/*
- * The name should actually be rsaSignatureWithripemd160, but I'm going to
- * continue using the convention I'm using with the other ciphers
- */
-#  define SN_ripemd160WithRSA             "RSA-RIPEMD160"
-#  define LN_ripemd160WithRSA             "ripemd160WithRSA"
-#  define NID_ripemd160WithRSA            119
-#  define OBJ_ripemd160WithRSA            1L,3L,36L,3L,3L,1L,2L
-
-/*-
- * Taken from rfc2040
- *  RC5_CBC_Parameters ::= SEQUENCE {
- *      version           INTEGER (v1_0(16)),
- *      rounds            INTEGER (8..127),
- *      blockSizeInBits   INTEGER (64, 128),
- *      iv                OCTET STRING OPTIONAL
- *      }
- */
-#  define SN_rc5_cbc                      "RC5-CBC"
-#  define LN_rc5_cbc                      "rc5-cbc"
-#  define NID_rc5_cbc                     120
-#  define OBJ_rc5_cbc                     OBJ_rsadsi,3L,8L
-
-#  define SN_rc5_ecb                      "RC5-ECB"
-#  define LN_rc5_ecb                      "rc5-ecb"
-#  define NID_rc5_ecb                     121
-
-#  define SN_rc5_cfb64                    "RC5-CFB"
-#  define LN_rc5_cfb64                    "rc5-cfb"
-#  define NID_rc5_cfb64                   122
-
-#  define SN_rc5_ofb64                    "RC5-OFB"
-#  define LN_rc5_ofb64                    "rc5-ofb"
-#  define NID_rc5_ofb64                   123
-
-#  define SN_rle_compression              "RLE"
-#  define LN_rle_compression              "run length compression"
-#  define NID_rle_compression             124
-#  define OBJ_rle_compression             1L,1L,1L,1L,666L,1L
-
-#  define SN_zlib_compression             "ZLIB"
-#  define LN_zlib_compression             "zlib compression"
-#  define NID_zlib_compression            125
-#  define OBJ_zlib_compression            1L,1L,1L,1L,666L,2L
-
-#  define SN_ext_key_usage                "extendedKeyUsage"
-#  define LN_ext_key_usage                "X509v3 Extended Key Usage"
-#  define NID_ext_key_usage               126
-#  define OBJ_ext_key_usage               OBJ_id_ce,37
-
-#  define SN_id_pkix                      "PKIX"
-#  define NID_id_pkix                     127
-#  define OBJ_id_pkix                     1L,3L,6L,1L,5L,5L,7L
-
-#  define SN_id_kp                        "id-kp"
-#  define NID_id_kp                       128
-#  define OBJ_id_kp                       OBJ_id_pkix,3L
-
-/* PKIX extended key usage OIDs */
-
-#  define SN_server_auth                  "serverAuth"
-#  define LN_server_auth                  "TLS Web Server Authentication"
-#  define NID_server_auth                 129
-#  define OBJ_server_auth                 OBJ_id_kp,1L
-
-#  define SN_client_auth                  "clientAuth"
-#  define LN_client_auth                  "TLS Web Client Authentication"
-#  define NID_client_auth                 130
-#  define OBJ_client_auth                 OBJ_id_kp,2L
-
-#  define SN_code_sign                    "codeSigning"
-#  define LN_code_sign                    "Code Signing"
-#  define NID_code_sign                   131
-#  define OBJ_code_sign                   OBJ_id_kp,3L
-
-#  define SN_email_protect                "emailProtection"
-#  define LN_email_protect                "E-mail Protection"
-#  define NID_email_protect               132
-#  define OBJ_email_protect               OBJ_id_kp,4L
-
-#  define SN_time_stamp                   "timeStamping"
-#  define LN_time_stamp                   "Time Stamping"
-#  define NID_time_stamp                  133
-#  define OBJ_time_stamp                  OBJ_id_kp,8L
-
-/* Additional extended key usage OIDs: Microsoft */
-
-#  define SN_ms_code_ind                  "msCodeInd"
-#  define LN_ms_code_ind                  "Microsoft Individual Code Signing"
-#  define NID_ms_code_ind                 134
-#  define OBJ_ms_code_ind                 1L,3L,6L,1L,4L,1L,311L,2L,1L,21L
-
-#  define SN_ms_code_com                  "msCodeCom"
-#  define LN_ms_code_com                  "Microsoft Commercial Code Signing"
-#  define NID_ms_code_com                 135
-#  define OBJ_ms_code_com                 1L,3L,6L,1L,4L,1L,311L,2L,1L,22L
-
-#  define SN_ms_ctl_sign                  "msCTLSign"
-#  define LN_ms_ctl_sign                  "Microsoft Trust List Signing"
-#  define NID_ms_ctl_sign                 136
-#  define OBJ_ms_ctl_sign                 1L,3L,6L,1L,4L,1L,311L,10L,3L,1L
-
-#  define SN_ms_sgc                       "msSGC"
-#  define LN_ms_sgc                       "Microsoft Server Gated Crypto"
-#  define NID_ms_sgc                      137
-#  define OBJ_ms_sgc                      1L,3L,6L,1L,4L,1L,311L,10L,3L,3L
-
-#  define SN_ms_efs                       "msEFS"
-#  define LN_ms_efs                       "Microsoft Encrypted File System"
-#  define NID_ms_efs                      138
-#  define OBJ_ms_efs                      1L,3L,6L,1L,4L,1L,311L,10L,3L,4L
-
-/* Additional usage: Netscape */
-
-#  define SN_ns_sgc                       "nsSGC"
-#  define LN_ns_sgc                       "Netscape Server Gated Crypto"
-#  define NID_ns_sgc                      139
-#  define OBJ_ns_sgc                      OBJ_netscape,4L,1L
-
-#  define SN_delta_crl                    "deltaCRL"
-#  define LN_delta_crl                    "X509v3 Delta CRL Indicator"
-#  define NID_delta_crl                   140
-#  define OBJ_delta_crl                   OBJ_id_ce,27L
-
-#  define SN_crl_reason                   "CRLReason"
-#  define LN_crl_reason                   "CRL Reason Code"
-#  define NID_crl_reason                  141
-#  define OBJ_crl_reason                  OBJ_id_ce,21L
-
-#  define SN_invalidity_date              "invalidityDate"
-#  define LN_invalidity_date              "Invalidity Date"
-#  define NID_invalidity_date             142
-#  define OBJ_invalidity_date             OBJ_id_ce,24L
-
-#  define SN_sxnet                        "SXNetID"
-#  define LN_sxnet                        "Strong Extranet ID"
-#  define NID_sxnet                       143
-#  define OBJ_sxnet                       1L,3L,101L,1L,4L,1L
-
-/* PKCS12 and related OBJECT IDENTIFIERS */
-
-#  define OBJ_pkcs12                      OBJ_pkcs,12L
-#  define OBJ_pkcs12_pbeids               OBJ_pkcs12, 1
-
-#  define SN_pbe_WithSHA1And128BitRC4     "PBE-SHA1-RC4-128"
-#  define LN_pbe_WithSHA1And128BitRC4     "pbeWithSHA1And128BitRC4"
-#  define NID_pbe_WithSHA1And128BitRC4    144
-#  define OBJ_pbe_WithSHA1And128BitRC4    OBJ_pkcs12_pbeids, 1L
-
-#  define SN_pbe_WithSHA1And40BitRC4      "PBE-SHA1-RC4-40"
-#  define LN_pbe_WithSHA1And40BitRC4      "pbeWithSHA1And40BitRC4"
-#  define NID_pbe_WithSHA1And40BitRC4     145
-#  define OBJ_pbe_WithSHA1And40BitRC4     OBJ_pkcs12_pbeids, 2L
-
-#  define SN_pbe_WithSHA1And3_Key_TripleDES_CBC   "PBE-SHA1-3DES"
-#  define LN_pbe_WithSHA1And3_Key_TripleDES_CBC   "pbeWithSHA1And3-KeyTripleDES-CBC"
-#  define NID_pbe_WithSHA1And3_Key_TripleDES_CBC  146
-#  define OBJ_pbe_WithSHA1And3_Key_TripleDES_CBC  OBJ_pkcs12_pbeids, 3L
-
-#  define SN_pbe_WithSHA1And2_Key_TripleDES_CBC   "PBE-SHA1-2DES"
-#  define LN_pbe_WithSHA1And2_Key_TripleDES_CBC   "pbeWithSHA1And2-KeyTripleDES-CBC"
-#  define NID_pbe_WithSHA1And2_Key_TripleDES_CBC  147
-#  define OBJ_pbe_WithSHA1And2_Key_TripleDES_CBC  OBJ_pkcs12_pbeids, 4L
-
-#  define SN_pbe_WithSHA1And128BitRC2_CBC         "PBE-SHA1-RC2-128"
-#  define LN_pbe_WithSHA1And128BitRC2_CBC         "pbeWithSHA1And128BitRC2-CBC"
-#  define NID_pbe_WithSHA1And128BitRC2_CBC        148
-#  define OBJ_pbe_WithSHA1And128BitRC2_CBC        OBJ_pkcs12_pbeids, 5L
-
-#  define SN_pbe_WithSHA1And40BitRC2_CBC  "PBE-SHA1-RC2-40"
-#  define LN_pbe_WithSHA1And40BitRC2_CBC  "pbeWithSHA1And40BitRC2-CBC"
-#  define NID_pbe_WithSHA1And40BitRC2_CBC 149
-#  define OBJ_pbe_WithSHA1And40BitRC2_CBC OBJ_pkcs12_pbeids, 6L
-
-#  define OBJ_pkcs12_Version1     OBJ_pkcs12, 10L
-
-#  define OBJ_pkcs12_BagIds       OBJ_pkcs12_Version1, 1L
-
-#  define LN_keyBag               "keyBag"
-#  define NID_keyBag              150
-#  define OBJ_keyBag              OBJ_pkcs12_BagIds, 1L
-
-#  define LN_pkcs8ShroudedKeyBag  "pkcs8ShroudedKeyBag"
-#  define NID_pkcs8ShroudedKeyBag 151
-#  define OBJ_pkcs8ShroudedKeyBag OBJ_pkcs12_BagIds, 2L
-
-#  define LN_certBag              "certBag"
-#  define NID_certBag             152
-#  define OBJ_certBag             OBJ_pkcs12_BagIds, 3L
-
-#  define LN_crlBag               "crlBag"
-#  define NID_crlBag              153
-#  define OBJ_crlBag              OBJ_pkcs12_BagIds, 4L
-
-#  define LN_secretBag            "secretBag"
-#  define NID_secretBag           154
-#  define OBJ_secretBag           OBJ_pkcs12_BagIds, 5L
-
-#  define LN_safeContentsBag      "safeContentsBag"
-#  define NID_safeContentsBag     155
-#  define OBJ_safeContentsBag     OBJ_pkcs12_BagIds, 6L
-
-#  define LN_friendlyName         "friendlyName"
-#  define NID_friendlyName        156
-#  define OBJ_friendlyName        OBJ_pkcs9, 20L
-
-#  define LN_localKeyID           "localKeyID"
-#  define NID_localKeyID          157
-#  define OBJ_localKeyID          OBJ_pkcs9, 21L
-
-#  define OBJ_certTypes           OBJ_pkcs9, 22L
-
-#  define LN_x509Certificate      "x509Certificate"
-#  define NID_x509Certificate     158
-#  define OBJ_x509Certificate     OBJ_certTypes, 1L
-
-#  define LN_sdsiCertificate      "sdsiCertificate"
-#  define NID_sdsiCertificate     159
-#  define OBJ_sdsiCertificate     OBJ_certTypes, 2L
-
-#  define OBJ_crlTypes            OBJ_pkcs9, 23L
-
-#  define LN_x509Crl              "x509Crl"
-#  define NID_x509Crl             160
-#  define OBJ_x509Crl             OBJ_crlTypes, 1L
-
-/* PKCS#5 v2 OIDs */
-
-#  define LN_pbes2                "PBES2"
-#  define NID_pbes2               161
-#  define OBJ_pbes2               OBJ_pkcs,5L,13L
-
-#  define LN_pbmac1               "PBMAC1"
-#  define NID_pbmac1              162
-#  define OBJ_pbmac1              OBJ_pkcs,5L,14L
-
-#  define LN_hmacWithSHA1         "hmacWithSHA1"
-#  define NID_hmacWithSHA1        163
-#  define OBJ_hmacWithSHA1        OBJ_rsadsi,2L,7L
-
-/* Policy Qualifier Ids */
-
-#  define LN_id_qt_cps            "Policy Qualifier CPS"
-#  define SN_id_qt_cps            "id-qt-cps"
-#  define NID_id_qt_cps           164
-#  define OBJ_id_qt_cps           OBJ_id_pkix,2L,1L
-
-#  define LN_id_qt_unotice        "Policy Qualifier User Notice"
-#  define SN_id_qt_unotice        "id-qt-unotice"
-#  define NID_id_qt_unotice       165
-#  define OBJ_id_qt_unotice       OBJ_id_pkix,2L,2L
-
-#  define SN_rc2_64_cbc                   "RC2-64-CBC"
-#  define LN_rc2_64_cbc                   "rc2-64-cbc"
-#  define NID_rc2_64_cbc                  166
-
-#  define SN_SMIMECapabilities            "SMIME-CAPS"
-#  define LN_SMIMECapabilities            "S/MIME Capabilities"
-#  define NID_SMIMECapabilities           167
-#  define OBJ_SMIMECapabilities           OBJ_pkcs9,15L
-
-#  define SN_pbeWithMD2AndRC2_CBC         "PBE-MD2-RC2-64"
-#  define LN_pbeWithMD2AndRC2_CBC         "pbeWithMD2AndRC2-CBC"
-#  define NID_pbeWithMD2AndRC2_CBC        168
-#  define OBJ_pbeWithMD2AndRC2_CBC        OBJ_pkcs,5L,4L
-
-#  define SN_pbeWithMD5AndRC2_CBC         "PBE-MD5-RC2-64"
-#  define LN_pbeWithMD5AndRC2_CBC         "pbeWithMD5AndRC2-CBC"
-#  define NID_pbeWithMD5AndRC2_CBC        169
-#  define OBJ_pbeWithMD5AndRC2_CBC        OBJ_pkcs,5L,6L
-
-#  define SN_pbeWithSHA1AndDES_CBC        "PBE-SHA1-DES"
-#  define LN_pbeWithSHA1AndDES_CBC        "pbeWithSHA1AndDES-CBC"
-#  define NID_pbeWithSHA1AndDES_CBC       170
-#  define OBJ_pbeWithSHA1AndDES_CBC       OBJ_pkcs,5L,10L
-
-/* Extension request OIDs */
-
-#  define LN_ms_ext_req                   "Microsoft Extension Request"
-#  define SN_ms_ext_req                   "msExtReq"
-#  define NID_ms_ext_req                  171
-#  define OBJ_ms_ext_req                  1L,3L,6L,1L,4L,1L,311L,2L,1L,14L
-
-#  define LN_ext_req                      "Extension Request"
-#  define SN_ext_req                      "extReq"
-#  define NID_ext_req                     172
-#  define OBJ_ext_req                     OBJ_pkcs9,14L
-
-#  define SN_name                         "name"
-#  define LN_name                         "name"
-#  define NID_name                        173
-#  define OBJ_name                        OBJ_X509,41L
-
-#  define SN_dnQualifier                  "dnQualifier"
-#  define LN_dnQualifier                  "dnQualifier"
-#  define NID_dnQualifier                 174
-#  define OBJ_dnQualifier                 OBJ_X509,46L
-
-#  define SN_id_pe                        "id-pe"
-#  define NID_id_pe                       175
-#  define OBJ_id_pe                       OBJ_id_pkix,1L
-
-#  define SN_id_ad                        "id-ad"
-#  define NID_id_ad                       176
-#  define OBJ_id_ad                       OBJ_id_pkix,48L
-
-#  define SN_info_access                  "authorityInfoAccess"
-#  define LN_info_access                  "Authority Information Access"
-#  define NID_info_access                 177
-#  define OBJ_info_access                 OBJ_id_pe,1L
-
-#  define SN_ad_OCSP                      "OCSP"
-#  define LN_ad_OCSP                      "OCSP"
-#  define NID_ad_OCSP                     178
-#  define OBJ_ad_OCSP                     OBJ_id_ad,1L
-
-#  define SN_ad_ca_issuers                "caIssuers"
-#  define LN_ad_ca_issuers                "CA Issuers"
-#  define NID_ad_ca_issuers               179
-#  define OBJ_ad_ca_issuers               OBJ_id_ad,2L
-
-#  define SN_OCSP_sign                    "OCSPSigning"
-#  define LN_OCSP_sign                    "OCSP Signing"
-#  define NID_OCSP_sign                   180
-#  define OBJ_OCSP_sign                   OBJ_id_kp,9L
-# endif                         /* USE_OBJ_MAC */
-
-# include <openssl/bio.h>
-# include <openssl/asn1.h>
-
-# define OBJ_NAME_TYPE_UNDEF             0x00
-# define OBJ_NAME_TYPE_MD_METH           0x01
-# define OBJ_NAME_TYPE_CIPHER_METH       0x02
-# define OBJ_NAME_TYPE_PKEY_METH         0x03
-# define OBJ_NAME_TYPE_COMP_METH         0x04
-# define OBJ_NAME_TYPE_NUM               0x05
-
-# define OBJ_NAME_ALIAS                  0x8000
-
-# define OBJ_BSEARCH_VALUE_ON_NOMATCH            0x01
-# define OBJ_BSEARCH_FIRST_VALUE_ON_MATCH        0x02
-
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-typedef struct obj_name_st {
-    int type;
-    int alias;
-    const char *name;
-    const char *data;
-} OBJ_NAME;
-
-# define         OBJ_create_and_add_object(a,b,c) OBJ_create(a,b,c)
-
-int OBJ_NAME_init(void);
-int OBJ_NAME_new_index(unsigned long (*hash_func) (const char *),
-                       int (*cmp_func) (const char *, const char *),
-                       void (*free_func) (const char *, int, const char *));
-const char *OBJ_NAME_get(const char *name, int type);
-int OBJ_NAME_add(const char *name, int type, const char *data);
-int OBJ_NAME_remove(const char *name, int type);
-void OBJ_NAME_cleanup(int type); /* -1 for everything */
-void OBJ_NAME_do_all(int type, void (*fn) (const OBJ_NAME *, void *arg),
-                     void *arg);
-void OBJ_NAME_do_all_sorted(int type,
-                            void (*fn) (const OBJ_NAME *, void *arg),
-                            void *arg);
-
-ASN1_OBJECT *OBJ_dup(const ASN1_OBJECT *o);
-ASN1_OBJECT *OBJ_nid2obj(int n);
-const char *OBJ_nid2ln(int n);
-const char *OBJ_nid2sn(int n);
-int OBJ_obj2nid(const ASN1_OBJECT *o);
-ASN1_OBJECT *OBJ_txt2obj(const char *s, int no_name);
-int OBJ_obj2txt(char *buf, int buf_len, const ASN1_OBJECT *a, int no_name);
-int OBJ_txt2nid(const char *s);
-int OBJ_ln2nid(const char *s);
-int OBJ_sn2nid(const char *s);
-int OBJ_cmp(const ASN1_OBJECT *a, const ASN1_OBJECT *b);
-const void *OBJ_bsearch_(const void *key, const void *base, int num, int size,
-                         int (*cmp) (const void *, const void *));
-const void *OBJ_bsearch_ex_(const void *key, const void *base, int num,
-                            int size,
-                            int (*cmp) (const void *, const void *),
-                            int flags);
-
-# define _DECLARE_OBJ_BSEARCH_CMP_FN(scope, type1, type2, nm)    \
-  static int nm##_cmp_BSEARCH_CMP_FN(const void *, const void *); \
-  static int nm##_cmp(type1 const *, type2 const *); \
-  scope type2 * OBJ_bsearch_##nm(type1 *key, type2 const *base, int num)
-
-# define DECLARE_OBJ_BSEARCH_CMP_FN(type1, type2, cmp)   \
-  _DECLARE_OBJ_BSEARCH_CMP_FN(static, type1, type2, cmp)
-# define DECLARE_OBJ_BSEARCH_GLOBAL_CMP_FN(type1, type2, nm)     \
-  type2 * OBJ_bsearch_##nm(type1 *key, type2 const *base, int num)
-
-/*-
- * Unsolved problem: if a type is actually a pointer type, like
- * nid_triple is, then its impossible to get a const where you need
- * it. Consider:
- *
- * typedef int nid_triple3;
- * const void *a_;
- * const nid_triple const *a = a_;
- *
- * The assignment discards a const because what you really want is:
- *
- * const int const * const *a = a_;
- *
- * But if you do that, you lose the fact that a is an array of 3 ints,
- * which breaks comparison functions.
- *
- * Thus we end up having to cast, sadly, or unpack the
- * declarations. Or, as I finally did in this case, declare nid_triple
- * to be a struct, which it should have been in the first place.
- *
- * Ben, August 2008.
- *
- * Also, strictly speaking not all types need be const, but handling
- * the non-constness means a lot of complication, and in practice
- * comparison routines do always not touch their arguments.
- */
-
-# define IMPLEMENT_OBJ_BSEARCH_CMP_FN(type1, type2, nm)  \
-  static int nm##_cmp_BSEARCH_CMP_FN(const void *a_, const void *b_)    \
-      { \
-      type1 const *a = a_; \
-      type2 const *b = b_; \
-      return nm##_cmp(a,b); \
-      } \
-  static type2 *OBJ_bsearch_##nm(type1 *key, type2 const *base, int num) \
-      { \
-      return (type2 *)OBJ_bsearch_(key, base, num, sizeof(type2), \
-                                        nm##_cmp_BSEARCH_CMP_FN); \
-      } \
-      extern void dummy_prototype(void)
-
-# define IMPLEMENT_OBJ_BSEARCH_GLOBAL_CMP_FN(type1, type2, nm)   \
-  static int nm##_cmp_BSEARCH_CMP_FN(const void *a_, const void *b_)    \
-      { \
-      type1 const *a = a_; \
-      type2 const *b = b_; \
-      return nm##_cmp(a,b); \
-      } \
-  type2 *OBJ_bsearch_##nm(type1 *key, type2 const *base, int num) \
-      { \
-      return (type2 *)OBJ_bsearch_(key, base, num, sizeof(type2), \
-                                        nm##_cmp_BSEARCH_CMP_FN); \
-      } \
-      extern void dummy_prototype(void)
-
-# define OBJ_bsearch(type1,key,type2,base,num,cmp)                              \
-  ((type2 *)OBJ_bsearch_(CHECKED_PTR_OF(type1,key),CHECKED_PTR_OF(type2,base), \
-                         num,sizeof(type2),                             \
-                         ((void)CHECKED_PTR_OF(type1,cmp##_type_1),     \
-                          (void)CHECKED_PTR_OF(type2,cmp##_type_2),     \
-                          cmp##_BSEARCH_CMP_FN)))
-
-# define OBJ_bsearch_ex(type1,key,type2,base,num,cmp,flags)                      \
-  ((type2 *)OBJ_bsearch_ex_(CHECKED_PTR_OF(type1,key),CHECKED_PTR_OF(type2,base), \
-                         num,sizeof(type2),                             \
-                         ((void)CHECKED_PTR_OF(type1,cmp##_type_1),     \
-                          (void)type_2=CHECKED_PTR_OF(type2,cmp##_type_2), \
-                          cmp##_BSEARCH_CMP_FN)),flags)
-
-int OBJ_new_nid(int num);
-int OBJ_add_object(const ASN1_OBJECT *obj);
-int OBJ_create(const char *oid, const char *sn, const char *ln);
-#if OPENSSL_API_COMPAT < 0x10100000L
-# define OBJ_cleanup() while(0) continue
-#endif
-int OBJ_create_objects(BIO *in);
-
-size_t OBJ_length(const ASN1_OBJECT *obj);
-const unsigned char *OBJ_get0_data(const ASN1_OBJECT *obj);
-
-int OBJ_find_sigid_algs(int signid, int *pdig_nid, int *ppkey_nid);
-int OBJ_find_sigid_by_algs(int *psignid, int dig_nid, int pkey_nid);
-int OBJ_add_sigid(int signid, int dig_id, int pkey_id);
-void OBJ_sigid_free(void);
-
-/* BEGIN ERROR CODES */
-/*
- * The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
-
-int ERR_load_OBJ_strings(void);
-
-/* Error codes for the OBJ functions. */
-
-/* Function codes. */
-# define OBJ_F_OBJ_ADD_OBJECT                             105
-# define OBJ_F_OBJ_CREATE                                 100
-# define OBJ_F_OBJ_DUP                                    101
-# define OBJ_F_OBJ_NAME_NEW_INDEX                         106
-# define OBJ_F_OBJ_NID2LN                                 102
-# define OBJ_F_OBJ_NID2OBJ                                103
-# define OBJ_F_OBJ_NID2SN                                 104
-
-/* Reason codes. */
-# define OBJ_R_OID_EXISTS                                 102
-# define OBJ_R_UNKNOWN_NID                                101
-
-# ifdef  __cplusplus
-}
-# endif
-#endif

gpac-2.2.1.tar.gz/extra_lib/include/openssl/ocsp.h Deleted

@@ -1,412 +0,0 @@
-/*
- * Copyright 2000-2016 The OpenSSL Project Authors. All Rights Reserved.
- *
- * Licensed under the OpenSSL license (the "License").  You may not use
- * this file except in compliance with the License.  You can obtain a copy
- * in the file LICENSE in the source distribution or at
- * https://www.openssl.org/source/license.html
- */
-
-#ifndef HEADER_OCSP_H
-# define HEADER_OCSP_H
-
-#include <openssl/opensslconf.h>
-
-/*
- * These definitions are outside the OPENSSL_NO_OCSP guard because although for
- * historical reasons they have OCSP_* names, they can actually be used
- * independently of OCSP. E.g. see RFC5280
- */
-/*-
- *   CRLReason ::= ENUMERATED {
- *        unspecified             (0),
- *        keyCompromise           (1),
- *        cACompromise            (2),
- *        affiliationChanged      (3),
- *        superseded              (4),
- *        cessationOfOperation    (5),
- *        certificateHold         (6),
- *        removeFromCRL           (8) }
- */
-#  define OCSP_REVOKED_STATUS_NOSTATUS               -1
-#  define OCSP_REVOKED_STATUS_UNSPECIFIED             0
-#  define OCSP_REVOKED_STATUS_KEYCOMPROMISE           1
-#  define OCSP_REVOKED_STATUS_CACOMPROMISE            2
-#  define OCSP_REVOKED_STATUS_AFFILIATIONCHANGED      3
-#  define OCSP_REVOKED_STATUS_SUPERSEDED              4
-#  define OCSP_REVOKED_STATUS_CESSATIONOFOPERATION    5
-#  define OCSP_REVOKED_STATUS_CERTIFICATEHOLD         6
-#  define OCSP_REVOKED_STATUS_REMOVEFROMCRL           8
-
-
-# ifndef OPENSSL_NO_OCSP
-
-#  include <openssl/ossl_typ.h>
-#  include <openssl/x509.h>
-#  include <openssl/x509v3.h>
-#  include <openssl/safestack.h>
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-/* Various flags and values */
-
-#  define OCSP_DEFAULT_NONCE_LENGTH       16
-
-#  define OCSP_NOCERTS                    0x1
-#  define OCSP_NOINTERN                   0x2
-#  define OCSP_NOSIGS                     0x4
-#  define OCSP_NOCHAIN                    0x8
-#  define OCSP_NOVERIFY                   0x10
-#  define OCSP_NOEXPLICIT                 0x20
-#  define OCSP_NOCASIGN                   0x40
-#  define OCSP_NODELEGATED                0x80
-#  define OCSP_NOCHECKS                   0x100
-#  define OCSP_TRUSTOTHER                 0x200
-#  define OCSP_RESPID_KEY                 0x400
-#  define OCSP_NOTIME                     0x800
-
-typedef struct ocsp_cert_id_st OCSP_CERTID;
-
-DEFINE_STACK_OF(OCSP_CERTID)
-
-typedef struct ocsp_one_request_st OCSP_ONEREQ;
-
-DEFINE_STACK_OF(OCSP_ONEREQ)
-
-typedef struct ocsp_req_info_st OCSP_REQINFO;
-typedef struct ocsp_signature_st OCSP_SIGNATURE;
-typedef struct ocsp_request_st OCSP_REQUEST;
-
-#  define OCSP_RESPONSE_STATUS_SUCCESSFUL           0
-#  define OCSP_RESPONSE_STATUS_MALFORMEDREQUEST     1
-#  define OCSP_RESPONSE_STATUS_INTERNALERROR        2
-#  define OCSP_RESPONSE_STATUS_TRYLATER             3
-#  define OCSP_RESPONSE_STATUS_SIGREQUIRED          5
-#  define OCSP_RESPONSE_STATUS_UNAUTHORIZED         6
-
-typedef struct ocsp_resp_bytes_st OCSP_RESPBYTES;
-
-#  define V_OCSP_RESPID_NAME 0
-#  define V_OCSP_RESPID_KEY  1
-
-DEFINE_STACK_OF(OCSP_RESPID)
-DECLARE_ASN1_FUNCTIONS(OCSP_RESPID)
-
-typedef struct ocsp_revoked_info_st OCSP_REVOKEDINFO;
-
-#  define V_OCSP_CERTSTATUS_GOOD    0
-#  define V_OCSP_CERTSTATUS_REVOKED 1
-#  define V_OCSP_CERTSTATUS_UNKNOWN 2
-
-typedef struct ocsp_cert_status_st OCSP_CERTSTATUS;
-typedef struct ocsp_single_response_st OCSP_SINGLERESP;
-
-DEFINE_STACK_OF(OCSP_SINGLERESP)
-
-typedef struct ocsp_response_data_st OCSP_RESPDATA;
-
-typedef struct ocsp_basic_response_st OCSP_BASICRESP;
-
-typedef struct ocsp_crl_id_st OCSP_CRLID;
-typedef struct ocsp_service_locator_st OCSP_SERVICELOC;
-
-#  define PEM_STRING_OCSP_REQUEST "OCSP REQUEST"
-#  define PEM_STRING_OCSP_RESPONSE "OCSP RESPONSE"
-
-#  define d2i_OCSP_REQUEST_bio(bp,p) ASN1_d2i_bio_of(OCSP_REQUEST,OCSP_REQUEST_new,d2i_OCSP_REQUEST,bp,p)
-
-#  define d2i_OCSP_RESPONSE_bio(bp,p) ASN1_d2i_bio_of(OCSP_RESPONSE,OCSP_RESPONSE_new,d2i_OCSP_RESPONSE,bp,p)
-
-#  define PEM_read_bio_OCSP_REQUEST(bp,x,cb) (OCSP_REQUEST *)PEM_ASN1_read_bio( \
-     (char *(*)())d2i_OCSP_REQUEST,PEM_STRING_OCSP_REQUEST,bp,(char **)x,cb,NULL)
-
-#   define PEM_read_bio_OCSP_RESPONSE(bp,x,cb)(OCSP_RESPONSE *)PEM_ASN1_read_bio(\
-     (char *(*)())d2i_OCSP_RESPONSE,PEM_STRING_OCSP_RESPONSE,bp,(char **)x,cb,NULL)
-
-#  define PEM_write_bio_OCSP_REQUEST(bp,o) \
-    PEM_ASN1_write_bio((int (*)())i2d_OCSP_REQUEST,PEM_STRING_OCSP_REQUEST,\
-                        bp,(char *)o, NULL,NULL,0,NULL,NULL)
-
-#  define PEM_write_bio_OCSP_RESPONSE(bp,o) \
-    PEM_ASN1_write_bio((int (*)())i2d_OCSP_RESPONSE,PEM_STRING_OCSP_RESPONSE,\
-                        bp,(char *)o, NULL,NULL,0,NULL,NULL)
-
-#  define i2d_OCSP_RESPONSE_bio(bp,o) ASN1_i2d_bio_of(OCSP_RESPONSE,i2d_OCSP_RESPONSE,bp,o)
-
-#  define i2d_OCSP_REQUEST_bio(bp,o) ASN1_i2d_bio_of(OCSP_REQUEST,i2d_OCSP_REQUEST,bp,o)
-
-#  define OCSP_REQUEST_sign(o,pkey,md) \
-        ASN1_item_sign(ASN1_ITEM_rptr(OCSP_REQINFO),\
-                &o->optionalSignature->signatureAlgorithm,NULL,\
-                o->optionalSignature->signature,&o->tbsRequest,pkey,md)
-
-#  define OCSP_BASICRESP_sign(o,pkey,md,d) \
-        ASN1_item_sign(ASN1_ITEM_rptr(OCSP_RESPDATA),&o->signatureAlgorithm,NULL,\
-                o->signature,&o->tbsResponseData,pkey,md)
-
-#  define OCSP_REQUEST_verify(a,r) ASN1_item_verify(ASN1_ITEM_rptr(OCSP_REQINFO),\
-        &a->optionalSignature->signatureAlgorithm,\
-        a->optionalSignature->signature,&a->tbsRequest,r)
-
-#  define OCSP_BASICRESP_verify(a,r,d) ASN1_item_verify(ASN1_ITEM_rptr(OCSP_RESPDATA),\
-        &a->signatureAlgorithm,a->signature,&a->tbsResponseData,r)
-
-#  define ASN1_BIT_STRING_digest(data,type,md,len) \
-        ASN1_item_digest(ASN1_ITEM_rptr(ASN1_BIT_STRING),type,data,md,len)
-
-#  define OCSP_CERTSTATUS_dup(cs)\
-                (OCSP_CERTSTATUS*)ASN1_dup((int(*)())i2d_OCSP_CERTSTATUS,\
-                (char *(*)())d2i_OCSP_CERTSTATUS,(char *)(cs))
-
-OCSP_CERTID *OCSP_CERTID_dup(OCSP_CERTID *id);
-
-OCSP_RESPONSE *OCSP_sendreq_bio(BIO *b, const char *path, OCSP_REQUEST *req);
-OCSP_REQ_CTX *OCSP_sendreq_new(BIO *io, const char *path, OCSP_REQUEST *req,
-                               int maxline);
-int OCSP_REQ_CTX_nbio(OCSP_REQ_CTX *rctx);
-int OCSP_sendreq_nbio(OCSP_RESPONSE **presp, OCSP_REQ_CTX *rctx);
-OCSP_REQ_CTX *OCSP_REQ_CTX_new(BIO *io, int maxline);
-void OCSP_REQ_CTX_free(OCSP_REQ_CTX *rctx);
-void OCSP_set_max_response_length(OCSP_REQ_CTX *rctx, unsigned long len);
-int OCSP_REQ_CTX_i2d(OCSP_REQ_CTX *rctx, const ASN1_ITEM *it,
-                     ASN1_VALUE *val);
-int OCSP_REQ_CTX_nbio_d2i(OCSP_REQ_CTX *rctx, ASN1_VALUE **pval,
-                          const ASN1_ITEM *it);
-BIO *OCSP_REQ_CTX_get0_mem_bio(OCSP_REQ_CTX *rctx);
-int OCSP_REQ_CTX_i2d(OCSP_REQ_CTX *rctx, const ASN1_ITEM *it,
-                     ASN1_VALUE *val);
-int OCSP_REQ_CTX_http(OCSP_REQ_CTX *rctx, const char *op, const char *path);
-int OCSP_REQ_CTX_set1_req(OCSP_REQ_CTX *rctx, OCSP_REQUEST *req);
-int OCSP_REQ_CTX_add1_header(OCSP_REQ_CTX *rctx,
-                             const char *name, const char *value);
-
-OCSP_CERTID *OCSP_cert_to_id(const EVP_MD *dgst, const X509 *subject,
-                             const X509 *issuer);
-
-OCSP_CERTID *OCSP_cert_id_new(const EVP_MD *dgst,
-                              const X509_NAME *issuerName,
-                              const ASN1_BIT_STRING *issuerKey,
-                              const ASN1_INTEGER *serialNumber);
-
-OCSP_ONEREQ *OCSP_request_add0_id(OCSP_REQUEST *req, OCSP_CERTID *cid);
-
-int OCSP_request_add1_nonce(OCSP_REQUEST *req, unsigned char *val, int len);
-int OCSP_basic_add1_nonce(OCSP_BASICRESP *resp, unsigned char *val, int len);
-int OCSP_check_nonce(OCSP_REQUEST *req, OCSP_BASICRESP *bs);
-int OCSP_copy_nonce(OCSP_BASICRESP *resp, OCSP_REQUEST *req);
-
-int OCSP_request_set1_name(OCSP_REQUEST *req, X509_NAME *nm);
-int OCSP_request_add1_cert(OCSP_REQUEST *req, X509 *cert);
-
-int OCSP_request_sign(OCSP_REQUEST *req,
-                      X509 *signer,
-                      EVP_PKEY *key,
-                      const EVP_MD *dgst,
-                      STACK_OF(X509) *certs, unsigned long flags);
-
-int OCSP_response_status(OCSP_RESPONSE *resp);
-OCSP_BASICRESP *OCSP_response_get1_basic(OCSP_RESPONSE *resp);
-
-const ASN1_OCTET_STRING *OCSP_resp_get0_signature(const OCSP_BASICRESP *bs);
-
-int OCSP_resp_count(OCSP_BASICRESP *bs);
-OCSP_SINGLERESP *OCSP_resp_get0(OCSP_BASICRESP *bs, int idx);
-const ASN1_GENERALIZEDTIME *OCSP_resp_get0_produced_at(const OCSP_BASICRESP* bs);
-const STACK_OF(X509) *OCSP_resp_get0_certs(const OCSP_BASICRESP *bs);
-int OCSP_resp_get0_id(const OCSP_BASICRESP *bs,
-                      const ASN1_OCTET_STRING **pid,
-                      const X509_NAME **pname);
-
-int OCSP_resp_find(OCSP_BASICRESP *bs, OCSP_CERTID *id, int last);
-int OCSP_single_get0_status(OCSP_SINGLERESP *single, int *reason,
-                            ASN1_GENERALIZEDTIME **revtime,
-                            ASN1_GENERALIZEDTIME **thisupd,
-                            ASN1_GENERALIZEDTIME **nextupd);
-int OCSP_resp_find_status(OCSP_BASICRESP *bs, OCSP_CERTID *id, int *status,
-                          int *reason,
-                          ASN1_GENERALIZEDTIME **revtime,
-                          ASN1_GENERALIZEDTIME **thisupd,
-                          ASN1_GENERALIZEDTIME **nextupd);
-int OCSP_check_validity(ASN1_GENERALIZEDTIME *thisupd,
-                        ASN1_GENERALIZEDTIME *nextupd, long sec, long maxsec);
-
-int OCSP_request_verify(OCSP_REQUEST *req, STACK_OF(X509) *certs,
-                        X509_STORE *store, unsigned long flags);
-
-int OCSP_parse_url(const char *url, char **phost, char **pport, char **ppath,
-                   int *pssl);
-
-int OCSP_id_issuer_cmp(OCSP_CERTID *a, OCSP_CERTID *b);
-int OCSP_id_cmp(OCSP_CERTID *a, OCSP_CERTID *b);
-
-int OCSP_request_onereq_count(OCSP_REQUEST *req);
-OCSP_ONEREQ *OCSP_request_onereq_get0(OCSP_REQUEST *req, int i);
-OCSP_CERTID *OCSP_onereq_get0_id(OCSP_ONEREQ *one);
-int OCSP_id_get0_info(ASN1_OCTET_STRING **piNameHash, ASN1_OBJECT **pmd,
-                      ASN1_OCTET_STRING **pikeyHash,
-                      ASN1_INTEGER **pserial, OCSP_CERTID *cid);
-int OCSP_request_is_signed(OCSP_REQUEST *req);
-OCSP_RESPONSE *OCSP_response_create(int status, OCSP_BASICRESP *bs);
-OCSP_SINGLERESP *OCSP_basic_add1_status(OCSP_BASICRESP *rsp,
-                                        OCSP_CERTID *cid,
-                                        int status, int reason,
-                                        ASN1_TIME *revtime,
-                                        ASN1_TIME *thisupd,
-                                        ASN1_TIME *nextupd);
-int OCSP_basic_add1_cert(OCSP_BASICRESP *resp, X509 *cert);
-int OCSP_basic_sign(OCSP_BASICRESP *brsp,
-                    X509 *signer, EVP_PKEY *key, const EVP_MD *dgst,
-                    STACK_OF(X509) *certs, unsigned long flags);
-int OCSP_RESPID_set_by_name(OCSP_RESPID *respid, X509 *cert);
-int OCSP_RESPID_set_by_key(OCSP_RESPID *respid, X509 *cert);
-int OCSP_RESPID_match(OCSP_RESPID *respid, X509 *cert);
-
-X509_EXTENSION *OCSP_crlID_new(const char *url, long *n, char *tim);
-
-X509_EXTENSION *OCSP_accept_responses_new(char **oids);
-
-X509_EXTENSION *OCSP_archive_cutoff_new(char *tim);
-
-X509_EXTENSION *OCSP_url_svcloc_new(X509_NAME *issuer, const char **urls);
-
-int OCSP_REQUEST_get_ext_count(OCSP_REQUEST *x);
-int OCSP_REQUEST_get_ext_by_NID(OCSP_REQUEST *x, int nid, int lastpos);
-int OCSP_REQUEST_get_ext_by_OBJ(OCSP_REQUEST *x, const ASN1_OBJECT *obj,
-                                int lastpos);
-int OCSP_REQUEST_get_ext_by_critical(OCSP_REQUEST *x, int crit, int lastpos);
-X509_EXTENSION *OCSP_REQUEST_get_ext(OCSP_REQUEST *x, int loc);
-X509_EXTENSION *OCSP_REQUEST_delete_ext(OCSP_REQUEST *x, int loc);
-void *OCSP_REQUEST_get1_ext_d2i(OCSP_REQUEST *x, int nid, int *crit,
-                                int *idx);
-int OCSP_REQUEST_add1_ext_i2d(OCSP_REQUEST *x, int nid, void *value, int crit,
-                              unsigned long flags);
-int OCSP_REQUEST_add_ext(OCSP_REQUEST *x, X509_EXTENSION *ex, int loc);
-
-int OCSP_ONEREQ_get_ext_count(OCSP_ONEREQ *x);
-int OCSP_ONEREQ_get_ext_by_NID(OCSP_ONEREQ *x, int nid, int lastpos);
-int OCSP_ONEREQ_get_ext_by_OBJ(OCSP_ONEREQ *x, const ASN1_OBJECT *obj, int lastpos);
-int OCSP_ONEREQ_get_ext_by_critical(OCSP_ONEREQ *x, int crit, int lastpos);
-X509_EXTENSION *OCSP_ONEREQ_get_ext(OCSP_ONEREQ *x, int loc);
-X509_EXTENSION *OCSP_ONEREQ_delete_ext(OCSP_ONEREQ *x, int loc);
-void *OCSP_ONEREQ_get1_ext_d2i(OCSP_ONEREQ *x, int nid, int *crit, int *idx);
-int OCSP_ONEREQ_add1_ext_i2d(OCSP_ONEREQ *x, int nid, void *value, int crit,
-                             unsigned long flags);
-int OCSP_ONEREQ_add_ext(OCSP_ONEREQ *x, X509_EXTENSION *ex, int loc);
-
-int OCSP_BASICRESP_get_ext_count(OCSP_BASICRESP *x);
-int OCSP_BASICRESP_get_ext_by_NID(OCSP_BASICRESP *x, int nid, int lastpos);
-int OCSP_BASICRESP_get_ext_by_OBJ(OCSP_BASICRESP *x, const ASN1_OBJECT *obj,
-                                  int lastpos);
-int OCSP_BASICRESP_get_ext_by_critical(OCSP_BASICRESP *x, int crit,
-                                       int lastpos);
-X509_EXTENSION *OCSP_BASICRESP_get_ext(OCSP_BASICRESP *x, int loc);
-X509_EXTENSION *OCSP_BASICRESP_delete_ext(OCSP_BASICRESP *x, int loc);
-void *OCSP_BASICRESP_get1_ext_d2i(OCSP_BASICRESP *x, int nid, int *crit,
-                                  int *idx);
-int OCSP_BASICRESP_add1_ext_i2d(OCSP_BASICRESP *x, int nid, void *value,
-                                int crit, unsigned long flags);
-int OCSP_BASICRESP_add_ext(OCSP_BASICRESP *x, X509_EXTENSION *ex, int loc);
-
-int OCSP_SINGLERESP_get_ext_count(OCSP_SINGLERESP *x);
-int OCSP_SINGLERESP_get_ext_by_NID(OCSP_SINGLERESP *x, int nid, int lastpos);
-int OCSP_SINGLERESP_get_ext_by_OBJ(OCSP_SINGLERESP *x, const ASN1_OBJECT *obj,
-                                   int lastpos);
-int OCSP_SINGLERESP_get_ext_by_critical(OCSP_SINGLERESP *x, int crit,
-                                        int lastpos);
-X509_EXTENSION *OCSP_SINGLERESP_get_ext(OCSP_SINGLERESP *x, int loc);
-X509_EXTENSION *OCSP_SINGLERESP_delete_ext(OCSP_SINGLERESP *x, int loc);
-void *OCSP_SINGLERESP_get1_ext_d2i(OCSP_SINGLERESP *x, int nid, int *crit,
-                                   int *idx);
-int OCSP_SINGLERESP_add1_ext_i2d(OCSP_SINGLERESP *x, int nid, void *value,
-                                 int crit, unsigned long flags);
-int OCSP_SINGLERESP_add_ext(OCSP_SINGLERESP *x, X509_EXTENSION *ex, int loc);
-const OCSP_CERTID *OCSP_SINGLERESP_get0_id(const OCSP_SINGLERESP *x);
-
-DECLARE_ASN1_FUNCTIONS(OCSP_SINGLERESP)
-DECLARE_ASN1_FUNCTIONS(OCSP_CERTSTATUS)
-DECLARE_ASN1_FUNCTIONS(OCSP_REVOKEDINFO)
-DECLARE_ASN1_FUNCTIONS(OCSP_BASICRESP)
-DECLARE_ASN1_FUNCTIONS(OCSP_RESPDATA)
-DECLARE_ASN1_FUNCTIONS(OCSP_RESPID)
-DECLARE_ASN1_FUNCTIONS(OCSP_RESPONSE)
-DECLARE_ASN1_FUNCTIONS(OCSP_RESPBYTES)
-DECLARE_ASN1_FUNCTIONS(OCSP_ONEREQ)
-DECLARE_ASN1_FUNCTIONS(OCSP_CERTID)
-DECLARE_ASN1_FUNCTIONS(OCSP_REQUEST)
-DECLARE_ASN1_FUNCTIONS(OCSP_SIGNATURE)
-DECLARE_ASN1_FUNCTIONS(OCSP_REQINFO)
-DECLARE_ASN1_FUNCTIONS(OCSP_CRLID)
-DECLARE_ASN1_FUNCTIONS(OCSP_SERVICELOC)
-
-const char *OCSP_response_status_str(long s);
-const char *OCSP_cert_status_str(long s);
-const char *OCSP_crl_reason_str(long s);
-
-int OCSP_REQUEST_print(BIO *bp, OCSP_REQUEST *a, unsigned long flags);
-int OCSP_RESPONSE_print(BIO *bp, OCSP_RESPONSE *o, unsigned long flags);
-
-int OCSP_basic_verify(OCSP_BASICRESP *bs, STACK_OF(X509) *certs,
-                      X509_STORE *st, unsigned long flags);
-
-/* BEGIN ERROR CODES */
-/*
- * The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
-
-int ERR_load_OCSP_strings(void);
-
-/* Error codes for the OCSP functions. */
-
-/* Function codes. */
-# define OCSP_F_D2I_OCSP_NONCE                            102
-# define OCSP_F_OCSP_BASIC_ADD1_STATUS                    103
-# define OCSP_F_OCSP_BASIC_SIGN                           104
-# define OCSP_F_OCSP_BASIC_VERIFY                         105
-# define OCSP_F_OCSP_CERT_ID_NEW                          101
-# define OCSP_F_OCSP_CHECK_DELEGATED                      106
-# define OCSP_F_OCSP_CHECK_IDS                            107
-# define OCSP_F_OCSP_CHECK_ISSUER                         108
-# define OCSP_F_OCSP_CHECK_VALIDITY                       115
-# define OCSP_F_OCSP_MATCH_ISSUERID                       109
-# define OCSP_F_OCSP_PARSE_URL                            114
-# define OCSP_F_OCSP_REQUEST_SIGN                         110
-# define OCSP_F_OCSP_REQUEST_VERIFY                       116
-# define OCSP_F_OCSP_RESPONSE_GET1_BASIC                  111
-# define OCSP_F_PARSE_HTTP_LINE1                          118
-
-/* Reason codes. */
-# define OCSP_R_CERTIFICATE_VERIFY_ERROR                  101
-# define OCSP_R_DIGEST_ERR                                102
-# define OCSP_R_ERROR_IN_NEXTUPDATE_FIELD                 122
-# define OCSP_R_ERROR_IN_THISUPDATE_FIELD                 123
-# define OCSP_R_ERROR_PARSING_URL                         121
-# define OCSP_R_MISSING_OCSPSIGNING_USAGE                 103
-# define OCSP_R_NEXTUPDATE_BEFORE_THISUPDATE              124
-# define OCSP_R_NOT_BASIC_RESPONSE                        104
-# define OCSP_R_NO_CERTIFICATES_IN_CHAIN                  105
-# define OCSP_R_NO_RESPONSE_DATA                          108
-# define OCSP_R_NO_REVOKED_TIME                           109
-# define OCSP_R_NO_SIGNER_KEY                             130
-# define OCSP_R_PRIVATE_KEY_DOES_NOT_MATCH_CERTIFICATE    110
-# define OCSP_R_REQUEST_NOT_SIGNED                        128
-# define OCSP_R_RESPONSE_CONTAINS_NO_REVOCATION_DATA      111
-# define OCSP_R_ROOT_CA_NOT_TRUSTED                       112
-# define OCSP_R_SERVER_RESPONSE_ERROR                     114
-# define OCSP_R_SERVER_RESPONSE_PARSE_ERROR               115
-# define OCSP_R_SIGNATURE_FAILURE                         117
-# define OCSP_R_SIGNER_CERTIFICATE_NOT_FOUND              118
-# define OCSP_R_STATUS_EXPIRED                            125
-# define OCSP_R_STATUS_NOT_YET_VALID                      126
-# define OCSP_R_STATUS_TOO_OLD                            127
-# define OCSP_R_UNKNOWN_MESSAGE_DIGEST                    119
-# define OCSP_R_UNKNOWN_NID                               120
-# define OCSP_R_UNSUPPORTED_REQUESTORNAME_TYPE            129
-
-#  ifdef  __cplusplus
-}
-#  endif
-# endif
-#endif

gpac-2.2.1.tar.gz/extra_lib/include/openssl/opensslconf.h Deleted

@@ -1,172 +0,0 @@
-/*
- * WARNING: do not edit!
- * Generated by makefile from include\openssl\opensslconf.h.in
- *
- * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
- *
- * Licensed under the OpenSSL license (the "License").  You may not use
- * this file except in compliance with the License.  You can obtain a copy
- * in the file LICENSE in the source distribution or at
- * https://www.openssl.org/source/license.html
- */
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-#ifdef OPENSSL_ALGORITHM_DEFINES
-# error OPENSSL_ALGORITHM_DEFINES no longer supported
-#endif
-
-/*
- * OpenSSL was configured with the following options:
- */
-
-#ifndef OPENSSL_SYS_WIN32
-# define OPENSSL_SYS_WIN32 1
-#endif
-#ifndef OPENSSL_NO_MD2
-# define OPENSSL_NO_MD2
-#endif
-#ifndef OPENSSL_NO_RC5
-# define OPENSSL_NO_RC5
-#endif
-#ifndef OPENSSL_THREADS
-# define OPENSSL_THREADS
-#endif
-#ifndef OPENSSL_NO_ASAN
-# define OPENSSL_NO_ASAN
-#endif
-#ifndef OPENSSL_NO_CRYPTO_MDEBUG
-# define OPENSSL_NO_CRYPTO_MDEBUG
-#endif
-#ifndef OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE
-# define OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE
-#endif
-#ifndef OPENSSL_NO_EC_NISTP_64_GCC_128
-# define OPENSSL_NO_EC_NISTP_64_GCC_128
-#endif
-#ifndef OPENSSL_NO_EGD
-# define OPENSSL_NO_EGD
-#endif
-#ifndef OPENSSL_NO_FUZZ_AFL
-# define OPENSSL_NO_FUZZ_AFL
-#endif
-#ifndef OPENSSL_NO_FUZZ_LIBFUZZER
-# define OPENSSL_NO_FUZZ_LIBFUZZER
-#endif
-#ifndef OPENSSL_NO_HEARTBEATS
-# define OPENSSL_NO_HEARTBEATS
-#endif
-#ifndef OPENSSL_NO_MSAN
-# define OPENSSL_NO_MSAN
-#endif
-#ifndef OPENSSL_NO_SCTP
-# define OPENSSL_NO_SCTP
-#endif
-#ifndef OPENSSL_NO_SSL_TRACE
-# define OPENSSL_NO_SSL_TRACE
-#endif
-#ifndef OPENSSL_NO_SSL3
-# define OPENSSL_NO_SSL3
-#endif
-#ifndef OPENSSL_NO_SSL3_METHOD
-# define OPENSSL_NO_SSL3_METHOD
-#endif
-#ifndef OPENSSL_NO_UBSAN
-# define OPENSSL_NO_UBSAN
-#endif
-#ifndef OPENSSL_NO_UNIT_TEST
-# define OPENSSL_NO_UNIT_TEST
-#endif
-#ifndef OPENSSL_NO_WEAK_SSL_CIPHERS
-# define OPENSSL_NO_WEAK_SSL_CIPHERS
-#endif
-#ifndef OPENSSL_NO_AFALGENG
-# define OPENSSL_NO_AFALGENG
-#endif
-
-
-/*
- * Sometimes OPENSSSL_NO_xxx ends up with an empty file and some compilers
- * don't like that.  This will hopefully silence them.
- */
-#define NON_EMPTY_TRANSLATION_UNIT static void *dummy = &dummy;
-
-/*
- * Applications should use -DOPENSSL_API_COMPAT=<version> to suppress the
- * declarations of functions deprecated in or before <version>. Otherwise, they
- * still won't see them if the library has been built to disable deprecated
- * functions.
- */
-#if defined(OPENSSL_NO_DEPRECATED)
-# define DECLARE_DEPRECATED(f)
-#elif __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0)
-# define DECLARE_DEPRECATED(f)    f __attribute__ ((deprecated));
-#else
-# define DECLARE_DEPRECATED(f)   f;
-#endif
-
-#ifndef OPENSSL_FILE
-# ifdef OPENSSL_NO_FILENAMES
-#  define OPENSSL_FILE ""
-#  define OPENSSL_LINE 0
-# else
-#  define OPENSSL_FILE __FILE__
-#  define OPENSSL_LINE __LINE__
-# endif
-#endif
-
-#ifndef OPENSSL_MIN_API
-# define OPENSSL_MIN_API 0
-#endif
-
-#if !defined(OPENSSL_API_COMPAT) || OPENSSL_API_COMPAT < OPENSSL_MIN_API
-# undef OPENSSL_API_COMPAT
-# define OPENSSL_API_COMPAT OPENSSL_MIN_API
-#endif
-
-#if OPENSSL_API_COMPAT < 0x10100000L
-# define DEPRECATEDIN_1_1_0(f)   DECLARE_DEPRECATED(f)
-#else
-# define DEPRECATEDIN_1_1_0(f)
-#endif
-
-#if OPENSSL_API_COMPAT < 0x10000000L
-# define DEPRECATEDIN_1_0_0(f)   DECLARE_DEPRECATED(f)
-#else
-# define DEPRECATEDIN_1_0_0(f)
-#endif
-
-#if OPENSSL_API_COMPAT < 0x00908000L
-# define DEPRECATEDIN_0_9_8(f)   DECLARE_DEPRECATED(f)
-#else
-# define DEPRECATEDIN_0_9_8(f)
-#endif
-
-#define OPENSSL_CPUID_OBJ
-
-/* Generate 80386 code? */
-#undef I386_ONLY
-
-#undef OPENSSL_UNISTD
-#define OPENSSL_UNISTD <unistd.h>
-
-#define OPENSSL_EXPORT_VAR_AS_FUNCTION
-
-/*
- * The following are cipher-specific, but are part of the public API.
- */
-#if !defined(OPENSSL_SYS_UEFI)
-# define BN_LLONG
-/* Only one for the following should be defined */
-# undef SIXTY_FOUR_BIT_LONG
-# undef SIXTY_FOUR_BIT
-# define THIRTY_TWO_BIT
-#endif
-
-#define RC4_INT unsigned int
-
-#ifdef  __cplusplus
-}
-#endif

gpac-2.2.1.tar.gz/extra_lib/include/openssl/opensslv.h Deleted

@@ -1,105 +0,0 @@
-/*
- * Copyright 1999-2016 The OpenSSL Project Authors. All Rights Reserved.
- *
- * Licensed under the OpenSSL license (the "License").  You may not use
- * this file except in compliance with the License.  You can obtain a copy
- * in the file LICENSE in the source distribution or at
- * https://www.openssl.org/source/license.html
- */
-
-#ifndef HEADER_OPENSSLV_H
-# define HEADER_OPENSSLV_H
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-/*-
- * Numeric release version identifier:
- * MNNFFPPS: major minor fix patch status
- * The status nibble has one of the values 0 for development, 1 to e for betas
- * 1 to 14, and f for release.  The patch level is exactly that.
- * For example:
- * 0.9.3-dev      0x00903000
- * 0.9.3-beta1    0x00903001
- * 0.9.3-beta2-dev 0x00903002
- * 0.9.3-beta2    0x00903002 (same as ...beta2-dev)
- * 0.9.3          0x0090300f
- * 0.9.3a         0x0090301f
- * 0.9.4          0x0090400f
- * 1.2.3z         0x102031af
- *
- * For continuity reasons (because 0.9.5 is already out, and is coded
- * 0x00905100), between 0.9.5 and 0.9.6 the coding of the patch level
- * part is slightly different, by setting the highest bit.  This means
- * that 0.9.5a looks like this: 0x0090581f.  At 0.9.6, we can start
- * with 0x0090600S...
- *
- * (Prior to 0.9.3-dev a different scheme was used: 0.9.2b is 0x0922.)
- * (Prior to 0.9.5a beta1, a different scheme was used: MMNNFFRBB for
- *  major minor fix final patch/beta)
- */
-# define OPENSSL_VERSION_NUMBER  0x1010006fL
-# ifdef OPENSSL_FIPS
-#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.1.0f-fips  25 May 2017"
-# else
-#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.1.0f  25 May 2017"
-# endif
-
-/*-
- * The macros below are to be used for shared library (.so, .dll, ...)
- * versioning.  That kind of versioning works a bit differently between
- * operating systems.  The most usual scheme is to set a major and a minor
- * number, and have the runtime loader check that the major number is equal
- * to what it was at application link time, while the minor number has to
- * be greater or equal to what it was at application link time.  With this
- * scheme, the version number is usually part of the file name, like this:
- *
- *      libcrypto.so.0.9
- *
- * Some unixen also make a softlink with the major version number only:
- *
- *      libcrypto.so.0
- *
- * On Tru64 and IRIX 6.x it works a little bit differently.  There, the
- * shared library version is stored in the file, and is actually a series
- * of versions, separated by colons.  The rightmost version present in the
- * library when linking an application is stored in the application to be
- * matched at run time.  When the application is run, a check is done to
- * see if the library version stored in the application matches any of the
- * versions in the version string of the library itself.
- * This version string can be constructed in any way, depending on what
- * kind of matching is desired.  However, to implement the same scheme as
- * the one used in the other unixen, all compatible versions, from lowest
- * to highest, should be part of the string.  Consecutive builds would
- * give the following versions strings:
- *
- *      3.0
- *      3.0:3.1
- *      3.0:3.1:3.2
- *      4.0
- *      4.0:4.1
- *
- * Notice how version 4 is completely incompatible with version, and
- * therefore give the breach you can see.
- *
- * There may be other schemes as well that I haven't yet discovered.
- *
- * So, here's the way it works here: first of all, the library version
- * number doesn't need at all to match the overall OpenSSL version.
- * However, it's nice and more understandable if it actually does.
- * The current library version is stored in the macro SHLIB_VERSION_NUMBER,
- * which is just a piece of text in the format "M.m.e" (Major, minor, edit).
- * For the sake of Tru64, IRIX, and any other OS that behaves in similar ways,
- * we need to keep a history of version numbers, which is done in the
- * macro SHLIB_VERSION_HISTORY.  The numbers are separated by colons and
- * should only keep the versions that are binary compatible with the current.
- */
-# define SHLIB_VERSION_HISTORY ""
-# define SHLIB_VERSION_NUMBER "1.1"
-
-
-#ifdef  __cplusplus
-}
-#endif
-#endif                          /* HEADER_OPENSSLV_H */

gpac-2.2.1.tar.gz/extra_lib/include/openssl/ossl_typ.h Deleted

@@ -1,190 +0,0 @@
-/*
- * Copyright 2001-2016 The OpenSSL Project Authors. All Rights Reserved.
- *
- * Licensed under the OpenSSL license (the "License").  You may not use
- * this file except in compliance with the License.  You can obtain a copy
- * in the file LICENSE in the source distribution or at
- * https://www.openssl.org/source/license.html
- */
-
-#ifndef HEADER_OPENSSL_TYPES_H
-# define HEADER_OPENSSL_TYPES_H
-
-#include <limits.h>
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-# include <openssl/e_os2.h>
-
-# ifdef NO_ASN1_TYPEDEFS
-#  define ASN1_INTEGER            ASN1_STRING
-#  define ASN1_ENUMERATED         ASN1_STRING
-#  define ASN1_BIT_STRING         ASN1_STRING
-#  define ASN1_OCTET_STRING       ASN1_STRING
-#  define ASN1_PRINTABLESTRING    ASN1_STRING
-#  define ASN1_T61STRING          ASN1_STRING
-#  define ASN1_IA5STRING          ASN1_STRING
-#  define ASN1_UTCTIME            ASN1_STRING
-#  define ASN1_GENERALIZEDTIME    ASN1_STRING
-#  define ASN1_TIME               ASN1_STRING
-#  define ASN1_GENERALSTRING      ASN1_STRING
-#  define ASN1_UNIVERSALSTRING    ASN1_STRING
-#  define ASN1_BMPSTRING          ASN1_STRING
-#  define ASN1_VISIBLESTRING      ASN1_STRING
-#  define ASN1_UTF8STRING         ASN1_STRING
-#  define ASN1_BOOLEAN            int
-#  define ASN1_NULL               int
-# else
-typedef struct asn1_string_st ASN1_INTEGER;
-typedef struct asn1_string_st ASN1_ENUMERATED;
-typedef struct asn1_string_st ASN1_BIT_STRING;
-typedef struct asn1_string_st ASN1_OCTET_STRING;
-typedef struct asn1_string_st ASN1_PRINTABLESTRING;
-typedef struct asn1_string_st ASN1_T61STRING;
-typedef struct asn1_string_st ASN1_IA5STRING;
-typedef struct asn1_string_st ASN1_GENERALSTRING;
-typedef struct asn1_string_st ASN1_UNIVERSALSTRING;
-typedef struct asn1_string_st ASN1_BMPSTRING;
-typedef struct asn1_string_st ASN1_UTCTIME;
-typedef struct asn1_string_st ASN1_TIME;
-typedef struct asn1_string_st ASN1_GENERALIZEDTIME;
-typedef struct asn1_string_st ASN1_VISIBLESTRING;
-typedef struct asn1_string_st ASN1_UTF8STRING;
-typedef struct asn1_string_st ASN1_STRING;
-typedef int ASN1_BOOLEAN;
-typedef int ASN1_NULL;
-# endif
-
-typedef struct asn1_object_st ASN1_OBJECT;
-
-typedef struct ASN1_ITEM_st ASN1_ITEM;
-typedef struct asn1_pctx_st ASN1_PCTX;
-typedef struct asn1_sctx_st ASN1_SCTX;
-
-# ifdef _WIN32
-#  undef X509_NAME
-#  undef X509_EXTENSIONS
-#  undef PKCS7_ISSUER_AND_SERIAL
-#  undef PKCS7_SIGNER_INFO
-#  undef OCSP_REQUEST
-#  undef OCSP_RESPONSE
-# endif
-
-# ifdef BIGNUM
-#  undef BIGNUM
-# endif
-struct dane_st;
-typedef struct bio_st BIO;
-typedef struct bignum_st BIGNUM;
-typedef struct bignum_ctx BN_CTX;
-typedef struct bn_blinding_st BN_BLINDING;
-typedef struct bn_mont_ctx_st BN_MONT_CTX;
-typedef struct bn_recp_ctx_st BN_RECP_CTX;
-typedef struct bn_gencb_st BN_GENCB;
-
-typedef struct buf_mem_st BUF_MEM;
-
-typedef struct evp_cipher_st EVP_CIPHER;
-typedef struct evp_cipher_ctx_st EVP_CIPHER_CTX;
-typedef struct evp_md_st EVP_MD;
-typedef struct evp_md_ctx_st EVP_MD_CTX;
-typedef struct evp_pkey_st EVP_PKEY;
-
-typedef struct evp_pkey_asn1_method_st EVP_PKEY_ASN1_METHOD;
-
-typedef struct evp_pkey_method_st EVP_PKEY_METHOD;
-typedef struct evp_pkey_ctx_st EVP_PKEY_CTX;
-
-typedef struct evp_Encode_Ctx_st EVP_ENCODE_CTX;
-
-typedef struct hmac_ctx_st HMAC_CTX;
-
-typedef struct dh_st DH;
-typedef struct dh_method DH_METHOD;
-
-typedef struct dsa_st DSA;
-typedef struct dsa_method DSA_METHOD;
-
-typedef struct rsa_st RSA;
-typedef struct rsa_meth_st RSA_METHOD;
-
-typedef struct ec_key_st EC_KEY;
-typedef struct ec_key_method_st EC_KEY_METHOD;
-
-typedef struct rand_meth_st RAND_METHOD;
-
-typedef struct ssl_dane_st SSL_DANE;
-typedef struct x509_st X509;
-typedef struct X509_algor_st X509_ALGOR;
-typedef struct X509_crl_st X509_CRL;
-typedef struct x509_crl_method_st X509_CRL_METHOD;
-typedef struct x509_revoked_st X509_REVOKED;
-typedef struct X509_name_st X509_NAME;
-typedef struct X509_pubkey_st X509_PUBKEY;
-typedef struct x509_store_st X509_STORE;
-typedef struct x509_store_ctx_st X509_STORE_CTX;
-
-typedef struct x509_object_st X509_OBJECT;
-typedef struct x509_lookup_st X509_LOOKUP;
-typedef struct x509_lookup_method_st X509_LOOKUP_METHOD;
-typedef struct X509_VERIFY_PARAM_st X509_VERIFY_PARAM;
-
-typedef struct pkcs8_priv_key_info_st PKCS8_PRIV_KEY_INFO;
-
-typedef struct v3_ext_ctx X509V3_CTX;
-typedef struct conf_st CONF;
-typedef struct ossl_init_settings_st OPENSSL_INIT_SETTINGS;
-
-typedef struct ui_st UI;
-typedef struct ui_method_st UI_METHOD;
-
-typedef struct engine_st ENGINE;
-typedef struct ssl_st SSL;
-typedef struct ssl_ctx_st SSL_CTX;
-
-typedef struct comp_ctx_st COMP_CTX;
-typedef struct comp_method_st COMP_METHOD;
-
-typedef struct X509_POLICY_NODE_st X509_POLICY_NODE;
-typedef struct X509_POLICY_LEVEL_st X509_POLICY_LEVEL;
-typedef struct X509_POLICY_TREE_st X509_POLICY_TREE;
-typedef struct X509_POLICY_CACHE_st X509_POLICY_CACHE;
-
-typedef struct AUTHORITY_KEYID_st AUTHORITY_KEYID;
-typedef struct DIST_POINT_st DIST_POINT;
-typedef struct ISSUING_DIST_POINT_st ISSUING_DIST_POINT;
-typedef struct NAME_CONSTRAINTS_st NAME_CONSTRAINTS;
-
-typedef struct crypto_ex_data_st CRYPTO_EX_DATA;
-
-typedef struct ocsp_req_ctx_st OCSP_REQ_CTX;
-typedef struct ocsp_response_st OCSP_RESPONSE;
-typedef struct ocsp_responder_id_st OCSP_RESPID;
-
-typedef struct sct_st SCT;
-typedef struct sct_ctx_st SCT_CTX;
-typedef struct ctlog_st CTLOG;
-typedef struct ctlog_store_st CTLOG_STORE;
-typedef struct ct_policy_eval_ctx_st CT_POLICY_EVAL_CTX;
-
-#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L && \
-    defined(INTMAX_MAX) && defined(UINTMAX_MAX)
-typedef intmax_t ossl_intmax_t;
-typedef uintmax_t ossl_uintmax_t;
-#else
-/*
- * Not long long, because the C-library can only be expected to provide
- * strtoll(), strtoull() at the same time as intmax_t and strtoimax(),
- * strtoumax().  Since we use these for parsing arguments, we need the
- * conversion functions, not just the sizes.
- */
-typedef long ossl_intmax_t;
-typedef unsigned long ossl_uintmax_t;
-#endif
-
-#ifdef  __cplusplus
-}
-#endif
-#endif                          /* def HEADER_OPENSSL_TYPES_H */

gpac-2.2.1.tar.gz/extra_lib/include/openssl/pem.h Deleted

@@ -1,501 +0,0 @@
-/*
- * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
- *
- * Licensed under the OpenSSL license (the "License").  You may not use
- * this file except in compliance with the License.  You can obtain a copy
- * in the file LICENSE in the source distribution or at
- * https://www.openssl.org/source/license.html
- */
-
-#ifndef HEADER_PEM_H
-# define HEADER_PEM_H
-
-# include <openssl/e_os2.h>
-# include <openssl/bio.h>
-# include <openssl/stack.h>
-# include <openssl/evp.h>
-# include <openssl/x509.h>
-# include <openssl/pem2.h>
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-# define PEM_BUFSIZE             1024
-
-# define PEM_STRING_X509_OLD     "X509 CERTIFICATE"
-# define PEM_STRING_X509         "CERTIFICATE"
-# define PEM_STRING_X509_TRUSTED "TRUSTED CERTIFICATE"
-# define PEM_STRING_X509_REQ_OLD "NEW CERTIFICATE REQUEST"
-# define PEM_STRING_X509_REQ     "CERTIFICATE REQUEST"
-# define PEM_STRING_X509_CRL     "X509 CRL"
-# define PEM_STRING_EVP_PKEY     "ANY PRIVATE KEY"
-# define PEM_STRING_PUBLIC       "PUBLIC KEY"
-# define PEM_STRING_RSA          "RSA PRIVATE KEY"
-# define PEM_STRING_RSA_PUBLIC   "RSA PUBLIC KEY"
-# define PEM_STRING_DSA          "DSA PRIVATE KEY"
-# define PEM_STRING_DSA_PUBLIC   "DSA PUBLIC KEY"
-# define PEM_STRING_PKCS7        "PKCS7"
-# define PEM_STRING_PKCS7_SIGNED "PKCS #7 SIGNED DATA"
-# define PEM_STRING_PKCS8        "ENCRYPTED PRIVATE KEY"
-# define PEM_STRING_PKCS8INF     "PRIVATE KEY"
-# define PEM_STRING_DHPARAMS     "DH PARAMETERS"
-# define PEM_STRING_DHXPARAMS    "X9.42 DH PARAMETERS"
-# define PEM_STRING_SSL_SESSION  "SSL SESSION PARAMETERS"
-# define PEM_STRING_DSAPARAMS    "DSA PARAMETERS"
-# define PEM_STRING_ECDSA_PUBLIC "ECDSA PUBLIC KEY"
-# define PEM_STRING_ECPARAMETERS "EC PARAMETERS"
-# define PEM_STRING_ECPRIVATEKEY "EC PRIVATE KEY"
-# define PEM_STRING_PARAMETERS   "PARAMETERS"
-# define PEM_STRING_CMS          "CMS"
-
-# define PEM_TYPE_ENCRYPTED      10
-# define PEM_TYPE_MIC_ONLY       20
-# define PEM_TYPE_MIC_CLEAR      30
-# define PEM_TYPE_CLEAR          40
-
-typedef struct pem_recip_st {
-    char *name;
-    X509_NAME *dn;
-    int cipher;
-    int key_enc;
-    /*      char iv8; unused and wrong size */
-} PEM_USER;
-
-typedef struct pem_ctx_st {
-    int type;                   /* what type of object */
-    struct {
-        int version;
-        int mode;
-    } proc_type;
-
-    char *domain;
-
-    struct {
-        int cipher;
-        /*-
-        unused, and wrong size
-        unsigned char iv8; */
-    } DEK_info;
-
-    PEM_USER *originator;
-
-    int num_recipient;
-    PEM_USER **recipient;
-
-/*-
-    XXX(ben): don#t think this is used!
-        STACK *x509_chain;      / * certificate chain */
-    EVP_MD *md;                 /* signature type */
-
-    int md_enc;                 /* is the md encrypted or not? */
-    int md_len;                 /* length of md_data */
-    char *md_data;              /* message digest, could be pkey encrypted */
-
-    EVP_CIPHER *dec;            /* date encryption cipher */
-    int key_len;                /* key length */
-    unsigned char *key;         /* key */
-  /*-
-    unused, and wrong size
-    unsigned char iv8; */
-
-    int data_enc;               /* is the data encrypted */
-    int data_len;
-    unsigned char *data;
-} PEM_CTX;
-
-/*
- * These macros make the PEM_read/PEM_write functions easier to maintain and
- * write. Now they are all implemented with either: IMPLEMENT_PEM_rw(...) or
- * IMPLEMENT_PEM_rw_cb(...)
- */
-
-# ifdef OPENSSL_NO_STDIO
-
-#  define IMPLEMENT_PEM_read_fp(name, type, str, asn1) /**/
-#  define IMPLEMENT_PEM_write_fp(name, type, str, asn1) /**/
-#  define IMPLEMENT_PEM_write_fp_const(name, type, str, asn1) /**/
-#  define IMPLEMENT_PEM_write_cb_fp(name, type, str, asn1) /**/
-#  define IMPLEMENT_PEM_write_cb_fp_const(name, type, str, asn1) /**/
-# else
-
-#  define IMPLEMENT_PEM_read_fp(name, type, str, asn1) \
-type *PEM_read_##name(FILE *fp, type **x, pem_password_cb *cb, void *u)\
-{ \
-return PEM_ASN1_read((d2i_of_void *)d2i_##asn1, str,fp,(void **)x,cb,u); \
-}
-
-#  define IMPLEMENT_PEM_write_fp(name, type, str, asn1) \
-int PEM_write_##name(FILE *fp, type *x) \
-{ \
-return PEM_ASN1_write((i2d_of_void *)i2d_##asn1,str,fp,x,NULL,NULL,0,NULL,NULL); \
-}
-
-#  define IMPLEMENT_PEM_write_fp_const(name, type, str, asn1) \
-int PEM_write_##name(FILE *fp, const type *x) \
-{ \
-return PEM_ASN1_write((i2d_of_void *)i2d_##asn1,str,fp,(void *)x,NULL,NULL,0,NULL,NULL); \
-}
-
-#  define IMPLEMENT_PEM_write_cb_fp(name, type, str, asn1) \
-int PEM_write_##name(FILE *fp, type *x, const EVP_CIPHER *enc, \
-             unsigned char *kstr, int klen, pem_password_cb *cb, \
-                  void *u) \
-        { \
-        return PEM_ASN1_write((i2d_of_void *)i2d_##asn1,str,fp,x,enc,kstr,klen,cb,u); \
-        }
-
-#  define IMPLEMENT_PEM_write_cb_fp_const(name, type, str, asn1) \
-int PEM_write_##name(FILE *fp, type *x, const EVP_CIPHER *enc, \
-             unsigned char *kstr, int klen, pem_password_cb *cb, \
-                  void *u) \
-        { \
-        return PEM_ASN1_write((i2d_of_void *)i2d_##asn1,str,fp,x,enc,kstr,klen,cb,u); \
-        }
-
-# endif
-
-# define IMPLEMENT_PEM_read_bio(name, type, str, asn1) \
-type *PEM_read_bio_##name(BIO *bp, type **x, pem_password_cb *cb, void *u)\
-{ \
-return PEM_ASN1_read_bio((d2i_of_void *)d2i_##asn1, str,bp,(void **)x,cb,u); \
-}
-
-# define IMPLEMENT_PEM_write_bio(name, type, str, asn1) \
-int PEM_write_bio_##name(BIO *bp, type *x) \
-{ \
-return PEM_ASN1_write_bio((i2d_of_void *)i2d_##asn1,str,bp,x,NULL,NULL,0,NULL,NULL); \
-}
-
-# define IMPLEMENT_PEM_write_bio_const(name, type, str, asn1) \
-int PEM_write_bio_##name(BIO *bp, const type *x) \
-{ \
-return PEM_ASN1_write_bio((i2d_of_void *)i2d_##asn1,str,bp,(void *)x,NULL,NULL,0,NULL,NULL); \
-}
-
-# define IMPLEMENT_PEM_write_cb_bio(name, type, str, asn1) \
-int PEM_write_bio_##name(BIO *bp, type *x, const EVP_CIPHER *enc, \
-             unsigned char *kstr, int klen, pem_password_cb *cb, void *u) \
-        { \
-        return PEM_ASN1_write_bio((i2d_of_void *)i2d_##asn1,str,bp,x,enc,kstr,klen,cb,u); \
-        }
-
-# define IMPLEMENT_PEM_write_cb_bio_const(name, type, str, asn1) \
-int PEM_write_bio_##name(BIO *bp, type *x, const EVP_CIPHER *enc, \
-             unsigned char *kstr, int klen, pem_password_cb *cb, void *u) \
-        { \
-        return PEM_ASN1_write_bio((i2d_of_void *)i2d_##asn1,str,bp,(void *)x,enc,kstr,klen,cb,u); \
-        }
-
-# define IMPLEMENT_PEM_write(name, type, str, asn1) \
-        IMPLEMENT_PEM_write_bio(name, type, str, asn1) \
-        IMPLEMENT_PEM_write_fp(name, type, str, asn1)
-
-# define IMPLEMENT_PEM_write_const(name, type, str, asn1) \
-        IMPLEMENT_PEM_write_bio_const(name, type, str, asn1) \
-        IMPLEMENT_PEM_write_fp_const(name, type, str, asn1)
-
-# define IMPLEMENT_PEM_write_cb(name, type, str, asn1) \
-        IMPLEMENT_PEM_write_cb_bio(name, type, str, asn1) \
-        IMPLEMENT_PEM_write_cb_fp(name, type, str, asn1)
-
-# define IMPLEMENT_PEM_write_cb_const(name, type, str, asn1) \
-        IMPLEMENT_PEM_write_cb_bio_const(name, type, str, asn1) \
-        IMPLEMENT_PEM_write_cb_fp_const(name, type, str, asn1)
-
-# define IMPLEMENT_PEM_read(name, type, str, asn1) \
-        IMPLEMENT_PEM_read_bio(name, type, str, asn1) \
-        IMPLEMENT_PEM_read_fp(name, type, str, asn1)
-
-# define IMPLEMENT_PEM_rw(name, type, str, asn1) \
-        IMPLEMENT_PEM_read(name, type, str, asn1) \
-        IMPLEMENT_PEM_write(name, type, str, asn1)
-
-# define IMPLEMENT_PEM_rw_const(name, type, str, asn1) \
-        IMPLEMENT_PEM_read(name, type, str, asn1) \
-        IMPLEMENT_PEM_write_const(name, type, str, asn1)
-
-# define IMPLEMENT_PEM_rw_cb(name, type, str, asn1) \
-        IMPLEMENT_PEM_read(name, type, str, asn1) \
-        IMPLEMENT_PEM_write_cb(name, type, str, asn1)
-
-/* These are the same except they are for the declarations */
-
-# if defined(OPENSSL_NO_STDIO)
-
-#  define DECLARE_PEM_read_fp(name, type) /**/
-#  define DECLARE_PEM_write_fp(name, type) /**/
-#  define DECLARE_PEM_write_fp_const(name, type) /**/
-#  define DECLARE_PEM_write_cb_fp(name, type) /**/
-# else
-
-#  define DECLARE_PEM_read_fp(name, type) \
-        type *PEM_read_##name(FILE *fp, type **x, pem_password_cb *cb, void *u);
-
-#  define DECLARE_PEM_write_fp(name, type) \
-        int PEM_write_##name(FILE *fp, type *x);
-
-#  define DECLARE_PEM_write_fp_const(name, type) \
-        int PEM_write_##name(FILE *fp, const type *x);
-
-#  define DECLARE_PEM_write_cb_fp(name, type) \
-        int PEM_write_##name(FILE *fp, type *x, const EVP_CIPHER *enc, \
-             unsigned char *kstr, int klen, pem_password_cb *cb, void *u);
-
-# endif
-
-#  define DECLARE_PEM_read_bio(name, type) \
-        type *PEM_read_bio_##name(BIO *bp, type **x, pem_password_cb *cb, void *u);
-
-#  define DECLARE_PEM_write_bio(name, type) \
-        int PEM_write_bio_##name(BIO *bp, type *x);
-
-#  define DECLARE_PEM_write_bio_const(name, type) \
-        int PEM_write_bio_##name(BIO *bp, const type *x);
-
-#  define DECLARE_PEM_write_cb_bio(name, type) \
-        int PEM_write_bio_##name(BIO *bp, type *x, const EVP_CIPHER *enc, \
-             unsigned char *kstr, int klen, pem_password_cb *cb, void *u);
-
-# define DECLARE_PEM_write(name, type) \
-        DECLARE_PEM_write_bio(name, type) \
-        DECLARE_PEM_write_fp(name, type)
-# define DECLARE_PEM_write_const(name, type) \
-        DECLARE_PEM_write_bio_const(name, type) \
-        DECLARE_PEM_write_fp_const(name, type)
-# define DECLARE_PEM_write_cb(name, type) \
-        DECLARE_PEM_write_cb_bio(name, type) \
-        DECLARE_PEM_write_cb_fp(name, type)
-# define DECLARE_PEM_read(name, type) \
-        DECLARE_PEM_read_bio(name, type) \
-        DECLARE_PEM_read_fp(name, type)
-# define DECLARE_PEM_rw(name, type) \
-        DECLARE_PEM_read(name, type) \
-        DECLARE_PEM_write(name, type)
-# define DECLARE_PEM_rw_const(name, type) \
-        DECLARE_PEM_read(name, type) \
-        DECLARE_PEM_write_const(name, type)
-# define DECLARE_PEM_rw_cb(name, type) \
-        DECLARE_PEM_read(name, type) \
-        DECLARE_PEM_write_cb(name, type)
-typedef int pem_password_cb (char *buf, int size, int rwflag, void *userdata);
-
-int PEM_get_EVP_CIPHER_INFO(char *header, EVP_CIPHER_INFO *cipher);
-int PEM_do_header(EVP_CIPHER_INFO *cipher, unsigned char *data, long *len,
-                  pem_password_cb *callback, void *u);
-
-int PEM_read_bio(BIO *bp, char **name, char **header,
-                 unsigned char **data, long *len);
-int PEM_write_bio(BIO *bp, const char *name, const char *hdr,
-                  const unsigned char *data, long len);
-int PEM_bytes_read_bio(unsigned char **pdata, long *plen, char **pnm,
-                       const char *name, BIO *bp, pem_password_cb *cb,
-                       void *u);
-void *PEM_ASN1_read_bio(d2i_of_void *d2i, const char *name, BIO *bp, void **x,
-                        pem_password_cb *cb, void *u);
-int PEM_ASN1_write_bio(i2d_of_void *i2d, const char *name, BIO *bp, void *x,
-                       const EVP_CIPHER *enc, unsigned char *kstr, int klen,
-                       pem_password_cb *cb, void *u);
-
-STACK_OF(X509_INFO) *PEM_X509_INFO_read_bio(BIO *bp, STACK_OF(X509_INFO) *sk,
-                                            pem_password_cb *cb, void *u);
-int PEM_X509_INFO_write_bio(BIO *bp, X509_INFO *xi, EVP_CIPHER *enc,
-                            unsigned char *kstr, int klen,
-                            pem_password_cb *cd, void *u);
-
-#ifndef OPENSSL_NO_STDIO
-int PEM_read(FILE *fp, char **name, char **header,
-             unsigned char **data, long *len);
-int PEM_write(FILE *fp, const char *name, const char *hdr,
-              const unsigned char *data, long len);
-void *PEM_ASN1_read(d2i_of_void *d2i, const char *name, FILE *fp, void **x,
-                    pem_password_cb *cb, void *u);
-int PEM_ASN1_write(i2d_of_void *i2d, const char *name, FILE *fp,
-                   void *x, const EVP_CIPHER *enc, unsigned char *kstr,
-                   int klen, pem_password_cb *callback, void *u);
-STACK_OF(X509_INFO) *PEM_X509_INFO_read(FILE *fp, STACK_OF(X509_INFO) *sk,
-                                        pem_password_cb *cb, void *u);
-#endif
-
-int PEM_SignInit(EVP_MD_CTX *ctx, EVP_MD *type);
-int PEM_SignUpdate(EVP_MD_CTX *ctx, unsigned char *d, unsigned int cnt);
-int PEM_SignFinal(EVP_MD_CTX *ctx, unsigned char *sigret,
-                  unsigned int *siglen, EVP_PKEY *pkey);
-
-int PEM_def_callback(char *buf, int num, int w, void *key);
-void PEM_proc_type(char *buf, int type);
-void PEM_dek_info(char *buf, const char *type, int len, char *str);
-
-# include <openssl/symhacks.h>
-
-DECLARE_PEM_rw(X509, X509)
-DECLARE_PEM_rw(X509_AUX, X509)
-DECLARE_PEM_rw(X509_REQ, X509_REQ)
-DECLARE_PEM_write(X509_REQ_NEW, X509_REQ)
-DECLARE_PEM_rw(X509_CRL, X509_CRL)
-DECLARE_PEM_rw(PKCS7, PKCS7)
-DECLARE_PEM_rw(NETSCAPE_CERT_SEQUENCE, NETSCAPE_CERT_SEQUENCE)
-DECLARE_PEM_rw(PKCS8, X509_SIG)
-DECLARE_PEM_rw(PKCS8_PRIV_KEY_INFO, PKCS8_PRIV_KEY_INFO)
-# ifndef OPENSSL_NO_RSA
-DECLARE_PEM_rw_cb(RSAPrivateKey, RSA)
-DECLARE_PEM_rw_const(RSAPublicKey, RSA)
-DECLARE_PEM_rw(RSA_PUBKEY, RSA)
-# endif
-# ifndef OPENSSL_NO_DSA
-DECLARE_PEM_rw_cb(DSAPrivateKey, DSA)
-DECLARE_PEM_rw(DSA_PUBKEY, DSA)
-DECLARE_PEM_rw_const(DSAparams, DSA)
-# endif
-# ifndef OPENSSL_NO_EC
-DECLARE_PEM_rw_const(ECPKParameters, EC_GROUP)
-DECLARE_PEM_rw_cb(ECPrivateKey, EC_KEY)
-DECLARE_PEM_rw(EC_PUBKEY, EC_KEY)
-# endif
-# ifndef OPENSSL_NO_DH
-DECLARE_PEM_rw_const(DHparams, DH)
-DECLARE_PEM_write_const(DHxparams, DH)
-# endif
-DECLARE_PEM_rw_cb(PrivateKey, EVP_PKEY)
-DECLARE_PEM_rw(PUBKEY, EVP_PKEY)
-
-int PEM_write_bio_PrivateKey_traditional(BIO *bp, EVP_PKEY *x,
-                                         const EVP_CIPHER *enc,
-                                         unsigned char *kstr, int klen,
-                                         pem_password_cb *cb, void *u);
-
-int PEM_write_bio_PKCS8PrivateKey_nid(BIO *bp, EVP_PKEY *x, int nid,
-                                      char *kstr, int klen,
-                                      pem_password_cb *cb, void *u);
-int PEM_write_bio_PKCS8PrivateKey(BIO *, EVP_PKEY *, const EVP_CIPHER *,
-                                  char *, int, pem_password_cb *, void *);
-int i2d_PKCS8PrivateKey_bio(BIO *bp, EVP_PKEY *x, const EVP_CIPHER *enc,
-                            char *kstr, int klen,
-                            pem_password_cb *cb, void *u);
-int i2d_PKCS8PrivateKey_nid_bio(BIO *bp, EVP_PKEY *x, int nid,
-                                char *kstr, int klen,
-                                pem_password_cb *cb, void *u);
-EVP_PKEY *d2i_PKCS8PrivateKey_bio(BIO *bp, EVP_PKEY **x, pem_password_cb *cb,
-                                  void *u);
-
-# ifndef OPENSSL_NO_STDIO
-int i2d_PKCS8PrivateKey_fp(FILE *fp, EVP_PKEY *x, const EVP_CIPHER *enc,
-                           char *kstr, int klen,
-                           pem_password_cb *cb, void *u);
-int i2d_PKCS8PrivateKey_nid_fp(FILE *fp, EVP_PKEY *x, int nid,
-                               char *kstr, int klen,
-                               pem_password_cb *cb, void *u);
-int PEM_write_PKCS8PrivateKey_nid(FILE *fp, EVP_PKEY *x, int nid,
-                                  char *kstr, int klen,
-                                  pem_password_cb *cb, void *u);
-
-EVP_PKEY *d2i_PKCS8PrivateKey_fp(FILE *fp, EVP_PKEY **x, pem_password_cb *cb,
-                                 void *u);
-
-int PEM_write_PKCS8PrivateKey(FILE *fp, EVP_PKEY *x, const EVP_CIPHER *enc,
-                              char *kstr, int klen, pem_password_cb *cd,
-                              void *u);
-# endif
-EVP_PKEY *PEM_read_bio_Parameters(BIO *bp, EVP_PKEY **x);
-int PEM_write_bio_Parameters(BIO *bp, EVP_PKEY *x);
-
-# ifndef OPENSSL_NO_DSA
-EVP_PKEY *b2i_PrivateKey(const unsigned char **in, long length);
-EVP_PKEY *b2i_PublicKey(const unsigned char **in, long length);
-EVP_PKEY *b2i_PrivateKey_bio(BIO *in);
-EVP_PKEY *b2i_PublicKey_bio(BIO *in);
-int i2b_PrivateKey_bio(BIO *out, EVP_PKEY *pk);
-int i2b_PublicKey_bio(BIO *out, EVP_PKEY *pk);
-#  ifndef OPENSSL_NO_RC4
-EVP_PKEY *b2i_PVK_bio(BIO *in, pem_password_cb *cb, void *u);
-int i2b_PVK_bio(BIO *out, EVP_PKEY *pk, int enclevel,
-                pem_password_cb *cb, void *u);
-#  endif
-# endif
-
-/* BEGIN ERROR CODES */
-/*
- * The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
-
-int ERR_load_PEM_strings(void);
-
-/* Error codes for the PEM functions. */
-
-/* Function codes. */
-# define PEM_F_B2I_DSS                                    127
-# define PEM_F_B2I_PVK_BIO                                128
-# define PEM_F_B2I_RSA                                    129
-# define PEM_F_CHECK_BITLEN_DSA                           130
-# define PEM_F_CHECK_BITLEN_RSA                           131
-# define PEM_F_D2I_PKCS8PRIVATEKEY_BIO                    120
-# define PEM_F_D2I_PKCS8PRIVATEKEY_FP                     121
-# define PEM_F_DO_B2I                                     132
-# define PEM_F_DO_B2I_BIO                                 133
-# define PEM_F_DO_BLOB_HEADER                             134
-# define PEM_F_DO_PK8PKEY                                 126
-# define PEM_F_DO_PK8PKEY_FP                              125
-# define PEM_F_DO_PVK_BODY                                135
-# define PEM_F_DO_PVK_HEADER                              136
-# define PEM_F_I2B_PVK                                    137
-# define PEM_F_I2B_PVK_BIO                                138
-# define PEM_F_LOAD_IV                                    101
-# define PEM_F_PEM_ASN1_READ                              102
-# define PEM_F_PEM_ASN1_READ_BIO                          103
-# define PEM_F_PEM_ASN1_WRITE                             104
-# define PEM_F_PEM_ASN1_WRITE_BIO                         105
-# define PEM_F_PEM_DEF_CALLBACK                           100
-# define PEM_F_PEM_DO_HEADER                              106
-# define PEM_F_PEM_GET_EVP_CIPHER_INFO                    107
-# define PEM_F_PEM_READ                                   108
-# define PEM_F_PEM_READ_BIO                               109
-# define PEM_F_PEM_READ_BIO_DHPARAMS                      141
-# define PEM_F_PEM_READ_BIO_PARAMETERS                    140
-# define PEM_F_PEM_READ_BIO_PRIVATEKEY                    123
-# define PEM_F_PEM_READ_DHPARAMS                          142
-# define PEM_F_PEM_READ_PRIVATEKEY                        124
-# define PEM_F_PEM_SIGNFINAL                              112
-# define PEM_F_PEM_WRITE                                  113
-# define PEM_F_PEM_WRITE_BIO                              114
-# define PEM_F_PEM_WRITE_PRIVATEKEY                       139
-# define PEM_F_PEM_X509_INFO_READ                         115
-# define PEM_F_PEM_X509_INFO_READ_BIO                     116
-# define PEM_F_PEM_X509_INFO_WRITE_BIO                    117
-
-/* Reason codes. */
-# define PEM_R_BAD_BASE64_DECODE                          100
-# define PEM_R_BAD_DECRYPT                                101
-# define PEM_R_BAD_END_LINE                               102
-# define PEM_R_BAD_IV_CHARS                               103
-# define PEM_R_BAD_MAGIC_NUMBER                           116
-# define PEM_R_BAD_PASSWORD_READ                          104
-# define PEM_R_BAD_VERSION_NUMBER                         117
-# define PEM_R_BIO_WRITE_FAILURE                          118
-# define PEM_R_CIPHER_IS_NULL                             127
-# define PEM_R_ERROR_CONVERTING_PRIVATE_KEY               115
-# define PEM_R_EXPECTING_PRIVATE_KEY_BLOB                 119
-# define PEM_R_EXPECTING_PUBLIC_KEY_BLOB                  120
-# define PEM_R_HEADER_TOO_LONG                            128
-# define PEM_R_INCONSISTENT_HEADER                        121
-# define PEM_R_KEYBLOB_HEADER_PARSE_ERROR                 122
-# define PEM_R_KEYBLOB_TOO_SHORT                          123
-# define PEM_R_MISSING_DEK_IV                             129
-# define PEM_R_NOT_DEK_INFO                               105
-# define PEM_R_NOT_ENCRYPTED                              106
-# define PEM_R_NOT_PROC_TYPE                              107
-# define PEM_R_NO_START_LINE                              108
-# define PEM_R_PROBLEMS_GETTING_PASSWORD                  109
-# define PEM_R_PVK_DATA_TOO_SHORT                         124
-# define PEM_R_PVK_TOO_SHORT                              125
-# define PEM_R_READ_KEY                                   111
-# define PEM_R_SHORT_HEADER                               112
-# define PEM_R_UNEXPECTED_DEK_IV                          130
-# define PEM_R_UNSUPPORTED_CIPHER                         113
-# define PEM_R_UNSUPPORTED_ENCRYPTION                     114
-# define PEM_R_UNSUPPORTED_KEY_COMPONENTS                 126
-
-# ifdef  __cplusplus
-}
-# endif
-#endif

gpac-2.2.1.tar.gz/extra_lib/include/openssl/pem2.h Deleted

gpac-2.2.1.tar.gz/extra_lib/include/openssl/pkcs12.h Deleted

@@ -1,282 +0,0 @@
-/*
- * Copyright 1999-2016 The OpenSSL Project Authors. All Rights Reserved.
- *
- * Licensed under the OpenSSL license (the "License").  You may not use
- * this file except in compliance with the License.  You can obtain a copy
- * in the file LICENSE in the source distribution or at
- * https://www.openssl.org/source/license.html
- */
-
-#ifndef HEADER_PKCS12_H
-# define HEADER_PKCS12_H
-
-# include <openssl/bio.h>
-# include <openssl/x509.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-# define PKCS12_KEY_ID   1
-# define PKCS12_IV_ID    2
-# define PKCS12_MAC_ID   3
-
-/* Default iteration count */
-# ifndef PKCS12_DEFAULT_ITER
-#  define PKCS12_DEFAULT_ITER     PKCS5_DEFAULT_ITER
-# endif
-
-# define PKCS12_MAC_KEY_LENGTH 20
-
-# define PKCS12_SALT_LEN 8
-
-/* It's not clear if these are actually needed... */
-# define PKCS12_key_gen PKCS12_key_gen_utf8
-# define PKCS12_add_friendlyname PKCS12_add_friendlyname_utf8
-
-/* MS key usage constants */
-
-# define KEY_EX  0x10
-# define KEY_SIG 0x80
-
-typedef struct PKCS12_MAC_DATA_st PKCS12_MAC_DATA;
-
-typedef struct PKCS12_st PKCS12;
-
-typedef struct PKCS12_SAFEBAG_st PKCS12_SAFEBAG;
-
-DEFINE_STACK_OF(PKCS12_SAFEBAG)
-
-typedef struct pkcs12_bag_st PKCS12_BAGS;
-
-# define PKCS12_ERROR    0
-# define PKCS12_OK       1
-
-/* Compatibility macros */
-
-#if OPENSSL_API_COMPAT < 0x10100000L
-
-# define M_PKCS12_bag_type PKCS12_bag_type
-# define M_PKCS12_cert_bag_type PKCS12_cert_bag_type
-# define M_PKCS12_crl_bag_type PKCS12_cert_bag_type
-
-# define PKCS12_certbag2x509 PKCS12_SAFEBAG_get1_cert
-# define PKCS12_certbag2scrl PKCS12_SAFEBAG_get1_crl
-# define PKCS12_bag_type PKCS12_SAFEBAG_get_nid
-# define PKCS12_cert_bag_type PKCS12_SAFEBAG_get_bag_nid
-# define PKCS12_x5092certbag PKCS12_SAFEBAG_create_cert
-# define PKCS12_x509crl2certbag PKCS12_SAFEBAG_create_crl
-# define PKCS12_MAKE_KEYBAG PKCS12_SAFEBAG_create0_p8inf
-# define PKCS12_MAKE_SHKEYBAG PKCS12_SAFEBAG_create_pkcs8_encrypt
-
-#endif
-
-DEPRECATEDIN_1_1_0(ASN1_TYPE *PKCS12_get_attr(const PKCS12_SAFEBAG *bag, int attr_nid))
-
-ASN1_TYPE *PKCS8_get_attr(PKCS8_PRIV_KEY_INFO *p8, int attr_nid);
-int PKCS12_mac_present(const PKCS12 *p12);
-void PKCS12_get0_mac(const ASN1_OCTET_STRING **pmac,
-                     const X509_ALGOR **pmacalg,
-                     const ASN1_OCTET_STRING **psalt,
-                     const ASN1_INTEGER **piter,
-                     const PKCS12 *p12);
-
-const ASN1_TYPE *PKCS12_SAFEBAG_get0_attr(const PKCS12_SAFEBAG *bag,
-                                          int attr_nid);
-const ASN1_OBJECT *PKCS12_SAFEBAG_get0_type(const PKCS12_SAFEBAG *bag);
-int PKCS12_SAFEBAG_get_nid(const PKCS12_SAFEBAG *bag);
-int PKCS12_SAFEBAG_get_bag_nid(const PKCS12_SAFEBAG *bag);
-
-X509 *PKCS12_SAFEBAG_get1_cert(const PKCS12_SAFEBAG *bag);
-X509_CRL *PKCS12_SAFEBAG_get1_crl(const PKCS12_SAFEBAG *bag);
-const STACK_OF(PKCS12_SAFEBAG) *
-PKCS12_SAFEBAG_get0_safes(const PKCS12_SAFEBAG *bag);
-const PKCS8_PRIV_KEY_INFO *PKCS12_SAFEBAG_get0_p8inf(const PKCS12_SAFEBAG *bag);
-const X509_SIG *PKCS12_SAFEBAG_get0_pkcs8(const PKCS12_SAFEBAG *bag);
-
-PKCS12_SAFEBAG *PKCS12_SAFEBAG_create_cert(X509 *x509);
-PKCS12_SAFEBAG *PKCS12_SAFEBAG_create_crl(X509_CRL *crl);
-PKCS12_SAFEBAG *PKCS12_SAFEBAG_create0_p8inf(PKCS8_PRIV_KEY_INFO *p8);
-PKCS12_SAFEBAG *PKCS12_SAFEBAG_create0_pkcs8(X509_SIG *p8);
-PKCS12_SAFEBAG *PKCS12_SAFEBAG_create_pkcs8_encrypt(int pbe_nid,
-                                                    const char *pass,
-                                                    int passlen,
-                                                    unsigned char *salt,
-                                                    int saltlen, int iter,
-                                                    PKCS8_PRIV_KEY_INFO *p8inf);
-
-PKCS12_SAFEBAG *PKCS12_item_pack_safebag(void *obj, const ASN1_ITEM *it,
-                                         int nid1, int nid2);
-PKCS8_PRIV_KEY_INFO *PKCS8_decrypt(const X509_SIG *p8, const char *pass,
-                                   int passlen);
-PKCS8_PRIV_KEY_INFO *PKCS12_decrypt_skey(const PKCS12_SAFEBAG *bag,
-                                         const char *pass, int passlen);
-X509_SIG *PKCS8_encrypt(int pbe_nid, const EVP_CIPHER *cipher,
-                        const char *pass, int passlen, unsigned char *salt,
-                        int saltlen, int iter, PKCS8_PRIV_KEY_INFO *p8);
-X509_SIG *PKCS8_set0_pbe(const char *pass, int passlen,
-                        PKCS8_PRIV_KEY_INFO *p8inf, X509_ALGOR *pbe);
-PKCS7 *PKCS12_pack_p7data(STACK_OF(PKCS12_SAFEBAG) *sk);
-STACK_OF(PKCS12_SAFEBAG) *PKCS12_unpack_p7data(PKCS7 *p7);
-PKCS7 *PKCS12_pack_p7encdata(int pbe_nid, const char *pass, int passlen,
-                             unsigned char *salt, int saltlen, int iter,
-                             STACK_OF(PKCS12_SAFEBAG) *bags);
-STACK_OF(PKCS12_SAFEBAG) *PKCS12_unpack_p7encdata(PKCS7 *p7, const char *pass,
-                                                  int passlen);
-
-int PKCS12_pack_authsafes(PKCS12 *p12, STACK_OF(PKCS7) *safes);
-STACK_OF(PKCS7) *PKCS12_unpack_authsafes(const PKCS12 *p12);
-
-int PKCS12_add_localkeyid(PKCS12_SAFEBAG *bag, unsigned char *name,
-                          int namelen);
-int PKCS12_add_friendlyname_asc(PKCS12_SAFEBAG *bag, const char *name,
-                                int namelen);
-int PKCS12_add_friendlyname_utf8(PKCS12_SAFEBAG *bag, const char *name,
-                                 int namelen);
-int PKCS12_add_CSPName_asc(PKCS12_SAFEBAG *bag, const char *name,
-                           int namelen);
-int PKCS12_add_friendlyname_uni(PKCS12_SAFEBAG *bag,
-                                const unsigned char *name, int namelen);
-int PKCS8_add_keyusage(PKCS8_PRIV_KEY_INFO *p8, int usage);
-ASN1_TYPE *PKCS12_get_attr_gen(const STACK_OF(X509_ATTRIBUTE) *attrs,
-                               int attr_nid);
-char *PKCS12_get_friendlyname(PKCS12_SAFEBAG *bag);
-const STACK_OF(X509_ATTRIBUTE) *
-PKCS12_SAFEBAG_get0_attrs(const PKCS12_SAFEBAG *bag);
-unsigned char *PKCS12_pbe_crypt(const X509_ALGOR *algor,
-                                const char *pass, int passlen,
-                                const unsigned char *in, int inlen,
-                                unsigned char **data, int *datalen,
-                                int en_de);
-void *PKCS12_item_decrypt_d2i(const X509_ALGOR *algor, const ASN1_ITEM *it,
-                              const char *pass, int passlen,
-                              const ASN1_OCTET_STRING *oct, int zbuf);
-ASN1_OCTET_STRING *PKCS12_item_i2d_encrypt(X509_ALGOR *algor,
-                                           const ASN1_ITEM *it,
-                                           const char *pass, int passlen,
-                                           void *obj, int zbuf);
-PKCS12 *PKCS12_init(int mode);
-int PKCS12_key_gen_asc(const char *pass, int passlen, unsigned char *salt,
-                       int saltlen, int id, int iter, int n,
-                       unsigned char *out, const EVP_MD *md_type);
-int PKCS12_key_gen_uni(unsigned char *pass, int passlen, unsigned char *salt,
-                       int saltlen, int id, int iter, int n,
-                       unsigned char *out, const EVP_MD *md_type);
-int PKCS12_key_gen_utf8(const char *pass, int passlen, unsigned char *salt,
-                        int saltlen, int id, int iter, int n,
-                        unsigned char *out, const EVP_MD *md_type);
-int PKCS12_PBE_keyivgen(EVP_CIPHER_CTX *ctx, const char *pass, int passlen,
-                        ASN1_TYPE *param, const EVP_CIPHER *cipher,
-                        const EVP_MD *md_type, int en_de);
-int PKCS12_gen_mac(PKCS12 *p12, const char *pass, int passlen,
-                   unsigned char *mac, unsigned int *maclen);
-int PKCS12_verify_mac(PKCS12 *p12, const char *pass, int passlen);
-int PKCS12_set_mac(PKCS12 *p12, const char *pass, int passlen,
-                   unsigned char *salt, int saltlen, int iter,
-                   const EVP_MD *md_type);
-int PKCS12_setup_mac(PKCS12 *p12, int iter, unsigned char *salt,
-                     int saltlen, const EVP_MD *md_type);
-unsigned char *OPENSSL_asc2uni(const char *asc, int asclen,
-                               unsigned char **uni, int *unilen);
-char *OPENSSL_uni2asc(const unsigned char *uni, int unilen);
-unsigned char *OPENSSL_utf82uni(const char *asc, int asclen,
-                                unsigned char **uni, int *unilen);
-char *OPENSSL_uni2utf8(const unsigned char *uni, int unilen);
-
-DECLARE_ASN1_FUNCTIONS(PKCS12)
-DECLARE_ASN1_FUNCTIONS(PKCS12_MAC_DATA)
-DECLARE_ASN1_FUNCTIONS(PKCS12_SAFEBAG)
-DECLARE_ASN1_FUNCTIONS(PKCS12_BAGS)
-
-DECLARE_ASN1_ITEM(PKCS12_SAFEBAGS)
-DECLARE_ASN1_ITEM(PKCS12_AUTHSAFES)
-
-void PKCS12_PBE_add(void);
-int PKCS12_parse(PKCS12 *p12, const char *pass, EVP_PKEY **pkey, X509 **cert,
-                 STACK_OF(X509) **ca);
-PKCS12 *PKCS12_create(const char *pass, const char *name, EVP_PKEY *pkey,
-                      X509 *cert, STACK_OF(X509) *ca, int nid_key, int nid_cert,
-                      int iter, int mac_iter, int keytype);
-
-PKCS12_SAFEBAG *PKCS12_add_cert(STACK_OF(PKCS12_SAFEBAG) **pbags, X509 *cert);
-PKCS12_SAFEBAG *PKCS12_add_key(STACK_OF(PKCS12_SAFEBAG) **pbags,
-                               EVP_PKEY *key, int key_usage, int iter,
-                               int key_nid, const char *pass);
-int PKCS12_add_safe(STACK_OF(PKCS7) **psafes, STACK_OF(PKCS12_SAFEBAG) *bags,
-                    int safe_nid, int iter, const char *pass);
-PKCS12 *PKCS12_add_safes(STACK_OF(PKCS7) *safes, int p7_nid);
-
-int i2d_PKCS12_bio(BIO *bp, PKCS12 *p12);
-# ifndef OPENSSL_NO_STDIO
-int i2d_PKCS12_fp(FILE *fp, PKCS12 *p12);
-# endif
-PKCS12 *d2i_PKCS12_bio(BIO *bp, PKCS12 **p12);
-# ifndef OPENSSL_NO_STDIO
-PKCS12 *d2i_PKCS12_fp(FILE *fp, PKCS12 **p12);
-# endif
-int PKCS12_newpass(PKCS12 *p12, const char *oldpass, const char *newpass);
-
-/* BEGIN ERROR CODES */
-/*
- * The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
-
-int ERR_load_PKCS12_strings(void);
-
-/* Error codes for the PKCS12 functions. */
-
-/* Function codes. */
-# define PKCS12_F_PKCS12_CREATE                           105
-# define PKCS12_F_PKCS12_GEN_MAC                          107
-# define PKCS12_F_PKCS12_INIT                             109
-# define PKCS12_F_PKCS12_ITEM_DECRYPT_D2I                 106
-# define PKCS12_F_PKCS12_ITEM_I2D_ENCRYPT                 108
-# define PKCS12_F_PKCS12_ITEM_PACK_SAFEBAG                117
-# define PKCS12_F_PKCS12_KEY_GEN_ASC                      110
-# define PKCS12_F_PKCS12_KEY_GEN_UNI                      111
-# define PKCS12_F_PKCS12_KEY_GEN_UTF8                     116
-# define PKCS12_F_PKCS12_NEWPASS                          128
-# define PKCS12_F_PKCS12_PACK_P7DATA                      114
-# define PKCS12_F_PKCS12_PACK_P7ENCDATA                   115
-# define PKCS12_F_PKCS12_PARSE                            118
-# define PKCS12_F_PKCS12_PBE_CRYPT                        119
-# define PKCS12_F_PKCS12_PBE_KEYIVGEN                     120
-# define PKCS12_F_PKCS12_SAFEBAG_CREATE0_P8INF            112
-# define PKCS12_F_PKCS12_SAFEBAG_CREATE0_PKCS8            113
-# define PKCS12_F_PKCS12_SAFEBAG_CREATE_PKCS8_ENCRYPT     133
-# define PKCS12_F_PKCS12_SETUP_MAC                        122
-# define PKCS12_F_PKCS12_SET_MAC                          123
-# define PKCS12_F_PKCS12_UNPACK_AUTHSAFES                 130
-# define PKCS12_F_PKCS12_UNPACK_P7DATA                    131
-# define PKCS12_F_PKCS12_VERIFY_MAC                       126
-# define PKCS12_F_PKCS8_ENCRYPT                           125
-# define PKCS12_F_PKCS8_SET0_PBE                          132
-
-/* Reason codes. */
-# define PKCS12_R_CANT_PACK_STRUCTURE                     100
-# define PKCS12_R_CONTENT_TYPE_NOT_DATA                   121
-# define PKCS12_R_DECODE_ERROR                            101
-# define PKCS12_R_ENCODE_ERROR                            102
-# define PKCS12_R_ENCRYPT_ERROR                           103
-# define PKCS12_R_ERROR_SETTING_ENCRYPTED_DATA_TYPE       120
-# define PKCS12_R_INVALID_NULL_ARGUMENT                   104
-# define PKCS12_R_INVALID_NULL_PKCS12_POINTER             105
-# define PKCS12_R_IV_GEN_ERROR                            106
-# define PKCS12_R_KEY_GEN_ERROR                           107
-# define PKCS12_R_MAC_ABSENT                              108
-# define PKCS12_R_MAC_GENERATION_ERROR                    109
-# define PKCS12_R_MAC_SETUP_ERROR                         110
-# define PKCS12_R_MAC_STRING_SET_ERROR                    111
-# define PKCS12_R_MAC_VERIFY_FAILURE                      113
-# define PKCS12_R_PARSE_ERROR                             114
-# define PKCS12_R_PKCS12_ALGOR_CIPHERINIT_ERROR           115
-# define PKCS12_R_PKCS12_CIPHERFINAL_ERROR                116
-# define PKCS12_R_PKCS12_PBE_CRYPT_ERROR                  117
-# define PKCS12_R_UNKNOWN_DIGEST_ALGORITHM                118
-# define PKCS12_R_UNSUPPORTED_PKCS12_MODE                 119
-
-# ifdef  __cplusplus
-}
-# endif
-#endif

gpac-2.2.1.tar.gz/extra_lib/include/openssl/pkcs7.h Deleted

@@ -1,404 +0,0 @@
-/*
- * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
- *
- * Licensed under the OpenSSL license (the "License").  You may not use
- * this file except in compliance with the License.  You can obtain a copy
- * in the file LICENSE in the source distribution or at
- * https://www.openssl.org/source/license.html
- */
-
-#ifndef HEADER_PKCS7_H
-# define HEADER_PKCS7_H
-
-# include <openssl/asn1.h>
-# include <openssl/bio.h>
-# include <openssl/e_os2.h>
-
-# include <openssl/symhacks.h>
-# include <openssl/ossl_typ.h>
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-/*-
-Encryption_ID           DES-CBC
-Digest_ID               MD5
-Digest_Encryption_ID    rsaEncryption
-Key_Encryption_ID       rsaEncryption
-*/
-
-typedef struct pkcs7_issuer_and_serial_st {
-    X509_NAME *issuer;
-    ASN1_INTEGER *serial;
-} PKCS7_ISSUER_AND_SERIAL;
-
-typedef struct pkcs7_signer_info_st {
-    ASN1_INTEGER *version;      /* version 1 */
-    PKCS7_ISSUER_AND_SERIAL *issuer_and_serial;
-    X509_ALGOR *digest_alg;
-    STACK_OF(X509_ATTRIBUTE) *auth_attr; /*  0  */
-    X509_ALGOR *digest_enc_alg;
-    ASN1_OCTET_STRING *enc_digest;
-    STACK_OF(X509_ATTRIBUTE) *unauth_attr; /*  1  */
-    /* The private key to sign with */
-    EVP_PKEY *pkey;
-} PKCS7_SIGNER_INFO;
-
-DEFINE_STACK_OF(PKCS7_SIGNER_INFO)
-
-typedef struct pkcs7_recip_info_st {
-    ASN1_INTEGER *version;      /* version 0 */
-    PKCS7_ISSUER_AND_SERIAL *issuer_and_serial;
-    X509_ALGOR *key_enc_algor;
-    ASN1_OCTET_STRING *enc_key;
-    X509 *cert;                 /* get the pub-key from this */
-} PKCS7_RECIP_INFO;
-
-DEFINE_STACK_OF(PKCS7_RECIP_INFO)
-
-typedef struct pkcs7_signed_st {
-    ASN1_INTEGER *version;      /* version 1 */
-    STACK_OF(X509_ALGOR) *md_algs; /* md used */
-    STACK_OF(X509) *cert;       /*  0  */
-    STACK_OF(X509_CRL) *crl;    /*  1  */
-    STACK_OF(PKCS7_SIGNER_INFO) *signer_info;
-    struct pkcs7_st *contents;
-} PKCS7_SIGNED;
-/*
- * The above structure is very very similar to PKCS7_SIGN_ENVELOPE. How about
- * merging the two
- */
-
-typedef struct pkcs7_enc_content_st {
-    ASN1_OBJECT *content_type;
-    X509_ALGOR *algorithm;
-    ASN1_OCTET_STRING *enc_data; /*  0  */
-    const EVP_CIPHER *cipher;
-} PKCS7_ENC_CONTENT;
-
-typedef struct pkcs7_enveloped_st {
-    ASN1_INTEGER *version;      /* version 0 */
-    STACK_OF(PKCS7_RECIP_INFO) *recipientinfo;
-    PKCS7_ENC_CONTENT *enc_data;
-} PKCS7_ENVELOPE;
-
-typedef struct pkcs7_signedandenveloped_st {
-    ASN1_INTEGER *version;      /* version 1 */
-    STACK_OF(X509_ALGOR) *md_algs; /* md used */
-    STACK_OF(X509) *cert;       /*  0  */
-    STACK_OF(X509_CRL) *crl;    /*  1  */
-    STACK_OF(PKCS7_SIGNER_INFO) *signer_info;
-    PKCS7_ENC_CONTENT *enc_data;
-    STACK_OF(PKCS7_RECIP_INFO) *recipientinfo;
-} PKCS7_SIGN_ENVELOPE;
-
-typedef struct pkcs7_digest_st {
-    ASN1_INTEGER *version;      /* version 0 */
-    X509_ALGOR *md;             /* md used */
-    struct pkcs7_st *contents;
-    ASN1_OCTET_STRING *digest;
-} PKCS7_DIGEST;
-
-typedef struct pkcs7_encrypted_st {
-    ASN1_INTEGER *version;      /* version 0 */
-    PKCS7_ENC_CONTENT *enc_data;
-} PKCS7_ENCRYPT;
-
-typedef struct pkcs7_st {
-    /*
-     * The following is non NULL if it contains ASN1 encoding of this
-     * structure
-     */
-    unsigned char *asn1;
-    long length;
-# define PKCS7_S_HEADER  0
-# define PKCS7_S_BODY    1
-# define PKCS7_S_TAIL    2
-    int state;                  /* used during processing */
-    int detached;
-    ASN1_OBJECT *type;
-    /* content as defined by the type */
-    /*
-     * all encryption/message digests are applied to the 'contents', leaving
-     * out the 'type' field.
-     */
-    union {
-        char *ptr;
-        /* NID_pkcs7_data */
-        ASN1_OCTET_STRING *data;
-        /* NID_pkcs7_signed */
-        PKCS7_SIGNED *sign;
-        /* NID_pkcs7_enveloped */
-        PKCS7_ENVELOPE *enveloped;
-        /* NID_pkcs7_signedAndEnveloped */
-        PKCS7_SIGN_ENVELOPE *signed_and_enveloped;
-        /* NID_pkcs7_digest */
-        PKCS7_DIGEST *digest;
-        /* NID_pkcs7_encrypted */
-        PKCS7_ENCRYPT *encrypted;
-        /* Anything else */
-        ASN1_TYPE *other;
-    } d;
-} PKCS7;
-
-DEFINE_STACK_OF(PKCS7)
-
-# define PKCS7_OP_SET_DETACHED_SIGNATURE 1
-# define PKCS7_OP_GET_DETACHED_SIGNATURE 2
-
-# define PKCS7_get_signed_attributes(si) ((si)->auth_attr)
-# define PKCS7_get_attributes(si)        ((si)->unauth_attr)
-
-# define PKCS7_type_is_signed(a) (OBJ_obj2nid((a)->type) == NID_pkcs7_signed)
-# define PKCS7_type_is_encrypted(a) (OBJ_obj2nid((a)->type) == NID_pkcs7_encrypted)
-# define PKCS7_type_is_enveloped(a) (OBJ_obj2nid((a)->type) == NID_pkcs7_enveloped)
-# define PKCS7_type_is_signedAndEnveloped(a) \
-                (OBJ_obj2nid((a)->type) == NID_pkcs7_signedAndEnveloped)
-# define PKCS7_type_is_data(a)   (OBJ_obj2nid((a)->type) == NID_pkcs7_data)
-# define PKCS7_type_is_digest(a)   (OBJ_obj2nid((a)->type) == NID_pkcs7_digest)
-
-# define PKCS7_set_detached(p,v) \
-                PKCS7_ctrl(p,PKCS7_OP_SET_DETACHED_SIGNATURE,v,NULL)
-# define PKCS7_get_detached(p) \
-                PKCS7_ctrl(p,PKCS7_OP_GET_DETACHED_SIGNATURE,0,NULL)
-
-# define PKCS7_is_detached(p7) (PKCS7_type_is_signed(p7) && PKCS7_get_detached(p7))
-
-/* S/MIME related flags */
-
-# define PKCS7_TEXT              0x1
-# define PKCS7_NOCERTS           0x2
-# define PKCS7_NOSIGS            0x4
-# define PKCS7_NOCHAIN           0x8
-# define PKCS7_NOINTERN          0x10
-# define PKCS7_NOVERIFY          0x20
-# define PKCS7_DETACHED          0x40
-# define PKCS7_BINARY            0x80
-# define PKCS7_NOATTR            0x100
-# define PKCS7_NOSMIMECAP        0x200
-# define PKCS7_NOOLDMIMETYPE     0x400
-# define PKCS7_CRLFEOL           0x800
-# define PKCS7_STREAM            0x1000
-# define PKCS7_NOCRL             0x2000
-# define PKCS7_PARTIAL           0x4000
-# define PKCS7_REUSE_DIGEST      0x8000
-# define PKCS7_NO_DUAL_CONTENT   0x10000
-
-/* Flags: for compatibility with older code */
-
-# define SMIME_TEXT      PKCS7_TEXT
-# define SMIME_NOCERTS   PKCS7_NOCERTS
-# define SMIME_NOSIGS    PKCS7_NOSIGS
-# define SMIME_NOCHAIN   PKCS7_NOCHAIN
-# define SMIME_NOINTERN  PKCS7_NOINTERN
-# define SMIME_NOVERIFY  PKCS7_NOVERIFY
-# define SMIME_DETACHED  PKCS7_DETACHED
-# define SMIME_BINARY    PKCS7_BINARY
-# define SMIME_NOATTR    PKCS7_NOATTR
-
-/* CRLF ASCII canonicalisation */
-# define SMIME_ASCIICRLF         0x80000
-
-DECLARE_ASN1_FUNCTIONS(PKCS7_ISSUER_AND_SERIAL)
-
-int PKCS7_ISSUER_AND_SERIAL_digest(PKCS7_ISSUER_AND_SERIAL *data,
-                                   const EVP_MD *type, unsigned char *md,
-                                   unsigned int *len);
-# ifndef OPENSSL_NO_STDIO
-PKCS7 *d2i_PKCS7_fp(FILE *fp, PKCS7 **p7);
-int i2d_PKCS7_fp(FILE *fp, PKCS7 *p7);
-# endif
-PKCS7 *PKCS7_dup(PKCS7 *p7);
-PKCS7 *d2i_PKCS7_bio(BIO *bp, PKCS7 **p7);
-int i2d_PKCS7_bio(BIO *bp, PKCS7 *p7);
-int i2d_PKCS7_bio_stream(BIO *out, PKCS7 *p7, BIO *in, int flags);
-int PEM_write_bio_PKCS7_stream(BIO *out, PKCS7 *p7, BIO *in, int flags);
-
-DECLARE_ASN1_FUNCTIONS(PKCS7_SIGNER_INFO)
-DECLARE_ASN1_FUNCTIONS(PKCS7_RECIP_INFO)
-DECLARE_ASN1_FUNCTIONS(PKCS7_SIGNED)
-DECLARE_ASN1_FUNCTIONS(PKCS7_ENC_CONTENT)
-DECLARE_ASN1_FUNCTIONS(PKCS7_ENVELOPE)
-DECLARE_ASN1_FUNCTIONS(PKCS7_SIGN_ENVELOPE)
-DECLARE_ASN1_FUNCTIONS(PKCS7_DIGEST)
-DECLARE_ASN1_FUNCTIONS(PKCS7_ENCRYPT)
-DECLARE_ASN1_FUNCTIONS(PKCS7)
-
-DECLARE_ASN1_ITEM(PKCS7_ATTR_SIGN)
-DECLARE_ASN1_ITEM(PKCS7_ATTR_VERIFY)
-
-DECLARE_ASN1_NDEF_FUNCTION(PKCS7)
-DECLARE_ASN1_PRINT_FUNCTION(PKCS7)
-
-long PKCS7_ctrl(PKCS7 *p7, int cmd, long larg, char *parg);
-
-int PKCS7_set_type(PKCS7 *p7, int type);
-int PKCS7_set0_type_other(PKCS7 *p7, int type, ASN1_TYPE *other);
-int PKCS7_set_content(PKCS7 *p7, PKCS7 *p7_data);
-int PKCS7_SIGNER_INFO_set(PKCS7_SIGNER_INFO *p7i, X509 *x509, EVP_PKEY *pkey,
-                          const EVP_MD *dgst);
-int PKCS7_SIGNER_INFO_sign(PKCS7_SIGNER_INFO *si);
-int PKCS7_add_signer(PKCS7 *p7, PKCS7_SIGNER_INFO *p7i);
-int PKCS7_add_certificate(PKCS7 *p7, X509 *x509);
-int PKCS7_add_crl(PKCS7 *p7, X509_CRL *x509);
-int PKCS7_content_new(PKCS7 *p7, int nid);
-int PKCS7_dataVerify(X509_STORE *cert_store, X509_STORE_CTX *ctx,
-                     BIO *bio, PKCS7 *p7, PKCS7_SIGNER_INFO *si);
-int PKCS7_signatureVerify(BIO *bio, PKCS7 *p7, PKCS7_SIGNER_INFO *si,
-                          X509 *x509);
-
-BIO *PKCS7_dataInit(PKCS7 *p7, BIO *bio);
-int PKCS7_dataFinal(PKCS7 *p7, BIO *bio);
-BIO *PKCS7_dataDecode(PKCS7 *p7, EVP_PKEY *pkey, BIO *in_bio, X509 *pcert);
-
-PKCS7_SIGNER_INFO *PKCS7_add_signature(PKCS7 *p7, X509 *x509,
-                                       EVP_PKEY *pkey, const EVP_MD *dgst);
-X509 *PKCS7_cert_from_signer_info(PKCS7 *p7, PKCS7_SIGNER_INFO *si);
-int PKCS7_set_digest(PKCS7 *p7, const EVP_MD *md);
-STACK_OF(PKCS7_SIGNER_INFO) *PKCS7_get_signer_info(PKCS7 *p7);
-
-PKCS7_RECIP_INFO *PKCS7_add_recipient(PKCS7 *p7, X509 *x509);
-void PKCS7_SIGNER_INFO_get0_algs(PKCS7_SIGNER_INFO *si, EVP_PKEY **pk,
-                                 X509_ALGOR **pdig, X509_ALGOR **psig);
-void PKCS7_RECIP_INFO_get0_alg(PKCS7_RECIP_INFO *ri, X509_ALGOR **penc);
-int PKCS7_add_recipient_info(PKCS7 *p7, PKCS7_RECIP_INFO *ri);
-int PKCS7_RECIP_INFO_set(PKCS7_RECIP_INFO *p7i, X509 *x509);
-int PKCS7_set_cipher(PKCS7 *p7, const EVP_CIPHER *cipher);
-int PKCS7_stream(unsigned char ***boundary, PKCS7 *p7);
-
-PKCS7_ISSUER_AND_SERIAL *PKCS7_get_issuer_and_serial(PKCS7 *p7, int idx);
-ASN1_OCTET_STRING *PKCS7_digest_from_attributes(STACK_OF(X509_ATTRIBUTE) *sk);
-int PKCS7_add_signed_attribute(PKCS7_SIGNER_INFO *p7si, int nid, int type,
-                               void *data);
-int PKCS7_add_attribute(PKCS7_SIGNER_INFO *p7si, int nid, int atrtype,
-                        void *value);
-ASN1_TYPE *PKCS7_get_attribute(PKCS7_SIGNER_INFO *si, int nid);
-ASN1_TYPE *PKCS7_get_signed_attribute(PKCS7_SIGNER_INFO *si, int nid);
-int PKCS7_set_signed_attributes(PKCS7_SIGNER_INFO *p7si,
-                                STACK_OF(X509_ATTRIBUTE) *sk);
-int PKCS7_set_attributes(PKCS7_SIGNER_INFO *p7si,
-                         STACK_OF(X509_ATTRIBUTE) *sk);
-
-PKCS7 *PKCS7_sign(X509 *signcert, EVP_PKEY *pkey, STACK_OF(X509) *certs,
-                  BIO *data, int flags);
-
-PKCS7_SIGNER_INFO *PKCS7_sign_add_signer(PKCS7 *p7,
-                                         X509 *signcert, EVP_PKEY *pkey,
-                                         const EVP_MD *md, int flags);
-
-int PKCS7_final(PKCS7 *p7, BIO *data, int flags);
-int PKCS7_verify(PKCS7 *p7, STACK_OF(X509) *certs, X509_STORE *store,
-                 BIO *indata, BIO *out, int flags);
-STACK_OF(X509) *PKCS7_get0_signers(PKCS7 *p7, STACK_OF(X509) *certs,
-                                   int flags);
-PKCS7 *PKCS7_encrypt(STACK_OF(X509) *certs, BIO *in, const EVP_CIPHER *cipher,
-                     int flags);
-int PKCS7_decrypt(PKCS7 *p7, EVP_PKEY *pkey, X509 *cert, BIO *data,
-                  int flags);
-
-int PKCS7_add_attrib_smimecap(PKCS7_SIGNER_INFO *si,
-                              STACK_OF(X509_ALGOR) *cap);
-STACK_OF(X509_ALGOR) *PKCS7_get_smimecap(PKCS7_SIGNER_INFO *si);
-int PKCS7_simple_smimecap(STACK_OF(X509_ALGOR) *sk, int nid, int arg);
-
-int PKCS7_add_attrib_content_type(PKCS7_SIGNER_INFO *si, ASN1_OBJECT *coid);
-int PKCS7_add0_attrib_signing_time(PKCS7_SIGNER_INFO *si, ASN1_TIME *t);
-int PKCS7_add1_attrib_digest(PKCS7_SIGNER_INFO *si,
-                             const unsigned char *md, int mdlen);
-
-int SMIME_write_PKCS7(BIO *bio, PKCS7 *p7, BIO *data, int flags);
-PKCS7 *SMIME_read_PKCS7(BIO *bio, BIO **bcont);
-
-BIO *BIO_new_PKCS7(BIO *out, PKCS7 *p7);
-
-/* BEGIN ERROR CODES */
-/*
- * The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
-
-int ERR_load_PKCS7_strings(void);
-
-/* Error codes for the PKCS7 functions. */
-
-/* Function codes. */
-# define PKCS7_F_DO_PKCS7_SIGNED_ATTRIB                   136
-# define PKCS7_F_PKCS7_ADD0_ATTRIB_SIGNING_TIME           135
-# define PKCS7_F_PKCS7_ADD_ATTRIB_SMIMECAP                118
-# define PKCS7_F_PKCS7_ADD_CERTIFICATE                    100
-# define PKCS7_F_PKCS7_ADD_CRL                            101
-# define PKCS7_F_PKCS7_ADD_RECIPIENT_INFO                 102
-# define PKCS7_F_PKCS7_ADD_SIGNATURE                      131
-# define PKCS7_F_PKCS7_ADD_SIGNER                         103
-# define PKCS7_F_PKCS7_BIO_ADD_DIGEST                     125
-# define PKCS7_F_PKCS7_COPY_EXISTING_DIGEST               138
-# define PKCS7_F_PKCS7_CTRL                               104
-# define PKCS7_F_PKCS7_DATADECODE                         112
-# define PKCS7_F_PKCS7_DATAFINAL                          128
-# define PKCS7_F_PKCS7_DATAINIT                           105
-# define PKCS7_F_PKCS7_DATAVERIFY                         107
-# define PKCS7_F_PKCS7_DECRYPT                            114
-# define PKCS7_F_PKCS7_DECRYPT_RINFO                      133
-# define PKCS7_F_PKCS7_ENCODE_RINFO                       132
-# define PKCS7_F_PKCS7_ENCRYPT                            115
-# define PKCS7_F_PKCS7_FINAL                              134
-# define PKCS7_F_PKCS7_FIND_DIGEST                        127
-# define PKCS7_F_PKCS7_GET0_SIGNERS                       124
-# define PKCS7_F_PKCS7_RECIP_INFO_SET                     130
-# define PKCS7_F_PKCS7_SET_CIPHER                         108
-# define PKCS7_F_PKCS7_SET_CONTENT                        109
-# define PKCS7_F_PKCS7_SET_DIGEST                         126
-# define PKCS7_F_PKCS7_SET_TYPE                           110
-# define PKCS7_F_PKCS7_SIGN                               116
-# define PKCS7_F_PKCS7_SIGNATUREVERIFY                    113
-# define PKCS7_F_PKCS7_SIGNER_INFO_SET                    129
-# define PKCS7_F_PKCS7_SIGNER_INFO_SIGN                   139
-# define PKCS7_F_PKCS7_SIGN_ADD_SIGNER                    137
-# define PKCS7_F_PKCS7_SIMPLE_SMIMECAP                    119
-# define PKCS7_F_PKCS7_VERIFY                             117
-
-/* Reason codes. */
-# define PKCS7_R_CERTIFICATE_VERIFY_ERROR                 117
-# define PKCS7_R_CIPHER_HAS_NO_OBJECT_IDENTIFIER          144
-# define PKCS7_R_CIPHER_NOT_INITIALIZED                   116
-# define PKCS7_R_CONTENT_AND_DATA_PRESENT                 118
-# define PKCS7_R_CTRL_ERROR                               152
-# define PKCS7_R_DECRYPT_ERROR                            119
-# define PKCS7_R_DIGEST_FAILURE                           101
-# define PKCS7_R_ENCRYPTION_CTRL_FAILURE                  149
-# define PKCS7_R_ENCRYPTION_NOT_SUPPORTED_FOR_THIS_KEY_TYPE 150
-# define PKCS7_R_ERROR_ADDING_RECIPIENT                   120
-# define PKCS7_R_ERROR_SETTING_CIPHER                     121
-# define PKCS7_R_INVALID_NULL_POINTER                     143
-# define PKCS7_R_INVALID_SIGNED_DATA_TYPE                 155
-# define PKCS7_R_NO_CONTENT                               122
-# define PKCS7_R_NO_DEFAULT_DIGEST                        151
-# define PKCS7_R_NO_MATCHING_DIGEST_TYPE_FOUND            154
-# define PKCS7_R_NO_RECIPIENT_MATCHES_CERTIFICATE         115
-# define PKCS7_R_NO_SIGNATURES_ON_DATA                    123
-# define PKCS7_R_NO_SIGNERS                               142
-# define PKCS7_R_OPERATION_NOT_SUPPORTED_ON_THIS_TYPE     104
-# define PKCS7_R_PKCS7_ADD_SIGNATURE_ERROR                124
-# define PKCS7_R_PKCS7_ADD_SIGNER_ERROR                   153
-# define PKCS7_R_PKCS7_DATASIGN                           145
-# define PKCS7_R_PRIVATE_KEY_DOES_NOT_MATCH_CERTIFICATE   127
-# define PKCS7_R_SIGNATURE_FAILURE                        105
-# define PKCS7_R_SIGNER_CERTIFICATE_NOT_FOUND             128
-# define PKCS7_R_SIGNING_CTRL_FAILURE                     147
-# define PKCS7_R_SIGNING_NOT_SUPPORTED_FOR_THIS_KEY_TYPE  148
-# define PKCS7_R_SMIME_TEXT_ERROR                         129
-# define PKCS7_R_UNABLE_TO_FIND_CERTIFICATE               106
-# define PKCS7_R_UNABLE_TO_FIND_MEM_BIO                   107
-# define PKCS7_R_UNABLE_TO_FIND_MESSAGE_DIGEST            108
-# define PKCS7_R_UNKNOWN_DIGEST_TYPE                      109
-# define PKCS7_R_UNKNOWN_OPERATION                        110
-# define PKCS7_R_UNSUPPORTED_CIPHER_TYPE                  111
-# define PKCS7_R_UNSUPPORTED_CONTENT_TYPE                 112
-# define PKCS7_R_WRONG_CONTENT_TYPE                       113
-# define PKCS7_R_WRONG_PKCS7_TYPE                         114
-
-# ifdef  __cplusplus
-}
-# endif
-#endif

gpac-2.2.1.tar.gz/extra_lib/include/openssl/rand.h Deleted

@@ -1,89 +0,0 @@
-/*
- * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
- *
- * Licensed under the OpenSSL license (the "License").  You may not use
- * this file except in compliance with the License.  You can obtain a copy
- * in the file LICENSE in the source distribution or at
- * https://www.openssl.org/source/license.html
- */
-
-#ifndef HEADER_RAND_H
-# define HEADER_RAND_H
-
-# include <stdlib.h>
-# include <openssl/ossl_typ.h>
-# include <openssl/e_os2.h>
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-/* Already defined in ossl_typ.h */
-/* typedef struct rand_meth_st RAND_METHOD; */
-
-struct rand_meth_st {
-    int (*seed) (const void *buf, int num);
-    int (*bytes) (unsigned char *buf, int num);
-    void (*cleanup) (void);
-    int (*add) (const void *buf, int num, double entropy);
-    int (*pseudorand) (unsigned char *buf, int num);
-    int (*status) (void);
-};
-
-# ifdef BN_DEBUG
-extern int rand_predictable;
-# endif
-
-int RAND_set_rand_method(const RAND_METHOD *meth);
-const RAND_METHOD *RAND_get_rand_method(void);
-# ifndef OPENSSL_NO_ENGINE
-int RAND_set_rand_engine(ENGINE *engine);
-# endif
-RAND_METHOD *RAND_OpenSSL(void);
-#if OPENSSL_API_COMPAT < 0x10100000L
-# define RAND_cleanup() while(0) continue
-#endif
-int RAND_bytes(unsigned char *buf, int num);
-DEPRECATEDIN_1_1_0(int RAND_pseudo_bytes(unsigned char *buf, int num))
-void RAND_seed(const void *buf, int num);
-#if defined(__ANDROID__) && defined(__NDK_FPABI__)
-__NDK_FPABI__	/* __attribute__((pcs("aapcs"))) on ARM */
-#endif
-void RAND_add(const void *buf, int num, double entropy);
-int RAND_load_file(const char *file, long max_bytes);
-int RAND_write_file(const char *file);
-const char *RAND_file_name(char *file, size_t num);
-int RAND_status(void);
-# ifndef OPENSSL_NO_EGD
-int RAND_query_egd_bytes(const char *path, unsigned char *buf, int bytes);
-int RAND_egd(const char *path);
-int RAND_egd_bytes(const char *path, int bytes);
-# endif
-int RAND_poll(void);
-
-#if defined(_WIN32) && (defined(BASETYPES) || defined(_WINDEF_H))
-/* application has to include <windows.h> in order to use these */
-DEPRECATEDIN_1_1_0(void RAND_screen(void))
-DEPRECATEDIN_1_1_0(int RAND_event(UINT, WPARAM, LPARAM))
-#endif
-
-/* BEGIN ERROR CODES */
-/*
- * The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
-
-int ERR_load_RAND_strings(void);
-
-/* Error codes for the RAND functions. */
-
-/* Function codes. */
-# define RAND_F_RAND_BYTES                                100
-
-/* Reason codes. */
-# define RAND_R_PRNG_NOT_SEEDED                           100
-
-# ifdef  __cplusplus
-}
-# endif
-#endif

gpac-2.2.1.tar.gz/extra_lib/include/openssl/rc2.h Deleted

@@ -1,51 +0,0 @@
-/*
- * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
- *
- * Licensed under the OpenSSL license (the "License").  You may not use
- * this file except in compliance with the License.  You can obtain a copy
- * in the file LICENSE in the source distribution or at
- * https://www.openssl.org/source/license.html
- */
-
-#ifndef HEADER_RC2_H
-# define HEADER_RC2_H
-
-# include <openssl/opensslconf.h>
-
-# ifndef OPENSSL_NO_RC2
-# ifdef  __cplusplus
-extern "C" {
-# endif
-
-typedef unsigned int RC2_INT;
-
-# define RC2_ENCRYPT     1
-# define RC2_DECRYPT     0
-
-# define RC2_BLOCK       8
-# define RC2_KEY_LENGTH  16
-
-typedef struct rc2_key_st {
-    RC2_INT data64;
-} RC2_KEY;
-
-void RC2_set_key(RC2_KEY *key, int len, const unsigned char *data, int bits);
-void RC2_ecb_encrypt(const unsigned char *in, unsigned char *out,
-                     RC2_KEY *key, int enc);
-void RC2_encrypt(unsigned long *data, RC2_KEY *key);
-void RC2_decrypt(unsigned long *data, RC2_KEY *key);
-void RC2_cbc_encrypt(const unsigned char *in, unsigned char *out, long length,
-                     RC2_KEY *ks, unsigned char *iv, int enc);
-void RC2_cfb64_encrypt(const unsigned char *in, unsigned char *out,
-                       long length, RC2_KEY *schedule, unsigned char *ivec,
-                       int *num, int enc);
-void RC2_ofb64_encrypt(const unsigned char *in, unsigned char *out,
-                       long length, RC2_KEY *schedule, unsigned char *ivec,
-                       int *num);
-
-# ifdef  __cplusplus
-}
-# endif
-# endif
-
-#endif

gpac-2.2.1.tar.gz/extra_lib/include/openssl/rc4.h Deleted

gpac-2.2.1.tar.gz/extra_lib/include/openssl/rc5.h Deleted

@@ -1,63 +0,0 @@
-/*
- * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
- *
- * Licensed under the OpenSSL license (the "License").  You may not use
- * this file except in compliance with the License.  You can obtain a copy
- * in the file LICENSE in the source distribution or at
- * https://www.openssl.org/source/license.html
- */
-
-#ifndef HEADER_RC5_H
-# define HEADER_RC5_H
-
-# include <openssl/opensslconf.h>
-
-# ifndef OPENSSL_NO_RC5
-# ifdef  __cplusplus
-extern "C" {
-# endif
-
-# define RC5_ENCRYPT     1
-# define RC5_DECRYPT     0
-
-# define RC5_32_INT unsigned int
-
-# define RC5_32_BLOCK            8
-# define RC5_32_KEY_LENGTH       16/* This is a default, max is 255 */
-
-/*
- * This are the only values supported.  Tweak the code if you want more The
- * most supported modes will be RC5-32/12/16 RC5-32/16/8
- */
-# define RC5_8_ROUNDS    8
-# define RC5_12_ROUNDS   12
-# define RC5_16_ROUNDS   16
-
-typedef struct rc5_key_st {
-    /* Number of rounds */
-    int rounds;
-    RC5_32_INT data2 * (RC5_16_ROUNDS + 1);
-} RC5_32_KEY;
-
-void RC5_32_set_key(RC5_32_KEY *key, int len, const unsigned char *data,
-                    int rounds);
-void RC5_32_ecb_encrypt(const unsigned char *in, unsigned char *out,
-                        RC5_32_KEY *key, int enc);
-void RC5_32_encrypt(unsigned long *data, RC5_32_KEY *key);
-void RC5_32_decrypt(unsigned long *data, RC5_32_KEY *key);
-void RC5_32_cbc_encrypt(const unsigned char *in, unsigned char *out,
-                        long length, RC5_32_KEY *ks, unsigned char *iv,
-                        int enc);
-void RC5_32_cfb64_encrypt(const unsigned char *in, unsigned char *out,
-                          long length, RC5_32_KEY *schedule,
-                          unsigned char *ivec, int *num, int enc);
-void RC5_32_ofb64_encrypt(const unsigned char *in, unsigned char *out,
-                          long length, RC5_32_KEY *schedule,
-                          unsigned char *ivec, int *num);
-
-# ifdef  __cplusplus
-}
-# endif
-# endif
-
-#endif

gpac-2.2.1.tar.gz/extra_lib/include/openssl/ripemd.h Deleted

@@ -1,47 +0,0 @@
-/*
- * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
- *
- * Licensed under the OpenSSL license (the "License").  You may not use
- * this file except in compliance with the License.  You can obtain a copy
- * in the file LICENSE in the source distribution or at
- * https://www.openssl.org/source/license.html
- */
-
-#ifndef HEADER_RIPEMD_H
-# define HEADER_RIPEMD_H
-
-# include <openssl/opensslconf.h>
-
-#ifndef OPENSSL_NO_RMD160
-# include <openssl/e_os2.h>
-# include <stddef.h>
-# ifdef  __cplusplus
-extern "C" {
-# endif
-
-# define RIPEMD160_LONG unsigned int
-
-# define RIPEMD160_CBLOCK        64
-# define RIPEMD160_LBLOCK        (RIPEMD160_CBLOCK/4)
-# define RIPEMD160_DIGEST_LENGTH 20
-
-typedef struct RIPEMD160state_st {
-    RIPEMD160_LONG A, B, C, D, E;
-    RIPEMD160_LONG Nl, Nh;
-    RIPEMD160_LONG dataRIPEMD160_LBLOCK;
-    unsigned int num;
-} RIPEMD160_CTX;
-
-int RIPEMD160_Init(RIPEMD160_CTX *c);
-int RIPEMD160_Update(RIPEMD160_CTX *c, const void *data, size_t len);
-int RIPEMD160_Final(unsigned char *md, RIPEMD160_CTX *c);
-unsigned char *RIPEMD160(const unsigned char *d, size_t n, unsigned char *md);
-void RIPEMD160_Transform(RIPEMD160_CTX *c, const unsigned char *b);
-
-# ifdef  __cplusplus
-}
-# endif
-# endif
-
-
-#endif

gpac-2.2.1.tar.gz/extra_lib/include/openssl/rsa.h Deleted

@@ -1,590 +0,0 @@
-/*
- * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
- *
- * Licensed under the OpenSSL license (the "License").  You may not use
- * this file except in compliance with the License.  You can obtain a copy
- * in the file LICENSE in the source distribution or at
- * https://www.openssl.org/source/license.html
- */
-
-#ifndef HEADER_RSA_H
-# define HEADER_RSA_H
-
-# include <openssl/opensslconf.h>
-
-# ifndef OPENSSL_NO_RSA
-# include <openssl/asn1.h>
-# include <openssl/bio.h>
-# include <openssl/crypto.h>
-# include <openssl/ossl_typ.h>
-# if OPENSSL_API_COMPAT < 0x10100000L
-#  include <openssl/bn.h>
-# endif
-# ifdef  __cplusplus
-extern "C" {
-# endif
-
-/* The types RSA and RSA_METHOD are defined in ossl_typ.h */
-
-# ifndef OPENSSL_RSA_MAX_MODULUS_BITS
-#  define OPENSSL_RSA_MAX_MODULUS_BITS   16384
-# endif
-
-# define OPENSSL_RSA_FIPS_MIN_MODULUS_BITS 1024
-
-# ifndef OPENSSL_RSA_SMALL_MODULUS_BITS
-#  define OPENSSL_RSA_SMALL_MODULUS_BITS 3072
-# endif
-# ifndef OPENSSL_RSA_MAX_PUBEXP_BITS
-
-/* exponent limit enforced for "large" modulus only */
-#  define OPENSSL_RSA_MAX_PUBEXP_BITS    64
-# endif
-
-# define RSA_3   0x3L
-# define RSA_F4  0x10001L
-
-# define RSA_METHOD_FLAG_NO_CHECK        0x0001/* don't check pub/private
-                                                * match */
-
-# define RSA_FLAG_CACHE_PUBLIC           0x0002
-# define RSA_FLAG_CACHE_PRIVATE          0x0004
-# define RSA_FLAG_BLINDING               0x0008
-# define RSA_FLAG_THREAD_SAFE            0x0010
-/*
- * This flag means the private key operations will be handled by rsa_mod_exp
- * and that they do not depend on the private key components being present:
- * for example a key stored in external hardware. Without this flag
- * bn_mod_exp gets called when private key components are absent.
- */
-# define RSA_FLAG_EXT_PKEY               0x0020
-
-/*
- * new with 0.9.6j and 0.9.7b; the built-in
- * RSA implementation now uses blinding by
- * default (ignoring RSA_FLAG_BLINDING),
- * but other engines might not need it
- */
-# define RSA_FLAG_NO_BLINDING            0x0080
-# if OPENSSL_API_COMPAT < 0x10100000L
-/*
- * Does nothing. Previously this switched off constant time behaviour.
- */
-#  define RSA_FLAG_NO_CONSTTIME           0x0000
-# endif
-# if OPENSSL_API_COMPAT < 0x00908000L
-/* deprecated name for the flag*/
-/*
- * new with 0.9.7h; the built-in RSA
- * implementation now uses constant time
- * modular exponentiation for secret exponents
- * by default. This flag causes the
- * faster variable sliding window method to
- * be used for all exponents.
- */
-#  define RSA_FLAG_NO_EXP_CONSTTIME RSA_FLAG_NO_CONSTTIME
-# endif
-
-# define EVP_PKEY_CTX_set_rsa_padding(ctx, pad) \
-        EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_RSA, -1, EVP_PKEY_CTRL_RSA_PADDING, \
-                                pad, NULL)
-
-# define EVP_PKEY_CTX_get_rsa_padding(ctx, ppad) \
-        EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_RSA, -1, \
-                                EVP_PKEY_CTRL_GET_RSA_PADDING, 0, ppad)
-
-# define EVP_PKEY_CTX_set_rsa_pss_saltlen(ctx, len) \
-        EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_RSA, \
-                                (EVP_PKEY_OP_SIGN|EVP_PKEY_OP_VERIFY), \
-                                EVP_PKEY_CTRL_RSA_PSS_SALTLEN, \
-                                len, NULL)
-
-# define EVP_PKEY_CTX_get_rsa_pss_saltlen(ctx, plen) \
-        EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_RSA, \
-                                (EVP_PKEY_OP_SIGN|EVP_PKEY_OP_VERIFY), \
-                                EVP_PKEY_CTRL_GET_RSA_PSS_SALTLEN, \
-                                0, plen)
-
-# define EVP_PKEY_CTX_set_rsa_keygen_bits(ctx, bits) \
-        EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_RSA, EVP_PKEY_OP_KEYGEN, \
-                                EVP_PKEY_CTRL_RSA_KEYGEN_BITS, bits, NULL)
-
-# define EVP_PKEY_CTX_set_rsa_keygen_pubexp(ctx, pubexp) \
-        EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_RSA, EVP_PKEY_OP_KEYGEN, \
-                                EVP_PKEY_CTRL_RSA_KEYGEN_PUBEXP, 0, pubexp)
-
-# define  EVP_PKEY_CTX_set_rsa_mgf1_md(ctx, md)  \
-                EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_RSA, \
-                        EVP_PKEY_OP_TYPE_SIG | EVP_PKEY_OP_TYPE_CRYPT, \
-                                EVP_PKEY_CTRL_RSA_MGF1_MD, 0, (void *)md)
-
-# define  EVP_PKEY_CTX_set_rsa_oaep_md(ctx, md)  \
-                EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_RSA, EVP_PKEY_OP_TYPE_CRYPT,  \
-                                EVP_PKEY_CTRL_RSA_OAEP_MD, 0, (void *)md)
-
-# define  EVP_PKEY_CTX_get_rsa_mgf1_md(ctx, pmd) \
-                EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_RSA, \
-                        EVP_PKEY_OP_TYPE_SIG | EVP_PKEY_OP_TYPE_CRYPT, \
-                                EVP_PKEY_CTRL_GET_RSA_MGF1_MD, 0, (void *)pmd)
-
-# define  EVP_PKEY_CTX_get_rsa_oaep_md(ctx, pmd) \
-                EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_RSA, EVP_PKEY_OP_TYPE_CRYPT,  \
-                                EVP_PKEY_CTRL_GET_RSA_OAEP_MD, 0, (void *)pmd)
-
-# define  EVP_PKEY_CTX_set0_rsa_oaep_label(ctx, l, llen) \
-                EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_RSA, EVP_PKEY_OP_TYPE_CRYPT,  \
-                                EVP_PKEY_CTRL_RSA_OAEP_LABEL, llen, (void *)l)
-
-# define  EVP_PKEY_CTX_get0_rsa_oaep_label(ctx, l)       \
-                EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_RSA, EVP_PKEY_OP_TYPE_CRYPT,  \
-                                EVP_PKEY_CTRL_GET_RSA_OAEP_LABEL, 0, (void *)l)
-
-# define EVP_PKEY_CTRL_RSA_PADDING       (EVP_PKEY_ALG_CTRL + 1)
-# define EVP_PKEY_CTRL_RSA_PSS_SALTLEN   (EVP_PKEY_ALG_CTRL + 2)
-
-# define EVP_PKEY_CTRL_RSA_KEYGEN_BITS   (EVP_PKEY_ALG_CTRL + 3)
-# define EVP_PKEY_CTRL_RSA_KEYGEN_PUBEXP (EVP_PKEY_ALG_CTRL + 4)
-# define EVP_PKEY_CTRL_RSA_MGF1_MD       (EVP_PKEY_ALG_CTRL + 5)
-
-# define EVP_PKEY_CTRL_GET_RSA_PADDING           (EVP_PKEY_ALG_CTRL + 6)
-# define EVP_PKEY_CTRL_GET_RSA_PSS_SALTLEN       (EVP_PKEY_ALG_CTRL + 7)
-# define EVP_PKEY_CTRL_GET_RSA_MGF1_MD           (EVP_PKEY_ALG_CTRL + 8)
-
-# define EVP_PKEY_CTRL_RSA_OAEP_MD       (EVP_PKEY_ALG_CTRL + 9)
-# define EVP_PKEY_CTRL_RSA_OAEP_LABEL    (EVP_PKEY_ALG_CTRL + 10)
-
-# define EVP_PKEY_CTRL_GET_RSA_OAEP_MD   (EVP_PKEY_ALG_CTRL + 11)
-# define EVP_PKEY_CTRL_GET_RSA_OAEP_LABEL (EVP_PKEY_ALG_CTRL + 12)
-
-# define RSA_PKCS1_PADDING       1
-# define RSA_SSLV23_PADDING      2
-# define RSA_NO_PADDING          3
-# define RSA_PKCS1_OAEP_PADDING  4
-# define RSA_X931_PADDING        5
-/* EVP_PKEY_ only */
-# define RSA_PKCS1_PSS_PADDING   6
-
-# define RSA_PKCS1_PADDING_SIZE  11
-
-# define RSA_set_app_data(s,arg)         RSA_set_ex_data(s,0,arg)
-# define RSA_get_app_data(s)             RSA_get_ex_data(s,0)
-
-RSA *RSA_new(void);
-RSA *RSA_new_method(ENGINE *engine);
-int RSA_bits(const RSA *rsa);
-int RSA_size(const RSA *rsa);
-int RSA_security_bits(const RSA *rsa);
-
-int RSA_set0_key(RSA *r, BIGNUM *n, BIGNUM *e, BIGNUM *d);
-int RSA_set0_factors(RSA *r, BIGNUM *p, BIGNUM *q);
-int RSA_set0_crt_params(RSA *r,BIGNUM *dmp1, BIGNUM *dmq1, BIGNUM *iqmp);
-void RSA_get0_key(const RSA *r,
-                  const BIGNUM **n, const BIGNUM **e, const BIGNUM **d);
-void RSA_get0_factors(const RSA *r, const BIGNUM **p, const BIGNUM **q);
-void RSA_get0_crt_params(const RSA *r,
-                         const BIGNUM **dmp1, const BIGNUM **dmq1,
-                         const BIGNUM **iqmp);
-void RSA_clear_flags(RSA *r, int flags);
-int RSA_test_flags(const RSA *r, int flags);
-void RSA_set_flags(RSA *r, int flags);
-ENGINE *RSA_get0_engine(const RSA *r);
-
-/* Deprecated version */
-DEPRECATEDIN_0_9_8(RSA *RSA_generate_key(int bits, unsigned long e, void
-                                         (*callback) (int, int, void *),
-                                         void *cb_arg))
-
-/* New version */
-int RSA_generate_key_ex(RSA *rsa, int bits, BIGNUM *e, BN_GENCB *cb);
-
-int RSA_X931_derive_ex(RSA *rsa, BIGNUM *p1, BIGNUM *p2, BIGNUM *q1,
-                       BIGNUM *q2, const BIGNUM *Xp1, const BIGNUM *Xp2,
-                       const BIGNUM *Xp, const BIGNUM *Xq1, const BIGNUM *Xq2,
-                       const BIGNUM *Xq, const BIGNUM *e, BN_GENCB *cb);
-int RSA_X931_generate_key_ex(RSA *rsa, int bits, const BIGNUM *e,
-                             BN_GENCB *cb);
-
-int RSA_check_key(const RSA *);
-int RSA_check_key_ex(const RSA *, BN_GENCB *cb);
-        /* next 4 return -1 on error */
-int RSA_public_encrypt(int flen, const unsigned char *from,
-                       unsigned char *to, RSA *rsa, int padding);
-int RSA_private_encrypt(int flen, const unsigned char *from,
-                        unsigned char *to, RSA *rsa, int padding);
-int RSA_public_decrypt(int flen, const unsigned char *from,
-                       unsigned char *to, RSA *rsa, int padding);
-int RSA_private_decrypt(int flen, const unsigned char *from,
-                        unsigned char *to, RSA *rsa, int padding);
-void RSA_free(RSA *r);
-/* "up" the RSA object's reference count */
-int RSA_up_ref(RSA *r);
-
-int RSA_flags(const RSA *r);
-
-void RSA_set_default_method(const RSA_METHOD *meth);
-const RSA_METHOD *RSA_get_default_method(void);
-const RSA_METHOD *RSA_get_method(const RSA *rsa);
-int RSA_set_method(RSA *rsa, const RSA_METHOD *meth);
-
-/* these are the actual RSA functions */
-const RSA_METHOD *RSA_PKCS1_OpenSSL(void);
-
-const RSA_METHOD *RSA_null_method(void);
-
-DECLARE_ASN1_ENCODE_FUNCTIONS_const(RSA, RSAPublicKey)
-DECLARE_ASN1_ENCODE_FUNCTIONS_const(RSA, RSAPrivateKey)
-
-typedef struct rsa_pss_params_st {
-    X509_ALGOR *hashAlgorithm;
-    X509_ALGOR *maskGenAlgorithm;
-    ASN1_INTEGER *saltLength;
-    ASN1_INTEGER *trailerField;
-} RSA_PSS_PARAMS;
-
-DECLARE_ASN1_FUNCTIONS(RSA_PSS_PARAMS)
-
-typedef struct rsa_oaep_params_st {
-    X509_ALGOR *hashFunc;
-    X509_ALGOR *maskGenFunc;
-    X509_ALGOR *pSourceFunc;
-} RSA_OAEP_PARAMS;
-
-DECLARE_ASN1_FUNCTIONS(RSA_OAEP_PARAMS)
-
-# ifndef OPENSSL_NO_STDIO
-int RSA_print_fp(FILE *fp, const RSA *r, int offset);
-# endif
-
-int RSA_print(BIO *bp, const RSA *r, int offset);
-
-/*
- * The following 2 functions sign and verify a X509_SIG ASN1 object inside
- * PKCS#1 padded RSA encryption
- */
-int RSA_sign(int type, const unsigned char *m, unsigned int m_length,
-             unsigned char *sigret, unsigned int *siglen, RSA *rsa);
-int RSA_verify(int type, const unsigned char *m, unsigned int m_length,
-               const unsigned char *sigbuf, unsigned int siglen, RSA *rsa);
-
-/*
- * The following 2 function sign and verify a ASN1_OCTET_STRING object inside
- * PKCS#1 padded RSA encryption
- */
-int RSA_sign_ASN1_OCTET_STRING(int type,
-                               const unsigned char *m, unsigned int m_length,
-                               unsigned char *sigret, unsigned int *siglen,
-                               RSA *rsa);
-int RSA_verify_ASN1_OCTET_STRING(int type, const unsigned char *m,
-                                 unsigned int m_length, unsigned char *sigbuf,
-                                 unsigned int siglen, RSA *rsa);
-
-int RSA_blinding_on(RSA *rsa, BN_CTX *ctx);
-void RSA_blinding_off(RSA *rsa);
-BN_BLINDING *RSA_setup_blinding(RSA *rsa, BN_CTX *ctx);
-
-int RSA_padding_add_PKCS1_type_1(unsigned char *to, int tlen,
-                                 const unsigned char *f, int fl);
-int RSA_padding_check_PKCS1_type_1(unsigned char *to, int tlen,
-                                   const unsigned char *f, int fl,
-                                   int rsa_len);
-int RSA_padding_add_PKCS1_type_2(unsigned char *to, int tlen,
-                                 const unsigned char *f, int fl);
-int RSA_padding_check_PKCS1_type_2(unsigned char *to, int tlen,
-                                   const unsigned char *f, int fl,
-                                   int rsa_len);
-int PKCS1_MGF1(unsigned char *mask, long len, const unsigned char *seed,
-               long seedlen, const EVP_MD *dgst);
-int RSA_padding_add_PKCS1_OAEP(unsigned char *to, int tlen,
-                               const unsigned char *f, int fl,
-                               const unsigned char *p, int pl);
-int RSA_padding_check_PKCS1_OAEP(unsigned char *to, int tlen,
-                                 const unsigned char *f, int fl, int rsa_len,
-                                 const unsigned char *p, int pl);
-int RSA_padding_add_PKCS1_OAEP_mgf1(unsigned char *to, int tlen,
-                                    const unsigned char *from, int flen,
-                                    const unsigned char *param, int plen,
-                                    const EVP_MD *md, const EVP_MD *mgf1md);
-int RSA_padding_check_PKCS1_OAEP_mgf1(unsigned char *to, int tlen,
-                                      const unsigned char *from, int flen,
-                                      int num, const unsigned char *param,
-                                      int plen, const EVP_MD *md,
-                                      const EVP_MD *mgf1md);
-int RSA_padding_add_SSLv23(unsigned char *to, int tlen,
-                           const unsigned char *f, int fl);
-int RSA_padding_check_SSLv23(unsigned char *to, int tlen,
-                             const unsigned char *f, int fl, int rsa_len);
-int RSA_padding_add_none(unsigned char *to, int tlen, const unsigned char *f,
-                         int fl);
-int RSA_padding_check_none(unsigned char *to, int tlen,
-                           const unsigned char *f, int fl, int rsa_len);
-int RSA_padding_add_X931(unsigned char *to, int tlen, const unsigned char *f,
-                         int fl);
-int RSA_padding_check_X931(unsigned char *to, int tlen,
-                           const unsigned char *f, int fl, int rsa_len);
-int RSA_X931_hash_id(int nid);
-
-int RSA_verify_PKCS1_PSS(RSA *rsa, const unsigned char *mHash,
-                         const EVP_MD *Hash, const unsigned char *EM,
-                         int sLen);
-int RSA_padding_add_PKCS1_PSS(RSA *rsa, unsigned char *EM,
-                              const unsigned char *mHash, const EVP_MD *Hash,
-                              int sLen);
-
-int RSA_verify_PKCS1_PSS_mgf1(RSA *rsa, const unsigned char *mHash,
-                              const EVP_MD *Hash, const EVP_MD *mgf1Hash,
-                              const unsigned char *EM, int sLen);
-
-int RSA_padding_add_PKCS1_PSS_mgf1(RSA *rsa, unsigned char *EM,
-                                   const unsigned char *mHash,
-                                   const EVP_MD *Hash, const EVP_MD *mgf1Hash,
-                                   int sLen);
-
-#define RSA_get_ex_new_index(l, p, newf, dupf, freef) \
-    CRYPTO_get_ex_new_index(CRYPTO_EX_INDEX_RSA, l, p, newf, dupf, freef)
-int RSA_set_ex_data(RSA *r, int idx, void *arg);
-void *RSA_get_ex_data(const RSA *r, int idx);
-
-RSA *RSAPublicKey_dup(RSA *rsa);
-RSA *RSAPrivateKey_dup(RSA *rsa);
-
-/*
- * If this flag is set the RSA method is FIPS compliant and can be used in
- * FIPS mode. This is set in the validated module method. If an application
- * sets this flag in its own methods it is its responsibility to ensure the
- * result is compliant.
- */
-
-# define RSA_FLAG_FIPS_METHOD                    0x0400
-
-/*
- * If this flag is set the operations normally disabled in FIPS mode are
- * permitted it is then the applications responsibility to ensure that the
- * usage is compliant.
- */
-
-# define RSA_FLAG_NON_FIPS_ALLOW                 0x0400
-/*
- * Application has decided PRNG is good enough to generate a key: don't
- * check.
- */
-# define RSA_FLAG_CHECKED                        0x0800
-
-RSA_METHOD *RSA_meth_new(const char *name, int flags);
-void RSA_meth_free(RSA_METHOD *meth);
-RSA_METHOD *RSA_meth_dup(const RSA_METHOD *meth);
-const char *RSA_meth_get0_name(const RSA_METHOD *meth);
-int RSA_meth_set1_name(RSA_METHOD *meth, const char *name);
-int RSA_meth_get_flags(RSA_METHOD *meth);
-int RSA_meth_set_flags(RSA_METHOD *meth, int flags);
-void *RSA_meth_get0_app_data(const RSA_METHOD *meth);
-int RSA_meth_set0_app_data(RSA_METHOD *meth, void *app_data);
-int (*RSA_meth_get_pub_enc(const RSA_METHOD *meth))
-    (int flen, const unsigned char *from,
-     unsigned char *to, RSA *rsa, int padding);
-int RSA_meth_set_pub_enc(RSA_METHOD *rsa,
-                         int (*pub_enc) (int flen, const unsigned char *from,
-                                         unsigned char *to, RSA *rsa,
-                                         int padding));
-int (*RSA_meth_get_pub_dec(const RSA_METHOD *meth))
-    (int flen, const unsigned char *from,
-     unsigned char *to, RSA *rsa, int padding);
-int RSA_meth_set_pub_dec(RSA_METHOD *rsa,
-                         int (*pub_dec) (int flen, const unsigned char *from,
-                                         unsigned char *to, RSA *rsa,
-                                         int padding));
-int (*RSA_meth_get_priv_enc(const RSA_METHOD *meth))
-    (int flen, const unsigned char *from,
-     unsigned char *to, RSA *rsa, int padding);
-int RSA_meth_set_priv_enc(RSA_METHOD *rsa,
-                          int (*priv_enc) (int flen, const unsigned char *from,
-                                           unsigned char *to, RSA *rsa,
-                                           int padding));
-int (*RSA_meth_get_priv_dec(const RSA_METHOD *meth))
-    (int flen, const unsigned char *from,
-     unsigned char *to, RSA *rsa, int padding);
-int RSA_meth_set_priv_dec(RSA_METHOD *rsa,
-                          int (*priv_dec) (int flen, const unsigned char *from,
-                                           unsigned char *to, RSA *rsa,
-                                           int padding));
-int (*RSA_meth_get_mod_exp(const RSA_METHOD *meth))
-    (BIGNUM *r0, const BIGNUM *I, RSA *rsa, BN_CTX *ctx);
-int RSA_meth_set_mod_exp(RSA_METHOD *rsa,
-                         int (*mod_exp) (BIGNUM *r0, const BIGNUM *I, RSA *rsa,
-                                         BN_CTX *ctx));
-int (*RSA_meth_get_bn_mod_exp(const RSA_METHOD *meth))
-    (BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
-     const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx);
-int RSA_meth_set_bn_mod_exp(RSA_METHOD *rsa,
-                            int (*bn_mod_exp) (BIGNUM *r,
-                                               const BIGNUM *a,
-                                               const BIGNUM *p,
-                                               const BIGNUM *m,
-                                               BN_CTX *ctx,
-                                               BN_MONT_CTX *m_ctx));
-int (*RSA_meth_get_init(const RSA_METHOD *meth)) (RSA *rsa);
-int RSA_meth_set_init(RSA_METHOD *rsa, int (*init) (RSA *rsa));
-int (*RSA_meth_get_finish(const RSA_METHOD *meth)) (RSA *rsa);
-int RSA_meth_set_finish(RSA_METHOD *rsa, int (*finish) (RSA *rsa));
-int (*RSA_meth_get_sign(const RSA_METHOD *meth))
-    (int type,
-     const unsigned char *m, unsigned int m_length,
-     unsigned char *sigret, unsigned int *siglen,
-     const RSA *rsa);
-int RSA_meth_set_sign(RSA_METHOD *rsa,
-                      int (*sign) (int type, const unsigned char *m,
-                                   unsigned int m_length,
-                                   unsigned char *sigret, unsigned int *siglen,
-                                   const RSA *rsa));
-int (*RSA_meth_get_verify(const RSA_METHOD *meth))
-    (int dtype, const unsigned char *m,
-     unsigned int m_length, const unsigned char *sigbuf,
-     unsigned int siglen, const RSA *rsa);
-int RSA_meth_set_verify(RSA_METHOD *rsa,
-                        int (*verify) (int dtype, const unsigned char *m,
-                                       unsigned int m_length,
-                                       const unsigned char *sigbuf,
-                                       unsigned int siglen, const RSA *rsa));
-int (*RSA_meth_get_keygen(const RSA_METHOD *meth))
-    (RSA *rsa, int bits, BIGNUM *e, BN_GENCB *cb);
-int RSA_meth_set_keygen(RSA_METHOD *rsa,
-                        int (*keygen) (RSA *rsa, int bits, BIGNUM *e,
-                                       BN_GENCB *cb));
-
-/* BEGIN ERROR CODES */
-/*
- * The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
-
-int ERR_load_RSA_strings(void);
-
-/* Error codes for the RSA functions. */
-
-/* Function codes. */
-# define RSA_F_CHECK_PADDING_MD                           140
-# define RSA_F_ENCODE_PKCS1                               146
-# define RSA_F_INT_RSA_VERIFY                             145
-# define RSA_F_OLD_RSA_PRIV_DECODE                        147
-# define RSA_F_PKEY_RSA_CTRL                              143
-# define RSA_F_PKEY_RSA_CTRL_STR                          144
-# define RSA_F_PKEY_RSA_SIGN                              142
-# define RSA_F_PKEY_RSA_VERIFY                            149
-# define RSA_F_PKEY_RSA_VERIFYRECOVER                     141
-# define RSA_F_RSA_ALGOR_TO_MD                            156
-# define RSA_F_RSA_BUILTIN_KEYGEN                         129
-# define RSA_F_RSA_CHECK_KEY                              123
-# define RSA_F_RSA_CHECK_KEY_EX                           160
-# define RSA_F_RSA_CMS_DECRYPT                            159
-# define RSA_F_RSA_ITEM_VERIFY                            148
-# define RSA_F_RSA_METH_DUP                               161
-# define RSA_F_RSA_METH_NEW                               162
-# define RSA_F_RSA_METH_SET1_NAME                         163
-# define RSA_F_RSA_MGF1_TO_MD                             157
-# define RSA_F_RSA_NEW_METHOD                             106
-# define RSA_F_RSA_NULL                                   124
-# define RSA_F_RSA_NULL_PRIVATE_DECRYPT                   132
-# define RSA_F_RSA_NULL_PRIVATE_ENCRYPT                   133
-# define RSA_F_RSA_NULL_PUBLIC_DECRYPT                    134
-# define RSA_F_RSA_NULL_PUBLIC_ENCRYPT                    135
-# define RSA_F_RSA_OSSL_PRIVATE_DECRYPT                   101
-# define RSA_F_RSA_OSSL_PRIVATE_ENCRYPT                   102
-# define RSA_F_RSA_OSSL_PUBLIC_DECRYPT                    103
-# define RSA_F_RSA_OSSL_PUBLIC_ENCRYPT                    104
-# define RSA_F_RSA_PADDING_ADD_NONE                       107
-# define RSA_F_RSA_PADDING_ADD_PKCS1_OAEP                 121
-# define RSA_F_RSA_PADDING_ADD_PKCS1_OAEP_MGF1            154
-# define RSA_F_RSA_PADDING_ADD_PKCS1_PSS                  125
-# define RSA_F_RSA_PADDING_ADD_PKCS1_PSS_MGF1             152
-# define RSA_F_RSA_PADDING_ADD_PKCS1_TYPE_1               108
-# define RSA_F_RSA_PADDING_ADD_PKCS1_TYPE_2               109
-# define RSA_F_RSA_PADDING_ADD_SSLV23                     110
-# define RSA_F_RSA_PADDING_ADD_X931                       127
-# define RSA_F_RSA_PADDING_CHECK_NONE                     111
-# define RSA_F_RSA_PADDING_CHECK_PKCS1_OAEP               122
-# define RSA_F_RSA_PADDING_CHECK_PKCS1_OAEP_MGF1          153
-# define RSA_F_RSA_PADDING_CHECK_PKCS1_TYPE_1             112
-# define RSA_F_RSA_PADDING_CHECK_PKCS1_TYPE_2             113
-# define RSA_F_RSA_PADDING_CHECK_SSLV23                   114
-# define RSA_F_RSA_PADDING_CHECK_X931                     128
-# define RSA_F_RSA_PRINT                                  115
-# define RSA_F_RSA_PRINT_FP                               116
-# define RSA_F_RSA_PRIV_ENCODE                            138
-# define RSA_F_RSA_PSS_TO_CTX                             155
-# define RSA_F_RSA_PUB_DECODE                             139
-# define RSA_F_RSA_SETUP_BLINDING                         136
-# define RSA_F_RSA_SIGN                                   117
-# define RSA_F_RSA_SIGN_ASN1_OCTET_STRING                 118
-# define RSA_F_RSA_VERIFY                                 119
-# define RSA_F_RSA_VERIFY_ASN1_OCTET_STRING               120
-# define RSA_F_RSA_VERIFY_PKCS1_PSS_MGF1                  126
-
-/* Reason codes. */
-# define RSA_R_ALGORITHM_MISMATCH                         100
-# define RSA_R_BAD_E_VALUE                                101
-# define RSA_R_BAD_FIXED_HEADER_DECRYPT                   102
-# define RSA_R_BAD_PAD_BYTE_COUNT                         103
-# define RSA_R_BAD_SIGNATURE                              104
-# define RSA_R_BLOCK_TYPE_IS_NOT_01                       106
-# define RSA_R_BLOCK_TYPE_IS_NOT_02                       107
-# define RSA_R_DATA_GREATER_THAN_MOD_LEN                  108
-# define RSA_R_DATA_TOO_LARGE                             109
-# define RSA_R_DATA_TOO_LARGE_FOR_KEY_SIZE                110
-# define RSA_R_DATA_TOO_LARGE_FOR_MODULUS                 132
-# define RSA_R_DATA_TOO_SMALL                             111
-# define RSA_R_DATA_TOO_SMALL_FOR_KEY_SIZE                122
-# define RSA_R_DIGEST_DOES_NOT_MATCH                      158
-# define RSA_R_DIGEST_TOO_BIG_FOR_RSA_KEY                 112
-# define RSA_R_DMP1_NOT_CONGRUENT_TO_D                    124
-# define RSA_R_DMQ1_NOT_CONGRUENT_TO_D                    125
-# define RSA_R_D_E_NOT_CONGRUENT_TO_1                     123
-# define RSA_R_FIRST_OCTET_INVALID                        133
-# define RSA_R_ILLEGAL_OR_UNSUPPORTED_PADDING_MODE        144
-# define RSA_R_INVALID_DIGEST                             157
-# define RSA_R_INVALID_DIGEST_LENGTH                      143
-# define RSA_R_INVALID_HEADER                             137
-# define RSA_R_INVALID_LABEL                              160
-# define RSA_R_INVALID_MESSAGE_LENGTH                     131
-# define RSA_R_INVALID_MGF1_MD                            156
-# define RSA_R_INVALID_OAEP_PARAMETERS                    161
-# define RSA_R_INVALID_PADDING                            138
-# define RSA_R_INVALID_PADDING_MODE                       141
-# define RSA_R_INVALID_PSS_PARAMETERS                     149
-# define RSA_R_INVALID_PSS_SALTLEN                        146
-# define RSA_R_INVALID_SALT_LENGTH                        150
-# define RSA_R_INVALID_TRAILER                            139
-# define RSA_R_INVALID_X931_DIGEST                        142
-# define RSA_R_IQMP_NOT_INVERSE_OF_Q                      126
-# define RSA_R_KEY_SIZE_TOO_SMALL                         120
-# define RSA_R_LAST_OCTET_INVALID                         134
-# define RSA_R_MODULUS_TOO_LARGE                          105
-# define RSA_R_NO_PUBLIC_EXPONENT                         140
-# define RSA_R_NULL_BEFORE_BLOCK_MISSING                  113
-# define RSA_R_N_DOES_NOT_EQUAL_P_Q                       127
-# define RSA_R_OAEP_DECODING_ERROR                        121
-# define RSA_R_OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE   148
-# define RSA_R_PADDING_CHECK_FAILED                       114
-# define RSA_R_PKCS_DECODING_ERROR                        159
-# define RSA_R_P_NOT_PRIME                                128
-# define RSA_R_Q_NOT_PRIME                                129
-# define RSA_R_RSA_OPERATIONS_NOT_SUPPORTED               130
-# define RSA_R_SLEN_CHECK_FAILED                          136
-# define RSA_R_SLEN_RECOVERY_FAILED                       135
-# define RSA_R_SSLV3_ROLLBACK_ATTACK                      115
-# define RSA_R_THE_ASN1_OBJECT_IDENTIFIER_IS_NOT_KNOWN_FOR_THIS_MD 116
-# define RSA_R_UNKNOWN_ALGORITHM_TYPE                     117
-# define RSA_R_UNKNOWN_DIGEST                             166
-# define RSA_R_UNKNOWN_MASK_DIGEST                        151
-# define RSA_R_UNKNOWN_PADDING_TYPE                       118
-# define RSA_R_UNSUPPORTED_ENCRYPTION_TYPE                162
-# define RSA_R_UNSUPPORTED_LABEL_SOURCE                   163
-# define RSA_R_UNSUPPORTED_MASK_ALGORITHM                 153
-# define RSA_R_UNSUPPORTED_MASK_PARAMETER                 154
-# define RSA_R_UNSUPPORTED_SIGNATURE_TYPE                 155
-# define RSA_R_VALUE_MISSING                              147
-# define RSA_R_WRONG_SIGNATURE_LENGTH                     119
-
-#  ifdef  __cplusplus
-}
-#  endif
-# endif
-#endif

gpac-2.2.1.tar.gz/extra_lib/include/openssl/safestack.h Deleted

@@ -1,164 +0,0 @@
-/*
- * Copyright 1999-2016 The OpenSSL Project Authors. All Rights Reserved.
- *
- * Licensed under the OpenSSL license (the "License").  You may not use
- * this file except in compliance with the License.  You can obtain a copy
- * in the file LICENSE in the source distribution or at
- * https://www.openssl.org/source/license.html
- */
-
-#ifndef HEADER_SAFESTACK_H
-# define HEADER_SAFESTACK_H
-
-# include <openssl/stack.h>
-# include <openssl/e_os2.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-# define STACK_OF(type) struct stack_st_##type
-
-# define SKM_DEFINE_STACK_OF(t1, t2, t3) \
-    STACK_OF(t1); \
-    typedef int (*sk_##t1##_compfunc)(const t3 * const *a, const t3 *const *b); \
-    typedef void (*sk_##t1##_freefunc)(t3 *a); \
-    typedef t3 * (*sk_##t1##_copyfunc)(const t3 *a); \
-    static ossl_inline int sk_##t1##_num(const STACK_OF(t1) *sk) \
-    { \
-        return OPENSSL_sk_num((const OPENSSL_STACK *)sk); \
-    } \
-    static ossl_inline t2 *sk_##t1##_value(const STACK_OF(t1) *sk, int idx) \
-    { \
-        return (t2 *)OPENSSL_sk_value((const OPENSSL_STACK *)sk, idx); \
-    } \
-    static ossl_inline STACK_OF(t1) *sk_##t1##_new(sk_##t1##_compfunc compare) \
-    { \
-        return (STACK_OF(t1) *)OPENSSL_sk_new((OPENSSL_sk_compfunc)compare); \
-    } \
-    static ossl_inline STACK_OF(t1) *sk_##t1##_new_null(void) \
-    { \
-        return (STACK_OF(t1) *)OPENSSL_sk_new_null(); \
-    } \
-    static ossl_inline void sk_##t1##_free(STACK_OF(t1) *sk) \
-    { \
-        OPENSSL_sk_free((OPENSSL_STACK *)sk); \
-    } \
-    static ossl_inline void sk_##t1##_zero(STACK_OF(t1) *sk) \
-    { \
-        OPENSSL_sk_zero((OPENSSL_STACK *)sk); \
-    } \
-    static ossl_inline t2 *sk_##t1##_delete(STACK_OF(t1) *sk, int i) \
-    { \
-        return (t2 *)OPENSSL_sk_delete((OPENSSL_STACK *)sk, i); \
-    } \
-    static ossl_inline t2 *sk_##t1##_delete_ptr(STACK_OF(t1) *sk, t2 *ptr) \
-    { \
-        return (t2 *)OPENSSL_sk_delete_ptr((OPENSSL_STACK *)sk, \
-                                           (const void *)ptr); \
-    } \
-    static ossl_inline int sk_##t1##_push(STACK_OF(t1) *sk, t2 *ptr) \
-    { \
-        return OPENSSL_sk_push((OPENSSL_STACK *)sk, (const void *)ptr); \
-    } \
-    static ossl_inline int sk_##t1##_unshift(STACK_OF(t1) *sk, t2 *ptr) \
-    { \
-        return OPENSSL_sk_unshift((OPENSSL_STACK *)sk, (const void *)ptr); \
-    } \
-    static ossl_inline t2 *sk_##t1##_pop(STACK_OF(t1) *sk) \
-    { \
-        return (t2 *)OPENSSL_sk_pop((OPENSSL_STACK *)sk); \
-    } \
-    static ossl_inline t2 *sk_##t1##_shift(STACK_OF(t1) *sk) \
-    { \
-        return (t2 *)OPENSSL_sk_shift((OPENSSL_STACK *)sk); \
-    } \
-    static ossl_inline void sk_##t1##_pop_free(STACK_OF(t1) *sk, sk_##t1##_freefunc freefunc) \
-    { \
-        OPENSSL_sk_pop_free((OPENSSL_STACK *)sk, (OPENSSL_sk_freefunc)freefunc); \
-    } \
-    static ossl_inline int sk_##t1##_insert(STACK_OF(t1) *sk, t2 *ptr, int idx) \
-    { \
-        return OPENSSL_sk_insert((OPENSSL_STACK *)sk, (const void *)ptr, idx); \
-    } \
-    static ossl_inline t2 *sk_##t1##_set(STACK_OF(t1) *sk, int idx, t2 *ptr) \
-    { \
-        return (t2 *)OPENSSL_sk_set((OPENSSL_STACK *)sk, idx, (const void *)ptr); \
-    } \
-    static ossl_inline int sk_##t1##_find(STACK_OF(t1) *sk, t2 *ptr) \
-    { \
-        return OPENSSL_sk_find((OPENSSL_STACK *)sk, (const void *)ptr); \
-    } \
-    static ossl_inline int sk_##t1##_find_ex(STACK_OF(t1) *sk, t2 *ptr) \
-    { \
-        return OPENSSL_sk_find_ex((OPENSSL_STACK *)sk, (const void *)ptr); \
-    } \
-    static ossl_inline void sk_##t1##_sort(STACK_OF(t1) *sk) \
-    { \
-        OPENSSL_sk_sort((OPENSSL_STACK *)sk); \
-    } \
-    static ossl_inline int sk_##t1##_is_sorted(const STACK_OF(t1) *sk) \
-    { \
-        return OPENSSL_sk_is_sorted((const OPENSSL_STACK *)sk); \
-    } \
-    static ossl_inline STACK_OF(t1) * sk_##t1##_dup(const STACK_OF(t1) *sk) \
-    { \
-        return (STACK_OF(t1) *)OPENSSL_sk_dup((const OPENSSL_STACK *)sk); \
-    } \
-    static ossl_inline STACK_OF(t1) *sk_##t1##_deep_copy(const STACK_OF(t1) *sk, \
-                                                    sk_##t1##_copyfunc copyfunc, \
-                                                    sk_##t1##_freefunc freefunc) \
-    { \
-        return (STACK_OF(t1) *)OPENSSL_sk_deep_copy((const OPENSSL_STACK *)sk, \
-                                            (OPENSSL_sk_copyfunc)copyfunc, \
-                                            (OPENSSL_sk_freefunc)freefunc); \
-    } \
-    static ossl_inline sk_##t1##_compfunc sk_##t1##_set_cmp_func(STACK_OF(t1) *sk, sk_##t1##_compfunc compare) \
-    { \
-        return (sk_##t1##_compfunc)OPENSSL_sk_set_cmp_func((OPENSSL_STACK *)sk, (OPENSSL_sk_compfunc)compare); \
-    }
-
-# define DEFINE_SPECIAL_STACK_OF(t1, t2) SKM_DEFINE_STACK_OF(t1, t2, t2)
-# define DEFINE_STACK_OF(t) SKM_DEFINE_STACK_OF(t, t, t)
-# define DEFINE_SPECIAL_STACK_OF_CONST(t1, t2) \
-            SKM_DEFINE_STACK_OF(t1, const t2, t2)
-# define DEFINE_STACK_OF_CONST(t) SKM_DEFINE_STACK_OF(t, const t, t)
-
-/*-
- * Strings are special: normally an lhash entry will point to a single
- * (somewhat) mutable object. In the case of strings:
- *
- * a) Instead of a single char, there is an array of chars, NUL-terminated.
- * b) The string may have be immutable.
- *
- * So, they need their own declarations. Especially important for
- * type-checking tools, such as Deputy.
- *
- * In practice, however, it appears to be hard to have a const
- * string. For now, I'm settling for dealing with the fact it is a
- * string at all.
- */
-typedef char *OPENSSL_STRING;
-typedef const char *OPENSSL_CSTRING;
-
-/*-
- * Confusingly, LHASH_OF(STRING) deals with char ** throughout, but
- * STACK_OF(STRING) is really more like STACK_OF(char), only, as mentioned
- * above, instead of a single char each entry is a NUL-terminated array of
- * chars. So, we have to implement STRING specially for STACK_OF. This is
- * dealt with in the autogenerated macros below.
- */
-DEFINE_SPECIAL_STACK_OF(OPENSSL_STRING, char)
-DEFINE_SPECIAL_STACK_OF_CONST(OPENSSL_CSTRING, char)
-
-/*
- * Similarly, we sometimes use a block of characters, NOT nul-terminated.
- * These should also be distinguished from "normal" stacks.
- */
-typedef void *OPENSSL_BLOCK;
-DEFINE_SPECIAL_STACK_OF(OPENSSL_BLOCK, void)
-
-# ifdef  __cplusplus
-}
-# endif
-#endif

gpac-2.2.1.tar.gz/extra_lib/include/openssl/seed.h Deleted

@@ -1,98 +0,0 @@
-/*
- * Copyright 2007-2016 The OpenSSL Project Authors. All Rights Reserved.
- *
- * Licensed under the OpenSSL license (the "License").  You may not use
- * this file except in compliance with the License.  You can obtain a copy
- * in the file LICENSE in the source distribution or at
- * https://www.openssl.org/source/license.html
- */
-
-/*
- * Copyright (c) 2007 KISA(Korea Information Security Agency). All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Neither the name of author nor the names of its contributors may
- *    be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef HEADER_SEED_H
-# define HEADER_SEED_H
-
-# include <openssl/opensslconf.h>
-
-# ifndef OPENSSL_NO_SEED
-# include <openssl/e_os2.h>
-# include <openssl/crypto.h>
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-/* look whether we need 'long' to get 32 bits */
-# ifdef AES_LONG
-#  ifndef SEED_LONG
-#   define SEED_LONG 1
-#  endif
-# endif
-
-# if !defined(NO_SYS_TYPES_H)
-#  include <sys/types.h>
-# endif
-
-# define SEED_BLOCK_SIZE 16
-# define SEED_KEY_LENGTH 16
-
-typedef struct seed_key_st {
-# ifdef SEED_LONG
-    unsigned long data32;
-# else
-    unsigned int data32;
-# endif
-} SEED_KEY_SCHEDULE;
-
-void SEED_set_key(const unsigned char rawkeySEED_KEY_LENGTH,
-                  SEED_KEY_SCHEDULE *ks);
-
-void SEED_encrypt(const unsigned char sSEED_BLOCK_SIZE,
-                  unsigned char dSEED_BLOCK_SIZE,
-                  const SEED_KEY_SCHEDULE *ks);
-void SEED_decrypt(const unsigned char sSEED_BLOCK_SIZE,
-                  unsigned char dSEED_BLOCK_SIZE,
-                  const SEED_KEY_SCHEDULE *ks);
-
-void SEED_ecb_encrypt(const unsigned char *in, unsigned char *out,
-                      const SEED_KEY_SCHEDULE *ks, int enc);
-void SEED_cbc_encrypt(const unsigned char *in, unsigned char *out, size_t len,
-                      const SEED_KEY_SCHEDULE *ks,
-                      unsigned char ivecSEED_BLOCK_SIZE, int enc);
-void SEED_cfb128_encrypt(const unsigned char *in, unsigned char *out,
-                         size_t len, const SEED_KEY_SCHEDULE *ks,
-                         unsigned char ivecSEED_BLOCK_SIZE, int *num,
-                         int enc);
-void SEED_ofb128_encrypt(const unsigned char *in, unsigned char *out,
-                         size_t len, const SEED_KEY_SCHEDULE *ks,
-                         unsigned char ivecSEED_BLOCK_SIZE, int *num);
-
-# ifdef  __cplusplus
-}
-# endif
-# endif
-
-#endif

gpac-2.2.1.tar.gz/extra_lib/include/openssl/sha.h Deleted

@@ -1,119 +0,0 @@
-/*
- * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
- *
- * Licensed under the OpenSSL license (the "License").  You may not use
- * this file except in compliance with the License.  You can obtain a copy
- * in the file LICENSE in the source distribution or at
- * https://www.openssl.org/source/license.html
- */
-
-#ifndef HEADER_SHA_H
-# define HEADER_SHA_H
-
-# include <openssl/e_os2.h>
-# include <stddef.h>
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-/*-
- * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
- * ! SHA_LONG has to be at least 32 bits wide.                    !
- * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
- */
-# define SHA_LONG unsigned int
-
-# define SHA_LBLOCK      16
-# define SHA_CBLOCK      (SHA_LBLOCK*4)/* SHA treats input data as a
-                                        * contiguous array of 32 bit wide
-                                        * big-endian values. */
-# define SHA_LAST_BLOCK  (SHA_CBLOCK-8)
-# define SHA_DIGEST_LENGTH 20
-
-typedef struct SHAstate_st {
-    SHA_LONG h0, h1, h2, h3, h4;
-    SHA_LONG Nl, Nh;
-    SHA_LONG dataSHA_LBLOCK;
-    unsigned int num;
-} SHA_CTX;
-
-int SHA1_Init(SHA_CTX *c);
-int SHA1_Update(SHA_CTX *c, const void *data, size_t len);
-int SHA1_Final(unsigned char *md, SHA_CTX *c);
-unsigned char *SHA1(const unsigned char *d, size_t n, unsigned char *md);
-void SHA1_Transform(SHA_CTX *c, const unsigned char *data);
-
-# define SHA256_CBLOCK   (SHA_LBLOCK*4)/* SHA-256 treats input data as a
-                                        * contiguous array of 32 bit wide
-                                        * big-endian values. */
-
-typedef struct SHA256state_st {
-    SHA_LONG h8;
-    SHA_LONG Nl, Nh;
-    SHA_LONG dataSHA_LBLOCK;
-    unsigned int num, md_len;
-} SHA256_CTX;
-
-int SHA224_Init(SHA256_CTX *c);
-int SHA224_Update(SHA256_CTX *c, const void *data, size_t len);
-int SHA224_Final(unsigned char *md, SHA256_CTX *c);
-unsigned char *SHA224(const unsigned char *d, size_t n, unsigned char *md);
-int SHA256_Init(SHA256_CTX *c);
-int SHA256_Update(SHA256_CTX *c, const void *data, size_t len);
-int SHA256_Final(unsigned char *md, SHA256_CTX *c);
-unsigned char *SHA256(const unsigned char *d, size_t n, unsigned char *md);
-void SHA256_Transform(SHA256_CTX *c, const unsigned char *data);
-
-# define SHA224_DIGEST_LENGTH    28
-# define SHA256_DIGEST_LENGTH    32
-# define SHA384_DIGEST_LENGTH    48
-# define SHA512_DIGEST_LENGTH    64
-
-/*
- * Unlike 32-bit digest algorithms, SHA-512 *relies* on SHA_LONG64
- * being exactly 64-bit wide. See Implementation Notes in sha512.c
- * for further details.
- */
-/*
- * SHA-512 treats input data as a
- * contiguous array of 64 bit
- * wide big-endian values.
- */
-# define SHA512_CBLOCK   (SHA_LBLOCK*8)
-# if (defined(_WIN32) || defined(_WIN64)) && !defined(__MINGW32__)
-#  define SHA_LONG64 unsigned __int64
-#  define U64(C)     C##UI64
-# elif defined(__arch64__)
-#  define SHA_LONG64 unsigned long
-#  define U64(C)     C##UL
-# else
-#  define SHA_LONG64 unsigned long long
-#  define U64(C)     C##ULL
-# endif
-
-typedef struct SHA512state_st {
-    SHA_LONG64 h8;
-    SHA_LONG64 Nl, Nh;
-    union {
-        SHA_LONG64 dSHA_LBLOCK;
-        unsigned char pSHA512_CBLOCK;
-    } u;
-    unsigned int num, md_len;
-} SHA512_CTX;
-
-int SHA384_Init(SHA512_CTX *c);
-int SHA384_Update(SHA512_CTX *c, const void *data, size_t len);
-int SHA384_Final(unsigned char *md, SHA512_CTX *c);
-unsigned char *SHA384(const unsigned char *d, size_t n, unsigned char *md);
-int SHA512_Init(SHA512_CTX *c);
-int SHA512_Update(SHA512_CTX *c, const void *data, size_t len);
-int SHA512_Final(unsigned char *md, SHA512_CTX *c);
-unsigned char *SHA512(const unsigned char *d, size_t n, unsigned char *md);
-void SHA512_Transform(SHA512_CTX *c, const unsigned char *data);
-
-#ifdef  __cplusplus
-}
-#endif
-
-#endif

gpac-2.2.1.tar.gz/extra_lib/include/openssl/srp.h Deleted

@@ -1,131 +0,0 @@
-/*
- * Copyright 2011-2016 The OpenSSL Project Authors. All Rights Reserved.
- *
- * Licensed under the OpenSSL license (the "License").  You may not use
- * this file except in compliance with the License.  You can obtain a copy
- * in the file LICENSE in the source distribution or at
- * https://www.openssl.org/source/license.html
- */
-
-#ifndef HEADER_SRP_H
-# define HEADER_SRP_H
-
-#include <openssl/opensslconf.h>
-
-#ifndef OPENSSL_NO_SRP
-# include <stdio.h>
-# include <string.h>
-# include <openssl/safestack.h>
-# include <openssl/bn.h>
-# include <openssl/crypto.h>
-
-# ifdef  __cplusplus
-extern "C" {
-# endif
-
-typedef struct SRP_gN_cache_st {
-    char *b64_bn;
-    BIGNUM *bn;
-} SRP_gN_cache;
-
-
-DEFINE_STACK_OF(SRP_gN_cache)
-
-typedef struct SRP_user_pwd_st {
-    /* Owned by us. */
-    char *id;
-    BIGNUM *s;
-    BIGNUM *v;
-    /* Not owned by us. */
-    const BIGNUM *g;
-    const BIGNUM *N;
-    /* Owned by us. */
-    char *info;
-} SRP_user_pwd;
-
-void SRP_user_pwd_free(SRP_user_pwd *user_pwd);
-
-DEFINE_STACK_OF(SRP_user_pwd)
-
-typedef struct SRP_VBASE_st {
-    STACK_OF(SRP_user_pwd) *users_pwd;
-    STACK_OF(SRP_gN_cache) *gN_cache;
-/* to simulate a user */
-    char *seed_key;
-    const BIGNUM *default_g;
-    const BIGNUM *default_N;
-} SRP_VBASE;
-
-/*
- * Internal structure storing N and g pair
- */
-typedef struct SRP_gN_st {
-    char *id;
-    const BIGNUM *g;
-    const BIGNUM *N;
-} SRP_gN;
-
-DEFINE_STACK_OF(SRP_gN)
-
-SRP_VBASE *SRP_VBASE_new(char *seed_key);
-void SRP_VBASE_free(SRP_VBASE *vb);
-int SRP_VBASE_init(SRP_VBASE *vb, char *verifier_file);
-
-/* This method ignores the configured seed and fails for an unknown user. */
-DEPRECATEDIN_1_1_0(SRP_user_pwd *SRP_VBASE_get_by_user(SRP_VBASE *vb, char *username))
-/* NOTE: unlike in SRP_VBASE_get_by_user, caller owns the returned pointer.*/
-SRP_user_pwd *SRP_VBASE_get1_by_user(SRP_VBASE *vb, char *username);
-
-char *SRP_create_verifier(const char *user, const char *pass, char **salt,
-                          char **verifier, const char *N, const char *g);
-int SRP_create_verifier_BN(const char *user, const char *pass, BIGNUM **salt,
-                           BIGNUM **verifier, const BIGNUM *N,
-                           const BIGNUM *g);
-
-# define SRP_NO_ERROR 0
-# define SRP_ERR_VBASE_INCOMPLETE_FILE 1
-# define SRP_ERR_VBASE_BN_LIB 2
-# define SRP_ERR_OPEN_FILE 3
-# define SRP_ERR_MEMORY 4
-
-# define DB_srptype      0
-# define DB_srpverifier  1
-# define DB_srpsalt      2
-# define DB_srpid        3
-# define DB_srpgN        4
-# define DB_srpinfo      5
-# undef  DB_NUMBER
-# define DB_NUMBER       6
-
-# define DB_SRP_INDEX    'I'
-# define DB_SRP_VALID    'V'
-# define DB_SRP_REVOKED  'R'
-# define DB_SRP_MODIF    'v'
-
-/* see srp.c */
-char *SRP_check_known_gN_param(const BIGNUM *g, const BIGNUM *N);
-SRP_gN *SRP_get_default_gN(const char *id);
-
-/* server side .... */
-BIGNUM *SRP_Calc_server_key(const BIGNUM *A, const BIGNUM *v, const BIGNUM *u,
-                            const BIGNUM *b, const BIGNUM *N);
-BIGNUM *SRP_Calc_B(const BIGNUM *b, const BIGNUM *N, const BIGNUM *g,
-                   const BIGNUM *v);
-int SRP_Verify_A_mod_N(const BIGNUM *A, const BIGNUM *N);
-BIGNUM *SRP_Calc_u(const BIGNUM *A, const BIGNUM *B, const BIGNUM *N);
-
-/* client side .... */
-BIGNUM *SRP_Calc_x(const BIGNUM *s, const char *user, const char *pass);
-BIGNUM *SRP_Calc_A(const BIGNUM *a, const BIGNUM *N, const BIGNUM *g);
-BIGNUM *SRP_Calc_client_key(const BIGNUM *N, const BIGNUM *B, const BIGNUM *g,
-                            const BIGNUM *x, const BIGNUM *a, const BIGNUM *u);
-int SRP_Verify_B_mod_N(const BIGNUM *B, const BIGNUM *N);
-
-# define SRP_MINIMAL_N 1024
-
-# ifdef  __cplusplus
-}
-# endif
-# endif
-
-#endif

gpac-2.2.1.tar.gz/extra_lib/include/openssl/srtp.h Deleted

@@ -1,50 +0,0 @@
-/*
- * Copyright 2011-2016 The OpenSSL Project Authors. All Rights Reserved.
- *
- * Licensed under the OpenSSL license (the "License").  You may not use
- * this file except in compliance with the License.  You can obtain a copy
- * in the file LICENSE in the source distribution or at
- * https://www.openssl.org/source/license.html
- */
-
-/*
- * DTLS code by Eric Rescorla <ekr@rtfm.com>
- *
- * Copyright (C) 2006, Network Resonance, Inc. Copyright (C) 2011, RTFM, Inc.
- */
-
-#ifndef HEADER_D1_SRTP_H
-# define HEADER_D1_SRTP_H
-
-# include <openssl/ssl.h>
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-# define SRTP_AES128_CM_SHA1_80 0x0001
-# define SRTP_AES128_CM_SHA1_32 0x0002
-# define SRTP_AES128_F8_SHA1_80 0x0003
-# define SRTP_AES128_F8_SHA1_32 0x0004
-# define SRTP_NULL_SHA1_80      0x0005
-# define SRTP_NULL_SHA1_32      0x0006
-
-/* AEAD SRTP protection profiles from RFC 7714 */
-# define SRTP_AEAD_AES_128_GCM  0x0007
-# define SRTP_AEAD_AES_256_GCM  0x0008
-
-# ifndef OPENSSL_NO_SRTP
-
-__owur int SSL_CTX_set_tlsext_use_srtp(SSL_CTX *ctx, const char *profiles);
-__owur int SSL_set_tlsext_use_srtp(SSL *ctx, const char *profiles);
-
-__owur STACK_OF(SRTP_PROTECTION_PROFILE) *SSL_get_srtp_profiles(SSL *ssl);
-__owur SRTP_PROTECTION_PROFILE *SSL_get_selected_srtp_profile(SSL *s);
-
-# endif
-
-#ifdef  __cplusplus
-}
-#endif
-
-#endif

gpac-2.2.1.tar.gz/extra_lib/include/openssl/ssl.h Deleted

@@ -1,2548 +0,0 @@
-/*
- * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
- *
- * Licensed under the OpenSSL license (the "License").  You may not use
- * this file except in compliance with the License.  You can obtain a copy
- * in the file LICENSE in the source distribution or at
- * https://www.openssl.org/source/license.html
- */
-
-/* ====================================================================
- * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
- * ECC cipher suite support in OpenSSL originally developed by
- * SUN MICROSYSTEMS, INC., and contributed to the OpenSSL project.
- */
-/* ====================================================================
- * Copyright 2005 Nokia. All rights reserved.
- *
- * The portions of the attached software ("Contribution") is developed by
- * Nokia Corporation and is licensed pursuant to the OpenSSL open source
- * license.
- *
- * The Contribution, originally written by Mika Kousa and Pasi Eronen of
- * Nokia Corporation, consists of the "PSK" (Pre-Shared Key) ciphersuites
- * support (see RFC 4279) to OpenSSL.
- *
- * No patent licenses or other rights except those expressly stated in
- * the OpenSSL open source license shall be deemed granted or received
- * expressly, by implication, estoppel, or otherwise.
- *
- * No assurances are provided by Nokia that the Contribution does not
- * infringe the patent or other intellectual property rights of any third
- * party or that the license provides you with all the necessary rights
- * to make use of the Contribution.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND. IN
- * ADDITION TO THE DISCLAIMERS INCLUDED IN THE LICENSE, NOKIA
- * SPECIFICALLY DISCLAIMS ANY LIABILITY FOR CLAIMS BROUGHT BY YOU OR ANY
- * OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS OR
- * OTHERWISE.
- */
-
-#ifndef HEADER_SSL_H
-# define HEADER_SSL_H
-
-# include <openssl/e_os2.h>
-# include <openssl/opensslconf.h>
-# include <openssl/comp.h>
-# include <openssl/bio.h>
-# if OPENSSL_API_COMPAT < 0x10100000L
-#  include <openssl/x509.h>
-#  include <openssl/crypto.h>
-#  include <openssl/lhash.h>
-#  include <openssl/buffer.h>
-# endif
-# include <openssl/pem.h>
-# include <openssl/hmac.h>
-# include <openssl/async.h>
-
-# include <openssl/safestack.h>
-# include <openssl/symhacks.h>
-# include <openssl/ct.h>
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-/* OpenSSL version number for ASN.1 encoding of the session information */
-/*-
- * Version 0 - initial version
- * Version 1 - added the optional peer certificate
- */
-# define SSL_SESSION_ASN1_VERSION 0x0001
-
-# define SSL_MAX_SSL_SESSION_ID_LENGTH           32
-# define SSL_MAX_SID_CTX_LENGTH                  32
-
-# define SSL_MIN_RSA_MODULUS_LENGTH_IN_BYTES     (512/8)
-# define SSL_MAX_KEY_ARG_LENGTH                  8
-# define SSL_MAX_MASTER_KEY_LENGTH               48
-
-/* The maximum number of encrypt/decrypt pipelines we can support */
-# define SSL_MAX_PIPELINES  32
-
-/* text strings for the ciphers */
-
-/* These are used to specify which ciphers to use and not to use */
-
-# define SSL_TXT_LOW             "LOW"
-# define SSL_TXT_MEDIUM          "MEDIUM"
-# define SSL_TXT_HIGH            "HIGH"
-# define SSL_TXT_FIPS            "FIPS"
-
-# define SSL_TXT_aNULL           "aNULL"
-# define SSL_TXT_eNULL           "eNULL"
-# define SSL_TXT_NULL            "NULL"
-
-# define SSL_TXT_kRSA            "kRSA"
-# define SSL_TXT_kDHr            "kDHr"
-# define SSL_TXT_kDHd            "kDHd"
-# define SSL_TXT_kDH             "kDH"
-# define SSL_TXT_kEDH            "kEDH"/* alias for kDHE */
-# define SSL_TXT_kDHE            "kDHE"
-# define SSL_TXT_kECDHr          "kECDHr"
-# define SSL_TXT_kECDHe          "kECDHe"
-# define SSL_TXT_kECDH           "kECDH"
-# define SSL_TXT_kEECDH          "kEECDH"/* alias for kECDHE */
-# define SSL_TXT_kECDHE          "kECDHE"
-# define SSL_TXT_kPSK            "kPSK"
-# define SSL_TXT_kRSAPSK         "kRSAPSK"
-# define SSL_TXT_kECDHEPSK       "kECDHEPSK"
-# define SSL_TXT_kDHEPSK         "kDHEPSK"
-# define SSL_TXT_kGOST           "kGOST"
-# define SSL_TXT_kSRP            "kSRP"
-
-# define SSL_TXT_aRSA            "aRSA"
-# define SSL_TXT_aDSS            "aDSS"
-# define SSL_TXT_aDH             "aDH"
-# define SSL_TXT_aECDH           "aECDH"
-# define SSL_TXT_aECDSA          "aECDSA"
-# define SSL_TXT_aPSK            "aPSK"
-# define SSL_TXT_aGOST94         "aGOST94"
-# define SSL_TXT_aGOST01         "aGOST01"
-# define SSL_TXT_aGOST12         "aGOST12"
-# define SSL_TXT_aGOST           "aGOST"
-# define SSL_TXT_aSRP            "aSRP"
-
-# define SSL_TXT_DSS             "DSS"
-# define SSL_TXT_DH              "DH"
-# define SSL_TXT_DHE             "DHE"/* same as "kDHE:-ADH" */
-# define SSL_TXT_EDH             "EDH"/* alias for DHE */
-# define SSL_TXT_ADH             "ADH"
-# define SSL_TXT_RSA             "RSA"
-# define SSL_TXT_ECDH            "ECDH"
-# define SSL_TXT_EECDH           "EECDH"/* alias for ECDHE" */
-# define SSL_TXT_ECDHE           "ECDHE"/* same as "kECDHE:-AECDH" */
-# define SSL_TXT_AECDH           "AECDH"
-# define SSL_TXT_ECDSA           "ECDSA"
-# define SSL_TXT_PSK             "PSK"
-# define SSL_TXT_SRP             "SRP"
-
-# define SSL_TXT_DES             "DES"
-# define SSL_TXT_3DES            "3DES"
-# define SSL_TXT_RC4             "RC4"
-# define SSL_TXT_RC2             "RC2"
-# define SSL_TXT_IDEA            "IDEA"
-# define SSL_TXT_SEED            "SEED"
-# define SSL_TXT_AES128          "AES128"
-# define SSL_TXT_AES256          "AES256"
-# define SSL_TXT_AES             "AES"
-# define SSL_TXT_AES_GCM         "AESGCM"
-# define SSL_TXT_AES_CCM         "AESCCM"
-# define SSL_TXT_AES_CCM_8       "AESCCM8"
-# define SSL_TXT_CAMELLIA128     "CAMELLIA128"
-# define SSL_TXT_CAMELLIA256     "CAMELLIA256"
-# define SSL_TXT_CAMELLIA        "CAMELLIA"
-# define SSL_TXT_CHACHA20        "CHACHA20"
-# define SSL_TXT_GOST            "GOST89"
-
-# define SSL_TXT_MD5             "MD5"
-# define SSL_TXT_SHA1            "SHA1"
-# define SSL_TXT_SHA             "SHA"/* same as "SHA1" */
-# define SSL_TXT_GOST94          "GOST94"
-# define SSL_TXT_GOST89MAC       "GOST89MAC"
-# define SSL_TXT_GOST12          "GOST12"
-# define SSL_TXT_GOST89MAC12     "GOST89MAC12"
-# define SSL_TXT_SHA256          "SHA256"
-# define SSL_TXT_SHA384          "SHA384"
-
-# define SSL_TXT_SSLV3           "SSLv3"
-# define SSL_TXT_TLSV1           "TLSv1"
-# define SSL_TXT_TLSV1_1         "TLSv1.1"
-# define SSL_TXT_TLSV1_2         "TLSv1.2"
-
-# define SSL_TXT_ALL             "ALL"
-
-/*-
- * COMPLEMENTOF* definitions. These identifiers are used to (de-select)
- * ciphers normally not being used.
- * Example: "RC4" will activate all ciphers using RC4 including ciphers
- * without authentication, which would normally disabled by DEFAULT (due
- * the "!ADH" being part of default). Therefore "RC4:!COMPLEMENTOFDEFAULT"
- * will make sure that it is also disabled in the specific selection.
- * COMPLEMENTOF* identifiers are portable between version, as adjustments
- * to the default cipher setup will also be included here.
- *
- * COMPLEMENTOFDEFAULT does not experience the same special treatment that
- * DEFAULT gets, as only selection is being done and no sorting as needed
- * for DEFAULT.
- */
-# define SSL_TXT_CMPALL          "COMPLEMENTOFALL"
-# define SSL_TXT_CMPDEF          "COMPLEMENTOFDEFAULT"
-
-/*
- * The following cipher list is used by default. It also is substituted when
- * an application-defined cipher list string starts with 'DEFAULT'.
- */
-# define SSL_DEFAULT_CIPHER_LIST "ALL:!COMPLEMENTOFDEFAULT:!eNULL"
-/*
- * As of OpenSSL 1.0.0, ssl_create_cipher_list() in ssl/ssl_ciph.c always
- * starts with a reasonable order, and all we have to do for DEFAULT is
- * throwing out anonymous and unencrypted ciphersuites! (The latter are not
- * actually enabled by ALL, but "ALL:RSA" would enable some of them.)
- */
-
-/* Used in SSL_set_shutdown()/SSL_get_shutdown(); */
-# define SSL_SENT_SHUTDOWN       1
-# define SSL_RECEIVED_SHUTDOWN   2
-
-#ifdef __cplusplus
-}
-#endif
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-# define SSL_FILETYPE_ASN1       X509_FILETYPE_ASN1
-# define SSL_FILETYPE_PEM        X509_FILETYPE_PEM
-
-/*
- * This is needed to stop compilers complaining about the 'struct ssl_st *'
- * function parameters used to prototype callbacks in SSL_CTX.
- */
-typedef struct ssl_st *ssl_crock_st;
-typedef struct tls_session_ticket_ext_st TLS_SESSION_TICKET_EXT;
-typedef struct ssl_method_st SSL_METHOD;
-typedef struct ssl_cipher_st SSL_CIPHER;
-typedef struct ssl_session_st SSL_SESSION;
-typedef struct tls_sigalgs_st TLS_SIGALGS;
-typedef struct ssl_conf_ctx_st SSL_CONF_CTX;
-typedef struct ssl_comp_st SSL_COMP;
-
-STACK_OF(SSL_CIPHER);
-STACK_OF(SSL_COMP);
-
-/* SRTP protection profiles for use with the use_srtp extension (RFC 5764)*/
-typedef struct srtp_protection_profile_st {
-    const char *name;
-    unsigned long id;
-} SRTP_PROTECTION_PROFILE;
-
-DEFINE_STACK_OF(SRTP_PROTECTION_PROFILE)
-
-typedef int (*tls_session_ticket_ext_cb_fn) (SSL *s,
-                                             const unsigned char *data,
-                                             int len, void *arg);
-typedef int (*tls_session_secret_cb_fn) (SSL *s, void *secret,
-                                         int *secret_len,
-                                         STACK_OF(SSL_CIPHER) *peer_ciphers,
-                                         const SSL_CIPHER **cipher, void *arg);
-
-/* Typedefs for handling custom extensions */
-
-typedef int (*custom_ext_add_cb) (SSL *s, unsigned int ext_type,
-                                  const unsigned char **out,
-                                  size_t *outlen, int *al, void *add_arg);
-
-typedef void (*custom_ext_free_cb) (SSL *s, unsigned int ext_type,
-                                    const unsigned char *out, void *add_arg);
-
-typedef int (*custom_ext_parse_cb) (SSL *s, unsigned int ext_type,
-                                    const unsigned char *in,
-                                    size_t inlen, int *al, void *parse_arg);
-
-/* Typedef for verification callback */
-typedef int (*SSL_verify_cb)(int preverify_ok, X509_STORE_CTX *x509_ctx);
-
-/* Allow initial connection to servers that don't support RI */
-# define SSL_OP_LEGACY_SERVER_CONNECT                    0x00000004U
-# define SSL_OP_TLSEXT_PADDING                           0x00000010U
-# define SSL_OP_SAFARI_ECDHE_ECDSA_BUG                   0x00000040U
-
-/*
- * Disable SSL 3.0/TLS 1.0 CBC vulnerability workaround that was added in
- * OpenSSL 0.9.6d.  Usually (depending on the application protocol) the
- * workaround is not needed.  Unfortunately some broken SSL/TLS
- * implementations cannot handle it at all, which is why we include it in
- * SSL_OP_ALL. Added in 0.9.6e
- */
-# define SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS              0x00000800U
-
-/* DTLS options */
-# define SSL_OP_NO_QUERY_MTU                             0x00001000U
-/* Turn on Cookie Exchange (on relevant for servers) */
-# define SSL_OP_COOKIE_EXCHANGE                          0x00002000U
-/* Don't use RFC4507 ticket extension */
-# define SSL_OP_NO_TICKET                                0x00004000U
-# ifndef OPENSSL_NO_DTLS1_METHOD
-/* Use Cisco's "speshul" version of DTLS_BAD_VER
- * (only with deprecated DTLSv1_client_method())  */
-#  define SSL_OP_CISCO_ANYCONNECT                        0x00008000U
-# endif
-
-/* As server, disallow session resumption on renegotiation */
-# define SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION   0x00010000U
-/* Don't use compression even if supported */
-# define SSL_OP_NO_COMPRESSION                           0x00020000U
-/* Permit unsafe legacy renegotiation */
-# define SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION        0x00040000U
-/*
- * Set on servers to choose the cipher according to the server's preferences
- */
-# define SSL_OP_CIPHER_SERVER_PREFERENCE                 0x00400000U
-/*
- * If set, a server will allow a client to issue a SSLv3.0 version number as
- * latest version supported in the premaster secret, even when TLSv1.0
- * (version 3.1) was announced in the client hello. Normally this is
- * forbidden to prevent version rollback attacks.
- */
-# define SSL_OP_TLS_ROLLBACK_BUG                         0x00800000U
-
-# define SSL_OP_NO_SSLv3                                 0x02000000U
-# define SSL_OP_NO_TLSv1                                 0x04000000U
-# define SSL_OP_NO_TLSv1_2                               0x08000000U
-# define SSL_OP_NO_TLSv1_1                               0x10000000U
-
-# define SSL_OP_NO_DTLSv1                                0x04000000U
-# define SSL_OP_NO_DTLSv1_2                              0x08000000U
-
-# define SSL_OP_NO_SSL_MASK (SSL_OP_NO_SSLv3|\
-        SSL_OP_NO_TLSv1|SSL_OP_NO_TLSv1_1|SSL_OP_NO_TLSv1_2)
-# define SSL_OP_NO_DTLS_MASK (SSL_OP_NO_DTLSv1|SSL_OP_NO_DTLSv1_2)
-
-/*
- * Make server add server-hello extension from early version of cryptopro
- * draft, when GOST ciphersuite is negotiated. Required for interoperability
- * with CryptoPro CSP 3.x
- */
-# define SSL_OP_CRYPTOPRO_TLSEXT_BUG                     0x80000000U
-
-/*
- * SSL_OP_ALL: various bug workarounds that should be rather harmless.
- * This used to be 0x000FFFFFL before 0.9.7.
- * This used to be 0x80000BFFU before 1.1.1.
- */
-# define SSL_OP_ALL        (SSL_OP_CRYPTOPRO_TLSEXT_BUG|\
-                            SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS|\
-                            SSL_OP_LEGACY_SERVER_CONNECT|\
-                            SSL_OP_TLSEXT_PADDING|\
-                            SSL_OP_SAFARI_ECDHE_ECDSA_BUG)
-
-/* OBSOLETE OPTIONS: retained for compatibility */
-
-/* Removed from OpenSSL 1.1.0. Was 0x00000001L */
-/* Related to removed SSLv2. */
-# define SSL_OP_MICROSOFT_SESS_ID_BUG                    0x0
-/* Removed from OpenSSL 1.1.0. Was 0x00000002L */
-/* Related to removed SSLv2. */
-# define SSL_OP_NETSCAPE_CHALLENGE_BUG                   0x0
-/* Removed from OpenSSL 0.9.8q and 1.0.0c. Was 0x00000008L */
-/* Dead forever, see CVE-2010-4180 */
-# define SSL_OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG         0x0
-/* Removed from OpenSSL 1.0.1h and 1.0.2. Was 0x00000010L */
-/* Refers to ancient SSLREF and SSLv2. */
-# define SSL_OP_SSLREF2_REUSE_CERT_TYPE_BUG              0x0
-/* Removed from OpenSSL 1.1.0. Was 0x00000020 */
-# define SSL_OP_MICROSOFT_BIG_SSLV3_BUFFER               0x0
-/* Removed from OpenSSL 0.9.7h and 0.9.8b. Was 0x00000040L */
-# define SSL_OP_MSIE_SSLV2_RSA_PADDING                   0x0
-/* Removed from OpenSSL 1.1.0. Was 0x00000080 */
-/* Ancient SSLeay version. */
-# define SSL_OP_SSLEAY_080_CLIENT_DH_BUG                 0x0
-/* Removed from OpenSSL 1.1.0. Was 0x00000100L */
-# define SSL_OP_TLS_D5_BUG                               0x0
-/* Removed from OpenSSL 1.1.0. Was 0x00000200L */
-# define SSL_OP_TLS_BLOCK_PADDING_BUG                    0x0
-/* Removed from OpenSSL 1.1.0. Was 0x00080000L */
-# define SSL_OP_SINGLE_ECDH_USE                          0x0
-/* Removed from OpenSSL 1.1.0. Was 0x00100000L */
-# define SSL_OP_SINGLE_DH_USE                            0x0
-/* Removed from OpenSSL 1.0.1k and 1.0.2. Was 0x00200000L */
-# define SSL_OP_EPHEMERAL_RSA                            0x0
-/* Removed from OpenSSL 1.1.0. Was 0x01000000L */
-# define SSL_OP_NO_SSLv2                                 0x0
-/* Removed from OpenSSL 1.0.1. Was 0x08000000L */
-# define SSL_OP_PKCS1_CHECK_1                            0x0
-/* Removed from OpenSSL 1.0.1. Was 0x10000000L */
-# define SSL_OP_PKCS1_CHECK_2                            0x0
-/* Removed from OpenSSL 1.1.0. Was 0x20000000L */ 
-# define SSL_OP_NETSCAPE_CA_DN_BUG                       0x0
-/* Removed from OpenSSL 1.1.0. Was 0x40000000L */
-# define SSL_OP_NETSCAPE_DEMO_CIPHER_CHANGE_BUG          0x0
-
-/*
- * Allow SSL_write(..., n) to return r with 0 < r < n (i.e. report success
- * when just a single record has been written):
- */
-# define SSL_MODE_ENABLE_PARTIAL_WRITE       0x00000001U
-/*
- * Make it possible to retry SSL_write() with changed buffer location (buffer
- * contents must stay the same!); this is not the default to avoid the
- * misconception that non-blocking SSL_write() behaves like non-blocking
- * write():
- */
-# define SSL_MODE_ACCEPT_MOVING_WRITE_BUFFER 0x00000002U
-/*
- * Never bother the application with retries if the transport is blocking:
- */
-# define SSL_MODE_AUTO_RETRY 0x00000004U
-/* Don't attempt to automatically build certificate chain */
-# define SSL_MODE_NO_AUTO_CHAIN 0x00000008U
-/*
- * Save RAM by releasing read and write buffers when they're empty. (SSL3 and
- * TLS only.) "Released" buffers are put onto a free-list in the context or
- * just freed (depending on the context's setting for freelist_max_len).
- */
-# define SSL_MODE_RELEASE_BUFFERS 0x00000010U
-/*
- * Send the current time in the Random fields of the ClientHello and
- * ServerHello records for compatibility with hypothetical implementations
- * that require it.
- */
-# define SSL_MODE_SEND_CLIENTHELLO_TIME 0x00000020U
-# define SSL_MODE_SEND_SERVERHELLO_TIME 0x00000040U
-/*
- * Send TLS_FALLBACK_SCSV in the ClientHello. To be set only by applications
- * that reconnect with a downgraded protocol version; see
- * draft-ietf-tls-downgrade-scsv-00 for details. DO NOT ENABLE THIS if your
- * application attempts a normal handshake. Only use this in explicit
- * fallback retries, following the guidance in
- * draft-ietf-tls-downgrade-scsv-00.
- */
-# define SSL_MODE_SEND_FALLBACK_SCSV 0x00000080U
-/*
- * Support Asynchronous operation
- */
-# define SSL_MODE_ASYNC 0x00000100U
-
-/* Cert related flags */
-/*
- * Many implementations ignore some aspects of the TLS standards such as
- * enforcing certificate chain algorithms. When this is set we enforce them.
- */
-# define SSL_CERT_FLAG_TLS_STRICT                0x00000001U
-
-/* Suite B modes, takes same values as certificate verify flags */
-# define SSL_CERT_FLAG_SUITEB_128_LOS_ONLY       0x10000
-/* Suite B 192 bit only mode */
-# define SSL_CERT_FLAG_SUITEB_192_LOS            0x20000
-/* Suite B 128 bit mode allowing 192 bit algorithms */
-# define SSL_CERT_FLAG_SUITEB_128_LOS            0x30000
-
-/* Perform all sorts of protocol violations for testing purposes */
-# define SSL_CERT_FLAG_BROKEN_PROTOCOL           0x10000000
-
-/* Flags for building certificate chains */
-/* Treat any existing certificates as untrusted CAs */
-# define SSL_BUILD_CHAIN_FLAG_UNTRUSTED          0x1
-/* Don't include root CA in chain */
-# define SSL_BUILD_CHAIN_FLAG_NO_ROOT            0x2
-/* Just check certificates already there */
-# define SSL_BUILD_CHAIN_FLAG_CHECK              0x4
-/* Ignore verification errors */
-# define SSL_BUILD_CHAIN_FLAG_IGNORE_ERROR       0x8
-/* Clear verification errors from queue */
-# define SSL_BUILD_CHAIN_FLAG_CLEAR_ERROR        0x10
-
-/* Flags returned by SSL_check_chain */
-/* Certificate can be used with this session */
-# define CERT_PKEY_VALID         0x1
-/* Certificate can also be used for signing */
-# define CERT_PKEY_SIGN          0x2
-/* EE certificate signing algorithm OK */
-# define CERT_PKEY_EE_SIGNATURE  0x10
-/* CA signature algorithms OK */
-# define CERT_PKEY_CA_SIGNATURE  0x20
-/* EE certificate parameters OK */
-# define CERT_PKEY_EE_PARAM      0x40
-/* CA certificate parameters OK */
-# define CERT_PKEY_CA_PARAM      0x80
-/* Signing explicitly allowed as opposed to SHA1 fallback */
-# define CERT_PKEY_EXPLICIT_SIGN 0x100
-/* Client CA issuer names match (always set for server cert) */
-# define CERT_PKEY_ISSUER_NAME   0x200
-/* Cert type matches client types (always set for server cert) */
-# define CERT_PKEY_CERT_TYPE     0x400
-/* Cert chain suitable to Suite B */
-# define CERT_PKEY_SUITEB        0x800
-
-# define SSL_CONF_FLAG_CMDLINE           0x1
-# define SSL_CONF_FLAG_FILE              0x2
-# define SSL_CONF_FLAG_CLIENT            0x4
-# define SSL_CONF_FLAG_SERVER            0x8
-# define SSL_CONF_FLAG_SHOW_ERRORS       0x10
-# define SSL_CONF_FLAG_CERTIFICATE       0x20
-# define SSL_CONF_FLAG_REQUIRE_PRIVATE   0x40
-/* Configuration value types */
-# define SSL_CONF_TYPE_UNKNOWN           0x0
-# define SSL_CONF_TYPE_STRING            0x1
-# define SSL_CONF_TYPE_FILE              0x2
-# define SSL_CONF_TYPE_DIR               0x3
-# define SSL_CONF_TYPE_NONE              0x4
-
-/*
- * Note: SSL_CTX_set_{options,mode} use |= op on the previous value, they
- * cannot be used to clear bits.
- */
-
-unsigned long SSL_CTX_get_options(const SSL_CTX *ctx);
-unsigned long SSL_get_options(const SSL* s);
-unsigned long SSL_CTX_clear_options(SSL_CTX *ctx, unsigned long op);
-unsigned long SSL_clear_options(SSL *s, unsigned long op);
-unsigned long SSL_CTX_set_options(SSL_CTX *ctx, unsigned long op);
-unsigned long SSL_set_options(SSL *s, unsigned long op);
-
-# define SSL_CTX_set_mode(ctx,op) \
-        SSL_CTX_ctrl((ctx),SSL_CTRL_MODE,(op),NULL)
-# define SSL_CTX_clear_mode(ctx,op) \
-        SSL_CTX_ctrl((ctx),SSL_CTRL_CLEAR_MODE,(op),NULL)
-# define SSL_CTX_get_mode(ctx) \
-        SSL_CTX_ctrl((ctx),SSL_CTRL_MODE,0,NULL)
-# define SSL_clear_mode(ssl,op) \
-        SSL_ctrl((ssl),SSL_CTRL_CLEAR_MODE,(op),NULL)
-# define SSL_set_mode(ssl,op) \
-        SSL_ctrl((ssl),SSL_CTRL_MODE,(op),NULL)
-# define SSL_get_mode(ssl) \
-        SSL_ctrl((ssl),SSL_CTRL_MODE,0,NULL)
-# define SSL_set_mtu(ssl, mtu) \
-        SSL_ctrl((ssl),SSL_CTRL_SET_MTU,(mtu),NULL)
-# define DTLS_set_link_mtu(ssl, mtu) \
-        SSL_ctrl((ssl),DTLS_CTRL_SET_LINK_MTU,(mtu),NULL)
-# define DTLS_get_link_min_mtu(ssl) \
-        SSL_ctrl((ssl),DTLS_CTRL_GET_LINK_MIN_MTU,0,NULL)
-
-# define SSL_get_secure_renegotiation_support(ssl) \
-        SSL_ctrl((ssl), SSL_CTRL_GET_RI_SUPPORT, 0, NULL)
-
-# ifndef OPENSSL_NO_HEARTBEATS
-#  define SSL_heartbeat(ssl) \
-        SSL_ctrl((ssl),SSL_CTRL_DTLS_EXT_SEND_HEARTBEAT,0,NULL)
-# endif
-
-# define SSL_CTX_set_cert_flags(ctx,op) \
-        SSL_CTX_ctrl((ctx),SSL_CTRL_CERT_FLAGS,(op),NULL)
-# define SSL_set_cert_flags(s,op) \
-        SSL_ctrl((s),SSL_CTRL_CERT_FLAGS,(op),NULL)
-# define SSL_CTX_clear_cert_flags(ctx,op) \
-        SSL_CTX_ctrl((ctx),SSL_CTRL_CLEAR_CERT_FLAGS,(op),NULL)
-# define SSL_clear_cert_flags(s,op) \
-        SSL_ctrl((s),SSL_CTRL_CLEAR_CERT_FLAGS,(op),NULL)
-
-void SSL_CTX_set_msg_callback(SSL_CTX *ctx,
-                              void (*cb) (int write_p, int version,
-                                          int content_type, const void *buf,
-                                          size_t len, SSL *ssl, void *arg));
-void SSL_set_msg_callback(SSL *ssl,
-                          void (*cb) (int write_p, int version,
-                                      int content_type, const void *buf,
-                                      size_t len, SSL *ssl, void *arg));
-# define SSL_CTX_set_msg_callback_arg(ctx, arg) SSL_CTX_ctrl((ctx), SSL_CTRL_SET_MSG_CALLBACK_ARG, 0, (arg))
-# define SSL_set_msg_callback_arg(ssl, arg) SSL_ctrl((ssl), SSL_CTRL_SET_MSG_CALLBACK_ARG, 0, (arg))
-
-# define SSL_get_extms_support(s) \
-        SSL_ctrl((s),SSL_CTRL_GET_EXTMS_SUPPORT,0,NULL)
-
-# ifndef OPENSSL_NO_SRP
-
-/* see tls_srp.c */
-__owur int SSL_SRP_CTX_init(SSL *s);
-__owur int SSL_CTX_SRP_CTX_init(SSL_CTX *ctx);
-int SSL_SRP_CTX_free(SSL *ctx);
-int SSL_CTX_SRP_CTX_free(SSL_CTX *ctx);
-__owur int SSL_srp_server_param_with_username(SSL *s, int *ad);
-__owur int SRP_Calc_A_param(SSL *s);
-
-# endif
-
-/* 100k max cert list */
-# define SSL_MAX_CERT_LIST_DEFAULT 1024*100
-
-# define SSL_SESSION_CACHE_MAX_SIZE_DEFAULT      (1024*20)
-
-/*
- * This callback type is used inside SSL_CTX, SSL, and in the functions that
- * set them. It is used to override the generation of SSL/TLS session IDs in
- * a server. Return value should be zero on an error, non-zero to proceed.
- * Also, callbacks should themselves check if the id they generate is unique
- * otherwise the SSL handshake will fail with an error - callbacks can do
- * this using the 'ssl' value they're passed by;
- * SSL_has_matching_session_id(ssl, id, *id_len) The length value passed in
- * is set at the maximum size the session ID can be. In SSLv3/TLSv1 it is 32
- * bytes. The callback can alter this length to be less if desired. It is
- * also an error for the callback to set the size to zero.
- */
-typedef int (*GEN_SESSION_CB) (const SSL *ssl, unsigned char *id,
-                               unsigned int *id_len);
-
-# define SSL_SESS_CACHE_OFF                      0x0000
-# define SSL_SESS_CACHE_CLIENT                   0x0001
-# define SSL_SESS_CACHE_SERVER                   0x0002
-# define SSL_SESS_CACHE_BOTH     (SSL_SESS_CACHE_CLIENT|SSL_SESS_CACHE_SERVER)
-# define SSL_SESS_CACHE_NO_AUTO_CLEAR            0x0080
-/* enough comments already ... see SSL_CTX_set_session_cache_mode(3) */
-# define SSL_SESS_CACHE_NO_INTERNAL_LOOKUP       0x0100
-# define SSL_SESS_CACHE_NO_INTERNAL_STORE        0x0200
-# define SSL_SESS_CACHE_NO_INTERNAL \
-        (SSL_SESS_CACHE_NO_INTERNAL_LOOKUP|SSL_SESS_CACHE_NO_INTERNAL_STORE)
-
-LHASH_OF(SSL_SESSION) *SSL_CTX_sessions(SSL_CTX *ctx);
-# define SSL_CTX_sess_number(ctx) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_SESS_NUMBER,0,NULL)
-# define SSL_CTX_sess_connect(ctx) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_SESS_CONNECT,0,NULL)
-# define SSL_CTX_sess_connect_good(ctx) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_SESS_CONNECT_GOOD,0,NULL)
-# define SSL_CTX_sess_connect_renegotiate(ctx) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_SESS_CONNECT_RENEGOTIATE,0,NULL)
-# define SSL_CTX_sess_accept(ctx) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_SESS_ACCEPT,0,NULL)
-# define SSL_CTX_sess_accept_renegotiate(ctx) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_SESS_ACCEPT_RENEGOTIATE,0,NULL)
-# define SSL_CTX_sess_accept_good(ctx) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_SESS_ACCEPT_GOOD,0,NULL)
-# define SSL_CTX_sess_hits(ctx) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_SESS_HIT,0,NULL)
-# define SSL_CTX_sess_cb_hits(ctx) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_SESS_CB_HIT,0,NULL)
-# define SSL_CTX_sess_misses(ctx) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_SESS_MISSES,0,NULL)
-# define SSL_CTX_sess_timeouts(ctx) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_SESS_TIMEOUTS,0,NULL)
-# define SSL_CTX_sess_cache_full(ctx) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_SESS_CACHE_FULL,0,NULL)
-
-void SSL_CTX_sess_set_new_cb(SSL_CTX *ctx,
-                             int (*new_session_cb) (struct ssl_st *ssl,
-                                                    SSL_SESSION *sess));
-int (*SSL_CTX_sess_get_new_cb(SSL_CTX *ctx)) (struct ssl_st *ssl,
-                                              SSL_SESSION *sess);
-void SSL_CTX_sess_set_remove_cb(SSL_CTX *ctx,
-                                void (*remove_session_cb) (struct ssl_ctx_st
-                                                           *ctx,
-                                                           SSL_SESSION
-                                                           *sess));
-void (*SSL_CTX_sess_get_remove_cb(SSL_CTX *ctx)) (struct ssl_ctx_st *ctx,
-                                                  SSL_SESSION *sess);
-void SSL_CTX_sess_set_get_cb(SSL_CTX *ctx,
-                             SSL_SESSION *(*get_session_cb) (struct ssl_st
-                                                             *ssl,
-                                                             const unsigned char
-                                                             *data, int len,
-                                                             int *copy));
-SSL_SESSION *(*SSL_CTX_sess_get_get_cb(SSL_CTX *ctx)) (struct ssl_st *ssl,
-                                                       const unsigned char *data,
-                                                       int len, int *copy);
-void SSL_CTX_set_info_callback(SSL_CTX *ctx,
-                               void (*cb) (const SSL *ssl, int type,
-                                           int val));
-void (*SSL_CTX_get_info_callback(SSL_CTX *ctx)) (const SSL *ssl, int type,
-                                                 int val);
-void SSL_CTX_set_client_cert_cb(SSL_CTX *ctx,
-                                int (*client_cert_cb) (SSL *ssl, X509 **x509,
-                                                       EVP_PKEY **pkey));
-int (*SSL_CTX_get_client_cert_cb(SSL_CTX *ctx)) (SSL *ssl, X509 **x509,
-                                                 EVP_PKEY **pkey);
-# ifndef OPENSSL_NO_ENGINE
-__owur int SSL_CTX_set_client_cert_engine(SSL_CTX *ctx, ENGINE *e);
-# endif
-void SSL_CTX_set_cookie_generate_cb(SSL_CTX *ctx,
-                                    int (*app_gen_cookie_cb) (SSL *ssl,
-                                                              unsigned char
-                                                              *cookie,
-                                                              unsigned int
-                                                              *cookie_len));
-void SSL_CTX_set_cookie_verify_cb(SSL_CTX *ctx,
-                                  int (*app_verify_cookie_cb) (SSL *ssl,
-                                                               const unsigned char
-                                                               *cookie,
-                                                               unsigned int
-                                                               cookie_len));
-# ifndef OPENSSL_NO_NEXTPROTONEG
-void SSL_CTX_set_next_protos_advertised_cb(SSL_CTX *s,
-                                           int (*cb) (SSL *ssl,
-                                                      const unsigned char
-                                                      **out,
-                                                      unsigned int *outlen,
-                                                      void *arg), void *arg);
-void SSL_CTX_set_next_proto_select_cb(SSL_CTX *s,
-                                      int (*cb) (SSL *ssl,
-                                                 unsigned char **out,
-                                                 unsigned char *outlen,
-                                                 const unsigned char *in,
-                                                 unsigned int inlen,
-                                                 void *arg), void *arg);
-void SSL_get0_next_proto_negotiated(const SSL *s, const unsigned char **data,
-                                    unsigned *len);
-# endif
-
-__owur int SSL_select_next_proto(unsigned char **out, unsigned char *outlen,
-                          const unsigned char *in, unsigned int inlen,
-                          const unsigned char *client,
-                          unsigned int client_len);
-
-# define OPENSSL_NPN_UNSUPPORTED 0
-# define OPENSSL_NPN_NEGOTIATED  1
-# define OPENSSL_NPN_NO_OVERLAP  2
-
-__owur int SSL_CTX_set_alpn_protos(SSL_CTX *ctx, const unsigned char *protos,
-                                   unsigned int protos_len);
-__owur int SSL_set_alpn_protos(SSL *ssl, const unsigned char *protos,
-                               unsigned int protos_len);
-void SSL_CTX_set_alpn_select_cb(SSL_CTX *ctx,
-                                int (*cb) (SSL *ssl,
-                                           const unsigned char **out,
-                                           unsigned char *outlen,
-                                           const unsigned char *in,
-                                           unsigned int inlen,
-                                           void *arg), void *arg);
-void SSL_get0_alpn_selected(const SSL *ssl, const unsigned char **data,
-                            unsigned int *len);
-
-# ifndef OPENSSL_NO_PSK
-/*
- * the maximum length of the buffer given to callbacks containing the
- * resulting identity/psk
- */
-#  define PSK_MAX_IDENTITY_LEN 128
-#  define PSK_MAX_PSK_LEN 256
-void SSL_CTX_set_psk_client_callback(SSL_CTX *ctx,
-                                     unsigned int (*psk_client_callback) (SSL
-                                                                          *ssl,
-                                                                          const
-                                                                          char
-                                                                          *hint,
-                                                                          char
-                                                                          *identity,
-                                                                          unsigned
-                                                                          int
-                                                                          max_identity_len,
-                                                                          unsigned
-                                                                          char
-                                                                          *psk,
-                                                                          unsigned
-                                                                          int
-                                                                          max_psk_len));
-void SSL_set_psk_client_callback(SSL *ssl,
-                                 unsigned int (*psk_client_callback) (SSL
-                                                                      *ssl,
-                                                                      const
-                                                                      char
-                                                                      *hint,
-                                                                      char
-                                                                      *identity,
-                                                                      unsigned
-                                                                      int
-                                                                      max_identity_len,
-                                                                      unsigned
-                                                                      char
-                                                                      *psk,
-                                                                      unsigned
-                                                                      int
-                                                                      max_psk_len));
-void SSL_CTX_set_psk_server_callback(SSL_CTX *ctx,
-                                     unsigned int (*psk_server_callback) (SSL
-                                                                          *ssl,
-                                                                          const
-                                                                          char
-                                                                          *identity,
-                                                                          unsigned
-                                                                          char
-                                                                          *psk,
-                                                                          unsigned
-                                                                          int
-                                                                          max_psk_len));
-void SSL_set_psk_server_callback(SSL *ssl,
-                                 unsigned int (*psk_server_callback) (SSL
-                                                                      *ssl,
-                                                                      const
-                                                                      char
-                                                                      *identity,
-                                                                      unsigned
-                                                                      char
-                                                                      *psk,
-                                                                      unsigned
-                                                                      int
-                                                                      max_psk_len));
-__owur int SSL_CTX_use_psk_identity_hint(SSL_CTX *ctx, const char *identity_hint);
-__owur int SSL_use_psk_identity_hint(SSL *s, const char *identity_hint);
-const char *SSL_get_psk_identity_hint(const SSL *s);
-const char *SSL_get_psk_identity(const SSL *s);
-# endif
-
-/* Register callbacks to handle custom TLS Extensions for client or server. */
-
-__owur int SSL_CTX_has_client_custom_ext(const SSL_CTX *ctx,
-                                         unsigned int ext_type);
-
-__owur int SSL_CTX_add_client_custom_ext(SSL_CTX *ctx, unsigned int ext_type,
-                                  custom_ext_add_cb add_cb,
-                                  custom_ext_free_cb free_cb,
-                                  void *add_arg,
-                                  custom_ext_parse_cb parse_cb,
-                                  void *parse_arg);
-
-__owur int SSL_CTX_add_server_custom_ext(SSL_CTX *ctx, unsigned int ext_type,
-                                  custom_ext_add_cb add_cb,
-                                  custom_ext_free_cb free_cb,
-                                  void *add_arg,
-                                  custom_ext_parse_cb parse_cb,
-                                  void *parse_arg);
-
-__owur int SSL_extension_supported(unsigned int ext_type);
-
-# define SSL_NOTHING            1
-# define SSL_WRITING            2
-# define SSL_READING            3
-# define SSL_X509_LOOKUP        4
-# define SSL_ASYNC_PAUSED       5
-# define SSL_ASYNC_NO_JOBS      6
-
-/* These will only be used when doing non-blocking IO */
-# define SSL_want_nothing(s)     (SSL_want(s) == SSL_NOTHING)
-# define SSL_want_read(s)        (SSL_want(s) == SSL_READING)
-# define SSL_want_write(s)       (SSL_want(s) == SSL_WRITING)
-# define SSL_want_x509_lookup(s) (SSL_want(s) == SSL_X509_LOOKUP)
-# define SSL_want_async(s)       (SSL_want(s) == SSL_ASYNC_PAUSED)
-# define SSL_want_async_job(s)   (SSL_want(s) == SSL_ASYNC_NO_JOBS)
-
-# define SSL_MAC_FLAG_READ_MAC_STREAM 1
-# define SSL_MAC_FLAG_WRITE_MAC_STREAM 2
-
-#ifdef __cplusplus
-}
-#endif
-
-# include <openssl/ssl2.h>
-# include <openssl/ssl3.h>
-# include <openssl/tls1.h>      /* This is mostly sslv3 with a few tweaks */
-# include <openssl/dtls1.h>     /* Datagram TLS */
-# include <openssl/srtp.h>      /* Support for the use_srtp extension */
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-/*
- * These need to be after the above set of includes due to a compiler bug
- * in VisualStudio 2015
- */
-DEFINE_STACK_OF_CONST(SSL_CIPHER)
-DEFINE_STACK_OF(SSL_COMP)
-
-/* compatibility */
-# define SSL_set_app_data(s,arg)         (SSL_set_ex_data(s,0,(char *)arg))
-# define SSL_get_app_data(s)             (SSL_get_ex_data(s,0))
-# define SSL_SESSION_set_app_data(s,a)   (SSL_SESSION_set_ex_data(s,0,(char *)a))
-# define SSL_SESSION_get_app_data(s)     (SSL_SESSION_get_ex_data(s,0))
-# define SSL_CTX_get_app_data(ctx)       (SSL_CTX_get_ex_data(ctx,0))
-# define SSL_CTX_set_app_data(ctx,arg)   (SSL_CTX_set_ex_data(ctx,0,(char *)arg))
-DEPRECATEDIN_1_1_0(void SSL_set_debug(SSL *s, int debug))
-
-
-/*
- * The valid handshake states (one for each type message sent and one for each
- * type of message received). There are also two "special" states:
- * TLS = TLS or DTLS state
- * DTLS = DTLS specific state
- * CR/SR = Client Read/Server Read
- * CW/SW = Client Write/Server Write
- *
- * The "special" states are:
- * TLS_ST_BEFORE = No handshake has been initiated yet
- * TLS_ST_OK = A handshake has been successfully completed
- */
-typedef enum {
-    TLS_ST_BEFORE,
-    TLS_ST_OK,
-    DTLS_ST_CR_HELLO_VERIFY_REQUEST,
-    TLS_ST_CR_SRVR_HELLO,
-    TLS_ST_CR_CERT,
-    TLS_ST_CR_CERT_STATUS,
-    TLS_ST_CR_KEY_EXCH,
-    TLS_ST_CR_CERT_REQ,
-    TLS_ST_CR_SRVR_DONE,
-    TLS_ST_CR_SESSION_TICKET,
-    TLS_ST_CR_CHANGE,
-    TLS_ST_CR_FINISHED,
-    TLS_ST_CW_CLNT_HELLO,
-    TLS_ST_CW_CERT,
-    TLS_ST_CW_KEY_EXCH,
-    TLS_ST_CW_CERT_VRFY,
-    TLS_ST_CW_CHANGE,
-    TLS_ST_CW_NEXT_PROTO,
-    TLS_ST_CW_FINISHED,
-    TLS_ST_SW_HELLO_REQ,
-    TLS_ST_SR_CLNT_HELLO,
-    DTLS_ST_SW_HELLO_VERIFY_REQUEST,
-    TLS_ST_SW_SRVR_HELLO,
-    TLS_ST_SW_CERT,
-    TLS_ST_SW_KEY_EXCH,
-    TLS_ST_SW_CERT_REQ,
-    TLS_ST_SW_SRVR_DONE,
-    TLS_ST_SR_CERT,
-    TLS_ST_SR_KEY_EXCH,
-    TLS_ST_SR_CERT_VRFY,
-    TLS_ST_SR_NEXT_PROTO,
-    TLS_ST_SR_CHANGE,
-    TLS_ST_SR_FINISHED,
-    TLS_ST_SW_SESSION_TICKET,
-    TLS_ST_SW_CERT_STATUS,
-    TLS_ST_SW_CHANGE,
-    TLS_ST_SW_FINISHED
-} OSSL_HANDSHAKE_STATE;
-
-/*
- * Most of the following state values are no longer used and are defined to be
- * the closest equivalent value in the current state machine code. Not all
- * defines have an equivalent and are set to a dummy value (-1). SSL_ST_CONNECT
- * and SSL_ST_ACCEPT are still in use in the definition of SSL_CB_ACCEPT_LOOP,
- * SSL_CB_ACCEPT_EXIT, SSL_CB_CONNECT_LOOP and SSL_CB_CONNECT_EXIT.
- */
-
-# define SSL_ST_CONNECT                  0x1000
-# define SSL_ST_ACCEPT                   0x2000
-
-# define SSL_ST_MASK                     0x0FFF
-
-# define SSL_CB_LOOP                     0x01
-# define SSL_CB_EXIT                     0x02
-# define SSL_CB_READ                     0x04
-# define SSL_CB_WRITE                    0x08
-# define SSL_CB_ALERT                    0x4000/* used in callback */
-# define SSL_CB_READ_ALERT               (SSL_CB_ALERT|SSL_CB_READ)
-# define SSL_CB_WRITE_ALERT              (SSL_CB_ALERT|SSL_CB_WRITE)
-# define SSL_CB_ACCEPT_LOOP              (SSL_ST_ACCEPT|SSL_CB_LOOP)
-# define SSL_CB_ACCEPT_EXIT              (SSL_ST_ACCEPT|SSL_CB_EXIT)
-# define SSL_CB_CONNECT_LOOP             (SSL_ST_CONNECT|SSL_CB_LOOP)
-# define SSL_CB_CONNECT_EXIT             (SSL_ST_CONNECT|SSL_CB_EXIT)
-# define SSL_CB_HANDSHAKE_START          0x10
-# define SSL_CB_HANDSHAKE_DONE           0x20
-
-/* Is the SSL_connection established? */
-# define SSL_in_connect_init(a)          (SSL_in_init(a) && !SSL_is_server(a))
-# define SSL_in_accept_init(a)           (SSL_in_init(a) && SSL_is_server(a))
-int SSL_in_init(SSL *s);
-int SSL_in_before(SSL *s);
-int SSL_is_init_finished(SSL *s);
-
-/*
- * The following 3 states are kept in ssl->rlayer.rstate when reads fail, you
- * should not need these
- */
-# define SSL_ST_READ_HEADER                      0xF0
-# define SSL_ST_READ_BODY                        0xF1
-# define SSL_ST_READ_DONE                        0xF2
-
-/*-
- * Obtain latest Finished message
- *   -- that we sent (SSL_get_finished)
- *   -- that we expected from peer (SSL_get_peer_finished).
- * Returns length (0 == no Finished so far), copies up to 'count' bytes.
- */
-size_t SSL_get_finished(const SSL *s, void *buf, size_t count);
-size_t SSL_get_peer_finished(const SSL *s, void *buf, size_t count);
-
-/*
- * use either SSL_VERIFY_NONE or SSL_VERIFY_PEER, the last 2 options are
- * 'ored' with SSL_VERIFY_PEER if they are desired
- */
-# define SSL_VERIFY_NONE                 0x00
-# define SSL_VERIFY_PEER                 0x01
-# define SSL_VERIFY_FAIL_IF_NO_PEER_CERT 0x02
-# define SSL_VERIFY_CLIENT_ONCE          0x04
-
-# define OpenSSL_add_ssl_algorithms()    SSL_library_init()
-# if OPENSSL_API_COMPAT < 0x10100000L
-#  define SSLeay_add_ssl_algorithms()    SSL_library_init()
-# endif
-
-/* More backward compatibility */
-# define SSL_get_cipher(s) \
-                SSL_CIPHER_get_name(SSL_get_current_cipher(s))
-# define SSL_get_cipher_bits(s,np) \
-                SSL_CIPHER_get_bits(SSL_get_current_cipher(s),np)
-# define SSL_get_cipher_version(s) \
-                SSL_CIPHER_get_version(SSL_get_current_cipher(s))
-# define SSL_get_cipher_name(s) \
-                SSL_CIPHER_get_name(SSL_get_current_cipher(s))
-# define SSL_get_time(a)         SSL_SESSION_get_time(a)
-# define SSL_set_time(a,b)       SSL_SESSION_set_time((a),(b))
-# define SSL_get_timeout(a)      SSL_SESSION_get_timeout(a)
-# define SSL_set_timeout(a,b)    SSL_SESSION_set_timeout((a),(b))
-
-# define d2i_SSL_SESSION_bio(bp,s_id) ASN1_d2i_bio_of(SSL_SESSION,SSL_SESSION_new,d2i_SSL_SESSION,bp,s_id)
-# define i2d_SSL_SESSION_bio(bp,s_id) ASN1_i2d_bio_of(SSL_SESSION,i2d_SSL_SESSION,bp,s_id)
-
-DECLARE_PEM_rw(SSL_SESSION, SSL_SESSION)
-# define SSL_AD_REASON_OFFSET            1000/* offset to get SSL_R_... value
-                                              * from SSL_AD_... */
-/* These alert types are for SSLv3 and TLSv1 */
-# define SSL_AD_CLOSE_NOTIFY             SSL3_AD_CLOSE_NOTIFY
-/* fatal */
-# define SSL_AD_UNEXPECTED_MESSAGE       SSL3_AD_UNEXPECTED_MESSAGE
-/* fatal */
-# define SSL_AD_BAD_RECORD_MAC           SSL3_AD_BAD_RECORD_MAC
-# define SSL_AD_DECRYPTION_FAILED        TLS1_AD_DECRYPTION_FAILED
-# define SSL_AD_RECORD_OVERFLOW          TLS1_AD_RECORD_OVERFLOW
-/* fatal */
-# define SSL_AD_DECOMPRESSION_FAILURE    SSL3_AD_DECOMPRESSION_FAILURE
-/* fatal */
-# define SSL_AD_HANDSHAKE_FAILURE        SSL3_AD_HANDSHAKE_FAILURE
-/* Not for TLS */
-# define SSL_AD_NO_CERTIFICATE           SSL3_AD_NO_CERTIFICATE
-# define SSL_AD_BAD_CERTIFICATE          SSL3_AD_BAD_CERTIFICATE
-# define SSL_AD_UNSUPPORTED_CERTIFICATE  SSL3_AD_UNSUPPORTED_CERTIFICATE
-# define SSL_AD_CERTIFICATE_REVOKED      SSL3_AD_CERTIFICATE_REVOKED
-# define SSL_AD_CERTIFICATE_EXPIRED      SSL3_AD_CERTIFICATE_EXPIRED
-# define SSL_AD_CERTIFICATE_UNKNOWN      SSL3_AD_CERTIFICATE_UNKNOWN
-/* fatal */
-# define SSL_AD_ILLEGAL_PARAMETER        SSL3_AD_ILLEGAL_PARAMETER
-/* fatal */
-# define SSL_AD_UNKNOWN_CA               TLS1_AD_UNKNOWN_CA
-/* fatal */
-# define SSL_AD_ACCESS_DENIED            TLS1_AD_ACCESS_DENIED
-/* fatal */
-# define SSL_AD_DECODE_ERROR             TLS1_AD_DECODE_ERROR
-# define SSL_AD_DECRYPT_ERROR            TLS1_AD_DECRYPT_ERROR
-/* fatal */
-# define SSL_AD_EXPORT_RESTRICTION       TLS1_AD_EXPORT_RESTRICTION
-/* fatal */
-# define SSL_AD_PROTOCOL_VERSION         TLS1_AD_PROTOCOL_VERSION
-/* fatal */
-# define SSL_AD_INSUFFICIENT_SECURITY    TLS1_AD_INSUFFICIENT_SECURITY
-/* fatal */
-# define SSL_AD_INTERNAL_ERROR           TLS1_AD_INTERNAL_ERROR
-# define SSL_AD_USER_CANCELLED           TLS1_AD_USER_CANCELLED
-# define SSL_AD_NO_RENEGOTIATION         TLS1_AD_NO_RENEGOTIATION
-# define SSL_AD_UNSUPPORTED_EXTENSION    TLS1_AD_UNSUPPORTED_EXTENSION
-# define SSL_AD_CERTIFICATE_UNOBTAINABLE TLS1_AD_CERTIFICATE_UNOBTAINABLE
-# define SSL_AD_UNRECOGNIZED_NAME        TLS1_AD_UNRECOGNIZED_NAME
-# define SSL_AD_BAD_CERTIFICATE_STATUS_RESPONSE TLS1_AD_BAD_CERTIFICATE_STATUS_RESPONSE
-# define SSL_AD_BAD_CERTIFICATE_HASH_VALUE TLS1_AD_BAD_CERTIFICATE_HASH_VALUE
-/* fatal */
-# define SSL_AD_UNKNOWN_PSK_IDENTITY     TLS1_AD_UNKNOWN_PSK_IDENTITY
-/* fatal */
-# define SSL_AD_INAPPROPRIATE_FALLBACK   TLS1_AD_INAPPROPRIATE_FALLBACK
-# define SSL_AD_NO_APPLICATION_PROTOCOL  TLS1_AD_NO_APPLICATION_PROTOCOL
-# define SSL_ERROR_NONE                  0
-# define SSL_ERROR_SSL                   1
-# define SSL_ERROR_WANT_READ             2
-# define SSL_ERROR_WANT_WRITE            3
-# define SSL_ERROR_WANT_X509_LOOKUP      4
-# define SSL_ERROR_SYSCALL               5/* look at error stack/return
-                                           * value/errno */
-# define SSL_ERROR_ZERO_RETURN           6
-# define SSL_ERROR_WANT_CONNECT          7
-# define SSL_ERROR_WANT_ACCEPT           8
-# define SSL_ERROR_WANT_ASYNC            9
-# define SSL_ERROR_WANT_ASYNC_JOB       10
-# define SSL_CTRL_SET_TMP_DH                     3
-# define SSL_CTRL_SET_TMP_ECDH                   4
-# define SSL_CTRL_SET_TMP_DH_CB                  6
-# define SSL_CTRL_GET_CLIENT_CERT_REQUEST        9
-# define SSL_CTRL_GET_NUM_RENEGOTIATIONS         10
-# define SSL_CTRL_CLEAR_NUM_RENEGOTIATIONS       11
-# define SSL_CTRL_GET_TOTAL_RENEGOTIATIONS       12
-# define SSL_CTRL_GET_FLAGS                      13
-# define SSL_CTRL_EXTRA_CHAIN_CERT               14
-# define SSL_CTRL_SET_MSG_CALLBACK               15
-# define SSL_CTRL_SET_MSG_CALLBACK_ARG           16
-/* only applies to datagram connections */
-# define SSL_CTRL_SET_MTU                17
-/* Stats */
-# define SSL_CTRL_SESS_NUMBER                    20
-# define SSL_CTRL_SESS_CONNECT                   21
-# define SSL_CTRL_SESS_CONNECT_GOOD              22
-# define SSL_CTRL_SESS_CONNECT_RENEGOTIATE       23
-# define SSL_CTRL_SESS_ACCEPT                    24
-# define SSL_CTRL_SESS_ACCEPT_GOOD               25
-# define SSL_CTRL_SESS_ACCEPT_RENEGOTIATE        26
-# define SSL_CTRL_SESS_HIT                       27
-# define SSL_CTRL_SESS_CB_HIT                    28
-# define SSL_CTRL_SESS_MISSES                    29
-# define SSL_CTRL_SESS_TIMEOUTS                  30
-# define SSL_CTRL_SESS_CACHE_FULL                31
-# define SSL_CTRL_MODE                           33
-# define SSL_CTRL_GET_READ_AHEAD                 40
-# define SSL_CTRL_SET_READ_AHEAD                 41
-# define SSL_CTRL_SET_SESS_CACHE_SIZE            42
-# define SSL_CTRL_GET_SESS_CACHE_SIZE            43
-# define SSL_CTRL_SET_SESS_CACHE_MODE            44
-# define SSL_CTRL_GET_SESS_CACHE_MODE            45
-# define SSL_CTRL_GET_MAX_CERT_LIST              50
-# define SSL_CTRL_SET_MAX_CERT_LIST              51
-# define SSL_CTRL_SET_MAX_SEND_FRAGMENT          52
-/* see tls1.h for macros based on these */
-# define SSL_CTRL_SET_TLSEXT_SERVERNAME_CB       53
-# define SSL_CTRL_SET_TLSEXT_SERVERNAME_ARG      54
-# define SSL_CTRL_SET_TLSEXT_HOSTNAME            55
-# define SSL_CTRL_SET_TLSEXT_DEBUG_CB            56
-# define SSL_CTRL_SET_TLSEXT_DEBUG_ARG           57
-# define SSL_CTRL_GET_TLSEXT_TICKET_KEYS         58
-# define SSL_CTRL_SET_TLSEXT_TICKET_KEYS         59
-/*# define SSL_CTRL_SET_TLSEXT_OPAQUE_PRF_INPUT    60 */
-/*# define SSL_CTRL_SET_TLSEXT_OPAQUE_PRF_INPUT_CB 61 */
-/*# define SSL_CTRL_SET_TLSEXT_OPAQUE_PRF_INPUT_CB_ARG 62 */
-# define SSL_CTRL_SET_TLSEXT_STATUS_REQ_CB       63
-# define SSL_CTRL_SET_TLSEXT_STATUS_REQ_CB_ARG   64
-# define SSL_CTRL_SET_TLSEXT_STATUS_REQ_TYPE     65
-# define SSL_CTRL_GET_TLSEXT_STATUS_REQ_EXTS     66
-# define SSL_CTRL_SET_TLSEXT_STATUS_REQ_EXTS     67
-# define SSL_CTRL_GET_TLSEXT_STATUS_REQ_IDS      68
-# define SSL_CTRL_SET_TLSEXT_STATUS_REQ_IDS      69
-# define SSL_CTRL_GET_TLSEXT_STATUS_REQ_OCSP_RESP        70
-# define SSL_CTRL_SET_TLSEXT_STATUS_REQ_OCSP_RESP        71
-# define SSL_CTRL_SET_TLSEXT_TICKET_KEY_CB       72
-# define SSL_CTRL_SET_TLS_EXT_SRP_USERNAME_CB    75
-# define SSL_CTRL_SET_SRP_VERIFY_PARAM_CB                76
-# define SSL_CTRL_SET_SRP_GIVE_CLIENT_PWD_CB             77
-# define SSL_CTRL_SET_SRP_ARG            78
-# define SSL_CTRL_SET_TLS_EXT_SRP_USERNAME               79
-# define SSL_CTRL_SET_TLS_EXT_SRP_STRENGTH               80
-# define SSL_CTRL_SET_TLS_EXT_SRP_PASSWORD               81
-# ifndef OPENSSL_NO_HEARTBEATS
-#  define SSL_CTRL_DTLS_EXT_SEND_HEARTBEAT               85
-#  define SSL_CTRL_GET_DTLS_EXT_HEARTBEAT_PENDING        86
-#  define SSL_CTRL_SET_DTLS_EXT_HEARTBEAT_NO_REQUESTS    87
-# endif
-# define DTLS_CTRL_GET_TIMEOUT           73
-# define DTLS_CTRL_HANDLE_TIMEOUT        74
-# define SSL_CTRL_GET_RI_SUPPORT                 76
-# define SSL_CTRL_CLEAR_MODE                     78
-# define SSL_CTRL_SET_NOT_RESUMABLE_SESS_CB      79
-# define SSL_CTRL_GET_EXTRA_CHAIN_CERTS          82
-# define SSL_CTRL_CLEAR_EXTRA_CHAIN_CERTS        83
-# define SSL_CTRL_CHAIN                          88
-# define SSL_CTRL_CHAIN_CERT                     89
-# define SSL_CTRL_GET_CURVES                     90
-# define SSL_CTRL_SET_CURVES                     91
-# define SSL_CTRL_SET_CURVES_LIST                92
-# define SSL_CTRL_GET_SHARED_CURVE               93
-# define SSL_CTRL_SET_SIGALGS                    97
-# define SSL_CTRL_SET_SIGALGS_LIST               98
-# define SSL_CTRL_CERT_FLAGS                     99
-# define SSL_CTRL_CLEAR_CERT_FLAGS               100
-# define SSL_CTRL_SET_CLIENT_SIGALGS             101
-# define SSL_CTRL_SET_CLIENT_SIGALGS_LIST        102
-# define SSL_CTRL_GET_CLIENT_CERT_TYPES          103
-# define SSL_CTRL_SET_CLIENT_CERT_TYPES          104
-# define SSL_CTRL_BUILD_CERT_CHAIN               105
-# define SSL_CTRL_SET_VERIFY_CERT_STORE          106
-# define SSL_CTRL_SET_CHAIN_CERT_STORE           107
-# define SSL_CTRL_GET_PEER_SIGNATURE_NID         108
-# define SSL_CTRL_GET_SERVER_TMP_KEY             109
-# define SSL_CTRL_GET_RAW_CIPHERLIST             110
-# define SSL_CTRL_GET_EC_POINT_FORMATS           111
-# define SSL_CTRL_GET_CHAIN_CERTS                115
-# define SSL_CTRL_SELECT_CURRENT_CERT            116
-# define SSL_CTRL_SET_CURRENT_CERT               117
-# define SSL_CTRL_SET_DH_AUTO                    118
-# define DTLS_CTRL_SET_LINK_MTU                  120
-# define DTLS_CTRL_GET_LINK_MIN_MTU              121
-# define SSL_CTRL_GET_EXTMS_SUPPORT              122
-# define SSL_CTRL_SET_MIN_PROTO_VERSION          123
-# define SSL_CTRL_SET_MAX_PROTO_VERSION          124
-# define SSL_CTRL_SET_SPLIT_SEND_FRAGMENT        125
-# define SSL_CTRL_SET_MAX_PIPELINES              126
-# define SSL_CTRL_GET_TLSEXT_STATUS_REQ_TYPE     127
-# define SSL_CTRL_GET_TLSEXT_STATUS_REQ_CB       128
-# define SSL_CTRL_GET_TLSEXT_STATUS_REQ_CB_ARG   129
-# define SSL_CERT_SET_FIRST                      1
-# define SSL_CERT_SET_NEXT                       2
-# define SSL_CERT_SET_SERVER                     3
-# define DTLSv1_get_timeout(ssl, arg) \
-        SSL_ctrl(ssl,DTLS_CTRL_GET_TIMEOUT,0, (void *)arg)
-# define DTLSv1_handle_timeout(ssl) \
-        SSL_ctrl(ssl,DTLS_CTRL_HANDLE_TIMEOUT,0, NULL)
-# define SSL_num_renegotiations(ssl) \
-        SSL_ctrl((ssl),SSL_CTRL_GET_NUM_RENEGOTIATIONS,0,NULL)
-# define SSL_clear_num_renegotiations(ssl) \
-        SSL_ctrl((ssl),SSL_CTRL_CLEAR_NUM_RENEGOTIATIONS,0,NULL)
-# define SSL_total_renegotiations(ssl) \
-        SSL_ctrl((ssl),SSL_CTRL_GET_TOTAL_RENEGOTIATIONS,0,NULL)
-# define SSL_CTX_set_tmp_dh(ctx,dh) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_SET_TMP_DH,0,(char *)dh)
-# define SSL_CTX_set_tmp_ecdh(ctx,ecdh) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_SET_TMP_ECDH,0,(char *)ecdh)
-# define SSL_CTX_set_dh_auto(ctx, onoff) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_SET_DH_AUTO,onoff,NULL)
-# define SSL_set_dh_auto(s, onoff) \
-        SSL_ctrl(s,SSL_CTRL_SET_DH_AUTO,onoff,NULL)
-# define SSL_set_tmp_dh(ssl,dh) \
-        SSL_ctrl(ssl,SSL_CTRL_SET_TMP_DH,0,(char *)dh)
-# define SSL_set_tmp_ecdh(ssl,ecdh) \
-        SSL_ctrl(ssl,SSL_CTRL_SET_TMP_ECDH,0,(char *)ecdh)
-# define SSL_CTX_add_extra_chain_cert(ctx,x509) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_EXTRA_CHAIN_CERT,0,(char *)x509)
-# define SSL_CTX_get_extra_chain_certs(ctx,px509) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_GET_EXTRA_CHAIN_CERTS,0,px509)
-# define SSL_CTX_get_extra_chain_certs_only(ctx,px509) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_GET_EXTRA_CHAIN_CERTS,1,px509)
-# define SSL_CTX_clear_extra_chain_certs(ctx) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_CLEAR_EXTRA_CHAIN_CERTS,0,NULL)
-# define SSL_CTX_set0_chain(ctx,sk) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_CHAIN,0,(char *)sk)
-# define SSL_CTX_set1_chain(ctx,sk) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_CHAIN,1,(char *)sk)
-# define SSL_CTX_add0_chain_cert(ctx,x509) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_CHAIN_CERT,0,(char *)x509)
-# define SSL_CTX_add1_chain_cert(ctx,x509) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_CHAIN_CERT,1,(char *)x509)
-# define SSL_CTX_get0_chain_certs(ctx,px509) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_GET_CHAIN_CERTS,0,px509)
-# define SSL_CTX_clear_chain_certs(ctx) \
-        SSL_CTX_set0_chain(ctx,NULL)
-# define SSL_CTX_build_cert_chain(ctx, flags) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_BUILD_CERT_CHAIN, flags, NULL)
-# define SSL_CTX_select_current_cert(ctx,x509) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_SELECT_CURRENT_CERT,0,(char *)x509)
-# define SSL_CTX_set_current_cert(ctx, op) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_SET_CURRENT_CERT, op, NULL)
-# define SSL_CTX_set0_verify_cert_store(ctx,st) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_SET_VERIFY_CERT_STORE,0,(char *)st)
-# define SSL_CTX_set1_verify_cert_store(ctx,st) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_SET_VERIFY_CERT_STORE,1,(char *)st)
-# define SSL_CTX_set0_chain_cert_store(ctx,st) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_SET_CHAIN_CERT_STORE,0,(char *)st)
-# define SSL_CTX_set1_chain_cert_store(ctx,st) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_SET_CHAIN_CERT_STORE,1,(char *)st)
-# define SSL_set0_chain(ctx,sk) \
-        SSL_ctrl(ctx,SSL_CTRL_CHAIN,0,(char *)sk)
-# define SSL_set1_chain(ctx,sk) \
-        SSL_ctrl(ctx,SSL_CTRL_CHAIN,1,(char *)sk)
-# define SSL_add0_chain_cert(ctx,x509) \
-        SSL_ctrl(ctx,SSL_CTRL_CHAIN_CERT,0,(char *)x509)
-# define SSL_add1_chain_cert(ctx,x509) \
-        SSL_ctrl(ctx,SSL_CTRL_CHAIN_CERT,1,(char *)x509)
-# define SSL_get0_chain_certs(ctx,px509) \
-        SSL_ctrl(ctx,SSL_CTRL_GET_CHAIN_CERTS,0,px509)
-# define SSL_clear_chain_certs(ctx) \
-        SSL_set0_chain(ctx,NULL)
-# define SSL_build_cert_chain(s, flags) \
-        SSL_ctrl(s,SSL_CTRL_BUILD_CERT_CHAIN, flags, NULL)
-# define SSL_select_current_cert(ctx,x509) \
-        SSL_ctrl(ctx,SSL_CTRL_SELECT_CURRENT_CERT,0,(char *)x509)
-# define SSL_set_current_cert(ctx,op) \
-        SSL_ctrl(ctx,SSL_CTRL_SET_CURRENT_CERT, op, NULL)
-# define SSL_set0_verify_cert_store(s,st) \
-        SSL_ctrl(s,SSL_CTRL_SET_VERIFY_CERT_STORE,0,(char *)st)
-# define SSL_set1_verify_cert_store(s,st) \
-        SSL_ctrl(s,SSL_CTRL_SET_VERIFY_CERT_STORE,1,(char *)st)
-# define SSL_set0_chain_cert_store(s,st) \
-        SSL_ctrl(s,SSL_CTRL_SET_CHAIN_CERT_STORE,0,(char *)st)
-# define SSL_set1_chain_cert_store(s,st) \
-        SSL_ctrl(s,SSL_CTRL_SET_CHAIN_CERT_STORE,1,(char *)st)
-# define SSL_get1_curves(ctx, s) \
-        SSL_ctrl(ctx,SSL_CTRL_GET_CURVES,0,(char *)s)
-# define SSL_CTX_set1_curves(ctx, clist, clistlen) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_SET_CURVES,clistlen,(char *)clist)
-# define SSL_CTX_set1_curves_list(ctx, s) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_SET_CURVES_LIST,0,(char *)s)
-# define SSL_set1_curves(ctx, clist, clistlen) \
-        SSL_ctrl(ctx,SSL_CTRL_SET_CURVES,clistlen,(char *)clist)
-# define SSL_set1_curves_list(ctx, s) \
-        SSL_ctrl(ctx,SSL_CTRL_SET_CURVES_LIST,0,(char *)s)
-# define SSL_get_shared_curve(s, n) \
-        SSL_ctrl(s,SSL_CTRL_GET_SHARED_CURVE,n,NULL)
-# define SSL_CTX_set1_sigalgs(ctx, slist, slistlen) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_SET_SIGALGS,slistlen,(int *)slist)
-# define SSL_CTX_set1_sigalgs_list(ctx, s) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_SET_SIGALGS_LIST,0,(char *)s)
-# define SSL_set1_sigalgs(ctx, slist, slistlen) \
-        SSL_ctrl(ctx,SSL_CTRL_SET_SIGALGS,slistlen,(int *)slist)
-# define SSL_set1_sigalgs_list(ctx, s) \
-        SSL_ctrl(ctx,SSL_CTRL_SET_SIGALGS_LIST,0,(char *)s)
-# define SSL_CTX_set1_client_sigalgs(ctx, slist, slistlen) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_SET_CLIENT_SIGALGS,slistlen,(int *)slist)
-# define SSL_CTX_set1_client_sigalgs_list(ctx, s) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_SET_CLIENT_SIGALGS_LIST,0,(char *)s)
-# define SSL_set1_client_sigalgs(ctx, slist, slistlen) \
-        SSL_ctrl(ctx,SSL_CTRL_SET_CLIENT_SIGALGS,clistlen,(int *)slist)
-# define SSL_set1_client_sigalgs_list(ctx, s) \
-        SSL_ctrl(ctx,SSL_CTRL_SET_CLIENT_SIGALGS_LIST,0,(char *)s)
-# define SSL_get0_certificate_types(s, clist) \
-        SSL_ctrl(s, SSL_CTRL_GET_CLIENT_CERT_TYPES, 0, (char *)clist)
-# define SSL_CTX_set1_client_certificate_types(ctx, clist, clistlen) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_SET_CLIENT_CERT_TYPES,clistlen,(char *)clist)
-# define SSL_set1_client_certificate_types(s, clist, clistlen) \
-        SSL_ctrl(s,SSL_CTRL_SET_CLIENT_CERT_TYPES,clistlen,(char *)clist)
-# define SSL_get_peer_signature_nid(s, pn) \
-        SSL_ctrl(s,SSL_CTRL_GET_PEER_SIGNATURE_NID,0,pn)
-# define SSL_get_server_tmp_key(s, pk) \
-        SSL_ctrl(s,SSL_CTRL_GET_SERVER_TMP_KEY,0,pk)
-# define SSL_get0_raw_cipherlist(s, plst) \
-        SSL_ctrl(s,SSL_CTRL_GET_RAW_CIPHERLIST,0,plst)
-# define SSL_get0_ec_point_formats(s, plst) \
-        SSL_ctrl(s,SSL_CTRL_GET_EC_POINT_FORMATS,0,plst)
-#define SSL_CTX_set_min_proto_version(ctx, version) \
-        SSL_CTX_ctrl(ctx, SSL_CTRL_SET_MIN_PROTO_VERSION, version, NULL)
-#define SSL_CTX_set_max_proto_version(ctx, version) \
-        SSL_CTX_ctrl(ctx, SSL_CTRL_SET_MAX_PROTO_VERSION, version, NULL)
-#define SSL_set_min_proto_version(s, version) \
-        SSL_ctrl(s, SSL_CTRL_SET_MIN_PROTO_VERSION, version, NULL)
-#define SSL_set_max_proto_version(s, version) \
-        SSL_ctrl(s, SSL_CTRL_SET_MAX_PROTO_VERSION, version, NULL)
-
-#if OPENSSL_API_COMPAT < 0x10100000L
-/* Provide some compatibility macros for removed functionality. */
-# define SSL_CTX_need_tmp_RSA(ctx)                0
-# define SSL_CTX_set_tmp_rsa(ctx,rsa)             1
-# define SSL_need_tmp_RSA(ssl)                    0
-# define SSL_set_tmp_rsa(ssl,rsa)                 1
-# define SSL_CTX_set_ecdh_auto(dummy, onoff)      ((onoff) != 0)
-# define SSL_set_ecdh_auto(dummy, onoff)          ((onoff) != 0)
-/*
- * We "pretend" to call the callback to avoid warnings about unused static
- * functions.
- */
-# define SSL_CTX_set_tmp_rsa_callback(ctx, cb)    while(0) (cb)(NULL, 0, 0)
-# define SSL_set_tmp_rsa_callback(ssl, cb)        while(0) (cb)(NULL, 0, 0)
-#endif
-
-__owur const BIO_METHOD *BIO_f_ssl(void);
-__owur BIO *BIO_new_ssl(SSL_CTX *ctx, int client);
-__owur BIO *BIO_new_ssl_connect(SSL_CTX *ctx);
-__owur BIO *BIO_new_buffer_ssl_connect(SSL_CTX *ctx);
-__owur int BIO_ssl_copy_session_id(BIO *to, BIO *from);
-void BIO_ssl_shutdown(BIO *ssl_bio);
-
-__owur int SSL_CTX_set_cipher_list(SSL_CTX *, const char *str);
-__owur SSL_CTX *SSL_CTX_new(const SSL_METHOD *meth);
-int SSL_CTX_up_ref(SSL_CTX *ctx);
-void SSL_CTX_free(SSL_CTX *);
-__owur long SSL_CTX_set_timeout(SSL_CTX *ctx, long t);
-__owur long SSL_CTX_get_timeout(const SSL_CTX *ctx);
-__owur X509_STORE *SSL_CTX_get_cert_store(const SSL_CTX *);
-void SSL_CTX_set_cert_store(SSL_CTX *, X509_STORE *);
-__owur int SSL_want(const SSL *s);
-__owur int SSL_clear(SSL *s);
-
-void SSL_CTX_flush_sessions(SSL_CTX *ctx, long tm);
-
-__owur const SSL_CIPHER *SSL_get_current_cipher(const SSL *s);
-__owur int SSL_CIPHER_get_bits(const SSL_CIPHER *c, int *alg_bits);
-__owur const char *SSL_CIPHER_get_version(const SSL_CIPHER *c);
-__owur const char *SSL_CIPHER_get_name(const SSL_CIPHER *c);
-__owur uint32_t SSL_CIPHER_get_id(const SSL_CIPHER *c);
-__owur int SSL_CIPHER_get_kx_nid(const SSL_CIPHER *c);
-__owur int SSL_CIPHER_get_auth_nid(const SSL_CIPHER *c);
-__owur int SSL_CIPHER_is_aead(const SSL_CIPHER *c);
-
-__owur int SSL_get_fd(const SSL *s);
-__owur int SSL_get_rfd(const SSL *s);
-__owur int SSL_get_wfd(const SSL *s);
-__owur const char *SSL_get_cipher_list(const SSL *s, int n);
-__owur char *SSL_get_shared_ciphers(const SSL *s, char *buf, int len);
-__owur int SSL_get_read_ahead(const SSL *s);
-__owur int SSL_pending(const SSL *s);
-__owur int SSL_has_pending(const SSL *s);
-# ifndef OPENSSL_NO_SOCK
-__owur int SSL_set_fd(SSL *s, int fd);
-__owur int SSL_set_rfd(SSL *s, int fd);
-__owur int SSL_set_wfd(SSL *s, int fd);
-# endif
-void SSL_set0_rbio(SSL *s, BIO *rbio);
-void SSL_set0_wbio(SSL *s, BIO *wbio);
-void SSL_set_bio(SSL *s, BIO *rbio, BIO *wbio);
-__owur BIO *SSL_get_rbio(const SSL *s);
-__owur BIO *SSL_get_wbio(const SSL *s);
-__owur int SSL_set_cipher_list(SSL *s, const char *str);
-void SSL_set_read_ahead(SSL *s, int yes);
-__owur int SSL_get_verify_mode(const SSL *s);
-__owur int SSL_get_verify_depth(const SSL *s);
-__owur SSL_verify_cb SSL_get_verify_callback(const SSL *s);
-void SSL_set_verify(SSL *s, int mode, SSL_verify_cb callback);
-void SSL_set_verify_depth(SSL *s, int depth);
-void SSL_set_cert_cb(SSL *s, int (*cb) (SSL *ssl, void *arg), void *arg);
-# ifndef OPENSSL_NO_RSA
-__owur int SSL_use_RSAPrivateKey(SSL *ssl, RSA *rsa);
-__owur int SSL_use_RSAPrivateKey_ASN1(SSL *ssl, const unsigned char *d, long len);
-# endif
-__owur int SSL_use_PrivateKey(SSL *ssl, EVP_PKEY *pkey);
-__owur int SSL_use_PrivateKey_ASN1(int pk, SSL *ssl, const unsigned char *d,
-                            long len);
-__owur int SSL_use_certificate(SSL *ssl, X509 *x);
-__owur int SSL_use_certificate_ASN1(SSL *ssl, const unsigned char *d, int len);
-
-/* Set serverinfo data for the current active cert. */
-__owur int SSL_CTX_use_serverinfo(SSL_CTX *ctx, const unsigned char *serverinfo,
-                           size_t serverinfo_length);
-__owur int SSL_CTX_use_serverinfo_file(SSL_CTX *ctx, const char *file);
-
-#ifndef OPENSSL_NO_RSA
-__owur int SSL_use_RSAPrivateKey_file(SSL *ssl, const char *file, int type);
-#endif
-
-__owur int SSL_use_PrivateKey_file(SSL *ssl, const char *file, int type);
-__owur int SSL_use_certificate_file(SSL *ssl, const char *file, int type);
-
-#ifndef OPENSSL_NO_RSA
-__owur int SSL_CTX_use_RSAPrivateKey_file(SSL_CTX *ctx, const char *file, int type);
-#endif
-__owur int SSL_CTX_use_PrivateKey_file(SSL_CTX *ctx, const char *file, int type);
-__owur int SSL_CTX_use_certificate_file(SSL_CTX *ctx, const char *file, int type);
-/* PEM type */
-__owur int SSL_CTX_use_certificate_chain_file(SSL_CTX *ctx, const char *file);
-__owur int SSL_use_certificate_chain_file(SSL *ssl, const char *file);
-__owur STACK_OF(X509_NAME) *SSL_load_client_CA_file(const char *file);
-__owur int SSL_add_file_cert_subjects_to_stack(STACK_OF(X509_NAME) *stackCAs,
-                                        const char *file);
-int SSL_add_dir_cert_subjects_to_stack(STACK_OF(X509_NAME) *stackCAs,
-                                       const char *dir);
-
-#if OPENSSL_API_COMPAT < 0x10100000L
-# define SSL_load_error_strings() \
-    OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS \
-                     | OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL)
-#endif
-
-__owur const char *SSL_state_string(const SSL *s);
-__owur const char *SSL_rstate_string(const SSL *s);
-__owur const char *SSL_state_string_long(const SSL *s);
-__owur const char *SSL_rstate_string_long(const SSL *s);
-__owur long SSL_SESSION_get_time(const SSL_SESSION *s);
-__owur long SSL_SESSION_set_time(SSL_SESSION *s, long t);
-__owur long SSL_SESSION_get_timeout(const SSL_SESSION *s);
-__owur long SSL_SESSION_set_timeout(SSL_SESSION *s, long t);
-__owur int SSL_SESSION_get_protocol_version(const SSL_SESSION *s);
-__owur const char *SSL_SESSION_get0_hostname(const SSL_SESSION *s);
-__owur const SSL_CIPHER *SSL_SESSION_get0_cipher(const SSL_SESSION *s);
-__owur int SSL_SESSION_has_ticket(const SSL_SESSION *s);
-__owur unsigned long SSL_SESSION_get_ticket_lifetime_hint(const SSL_SESSION *s);
-void SSL_SESSION_get0_ticket(const SSL_SESSION *s, const unsigned char **tick,
-                            size_t *len);
-__owur int SSL_copy_session_id(SSL *to, const SSL *from);
-__owur X509 *SSL_SESSION_get0_peer(SSL_SESSION *s);
-__owur int SSL_SESSION_set1_id_context(SSL_SESSION *s, const unsigned char *sid_ctx,
-                                unsigned int sid_ctx_len);
-__owur int SSL_SESSION_set1_id(SSL_SESSION *s, const unsigned char *sid,
-                               unsigned int sid_len);
-
-__owur SSL_SESSION *SSL_SESSION_new(void);
-const unsigned char *SSL_SESSION_get_id(const SSL_SESSION *s,
-                                        unsigned int *len);
-const unsigned char *SSL_SESSION_get0_id_context(const SSL_SESSION *s,
-                                                unsigned int *len);
-__owur unsigned int SSL_SESSION_get_compress_id(const SSL_SESSION *s);
-# ifndef OPENSSL_NO_STDIO
-int SSL_SESSION_print_fp(FILE *fp, const SSL_SESSION *ses);
-# endif
-int SSL_SESSION_print(BIO *fp, const SSL_SESSION *ses);
-int SSL_SESSION_print_keylog(BIO *bp, const SSL_SESSION *x);
-int SSL_SESSION_up_ref(SSL_SESSION *ses);
-void SSL_SESSION_free(SSL_SESSION *ses);
-__owur int i2d_SSL_SESSION(SSL_SESSION *in, unsigned char **pp);
-__owur int SSL_set_session(SSL *to, SSL_SESSION *session);
-__owur int SSL_CTX_add_session(SSL_CTX *s, SSL_SESSION *c);
-int SSL_CTX_remove_session(SSL_CTX *, SSL_SESSION *c);
-__owur int SSL_CTX_set_generate_session_id(SSL_CTX *, GEN_SESSION_CB);
-__owur int SSL_set_generate_session_id(SSL *, GEN_SESSION_CB);
-__owur int SSL_has_matching_session_id(const SSL *ssl, const unsigned char *id,
-                                unsigned int id_len);
-SSL_SESSION *d2i_SSL_SESSION(SSL_SESSION **a, const unsigned char **pp,
-                             long length);
-
-# ifdef HEADER_X509_H
-__owur X509 *SSL_get_peer_certificate(const SSL *s);
-# endif
-
-__owur STACK_OF(X509) *SSL_get_peer_cert_chain(const SSL *s);
-
-__owur int SSL_CTX_get_verify_mode(const SSL_CTX *ctx);
-__owur int SSL_CTX_get_verify_depth(const SSL_CTX *ctx);
-__owur SSL_verify_cb SSL_CTX_get_verify_callback(const SSL_CTX *ctx);
-void SSL_CTX_set_verify(SSL_CTX *ctx, int mode, SSL_verify_cb callback);
-void SSL_CTX_set_verify_depth(SSL_CTX *ctx, int depth);
-void SSL_CTX_set_cert_verify_callback(SSL_CTX *ctx,
-                                      int (*cb) (X509_STORE_CTX *, void *),
-                                      void *arg);
-void SSL_CTX_set_cert_cb(SSL_CTX *c, int (*cb) (SSL *ssl, void *arg),
-                         void *arg);
-# ifndef OPENSSL_NO_RSA
-__owur int SSL_CTX_use_RSAPrivateKey(SSL_CTX *ctx, RSA *rsa);
-__owur int SSL_CTX_use_RSAPrivateKey_ASN1(SSL_CTX *ctx, const unsigned char *d,
-                                   long len);
-# endif
-__owur int SSL_CTX_use_PrivateKey(SSL_CTX *ctx, EVP_PKEY *pkey);
-__owur int SSL_CTX_use_PrivateKey_ASN1(int pk, SSL_CTX *ctx,
-                                const unsigned char *d, long len);
-__owur int SSL_CTX_use_certificate(SSL_CTX *ctx, X509 *x);
-__owur int SSL_CTX_use_certificate_ASN1(SSL_CTX *ctx, int len,
-                                 const unsigned char *d);
-
-void SSL_CTX_set_default_passwd_cb(SSL_CTX *ctx, pem_password_cb *cb);
-void SSL_CTX_set_default_passwd_cb_userdata(SSL_CTX *ctx, void *u);
-pem_password_cb *SSL_CTX_get_default_passwd_cb(SSL_CTX *ctx);
-void *SSL_CTX_get_default_passwd_cb_userdata(SSL_CTX *ctx);
-void SSL_set_default_passwd_cb(SSL *s, pem_password_cb *cb);
-void SSL_set_default_passwd_cb_userdata(SSL *s, void *u);
-pem_password_cb *SSL_get_default_passwd_cb(SSL *s);
-void *SSL_get_default_passwd_cb_userdata(SSL *s);
-
-__owur int SSL_CTX_check_private_key(const SSL_CTX *ctx);
-__owur int SSL_check_private_key(const SSL *ctx);
-
-__owur int SSL_CTX_set_session_id_context(SSL_CTX *ctx, const unsigned char *sid_ctx,
-                                   unsigned int sid_ctx_len);
-
-SSL *SSL_new(SSL_CTX *ctx);
-int SSL_up_ref(SSL *s);
-int SSL_is_dtls(const SSL *s);
-__owur int SSL_set_session_id_context(SSL *ssl, const unsigned char *sid_ctx,
-                               unsigned int sid_ctx_len);
-
-__owur int SSL_CTX_set_purpose(SSL_CTX *s, int purpose);
-__owur int SSL_set_purpose(SSL *s, int purpose);
-__owur int SSL_CTX_set_trust(SSL_CTX *s, int trust);
-__owur int SSL_set_trust(SSL *s, int trust);
-
-__owur int SSL_set1_host(SSL *s, const char *hostname);
-__owur int SSL_add1_host(SSL *s, const char *hostname);
-__owur const char *SSL_get0_peername(SSL *s);
-void SSL_set_hostflags(SSL *s, unsigned int flags);
-
-__owur int SSL_CTX_dane_enable(SSL_CTX *ctx);
-__owur int SSL_CTX_dane_mtype_set(SSL_CTX *ctx, const EVP_MD *md,
-                                  uint8_t mtype, uint8_t ord);
-__owur int SSL_dane_enable(SSL *s, const char *basedomain);
-__owur int SSL_dane_tlsa_add(SSL *s, uint8_t usage, uint8_t selector,
-                             uint8_t mtype, unsigned char *data, size_t dlen);
-__owur int SSL_get0_dane_authority(SSL *s, X509 **mcert, EVP_PKEY **mspki);
-__owur int SSL_get0_dane_tlsa(SSL *s, uint8_t *usage, uint8_t *selector,
-                              uint8_t *mtype, unsigned const char **data,
-                              size_t *dlen);
-/*
- * Bridge opacity barrier between libcrypt and libssl, also needed to support
- * offline testing in test/danetest.c
- */
-SSL_DANE *SSL_get0_dane(SSL *ssl);
-/*
- * DANE flags
- */
-unsigned long SSL_CTX_dane_set_flags(SSL_CTX *ctx, unsigned long flags);
-unsigned long SSL_CTX_dane_clear_flags(SSL_CTX *ctx, unsigned long flags);
-unsigned long SSL_dane_set_flags(SSL *ssl, unsigned long flags);
-unsigned long SSL_dane_clear_flags(SSL *ssl, unsigned long flags);
-
-__owur int SSL_CTX_set1_param(SSL_CTX *ctx, X509_VERIFY_PARAM *vpm);
-__owur int SSL_set1_param(SSL *ssl, X509_VERIFY_PARAM *vpm);
-
-__owur X509_VERIFY_PARAM *SSL_CTX_get0_param(SSL_CTX *ctx);
-__owur X509_VERIFY_PARAM *SSL_get0_param(SSL *ssl);
-
-# ifndef OPENSSL_NO_SRP
-int SSL_CTX_set_srp_username(SSL_CTX *ctx, char *name);
-int SSL_CTX_set_srp_password(SSL_CTX *ctx, char *password);
-int SSL_CTX_set_srp_strength(SSL_CTX *ctx, int strength);
-int SSL_CTX_set_srp_client_pwd_callback(SSL_CTX *ctx,
-                                        char *(*cb) (SSL *, void *));
-int SSL_CTX_set_srp_verify_param_callback(SSL_CTX *ctx,
-                                          int (*cb) (SSL *, void *));
-int SSL_CTX_set_srp_username_callback(SSL_CTX *ctx,
-                                      int (*cb) (SSL *, int *, void *));
-int SSL_CTX_set_srp_cb_arg(SSL_CTX *ctx, void *arg);
-
-int SSL_set_srp_server_param(SSL *s, const BIGNUM *N, const BIGNUM *g,
-                             BIGNUM *sa, BIGNUM *v, char *info);
-int SSL_set_srp_server_param_pw(SSL *s, const char *user, const char *pass,
-                                const char *grp);
-
-__owur BIGNUM *SSL_get_srp_g(SSL *s);
-__owur BIGNUM *SSL_get_srp_N(SSL *s);
-
-__owur char *SSL_get_srp_username(SSL *s);
-__owur char *SSL_get_srp_userinfo(SSL *s);
-# endif
-
-void SSL_certs_clear(SSL *s);
-void SSL_free(SSL *ssl);
-# ifdef OSSL_ASYNC_FD
-/*
- * Windows application developer has to include windows.h to use these.
- */
-__owur int SSL_waiting_for_async(SSL *s);
-__owur int SSL_get_all_async_fds(SSL *s, OSSL_ASYNC_FD *fds, size_t *numfds);
-__owur int SSL_get_changed_async_fds(SSL *s, OSSL_ASYNC_FD *addfd,
-                                     size_t *numaddfds, OSSL_ASYNC_FD *delfd,
-                                     size_t *numdelfds);
-# endif
-__owur int SSL_accept(SSL *ssl);
-__owur int SSL_connect(SSL *ssl);
-__owur int SSL_read(SSL *ssl, void *buf, int num);
-__owur int SSL_peek(SSL *ssl, void *buf, int num);
-__owur int SSL_write(SSL *ssl, const void *buf, int num);
-long SSL_ctrl(SSL *ssl, int cmd, long larg, void *parg);
-long SSL_callback_ctrl(SSL *, int, void (*)(void));
-long SSL_CTX_ctrl(SSL_CTX *ctx, int cmd, long larg, void *parg);
-long SSL_CTX_callback_ctrl(SSL_CTX *, int, void (*)(void));
-
-__owur int SSL_get_error(const SSL *s, int ret_code);
-__owur const char *SSL_get_version(const SSL *s);
-
-/* This sets the 'default' SSL version that SSL_new() will create */
-__owur int SSL_CTX_set_ssl_version(SSL_CTX *ctx, const SSL_METHOD *meth);
-
-# ifndef OPENSSL_NO_SSL3_METHOD
-DEPRECATEDIN_1_1_0(__owur const SSL_METHOD *SSLv3_method(void)) /* SSLv3 */
-DEPRECATEDIN_1_1_0(__owur const SSL_METHOD *SSLv3_server_method(void)) /* SSLv3 */
-DEPRECATEDIN_1_1_0(__owur const SSL_METHOD *SSLv3_client_method(void)) /* SSLv3 */
-# endif
-
-#define SSLv23_method           TLS_method
-#define SSLv23_server_method    TLS_server_method
-#define SSLv23_client_method    TLS_client_method
-
-/* Negotiate highest available SSL/TLS version */
-__owur const SSL_METHOD *TLS_method(void);
-__owur const SSL_METHOD *TLS_server_method(void);
-__owur const SSL_METHOD *TLS_client_method(void);
-
-# ifndef OPENSSL_NO_TLS1_METHOD
-DEPRECATEDIN_1_1_0(__owur const SSL_METHOD *TLSv1_method(void)) /* TLSv1.0 */
-DEPRECATEDIN_1_1_0(__owur const SSL_METHOD *TLSv1_server_method(void)) /* TLSv1.0 */
-DEPRECATEDIN_1_1_0(__owur const SSL_METHOD *TLSv1_client_method(void)) /* TLSv1.0 */
-# endif
-
-# ifndef OPENSSL_NO_TLS1_1_METHOD
-DEPRECATEDIN_1_1_0(__owur const SSL_METHOD *TLSv1_1_method(void)) /* TLSv1.1 */
-DEPRECATEDIN_1_1_0(__owur const SSL_METHOD *TLSv1_1_server_method(void)) /* TLSv1.1 */
-DEPRECATEDIN_1_1_0(__owur const SSL_METHOD *TLSv1_1_client_method(void)) /* TLSv1.1 */
-# endif
-
-# ifndef OPENSSL_NO_TLS1_2_METHOD
-DEPRECATEDIN_1_1_0(__owur const SSL_METHOD *TLSv1_2_method(void)) /* TLSv1.2 */
-DEPRECATEDIN_1_1_0(__owur const SSL_METHOD *TLSv1_2_server_method(void)) /* TLSv1.2 */
-DEPRECATEDIN_1_1_0(__owur const SSL_METHOD *TLSv1_2_client_method(void)) /* TLSv1.2 */
-# endif
-
-# ifndef OPENSSL_NO_DTLS1_METHOD
-DEPRECATEDIN_1_1_0(__owur const SSL_METHOD *DTLSv1_method(void)) /* DTLSv1.0 */
-DEPRECATEDIN_1_1_0(__owur const SSL_METHOD *DTLSv1_server_method(void)) /* DTLSv1.0 */
-DEPRECATEDIN_1_1_0(__owur const SSL_METHOD *DTLSv1_client_method(void)) /* DTLSv1.0 */
-# endif
-
-# ifndef OPENSSL_NO_DTLS1_2_METHOD
-DEPRECATEDIN_1_1_0(__owur const SSL_METHOD *DTLSv1_2_method(void)) /* DTLSv1.2 */
-DEPRECATEDIN_1_1_0(__owur const SSL_METHOD *DTLSv1_2_server_method(void)) /* DTLSv1.2 */
-DEPRECATEDIN_1_1_0(__owur const SSL_METHOD *DTLSv1_2_client_method(void)) /* DTLSv1.2 */
-#endif
-
-__owur const SSL_METHOD *DTLS_method(void); /* DTLS 1.0 and 1.2 */
-__owur const SSL_METHOD *DTLS_server_method(void); /* DTLS 1.0 and 1.2 */
-__owur const SSL_METHOD *DTLS_client_method(void); /* DTLS 1.0 and 1.2 */
-
-__owur STACK_OF(SSL_CIPHER) *SSL_get_ciphers(const SSL *s);
-__owur STACK_OF(SSL_CIPHER) *SSL_CTX_get_ciphers(const SSL_CTX *ctx);
-__owur STACK_OF(SSL_CIPHER) *SSL_get_client_ciphers(const SSL *s);
-__owur STACK_OF(SSL_CIPHER) *SSL_get1_supported_ciphers(SSL *s);
-
-__owur int SSL_do_handshake(SSL *s);
-int SSL_renegotiate(SSL *s);
-__owur int SSL_renegotiate_abbreviated(SSL *s);
-__owur int SSL_renegotiate_pending(SSL *s);
-int SSL_shutdown(SSL *s);
-
-__owur const SSL_METHOD *SSL_CTX_get_ssl_method(SSL_CTX *ctx);
-__owur const SSL_METHOD *SSL_get_ssl_method(SSL *s);
-__owur int SSL_set_ssl_method(SSL *s, const SSL_METHOD *method);
-__owur const char *SSL_alert_type_string_long(int value);
-__owur const char *SSL_alert_type_string(int value);
-__owur const char *SSL_alert_desc_string_long(int value);
-__owur const char *SSL_alert_desc_string(int value);
-
-void SSL_set_client_CA_list(SSL *s, STACK_OF(X509_NAME) *name_list);
-void SSL_CTX_set_client_CA_list(SSL_CTX *ctx, STACK_OF(X509_NAME) *name_list);
-__owur STACK_OF(X509_NAME) *SSL_get_client_CA_list(const SSL *s);
-__owur STACK_OF(X509_NAME) *SSL_CTX_get_client_CA_list(const SSL_CTX *s);
-__owur int SSL_add_client_CA(SSL *ssl, X509 *x);
-__owur int SSL_CTX_add_client_CA(SSL_CTX *ctx, X509 *x);
-
-void SSL_set_connect_state(SSL *s);
-void SSL_set_accept_state(SSL *s);
-
-__owur long SSL_get_default_timeout(const SSL *s);
-
-#if OPENSSL_API_COMPAT < 0x10100000L
-# define SSL_library_init() OPENSSL_init_ssl(0, NULL)
-#endif
-
-__owur char *SSL_CIPHER_description(const SSL_CIPHER *, char *buf, int size);
-__owur STACK_OF(X509_NAME) *SSL_dup_CA_list(STACK_OF(X509_NAME) *sk);
-
-__owur SSL *SSL_dup(SSL *ssl);
-
-__owur X509 *SSL_get_certificate(const SSL *ssl);
-/*
- * EVP_PKEY
- */ struct evp_pkey_st *SSL_get_privatekey(const SSL *ssl);
-
-__owur X509 *SSL_CTX_get0_certificate(const SSL_CTX *ctx);
-__owur EVP_PKEY *SSL_CTX_get0_privatekey(const SSL_CTX *ctx);
-
-void SSL_CTX_set_quiet_shutdown(SSL_CTX *ctx, int mode);
-__owur int SSL_CTX_get_quiet_shutdown(const SSL_CTX *ctx);
-void SSL_set_quiet_shutdown(SSL *ssl, int mode);
-__owur int SSL_get_quiet_shutdown(const SSL *ssl);
-void SSL_set_shutdown(SSL *ssl, int mode);
-__owur int SSL_get_shutdown(const SSL *ssl);
-__owur int SSL_version(const SSL *ssl);
-__owur int SSL_client_version(const SSL *s);
-__owur int SSL_CTX_set_default_verify_paths(SSL_CTX *ctx);
-__owur int SSL_CTX_set_default_verify_dir(SSL_CTX *ctx);
-__owur int SSL_CTX_set_default_verify_file(SSL_CTX *ctx);
-__owur int SSL_CTX_load_verify_locations(SSL_CTX *ctx, const char *CAfile,
-                                  const char *CApath);
-# define SSL_get0_session SSL_get_session/* just peek at pointer */
-__owur SSL_SESSION *SSL_get_session(const SSL *ssl);
-__owur SSL_SESSION *SSL_get1_session(SSL *ssl); /* obtain a reference count */
-__owur SSL_CTX *SSL_get_SSL_CTX(const SSL *ssl);
-SSL_CTX *SSL_set_SSL_CTX(SSL *ssl, SSL_CTX *ctx);
-void SSL_set_info_callback(SSL *ssl,
-                           void (*cb) (const SSL *ssl, int type, int val));
-void (*SSL_get_info_callback(const SSL *ssl)) (const SSL *ssl, int type,
-                                               int val);
-__owur OSSL_HANDSHAKE_STATE SSL_get_state(const SSL *ssl);
-
-void SSL_set_verify_result(SSL *ssl, long v);
-__owur long SSL_get_verify_result(const SSL *ssl);
-__owur STACK_OF(X509) *SSL_get0_verified_chain(const SSL *s);
-
-__owur size_t SSL_get_client_random(const SSL *ssl, unsigned char *out,
-                                    size_t outlen);
-__owur size_t SSL_get_server_random(const SSL *ssl, unsigned char *out,
-                                    size_t outlen);
-__owur size_t SSL_SESSION_get_master_key(const SSL_SESSION *ssl,
-                                         unsigned char *out, size_t outlen);
-
-#define SSL_get_ex_new_index(l, p, newf, dupf, freef) \
-    CRYPTO_get_ex_new_index(CRYPTO_EX_INDEX_SSL, l, p, newf, dupf, freef)
-__owur int SSL_set_ex_data(SSL *ssl, int idx, void *data);
-void *SSL_get_ex_data(const SSL *ssl, int idx);
-#define SSL_SESSION_get_ex_new_index(l, p, newf, dupf, freef) \
-    CRYPTO_get_ex_new_index(CRYPTO_EX_INDEX_SSL_SESSION, l, p, newf, dupf, freef)
-__owur int SSL_SESSION_set_ex_data(SSL_SESSION *ss, int idx, void *data);
-void *SSL_SESSION_get_ex_data(const SSL_SESSION *ss, int idx);
-#define SSL_CTX_get_ex_new_index(l, p, newf, dupf, freef) \
-    CRYPTO_get_ex_new_index(CRYPTO_EX_INDEX_SSL_CTX, l, p, newf, dupf, freef)
-__owur int SSL_CTX_set_ex_data(SSL_CTX *ssl, int idx, void *data);
-void *SSL_CTX_get_ex_data(const SSL_CTX *ssl, int idx);
-
-__owur int SSL_get_ex_data_X509_STORE_CTX_idx(void);
-
-# define SSL_CTX_sess_set_cache_size(ctx,t) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_SET_SESS_CACHE_SIZE,t,NULL)
-# define SSL_CTX_sess_get_cache_size(ctx) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_GET_SESS_CACHE_SIZE,0,NULL)
-# define SSL_CTX_set_session_cache_mode(ctx,m) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_SET_SESS_CACHE_MODE,m,NULL)
-# define SSL_CTX_get_session_cache_mode(ctx) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_GET_SESS_CACHE_MODE,0,NULL)
-
-# define SSL_CTX_get_default_read_ahead(ctx) SSL_CTX_get_read_ahead(ctx)
-# define SSL_CTX_set_default_read_ahead(ctx,m) SSL_CTX_set_read_ahead(ctx,m)
-# define SSL_CTX_get_read_ahead(ctx) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_GET_READ_AHEAD,0,NULL)
-# define SSL_CTX_set_read_ahead(ctx,m) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_SET_READ_AHEAD,m,NULL)
-# define SSL_CTX_get_max_cert_list(ctx) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_GET_MAX_CERT_LIST,0,NULL)
-# define SSL_CTX_set_max_cert_list(ctx,m) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_SET_MAX_CERT_LIST,m,NULL)
-# define SSL_get_max_cert_list(ssl) \
-        SSL_ctrl(ssl,SSL_CTRL_GET_MAX_CERT_LIST,0,NULL)
-# define SSL_set_max_cert_list(ssl,m) \
-        SSL_ctrl(ssl,SSL_CTRL_SET_MAX_CERT_LIST,m,NULL)
-
-# define SSL_CTX_set_max_send_fragment(ctx,m) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_SET_MAX_SEND_FRAGMENT,m,NULL)
-# define SSL_set_max_send_fragment(ssl,m) \
-        SSL_ctrl(ssl,SSL_CTRL_SET_MAX_SEND_FRAGMENT,m,NULL)
-# define SSL_CTX_set_split_send_fragment(ctx,m) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_SET_SPLIT_SEND_FRAGMENT,m,NULL)
-# define SSL_set_split_send_fragment(ssl,m) \
-        SSL_ctrl(ssl,SSL_CTRL_SET_SPLIT_SEND_FRAGMENT,m,NULL)
-# define SSL_CTX_set_max_pipelines(ctx,m) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_SET_MAX_PIPELINES,m,NULL)
-# define SSL_set_max_pipelines(ssl,m) \
-        SSL_ctrl(ssl,SSL_CTRL_SET_MAX_PIPELINES,m,NULL)
-
-void SSL_CTX_set_default_read_buffer_len(SSL_CTX *ctx, size_t len);
-void SSL_set_default_read_buffer_len(SSL *s, size_t len);
-
-# ifndef OPENSSL_NO_DH
-/* NB: the |keylength| is only applicable when is_export is true */
-void SSL_CTX_set_tmp_dh_callback(SSL_CTX *ctx,
-                                 DH *(*dh) (SSL *ssl, int is_export,
-                                            int keylength));
-void SSL_set_tmp_dh_callback(SSL *ssl,
-                             DH *(*dh) (SSL *ssl, int is_export,
-                                        int keylength));
-# endif
-
-__owur const COMP_METHOD *SSL_get_current_compression(SSL *s);
-__owur const COMP_METHOD *SSL_get_current_expansion(SSL *s);
-__owur const char *SSL_COMP_get_name(const COMP_METHOD *comp);
-__owur const char *SSL_COMP_get0_name(const SSL_COMP *comp);
-__owur int SSL_COMP_get_id(const SSL_COMP *comp);
-STACK_OF(SSL_COMP) *SSL_COMP_get_compression_methods(void);
-__owur STACK_OF(SSL_COMP) *SSL_COMP_set0_compression_methods(STACK_OF(SSL_COMP)
-                                                      *meths);
-#if OPENSSL_API_COMPAT < 0x10100000L
-# define SSL_COMP_free_compression_methods() while(0) continue
-#endif
-__owur int SSL_COMP_add_compression_method(int id, COMP_METHOD *cm);
-
-const SSL_CIPHER *SSL_CIPHER_find(SSL *ssl, const unsigned char *ptr);
-int SSL_CIPHER_get_cipher_nid(const SSL_CIPHER *c);
-int SSL_CIPHER_get_digest_nid(const SSL_CIPHER *c);
-
-/* TLS extensions functions */
-__owur int SSL_set_session_ticket_ext(SSL *s, void *ext_data, int ext_len);
-
-__owur int SSL_set_session_ticket_ext_cb(SSL *s, tls_session_ticket_ext_cb_fn cb,
-                                  void *arg);
-
-/* Pre-shared secret session resumption functions */
-__owur int SSL_set_session_secret_cb(SSL *s,
-                              tls_session_secret_cb_fn tls_session_secret_cb,
-                              void *arg);
-
-void SSL_CTX_set_not_resumable_session_callback(SSL_CTX *ctx,
-                                                int (*cb) (SSL *ssl,
-                                                           int
-                                                           is_forward_secure));
-
-void SSL_set_not_resumable_session_callback(SSL *ssl,
-                                            int (*cb) (SSL *ssl,
-                                                       int
-                                                       is_forward_secure));
-# if OPENSSL_API_COMPAT < 0x10100000L
-#  define SSL_cache_hit(s) SSL_session_reused(s)
-# endif
-
-__owur int SSL_session_reused(SSL *s);
-__owur int SSL_is_server(const SSL *s);
-
-__owur __owur SSL_CONF_CTX *SSL_CONF_CTX_new(void);
-int SSL_CONF_CTX_finish(SSL_CONF_CTX *cctx);
-void SSL_CONF_CTX_free(SSL_CONF_CTX *cctx);
-unsigned int SSL_CONF_CTX_set_flags(SSL_CONF_CTX *cctx, unsigned int flags);
-__owur unsigned int SSL_CONF_CTX_clear_flags(SSL_CONF_CTX *cctx, unsigned int flags);
-__owur int SSL_CONF_CTX_set1_prefix(SSL_CONF_CTX *cctx, const char *pre);
-
-void SSL_CONF_CTX_set_ssl(SSL_CONF_CTX *cctx, SSL *ssl);
-void SSL_CONF_CTX_set_ssl_ctx(SSL_CONF_CTX *cctx, SSL_CTX *ctx);
-
-__owur int SSL_CONF_cmd(SSL_CONF_CTX *cctx, const char *cmd, const char *value);
-__owur int SSL_CONF_cmd_argv(SSL_CONF_CTX *cctx, int *pargc, char ***pargv);
-__owur int SSL_CONF_cmd_value_type(SSL_CONF_CTX *cctx, const char *cmd);
-
-void SSL_add_ssl_module(void);
-int SSL_config(SSL *s, const char *name);
-int SSL_CTX_config(SSL_CTX *ctx, const char *name);
-
-# ifndef OPENSSL_NO_SSL_TRACE
-void SSL_trace(int write_p, int version, int content_type,
-               const void *buf, size_t len, SSL *ssl, void *arg);
-__owur const char *SSL_CIPHER_standard_name(const SSL_CIPHER *c);
-# endif
-
-# ifndef OPENSSL_NO_SOCK
-int DTLSv1_listen(SSL *s, BIO_ADDR *client);
-# endif
-
-# ifndef OPENSSL_NO_CT
-
-/*
- * A callback for verifying that the received SCTs are sufficient.
- * Expected to return 1 if they are sufficient, otherwise 0.
- * May return a negative integer if an error occurs.
- * A connection should be aborted if the SCTs are deemed insufficient.
- */
-typedef int(*ssl_ct_validation_cb)(const CT_POLICY_EVAL_CTX *ctx,
-                                   const STACK_OF(SCT) *scts, void *arg);
-
-/*
- * Sets a |callback| that is invoked upon receipt of ServerHelloDone to validate
- * the received SCTs.
- * If the callback returns a non-positive result, the connection is terminated.
- * Call this function before beginning a handshake.
- * If a NULL |callback| is provided, SCT validation is disabled.
- * |arg| is arbitrary userdata that will be passed to the callback whenever it
- * is invoked. Ownership of |arg| remains with the caller.
- *
- * NOTE: A side-effect of setting a CT callback is that an OCSP stapled response
- *       will be requested.
- */
-int SSL_set_ct_validation_callback(SSL *s, ssl_ct_validation_cb callback,
-                                   void *arg);
-int SSL_CTX_set_ct_validation_callback(SSL_CTX *ctx,
-                                       ssl_ct_validation_cb callback,
-                                       void *arg);
-#define SSL_disable_ct(s) \
-        ((void) SSL_set_validation_callback((s), NULL, NULL))
-#define SSL_CTX_disable_ct(ctx) \
-        ((void) SSL_CTX_set_validation_callback((ctx), NULL, NULL))
-
-/*
- * The validation type enumerates the available behaviours of the built-in SSL
- * CT validation callback selected via SSL_enable_ct() and SSL_CTX_enable_ct().
- * The underlying callback is a static function in libssl.
- */
-enum {
-    SSL_CT_VALIDATION_PERMISSIVE = 0,
-    SSL_CT_VALIDATION_STRICT
-};
-
-/*
- * Enable CT by setting up a callback that implements one of the built-in
- * validation variants.  The SSL_CT_VALIDATION_PERMISSIVE variant always
- * continues the handshake, the application can make appropriate decisions at
- * handshake completion.  The SSL_CT_VALIDATION_STRICT variant requires at
- * least one valid SCT, or else handshake termination will be requested.  The
- * handshake may continue anyway if SSL_VERIFY_NONE is in effect.
- */
-int SSL_enable_ct(SSL *s, int validation_mode);
-int SSL_CTX_enable_ct(SSL_CTX *ctx, int validation_mode);
-
-/*
- * Report whether a non-NULL callback is enabled.
- */
-int SSL_ct_is_enabled(const SSL *s);
-int SSL_CTX_ct_is_enabled(const SSL_CTX *ctx);
-
-/* Gets the SCTs received from a connection */
-const STACK_OF(SCT) *SSL_get0_peer_scts(SSL *s);
-
-/*
- * Loads the CT log list from the default location.
- * If a CTLOG_STORE has previously been set using SSL_CTX_set_ctlog_store,
- * the log information loaded from this file will be appended to the
- * CTLOG_STORE.
- * Returns 1 on success, 0 otherwise.
- */
-int SSL_CTX_set_default_ctlog_list_file(SSL_CTX *ctx);
-
-/*
- * Loads the CT log list from the specified file path.
- * If a CTLOG_STORE has previously been set using SSL_CTX_set_ctlog_store,
- * the log information loaded from this file will be appended to the
- * CTLOG_STORE.
- * Returns 1 on success, 0 otherwise.
- */
-int SSL_CTX_set_ctlog_list_file(SSL_CTX *ctx, const char *path);
-
-/*
- * Sets the CT log list used by all SSL connections created from this SSL_CTX.
- * Ownership of the CTLOG_STORE is transferred to the SSL_CTX.
- */
-void SSL_CTX_set0_ctlog_store(SSL_CTX *ctx, CTLOG_STORE *logs);
-
-/*
- * Gets the CT log list used by all SSL connections created from this SSL_CTX.
- * This will be NULL unless one of the following functions has been called:
- * - SSL_CTX_set_default_ctlog_list_file
- * - SSL_CTX_set_ctlog_list_file
- * - SSL_CTX_set_ctlog_store
- */
-const CTLOG_STORE *SSL_CTX_get0_ctlog_store(const SSL_CTX *ctx);
-
-# endif /* OPENSSL_NO_CT */
-
-/* What the "other" parameter contains in security callback */
-/* Mask for type */
-# define SSL_SECOP_OTHER_TYPE    0xffff0000
-# define SSL_SECOP_OTHER_NONE    0
-# define SSL_SECOP_OTHER_CIPHER  (1 << 16)
-# define SSL_SECOP_OTHER_CURVE   (2 << 16)
-# define SSL_SECOP_OTHER_DH      (3 << 16)
-# define SSL_SECOP_OTHER_PKEY    (4 << 16)
-# define SSL_SECOP_OTHER_SIGALG  (5 << 16)
-# define SSL_SECOP_OTHER_CERT    (6 << 16)
-
-/* Indicated operation refers to peer key or certificate */
-# define SSL_SECOP_PEER          0x1000
-
-/* Values for "op" parameter in security callback */
-
-/* Called to filter ciphers */
-/* Ciphers client supports */
-# define SSL_SECOP_CIPHER_SUPPORTED      (1 | SSL_SECOP_OTHER_CIPHER)
-/* Cipher shared by client/server */
-# define SSL_SECOP_CIPHER_SHARED         (2 | SSL_SECOP_OTHER_CIPHER)
-/* Sanity check of cipher server selects */
-# define SSL_SECOP_CIPHER_CHECK          (3 | SSL_SECOP_OTHER_CIPHER)
-/* Curves supported by client */
-# define SSL_SECOP_CURVE_SUPPORTED       (4 | SSL_SECOP_OTHER_CURVE)
-/* Curves shared by client/server */
-# define SSL_SECOP_CURVE_SHARED          (5 | SSL_SECOP_OTHER_CURVE)
-/* Sanity check of curve server selects */
-# define SSL_SECOP_CURVE_CHECK           (6 | SSL_SECOP_OTHER_CURVE)
-/* Temporary DH key */
-# define SSL_SECOP_TMP_DH                (7 | SSL_SECOP_OTHER_PKEY)
-/* SSL/TLS version */
-# define SSL_SECOP_VERSION               (9 | SSL_SECOP_OTHER_NONE)
-/* Session tickets */
-# define SSL_SECOP_TICKET                (10 | SSL_SECOP_OTHER_NONE)
-/* Supported signature algorithms sent to peer */
-# define SSL_SECOP_SIGALG_SUPPORTED      (11 | SSL_SECOP_OTHER_SIGALG)
-/* Shared signature algorithm */
-# define SSL_SECOP_SIGALG_SHARED         (12 | SSL_SECOP_OTHER_SIGALG)
-/* Sanity check signature algorithm allowed */
-# define SSL_SECOP_SIGALG_CHECK          (13 | SSL_SECOP_OTHER_SIGALG)
-/* Used to get mask of supported public key signature algorithms */
-# define SSL_SECOP_SIGALG_MASK           (14 | SSL_SECOP_OTHER_SIGALG)
-/* Use to see if compression is allowed */
-# define SSL_SECOP_COMPRESSION           (15 | SSL_SECOP_OTHER_NONE)
-/* EE key in certificate */
-# define SSL_SECOP_EE_KEY                (16 | SSL_SECOP_OTHER_CERT)
-/* CA key in certificate */
-# define SSL_SECOP_CA_KEY                (17 | SSL_SECOP_OTHER_CERT)
-/* CA digest algorithm in certificate */
-# define SSL_SECOP_CA_MD                 (18 | SSL_SECOP_OTHER_CERT)
-/* Peer EE key in certificate */
-# define SSL_SECOP_PEER_EE_KEY           (SSL_SECOP_EE_KEY | SSL_SECOP_PEER)
-/* Peer CA key in certificate */
-# define SSL_SECOP_PEER_CA_KEY           (SSL_SECOP_CA_KEY | SSL_SECOP_PEER)
-/* Peer CA digest algorithm in certificate */
-# define SSL_SECOP_PEER_CA_MD            (SSL_SECOP_CA_MD | SSL_SECOP_PEER)
-
-void SSL_set_security_level(SSL *s, int level);
-__owur int SSL_get_security_level(const SSL *s);
-void SSL_set_security_callback(SSL *s,
-                               int (*cb) (const SSL *s, const SSL_CTX *ctx, int op,
-                                          int bits, int nid, void *other,
-                                          void *ex));
-int (*SSL_get_security_callback(const SSL *s)) (const SSL *s, const SSL_CTX *ctx, int op,
-                                                int bits, int nid,
-                                                void *other, void *ex);
-void SSL_set0_security_ex_data(SSL *s, void *ex);
-__owur void *SSL_get0_security_ex_data(const SSL *s);
-
-void SSL_CTX_set_security_level(SSL_CTX *ctx, int level);
-__owur int SSL_CTX_get_security_level(const SSL_CTX *ctx);
-void SSL_CTX_set_security_callback(SSL_CTX *ctx,
-                                   int (*cb) (const SSL *s, const SSL_CTX *ctx, int op,
-                                              int bits, int nid, void *other,
-                                              void *ex));
-int (*SSL_CTX_get_security_callback(const SSL_CTX *ctx)) (const SSL *s,
-                                                          const SSL_CTX *ctx,
-                                                          int op, int bits,
-                                                          int nid,
-                                                          void *other,
-                                                          void *ex);
-void SSL_CTX_set0_security_ex_data(SSL_CTX *ctx, void *ex);
-__owur void *SSL_CTX_get0_security_ex_data(const SSL_CTX *ctx);
-
-/* OPENSSL_INIT flag 0x010000 reserved for internal use */
-#define OPENSSL_INIT_NO_LOAD_SSL_STRINGS    0x00100000L
-#define OPENSSL_INIT_LOAD_SSL_STRINGS       0x00200000L
-
-#define OPENSSL_INIT_SSL_DEFAULT \
-        (OPENSSL_INIT_LOAD_SSL_STRINGS | OPENSSL_INIT_LOAD_CRYPTO_STRINGS)
-
-int OPENSSL_init_ssl(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings);
-
-# ifndef OPENSSL_NO_UNIT_TEST
-__owur const struct openssl_ssl_test_functions *SSL_test_functions(void);
-# endif
-
-extern const char SSL_version_str;
-
-/* BEGIN ERROR CODES */
-/*
- * The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
-
-int ERR_load_SSL_strings(void);
-
-/* Error codes for the SSL functions. */
-
-/* Function codes. */
-# define SSL_F_CHECK_SUITEB_CIPHER_LIST                   331
-# define SSL_F_CT_MOVE_SCTS                               345
-# define SSL_F_CT_STRICT                                  349
-# define SSL_F_D2I_SSL_SESSION                            103
-# define SSL_F_DANE_CTX_ENABLE                            347
-# define SSL_F_DANE_MTYPE_SET                             393
-# define SSL_F_DANE_TLSA_ADD                              394
-# define SSL_F_DO_DTLS1_WRITE                             245
-# define SSL_F_DO_SSL3_WRITE                              104
-# define SSL_F_DTLS1_BUFFER_RECORD                        247
-# define SSL_F_DTLS1_CHECK_TIMEOUT_NUM                    318
-# define SSL_F_DTLS1_HEARTBEAT                            305
-# define SSL_F_DTLS1_PREPROCESS_FRAGMENT                  288
-# define SSL_F_DTLS1_PROCESS_BUFFERED_RECORDS             424
-# define SSL_F_DTLS1_PROCESS_RECORD                       257
-# define SSL_F_DTLS1_READ_BYTES                           258
-# define SSL_F_DTLS1_READ_FAILED                          339
-# define SSL_F_DTLS1_RETRANSMIT_MESSAGE                   390
-# define SSL_F_DTLS1_WRITE_APP_DATA_BYTES                 268
-# define SSL_F_DTLSV1_LISTEN                              350
-# define SSL_F_DTLS_CONSTRUCT_CHANGE_CIPHER_SPEC          371
-# define SSL_F_DTLS_CONSTRUCT_HELLO_VERIFY_REQUEST        385
-# define SSL_F_DTLS_GET_REASSEMBLED_MESSAGE               370
-# define SSL_F_DTLS_PROCESS_HELLO_VERIFY                  386
-# define SSL_F_OPENSSL_INIT_SSL                           342
-# define SSL_F_OSSL_STATEM_CLIENT_READ_TRANSITION         417
-# define SSL_F_OSSL_STATEM_SERVER_READ_TRANSITION         418
-# define SSL_F_READ_STATE_MACHINE                         352
-# define SSL_F_SSL3_CHANGE_CIPHER_STATE                   129
-# define SSL_F_SSL3_CHECK_CERT_AND_ALGORITHM              130
-# define SSL_F_SSL3_CTRL                                  213
-# define SSL_F_SSL3_CTX_CTRL                              133
-# define SSL_F_SSL3_DIGEST_CACHED_RECORDS                 293
-# define SSL_F_SSL3_DO_CHANGE_CIPHER_SPEC                 292
-# define SSL_F_SSL3_FINAL_FINISH_MAC                      285
-# define SSL_F_SSL3_GENERATE_KEY_BLOCK                    238
-# define SSL_F_SSL3_GENERATE_MASTER_SECRET                388
-# define SSL_F_SSL3_GET_RECORD                            143
-# define SSL_F_SSL3_INIT_FINISHED_MAC                     397
-# define SSL_F_SSL3_OUTPUT_CERT_CHAIN                     147
-# define SSL_F_SSL3_READ_BYTES                            148
-# define SSL_F_SSL3_READ_N                                149
-# define SSL_F_SSL3_SETUP_KEY_BLOCK                       157
-# define SSL_F_SSL3_SETUP_READ_BUFFER                     156
-# define SSL_F_SSL3_SETUP_WRITE_BUFFER                    291
-# define SSL_F_SSL3_WRITE_BYTES                           158
-# define SSL_F_SSL3_WRITE_PENDING                         159
-# define SSL_F_SSL_ADD_CERT_CHAIN                         316
-# define SSL_F_SSL_ADD_CERT_TO_BUF                        319
-# define SSL_F_SSL_ADD_CLIENTHELLO_RENEGOTIATE_EXT        298
-# define SSL_F_SSL_ADD_CLIENTHELLO_TLSEXT                 277
-# define SSL_F_SSL_ADD_CLIENTHELLO_USE_SRTP_EXT           307
-# define SSL_F_SSL_ADD_DIR_CERT_SUBJECTS_TO_STACK         215
-# define SSL_F_SSL_ADD_FILE_CERT_SUBJECTS_TO_STACK        216
-# define SSL_F_SSL_ADD_SERVERHELLO_RENEGOTIATE_EXT        299
-# define SSL_F_SSL_ADD_SERVERHELLO_TLSEXT                 278
-# define SSL_F_SSL_ADD_SERVERHELLO_USE_SRTP_EXT           308
-# define SSL_F_SSL_BAD_METHOD                             160
-# define SSL_F_SSL_BUILD_CERT_CHAIN                       332
-# define SSL_F_SSL_BYTES_TO_CIPHER_LIST                   161
-# define SSL_F_SSL_CERT_ADD0_CHAIN_CERT                   346
-# define SSL_F_SSL_CERT_DUP                               221
-# define SSL_F_SSL_CERT_NEW                               162
-# define SSL_F_SSL_CERT_SET0_CHAIN                        340
-# define SSL_F_SSL_CHECK_PRIVATE_KEY                      163
-# define SSL_F_SSL_CHECK_SERVERHELLO_TLSEXT               280
-# define SSL_F_SSL_CHECK_SRVR_ECC_CERT_AND_ALG            279
-# define SSL_F_SSL_CIPHER_PROCESS_RULESTR                 230
-# define SSL_F_SSL_CIPHER_STRENGTH_SORT                   231
-# define SSL_F_SSL_CLEAR                                  164
-# define SSL_F_SSL_COMP_ADD_COMPRESSION_METHOD            165
-# define SSL_F_SSL_CONF_CMD                               334
-# define SSL_F_SSL_CREATE_CIPHER_LIST                     166
-# define SSL_F_SSL_CTRL                                   232
-# define SSL_F_SSL_CTX_CHECK_PRIVATE_KEY                  168
-# define SSL_F_SSL_CTX_ENABLE_CT                          398
-# define SSL_F_SSL_CTX_MAKE_PROFILES                      309
-# define SSL_F_SSL_CTX_NEW                                169
-# define SSL_F_SSL_CTX_SET_ALPN_PROTOS                    343
-# define SSL_F_SSL_CTX_SET_CIPHER_LIST                    269
-# define SSL_F_SSL_CTX_SET_CLIENT_CERT_ENGINE             290
-# define SSL_F_SSL_CTX_SET_CT_VALIDATION_CALLBACK         396
-# define SSL_F_SSL_CTX_SET_SESSION_ID_CONTEXT             219
-# define SSL_F_SSL_CTX_SET_SSL_VERSION                    170
-# define SSL_F_SSL_CTX_USE_CERTIFICATE                    171
-# define SSL_F_SSL_CTX_USE_CERTIFICATE_ASN1               172
-# define SSL_F_SSL_CTX_USE_CERTIFICATE_FILE               173
-# define SSL_F_SSL_CTX_USE_PRIVATEKEY                     174
-# define SSL_F_SSL_CTX_USE_PRIVATEKEY_ASN1                175
-# define SSL_F_SSL_CTX_USE_PRIVATEKEY_FILE                176
-# define SSL_F_SSL_CTX_USE_PSK_IDENTITY_HINT              272
-# define SSL_F_SSL_CTX_USE_RSAPRIVATEKEY                  177
-# define SSL_F_SSL_CTX_USE_RSAPRIVATEKEY_ASN1             178
-# define SSL_F_SSL_CTX_USE_RSAPRIVATEKEY_FILE             179
-# define SSL_F_SSL_CTX_USE_SERVERINFO                     336
-# define SSL_F_SSL_CTX_USE_SERVERINFO_FILE                337
-# define SSL_F_SSL_DANE_DUP                               403
-# define SSL_F_SSL_DANE_ENABLE                            395
-# define SSL_F_SSL_DO_CONFIG                              391
-# define SSL_F_SSL_DO_HANDSHAKE                           180
-# define SSL_F_SSL_DUP_CA_LIST                            408
-# define SSL_F_SSL_ENABLE_CT                              402
-# define SSL_F_SSL_GET_NEW_SESSION                        181
-# define SSL_F_SSL_GET_PREV_SESSION                       217
-# define SSL_F_SSL_GET_SERVER_CERT_INDEX                  322
-# define SSL_F_SSL_GET_SIGN_PKEY                          183
-# define SSL_F_SSL_INIT_WBIO_BUFFER                       184
-# define SSL_F_SSL_LOAD_CLIENT_CA_FILE                    185
-# define SSL_F_SSL_MODULE_INIT                            392
-# define SSL_F_SSL_NEW                                    186
-# define SSL_F_SSL_PARSE_CLIENTHELLO_RENEGOTIATE_EXT      300
-# define SSL_F_SSL_PARSE_CLIENTHELLO_TLSEXT               302
-# define SSL_F_SSL_PARSE_CLIENTHELLO_USE_SRTP_EXT         310
-# define SSL_F_SSL_PARSE_SERVERHELLO_RENEGOTIATE_EXT      301
-# define SSL_F_SSL_PARSE_SERVERHELLO_TLSEXT               303
-# define SSL_F_SSL_PARSE_SERVERHELLO_USE_SRTP_EXT         311
-# define SSL_F_SSL_PEEK                                   270
-# define SSL_F_SSL_READ                                   223
-# define SSL_F_SSL_SCAN_CLIENTHELLO_TLSEXT                320
-# define SSL_F_SSL_SCAN_SERVERHELLO_TLSEXT                321
-# define SSL_F_SSL_SESSION_DUP                            348
-# define SSL_F_SSL_SESSION_NEW                            189
-# define SSL_F_SSL_SESSION_PRINT_FP                       190
-# define SSL_F_SSL_SESSION_SET1_ID                        423
-# define SSL_F_SSL_SESSION_SET1_ID_CONTEXT                312
-# define SSL_F_SSL_SET_ALPN_PROTOS                        344
-# define SSL_F_SSL_SET_CERT                               191
-# define SSL_F_SSL_SET_CIPHER_LIST                        271
-# define SSL_F_SSL_SET_CT_VALIDATION_CALLBACK             399
-# define SSL_F_SSL_SET_FD                                 192
-# define SSL_F_SSL_SET_PKEY                               193
-# define SSL_F_SSL_SET_RFD                                194
-# define SSL_F_SSL_SET_SESSION                            195
-# define SSL_F_SSL_SET_SESSION_ID_CONTEXT                 218
-# define SSL_F_SSL_SET_SESSION_TICKET_EXT                 294
-# define SSL_F_SSL_SET_WFD                                196
-# define SSL_F_SSL_SHUTDOWN                               224
-# define SSL_F_SSL_SRP_CTX_INIT                           313
-# define SSL_F_SSL_START_ASYNC_JOB                        389
-# define SSL_F_SSL_UNDEFINED_FUNCTION                     197
-# define SSL_F_SSL_UNDEFINED_VOID_FUNCTION                244
-# define SSL_F_SSL_USE_CERTIFICATE                        198
-# define SSL_F_SSL_USE_CERTIFICATE_ASN1                   199
-# define SSL_F_SSL_USE_CERTIFICATE_FILE                   200
-# define SSL_F_SSL_USE_PRIVATEKEY                         201
-# define SSL_F_SSL_USE_PRIVATEKEY_ASN1                    202
-# define SSL_F_SSL_USE_PRIVATEKEY_FILE                    203
-# define SSL_F_SSL_USE_PSK_IDENTITY_HINT                  273
-# define SSL_F_SSL_USE_RSAPRIVATEKEY                      204
-# define SSL_F_SSL_USE_RSAPRIVATEKEY_ASN1                 205
-# define SSL_F_SSL_USE_RSAPRIVATEKEY_FILE                 206
-# define SSL_F_SSL_VALIDATE_CT                            400
-# define SSL_F_SSL_VERIFY_CERT_CHAIN                      207
-# define SSL_F_SSL_WRITE                                  208
-# define SSL_F_STATE_MACHINE                              353
-# define SSL_F_TLS12_CHECK_PEER_SIGALG                    333
-# define SSL_F_TLS1_CHANGE_CIPHER_STATE                   209
-# define SSL_F_TLS1_CHECK_DUPLICATE_EXTENSIONS            341
-# define SSL_F_TLS1_ENC                                   401
-# define SSL_F_TLS1_EXPORT_KEYING_MATERIAL                314
-# define SSL_F_TLS1_GET_CURVELIST                         338
-# define SSL_F_TLS1_PRF                                   284
-# define SSL_F_TLS1_SETUP_KEY_BLOCK                       211
-# define SSL_F_TLS1_SET_SERVER_SIGALGS                    335
-# define SSL_F_TLS_CLIENT_KEY_EXCHANGE_POST_WORK          354
-# define SSL_F_TLS_CONSTRUCT_CERTIFICATE_REQUEST          372
-# define SSL_F_TLS_CONSTRUCT_CKE_DHE                      404
-# define SSL_F_TLS_CONSTRUCT_CKE_ECDHE                    405
-# define SSL_F_TLS_CONSTRUCT_CKE_GOST                     406
-# define SSL_F_TLS_CONSTRUCT_CKE_PSK_PREAMBLE             407
-# define SSL_F_TLS_CONSTRUCT_CKE_RSA                      409
-# define SSL_F_TLS_CONSTRUCT_CKE_SRP                      410
-# define SSL_F_TLS_CONSTRUCT_CLIENT_CERTIFICATE           355
-# define SSL_F_TLS_CONSTRUCT_CLIENT_HELLO                 356
-# define SSL_F_TLS_CONSTRUCT_CLIENT_KEY_EXCHANGE          357
-# define SSL_F_TLS_CONSTRUCT_CLIENT_VERIFY                358
-# define SSL_F_TLS_CONSTRUCT_FINISHED                     359
-# define SSL_F_TLS_CONSTRUCT_HELLO_REQUEST                373
-# define SSL_F_TLS_CONSTRUCT_NEW_SESSION_TICKET           428
-# define SSL_F_TLS_CONSTRUCT_SERVER_CERTIFICATE           374
-# define SSL_F_TLS_CONSTRUCT_SERVER_DONE                  375
-# define SSL_F_TLS_CONSTRUCT_SERVER_HELLO                 376
-# define SSL_F_TLS_CONSTRUCT_SERVER_KEY_EXCHANGE          377
-# define SSL_F_TLS_GET_MESSAGE_BODY                       351
-# define SSL_F_TLS_GET_MESSAGE_HEADER                     387
-# define SSL_F_TLS_POST_PROCESS_CLIENT_HELLO              378
-# define SSL_F_TLS_POST_PROCESS_CLIENT_KEY_EXCHANGE       384
-# define SSL_F_TLS_PREPARE_CLIENT_CERTIFICATE             360
-# define SSL_F_TLS_PROCESS_CERTIFICATE_REQUEST            361
-# define SSL_F_TLS_PROCESS_CERT_STATUS                    362
-# define SSL_F_TLS_PROCESS_CERT_VERIFY                    379
-# define SSL_F_TLS_PROCESS_CHANGE_CIPHER_SPEC             363
-# define SSL_F_TLS_PROCESS_CKE_DHE                        411
-# define SSL_F_TLS_PROCESS_CKE_ECDHE                      412
-# define SSL_F_TLS_PROCESS_CKE_GOST                       413
-# define SSL_F_TLS_PROCESS_CKE_PSK_PREAMBLE               414
-# define SSL_F_TLS_PROCESS_CKE_RSA                        415
-# define SSL_F_TLS_PROCESS_CKE_SRP                        416
-# define SSL_F_TLS_PROCESS_CLIENT_CERTIFICATE             380
-# define SSL_F_TLS_PROCESS_CLIENT_HELLO                   381
-# define SSL_F_TLS_PROCESS_CLIENT_KEY_EXCHANGE            382
-# define SSL_F_TLS_PROCESS_FINISHED                       364
-# define SSL_F_TLS_PROCESS_KEY_EXCHANGE                   365
-# define SSL_F_TLS_PROCESS_NEW_SESSION_TICKET             366
-# define SSL_F_TLS_PROCESS_NEXT_PROTO                     383
-# define SSL_F_TLS_PROCESS_SERVER_CERTIFICATE             367
-# define SSL_F_TLS_PROCESS_SERVER_DONE                    368
-# define SSL_F_TLS_PROCESS_SERVER_HELLO                   369
-# define SSL_F_TLS_PROCESS_SKE_DHE                        419
-# define SSL_F_TLS_PROCESS_SKE_ECDHE                      420
-# define SSL_F_TLS_PROCESS_SKE_PSK_PREAMBLE               421
-# define SSL_F_TLS_PROCESS_SKE_SRP                        422
-# define SSL_F_USE_CERTIFICATE_CHAIN_FILE                 220
-
-/* Reason codes. */
-# define SSL_R_APP_DATA_IN_HANDSHAKE                      100
-# define SSL_R_ATTEMPT_TO_REUSE_SESSION_IN_DIFFERENT_CONTEXT 272
-# define SSL_R_AT_LEAST_TLS_1_0_NEEDED_IN_FIPS_MODE       143
-# define SSL_R_AT_LEAST_TLS_1_2_NEEDED_IN_SUITEB_MODE     158
-# define SSL_R_BAD_CHANGE_CIPHER_SPEC                     103
-# define SSL_R_BAD_DATA                                   390
-# define SSL_R_BAD_DATA_RETURNED_BY_CALLBACK              106
-# define SSL_R_BAD_DECOMPRESSION                          107
-# define SSL_R_BAD_DH_VALUE                               102
-# define SSL_R_BAD_DIGEST_LENGTH                          111
-# define SSL_R_BAD_ECC_CERT                               304
-# define SSL_R_BAD_ECPOINT                                306
-# define SSL_R_BAD_HANDSHAKE_LENGTH                       332
-# define SSL_R_BAD_HELLO_REQUEST                          105
-# define SSL_R_BAD_LENGTH                                 271
-# define SSL_R_BAD_PACKET_LENGTH                          115
-# define SSL_R_BAD_PROTOCOL_VERSION_NUMBER                116
-# define SSL_R_BAD_RSA_ENCRYPT                            119
-# define SSL_R_BAD_SIGNATURE                              123
-# define SSL_R_BAD_SRP_A_LENGTH                           347
-# define SSL_R_BAD_SRP_PARAMETERS                         371
-# define SSL_R_BAD_SRTP_MKI_VALUE                         352
-# define SSL_R_BAD_SRTP_PROTECTION_PROFILE_LIST           353
-# define SSL_R_BAD_SSL_FILETYPE                           124
-# define SSL_R_BAD_VALUE                                  384
-# define SSL_R_BAD_WRITE_RETRY                            127
-# define SSL_R_BIO_NOT_SET                                128
-# define SSL_R_BLOCK_CIPHER_PAD_IS_WRONG                  129
-# define SSL_R_BN_LIB                                     130
-# define SSL_R_CA_DN_LENGTH_MISMATCH                      131
-# define SSL_R_CA_KEY_TOO_SMALL                           397
-# define SSL_R_CA_MD_TOO_WEAK                             398
-# define SSL_R_CCS_RECEIVED_EARLY                         133
-# define SSL_R_CERTIFICATE_VERIFY_FAILED                  134
-# define SSL_R_CERT_CB_ERROR                              377
-# define SSL_R_CERT_LENGTH_MISMATCH                       135
-# define SSL_R_CIPHER_CODE_WRONG_LENGTH                   137
-# define SSL_R_CIPHER_OR_HASH_UNAVAILABLE                 138
-# define SSL_R_CLIENTHELLO_TLSEXT                         226
-# define SSL_R_COMPRESSED_LENGTH_TOO_LONG                 140
-# define SSL_R_COMPRESSION_DISABLED                       343
-# define SSL_R_COMPRESSION_FAILURE                        141
-# define SSL_R_COMPRESSION_ID_NOT_WITHIN_PRIVATE_RANGE    307
-# define SSL_R_COMPRESSION_LIBRARY_ERROR                  142
-# define SSL_R_CONNECTION_TYPE_NOT_SET                    144
-# define SSL_R_CONTEXT_NOT_DANE_ENABLED                   167
-# define SSL_R_COOKIE_GEN_CALLBACK_FAILURE                400
-# define SSL_R_COOKIE_MISMATCH                            308
-# define SSL_R_CUSTOM_EXT_HANDLER_ALREADY_INSTALLED       206
-# define SSL_R_DANE_ALREADY_ENABLED                       172
-# define SSL_R_DANE_CANNOT_OVERRIDE_MTYPE_FULL            173
-# define SSL_R_DANE_NOT_ENABLED                           175
-# define SSL_R_DANE_TLSA_BAD_CERTIFICATE                  180
-# define SSL_R_DANE_TLSA_BAD_CERTIFICATE_USAGE            184
-# define SSL_R_DANE_TLSA_BAD_DATA_LENGTH                  189
-# define SSL_R_DANE_TLSA_BAD_DIGEST_LENGTH                192
-# define SSL_R_DANE_TLSA_BAD_MATCHING_TYPE                200
-# define SSL_R_DANE_TLSA_BAD_PUBLIC_KEY                   201
-# define SSL_R_DANE_TLSA_BAD_SELECTOR                     202
-# define SSL_R_DANE_TLSA_NULL_DATA                        203
-# define SSL_R_DATA_BETWEEN_CCS_AND_FINISHED              145
-# define SSL_R_DATA_LENGTH_TOO_LONG                       146
-# define SSL_R_DECRYPTION_FAILED                          147
-# define SSL_R_DECRYPTION_FAILED_OR_BAD_RECORD_MAC        281
-# define SSL_R_DH_KEY_TOO_SMALL                           394
-# define SSL_R_DH_PUBLIC_VALUE_LENGTH_IS_WRONG            148
-# define SSL_R_DIGEST_CHECK_FAILED                        149
-# define SSL_R_DTLS_MESSAGE_TOO_BIG                       334
-# define SSL_R_DUPLICATE_COMPRESSION_ID                   309
-# define SSL_R_ECC_CERT_NOT_FOR_SIGNING                   318
-# define SSL_R_ECDH_REQUIRED_FOR_SUITEB_MODE              374
-# define SSL_R_EE_KEY_TOO_SMALL                           399
-# define SSL_R_EMPTY_SRTP_PROTECTION_PROFILE_LIST         354
-# define SSL_R_ENCRYPTED_LENGTH_TOO_LONG                  150
-# define SSL_R_ERROR_IN_RECEIVED_CIPHER_LIST              151
-# define SSL_R_ERROR_SETTING_TLSA_BASE_DOMAIN             204
-# define SSL_R_EXCEEDS_MAX_FRAGMENT_SIZE                  194
-# define SSL_R_EXCESSIVE_MESSAGE_SIZE                     152
-# define SSL_R_EXTRA_DATA_IN_MESSAGE                      153
-# define SSL_R_FAILED_TO_INIT_ASYNC                       405
-# define SSL_R_FRAGMENTED_CLIENT_HELLO                    401
-# define SSL_R_GOT_A_FIN_BEFORE_A_CCS                     154
-# define SSL_R_HTTPS_PROXY_REQUEST                        155
-# define SSL_R_HTTP_REQUEST                               156
-# define SSL_R_ILLEGAL_SUITEB_DIGEST                      380
-# define SSL_R_INAPPROPRIATE_FALLBACK                     373
-# define SSL_R_INCONSISTENT_COMPRESSION                   340
-# define SSL_R_INCONSISTENT_EXTMS                         104
-# define SSL_R_INVALID_COMMAND                            280
-# define SSL_R_INVALID_COMPRESSION_ALGORITHM              341
-# define SSL_R_INVALID_CONFIGURATION_NAME                 113
-# define SSL_R_INVALID_CT_VALIDATION_TYPE                 212
-# define SSL_R_INVALID_NULL_CMD_NAME                      385
-# define SSL_R_INVALID_SEQUENCE_NUMBER                    402
-# define SSL_R_INVALID_SERVERINFO_DATA                    388
-# define SSL_R_INVALID_SRP_USERNAME                       357
-# define SSL_R_INVALID_STATUS_RESPONSE                    328
-# define SSL_R_INVALID_TICKET_KEYS_LENGTH                 325
-# define SSL_R_LENGTH_MISMATCH                            159
-# define SSL_R_LENGTH_TOO_LONG                            404
-# define SSL_R_LENGTH_TOO_SHORT                           160
-# define SSL_R_LIBRARY_BUG                                274
-# define SSL_R_LIBRARY_HAS_NO_CIPHERS                     161
-# define SSL_R_MISSING_DSA_SIGNING_CERT                   165
-# define SSL_R_MISSING_ECDSA_SIGNING_CERT                 381
-# define SSL_R_MISSING_RSA_CERTIFICATE                    168
-# define SSL_R_MISSING_RSA_ENCRYPTING_CERT                169
-# define SSL_R_MISSING_RSA_SIGNING_CERT                   170
-# define SSL_R_MISSING_SRP_PARAM                          358
-# define SSL_R_MISSING_TMP_DH_KEY                         171
-# define SSL_R_MISSING_TMP_ECDH_KEY                       311
-# define SSL_R_NO_CERTIFICATES_RETURNED                   176
-# define SSL_R_NO_CERTIFICATE_ASSIGNED                    177
-# define SSL_R_NO_CERTIFICATE_SET                         179
-# define SSL_R_NO_CIPHERS_AVAILABLE                       181
-# define SSL_R_NO_CIPHERS_SPECIFIED                       183
-# define SSL_R_NO_CIPHER_MATCH                            185
-# define SSL_R_NO_CLIENT_CERT_METHOD                      331
-# define SSL_R_NO_COMPRESSION_SPECIFIED                   187
-# define SSL_R_NO_GOST_CERTIFICATE_SENT_BY_PEER           330
-# define SSL_R_NO_METHOD_SPECIFIED                        188
-# define SSL_R_NO_PEM_EXTENSIONS                          389
-# define SSL_R_NO_PRIVATE_KEY_ASSIGNED                    190
-# define SSL_R_NO_PROTOCOLS_AVAILABLE                     191
-# define SSL_R_NO_RENEGOTIATION                           339
-# define SSL_R_NO_REQUIRED_DIGEST                         324
-# define SSL_R_NO_SHARED_CIPHER                           193
-# define SSL_R_NO_SHARED_SIGNATURE_ALGORITHMS             376
-# define SSL_R_NO_SRTP_PROFILES                           359
-# define SSL_R_NO_VALID_SCTS                              216
-# define SSL_R_NO_VERIFY_COOKIE_CALLBACK                  403
-# define SSL_R_NULL_SSL_CTX                               195
-# define SSL_R_NULL_SSL_METHOD_PASSED                     196
-# define SSL_R_OLD_SESSION_CIPHER_NOT_RETURNED            197
-# define SSL_R_OLD_SESSION_COMPRESSION_ALGORITHM_NOT_RETURNED 344
-# define SSL_R_PACKET_LENGTH_TOO_LONG                     198
-# define SSL_R_PARSE_TLSEXT                               227
-# define SSL_R_PATH_TOO_LONG                              270
-# define SSL_R_PEER_DID_NOT_RETURN_A_CERTIFICATE          199
-# define SSL_R_PEM_NAME_BAD_PREFIX                        391
-# define SSL_R_PEM_NAME_TOO_SHORT                         392
-# define SSL_R_PIPELINE_FAILURE                           406
-# define SSL_R_PROTOCOL_IS_SHUTDOWN                       207
-# define SSL_R_PSK_IDENTITY_NOT_FOUND                     223
-# define SSL_R_PSK_NO_CLIENT_CB                           224
-# define SSL_R_PSK_NO_SERVER_CB                           225
-# define SSL_R_READ_BIO_NOT_SET                           211
-# define SSL_R_READ_TIMEOUT_EXPIRED                       312
-# define SSL_R_RECORD_LENGTH_MISMATCH                     213
-# define SSL_R_RECORD_TOO_SMALL                           298
-# define SSL_R_RENEGOTIATE_EXT_TOO_LONG                   335
-# define SSL_R_RENEGOTIATION_ENCODING_ERR                 336
-# define SSL_R_RENEGOTIATION_MISMATCH                     337
-# define SSL_R_REQUIRED_CIPHER_MISSING                    215
-# define SSL_R_REQUIRED_COMPRESSION_ALGORITHM_MISSING     342
-# define SSL_R_SCSV_RECEIVED_WHEN_RENEGOTIATING           345
-# define SSL_R_SCT_VERIFICATION_FAILED                    208
-# define SSL_R_SERVERHELLO_TLSEXT                         275
-# define SSL_R_SESSION_ID_CONTEXT_UNINITIALIZED           277
-# define SSL_R_SHUTDOWN_WHILE_IN_INIT                     407
-# define SSL_R_SIGNATURE_ALGORITHMS_ERROR                 360
-# define SSL_R_SIGNATURE_FOR_NON_SIGNING_CERTIFICATE      220
-# define SSL_R_SRP_A_CALC                                 361
-# define SSL_R_SRTP_COULD_NOT_ALLOCATE_PROFILES           362
-# define SSL_R_SRTP_PROTECTION_PROFILE_LIST_TOO_LONG      363
-# define SSL_R_SRTP_UNKNOWN_PROTECTION_PROFILE            364
-# define SSL_R_SSL3_EXT_INVALID_SERVERNAME                319
-# define SSL_R_SSL3_EXT_INVALID_SERVERNAME_TYPE           320
-# define SSL_R_SSL3_SESSION_ID_TOO_LONG                   300
-# define SSL_R_SSLV3_ALERT_BAD_CERTIFICATE                1042
-# define SSL_R_SSLV3_ALERT_BAD_RECORD_MAC                 1020
-# define SSL_R_SSLV3_ALERT_CERTIFICATE_EXPIRED            1045
-# define SSL_R_SSLV3_ALERT_CERTIFICATE_REVOKED            1044
-# define SSL_R_SSLV3_ALERT_CERTIFICATE_UNKNOWN            1046
-# define SSL_R_SSLV3_ALERT_DECOMPRESSION_FAILURE          1030
-# define SSL_R_SSLV3_ALERT_HANDSHAKE_FAILURE              1040
-# define SSL_R_SSLV3_ALERT_ILLEGAL_PARAMETER              1047
-# define SSL_R_SSLV3_ALERT_NO_CERTIFICATE                 1041
-# define SSL_R_SSLV3_ALERT_UNEXPECTED_MESSAGE             1010
-# define SSL_R_SSLV3_ALERT_UNSUPPORTED_CERTIFICATE        1043
-# define SSL_R_SSL_COMMAND_SECTION_EMPTY                  117
-# define SSL_R_SSL_COMMAND_SECTION_NOT_FOUND              125
-# define SSL_R_SSL_CTX_HAS_NO_DEFAULT_SSL_VERSION         228
-# define SSL_R_SSL_HANDSHAKE_FAILURE                      229
-# define SSL_R_SSL_LIBRARY_HAS_NO_CIPHERS                 230
-# define SSL_R_SSL_NEGATIVE_LENGTH                        372
-# define SSL_R_SSL_SECTION_EMPTY                          126
-# define SSL_R_SSL_SECTION_NOT_FOUND                      136
-# define SSL_R_SSL_SESSION_ID_CALLBACK_FAILED             301
-# define SSL_R_SSL_SESSION_ID_CONFLICT                    302
-# define SSL_R_SSL_SESSION_ID_TOO_LONG                    408
-# define SSL_R_SSL_SESSION_ID_CONTEXT_TOO_LONG            273
-# define SSL_R_SSL_SESSION_ID_HAS_BAD_LENGTH              303
-# define SSL_R_SSL_SESSION_VERSION_MISMATCH               210
-# define SSL_R_TLSV1_ALERT_ACCESS_DENIED                  1049
-# define SSL_R_TLSV1_ALERT_DECODE_ERROR                   1050
-# define SSL_R_TLSV1_ALERT_DECRYPTION_FAILED              1021
-# define SSL_R_TLSV1_ALERT_DECRYPT_ERROR                  1051
-# define SSL_R_TLSV1_ALERT_EXPORT_RESTRICTION             1060
-# define SSL_R_TLSV1_ALERT_INAPPROPRIATE_FALLBACK         1086
-# define SSL_R_TLSV1_ALERT_INSUFFICIENT_SECURITY          1071
-# define SSL_R_TLSV1_ALERT_INTERNAL_ERROR                 1080
-# define SSL_R_TLSV1_ALERT_NO_RENEGOTIATION               1100
-# define SSL_R_TLSV1_ALERT_PROTOCOL_VERSION               1070
-# define SSL_R_TLSV1_ALERT_RECORD_OVERFLOW                1022
-# define SSL_R_TLSV1_ALERT_UNKNOWN_CA                     1048
-# define SSL_R_TLSV1_ALERT_USER_CANCELLED                 1090
-# define SSL_R_TLSV1_BAD_CERTIFICATE_HASH_VALUE           1114
-# define SSL_R_TLSV1_BAD_CERTIFICATE_STATUS_RESPONSE      1113
-# define SSL_R_TLSV1_CERTIFICATE_UNOBTAINABLE             1111
-# define SSL_R_TLSV1_UNRECOGNIZED_NAME                    1112
-# define SSL_R_TLSV1_UNSUPPORTED_EXTENSION                1110
-# define SSL_R_TLS_HEARTBEAT_PEER_DOESNT_ACCEPT           365
-# define SSL_R_TLS_HEARTBEAT_PENDING                      366
-# define SSL_R_TLS_ILLEGAL_EXPORTER_LABEL                 367
-# define SSL_R_TLS_INVALID_ECPOINTFORMAT_LIST             157
-# define SSL_R_TOO_MANY_WARN_ALERTS                       409
-# define SSL_R_UNABLE_TO_FIND_ECDH_PARAMETERS             314
-# define SSL_R_UNABLE_TO_FIND_PUBLIC_KEY_PARAMETERS       239
-# define SSL_R_UNABLE_TO_LOAD_SSL3_MD5_ROUTINES           242
-# define SSL_R_UNABLE_TO_LOAD_SSL3_SHA1_ROUTINES          243
-# define SSL_R_UNEXPECTED_MESSAGE                         244
-# define SSL_R_UNEXPECTED_RECORD                          245
-# define SSL_R_UNINITIALIZED                              276
-# define SSL_R_UNKNOWN_ALERT_TYPE                         246
-# define SSL_R_UNKNOWN_CERTIFICATE_TYPE                   247
-# define SSL_R_UNKNOWN_CIPHER_RETURNED                    248
-# define SSL_R_UNKNOWN_CIPHER_TYPE                        249
-# define SSL_R_UNKNOWN_CMD_NAME                           386
-# define SSL_R_UNKNOWN_COMMAND                            139
-# define SSL_R_UNKNOWN_DIGEST                             368
-# define SSL_R_UNKNOWN_KEY_EXCHANGE_TYPE                  250
-# define SSL_R_UNKNOWN_PKEY_TYPE                          251
-# define SSL_R_UNKNOWN_PROTOCOL                           252
-# define SSL_R_UNKNOWN_SSL_VERSION                        254
-# define SSL_R_UNKNOWN_STATE                              255
-# define SSL_R_UNSAFE_LEGACY_RENEGOTIATION_DISABLED       338
-# define SSL_R_UNSUPPORTED_COMPRESSION_ALGORITHM          257
-# define SSL_R_UNSUPPORTED_ELLIPTIC_CURVE                 315
-# define SSL_R_UNSUPPORTED_PROTOCOL                       258
-# define SSL_R_UNSUPPORTED_SSL_VERSION                    259
-# define SSL_R_UNSUPPORTED_STATUS_TYPE                    329
-# define SSL_R_USE_SRTP_NOT_NEGOTIATED                    369
-# define SSL_R_VERSION_TOO_HIGH                           166
-# define SSL_R_VERSION_TOO_LOW                            396
-# define SSL_R_WRONG_CERTIFICATE_TYPE                     383
-# define SSL_R_WRONG_CIPHER_RETURNED                      261
-# define SSL_R_WRONG_CURVE                                378
-# define SSL_R_WRONG_SIGNATURE_LENGTH                     264
-# define SSL_R_WRONG_SIGNATURE_SIZE                       265
-# define SSL_R_WRONG_SIGNATURE_TYPE                       370
-# define SSL_R_WRONG_SSL_VERSION                          266
-# define SSL_R_WRONG_VERSION_NUMBER                       267
-# define SSL_R_X509_LIB                                   268
-# define SSL_R_X509_VERIFICATION_SETUP_PROBLEMS           269
-
-# ifdef  __cplusplus
-}
-# endif
-#endif

gpac-2.2.1.tar.gz/extra_lib/include/openssl/ssl2.h Deleted

gpac-2.2.1.tar.gz/extra_lib/include/openssl/ssl3.h Deleted

@@ -1,310 +0,0 @@
-/*
- * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
- *
- * Licensed under the OpenSSL license (the "License").  You may not use
- * this file except in compliance with the License.  You can obtain a copy
- * in the file LICENSE in the source distribution or at
- * https://www.openssl.org/source/license.html
- */
-
-/* ====================================================================
- * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
- * ECC cipher suite support in OpenSSL originally developed by
- * SUN MICROSYSTEMS, INC., and contributed to the OpenSSL project.
- */
-
-#ifndef HEADER_SSL3_H
-# define HEADER_SSL3_H
-
-# include <openssl/comp.h>
-# include <openssl/buffer.h>
-# include <openssl/evp.h>
-# include <openssl/ssl.h>
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-/*
- * Signalling cipher suite value from RFC 5746
- * (TLS_EMPTY_RENEGOTIATION_INFO_SCSV)
- */
-# define SSL3_CK_SCSV                            0x030000FF
-
-/*
- * Signalling cipher suite value from draft-ietf-tls-downgrade-scsv-00
- * (TLS_FALLBACK_SCSV)
- */
-# define SSL3_CK_FALLBACK_SCSV                   0x03005600
-
-# define SSL3_CK_RSA_NULL_MD5                    0x03000001
-# define SSL3_CK_RSA_NULL_SHA                    0x03000002
-# define SSL3_CK_RSA_RC4_40_MD5                  0x03000003
-# define SSL3_CK_RSA_RC4_128_MD5                 0x03000004
-# define SSL3_CK_RSA_RC4_128_SHA                 0x03000005
-# define SSL3_CK_RSA_RC2_40_MD5                  0x03000006
-# define SSL3_CK_RSA_IDEA_128_SHA                0x03000007
-# define SSL3_CK_RSA_DES_40_CBC_SHA              0x03000008
-# define SSL3_CK_RSA_DES_64_CBC_SHA              0x03000009
-# define SSL3_CK_RSA_DES_192_CBC3_SHA            0x0300000A
-
-# define SSL3_CK_DH_DSS_DES_40_CBC_SHA           0x0300000B
-# define SSL3_CK_DH_DSS_DES_64_CBC_SHA           0x0300000C
-# define SSL3_CK_DH_DSS_DES_192_CBC3_SHA         0x0300000D
-# define SSL3_CK_DH_RSA_DES_40_CBC_SHA           0x0300000E
-# define SSL3_CK_DH_RSA_DES_64_CBC_SHA           0x0300000F
-# define SSL3_CK_DH_RSA_DES_192_CBC3_SHA         0x03000010
-
-# define SSL3_CK_DHE_DSS_DES_40_CBC_SHA          0x03000011
-# define SSL3_CK_EDH_DSS_DES_40_CBC_SHA          SSL3_CK_DHE_DSS_DES_40_CBC_SHA
-# define SSL3_CK_DHE_DSS_DES_64_CBC_SHA          0x03000012
-# define SSL3_CK_EDH_DSS_DES_64_CBC_SHA          SSL3_CK_DHE_DSS_DES_64_CBC_SHA
-# define SSL3_CK_DHE_DSS_DES_192_CBC3_SHA        0x03000013
-# define SSL3_CK_EDH_DSS_DES_192_CBC3_SHA        SSL3_CK_DHE_DSS_DES_192_CBC3_SHA
-# define SSL3_CK_DHE_RSA_DES_40_CBC_SHA          0x03000014
-# define SSL3_CK_EDH_RSA_DES_40_CBC_SHA          SSL3_CK_DHE_RSA_DES_40_CBC_SHA
-# define SSL3_CK_DHE_RSA_DES_64_CBC_SHA          0x03000015
-# define SSL3_CK_EDH_RSA_DES_64_CBC_SHA          SSL3_CK_DHE_RSA_DES_64_CBC_SHA
-# define SSL3_CK_DHE_RSA_DES_192_CBC3_SHA        0x03000016
-# define SSL3_CK_EDH_RSA_DES_192_CBC3_SHA        SSL3_CK_DHE_RSA_DES_192_CBC3_SHA
-
-# define SSL3_CK_ADH_RC4_40_MD5                  0x03000017
-# define SSL3_CK_ADH_RC4_128_MD5                 0x03000018
-# define SSL3_CK_ADH_DES_40_CBC_SHA              0x03000019
-# define SSL3_CK_ADH_DES_64_CBC_SHA              0x0300001A
-# define SSL3_CK_ADH_DES_192_CBC_SHA             0x0300001B
-
-# define SSL3_TXT_RSA_NULL_MD5                   "NULL-MD5"
-# define SSL3_TXT_RSA_NULL_SHA                   "NULL-SHA"
-# define SSL3_TXT_RSA_RC4_40_MD5                 "EXP-RC4-MD5"
-# define SSL3_TXT_RSA_RC4_128_MD5                "RC4-MD5"
-# define SSL3_TXT_RSA_RC4_128_SHA                "RC4-SHA"
-# define SSL3_TXT_RSA_RC2_40_MD5                 "EXP-RC2-CBC-MD5"
-# define SSL3_TXT_RSA_IDEA_128_SHA               "IDEA-CBC-SHA"
-# define SSL3_TXT_RSA_DES_40_CBC_SHA             "EXP-DES-CBC-SHA"
-# define SSL3_TXT_RSA_DES_64_CBC_SHA             "DES-CBC-SHA"
-# define SSL3_TXT_RSA_DES_192_CBC3_SHA           "DES-CBC3-SHA"
-
-# define SSL3_TXT_DH_DSS_DES_40_CBC_SHA          "EXP-DH-DSS-DES-CBC-SHA"
-# define SSL3_TXT_DH_DSS_DES_64_CBC_SHA          "DH-DSS-DES-CBC-SHA"
-# define SSL3_TXT_DH_DSS_DES_192_CBC3_SHA        "DH-DSS-DES-CBC3-SHA"
-# define SSL3_TXT_DH_RSA_DES_40_CBC_SHA          "EXP-DH-RSA-DES-CBC-SHA"
-# define SSL3_TXT_DH_RSA_DES_64_CBC_SHA          "DH-RSA-DES-CBC-SHA"
-# define SSL3_TXT_DH_RSA_DES_192_CBC3_SHA        "DH-RSA-DES-CBC3-SHA"
-
-# define SSL3_TXT_DHE_DSS_DES_40_CBC_SHA         "EXP-DHE-DSS-DES-CBC-SHA"
-# define SSL3_TXT_DHE_DSS_DES_64_CBC_SHA         "DHE-DSS-DES-CBC-SHA"
-# define SSL3_TXT_DHE_DSS_DES_192_CBC3_SHA       "DHE-DSS-DES-CBC3-SHA"
-# define SSL3_TXT_DHE_RSA_DES_40_CBC_SHA         "EXP-DHE-RSA-DES-CBC-SHA"
-# define SSL3_TXT_DHE_RSA_DES_64_CBC_SHA         "DHE-RSA-DES-CBC-SHA"
-# define SSL3_TXT_DHE_RSA_DES_192_CBC3_SHA       "DHE-RSA-DES-CBC3-SHA"
-
-/*
- * This next block of six "EDH" labels is for backward compatibility with
- * older versions of OpenSSL.  New code should use the six "DHE" labels above
- * instead:
- */
-# define SSL3_TXT_EDH_DSS_DES_40_CBC_SHA         "EXP-EDH-DSS-DES-CBC-SHA"
-# define SSL3_TXT_EDH_DSS_DES_64_CBC_SHA         "EDH-DSS-DES-CBC-SHA"
-# define SSL3_TXT_EDH_DSS_DES_192_CBC3_SHA       "EDH-DSS-DES-CBC3-SHA"
-# define SSL3_TXT_EDH_RSA_DES_40_CBC_SHA         "EXP-EDH-RSA-DES-CBC-SHA"
-# define SSL3_TXT_EDH_RSA_DES_64_CBC_SHA         "EDH-RSA-DES-CBC-SHA"
-# define SSL3_TXT_EDH_RSA_DES_192_CBC3_SHA       "EDH-RSA-DES-CBC3-SHA"
-
-# define SSL3_TXT_ADH_RC4_40_MD5                 "EXP-ADH-RC4-MD5"
-# define SSL3_TXT_ADH_RC4_128_MD5                "ADH-RC4-MD5"
-# define SSL3_TXT_ADH_DES_40_CBC_SHA             "EXP-ADH-DES-CBC-SHA"
-# define SSL3_TXT_ADH_DES_64_CBC_SHA             "ADH-DES-CBC-SHA"
-# define SSL3_TXT_ADH_DES_192_CBC_SHA            "ADH-DES-CBC3-SHA"
-
-# define SSL3_SSL_SESSION_ID_LENGTH              32
-# define SSL3_MAX_SSL_SESSION_ID_LENGTH          32
-
-# define SSL3_MASTER_SECRET_SIZE                 48
-# define SSL3_RANDOM_SIZE                        32
-# define SSL3_SESSION_ID_SIZE                    32
-# define SSL3_RT_HEADER_LENGTH                   5
-
-# define SSL3_HM_HEADER_LENGTH                  4
-
-# ifndef SSL3_ALIGN_PAYLOAD
- /*
-  * Some will argue that this increases memory footprint, but it's not
-  * actually true. Point is that malloc has to return at least 64-bit aligned
-  * pointers, meaning that allocating 5 bytes wastes 3 bytes in either case.
-  * Suggested pre-gaping simply moves these wasted bytes from the end of
-  * allocated region to its front, but makes data payload aligned, which
-  * improves performance:-)
-  */
-#  define SSL3_ALIGN_PAYLOAD                     8
-# else
-#  if (SSL3_ALIGN_PAYLOAD&(SSL3_ALIGN_PAYLOAD-1))!=0
-#   error "insane SSL3_ALIGN_PAYLOAD"
-#   undef SSL3_ALIGN_PAYLOAD
-#  endif
-# endif
-
-/*
- * This is the maximum MAC (digest) size used by the SSL library. Currently
- * maximum of 20 is used by SHA1, but we reserve for future extension for
- * 512-bit hashes.
- */
-
-# define SSL3_RT_MAX_MD_SIZE                     64
-
-/*
- * Maximum block size used in all ciphersuites. Currently 16 for AES.
- */
-
-# define SSL_RT_MAX_CIPHER_BLOCK_SIZE            16
-
-# define SSL3_RT_MAX_EXTRA                       (16384)
-
-/* Maximum plaintext length: defined by SSL/TLS standards */
-# define SSL3_RT_MAX_PLAIN_LENGTH                16384
-/* Maximum compression overhead: defined by SSL/TLS standards */
-# define SSL3_RT_MAX_COMPRESSED_OVERHEAD         1024
-
-/*
- * The standards give a maximum encryption overhead of 1024 bytes. In
- * practice the value is lower than this. The overhead is the maximum number
- * of padding bytes (256) plus the mac size.
- */
-# define SSL3_RT_MAX_ENCRYPTED_OVERHEAD  (256 + SSL3_RT_MAX_MD_SIZE)
-
-/*
- * OpenSSL currently only uses a padding length of at most one block so the
- * send overhead is smaller.
- */
-
-# define SSL3_RT_SEND_MAX_ENCRYPTED_OVERHEAD \
-                        (SSL_RT_MAX_CIPHER_BLOCK_SIZE + SSL3_RT_MAX_MD_SIZE)
-
-/* If compression isn't used don't include the compression overhead */
-
-# ifdef OPENSSL_NO_COMP
-#  define SSL3_RT_MAX_COMPRESSED_LENGTH           SSL3_RT_MAX_PLAIN_LENGTH
-# else
-#  define SSL3_RT_MAX_COMPRESSED_LENGTH   \
-                (SSL3_RT_MAX_PLAIN_LENGTH+SSL3_RT_MAX_COMPRESSED_OVERHEAD)
-# endif
-# define SSL3_RT_MAX_ENCRYPTED_LENGTH    \
-                (SSL3_RT_MAX_ENCRYPTED_OVERHEAD+SSL3_RT_MAX_COMPRESSED_LENGTH)
-# define SSL3_RT_MAX_PACKET_SIZE         \
-                (SSL3_RT_MAX_ENCRYPTED_LENGTH+SSL3_RT_HEADER_LENGTH)
-
-# define SSL3_MD_CLIENT_FINISHED_CONST   "\x43\x4C\x4E\x54"
-# define SSL3_MD_SERVER_FINISHED_CONST   "\x53\x52\x56\x52"
-
-# define SSL3_VERSION                    0x0300
-# define SSL3_VERSION_MAJOR              0x03
-# define SSL3_VERSION_MINOR              0x00
-
-# define SSL3_RT_CHANGE_CIPHER_SPEC      20
-# define SSL3_RT_ALERT                   21
-# define SSL3_RT_HANDSHAKE               22
-# define SSL3_RT_APPLICATION_DATA        23
-# define DTLS1_RT_HEARTBEAT              24
-
-/* Pseudo content types to indicate additional parameters */
-# define TLS1_RT_CRYPTO                  0x1000
-# define TLS1_RT_CRYPTO_PREMASTER        (TLS1_RT_CRYPTO | 0x1)
-# define TLS1_RT_CRYPTO_CLIENT_RANDOM    (TLS1_RT_CRYPTO | 0x2)
-# define TLS1_RT_CRYPTO_SERVER_RANDOM    (TLS1_RT_CRYPTO | 0x3)
-# define TLS1_RT_CRYPTO_MASTER           (TLS1_RT_CRYPTO | 0x4)
-
-# define TLS1_RT_CRYPTO_READ             0x0000
-# define TLS1_RT_CRYPTO_WRITE            0x0100
-# define TLS1_RT_CRYPTO_MAC              (TLS1_RT_CRYPTO | 0x5)
-# define TLS1_RT_CRYPTO_KEY              (TLS1_RT_CRYPTO | 0x6)
-# define TLS1_RT_CRYPTO_IV               (TLS1_RT_CRYPTO | 0x7)
-# define TLS1_RT_CRYPTO_FIXED_IV         (TLS1_RT_CRYPTO | 0x8)
-
-/* Pseudo content type for SSL/TLS header info */
-# define SSL3_RT_HEADER                  0x100
-
-# define SSL3_AL_WARNING                 1
-# define SSL3_AL_FATAL                   2
-
-# define SSL3_AD_CLOSE_NOTIFY             0
-# define SSL3_AD_UNEXPECTED_MESSAGE      10/* fatal */
-# define SSL3_AD_BAD_RECORD_MAC          20/* fatal */
-# define SSL3_AD_DECOMPRESSION_FAILURE   30/* fatal */
-# define SSL3_AD_HANDSHAKE_FAILURE       40/* fatal */
-# define SSL3_AD_NO_CERTIFICATE          41
-# define SSL3_AD_BAD_CERTIFICATE         42
-# define SSL3_AD_UNSUPPORTED_CERTIFICATE 43
-# define SSL3_AD_CERTIFICATE_REVOKED     44
-# define SSL3_AD_CERTIFICATE_EXPIRED     45
-# define SSL3_AD_CERTIFICATE_UNKNOWN     46
-# define SSL3_AD_ILLEGAL_PARAMETER       47/* fatal */
-
-# define TLS1_HB_REQUEST         1
-# define TLS1_HB_RESPONSE        2
-
-
-# define SSL3_CT_RSA_SIGN                        1
-# define SSL3_CT_DSS_SIGN                        2
-# define SSL3_CT_RSA_FIXED_DH                    3
-# define SSL3_CT_DSS_FIXED_DH                    4
-# define SSL3_CT_RSA_EPHEMERAL_DH                5
-# define SSL3_CT_DSS_EPHEMERAL_DH                6
-# define SSL3_CT_FORTEZZA_DMS                    20
-/*
- * SSL3_CT_NUMBER is used to size arrays and it must be large enough to
- * contain all of the cert types defined either for SSLv3 and TLSv1.
- */
-# define SSL3_CT_NUMBER                  9
-
-# define SSL3_FLAGS_NO_RENEGOTIATE_CIPHERS       0x0001
-
-/* Removed from OpenSSL 1.1.0 */
-# define TLS1_FLAGS_TLS_PADDING_BUG              0x0
-
-# define TLS1_FLAGS_SKIP_CERT_VERIFY             0x0010
-
-/* Set if we encrypt then mac instead of usual mac then encrypt */
-# define TLS1_FLAGS_ENCRYPT_THEN_MAC_READ        0x0100
-# define TLS1_FLAGS_ENCRYPT_THEN_MAC             TLS1_FLAGS_ENCRYPT_THEN_MAC_READ
-
-/* Set if extended master secret extension received from peer */
-# define TLS1_FLAGS_RECEIVED_EXTMS               0x0200
-
-# define TLS1_FLAGS_ENCRYPT_THEN_MAC_WRITE       0x0400
-
-# define SSL3_MT_HELLO_REQUEST                   0
-# define SSL3_MT_CLIENT_HELLO                    1
-# define SSL3_MT_SERVER_HELLO                    2
-# define SSL3_MT_NEWSESSION_TICKET               4
-# define SSL3_MT_CERTIFICATE                     11
-# define SSL3_MT_SERVER_KEY_EXCHANGE             12
-# define SSL3_MT_CERTIFICATE_REQUEST             13
-# define SSL3_MT_SERVER_DONE                     14
-# define SSL3_MT_CERTIFICATE_VERIFY              15
-# define SSL3_MT_CLIENT_KEY_EXCHANGE             16
-# define SSL3_MT_FINISHED                        20
-# define SSL3_MT_CERTIFICATE_STATUS              22
-# ifndef OPENSSL_NO_NEXTPROTONEG
-#  define SSL3_MT_NEXT_PROTO                      67
-# endif
-# define DTLS1_MT_HELLO_VERIFY_REQUEST    3
-
-/* Dummy message type for handling CCS like a normal handshake message */
-# define SSL3_MT_CHANGE_CIPHER_SPEC              0x0101
-
-# define SSL3_MT_CCS                             1
-
-/* These are used when changing over to a new cipher */
-# define SSL3_CC_READ            0x01
-# define SSL3_CC_WRITE           0x02
-# define SSL3_CC_CLIENT          0x10
-# define SSL3_CC_SERVER          0x20
-# define SSL3_CHANGE_CIPHER_CLIENT_WRITE (SSL3_CC_CLIENT|SSL3_CC_WRITE)
-# define SSL3_CHANGE_CIPHER_SERVER_READ  (SSL3_CC_SERVER|SSL3_CC_READ)
-# define SSL3_CHANGE_CIPHER_CLIENT_READ  (SSL3_CC_CLIENT|SSL3_CC_READ)
-# define SSL3_CHANGE_CIPHER_SERVER_WRITE (SSL3_CC_SERVER|SSL3_CC_WRITE)
-
-#ifdef  __cplusplus
-}
-#endif
-#endif

gpac-2.2.1.tar.gz/extra_lib/include/openssl/stack.h Deleted

@@ -1,78 +0,0 @@
-/*
- * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
- *
- * Licensed under the OpenSSL license (the "License").  You may not use
- * this file except in compliance with the License.  You can obtain a copy
- * in the file LICENSE in the source distribution or at
- * https://www.openssl.org/source/license.html
- */
-
-#ifndef HEADER_STACK_H
-# define HEADER_STACK_H
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-typedef struct stack_st OPENSSL_STACK; /* Use STACK_OF(...) instead */
-
-typedef int (*OPENSSL_sk_compfunc)(const void *, const void *);
-typedef void (*OPENSSL_sk_freefunc)(void *);
-typedef void *(*OPENSSL_sk_copyfunc)(const void *);
-
-int OPENSSL_sk_num(const OPENSSL_STACK *);
-void *OPENSSL_sk_value(const OPENSSL_STACK *, int);
-
-void *OPENSSL_sk_set(OPENSSL_STACK *st, int i, const void *data);
-
-OPENSSL_STACK *OPENSSL_sk_new(OPENSSL_sk_compfunc cmp);
-OPENSSL_STACK *OPENSSL_sk_new_null(void);
-void OPENSSL_sk_free(OPENSSL_STACK *);
-void OPENSSL_sk_pop_free(OPENSSL_STACK *st, void (*func) (void *));
-OPENSSL_STACK *OPENSSL_sk_deep_copy(const OPENSSL_STACK *, OPENSSL_sk_copyfunc c, OPENSSL_sk_freefunc f);
-int OPENSSL_sk_insert(OPENSSL_STACK *sk, const void *data, int where);
-void *OPENSSL_sk_delete(OPENSSL_STACK *st, int loc);
-void *OPENSSL_sk_delete_ptr(OPENSSL_STACK *st, const void *p);
-int OPENSSL_sk_find(OPENSSL_STACK *st, const void *data);
-int OPENSSL_sk_find_ex(OPENSSL_STACK *st, const void *data);
-int OPENSSL_sk_push(OPENSSL_STACK *st, const void *data);
-int OPENSSL_sk_unshift(OPENSSL_STACK *st, const void *data);
-void *OPENSSL_sk_shift(OPENSSL_STACK *st);
-void *OPENSSL_sk_pop(OPENSSL_STACK *st);
-void OPENSSL_sk_zero(OPENSSL_STACK *st);
-OPENSSL_sk_compfunc OPENSSL_sk_set_cmp_func(OPENSSL_STACK *sk, OPENSSL_sk_compfunc cmp);
-OPENSSL_STACK *OPENSSL_sk_dup(const OPENSSL_STACK *st);
-void OPENSSL_sk_sort(OPENSSL_STACK *st);
-int OPENSSL_sk_is_sorted(const OPENSSL_STACK *st);
-
-# if OPENSSL_API_COMPAT < 0x10100000L
-#  define _STACK OPENSSL_STACK
-#  define sk_num OPENSSL_sk_num
-#  define sk_value OPENSSL_sk_value
-#  define sk_set OPENSSL_sk_set
-#  define sk_new OPENSSL_sk_new
-#  define sk_new_null OPENSSL_sk_new_null
-#  define sk_free OPENSSL_sk_free
-#  define sk_pop_free OPENSSL_sk_pop_free
-#  define sk_deep_copy OPENSSL_sk_deep_copy
-#  define sk_insert OPENSSL_sk_insert
-#  define sk_delete OPENSSL_sk_delete
-#  define sk_delete_ptr OPENSSL_sk_delete_ptr
-#  define sk_find OPENSSL_sk_find
-#  define sk_find_ex OPENSSL_sk_find_ex
-#  define sk_push OPENSSL_sk_push
-#  define sk_unshift OPENSSL_sk_unshift
-#  define sk_shift OPENSSL_sk_shift
-#  define sk_pop OPENSSL_sk_pop
-#  define sk_zero OPENSSL_sk_zero
-#  define sk_set_cmp_func OPENSSL_sk_set_cmp_func
-#  define sk_dup OPENSSL_sk_dup
-#  define sk_sort OPENSSL_sk_sort
-#  define sk_is_sorted OPENSSL_sk_is_sorted
-# endif
-
-#ifdef  __cplusplus
-}
-#endif
-
-#endif

gpac-2.2.1.tar.gz/extra_lib/include/openssl/symhacks.h Deleted

@@ -1,52 +0,0 @@
-/*
- * Copyright 1999-2016 The OpenSSL Project Authors. All Rights Reserved.
- *
- * Licensed under the OpenSSL license (the "License").  You may not use
- * this file except in compliance with the License.  You can obtain a copy
- * in the file LICENSE in the source distribution or at
- * https://www.openssl.org/source/license.html
- */
-
-#ifndef HEADER_SYMHACKS_H
-# define HEADER_SYMHACKS_H
-
-# include <openssl/e_os2.h>
-
-/* Case insensitive linking causes problems.... */
-# if defined(OPENSSL_SYS_VMS)
-#  undef ERR_load_CRYPTO_strings
-#  define ERR_load_CRYPTO_strings                 ERR_load_CRYPTOlib_strings
-#  undef OCSP_crlID_new
-#  define OCSP_crlID_new                          OCSP_crlID2_new
-
-#  undef d2i_ECPARAMETERS
-#  define d2i_ECPARAMETERS                        d2i_UC_ECPARAMETERS
-#  undef i2d_ECPARAMETERS
-#  define i2d_ECPARAMETERS                        i2d_UC_ECPARAMETERS
-#  undef d2i_ECPKPARAMETERS
-#  define d2i_ECPKPARAMETERS                      d2i_UC_ECPKPARAMETERS
-#  undef i2d_ECPKPARAMETERS
-#  define i2d_ECPKPARAMETERS                      i2d_UC_ECPKPARAMETERS
-
-/*
- * These functions do not seem to exist! However, I'm paranoid... Original
- * command in x509v3.h: These functions are being redefined in another
- * directory, and clash when the linker is case-insensitive, so let's hide
- * them a little, by giving them an extra 'o' at the beginning of the name...
- */
-#  undef X509v3_cleanup_extensions
-#  define X509v3_cleanup_extensions               oX509v3_cleanup_extensions
-#  undef X509v3_add_extension
-#  define X509v3_add_extension                    oX509v3_add_extension
-#  undef X509v3_add_netscape_extensions
-#  define X509v3_add_netscape_extensions          oX509v3_add_netscape_extensions
-#  undef X509v3_add_standard_extensions
-#  define X509v3_add_standard_extensions          oX509v3_add_standard_extensions
-
-/* This one clashes with CMS_data_create */
-#  undef cms_Data_create
-#  define cms_Data_create                         priv_cms_Data_create
-
-# endif
-
-#endif                          /* ! defined HEADER_VMS_IDHACKS_H */

gpac-2.2.1.tar.gz/extra_lib/include/openssl/tls1.h Deleted

@@ -1,972 +0,0 @@
-/*
- * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
- *
- * Licensed under the OpenSSL license (the "License").  You may not use
- * this file except in compliance with the License.  You can obtain a copy
- * in the file LICENSE in the source distribution or at
- * https://www.openssl.org/source/license.html
- */
-
-/* ====================================================================
- * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
- *
- * Portions of the attached software ("Contribution") are developed by
- * SUN MICROSYSTEMS, INC., and are contributed to the OpenSSL project.
- *
- * The Contribution is licensed pursuant to the OpenSSL open source
- * license provided above.
- *
- * ECC cipher suite support in OpenSSL originally written by
- * Vipul Gupta and Sumit Gupta of Sun Microsystems Laboratories.
- *
- */
-/* ====================================================================
- * Copyright 2005 Nokia. All rights reserved.
- *
- * The portions of the attached software ("Contribution") is developed by
- * Nokia Corporation and is licensed pursuant to the OpenSSL open source
- * license.
- *
- * The Contribution, originally written by Mika Kousa and Pasi Eronen of
- * Nokia Corporation, consists of the "PSK" (Pre-Shared Key) ciphersuites
- * support (see RFC 4279) to OpenSSL.
- *
- * No patent licenses or other rights except those expressly stated in
- * the OpenSSL open source license shall be deemed granted or received
- * expressly, by implication, estoppel, or otherwise.
- *
- * No assurances are provided by Nokia that the Contribution does not
- * infringe the patent or other intellectual property rights of any third
- * party or that the license provides you with all the necessary rights
- * to make use of the Contribution.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND. IN
- * ADDITION TO THE DISCLAIMERS INCLUDED IN THE LICENSE, NOKIA
- * SPECIFICALLY DISCLAIMS ANY LIABILITY FOR CLAIMS BROUGHT BY YOU OR ANY
- * OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS OR
- * OTHERWISE.
- */
-
-#ifndef HEADER_TLS1_H
-# define HEADER_TLS1_H
-
-# include <openssl/buffer.h>
-# include <openssl/x509.h>
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-/* Default security level if not overridden at config time */
-# ifndef OPENSSL_TLS_SECURITY_LEVEL
-#  define OPENSSL_TLS_SECURITY_LEVEL 1
-# endif
-
-# define TLS1_VERSION                    0x0301
-# define TLS1_1_VERSION                  0x0302
-# define TLS1_2_VERSION                  0x0303
-# define TLS_MAX_VERSION                 TLS1_2_VERSION
-
-/* Special value for method supporting multiple versions */
-# define TLS_ANY_VERSION                 0x10000
-
-# define TLS1_VERSION_MAJOR              0x03
-# define TLS1_VERSION_MINOR              0x01
-
-# define TLS1_1_VERSION_MAJOR            0x03
-# define TLS1_1_VERSION_MINOR            0x02
-
-# define TLS1_2_VERSION_MAJOR            0x03
-# define TLS1_2_VERSION_MINOR            0x03
-
-# define TLS1_get_version(s) \
-                ((SSL_version(s) >> 8) == TLS1_VERSION_MAJOR ? SSL_version(s) : 0)
-
-# define TLS1_get_client_version(s) \
-                ((SSL_client_version(s) >> 8) == TLS1_VERSION_MAJOR ? SSL_client_version(s) : 0)
-
-# define TLS1_AD_DECRYPTION_FAILED       21
-# define TLS1_AD_RECORD_OVERFLOW         22
-# define TLS1_AD_UNKNOWN_CA              48/* fatal */
-# define TLS1_AD_ACCESS_DENIED           49/* fatal */
-# define TLS1_AD_DECODE_ERROR            50/* fatal */
-# define TLS1_AD_DECRYPT_ERROR           51
-# define TLS1_AD_EXPORT_RESTRICTION      60/* fatal */
-# define TLS1_AD_PROTOCOL_VERSION        70/* fatal */
-# define TLS1_AD_INSUFFICIENT_SECURITY   71/* fatal */
-# define TLS1_AD_INTERNAL_ERROR          80/* fatal */
-# define TLS1_AD_INAPPROPRIATE_FALLBACK  86/* fatal */
-# define TLS1_AD_USER_CANCELLED          90
-# define TLS1_AD_NO_RENEGOTIATION        100
-/* codes 110-114 are from RFC3546 */
-# define TLS1_AD_UNSUPPORTED_EXTENSION   110
-# define TLS1_AD_CERTIFICATE_UNOBTAINABLE 111
-# define TLS1_AD_UNRECOGNIZED_NAME       112
-# define TLS1_AD_BAD_CERTIFICATE_STATUS_RESPONSE 113
-# define TLS1_AD_BAD_CERTIFICATE_HASH_VALUE 114
-# define TLS1_AD_UNKNOWN_PSK_IDENTITY    115/* fatal */
-# define TLS1_AD_NO_APPLICATION_PROTOCOL 120 /* fatal */
-
-/* ExtensionType values from RFC3546 / RFC4366 / RFC6066 */
-# define TLSEXT_TYPE_server_name                 0
-# define TLSEXT_TYPE_max_fragment_length         1
-# define TLSEXT_TYPE_client_certificate_url      2
-# define TLSEXT_TYPE_trusted_ca_keys             3
-# define TLSEXT_TYPE_truncated_hmac              4
-# define TLSEXT_TYPE_status_request              5
-/* ExtensionType values from RFC4681 */
-# define TLSEXT_TYPE_user_mapping                6
-/* ExtensionType values from RFC5878 */
-# define TLSEXT_TYPE_client_authz                7
-# define TLSEXT_TYPE_server_authz                8
-/* ExtensionType values from RFC6091 */
-# define TLSEXT_TYPE_cert_type           9
-
-/* ExtensionType values from RFC4492 */
-# define TLSEXT_TYPE_elliptic_curves             10
-# define TLSEXT_TYPE_ec_point_formats            11
-
-/* ExtensionType value from RFC5054 */
-# define TLSEXT_TYPE_srp                         12
-
-/* ExtensionType values from RFC5246 */
-# define TLSEXT_TYPE_signature_algorithms        13
-
-/* ExtensionType value from RFC5764 */
-# define TLSEXT_TYPE_use_srtp    14
-
-/* ExtensionType value from RFC5620 */
-# define TLSEXT_TYPE_heartbeat   15
-
-/* ExtensionType value from RFC7301 */
-# define TLSEXT_TYPE_application_layer_protocol_negotiation 16
-
-/*
- * Extension type for Certificate Transparency
- * https://tools.ietf.org/html/rfc6962#section-3.3.1
- */
-# define TLSEXT_TYPE_signed_certificate_timestamp    18
-
-/*
- * ExtensionType value for TLS padding extension.
- * http://tools.ietf.org/html/draft-agl-tls-padding
- */
-# define TLSEXT_TYPE_padding     21
-
-/* ExtensionType value from RFC7366 */
-# define TLSEXT_TYPE_encrypt_then_mac    22
-
-/* ExtensionType value from RFC7627 */
-# define TLSEXT_TYPE_extended_master_secret      23
-
-/* ExtensionType value from RFC4507 */
-# define TLSEXT_TYPE_session_ticket              35
-
-/* Temporary extension type */
-# define TLSEXT_TYPE_renegotiate                 0xff01
-
-# ifndef OPENSSL_NO_NEXTPROTONEG
-/* This is not an IANA defined extension number */
-#  define TLSEXT_TYPE_next_proto_neg              13172
-# endif
-
-/* NameType value from RFC3546 */
-# define TLSEXT_NAMETYPE_host_name 0
-/* status request value from RFC3546 */
-# define TLSEXT_STATUSTYPE_ocsp 1
-
-/* ECPointFormat values from RFC4492 */
-# define TLSEXT_ECPOINTFORMAT_first                      0
-# define TLSEXT_ECPOINTFORMAT_uncompressed               0
-# define TLSEXT_ECPOINTFORMAT_ansiX962_compressed_prime  1
-# define TLSEXT_ECPOINTFORMAT_ansiX962_compressed_char2  2
-# define TLSEXT_ECPOINTFORMAT_last                       2
-
-/* Signature and hash algorithms from RFC5246 */
-# define TLSEXT_signature_anonymous                      0
-# define TLSEXT_signature_rsa                            1
-# define TLSEXT_signature_dsa                            2
-# define TLSEXT_signature_ecdsa                          3
-# define TLSEXT_signature_gostr34102001                  237
-# define TLSEXT_signature_gostr34102012_256              238
-# define TLSEXT_signature_gostr34102012_512              239
-
-/* Total number of different signature algorithms */
-# define TLSEXT_signature_num                            7
-
-# define TLSEXT_hash_none                                0
-# define TLSEXT_hash_md5                                 1
-# define TLSEXT_hash_sha1                                2
-# define TLSEXT_hash_sha224                              3
-# define TLSEXT_hash_sha256                              4
-# define TLSEXT_hash_sha384                              5
-# define TLSEXT_hash_sha512                              6
-# define TLSEXT_hash_gostr3411                           237
-# define TLSEXT_hash_gostr34112012_256                   238
-# define TLSEXT_hash_gostr34112012_512                   239
-
-/* Total number of different digest algorithms */
-
-# define TLSEXT_hash_num                                 10
-
-/* Flag set for unrecognised algorithms */
-# define TLSEXT_nid_unknown                              0x1000000
-
-/* ECC curves */
-
-# define TLSEXT_curve_P_256                              23
-# define TLSEXT_curve_P_384                              24
-
-# define TLSEXT_MAXLEN_host_name 255
-
-__owur const char *SSL_get_servername(const SSL *s, const int type);
-__owur int SSL_get_servername_type(const SSL *s);
-/*
- * SSL_export_keying_material exports a value derived from the master secret,
- * as specified in RFC 5705. It writes |olen| bytes to |out| given a label and
- * optional context. (Since a zero length context is allowed, the |use_context|
- * flag controls whether a context is included.) It returns 1 on success and
- * zero otherwise.
- */
-__owur int SSL_export_keying_material(SSL *s, unsigned char *out, size_t olen,
-                               const char *label, size_t llen,
-                               const unsigned char *p, size_t plen,
-                               int use_context);
-
-int SSL_get_sigalgs(SSL *s, int idx,
-                    int *psign, int *phash, int *psignandhash,
-                    unsigned char *rsig, unsigned char *rhash);
-
-int SSL_get_shared_sigalgs(SSL *s, int idx,
-                           int *psign, int *phash, int *psignandhash,
-                           unsigned char *rsig, unsigned char *rhash);
-
-__owur int SSL_check_chain(SSL *s, X509 *x, EVP_PKEY *pk, STACK_OF(X509) *chain);
-
-# define SSL_set_tlsext_host_name(s,name) \
-SSL_ctrl(s,SSL_CTRL_SET_TLSEXT_HOSTNAME,TLSEXT_NAMETYPE_host_name,(char *)name)
-
-# define SSL_set_tlsext_debug_callback(ssl, cb) \
-SSL_callback_ctrl(ssl,SSL_CTRL_SET_TLSEXT_DEBUG_CB,(void (*)(void))cb)
-
-# define SSL_set_tlsext_debug_arg(ssl, arg) \
-SSL_ctrl(ssl,SSL_CTRL_SET_TLSEXT_DEBUG_ARG,0, (void *)arg)
-
-# define SSL_get_tlsext_status_type(ssl) \
-SSL_ctrl(ssl,SSL_CTRL_GET_TLSEXT_STATUS_REQ_TYPE,0, NULL)
-
-# define SSL_set_tlsext_status_type(ssl, type) \
-SSL_ctrl(ssl,SSL_CTRL_SET_TLSEXT_STATUS_REQ_TYPE,type, NULL)
-
-# define SSL_get_tlsext_status_exts(ssl, arg) \
-SSL_ctrl(ssl,SSL_CTRL_GET_TLSEXT_STATUS_REQ_EXTS,0, (void *)arg)
-
-# define SSL_set_tlsext_status_exts(ssl, arg) \
-SSL_ctrl(ssl,SSL_CTRL_SET_TLSEXT_STATUS_REQ_EXTS,0, (void *)arg)
-
-# define SSL_get_tlsext_status_ids(ssl, arg) \
-SSL_ctrl(ssl,SSL_CTRL_GET_TLSEXT_STATUS_REQ_IDS,0, (void *)arg)
-
-# define SSL_set_tlsext_status_ids(ssl, arg) \
-SSL_ctrl(ssl,SSL_CTRL_SET_TLSEXT_STATUS_REQ_IDS,0, (void *)arg)
-
-# define SSL_get_tlsext_status_ocsp_resp(ssl, arg) \
-SSL_ctrl(ssl,SSL_CTRL_GET_TLSEXT_STATUS_REQ_OCSP_RESP,0, (void *)arg)
-
-# define SSL_set_tlsext_status_ocsp_resp(ssl, arg, arglen) \
-SSL_ctrl(ssl,SSL_CTRL_SET_TLSEXT_STATUS_REQ_OCSP_RESP,arglen, (void *)arg)
-
-# define SSL_CTX_set_tlsext_servername_callback(ctx, cb) \
-SSL_CTX_callback_ctrl(ctx,SSL_CTRL_SET_TLSEXT_SERVERNAME_CB,(void (*)(void))cb)
-
-# define SSL_TLSEXT_ERR_OK 0
-# define SSL_TLSEXT_ERR_ALERT_WARNING 1
-# define SSL_TLSEXT_ERR_ALERT_FATAL 2
-# define SSL_TLSEXT_ERR_NOACK 3
-
-# define SSL_CTX_set_tlsext_servername_arg(ctx, arg) \
-SSL_CTX_ctrl(ctx,SSL_CTRL_SET_TLSEXT_SERVERNAME_ARG,0, (void *)arg)
-
-# define SSL_CTX_get_tlsext_ticket_keys(ctx, keys, keylen) \
-        SSL_CTX_ctrl((ctx),SSL_CTRL_GET_TLSEXT_TICKET_KEYS,(keylen),(keys))
-# define SSL_CTX_set_tlsext_ticket_keys(ctx, keys, keylen) \
-        SSL_CTX_ctrl((ctx),SSL_CTRL_SET_TLSEXT_TICKET_KEYS,(keylen),(keys))
-
-# define SSL_CTX_get_tlsext_status_cb(ssl, cb) \
-SSL_CTX_ctrl(ssl,SSL_CTRL_GET_TLSEXT_STATUS_REQ_CB,0, (void (**)(void))cb)
-# define SSL_CTX_set_tlsext_status_cb(ssl, cb) \
-SSL_CTX_callback_ctrl(ssl,SSL_CTRL_SET_TLSEXT_STATUS_REQ_CB,(void (*)(void))cb)
-
-# define SSL_CTX_get_tlsext_status_arg(ssl, arg) \
-SSL_CTX_ctrl(ssl,SSL_CTRL_GET_TLSEXT_STATUS_REQ_CB_ARG,0, (void *)arg
-# define SSL_CTX_set_tlsext_status_arg(ssl, arg) \
-SSL_CTX_ctrl(ssl,SSL_CTRL_SET_TLSEXT_STATUS_REQ_CB_ARG,0, (void *)arg)
-
-#define SSL_CTX_set_tlsext_status_type(ssl, type) \
-        SSL_CTX_ctrl(ssl, SSL_CTRL_SET_TLSEXT_STATUS_REQ_TYPE, type, NULL)
-
-#define SSL_CTX_get_tlsext_status_type(ssl) \
-        SSL_CTX_ctrl(ssl, SSL_CTRL_GET_TLSEXT_STATUS_REQ_TYPE, 0, NULL)
-
-# define SSL_CTX_set_tlsext_ticket_key_cb(ssl, cb) \
-SSL_CTX_callback_ctrl(ssl,SSL_CTRL_SET_TLSEXT_TICKET_KEY_CB,(void (*)(void))cb)
-
-# ifndef OPENSSL_NO_HEARTBEATS
-#  define SSL_DTLSEXT_HB_ENABLED                   0x01
-#  define SSL_DTLSEXT_HB_DONT_SEND_REQUESTS        0x02
-#  define SSL_DTLSEXT_HB_DONT_RECV_REQUESTS        0x04
-#  define SSL_get_dtlsext_heartbeat_pending(ssl) \
-        SSL_ctrl((ssl),SSL_CTRL_GET_DTLS_EXT_HEARTBEAT_PENDING,0,NULL)
-#  define SSL_set_dtlsext_heartbeat_no_requests(ssl, arg) \
-        SSL_ctrl((ssl),SSL_CTRL_SET_DTLS_EXT_HEARTBEAT_NO_REQUESTS,arg,NULL)
-
-#  if OPENSSL_API_COMPAT < 0x10100000L
-#   define SSL_CTRL_TLS_EXT_SEND_HEARTBEAT \
-        SSL_CTRL_DTLS_EXT_SEND_HEARTBEAT
-#   define SSL_CTRL_GET_TLS_EXT_HEARTBEAT_PENDING \
-        SSL_CTRL_GET_DTLS_EXT_HEARTBEAT_PENDING
-#   define SSL_CTRL_SET_TLS_EXT_HEARTBEAT_NO_REQUESTS \
-        SSL_CTRL_SET_DTLS_EXT_HEARTBEAT_NO_REQUESTS
-#   define SSL_TLSEXT_HB_ENABLED \
-        SSL_DTLSEXT_HB_ENABLED
-#   define SSL_TLSEXT_HB_DONT_SEND_REQUESTS \
-        SSL_DTLSEXT_HB_DONT_SEND_REQUESTS
-#   define SSL_TLSEXT_HB_DONT_RECV_REQUESTS \
-        SSL_DTLSEXT_HB_DONT_RECV_REQUESTS
-#   define SSL_get_tlsext_heartbeat_pending(ssl) \
-        SSL_get_dtlsext_heartbeat_pending(ssl)
-#   define SSL_set_tlsext_heartbeat_no_requests(ssl, arg) \
-        SSL_set_dtlsext_heartbeat_no_requests(ssl, arg)
-#  endif
-# endif
-
-/* PSK ciphersuites from 4279 */
-# define TLS1_CK_PSK_WITH_RC4_128_SHA                    0x0300008A
-# define TLS1_CK_PSK_WITH_3DES_EDE_CBC_SHA               0x0300008B
-# define TLS1_CK_PSK_WITH_AES_128_CBC_SHA                0x0300008C
-# define TLS1_CK_PSK_WITH_AES_256_CBC_SHA                0x0300008D
-
-# define TLS1_CK_DHE_PSK_WITH_RC4_128_SHA                0x0300008E
-# define TLS1_CK_DHE_PSK_WITH_3DES_EDE_CBC_SHA           0x0300008F
-# define TLS1_CK_DHE_PSK_WITH_AES_128_CBC_SHA            0x03000090
-# define TLS1_CK_DHE_PSK_WITH_AES_256_CBC_SHA            0x03000091
-
-# define TLS1_CK_RSA_PSK_WITH_RC4_128_SHA                0x03000092
-# define TLS1_CK_RSA_PSK_WITH_3DES_EDE_CBC_SHA           0x03000093
-# define TLS1_CK_RSA_PSK_WITH_AES_128_CBC_SHA            0x03000094
-# define TLS1_CK_RSA_PSK_WITH_AES_256_CBC_SHA            0x03000095
-
-/* PSK ciphersuites from 5487 */
-# define TLS1_CK_PSK_WITH_AES_128_GCM_SHA256             0x030000A8
-# define TLS1_CK_PSK_WITH_AES_256_GCM_SHA384             0x030000A9
-# define TLS1_CK_DHE_PSK_WITH_AES_128_GCM_SHA256         0x030000AA
-# define TLS1_CK_DHE_PSK_WITH_AES_256_GCM_SHA384         0x030000AB
-# define TLS1_CK_RSA_PSK_WITH_AES_128_GCM_SHA256         0x030000AC
-# define TLS1_CK_RSA_PSK_WITH_AES_256_GCM_SHA384         0x030000AD
-
-# define TLS1_CK_PSK_WITH_AES_128_CBC_SHA256             0x030000AE
-# define TLS1_CK_PSK_WITH_AES_256_CBC_SHA384             0x030000AF
-# define TLS1_CK_PSK_WITH_NULL_SHA256                    0x030000B0
-# define TLS1_CK_PSK_WITH_NULL_SHA384                    0x030000B1
-
-# define TLS1_CK_DHE_PSK_WITH_AES_128_CBC_SHA256         0x030000B2
-# define TLS1_CK_DHE_PSK_WITH_AES_256_CBC_SHA384         0x030000B3
-# define TLS1_CK_DHE_PSK_WITH_NULL_SHA256                0x030000B4
-# define TLS1_CK_DHE_PSK_WITH_NULL_SHA384                0x030000B5
-
-# define TLS1_CK_RSA_PSK_WITH_AES_128_CBC_SHA256         0x030000B6
-# define TLS1_CK_RSA_PSK_WITH_AES_256_CBC_SHA384         0x030000B7
-# define TLS1_CK_RSA_PSK_WITH_NULL_SHA256                0x030000B8
-# define TLS1_CK_RSA_PSK_WITH_NULL_SHA384                0x030000B9
-
-/* NULL PSK ciphersuites from RFC4785 */
-# define TLS1_CK_PSK_WITH_NULL_SHA                       0x0300002C
-# define TLS1_CK_DHE_PSK_WITH_NULL_SHA                   0x0300002D
-# define TLS1_CK_RSA_PSK_WITH_NULL_SHA                   0x0300002E
-
-/* AES ciphersuites from RFC3268 */
-# define TLS1_CK_RSA_WITH_AES_128_SHA                    0x0300002F
-# define TLS1_CK_DH_DSS_WITH_AES_128_SHA                 0x03000030
-# define TLS1_CK_DH_RSA_WITH_AES_128_SHA                 0x03000031
-# define TLS1_CK_DHE_DSS_WITH_AES_128_SHA                0x03000032
-# define TLS1_CK_DHE_RSA_WITH_AES_128_SHA                0x03000033
-# define TLS1_CK_ADH_WITH_AES_128_SHA                    0x03000034
-
-# define TLS1_CK_RSA_WITH_AES_256_SHA                    0x03000035
-# define TLS1_CK_DH_DSS_WITH_AES_256_SHA                 0x03000036
-# define TLS1_CK_DH_RSA_WITH_AES_256_SHA                 0x03000037
-# define TLS1_CK_DHE_DSS_WITH_AES_256_SHA                0x03000038
-# define TLS1_CK_DHE_RSA_WITH_AES_256_SHA                0x03000039
-# define TLS1_CK_ADH_WITH_AES_256_SHA                    0x0300003A
-
-/* TLS v1.2 ciphersuites */
-# define TLS1_CK_RSA_WITH_NULL_SHA256                    0x0300003B
-# define TLS1_CK_RSA_WITH_AES_128_SHA256                 0x0300003C
-# define TLS1_CK_RSA_WITH_AES_256_SHA256                 0x0300003D
-# define TLS1_CK_DH_DSS_WITH_AES_128_SHA256              0x0300003E
-# define TLS1_CK_DH_RSA_WITH_AES_128_SHA256              0x0300003F
-# define TLS1_CK_DHE_DSS_WITH_AES_128_SHA256             0x03000040
-
-/* Camellia ciphersuites from RFC4132 */
-# define TLS1_CK_RSA_WITH_CAMELLIA_128_CBC_SHA           0x03000041
-# define TLS1_CK_DH_DSS_WITH_CAMELLIA_128_CBC_SHA        0x03000042
-# define TLS1_CK_DH_RSA_WITH_CAMELLIA_128_CBC_SHA        0x03000043
-# define TLS1_CK_DHE_DSS_WITH_CAMELLIA_128_CBC_SHA       0x03000044
-# define TLS1_CK_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA       0x03000045
-# define TLS1_CK_ADH_WITH_CAMELLIA_128_CBC_SHA           0x03000046
-
-/* TLS v1.2 ciphersuites */
-# define TLS1_CK_DHE_RSA_WITH_AES_128_SHA256             0x03000067
-# define TLS1_CK_DH_DSS_WITH_AES_256_SHA256              0x03000068
-# define TLS1_CK_DH_RSA_WITH_AES_256_SHA256              0x03000069
-# define TLS1_CK_DHE_DSS_WITH_AES_256_SHA256             0x0300006A
-# define TLS1_CK_DHE_RSA_WITH_AES_256_SHA256             0x0300006B
-# define TLS1_CK_ADH_WITH_AES_128_SHA256                 0x0300006C
-# define TLS1_CK_ADH_WITH_AES_256_SHA256                 0x0300006D
-
-/* Camellia ciphersuites from RFC4132 */
-# define TLS1_CK_RSA_WITH_CAMELLIA_256_CBC_SHA           0x03000084
-# define TLS1_CK_DH_DSS_WITH_CAMELLIA_256_CBC_SHA        0x03000085
-# define TLS1_CK_DH_RSA_WITH_CAMELLIA_256_CBC_SHA        0x03000086
-# define TLS1_CK_DHE_DSS_WITH_CAMELLIA_256_CBC_SHA       0x03000087
-# define TLS1_CK_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA       0x03000088
-# define TLS1_CK_ADH_WITH_CAMELLIA_256_CBC_SHA           0x03000089
-
-/* SEED ciphersuites from RFC4162 */
-# define TLS1_CK_RSA_WITH_SEED_SHA                       0x03000096
-# define TLS1_CK_DH_DSS_WITH_SEED_SHA                    0x03000097
-# define TLS1_CK_DH_RSA_WITH_SEED_SHA                    0x03000098
-# define TLS1_CK_DHE_DSS_WITH_SEED_SHA                   0x03000099
-# define TLS1_CK_DHE_RSA_WITH_SEED_SHA                   0x0300009A
-# define TLS1_CK_ADH_WITH_SEED_SHA                       0x0300009B
-
-/* TLS v1.2 GCM ciphersuites from RFC5288 */
-# define TLS1_CK_RSA_WITH_AES_128_GCM_SHA256             0x0300009C
-# define TLS1_CK_RSA_WITH_AES_256_GCM_SHA384             0x0300009D
-# define TLS1_CK_DHE_RSA_WITH_AES_128_GCM_SHA256         0x0300009E
-# define TLS1_CK_DHE_RSA_WITH_AES_256_GCM_SHA384         0x0300009F
-# define TLS1_CK_DH_RSA_WITH_AES_128_GCM_SHA256          0x030000A0
-# define TLS1_CK_DH_RSA_WITH_AES_256_GCM_SHA384          0x030000A1
-# define TLS1_CK_DHE_DSS_WITH_AES_128_GCM_SHA256         0x030000A2
-# define TLS1_CK_DHE_DSS_WITH_AES_256_GCM_SHA384         0x030000A3
-# define TLS1_CK_DH_DSS_WITH_AES_128_GCM_SHA256          0x030000A4
-# define TLS1_CK_DH_DSS_WITH_AES_256_GCM_SHA384          0x030000A5
-# define TLS1_CK_ADH_WITH_AES_128_GCM_SHA256             0x030000A6
-# define TLS1_CK_ADH_WITH_AES_256_GCM_SHA384             0x030000A7
-
-/* CCM ciphersuites from RFC6655 */
-# define TLS1_CK_RSA_WITH_AES_128_CCM                    0x0300C09C
-# define TLS1_CK_RSA_WITH_AES_256_CCM                    0x0300C09D
-# define TLS1_CK_DHE_RSA_WITH_AES_128_CCM                0x0300C09E
-# define TLS1_CK_DHE_RSA_WITH_AES_256_CCM                0x0300C09F
-# define TLS1_CK_RSA_WITH_AES_128_CCM_8                  0x0300C0A0
-# define TLS1_CK_RSA_WITH_AES_256_CCM_8                  0x0300C0A1
-# define TLS1_CK_DHE_RSA_WITH_AES_128_CCM_8              0x0300C0A2
-# define TLS1_CK_DHE_RSA_WITH_AES_256_CCM_8              0x0300C0A3
-# define TLS1_CK_PSK_WITH_AES_128_CCM                    0x0300C0A4
-# define TLS1_CK_PSK_WITH_AES_256_CCM                    0x0300C0A5
-# define TLS1_CK_DHE_PSK_WITH_AES_128_CCM                0x0300C0A6
-# define TLS1_CK_DHE_PSK_WITH_AES_256_CCM                0x0300C0A7
-# define TLS1_CK_PSK_WITH_AES_128_CCM_8                  0x0300C0A8
-# define TLS1_CK_PSK_WITH_AES_256_CCM_8                  0x0300C0A9
-# define TLS1_CK_DHE_PSK_WITH_AES_128_CCM_8              0x0300C0AA
-# define TLS1_CK_DHE_PSK_WITH_AES_256_CCM_8              0x0300C0AB
-
-/* CCM ciphersuites from RFC7251 */
-# define TLS1_CK_ECDHE_ECDSA_WITH_AES_128_CCM            0x0300C0AC
-# define TLS1_CK_ECDHE_ECDSA_WITH_AES_256_CCM            0x0300C0AD
-# define TLS1_CK_ECDHE_ECDSA_WITH_AES_128_CCM_8          0x0300C0AE
-# define TLS1_CK_ECDHE_ECDSA_WITH_AES_256_CCM_8          0x0300C0AF
-
-/* TLS 1.2 Camellia SHA-256 ciphersuites from RFC5932 */
-# define TLS1_CK_RSA_WITH_CAMELLIA_128_CBC_SHA256                0x030000BA
-# define TLS1_CK_DH_DSS_WITH_CAMELLIA_128_CBC_SHA256             0x030000BB
-# define TLS1_CK_DH_RSA_WITH_CAMELLIA_128_CBC_SHA256             0x030000BC
-# define TLS1_CK_DHE_DSS_WITH_CAMELLIA_128_CBC_SHA256            0x030000BD
-# define TLS1_CK_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA256            0x030000BE
-# define TLS1_CK_ADH_WITH_CAMELLIA_128_CBC_SHA256                0x030000BF
-
-# define TLS1_CK_RSA_WITH_CAMELLIA_256_CBC_SHA256                0x030000C0
-# define TLS1_CK_DH_DSS_WITH_CAMELLIA_256_CBC_SHA256             0x030000C1
-# define TLS1_CK_DH_RSA_WITH_CAMELLIA_256_CBC_SHA256             0x030000C2
-# define TLS1_CK_DHE_DSS_WITH_CAMELLIA_256_CBC_SHA256            0x030000C3
-# define TLS1_CK_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA256            0x030000C4
-# define TLS1_CK_ADH_WITH_CAMELLIA_256_CBC_SHA256                0x030000C5
-
-/* ECC ciphersuites from RFC4492 */
-# define TLS1_CK_ECDH_ECDSA_WITH_NULL_SHA                0x0300C001
-# define TLS1_CK_ECDH_ECDSA_WITH_RC4_128_SHA             0x0300C002
-# define TLS1_CK_ECDH_ECDSA_WITH_DES_192_CBC3_SHA        0x0300C003
-# define TLS1_CK_ECDH_ECDSA_WITH_AES_128_CBC_SHA         0x0300C004
-# define TLS1_CK_ECDH_ECDSA_WITH_AES_256_CBC_SHA         0x0300C005
-
-# define TLS1_CK_ECDHE_ECDSA_WITH_NULL_SHA               0x0300C006
-# define TLS1_CK_ECDHE_ECDSA_WITH_RC4_128_SHA            0x0300C007
-# define TLS1_CK_ECDHE_ECDSA_WITH_DES_192_CBC3_SHA       0x0300C008
-# define TLS1_CK_ECDHE_ECDSA_WITH_AES_128_CBC_SHA        0x0300C009
-# define TLS1_CK_ECDHE_ECDSA_WITH_AES_256_CBC_SHA        0x0300C00A
-
-# define TLS1_CK_ECDH_RSA_WITH_NULL_SHA                  0x0300C00B
-# define TLS1_CK_ECDH_RSA_WITH_RC4_128_SHA               0x0300C00C
-# define TLS1_CK_ECDH_RSA_WITH_DES_192_CBC3_SHA          0x0300C00D
-# define TLS1_CK_ECDH_RSA_WITH_AES_128_CBC_SHA           0x0300C00E
-# define TLS1_CK_ECDH_RSA_WITH_AES_256_CBC_SHA           0x0300C00F
-
-# define TLS1_CK_ECDHE_RSA_WITH_NULL_SHA                 0x0300C010
-# define TLS1_CK_ECDHE_RSA_WITH_RC4_128_SHA              0x0300C011
-# define TLS1_CK_ECDHE_RSA_WITH_DES_192_CBC3_SHA         0x0300C012
-# define TLS1_CK_ECDHE_RSA_WITH_AES_128_CBC_SHA          0x0300C013
-# define TLS1_CK_ECDHE_RSA_WITH_AES_256_CBC_SHA          0x0300C014
-
-# define TLS1_CK_ECDH_anon_WITH_NULL_SHA                 0x0300C015
-# define TLS1_CK_ECDH_anon_WITH_RC4_128_SHA              0x0300C016
-# define TLS1_CK_ECDH_anon_WITH_DES_192_CBC3_SHA         0x0300C017
-# define TLS1_CK_ECDH_anon_WITH_AES_128_CBC_SHA          0x0300C018
-# define TLS1_CK_ECDH_anon_WITH_AES_256_CBC_SHA          0x0300C019
-
-/* SRP ciphersuites from RFC 5054 */
-# define TLS1_CK_SRP_SHA_WITH_3DES_EDE_CBC_SHA           0x0300C01A
-# define TLS1_CK_SRP_SHA_RSA_WITH_3DES_EDE_CBC_SHA       0x0300C01B
-# define TLS1_CK_SRP_SHA_DSS_WITH_3DES_EDE_CBC_SHA       0x0300C01C
-# define TLS1_CK_SRP_SHA_WITH_AES_128_CBC_SHA            0x0300C01D
-# define TLS1_CK_SRP_SHA_RSA_WITH_AES_128_CBC_SHA        0x0300C01E
-# define TLS1_CK_SRP_SHA_DSS_WITH_AES_128_CBC_SHA        0x0300C01F
-# define TLS1_CK_SRP_SHA_WITH_AES_256_CBC_SHA            0x0300C020
-# define TLS1_CK_SRP_SHA_RSA_WITH_AES_256_CBC_SHA        0x0300C021
-# define TLS1_CK_SRP_SHA_DSS_WITH_AES_256_CBC_SHA        0x0300C022
-
-/* ECDH HMAC based ciphersuites from RFC5289 */
-
-# define TLS1_CK_ECDHE_ECDSA_WITH_AES_128_SHA256         0x0300C023
-# define TLS1_CK_ECDHE_ECDSA_WITH_AES_256_SHA384         0x0300C024
-# define TLS1_CK_ECDH_ECDSA_WITH_AES_128_SHA256          0x0300C025
-# define TLS1_CK_ECDH_ECDSA_WITH_AES_256_SHA384          0x0300C026
-# define TLS1_CK_ECDHE_RSA_WITH_AES_128_SHA256           0x0300C027
-# define TLS1_CK_ECDHE_RSA_WITH_AES_256_SHA384           0x0300C028
-# define TLS1_CK_ECDH_RSA_WITH_AES_128_SHA256            0x0300C029
-# define TLS1_CK_ECDH_RSA_WITH_AES_256_SHA384            0x0300C02A
-
-/* ECDH GCM based ciphersuites from RFC5289 */
-# define TLS1_CK_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256     0x0300C02B
-# define TLS1_CK_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384     0x0300C02C
-# define TLS1_CK_ECDH_ECDSA_WITH_AES_128_GCM_SHA256      0x0300C02D
-# define TLS1_CK_ECDH_ECDSA_WITH_AES_256_GCM_SHA384      0x0300C02E
-# define TLS1_CK_ECDHE_RSA_WITH_AES_128_GCM_SHA256       0x0300C02F
-# define TLS1_CK_ECDHE_RSA_WITH_AES_256_GCM_SHA384       0x0300C030
-# define TLS1_CK_ECDH_RSA_WITH_AES_128_GCM_SHA256        0x0300C031
-# define TLS1_CK_ECDH_RSA_WITH_AES_256_GCM_SHA384        0x0300C032
-
-/* ECDHE PSK ciphersuites from RFC5489 */
-# define TLS1_CK_ECDHE_PSK_WITH_RC4_128_SHA              0x0300C033
-# define TLS1_CK_ECDHE_PSK_WITH_3DES_EDE_CBC_SHA         0x0300C034
-# define TLS1_CK_ECDHE_PSK_WITH_AES_128_CBC_SHA          0x0300C035
-# define TLS1_CK_ECDHE_PSK_WITH_AES_256_CBC_SHA          0x0300C036
-
-# define TLS1_CK_ECDHE_PSK_WITH_AES_128_CBC_SHA256       0x0300C037
-# define TLS1_CK_ECDHE_PSK_WITH_AES_256_CBC_SHA384       0x0300C038
-
-/* NULL PSK ciphersuites from RFC4785 */
-
-# define TLS1_CK_ECDHE_PSK_WITH_NULL_SHA                 0x0300C039
-# define TLS1_CK_ECDHE_PSK_WITH_NULL_SHA256              0x0300C03A
-# define TLS1_CK_ECDHE_PSK_WITH_NULL_SHA384              0x0300C03B
-
-/* Camellia-CBC ciphersuites from RFC6367 */
-# define TLS1_CK_ECDHE_ECDSA_WITH_CAMELLIA_128_CBC_SHA256 0x0300C072
-# define TLS1_CK_ECDHE_ECDSA_WITH_CAMELLIA_256_CBC_SHA384 0x0300C073
-# define TLS1_CK_ECDH_ECDSA_WITH_CAMELLIA_128_CBC_SHA256  0x0300C074
-# define TLS1_CK_ECDH_ECDSA_WITH_CAMELLIA_256_CBC_SHA384  0x0300C075
-# define TLS1_CK_ECDHE_RSA_WITH_CAMELLIA_128_CBC_SHA256   0x0300C076
-# define TLS1_CK_ECDHE_RSA_WITH_CAMELLIA_256_CBC_SHA384   0x0300C077
-# define TLS1_CK_ECDH_RSA_WITH_CAMELLIA_128_CBC_SHA256    0x0300C078
-# define TLS1_CK_ECDH_RSA_WITH_CAMELLIA_256_CBC_SHA384    0x0300C079
-
-# define TLS1_CK_PSK_WITH_CAMELLIA_128_CBC_SHA256         0x0300C094
-# define TLS1_CK_PSK_WITH_CAMELLIA_256_CBC_SHA384         0x0300C095
-# define TLS1_CK_DHE_PSK_WITH_CAMELLIA_128_CBC_SHA256     0x0300C096
-# define TLS1_CK_DHE_PSK_WITH_CAMELLIA_256_CBC_SHA384     0x0300C097
-# define TLS1_CK_RSA_PSK_WITH_CAMELLIA_128_CBC_SHA256     0x0300C098
-# define TLS1_CK_RSA_PSK_WITH_CAMELLIA_256_CBC_SHA384     0x0300C099
-# define TLS1_CK_ECDHE_PSK_WITH_CAMELLIA_128_CBC_SHA256   0x0300C09A
-# define TLS1_CK_ECDHE_PSK_WITH_CAMELLIA_256_CBC_SHA384   0x0300C09B
-
-/* draft-ietf-tls-chacha20-poly1305-03 */
-# define TLS1_CK_ECDHE_RSA_WITH_CHACHA20_POLY1305         0x0300CCA8
-# define TLS1_CK_ECDHE_ECDSA_WITH_CHACHA20_POLY1305       0x0300CCA9
-# define TLS1_CK_DHE_RSA_WITH_CHACHA20_POLY1305           0x0300CCAA
-# define TLS1_CK_PSK_WITH_CHACHA20_POLY1305               0x0300CCAB
-# define TLS1_CK_ECDHE_PSK_WITH_CHACHA20_POLY1305         0x0300CCAC
-# define TLS1_CK_DHE_PSK_WITH_CHACHA20_POLY1305           0x0300CCAD
-# define TLS1_CK_RSA_PSK_WITH_CHACHA20_POLY1305           0x0300CCAE
-
-/*
- * XXX Backward compatibility alert: Older versions of OpenSSL gave some DHE
- * ciphers names with "EDH" instead of "DHE".  Going forward, we should be
- * using DHE everywhere, though we may indefinitely maintain aliases for
- * users or configurations that used "EDH"
- */
-# define TLS1_TXT_DHE_DSS_WITH_RC4_128_SHA               "DHE-DSS-RC4-SHA"
-
-# define TLS1_TXT_PSK_WITH_NULL_SHA                      "PSK-NULL-SHA"
-# define TLS1_TXT_DHE_PSK_WITH_NULL_SHA                  "DHE-PSK-NULL-SHA"
-# define TLS1_TXT_RSA_PSK_WITH_NULL_SHA                  "RSA-PSK-NULL-SHA"
-
-/* AES ciphersuites from RFC3268 */
-# define TLS1_TXT_RSA_WITH_AES_128_SHA                   "AES128-SHA"
-# define TLS1_TXT_DH_DSS_WITH_AES_128_SHA                "DH-DSS-AES128-SHA"
-# define TLS1_TXT_DH_RSA_WITH_AES_128_SHA                "DH-RSA-AES128-SHA"
-# define TLS1_TXT_DHE_DSS_WITH_AES_128_SHA               "DHE-DSS-AES128-SHA"
-# define TLS1_TXT_DHE_RSA_WITH_AES_128_SHA               "DHE-RSA-AES128-SHA"
-# define TLS1_TXT_ADH_WITH_AES_128_SHA                   "ADH-AES128-SHA"
-
-# define TLS1_TXT_RSA_WITH_AES_256_SHA                   "AES256-SHA"
-# define TLS1_TXT_DH_DSS_WITH_AES_256_SHA                "DH-DSS-AES256-SHA"
-# define TLS1_TXT_DH_RSA_WITH_AES_256_SHA                "DH-RSA-AES256-SHA"
-# define TLS1_TXT_DHE_DSS_WITH_AES_256_SHA               "DHE-DSS-AES256-SHA"
-# define TLS1_TXT_DHE_RSA_WITH_AES_256_SHA               "DHE-RSA-AES256-SHA"
-# define TLS1_TXT_ADH_WITH_AES_256_SHA                   "ADH-AES256-SHA"
-
-/* ECC ciphersuites from RFC4492 */
-# define TLS1_TXT_ECDH_ECDSA_WITH_NULL_SHA               "ECDH-ECDSA-NULL-SHA"
-# define TLS1_TXT_ECDH_ECDSA_WITH_RC4_128_SHA            "ECDH-ECDSA-RC4-SHA"
-# define TLS1_TXT_ECDH_ECDSA_WITH_DES_192_CBC3_SHA       "ECDH-ECDSA-DES-CBC3-SHA"
-# define TLS1_TXT_ECDH_ECDSA_WITH_AES_128_CBC_SHA        "ECDH-ECDSA-AES128-SHA"
-# define TLS1_TXT_ECDH_ECDSA_WITH_AES_256_CBC_SHA        "ECDH-ECDSA-AES256-SHA"
-
-# define TLS1_TXT_ECDHE_ECDSA_WITH_NULL_SHA              "ECDHE-ECDSA-NULL-SHA"
-# define TLS1_TXT_ECDHE_ECDSA_WITH_RC4_128_SHA           "ECDHE-ECDSA-RC4-SHA"
-# define TLS1_TXT_ECDHE_ECDSA_WITH_DES_192_CBC3_SHA      "ECDHE-ECDSA-DES-CBC3-SHA"
-# define TLS1_TXT_ECDHE_ECDSA_WITH_AES_128_CBC_SHA       "ECDHE-ECDSA-AES128-SHA"
-# define TLS1_TXT_ECDHE_ECDSA_WITH_AES_256_CBC_SHA       "ECDHE-ECDSA-AES256-SHA"
-
-# define TLS1_TXT_ECDH_RSA_WITH_NULL_SHA                 "ECDH-RSA-NULL-SHA"
-# define TLS1_TXT_ECDH_RSA_WITH_RC4_128_SHA              "ECDH-RSA-RC4-SHA"
-# define TLS1_TXT_ECDH_RSA_WITH_DES_192_CBC3_SHA         "ECDH-RSA-DES-CBC3-SHA"
-# define TLS1_TXT_ECDH_RSA_WITH_AES_128_CBC_SHA          "ECDH-RSA-AES128-SHA"
-# define TLS1_TXT_ECDH_RSA_WITH_AES_256_CBC_SHA          "ECDH-RSA-AES256-SHA"
-
-# define TLS1_TXT_ECDHE_RSA_WITH_NULL_SHA                "ECDHE-RSA-NULL-SHA"
-# define TLS1_TXT_ECDHE_RSA_WITH_RC4_128_SHA             "ECDHE-RSA-RC4-SHA"
-# define TLS1_TXT_ECDHE_RSA_WITH_DES_192_CBC3_SHA        "ECDHE-RSA-DES-CBC3-SHA"
-# define TLS1_TXT_ECDHE_RSA_WITH_AES_128_CBC_SHA         "ECDHE-RSA-AES128-SHA"
-# define TLS1_TXT_ECDHE_RSA_WITH_AES_256_CBC_SHA         "ECDHE-RSA-AES256-SHA"
-
-# define TLS1_TXT_ECDH_anon_WITH_NULL_SHA                "AECDH-NULL-SHA"
-# define TLS1_TXT_ECDH_anon_WITH_RC4_128_SHA             "AECDH-RC4-SHA"
-# define TLS1_TXT_ECDH_anon_WITH_DES_192_CBC3_SHA        "AECDH-DES-CBC3-SHA"
-# define TLS1_TXT_ECDH_anon_WITH_AES_128_CBC_SHA         "AECDH-AES128-SHA"
-# define TLS1_TXT_ECDH_anon_WITH_AES_256_CBC_SHA         "AECDH-AES256-SHA"
-
-/* PSK ciphersuites from RFC 4279 */
-# define TLS1_TXT_PSK_WITH_RC4_128_SHA                   "PSK-RC4-SHA"
-# define TLS1_TXT_PSK_WITH_3DES_EDE_CBC_SHA              "PSK-3DES-EDE-CBC-SHA"
-# define TLS1_TXT_PSK_WITH_AES_128_CBC_SHA               "PSK-AES128-CBC-SHA"
-# define TLS1_TXT_PSK_WITH_AES_256_CBC_SHA               "PSK-AES256-CBC-SHA"
-
-# define TLS1_TXT_DHE_PSK_WITH_RC4_128_SHA               "DHE-PSK-RC4-SHA"
-# define TLS1_TXT_DHE_PSK_WITH_3DES_EDE_CBC_SHA          "DHE-PSK-3DES-EDE-CBC-SHA"
-# define TLS1_TXT_DHE_PSK_WITH_AES_128_CBC_SHA           "DHE-PSK-AES128-CBC-SHA"
-# define TLS1_TXT_DHE_PSK_WITH_AES_256_CBC_SHA           "DHE-PSK-AES256-CBC-SHA"
-# define TLS1_TXT_RSA_PSK_WITH_RC4_128_SHA               "RSA-PSK-RC4-SHA"
-# define TLS1_TXT_RSA_PSK_WITH_3DES_EDE_CBC_SHA          "RSA-PSK-3DES-EDE-CBC-SHA"
-# define TLS1_TXT_RSA_PSK_WITH_AES_128_CBC_SHA           "RSA-PSK-AES128-CBC-SHA"
-# define TLS1_TXT_RSA_PSK_WITH_AES_256_CBC_SHA           "RSA-PSK-AES256-CBC-SHA"
-
-/* PSK ciphersuites from RFC 5487 */
-# define TLS1_TXT_PSK_WITH_AES_128_GCM_SHA256            "PSK-AES128-GCM-SHA256"
-# define TLS1_TXT_PSK_WITH_AES_256_GCM_SHA384            "PSK-AES256-GCM-SHA384"
-# define TLS1_TXT_DHE_PSK_WITH_AES_128_GCM_SHA256        "DHE-PSK-AES128-GCM-SHA256"
-# define TLS1_TXT_DHE_PSK_WITH_AES_256_GCM_SHA384        "DHE-PSK-AES256-GCM-SHA384"
-# define TLS1_TXT_RSA_PSK_WITH_AES_128_GCM_SHA256        "RSA-PSK-AES128-GCM-SHA256"
-# define TLS1_TXT_RSA_PSK_WITH_AES_256_GCM_SHA384        "RSA-PSK-AES256-GCM-SHA384"
-
-# define TLS1_TXT_PSK_WITH_AES_128_CBC_SHA256            "PSK-AES128-CBC-SHA256"
-# define TLS1_TXT_PSK_WITH_AES_256_CBC_SHA384            "PSK-AES256-CBC-SHA384"
-# define TLS1_TXT_PSK_WITH_NULL_SHA256                   "PSK-NULL-SHA256"
-# define TLS1_TXT_PSK_WITH_NULL_SHA384                   "PSK-NULL-SHA384"
-
-# define TLS1_TXT_DHE_PSK_WITH_AES_128_CBC_SHA256        "DHE-PSK-AES128-CBC-SHA256"
-# define TLS1_TXT_DHE_PSK_WITH_AES_256_CBC_SHA384        "DHE-PSK-AES256-CBC-SHA384"
-# define TLS1_TXT_DHE_PSK_WITH_NULL_SHA256               "DHE-PSK-NULL-SHA256"
-# define TLS1_TXT_DHE_PSK_WITH_NULL_SHA384               "DHE-PSK-NULL-SHA384"
-
-# define TLS1_TXT_RSA_PSK_WITH_AES_128_CBC_SHA256        "RSA-PSK-AES128-CBC-SHA256"
-# define TLS1_TXT_RSA_PSK_WITH_AES_256_CBC_SHA384        "RSA-PSK-AES256-CBC-SHA384"
-# define TLS1_TXT_RSA_PSK_WITH_NULL_SHA256               "RSA-PSK-NULL-SHA256"
-# define TLS1_TXT_RSA_PSK_WITH_NULL_SHA384               "RSA-PSK-NULL-SHA384"
-
-/* SRP ciphersuite from RFC 5054 */
-# define TLS1_TXT_SRP_SHA_WITH_3DES_EDE_CBC_SHA          "SRP-3DES-EDE-CBC-SHA"
-# define TLS1_TXT_SRP_SHA_RSA_WITH_3DES_EDE_CBC_SHA      "SRP-RSA-3DES-EDE-CBC-SHA"
-# define TLS1_TXT_SRP_SHA_DSS_WITH_3DES_EDE_CBC_SHA      "SRP-DSS-3DES-EDE-CBC-SHA"
-# define TLS1_TXT_SRP_SHA_WITH_AES_128_CBC_SHA           "SRP-AES-128-CBC-SHA"
-# define TLS1_TXT_SRP_SHA_RSA_WITH_AES_128_CBC_SHA       "SRP-RSA-AES-128-CBC-SHA"
-# define TLS1_TXT_SRP_SHA_DSS_WITH_AES_128_CBC_SHA       "SRP-DSS-AES-128-CBC-SHA"
-# define TLS1_TXT_SRP_SHA_WITH_AES_256_CBC_SHA           "SRP-AES-256-CBC-SHA"
-# define TLS1_TXT_SRP_SHA_RSA_WITH_AES_256_CBC_SHA       "SRP-RSA-AES-256-CBC-SHA"
-# define TLS1_TXT_SRP_SHA_DSS_WITH_AES_256_CBC_SHA       "SRP-DSS-AES-256-CBC-SHA"
-
-/* Camellia ciphersuites from RFC4132 */
-# define TLS1_TXT_RSA_WITH_CAMELLIA_128_CBC_SHA          "CAMELLIA128-SHA"
-# define TLS1_TXT_DH_DSS_WITH_CAMELLIA_128_CBC_SHA       "DH-DSS-CAMELLIA128-SHA"
-# define TLS1_TXT_DH_RSA_WITH_CAMELLIA_128_CBC_SHA       "DH-RSA-CAMELLIA128-SHA"
-# define TLS1_TXT_DHE_DSS_WITH_CAMELLIA_128_CBC_SHA      "DHE-DSS-CAMELLIA128-SHA"
-# define TLS1_TXT_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA      "DHE-RSA-CAMELLIA128-SHA"
-# define TLS1_TXT_ADH_WITH_CAMELLIA_128_CBC_SHA          "ADH-CAMELLIA128-SHA"
-
-# define TLS1_TXT_RSA_WITH_CAMELLIA_256_CBC_SHA          "CAMELLIA256-SHA"
-# define TLS1_TXT_DH_DSS_WITH_CAMELLIA_256_CBC_SHA       "DH-DSS-CAMELLIA256-SHA"
-# define TLS1_TXT_DH_RSA_WITH_CAMELLIA_256_CBC_SHA       "DH-RSA-CAMELLIA256-SHA"
-# define TLS1_TXT_DHE_DSS_WITH_CAMELLIA_256_CBC_SHA      "DHE-DSS-CAMELLIA256-SHA"
-# define TLS1_TXT_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA      "DHE-RSA-CAMELLIA256-SHA"
-# define TLS1_TXT_ADH_WITH_CAMELLIA_256_CBC_SHA          "ADH-CAMELLIA256-SHA"
-
-/* TLS 1.2 Camellia SHA-256 ciphersuites from RFC5932 */
-# define TLS1_TXT_RSA_WITH_CAMELLIA_128_CBC_SHA256               "CAMELLIA128-SHA256"
-# define TLS1_TXT_DH_DSS_WITH_CAMELLIA_128_CBC_SHA256            "DH-DSS-CAMELLIA128-SHA256"
-# define TLS1_TXT_DH_RSA_WITH_CAMELLIA_128_CBC_SHA256            "DH-RSA-CAMELLIA128-SHA256"
-# define TLS1_TXT_DHE_DSS_WITH_CAMELLIA_128_CBC_SHA256           "DHE-DSS-CAMELLIA128-SHA256"
-# define TLS1_TXT_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA256           "DHE-RSA-CAMELLIA128-SHA256"
-# define TLS1_TXT_ADH_WITH_CAMELLIA_128_CBC_SHA256               "ADH-CAMELLIA128-SHA256"
-
-# define TLS1_TXT_RSA_WITH_CAMELLIA_256_CBC_SHA256               "CAMELLIA256-SHA256"
-# define TLS1_TXT_DH_DSS_WITH_CAMELLIA_256_CBC_SHA256            "DH-DSS-CAMELLIA256-SHA256"
-# define TLS1_TXT_DH_RSA_WITH_CAMELLIA_256_CBC_SHA256            "DH-RSA-CAMELLIA256-SHA256"
-# define TLS1_TXT_DHE_DSS_WITH_CAMELLIA_256_CBC_SHA256           "DHE-DSS-CAMELLIA256-SHA256"
-# define TLS1_TXT_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA256           "DHE-RSA-CAMELLIA256-SHA256"
-# define TLS1_TXT_ADH_WITH_CAMELLIA_256_CBC_SHA256               "ADH-CAMELLIA256-SHA256"
-
-# define TLS1_TXT_PSK_WITH_CAMELLIA_128_CBC_SHA256               "PSK-CAMELLIA128-SHA256"
-# define TLS1_TXT_PSK_WITH_CAMELLIA_256_CBC_SHA384               "PSK-CAMELLIA256-SHA384"
-# define TLS1_TXT_DHE_PSK_WITH_CAMELLIA_128_CBC_SHA256           "DHE-PSK-CAMELLIA128-SHA256"
-# define TLS1_TXT_DHE_PSK_WITH_CAMELLIA_256_CBC_SHA384           "DHE-PSK-CAMELLIA256-SHA384"
-# define TLS1_TXT_RSA_PSK_WITH_CAMELLIA_128_CBC_SHA256           "RSA-PSK-CAMELLIA128-SHA256"
-# define TLS1_TXT_RSA_PSK_WITH_CAMELLIA_256_CBC_SHA384           "RSA-PSK-CAMELLIA256-SHA384"
-# define TLS1_TXT_ECDHE_PSK_WITH_CAMELLIA_128_CBC_SHA256         "ECDHE-PSK-CAMELLIA128-SHA256"
-# define TLS1_TXT_ECDHE_PSK_WITH_CAMELLIA_256_CBC_SHA384         "ECDHE-PSK-CAMELLIA256-SHA384"
-
-/* SEED ciphersuites from RFC4162 */
-# define TLS1_TXT_RSA_WITH_SEED_SHA                      "SEED-SHA"
-# define TLS1_TXT_DH_DSS_WITH_SEED_SHA                   "DH-DSS-SEED-SHA"
-# define TLS1_TXT_DH_RSA_WITH_SEED_SHA                   "DH-RSA-SEED-SHA"
-# define TLS1_TXT_DHE_DSS_WITH_SEED_SHA                  "DHE-DSS-SEED-SHA"
-# define TLS1_TXT_DHE_RSA_WITH_SEED_SHA                  "DHE-RSA-SEED-SHA"
-# define TLS1_TXT_ADH_WITH_SEED_SHA                      "ADH-SEED-SHA"
-
-/* TLS v1.2 ciphersuites */
-# define TLS1_TXT_RSA_WITH_NULL_SHA256                   "NULL-SHA256"
-# define TLS1_TXT_RSA_WITH_AES_128_SHA256                "AES128-SHA256"
-# define TLS1_TXT_RSA_WITH_AES_256_SHA256                "AES256-SHA256"
-# define TLS1_TXT_DH_DSS_WITH_AES_128_SHA256             "DH-DSS-AES128-SHA256"
-# define TLS1_TXT_DH_RSA_WITH_AES_128_SHA256             "DH-RSA-AES128-SHA256"
-# define TLS1_TXT_DHE_DSS_WITH_AES_128_SHA256            "DHE-DSS-AES128-SHA256"
-# define TLS1_TXT_DHE_RSA_WITH_AES_128_SHA256            "DHE-RSA-AES128-SHA256"
-# define TLS1_TXT_DH_DSS_WITH_AES_256_SHA256             "DH-DSS-AES256-SHA256"
-# define TLS1_TXT_DH_RSA_WITH_AES_256_SHA256             "DH-RSA-AES256-SHA256"
-# define TLS1_TXT_DHE_DSS_WITH_AES_256_SHA256            "DHE-DSS-AES256-SHA256"
-# define TLS1_TXT_DHE_RSA_WITH_AES_256_SHA256            "DHE-RSA-AES256-SHA256"
-# define TLS1_TXT_ADH_WITH_AES_128_SHA256                "ADH-AES128-SHA256"
-# define TLS1_TXT_ADH_WITH_AES_256_SHA256                "ADH-AES256-SHA256"
-
-/* TLS v1.2 GCM ciphersuites from RFC5288 */
-# define TLS1_TXT_RSA_WITH_AES_128_GCM_SHA256            "AES128-GCM-SHA256"
-# define TLS1_TXT_RSA_WITH_AES_256_GCM_SHA384            "AES256-GCM-SHA384"
-# define TLS1_TXT_DHE_RSA_WITH_AES_128_GCM_SHA256        "DHE-RSA-AES128-GCM-SHA256"
-# define TLS1_TXT_DHE_RSA_WITH_AES_256_GCM_SHA384        "DHE-RSA-AES256-GCM-SHA384"
-# define TLS1_TXT_DH_RSA_WITH_AES_128_GCM_SHA256         "DH-RSA-AES128-GCM-SHA256"
-# define TLS1_TXT_DH_RSA_WITH_AES_256_GCM_SHA384         "DH-RSA-AES256-GCM-SHA384"
-# define TLS1_TXT_DHE_DSS_WITH_AES_128_GCM_SHA256        "DHE-DSS-AES128-GCM-SHA256"
-# define TLS1_TXT_DHE_DSS_WITH_AES_256_GCM_SHA384        "DHE-DSS-AES256-GCM-SHA384"
-# define TLS1_TXT_DH_DSS_WITH_AES_128_GCM_SHA256         "DH-DSS-AES128-GCM-SHA256"
-# define TLS1_TXT_DH_DSS_WITH_AES_256_GCM_SHA384         "DH-DSS-AES256-GCM-SHA384"
-# define TLS1_TXT_ADH_WITH_AES_128_GCM_SHA256            "ADH-AES128-GCM-SHA256"
-# define TLS1_TXT_ADH_WITH_AES_256_GCM_SHA384            "ADH-AES256-GCM-SHA384"
-
-/* CCM ciphersuites from RFC6655 */
-
-# define TLS1_TXT_RSA_WITH_AES_128_CCM                   "AES128-CCM"
-# define TLS1_TXT_RSA_WITH_AES_256_CCM                   "AES256-CCM"
-# define TLS1_TXT_DHE_RSA_WITH_AES_128_CCM               "DHE-RSA-AES128-CCM"
-# define TLS1_TXT_DHE_RSA_WITH_AES_256_CCM               "DHE-RSA-AES256-CCM"
-
-# define TLS1_TXT_RSA_WITH_AES_128_CCM_8                 "AES128-CCM8"
-# define TLS1_TXT_RSA_WITH_AES_256_CCM_8                 "AES256-CCM8"
-# define TLS1_TXT_DHE_RSA_WITH_AES_128_CCM_8             "DHE-RSA-AES128-CCM8"
-# define TLS1_TXT_DHE_RSA_WITH_AES_256_CCM_8             "DHE-RSA-AES256-CCM8"
-
-# define TLS1_TXT_PSK_WITH_AES_128_CCM                   "PSK-AES128-CCM"
-# define TLS1_TXT_PSK_WITH_AES_256_CCM                   "PSK-AES256-CCM"
-# define TLS1_TXT_DHE_PSK_WITH_AES_128_CCM               "DHE-PSK-AES128-CCM"
-# define TLS1_TXT_DHE_PSK_WITH_AES_256_CCM               "DHE-PSK-AES256-CCM"
-
-# define TLS1_TXT_PSK_WITH_AES_128_CCM_8                 "PSK-AES128-CCM8"
-# define TLS1_TXT_PSK_WITH_AES_256_CCM_8                 "PSK-AES256-CCM8"
-# define TLS1_TXT_DHE_PSK_WITH_AES_128_CCM_8             "DHE-PSK-AES128-CCM8"
-# define TLS1_TXT_DHE_PSK_WITH_AES_256_CCM_8             "DHE-PSK-AES256-CCM8"
-
-/* CCM ciphersuites from RFC7251 */
-
-# define TLS1_TXT_ECDHE_ECDSA_WITH_AES_128_CCM       "ECDHE-ECDSA-AES128-CCM"
-# define TLS1_TXT_ECDHE_ECDSA_WITH_AES_256_CCM       "ECDHE-ECDSA-AES256-CCM"
-# define TLS1_TXT_ECDHE_ECDSA_WITH_AES_128_CCM_8     "ECDHE-ECDSA-AES128-CCM8"
-# define TLS1_TXT_ECDHE_ECDSA_WITH_AES_256_CCM_8     "ECDHE-ECDSA-AES256-CCM8"
-
-/* ECDH HMAC based ciphersuites from RFC5289 */
-
-# define TLS1_TXT_ECDHE_ECDSA_WITH_AES_128_SHA256    "ECDHE-ECDSA-AES128-SHA256"
-# define TLS1_TXT_ECDHE_ECDSA_WITH_AES_256_SHA384    "ECDHE-ECDSA-AES256-SHA384"
-# define TLS1_TXT_ECDH_ECDSA_WITH_AES_128_SHA256     "ECDH-ECDSA-AES128-SHA256"
-# define TLS1_TXT_ECDH_ECDSA_WITH_AES_256_SHA384     "ECDH-ECDSA-AES256-SHA384"
-# define TLS1_TXT_ECDHE_RSA_WITH_AES_128_SHA256      "ECDHE-RSA-AES128-SHA256"
-# define TLS1_TXT_ECDHE_RSA_WITH_AES_256_SHA384      "ECDHE-RSA-AES256-SHA384"
-# define TLS1_TXT_ECDH_RSA_WITH_AES_128_SHA256       "ECDH-RSA-AES128-SHA256"
-# define TLS1_TXT_ECDH_RSA_WITH_AES_256_SHA384       "ECDH-RSA-AES256-SHA384"
-
-/* ECDH GCM based ciphersuites from RFC5289 */
-# define TLS1_TXT_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256    "ECDHE-ECDSA-AES128-GCM-SHA256"
-# define TLS1_TXT_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384    "ECDHE-ECDSA-AES256-GCM-SHA384"
-# define TLS1_TXT_ECDH_ECDSA_WITH_AES_128_GCM_SHA256     "ECDH-ECDSA-AES128-GCM-SHA256"
-# define TLS1_TXT_ECDH_ECDSA_WITH_AES_256_GCM_SHA384     "ECDH-ECDSA-AES256-GCM-SHA384"
-# define TLS1_TXT_ECDHE_RSA_WITH_AES_128_GCM_SHA256      "ECDHE-RSA-AES128-GCM-SHA256"
-# define TLS1_TXT_ECDHE_RSA_WITH_AES_256_GCM_SHA384      "ECDHE-RSA-AES256-GCM-SHA384"
-# define TLS1_TXT_ECDH_RSA_WITH_AES_128_GCM_SHA256       "ECDH-RSA-AES128-GCM-SHA256"
-# define TLS1_TXT_ECDH_RSA_WITH_AES_256_GCM_SHA384       "ECDH-RSA-AES256-GCM-SHA384"
-
-/* TLS v1.2 PSK GCM ciphersuites from RFC5487 */
-# define TLS1_TXT_PSK_WITH_AES_128_GCM_SHA256            "PSK-AES128-GCM-SHA256"
-# define TLS1_TXT_PSK_WITH_AES_256_GCM_SHA384            "PSK-AES256-GCM-SHA384"
-
-/* ECDHE PSK ciphersuites from RFC 5489 */
-# define TLS1_TXT_ECDHE_PSK_WITH_RC4_128_SHA               "ECDHE-PSK-RC4-SHA"
-# define TLS1_TXT_ECDHE_PSK_WITH_3DES_EDE_CBC_SHA          "ECDHE-PSK-3DES-EDE-CBC-SHA"
-# define TLS1_TXT_ECDHE_PSK_WITH_AES_128_CBC_SHA           "ECDHE-PSK-AES128-CBC-SHA"
-# define TLS1_TXT_ECDHE_PSK_WITH_AES_256_CBC_SHA           "ECDHE-PSK-AES256-CBC-SHA"
-
-# define TLS1_TXT_ECDHE_PSK_WITH_AES_128_CBC_SHA256        "ECDHE-PSK-AES128-CBC-SHA256"
-# define TLS1_TXT_ECDHE_PSK_WITH_AES_256_CBC_SHA384        "ECDHE-PSK-AES256-CBC-SHA384"
-
-# define TLS1_TXT_ECDHE_PSK_WITH_NULL_SHA                  "ECDHE-PSK-NULL-SHA"
-# define TLS1_TXT_ECDHE_PSK_WITH_NULL_SHA256               "ECDHE-PSK-NULL-SHA256"
-# define TLS1_TXT_ECDHE_PSK_WITH_NULL_SHA384               "ECDHE-PSK-NULL-SHA384"
-
-/* Camellia-CBC ciphersuites from RFC6367 */
-# define TLS1_TXT_ECDHE_ECDSA_WITH_CAMELLIA_128_CBC_SHA256 "ECDHE-ECDSA-CAMELLIA128-SHA256"
-# define TLS1_TXT_ECDHE_ECDSA_WITH_CAMELLIA_256_CBC_SHA384 "ECDHE-ECDSA-CAMELLIA256-SHA384"
-# define TLS1_TXT_ECDH_ECDSA_WITH_CAMELLIA_128_CBC_SHA256  "ECDH-ECDSA-CAMELLIA128-SHA256"
-# define TLS1_TXT_ECDH_ECDSA_WITH_CAMELLIA_256_CBC_SHA384  "ECDH-ECDSA-CAMELLIA256-SHA384"
-# define TLS1_TXT_ECDHE_RSA_WITH_CAMELLIA_128_CBC_SHA256   "ECDHE-RSA-CAMELLIA128-SHA256"
-# define TLS1_TXT_ECDHE_RSA_WITH_CAMELLIA_256_CBC_SHA384   "ECDHE-RSA-CAMELLIA256-SHA384"
-# define TLS1_TXT_ECDH_RSA_WITH_CAMELLIA_128_CBC_SHA256    "ECDH-RSA-CAMELLIA128-SHA256"
-# define TLS1_TXT_ECDH_RSA_WITH_CAMELLIA_256_CBC_SHA384    "ECDH-RSA-CAMELLIA256-SHA384"
-
-/* draft-ietf-tls-chacha20-poly1305-03 */
-# define TLS1_TXT_ECDHE_RSA_WITH_CHACHA20_POLY1305         "ECDHE-RSA-CHACHA20-POLY1305"
-# define TLS1_TXT_ECDHE_ECDSA_WITH_CHACHA20_POLY1305       "ECDHE-ECDSA-CHACHA20-POLY1305"
-# define TLS1_TXT_DHE_RSA_WITH_CHACHA20_POLY1305           "DHE-RSA-CHACHA20-POLY1305"
-# define TLS1_TXT_PSK_WITH_CHACHA20_POLY1305               "PSK-CHACHA20-POLY1305"
-# define TLS1_TXT_ECDHE_PSK_WITH_CHACHA20_POLY1305         "ECDHE-PSK-CHACHA20-POLY1305"
-# define TLS1_TXT_DHE_PSK_WITH_CHACHA20_POLY1305           "DHE-PSK-CHACHA20-POLY1305"
-# define TLS1_TXT_RSA_PSK_WITH_CHACHA20_POLY1305           "RSA-PSK-CHACHA20-POLY1305"
-
-# define TLS_CT_RSA_SIGN                 1
-# define TLS_CT_DSS_SIGN                 2
-# define TLS_CT_RSA_FIXED_DH             3
-# define TLS_CT_DSS_FIXED_DH             4
-# define TLS_CT_ECDSA_SIGN               64
-# define TLS_CT_RSA_FIXED_ECDH           65
-# define TLS_CT_ECDSA_FIXED_ECDH         66
-# define TLS_CT_GOST01_SIGN              22
-# define TLS_CT_GOST12_SIGN              238
-# define TLS_CT_GOST12_512_SIGN          239
-
-/*
- * when correcting this number, correct also SSL3_CT_NUMBER in ssl3.h (see
- * comment there)
- */
-# define TLS_CT_NUMBER                   9
-
-# define TLS1_FINISH_MAC_LENGTH          12
-
-# define TLS_MD_MAX_CONST_SIZE                   22
-# define TLS_MD_CLIENT_FINISH_CONST              "client finished"
-# define TLS_MD_CLIENT_FINISH_CONST_SIZE         15
-# define TLS_MD_SERVER_FINISH_CONST              "server finished"
-# define TLS_MD_SERVER_FINISH_CONST_SIZE         15
-# define TLS_MD_KEY_EXPANSION_CONST              "key expansion"
-# define TLS_MD_KEY_EXPANSION_CONST_SIZE         13
-# define TLS_MD_CLIENT_WRITE_KEY_CONST           "client write key"
-# define TLS_MD_CLIENT_WRITE_KEY_CONST_SIZE      16
-# define TLS_MD_SERVER_WRITE_KEY_CONST           "server write key"
-# define TLS_MD_SERVER_WRITE_KEY_CONST_SIZE      16
-# define TLS_MD_IV_BLOCK_CONST                   "IV block"
-# define TLS_MD_IV_BLOCK_CONST_SIZE              8
-# define TLS_MD_MASTER_SECRET_CONST              "master secret"
-# define TLS_MD_MASTER_SECRET_CONST_SIZE         13
-# define TLS_MD_EXTENDED_MASTER_SECRET_CONST     "extended master secret"
-# define TLS_MD_EXTENDED_MASTER_SECRET_CONST_SIZE        22
-
-# ifdef CHARSET_EBCDIC
-#  undef TLS_MD_CLIENT_FINISH_CONST
-/*
- * client finished
- */
-#  define TLS_MD_CLIENT_FINISH_CONST    "\x63\x6c\x69\x65\x6e\x74\x20\x66\x69\x6e\x69\x73\x68\x65\x64"
-
-#  undef TLS_MD_SERVER_FINISH_CONST
-/*
- * server finished
- */
-#  define TLS_MD_SERVER_FINISH_CONST    "\x73\x65\x72\x76\x65\x72\x20\x66\x69\x6e\x69\x73\x68\x65\x64"
-
-#  undef TLS_MD_SERVER_WRITE_KEY_CONST
-/*
- * server write key
- */
-#  define TLS_MD_SERVER_WRITE_KEY_CONST "\x73\x65\x72\x76\x65\x72\x20\x77\x72\x69\x74\x65\x20\x6b\x65\x79"
-
-#  undef TLS_MD_KEY_EXPANSION_CONST
-/*
- * key expansion
- */
-#  define TLS_MD_KEY_EXPANSION_CONST    "\x6b\x65\x79\x20\x65\x78\x70\x61\x6e\x73\x69\x6f\x6e"
-
-#  undef TLS_MD_CLIENT_WRITE_KEY_CONST
-/*
- * client write key
- */
-#  define TLS_MD_CLIENT_WRITE_KEY_CONST "\x63\x6c\x69\x65\x6e\x74\x20\x77\x72\x69\x74\x65\x20\x6b\x65\x79"
-
-#  undef TLS_MD_SERVER_WRITE_KEY_CONST
-/*
- * server write key
- */
-#  define TLS_MD_SERVER_WRITE_KEY_CONST "\x73\x65\x72\x76\x65\x72\x20\x77\x72\x69\x74\x65\x20\x6b\x65\x79"
-
-#  undef TLS_MD_IV_BLOCK_CONST
-/*
- * IV block
- */
-#  define TLS_MD_IV_BLOCK_CONST         "\x49\x56\x20\x62\x6c\x6f\x63\x6b"
-
-#  undef TLS_MD_MASTER_SECRET_CONST
-/*
- * master secret
- */
-#  define TLS_MD_MASTER_SECRET_CONST    "\x6d\x61\x73\x74\x65\x72\x20\x73\x65\x63\x72\x65\x74"
-#  undef TLS_MD_EXTENDED_MASTER_SECRET_CONST
-/*
- * extended master secret
- */
-#  define TLS_MD_EXTENDED_MASTER_SECRET_CONST    "\x65\x78\x74\x65\x63\x64\x65\x64\x20\x6d\x61\x73\x74\x65\x72\x20\x73\x65\x63\x72\x65\x74"
-# endif
-
-/* TLS Session Ticket extension struct */
-struct tls_session_ticket_ext_st {
-    unsigned short length;
-    void *data;
-};
-
-#ifdef  __cplusplus
-}
-#endif
-#endif

gpac-2.2.1.tar.gz/extra_lib/include/openssl/ts.h Deleted

@@ -1,643 +0,0 @@
-/*
- * Copyright 2006-2016 The OpenSSL Project Authors. All Rights Reserved.
- *
- * Licensed under the OpenSSL license (the "License").  You may not use
- * this file except in compliance with the License.  You can obtain a copy
- * in the file LICENSE in the source distribution or at
- * https://www.openssl.org/source/license.html
- */
-
-#ifndef HEADER_TS_H
-# define HEADER_TS_H
-
-# include <openssl/opensslconf.h>
-
-# ifndef OPENSSL_NO_TS
-# include <openssl/symhacks.h>
-# include <openssl/buffer.h>
-# include <openssl/evp.h>
-# include <openssl/bio.h>
-# include <openssl/stack.h>
-# include <openssl/asn1.h>
-# include <openssl/safestack.h>
-# include <openssl/rsa.h>
-# include <openssl/dsa.h>
-# include <openssl/dh.h>
-# ifdef  __cplusplus
-extern "C" {
-# endif
-
-# include <openssl/x509.h>
-# include <openssl/x509v3.h>
-
-typedef struct TS_msg_imprint_st TS_MSG_IMPRINT;
-typedef struct TS_req_st TS_REQ;
-typedef struct TS_accuracy_st TS_ACCURACY;
-typedef struct TS_tst_info_st TS_TST_INFO;
-
-/* Possible values for status. */
-# define TS_STATUS_GRANTED                       0
-# define TS_STATUS_GRANTED_WITH_MODS             1
-# define TS_STATUS_REJECTION                     2
-# define TS_STATUS_WAITING                       3
-# define TS_STATUS_REVOCATION_WARNING            4
-# define TS_STATUS_REVOCATION_NOTIFICATION       5
-
-/* Possible values for failure_info. */
-# define TS_INFO_BAD_ALG                 0
-# define TS_INFO_BAD_REQUEST             2
-# define TS_INFO_BAD_DATA_FORMAT         5
-# define TS_INFO_TIME_NOT_AVAILABLE      14
-# define TS_INFO_UNACCEPTED_POLICY       15
-# define TS_INFO_UNACCEPTED_EXTENSION    16
-# define TS_INFO_ADD_INFO_NOT_AVAILABLE  17
-# define TS_INFO_SYSTEM_FAILURE          25
-
-
-typedef struct TS_status_info_st TS_STATUS_INFO;
-typedef struct ESS_issuer_serial ESS_ISSUER_SERIAL;
-typedef struct ESS_cert_id ESS_CERT_ID;
-typedef struct ESS_signing_cert ESS_SIGNING_CERT;
-
-DEFINE_STACK_OF(ESS_CERT_ID)
-
-typedef struct TS_resp_st TS_RESP;
-
-TS_REQ *TS_REQ_new(void);
-void TS_REQ_free(TS_REQ *a);
-int i2d_TS_REQ(const TS_REQ *a, unsigned char **pp);
-TS_REQ *d2i_TS_REQ(TS_REQ **a, const unsigned char **pp, long length);
-
-TS_REQ *TS_REQ_dup(TS_REQ *a);
-
-#ifndef OPENSSL_NO_STDIO
-TS_REQ *d2i_TS_REQ_fp(FILE *fp, TS_REQ **a);
-int i2d_TS_REQ_fp(FILE *fp, TS_REQ *a);
-#endif
-TS_REQ *d2i_TS_REQ_bio(BIO *fp, TS_REQ **a);
-int i2d_TS_REQ_bio(BIO *fp, TS_REQ *a);
-
-TS_MSG_IMPRINT *TS_MSG_IMPRINT_new(void);
-void TS_MSG_IMPRINT_free(TS_MSG_IMPRINT *a);
-int i2d_TS_MSG_IMPRINT(const TS_MSG_IMPRINT *a, unsigned char **pp);
-TS_MSG_IMPRINT *d2i_TS_MSG_IMPRINT(TS_MSG_IMPRINT **a,
-                                   const unsigned char **pp, long length);
-
-TS_MSG_IMPRINT *TS_MSG_IMPRINT_dup(TS_MSG_IMPRINT *a);
-
-#ifndef OPENSSL_NO_STDIO
-TS_MSG_IMPRINT *d2i_TS_MSG_IMPRINT_fp(FILE *fp, TS_MSG_IMPRINT **a);
-int i2d_TS_MSG_IMPRINT_fp(FILE *fp, TS_MSG_IMPRINT *a);
-#endif
-TS_MSG_IMPRINT *d2i_TS_MSG_IMPRINT_bio(BIO *bio, TS_MSG_IMPRINT **a);
-int i2d_TS_MSG_IMPRINT_bio(BIO *bio, TS_MSG_IMPRINT *a);
-
-TS_RESP *TS_RESP_new(void);
-void TS_RESP_free(TS_RESP *a);
-int i2d_TS_RESP(const TS_RESP *a, unsigned char **pp);
-TS_RESP *d2i_TS_RESP(TS_RESP **a, const unsigned char **pp, long length);
-TS_TST_INFO *PKCS7_to_TS_TST_INFO(PKCS7 *token);
-TS_RESP *TS_RESP_dup(TS_RESP *a);
-
-#ifndef OPENSSL_NO_STDIO
-TS_RESP *d2i_TS_RESP_fp(FILE *fp, TS_RESP **a);
-int i2d_TS_RESP_fp(FILE *fp, TS_RESP *a);
-#endif
-TS_RESP *d2i_TS_RESP_bio(BIO *bio, TS_RESP **a);
-int i2d_TS_RESP_bio(BIO *bio, TS_RESP *a);
-
-TS_STATUS_INFO *TS_STATUS_INFO_new(void);
-void TS_STATUS_INFO_free(TS_STATUS_INFO *a);
-int i2d_TS_STATUS_INFO(const TS_STATUS_INFO *a, unsigned char **pp);
-TS_STATUS_INFO *d2i_TS_STATUS_INFO(TS_STATUS_INFO **a,
-                                   const unsigned char **pp, long length);
-TS_STATUS_INFO *TS_STATUS_INFO_dup(TS_STATUS_INFO *a);
-
-TS_TST_INFO *TS_TST_INFO_new(void);
-void TS_TST_INFO_free(TS_TST_INFO *a);
-int i2d_TS_TST_INFO(const TS_TST_INFO *a, unsigned char **pp);
-TS_TST_INFO *d2i_TS_TST_INFO(TS_TST_INFO **a, const unsigned char **pp,
-                             long length);
-TS_TST_INFO *TS_TST_INFO_dup(TS_TST_INFO *a);
-
-#ifndef OPENSSL_NO_STDIO
-TS_TST_INFO *d2i_TS_TST_INFO_fp(FILE *fp, TS_TST_INFO **a);
-int i2d_TS_TST_INFO_fp(FILE *fp, TS_TST_INFO *a);
-#endif
-TS_TST_INFO *d2i_TS_TST_INFO_bio(BIO *bio, TS_TST_INFO **a);
-int i2d_TS_TST_INFO_bio(BIO *bio, TS_TST_INFO *a);
-
-TS_ACCURACY *TS_ACCURACY_new(void);
-void TS_ACCURACY_free(TS_ACCURACY *a);
-int i2d_TS_ACCURACY(const TS_ACCURACY *a, unsigned char **pp);
-TS_ACCURACY *d2i_TS_ACCURACY(TS_ACCURACY **a, const unsigned char **pp,
-                             long length);
-TS_ACCURACY *TS_ACCURACY_dup(TS_ACCURACY *a);
-
-ESS_ISSUER_SERIAL *ESS_ISSUER_SERIAL_new(void);
-void ESS_ISSUER_SERIAL_free(ESS_ISSUER_SERIAL *a);
-int i2d_ESS_ISSUER_SERIAL(const ESS_ISSUER_SERIAL *a, unsigned char **pp);
-ESS_ISSUER_SERIAL *d2i_ESS_ISSUER_SERIAL(ESS_ISSUER_SERIAL **a,
-                                         const unsigned char **pp,
-                                         long length);
-ESS_ISSUER_SERIAL *ESS_ISSUER_SERIAL_dup(ESS_ISSUER_SERIAL *a);
-
-ESS_CERT_ID *ESS_CERT_ID_new(void);
-void ESS_CERT_ID_free(ESS_CERT_ID *a);
-int i2d_ESS_CERT_ID(const ESS_CERT_ID *a, unsigned char **pp);
-ESS_CERT_ID *d2i_ESS_CERT_ID(ESS_CERT_ID **a, const unsigned char **pp,
-                             long length);
-ESS_CERT_ID *ESS_CERT_ID_dup(ESS_CERT_ID *a);
-
-ESS_SIGNING_CERT *ESS_SIGNING_CERT_new(void);
-void ESS_SIGNING_CERT_free(ESS_SIGNING_CERT *a);
-int i2d_ESS_SIGNING_CERT(const ESS_SIGNING_CERT *a, unsigned char **pp);
-ESS_SIGNING_CERT *d2i_ESS_SIGNING_CERT(ESS_SIGNING_CERT **a,
-                                       const unsigned char **pp, long length);
-ESS_SIGNING_CERT *ESS_SIGNING_CERT_dup(ESS_SIGNING_CERT *a);
-
-int TS_REQ_set_version(TS_REQ *a, long version);
-long TS_REQ_get_version(const TS_REQ *a);
-
-int TS_STATUS_INFO_set_status(TS_STATUS_INFO *a, int i);
-const ASN1_INTEGER *TS_STATUS_INFO_get0_status(const TS_STATUS_INFO *a);
-
-const STACK_OF(ASN1_UTF8STRING) *
-TS_STATUS_INFO_get0_text(const TS_STATUS_INFO *a);
-
-const ASN1_BIT_STRING *
-TS_STATUS_INFO_get0_failure_info(const TS_STATUS_INFO *a);
-
-int TS_REQ_set_msg_imprint(TS_REQ *a, TS_MSG_IMPRINT *msg_imprint);
-TS_MSG_IMPRINT *TS_REQ_get_msg_imprint(TS_REQ *a);
-
-int TS_MSG_IMPRINT_set_algo(TS_MSG_IMPRINT *a, X509_ALGOR *alg);
-X509_ALGOR *TS_MSG_IMPRINT_get_algo(TS_MSG_IMPRINT *a);
-
-int TS_MSG_IMPRINT_set_msg(TS_MSG_IMPRINT *a, unsigned char *d, int len);
-ASN1_OCTET_STRING *TS_MSG_IMPRINT_get_msg(TS_MSG_IMPRINT *a);
-
-int TS_REQ_set_policy_id(TS_REQ *a, const ASN1_OBJECT *policy);
-ASN1_OBJECT *TS_REQ_get_policy_id(TS_REQ *a);
-
-int TS_REQ_set_nonce(TS_REQ *a, const ASN1_INTEGER *nonce);
-const ASN1_INTEGER *TS_REQ_get_nonce(const TS_REQ *a);
-
-int TS_REQ_set_cert_req(TS_REQ *a, int cert_req);
-int TS_REQ_get_cert_req(const TS_REQ *a);
-
-STACK_OF(X509_EXTENSION) *TS_REQ_get_exts(TS_REQ *a);
-void TS_REQ_ext_free(TS_REQ *a);
-int TS_REQ_get_ext_count(TS_REQ *a);
-int TS_REQ_get_ext_by_NID(TS_REQ *a, int nid, int lastpos);
-int TS_REQ_get_ext_by_OBJ(TS_REQ *a, const ASN1_OBJECT *obj, int lastpos);
-int TS_REQ_get_ext_by_critical(TS_REQ *a, int crit, int lastpos);
-X509_EXTENSION *TS_REQ_get_ext(TS_REQ *a, int loc);
-X509_EXTENSION *TS_REQ_delete_ext(TS_REQ *a, int loc);
-int TS_REQ_add_ext(TS_REQ *a, X509_EXTENSION *ex, int loc);
-void *TS_REQ_get_ext_d2i(TS_REQ *a, int nid, int *crit, int *idx);
-
-/* Function declarations for TS_REQ defined in ts/ts_req_print.c */
-
-int TS_REQ_print_bio(BIO *bio, TS_REQ *a);
-
-/* Function declarations for TS_RESP defined in ts/ts_resp_utils.c */
-
-int TS_RESP_set_status_info(TS_RESP *a, TS_STATUS_INFO *info);
-TS_STATUS_INFO *TS_RESP_get_status_info(TS_RESP *a);
-
-/* Caller loses ownership of PKCS7 and TS_TST_INFO objects. */
-void TS_RESP_set_tst_info(TS_RESP *a, PKCS7 *p7, TS_TST_INFO *tst_info);
-PKCS7 *TS_RESP_get_token(TS_RESP *a);
-TS_TST_INFO *TS_RESP_get_tst_info(TS_RESP *a);
-
-int TS_TST_INFO_set_version(TS_TST_INFO *a, long version);
-long TS_TST_INFO_get_version(const TS_TST_INFO *a);
-
-int TS_TST_INFO_set_policy_id(TS_TST_INFO *a, ASN1_OBJECT *policy_id);
-ASN1_OBJECT *TS_TST_INFO_get_policy_id(TS_TST_INFO *a);
-
-int TS_TST_INFO_set_msg_imprint(TS_TST_INFO *a, TS_MSG_IMPRINT *msg_imprint);
-TS_MSG_IMPRINT *TS_TST_INFO_get_msg_imprint(TS_TST_INFO *a);
-
-int TS_TST_INFO_set_serial(TS_TST_INFO *a, const ASN1_INTEGER *serial);
-const ASN1_INTEGER *TS_TST_INFO_get_serial(const TS_TST_INFO *a);
-
-int TS_TST_INFO_set_time(TS_TST_INFO *a, const ASN1_GENERALIZEDTIME *gtime);
-const ASN1_GENERALIZEDTIME *TS_TST_INFO_get_time(const TS_TST_INFO *a);
-
-int TS_TST_INFO_set_accuracy(TS_TST_INFO *a, TS_ACCURACY *accuracy);
-TS_ACCURACY *TS_TST_INFO_get_accuracy(TS_TST_INFO *a);
-
-int TS_ACCURACY_set_seconds(TS_ACCURACY *a, const ASN1_INTEGER *seconds);
-const ASN1_INTEGER *TS_ACCURACY_get_seconds(const TS_ACCURACY *a);
-
-int TS_ACCURACY_set_millis(TS_ACCURACY *a, const ASN1_INTEGER *millis);
-const ASN1_INTEGER *TS_ACCURACY_get_millis(const TS_ACCURACY *a);
-
-int TS_ACCURACY_set_micros(TS_ACCURACY *a, const ASN1_INTEGER *micros);
-const ASN1_INTEGER *TS_ACCURACY_get_micros(const TS_ACCURACY *a);
-
-int TS_TST_INFO_set_ordering(TS_TST_INFO *a, int ordering);
-int TS_TST_INFO_get_ordering(const TS_TST_INFO *a);
-
-int TS_TST_INFO_set_nonce(TS_TST_INFO *a, const ASN1_INTEGER *nonce);
-const ASN1_INTEGER *TS_TST_INFO_get_nonce(const TS_TST_INFO *a);
-
-int TS_TST_INFO_set_tsa(TS_TST_INFO *a, GENERAL_NAME *tsa);
-GENERAL_NAME *TS_TST_INFO_get_tsa(TS_TST_INFO *a);
-
-STACK_OF(X509_EXTENSION) *TS_TST_INFO_get_exts(TS_TST_INFO *a);
-void TS_TST_INFO_ext_free(TS_TST_INFO *a);
-int TS_TST_INFO_get_ext_count(TS_TST_INFO *a);
-int TS_TST_INFO_get_ext_by_NID(TS_TST_INFO *a, int nid, int lastpos);
-int TS_TST_INFO_get_ext_by_OBJ(TS_TST_INFO *a, const ASN1_OBJECT *obj,
-                               int lastpos);
-int TS_TST_INFO_get_ext_by_critical(TS_TST_INFO *a, int crit, int lastpos);
-X509_EXTENSION *TS_TST_INFO_get_ext(TS_TST_INFO *a, int loc);
-X509_EXTENSION *TS_TST_INFO_delete_ext(TS_TST_INFO *a, int loc);
-int TS_TST_INFO_add_ext(TS_TST_INFO *a, X509_EXTENSION *ex, int loc);
-void *TS_TST_INFO_get_ext_d2i(TS_TST_INFO *a, int nid, int *crit, int *idx);
-
-/*
- * Declarations related to response generation, defined in ts/ts_resp_sign.c.
- */
-
-/* Optional flags for response generation. */
-
-/* Don't include the TSA name in response. */
-# define TS_TSA_NAME             0x01
-
-/* Set ordering to true in response. */
-# define TS_ORDERING             0x02
-
-/*
- * Include the signer certificate and the other specified certificates in
- * the ESS signing certificate attribute beside the PKCS7 signed data.
- * Only the signer certificates is included by default.
- */
-# define TS_ESS_CERT_ID_CHAIN    0x04
-
-/* Forward declaration. */
-struct TS_resp_ctx;
-
-/* This must return a unique number less than 160 bits long. */
-typedef ASN1_INTEGER *(*TS_serial_cb) (struct TS_resp_ctx *, void *);
-
-/*
- * This must return the seconds and microseconds since Jan 1, 1970 in the sec
- * and usec variables allocated by the caller. Return non-zero for success
- * and zero for failure.
- */
-typedef int (*TS_time_cb) (struct TS_resp_ctx *, void *, long *sec,
-                           long *usec);
-
-/*
- * This must process the given extension. It can modify the TS_TST_INFO
- * object of the context. Return values: !0 (processed), 0 (error, it must
- * set the status info/failure info of the response).
- */
-typedef int (*TS_extension_cb) (struct TS_resp_ctx *, X509_EXTENSION *,
-                                void *);
-
-typedef struct TS_resp_ctx TS_RESP_CTX;
-
-DEFINE_STACK_OF_CONST(EVP_MD)
-
-/* Creates a response context that can be used for generating responses. */
-TS_RESP_CTX *TS_RESP_CTX_new(void);
-void TS_RESP_CTX_free(TS_RESP_CTX *ctx);
-
-/* This parameter must be set. */
-int TS_RESP_CTX_set_signer_cert(TS_RESP_CTX *ctx, X509 *signer);
-
-/* This parameter must be set. */
-int TS_RESP_CTX_set_signer_key(TS_RESP_CTX *ctx, EVP_PKEY *key);
-
-int TS_RESP_CTX_set_signer_digest(TS_RESP_CTX *ctx,
-                                  const EVP_MD *signer_digest);
-
-/* This parameter must be set. */
-int TS_RESP_CTX_set_def_policy(TS_RESP_CTX *ctx, const ASN1_OBJECT *def_policy);
-
-/* No additional certs are included in the response by default. */
-int TS_RESP_CTX_set_certs(TS_RESP_CTX *ctx, STACK_OF(X509) *certs);
-
-/*
- * Adds a new acceptable policy, only the default policy is accepted by
- * default.
- */
-int TS_RESP_CTX_add_policy(TS_RESP_CTX *ctx, const ASN1_OBJECT *policy);
-
-/*
- * Adds a new acceptable message digest. Note that no message digests are
- * accepted by default. The md argument is shared with the caller.
- */
-int TS_RESP_CTX_add_md(TS_RESP_CTX *ctx, const EVP_MD *md);
-
-/* Accuracy is not included by default. */
-int TS_RESP_CTX_set_accuracy(TS_RESP_CTX *ctx,
-                             int secs, int millis, int micros);
-
-/*
- * Clock precision digits, i.e. the number of decimal digits: '0' means sec,
- * '3' msec, '6' usec, and so on. Default is 0.
- */
-int TS_RESP_CTX_set_clock_precision_digits(TS_RESP_CTX *ctx,
-                                           unsigned clock_precision_digits);
-/* At most we accept usec precision. */
-# define TS_MAX_CLOCK_PRECISION_DIGITS   6
-
-/* Maximum status message length */
-# define TS_MAX_STATUS_LENGTH   (1024 * 1024)
-
-/* No flags are set by default. */
-void TS_RESP_CTX_add_flags(TS_RESP_CTX *ctx, int flags);
-
-/* Default callback always returns a constant. */
-void TS_RESP_CTX_set_serial_cb(TS_RESP_CTX *ctx, TS_serial_cb cb, void *data);
-
-/* Default callback uses the gettimeofday() and gmtime() system calls. */
-void TS_RESP_CTX_set_time_cb(TS_RESP_CTX *ctx, TS_time_cb cb, void *data);
-
-/*
- * Default callback rejects all extensions. The extension callback is called
- * when the TS_TST_INFO object is already set up and not signed yet.
- */
-/* FIXME: extension handling is not tested yet. */
-void TS_RESP_CTX_set_extension_cb(TS_RESP_CTX *ctx,
-                                  TS_extension_cb cb, void *data);
-
-/* The following methods can be used in the callbacks. */
-int TS_RESP_CTX_set_status_info(TS_RESP_CTX *ctx,
-                                int status, const char *text);
-
-/* Sets the status info only if it is still TS_STATUS_GRANTED. */
-int TS_RESP_CTX_set_status_info_cond(TS_RESP_CTX *ctx,
-                                     int status, const char *text);
-
-int TS_RESP_CTX_add_failure_info(TS_RESP_CTX *ctx, int failure);
-
-/* The get methods below can be used in the extension callback. */
-TS_REQ *TS_RESP_CTX_get_request(TS_RESP_CTX *ctx);
-
-TS_TST_INFO *TS_RESP_CTX_get_tst_info(TS_RESP_CTX *ctx);
-
-/*
- * Creates the signed TS_TST_INFO and puts it in TS_RESP.
- * In case of errors it sets the status info properly.
- * Returns NULL only in case of memory allocation/fatal error.
- */
-TS_RESP *TS_RESP_create_response(TS_RESP_CTX *ctx, BIO *req_bio);
-
-/*
- * Declarations related to response verification,
- * they are defined in ts/ts_resp_verify.c.
- */
-
-int TS_RESP_verify_signature(PKCS7 *token, STACK_OF(X509) *certs,
-                             X509_STORE *store, X509 **signer_out);
-
-/* Context structure for the generic verify method. */
-
-/* Verify the signer's certificate and the signature of the response. */
-# define TS_VFY_SIGNATURE        (1u << 0)
-/* Verify the version number of the response. */
-# define TS_VFY_VERSION          (1u << 1)
-/* Verify if the policy supplied by the user matches the policy of the TSA. */
-# define TS_VFY_POLICY           (1u << 2)
-/*
- * Verify the message imprint provided by the user. This flag should not be
- * specified with TS_VFY_DATA.
- */
-# define TS_VFY_IMPRINT          (1u << 3)
-/*
- * Verify the message imprint computed by the verify method from the user
- * provided data and the MD algorithm of the response. This flag should not
- * be specified with TS_VFY_IMPRINT.
- */
-# define TS_VFY_DATA             (1u << 4)
-/* Verify the nonce value. */
-# define TS_VFY_NONCE            (1u << 5)
-/* Verify if the TSA name field matches the signer certificate. */
-# define TS_VFY_SIGNER           (1u << 6)
-/* Verify if the TSA name field equals to the user provided name. */
-# define TS_VFY_TSA_NAME         (1u << 7)
-
-/* You can use the following convenience constants. */
-# define TS_VFY_ALL_IMPRINT      (TS_VFY_SIGNATURE       \
-                                 | TS_VFY_VERSION       \
-                                 | TS_VFY_POLICY        \
-                                 | TS_VFY_IMPRINT       \
-                                 | TS_VFY_NONCE         \
-                                 | TS_VFY_SIGNER        \
-                                 | TS_VFY_TSA_NAME)
-# define TS_VFY_ALL_DATA         (TS_VFY_SIGNATURE       \
-                                 | TS_VFY_VERSION       \
-                                 | TS_VFY_POLICY        \
-                                 | TS_VFY_DATA          \
-                                 | TS_VFY_NONCE         \
-                                 | TS_VFY_SIGNER        \
-                                 | TS_VFY_TSA_NAME)
-
-typedef struct TS_verify_ctx TS_VERIFY_CTX;
-
-int TS_RESP_verify_response(TS_VERIFY_CTX *ctx, TS_RESP *response);
-int TS_RESP_verify_token(TS_VERIFY_CTX *ctx, PKCS7 *token);
-
-/*
- * Declarations related to response verification context,
- */
-TS_VERIFY_CTX *TS_VERIFY_CTX_new(void);
-void TS_VERIFY_CTX_init(TS_VERIFY_CTX *ctx);
-void TS_VERIFY_CTX_free(TS_VERIFY_CTX *ctx);
-void TS_VERIFY_CTX_cleanup(TS_VERIFY_CTX *ctx);
-int TS_VERIFY_CTX_set_flags(TS_VERIFY_CTX *ctx, int f);
-int TS_VERIFY_CTX_add_flags(TS_VERIFY_CTX *ctx, int f);
-BIO *TS_VERIFY_CTX_set_data(TS_VERIFY_CTX *ctx, BIO *b);
-unsigned char *TS_VERIFY_CTX_set_imprint(TS_VERIFY_CTX *ctx,
-                                         unsigned char *hexstr, long len);
-X509_STORE *TS_VERIFY_CTX_set_store(TS_VERIFY_CTX *ctx, X509_STORE *s);
-STACK_OF(X509) *TS_VERIFY_CTS_set_certs(TS_VERIFY_CTX *ctx, STACK_OF(X509) *certs);
-
-/*-
- * If ctx is NULL, it allocates and returns a new object, otherwise
- * it returns ctx. It initialises all the members as follows:
- * flags = TS_VFY_ALL_IMPRINT & ~(TS_VFY_TSA_NAME | TS_VFY_SIGNATURE)
- * certs = NULL
- * store = NULL
- * policy = policy from the request or NULL if absent (in this case
- *      TS_VFY_POLICY is cleared from flags as well)
- * md_alg = MD algorithm from request
- * imprint, imprint_len = imprint from request
- * data = NULL
- * nonce, nonce_len = nonce from the request or NULL if absent (in this case
- *      TS_VFY_NONCE is cleared from flags as well)
- * tsa_name = NULL
- * Important: after calling this method TS_VFY_SIGNATURE should be added!
- */
-TS_VERIFY_CTX *TS_REQ_to_TS_VERIFY_CTX(TS_REQ *req, TS_VERIFY_CTX *ctx);
-
-/* Function declarations for TS_RESP defined in ts/ts_resp_print.c */
-
-int TS_RESP_print_bio(BIO *bio, TS_RESP *a);
-int TS_STATUS_INFO_print_bio(BIO *bio, TS_STATUS_INFO *a);
-int TS_TST_INFO_print_bio(BIO *bio, TS_TST_INFO *a);
-
-/* Common utility functions defined in ts/ts_lib.c */
-
-int TS_ASN1_INTEGER_print_bio(BIO *bio, const ASN1_INTEGER *num);
-int TS_OBJ_print_bio(BIO *bio, const ASN1_OBJECT *obj);
-int TS_ext_print_bio(BIO *bio, const STACK_OF(X509_EXTENSION) *extensions);
-int TS_X509_ALGOR_print_bio(BIO *bio, const X509_ALGOR *alg);
-int TS_MSG_IMPRINT_print_bio(BIO *bio, TS_MSG_IMPRINT *msg);
-
-/*
- * Function declarations for handling configuration options, defined in
- * ts/ts_conf.c
- */
-
-X509 *TS_CONF_load_cert(const char *file);
-STACK_OF(X509) *TS_CONF_load_certs(const char *file);
-EVP_PKEY *TS_CONF_load_key(const char *file, const char *pass);
-const char *TS_CONF_get_tsa_section(CONF *conf, const char *section);
-int TS_CONF_set_serial(CONF *conf, const char *section, TS_serial_cb cb,
-                       TS_RESP_CTX *ctx);
-#ifndef OPENSSL_NO_ENGINE
-int TS_CONF_set_crypto_device(CONF *conf, const char *section,
-                              const char *device);
-int TS_CONF_set_default_engine(const char *name);
-#endif
-int TS_CONF_set_signer_cert(CONF *conf, const char *section,
-                            const char *cert, TS_RESP_CTX *ctx);
-int TS_CONF_set_certs(CONF *conf, const char *section, const char *certs,
-                      TS_RESP_CTX *ctx);
-int TS_CONF_set_signer_key(CONF *conf, const char *section,
-                           const char *key, const char *pass,
-                           TS_RESP_CTX *ctx);
-int TS_CONF_set_signer_digest(CONF *conf, const char *section,
-                               const char *md, TS_RESP_CTX *ctx);
-int TS_CONF_set_def_policy(CONF *conf, const char *section,
-                           const char *policy, TS_RESP_CTX *ctx);
-int TS_CONF_set_policies(CONF *conf, const char *section, TS_RESP_CTX *ctx);
-int TS_CONF_set_digests(CONF *conf, const char *section, TS_RESP_CTX *ctx);
-int TS_CONF_set_accuracy(CONF *conf, const char *section, TS_RESP_CTX *ctx);
-int TS_CONF_set_clock_precision_digits(CONF *conf, const char *section,
-                                       TS_RESP_CTX *ctx);
-int TS_CONF_set_ordering(CONF *conf, const char *section, TS_RESP_CTX *ctx);
-int TS_CONF_set_tsa_name(CONF *conf, const char *section, TS_RESP_CTX *ctx);
-int TS_CONF_set_ess_cert_id_chain(CONF *conf, const char *section,
-                                  TS_RESP_CTX *ctx);
-
-/* -------------------------------------------------- */
-/* BEGIN ERROR CODES */
-/*
- * The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
-
-int ERR_load_TS_strings(void);
-
-/* Error codes for the TS functions. */
-
-/* Function codes. */
-# define TS_F_DEF_SERIAL_CB                               110
-# define TS_F_DEF_TIME_CB                                 111
-# define TS_F_ESS_ADD_SIGNING_CERT                        112
-# define TS_F_ESS_CERT_ID_NEW_INIT                        113
-# define TS_F_ESS_SIGNING_CERT_NEW_INIT                   114
-# define TS_F_INT_TS_RESP_VERIFY_TOKEN                    149
-# define TS_F_PKCS7_TO_TS_TST_INFO                        148
-# define TS_F_TS_ACCURACY_SET_MICROS                      115
-# define TS_F_TS_ACCURACY_SET_MILLIS                      116
-# define TS_F_TS_ACCURACY_SET_SECONDS                     117
-# define TS_F_TS_CHECK_IMPRINTS                           100
-# define TS_F_TS_CHECK_NONCES                             101
-# define TS_F_TS_CHECK_POLICY                             102
-# define TS_F_TS_CHECK_SIGNING_CERTS                      103
-# define TS_F_TS_CHECK_STATUS_INFO                        104
-# define TS_F_TS_COMPUTE_IMPRINT                          145
-# define TS_F_TS_CONF_INVALID                             151
-# define TS_F_TS_CONF_LOAD_CERT                           153
-# define TS_F_TS_CONF_LOAD_CERTS                          154
-# define TS_F_TS_CONF_LOAD_KEY                            155
-# define TS_F_TS_CONF_LOOKUP_FAIL                         152
-# define TS_F_TS_CONF_SET_DEFAULT_ENGINE                  146
-# define TS_F_TS_GET_STATUS_TEXT                          105
-# define TS_F_TS_MSG_IMPRINT_SET_ALGO                     118
-# define TS_F_TS_REQ_SET_MSG_IMPRINT                      119
-# define TS_F_TS_REQ_SET_NONCE                            120
-# define TS_F_TS_REQ_SET_POLICY_ID                        121
-# define TS_F_TS_RESP_CREATE_RESPONSE                     122
-# define TS_F_TS_RESP_CREATE_TST_INFO                     123
-# define TS_F_TS_RESP_CTX_ADD_FAILURE_INFO                124
-# define TS_F_TS_RESP_CTX_ADD_MD                          125
-# define TS_F_TS_RESP_CTX_ADD_POLICY                      126
-# define TS_F_TS_RESP_CTX_NEW                             127
-# define TS_F_TS_RESP_CTX_SET_ACCURACY                    128
-# define TS_F_TS_RESP_CTX_SET_CERTS                       129
-# define TS_F_TS_RESP_CTX_SET_DEF_POLICY                  130
-# define TS_F_TS_RESP_CTX_SET_SIGNER_CERT                 131
-# define TS_F_TS_RESP_CTX_SET_STATUS_INFO                 132
-# define TS_F_TS_RESP_GET_POLICY                          133
-# define TS_F_TS_RESP_SET_GENTIME_WITH_PRECISION          134
-# define TS_F_TS_RESP_SET_STATUS_INFO                     135
-# define TS_F_TS_RESP_SET_TST_INFO                        150
-# define TS_F_TS_RESP_SIGN                                136
-# define TS_F_TS_RESP_VERIFY_SIGNATURE                    106
-# define TS_F_TS_TST_INFO_SET_ACCURACY                    137
-# define TS_F_TS_TST_INFO_SET_MSG_IMPRINT                 138
-# define TS_F_TS_TST_INFO_SET_NONCE                       139
-# define TS_F_TS_TST_INFO_SET_POLICY_ID                   140
-# define TS_F_TS_TST_INFO_SET_SERIAL                      141
-# define TS_F_TS_TST_INFO_SET_TIME                        142
-# define TS_F_TS_TST_INFO_SET_TSA                         143
-# define TS_F_TS_VERIFY                                   108
-# define TS_F_TS_VERIFY_CERT                              109
-# define TS_F_TS_VERIFY_CTX_NEW                           144
-
-/* Reason codes. */
-# define TS_R_BAD_PKCS7_TYPE                              132
-# define TS_R_BAD_TYPE                                    133
-# define TS_R_CANNOT_LOAD_CERT                            137
-# define TS_R_CANNOT_LOAD_KEY                             138
-# define TS_R_CERTIFICATE_VERIFY_ERROR                    100
-# define TS_R_COULD_NOT_SET_ENGINE                        127
-# define TS_R_COULD_NOT_SET_TIME                          115
-# define TS_R_DETACHED_CONTENT                            134
-# define TS_R_ESS_ADD_SIGNING_CERT_ERROR                  116
-# define TS_R_ESS_SIGNING_CERTIFICATE_ERROR               101
-# define TS_R_INVALID_NULL_POINTER                        102
-# define TS_R_INVALID_SIGNER_CERTIFICATE_PURPOSE          117
-# define TS_R_MESSAGE_IMPRINT_MISMATCH                    103
-# define TS_R_NONCE_MISMATCH                              104
-# define TS_R_NONCE_NOT_RETURNED                          105
-# define TS_R_NO_CONTENT                                  106
-# define TS_R_NO_TIME_STAMP_TOKEN                         107
-# define TS_R_PKCS7_ADD_SIGNATURE_ERROR                   118
-# define TS_R_PKCS7_ADD_SIGNED_ATTR_ERROR                 119
-# define TS_R_PKCS7_TO_TS_TST_INFO_FAILED                 129
-# define TS_R_POLICY_MISMATCH                             108
-# define TS_R_PRIVATE_KEY_DOES_NOT_MATCH_CERTIFICATE      120
-# define TS_R_RESPONSE_SETUP_ERROR                        121
-# define TS_R_SIGNATURE_FAILURE                           109
-# define TS_R_THERE_MUST_BE_ONE_SIGNER                    110
-# define TS_R_TIME_SYSCALL_ERROR                          122
-# define TS_R_TOKEN_NOT_PRESENT                           130
-# define TS_R_TOKEN_PRESENT                               131
-# define TS_R_TSA_NAME_MISMATCH                           111
-# define TS_R_TSA_UNTRUSTED                               112
-# define TS_R_TST_INFO_SETUP_ERROR                        123
-# define TS_R_TS_DATASIGN                                 124
-# define TS_R_UNACCEPTABLE_POLICY                         125
-# define TS_R_UNSUPPORTED_MD_ALGORITHM                    126
-# define TS_R_UNSUPPORTED_VERSION                         113
-# define TS_R_VAR_BAD_VALUE                               135
-# define TS_R_VAR_LOOKUP_FAILURE                          136
-# define TS_R_WRONG_CONTENT_TYPE                          114
-
-#  ifdef  __cplusplus
-}
-#  endif
-# endif
-#endif

gpac-2.2.1.tar.gz/extra_lib/include/openssl/txt_db.h Deleted

@@ -1,57 +0,0 @@
-/*
- * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
- *
- * Licensed under the OpenSSL license (the "License").  You may not use
- * this file except in compliance with the License.  You can obtain a copy
- * in the file LICENSE in the source distribution or at
- * https://www.openssl.org/source/license.html
- */
-
-#ifndef HEADER_TXT_DB_H
-# define HEADER_TXT_DB_H
-
-# include <openssl/opensslconf.h>
-# include <openssl/bio.h>
-# include <openssl/stack.h>
-# include <openssl/lhash.h>
-
-# define DB_ERROR_OK                     0
-# define DB_ERROR_MALLOC                 1
-# define DB_ERROR_INDEX_CLASH            2
-# define DB_ERROR_INDEX_OUT_OF_RANGE     3
-# define DB_ERROR_NO_INDEX               4
-# define DB_ERROR_INSERT_INDEX_CLASH     5
-# define DB_ERROR_WRONG_NUM_FIELDS       6
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-typedef OPENSSL_STRING *OPENSSL_PSTRING;
-DEFINE_SPECIAL_STACK_OF(OPENSSL_PSTRING, OPENSSL_STRING)
-
-typedef struct txt_db_st {
-    int num_fields;
-    STACK_OF(OPENSSL_PSTRING) *data;
-    LHASH_OF(OPENSSL_STRING) **index;
-    int (**qual) (OPENSSL_STRING *);
-    long error;
-    long arg1;
-    long arg2;
-    OPENSSL_STRING *arg_row;
-} TXT_DB;
-
-TXT_DB *TXT_DB_read(BIO *in, int num);
-long TXT_DB_write(BIO *out, TXT_DB *db);
-int TXT_DB_create_index(TXT_DB *db, int field, int (*qual) (OPENSSL_STRING *),
-                        OPENSSL_LH_HASHFUNC hash, OPENSSL_LH_COMPFUNC cmp);
-void TXT_DB_free(TXT_DB *db);
-OPENSSL_STRING *TXT_DB_get_by_index(TXT_DB *db, int idx,
-                                    OPENSSL_STRING *value);
-int TXT_DB_insert(TXT_DB *db, OPENSSL_STRING *value);
-
-#ifdef  __cplusplus
-}
-#endif
-
-#endif

gpac-2.2.1.tar.gz/extra_lib/include/openssl/ui.h Deleted

@@ -1,378 +0,0 @@
-/*
- * Copyright 2001-2016 The OpenSSL Project Authors. All Rights Reserved.
- *
- * Licensed under the OpenSSL license (the "License").  You may not use
- * this file except in compliance with the License.  You can obtain a copy
- * in the file LICENSE in the source distribution or at
- * https://www.openssl.org/source/license.html
- */
-
-#ifndef HEADER_UI_H
-# define HEADER_UI_H
-
-# include <openssl/opensslconf.h>
-
-# ifndef OPENSSL_NO_UI
-
-#  if OPENSSL_API_COMPAT < 0x10100000L
-#   include <openssl/crypto.h>
-#  endif
-#  include <openssl/safestack.h>
-#  include <openssl/ossl_typ.h>
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-/*
- * All the following functions return -1 or NULL on error and in some cases
- * (UI_process()) -2 if interrupted or in some other way cancelled. When
- * everything is fine, they return 0, a positive value or a non-NULL pointer,
- * all depending on their purpose.
- */
-
-/* Creators and destructor.   */
-UI *UI_new(void);
-UI *UI_new_method(const UI_METHOD *method);
-void UI_free(UI *ui);
-
-/*-
-   The following functions are used to add strings to be printed and prompt
-   strings to prompt for data.  The names are UI_{add,dup}_<function>_string
-   and UI_{add,dup}_input_boolean.
-
-   UI_{add,dup}_<function>_string have the following meanings:
-        add     add a text or prompt string.  The pointers given to these
-                functions are used verbatim, no copying is done.
-        dup     make a copy of the text or prompt string, then add the copy
-                to the collection of strings in the user interface.
-        <function>
-                The function is a name for the functionality that the given
-                string shall be used for.  It can be one of:
-                        input   use the string as data prompt.
-                        verify  use the string as verification prompt.  This
-                                is used to verify a previous input.
-                        info    use the string for informational output.
-                        error   use the string for error output.
-   Honestly, there's currently no difference between info and error for the
-   moment.
-
-   UI_{add,dup}_input_boolean have the same semantics for "add" and "dup",
-   and are typically used when one wants to prompt for a yes/no response.
-
-   All of the functions in this group take a UI and a prompt string.
-   The string input and verify addition functions also take a flag argument,
-   a buffer for the result to end up with, a minimum input size and a maximum
-   input size (the result buffer MUST be large enough to be able to contain
-   the maximum number of characters).  Additionally, the verify addition
-   functions takes another buffer to compare the result against.
-   The boolean input functions take an action description string (which should
-   be safe to ignore if the expected user action is obvious, for example with
-   a dialog box with an OK button and a Cancel button), a string of acceptable
-   characters to mean OK and to mean Cancel.  The two last strings are checked
-   to make sure they don't have common characters.  Additionally, the same
-   flag argument as for the string input is taken, as well as a result buffer.
-   The result buffer is required to be at least one byte long.  Depending on
-   the answer, the first character from the OK or the Cancel character strings
-   will be stored in the first byte of the result buffer.  No NUL will be
-   added, so the result is *not* a string.
-
-   On success, the all return an index of the added information.  That index
-   is useful when retrieving results with UI_get0_result(). */
-int UI_add_input_string(UI *ui, const char *prompt, int flags,
-                        char *result_buf, int minsize, int maxsize);
-int UI_dup_input_string(UI *ui, const char *prompt, int flags,
-                        char *result_buf, int minsize, int maxsize);
-int UI_add_verify_string(UI *ui, const char *prompt, int flags,
-                         char *result_buf, int minsize, int maxsize,
-                         const char *test_buf);
-int UI_dup_verify_string(UI *ui, const char *prompt, int flags,
-                         char *result_buf, int minsize, int maxsize,
-                         const char *test_buf);
-int UI_add_input_boolean(UI *ui, const char *prompt, const char *action_desc,
-                         const char *ok_chars, const char *cancel_chars,
-                         int flags, char *result_buf);
-int UI_dup_input_boolean(UI *ui, const char *prompt, const char *action_desc,
-                         const char *ok_chars, const char *cancel_chars,
-                         int flags, char *result_buf);
-int UI_add_info_string(UI *ui, const char *text);
-int UI_dup_info_string(UI *ui, const char *text);
-int UI_add_error_string(UI *ui, const char *text);
-int UI_dup_error_string(UI *ui, const char *text);
-
-/* These are the possible flags.  They can be or'ed together. */
-/* Use to have echoing of input */
-# define UI_INPUT_FLAG_ECHO              0x01
-/*
- * Use a default password.  Where that password is found is completely up to
- * the application, it might for example be in the user data set with
- * UI_add_user_data().  It is not recommended to have more than one input in
- * each UI being marked with this flag, or the application might get
- * confused.
- */
-#  define UI_INPUT_FLAG_DEFAULT_PWD       0x02
-
-/*-
- * The user of these routines may want to define flags of their own.  The core
- * UI won't look at those, but will pass them on to the method routines.  They
- * must use higher bits so they don't get confused with the UI bits above.
- * UI_INPUT_FLAG_USER_BASE tells which is the lowest bit to use.  A good
- * example of use is this:
- *
- *    #define MY_UI_FLAG1       (0x01 << UI_INPUT_FLAG_USER_BASE)
- *
-*/
-#  define UI_INPUT_FLAG_USER_BASE 16
-
-/*-
- * The following function helps construct a prompt.  object_desc is a
- * textual short description of the object, for example "pass phrase",
- * and object_name is the name of the object (might be a card name or
- * a file name.
- * The returned string shall always be allocated on the heap with
- * OPENSSL_malloc(), and need to be free'd with OPENSSL_free().
- *
- * If the ui_method doesn't contain a pointer to a user-defined prompt
- * constructor, a default string is built, looking like this:
- *
- *       "Enter {object_desc} for {object_name}:"
- *
- * So, if object_desc has the value "pass phrase" and object_name has
- * the value "foo.key", the resulting string is:
- *
- *       "Enter pass phrase for foo.key:"
-*/
-char *UI_construct_prompt(UI *ui_method,
-                          const char *object_desc, const char *object_name);
-
-/*
- * The following function is used to store a pointer to user-specific data.
- * Any previous such pointer will be returned and replaced.
- *
- * For callback purposes, this function makes a lot more sense than using
- * ex_data, since the latter requires that different parts of OpenSSL or
- * applications share the same ex_data index.
- *
- * Note that the UI_OpenSSL() method completely ignores the user data. Other
- * methods may not, however.
- */
-void *UI_add_user_data(UI *ui, void *user_data);
-/* We need a user data retrieving function as well.  */
-void *UI_get0_user_data(UI *ui);
-
-/* Return the result associated with a prompt given with the index i. */
-const char *UI_get0_result(UI *ui, int i);
-
-/* When all strings have been added, process the whole thing. */
-int UI_process(UI *ui);
-
-/*
- * Give a user interface parametrised control commands.  This can be used to
- * send down an integer, a data pointer or a function pointer, as well as be
- * used to get information from a UI.
- */
-int UI_ctrl(UI *ui, int cmd, long i, void *p, void (*f) (void));
-
-/* The commands */
-/*
- * Use UI_CONTROL_PRINT_ERRORS with the value 1 to have UI_process print the
- * OpenSSL error stack before printing any info or added error messages and
- * before any prompting.
- */
-#  define UI_CTRL_PRINT_ERRORS            1
-/*
- * Check if a UI_process() is possible to do again with the same instance of
- * a user interface.  This makes UI_ctrl() return 1 if it is redoable, and 0
- * if not.
- */
-# define UI_CTRL_IS_REDOABLE             2
-
-/* Some methods may use extra data */
-# define UI_set_app_data(s,arg)         UI_set_ex_data(s,0,arg)
-# define UI_get_app_data(s)             UI_get_ex_data(s,0)
-
-#define UI_get_ex_new_index(l, p, newf, dupf, freef) \
-    CRYPTO_get_ex_new_index(CRYPTO_EX_INDEX_UI, l, p, newf, dupf, freef)
-int UI_set_ex_data(UI *r, int idx, void *arg);
-void *UI_get_ex_data(UI *r, int idx);
-
-/* Use specific methods instead of the built-in one */
-void UI_set_default_method(const UI_METHOD *meth);
-const UI_METHOD *UI_get_default_method(void);
-const UI_METHOD *UI_get_method(UI *ui);
-const UI_METHOD *UI_set_method(UI *ui, const UI_METHOD *meth);
-
-/* The method with all the built-in thingies */
-UI_METHOD *UI_OpenSSL(void);
-
-/* ---------- For method writers ---------- */
-/*-
-   A method contains a number of functions that implement the low level
-   of the User Interface.  The functions are:
-
-        an opener       This function starts a session, maybe by opening
-                        a channel to a tty, or by opening a window.
-        a writer        This function is called to write a given string,
-                        maybe to the tty, maybe as a field label in a
-                        window.
-        a flusher       This function is called to flush everything that
-                        has been output so far.  It can be used to actually
-                        display a dialog box after it has been built.
-        a reader        This function is called to read a given prompt,
-                        maybe from the tty, maybe from a field in a
-                        window.  Note that it's called with all string
-                        structures, not only the prompt ones, so it must
-                        check such things itself.
-        a closer        This function closes the session, maybe by closing
-                        the channel to the tty, or closing the window.
-
-   All these functions are expected to return:
-
-        0       on error.
-        1       on success.
-        -1      on out-of-band events, for example if some prompting has
-                been canceled (by pressing Ctrl-C, for example).  This is
-                only checked when returned by the flusher or the reader.
-
-   The way this is used, the opener is first called, then the writer for all
-   strings, then the flusher, then the reader for all strings and finally the
-   closer.  Note that if you want to prompt from a terminal or other command
-   line interface, the best is to have the reader also write the prompts
-   instead of having the writer do it.  If you want to prompt from a dialog
-   box, the writer can be used to build up the contents of the box, and the
-   flusher to actually display the box and run the event loop until all data
-   has been given, after which the reader only grabs the given data and puts
-   them back into the UI strings.
-
-   All method functions take a UI as argument.  Additionally, the writer and
-   the reader take a UI_STRING.
-*/
-
-/*
- * The UI_STRING type is the data structure that contains all the needed info
- * about a string or a prompt, including test data for a verification prompt.
- */
-typedef struct ui_string_st UI_STRING;
-DEFINE_STACK_OF(UI_STRING)
-
-/*
- * The different types of strings that are currently supported. This is only
- * needed by method authors.
- */
-enum UI_string_types {
-    UIT_NONE = 0,
-    UIT_PROMPT,                 /* Prompt for a string */
-    UIT_VERIFY,                 /* Prompt for a string and verify */
-    UIT_BOOLEAN,                /* Prompt for a yes/no response */
-    UIT_INFO,                   /* Send info to the user */
-    UIT_ERROR                   /* Send an error message to the user */
-};
-
-/* Create and manipulate methods */
-UI_METHOD *UI_create_method(const char *name);
-void UI_destroy_method(UI_METHOD *ui_method);
-int UI_method_set_opener(UI_METHOD *method, int (*opener) (UI *ui));
-int UI_method_set_writer(UI_METHOD *method,
-                         int (*writer) (UI *ui, UI_STRING *uis));
-int UI_method_set_flusher(UI_METHOD *method, int (*flusher) (UI *ui));
-int UI_method_set_reader(UI_METHOD *method,
-                         int (*reader) (UI *ui, UI_STRING *uis));
-int UI_method_set_closer(UI_METHOD *method, int (*closer) (UI *ui));
-int UI_method_set_prompt_constructor(UI_METHOD *method,
-                                     char *(*prompt_constructor) (UI *ui,
-                                                                  const char
-                                                                  *object_desc,
-                                                                  const char
-                                                                  *object_name));
-int (*UI_method_get_opener(UI_METHOD *method)) (UI *);
-int (*UI_method_get_writer(UI_METHOD *method)) (UI *, UI_STRING *);
-int (*UI_method_get_flusher(UI_METHOD *method)) (UI *);
-int (*UI_method_get_reader(UI_METHOD *method)) (UI *, UI_STRING *);
-int (*UI_method_get_closer(UI_METHOD *method)) (UI *);
-char *(*UI_method_get_prompt_constructor(UI_METHOD *method)) (UI *,
-                                                              const char *,
-                                                              const char *);
-
-/*
- * The following functions are helpers for method writers to access relevant
- * data from a UI_STRING.
- */
-
-/* Return type of the UI_STRING */
-enum UI_string_types UI_get_string_type(UI_STRING *uis);
-/* Return input flags of the UI_STRING */
-int UI_get_input_flags(UI_STRING *uis);
-/* Return the actual string to output (the prompt, info or error) */
-const char *UI_get0_output_string(UI_STRING *uis);
-/*
- * Return the optional action string to output (the boolean prompt
- * instruction)
- */
-const char *UI_get0_action_string(UI_STRING *uis);
-/* Return the result of a prompt */
-const char *UI_get0_result_string(UI_STRING *uis);
-/*
- * Return the string to test the result against.  Only useful with verifies.
- */
-const char *UI_get0_test_string(UI_STRING *uis);
-/* Return the required minimum size of the result */
-int UI_get_result_minsize(UI_STRING *uis);
-/* Return the required maximum size of the result */
-int UI_get_result_maxsize(UI_STRING *uis);
-/* Set the result of a UI_STRING. */
-int UI_set_result(UI *ui, UI_STRING *uis, const char *result);
-
-/* A couple of popular utility functions */
-int UI_UTIL_read_pw_string(char *buf, int length, const char *prompt,
-                           int verify);
-int UI_UTIL_read_pw(char *buf, char *buff, int size, const char *prompt,
-                    int verify);
-
-/* BEGIN ERROR CODES */
-/*
- * The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
-
-int ERR_load_UI_strings(void);
-
-/* Error codes for the UI functions. */
-
-/* Function codes. */
-# define UI_F_CLOSE_CONSOLE                               115
-# define UI_F_ECHO_CONSOLE                                116
-# define UI_F_GENERAL_ALLOCATE_BOOLEAN                    108
-# define UI_F_GENERAL_ALLOCATE_PROMPT                     109
-# define UI_F_NOECHO_CONSOLE                              117
-# define UI_F_OPEN_CONSOLE                                114
-# define UI_F_UI_CREATE_METHOD                            112
-# define UI_F_UI_CTRL                                     111
-# define UI_F_UI_DUP_ERROR_STRING                         101
-# define UI_F_UI_DUP_INFO_STRING                          102
-# define UI_F_UI_DUP_INPUT_BOOLEAN                        110
-# define UI_F_UI_DUP_INPUT_STRING                         103
-# define UI_F_UI_DUP_VERIFY_STRING                        106
-# define UI_F_UI_GET0_RESULT                              107
-# define UI_F_UI_NEW_METHOD                               104
-# define UI_F_UI_PROCESS                                  113
-# define UI_F_UI_SET_RESULT                               105
-
-/* Reason codes. */
-# define UI_R_COMMON_OK_AND_CANCEL_CHARACTERS             104
-# define UI_R_INDEX_TOO_LARGE                             102
-# define UI_R_INDEX_TOO_SMALL                             103
-# define UI_R_NO_RESULT_BUFFER                            105
-# define UI_R_PROCESSING_ERROR                            107
-# define UI_R_RESULT_TOO_LARGE                            100
-# define UI_R_RESULT_TOO_SMALL                            101
-# define UI_R_SYSASSIGN_ERROR                             109
-# define UI_R_SYSDASSGN_ERROR                             110
-# define UI_R_SYSQIOW_ERROR                               111
-# define UI_R_UNKNOWN_CONTROL_COMMAND                     106
-# define UI_R_UNKNOWN_TTYGET_ERRNO_VALUE                  108
-
-#  ifdef  __cplusplus
-}
-#  endif
-# endif
-#endif

gpac-2.2.1.tar.gz/extra_lib/include/openssl/whrlpool.h Deleted

@@ -1,48 +0,0 @@
-/*
- * Copyright 2005-2016 The OpenSSL Project Authors. All Rights Reserved.
- *
- * Licensed under the OpenSSL license (the "License").  You may not use
- * this file except in compliance with the License.  You can obtain a copy
- * in the file LICENSE in the source distribution or at
- * https://www.openssl.org/source/license.html
- */
-
-#ifndef HEADER_WHRLPOOL_H
-# define HEADER_WHRLPOOL_H
-
-#include <openssl/opensslconf.h>
-
-# ifndef OPENSSL_NO_WHIRLPOOL
-# include <openssl/e_os2.h>
-# include <stddef.h>
-# ifdef __cplusplus
-extern "C" {
-# endif
-
-# define WHIRLPOOL_DIGEST_LENGTH (512/8)
-# define WHIRLPOOL_BBLOCK        512
-# define WHIRLPOOL_COUNTER       (256/8)
-
-typedef struct {
-    union {
-        unsigned char cWHIRLPOOL_DIGEST_LENGTH;
-        /* double q is here to ensure 64-bit alignment */
-        double qWHIRLPOOL_DIGEST_LENGTH / sizeof(double);
-    } H;
-    unsigned char dataWHIRLPOOL_BBLOCK / 8;
-    unsigned int bitoff;
-    size_t bitlenWHIRLPOOL_COUNTER / sizeof(size_t);
-} WHIRLPOOL_CTX;
-
-int WHIRLPOOL_Init(WHIRLPOOL_CTX *c);
-int WHIRLPOOL_Update(WHIRLPOOL_CTX *c, const void *inp, size_t bytes);
-void WHIRLPOOL_BitUpdate(WHIRLPOOL_CTX *c, const void *inp, size_t bits);
-int WHIRLPOOL_Final(unsigned char *md, WHIRLPOOL_CTX *c);
-unsigned char *WHIRLPOOL(const void *inp, size_t bytes, unsigned char *md);
-
-# ifdef __cplusplus
-}
-# endif
-# endif
-
-#endif

gpac-2.2.1.tar.gz/extra_lib/include/openssl/x509.h Deleted

@@ -1,1123 +0,0 @@
-/*
- * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
- *
- * Licensed under the OpenSSL license (the "License").  You may not use
- * this file except in compliance with the License.  You can obtain a copy
- * in the file LICENSE in the source distribution or at
- * https://www.openssl.org/source/license.html
- */
-
-/* ====================================================================
- * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
- * ECDH support in OpenSSL originally developed by
- * SUN MICROSYSTEMS, INC., and contributed to the OpenSSL project.
- */
-
-#ifndef HEADER_X509_H
-# define HEADER_X509_H
-
-# include <openssl/e_os2.h>
-# include <openssl/ossl_typ.h>
-# include <openssl/symhacks.h>
-# include <openssl/buffer.h>
-# include <openssl/evp.h>
-# include <openssl/bio.h>
-# include <openssl/stack.h>
-# include <openssl/asn1.h>
-# include <openssl/safestack.h>
-# include <openssl/ec.h>
-
-# if OPENSSL_API_COMPAT < 0x10100000L
-#  include <openssl/rsa.h>
-#  include <openssl/dsa.h>
-#  include <openssl/dh.h>
-# endif
-
-# include <openssl/sha.h>
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-# define X509_FILETYPE_PEM       1
-# define X509_FILETYPE_ASN1      2
-# define X509_FILETYPE_DEFAULT   3
-
-# define X509v3_KU_DIGITAL_SIGNATURE     0x0080
-# define X509v3_KU_NON_REPUDIATION       0x0040
-# define X509v3_KU_KEY_ENCIPHERMENT      0x0020
-# define X509v3_KU_DATA_ENCIPHERMENT     0x0010
-# define X509v3_KU_KEY_AGREEMENT         0x0008
-# define X509v3_KU_KEY_CERT_SIGN         0x0004
-# define X509v3_KU_CRL_SIGN              0x0002
-# define X509v3_KU_ENCIPHER_ONLY         0x0001
-# define X509v3_KU_DECIPHER_ONLY         0x8000
-# define X509v3_KU_UNDEF                 0xffff
-
-struct X509_algor_st {
-    ASN1_OBJECT *algorithm;
-    ASN1_TYPE *parameter;
-} /* X509_ALGOR */ ;
-
-typedef STACK_OF(X509_ALGOR) X509_ALGORS;
-
-typedef struct X509_val_st {
-    ASN1_TIME *notBefore;
-    ASN1_TIME *notAfter;
-} X509_VAL;
-
-typedef struct X509_sig_st X509_SIG;
-
-typedef struct X509_name_entry_st X509_NAME_ENTRY;
-
-DEFINE_STACK_OF(X509_NAME_ENTRY)
-
-DEFINE_STACK_OF(X509_NAME)
-
-# define X509_EX_V_NETSCAPE_HACK         0x8000
-# define X509_EX_V_INIT                  0x0001
-typedef struct X509_extension_st X509_EXTENSION;
-
-typedef STACK_OF(X509_EXTENSION) X509_EXTENSIONS;
-
-DEFINE_STACK_OF(X509_EXTENSION)
-
-typedef struct x509_attributes_st X509_ATTRIBUTE;
-
-DEFINE_STACK_OF(X509_ATTRIBUTE)
-
-typedef struct X509_req_info_st X509_REQ_INFO;
-
-typedef struct X509_req_st X509_REQ;
-
-typedef struct x509_cert_aux_st X509_CERT_AUX;
-
-typedef struct x509_cinf_st X509_CINF;
-
-DEFINE_STACK_OF(X509)
-
-/* This is used for a table of trust checking functions */
-
-typedef struct x509_trust_st {
-    int trust;
-    int flags;
-    int (*check_trust) (struct x509_trust_st *, X509 *, int);
-    char *name;
-    int arg1;
-    void *arg2;
-} X509_TRUST;
-
-DEFINE_STACK_OF(X509_TRUST)
-
-/* standard trust ids */
-
-# define X509_TRUST_DEFAULT      0 /* Only valid in purpose settings */
-
-# define X509_TRUST_COMPAT       1
-# define X509_TRUST_SSL_CLIENT   2
-# define X509_TRUST_SSL_SERVER   3
-# define X509_TRUST_EMAIL        4
-# define X509_TRUST_OBJECT_SIGN  5
-# define X509_TRUST_OCSP_SIGN    6
-# define X509_TRUST_OCSP_REQUEST 7
-# define X509_TRUST_TSA          8
-
-/* Keep these up to date! */
-# define X509_TRUST_MIN          1
-# define X509_TRUST_MAX          8
-
-/* trust_flags values */
-# define X509_TRUST_DYNAMIC      (1U << 0)
-# define X509_TRUST_DYNAMIC_NAME (1U << 1)
-/* No compat trust if self-signed, preempts "DO_SS" */
-# define X509_TRUST_NO_SS_COMPAT (1U << 2)
-/* Compat trust if no explicit accepted trust EKUs */
-# define X509_TRUST_DO_SS_COMPAT (1U << 3)
-/* Accept "anyEKU" as a wildcard trust OID */
-# define X509_TRUST_OK_ANY_EKU   (1U << 4)
-
-/* check_trust return codes */
-
-# define X509_TRUST_TRUSTED      1
-# define X509_TRUST_REJECTED     2
-# define X509_TRUST_UNTRUSTED    3
-
-/* Flags for X509_print_ex() */
-
-# define X509_FLAG_COMPAT                0
-# define X509_FLAG_NO_HEADER             1L
-# define X509_FLAG_NO_VERSION            (1L << 1)
-# define X509_FLAG_NO_SERIAL             (1L << 2)
-# define X509_FLAG_NO_SIGNAME            (1L << 3)
-# define X509_FLAG_NO_ISSUER             (1L << 4)
-# define X509_FLAG_NO_VALIDITY           (1L << 5)
-# define X509_FLAG_NO_SUBJECT            (1L << 6)
-# define X509_FLAG_NO_PUBKEY             (1L << 7)
-# define X509_FLAG_NO_EXTENSIONS         (1L << 8)
-# define X509_FLAG_NO_SIGDUMP            (1L << 9)
-# define X509_FLAG_NO_AUX                (1L << 10)
-# define X509_FLAG_NO_ATTRIBUTES         (1L << 11)
-# define X509_FLAG_NO_IDS                (1L << 12)
-
-/* Flags specific to X509_NAME_print_ex() */
-
-/* The field separator information */
-
-# define XN_FLAG_SEP_MASK        (0xf << 16)
-
-# define XN_FLAG_COMPAT          0/* Traditional; use old X509_NAME_print */
-# define XN_FLAG_SEP_COMMA_PLUS  (1 << 16)/* RFC2253 ,+ */
-# define XN_FLAG_SEP_CPLUS_SPC   (2 << 16)/* ,+ spaced: more readable */
-# define XN_FLAG_SEP_SPLUS_SPC   (3 << 16)/* ;+ spaced */
-# define XN_FLAG_SEP_MULTILINE   (4 << 16)/* One line per field */
-
-# define XN_FLAG_DN_REV          (1 << 20)/* Reverse DN order */
-
-/* How the field name is shown */
-
-# define XN_FLAG_FN_MASK         (0x3 << 21)
-
-# define XN_FLAG_FN_SN           0/* Object short name */
-# define XN_FLAG_FN_LN           (1 << 21)/* Object long name */
-# define XN_FLAG_FN_OID          (2 << 21)/* Always use OIDs */
-# define XN_FLAG_FN_NONE         (3 << 21)/* No field names */
-
-# define XN_FLAG_SPC_EQ          (1 << 23)/* Put spaces round '=' */
-
-/*
- * This determines if we dump fields we don't recognise: RFC2253 requires
- * this.
- */
-
-# define XN_FLAG_DUMP_UNKNOWN_FIELDS (1 << 24)
-
-# define XN_FLAG_FN_ALIGN        (1 << 25)/* Align field names to 20
-                                           * characters */
-
-/* Complete set of RFC2253 flags */
-
-# define XN_FLAG_RFC2253 (ASN1_STRFLGS_RFC2253 | \
-                        XN_FLAG_SEP_COMMA_PLUS | \
-                        XN_FLAG_DN_REV | \
-                        XN_FLAG_FN_SN | \
-                        XN_FLAG_DUMP_UNKNOWN_FIELDS)
-
-/* readable oneline form */
-
-# define XN_FLAG_ONELINE (ASN1_STRFLGS_RFC2253 | \
-                        ASN1_STRFLGS_ESC_QUOTE | \
-                        XN_FLAG_SEP_CPLUS_SPC | \
-                        XN_FLAG_SPC_EQ | \
-                        XN_FLAG_FN_SN)
-
-/* readable multiline form */
-
-# define XN_FLAG_MULTILINE (ASN1_STRFLGS_ESC_CTRL | \
-                        ASN1_STRFLGS_ESC_MSB | \
-                        XN_FLAG_SEP_MULTILINE | \
-                        XN_FLAG_SPC_EQ | \
-                        XN_FLAG_FN_LN | \
-                        XN_FLAG_FN_ALIGN)
-
-DEFINE_STACK_OF(X509_REVOKED)
-
-typedef struct X509_crl_info_st X509_CRL_INFO;
-
-DEFINE_STACK_OF(X509_CRL)
-
-typedef struct private_key_st {
-    int version;
-    /* The PKCS#8 data types */
-    X509_ALGOR *enc_algor;
-    ASN1_OCTET_STRING *enc_pkey; /* encrypted pub key */
-    /* When decrypted, the following will not be NULL */
-    EVP_PKEY *dec_pkey;
-    /* used to encrypt and decrypt */
-    int key_length;
-    char *key_data;
-    int key_free;               /* true if we should auto free key_data */
-    /* expanded version of 'enc_algor' */
-    EVP_CIPHER_INFO cipher;
-} X509_PKEY;
-
-typedef struct X509_info_st {
-    X509 *x509;
-    X509_CRL *crl;
-    X509_PKEY *x_pkey;
-    EVP_CIPHER_INFO enc_cipher;
-    int enc_len;
-    char *enc_data;
-} X509_INFO;
-
-DEFINE_STACK_OF(X509_INFO)
-
-/*
- * The next 2 structures and their 8 routines were sent to me by Pat Richard
- * <patr@x509.com> and are used to manipulate Netscapes spki structures -
- * useful if you are writing a CA web page
- */
-typedef struct Netscape_spkac_st {
-    X509_PUBKEY *pubkey;
-    ASN1_IA5STRING *challenge;  /* challenge sent in atlas >= PR2 */
-} NETSCAPE_SPKAC;
-
-typedef struct Netscape_spki_st {
-    NETSCAPE_SPKAC *spkac;      /* signed public key and challenge */
-    X509_ALGOR sig_algor;
-    ASN1_BIT_STRING *signature;
-} NETSCAPE_SPKI;
-
-/* Netscape certificate sequence structure */
-typedef struct Netscape_certificate_sequence {
-    ASN1_OBJECT *type;
-    STACK_OF(X509) *certs;
-} NETSCAPE_CERT_SEQUENCE;
-
-/*- Unused (and iv length is wrong)
-typedef struct CBCParameter_st
-        {
-        unsigned char iv8;
-        } CBC_PARAM;
-*/
-
-/* Password based encryption structure */
-
-typedef struct PBEPARAM_st {
-    ASN1_OCTET_STRING *salt;
-    ASN1_INTEGER *iter;
-} PBEPARAM;
-
-/* Password based encryption V2 structures */
-
-typedef struct PBE2PARAM_st {
-    X509_ALGOR *keyfunc;
-    X509_ALGOR *encryption;
-} PBE2PARAM;
-
-typedef struct PBKDF2PARAM_st {
-/* Usually OCTET STRING but could be anything */
-    ASN1_TYPE *salt;
-    ASN1_INTEGER *iter;
-    ASN1_INTEGER *keylength;
-    X509_ALGOR *prf;
-} PBKDF2PARAM;
-
-#ifdef  __cplusplus
-}
-#endif
-
-# include <openssl/x509_vfy.h>
-# include <openssl/pkcs7.h>
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-# define X509_EXT_PACK_UNKNOWN   1
-# define X509_EXT_PACK_STRING    2
-
-# define         X509_extract_key(x)     X509_get_pubkey(x)/*****/
-# define         X509_REQ_extract_key(a) X509_REQ_get_pubkey(a)
-# define         X509_name_cmp(a,b)      X509_NAME_cmp((a),(b))
-
-void X509_CRL_set_default_method(const X509_CRL_METHOD *meth);
-X509_CRL_METHOD *X509_CRL_METHOD_new(int (*crl_init) (X509_CRL *crl),
-                                     int (*crl_free) (X509_CRL *crl),
-                                     int (*crl_lookup) (X509_CRL *crl,
-                                                        X509_REVOKED **ret,
-                                                        ASN1_INTEGER *ser,
-                                                        X509_NAME *issuer),
-                                     int (*crl_verify) (X509_CRL *crl,
-                                                        EVP_PKEY *pk));
-void X509_CRL_METHOD_free(X509_CRL_METHOD *m);
-
-void X509_CRL_set_meth_data(X509_CRL *crl, void *dat);
-void *X509_CRL_get_meth_data(X509_CRL *crl);
-
-const char *X509_verify_cert_error_string(long n);
-
-int X509_verify(X509 *a, EVP_PKEY *r);
-
-int X509_REQ_verify(X509_REQ *a, EVP_PKEY *r);
-int X509_CRL_verify(X509_CRL *a, EVP_PKEY *r);
-int NETSCAPE_SPKI_verify(NETSCAPE_SPKI *a, EVP_PKEY *r);
-
-NETSCAPE_SPKI *NETSCAPE_SPKI_b64_decode(const char *str, int len);
-char *NETSCAPE_SPKI_b64_encode(NETSCAPE_SPKI *x);
-EVP_PKEY *NETSCAPE_SPKI_get_pubkey(NETSCAPE_SPKI *x);
-int NETSCAPE_SPKI_set_pubkey(NETSCAPE_SPKI *x, EVP_PKEY *pkey);
-
-int NETSCAPE_SPKI_print(BIO *out, NETSCAPE_SPKI *spki);
-
-int X509_signature_dump(BIO *bp, const ASN1_STRING *sig, int indent);
-int X509_signature_print(BIO *bp, const X509_ALGOR *alg,
-                         const ASN1_STRING *sig);
-
-int X509_sign(X509 *x, EVP_PKEY *pkey, const EVP_MD *md);
-int X509_sign_ctx(X509 *x, EVP_MD_CTX *ctx);
-# ifndef OPENSSL_NO_OCSP
-int X509_http_nbio(OCSP_REQ_CTX *rctx, X509 **pcert);
-# endif
-int X509_REQ_sign(X509_REQ *x, EVP_PKEY *pkey, const EVP_MD *md);
-int X509_REQ_sign_ctx(X509_REQ *x, EVP_MD_CTX *ctx);
-int X509_CRL_sign(X509_CRL *x, EVP_PKEY *pkey, const EVP_MD *md);
-int X509_CRL_sign_ctx(X509_CRL *x, EVP_MD_CTX *ctx);
-# ifndef OPENSSL_NO_OCSP
-int X509_CRL_http_nbio(OCSP_REQ_CTX *rctx, X509_CRL **pcrl);
-# endif
-int NETSCAPE_SPKI_sign(NETSCAPE_SPKI *x, EVP_PKEY *pkey, const EVP_MD *md);
-
-int X509_pubkey_digest(const X509 *data, const EVP_MD *type,
-                       unsigned char *md, unsigned int *len);
-int X509_digest(const X509 *data, const EVP_MD *type,
-                unsigned char *md, unsigned int *len);
-int X509_CRL_digest(const X509_CRL *data, const EVP_MD *type,
-                    unsigned char *md, unsigned int *len);
-int X509_REQ_digest(const X509_REQ *data, const EVP_MD *type,
-                    unsigned char *md, unsigned int *len);
-int X509_NAME_digest(const X509_NAME *data, const EVP_MD *type,
-                     unsigned char *md, unsigned int *len);
-
-# ifndef OPENSSL_NO_STDIO
-X509 *d2i_X509_fp(FILE *fp, X509 **x509);
-int i2d_X509_fp(FILE *fp, X509 *x509);
-X509_CRL *d2i_X509_CRL_fp(FILE *fp, X509_CRL **crl);
-int i2d_X509_CRL_fp(FILE *fp, X509_CRL *crl);
-X509_REQ *d2i_X509_REQ_fp(FILE *fp, X509_REQ **req);
-int i2d_X509_REQ_fp(FILE *fp, X509_REQ *req);
-#  ifndef OPENSSL_NO_RSA
-RSA *d2i_RSAPrivateKey_fp(FILE *fp, RSA **rsa);
-int i2d_RSAPrivateKey_fp(FILE *fp, RSA *rsa);
-RSA *d2i_RSAPublicKey_fp(FILE *fp, RSA **rsa);
-int i2d_RSAPublicKey_fp(FILE *fp, RSA *rsa);
-RSA *d2i_RSA_PUBKEY_fp(FILE *fp, RSA **rsa);
-int i2d_RSA_PUBKEY_fp(FILE *fp, RSA *rsa);
-#  endif
-#  ifndef OPENSSL_NO_DSA
-DSA *d2i_DSA_PUBKEY_fp(FILE *fp, DSA **dsa);
-int i2d_DSA_PUBKEY_fp(FILE *fp, DSA *dsa);
-DSA *d2i_DSAPrivateKey_fp(FILE *fp, DSA **dsa);
-int i2d_DSAPrivateKey_fp(FILE *fp, DSA *dsa);
-#  endif
-#  ifndef OPENSSL_NO_EC
-EC_KEY *d2i_EC_PUBKEY_fp(FILE *fp, EC_KEY **eckey);
-int i2d_EC_PUBKEY_fp(FILE *fp, EC_KEY *eckey);
-EC_KEY *d2i_ECPrivateKey_fp(FILE *fp, EC_KEY **eckey);
-int i2d_ECPrivateKey_fp(FILE *fp, EC_KEY *eckey);
-#  endif
-X509_SIG *d2i_PKCS8_fp(FILE *fp, X509_SIG **p8);
-int i2d_PKCS8_fp(FILE *fp, X509_SIG *p8);
-PKCS8_PRIV_KEY_INFO *d2i_PKCS8_PRIV_KEY_INFO_fp(FILE *fp,
-                                                PKCS8_PRIV_KEY_INFO **p8inf);
-int i2d_PKCS8_PRIV_KEY_INFO_fp(FILE *fp, PKCS8_PRIV_KEY_INFO *p8inf);
-int i2d_PKCS8PrivateKeyInfo_fp(FILE *fp, EVP_PKEY *key);
-int i2d_PrivateKey_fp(FILE *fp, EVP_PKEY *pkey);
-EVP_PKEY *d2i_PrivateKey_fp(FILE *fp, EVP_PKEY **a);
-int i2d_PUBKEY_fp(FILE *fp, EVP_PKEY *pkey);
-EVP_PKEY *d2i_PUBKEY_fp(FILE *fp, EVP_PKEY **a);
-# endif
-
-X509 *d2i_X509_bio(BIO *bp, X509 **x509);
-int i2d_X509_bio(BIO *bp, X509 *x509);
-X509_CRL *d2i_X509_CRL_bio(BIO *bp, X509_CRL **crl);
-int i2d_X509_CRL_bio(BIO *bp, X509_CRL *crl);
-X509_REQ *d2i_X509_REQ_bio(BIO *bp, X509_REQ **req);
-int i2d_X509_REQ_bio(BIO *bp, X509_REQ *req);
-#  ifndef OPENSSL_NO_RSA
-RSA *d2i_RSAPrivateKey_bio(BIO *bp, RSA **rsa);
-int i2d_RSAPrivateKey_bio(BIO *bp, RSA *rsa);
-RSA *d2i_RSAPublicKey_bio(BIO *bp, RSA **rsa);
-int i2d_RSAPublicKey_bio(BIO *bp, RSA *rsa);
-RSA *d2i_RSA_PUBKEY_bio(BIO *bp, RSA **rsa);
-int i2d_RSA_PUBKEY_bio(BIO *bp, RSA *rsa);
-#  endif
-#  ifndef OPENSSL_NO_DSA
-DSA *d2i_DSA_PUBKEY_bio(BIO *bp, DSA **dsa);
-int i2d_DSA_PUBKEY_bio(BIO *bp, DSA *dsa);
-DSA *d2i_DSAPrivateKey_bio(BIO *bp, DSA **dsa);
-int i2d_DSAPrivateKey_bio(BIO *bp, DSA *dsa);
-#  endif
-#  ifndef OPENSSL_NO_EC
-EC_KEY *d2i_EC_PUBKEY_bio(BIO *bp, EC_KEY **eckey);
-int i2d_EC_PUBKEY_bio(BIO *bp, EC_KEY *eckey);
-EC_KEY *d2i_ECPrivateKey_bio(BIO *bp, EC_KEY **eckey);
-int i2d_ECPrivateKey_bio(BIO *bp, EC_KEY *eckey);
-#  endif
-X509_SIG *d2i_PKCS8_bio(BIO *bp, X509_SIG **p8);
-int i2d_PKCS8_bio(BIO *bp, X509_SIG *p8);
-PKCS8_PRIV_KEY_INFO *d2i_PKCS8_PRIV_KEY_INFO_bio(BIO *bp,
-                                                 PKCS8_PRIV_KEY_INFO **p8inf);
-int i2d_PKCS8_PRIV_KEY_INFO_bio(BIO *bp, PKCS8_PRIV_KEY_INFO *p8inf);
-int i2d_PKCS8PrivateKeyInfo_bio(BIO *bp, EVP_PKEY *key);
-int i2d_PrivateKey_bio(BIO *bp, EVP_PKEY *pkey);
-EVP_PKEY *d2i_PrivateKey_bio(BIO *bp, EVP_PKEY **a);
-int i2d_PUBKEY_bio(BIO *bp, EVP_PKEY *pkey);
-EVP_PKEY *d2i_PUBKEY_bio(BIO *bp, EVP_PKEY **a);
-
-X509 *X509_dup(X509 *x509);
-X509_ATTRIBUTE *X509_ATTRIBUTE_dup(X509_ATTRIBUTE *xa);
-X509_EXTENSION *X509_EXTENSION_dup(X509_EXTENSION *ex);
-X509_CRL *X509_CRL_dup(X509_CRL *crl);
-X509_REVOKED *X509_REVOKED_dup(X509_REVOKED *rev);
-X509_REQ *X509_REQ_dup(X509_REQ *req);
-X509_ALGOR *X509_ALGOR_dup(X509_ALGOR *xn);
-int X509_ALGOR_set0(X509_ALGOR *alg, ASN1_OBJECT *aobj, int ptype,
-                    void *pval);
-void X509_ALGOR_get0(const ASN1_OBJECT **paobj, int *pptype,
-                     const void **ppval, const X509_ALGOR *algor);
-void X509_ALGOR_set_md(X509_ALGOR *alg, const EVP_MD *md);
-int X509_ALGOR_cmp(const X509_ALGOR *a, const X509_ALGOR *b);
-
-X509_NAME *X509_NAME_dup(X509_NAME *xn);
-X509_NAME_ENTRY *X509_NAME_ENTRY_dup(X509_NAME_ENTRY *ne);
-
-int X509_cmp_time(const ASN1_TIME *s, time_t *t);
-int X509_cmp_current_time(const ASN1_TIME *s);
-ASN1_TIME *X509_time_adj(ASN1_TIME *s, long adj, time_t *t);
-ASN1_TIME *X509_time_adj_ex(ASN1_TIME *s,
-                            int offset_day, long offset_sec, time_t *t);
-ASN1_TIME *X509_gmtime_adj(ASN1_TIME *s, long adj);
-
-const char *X509_get_default_cert_area(void);
-const char *X509_get_default_cert_dir(void);
-const char *X509_get_default_cert_file(void);
-const char *X509_get_default_cert_dir_env(void);
-const char *X509_get_default_cert_file_env(void);
-const char *X509_get_default_private_dir(void);
-
-X509_REQ *X509_to_X509_REQ(X509 *x, EVP_PKEY *pkey, const EVP_MD *md);
-X509 *X509_REQ_to_X509(X509_REQ *r, int days, EVP_PKEY *pkey);
-
-DECLARE_ASN1_FUNCTIONS(X509_ALGOR)
-DECLARE_ASN1_ENCODE_FUNCTIONS(X509_ALGORS, X509_ALGORS, X509_ALGORS)
-DECLARE_ASN1_FUNCTIONS(X509_VAL)
-
-DECLARE_ASN1_FUNCTIONS(X509_PUBKEY)
-
-int X509_PUBKEY_set(X509_PUBKEY **x, EVP_PKEY *pkey);
-EVP_PKEY *X509_PUBKEY_get0(X509_PUBKEY *key);
-EVP_PKEY *X509_PUBKEY_get(X509_PUBKEY *key);
-int X509_get_pubkey_parameters(EVP_PKEY *pkey, STACK_OF(X509) *chain);
-long X509_get_pathlen(X509 *x);
-int i2d_PUBKEY(EVP_PKEY *a, unsigned char **pp);
-EVP_PKEY *d2i_PUBKEY(EVP_PKEY **a, const unsigned char **pp, long length);
-# ifndef OPENSSL_NO_RSA
-int i2d_RSA_PUBKEY(RSA *a, unsigned char **pp);
-RSA *d2i_RSA_PUBKEY(RSA **a, const unsigned char **pp, long length);
-# endif
-# ifndef OPENSSL_NO_DSA
-int i2d_DSA_PUBKEY(DSA *a, unsigned char **pp);
-DSA *d2i_DSA_PUBKEY(DSA **a, const unsigned char **pp, long length);
-# endif
-# ifndef OPENSSL_NO_EC
-int i2d_EC_PUBKEY(EC_KEY *a, unsigned char **pp);
-EC_KEY *d2i_EC_PUBKEY(EC_KEY **a, const unsigned char **pp, long length);
-# endif
-
-DECLARE_ASN1_FUNCTIONS(X509_SIG)
-void X509_SIG_get0(const X509_SIG *sig, const X509_ALGOR **palg,
-                   const ASN1_OCTET_STRING **pdigest);
-void X509_SIG_getm(X509_SIG *sig, X509_ALGOR **palg,
-                   ASN1_OCTET_STRING **pdigest);
-
-DECLARE_ASN1_FUNCTIONS(X509_REQ_INFO)
-DECLARE_ASN1_FUNCTIONS(X509_REQ)
-
-DECLARE_ASN1_FUNCTIONS(X509_ATTRIBUTE)
-X509_ATTRIBUTE *X509_ATTRIBUTE_create(int nid, int atrtype, void *value);
-
-DECLARE_ASN1_FUNCTIONS(X509_EXTENSION)
-DECLARE_ASN1_ENCODE_FUNCTIONS(X509_EXTENSIONS, X509_EXTENSIONS, X509_EXTENSIONS)
-
-DECLARE_ASN1_FUNCTIONS(X509_NAME_ENTRY)
-
-DECLARE_ASN1_FUNCTIONS(X509_NAME)
-
-int X509_NAME_set(X509_NAME **xn, X509_NAME *name);
-
-DECLARE_ASN1_FUNCTIONS(X509_CINF)
-
-DECLARE_ASN1_FUNCTIONS(X509)
-DECLARE_ASN1_FUNCTIONS(X509_CERT_AUX)
-
-#define X509_get_ex_new_index(l, p, newf, dupf, freef) \
-    CRYPTO_get_ex_new_index(CRYPTO_EX_INDEX_X509, l, p, newf, dupf, freef)
-int X509_set_ex_data(X509 *r, int idx, void *arg);
-void *X509_get_ex_data(X509 *r, int idx);
-int i2d_X509_AUX(X509 *a, unsigned char **pp);
-X509 *d2i_X509_AUX(X509 **a, const unsigned char **pp, long length);
-
-int i2d_re_X509_tbs(X509 *x, unsigned char **pp);
-
-void X509_get0_signature(const ASN1_BIT_STRING **psig,
-                         const X509_ALGOR **palg, const X509 *x);
-int X509_get_signature_nid(const X509 *x);
-
-int X509_trusted(const X509 *x);
-int X509_alias_set1(X509 *x, const unsigned char *name, int len);
-int X509_keyid_set1(X509 *x, const unsigned char *id, int len);
-unsigned char *X509_alias_get0(X509 *x, int *len);
-unsigned char *X509_keyid_get0(X509 *x, int *len);
-int (*X509_TRUST_set_default(int (*trust) (int, X509 *, int))) (int, X509 *,
-                                                                int);
-int X509_TRUST_set(int *t, int trust);
-int X509_add1_trust_object(X509 *x, const ASN1_OBJECT *obj);
-int X509_add1_reject_object(X509 *x, const ASN1_OBJECT *obj);
-void X509_trust_clear(X509 *x);
-void X509_reject_clear(X509 *x);
-
-STACK_OF(ASN1_OBJECT) *X509_get0_trust_objects(X509 *x);
-STACK_OF(ASN1_OBJECT) *X509_get0_reject_objects(X509 *x);
-
-DECLARE_ASN1_FUNCTIONS(X509_REVOKED)
-DECLARE_ASN1_FUNCTIONS(X509_CRL_INFO)
-DECLARE_ASN1_FUNCTIONS(X509_CRL)
-
-int X509_CRL_add0_revoked(X509_CRL *crl, X509_REVOKED *rev);
-int X509_CRL_get0_by_serial(X509_CRL *crl,
-                            X509_REVOKED **ret, ASN1_INTEGER *serial);
-int X509_CRL_get0_by_cert(X509_CRL *crl, X509_REVOKED **ret, X509 *x);
-
-X509_PKEY *X509_PKEY_new(void);
-void X509_PKEY_free(X509_PKEY *a);
-
-DECLARE_ASN1_FUNCTIONS(NETSCAPE_SPKI)
-DECLARE_ASN1_FUNCTIONS(NETSCAPE_SPKAC)
-DECLARE_ASN1_FUNCTIONS(NETSCAPE_CERT_SEQUENCE)
-
-X509_INFO *X509_INFO_new(void);
-void X509_INFO_free(X509_INFO *a);
-char *X509_NAME_oneline(const X509_NAME *a, char *buf, int size);
-
-int ASN1_verify(i2d_of_void *i2d, X509_ALGOR *algor1,
-                ASN1_BIT_STRING *signature, char *data, EVP_PKEY *pkey);
-
-int ASN1_digest(i2d_of_void *i2d, const EVP_MD *type, char *data,
-                unsigned char *md, unsigned int *len);
-
-int ASN1_sign(i2d_of_void *i2d, X509_ALGOR *algor1,
-              X509_ALGOR *algor2, ASN1_BIT_STRING *signature,
-              char *data, EVP_PKEY *pkey, const EVP_MD *type);
-
-int ASN1_item_digest(const ASN1_ITEM *it, const EVP_MD *type, void *data,
-                     unsigned char *md, unsigned int *len);
-
-int ASN1_item_verify(const ASN1_ITEM *it, X509_ALGOR *algor1,
-                     ASN1_BIT_STRING *signature, void *data, EVP_PKEY *pkey);
-
-int ASN1_item_sign(const ASN1_ITEM *it, X509_ALGOR *algor1,
-                   X509_ALGOR *algor2, ASN1_BIT_STRING *signature, void *data,
-                   EVP_PKEY *pkey, const EVP_MD *type);
-int ASN1_item_sign_ctx(const ASN1_ITEM *it, X509_ALGOR *algor1,
-                       X509_ALGOR *algor2, ASN1_BIT_STRING *signature,
-                       void *asn, EVP_MD_CTX *ctx);
-
-long X509_get_version(const X509 *x);
-int X509_set_version(X509 *x, long version);
-int X509_set_serialNumber(X509 *x, ASN1_INTEGER *serial);
-ASN1_INTEGER *X509_get_serialNumber(X509 *x);
-const ASN1_INTEGER *X509_get0_serialNumber(const X509 *x);
-int X509_set_issuer_name(X509 *x, X509_NAME *name);
-X509_NAME *X509_get_issuer_name(const X509 *a);
-int X509_set_subject_name(X509 *x, X509_NAME *name);
-X509_NAME *X509_get_subject_name(const X509 *a);
-const ASN1_TIME * X509_get0_notBefore(const X509 *x);
-ASN1_TIME *X509_getm_notBefore(const X509 *x);
-int X509_set1_notBefore(X509 *x, const ASN1_TIME *tm);
-const ASN1_TIME *X509_get0_notAfter(const X509 *x);
-ASN1_TIME *X509_getm_notAfter(const X509 *x);
-int X509_set1_notAfter(X509 *x, const ASN1_TIME *tm);
-int X509_set_pubkey(X509 *x, EVP_PKEY *pkey);
-int X509_up_ref(X509 *x);
-int X509_get_signature_type(const X509 *x);
-
-# if OPENSSL_API_COMPAT < 0x10100000L
-#  define X509_get_notBefore X509_getm_notBefore
-#  define X509_get_notAfter X509_getm_notAfter
-#  define X509_set_notBefore X509_set1_notBefore
-#  define X509_set_notAfter X509_set1_notAfter
-#endif
-
-
-/*
- * This one is only used so that a binary form can output, as in
- * i2d_X509_NAME(X509_get_X509_PUBKEY(x), &buf)
- */
-X509_PUBKEY *X509_get_X509_PUBKEY(const X509 *x);
-const STACK_OF(X509_EXTENSION) *X509_get0_extensions(const X509 *x);
-void X509_get0_uids(const X509 *x, const ASN1_BIT_STRING **piuid,
-                    const ASN1_BIT_STRING **psuid);
-const X509_ALGOR *X509_get0_tbs_sigalg(const X509 *x);
-
-EVP_PKEY *X509_get0_pubkey(const X509 *x);
-EVP_PKEY *X509_get_pubkey(X509 *x);
-ASN1_BIT_STRING *X509_get0_pubkey_bitstr(const X509 *x);
-int X509_certificate_type(const X509 *x, const EVP_PKEY *pubkey);
-
-long X509_REQ_get_version(const X509_REQ *req);
-int X509_REQ_set_version(X509_REQ *x, long version);
-X509_NAME *X509_REQ_get_subject_name(const X509_REQ *req);
-int X509_REQ_set_subject_name(X509_REQ *req, X509_NAME *name);
-void X509_REQ_get0_signature(const X509_REQ *req, const ASN1_BIT_STRING **psig,
-                             const X509_ALGOR **palg);
-int X509_REQ_get_signature_nid(const X509_REQ *req);
-int i2d_re_X509_REQ_tbs(X509_REQ *req, unsigned char **pp);
-int X509_REQ_set_pubkey(X509_REQ *x, EVP_PKEY *pkey);
-EVP_PKEY *X509_REQ_get_pubkey(X509_REQ *req);
-EVP_PKEY *X509_REQ_get0_pubkey(X509_REQ *req);
-X509_PUBKEY *X509_REQ_get_X509_PUBKEY(X509_REQ *req);
-int X509_REQ_extension_nid(int nid);
-int *X509_REQ_get_extension_nids(void);
-void X509_REQ_set_extension_nids(int *nids);
-STACK_OF(X509_EXTENSION) *X509_REQ_get_extensions(X509_REQ *req);
-int X509_REQ_add_extensions_nid(X509_REQ *req, STACK_OF(X509_EXTENSION) *exts,
-                                int nid);
-int X509_REQ_add_extensions(X509_REQ *req, STACK_OF(X509_EXTENSION) *exts);
-int X509_REQ_get_attr_count(const X509_REQ *req);
-int X509_REQ_get_attr_by_NID(const X509_REQ *req, int nid, int lastpos);
-int X509_REQ_get_attr_by_OBJ(const X509_REQ *req, const ASN1_OBJECT *obj,
-                             int lastpos);
-X509_ATTRIBUTE *X509_REQ_get_attr(const X509_REQ *req, int loc);
-X509_ATTRIBUTE *X509_REQ_delete_attr(X509_REQ *req, int loc);
-int X509_REQ_add1_attr(X509_REQ *req, X509_ATTRIBUTE *attr);
-int X509_REQ_add1_attr_by_OBJ(X509_REQ *req,
-                              const ASN1_OBJECT *obj, int type,
-                              const unsigned char *bytes, int len);
-int X509_REQ_add1_attr_by_NID(X509_REQ *req,
-                              int nid, int type,
-                              const unsigned char *bytes, int len);
-int X509_REQ_add1_attr_by_txt(X509_REQ *req,
-                              const char *attrname, int type,
-                              const unsigned char *bytes, int len);
-
-int X509_CRL_set_version(X509_CRL *x, long version);
-int X509_CRL_set_issuer_name(X509_CRL *x, X509_NAME *name);
-int X509_CRL_set1_lastUpdate(X509_CRL *x, const ASN1_TIME *tm);
-int X509_CRL_set1_nextUpdate(X509_CRL *x, const ASN1_TIME *tm);
-int X509_CRL_sort(X509_CRL *crl);
-int X509_CRL_up_ref(X509_CRL *crl);
-
-# if OPENSSL_API_COMPAT < 0x10100000L
-#  define X509_CRL_set_lastUpdate X509_CRL_set1_lastUpdate
-#  define X509_CRL_set_nextUpdate X509_CRL_set1_nextUpdate
-#endif
-
-long X509_CRL_get_version(const X509_CRL *crl);
-const ASN1_TIME *X509_CRL_get0_lastUpdate(const X509_CRL *crl);
-const ASN1_TIME *X509_CRL_get0_nextUpdate(const X509_CRL *crl);
-DEPRECATEDIN_1_1_0(ASN1_TIME *X509_CRL_get_lastUpdate(X509_CRL *crl))
-DEPRECATEDIN_1_1_0(ASN1_TIME *X509_CRL_get_nextUpdate(X509_CRL *crl))
-X509_NAME *X509_CRL_get_issuer(const X509_CRL *crl);
-const STACK_OF(X509_EXTENSION) *X509_CRL_get0_extensions(const X509_CRL *crl);
-STACK_OF(X509_REVOKED) *X509_CRL_get_REVOKED(X509_CRL *crl);
-void X509_CRL_get0_signature(const X509_CRL *crl, const ASN1_BIT_STRING **psig,
-                             const X509_ALGOR **palg);
-int X509_CRL_get_signature_nid(const X509_CRL *crl);
-int i2d_re_X509_CRL_tbs(X509_CRL *req, unsigned char **pp);
-
-const ASN1_INTEGER *X509_REVOKED_get0_serialNumber(const X509_REVOKED *x);
-int X509_REVOKED_set_serialNumber(X509_REVOKED *x, ASN1_INTEGER *serial);
-const ASN1_TIME *X509_REVOKED_get0_revocationDate(const X509_REVOKED *x);
-int X509_REVOKED_set_revocationDate(X509_REVOKED *r, ASN1_TIME *tm);
-const STACK_OF(X509_EXTENSION) *
-X509_REVOKED_get0_extensions(const X509_REVOKED *r);
-
-X509_CRL *X509_CRL_diff(X509_CRL *base, X509_CRL *newer,
-                        EVP_PKEY *skey, const EVP_MD *md, unsigned int flags);
-
-int X509_REQ_check_private_key(X509_REQ *x509, EVP_PKEY *pkey);
-
-int X509_check_private_key(const X509 *x509, const EVP_PKEY *pkey);
-int X509_chain_check_suiteb(int *perror_depth,
-                            X509 *x, STACK_OF(X509) *chain,
-                            unsigned long flags);
-int X509_CRL_check_suiteb(X509_CRL *crl, EVP_PKEY *pk, unsigned long flags);
-STACK_OF(X509) *X509_chain_up_ref(STACK_OF(X509) *chain);
-
-int X509_issuer_and_serial_cmp(const X509 *a, const X509 *b);
-unsigned long X509_issuer_and_serial_hash(X509 *a);
-
-int X509_issuer_name_cmp(const X509 *a, const X509 *b);
-unsigned long X509_issuer_name_hash(X509 *a);
-
-int X509_subject_name_cmp(const X509 *a, const X509 *b);
-unsigned long X509_subject_name_hash(X509 *x);
-
-# ifndef OPENSSL_NO_MD5
-unsigned long X509_issuer_name_hash_old(X509 *a);
-unsigned long X509_subject_name_hash_old(X509 *x);
-# endif
-
-int X509_cmp(const X509 *a, const X509 *b);
-int X509_NAME_cmp(const X509_NAME *a, const X509_NAME *b);
-unsigned long X509_NAME_hash(X509_NAME *x);
-unsigned long X509_NAME_hash_old(X509_NAME *x);
-
-int X509_CRL_cmp(const X509_CRL *a, const X509_CRL *b);
-int X509_CRL_match(const X509_CRL *a, const X509_CRL *b);
-int X509_aux_print(BIO *out, X509 *x, int indent);
-# ifndef OPENSSL_NO_STDIO
-int X509_print_ex_fp(FILE *bp, X509 *x, unsigned long nmflag,
-                     unsigned long cflag);
-int X509_print_fp(FILE *bp, X509 *x);
-int X509_CRL_print_fp(FILE *bp, X509_CRL *x);
-int X509_REQ_print_fp(FILE *bp, X509_REQ *req);
-int X509_NAME_print_ex_fp(FILE *fp, const X509_NAME *nm, int indent,
-                          unsigned long flags);
-# endif
-
-int X509_NAME_print(BIO *bp, const X509_NAME *name, int obase);
-int X509_NAME_print_ex(BIO *out, const X509_NAME *nm, int indent,
-                       unsigned long flags);
-int X509_print_ex(BIO *bp, X509 *x, unsigned long nmflag,
-                  unsigned long cflag);
-int X509_print(BIO *bp, X509 *x);
-int X509_ocspid_print(BIO *bp, X509 *x);
-int X509_CRL_print(BIO *bp, X509_CRL *x);
-int X509_REQ_print_ex(BIO *bp, X509_REQ *x, unsigned long nmflag,
-                      unsigned long cflag);
-int X509_REQ_print(BIO *bp, X509_REQ *req);
-
-int X509_NAME_entry_count(const X509_NAME *name);
-int X509_NAME_get_text_by_NID(X509_NAME *name, int nid, char *buf, int len);
-int X509_NAME_get_text_by_OBJ(X509_NAME *name, const ASN1_OBJECT *obj,
-                              char *buf, int len);
-
-/*
- * NOTE: you should be passing -1, not 0 as lastpos. The functions that use
- * lastpos, search after that position on.
- */
-int X509_NAME_get_index_by_NID(X509_NAME *name, int nid, int lastpos);
-int X509_NAME_get_index_by_OBJ(X509_NAME *name, const ASN1_OBJECT *obj,
-                               int lastpos);
-X509_NAME_ENTRY *X509_NAME_get_entry(const X509_NAME *name, int loc);
-X509_NAME_ENTRY *X509_NAME_delete_entry(X509_NAME *name, int loc);
-int X509_NAME_add_entry(X509_NAME *name, const X509_NAME_ENTRY *ne,
-                        int loc, int set);
-int X509_NAME_add_entry_by_OBJ(X509_NAME *name, const ASN1_OBJECT *obj, int type,
-                               const unsigned char *bytes, int len, int loc,
-                               int set);
-int X509_NAME_add_entry_by_NID(X509_NAME *name, int nid, int type,
-                               const unsigned char *bytes, int len, int loc,
-                               int set);
-X509_NAME_ENTRY *X509_NAME_ENTRY_create_by_txt(X509_NAME_ENTRY **ne,
-                                               const char *field, int type,
-                                               const unsigned char *bytes,
-                                               int len);
-X509_NAME_ENTRY *X509_NAME_ENTRY_create_by_NID(X509_NAME_ENTRY **ne, int nid,
-                                               int type, 
-                                               const unsigned char *bytes,
-                                               int len);
-int X509_NAME_add_entry_by_txt(X509_NAME *name, const char *field, int type,
-                               const unsigned char *bytes, int len, int loc,
-                               int set);
-X509_NAME_ENTRY *X509_NAME_ENTRY_create_by_OBJ(X509_NAME_ENTRY **ne,
-                                               const ASN1_OBJECT *obj, int type,
-                                               const unsigned char *bytes,
-                                               int len);
-int X509_NAME_ENTRY_set_object(X509_NAME_ENTRY *ne, const ASN1_OBJECT *obj);
-int X509_NAME_ENTRY_set_data(X509_NAME_ENTRY *ne, int type,
-                             const unsigned char *bytes, int len);
-ASN1_OBJECT *X509_NAME_ENTRY_get_object(const X509_NAME_ENTRY *ne);
-ASN1_STRING * X509_NAME_ENTRY_get_data(const X509_NAME_ENTRY *ne);
-int X509_NAME_ENTRY_set(const X509_NAME_ENTRY *ne);
-
-int X509_NAME_get0_der(X509_NAME *nm, const unsigned char **pder,
-                       size_t *pderlen);
-
-int X509v3_get_ext_count(const STACK_OF(X509_EXTENSION) *x);
-int X509v3_get_ext_by_NID(const STACK_OF(X509_EXTENSION) *x,
-                          int nid, int lastpos);
-int X509v3_get_ext_by_OBJ(const STACK_OF(X509_EXTENSION) *x,
-                          const ASN1_OBJECT *obj, int lastpos);
-int X509v3_get_ext_by_critical(const STACK_OF(X509_EXTENSION) *x,
-                               int crit, int lastpos);
-X509_EXTENSION *X509v3_get_ext(const STACK_OF(X509_EXTENSION) *x, int loc);
-X509_EXTENSION *X509v3_delete_ext(STACK_OF(X509_EXTENSION) *x, int loc);
-STACK_OF(X509_EXTENSION) *X509v3_add_ext(STACK_OF(X509_EXTENSION) **x,
-                                         X509_EXTENSION *ex, int loc);
-
-int X509_get_ext_count(const X509 *x);
-int X509_get_ext_by_NID(const X509 *x, int nid, int lastpos);
-int X509_get_ext_by_OBJ(const X509 *x, const ASN1_OBJECT *obj, int lastpos);
-int X509_get_ext_by_critical(const X509 *x, int crit, int lastpos);
-X509_EXTENSION *X509_get_ext(const X509 *x, int loc);
-X509_EXTENSION *X509_delete_ext(X509 *x, int loc);
-int X509_add_ext(X509 *x, X509_EXTENSION *ex, int loc);
-void *X509_get_ext_d2i(const X509 *x, int nid, int *crit, int *idx);
-int X509_add1_ext_i2d(X509 *x, int nid, void *value, int crit,
-                      unsigned long flags);
-
-int X509_CRL_get_ext_count(const X509_CRL *x);
-int X509_CRL_get_ext_by_NID(const X509_CRL *x, int nid, int lastpos);
-int X509_CRL_get_ext_by_OBJ(const X509_CRL *x, const ASN1_OBJECT *obj,
-                            int lastpos);
-int X509_CRL_get_ext_by_critical(const X509_CRL *x, int crit, int lastpos);
-X509_EXTENSION *X509_CRL_get_ext(const X509_CRL *x, int loc);
-X509_EXTENSION *X509_CRL_delete_ext(X509_CRL *x, int loc);
-int X509_CRL_add_ext(X509_CRL *x, X509_EXTENSION *ex, int loc);
-void *X509_CRL_get_ext_d2i(const X509_CRL *x, int nid, int *crit, int *idx);
-int X509_CRL_add1_ext_i2d(X509_CRL *x, int nid, void *value, int crit,
-                          unsigned long flags);
-
-int X509_REVOKED_get_ext_count(const X509_REVOKED *x);
-int X509_REVOKED_get_ext_by_NID(const X509_REVOKED *x, int nid, int lastpos);
-int X509_REVOKED_get_ext_by_OBJ(const X509_REVOKED *x, const ASN1_OBJECT *obj,
-                                int lastpos);
-int X509_REVOKED_get_ext_by_critical(const X509_REVOKED *x, int crit,
-                                     int lastpos);
-X509_EXTENSION *X509_REVOKED_get_ext(const X509_REVOKED *x, int loc);
-X509_EXTENSION *X509_REVOKED_delete_ext(X509_REVOKED *x, int loc);
-int X509_REVOKED_add_ext(X509_REVOKED *x, X509_EXTENSION *ex, int loc);
-void *X509_REVOKED_get_ext_d2i(const X509_REVOKED *x, int nid, int *crit,
-                               int *idx);
-int X509_REVOKED_add1_ext_i2d(X509_REVOKED *x, int nid, void *value, int crit,
-                              unsigned long flags);
-
-X509_EXTENSION *X509_EXTENSION_create_by_NID(X509_EXTENSION **ex,
-                                             int nid, int crit,
-                                             ASN1_OCTET_STRING *data);
-X509_EXTENSION *X509_EXTENSION_create_by_OBJ(X509_EXTENSION **ex,
-                                             const ASN1_OBJECT *obj, int crit,
-                                             ASN1_OCTET_STRING *data);
-int X509_EXTENSION_set_object(X509_EXTENSION *ex, const ASN1_OBJECT *obj);
-int X509_EXTENSION_set_critical(X509_EXTENSION *ex, int crit);
-int X509_EXTENSION_set_data(X509_EXTENSION *ex, ASN1_OCTET_STRING *data);
-ASN1_OBJECT *X509_EXTENSION_get_object(X509_EXTENSION *ex);
-ASN1_OCTET_STRING *X509_EXTENSION_get_data(X509_EXTENSION *ne);
-int X509_EXTENSION_get_critical(const X509_EXTENSION *ex);
-
-int X509at_get_attr_count(const STACK_OF(X509_ATTRIBUTE) *x);
-int X509at_get_attr_by_NID(const STACK_OF(X509_ATTRIBUTE) *x, int nid,
-                           int lastpos);
-int X509at_get_attr_by_OBJ(const STACK_OF(X509_ATTRIBUTE) *sk,
-                           const ASN1_OBJECT *obj, int lastpos);
-X509_ATTRIBUTE *X509at_get_attr(const STACK_OF(X509_ATTRIBUTE) *x, int loc);
-X509_ATTRIBUTE *X509at_delete_attr(STACK_OF(X509_ATTRIBUTE) *x, int loc);
-STACK_OF(X509_ATTRIBUTE) *X509at_add1_attr(STACK_OF(X509_ATTRIBUTE) **x,
-                                           X509_ATTRIBUTE *attr);
-STACK_OF(X509_ATTRIBUTE) *X509at_add1_attr_by_OBJ(STACK_OF(X509_ATTRIBUTE)
-                                                  **x, const ASN1_OBJECT *obj,
-                                                  int type,
-                                                  const unsigned char *bytes,
-                                                  int len);
-STACK_OF(X509_ATTRIBUTE) *X509at_add1_attr_by_NID(STACK_OF(X509_ATTRIBUTE)
-                                                  **x, int nid, int type,
-                                                  const unsigned char *bytes,
-                                                  int len);
-STACK_OF(X509_ATTRIBUTE) *X509at_add1_attr_by_txt(STACK_OF(X509_ATTRIBUTE)
-                                                  **x, const char *attrname,
-                                                  int type,
-                                                  const unsigned char *bytes,
-                                                  int len);
-void *X509at_get0_data_by_OBJ(STACK_OF(X509_ATTRIBUTE) *x,
-                              const ASN1_OBJECT *obj, int lastpos, int type);
-X509_ATTRIBUTE *X509_ATTRIBUTE_create_by_NID(X509_ATTRIBUTE **attr, int nid,
-                                             int atrtype, const void *data,
-                                             int len);
-X509_ATTRIBUTE *X509_ATTRIBUTE_create_by_OBJ(X509_ATTRIBUTE **attr,
-                                             const ASN1_OBJECT *obj,
-                                             int atrtype, const void *data,
-                                             int len);
-X509_ATTRIBUTE *X509_ATTRIBUTE_create_by_txt(X509_ATTRIBUTE **attr,
-                                             const char *atrname, int type,
-                                             const unsigned char *bytes,
-                                             int len);
-int X509_ATTRIBUTE_set1_object(X509_ATTRIBUTE *attr, const ASN1_OBJECT *obj);
-int X509_ATTRIBUTE_set1_data(X509_ATTRIBUTE *attr, int attrtype,
-                             const void *data, int len);
-void *X509_ATTRIBUTE_get0_data(X509_ATTRIBUTE *attr, int idx, int atrtype,
-                               void *data);
-int X509_ATTRIBUTE_count(const X509_ATTRIBUTE *attr);
-ASN1_OBJECT *X509_ATTRIBUTE_get0_object(X509_ATTRIBUTE *attr);
-ASN1_TYPE *X509_ATTRIBUTE_get0_type(X509_ATTRIBUTE *attr, int idx);
-
-int EVP_PKEY_get_attr_count(const EVP_PKEY *key);
-int EVP_PKEY_get_attr_by_NID(const EVP_PKEY *key, int nid, int lastpos);
-int EVP_PKEY_get_attr_by_OBJ(const EVP_PKEY *key, const ASN1_OBJECT *obj,
-                             int lastpos);
-X509_ATTRIBUTE *EVP_PKEY_get_attr(const EVP_PKEY *key, int loc);
-X509_ATTRIBUTE *EVP_PKEY_delete_attr(EVP_PKEY *key, int loc);
-int EVP_PKEY_add1_attr(EVP_PKEY *key, X509_ATTRIBUTE *attr);
-int EVP_PKEY_add1_attr_by_OBJ(EVP_PKEY *key,
-                              const ASN1_OBJECT *obj, int type,
-                              const unsigned char *bytes, int len);
-int EVP_PKEY_add1_attr_by_NID(EVP_PKEY *key,
-                              int nid, int type,
-                              const unsigned char *bytes, int len);
-int EVP_PKEY_add1_attr_by_txt(EVP_PKEY *key,
-                              const char *attrname, int type,
-                              const unsigned char *bytes, int len);
-
-int X509_verify_cert(X509_STORE_CTX *ctx);
-
-/* lookup a cert from a X509 STACK */
-X509 *X509_find_by_issuer_and_serial(STACK_OF(X509) *sk, X509_NAME *name,
-                                     ASN1_INTEGER *serial);
-X509 *X509_find_by_subject(STACK_OF(X509) *sk, X509_NAME *name);
-
-DECLARE_ASN1_FUNCTIONS(PBEPARAM)
-DECLARE_ASN1_FUNCTIONS(PBE2PARAM)
-DECLARE_ASN1_FUNCTIONS(PBKDF2PARAM)
-
-int PKCS5_pbe_set0_algor(X509_ALGOR *algor, int alg, int iter,
-                         const unsigned char *salt, int saltlen);
-
-X509_ALGOR *PKCS5_pbe_set(int alg, int iter,
-                          const unsigned char *salt, int saltlen);
-X509_ALGOR *PKCS5_pbe2_set(const EVP_CIPHER *cipher, int iter,
-                           unsigned char *salt, int saltlen);
-X509_ALGOR *PKCS5_pbe2_set_iv(const EVP_CIPHER *cipher, int iter,
-                              unsigned char *salt, int saltlen,
-                              unsigned char *aiv, int prf_nid);
-
-#ifndef OPENSSL_NO_SCRYPT
-X509_ALGOR *PKCS5_pbe2_set_scrypt(const EVP_CIPHER *cipher,
-                                  const unsigned char *salt, int saltlen,
-                                  unsigned char *aiv, uint64_t N, uint64_t r,
-                                  uint64_t p);
-#endif
-
-X509_ALGOR *PKCS5_pbkdf2_set(int iter, unsigned char *salt, int saltlen,
-                             int prf_nid, int keylen);
-
-/* PKCS#8 utilities */
-
-DECLARE_ASN1_FUNCTIONS(PKCS8_PRIV_KEY_INFO)
-
-EVP_PKEY *EVP_PKCS82PKEY(const PKCS8_PRIV_KEY_INFO *p8);
-PKCS8_PRIV_KEY_INFO *EVP_PKEY2PKCS8(EVP_PKEY *pkey);
-
-int PKCS8_pkey_set0(PKCS8_PRIV_KEY_INFO *priv, ASN1_OBJECT *aobj,
-                    int version, int ptype, void *pval,
-                    unsigned char *penc, int penclen);
-int PKCS8_pkey_get0(const ASN1_OBJECT **ppkalg,
-                    const unsigned char **pk, int *ppklen,
-                    const X509_ALGOR **pa, const PKCS8_PRIV_KEY_INFO *p8);
-
-const STACK_OF(X509_ATTRIBUTE) *
-PKCS8_pkey_get0_attrs(const PKCS8_PRIV_KEY_INFO *p8);
-int PKCS8_pkey_add1_attr_by_NID(PKCS8_PRIV_KEY_INFO *p8, int nid, int type,
-                                const unsigned char *bytes, int len);
-
-int X509_PUBKEY_set0_param(X509_PUBKEY *pub, ASN1_OBJECT *aobj,
-                           int ptype, void *pval,
-                           unsigned char *penc, int penclen);
-int X509_PUBKEY_get0_param(ASN1_OBJECT **ppkalg,
-                           const unsigned char **pk, int *ppklen,
-                           X509_ALGOR **pa, X509_PUBKEY *pub);
-
-int X509_check_trust(X509 *x, int id, int flags);
-int X509_TRUST_get_count(void);
-X509_TRUST *X509_TRUST_get0(int idx);
-int X509_TRUST_get_by_id(int id);
-int X509_TRUST_add(int id, int flags, int (*ck) (X509_TRUST *, X509 *, int),
-                   const char *name, int arg1, void *arg2);
-void X509_TRUST_cleanup(void);
-int X509_TRUST_get_flags(const X509_TRUST *xp);
-char *X509_TRUST_get0_name(const X509_TRUST *xp);
-int X509_TRUST_get_trust(const X509_TRUST *xp);
-
-/* BEGIN ERROR CODES */
-/*
- * The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
-
-int ERR_load_X509_strings(void);
-
-/* Error codes for the X509 functions. */
-
-/* Function codes. */
-# define X509_F_ADD_CERT_DIR                              100
-# define X509_F_BUILD_CHAIN                               106
-# define X509_F_BY_FILE_CTRL                              101
-# define X509_F_CHECK_NAME_CONSTRAINTS                    149
-# define X509_F_CHECK_POLICY                              145
-# define X509_F_DANE_I2D                                  107
-# define X509_F_DIR_CTRL                                  102
-# define X509_F_GET_CERT_BY_SUBJECT                       103
-# define X509_F_NETSCAPE_SPKI_B64_DECODE                  129
-# define X509_F_NETSCAPE_SPKI_B64_ENCODE                  130
-# define X509_F_X509AT_ADD1_ATTR                          135
-# define X509_F_X509V3_ADD_EXT                            104
-# define X509_F_X509_ATTRIBUTE_CREATE_BY_NID              136
-# define X509_F_X509_ATTRIBUTE_CREATE_BY_OBJ              137
-# define X509_F_X509_ATTRIBUTE_CREATE_BY_TXT              140
-# define X509_F_X509_ATTRIBUTE_GET0_DATA                  139
-# define X509_F_X509_ATTRIBUTE_SET1_DATA                  138
-# define X509_F_X509_CHECK_PRIVATE_KEY                    128
-# define X509_F_X509_CRL_DIFF                             105
-# define X509_F_X509_CRL_PRINT_FP                         147
-# define X509_F_X509_EXTENSION_CREATE_BY_NID              108
-# define X509_F_X509_EXTENSION_CREATE_BY_OBJ              109
-# define X509_F_X509_GET_PUBKEY_PARAMETERS                110
-# define X509_F_X509_LOAD_CERT_CRL_FILE                   132
-# define X509_F_X509_LOAD_CERT_FILE                       111
-# define X509_F_X509_LOAD_CRL_FILE                        112
-# define X509_F_X509_NAME_ADD_ENTRY                       113
-# define X509_F_X509_NAME_ENTRY_CREATE_BY_NID             114
-# define X509_F_X509_NAME_ENTRY_CREATE_BY_TXT             131
-# define X509_F_X509_NAME_ENTRY_SET_OBJECT                115
-# define X509_F_X509_NAME_ONELINE                         116
-# define X509_F_X509_NAME_PRINT                           117
-# define X509_F_X509_OBJECT_NEW                           150
-# define X509_F_X509_PRINT_EX_FP                          118
-# define X509_F_X509_PUBKEY_DECODE                        148
-# define X509_F_X509_PUBKEY_GET0                          119
-# define X509_F_X509_PUBKEY_SET                           120
-# define X509_F_X509_REQ_CHECK_PRIVATE_KEY                144
-# define X509_F_X509_REQ_PRINT_EX                         121
-# define X509_F_X509_REQ_PRINT_FP                         122
-# define X509_F_X509_REQ_TO_X509                          123
-# define X509_F_X509_STORE_ADD_CERT                       124
-# define X509_F_X509_STORE_ADD_CRL                        125
-# define X509_F_X509_STORE_CTX_GET1_ISSUER                146
-# define X509_F_X509_STORE_CTX_INIT                       143
-# define X509_F_X509_STORE_CTX_NEW                        142
-# define X509_F_X509_STORE_CTX_PURPOSE_INHERIT            134
-# define X509_F_X509_TO_X509_REQ                          126
-# define X509_F_X509_TRUST_ADD                            133
-# define X509_F_X509_TRUST_SET                            141
-# define X509_F_X509_VERIFY_CERT                          127
-
-/* Reason codes. */
-# define X509_R_AKID_MISMATCH                             110
-# define X509_R_BAD_SELECTOR                              133
-# define X509_R_BAD_X509_FILETYPE                         100
-# define X509_R_BASE64_DECODE_ERROR                       118
-# define X509_R_CANT_CHECK_DH_KEY                         114
-# define X509_R_CERT_ALREADY_IN_HASH_TABLE                101
-# define X509_R_CRL_ALREADY_DELTA                         127
-# define X509_R_CRL_VERIFY_FAILURE                        131
-# define X509_R_IDP_MISMATCH                              128
-# define X509_R_INVALID_DIRECTORY                         113
-# define X509_R_INVALID_FIELD_NAME                        119
-# define X509_R_INVALID_TRUST                             123
-# define X509_R_ISSUER_MISMATCH                           129
-# define X509_R_KEY_TYPE_MISMATCH                         115
-# define X509_R_KEY_VALUES_MISMATCH                       116
-# define X509_R_LOADING_CERT_DIR                          103
-# define X509_R_LOADING_DEFAULTS                          104
-# define X509_R_METHOD_NOT_SUPPORTED                      124
-# define X509_R_NAME_TOO_LONG                             134
-# define X509_R_NEWER_CRL_NOT_NEWER                       132
-# define X509_R_NO_CERT_SET_FOR_US_TO_VERIFY              105
-# define X509_R_NO_CRL_NUMBER                             130
-# define X509_R_PUBLIC_KEY_DECODE_ERROR                   125
-# define X509_R_PUBLIC_KEY_ENCODE_ERROR                   126
-# define X509_R_SHOULD_RETRY                              106
-# define X509_R_UNABLE_TO_FIND_PARAMETERS_IN_CHAIN        107
-# define X509_R_UNABLE_TO_GET_CERTS_PUBLIC_KEY            108
-# define X509_R_UNKNOWN_KEY_TYPE                          117
-# define X509_R_UNKNOWN_NID                               109
-# define X509_R_UNKNOWN_PURPOSE_ID                        121
-# define X509_R_UNKNOWN_TRUST_ID                          120
-# define X509_R_UNSUPPORTED_ALGORITHM                     111
-# define X509_R_WRONG_LOOKUP_TYPE                         112
-# define X509_R_WRONG_TYPE                                122
-
-# ifdef  __cplusplus
-}
-# endif
-#endif

gpac-2.2.1.tar.gz/extra_lib/include/openssl/x509_vfy.h Deleted

@@ -1,544 +0,0 @@
-/*
- * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
- *
- * Licensed under the OpenSSL license (the "License").  You may not use
- * this file except in compliance with the License.  You can obtain a copy
- * in the file LICENSE in the source distribution or at
- * https://www.openssl.org/source/license.html
- */
-
-#ifndef HEADER_X509_VFY_H
-# define HEADER_X509_VFY_H
-
-/*
- * Protect against recursion, x509.h and x509_vfy.h each include the other.
- */
-# ifndef HEADER_X509_H
-#  include <openssl/x509.h>
-# endif
-
-# include <openssl/opensslconf.h>
-# include <openssl/lhash.h>
-# include <openssl/bio.h>
-# include <openssl/crypto.h>
-# include <openssl/symhacks.h>
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-/*-
-SSL_CTX -> X509_STORE
-                -> X509_LOOKUP
-                        ->X509_LOOKUP_METHOD
-                -> X509_LOOKUP
-                        ->X509_LOOKUP_METHOD
-
-SSL     -> X509_STORE_CTX
-                ->X509_STORE
-
-The X509_STORE holds the tables etc for verification stuff.
-A X509_STORE_CTX is used while validating a single certificate.
-The X509_STORE has X509_LOOKUPs for looking up certs.
-The X509_STORE then calls a function to actually verify the
-certificate chain.
-*/
-
-typedef enum {
-    X509_LU_NONE = 0,
-    X509_LU_X509, X509_LU_CRL
-} X509_LOOKUP_TYPE;
-
-#if OPENSSL_API_COMPAT < 0x10100000L
-#define X509_LU_RETRY   -1
-#define X509_LU_FAIL    0
-#endif
-
-DEFINE_STACK_OF(X509_LOOKUP)
-DEFINE_STACK_OF(X509_OBJECT)
-DEFINE_STACK_OF(X509_VERIFY_PARAM)
-
-int X509_STORE_set_depth(X509_STORE *store, int depth);
-
-typedef int (*X509_STORE_CTX_verify_cb)(int, X509_STORE_CTX *);
-typedef int (*X509_STORE_CTX_verify_fn)(X509_STORE_CTX *);
-typedef int (*X509_STORE_CTX_get_issuer_fn)(X509 **issuer,
-                                            X509_STORE_CTX *ctx, X509 *x);
-typedef int (*X509_STORE_CTX_check_issued_fn)(X509_STORE_CTX *ctx,
-                                              X509 *x, X509 *issuer);
-typedef int (*X509_STORE_CTX_check_revocation_fn)(X509_STORE_CTX *ctx);
-typedef int (*X509_STORE_CTX_get_crl_fn)(X509_STORE_CTX *ctx,
-                                         X509_CRL **crl, X509 *x);
-typedef int (*X509_STORE_CTX_check_crl_fn)(X509_STORE_CTX *ctx, X509_CRL *crl);
-typedef int (*X509_STORE_CTX_cert_crl_fn)(X509_STORE_CTX *ctx,
-                                          X509_CRL *crl, X509 *x);
-typedef int (*X509_STORE_CTX_check_policy_fn)(X509_STORE_CTX *ctx);
-typedef STACK_OF(X509) *(*X509_STORE_CTX_lookup_certs_fn)(X509_STORE_CTX *ctx,
-                                                          X509_NAME *nm);
-typedef STACK_OF(X509_CRL) *(*X509_STORE_CTX_lookup_crls_fn)(X509_STORE_CTX *ctx,
-                                                             X509_NAME *nm);
-typedef int (*X509_STORE_CTX_cleanup_fn)(X509_STORE_CTX *ctx);
-
-
-void X509_STORE_CTX_set_depth(X509_STORE_CTX *ctx, int depth);
-
-# define X509_STORE_CTX_set_app_data(ctx,data) \
-        X509_STORE_CTX_set_ex_data(ctx,0,data)
-# define X509_STORE_CTX_get_app_data(ctx) \
-        X509_STORE_CTX_get_ex_data(ctx,0)
-
-# define X509_L_FILE_LOAD        1
-# define X509_L_ADD_DIR          2
-
-# define X509_LOOKUP_load_file(x,name,type) \
-                X509_LOOKUP_ctrl((x),X509_L_FILE_LOAD,(name),(long)(type),NULL)
-
-# define X509_LOOKUP_add_dir(x,name,type) \
-                X509_LOOKUP_ctrl((x),X509_L_ADD_DIR,(name),(long)(type),NULL)
-
-# define         X509_V_OK                                       0
-# define         X509_V_ERR_UNSPECIFIED                          1
-# define         X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT            2
-# define         X509_V_ERR_UNABLE_TO_GET_CRL                    3
-# define         X509_V_ERR_UNABLE_TO_DECRYPT_CERT_SIGNATURE     4
-# define         X509_V_ERR_UNABLE_TO_DECRYPT_CRL_SIGNATURE      5
-# define         X509_V_ERR_UNABLE_TO_DECODE_ISSUER_PUBLIC_KEY   6
-# define         X509_V_ERR_CERT_SIGNATURE_FAILURE               7
-# define         X509_V_ERR_CRL_SIGNATURE_FAILURE                8
-# define         X509_V_ERR_CERT_NOT_YET_VALID                   9
-# define         X509_V_ERR_CERT_HAS_EXPIRED                     10
-# define         X509_V_ERR_CRL_NOT_YET_VALID                    11
-# define         X509_V_ERR_CRL_HAS_EXPIRED                      12
-# define         X509_V_ERR_ERROR_IN_CERT_NOT_BEFORE_FIELD       13
-# define         X509_V_ERR_ERROR_IN_CERT_NOT_AFTER_FIELD        14
-# define         X509_V_ERR_ERROR_IN_CRL_LAST_UPDATE_FIELD       15
-# define         X509_V_ERR_ERROR_IN_CRL_NEXT_UPDATE_FIELD       16
-# define         X509_V_ERR_OUT_OF_MEM                           17
-# define         X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT          18
-# define         X509_V_ERR_SELF_SIGNED_CERT_IN_CHAIN            19
-# define         X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY    20
-# define         X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE      21
-# define         X509_V_ERR_CERT_CHAIN_TOO_LONG                  22
-# define         X509_V_ERR_CERT_REVOKED                         23
-# define         X509_V_ERR_INVALID_CA                           24
-# define         X509_V_ERR_PATH_LENGTH_EXCEEDED                 25
-# define         X509_V_ERR_INVALID_PURPOSE                      26
-# define         X509_V_ERR_CERT_UNTRUSTED                       27
-# define         X509_V_ERR_CERT_REJECTED                        28
-/* These are 'informational' when looking for issuer cert */
-# define         X509_V_ERR_SUBJECT_ISSUER_MISMATCH              29
-# define         X509_V_ERR_AKID_SKID_MISMATCH                   30
-# define         X509_V_ERR_AKID_ISSUER_SERIAL_MISMATCH          31
-# define         X509_V_ERR_KEYUSAGE_NO_CERTSIGN                 32
-# define         X509_V_ERR_UNABLE_TO_GET_CRL_ISSUER             33
-# define         X509_V_ERR_UNHANDLED_CRITICAL_EXTENSION         34
-# define         X509_V_ERR_KEYUSAGE_NO_CRL_SIGN                 35
-# define         X509_V_ERR_UNHANDLED_CRITICAL_CRL_EXTENSION     36
-# define         X509_V_ERR_INVALID_NON_CA                       37
-# define         X509_V_ERR_PROXY_PATH_LENGTH_EXCEEDED           38
-# define         X509_V_ERR_KEYUSAGE_NO_DIGITAL_SIGNATURE        39
-# define         X509_V_ERR_PROXY_CERTIFICATES_NOT_ALLOWED       40
-# define         X509_V_ERR_INVALID_EXTENSION                    41
-# define         X509_V_ERR_INVALID_POLICY_EXTENSION             42
-# define         X509_V_ERR_NO_EXPLICIT_POLICY                   43
-# define         X509_V_ERR_DIFFERENT_CRL_SCOPE                  44
-# define         X509_V_ERR_UNSUPPORTED_EXTENSION_FEATURE        45
-# define         X509_V_ERR_UNNESTED_RESOURCE                    46
-# define         X509_V_ERR_PERMITTED_VIOLATION                  47
-# define         X509_V_ERR_EXCLUDED_VIOLATION                   48
-# define         X509_V_ERR_SUBTREE_MINMAX                       49
-/* The application is not happy */
-# define         X509_V_ERR_APPLICATION_VERIFICATION             50
-# define         X509_V_ERR_UNSUPPORTED_CONSTRAINT_TYPE          51
-# define         X509_V_ERR_UNSUPPORTED_CONSTRAINT_SYNTAX        52
-# define         X509_V_ERR_UNSUPPORTED_NAME_SYNTAX              53
-# define         X509_V_ERR_CRL_PATH_VALIDATION_ERROR            54
-/* Another issuer check debug option */
-# define         X509_V_ERR_PATH_LOOP                            55
-/* Suite B mode algorithm violation */
-# define         X509_V_ERR_SUITE_B_INVALID_VERSION              56
-# define         X509_V_ERR_SUITE_B_INVALID_ALGORITHM            57
-# define         X509_V_ERR_SUITE_B_INVALID_CURVE                58
-# define         X509_V_ERR_SUITE_B_INVALID_SIGNATURE_ALGORITHM  59
-# define         X509_V_ERR_SUITE_B_LOS_NOT_ALLOWED              60
-# define         X509_V_ERR_SUITE_B_CANNOT_SIGN_P_384_WITH_P_256 61
-/* Host, email and IP check errors */
-# define         X509_V_ERR_HOSTNAME_MISMATCH                    62
-# define         X509_V_ERR_EMAIL_MISMATCH                       63
-# define         X509_V_ERR_IP_ADDRESS_MISMATCH                  64
-/* DANE TLSA errors */
-# define         X509_V_ERR_DANE_NO_MATCH                        65
-/* security level errors */
-# define         X509_V_ERR_EE_KEY_TOO_SMALL                     66
-# define         X509_V_ERR_CA_KEY_TOO_SMALL                     67
-# define         X509_V_ERR_CA_MD_TOO_WEAK                       68
-/* Caller error */
-# define         X509_V_ERR_INVALID_CALL                         69
-/* Issuer lookup error */
-# define         X509_V_ERR_STORE_LOOKUP                         70
-/* Certificate transparency */
-# define         X509_V_ERR_NO_VALID_SCTS                        71
-
-# define         X509_V_ERR_PROXY_SUBJECT_NAME_VIOLATION         72
-
-/* Certificate verify flags */
-
-# if OPENSSL_API_COMPAT < 0x10100000L
-#  define X509_V_FLAG_CB_ISSUER_CHECK             0x0   /* Deprecated */
-# endif
-/* Use check time instead of current time */
-# define X509_V_FLAG_USE_CHECK_TIME              0x2
-/* Lookup CRLs */
-# define X509_V_FLAG_CRL_CHECK                   0x4
-/* Lookup CRLs for whole chain */
-# define X509_V_FLAG_CRL_CHECK_ALL               0x8
-/* Ignore unhandled critical extensions */
-# define X509_V_FLAG_IGNORE_CRITICAL             0x10
-/* Disable workarounds for broken certificates */
-# define X509_V_FLAG_X509_STRICT                 0x20
-/* Enable proxy certificate validation */
-# define X509_V_FLAG_ALLOW_PROXY_CERTS           0x40
-/* Enable policy checking */
-# define X509_V_FLAG_POLICY_CHECK                0x80
-/* Policy variable require-explicit-policy */
-# define X509_V_FLAG_EXPLICIT_POLICY             0x100
-/* Policy variable inhibit-any-policy */
-# define X509_V_FLAG_INHIBIT_ANY                 0x200
-/* Policy variable inhibit-policy-mapping */
-# define X509_V_FLAG_INHIBIT_MAP                 0x400
-/* Notify callback that policy is OK */
-# define X509_V_FLAG_NOTIFY_POLICY               0x800
-/* Extended CRL features such as indirect CRLs, alternate CRL signing keys */
-# define X509_V_FLAG_EXTENDED_CRL_SUPPORT        0x1000
-/* Delta CRL support */
-# define X509_V_FLAG_USE_DELTAS                  0x2000
-/* Check self-signed CA signature */
-# define X509_V_FLAG_CHECK_SS_SIGNATURE          0x4000
-/* Use trusted store first */
-# define X509_V_FLAG_TRUSTED_FIRST               0x8000
-/* Suite B 128 bit only mode: not normally used */
-# define X509_V_FLAG_SUITEB_128_LOS_ONLY         0x10000
-/* Suite B 192 bit only mode */
-# define X509_V_FLAG_SUITEB_192_LOS              0x20000
-/* Suite B 128 bit mode allowing 192 bit algorithms */
-# define X509_V_FLAG_SUITEB_128_LOS              0x30000
-/* Allow partial chains if at least one certificate is in trusted store */
-# define X509_V_FLAG_PARTIAL_CHAIN               0x80000
-/*
- * If the initial chain is not trusted, do not attempt to build an alternative
- * chain. Alternate chain checking was introduced in 1.1.0. Setting this flag
- * will force the behaviour to match that of previous versions.
- */
-# define X509_V_FLAG_NO_ALT_CHAINS               0x100000
-/* Do not check certificate/CRL validity against current time */
-# define X509_V_FLAG_NO_CHECK_TIME               0x200000
-
-# define X509_VP_FLAG_DEFAULT                    0x1
-# define X509_VP_FLAG_OVERWRITE                  0x2
-# define X509_VP_FLAG_RESET_FLAGS                0x4
-# define X509_VP_FLAG_LOCKED                     0x8
-# define X509_VP_FLAG_ONCE                       0x10
-
-/* Internal use: mask of policy related options */
-# define X509_V_FLAG_POLICY_MASK (X509_V_FLAG_POLICY_CHECK \
-                                | X509_V_FLAG_EXPLICIT_POLICY \
-                                | X509_V_FLAG_INHIBIT_ANY \
-                                | X509_V_FLAG_INHIBIT_MAP)
-
-int X509_OBJECT_idx_by_subject(STACK_OF(X509_OBJECT) *h, X509_LOOKUP_TYPE type,
-                               X509_NAME *name);
-X509_OBJECT *X509_OBJECT_retrieve_by_subject(STACK_OF(X509_OBJECT) *h,
-                                             X509_LOOKUP_TYPE type,
-                                             X509_NAME *name);
-X509_OBJECT *X509_OBJECT_retrieve_match(STACK_OF(X509_OBJECT) *h,
-                                        X509_OBJECT *x);
-int X509_OBJECT_up_ref_count(X509_OBJECT *a);
-X509_OBJECT *X509_OBJECT_new(void);
-void X509_OBJECT_free(X509_OBJECT *a);
-X509_LOOKUP_TYPE X509_OBJECT_get_type(const X509_OBJECT *a);
-X509 *X509_OBJECT_get0_X509(const X509_OBJECT *a);
-X509_CRL *X509_OBJECT_get0_X509_CRL(X509_OBJECT *a);
-X509_STORE *X509_STORE_new(void);
-void X509_STORE_free(X509_STORE *v);
-int X509_STORE_lock(X509_STORE *ctx);
-int X509_STORE_unlock(X509_STORE *ctx);
-int X509_STORE_up_ref(X509_STORE *v);
-STACK_OF(X509_OBJECT) *X509_STORE_get0_objects(X509_STORE *v);
-
-STACK_OF(X509) *X509_STORE_CTX_get1_certs(X509_STORE_CTX *st, X509_NAME *nm);
-STACK_OF(X509_CRL) *X509_STORE_CTX_get1_crls(X509_STORE_CTX *st, X509_NAME *nm);
-int X509_STORE_set_flags(X509_STORE *ctx, unsigned long flags);
-int X509_STORE_set_purpose(X509_STORE *ctx, int purpose);
-int X509_STORE_set_trust(X509_STORE *ctx, int trust);
-int X509_STORE_set1_param(X509_STORE *ctx, X509_VERIFY_PARAM *pm);
-X509_VERIFY_PARAM *X509_STORE_get0_param(X509_STORE *ctx);
-
-void X509_STORE_set_verify(X509_STORE *ctx, X509_STORE_CTX_verify_fn verify);
-#define X509_STORE_set_verify_func(ctx, func) \
-            X509_STORE_set_verify((ctx),(func))
-void X509_STORE_CTX_set_verify(X509_STORE_CTX *ctx,
-                               X509_STORE_CTX_verify_fn verify);
-X509_STORE_CTX_verify_fn X509_STORE_get_verify(X509_STORE *ctx);
-void X509_STORE_set_verify_cb(X509_STORE *ctx,
-                              X509_STORE_CTX_verify_cb verify_cb);
-# define X509_STORE_set_verify_cb_func(ctx,func) \
-            X509_STORE_set_verify_cb((ctx),(func))
-X509_STORE_CTX_verify_cb X509_STORE_get_verify_cb(X509_STORE *ctx);
-void X509_STORE_set_get_issuer(X509_STORE *ctx,
-                               X509_STORE_CTX_get_issuer_fn get_issuer);
-X509_STORE_CTX_get_issuer_fn X509_STORE_get_get_issuer(X509_STORE *ctx);
-void X509_STORE_set_check_issued(X509_STORE *ctx,
-                                 X509_STORE_CTX_check_issued_fn check_issued);
-X509_STORE_CTX_check_issued_fn X509_STORE_get_check_issued(X509_STORE *ctx);
-void X509_STORE_set_check_revocation(X509_STORE *ctx,
-                                     X509_STORE_CTX_check_revocation_fn check_revocation);
-X509_STORE_CTX_check_revocation_fn X509_STORE_get_check_revocation(X509_STORE *ctx);
-void X509_STORE_set_get_crl(X509_STORE *ctx,
-                            X509_STORE_CTX_get_crl_fn get_crl);
-X509_STORE_CTX_get_crl_fn X509_STORE_get_get_crl(X509_STORE *ctx);
-void X509_STORE_set_check_crl(X509_STORE *ctx,
-                              X509_STORE_CTX_check_crl_fn check_crl);
-X509_STORE_CTX_check_crl_fn X509_STORE_get_check_crl(X509_STORE *ctx);
-void X509_STORE_set_cert_crl(X509_STORE *ctx,
-                             X509_STORE_CTX_cert_crl_fn cert_crl);
-X509_STORE_CTX_cert_crl_fn X509_STORE_get_cert_crl(X509_STORE *ctx);
-void X509_STORE_set_check_policy(X509_STORE *ctx,
-                                 X509_STORE_CTX_check_policy_fn check_policy);
-X509_STORE_CTX_check_policy_fn X509_STORE_get_check_policy(X509_STORE *ctx);
-void X509_STORE_set_lookup_certs(X509_STORE *ctx,
-                                 X509_STORE_CTX_lookup_certs_fn lookup_certs);
-X509_STORE_CTX_lookup_certs_fn X509_STORE_get_lookup_certs(X509_STORE *ctx);
-void X509_STORE_set_lookup_crls(X509_STORE *ctx,
-                                X509_STORE_CTX_lookup_crls_fn lookup_crls);
-#define X509_STORE_set_lookup_crls_cb(ctx, func) \
-    X509_STORE_set_lookup_crls((ctx), (func))
-X509_STORE_CTX_lookup_crls_fn X509_STORE_get_lookup_crls(X509_STORE *ctx);
-void X509_STORE_set_cleanup(X509_STORE *ctx,
-                            X509_STORE_CTX_cleanup_fn cleanup);
-X509_STORE_CTX_cleanup_fn X509_STORE_get_cleanup(X509_STORE *ctx);
-
-#define X509_STORE_get_ex_new_index(l, p, newf, dupf, freef) \
-    CRYPTO_get_ex_new_index(CRYPTO_EX_INDEX_X509_STORE, l, p, newf, dupf, freef)
-int X509_STORE_set_ex_data(X509_STORE *ctx, int idx, void *data);
-void *X509_STORE_get_ex_data(X509_STORE *ctx, int idx);
-
-X509_STORE_CTX *X509_STORE_CTX_new(void);
-
-int X509_STORE_CTX_get1_issuer(X509 **issuer, X509_STORE_CTX *ctx, X509 *x);
-
-void X509_STORE_CTX_free(X509_STORE_CTX *ctx);
-int X509_STORE_CTX_init(X509_STORE_CTX *ctx, X509_STORE *store,
-                        X509 *x509, STACK_OF(X509) *chain);
-void X509_STORE_CTX_set0_trusted_stack(X509_STORE_CTX *ctx, STACK_OF(X509) *sk);
-void X509_STORE_CTX_cleanup(X509_STORE_CTX *ctx);
-
-X509_STORE *X509_STORE_CTX_get0_store(X509_STORE_CTX *ctx);
-X509 *X509_STORE_CTX_get0_cert(X509_STORE_CTX *ctx);
-STACK_OF(X509)* X509_STORE_CTX_get0_untrusted(X509_STORE_CTX *ctx);
-void X509_STORE_CTX_set0_untrusted(X509_STORE_CTX *ctx, STACK_OF(X509) *sk);
-void X509_STORE_CTX_set_verify_cb(X509_STORE_CTX *ctx,
-                                  X509_STORE_CTX_verify_cb verify);
-X509_STORE_CTX_verify_cb X509_STORE_CTX_get_verify_cb(X509_STORE_CTX *ctx);
-X509_STORE_CTX_verify_fn X509_STORE_CTX_get_verify(X509_STORE_CTX *ctx);
-X509_STORE_CTX_get_issuer_fn X509_STORE_CTX_get_get_issuer(X509_STORE_CTX *ctx);
-X509_STORE_CTX_check_issued_fn X509_STORE_CTX_get_check_issued(X509_STORE_CTX *ctx);
-X509_STORE_CTX_check_revocation_fn X509_STORE_CTX_get_check_revocation(X509_STORE_CTX *ctx);
-X509_STORE_CTX_get_crl_fn X509_STORE_CTX_get_get_crl(X509_STORE_CTX *ctx);
-X509_STORE_CTX_check_crl_fn X509_STORE_CTX_get_check_crl(X509_STORE_CTX *ctx);
-X509_STORE_CTX_cert_crl_fn X509_STORE_CTX_get_cert_crl(X509_STORE_CTX *ctx);
-X509_STORE_CTX_check_policy_fn X509_STORE_CTX_get_check_policy(X509_STORE_CTX *ctx);
-X509_STORE_CTX_lookup_certs_fn X509_STORE_CTX_get_lookup_certs(X509_STORE_CTX *ctx);
-X509_STORE_CTX_lookup_crls_fn X509_STORE_CTX_get_lookup_crls(X509_STORE_CTX *ctx);
-X509_STORE_CTX_cleanup_fn X509_STORE_CTX_get_cleanup(X509_STORE_CTX *ctx);
-
-#if OPENSSL_API_COMPAT < 0x10100000L
-# define X509_STORE_CTX_get_chain X509_STORE_CTX_get0_chain
-# define X509_STORE_CTX_set_chain X509_STORE_CTX_set0_untrusted
-# define X509_STORE_CTX_trusted_stack X509_STORE_CTX_set0_trusted_stack
-# define X509_STORE_get_by_subject X509_STORE_CTX_get_by_subject
-# define X509_STORE_get1_cert X509_STORE_CTX_get1_certs
-# define X509_STORE_get1_crl X509_STORE_CTX_get1_crls
-#endif
-
-X509_LOOKUP *X509_STORE_add_lookup(X509_STORE *v, X509_LOOKUP_METHOD *m);
-X509_LOOKUP_METHOD *X509_LOOKUP_hash_dir(void);
-X509_LOOKUP_METHOD *X509_LOOKUP_file(void);
-
-int X509_STORE_add_cert(X509_STORE *ctx, X509 *x);
-int X509_STORE_add_crl(X509_STORE *ctx, X509_CRL *x);
-
-int X509_STORE_CTX_get_by_subject(X509_STORE_CTX *vs, X509_LOOKUP_TYPE type,
-                                  X509_NAME *name, X509_OBJECT *ret);
-X509_OBJECT *X509_STORE_CTX_get_obj_by_subject(X509_STORE_CTX *vs,
-                                               X509_LOOKUP_TYPE type,
-                                               X509_NAME *name);
-
-int X509_LOOKUP_ctrl(X509_LOOKUP *ctx, int cmd, const char *argc,
-                     long argl, char **ret);
-
-int X509_load_cert_file(X509_LOOKUP *ctx, const char *file, int type);
-int X509_load_crl_file(X509_LOOKUP *ctx, const char *file, int type);
-int X509_load_cert_crl_file(X509_LOOKUP *ctx, const char *file, int type);
-
-X509_LOOKUP *X509_LOOKUP_new(X509_LOOKUP_METHOD *method);
-void X509_LOOKUP_free(X509_LOOKUP *ctx);
-int X509_LOOKUP_init(X509_LOOKUP *ctx);
-int X509_LOOKUP_by_subject(X509_LOOKUP *ctx, X509_LOOKUP_TYPE type,
-                           X509_NAME *name, X509_OBJECT *ret);
-int X509_LOOKUP_by_issuer_serial(X509_LOOKUP *ctx, X509_LOOKUP_TYPE type,
-                                 X509_NAME *name, ASN1_INTEGER *serial,
-                                 X509_OBJECT *ret);
-int X509_LOOKUP_by_fingerprint(X509_LOOKUP *ctx, X509_LOOKUP_TYPE type,
-                               const unsigned char *bytes, int len,
-                               X509_OBJECT *ret);
-int X509_LOOKUP_by_alias(X509_LOOKUP *ctx, X509_LOOKUP_TYPE type,
-                         const char *str, int len, X509_OBJECT *ret);
-int X509_LOOKUP_shutdown(X509_LOOKUP *ctx);
-
-int X509_STORE_load_locations(X509_STORE *ctx,
-                              const char *file, const char *dir);
-int X509_STORE_set_default_paths(X509_STORE *ctx);
-
-#define X509_STORE_CTX_get_ex_new_index(l, p, newf, dupf, freef) \
-    CRYPTO_get_ex_new_index(CRYPTO_EX_INDEX_X509_STORE_CTX, l, p, newf, dupf, freef)
-int X509_STORE_CTX_set_ex_data(X509_STORE_CTX *ctx, int idx, void *data);
-void *X509_STORE_CTX_get_ex_data(X509_STORE_CTX *ctx, int idx);
-int X509_STORE_CTX_get_error(X509_STORE_CTX *ctx);
-void X509_STORE_CTX_set_error(X509_STORE_CTX *ctx, int s);
-int X509_STORE_CTX_get_error_depth(X509_STORE_CTX *ctx);
-void X509_STORE_CTX_set_error_depth(X509_STORE_CTX *ctx, int depth);
-X509 *X509_STORE_CTX_get_current_cert(X509_STORE_CTX *ctx);
-void X509_STORE_CTX_set_current_cert(X509_STORE_CTX *ctx, X509 *x);
-X509 *X509_STORE_CTX_get0_current_issuer(X509_STORE_CTX *ctx);
-X509_CRL *X509_STORE_CTX_get0_current_crl(X509_STORE_CTX *ctx);
-X509_STORE_CTX *X509_STORE_CTX_get0_parent_ctx(X509_STORE_CTX *ctx);
-STACK_OF(X509) *X509_STORE_CTX_get0_chain(X509_STORE_CTX *ctx);
-STACK_OF(X509) *X509_STORE_CTX_get1_chain(X509_STORE_CTX *ctx);
-void X509_STORE_CTX_set_cert(X509_STORE_CTX *c, X509 *x);
-void X509_STORE_CTX_set0_verified_chain(X509_STORE_CTX *c, STACK_OF(X509) *sk);
-void X509_STORE_CTX_set0_crls(X509_STORE_CTX *c, STACK_OF(X509_CRL) *sk);
-int X509_STORE_CTX_set_purpose(X509_STORE_CTX *ctx, int purpose);
-int X509_STORE_CTX_set_trust(X509_STORE_CTX *ctx, int trust);
-int X509_STORE_CTX_purpose_inherit(X509_STORE_CTX *ctx, int def_purpose,
-                                   int purpose, int trust);
-void X509_STORE_CTX_set_flags(X509_STORE_CTX *ctx, unsigned long flags);
-void X509_STORE_CTX_set_time(X509_STORE_CTX *ctx, unsigned long flags,
-                             time_t t);
-
-X509_POLICY_TREE *X509_STORE_CTX_get0_policy_tree(X509_STORE_CTX *ctx);
-int X509_STORE_CTX_get_explicit_policy(X509_STORE_CTX *ctx);
-int X509_STORE_CTX_get_num_untrusted(X509_STORE_CTX *ctx);
-
-X509_VERIFY_PARAM *X509_STORE_CTX_get0_param(X509_STORE_CTX *ctx);
-void X509_STORE_CTX_set0_param(X509_STORE_CTX *ctx, X509_VERIFY_PARAM *param);
-int X509_STORE_CTX_set_default(X509_STORE_CTX *ctx, const char *name);
-
-/*
- * Bridge opacity barrier between libcrypt and libssl, also needed to support
- * offline testing in test/danetest.c
- */
-void X509_STORE_CTX_set0_dane(X509_STORE_CTX *ctx, SSL_DANE *dane);
-#define DANE_FLAG_NO_DANE_EE_NAMECHECKS (1L << 0)
-
-/* X509_VERIFY_PARAM functions */
-
-X509_VERIFY_PARAM *X509_VERIFY_PARAM_new(void);
-void X509_VERIFY_PARAM_free(X509_VERIFY_PARAM *param);
-int X509_VERIFY_PARAM_inherit(X509_VERIFY_PARAM *to,
-                              const X509_VERIFY_PARAM *from);
-int X509_VERIFY_PARAM_set1(X509_VERIFY_PARAM *to,
-                           const X509_VERIFY_PARAM *from);
-int X509_VERIFY_PARAM_set1_name(X509_VERIFY_PARAM *param, const char *name);
-int X509_VERIFY_PARAM_set_flags(X509_VERIFY_PARAM *param,
-                                unsigned long flags);
-int X509_VERIFY_PARAM_clear_flags(X509_VERIFY_PARAM *param,
-                                  unsigned long flags);
-unsigned long X509_VERIFY_PARAM_get_flags(X509_VERIFY_PARAM *param);
-int X509_VERIFY_PARAM_set_purpose(X509_VERIFY_PARAM *param, int purpose);
-int X509_VERIFY_PARAM_set_trust(X509_VERIFY_PARAM *param, int trust);
-void X509_VERIFY_PARAM_set_depth(X509_VERIFY_PARAM *param, int depth);
-void X509_VERIFY_PARAM_set_auth_level(X509_VERIFY_PARAM *param, int auth_level);
-time_t X509_VERIFY_PARAM_get_time(const X509_VERIFY_PARAM *param);
-void X509_VERIFY_PARAM_set_time(X509_VERIFY_PARAM *param, time_t t);
-int X509_VERIFY_PARAM_add0_policy(X509_VERIFY_PARAM *param,
-                                  ASN1_OBJECT *policy);
-int X509_VERIFY_PARAM_set1_policies(X509_VERIFY_PARAM *param,
-                                    STACK_OF(ASN1_OBJECT) *policies);
-
-int X509_VERIFY_PARAM_set_inh_flags(X509_VERIFY_PARAM *param,
-                                    uint32_t flags);
-uint32_t X509_VERIFY_PARAM_get_inh_flags(const X509_VERIFY_PARAM *param);
-
-int X509_VERIFY_PARAM_set1_host(X509_VERIFY_PARAM *param,
-                                const char *name, size_t namelen);
-int X509_VERIFY_PARAM_add1_host(X509_VERIFY_PARAM *param,
-                                const char *name, size_t namelen);
-void X509_VERIFY_PARAM_set_hostflags(X509_VERIFY_PARAM *param,
-                                     unsigned int flags);
-char *X509_VERIFY_PARAM_get0_peername(X509_VERIFY_PARAM *);
-void X509_VERIFY_PARAM_move_peername(X509_VERIFY_PARAM *, X509_VERIFY_PARAM *);
-int X509_VERIFY_PARAM_set1_email(X509_VERIFY_PARAM *param,
-                                 const char *email, size_t emaillen);
-int X509_VERIFY_PARAM_set1_ip(X509_VERIFY_PARAM *param,
-                              const unsigned char *ip, size_t iplen);
-int X509_VERIFY_PARAM_set1_ip_asc(X509_VERIFY_PARAM *param,
-                                  const char *ipasc);
-
-int X509_VERIFY_PARAM_get_depth(const X509_VERIFY_PARAM *param);
-int X509_VERIFY_PARAM_get_auth_level(const X509_VERIFY_PARAM *param);
-const char *X509_VERIFY_PARAM_get0_name(const X509_VERIFY_PARAM *param);
-
-int X509_VERIFY_PARAM_add0_table(X509_VERIFY_PARAM *param);
-int X509_VERIFY_PARAM_get_count(void);
-const X509_VERIFY_PARAM *X509_VERIFY_PARAM_get0(int id);
-const X509_VERIFY_PARAM *X509_VERIFY_PARAM_lookup(const char *name);
-void X509_VERIFY_PARAM_table_cleanup(void);
-
-/* Non positive return values are errors */
-#define X509_PCY_TREE_FAILURE  -2 /* Failure to satisfy explicit policy */
-#define X509_PCY_TREE_INVALID  -1 /* Inconsistent or invalid extensions */
-#define X509_PCY_TREE_INTERNAL  0 /* Internal error, most likely malloc */
-
-/*
- * Positive return values form a bit mask, all but the first are internal to
- * the library and don't appear in results from X509_policy_check().
- */
-#define X509_PCY_TREE_VALID     1 /* The policy tree is valid */
-#define X509_PCY_TREE_EMPTY     2 /* The policy tree is empty */
-#define X509_PCY_TREE_EXPLICIT  4 /* Explicit policy required */
-
-int X509_policy_check(X509_POLICY_TREE **ptree, int *pexplicit_policy,
-                      STACK_OF(X509) *certs,
-                      STACK_OF(ASN1_OBJECT) *policy_oids, unsigned int flags);
-
-void X509_policy_tree_free(X509_POLICY_TREE *tree);
-
-int X509_policy_tree_level_count(const X509_POLICY_TREE *tree);
-X509_POLICY_LEVEL *X509_policy_tree_get0_level(const X509_POLICY_TREE *tree,
-                                               int i);
-
-STACK_OF(X509_POLICY_NODE) *X509_policy_tree_get0_policies(const
-                                                           X509_POLICY_TREE
-                                                           *tree);
-
-STACK_OF(X509_POLICY_NODE) *X509_policy_tree_get0_user_policies(const
-                                                                X509_POLICY_TREE
-                                                                *tree);
-
-int X509_policy_level_node_count(X509_POLICY_LEVEL *level);
-
-X509_POLICY_NODE *X509_policy_level_get0_node(X509_POLICY_LEVEL *level,
-                                              int i);
-
-const ASN1_OBJECT *X509_policy_node_get0_policy(const X509_POLICY_NODE *node);
-
-STACK_OF(POLICYQUALINFO) *X509_policy_node_get0_qualifiers(const
-                                                           X509_POLICY_NODE
-                                                           *node);
-const X509_POLICY_NODE *X509_policy_node_get0_parent(const X509_POLICY_NODE
-                                                     *node);
-
-#ifdef  __cplusplus
-}
-#endif
-#endif

gpac-2.2.1.tar.gz/extra_lib/include/openssl/x509v3.h Deleted

@@ -1,1006 +0,0 @@
-/*
- * Copyright 1999-2016 The OpenSSL Project Authors. All Rights Reserved.
- *
- * Licensed under the OpenSSL license (the "License").  You may not use
- * this file except in compliance with the License.  You can obtain a copy
- * in the file LICENSE in the source distribution or at
- * https://www.openssl.org/source/license.html
- */
-
-#ifndef HEADER_X509V3_H
-# define HEADER_X509V3_H
-
-# include <openssl/bio.h>
-# include <openssl/x509.h>
-# include <openssl/conf.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Forward reference */
-struct v3_ext_method;
-struct v3_ext_ctx;
-
-/* Useful typedefs */
-
-typedef void *(*X509V3_EXT_NEW)(void);
-typedef void (*X509V3_EXT_FREE) (void *);
-typedef void *(*X509V3_EXT_D2I)(void *, const unsigned char **, long);
-typedef int (*X509V3_EXT_I2D) (void *, unsigned char **);
-typedef STACK_OF(CONF_VALUE) *
-    (*X509V3_EXT_I2V) (const struct v3_ext_method *method, void *ext,
-                       STACK_OF(CONF_VALUE) *extlist);
-typedef void *(*X509V3_EXT_V2I)(const struct v3_ext_method *method,
-                                struct v3_ext_ctx *ctx,
-                                STACK_OF(CONF_VALUE) *values);
-typedef char *(*X509V3_EXT_I2S)(const struct v3_ext_method *method,
-                                void *ext);
-typedef void *(*X509V3_EXT_S2I)(const struct v3_ext_method *method,
-                                struct v3_ext_ctx *ctx, const char *str);
-typedef int (*X509V3_EXT_I2R) (const struct v3_ext_method *method, void *ext,
-                               BIO *out, int indent);
-typedef void *(*X509V3_EXT_R2I)(const struct v3_ext_method *method,
-                                struct v3_ext_ctx *ctx, const char *str);
-
-/* V3 extension structure */
-
-struct v3_ext_method {
-    int ext_nid;
-    int ext_flags;
-/* If this is set the following four fields are ignored */
-    ASN1_ITEM_EXP *it;
-/* Old style ASN1 calls */
-    X509V3_EXT_NEW ext_new;
-    X509V3_EXT_FREE ext_free;
-    X509V3_EXT_D2I d2i;
-    X509V3_EXT_I2D i2d;
-/* The following pair is used for string extensions */
-    X509V3_EXT_I2S i2s;
-    X509V3_EXT_S2I s2i;
-/* The following pair is used for multi-valued extensions */
-    X509V3_EXT_I2V i2v;
-    X509V3_EXT_V2I v2i;
-/* The following are used for raw extensions */
-    X509V3_EXT_I2R i2r;
-    X509V3_EXT_R2I r2i;
-    void *usr_data;             /* Any extension specific data */
-};
-
-typedef struct X509V3_CONF_METHOD_st {
-    char *(*get_string) (void *db, const char *section, const char *value);
-    STACK_OF(CONF_VALUE) *(*get_section) (void *db, const char *section);
-    void (*free_string) (void *db, char *string);
-    void (*free_section) (void *db, STACK_OF(CONF_VALUE) *section);
-} X509V3_CONF_METHOD;
-
-/* Context specific info */
-struct v3_ext_ctx {
-# define CTX_TEST 0x1
-# define X509V3_CTX_REPLACE 0x2
-    int flags;
-    X509 *issuer_cert;
-    X509 *subject_cert;
-    X509_REQ *subject_req;
-    X509_CRL *crl;
-    X509V3_CONF_METHOD *db_meth;
-    void *db;
-/* Maybe more here */
-};
-
-typedef struct v3_ext_method X509V3_EXT_METHOD;
-
-DEFINE_STACK_OF(X509V3_EXT_METHOD)
-
-/* ext_flags values */
-# define X509V3_EXT_DYNAMIC      0x1
-# define X509V3_EXT_CTX_DEP      0x2
-# define X509V3_EXT_MULTILINE    0x4
-
-typedef BIT_STRING_BITNAME ENUMERATED_NAMES;
-
-typedef struct BASIC_CONSTRAINTS_st {
-    int ca;
-    ASN1_INTEGER *pathlen;
-} BASIC_CONSTRAINTS;
-
-typedef struct PKEY_USAGE_PERIOD_st {
-    ASN1_GENERALIZEDTIME *notBefore;
-    ASN1_GENERALIZEDTIME *notAfter;
-} PKEY_USAGE_PERIOD;
-
-typedef struct otherName_st {
-    ASN1_OBJECT *type_id;
-    ASN1_TYPE *value;
-} OTHERNAME;
-
-typedef struct EDIPartyName_st {
-    ASN1_STRING *nameAssigner;
-    ASN1_STRING *partyName;
-} EDIPARTYNAME;
-
-typedef struct GENERAL_NAME_st {
-# define GEN_OTHERNAME   0
-# define GEN_EMAIL       1
-# define GEN_DNS         2
-# define GEN_X400        3
-# define GEN_DIRNAME     4
-# define GEN_EDIPARTY    5
-# define GEN_URI         6
-# define GEN_IPADD       7
-# define GEN_RID         8
-    int type;
-    union {
-        char *ptr;
-        OTHERNAME *otherName;   /* otherName */
-        ASN1_IA5STRING *rfc822Name;
-        ASN1_IA5STRING *dNSName;
-        ASN1_TYPE *x400Address;
-        X509_NAME *directoryName;
-        EDIPARTYNAME *ediPartyName;
-        ASN1_IA5STRING *uniformResourceIdentifier;
-        ASN1_OCTET_STRING *iPAddress;
-        ASN1_OBJECT *registeredID;
-        /* Old names */
-        ASN1_OCTET_STRING *ip;  /* iPAddress */
-        X509_NAME *dirn;        /* dirn */
-        ASN1_IA5STRING *ia5;    /* rfc822Name, dNSName,
-                                 * uniformResourceIdentifier */
-        ASN1_OBJECT *rid;       /* registeredID */
-        ASN1_TYPE *other;       /* x400Address */
-    } d;
-} GENERAL_NAME;
-
-typedef struct ACCESS_DESCRIPTION_st {
-    ASN1_OBJECT *method;
-    GENERAL_NAME *location;
-} ACCESS_DESCRIPTION;
-
-typedef STACK_OF(ACCESS_DESCRIPTION) AUTHORITY_INFO_ACCESS;
-
-typedef STACK_OF(ASN1_OBJECT) EXTENDED_KEY_USAGE;
-
-typedef STACK_OF(ASN1_INTEGER) TLS_FEATURE;
-
-DEFINE_STACK_OF(GENERAL_NAME)
-typedef STACK_OF(GENERAL_NAME) GENERAL_NAMES;
-DEFINE_STACK_OF(GENERAL_NAMES)
-
-DEFINE_STACK_OF(ACCESS_DESCRIPTION)
-
-typedef struct DIST_POINT_NAME_st {
-    int type;
-    union {
-        GENERAL_NAMES *fullname;
-        STACK_OF(X509_NAME_ENTRY) *relativename;
-    } name;
-/* If relativename then this contains the full distribution point name */
-    X509_NAME *dpname;
-} DIST_POINT_NAME;
-/* All existing reasons */
-# define CRLDP_ALL_REASONS       0x807f
-
-# define CRL_REASON_NONE                         -1
-# define CRL_REASON_UNSPECIFIED                  0
-# define CRL_REASON_KEY_COMPROMISE               1
-# define CRL_REASON_CA_COMPROMISE                2
-# define CRL_REASON_AFFILIATION_CHANGED          3
-# define CRL_REASON_SUPERSEDED                   4
-# define CRL_REASON_CESSATION_OF_OPERATION       5
-# define CRL_REASON_CERTIFICATE_HOLD             6
-# define CRL_REASON_REMOVE_FROM_CRL              8
-# define CRL_REASON_PRIVILEGE_WITHDRAWN          9
-# define CRL_REASON_AA_COMPROMISE                10
-
-struct DIST_POINT_st {
-    DIST_POINT_NAME *distpoint;
-    ASN1_BIT_STRING *reasons;
-    GENERAL_NAMES *CRLissuer;
-    int dp_reasons;
-};
-
-typedef STACK_OF(DIST_POINT) CRL_DIST_POINTS;
-
-DEFINE_STACK_OF(DIST_POINT)
-
-struct AUTHORITY_KEYID_st {
-    ASN1_OCTET_STRING *keyid;
-    GENERAL_NAMES *issuer;
-    ASN1_INTEGER *serial;
-};
-
-/* Strong extranet structures */
-
-typedef struct SXNET_ID_st {
-    ASN1_INTEGER *zone;
-    ASN1_OCTET_STRING *user;
-} SXNETID;
-
-DEFINE_STACK_OF(SXNETID)
-
-typedef struct SXNET_st {
-    ASN1_INTEGER *version;
-    STACK_OF(SXNETID) *ids;
-} SXNET;
-
-typedef struct NOTICEREF_st {
-    ASN1_STRING *organization;
-    STACK_OF(ASN1_INTEGER) *noticenos;
-} NOTICEREF;
-
-typedef struct USERNOTICE_st {
-    NOTICEREF *noticeref;
-    ASN1_STRING *exptext;
-} USERNOTICE;
-
-typedef struct POLICYQUALINFO_st {
-    ASN1_OBJECT *pqualid;
-    union {
-        ASN1_IA5STRING *cpsuri;
-        USERNOTICE *usernotice;
-        ASN1_TYPE *other;
-    } d;
-} POLICYQUALINFO;
-
-DEFINE_STACK_OF(POLICYQUALINFO)
-
-typedef struct POLICYINFO_st {
-    ASN1_OBJECT *policyid;
-    STACK_OF(POLICYQUALINFO) *qualifiers;
-} POLICYINFO;
-
-typedef STACK_OF(POLICYINFO) CERTIFICATEPOLICIES;
-
-DEFINE_STACK_OF(POLICYINFO)
-
-typedef struct POLICY_MAPPING_st {
-    ASN1_OBJECT *issuerDomainPolicy;
-    ASN1_OBJECT *subjectDomainPolicy;
-} POLICY_MAPPING;
-
-DEFINE_STACK_OF(POLICY_MAPPING)
-
-typedef STACK_OF(POLICY_MAPPING) POLICY_MAPPINGS;
-
-typedef struct GENERAL_SUBTREE_st {
-    GENERAL_NAME *base;
-    ASN1_INTEGER *minimum;
-    ASN1_INTEGER *maximum;
-} GENERAL_SUBTREE;
-
-DEFINE_STACK_OF(GENERAL_SUBTREE)
-
-struct NAME_CONSTRAINTS_st {
-    STACK_OF(GENERAL_SUBTREE) *permittedSubtrees;
-    STACK_OF(GENERAL_SUBTREE) *excludedSubtrees;
-};
-
-typedef struct POLICY_CONSTRAINTS_st {
-    ASN1_INTEGER *requireExplicitPolicy;
-    ASN1_INTEGER *inhibitPolicyMapping;
-} POLICY_CONSTRAINTS;
-
-/* Proxy certificate structures, see RFC 3820 */
-typedef struct PROXY_POLICY_st {
-    ASN1_OBJECT *policyLanguage;
-    ASN1_OCTET_STRING *policy;
-} PROXY_POLICY;
-
-typedef struct PROXY_CERT_INFO_EXTENSION_st {
-    ASN1_INTEGER *pcPathLengthConstraint;
-    PROXY_POLICY *proxyPolicy;
-} PROXY_CERT_INFO_EXTENSION;
-
-DECLARE_ASN1_FUNCTIONS(PROXY_POLICY)
-DECLARE_ASN1_FUNCTIONS(PROXY_CERT_INFO_EXTENSION)
-
-struct ISSUING_DIST_POINT_st {
-    DIST_POINT_NAME *distpoint;
-    int onlyuser;
-    int onlyCA;
-    ASN1_BIT_STRING *onlysomereasons;
-    int indirectCRL;
-    int onlyattr;
-};
-
-/* Values in idp_flags field */
-/* IDP present */
-# define IDP_PRESENT     0x1
-/* IDP values inconsistent */
-# define IDP_INVALID     0x2
-/* onlyuser true */
-# define IDP_ONLYUSER    0x4
-/* onlyCA true */
-# define IDP_ONLYCA      0x8
-/* onlyattr true */
-# define IDP_ONLYATTR    0x10
-/* indirectCRL true */
-# define IDP_INDIRECT    0x20
-/* onlysomereasons present */
-# define IDP_REASONS     0x40
-
-# define X509V3_conf_err(val) ERR_add_error_data(6, "section:", val->section, \
-",name:", val->name, ",value:", val->value);
-
-# define X509V3_set_ctx_test(ctx) \
-                        X509V3_set_ctx(ctx, NULL, NULL, NULL, NULL, CTX_TEST)
-# define X509V3_set_ctx_nodb(ctx) (ctx)->db = NULL;
-
-# define EXT_BITSTRING(nid, table) { nid, 0, ASN1_ITEM_ref(ASN1_BIT_STRING), \
-                        0,0,0,0, \
-                        0,0, \
-                        (X509V3_EXT_I2V)i2v_ASN1_BIT_STRING, \
-                        (X509V3_EXT_V2I)v2i_ASN1_BIT_STRING, \
-                        NULL, NULL, \
-                        table}
-
-# define EXT_IA5STRING(nid) { nid, 0, ASN1_ITEM_ref(ASN1_IA5STRING), \
-                        0,0,0,0, \
-                        (X509V3_EXT_I2S)i2s_ASN1_IA5STRING, \
-                        (X509V3_EXT_S2I)s2i_ASN1_IA5STRING, \
-                        0,0,0,0, \
-                        NULL}
-
-# define EXT_END { -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
-
-/* X509_PURPOSE stuff */
-
-# define EXFLAG_BCONS            0x1
-# define EXFLAG_KUSAGE           0x2
-# define EXFLAG_XKUSAGE          0x4
-# define EXFLAG_NSCERT           0x8
-
-# define EXFLAG_CA               0x10
-/* Really self issued not necessarily self signed */
-# define EXFLAG_SI               0x20
-# define EXFLAG_V1               0x40
-# define EXFLAG_INVALID          0x80
-/* EXFLAG_SET is set to indicate that some values have been precomputed */
-# define EXFLAG_SET              0x100
-# define EXFLAG_CRITICAL         0x200
-# define EXFLAG_PROXY            0x400
-
-# define EXFLAG_INVALID_POLICY   0x800
-# define EXFLAG_FRESHEST         0x1000
-/* Self signed */
-# define EXFLAG_SS               0x2000
-
-# define KU_DIGITAL_SIGNATURE    0x0080
-# define KU_NON_REPUDIATION      0x0040
-# define KU_KEY_ENCIPHERMENT     0x0020
-# define KU_DATA_ENCIPHERMENT    0x0010
-# define KU_KEY_AGREEMENT        0x0008
-# define KU_KEY_CERT_SIGN        0x0004
-# define KU_CRL_SIGN             0x0002
-# define KU_ENCIPHER_ONLY        0x0001
-# define KU_DECIPHER_ONLY        0x8000
-
-# define NS_SSL_CLIENT           0x80
-# define NS_SSL_SERVER           0x40
-# define NS_SMIME                0x20
-# define NS_OBJSIGN              0x10
-# define NS_SSL_CA               0x04
-# define NS_SMIME_CA             0x02
-# define NS_OBJSIGN_CA           0x01
-# define NS_ANY_CA               (NS_SSL_CA|NS_SMIME_CA|NS_OBJSIGN_CA)
-
-# define XKU_SSL_SERVER          0x1
-# define XKU_SSL_CLIENT          0x2
-# define XKU_SMIME               0x4
-# define XKU_CODE_SIGN           0x8
-# define XKU_SGC                 0x10
-# define XKU_OCSP_SIGN           0x20
-# define XKU_TIMESTAMP           0x40
-# define XKU_DVCS                0x80
-# define XKU_ANYEKU              0x100
-
-# define X509_PURPOSE_DYNAMIC    0x1
-# define X509_PURPOSE_DYNAMIC_NAME       0x2
-
-typedef struct x509_purpose_st {
-    int purpose;
-    int trust;                  /* Default trust ID */
-    int flags;
-    int (*check_purpose) (const struct x509_purpose_st *, const X509 *, int);
-    char *name;
-    char *sname;
-    void *usr_data;
-} X509_PURPOSE;
-
-# define X509_PURPOSE_SSL_CLIENT         1
-# define X509_PURPOSE_SSL_SERVER         2
-# define X509_PURPOSE_NS_SSL_SERVER      3
-# define X509_PURPOSE_SMIME_SIGN         4
-# define X509_PURPOSE_SMIME_ENCRYPT      5
-# define X509_PURPOSE_CRL_SIGN           6
-# define X509_PURPOSE_ANY                7
-# define X509_PURPOSE_OCSP_HELPER        8
-# define X509_PURPOSE_TIMESTAMP_SIGN     9
-
-# define X509_PURPOSE_MIN                1
-# define X509_PURPOSE_MAX                9
-
-/* Flags for X509V3_EXT_print() */
-
-# define X509V3_EXT_UNKNOWN_MASK         (0xfL << 16)
-/* Return error for unknown extensions */
-# define X509V3_EXT_DEFAULT              0
-/* Print error for unknown extensions */
-# define X509V3_EXT_ERROR_UNKNOWN        (1L << 16)
-/* ASN1 parse unknown extensions */
-# define X509V3_EXT_PARSE_UNKNOWN        (2L << 16)
-/* BIO_dump unknown extensions */
-# define X509V3_EXT_DUMP_UNKNOWN         (3L << 16)
-
-/* Flags for X509V3_add1_i2d */
-
-# define X509V3_ADD_OP_MASK              0xfL
-# define X509V3_ADD_DEFAULT              0L
-# define X509V3_ADD_APPEND               1L
-# define X509V3_ADD_REPLACE              2L
-# define X509V3_ADD_REPLACE_EXISTING     3L
-# define X509V3_ADD_KEEP_EXISTING        4L
-# define X509V3_ADD_DELETE               5L
-# define X509V3_ADD_SILENT               0x10
-
-DEFINE_STACK_OF(X509_PURPOSE)
-
-DECLARE_ASN1_FUNCTIONS(BASIC_CONSTRAINTS)
-
-DECLARE_ASN1_FUNCTIONS(SXNET)
-DECLARE_ASN1_FUNCTIONS(SXNETID)
-
-int SXNET_add_id_asc(SXNET **psx, const char *zone, const char *user, int userlen);
-int SXNET_add_id_ulong(SXNET **psx, unsigned long lzone, const char *user,
-                       int userlen);
-int SXNET_add_id_INTEGER(SXNET **psx, ASN1_INTEGER *izone, const char *user,
-                         int userlen);
-
-ASN1_OCTET_STRING *SXNET_get_id_asc(SXNET *sx, const char *zone);
-ASN1_OCTET_STRING *SXNET_get_id_ulong(SXNET *sx, unsigned long lzone);
-ASN1_OCTET_STRING *SXNET_get_id_INTEGER(SXNET *sx, ASN1_INTEGER *zone);
-
-DECLARE_ASN1_FUNCTIONS(AUTHORITY_KEYID)
-
-DECLARE_ASN1_FUNCTIONS(PKEY_USAGE_PERIOD)
-
-DECLARE_ASN1_FUNCTIONS(GENERAL_NAME)
-GENERAL_NAME *GENERAL_NAME_dup(GENERAL_NAME *a);
-int GENERAL_NAME_cmp(GENERAL_NAME *a, GENERAL_NAME *b);
-
-ASN1_BIT_STRING *v2i_ASN1_BIT_STRING(X509V3_EXT_METHOD *method,
-                                     X509V3_CTX *ctx,
-                                     STACK_OF(CONF_VALUE) *nval);
-STACK_OF(CONF_VALUE) *i2v_ASN1_BIT_STRING(X509V3_EXT_METHOD *method,
-                                          ASN1_BIT_STRING *bits,
-                                          STACK_OF(CONF_VALUE) *extlist);
-char *i2s_ASN1_IA5STRING(X509V3_EXT_METHOD *method, ASN1_IA5STRING *ia5);
-ASN1_IA5STRING *s2i_ASN1_IA5STRING(X509V3_EXT_METHOD *method,
-                                   X509V3_CTX *ctx, const char *str);
-
-STACK_OF(CONF_VALUE) *i2v_GENERAL_NAME(X509V3_EXT_METHOD *method,
-                                       GENERAL_NAME *gen,
-                                       STACK_OF(CONF_VALUE) *ret);
-int GENERAL_NAME_print(BIO *out, GENERAL_NAME *gen);
-
-DECLARE_ASN1_FUNCTIONS(GENERAL_NAMES)
-
-STACK_OF(CONF_VALUE) *i2v_GENERAL_NAMES(X509V3_EXT_METHOD *method,
-                                        GENERAL_NAMES *gen,
-                                        STACK_OF(CONF_VALUE) *extlist);
-GENERAL_NAMES *v2i_GENERAL_NAMES(const X509V3_EXT_METHOD *method,
-                                 X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *nval);
-
-DECLARE_ASN1_FUNCTIONS(OTHERNAME)
-DECLARE_ASN1_FUNCTIONS(EDIPARTYNAME)
-int OTHERNAME_cmp(OTHERNAME *a, OTHERNAME *b);
-void GENERAL_NAME_set0_value(GENERAL_NAME *a, int type, void *value);
-void *GENERAL_NAME_get0_value(GENERAL_NAME *a, int *ptype);
-int GENERAL_NAME_set0_othername(GENERAL_NAME *gen,
-                                ASN1_OBJECT *oid, ASN1_TYPE *value);
-int GENERAL_NAME_get0_otherName(GENERAL_NAME *gen,
-                                ASN1_OBJECT **poid, ASN1_TYPE **pvalue);
-
-char *i2s_ASN1_OCTET_STRING(X509V3_EXT_METHOD *method,
-                            const ASN1_OCTET_STRING *ia5);
-ASN1_OCTET_STRING *s2i_ASN1_OCTET_STRING(X509V3_EXT_METHOD *method,
-                                         X509V3_CTX *ctx, const char *str);
-
-DECLARE_ASN1_FUNCTIONS(EXTENDED_KEY_USAGE)
-int i2a_ACCESS_DESCRIPTION(BIO *bp, const ACCESS_DESCRIPTION *a);
-
-DECLARE_ASN1_ALLOC_FUNCTIONS(TLS_FEATURE)
-
-DECLARE_ASN1_FUNCTIONS(CERTIFICATEPOLICIES)
-DECLARE_ASN1_FUNCTIONS(POLICYINFO)
-DECLARE_ASN1_FUNCTIONS(POLICYQUALINFO)
-DECLARE_ASN1_FUNCTIONS(USERNOTICE)
-DECLARE_ASN1_FUNCTIONS(NOTICEREF)
-
-DECLARE_ASN1_FUNCTIONS(CRL_DIST_POINTS)
-DECLARE_ASN1_FUNCTIONS(DIST_POINT)
-DECLARE_ASN1_FUNCTIONS(DIST_POINT_NAME)
-DECLARE_ASN1_FUNCTIONS(ISSUING_DIST_POINT)
-
-int DIST_POINT_set_dpname(DIST_POINT_NAME *dpn, X509_NAME *iname);
-
-int NAME_CONSTRAINTS_check(X509 *x, NAME_CONSTRAINTS *nc);
-int NAME_CONSTRAINTS_check_CN(X509 *x, NAME_CONSTRAINTS *nc);
-
-DECLARE_ASN1_FUNCTIONS(ACCESS_DESCRIPTION)
-DECLARE_ASN1_FUNCTIONS(AUTHORITY_INFO_ACCESS)
-
-DECLARE_ASN1_ITEM(POLICY_MAPPING)
-DECLARE_ASN1_ALLOC_FUNCTIONS(POLICY_MAPPING)
-DECLARE_ASN1_ITEM(POLICY_MAPPINGS)
-
-DECLARE_ASN1_ITEM(GENERAL_SUBTREE)
-DECLARE_ASN1_ALLOC_FUNCTIONS(GENERAL_SUBTREE)
-
-DECLARE_ASN1_ITEM(NAME_CONSTRAINTS)
-DECLARE_ASN1_ALLOC_FUNCTIONS(NAME_CONSTRAINTS)
-
-DECLARE_ASN1_ALLOC_FUNCTIONS(POLICY_CONSTRAINTS)
-DECLARE_ASN1_ITEM(POLICY_CONSTRAINTS)
-
-GENERAL_NAME *a2i_GENERAL_NAME(GENERAL_NAME *out,
-                               const X509V3_EXT_METHOD *method,
-                               X509V3_CTX *ctx, int gen_type,
-                               const char *value, int is_nc);
-
-# ifdef HEADER_CONF_H
-GENERAL_NAME *v2i_GENERAL_NAME(const X509V3_EXT_METHOD *method,
-                               X509V3_CTX *ctx, CONF_VALUE *cnf);
-GENERAL_NAME *v2i_GENERAL_NAME_ex(GENERAL_NAME *out,
-                                  const X509V3_EXT_METHOD *method,
-                                  X509V3_CTX *ctx, CONF_VALUE *cnf,
-                                  int is_nc);
-void X509V3_conf_free(CONF_VALUE *val);
-
-X509_EXTENSION *X509V3_EXT_nconf_nid(CONF *conf, X509V3_CTX *ctx, int ext_nid,
-                                     const char *value);
-X509_EXTENSION *X509V3_EXT_nconf(CONF *conf, X509V3_CTX *ctx, const char *name,
-                                 const char *value);
-int X509V3_EXT_add_nconf_sk(CONF *conf, X509V3_CTX *ctx, const char *section,
-                            STACK_OF(X509_EXTENSION) **sk);
-int X509V3_EXT_add_nconf(CONF *conf, X509V3_CTX *ctx, const char *section,
-                         X509 *cert);
-int X509V3_EXT_REQ_add_nconf(CONF *conf, X509V3_CTX *ctx, const char *section,
-                             X509_REQ *req);
-int X509V3_EXT_CRL_add_nconf(CONF *conf, X509V3_CTX *ctx, const char *section,
-                             X509_CRL *crl);
-
-X509_EXTENSION *X509V3_EXT_conf_nid(LHASH_OF(CONF_VALUE) *conf,
-                                    X509V3_CTX *ctx, int ext_nid,
-                                    const char *value);
-X509_EXTENSION *X509V3_EXT_conf(LHASH_OF(CONF_VALUE) *conf, X509V3_CTX *ctx,
-                                const char *name, const char *value);
-int X509V3_EXT_add_conf(LHASH_OF(CONF_VALUE) *conf, X509V3_CTX *ctx,
-                        const char *section, X509 *cert);
-int X509V3_EXT_REQ_add_conf(LHASH_OF(CONF_VALUE) *conf, X509V3_CTX *ctx,
-                            const char *section, X509_REQ *req);
-int X509V3_EXT_CRL_add_conf(LHASH_OF(CONF_VALUE) *conf, X509V3_CTX *ctx,
-                            const char *section, X509_CRL *crl);
-
-int X509V3_add_value_bool_nf(const char *name, int asn1_bool,
-                             STACK_OF(CONF_VALUE) **extlist);
-int X509V3_get_value_bool(const CONF_VALUE *value, int *asn1_bool);
-int X509V3_get_value_int(const CONF_VALUE *value, ASN1_INTEGER **aint);
-void X509V3_set_nconf(X509V3_CTX *ctx, CONF *conf);
-void X509V3_set_conf_lhash(X509V3_CTX *ctx, LHASH_OF(CONF_VALUE) *lhash);
-# endif
-
-char *X509V3_get_string(X509V3_CTX *ctx, const char *name, const char *section);
-STACK_OF(CONF_VALUE) *X509V3_get_section(X509V3_CTX *ctx, const char *section);
-void X509V3_string_free(X509V3_CTX *ctx, char *str);
-void X509V3_section_free(X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *section);
-void X509V3_set_ctx(X509V3_CTX *ctx, X509 *issuer, X509 *subject,
-                    X509_REQ *req, X509_CRL *crl, int flags);
-
-int X509V3_add_value(const char *name, const char *value,
-                     STACK_OF(CONF_VALUE) **extlist);
-int X509V3_add_value_uchar(const char *name, const unsigned char *value,
-                           STACK_OF(CONF_VALUE) **extlist);
-int X509V3_add_value_bool(const char *name, int asn1_bool,
-                          STACK_OF(CONF_VALUE) **extlist);
-int X509V3_add_value_int(const char *name, const ASN1_INTEGER *aint,
-                         STACK_OF(CONF_VALUE) **extlist);
-char *i2s_ASN1_INTEGER(X509V3_EXT_METHOD *meth, const ASN1_INTEGER *aint);
-ASN1_INTEGER *s2i_ASN1_INTEGER(X509V3_EXT_METHOD *meth, const char *value);
-char *i2s_ASN1_ENUMERATED(X509V3_EXT_METHOD *meth, const ASN1_ENUMERATED *aint);
-char *i2s_ASN1_ENUMERATED_TABLE(X509V3_EXT_METHOD *meth,
-                                const ASN1_ENUMERATED *aint);
-int X509V3_EXT_add(X509V3_EXT_METHOD *ext);
-int X509V3_EXT_add_list(X509V3_EXT_METHOD *extlist);
-int X509V3_EXT_add_alias(int nid_to, int nid_from);
-void X509V3_EXT_cleanup(void);
-
-const X509V3_EXT_METHOD *X509V3_EXT_get(X509_EXTENSION *ext);
-const X509V3_EXT_METHOD *X509V3_EXT_get_nid(int nid);
-int X509V3_add_standard_extensions(void);
-STACK_OF(CONF_VALUE) *X509V3_parse_list(const char *line);
-void *X509V3_EXT_d2i(X509_EXTENSION *ext);
-void *X509V3_get_d2i(const STACK_OF(X509_EXTENSION) *x, int nid, int *crit,
-                     int *idx);
-
-X509_EXTENSION *X509V3_EXT_i2d(int ext_nid, int crit, void *ext_struc);
-int X509V3_add1_i2d(STACK_OF(X509_EXTENSION) **x, int nid, void *value,
-                    int crit, unsigned long flags);
-
-#if OPENSSL_API_COMPAT < 0x10100000L
-/* The new declarations are in crypto.h, but the old ones were here. */
-# define hex_to_string OPENSSL_buf2hexstr
-# define string_to_hex OPENSSL_hexstr2buf
-#endif
-
-void X509V3_EXT_val_prn(BIO *out, STACK_OF(CONF_VALUE) *val, int indent,
-                        int ml);
-int X509V3_EXT_print(BIO *out, X509_EXTENSION *ext, unsigned long flag,
-                     int indent);
-#ifndef OPENSSL_NO_STDIO
-int X509V3_EXT_print_fp(FILE *out, X509_EXTENSION *ext, int flag, int indent);
-#endif
-int X509V3_extensions_print(BIO *out, const char *title,
-                            const STACK_OF(X509_EXTENSION) *exts,
-                            unsigned long flag, int indent);
-
-int X509_check_ca(X509 *x);
-int X509_check_purpose(X509 *x, int id, int ca);
-int X509_supported_extension(X509_EXTENSION *ex);
-int X509_PURPOSE_set(int *p, int purpose);
-int X509_check_issued(X509 *issuer, X509 *subject);
-int X509_check_akid(X509 *issuer, AUTHORITY_KEYID *akid);
-void X509_set_proxy_flag(X509 *x);
-void X509_set_proxy_pathlen(X509 *x, long l);
-long X509_get_proxy_pathlen(X509 *x);
-
-uint32_t X509_get_extension_flags(X509 *x);
-uint32_t X509_get_key_usage(X509 *x);
-uint32_t X509_get_extended_key_usage(X509 *x);
-const ASN1_OCTET_STRING *X509_get0_subject_key_id(X509 *x);
-
-int X509_PURPOSE_get_count(void);
-X509_PURPOSE *X509_PURPOSE_get0(int idx);
-int X509_PURPOSE_get_by_sname(const char *sname);
-int X509_PURPOSE_get_by_id(int id);
-int X509_PURPOSE_add(int id, int trust, int flags,
-                     int (*ck) (const X509_PURPOSE *, const X509 *, int),
-                     const char *name, const char *sname, void *arg);
-char *X509_PURPOSE_get0_name(const X509_PURPOSE *xp);
-char *X509_PURPOSE_get0_sname(const X509_PURPOSE *xp);
-int X509_PURPOSE_get_trust(const X509_PURPOSE *xp);
-void X509_PURPOSE_cleanup(void);
-int X509_PURPOSE_get_id(const X509_PURPOSE *);
-
-STACK_OF(OPENSSL_STRING) *X509_get1_email(X509 *x);
-STACK_OF(OPENSSL_STRING) *X509_REQ_get1_email(X509_REQ *x);
-void X509_email_free(STACK_OF(OPENSSL_STRING) *sk);
-STACK_OF(OPENSSL_STRING) *X509_get1_ocsp(X509 *x);
-/* Flags for X509_check_* functions */
-
-/*
- * Always check subject name for host match even if subject alt names present
- */
-# define X509_CHECK_FLAG_ALWAYS_CHECK_SUBJECT    0x1
-/* Disable wildcard matching for dnsName fields and common name. */
-# define X509_CHECK_FLAG_NO_WILDCARDS    0x2
-/* Wildcards must not match a partial label. */
-# define X509_CHECK_FLAG_NO_PARTIAL_WILDCARDS 0x4
-/* Allow (non-partial) wildcards to match multiple labels. */
-# define X509_CHECK_FLAG_MULTI_LABEL_WILDCARDS 0x8
-/* Constraint verifier subdomain patterns to match a single labels. */
-# define X509_CHECK_FLAG_SINGLE_LABEL_SUBDOMAINS 0x10
-/* Never check the subject CN */
-# define X509_CHECK_FLAG_NEVER_CHECK_SUBJECT    0x20
-/*
- * Match reference identifiers starting with "." to any sub-domain.
- * This is a non-public flag, turned on implicitly when the subject
- * reference identity is a DNS name.
- */
-# define _X509_CHECK_FLAG_DOT_SUBDOMAINS 0x8000
-
-int X509_check_host(X509 *x, const char *chk, size_t chklen,
-                    unsigned int flags, char **peername);
-int X509_check_email(X509 *x, const char *chk, size_t chklen,
-                     unsigned int flags);
-int X509_check_ip(X509 *x, const unsigned char *chk, size_t chklen,
-                  unsigned int flags);
-int X509_check_ip_asc(X509 *x, const char *ipasc, unsigned int flags);
-
-ASN1_OCTET_STRING *a2i_IPADDRESS(const char *ipasc);
-ASN1_OCTET_STRING *a2i_IPADDRESS_NC(const char *ipasc);
-int X509V3_NAME_from_section(X509_NAME *nm, STACK_OF(CONF_VALUE) *dn_sk,
-                             unsigned long chtype);
-
-void X509_POLICY_NODE_print(BIO *out, X509_POLICY_NODE *node, int indent);
-DEFINE_STACK_OF(X509_POLICY_NODE)
-
-#ifndef OPENSSL_NO_RFC3779
-typedef struct ASRange_st {
-    ASN1_INTEGER *min, *max;
-} ASRange;
-
-# define ASIdOrRange_id          0
-# define ASIdOrRange_range       1
-
-typedef struct ASIdOrRange_st {
-    int type;
-    union {
-        ASN1_INTEGER *id;
-        ASRange *range;
-    } u;
-} ASIdOrRange;
-
-typedef STACK_OF(ASIdOrRange) ASIdOrRanges;
-DEFINE_STACK_OF(ASIdOrRange)
-
-# define ASIdentifierChoice_inherit              0
-# define ASIdentifierChoice_asIdsOrRanges        1
-
-typedef struct ASIdentifierChoice_st {
-    int type;
-    union {
-        ASN1_NULL *inherit;
-        ASIdOrRanges *asIdsOrRanges;
-    } u;
-} ASIdentifierChoice;
-
-typedef struct ASIdentifiers_st {
-    ASIdentifierChoice *asnum, *rdi;
-} ASIdentifiers;
-
-DECLARE_ASN1_FUNCTIONS(ASRange)
-DECLARE_ASN1_FUNCTIONS(ASIdOrRange)
-DECLARE_ASN1_FUNCTIONS(ASIdentifierChoice)
-DECLARE_ASN1_FUNCTIONS(ASIdentifiers)
-
-typedef struct IPAddressRange_st {
-    ASN1_BIT_STRING *min, *max;
-} IPAddressRange;
-
-# define IPAddressOrRange_addressPrefix  0
-# define IPAddressOrRange_addressRange   1
-
-typedef struct IPAddressOrRange_st {
-    int type;
-    union {
-        ASN1_BIT_STRING *addressPrefix;
-        IPAddressRange *addressRange;
-    } u;
-} IPAddressOrRange;
-
-typedef STACK_OF(IPAddressOrRange) IPAddressOrRanges;
-DEFINE_STACK_OF(IPAddressOrRange)
-
-# define IPAddressChoice_inherit                 0
-# define IPAddressChoice_addressesOrRanges       1
-
-typedef struct IPAddressChoice_st {
-    int type;
-    union {
-        ASN1_NULL *inherit;
-        IPAddressOrRanges *addressesOrRanges;
-    } u;
-} IPAddressChoice;
-
-typedef struct IPAddressFamily_st {
-    ASN1_OCTET_STRING *addressFamily;
-    IPAddressChoice *ipAddressChoice;
-} IPAddressFamily;
-
-typedef STACK_OF(IPAddressFamily) IPAddrBlocks;
-DEFINE_STACK_OF(IPAddressFamily)
-
-DECLARE_ASN1_FUNCTIONS(IPAddressRange)
-DECLARE_ASN1_FUNCTIONS(IPAddressOrRange)
-DECLARE_ASN1_FUNCTIONS(IPAddressChoice)
-DECLARE_ASN1_FUNCTIONS(IPAddressFamily)
-
-/*
- * API tag for elements of the ASIdentifer SEQUENCE.
- */
-# define V3_ASID_ASNUM   0
-# define V3_ASID_RDI     1
-
-/*
- * AFI values, assigned by IANA.  It'd be nice to make the AFI
- * handling code totally generic, but there are too many little things
- * that would need to be defined for other address families for it to
- * be worth the trouble.
- */
-# define IANA_AFI_IPV4   1
-# define IANA_AFI_IPV6   2
-
-/*
- * Utilities to construct and extract values from RFC3779 extensions,
- * since some of the encodings (particularly for IP address prefixes
- * and ranges) are a bit tedious to work with directly.
- */
-int X509v3_asid_add_inherit(ASIdentifiers *asid, int which);
-int X509v3_asid_add_id_or_range(ASIdentifiers *asid, int which,
-                                ASN1_INTEGER *min, ASN1_INTEGER *max);
-int X509v3_addr_add_inherit(IPAddrBlocks *addr,
-                            const unsigned afi, const unsigned *safi);
-int X509v3_addr_add_prefix(IPAddrBlocks *addr,
-                           const unsigned afi, const unsigned *safi,
-                           unsigned char *a, const int prefixlen);
-int X509v3_addr_add_range(IPAddrBlocks *addr,
-                          const unsigned afi, const unsigned *safi,
-                          unsigned char *min, unsigned char *max);
-unsigned X509v3_addr_get_afi(const IPAddressFamily *f);
-int X509v3_addr_get_range(IPAddressOrRange *aor, const unsigned afi,
-                          unsigned char *min, unsigned char *max,
-                          const int length);
-
-/*
- * Canonical forms.
- */
-int X509v3_asid_is_canonical(ASIdentifiers *asid);
-int X509v3_addr_is_canonical(IPAddrBlocks *addr);
-int X509v3_asid_canonize(ASIdentifiers *asid);
-int X509v3_addr_canonize(IPAddrBlocks *addr);
-
-/*
- * Tests for inheritance and containment.
- */
-int X509v3_asid_inherits(ASIdentifiers *asid);
-int X509v3_addr_inherits(IPAddrBlocks *addr);
-int X509v3_asid_subset(ASIdentifiers *a, ASIdentifiers *b);
-int X509v3_addr_subset(IPAddrBlocks *a, IPAddrBlocks *b);
-
-/*
- * Check whether RFC 3779 extensions nest properly in chains.
- */
-int X509v3_asid_validate_path(X509_STORE_CTX *);
-int X509v3_addr_validate_path(X509_STORE_CTX *);
-int X509v3_asid_validate_resource_set(STACK_OF(X509) *chain,
-                                      ASIdentifiers *ext,
-                                      int allow_inheritance);
-int X509v3_addr_validate_resource_set(STACK_OF(X509) *chain,
-                                      IPAddrBlocks *ext, int allow_inheritance);
-
-#endif                         /* OPENSSL_NO_RFC3779 */
-
-/* BEGIN ERROR CODES */
-/*
- * The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
-
-int ERR_load_X509V3_strings(void);
-
-/* Error codes for the X509V3 functions. */
-
-/* Function codes. */
-# define X509V3_F_A2I_GENERAL_NAME                        164
-# define X509V3_F_ADDR_VALIDATE_PATH_INTERNAL             166
-# define X509V3_F_ASIDENTIFIERCHOICE_CANONIZE             161
-# define X509V3_F_ASIDENTIFIERCHOICE_IS_CANONICAL         162
-# define X509V3_F_COPY_EMAIL                              122
-# define X509V3_F_COPY_ISSUER                             123
-# define X509V3_F_DO_DIRNAME                              144
-# define X509V3_F_DO_EXT_I2D                              135
-# define X509V3_F_DO_EXT_NCONF                            151
-# define X509V3_F_GNAMES_FROM_SECTNAME                    156
-# define X509V3_F_I2S_ASN1_ENUMERATED                     121
-# define X509V3_F_I2S_ASN1_IA5STRING                      149
-# define X509V3_F_I2S_ASN1_INTEGER                        120
-# define X509V3_F_I2V_AUTHORITY_INFO_ACCESS               138
-# define X509V3_F_NOTICE_SECTION                          132
-# define X509V3_F_NREF_NOS                                133
-# define X509V3_F_POLICY_SECTION                          131
-# define X509V3_F_PROCESS_PCI_VALUE                       150
-# define X509V3_F_R2I_CERTPOL                             130
-# define X509V3_F_R2I_PCI                                 155
-# define X509V3_F_S2I_ASN1_IA5STRING                      100
-# define X509V3_F_S2I_ASN1_INTEGER                        108
-# define X509V3_F_S2I_ASN1_OCTET_STRING                   112
-# define X509V3_F_S2I_SKEY_ID                             115
-# define X509V3_F_SET_DIST_POINT_NAME                     158
-# define X509V3_F_SXNET_ADD_ID_ASC                        125
-# define X509V3_F_SXNET_ADD_ID_INTEGER                    126
-# define X509V3_F_SXNET_ADD_ID_ULONG                      127
-# define X509V3_F_SXNET_GET_ID_ASC                        128
-# define X509V3_F_SXNET_GET_ID_ULONG                      129
-# define X509V3_F_V2I_ASIDENTIFIERS                       163
-# define X509V3_F_V2I_ASN1_BIT_STRING                     101
-# define X509V3_F_V2I_AUTHORITY_INFO_ACCESS               139
-# define X509V3_F_V2I_AUTHORITY_KEYID                     119
-# define X509V3_F_V2I_BASIC_CONSTRAINTS                   102
-# define X509V3_F_V2I_CRLD                                134
-# define X509V3_F_V2I_EXTENDED_KEY_USAGE                  103
-# define X509V3_F_V2I_GENERAL_NAMES                       118
-# define X509V3_F_V2I_GENERAL_NAME_EX                     117
-# define X509V3_F_V2I_IDP                                 157
-# define X509V3_F_V2I_IPADDRBLOCKS                        159
-# define X509V3_F_V2I_ISSUER_ALT                          153
-# define X509V3_F_V2I_NAME_CONSTRAINTS                    147
-# define X509V3_F_V2I_POLICY_CONSTRAINTS                  146
-# define X509V3_F_V2I_POLICY_MAPPINGS                     145
-# define X509V3_F_V2I_SUBJECT_ALT                         154
-# define X509V3_F_V2I_TLS_FEATURE                         165
-# define X509V3_F_V3_GENERIC_EXTENSION                    116
-# define X509V3_F_X509V3_ADD1_I2D                         140
-# define X509V3_F_X509V3_ADD_VALUE                        105
-# define X509V3_F_X509V3_EXT_ADD                          104
-# define X509V3_F_X509V3_EXT_ADD_ALIAS                    106
-# define X509V3_F_X509V3_EXT_I2D                          136
-# define X509V3_F_X509V3_EXT_NCONF                        152
-# define X509V3_F_X509V3_GET_SECTION                      142
-# define X509V3_F_X509V3_GET_STRING                       143
-# define X509V3_F_X509V3_GET_VALUE_BOOL                   110
-# define X509V3_F_X509V3_PARSE_LIST                       109
-# define X509V3_F_X509_PURPOSE_ADD                        137
-# define X509V3_F_X509_PURPOSE_SET                        141
-
-/* Reason codes. */
-# define X509V3_R_BAD_IP_ADDRESS                          118
-# define X509V3_R_BAD_OBJECT                              119
-# define X509V3_R_BN_DEC2BN_ERROR                         100
-# define X509V3_R_BN_TO_ASN1_INTEGER_ERROR                101
-# define X509V3_R_DIRNAME_ERROR                           149
-# define X509V3_R_DISTPOINT_ALREADY_SET                   160
-# define X509V3_R_DUPLICATE_ZONE_ID                       133
-# define X509V3_R_ERROR_CONVERTING_ZONE                   131
-# define X509V3_R_ERROR_CREATING_EXTENSION                144
-# define X509V3_R_ERROR_IN_EXTENSION                      128
-# define X509V3_R_EXPECTED_A_SECTION_NAME                 137
-# define X509V3_R_EXTENSION_EXISTS                        145
-# define X509V3_R_EXTENSION_NAME_ERROR                    115
-# define X509V3_R_EXTENSION_NOT_FOUND                     102
-# define X509V3_R_EXTENSION_SETTING_NOT_SUPPORTED         103
-# define X509V3_R_EXTENSION_VALUE_ERROR                   116
-# define X509V3_R_ILLEGAL_EMPTY_EXTENSION                 151
-# define X509V3_R_INCORRECT_POLICY_SYNTAX_TAG             152
-# define X509V3_R_INVALID_ASNUMBER                        162
-# define X509V3_R_INVALID_ASRANGE                         163
-# define X509V3_R_INVALID_BOOLEAN_STRING                  104
-# define X509V3_R_INVALID_EXTENSION_STRING                105
-# define X509V3_R_INVALID_INHERITANCE                     165
-# define X509V3_R_INVALID_IPADDRESS                       166
-# define X509V3_R_INVALID_MULTIPLE_RDNS                   161
-# define X509V3_R_INVALID_NAME                            106
-# define X509V3_R_INVALID_NULL_ARGUMENT                   107
-# define X509V3_R_INVALID_NULL_NAME                       108
-# define X509V3_R_INVALID_NULL_VALUE                      109
-# define X509V3_R_INVALID_NUMBER                          140
-# define X509V3_R_INVALID_NUMBERS                         141
-# define X509V3_R_INVALID_OBJECT_IDENTIFIER               110
-# define X509V3_R_INVALID_OPTION                          138
-# define X509V3_R_INVALID_POLICY_IDENTIFIER               134
-# define X509V3_R_INVALID_PROXY_POLICY_SETTING            153
-# define X509V3_R_INVALID_PURPOSE                         146
-# define X509V3_R_INVALID_SAFI                            164
-# define X509V3_R_INVALID_SECTION                         135
-# define X509V3_R_INVALID_SYNTAX                          143
-# define X509V3_R_ISSUER_DECODE_ERROR                     126
-# define X509V3_R_MISSING_VALUE                           124
-# define X509V3_R_NEED_ORGANIZATION_AND_NUMBERS           142
-# define X509V3_R_NO_CONFIG_DATABASE                      136
-# define X509V3_R_NO_ISSUER_CERTIFICATE                   121
-# define X509V3_R_NO_ISSUER_DETAILS                       127
-# define X509V3_R_NO_POLICY_IDENTIFIER                    139
-# define X509V3_R_NO_PROXY_CERT_POLICY_LANGUAGE_DEFINED   154
-# define X509V3_R_NO_PUBLIC_KEY                           114
-# define X509V3_R_NO_SUBJECT_DETAILS                      125
-# define X509V3_R_OPERATION_NOT_DEFINED                   148
-# define X509V3_R_OTHERNAME_ERROR                         147
-# define X509V3_R_POLICY_LANGUAGE_ALREADY_DEFINED         155
-# define X509V3_R_POLICY_PATH_LENGTH                      156
-# define X509V3_R_POLICY_PATH_LENGTH_ALREADY_DEFINED      157
-# define X509V3_R_POLICY_WHEN_PROXY_LANGUAGE_REQUIRES_NO_POLICY 159
-# define X509V3_R_SECTION_NOT_FOUND                       150
-# define X509V3_R_UNABLE_TO_GET_ISSUER_DETAILS            122
-# define X509V3_R_UNABLE_TO_GET_ISSUER_KEYID              123
-# define X509V3_R_UNKNOWN_BIT_STRING_ARGUMENT             111
-# define X509V3_R_UNKNOWN_EXTENSION                       129
-# define X509V3_R_UNKNOWN_EXTENSION_NAME                  130
-# define X509V3_R_UNKNOWN_OPTION                          120
-# define X509V3_R_UNSUPPORTED_OPTION                      117
-# define X509V3_R_UNSUPPORTED_TYPE                        167
-# define X509V3_R_USER_TOO_LONG                           132
-
-# ifdef  __cplusplus
-}
-# endif
-#endif

gpac-2.2.1.tar.gz/extra_lib/include/platinum Deleted

gpac-2.2.1.tar.gz/extra_lib/include/platinum/Neptune.h Deleted

@@ -1,86 +0,0 @@
-/*****************************************************************
-|
-|   Neptune - Toplevel Include
-|
-| Copyright (c) 2002-2008, Axiomatic Systems, LLC.
-| All rights reserved.
-|
-| Redistribution and use in source and binary forms, with or without
-| modification, are permitted provided that the following conditions are met:
-|     * Redistributions of source code must retain the above copyright
-|       notice, this list of conditions and the following disclaimer.
-|     * Redistributions in binary form must reproduce the above copyright
-|       notice, this list of conditions and the following disclaimer in the
-|       documentation and/or other materials provided with the distribution.
-|     * Neither the name of Axiomatic Systems nor the
-|       names of its contributors may be used to endorse or promote products
-|       derived from this software without specific prior written permission.
-|
-| THIS SOFTWARE IS PROVIDED BY AXIOMATIC SYSTEMS ''AS IS'' AND ANY
-| EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-| WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-| DISCLAIMED. IN NO EVENT SHALL AXIOMATIC SYSTEMS BE LIABLE FOR ANY
-| DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-| (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-| LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-| ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-| (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-| SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-|
- ****************************************************************/
-
-#ifndef _NEPTUNE_H_
-#define _NEPTUNE_H_
-
-/*----------------------------------------------------------------------
-|   flags
-+---------------------------------------------------------------------*/
-#define NPT_EXTERNAL_USE /* do not expose internal definitions */
-
-/*----------------------------------------------------------------------
-|   includes
-+---------------------------------------------------------------------*/
-#include "NptConfig.h"
-#include "NptCommon.h"
-#include "NptResults.h"
-#include "NptTypes.h"
-#include "NptConstants.h"
-#include "NptReferences.h"
-#include "NptStreams.h"
-#include "NptBufferedStreams.h"
-#include "NptFile.h"
-#include "NptNetwork.h"
-#include "NptSockets.h"
-#include "NptTime.h"
-#include "NptThreads.h"
-#include "NptSystem.h"
-#include "NptMessaging.h"
-#include "NptQueue.h"
-#include "NptSimpleMessageQueue.h"
-#include "NptSelectableMessageQueue.h"
-#include "NptXml.h"
-#include "NptStrings.h"
-#include "NptArray.h"
-#include "NptList.h"
-#include "NptMap.h"
-#include "NptStack.h"
-#include "NptUri.h"
-#include "NptHttp.h"
-#include "NptDataBuffer.h"
-#include "NptUtils.h"
-#include "NptRingBuffer.h"
-#include "NptBase64.h"
-#include "NptConsole.h"
-#include "NptLogging.h"
-#include "NptSerialPort.h"
-#include "NptVersion.h"
-#include "NptDynamicLibraries.h"
-#include "NptDynamicCast.h"
-#include "NptDigest.h"
-#include "NptCrypto.h"
-
-// optional modules
-#include "NptZip.h"
-#include "NptTls.h"
-
-#endif // _NEPTUNE_H_

gpac-2.2.1.tar.gz/extra_lib/include/platinum/NptArray.h Deleted

@@ -1,522 +0,0 @@
-/*****************************************************************
-|
-|   Neptune - Arrays
-|
-| Copyright (c) 2002-2008, Axiomatic Systems, LLC.
-| All rights reserved.
-|
-| Redistribution and use in source and binary forms, with or without
-| modification, are permitted provided that the following conditions are met:
-|     * Redistributions of source code must retain the above copyright
-|       notice, this list of conditions and the following disclaimer.
-|     * Redistributions in binary form must reproduce the above copyright
-|       notice, this list of conditions and the following disclaimer in the
-|       documentation and/or other materials provided with the distribution.
-|     * Neither the name of Axiomatic Systems nor the
-|       names of its contributors may be used to endorse or promote products
-|       derived from this software without specific prior written permission.
-|
-| THIS SOFTWARE IS PROVIDED BY AXIOMATIC SYSTEMS ''AS IS'' AND ANY
-| EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-| WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-| DISCLAIMED. IN NO EVENT SHALL AXIOMATIC SYSTEMS BE LIABLE FOR ANY
-| DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-| (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-| LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-| ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-| (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-| SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-|
-****************************************************************/
-
-#ifndef _NPT_ARRAY_H_
-#define _NPT_ARRAY_H_
-
-/*----------------------------------------------------------------------
-|   includes
-+---------------------------------------------------------------------*/
-#include "NptConfig.h"
-#if defined(NPT_CONFIG_HAVE_NEW_H)
-#include <new>
-#endif
-#include "NptTypes.h"
-#include "NptResults.h"
-
-/*----------------------------------------------------------------------
-|   constants
-+---------------------------------------------------------------------*/
-const int NPT_ARRAY_INITIAL_MAX_SIZE = 128; // bytes
-
-/*----------------------------------------------------------------------
-|   NPT_Array
-+---------------------------------------------------------------------*/
-template <typename T> 
-class NPT_Array 
-{
-public:
-    // types
-    typedef T Element;
-    typedef T* Iterator;
-
-    // methods
-    NPT_Array<T>(): m_Capacity(0), m_ItemCount(0), m_Items(0) {}
-    explicit NPT_Array<T>(NPT_Cardinal count);
-    NPT_Array<T>(NPT_Cardinal count, const T& item);
-    NPT_Array<T>(const T* items, NPT_Cardinal item_count);
-   ~NPT_Array<T>();
-    NPT_Array<T>(const NPT_Array<T>& copy);
-    NPT_Array<T>& operator=(const NPT_Array<T>& copy);
-    bool          operator==(const NPT_Array<T>& other) const;
-    bool          operator!=(const NPT_Array<T>& other) const;
-    NPT_Cardinal GetItemCount() const { return m_ItemCount; }
-    NPT_Result   Add(const T& item);
-    T& operator(NPT_Ordinal pos)             { return m_Itemspos; }
-    const T& operator(NPT_Ordinal pos) const { return m_Itemspos; }
-    NPT_Result   Erase(Iterator which);
-    NPT_Result   Erase(NPT_Ordinal which) { return Erase(&m_Itemswhich); }
-    NPT_Result   Erase(Iterator first, Iterator last);
-    NPT_Result   Erase(NPT_Ordinal first, NPT_Ordinal last) { return Erase(&m_Itemsfirst, &m_Itemslast); }
-    NPT_Result   Insert(Iterator where, const T& item, NPT_Cardinal count = 1);
-    NPT_Result   Reserve(NPT_Cardinal count);
-    NPT_Cardinal GetCapacity() const { return m_Capacity; }
-    NPT_Result   Resize(NPT_Cardinal count);
-    NPT_Result   Resize(NPT_Cardinal count, const T& fill);
-    NPT_Result   Clear();
-    bool         Contains(const T& data) const;
-    Iterator     GetFirstItem() const { return m_ItemCount?&m_Items0:NULL; }
-    Iterator     GetLastItem() const  { return m_ItemCount?&m_Itemsm_ItemCount-1:NULL; }
-    Iterator     GetItem(NPT_Ordinal n) { return n<m_ItemCount?&m_Itemsn:NULL; }
-
-    // template list operations
-    // keep these template members defined here because MSV6 does not let
-    // us define them later
-    template <typename X> 
-    NPT_Result Apply(const X& function) const
-    {                                  
-        for (unsigned int i=0; i<m_ItemCount; i++) function(m_Itemsi);
-        return NPT_SUCCESS;
-    }
-
-    template <typename X, typename P>
-    NPT_Result ApplyUntil(const X& function, const P& predicate, bool* match = NULL) const
-    {                                  
-        for (unsigned int i=0; i<m_ItemCount; i++) {
-            NPT_Result return_value;
-            if (predicate(function(m_Itemsi), return_value)) {
-                if (match) *match = true;
-                return return_value;
-            }
-        }
-        if (match) *match = false;
-        return NPT_SUCCESS;
-    }
-
-    template <typename X> 
-    T* Find(const X& predicate, NPT_Ordinal n=0, NPT_Ordinal* pos = NULL) const
-    {
-        if (pos) *pos = -1;
-
-        for (unsigned int i=0; i<m_ItemCount; i++) {
-            if (predicate(m_Itemsi)) {
-                if (pos) *pos = i;
-                if (n == 0) return &m_Itemsi;
-                --n;
-            }
-        }
-        return NULL;
-    }
-
-protected:
-    // methods
-    T* Allocate(NPT_Cardinal count, NPT_Cardinal& allocated);
-
-    // members
-    NPT_Cardinal m_Capacity;
-    NPT_Cardinal m_ItemCount;
-    T*           m_Items;
-};
-
-/*----------------------------------------------------------------------
-|   NPT_Array<T>::NPT_Array<T>
-+---------------------------------------------------------------------*/
-template <typename T>
-inline
-NPT_Array<T>::NPT_Array(NPT_Cardinal count) :
-    m_Capacity(0),
-    m_ItemCount(0),
-    m_Items(0)
-{
-    Reserve(count);
-}
-
-/*----------------------------------------------------------------------
-|   NPT_Array<T>::NPT_Array<T>
-+---------------------------------------------------------------------*/
-template <typename T>
-inline
-NPT_Array<T>::NPT_Array(const NPT_Array<T>& copy) :
-    m_Capacity(0),
-    m_ItemCount(0),
-    m_Items(0)
-{
-    Reserve(copy.GetItemCount());
-    for (NPT_Ordinal i=0; i<copy.m_ItemCount; i++) {
-        new ((void*)&m_Itemsi) T(copy.m_Itemsi);
-    }
-    m_ItemCount = copy.m_ItemCount;
-}
-
-/*----------------------------------------------------------------------
-|   NPT_Array<T>::NPT_Array<T>
-+---------------------------------------------------------------------*/
-template <typename T>
-inline
-NPT_Array<T>::NPT_Array(NPT_Cardinal count, const T& item) :
-    m_Capacity(0),
-    m_ItemCount(count),
-    m_Items(0)    
-{
-    Reserve(count);
-    for (NPT_Ordinal i=0; i<count; i++) {
-        new ((void*)&m_Itemsi) T(item);
-    }
-}
-
-/*----------------------------------------------------------------------
-|   NPT_Array<T>::NPT_Array<T>
-+---------------------------------------------------------------------*/
-template <typename T>
-inline
-NPT_Array<T>::NPT_Array(const T* items, NPT_Cardinal item_count) :
-    m_Capacity(0),
-    m_ItemCount(item_count),
-    m_Items(0)    
-{
-    Reserve(item_count);
-    for (NPT_Ordinal i=0; i<item_count; i++) {
-        new ((void*)&m_Itemsi) T(itemsi);
-    }
-}
-
-/*----------------------------------------------------------------------
-|   NPT_Array<T>::~NPT_Array<T>
-+---------------------------------------------------------------------*/
-template <typename T>
-inline
-NPT_Array<T>::~NPT_Array()
-{
-    // remove all items
-    Clear();
-
-    // free the memory
-    ::operator delete((void*)m_Items);
-}
-
-/*----------------------------------------------------------------------
-|   NPT_Array<T>::operator=
-+---------------------------------------------------------------------*/
-template <typename T>
-NPT_Array<T>&
-NPT_Array<T>::operator=(const NPT_Array<T>& copy)
-{
-    // do nothing if we're assigning to ourselves
-    if (this == &copy) return *this;
-
-    // destroy all elements
-    Clear();
-
-    // copy all elements from the other object
-    Reserve(copy.GetItemCount());
-    m_ItemCount = copy.m_ItemCount;
-    for (NPT_Ordinal i=0; i<copy.m_ItemCount; i++) {
-        new ((void*)&m_Itemsi) T(copy.m_Itemsi);
-    }
-
-    return *this;
-}
-
-/*----------------------------------------------------------------------
-|   NPT_Array<T>::Clear
-+---------------------------------------------------------------------*/
-template <typename T>
-NPT_Result
-NPT_Array<T>::Clear()
-{
-    // destroy all items
-    for (NPT_Ordinal i=0; i<m_ItemCount; i++) {
-        m_Itemsi.~T();
-    }
-
-    m_ItemCount = 0;
-
-    return NPT_SUCCESS;
-}
-
-/*----------------------------------------------------------------------
-|   NPT_Array<T>::Allocate
-+---------------------------------------------------------------------*/
-template <typename T>
-T*
-NPT_Array<T>::Allocate(NPT_Cardinal count, NPT_Cardinal& allocated) 
-{
-    if (m_Capacity) {
-        allocated = 2*m_Capacity;
-    } else {
-        // start with just enough elements to fill 
-        // NPT_ARRAY_INITIAL_MAX_SIZE worth of memory
-        allocated = NPT_ARRAY_INITIAL_MAX_SIZE/sizeof(T);
-        if (allocated == 0) allocated = 1;
-    }
-    if (allocated < count) allocated = count;
-
-    // allocate the items
-    return (T*)::operator new(allocated*sizeof(T));
-}
-
-/*----------------------------------------------------------------------
-|   NPT_Array<T>::Reserve
-+---------------------------------------------------------------------*/
-template <typename T>
-NPT_Result
-NPT_Array<T>::Reserve(NPT_Cardinal count)
-{
-    if (count <= m_Capacity) return NPT_SUCCESS;
-
-    // (re)allocate the items
-    NPT_Cardinal new_capacity;
-    T* new_items = Allocate(count, new_capacity);
-    if (new_items == NULL) {
-        return NPT_ERROR_OUT_OF_MEMORY;
-    }
-    if (m_ItemCount && m_Items) {
-        for (unsigned int i=0; i<m_ItemCount; i++) {
-            // construct the copy
-            new ((void*)&new_itemsi)T(m_Itemsi);
-
-            // destroy the item
-            m_Itemsi.~T();
-        }
-    }
-    ::operator delete((void*)m_Items);
-    m_Items = new_items;
-    m_Capacity = new_capacity;
-
-    return NPT_SUCCESS;
-}
-
-/*----------------------------------------------------------------------
-|   NPT_Array<T>::Add
-+---------------------------------------------------------------------*/
-template <typename T>
-inline
-NPT_Result
-NPT_Array<T>::Add(const T& item)
-{
-    // ensure capacity
-    NPT_Result result = Reserve(m_ItemCount+1);
-    if (result != NPT_SUCCESS) return result;
-
-    // store the item
-    new ((void*)&m_Itemsm_ItemCount++) T(item);
-
-    return NPT_SUCCESS;
-}
-
-/*----------------------------------------------------------------------
-|   NPT_Array<T>::Erase
-+---------------------------------------------------------------------*/
-template <typename T>
-inline
-NPT_Result
-NPT_Array<T>::Erase(Iterator which)
-{
-    return Erase(which, which);
-}
-
-/*----------------------------------------------------------------------
-|   NPT_Array<T>::Erase
-+---------------------------------------------------------------------*/
-template <typename T>
-NPT_Result
-NPT_Array<T>::Erase(Iterator first, Iterator last)
-{
-    // check parameters
-    if (first == NULL || last == NULL) return NPT_ERROR_INVALID_PARAMETERS;
-
-    // check the bounds
-    NPT_Ordinal first_index = (NPT_Ordinal)(NPT_POINTER_TO_LONG(first-m_Items));
-    NPT_Ordinal last_index  = (NPT_Ordinal)(NPT_POINTER_TO_LONG(last-m_Items));
-    if (first_index >= m_ItemCount ||
-        last_index  >= m_ItemCount ||
-        first_index > last_index) {
-        return NPT_ERROR_INVALID_PARAMETERS;
-    }
-
-    // shift items to the left
-    NPT_Cardinal interval = last_index-first_index+1;
-    NPT_Cardinal shifted = m_ItemCount-last_index-1;
-    for (NPT_Ordinal i=first_index; i<first_index+shifted; i++) {
-        m_Itemsi = m_Itemsi+interval;
-    }
-
-    // destruct the remaining items
-    for (NPT_Ordinal i=first_index+shifted; i<m_ItemCount; i++) {
-        m_Itemsi.~T();
-    }
-
-    // update the item count
-    m_ItemCount -= interval;
-
-    return NPT_SUCCESS;
-}
-
-/*----------------------------------------------------------------------
-|   NPT_Array<T>::Insert
-+---------------------------------------------------------------------*/
-template <typename T>
-NPT_Result
-NPT_Array<T>::Insert(Iterator where, const T& item, NPT_Cardinal repeat)
-{
-    // check bounds
-    NPT_Ordinal where_index = where?((NPT_Ordinal)NPT_POINTER_TO_LONG(where-m_Items)):m_ItemCount;
-    if (where > &m_Itemsm_ItemCount || repeat == 0) return NPT_ERROR_INVALID_PARAMETERS;
-
-    NPT_Cardinal needed = m_ItemCount+repeat;
-    if (needed > m_Capacity) {
-        // allocate more memory
-        NPT_Cardinal new_capacity;
-        T* new_items = Allocate(needed, new_capacity);
-        if (new_items == NULL) return NPT_ERROR_OUT_OF_MEMORY;
-        m_Capacity = new_capacity;
-
-        // move the items before the insertion point
-        for (NPT_Ordinal i=0; i<where_index; i++) {
-            new((void*)&new_itemsi)T(m_Itemsi);
-            m_Itemsi.~T();
-        }
-
-        // move the items after the insertion point
-        for (NPT_Ordinal i=where_index; i<m_ItemCount; i++) {
-            new((void*)&new_itemsi+repeat)T(m_Itemsi);
-            m_Itemsi.~T();
-        }
-
-        // use the new items instead of the current ones
-        ::operator delete((void*)m_Items);
-        m_Items = new_items;
-    } else {
-        // shift items after the insertion point to the right
-        for (NPT_Ordinal i=m_ItemCount; i>where_index; i--) {
-            new((void*)&m_Itemsi+repeat-1)T(m_Itemsi-1);
-            m_Itemsi-1.~T();
-        }
-    }
-
-    // insert the new items
-    for (NPT_Cardinal i=where_index; i<where_index+repeat; i++) {
-        new((void*)&m_Itemsi)T(item);
-    }
-
-    // update the item count
-    m_ItemCount += repeat;
-
-    return NPT_SUCCESS;
-}
-
-/*----------------------------------------------------------------------
-|   NPT_Array<T>::Resize
-+---------------------------------------------------------------------*/
-template <typename T>
-NPT_Result
-NPT_Array<T>::Resize(NPT_Cardinal size)
-{
-    if (size < m_ItemCount) {
-        // shrink
-        for (NPT_Ordinal i=size; i<m_ItemCount; i++) {
-            m_Itemsi.~T();
-        }
-        m_ItemCount = size;
-    } else if (size > m_ItemCount) {
-        return Resize(size, T());
-    }
-
-    return NPT_SUCCESS;
-}
-
-/*----------------------------------------------------------------------
-|   NPT_Array<T>::Resize
-+---------------------------------------------------------------------*/
-template <typename T>
-NPT_Result
-NPT_Array<T>::Resize(NPT_Cardinal size, const T& fill)
-{
-    if (size < m_ItemCount) {
-        return Resize(size);
-    } else if (size > m_ItemCount) {
-        Reserve(size);
-        for (NPT_Ordinal i=m_ItemCount; i<size; i++) {
-            new ((void*)&m_Itemsi) T(fill);
-        }
-        m_ItemCount = size;
-    }
-
-    return NPT_SUCCESS;
-}
-
-/*----------------------------------------------------------------------
-|   NPT_Array<T>::Contains
-+---------------------------------------------------------------------*/
-template <typename T>
-bool
-NPT_Array<T>::Contains(const T& data) const
-{
-    for (NPT_Ordinal i=0; i<m_ItemCount; i++) {
-        if (m_Itemsi == data) return true;
-    }
-
-    return false;
-}
-
-/*----------------------------------------------------------------------
-|   NPT_Array<T>::operator==
-+---------------------------------------------------------------------*/
-template <typename T>
-bool
-NPT_Array<T>::operator==(const NPT_Array<T>& other) const
-{
-    // we need the same number of items
-    if (other.m_ItemCount != m_ItemCount) return false;
-
-    // compare all items
-    for (NPT_Ordinal i=0; i<m_ItemCount; i++) {
-        if (!(m_Itemsi == other.m_Itemsi)) return false;
-    }
-
-    return true;
-}
-
-/*----------------------------------------------------------------------
-|   NPT_Array<T>::operator!=
-+---------------------------------------------------------------------*/
-template <typename T>
-inline
-bool
-NPT_Array<T>::operator!=(const NPT_Array<T>& other) const
-{
-    return !(*this == other);
-}
-
-#endif // _NPT_ARRAY_H_
-
-
-
-
-
-
-
-
-
-
-
-
-

gpac-2.2.1.tar.gz/extra_lib/include/platinum/NptAutomaticCleaner.h Deleted

@@ -1,90 +0,0 @@
-/*****************************************************************
-|
-|   Neptune - Automatic Cleaner
-|
-| Copyright (c) 2002-2008, Axiomatic Systems, LLC.
-| All rights reserved.
-|
-| Redistribution and use in source and binary forms, with or without
-| modification, are permitted provided that the following conditions are met:
-|     * Redistributions of source code must retain the above copyright
-|       notice, this list of conditions and the following disclaimer.
-|     * Redistributions in binary form must reproduce the above copyright
-|       notice, this list of conditions and the following disclaimer in the
-|       documentation and/or other materials provided with the distribution.
-|     * Neither the name of Axiomatic Systems nor the
-|       names of its contributors may be used to endorse or promote products
-|       derived from this software without specific prior written permission.
-|
-| THIS SOFTWARE IS PROVIDED BY AXIOMATIC SYSTEMS ''AS IS'' AND ANY
-| EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-| WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-| DISCLAIMED. IN NO EVENT SHALL AXIOMATIC SYSTEMS BE LIABLE FOR ANY
-| DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-| (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-| LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-| ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-| (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-| SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-|
-****************************************************************/
-
-#ifndef _NPT_AUTOMATIC_CLEANER_H_
-#define _NPT_AUTOMATIC_CLEANER_H_
-
-/*----------------------------------------------------------------------
-|   includes
-+---------------------------------------------------------------------*/
-#include "NptList.h"
-
-/*----------------------------------------------------------------------
-|   NPT_AutomaticCleaner
-+---------------------------------------------------------------------*/
-class NPT_AutomaticCleaner
-{
-public:
-    class Singleton {
-    public:
-        virtual ~Singleton() {}
-    };
-    
-    // singleton management
-    class Cleaner {
-        static Cleaner AutomaticCleaner;
-        ~Cleaner() {
-            if (Instance) {
-                delete Instance;
-                Instance = NULL;
-            }
-        }
-    };
-    static NPT_AutomaticCleaner* GetInstance();
-    static void Shutdown() {
-        if (Instance) {
-            delete Instance;
-            Instance = NULL;
-        }
-	}
-    
-    // destructor
-    ~NPT_AutomaticCleaner();
-    
-    // methods
-    NPT_Result Register(Singleton* singleton);
-    NPT_Result RegisterTlsContext(Singleton* singleton);
-    NPT_Result RegisterHttpConnectionManager(Singleton* singleton);
-    
-private:
-    // class members
-    static NPT_AutomaticCleaner* Instance;
-    
-    // constructor
-    NPT_AutomaticCleaner();
-    
-    // members
-    NPT_List<Singleton*> m_Singletons;
-    Singleton* m_TlsContext;
-    Singleton* m_HttpConnectionManager;
-};
-
-#endif // _NPT_AUTOMATIC_CLEANER_H_

gpac-2.2.1.tar.gz/extra_lib/include/platinum/NptAutoreleasePool.h Deleted

@@ -1,57 +0,0 @@
-/*****************************************************************
-|
-|   Neptune - AutoreleasePool
-|
-| Copyright (c) 2002-2008, Axiomatic Systems, LLC.
-| All rights reserved.
-|
-| Redistribution and use in source and binary forms, with or without
-| modification, are permitted provided that the following conditions are met:
-|     * Redistributions of source code must retain the above copyright
-|       notice, this list of conditions and the following disclaimer.
-|     * Redistributions in binary form must reproduce the above copyright
-|       notice, this list of conditions and the following disclaimer in the
-|       documentation and/or other materials provided with the distribution.
-|     * Neither the name of Axiomatic Systems nor the
-|       names of its contributors may be used to endorse or promote products
-|       derived from this software without specific prior written permission.
-|
-| THIS SOFTWARE IS PROVIDED BY AXIOMATIC SYSTEMS ''AS IS'' AND ANY
-| EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-| WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-| DISCLAIMED. IN NO EVENT SHALL AXIOMATIC SYSTEMS BE LIABLE FOR ANY
-| DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-| (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-| LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-| ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-| (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-| SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-|
- ****************************************************************/
-
-#ifndef _NPT_AUTORELEASE_POOL_H_
-#define _NPT_AUTORELEASE_POOL_H_
-
-/*----------------------------------------------------------------------
-|   NPT_AutoreleasePoolInterface
-+---------------------------------------------------------------------*/
-class NPT_AutoreleasePoolInterface 
-{
-public:
-    virtual ~NPT_AutoreleasePoolInterface() {}
-};
-
-/*----------------------------------------------------------------------
-|   NPT_AutoreleasePool
-+---------------------------------------------------------------------*/
-class NPT_AutoreleasePool : public NPT_AutoreleasePoolInterface 
-{
-public:
-    NPT_AutoreleasePool();
-    virtual ~NPT_AutoreleasePool();
-
-private:
-    NPT_AutoreleasePoolInterface* m_Delegate;
-};
-
-#endif // _NPT_AUTORELEASE_POOL_H_

gpac-2.2.1.tar.gz/extra_lib/include/platinum/NptBase64.h Deleted

@@ -1,68 +0,0 @@
-/*****************************************************************
-|
-|   Neptune - Base64
-|
-| Copyright (c) 2002-2008, Axiomatic Systems, LLC.
-| All rights reserved.
-|
-| Redistribution and use in source and binary forms, with or without
-| modification, are permitted provided that the following conditions are met:
-|     * Redistributions of source code must retain the above copyright
-|       notice, this list of conditions and the following disclaimer.
-|     * Redistributions in binary form must reproduce the above copyright
-|       notice, this list of conditions and the following disclaimer in the
-|       documentation and/or other materials provided with the distribution.
-|     * Neither the name of Axiomatic Systems nor the
-|       names of its contributors may be used to endorse or promote products
-|       derived from this software without specific prior written permission.
-|
-| THIS SOFTWARE IS PROVIDED BY AXIOMATIC SYSTEMS ''AS IS'' AND ANY
-| EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-| WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-| DISCLAIMED. IN NO EVENT SHALL AXIOMATIC SYSTEMS BE LIABLE FOR ANY
-| DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-| (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-| LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-| ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-| (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-| SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-|
-****************************************************************/
-
-#ifndef _NPT_BASE64_H_
-#define _NPT_BASE64_H_
-
-/*----------------------------------------------------------------------
-|   includes
-+---------------------------------------------------------------------*/
-#include "NptDataBuffer.h"
-#include "NptStrings.h"
-
-/*----------------------------------------------------------------------
-|   constants
-+---------------------------------------------------------------------*/
-const NPT_Cardinal NPT_BASE64_MIME_BLOCKS_PER_LINE = 19;
-const NPT_Cardinal NPT_BASE64_PEM_BLOCKS_PER_LINE  = 16;
-
-/*----------------------------------------------------------------------
-|   NPT_Base64
-+---------------------------------------------------------------------*/
-class NPT_Base64 {
-public:
-    // class methods
-    static NPT_Result Decode(const char*     base64, 
-                             NPT_Size        size,
-                             NPT_DataBuffer& data,
-                             bool            url_safe = false);
-    static NPT_Result Encode(const NPT_Byte* data, 
-                             NPT_Size        size, 
-                             NPT_String&     base64, 
-                             NPT_Cardinal    max_blocks_per_line = 0, 
-                             bool            url_safe = false);
-
-private: 
-    // this class is purely static
-    NPT_Base64();
-};
-
-#endif // _NPT_BASE64_H_

gpac-2.2.1.tar.gz/extra_lib/include/platinum/NptBufferedStreams.h Deleted

@@ -1,101 +0,0 @@
-/*****************************************************************
-|
-|   Neptune - Buffered Byte Stream
-|
-| Copyright (c) 2002-2008, Axiomatic Systems, LLC.
-| All rights reserved.
-|
-| Redistribution and use in source and binary forms, with or without
-| modification, are permitted provided that the following conditions are met:
-|     * Redistributions of source code must retain the above copyright
-|       notice, this list of conditions and the following disclaimer.
-|     * Redistributions in binary form must reproduce the above copyright
-|       notice, this list of conditions and the following disclaimer in the
-|       documentation and/or other materials provided with the distribution.
-|     * Neither the name of Axiomatic Systems nor the
-|       names of its contributors may be used to endorse or promote products
-|       derived from this software without specific prior written permission.
-|
-| THIS SOFTWARE IS PROVIDED BY AXIOMATIC SYSTEMS ''AS IS'' AND ANY
-| EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-| WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-| DISCLAIMED. IN NO EVENT SHALL AXIOMATIC SYSTEMS BE LIABLE FOR ANY
-| DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-| (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-| LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-| ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-| (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-| SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-|
- ****************************************************************/
-
-#ifndef _NPT_BUFFERED_STREAMS_H_
-#define _NPT_BUFFERED_STREAMS_H_
-
-/*----------------------------------------------------------------------
-|   includes
-+---------------------------------------------------------------------*/
-#include "NptStreams.h"
-#include "NptTypes.h"
-#include "NptConstants.h"
-#include "NptStrings.h"
-#include "NptDebug.h"
-
-/*----------------------------------------------------------------------
-|   NPT_BufferedStream
-+---------------------------------------------------------------------*/
-const NPT_Size NPT_BUFFERED_BYTE_STREAM_DEFAULT_SIZE = 4096;
-
-/*----------------------------------------------------------------------
-|   NPT_BufferedInputStream
-+---------------------------------------------------------------------*/
-class NPT_BufferedInputStream : public NPT_InputStream
-{
-public:
-    // constructors and destructor
-    NPT_BufferedInputStream(NPT_InputStreamReference& stream,
-                            NPT_Size buffer_size = NPT_BUFFERED_BYTE_STREAM_DEFAULT_SIZE);
-    virtual ~NPT_BufferedInputStream();
-
-    // methods
-    virtual NPT_Result ReadLine(NPT_String& line,
-                                NPT_Size    max_chars = 4096,
-                                bool        break_on_cr = false);
-    virtual NPT_Result ReadLine(char*     buffer, 
-                                NPT_Size  buffer_size,
-                                NPT_Size* chars_read = NULL,
-                                bool      break_on_cr = false);
-    virtual NPT_Result SetBufferSize(NPT_Size size, bool force = false);
-    virtual NPT_Result Peek(void*     buffer, 
-                            NPT_Size  bytes_to_read, 
-                            NPT_Size* bytes_read);
-                              
-    // NPT_InputStream methods
-    NPT_Result Read(void*     buffer, 
-                    NPT_Size  bytes_to_read, 
-                    NPT_Size* bytes_read = NULL);
-    NPT_Result Seek(NPT_Position offset);
-    NPT_Result Tell(NPT_Position& offset);
-    NPT_Result GetSize(NPT_LargeSize& size);
-    NPT_Result GetAvailable(NPT_LargeSize& available);
-
-protected:
-    // members
-    NPT_InputStreamReference m_Source;
-    bool                     m_SkipNewline;
-    bool                     m_Eos;
-    struct {
-        NPT_Byte* data;
-        NPT_Size  offset;
-        NPT_Size  valid;
-        NPT_Size  size;
-    } m_Buffer;
-
-    // methods
-    virtual NPT_Result FillBuffer();
-    virtual NPT_Result ReleaseBuffer();
-};
-
-typedef NPT_Reference<NPT_BufferedInputStream> NPT_BufferedInputStreamReference;
-
-#endif // _NPT_BUFFERED_STREAMS_H_

gpac-2.2.1.tar.gz/extra_lib/include/platinum/NptCommon.h Deleted

@@ -1,169 +0,0 @@
-/*****************************************************************
-|
-|   Neptune - Common Definitions
-|
-| Copyright (c) 2002-2008, Axiomatic Systems, LLC.
-| All rights reserved.
-|
-| Redistribution and use in source and binary forms, with or without
-| modification, are permitted provided that the following conditions are met:
-|     * Redistributions of source code must retain the above copyright
-|       notice, this list of conditions and the following disclaimer.
-|     * Redistributions in binary form must reproduce the above copyright
-|       notice, this list of conditions and the following disclaimer in the
-|       documentation and/or other materials provided with the distribution.
-|     * Neither the name of Axiomatic Systems nor the
-|       names of its contributors may be used to endorse or promote products
-|       derived from this software without specific prior written permission.
-|
-| THIS SOFTWARE IS PROVIDED BY AXIOMATIC SYSTEMS ''AS IS'' AND ANY
-| EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-| WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-| DISCLAIMED. IN NO EVENT SHALL AXIOMATIC SYSTEMS BE LIABLE FOR ANY
-| DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-| (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-| LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-| ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-| (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-| SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-|
- ****************************************************************/
-
-#ifndef _NPT_COMMON_H_
-#define _NPT_COMMON_H_
-
-/*----------------------------------------------------------------------
-|   includes
-+---------------------------------------------------------------------*/
-#include "NptTypes.h"
-#include "NptResults.h"
-
-/*----------------------------------------------------------------------
-|   NPT_ObjectDeleter
-+---------------------------------------------------------------------*/
-template <class T>
-class NPT_ObjectDeleter {
-public:
-    void operator()(T* object) const {
-        delete object;
-    }
-};
-
-/*----------------------------------------------------------------------
-|   NPT_ObjectComparator
-+---------------------------------------------------------------------*/
-template <class T>
-class NPT_ObjectComparator {
-public:
-    NPT_ObjectComparator(T& object) : m_Object(object) {}
-    bool operator()(const T& object) const {
-        return object == m_Object;
-    }
-private:
-    T& m_Object;
-};
-
-/*----------------------------------------------------------------------
-|   NPT_ContainerFind
-+---------------------------------------------------------------------*/
-template <typename T, typename P>
-NPT_Result NPT_ContainerFind(T&                   container, 
-                             const P&             predicate, 
-                             typename T::Element& item, 
-                             NPT_Ordinal          n=0) 
-{
-    typename T::Iterator found = container.Find(predicate, n);
-    if (found) {
-        item = *found;
-        return NPT_SUCCESS;
-    } else {
-        return NPT_ERROR_NO_SUCH_ITEM;
-    }
-}
-
-/*----------------------------------------------------------------------
-|   NPT_ContainerFind
-+---------------------------------------------------------------------*/
-template <typename T, typename P>
-NPT_Result NPT_ContainerFind(T&                    container, 
-                             const P&              predicate, 
-                             typename T::Iterator& iter, 
-                             NPT_Ordinal           n=0) 
-{
-    iter = container.Find(predicate, n);
-    return iter?NPT_SUCCESS:NPT_ERROR_NO_SUCH_ITEM;
-}
-
-/*----------------------------------------------------------------------
-|   NPT_UntilResultEquals
-+---------------------------------------------------------------------*/
-class NPT_UntilResultEquals
-{
-public:
-    // methods
-    NPT_UntilResultEquals(NPT_Result condition_result, 
-                          NPT_Result return_value = NPT_SUCCESS) :
-      m_ConditionResult(condition_result),
-      m_ReturnValue(return_value) {}
-    bool operator()(NPT_Result result, NPT_Result& return_value) const {
-        if (result == m_ConditionResult) {
-            return_value = m_ReturnValue;
-            return true;
-        } else {
-            return false;
-        }
-    }
-
-private:
-    // members
-    NPT_Result m_ConditionResult;
-    NPT_Result m_ReturnValue;
-};
-
-/*----------------------------------------------------------------------
-|   NPT_UntilResultNotEquals
-+---------------------------------------------------------------------*/
-class NPT_UntilResultNotEquals
-{
-public:
-    // methods
-    NPT_UntilResultNotEquals(NPT_Result condition_result) :
-      m_ConditionResult(condition_result) {}
-    bool operator()(NPT_Result result, NPT_Result& return_value) const {
-        if (result != m_ConditionResult) {
-            return_value = result;
-            return true;
-        } else {
-            return false;
-        }
-    }
-
-private:
-    // members
-    NPT_Result m_ConditionResult;
-};
-
-/*----------------------------------------------------------------------
-|   NPT_PropertyValue
-+---------------------------------------------------------------------*/
-class NPT_PropertyValue
-{
- public:
-    // typedefs
-    typedef enum {UNKNOWN, INTEGER, STRING} Type;
-
-    // methods
-    NPT_PropertyValue() : m_Type(UNKNOWN), m_Integer(0) {}
-    NPT_PropertyValue(int value)         : m_Type(INTEGER), m_Integer(value) {}
-    NPT_PropertyValue(const char* value) : m_Type(STRING),  m_String(value)  {}
-
-    // members
-    Type m_Type;
-    union {
-        int         m_Integer;
-        const char* m_String;
-    };
-};
-
-#endif // _NPT_COMMON_H_
-

gpac-2.2.1.tar.gz/extra_lib/include/platinum/NptConfig.h Deleted

@@ -1,351 +0,0 @@
-/*****************************************************************
-|
-|   Neptune - Configuration
-|
-| Copyright (c) 2002-2008, Axiomatic Systems, LLC.
-| All rights reserved.
-|
-| Redistribution and use in source and binary forms, with or without
-| modification, are permitted provided that the following conditions are met:
-|     * Redistributions of source code must retain the above copyright
-|       notice, this list of conditions and the following disclaimer.
-|     * Redistributions in binary form must reproduce the above copyright
-|       notice, this list of conditions and the following disclaimer in the
-|       documentation and/or other materials provided with the distribution.
-|     * Neither the name of Axiomatic Systems nor the
-|       names of its contributors may be used to endorse or promote products
-|       derived from this software without specific prior written permission.
-|
-| THIS SOFTWARE IS PROVIDED BY AXIOMATIC SYSTEMS ''AS IS'' AND ANY
-| EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-| WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-| DISCLAIMED. IN NO EVENT SHALL AXIOMATIC SYSTEMS BE LIABLE FOR ANY
-| DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-| (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-| LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-| ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-| (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-| SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-|
- ****************************************************************/
-
-#ifndef _NPT_CONFIG_H_
-#define _NPT_CONFIG_H_
-
-/*----------------------------------------------------------------------
-|   defaults
-+---------------------------------------------------------------------*/
-#define NPT_CONFIG_HAVE_ASSERT_H
-#define NPT_CONFIG_HAVE_STD_C
-#define NPT_CONFIG_HAVE_POSIX_TIME
-#define NPT_CONFIG_HAVE_ASSERT_H
-#define NPT_CONFIG_HAVE_STDLIB_H
-#define NPT_CONFIG_HAVE_STDIO_H
-#define NPT_CONFIG_HAVE_STDARG_H
-#define NPT_CONFIG_HAVE_STDINT_H
-#define NPT_CONFIG_HAVE_STRING_H
-#define NPT_CONFIG_HAVE_LIMITS_H
-
-/*----------------------------------------------------------------------
-|   standard C runtime
-+---------------------------------------------------------------------*/
-#if defined(NPT_CONFIG_HAVE_STD_C)
-#define NPT_CONFIG_HAVE_MALLOC
-#define NPT_CONFIG_HAVE_CALLOC
-#define NPT_CONFIG_HAVE_REALLOC
-#define NPT_CONFIG_HAVE_FREE
-#define NPT_CONFIG_HAVE_MEMCPY
-#define NPT_CONFIG_HAVE_MEMSET
-#define NPT_CONFIG_HAVE_MEMCMP
-#define NPT_CONFIG_HAVE_GETENV
-#define NPT_CONFIG_HAVE_SETENV
-#define NPT_CONFIG_HAVE_UNSETENV
-#define NPT_CONFIG_HAVE_READDIR_R
-#endif /* NPT_CONFIG_HAS_STD_C */
-
-#if defined(NPT_CONFIG_HAVE_POSIX_TIME)
-#define NPT_CONFIG_HAVE_GMTIME
-#define NPT_CONFIG_HAVE_GMTIME_R
-#define NPT_CONFIG_HAVE_LOCALTIME
-#define NPT_CONFIG_HAVE_LOCALTIME_R
-#endif
-
-#if defined(NPT_CONFIG_HAVE_STRING_H)
-#define NPT_CONFIG_HAVE_STRCMP
-#define NPT_CONFIG_HAVE_STRNCMP
-#define NPT_CONFIG_HAVE_STRDUP
-#define NPT_CONFIG_HAVE_STRLEN
-#define NPT_CONFIG_HAVE_STRCPY
-#define NPT_CONFIG_HAVE_STRNCPY
-#endif /* NPT_CONFIG_HAVE_STRING_H */
-
-#if defined(NPT_CONFIG_HAVE_STDIO_H)
-#define NPT_CONFIG_HAVE_SPRINTF
-#define NPT_CONFIG_HAVE_SNPRINTF
-#define NPT_CONFIG_HAVE_VSPRINTF
-#define NPT_CONFIG_HAVE_VSNPRINTF
-#endif /* NPT_CONFIG_HAVE_STDIO_H */
-
-#if defined(NPT_CONFIG_HAVE_LIMITS_H)
-#define NPT_CONFIG_HAVE_INT_MIN
-#define NPT_CONFIG_HAVE_INT_MAX
-#define NPT_CONFIG_HAVE_UINT_MAX
-#define NPT_CONFIG_HAVE_LONG_MIN
-#define NPT_CONFIG_HAVE_LONG_MAX
-#define NPT_CONFIG_HAVE_ULONG_MAX
-#endif
-
-/*----------------------------------------------------------------------
-|   standard C++ runtime
-+---------------------------------------------------------------------*/
-#define NPT_CONFIG_HAVE_NEW_H
-
-/*----------------------------------------------------------------------
-|   sockets
-+---------------------------------------------------------------------*/
-#define NPT_CONFIG_HAVE_SOCKADDR_SA_LEN
-
-/*----------------------------------------------------------------------
-|   platform specifics
-+---------------------------------------------------------------------*/
-/* Windows 32 */
-#if defined(_WIN32) || defined(_XBOX)
-#if !defined(STRICT)
-#define STRICT
-#endif
-#endif
-
-/* XBox */
-#if defined(_XBOX)
-#define NPT_CONFIG_THREAD_STACK_SIZE 0x10000
-#endif
-
-/* QNX */
-#if defined(__QNX__)
-#endif
-
-/* cygwin */
-#if defined(__CYGWIN__)
-#undef NPT_CONFIG_HAVE_SOCKADDR_SA_LEN
-#endif
-
-/* linux */
-#if defined(__linux__)
-#define NPT_CONFIG_HAVE_GETADDRINFO
-#undef NPT_CONFIG_HAVE_SOCKADDR_SA_LEN
-#endif
-
-/* symbian */
-#if defined(__SYMBIAN32__)
-/* If defined, specify the stack size of each NPT_Thread. */
-#define NPT_CONFIG_THREAD_STACK_SIZE   0x14000
-#endif
-
-/* android */
-#if defined(ANDROID)
-#define NPT_CONFIG_HAVE_GETADDRINFO
-#undef NPT_CONFIG_HAVE_SOCKADDR_SA_LEN
-#endif
-
-/* OSX and iOS */
-#if defined(__APPLE__)
-#define NPT_CONFIG_HAVE_GETADDRINFO
-#define NPT_CONFIG_HAVE_AUTORELEASE_POOL
-#define NPT_CONFIG_HAVE_SYSTEM_LOG_CONFIG
-#endif
-
-/*----------------------------------------------------------------------
-|   compiler specifics
-+---------------------------------------------------------------------*/
-/* GCC */
-#if defined(__GNUC__)
-#define NPT_LocalFunctionName __FUNCTION__
-#define NPT_COMPILER_UNUSED(p) (void)p
-#else
-#define NPT_COMPILER_UNUSED(p) 
-#endif
-
-/* TriMedia C/C++ Compiler */
-#if defined(__TCS__)
-#undef NPT_CONFIG_HAVE_ASSERT_H
-#undef NPT_CONFIG_HAVE_SNPRINTF
-#undef NPT_CONFIG_HAVE_VSNPRINTF
-#endif
-
-/* palmos compiler */
-#if defined(__PALMOS__)
-#if __PALMOS__ <= 0x05000000
-#undef NPT_CONFIG_HAVE_ASSERT_H
-#undef NPT_CONFIG_HAVE_SNPRINTF
-#undef NPT_CONFIG_HAVE_VSNPRINTF
-#endif
-#endif
-
-/* Microsoft C/C++ Compiler */
-#if defined(_MSC_VER)
-#undef NPT_CONFIG_HAVE_STDINT_H
-#define NPT_CONFIG_HAVE_GETADDRINFO
-#define NPT_CONFIG_STAT_ST_CTIME_IS_ST_BIRTHTIME
-#define NPT_FORMAT_64 "I64"
-#define NPT_CONFIG_INT64_TYPE __int64
-#define NPT_INT64_MIN _I64_MIN
-#define NPT_INT64_MAX _I64_MAX
-#define NPT_UINT64_MAX _UI64_MAX
-#define NPT_INT64_C(_x) _x##i64
-#define NPT_UINT64_C(_x) _x##ui64
-#define NPT_LocalFunctionName __FUNCTION__
-#if !defined(_WIN32_WCE)
-#define NPT_fseek _fseeki64
-#define NPT_ftell _ftelli64
-#else
-#define NPT_fseek(a,b,c) fseek((a),(long)(b), (c))
-#define NPT_ftell ftell
-#endif
-#define NPT_stat  NPT_stat_utf8
-#define NPT_stat_struct struct __stat64
-#if defined(_WIN64)
-typedef __int64 NPT_PointerLong;
-#else
-#if _MSC_VER >= 1400
-typedef __w64 long NPT_PointerLong;
-#else
-typedef long NPT_PointerLong;
-#endif
-#endif
-#define NPT_POINTER_TO_LONG(_p) ((NPT_PointerLong) (_p) )
-#if _MSC_VER >= 1400 && !defined(_WIN32_WCE)
-#define gmtime_r(a,b) gmtime_s(a,b)
-#define localtime_r(a,b) localtime_s(b,a)
-#define NPT_CONFIG_HAVE_FOPEN_S
-#define NPT_CONFIG_HAVE_FSOPEN
-#define NPT_CONFIG_HAVE_SHARE_H
-#define NPT_vsnprintf(s,c,f,a)  _vsnprintf_s(s,c,_TRUNCATE,f,a)
-#define NPT_snprintf(s,c,f,...) _snprintf_s(s,c,_TRUNCATE,f,__VA_ARGS__)
-#define NPT_strncpy(d,s,c)       strncpy_s(d,c+1,s,c)
-#define NPT_strcpy(d,s)          strcpy_s(d,strlen(s)+1,s)
-#undef NPT_CONFIG_HAVE_GETENV
-#define NPT_CONFIG_HAVE_DUPENV_S
-#define dupenv_s _dupenv_s
-#undef NPT_CONFIG_HAVE_SETENV
-#undef NPT_CONFIG_HAVE_UNSETENV
-#define NPT_CONFIG_HAVE_PUTENV_S
-#define putenv_s _putenv_s
-#else
-#undef NPT_CONFIG_HAVE_GMTIME_R
-#undef NPT_CONFIG_HAVE_LOCALTIME_R
-#define NPT_vsnprintf  _vsnprintf
-#define NPT_snprintf   _snprintf
-#endif
-#if defined(_DEBUG)
-#define _CRTDBG_MAP_ALLOC
-#endif
-#endif
-
-/* Windows CE */
-#if defined(_WIN32_WCE)
-#if defined(NPT_CONFIG_HAVE_FOPEN_S)
-#undef NPT_CONFIG_HAVE_FOPEN_S
-#endif
-#endif
-
-/* Symbian */
-#if defined(__SYMBIAN32__)
-#undef NPT_CONFIG_HAVE_NEW_H
-#include "e32std.h"
-#define explicit
-#define NPT_fseek fseek  // no fseeko ?
-#define NPT_ftell ftell  // no ftello ?
-#endif
-
-/* Android */
-#if defined(ANDROID)
-#if !defined(NPT_CONFIG_NO_RTTI)
-#define NPT_CONFIG_NO_RTTI
-#endif
-#endif
-
-/* OSX and iOS */
-#if defined(__APPLE__)
-#include <TargetConditionals.h>
-#include <AvailabilityMacros.h>
-#define NPT_CONFIG_HAVE_NET_IF_DL_H
-#define NPT_CONFIG_HAVE_SOCKADDR_DL
-#if !defined(TARGET_OS_IPHONE) || !TARGET_OS_IPHONE
-#define NPT_CONFIG_HAVE_NET_IF_TYPES_H
-#if defined(MAC_OS_X_VERSION_10_6) && (MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_6)
-#define NPT_CONFIG_HAVE_STAT_ST_BIRTHTIME
-#endif
-#endif
-#endif
-
-/*----------------------------------------------------------------------
-|   defaults
-+---------------------------------------------------------------------*/
-#if !defined(NPT_FORMAT_64)
-#define NPT_FORMAT_64 "ll"
-#endif
-
-#if !defined(NPT_POINTER_TO_LONG)
-#define NPT_POINTER_TO_LONG(_p) ((long)(_p))
-#endif
-
-#if !defined(NPT_CONFIG_INT64_TYPE)
-#define NPT_CONFIG_INT64_TYPE long long
-#endif
-
-#if !defined(NPT_INT64_C)
-#define NPT_INT64_C(_x) _x##LL
-#endif
-
-#if !defined(NPT_UINT64_C)
-#define NPT_UINT64_C(_x) _x##ULL
-#endif
-
-#if !defined(NPT_snprintf)
-#define NPT_snprintf snprintf
-#endif
-
-#if !defined(NPT_strcpy)
-#define NPT_strcpy strcpy
-#endif
-
-#if !defined(NPT_strncpy)
-#define NPT_strncpy strncpy
-#endif
-
-#if !defined(NPT_vsnprintf)
-#define NPT_vsnprintf vsnprintf
-#endif
-
-#if !defined(NPT_LocalFunctionName)
-#define NPT_LocalFunctionName (NULL)
-#endif
-
-#if !defined(NPT_CONFIG_THREAD_STACK_SIZE)
-#define NPT_CONFIG_THREAD_STACK_SIZE 0
-#endif
-
-#if !defined(NPT_fseek)
-#define NPT_fseek fseeko
-#endif
-
-#if !defined(NPT_ftell)
-#define NPT_ftell ftello
-#endif
-
-#if !defined(NPT_stat)
-#define NPT_stat stat
-#endif
-
-#if !defined(NPT_stat_struct)
-#define NPT_stat_struct struct stat
-#endif
-
-/*----------------------------------------------------------------------
-|   includes
-+---------------------------------------------------------------------*/
-#if defined(DMALLOC)
-#include <dmalloc.h>
-#endif
-
-#endif // _NPT_CONFIG_H_

gpac-2.2.1.tar.gz/extra_lib/include/platinum/NptConsole.h Deleted

@@ -1,55 +0,0 @@
-/*****************************************************************
-|
-|   Neptune - Console
-|
-| Copyright (c) 2002-2008, Axiomatic Systems, LLC.
-| All rights reserved.
-|
-| Redistribution and use in source and binary forms, with or without
-| modification, are permitted provided that the following conditions are met:
-|     * Redistributions of source code must retain the above copyright
-|       notice, this list of conditions and the following disclaimer.
-|     * Redistributions in binary form must reproduce the above copyright
-|       notice, this list of conditions and the following disclaimer in the
-|       documentation and/or other materials provided with the distribution.
-|     * Neither the name of Axiomatic Systems nor the
-|       names of its contributors may be used to endorse or promote products
-|       derived from this software without specific prior written permission.
-|
-| THIS SOFTWARE IS PROVIDED BY AXIOMATIC SYSTEMS ''AS IS'' AND ANY
-| EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-| WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-| DISCLAIMED. IN NO EVENT SHALL AXIOMATIC SYSTEMS BE LIABLE FOR ANY
-| DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-| (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-| LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-| ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-| (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-| SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-|
-****************************************************************/
-/** @file
-* Header file for console support
-*/
-
-#ifndef _NPT_CONSOLE_H_
-#define _NPT_CONSOLE_H_
-
-/*----------------------------------------------------------------------
-|   includes
-+---------------------------------------------------------------------*/
-#include "NptTypes.h"
-#include "NptResults.h"
-
-/*----------------------------------------------------------------------
-|   prototypes
-+---------------------------------------------------------------------*/
-class NPT_Console {
-public:
-    // class methods
-    static void Output(const char* message);
-    static void OutputF(const char* format, ...);
-};
-
-
-#endif /* _NPT_CONSOLE_H_ */

gpac-2.2.1.tar.gz/extra_lib/include/platinum/NptConstants.h Deleted

@@ -1,44 +0,0 @@
-/*****************************************************************
-|
-|   Neptune - Constants
-|
-| Copyright (c) 2002-2008, Axiomatic Systems, LLC.
-| All rights reserved.
-|
-| Redistribution and use in source and binary forms, with or without
-| modification, are permitted provided that the following conditions are met:
-|     * Redistributions of source code must retain the above copyright
-|       notice, this list of conditions and the following disclaimer.
-|     * Redistributions in binary form must reproduce the above copyright
-|       notice, this list of conditions and the following disclaimer in the
-|       documentation and/or other materials provided with the distribution.
-|     * Neither the name of Axiomatic Systems nor the
-|       names of its contributors may be used to endorse or promote products
-|       derived from this software without specific prior written permission.
-|
-| THIS SOFTWARE IS PROVIDED BY AXIOMATIC SYSTEMS ''AS IS'' AND ANY
-| EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-| WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-| DISCLAIMED. IN NO EVENT SHALL AXIOMATIC SYSTEMS BE LIABLE FOR ANY
-| DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-| (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-| LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-| ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-| (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-| SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-|
- ****************************************************************/
-
-#ifndef _NPT_CONSTANTS_H_
-#define _NPT_CONSTANTS_H_
-
-/*----------------------------------------------------------------------
-|   constants       
-+---------------------------------------------------------------------*/
-#ifndef NULL
-#define NULL 0
-#endif
-
-const int NPT_TIMEOUT_INFINITE = -1;
-
-#endif // _NPT_CONSTANTS_H_

gpac-2.2.1.tar.gz/extra_lib/include/platinum/NptCrypto.h Deleted

@@ -1,78 +0,0 @@
-/*****************************************************************
-|
-|   Neptune - Crypto
-|
-| Copyright (c) 2002-2010, Axiomatic Systems, LLC.
-| All rights reserved.
-|
-| Redistribution and use in source and binary forms, with or without
-| modification, are permitted provided that the following conditions are met:
-|     * Redistributions of source code must retain the above copyright
-|       notice, this list of conditions and the following disclaimer.
-|     * Redistributions in binary form must reproduce the above copyright
-|       notice, this list of conditions and the following disclaimer in the
-|       documentation and/or other materials provided with the distribution.
-|     * Neither the name of Axiomatic Systems nor the
-|       names of its contributors may be used to endorse or promote products
-|       derived from this software without specific prior written permission.
-|
-| THIS SOFTWARE IS PROVIDED BY AXIOMATIC SYSTEMS ''AS IS'' AND ANY
-| EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-| WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-| DISCLAIMED. IN NO EVENT SHALL AXIOMATIC SYSTEMS BE LIABLE FOR ANY
-| DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-| (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-| LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-| ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-| (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-| SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-|
- ****************************************************************/
-
-#ifndef _NPT_CRYPTO_H_
-#define _NPT_CRYPTO_H_
-
-/*----------------------------------------------------------------------
-|   includes
-+---------------------------------------------------------------------*/
-#include "NptTypes.h"
-#include "NptDataBuffer.h"
-
-/*----------------------------------------------------------------------
-|   NPT_BlockCipher
-+---------------------------------------------------------------------*/
-class NPT_BlockCipher {
-public:
-    // types
-    typedef enum {
-        AES_128
-    } Algorithm;
-    
-    typedef enum {
-        ENCRYPT,
-        DECRYPT
-    } Direction;
-    
-    // factory
-    static NPT_Result Create(Algorithm         algorithm, 
-                             Direction         direction,
-                             const NPT_UInt8*  key,
-                             NPT_Size          key_size,
-                             NPT_BlockCipher*& cipher);
-    
-    // methods
-    virtual           ~NPT_BlockCipher() {}
-    virtual NPT_Size   GetBlockSize() = 0;
-    virtual Direction  GetDirection() = 0;
-    virtual Algorithm  GetAlgorithm() = 0;
-    virtual NPT_Result ProcessBlock(const NPT_UInt8* input, NPT_UInt8* output) = 0;
-    /**
-     * @param iv Initial vector (same size as cipher block size), or NULL for an IV made up of all zeros.
-     */
-    virtual NPT_Result ProcessCbc(const NPT_UInt8* input, NPT_Size input_size, const NPT_UInt8* iv, NPT_DataBuffer& output);
-    
-protected:
-    NPT_BlockCipher() {} // don't instantiate directly
-};
-
-#endif // _NPT_CRYPTO_H_

gpac-2.2.1.tar.gz/extra_lib/include/platinum/NptDataBuffer.h Deleted

@@ -1,83 +0,0 @@
-/*****************************************************************
-|
-|   Neptune - Datagram Packets
-|
-| Copyright (c) 2002-2008, Axiomatic Systems, LLC.
-| All rights reserved.
-|
-| Redistribution and use in source and binary forms, with or without
-| modification, are permitted provided that the following conditions are met:
-|     * Redistributions of source code must retain the above copyright
-|       notice, this list of conditions and the following disclaimer.
-|     * Redistributions in binary form must reproduce the above copyright
-|       notice, this list of conditions and the following disclaimer in the
-|       documentation and/or other materials provided with the distribution.
-|     * Neither the name of Axiomatic Systems nor the
-|       names of its contributors may be used to endorse or promote products
-|       derived from this software without specific prior written permission.
-|
-| THIS SOFTWARE IS PROVIDED BY AXIOMATIC SYSTEMS ''AS IS'' AND ANY
-| EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-| WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-| DISCLAIMED. IN NO EVENT SHALL AXIOMATIC SYSTEMS BE LIABLE FOR ANY
-| DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-| (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-| LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-| ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-| (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-| SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-|
- ****************************************************************/
-
-#ifndef _NPT_DATA_BUFFER_H_
-#define _NPT_DATA_BUFFER_H_
-
-/*----------------------------------------------------------------------
-|   includes
-+---------------------------------------------------------------------*/
-#include "NptTypes.h"
-#include "NptConstants.h"
-
-/*----------------------------------------------------------------------
-|   NPT_DataBuffer
-+---------------------------------------------------------------------*/
-class NPT_DataBuffer 
-{
- public:
-    // constructors & destructor
-    NPT_DataBuffer();              // size unknown until first set 
-    NPT_DataBuffer(NPT_Size size); // initial size specified
-    NPT_DataBuffer(const void* data, NPT_Size size, bool copy = true); // initial data and size specified
-    NPT_DataBuffer(const NPT_DataBuffer& other);
-    virtual ~NPT_DataBuffer();
-
-    // operators
-    NPT_DataBuffer& operator=(const NPT_DataBuffer& copy);
-    bool            operator==(const NPT_DataBuffer& other) const;
-
-    // data buffer handling methods
-    virtual NPT_Result SetBuffer(NPT_Byte* buffer, NPT_Size bufferSize);
-    virtual NPT_Result SetBufferSize(NPT_Size bufferSize);
-    virtual NPT_Size   GetBufferSize() const { return m_BufferSize; }
-    virtual NPT_Result Reserve(NPT_Size size);
-    virtual NPT_Result Clear();
-
-    // data handling methods
-    virtual const NPT_Byte* GetData() const { return m_Buffer; }
-    virtual NPT_Byte*       UseData() { return m_Buffer; };
-    virtual NPT_Size        GetDataSize() const { return m_DataSize; }
-    virtual NPT_Result      SetDataSize(NPT_Size size);
-    virtual NPT_Result      SetData(const NPT_Byte* data, NPT_Size dataSize);
-
- protected:
-    // members
-    bool      m_BufferIsLocal;
-    NPT_Byte* m_Buffer;
-    NPT_Size  m_BufferSize;
-    NPT_Size  m_DataSize;
-
-    // methods
-    NPT_Result ReallocateBuffer(NPT_Size size);
-};
-
-#endif // _NPT_DATA_BUFFER_H_

gpac-2.2.1.tar.gz/extra_lib/include/platinum/NptDebug.h Deleted

@@ -1,56 +0,0 @@
-/*****************************************************************
-|
-|   Neptune - Debug Utilities
-|
-| Copyright (c) 2002-2008, Axiomatic Systems, LLC.
-| All rights reserved.
-|
-| Redistribution and use in source and binary forms, with or without
-| modification, are permitted provided that the following conditions are met:
-|     * Redistributions of source code must retain the above copyright
-|       notice, this list of conditions and the following disclaimer.
-|     * Redistributions in binary form must reproduce the above copyright
-|       notice, this list of conditions and the following disclaimer in the
-|       documentation and/or other materials provided with the distribution.
-|     * Neither the name of Axiomatic Systems nor the
-|       names of its contributors may be used to endorse or promote products
-|       derived from this software without specific prior written permission.
-|
-| THIS SOFTWARE IS PROVIDED BY AXIOMATIC SYSTEMS ''AS IS'' AND ANY
-| EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-| WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-| DISCLAIMED. IN NO EVENT SHALL AXIOMATIC SYSTEMS BE LIABLE FOR ANY
-| DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-| (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-| LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-| ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-| (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-| SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-|
- ****************************************************************/
-
-#ifndef _NPT_DEBUG_H_
-#define _NPT_DEBUG_H_
-
-/*----------------------------------------------------------------------
-|    includes
-+---------------------------------------------------------------------*/
-#include "NptConfig.h"
-
-/*----------------------------------------------------------------------
-|    standard macros
-+---------------------------------------------------------------------*/
-#if defined(NPT_CONFIG_HAVE_ASSERT_H) && defined(NPT_DEBUG)
-#include <assert.h>
-#define NPT_ASSERT(x) assert(x)
-#else
-#define NPT_ASSERT(x) ((void)0)
-#endif
-
-/*----------------------------------------------------------------------
-|   NPT_Debug
-+---------------------------------------------------------------------*/
-extern void NPT_Debug(const char* format, ...);
-extern void NPT_DebugOutput(const char* message);
-
-#endif // _NPT_DEBUG_H_

gpac-2.2.1.tar.gz/extra_lib/include/platinum/NptDefs.h Deleted

gpac-2.2.1.tar.gz/extra_lib/include/platinum/NptDigest.h Deleted

@@ -1,78 +0,0 @@
-/*****************************************************************
-|
-|   Neptune - Message Digests
-|
-| Copyright (c) 2002-2010, Axiomatic Systems, LLC.
-| All rights reserved.
-|
-| Redistribution and use in source and binary forms, with or without
-| modification, are permitted provided that the following conditions are met:
-|     * Redistributions of source code must retain the above copyright
-|       notice, this list of conditions and the following disclaimer.
-|     * Redistributions in binary form must reproduce the above copyright
-|       notice, this list of conditions and the following disclaimer in the
-|       documentation and/or other materials provided with the distribution.
-|     * Neither the name of Axiomatic Systems nor the
-|       names of its contributors may be used to endorse or promote products
-|       derived from this software without specific prior written permission.
-|
-| THIS SOFTWARE IS PROVIDED BY AXIOMATIC SYSTEMS ''AS IS'' AND ANY
-| EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-| WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-| DISCLAIMED. IN NO EVENT SHALL AXIOMATIC SYSTEMS BE LIABLE FOR ANY
-| DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-| (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-| LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-| ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-| (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-| SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-|
- ****************************************************************/
-
-#ifndef _NPT_DIGEST_H_
-#define _NPT_DIGEST_H_
-
-/*----------------------------------------------------------------------
-|   includes
-+---------------------------------------------------------------------*/
-#include "NptTypes.h"
-#include "NptDataBuffer.h"
-
-/*----------------------------------------------------------------------
-|   NPT_Digest
-+---------------------------------------------------------------------*/
-class NPT_Digest {
-public:
-    // types
-    typedef enum {
-        ALGORITHM_SHA1,
-        ALGORITHM_SHA256,
-        ALGORITHM_MD5
-    } Algorithm;
-    
-    // factory
-    static NPT_Result Create(Algorithm algorithm, NPT_Digest*& digest);
-    
-    // methods
-    virtual             ~NPT_Digest() {}
-    virtual unsigned int GetSize() = 0;
-    virtual NPT_Result   Update(const NPT_UInt8* data, NPT_Size data_size) = 0;
-    virtual NPT_Result   GetDigest(NPT_DataBuffer& digest) = 0;
-
-protected:
-    NPT_Digest() {} // don't instantiate directly
-};
-
-class NPT_Hmac {
-public:
-    static NPT_Result Create(NPT_Digest::Algorithm algorithm,
-                             const NPT_UInt8*      key,
-                             NPT_Size              key_size, 
-                             NPT_Digest*&          digest);
-
-private:
-    // methods
-    NPT_Hmac() {} // don't instantiate
-};
-
-#endif // _NPT_DIGEST_H_

gpac-2.2.1.tar.gz/extra_lib/include/platinum/NptDynamicCast.h Deleted

@@ -1,89 +0,0 @@
-/*****************************************************************
-|
-|   Neptune - Dynamic Cast Support
-|
-| Copyright (c) 2002-2008, Axiomatic Systems, LLC.
-| All rights reserved.
-|
-| Redistribution and use in source and binary forms, with or without
-| modification, are permitted provided that the following conditions are met:
-|     * Redistributions of source code must retain the above copyright
-|       notice, this list of conditions and the following disclaimer.
-|     * Redistributions in binary form must reproduce the above copyright
-|       notice, this list of conditions and the following disclaimer in the
-|       documentation and/or other materials provided with the distribution.
-|     * Neither the name of Axiomatic Systems nor the
-|       names of its contributors may be used to endorse or promote products
-|       derived from this software without specific prior written permission.
-|
-| THIS SOFTWARE IS PROVIDED BY AXIOMATIC SYSTEMS ''AS IS'' AND ANY
-| EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-| WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-| DISCLAIMED. IN NO EVENT SHALL AXIOMATIC SYSTEMS BE LIABLE FOR ANY
-| DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-| (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-| LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-| ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-| (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-| SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-|
- ****************************************************************/
-
-#ifndef _NPT_DYNAMIC_CAST_H_
-#define _NPT_DYNAMIC_CAST_H_
-
-/*----------------------------------------------------------------------
-|   includes
-+---------------------------------------------------------------------*/
-#include "NptTypes.h"
-#include "NptCommon.h"
-#include "NptResults.h"
-#include "NptConfig.h"
-
-/*----------------------------------------------------------------------
-|   macros
-+---------------------------------------------------------------------*/
-#if defined(NPT_CONFIG_NO_RTTI)
-#define NPT_DYNAMIC_CAST(_class,_object) \
-( ((_object)==0) ? 0 : reinterpret_cast<_class*>((_object)->DynamicCast(&_class::_class_##_class)) )
-#define NPT_IMPLEMENT_DYNAMIC_CAST(_class)              \
-static int _class_##_class;                             \
-virtual void* DynamicCast(const void* class_anchor) {   \
-    if (class_anchor ==  &_class::_class_##_class) {    \
-        return static_cast<_class*>(this);              \
-    }                                                   \
-    return NULL;                                        \
-}
-#define NPT_IMPLEMENT_DYNAMIC_CAST_D(_class,_superclass)\
-static int _class_##_class;                             \
-virtual void* DynamicCast(const void* class_anchor) {   \
-    if (class_anchor ==  &_class::_class_##_class) {    \
-        return static_cast<_class*>(this);              \
-    } else {                                            \
-        return _superclass::DynamicCast(class_anchor);  \
-    }                                                   \
-}
-#define NPT_IMPLEMENT_DYNAMIC_CAST_D2(_class,_superclass,_mixin)\
-static int _class_##_class;                                     \
-virtual void* DynamicCast(const void* class_anchor) {           \
-    if (class_anchor ==  &_class::_class_##_class) {            \
-        return static_cast<_class*>(this);                      \
-    } else {                                                    \
-        void* sup = _superclass::DynamicCast(class_anchor);     \
-        if (sup) return sup;                                    \
-        return _mixin::DynamicCast(class_anchor);               \
-    }                                                           \
-}
-#define NPT_DEFINE_DYNAMIC_CAST_ANCHOR(_class) int _class::_class_##_class = 0;
-
-#else
-
-#define NPT_DYNAMIC_CAST(_class,_object) dynamic_cast<_class*>(_object)
-#define NPT_IMPLEMENT_DYNAMIC_CAST(_class)
-#define NPT_IMPLEMENT_DYNAMIC_CAST_D(_class,_superclass)
-#define NPT_IMPLEMENT_DYNAMIC_CAST_D2(_class,_superclass,_mixin)
-#define NPT_DEFINE_DYNAMIC_CAST_ANCHOR(_class)
-
-#endif
-
-#endif // _NPT_DYNAMIC_CAST_H_

gpac-2.2.1.tar.gz/extra_lib/include/platinum/NptDynamicLibraries.h Deleted

@@ -1,84 +0,0 @@
-/*****************************************************************
-|
-|   Neptune - Dynamic Libraries
-|
-| Copyright (c) 2002-2008, Axiomatic Systems, LLC.
-| All rights reserved.
-|
-| Redistribution and use in source and binary forms, with or without
-| modification, are permitted provided that the following conditions are met:
-|     * Redistributions of source code must retain the above copyright
-|       notice, this list of conditions and the following disclaimer.
-|     * Redistributions in binary form must reproduce the above copyright
-|       notice, this list of conditions and the following disclaimer in the
-|       documentation and/or other materials provided with the distribution.
-|     * Neither the name of Axiomatic Systems nor the
-|       names of its contributors may be used to endorse or promote products
-|       derived from this software without specific prior written permission.
-|
-| THIS SOFTWARE IS PROVIDED BY AXIOMATIC SYSTEMS ''AS IS'' AND ANY
-| EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-| WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-| DISCLAIMED. IN NO EVENT SHALL AXIOMATIC SYSTEMS BE LIABLE FOR ANY
-| DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-| (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-| LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-| ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-| (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-| SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-|
- ****************************************************************/
-
-#ifndef _NPT_DYNAMIC_LIBRARIES_H_
-#define _NPT_DYNAMIC_LIBRARIES_H_
-
-/*----------------------------------------------------------------------
-|   includes
-+---------------------------------------------------------------------*/
-#include "NptTypes.h"
-
-/*----------------------------------------------------------------------
-|   constants
-+---------------------------------------------------------------------*/
-#define NPT_DYANMIC_LIBRARY_LOAD_FLAG_NOW 1
-
-/*----------------------------------------------------------------------
-|   NPT_DynamicLibraryInterface
-+---------------------------------------------------------------------*/
-class NPT_DynamicLibraryInterface
-{
-public:
-    virtual ~NPT_DynamicLibraryInterface() {}
-    virtual NPT_Result FindSymbol(const char* name, void*& symbol) = 0;
-    virtual NPT_Result Unload() = 0;
-};
-
-/*----------------------------------------------------------------------
-|   NPT_DynamicLibrary
-+---------------------------------------------------------------------*/
-class NPT_DynamicLibrary : public NPT_DynamicLibraryInterface
-{
-public:
-    // class methods
-    static NPT_Result Load(const char* name, NPT_Flags flags, NPT_DynamicLibrary*& library);
-    
-    // destructor
-    ~NPT_DynamicLibrary() { delete m_Delegate; }
-    
-    // NPT_DynamicLibraryInterface methods
-    virtual NPT_Result FindSymbol(const char* name, void*& symbol) {
-        return m_Delegate->FindSymbol(name, symbol);
-    }
-    virtual NPT_Result Unload() {
-        return m_Delegate->Unload();
-    }
-    
-private:
-    // methods
-    NPT_DynamicLibrary(NPT_DynamicLibraryInterface* delegate) : m_Delegate(delegate) {}
-    
-    // members
-    NPT_DynamicLibraryInterface* m_Delegate;
-};
-
-#endif // _NPT_DYNAMIC_LIBRARIES_H_

gpac-2.2.1.tar.gz/extra_lib/include/platinum/NptFile.h Deleted

@@ -1,229 +0,0 @@
-/*****************************************************************
-|
-|   Neptune - Files
-|
-| Copyright (c) 2002-2008, Axiomatic Systems, LLC.
-| All rights reserved.
-|
-| Redistribution and use in source and binary forms, with or without
-| modification, are permitted provided that the following conditions are met:
-|     * Redistributions of source code must retain the above copyright
-|       notice, this list of conditions and the following disclaimer.
-|     * Redistributions in binary form must reproduce the above copyright
-|       notice, this list of conditions and the following disclaimer in the
-|       documentation and/or other materials provided with the distribution.
-|     * Neither the name of Axiomatic Systems nor the
-|       names of its contributors may be used to endorse or promote products
-|       derived from this software without specific prior written permission.
-|
-| THIS SOFTWARE IS PROVIDED BY AXIOMATIC SYSTEMS ''AS IS'' AND ANY
-| EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-| WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-| DISCLAIMED. IN NO EVENT SHALL AXIOMATIC SYSTEMS BE LIABLE FOR ANY
-| DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-| (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-| LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-| ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-| (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-| SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-|
- ****************************************************************/
-
-#ifndef _NPT_FILE_H_
-#define _NPT_FILE_H_
-
-/*----------------------------------------------------------------------
-|   includes
-+---------------------------------------------------------------------*/
-#include "NptTypes.h"
-#include "NptStreams.h"
-#include "NptTime.h"
-
-/*----------------------------------------------------------------------
-|   constants
-+---------------------------------------------------------------------*/
-const int NPT_ERROR_NO_SUCH_FILE          = NPT_ERROR_BASE_FILE - 0;
-const int NPT_ERROR_FILE_NOT_OPEN         = NPT_ERROR_BASE_FILE - 1;
-const int NPT_ERROR_FILE_BUSY             = NPT_ERROR_BASE_FILE - 2;
-const int NPT_ERROR_FILE_ALREADY_OPEN     = NPT_ERROR_BASE_FILE - 3;
-const int NPT_ERROR_FILE_NOT_READABLE     = NPT_ERROR_BASE_FILE - 4;
-const int NPT_ERROR_FILE_NOT_WRITABLE     = NPT_ERROR_BASE_FILE - 5;
-const int NPT_ERROR_FILE_NOT_DIRECTORY    = NPT_ERROR_BASE_FILE - 6;
-const int NPT_ERROR_FILE_ALREADY_EXISTS   = NPT_ERROR_BASE_FILE - 7;
-const int NPT_ERROR_FILE_NOT_ENOUGH_SPACE = NPT_ERROR_BASE_FILE - 8;
-const int NPT_ERROR_DIRECTORY_NOT_EMPTY   = NPT_ERROR_BASE_FILE - 9;
-
-/**
- * File open modes.
- * Use a combination of these flags to indicate how a file should be opened 
- * Note all combinations of flags are valid or meaningful:
- * If NPT_FILE_OPEN_MODE_WRITE is not set, then NPT_FILE_OPEN_MODE_CREATE, 
- * NPT_FILE_OPEN_MODE_TRUNCATE and NPT_FILE_OPEN_MODE_APPEND are ignored.
- * If NPT_FILE_OPEN_MODE_APPEND is set, then NPT_FILE_OPEN_MODE_CREATE is
- * automatically implied whether it is set or not.
- * NPT_FILE_OPEN_MODE_CREATE and NPT_FILE_OPEN_MODE_TRUNCATE imply each
- * other (if one is set, the other one is automatically implied)
- */
-const unsigned int NPT_FILE_OPEN_MODE_READ       = 0x01;
-const unsigned int NPT_FILE_OPEN_MODE_WRITE      = 0x02;
-const unsigned int NPT_FILE_OPEN_MODE_CREATE     = 0x04;
-const unsigned int NPT_FILE_OPEN_MODE_TRUNCATE   = 0x08;
-const unsigned int NPT_FILE_OPEN_MODE_UNBUFFERED = 0x10;
-const unsigned int NPT_FILE_OPEN_MODE_APPEND     = 0x20;
-
-const unsigned int NPT_FILE_ATTRIBUTE_READ_ONLY = 0x01;
-const unsigned int NPT_FILE_ATTRIBUTE_LINK      = 0x02;
-
-#define NPT_FILE_STANDARD_INPUT  "@STDIN"
-#define NPT_FILE_STANDARD_OUTPUT "@STDOUT"
-#define NPT_FILE_STANDARD_ERROR  "@STDERR"
-
-/*----------------------------------------------------------------------
-|   class references
-+---------------------------------------------------------------------*/
-class NPT_DataBuffer;
-
-/*----------------------------------------------------------------------
-|   NPT_FileInfo
-+---------------------------------------------------------------------*/
-struct NPT_FileInfo
-{
-    // types
-    typedef enum {
-        FILE_TYPE_NONE,
-        FILE_TYPE_REGULAR,
-        FILE_TYPE_DIRECTORY,
-        FILE_TYPE_SPECIAL,
-        FILE_TYPE_OTHER
-    } FileType;
-    
-    // constructor
-    NPT_FileInfo() : m_Type(FILE_TYPE_NONE), m_Size(0), m_AttributesMask(0), m_Attributes(0) {}
-    
-    // members
-    FileType      m_Type;
-    NPT_UInt64    m_Size;
-    NPT_Flags     m_AttributesMask;
-    NPT_Flags     m_Attributes;
-    NPT_TimeStamp m_CreationTime;
-    NPT_TimeStamp m_ModificationTime;
-};
-
-/*----------------------------------------------------------------------
-|   NPT_FilePath
-+---------------------------------------------------------------------*/
-class NPT_FilePath
-{
-public:
-    // class members
-    static const char* const Separator;
-
-    // class methods
-    static NPT_String BaseName(const char* path, bool with_extension = true);
-    static NPT_String DirName(const char* path);
-    static NPT_String FileExtension(const char* path);
-    static NPT_String Create(const char* directory, const char* base);
-    
-private:
-    NPT_FilePath() {} // this class can't have instances
-};
-
-/*----------------------------------------------------------------------
-|   NPT_FileInterface
-+---------------------------------------------------------------------*/
-class NPT_FileInterface
-{
-public:
-    // types
-    typedef unsigned int OpenMode;
-
-    // constructors and destructor
-    virtual ~NPT_FileInterface() {}
-
-    // methods
-    virtual NPT_Result Open(OpenMode mode) = 0;
-    virtual NPT_Result Close() = 0;
-    virtual NPT_Result GetInputStream(NPT_InputStreamReference& stream) = 0;
-    virtual NPT_Result GetOutputStream(NPT_OutputStreamReference& stream) = 0;
-};
-
-/*----------------------------------------------------------------------
-|   NPT_File
-+---------------------------------------------------------------------*/
-class NPT_File : public NPT_FileInterface
-{
-public:
-    // class methods
-    static NPT_Result GetRoots(NPT_List<NPT_String>& roots);
-    static NPT_Result GetSize(const char* path, NPT_LargeSize &size);
-    static NPT_Result GetInfo(const char* path, NPT_FileInfo* info = NULL);
-    static bool       Exists(const char* path) { return NPT_SUCCEEDED(GetInfo(path)); }
-    static NPT_Result Remove(const char* path, bool recurse = false);
-    static NPT_Result RemoveFile(const char* path);
-    static NPT_Result RemoveDir(const char* path);
-    static NPT_Result RemoveDir(const char* path, bool force_if_not_empty);
-    static NPT_Result Rename(const char* from_path, const char* to_path);
-    static NPT_Result ListDir(const char* path, NPT_List<NPT_String>& entries, NPT_Ordinal start = 0, NPT_Cardinal count = 0);
-    static NPT_Result CreateDir(const char* path);
-    static NPT_Result CreateDir(const char* path, bool create_intermediate_dirs);
-    static NPT_Result GetWorkingDir(NPT_String& path);
-    static NPT_Result Load(const char* path, NPT_DataBuffer& buffer, NPT_FileInterface::OpenMode mode = NPT_FILE_OPEN_MODE_READ);
-    static NPT_Result Load(const char* path, NPT_String& data, NPT_FileInterface::OpenMode mode = NPT_FILE_OPEN_MODE_READ);
-    static NPT_Result Save(const char* path, NPT_String& data);
-    static NPT_Result Save(const char* path, const NPT_DataBuffer& buffer);
-    
-    // constructors and destructor
-    NPT_File(const char* path);
-   ~NPT_File() { delete m_Delegate; }
-
-    // methods
-    NPT_Result          Load(NPT_DataBuffer& buffer);
-    NPT_Result          Save(const NPT_DataBuffer& buffer);
-    const NPT_String&   GetPath() { return m_Path; }
-    NPT_Result          GetSize(NPT_LargeSize &size);
-    NPT_Result          GetInfo(NPT_FileInfo& info);
-    NPT_Result          ListDir(NPT_List<NPT_String>& entries);
-    NPT_Result          Rename(const char* path);
-    
-    // NPT_FileInterface methods
-    NPT_Result Open(OpenMode mode) {
-        return m_Delegate->Open(mode);
-    }
-    NPT_Result Close() {
-        return m_Delegate->Close();
-    }
-    NPT_Result GetInputStream(NPT_InputStreamReference& stream) {
-        return m_Delegate->GetInputStream(stream);
-    }
-    NPT_Result GetOutputStream(NPT_OutputStreamReference& stream) {
-        return m_Delegate->GetOutputStream(stream);
-    }
-
-    // operators
-    NPT_File& operator=(const NPT_File& file);
-
-protected:
-    // members
-    NPT_FileInterface* m_Delegate;
-    NPT_String         m_Path;
-    bool               m_IsSpecial;
-};
-
-/*----------------------------------------------------------------------
-|   NPT_FileDateComparator
-+---------------------------------------------------------------------*/
-class NPT_FileDateComparator {
-public: 
-    NPT_FileDateComparator(const char* directory) : m_Directory(directory) {}
-    NPT_Int32 operator()(const NPT_String& file1, const NPT_String& file2) const {
-        NPT_FileInfo info1, info2;
-        if (NPT_FAILED(NPT_File::GetInfo(NPT_FilePath::Create(m_Directory, file1), &info1))) return -1;
-        if (NPT_FAILED(NPT_File::GetInfo(NPT_FilePath::Create(m_Directory, file2), &info2))) return -1;
-        return (info1.m_ModificationTime == info2.m_ModificationTime) ? 0 : (info1.m_ModificationTime < info2.m_ModificationTime ? -1 : 1);
-    }
-    
-private:
-    NPT_String m_Directory;
-};
-
-#endif // _NPT_FILE_H_

gpac-2.2.1.tar.gz/extra_lib/include/platinum/NptHash.h Deleted

@@ -1,83 +0,0 @@
-/*****************************************************************
-|
-|   Neptune - Hashing
-|
-| Copyright (c) 2002-2010, Axiomatic Systems, LLC.
-| All rights reserved.
-|
-| Redistribution and use in source and binary forms, with or without
-| modification, are permitted provided that the following conditions are met:
-|     * Redistributions of source code must retain the above copyright
-|       notice, this list of conditions and the following disclaimer.
-|     * Redistributions in binary form must reproduce the above copyright
-|       notice, this list of conditions and the following disclaimer in the
-|       documentation and/or other materials provided with the distribution.
-|     * Neither the name of Axiomatic Systems nor the
-|       names of its contributors may be used to endorse or promote products
-|       derived from this software without specific prior written permission.
-|
-| THIS SOFTWARE IS PROVIDED BY AXIOMATIC SYSTEMS ''AS IS'' AND ANY
-| EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-| WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-| DISCLAIMED. IN NO EVENT SHALL AXIOMATIC SYSTEMS BE LIABLE FOR ANY
-| DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-| (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-| LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-| ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-| (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-| SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-|
-****************************************************************/
-
-#ifndef _NPT_HASH_H_
-#define _NPT_HASH_H_
-
-/*----------------------------------------------------------------------
-|   includes
-+---------------------------------------------------------------------*/
-#include "NptTypes.h"
-#include "NptResults.h"
-
-/*----------------------------------------------------------------------
-|    Fowler/Noll/Vo FNV-1a hash functions
-+---------------------------------------------------------------------*/
-const NPT_UInt32 NPT_FNV1A_32_INIT = ((NPT_UInt32)0x811c9dc5);
-NPT_UInt32 NPT_Fnv1aHash32(const NPT_UInt8* data, NPT_Size data_size, NPT_UInt32 hash_init=NPT_FNV1A_32_INIT);
-NPT_UInt32 NPT_Fnv1aHashStr32(const char* data, NPT_UInt32 hash_init=NPT_FNV1A_32_INIT);
-const NPT_UInt64 NPT_FNV1A_64_INIT = ((NPT_UInt64)0xcbf29ce484222325ULL);
-NPT_UInt64 NPT_Fnv1aHash64(const NPT_UInt8* data, NPT_Size data_size, NPT_UInt64 hash_init=NPT_FNV1A_64_INIT);
-NPT_UInt64 NPT_Fnv1aHashStr64(const char* data, NPT_UInt64 hash_init=NPT_FNV1A_64_INIT);
-
-/*----------------------------------------------------------------------
-|   NPT_Hash
-+---------------------------------------------------------------------*/
-template <typename K>
-struct NPT_Hash
-{
-};
-
-template <>
-struct NPT_Hash<const char*>
-{
-    NPT_UInt32 operator()(const char* s) const { return NPT_Fnv1aHashStr32(s); }
-};
-
-template <>
-struct NPT_Hash<char*>
-{
-    NPT_UInt32 operator()(char* s) const { return NPT_Fnv1aHashStr32(s); }
-};
-
-template <>
-struct NPT_Hash<int>
-{
-    NPT_UInt32 operator()(int i) const { return NPT_Fnv1aHash32(reinterpret_cast<const NPT_UInt8*>(&i), sizeof(int)); }
-};
-
-template <>
-struct NPT_Hash<unsigned int>
-{
-    NPT_UInt32 operator()(unsigned int i) const { return NPT_Fnv1aHash32(reinterpret_cast<const NPT_UInt8*>(&i), sizeof(int)); }
-};
-
-#endif // _NPT_HASH_H_

gpac-2.2.1.tar.gz/extra_lib/include/platinum/NptHttp.h Deleted

@@ -1,861 +0,0 @@
-/*****************************************************************
-|
-|   Neptune - HTTP Protocol
-|
-| Copyright (c) 2002-2008, Axiomatic Systems, LLC.
-| All rights reserved.
-|
-| Redistribution and use in source and binary forms, with or without
-| modification, are permitted provided that the following conditions are met:
-|     * Redistributions of source code must retain the above copyright
-|       notice, this list of conditions and the following disclaimer.
-|     * Redistributions in binary form must reproduce the above copyright
-|       notice, this list of conditions and the following disclaimer in the
-|       documentation and/or other materials provided with the distribution.
-|     * Neither the name of Axiomatic Systems nor the
-|       names of its contributors may be used to endorse or promote products
-|       derived from this software without specific prior written permission.
-|
-| THIS SOFTWARE IS PROVIDED BY AXIOMATIC SYSTEMS ''AS IS'' AND ANY
-| EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-| WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-| DISCLAIMED. IN NO EVENT SHALL AXIOMATIC SYSTEMS BE LIABLE FOR ANY
-| DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-| (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-| LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-| ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-| (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-| SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-|
- ****************************************************************/
-
-#ifndef _NPT_HTTP_H_
-#define _NPT_HTTP_H_
-
-/*----------------------------------------------------------------------
-|   includes
-+---------------------------------------------------------------------*/
-#include "NptUri.h"
-#include "NptTypes.h"
-#include "NptList.h"
-#include "NptBufferedStreams.h"
-#include "NptSockets.h"
-#include "NptMap.h"
-#include "NptDynamicCast.h"
-#include "NptVersion.h"
-#include "NptTime.h"
-#include "NptThreads.h"
-#include "NptAutomaticCleaner.h"
-
-/*----------------------------------------------------------------------
-|   constants
-+---------------------------------------------------------------------*/
-const unsigned int NPT_HTTP_DEFAULT_PORT  = 80;
-const unsigned int NPT_HTTPS_DEFAULT_PORT = 443;
-const unsigned int NPT_HTTP_INVALID_PORT  = 0;
-
-const NPT_Timeout  NPT_HTTP_CLIENT_DEFAULT_CONNECTION_TIMEOUT    = 30000;
-const NPT_Timeout  NPT_HTTP_CLIENT_DEFAULT_IO_TIMEOUT            = 30000;
-const NPT_Timeout  NPT_HTTP_CLIENT_DEFAULT_NAME_RESOLVER_TIMEOUT = 60000;
-const unsigned int NPT_HTTP_CLIENT_DEFAULT_MAX_REDIRECTS         = 20;
-
-const NPT_Timeout NPT_HTTP_SERVER_DEFAULT_CONNECTION_TIMEOUT    = NPT_TIMEOUT_INFINITE;
-const NPT_Timeout NPT_HTTP_SERVER_DEFAULT_IO_TIMEOUT            = 60000;
-
-const unsigned int NPT_HTTP_CONNECTION_MANAGER_MAX_CONNECTION_POOL_SIZE = 5;
-const unsigned int NPT_HTTP_CONNECTION_MANAGER_MAX_CONNECTION_AGE       = 50; // seconds
-const unsigned int NPT_HTTP_MAX_RECONNECTS                              = 10;
-const unsigned int NPT_HTTP_MAX_100_RESPONSES                           = 10;
-
-const int NPT_HTTP_PROTOCOL_MAX_LINE_LENGTH  = 8192;
-const int NPT_HTTP_PROTOCOL_MAX_HEADER_COUNT = 100;
-
-#define NPT_HTTP_PROTOCOL_1_0   "HTTP/1.0"
-#define NPT_HTTP_PROTOCOL_1_1   "HTTP/1.1"
-#define NPT_HTTP_METHOD_GET     "GET"
-#define NPT_HTTP_METHOD_HEAD    "HEAD"
-#define NPT_HTTP_METHOD_POST    "POST"
-#define NPT_HTTP_METHOD_PUT     "PUT"
-#define NPT_HTTP_METHOD_OPTIONS "OPTIONS"
-#define NPT_HTTP_METHOD_DELETE  "DELETE"
-#define NPT_HTTP_METHOD_TRACE   "TRACE"
-
-#define NPT_HTTP_HEADER_HOST                "Host"
-#define NPT_HTTP_HEADER_CONNECTION          "Connection"
-#define NPT_HTTP_HEADER_USER_AGENT          "User-Agent"
-#define NPT_HTTP_HEADER_SERVER              "Server"
-#define NPT_HTTP_HEADER_CONTENT_LENGTH      "Content-Length"
-#define NPT_HTTP_HEADER_CONTENT_TYPE        "Content-Type"
-#define NPT_HTTP_HEADER_CONTENT_ENCODING    "Content-Encoding"
-#define NPT_HTTP_HEADER_TRANSFER_ENCODING   "Transfer-Encoding"
-#define NPT_HTTP_HEADER_LOCATION            "Location"
-#define NPT_HTTP_HEADER_RANGE               "Range"
-#define NPT_HTTP_HEADER_CONTENT_RANGE       "Content-Range"
-#define NPT_HTTP_HEADER_COOKIE              "Cookie"
-#define NPT_HTTP_HEADER_ACCEPT_RANGES       "Accept-Ranges"
-#define NPT_HTTP_HEADER_CONTENT_RANGE       "Content-Range"
-#define NPT_HTTP_HEADER_AUTHORIZATION       "Authorization"
-
-#define NPT_HTTP_TRANSFER_ENCODING_CHUNKED  "chunked"
-
-
-const int NPT_ERROR_HTTP_INVALID_RESPONSE_LINE = NPT_ERROR_BASE_HTTP - 0;
-const int NPT_ERROR_HTTP_INVALID_REQUEST_LINE  = NPT_ERROR_BASE_HTTP - 1;
-const int NPT_ERROR_HTTP_NO_PROXY              = NPT_ERROR_BASE_HTTP - 2;
-const int NPT_ERROR_HTTP_INVALID_REQUEST       = NPT_ERROR_BASE_HTTP - 3;
-const int NPT_ERROR_HTTP_METHOD_NOT_SUPPORTED  = NPT_ERROR_BASE_HTTP - 4;
-const int NPT_ERROR_HTTP_TOO_MANY_REDIRECTS    = NPT_ERROR_BASE_HTTP - 5;
-const int NPT_ERROR_HTTP_TOO_MANY_RECONNECTS   = NPT_ERROR_BASE_HTTP - 6;
-const int NPT_ERROR_HTTP_CANNOT_RESEND_BODY    = NPT_ERROR_BASE_HTTP - 7;
-
-#define NPT_HTTP_LINE_TERMINATOR "\r\n"
-
-#if !defined(NPT_CONFIG_HTTP_DEFAULT_USER_AGENT)
-#define NPT_CONFIG_HTTP_DEFAULT_USER_AGENT "Neptune/" NPT_NEPTUNE_VERSION_STRING
-#endif
-
-/*----------------------------------------------------------------------
-|   types
-+---------------------------------------------------------------------*/
-typedef unsigned int NPT_HttpStatusCode;
-typedef NPT_UrlQuery NPT_HttpUrlQuery; // for backward compatibility
-
-/*----------------------------------------------------------------------
-|   NPT_HttpUrl
-+---------------------------------------------------------------------*/
-class NPT_HttpUrl : public NPT_Url {
-public:
-    // constructors
-    NPT_HttpUrl() {}
-    NPT_HttpUrl(const char* host, 
-                NPT_UInt16  port, 
-                const char* path,
-                const char* query = NULL,
-                const char* fragment = NULL);
-    NPT_HttpUrl(const char* url, bool ignore_scheme = false);
-
-    // methods
-    virtual NPT_String ToString(bool with_fragment = true) const;
-};
-
-/*----------------------------------------------------------------------
-|   NPT_HttpProtocol
-+---------------------------------------------------------------------*/
-class NPT_HttpProtocol
-{
-public:
-    // class methods
-    const char* GetStatusCodeString(NPT_HttpStatusCode status_code);
-};
-
-/*----------------------------------------------------------------------
-|   NPT_HttpHeader
-+---------------------------------------------------------------------*/
-class NPT_HttpHeader {
-public:
-    // constructors and destructor
-    NPT_HttpHeader(const char* name, const char* value);
-    ~NPT_HttpHeader();
-
-    // methods
-    NPT_Result        Emit(NPT_OutputStream& stream) const;
-    const NPT_String& GetName()  const { return m_Name;  }
-    const NPT_String& GetValue() const { return m_Value; }
-    NPT_Result        SetName(const char* name);
-    NPT_Result        SetValue(const char* value);
-
-private:
-    // members
-    NPT_String m_Name;
-    NPT_String m_Value;
-};
-
-/*----------------------------------------------------------------------
-|   NPT_HttpHeaders
-+---------------------------------------------------------------------*/
-class NPT_HttpHeaders {
-public:
-    // constructors and destructor
-     NPT_HttpHeaders();
-    ~NPT_HttpHeaders();
-
-    // methods
-    NPT_Result Parse(NPT_BufferedInputStream& stream);
-    NPT_Result Emit(NPT_OutputStream& stream) const;
-    const NPT_List<NPT_HttpHeader*>& GetHeaders() const { return m_Headers; }
-    NPT_HttpHeader*   GetHeader(const char* name) const;
-    const NPT_String* GetHeaderValue(const char* name) const;
-    NPT_Result        SetHeader(const char* name, const char* value, bool replace=true);
-    NPT_Result        AddHeader(const char* name, const char* value);
-    NPT_Result        RemoveHeader(const char* name);
-
-private:
-    // members
-    NPT_List<NPT_HttpHeader*> m_Headers;
-};
-
-/*----------------------------------------------------------------------
-|   NPT_HttpEntity
-+---------------------------------------------------------------------*/
-class NPT_HttpEntity {
-public:
-    // constructors and destructor
-             NPT_HttpEntity();
-             NPT_HttpEntity(const NPT_HttpHeaders& headers);
-    virtual ~NPT_HttpEntity();
-
-    // methods
-    NPT_Result SetInputStream(const NPT_InputStreamReference& stream,
-                              bool update_content_length = false);
-    NPT_Result SetInputStream(const void* data, NPT_Size size);
-    NPT_Result SetInputStream(const NPT_String& string);
-    NPT_Result SetInputStream(const char* string);
-    NPT_Result GetInputStream(NPT_InputStreamReference& stream);
-    NPT_Result Load(NPT_DataBuffer& buffer);
-    NPT_Result SetHeaders(const NPT_HttpHeaders& headers);
-
-    // field access
-    NPT_Result        SetContentLength(NPT_LargeSize length);
-    NPT_Result        SetContentType(const char* type);
-    NPT_Result        SetContentEncoding(const char* encoding);
-    NPT_Result        SetTransferEncoding(const char* encoding);
-    NPT_LargeSize     GetContentLength()     { return m_ContentLength;   }
-    const NPT_String& GetContentType()       { return m_ContentType;     }
-    const NPT_String& GetContentEncoding()   { return m_ContentEncoding; }
-    const NPT_String& GetTransferEncoding()  { return m_TransferEncoding;}
-    bool              ContentLengthIsKnown() { return m_ContentLengthIsKnown; }
-
-private:
-    // members
-    NPT_InputStreamReference m_InputStream;
-    NPT_LargeSize            m_ContentLength;
-    NPT_String               m_ContentType;
-    NPT_String               m_ContentEncoding;
-    NPT_String               m_TransferEncoding;
-    bool                     m_ContentLengthIsKnown;
-};
-
-/*----------------------------------------------------------------------
-|   NPT_HttpMessage
-+---------------------------------------------------------------------*/
-class NPT_HttpMessage {
-public:
-    // constructors and destructor
-    virtual ~NPT_HttpMessage();
-
-    // methods
-    const NPT_String& GetProtocol() const { 
-        return m_Protocol; 
-    }
-    NPT_Result SetProtocol(const char* protocol) {
-        m_Protocol = protocol;
-        return NPT_SUCCESS;
-    }
-    NPT_HttpHeaders& GetHeaders() { 
-        return m_Headers;  
-    }
-    const NPT_HttpHeaders& GetHeaders() const { 
-        return m_Headers;  
-    }
-    NPT_Result SetEntity(NPT_HttpEntity* entity);
-    NPT_HttpEntity* GetEntity() {
-        return m_Entity;
-    }
-    NPT_HttpEntity* GetEntity() const {
-        return m_Entity;
-    }
-    virtual NPT_Result ParseHeaders(NPT_BufferedInputStream& stream);
-
-protected:
-    // constructors
-    NPT_HttpMessage(const char* protocol);
-
-    // members
-    NPT_String      m_Protocol;
-    NPT_HttpHeaders m_Headers;
-    NPT_HttpEntity* m_Entity;
-};
-
-/*----------------------------------------------------------------------
-|   NPT_HttpRequest
-+---------------------------------------------------------------------*/
-class NPT_HttpRequest : public NPT_HttpMessage {
-public:
-    // class methods
-    static NPT_Result Parse(NPT_BufferedInputStream& stream, 
-                            const NPT_SocketAddress* endpoint,
-                            NPT_HttpRequest*&        request);
-
-    // constructors and destructor
-    NPT_HttpRequest(const NPT_HttpUrl& url,
-                    const char*        method,
-                    const char*        protocol = NPT_HTTP_PROTOCOL_1_0);
-    NPT_HttpRequest(const char*        url,
-                    const char*        method,
-                    const char*        protocol = NPT_HTTP_PROTOCOL_1_0);
-    virtual ~NPT_HttpRequest();
-
-    // methods
-    const NPT_HttpUrl& GetUrl() const { return m_Url; }
-    NPT_HttpUrl&       GetUrl()       { return m_Url; }
-    NPT_Result         SetUrl(const char* url);
-    NPT_Result         SetUrl(const NPT_HttpUrl& url);
-    const NPT_String&  GetMethod() const { return m_Method; }
-    virtual NPT_Result Emit(NPT_OutputStream& stream, bool use_proxy=false) const;
-    
-protected:
-    // members
-    NPT_HttpUrl m_Url;
-    NPT_String  m_Method;
-};
-
-/*----------------------------------------------------------------------
-|   NPT_HttpResponse
-+---------------------------------------------------------------------*/
-class NPT_HttpResponse : public NPT_HttpMessage {
-public:
-    // class methods
-    static NPT_Result Parse(NPT_BufferedInputStream& stream, 
-                            NPT_HttpResponse*&       response);
-
-    // constructors and destructor
-             NPT_HttpResponse(NPT_HttpStatusCode status_code,
-                              const char*        reason_phrase,
-                              const char*        protocol = NPT_HTTP_PROTOCOL_1_0);
-    virtual ~NPT_HttpResponse();
-
-    // methods
-    NPT_Result         SetStatus(NPT_HttpStatusCode status_code,
-                                 const char*        reason_phrase,
-                                 const char*        protocol = NULL);
-    NPT_Result         SetProtocol(const char* protocol);
-    NPT_HttpStatusCode GetStatusCode() const { return m_StatusCode;   }
-    const NPT_String&  GetReasonPhrase() const { return m_ReasonPhrase; }
-    virtual NPT_Result Emit(NPT_OutputStream& stream) const;
-
-protected:
-    // members
-    NPT_HttpStatusCode m_StatusCode;
-    NPT_String         m_ReasonPhrase;
-};
-
-/*----------------------------------------------------------------------
-|   NPT_HttpProxyAddress
-+---------------------------------------------------------------------*/
-class NPT_HttpProxyAddress
-{
-public:
-    NPT_HttpProxyAddress() : m_Port(NPT_HTTP_INVALID_PORT) {}
-    NPT_HttpProxyAddress(const char* hostname, NPT_UInt16 port) :
-        m_HostName(hostname), m_Port(port) {}
-
-    const NPT_String& GetHostName() const { return m_HostName; } 
-    void              SetHostName(const char* hostname) { m_HostName = hostname; }
-    NPT_UInt16        GetPort() const { return m_Port; }
-    void              SetPort(NPT_UInt16 port) { m_Port = port; }
-
-private:
-    NPT_String m_HostName;
-    NPT_UInt16 m_Port;
-};
-
-/*----------------------------------------------------------------------
-|   NPT_HttpProxySelector
-+---------------------------------------------------------------------*/
-class NPT_HttpProxySelector
-{
-public:
-    // class methods
-    static NPT_HttpProxySelector* GetDefault();
-    static NPT_HttpProxySelector* GetSystemSelector();
-    
-    // methods
-    virtual ~NPT_HttpProxySelector() {};
-    virtual NPT_Result GetProxyForUrl(const NPT_HttpUrl& url, NPT_HttpProxyAddress& proxy) = 0;
-    
-private:
-    // class members
-    static NPT_HttpProxySelector* m_SystemDefault;
-};
-
-class NPT_HttpRequestContext;
-
-/*----------------------------------------------------------------------
-|   NPT_HttpClient
-+---------------------------------------------------------------------*/
-class NPT_HttpClient {
-public:
-    // types
-    struct Config {
-        Config() : m_ConnectionTimeout(  NPT_HTTP_CLIENT_DEFAULT_CONNECTION_TIMEOUT),
-                   m_IoTimeout(          NPT_HTTP_CLIENT_DEFAULT_CONNECTION_TIMEOUT),
-                   m_NameResolverTimeout(NPT_HTTP_CLIENT_DEFAULT_NAME_RESOLVER_TIMEOUT),
-                   m_MaxRedirects(       NPT_HTTP_CLIENT_DEFAULT_MAX_REDIRECTS),
-                   m_UserAgent(          NPT_CONFIG_HTTP_DEFAULT_USER_AGENT) {}
-        NPT_Timeout  m_ConnectionTimeout;
-        NPT_Timeout  m_IoTimeout;
-        NPT_Timeout  m_NameResolverTimeout;
-        NPT_Cardinal m_MaxRedirects;
-        NPT_String   m_UserAgent;
-    };
-    
-    class Connection {
-    public:
-        virtual ~Connection() {}
-        virtual NPT_InputStreamReference&  GetInputStream()  = 0;
-        virtual NPT_OutputStreamReference& GetOutputStream() = 0;
-        virtual NPT_Result                 GetInfo(NPT_SocketInfo& info) = 0;
-        virtual bool                       SupportsPersistence() { return false;                    }
-        virtual bool                       IsRecycled()          { return false;                    }
-        virtual NPT_Result                 Recycle()             { delete this; return NPT_SUCCESS; }
-        virtual NPT_Result                 Abort()               { return NPT_ERROR_NOT_IMPLEMENTED; }
-    };
-    
-    class Connector {
-    public:
-        virtual ~Connector() {}
-
-        virtual NPT_Result Connect(const NPT_HttpUrl&          url,
-                                   NPT_HttpClient&             client,
-                                   const NPT_HttpProxyAddress* proxy,
-                                   bool                        reuse, // whether we can reuse a connection or not
-                                   Connection*&                connection) = 0;
-        
-    protected:
-        NPT_Result TrackConnection(NPT_HttpClient& client,
-                                   Connection*     connection) { return client.TrackConnection(connection); }
-        Connector() {} // don't instantiate directly
-    };
-
-    // class methods
-    static NPT_Result WriteRequest(NPT_OutputStream& output_stream, 
-                                   NPT_HttpRequest&  request,
-                                   bool              should_persist,
-                                   bool			     use_proxy = false);
-    static NPT_Result ReadResponse(NPT_InputStreamReference&  input_stream,
-                                   bool                       should_persist,
-                                   bool                       expect_entity,
-                                   NPT_HttpResponse*&         response,
-                                   NPT_Reference<Connection>* cref = NULL);
-
-    /**
-     * @param connector Pointer to a connector instance, or NULL to use 
-     * the default (TCP) connector.
-     * @param transfer_ownership Boolean flag. If true, the NPT_HttpClient object
-     * becomes the owner of the passed Connector and will delete it when it is 
-     * itself deleted. If false, the caller keeps the ownership of the connector. 
-     * This flag is ignored if the connector parameter is NULL.
-     */
-    NPT_HttpClient(Connector* connector = NULL, bool transfer_ownership = true);
-
-    virtual ~NPT_HttpClient();
-
-    // methods
-    NPT_Result SendRequest(NPT_HttpRequest&        request,
-                           NPT_HttpResponse*&      response,
-                           NPT_HttpRequestContext* context = NULL);
-    NPT_Result Abort();
-    const Config& GetConfig() const { return m_Config; }
-    NPT_Result SetConfig(const Config& config);
-    NPT_Result SetProxy(const char* http_proxy_hostname, 
-                        NPT_UInt16  http_proxy_port,
-                        const char* https_proxy_hostname = NULL,
-                        NPT_UInt16  https_proxy_port = 0);
-    NPT_Result SetProxySelector(NPT_HttpProxySelector* selector);
-    NPT_Result SetConnector(Connector* connector);
-    NPT_Result SetTimeouts(NPT_Timeout connection_timeout,
-                           NPT_Timeout io_timeout,
-                           NPT_Timeout name_resolver_timeout);
-    NPT_Result SetUserAgent(const char* user_agent);
-    NPT_Result SetOptions(NPT_Flags options, bool on);
-    
-protected:
-    // methods
-    NPT_Result TrackConnection(Connection* connection);
-    NPT_Result SendRequestOnce(NPT_HttpRequest&        request,
-                               NPT_HttpResponse*&      response,
-                               NPT_HttpRequestContext* context = NULL);
-
-    // members
-    Config                 m_Config;
-    NPT_HttpProxySelector* m_ProxySelector;
-    bool                   m_ProxySelectorIsOwned;
-    Connector*             m_Connector;
-    bool                   m_ConnectorIsOwned;
-    NPT_Mutex              m_AbortLock;
-    bool                   m_Aborted;
-};
-
-/*----------------------------------------------------------------------
-|   NPT_HttpConnectionManager
-+---------------------------------------------------------------------*/
-class NPT_HttpConnectionManager : public NPT_Thread,
-                                  public NPT_AutomaticCleaner::Singleton
-{
-public:
-    // singleton management
-    static NPT_HttpConnectionManager* GetInstance();
-    
-    class Connection : public NPT_HttpClient::Connection 
-    {
-    public:
-        Connection(NPT_HttpConnectionManager& manager,
-                   NPT_SocketReference&       socket,
-                   NPT_InputStreamReference   input_stream,
-                   NPT_OutputStreamReference  output_stream);
-        virtual ~Connection();
-                   
-        // NPT_HttpClient::Connection methods
-        virtual NPT_InputStreamReference&  GetInputStream()      { return m_InputStream;           }
-        virtual NPT_OutputStreamReference& GetOutputStream()     { return m_OutputStream;          }
-        virtual NPT_Result                 GetInfo(NPT_SocketInfo& info) { return m_Socket->GetInfo(info); }
-        virtual bool                       SupportsPersistence() { return true;                    }
-        virtual bool                       IsRecycled()          { return m_IsRecycled;            }
-        virtual NPT_Result                 Recycle();
-        virtual NPT_Result                 Abort()               { return m_Socket->Cancel(); }
-
-        // members
-        NPT_HttpConnectionManager& m_Manager;
-        bool                       m_IsRecycled;
-        NPT_TimeStamp              m_TimeStamp;
-        NPT_SocketReference        m_Socket;
-        NPT_InputStreamReference   m_InputStream;
-        NPT_OutputStreamReference  m_OutputStream;
-    };
-    
-    // destructor
-    ~NPT_HttpConnectionManager();
-    
-    // methods
-    Connection* FindConnection(NPT_SocketAddress& address);
-    NPT_Result  Recycle(Connection* connection);
-    NPT_Result  Track(NPT_HttpClient* client, NPT_HttpClient::Connection* connection);
-    NPT_Result  AbortConnections(NPT_HttpClient* client);
-    
-    // class methods
-    static NPT_Result  Untrack(NPT_HttpClient::Connection* connection);
-    
-private:
-    typedef NPT_List<NPT_HttpClient::Connection*> ConnectionList;
-    
-    // class members
-    static NPT_HttpConnectionManager* Instance;
-    
-    // constructor
-    NPT_HttpConnectionManager();
-    
-    // NPT_Thread methods
-    void Run();
-    
-    // methods
-    NPT_Result      UntrackConnection(NPT_HttpClient::Connection* connection);
-    NPT_Result      Cleanup();
-
-    // members
-    NPT_Mutex             m_Lock;
-    NPT_Cardinal          m_MaxConnections;
-    NPT_Cardinal          m_MaxConnectionAge;
-    NPT_SharedVariable    m_Aborted;
-    NPT_List<Connection*> m_Connections;
-    NPT_Map<NPT_HttpClient*, ConnectionList> m_ClientConnections;
-};
-
-/*----------------------------------------------------------------------
-|   NPT_HttpRequestContext
-+---------------------------------------------------------------------*/
-class NPT_HttpRequestContext
-{
-public:
-    // constructor
-    NPT_HttpRequestContext() {}
-    NPT_HttpRequestContext(const NPT_SocketAddress* local_address,
-                           const NPT_SocketAddress* remote_address);
-                  
-    // methods
-    const NPT_SocketAddress& GetLocalAddress()  const { return m_LocalAddress;  }
-    const NPT_SocketAddress& GetRemoteAddress() const { return m_RemoteAddress; }
-    void SetLocalAddress(const NPT_SocketAddress& address) {
-        m_LocalAddress = address;
-    }
-    void SetRemoteAddress(const NPT_SocketAddress& address) {
-        m_RemoteAddress = address;
-    }
-    
-private:
-    // members
-    NPT_SocketAddress m_LocalAddress;
-    NPT_SocketAddress m_RemoteAddress;
-};
-
-/*----------------------------------------------------------------------
-|   NPT_HttpRequestHandler
-+---------------------------------------------------------------------*/
-class NPT_HttpRequestHandler 
-{
-public:
-    NPT_IMPLEMENT_DYNAMIC_CAST(NPT_HttpRequestHandler)
-
-    // destructor
-    virtual ~NPT_HttpRequestHandler() {}
-
-    // methods
-    virtual NPT_Result SetupResponse(NPT_HttpRequest&              request,
-                                     const NPT_HttpRequestContext& context,
-                                     NPT_HttpResponse&             response) = 0;
-                                     
-    /**
-     * Override this method if you want to write the body yourself.
-     * The default implementation will simply write out the entity's
-     * input stream.
-     */
-    virtual NPT_Result SendResponseBody(const NPT_HttpRequestContext& context,
-                                        NPT_HttpResponse&             response,
-                                        NPT_OutputStream&             output);
-};
-
-/*----------------------------------------------------------------------
-|   NPT_HttpStaticRequestHandler
-+---------------------------------------------------------------------*/
-class NPT_HttpStaticRequestHandler : public NPT_HttpRequestHandler
-{
-public:
-    // constructors
-    NPT_HttpStaticRequestHandler(const char* document, 
-                                 const char* mime_type = "text/html",
-                                 bool        copy = true);
-    NPT_HttpStaticRequestHandler(const void* data,
-                                 NPT_Size    size,
-                                 const char* mime_type = "text/html",
-                                 bool        copy = true);
-
-    // NPT_HttpRequestHandler methods
-    virtual NPT_Result SetupResponse(NPT_HttpRequest&              request, 
-                                     const NPT_HttpRequestContext& context,
-                                     NPT_HttpResponse&             response);
-
-private:
-    NPT_String     m_MimeType;
-    NPT_DataBuffer m_Buffer;
-};
-
-/*----------------------------------------------------------------------
-|   NPT_HttpFileRequestHandler_FileTypeMap
-+---------------------------------------------------------------------*/
-typedef struct NPT_HttpFileRequestHandler_DefaultFileTypeMapEntry {
-    const char* extension;
-    const char* mime_type;
-} NPT_HttpFileRequestHandler_FileTypeMapEntry;
-
-/*----------------------------------------------------------------------
-|   NPT_HttpFileRequestHandler
-+---------------------------------------------------------------------*/
-class NPT_HttpFileRequestHandler : public NPT_HttpRequestHandler
-{
-public:
-    // constructors
-    NPT_HttpFileRequestHandler(const char* url_root,
-                               const char* file_root,
-                               bool        auto_dir = false,
-                               const char* auto_index = NULL);
-
-    // NPT_HttpRequestHandler methods
-    virtual NPT_Result SetupResponse(NPT_HttpRequest&              request, 
-                                     const NPT_HttpRequestContext& context,
-                                     NPT_HttpResponse&             response);
-    
-    // class methods
-    static const char* GetDefaultContentType(const char* extension);
-    
-    // accessors
-    NPT_Map<NPT_String,NPT_String>& GetFileTypeMap() { return m_FileTypeMap; }
-    void SetDefaultMimeType(const char* mime_type) {
-        m_DefaultMimeType = mime_type;
-    }
-    void SetUseDefaultFileTypeMap(bool use_default) {
-        m_UseDefaultFileTypeMap = use_default;
-    }
-    
-    static NPT_Result SetupResponseBody(NPT_HttpResponse&         response,
-                                        NPT_InputStreamReference& stream,
-                                        const NPT_String*         range_spec = NULL);
-
-protected:
-    // methods
-    const char* GetContentType(const NPT_String& filename);
-
-private:
-    NPT_String                      m_UrlRoot;
-    NPT_String                      m_FileRoot;
-    NPT_Map<NPT_String, NPT_String> m_FileTypeMap;
-    NPT_String                      m_DefaultMimeType;
-    bool                            m_UseDefaultFileTypeMap;
-    bool                            m_AutoDir;
-    NPT_String                      m_AutoIndex;
-};
-
-/*----------------------------------------------------------------------
-|   NPT_HttpServer
-+---------------------------------------------------------------------*/
-class NPT_HttpServer {
-public:
-    // types
-    struct Config {
-        NPT_Timeout   m_ConnectionTimeout;
-        NPT_Timeout   m_IoTimeout;
-        NPT_IpAddress m_ListenAddress;
-        NPT_UInt16    m_ListenPort;
-        bool          m_ReuseAddress;
-    };
-
-    // constructors and destructor
-    NPT_HttpServer(NPT_UInt16 listen_port = NPT_HTTP_DEFAULT_PORT,
-                   bool       reuse_address = true);
-    NPT_HttpServer(NPT_IpAddress listen_address, 
-                   NPT_UInt16    listen_port = NPT_HTTP_DEFAULT_PORT,
-                   bool          reuse_address = true);
-    virtual ~NPT_HttpServer();
-
-    // methods
-    NPT_Result SetConfig(const Config& config);
-    const Config& GetConfig() const { return m_Config; }
-    NPT_Result SetListenPort(NPT_UInt16 port, bool reuse_address = true);
-    NPT_Result SetTimeouts(NPT_Timeout connection_timeout, NPT_Timeout io_timeout);
-    NPT_Result SetServerHeader(const char* server_header);
-    NPT_Result Abort();
-    NPT_Result WaitForNewClient(NPT_InputStreamReference&  input,
-                                NPT_OutputStreamReference& output,
-                                NPT_HttpRequestContext*    context,
-                                NPT_Flags                  socket_flags = 0);
-    NPT_Result Loop(bool cancellable_sockets=true);
-    NPT_UInt16 GetPort() { return m_BoundPort; }
-    void Terminate();
-    
-    /**
-     * Add a request handler. By default the ownership of the handler is NOT transfered to this object,
-     * so the caller is responsible for the lifetime management of the handler object.
-     */
-    virtual NPT_Result AddRequestHandler(NPT_HttpRequestHandler* handler, 
-                                         const char*             path, 
-                                         bool                    include_children = false,
-                                         bool                    transfer_ownership = false);
-    virtual NPT_HttpRequestHandler* FindRequestHandler(NPT_HttpRequest& request);
-    virtual NPT_List<NPT_HttpRequestHandler*> FindRequestHandlers(NPT_HttpRequest& request);
-
-    /**
-     * Parse the request from a new client, form a response, and send it back. 
-     */
-    virtual NPT_Result RespondToClient(NPT_InputStreamReference&     input,
-                                       NPT_OutputStreamReference&    output,
-                                       const NPT_HttpRequestContext& context);
-
-protected:
-    // types
-    struct HandlerConfig {
-        HandlerConfig(NPT_HttpRequestHandler* handler,
-                      const char*             path,
-                      bool                    include_children,
-                      bool                    transfer_ownership = false);
-        ~HandlerConfig();
-
-        // methods
-        bool WillHandle(NPT_HttpRequest& request);
-
-        // members
-        NPT_HttpRequestHandler* m_Handler;
-        NPT_String              m_Path;
-        bool                    m_IncludeChildren;
-        bool                    m_HandlerIsOwned;
-    };
-
-    // methods
-    NPT_Result Bind();
-
-    // members
-    NPT_TcpServerSocket      m_Socket;
-    NPT_UInt16               m_BoundPort;
-    Config                   m_Config;
-    NPT_List<HandlerConfig*> m_RequestHandlers;
-    NPT_String               m_ServerHeader;
-    bool                     m_Run;
-};
-
-/*----------------------------------------------------------------------
-|   NPT_HttpResponder
-+---------------------------------------------------------------------*/
-class NPT_HttpResponder {
-public:
-    // types
-    struct Config {
-        NPT_Timeout m_IoTimeout;
-    };
-
-    // constructors and destructor
-    NPT_HttpResponder(NPT_InputStreamReference&  input,
-                      NPT_OutputStreamReference& output);
-    virtual ~NPT_HttpResponder();
-
-    // methods
-    NPT_Result SetConfig(const Config& config);
-    NPT_Result SetTimeout(NPT_Timeout io_timeout);
-    NPT_Result ParseRequest(NPT_HttpRequest*&        request,
-                            const NPT_SocketAddress* local_address = NULL);
-    NPT_Result SendResponseHeaders(NPT_HttpResponse& response);
-
-protected:
-    // members
-    Config                           m_Config;
-    NPT_BufferedInputStreamReference m_Input;
-    NPT_OutputStreamReference        m_Output;
-};
-
-/*----------------------------------------------------------------------
-|   NPT_HttpChunkedInputStream
-+---------------------------------------------------------------------*/
-class NPT_HttpChunkedInputStream : public NPT_InputStream
-{
-public:
-    // constructors and destructor
-    NPT_HttpChunkedInputStream(NPT_BufferedInputStreamReference& stream);
-    virtual ~NPT_HttpChunkedInputStream();
-
-    // NPT_InputStream methods
-    NPT_Result Read(void*     buffer, 
-                    NPT_Size  bytes_to_read, 
-                    NPT_Size* bytes_read = NULL);
-    NPT_Result Seek(NPT_Position offset);
-    NPT_Result Tell(NPT_Position& offset);
-    NPT_Result GetSize(NPT_LargeSize& size);
-    NPT_Result GetAvailable(NPT_LargeSize& available);
-
-protected:
-    // members
-    NPT_BufferedInputStreamReference m_Source;
-    NPT_UInt32                       m_CurrentChunkSize;
-    bool                             m_Eos;
-};
-
-/*----------------------------------------------------------------------
-|   NPT_HttpChunkedOutputStream
-+---------------------------------------------------------------------*/
-class NPT_HttpChunkedOutputStream : public NPT_OutputStream
-{
-public:
-    // constructors and destructor
-    NPT_HttpChunkedOutputStream(NPT_OutputStream& stream);
-    virtual ~NPT_HttpChunkedOutputStream();
-
-    // NPT_OutputStream methods
-    NPT_Result Write(const void* buffer, 
-                     NPT_Size    bytes_to_write, 
-                     NPT_Size*   bytes_written = NULL);
-    NPT_Result Seek(NPT_Position /*offset*/) { return NPT_ERROR_NOT_SUPPORTED;}
-    NPT_Result Tell(NPT_Position& offset)    { return m_Stream.Tell(offset);  }
-    NPT_Result Flush()                       { return m_Stream.Flush();       }
-
-protected:
-    // members
-    NPT_OutputStream& m_Stream;
-};
-
-#endif // _NPT_HTTP_H_
-

gpac-2.2.1.tar.gz/extra_lib/include/platinum/NptInterfaces.h Deleted

@@ -1,115 +0,0 @@
-/*****************************************************************
-|
-|   Neptune - Interfaces
-|
-| Copyright (c) 2002-2008, Axiomatic Systems, LLC.
-| All rights reserved.
-|
-| Redistribution and use in source and binary forms, with or without
-| modification, are permitted provided that the following conditions are met:
-|     * Redistributions of source code must retain the above copyright
-|       notice, this list of conditions and the following disclaimer.
-|     * Redistributions in binary form must reproduce the above copyright
-|       notice, this list of conditions and the following disclaimer in the
-|       documentation and/or other materials provided with the distribution.
-|     * Neither the name of Axiomatic Systems nor the
-|       names of its contributors may be used to endorse or promote products
-|       derived from this software without specific prior written permission.
-|
-| THIS SOFTWARE IS PROVIDED BY AXIOMATIC SYSTEMS ''AS IS'' AND ANY
-| EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-| WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-| DISCLAIMED. IN NO EVENT SHALL AXIOMATIC SYSTEMS BE LIABLE FOR ANY
-| DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-| (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-| LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-| ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-| (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-| SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-|
- ****************************************************************/
-
-#ifndef _NPT_INTERFACES_H_
-#define _NPT_INTERFACES_H_
-
-/*----------------------------------------------------------------------
-|   includes
-+---------------------------------------------------------------------*/
-#include "NptTypes.h"
-#include "NptCommon.h"
-#include "NptResults.h"
-#include "NptConfig.h"
-
-/*----------------------------------------------------------------------
-|   constants
-+---------------------------------------------------------------------*/
-const int NPT_ERROR_NO_SUCH_INTERFACE = NPT_ERROR_BASE_INTERFACES - 0;
-
-/*----------------------------------------------------------------------
-|   NPT_InterfaceId
-+---------------------------------------------------------------------*/
-class NPT_InterfaceId
-{
- public:
-    // methods
-    bool operator==(const NPT_InterfaceId& id) const {
-        return ((id.m_Id == m_Id) && (id.m_Version == m_Version));
-    }
-
-    // members
-    unsigned long m_Id;
-    unsigned long m_Version;
-};
-
-/*----------------------------------------------------------------------
-|   NPT_Polymorphic
-+---------------------------------------------------------------------*/
-class NPT_Polymorphic
-{
-public:
-    // destructor
-    virtual ~NPT_Polymorphic() {}
-     
-    // methods
-    virtual NPT_Result GetInterface(const NPT_InterfaceId& id, 
-                                    NPT_Interface*&        iface) = 0;
-};
-
-/*----------------------------------------------------------------------
-|   NPT_Interruptible
-+---------------------------------------------------------------------*/
-class NPT_Interruptible
-{
-public:
-    // destructor
-    virtual ~NPT_Interruptible() {}
-
-    // methods
-    virtual NPT_Result Interrupt() = 0;
-};
-
-/*----------------------------------------------------------------------
-|   NPT_Configurable
-+---------------------------------------------------------------------*/
-class NPT_Configurable
-{
-public:
-    // destructor
-    virtual ~NPT_Configurable() {}
-     
-    // methods
-    virtual NPT_Result SetProperty(const char* /*name*/, 
-                                   const char* /*value*/) { 
-        return NPT_ERROR_NO_SUCH_PROPERTY;
-    }
-    virtual NPT_Result SetProperty(const char* /*name*/, 
-                                   int         /*value*/) { 
-        return NPT_ERROR_NO_SUCH_PROPERTY;
-    }
-    virtual NPT_Result GetProperty(const char*        /*name*/, 
-                                   NPT_PropertyValue& /*value*/) {
-        return NPT_ERROR_NO_SUCH_PROPERTY;
-    }
-};
-
-#endif // _NPT_INTERFACES_H_

gpac-2.2.1.tar.gz/extra_lib/include/platinum/NptJson.h Deleted

@@ -1,42 +0,0 @@
-/*****************************************************************
-|
-|   Neptune - JSON
-|
-| Copyright (c) 2002-2012, Axiomatic Systems, LLC.
-| All rights reserved.
-|
-| Redistribution and use in source and binary forms, with or without
-| modification, are permitted provided that the following conditions are met:
-|     * Redistributions of source code must retain the above copyright
-|       notice, this list of conditions and the following disclaimer.
-|     * Redistributions in binary form must reproduce the above copyright
-|       notice, this list of conditions and the following disclaimer in the
-|       documentation and/or other materials provided with the distribution.
-|     * Neither the name of Axiomatic Systems nor the
-|       names of its contributors may be used to endorse or promote products
-|       derived from this software without specific prior written permission.
-|
-| THIS SOFTWARE IS PROVIDED BY AXIOMATIC SYSTEMS ''AS IS'' AND ANY
-| EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-| WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-| DISCLAIMED. IN NO EVENT SHALL AXIOMATIC SYSTEMS BE LIABLE FOR ANY
-| DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-| (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-| LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-| ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-| (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-| SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-|
- ****************************************************************/
-
-#ifndef _NPT_JSON_H_
-#define _NPT_JSON_H_
-
-/*----------------------------------------------------------------------
-|   includes
-+---------------------------------------------------------------------*/
-#include "NptTypes.h"
-#include "NptStrings.h"
-
-
-#endif // _NPT_JSON_H_

gpac-2.2.1.tar.gz/extra_lib/include/platinum/NptList.h Deleted

@@ -1,705 +0,0 @@
-/*****************************************************************
-|
-|   Neptune - Lists
-|
-| Copyright (c) 2002-2008, Axiomatic Systems, LLC.
-| All rights reserved.
-|
-| Redistribution and use in source and binary forms, with or without
-| modification, are permitted provided that the following conditions are met:
-|     * Redistributions of source code must retain the above copyright
-|       notice, this list of conditions and the following disclaimer.
-|     * Redistributions in binary form must reproduce the above copyright
-|       notice, this list of conditions and the following disclaimer in the
-|       documentation and/or other materials provided with the distribution.
-|     * Neither the name of Axiomatic Systems nor the
-|       names of its contributors may be used to endorse or promote products
-|       derived from this software without specific prior written permission.
-|
-| THIS SOFTWARE IS PROVIDED BY AXIOMATIC SYSTEMS ''AS IS'' AND ANY
-| EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-| WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-| DISCLAIMED. IN NO EVENT SHALL AXIOMATIC SYSTEMS BE LIABLE FOR ANY
-| DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-| (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-| LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-| ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-| (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-| SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-|
- ****************************************************************/
-
-#ifndef _NPT_LIST_H_
-#define _NPT_LIST_H_
-
-/*----------------------------------------------------------------------
-|   includes
-+---------------------------------------------------------------------*/
-#include "NptResults.h"
-#include "NptTypes.h"
-#include "NptConstants.h"
-#include "NptCommon.h"
-
-/*----------------------------------------------------------------------
-|   constants
-+---------------------------------------------------------------------*/
-const int NPT_ERROR_LIST_EMPTY              = NPT_ERROR_BASE_LIST - 0;
-const int NPT_ERROR_LIST_OPERATION_ABORTED  = NPT_ERROR_BASE_LIST - 1;
-const int NPT_ERROR_LIST_OPERATION_CONTINUE = NPT_ERROR_BASE_LIST - 2;
-
-/*----------------------------------------------------------------------
-|   NPT_List
-+---------------------------------------------------------------------*/
-template <typename T> 
-class NPT_List 
-{
-protected:
-    class Item;
-
-public:
-    // types
-    typedef T Element;
-
-    class Iterator {
-    public:
-        Iterator() : m_Item(NULL) {}
-        explicit Iterator(Item* item) : m_Item(item) {}
-        Iterator(const Iterator& copy) : m_Item(copy.m_Item) {}
-        T&  operator*()  const { return m_Item->m_Data; }
-        T*  operator->() const { return &m_Item->m_Data;}
-        Iterator& operator++()  { // prefix
-            m_Item = m_Item->m_Next;
-            return (*this); 
-        }
-        Iterator operator++(int) { // postfix
-            Iterator saved_this = *this;
-            m_Item = m_Item->m_Next;
-            return saved_this;
-        }
-        Iterator& operator--() { // prefix
-            m_Item = m_Item->m_Prev;
-            return (*this); 
-        }
-        Iterator operator--(int) { // postfix
-            Iterator saved_this = *this;
-            m_Item = m_Item->m_Prev;
-            return saved_this;
-        }
-        operator bool() const {
-            return m_Item != NULL;
-        }
-        bool operator==(const Iterator& other) const {
-            return m_Item == other.m_Item;
-        }
-        bool operator!=(const Iterator& other) const {
-            return m_Item != other.m_Item;
-        }
-        void operator=(const Iterator& other) {
-            m_Item = other.m_Item;
-        }
-        void operator=(Item* item) {
-            m_Item = item;
-        }
-
-    private:
-        Item* m_Item;
-
-        // friends
-        friend class NPT_List<T>;
-    };
-
-    // methods
-                 NPT_List<T>();
-                 NPT_List<T>(const NPT_List<T>& list);
-                ~NPT_List<T>();
-    NPT_Result   Add(const T& data);
-    NPT_Result   Insert(const Iterator where, const T& data);
-    NPT_Result   Remove(const T& data, bool all=false);
-    NPT_Result   Erase(const Iterator position);
-    NPT_Result   PopHead(T& data);
-    bool         Contains(const T& data) const;
-    NPT_Result   Clear();
-    NPT_Result   Get(NPT_Ordinal index, T& data) const;
-    NPT_Result   Get(NPT_Ordinal index, T*& data) const;
-    NPT_Cardinal GetItemCount() const { return m_ItemCount; }
-    Iterator     GetFirstItem() const { return Iterator(m_Head); }
-    Iterator     GetLastItem() const  { return Iterator(m_Tail); }
-    Iterator     GetItem(NPT_Ordinal index) const;
-
-    // list manipulation
-    NPT_Result   Add(NPT_List<T>& list);
-    NPT_Result   Remove(const NPT_List<T>& list, bool all=false);
-    NPT_Result   Cut(NPT_Cardinal keep, NPT_List<T>& cut);
-    
-    // item manipulation
-    NPT_Result   Add(Item& item);
-    NPT_Result   Detach(Item& item);
-    NPT_Result   Insert(const Iterator where, Item& item);
-
-    // list operations
-    // keep these template members defined here because MSV6 does not let
-    // us define them later
-    template <typename X> 
-    NPT_Result Apply(const X& function) const
-    {                          
-        Item* item = m_Head;
-        while (item) {
-            function(item->m_Data);
-            item = item->m_Next;
-        }
-
-        return NPT_SUCCESS;
-    }
-
-    template <typename X, typename P> 
-    NPT_Result ApplyUntil(const X& function, const P& predicate, bool* match = NULL) const
-    {                          
-        Item* item = m_Head;
-        while (item) {
-            NPT_Result return_value;
-            if (predicate(function(item->m_Data), return_value)) {
-                if (match) *match = true;
-                return return_value;
-            }
-            item = item->m_Next;
-        }
-        
-        if (match) *match = false;
-        return NPT_SUCCESS;
-    }
-
-    template <typename P> 
-    Iterator Find(const P& predicate, NPT_Ordinal n=0) const
-    {
-        Item* item = m_Head;
-        while (item) {
-            if (predicate(item->m_Data)) {
-                if (n == 0) {
-                    return Iterator(item);
-                }
-                --n;
-            }
-            item = item->m_Next;
-        }
-
-        return Iterator(NULL);
-    }
-
-    // Merge sort algorithm
-    // http://en.wikipedia.org/wiki/Mergesort
-    template <typename X> 
-    NPT_Result Sort(const X& function)
-    {   
-        if (GetItemCount() <= 1) return NPT_SUCCESS;
-        
-        NPT_List<T> right;
-        NPT_CHECK(Cut(GetItemCount() >> 1, right));
-        
-        // Sort ourselves again
-        Sort(function);
-        
-        // sort the right side
-        right.Sort(function);
-        
-        // merge the two back inline
-        if (function(m_Tail->m_Data, right.m_Head->m_Data) > 0) {
-            Merge(right, function);
-        } else {
-            // append right
-            right.m_Head->m_Prev = m_Tail;
-            if (m_Tail) m_Tail->m_Next = right.m_Head;
-            if (!m_Head) m_Head = right.m_Head;
-            m_Tail = right.m_Tail;
-            m_ItemCount += right.m_ItemCount;
-            
-            right.m_ItemCount = 0;
-            right.m_Head = right.m_Tail = NULL;
-        }
-        
-        return NPT_SUCCESS;
-    }
-
-    template <typename X> 
-    NPT_Result Merge(NPT_List<T>& other, const X& function) 
-    {
-        Iterator left = GetFirstItem();
-        Iterator right;
-        while (left && other.m_Head) {
-            if (function(*left, other.m_Head->m_Data) <= 0) {
-                ++left;
-            } else {
-                // remove head and insert it
-                Item* head = other.m_Head;
-                other.Detach(*head);
-                Insert(left, *head);
-            }
-        }
-        
-        // add what's left of other if any
-        if (other.m_Head) {
-            other.m_Head->m_Prev = m_Tail;
-            if (m_Tail) m_Tail->m_Next = other.m_Head;
-            m_Tail = other.m_Tail;
-            if (!m_Head) m_Head = other.m_Head;
-            other.m_Head = other.m_Tail = NULL;
-        }
-        m_ItemCount += other.m_ItemCount;
-        other.m_ItemCount = 0;
-        return NPT_SUCCESS;
-    }
-
-    // operators
-    void operator=(const NPT_List<T>& other);
-    bool operator==(const NPT_List<T>& other) const;
-    bool operator!=(const NPT_List<T>& other) const;
-
-protected:
-    // types
-    class Item 
-    {
-    public:
-        // methods
-        Item(const T& data) : m_Next(0), m_Prev(0), m_Data(data) {}
-
-        // members
-        Item* m_Next;
-        Item* m_Prev;
-        T     m_Data;
-
-        // friends
-        //friend class NPT_List<T>;
-        //friend class NPT_List<T>::Iterator;
-    };
-
-    // members
-    NPT_Cardinal m_ItemCount;
-    Item*        m_Head;
-    Item*        m_Tail;
-};
-
-/*----------------------------------------------------------------------
-|   NPT_List<T>::NPT_List
-+---------------------------------------------------------------------*/
-template <typename T>
-inline
-NPT_List<T>::NPT_List() : m_ItemCount(0), m_Head(0), m_Tail(0) 
-{
-}
-
-/*----------------------------------------------------------------------
-|   NPT_List<T>::NPT_List
-+---------------------------------------------------------------------*/
-template <typename T>
-inline
-NPT_List<T>::NPT_List(const NPT_List<T>& list) : m_ItemCount(0), m_Head(0), m_Tail(0) 
-{
-    *this = list;
-}
-
-/*----------------------------------------------------------------------
-|   NPT_List<T>::~NPT_List<T>
-+---------------------------------------------------------------------*/
-template <typename T>
-inline
-NPT_List<T>::~NPT_List()
-{
-    Clear();
-}
- 
-/*----------------------------------------------------------------------
-|   NPT_List<T>::operator=
-+---------------------------------------------------------------------*/
-template <typename T>
-void
-NPT_List<T>::operator=(const NPT_List<T>& list)
-{
-    // cleanup
-    Clear();
-
-    // copy the new list
-    Item* item = list.m_Head;
-    while (item) {
-        Add(item->m_Data);
-        item = item->m_Next;
-    }
-}
-
-/*----------------------------------------------------------------------
-|   NPT_List<T>::operator==
-+---------------------------------------------------------------------*/
-template <typename T>
-bool
-NPT_List<T>::operator==(const NPT_List<T>& other) const
-{
-    // quick test
-    if (m_ItemCount != other.m_ItemCount) return false;
-
-    // compare all elements one by one
-    Item* our_item = m_Head;
-    Item* their_item = other.m_Head;
-    while (our_item && their_item) {
-        if (our_item->m_Data != their_item->m_Data) return false;
-        our_item   = our_item->m_Next;
-        their_item = their_item->m_Next;
-    }
-    
-    return our_item == NULL && their_item == NULL;
-}
-
-/*----------------------------------------------------------------------
-|   NPT_List<T>::operator!=
-+---------------------------------------------------------------------*/
-template <typename T>
-inline
-bool
-NPT_List<T>::operator!=(const NPT_List<T>& other) const
-{
-    return !(*this == other);
-}
-
-/*----------------------------------------------------------------------
-|   NPT_List<T>::Clear
-+---------------------------------------------------------------------*/
-template <typename T>
-NPT_Result
-NPT_List<T>::Clear()
-{
-    // delete all items
-    Item* item = m_Head;
-    while (item) {
-        Item* next = item->m_Next;
-        delete item;
-        item = next;
-    }
-
-    m_ItemCount = 0;
-    m_Head      = NULL;
-    m_Tail      = NULL;
-
-    return NPT_SUCCESS;
-}
-
-/*----------------------------------------------------------------------
-|   NPT_List<T>::Add
-+---------------------------------------------------------------------*/
-template <typename T>
-NPT_Result
-NPT_List<T>::Add(Item& item)
-{
-    // add element at the tail
-    if (m_Tail) {
-        item.m_Prev = m_Tail;
-        item.m_Next = NULL;
-        m_Tail->m_Next = &item;
-        m_Tail = &item;
-    } else {
-        m_Head = &item;
-        m_Tail = &item;
-        item.m_Next = NULL;
-        item.m_Prev = NULL;
-    }
-
-    // one more item in the list now
-    ++m_ItemCount;
- 
-    return NPT_SUCCESS;
-}
-
-/*----------------------------------------------------------------------
-|   NPT_List<T>::Add
-+---------------------------------------------------------------------*/
-template <typename T>
-NPT_Result
-NPT_List<T>::Add(NPT_List<T>& list)
-{
-    // copy the new list
-    Item* item = list.m_Head;
-    while (item) {
-        Add(item->m_Data);
-        item = item->m_Next;
-    }
-
-    return NPT_SUCCESS;
-}
-
-/*----------------------------------------------------------------------
-|   NPT_List<T>::Add
-+---------------------------------------------------------------------*/
-template <typename T>
-inline
-NPT_Result
-NPT_List<T>::Add(const T& data)
-{
-    return Add(*new Item(data));
-}
-
-/*----------------------------------------------------------------------
-|   NPT_List<T>::GetItem
-+---------------------------------------------------------------------*/
-template <typename T>
-typename NPT_List<T>::Iterator
-NPT_List<T>::GetItem(NPT_Ordinal n) const
-{
-    Iterator result;
-    if (n >= m_ItemCount) return result;
-    
-    result = m_Head;
-    for (unsigned int i=0; i<n; i++) {
-        ++result;
-    }
-
-    return result;
-}
-
-/*----------------------------------------------------------------------
-|   NPT_List<T>::Insert
-+---------------------------------------------------------------------*/
-template <typename T>
-inline 
-NPT_Result
-NPT_List<T>::Insert(Iterator where, const T&data)
-{
-    return Insert(where, *new Item(data));
-}
-
-/*----------------------------------------------------------------------
-|   NPT_List<T>::Insert
-+---------------------------------------------------------------------*/
-template <typename T>
-NPT_Result
-NPT_List<T>::Insert(Iterator where, Item& item)
-{
-    // insert the item in the list
-    Item* position = where.m_Item;
-    if (position) {
-        // insert at position
-        item.m_Next = position;
-        item.m_Prev = position->m_Prev;
-        position->m_Prev = &item;
-        if (item.m_Prev) {
-            item.m_Prev->m_Next = &item;
-        } else {
-            // this is the new head
-            m_Head = &item;
-        }
-
-        // one more item in the list now
-        ++m_ItemCount;
-    } else {
-        // insert at tail
-        return Add(item);
-    }
- 
-    return NPT_SUCCESS;
-}
-
-/*----------------------------------------------------------------------
-|   NPT_List<T>::Erase
-+---------------------------------------------------------------------*/
-template <typename T>
-NPT_Result
-NPT_List<T>::Erase(Iterator position) 
-{
-    if (!position) return NPT_ERROR_NO_SUCH_ITEM;
-    Detach(*position.m_Item);
-    delete position.m_Item;
-
-    return NPT_SUCCESS;
-}
-
-/*----------------------------------------------------------------------
-|   NPT_List<T>::Remove
-+---------------------------------------------------------------------*/
-template <typename T>
-NPT_Result
-NPT_List<T>::Remove(const T& data, bool all)
-{
-    Item* item = m_Head;
-    NPT_Cardinal matches = 0;
-
-    while (item) {
-        Item* next = item->m_Next;
-        if (item->m_Data == data) {
-            // we found a match
-            ++matches;
-
-            // detach item
-            Detach(*item);
-            
-            // destroy the item
-            delete item;
-
-            if (!all) return NPT_SUCCESS;
-        }
-        item = next;
-    }
- 
-    return matches?NPT_SUCCESS:NPT_ERROR_NO_SUCH_ITEM;
-}
-
-/*----------------------------------------------------------------------
-|   NPT_List<T>::Remove
-+---------------------------------------------------------------------*/
-template <typename T>
-NPT_Result
-NPT_List<T>::Remove(const NPT_List<T>& list, bool all)
-{
-    Item* item = list.m_Head;
-    while (item) {
-        Remove(item->m_Data, all);
-        item = item->m_Next;
-    }
-
-    return NPT_SUCCESS;
-}
-
-/*----------------------------------------------------------------------
-|   NPT_List<T>::Detach
-+---------------------------------------------------------------------*/
-template <typename T>
-NPT_Result
-NPT_List<T>::Detach(Item& item)
-{
-    // remove item
-    if (item.m_Prev) {
-        // item is not the head
-        if (item.m_Next) {
-            // item is not the tail
-            item.m_Next->m_Prev = item.m_Prev;
-            item.m_Prev->m_Next = item.m_Next;
-        } else {
-            // item is the tail
-            m_Tail = item.m_Prev;
-            m_Tail->m_Next = NULL;
-        }
-    } else {
-        // item is the head
-        m_Head = item.m_Next;
-        if (m_Head) {
-            // item is not the tail
-            m_Head->m_Prev = NULL;
-        } else {
-            // item is also the tail
-            m_Tail = NULL;
-        }
-    }
-
-    // one less item in the list now
-    --m_ItemCount;
-
-    return NPT_SUCCESS;
-}
-
-/*----------------------------------------------------------------------
-|   NPT_List<T>::Get
-+---------------------------------------------------------------------*/
-template <typename T>
-NPT_Result
-NPT_List<T>::Get(NPT_Ordinal index, T& data) const
-{
-    T* data_pointer;
-    NPT_CHECK(Get(index, data_pointer));
-    data = *data_pointer;
-    return NPT_SUCCESS;
-}
-
-/*----------------------------------------------------------------------
-|   NPT_List<T>::Get
-+---------------------------------------------------------------------*/
-template <typename T>
-NPT_Result
-NPT_List<T>::Get(NPT_Ordinal index, T*& data) const
-{
-    Item* item = m_Head;
-
-    if (index < m_ItemCount) {
-        while (index--) item = item->m_Next;
-        data = &item->m_Data;
-        return NPT_SUCCESS;
-    } else {
-        data = NULL;
-        return NPT_ERROR_NO_SUCH_ITEM;
-    }
-}
-
-/*----------------------------------------------------------------------
-|   NPT_List<T>::PopHead
-+---------------------------------------------------------------------*/
-template <typename T>
-NPT_Result
-NPT_List<T>::PopHead(T& data)
-{
-    // check that we have an element
-    if (m_Head == NULL) return NPT_ERROR_LIST_EMPTY;
-
-    // copy the head item's data
-    data = m_Head->m_Data;
-
-    // discard the head item
-    Item* head = m_Head;
-    m_Head = m_Head->m_Next;
-    if (m_Head) {
-        m_Head->m_Prev = NULL;
-    } else {
-        m_Tail = NULL;
-    }
-    delete head;
-
-    // update the count
-    --m_ItemCount;
-
-    return NPT_SUCCESS;
-}
-
-/*----------------------------------------------------------------------
-|   NPT_List<T>::Contains
-+---------------------------------------------------------------------*/
-template <typename T>
-bool
-NPT_List<T>::Contains(const T& data) const
-{
-    Item* item = m_Head;
-    while (item) {
-        if (item->m_Data == data) return true;
-        item = item->m_Next;
-    }
-
-    return false;
-}
-
-/*----------------------------------------------------------------------
-|   NPT_List<T>::Cut
-+---------------------------------------------------------------------*/
-template <typename T> 
-NPT_Result 
-NPT_List<T>::Cut(NPT_Cardinal keep, NPT_List<T>& cut) 
-{
-    cut.Clear();
-    
-    // shortcut
-    if (keep >= GetItemCount()) return NPT_SUCCESS;
-    
-    // update new counts first
-    cut.m_ItemCount = m_ItemCount-keep;
-    m_ItemCount = keep;
-    
-    // look for the cut-point item
-    Item* item = m_Head;
-    while (keep--) { item = item->m_Next;}
-    
-    // the cut list goes from the cut-point item to the tail
-    cut.m_Head = item;
-    cut.m_Tail = m_Tail;
-    
-    // update the portion of the list we keep
-    if (item == m_Head) m_Head = NULL;
-    m_Tail = item->m_Prev;
-    
-    // update the cut list
-    if (item->m_Prev) item->m_Prev->m_Next = NULL;
-    item->m_Prev = NULL;
-    
-    return NPT_SUCCESS;
-}
-
-#endif // _NPT_LIST_H_

gpac-2.2.1.tar.gz/extra_lib/include/platinum/NptLogging.h Deleted

@@ -1,520 +0,0 @@
-/*****************************************************************
-|
-|   Neptune - Logging Support
-|
-| Copyright (c) 2002-2008, Axiomatic Systems, LLC.
-| All rights reserved.
-|
-| Redistribution and use in source and binary forms, with or without
-| modification, are permitted provided that the following conditions are met:
-|     * Redistributions of source code must retain the above copyright
-|       notice, this list of conditions and the following disclaimer.
-|     * Redistributions in binary form must reproduce the above copyright
-|       notice, this list of conditions and the following disclaimer in the
-|       documentation and/or other materials provided with the distribution.
-|     * Neither the name of Axiomatic Systems nor the
-|       names of its contributors may be used to endorse or promote products
-|       derived from this software without specific prior written permission.
-|
-| THIS SOFTWARE IS PROVIDED BY AXIOMATIC SYSTEMS ''AS IS'' AND ANY
-| EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-| WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-| DISCLAIMED. IN NO EVENT SHALL AXIOMATIC SYSTEMS BE LIABLE FOR ANY
-| DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-| (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-| LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-| ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-| (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-| SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-|
-****************************************************************/
-/** @file
-* Header file for logging
-*/
-
-#ifndef _NPT_LOGGING_H_
-#define _NPT_LOGGING_H_
-
-/*----------------------------------------------------------------------
-|   includes
-+---------------------------------------------------------------------*/
-#include "NptConfig.h"
-#include "NptTypes.h"
-#include "NptTime.h"
-#include "NptStrings.h"
-#include "NptList.h"
-#include "NptStreams.h"
-#include "NptThreads.h"
-#include "NptHttp.h"
-
-/*----------------------------------------------------------------------
-|   class references
-+---------------------------------------------------------------------*/
-class NPT_LogManager;
-
-/*----------------------------------------------------------------------
-|   types
-+---------------------------------------------------------------------*/
-class NPT_LogRecord {
-public:
-    const char*   m_LoggerName;
-    int           m_Level;
-    const char*   m_Message;
-    NPT_TimeStamp m_TimeStamp;
-    const char*   m_SourceFile;
-    unsigned int  m_SourceLine;
-    const char*   m_SourceFunction;
-    unsigned long m_ThreadId;
-};
-
-class NPT_LogHandler {
-public:
-    typedef void(*CustomHandlerExternalFunction)(const NPT_LogRecord* record);
-    
-    // class methods
-    static NPT_Result SetCustomHandlerFunction(CustomHandlerExternalFunction function);
-    static NPT_Result Create(const char*      logger_name,
-                             const char*      handler_name,
-                             NPT_LogHandler*& handler);
-
-    // methods
-    virtual ~NPT_LogHandler() {}
-    virtual void       Log(const NPT_LogRecord& record) = 0;
-    virtual NPT_String ToString() { return ""; }
-};
-
-class NPT_Logger {
-public:
-    // methods
-    NPT_Logger(const char* name, NPT_LogManager& manager);
-    ~NPT_Logger();
-    void Log(int          level, 
-             const char*  source_file,
-             unsigned int source_line,
-             const char*  source_function,
-             const char*  msg, 
-                          ...);
-
-    NPT_Result AddHandler(NPT_LogHandler* handler, bool transfer_ownership = true);
-    NPT_Result DeleteHandlers();
-    NPT_Result SetParent(NPT_Logger* parent);
-    const NPT_String& GetName()  const { return m_Name;  }
-    int               GetLevel() const { return m_Level; }
-    bool              GetForwardToParent() const { return m_ForwardToParent; }
-    NPT_List<NPT_LogHandler*>& GetHandlers() { return m_Handlers; }
-
-private:
-    // members
-    NPT_LogManager&           m_Manager;
-    NPT_String                m_Name;
-    int                       m_Level;
-    bool                      m_LevelIsInherited;
-    bool                      m_ForwardToParent;
-    NPT_Logger*               m_Parent;
-    NPT_List<NPT_LogHandler*> m_Handlers;
-    NPT_List<NPT_LogHandler*> m_ExternalHandlers;
-
-    // friends
-    friend class NPT_LogManager;
-};
-
-typedef struct {
-    NPT_Logger* logger;
-    const char* name;
-} NPT_LoggerReference;
-
-class NPT_Log {
-public:
-    // class methods
-    static int         GetLogLevel(const char* name);
-    static const char* GetLogLevelName(int level);
-    static const char* GetLogLevelAnsiColor(int level);
-    static void        FormatRecordToStream(const NPT_LogRecord& record,
-                                            NPT_OutputStream&    stream,
-                                            bool                 use_colors,
-                                            NPT_Flags            format_filter);
-};
-
-class NPT_LogConfigEntry {
-public:
-    NPT_LogConfigEntry(const char* key, const char* value) :
-      m_Key(key), m_Value(value) {}
-    NPT_String m_Key;
-    NPT_String m_Value;
-};
-
-class NPT_LogManager {
-public:
-    // class methods
-    static NPT_LogManager& GetDefault();
-    static bool ConfigValueIsBooleanTrue(NPT_String& value);
-    static bool ConfigValueIsBooleanFalse(NPT_String& value);
-    static NPT_Logger* GetLogger(const char* name);
-
-    // methods
-    NPT_LogManager();
-    ~NPT_LogManager();
-    NPT_Result                    Configure(const char* config_sources = NULL);
-    NPT_String*                   GetConfigValue(const char* prefix, const char* suffix);
-    NPT_List<NPT_Logger*>&        GetLoggers() { return m_Loggers; }
-    NPT_List<NPT_LogConfigEntry>& GetConfig()  { return m_Config;  }
-    void                          SetEnabled(bool enabled) { m_Enabled = enabled; }
-    bool                          IsEnabled()              { return m_Enabled;    }
-    void                          Lock();
-    void                          Unlock();
-
-private:
-    // methods
-    NPT_Result  SetConfigValue(const char* key, const char* value);
-    NPT_Result  ParseConfig(const char* config, NPT_Size config_size);
-    NPT_Result  ParseConfigSource(NPT_String& source);
-    NPT_Result  ParseConfigFile(const char* filename);
-    bool        HaveLoggerConfig(const char* name);
-    NPT_Logger* FindLogger(const char* name);
-    NPT_Result  ConfigureLogger(NPT_Logger* logger);
-
-    // members
-    NPT_Mutex                    m_Lock;
-    NPT_Thread::ThreadId         m_LockOwner;
-    bool                         m_Enabled;
-    bool                         m_Configured;
-    NPT_List<NPT_LogConfigEntry> m_Config;
-    NPT_List<NPT_Logger*>        m_Loggers;
-    NPT_Logger*                  m_Root;
-};
-
-const unsigned short NPT_HTTP_LOGGER_CONFIGURATOR_DEFAULT_PORT = 6378;
-class NPT_HttpLoggerConfigurator : NPT_HttpRequestHandler, public NPT_Thread {
-public:
-    // constructor and destructor
-    NPT_HttpLoggerConfigurator(NPT_UInt16 port = NPT_HTTP_LOGGER_CONFIGURATOR_DEFAULT_PORT,
-                               bool       detached = true);
-    virtual ~NPT_HttpLoggerConfigurator();
-
-    // NPT_Runnable (NPT_Thread) methods
-    virtual void Run();
-
-private:
-    // NPT_HttpRequestHandler methods
-    virtual NPT_Result SetupResponse(NPT_HttpRequest&              request,
-                                     const NPT_HttpRequestContext& context,
-                                     NPT_HttpResponse&             response);
-
-    // members
-    NPT_HttpServer* m_Server;
-};
-
-NPT_Result NPT_GetSystemLogConfig(NPT_String& config);
-
-/*----------------------------------------------------------------------
-|   constants
-+---------------------------------------------------------------------*/
-#define NPT_LOG_LEVEL_FATAL   700
-#define NPT_LOG_LEVEL_SEVERE  600 
-#define NPT_LOG_LEVEL_WARNING 500
-#define NPT_LOG_LEVEL_INFO    400
-#define NPT_LOG_LEVEL_FINE    300
-#define NPT_LOG_LEVEL_FINER   200
-#define NPT_LOG_LEVEL_FINEST  100 
-
-#define NPT_LOG_LEVEL_OFF     32767
-#define NPT_LOG_LEVEL_ALL     0
-
-/*----------------------------------------------------------------------
-|   macros
-+---------------------------------------------------------------------*/
-#define NPT_LOG_GET_LOGGER(_logger)                                   \
-    if ((_logger).logger == NULL) {                                   \
-        (_logger).logger = NPT_LogManager::GetLogger((_logger).name); \
-    }
-
-#if defined(NPT_CONFIG_ENABLE_LOGGING)
-//TODO: volatile makes tons of errors for me
-//#define NPT_DEFINE_LOGGER(_logger, _name) static volatile NPT_LoggerReference _logger = { NULL, (_name) };
-#define NPT_DEFINE_LOGGER(_logger, _name) static NPT_LoggerReference _logger = { NULL, (_name) };
-
-#define NPT_LOG_X(_logger, _level, _argsx)                              \
-do {                                                                    \
-    NPT_LOG_GET_LOGGER((_logger))                                       \
-    if ((_logger).logger && (_level) >= (_logger).logger->GetLevel()) { \
-        (_logger).logger->Log _argsx;                                   \
-    }                                                                   \
-} while(0)
-
-#define NPT_CHECK_LL(_logger, _level, _result) do {                                    \
-    NPT_Result _x = (_result);                                                         \
-    if (_x != NPT_SUCCESS) {                                                           \
-        NPT_LOG_X((_logger),(_level),((_level),__FILE__,__LINE__,(NPT_LocalFunctionName),"NPT_CHECK failed, result=%d (%s) %s", _x, NPT_ResultText(_x), #_result)); \
-        return _x;                                                                     \
-    }                                                                                  \
-} while(0)
-
-#define NPT_CHECK_LABEL_LL(_logger, _level, _result, _label) do {                      \
-    NPT_Result _x = (_result);                                                         \
-    if (_x != NPT_SUCCESS) {                                                           \
-        NPT_LOG_X((_logger),(_level),((_level),__FILE__,__LINE__,(NPT_LocalFunctionName),"NPT_CHECK failed, result=%d (%s) %s", _x, NPT_ResultText(_x), #_result)); \
-        goto _label;                                                                   \
-    }                                                                                  \
-} while(0)
-#define NPT_CHECK_POINTER_LL(_logger, _level, _p) do {                                 \
-    if ((_p) == NULL) {                                                                  \
-        NPT_LOG_X((_logger),(_level),((_level),__FILE__,__LINE__,(NPT_LocalFunctionName),"@@@ NULL pointer parameter"));                     \
-        return NPT_ERROR_INVALID_PARAMETERS;                                                     \
-    }                                                                                  \
-} while(0)
-#define NPT_CHECK_POINTER_LABEL_LL(_logger, _level, _p, _label) do {                   \
-    if ((_p) == NULL) {                                                                  \
-        NPT_LOG_X((_logger),(_level),((_level),__FILE__,__LINE__,(NPT_LocalFunctionName),"@@@ NULL pointer parameter"));                     \
-        goto _label;                                                                   \
-    }                                                                                  \
-} while(0)
-
-#else /* NPT_CONFIG_ENABLE_LOGGING */
-
-#define NPT_DEFINE_LOGGER(_logger, _name)
-#define NPT_LOG_X(_logger, _level, _argsx)
-#define NPT_CHECK_LL(_logger, _level, _result) NPT_CHECK(_result)
-#define NPT_CHECK_LABEL_LL(_logger, _level, _result, _label) NPT_CHECK_LABEL((_result), _label)
-#define NPT_CHECK_POINTER_LL(_logger, _level, _p) NPT_CHECK_POINTER((_p))
-#define NPT_CHECK_POINTER_LABEL_LL(_logger, _level, _p, _label) NPT_CHECK_POINTER_LABEL((_p), _label)
-
-#endif /* NPT_CONFIG_ENABLE_LOGGING */
-
-#define NPT_SET_LOCAL_LOGGER(_name) NPT_DEFINE_LOGGER(_NPT_LocalLogger, (_name))
-#define NPT_CHECK_L(_level, _result) NPT_CHECK_LL(_NPT_LocalLogger, (_level), (_result))
-#define NPT_CHECK_LABEL_L(_level, _result, _label) NPT_CHECK_LABEL_LL(_NPT_LocalLogger, (_level), NULL, (_result), _label)
-
-/* NOTE: the following are machine-generated, do not edit */
-#define NPT_LOG_LL(_logger,_level,_msg) NPT_LOG_X((_logger),(_level),((_level),__FILE__,__LINE__,(NPT_LocalFunctionName),(_msg)))
-#define NPT_LOG(_level,_msg) NPT_LOG_LL((_NPT_LocalLogger),(_level),(_msg))
-#define NPT_LOG_L(_logger,_level,_msg) NPT_LOG_LL((_logger),(_level),(_msg))
-#define NPT_LOG_LL1(_logger,_level,_msg,_arg1) NPT_LOG_X((_logger),(_level),((_level),__FILE__,__LINE__,(NPT_LocalFunctionName),(_msg),(_arg1)))
-#define NPT_LOG_1(_level,_msg,_arg1) NPT_LOG_LL1((_NPT_LocalLogger),(_level),(_msg),(_arg1))
-#define NPT_LOG_L1(_logger,_level,_msg,_arg1) NPT_LOG_LL1((_logger),(_level),(_msg),(_arg1))
-#define NPT_LOG_LL2(_logger,_level,_msg,_arg1,_arg2) NPT_LOG_X((_logger),(_level),((_level),__FILE__,__LINE__,(NPT_LocalFunctionName),(_msg),(_arg1),(_arg2)))
-#define NPT_LOG_2(_level,_msg,_arg1,_arg2) NPT_LOG_LL2((_NPT_LocalLogger),(_level),(_msg),(_arg1),(_arg2))
-#define NPT_LOG_L2(_logger,_level,_msg,_arg1,_arg2) NPT_LOG_LL2((_logger),(_level),(_msg),(_arg1),(_arg2))
-#define NPT_LOG_LL3(_logger,_level,_msg,_arg1,_arg2,_arg3) NPT_LOG_X((_logger),(_level),((_level),__FILE__,__LINE__,(NPT_LocalFunctionName),(_msg),(_arg1),(_arg2),(_arg3)))
-#define NPT_LOG_3(_level,_msg,_arg1,_arg2,_arg3) NPT_LOG_LL3((_NPT_LocalLogger),(_level),(_msg),(_arg1),(_arg2),(_arg3))
-#define NPT_LOG_L3(_logger,_level,_msg,_arg1,_arg2,_arg3) NPT_LOG_LL3((_logger),(_level),(_msg),(_arg1),(_arg2),(_arg3))
-#define NPT_LOG_LL4(_logger,_level,_msg,_arg1,_arg2,_arg3,_arg4) NPT_LOG_X((_logger),(_level),((_level),__FILE__,__LINE__,(NPT_LocalFunctionName),(_msg),(_arg1),(_arg2),(_arg3),(_arg4)))
-#define NPT_LOG_4(_level,_msg,_arg1,_arg2,_arg3,_arg4) NPT_LOG_LL4((_NPT_LocalLogger),(_level),(_msg),(_arg1),(_arg2),(_arg3),(_arg4))
-#define NPT_LOG_L4(_logger,_level,_msg,_arg1,_arg2,_arg3,_arg4) NPT_LOG_LL4((_logger),(_level),(_msg),(_arg1),(_arg2),(_arg3),(_arg4))
-#define NPT_LOG_LL5(_logger,_level,_msg,_arg1,_arg2,_arg3,_arg4,_arg5) NPT_LOG_X((_logger),(_level),((_level),__FILE__,__LINE__,(NPT_LocalFunctionName),(_msg),(_arg1),(_arg2),(_arg3),(_arg4),(_arg5)))
-#define NPT_LOG_5(_level,_msg,_arg1,_arg2,_arg3,_arg4,_arg5) NPT_LOG_LL5((_NPT_LocalLogger),(_level),(_msg),(_arg1),(_arg2),(_arg3),(_arg4),(_arg5))
-#define NPT_LOG_L5(_logger,_level,_msg,_arg1,_arg2,_arg3,_arg4,_arg5) NPT_LOG_LL5((_logger),(_level),(_msg),(_arg1),(_arg2),(_arg3),(_arg4),(_arg5))
-#define NPT_LOG_LL6(_logger,_level,_msg,_arg1,_arg2,_arg3,_arg4,_arg5,_arg6) NPT_LOG_X((_logger),(_level),((_level),__FILE__,__LINE__,(NPT_LocalFunctionName),(_msg),(_arg1),(_arg2),(_arg3),(_arg4),(_arg5),(_arg6)))
-#define NPT_LOG_6(_level,_msg,_arg1,_arg2,_arg3,_arg4,_arg5,_arg6) NPT_LOG_LL6((_NPT_LocalLogger),(_level),(_msg),(_arg1),(_arg2),(_arg3),(_arg4),(_arg5),(_arg6))
-#define NPT_LOG_L6(_logger,_level,_msg,_arg1,_arg2,_arg3,_arg4,_arg5,_arg6) NPT_LOG_LL6((_logger),(_level),(_msg),(_arg1),(_arg2),(_arg3),(_arg4),(_arg5),(_arg6))
-#define NPT_LOG_LL7(_logger,_level,_msg,_arg1,_arg2,_arg3,_arg4,_arg5,_arg6,_arg7) NPT_LOG_X((_logger),(_level),((_level),__FILE__,__LINE__,(NPT_LocalFunctionName),(_msg),(_arg1),(_arg2),(_arg3),(_arg4),(_arg5),(_arg6),(_arg7)))
-#define NPT_LOG_7(_level,_msg,_arg1,_arg2,_arg3,_arg4,_arg5,_arg6,_arg7) NPT_LOG_LL7((_NPT_LocalLogger),(_level),(_msg),(_arg1),(_arg2),(_arg3),(_arg4),(_arg5),(_arg6),(_arg7))
-#define NPT_LOG_L7(_logger,_level,_msg,_arg1,_arg2,_arg3,_arg4,_arg5,_arg6,_arg7) NPT_LOG_LL7((_logger),(_level),(_msg),(_arg1),(_arg2),(_arg3),(_arg4),(_arg5),(_arg6),(_arg7))
-#define NPT_LOG_LL8(_logger,_level,_msg,_arg1,_arg2,_arg3,_arg4,_arg5,_arg6,_arg7,_arg8) NPT_LOG_X((_logger),(_level),((_level),__FILE__,__LINE__,(NPT_LocalFunctionName),(_msg),(_arg1),(_arg2),(_arg3),(_arg4),(_arg5),(_arg6),(_arg7),(_arg8)))
-#define NPT_LOG_8(_level,_msg,_arg1,_arg2,_arg3,_arg4,_arg5,_arg6,_arg7,_arg8) NPT_LOG_LL8((_NPT_LocalLogger),(_level),(_msg),(_arg1),(_arg2),(_arg3),(_arg4),(_arg5),(_arg6),(_arg7),(_arg8))
-#define NPT_LOG_L8(_logger,_level,_msg,_arg1,_arg2,_arg3,_arg4,_arg5,_arg6,_arg7,_arg8) NPT_LOG_LL8((_logger),(_level),(_msg),(_arg1),(_arg2),(_arg3),(_arg4),(_arg5),(_arg6),(_arg7),(_arg8))
-#define NPT_LOG_LL9(_logger,_level,_msg,_arg1,_arg2,_arg3,_arg4,_arg5,_arg6,_arg7,_arg8,_arg9) NPT_LOG_X((_logger),(_level),((_level),__FILE__,__LINE__,(NPT_LocalFunctionName),(_msg),(_arg1),(_arg2),(_arg3),(_arg4),(_arg5),(_arg6),(_arg7),(_arg8),(_arg9)))
-#define NPT_LOG_9(_level,_msg,_arg1,_arg2,_arg3,_arg4,_arg5,_arg6,_arg7,_arg8,_arg9) NPT_LOG_LL9((_NPT_LocalLogger),(_level),(_msg),(_arg1),(_arg2),(_arg3),(_arg4),(_arg5),(_arg6),(_arg7),(_arg8),(_arg9))
-#define NPT_LOG_L9(_logger,_level,_msg,_arg1,_arg2,_arg3,_arg4,_arg5,_arg6,_arg7,_arg8,_arg9) NPT_LOG_LL9((_logger),(_level),(_msg),(_arg1),(_arg2),(_arg3),(_arg4),(_arg5),(_arg6),(_arg7),(_arg8),(_arg9))
-
-#define NPT_LOG_FATAL(_msg) NPT_LOG_LL((_NPT_LocalLogger),NPT_LOG_LEVEL_FATAL,(_msg))
-#define NPT_LOG_FATAL_L(_logger,_msg) NPT_LOG_LL((_logger),NPT_LOG_LEVEL_FATAL,(_msg))
-#define NPT_LOG_FATAL_1(_msg,_arg1) NPT_LOG_LL1((_NPT_LocalLogger),NPT_LOG_LEVEL_FATAL,(_msg),(_arg1))
-#define NPT_LOG_FATAL_L1(_logger,_msg,_arg1) NPT_LOG_LL1((_logger),NPT_LOG_LEVEL_FATAL,(_msg),(_arg1))
-#define NPT_LOG_FATAL_2(_msg,_arg1,_arg2) NPT_LOG_LL2((_NPT_LocalLogger),NPT_LOG_LEVEL_FATAL,(_msg),(_arg1),(_arg2))
-#define NPT_LOG_FATAL_L2(_logger,_msg,_arg1,_arg2) NPT_LOG_LL2((_logger),NPT_LOG_LEVEL_FATAL,(_msg),(_arg1),(_arg2))
-#define NPT_LOG_FATAL_3(_msg,_arg1,_arg2,_arg3) NPT_LOG_LL3((_NPT_LocalLogger),NPT_LOG_LEVEL_FATAL,(_msg),(_arg1),(_arg2),(_arg3))
-#define NPT_LOG_FATAL_L3(_logger,_msg,_arg1,_arg2,_arg3) NPT_LOG_LL3((_logger),NPT_LOG_LEVEL_FATAL,(_msg),(_arg1),(_arg2),(_arg3))
-#define NPT_LOG_FATAL_4(_msg,_arg1,_arg2,_arg3,_arg4) NPT_LOG_LL4((_NPT_LocalLogger),NPT_LOG_LEVEL_FATAL,(_msg),(_arg1),(_arg2),(_arg3),(_arg4))
-#define NPT_LOG_FATAL_L4(_logger,_msg,_arg1,_arg2,_arg3,_arg4) NPT_LOG_LL4((_logger),NPT_LOG_LEVEL_FATAL,(_msg),(_arg1),(_arg2),(_arg3),(_arg4))
-#define NPT_LOG_FATAL_5(_msg,_arg1,_arg2,_arg3,_arg4,_arg5) NPT_LOG_LL5((_NPT_LocalLogger),NPT_LOG_LEVEL_FATAL,(_msg),(_arg1),(_arg2),(_arg3),(_arg4),(_arg5))
-#define NPT_LOG_FATAL_L5(_logger,_msg,_arg1,_arg2,_arg3,_arg4,_arg5) NPT_LOG_LL5((_logger),NPT_LOG_LEVEL_FATAL,(_msg),(_arg1),(_arg2),(_arg3),(_arg4),(_arg5))
-#define NPT_LOG_FATAL_6(_msg,_arg1,_arg2,_arg3,_arg4,_arg5,_arg6) NPT_LOG_LL6((_NPT_LocalLogger),NPT_LOG_LEVEL_FATAL,(_msg),(_arg1),(_arg2),(_arg3),(_arg4),(_arg5),(_arg6))
-#define NPT_LOG_FATAL_L6(_logger,_msg,_arg1,_arg2,_arg3,_arg4,_arg5,_arg6) NPT_LOG_LL6((_logger),NPT_LOG_LEVEL_FATAL,(_msg),(_arg1),(_arg2),(_arg3),(_arg4),(_arg5),(_arg6))
-#define NPT_LOG_FATAL_7(_msg,_arg1,_arg2,_arg3,_arg4,_arg5,_arg6,_arg7) NPT_LOG_LL7((_NPT_LocalLogger),NPT_LOG_LEVEL_FATAL,(_msg),(_arg1),(_arg2),(_arg3),(_arg4),(_arg5),(_arg6),(_arg7))
-#define NPT_LOG_FATAL_L7(_logger,_msg,_arg1,_arg2,_arg3,_arg4,_arg5,_arg6,_arg7) NPT_LOG_LL7((_logger),NPT_LOG_LEVEL_FATAL,(_msg),(_arg1),(_arg2),(_arg3),(_arg4),(_arg5),(_arg6),(_arg7))
-#define NPT_LOG_FATAL_8(_msg,_arg1,_arg2,_arg3,_arg4,_arg5,_arg6,_arg7,_arg8) NPT_LOG_LL8((_NPT_LocalLogger),NPT_LOG_LEVEL_FATAL,(_msg),(_arg1),(_arg2),(_arg3),(_arg4),(_arg5),(_arg6),(_arg7),(_arg8))
-#define NPT_LOG_FATAL_L8(_logger,_msg,_arg1,_arg2,_arg3,_arg4,_arg5,_arg6,_arg7,_arg8) NPT_LOG_LL8((_logger),NPT_LOG_LEVEL_FATAL,(_msg),(_arg1),(_arg2),(_arg3),(_arg4),(_arg5),(_arg6),(_arg7),(_arg8))
-#define NPT_LOG_FATAL_9(_msg,_arg1,_arg2,_arg3,_arg4,_arg5,_arg6,_arg7,_arg8,_arg9) NPT_LOG_LL9((_NPT_LocalLogger),NPT_LOG_LEVEL_FATAL,(_msg),(_arg1),(_arg2),(_arg3),(_arg4),(_arg5),(_arg6),(_arg7),(_arg8),(_arg9))
-#define NPT_LOG_FATAL_L9(_logger,_msg,_arg1,_arg2,_arg3,_arg4,_arg5,_arg6,_arg7,_arg8,_arg9) NPT_LOG_LL9((_logger),NPT_LOG_LEVEL_FATAL,(_msg),(_arg1),(_arg2),(_arg3),(_arg4),(_arg5),(_arg6),(_arg7),(_arg8),(_arg9))
-#define NPT_LOG_SEVERE(_msg) NPT_LOG_LL((_NPT_LocalLogger),NPT_LOG_LEVEL_SEVERE,(_msg))
-#define NPT_LOG_SEVERE_L(_logger,_msg) NPT_LOG_LL((_logger),NPT_LOG_LEVEL_SEVERE,(_msg))
-#define NPT_LOG_SEVERE_1(_msg,_arg1) NPT_LOG_LL1((_NPT_LocalLogger),NPT_LOG_LEVEL_SEVERE,(_msg),(_arg1))
-#define NPT_LOG_SEVERE_L1(_logger,_msg,_arg1) NPT_LOG_LL1((_logger),NPT_LOG_LEVEL_SEVERE,(_msg),(_arg1))
-#define NPT_LOG_SEVERE_2(_msg,_arg1,_arg2) NPT_LOG_LL2((_NPT_LocalLogger),NPT_LOG_LEVEL_SEVERE,(_msg),(_arg1),(_arg2))
-#define NPT_LOG_SEVERE_L2(_logger,_msg,_arg1,_arg2) NPT_LOG_LL2((_logger),NPT_LOG_LEVEL_SEVERE,(_msg),(_arg1),(_arg2))
-#define NPT_LOG_SEVERE_3(_msg,_arg1,_arg2,_arg3) NPT_LOG_LL3((_NPT_LocalLogger),NPT_LOG_LEVEL_SEVERE,(_msg),(_arg1),(_arg2),(_arg3))
-#define NPT_LOG_SEVERE_L3(_logger,_msg,_arg1,_arg2,_arg3) NPT_LOG_LL3((_logger),NPT_LOG_LEVEL_SEVERE,(_msg),(_arg1),(_arg2),(_arg3))
-#define NPT_LOG_SEVERE_4(_msg,_arg1,_arg2,_arg3,_arg4) NPT_LOG_LL4((_NPT_LocalLogger),NPT_LOG_LEVEL_SEVERE,(_msg),(_arg1),(_arg2),(_arg3),(_arg4))
-#define NPT_LOG_SEVERE_L4(_logger,_msg,_arg1,_arg2,_arg3,_arg4) NPT_LOG_LL4((_logger),NPT_LOG_LEVEL_SEVERE,(_msg),(_arg1),(_arg2),(_arg3),(_arg4))
-#define NPT_LOG_SEVERE_5(_msg,_arg1,_arg2,_arg3,_arg4,_arg5) NPT_LOG_LL5((_NPT_LocalLogger),NPT_LOG_LEVEL_SEVERE,(_msg),(_arg1),(_arg2),(_arg3),(_arg4),(_arg5))
-#define NPT_LOG_SEVERE_L5(_logger,_msg,_arg1,_arg2,_arg3,_arg4,_arg5) NPT_LOG_LL5((_logger),NPT_LOG_LEVEL_SEVERE,(_msg),(_arg1),(_arg2),(_arg3),(_arg4),(_arg5))
-#define NPT_LOG_SEVERE_6(_msg,_arg1,_arg2,_arg3,_arg4,_arg5,_arg6) NPT_LOG_LL6((_NPT_LocalLogger),NPT_LOG_LEVEL_SEVERE,(_msg),(_arg1),(_arg2),(_arg3),(_arg4),(_arg5),(_arg6))
-#define NPT_LOG_SEVERE_L6(_logger,_msg,_arg1,_arg2,_arg3,_arg4,_arg5,_arg6) NPT_LOG_LL6((_logger),NPT_LOG_LEVEL_SEVERE,(_msg),(_arg1),(_arg2),(_arg3),(_arg4),(_arg5),(_arg6))
-#define NPT_LOG_SEVERE_7(_msg,_arg1,_arg2,_arg3,_arg4,_arg5,_arg6,_arg7) NPT_LOG_LL7((_NPT_LocalLogger),NPT_LOG_LEVEL_SEVERE,(_msg),(_arg1),(_arg2),(_arg3),(_arg4),(_arg5),(_arg6),(_arg7))
-#define NPT_LOG_SEVERE_L7(_logger,_msg,_arg1,_arg2,_arg3,_arg4,_arg5,_arg6,_arg7) NPT_LOG_LL7((_logger),NPT_LOG_LEVEL_SEVERE,(_msg),(_arg1),(_arg2),(_arg3),(_arg4),(_arg5),(_arg6),(_arg7))
-#define NPT_LOG_SEVERE_8(_msg,_arg1,_arg2,_arg3,_arg4,_arg5,_arg6,_arg7,_arg8) NPT_LOG_LL8((_NPT_LocalLogger),NPT_LOG_LEVEL_SEVERE,(_msg),(_arg1),(_arg2),(_arg3),(_arg4),(_arg5),(_arg6),(_arg7),(_arg8))
-#define NPT_LOG_SEVERE_L8(_logger,_msg,_arg1,_arg2,_arg3,_arg4,_arg5,_arg6,_arg7,_arg8) NPT_LOG_LL8((_logger),NPT_LOG_LEVEL_SEVERE,(_msg),(_arg1),(_arg2),(_arg3),(_arg4),(_arg5),(_arg6),(_arg7),(_arg8))
-#define NPT_LOG_SEVERE_9(_msg,_arg1,_arg2,_arg3,_arg4,_arg5,_arg6,_arg7,_arg8,_arg9) NPT_LOG_LL9((_NPT_LocalLogger),NPT_LOG_LEVEL_SEVERE,(_msg),(_arg1),(_arg2),(_arg3),(_arg4),(_arg5),(_arg6),(_arg7),(_arg8),(_arg9))
-#define NPT_LOG_SEVERE_L9(_logger,_msg,_arg1,_arg2,_arg3,_arg4,_arg5,_arg6,_arg7,_arg8,_arg9) NPT_LOG_LL9((_logger),NPT_LOG_LEVEL_SEVERE,(_msg),(_arg1),(_arg2),(_arg3),(_arg4),(_arg5),(_arg6),(_arg7),(_arg8),(_arg9))
-#define NPT_LOG_WARNING(_msg) NPT_LOG_LL((_NPT_LocalLogger),NPT_LOG_LEVEL_WARNING,(_msg))
-#define NPT_LOG_WARNING_L(_logger,_msg) NPT_LOG_LL((_logger),NPT_LOG_LEVEL_WARNING,(_msg))
-#define NPT_LOG_WARNING_1(_msg,_arg1) NPT_LOG_LL1((_NPT_LocalLogger),NPT_LOG_LEVEL_WARNING,(_msg),(_arg1))
-#define NPT_LOG_WARNING_L1(_logger,_msg,_arg1) NPT_LOG_LL1((_logger),NPT_LOG_LEVEL_WARNING,(_msg),(_arg1))
-#define NPT_LOG_WARNING_2(_msg,_arg1,_arg2) NPT_LOG_LL2((_NPT_LocalLogger),NPT_LOG_LEVEL_WARNING,(_msg),(_arg1),(_arg2))
-#define NPT_LOG_WARNING_L2(_logger,_msg,_arg1,_arg2) NPT_LOG_LL2((_logger),NPT_LOG_LEVEL_WARNING,(_msg),(_arg1),(_arg2))
-#define NPT_LOG_WARNING_3(_msg,_arg1,_arg2,_arg3) NPT_LOG_LL3((_NPT_LocalLogger),NPT_LOG_LEVEL_WARNING,(_msg),(_arg1),(_arg2),(_arg3))
-#define NPT_LOG_WARNING_L3(_logger,_msg,_arg1,_arg2,_arg3) NPT_LOG_LL3((_logger),NPT_LOG_LEVEL_WARNING,(_msg),(_arg1),(_arg2),(_arg3))
-#define NPT_LOG_WARNING_4(_msg,_arg1,_arg2,_arg3,_arg4) NPT_LOG_LL4((_NPT_LocalLogger),NPT_LOG_LEVEL_WARNING,(_msg),(_arg1),(_arg2),(_arg3),(_arg4))
-#define NPT_LOG_WARNING_L4(_logger,_msg,_arg1,_arg2,_arg3,_arg4) NPT_LOG_LL4((_logger),NPT_LOG_LEVEL_WARNING,(_msg),(_arg1),(_arg2),(_arg3),(_arg4))
-#define NPT_LOG_WARNING_5(_msg,_arg1,_arg2,_arg3,_arg4,_arg5) NPT_LOG_LL5((_NPT_LocalLogger),NPT_LOG_LEVEL_WARNING,(_msg),(_arg1),(_arg2),(_arg3),(_arg4),(_arg5))
-#define NPT_LOG_WARNING_L5(_logger,_msg,_arg1,_arg2,_arg3,_arg4,_arg5) NPT_LOG_LL5((_logger),NPT_LOG_LEVEL_WARNING,(_msg),(_arg1),(_arg2),(_arg3),(_arg4),(_arg5))
-#define NPT_LOG_WARNING_6(_msg,_arg1,_arg2,_arg3,_arg4,_arg5,_arg6) NPT_LOG_LL6((_NPT_LocalLogger),NPT_LOG_LEVEL_WARNING,(_msg),(_arg1),(_arg2),(_arg3),(_arg4),(_arg5),(_arg6))
-#define NPT_LOG_WARNING_L6(_logger,_msg,_arg1,_arg2,_arg3,_arg4,_arg5,_arg6) NPT_LOG_LL6((_logger),NPT_LOG_LEVEL_WARNING,(_msg),(_arg1),(_arg2),(_arg3),(_arg4),(_arg5),(_arg6))
-#define NPT_LOG_WARNING_7(_msg,_arg1,_arg2,_arg3,_arg4,_arg5,_arg6,_arg7) NPT_LOG_LL7((_NPT_LocalLogger),NPT_LOG_LEVEL_WARNING,(_msg),(_arg1),(_arg2),(_arg3),(_arg4),(_arg5),(_arg6),(_arg7))
-#define NPT_LOG_WARNING_L7(_logger,_msg,_arg1,_arg2,_arg3,_arg4,_arg5,_arg6,_arg7) NPT_LOG_LL7((_logger),NPT_LOG_LEVEL_WARNING,(_msg),(_arg1),(_arg2),(_arg3),(_arg4),(_arg5),(_arg6),(_arg7))
-#define NPT_LOG_WARNING_8(_msg,_arg1,_arg2,_arg3,_arg4,_arg5,_arg6,_arg7,_arg8) NPT_LOG_LL8((_NPT_LocalLogger),NPT_LOG_LEVEL_WARNING,(_msg),(_arg1),(_arg2),(_arg3),(_arg4),(_arg5),(_arg6),(_arg7),(_arg8))
-#define NPT_LOG_WARNING_L8(_logger,_msg,_arg1,_arg2,_arg3,_arg4,_arg5,_arg6,_arg7,_arg8) NPT_LOG_LL8((_logger),NPT_LOG_LEVEL_WARNING,(_msg),(_arg1),(_arg2),(_arg3),(_arg4),(_arg5),(_arg6),(_arg7),(_arg8))
-#define NPT_LOG_WARNING_9(_msg,_arg1,_arg2,_arg3,_arg4,_arg5,_arg6,_arg7,_arg8,_arg9) NPT_LOG_LL9((_NPT_LocalLogger),NPT_LOG_LEVEL_WARNING,(_msg),(_arg1),(_arg2),(_arg3),(_arg4),(_arg5),(_arg6),(_arg7),(_arg8),(_arg9))
-#define NPT_LOG_WARNING_L9(_logger,_msg,_arg1,_arg2,_arg3,_arg4,_arg5,_arg6,_arg7,_arg8,_arg9) NPT_LOG_LL9((_logger),NPT_LOG_LEVEL_WARNING,(_msg),(_arg1),(_arg2),(_arg3),(_arg4),(_arg5),(_arg6),(_arg7),(_arg8),(_arg9))
-#define NPT_LOG_INFO(_msg) NPT_LOG_LL((_NPT_LocalLogger),NPT_LOG_LEVEL_INFO,(_msg))
-#define NPT_LOG_INFO_L(_logger,_msg) NPT_LOG_LL((_logger),NPT_LOG_LEVEL_INFO,(_msg))
-#define NPT_LOG_INFO_1(_msg,_arg1) NPT_LOG_LL1((_NPT_LocalLogger),NPT_LOG_LEVEL_INFO,(_msg),(_arg1))
-#define NPT_LOG_INFO_L1(_logger,_msg,_arg1) NPT_LOG_LL1((_logger),NPT_LOG_LEVEL_INFO,(_msg),(_arg1))
-#define NPT_LOG_INFO_2(_msg,_arg1,_arg2) NPT_LOG_LL2((_NPT_LocalLogger),NPT_LOG_LEVEL_INFO,(_msg),(_arg1),(_arg2))
-#define NPT_LOG_INFO_L2(_logger,_msg,_arg1,_arg2) NPT_LOG_LL2((_logger),NPT_LOG_LEVEL_INFO,(_msg),(_arg1),(_arg2))
-#define NPT_LOG_INFO_3(_msg,_arg1,_arg2,_arg3) NPT_LOG_LL3((_NPT_LocalLogger),NPT_LOG_LEVEL_INFO,(_msg),(_arg1),(_arg2),(_arg3))
-#define NPT_LOG_INFO_L3(_logger,_msg,_arg1,_arg2,_arg3) NPT_LOG_LL3((_logger),NPT_LOG_LEVEL_INFO,(_msg),(_arg1),(_arg2),(_arg3))
-#define NPT_LOG_INFO_4(_msg,_arg1,_arg2,_arg3,_arg4) NPT_LOG_LL4((_NPT_LocalLogger),NPT_LOG_LEVEL_INFO,(_msg),(_arg1),(_arg2),(_arg3),(_arg4))
-#define NPT_LOG_INFO_L4(_logger,_msg,_arg1,_arg2,_arg3,_arg4) NPT_LOG_LL4((_logger),NPT_LOG_LEVEL_INFO,(_msg),(_arg1),(_arg2),(_arg3),(_arg4))
-#define NPT_LOG_INFO_5(_msg,_arg1,_arg2,_arg3,_arg4,_arg5) NPT_LOG_LL5((_NPT_LocalLogger),NPT_LOG_LEVEL_INFO,(_msg),(_arg1),(_arg2),(_arg3),(_arg4),(_arg5))
-#define NPT_LOG_INFO_L5(_logger,_msg,_arg1,_arg2,_arg3,_arg4,_arg5) NPT_LOG_LL5((_logger),NPT_LOG_LEVEL_INFO,(_msg),(_arg1),(_arg2),(_arg3),(_arg4),(_arg5))
-#define NPT_LOG_INFO_6(_msg,_arg1,_arg2,_arg3,_arg4,_arg5,_arg6) NPT_LOG_LL6((_NPT_LocalLogger),NPT_LOG_LEVEL_INFO,(_msg),(_arg1),(_arg2),(_arg3),(_arg4),(_arg5),(_arg6))
-#define NPT_LOG_INFO_L6(_logger,_msg,_arg1,_arg2,_arg3,_arg4,_arg5,_arg6) NPT_LOG_LL6((_logger),NPT_LOG_LEVEL_INFO,(_msg),(_arg1),(_arg2),(_arg3),(_arg4),(_arg5),(_arg6))
-#define NPT_LOG_INFO_7(_msg,_arg1,_arg2,_arg3,_arg4,_arg5,_arg6,_arg7) NPT_LOG_LL7((_NPT_LocalLogger),NPT_LOG_LEVEL_INFO,(_msg),(_arg1),(_arg2),(_arg3),(_arg4),(_arg5),(_arg6),(_arg7))
-#define NPT_LOG_INFO_L7(_logger,_msg,_arg1,_arg2,_arg3,_arg4,_arg5,_arg6,_arg7) NPT_LOG_LL7((_logger),NPT_LOG_LEVEL_INFO,(_msg),(_arg1),(_arg2),(_arg3),(_arg4),(_arg5),(_arg6),(_arg7))
-#define NPT_LOG_INFO_8(_msg,_arg1,_arg2,_arg3,_arg4,_arg5,_arg6,_arg7,_arg8) NPT_LOG_LL8((_NPT_LocalLogger),NPT_LOG_LEVEL_INFO,(_msg),(_arg1),(_arg2),(_arg3),(_arg4),(_arg5),(_arg6),(_arg7),(_arg8))
-#define NPT_LOG_INFO_L8(_logger,_msg,_arg1,_arg2,_arg3,_arg4,_arg5,_arg6,_arg7,_arg8) NPT_LOG_LL8((_logger),NPT_LOG_LEVEL_INFO,(_msg),(_arg1),(_arg2),(_arg3),(_arg4),(_arg5),(_arg6),(_arg7),(_arg8))
-#define NPT_LOG_INFO_9(_msg,_arg1,_arg2,_arg3,_arg4,_arg5,_arg6,_arg7,_arg8,_arg9) NPT_LOG_LL9((_NPT_LocalLogger),NPT_LOG_LEVEL_INFO,(_msg),(_arg1),(_arg2),(_arg3),(_arg4),(_arg5),(_arg6),(_arg7),(_arg8),(_arg9))
-#define NPT_LOG_INFO_L9(_logger,_msg,_arg1,_arg2,_arg3,_arg4,_arg5,_arg6,_arg7,_arg8,_arg9) NPT_LOG_LL9((_logger),NPT_LOG_LEVEL_INFO,(_msg),(_arg1),(_arg2),(_arg3),(_arg4),(_arg5),(_arg6),(_arg7),(_arg8),(_arg9))
-#define NPT_LOG_FINE(_msg) NPT_LOG_LL((_NPT_LocalLogger),NPT_LOG_LEVEL_FINE,(_msg))
-#define NPT_LOG_FINE_L(_logger,_msg) NPT_LOG_LL((_logger),NPT_LOG_LEVEL_FINE,(_msg))
-#define NPT_LOG_FINE_1(_msg,_arg1) NPT_LOG_LL1((_NPT_LocalLogger),NPT_LOG_LEVEL_FINE,(_msg),(_arg1))
-#define NPT_LOG_FINE_L1(_logger,_msg,_arg1) NPT_LOG_LL1((_logger),NPT_LOG_LEVEL_FINE,(_msg),(_arg1))
-#define NPT_LOG_FINE_2(_msg,_arg1,_arg2) NPT_LOG_LL2((_NPT_LocalLogger),NPT_LOG_LEVEL_FINE,(_msg),(_arg1),(_arg2))
-#define NPT_LOG_FINE_L2(_logger,_msg,_arg1,_arg2) NPT_LOG_LL2((_logger),NPT_LOG_LEVEL_FINE,(_msg),(_arg1),(_arg2))
-#define NPT_LOG_FINE_3(_msg,_arg1,_arg2,_arg3) NPT_LOG_LL3((_NPT_LocalLogger),NPT_LOG_LEVEL_FINE,(_msg),(_arg1),(_arg2),(_arg3))
-#define NPT_LOG_FINE_L3(_logger,_msg,_arg1,_arg2,_arg3) NPT_LOG_LL3((_logger),NPT_LOG_LEVEL_FINE,(_msg),(_arg1),(_arg2),(_arg3))
-#define NPT_LOG_FINE_4(_msg,_arg1,_arg2,_arg3,_arg4) NPT_LOG_LL4((_NPT_LocalLogger),NPT_LOG_LEVEL_FINE,(_msg),(_arg1),(_arg2),(_arg3),(_arg4))
-#define NPT_LOG_FINE_L4(_logger,_msg,_arg1,_arg2,_arg3,_arg4) NPT_LOG_LL4((_logger),NPT_LOG_LEVEL_FINE,(_msg),(_arg1),(_arg2),(_arg3),(_arg4))
-#define NPT_LOG_FINE_5(_msg,_arg1,_arg2,_arg3,_arg4,_arg5) NPT_LOG_LL5((_NPT_LocalLogger),NPT_LOG_LEVEL_FINE,(_msg),(_arg1),(_arg2),(_arg3),(_arg4),(_arg5))
-#define NPT_LOG_FINE_L5(_logger,_msg,_arg1,_arg2,_arg3,_arg4,_arg5) NPT_LOG_LL5((_logger),NPT_LOG_LEVEL_FINE,(_msg),(_arg1),(_arg2),(_arg3),(_arg4),(_arg5))
-#define NPT_LOG_FINE_6(_msg,_arg1,_arg2,_arg3,_arg4,_arg5,_arg6) NPT_LOG_LL6((_NPT_LocalLogger),NPT_LOG_LEVEL_FINE,(_msg),(_arg1),(_arg2),(_arg3),(_arg4),(_arg5),(_arg6))
-#define NPT_LOG_FINE_L6(_logger,_msg,_arg1,_arg2,_arg3,_arg4,_arg5,_arg6) NPT_LOG_LL6((_logger),NPT_LOG_LEVEL_FINE,(_msg),(_arg1),(_arg2),(_arg3),(_arg4),(_arg5),(_arg6))
-#define NPT_LOG_FINE_7(_msg,_arg1,_arg2,_arg3,_arg4,_arg5,_arg6,_arg7) NPT_LOG_LL7((_NPT_LocalLogger),NPT_LOG_LEVEL_FINE,(_msg),(_arg1),(_arg2),(_arg3),(_arg4),(_arg5),(_arg6),(_arg7))
-#define NPT_LOG_FINE_L7(_logger,_msg,_arg1,_arg2,_arg3,_arg4,_arg5,_arg6,_arg7) NPT_LOG_LL7((_logger),NPT_LOG_LEVEL_FINE,(_msg),(_arg1),(_arg2),(_arg3),(_arg4),(_arg5),(_arg6),(_arg7))
-#define NPT_LOG_FINE_8(_msg,_arg1,_arg2,_arg3,_arg4,_arg5,_arg6,_arg7,_arg8) NPT_LOG_LL8((_NPT_LocalLogger),NPT_LOG_LEVEL_FINE,(_msg),(_arg1),(_arg2),(_arg3),(_arg4),(_arg5),(_arg6),(_arg7),(_arg8))
-#define NPT_LOG_FINE_L8(_logger,_msg,_arg1,_arg2,_arg3,_arg4,_arg5,_arg6,_arg7,_arg8) NPT_LOG_LL8((_logger),NPT_LOG_LEVEL_FINE,(_msg),(_arg1),(_arg2),(_arg3),(_arg4),(_arg5),(_arg6),(_arg7),(_arg8))
-#define NPT_LOG_FINE_9(_msg,_arg1,_arg2,_arg3,_arg4,_arg5,_arg6,_arg7,_arg8,_arg9) NPT_LOG_LL9((_NPT_LocalLogger),NPT_LOG_LEVEL_FINE,(_msg),(_arg1),(_arg2),(_arg3),(_arg4),(_arg5),(_arg6),(_arg7),(_arg8),(_arg9))
-#define NPT_LOG_FINE_L9(_logger,_msg,_arg1,_arg2,_arg3,_arg4,_arg5,_arg6,_arg7,_arg8,_arg9) NPT_LOG_LL9((_logger),NPT_LOG_LEVEL_FINE,(_msg),(_arg1),(_arg2),(_arg3),(_arg4),(_arg5),(_arg6),(_arg7),(_arg8),(_arg9))
-#define NPT_LOG_FINER(_msg) NPT_LOG_LL((_NPT_LocalLogger),NPT_LOG_LEVEL_FINER,(_msg))
-#define NPT_LOG_FINER_L(_logger,_msg) NPT_LOG_LL((_logger),NPT_LOG_LEVEL_FINER,(_msg))
-#define NPT_LOG_FINER_1(_msg,_arg1) NPT_LOG_LL1((_NPT_LocalLogger),NPT_LOG_LEVEL_FINER,(_msg),(_arg1))
-#define NPT_LOG_FINER_L1(_logger,_msg,_arg1) NPT_LOG_LL1((_logger),NPT_LOG_LEVEL_FINER,(_msg),(_arg1))
-#define NPT_LOG_FINER_2(_msg,_arg1,_arg2) NPT_LOG_LL2((_NPT_LocalLogger),NPT_LOG_LEVEL_FINER,(_msg),(_arg1),(_arg2))
-#define NPT_LOG_FINER_L2(_logger,_msg,_arg1,_arg2) NPT_LOG_LL2((_logger),NPT_LOG_LEVEL_FINER,(_msg),(_arg1),(_arg2))
-#define NPT_LOG_FINER_3(_msg,_arg1,_arg2,_arg3) NPT_LOG_LL3((_NPT_LocalLogger),NPT_LOG_LEVEL_FINER,(_msg),(_arg1),(_arg2),(_arg3))
-#define NPT_LOG_FINER_L3(_logger,_msg,_arg1,_arg2,_arg3) NPT_LOG_LL3((_logger),NPT_LOG_LEVEL_FINER,(_msg),(_arg1),(_arg2),(_arg3))
-#define NPT_LOG_FINER_4(_msg,_arg1,_arg2,_arg3,_arg4) NPT_LOG_LL4((_NPT_LocalLogger),NPT_LOG_LEVEL_FINER,(_msg),(_arg1),(_arg2),(_arg3),(_arg4))
-#define NPT_LOG_FINER_L4(_logger,_msg,_arg1,_arg2,_arg3,_arg4) NPT_LOG_LL4((_logger),NPT_LOG_LEVEL_FINER,(_msg),(_arg1),(_arg2),(_arg3),(_arg4))
-#define NPT_LOG_FINER_5(_msg,_arg1,_arg2,_arg3,_arg4,_arg5) NPT_LOG_LL5((_NPT_LocalLogger),NPT_LOG_LEVEL_FINER,(_msg),(_arg1),(_arg2),(_arg3),(_arg4),(_arg5))
-#define NPT_LOG_FINER_L5(_logger,_msg,_arg1,_arg2,_arg3,_arg4,_arg5) NPT_LOG_LL5((_logger),NPT_LOG_LEVEL_FINER,(_msg),(_arg1),(_arg2),(_arg3),(_arg4),(_arg5))
-#define NPT_LOG_FINER_6(_msg,_arg1,_arg2,_arg3,_arg4,_arg5,_arg6) NPT_LOG_LL6((_NPT_LocalLogger),NPT_LOG_LEVEL_FINER,(_msg),(_arg1),(_arg2),(_arg3),(_arg4),(_arg5),(_arg6))
-#define NPT_LOG_FINER_L6(_logger,_msg,_arg1,_arg2,_arg3,_arg4,_arg5,_arg6) NPT_LOG_LL6((_logger),NPT_LOG_LEVEL_FINER,(_msg),(_arg1),(_arg2),(_arg3),(_arg4),(_arg5),(_arg6))
-#define NPT_LOG_FINER_7(_msg,_arg1,_arg2,_arg3,_arg4,_arg5,_arg6,_arg7) NPT_LOG_LL7((_NPT_LocalLogger),NPT_LOG_LEVEL_FINER,(_msg),(_arg1),(_arg2),(_arg3),(_arg4),(_arg5),(_arg6),(_arg7))
-#define NPT_LOG_FINER_L7(_logger,_msg,_arg1,_arg2,_arg3,_arg4,_arg5,_arg6,_arg7) NPT_LOG_LL7((_logger),NPT_LOG_LEVEL_FINER,(_msg),(_arg1),(_arg2),(_arg3),(_arg4),(_arg5),(_arg6),(_arg7))
-#define NPT_LOG_FINER_8(_msg,_arg1,_arg2,_arg3,_arg4,_arg5,_arg6,_arg7,_arg8) NPT_LOG_LL8((_NPT_LocalLogger),NPT_LOG_LEVEL_FINER,(_msg),(_arg1),(_arg2),(_arg3),(_arg4),(_arg5),(_arg6),(_arg7),(_arg8))
-#define NPT_LOG_FINER_L8(_logger,_msg,_arg1,_arg2,_arg3,_arg4,_arg5,_arg6,_arg7,_arg8) NPT_LOG_LL8((_logger),NPT_LOG_LEVEL_FINER,(_msg),(_arg1),(_arg2),(_arg3),(_arg4),(_arg5),(_arg6),(_arg7),(_arg8))
-#define NPT_LOG_FINER_9(_msg,_arg1,_arg2,_arg3,_arg4,_arg5,_arg6,_arg7,_arg8,_arg9) NPT_LOG_LL9((_NPT_LocalLogger),NPT_LOG_LEVEL_FINER,(_msg),(_arg1),(_arg2),(_arg3),(_arg4),(_arg5),(_arg6),(_arg7),(_arg8),(_arg9))
-#define NPT_LOG_FINER_L9(_logger,_msg,_arg1,_arg2,_arg3,_arg4,_arg5,_arg6,_arg7,_arg8,_arg9) NPT_LOG_LL9((_logger),NPT_LOG_LEVEL_FINER,(_msg),(_arg1),(_arg2),(_arg3),(_arg4),(_arg5),(_arg6),(_arg7),(_arg8),(_arg9))
-#define NPT_LOG_FINEST(_msg) NPT_LOG_LL((_NPT_LocalLogger),NPT_LOG_LEVEL_FINEST,(_msg))
-#define NPT_LOG_FINEST_L(_logger,_msg) NPT_LOG_LL((_logger),NPT_LOG_LEVEL_FINEST,(_msg))
-#define NPT_LOG_FINEST_1(_msg,_arg1) NPT_LOG_LL1((_NPT_LocalLogger),NPT_LOG_LEVEL_FINEST,(_msg),(_arg1))
-#define NPT_LOG_FINEST_L1(_logger,_msg,_arg1) NPT_LOG_LL1((_logger),NPT_LOG_LEVEL_FINEST,(_msg),(_arg1))
-#define NPT_LOG_FINEST_2(_msg,_arg1,_arg2) NPT_LOG_LL2((_NPT_LocalLogger),NPT_LOG_LEVEL_FINEST,(_msg),(_arg1),(_arg2))
-#define NPT_LOG_FINEST_L2(_logger,_msg,_arg1,_arg2) NPT_LOG_LL2((_logger),NPT_LOG_LEVEL_FINEST,(_msg),(_arg1),(_arg2))
-#define NPT_LOG_FINEST_3(_msg,_arg1,_arg2,_arg3) NPT_LOG_LL3((_NPT_LocalLogger),NPT_LOG_LEVEL_FINEST,(_msg),(_arg1),(_arg2),(_arg3))
-#define NPT_LOG_FINEST_L3(_logger,_msg,_arg1,_arg2,_arg3) NPT_LOG_LL3((_logger),NPT_LOG_LEVEL_FINEST,(_msg),(_arg1),(_arg2),(_arg3))
-#define NPT_LOG_FINEST_4(_msg,_arg1,_arg2,_arg3,_arg4) NPT_LOG_LL4((_NPT_LocalLogger),NPT_LOG_LEVEL_FINEST,(_msg),(_arg1),(_arg2),(_arg3),(_arg4))
-#define NPT_LOG_FINEST_L4(_logger,_msg,_arg1,_arg2,_arg3,_arg4) NPT_LOG_LL4((_logger),NPT_LOG_LEVEL_FINEST,(_msg),(_arg1),(_arg2),(_arg3),(_arg4))
-#define NPT_LOG_FINEST_5(_msg,_arg1,_arg2,_arg3,_arg4,_arg5) NPT_LOG_LL5((_NPT_LocalLogger),NPT_LOG_LEVEL_FINEST,(_msg),(_arg1),(_arg2),(_arg3),(_arg4),(_arg5))
-#define NPT_LOG_FINEST_L5(_logger,_msg,_arg1,_arg2,_arg3,_arg4,_arg5) NPT_LOG_LL5((_logger),NPT_LOG_LEVEL_FINEST,(_msg),(_arg1),(_arg2),(_arg3),(_arg4),(_arg5))
-#define NPT_LOG_FINEST_6(_msg,_arg1,_arg2,_arg3,_arg4,_arg5,_arg6) NPT_LOG_LL6((_NPT_LocalLogger),NPT_LOG_LEVEL_FINEST,(_msg),(_arg1),(_arg2),(_arg3),(_arg4),(_arg5),(_arg6))
-#define NPT_LOG_FINEST_L6(_logger,_msg,_arg1,_arg2,_arg3,_arg4,_arg5,_arg6) NPT_LOG_LL6((_logger),NPT_LOG_LEVEL_FINEST,(_msg),(_arg1),(_arg2),(_arg3),(_arg4),(_arg5),(_arg6))
-#define NPT_LOG_FINEST_7(_msg,_arg1,_arg2,_arg3,_arg4,_arg5,_arg6,_arg7) NPT_LOG_LL7((_NPT_LocalLogger),NPT_LOG_LEVEL_FINEST,(_msg),(_arg1),(_arg2),(_arg3),(_arg4),(_arg5),(_arg6),(_arg7))
-#define NPT_LOG_FINEST_L7(_logger,_msg,_arg1,_arg2,_arg3,_arg4,_arg5,_arg6,_arg7) NPT_LOG_LL7((_logger),NPT_LOG_LEVEL_FINEST,(_msg),(_arg1),(_arg2),(_arg3),(_arg4),(_arg5),(_arg6),(_arg7))
-#define NPT_LOG_FINEST_8(_msg,_arg1,_arg2,_arg3,_arg4,_arg5,_arg6,_arg7,_arg8) NPT_LOG_LL8((_NPT_LocalLogger),NPT_LOG_LEVEL_FINEST,(_msg),(_arg1),(_arg2),(_arg3),(_arg4),(_arg5),(_arg6),(_arg7),(_arg8))
-#define NPT_LOG_FINEST_L8(_logger,_msg,_arg1,_arg2,_arg3,_arg4,_arg5,_arg6,_arg7,_arg8) NPT_LOG_LL8((_logger),NPT_LOG_LEVEL_FINEST,(_msg),(_arg1),(_arg2),(_arg3),(_arg4),(_arg5),(_arg6),(_arg7),(_arg8))
-#define NPT_LOG_FINEST_9(_msg,_arg1,_arg2,_arg3,_arg4,_arg5,_arg6,_arg7,_arg8,_arg9) NPT_LOG_LL9((_NPT_LocalLogger),NPT_LOG_LEVEL_FINEST,(_msg),(_arg1),(_arg2),(_arg3),(_arg4),(_arg5),(_arg6),(_arg7),(_arg8),(_arg9))
-#define NPT_LOG_FINEST_L9(_logger,_msg,_arg1,_arg2,_arg3,_arg4,_arg5,_arg6,_arg7,_arg8,_arg9) NPT_LOG_LL9((_logger),NPT_LOG_LEVEL_FINEST,(_msg),(_arg1),(_arg2),(_arg3),(_arg4),(_arg5),(_arg6),(_arg7),(_arg8),(_arg9))
-
-#define NPT_CHECK_FATAL(_result) NPT_CHECK_LL((_NPT_LocalLogger),NPT_LOG_LEVEL_FATAL,(_result))
-#define NPT_CHECK_FATAL_L(_logger,_result) NPT_CHECK_LL((_logger),NPT_LOG_LEVEL_FATAL,(_result))
-#define NPT_CHECK_SEVERE(_result) NPT_CHECK_LL((_NPT_LocalLogger),NPT_LOG_LEVEL_SEVERE,(_result))
-#define NPT_CHECK_SEVERE_L(_logger,_result) NPT_CHECK_LL((_logger),NPT_LOG_LEVEL_SEVERE,(_result))
-#define NPT_CHECK_WARNING(_result) NPT_CHECK_LL((_NPT_LocalLogger),NPT_LOG_LEVEL_WARNING,(_result))
-#define NPT_CHECK_WARNING_L(_logger,_result) NPT_CHECK_LL((_logger),NPT_LOG_LEVEL_WARNING,(_result))
-#define NPT_CHECK_INFO(_result) NPT_CHECK_LL((_NPT_LocalLogger),NPT_LOG_LEVEL_INFO,(_result))
-#define NPT_CHECK_INFO_L(_logger,_result) NPT_CHECK_LL((_logger),NPT_LOG_LEVEL_INFO,(_result))
-#define NPT_CHECK_FINE(_result) NPT_CHECK_LL((_NPT_LocalLogger),NPT_LOG_LEVEL_FINE,(_result))
-#define NPT_CHECK_FINE_L(_logger,_result) NPT_CHECK_LL((_logger),NPT_LOG_LEVEL_FINE,(_result))
-#define NPT_CHECK_FINER(_result) NPT_CHECK_LL((_NPT_LocalLogger),NPT_LOG_LEVEL_FINER,(_result))
-#define NPT_CHECK_FINER_L(_logger,_result) NPT_CHECK_LL((_logger),NPT_LOG_LEVEL_FINER,(_result))
-#define NPT_CHECK_FINEST(_result) NPT_CHECK_LL((_NPT_LocalLogger),NPT_LOG_LEVEL_FINEST,(_result))
-#define NPT_CHECK_FINEST_L(_logger,_result) NPT_CHECK_LL((_logger),NPT_LOG_LEVEL_FINEST,(_result))
-
-#define NPT_CHECK_LABEL_FATAL(_result,_label) NPT_CHECK_LABEL_LL((_NPT_LocalLogger),NPT_LOG_LEVEL_FATAL,(_result),_label)
-#define NPT_CHECK_LABEL_FATAL_L(_logger,_result,_label) NPT_CHECK_LABEL_LL((_logger),NPT_LOG_LEVEL_FATAL,(_result),_label)
-#define NPT_CHECK_LABEL_SEVERE(_result,_label) NPT_CHECK_LABEL_LL((_NPT_LocalLogger),NPT_LOG_LEVEL_SEVERE,(_result),_label)
-#define NPT_CHECK_LABEL_SEVERE_L(_logger,_result,_label) NPT_CHECK_LABEL_LL((_logger),NPT_LOG_LEVEL_SEVERE,(_result),_label)
-#define NPT_CHECK_LABEL_WARNING(_result,_label) NPT_CHECK_LABEL_LL((_NPT_LocalLogger),NPT_LOG_LEVEL_WARNING,(_result),_label)
-#define NPT_CHECK_LABEL_WARNING_L(_logger,_result,_label) NPT_CHECK_LABEL_LL((_logger),NPT_LOG_LEVEL_WARNING,(_result),_label)
-#define NPT_CHECK_LABEL_INFO(_result,_label) NPT_CHECK_LABEL_LL((_NPT_LocalLogger),NPT_LOG_LEVEL_INFO,(_result),_label)
-#define NPT_CHECK_LABEL_INFO_L(_logger,_result,_label) NPT_CHECK_LABEL_LL((_logger),NPT_LOG_LEVEL_INFO,(_result),_label)
-#define NPT_CHECK_LABEL_FINE(_result,_label) NPT_CHECK_LABEL_LL((_NPT_LocalLogger),NPT_LOG_LEVEL_FINE,(_result),_label)
-#define NPT_CHECK_LABEL_FINE_L(_logger,_result,_label) NPT_CHECK_LABEL_LL((_logger),NPT_LOG_LEVEL_FINE,(_result),_label)
-#define NPT_CHECK_LABEL_FINER(_result,_label) NPT_CHECK_LABEL_LL((_NPT_LocalLogger),NPT_LOG_LEVEL_FINER,(_result),_label)
-#define NPT_CHECK_LABEL_FINER_L(_logger,_result,_label) NPT_CHECK_LABEL_LL((_logger),NPT_LOG_LEVEL_FINER,(_result),_label)
-#define NPT_CHECK_LABEL_FINEST(_result,_label) NPT_CHECK_LABEL_LL((_NPT_LocalLogger),NPT_LOG_LEVEL_FINEST,(_result),_label)
-#define NPT_CHECK_LABEL_FINEST_L(_logger,_result,_label) NPT_CHECK_LABEL_LL((_logger),NPT_LOG_LEVEL_FINEST,(_result),_label)
-
-#define NPT_CHECK_POINTER_FATAL(_p) NPT_CHECK_POINTER_LL((_NPT_LocalLogger),NPT_LOG_LEVEL_FATAL,(_p))
-#define NPT_CHECK_POINTER_FATAL_L(_logger,_p) NPT_CHECK_POINTER_LL(_logger,NPT_LOG_LEVEL_FATAL,(_p))
-#define NPT_CHECK_POINTER_SEVERE(_p) NPT_CHECK_POINTER_LL((_NPT_LocalLogger),NPT_LOG_LEVEL_SEVERE,(_p))
-#define NPT_CHECK_POINTER_SEVERE_L(_logger,_p) NPT_CHECK_POINTER_LL(_logger,NPT_LOG_LEVEL_SEVERE,(_p))
-#define NPT_CHECK_POINTER_WARNING(_p) NPT_CHECK_POINTER_LL((_NPT_LocalLogger),NPT_LOG_LEVEL_WARNING,(_p))
-#define NPT_CHECK_POINTER_WARNING_L(_logger,_p) NPT_CHECK_POINTER_LL(_logger,NPT_LOG_LEVEL_WARNING,(_p))
-#define NPT_CHECK_POINTER_INFO(_p) NPT_CHECK_POINTER_LL((_NPT_LocalLogger),NPT_LOG_LEVEL_INFO,(_p))
-#define NPT_CHECK_POINTER_INFO_L(_logger,_p) NPT_CHECK_POINTER_LL(_logger,NPT_LOG_LEVEL_INFO,(_p))
-#define NPT_CHECK_POINTER_FINE(_p) NPT_CHECK_POINTER_LL((_NPT_LocalLogger),NPT_LOG_LEVEL_FINE,(_p))
-#define NPT_CHECK_POINTER_FINE_L(_logger,_p) NPT_CHECK_POINTER_LL(_logger,NPT_LOG_LEVEL_FINE,(_p))
-#define NPT_CHECK_POINTER_FINER(_p) NPT_CHECK_POINTER_LL((_NPT_LocalLogger),NPT_LOG_LEVEL_FINER,(_p))
-#define NPT_CHECK_POINTER_FINER_L(_logger,_p) NPT_CHECK_POINTER_LL(_logger,NPT_LOG_LEVEL_FINER,(_p))
-#define NPT_CHECK_POINTER_FINEST(_p) NPT_CHECK_POINTER_LL((_NPT_LocalLogger),NPT_LOG_LEVEL_FINEST,(_p))
-#define NPT_CHECK_POINTER_FINEST_L(_logger,_p) NPT_CHECK_POINTER_LL(_logger,NPT_LOG_LEVEL_FINEST,(_p))
-
-#define NPT_CHECK_POINTER_LABEL_FATAL(_p,_label) NPT_CHECK_POINTER_LABEL_LL((_NPT_LocalLogger),NPT_LOG_LEVEL_FATAL,(_p),_label)
-#define NPT_CHECK_POINTER_LABEL_FATAL_L(_logger,_p,_label) NPT_CHECK_POINTER_LABEL_LL(_logger,NPT_LOG_LEVEL_FATAL,(_p),_label)
-#define NPT_CHECK_POINTER_LABEL_SEVERE(_p,_label) NPT_CHECK_POINTER_LABEL_LL((_NPT_LocalLogger),NPT_LOG_LEVEL_SEVERE,(_p),_label)
-#define NPT_CHECK_POINTER_LABEL_SEVERE_L(_logger,_p,_label) NPT_CHECK_POINTER_LABEL_LL(_logger,NPT_LOG_LEVEL_SEVERE,(_p),_label)
-#define NPT_CHECK_POINTER_LABEL_WARNING(_p,_label) NPT_CHECK_POINTER_LABEL_LL((_NPT_LocalLogger),NPT_LOG_LEVEL_WARNING,(_p),_label)
-#define NPT_CHECK_POINTER_LABEL_WARNING_L(_logger,_p,_label) NPT_CHECK_POINTER_LABEL_LL(_logger,NPT_LOG_LEVEL_WARNING,(_p),_label)
-#define NPT_CHECK_POINTER_LABEL_INFO(_p,_label) NPT_CHECK_POINTER_LABEL_LL((_NPT_LocalLogger),NPT_LOG_LEVEL_INFO,(_p),_label)
-#define NPT_CHECK_POINTER_LABEL_INFO_L(_logger,_p,_label) NPT_CHECK_POINTER_LABEL_LL(_logger,NPT_LOG_LEVEL_INFO,(_p),_label)
-#define NPT_CHECK_POINTER_LABEL_FINE(_p, _label) NPT_CHECK_POINTER_LABEL_LL((_NPT_LocalLogger),NPT_LOG_LEVEL_FINE,(_p),_label)
-#define NPT_CHECK_POINTER_LABEL_FINE_L(_logger,_p,_label) NPT_CHECK_POINTER_LABEL_LL(_logger,NPT_LOG_LEVEL_FINE,(_p),_label)
-#define NPT_CHECK_POINTER_LABEL_FINER(_p,_label) NPT_CHECK_POINTER_LABEL_LL((_NPT_LocalLogger),NPT_LOG_LEVEL_FINER,(_p),_label)
-#define NPT_CHECK_POINTER_LABEL_FINER_L(_logger,_p,_label) NPT_CHECK_POINTER_LABEL_LL(_logger,NPT_LOG_LEVEL_FINER,(_p),_label)
-#define NPT_CHECK_POINTER_LABEL_FINEST(_p,_label) NNPT_CHECK_POINTER_LABEL_LL((_NPT_LocalLogger),NPT_LOG_LEVEL_FINEST,(_p),_label)
-#define NPT_CHECK_POINTER_LABEL_FINEST_L(_logger,_p,_label) NPT_CHECK_POINTER_LABEL_LL(_logger,NPT_LOG_LEVEL_FINEST,(_p),_label)
-
-#endif /* _NPT_LOGGING_H_ */

gpac-2.2.1.tar.gz/extra_lib/include/platinum/NptMap.h Deleted

@@ -1,807 +0,0 @@
-/*****************************************************************
-|
-|   Neptune - Maps
-|
-| Copyright (c) 2002-2008, Axiomatic Systems, LLC.
-| All rights reserved.
-|
-| Redistribution and use in source and binary forms, with or without
-| modification, are permitted provided that the following conditions are met:
-|     * Redistributions of source code must retain the above copyright
-|       notice, this list of conditions and the following disclaimer.
-|     * Redistributions in binary form must reproduce the above copyright
-|       notice, this list of conditions and the following disclaimer in the
-|       documentation and/or other materials provided with the distribution.
-|     * Neither the name of Axiomatic Systems nor the
-|       names of its contributors may be used to endorse or promote products
-|       derived from this software without specific prior written permission.
-|
-| THIS SOFTWARE IS PROVIDED BY AXIOMATIC SYSTEMS ''AS IS'' AND ANY
-| EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-| WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-| DISCLAIMED. IN NO EVENT SHALL AXIOMATIC SYSTEMS BE LIABLE FOR ANY
-| DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-| (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-| LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-| ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-| (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-| SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-|
-****************************************************************/
-
-#ifndef _NPT_MAP_H_
-#define _NPT_MAP_H_
-
-/*----------------------------------------------------------------------
-|   includes
-+---------------------------------------------------------------------*/
-#include "NptTypes.h"
-#include "NptResults.h"
-#include "NptList.h"
-#include "NptHash.h"
-
-/*----------------------------------------------------------------------
-|   NPT_Map
-+---------------------------------------------------------------------*/
-template <typename K, typename V> 
-class NPT_Map 
-{
-public:
-    // types
-    class Entry {
-    public:
-        // constructor
-        Entry(const K& key, const V& value) : m_Key(key), m_Value(value) {}
-        Entry(const K& key) : m_Key(key) {}
-        
-        // accessors
-        const K& GetKey()   const { return m_Key;   }
-        const V& GetValue() const { return m_Value; }
-
-        // operators 
-        bool operator==(const Entry& other) const {
-            return m_Key == other.m_Key && m_Value == other.m_Value;
-        }
-
-    protected:
-        // methods
-        void SetValue(const V& value) { m_Value = value; }
-
-        // members
-        K m_Key;
-        V m_Value;
-
-        // friends
-        friend class NPT_Map<K,V>;
-    };
-
-    // constructors
-    NPT_Map<K,V>() {}
-    NPT_Map<K,V>(const NPT_Map<K,V>& copy);
-
-    // destructor
-    ~NPT_Map<K,V>();
-
-    // methods
-    NPT_Result   Put(const K& key, const V& value);
-    NPT_Result   Get(const K& key, V*& value) const; // WARNING: the second parameter is a POINTER on the value type!!!
-    bool         HasKey(const K& key) const { return GetEntry(key) != NULL; }
-    bool         HasValue(const V& value) const;
-    NPT_Result   Erase(const K& key);
-    NPT_Cardinal GetEntryCount() const         { return m_Entries.GetItemCount(); }
-    const NPT_List<Entry*>& GetEntries() const { return m_Entries; }
-    NPT_Result   Clear();
-
-    // operators
-    V&                  operator(const K& key);
-    const NPT_Map<K,V>& operator=(const NPT_Map<K,V>& copy);
-    bool                operator==(const NPT_Map<K,V>& other) const;
-    bool                operator!=(const NPT_Map<K,V>& other) const;
-
-private:
-    // types
-    typedef typename NPT_List<Entry*>::Iterator ListIterator;
-
-    // methods
-    Entry* GetEntry(const K& key) const;
-
-    // members
-    NPT_List<Entry*> m_Entries;
-};
-
-/*----------------------------------------------------------------------
-|   NPT_Map<K,V>::NPT_Map<K,V>
-+---------------------------------------------------------------------*/
-template <typename K, typename V>
-NPT_Map<K,V>::NPT_Map(const NPT_Map<K,V>& copy)
-{
-    *this = copy;
-}
-
-/*----------------------------------------------------------------------
-|   NPT_Map<K,V>::~NPT_Map<K,V>
-+---------------------------------------------------------------------*/
-template <typename K, typename V>
-NPT_Map<K,V>::~NPT_Map()
-{
-    // call Clear to ensure we delete all entry objects
-    Clear();
-}
-
-/*----------------------------------------------------------------------
-|   NPT_Map<K,V>::Clear
-+---------------------------------------------------------------------*/
-template <typename K, typename V>
-NPT_Result
-NPT_Map<K,V>::Clear()
-{
-    m_Entries.Apply(NPT_ObjectDeleter<Entry>());
-    m_Entries.Clear();
-
-    return NPT_SUCCESS;
-}
-
-/*----------------------------------------------------------------------
-|   NPT_Map<K,V>::GetEntry
-+---------------------------------------------------------------------*/
-template <typename K, typename V>
-typename NPT_Map<K,V>::Entry*
-NPT_Map<K,V>::GetEntry(const K& key) const
-{
-    typename NPT_List<Entry*>::Iterator entry = m_Entries.GetFirstItem();
-    while (entry) {
-        if ((*entry)->GetKey() == key) {
-            return *entry;
-        }
-        ++entry;
-    }
-
-    return NULL;
-}
-
-/*----------------------------------------------------------------------
-|   NPT_Map<K,V>::Put
-+---------------------------------------------------------------------*/
-template <typename K, typename V>
-NPT_Result
-NPT_Map<K,V>::Put(const K& key, const V& value)
-{
-    Entry* entry = GetEntry(key);
-    if (entry == NULL) {
-        // no existing entry for that key, create one
-        m_Entries.Add(new Entry(key, value));
-    } else {
-        // replace the existing entry for that key
-        entry->SetValue(value);
-    }
-
-    return NPT_SUCCESS;
-}
-
-/*----------------------------------------------------------------------
-|   NPT_Map<K,V>::Get
-+---------------------------------------------------------------------*/
-template <typename K, typename V>
-NPT_Result
-NPT_Map<K,V>::Get(const K& key, V*& value) const
-{
-    Entry* entry = GetEntry(key);
-    if (entry == NULL) {
-        // no existing entry for that key
-        value = NULL;
-        return NPT_ERROR_NO_SUCH_ITEM;
-    } else {
-        // found an entry with that key
-        value = &entry->m_Value;
-        return NPT_SUCCESS;
-    }
-}
-
-/*----------------------------------------------------------------------
-|   NPT_Map<K,V>::HasValue
-+---------------------------------------------------------------------*/
-template <typename K, typename V>
-bool
-NPT_Map<K,V>::HasValue(const V& value) const
-{
-    ListIterator entry = m_Entries.GetFirstItem();
-    while (entry) {
-        if (value == (*entry)->m_Value) {
-            return true;
-        }
-        ++entry;
-    }
-
-    return false;
-}
-
-/*----------------------------------------------------------------------
-|   NPT_Map<K,V>::operator=
-+---------------------------------------------------------------------*/
-template <typename K, typename V>
-const NPT_Map<K,V>&
-NPT_Map<K,V>::operator=(const NPT_Map<K,V>& copy)
-{
-    // do nothing if we're assigning to ourselves
-    if (this == &copy) return copy;
-
-    // destroy all entries
-    Clear();
-
-    // copy all entries one by one
-    ListIterator entry = copy.m_Entries.GetFirstItem();
-    while (entry) {
-        m_Entries.Add(new Entry((*entry)->GetKey(), (*entry)->GetValue()));
-        ++entry;
-    }
-
-    return *this;
-}
-
-/*----------------------------------------------------------------------
-|   NPT_Map<K,V>::Erase
-+---------------------------------------------------------------------*/
-template <typename K, typename V>
-NPT_Result
-NPT_Map<K,V>::Erase(const K& key)
-{
-    ListIterator entry = m_Entries.GetFirstItem();
-    while (entry) {
-        if ((*entry)->GetKey() == key) {
-            delete *entry; // do this before removing the entry from the
-                           // list, because Erase() will invalidate the
-                           // iterator item
-            m_Entries.Erase(entry);
-            return NPT_SUCCESS;
-        }
-        ++entry;
-    }
-
-    return NPT_ERROR_NO_SUCH_ITEM;
-}
-
-/*----------------------------------------------------------------------
-|   NPT_Map<K,V>::operator==
-+---------------------------------------------------------------------*/
-template <typename K, typename V>
-bool
-NPT_Map<K,V>::operator==(const NPT_Map<K,V>& other) const
-{
-    // quick test
-    if (m_Entries.GetItemCount() != other.m_Entries.GetItemCount()) return false;
-
-    // compare all entries to all other entries
-    ListIterator entry = m_Entries.GetFirstItem();
-    while (entry) {
-        V* value;
-        if (NPT_SUCCEEDED(other.Get((*entry)->m_Key, value))) {
-            // the other map has an entry for this key, check the value
-            if (!(*value == (*entry)->m_Value)) return false;
-        } else {
-            // the other map does not have an entry for this key
-            return false;
-        }
-        ++entry;
-    }
-
-    return true;
-}
-
-/*----------------------------------------------------------------------
-|   NPT_Map<K,V>::operator!=
-+---------------------------------------------------------------------*/
-template <typename K, typename V>
-bool
-NPT_Map<K,V>::operator!=(const NPT_Map<K,V>& other) const
-{
-    return !(*this == other);
-}
-
-/*----------------------------------------------------------------------
-|   NPT_Map<K,V>::operator
-+---------------------------------------------------------------------*/
-template <typename K, typename V>
-V&
-NPT_Map<K,V>::operator(const K& key)
-{
-    Entry* entry = GetEntry(key);
-    if (entry == NULL) {
-        // create a new "default" entry for this key
-        entry = new Entry(key);
-        m_Entries.Add(entry);
-    }
-     
-    return entry->m_Value;
-}
-
-/*----------------------------------------------------------------------
-|   NPT_HashMap
-+---------------------------------------------------------------------*/
-template <typename K, typename V, typename HF = NPT_Hash<K> > 
-class NPT_HashMap 
-{
-public:
-    // types
-    class Entry {
-    public:
-        // constructor
-        Entry(NPT_UInt32 hash_value, const K& key, const V& value) : m_HashValue(hash_value), m_Key(key), m_Value(value) {}
-        Entry(NPT_UInt32 hash_value, const K& key)                 : m_HashValue(hash_value), m_Key(key) {}
-        
-        // accessors
-        const K&   GetKey()       const { return m_Key;   }
-        const V&   GetValue()     const { return m_Value; }
-        NPT_UInt32 GetHashValue() const { return m_HashValue; }
-        
-        // operators 
-        bool operator==(const Entry& other) const {
-            return m_HashValue == other.m_HashValue && m_Key == other.m_Key && m_Value == other.m_Value;
-        }
-
-    protected:
-        // methods
-        void SetValue(const V& value) { m_Value = value; }
-
-        // members
-        NPT_UInt32 m_HashValue;
-        K          m_Key;
-        V          m_Value;
-
-        // friends
-        friend class NPT_HashMap<K,V,HF>;
-    };
-
-    class Iterator {
-    public:
-        Iterator() : m_Entry(NULL), m_Map(NULL) {}
-        Iterator(Entry** entry, const NPT_HashMap<K,V,HF>* map) : m_Entry(entry), m_Map(map) {}
-        Iterator(const Iterator& copy) : m_Entry(copy.m_Entry), m_Map(copy.m_Map) {}
-        const Entry&  operator*()  const { return **m_Entry; }
-        Iterator& operator++()  { // prefix
-            if (m_Map && m_Entry) {
-                do {
-                    ++m_Entry;
-                    if (m_Entry >= &m_Map->m_Buckets1<<m_Map->m_BucketCountLog) {
-                        m_Entry = NULL;
-                    } else {
-                        if (*m_Entry) break;
-                    }
-                } while (m_Entry);
-            }
-            return (*this); 
-        }
-        Iterator operator++(int) { // postfix
-            Iterator saved_this = *this;
-            ++(*this);
-            return saved_this;
-        }
-        operator bool() const {
-            return m_Entry != NULL;
-        }
-        bool operator==(const Iterator& other) const {
-            return m_Map == other.m_Map && m_Entry == other.m_Entry;
-        }
-        bool operator!=(const Iterator& other) const {
-            return !(*this == other);
-        }
-        void operator=(const Iterator& other) {
-            m_Entry = other.m_Entry;
-            m_Map   = other.m_Map;
-        }
-
-    private:
-        // friends
-        friend class NPT_HashMap<K,V,HF>;
-
-        // members
-        Entry**                    m_Entry;
-        const NPT_HashMap<K,V,HF>* m_Map;
-    };
-
-    // constructors
-    NPT_HashMap<K,V,HF>();
-    NPT_HashMap<K,V,HF>(const HF& hasher);
-    NPT_HashMap<K,V,HF>(const NPT_HashMap<K,V,HF>& copy);
-
-    // destructor
-    ~NPT_HashMap<K,V,HF>();
-
-    // methods
-    NPT_Result   Put(const K& key, const V& value);
-    NPT_Result   Get(const K& key, V*& value) const; // WARNING: the second parameter is a POINTER on the value type!!!
-    bool         HasKey(const K& key) const { return GetEntry(key) != NULL; }
-    bool         HasValue(const V& value) const;
-    NPT_Result   Erase(const K& key);
-    NPT_Cardinal GetEntryCount() const { return m_EntryCount; }
-    Iterator     GetEntries() const;
-    NPT_Result   Clear();
-    
-    // list operations
-    // keep these template members defined here because MSV6 does not let
-    // us define them later
-    template <typename X> 
-    NPT_Result Apply(const X& function) const
-    {                          
-        for (int i=0; i<(1<<m_BucketCountLog); i++) {
-            if (m_Bucketsi) {
-                function(m_Bucketsi);
-            }
-        }
-        return NPT_SUCCESS;
-    }
-
-    // operators
-    V&                         operator(const K& key);
-    const NPT_HashMap<K,V,HF>& operator=(const NPT_HashMap<K,V,HF>& copy);
-    bool                       operator==(const NPT_HashMap<K,V,HF>& other) const;
-    bool                       operator!=(const NPT_HashMap<K,V,HF>& other) const;
-
-private:
-    // methods
-    Entry*     GetEntry(const K& key, NPT_UInt32* position=NULL) const;
-    NPT_Result AddEntry(Entry* entry);
-    void       AllocateBuckets(unsigned int count_log);
-    void       AdjustBuckets(NPT_Cardinal entry_count, bool allow_shrink=false);
-    
-    // members
-    HF           m_Hasher;
-    Entry**      m_Buckets;
-    NPT_Cardinal m_BucketCountLog;
-    NPT_Cardinal m_EntryCount;
-};
-
-/*----------------------------------------------------------------------
-|   NPT_HashMap<K,V>::NPT_HashMap
-+---------------------------------------------------------------------*/
-template <typename K, typename V, typename HF>
-NPT_HashMap<K,V,HF>::NPT_HashMap() :
-    m_Buckets(NULL),
-    m_EntryCount(0)
-{
-    AllocateBuckets(4);
-}
-
-/*----------------------------------------------------------------------
-|   NPT_HashMap<K,V>::NPT_HashMap
-+---------------------------------------------------------------------*/
-template <typename K, typename V, typename HF>
-NPT_HashMap<K,V,HF>::NPT_HashMap(const HF& hasher) :
-    m_Hasher(hasher),
-    m_Buckets(NULL),
-    m_EntryCount(0)
-{
-    AllocateBuckets(4);
-}
-
-/*----------------------------------------------------------------------
-|   NPT_HashMap<K,V>::NPT_HashMap
-+---------------------------------------------------------------------*/
-template <typename K, typename V, typename HF>
-NPT_HashMap<K,V,HF>::NPT_HashMap(const NPT_HashMap<K,V,HF>& copy) :
-    m_Buckets(NULL),
-    m_BucketCountLog(0),
-    m_EntryCount(0)
-{
-    *this = copy;
-}
-
-/*----------------------------------------------------------------------
-|   NPT_MapMap<K,V,HF>::NPT_HashMap
-+---------------------------------------------------------------------*/
-template <typename K, typename V, typename HF>
-NPT_HashMap<K,V,HF>::~NPT_HashMap()
-{
-    for (int i=0; i<(1<<m_BucketCountLog); i++) {
-        delete m_Bucketsi;
-    }
-    delete m_Buckets;
-}
-
-/*----------------------------------------------------------------------
-|   NPT_HashMap<K,V,HF>::AllocateBuckets
-+---------------------------------------------------------------------*/
-template <typename K, typename V, typename HF>
-void
-NPT_HashMap<K,V,HF>::AllocateBuckets(unsigned int count_log)
-{
-    m_Buckets = new Entry*1<<count_log;
-    m_BucketCountLog = count_log;
-    for (int i=0; i<(1<<count_log); i++) {
-        m_Bucketsi = NULL;
-    }
-}
-
-/*----------------------------------------------------------------------
-|   NPT_HashMap<K,V,HF>::AdjustBuckets
-+---------------------------------------------------------------------*/
-template <typename K, typename V, typename HF>
-void
-NPT_HashMap<K,V,HF>::AdjustBuckets(NPT_Cardinal entry_count, bool allow_shrink)
-{
-    Entry** buckets = NULL;
-    unsigned int bucket_count = 1<<m_BucketCountLog;
-    if (2*entry_count >= bucket_count) {
-        // we need to grow
-        buckets = m_Buckets;
-        AllocateBuckets(m_BucketCountLog+1);
-    } else if (allow_shrink && (5*entry_count < bucket_count) && m_BucketCountLog > 4) {
-        // we need to shrink
-        buckets = m_Buckets;
-        AllocateBuckets(m_BucketCountLog-1);
-    }
-    if (buckets) {
-        m_EntryCount = 0;
-        for (unsigned int i=0; i<bucket_count; i++) {
-            if (bucketsi) AddEntry(bucketsi);
-        }
-        delete buckets;
-    }
-}
-
-/*----------------------------------------------------------------------
-|   NPT_HashMap<K,V,HF>::Clear
-+---------------------------------------------------------------------*/
-template <typename K, typename V, typename HF>
-NPT_Result
-NPT_HashMap<K,V,HF>::Clear()
-{
-    if (m_Buckets) {
-        for (int i=0; i<(1<<m_BucketCountLog); i++) {
-            delete m_Bucketsi;
-        }
-        delete m_Buckets;
-    }
-    m_EntryCount = 0;
-    AllocateBuckets(4);
-    
-    return NPT_SUCCESS;
-}
-
-/*----------------------------------------------------------------------
-|   NPT_HashMap<K,V,HF>::GetEntries
-+---------------------------------------------------------------------*/
-template <typename K, typename V, typename HF>
-typename NPT_HashMap<K,V,HF>::Iterator
-NPT_HashMap<K,V,HF>::GetEntries() const
-{
-    for (int i=0; i<(1<<m_BucketCountLog); i++) {
-        if (m_Bucketsi) {
-            return Iterator(&m_Bucketsi, this);
-        }
-    }
-    return Iterator(NULL, this);
-}
-
-/*----------------------------------------------------------------------
-|   NPT_HashMap<K,V,HF>::GetEntry
-+---------------------------------------------------------------------*/
-template <typename K, typename V, typename HF>
-typename NPT_HashMap<K,V,HF>::Entry*
-NPT_HashMap<K,V,HF>::GetEntry(const K& key, NPT_UInt32* position) const
-{
-    NPT_UInt32 hash_value = m_Hasher(key);
-    NPT_UInt32 mask       = (1<<m_BucketCountLog)-1;
-    NPT_UInt32 cursor     = hash_value & mask;
-    while (m_Bucketscursor) {
-        Entry* entry = m_Bucketscursor;
-        if (entry->m_HashValue == hash_value &&
-            entry->m_Key       == key) {
-            if (position) *position = cursor;
-            return entry;
-        }
-        cursor = (cursor + 1) & mask;
-    }
-    
-    return NULL;
-}
-
-/*----------------------------------------------------------------------
-|   NPT_HashMap<K,V,HF>::AddEntry
-+---------------------------------------------------------------------*/
-template <typename K, typename V, typename HF>
-NPT_Result
-NPT_HashMap<K,V,HF>::AddEntry(Entry* entry)
-{
-    AdjustBuckets(m_EntryCount+1);
-
-    NPT_UInt32 hash_value = entry->m_HashValue;
-    NPT_UInt32 mask       = (1<<m_BucketCountLog)-1;
-    NPT_UInt32 cursor     = hash_value & mask;
-    while (m_Bucketscursor) {
-        cursor = (cursor + 1) & mask;
-    }
-    m_Bucketscursor = entry;
-    ++m_EntryCount;
-    
-    return NPT_SUCCESS;
-}
-
-/*----------------------------------------------------------------------
-|   NPT_HashMap<K,V,HF>::Put
-+---------------------------------------------------------------------*/
-template <typename K, typename V, typename HF>
-NPT_Result
-NPT_HashMap<K,V,HF>::Put(const K& key, const V& value)
-{
-    Entry* entry = GetEntry(key);
-    if (entry == NULL) {
-        // no existing entry for that key, create one
-        return AddEntry(new Entry(m_Hasher(key), key, value));
-    } else {
-        // replace the existing entry for that key
-        entry->SetValue(value);
-    }
-
-    return NPT_SUCCESS;
-}
-
-/*----------------------------------------------------------------------
-|   NPT_HashMap<K,V,HF>::Get
-+---------------------------------------------------------------------*/
-template <typename K, typename V, typename HF>
-NPT_Result
-NPT_HashMap<K,V,HF>::Get(const K& key, V*& value) const
-{
-    Entry* entry = GetEntry(key);
-    if (entry == NULL) {
-        // no existing entry for that key
-        value = NULL;
-        return NPT_ERROR_NO_SUCH_ITEM;
-    } else {
-        // found an entry with that key
-        value = &entry->m_Value;
-        return NPT_SUCCESS;
-    }
-}
-
-/*----------------------------------------------------------------------
-|   NPT_HashMap<K,V,HF>::HasValue
-+---------------------------------------------------------------------*/
-template <typename K, typename V, typename HF>
-bool
-NPT_HashMap<K,V,HF>::HasValue(const V& value) const
-{
-    for (int i=0; i<(1<<m_BucketCountLog); i++) {
-        if (m_Bucketsi && m_Bucketsi->m_Value == value) {
-            return true;
-        }
-    }
-
-    return false;
-}
-
-/*----------------------------------------------------------------------
-|   NPT_HashMap<K,V,HF>::Erase
-+---------------------------------------------------------------------*/
-template <typename K, typename V, typename HF>
-NPT_Result
-NPT_HashMap<K,V,HF>::Erase(const K& key)
-{
-    NPT_UInt32 position;
-    Entry* entry = GetEntry(key, &position);
-    if (entry == NULL) {
-        return NPT_ERROR_NO_SUCH_ITEM;
-    }
-    
-    // mark the bucket as unoccupied
-    m_Bucketsposition = NULL;
-    
-    // look for buckets that need to be relocated:
-    // there should be no empty bucket between an entry's ideal hash bucket
-    // and its actual bucket.
-    NPT_UInt32 mask = (1<<m_BucketCountLog)-1;
-    for (NPT_UInt32 cursor = (position+1) & mask; m_Bucketscursor; cursor = (cursor + 1) & mask) {
-        NPT_UInt32 target = m_Bucketscursor->m_HashValue & mask;
-        // check if target is between position and cursor (modulo the bucket array size)
-        // |    position.target.cursor |
-        // |....cursor position.target.| or |.target..cursor position...|
-        if ( (position <= cursor) ?
-             ((position < target) && (target <= cursor)) :
-             ((position < target) || (target <= cursor)) ) {
-             continue;
-        }
-        
-        // move the bucket back
-        m_Bucketsposition = m_Bucketscursor;
-        m_Bucketscursor = NULL;
-        position = cursor;
-    }
-        
-    // cleanup and adjust the counter and buckets
-    delete entry;
-    --m_EntryCount;
-    AdjustBuckets(m_EntryCount, true);
-
-    return NPT_SUCCESS;
-}
-
-/*----------------------------------------------------------------------
-|   NPT_HashMap<K,V,HF>::operator=
-+---------------------------------------------------------------------*/
-template <typename K, typename V, typename HF>
-const NPT_HashMap<K,V,HF>&
-NPT_HashMap<K,V,HF>::operator=(const NPT_HashMap<K,V,HF>& copy)
-{
-    // do nothing if we're assigning to ourselves
-    if (this == &copy) return copy;
-
-    // destroy all entries
-    Clear();
-
-    // prepare to receive all the entries
-    AdjustBuckets(copy.m_EntryCount);
-    
-    // copy all entries
-    for (int i=0; i<1<<copy.m_BucketCountLog; i++) {
-        if (copy.m_Bucketsi) {
-            AddEntry(new Entry(m_Hasher(copy.m_Bucketsi->GetKey()),
-                               copy.m_Bucketsi->GetKey(), 
-                               copy.m_Bucketsi->GetValue()));
-        }
-    }
-    
-    return *this;
-}
-
-/*----------------------------------------------------------------------
-|   NPT_HashMap<K,V,HF>::operator==
-+---------------------------------------------------------------------*/
-template <typename K, typename V, typename HF>
-bool
-NPT_HashMap<K,V,HF>::operator==(const NPT_HashMap<K,V,HF>& other) const
-{
-    // quick check
-    if (m_EntryCount != other.m_EntryCount) return false;
-    
-    // compare all entries to all other entries
-    for (int i=0; i<(1<<m_BucketCountLog); i++) {
-        Entry* entry = m_Bucketsi;
-        if (entry == NULL) continue;
-        Entry* other_entry = other.GetEntry(entry->m_Key);
-        if (other_entry == NULL || !(other_entry->m_Value == entry->m_Value)) {
-            return false;
-        }
-    }
-    
-    return true;
-}
-
-/*----------------------------------------------------------------------
-|   NPT_HashMap<K,V,HF>::operator!=
-+---------------------------------------------------------------------*/
-template <typename K, typename V, typename HF>
-bool
-NPT_HashMap<K,V,HF>::operator!=(const NPT_HashMap<K,V,HF>& other) const
-{
-    return !(*this == other);
-}
-
-/*----------------------------------------------------------------------
-|   NPT_HashMap<K,V>::operator
-+---------------------------------------------------------------------*/
-template <typename K, typename V, typename HF>
-V&
-NPT_HashMap<K,V,HF>::operator(const K& key)
-{
-    Entry* entry = GetEntry(key);
-    if (entry == NULL) {
-        // create a new "default" entry for this key
-        entry = new Entry(m_Hasher(key), key);
-        AddEntry(entry);
-    }
-     
-    return entry->m_Value;
-}
-
-/*----------------------------------------------------------------------
-|   NPT_MapEntryValueDeleter
-+---------------------------------------------------------------------*/
-template <class T>
-class NPT_MapEntryValueDeleter {
-public:
-    void operator()(T* entry) const {
-        delete entry->GetValue();
-    }
-};
-
-#endif // _NPT_MAP_H_

gpac-2.2.1.tar.gz/extra_lib/include/platinum/NptMessaging.h Deleted

@@ -1,230 +0,0 @@
-/*****************************************************************
-|
-|   Neptune - Messaging System
-|
-| Copyright (c) 2002-2008, Axiomatic Systems, LLC.
-| All rights reserved.
-|
-| Redistribution and use in source and binary forms, with or without
-| modification, are permitted provided that the following conditions are met:
-|     * Redistributions of source code must retain the above copyright
-|       notice, this list of conditions and the following disclaimer.
-|     * Redistributions in binary form must reproduce the above copyright
-|       notice, this list of conditions and the following disclaimer in the
-|       documentation and/or other materials provided with the distribution.
-|     * Neither the name of Axiomatic Systems nor the
-|       names of its contributors may be used to endorse or promote products
-|       derived from this software without specific prior written permission.
-|
-| THIS SOFTWARE IS PROVIDED BY AXIOMATIC SYSTEMS ''AS IS'' AND ANY
-| EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-| WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-| DISCLAIMED. IN NO EVENT SHALL AXIOMATIC SYSTEMS BE LIABLE FOR ANY
-| DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-| (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-| LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-| ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-| (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-| SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-|
- ****************************************************************/
-
-#ifndef _NPT_MESSAGING_H_
-#define _NPT_MESSAGING_H_
-
-/*----------------------------------------------------------------------
-|   includes
-+---------------------------------------------------------------------*/
-#include "NptConstants.h"
-#include "NptTypes.h"
-#include "NptResults.h"
-#include "NptList.h"
-#include "NptThreads.h"
-#include "NptDynamicCast.h"
-
-/*----------------------------------------------------------------------
-|   forward references
-+---------------------------------------------------------------------*/
-class NPT_Message;
-
-/*----------------------------------------------------------------------
-|   NPT_MessageHandler
-+---------------------------------------------------------------------*/
-class NPT_MessageHandler
-{
-public:
-    NPT_IMPLEMENT_DYNAMIC_CAST(NPT_MessageHandler)
-    
-    // methods
-    virtual ~NPT_MessageHandler() {}
-
-    // default message handler
-    virtual void OnMessage(NPT_Message*) {}
-
-    // this method is a central point of handling for received messages.
-    // it can be overloaded by subclasses that wish to process all 
-    // incoming messages
-    virtual NPT_Result HandleMessage(NPT_Message* message);
-};
-
-/*----------------------------------------------------------------------
-|   NPT_MessageHandlerProxy
-+---------------------------------------------------------------------*/
-class NPT_MessageHandlerProxy : public NPT_MessageHandler
-{
-public:
-    NPT_IMPLEMENT_DYNAMIC_CAST_D(NPT_MessageHandlerProxy, NPT_MessageHandler)
-
-    /**
-     * Create a proxy for a message handler.
-     * All calls to HandleMessage() and OnMessage() on the proxy
-     * are automatically forwarded to the handler.
-     * This class is useful in cases where a handler is passed
-     * asynchronously (for example in a message queue) and one wishes
-     * to guarantee right away that no more calls to the handler will be 
-     * made (because, for example, the handler needs to be deleted).
-     *
-     * The proxy object keeps a pointer to the handler, but does not own it.
-     */
-    NPT_MessageHandlerProxy(NPT_MessageHandler* handler);
-    
-    // destructor
-    virtual ~NPT_MessageHandlerProxy();
-
-    // NPT_MessageHandler methods
-    virtual void OnMessage(NPT_Message*);
-    virtual NPT_Result HandleMessage(NPT_Message* message);
-    
-    /**
-     * Detach the proxy from the handler implementation.
-     * After this call returns, calls will no longer be
-     * forwarded to the handler object. It is then safe, for example,
-     * to delete the handler.
-     */
-    void DetachHandler();
-    
-    /**
-     * Increment the reference count
-     */
-    void AddReference();
-
-    /**
-     * Decrement the reference count and delete if 0
-     */
-    void Release();
-    
-private:
-    // members
-    NPT_MessageHandler* m_Handler;
-    NPT_Cardinal        m_ReferenceCount;
-    NPT_Mutex           m_Lock;
-};
-
-/*----------------------------------------------------------------------
-|   NPT_Messsage
-+---------------------------------------------------------------------*/
-class NPT_Message
-{
-public:
-    // types
-    typedef const char* Type;
-
-    // static members
-    static Type const MessageType;
-
-    // methods
-    virtual           ~NPT_Message() {}
-    virtual Type       GetType() { return MessageType; }
-    virtual NPT_Result Dispatch(NPT_MessageHandler* handler) {
-        return DefaultDeliver(handler);
-    }
-    // this method should really be called 'Deliver', but this would
-    // cause a problem when subclasses overload it 
-    virtual NPT_Result DefaultDeliver(NPT_MessageHandler* handler) {
-        handler->OnMessage(this);
-        return NPT_SUCCESS;
-    }
-};
-
-/*----------------------------------------------------------------------
-|   NPT_TerminateMesssage
-+---------------------------------------------------------------------*/
-class NPT_TerminateMessage : public NPT_Message
-{
-public:
-    // methods
-    NPT_Result Dispatch(NPT_MessageHandler* /*handler*/) {
-        return NPT_ERROR_TERMINATED;
-    }
-};
-
-/*----------------------------------------------------------------------
-|   NPT_MessageQueue
-+---------------------------------------------------------------------*/
-class NPT_MessageQueue
-{
-public:
-    // methods
-    virtual           ~NPT_MessageQueue() {}
-    virtual NPT_Result PumpMessage(NPT_Timeout timeout = NPT_TIMEOUT_INFINITE) = 0;
-    virtual NPT_Result QueueMessage(NPT_Message*        message, 
-                                    NPT_MessageHandler* handler) = 0;
-};
-
-/*----------------------------------------------------------------------
-|   NPT_MessageReceiver
-+---------------------------------------------------------------------*/
-class NPT_MessageReceiver
-{
-public:
-    // methods
-    NPT_MessageReceiver() : m_Queue(NULL), m_Handler(NULL) {}
-    NPT_MessageReceiver(NPT_MessageHandler* handler) : 
-        m_Queue(NULL), m_Handler(handler) {}
-    NPT_MessageReceiver(NPT_MessageQueue* queue) : 
-        m_Queue(queue), m_Handler(NULL) {}
-    NPT_MessageReceiver(NPT_MessageHandler* handler, 
-                        NPT_MessageQueue*   queue) : 
-        m_Queue(queue), m_Handler(handler) {}
-    virtual ~NPT_MessageReceiver() {}
-    NPT_Result SetQueue(NPT_MessageQueue* queue) {
-        m_Queue = queue;
-        return NPT_SUCCESS;
-    }
-    NPT_Result SetHandler(NPT_MessageHandler* handler) {
-        m_Handler = handler;
-        return NPT_SUCCESS;
-    }
-    virtual NPT_Result PostMessage(NPT_Message* message) {
-        if (m_Queue) {
-            return m_Queue->QueueMessage(message, m_Handler);
-        } else {
-            return NPT_FAILURE;
-        }
-    }
-
-protected:
-    // members
-    NPT_MessageQueue*   m_Queue;
-    NPT_MessageHandler* m_Handler;
-};
-
-/*----------------------------------------------------------------------
-|   NPT_MessageBroadcaster
-+---------------------------------------------------------------------*/
-class NPT_MessageBroadcaster
-{
-public:
-    // methods
-    NPT_MessageBroadcaster(NPT_Message* message) : m_Message(message) {}
-    NPT_Result operator()(NPT_MessageReceiver*& receiver) const {
-        receiver->PostMessage(m_Message);
-        return NPT_SUCCESS;
-    }
-
-private:
-    // members
-    NPT_Message* m_Message;
-};
-
-#endif // _NPT_MESSAGING_H_

gpac-2.2.1.tar.gz/extra_lib/include/platinum/NptNetwork.h Deleted

@@ -1,250 +0,0 @@
-/*****************************************************************
-|
-|   Neptune - Network
-|
-| Copyright (c) 2002-2008, Axiomatic Systems, LLC.
-| All rights reserved.
-|
-| Redistribution and use in source and binary forms, with or without
-| modification, are permitted provided that the following conditions are met:
-|     * Redistributions of source code must retain the above copyright
-|       notice, this list of conditions and the following disclaimer.
-|     * Redistributions in binary form must reproduce the above copyright
-|       notice, this list of conditions and the following disclaimer in the
-|       documentation and/or other materials provided with the distribution.
-|     * Neither the name of Axiomatic Systems nor the
-|       names of its contributors may be used to endorse or promote products
-|       derived from this software without specific prior written permission.
-|
-| THIS SOFTWARE IS PROVIDED BY AXIOMATIC SYSTEMS ''AS IS'' AND ANY
-| EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-| WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-| DISCLAIMED. IN NO EVENT SHALL AXIOMATIC SYSTEMS BE LIABLE FOR ANY
-| DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-| (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-| LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-| ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-| (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-| SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-|
- ****************************************************************/
-
-#ifndef _NPT_NETWORK_H_
-#define _NPT_NETWORK_H_
-
-/*----------------------------------------------------------------------
-|   includes
-+---------------------------------------------------------------------*/
-#include "NptTypes.h"
-#include "NptConstants.h"
-#include "NptStrings.h"
-#include "NptList.h"
-
-/*----------------------------------------------------------------------
-|   constants
-+---------------------------------------------------------------------*/
-const unsigned int NPT_NETWORK_MAX_MAC_ADDRESS_LENGTH  = 8;
-
-/*----------------------------------------------------------------------
-|   flags
-+---------------------------------------------------------------------*/
-#define NPT_NETWORK_INTERFACE_FLAG_LOOPBACK       0x01
-#define NPT_NETWORK_INTERFACE_FLAG_PROMISCUOUS    0x02
-#define NPT_NETWORK_INTERFACE_FLAG_BROADCAST      0x04
-#define NPT_NETWORK_INTERFACE_FLAG_MULTICAST      0x08
-#define NPT_NETWORK_INTERFACE_FLAG_POINT_TO_POINT 0x10
-
-/*----------------------------------------------------------------------
-|   workarounds
-+---------------------------------------------------------------------*/
-#if defined(_WIN32)
-#if defined(SetPort)
-#undef SetPort
-#endif
-#endif
-
-/*----------------------------------------------------------------------
-|   types
-+---------------------------------------------------------------------*/
-typedef unsigned int NPT_IpPort;
-
-/*----------------------------------------------------------------------
-|   NPT_IpAddress
-+---------------------------------------------------------------------*/
-class NPT_IpAddress
-{
-public:
-    // class members
-    static const NPT_IpAddress Any;
-
-    // constructors and destructor
-    NPT_IpAddress();
-    NPT_IpAddress(unsigned long address);
-    NPT_IpAddress(unsigned char a, unsigned char b, unsigned char c, unsigned char d);
-
-    // methods
-    NPT_Result       ResolveName(const char* name, 
-                                 NPT_Timeout timeout = NPT_TIMEOUT_INFINITE);
-    NPT_Result       Parse(const char* name);
-    NPT_Result       Set(unsigned long address);
-    NPT_Result       Set(const unsigned char bytes4);
-    const unsigned char* AsBytes() const;
-    unsigned long    AsLong() const;
-    NPT_String       ToString() const;
-    
-    // operators
-    bool             operator==(const NPT_IpAddress& other) const;
-    
-    // FIXME: temporary
-    NPT_String       m_HostName;
-
-private:
-    // members
-    unsigned char m_Address4;
-};
-
-/*----------------------------------------------------------------------
-|   NPT_MacAddress
-+---------------------------------------------------------------------*/
-class NPT_MacAddress
-{
-public:
-    // typedef enum
-    typedef enum {
-        TYPE_UNKNOWN,
-        TYPE_LOOPBACK,
-        TYPE_ETHERNET,
-        TYPE_PPP,
-        TYPE_IEEE_802_11
-    } Type;
-    
-    // constructors and destructor
-    NPT_MacAddress() : m_Type(TYPE_UNKNOWN), m_Length(0) {}
-    NPT_MacAddress(Type           type,
-                   const unsigned char* addr, 
-                   unsigned int   length);
-    
-    // methods
-    void                 SetAddress(Type type, const unsigned char* addr,
-                                    unsigned int length);
-    Type                 GetType() const    { return m_Type; }
-    const unsigned char* GetAddress() const { return m_Address; }
-    unsigned int         GetLength() const  { return m_Length; }
-    NPT_String           ToString() const;
-    
-private:
-    // members
-    Type          m_Type;
-    unsigned char m_AddressNPT_NETWORK_MAX_MAC_ADDRESS_LENGTH;
-    unsigned int  m_Length;
-};
-
-/*----------------------------------------------------------------------
-|   NPT_NetworkInterfaceAddress
-+---------------------------------------------------------------------*/
-class NPT_NetworkInterfaceAddress
-{
-public:
-    // constructors and destructor
-    NPT_NetworkInterfaceAddress(const NPT_IpAddress& primary,
-                                const NPT_IpAddress& broadcast,
-                                const NPT_IpAddress& destination,
-                                const NPT_IpAddress& netmask) :
-        m_PrimaryAddress(primary),
-        m_BroadcastAddress(broadcast),
-        m_DestinationAddress(destination),
-        m_NetMask(netmask) {}
-
-    // methods
-    const NPT_IpAddress& GetPrimaryAddress() const {
-        return m_PrimaryAddress;
-    }
-    const NPT_IpAddress& GetBroadcastAddress() const {
-        return m_BroadcastAddress;
-    }
-    const NPT_IpAddress& GetDestinationAddress() const {
-        return m_DestinationAddress;
-    }
-    const NPT_IpAddress& GetNetMask() const {
-        return m_NetMask;
-    }
-    
-    bool IsAddressInNetwork(const NPT_IpAddress& address) {
-        if (m_PrimaryAddress.AsLong() == address.AsLong()) return true;
-        if (m_NetMask.AsLong() == 0) return false;
-        return (m_PrimaryAddress.AsLong() & m_NetMask.AsLong()) == (address.AsLong() & m_NetMask.AsLong());
-    }
-
-private:
-    // members
-    NPT_IpAddress m_PrimaryAddress;
-    NPT_IpAddress m_BroadcastAddress;
-    NPT_IpAddress m_DestinationAddress;
-    NPT_IpAddress m_NetMask;
-};
-
-/*----------------------------------------------------------------------
-|   NPT_NetworkInterface
-+---------------------------------------------------------------------*/
-class NPT_NetworkInterface
-{
-public:
-    // class methods
-    static NPT_Result GetNetworkInterfaces(NPT_List<NPT_NetworkInterface*>& interfaces);
-
-    // constructors and destructor
-    NPT_NetworkInterface(const char*           name,
-                         const NPT_MacAddress& mac,
-                         NPT_Flags             flags);
-    NPT_NetworkInterface(const char*           name,
-                         NPT_Flags             flags);
-   ~NPT_NetworkInterface() {}
-
-    // methods
-    NPT_Result AddAddress(const NPT_NetworkInterfaceAddress& address);
-    const NPT_String& GetName() const {
-        return m_Name;
-    }
-    const NPT_MacAddress& GetMacAddress() const {
-        return m_MacAddress;
-    }
-    void SetMacAddress(NPT_MacAddress::Type type,
-                       const unsigned char* addr, 
-                       unsigned int         length) {
-        m_MacAddress.SetAddress(type, addr, length);
-    }
-    NPT_Flags GetFlags() const { return m_Flags; }
-    const NPT_List<NPT_NetworkInterfaceAddress>& GetAddresses() const {
-        return m_Addresses;
-    }    
-    
-    bool IsAddressInNetwork(const NPT_IpAddress& address) {
-        NPT_List<NPT_NetworkInterfaceAddress>::Iterator iter = m_Addresses.GetFirstItem();
-        while (iter) {
-            if ((*iter).IsAddressInNetwork(address)) return true;
-           ++iter;
-        }
-        return false;
-    }
-    
-private:
-    // members
-    NPT_String                            m_Name;
-    NPT_MacAddress                        m_MacAddress;
-    NPT_Flags                             m_Flags;
-    NPT_List<NPT_NetworkInterfaceAddress> m_Addresses;
-};
-
-/*----------------------------------------------------------------------
-|   NPT_NetworkNameResolver
-+---------------------------------------------------------------------*/
-class NPT_NetworkNameResolver
-{
-public:
-    // class methods
-    static NPT_Result Resolve(const char*              name, 
-                              NPT_List<NPT_IpAddress>& addresses,
-                              NPT_Timeout              timeout = NPT_TIMEOUT_INFINITE);
-};
-
-#endif // _NPT_NETWORK_H_

gpac-2.2.1.tar.gz/extra_lib/include/platinum/NptQueue.h Deleted

@@ -1,94 +0,0 @@
-/*****************************************************************
-|
-|   Neptune - Queue
-|
-| Copyright (c) 2002-2008, Axiomatic Systems, LLC.
-| All rights reserved.
-|
-| Redistribution and use in source and binary forms, with or without
-| modification, are permitted provided that the following conditions are met:
-|     * Redistributions of source code must retain the above copyright
-|       notice, this list of conditions and the following disclaimer.
-|     * Redistributions in binary form must reproduce the above copyright
-|       notice, this list of conditions and the following disclaimer in the
-|       documentation and/or other materials provided with the distribution.
-|     * Neither the name of Axiomatic Systems nor the
-|       names of its contributors may be used to endorse or promote products
-|       derived from this software without specific prior written permission.
-|
-| THIS SOFTWARE IS PROVIDED BY AXIOMATIC SYSTEMS ''AS IS'' AND ANY
-| EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-| WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-| DISCLAIMED. IN NO EVENT SHALL AXIOMATIC SYSTEMS BE LIABLE FOR ANY
-| DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-| (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-| LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-| ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-| (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-| SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-|
- ****************************************************************/
-
-#ifndef _NPT_QUEUE_H_
-#define _NPT_QUEUE_H_
-
-/*----------------------------------------------------------------------
-|   includes
-+---------------------------------------------------------------------*/
-#include "NptTypes.h"
-#include "NptConstants.h"
-
-/*----------------------------------------------------------------------
-|   NPT_QueueItem
-+---------------------------------------------------------------------*/
-class NPT_QueueItem;
-
-/*----------------------------------------------------------------------
-|   NPT_GenericQueue
-+---------------------------------------------------------------------*/
-class NPT_GenericQueue
-{
- public:
-    // class methods
-    static NPT_GenericQueue* CreateInstance(NPT_Cardinal max_items = 0);
-
-    // methods
-    virtual           ~NPT_GenericQueue() {}
-    virtual NPT_Result Push(NPT_QueueItem* item, 
-                           NPT_Timeout     timeout = NPT_TIMEOUT_INFINITE) = 0; 
-    virtual NPT_Result Pop(NPT_QueueItem*& item, 
-                           NPT_Timeout     timeout = NPT_TIMEOUT_INFINITE) = 0;
-    virtual NPT_Result Peek(NPT_QueueItem*& item, 
-                           NPT_Timeout     timeout = NPT_TIMEOUT_INFINITE) = 0;
- protected:
-    // methods
-    NPT_GenericQueue() {}
-};
-
-/*----------------------------------------------------------------------
-|   NPT_Queue
-+---------------------------------------------------------------------*/
-template <class T>
-class NPT_Queue
-{
- public:
-    // methods
-    NPT_Queue(NPT_Cardinal max_items = 0) :
-        m_Delegate(NPT_GenericQueue::CreateInstance(max_items)) {}
-    virtual ~NPT_Queue<T>() { delete m_Delegate; }
-    virtual NPT_Result Push(T* item, NPT_Timeout timeout = NPT_TIMEOUT_INFINITE) {
-        return m_Delegate->Push(reinterpret_cast<NPT_QueueItem*>(item), timeout);
-    }
-    virtual NPT_Result Pop(T*& item, NPT_Timeout timeout = NPT_TIMEOUT_INFINITE) {
-        return m_Delegate->Pop(reinterpret_cast<NPT_QueueItem*&>(item), timeout);
-    }
-    virtual NPT_Result Peek(T*& item, NPT_Timeout timeout = NPT_TIMEOUT_INFINITE) {
-        return m_Delegate->Peek(reinterpret_cast<NPT_QueueItem*&>(item), timeout);
-    }
-
- protected:
-    // members
-    NPT_GenericQueue* m_Delegate;
-};
-
-#endif // _NPT_QUEUE_H_

gpac-2.2.1.tar.gz/extra_lib/include/platinum/NptReferences.h Deleted

@@ -1,173 +0,0 @@
-/*****************************************************************
-|
-|   Neptune - References
-|
-| Copyright (c) 2002-2008, Axiomatic Systems, LLC.
-| All rights reserved.
-|
-| Redistribution and use in source and binary forms, with or without
-| modification, are permitted provided that the following conditions are met:
-|     * Redistributions of source code must retain the above copyright
-|       notice, this list of conditions and the following disclaimer.
-|     * Redistributions in binary form must reproduce the above copyright
-|       notice, this list of conditions and the following disclaimer in the
-|       documentation and/or other materials provided with the distribution.
-|     * Neither the name of Axiomatic Systems nor the
-|       names of its contributors may be used to endorse or promote products
-|       derived from this software without specific prior written permission.
-|
-| THIS SOFTWARE IS PROVIDED BY AXIOMATIC SYSTEMS ''AS IS'' AND ANY
-| EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-| WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-| DISCLAIMED. IN NO EVENT SHALL AXIOMATIC SYSTEMS BE LIABLE FOR ANY
-| DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-| (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-| LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-| ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-| (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-| SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-|
-****************************************************************/
-
-#ifndef _NPT_REFERENCES_H_
-#define _NPT_REFERENCES_H_
-
-/*----------------------------------------------------------------------
-|   includes
-+---------------------------------------------------------------------*/
-#include "NptConstants.h"
-#include "NptThreads.h"
-
-/*----------------------------------------------------------------------
-|   NPT_Reference
-+---------------------------------------------------------------------*/
-template <typename T>
-class NPT_Reference
-{
-public:
-    // constructors and destructor
-    NPT_Reference() : m_Object(NULL), m_Counter(NULL), m_Mutex(NULL), m_ThreadSafe(true) {}
-    explicit NPT_Reference(T* object, bool thread_safe = true) : 
-        m_Object(object), 
-        m_Counter(object?new NPT_Cardinal(1):NULL),
-        m_Mutex((object && thread_safe)?new NPT_Mutex():NULL),
-        m_ThreadSafe(thread_safe) {}
-
-    NPT_Reference(const NPT_Reference<T>& ref) :
-        m_Object(ref.m_Object), m_Counter(ref.m_Counter), m_Mutex(ref.m_Mutex), m_ThreadSafe(ref.m_ThreadSafe) {
-        if (m_Mutex) m_Mutex->Lock();
-        if (m_Counter) ++(*m_Counter);
-        if (m_Mutex) m_Mutex->Unlock();
-    }
-
-    // this methods should be private, but this causes a problem on some
-    // compilers, because we need this function in order to implement
-    // the cast operator operator NPT_Reference<U>() below, which would
-    // have to be marked as a friend, and friend declarations with the 
-    // same class name confuses some compilers
-    NPT_Reference(T* object, NPT_Cardinal* counter, NPT_Mutex* mutex, bool thread_safe) : 
-        m_Object(object), m_Counter(counter), m_Mutex(mutex), m_ThreadSafe(thread_safe) {
-        if (m_Mutex) m_Mutex->Lock();
-        if (m_Counter) ++(*m_Counter);
-        if (m_Mutex) m_Mutex->Unlock();
-    }
-
-    ~NPT_Reference() {
-        Release();
-    }
-
-    // overloaded operators
-    NPT_Reference<T>& operator=(const NPT_Reference<T>& ref) {
-        if (this != &ref) {
-            Release();
-            m_Object = ref.m_Object;
-            m_Counter = ref.m_Counter;
-            m_Mutex = ref.m_Mutex;
-            m_ThreadSafe = ref.m_ThreadSafe;
-            
-            if (m_Mutex) m_Mutex->Lock();
-            if (m_Counter) ++(*m_Counter);
-            if (m_Mutex) m_Mutex->Unlock();
-        }
-        return *this;
-    }
-    NPT_Reference<T>& operator=(T* object) {
-        Release();
-        m_Object  = object;
-        m_Counter = object?new NPT_Cardinal(1):NULL;
-        m_Mutex   = (object && m_ThreadSafe)?new NPT_Mutex():NULL;
-        return *this;
-    }
-    T& operator*() const { return *m_Object; }
-    T* operator->() const { return m_Object; }
-
-    bool operator==(const NPT_Reference<T>& ref) const {
-        return m_Object == ref.m_Object;
-    } 
-    bool operator!=(const NPT_Reference<T>& ref) const {
-        return m_Object != ref.m_Object;
-    }
-
-    // overloaded cast operators
-    template <typename U> operator NPT_Reference<U>() {
-        return NPT_Reference<U>(m_Object, m_Counter, m_Mutex, m_ThreadSafe);
-    }
-
-    // methods
-    /**
-     * Returns the naked pointer value.
-     */
-    T* AsPointer() const { return m_Object; }
-    
-    /**
-     * Returns the reference counter value.
-     */
-    NPT_Cardinal GetCounter() const { return *m_Counter; }
-    
-    /**
-     * Returns whether this references a NULL object.
-     */
-    bool IsNull()  const { return m_Object == NULL; }
-    
-    /**
-     * Detach the reference from the shared object.
-     * The reference count is decremented, but the object is not deleted if the
-     * reference count becomes 0.
-     * After the method returns, this reference does not point to any shared object.
-     */
-    void Detach() {
-        Release(true);        
-    }
-    
-private:
-    // methods
-    void Release(bool detach_only = false) {
-        bool last_reference = false;
-        if (m_Mutex) m_Mutex->Lock();
-            
-        if (m_Counter && --(*m_Counter) == 0) {
-            delete m_Counter;
-            if (!detach_only) delete m_Object;
-            last_reference = true;
-        }
-        
-        m_Counter = NULL;
-        m_Object  = NULL;
-        
-        if (m_Mutex) {
-            NPT_Mutex* mutex = m_Mutex;
-            m_Mutex = NULL;
-            mutex->Unlock();
-            if (last_reference) delete mutex;
-        }
-        
-    }
-
-    // members
-    T*            m_Object;
-    NPT_Cardinal* m_Counter;
-    NPT_Mutex*    m_Mutex;
-    bool          m_ThreadSafe;
-};
-
-#endif // _NPT_REFERENCES_H_

gpac-2.2.1.tar.gz/extra_lib/include/platinum/NptResults.h Deleted

@@ -1,163 +0,0 @@
-/*****************************************************************
-|
-|   Neptune - Result Codes
-|
-| Copyright (c) 2002-2008, Axiomatic Systems, LLC.
-| All rights reserved.
-|
-| Redistribution and use in source and binary forms, with or without
-| modification, are permitted provided that the following conditions are met:
-|     * Redistributions of source code must retain the above copyright
-|       notice, this list of conditions and the following disclaimer.
-|     * Redistributions in binary form must reproduce the above copyright
-|       notice, this list of conditions and the following disclaimer in the
-|       documentation and/or other materials provided with the distribution.
-|     * Neither the name of Axiomatic Systems nor the
-|       names of its contributors may be used to endorse or promote products
-|       derived from this software without specific prior written permission.
-|
-| THIS SOFTWARE IS PROVIDED BY AXIOMATIC SYSTEMS ''AS IS'' AND ANY
-| EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-| WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-| DISCLAIMED. IN NO EVENT SHALL AXIOMATIC SYSTEMS BE LIABLE FOR ANY
-| DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-| (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-| LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-| ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-| (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-| SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-|
- ****************************************************************/
-
-#ifndef _NPT_RESULTS_H_
-#define _NPT_RESULTS_H_
-
-/*----------------------------------------------------------------------
-|   macros
-+---------------------------------------------------------------------*/
-#if defined(NPT_DEBUG)
-#include "NptDebug.h"
-#define NPT_CHECK(_x)               \
-do {                                \
-    NPT_Result _result = (_x);      \
-    if (_result != NPT_SUCCESS) {   \
-        NPT_Debug("%s(%d): @@@ NPT_CHECK failed, result=%d (%s)\n", __FILE__, __LINE__, _result, NPT_ResultText(_result)); \
-        return _result;             \
-    }                               \
-} while(0)
-#define NPT_CHECK_POINTER(_p)                 \
-do {                                          \
-    if ((_p) == NULL) {                       \
-        NPT_Debug("%s(%d): @@@ NULL pointer parameter\n", __FILE__, __LINE__); \
-        return NPT_ERROR_INVALID_PARAMETERS;  \
-    }                                         \
-} while(0)
-#define NPT_CHECK_LABEL(_x, label)  \
-do {                                \
-    NPT_Result _result = (_x);      \
-    if (_result != NPT_SUCCESS) {   \
-        NPT_Debug("%s(%d): @@@ NPT_CHECK failed, result=%d (%s)\n", __FILE__, __LINE__, _result, NPT_ResultText(_result)); \
-        goto label;                 \
-    }                               \
-} while(0)
-#define NPT_CHECK_POINTER_LABEL(_p, label)   \
-do {                                         \
-    if (_p == NULL) {                        \
-        NPT_Debug("%s(%d): @@@ NULL pointer parameter\n", __FILE__, __LINE__); \
-        goto label;                          \
-    }                                        \
-} while(0)
-#else
-#define NPT_CHECK(_x)               \
-do {                                \
-    NPT_Result _result = (_x);      \
-    if (_result != NPT_SUCCESS) {   \
-        return _result;             \
-    }                               \
-} while(0)
-#define NPT_CHECK_POINTER(_p)                               \
-do {                                                        \
-    if ((_p) == NULL) return NPT_ERROR_INVALID_PARAMETERS;  \
-} while(0)
-#define NPT_CHECK_LABEL(_x, label)  \
-do {                                \
-    NPT_Result _result = (_x);      \
-    if (_result != NPT_SUCCESS) {   \
-        goto label;                 \
-    }                               \
-} while(0)
-#define NPT_CHECK_POINTER_LABEL(_p, label)   \
-do {                                         \
-    if ((_p) == NULL) {                      \
-        goto label;                          \
-    }                                        \
-} while(0)
-#endif
-
-#define NPT_FAILED(result)              ((result) != NPT_SUCCESS)
-#define NPT_SUCCEEDED(result)           ((result) == NPT_SUCCESS)
-
-/*----------------------------------------------------------------------
-|   result codes
-+---------------------------------------------------------------------*/
-/** Result indicating that the operation or call succeeded */
-#define NPT_SUCCESS                     0
-
-/** Result indicating an unspecififed failure condition */
-#define NPT_FAILURE                     (-1)
-
-#if !defined(NPT_ERROR_BASE)
-#define NPT_ERROR_BASE -20000
-#endif
-
-// error bases
-#define NPT_ERROR_BASE_GENERAL        (NPT_ERROR_BASE-0)
-#define NPT_ERROR_BASE_LIST           (NPT_ERROR_BASE-100)
-#define NPT_ERROR_BASE_FILE           (NPT_ERROR_BASE-200)
-#define NPT_ERROR_BASE_IO             (NPT_ERROR_BASE-300)
-#define NPT_ERROR_BASE_SOCKET         (NPT_ERROR_BASE-400)
-#define NPT_ERROR_BASE_INTERFACES     (NPT_ERROR_BASE-500)
-#define NPT_ERROR_BASE_XML            (NPT_ERROR_BASE-600)
-#define NPT_ERROR_BASE_UNIX           (NPT_ERROR_BASE-700)
-#define NPT_ERROR_BASE_HTTP           (NPT_ERROR_BASE-800)
-#define NPT_ERROR_BASE_THREADS        (NPT_ERROR_BASE-900)
-#define NPT_ERROR_BASE_SERIAL_PORT    (NPT_ERROR_BASE-1000)
-#define NPT_ERROR_BASE_TLS            (NPT_ERROR_BASE-1100)
-
-// general errors
-#define NPT_ERROR_INVALID_PARAMETERS  (NPT_ERROR_BASE_GENERAL - 0)
-#define NPT_ERROR_PERMISSION_DENIED   (NPT_ERROR_BASE_GENERAL - 1)
-#define NPT_ERROR_OUT_OF_MEMORY       (NPT_ERROR_BASE_GENERAL - 2)
-#define NPT_ERROR_NO_SUCH_NAME        (NPT_ERROR_BASE_GENERAL - 3)
-#define NPT_ERROR_NO_SUCH_PROPERTY    (NPT_ERROR_BASE_GENERAL - 4)
-#define NPT_ERROR_NO_SUCH_ITEM        (NPT_ERROR_BASE_GENERAL - 5)
-#define NPT_ERROR_NO_SUCH_CLASS       (NPT_ERROR_BASE_GENERAL - 6)
-#define NPT_ERROR_OVERFLOW            (NPT_ERROR_BASE_GENERAL - 7)
-#define NPT_ERROR_INTERNAL            (NPT_ERROR_BASE_GENERAL - 8)
-#define NPT_ERROR_INVALID_STATE       (NPT_ERROR_BASE_GENERAL - 9)
-#define NPT_ERROR_INVALID_FORMAT      (NPT_ERROR_BASE_GENERAL - 10)
-#define NPT_ERROR_INVALID_SYNTAX      (NPT_ERROR_BASE_GENERAL - 11)
-#define NPT_ERROR_NOT_IMPLEMENTED     (NPT_ERROR_BASE_GENERAL - 12)
-#define NPT_ERROR_NOT_SUPPORTED       (NPT_ERROR_BASE_GENERAL - 13)
-#define NPT_ERROR_TIMEOUT             (NPT_ERROR_BASE_GENERAL - 14)
-#define NPT_ERROR_WOULD_BLOCK         (NPT_ERROR_BASE_GENERAL - 15)
-#define NPT_ERROR_TERMINATED          (NPT_ERROR_BASE_GENERAL - 16)
-#define NPT_ERROR_OUT_OF_RANGE        (NPT_ERROR_BASE_GENERAL - 17)
-#define NPT_ERROR_OUT_OF_RESOURCES    (NPT_ERROR_BASE_GENERAL - 18)
-#define NPT_ERROR_NOT_ENOUGH_SPACE    (NPT_ERROR_BASE_GENERAL - 19)
-#define NPT_ERROR_INTERRUPTED         (NPT_ERROR_BASE_GENERAL - 20)
-#define NPT_ERROR_CANCELLED           (NPT_ERROR_BASE_GENERAL - 21)
-
-/* standard error codes                                  */
-/* these are special codes to convey an errno            */
-/* the error code is (SHI_ERROR_BASE_ERRNO - errno)      */
-/* where errno is the positive integer from errno.h      */
-#define NPT_ERROR_BASE_ERRNO          (NPT_ERROR_BASE-2000)
-#define NPT_ERROR_ERRNO(e)            (NPT_ERROR_BASE_ERRNO - (e))
-
-/*----------------------------------------------------------------------
-|   functions
-+---------------------------------------------------------------------*/
-const char* NPT_ResultText(int result);
-
-#endif // _NPT_RESULTS_H_

gpac-2.2.1.tar.gz/extra_lib/include/platinum/NptRingBuffer.h Deleted

@@ -1,84 +0,0 @@
-/*****************************************************************
-|
-|   Neptune - Ring Buffer
-|
-| Copyright (c) 2002-2008, Axiomatic Systems, LLC.
-| All rights reserved.
-|
-| Redistribution and use in source and binary forms, with or without
-| modification, are permitted provided that the following conditions are met:
-|     * Redistributions of source code must retain the above copyright
-|       notice, this list of conditions and the following disclaimer.
-|     * Redistributions in binary form must reproduce the above copyright
-|       notice, this list of conditions and the following disclaimer in the
-|       documentation and/or other materials provided with the distribution.
-|     * Neither the name of Axiomatic Systems nor the
-|       names of its contributors may be used to endorse or promote products
-|       derived from this software without specific prior written permission.
-|
-| THIS SOFTWARE IS PROVIDED BY AXIOMATIC SYSTEMS ''AS IS'' AND ANY
-| EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-| WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-| DISCLAIMED. IN NO EVENT SHALL AXIOMATIC SYSTEMS BE LIABLE FOR ANY
-| DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-| (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-| LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-| ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-| (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-| SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-|
- ****************************************************************/
-
-#ifndef _NPT_RING_BUFFER_H_
-#define _NPT_RING_BUFFER_H_
-
-/*----------------------------------------------------------------------
-|   includes
-+---------------------------------------------------------------------*/
-#include "NptTypes.h"
-#include "NptReferences.h"
-
-/*----------------------------------------------------------------------
-|   NPT_RingBuffer
-+---------------------------------------------------------------------*/
-class NPT_RingBuffer
-{
- public:
-    // methods
-                  NPT_RingBuffer(NPT_Size size);
-                  NPT_RingBuffer(void* buffer, NPT_Size size);
-    virtual      ~NPT_RingBuffer();
-    NPT_Size      GetSpace() const;
-    NPT_Size      GetContiguousSpace() const;
-    NPT_Result    Write(const void* buffer, NPT_Size byte_count);
-    NPT_Size      GetAvailable() const;
-    NPT_Size      GetContiguousAvailable() const;
-    NPT_Result    Read(void* buffer, NPT_Size byte_count);
-    unsigned char ReadByte();
-    unsigned char PeekByte(NPT_Position offset);
-    NPT_Result    MoveIn(NPT_Position offset);
-    NPT_Result    MoveOut(NPT_Position offset);
-    NPT_Result    Flush();
-    NPT_Result    Close();
-    bool          IsClosed() { return m_Closed; }
-
-    // accessors
-    unsigned char* GetWritePointer()  { return m_In; }
-    unsigned char* GetReadPointer()   { return m_Out;}
-
- private:
-    // members
-    struct {
-        unsigned char* start;
-        unsigned char* end;
-    }              m_Data;
-    unsigned char* m_In;
-    unsigned char* m_Out;
-//    NPT_Size       m_Size;
-    bool           m_BufferIsLocal;
-    bool           m_Closed;
-};
-
-typedef NPT_Reference<NPT_RingBuffer> NPT_RingBufferReference;
-
-#endif // _NPT_RING_BUFFER_H_

gpac-2.2.1.tar.gz/extra_lib/include/platinum/NptSelectableMessageQueue.h Deleted

@@ -1,68 +0,0 @@
-/*****************************************************************
-|
-|   Neptune - Selectable Message Queue
-|
-| Copyright (c) 2002-2008, Axiomatic Systems, LLC.
-| All rights reserved.
-|
-| Redistribution and use in source and binary forms, with or without
-| modification, are permitted provided that the following conditions are met:
-|     * Redistributions of source code must retain the above copyright
-|       notice, this list of conditions and the following disclaimer.
-|     * Redistributions in binary form must reproduce the above copyright
-|       notice, this list of conditions and the following disclaimer in the
-|       documentation and/or other materials provided with the distribution.
-|     * Neither the name of Axiomatic Systems nor the
-|       names of its contributors may be used to endorse or promote products
-|       derived from this software without specific prior written permission.
-|
-| THIS SOFTWARE IS PROVIDED BY AXIOMATIC SYSTEMS ''AS IS'' AND ANY
-| EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-| WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-| DISCLAIMED. IN NO EVENT SHALL AXIOMATIC SYSTEMS BE LIABLE FOR ANY
-| DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-| (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-| LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-| ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-| (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-| SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-|
- ****************************************************************/
-
-#ifndef _NPT_SELECTABLE_MESSAGE_QUEUE_H_
-#define _NPT_SELECTABLE_MESSAGE_QUEUE_H_
-
-/*----------------------------------------------------------------------
-|   includes
-+---------------------------------------------------------------------*/
-#include "NptMessaging.h"
-#include "NptSimpleMessageQueue.h"
-
-/*----------------------------------------------------------------------
-|   NPT_SelectableMessageQueue
-+---------------------------------------------------------------------*/
-class NPT_SelectableMessageQueue : public NPT_SimpleMessageQueue
-{
-public:
-    // methods
-             NPT_SelectableMessageQueue();
-    virtual ~NPT_SelectableMessageQueue();
-    
-    // NPT_MessageQueue methods
-    virtual NPT_Result PumpMessage(NPT_Timeout timeout = NPT_TIMEOUT_INFINITE);
-    virtual NPT_Result QueueMessage(NPT_Message*        message,
-                                    NPT_MessageHandler* handler);
-
-    // methods
-    int  GetEventFd() { return m_Pipe0; }
- 
-private:
-    // methods
-    NPT_Result FlushEvent();
-
-    // members
-    int m_Pipe2;
-};
-
-
-#endif /* _NPT_SELECTABLE_MESSAGE_QUEUE_H_ */

gpac-2.2.1.tar.gz/extra_lib/include/platinum/NptSerialPort.h Deleted

@@ -1,119 +0,0 @@
-/*****************************************************************
-|
-|   Neptune - Serial Ports
-|
-| Copyright (c) 2002-2008, Axiomatic Systems, LLC.
-| All rights reserved.
-|
-| Redistribution and use in source and binary forms, with or without
-| modification, are permitted provided that the following conditions are met:
-|     * Redistributions of source code must retain the above copyright
-|       notice, this list of conditions and the following disclaimer.
-|     * Redistributions in binary form must reproduce the above copyright
-|       notice, this list of conditions and the following disclaimer in the
-|       documentation and/or other materials provided with the distribution.
-|     * Neither the name of Axiomatic Systems nor the
-|       names of its contributors may be used to endorse or promote products
-|       derived from this software without specific prior written permission.
-|
-| THIS SOFTWARE IS PROVIDED BY AXIOMATIC SYSTEMS ''AS IS'' AND ANY
-| EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-| WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-| DISCLAIMED. IN NO EVENT SHALL AXIOMATIC SYSTEMS BE LIABLE FOR ANY
-| DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-| (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-| LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-| ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-| (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-| SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-|
- ****************************************************************/
-
-#ifndef _NPT_SERIAL_PORT_H_
-#define _NPT_SERIAL_PORT_H_
-
-/*----------------------------------------------------------------------
-|   includes
-+---------------------------------------------------------------------*/
-#include "NptTypes.h"
-#include "NptStreams.h"
-
-/*----------------------------------------------------------------------
-|   constants
-+---------------------------------------------------------------------*/
-const int NPT_ERROR_NO_SUCH_SERIAL_PORT      = NPT_ERROR_BASE_SERIAL_PORT - 0;
-const int NPT_ERROR_SERIAL_PORT_NOT_OPEN     = NPT_ERROR_BASE_SERIAL_PORT - 1;
-const int NPT_ERROR_SERIAL_PORT_ALREADY_OPEN = NPT_ERROR_BASE_SERIAL_PORT - 2;
-const int NPT_ERROR_SERIAL_PORT_BUSY         = NPT_ERROR_BASE_SERIAL_PORT - 3;
-
-typedef enum {
-    NPT_SERIAL_PORT_PARITY_NONE,
-    NPT_SERIAL_PORT_PARITY_EVEN,
-    NPT_SERIAL_PORT_PARITY_ODD,
-    NPT_SERIAL_PORT_PARITY_MARK
-} NPT_SerialPortParity;
-
-typedef enum {
-    NPT_SERIAL_PORT_STOP_BITS_1,
-    NPT_SERIAL_PORT_STOP_BITS_1_5,
-    NPT_SERIAL_PORT_STOP_BITS_2
-} NPT_SerialPortStopBits;
-
-typedef enum {
-    NPT_SERIAL_PORT_FLOW_CONTROL_NONE,
-    NPT_SERIAL_PORT_FLOW_CONTROL_HARDWARE,
-    NPT_SERIAL_PORT_FLOW_CONTROL_XON_XOFF
-} NPT_SerialPortFlowControl;
-
-/*----------------------------------------------------------------------
-|   NPT_SerialPortInterface
-+---------------------------------------------------------------------*/
-class NPT_SerialPortInterface
-{
-public:
-    // constructors and destructor
-    virtual ~NPT_SerialPortInterface() {}
-
-    // methods
-    virtual NPT_Result Open(unsigned int              speed, 
-                            NPT_SerialPortStopBits    stop_bits,
-                            NPT_SerialPortFlowControl flow_control,
-                            NPT_SerialPortParity      parity) = 0;
-    virtual NPT_Result Close() = 0;
-    virtual NPT_Result GetInputStream(NPT_InputStreamReference& stream) = 0;
-    virtual NPT_Result GetOutputStream(NPT_OutputStreamReference& stream) = 0;
-};
-
-/*----------------------------------------------------------------------
-|   NPT_SerialPort
-+---------------------------------------------------------------------*/
-class NPT_SerialPort : public NPT_SerialPortInterface
-{
-public:
-    // constructors and destructor
-    NPT_SerialPort(const char* name);
-   ~NPT_SerialPort() { delete m_Delegate; }
-
-    // NPT_SerialPortInterface methods
-    NPT_Result Open(unsigned int              speed, 
-                    NPT_SerialPortStopBits    stop_bits = NPT_SERIAL_PORT_STOP_BITS_1,
-                    NPT_SerialPortFlowControl flow_control = NPT_SERIAL_PORT_FLOW_CONTROL_NONE,
-                    NPT_SerialPortParity      parity = NPT_SERIAL_PORT_PARITY_NONE) {
-        return m_Delegate->Open(speed, stop_bits, flow_control, parity);
-    }
-    NPT_Result Close() {
-        return m_Delegate->Close();
-    }
-    NPT_Result GetInputStream(NPT_InputStreamReference& stream) {
-        return m_Delegate->GetInputStream(stream);
-    }
-    NPT_Result GetOutputStream(NPT_OutputStreamReference& stream) {
-        return m_Delegate->GetOutputStream(stream);
-    }
-
-protected:
-    // members
-    NPT_SerialPortInterface* m_Delegate;
-};
-
-#endif // _NPT_SERIAL_PORT_H_

gpac-2.2.1.tar.gz/extra_lib/include/platinum/NptSimpleMessageQueue.h Deleted

@@ -1,68 +0,0 @@
-/*****************************************************************
-|
-|   Neptune - Simple Message Queue
-|
-| Copyright (c) 2002-2008, Axiomatic Systems, LLC.
-| All rights reserved.
-|
-| Redistribution and use in source and binary forms, with or without
-| modification, are permitted provided that the following conditions are met:
-|     * Redistributions of source code must retain the above copyright
-|       notice, this list of conditions and the following disclaimer.
-|     * Redistributions in binary form must reproduce the above copyright
-|       notice, this list of conditions and the following disclaimer in the
-|       documentation and/or other materials provided with the distribution.
-|     * Neither the name of Axiomatic Systems nor the
-|       names of its contributors may be used to endorse or promote products
-|       derived from this software without specific prior written permission.
-|
-| THIS SOFTWARE IS PROVIDED BY AXIOMATIC SYSTEMS ''AS IS'' AND ANY
-| EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-| WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-| DISCLAIMED. IN NO EVENT SHALL AXIOMATIC SYSTEMS BE LIABLE FOR ANY
-| DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-| (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-| LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-| ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-| (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-| SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-|
- ****************************************************************/
-
-#ifndef _NPT_SIMPLE_MESSAGE_QUEUE_H_
-#define _NPT_SIMPLE_MESSAGE_QUEUE_H_
-
-/*----------------------------------------------------------------------
-|   includes
-+---------------------------------------------------------------------*/
-#include "NptTypes.h"
-#include "NptThreads.h"
-#include "NptMessaging.h"
-#include "NptQueue.h"
-
-/*----------------------------------------------------------------------
-|   class references
-+---------------------------------------------------------------------*/
-class NPT_SimpleMessageCapsule;
-
-/*----------------------------------------------------------------------
-|   NPT_SimpleMessageQueue
-+---------------------------------------------------------------------*/
-class NPT_SimpleMessageQueue : public NPT_MessageQueue
-{
- public:
-    // members
-    NPT_SimpleMessageQueue();
-    virtual ~NPT_SimpleMessageQueue();
-
-    // NPT_MessageQueue methods
-    virtual NPT_Result QueueMessage(NPT_Message*        message, 
-                                    NPT_MessageHandler* handler);
-    virtual NPT_Result PumpMessage(NPT_Timeout timeout = NPT_TIMEOUT_INFINITE);
-
- private:
-    // members
-    NPT_Queue<NPT_SimpleMessageCapsule> m_Queue;
-};
-
-#endif // _NPT_SIMPLE_MESSAGE_QUEUE_H_

gpac-2.2.1.tar.gz/extra_lib/include/platinum/NptSockets.h Deleted

@@ -1,335 +0,0 @@
-/*****************************************************************
-|
-|   Neptune - Network Sockets
-|
-| Copyright (c) 2002-2008, Axiomatic Systems, LLC.
-| All rights reserved.
-|
-| Redistribution and use in source and binary forms, with or without
-| modification, are permitted provided that the following conditions are met:
-|     * Redistributions of source code must retain the above copyright
-|       notice, this list of conditions and the following disclaimer.
-|     * Redistributions in binary form must reproduce the above copyright
-|       notice, this list of conditions and the following disclaimer in the
-|       documentation and/or other materials provided with the distribution.
-|     * Neither the name of Axiomatic Systems nor the
-|       names of its contributors may be used to endorse or promote products
-|       derived from this software without specific prior written permission.
-|
-| THIS SOFTWARE IS PROVIDED BY AXIOMATIC SYSTEMS ''AS IS'' AND ANY
-| EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-| WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-| DISCLAIMED. IN NO EVENT SHALL AXIOMATIC SYSTEMS BE LIABLE FOR ANY
-| DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-| (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-| LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-| ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-| (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-| SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-|
- ****************************************************************/
-
-#ifndef _NPT_SOCKETS_H_
-#define _NPT_SOCKETS_H_
-
-/*----------------------------------------------------------------------
-|   includes
-+---------------------------------------------------------------------*/
-#include "NptTypes.h"
-#include "NptConstants.h"
-#include "NptStreams.h"
-#include "NptStrings.h"
-#include "NptDataBuffer.h"
-#include "NptNetwork.h"
-
-/*----------------------------------------------------------------------
-|   constants
-+---------------------------------------------------------------------*/
-const int NPT_ERROR_CONNECTION_RESET      = NPT_ERROR_BASE_SOCKET - 0;
-const int NPT_ERROR_CONNECTION_ABORTED    = NPT_ERROR_BASE_SOCKET - 1;
-const int NPT_ERROR_CONNECTION_REFUSED    = NPT_ERROR_BASE_SOCKET - 2;
-const int NPT_ERROR_CONNECTION_FAILED     = NPT_ERROR_BASE_SOCKET - 3;
-const int NPT_ERROR_HOST_UNKNOWN          = NPT_ERROR_BASE_SOCKET - 4;
-const int NPT_ERROR_SOCKET_FAILED         = NPT_ERROR_BASE_SOCKET - 5;
-const int NPT_ERROR_GETSOCKOPT_FAILED     = NPT_ERROR_BASE_SOCKET - 6;
-const int NPT_ERROR_SETSOCKOPT_FAILED     = NPT_ERROR_BASE_SOCKET - 7;
-const int NPT_ERROR_SOCKET_CONTROL_FAILED = NPT_ERROR_BASE_SOCKET - 8;
-const int NPT_ERROR_BIND_FAILED           = NPT_ERROR_BASE_SOCKET - 9;
-const int NPT_ERROR_LISTEN_FAILED         = NPT_ERROR_BASE_SOCKET - 10;
-const int NPT_ERROR_ACCEPT_FAILED         = NPT_ERROR_BASE_SOCKET - 11;
-const int NPT_ERROR_ADDRESS_IN_USE        = NPT_ERROR_BASE_SOCKET - 12;
-const int NPT_ERROR_NETWORK_DOWN          = NPT_ERROR_BASE_SOCKET - 13;
-const int NPT_ERROR_NETWORK_UNREACHABLE   = NPT_ERROR_BASE_SOCKET - 14;
-const int NPT_ERROR_NOT_CONNECTED         = NPT_ERROR_BASE_SOCKET - 15;
-
-const unsigned int NPT_SOCKET_FLAG_CANCELLABLE = 1; // make the socket cancellable
-
-/*----------------------------------------------------------------------
-|   forward references
-+---------------------------------------------------------------------*/
-class NPT_Socket;
-
-/*----------------------------------------------------------------------
-|   NPT_SocketAddress
-+---------------------------------------------------------------------*/
-class NPT_SocketAddress 
-{
-public:
-    // constructors and destructor
-    NPT_SocketAddress() : m_Port(0) {}
-    NPT_SocketAddress(const NPT_IpAddress& address, NPT_IpPort port) :
-        m_IpAddress(address),
-        m_Port(port) {}
-
-    // methods
-    NPT_Result SetIpAddress(const NPT_IpAddress& address) {
-        m_IpAddress = address;
-        return NPT_SUCCESS;
-    }
-    const NPT_IpAddress& GetIpAddress() const { 
-        return m_IpAddress; 
-    }
-    NPT_Result SetPort(NPT_IpPort port) { 
-        m_Port = port; 
-        return NPT_SUCCESS; 
-    }
-    NPT_IpPort GetPort() const { 
-        return m_Port; 
-    }
-    NPT_String ToString() const;
-
-    // operators
-    bool operator==(const NPT_SocketAddress& other) const;
-
-private:
-    // members
-    NPT_IpAddress m_IpAddress;
-    NPT_IpPort    m_Port;
-};
-
-/*----------------------------------------------------------------------
-|   NPT_SocketInfo
-+---------------------------------------------------------------------*/
-typedef struct {
-    NPT_SocketAddress local_address;
-    NPT_SocketAddress remote_address;
-} NPT_SocketInfo;
-
-/*----------------------------------------------------------------------
-|   NPT_SocketInterface
-+---------------------------------------------------------------------*/
-class NPT_SocketInterface
-{
- public:
-    virtual ~NPT_SocketInterface() {}
-
-    // interface methods
-    virtual NPT_Result Bind(const NPT_SocketAddress& address, bool reuse_address = true) = 0;
-    virtual NPT_Result Connect(const NPT_SocketAddress& address, NPT_Timeout timeout) = 0;
-    virtual NPT_Result WaitForConnection(NPT_Timeout timeout) = 0;
-    virtual NPT_Result GetInputStream(NPT_InputStreamReference& stream) = 0;
-    virtual NPT_Result GetOutputStream(NPT_OutputStreamReference& stream) = 0;
-    virtual NPT_Result GetInfo(NPT_SocketInfo& info) = 0;
-    virtual NPT_Result SetReadTimeout(NPT_Timeout timeout) = 0;
-    virtual NPT_Result SetWriteTimeout(NPT_Timeout timeout) = 0;
-    virtual NPT_Result Cancel(bool shutdown=true) = 0;
-};
-
-/*----------------------------------------------------------------------
-|   NPT_UdpSocketInterface
-+---------------------------------------------------------------------*/
-class NPT_UdpSocketInterface
-{
- public:
-    virtual ~NPT_UdpSocketInterface() {}
-
-    // methods
-    virtual NPT_Result Send(const NPT_DataBuffer&    packet, 
-                            const NPT_SocketAddress* address = NULL) = 0;
-    virtual NPT_Result Receive(NPT_DataBuffer&    packet, 
-                               NPT_SocketAddress* address = NULL) = 0;
-};
-
-/*----------------------------------------------------------------------
-|   NPT_UdpMulticastSocketInterface
-+---------------------------------------------------------------------*/
-class NPT_UdpMulticastSocketInterface
-{
- public:
-    virtual ~NPT_UdpMulticastSocketInterface() {}
-
-    // methods
-    virtual NPT_Result JoinGroup(const NPT_IpAddress& group, 
-                                 const NPT_IpAddress& iface) = 0;
-    virtual NPT_Result LeaveGroup(const NPT_IpAddress& group,
-                                  const NPT_IpAddress& iface) = 0;
-    virtual NPT_Result SetTimeToLive(unsigned char ttl) = 0;
-    virtual NPT_Result SetInterface(const NPT_IpAddress& iface) = 0;
-};
-
-/*----------------------------------------------------------------------
-|   NPT_TcpServerSocketInterface
-+---------------------------------------------------------------------*/
-class NPT_TcpServerSocketInterface
-{
- public:
-    virtual ~NPT_TcpServerSocketInterface() {}
-
-    // interface methods
-    virtual NPT_Result Listen(unsigned int max_clients) = 0;
-    virtual NPT_Result WaitForNewClient(NPT_Socket*& client, 
-                                        NPT_Timeout  timeout,
-                                        NPT_Flags    flags) = 0;
-};
-
-/*----------------------------------------------------------------------
-|   NPT_Socket
-+---------------------------------------------------------------------*/
-class NPT_Socket : public NPT_SocketInterface
-{
-public:
-    // constructor and destructor
-    explicit NPT_Socket(NPT_SocketInterface* delegate) : m_SocketDelegate(delegate) {}
-    virtual ~NPT_Socket();
-
-    // delegate NPT_SocketInterface methods
-    NPT_Result Bind(const NPT_SocketAddress& address, bool reuse_address = true) {             
-        return m_SocketDelegate->Bind(address, reuse_address);                            
-    }                                                               
-    NPT_Result Connect(const NPT_SocketAddress& address,            
-                       NPT_Timeout timeout = NPT_TIMEOUT_INFINITE) {
-       return m_SocketDelegate->Connect(address, timeout);                 
-    }                                                               
-    NPT_Result WaitForConnection(NPT_Timeout timeout = NPT_TIMEOUT_INFINITE) {
-        return m_SocketDelegate->WaitForConnection(timeout);                 
-    } 
-    NPT_Result GetInputStream(NPT_InputStreamReference& stream) {   
-        return m_SocketDelegate->GetInputStream(stream);                   
-    }                                                               
-    NPT_Result GetOutputStream(NPT_OutputStreamReference& stream) { 
-    return m_SocketDelegate->GetOutputStream(stream);                      
-    }                                                               
-    NPT_Result GetInfo(NPT_SocketInfo& info) {                      
-        return m_SocketDelegate->GetInfo(info);                            
-    }                                                               
-    NPT_Result SetReadTimeout(NPT_Timeout timeout) {                      
-        return m_SocketDelegate->SetReadTimeout(timeout);                            
-    }                                                          
-    NPT_Result SetWriteTimeout(NPT_Timeout timeout) {                      
-        return m_SocketDelegate->SetWriteTimeout(timeout);                            
-    }                                                          
-    NPT_Result Cancel(bool shutdown=true) {                      
-        return m_SocketDelegate->Cancel(shutdown);                            
-    }                                                          
-
-protected:
-    // constructor
-    NPT_Socket() {}
-
-    // members
-    NPT_SocketInterface* m_SocketDelegate;
-};
-
-typedef NPT_Reference<NPT_Socket> NPT_SocketReference;
-
-/*----------------------------------------------------------------------
-|   NPT_UdpSocket
-+---------------------------------------------------------------------*/
-class NPT_UdpSocket : public NPT_Socket,
-                      public NPT_UdpSocketInterface
-{
- public:
-    // constructor and destructor
-             NPT_UdpSocket(NPT_Flags flags=NPT_SOCKET_FLAG_CANCELLABLE);
-    virtual ~NPT_UdpSocket();
-
-    // delegate NPT_UdpSocketInterface methods
-    NPT_Result Send(const NPT_DataBuffer&    packet,           
-                    const NPT_SocketAddress* address = NULL) {
-        return m_UdpSocketDelegate->Send(packet, address);              
-    }                                                         
-    NPT_Result Receive(NPT_DataBuffer&     packet,            
-                       NPT_SocketAddress*  address = NULL) {  
-        return m_UdpSocketDelegate->Receive(packet, address);           
-    }
-
-protected:
-    // constructor
-    NPT_UdpSocket(NPT_UdpSocketInterface* delegate);
-
-    // members
-    NPT_UdpSocketInterface* m_UdpSocketDelegate;
-};
-
-/*----------------------------------------------------------------------
-|   NPT_UdpMulticastSocket
-+---------------------------------------------------------------------*/
-class NPT_UdpMulticastSocket : public NPT_UdpSocket, 
-                               public NPT_UdpMulticastSocketInterface
-{
-public:
-    // constructor and destructor
-             NPT_UdpMulticastSocket(NPT_Flags flags=NPT_SOCKET_FLAG_CANCELLABLE);
-    virtual ~NPT_UdpMulticastSocket();
-
-    // delegate NPT_UdpMulticastSocketInterface methods
-    NPT_Result JoinGroup(const NPT_IpAddress& group,            
-                         const NPT_IpAddress& iface =           
-                         NPT_IpAddress::Any) {                  
-        return m_UdpMulticastSocketDelegate->JoinGroup(group, iface);
-    }                                                           
-    NPT_Result LeaveGroup(const NPT_IpAddress& group,           
-                          const NPT_IpAddress& iface =          
-                          NPT_IpAddress::Any) {                 
-        return m_UdpMulticastSocketDelegate->LeaveGroup(group, iface);
-    }                                                          
-    NPT_Result SetTimeToLive(unsigned char ttl) {     
-        return m_UdpMulticastSocketDelegate->SetTimeToLive(ttl); 
-    }
-    NPT_Result SetInterface(const NPT_IpAddress& iface) {
-        return m_UdpMulticastSocketDelegate->SetInterface(iface);
-    }
-
-protected:
-    // members
-    NPT_UdpMulticastSocketInterface* m_UdpMulticastSocketDelegate;
-};
-
-/*----------------------------------------------------------------------
-|   NPT_TcpClientSocket
-+---------------------------------------------------------------------*/
-class NPT_TcpClientSocket : public NPT_Socket
-{
-public:
-    // constructors and destructor
-             NPT_TcpClientSocket(NPT_Flags flags=NPT_SOCKET_FLAG_CANCELLABLE);
-    virtual ~NPT_TcpClientSocket();
-};
-
-/*----------------------------------------------------------------------
-|   NPT_TcpServerSocket
-+---------------------------------------------------------------------*/
-class NPT_TcpServerSocket : public NPT_Socket,
-                            public NPT_TcpServerSocketInterface
-{
-public:
-    // constructors and destructor
-             NPT_TcpServerSocket(NPT_Flags flags=NPT_SOCKET_FLAG_CANCELLABLE);
-    virtual ~NPT_TcpServerSocket();
-
-    // delegate NPT_TcpServerSocketInterface methods
-    NPT_Result Listen(unsigned int max_clients) {   
-        return m_TcpServerSocketDelegate->Listen(max_clients);
-    }
-    NPT_Result WaitForNewClient(NPT_Socket*& client, 
-                                NPT_Timeout  timeout = NPT_TIMEOUT_INFINITE,
-                                NPT_Flags    flags = 0) {
-        return m_TcpServerSocketDelegate->WaitForNewClient(client, timeout, flags);
-    }
-
-protected:
-    // members
-    NPT_TcpServerSocketInterface* m_TcpServerSocketDelegate;
-};
-
-#endif // _NPT_SOCKETS_H_

gpac-2.2.1.tar.gz/extra_lib/include/platinum/NptStack.h Deleted

@@ -1,74 +0,0 @@
-/*****************************************************************
-|
-|   Neptune - Stack
-|
-| Copyright (c) 2002-2008, Axiomatic Systems, LLC.
-| All rights reserved.
-|
-| Redistribution and use in source and binary forms, with or without
-| modification, are permitted provided that the following conditions are met:
-|     * Redistributions of source code must retain the above copyright
-|       notice, this list of conditions and the following disclaimer.
-|     * Redistributions in binary form must reproduce the above copyright
-|       notice, this list of conditions and the following disclaimer in the
-|       documentation and/or other materials provided with the distribution.
-|     * Neither the name of Axiomatic Systems nor the
-|       names of its contributors may be used to endorse or promote products
-|       derived from this software without specific prior written permission.
-|
-| THIS SOFTWARE IS PROVIDED BY AXIOMATIC SYSTEMS ''AS IS'' AND ANY
-| EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-| WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-| DISCLAIMED. IN NO EVENT SHALL AXIOMATIC SYSTEMS BE LIABLE FOR ANY
-| DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-| (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-| LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-| ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-| (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-| SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-|
-****************************************************************/
-
-#ifndef _NPT_STACK_H_
-#define _NPT_STACK_H_
-
-/*----------------------------------------------------------------------
-|   includes
-+---------------------------------------------------------------------*/
-#include "NptResults.h"
-#include "NptTypes.h"
-#include "NptList.h"
-
-/*----------------------------------------------------------------------
-|   NPT_Stack
-+---------------------------------------------------------------------*/
-template <typename T> 
-class NPT_Stack : public NPT_List<T>
-{
-public:
-    // methods
-    NPT_Result Push(const T& value) {
-        // NOTE: we must use the this-> accessor here because the standard
-        // requires it when the member to look up is in a parent template
-        return this->Add(value);
-    }
-
-    NPT_Result Peek(T& value) {
-        // NOTE: we must use the this-> accessor here because the standard
-        // requires it when the member to look up is in a parent template
-        if (this->m_ItemCount == 0) return NPT_ERROR_NO_SUCH_ITEM;
-        value = this->m_Tail->m_Data;
-        return NPT_SUCCESS;
-    }
-
-    NPT_Result Pop(T& value) {
-        // NOTE: we must use the this-> accessor here because the standard
-        // requires it when the member to look up is in a parent template
-        if (this->m_ItemCount == 0) return NPT_ERROR_NO_SUCH_ITEM;
-        typename NPT_List<T>::Iterator tail = this->GetLastItem();
-        value = *tail;
-        return this->Erase(tail);
-    }
-};
-
-#endif // _NPT_STACK_H_

gpac-2.2.1.tar.gz/extra_lib/include/platinum/NptStreams.h Deleted

@@ -1,321 +0,0 @@
-/*****************************************************************
-|
-|   Neptune - Byte Streams
-|
-| Copyright (c) 2002-2008, Axiomatic Systems, LLC.
-| All rights reserved.
-|
-| Redistribution and use in source and binary forms, with or without
-| modification, are permitted provided that the following conditions are met:
-|     * Redistributions of source code must retain the above copyright
-|       notice, this list of conditions and the following disclaimer.
-|     * Redistributions in binary form must reproduce the above copyright
-|       notice, this list of conditions and the following disclaimer in the
-|       documentation and/or other materials provided with the distribution.
-|     * Neither the name of Axiomatic Systems nor the
-|       names of its contributors may be used to endorse or promote products
-|       derived from this software without specific prior written permission.
-|
-| THIS SOFTWARE IS PROVIDED BY AXIOMATIC SYSTEMS ''AS IS'' AND ANY
-| EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-| WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-| DISCLAIMED. IN NO EVENT SHALL AXIOMATIC SYSTEMS BE LIABLE FOR ANY
-| DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-| (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-| LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-| ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-| (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-| SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-|
- ****************************************************************/
-
-#ifndef _NPT_STREAMS_H_
-#define _NPT_STREAMS_H_
-
-/*----------------------------------------------------------------------
-|    includes
-+---------------------------------------------------------------------*/
-#include "NptTypes.h"
-#include "NptReferences.h"
-#include "NptConstants.h"
-#include "NptResults.h"
-#include "NptDataBuffer.h"
-#include "NptStrings.h"
-
-/*----------------------------------------------------------------------
-|    class references
-+---------------------------------------------------------------------*/
-class NPT_String;
-
-/*----------------------------------------------------------------------
-|    constants
-+---------------------------------------------------------------------*/
-const int NPT_ERROR_READ_FAILED  = NPT_ERROR_BASE_IO - 0;
-const int NPT_ERROR_WRITE_FAILED = NPT_ERROR_BASE_IO - 1;
-const int NPT_ERROR_EOS          = NPT_ERROR_BASE_IO - 2;
-
-/*----------------------------------------------------------------------
-|    NPT_InputStream
-+---------------------------------------------------------------------*/
-class NPT_InputStream
-{
- public:
-    // constructor and destructor
-    virtual ~NPT_InputStream() {};
-
-    // methods
-    virtual NPT_Result Load(NPT_DataBuffer& buffer, NPT_Size max_read = 0);
-    virtual NPT_Result Read(void*     buffer, 
-                            NPT_Size  bytes_to_read, 
-                            NPT_Size* bytes_read = NULL) = 0;
-    virtual NPT_Result ReadFully(void*     buffer, 
-                                 NPT_Size  bytes_to_read);
-    virtual NPT_Result Seek(NPT_Position offset) = 0;
-    virtual NPT_Result Skip(NPT_Size offset);
-    virtual NPT_Result Tell(NPT_Position& offset) = 0;
-    virtual NPT_Result GetSize(NPT_LargeSize& size) = 0;
-    virtual NPT_Result GetAvailable(NPT_LargeSize& available) = 0;
-    
-    // data access methods
-    NPT_Result ReadUI64(NPT_UInt64& value);
-    NPT_Result ReadUI32(NPT_UInt32& value);
-    NPT_Result ReadUI24(NPT_UInt32& value);
-    NPT_Result ReadUI16(NPT_UInt16& value);
-    NPT_Result ReadUI08(NPT_UInt8&  value);    
-};
-
-typedef NPT_Reference<NPT_InputStream> NPT_InputStreamReference;
-
-/*----------------------------------------------------------------------
-|    NPT_OutputStream
-+---------------------------------------------------------------------*/
-class NPT_OutputStream
-{
-public:
-    // constructor and destructor
-    virtual ~NPT_OutputStream() {};
-
-    // methods
-    virtual NPT_Result Write(const void* buffer, 
-                             NPT_Size    bytes_to_write, 
-                             NPT_Size*   bytes_written = NULL) = 0;
-    virtual NPT_Result WriteFully(const void* buffer, 
-                                  NPT_Size    bytes_to_write);
-    virtual NPT_Result WriteString(const char* string_buffer);
-    virtual NPT_Result WriteLine(const char* line_buffer);
-    virtual NPT_Result Seek(NPT_Position offset) = 0;
-    virtual NPT_Result Tell(NPT_Position& offset) = 0;
-    virtual NPT_Result Flush() { return NPT_SUCCESS; }
-    
-    // data access methods
-    NPT_Result WriteUI64(NPT_UInt64 value);
-    NPT_Result WriteUI32(NPT_UInt32 value);
-    NPT_Result WriteUI24(NPT_UInt32 value);
-    NPT_Result WriteUI16(NPT_UInt16 value);
-    NPT_Result WriteUI08(NPT_UInt8  value);    
-};
-
-typedef NPT_Reference<NPT_OutputStream> NPT_OutputStreamReference;
-
-/*----------------------------------------------------------------------
-|    NPT_StreamToStreamCopy
-+---------------------------------------------------------------------*/
-NPT_Result NPT_StreamToStreamCopy(NPT_InputStream&  from, 
-                                  NPT_OutputStream& to,
-                                  NPT_Position      offset = 0,
-                                  NPT_LargeSize     size   = 0, /* 0 means the entire stream */
-                                  NPT_LargeSize*    bytes_written = NULL);
-
-/*----------------------------------------------------------------------
-|    NPT_DelegatingInputStream
-|
-|    Use this class as a base class if you need to inherit both from
-|    NPT_InputStream and NPT_OutputStream which share the Seek and Tell
-|    method. In this case, you override the  base-specific version of 
-|    those methods, InputSeek, InputTell, instead of the Seek and Tell 
-|    methods.
-+---------------------------------------------------------------------*/
-class NPT_DelegatingInputStream : public NPT_InputStream
-{
-public:
-    // NPT_InputStream methods
-    NPT_Result Seek(NPT_Position offset) {
-        return InputSeek(offset);
-    }
-    NPT_Result Tell(NPT_Position& offset) {
-        return InputTell(offset);
-    }
-
-private:
-    // methods
-    virtual NPT_Result InputSeek(NPT_Position  offset) = 0;
-    virtual NPT_Result InputTell(NPT_Position& offset) = 0;
-};
-
-/*----------------------------------------------------------------------
-|    NPT_DelegatingOutputStream
-|
-|    Use this class as a base class if you need to inherit both from
-|    NPT_InputStream and NPT_OutputStream which share the Seek and Tell
-|    method. In this case, you override the  base-specific version of 
-|    those methods, OutputSeek and OutputTell, instead of the Seek and 
-|    Tell methods.
-+---------------------------------------------------------------------*/
-class NPT_DelegatingOutputStream : public NPT_OutputStream
-{
-public:
-    // NPT_OutputStream methods
-    NPT_Result Seek(NPT_Position offset) {
-        return OutputSeek(offset);
-    }
-    NPT_Result Tell(NPT_Position& offset) {
-        return OutputTell(offset);
-    }
-
-private:
-    // methods
-    virtual NPT_Result OutputSeek(NPT_Position  offset) = 0;
-    virtual NPT_Result OutputTell(NPT_Position& offset) = 0;
-};
-
-/*----------------------------------------------------------------------
-|    NPT_MemoryStream
-+---------------------------------------------------------------------*/
-class NPT_MemoryStream : 
-    public NPT_DelegatingInputStream,
-    public NPT_DelegatingOutputStream
-{
-public:
-    // constructor and destructor
-    NPT_MemoryStream(NPT_Size initial_capacity = 0);
-    NPT_MemoryStream(const void* data, NPT_Size size);
-    virtual ~NPT_MemoryStream() {}
-
-    // accessors
-    const NPT_DataBuffer& GetBuffer() const { return m_Buffer; }
-
-    // NPT_InputStream methods
-    NPT_Result Read(void*     buffer, 
-                    NPT_Size  bytes_to_read, 
-                    NPT_Size* bytes_read = NULL);
-    NPT_Result GetSize(NPT_LargeSize& size)  { 
-        size = m_Buffer.GetDataSize();    
-        return NPT_SUCCESS;
-    }
-    NPT_Result GetAvailable(NPT_LargeSize& available) { 
-        available = (NPT_LargeSize)m_Buffer.GetDataSize()-m_ReadOffset; 
-        return NPT_SUCCESS;
-    }
-
-    // NPT_OutputStream methods
-    NPT_Result Write(const void* buffer, 
-                     NPT_Size    bytes_to_write, 
-                     NPT_Size*   bytes_written = NULL);
-
-    // methods delegated to m_Buffer
-    const NPT_Byte* GetData() const { return m_Buffer.GetData(); }
-    NPT_Byte*       UseData()       { return m_Buffer.UseData(); }
-    NPT_Size        GetDataSize() const   { return m_Buffer.GetDataSize(); }
-    NPT_Size        GetBufferSize() const { return m_Buffer.GetBufferSize();}
-
-    // methods
-    NPT_Result SetDataSize(NPT_Size size);
-
-private:
-    // NPT_DelegatingInputStream methods
-    NPT_Result InputSeek(NPT_Position offset);
-    NPT_Result InputTell(NPT_Position& offset) { 
-        offset = m_ReadOffset; 
-        return NPT_SUCCESS;
-    }
-
-    // NPT_DelegatingOutputStream methods
-    NPT_Result OutputSeek(NPT_Position offset);
-    NPT_Result OutputTell(NPT_Position& offset) {
-        offset = m_WriteOffset; 
-        return NPT_SUCCESS;
-    }
-
-protected:
-    // members
-    NPT_DataBuffer m_Buffer;
-    NPT_Size       m_ReadOffset;
-    NPT_Size       m_WriteOffset;
-};
-
-typedef NPT_Reference<NPT_MemoryStream> NPT_MemoryStreamReference;
-
-/*----------------------------------------------------------------------
-|   NPT_StringOutputStream
-+---------------------------------------------------------------------*/
-class NPT_StringOutputStream : public NPT_OutputStream
-{
-public:
-    // methods
-    NPT_StringOutputStream(NPT_Size size = 4096);
-    NPT_StringOutputStream(NPT_String* storage);
-    virtual ~NPT_StringOutputStream() ;
-
-    const NPT_String& GetString() const { return *m_String; }
-    NPT_Result Reset() { if (m_String) m_String->SetLength(0); return NPT_SUCCESS; }
-
-    // NPT_OutputStream methods
-    NPT_Result Write(const void* buffer, NPT_Size bytes_to_write, NPT_Size* bytes_written = NULL);
-
-    NPT_Result Seek(NPT_Position /*offset*/)  { return NPT_ERROR_NOT_SUPPORTED;   }
-    NPT_Result Tell(NPT_Position& offset) { offset = m_String->GetLength(); return NPT_SUCCESS; }
-
-protected:
-    NPT_String* m_String;
-    bool        m_StringIsOwned;
-};
-
-typedef NPT_Reference<NPT_StringOutputStream> NPT_StringOutputStreamReference;
-
-/*----------------------------------------------------------------------
-|   NPT_SubInputStream
-+---------------------------------------------------------------------*/
-class NPT_SubInputStream : public NPT_InputStream
-{
-public:
-    // constructor and destructor
-    NPT_SubInputStream(NPT_InputStreamReference& source, 
-                       NPT_Position              start,
-                       NPT_LargeSize             size); 
-
-    // methods
-    virtual NPT_Result Read(void*     buffer, 
-                            NPT_Size  bytes_to_read, 
-                            NPT_Size* bytes_read = NULL) = 0;
-    virtual NPT_Result Seek(NPT_Position offset) = 0;
-    virtual NPT_Result Tell(NPT_Position& offset) = 0;
-    virtual NPT_Result GetSize(NPT_LargeSize& size) = 0;
-    virtual NPT_Result GetAvailable(NPT_LargeSize& available) = 0;
-
-private:
-    NPT_InputStreamReference m_Source;
-    NPT_Position             m_Position;
-    NPT_Position             m_Start;
-    NPT_LargeSize            m_Size;
-};
-
-/*----------------------------------------------------------------------
-|   NPT_NullOutputStream
-+---------------------------------------------------------------------*/
-class NPT_NullOutputStream : public NPT_OutputStream
-{
-public:
-    // methods
-    NPT_NullOutputStream() {}
-    virtual ~NPT_NullOutputStream() {}
-
-    // NPT_OutputStream methods
-    NPT_Result Write(const void* buffer, NPT_Size bytes_to_write, NPT_Size* bytes_written = NULL);
-
-    NPT_Result Seek(NPT_Position /*offset*/)  { return NPT_ERROR_NOT_SUPPORTED;   }
-    NPT_Result Tell(NPT_Position& /*offset*/)  { return NPT_ERROR_NOT_SUPPORTED;   }
-};
-
-typedef NPT_Reference<NPT_NullOutputStream> NPT_NullOutputStreamReference;
-
-#endif // _NPT_STREAMS_H_

gpac-2.2.1.tar.gz/extra_lib/include/platinum/NptStrings.h Deleted

@@ -1,358 +0,0 @@
-/*****************************************************************
-|
-|   Neptune - String Objects
-|
-| Copyright (c) 2002-2008, Axiomatic Systems, LLC.
-| All rights reserved.
-|
-| Redistribution and use in source and binary forms, with or without
-| modification, are permitted provided that the following conditions are met:
-|     * Redistributions of source code must retain the above copyright
-|       notice, this list of conditions and the following disclaimer.
-|     * Redistributions in binary form must reproduce the above copyright
-|       notice, this list of conditions and the following disclaimer in the
-|       documentation and/or other materials provided with the distribution.
-|     * Neither the name of Axiomatic Systems nor the
-|       names of its contributors may be used to endorse or promote products
-|       derived from this software without specific prior written permission.
-|
-| THIS SOFTWARE IS PROVIDED BY AXIOMATIC SYSTEMS ''AS IS'' AND ANY
-| EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-| WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-| DISCLAIMED. IN NO EVENT SHALL AXIOMATIC SYSTEMS BE LIABLE FOR ANY
-| DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-| (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-| LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-| ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-| (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-| SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-|
- ****************************************************************/
-
-#ifndef _NPT_STRINGS_H_
-#define _NPT_STRINGS_H_
-
-/*----------------------------------------------------------------------
-|   includes
-+---------------------------------------------------------------------*/
-#include "NptConfig.h"
-#if defined(NPT_CONFIG_HAVE_NEW_H)
-#include <new>
-#endif
-#include "NptTypes.h"
-#include "NptConstants.h"
-#include "NptList.h"
-#include "NptArray.h"
-#include "NptDebug.h"
-#include "NptHash.h"
-
-/*----------------------------------------------------------------------
-|   constants
-+---------------------------------------------------------------------*/
-const int NPT_STRING_SEARCH_FAILED = -1;
-
-/*----------------------------------------------------------------------
-|   NPT_String
-+---------------------------------------------------------------------*/
-class NPT_String
-{
-public:
-    // factories
-    static NPT_String FromInteger(NPT_Int64 value);
-    static NPT_String FromIntegerU(NPT_UInt64 value);
-    static NPT_String Format(const char* format, ...);
-    
-    // constructors
-    NPT_String(const NPT_String& str);
-    NPT_String(const char* str);
-    NPT_String(const char* str, NPT_Size length);
-    NPT_String(char c, NPT_Cardinal repeat = 1);
-    NPT_String() : m_Chars(NULL) {}
-   ~NPT_String() { if (m_Chars) GetBuffer()->Destroy(); }
-
-    // string info and manipulations
-    bool       IsEmpty() const { return m_Chars == NULL || GetBuffer()->GetLength() == 0; }
-    NPT_Size   GetLength()   const { return m_Chars ? GetBuffer()->GetLength() : 0;    }
-    NPT_Size   GetCapacity() const { return m_Chars ? GetBuffer()->GetAllocated() : 0; }
-    NPT_Result SetLength(NPT_Size length, bool pad = false);
-    void       Assign(const char* chars, NPT_Size size);
-    void       Append(const char* chars, NPT_Size size);
-    void       Append(const char* s) { Append(s, StringLength(s)); }
-    int        Compare(const char* s, bool ignore_case = false) const;
-    static int Compare(const char* s1, const char* s2, bool ignore_case = false);
-    int        CompareN(const char* s, NPT_Size count, bool ignore_case = false) const;
-    static int CompareN(const char* s1, const char* s2, NPT_Size count, bool ignore_case = false);
-
-    // substrings
-    NPT_String SubString(NPT_Ordinal first, NPT_Size length) const;
-    NPT_String SubString(NPT_Ordinal first) const {
-        return SubString(first, GetLength());
-    }
-    NPT_String Left(NPT_Size length) const {
-        return SubString(0, length);
-    }
-    NPT_String Right(NPT_Size length) const {
-        return length >= GetLength() ? 
-               *this : 
-               SubString(GetLength()-length, length);
-    }
-    NPT_List<NPT_String> Split(const char* separator) const;
-    NPT_Array<NPT_String> SplitAny(const char* separator) const;
-    static NPT_String Join(NPT_List<NPT_String>& args, const char* separator);
-    
-    // buffer management
-    void       Reserve(NPT_Size length);
-
-    // hashing
-    NPT_UInt32 GetHash32() const;
-    NPT_UInt64 GetHash64() const;
-
-    // conversions
-    NPT_String ToLowercase() const;
-    NPT_String ToUppercase() const;
-    NPT_Result ToInteger(int& value, bool relaxed = true) const;
-    NPT_Result ToInteger(unsigned int& value, bool relaxed = true) const;
-    NPT_Result ToInteger(long& value, bool relaxed = true) const;
-    NPT_Result ToInteger(unsigned long& value, bool relaxed = true) const;
-    NPT_Result ToInteger32(NPT_Int32& value, bool relaxed = true) const;
-    NPT_Result ToInteger32(NPT_UInt32& value, bool relaxed = true) const;
-    NPT_Result ToInteger64(NPT_Int64& value, bool relaxed = true) const;
-    NPT_Result ToInteger64(NPT_UInt64& value, bool relaxed = true) const;
-    NPT_Result ToFloat(float& value, bool relaxed = true) const;
-    
-    // processing
-    void MakeLowercase();
-    void MakeUppercase();
-    const NPT_String& Replace(char a, char b);
-    const NPT_String& Replace(char a, const char* b);
-
-    // search
-    int  Find(char c, NPT_Ordinal start = 0, bool ignore_case = false) const;
-    int  Find(const char* s, NPT_Ordinal start = 0, bool ignore_case = false) const;
-    int  FindAny(const char* s, NPT_Ordinal start, bool ignore_case = false) const;
-    int  ReverseFind(char c, NPT_Ordinal start = 0, bool ignore_case = false) const;
-    int  ReverseFind(const char* s, NPT_Ordinal start = 0, bool ignore_case = false) const;
-    bool StartsWith(const char* s, bool ignore_case = false) const;
-    bool EndsWith(const char* s, bool ignore_case = false) const;
-
-    // editing
-    const NPT_String& Insert(const char* s, NPT_Ordinal where = 0);
-    const NPT_String& Erase(NPT_Ordinal start, NPT_Cardinal count = 1);
-    const NPT_String& Replace(const char* before, const char* after);
-    // void Replace(NPT_Ordinal start, NPT_Cardinal count, const char* s);
-    const NPT_String& TrimLeft();
-    const NPT_String& TrimLeft(char c);
-    const NPT_String& TrimLeft(const char* chars);
-    const NPT_String& TrimRight();
-    const NPT_String& TrimRight(char c);
-    const NPT_String& TrimRight(const char* chars);
-    const NPT_String& Trim();
-    const NPT_String& Trim(char c);
-    const NPT_String& Trim(const char* chars);
-
-    // type casting
-    operator char*() const        { return m_Chars ? m_Chars: &EmptyString; }
-    operator const char* () const { return m_Chars ? m_Chars: &EmptyString; }
-    const char* GetChars() const  { return m_Chars ? m_Chars: &EmptyString; }
-    char*       UseChars()        { return m_Chars ? m_Chars: &EmptyString; }
-
-    // operator overloading
-    NPT_String& operator=(const char* str);
-    NPT_String& operator=(const NPT_String& str);
-    NPT_String& operator=(char c);
-    const NPT_String& operator+=(const NPT_String& s) {
-        Append(s.GetChars(), s.GetLength());
-        return *this;
-    }
-    const NPT_String& operator+=(const char* s) {
-        Append(s);
-        return *this;
-    }
-    const NPT_String& operator+=(char c) {
-        Append(&c, 1);
-        return *this;
-    }
-    char operator(int index) const {
-        NPT_ASSERT((unsigned int)index < GetLength());
-        return GetChars()index;
-    }
-    char& operator(int index) {
-        NPT_ASSERT((unsigned int)index < GetLength());
-        return UseChars()index;
-    }
-
-    // friend operators
-    friend NPT_String operator+(const NPT_String& s1, const NPT_String& s2) {
-        return s1+s2.GetChars();
-    }
-    friend NPT_String operator+(const NPT_String& s1, const char* s2);
-    friend NPT_String operator+(const char* s1, const NPT_String& s2);
-    friend NPT_String operator+(const NPT_String& s, char c);
-    friend NPT_String operator+(char c, const NPT_String& s);
-
-protected:
-    // inner classes
-    class Buffer {
-    public:
-        // class methods
-        static Buffer* Allocate(NPT_Size allocated, NPT_Size length) {
-            void* mem = ::operator new(sizeof(Buffer)+allocated+1);
-            return new(mem) Buffer(allocated, length);
-        }
-        static char* Create(NPT_Size allocated, NPT_Size length=0) {
-            Buffer* shared = Allocate(allocated, length);
-            return shared->GetChars();
-        }
-        static char* Create(const char* copy) {
-            NPT_Size length = StringLength(copy);
-            Buffer* shared = Allocate(length, length);
-            CopyString(shared->GetChars(), copy);
-            return shared->GetChars();
-        }
-        static char* Create(const char* copy, NPT_Size length) {
-            Buffer* shared = Allocate(length, length);
-            CopyBuffer(shared->GetChars(), copy, length);
-            shared->GetChars()length = '\0';
-            return shared->GetChars();
-        }
-        static char* Create(char c, NPT_Cardinal repeat) {
-            Buffer* shared = Allocate(repeat, repeat);
-            char* s = shared->GetChars();
-            while (repeat--) {
-                *s++ = c;
-            }
-            *s = '\0';
-            return shared->GetChars();
-        }
-
-        // methods
-        char* GetChars() { 
-            // return a pointer to the first char
-            return reinterpret_cast<char*>(this+1); 
-        }
-        NPT_Size GetLength() const      { return m_Length; }
-        void SetLength(NPT_Size length) { m_Length = length; }
-        NPT_Size GetAllocated() const   { return m_Allocated; }
-        void Destroy() { ::operator delete((void*)this); }
-        
-    private:
-        // methods
-        Buffer(NPT_Size allocated, NPT_Size length = 0) : 
-            m_Length(length),
-            m_Allocated(allocated) {}
-        
-        // members
-        NPT_Cardinal m_Length;
-        NPT_Cardinal m_Allocated;
-        // the actual string data follows
-
-    };
-    
-    // members
-    char* m_Chars;
-
-private:
-    // friends
-    friend class Buffer;
-
-    // static members
-    static char EmptyString;
-
-    // methods
-    Buffer* GetBuffer() const { 
-        return reinterpret_cast<Buffer*>(m_Chars)-1;
-    }
-    void Reset() { 
-        if (m_Chars != NULL) {
-            delete GetBuffer(); 
-            m_Chars = NULL;
-        }
-    }
-    char* PrepareToWrite(NPT_Size length);
-    void PrepareToAppend(NPT_Size length, NPT_Size allocate);
-
-    // static methods
-    static void CopyString(char* dst, const char* src) {
-        while ((*dst++ = *src++)){}
-    }
-    
-    static void CopyBuffer(char* dst, const char* src, NPT_Size size) {
-        while (size--) *dst++ = *src++;
-    }
-    
-    static NPT_Size StringLength(const char* str) {
-        NPT_Size length = 0;
-        while (*str++) length++;
-        return length;
-    }
-};
-
-/*----------------------------------------------------------------------
-|   external operators
-+---------------------------------------------------------------------*/
-inline bool operator==(const NPT_String& s1, const NPT_String& s2) { 
-    return s1.Compare(s2) == 0; 
-}
-inline bool operator==(const NPT_String& s1, const char* s2) {
-    return s1.Compare(s2) == 0; 
-}
-inline bool operator==(const char* s1, const NPT_String& s2) {
-    return s2.Compare(s1) == 0; 
-}
-inline bool operator!=(const NPT_String& s1, const NPT_String& s2) {
-    return s1.Compare(s2) != 0; 
-}
-inline bool operator!=(const NPT_String& s1, const char* s2) {
-    return s1.Compare(s2) != 0; 
-}
-inline bool operator!=(const char* s1, const NPT_String& s2) {
-    return s2.Compare(s1) != 0; 
-}
-inline bool operator<(const NPT_String& s1, const NPT_String& s2) {
-    return s1.Compare(s2) < 0; 
-}
-inline bool operator<(const NPT_String& s1, const char* s2) {
-    return s1.Compare(s2) < 0; 
-}
-inline bool operator<(const char* s1, const NPT_String& s2) {
-    return s2.Compare(s1) > 0; 
-}
-inline bool operator>(const NPT_String& s1, const NPT_String& s2) {
-    return s1.Compare(s2) > 0; 
-}
-inline bool operator>(const NPT_String& s1, const char* s2) {
-    return s1.Compare(s2) > 0; 
-}
-inline bool operator>(const char* s1, const NPT_String& s2) {
-    return s2.Compare(s1) < 0; 
-}
-inline bool operator<=(const NPT_String& s1, const NPT_String& s2) {
-    return s1.Compare(s2) <= 0; 
-}
-inline bool operator<=(const NPT_String& s1, const char* s2) {
-    return s1.Compare(s2) <= 0; 
-}
-inline bool operator<=(const char* s1, const NPT_String& s2) {
-    return s2.Compare(s1) >= 0; 
-}
-inline bool operator>=(const NPT_String& s1, const NPT_String& s2) {
-    return s1.Compare(s2) >= 0; 
-}
-inline bool operator>=(const NPT_String& s1, const char* s2) {
-    return s1.Compare(s2) >= 0; 
-}
-inline bool operator>=(const char* s1, const NPT_String& s2) {
-    return s2.Compare(s1) <= 0; 
-}
-
-/*----------------------------------------------------------------------
-|   hashing
-+---------------------------------------------------------------------*/
-template <>
-struct NPT_Hash<NPT_String>
-{
-    NPT_UInt32 operator()(const NPT_String& s) const { return s.GetHash32(); }
-};
-
-
-#endif // _NPT_STRINGS_H_

gpac-2.2.1.tar.gz/extra_lib/include/platinum/NptSystem.h Deleted

@@ -1,63 +0,0 @@
-/*****************************************************************
-|
-|   Neptune - System
-|
-| Copyright (c) 2002-2008, Axiomatic Systems, LLC.
-| All rights reserved.
-|
-| Redistribution and use in source and binary forms, with or without
-| modification, are permitted provided that the following conditions are met:
-|     * Redistributions of source code must retain the above copyright
-|       notice, this list of conditions and the following disclaimer.
-|     * Redistributions in binary form must reproduce the above copyright
-|       notice, this list of conditions and the following disclaimer in the
-|       documentation and/or other materials provided with the distribution.
-|     * Neither the name of Axiomatic Systems nor the
-|       names of its contributors may be used to endorse or promote products
-|       derived from this software without specific prior written permission.
-|
-| THIS SOFTWARE IS PROVIDED BY AXIOMATIC SYSTEMS ''AS IS'' AND ANY
-| EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-| WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-| DISCLAIMED. IN NO EVENT SHALL AXIOMATIC SYSTEMS BE LIABLE FOR ANY
-| DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-| (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-| LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-| ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-| (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-| SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-|
- ****************************************************************/
-
-#ifndef _NPT_SYSTEM_H_
-#define _NPT_SYSTEM_H_
-
-/*----------------------------------------------------------------------
-|   includes
-+---------------------------------------------------------------------*/
-#include "NptTypes.h"
-#include "NptTime.h"
-
-/*----------------------------------------------------------------------
-|   NPT_System
-+---------------------------------------------------------------------*/
-class NPT_System
-{
-public:
-    // methods
-    static NPT_Result GetProcessId(NPT_UInt32& id);
-    static NPT_Result GetMachineName(NPT_String& name);
-    static NPT_Result GetCurrentTimeStamp(NPT_TimeStamp& now);
-    static NPT_Result Sleep(const NPT_TimeInterval& duration);
-    static NPT_Result SleepUntil(const NPT_TimeStamp& when);
-    static NPT_Result SetRandomSeed(unsigned int seed);
-    static NPT_UInt32 GetRandomInteger();
-    
-protected:
-    // constructor
-    NPT_System() {}
-};
-
-NPT_Result NPT_GetSystemMachineName(NPT_String& name);
-
-#endif // _NPT_SYSTEM_H_

gpac-2.2.1.tar.gz/extra_lib/include/platinum/NptThreads.h Deleted

@@ -1,318 +0,0 @@
-/*****************************************************************
-|
-|   Neptune - Threads
-|
-| Copyright (c) 2002-2008, Axiomatic Systems, LLC.
-| All rights reserved.
-|
-| Redistribution and use in source and binary forms, with or without
-| modification, are permitted provided that the following conditions are met:
-|     * Redistributions of source code must retain the above copyright
-|       notice, this list of conditions and the following disclaimer.
-|     * Redistributions in binary form must reproduce the above copyright
-|       notice, this list of conditions and the following disclaimer in the
-|       documentation and/or other materials provided with the distribution.
-|     * Neither the name of Axiomatic Systems nor the
-|       names of its contributors may be used to endorse or promote products
-|       derived from this software without specific prior written permission.
-|
-| THIS SOFTWARE IS PROVIDED BY AXIOMATIC SYSTEMS ''AS IS'' AND ANY
-| EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-| WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-| DISCLAIMED. IN NO EVENT SHALL AXIOMATIC SYSTEMS BE LIABLE FOR ANY
-| DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-| (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-| LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-| ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-| (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-| SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-|
- ****************************************************************/
-
-#ifndef _NPT_THREADS_H_
-#define _NPT_THREADS_H_
-
-/*----------------------------------------------------------------------
-|   includes
-+---------------------------------------------------------------------*/
-#include "NptTypes.h"
-#include "NptConstants.h"
-#include "NptInterfaces.h"
-
-/*----------------------------------------------------------------------
-|   error codes
-+---------------------------------------------------------------------*/
-const int NPT_ERROR_CALLBACK_HANDLER_SHUTDOWN = NPT_ERROR_BASE_THREADS-0;
-const int NPT_ERROR_CALLBACK_NOTHING_PENDING  = NPT_ERROR_BASE_THREADS-1;
-
-/*----------------------------------------------------------------------
-|   constants
-+---------------------------------------------------------------------*/
-const int NPT_THREAD_PRIORITY_MIN           = -15;
-const int NPT_THREAD_PRIORITY_IDLE          = -15;
-const int NPT_THREAD_PRIORITY_LOWEST        =  -2;
-const int NPT_THREAD_PRIORITY_BELOW_NORMAL  =  -1;
-const int NPT_THREAD_PRIORITY_NORMAL        =   0;
-const int NPT_THREAD_PRIORITY_ABOVE_NORMAL  =   1;
-const int NPT_THREAD_PRIORITY_HIGHEST       =   2;
-const int NPT_THREAD_PRIORITY_TIME_CRITICAL =  15;
-const int NPT_THREAD_PRIORITY_MAX           =  15;
-
-/*----------------------------------------------------------------------
-|   NPT_MutexInterface
-+---------------------------------------------------------------------*/
-class NPT_MutexInterface
-{
- public:
-    // methods
-    virtual           ~NPT_MutexInterface() {}
-    virtual NPT_Result Lock()   = 0;
-    virtual NPT_Result Unlock() = 0;
-};
-
-/*----------------------------------------------------------------------
-|   NPT_Mutex
-+---------------------------------------------------------------------*/
-class NPT_Mutex : public NPT_MutexInterface
-{
- public:
-    // methods
-               NPT_Mutex();
-              ~NPT_Mutex() { delete m_Delegate; }
-    NPT_Result Lock()   { return m_Delegate->Lock();   }
-    NPT_Result Unlock() { return m_Delegate->Unlock(); }
-
- private:
-    // members
-    NPT_MutexInterface* m_Delegate;
-};
-
-/*----------------------------------------------------------------------
-|   NPT_AutoLock
-+---------------------------------------------------------------------*/
-class NPT_AutoLock
-{
- public:
-    // methods
-     NPT_AutoLock(NPT_Mutex &mutex) : m_Mutex(mutex)   {
-        m_Mutex.Lock();
-    }
-    ~NPT_AutoLock() {
-        m_Mutex.Unlock(); 
-    }
-        
- private:
-    // members
-    NPT_Mutex& m_Mutex;
-};
-
-/*----------------------------------------------------------------------
-|   NPT_Lock
-+---------------------------------------------------------------------*/
-template <typename T> 
-class NPT_Lock : public T,
-                 public NPT_Mutex
-{
-};
-
-/*----------------------------------------------------------------------
-|   NPT_SingletonLock
-+---------------------------------------------------------------------*/
-class NPT_SingletonLock
-{
-public:
-    static NPT_Mutex& GetInstance() {
-        return Instance;
-    }
-    
-private:
-    static NPT_Mutex Instance;
-};
-
-/*----------------------------------------------------------------------
-|   NPT_SharedVariableInterface
-+---------------------------------------------------------------------*/
-class NPT_SharedVariableInterface
-{
- public:
-    // methods
-    virtual           ~NPT_SharedVariableInterface() {}
-    virtual void       SetValue(int value)= 0;
-    virtual int        GetValue()         = 0;
-    virtual NPT_Result WaitUntilEquals(int value, NPT_Timeout timeout = NPT_TIMEOUT_INFINITE) = 0;
-    virtual NPT_Result WaitWhileEquals(int value, NPT_Timeout timeout = NPT_TIMEOUT_INFINITE) = 0;
-};
-
-/*----------------------------------------------------------------------
-|   NPT_SharedVariable
-+---------------------------------------------------------------------*/
-class NPT_SharedVariable : public NPT_SharedVariableInterface
-{
- public:
-    // methods
-               NPT_SharedVariable(int value = 0);
-              ~NPT_SharedVariable() { delete m_Delegate; }
-    void SetValue(int value) { 
-        m_Delegate->SetValue(value); 
-    }
-    int GetValue() { 
-        return m_Delegate->GetValue(); 
-    }
-    NPT_Result WaitUntilEquals(int value, NPT_Timeout timeout = NPT_TIMEOUT_INFINITE) { 
-        return m_Delegate->WaitUntilEquals(value, timeout); 
-    }
-    NPT_Result WaitWhileEquals(int value, NPT_Timeout timeout = NPT_TIMEOUT_INFINITE) { 
-        return m_Delegate->WaitWhileEquals(value, timeout); 
-    }
-
- private:
-    // members
-    NPT_SharedVariableInterface* m_Delegate;
-};
-
-/*----------------------------------------------------------------------
-|   NPT_AtomicVariableInterface
-+---------------------------------------------------------------------*/
-class NPT_AtomicVariableInterface
-{
- public:
-    // methods
-    virtual      ~NPT_AtomicVariableInterface() {}
-    virtual  int  Increment() = 0;
-    virtual  int  Decrement() = 0;
-    virtual  int  GetValue()  = 0;
-    virtual  void SetValue(int value)  = 0;
-};
-
-/*----------------------------------------------------------------------
-|   NPT_AtomicVariable
-+---------------------------------------------------------------------*/
-class NPT_AtomicVariable : public NPT_AtomicVariableInterface
-{
- public:
-    // methods
-         NPT_AtomicVariable(int value = 0);
-        ~NPT_AtomicVariable() { delete m_Delegate;             }
-    int  Increment()          { return m_Delegate->Increment();}
-    int  Decrement()          { return m_Delegate->Decrement();}
-    void SetValue(int value)  { m_Delegate->SetValue(value);   }
-    int  GetValue()           { return m_Delegate->GetValue(); }
-
- private:
-    // members
-    NPT_AtomicVariableInterface* m_Delegate;
-};
-
-/*----------------------------------------------------------------------
-|   NPT_Runnable
-+---------------------------------------------------------------------*/
-class NPT_Runnable
-{
-public:
-    virtual ~NPT_Runnable() {}  
-    virtual void Run() = 0;
-};
-
-/*----------------------------------------------------------------------
-|   NPT_ThreadInterface
-+---------------------------------------------------------------------*/
-class NPT_ThreadInterface: public NPT_Runnable, public NPT_Interruptible
-{
- public:
-    // methods
-    virtual           ~NPT_ThreadInterface() {}
-    virtual NPT_Result Start() = 0;
-    virtual NPT_Result Wait(NPT_Timeout timeout = NPT_TIMEOUT_INFINITE) = 0;
-    virtual NPT_Result SetPriority(int /*priority*/) { return NPT_SUCCESS; } 
-    virtual NPT_Result GetPriority(int& priority) = 0;
-};
-
-/*----------------------------------------------------------------------
-|   NPT_Thread
-+---------------------------------------------------------------------*/
-class NPT_Thread : public NPT_ThreadInterface
-{
- public:
-    // types
-    typedef unsigned long ThreadId;
-
-    // class methods
-    static ThreadId GetCurrentThreadId();
-    static NPT_Result SetCurrentThreadPriority(int priority);
-    static NPT_Result GetCurrentThreadPriority(int& priority);
-
-    // methods
-    explicit NPT_Thread(bool detached = false);
-    explicit NPT_Thread(NPT_Runnable& target, bool detached = false);
-   ~NPT_Thread() { delete m_Delegate; }
-
-    // NPT_ThreadInterface methods
-    NPT_Result Start() { 
-        return m_Delegate->Start(); 
-    } 
-    NPT_Result Wait(NPT_Timeout timeout = NPT_TIMEOUT_INFINITE)  { 
-        return m_Delegate->Wait(timeout);  
-    }
-    NPT_Result SetPriority(int priority) {
-        return m_Delegate->SetPriority(priority);
-    }    
-    NPT_Result GetPriority(int& priority) {
-        return m_Delegate->GetPriority(priority);
-    }
-
-    // NPT_Runnable methods
-    virtual void Run() {}
-
-    // NPT_Interruptible methods
-    virtual NPT_Result Interrupt() { return m_Delegate->Interrupt(); }
-
- private:
-    // members
-    NPT_ThreadInterface* m_Delegate;
-};
-
-
-/*----------------------------------------------------------------------
-|   NPT_ThreadCallbackReceiver
-+---------------------------------------------------------------------*/
-class NPT_ThreadCallbackReceiver
-{
-public:
-    virtual ~NPT_ThreadCallbackReceiver() {}
-    virtual void OnCallback(void* args) = 0;
-};
-
-/*----------------------------------------------------------------------
-|   NPT_ThreadCallbackSlot
-+---------------------------------------------------------------------*/
-class NPT_ThreadCallbackSlot
-{
-public:
-    // types
-    class NotificationHelper {
-    public:
-        virtual ~NotificationHelper() {};
-        virtual void Notify(void) = 0;
-    };
-
-    // constructor
-    NPT_ThreadCallbackSlot();
-
-    // methods
-    NPT_Result ReceiveCallback(NPT_ThreadCallbackReceiver& receiver, NPT_Timeout timeout = 0);
-    NPT_Result SendCallback(void* args);
-    NPT_Result SetNotificationHelper(NotificationHelper* helper);
-    NPT_Result Shutdown();
-
-protected:
-    // members
-    volatile void*      m_CallbackArgs;
-    volatile bool       m_Shutdown;
-    NPT_SharedVariable  m_Pending;
-    NPT_SharedVariable  m_Ack;
-    NPT_Mutex           m_ReadLock;
-    NPT_Mutex           m_WriteLock;
-    NotificationHelper* m_NotificationHelper;
-};
-
-#endif // _NPT_THREADS_H_

gpac-2.2.1.tar.gz/extra_lib/include/platinum/NptTime.h Deleted

@@ -1,156 +0,0 @@
-/*****************************************************************
-|
-|   Neptune - Time
-|
-| Copyright (c) 2002-2008, Axiomatic Systems, LLC.
-| All rights reserved.
-|
-| Redistribution and use in source and binary forms, with or without
-| modification, are permitted provided that the following conditions are met:
-|     * Redistributions of source code must retain the above copyright
-|       notice, this list of conditions and the following disclaimer.
-|     * Redistributions in binary form must reproduce the above copyright
-|       notice, this list of conditions and the following disclaimer in the
-|       documentation and/or other materials provided with the distribution.
-|     * Neither the name of Axiomatic Systems nor the
-|       names of its contributors may be used to endorse or promote products
-|       derived from this software without specific prior written permission.
-|
-| THIS SOFTWARE IS PROVIDED BY AXIOMATIC SYSTEMS ''AS IS'' AND ANY
-| EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-| WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-| DISCLAIMED. IN NO EVENT SHALL AXIOMATIC SYSTEMS BE LIABLE FOR ANY
-| DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-| (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-| LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-| ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-| (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-| SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-|
- ****************************************************************/
-
-#ifndef _NPT_TIME_H_
-#define _NPT_TIME_H_
-
-/*----------------------------------------------------------------------
-|   includes
-+---------------------------------------------------------------------*/
-#include "NptTypes.h"
-#include "NptStrings.h"
-
-/*----------------------------------------------------------------------
-|   constants
-+---------------------------------------------------------------------*/
-#define NPT_DATETIME_YEAR_MIN 1901
-#define NPT_DATETIME_YEAR_MAX 2262
-
-/*----------------------------------------------------------------------
-|   NPT_TimeStamp
-+---------------------------------------------------------------------*/
-class NPT_TimeStamp
-{
- public:
-    // methods
-    NPT_TimeStamp(const NPT_TimeStamp& timestamp);
-    NPT_TimeStamp() : m_NanoSeconds(0) {}
-    NPT_TimeStamp(NPT_Int64 nanoseconds) : m_NanoSeconds(nanoseconds) {}
-    NPT_TimeStamp(double seconds);
-    NPT_TimeStamp& operator+=(const NPT_TimeStamp& time_stamp);
-    NPT_TimeStamp& operator-=(const NPT_TimeStamp& time_stamp);
-    bool operator==(const NPT_TimeStamp& t) const { return m_NanoSeconds == t.m_NanoSeconds; }
-    bool operator!=(const NPT_TimeStamp& t) const { return m_NanoSeconds != t.m_NanoSeconds; }
-    bool operator> (const NPT_TimeStamp& t) const { return m_NanoSeconds >  t.m_NanoSeconds; }
-    bool operator< (const NPT_TimeStamp& t) const { return m_NanoSeconds <  t.m_NanoSeconds; }
-    bool operator>=(const NPT_TimeStamp& t) const { return m_NanoSeconds >= t.m_NanoSeconds; }
-    bool operator<=(const NPT_TimeStamp& t) const { return m_NanoSeconds <= t.m_NanoSeconds; }
-
-    // accessors
-    void SetNanos(NPT_Int64 nanoseconds) { m_NanoSeconds = nanoseconds;          }
-    void SetMicros(NPT_Int64 micros)     { m_NanoSeconds = micros  * 1000;       }
-    void SetMillis(NPT_Int64 millis)     { m_NanoSeconds = millis  * 1000000;    }
-    void SetSeconds(NPT_Int64 seconds)   { m_NanoSeconds = seconds * 1000000000; }
-        
-    // conversion
-    operator double() const               { return (double)m_NanoSeconds/1E9; }
-    void FromNanos(NPT_Int64 nanoseconds) { m_NanoSeconds = nanoseconds;      }
-    NPT_Int64 ToNanos() const             { return m_NanoSeconds;             }
-    NPT_Int64 ToMicros() const            { return m_NanoSeconds/1000;        }
-    NPT_Int64 ToMillis() const            { return m_NanoSeconds/1000000;     }
-    NPT_Int64 ToSeconds() const           { return m_NanoSeconds/1000000000;  }
-    
-private:
-    // members
-    NPT_Int64 m_NanoSeconds;
-};
-
-/*----------------------------------------------------------------------
-|   operator+
-+---------------------------------------------------------------------*/
-inline 
-NPT_TimeStamp 
-operator+(const NPT_TimeStamp& t1, const NPT_TimeStamp& t2) 
-{
-    NPT_TimeStamp t = t1;
-    return t += t2;
-}
-
-/*----------------------------------------------------------------------
-|   operator-
-+---------------------------------------------------------------------*/
-inline 
-NPT_TimeStamp 
-operator-(const NPT_TimeStamp& t1, const NPT_TimeStamp& t2) 
-{
-    NPT_TimeStamp t = t1;
-    return t -= t2;
-}
-
-/*----------------------------------------------------------------------
-|   NPT_TimeInterval
-+---------------------------------------------------------------------*/
-typedef NPT_TimeStamp NPT_TimeInterval;
-
-/*----------------------------------------------------------------------
-|   NPT_DateTime
-+---------------------------------------------------------------------*/
-class NPT_DateTime {
-public:
-    // types
-    enum Format {
-        FORMAT_ANSI,
-        FORMAT_W3C,
-        FORMAT_RFC_1123,  // RFC 822 updated by RFC 1123
-        FORMAT_RFC_1036   // RFC 850 updated by RFC 1036
-    };
-    
-    enum FormatFlags {
-        FLAG_EMIT_FRACTION      = 1,
-        FLAG_EXTENDED_PRECISION = 2
-    };
-    
-    // class methods
-    NPT_Int32 GetLocalTimeZone();
-    
-    // constructors
-    NPT_DateTime();
-    NPT_DateTime(const NPT_TimeStamp& timestamp, bool local=false);
-    
-    // methods
-    NPT_Result ChangeTimeZone(NPT_Int32 timezone);
-    NPT_Result FromTimeStamp(const NPT_TimeStamp& timestamp, bool local=false);
-    NPT_Result ToTimeStamp(NPT_TimeStamp& timestamp) const;
-    NPT_Result FromString(const char* date, Format format = FORMAT_ANSI);
-    NPT_String ToString(Format format = FORMAT_ANSI, NPT_Flags flags=0) const;
-    
-    // members
-    NPT_Int32 m_Year;        // year
-    NPT_Int32 m_Month;       // month of the year (1-12)
-    NPT_Int32 m_Day;         // day of the month (1-31)
-    NPT_Int32 m_Hours;       // hours (0-23)
-    NPT_Int32 m_Minutes;     // minutes (0-59)
-    NPT_Int32 m_Seconds;     // seconds (0-59)
-    NPT_Int32 m_NanoSeconds; // nanoseconds (0-999999999)
-    NPT_Int32 m_TimeZone;    // minutes offset from GMT
-};
-
-#endif // _NPT_TIME_H_

gpac-2.2.1.tar.gz/extra_lib/include/platinum/NptTls.h Deleted

@@ -1,306 +0,0 @@
-/*****************************************************************
-|
-|   Neptune - TLS/SSL Support
-|
-| Copyright (c) 2002-2008, Axiomatic Systems, LLC.
-| All rights reserved.
-|
-| Redistribution and use in source and binary forms, with or without
-| modification, are permitted provided that the following conditions are met:
-|     * Redistributions of source code must retain the above copyright
-|       notice, this list of conditions and the following disclaimer.
-|     * Redistributions in binary form must reproduce the above copyright
-|       notice, this list of conditions and the following disclaimer in the
-|       documentation and/or other materials provided with the distribution.
-|     * Neither the name of Axiomatic Systems nor the
-|       names of its contributors may be used to endorse or promote products
-|       derived from this software without specific prior written permission.
-|
-| THIS SOFTWARE IS PROVIDED BY AXIOMATIC SYSTEMS ''AS IS'' AND ANY
-| EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-| WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-| DISCLAIMED. IN NO EVENT SHALL AXIOMATIC SYSTEMS BE LIABLE FOR ANY
-| DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-| (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-| LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-| ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-| (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-| SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-|
- ****************************************************************/
-
-#ifndef _NPT_TLS_H_
-#define _NPT_TLS_H_
-
-/*----------------------------------------------------------------------
-|   includes
-+---------------------------------------------------------------------*/
-#include "NptConfig.h"
-#include "NptStreams.h"
-#include "NptTime.h"
-#include "NptHttp.h"
-
-/*----------------------------------------------------------------------
-|   error codes
-+---------------------------------------------------------------------*/
-const NPT_Result NPT_ERROR_INVALID_PASSWORD                     = (NPT_ERROR_BASE_TLS-1);
-const NPT_Result NPT_ERROR_TLS_INVALID_HANDSHAKE                = (NPT_ERROR_BASE_TLS-2);
-const NPT_Result NPT_ERROR_TLS_INVALID_PROTOCOL_MESSAGE         = (NPT_ERROR_BASE_TLS-3);
-const NPT_Result NPT_ERROR_TLS_INVALID_HMAC                     = (NPT_ERROR_BASE_TLS-4);
-const NPT_Result NPT_ERROR_TLS_INVALID_VERSION                  = (NPT_ERROR_BASE_TLS-5);
-const NPT_Result NPT_ERROR_TLS_INVALID_SESSION                  = (NPT_ERROR_BASE_TLS-6);
-const NPT_Result NPT_ERROR_TLS_NO_CIPHER                        = (NPT_ERROR_BASE_TLS-7);
-const NPT_Result NPT_ERROR_TLS_BAD_CERTIFICATE                  = (NPT_ERROR_BASE_TLS-8);
-const NPT_Result NPT_ERROR_TLS_INVALID_KEY                      = (NPT_ERROR_BASE_TLS-9);
-const NPT_Result NPT_ERROR_TLS_NO_CLIENT_RENEGOTIATION          = (NPT_ERROR_BASE_TLS-10);
-const NPT_Result NPT_ERROR_TLS_INVALID_FINISHED_MESSAGE         = (NPT_ERROR_BASE_TLS-11);
-const NPT_Result NPT_ERROR_TLS_NO_CERTIFICATE_DEFINED           = (NPT_ERROR_BASE_TLS-12);
-const NPT_Result NPT_ERROR_TLS_ALERT_HANDSHAKE_FAILED           = (NPT_ERROR_BASE_TLS-13); 
-const NPT_Result NPT_ERROR_TLS_ALERT_BAD_CERTIFICATE            = (NPT_ERROR_BASE_TLS-14);
-const NPT_Result NPT_ERROR_TLS_ALERT_INVALID_VERSION            = (NPT_ERROR_BASE_TLS-15);
-const NPT_Result NPT_ERROR_TLS_ALERT_BAD_RECORD_MAC             = (NPT_ERROR_BASE_TLS-16);
-const NPT_Result NPT_ERROR_TLS_ALERT_DECODE_ERROR               = (NPT_ERROR_BASE_TLS-17);
-const NPT_Result NPT_ERROR_TLS_ALERT_DECRYPT_ERROR              = (NPT_ERROR_BASE_TLS-18);
-const NPT_Result NPT_ERROR_TLS_ALERT_ILLEGAL_PARAMETER          = (NPT_ERROR_BASE_TLS-19);
-const NPT_Result NPT_ERROR_TLS_ALERT_UNEXPECTED_MESSAGE         = (NPT_ERROR_BASE_TLS-20);
-const NPT_Result NPT_ERROR_TLS_CERTIFICATE_FAILURE              = (NPT_ERROR_BASE_TLS-21);
-const NPT_Result NPT_ERROR_TLS_CERTIFICATE_NO_TRUST_ANCHOR      = (NPT_ERROR_BASE_TLS-22);
-const NPT_Result NPT_ERROR_TLS_CERTIFICATE_BAD_SIGNATURE        = (NPT_ERROR_BASE_TLS-23);      
-const NPT_Result NPT_ERROR_TLS_CERTIFICATE_NOT_YET_VALID        = (NPT_ERROR_BASE_TLS-24);
-const NPT_Result NPT_ERROR_TLS_CERTIFICATE_EXPIRED              = (NPT_ERROR_BASE_TLS-25);
-const NPT_Result NPT_ERROR_TLS_CERTIFICATE_SELF_SIGNED          = (NPT_ERROR_BASE_TLS-26);
-const NPT_Result NPT_ERROR_TLS_CERTIFICATE_INVALID_CHAIN        = (NPT_ERROR_BASE_TLS-27);
-const NPT_Result NPT_ERROR_TLS_CERTIFICATE_UNSUPPORTED_DIGEST   = (NPT_ERROR_BASE_TLS-28);
-const NPT_Result NPT_ERROR_TLS_CERTIFICATE_INVALID_PRIVATE_KEY  = (NPT_ERROR_BASE_TLS-29);
-const NPT_Result NPT_ERROR_TLS_DNS_NAME_MISMATCH                = (NPT_ERROR_BASE_TLS-30);
-
-/*----------------------------------------------------------------------
-|   constants
-+---------------------------------------------------------------------*/
-const unsigned int NPT_TLS_NULL_WITH_NULL_NULL      = 0x00;
-const unsigned int NPT_TLS_RSA_WITH_RC4_128_MD5     = 0x04;
-const unsigned int NPT_TLS_RSA_WITH_RC4_128_SHA     = 0x05;
-const unsigned int NPT_TLS_RSA_WITH_AES_128_CBC_SHA = 0x2F;
-const unsigned int NPT_TLS_RSA_WITH_AES_256_CBC_SHA = 0x35;
-
-/*----------------------------------------------------------------------
-|   class references
-+---------------------------------------------------------------------*/
-class NPT_TlsContextImpl;
-class NPT_TlsSessionImpl;
-
-/*----------------------------------------------------------------------
-|   types
-+---------------------------------------------------------------------*/
-typedef enum {
-    NPT_TLS_KEY_FORMAT_RSA_PRIVATE,
-    NPT_TLS_KEY_FORMAT_PKCS8,
-    NPT_TLS_KEY_FORMAT_PKCS12
-} NPT_TlsKeyFormat;
-
-struct NPT_TlsTrustAnchorData {
-    const unsigned char* cert_data;
-    unsigned int         cert_size;
-};
-
-/*----------------------------------------------------------------------
-|   NPT_Tls
-+---------------------------------------------------------------------*/
-class NPT_Tls
-{
-public:
-    static const NPT_TlsTrustAnchorData* GetDefaultTrustAnchors(NPT_Ordinal indx=0);
-    static bool MatchDnsNames(const char*                 hostname,
-                              const NPT_List<NPT_String>& dns_names);
-    static bool MatchDnsName(const char* hostname, const char* dns_name);
-                              
-private:
-    NPT_Tls() {}; // don't instantiate 
-};
-
-/*----------------------------------------------------------------------
-|   NPT_TlsContext
-+---------------------------------------------------------------------*/
-class NPT_TlsContext : public NPT_AutomaticCleaner::Singleton
-{
-public:
-    enum {
-        OPTION_VERIFY_LATER               = 1,
-        OPTION_REQUIRE_CLIENT_CERTIFICATE = 2,
-        OPTION_ADD_DEFAULT_TRUST_ANCHORS  = 4,
-        OPTION_NO_SESSION_CACHE           = 8
-    };
-    NPT_TlsContext(NPT_Flags options=0);
-   ~NPT_TlsContext();
-   
-    // methods
-    NPT_Result LoadKey(NPT_TlsKeyFormat     key_format, 
-                       const unsigned char* key_data,
-                       NPT_Size             key_data_size,
-                       const char*          password);
-      
-    NPT_Result SelfSignCertificate(const char* common_name,
-                                   const char* organization,
-                                   const char* organizational_name);
-                                   
-    /** 
-     * Add one trust anchor
-     */
-    NPT_Result AddTrustAnchor(const unsigned char* ta_data,
-                              NPT_Size             ta_data_size);
-    /**
-     * Add one or more trust anchors, from a list
-     * @param anchors Array of trust anchor data
-     * @param anchor_count Number of anchors in the array, or 0 if the array
-     * is terminated by a 'sentinel' (an anchor data with the field cert_data set
-     * to NULL and the field cert_size set to 0).
-     */
-    NPT_Result AddTrustAnchors(const NPT_TlsTrustAnchorData* anchors, 
-                               NPT_Cardinal                  anchor_count = 0);
-
-protected:
-    NPT_TlsContextImpl* m_Impl;
-    
-    // friends
-    friend class NPT_TlsSession;
-    friend class NPT_TlsClientSession;
-    friend class NPT_TlsServerSession;
-};
-
-/*----------------------------------------------------------------------
-|   NPT_TlsCertificateInfo
-+---------------------------------------------------------------------*/
-struct NPT_TlsCertificateInfo
-{
-    struct _subject {
-        NPT_String common_name;
-        NPT_String organization;
-        NPT_String organizational_name;
-    } subject;
-    struct _issuer {
-        NPT_String common_name;
-        NPT_String organization;
-        NPT_String organizational_name;
-    } issuer;
-    struct _fingerprint {
-        unsigned char sha120;
-        unsigned char md516;
-    } fingerprint;
-    NPT_DateTime issue_date;
-    NPT_DateTime expiration_date;
-    NPT_List<NPT_String> alternate_names;
-};
-
-/*----------------------------------------------------------------------
-|   NPT_TlsSession
-+---------------------------------------------------------------------*/
-class NPT_TlsSession
-{
-public:
-    virtual ~NPT_TlsSession();
-    virtual NPT_Result Handshake();
-    virtual NPT_Result GetHandshakeStatus();
-    virtual NPT_Result GetPeerCertificateInfo(NPT_TlsCertificateInfo& info, NPT_Ordinal position=0);
-    virtual NPT_Result VerifyPeerCertificate();
-    virtual NPT_Result VerifyDnsNameMatch(const char* hostname);
-    virtual NPT_Result GetSessionId(NPT_DataBuffer& session_id);
-    virtual NPT_UInt32 GetCipherSuiteId();
-    virtual NPT_Result GetInputStream(NPT_InputStreamReference& stream);
-    virtual NPT_Result GetOutputStream(NPT_OutputStreamReference& stream);
-    
-protected:
-    NPT_TlsSession(NPT_TlsContext&     context, 
-                   NPT_TlsSessionImpl* impl);
-
-    NPT_TlsContext&                   m_Context;
-    NPT_Reference<NPT_TlsSessionImpl> m_Impl;
-    NPT_InputStreamReference          m_InputStream;
-    NPT_OutputStreamReference         m_OutputStream;
-};
-
-/*----------------------------------------------------------------------
-|   NPT_TlsClientSession
-+---------------------------------------------------------------------*/
-class NPT_TlsClientSession : public NPT_TlsSession
-{
-public:
-    NPT_TlsClientSession(NPT_TlsContext&            context,
-                         NPT_InputStreamReference&  input,
-                         NPT_OutputStreamReference& output);
-};
-
-/*----------------------------------------------------------------------
-|   NPT_TlsServerSession
-+---------------------------------------------------------------------*/
-class NPT_TlsServerSession : public NPT_TlsSession
-{
-public:
-    NPT_TlsServerSession(NPT_TlsContext&            context,
-                         NPT_InputStreamReference&  input,
-                         NPT_OutputStreamReference& output);
-};
-
-/*----------------------------------------------------------------------
-|   NPT_HttpTlsConnector
-+---------------------------------------------------------------------*/
-#if defined(NPT_CONFIG_ENABLE_TLS)
-class NPT_HttpTlsConnector : public NPT_HttpClient::Connector
-{
-public:
-    enum {
-        OPTION_ACCEPT_SELF_SIGNED_CERTS = 1,
-        OPTION_ACCEPT_HOSTNAME_MISMATCH = 2
-    };
-    NPT_HttpTlsConnector(NPT_Flags options = 0);
-    NPT_HttpTlsConnector(NPT_TlsContext& tls_context, NPT_Flags options = 0);
-    virtual ~NPT_HttpTlsConnector() {}
-    NPT_TlsContext& GetTlsContext() { return m_TlsContext; }
-    
-    virtual NPT_Result VerifyPeer(NPT_TlsClientSession& session,
-                                  const char*           hostname);
-    
-    //  NPT_HttpClient::Connector methods
-    virtual NPT_Result Connect(const NPT_HttpUrl&           url,
-                               NPT_HttpClient&              client,
-                               const NPT_HttpProxyAddress*  proxy,
-                               bool                         reuse,
-                               NPT_HttpClient::Connection*& connection);
-
-private:
-    // class methods
-    static NPT_TlsContext& GetDefaultTlsContext();
-    
-    // class members
-    static NPT_TlsContext* DefaultTlsContext;
-    
-    // members
-    NPT_TlsContext& m_TlsContext;
-    NPT_Flags       m_Options;
-};
-#else
-class NPT_HttpTlsConnector : public NPT_HttpClient::Connector
-{
-public:
-    virtual ~NPT_HttpTlsConnector() {}
-    virtual NPT_Result Connect(const NPT_HttpUrl&           url,
-                               NPT_HttpClient&              client,
-                               const NPT_HttpProxyAddress*  proxy,
-                               bool                         reuse,
-                               NPT_HttpClient::Connection*& connection);
-};
-#endif
-
-/*----------------------------------------------------------------------
-|   Trust Anchors
-+-----------------------------------------------------------------*/
-/** 
- * Arrays of trust anchors (each array element is of type NPT_TlsTrustAnchorData
- * and the last element is a terminator element: the cert_data field is NULL
- * and the cert_size field is 0
- */ 
-#if defined(NPT_CONFIG_ENABLE_TLS)
-#include "NptTlsDefaultTrustAnchorsBase.h"
-#include "NptTlsDefaultTrustAnchorsExtended.h"
-#endif
-
-#endif // _NPT_TLS_H_

gpac-2.2.1.tar.gz/extra_lib/include/platinum/NptTlsDefaultTrustAnchorsBase.h Deleted

@@ -1,583 +0,0 @@
-/*****************************************************************
-|
-|   Neptune - Trust Anchors
-|
-|   This file is automatically generated by a script, do not edit!
-|
-| Copyright (c) 2002-2010, Axiomatic Systems, LLC.
-| All rights reserved.
-|
-| Redistribution and use in source and binary forms, with or without
-| modification, are permitted provided that the following conditions are met:
-|     * Redistributions of source code must retain the above copyright
-|       notice, this list of conditions and the following disclaimer.
-|     * Redistributions in binary form must reproduce the above copyright
-|       notice, this list of conditions and the following disclaimer in the
-|       documentation and/or other materials provided with the distribution.
-|     * Neither the name of Axiomatic Systems nor the
-|       names of its contributors may be used to endorse or promote products
-|       derived from this software without specific prior written permission.
-|
-| THIS SOFTWARE IS PROVIDED BY AXIOMATIC SYSTEMS ''AS IS'' AND ANY
-| EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-| WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-| DISCLAIMED. IN NO EVENT SHALL AXIOMATIC SYSTEMS BE LIABLE FOR ANY
-| DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-| (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-| LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-| ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-| (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-| SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-|
- ****************************************************************/
-
- /* This file is automatically generated by GenTrustAnchorsTables.py, do not edit */
-
-#include "NptTls.h"
-
-extern const NPT_TlsTrustAnchorData NptTlsDefaultTrustAnchorsBase137;
-
-/* Verisign/RSA Secure Server CA */
-extern const unsigned int NptTlsTrustAnchor_Base_0000_Size;
-extern const unsigned char NptTlsTrustAnchor_Base_0000_Data;
-
-/* GTE CyberTrust Root CA */
-extern const unsigned int NptTlsTrustAnchor_Base_0001_Size;
-extern const unsigned char NptTlsTrustAnchor_Base_0001_Data;
-
-/* GTE CyberTrust Global Root */
-extern const unsigned int NptTlsTrustAnchor_Base_0002_Size;
-extern const unsigned char NptTlsTrustAnchor_Base_0002_Data;
-
-/* Thawte Personal Basic CA */
-extern const unsigned int NptTlsTrustAnchor_Base_0003_Size;
-extern const unsigned char NptTlsTrustAnchor_Base_0003_Data;
-
-/* Thawte Personal Premium CA */
-extern const unsigned int NptTlsTrustAnchor_Base_0004_Size;
-extern const unsigned char NptTlsTrustAnchor_Base_0004_Data;
-
-/* Thawte Personal Freemail CA */
-extern const unsigned int NptTlsTrustAnchor_Base_0005_Size;
-extern const unsigned char NptTlsTrustAnchor_Base_0005_Data;
-
-/* Thawte Server CA */
-extern const unsigned int NptTlsTrustAnchor_Base_0006_Size;
-extern const unsigned char NptTlsTrustAnchor_Base_0006_Data;
-
-/* Thawte Premium Server CA */
-extern const unsigned int NptTlsTrustAnchor_Base_0007_Size;
-extern const unsigned char NptTlsTrustAnchor_Base_0007_Data;
-
-/* Equifax Secure CA */
-extern const unsigned int NptTlsTrustAnchor_Base_0008_Size;
-extern const unsigned char NptTlsTrustAnchor_Base_0008_Data;
-
-/* Digital Signature Trust Co. Global CA 1 */
-extern const unsigned int NptTlsTrustAnchor_Base_0009_Size;
-extern const unsigned char NptTlsTrustAnchor_Base_0009_Data;
-
-/* Digital Signature Trust Co. Global CA 3 */
-extern const unsigned int NptTlsTrustAnchor_Base_0010_Size;
-extern const unsigned char NptTlsTrustAnchor_Base_0010_Data;
-
-/* Digital Signature Trust Co. Global CA 2 */
-extern const unsigned int NptTlsTrustAnchor_Base_0011_Size;
-extern const unsigned char NptTlsTrustAnchor_Base_0011_Data;
-
-/* Digital Signature Trust Co. Global CA 4 */
-extern const unsigned int NptTlsTrustAnchor_Base_0012_Size;
-extern const unsigned char NptTlsTrustAnchor_Base_0012_Data;
-
-/* Verisign Class 1 Public Primary Certification Authority */
-extern const unsigned int NptTlsTrustAnchor_Base_0013_Size;
-extern const unsigned char NptTlsTrustAnchor_Base_0013_Data;
-
-/* Verisign Class 2 Public Primary Certification Authority */
-extern const unsigned int NptTlsTrustAnchor_Base_0014_Size;
-extern const unsigned char NptTlsTrustAnchor_Base_0014_Data;
-
-/* Verisign Class 3 Public Primary Certification Authority */
-extern const unsigned int NptTlsTrustAnchor_Base_0015_Size;
-extern const unsigned char NptTlsTrustAnchor_Base_0015_Data;
-
-/* Verisign Class 1 Public Primary Certification Authority - G2 */
-extern const unsigned int NptTlsTrustAnchor_Base_0016_Size;
-extern const unsigned char NptTlsTrustAnchor_Base_0016_Data;
-
-/* Verisign Class 2 Public Primary Certification Authority - G2 */
-extern const unsigned int NptTlsTrustAnchor_Base_0017_Size;
-extern const unsigned char NptTlsTrustAnchor_Base_0017_Data;
-
-/* Verisign Class 3 Public Primary Certification Authority - G2 */
-extern const unsigned int NptTlsTrustAnchor_Base_0018_Size;
-extern const unsigned char NptTlsTrustAnchor_Base_0018_Data;
-
-/* Verisign Class 4 Public Primary Certification Authority - G2 */
-extern const unsigned int NptTlsTrustAnchor_Base_0019_Size;
-extern const unsigned char NptTlsTrustAnchor_Base_0019_Data;
-
-/* GlobalSign Root CA */
-extern const unsigned int NptTlsTrustAnchor_Base_0020_Size;
-extern const unsigned char NptTlsTrustAnchor_Base_0020_Data;
-
-/* GlobalSign Root CA - R2 */
-extern const unsigned int NptTlsTrustAnchor_Base_0021_Size;
-extern const unsigned char NptTlsTrustAnchor_Base_0021_Data;
-
-/* ValiCert Class 1 VA */
-extern const unsigned int NptTlsTrustAnchor_Base_0022_Size;
-extern const unsigned char NptTlsTrustAnchor_Base_0022_Data;
-
-/* ValiCert Class 2 VA */
-extern const unsigned int NptTlsTrustAnchor_Base_0023_Size;
-extern const unsigned char NptTlsTrustAnchor_Base_0023_Data;
-
-/* RSA Root Certificate 1 */
-extern const unsigned int NptTlsTrustAnchor_Base_0024_Size;
-extern const unsigned char NptTlsTrustAnchor_Base_0024_Data;
-
-/* Verisign Class 1 Public Primary Certification Authority - G3 */
-extern const unsigned int NptTlsTrustAnchor_Base_0025_Size;
-extern const unsigned char NptTlsTrustAnchor_Base_0025_Data;
-
-/* Verisign Class 2 Public Primary Certification Authority - G3 */
-extern const unsigned int NptTlsTrustAnchor_Base_0026_Size;
-extern const unsigned char NptTlsTrustAnchor_Base_0026_Data;
-
-/* Verisign Class 3 Public Primary Certification Authority - G3 */
-extern const unsigned int NptTlsTrustAnchor_Base_0027_Size;
-extern const unsigned char NptTlsTrustAnchor_Base_0027_Data;
-
-/* Verisign Class 4 Public Primary Certification Authority - G3 */
-extern const unsigned int NptTlsTrustAnchor_Base_0028_Size;
-extern const unsigned char NptTlsTrustAnchor_Base_0028_Data;
-
-/* Entrust.net Secure Server CA */
-extern const unsigned int NptTlsTrustAnchor_Base_0029_Size;
-extern const unsigned char NptTlsTrustAnchor_Base_0029_Data;
-
-/* Entrust.net Secure Personal CA */
-extern const unsigned int NptTlsTrustAnchor_Base_0030_Size;
-extern const unsigned char NptTlsTrustAnchor_Base_0030_Data;
-
-/* Entrust.net Premium 2048 Secure Server CA */
-extern const unsigned int NptTlsTrustAnchor_Base_0031_Size;
-extern const unsigned char NptTlsTrustAnchor_Base_0031_Data;
-
-/* Baltimore CyberTrust Root */
-extern const unsigned int NptTlsTrustAnchor_Base_0032_Size;
-extern const unsigned char NptTlsTrustAnchor_Base_0032_Data;
-
-/* Equifax Secure Global eBusiness CA */
-extern const unsigned int NptTlsTrustAnchor_Base_0033_Size;
-extern const unsigned char NptTlsTrustAnchor_Base_0033_Data;
-
-/* Equifax Secure eBusiness CA 1 */
-extern const unsigned int NptTlsTrustAnchor_Base_0034_Size;
-extern const unsigned char NptTlsTrustAnchor_Base_0034_Data;
-
-/* Equifax Secure eBusiness CA 2 */
-extern const unsigned int NptTlsTrustAnchor_Base_0035_Size;
-extern const unsigned char NptTlsTrustAnchor_Base_0035_Data;
-
-/* Visa International Global Root 2 */
-extern const unsigned int NptTlsTrustAnchor_Base_0036_Size;
-extern const unsigned char NptTlsTrustAnchor_Base_0036_Data;
-
-/* AddTrust Low-Value Services Root */
-extern const unsigned int NptTlsTrustAnchor_Base_0037_Size;
-extern const unsigned char NptTlsTrustAnchor_Base_0037_Data;
-
-/* AddTrust External Root */
-extern const unsigned int NptTlsTrustAnchor_Base_0038_Size;
-extern const unsigned char NptTlsTrustAnchor_Base_0038_Data;
-
-/* AddTrust Public Services Root */
-extern const unsigned int NptTlsTrustAnchor_Base_0039_Size;
-extern const unsigned char NptTlsTrustAnchor_Base_0039_Data;
-
-/* AddTrust Qualified Certificates Root */
-extern const unsigned int NptTlsTrustAnchor_Base_0040_Size;
-extern const unsigned char NptTlsTrustAnchor_Base_0040_Data;
-
-/* Verisign Time Stamping Authority CA */
-extern const unsigned int NptTlsTrustAnchor_Base_0041_Size;
-extern const unsigned char NptTlsTrustAnchor_Base_0041_Data;
-
-/* Thawte Time Stamping CA */
-extern const unsigned int NptTlsTrustAnchor_Base_0042_Size;
-extern const unsigned char NptTlsTrustAnchor_Base_0042_Data;
-
-/* Entrust.net Global Secure Server CA */
-extern const unsigned int NptTlsTrustAnchor_Base_0043_Size;
-extern const unsigned char NptTlsTrustAnchor_Base_0043_Data;
-
-/* Entrust.net Global Secure Personal CA */
-extern const unsigned int NptTlsTrustAnchor_Base_0044_Size;
-extern const unsigned char NptTlsTrustAnchor_Base_0044_Data;
-
-/* Entrust Root Certification Authority */
-extern const unsigned int NptTlsTrustAnchor_Base_0045_Size;
-extern const unsigned char NptTlsTrustAnchor_Base_0045_Data;
-
-/* AOL Time Warner Root Certification Authority 1 */
-extern const unsigned int NptTlsTrustAnchor_Base_0046_Size;
-extern const unsigned char NptTlsTrustAnchor_Base_0046_Data;
-
-/* AOL Time Warner Root Certification Authority 2 */
-extern const unsigned int NptTlsTrustAnchor_Base_0047_Size;
-extern const unsigned char NptTlsTrustAnchor_Base_0047_Data;
-
-/* beTRUSTed Root CA */
-extern const unsigned int NptTlsTrustAnchor_Base_0048_Size;
-extern const unsigned char NptTlsTrustAnchor_Base_0048_Data;
-
-/* beTRUSTed Root CA-Baltimore Implementation */
-extern const unsigned int NptTlsTrustAnchor_Base_0049_Size;
-extern const unsigned char NptTlsTrustAnchor_Base_0049_Data;
-
-/* beTRUSTed Root CA - Entrust Implementation */
-extern const unsigned int NptTlsTrustAnchor_Base_0050_Size;
-extern const unsigned char NptTlsTrustAnchor_Base_0050_Data;
-
-/* beTRUSTed Root CA - RSA Implementation */
-extern const unsigned int NptTlsTrustAnchor_Base_0051_Size;
-extern const unsigned char NptTlsTrustAnchor_Base_0051_Data;
-
-/* RSA Security 2048 v3 */
-extern const unsigned int NptTlsTrustAnchor_Base_0052_Size;
-extern const unsigned char NptTlsTrustAnchor_Base_0052_Data;
-
-/* RSA Security 1024 v3 */
-extern const unsigned int NptTlsTrustAnchor_Base_0053_Size;
-extern const unsigned char NptTlsTrustAnchor_Base_0053_Data;
-
-/* GeoTrust Global CA */
-extern const unsigned int NptTlsTrustAnchor_Base_0054_Size;
-extern const unsigned char NptTlsTrustAnchor_Base_0054_Data;
-
-/* GeoTrust Global CA 2 */
-extern const unsigned int NptTlsTrustAnchor_Base_0055_Size;
-extern const unsigned char NptTlsTrustAnchor_Base_0055_Data;
-
-/* GeoTrust Universal CA */
-extern const unsigned int NptTlsTrustAnchor_Base_0056_Size;
-extern const unsigned char NptTlsTrustAnchor_Base_0056_Data;
-
-/* GeoTrust Universal CA 2 */
-extern const unsigned int NptTlsTrustAnchor_Base_0057_Size;
-extern const unsigned char NptTlsTrustAnchor_Base_0057_Data;
-
-/* UTN-USER First-Network Applications */
-extern const unsigned int NptTlsTrustAnchor_Base_0058_Size;
-extern const unsigned char NptTlsTrustAnchor_Base_0058_Data;
-
-/* America Online Root Certification Authority 1 */
-extern const unsigned int NptTlsTrustAnchor_Base_0059_Size;
-extern const unsigned char NptTlsTrustAnchor_Base_0059_Data;
-
-/* America Online Root Certification Authority 2 */
-extern const unsigned int NptTlsTrustAnchor_Base_0060_Size;
-extern const unsigned char NptTlsTrustAnchor_Base_0060_Data;
-
-/* Visa eCommerce Root */
-extern const unsigned int NptTlsTrustAnchor_Base_0061_Size;
-extern const unsigned char NptTlsTrustAnchor_Base_0061_Data;
-
-/* TC TrustCenter, Germany, Class 2 CA */
-extern const unsigned int NptTlsTrustAnchor_Base_0062_Size;
-extern const unsigned char NptTlsTrustAnchor_Base_0062_Data;
-
-/* TC TrustCenter, Germany, Class 3 CA */
-extern const unsigned int NptTlsTrustAnchor_Base_0063_Size;
-extern const unsigned char NptTlsTrustAnchor_Base_0063_Data;
-
-/* Certum Root CA */
-extern const unsigned int NptTlsTrustAnchor_Base_0064_Size;
-extern const unsigned char NptTlsTrustAnchor_Base_0064_Data;
-
-/* Comodo AAA Services root */
-extern const unsigned int NptTlsTrustAnchor_Base_0065_Size;
-extern const unsigned char NptTlsTrustAnchor_Base_0065_Data;
-
-/* Comodo Secure Services root */
-extern const unsigned int NptTlsTrustAnchor_Base_0066_Size;
-extern const unsigned char NptTlsTrustAnchor_Base_0066_Data;
-
-/* Comodo Trusted Services root */
-extern const unsigned int NptTlsTrustAnchor_Base_0067_Size;
-extern const unsigned char NptTlsTrustAnchor_Base_0067_Data;
-
-/* IPS Chained CAs root */
-extern const unsigned int NptTlsTrustAnchor_Base_0068_Size;
-extern const unsigned char NptTlsTrustAnchor_Base_0068_Data;
-
-/* IPS CLASE1 root */
-extern const unsigned int NptTlsTrustAnchor_Base_0069_Size;
-extern const unsigned char NptTlsTrustAnchor_Base_0069_Data;
-
-/* IPS CLASE3 root */
-extern const unsigned int NptTlsTrustAnchor_Base_0070_Size;
-extern const unsigned char NptTlsTrustAnchor_Base_0070_Data;
-
-/* IPS CLASEA1 root */
-extern const unsigned int NptTlsTrustAnchor_Base_0071_Size;
-extern const unsigned char NptTlsTrustAnchor_Base_0071_Data;
-
-/* IPS CLASEA3 root */
-extern const unsigned int NptTlsTrustAnchor_Base_0072_Size;
-extern const unsigned char NptTlsTrustAnchor_Base_0072_Data;
-
-/* IPS Servidores root */
-extern const unsigned int NptTlsTrustAnchor_Base_0073_Size;
-extern const unsigned char NptTlsTrustAnchor_Base_0073_Data;
-
-/* IPS Timestamping root */
-extern const unsigned int NptTlsTrustAnchor_Base_0074_Size;
-extern const unsigned char NptTlsTrustAnchor_Base_0074_Data;
-
-/* QuoVadis Root CA */
-extern const unsigned int NptTlsTrustAnchor_Base_0075_Size;
-extern const unsigned char NptTlsTrustAnchor_Base_0075_Data;
-
-/* QuoVadis Root CA 2 */
-extern const unsigned int NptTlsTrustAnchor_Base_0076_Size;
-extern const unsigned char NptTlsTrustAnchor_Base_0076_Data;
-
-/* QuoVadis Root CA 3 */
-extern const unsigned int NptTlsTrustAnchor_Base_0077_Size;
-extern const unsigned char NptTlsTrustAnchor_Base_0077_Data;
-
-/* Security Communication Root CA */
-extern const unsigned int NptTlsTrustAnchor_Base_0078_Size;
-extern const unsigned char NptTlsTrustAnchor_Base_0078_Data;
-
-/* Sonera Class 1 Root CA */
-extern const unsigned int NptTlsTrustAnchor_Base_0079_Size;
-extern const unsigned char NptTlsTrustAnchor_Base_0079_Data;
-
-/* Sonera Class 2 Root CA */
-extern const unsigned int NptTlsTrustAnchor_Base_0080_Size;
-extern const unsigned char NptTlsTrustAnchor_Base_0080_Data;
-
-/* Staat der Nederlanden Root CA */
-extern const unsigned int NptTlsTrustAnchor_Base_0081_Size;
-extern const unsigned char NptTlsTrustAnchor_Base_0081_Data;
-
-/* TDC Internet Root CA */
-extern const unsigned int NptTlsTrustAnchor_Base_0082_Size;
-extern const unsigned char NptTlsTrustAnchor_Base_0082_Data;
-
-/* TDC OCES Root CA */
-extern const unsigned int NptTlsTrustAnchor_Base_0083_Size;
-extern const unsigned char NptTlsTrustAnchor_Base_0083_Data;
-
-/* UTN DATACorp SGC Root CA */
-extern const unsigned int NptTlsTrustAnchor_Base_0084_Size;
-extern const unsigned char NptTlsTrustAnchor_Base_0084_Data;
-
-/* UTN USERFirst Email Root CA */
-extern const unsigned int NptTlsTrustAnchor_Base_0085_Size;
-extern const unsigned char NptTlsTrustAnchor_Base_0085_Data;
-
-/* UTN USERFirst Hardware Root CA */
-extern const unsigned int NptTlsTrustAnchor_Base_0086_Size;
-extern const unsigned char NptTlsTrustAnchor_Base_0086_Data;
-
-/* UTN USERFirst Object Root CA */
-extern const unsigned int NptTlsTrustAnchor_Base_0087_Size;
-extern const unsigned char NptTlsTrustAnchor_Base_0087_Data;
-
-/* Camerfirma Chambers of Commerce Root */
-extern const unsigned int NptTlsTrustAnchor_Base_0088_Size;
-extern const unsigned char NptTlsTrustAnchor_Base_0088_Data;
-
-/* Camerfirma Global Chambersign Root */
-extern const unsigned int NptTlsTrustAnchor_Base_0089_Size;
-extern const unsigned char NptTlsTrustAnchor_Base_0089_Data;
-
-/* NetLock Qualified (Class QA) Root */
-extern const unsigned int NptTlsTrustAnchor_Base_0090_Size;
-extern const unsigned char NptTlsTrustAnchor_Base_0090_Data;
-
-/* NetLock Notary (Class A) Root */
-extern const unsigned int NptTlsTrustAnchor_Base_0091_Size;
-extern const unsigned char NptTlsTrustAnchor_Base_0091_Data;
-
-/* NetLock Business (Class B) Root */
-extern const unsigned int NptTlsTrustAnchor_Base_0092_Size;
-extern const unsigned char NptTlsTrustAnchor_Base_0092_Data;
-
-/* NetLock Express (Class C) Root */
-extern const unsigned int NptTlsTrustAnchor_Base_0093_Size;
-extern const unsigned char NptTlsTrustAnchor_Base_0093_Data;
-
-/* XRamp Global CA Root */
-extern const unsigned int NptTlsTrustAnchor_Base_0094_Size;
-extern const unsigned char NptTlsTrustAnchor_Base_0094_Data;
-
-/* Go Daddy Class 2 CA */
-extern const unsigned int NptTlsTrustAnchor_Base_0095_Size;
-extern const unsigned char NptTlsTrustAnchor_Base_0095_Data;
-
-/* Starfield Class 2 CA */
-extern const unsigned int NptTlsTrustAnchor_Base_0096_Size;
-extern const unsigned char NptTlsTrustAnchor_Base_0096_Data;
-
-/* StartCom Ltd. */
-extern const unsigned int NptTlsTrustAnchor_Base_0097_Size;
-extern const unsigned char NptTlsTrustAnchor_Base_0097_Data;
-
-/* StartCom Certification Authority */
-extern const unsigned int NptTlsTrustAnchor_Base_0098_Size;
-extern const unsigned char NptTlsTrustAnchor_Base_0098_Data;
-
-/* Firmaprofesional Root CA */
-extern const unsigned int NptTlsTrustAnchor_Base_0099_Size;
-extern const unsigned char NptTlsTrustAnchor_Base_0099_Data;
-
-/* Wells Fargo Root CA */
-extern const unsigned int NptTlsTrustAnchor_Base_0100_Size;
-extern const unsigned char NptTlsTrustAnchor_Base_0100_Data;
-
-/* Swisscom Root CA 1 */
-extern const unsigned int NptTlsTrustAnchor_Base_0101_Size;
-extern const unsigned char NptTlsTrustAnchor_Base_0101_Data;
-
-/* DigiCert Assured ID Root CA */
-extern const unsigned int NptTlsTrustAnchor_Base_0102_Size;
-extern const unsigned char NptTlsTrustAnchor_Base_0102_Data;
-
-/* DigiCert Global Root CA */
-extern const unsigned int NptTlsTrustAnchor_Base_0103_Size;
-extern const unsigned char NptTlsTrustAnchor_Base_0103_Data;
-
-/* DigiCert High Assurance EV Root CA */
-extern const unsigned int NptTlsTrustAnchor_Base_0104_Size;
-extern const unsigned char NptTlsTrustAnchor_Base_0104_Data;
-
-/* Certplus Class 2 Primary CA */
-extern const unsigned int NptTlsTrustAnchor_Base_0105_Size;
-extern const unsigned char NptTlsTrustAnchor_Base_0105_Data;
-
-/* DST Root CA X3 */
-extern const unsigned int NptTlsTrustAnchor_Base_0106_Size;
-extern const unsigned char NptTlsTrustAnchor_Base_0106_Data;
-
-/* DST ACES CA X6 */
-extern const unsigned int NptTlsTrustAnchor_Base_0107_Size;
-extern const unsigned char NptTlsTrustAnchor_Base_0107_Data;
-
-/* SwissSign Platinum CA - G2 */
-extern const unsigned int NptTlsTrustAnchor_Base_0108_Size;
-extern const unsigned char NptTlsTrustAnchor_Base_0108_Data;
-
-/* SwissSign Gold CA - G2 */
-extern const unsigned int NptTlsTrustAnchor_Base_0109_Size;
-extern const unsigned char NptTlsTrustAnchor_Base_0109_Data;
-
-/* SwissSign Silver CA - G2 */
-extern const unsigned int NptTlsTrustAnchor_Base_0110_Size;
-extern const unsigned char NptTlsTrustAnchor_Base_0110_Data;
-
-/* GeoTrust Primary Certification Authority */
-extern const unsigned int NptTlsTrustAnchor_Base_0111_Size;
-extern const unsigned char NptTlsTrustAnchor_Base_0111_Data;
-
-/* thawte Primary Root CA */
-extern const unsigned int NptTlsTrustAnchor_Base_0112_Size;
-extern const unsigned char NptTlsTrustAnchor_Base_0112_Data;
-
-/* VeriSign Class 3 Public Primary Certification Authority - G5 */
-extern const unsigned int NptTlsTrustAnchor_Base_0113_Size;
-extern const unsigned char NptTlsTrustAnchor_Base_0113_Data;
-
-/* SecureTrust CA */
-extern const unsigned int NptTlsTrustAnchor_Base_0114_Size;
-extern const unsigned char NptTlsTrustAnchor_Base_0114_Data;
-
-/* Secure Global CA */
-extern const unsigned int NptTlsTrustAnchor_Base_0115_Size;
-extern const unsigned char NptTlsTrustAnchor_Base_0115_Data;
-
-/* COMODO Certification Authority */
-extern const unsigned int NptTlsTrustAnchor_Base_0116_Size;
-extern const unsigned char NptTlsTrustAnchor_Base_0116_Data;
-
-/* DigiNotar Root CA */
-extern const unsigned int NptTlsTrustAnchor_Base_0117_Size;
-extern const unsigned char NptTlsTrustAnchor_Base_0117_Data;
-
-/* Network Solutions Certificate Authority */
-extern const unsigned int NptTlsTrustAnchor_Base_0118_Size;
-extern const unsigned char NptTlsTrustAnchor_Base_0118_Data;
-
-/* WellsSecure Public Root Certificate Authority */
-extern const unsigned int NptTlsTrustAnchor_Base_0119_Size;
-extern const unsigned char NptTlsTrustAnchor_Base_0119_Data;
-
-/* IGC/A */
-extern const unsigned int NptTlsTrustAnchor_Base_0120_Size;
-extern const unsigned char NptTlsTrustAnchor_Base_0120_Data;
-
-/* Security Communication EV RootCA1 */
-extern const unsigned int NptTlsTrustAnchor_Base_0121_Size;
-extern const unsigned char NptTlsTrustAnchor_Base_0121_Data;
-
-/* TC TrustCenter Class 2 CA II */
-extern const unsigned int NptTlsTrustAnchor_Base_0122_Size;
-extern const unsigned char NptTlsTrustAnchor_Base_0122_Data;
-
-/* TC TrustCenter Class 3 CA II */
-extern const unsigned int NptTlsTrustAnchor_Base_0123_Size;
-extern const unsigned char NptTlsTrustAnchor_Base_0123_Data;
-
-/* TC TrustCenter Universal CA I */
-extern const unsigned int NptTlsTrustAnchor_Base_0124_Size;
-extern const unsigned char NptTlsTrustAnchor_Base_0124_Data;
-
-/* Deutsche Telekom Root CA 2 */
-extern const unsigned int NptTlsTrustAnchor_Base_0125_Size;
-extern const unsigned char NptTlsTrustAnchor_Base_0125_Data;
-
-/* ComSign CA */
-extern const unsigned int NptTlsTrustAnchor_Base_0126_Size;
-extern const unsigned char NptTlsTrustAnchor_Base_0126_Data;
-
-/* ComSign Secured CA */
-extern const unsigned int NptTlsTrustAnchor_Base_0127_Size;
-extern const unsigned char NptTlsTrustAnchor_Base_0127_Data;
-
-/* Cybertrust Global Root */
-extern const unsigned int NptTlsTrustAnchor_Base_0128_Size;
-extern const unsigned char NptTlsTrustAnchor_Base_0128_Data;
-
-/* Buypass Class 2 CA 1 */
-extern const unsigned int NptTlsTrustAnchor_Base_0129_Size;
-extern const unsigned char NptTlsTrustAnchor_Base_0129_Data;
-
-/* Buypass Class 3 CA 1 */
-extern const unsigned int NptTlsTrustAnchor_Base_0130_Size;
-extern const unsigned char NptTlsTrustAnchor_Base_0130_Data;
-
-/* certSIGN ROOT CA */
-extern const unsigned int NptTlsTrustAnchor_Base_0131_Size;
-extern const unsigned char NptTlsTrustAnchor_Base_0131_Data;
-
-/* ApplicationCA - Japanese Government */
-extern const unsigned int NptTlsTrustAnchor_Base_0132_Size;
-extern const unsigned char NptTlsTrustAnchor_Base_0132_Data;
-
-/* GeoTrust Primary Certification Authority - G3 */
-extern const unsigned int NptTlsTrustAnchor_Base_0133_Size;
-extern const unsigned char NptTlsTrustAnchor_Base_0133_Data;
-
-/* thawte Primary Root CA - G2 */
-extern const unsigned int NptTlsTrustAnchor_Base_0134_Size;
-extern const unsigned char NptTlsTrustAnchor_Base_0134_Data;
-
-/* GeoTrust Primary Certification Authority - G2 */
-extern const unsigned int NptTlsTrustAnchor_Base_0135_Size;
-extern const unsigned char NptTlsTrustAnchor_Base_0135_Data;
-

gpac-2.2.1.tar.gz/extra_lib/include/platinum/NptTlsDefaultTrustAnchorsExtended.h Deleted

@@ -1,91 +0,0 @@
-/*****************************************************************
-|
-|   Neptune - Trust Anchors
-|
-|   This file is automatically generated by a script, do not edit!
-|
-| Copyright (c) 2002-2010, Axiomatic Systems, LLC.
-| All rights reserved.
-|
-| Redistribution and use in source and binary forms, with or without
-| modification, are permitted provided that the following conditions are met:
-|     * Redistributions of source code must retain the above copyright
-|       notice, this list of conditions and the following disclaimer.
-|     * Redistributions in binary form must reproduce the above copyright
-|       notice, this list of conditions and the following disclaimer in the
-|       documentation and/or other materials provided with the distribution.
-|     * Neither the name of Axiomatic Systems nor the
-|       names of its contributors may be used to endorse or promote products
-|       derived from this software without specific prior written permission.
-|
-| THIS SOFTWARE IS PROVIDED BY AXIOMATIC SYSTEMS ''AS IS'' AND ANY
-| EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-| WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-| DISCLAIMED. IN NO EVENT SHALL AXIOMATIC SYSTEMS BE LIABLE FOR ANY
-| DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-| (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-| LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-| ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-| (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-| SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-|
- ****************************************************************/
-
- /* This file is automatically generated by GenTrustAnchorsTables.py, do not edit */
-
-#include "NptTls.h"
-
-extern const NPT_TlsTrustAnchorData NptTlsDefaultTrustAnchorsExtended14;
-
-/* ABAecom (sub., Am. Bankers Assn.) Root CA */
-extern const unsigned int NptTlsTrustAnchor_Extended_0000_Size;
-extern const unsigned char NptTlsTrustAnchor_Extended_0000_Data;
-
-/* Taiwan GRCA */
-extern const unsigned int NptTlsTrustAnchor_Extended_0001_Size;
-extern const unsigned char NptTlsTrustAnchor_Extended_0001_Data;
-
-/* TURKTRUST Certificate Services Provider Root 1 */
-extern const unsigned int NptTlsTrustAnchor_Extended_0002_Size;
-extern const unsigned char NptTlsTrustAnchor_Extended_0002_Data;
-
-/* TURKTRUST Certificate Services Provider Root 2 */
-extern const unsigned int NptTlsTrustAnchor_Extended_0003_Size;
-extern const unsigned char NptTlsTrustAnchor_Extended_0003_Data;
-
-/* OISTE WISeKey Global Root GA CA */
-extern const unsigned int NptTlsTrustAnchor_Extended_0004_Size;
-extern const unsigned char NptTlsTrustAnchor_Extended_0004_Data;
-
-/* S-TRUST Authentication and Encryption Root CA 2005 PN */
-extern const unsigned int NptTlsTrustAnchor_Extended_0005_Size;
-extern const unsigned char NptTlsTrustAnchor_Extended_0005_Data;
-
-/* Microsec e-Szigno Root CA */
-extern const unsigned int NptTlsTrustAnchor_Extended_0006_Size;
-extern const unsigned char NptTlsTrustAnchor_Extended_0006_Data;
-
-/* Certigna */
-extern const unsigned int NptTlsTrustAnchor_Extended_0007_Size;
-extern const unsigned char NptTlsTrustAnchor_Extended_0007_Data;
-
-/* AC Ra\xC3\xADz Certic\xC3\xA1mara S.A. */
-extern const unsigned int NptTlsTrustAnchor_Extended_0008_Size;
-extern const unsigned char NptTlsTrustAnchor_Extended_0008_Data;
-
-/* ePKI Root Certification Authority */
-extern const unsigned int NptTlsTrustAnchor_Extended_0009_Size;
-extern const unsigned char NptTlsTrustAnchor_Extended_0009_Data;
-
-/* TUBITAK UEKAE Kok Sertifika Hizmet Saglayicisi - Surum 3 */
-extern const unsigned int NptTlsTrustAnchor_Extended_0010_Size;
-extern const unsigned char NptTlsTrustAnchor_Extended_0010_Data;
-
-/* CNNIC ROOT */
-extern const unsigned int NptTlsTrustAnchor_Extended_0011_Size;
-extern const unsigned char NptTlsTrustAnchor_Extended_0011_Data;
-
-/* EBG Elektronik Sertifika Hizmet Saglayicisi */
-extern const unsigned int NptTlsTrustAnchor_Extended_0012_Size;
-extern const unsigned char NptTlsTrustAnchor_Extended_0012_Data;
-

gpac-2.2.1.tar.gz/extra_lib/include/platinum/NptTypes.h Deleted

@@ -1,149 +0,0 @@
-/*****************************************************************
-|
-|   Neptune - Types
-|
-| Copyright (c) 2002-2008, Axiomatic Systems, LLC.
-| All rights reserved.
-|
-| Redistribution and use in source and binary forms, with or without
-| modification, are permitted provided that the following conditions are met:
-|     * Redistributions of source code must retain the above copyright
-|       notice, this list of conditions and the following disclaimer.
-|     * Redistributions in binary form must reproduce the above copyright
-|       notice, this list of conditions and the following disclaimer in the
-|       documentation and/or other materials provided with the distribution.
-|     * Neither the name of Axiomatic Systems nor the
-|       names of its contributors may be used to endorse or promote products
-|       derived from this software without specific prior written permission.
-|
-| THIS SOFTWARE IS PROVIDED BY AXIOMATIC SYSTEMS ''AS IS'' AND ANY
-| EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-| WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-| DISCLAIMED. IN NO EVENT SHALL AXIOMATIC SYSTEMS BE LIABLE FOR ANY
-| DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-| (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-| LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-| ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-| (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-| SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-|
- ****************************************************************/
-
-#ifndef _NPT_TYPES_H_
-#define _NPT_TYPES_H_
-
-/*----------------------------------------------------------------------
-|   includes
-+---------------------------------------------------------------------*/
-#include "NptConfig.h"
-
-/*----------------------------------------------------------------------
-|   sized types (this assumes that ints are 32 bits)
-+---------------------------------------------------------------------*/
-typedef NPT_CONFIG_INT64_TYPE          NPT_Int64;
-typedef unsigned NPT_CONFIG_INT64_TYPE NPT_UInt64;
-typedef unsigned int                   NPT_UInt32;
-typedef int                            NPT_Int32;
-typedef unsigned short                 NPT_UInt16;
-typedef short                          NPT_Int16;
-typedef unsigned char                  NPT_UInt8;
-typedef char                           NPT_Int8;
-typedef float                          NPT_Float;
-
-/*----------------------------------------------------------------------
-|   named types       
-+---------------------------------------------------------------------*/
-typedef int           NPT_Result;
-typedef unsigned int  NPT_Cardinal;
-typedef unsigned int  NPT_Ordinal;
-typedef NPT_UInt32    NPT_Size;
-typedef NPT_UInt64    NPT_LargeSize;
-typedef NPT_Int32     NPT_Offset;
-typedef NPT_UInt64    NPT_Position;
-typedef NPT_Int32     NPT_Timeout;
-typedef void          NPT_Interface;
-typedef NPT_UInt8     NPT_Byte;
-typedef NPT_UInt32    NPT_Flags;
-typedef void*         NPT_Any;
-typedef const void*   NPT_AnyConst;
-
-/*----------------------------------------------------------------------
-|   limits       
-+---------------------------------------------------------------------*/
-#if defined(NPT_CONFIG_HAVE_LIMITS_H)
-#include <limits.h>
-#endif
-
-#if !defined(NPT_INT_MIN)
-#if defined(NPT_CONFIG_HAVE_INT_MIN)
-#define NPT_INT_MIN INT_MIN
-#endif
-#endif
-
-#if !defined(NPT_INT_MAX)
-#if defined(NPT_CONFIG_HAVE_INT_MAX)
-#define NPT_INT_MAX INT_MAX
-#endif
-#endif
-
-#if !defined(NPT_UINT_MAX)
-#if defined(NPT_CONFIG_HAVE_UINT_MAX)
-#define NPT_UINT_MAX UINT_MAX
-#endif
-#endif
-
-#if !defined(NPT_LONG_MIN)
-#if defined(NPT_CONFIG_HAVE_LONG_MIN)
-#define NPT_LONG_MIN LONG_MIN
-#endif
-#endif
-
-#if !defined(NPT_LONG_MAX)
-#if defined(NPT_CONFIG_HAVE_LONG_MAX)
-#define NPT_LONG_MAX LONG_MAX
-#endif
-#endif
-
-#if !defined(NPT_ULONG_MAX)
-#if defined(NPT_CONFIG_HAVE_ULONG_MAX)
-#define NPT_ULONG_MAX ULONG_MAX
-#endif
-#endif
-
-#if !defined(NPT_INT32_MAX)
-#define NPT_INT32_MAX 0x7FFFFFFF
-#endif
-
-#if !defined(NPT_INT32_MIN)
-#define NPT_INT32_MIN (-NPT_INT32_MAX - 1) 
-#endif
-
-#if !defined(NPT_UINT32_MAX)
-#define NPT_UINT32_MAX 0xFFFFFFFF
-#endif
-
-#if !defined(NPT_INT64_MAX)
-#if defined(NPT_CONFIG_HAVE_LLONG_MAX)
-#define NPT_INT64_MAX LLONG_MAX
-#else
-#define NPT_INT64_MAX 0x7FFFFFFFFFFFFFFFLL
-#endif
-#endif
-
-#if !defined(NPT_INT64_MIN)
-#if defined(NPT_CONFIG_HAVE_LLONG_MIN)
-#define NPT_INT64_MIN LLONG_MIN
-#else
-#define NPT_INT64_MIN (-NPT_INT64_MAX - 1LL) 
-#endif
-#endif
-
-#if !defined(NPT_UINT64_MAX)
-#if defined(NPT_CONFIG_HAVE_ULLONG_MAX)
-#define NPT_UINT64_MAX ULLONG_MAX
-#else
-#define NPT_UINT64_MAX 0xFFFFFFFFFFFFFFFFULL
-#endif
-#endif
-
-#endif // _NPT_TYPES_H_

gpac-2.2.1.tar.gz/extra_lib/include/platinum/NptUri.h Deleted

@@ -1,320 +0,0 @@
-/*****************************************************************
-|
-|   Neptune - URI
-|
-| Copyright (c) 2002-2008, Axiomatic Systems, LLC.
-| All rights reserved.
-|
-| Redistribution and use in source and binary forms, with or without
-| modification, are permitted provided that the following conditions are met:
-|     * Redistributions of source code must retain the above copyright
-|       notice, this list of conditions and the following disclaimer.
-|     * Redistributions in binary form must reproduce the above copyright
-|       notice, this list of conditions and the following disclaimer in the
-|       documentation and/or other materials provided with the distribution.
-|     * Neither the name of Axiomatic Systems nor the
-|       names of its contributors may be used to endorse or promote products
-|       derived from this software without specific prior written permission.
-|
-| THIS SOFTWARE IS PROVIDED BY AXIOMATIC SYSTEMS ''AS IS'' AND ANY
-| EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-| WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-| DISCLAIMED. IN NO EVENT SHALL AXIOMATIC SYSTEMS BE LIABLE FOR ANY
-| DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-| (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-| LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-| ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-| (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-| SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-|
- ****************************************************************/
-
-#ifndef _NPT_URI_H_
-#define _NPT_URI_H_
-
-/*----------------------------------------------------------------------
-|   includes
-+---------------------------------------------------------------------*/
-#include "NptStrings.h"
-#include "NptList.h"
-
-/*----------------------------------------------------------------------
-|   constants
-+---------------------------------------------------------------------*/
-const NPT_UInt16 NPT_URL_INVALID_PORT       = 0;
-const NPT_UInt16 NPT_URL_DEFAULT_HTTP_PORT  = 80;
-const NPT_UInt16 NPT_URL_DEFAULT_HTTPS_PORT = 443;
-
-/*----------------------------------------------------------------------
-|   NPT_Uri
-+---------------------------------------------------------------------*/
-class NPT_Uri {
-public:
-    // types
-    typedef enum {
-        SCHEME_ID_UNKNOWN,
-        SCHEME_ID_HTTP,
-        SCHEME_ID_HTTPS
-    } SchemeId;
-
-    // constants. use as a parameter to Encode()
-    static const char* const PathCharsToEncode;
-    static const char* const QueryCharsToEncode;
-    static const char* const FragmentCharsToEncode;
-    static const char* const UnsafeCharsToEncode;
-
-    // class methods
-    static NPT_String PercentEncode(const char* str, const char* chars, bool encode_percents=true);
-    static NPT_String PercentDecode(const char* str);
-    static SchemeId   ParseScheme(const NPT_String& scheme);
-
-    // methods
-    NPT_Uri() : m_SchemeId(SCHEME_ID_UNKNOWN) {}
-    virtual ~NPT_Uri() {}
-    const NPT_String& GetScheme() const {
-        return m_Scheme;
-    }
-    void SetScheme(const char* scheme);
-    NPT_Result SetSchemeFromUri(const char* uri);
-    SchemeId GetSchemeId() const {
-        return m_SchemeId;
-    }
-
-protected:
-    // members
-    NPT_String m_Scheme;
-    SchemeId   m_SchemeId;
-};
-
-/*----------------------------------------------------------------------
-|   NPT_UrlQuery
-+---------------------------------------------------------------------*/
-class NPT_UrlQuery
-{
-public:
-    // class methods
-    static NPT_String UrlEncode(const char* str, bool encode_percents=true);
-    static NPT_String UrlDecode(const char* str);
-    
-    // types
-    struct Field {
-        Field(const char* name, const char* value, bool encoded);
-        NPT_String m_Name;
-        NPT_String m_Value;
-    };
-
-    // constructor
-    NPT_UrlQuery() {}
-    NPT_UrlQuery(const char* query);
-
-    // accessors
-    NPT_List<Field>& GetFields() { return m_Fields; }
-
-    // methods
-    NPT_Result  Parse(const char* query);
-    NPT_Result  SetField(const char* name, const char* value, bool encoded=false);
-    NPT_Result  AddField(const char* name, const char* value, bool encoded=false);
-    const char* GetField(const char* name);
-    NPT_String  ToString();
-
-private:
-    // members
-    NPT_List<Field> m_Fields;
-};
-
-/*----------------------------------------------------------------------
-|   NPT_Url
-+---------------------------------------------------------------------*/
-class NPT_Url : public NPT_Uri {
-public:
-    /**
-     * Default constructor. This does not construct a valid URL, but an
-     * uninitialized one that can later be initialized to a valid URL by
-     * parsing or setting some of its fields.
-     */
-    NPT_Url();
-    
-    /**
-     * Construct a URL by parsing an input string in its fully encoded form.
-     * If an error occurs during parsing (such as an invalid syntax), the
-     * URL will be in an invalid state (a call to IsValid() will return false).
-     *
-     * @param url The URL string in its encoded form
-     * @param default_port The default port number, or 0 if not specified
-     */
-    NPT_Url(const char* url, NPT_UInt16  default_port = 0);
-    
-    /**
-     * Construct a URL from its components. When constructing a URL from
-     * components, the components are assumed to be passed in their non-encoded
-     * form, and will thus be encoded automatically.
-     *
-     * @param scheme The URL scheme
-     * @param port The port number
-     * @param path The path
-     * @param query The query, if any, or NULL
-     * @param fragment The fragment, if any, or NULL
-     */
-    NPT_Url(const char* scheme,
-            const char* host, 
-            NPT_UInt16  port, 
-            const char* path,
-            const char* query = NULL,
-            const char* fragment = NULL);
-
-    /**
-     * Parse a URL from its fully encoded form.
-     *
-     * @param url The URL string in its encoded form
-     * @param default port The defautl port number, or 0 if not specified
-     */
-    NPT_Result Parse(const char* url, NPT_UInt16  default_port = 0);
-    
-    /**
-     * Parse just the path plus optional query and fragment from a fully encoded form.
-     *
-     * @param path_plus The URL path plus optional query and fragment
-     */
-    NPT_Result ParsePathPlus(const char* path_plus);
-    
-    /**
-     * Returns the host part of the URL, in its encoded form
-     */
-    const NPT_String& GetHost() const { return m_Host;     }
-    
-    /**
-     * Returns the port number of the URL.
-     */
-    NPT_UInt16 GetPort() const { return m_Port;     }
-
-    /**
-     * Returns the path part of the URL, in its encoded form
-     */
-    const NPT_String& GetPath() const { return m_Path; }
-    
-    /**
-     * Returns the path part of the URL, in its encoded or decoded form
-     */
-    NPT_String GetPath(bool decoded) const { return decoded?NPT_Uri::PercentDecode(m_Path):m_Path;}
-
-    /**
-     * Returns the query part of the URL, in its encoded form
-     */
-    const NPT_String& GetQuery() const { return m_Query; }
-    
-    /**
-     * Returns the fragment part of the URL, in its encoded form
-     */
-    const NPT_String& GetFragment() const { return m_Fragment; }
-    
-    /**
-     * Returns whether the URL is valid or not. Invalid URLs are uninitialized or
-     * not fully initialized URLs.
-     *
-     * @return true if the URL is valid, false if it is not.
-     */
-    virtual bool IsValid() const;
-    
-    /**
-     * Resets a URL to an uninitialized state.
-     */
-    void Reset();
-    
-    /**
-     * Returns whether the URL has a query part or not.
-     *
-     * @return true if the URL has a query part, false if it does not.
-     */
-    bool HasQuery() const { return m_HasQuery; } 
-
-    /**
-     * Returns whether the URL has a fragment part or not.
-     *
-     * @return true if the URL has a fragment part, false if it does not.
-     */
-    bool HasFragment() const { return m_HasFragment; }
-
-    /**
-     * Sets the host part of the URL.
-     *
-     * @param host The host part of the URL
-     */
-    NPT_Result SetHost(const char* host);
-    
-    /**
-     * Sets the port number of the URL.
-     *
-     * @param port The port number of the URL
-     */
-    NPT_Result SetPort(NPT_UInt16 port);
-    
-    /**
-     * Sets the path part of the URL.
-     *
-     * @param path The path part of the URL
-     * @param encoded Boolean flag indicating whether the path parameter is
-     * already encoded or not. If it is not already encoded, it will be
-     * automatically encoded.
-     */
-    NPT_Result SetPath(const char* path, bool encoded=false);
-    
-    /**
-     * Sets the query part of the URL.
-     * 
-     * @param query The query part of the URL
-     * @param encoded Boolean flag indicating whether the query parameter is
-     * already encoded or not. If it is not already encoded, it will be
-     * automatically encoded.
-     */     
-    NPT_Result SetQuery(const char* query, bool encoded=false);
-
-    /**
-     * Sets the fragment part of the URL.
-     * 
-     * @param query The fragment part of the URL
-     * @param encoded Boolean flag indicating whether the fragment parameter is
-     * already encoded or not. If it is not already encoded, it will be
-     * automatically encoded.
-     */     
-    NPT_Result SetFragment(const char* fragment, bool encoded=false);
-
-    /**
-     * Return the string representation of the URL in a way that can be used in 
-     * an HTTP request (i.e just the portion of the URL starting with the path)
-     *
-     * @param with_fragment Boolean flag specifiying whether the fragment part of 
-     * the URL should be included in the returned string or not.
-     */
-    virtual NPT_String ToRequestString(bool with_fragment = false) const;
-
-    /**
-     * Return the string representation of the URL.
-     *
-     * @param default_port default port number for the scheme. If the port number of
-     * the URL is not equal to the default port, then port number is explicitely 
-     * included in the string representation of the URL. 
-     * @param with_fragment Boolean flag specifiying whether the fragment part of 
-     * the URL should be included in the returned string or not.
-     */
-    virtual NPT_String ToStringWithDefaultPort(NPT_UInt16 default_port, bool with_fragment = true) const;
-
-    /**
-     * Return the string representation of the URL.
-     *
-     * @param with_fragment Boolean flag specifiying whether the fragment part of 
-     * the URL should be included in the returned string or not.
-     */
-    virtual NPT_String ToString(bool with_fragment = true) const;
-
-protected:
-    // members
-    NPT_String m_Host;
-    NPT_UInt16 m_Port;
-    NPT_String m_Path;
-    bool       m_HasQuery;
-    NPT_String m_Query;
-    bool       m_HasFragment;
-    NPT_String m_Fragment;
-};
-
-#endif // _NPT_URI_H_

gpac-2.2.1.tar.gz/extra_lib/include/platinum/NptUtils.h Deleted

@@ -1,228 +0,0 @@
-/*****************************************************************
-|
-|   Neptune Utils
-|
-| Copyright (c) 2002-2008, Axiomatic Systems, LLC.
-| All rights reserved.
-|
-| Redistribution and use in source and binary forms, with or without
-| modification, are permitted provided that the following conditions are met:
-|     * Redistributions of source code must retain the above copyright
-|       notice, this list of conditions and the following disclaimer.
-|     * Redistributions in binary form must reproduce the above copyright
-|       notice, this list of conditions and the following disclaimer in the
-|       documentation and/or other materials provided with the distribution.
-|     * Neither the name of Axiomatic Systems nor the
-|       names of its contributors may be used to endorse or promote products
-|       derived from this software without specific prior written permission.
-|
-| THIS SOFTWARE IS PROVIDED BY AXIOMATIC SYSTEMS ''AS IS'' AND ANY
-| EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-| WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-| DISCLAIMED. IN NO EVENT SHALL AXIOMATIC SYSTEMS BE LIABLE FOR ANY
-| DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-| (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-| LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-| ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-| (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-| SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-|
- ****************************************************************/
-
-#ifndef _NPT_UTILS_H_
-#define _NPT_UTILS_H_
-
-/*----------------------------------------------------------------------
-|   includes
-+---------------------------------------------------------------------*/
-#include "NptConfig.h"
-#include "NptTypes.h"
-#include "NptStrings.h"
-#include "NptMap.h"
-#include "NptDataBuffer.h"
-#include "NptHash.h"
-
-#if defined (NPT_CONFIG_HAVE_STDIO_H)
-#include <stdio.h>
-#endif
-
-#if defined (NPT_CONFIG_HAVE_STRING_H)
-#include <string.h>
-#endif
-
-#if defined(NPT_CONFIG_HAVE_STDARG_H)
-#include <stdarg.h>
-#endif
-
-/*----------------------------------------------------------------------
-|   macros
-+---------------------------------------------------------------------*/
-#define NPT_ARRAY_SIZE(_a) (sizeof(_a)/sizeof((_a)0))
-
-/*----------------------------------------------------------------------
-|   byte I/O
-+---------------------------------------------------------------------*/
-extern void NPT_BytesFromInt64Be(unsigned char* buffer, NPT_UInt64 value);
-extern void NPT_BytesFromInt32Be(unsigned char* buffer, NPT_UInt32 value);
-extern void NPT_BytesFromInt24Be(unsigned char* buffer, NPT_UInt32 value);
-extern void NPT_BytesFromInt16Be(unsigned char* buffer, NPT_UInt16 value);
-extern NPT_UInt64 NPT_BytesToInt64Be(const unsigned char* buffer);
-extern NPT_UInt32 NPT_BytesToInt32Be(const unsigned char* buffer);
-extern NPT_UInt32 NPT_BytesToInt24Be(const unsigned char* buffer);
-extern NPT_UInt16 NPT_BytesToInt16Be(const unsigned char* buffer);
-
-extern void NPT_BytesFromInt64Le(unsigned char* buffer, NPT_UInt64 value);
-extern void NPT_BytesFromInt32Le(unsigned char* buffer, NPT_UInt32 value);
-extern void NPT_BytesFromInt24Le(unsigned char* buffer, NPT_UInt32 value);
-extern void NPT_BytesFromInt16Le(unsigned char* buffer, NPT_UInt16 value);
-extern NPT_UInt64 NPT_BytesToInt64Le(const unsigned char* buffer);
-extern NPT_UInt32 NPT_BytesToInt32Le(const unsigned char* buffer);
-extern NPT_UInt32 NPT_BytesToInt24Le(const unsigned char* buffer);
-extern NPT_UInt16 NPT_BytesToInt16Le(const unsigned char* buffer);
-
-/*----------------------------------------------------------------------
-|    conversion utilities
-+---------------------------------------------------------------------*/
-extern NPT_Result 
-NPT_ParseFloat(const char* str, float& result, bool relaxed = true);
-
-extern NPT_Result 
-NPT_ParseInteger(const char* str, long& result, bool relaxed = true, NPT_Cardinal* chars_used = 0);
-
-extern NPT_Result 
-NPT_ParseInteger(const char* str, unsigned long& result, bool relaxed = true, NPT_Cardinal* chars_used = 0);
-
-extern NPT_Result 
-NPT_ParseInteger(const char* str, int& result, bool relaxed = true, NPT_Cardinal* chars_used = 0);
-
-extern NPT_Result 
-NPT_ParseInteger(const char* str, unsigned int& result, bool relaxed = true, NPT_Cardinal* chars_used = 0);
-
-extern NPT_Result 
-NPT_ParseInteger32(const char* str, NPT_Int32& result, bool relaxed = true, NPT_Cardinal* chars_used = 0);
-
-extern NPT_Result 
-NPT_ParseInteger32(const char* str, NPT_UInt32& result, bool relaxed = true, NPT_Cardinal* chars_used = 0);
-
-extern NPT_Result 
-NPT_ParseInteger64(const char* str, NPT_Int64& result, bool relaxed = true, NPT_Cardinal* chars_used = 0);
-
-extern NPT_Result 
-NPT_ParseInteger64(const char* str, NPT_UInt64& result, bool relaxed = true, NPT_Cardinal* chars_used = 0);
-
-/*----------------------------------------------------------------------
-|    formatting
-+---------------------------------------------------------------------*/
-void
-NPT_FormatOutput(void        (*function)(void* parameter, const char* message),
-                 void*       function_parameter,
-                 const char* format, 
-                 va_list     args);
-
-void NPT_ByteToHex(NPT_Byte b, char* buffer, bool uppercase=false);
-NPT_Result NPT_HexToByte(const char* buffer, NPT_Byte& b);
-NPT_Result NPT_HexToBytes(const char* hex, NPT_DataBuffer& bytes);
-NPT_String NPT_HexString(const unsigned char* data, 
-                         NPT_Size             data_size,
-                         const char*          separator = NULL,
-                         bool                 uppercase=false);
-char NPT_NibbleToHex(unsigned int nibble, bool uppercase = true);
-int NPT_HexToNibble(char hex);
-
-/*----------------------------------------------------------------------
-|    parsing
-+---------------------------------------------------------------------*/
-NPT_Result 
-NPT_ParseMimeParameters(const char*                      encoded,
-                        NPT_Map<NPT_String, NPT_String>& parameters);
-
-/*----------------------------------------------------------------------
-|    environment variables
-+---------------------------------------------------------------------*/
-class NPT_Environment {
-public:
-    static NPT_Result Get(const char* name, NPT_String& value);
-    static NPT_Result Set(const char* name, const char* value);
-};
-// compat for older APIs
-#define NPT_GetEnvironment(_x,_y) NPT_Environment::Get(_x,_y)
-
-/*----------------------------------------------------------------------
-|   string utils
-+---------------------------------------------------------------------*/
-#if defined (NPT_CONFIG_HAVE_STDIO_H)
-#include <stdio.h>
-#endif
-
-#if defined (NPT_CONFIG_HAVE_STRING_H)
-#include <string.h>
-#endif
-
-#if defined (NPT_CONFIG_HAVE_SNPRINTF)
-#define NPT_FormatString NPT_snprintf
-#else
-int NPT_FormatString(char* str, NPT_Size size, const char* format, ...);
-#endif
-
-#if defined(NPT_CONFIG_HAVE_VSNPRINTF)
-#define NPT_FormatStringVN(s,c,f,a) NPT_vsnprintf(s,c,f,a)
-#else
-extern int NPT_FormatStringVN(char *buffer, size_t count, const char *format, va_list argptr);
-#endif
-
-#if defined(NPT_CONFIG_HAVE_MEMCPY)
-#define NPT_CopyMemory memcpy
-#else
-extern void NPT_CopyMemory(void* dest, void* src, NPT_Size size);
-#endif
-
-#if defined(NPT_CONFIG_HAVE_STRCMP)
-#define NPT_StringsEqual(s1, s2) (strcmp((s1), (s2)) == 0)
-#else
-extern int NPT_StringsEqual(const char* s1, const char* s2);
-#endif
-
-#if defined(NPT_CONFIG_HAVE_STRNCMP)
-#define NPT_StringsEqualN(s1, s2, n) (strncmp((s1), (s2), (n)) == 0)
-#else
-extern int NPT_StringsEqualN(const char* s1, const char* s2, unsigned long size);
-#endif
-
-#if defined(NPT_CONFIG_HAVE_STRLEN)
-#define NPT_StringLength(s) (NPT_Size)(strlen(s))
-#else
-extern unsigned long NPT_StringLength(const char* s);
-#endif
-
-#if defined(NPT_CONFIG_HAVE_STRCPY)
-#define NPT_CopyString(dst, src) ((void)NPT_strcpy((dst), (src)))
-#else
-extern void NPT_CopyString(char* dst, const char* src);
-#endif
-
-/**
- * Copy up to n characters from src to dst.
- * The destination buffer will be null-terminated, so it must
- * have enough space for n+1 characters (n from the source plus
- * the null terminator).
- */
-#if defined(NPT_CONFIG_HAVE_STRNCPY)
-#define NPT_CopyStringN(dst, src, n) \
-do { ((void)NPT_strncpy((dst), (src), n)); (dst)(n) = '\0'; } while(0)
-#else
-extern int NPT_CopyStringN(char* dst, const char* src, unsigned long n);
-#endif
-
-#if defined(NPT_CONFIG_HAVE_MEMSET)
-#define NPT_SetMemory memset
-#else
-extern void NPT_SetMemory(void* dest, int c, NPT_Size size);
-#endif
-
-#if defined(NPT_CONFIG_HAVE_MEMCMP)
-#define NPT_MemoryEqual(s1, s2, n) (memcmp((s1), (s2), (n)) == 0) 
-#else 
-extern int NPT_MemoryEqual(const void* s1, const void* s2, unsigned long n); 
-#endif
-
-#endif // _NPT_UTILS_H_

gpac-2.2.1.tar.gz/extra_lib/include/platinum/NptVersion.h Deleted

@@ -1,41 +0,0 @@
-/*****************************************************************
-|
-|   Neptune - Version Info
-|
-| Copyright (c) 2002-2008, Axiomatic Systems, LLC.
-| All rights reserved.
-|
-| Redistribution and use in source and binary forms, with or without
-| modification, are permitted provided that the following conditions are met:
-|     * Redistributions of source code must retain the above copyright
-|       notice, this list of conditions and the following disclaimer.
-|     * Redistributions in binary form must reproduce the above copyright
-|       notice, this list of conditions and the following disclaimer in the
-|       documentation and/or other materials provided with the distribution.
-|     * Neither the name of Axiomatic Systems nor the
-|       names of its contributors may be used to endorse or promote products
-|       derived from this software without specific prior written permission.
-|
-| THIS SOFTWARE IS PROVIDED BY AXIOMATIC SYSTEMS ''AS IS'' AND ANY
-| EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-| WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-| DISCLAIMED. IN NO EVENT SHALL AXIOMATIC SYSTEMS BE LIABLE FOR ANY
-| DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-| (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-| LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-| ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-| (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-| SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-|
- ****************************************************************/
-
-#ifndef _NPT_VERSION_H_
-#define _NPT_VERSION_H_
-
-/*----------------------------------------------------------------------
-|   includes
-+---------------------------------------------------------------------*/
-#define NPT_NEPTUNE_VERSION        0x01010300
-#define NPT_NEPTUNE_VERSION_STRING "1.1.3"
-
-#endif // _NPT_VERSION_H_

gpac-2.2.1.tar.gz/extra_lib/include/platinum/NptXml.h Deleted

@@ -1,390 +0,0 @@
-/*****************************************************************
-|
-|   Neptune - Xml Support
-|
-| Copyright (c) 2002-2008, Axiomatic Systems, LLC.
-| All rights reserved.
-|
-| Redistribution and use in source and binary forms, with or without
-| modification, are permitted provided that the following conditions are met:
-|     * Redistributions of source code must retain the above copyright
-|       notice, this list of conditions and the following disclaimer.
-|     * Redistributions in binary form must reproduce the above copyright
-|       notice, this list of conditions and the following disclaimer in the
-|       documentation and/or other materials provided with the distribution.
-|     * Neither the name of Axiomatic Systems nor the
-|       names of its contributors may be used to endorse or promote products
-|       derived from this software without specific prior written permission.
-|
-| THIS SOFTWARE IS PROVIDED BY AXIOMATIC SYSTEMS ''AS IS'' AND ANY
-| EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-| WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-| DISCLAIMED. IN NO EVENT SHALL AXIOMATIC SYSTEMS BE LIABLE FOR ANY
-| DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-| (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-| LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-| ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-| (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-| SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-|
- ****************************************************************/
-
-#ifndef _NPT_XML_H_
-#define _NPT_XML_H_
-
-/*----------------------------------------------------------------------
-|   includes
-+---------------------------------------------------------------------*/
-#include "NptTypes.h"
-#include "NptList.h"
-#include "NptStrings.h"
-#include "NptStreams.h"
-
-/*----------------------------------------------------------------------
-|   constants
-+---------------------------------------------------------------------*/
-const int NPT_ERROR_XML_INVALID_NESTING = NPT_ERROR_BASE_XML - 0;
-const int NPT_ERROR_XML_TAG_MISMATCH    = NPT_ERROR_BASE_XML - 1;
-const int NPT_ERROR_XML_NO_ROOT         = NPT_ERROR_BASE_XML - 2;
-const int NPT_ERROR_XML_MULTIPLE_ROOTS  = NPT_ERROR_BASE_XML - 3;
-
-#define NPT_XML_ANY_NAMESPACE "*"
-#define NPT_XML_NO_NAMESPACE  NULL
-
-/*----------------------------------------------------------------------
-|   forward declarations
-+---------------------------------------------------------------------*/
-class NPT_XmlProcessor;
-
-/*----------------------------------------------------------------------
-|   NPT_XmlAttribute
-+---------------------------------------------------------------------*/
-class NPT_XmlAttribute
-{
- public:
-    // methods
-    NPT_XmlAttribute(const char* name, const char* value);
-    NPT_XmlAttribute(const char* prefix, const char* name, const char* value) :
-        m_Prefix(prefix), m_Name(name), m_Value(value) {}
-    const NPT_String& GetPrefix() const { return m_Prefix; }
-    const NPT_String& GetName()   const { return m_Name;   }
-    const NPT_String& GetValue()  const { return m_Value;  }
-    void              SetValue(const char* value) { m_Value = value; }
-
- private:
-    // members
-    NPT_String m_Prefix;
-    NPT_String m_Name;
-    NPT_String m_Value;
-
-    NPT_XmlAttribute(const NPT_XmlAttribute& attribute) :
-        m_Prefix(attribute.m_Prefix), 
-        m_Name(attribute.m_Name), 
-        m_Value(attribute.m_Value) {}
-    NPT_XmlAttribute& operator=(const NPT_XmlAttribute& a);
-
-    // friends
-    friend class NPT_XmlAttributeFinder;
-    friend class NPT_XmlAttributeFinderWithPrefix;
-};
-
-/*----------------------------------------------------------------------
-|   NPT_XmlNamespaceMap
-+---------------------------------------------------------------------*/
-class NPT_XmlNamespaceMap
-{
-public:
-    // destructor
-    ~NPT_XmlNamespaceMap();
-
-    // methods   
-    NPT_Result        SetNamespaceUri(const char* prefix, const char* uri);
-    const NPT_String* GetNamespaceUri(const char* prefix);
-    const NPT_String* GetNamespacePrefix(const char* uri);
-
-private:
-    // types
-    class Entry {
-    public:
-        // constructor
-        Entry(const char* prefix, const char* uri) : 
-            m_Prefix(prefix), m_Uri(uri) {}
-
-        // members
-        NPT_String m_Prefix;
-        NPT_String m_Uri;
-    };
-
-    // members
-    NPT_List<Entry*> m_Entries;
-
-    // friends
-    friend class NPT_XmlWriter;
-    friend class NPT_XmlNodeWriter;
-    friend class NPT_XmlNodeCanonicalWriter;
-};
-
-/*----------------------------------------------------------------------
-|   NPT_XmlNode
-+---------------------------------------------------------------------*/
-class NPT_XmlElementNode;
-class NPT_XmlTextNode;
-class NPT_XmlNode
-{
- public:
-    // types
-    typedef enum {
-        DOCUMENT,
-        ELEMENT,
-        TEXT
-    } Type;
-
-    // methods
-    NPT_XmlNode(Type type) : m_Type(type), m_Parent(NULL) {}
-    virtual     ~NPT_XmlNode() {}
-    Type         GetType() const { return m_Type; }
-    NPT_XmlNode* GetParent() const { return m_Parent; }
-
-    // type casting
-    virtual NPT_XmlElementNode*       AsElementNode()       { return NULL; }
-    virtual const NPT_XmlElementNode* AsElementNode() const { return NULL; }
-    virtual NPT_XmlTextNode*          AsTextNode()          { return NULL; }
-    virtual const NPT_XmlTextNode*    AsTextNode() const    { return NULL; }
-
- protected:
-    // methods
-    virtual void SetParent(NPT_XmlNode* parent) { m_Parent = parent; }
-
-    // members  
-    Type         m_Type;
-    NPT_XmlNode* m_Parent;
-
-    // friends
-    friend class NPT_XmlNodeFinder;
-    friend class NPT_XmlSerializer;
-    friend class NPT_XmlWriter;
-    friend class NPT_XmlElementNode; // to allow access to SetParent()
-};
-
-/*----------------------------------------------------------------------
-|   NPT_XmlElementNode
-+---------------------------------------------------------------------*/
-class NPT_XmlElementNode : public NPT_XmlNode
-{
- public:
-    // methods
-                            NPT_XmlElementNode(const char* tag);
-                            NPT_XmlElementNode(const char* prefix, const char* tag);
-    virtual                ~NPT_XmlElementNode();
-    NPT_List<NPT_XmlNode*>& GetChildren() { return m_Children; }
-    const NPT_List<NPT_XmlNode*>& 
-                            GetChildren() const { return m_Children; }
-    NPT_XmlElementNode*     GetChild(const char* tag, 
-                                     const char* namespc = NPT_XML_NO_NAMESPACE,
-                                     NPT_Ordinal n=0) const;
-    NPT_Result              AddChild(NPT_XmlNode* child);
-    NPT_Result              SetAttribute(const char* prefix,
-                                         const char* name, 
-                                         const char* value);
-    NPT_Result              SetAttribute(const char* name, 
-                                         const char* value);
-    NPT_Result              AddText(const char* text); 
-    NPT_List<NPT_XmlAttribute*>& 
-                            GetAttributes() { return m_Attributes; }
-    const NPT_List<NPT_XmlAttribute*>&
-                            GetAttributes() const { return m_Attributes; }
-    const NPT_String*       GetAttribute(const char* name,
-                                         const char* namespc = NPT_XML_NO_NAMESPACE) const;
-    const NPT_String&       GetPrefix() const { return m_Prefix; }
-    const NPT_String&       GetTag()    const { return m_Tag;    }
-    const NPT_String*       GetText(NPT_Ordinal n=0) const;
-
-    // bring all the namespace definitions used in this element of one of its descendants
-    // into the namespace map of this element so that it may be serialized as a
-    // standalone element without any prefixes with undefined namespace uris
-    NPT_Result              MakeStandalone();
-
-    // namespace methods   
-    const NPT_String* GetNamespace() const;
-    NPT_Result        SetNamespaceUri(const char* prefix, const char* uri);
-    const NPT_String* GetNamespaceUri(const char* prefix) const;
-    const NPT_String* GetNamespacePrefix(const char* uri) const;
-
-    // type casting
-    NPT_XmlElementNode*       AsElementNode()       { return this; }
-    const NPT_XmlElementNode* AsElementNode() const { return this; }
-
-protected:
-    // methods
-    void SetParent(NPT_XmlNode* parent);
-    void SetNamespaceParent(NPT_XmlElementNode* parent);
-    void RelinkNamespaceMaps();
-
-    NPT_Result AddAttribute(const char* name, const char* value);
-
-    // members  
-    NPT_String                  m_Prefix;
-    NPT_String                  m_Tag;
-    NPT_List<NPT_XmlNode*>      m_Children;
-    NPT_List<NPT_XmlAttribute*> m_Attributes;
-    NPT_XmlNamespaceMap*        m_NamespaceMap;
-    NPT_XmlElementNode*         m_NamespaceParent;
-
-    // friends
-    friend class NPT_XmlTagFinder;
-    friend class NPT_XmlSerializer;
-    friend class NPT_XmlWriter;
-    friend class NPT_XmlNodeWriter;
-    friend class NPT_XmlNodeCanonicalWriter;
-    friend class NPT_XmlParser;
-    friend class NPT_XmlProcessor;
-    friend class NPT_XmlNamespaceCollapser;
-};
-
-/*----------------------------------------------------------------------
-|   NPT_XmlTextNode
-+---------------------------------------------------------------------*/
-class NPT_XmlTextNode : public NPT_XmlNode
-{
- public:
-    // types
-    typedef enum {
-        CHARACTER_DATA,
-        IGNORABLE_WHITESPACE,
-        CDATA_SECTION,
-        ENTITY_REFERENCE,
-        COMMENT
-    } TokenType;
-
-    // constructor
-    NPT_XmlTextNode(TokenType token_type, const char* text);
-
-    // methods
-    const NPT_String& GetString() const { return m_Text; }
-
-    // type casting
-    NPT_XmlTextNode*       AsTextNode()       { return this; }
-    const NPT_XmlTextNode* AsTextNode() const { return this; }
-
- private:
-    // members  
-//    TokenType  m_TokenType;
-    NPT_String m_Text;
-};
-
-/*----------------------------------------------------------------------
-|   NPT_XmlParser
-+---------------------------------------------------------------------*/
-class NPT_XmlParser
-{
- public:
-    // methods
-             NPT_XmlParser(bool keep_whitespace = true);
-    virtual ~NPT_XmlParser();
-    virtual  NPT_Result Parse(const char*   xml, 
-                              NPT_XmlNode*& tree,
-                              bool          incremental=false);
-    virtual  NPT_Result Parse(const char*   xml, 
-                              NPT_Size      size,
-                              NPT_XmlNode*& tree,
-                              bool          incremental=false);
-    virtual  NPT_Result Parse(NPT_InputStream& stream, 
-                              NPT_XmlNode*&    tree,
-                              bool             incremental=false);
-    virtual  NPT_Result Parse(NPT_InputStream& stream, 
-                              NPT_Size&        size,
-                              NPT_XmlNode*&    tree,
-                              bool             incremental=false);
-    
- protected:
-    // NPT_XmlHandler methods
-    NPT_Result OnStartElement(const char* name);
-    NPT_Result OnElementAttribute(const char* name, const char* value);
-    NPT_Result OnEndElement(const char* name);
-    NPT_Result OnCharacterData(const char* data, unsigned long size);
-    void       RemoveIgnorableWhitespace();
-
-    // members
-    NPT_XmlProcessor*   m_Processor;
-    NPT_XmlElementNode* m_Root;
-    NPT_XmlElementNode* m_CurrentElement;
-    bool                m_KeepWhitespace;
-
-private:
-    void Reset();
-    
-    // friends
-    friend class NPT_XmlProcessor;
-};
-
-/*----------------------------------------------------------------------
-|   NPT_XmlSerializer
-+---------------------------------------------------------------------*/
-class NPT_XmlSerializer
-{
-public:
-    // methods
-                       NPT_XmlSerializer(NPT_OutputStream* output,
-                                         NPT_Cardinal      indentation = 0,
-                                         bool              shrink_empty_elements = true,
-                                         bool              add_xml_decl = false);
-    virtual           ~NPT_XmlSerializer();
-    virtual NPT_Result StartDocument();
-    virtual NPT_Result EndDocument();
-    virtual NPT_Result StartElement(const char* prefix, const char* name);
-    virtual NPT_Result EndElement(const char* prefix, const char* name);
-    virtual NPT_Result Attribute(const char* prefix, const char* name, const char* value);
-    virtual NPT_Result Text(const char* text);
-    virtual NPT_Result CdataSection(const char* data);
-    virtual NPT_Result Comment(const char* comment);
-
-protected:
-    // methods
-    void       EscapeChar(unsigned char c, char* text);
-    NPT_Result ProcessPending();
-    NPT_Result OutputEscapedString(const char* text, bool attribute);
-    void       OutputIndentation(bool start);
-
-    // members
-    NPT_OutputStream* m_Output;
-    bool              m_ElementPending;
-    NPT_Cardinal      m_Depth;
-    NPT_Cardinal      m_Indentation;
-    NPT_String        m_IndentationPrefix;
-    bool              m_ElementHasText;
-    bool              m_ShrinkEmptyElements;
-    bool              m_AddXmlDecl;
-};
-
-/*----------------------------------------------------------------------
-|   NPT_XmlWriter
-+---------------------------------------------------------------------*/
-class NPT_XmlWriter
-{
-public:
-    // constructor
-    explicit NPT_XmlWriter(NPT_Cardinal indentation = 0) : m_Indentation(indentation) {}
-
-    // methods
-    NPT_Result Serialize(NPT_XmlNode&      node, 
-                         NPT_OutputStream& stream, 
-                         bool              add_xml_decl = false);
-
-private:
-    // members
-    NPT_Cardinal m_Indentation;
-};
-
-/*----------------------------------------------------------------------
-|   NPT_XmlCanonicalizer
-+---------------------------------------------------------------------*/
-class NPT_XmlCanonicalizer
-{
-public:
-    // methods
-    NPT_Result Serialize(NPT_XmlNode&      node, 
-                         NPT_OutputStream& stream, 
-                         bool              add_xml_decl = false);
-};
-
-#endif // _NPT_XML_H_

gpac-2.2.1.tar.gz/extra_lib/include/platinum/NptZip.h Deleted

@@ -1,176 +0,0 @@
-/*****************************************************************
-|
-|   Neptune - Zip Support
-|
-| Copyright (c) 2002-2008, Axiomatic Systems, LLC.
-| All rights reserved.
-|
-| Redistribution and use in source and binary forms, with or without
-| modification, are permitted provided that the following conditions are met:
-|     * Redistributions of source code must retain the above copyright
-|       notice, this list of conditions and the following disclaimer.
-|     * Redistributions in binary form must reproduce the above copyright
-|       notice, this list of conditions and the following disclaimer in the
-|       documentation and/or other materials provided with the distribution.
-|     * Neither the name of Axiomatic Systems nor the
-|       names of its contributors may be used to endorse or promote products
-|       derived from this software without specific prior written permission.
-|
-| THIS SOFTWARE IS PROVIDED BY AXIOMATIC SYSTEMS ''AS IS'' AND ANY
-| EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-| WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-| DISCLAIMED. IN NO EVENT SHALL AXIOMATIC SYSTEMS BE LIABLE FOR ANY
-| DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-| (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-| LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-| ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-| (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-| SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-|
- ****************************************************************/
-
-#ifndef _NPT_ZIP_H_
-#define _NPT_ZIP_H_
-
-/*----------------------------------------------------------------------
-|   includes
-+---------------------------------------------------------------------*/
-#include "NptConfig.h"
-#include "NptStreams.h"
-#include "NptFile.h"
-
-/*----------------------------------------------------------------------
-|   class references
-+---------------------------------------------------------------------*/
-class NPT_ZipInflateState;
-class NPT_ZipDeflateState;
-
-/*----------------------------------------------------------------------
-|   NPT_Zip
-+---------------------------------------------------------------------*/
-const int NPT_ZIP_COMPRESSION_LEVEL_DEFAULT = -1;
-const int NPT_ZIP_COMPRESSION_LEVEL_MIN     = 0;
-const int NPT_ZIP_COMPRESSION_LEVEL_MAX     = 9;
-const int NPT_ZIP_COMPRESSION_LEVEL_NONE    = 0;
-class NPT_Zip 
-{
-public:
-    // class methods
-    static NPT_Result MapError(int err);
-
-    /** 
-     * Compressed data format
-     */
-    typedef enum {
-        ZLIB,
-        GZIP
-    } Format;
-        
-    /**
-     * Deflate (i.e compress) a buffer
-     */
-    static NPT_Result Deflate(const NPT_DataBuffer& in,
-                              NPT_DataBuffer&       out,
-                              int                   compression_level = NPT_ZIP_COMPRESSION_LEVEL_DEFAULT,
-                              Format                format = ZLIB);
-                              
-    /**
-     * Inflate (i.e decompress) a buffer
-     */
-    static NPT_Result Inflate(const NPT_DataBuffer& in,
-                              NPT_DataBuffer&       out);   
-    
-    /**
-     * Deflate (i.e compress) a file
-     */
-    static NPT_Result Deflate(NPT_File& in,
-                              NPT_File& out,
-                              int       compression_level = NPT_ZIP_COMPRESSION_LEVEL_DEFAULT,
-                              Format    format = GZIP);
-    
-};
-
-/*----------------------------------------------------------------------
-|   NPT_ZipInflatingInputStream
-+---------------------------------------------------------------------*/
-class NPT_ZipInflatingInputStream : public NPT_InputStream 
-{
-public:
-    NPT_ZipInflatingInputStream(NPT_InputStreamReference& source);
-   ~NPT_ZipInflatingInputStream();
-   
-    // NPT_InputStream methods
-    virtual NPT_Result Read(void*     buffer, 
-                            NPT_Size  bytes_to_read, 
-                            NPT_Size* bytes_read = NULL);
-    virtual NPT_Result Seek(NPT_Position offset);
-    virtual NPT_Result Tell(NPT_Position& offset);
-    virtual NPT_Result GetSize(NPT_LargeSize& size);
-    virtual NPT_Result GetAvailable(NPT_LargeSize& available);
-
-private:
-    NPT_InputStreamReference m_Source;
-    NPT_Position             m_Position;
-    NPT_ZipInflateState*     m_State;
-    NPT_DataBuffer           m_Buffer;
-};
-
-/*----------------------------------------------------------------------
-|   NPT_ZipInflatingOutputStream
-+---------------------------------------------------------------------*/
-
-/*----------------------------------------------------------------------
-|   NPT_ZipDeflatingInputStream
-+---------------------------------------------------------------------*/
-class NPT_ZipDeflatingInputStream : public NPT_InputStream 
-{
-public:
-    NPT_ZipDeflatingInputStream(NPT_InputStreamReference& source,
-                                int                       compression_level = NPT_ZIP_COMPRESSION_LEVEL_DEFAULT,
-                                NPT_Zip::Format           format = NPT_Zip::ZLIB);
-   ~NPT_ZipDeflatingInputStream();
-   
-    // NPT_InputStream methods
-    virtual NPT_Result Read(void*     buffer, 
-                            NPT_Size  bytes_to_read, 
-                            NPT_Size* bytes_read = NULL);
-    virtual NPT_Result Seek(NPT_Position offset);
-    virtual NPT_Result Tell(NPT_Position& offset);
-    virtual NPT_Result GetSize(NPT_LargeSize& size);
-    virtual NPT_Result GetAvailable(NPT_LargeSize& available);
-
-private:
-    NPT_InputStreamReference m_Source;
-    NPT_Position             m_Position;
-    bool                     m_Eos;
-    NPT_ZipDeflateState*     m_State;
-    NPT_DataBuffer           m_Buffer;
-};
-
-/*----------------------------------------------------------------------
-|   NPT_ZipDeflatingOutputStream
-+---------------------------------------------------------------------*/
-/*class NPT_ZipDeflatingOutputStream : public NPT_OutputStream 
-{
-public:
-    NPT_ZipDeflatingOutputStream(NPT_OutputStreamReference& source,
-                                 int                        compression_level = NPT_ZIP_COMPRESSION_LEVEL_DEFAULT,
-                                 NPT_Zip::Format            format = NPT_Zip::ZLIB);
-   NPT_ZipDeflatingOutputStream();
-   
-    // NPT_OutputStream methods
-    virtual NPT_Result Write(void*     buffer, 
-                             NPT_Size  bytes_to_write, 
-                             NPT_Size* bytes_written = NULL);
-    virtual NPT_Result Seek(NPT_Position offset);
-    virtual NPT_Result Tell(NPT_Position& offset);
-
-private:
-    NPT_OutputStreamReference m_Output;
-    NPT_Position              m_Position;
-    bool                      m_Eos;
-    NPT_ZipDeflateState*      m_State;
-    NPT_DataBuffer            m_Buffer;
-}; */
-
-#endif // _NPT_ZIP_H_

gpac-2.2.1.tar.gz/extra_lib/include/platinum/Platinum.h Deleted

@@ -1,118 +0,0 @@
-/*****************************************************************
-|
-|   Platinum - Top Level Include
-|
-| Copyright (c) 2004-2010, Plutinosoft, LLC.
-| All rights reserved.
-| http://www.plutinosoft.com
-|
-| This program is free software; you can redistribute it and/or
-| modify it under the terms of the GNU General Public License
-| as published by the Free Software Foundation; either version 2
-| of the License, or (at your option) any later version.
-|
-| OEMs, ISVs, VARs and other distributors that combine and 
-| distribute commercially licensed software with Platinum software
-| and do not wish to distribute the source code for the commercially
-| licensed software under version 2, or (at your option) any later
-| version, of the GNU General Public License (the "GPL") must enter
-| into a commercial license agreement with Plutinosoft, LLC.
-| licensing@plutinosoft.com
-| 
-| This program 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 General Public License for more details.
-|
-| You should have received a copy of the GNU General Public License
-| along with this program; see the file LICENSE.txt. If not, write to
-| the Free Software Foundation, Inc., 
-| 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-| http://www.gnu.org/licenses/gpl-2.0.html
-|
- ****************************************************************/
-/** @file
- Master Header file included by Platinum client applications.
- 
- Client Applications should only need to include this file, as it 
- includes all the more specific include files required to use the API
- */
-
-/** 
-@mainpage Platinum UPnP SDK
-
-@section intro Introduction
-
-The Platinum SDK contains all the software components necessary to 
-build and use the Platinum UPnP Framework. This includes
-the Platinum framework and the Neptune C++ runtime
-library.
-
-@section architecture Architecture
-
-The Platinum framework consists of a core framework that implements the UPnP
-core specifications including GENA, SOAP and SSDP. Building on top of that, the 
-Platinum framework provides the foundation for UPnP AV Media Server and 
-Media Renderer compliant implementations.
- 
-The Platinum framework leverages the Neptune C++ runtime library which offers an 
-elegant platform abstraction layer for multithreading, file system and 
-network operations. Additionally, it provides support for XML parsing, string and time
-manipulation, template based linked-lists, stacks and arrays, and a configurable 
-cross-platform logging system.
- 
-*/
-
-#ifndef _PLATINUM_H_
-#define _PLATINUM_H_
-
-/*----------------------------------------------------------------------
-|   includes
-+---------------------------------------------------------------------*/
-#include "PltUPnP.h"
-#include "PltCtrlPoint.h"
-#include "PltDeviceData.h"
-#include "PltHttpServer.h"
-#include "PltVersion.h"
-
-#include "PltMimeType.h"
-#include "PltProtocolInfo.h"
-#include "PltAction.h"
-#include "PltArgument.h"
-#include "PltConstants.h"
-#include "PltCtrlPointTask.h"
-#include "PltDatagramStream.h"
-#include "PltDeviceHost.h"
-#include "PltEvent.h"
-#include "PltHttp.h"
-#include "PltHttpClientTask.h"
-#include "PltHttpServer.h"
-#include "PltHttpServerTask.h"
-#include "PltService.h"
-#include "PltSsdp.h"
-#include "PltStateVariable.h"
-#include "PltTaskManager.h"
-#include "PltThreadTask.h"
-#include "PltUtilities.h"
-
-#include "PltMediaServer.h"
-#include "PltMediaBrowser.h"
-#include "PltMediaRenderer.h"
-#include "PltMediaController.h"
-#include "PltDidl.h"
-#include "PltFileMediaServer.h"
-#include "PltMediaCache.h"
-#include "PltMediaItem.h"
-#include "PltSyncMediaBrowser.h"
-
-#include "PltXbox360.h"
-#include "PltMediaConnect.h"
-
-#include "PltDownloader.h"
-#include "PltStreamPump.h"
-#include "PltFrameBuffer.h"
-#include "PltFrameServer.h"
-#include "PltFrameStream.h"
-#include "PltRingBufferStream.h"
-
-#endif /* _PLATINUM_H_ */

gpac-2.2.1.tar.gz/extra_lib/include/platinum/PltAction.h Deleted

@@ -1,321 +0,0 @@
-/*****************************************************************
-|
-|   Platinum - Service Action
-|
-| Copyright (c) 2004-2010, Plutinosoft, LLC.
-| All rights reserved.
-| http://www.plutinosoft.com
-|
-| This program is free software; you can redistribute it and/or
-| modify it under the terms of the GNU General Public License
-| as published by the Free Software Foundation; either version 2
-| of the License, or (at your option) any later version.
-|
-| OEMs, ISVs, VARs and other distributors that combine and 
-| distribute commercially licensed software with Platinum software
-| and do not wish to distribute the source code for the commercially
-| licensed software under version 2, or (at your option) any later
-| version, of the GNU General Public License (the "GPL") must enter
-| into a commercial license agreement with Plutinosoft, LLC.
-| licensing@plutinosoft.com
-|  
-| This program 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 General Public License for more details.
-|
-| You should have received a copy of the GNU General Public License
-| along with this program; see the file LICENSE.txt. If not, write to
-| the Free Software Foundation, Inc., 
-| 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-| http://www.gnu.org/licenses/gpl-2.0.html
-|
-****************************************************************/
-
-/** @file
-   UPnP Service Action
- */
-
-#ifndef _PLT_ACTION_H_
-#define _PLT_ACTION_H_
-
-/*----------------------------------------------------------------------
-|   includes
-+---------------------------------------------------------------------*/
-#include "Neptune.h"
-#include "PltArgument.h"
-#include "PltDeviceData.h"
-
-/*----------------------------------------------------------------------
-|   forward declarations
-+---------------------------------------------------------------------*/
-class PLT_Service;
-
-/*----------------------------------------------------------------------
-|   PLT_ActionDesc
-+---------------------------------------------------------------------*/
-/**
- The PLT_ActionDesc class provides information about a UPnP Service given action.
- This description has a name, a set of arguments and is associated to a service.
- */
-class PLT_ActionDesc
-{
-public:
-    /**
-     Constructor
-     @param name the action name
-     @param service the UPnP service the action is associated with
-     */
-    PLT_ActionDesc(const char* name, PLT_Service* service);
-   ~PLT_ActionDesc();
-
-    /**
-     Return an array of arguments
-     @return array of arguments
-     */
-    NPT_Array<PLT_ArgumentDesc*>& GetArgumentDescs() { 
-        return m_ArgumentDescs; 
-    }
-
-    /**
-     Return the action name.
-     @return action name.
-     */
-    const NPT_String& GetName() const { return m_Name;}
-    
-    /**
-     Look for an argument given a name.
-     @param name argument name
-     @return PLT_ArgumentDesc pointer
-     */
-    PLT_ArgumentDesc* GetArgumentDesc(const char* name);
-    
-    /**
-     Serialize action information to xml into an existing xml tree
-     @param node the xml Element to serialize action information
-     */
-    NPT_Result        GetSCPDXML(NPT_XmlElementNode* node);
-    
-    /**
-     Return the service the action is associated with
-     */
-    PLT_Service*      GetService();
-
-protected:
-    //members
-    NPT_String                   m_Name;
-    PLT_Service*                 m_Service;
-    NPT_Array<PLT_ArgumentDesc*> m_ArgumentDescs;
-};
-
-/*----------------------------------------------------------------------
-|   PLT_Action
-+---------------------------------------------------------------------*/
-/** 
- The PLT_Action class provides a mechanism to call or verify the validity of a
- specific UPNP service action.
- Given a service, a UPnP Control Point would use this class to serialize a soap
- request. On the other side, a UPnP Device would use this class to verify
- a soap request and the validity of the action arguments.
- */
-class PLT_Action
-{
-public:
-    /**
-     Constructor
-     @param action_desc the action description
-     If you intend to send an action, you need to use the second constructor
-     and pass the root device of the device you wish to control.
-     */
-    PLT_Action(PLT_ActionDesc& action_desc);
-    
-    /**
-     Constructor
-     @param action_desc the action description
-     @param root_device a reference to the root device of the service the action
-     is associated with. This insures that the device won't be deleted if it goes 
-     away while we're waiting for a response for this action. This is important because
-     we only keep a reference to the PLT_ActionDesc which is own by the service operated
-     by the device (or embedded device).
-     */
-    PLT_Action(PLT_ActionDesc& action_desc, PLT_DeviceDataReference& root_device);
-    ~PLT_Action();
-
-    /**
-     Return the action description
-     @return the action description
-     */
-    PLT_ActionDesc& GetActionDesc() { return m_ActionDesc; }
-    
-    /**
-     Retrieve the string value of an argument given an argument name.
-     @param name the argument name
-     @param value the string value to retrieve
-     @return error if the argument is not found or if the type does not correspond.
-     */
-    NPT_Result GetArgumentValue(const char* name, NPT_String& value);
-    
-    /**
-     Retrieve the value of an argument given an argument name.
-     @param name the argument name
-     @param value the unsigned int value to retrieve
-     @return error if the argument is not found or if the type does not correspond.
-     */
-    NPT_Result GetArgumentValue(const char* name, NPT_UInt32& value);
-    
-    /**
-     Retrieve the value of an argument given an argument name.
-     @param name the argument name
-     @param value the int value to retrieve
-     @return error if the argument is not found or if the type does not correspond.
-     */
-    NPT_Result GetArgumentValue(const char* name, NPT_Int32& value);
-    
-    /**
-     Retrieve the value of an argument given an argument name.
-     @param name the argument name
-     @param value the bool value to retrieve
-     @return error if the argument is not found or if the type does not correspond.
-     */
-	NPT_Result GetArgumentValue(const char* name, bool& value);
-    
-    /**
-     Verify a value is valid for a given argument.
-     @param name the argument name
-     @param value the value to verify
-     */
-    NPT_Result VerifyArgumentValue(const char* name, const char* value);
-    
-    /**
-     Verify that all required arguments are set.
-     @param input boolean indicating whether input or output parameters 
-     should be verified
-     */
-    NPT_Result VerifyArguments(bool input);
-    
-    /**
-     Set the output argument value from the associated current state variable value.
-     @param name the state variable name
-     */
-    NPT_Result SetArgumentOutFromStateVariable(const char* name);
-    
-    /**
-     Set all the output argument values associated with state variables.
-     */
-    NPT_Result SetArgumentsOutFromStateVariable();
-    
-    /**
-     Set an argument value
-     @param name the argument name
-     @param value the argument value
-     */
-    NPT_Result SetArgumentValue(const char* name, const char* value);
-
-    /** 
-     Set the error code and description in case of failure.
-     @param code the code for the error
-     @param description a short description
-     */
-    NPT_Result SetError(unsigned int code, const char* description);
-    
-    /**
-     Return the error description and code for the failed action.
-     @param code optional pointer to receive the code
-     @return the error short description
-     */
-    const char* GetError(unsigned int* code = NULL);
-    
-    /**
-     Return the error code for the failed action.
-     @return the error code.
-     */
-    unsigned int GetErrorCode();
-    
-    /**
-     Called by a control point when serializing an action.
-     @param stream the stream to serialize the action to
-     */
-    NPT_Result    FormatSoapRequest(NPT_OutputStream& stream);
-    
-    /**
-     Called by a device when serializing a response to an action.
-     @param stream the stream to serialize the action to
-     */
-    NPT_Result    FormatSoapResponse(NPT_OutputStream& stream);
-
-    /**
-     Helper method for a device to serialize an action invocation error.
-     @param code optional pointer to receive the code
-     @param desc the error short description
-     @param stream the stream to serialize to
-     */
-    static NPT_Result FormatSoapError(unsigned int      code, 
-                                      NPT_String        desc, 
-                                      NPT_OutputStream& stream);
-
-private:
-    // methods
-    NPT_Result    SetArgumentOutFromStateVariable(PLT_ArgumentDesc* arg_desc);
-    PLT_Argument* GetArgument(const char* name);
-
-protected:
-    // members
-    PLT_ActionDesc&         m_ActionDesc;
-    PLT_Arguments           m_Arguments;
-    unsigned int            m_ErrorCode;
-    NPT_String              m_ErrorDescription;
-    
-    // keep reference of service root device to prevent it 
-    // from being released during action lifetime
-	PLT_DeviceDataReference m_RootDevice;
-};
-
-typedef NPT_Reference<PLT_Action> PLT_ActionReference;
-
-/*----------------------------------------------------------------------
-|   PLT_GetSCPDXMLIterator
-+---------------------------------------------------------------------*/
-/**
- The PLT_GetSCPDXMLIterator class provides a recursive way to serialize 
- an SCPD into an xml tree.
- */
-template <class T>
-class PLT_GetSCPDXMLIterator
-{
-public:
-    PLT_GetSCPDXMLIterator<T>(NPT_XmlElementNode* node) :
-        m_Node(node) {}
-      
-    NPT_Result operator()(T* const & data) const {
-        return data->GetSCPDXML(m_Node);
-    }
-
-private:
-    NPT_XmlElementNode* m_Node;
-};
-
-/*----------------------------------------------------------------------
-|   PLT_ActionDescNameFinder
-+---------------------------------------------------------------------*/
-/** 
- The PLT_ActionDescNameFinder class provides a mechanism to find a PLT_ActionDesc 
- given an action name.
- */
-class PLT_ActionDescNameFinder
-{
-public:
-    // methods
-    PLT_ActionDescNameFinder(const char* name) : 
-        m_Name(name) {}
-    virtual ~PLT_ActionDescNameFinder() {}
-
-    bool operator()(const PLT_ActionDesc* const & action_desc) const {
-        return action_desc->GetName().Compare(m_Name, true) ? false : true;
-    }
-
-private:
-    // members
-    NPT_String   m_Name;
-};
-
-#endif /* _PLT_ACTION_H_ */

gpac-2.2.1.tar.gz/extra_lib/include/platinum/PltArgument.h Deleted

@@ -1,168 +0,0 @@
-/*****************************************************************
-|
-|   Platinum - Action Argument
-|
-| Copyright (c) 2004-2010, Plutinosoft, LLC.
-| All rights reserved.
-| http://www.plutinosoft.com
-|
-| This program is free software; you can redistribute it and/or
-| modify it under the terms of the GNU General Public License
-| as published by the Free Software Foundation; either version 2
-| of the License, or (at your option) any later version.
-|
-| OEMs, ISVs, VARs and other distributors that combine and 
-| distribute commercially licensed software with Platinum software
-| and do not wish to distribute the source code for the commercially
-| licensed software under version 2, or (at your option) any later
-| version, of the GNU General Public License (the "GPL") must enter
-| into a commercial license agreement with Plutinosoft, LLC.
-| licensing@plutinosoft.com
-|  
-| This program 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 General Public License for more details.
-|
-| You should have received a copy of the GNU General Public License
-| along with this program; see the file LICENSE.txt. If not, write to
-| the Free Software Foundation, Inc., 
-| 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-| http://www.gnu.org/licenses/gpl-2.0.html
-|
-****************************************************************/
-
-/** @file
- UPnP Service Action Argument
- */
-
-#ifndef _PLT_ARGUMENT_H_
-#define _PLT_ARGUMENT_H_
-
-/*----------------------------------------------------------------------
-|   includes
-+---------------------------------------------------------------------*/
-#include "Neptune.h"
-
-/*----------------------------------------------------------------------
-|   forward declarations
-+---------------------------------------------------------------------*/
-class PLT_StateVariable;
-class PLT_Argument;
-class PLT_ActionDesc;
-typedef NPT_Array<PLT_Argument*> PLT_Arguments;
-
-/*----------------------------------------------------------------------
-|   PLT_ArgumentDesc
-+---------------------------------------------------------------------*/
-/**
- The PLT_ArgumentDesc class provides information about a given argument of a 
- UPnP Service given action.
- It has a name, a position, a direction (in/out), a PLT_StateVariable state 
- variable association and whether it is the return value of the action or not.
- */
-class PLT_ArgumentDesc
-{
-public:
-    PLT_ArgumentDesc(const char*        name,
-                     NPT_Ordinal        position,
-                     const char*        direction = "in",
-                     PLT_StateVariable* variable = NULL, 
-                     bool               has_ret = false);
-
-    // accessor methods
-    NPT_Result         GetSCPDXML(NPT_XmlElementNode* node);
-    const NPT_String&  GetName() const { return m_Name; }
-    const NPT_String&  GetDirection() const { return m_Direction; }
-    NPT_Ordinal        GetPosition() { return m_Position; }
-    PLT_StateVariable* GetRelatedStateVariable() { return m_RelatedStateVariable; }
-    bool               HasReturnValue() { return m_HasReturnValue; }
-
-protected:
-    NPT_String         m_Name;
-    NPT_Ordinal        m_Position;
-    NPT_String         m_Direction;
-    PLT_StateVariable* m_RelatedStateVariable;
-    bool               m_HasReturnValue;
-};
-
-/*----------------------------------------------------------------------
-|   PLT_Argument
-+---------------------------------------------------------------------*/
-/** 
- The PLT_Argument class provides a mechanism to set or verify the validity of a
- specific UPNP service action argument.
- Typically, only a PLT_Action uses this class. Since an argument can be
- associated to a state variable, the argument is automatically updated when
- the associated state variable is changed 
- */
-class PLT_Argument
-{
-public:
-    PLT_Argument(PLT_ArgumentDesc& arg_desc);
-
-    // class methods
-    static NPT_Result CreateArgument(PLT_ActionDesc& action_desc, 
-                                     const char*     arg_name, 
-                                     const char*     arg_value,
-                                     PLT_Argument*&  arg);
-
-    // accessor methods
-    PLT_ArgumentDesc&  GetDesc() { return m_ArgDesc; }
-    NPT_Ordinal        GetPosition() { return m_ArgDesc.GetPosition(); }
-    NPT_Result         SetValue(const char* value);
-    const NPT_String&  GetValue();
-
-private:
-    NPT_Result         ValidateValue(const char* value);
-    
-protected:
-    PLT_ArgumentDesc&  m_ArgDesc;
-    NPT_String         m_Value;
-};
-
-/*----------------------------------------------------------------------
-|   PLT_ArgumentNameFinder
-+---------------------------------------------------------------------*/
-/** 
- The PLT_ArgumentNameFinder class provides a mechanism to find a PLT_Argument given
- an argument name.
- */
-class PLT_ArgumentNameFinder
-{
-public:
-    // methods
-    PLT_ArgumentNameFinder(const char* name) : m_Name(name) {}
-
-    bool operator()(PLT_Argument* const & argument) const {
-        return argument->GetDesc().GetName().Compare(m_Name, true) ? false : true;
-    }
-
-private:
-    // members
-    NPT_String m_Name;
-};
-
-/*----------------------------------------------------------------------
-|   PLT_ArgumentDescNameFinder
-+---------------------------------------------------------------------*/
-/** 
- The PLT_ArgumentDescNameFinder class provides a mechanism to find a PLT_ArgumentDesc given
- an argument name.
- */
-class PLT_ArgumentDescNameFinder
-{
-public:
-    // methods
-    PLT_ArgumentDescNameFinder(const char* name) : m_Name(name) {}
-
-    bool operator()(PLT_ArgumentDesc* const & arg_desc) const {
-        return arg_desc->GetName().Compare(m_Name, true) ? false : true;
-    }
-
-private:
-    // members
-    NPT_String m_Name;
-};
-
-#endif /* _PLT_ARGUMENT_H_ */

gpac-2.2.1.tar.gz/extra_lib/include/platinum/PltConstants.h Deleted

@@ -1,87 +0,0 @@
-/*****************************************************************
-|
-|   Platinum - UPnP Constants
-|
-| Copyright (c) 2004-2010, Plutinosoft, LLC.
-| All rights reserved.
-| http://www.plutinosoft.com
-|
-| This program is free software; you can redistribute it and/or
-| modify it under the terms of the GNU General Public License
-| as published by the Free Software Foundation; either version 2
-| of the License, or (at your option) any later version.
-|
-| OEMs, ISVs, VARs and other distributors that combine and 
-| distribute commercially licensed software with Platinum software
-| and do not wish to distribute the source code for the commercially
-| licensed software under version 2, or (at your option) any later
-| version, of the GNU General Public License (the "GPL") must enter
-| into a commercial license agreement with Plutinosoft, LLC.
-| licensing@plutinosoft.com
-|  
-| This program 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 General Public License for more details.
-|
-| You should have received a copy of the GNU General Public License
-| along with this program; see the file LICENSE.txt. If not, write to
-| the Free Software Foundation, Inc., 
-| 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-| http://www.gnu.org/licenses/gpl-2.0.html
-|
-****************************************************************/
-
-/** @file
- UPnP Constants
- */
-
-#ifndef _PLT_UPNP_CONSTANTS_H_
-#define _PLT_UPNP_CONSTANTS_H_
-
-/*----------------------------------------------------------------------
-|   includes
-+---------------------------------------------------------------------*/
-#include "Neptune.h"
-
-/*----------------------------------------------------------------------
-|   PLT_Constants
-+---------------------------------------------------------------------*/
-/**
- The PLT_Constants class provides a way to globally set or get certain 
- UPnP constants.
- */
-class PLT_Constants
-{
-public:
-    // class methods
-    static PLT_Constants& GetInstance();
-    
-    PLT_Constants();
-    ~PLT_Constants() {};
-    
-    void SetDefaultDeviceLease(NPT_TimeInterval lease) { m_DefaultDeviceLease = new NPT_TimeInterval(lease); }
-    NPT_Reference<NPT_TimeInterval> GetDefaultDeviceLease() { return m_DefaultDeviceLease; }
-  
-    void SetDefaultSubscribeLease(NPT_TimeInterval lease) { m_DefaultSubscribeLease = new NPT_TimeInterval(lease); }
-    NPT_Reference<NPT_TimeInterval> GetDefaultSubscribeLease() { return m_DefaultSubscribeLease; }
-    
-    void SetDefaultUserAgent(const char* agent) { m_DefaultUserAgent = new NPT_String(agent); }
-    NPT_Reference<NPT_String> GetDefaultUserAgent() { return m_DefaultUserAgent; }
-    
-    void SetSearchMulticastTimeToLive(NPT_UInt32 ttl) { m_SearchMulticastTimeToLive = ttl; }
-    NPT_UInt32 GetSearchMulticastTimeToLive() { return m_SearchMulticastTimeToLive; }
-
-    void SetAnnounceMulticastTimeToLive(NPT_UInt32 ttl) { m_AnnounceMulticastTimeToLive = ttl; }
-    NPT_UInt32 GetAnnounceMulticastTimeToLive() { return m_AnnounceMulticastTimeToLive; }
-
-private:
-    // members
-    NPT_Reference<NPT_TimeInterval> m_DefaultDeviceLease;
-    NPT_Reference<NPT_TimeInterval> m_DefaultSubscribeLease;
-    NPT_Reference<NPT_String>       m_DefaultUserAgent;
-    NPT_UInt32                      m_SearchMulticastTimeToLive;
-    NPT_UInt32                      m_AnnounceMulticastTimeToLive;
-};
-
-#endif /* _PLT_UPNP_CONSTANTS_H_ */

gpac-2.2.1.tar.gz/extra_lib/include/platinum/PltCtrlPoint.h Deleted

@@ -1,255 +0,0 @@
-/*****************************************************************
-|
-|   Platinum - Control Point
-|
-| Copyright (c) 2004-2010, Plutinosoft, LLC.
-| All rights reserved.
-| http://www.plutinosoft.com
-|
-| This program is free software; you can redistribute it and/or
-| modify it under the terms of the GNU General Public License
-| as published by the Free Software Foundation; either version 2
-| of the License, or (at your option) any later version.
-|
-| OEMs, ISVs, VARs and other distributors that combine and 
-| distribute commercially licensed software with Platinum software
-| and do not wish to distribute the source code for the commercially
-| licensed software under version 2, or (at your option) any later
-| version, of the GNU General Public License (the "GPL") must enter
-| into a commercial license agreement with Plutinosoft, LLC.
-| licensing@plutinosoft.com
-|  
-| This program 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 General Public License for more details.
-|
-| You should have received a copy of the GNU General Public License
-| along with this program; see the file LICENSE.txt. If not, write to
-| the Free Software Foundation, Inc., 
-| 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-| http://www.gnu.org/licenses/gpl-2.0.html
-|
-****************************************************************/
-
-/** @file
- UPnP ControlPoint
- */
-
-#ifndef _PLT_CONTROL_POINT_H_
-#define _PLT_CONTROL_POINT_H_
-
-/*----------------------------------------------------------------------
-|   includes
-+---------------------------------------------------------------------*/
-#include "Neptune.h"
-#include "PltService.h"
-#include "PltSsdp.h"
-#include "PltDeviceData.h"
-
-/*----------------------------------------------------------------------
-|   forward declarations
-+---------------------------------------------------------------------*/
-class PLT_HttpServer;
-class PLT_CtrlPointHouseKeepingTask;
-class PLT_SsdpSearchTask;
-class PLT_SsdpListenTask;
-class PLT_CtrlPointGetSCPDsTask;
-class PLT_CtrlPointGetSCPDRequest;
-
-/*----------------------------------------------------------------------
-|   PLT_CtrlPointListener class
-+---------------------------------------------------------------------*/
-/**
- The PLT_CtrlPointListener class is an interface used to receive notifications when
- devices are found or removed from the network, actions responses and events
- are being received.
- */
-class PLT_CtrlPointListener
-{
-public:
-    virtual ~PLT_CtrlPointListener() {}
-
-    virtual NPT_Result OnDeviceAdded(PLT_DeviceDataReference& device) = 0;
-    virtual NPT_Result OnDeviceRemoved(PLT_DeviceDataReference& device) = 0;
-    virtual NPT_Result OnActionResponse(NPT_Result res, PLT_ActionReference& action, void* userdata) = 0;
-    virtual NPT_Result OnEventNotify(PLT_Service* service, NPT_List<PLT_StateVariable*>* vars) = 0;
-};
-
-typedef NPT_List<PLT_CtrlPointListener*> PLT_CtrlPointListenerList;
-
-/*----------------------------------------------------------------------
-|   PLT_CtrlPoint class
-+---------------------------------------------------------------------*/
-/**
- The PLT_CtrlPoint class implements the base functionality of a UPnP ControlPoint.
- It searches and inpects devices, invoke actions on services and subscribes to 
- events. 
- */
-class PLT_CtrlPoint : public PLT_SsdpPacketListener,
-                      public PLT_SsdpSearchResponseListener,
-                      public NPT_HttpRequestHandler
-{
-public:
-    PLT_CtrlPoint(const char* search_criteria = "upnp:rootdevice"); // pass NULL to prevent repeated automatic search
-    virtual ~PLT_CtrlPoint();
-    
-    /**
-     Returns the port used by the internal HTTP server for all incoming event notifications.
-     @return port
-     */
-    virtual NPT_Result GetPort(NPT_UInt16& port);
-    
-    // delegation
-    virtual NPT_Result AddListener(PLT_CtrlPointListener* listener);
-    virtual NPT_Result RemoveListener(PLT_CtrlPointListener* listener);
-
-    // discovery
-    virtual void IgnoreUUID(const char* uuid);
-    virtual NPT_Result Search(const NPT_HttpUrl& url = NPT_HttpUrl("239.255.255.250", 1900, "*"), 
-                              const char*        target = "upnp:rootdevice", 
-                              NPT_Cardinal       mx = 5,
-                              NPT_TimeInterval   frequency = NPT_TimeInterval(50.), // pass NPT_TimeInterval(0.) for one time only
-                              NPT_TimeInterval   initial_delay = NPT_TimeInterval(0.));
-    virtual NPT_Result Discover(const NPT_HttpUrl& url = NPT_HttpUrl("239.255.255.250", 1900, "*"),
-                                const char*        target = "ssdp:all", 
-                                NPT_Cardinal       mx = 5,
-                                NPT_TimeInterval   frequency = NPT_TimeInterval(50.), // pass NPT_TimeInterval(0.) for one time only
-                                NPT_TimeInterval   initial_delay = NPT_TimeInterval(0.));
-    virtual NPT_Result InspectDevice(const NPT_HttpUrl& location,
-                                     const char*        uuid,
-                                     NPT_TimeInterval   leasetime = *PLT_Constants::GetInstance().GetDefaultDeviceLease());
-
-    // actions
-    virtual NPT_Result FindActionDesc(PLT_DeviceDataReference& device, 
-                                  const char*              service_type,
-                                  const char*              action_name,
-                                  PLT_ActionDesc*&         action_desc);
-    virtual NPT_Result CreateAction(PLT_DeviceDataReference& device,
-                                const char*              service_type,
-                                const char*              action_name,
-                                PLT_ActionReference&     action);
-    virtual NPT_Result InvokeAction(PLT_ActionReference& action,
-                                    void*                userdata = NULL);
-
-    // events
-    virtual NPT_Result Subscribe(PLT_Service* service, 
-                                 bool         cancel = false, 
-                                 void*        userdata = NULL);
-
-    // NPT_HttpRequestHandler methods
-    virtual NPT_Result SetupResponse(NPT_HttpRequest&              request,
-                                     const NPT_HttpRequestContext& context,
-                                     NPT_HttpResponse&             response);
-
-    // PLT_SsdpSearchResponseListener methods
-    virtual NPT_Result ProcessSsdpSearchResponse(NPT_Result                    res, 
-                                                 const NPT_HttpRequestContext& context,
-                                                 NPT_HttpResponse*             response);
-    // PLT_SsdpPacketListener method
-    virtual NPT_Result OnSsdpPacket(const NPT_HttpRequest&        request, 
-                                    const NPT_HttpRequestContext& context);
-
-protected:
-
-    // State Variable Handling
-    virtual NPT_Result DecomposeLastChangeVar(NPT_List<PLT_StateVariable*>& vars);
-
-    // methods
-    virtual NPT_Result Start(PLT_SsdpListenTask* task);
-    virtual NPT_Result Stop(PLT_SsdpListenTask* task);
-
-    // SSDP & HTTP Notifications handling
-    virtual NPT_Result ProcessSsdpNotify(const NPT_HttpRequest&        request,
-                                         const NPT_HttpRequestContext& context);
-    virtual NPT_Result ProcessSsdpMessage(const NPT_HttpMessage&        message,
-                                          const NPT_HttpRequestContext& context,  
-                                          NPT_String&                   uuid);
-    virtual NPT_Result ProcessGetDescriptionResponse(NPT_Result                    res,
-                                                     const NPT_HttpRequest&        request, 
-                                                     const NPT_HttpRequestContext& context,
-                                                     NPT_HttpResponse*             response,
-                                                     NPT_TimeInterval              leasetime,
-                                                     NPT_String                    uuid);
-    virtual NPT_Result ProcessGetSCPDResponse(NPT_Result                    res,
-                                              const NPT_HttpRequest&        request,
-                                              const NPT_HttpRequestContext& context,
-                                              NPT_HttpResponse*             response,
-                                              PLT_DeviceDataReference&      device);
-    virtual NPT_Result ProcessActionResponse(NPT_Result                    res,
-                                             const NPT_HttpRequest&        request,
-                                             const NPT_HttpRequestContext& context,
-                                             NPT_HttpResponse*             response,
-                                             PLT_ActionReference&          action,
-                                             void*                         userdata);
-    virtual NPT_Result ProcessSubscribeResponse(NPT_Result                    res,
-                                                const NPT_HttpRequest&        request, 
-                                                const NPT_HttpRequestContext& context, 
-                                                NPT_HttpResponse*             response,
-                                                PLT_Service*                  service,
-                                                void*                         userdata);
-    virtual NPT_Result ProcessHttpNotify(const NPT_HttpRequest&        request,
-                                         const NPT_HttpRequestContext& context,
-                                         NPT_HttpResponse&             response);
-
-    // Device management
-    virtual NPT_Result AddDevice(PLT_DeviceDataReference& data);
-    virtual NPT_Result RemoveDevice(PLT_DeviceDataReference& data);
-    
-private:
-    // methods
-    NPT_Result      RenewSubscribers();
-    PLT_ThreadTask* RenewSubscriber(PLT_EventSubscriberReference subscriber);
-    
-    NPT_Result AddPendingEventNotification(PLT_EventNotification *notification);
-    NPT_Result ProcessPendingEventNotifications();
-    NPT_Result ProcessEventNotification(PLT_EventSubscriberReference subscriber,
-                                        PLT_EventNotification*       notification,
-                                        NPT_List<PLT_StateVariable*> &vars);
-    
-    NPT_Result DoHouseKeeping();
-    NPT_Result FetchDeviceSCPDs(PLT_CtrlPointGetSCPDsTask* task,
-                                PLT_DeviceDataReference&   device, 
-                                NPT_Cardinal               level);
-
-    // Device management
-    NPT_Result FindDevice(const char* uuid, PLT_DeviceDataReference& device, bool return_root = false);
-    NPT_Result NotifyDeviceReady(PLT_DeviceDataReference& data);
-    NPT_Result NotifyDeviceRemoved(PLT_DeviceDataReference& data);
-    NPT_Result CleanupDevice(PLT_DeviceDataReference& data);
-    
-    NPT_Result ParseFault(PLT_ActionReference& action, NPT_XmlElementNode* fault);
-    PLT_SsdpSearchTask* CreateSearchTask(const NPT_HttpUrl&   url, 
-                                         const char*          target, 
-                                         NPT_Cardinal         mx, 
-                                         NPT_TimeInterval     frequency,
-                                         const NPT_IpAddress& address);
-    
-private:
-    friend class NPT_Reference<PLT_CtrlPoint>;
-    friend class PLT_UPnP;
-    friend class PLT_UPnP_CtrlPointStartIterator;
-    friend class PLT_UPnP_CtrlPointStopIterator;
-    friend class PLT_EventSubscriberRemoverIterator;
-    friend class PLT_CtrlPointGetDescriptionTask;
-    friend class PLT_CtrlPointGetSCPDsTask;
-    friend class PLT_CtrlPointInvokeActionTask;
-    friend class PLT_CtrlPointHouseKeepingTask;
-    friend class PLT_CtrlPointSubscribeEventTask;
-
-    NPT_List<NPT_String>                         m_UUIDsToIgnore;
-    PLT_CtrlPointListenerList                    m_ListenerList;
-    PLT_HttpServer*                              m_EventHttpServer;
-    PLT_TaskManager                              m_TaskManager;
-    NPT_Mutex                                    m_Lock;
-    NPT_List<PLT_DeviceDataReference>            m_RootDevices;
-    NPT_List<PLT_EventSubscriberReference>       m_Subscribers;
-    NPT_String                                   m_SearchCriteria;
-    bool                                         m_Aborted;
-    NPT_List<PLT_EventNotification *>            m_PendingNotifications;
-    NPT_List<NPT_String>                         m_PendingInspections;
-};
-
-typedef NPT_Reference<PLT_CtrlPoint> PLT_CtrlPointReference;
-
-#endif /* _PLT_CONTROL_POINT_H_ */

gpac-2.2.1.tar.gz/extra_lib/include/platinum/PltCtrlPointTask.h Deleted

@@ -1,225 +0,0 @@
-/*****************************************************************
-|
-|   Platinum - Control Point Tasks
-|
-| Copyright (c) 2004-2010, Plutinosoft, LLC.
-| All rights reserved.
-| http://www.plutinosoft.com
-|
-| This program is free software; you can redistribute it and/or
-| modify it under the terms of the GNU General Public License
-| as published by the Free Software Foundation; either version 2
-| of the License, or (at your option) any later version.
-|
-| OEMs, ISVs, VARs and other distributors that combine and 
-| distribute commercially licensed software with Platinum software
-| and do not wish to distribute the source code for the commercially
-| licensed software under version 2, or (at your option) any later
-| version, of the GNU General Public License (the "GPL") must enter
-| into a commercial license agreement with Plutinosoft, LLC.
-| licensing@plutinosoft.com
-|  
-| This program 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 General Public License for more details.
-|
-| You should have received a copy of the GNU General Public License
-| along with this program; see the file LICENSE.txt. If not, write to
-| the Free Software Foundation, Inc., 
-| 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-| http://www.gnu.org/licenses/gpl-2.0.html
-|
-****************************************************************/
-
-/** @file
- UPnP ControlPoint Tasks
- */
-
-#ifndef _PLT_CONTROL_POINT_TASK_H_
-#define _PLT_CONTROL_POINT_TASK_H_
-
-/*----------------------------------------------------------------------
-|   includes
-+---------------------------------------------------------------------*/
-#include "Neptune.h"
-#include "PltHttpClientTask.h"
-#include "PltDatagramStream.h"
-#include "PltDeviceData.h"
-#include "PltCtrlPoint.h"
-
-/*----------------------------------------------------------------------
-|   forward declarations
-+---------------------------------------------------------------------*/
-class PLT_Action;
-
-/*----------------------------------------------------------------------
-|   PLT_CtrlPointGetDescriptionTask class
-+---------------------------------------------------------------------*/
-/**
- The PLT_CtrlPointGetDescriptionTask class fetches the description xml document
- from a UPnP device
- */
-class PLT_CtrlPointGetDescriptionTask : public PLT_HttpClientSocketTask
-{
-public:
-    PLT_CtrlPointGetDescriptionTask(const NPT_HttpUrl& url,
-                                    PLT_CtrlPoint*     ctrl_point,
-                                    NPT_TimeInterval   leasetime,
-                                    NPT_String         uuid);
-    virtual ~PLT_CtrlPointGetDescriptionTask();
-
-protected:
-    // PLT_HttpClientSocketTask methods
-    NPT_Result ProcessResponse(NPT_Result                    res, 
-                               const NPT_HttpRequest&        request, 
-                               const NPT_HttpRequestContext& context, 
-                               NPT_HttpResponse*             response);
-
-protected:
-    PLT_CtrlPoint*   m_CtrlPoint;
-    NPT_TimeInterval m_LeaseTime;
-    NPT_String       m_UUID;
-};
-
-/*----------------------------------------------------------------------
-|   PLT_CtrlPointGetSCPDRequest class
-+---------------------------------------------------------------------*/
-/**
- The PLT_CtrlPointGetSCPDRequest class is used by a PLT_CtrlPointGetSCPDsTask task
- to fetch a specific SCPD xml document for a given service of a given device.
- */
-class PLT_CtrlPointGetSCPDRequest : public NPT_HttpRequest
-{
-public:
-    PLT_CtrlPointGetSCPDRequest(PLT_DeviceDataReference& device,
-                                const char*              url,
-                                const char*              method = "GET",
-                                const char*              protocol = NPT_HTTP_PROTOCOL_1_1) : // 1.1 for pipelining
-        NPT_HttpRequest(url, method, protocol), m_Device(device) {}
-    virtual ~PLT_CtrlPointGetSCPDRequest() {}
-
-    // members
-    PLT_DeviceDataReference m_Device;
-};
-
-/*----------------------------------------------------------------------
-|   PLT_CtrlPointGetSCPDsTask class
-+---------------------------------------------------------------------*/
-/**
- The PLT_CtrlPointGetSCPDsTask class fetches the SCPD xml document of one or more
- services for a given device. 
- */
-class PLT_CtrlPointGetSCPDsTask : public PLT_HttpClientSocketTask
-{
-public:
-    PLT_CtrlPointGetSCPDsTask(PLT_CtrlPoint* ctrl_point, PLT_DeviceDataReference& root_device);
-    virtual ~PLT_CtrlPointGetSCPDsTask() {}
-
-    NPT_Result AddSCPDRequest(PLT_CtrlPointGetSCPDRequest* request) {
-        return PLT_HttpClientSocketTask::AddRequest((NPT_HttpRequest*)request);
-    }
-
-    // override to prevent calling this directly
-    NPT_Result AddRequest(NPT_HttpRequest*) {
-        // only queuing PLT_CtrlPointGetSCPDRequest allowed
-        return NPT_ERROR_NOT_SUPPORTED;
-    }
-
-protected:
-    // PLT_HttpClientSocketTask methods
-    NPT_Result ProcessResponse(NPT_Result                    res, 
-                               const NPT_HttpRequest&        request, 
-                               const NPT_HttpRequestContext& context, 
-                               NPT_HttpResponse*             response);   
-
-protected:
-    PLT_CtrlPoint*          m_CtrlPoint;
-    PLT_DeviceDataReference m_RootDevice;
-};
-
-/*----------------------------------------------------------------------
-|   PLT_CtrlPointInvokeActionTask class
-+---------------------------------------------------------------------*/
-/**
- The PLT_CtrlPointInvokeActionTask class is used by a PLT_CtrlPoint to invoke
- a specific action of a given service for a given device.
- */
-class PLT_CtrlPointInvokeActionTask : public PLT_HttpClientSocketTask
-{
-public:
-    PLT_CtrlPointInvokeActionTask(NPT_HttpRequest*     request,
-                                  PLT_CtrlPoint*       ctrl_point, 
-                                  PLT_ActionReference& action,
-                                  void*                userdata);
-    virtual ~PLT_CtrlPointInvokeActionTask();
-
-protected:
-    // PLT_HttpClientSocketTask methods
-    NPT_Result ProcessResponse(NPT_Result                    res, 
-                               const NPT_HttpRequest&        request, 
-                               const NPT_HttpRequestContext& context, 
-                               NPT_HttpResponse*             response);   
-
-protected:
-    PLT_CtrlPoint*      m_CtrlPoint;
-    PLT_ActionReference m_Action;
-    void*               m_Userdata;
-};
-
-/*----------------------------------------------------------------------
-|   PLT_CtrlPointHouseKeepingTask class
-+---------------------------------------------------------------------*/
-/**
- The PLT_CtrlPointHouseKeepingTask class is used by a PLT_CtrlPoint to keep 
- track of expired devices and autmatically renew event subscribers. 
- */
-class PLT_CtrlPointHouseKeepingTask : public PLT_ThreadTask
-{
-public:
-    PLT_CtrlPointHouseKeepingTask(PLT_CtrlPoint*   ctrl_point, 
-                                  NPT_TimeInterval timer = NPT_TimeInterval(5.));
-
-protected:
-    ~PLT_CtrlPointHouseKeepingTask() {}
-
-    // PLT_ThreadTask methods
-    virtual void DoRun();
-
-protected:
-    PLT_CtrlPoint*   m_CtrlPoint;
-    NPT_TimeInterval m_Timer;
-};
-
-/*----------------------------------------------------------------------
-|   PLT_CtrlPointSubscribeEventTask class
-+---------------------------------------------------------------------*/
-/**
- The PLT_CtrlPointSubscribeEventTask class is used to subscribe, renew or cancel
- a subscription for a given service of a given device.
- */
-class PLT_CtrlPointSubscribeEventTask : public PLT_HttpClientSocketTask
-{
-public:
-    PLT_CtrlPointSubscribeEventTask(NPT_HttpRequest*         request,
-                                    PLT_CtrlPoint*           ctrl_point, 
-									PLT_DeviceDataReference& device,
-                                    PLT_Service*             service,
-                                    void*                    userdata = NULL);
-    virtual ~PLT_CtrlPointSubscribeEventTask();
-    
-protected:
-    // PLT_HttpClientSocketTask methods
-    NPT_Result ProcessResponse(NPT_Result                    res, 
-                               const NPT_HttpRequest&        request, 
-                               const NPT_HttpRequestContext& context, 
-                               NPT_HttpResponse*             response);
-
-protected:
-    PLT_CtrlPoint*          m_CtrlPoint;
-    PLT_Service*            m_Service;
-	PLT_DeviceDataReference m_Device; // force to keep a reference to device owning m_Service
-    void*                   m_Userdata;
-};
-
-#endif /* _PLT_CONTROL_POINT_TASK_H_ */

gpac-2.2.1.tar.gz/extra_lib/include/platinum/PltDatagramStream.h Deleted

@@ -1,117 +0,0 @@
-/*****************************************************************
-|
-|   Platinum - Datagram Stream
-|
-| Copyright (c) 2004-2010, Plutinosoft, LLC.
-| All rights reserved.
-| http://www.plutinosoft.com
-|
-| This program is free software; you can redistribute it and/or
-| modify it under the terms of the GNU General Public License
-| as published by the Free Software Foundation; either version 2
-| of the License, or (at your option) any later version.
-|
-| OEMs, ISVs, VARs and other distributors that combine and 
-| distribute commercially licensed software with Platinum software
-| and do not wish to distribute the source code for the commercially
-| licensed software under version 2, or (at your option) any later
-| version, of the GNU General Public License (the "GPL") must enter
-| into a commercial license agreement with Plutinosoft, LLC.
-| licensing@plutinosoft.com
-|  
-| This program 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 General Public License for more details.
-|
-| You should have received a copy of the GNU General Public License
-| along with this program; see the file LICENSE.txt. If not, write to
-| the Free Software Foundation, Inc., 
-| 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-| http://www.gnu.org/licenses/gpl-2.0.html
-|
-****************************************************************/
-
-/** @file
- Datagram Input/Output Neptune streams
- */
-
-#ifndef _PLT_DATAGRAM_H_
-#define _PLT_DATAGRAM_H_
-
-/*----------------------------------------------------------------------
-|   includes
-+---------------------------------------------------------------------*/
-#include "Neptune.h"
-
-/*----------------------------------------------------------------------
-|   PLT_InputDatagramStream
-+---------------------------------------------------------------------*/
-/**
- The PLT_InputDatagramStream class is a simple buffered input stream 
- used when reading SSDP packets on a UDP socket. It allows to use Neptune
- HTTP parsing as if reading on a TCP socket.
- */
-class PLT_InputDatagramStream : public NPT_InputStream
-{
-public:
-    // methods
-    PLT_InputDatagramStream(NPT_UdpSocket* socket,
-                            NPT_Size       buffer_size = 2000);
-    virtual ~PLT_InputDatagramStream();
-    
-    NPT_Result GetInfo(NPT_SocketInfo& info);
-
-    // NPT_InputStream methods
-    NPT_Result Read(void*     buffer, 
-                    NPT_Size  bytes_to_read, 
-                    NPT_Size* bytes_read = 0);
-
-    NPT_Result Seek(NPT_Position offset) { NPT_COMPILER_UNUSED(offset); return NPT_FAILURE; }
-    NPT_Result Skip(NPT_Size offset) { NPT_COMPILER_UNUSED(offset); return NPT_FAILURE; }
-    NPT_Result Tell(NPT_Position& offset){ NPT_COMPILER_UNUSED(offset); return NPT_FAILURE; }
-    NPT_Result GetSize(NPT_LargeSize& size)   { NPT_COMPILER_UNUSED(size); return NPT_FAILURE; }
-    NPT_Result GetAvailable(NPT_LargeSize& available) { NPT_COMPILER_UNUSED(available); return NPT_FAILURE; }
-        
-protected:
-    NPT_UdpSocket*      m_Socket;
-    NPT_SocketInfo      m_Info;
-    NPT_DataBuffer      m_Buffer;
-    NPT_Position        m_BufferOffset;
-};
-
-typedef NPT_Reference<PLT_InputDatagramStream> PLT_InputDatagramStreamReference;
-
-/*----------------------------------------------------------------------
-|   PLT_OutputDatagramStream
-+---------------------------------------------------------------------*/
-/**
- The PLT_OutputDatagramStream class is a simple buffered output stream 
- used when writing SSDP packets on a UDP socket. It allows to use Neptune
- HTTP client as if writing on a TCP socket.
- */
-class PLT_OutputDatagramStream : public NPT_OutputStream
-{
-public:
-    // methods
-    PLT_OutputDatagramStream(NPT_UdpSocket*           socket, 
-                             NPT_Size                 size = 4096,
-                             const NPT_SocketAddress* address = NULL);
-    virtual ~PLT_OutputDatagramStream();
-
-    // NPT_OutputStream methods
-    NPT_Result Write(const void* buffer, NPT_Size bytes_to_write, NPT_Size* bytes_written = NULL);
-    NPT_Result Flush();
-
-    NPT_Result Seek(NPT_Position offset)  { NPT_COMPILER_UNUSED(offset); return NPT_FAILURE; }
-    NPT_Result Tell(NPT_Position& offset) { NPT_COMPILER_UNUSED(offset); return NPT_FAILURE; }
-
-protected:
-    NPT_UdpSocket*     m_Socket;
-    NPT_DataBuffer     m_Buffer;
-    NPT_SocketAddress* m_Address;
-};
-
-typedef NPT_Reference<PLT_OutputDatagramStream> PLT_OutputDatagramStreamReference;
-
-#endif /* _PLT_DATAGRAM_H_ */

gpac-2.2.1.tar.gz/extra_lib/include/platinum/PltDeviceData.h Deleted

@@ -1,248 +0,0 @@
-/*****************************************************************
-|
-|   Platinum - Device Data
-|
-| Copyright (c) 2004-2010, Plutinosoft, LLC.
-| All rights reserved.
-| http://www.plutinosoft.com
-|
-| This program is free software; you can redistribute it and/or
-| modify it under the terms of the GNU General Public License
-| as published by the Free Software Foundation; either version 2
-| of the License, or (at your option) any later version.
-|
-| OEMs, ISVs, VARs and other distributors that combine and 
-| distribute commercially licensed software with Platinum software
-| and do not wish to distribute the source code for the commercially
-| licensed software under version 2, or (at your option) any later
-| version, of the GNU General Public License (the "GPL") must enter
-| into a commercial license agreement with Plutinosoft, LLC.
-| licensing@plutinosoft.com
-|  
-| This program 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 General Public License for more details.
-|
-| You should have received a copy of the GNU General Public License
-| along with this program; see the file LICENSE.txt. If not, write to
-| the Free Software Foundation, Inc., 
-| 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-| http://www.gnu.org/licenses/gpl-2.0.html
-|
-****************************************************************/
-
-/** @file
- UPnP Device information
- */
-
-#ifndef _PLT_DEVICE_DATA_H_
-#define _PLT_DEVICE_DATA_H_
-
-/*----------------------------------------------------------------------
-|   includes
-+---------------------------------------------------------------------*/
-#include "Neptune.h"
-#include "PltConstants.h"
-
-/*----------------------------------------------------------------------
-|   forward declarations
-+---------------------------------------------------------------------*/
-class PLT_Service;
-class PLT_DeviceData;
-
-typedef NPT_Reference<PLT_DeviceData> PLT_DeviceDataReference;
-typedef NPT_List<PLT_DeviceDataReference> PLT_DeviceDataReferenceList;
-
-/*----------------------------------------------------------------------
-|   PLT_DeviceIcon class
-+---------------------------------------------------------------------*/
-/** 
- The PLT_DeviceIcon class represents a given instance of a UPnP device icon.
- */
-class PLT_DeviceIcon
-{
-public:
-    PLT_DeviceIcon(const char* mimetype = "", 
-                   NPT_Int32   width = 0, 
-                   NPT_Int32   height = 0,
-                   NPT_Int32   depth = 0,
-                   const char* urlpath = "") :
-        m_MimeType(mimetype),
-        m_Width(width),
-        m_Height(height),
-        m_Depth(depth),
-        m_UrlPath(urlpath) {}
-    virtual ~PLT_DeviceIcon() {}
-   
-    NPT_String  m_MimeType;
-    NPT_Int32   m_Width;
-    NPT_Int32   m_Height;
-    NPT_Int32   m_Depth;
-    NPT_String  m_UrlPath;
-};
-
-/*----------------------------------------------------------------------
-|   PLT_DeviceData class
-+---------------------------------------------------------------------*/
-/**
- The PLT_DeviceData class holds information about a device being advertised or
- found by a control point. It maintains a list of services and 
- embedded devices if any.
- */
-class PLT_DeviceData
-{
-public:
-    PLT_DeviceData(
-        NPT_HttpUrl      description_url = NPT_HttpUrl(NULL, 0, "/description.xml"), 
-        const char*      uuid = "",
-        NPT_TimeInterval lease_time = *PLT_Constants::GetInstance().GetDefaultDeviceLease(),
-        const char*      device_type = "",
-        const char*      friendly_name = "");
-
-    /* methods */
-    virtual NPT_Result  GetDescription(NPT_String& desc);
-    virtual NPT_String  GetDescriptionUrl(const char* ip_address = NULL);
-    virtual NPT_HttpUrl GetURLBase();
-    virtual NPT_HttpUrl NormalizeURL(const NPT_String& url);
-    virtual NPT_Result  GetDescription(NPT_XmlElementNode* parent, NPT_XmlElementNode** device = NULL);
-    virtual NPT_String  GetIconUrl(const char* mimetype = NULL, NPT_Int32 maxsize = 0, NPT_Int32 maxdepth = 0);
-
-    const NPT_TimeInterval& GetLeaseTime()    const { return m_LeaseTime;        }
-    const NPT_String&   GetUUID()             const { return m_UUID;             }
-    const NPT_String&   GetFriendlyName()     const { return m_FriendlyName;     }
-    const NPT_String&   GetType()             const { return m_DeviceType;       }
-    const NPT_String&   GetModelDescription() const { return m_ModelDescription; }
-    const NPT_String&   GetParentUUID()       const { return m_ParentUUID;       }
-    bool                IsRoot()              { return m_ParentUUID.IsEmpty();   }
-    const NPT_IpAddress& GetLocalIP()          const { return m_LocalIfaceIp;     }
-
-    const NPT_Array<PLT_Service*>&            GetServices()        const { return m_Services; }
-    const NPT_Array<PLT_DeviceDataReference>& GetEmbeddedDevices() const { return m_EmbeddedDevices; }
-
-    NPT_Result FindEmbeddedDevice(const char* uuid, PLT_DeviceDataReference& device);
-    NPT_Result FindEmbeddedDeviceByType(const char* type, PLT_DeviceDataReference& device);
-    NPT_Result FindServiceById(const char* id, PLT_Service*& service);
-    NPT_Result FindServiceByType(const char* type, PLT_Service*& service);
-	NPT_Result FindServiceByName(const char* name, PLT_Service*& service);
-    NPT_Result FindServiceBySCPDURL(const char* url, PLT_Service*& service, bool recursive = false);
-    NPT_Result FindServiceByControlURL(const char* url, PLT_Service*& service, bool recursive = false);
-    NPT_Result FindServiceByEventSubURL(const char* url, PLT_Service*& service, bool recursive = false);
-
-    /* called by PLT_Device subclasses */
-    NPT_Result AddEmbeddedDevice(PLT_DeviceDataReference& device);
-    NPT_Result RemoveEmbeddedDevice(PLT_DeviceDataReference& device);
-    NPT_Result AddService(PLT_Service* service);
-	NPT_Result RemoveService(PLT_Service* service);
-
-    operator const char* ();
-
-protected:
-    virtual ~PLT_DeviceData();
-    virtual void       Cleanup();
-    virtual NPT_Result OnAddExtraInfo(NPT_XmlElementNode* /*device_node*/) { return NPT_SUCCESS; }
-    NPT_Result         SetLeaseTime(NPT_TimeInterval lease_time, NPT_TimeStamp lease_time_last_update = 0.);
-
-private:
-    /* called by PLT_CtrlPoint when an existing device location is updated */
-    NPT_Result    SetDescriptionUrl(NPT_HttpUrl& url);
-
-    NPT_Result    SetURLBase(NPT_HttpUrl& url_base);
-    NPT_TimeStamp GetLeaseTimeLastUpdate();
-    
-    /* class methods */
-    static NPT_Result SetDescription(PLT_DeviceDataReference&      root_device,
-                                     NPT_TimeInterval              leasetime,
-                                     NPT_HttpUrl                   description_url,
-                                     const char*                   description, 
-                                     const NPT_HttpRequestContext& context);
-    static NPT_Result SetDescriptionDevice(PLT_DeviceDataReference&      device,
-                                           NPT_XmlElementNode*           device_node, 
-                                           const NPT_HttpRequestContext& context);
-
-public:
-    NPT_String m_Manufacturer;
-    NPT_String m_ManufacturerURL;
-    NPT_String m_ModelDescription;
-    NPT_String m_ModelName;
-    NPT_String m_ModelNumber;
-    NPT_String m_ModelURL;
-    NPT_String m_SerialNumber;
-    NPT_String m_UPC;
-    NPT_String m_PresentationURL;
-    NPT_String m_DlnaDoc;
-    NPT_String m_DlnaCap;
-    NPT_String m_AggregationFlags;
-
-protected:
-    friend class NPT_Reference<PLT_DeviceData>;
-    friend class PLT_CtrlPoint;
-    friend class PLT_DeviceReadyIterator;
-    friend class PLT_DeviceHost;
-
-    //members
-    NPT_String                         m_ParentUUID;
-    NPT_String                         m_UUID;
-    NPT_HttpUrl                        m_URLDescription;
-    NPT_HttpUrl                        m_URLBase;
-    NPT_String                         m_DeviceType;
-    NPT_String                         m_FriendlyName;
-    NPT_TimeInterval                   m_LeaseTime;
-    NPT_TimeStamp                      m_LeaseTimeLastUpdate;
-    NPT_Array<PLT_Service*>            m_Services;
-    NPT_Array<PLT_DeviceDataReference> m_EmbeddedDevices;
-    NPT_Array<PLT_DeviceIcon>          m_Icons;
-
-    /* IP address of interface used when retrieving device description.
-       We need the info for the control point subscription callback */
-    NPT_IpAddress                      m_LocalIfaceIp; 
-    NPT_String                         m_Representation;
-};
-
-/*----------------------------------------------------------------------
-|   PLT_DeviceDataFinder
-+---------------------------------------------------------------------*/
-/**
- The PLT_DeviceDataFinder class returns a PLT_DeviceData instance given
- a device UUID.
- */
-class PLT_DeviceDataFinder
-{
-public:
-    // methods
-    PLT_DeviceDataFinder(const char* uuid) : m_UUID(uuid) {}
-    virtual ~PLT_DeviceDataFinder() {}
-
-    bool operator()(const PLT_DeviceDataReference& data) const {
-        return data->GetUUID().Compare(m_UUID, true) ? false : true;
-    }
-
-private:
-    // members
-    NPT_String m_UUID;
-};
-
-/*----------------------------------------------------------------------
-|   PLT_DeviceDataFinderByType
-+---------------------------------------------------------------------*/
-/**
- The PLT_DeviceDataFinderByType class returns a PLT_DeviceData instance 
- given a device type.
- */
-class PLT_DeviceDataFinderByType
-{
-public:
-    // methods
-    PLT_DeviceDataFinderByType(const char* type) : m_Type(type) {}
-    virtual ~PLT_DeviceDataFinderByType() {}
-
-    bool operator()(const PLT_DeviceDataReference& data) const {
-        return data->GetType().Compare(m_Type, true) ? false : true;
-    }
-
-private:
-    // members
-    NPT_String m_Type;
-};
-
-#endif /* _PLT_DEVICE_DATA_H_ */

gpac-2.2.1.tar.gz/extra_lib/include/platinum/PltDeviceHost.h Deleted

@@ -1,341 +0,0 @@
-/*****************************************************************
-|
-|   Platinum - Device Host
-|
-| Copyright (c) 2004-2010, Plutinosoft, LLC.
-| All rights reserved.
-| http://www.plutinosoft.com
-|
-| This program is free software; you can redistribute it and/or
-| modify it under the terms of the GNU General Public License
-| as published by the Free Software Foundation; either version 2
-| of the License, or (at your option) any later version.
-|
-| OEMs, ISVs, VARs and other distributors that combine and 
-| distribute commercially licensed software with Platinum software
-| and do not wish to distribute the source code for the commercially
-| licensed software under version 2, or (at your option) any later
-| version, of the GNU General Public License (the "GPL") must enter
-| into a commercial license agreement with Plutinosoft, LLC.
-| licensing@plutinosoft.com
-|  
-| This program 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 General Public License for more details.
-|
-| You should have received a copy of the GNU General Public License
-| along with this program; see the file LICENSE.txt. If not, write to
-| the Free Software Foundation, Inc., 
-| 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-| http://www.gnu.org/licenses/gpl-2.0.html
-|
-****************************************************************/
-
-/** @file
- UPnP Device
- */
-
-#ifndef _PLT_DEVICE_HOST_H_
-#define _PLT_DEVICE_HOST_H_
-
-/*----------------------------------------------------------------------
-|   includes
-+---------------------------------------------------------------------*/
-#include "Neptune.h"
-#include "PltDeviceData.h"
-#include "PltSsdp.h"
-#include "PltTaskManager.h"
-#include "PltAction.h"
-#include "PltHttp.h"
-
-/*----------------------------------------------------------------------
-|   forward declarations
-+---------------------------------------------------------------------*/
-class PLT_HttpServer;
-class PLT_HttpServerHandler;
-class PLT_SsdpDeviceAnnounceTask;
-class PLT_SsdpListenTask;
-
-/*----------------------------------------------------------------------
-|   PLT_DeviceHost class
-+---------------------------------------------------------------------*/
-/**
- UPnP Device Host.
- The PLT_DeviceHost class is a base class for implementing a UPnP Device. It handles 
- network announcements and responses to searches from ControlPoints. ControlPoint
- action invocations are also received and delegated to derived classes. A 
- PLT_DeviceHost also takes care of eventing when services state variables change.
- */
-class PLT_DeviceHost : public PLT_DeviceData,
-                       public PLT_SsdpPacketListener,
-                       public NPT_HttpRequestHandler
-{
-public:
-    /**
-     Creates a new instance of UPnP Device Host.
-     @param description_path Relative path for description url
-     @param uuid UPnP device unique id
-     @param device_type UPnP device type
-     @param friendly_name Name advertised for UPnP device
-     @param show_ip Flag to indicate if device IP should be appended to friendly name
-     @param port local port for the device host internal HTTP server, 0 for randomly
-     selected.
-     @param port_rebind Flag to indicate if device host should automatically try to look 
-     for another port if failing to choose the one passed.
-     */
-    PLT_DeviceHost(const char*  description_path = "/",
-                   const char*  uuid = "",
-                   const char*  device_type = "",
-                   const char*  friendly_name = "",
-                   bool         show_ip = false,
-                   NPT_UInt16   port = 0,
-                   bool         port_rebind = false);
-    virtual ~PLT_DeviceHost();
-    
-    virtual void SetBroadcast(bool broadcast) { m_Broadcast = broadcast; }
-     
-    /**
-     When a UPnP device comes up, the specifications require that a SSDP bye-bye
-     sequence is sent to force the removal of the device in case it wasn't sent
-     properly during the last shutdown.
-     @param bye_bye_first Boolean to indicate that SSDP bye-bye sequence should 
-     be sent first or not.
-     */
-    virtual void SetByeByeFirst(bool bye_bye_first) { m_ByeByeFirst = bye_bye_first; }
-    
-    /**
-     Returns the port used by the internal HTTP server for all incoming requests.
-     @return port
-     */
-    virtual NPT_UInt16 GetPort() { return m_Port; };
-    
-    /**
-     Sets the lease time.
-     @param lease_time Lease Time
-     */
-    NPT_Result SetLeaseTime(NPT_TimeInterval lease_time) { return PLT_DeviceData::SetLeaseTime(lease_time); }
-
-protected:
-    /**
-     NPT_HttpRequestHandler method for setting up the response of an incoming
-     HTTP request.
-     @param request the request received
-     @param context the context of the request
-     @param response the response to set up
-     */
-    virtual NPT_Result SetupResponse(NPT_HttpRequest&              request,
-                                     const NPT_HttpRequestContext& context,
-                                     NPT_HttpResponse&             response);
-
-    /**
-     Static method similar to Announce.
-     @param device the device to announce
-     @param request the SSDP pre formatted request
-     @param socket the network socket to use to send the request
-     @param byebye boolean indicating if the announce is a SSDP bye-bye or alive.
-     */
-    static NPT_Result Announce(PLT_DeviceData*  device, 
-                                NPT_HttpRequest& request, 
-                                NPT_UdpSocket&   socket, 
-                                bool             byebye);
-    /**
-     Called during SSDP announce. The HTTP request is already configured with
-     the right method and host.
-     @param request the SSDP pre formatted request
-     @param socket the network socket to use to send the request
-     @param byebye boolean indicating if the announce is a SSDP bye-bye or alive.
-     */
-    NPT_Result Announce(NPT_HttpRequest& request, 
-                        NPT_UdpSocket&   socket, 
-                        bool             byebye) {
-        return Announce(this, request, socket, byebye);
-    }
-
-    /**
-     PLT_SsdpPacketListener method called when a M-SEARCH SSDP packet is received.
-     @param request SSDP packet
-     @param context the context of the request
-     */
-    virtual NPT_Result OnSsdpPacket(const NPT_HttpRequest&        request, 
-                                    const NPT_HttpRequestContext& context);
-
-    /**
-     Static method similar to SendSsdpSearchResponse.
-     @param device the device to announce
-     @param response the SSDP pre formatted response
-     @param socket the network socket to use to send the request
-     @param st the original request search target
-     @param addr the remote address to send the response back to in case the socket
-     is not already connected.
-     */
-    static NPT_Result SendSsdpSearchResponse(PLT_DeviceData*          device, 
-                                             NPT_HttpResponse&        response, 
-                                             NPT_UdpSocket&           socket, 
-                                             const char*              st,
-                                             const NPT_SocketAddress* addr  = NULL);
-    /**
-     Called by PLT_SsdpDeviceSearchResponseTask when responding to a M-SEARCH
-     SSDP request.
-     @param response the SSDP pre formatted response
-     @param socket the network socket to use to send the request
-     @param st the original request search target
-     @param addr the remote address to send the response back to in case the socket
-     is not already connected.
-     */
-    virtual NPT_Result SendSsdpSearchResponse(NPT_HttpResponse&        response, 
-                                              NPT_UdpSocket&           socket, 
-                                              const char*              st,
-                                              const NPT_SocketAddress* addr = NULL) {
-        return SendSsdpSearchResponse(this, response, socket, st, addr);
-    }
-    
-public:
-    /**
-     Add UPnP icon information to serve from file system.
-     @param icon the icon information including url path
-     @param fileroot the file system root path 
-     @param urlroot the url root path of the icon url to match to fileroot
-     Note: As an exemple, if the icon url path is "/images/icon1.jpg", the fileroot
-     is "/Users/joe/www" and the urlroot is "/", when a request is made for
-     "/images/icon1.jpg", the file is expected to be found at 
-     "/Users/joe/www/images/icon1.jpg". If the urlroot were "/images", the file 
-     would be expected to be found at "/Users/joe/www/icon1.jpg".
-     */
-    virtual NPT_Result AddIcon(const PLT_DeviceIcon& icon, 
-                               const char*           fileroot,
-                               const char*           urlroot = "/");
-    
-    /**
-     Add UPnP icon information to serve using static image.
-     @param icon the icon information including url path
-     @param data the image data
-     @param size the image data size
-     @param copy boolean to indicate the data should be copied internally
-     */
-    virtual NPT_Result AddIcon(const PLT_DeviceIcon& icon, 
-                               const void*           data, 
-                               NPT_Size              size, 
-                               bool                  copy = true);
-
-protected:
-    /**
-     Required method for setting up UPnP services of device host 
-     (and any embedded). Called when device starts.
-     */
-    virtual NPT_Result SetupServices() = 0;
-    
-    /**
-     Default implementation for registering device icon resources. Override to 
-     use different ones. Called when device starts.
-     */
-    virtual NPT_Result SetupIcons();
-    
-    /** 
-     Default implementation for setting up device host. This calls SetupServices
-     and SetupIcons when device starts.
-     */
-    virtual NPT_Result SetupDevice();
-    
-    /**
-     Called by PLT_TaskManager when the device is started.
-     @param task the SSDP listening task to attach to for receiving 
-     SSDP M-SEARCH messages.
-     */
-    virtual NPT_Result Start(PLT_SsdpListenTask* task);
-    
-    /**
-     Called by PLT_TaskManager when the device is stoped.
-     @param task the SSDP listening task to detach from to stop receiving 
-     SSDP M-SEARCH messages.
-     */
-    virtual NPT_Result Stop(PLT_SsdpListenTask* task);
-    
-    /**
-     This mehod is called when an action performed by a control point has been 
-     received and needs to be answered.
-     @param action the action information to answer
-     @param context the context information including the HTTP request and
-     local and remote socket information (IP & port).
-     */
-    virtual NPT_Result OnAction(PLT_ActionReference&          action, 
-                                const PLT_HttpRequestContext& context);
-    
-    /**
-     This method is called when a control point is requesting the device
-     description.
-     @param request the HTTP request
-     @param context the context information including local and remote socket information.
-     @param response the response to setup.
-     */
-    virtual NPT_Result ProcessGetDescription(NPT_HttpRequest&              request,
-                                             const NPT_HttpRequestContext& context,
-                                             NPT_HttpResponse&             response);
-    
-    /**
-     This method is called when a control point is requesting a service SCPD.
-     @param service the service
-     @param request the HTTP request
-     @param context the context information including local and remote socket information.
-     @param response the response to setup.
-     */
-    virtual NPT_Result ProcessGetSCPD(PLT_Service*                  service,
-                                      NPT_HttpRequest&              request,
-                                      const NPT_HttpRequestContext& context,
-                                      NPT_HttpResponse&             response);
-    
-    /**
-     This method is called when a "GET" request for a resource other than the device
-     description, SCPD, or icons has been received.
-     @param request the HTTP request
-     @param context the context information including local and remote socket information.
-     @param response the response to setup.
-     */
-    virtual NPT_Result ProcessHttpGetRequest(NPT_HttpRequest&              request,
-                                             const NPT_HttpRequestContext& context,
-                                             NPT_HttpResponse&             response);
-    
-    /**
-     This method is called when a "POST" request has been received. This is usually
-     an UPnP service action invocation. This will deserialize the request and call
-     the OnAction method.
-     @param request the HTTP request
-     @param context the context information including local and remote socket information.
-     @param response the response to setup.
-     */
-    virtual NPT_Result ProcessHttpPostRequest(NPT_HttpRequest&              request,
-                                              const NPT_HttpRequestContext& context,
-                                              NPT_HttpResponse&             response);
-    
-    /**
-     This method is called when a request from a subscriber has been received. This is
-     for any new subscritions, existing subscrition renewal or cancellation.
-     @param request the HTTP request
-     @param context the context information including local and remote socket information.
-     @param response the response to setup.
-     */
-    virtual NPT_Result ProcessHttpSubscriberRequest(NPT_HttpRequest&              request,
-                                                    const NPT_HttpRequestContext& context,
-                                                    NPT_HttpResponse&             response);
-
-protected:
-    friend class PLT_UPnP;
-    friend class PLT_UPnP_DeviceStartIterator;
-    friend class PLT_UPnP_DeviceStopIterator;
-    friend class PLT_Service;
-    friend class NPT_Reference<PLT_DeviceHost>;
-    friend class PLT_SsdpDeviceSearchResponseInterfaceIterator;
-    friend class PLT_SsdpDeviceSearchResponseTask;
-    friend class PLT_SsdpAnnounceInterfaceIterator;
-
-    PLT_TaskManager m_TaskManager;
-    PLT_HttpServer* m_HttpServer;
-    bool            m_Broadcast;
-    NPT_UInt16      m_Port;
-    bool            m_PortRebind;
-    bool            m_ByeByeFirst;
-};
-
-typedef NPT_Reference<PLT_DeviceHost> PLT_DeviceHostReference;
-
-#endif /* _PLT_DEVICE_HOST_H_ */

gpac-2.2.1.tar.gz/extra_lib/include/platinum/PltDidl.h Deleted

@@ -1,158 +0,0 @@
-/*****************************************************************
-|
-|   Platinum - DIDL handling
-|
-| Copyright (c) 2004-2010, Plutinosoft, LLC.
-| All rights reserved.
-| http://www.plutinosoft.com
-|
-| This program is free software; you can redistribute it and/or
-| modify it under the terms of the GNU General Public License
-| as published by the Free Software Foundation; either version 2
-| of the License, or (at your option) any later version.
-|
-| OEMs, ISVs, VARs and other distributors that combine and 
-| distribute commercially licensed software with Platinum software
-| and do not wish to distribute the source code for the commercially
-| licensed software under version 2, or (at your option) any later
-| version, of the GNU General Public License (the "GPL") must enter
-| into a commercial license agreement with Plutinosoft, LLC.
-| licensing@plutinosoft.com
-|  
-| This program 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 General Public License for more details.
-|
-| You should have received a copy of the GNU General Public License
-| along with this program; see the file LICENSE.txt. If not, write to
-| the Free Software Foundation, Inc., 
-| 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-| http://www.gnu.org/licenses/gpl-2.0.html
-|
-****************************************************************/
-
-/** @file
- UPnP AV Didl
- */
-
-#ifndef _PLT_DIDL_H_
-#define _PLT_DIDL_H_
-
-/*----------------------------------------------------------------------
-|   includes
-+---------------------------------------------------------------------*/
-#include "Neptune.h"
-#include "PltMediaItem.h"
-
-/*----------------------------------------------------------------------
-|   constants
-+---------------------------------------------------------------------*/
-#define PLT_FILTER_MASK_ALL                         0xFFFFFFFF
-
-#define PLT_FILTER_MASK_CREATOR                     0x00000001
-#define PLT_FILTER_MASK_ARTIST                      0x00000002
-#define PLT_FILTER_MASK_ALBUM                       0x00000004
-#define PLT_FILTER_MASK_GENRE                       0x00000008
-#define PLT_FILTER_MASK_ALBUMARTURI                 0x00000010
-#define PLT_FILTER_MASK_DESCRIPTION                 0x00000020
-#define PLT_FILTER_MASK_SEARCHABLE                  0x00000040
-#define PLT_FILTER_MASK_CHILDCOUNT                  0x00000080
-#define PLT_FILTER_MASK_ORIGINALTRACK               0x00000100
-#define PLT_FILTER_MASK_ACTOR                       0x00000200
-#define PLT_FILTER_MASK_AUTHOR                      0x00000400
-#define PLT_FILTER_MASK_DATE                        0x00000800
-#define PLT_FILTER_MASK_PROGRAMTITLE                0x00001000
-#define PLT_FILTER_MASK_SERIESTITLE                 0x00002000
-#define PLT_FILTER_MASK_EPISODE                     0x00004000
-#define PLT_FILTER_MASK_TITLE                       0x00008000
-
-#define PLT_FILTER_MASK_RES                         0x00010000
-#define PLT_FILTER_MASK_RES_DURATION                0x00020000
-#define PLT_FILTER_MASK_RES_SIZE                    0x00040000
-#define PLT_FILTER_MASK_RES_PROTECTION              0x00080000
-#define PLT_FILTER_MASK_RES_RESOLUTION              0x00100000
-#define PLT_FILTER_MASK_RES_BITRATE                 0x00200000
-#define PLT_FILTER_MASK_RES_BITSPERSAMPLE           0x00400000
-#define PLT_FILTER_MASK_RES_NRAUDIOCHANNELS			0x00800000
-#define PLT_FILTER_MASK_RES_SAMPLEFREQUENCY			0x01000000
-
-#define PLT_FILTER_MASK_LONGDESCRIPTION             0x02000000
-#define PLT_FILTER_MASK_ICON                        0x04000000
-
-#define PLT_FILTER_MASK_TOC							0x02000000
-#define PLT_FILTER_MASK_SEARCHCLASS					0x04000000
-#define PLT_FILTER_MASK_REFID                       0x08000000
-
-#define PLT_FILTER_FIELD_TITLE                      "dc:title"
-#define PLT_FILTER_FIELD_CREATOR                    "dc:creator"
-#define PLT_FILTER_FIELD_DATE                       "dc:date"
-#define PLT_FILTER_FIELD_ARTIST                     "upnp:artist"
-#define PLT_FILTER_FIELD_ACTOR                      "upnp:actor"
-#define PLT_FILTER_FIELD_AUTHOR                     "upnp:author"
-#define PLT_FILTER_FIELD_ALBUM                      "upnp:album"
-#define PLT_FILTER_FIELD_GENRE                      "upnp:genre"
-#define PLT_FILTER_FIELD_ALBUMARTURI                "upnp:albumArtURI"
-#define PLT_FILTER_FIELD_ALBUMARTURI_DLNAPROFILEID  "upnp:albumArtURI@dlna:profileID"
-#define PLT_FILTER_FIELD_DESCRIPTION                "dc:description"
-#define PLT_FILTER_FIELD_LONGDESCRIPTION            "upnp:longDescription"
-#define PLT_FILTER_FIELD_ICON                       "upnp:icon"
-#define PLT_FILTER_FIELD_ORIGINALTRACK              "upnp:originalTrackNumber"
-#define PLT_FILTER_FIELD_PROGRAMTITLE               "upnp:programTitle"
-#define PLT_FILTER_FIELD_SERIESTITLE                "upnp:seriesTitle"
-#define PLT_FILTER_FIELD_EPISODE                    "upnp:episodeNumber"
-#define PLT_FILTER_FIELD_SEARCHCLASS				"upnp:searchClass"
-#define PLT_FILTER_FIELD_SEARCHABLE                 "@searchable"
-#define PLT_FILTER_FIELD_CHILDCOUNT                 "@childcount"
-#define PLT_FILTER_FIELD_CONTAINER_CHILDCOUNT       "container@childCount"
-#define PLT_FILTER_FIELD_CONTAINER_SEARCHABLE       "container@searchable"
-#define PLT_FILTER_FIELD_REFID                      "@refID"
-
-#define PLT_FILTER_FIELD_RES                        "res"
-#define PLT_FILTER_FIELD_RES_DURATION               "res@duration"
-#define PLT_FILTER_FIELD_RES_DURATION_SHORT         "@duration"
-#define PLT_FILTER_FIELD_RES_SIZE                   "res@size"
-#define PLT_FILTER_FIELD_RES_PROTECTION             "res@protection"
-#define PLT_FILTER_FIELD_RES_RESOLUTION             "res@resolution"
-#define PLT_FILTER_FIELD_RES_BITRATE                "res@bitrate"
-#define PLT_FILTER_FIELD_RES_BITSPERSAMPLE          "res@bitsPerSample"
-#define PLT_FILTER_FIELD_RES_NRAUDIOCHANNELS        "res@nrAudioChannels"
-#define PLT_FILTER_FIELD_RES_SAMPLEFREQUENCY        "res@sampleFrequency"
-
-extern const char* didl_header;
-extern const char* didl_footer;
-extern const char* didl_namespace_dc;
-extern const char* didl_namespace_upnp;
-extern const char* didl_namespace_dlna;
-
-/*----------------------------------------------------------------------
-|   PLT_Didl
-+---------------------------------------------------------------------*/
-/**
- DIDL manipulation.
- The PLT_Didl class provides a mechanism to (de)serialize a PLT_MediaObject or
- list of PLT_MediaObject (PLT_MediaObjectList).
- */
-class PLT_Didl
-{
-public:
-    static NPT_Result  ToDidl(PLT_MediaObject&  object, 
-                              const NPT_String& filter, 
-                              NPT_String&       didl);
-    static NPT_Result  FromDidl(const char* didl, 
-                                PLT_MediaObjectListReference& objects);
-    static void        AppendXmlEscape(NPT_String& out, const char* in);
-    static void        AppendXmlUnEscape(NPT_String& out, const char* in);
-    static NPT_Result  ParseTimeStamp(const NPT_String& timestamp, NPT_UInt32& seconds);
-    static NPT_String  FormatTimeStamp(NPT_UInt32 seconds);
-    static NPT_Result  ParseTimeStamp(const NPT_String& in, NPT_TimeStamp& timestamp) {
-        NPT_UInt32 seconds;
-        NPT_Result res = ParseTimeStamp(in, seconds);
-        timestamp = NPT_TimeStamp((double)seconds);
-        return res;
-    }
-
-    static NPT_UInt32  ConvertFilterToMask(const NPT_String& filter);
-};
-
-#endif /* _PLT_DIDL_H_ */

gpac-2.2.1.tar.gz/extra_lib/include/platinum/PltDownloader.h Deleted

@@ -1,89 +0,0 @@
-/*****************************************************************
-|
-|   Platinum - Downloader
-|
-| Copyright (c) 2004-2010, Plutinosoft, LLC.
-| All rights reserved.
-| http://www.plutinosoft.com
-|
-| This program is free software; you can redistribute it and/or
-| modify it under the terms of the GNU General Public License
-| as published by the Free Software Foundation; either version 2
-| of the License, or (at your option) any later version.
-|
-| OEMs, ISVs, VARs and other distributors that combine and 
-| distribute commercially licensed software with Platinum software
-| and do not wish to distribute the source code for the commercially
-| licensed software under version 2, or (at your option) any later
-| version, of the GNU General Public License (the "GPL") must enter
-| into a commercial license agreement with Plutinosoft, LLC.
-| licensing@plutinosoft.com
-|  
-| This program 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 General Public License for more details.
-|
-| You should have received a copy of the GNU General Public License
-| along with this program; see the file LICENSE.txt. If not, write to
-| the Free Software Foundation, Inc., 
-| 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-| http://www.gnu.org/licenses/gpl-2.0.html
-|
-****************************************************************/
-
-#ifndef _PLT_DOWNLOADER_H_
-#define _PLT_DOWNLOADER_H_
-
-/*----------------------------------------------------------------------
-|   Includes
-+---------------------------------------------------------------------*/
-#include "Neptune.h"
-#include "PltHttpClientTask.h"
-
-/*----------------------------------------------------------------------
-|   forward declarations
-+---------------------------------------------------------------------*/
-class PLT_Downloader;
-
-/*----------------------------------------------------------------------
-|   types
-+---------------------------------------------------------------------*/
-typedef enum {
-    PLT_DOWNLOADER_IDLE,
-    PLT_DOWNLOADER_STARTED,
-    PLT_DOWNLOADER_DOWNLOADING,
-    PLT_DOWNLOADER_ERROR,
-    PLT_DOWNLOADER_SUCCESS
-} Plt_DowloaderState;
-
-/*----------------------------------------------------------------------
-|   PLT_Downloader class
-+---------------------------------------------------------------------*/
-class PLT_Downloader : public PLT_HttpClientSocketTask
-{
-public:
-    PLT_Downloader(NPT_HttpUrl&               url, 
-                   NPT_OutputStreamReference& output);
-    virtual ~PLT_Downloader();
-    
-    Plt_DowloaderState GetState() { return m_State; }
-
-    // PLT_HttpClientTask method
-    NPT_Result ProcessResponse(NPT_Result                    res, 
-                               const NPT_HttpRequest&        request, 
-                               const NPT_HttpRequestContext& context, 
-                               NPT_HttpResponse*             response);
-
-protected:
-    virtual void DoRun();
-    virtual void DoAbort();
-    
-private:
-    // members
-    NPT_HttpUrl               m_URL;
-    NPT_OutputStreamReference m_Output;
-    Plt_DowloaderState        m_State;
-};
-
-#endif /* _PLT_DOWNLOADER_H_ */

gpac-2.2.1.tar.gz/extra_lib/include/platinum/PltEvent.h Deleted

@@ -1,191 +0,0 @@
-/*****************************************************************
-|
-|   Platinum - Event
-|
-| Copyright (c) 2004-2010, Plutinosoft, LLC.
-| All rights reserved.
-| http://www.plutinosoft.com
-|
-| This program is free software; you can redistribute it and/or
-| modify it under the terms of the GNU General Public License
-| as published by the Free Software Foundation; either version 2
-| of the License, or (at your option) any later version.
-|
-| OEMs, ISVs, VARs and other distributors that combine and 
-| distribute commercially licensed software with Platinum software
-| and do not wish to distribute the source code for the commercially
-| licensed software under version 2, or (at your option) any later
-| version, of the GNU General Public License (the "GPL") must enter
-| into a commercial license agreement with Plutinosoft, LLC.
-| licensing@plutinosoft.com
-|  
-| This program 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 General Public License for more details.
-|
-| You should have received a copy of the GNU General Public License
-| along with this program; see the file LICENSE.txt. If not, write to
-| the Free Software Foundation, Inc., 
-| 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-| http://www.gnu.org/licenses/gpl-2.0.html
-|
-****************************************************************/
-
-/** @file
- UPnP Eventing
- */
-
-#ifndef _PLT_EVENT_H_
-#define _PLT_EVENT_H_
-
-/*----------------------------------------------------------------------
-|   includes
-+---------------------------------------------------------------------*/
-#include "Neptune.h"
-#include "PltHttpClientTask.h"
-
-/*----------------------------------------------------------------------
-|   forward declarations
-+---------------------------------------------------------------------*/
-class PLT_StateVariable;
-class PLT_DeviceData;
-class PLT_Service;
-class PLT_TaskManager;
-class PLT_CtrlPoint;
-
-/*----------------------------------------------------------------------
-|   PLT_EventNotification class
-+---------------------------------------------------------------------*/
-/**
- The PLT_EventNotification class represents an event notification for a given
- service to a given subscriber 
- */
-class PLT_EventNotification
-{
-public:
-    ~PLT_EventNotification() {}
-
-    static PLT_EventNotification* Parse(const NPT_HttpRequest&        request,
-                                        const NPT_HttpRequestContext& context,
-                                        NPT_HttpResponse&             response);
-
-
-    NPT_TimeStamp                 m_ReceptionTime;
-    NPT_HttpUrl                   m_RequestUrl;
-    NPT_String                    m_SID;
-    NPT_Ordinal                   m_EventKey;
-    NPT_String                    m_XmlBody;
-    
-protected:
-    PLT_EventNotification() {}
-};
-
-/*----------------------------------------------------------------------
-|   PLT_EventSubscriber class
-+---------------------------------------------------------------------*/
-/**
- The PLT_EventSubscriber class represents an event subscription for a given service
- from a UPnP ControlPoint.
- */
-class PLT_EventSubscriber
-{
-public:
-    PLT_EventSubscriber(PLT_TaskManager* task_manager, 
-                        PLT_Service*     service,
-                        const char*      sid,
-                        NPT_Timeout      timeout_secs = -1);
-    ~PLT_EventSubscriber();
-
-    PLT_Service*      GetService();
-    NPT_Ordinal       GetEventKey();
-    NPT_Result        SetEventKey(NPT_Ordinal value);
-    NPT_SocketAddress GetLocalIf();
-    NPT_Result        SetLocalIf(NPT_SocketAddress value);
-    NPT_TimeStamp     GetExpirationTime();
-    NPT_Result        SetTimeout(NPT_Timeout seconds = -1);
-    const NPT_String& GetSID() const { return m_SID; }
-    NPT_Result        FindCallbackURL(const char* callback_url);
-    NPT_Result        AddCallbackURL(const char* callback_url);
-    NPT_Result        Notify(NPT_List<PLT_StateVariable*>& vars);
-    
-protected:
-    //members
-    PLT_TaskManager*          m_TaskManager;
-    PLT_Service*              m_Service;
-    NPT_Ordinal               m_EventKey;
-    PLT_HttpClientSocketTask* m_SubscriberTask;
-    NPT_String                m_SID;
-    NPT_SocketAddress         m_LocalIf;
-    NPT_Array<NPT_String>     m_CallbackURLs;
-    NPT_TimeStamp             m_ExpirationTime;
-};
-
-typedef NPT_Reference<PLT_EventSubscriber> PLT_EventSubscriberReference;
-
-/*----------------------------------------------------------------------
-|   PLT_EventSubscriberFinderBySID
-+---------------------------------------------------------------------*/
-/**
- The PLT_EventSubscriberFinderBySID class returns an instance of a PLT_EventSubscriber
- given its subscriber ID.
- */
-class PLT_EventSubscriberFinderBySID
-{
-public:
-    // methods
-    PLT_EventSubscriberFinderBySID(const char* sid) : m_SID(sid) {}
-
-    bool operator()(PLT_EventSubscriberReference const & sub) const {
-        return m_SID.Compare(sub->GetSID(), true) ? false : true;
-    }
-
-private:
-    // members
-    NPT_String m_SID;
-};
-
-/*----------------------------------------------------------------------
-|   PLT_EventSubscriberFinderByCallbackURL
-+---------------------------------------------------------------------*/
-/**
- The PLT_EventSubscriberFinderByCallbackURL class returns an instance of a 
- PLT_EventSubscriber given its subscriber callback url.
- */
-class PLT_EventSubscriberFinderByCallbackURL
-{
-public:
-    // methods
-    PLT_EventSubscriberFinderByCallbackURL(const char* callback_url) : 
-      m_CallbackURL(callback_url) {}
-
-    bool operator()(PLT_EventSubscriberReference const & sub) const {
-        return NPT_SUCCEEDED(sub->FindCallbackURL(m_CallbackURL));
-    }
-
-private:
-    // members
-    NPT_String m_CallbackURL;
-};
-
-/*----------------------------------------------------------------------
-|   PLT_EventSubscriberFinderByService
-+---------------------------------------------------------------------*/
-/**
- The PLT_EventSubscriberFinderByService class returns an instance of a 
- PLT_EventSubscriber given a UPnP service.
- */
-class PLT_EventSubscriberFinderByService
-{
-public:
-    // methods
-    PLT_EventSubscriberFinderByService(PLT_Service* service) : m_Service(service) {}
-    virtual ~PLT_EventSubscriberFinderByService() {}
-    bool operator()(PLT_EventSubscriberReference const & eventSub) const;
-
-private:
-    // members
-    PLT_Service* m_Service;
-};
-
-#endif /* _PLT_EVENT_H_ */

gpac-2.2.1.tar.gz/extra_lib/include/platinum/PltFileMediaServer.h Deleted

@@ -1,151 +0,0 @@
-/*****************************************************************
-|
-|   Platinum - File Media Server
-|
-| Copyright (c) 2004-2010, Plutinosoft, LLC.
-| All rights reserved.
-| http://www.plutinosoft.com
-|
-| This program is free software; you can redistribute it and/or
-| modify it under the terms of the GNU General Public License
-| as published by the Free Software Foundation; either version 2
-| of the License, or (at your option) any later version.
-|
-| OEMs, ISVs, VARs and other distributors that combine and 
-| distribute commercially licensed software with Platinum software
-| and do not wish to distribute the source code for the commercially
-| licensed software under version 2, or (at your option) any later
-| version, of the GNU General Public License (the "GPL") must enter
-| into a commercial license agreement with Plutinosoft, LLC.
-| licensing@plutinosoft.com
-|  
-| This program 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 General Public License for more details.
-|
-| You should have received a copy of the GNU General Public License
-| along with this program; see the file LICENSE.txt. If not, write to
-| the Free Software Foundation, Inc., 
-| 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-| http://www.gnu.org/licenses/gpl-2.0.html
-|
-****************************************************************/
-
-/** @file
- UPnP AV Filesystem based Media Server sample implementation 
- */
-
-#ifndef _PLT_FILE_MEDIA_SERVER_H_
-#define _PLT_FILE_MEDIA_SERVER_H_
-
-/*----------------------------------------------------------------------
-|   includes
-+---------------------------------------------------------------------*/
-#include "Neptune.h"
-#include "PltMediaServer.h"
-#include "PltMediaCache.h"
-
-/*----------------------------------------------------------------------
-|   PLT_FileMediaServerDelegate
-+---------------------------------------------------------------------*/
-/**
- File Media Server Delegate.
- The PLT_FileMediaServerDelegate class is an example of a PLT_MediaServerDelegate
- implementation for a file system backed Media Server.
- */
-class PLT_FileMediaServerDelegate : public PLT_MediaServerDelegate
-{
-public:
-    // class methods
-    static NPT_String BuildSafeResourceUri(const NPT_HttpUrl& base_uri, 
-                                           const char*        host, 
-                                           const char*        file_path);
-    // constructor & destructor
-    PLT_FileMediaServerDelegate(const char* url_root, const char* file_root, bool use_cache = false);
-    virtual ~PLT_FileMediaServerDelegate();
-    
-protected:
-    // PLT_MediaServerDelegate methods
-    virtual NPT_Result OnBrowseMetadata(PLT_ActionReference&          action, 
-                                        const char*                   object_id, 
-                                        const char*                   filter,
-                                        NPT_UInt32                    starting_index,
-                                        NPT_UInt32                    requested_count,
-                                        const char*                   sort_criteria,
-                                        const PLT_HttpRequestContext& context);
-    virtual NPT_Result OnBrowseDirectChildren(PLT_ActionReference&          action, 
-                                              const char*                   object_id, 
-                                              const char*                   filter,
-                                              NPT_UInt32                    starting_index,
-                                              NPT_UInt32                    requested_count,
-                                              const char*                   sort_criteria,
-                                              const PLT_HttpRequestContext& context);
-    virtual NPT_Result OnSearchContainer(PLT_ActionReference&          action, 
-                                         const char*                   object_id, 
-                                         const char*                   search_criteria,
-                                         const char*                   filter,
-                                         NPT_UInt32                    starting_index,
-                                         NPT_UInt32                    requested_count,
-                                         const char*                   sort_criteria, 
-                                         const PLT_HttpRequestContext& context);
-    virtual NPT_Result ProcessFileRequest(NPT_HttpRequest&              request, 
-                                          const NPT_HttpRequestContext& context,
-                                          NPT_HttpResponse&             response);
-    
-    // overridable methods
-    virtual NPT_Result ExtractResourcePath(const NPT_HttpUrl& url, NPT_String& file_path);
-    virtual NPT_String BuildResourceUri(const NPT_HttpUrl& base_uri, const char* host, const char* file_path);
-    virtual NPT_Result ServeFile(const NPT_HttpRequest&        request, 
-                                 const NPT_HttpRequestContext& context,
-                                 NPT_HttpResponse&             response,
-                                 const NPT_String&             file_path);
-    virtual NPT_Result GetFilePath(const char* object_id, NPT_String& filepath);
-    virtual bool       ProcessFile(const NPT_String&, const char* filter = NULL) { NPT_COMPILER_UNUSED(filter); return true;}
-    virtual PLT_MediaObject* BuildFromFilePath(const NPT_String&             filepath, 
-                                               const PLT_HttpRequestContext& context,
-                                               bool                          with_count = true,
-                                               bool                          keep_extension_in_title = false,
-                                               bool                          allip = false);
-    
-protected:
-    friend class PLT_MediaItem;
-    
-    NPT_String  m_UrlRoot;
-    NPT_String  m_FileRoot;
-    bool        m_FilterUnknownOut;
-    bool        m_UseCache;
-    
-    PLT_MediaCache<NPT_Reference<NPT_List<NPT_String> >, NPT_TimeStamp> m_DirCache;
-};
-
-/*----------------------------------------------------------------------
-|   PLT_FileMediaServer
-+---------------------------------------------------------------------*/
-/**
- File Media Server.
- The PLT_FileMediaServer class is an example of a PLT_MediaServer implementation
- for a file system backed Media Server.
- */
-class PLT_FileMediaServer : public PLT_MediaServer,
-                            public PLT_FileMediaServerDelegate
-{
-public:    // constructor
-    PLT_FileMediaServer(const char*  file_root,
-                        const char*  friendly_name,
-                        bool         show_ip = false,
-                        const char*  uuid = NULL,
-                        NPT_UInt16   port = 0,
-                        bool         port_rebind = false) :
-        PLT_MediaServer(friendly_name, 
-                        show_ip,
-                        uuid, 
-                        port,
-                        port_rebind),
-        PLT_FileMediaServerDelegate("/", file_root) {SetDelegate(this);}
-
-protected:
-    virtual ~PLT_FileMediaServer() {}
-};
-
-#endif /* _PLT_FILE_MEDIA_SERVER_H_ */

gpac-2.2.1.tar.gz/extra_lib/include/platinum/PltFrameBuffer.h Deleted

@@ -1,76 +0,0 @@
-/*****************************************************************
-|
-|   Platinum - Frame Buffer
-|
-| Copyright (c) 2004-2010, Plutinosoft, LLC.
-| All rights reserved.
-| http://www.plutinosoft.com
-|
-| This program is free software; you can redistribute it and/or
-| modify it under the terms of the GNU General Public License
-| as published by the Free Software Foundation; either version 2
-| of the License, or (at your option) any later version.
-|
-| OEMs, ISVs, VARs and other distributors that combine and 
-| distribute commercially licensed software with Platinum software
-| and do not wish to distribute the source code for the commercially
-| licensed software under version 2, or (at your option) any later
-| version, of the GNU General Public License (the "GPL") must enter
-| into a commercial license agreement with Plutinosoft, LLC.
-| licensing@plutinosoft.com
-|  
-| This program 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 General Public License for more details.
-|
-| You should have received a copy of the GNU General Public License
-| along with this program; see the file LICENSE.txt. If not, write to
-| the Free Software Foundation, Inc., 
-| 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-| http://www.gnu.org/licenses/gpl-2.0.html
-|
-****************************************************************/
-
-#ifndef _PLT_FRAME_BUFFER_H_
-#define _PLT_FRAME_BUFFER_H_
-
-/*----------------------------------------------------------------------
-|   includes
-+---------------------------------------------------------------------*/
-#include "Neptune.h"
-
-/*----------------------------------------------------------------------
-|   PLT_FrameBuffer
-+---------------------------------------------------------------------*/
-class PLT_FrameBuffer 
-{
- public:
-    // constructor & destructor
-    PLT_FrameBuffer(const char* mime_type);
-    virtual ~PLT_FrameBuffer();
-    
-    void Reset();
-    void Abort();
-    void AddReader()    { m_Readers.Increment(); }
-    void RemoveReader() { m_Readers.Decrement(); }
-    int  GetNbReaders() { return m_Readers.GetValue(); }
-    const char* GetMimeType() { return m_MimeType; }
-
-    // data buffer handling methods
-    virtual NPT_Result SetNextFrame(const NPT_Byte* buffer, NPT_Size bufferSize);
-    virtual NPT_Result GetNextFrame(NPT_UInt32&     last_frame_index, 
-                                    NPT_DataBuffer& buffer, 
-                                    NPT_Timeout     timeout = NPT_TIMEOUT_INFINITE);
-
- protected:
-    // members
-    NPT_String         m_MimeType;
-    bool               m_Aborted;
-    NPT_SharedVariable m_FrameIndex;
-    NPT_DataBuffer     m_Frame;
-    NPT_Mutex          m_FrameLock;
-    NPT_AtomicVariable m_Readers;
-};
-
-#endif // _PLT_FRAME_BUFFER_H_

gpac-2.2.1.tar.gz/extra_lib/include/platinum/PltFrameServer.h Deleted

@@ -1,103 +0,0 @@
-/*****************************************************************
-|
-|   Platinum - Frame Server
-|
-| Copyright (c) 2004-2010, Plutinosoft, LLC.
-| All rights reserved.
-| http://www.plutinosoft.com
-|
-| This program is free software; you can redistribute it and/or
-| modify it under the terms of the GNU General Public License
-| as published by the Free Software Foundation; either version 2
-| of the License, or (at your option) any later version.
-|
-| OEMs, ISVs, VARs and other distributors that combine and 
-| distribute commercially licensed software with Platinum software
-| and do not wish to distribute the source code for the commercially
-| licensed software under version 2, or (at your option) any later
-| version, of the GNU General Public License (the "GPL") must enter
-| into a commercial license agreement with Plutinosoft, LLC.
-| licensing@plutinosoft.com
-|  
-| This program 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 General Public License for more details.
-|
-| You should have received a copy of the GNU General Public License
-| along with this program; see the file LICENSE.txt. If not, write to
-| the Free Software Foundation, Inc., 
-| 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-| http://www.gnu.org/licenses/gpl-2.0.html
-|
-****************************************************************/
-
-#ifndef _PLT_FRAME_SERVER_H_
-#define _PLT_FRAME_SERVER_H_
-
-/*----------------------------------------------------------------------
-|   includes
-+---------------------------------------------------------------------*/
-#include "Neptune.h"
-#include "PltHttpServer.h"
-#include "PltFrameBuffer.h"
-
-/*----------------------------------------------------------------------
-|   forward declarations
-+---------------------------------------------------------------------*/
-class PLT_SocketPolicyServer;
-
-/*----------------------------------------------------------------------
-|   PLT_StreamValidator class
-+---------------------------------------------------------------------*/
-class PLT_StreamValidator
-{
-public:
-    virtual ~PLT_StreamValidator() {}
-    virtual bool OnNewRequestAccept(const NPT_HttpRequest&          request, 
-                                    const NPT_HttpRequestContext&   context,
-                                    NPT_HttpResponse&               response, 
-                                    NPT_Reference<PLT_FrameBuffer>& buffer) = 0;
-};
-
-/*----------------------------------------------------------------------
-|   PLT_HttpStreamRequestHandler
-+---------------------------------------------------------------------*/
-class PLT_HttpStreamRequestHandler : public NPT_HttpRequestHandler
-{
-public:
-    // constructor
-    PLT_HttpStreamRequestHandler(PLT_StreamValidator& stream_validator) :
-        m_StreamValidator(stream_validator) {}
-
-    // NPT_HttpRequestHandler methods
-    virtual NPT_Result SetupResponse(NPT_HttpRequest&              request, 
-                                     const NPT_HttpRequestContext& context,
-                                     NPT_HttpResponse&             response);
-
-private:
-    PLT_StreamValidator& m_StreamValidator;
-};
-
-/*----------------------------------------------------------------------
-|   PLT_FrameServer class
-+---------------------------------------------------------------------*/
-class PLT_FrameServer : public PLT_HttpServer
-{
-public:
-    PLT_FrameServer(const char*          resource_name,
-                    PLT_StreamValidator& stream_validator,
-                    NPT_IpAddress        address = NPT_IpAddress::Any,
-                    NPT_UInt16           port = 0,
-                    bool                 policy_server_enabled = false);
-    virtual ~PLT_FrameServer();
-    
-    virtual NPT_Result Start();
-
-protected:
-    PLT_SocketPolicyServer* m_PolicyServer;
-    PLT_StreamValidator&    m_StreamValidator;
-    bool                    m_PolicyServerEnabled;
-};
-
-#endif /* _PLT_FRAME_SERVER_H_ */

gpac-2.2.1.tar.gz/extra_lib/include/platinum/PltFrameStream.h Deleted

@@ -1,79 +0,0 @@
-/*****************************************************************
-|
-|   Platinum - Frame Stream
-|
-| Copyright (c) 2004-2010, Plutinosoft, LLC.
-| All rights reserved.
-| http://www.plutinosoft.com
-|
-| This program is free software; you can redistribute it and/or
-| modify it under the terms of the GNU General Public License
-| as published by the Free Software Foundation; either version 2
-| of the License, or (at your option) any later version.
-|
-| OEMs, ISVs, VARs and other distributors that combine and 
-| distribute commercially licensed software with Platinum software
-| and do not wish to distribute the source code for the commercially
-| licensed software under version 2, or (at your option) any later
-| version, of the GNU General Public License (the "GPL") must enter
-| into a commercial license agreement with Plutinosoft, LLC.
-| licensing@plutinosoft.com
-|  
-| This program 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 General Public License for more details.
-|
-| You should have received a copy of the GNU General Public License
-| along with this program; see the file LICENSE.txt. If not, write to
-| the Free Software Foundation, Inc., 
-| 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-| http://www.gnu.org/licenses/gpl-2.0.html
-|
-****************************************************************/
-
-#ifndef _PLT_FRAMESTREAM_H_
-#define _PLT_FRAMESTREAM_H_
-
-/*----------------------------------------------------------------------
-|   includes
-+---------------------------------------------------------------------*/
-#include "Neptune.h"
-#include "PltFrameBuffer.h"
-
-/*----------------------------------------------------------------------
-|   PLT_InputFrameStream
-+---------------------------------------------------------------------*/
-class PLT_InputFrameStream : public NPT_InputStream
-{
-public:
-    // methods
-    PLT_InputFrameStream(NPT_Reference<PLT_FrameBuffer>& frame_buffer,
-                         const char*                     boundary);
-    virtual ~PLT_InputFrameStream();
-
-    // NPT_InputStream methods
-    NPT_Result Read(void*     buffer, 
-                    NPT_Size  bytes_to_read, 
-                    NPT_Size* bytes_read = 0);
-
-    NPT_Result Seek(NPT_Position offset)      { NPT_COMPILER_UNUSED(offset); return NPT_FAILURE; }
-    NPT_Result Skip(NPT_Size offset)          { NPT_COMPILER_UNUSED(offset); return NPT_FAILURE; }
-    NPT_Result Tell(NPT_Position& offset)     { NPT_COMPILER_UNUSED(offset); return NPT_FAILURE; }
-    NPT_Result GetSize(NPT_LargeSize& size)   { NPT_COMPILER_UNUSED(size);   return NPT_FAILURE; }
-    NPT_Result GetAvailable(NPT_LargeSize& available);
-        
-private:
-    NPT_Result FillBuffer();
-
-protected:
-    NPT_Reference<PLT_FrameBuffer> m_FrameBuffer;
-    NPT_MemoryStream               m_Part;
-    NPT_UInt32                     m_LastFrameIndex;
-    NPT_String                     m_Boundary;
-    bool                           m_Eos;
-};
-
-typedef NPT_Reference<PLT_InputFrameStream> PLT_InputFrameStreamReference;
-
-#endif /* _PLT_FRAMESTREAM_H_ */

gpac-2.2.1.tar.gz/extra_lib/include/platinum/PltHttp.h Deleted

@@ -1,171 +0,0 @@
-/*****************************************************************
-|
-|   Platinum - HTTP Helper
-|
-| Copyright (c) 2004-2010, Plutinosoft, LLC.
-| All rights reserved.
-| http://www.plutinosoft.com
-|
-| This program is free software; you can redistribute it and/or
-| modify it under the terms of the GNU General Public License
-| as published by the Free Software Foundation; either version 2
-| of the License, or (at your option) any later version.
-|
-| OEMs, ISVs, VARs and other distributors that combine and 
-| distribute commercially licensed software with Platinum software
-| and do not wish to distribute the source code for the commercially
-| licensed software under version 2, or (at your option) any later
-| version, of the GNU General Public License (the "GPL") must enter
-| into a commercial license agreement with Plutinosoft, LLC.
-| licensing@plutinosoft.com
-|  
-| This program 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 General Public License for more details.
-|
-| You should have received a copy of the GNU General Public License
-| along with this program; see the file LICENSE.txt. If not, write to
-| the Free Software Foundation, Inc., 
-| 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-| http://www.gnu.org/licenses/gpl-2.0.html
-|
-****************************************************************/
-
-/** @file
- HTTP utilities
- */
-
-#ifndef _PLT_HTTP_H_
-#define _PLT_HTTP_H_
-
-/*----------------------------------------------------------------------
-|   includes
-+---------------------------------------------------------------------*/
-#include "Neptune.h"
-#include "PltVersion.h"
-
-/*----------------------------------------------------------------------
-|   constants
-+---------------------------------------------------------------------*/
-#if !defined(PLT_HTTP_DEFAULT_USER_AGENT)
-#define PLT_HTTP_DEFAULT_USER_AGENT "UPnP/1.0 DLNADOC/1.50 Platinum/" PLT_PLATINUM_SDK_VERSION_STRING
-#endif
-
-#if !defined(PLT_HTTP_DEFAULT_SERVER)
-#define PLT_HTTP_DEFAULT_SERVER "UPnP/1.0 DLNADOC/1.50 Platinum/" PLT_PLATINUM_SDK_VERSION_STRING
-#endif
-
-/*----------------------------------------------------------------------
-|   types
-+---------------------------------------------------------------------*/
-typedef enum {
-	PLT_DEVICE_UNKNOWN,
-	PLT_DEVICE_XBOX,
-	PLT_DEVICE_PS3,
-	PLT_DEVICE_WMP,
-    PLT_DEVICE_SONOS,
-    PLT_DEVICE_MAC,
-    PLT_DEVICE_WINDOWS,
-    PLT_DEVICE_VLC
-} PLT_DeviceSignature;
-
-/*----------------------------------------------------------------------
-|   PLT_HttpHelper
-+---------------------------------------------------------------------*/
-/**
- The PLT_HttpHelper class is a set of utility functions for manipulating 
- HTTP headers, entities and messages.
- */
-class PLT_HttpHelper {
-public:
-    static bool         IsConnectionKeepAlive(NPT_HttpMessage& message);
-    static bool         IsBodyStreamSeekable(NPT_HttpMessage& message);
-
-    static NPT_Result   ToLog(NPT_LoggerReference logger, int level, const char* prefix, NPT_HttpRequest* request);
-    static NPT_Result   ToLog(NPT_LoggerReference logger, int level, const char* prefix, const NPT_HttpRequest& request);
-    static NPT_Result   ToLog(NPT_LoggerReference logger, int level, const char* prefix, NPT_HttpResponse* response);
-    static NPT_Result   ToLog(NPT_LoggerReference logger, int level, const char* prefix, const NPT_HttpResponse& response);
-
-    static NPT_Result   GetContentType(const NPT_HttpMessage& message, NPT_String& type);
-    static NPT_Result   GetContentLength(const NPT_HttpMessage& message, NPT_LargeSize& len);
-
-    static NPT_Result   GetHost(const NPT_HttpRequest& request, NPT_String& value);
-    static void         SetHost(NPT_HttpRequest& request, const char* host);
-	static PLT_DeviceSignature GetDeviceSignature(const NPT_HttpRequest& request);
-
-    static NPT_Result   SetBody(NPT_HttpMessage& message, NPT_String& text, NPT_HttpEntity** entity = NULL);
-    static NPT_Result   SetBody(NPT_HttpMessage& message, const char* text, NPT_HttpEntity** entity = NULL);
-    static NPT_Result   SetBody(NPT_HttpMessage& message, const void* body, NPT_LargeSize len, NPT_HttpEntity** entity = NULL);
-    static NPT_Result   SetBody(NPT_HttpMessage& message, NPT_InputStreamReference stream, NPT_HttpEntity** entity = NULL);
-    static NPT_Result   GetBody(const NPT_HttpMessage& message, NPT_String& body);
-    static NPT_Result   ParseBody(const NPT_HttpMessage& message, NPT_XmlElementNode*& xml);
-
-	static void			SetBasicAuthorization(NPT_HttpRequest& request, const char* username, const char* password);
-};
-
-/*----------------------------------------------------------------------
-|   PLT_HttpRequestContext
-+---------------------------------------------------------------------*/
-/** 
- The PLT_HttpRequestContext class holds information about the request sent, the
- local & remote ip addresses and ports associated with a connection. It is used
- mostly when processing a HTTP response.
- */
-class PLT_HttpRequestContext : public NPT_HttpRequestContext {
-public:
-    // constructors and destructor
-    PLT_HttpRequestContext(const NPT_HttpRequest& request) : 
-        m_Request(request) {}
-    PLT_HttpRequestContext(const NPT_HttpRequest& request, const NPT_HttpRequestContext& context) :
-        NPT_HttpRequestContext(&context.GetLocalAddress(), &context.GetRemoteAddress()),
-        m_Request(request) {}
-    virtual ~PLT_HttpRequestContext() {}
-    
-    const NPT_HttpRequest& GetRequest() const { return m_Request; }
-	PLT_DeviceSignature GetDeviceSignature() { return PLT_HttpHelper::GetDeviceSignature(m_Request); }
-    
-private:
-    const NPT_HttpRequest& m_Request;
-};
-
-/*----------------------------------------------------------------------
-|   macros
-+---------------------------------------------------------------------*/
-#if defined(NPT_CONFIG_ENABLE_LOGGING)
-#define PLT_LOG_HTTP_MESSAGE_L(_logger, _level, _prefix, _msg) \
-    PLT_HttpHelper::ToLog((_logger), (_level), (_prefix), (_msg))
-#define PLT_LOG_HTTP_MESSAGE(_level, _prefix, _msg) \
-	PLT_HttpHelper::ToLog((_NPT_LocalLogger), (_level), (_prefix), (_msg))
-
-#else /* NPT_CONFIG_ENABLE_LOGGING */
-#define PLT_LOG_HTTP_MESSAGE_L(_logger, _level, _prefix, _msg)
-#define PLT_LOG_HTTP_MESSAGE(_level, _prefix, _msg)
-#endif /* NPT_CONFIG_ENABLE_LOGGING */
-
-/*----------------------------------------------------------------------
-|   PLT_HttpRequestHandler
-+---------------------------------------------------------------------*/
-/**
- The PLT_HttpRequestHandler class delegates the handling of the response of a
- received HTTP request by a HTTP Server.
- */
-class PLT_HttpRequestHandler : public NPT_HttpRequestHandler
-{
-public:
-    PLT_HttpRequestHandler(NPT_HttpRequestHandler* delegate) : 
-        m_Delegate(delegate) {}
-    virtual ~PLT_HttpRequestHandler() {}
-
-    // NPT_HttpRequestHandler methods
-    NPT_Result SetupResponse(NPT_HttpRequest&              request, 
-                             const NPT_HttpRequestContext& context,
-                             NPT_HttpResponse&             response) {
-        return m_Delegate->SetupResponse(request, context, response);
-    }
-
-private:
-    NPT_HttpRequestHandler* m_Delegate;
-};
-
-#endif /* _PLT_HTTP_H_ */

gpac-2.2.1.tar.gz/extra_lib/include/platinum/PltHttpClientTask.h Deleted

@@ -1,123 +0,0 @@
-/*****************************************************************
-|
-|   Platinum - HTTP Client Tasks
-|
-| Copyright (c) 2004-2010, Plutinosoft, LLC.
-| All rights reserved.
-| http://www.plutinosoft.com
-|
-| This program is free software; you can redistribute it and/or
-| modify it under the terms of the GNU General Public License
-| as published by the Free Software Foundation; either version 2
-| of the License, or (at your option) any later version.
-|
-| OEMs, ISVs, VARs and other distributors that combine and 
-| distribute commercially licensed software with Platinum software
-| and do not wish to distribute the source code for the commercially
-| licensed software under version 2, or (at your option) any later
-| version, of the GNU General Public License (the "GPL") must enter
-| into a commercial license agreement with Plutinosoft, LLC.
-| licensing@plutinosoft.com
-|  
-| This program 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 General Public License for more details.
-|
-| You should have received a copy of the GNU General Public License
-| along with this program; see the file LICENSE.txt. If not, write to
-| the Free Software Foundation, Inc., 
-| 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-| http://www.gnu.org/licenses/gpl-2.0.html
-|
-****************************************************************/
-
-/** @file
- HTTP Client tasks
- */
-
-#ifndef _PLT_HTTP_CLIENT_TASK_H_
-#define _PLT_HTTP_CLIENT_TASK_H_
-
-/*----------------------------------------------------------------------
-|   includes
-+---------------------------------------------------------------------*/
-#include "Neptune.h"
-#include "PltHttp.h"
-#include "PltThreadTask.h"
-
-/*----------------------------------------------------------------------
-|   PLT_HttpClientSocketTask class
-+---------------------------------------------------------------------*/
-/**
- The PLT_HttpClientSocketTask class is the base class used to send a HTTP request
- asynchronously using a task (thread). It supports persistent connections
- and HTTP pipelining with automatic fallback and reconnection when HTTP 1.0 
- is used.
- */
-class PLT_HttpClientSocketTask : public PLT_ThreadTask
-{
-friend class PLT_ThreadTask;
-
-public:
-    PLT_HttpClientSocketTask(NPT_HttpRequest* request = NULL, 
-                             bool             wait_forever = false);
-
-    virtual NPT_Result AddRequest(NPT_HttpRequest* request);
-    virtual NPT_Result SetHttpClientConfig(const NPT_HttpClient::Config& config);
-
-protected:
-    virtual ~PLT_HttpClientSocketTask();
-
-protected:
-    // PLT_ThreadTask methods
-    virtual void DoAbort();
-    virtual void DoRun();
-
-    virtual NPT_Result ProcessResponse(NPT_Result                    res, 
-                                       const NPT_HttpRequest&        request, 
-                                       const NPT_HttpRequestContext& context,
-                                       NPT_HttpResponse*             response);
-
-private:
-    NPT_Result GetNextRequest(NPT_HttpRequest*& request, NPT_Timeout timeout_ms);
-
-protected:
-    NPT_HttpClient              m_Client;
-    bool                        m_WaitForever;
-    NPT_Queue<NPT_HttpRequest>  m_Requests;
-};
-
-/*----------------------------------------------------------------------
-|   PLT_HttpClientTask class
-+---------------------------------------------------------------------*/
-/**
- The PLT_HttpClientTask class is a templatized version of PLT_HttpClientSocketTask
- to support arbitrary delegation of HTTP response handling.
- */
-template <class T>
-class PLT_HttpClientTask : public PLT_HttpClientSocketTask
-{
-public:
-    PLT_HttpClientTask<T>(const NPT_HttpUrl& url, T* data) : 
-        PLT_HttpClientSocketTask(new NPT_HttpRequest(url, 
-                                                     "GET", 
-                                                     NPT_HTTP_PROTOCOL_1_1)), 
-                                 m_Data(data) {}
- protected:
-    virtual ~PLT_HttpClientTask<T>() {}
-
-protected:
-    // PLT_HttpClientSocketTask method
-    NPT_Result ProcessResponse(NPT_Result                    res, 
-                               const NPT_HttpRequest&        request, 
-                               const NPT_HttpRequestContext& context, 
-                               NPT_HttpResponse*             response) {
-        return m_Data->ProcessResponse(res, request, context, response);
-    }
-
-protected:
-    T* m_Data;
-};
-
-#endif /* _PLT_HTTP_CLIENT_TASK_H_ */

gpac-2.2.1.tar.gz/extra_lib/include/platinum/PltHttpServer.h Deleted

@@ -1,96 +0,0 @@
-/*****************************************************************
-|
-|   Platinum - HTTP Server
-|
-| Copyright (c) 2004-2010, Plutinosoft, LLC.
-| All rights reserved.
-| http://www.plutinosoft.com
-|
-| This program is free software; you can redistribute it and/or
-| modify it under the terms of the GNU General Public License
-| as published by the Free Software Foundation; either version 2
-| of the License, or (at your option) any later version.
-|
-| OEMs, ISVs, VARs and other distributors that combine and 
-| distribute commercially licensed software with Platinum software
-| and do not wish to distribute the source code for the commercially
-| licensed software under version 2, or (at your option) any later
-| version, of the GNU General Public License (the "GPL") must enter
-| into a commercial license agreement with Plutinosoft, LLC.
-| licensing@plutinosoft.com
-|  
-| This program 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 General Public License for more details.
-|
-| You should have received a copy of the GNU General Public License
-| along with this program; see the file LICENSE.txt. If not, write to
-| the Free Software Foundation, Inc., 
-| 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-| http://www.gnu.org/licenses/gpl-2.0.html
-|
-****************************************************************/
-
-/** @file
- HTTP Server
- */
-
-#ifndef _PLT_HTTP_SERVER_H_
-#define _PLT_HTTP_SERVER_H_
-
-/*----------------------------------------------------------------------
-|   includes
-+---------------------------------------------------------------------*/
-#include "Neptune.h"
-#include "PltHttpServerTask.h"
-
-/*----------------------------------------------------------------------
-|   PLT_HttpServer class
-+---------------------------------------------------------------------*/
-/**
- The PLT_HttpServer class provides an asynchronous way to handle multiple HTTP requests
- concurrently. Pipelining requests and keep-alive connections are supported.
- */
-class PLT_HttpServer : public NPT_HttpRequestHandler,
-                       public NPT_HttpServer
-{
-public:
-    PLT_HttpServer(NPT_IpAddress address = NPT_IpAddress::Any,
-                   NPT_IpPort    port = 0,
-                   bool          allow_random_port_on_bind_failure = false,
-                   NPT_Cardinal  max_clients = 50,
-                   bool          reuse_address = false);
-    virtual ~PLT_HttpServer();
-    
-    // class methods
-    static NPT_Result ServeFile(const NPT_HttpRequest&        request, 
-                                const NPT_HttpRequestContext& context,
-                                NPT_HttpResponse&             response, 
-                                NPT_String                    file_path);
-    static NPT_Result ServeStream(const NPT_HttpRequest&        request, 
-                                  const NPT_HttpRequestContext& context,
-                                  NPT_HttpResponse&             response,
-                                  NPT_InputStreamReference&     stream, 
-                                  const char*                   content_type);
-
-    // NPT_HttpRequestHandler methods
-    virtual NPT_Result SetupResponse(NPT_HttpRequest&              request,
-                                     const NPT_HttpRequestContext& context,
-                                     NPT_HttpResponse&             response);
-
-    // methods
-    virtual NPT_Result   Start();
-    virtual NPT_Result   Stop();
-    virtual unsigned int GetPort() { return m_Port; }
-
-private:
-    PLT_TaskManager*    m_TaskManager;
-    NPT_IpAddress       m_Address;
-    NPT_IpPort          m_Port;
-    bool                m_AllowRandomPortOnBindFailure;
-    bool                m_ReuseAddress;
-    bool                m_Aborted;
-};
-
-#endif /* _PLT_HTTP_SERVER_H_ */

gpac-2.2.1.tar.gz/extra_lib/include/platinum/PltHttpServerListener.h Deleted

@@ -1,55 +0,0 @@
-/*****************************************************************
-|
-|   Platinum - HTTP Server Listener
-|
-| Copyright (c) 2004-2008, Plutinosoft, LLC.
-| All rights reserved.
-| http://www.plutinosoft.com
-|
-| This program is free software; you can redistribute it and/or
-| modify it under the terms of the GNU General Public License
-| as published by the Free Software Foundation; either version 2
-| of the License, or (at your option) any later version.
-|
-| OEMs, ISVs, VARs and other distributors that combine and 
-| distribute commercially licensed software with Platinum software
-| and do not wish to distribute the source code for the commercially
-| licensed software under version 2, or (at your option) any later
-| version, of the GNU General Public License (the "GPL") must enter
-| into a commercial license agreement with Plutinosoft, LLC.
-| 
-| This program 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 General Public License for more details.
-|
-| You should have received a copy of the GNU General Public License
-| along with this program; see the file LICENSE.txt. If not, write to
-| the Free Software Foundation, Inc., 
-| 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-| http://www.gnu.org/licenses/gpl-2.0.html
-|
-****************************************************************/
-#ifndef _PLT_HTTP_SERVER_LISTENER_H_
-#define _PLT_HTTP_SERVER_LISTENER_H_
-
-/*----------------------------------------------------------------------
-|   includes
-+---------------------------------------------------------------------*/
-#include "Neptune.h"
-
-/*----------------------------------------------------------------------
-|   PLT_HttpServerListener Interface
-+---------------------------------------------------------------------*/
-class PLT_HttpServerListener
-{
- public:
-    virtual ~PLT_HttpServerListener() {}
-    
-    virtual NPT_Result ProcessHttpRequest(NPT_HttpRequest&              request, 
-                                          const NPT_HttpRequestContext& context,
-                                          NPT_HttpResponse*&            response,
-                                          bool&                         headers_only) = 0;
-};
-
-#endif /* _PLT_HTTP_SERVER_LISTENER_H_ */

gpac-2.2.1.tar.gz/extra_lib/include/platinum/PltHttpServerTask.h Deleted

@@ -1,163 +0,0 @@
-/*****************************************************************
-|
-|   Platinum - HTTP Server Tasks
-|
-| Copyright (c) 2004-2010, Plutinosoft, LLC.
-| All rights reserved.
-| http://www.plutinosoft.com
-|
-| This program is free software; you can redistribute it and/or
-| modify it under the terms of the GNU General Public License
-| as published by the Free Software Foundation; either version 2
-| of the License, or (at your option) any later version.
-|
-| OEMs, ISVs, VARs and other distributors that combine and 
-| distribute commercially licensed software with Platinum software
-| and do not wish to distribute the source code for the commercially
-| licensed software under version 2, or (at your option) any later
-| version, of the GNU General Public License (the "GPL") must enter
-| into a commercial license agreement with Plutinosoft, LLC.
-| licensing@plutinosoft.com
-|  
-| This program 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 General Public License for more details.
-|
-| You should have received a copy of the GNU General Public License
-| along with this program; see the file LICENSE.txt. If not, write to
-| the Free Software Foundation, Inc., 
-| 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-| http://www.gnu.org/licenses/gpl-2.0.html
-|
-****************************************************************/
-
-/** @file
- HTTP Server Tasks
- */
-
-#ifndef _PLT_HTTP_SERVER_TASK_H_
-#define _PLT_HTTP_SERVER_TASK_H_
-
-/*----------------------------------------------------------------------
-|   includes
-+---------------------------------------------------------------------*/
-#include "Neptune.h"
-#include "PltHttp.h"
-#include "PltDatagramStream.h"
-#include "PltThreadTask.h"
-
-/*----------------------------------------------------------------------
-|   PLT_HttpServerSocketTask class
-+---------------------------------------------------------------------*/
-/** 
- The PLT_HttpServerSocketTask class is a task used for handling one or more HTTP 
- requests from a client. It is created by a PLT_HttpListenTask instance upon
- receiving a connection request. A PLT_HttpServer will handle the delegation for
- setting up the HTTP response.
- */
-class PLT_HttpServerSocketTask : public PLT_ThreadTask
-{
-    friend class PLT_ThreadTask;
-
-public:
-    PLT_HttpServerSocketTask(NPT_Socket* socket, bool stay_alive_forever = false);
-
-protected:
-    virtual ~PLT_HttpServerSocketTask();
-
-protected:
-    // Request callback handler
-    virtual NPT_Result SetupResponse(NPT_HttpRequest&              request, 
-                                     const NPT_HttpRequestContext& context,
-                                     NPT_HttpResponse&             response) = 0;
-
-    // overridables
-    virtual NPT_Result GetInputStream(NPT_InputStreamReference& stream);
-    virtual NPT_Result GetInfo(NPT_SocketInfo& info);
-
-    // PLT_ThreadTask methods
-    virtual void DoAbort() { if (m_Socket) m_Socket->Cancel(); }
-    virtual void DoRun();
-
-private:
-    virtual NPT_Result Read(NPT_BufferedInputStreamReference& buffered_input_stream, 
-                            NPT_HttpRequest*&                 request,
-                            NPT_HttpRequestContext*           context = NULL);
-    virtual NPT_Result Write(NPT_HttpResponse* response, 
-                             bool&             keep_alive, 
-                             bool              headers_only = false);
-    virtual NPT_Result RespondToClient(NPT_HttpRequest&              request, 
-                                       const NPT_HttpRequestContext& context,
-                                       NPT_HttpResponse*&            response);
-    virtual NPT_Result SendResponseHeaders(NPT_HttpResponse* response,
-                                           NPT_OutputStream& output_stream,
-                                           bool&             keep_alive);
-    virtual NPT_Result SendResponseBody(NPT_HttpResponse* response,
-                                        NPT_OutputStream& output_stream);
-
-protected:
-    NPT_Socket*         m_Socket;
-    bool                m_StayAliveForever;
-};
-
-/*----------------------------------------------------------------------
-|   PLT_HttpServerTask class
-+---------------------------------------------------------------------*/
-/**
- The PLT_HttpServerTask class is a version of PLT_HttpServerSocketTask that supports 
- delegation of HTTP request handling.
- */
-class PLT_HttpServerTask : public PLT_HttpServerSocketTask
-{
-public:
-    PLT_HttpServerTask(NPT_HttpRequestHandler* handler, 
-                       NPT_Socket*             socket, 
-                       bool                    keep_alive = false) : 
-        PLT_HttpServerSocketTask(socket, keep_alive), m_Handler(handler) {}
-
-protected:
-    virtual ~PLT_HttpServerTask() {}
-
-    NPT_Result SetupResponse(NPT_HttpRequest&              request, 
-                             const NPT_HttpRequestContext& context,
-                             NPT_HttpResponse&             response) {
-        return m_Handler->SetupResponse(request, context, response);
-    }
-
-protected:
-    NPT_HttpRequestHandler* m_Handler;
-};
-
-/*----------------------------------------------------------------------
-|   PLT_HttpListenTask class
-+---------------------------------------------------------------------*/
-/**
- The PLT_HttpListenTask class is used by a PLT_HttpServer to listen for incoming
- connections and spawn a new task for handling each request.
- */
-class PLT_HttpListenTask : public PLT_ThreadTask
-{
-public:
-    PLT_HttpListenTask(NPT_HttpRequestHandler* handler, 
-                       NPT_TcpServerSocket*    socket, 
-                       bool                    owns_socket = true) : 
-        m_Handler(handler), m_Socket(socket), m_OwnsSocket(owns_socket) {}
-
-protected:
-    virtual ~PLT_HttpListenTask() { 
-        if (m_OwnsSocket && m_Socket) delete m_Socket;
-    }
-
-protected:
-    // PLT_ThreadTask methods
-    virtual void DoAbort() { if (m_Socket) m_Socket->Cancel(); }
-    virtual void DoRun();
-
-protected:
-    NPT_HttpRequestHandler* m_Handler;
-    NPT_TcpServerSocket*    m_Socket;
-    bool                    m_OwnsSocket;
-};
-
-#endif /* _PLT_HTTP_SERVER_TASK_H_ */

gpac-2.2.1.tar.gz/extra_lib/include/platinum/PltLeaks.h Deleted

@@ -1,51 +0,0 @@
-/*****************************************************************
-|
-|   Platinum - Leaks
-|
-| Copyright (c) 2004-2010, Plutinosoft, LLC.
-| All rights reserved.
-| http://www.plutinosoft.com
-|
-| This program is free software; you can redistribute it and/or
-| modify it under the terms of the GNU General Public License
-| as published by the Free Software Foundation; either version 2
-| of the License, or (at your option) any later version.
-|
-| OEMs, ISVs, VARs and other distributors that combine and 
-| distribute commercially licensed software with Platinum software
-| and do not wish to distribute the source code for the commercially
-| licensed software under version 2, or (at your option) any later
-| version, of the GNU General Public License (the "GPL") must enter
-| into a commercial license agreement with Plutinosoft, LLC.
-| licensing@plutinosoft.com
-|  
-| This program 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 General Public License for more details.
-|
-| You should have received a copy of the GNU General Public License
-| along with this program; see the file LICENSE.txt. If not, write to
-| the Free Software Foundation, Inc., 
-| 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-| http://www.gnu.org/licenses/gpl-2.0.html
-|
-****************************************************************/
-
-#ifndef _PLT_LEAKS_H_
-#define _PLT_LEAKS_H_ 
-
-/*----------------------------------------------------------------------
-|   functions
-+---------------------------------------------------------------------*/
-#if defined(__cplusplus)
-extern "C" {
-#endif 
-
-void PLT_Leak_Enable(void);
-
-#if defined(__cplusplus)
-}
-#endif 
-
-#endif /* _PLT_LEAKS_H_ */

gpac-2.2.1.tar.gz/extra_lib/include/platinum/PltMediaBrowser.h Deleted

@@ -1,156 +0,0 @@
-/*****************************************************************
-|
-|   Platinum - AV Media Browser (Media Server Control Point)
-|
-| Copyright (c) 2004-2010, Plutinosoft, LLC.
-| All rights reserved.
-| http://www.plutinosoft.com
-|
-| This program is free software; you can redistribute it and/or
-| modify it under the terms of the GNU General Public License
-| as published by the Free Software Foundation; either version 2
-| of the License, or (at your option) any later version.
-|
-| OEMs, ISVs, VARs and other distributors that combine and 
-| distribute commercially licensed software with Platinum software
-| and do not wish to distribute the source code for the commercially
-| licensed software under version 2, or (at your option) any later
-| version, of the GNU General Public License (the "GPL") must enter
-| into a commercial license agreement with Plutinosoft, LLC.
-| licensing@plutinosoft.com
-|  
-| This program 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 General Public License for more details.
-|
-| You should have received a copy of the GNU General Public License
-| along with this program; see the file LICENSE.txt. If not, write to
-| the Free Software Foundation, Inc., 
-| 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-| http://www.gnu.org/licenses/gpl-2.0.html
-|
-****************************************************************/
-
-/** @file
- UPnP AV Media Controller implementation.
- */
-
-#ifndef _PLT_MEDIA_BROWSER_H_
-#define _PLT_MEDIA_BROWSER_H_
-
-/*----------------------------------------------------------------------
-|   includes
-+---------------------------------------------------------------------*/
-#include "PltCtrlPoint.h"
-#include "PltMediaItem.h"
-
-/*----------------------------------------------------------------------
-|   PLT_BrowseInfo
-+---------------------------------------------------------------------*/
-/**
- The PLT_BrowseInfo struct is used to marshall Browse or Search action 
- response results across different threads of execution.
- */
-typedef struct {
-    NPT_String                   object_id;
-    PLT_MediaObjectListReference items;
-    NPT_UInt32                   si;
-    NPT_UInt32                   nr;
-    NPT_UInt32                   tm;
-    NPT_UInt32                   uid;
-} PLT_BrowseInfo;
-
-/*----------------------------------------------------------------------
-|   PLT_MediaBrowserDelegate
-+---------------------------------------------------------------------*/
-/**
- The PLT_MediaBrowserDelegate class is an interface for receiving PLT_MediaBrowser
- events or action responses.
- */
-class PLT_MediaBrowserDelegate
-{
-public:
-    virtual ~PLT_MediaBrowserDelegate() {}
-    
-    virtual bool OnMSAdded(PLT_DeviceDataReference& /* device */) { return true; }
-    virtual void OnMSRemoved(PLT_DeviceDataReference& /* device */) {}
-    virtual void OnMSStateVariablesChanged(
-        PLT_Service*                  /*service*/, 
-        NPT_List<PLT_StateVariable*>* /*vars*/) {}
-
-    // ContentDirectory
-    virtual void OnBrowseResult(
-        NPT_Result               /*res*/, 
-        PLT_DeviceDataReference& /*device*/, 
-        PLT_BrowseInfo*          /*info*/, 
-        void*                    /*userdata*/) {}
-
-	virtual void OnSearchResult(
-        NPT_Result               /*res*/, 
-        PLT_DeviceDataReference& /*device*/, 
-        PLT_BrowseInfo*          /*info*/, 
-        void*                    /*userdata*/) {}
-};
-
-/*----------------------------------------------------------------------
-|   PLT_MediaBrowser
-+---------------------------------------------------------------------*/
-/**
- The PLT_MediaBrowser class implements a UPnP AV Media Server control point.
- */
-class PLT_MediaBrowser : public PLT_CtrlPointListener
-{
-public:
-    PLT_MediaBrowser(PLT_CtrlPointReference&   ctrl_point,
-                     PLT_MediaBrowserDelegate* delegate = NULL);
-    virtual ~PLT_MediaBrowser();
-
-    // ContentDirectory service
-    virtual NPT_Result Browse(PLT_DeviceDataReference& device, 
-                              const char*              object_id, 
-                              NPT_UInt32               start_index,
-                              NPT_UInt32               count = 30, // DLNA recommendations
-                              bool                     browse_metadata = false,
-                              const char*              filter = "dc:date,upnp:genre,res,res@duration,res@size,upnp:albumArtURI,upnp:originalTrackNumber,upnp:album,upnp:artist,upnp:author", // explicitely specify res otherwise WMP won't return a URL!
-                              const char*              sort_criteria = "",
-                              void*                    userdata = NULL);
-
-	virtual NPT_Result Search(PLT_DeviceDataReference& device, 
-		                      const char*              container_id,
-							  const char*              search_criteria,
-				              NPT_UInt32               start_index,
-					          NPT_UInt32               count = 30, // DLNA recommendations
-                              const char*              filter = "dc:date,upnp:genre,res,res@duration,res@size,upnp:albumArtURI,upnp:originalTrackNumber,upnp:album,upnp:artist,upnp:author", // explicitely specify res otherwise WMP won't return a URL!
-						  	  void*                    userdata = NULL);
-
-    // methods
-    virtual const NPT_Lock<PLT_DeviceDataReferenceList>& GetMediaServers() { return m_MediaServers; }
-    virtual NPT_Result FindServer(const char* uuid, PLT_DeviceDataReference& device);    
-    virtual void SetDelegate(PLT_MediaBrowserDelegate* delegate) { m_Delegate = delegate; }
-
-protected:
-    // PLT_CtrlPointListener methods
-    virtual NPT_Result OnDeviceAdded(PLT_DeviceDataReference& device);
-    virtual NPT_Result OnDeviceRemoved(PLT_DeviceDataReference& device);
-    virtual NPT_Result OnActionResponse(NPT_Result res, PLT_ActionReference& action, void* userdata);
-    virtual NPT_Result OnEventNotify(PLT_Service* service, NPT_List<PLT_StateVariable*>* vars);
-    
-    // ContentDirectory service responses
-    virtual NPT_Result OnBrowseResponse(NPT_Result               res, 
-                                        PLT_DeviceDataReference& device, 
-                                        PLT_ActionReference&     action, 
-                                        void*                    userdata);
-
-	virtual NPT_Result OnSearchResponse(NPT_Result               res, 
-                                        PLT_DeviceDataReference& device, 
-                                        PLT_ActionReference&     action, 
-                                        void*                    userdata);
-    
-protected:
-    PLT_CtrlPointReference                m_CtrlPoint;
-    PLT_MediaBrowserDelegate*             m_Delegate;
-    NPT_Lock<PLT_DeviceDataReferenceList> m_MediaServers;
-};
-
-#endif /* _PLT_MEDIA_BROWSER_H_ */

gpac-2.2.1.tar.gz/extra_lib/include/platinum/PltMediaBrowserListener.h Deleted

@@ -1,80 +0,0 @@
-/*****************************************************************
-|
-|   Platinum - AV Media Browser Listener
-|
-| Copyright (c) 2004-2008, Plutinosoft, LLC.
-| All rights reserved.
-| http://www.plutinosoft.com
-|
-| This program is free software; you can redistribute it and/or
-| modify it under the terms of the GNU General Public License
-| as published by the Free Software Foundation; either version 2
-| of the License, or (at your option) any later version.
-|
-| OEMs, ISVs, VARs and other distributors that combine and 
-| distribute commercially licensed software with Platinum software
-| and do not wish to distribute the source code for the commercially
-| licensed software under version 2, or (at your option) any later
-| version, of the GNU General Public License (the "GPL") must enter
-| into a commercial license agreement with Plutinosoft, LLC.
-| 
-| This program 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 General Public License for more details.
-|
-| You should have received a copy of the GNU General Public License
-| along with this program; see the file LICENSE.txt. If not, write to
-| the Free Software Foundation, Inc., 
-| 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-| http://www.gnu.org/licenses/gpl-2.0.html
-|
-****************************************************************/
-
-#ifndef _PLT_MEDIA_BROWSER_LISTENER_H_
-#define _PLT_MEDIA_BROWSER_LISTENER_H_
-
-/*----------------------------------------------------------------------
-|   includes
-+---------------------------------------------------------------------*/
-#include "PltMediaItem.h"
-#include "PltDeviceData.h"
-
-/*----------------------------------------------------------------------
-|   PLT_BrowseInfo
-+---------------------------------------------------------------------*/
-class PLT_BrowseInfo {
-public:
-    PLT_BrowseInfo() : nr(0), tm(0), uid(0) {}
-
-    NPT_String                   object_id;
-    PLT_MediaObjectListReference items;
-    NPT_UInt32                   nr;
-    NPT_UInt32                   tm;
-    NPT_UInt32                   uid;
-};
-
-/*----------------------------------------------------------------------
-|   PLT_MediaBrowserListener class
-+---------------------------------------------------------------------*/
-class PLT_MediaBrowserListener
-{
-public:
-    virtual ~PLT_MediaBrowserListener() {}
-
-    virtual void OnMSAddedRemoved(
-        PLT_DeviceDataReference& /*device*/, 
-        int                      /*added*/) {}
-
-    virtual void OnMSStateVariablesChanged(
-        PLT_Service*                  /*service*/, 
-        NPT_List<PLT_StateVariable*>* /*vars*/) {}
-
-    virtual void OnMSBrowseResult(
-        NPT_Result               /*res*/, 
-        PLT_DeviceDataReference& /*device*/, 
-        PLT_BrowseInfo*          /*info*/, 
-        void*                    /*userdata*/) {}
-};
-
-#endif /* _PLT_MEDIA_BROWSER_LISTENER_H_ */

gpac-2.2.1.tar.gz/extra_lib/include/platinum/PltMediaCache.h Deleted

@@ -1,203 +0,0 @@
-/*****************************************************************
-|
-|   Platinum - AV Media Cache
-|
-| Copyright (c) 2004-2010, Plutinosoft, LLC.
-| All rights reserved.
-| http://www.plutinosoft.com
-|
-| This program is free software; you can redistribute it and/or
-| modify it under the terms of the GNU General Public License
-| as published by the Free Software Foundation; either version 2
-| of the License, or (at your option) any later version.
-|
-| OEMs, ISVs, VARs and other distributors that combine and 
-| distribute commercially licensed software with Platinum software
-| and do not wish to distribute the source code for the commercially
-| licensed software under version 2, or (at your option) any later
-| version, of the GNU General Public License (the "GPL") must enter
-| into a commercial license agreement with Plutinosoft, LLC.
-| licensing@plutinosoft.com
-|  
-| This program 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 General Public License for more details.
-|
-| You should have received a copy of the GNU General Public License
-| along with this program; see the file LICENSE.txt. If not, write to
-| the Free Software Foundation, Inc., 
-| 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-| http://www.gnu.org/licenses/gpl-2.0.html
-|
-****************************************************************/
-
-/** @file
- Simple Object Caching utility.
- */
-
-#ifndef _PLT_MEDIA_CACHE_H_
-#define _PLT_MEDIA_CACHE_H_
-
-/*----------------------------------------------------------------------
-|   includes
-+---------------------------------------------------------------------*/
-#include "Neptune.h"
-
-/*----------------------------------------------------------------------
-|   PLT_MediaCache
-+---------------------------------------------------------------------*/
-/**
- The PLT_MediaCache template provides a way to hold references to object in 
- memory. 
- */ 
-template <typename T, typename U>
-class PLT_MediaCache
-{
-public:
-    typedef typename NPT_Map<NPT_String,T>::Entry ElementEntry;
-    typedef typename NPT_List<ElementEntry*>::Iterator ElementIterator;
-
-    PLT_MediaCache<T,U>() {}
-    virtual ~PLT_MediaCache<T,U>() {}
-
-    NPT_Result Put(const char* root, const char* key, T& value, U* tag = NULL);
-    NPT_Result Get(const char* root, const char* key, T& value, U* tag = NULL);
-    NPT_Result Clear(const char* root, const char* key);
-    NPT_Result Clear(const char* root = NULL);
-
-private:
-    // methods
-    NPT_String GenerateKey(const char* root, const char* key);
-
-private:
-    // members
-    NPT_Mutex              m_Mutex;
-    NPT_Map<NPT_String, T> m_Items;
-    NPT_Map<NPT_String, U> m_Tags;
-};
-
-/*----------------------------------------------------------------------
-|   PLT_MediaCache::GenerateKey
-+---------------------------------------------------------------------*/
-template <typename T, typename U>
-inline
-NPT_String
-PLT_MediaCache<T,U>::GenerateKey(const char* root, const char* key)
-{
-    // TODO: There could be collision
-    NPT_String result = root;
-    result += "/";
-    result += key;
-    return result;
-}
-
-/*----------------------------------------------------------------------
-|   PLT_MediaCache::Put
-+---------------------------------------------------------------------*/
-template <typename T, typename U>
-inline
-NPT_Result
-PLT_MediaCache<T,U>::Put(const char* root,
-                         const char* key, 
-                         T&          value,
-                         U*          tag)
-{
-    NPT_AutoLock lock(m_Mutex);
-
-    NPT_String fullkey = GenerateKey(root, key);
-    if (fullkey.GetLength() == 0) return NPT_ERROR_INVALID_PARAMETERS;
-
-    m_Items.Erase(fullkey);
-    NPT_CHECK(m_Items.Put(fullkey, value));
-    
-    if (tag) NPT_CHECK(m_Tags.Put(fullkey, *tag));
-    
-    return NPT_SUCCESS;
-}
-
-/*----------------------------------------------------------------------
-|   PLT_MediaCache::Get
-+---------------------------------------------------------------------*/
-template <typename T, typename U>
-inline
-NPT_Result
-PLT_MediaCache<T,U>::Get(const char* root,
-                         const char* key,
-                         T&          value,
-                         U*          tag /* = NULL */)
-{
-    NPT_AutoLock lock(m_Mutex);
-
-    NPT_String fullkey = GenerateKey(root, key);
-    if (fullkey.GetLength() == 0) return NPT_ERROR_INVALID_PARAMETERS;
-    
-    T* _value = NULL;
-    NPT_CHECK(m_Items.Get(fullkey, _value));
-    
-    U* _tag;
-    if (tag) {
-        m_Tags.Get(fullkey, _tag);
-        if (_tag) *tag = *_tag;
-    }
-
-    value = *_value;
-    return NPT_SUCCESS;
-}
-
-/*----------------------------------------------------------------------
-|   PLT_MediaCache::Clear
-+---------------------------------------------------------------------*/
-template <typename T, typename U>
-inline
-NPT_Result 
-PLT_MediaCache<T,U>::Clear(const char* root, const char* key) 
-{
-    NPT_AutoLock lock(m_Mutex);
-
-    NPT_String fullkey = GenerateKey(root, key);
-    if (fullkey.GetLength() == 0) return NPT_ERROR_INVALID_PARAMETERS;
-
-    ElementIterator entries = m_Items.GetEntries().GetFirstItem();
-    ElementIterator entry;
-    while (entries) {
-        entry = entries++;
-        if ((*entry)->GetKey() == (fullkey)) {
-            m_Items.Erase(fullkey);
-            m_Tags.Erase(fullkey);
-            return NPT_SUCCESS;
-        }
-    }
-
-    return NPT_ERROR_NO_SUCH_ITEM;
-}
-
-/*----------------------------------------------------------------------
-|   PLT_MediaCache::Clear
-+---------------------------------------------------------------------*/
-template <typename T, typename U>
-inline
-NPT_Result
-PLT_MediaCache<T,U>::Clear(const char* root)
-{
-    NPT_AutoLock lock(m_Mutex);
-
-    if (!root || root0=='\0') 
-        return m_Items.Clear();
-
-    NPT_String key = GenerateKey(root, "");
-    ElementIterator entries = m_Items.GetEntries().GetFirstItem();
-    ElementIterator entry;
-    while (entries) {
-        entry = entries++;
-        NPT_String entry_key = (*entry)->GetKey();
-        if (entry_key.StartsWith(key)) {
-            m_Items.Erase(entry_key);
-            m_Tags.Erase(entry_key);
-        }
-    }
-
-    return NPT_SUCCESS;
-}
-
-#endif /* _PLT_MEDIA_CACHE_H_ */

gpac-2.2.1.tar.gz/extra_lib/include/platinum/PltMediaConnect.h Deleted

@@ -1,110 +0,0 @@
-/*****************************************************************
-|
-|      Platinum - AV Media Connect Device
-|
-| Copyright (c) 2004-2010, Plutinosoft, LLC.
-| All rights reserved.
-| http://www.plutinosoft.com
-|
-| This program is free software; you can redistribute it and/or
-| modify it under the terms of the GNU General Public License
-| as published by the Free Software Foundation; either version 2
-| of the License, or (at your option) any later version.
-|
-| OEMs, ISVs, VARs and other distributors that combine and 
-| distribute commercially licensed software with Platinum software
-| and do not wish to distribute the source code for the commercially
-| licensed software under version 2, or (at your option) any later
-| version, of the GNU General Public License (the "GPL") must enter
-| into a commercial license agreement with Plutinosoft, LLC.
-| licensing@plutinosoft.com
-|  licensing@plutinosoft.com
-|  
-| This program 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 General Public License for more details.
-|
-| You should have received a copy of the GNU General Public License
-| along with this program; see the file LICENSE.txt. If not, write to
-| the Free Software Foundation, Inc., 
-| 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-| http://www.gnu.org/licenses/gpl-2.0.html
-|
-****************************************************************/
-
-#ifndef _PLT_MEDIA_CONNECT_H_
-#define _PLT_MEDIA_CONNECT_H_
-
-/*----------------------------------------------------------------------
-|       includes
-+---------------------------------------------------------------------*/
-#include "Neptune.h"
-#include "PltFileMediaServer.h"
-
-/*----------------------------------------------------------------------
-|   PLT_MediaConnect
-+---------------------------------------------------------------------*/
-class PLT_MediaConnect : public PLT_MediaServer
-{
-public:
-    // class methods
-    static NPT_Result GetMappedObjectId(const char* object_id, 
-                                        NPT_String& mapped_object_id);
-    
-    // constructor
-    PLT_MediaConnect(const char*  friendly_name,
-                     bool         add_hostname = true,
-                     const char*  udn = NULL,
-                     NPT_UInt16   port = 0,
-                     bool         port_rebind = false);
-
-protected:
-    virtual ~PLT_MediaConnect();
-    
-    // PLT_DeviceHost methods
-    virtual NPT_Result SetupServices();
-    virtual NPT_Result OnAction(PLT_ActionReference&          action, 
-                                const PLT_HttpRequestContext& context);
-    virtual NPT_Result ProcessGetDescription(NPT_HttpRequest&              request,
-                                             const NPT_HttpRequestContext& context,
-                                             NPT_HttpResponse&             response);
-    virtual NPT_Result ProcessGetSCPD(PLT_Service*                  service,
-                                      NPT_HttpRequest&              request,
-                                      const NPT_HttpRequestContext& context,
-                                      NPT_HttpResponse&             response);
-
-    // X_MS_MediaReceiverRegistrar
-    virtual NPT_Result OnIsAuthorized(PLT_ActionReference&  action);
-    virtual NPT_Result OnRegisterDevice(PLT_ActionReference&  action);
-    virtual NPT_Result OnIsValidated(PLT_ActionReference&  action);
-
-protected:
-	NPT_Mutex   m_Lock;
-    bool        m_AddHostname;
-};
-
-/*----------------------------------------------------------------------
- |   PLT_FileMediaConnectDelegate class
- +---------------------------------------------------------------------*/
-class PLT_FileMediaConnectDelegate : public PLT_FileMediaServerDelegate
-{
-public:
-    // constructor & destructor
-    PLT_FileMediaConnectDelegate(const char* url_root, const char* file_root) :
-        PLT_FileMediaServerDelegate(url_root, file_root) {}
-    virtual ~PLT_FileMediaConnectDelegate() {}
-    
-    // PLT_FileMediaServerDelegate methods
-    virtual NPT_Result GetFilePath(const char* object_id, NPT_String& filepath);
-    virtual NPT_Result OnSearchContainer(PLT_ActionReference&          action, 
-                                         const char*                   object_id, 
-                                         const char*                   search_criteria,
-                                         const char*                   filter,
-                                         NPT_UInt32                    starting_index,
-                                         NPT_UInt32                    requested_count,
-                                         const char*                   sort_criteria, 
-                                         const PLT_HttpRequestContext& context);
-};
-
-#endif /* _PLT_MEDIA_CONNECT_H_ */

gpac-2.2.1.tar.gz/extra_lib/include/platinum/PltMediaController.h Deleted

@@ -1,344 +0,0 @@
-/*****************************************************************
-|
-|   Platinum - AV Media Controller (Media Renderer Control Point)
-|
-| Copyright (c) 2004-2010, Plutinosoft, LLC.
-| All rights reserved.
-| http://www.plutinosoft.com
-|
-| This program is free software; you can redistribute it and/or
-| modify it under the terms of the GNU General Public License
-| as published by the Free Software Foundation; either version 2
-| of the License, or (at your option) any later version.
-|
-| OEMs, ISVs, VARs and other distributors that combine and 
-| distribute commercially licensed software with Platinum software
-| and do not wish to distribute the source code for the commercially
-| licensed software under version 2, or (at your option) any later
-| version, of the GNU General Public License (the "GPL") must enter
-| into a commercial license agreement with Plutinosoft, LLC.
-| licensing@plutinosoft.com
-| 
-| This program 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 General Public License for more details.
-|
-| You should have received a copy of the GNU General Public License
-| along with this program; see the file LICENSE.txt. If not, write to
-| the Free Software Foundation, Inc., 
-| 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-| http://www.gnu.org/licenses/gpl-2.0.html
-|
-****************************************************************/
-
-#ifndef _PLT_MEDIA_CONTROLLER_H_
-#define _PLT_MEDIA_CONTROLLER_H_
-
-/*----------------------------------------------------------------------
-|   includes
-+---------------------------------------------------------------------*/
-#include "PltCtrlPoint.h"
-#include "PltMediaItem.h"
-
-/*----------------------------------------------------------------------
-|   Defines
-+---------------------------------------------------------------------*/
-typedef NPT_List<NPT_String> PLT_StringList;
-
-typedef struct {
-    PLT_StringList play_media;
-    PLT_StringList rec_media;
-    PLT_StringList rec_quality_modes;
-} PLT_DeviceCapabilities;
-
-typedef struct {
-    NPT_UInt32    num_tracks;
-    NPT_TimeStamp media_duration;
-    NPT_String    cur_uri;
-    NPT_String    cur_metadata;
-    NPT_String    next_uri;
-    NPT_String    next_metadata;
-    NPT_String    play_medium;
-    NPT_String    rec_medium;
-    NPT_String    write_status;
-} PLT_MediaInfo;
-
-typedef struct {
-    NPT_UInt32    track;
-    NPT_TimeStamp track_duration;
-    NPT_String    track_metadata;
-    NPT_String    track_uri;
-    NPT_TimeStamp rel_time;
-    NPT_TimeStamp abs_time;
-    NPT_Int32     rel_count;
-    NPT_Int32     abs_count;
-} PLT_PositionInfo;
-
-typedef struct {
-    NPT_String cur_transport_state;
-    NPT_String cur_transport_status;
-    NPT_String cur_speed;
-} PLT_TransportInfo;
-
-typedef struct {
-    NPT_String play_mode;
-    NPT_String rec_quality_mode;
-} PLT_TransportSettings;
-
-typedef struct {
-    NPT_UInt32 rcs_id;
-    NPT_UInt32 avtransport_id;
-    NPT_String protocol_info;
-    NPT_String peer_connection_mgr;
-    NPT_UInt32 peer_connection_id;
-    NPT_String direction;
-    NPT_String status;
-} PLT_ConnectionInfo;
-
-/*----------------------------------------------------------------------
-|   PLT_MediaControllerDelegate
-+---------------------------------------------------------------------*/
-class PLT_MediaControllerDelegate
-{
-public:
-    virtual ~PLT_MediaControllerDelegate() {}
-
-    virtual bool OnMRAdded(PLT_DeviceDataReference& /* device */) { return true; }
-    virtual void OnMRRemoved(PLT_DeviceDataReference& /* device */) {}
-    virtual void OnMRStateVariablesChanged(PLT_Service*                  /* service */, 
-                                           NPT_List<PLT_StateVariable*>* /* vars */) {}
-
-    // AVTransport
-    virtual void OnGetCurrentTransportActionsResult(
-        NPT_Result               /* res */, 
-        PLT_DeviceDataReference& /* device */,
-        PLT_StringList*          /* actions */, 
-        void*                    /* userdata */) {}
-
-    virtual void OnGetDeviceCapabilitiesResult(
-        NPT_Result               /* res */, 
-        PLT_DeviceDataReference& /* device */,
-        PLT_DeviceCapabilities*  /* capabilities */,
-        void*                    /* userdata */) {}
-
-    virtual void OnGetMediaInfoResult(
-        NPT_Result               /* res */,
-        PLT_DeviceDataReference& /* device */,
-        PLT_MediaInfo*           /* info */,
-        void*                    /* userdata */) {}
-
-    virtual void OnGetPositionInfoResult(
-        NPT_Result               /* res */,
-        PLT_DeviceDataReference& /* device */,
-        PLT_PositionInfo*        /* info */,
-        void*                    /* userdata */) {}
-
-    virtual void OnGetTransportInfoResult(
-        NPT_Result               /* res */,
-        PLT_DeviceDataReference& /* device */,
-        PLT_TransportInfo*       /* info */,
-        void*                    /* userdata */) {}
-
-    virtual void OnGetTransportSettingsResult(
-        NPT_Result               /* res */,
-        PLT_DeviceDataReference& /* device */,
-        PLT_TransportSettings*   /* settings */,
-        void*                    /* userdata */) {}
-
-    virtual void OnNextResult(
-        NPT_Result               /* res */,
-        PLT_DeviceDataReference& /* device */,
-        void*                    /* userdata */) {}
-
-    virtual void OnPauseResult(
-        NPT_Result               /* res */,
-        PLT_DeviceDataReference& /* device */,
-        void*                    /* userdata */) {}  
-
-    virtual void OnPlayResult(
-        NPT_Result               /* res */,
-        PLT_DeviceDataReference& /* device */,
-        void*                    /* userdata */) {}
-
-    virtual void OnPreviousResult(
-        NPT_Result               /* res */,
-        PLT_DeviceDataReference& /* device */,
-        void*                    /* userdata */) {}
-
-    virtual void OnSeekResult(
-        NPT_Result               /* res */,
-        PLT_DeviceDataReference& /* device */,
-        void*                    /* userdata */) {}
-
-    virtual void OnSetAVTransportURIResult(
-        NPT_Result               /* res */,
-        PLT_DeviceDataReference& /* device */,
-        void*                    /* userdata */) {}
-
-    virtual void OnSetPlayModeResult(
-        NPT_Result               /* res */,
-        PLT_DeviceDataReference& /* device */,
-        void*                    /* userdata */) {}
-
-    virtual void OnStopResult(
-        NPT_Result               /* res */,
-        PLT_DeviceDataReference& /* device */,
-        void*                    /* userdata */) {}
-        
-    // ConnectionManager
-    virtual void OnGetCurrentConnectionIDsResult(
-        NPT_Result               /* res */,
-        PLT_DeviceDataReference& /* device */,
-        PLT_StringList*          /* ids */,
-        void*                    /* userdata */) {}
-
-    virtual void OnGetCurrentConnectionInfoResult(
-        NPT_Result               /* res */,
-        PLT_DeviceDataReference& /* device */,
-        PLT_ConnectionInfo*      /* info */,
-        void*                    /* userdata */) {}
-
-    virtual void OnGetProtocolInfoResult(
-        NPT_Result               /* res */,
-        PLT_DeviceDataReference& /* device */,
-        PLT_StringList*          /* sources */,
-        PLT_StringList*          /* sinks */,
-        void*                    /* userdata */) {}
-        
-    // RenderingControl
-    virtual void OnSetMuteResult(
-        NPT_Result               /* res */,
-        PLT_DeviceDataReference& /* device */,
-        void*                    /* userdata */) {}
-
-    virtual void OnGetMuteResult(
-        NPT_Result               /* res */,
-        PLT_DeviceDataReference& /* device */,
-        const char*              /* channel */,
-        bool                     /* mute */,
-        void*                    /* userdata */) {}
-
-	virtual void OnSetVolumeResult(
-        NPT_Result               /* res */,
-        PLT_DeviceDataReference& /* device */,
-        void*                    /* userdata */) {}
-
-	virtual void OnGetVolumeResult(
-        NPT_Result               /* res */,
-        PLT_DeviceDataReference& /* device */,
-		const char*              /* channel */,
-    	NPT_UInt32				 /* volume */,
-	    void*                    /* userdata */) {}
-};
-
-/*----------------------------------------------------------------------
-|   PLT_MediaController
-+---------------------------------------------------------------------*/
-class PLT_MediaController : public PLT_CtrlPointListener
-{
-public:
-    PLT_MediaController(PLT_CtrlPointReference&      ctrl_point, 
-                        PLT_MediaControllerDelegate* delegate = NULL);
-    virtual ~PLT_MediaController();
-
-    // public methods
-    virtual void SetDelegate(PLT_MediaControllerDelegate* delegate) {
-        m_Delegate = delegate;
-    }
-
-    // PLT_CtrlPointListener methods
-    virtual NPT_Result OnDeviceAdded(PLT_DeviceDataReference& device);
-    virtual NPT_Result OnDeviceRemoved(PLT_DeviceDataReference& device);
-    virtual NPT_Result OnActionResponse(NPT_Result res, PLT_ActionReference& action, void* userdata);
-    virtual NPT_Result OnEventNotify(PLT_Service* service, NPT_List<PLT_StateVariable*>* vars);
-
-    // AVTransport
-    NPT_Result GetCurrentTransportActions(PLT_DeviceDataReference& device, NPT_UInt32 instance_id, void* userdata);
-    NPT_Result GetDeviceCapabilities(PLT_DeviceDataReference& device, NPT_UInt32 instance_id, void* userdata);
-    NPT_Result GetMediaInfo(PLT_DeviceDataReference& device, NPT_UInt32 instance_id, void* userdata);
-    NPT_Result GetPositionInfo(PLT_DeviceDataReference& device,  NPT_UInt32 instance_id, void* userdata);
-    NPT_Result GetTransportInfo(PLT_DeviceDataReference& device, NPT_UInt32 instance_id, void* userdata);
-    NPT_Result GetTransportSettings(PLT_DeviceDataReference& device, NPT_UInt32 instance_id, void* userdata);
-    NPT_Result Next(PLT_DeviceDataReference& device, NPT_UInt32 instance_id, void* userdata);
-    NPT_Result Pause(PLT_DeviceDataReference& device, NPT_UInt32 instance_id, void* userdata);
-    NPT_Result Play(PLT_DeviceDataReference&  device, NPT_UInt32 instance_id, NPT_String speed, void* userdata);
-    NPT_Result Previous(PLT_DeviceDataReference& device, NPT_UInt32 instance_id, void* userdata);
-    NPT_Result Seek(PLT_DeviceDataReference&  device, NPT_UInt32 instance_id, NPT_String unit, NPT_String target, void* userdata);
-    bool       CanSetNextAVTransportURI(PLT_DeviceDataReference& device);
-    NPT_Result SetAVTransportURI(PLT_DeviceDataReference& device, NPT_UInt32 instance_id, const char* uri, const char* metadata, void* userdata);
-    NPT_Result SetNextAVTransportURI(PLT_DeviceDataReference& device, NPT_UInt32 instance_id, const char* next_uri, const char* next_metadata, void* userdata);
-    NPT_Result SetPlayMode(PLT_DeviceDataReference&  device, NPT_UInt32 instance_id, NPT_String new_play_mode, void* userdata);
-    NPT_Result Stop(PLT_DeviceDataReference& device, NPT_UInt32 instance_id, void* userdata);
-
-    // ConnectionManager
-    NPT_Result GetCurrentConnectionIDs(PLT_DeviceDataReference& device, void* userdata);
-    NPT_Result GetCurrentConnectionInfo(PLT_DeviceDataReference& device, NPT_UInt32 connection_id, void* userdata);
-    NPT_Result GetProtocolInfo(PLT_DeviceDataReference& device, void* userdata);
-    
-    // RenderingControl
-    NPT_Result SetMute(PLT_DeviceDataReference& device, NPT_UInt32 instance_id, const char* channel, bool mute, void* userdata);
-    NPT_Result GetMute(PLT_DeviceDataReference& device, NPT_UInt32 instance_id, const char* channel, void* userdata);
-	NPT_Result SetVolume(PLT_DeviceDataReference& device, NPT_UInt32 instance_id, const char* channel, int volume, void* userdata);
-	NPT_Result GetVolume(PLT_DeviceDataReference& device, NPT_UInt32 instance_id, const char* channel, void* userdata);	
-
-    // VariableStates    
-    virtual NPT_Result GetProtocolInfoSink(const NPT_String& device_uuid, NPT_List<NPT_String>& sinks);
-    virtual NPT_Result GetTransportState(const NPT_String&  device_uuid, NPT_String& state);
-    virtual NPT_Result GetVolumeState(const NPT_String&  device_uuid, NPT_UInt32& volume);
-    
-    // methods
-    virtual NPT_Result FindRenderer(const char* uuid, PLT_DeviceDataReference& device);
-    virtual NPT_Result FindMatchingProtocolInfo(NPT_List<NPT_String>& sinks, const char* protocol_info);
-    virtual NPT_Result FindBestResource(PLT_DeviceDataReference& device, PLT_MediaObject& item, NPT_Cardinal& resource_index);
-
-private:
-    NPT_Result InvokeActionWithInstance(PLT_ActionReference& action, NPT_UInt32 instance_id, void* userdata = NULL);
-
-    NPT_Result OnGetCurrentTransportActionsResponse(NPT_Result res, PLT_DeviceDataReference& device, PLT_ActionReference& action, void* userdata);
-    NPT_Result OnGetDeviceCapabilitiesResponse(NPT_Result res, PLT_DeviceDataReference& device, PLT_ActionReference& action, void* userdata);
-    NPT_Result OnGetMediaInfoResponse(NPT_Result res, PLT_DeviceDataReference& device, PLT_ActionReference& action, void* userdata);
-    NPT_Result OnGetPositionInfoResponse(NPT_Result res, PLT_DeviceDataReference& device, PLT_ActionReference& action, void* userdata);
-    NPT_Result OnGetTransportInfoResponse(NPT_Result res, PLT_DeviceDataReference& device, PLT_ActionReference& action, void* userdata);
-    NPT_Result OnGetTransportSettingsResponse(NPT_Result res, PLT_DeviceDataReference& device, PLT_ActionReference& action, void* userdata);
-
-    NPT_Result OnGetCurrentConnectionIDsResponse(NPT_Result res, PLT_DeviceDataReference& device, PLT_ActionReference& action, void* userdata);
-    NPT_Result OnGetCurrentConnectionInfoResponse(NPT_Result res, PLT_DeviceDataReference& device, PLT_ActionReference& action, void* userdata);
-    NPT_Result OnGetProtocolInfoResponse(NPT_Result res, PLT_DeviceDataReference& device, PLT_ActionReference& action, void* userdata);
-    
-    NPT_Result OnGetMuteResponse(NPT_Result res, PLT_DeviceDataReference& device, PLT_ActionReference& action, void* userdata);
-	NPT_Result OnGetVolumeResponse(NPT_Result res, PLT_DeviceDataReference& device, PLT_ActionReference& action, void* userdata);
-
-public:
-    static void ParseCSV(const char* csv, PLT_StringList& values) {
-        const char* start = csv;
-        const char* p = start;
-
-        // look for the , character
-        while (*p) {
-            if (*p == ',') {
-                NPT_String val(start, (int)(p-start));
-                val.Trim(' ');
-                values.Add(val);
-                start = p + 1;
-            }
-            p++;
-        }
-
-        // last one
-        NPT_String last(start, (int)(p-start));
-        last.Trim(' ');
-        if (last.GetLength()) {
-            values.Add(last);
-        }
-    }
-
-private:
-    PLT_CtrlPointReference                m_CtrlPoint;
-    PLT_MediaControllerDelegate*          m_Delegate;
-    NPT_Lock<PLT_DeviceDataReferenceList> m_MediaRenderers;
-};
-
-typedef NPT_Reference<PLT_MediaController> PLT_MediaControllerReference;
-
-#endif /* _PLT_MEDIA_CONTROLLER_H_ */

gpac-2.2.1.tar.gz/extra_lib/include/platinum/PltMediaControllerListener.h Deleted

@@ -1,203 +0,0 @@
-/*****************************************************************
-|
-|   Platinum - AV Media Controller Listener
-|
-| Copyright (c) 2004-2008, Plutinosoft, LLC.
-| All rights reserved.
-| http://www.plutinosoft.com
-|
-| This program is free software; you can redistribute it and/or
-| modify it under the terms of the GNU General Public License
-| as published by the Free Software Foundation; either version 2
-| of the License, or (at your option) any later version.
-|
-| OEMs, ISVs, VARs and other distributors that combine and 
-| distribute commercially licensed software with Platinum software
-| and do not wish to distribute the source code for the commercially
-| licensed software under version 2, or (at your option) any later
-| version, of the GNU General Public License (the "GPL") must enter
-| into a commercial license agreement with Plutinosoft, LLC.
-| 
-| This program 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 General Public License for more details.
-|
-| You should have received a copy of the GNU General Public License
-| along with this program; see the file LICENSE.txt. If not, write to
-| the Free Software Foundation, Inc., 
-| 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-| http://www.gnu.org/licenses/gpl-2.0.html
-|
-****************************************************************/
-
-#ifndef _PLT_MEDIA_CONTROLLER_LISTENER_H_
-#define _PLT_MEDIA_CONTROLLER_LISTENER_H_
-
-/*----------------------------------------------------------------------
-|   Defines
-+---------------------------------------------------------------------*/
-typedef NPT_List<NPT_String> PLT_StringList;
-
-struct PLT_DeviceCapabilities {
-    PLT_StringList play_media;
-    PLT_StringList rec_media;
-    PLT_StringList rec_quality_modes;
-};
-
-struct PLT_MediaInfo {
-    NPT_UInt32    num_tracks;
-    NPT_TimeStamp media_duration;
-    NPT_String    cur_uri;
-    NPT_String    cur_metadata;
-    NPT_String    next_uri;
-    NPT_String    next_metadata;
-    NPT_String    play_medium;
-    NPT_String    rec_medium;
-    NPT_String    write_status;
-};
-
-struct PLT_PositionInfo {
-    NPT_UInt32    track;
-    NPT_TimeStamp track_duration;
-    NPT_String    track_metadata;
-    NPT_String    track_uri;
-    NPT_TimeStamp rel_time;
-    NPT_TimeStamp abs_time;
-    NPT_Int32     rel_count;
-    NPT_Int32     abs_count;
-};
-
-struct PLT_TransportInfo {
-    NPT_String cur_transport_state;
-    NPT_String cur_transport_status;
-    NPT_String cur_speed;
-};
-
-struct PLT_TransportSettings {
-    NPT_String play_mode;
-    NPT_String rec_quality_mode;
-};
-
-struct PLT_ConnectionInfo {
-    NPT_UInt32 rcs_id;
-    NPT_UInt32 avtransport_id;
-    NPT_String protocol_info;
-    NPT_String peer_connection_mgr;
-    NPT_UInt32 peer_connection_id;
-    NPT_String direction;
-    NPT_String status;
-};
-
-/*----------------------------------------------------------------------
-|   PLT_MediaControllerListener class
-+---------------------------------------------------------------------*/
-class PLT_MediaControllerListener
-{
-public:
-    virtual ~PLT_MediaControllerListener() {}
-
-    virtual void OnMRAddedRemoved(PLT_DeviceDataReference& /* device */, 
-                                  int                      /* added */) {}
-    virtual void OnMRStateVariablesChanged(PLT_Service*                  /* service */, 
-                                           NPT_List<PLT_StateVariable*>* /* vars */) {}
-
-    // AVTransport
-    virtual void OnGetCurrentTransportActionsResult(
-        NPT_Result               /* res */, 
-        PLT_DeviceDataReference& /* device */,
-        PLT_StringList*          /* actions */, 
-        void*                    /* userdata */) {}
-
-    virtual void OnGetDeviceCapabilitiesResult(
-        NPT_Result               /* res */, 
-        PLT_DeviceDataReference& /* device */,
-        PLT_DeviceCapabilities*  /* capabilities */,
-        void*                    /* userdata */) {}
-
-    virtual void OnGetMediaInfoResult(
-        NPT_Result               /* res */,
-        PLT_DeviceDataReference& /* device */,
-        PLT_MediaInfo*           /* info */,
-        void*                    /* userdata */) {}
-
-    virtual void OnGetPositionInfoResult(
-        NPT_Result               /* res */,
-        PLT_DeviceDataReference& /* device */,
-        PLT_PositionInfo*        /* info */,
-        void*                    /* userdata */) {}
-
-    virtual void OnGetTransportInfoResult(
-        NPT_Result               /* res */,
-        PLT_DeviceDataReference& /* device */,
-        PLT_TransportInfo*       /* info */,
-        void*                    /* userdata */) {}
-
-    virtual void OnGetTransportSettingsResult(
-        NPT_Result               /* res */,
-        PLT_DeviceDataReference& /* device */,
-        PLT_TransportSettings*   /* settings */,
-        void*                    /* userdata */) {}
-
-    virtual void OnNextResult(
-        NPT_Result               /* res */,
-        PLT_DeviceDataReference& /* device */,
-        void*                    /* userdata */) {}
-
-    virtual void OnPauseResult(
-        NPT_Result               /* res */,
-        PLT_DeviceDataReference& /* device */,
-        void*                    /* userdata */) {}  
-
-    virtual void OnPlayResult(
-        NPT_Result               /* res */,
-        PLT_DeviceDataReference& /* device */,
-        void*                    /* userdata */) {}
-
-    virtual void OnPreviousResult(
-        NPT_Result               /* res */,
-        PLT_DeviceDataReference& /* device */,
-        void*                    /* userdata */) {}
-
-    virtual void OnSeekResult(
-        NPT_Result               /* res */,
-        PLT_DeviceDataReference& /* device */,
-        void*                    /* userdata */) {}
-
-    virtual void OnSetAVTransportURIResult(
-        NPT_Result               /* res */,
-        PLT_DeviceDataReference& /* device */,
-        void*                    /* userdata */) {}
-
-    virtual void OnSetPlayModeResult(
-        NPT_Result               /* res */,
-        PLT_DeviceDataReference& /* device */,
-        void*                    /* userdata */) {}
-
-    virtual void OnStopResult(
-        NPT_Result               /* res */,
-        PLT_DeviceDataReference& /* device */,
-        void*                    /* userdata */) {}
-
-    // ConnectionManager
-    virtual void OnGetCurrentConnectionIDsResult(
-        NPT_Result               /* res */,
-        PLT_DeviceDataReference& /* device */,
-        PLT_StringList*          /* ids */,
-        void*                    /* userdata */) {}
-
-    virtual void OnGetCurrentConnectionInfoResult(
-        NPT_Result               /* res */,
-        PLT_DeviceDataReference& /* device */,
-        PLT_ConnectionInfo*      /* info */,
-        void*                    /* userdata */) {}
-
-    virtual void OnGetProtocolInfoResult(
-        NPT_Result               /* res */,
-        PLT_DeviceDataReference& /* device */,
-        PLT_StringList*          /* sources */,
-        PLT_StringList*          /* sinks */,
-        void*                    /* userdata */) {}
-};
-
-#endif /* _PLT_MEDIA_CONTROLLER_LISTENER_H_ */

gpac-2.2.1.tar.gz/extra_lib/include/platinum/PltMediaItem.h Deleted

@@ -1,304 +0,0 @@
-/*****************************************************************
-|
-|   Platinum - AV Media Item
-|
-| Copyright (c) 2004-2010, Plutinosoft, LLC.
-| All rights reserved.
-| http://www.plutinosoft.com
-|
-| This program is free software; you can redistribute it and/or
-| modify it under the terms of the GNU General Public License
-| as published by the Free Software Foundation; either version 2
-| of the License, or (at your option) any later version.
-|
-| OEMs, ISVs, VARs and other distributors that combine and 
-| distribute commercially licensed software with Platinum software
-| and do not wish to distribute the source code for the commercially
-| licensed software under version 2, or (at your option) any later
-| version, of the GNU General Public License (the "GPL") must enter
-| into a commercial license agreement with Plutinosoft, LLC.
-| licensing@plutinosoft.com
-|  
-| This program 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 General Public License for more details.
-|
-| You should have received a copy of the GNU General Public License
-| along with this program; see the file LICENSE.txt. If not, write to
-| the Free Software Foundation, Inc., 
-| 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-| http://www.gnu.org/licenses/gpl-2.0.html
-|
-****************************************************************/
-
-/** @file
- UPnP AV Media Object reprensentation.
- */
-
-#ifndef _PLT_MEDIA_ITEM_H_
-#define _PLT_MEDIA_ITEM_H_
-
-/*----------------------------------------------------------------------
-|   includes
-+---------------------------------------------------------------------*/
-#include "Neptune.h"
-#include "PltHttp.h"
-#include "PltProtocolInfo.h"
-
-/*----------------------------------------------------------------------
-|   typedefs
-+---------------------------------------------------------------------*/
-/**
- The PLT_ObjectClass struct is used to assign a type to a PLT_MediaObject.
- */
-typedef struct { 
-    NPT_String type;
-    NPT_String friendly_name;
-} PLT_ObjectClass;
-
-typedef struct { 
-    NPT_String type;
-    NPT_String friendly_name;
-    bool       include_derived;
-} PLT_SearchClass;
-
-typedef struct {
-    NPT_String name;
-    NPT_String role;
-} PLT_PersonRole;
-
-class PLT_PersonRoles  : public NPT_List<PLT_PersonRole>
-{
-public:
-    NPT_Result Add(const NPT_String& name, const NPT_String& role = "");
-    NPT_Result ToDidl(NPT_String& didl, const NPT_String& tag);
-    NPT_Result FromDidl(const NPT_Array<NPT_XmlElementNode*>& nodes);
-};
-
-typedef struct {
-    NPT_String allowed_use; // (CSV)
-    NPT_String validity_start;
-    NPT_String validity_end;
-    NPT_String remaining_time;
-    NPT_String usage_info;
-    NPT_String rights_info_uri;
-    NPT_String content_info_uri;
-} PLT_Constraint;
-
-typedef struct {
-    PLT_PersonRoles artists;
-    PLT_PersonRoles actors;
-    PLT_PersonRoles authors;
-    NPT_String      producer; //TODO: can be multiple
-    NPT_String      director; //TODO: can be multiple
-    NPT_String      publisher; //TODO: can be multiple
-    NPT_String      contributor; // should match m_Creator (dc:creator) //TODO: can be multiple
-} PLT_PeopleInfo;
-
-typedef struct {
-    NPT_List<NPT_String> genres;
-    NPT_String album; //TODO: can be multiple
-    NPT_String playlist; // dc:title of the playlist item the content belongs too //TODO: can be multiple
-} PLT_AffiliationInfo;
-
-typedef struct {
-    NPT_String description;
-    NPT_String long_description;
-    NPT_String icon_uri;
-    NPT_String region;
-    NPT_String rating;
-    NPT_String rights; //TODO: can be multiple
-    NPT_String date;
-    NPT_String language;
-} PLT_Description;
-
-typedef struct {
-    NPT_String uri;
-    NPT_String dlna_profile;
-} PLT_AlbumArtInfo;
-
-typedef struct {
-    NPT_List<PLT_AlbumArtInfo> album_arts;
-    NPT_String artist_discography_uri;
-    NPT_String lyrics_uri;
-    NPT_List<NPT_String> relations; // dc:relation
-} PLT_ExtraInfo;
-
-typedef struct {
-    NPT_UInt32 dvdregioncode;
-    NPT_UInt32 original_track_number;
-    NPT_String toc;
-    NPT_String user_annotation; //TODO: can be multiple
-} PLT_MiscInfo;
-
-typedef struct {
-    NPT_UInt64 total;
-    NPT_UInt64 used;
-    NPT_UInt64 free;
-    NPT_UInt64 max_partition;
-    NPT_UInt64 medium;
-} PLT_StorageInfo;
-
-typedef struct {
-    NPT_String program_title;
-    NPT_String series_title;
-    NPT_UInt32 episode_number;
-} PLT_RecordedInfo;
-
-/*----------------------------------------------------------------------
-|   PLT_MediaItemResource
-+---------------------------------------------------------------------*/
-class PLT_MediaItemResource
-{
-public:
-    PLT_MediaItemResource();
-    ~PLT_MediaItemResource() {}
-
-    NPT_String       m_Uri;
-    PLT_ProtocolInfo m_ProtocolInfo;
-    NPT_UInt32       m_Duration; /* seconds */
-    NPT_LargeSize    m_Size;
-    NPT_String       m_Protection;
-    NPT_UInt32       m_Bitrate; /* bytes/seconds */
-    NPT_UInt32       m_BitsPerSample;
-    NPT_UInt32       m_SampleFrequency;
-    NPT_UInt32       m_NbAudioChannels;
-    NPT_String       m_Resolution;
-    NPT_UInt32       m_ColorDepth;
-};
-
-/*----------------------------------------------------------------------
-|   PLT_MediaObject
-+---------------------------------------------------------------------*/
-/**
- The PLT_MediaObject class is any data entity that can be returned by a
- ContentDirectory Service from a browsing or searching action. This is the
- base class from which PLT_MediaItem and PLT_MediaContainer derive.
- */
-class PLT_MediaObject
-{
-protected:
-    NPT_IMPLEMENT_DYNAMIC_CAST(PLT_MediaObject)
-
-    PLT_MediaObject() {}
-
-public:
-    virtual ~PLT_MediaObject() {}
-
-    bool IsContainer() { return m_ObjectClass.type.StartsWith("object.container"); }
-
-    static const char* GetUPnPClass(const char* filename, 
-                                    const PLT_HttpRequestContext* context = NULL);
-
-    virtual NPT_Result Reset();
-    virtual NPT_Result ToDidl(const NPT_String& filter, NPT_String& didl);
-    virtual NPT_Result ToDidl(NPT_UInt32 mask, NPT_String& didl);
-    virtual NPT_Result FromDidl(NPT_XmlElementNode* entry);
-
-public:
-    /* common properties */
-    PLT_ObjectClass     m_ObjectClass;
-    NPT_String          m_ObjectID;
-    NPT_String          m_ParentID;
-    NPT_String          m_ReferenceID;
-
-    /* metadata */
-    NPT_String          m_Title;
-    NPT_String          m_Creator;
-    NPT_String          m_Date;
-    PLT_PeopleInfo      m_People;
-    PLT_AffiliationInfo m_Affiliation;
-    PLT_Description     m_Description;
-    PLT_RecordedInfo    m_Recorded;
-
-    /* properties */
-    bool m_Restricted;
-
-    /* extras */
-    PLT_ExtraInfo m_ExtraInfo;
-
-    /* miscellaneous info */
-    PLT_MiscInfo m_MiscInfo;
-
-    /* resources related */
-    NPT_Array<PLT_MediaItemResource> m_Resources;
-
-    /* original DIDL for Control Points to pass to a renderer when invoking SetAVTransportURI */
-    NPT_String m_Didl;    
-};
-
-/*----------------------------------------------------------------------
-|   PLT_MediaItem
-+---------------------------------------------------------------------*/
-/**
- The PLT_MediaItem class represents a first-level class derived directly from
- PLT_MediaObject. It most often represents a single piece of AV data. 
- */
-class PLT_MediaItem : public PLT_MediaObject
-{
-public:
-    NPT_IMPLEMENT_DYNAMIC_CAST_D(PLT_MediaItem, PLT_MediaObject)
-
-    PLT_MediaItem();
-    virtual ~PLT_MediaItem();
-
-    // PLT_MediaObject methods
-    NPT_Result ToDidl(const NPT_String& filter, NPT_String& didl);
-    NPT_Result ToDidl(NPT_UInt32 mask, NPT_String& didl);
-    NPT_Result FromDidl(NPT_XmlElementNode* entry);
-};
-
-/*----------------------------------------------------------------------
-|   PLT_MediaContainer
-+---------------------------------------------------------------------*/
-/**
- The PLT_MediaContainer class represents a first-level class derived directly
- from PLT_MediaObject. A PLT_MediaContainer represents a collection of 
- PLT_MediaObject instances.
- */
-class PLT_MediaContainer : public PLT_MediaObject
-{
-public:
-    NPT_IMPLEMENT_DYNAMIC_CAST_D(PLT_MediaContainer, PLT_MediaObject)
-
-    PLT_MediaContainer();
-    virtual ~PLT_MediaContainer();
-
-    // PLT_MediaObject methods
-    NPT_Result Reset();
-    NPT_Result ToDidl(const NPT_String& filter, NPT_String& didl);
-    NPT_Result ToDidl(NPT_UInt32 mask, NPT_String& didl);
-    NPT_Result FromDidl(NPT_XmlElementNode* entry);
-
-public:
-    NPT_List<PLT_SearchClass> m_SearchClasses;
-
-    /* properties */
-    bool m_Searchable;
-
-    /* container info related */
-    NPT_Int32  m_ChildrenCount;    
-    NPT_UInt32 m_ContainerUpdateID;
-};
-
-/*----------------------------------------------------------------------
-|   PLT_MediaObjectList
-+---------------------------------------------------------------------*/
-/**
- The PLT_MediaObjectList class is a list of PLT_MediaObject instances.
- */
-class PLT_MediaObjectList : public NPT_List<PLT_MediaObject*>
-{
-public:
-    PLT_MediaObjectList();
-
-protected:
-    virtual ~PLT_MediaObjectList(void);
-    friend class NPT_Reference<PLT_MediaObjectList>;
-};
-
-typedef NPT_Reference<PLT_MediaObjectList> PLT_MediaObjectListReference;
-typedef NPT_Reference<PLT_MediaObject> PLT_MediaObjectReference;
-
-#endif /* _PLT_MEDIA_ITEM_H_ */

gpac-2.2.1.tar.gz/extra_lib/include/platinum/PltMediaPlaylist.h Deleted

@@ -1,85 +0,0 @@
-/*****************************************************************
-|
-|   Platinum - AV Media Playlist
-|
-| Copyright (c) 2004-2008, Plutinosoft, LLC.
-| All rights reserved.
-| http://www.plutinosoft.com
-|
-| This program is free software; you can redistribute it and/or
-| modify it under the terms of the GNU General Public License
-| as published by the Free Software Foundation; either version 2
-| of the License, or (at your option) any later version.
-|
-| OEMs, ISVs, VARs and other distributors that combine and 
-| distribute commercially licensed software with Platinum software
-| and do not wish to distribute the source code for the commercially
-| licensed software under version 2, or (at your option) any later
-| version, of the GNU General Public License (the "GPL") must enter
-| into a commercial license agreement with Plutinosoft, LLC.
-| 
-| This program 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 General Public License for more details.
-|
-| You should have received a copy of the GNU General Public License
-| along with this program; see the file LICENSE.txt. If not, write to
-| the Free Software Foundation, Inc., 
-| 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-| http://www.gnu.org/licenses/gpl-2.0.html
-|
-****************************************************************/
-
-#ifndef _PLT_MEDIA_PLAYLIST_H_
-#define _PLT_MEDIA_PLAYLIST_H_
-
-/*----------------------------------------------------------------------
-|   includes
-+---------------------------------------------------------------------*/
-#include "Neptune.h"
-#include "PltMediaItem.h"
-
-/*----------------------------------------------------------------------
-|   typedefs
-+---------------------------------------------------------------------*/
-typedef NPT_List<PLT_MediaItem*> PLT_MediaItemList;
-typedef NPT_Reference<PLT_MediaItemList> PLT_MediaItemListReference;
-
-/*----------------------------------------------------------------------
-|   PLT_MediaPlaylist class
-+---------------------------------------------------------------------*/
-class PLT_MediaPlaylist
-{
-public:
-    PLT_MediaPlaylist();
-    ~PLT_MediaPlaylist(void);
-
-    NPT_Result  Clear();
-    NPT_Result  Queue(PLT_MediaItem* item);
-    NPT_Result  Queue(PLT_MediaItemList* list);
-    template <typename X> 
-    NPT_Result  Apply(const X& function) {
-        return m_List->Apply(function);
-    }
-
-private:
-    PLT_MediaItemListReference m_List;
-};
-
-/*----------------------------------------------------------------------
-|   PLT_MediaItemQueueIterator class
-+---------------------------------------------------------------------*/
-class PLT_MediaItemQueueIterator
-{
-public:
-    PLT_MediaItemQueueIterator(PLT_MediaPlaylist* playlist) : m_Playlist(playlist) {}
-    NPT_Result operator()(PLT_MediaItem*& item) const {
-        return m_Playlist->Queue(item);
-    }
-
-private:
-    PLT_MediaPlaylist* m_Playlist;
-};
-
-#endif /* _PLT_MEDIA_PLAYLIST_H_ */

gpac-2.2.1.tar.gz/extra_lib/include/platinum/PltMediaRenderer.h Deleted

@@ -1,117 +0,0 @@
-/*****************************************************************
-|
-|   Platinum - AV Media Renderer Device
-|
-| Copyright (c) 2004-2010, Plutinosoft, LLC.
-| All rights reserved.
-| http://www.plutinosoft.com
-|
-| This program is free software; you can redistribute it and/or
-| modify it under the terms of the GNU General Public License
-| as published by the Free Software Foundation; either version 2
-| of the License, or (at your option) any later version.
-|
-| OEMs, ISVs, VARs and other distributors that combine and 
-| distribute commercially licensed software with Platinum software
-| and do not wish to distribute the source code for the commercially
-| licensed software under version 2, or (at your option) any later
-| version, of the GNU General Public License (the "GPL") must enter
-| into a commercial license agreement with Plutinosoft, LLC.
-| licensing@plutinosoft.com
-| 
-| This program 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 General Public License for more details.
-|
-| You should have received a copy of the GNU General Public License
-| along with this program; see the file LICENSE.txt. If not, write to
-| the Free Software Foundation, Inc., 
-| 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-| http://www.gnu.org/licenses/gpl-2.0.html
-|
-****************************************************************/
-
-#ifndef _PLT_MEDIA_RENDERER_H_
-#define _PLT_MEDIA_RENDERER_H_
-
-/*----------------------------------------------------------------------
-|   includes
-+---------------------------------------------------------------------*/
-#include "PltDeviceHost.h"
-
-/*----------------------------------------------------------------------
-|   PLT_MediaRendererDelegate
-+---------------------------------------------------------------------*/
-class PLT_MediaRendererDelegate
-{
-public:
-    virtual ~PLT_MediaRendererDelegate() {}
-
-    // ConnectionManager
-    virtual NPT_Result OnGetCurrentConnectionInfo(PLT_ActionReference& action) = 0;
-
-    // AVTransport
-    virtual NPT_Result OnNext(PLT_ActionReference& action) = 0;
-    virtual NPT_Result OnPause(PLT_ActionReference& action) = 0;
-    virtual NPT_Result OnPlay(PLT_ActionReference& action) = 0;
-    virtual NPT_Result OnPrevious(PLT_ActionReference& action) = 0;
-    virtual NPT_Result OnSeek(PLT_ActionReference& action) = 0;
-    virtual NPT_Result OnStop(PLT_ActionReference& action) = 0;
-    virtual NPT_Result OnSetAVTransportURI(PLT_ActionReference& action) = 0;
-    virtual NPT_Result OnSetPlayMode(PLT_ActionReference& action) = 0;
-
-    // RenderingControl
-    virtual NPT_Result OnSetVolume(PLT_ActionReference& action) = 0;
-    virtual NPT_Result OnSetVolumeDB(PLT_ActionReference& action) = 0;
-    virtual NPT_Result OnGetVolumeDBRange(PLT_ActionReference& action) = 0;
-    virtual NPT_Result OnSetMute(PLT_ActionReference& action) = 0;
-};
-
-/*----------------------------------------------------------------------
-|   PLT_MediaRenderer
-+---------------------------------------------------------------------*/
-class PLT_MediaRenderer : public PLT_DeviceHost
-{
-public:
-    PLT_MediaRenderer(const char*  friendly_name,
-                      bool         show_ip = false,
-                      const char*  uuid = NULL,
-                      unsigned int port = 0,
-                      bool         port_rebind = false);
-    // methods
-    virtual void SetDelegate(PLT_MediaRendererDelegate* delegate) { m_Delegate = delegate; }
-
-    // PLT_DeviceHost methods
-    virtual NPT_Result SetupServices();
-    virtual NPT_Result OnAction(PLT_ActionReference&          action, 
-                                const PLT_HttpRequestContext& context);
-
-protected:
-    virtual ~PLT_MediaRenderer();
-
-    // PLT_MediaRendererInterface methods
-    // ConnectionManager
-    virtual NPT_Result OnGetCurrentConnectionInfo(PLT_ActionReference& action);
-
-    // AVTransport
-    virtual NPT_Result OnNext(PLT_ActionReference& action);
-    virtual NPT_Result OnPause(PLT_ActionReference& action);
-    virtual NPT_Result OnPlay(PLT_ActionReference& action);
-    virtual NPT_Result OnPrevious(PLT_ActionReference& action);
-    virtual NPT_Result OnSeek(PLT_ActionReference& action);
-    virtual NPT_Result OnStop(PLT_ActionReference& action);
-    virtual NPT_Result OnSetAVTransportURI(PLT_ActionReference& action);
-    virtual NPT_Result OnSetPlayMode(PLT_ActionReference& action);
-
-    // RenderingControl
-    virtual NPT_Result OnSetVolume(PLT_ActionReference& action);
-    virtual NPT_Result OnSetVolumeDB(PLT_ActionReference &action);
-    virtual NPT_Result OnGetVolumeDBRange(PLT_ActionReference &action);
-    virtual NPT_Result OnSetMute(PLT_ActionReference& action);
-
-private:
-    PLT_MediaRendererDelegate* m_Delegate;
-};
-
-#endif /* _PLT_MEDIA_RENDERER_H_ */

gpac-2.2.1.tar.gz/extra_lib/include/platinum/PltMediaServer.h Deleted

@@ -1,187 +0,0 @@
-/*****************************************************************
-|
-|   Platinum - AV Media Server Device
-|
-| Copyright (c) 2004-2010, Plutinosoft, LLC.
-| All rights reserved.
-| http://www.plutinosoft.com
-|
-| This program is free software; you can redistribute it and/or
-| modify it under the terms of the GNU General Public License
-| as published by the Free Software Foundation; either version 2
-| of the License, or (at your option) any later version.
-|
-| OEMs, ISVs, VARs and other distributors that combine and 
-| distribute commercially licensed software with Platinum software
-| and do not wish to distribute the source code for the commercially
-| licensed software under version 2, or (at your option) any later
-| version, of the GNU General Public License (the "GPL") must enter
-| into a commercial license agreement with Plutinosoft, LLC.
-| licensing@plutinosoft.com
-|  
-| This program 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 General Public License for more details.
-|
-| You should have received a copy of the GNU General Public License
-| along with this program; see the file LICENSE.txt. If not, write to
-| the Free Software Foundation, Inc., 
-| 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-| http://www.gnu.org/licenses/gpl-2.0.html
-|
-****************************************************************/
-
-/** @file
- UPnP AV Media Server.
- */
-
-#ifndef _PLT_MEDIA_SERVER_H_
-#define _PLT_MEDIA_SERVER_H_
-
-/*----------------------------------------------------------------------
-|   includes
-+---------------------------------------------------------------------*/
-#include "Neptune.h"
-#include "PltDeviceHost.h"
-#include "PltMediaItem.h"
-
-/*----------------------------------------------------------------------
-|   constants
-+---------------------------------------------------------------------*/
-#define MAX_PATH_LENGTH 1024
-
-/*----------------------------------------------------------------------
-|   PLT_MediaServerDelegate
-+---------------------------------------------------------------------*/
-/** 
- The PLT_MediaServerDelegate class is an interface for delegating the handling 
- of the required UPnP AV ContentDirectory service actions. It also handles 
- resource HTTP requests (downloading).
- */
-class PLT_MediaServerDelegate
-{
-public:
-    PLT_MediaServerDelegate() {}
-    virtual ~PLT_MediaServerDelegate() {}
-    
-    virtual NPT_Result OnBrowseMetadata(PLT_ActionReference&          /*action*/, 
-                                        const char*                   /*object_id*/, 
-                                        const char*                   /*filter*/,
-                                        NPT_UInt32                    /*starting_index*/,
-                                        NPT_UInt32                    /*requested_count*/,
-                                        const char*                   /*sort_criteria*/,
-                                        const PLT_HttpRequestContext& /*context*/) = 0;
-    virtual NPT_Result OnBrowseDirectChildren(PLT_ActionReference&          /*action*/, 
-                                              const char*                   /*object_id*/, 
-                                              const char*                   /*filter*/,
-                                              NPT_UInt32                    /*starting_index*/,
-                                              NPT_UInt32                    /*requested_count*/,
-                                              const char*                   /*sort_criteria*/, 
-                                              const PLT_HttpRequestContext& /*context*/) = 0;
-    virtual NPT_Result OnSearchContainer(PLT_ActionReference&          /*action*/, 
-                                         const char*                   /*container_id*/, 
-                                         const char*                   /*search_criteria*/,
- 										 const char*                   /*filter*/,
-                                         NPT_UInt32                    /*starting_index*/,
-                                         NPT_UInt32                    /*requested_count*/,
-                                         const char*                   /*sort_criteria*/, 
-                                         const PLT_HttpRequestContext& /*context*/) = 0;
-    virtual NPT_Result ProcessFileRequest(NPT_HttpRequest&              /*request*/,
-                                          const NPT_HttpRequestContext& /*context*/,
-                                          NPT_HttpResponse&             /*response*/) = 0;
-};
-
-/*----------------------------------------------------------------------
-|   PLT_MediaServer
-+---------------------------------------------------------------------*/
-/**
- The PLT_MediaServer class implements the base class for a UPnP AV 
- Media Server device.
- */
-class PLT_MediaServer : public PLT_DeviceHost
-{
-public:
-    /* BrowseFlags */
-    enum BrowseFlags {
-        BROWSEMETADATA,
-        BROWSEDIRECTCHILDREN
-    };
-    
-    // class methods
-    static NPT_Result ParseBrowseFlag(const char* str, BrowseFlags& flag);
-    static NPT_Result ParseSort(const NPT_String& sort, NPT_List<NPT_String>& list);
-
-    // constructor
-    PLT_MediaServer(const char*  friendly_name,
-                    bool         show_ip = false,
-                    const char*  uuid = NULL,
-                    NPT_UInt16   port = 0,
-                    bool         port_rebind = false);
-    
-    // methods
-    virtual void SetDelegate(PLT_MediaServerDelegate* delegate) { m_Delegate = delegate; }
-    PLT_MediaServerDelegate* GetDelegate() { return m_Delegate; }
-    virtual void UpdateSystemUpdateID(NPT_UInt32 update);
-    virtual void UpdateContainerUpdateID(const char* id, NPT_UInt32 update);
-    
-protected:
-    virtual ~PLT_MediaServer();
-    
-    // PLT_DeviceHost methods
-    virtual NPT_Result SetupServices();
-    virtual NPT_Result OnAction(PLT_ActionReference&          action, 
-                                const PLT_HttpRequestContext& context);
-    virtual NPT_Result ProcessHttpGetRequest(NPT_HttpRequest&              request, 
-                                             const NPT_HttpRequestContext& context,
-                                             NPT_HttpResponse&             response);
-    
-    // ConnectionManager
-    virtual NPT_Result OnGetCurrentConnectionIDs(PLT_ActionReference&          action, 
-                                                 const PLT_HttpRequestContext& context);
-    virtual NPT_Result OnGetProtocolInfo(PLT_ActionReference&          action, 
-                                         const PLT_HttpRequestContext& context);
-    virtual NPT_Result OnGetCurrentConnectionInfo(PLT_ActionReference&          action, 
-                                                  const PLT_HttpRequestContext& context);
-
-    // ContentDirectory
-    virtual NPT_Result OnGetSortCapabilities(PLT_ActionReference&          action, 
-                                             const PLT_HttpRequestContext& context);
-    virtual NPT_Result OnGetSearchCapabilities(PLT_ActionReference&          action, 
-                                               const PLT_HttpRequestContext& context);
-    virtual NPT_Result OnGetSystemUpdateID(PLT_ActionReference&          action, 
-                                           const PLT_HttpRequestContext& context);
-    virtual NPT_Result OnBrowse(PLT_ActionReference&          action, 
-                                const PLT_HttpRequestContext& context);
-    virtual NPT_Result OnSearch(PLT_ActionReference&          action, 
-                                const PLT_HttpRequestContext& context);
-
-    // overridable methods
-    virtual NPT_Result OnBrowseMetadata(PLT_ActionReference&          action, 
-                                        const char*                   object_id, 
-                                        const char*                   filter,
-                                        NPT_UInt32                    starting_index,
-                                        NPT_UInt32                    requested_count,
-                                        const char*                   sort_criteria,
-                                        const PLT_HttpRequestContext& context);
-    virtual NPT_Result OnBrowseDirectChildren(PLT_ActionReference&          action, 
-                                              const char*                   object_id, 
-                                              const char*                   filter,
-                                              NPT_UInt32                    starting_index,
-                                              NPT_UInt32                    requested_count,
-                                              const char*                   sort_criteria, 
-                                              const PLT_HttpRequestContext& context);
-    virtual NPT_Result OnSearchContainer(PLT_ActionReference&          action, 
-                                         const char*                   container_id, 
-                                         const char*                   search_criteria,
- 										 const char*                   filter,
-                                         NPT_UInt32                    starting_index,
-                                         NPT_UInt32                    requested_count,
-                                         const char*                   sort_criteria, 
-                                         const PLT_HttpRequestContext& context);
-    
-private:
-    PLT_MediaServerDelegate* m_Delegate;
-};
-
-#endif /* _PLT_MEDIA_SERVER_H_ */

gpac-2.2.1.tar.gz/extra_lib/include/platinum/PltMetadataHandler.h Deleted

@@ -1,91 +0,0 @@
-/*****************************************************************
-|
-|   Platinum - Metadata Handler
-|
-| Copyright (c) 2004-2010, Plutinosoft, LLC.
-| All rights reserved.
-| http://www.plutinosoft.com
-|
-| This program is free software; you can redistribute it and/or
-| modify it under the terms of the GNU General Public License
-| as published by the Free Software Foundation; either version 2
-| of the License, or (at your option) any later version.
-|
-| OEMs, ISVs, VARs and other distributors that combine and 
-| distribute commercially licensed software with Platinum software
-| and do not wish to distribute the source code for the commercially
-| licensed software under version 2, or (at your option) any later
-| version, of the GNU General Public License (the "GPL") must enter
-| into a commercial license agreement with Plutinosoft, LLC.
-| licensing@plutinosoft.com
-|  
-| This program 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 General Public License for more details.
-|
-| You should have received a copy of the GNU General Public License
-| along with this program; see the file LICENSE.txt. If not, write to
-| the Free Software Foundation, Inc., 
-| 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-| http://www.gnu.org/licenses/gpl-2.0.html
-|
-****************************************************************/
-
-#ifndef _PLT_METADATA_HANDLER_H_
-#define _PLT_METADATA_HANDLER_H_
-
-/*----------------------------------------------------------------------
-|   includes
-+---------------------------------------------------------------------*/
-#include "Neptune.h"
-
-/*----------------------------------------------------------------------
-|   PLT_MetadataHandler class
-+---------------------------------------------------------------------*/
-class PLT_MetadataHandler
-{
-public:
-    virtual ~PLT_MetadataHandler() {}
-
-    // metadata overridables
-    virtual bool HandleExtension(const char* extension) = 0;
-    virtual NPT_Result  Load(NPT_InputStream&  stream, 
-                             NPT_TimeInterval  sleeptime = NPT_TimeInterval(.01), 
-                             NPT_TimeInterval  timeout = NPT_TimeInterval(30.)) = 0;
-    virtual NPT_Result  Save(NPT_OutputStream& stream,
-                             NPT_TimeInterval  sleeptime = NPT_TimeInterval(.01), 
-                             NPT_TimeInterval  timeout = NPT_TimeInterval(30.)) = 0;
-
-    virtual const char* GetLicenseData(NPT_String& licenseData) = 0;
-    virtual NPT_Result  GetCoverArtData(char*& caData, int& len) = 0;
-    virtual const char* GetContentID(NPT_String& value) = 0;
-    virtual const char* GetTitle(NPT_String& value) = 0;
-    virtual const char* GetDescription(NPT_String& value) = 0;
-    virtual NPT_Result  GetDuration(NPT_UInt32& seconds) = 0;
-    virtual const char* GetProtection(NPT_String& protection) = 0;
-    virtual NPT_Result  GetYear(NPT_Size& year) = 0;
-    
-    // helper functions
-    virtual NPT_Result  Load(const char* filename);
-    virtual NPT_Result  Save(const char* filename);
-};
-
-/*----------------------------------------------------------------------
-|   PLT_MetadataHandlerFinder
-+---------------------------------------------------------------------*/
-class PLT_MetadataHandlerFinder
-{
-public:
-    // methods
-    PLT_MetadataHandlerFinder(const char* extension) : m_Extension(extension) {}
-    bool operator()(PLT_MetadataHandler* const & handler) const {
-        return handler->HandleExtension(m_Extension) ? true : false;
-    }
-
-private:
-    // members
-    NPT_String m_Extension;
-};
-
-#endif /* _PLT_METADATA_HANDLER_H_ */

gpac-2.2.1.tar.gz/extra_lib/include/platinum/PltMimeType.h Deleted

@@ -1,75 +0,0 @@
-/*****************************************************************
-|
-|   Platinum - AV Media MimeType
-|
-| Copyright (c) 2004-2010, Plutinosoft, LLC.
-| All rights reserved.
-| http://www.plutinosoft.com
-|
-| This program is free software; you can redistribute it and/or
-| modify it under the terms of the GNU General Public License
-| as published by the Free Software Foundation; either version 2
-| of the License, or (at your option) any later version.
-|
-| OEMs, ISVs, VARs and other distributors that combine and 
-| distribute commercially licensed software with Platinum software
-| and do not wish to distribute the source code for the commercially
-| licensed software under version 2, or (at your option) any later
-| version, of the GNU General Public License (the "GPL") must enter
-| into a commercial license agreement with Plutinosoft, LLC.
-| licensing@plutinosoft.com
-|  
-| This program 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 General Public License for more details.
-|
-| You should have received a copy of the GNU General Public License
-| along with this program; see the file LICENSE.txt. If not, write to
-| the Free Software Foundation, Inc., 
-| 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-| http://www.gnu.org/licenses/gpl-2.0.html
-|
-****************************************************************/
-
-/** @file
- UPnP AV Media MimeType.
- */
-
-#ifndef _PLT_MIMETYPE_H_
-#define _PLT_MIMETYPE_H_
-
-/*----------------------------------------------------------------------
-|   includes
-+---------------------------------------------------------------------*/
-#include "Neptune.h"
-#include "PltHttp.h"
-/*----------------------------------------------------------------------
-|   forward declarations
-+---------------------------------------------------------------------*/
-class PLT_HttpRequestContext;
-
-/*----------------------------------------------------------------------
-|   PLT_MimeType
-+---------------------------------------------------------------------*/
-class PLT_MimeType
-{
-public:
-    virtual ~PLT_MimeType() {}
-
-    static const char* GetMimeType(const NPT_String&             filename, 
-                                   const PLT_HttpRequestContext* context = NULL);
-    static const char* GetMimeType(const NPT_String&   filename,
-                                   PLT_DeviceSignature signature = PLT_DEVICE_UNKNOWN);
-    
-    static const char* GetMimeTypeFromExtension(const NPT_String&             extension, 
-                                                const PLT_HttpRequestContext* context = NULL);
-    static const char* GetMimeTypeFromExtension(const NPT_String&   extension,
-                                                PLT_DeviceSignature signature = PLT_DEVICE_UNKNOWN);
-
-private:
-    PLT_MimeType() {}
-
-};
-
-#endif /* _PLT_MIMETYPE_H_ */

gpac-2.2.1.tar.gz/extra_lib/include/platinum/PltProtocolInfo.h Deleted

@@ -1,158 +0,0 @@
-/*****************************************************************
-|
-|   Platinum - AV Media Protocol Info
-|
-| Copyright (c) 2004-2010, Plutinosoft, LLC.
-| All rights reserved.
-| http://www.plutinosoft.com
-|
-| This program is free software; you can redistribute it and/or
-| modify it under the terms of the GNU General Public License
-| as published by the Free Software Foundation; either version 2
-| of the License, or (at your option) any later version.
-|
-| OEMs, ISVs, VARs and other distributors that combine and 
-| distribute commercially licensed software with Platinum software
-| and do not wish to distribute the source code for the commercially
-| licensed software under version 2, or (at your option) any later
-| version, of the GNU General Public License (the "GPL") must enter
-| into a commercial license agreement with Plutinosoft, LLC.
-| licensing@plutinosoft.com
-| 
-| This program 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 General Public License for more details.
-|
-| You should have received a copy of the GNU General Public License
-| along with this program; see the file LICENSE.txt. If not, write to
-| the Free Software Foundation, Inc., 
-| 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-| http://www.gnu.org/licenses/gpl-2.0.html
-|
-****************************************************************/
-
-/** @file
- UPnP AV Media Object Protocol Info.
- */
-
-#ifndef _PLT_PROTOCOL_INFO_H_
-#define _PLT_PROTOCOL_INFO_H_
-
-/*----------------------------------------------------------------------
-|   includes
-+---------------------------------------------------------------------*/
-#include "Neptune.h"
-#include "PltHttp.h"
-
-/*----------------------------------------------------------------------
-|   forward declarations
-+---------------------------------------------------------------------*/
-class PLT_HttpRequestContext;
-
-/*----------------------------------------------------------------------
-|   typedefs
-+---------------------------------------------------------------------*/
-typedef struct PLT_HttpFileRequestHandler_DefaultDlnaExtMapEntry {
-    const char* mime_type;
-    const char* dlna_ext;
-} PLT_HttpFileRequestHandler_DefaultDlnaExtMapEntry ;
-
-/*----------------------------------------------------------------------
-|   PLT_ProtocolInfo
-+---------------------------------------------------------------------*/
-/**
- The PLT_ProtocolInfo class holds information about the protocol info of a 
- given UPnP Media Item resource.
- */
-class PLT_ProtocolInfo
-{
-public:
-    class FieldEntry {
-    public:
-        FieldEntry(const char* key, const char* value) :
-            m_Key(key), m_Value(value) {}
-        NPT_String m_Key;
-        NPT_String m_Value;
-    };
-
-    // class methods
-    static NPT_String  GetMimeTypeFromProtocolInfo(const char* protocol_info);
-    
-    static const char* GetDlnaExtension(const char* mime_type, 
-                                        const PLT_HttpRequestContext* context = NULL);
-    static const char* GetDlnaExtension(const char* mime_type, 
-                                        PLT_DeviceSignature signature = PLT_DEVICE_UNKNOWN);
-    
-    static PLT_ProtocolInfo GetProtocolInfo(const char* filename, 
-                                            bool with_dlna_extension = true, 
-                                            const PLT_HttpRequestContext* context = NULL);
-    static PLT_ProtocolInfo GetProtocolInfo(const char* filename, 
-                                            bool with_dlna_extension = true, 
-                                            PLT_DeviceSignature signature = PLT_DEVICE_UNKNOWN);
-    
-    static PLT_ProtocolInfo GetProtocolInfoFromMimeType(const char* mime_type, 
-                                                        bool with_dlna_extension = true, 
-                                                        const PLT_HttpRequestContext* context = NULL);
-    static PLT_ProtocolInfo GetProtocolInfoFromMimeType(const char* mime_type, 
-                                                        bool with_dlna_extension = true, 
-                                                        PLT_DeviceSignature signature = PLT_DEVICE_UNKNOWN);
-
-    // methods
-    PLT_ProtocolInfo();
-    //PLT_ProtocolInfo(NPT_String protocol_info);
-    PLT_ProtocolInfo(const char* protocol_info);
-    PLT_ProtocolInfo(const char* protocol,
-                     const char* mask,
-                     const char* content_type,
-                     const char* extra);
-    const NPT_String& GetProtocol()     const { return m_Protocol;  }
-    const NPT_String& GetMask()         const { return m_Mask; }
-    const NPT_String& GetContentType()  const { return m_ContentType;  }
-    const NPT_String& GetExtra()        const { return m_Extra; }
-    
-    const NPT_String& GetDLNA_PN()      const { return m_DLNA_PN; }
-
-    bool IsValid() { return m_Valid; }
-
-    NPT_String ToString() const;
-
-    bool Match(const PLT_ProtocolInfo& other) const;
-
-private:
-	typedef enum {
-		PLT_PROTINFO_PARSER_STATE_START,
-		PLT_PROTINFO_PARSER_STATE_PN,
-		PLT_PROTINFO_PARSER_STATE_OP,
-		PLT_PROTINFO_PARSER_STATE_PS,
-		PLT_PROTINFO_PARSER_STATE_CI,
-		PLT_PROTINFO_PARSER_STATE_FLAGS,
-		PLT_PROTINFO_PARSER_STATE_MAXSP,
-		PLT_PROTINFO_PARSER_STATE_OTHER
-	} PLT_ProtocolInfoParserState;
-
-    NPT_Result SetProtocolInfo(const char* protocol_info);
-    NPT_Result ValidateField(const char*  val, 
-                        const char*  valid_chars, 
-                        NPT_Cardinal num_chars = 0); // 0 means variable number of chars
-    NPT_Result ParseExtra(NPT_List<FieldEntry>& entries);
-    NPT_Result ValidateExtra();
-
-private:
-    NPT_String           m_Protocol;
-    NPT_String           m_Mask;
-    NPT_String           m_ContentType;
-    NPT_String           m_Extra;
-    
-    NPT_String           m_DLNA_PN;    // DLNA.ORG_PN Parameter (pn-param)
-    NPT_String           m_DLNA_OP;    // Operations Parameter (op-param)
-    NPT_String           m_DLNA_PS;    // Server-Side PlaySpeeds Parameter (ps-param)
-    NPT_String           m_DLNA_CI;    // Conversion Indicator Flag (ci-param)
-    NPT_String           m_DLNA_FLAGS; // Flags Parameter (flags-param)
-    NPT_String           m_DLNA_MAXSP; // Maximum RTSP Speed Header value (maxsp-param)
-    NPT_List<FieldEntry> m_DLNA_OTHER; // Vendor-defined 4th field Parameters (other-param)
-    
-    bool                 m_Valid;
-};
-
-#endif /* _PLT_PROTOCOL_INFO_H_ */

gpac-2.2.1.tar.gz/extra_lib/include/platinum/PltRingBufferStream.h Deleted

@@ -1,121 +0,0 @@
-/*****************************************************************
-|
-|   Platinum - Ring buffer stream
-|
-| Copyright (c) 2004-2010, Plutinosoft, LLC.
-| All rights reserved.
-| http://www.plutinosoft.com
-|
-| This program is free software; you can redistribute it and/or
-| modify it under the terms of the GNU General Public License
-| as published by the Free Software Foundation; either version 2
-| of the License, or (at your option) any later version.
-|
-| OEMs, ISVs, VARs and other distributors that combine and 
-| distribute commercially licensed software with Platinum software
-| and do not wish to distribute the source code for the commercially
-| licensed software under version 2, or (at your option) any later
-| version, of the GNU General Public License (the "GPL") must enter
-| into a commercial license agreement with Plutinosoft, LLC.
-| licensing@plutinosoft.com
-|  
-| This program 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 General Public License for more details.
-|
-| You should have received a copy of the GNU General Public License
-| along with this program; see the file LICENSE.txt. If not, write to
-| the Free Software Foundation, Inc., 
-| 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-| http://www.gnu.org/licenses/gpl-2.0.html
-|
-****************************************************************/
-
-#ifndef _PLT_RING_BUFFER_STREAM_H_
-#define _PLT_RING_BUFFER_STREAM_H_
-
-/*----------------------------------------------------------------------
-|   includes
-+---------------------------------------------------------------------*/
-#include "NptStreams.h"
-#include "NptRingBuffer.h"
-#include "NptThreads.h"
-
-/*----------------------------------------------------------------------
-|   PLT_RingBufferStream class
-+---------------------------------------------------------------------*/
-class PLT_RingBufferStream : public NPT_DelegatingInputStream,   
-                             public NPT_DelegatingOutputStream
-{
-public:
-    PLT_RingBufferStream(NPT_Size buffer_size = 4096, bool blocking = true);
-    PLT_RingBufferStream(NPT_RingBufferReference& buffer, bool blocking = true);
-    virtual ~PLT_RingBufferStream();
-    
-    // methods
-    bool IsAborted() { return m_Aborted; }
-    
-    // NPT_InputStream methods
-    NPT_Result Read(void*     buffer, 
-                    NPT_Size  bytes_to_read, 
-                    NPT_Size* bytes_read = NULL);
-    NPT_Result GetSize(NPT_LargeSize& size)  {
-        NPT_COMPILER_UNUSED(size);
-        return NPT_ERROR_NOT_SUPPORTED;
-    }
-    NPT_Result GetSpace(NPT_LargeSize& space) { 
-        NPT_AutoLock autoLock(m_Lock);
-        space = m_RingBuffer->GetSpace();
-        return NPT_SUCCESS;
-    }
-    NPT_Result GetAvailable(NPT_LargeSize& available) { 
-        NPT_AutoLock autoLock(m_Lock);
-        available = m_RingBuffer->GetAvailable();
-        return NPT_SUCCESS;
-    }
-
-    // NPT_OutputStream methods
-    NPT_Result Write(const void* buffer, 
-                     NPT_Size    bytes_to_write, 
-                     NPT_Size*   bytes_written = NULL);
-    NPT_Result Flush();
-    NPT_Result SetEOS();
-    NPT_Result Abort();
-
-protected:
-    // NPT_DelegatingInputStream methods
-    NPT_Result InputSeek(NPT_Position offset) {
-        NPT_COMPILER_UNUSED(offset);
-        return NPT_ERROR_NOT_SUPPORTED;
-    }
-    NPT_Result InputTell(NPT_Position& offset) { 
-        NPT_AutoLock autoLock(m_Lock);
-        offset = m_TotalBytesRead; 
-        return NPT_SUCCESS;
-    }
-
-    // NPT_DelegatingOutputStream methods
-    NPT_Result OutputSeek(NPT_Position offset) {
-        NPT_COMPILER_UNUSED(offset);
-        return NPT_ERROR_NOT_SUPPORTED;
-    }
-    NPT_Result OutputTell(NPT_Position& offset) {
-        NPT_AutoLock autoLock(m_Lock);
-        offset = m_TotalBytesWritten; 
-        return NPT_SUCCESS;
-    }
-
-private:
-    NPT_RingBufferReference m_RingBuffer;
-    NPT_Offset              m_TotalBytesRead;
-    NPT_Offset              m_TotalBytesWritten;
-    NPT_Mutex               m_Lock;
-    bool                    m_Blocking;
-    bool                    m_Eos;
-    bool                    m_Aborted;
-};
-
-typedef NPT_Reference<PLT_RingBufferStream> PLT_RingBufferStreamReference;
-
-#endif // _PLT_RING_BUFFER_STREAM_H_

gpac-2.2.1.tar.gz/extra_lib/include/platinum/PltService.h Deleted

@@ -1,521 +0,0 @@
-/*****************************************************************
-|
-|   Platinum - Service
-|
-| Copyright (c) 2004-2010, Plutinosoft, LLC.
-| All rights reserved.
-| http://www.plutinosoft.com
-|
-| This program is free software; you can redistribute it and/or
-| modify it under the terms of the GNU General Public License
-| as published by the Free Software Foundation; either version 2
-| of the License, or (at your option) any later version.
-|
-| OEMs, ISVs, VARs and other distributors that combine and 
-| distribute commercially licensed software with Platinum software
-| and do not wish to distribute the source code for the commercially
-| licensed software under version 2, or (at your option) any later
-| version, of the GNU General Public License (the "GPL") must enter
-| into a commercial license agreement with Plutinosoft, LLC.
-| licensing@plutinosoft.com
-|  
-| This program 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 General Public License for more details.
-|
-| You should have received a copy of the GNU General Public License
-| along with this program; see the file LICENSE.txt. If not, write to
-| the Free Software Foundation, Inc., 
-| 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-| http://www.gnu.org/licenses/gpl-2.0.html
-|
-****************************************************************/
-
-/** @file
- UPnP Service
- */
-
-#ifndef _PLT_SERVICE_H_
-#define _PLT_SERVICE_H_
-
-/*----------------------------------------------------------------------
-|    includes
-+---------------------------------------------------------------------*/
-#include "Neptune.h"
-#include "PltEvent.h"
-#include "PltArgument.h"
-#include "PltStateVariable.h"
-#include "PltAction.h"
-
-/*----------------------------------------------------------------------
-|    forward declarations
-+---------------------------------------------------------------------*/
-class PLT_DeviceData;
-
-/*----------------------------------------------------------------------
-|    PLT_Service class
-+---------------------------------------------------------------------*/
-/**
- UPnP Service.
- The PLT_Service class holds information about a UPnP service of a given device.
- It maintains a list of actions and state variables. A PLT_DeviceData instance can own 
- one or more PLT_Service instances. When a PLT_Service is advertised as part of a
- a UPnP Device (PLT_DeviceHost), it also maintains a list of subscribers to nofify when
- state variables change.
- */
-class PLT_Service
-{
-public:
-    // methods
-    /**
-     Create an instance of a UPnP Service either hosted or discovered.
-     @param device Pointer to the PLT_DeviceData the service is associated to
-     @param type String representing the UPnP service type
-     @param id String representing the UPnP service id
-     @param name A String to create unique service SCPD, control and eventing urls
-     @param last_change_namespace A String for the LastChange state variable namespace if any
-     */
-    PLT_Service(PLT_DeviceData* device,
-                const char*     type, 
-                const char*     id,
-                const char*     name,
-                const char*     last_change_namespace = NULL);
-    virtual ~PLT_Service();
-    
-    // methods
-    /**
-     When service is hosted by a PLT_DeviceHost, this setups the SCPD, control and event urls.
-     @param service_name the service name used to format unique urls
-     */
-    NPT_Result InitURLs(const char* service_name);
-    
-    /**
-     Verify the service has been properly initialized or is a valid discovered service.
-     @return true if valid.
-     */
-    bool IsValid() {  return (m_ActionDescs.GetItemCount() > 0); }
-    
-    /**
-     When a PLT_DeviceHost needs to change more than one state variables at a time
-     but would rather send only one event with all state variable changes, this can be 
-     used to pause and resume the automatic eventing.
-     @param pause Flag to indicate if eventing should be paused or resumed 
-     */
-    NPT_Result PauseEventing(bool pause = true);
-
-    // class methods
-    static bool IsTrue(const NPT_String& value) {
-        if (value.Compare("1", true)    && 
-            value.Compare("true", true) && 
-            value.Compare("yes", true)) {
-            return false;
-        }
-        return true;
-    }
-
-    // accessor methods
-    /**
-     Set the SCPD url for control points to be able to fetch the SCPD xml document.
-     @param url relative path of SCPD url
-     */
-    NPT_Result SetSCPDURL(const char* url)     { m_SCPDURL = url; return NPT_SUCCESS; }
-    
-    /*
-     Set the Service Control url for control points to be able to invoke actions.
-     @param url relative path of control url
-     */
-    NPT_Result SetControlURL(const char* url)  { m_ControlURL = url; return NPT_SUCCESS; };
-    
-    /**
-     Set the Service Event subscription url for control points to be able to subscribe
-     to events.
-     @param url relative path of even url
-     */
-    NPT_Result SetEventSubURL(const char* url) { m_EventSubURL = url; return NPT_SUCCESS; };
-    
-    /**
-     Return the SCPD url associated with this service.
-     @param absolute flag to indicate if absolute url including ip and port should
-     be returned
-     @return SCPD url
-     */
-    NPT_String GetSCPDURL(bool absolute = false);
-    
-    /**
-     Return the Control url associated with this service.
-     @param absolute flag to indicate if absolute url including ip and port should
-     be returned
-     @return Control url
-     */
-    NPT_String GetControlURL(bool absolute = false);
-    
-    /**
-     Return the Event subscription url associated with this service.
-     @param absolute flag to indicate if absolute url including ip and port should
-     be returned
-     @return Event url
-     */
-    NPT_String GetEventSubURL(bool absolute = false);
-    
-    /**
-     Return the service id.
-     @return service id
-     */
-    const NPT_String& GetServiceID() const { return m_ServiceID;   }
-    
-    /**
-     Return the service type.
-     @return service type
-     */
-    const NPT_String& GetServiceType() const { return m_ServiceType; }
-
-    /**
-     Return the service friendly name.
-     @return service name
-     */
-    const NPT_String& GetServiceName() const { return m_ServiceName; } 
-
-    /**
-     Return the PLT_DeviceData* the service is associated with.
-     @return PLT_DeviceData pointer
-     */
-    PLT_DeviceData* GetDevice() { return m_Device;      }
-    
-    /**
-     When a control point discover a new service with a higher version number
-     than it can work with, a lower version can be set to force backward 
-     compatibility.
-     @param version Integer specifying the version to use
-     */
-    NPT_Result ForceVersion(NPT_Cardinal version);
-
-    /**
-     Return the service SCPD xml document.
-     @param xml String to receive document
-     */
-    NPT_Result GetSCPDXML(NPT_String& xml);
-    
-    /**
-     Set the service SCPD xml document.
-     @param xml String SCPD xml document
-     */
-    NPT_Result SetSCPDXML(const char* xml);
-    
-    /**
-     Populate the UPnP Device description document with service information.
-     @param parent XML Element where to insert the service XML Element
-     @param service Pointer to service XML Element node newly created so it can be
-     extended with additional non standard information.
-     */
-    NPT_Result GetDescription(NPT_XmlElementNode* parent, NPT_XmlElementNode** service = NULL);
-
-    /**
-     Set a new value for a given state variable. The service keeps track of which
-     state variables have changed and events are being triggered by a PLT_ServiceEventTask
-     when necessary.
-     @param name state variable name
-     @param value new State Variable value.
-     */
-    NPT_Result SetStateVariable(const char* name, const char* value);
-    
-    /**
-     Certain state variables notifications must not be sent faster than a certain 
-     rate according to the UPnP specs. This sets the rate for a given state variable.
-     @param name state variable name
-     @param rate a time interval specifying the minimum interval allowed between
-     notifications.
-     */
-    NPT_Result SetStateVariableRate(const char* name, NPT_TimeInterval rate);
-    
-    /**
-     Certain state variables require extra xml attributes when serialized.
-     @param name state variable name
-     @param key the attribute name
-     @param value the attribute value
-     */
-	NPT_Result SetStateVariableExtraAttribute(const char* name, const char* key, const char* value);
-    
-    /**
-     Helper function to increment a state variable representing a number.
-     @param name state variable name
-     */
-    NPT_Result IncStateVariable(const char* name);
-    
-    /**
-     Return the PLT_StateVariable pointer given a state variable name.
-     @param name state variable name
-     @return PLT_StateVariable pointer
-     */
-    PLT_StateVariable* FindStateVariable(const char* name);
-    
-    /**
-     Return the state variable value given a state variable name.
-     @param name state variable name
-     @param value state variable value output
-     */
-    NPT_Result GetStateVariableValue(const char* name, NPT_String& value);
-    
-    /**
-     Return whether a service is capable of sending events.
-     @return true if sending events
-     */
-    bool IsSubscribable();
-    
-    /**
-     Return the list of state variables.
-     @return list of state variable pointers.
-     */
-    const NPT_List<PLT_StateVariable*>& GetStateVariables() const { return m_StateVars; }
-
-    /**
-     Return the PLT_ActionDesc given an action name
-     @param name action name
-     @return PLT_ActioDesc pointer
-     */
-    PLT_ActionDesc* FindActionDesc(const char* name);
-    
-    /**
-     Return an array of actions descriptions PLT_ActionDesc.
-     @return array of PLT_ActionDesc pointers.
-     */
-    const NPT_Array<PLT_ActionDesc*>& GetActionDescs() const { return m_ActionDescs; }
-
-private:    
-    /**
-     A task to send events.
-     The PLT_ServiceEventTask is started when receiving a first subscription. It
-     monitors if some state variables have changed and sends events to all
-     subscribers if so.
-     */
-    class PLT_ServiceEventTask : public PLT_ThreadTask {
-    public:
-        PLT_ServiceEventTask(PLT_Service* service) : m_Service(service) {}
-        
-        void DoRun() { 
-            while (!IsAborting(100)) m_Service->NotifyChanged();
-        }
-        
-    private:
-        PLT_Service* m_Service;
-    };
-    
-    // methods
-    void Cleanup();
-    
-    /**
-     Called by a PLT_StateVariable to keep track of what events need to be 
-     sent by the PLT_ServiceEventTask task.
-     @param var PLT_StateVariable pointer
-     */
-    NPT_Result AddChanged(PLT_StateVariable* var);
-    
-    /**
-     Certain UPnP services combine state variable changes into one single
-     state variable called "LastChange". This function updates the LastChange
-     state variable by looking through the list passed for state variables that
-     are not individually evented.
-     */
-    NPT_Result UpdateLastChange(NPT_List<PLT_StateVariable*>& vars);
-    
-    /**
-     Send state variable change events to all subscribers.
-     */
-    NPT_Result NotifyChanged();
-
-    // Events
-    /**
-     Called by PLT_DeviceHost when it receives a request for a new subscription.
-     */
-    NPT_Result ProcessNewSubscription(
-        PLT_TaskManager*         task_manager,
-        const NPT_SocketAddress& addr, 
-        const NPT_String&        callback_urls, 
-        int                      timeout, 
-        NPT_HttpResponse&        response);
-    
-    /**
-     Called by PLT_DeviceHost when it receives a request renewing an existing
-     subscription.
-     */
-    NPT_Result ProcessRenewSubscription(
-        const NPT_SocketAddress& addr, 
-        const NPT_String&        sid, 
-        int                      timeout,
-        NPT_HttpResponse&        response);
-    
-    /**
-     Called by PLT_DeviceHost when it receives a request to cancel an existing
-     subscription.
-     */
-    NPT_Result ProcessCancelSubscription(
-        const NPT_SocketAddress& addr, 
-        const NPT_String&        sid, 
-        NPT_HttpResponse&        response);
-
-
-protected:
-    // friends that need to call private functions
-    friend class PLT_StateVariable; // AddChanged
-    friend class PLT_DeviceHost;    // ProcessXXSubscription
-    
-    //members
-    PLT_DeviceData*                         m_Device;
-    NPT_String                              m_ServiceType;
-    NPT_String                              m_ServiceID;
-	NPT_String                              m_ServiceName;
-    NPT_String                              m_SCPDURL;
-    NPT_String                              m_ControlURL;
-    NPT_String                              m_EventSubURL;
-    PLT_ServiceEventTask*                   m_EventTask;
-    NPT_Array<PLT_ActionDesc*>              m_ActionDescs;
-    NPT_List<PLT_StateVariable*>            m_StateVars;
-    NPT_Mutex                               m_Lock;
-    NPT_List<PLT_StateVariable*>            m_StateVarsChanged;
-    NPT_List<PLT_StateVariable*>            m_StateVarsToPublish;
-    NPT_List<PLT_EventSubscriberReference>  m_Subscribers;
-    bool                                    m_EventingPaused;
-    NPT_String                              m_LastChangeNamespace;
-};
-
-/*----------------------------------------------------------------------
-|    PLT_ServiceSCPDURLFinder
-+---------------------------------------------------------------------*/
-/** 
- The PLT_ServiceSCPDURLFinder class returns an instance of a PLT_Service given a 
- service SCPD url.
- */
-class PLT_ServiceSCPDURLFinder
-{
-public:
-    // methods
-    PLT_ServiceSCPDURLFinder(const char* url) : m_URL(url) {}
-    virtual ~PLT_ServiceSCPDURLFinder() {}
-    bool operator()(PLT_Service* const & service) const;
-
-private:
-    // members
-    NPT_String m_URL;
-};
-
-/*----------------------------------------------------------------------
-|    PLT_ServiceControlURLFinder
-+---------------------------------------------------------------------*/
-/** 
- The PLT_ServiceControlURLFinder class returns an instance of a PLT_Service 
- given a service control url.
- */
-class PLT_ServiceControlURLFinder
-{
-public:
-    // methods
-    PLT_ServiceControlURLFinder(const char* url) : m_URL(url) {}
-    virtual ~PLT_ServiceControlURLFinder() {}
-    bool operator()(PLT_Service* const & service) const;
-
-private:
-    // members
-    NPT_String m_URL;
-};
-
-/*----------------------------------------------------------------------
-|    PLT_ServiceEventSubURLFinder
-+---------------------------------------------------------------------*/
-/** 
- The PLT_ServiceEventSubURLFinder class returns an instance of a PLT_Service 
- given a service event subscription url.
- */
-class PLT_ServiceEventSubURLFinder
-{
-public:
-    // methods
-    PLT_ServiceEventSubURLFinder(const char* url) : m_URL(url) {}
-    virtual ~PLT_ServiceEventSubURLFinder() {}
-    bool operator()(PLT_Service* const & service) const;
-
-private:
-    // members
-    NPT_String m_URL;
-};
-
-/*----------------------------------------------------------------------
-|    PLT_ServiceIDFinder
-+---------------------------------------------------------------------*/
-/** 
- The PLT_ServiceIDFinder class returns an instance of a PLT_Service given a 
- service id.
- */
-class PLT_ServiceIDFinder
-{
-public:
-    // methods
-    PLT_ServiceIDFinder(const char* id) : m_Id(id) {}
-    virtual ~PLT_ServiceIDFinder() {}
-    bool operator()(PLT_Service* const & service) const;
-
-private:
-    // members
-    NPT_String m_Id;
-};
-
-/*----------------------------------------------------------------------
-|    PLT_ServiceTypeFinder
-+---------------------------------------------------------------------*/
-/** 
- The PLT_ServiceTypeFinder class returns an instance of a PLT_Service given a 
- service type.
- */
-class PLT_ServiceTypeFinder
-{
-public:
-    // methods
-    PLT_ServiceTypeFinder(const char* type) : m_Type(type) {}
-    virtual ~PLT_ServiceTypeFinder() {}
-    bool operator()(PLT_Service* const & service) const;
-
-private:
-    // members
-    NPT_String m_Type;
-};
-
-/*----------------------------------------------------------------------
-|    PLT_ServiceNameFinder
-+---------------------------------------------------------------------*/
-/** 
- The PLT_ServiceNameFinder class returns an instance of a PLT_Service given a 
- service name.
- */
-class PLT_ServiceNameFinder
-{
-public:
-    // methods
-    PLT_ServiceNameFinder(const char* name) : m_Name(name) {}
-    virtual ~PLT_ServiceNameFinder() {}
-    bool operator()(PLT_Service* const & service) const;
-
-private:
-    // members
-    NPT_String m_Name;
-};
-
-/*----------------------------------------------------------------------
-|    PLT_LastChangeXMLIterator
-+---------------------------------------------------------------------*/
-/**
- The PLT_LastChangeXMLIterator class is used to serialize the LastChange variable
- changes into xml given a list of state variables.
- */
-class PLT_LastChangeXMLIterator
-{
-public:
-    // methods
-    PLT_LastChangeXMLIterator(NPT_XmlElementNode* node) : m_Node(node) {}
-    virtual ~PLT_LastChangeXMLIterator() {}
-
-    NPT_Result operator()(PLT_StateVariable* const & var) const;
-
-private:
-    NPT_XmlElementNode* m_Node;
-};
-
-#endif /* _PLT_SERVICE_H_ */

gpac-2.2.1.tar.gz/extra_lib/include/platinum/PltSsdp.h Deleted

@@ -1,379 +0,0 @@
-/*****************************************************************
-|
-|   Platinum - SSDP
-|
-| Copyright (c) 2004-2010, Plutinosoft, LLC.
-| All rights reserved.
-| http://www.plutinosoft.com
-|
-| This program is free software; you can redistribute it and/or
-| modify it under the terms of the GNU General Public License
-| as published by the Free Software Foundation; either version 2
-| of the License, or (at your option) any later version.
-|
-| OEMs, ISVs, VARs and other distributors that combine and 
-| distribute commercially licensed software with Platinum software
-| and do not wish to distribute the source code for the commercially
-| licensed software under version 2, or (at your option) any later
-| version, of the GNU General Public License (the "GPL") must enter
-| into a commercial license agreement with Plutinosoft, LLC.
-| licensing@plutinosoft.com
-|  
-| This program 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 General Public License for more details.
-|
-| You should have received a copy of the GNU General Public License
-| along with this program; see the file LICENSE.txt. If not, write to
-| the Free Software Foundation, Inc., 
-| 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-| http://www.gnu.org/licenses/gpl-2.0.html
-|
-****************************************************************/
-
-/** @file
- UPnP SSDP
- */
-
-#ifndef _PLT_SSDP_H_
-#define _PLT_SSDP_H_
-
-/*----------------------------------------------------------------------
-|   includes
-+---------------------------------------------------------------------*/
-#include "Neptune.h"
-#include "PltThreadTask.h"
-#include "PltHttpServerTask.h"
-
-/*----------------------------------------------------------------------
-|   forward declarations
-+---------------------------------------------------------------------*/
-class PLT_DeviceHost;
-
-/*----------------------------------------------------------------------
-|   PLT_SsdpPacketListener class
-+---------------------------------------------------------------------*/
-/**
- The PLT_SsdpPacketListener class is an interface for handling SSDP packets
- (M-SEARCH and NOTIFY).
- */
-class PLT_SsdpPacketListener
-{
-public:
-    virtual ~PLT_SsdpPacketListener() {}
-    virtual NPT_Result OnSsdpPacket(const NPT_HttpRequest&        request, 
-                                    const NPT_HttpRequestContext& context) = 0;
-};
-
-/*----------------------------------------------------------------------
-|   PLT_SsdpSearchResponseListener class
-+---------------------------------------------------------------------*/
-/**
- The PLT_SsdpSearchResponseListener class is an interface for handling SSDP M-SEARCH 
- responses.
- */
-class PLT_SsdpSearchResponseListener
-{
-public:
-    virtual ~PLT_SsdpSearchResponseListener() {}
-    virtual NPT_Result ProcessSsdpSearchResponse(NPT_Result                    res,  
-                                                 const NPT_HttpRequestContext& context,
-                                                 NPT_HttpResponse*             response) = 0;
-};
-
-/*----------------------------------------------------------------------
-|   PLT_SsdpSender class
-+---------------------------------------------------------------------*/
-/**
- The PLT_SsdpSender class provides a mechanism to format and send SSDP packets.
- */
-class PLT_SsdpSender
-{
-public:
-    static NPT_Result SendSsdp(NPT_HttpRequest&   request, 
-                               const char*        usn,
-                               const char*        nt,
-                               NPT_UdpSocket&     socket,
-                               bool               notify,
-                               const NPT_SocketAddress* addr = NULL);
-     
-    static NPT_Result SendSsdp(NPT_HttpResponse&  response,
-                               const char*        usn,
-                               const char*        nt,
-                               NPT_UdpSocket&     socket,
-                               bool               notify, 
-                               const NPT_SocketAddress* addr = NULL);
-
-private:
-    static NPT_Result FormatPacket(NPT_HttpMessage&   message,
-                                   const char*        usn,
-                                   const char*        nt,
-                                   NPT_UdpSocket&     socket,
-                                   bool               notify);
-};
-
-/*----------------------------------------------------------------------
-|   PLT_SsdpDeviceSearchResponseInterfaceIterator class
-+---------------------------------------------------------------------*/
-/**
- The PLT_SsdpDeviceSearchResponseInterfaceIterator class looks for the best network
- interface to use then sends a SSDP M-SEARCH response.
- */
-class PLT_SsdpDeviceSearchResponseInterfaceIterator
-{
-public:
-    PLT_SsdpDeviceSearchResponseInterfaceIterator(PLT_DeviceHost*   device, 
-                                                  NPT_SocketAddress remote_addr,
-                                                  const char*       st) :
-        m_Device(device), m_RemoteAddr(remote_addr), m_ST(st)  {}
-    virtual ~PLT_SsdpDeviceSearchResponseInterfaceIterator() {}
-      
-    NPT_Result operator()(NPT_NetworkInterface*& if_addr) const;
-
-private:
-    PLT_DeviceHost*   m_Device;
-    NPT_SocketAddress m_RemoteAddr;
-    NPT_String        m_ST;
-};
-
-/*----------------------------------------------------------------------
-|   PLT_SsdpDeviceSearchResponseTask class
-+---------------------------------------------------------------------*/
-/**
- The PLT_SsdpDeviceSearchResponseTask class is used by a PLT_DeviceHost to respond
- to SSDP M-SEARCH requests from UPnP ControlPoints.
- */
-class PLT_SsdpDeviceSearchResponseTask : public PLT_ThreadTask
-{
-public:
-    PLT_SsdpDeviceSearchResponseTask(PLT_DeviceHost*   device, 
-                                     NPT_SocketAddress remote_addr,
-                                     const char*       st) : 
-        m_Device(device), m_RemoteAddr(remote_addr), m_ST(st) {}
-
-protected:
-    virtual ~PLT_SsdpDeviceSearchResponseTask() {}
-
-    // PLT_ThreadTask methods
-    virtual void DoRun();
-    
-protected:
-    PLT_DeviceHost*     m_Device;
-    NPT_SocketAddress   m_RemoteAddr;
-    NPT_String          m_ST;
-};
-
-/*----------------------------------------------------------------------
-|   PLT_SsdpAnnounceInterfaceIterator class
-+---------------------------------------------------------------------*/
-/**
- The PLT_SsdpAnnounceInterfaceIterator class is used to send SSDP announcements 
- given a list of network interaces. 
- */
-class PLT_SsdpAnnounceInterfaceIterator
-{
-public:
-    PLT_SsdpAnnounceInterfaceIterator(PLT_DeviceHost* device, bool is_byebye = false, bool broadcast = false) :
-        m_Device(device), m_IsByeBye(is_byebye), m_Broadcast(broadcast) {}
-      
-    NPT_Result operator()(NPT_NetworkInterface*& if_addr) const;
-    
-private:
-    PLT_DeviceHost* m_Device;
-    bool            m_IsByeBye;
-    bool            m_Broadcast;
-};
-
-/*----------------------------------------------------------------------
-|   PLT_SsdpInitMulticastIterator class
-+---------------------------------------------------------------------*/
-/** 
- The PLT_SsdpInitMulticastIterator class is used to join a multicast group 
- given a list of IP addresses.
- */
-class PLT_SsdpInitMulticastIterator
-{
-public:
-    PLT_SsdpInitMulticastIterator(NPT_UdpMulticastSocket* socket) :
-        m_Socket(socket) {}
-
-    NPT_Result operator()(NPT_IpAddress& if_addr) const {
-        NPT_IpAddress addr;
-        addr.ResolveName("239.255.255.250");
-        // OSX bug, since we're reusing the socket, we need to leave group first
-        // before joining it
-        m_Socket->LeaveGroup(addr, if_addr);
-        return m_Socket->JoinGroup(addr, if_addr);
-    }
-
-private:
-    NPT_UdpMulticastSocket* m_Socket;
-};
-
-/*----------------------------------------------------------------------
-|   PLT_SsdpDeviceAnnounceTask class
-+---------------------------------------------------------------------*/
-/**
- The PLT_SsdpDeviceAnnounceTask class is a task to send UPnP Device SSDP announcements
- (alive or byebye). It can be setup to automatically repeat after an interval.
- */
-class PLT_SsdpDeviceAnnounceTask : public PLT_ThreadTask
-{
-public:
-    PLT_SsdpDeviceAnnounceTask(PLT_DeviceHost*  device, 
-                               NPT_TimeInterval repeat,
-                               bool             is_byebye_first = false,
-                               bool             extra_broadcast = false) : 
-        m_Device(device), 
-        m_Repeat(repeat), m_IsByeByeFirst(is_byebye_first), 
-        m_ExtraBroadcast(extra_broadcast) {}
-
-protected:
-    virtual ~PLT_SsdpDeviceAnnounceTask() {}
-
-    // PLT_ThreadTask methods
-    virtual void DoRun();
-
-protected:
-    PLT_DeviceHost*             m_Device;
-    NPT_TimeInterval            m_Repeat;
-    bool                        m_IsByeByeFirst;
-    bool                        m_ExtraBroadcast;
-};
-
-/*----------------------------------------------------------------------
-|   PLT_NetworkInterfaceAddressSearchIterator class
-+---------------------------------------------------------------------*/
-/**
- The PLT_NetworkInterfaceAddressSearchIterator class returns the network interface
- given an IP address.
- */
-class PLT_NetworkInterfaceAddressSearchIterator
-{
-public:
-    PLT_NetworkInterfaceAddressSearchIterator(NPT_String ip) : m_Ip(ip)  {}
-    virtual ~PLT_NetworkInterfaceAddressSearchIterator() {}
-
-    NPT_Result operator()(NPT_NetworkInterface*& addr) const {
-        NPT_List<NPT_NetworkInterfaceAddress>::Iterator niaddr = addr->GetAddresses().GetFirstItem();
-        if (!niaddr) return NPT_FAILURE;
-
-        return (m_Ip.Compare((*niaddr).GetPrimaryAddress().ToString(), true) == 0) ? NPT_SUCCESS : NPT_FAILURE;
-    }
-
-private:
-    NPT_String m_Ip;
-};
-
-/*----------------------------------------------------------------------
-|   PLT_SsdpPacketListenerIterator class
-+---------------------------------------------------------------------*/
-/**
- The PLT_SsdpPacketListenerIterator class iterates through a list of 
- PLT_SsdpPacketListener instances to notify of a new SSDP incoming packet.
- */
-class PLT_SsdpPacketListenerIterator
-{
-public:
-    PLT_SsdpPacketListenerIterator(NPT_HttpRequest&              request, 
-                                   const NPT_HttpRequestContext& context) :
-      m_Request(request), m_Context(context) {}
-
-    NPT_Result operator()(PLT_SsdpPacketListener*& listener) const {
-        return listener->OnSsdpPacket(m_Request, m_Context);
-    }
-
-private:
-    NPT_HttpRequest&              m_Request;
-    const NPT_HttpRequestContext& m_Context;
-};
-
-/*----------------------------------------------------------------------
-|   PLT_SsdpListenTask class
-+---------------------------------------------------------------------*/
-/**
- The PLT_SsdpListenTask class is used to listen for incoming SSDP packets and 
- keep track of a list of PLT_SsdpPacketListener listeners to notify when a new 
- SSDP packet has arrived.
- */
-class PLT_SsdpListenTask : public PLT_HttpServerSocketTask
-{
-public:
-    PLT_SsdpListenTask(NPT_Socket* socket) : 
-        PLT_HttpServerSocketTask(socket, true) {
-        // Change read time out for UDP because iPhone 3.0 seems to hang
-        // after reading everything from the socket even though
-        // more stuff arrived
-#if defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE
-        m_Socket->SetReadTimeout(10000);
-#endif
-    }
-
-    NPT_Result AddListener(PLT_SsdpPacketListener* listener) {
-        NPT_AutoLock lock(m_Mutex);
-        m_Listeners.Add(listener);
-        return NPT_SUCCESS;
-    }
-
-    NPT_Result RemoveListener(PLT_SsdpPacketListener* listener) {
-        NPT_AutoLock lock(m_Mutex);
-        m_Listeners.Remove(listener);
-        return NPT_SUCCESS;
-    }
-    
-    // PLT_Task methods
-    void DoAbort();
-
-protected:
-    virtual ~PLT_SsdpListenTask() {}
-
-    // PLT_HttpServerSocketTask methods
-    NPT_Result GetInputStream(NPT_InputStreamReference& stream);
-    NPT_Result GetInfo(NPT_SocketInfo& info);
-    NPT_Result SetupResponse(NPT_HttpRequest&              request, 
-                             const NPT_HttpRequestContext& context,
-                             NPT_HttpResponse&             response);
-
-protected:
-    PLT_InputDatagramStreamReference  m_Datagram;
-    NPT_List<PLT_SsdpPacketListener*> m_Listeners;
-    NPT_Mutex                         m_Mutex;
-};
-
-/*----------------------------------------------------------------------
-|   PLT_SsdpSearchTask class
-+---------------------------------------------------------------------*/
-/**
- The PLT_SsdpSearchTask class is a task used by a PLT_CtrlPoint to issue a SSDP
- M-SEARCH request. It can be set to repeat at a certain frequencey.
- */
-class PLT_SsdpSearchTask : public PLT_ThreadTask
-{
-public:
-    PLT_SsdpSearchTask(NPT_UdpSocket*                  socket,
-                       PLT_SsdpSearchResponseListener* listener, 
-                       NPT_HttpRequest*                request,
-                       NPT_TimeInterval                frequency = NPT_TimeInterval(0.)); // pass 0 for one time
-
-protected:
-    virtual ~PLT_SsdpSearchTask();
-
-    // PLT_ThreadTask methods
-    virtual void DoAbort();
-    virtual void DoRun();
-
-    virtual NPT_Result ProcessResponse(NPT_Result                    res, 
-                                       const NPT_HttpRequest&        request,  
-                                       const NPT_HttpRequestContext& context,
-                                       NPT_HttpResponse*             response);
-
-private:
-    PLT_SsdpSearchResponseListener* m_Listener;
-    NPT_HttpRequest*                m_Request;
-    NPT_TimeInterval                m_Frequency;
-    bool                            m_Repeat;
-    NPT_UdpSocket*                  m_Socket;
-};
-
-#endif /* _PLT_SSDP_H_ */

gpac-2.2.1.tar.gz/extra_lib/include/platinum/PltSsdpListener.h Deleted

@@ -1,65 +0,0 @@
-/*****************************************************************
-|
-|   Platinum - SSDP Listener
-|
-| Copyright (c) 2004-2008, Plutinosoft, LLC.
-| All rights reserved.
-| http://www.plutinosoft.com
-|
-| This program is free software; you can redistribute it and/or
-| modify it under the terms of the GNU General Public License
-| as published by the Free Software Foundation; either version 2
-| of the License, or (at your option) any later version.
-|
-| OEMs, ISVs, VARs and other distributors that combine and 
-| distribute commercially licensed software with Platinum software
-| and do not wish to distribute the source code for the commercially
-| licensed software under version 2, or (at your option) any later
-| version, of the GNU General Public License (the "GPL") must enter
-| into a commercial license agreement with Plutinosoft, LLC.
-| 
-| This program 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 General Public License for more details.
-|
-| You should have received a copy of the GNU General Public License
-| along with this program; see the file LICENSE.txt. If not, write to
-| the Free Software Foundation, Inc., 
-| 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-| http://www.gnu.org/licenses/gpl-2.0.html
-|
-****************************************************************/
-
-#ifndef _PLT_SSDP_LISTENER_H_
-#define _PLT_SSDP_LISTENER_H_
-
-/*----------------------------------------------------------------------
-|   includes
-+---------------------------------------------------------------------*/
-#include "Neptune.h"
-
-/*----------------------------------------------------------------------
-|   PLT_SsdpPacketListener class
-+---------------------------------------------------------------------*/
-class PLT_SsdpPacketListener
-{
-public:
-    virtual ~PLT_SsdpPacketListener() {}
-    virtual NPT_Result OnSsdpPacket(NPT_HttpRequest&              request, 
-                                    const NPT_HttpRequestContext& context) = 0;
-};
-
-/*----------------------------------------------------------------------
-|   PLT_SsdpSearchResponseListener class
-+---------------------------------------------------------------------*/
-class PLT_SsdpSearchResponseListener
-{
-public:
-    virtual ~PLT_SsdpSearchResponseListener() {}
-    virtual NPT_Result ProcessSsdpSearchResponse(NPT_Result                    res,  
-                                                 const NPT_HttpRequestContext& context,
-                                                 NPT_HttpResponse*             response) = 0;
-};
-
-#endif /* _PLT_SSDP_LISTENER_H_ */

gpac-2.2.1.tar.gz/extra_lib/include/platinum/PltStateVariable.h Deleted

@@ -1,223 +0,0 @@
-/*****************************************************************
-|
-|   Platinum - Service State Variable
-|
-| Copyright (c) 2004-2010, Plutinosoft, LLC.
-| All rights reserved.
-| http://www.plutinosoft.com
-|
-| This program is free software; you can redistribute it and/or
-| modify it under the terms of the GNU General Public License
-| as published by the Free Software Foundation; either version 2
-| of the License, or (at your option) any later version.
-|
-| OEMs, ISVs, VARs and other distributors that combine and 
-| distribute commercially licensed software with Platinum software
-| and do not wish to distribute the source code for the commercially
-| licensed software under version 2, or (at your option) any later
-| version, of the GNU General Public License (the "GPL") must enter
-| into a commercial license agreement with Plutinosoft, LLC.
-| licensing@plutinosoft.com
-|  
-| This program 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 General Public License for more details.
-|
-| You should have received a copy of the GNU General Public License
-| along with this program; see the file LICENSE.txt. If not, write to
-| the Free Software Foundation, Inc., 
-| 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-| http://www.gnu.org/licenses/gpl-2.0.html
-|
-****************************************************************/
-
-/** @file
- UPnP State Variable
- */
-
-#ifndef _PLT_STATE_VARIABLE_H_
-#define _PLT_STATE_VARIABLE_H_
-
-/*----------------------------------------------------------------------
-|   includes
-+---------------------------------------------------------------------*/
-#include "Neptune.h"
-
-/*----------------------------------------------------------------------
-|   forward declarations
-+---------------------------------------------------------------------*/
-class PLT_Argument;
-class PLT_Service;
-
-/*----------------------------------------------------------------------
-|   NPT_AllowedValueRange struct
-+---------------------------------------------------------------------*/
-/**
- The NPT_AllowedValueRange struct holds the min, max and step value allowed of
- a UPnP Service state variable.
- */
-typedef struct {
-    NPT_Int32 min_value;
-    NPT_Int32 max_value;
-    NPT_Int32 step;
-} NPT_AllowedValueRange;
-
-/*----------------------------------------------------------------------
-|   PLT_StateVariable class
-+---------------------------------------------------------------------*/
-/**
- The PLT_StateVariable class maintains the state of a UPnP Service state variable. 
- It is used by a PLT_DeviceHost instance to notify subscribers of a change or by a
- subscriber (PLT_CtrlPoint) when a service state variable change notification
- has been received.
- */
-class PLT_StateVariable
-{
-public:
-    PLT_StateVariable(PLT_Service* service);
-    ~PLT_StateVariable();
-
-    /**
-     Populate the SCPD xml document with state variable information.
-     @param node XML Element where to insert the state variable XML Element
-     */
-    NPT_Result GetSCPDXML(NPT_XmlElementNode* node);
-    
-    /**
-     Return the PLT_Service that this state variable is associated with.
-     @return PLT_Service pointer.
-     */
-    PLT_Service* GetService();
-    
-    /**
-     Return whether the state variable is eventable directly or indirectly. A state
-     variable sends events indirectly when part of the "LastChange" state variable.
-     @param indirectly Boolean to test if the state variable is sending events indirectly
-     @return Whether the state variable sends events according to the input flag specified.
-     */
-    bool IsSendingEvents(bool indirectly = false);
-    
-    /**
-     Force the state variable to send events directly.
-     */
-    void DisableIndirectEventing();
-    
-    /**
-     Certain state variables notifications must not be sent faster than a certain 
-     rate according to the UPnP specs. This sets the rate for a given state variable.
-     @param rate time interval to respect between notifications.
-     */
-    NPT_Result SetRate(NPT_TimeInterval rate);
-    
-    /**
-     Set the state variable value. The value is first validated to make sure
-     it is an allowed value. Once the value is validated, it is marked for eventing by
-     calling the PLT_Service AddChanged function.
-     @param value new state variable value. Can be a comma separated list of values.
-     */
-    NPT_Result SetValue(const char* value);
-    
-    /**
-     Validate the new value of the state variable.
-     @param value new state variable value. Can be a comma separated list of values.
-     */
-    NPT_Result ValidateValue(const char* value);
-    
-    /**
-     Certain state variables require extra xml attributes when serialized.
-     @param name the attribute name
-     @param value the attribute value
-     */
-	NPT_Result SetExtraAttribute(const char* name, const char* value);
-
-    /**
-     Return the state variable name.
-     @return state variable name.
-     */
-    const NPT_String& GetName()     const { return m_Name;     }
-    
-    /**
-     Return the current state variable value.
-     @return state variable current value.
-     */
-    const NPT_String& GetValue()    const { return m_Value;    }
-    
-    /**
-     Return the state variable data type.
-     @return state variable data type.
-     */
-    const NPT_String& GetDataType() const { return m_DataType; }
-    
-    /**
-     Return the state variable allowed value range if any.
-     @return state variable value range pointer or null if none.
-     */
-	const NPT_AllowedValueRange* GetAllowedValueRange() const { return m_AllowedValueRange; }
-
-    /**
-     Helper function to return a state variable given a list of state variables
-     and a state variable name.
-     @param vars list of state variables
-     @param name state variable name to look for
-     @return PLT_StateVariable pointer.
-     */
-    static PLT_StateVariable* Find(NPT_List<PLT_StateVariable*>& vars, 
-                                   const char*                   name);
-
-protected:
-    /**
-     Return whether the state variable value changed and subscribers need to
-     be notified.
-     */
-    bool IsReadyToPublish();
-    
-    /**
-     Serialize the state variable into xml.
-     */
-	NPT_Result Serialize(NPT_XmlElementNode& node);
-
-protected:
-    friend class PLT_Service;
-    friend class PLT_LastChangeXMLIterator;
-
-    //members
-    PLT_Service*            m_Service;
-    NPT_AllowedValueRange*  m_AllowedValueRange;
-    NPT_String              m_Name;
-    NPT_String              m_DataType;
-    NPT_String              m_DefaultValue;
-    bool                    m_IsSendingEvents;
-    bool                    m_IsSendingEventsIndirectly;
-    NPT_TimeInterval        m_Rate;
-    NPT_TimeStamp           m_LastEvent;
-    NPT_Array<NPT_String*>  m_AllowedValues;
-    NPT_String              m_Value;
-
-	NPT_Map<NPT_String,NPT_String> m_ExtraAttributes;
-};
-
-/*----------------------------------------------------------------------
-|   PLT_StateVariableNameFinder
-+---------------------------------------------------------------------*/
-/**
- The PLT_StateVariableNameFinder class returns the PLT_StateVariable instance
- given a state variable name.
- */
-class PLT_StateVariableNameFinder 
-{
-public:
-    // methods
-    PLT_StateVariableNameFinder(const char* name) : m_Name(name) {}
-    virtual ~PLT_StateVariableNameFinder() {}
-
-    bool operator()(const PLT_StateVariable* const & state_variable) const {
-        return state_variable->GetName().Compare(m_Name, true) ? false : true;
-    }
-
-private:
-    // members
-    NPT_String   m_Name;
-};
-
-#endif /* _PLT_STATE_VARIABLE_H_ */

gpac-2.2.1.tar.gz/extra_lib/include/platinum/PltStreamPump.h Deleted

@@ -1,132 +0,0 @@
-/*****************************************************************
-|
-|   Platinum - Stream Pump
-|
-| Copyright (c) 2004-2010, Plutinosoft, LLC.
-| All rights reserved.
-| http://www.plutinosoft.com
-|
-| This program is free software; you can redistribute it and/or
-| modify it under the terms of the GNU General Public License
-| as published by the Free Software Foundation; either version 2
-| of the License, or (at your option) any later version.
-|
-| OEMs, ISVs, VARs and other distributors that combine and 
-| distribute commercially licensed software with Platinum software
-| and do not wish to distribute the source code for the commercially
-| licensed software under version 2, or (at your option) any later
-| version, of the GNU General Public License (the "GPL") must enter
-| into a commercial license agreement with Plutinosoft, LLC.
-| licensing@plutinosoft.com
-|  
-| This program 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 General Public License for more details.
-|
-| You should have received a copy of the GNU General Public License
-| along with this program; see the file LICENSE.txt. If not, write to
-| the Free Software Foundation, Inc., 
-| 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-| http://www.gnu.org/licenses/gpl-2.0.html
-|
-****************************************************************/
-
-#ifndef _PLT_STREAM_PUMP_H_
-#define _PLT_STREAM_PUMP_H_
-
-/*----------------------------------------------------------------------
-|   includes
-+---------------------------------------------------------------------*/
-#include "NptStreams.h"
-#include "NptRingBuffer.h"
-
-/*----------------------------------------------------------------------
-|   PLT_PipeInputStream
-+---------------------------------------------------------------------*/
-class PLT_PipeInputStream
-{
-public:
-    // constructor and destructor
-    virtual ~PLT_PipeInputStream() {};
-
-    // methods
-    virtual NPT_Result Receive(NPT_InputStream& stream, NPT_Size max_bytes_to_read, NPT_Size* bytes_read = 0) = 0;
-};
-
-typedef NPT_Reference<PLT_PipeInputStream> PLT_PipeInputStreamReference;
-
-/*----------------------------------------------------------------------
-|   PLT_PipeOutputStream
-+---------------------------------------------------------------------*/
-class PLT_PipeOutputStream
-{
-public:
-    // constructor and destructor
-    virtual ~PLT_PipeOutputStream() {};
-
-    // methods
-    virtual NPT_Result Transmit(NPT_OutputStream& stream) = 0;
-};
-
-typedef NPT_Reference<PLT_PipeOutputStream> PLT_PipeOutputStreamReference;
-
-/*----------------------------------------------------------------------
-|   PLT_StreamPump class
-+---------------------------------------------------------------------*/
-class PLT_StreamPump
-{
-public:
-    virtual ~PLT_StreamPump();
-
-protected:
-    // methods
-    PLT_StreamPump(NPT_Size size = 65535);
-    NPT_Result PullData(NPT_InputStream& input, NPT_Size max_bytes_to_read);
-    NPT_Result PushData(NPT_OutputStream& output, NPT_Size& bytes_written);
-
-    // members
-    NPT_RingBuffer*     m_RingBuffer;
-    NPT_Offset          m_TotalBytesRead;
-    NPT_Offset          m_TotalBytesWritten;
-};
-
-/*----------------------------------------------------------------------
-|   PLT_PipeInputStreamPump class
-+---------------------------------------------------------------------*/
-class PLT_PipeInputStreamPump : public PLT_StreamPump,
-                                public PLT_PipeInputStream
-{
-public:
-    PLT_PipeInputStreamPump(NPT_OutputStreamReference& output, NPT_Size size = 65535);
-    virtual ~PLT_PipeInputStreamPump();
-
-    NPT_Result Receive(NPT_InputStream& input, NPT_Size max_bytes_to_read, NPT_Size* bytes_read);
-
-protected:
-    NPT_OutputStreamReference   m_Output;
-    NPT_Result                  m_LastRes;
-};
-
-/*----------------------------------------------------------------------
-|   PLT_PipeInputStreamPump class
-+---------------------------------------------------------------------*/
-class PLT_PipeOutputStreamPump : public PLT_StreamPump,
-                                 public PLT_PipeOutputStream
-{
-public:
-    PLT_PipeOutputStreamPump(NPT_InputStreamReference& input, 
-                             NPT_Size                  size = 65535,
-                             NPT_Size                  max_bytes_to_read = 0);
-    virtual ~PLT_PipeOutputStreamPump();
-
-    NPT_Result Transmit(NPT_OutputStream& output);
-
-protected:
-    NPT_InputStreamReference    m_Input;
-    NPT_Size                    m_MaxBytesToRead;
-    NPT_Result                  m_LastRes;
-};
-
-
-#endif // _PLT_STREAM_PUMP_H_

gpac-2.2.1.tar.gz/extra_lib/include/platinum/PltSvnVersion.h Deleted

gpac-2.2.1.tar.gz/extra_lib/include/platinum/PltSyncMediaBrowser.h Deleted

@@ -1,173 +0,0 @@
-/*****************************************************************
-|
-|   Platinum - Synchronous Media Browser
-|
-| Copyright (c) 2004-2010, Plutinosoft, LLC.
-| All rights reserved.
-| http://www.plutinosoft.com
-|
-| This program is free software; you can redistribute it and/or
-| modify it under the terms of the GNU General Public License
-| as published by the Free Software Foundation; either version 2
-| of the License, or (at your option) any later version.
-|
-| OEMs, ISVs, VARs and other distributors that combine and 
-| distribute commercially licensed software with Platinum software
-| and do not wish to distribute the source code for the commercially
-| licensed software under version 2, or (at your option) any later
-| version, of the GNU General Public License (the "GPL") must enter
-| into a commercial license agreement with Plutinosoft, LLC.
-| licensing@plutinosoft.com
-|  
-| This program 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 General Public License for more details.
-|
-| You should have received a copy of the GNU General Public License
-| along with this program; see the file LICENSE.txt. If not, write to
-| the Free Software Foundation, Inc., 
-| 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-| http://www.gnu.org/licenses/gpl-2.0.html
-|
-****************************************************************/
-
-/** @file
- UPnP AV Media Controller synchronous implementation.
- */
-
-#ifndef _PLT_SYNC_MEDIA_BROWSER_
-#define _PLT_SYNC_MEDIA_BROWSER_
-
-/*----------------------------------------------------------------------
-|   includes
-+---------------------------------------------------------------------*/
-#include "Neptune.h"
-#include "PltCtrlPoint.h"
-#include "PltMediaBrowser.h"
-#include "PltMediaCache.h"
-
-/*----------------------------------------------------------------------
-|   types
-+---------------------------------------------------------------------*/
-typedef NPT_Map<NPT_String, PLT_DeviceDataReference>         PLT_DeviceMap;
-typedef NPT_Map<NPT_String, PLT_DeviceDataReference>::Entry  PLT_DeviceMapEntry;
-
-typedef struct PLT_BrowseData {
-    NPT_SharedVariable shared_var;
-    NPT_Result         res;
-    PLT_BrowseInfo     info;
-} PLT_BrowseData;
-
-typedef NPT_Reference<PLT_BrowseData> PLT_BrowseDataReference;
-
-/*----------------------------------------------------------------------
-|   PLT_MediaContainerListener
-+---------------------------------------------------------------------*/
-class PLT_MediaContainerChangesListener
-{
-public:
-    virtual ~PLT_MediaContainerChangesListener() {}
-    virtual void OnContainerChanged(PLT_DeviceDataReference& device, 
-                                    const char*              item_id, 
-                                    const char*              update_id) = 0;
-};
-
-/*----------------------------------------------------------------------
-|   PLT_SyncMediaBrowser
-+---------------------------------------------------------------------*/
-class PLT_SyncMediaBrowser : public PLT_MediaBrowser,
-                             public PLT_MediaBrowserDelegate
-{
-public:
-    PLT_SyncMediaBrowser(PLT_CtrlPointReference&            ctrlPoint, 
-                         bool                               use_cache = false, 
-                         PLT_MediaContainerChangesListener* listener = NULL);
-    virtual ~PLT_SyncMediaBrowser();
-
-    // PLT_MediaBrowser methods
-    virtual NPT_Result OnDeviceAdded(PLT_DeviceDataReference& device);
-    virtual NPT_Result OnDeviceRemoved(PLT_DeviceDataReference& device);
-
-    // PLT_MediaBrowserDelegate methods
-    virtual void OnMSStateVariablesChanged(PLT_Service*                  service, 
-                                           NPT_List<PLT_StateVariable*>* vars);
-    virtual void OnBrowseResult(NPT_Result               res, 
-                                PLT_DeviceDataReference& device, 
-                                PLT_BrowseInfo*          info, 
-                                void*                    userdata);
-
-    // methods
-    void       SetContainerListener(PLT_MediaContainerChangesListener* listener) {
-        m_ContainerListener = listener;
-    }
-    NPT_Result BrowseSync(PLT_DeviceDataReference&      device, 
-                          const char*                   id, 
-                          PLT_MediaObjectListReference& list,
-                          bool                          metadata = false,
-                          NPT_Int32                     start = 0,
-                          NPT_Cardinal                  max_results = 0); // 0 means all
-
-    const NPT_Lock<PLT_DeviceMap>& GetMediaServersMap() const { return m_MediaServers; }
-    bool IsCached(const char* uuid, const char* object_id);
-
-protected:
-    NPT_Result BrowseSync(PLT_BrowseDataReference& browse_data,
-                          PLT_DeviceDataReference& device, 
-                          const char*              object_id,
-                          NPT_Int32                index, 
-                          NPT_Int32                count,
-                          bool                     browse_metadata = false,
-                          const char*              filter = "dc:date,upnp:genre,res,res@duration,res@size,upnp:albumArtURI,upnp:album,upnp:artist,upnp:author,searchable,childCount", // explicitely specify res otherwise WMP won't return a URL!
-                          const char*              sort = "");
-private:
-    NPT_Result Find(const char* ip, PLT_DeviceDataReference& device);
-    NPT_Result WaitForResponse(NPT_SharedVariable& shared_var);
-
-private:
-    NPT_Lock<PLT_DeviceMap>              m_MediaServers;
-    PLT_MediaContainerChangesListener*   m_ContainerListener;
-    bool                                 m_UseCache;
-    PLT_MediaCache<PLT_MediaObjectListReference,NPT_String> m_Cache;
-};
-
-/*----------------------------------------------------------------------
-|   PLT_DeviceMapFinderByIp
-+---------------------------------------------------------------------*/
-class PLT_DeviceMapFinderByIp
-{
-public:
-    // methods
-    PLT_DeviceMapFinderByIp(const char* ip) : m_IP(ip) {}
-
-    bool operator()(const PLT_DeviceMapEntry* const& entry) const {
-        PLT_DeviceDataReference device = entry->GetValue();
-        return (device->GetURLBase().GetHost() == m_IP);
-    }
-
-private:
-    // members
-    NPT_String m_IP;
-};
-
-/*----------------------------------------------------------------------
-|   PLT_DeviceFinderByUUID
-+---------------------------------------------------------------------*/
-class PLT_DeviceMapFinderByUUID
-{
-public:
-    // methods
-    PLT_DeviceMapFinderByUUID(const char* uuid) : m_UUID(uuid) {}
-
-    bool operator()(const PLT_DeviceMapEntry* const& entry) const {
-        PLT_DeviceDataReference device = entry->GetValue();
-        return device->GetUUID() == m_UUID;
-    }
-
-private:
-    // members
-    NPT_String m_UUID;
-};
-
-#endif /* _PLT_SYNC_MEDIA_BROWSER_ */
-

gpac-2.2.1.tar.gz/extra_lib/include/platinum/PltTaskManager.h Deleted

@@ -1,110 +0,0 @@
-/*****************************************************************
-|
-|   Platinum - Task Manager
-|
-| Copyright (c) 2004-2010, Plutinosoft, LLC.
-| All rights reserved.
-| http://www.plutinosoft.com
-|
-| This program is free software; you can redistribute it and/or
-| modify it under the terms of the GNU General Public License
-| as published by the Free Software Foundation; either version 2
-| of the License, or (at your option) any later version.
-|
-| OEMs, ISVs, VARs and other distributors that combine and 
-| distribute commercially licensed software with Platinum software
-| and do not wish to distribute the source code for the commercially
-| licensed software under version 2, or (at your option) any later
-| version, of the GNU General Public License (the "GPL") must enter
-| into a commercial license agreement with Plutinosoft, LLC.
-| licensing@plutinosoft.com
-|  
-| This program 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 General Public License for more details.
-|
-| You should have received a copy of the GNU General Public License
-| along with this program; see the file LICENSE.txt. If not, write to
-| the Free Software Foundation, Inc., 
-| 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-| http://www.gnu.org/licenses/gpl-2.0.html
-|
-****************************************************************/
-
-/** @file
- Runnable Tasks Manager
- */
-
-#ifndef _PLT_TASKMANAGER_H_
-#define _PLT_TASKMANAGER_H_
-
-/*----------------------------------------------------------------------
-|   includes
-+---------------------------------------------------------------------*/
-#include "Neptune.h"
-
-/*----------------------------------------------------------------------
-|   forward declarations
-+---------------------------------------------------------------------*/
-class PLT_ThreadTask;
-
-/*----------------------------------------------------------------------
-|   PLT_TaskManager class
-+---------------------------------------------------------------------*/
-/**
- The PLT_TaskManager class maintains a list of runnable tasks. During shutdown, it
- can stop all running tasks. Additionally, it can limit the number of
- tasks that can run at any given time.
- */
-class PLT_TaskManager
-{
-public:
-    /**
-     Create a new Task Manager.
-     @param max_tasks Maximum number of concurrent tasks that the task manager
-     will allow. When the value is reached, a thread calling AddTask will block until
-     a task has finished.
-     */
-	PLT_TaskManager(NPT_Cardinal max_tasks = 0);
-	virtual ~PLT_TaskManager();
-
-    /**
-     Start a new new task and associates it with this task manager.
-     @param task new task
-     @param delay optional time interval to wait before launching the new task
-     @param auto_destroy a flag to indicate if the task is owned by someone else
-     and thus should not destroy itself when done.
-     */
-    virtual NPT_Result StartTask(PLT_ThreadTask*   task, 
-                                 NPT_TimeInterval* delay = NULL,
-                                 bool              auto_destroy = true);
-
-    /**
-     Stop all tasks associated with this task manager.
-     */
-    NPT_Result StopAllTasks();
-
-    /**
-     Returns the max number of concurrent tasks allowed. 0 for no limit.
-     */
-    NPT_Cardinal GetMaxTasks() { return m_MaxTasks; }
-
-private:
-    friend class PLT_ThreadTask;
-
-    // called by PLT_ThreadTask
-    NPT_Result AddTask(PLT_ThreadTask* task);
-    NPT_Result RemoveTask(PLT_ThreadTask* task);
-
-private:
-    NPT_List<PLT_ThreadTask*>  m_Tasks;
-    NPT_Mutex                  m_TasksLock;
-    NPT_Mutex                  m_CallbackLock;
-    NPT_Queue<int>*            m_Queue;
-    NPT_Cardinal               m_MaxTasks;
-    NPT_Cardinal               m_RunningTasks;
-    bool                       m_Stopping;
-};
-
-#endif /* _PLT_TASKMANAGER_H_ */

gpac-2.2.1.tar.gz/extra_lib/include/platinum/PltThreadTask.h Deleted

@@ -1,140 +0,0 @@
-/*****************************************************************
-|
-|   Platinum - Thread Tasks
-|
-| Copyright (c) 2004-2010, Plutinosoft, LLC.
-| All rights reserved.
-| http://www.plutinosoft.com
-|
-| This program is free software; you can redistribute it and/or
-| modify it under the terms of the GNU General Public License
-| as published by the Free Software Foundation; either version 2
-| of the License, or (at your option) any later version.
-|
-| OEMs, ISVs, VARs and other distributors that combine and 
-| distribute commercially licensed software with Platinum software
-| and do not wish to distribute the source code for the commercially
-| licensed software under version 2, or (at your option) any later
-| version, of the GNU General Public License (the "GPL") must enter
-| into a commercial license agreement with Plutinosoft, LLC.
-| licensing@plutinosoft.com
-|  
-| This program 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 General Public License for more details.
-|
-| You should have received a copy of the GNU General Public License
-| along with this program; see the file LICENSE.txt. If not, write to
-| the Free Software Foundation, Inc., 
-| 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-| http://www.gnu.org/licenses/gpl-2.0.html
-|
-****************************************************************/
-
-/** @file
- Runnable Task
- */
-
-#ifndef _PLT_THREADTASK_H_
-#define _PLT_THREADTASK_H_
-
-/*----------------------------------------------------------------------
-|   includes
-+---------------------------------------------------------------------*/
-#include "Neptune.h"
-#include "PltTaskManager.h"
-
-/*----------------------------------------------------------------------
-|   PLT_ThreadTask class
-+---------------------------------------------------------------------*/
-/**
- The PLT_ThreadTask class is a base class for executing a given task in a worker
- thread. A PLT_ThreadTask is usually always associated to a PLT_TaskManager 
- which maintains a list to stop and destroy tasks when finished.
- */
-class PLT_ThreadTask : public NPT_Runnable
-{
-public:
-    friend class PLT_TaskManager;
-
-    /**
-     When a task is not managed by a PLT_TaskManager, the owner must call
-     this to stop and destroy it.
-     */
-    NPT_Result Kill();
-    
-protected:
-    /**
-     Return whether this task is in the process of stopping.
-     @param timeout number of milliseconds to wait
-     @return boolean indicating if the task is stopping
-     */
-    virtual bool IsAborting(NPT_Timeout timeout) {
-        return NPT_SUCCEEDED(m_Abort.WaitUntilEquals(1, timeout));
-    }
-    
-    /**
-     Start a task by associating it with a task manager.
-     @param task_manager PLT_TaskManager pointer
-     @param delay optional time interval to wait before launching the new task
-     @param auto_destroy a flag to indicate if the task is owned by someone else
-     and thus should not destroy itself when done.
-     */
-    NPT_Result Start(PLT_TaskManager*  task_manager = NULL, 
-                     NPT_TimeInterval* delay = NULL,
-                     bool              auto_destroy = true);
-    /**
-     Stop the task. This is either called by a task manager or the Kill method.
-     @param blocking Whether the method should block until the task has finished.
-     */
-    NPT_Result Stop(bool blocking = true);
-    
-    /**
-     This method to override in derived classes is called when the task is about
-     to start. 
-     */
-    virtual void DoInit()    {}
-    
-    /**
-     This method to override in derived classes is called when the task is about
-     to stop.
-     */
-    virtual void DoAbort()   {}
-    
-    /**
-     This method to override in derived classes is the main task loop.
-     */
-    virtual void DoRun()     {}
-    
-    /**
-     A PLT_ThreadTask base class is never instantiated directly.
-     */
-    PLT_ThreadTask();
-    
-    /**
-     The task manager will destroy the task when finished if m_AutoDestroy is 
-     true otherwise the owner of this task must use the Kill method.
-     */
-    virtual ~PLT_ThreadTask();
-    
-private:    
-    NPT_Result StartThread();
-    
-    // NPT_Thread methods
-    void Run();
-
-protected:
-    // members
-    PLT_TaskManager*    m_TaskManager;
-
-private:
-    // members
-    NPT_SharedVariable  m_Started;
-    NPT_SharedVariable  m_Abort;
-    NPT_Thread*         m_Thread;
-    bool                m_AutoDestroy;
-    NPT_TimeInterval    m_Delay;
-};
-
-#endif /* _PLT_THREADTASK_H_ */

gpac-2.2.1.tar.gz/extra_lib/include/platinum/PltTime.h Deleted

@@ -1,57 +0,0 @@
-/*****************************************************************
-|
-|   Platinum - Time
-|
-| Copyright (c) 2004-2008, Plutinosoft, LLC.
-| All rights reserved.
-| http://www.plutinosoft.com
-|
-| This program is free software; you can redistribute it and/or
-| modify it under the terms of the GNU General Public License
-| as published by the Free Software Foundation; either version 2
-| of the License, or (at your option) any later version.
-|
-| OEMs, ISVs, VARs and other distributors that combine and 
-| distribute commercially licensed software with Platinum software
-| and do not wish to distribute the source code for the commercially
-| licensed software under version 2, or (at your option) any later
-| version, of the GNU General Public License (the "GPL") must enter
-| into a commercial license agreement with Plutinosoft, LLC.
-| 
-| This program 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 General Public License for more details.
-|
-| You should have received a copy of the GNU General Public License
-| along with this program; see the file LICENSE.txt. If not, write to
-| the Free Software Foundation, Inc., 
-| 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-| http://www.gnu.org/licenses/gpl-2.0.html
-|
-****************************************************************/
-
-#ifndef _PLT_TIME_H_
-#define _PLT_TIME_H_
-
-/*----------------------------------------------------------------------
-|   includes
-+---------------------------------------------------------------------*/
-#include "NptTypes.h"
-#include "NptTime.h"
-
-/*----------------------------------------------------------------------
-|   PLT_Time
-+---------------------------------------------------------------------*/
-class PLT_Time
-{
-public:
-    // methods
-    static NPT_Result GetTimeStampFromDate(const NPT_Date& date, 
-                                           NPT_TimeStamp&  timestamp);
-
-    /* helper functions */
-    static NPT_Result SetDateTimeZone(NPT_Date& date, NPT_TimeZone tz);
-};
-
-#endif // _NPT_TIME_H_

gpac-2.2.1.tar.gz/extra_lib/include/platinum/PltUPnP.h Deleted

@@ -1,143 +0,0 @@
-/*****************************************************************
-|
-|   Platinum - UPnP Engine
-|
-| Copyright (c) 2004-2010, Plutinosoft, LLC.
-| All rights reserved.
-| http://www.plutinosoft.com
-|
-| This program is free software; you can redistribute it and/or
-| modify it under the terms of the GNU General Public License
-| as published by the Free Software Foundation; either version 2
-| of the License, or (at your option) any later version.
-|
-| OEMs, ISVs, VARs and other distributors that combine and 
-| distribute commercially licensed software with Platinum software
-| and do not wish to distribute the source code for the commercially
-| licensed software under version 2, or (at your option) any later
-| version, of the GNU General Public License (the "GPL") must enter
-| into a commercial license agreement with Plutinosoft, LLC.
-| licensing@plutinosoft.com
-|  
-| This program 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 General Public License for more details.
-|
-| You should have received a copy of the GNU General Public License
-| along with this program; see the file LICENSE.txt. If not, write to
-| the Free Software Foundation, Inc., 
-| 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-| http://www.gnu.org/licenses/gpl-2.0.html
-|
-****************************************************************/
-
-/** @file
- UPnP Devices and ControlPoints Manager
- */
-
-#ifndef _PLT_UPNP_H_
-#define _PLT_UPNP_H_
-
-/*----------------------------------------------------------------------
-|   includes
-+---------------------------------------------------------------------*/
-#include "PltTaskManager.h"
-#include "PltCtrlPoint.h"
-#include "PltDeviceHost.h"
-#include "PltUtilities.h"
-
-/*----------------------------------------------------------------------
-|   constants
-+---------------------------------------------------------------------*/
-#define PLT_DLNA_SSDP_DELAY       0.05f
-#define PLT_DLNA_SSDP_DELAY_GROUP 0.2f
-
-/*----------------------------------------------------------------------
-|   forward definitions
-+---------------------------------------------------------------------*/
-class PLT_SsdpListenTask;
-
-/*----------------------------------------------------------------------
-|   PLT_UPnP class
-+---------------------------------------------------------------------*/
-/**
- The PLT_UPnP class maintains a list of devices (PLT_DeviceHost) to advertise and/or 
- control points (PLT_CtrlPoint).
- */
-class PLT_UPnP
-{
-public:
-    /**
-     Create a UPnP instance.
-     */
-    PLT_UPnP();
-    ~PLT_UPnP();
-
-    /**
-     Add and start a device inside this UPnP context.
-     @param device device to start.
-     */
-    NPT_Result AddDevice(PLT_DeviceHostReference& device);
-    
-    /**
-     Add and start a control point inside this UPnP context.
-     @param ctrlpoint control point to start.
-     */
-    NPT_Result AddCtrlPoint(PLT_CtrlPointReference& ctrlpoint);
-
-    /**
-     Remove an existing device from this UPnP context.
-     @param device device to stop.
-     */
-    NPT_Result RemoveDevice(PLT_DeviceHostReference& device);
-    
-    /**
-     Remove an existing control point from this UPnP context.
-     @param ctrlpoint control point to stop.
-     */
-    NPT_Result RemoveCtrlPoint(PLT_CtrlPointReference& ctrlpoint);
-
-    /**
-     Start the UPnP context and all existing devices and control points
-     associated with it.
-     */
-    NPT_Result Start();
-    
-    /**
-     Stop the UPnP context and all existing devices and control points
-     associated with it.
-     */
-    NPT_Result Stop();
-    
-    /**
-     Return the UPnP Engine state.
-     @return True if the UPnP engine is running.
-     */
-    bool IsRunning() { return m_Started; }
-
-    /**
-     When a device and a control point are added to the same UPnP context, it is
-     desired that the device be not discovered by the control point. For example when
-     creating a combo UPnP Renderer/CtrlPoint. This methods tells the control point
-     to ignore devices associated with the same UPnP context.
-     @param ignore boolean to ignore devices in context
-     */
-	void SetIgnoreLocalUUIDs(bool ignore) { m_IgnoreLocalUUIDs = ignore; }
-
-private:
-    // members
-    NPT_Mutex                           m_Lock;
-    NPT_List<PLT_DeviceHostReference>   m_Devices;
-    NPT_List<PLT_CtrlPointReference>    m_CtrlPoints;
-    PLT_TaskManager                     m_TaskManager;
-
-    // Since we can only have one socket listening on port 1900, 
-    // we create it in here and we will attach every control points
-    // and devices to it when they're added
-    bool                                m_Started;
-    PLT_SsdpListenTask*                 m_SsdpListenTask; 
-	bool								m_IgnoreLocalUUIDs;
-};
-
-#endif /* _PLT_UPNP_H_ */

gpac-2.2.1.tar.gz/extra_lib/include/platinum/PltUPnPHelper.h Deleted

@@ -1,341 +0,0 @@
-/*****************************************************************
-|
-|   Platinum - UPnP Helper
-|
-| Copyright (c) 2004-2008, Plutinosoft, LLC.
-| All rights reserved.
-| http://www.plutinosoft.com
-|
-| This program is free software; you can redistribute it and/or
-| modify it under the terms of the GNU General Public License
-| as published by the Free Software Foundation; either version 2
-| of the License, or (at your option) any later version.
-|
-| OEMs, ISVs, VARs and other distributors that combine and 
-| distribute commercially licensed software with Platinum software
-| and do not wish to distribute the source code for the commercially
-| licensed software under version 2, or (at your option) any later
-| version, of the GNU General Public License (the "GPL") must enter
-| into a commercial license agreement with Plutinosoft, LLC.
-| 
-| This program 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 General Public License for more details.
-|
-| You should have received a copy of the GNU General Public License
-| along with this program; see the file LICENSE.txt. If not, write to
-| the Free Software Foundation, Inc., 
-| 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-| http://www.gnu.org/licenses/gpl-2.0.html
-|
-****************************************************************/
-
-#ifndef _PLT_UPNP_HELPER_H_
-#define _PLT_UPNP_HELPER_H_
-
-/*----------------------------------------------------------------------
-|   includes
-+---------------------------------------------------------------------*/
-#include "Neptune.h"
-
-/*----------------------------------------------------------------------
-|   NPT_StringFinder
-+---------------------------------------------------------------------*/
-class NPT_StringFinder
-{
-public:
-    // methods
-    NPT_StringFinder(const char* value) : m_Value(value) {}
-    virtual ~NPT_StringFinder() {}
-    bool operator()(const NPT_String* const & value) const {
-        return value->Compare(m_Value) ? false : true;
-    }
-    bool operator()(const NPT_String& value) const {
-        return value.Compare(m_Value) ? false : true;
-    }
-
-private:
-    // members
-    NPT_String   m_Value;
-};
-
-/*----------------------------------------------------------------------
-|   PLT_UPnPMessageHelper class
-+---------------------------------------------------------------------*/
-class PLT_UPnPMessageHelper
-{
-public:
-    // methods
-    static const NPT_String* GetST(NPT_HttpMessage& message) { 
-        return message.GetHeaders().GetHeaderValue("ST"); 
-    }
-    static NPT_Result SetST(NPT_HttpMessage& message, 
-                            const char*      st) { 
-        return message.GetHeaders().SetHeader("ST", st); 
-    }
-    static const NPT_String* GetNT(NPT_HttpMessage& message) { 
-        return message.GetHeaders().GetHeaderValue("NT"); 
-    }
-    static NPT_Result SetNT(NPT_HttpMessage& message, 
-                            const char*      nt) { 
-        return message.GetHeaders().SetHeader("NT", nt); 
-    }
-    static const NPT_String* GetNTS(NPT_HttpMessage& message) { 
-        return message.GetHeaders().GetHeaderValue("NTS"); 
-    }
-    static NPT_Result SetNTS(NPT_HttpMessage& message, 
-                             const char*      nts) { 
-        return message.GetHeaders().SetHeader("NTS", nts); 
-    }
-    static const NPT_String* GetMAN(NPT_HttpMessage& message) { 
-        return message.GetHeaders().GetHeaderValue("MAN"); 
-    }
-    static NPT_Result SetMAN(NPT_HttpMessage& message, 
-                             const char*      man) { 
-        return message.GetHeaders().SetHeader("MAN", man); 
-    }
-    static const NPT_String* GetLocation(NPT_HttpMessage& message) { 
-        return message.GetHeaders().GetHeaderValue("LOCATION"); 
-    }
-    static NPT_Result SetLocation(NPT_HttpMessage& message, 
-                                  const char*      location) { 
-        return message.GetHeaders().SetHeader("LOCATION", location); 
-    }
-    static const NPT_String* GetServer(NPT_HttpMessage& message) { 
-        return message.GetHeaders().GetHeaderValue(NPT_HTTP_HEADER_SERVER); 
-    }
-    static NPT_Result SetServer(NPT_HttpMessage& message, 
-                                const char*      server, 
-                                bool             replace = true) { 
-        return message.GetHeaders().SetHeader(
-            NPT_HTTP_HEADER_SERVER, 
-            server, 
-            replace); 
-    }
-    static const NPT_String* GetUSN(NPT_HttpMessage& message) { 
-        return message.GetHeaders().GetHeaderValue("USN"); 
-    }
-    static NPT_Result SetUSN(NPT_HttpMessage& message, 
-                             const char*      usn) { 
-        return message.GetHeaders().SetHeader("USN", usn); 
-    }
-    static const NPT_String* GetCallbacks(NPT_HttpMessage& message) { 
-        return message.GetHeaders().GetHeaderValue("CALLBACK"); 
-    }
-    static NPT_Result SetCallbacks(NPT_HttpMessage& message, 
-                                   const char*      callbacks) { 
-        return message.GetHeaders().SetHeader("CALLBACK", callbacks); 
-    }
-    static const NPT_String* GetSID(NPT_HttpMessage& message) { 
-        return message.GetHeaders().GetHeaderValue("SID"); 
-    }
-    static NPT_Result SetSID(NPT_HttpMessage& message, 
-                             const char*      sid) { 
-        return message.GetHeaders().SetHeader("SID", sid); 
-    }
-    static NPT_Result GetLeaseTime(NPT_HttpMessage& message, 
-                                   NPT_Timeout&     value) { 
-        value = 0;
-        const NPT_String* cc = 
-            message.GetHeaders().GetHeaderValue("CACHE-CONTROL");
-        NPT_CHECK_POINTER(cc);
-        return ExtractLeaseTime(*cc, value); 
-    }
-    static NPT_Result SetLeaseTime(NPT_HttpMessage&  message, 
-                                   const NPT_Timeout lease) { 
-        return message.GetHeaders().SetHeader(
-            "CACHE-CONTROL", 
-            "max-age="+NPT_String::FromInteger(lease)); 
-    }
-    static NPT_Result GetTimeOut(NPT_HttpMessage& message, 
-                                 NPT_Int32&       value) { 
-        value = 0;
-        const NPT_String* timeout = 
-            message.GetHeaders().GetHeaderValue("TIMEOUT"); 
-        NPT_CHECK_POINTER(timeout);
-        return ExtractTimeOut(*timeout, value); 
-    }
-    static NPT_Result SetTimeOut(NPT_HttpMessage& message, 
-                                 const NPT_Int32  timeout) { 
-        if (timeout >= 0) {
-            return message.GetHeaders().SetHeader(
-                "TIMEOUT", 
-                "Second-"+NPT_String::FromInteger(timeout)); 
-        } else {
-            return message.GetHeaders().SetHeader(
-                "TIMEOUT", "Second-infinite"); 
-        }
-    }
-    static NPT_Result GetMX(NPT_HttpMessage& message, 
-                            NPT_UInt32&      value) { 
-        value = 0;
-        const NPT_String* mx = 
-            message.GetHeaders().GetHeaderValue("MX");
-        NPT_CHECK_POINTER(mx);
-        return NPT_ParseInteger32(*mx, value);
-    }
-    static NPT_Result SetMX(NPT_HttpMessage& message, 
-                            const NPT_UInt32 mx) {
-        return message.GetHeaders().SetHeader(
-            "MX", 
-            NPT_String::FromInteger(mx)); 
-    }
-    static NPT_Result GetSeq(NPT_HttpMessage& message,  
-                             NPT_UInt32&      value) { 
-        value = 0;
-        const NPT_String* seq = 
-            message.GetHeaders().GetHeaderValue("SEQ");
-        NPT_CHECK_POINTER(seq);
-        return NPT_ParseInteger32(*seq, value);
-    }
-    static NPT_Result SetSeq(NPT_HttpMessage& message, 
-                             const NPT_UInt32 seq) {
-        return message.GetHeaders().SetHeader(
-            "SEQ", 
-            NPT_String::FromInteger(seq)); 
-    }
-    static const char* GenerateUUID(int         count, 
-                                    NPT_String& uuid) {   
-        uuid = "";
-        for (int i=0;i<(count<100?count:100);i++) {
-            int random = NPT_System::GetRandomInteger();
-            uuid += (char)((random % 25) + 66);
-        }
-        return uuid;
-    }
-    static const char* GenerateGUID(NPT_String& guid) {   
-        guid = "";
-        for (int i=0;i<32;i++) {
-            char nibble = (char)(NPT_System::GetRandomInteger() % 16);
-            guid += (nibble < 10) ? ('0' + nibble) : ('a' + (nibble-10));
-            if (i == 7 || i == 11 || i == 15 || i == 19) {
-                guid += '-';
-            }
-        }
-        return guid;
-    }
-    static NPT_Result ExtractLeaseTime(const char*  cache_control, 
-                                       NPT_Timeout& lease) {
-        int value;
-        if (cache_control && 
-            sscanf(cache_control, "max-age=%d", &value) == 1) {
-            lease = value;
-            return NPT_SUCCESS;
-        }
-        return NPT_FAILURE;
-    }
-    static NPT_Result ExtractTimeOut(const char* timeout, 
-                                     NPT_Int32&  len) {
-        NPT_String temp = timeout;
-        if (temp.CompareN("Second-", 7, true)) {
-            return NPT_ERROR_INVALID_FORMAT;
-        }
-
-        if (temp.Compare("Second-infinite", true) == 0) {
-            len = NPT_TIMEOUT_INFINITE;
-            return NPT_SUCCESS;
-        }
-        return temp.SubString(7).ToInteger(len);
-    }
-    static NPT_Result GetIPAddresses(NPT_List<NPT_IpAddress>& ips, 
-                                     bool with_localhost = false) {
-        NPT_List<NPT_NetworkInterface*> if_list;
-        NPT_CHECK(NPT_NetworkInterface::GetNetworkInterfaces(if_list));
-
-        NPT_List<NPT_NetworkInterface*>::Iterator iface = 
-            if_list.GetFirstItem();
-        while (iface) {
-            NPT_IpAddress ip = 
-                (*(*iface)->GetAddresses().GetFirstItem()).GetPrimaryAddress();
-            if (ip.ToString().Compare("0.0.0.0") && ip.ToString().Compare("127.0.0.1")) {
-                ips.Add(ip);
-            }
-            ++iface;
-        }
-
-        if (ips.GetItemCount() == 0 || with_localhost) {
-            NPT_IpAddress localhost;
-            localhost.Parse("127.0.0.1");
-            ips.Add(localhost);
-        }
-
-        if_list.Apply(NPT_ObjectDeleter<NPT_NetworkInterface>());
-        return NPT_SUCCESS;
-    }
-
-    static NPT_Result GetNetworkInterfaces(NPT_List<NPT_NetworkInterface*>& if_list, 
-                                           bool with_localhost = false) {
-        NPT_CHECK(_GetNetworkInterfaces(if_list, false));
-
-        // if no valid interfaces or if requested, add localhost capable interface
-        if (if_list.GetItemCount() == 0 || with_localhost) {
-            NPT_CHECK(_GetNetworkInterfaces(if_list, true));
-        }
-        return NPT_SUCCESS;
-    }
-
-	static NPT_Result GetMACAddresses(NPT_List<NPT_String>& addresses) {
-        NPT_List<NPT_NetworkInterface*> if_list;
-        NPT_CHECK(NPT_NetworkInterface::GetNetworkInterfaces(if_list));
-
-        NPT_List<NPT_NetworkInterface*>::Iterator iface = if_list.GetFirstItem();
-        while (iface) {
-            NPT_String ip = (*(*iface)->GetAddresses().GetFirstItem()).GetPrimaryAddress().ToString();
-            if (ip.Compare("0.0.0.0") && ip.Compare("127.0.0.1")) {
-				addresses.Add((*iface)->GetMacAddress().ToString());
-            }
-            ++iface;
-        }
-
-        if_list.Apply(NPT_ObjectDeleter<NPT_NetworkInterface>());
-        return NPT_SUCCESS;
-    }
-
-
-	static bool IsLocalNetworkAddress(const NPT_IpAddress& address) {
-		if(address.ToString() == "127.0.0.1") return true;
-
-		NPT_List<NPT_NetworkInterface*> if_list;
-        NPT_NetworkInterface::GetNetworkInterfaces(if_list);
-
-		NPT_List<NPT_NetworkInterface*>::Iterator iface = if_list.GetFirstItem();
-        while (iface) {
-			if((*iface)->IsAddressInNetwork(address)) return true;
-            ++iface;
-        }
-
-		if_list.Apply(NPT_ObjectDeleter<NPT_NetworkInterface>());
-		return false;
-	}
-
-private:
-
-    static NPT_Result _GetNetworkInterfaces(NPT_List<NPT_NetworkInterface*>& if_list, 
-                                            bool only_localhost = false) {
-        NPT_List<NPT_NetworkInterface*> _if_list;
-        NPT_CHECK(NPT_NetworkInterface::GetNetworkInterfaces(_if_list));
-
-        NPT_NetworkInterface* iface;
-        while (NPT_SUCCEEDED(_if_list.PopHead(iface))) {
-            NPT_String ip = 
-                iface->GetAddresses().GetFirstItem()->GetPrimaryAddress().ToString();
-            if (ip.Compare("0.0.0.0") && 
-                ((!only_localhost && ip.Compare("127.0.0.1")) || 
-                 (only_localhost && !ip.Compare("127.0.0.1")))) {
-                if_list.Add(iface);
-
-                // add localhost only once
-                if (only_localhost) break;
-            } else {
-                delete iface;
-            }
-        }
-
-        // cleanup any remaining items in list if we breaked early
-        _if_list.Apply(NPT_ObjectDeleter<NPT_NetworkInterface>());
-        return NPT_SUCCESS;
-    }
-};
-
-#endif /* _PLT_UPNP_HELPER_H_ */

gpac-2.2.1.tar.gz/extra_lib/include/platinum/PltUtilities.h Deleted

@@ -1,724 +0,0 @@
-/*****************************************************************
-|
-|   Platinum - Utilities
-|
-| Copyright (c) 2004-2010, Plutinosoft, LLC.
-| All rights reserved.
-| http://www.plutinosoft.com
-|
-| This program is free software; you can redistribute it and/or
-| modify it under the terms of the GNU General Public License
-| as published by the Free Software Foundation; either version 2
-| of the License, or (at your option) any later version.
-|
-| OEMs, ISVs, VARs and other distributors that combine and 
-| distribute commercially licensed software with Platinum software
-| and do not wish to distribute the source code for the commercially
-| licensed software under version 2, or (at your option) any later
-| version, of the GNU General Public License (the "GPL") must enter
-| into a commercial license agreement with Plutinosoft, LLC.
-| licensing@plutinosoft.com
-|  
-| This program 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 General Public License for more details.
-|
-| You should have received a copy of the GNU General Public License
-| along with this program; see the file LICENSE.txt. If not, write to
-| the Free Software Foundation, Inc., 
-| 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-| http://www.gnu.org/licenses/gpl-2.0.html
-|
-****************************************************************/
-
-#ifndef _PLT_UTILITIES_H_
-#define _PLT_UTILITIES_H_
-
-/*----------------------------------------------------------------------
-|   includes
-+---------------------------------------------------------------------*/
-#include "Neptune.h"
-
-/*----------------------------------------------------------------------
-|   PLT_XmlAttributeFinder
-+---------------------------------------------------------------------*/
-/**
- The PLT_XmlAttributeFinder class is used to determine if an attribute 
- exists given an xml element node, an attribute name and namespace.
- */
-class PLT_XmlAttributeFinder
-{
-public:
-    // if 'namespc' is NULL, we're looking for ANY namespace
-    // if 'namespc' is '\0', we're looking for NO namespace
-    // if 'namespc' is non-empty, look for that SPECIFIC namespace
-    PLT_XmlAttributeFinder(const NPT_XmlElementNode& element, 
-                           const char*               name, 
-                           const char*               namespc) : 
-      m_Element(element), m_Name(name), m_Namespace(namespc) {}
-
-    bool operator()(const NPT_XmlAttribute* const & attribute) const {
-        if (attribute->GetName() == m_Name) {
-            if (m_Namespace) {
-                const NPT_String& prefix = attribute->GetPrefix();
-                if (m_Namespace0 == '\0') {
-                    // match if the attribute has NO namespace
-                    return prefix.IsEmpty();
-                } else {
-                    // match if the attribute has the SPECIFIC namespace
-                    // we're looking for
-                    const NPT_String* namespc = m_Element.GetNamespaceUri(prefix);
-                    return namespc && *namespc == m_Namespace;
-                }
-            } else {
-                // ANY namespace will match
-                return true;
-            }
-        } else {
-            return false;
-        }
-    }
-
-private:
-    const NPT_XmlElementNode& m_Element;
-    const char*               m_Name;
-    const char*               m_Namespace;
-};
-
-/*----------------------------------------------------------------------
-|   PLT_XmlHelper
-+---------------------------------------------------------------------*/
-/**
- The PLT_XmlHelper class is a set of utility functions for manipulating 
- xml documents and DOM trees.
- */
-class PLT_XmlHelper
-{
-public:
-
-    // static methods
-
-    static NPT_Result Parse(const NPT_String&    xml,
-                            NPT_XmlElementNode*& tree) {
-        // reset tree
-        tree = NULL;
-
-        // parse body
-        NPT_XmlParser parser;
-        NPT_XmlNode*  node;
-        NPT_Result result = parser.Parse(xml, node);
-        if (NPT_FAILED(result)) {
-            //NPT_LOG_FINEST_1("Failed to parse %s", xml.IsEmpty()?"(empty string)":xml.GetChars());
-            NPT_CHECK(result);
-        }
-
-        tree = node->AsElementNode();
-        if (!tree) {
-            delete node;
-            return NPT_FAILURE;
-        }
-        
-        return NPT_SUCCESS;
-    }
-
-    static NPT_Result GetChildText(NPT_XmlElementNode* node, 
-                                   const char*         tag, 
-                                   NPT_String&         value,
-                                   const char*         namespc = "",
-                                   NPT_Cardinal        max_size = 1024) {
-        value = "";
-
-        if (!node) return NPT_FAILURE;
-
-        // special case "" means we look for the same namespace as the parent
-        if (namespc && namespc0 == '\0') namespc = node->GetNamespace()?node->GetNamespace()->GetChars():NPT_XML_NO_NAMESPACE;
-
-        NPT_XmlElementNode* child = node->GetChild(tag, namespc);
-        if (!child) return NPT_FAILURE;
-
-        const NPT_String* text = child->GetText();
-        // DLNA 7.3.17
-        value = text?text->SubString(0, max_size):"";
-        return NPT_SUCCESS;
-    }
-                                   
-    static NPT_Result RemoveAttribute(NPT_XmlElementNode* node, 
-                                      const char*         name,
-                                      const char*         namespc = "") {
-        if (!node) return NPT_FAILURE;
-
-        // special case "" means we look for the same namespace as the parent
-        if (namespc && namespc0 == '\0') namespc = node->GetNamespace()?node->GetNamespace()->GetChars():NPT_XML_NO_NAMESPACE;
-
-        NPT_List<NPT_XmlAttribute*>::Iterator attribute;
-        attribute = node->GetAttributes().Find(PLT_XmlAttributeFinder(*node, name, namespc));
-        if (!attribute) return NPT_FAILURE;
-
-        delete *attribute;
-        NPT_CHECK(node->GetAttributes().Erase(attribute));
-
-        return NPT_SUCCESS;
-    }
-                                   
-    static NPT_Result GetAttribute(NPT_XmlElementNode* node, 
-                                   const char*         name,
-                                   NPT_XmlAttribute*&  attr,
-                                   const char*         namespc = "") {
-        attr = NULL;
-
-        if (!node) return NPT_FAILURE;
-
-        // special case "" means we look for the same namespace as the parent
-        if (namespc && namespc0 == '\0') namespc = node->GetNamespace()?node->GetNamespace()->GetChars():NPT_XML_NO_NAMESPACE;
-
-        NPT_List<NPT_XmlAttribute*>::Iterator attribute;
-        attribute = node->GetAttributes().Find(PLT_XmlAttributeFinder(*node, name, namespc));
-        if (!attribute) {
-            //NPT_Debug("Failed to find attribute %s:%s", namespc, name);
-            return NPT_FAILURE;
-        }
-
-        attr = (*attribute);
-        return NPT_SUCCESS;
-    }
-
-    static NPT_Result GetAttribute(NPT_XmlElementNode* node, 
-                                   const char*         name,
-                                   NPT_String&         value,
-                                   const char*         namespc = "",
-                                   NPT_Cardinal        max_size = 1024) {
-        value = "";
-        
-        NPT_XmlAttribute* attribute = NULL;
-        NPT_Result result = GetAttribute(node, name, attribute, namespc);
-        if (NPT_FAILED(result)) return result;
-        
-        if (!attribute) return NPT_FAILURE;
-        // DLNA 7.3.17 truncate to 1024 bytes
-        value = attribute->GetValue().SubString(0, max_size);
-        return NPT_SUCCESS;
-    }
-
-    static NPT_Result SetAttribute(NPT_XmlElementNode* node, 
-                                   const char*         name,
-                                   NPT_String&         value,
-                                   const char*         namespc = "") {
-        NPT_XmlAttribute* attribute = NULL;
-        NPT_CHECK(GetAttribute(node, name, attribute, namespc));
-        if (!attribute) return NPT_FAILURE;
-
-        attribute->SetValue(value);
-        return NPT_SUCCESS;
-    }
-
-    static NPT_Result AddChildText(NPT_XmlElementNode* node,
-                                   const char*         tag,
-                                   const char*         text,
-                                   const char*         prefix = NULL) {
-        if (!node) return NPT_FAILURE;
-        NPT_XmlElementNode* child = new NPT_XmlElementNode(prefix, tag);
-        child->AddText(text);
-        return node->AddChild(child);
-    }
-
-    static bool IsMatch(const NPT_XmlNode* const & node, const char* tag, const char* namespc_mapped) {
-        // if m_Namespace is NULL, we're looking for ANY namespace
-        // if m_Namespace is '\0', we're looking for NO namespace
-        // if m_Namespace is non-empty, look for that SPECIFIC namespace
-        
-        const NPT_XmlElementNode* element = node->AsElementNode();
-        // is tag the same (case sensitive)?
-        if (element && element->GetTag() == tag) {
-            if (namespc_mapped) {
-                // look for a SPECIFIC namespace or NO namespace
-                const NPT_String* namespc = element->GetNamespace();
-                if (namespc) {
-                    // the element has a namespace, match if it is equal to
-                    // what we're looking for
-                    return *namespc == namespc_mapped;
-                } else {
-                    // the element does not have a namespace, match if we're
-                    // looking for NO namespace
-                    return namespc_mapped0 == '\0';
-                }
-            } else {
-                // ANY namespace will match
-                return true;
-            }
-        }
-        return false;
-    } 
-
-    static NPT_Result GetChildren(NPT_XmlElementNode*              node,
-                                  NPT_Array<NPT_XmlElementNode*>&  children,
-                                  const char*                      tag,
-                                  const char*                      namespc = "") {
-        if (!node) return NPT_FAILURE;
-
-        // special case "" means we look for the same namespace as the parent
-        if (namespc && namespc0 == '\0') namespc = node->GetNamespace()?node->GetNamespace()->GetChars():NPT_XML_NO_NAMESPACE;
-
-        const char* namespc_mapped = (namespc==NULL)?"":(namespc0=='*' && namespc1=='\0')?NULL:namespc;
-
-        // get all children first
-        NPT_List<NPT_XmlNode*>& allchildren = node->GetChildren();
-
-        // iterate through children and add only elements with matching tag
-        NPT_List<NPT_XmlNode*>::Iterator child = allchildren.GetFirstItem();
-        while  (child) {
-            if (IsMatch(*child, tag, namespc_mapped)) {
-                children.Add((*child)->AsElementNode());
-            }
-            ++child;
-        }
-        return NPT_SUCCESS;
-    }
-
-    static NPT_XmlElementNode* GetChild(NPT_XmlElementNode* node,
-                                        const char*         tag,
-                                        const char*         namespc = "") {
-        if (!node) return NULL;
-
-        // special case "" means we look for the same namespace as the parent
-        if (namespc && namespc0 == '\0') namespc = node->GetNamespace()?node->GetNamespace()->GetChars():NPT_XML_NO_NAMESPACE;
-
-        return node->GetChild(tag, namespc);
-    }
-
-    static NPT_Result GetChild(NPT_XmlElementNode*  parent,
-                               NPT_XmlElementNode*& child,
-                               NPT_Ordinal          n = 0) {
-        if (!parent) return NPT_FAILURE;
-
-        // reset child
-        child = NULL;
-
-        // get all children first
-        NPT_List<NPT_XmlNode*>::Iterator children = parent->GetChildren().GetFirstItem();
-        while  (children) {
-            if ((*children)->AsElementNode() && n-- == 0) {
-                child = (*children)->AsElementNode();
-                return NPT_SUCCESS;
-            }
-            children++;
-        }
-
-        return NPT_FAILURE;
-    }
-
-    static NPT_Result Serialize(NPT_XmlNode& node, NPT_String& xml, bool add_header = true, NPT_Int8 indentation = 0) {
-        NPT_XmlWriter writer(indentation);
-        NPT_StringOutputStreamReference stream(new NPT_StringOutputStream(&xml));
-        NPT_CHECK(writer.Serialize(node, *stream, add_header));
-        return NPT_SUCCESS;
-    }
-
-	static NPT_String Serialize(NPT_XmlNode& node, bool add_header = true, NPT_Int8 indentation = 0) {
-		NPT_XmlWriter writer(indentation);
-		NPT_String xml;
-		NPT_StringOutputStreamReference stream(new NPT_StringOutputStream(&xml));
-		if (NPT_FAILED(writer.Serialize(node, *stream, add_header))) {
-			NPT_Debug("Failed to serialize xml node");
-			return "";
-		}
-
-		return xml;
-	}
-private:
-    // members
-};
-
-/*----------------------------------------------------------------------
-|   NPT_StringFinder
-+---------------------------------------------------------------------*/
-/**
- The NPT_StringFinder class is used to determine if a string is found 
- as part of a list of strings.
- */
-class NPT_StringFinder
-{
-public:
-    // methods
-    NPT_StringFinder(const char* value, bool ignore_case = false) : 
-        m_Value(value), m_IgnoreCase(ignore_case) {}
-    virtual ~NPT_StringFinder() {}
-    bool operator()(const NPT_String* const & value) const {
-        return value->Compare(m_Value, m_IgnoreCase) ? false : true;
-    }
-    bool operator()(const NPT_String& value) const {
-        return value.Compare(m_Value, m_IgnoreCase) ? false : true;
-    }
-    
-private:
-    // members
-    NPT_String   m_Value;
-    bool         m_IgnoreCase;
-};
-
-/*----------------------------------------------------------------------
-|   NPT_IpAddressFinder
-+---------------------------------------------------------------------*/
-/**
- The NPT_IpAddressFinder class is used to determine if a IP Address is found 
- as part of a list of IP Addresses.
- */
-class NPT_IpAddressFinder
-{
-public:
-    // methods
-    NPT_IpAddressFinder(NPT_IpAddress ip) : m_Value(ip) {}
-    virtual ~NPT_IpAddressFinder() {}
-    
-    bool operator()(const NPT_IpAddress* const & value) const {
-        return *value == m_Value;
-    }
-    bool operator()(const NPT_IpAddress& value) const {
-        return value == m_Value;
-    }
-    
-private:
-    // members
-    NPT_IpAddress m_Value;
-};
-
-
-/*----------------------------------------------------------------------
-|   PLT_UPnPMessageHelper class
-+---------------------------------------------------------------------*/
-/**
- The PLT_UPnPMessageHelper class is a set of utility functions for manipulating 
- specific UPnP HTTP headers.
- */
-class PLT_UPnPMessageHelper
-{
-public:
-    // methods
-    static const NPT_String* GetST(const NPT_HttpMessage& message) { 
-        return message.GetHeaders().GetHeaderValue("ST"); 
-    }
-    static NPT_Result SetST(NPT_HttpMessage& message, 
-                            const char*      st) { 
-        return message.GetHeaders().SetHeader("ST", st); 
-    }
-    static const NPT_String* GetNT(const NPT_HttpMessage& message) { 
-        return message.GetHeaders().GetHeaderValue("NT"); 
-    }
-    static NPT_Result SetNT(NPT_HttpMessage& message, 
-                            const char*      nt) { 
-        return message.GetHeaders().SetHeader("NT", nt); 
-    }
-    static const NPT_String* GetNTS(const NPT_HttpMessage& message) { 
-        return message.GetHeaders().GetHeaderValue("NTS"); 
-    }
-    static NPT_Result SetNTS(NPT_HttpMessage& message, 
-                             const char*      nts) { 
-        return message.GetHeaders().SetHeader("NTS", nts); 
-    }
-    static const NPT_String* GetMAN(const NPT_HttpMessage& message) { 
-        return message.GetHeaders().GetHeaderValue("MAN"); 
-    }
-    static NPT_Result SetMAN(NPT_HttpMessage& message, 
-                             const char*      man) { 
-        return message.GetHeaders().SetHeader("MAN", man); 
-    }
-    static const NPT_String* GetLocation(const NPT_HttpMessage& message) { 
-        return message.GetHeaders().GetHeaderValue("Location"); 
-    }
-    static NPT_Result SetLocation(NPT_HttpMessage& message, 
-                                  const char*      location) { 
-        return message.GetHeaders().SetHeader("Location", location); 
-    }
-    static const NPT_String* GetServer(const NPT_HttpMessage& message) { 
-        return message.GetHeaders().GetHeaderValue(NPT_HTTP_HEADER_SERVER); 
-    }
-    static NPT_Result SetServer(NPT_HttpMessage& message, 
-                                const char*      server, 
-                                bool             replace = true) { 
-        return message.GetHeaders().SetHeader(
-                                              NPT_HTTP_HEADER_SERVER, 
-                                              server, 
-                                              replace); 
-    }
-    static const NPT_String* GetUSN(const NPT_HttpMessage& message) { 
-        return message.GetHeaders().GetHeaderValue("USN"); 
-    }
-    static NPT_Result SetUSN(NPT_HttpMessage& message, 
-                             const char*      usn) { 
-        return message.GetHeaders().SetHeader("USN", usn); 
-    }
-    static const NPT_String* GetCallbacks(const NPT_HttpMessage& message) { 
-        return message.GetHeaders().GetHeaderValue("CALLBACK"); 
-    }
-    static NPT_Result SetCallbacks(NPT_HttpMessage& message, 
-                                   const char*      callbacks) { 
-        return message.GetHeaders().SetHeader("CALLBACK", callbacks); 
-    }
-    static const NPT_String* GetSID(const NPT_HttpMessage& message) { 
-        return message.GetHeaders().GetHeaderValue("SID"); 
-    }
-    static NPT_Result SetSID(NPT_HttpMessage& message, 
-                             const char*      sid) { 
-        return message.GetHeaders().SetHeader("SID", sid); 
-    }
-    static NPT_Result GetLeaseTime(const NPT_HttpMessage& message, 
-                                   NPT_TimeInterval&      lease) { 
-        const NPT_String* cc = 
-        message.GetHeaders().GetHeaderValue("Cache-Control");
-        NPT_CHECK_POINTER(cc);
-        return ExtractLeaseTime(*cc, lease);
-    }
-    static NPT_Result SetLeaseTime(NPT_HttpMessage&        message, 
-                                   const NPT_TimeInterval& lease) { 
-        return message.GetHeaders().SetHeader(
-                                              "Cache-Control", 
-                                              "max-age="+NPT_String::FromInteger(lease.ToSeconds())); 
-    }
-    static NPT_Result GetTimeOut(const NPT_HttpMessage& message, 
-                                 NPT_Int32&             seconds) { 
-        seconds = 0;
-        const NPT_String* timeout = 
-        message.GetHeaders().GetHeaderValue("TIMEOUT"); 
-        NPT_CHECK_POINTER(timeout);
-        return ExtractTimeOut(*timeout, seconds); 
-    }
-    static NPT_Result SetTimeOut(NPT_HttpMessage& message, 
-                                 const NPT_Int32  seconds) { 
-        if (seconds >= 0) {
-            return message.GetHeaders().SetHeader(
-                                                  "TIMEOUT", 
-                                                  "Second-"+NPT_String::FromInteger(seconds)); 
-        } else {
-            return message.GetHeaders().SetHeader(
-                                                  "TIMEOUT", 
-                                                  "Second-infinite"); 
-        }
-    }
-    static NPT_Result SetDate(NPT_HttpMessage& message) { 
-        NPT_TimeStamp now;
-        NPT_System::GetCurrentTimeStamp(now);
-        NPT_DateTime date(now);
-        
-        return message.GetHeaders().SetHeader("Date", date.ToString(NPT_DateTime::FORMAT_RFC_1123)); 
-    }
-    static NPT_Result GetIfModifiedSince(const NPT_HttpMessage& message,
-                                         NPT_DateTime&          date) {
-        
-        const NPT_String* value = 
-        message.GetHeaders().GetHeaderValue("If-Modified-Since");
-        if (!value) return NPT_FAILURE;
-        
-        // Try RFC 1123, RFC 1036, then ANSI
-        if (NPT_SUCCEEDED(date.FromString(*value, NPT_DateTime::FORMAT_RFC_1123))) 
-            return NPT_SUCCESS;
-        if (NPT_SUCCEEDED(date.FromString(*value, NPT_DateTime::FORMAT_RFC_1036)))
-            return NPT_SUCCESS;
-        return date.FromString(*value, NPT_DateTime::FORMAT_ANSI);
-    }            
-    static NPT_Result SetIfModifiedSince(NPT_HttpMessage&    message,
-                                         const NPT_DateTime& date) {
-        return message.GetHeaders().SetHeader(
-                                              "If-Modified-Since",
-                                              date.ToString(NPT_DateTime::FORMAT_RFC_1123));
-    }
-    static NPT_Result GetMX(const NPT_HttpMessage& message, 
-                            NPT_UInt32&            value) { 
-        value = 0;
-        const NPT_String* mx = 
-        message.GetHeaders().GetHeaderValue("MX");
-        NPT_CHECK_POINTER(mx);
-        return NPT_ParseInteger32(*mx, value, false); // no relax to be UPnP compliant
-    }
-    static NPT_Result SetMX(NPT_HttpMessage& message, 
-                            const NPT_UInt32 mx) {
-        return message.GetHeaders().SetHeader(
-                                              "MX", 
-                                              NPT_String::FromInteger(mx)); 
-    }
-    static NPT_Result GetSeq(const NPT_HttpMessage& message,  
-                             NPT_UInt32&      value) { 
-        value = 0;
-        const NPT_String* seq = 
-        message.GetHeaders().GetHeaderValue("SEQ");
-        NPT_CHECK_POINTER(seq);
-        return NPT_ParseInteger32(*seq, value);
-    }
-    static NPT_Result SetSeq(NPT_HttpMessage& message, 
-                             const NPT_UInt32 seq) {
-        return message.GetHeaders().SetHeader(
-                                              "SEQ", 
-                                              NPT_String::FromInteger(seq)); 
-    }
-    static const char* GenerateUUID(int         count, 
-                                    NPT_String& uuid) {   
-        uuid = "";
-        for (int i=0;i<(count<100?count:100);i++) {
-            int random = NPT_System::GetRandomInteger();
-            uuid += (char)((random % 25) + 66);
-        }
-        return uuid;
-    }
-    
-    static const char* GenerateSerialNumber(NPT_String& sn, int count = 40) {
-        sn = "{";
-        for (int i=0;i<count;i++) {
-            char nibble = (char)(NPT_System::GetRandomInteger() % 16);
-            sn += (nibble < 10) ? ('0' + nibble) : ('a' + (nibble-10));
-        }
-        sn += "}";
-        return sn;
-    }
-    static const char* GenerateGUID(NPT_String& guid) {   
-        guid = "";
-        for (int i=0;i<32;i++) {
-            char nibble = (char)(NPT_System::GetRandomInteger() % 16);
-            guid += (nibble < 10) ? ('0' + nibble) : ('a' + (nibble-10));
-            if (i == 7 || i == 11 || i == 15 || i == 19) {
-                guid += '-';
-            }
-        }
-        return guid;
-    }
-    static NPT_Result ExtractLeaseTime(const NPT_String& cache_control, 
-                                       NPT_TimeInterval& lease) {
-        NPT_Int32 value;
-        if (cache_control.StartsWith("max-age=", true) &&
-            NPT_SUCCEEDED(NPT_ParseInteger32(cache_control.GetChars()+8, 
-                                             value))) {
-            lease.SetSeconds(value);
-            return NPT_SUCCESS;
-        }
-        return NPT_FAILURE;
-    }
-    static NPT_Result ExtractTimeOut(const char* timeout, 
-                                     NPT_Int32&  len) {
-        NPT_String temp = timeout;
-        if (temp.CompareN("Second-", 7, true)) {
-            return NPT_ERROR_INVALID_FORMAT;
-        }
-        
-        if (temp.Compare("Second-infinite", true) == 0) {
-            len = NPT_TIMEOUT_INFINITE;
-            return NPT_SUCCESS;
-        }
-        return temp.SubString(7).ToInteger(len);
-    }
-    static NPT_Result GetIPAddresses(NPT_List<NPT_IpAddress>& ips, 
-                                     bool with_localhost = false) {
-        NPT_List<NPT_NetworkInterface*> if_list;
-        NPT_CHECK(GetNetworkInterfaces(if_list, with_localhost));
-        
-        NPT_List<NPT_NetworkInterface*>::Iterator iface = if_list.GetFirstItem();
-        while (iface) {
-            NPT_IpAddress ip = (*(*iface)->GetAddresses().GetFirstItem()).GetPrimaryAddress();
-            if (ip.ToString().Compare("0.0.0.0") && 
-                (with_localhost || ip.ToString().Compare("127.0.0.1"))) {
-                ips.Add(ip);
-            }
-            ++iface;
-        }
-        
-        if (with_localhost && !ips.Find(NPT_IpAddressFinder(NPT_IpAddress(127, 0, 0, 1)))) {
-            NPT_IpAddress localhost;
-            localhost.Parse("127.0.0.1");
-            ips.Add(localhost);
-        }
-        
-        if_list.Apply(NPT_ObjectDeleter<NPT_NetworkInterface>());
-        return NPT_SUCCESS;
-    }
-    
-    static NPT_Result GetNetworkInterfaces(NPT_List<NPT_NetworkInterface*>& if_list, 
-                                           bool with_localhost = false) {
-        NPT_CHECK(_GetNetworkInterfaces(if_list, with_localhost, false));
-        
-        // if no valid interfaces or if requested, add localhost interface
-        if (if_list.GetItemCount() == 0) {
-            NPT_CHECK(_GetNetworkInterfaces(if_list, true, true));
-        }
-        return NPT_SUCCESS;
-    }
-    
-	static NPT_Result GetMACAddresses(NPT_List<NPT_String>& addresses) {
-        NPT_List<NPT_NetworkInterface*> if_list;
-        NPT_CHECK(GetNetworkInterfaces(if_list));
-        
-        NPT_List<NPT_NetworkInterface*>::Iterator iface = if_list.GetFirstItem();
-        while (iface) {
-            NPT_String ip = (*(*iface)->GetAddresses().GetFirstItem()).GetPrimaryAddress().ToString();
-            if (ip.Compare("0.0.0.0") && ip.Compare("127.0.0.1")) {
-				addresses.Add((*iface)->GetMacAddress().ToString());
-            }
-            ++iface;
-        }
-        
-        if_list.Apply(NPT_ObjectDeleter<NPT_NetworkInterface>());
-        return NPT_SUCCESS;
-    }
-    
-    
-	static bool IsLocalNetworkAddress(const NPT_IpAddress& address) {
-		if (address.ToString() == "127.0.0.1") return true;
-        
-		NPT_List<NPT_NetworkInterface*> if_list;
-        NPT_NetworkInterface::GetNetworkInterfaces(if_list);
-        
-		NPT_List<NPT_NetworkInterface*>::Iterator iface = if_list.GetFirstItem();
-        while (iface) {
-			if((*iface)->IsAddressInNetwork(address)) return true;
-            ++iface;
-        }
-        
-		if_list.Apply(NPT_ObjectDeleter<NPT_NetworkInterface>());
-		return false;
-	}
-    
-private:
-    
-    static NPT_Result _GetNetworkInterfaces(NPT_List<NPT_NetworkInterface*>& if_list,
-                                            bool include_localhost = false,
-                                            bool only_localhost = false) {
-        NPT_List<NPT_NetworkInterface*> _if_list;
-        NPT_CHECK(NPT_NetworkInterface::GetNetworkInterfaces(_if_list));
-        
-        NPT_NetworkInterface* iface;
-        while (NPT_SUCCEEDED(_if_list.PopHead(iface))) {
-            // only interested in non PTP & multicast capable interfaces
-            if ((iface->GetAddresses().GetItemCount() == 0) ||
-                !(iface->GetFlags() & NPT_NETWORK_INTERFACE_FLAG_MULTICAST) ||
-                 (iface->GetFlags() & NPT_NETWORK_INTERFACE_FLAG_POINT_TO_POINT)) {
-                delete iface;
-                continue;
-            }
-            
-            NPT_String ip = iface->GetAddresses().GetFirstItem()->GetPrimaryAddress().ToString();
-            
-            if (iface->GetFlags() & NPT_NETWORK_INTERFACE_FLAG_LOOPBACK) {
-                if (include_localhost || only_localhost) {
-                    if_list.Add(iface);
-                    continue;
-                }
-            } else if (ip.Compare("0.0.0.0") && !only_localhost) {
-                if_list.Add(iface);
-                continue;
-            }
-            
-            delete iface;
-        }
-        
-        // cleanup any remaining items in list if we breaked early
-        _if_list.Apply(NPT_ObjectDeleter<NPT_NetworkInterface>());
-        return NPT_SUCCESS;
-    }
-};
-
-#endif // _PLT_UTILITIES_H_
-
-
-
-
-
-
-
-
-

gpac-2.2.1.tar.gz/extra_lib/include/platinum/PltVersion.h Deleted

@@ -1,44 +0,0 @@
-/*****************************************************************
-|
-|   Platinum - Version Info
-|
-| Copyright (c) 2004-2010, Plutinosoft, LLC.
-| All rights reserved.
-| http://www.plutinosoft.com
-|
-| This program is free software; you can redistribute it and/or
-| modify it under the terms of the GNU General Public License
-| as published by the Free Software Foundation; either version 2
-| of the License, or (at your option) any later version.
-|
-| OEMs, ISVs, VARs and other distributors that combine and 
-| distribute commercially licensed software with Platinum software
-| and do not wish to distribute the source code for the commercially
-| licensed software under version 2, or (at your option) any later
-| version, of the GNU General Public License (the "GPL") must enter
-| into a commercial license agreement with Plutinosoft, LLC.
-| licensing@plutinosoft.com
-| 
-| This program 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 General Public License for more details.
-|
-| You should have received a copy of the GNU General Public License
-| along with this program; see the file LICENSE.txt. If not, write to
-| the Free Software Foundation, Inc., 
-| 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-| http://www.gnu.org/licenses/gpl-2.0.html
-|
-****************************************************************/
-
-#ifndef _PLT_VERSION_H_
-#define _PLT_VERSION_H_
-
-/*----------------------------------------------------------------------
-|   constants
-+---------------------------------------------------------------------*/
-#define PLT_PLATINUM_SDK_VERSION            0x00010411
-#define PLT_PLATINUM_SDK_VERSION_STRING     "1.0.4.11"
-
-#endif // _PLT_VERSION_H_

gpac-2.2.1.tar.gz/extra_lib/include/platinum/PltXbox360.h Deleted

@@ -1,73 +0,0 @@
-/*****************************************************************
-|
-|   Platinum - XBox 360
-|
-| Copyright (c) 2004-2010, Plutinosoft, LLC.
-| All rights reserved.
-| http://www.plutinosoft.com
-|
-| This program is free software; you can redistribute it and/or
-| modify it under the terms of the GNU General Public License
-| as published by the Free Software Foundation; either version 2
-| of the License, or (at your option) any later version.
-|
-| OEMs, ISVs, VARs and other distributors that combine and 
-| distribute commercially licensed software with Platinum software
-| and do not wish to distribute the source code for the commercially
-| licensed software under version 2, or (at your option) any later
-| version, of the GNU General Public License (the "GPL") must enter
-| into a commercial license agreement with Plutinosoft, LLC.
-| licensing@plutinosoft.com
-| 
-| This program 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 General Public License for more details.
-|
-| You should have received a copy of the GNU General Public License
-| along with this program; see the file LICENSE.txt. If not, write to
-| the Free Software Foundation, Inc., 
-| 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-| http://www.gnu.org/licenses/gpl-2.0.html
-|
-****************************************************************/
-
-#ifndef _PLT_XBOX360_H_
-#define _PLT_XBOX360_H_
-
-/*----------------------------------------------------------------------
-|   includes
-+---------------------------------------------------------------------*/
-#include "PltMediaRenderer.h"
-
-class PLT_Xbox360 : public PLT_MediaRenderer
-{
-public:
-    PLT_Xbox360(const char*  uuid        = NULL, 
-                unsigned int port        = 0,
-                bool         port_rebind = false);
-
-protected:
-    // PLT_DeviceHost methods
-    virtual NPT_Result SetupServices();
-    virtual NPT_Result SetupIcons();
-    virtual NPT_Result InitServiceURLs(PLT_Service* service, const char* service_name);
-    
-    virtual NPT_Result Announce(PLT_DeviceData*  device, 
-                                NPT_HttpRequest& request, 
-                                NPT_UdpSocket&   socket, 
-                                bool             byebye);
-
-    // PLT_DeviceData methods
-    virtual NPT_Result GetDescription(NPT_String& desc) { return PLT_MediaRenderer::GetDescription(desc); }
-    virtual NPT_Result GetDescription(NPT_XmlElementNode*  parent, 
-                                      NPT_XmlElementNode** device = NULL);
-
-protected:
-    virtual ~PLT_Xbox360();
-
-    virtual NPT_Result AnnouncePresence(NPT_UdpSocket& socket, 
-                                        const char*    serial_number);
-};
-
-#endif /* _PLT_XBOX360_H_ */

gpac-2.2.1.tar.gz/extra_lib/include/platinum/PltXmlHelper.h Deleted

@@ -1,299 +0,0 @@
-/*****************************************************************
-|
-|   Platinum - Xml Helper
-|
-| Copyright (c) 2004-2008, Plutinosoft, LLC.
-| All rights reserved.
-| http://www.plutinosoft.com
-|
-| This program is free software; you can redistribute it and/or
-| modify it under the terms of the GNU General Public License
-| as published by the Free Software Foundation; either version 2
-| of the License, or (at your option) any later version.
-|
-| OEMs, ISVs, VARs and other distributors that combine and 
-| distribute commercially licensed software with Platinum software
-| and do not wish to distribute the source code for the commercially
-| licensed software under version 2, or (at your option) any later
-| version, of the GNU General Public License (the "GPL") must enter
-| into a commercial license agreement with Plutinosoft, LLC.
-| 
-| This program 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 General Public License for more details.
-|
-| You should have received a copy of the GNU General Public License
-| along with this program; see the file LICENSE.txt. If not, write to
-| the Free Software Foundation, Inc., 
-| 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-| http://www.gnu.org/licenses/gpl-2.0.html
-|
-****************************************************************/
-
-#ifndef _PLT_XML_HELPER_H_
-#define _PLT_XML_HELPER_H_
-
-/*----------------------------------------------------------------------
-|   includes
-+---------------------------------------------------------------------*/
-#include "Neptune.h"
-/*----------------------------------------------------------------------
-|   PLT_XmlAttributeFinder
-+---------------------------------------------------------------------*/
-class PLT_XmlAttributeFinder
-{
-public:
-    // if 'namespc' is NULL, we're looking for ANY namespace
-    // if 'namespc' is '\0', we're looking for NO namespace
-    // if 'namespc' is non-empty, look for that SPECIFIC namespace
-    PLT_XmlAttributeFinder(const NPT_XmlElementNode& element, 
-                           const char*               name, 
-                           const char*               namespc) : 
-      m_Element(element), m_Name(name), m_Namespace(namespc) {}
-
-    bool operator()(const NPT_XmlAttribute* const & attribute) const {
-        if (attribute->GetName() == m_Name) {
-            if (m_Namespace) {
-                const NPT_String& prefix = attribute->GetPrefix();
-                if (m_Namespace0 == '\0') {
-                    // match if the attribute has NO namespace
-                    return prefix.IsEmpty();
-                } else {
-                    // match if the attribute has the SPECIFIC namespace
-                    // we're looking for
-                    const NPT_String* namespc = m_Element.GetNamespaceUri(prefix);
-                    return namespc && *namespc == m_Namespace;
-                }
-            } else {
-                // ANY namespace will match
-                return true;
-            }
-        } else {
-            return false;
-        }
-    }
-
-private:
-    const NPT_XmlElementNode& m_Element;
-    const char*               m_Name;
-    const char*               m_Namespace;
-};
-
-/*----------------------------------------------------------------------
-|   PLT_XmlHelper
-+---------------------------------------------------------------------*/
-class PLT_XmlHelper
-{
-public:
-
-    // static methods
-    static NPT_Result GetChildText(NPT_XmlElementNode* node, 
-                                   const char*         tag, 
-                                   NPT_String&         value,
-                                   const char*         namespc = "") {
-        value = "";
-
-        if (!node) return NPT_FAILURE;
-
-        // special case "" means we look for the same namespace as the parent
-        if (namespc && namespc0 == '\0') namespc = node->GetNamespace()?node->GetNamespace()->GetChars():NPT_XML_NO_NAMESPACE;
-
-        NPT_XmlElementNode* child = node->GetChild(tag, namespc);
-        if (!child) return NPT_FAILURE;
-
-        const NPT_String* text = child->GetText();
-        value = text?*text:"";
-        return NPT_SUCCESS;
-    }
-                                   
-    static NPT_Result RemoveAttribute(NPT_XmlElementNode* node, 
-                                      const char*         name,
-                                      const char*         namespc = "") {
-        if (!node) return NPT_FAILURE;
-
-        // special case "" means we look for the same namespace as the parent
-        if (namespc && namespc0 == '\0') namespc = node->GetNamespace()?node->GetNamespace()->GetChars():NPT_XML_NO_NAMESPACE;
-
-        NPT_List<NPT_XmlAttribute*>::Iterator attribute;
-        attribute = node->GetAttributes().Find(PLT_XmlAttributeFinder(*node, name, namespc));
-        if (!attribute) return NPT_FAILURE;
-
-        delete *attribute;
-        NPT_CHECK(node->GetAttributes().Erase(attribute));
-
-        return NPT_SUCCESS;
-    }
-                                   
-    static NPT_Result GetAttribute(NPT_XmlElementNode* node, 
-                                   const char*         name,
-                                   NPT_XmlAttribute*&  attr,
-                                   const char*         namespc = "") {
-        attr = NULL;
-
-        if (!node) return NPT_FAILURE;
-
-        // special case "" means we look for the same namespace as the parent
-        if (namespc && namespc0 == '\0') namespc = node->GetNamespace()?node->GetNamespace()->GetChars():NPT_XML_NO_NAMESPACE;
-
-        NPT_List<NPT_XmlAttribute*>::Iterator attribute;
-        attribute = node->GetAttributes().Find(PLT_XmlAttributeFinder(*node, name, namespc));
-        if (!attribute) return NPT_FAILURE;
-
-        attr = (*attribute);
-        return NPT_SUCCESS;
-    }
-
-    static NPT_Result GetAttribute(NPT_XmlElementNode* node, 
-                                   const char*         name,
-                                   NPT_String&         value,
-                                   const char*         namespc = "") {
-        value = "";
-        
-        NPT_XmlAttribute* attribute = NULL;
-        NPT_CHECK(GetAttribute(node, name, attribute, namespc));
-        if (!attribute) return NPT_FAILURE;
-
-        value = attribute->GetValue();
-        return NPT_SUCCESS;
-    }
-
-    static NPT_Result SetAttribute(NPT_XmlElementNode* node, 
-                                   const char*         name,
-                                   NPT_String&         value,
-                                   const char*         namespc = "") {
-        NPT_XmlAttribute* attribute = NULL;
-        NPT_CHECK(GetAttribute(node, name, attribute, namespc));
-        if (!attribute) return NPT_FAILURE;
-
-        attribute->SetValue(value);
-        return NPT_SUCCESS;
-    }
-
-    static NPT_Result AddChildText(NPT_XmlElementNode* node,
-                                   const char*         tag,
-                                   const char*         text,
-                                   const char*         prefix = NULL) {
-        if (!node) return NPT_FAILURE;
-        NPT_XmlElementNode* child = new NPT_XmlElementNode(prefix, tag);
-        child->AddText(text);
-        return node->AddChild(child);
-    }
-
-    static bool IsMatch(const NPT_XmlNode* const & node, const char* tag, const char* namespc_mapped) {
-        // if m_Namespace is NULL, we're looking for ANY namespace
-        // if m_Namespace is '\0', we're looking for NO namespace
-        // if m_Namespace is non-empty, look for that SPECIFIC namespace
-        
-        const NPT_XmlElementNode* element = node->AsElementNode();
-        // is tag the same (case sensitive)?
-        if (element && element->GetTag() == tag) {
-            if (namespc_mapped) {
-                // look for a SPECIFIC namespace or NO namespace
-                const NPT_String* namespc = element->GetNamespace();
-                if (namespc) {
-                    // the element has a namespace, match if it is equal to
-                    // what we're looking for
-                    return *namespc == namespc_mapped;
-                } else {
-                    // the element does not have a namespace, match if we're
-                    // looking for NO namespace
-                    return namespc_mapped0 == '\0';
-                }
-            } else {
-                // ANY namespace will match
-                return true;
-            }
-        }
-        return false;
-    } 
-
-    static NPT_Result GetChildren(NPT_XmlElementNode*              node,
-                                  NPT_Array<NPT_XmlElementNode*>&  children,
-                                  const char*                      tag,
-                                  const char*                      namespc = "") {
-        if (!node) return NPT_FAILURE;
-
-        // special case "" means we look for the same namespace as the parent
-        if (namespc && namespc0 == '\0') namespc = node->GetNamespace()?node->GetNamespace()->GetChars():NPT_XML_NO_NAMESPACE;
-
-        const char* namespc_mapped = (namespc==NULL)?"":(namespc0=='*' && namespc1=='\0')?NULL:namespc;
-
-        // get all children first
-        NPT_List<NPT_XmlNode*>& allchildren = node->GetChildren();
-
-        // iterate through children and add only elements with matching tag
-        NPT_List<NPT_XmlNode*>::Iterator child = allchildren.GetFirstItem();
-        while  (child) {
-            if (IsMatch(*child, tag, namespc_mapped)) {
-                children.Add((*child)->AsElementNode());
-            }
-            ++child;
-        }
-        return NPT_SUCCESS;
-    }
-
-    static NPT_XmlElementNode* GetChild(NPT_XmlElementNode* node,
-                                        const char*         tag,
-                                        const char*         namespc = "") {
-        if (!node) return NULL;
-
-        // special case "" means we look for the same namespace as the parent
-        if (namespc && namespc0 == '\0') namespc = node->GetNamespace()?node->GetNamespace()->GetChars():NPT_XML_NO_NAMESPACE;
-
-        return node->GetChild(tag, namespc);
-    }
-
-    static NPT_Result GetChild(NPT_XmlElementNode*  parent,
-                               NPT_XmlElementNode*& child,
-                               NPT_Ordinal          n = 0) {
-        if (!parent) return NPT_FAILURE;
-
-        // reset child
-        child = NULL;
-
-        // get all children first
-        NPT_List<NPT_XmlNode*>::Iterator children = parent->GetChildren().GetFirstItem();
-        while  (children) {
-            if ((*children)->AsElementNode() && n-- == 0) {
-                child = (*children)->AsElementNode();
-                return NPT_SUCCESS;
-            }
-            children++;
-        }
-
-        return NPT_FAILURE;
-    }
-
-    static NPT_Result Serialize(NPT_XmlNode& node, NPT_String& xml, bool add_header = true) {
-        NPT_XmlWriter writer(0);
-        NPT_StringOutputStreamReference stream(new NPT_StringOutputStream(&xml));
-        NPT_CHECK(writer.Serialize(node, *stream, add_header));
-        return NPT_SUCCESS;
-    }
-
-	static NPT_String Serialize(NPT_XmlNode& node, bool add_header = true) {
-		NPT_XmlWriter writer(0);
-		NPT_String xml;
-		NPT_StringOutputStreamReference stream(new NPT_StringOutputStream(&xml));
-		if (NPT_FAILED(writer.Serialize(node, *stream, add_header))) {
-			NPT_Debug("Failed to serialize xml node");
-			return "";
-		}
-
-		return xml;
-	}
-private:
-    // members
-};
-
-#endif // _PLT_XML_HELPER_H_
-
-
-
-
-
-
-
-
-

gpac-2.2.1.tar.gz/extra_lib/include/png Deleted

gpac-2.2.1.tar.gz/extra_lib/include/png/png.h Deleted

@@ -1,3597 +0,0 @@
-/* png.h - header file for PNG reference library
- *
- * libpng version 1.2.33 - October 31, 2008
- * Copyright (c) 1998-2008 Glenn Randers-Pehrson
- * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
- * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
- *
- * Authors and maintainers:
- *  libpng versions 0.71, May 1995, through 0.88, January 1996: Guy Schalnat
- *  libpng versions 0.89c, June 1996, through 0.96, May 1997: Andreas Dilger
- *  libpng versions 0.97, January 1998, through 1.2.33 - October 31, 2008: Glenn
- *  See also "Contributing Authors", below.
- *
- * Note about libpng version numbers:
- *
- *    Due to various miscommunications, unforeseen code incompatibilities
- *    and occasional factors outside the authors' control, version numbering
- *    on the library has not always been consistent and straightforward.
- *    The following table summarizes matters since version 0.89c, which was
- *    the first widely used release:
- *
- *    source                 png.h  png.h  shared-lib
- *    version                string   int  version
- *    -------                ------ -----  ----------
- *    0.89c "1.0 beta 3"     0.89      89  1.0.89
- *    0.90  "1.0 beta 4"     0.90      90  0.90  should have been 2.0.90
- *    0.95  "1.0 beta 5"     0.95      95  0.95  should have been 2.0.95
- *    0.96  "1.0 beta 6"     0.96      96  0.96  should have been 2.0.96
- *    0.97b "1.00.97 beta 7" 1.00.97   97  1.0.1 should have been 2.0.97
- *    0.97c                  0.97      97  2.0.97
- *    0.98                   0.98      98  2.0.98
- *    0.99                   0.99      98  2.0.99
- *    0.99a-m                0.99      99  2.0.99
- *    1.00                   1.00     100  2.1.0 100 should be 10000
- *    1.0.0      (from here on, the   100  2.1.0 100 should be 10000
- *    1.0.1       png.h string is   10001  2.1.0
- *    1.0.1a-e    identical to the  10002  from here on, the shared library
- *    1.0.2       source version)   10002  is 2.V where V is the source code
- *    1.0.2a-b                      10003  version, except as noted.
- *    1.0.3                         10003
- *    1.0.3a-d                      10004
- *    1.0.4                         10004
- *    1.0.4a-f                      10005
- *    1.0.5 (+ 2 patches)           10005
- *    1.0.5a-d                      10006
- *    1.0.5e-r                      10100 (not source compatible)
- *    1.0.5s-v                      10006 (not binary compatible)
- *    1.0.6 (+ 3 patches)           10006 (still binary incompatible)
- *    1.0.6d-f                      10007 (still binary incompatible)
- *    1.0.6g                        10007
- *    1.0.6h                        10007  10.6h (testing xy.z so-numbering)
- *    1.0.6i                        10007  10.6i
- *    1.0.6j                        10007  2.1.0.6j (incompatible with 1.0.0)
- *    1.0.7beta11-14        DLLNUM  10007  2.1.0.7beta11-14 (binary compatible)
- *    1.0.7beta15-18           1    10007  2.1.0.7beta15-18 (binary compatible)
- *    1.0.7rc1-2               1    10007  2.1.0.7rc1-2 (binary compatible)
- *    1.0.7                    1    10007  (still compatible)
- *    1.0.8beta1-4             1    10008  2.1.0.8beta1-4
- *    1.0.8rc1                 1    10008  2.1.0.8rc1
- *    1.0.8                    1    10008  2.1.0.8
- *    1.0.9beta1-6             1    10009  2.1.0.9beta1-6
- *    1.0.9rc1                 1    10009  2.1.0.9rc1
- *    1.0.9beta7-10            1    10009  2.1.0.9beta7-10
- *    1.0.9rc2                 1    10009  2.1.0.9rc2
- *    1.0.9                    1    10009  2.1.0.9
- *    1.0.10beta1              1    10010  2.1.0.10beta1
- *    1.0.10rc1                1    10010  2.1.0.10rc1
- *    1.0.10                   1    10010  2.1.0.10
- *    1.0.11beta1-3            1    10011  2.1.0.11beta1-3
- *    1.0.11rc1                1    10011  2.1.0.11rc1
- *    1.0.11                   1    10011  2.1.0.11
- *    1.0.12beta1-2            2    10012  2.1.0.12beta1-2
- *    1.0.12rc1                2    10012  2.1.0.12rc1
- *    1.0.12                   2    10012  2.1.0.12
- *    1.1.0a-f                 -    10100  2.1.1.0a-f (branch abandoned)
- *    1.2.0beta1-2             2    10200  2.1.2.0beta1-2
- *    1.2.0beta3-5             3    10200  3.1.2.0beta3-5
- *    1.2.0rc1                 3    10200  3.1.2.0rc1
- *    1.2.0                    3    10200  3.1.2.0
- *    1.2.1beta1-4             3    10201  3.1.2.1beta1-4
- *    1.2.1rc1-2               3    10201  3.1.2.1rc1-2
- *    1.2.1                    3    10201  3.1.2.1
- *    1.2.2beta1-6            12    10202  12.so.0.1.2.2beta1-6
- *    1.0.13beta1             10    10013  10.so.0.1.0.13beta1
- *    1.0.13rc1               10    10013  10.so.0.1.0.13rc1
- *    1.2.2rc1                12    10202  12.so.0.1.2.2rc1
- *    1.0.13                  10    10013  10.so.0.1.0.13
- *    1.2.2                   12    10202  12.so.0.1.2.2
- *    1.2.3rc1-6              12    10203  12.so.0.1.2.3rc1-6
- *    1.2.3                   12    10203  12.so.0.1.2.3
- *    1.2.4beta1-3            13    10204  12.so.0.1.2.4beta1-3
- *    1.0.14rc1               13    10014  10.so.0.1.0.14rc1
- *    1.2.4rc1                13    10204  12.so.0.1.2.4rc1
- *    1.0.14                  10    10014  10.so.0.1.0.14
- *    1.2.4                   13    10204  12.so.0.1.2.4
- *    1.2.5beta1-2            13    10205  12.so.0.1.2.5beta1-2
- *    1.0.15rc1-3             10    10015  10.so.0.1.0.15rc1-3
- *    1.2.5rc1-3              13    10205  12.so.0.1.2.5rc1-3
- *    1.0.15                  10    10015  10.so.0.1.0.15
- *    1.2.5                   13    10205  12.so.0.1.2.5
- *    1.2.6beta1-4            13    10206  12.so.0.1.2.6beta1-4
- *    1.0.16                  10    10016  10.so.0.1.0.16
- *    1.2.6                   13    10206  12.so.0.1.2.6
- *    1.2.7beta1-2            13    10207  12.so.0.1.2.7beta1-2
- *    1.0.17rc1               10    10017  10.so.0.1.0.17rc1
- *    1.2.7rc1                13    10207  12.so.0.1.2.7rc1
- *    1.0.17                  10    10017  10.so.0.1.0.17
- *    1.2.7                   13    10207  12.so.0.1.2.7
- *    1.2.8beta1-5            13    10208  12.so.0.1.2.8beta1-5
- *    1.0.18rc1-5             10    10018  10.so.0.1.0.18rc1-5
- *    1.2.8rc1-5              13    10208  12.so.0.1.2.8rc1-5
- *    1.0.18                  10    10018  10.so.0.1.0.18
- *    1.2.8                   13    10208  12.so.0.1.2.8
- *    1.2.9beta1-3            13    10209  12.so.0.1.2.9beta1-3
- *    1.2.9beta4-11           13    10209  12.so.0.9.0
- *    1.2.9rc1                13    10209  12.so.0.9.0
- *    1.2.9                   13    10209  12.so.0.9.0
- *    1.2.10beta1-8           13    10210  12.so.0.10.0
- *    1.2.10rc1-3             13    10210  12.so.0.10.0
- *    1.2.10                  13    10210  12.so.0.10.0
- *    1.2.11beta1-4           13    10211  12.so.0.11.0
- *    1.0.19rc1-5             10    10019  10.so.0.19.0
- *    1.2.11rc1-5             13    10211  12.so.0.11.0
- *    1.0.19                  10    10019  10.so.0.19.0
- *    1.2.11                  13    10211  12.so.0.11.0
- *    1.0.20                  10    10020  10.so.0.20.0
- *    1.2.12                  13    10212  12.so.0.12.0
- *    1.2.13beta1             13    10213  12.so.0.13.0
- *    1.0.21                  10    10021  10.so.0.21.0
- *    1.2.13                  13    10213  12.so.0.13.0
- *    1.2.14beta1-2           13    10214  12.so.0.14.0
- *    1.0.22rc1               10    10022  10.so.0.22.0
- *    1.2.14rc1               13    10214  12.so.0.14.0
- *    1.0.22                  10    10022  10.so.0.22.0
- *    1.2.14                  13    10214  12.so.0.14.0
- *    1.2.15beta1-6           13    10215  12.so.0.15.0
- *    1.0.23rc1-5             10    10023  10.so.0.23.0
- *    1.2.15rc1-5             13    10215  12.so.0.15.0
- *    1.0.23                  10    10023  10.so.0.23.0
- *    1.2.15                  13    10215  12.so.0.15.0
- *    1.2.16beta1-2           13    10216  12.so.0.16.0
- *    1.2.16rc1               13    10216  12.so.0.16.0
- *    1.0.24                  10    10024  10.so.0.24.0
- *    1.2.16                  13    10216  12.so.0.16.0
- *    1.2.17beta1-2           13    10217  12.so.0.17.0
- *    1.0.25rc1               10    10025  10.so.0.25.0
- *    1.2.17rc1-3             13    10217  12.so.0.17.0
- *    1.0.25                  10    10025  10.so.0.25.0
- *    1.2.17                  13    10217  12.so.0.17.0
- *    1.0.26                  10    10026  10.so.0.26.0
- *    1.2.18                  13    10218  12.so.0.18.0
- *    1.2.19beta1-31          13    10219  12.so.0.19.0
- *    1.0.27rc1-6             10    10027  10.so.0.27.0
- *    1.2.19rc1-6             13    10219  12.so.0.19.0
- *    1.0.27                  10    10027  10.so.0.27.0
- *    1.2.19                  13    10219  12.so.0.19.0
- *    1.2.20beta01-04         13    10220  12.so.0.20.0
- *    1.0.28rc1-6             10    10028  10.so.0.28.0
- *    1.2.20rc1-6             13    10220  12.so.0.20.0
- *    1.0.28                  10    10028  10.so.0.28.0
- *    1.2.20                  13    10220  12.so.0.20.0
- *    1.2.21beta1-2           13    10221  12.so.0.21.0
- *    1.2.21rc1-3             13    10221  12.so.0.21.0
- *    1.0.29                  10    10029  10.so.0.29.0
- *    1.2.21                  13    10221  12.so.0.21.0
- *    1.2.22beta1-4           13    10222  12.so.0.22.0
- *    1.0.30rc1               10    10030  10.so.0.30.0
- *    1.2.22rc1               13    10222  12.so.0.22.0
- *    1.0.30                  10    10030  10.so.0.30.0
- *    1.2.22                  13    10222  12.so.0.22.0
- *    1.2.23beta01-05         13    10223  12.so.0.23.0
- *    1.2.23rc01              13    10223  12.so.0.23.0
- *    1.2.23                  13    10223  12.so.0.23.0
- *    1.2.24beta01-02         13    10224  12.so.0.24.0
- *    1.2.24rc01              13    10224  12.so.0.24.0
- *    1.2.24                  13    10224  12.so.0.24.0
- *    1.2.25beta01-06         13    10225  12.so.0.25.0
- *    1.2.25rc01-02           13    10225  12.so.0.25.0
- *    1.0.31                  10    10031  10.so.0.31.0
- *    1.2.25                  13    10225  12.so.0.25.0
- *    1.2.26beta01-06         13    10226  12.so.0.26.0
- *    1.2.26rc01              13    10226  12.so.0.26.0
- *    1.2.26                  13    10226  12.so.0.26.0
- *    1.0.32                  10    10032  10.so.0.32.0
- *    1.2.27beta01-06         13    10227  12.so.0.27.0
- *    1.2.27rc01              13    10227  12.so.0.27.0
- *    1.0.33                  10    10033  10.so.0.33.0
- *    1.2.27                  13    10227  12.so.0.27.0
- *    1.0.34                  10    10034  10.so.0.34.0
- *    1.2.28                  13    10228  12.so.0.28.0
- *    1.2.29beta01-03         13    10229  12.so.0.29.0
- *    1.2.29rc01              13    10229  12.so.0.29.0
- *    1.0.35                  10    10035  10.so.0.35.0
- *    1.2.29                  13    10229  12.so.0.29.0
- *    1.0.37                  10    10037  10.so.0.37.0
- *    1.2.30beta01-04         13    10230  12.so.0.30.0
- *    1.0.38rc01-08           10    10038  10.so.0.38.0
- *    1.2.30rc01-08           13    10230  12.so.0.30.0
- *    1.0.38                  10    10038  10.so.0.38.0
- *    1.2.30                  13    10230  12.so.0.30.0
- *    1.0.39rc01-03           10    10039  10.so.0.39.0
- *    1.2.31rc01-03           13    10231  12.so.0.31.0
- *    1.0.39                  10    10039  10.so.0.39.0
- *    1.2.31                  13    10231  12.so.0.31.0
- *    1.2.32beta01-02         13    10232  12.so.0.32.0
- *    1.0.40rc01              10    10040  10.so.0.40.0
- *    1.2.32rc01              13    10232  12.so.0.32.0
- *    1.0.40                  10    10040  10.so.0.40.0
- *    1.2.32                  13    10232  12.so.0.32.0
- *    1.2.33beta01-02         13    10233  12.so.0.33.0
- *    1.2.33rc01-02           13    10233  12.so.0.33.0
- *    1.0.41rc01              10    10041  10.so.0.41.0
- *    1.2.33                  13    10233  12.so.0.33.0
- *    1.0.41                  10    10041  10.so.0.41.0
- *
- *    Henceforth the source version will match the shared-library major
- *    and minor numbers; the shared-library major version number will be
- *    used for changes in backward compatibility, as it is intended.  The
- *    PNG_LIBPNG_VER macro, which is not used within libpng but is available
- *    for applications, is an unsigned integer of the form xyyzz corresponding
- *    to the source version x.y.z (leading zeros in y and z).  Beta versions
- *    were given the previous public release number plus a letter, until
- *    version 1.0.6j; from then on they were given the upcoming public
- *    release number plus "betaNN" or "rcNN".
- *
- *    Binary incompatibility exists only when applications make direct access
- *    to the info_ptr or png_ptr members through png.h, and the compiled
- *    application is loaded with a different version of the library.
- *
- *    DLLNUM will change each time there are forward or backward changes
- *    in binary compatibility (e.g., when a new feature is added).
- *
- * See libpng.txt or libpng.3 for more information.  The PNG specification
- * is available as a W3C Recommendation and as an ISO Specification,
- * <http://www.w3.org/TR/2003/REC-PNG-20031110/
- */
-
-/*
- * COPYRIGHT NOTICE, DISCLAIMER, and LICENSE:
- *
- * If you modify libpng you may insert additional notices immediately following
- * this sentence.
- *
- * libpng versions 1.2.6, August 15, 2004, through 1.2.33, October 31, 2008, are
- * Copyright (c) 2004, 2006-2008 Glenn Randers-Pehrson, and are
- * distributed according to the same disclaimer and license as libpng-1.2.5
- * with the following individual added to the list of Contributing Authors:
- *
- *    Cosmin Truta
- *
- * libpng versions 1.0.7, July 1, 2000, through 1.2.5, October 3, 2002, are
- * Copyright (c) 2000-2002 Glenn Randers-Pehrson, and are
- * distributed according to the same disclaimer and license as libpng-1.0.6
- * with the following individuals added to the list of Contributing Authors:
- *
- *    Simon-Pierre Cadieux
- *    Eric S. Raymond
- *    Gilles Vollant
- *
- * and with the following additions to the disclaimer:
- *
- *    There is no warranty against interference with your enjoyment of the
- *    library or against infringement.  There is no warranty that our
- *    efforts or the library will fulfill any of your particular purposes
- *    or needs.  This library is provided with all faults, and the entire
- *    risk of satisfactory quality, performance, accuracy, and effort is with
- *    the user.
- *
- * libpng versions 0.97, January 1998, through 1.0.6, March 20, 2000, are
- * Copyright (c) 1998, 1999, 2000 Glenn Randers-Pehrson, and are
- * distributed according to the same disclaimer and license as libpng-0.96,
- * with the following individuals added to the list of Contributing Authors:
- *
- *    Tom Lane
- *    Glenn Randers-Pehrson
- *    Willem van Schaik
- *
- * libpng versions 0.89, June 1996, through 0.96, May 1997, are
- * Copyright (c) 1996, 1997 Andreas Dilger
- * Distributed according to the same disclaimer and license as libpng-0.88,
- * with the following individuals added to the list of Contributing Authors:
- *
- *    John Bowler
- *    Kevin Bracey
- *    Sam Bushell
- *    Magnus Holmgren
- *    Greg Roelofs
- *    Tom Tanner
- *
- * libpng versions 0.5, May 1995, through 0.88, January 1996, are
- * Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.
- *
- * For the purposes of this copyright and license, "Contributing Authors"
- * is defined as the following set of individuals:
- *
- *    Andreas Dilger
- *    Dave Martindale
- *    Guy Eric Schalnat
- *    Paul Schmidt
- *    Tim Wegner
- *
- * The PNG Reference Library is supplied "AS IS".  The Contributing Authors
- * and Group 42, Inc. disclaim all warranties, expressed or implied,
- * including, without limitation, the warranties of merchantability and of
- * fitness for any purpose.  The Contributing Authors and Group 42, Inc.
- * assume no liability for direct, indirect, incidental, special, exemplary,
- * or consequential damages, which may result from the use of the PNG
- * Reference Library, even if advised of the possibility of such damage.
- *
- * Permission is hereby granted to use, copy, modify, and distribute this
- * source code, or portions hereof, for any purpose, without fee, subject
- * to the following restrictions:
- *
- * 1. The origin of this source code must not be misrepresented.
- *
- * 2. Altered versions must be plainly marked as such and
- * must not be misrepresented as being the original source.
- *
- * 3. This Copyright notice may not be removed or altered from
- *    any source or altered source distribution.
- *
- * The Contributing Authors and Group 42, Inc. specifically permit, without
- * fee, and encourage the use of this source code as a component to
- * supporting the PNG file format in commercial products.  If you use this
- * source code in a product, acknowledgment is not required but would be
- * appreciated.
- */
-
-/*
- * A "png_get_copyright" function is available, for convenient use in "about"
- * boxes and the like:
- *
- * printf("%s",png_get_copyright(NULL));
- *
- * Also, the PNG logo (in PNG format, of course) is supplied in the
- * files "pngbar.png" and "pngbar.jpg (88x31) and "pngnow.png" (98x31).
- */
-
-/*
- * Libpng is OSI Certified Open Source Software.  OSI Certified is a
- * certification mark of the Open Source Initiative.
- */
-
-/*
- * The contributing authors would like to thank all those who helped
- * with testing, bug fixes, and patience.  This wouldn't have been
- * possible without all of you.
- *
- * Thanks to Frank J. T. Wojcik for helping with the documentation.
- */
-
-/*
- * Y2K compliance in libpng:
- * =========================
- *
- *    October 31, 2008
- *
- *    Since the PNG Development group is an ad-hoc body, we can't make
- *    an official declaration.
- *
- *    This is your unofficial assurance that libpng from version 0.71 and
- *    upward through 1.2.33 are Y2K compliant.  It is my belief that earlier
- *    versions were also Y2K compliant.
- *
- *    Libpng only has three year fields.  One is a 2-byte unsigned integer
- *    that will hold years up to 65535.  The other two hold the date in text
- *    format, and will hold years up to 9999.
- *
- *    The integer is
- *        "png_uint_16 year" in png_time_struct.
- *
- *    The strings are
- *        "png_charp time_buffer" in png_struct and
- *        "near_time_buffer", which is a local character string in png.c.
- *
- *    There are seven time-related functions:
- *        png.c: png_convert_to_rfc_1123() in png.c
- *          (formerly png_convert_to_rfc_1152() in error)
- *        png_convert_from_struct_tm() in pngwrite.c, called in pngwrite.c
- *        png_convert_from_time_t() in pngwrite.c
- *        png_get_tIME() in pngget.c
- *        png_handle_tIME() in pngrutil.c, called in pngread.c
- *        png_set_tIME() in pngset.c
- *        png_write_tIME() in pngwutil.c, called in pngwrite.c
- *
- *    All handle dates properly in a Y2K environment.  The
- *    png_convert_from_time_t() function calls gmtime() to convert from system
- *    clock time, which returns (year - 1900), which we properly convert to
- *    the full 4-digit year.  There is a possibility that applications using
- *    libpng are not passing 4-digit years into the png_convert_to_rfc_1123()
- *    function, or that they are incorrectly passing only a 2-digit year
- *    instead of "year - 1900" into the png_convert_from_struct_tm() function,
- *    but this is not under our control.  The libpng documentation has always
- *    stated that it works with 4-digit years, and the APIs have been
- *    documented as such.
- *
- *    The tIME chunk itself is also Y2K compliant.  It uses a 2-byte unsigned
- *    integer to hold the year, and can hold years as large as 65535.
- *
- *    zlib, upon which libpng depends, is also Y2K compliant.  It contains
- *    no date-related code.
- *
- *       Glenn Randers-Pehrson
- *       libpng maintainer
- *       PNG Development Group
- */
-
-#ifndef PNG_H
-#define PNG_H
-
-/* This is not the place to learn how to use libpng.  The file libpng.txt
- * describes how to use libpng, and the file example.c summarizes it
- * with some code on which to build.  This file is useful for looking
- * at the actual function definitions and structure components.
- */
-
-/* Version information for png.h - this should match the version in png.c */
-#define PNG_LIBPNG_VER_STRING "1.2.33"
-#define PNG_HEADER_VERSION_STRING \
-   " libpng version 1.2.33 - October 31, 2008\n"
-
-#define PNG_LIBPNG_VER_SONUM   0
-#define PNG_LIBPNG_VER_DLLNUM  13
-
-/* These should match the first 3 components of PNG_LIBPNG_VER_STRING: */
-#define PNG_LIBPNG_VER_MAJOR   1
-#define PNG_LIBPNG_VER_MINOR   2
-#define PNG_LIBPNG_VER_RELEASE 33
-/* This should match the numeric part of the final component of
- * PNG_LIBPNG_VER_STRING, omitting any leading zero: */
-
-#define PNG_LIBPNG_VER_BUILD  0
-
-/* Release Status */
-#define PNG_LIBPNG_BUILD_ALPHA    1
-#define PNG_LIBPNG_BUILD_BETA     2
-#define PNG_LIBPNG_BUILD_RC       3
-#define PNG_LIBPNG_BUILD_STABLE   4
-#define PNG_LIBPNG_BUILD_RELEASE_STATUS_MASK 7
-  
-/* Release-Specific Flags */
-#define PNG_LIBPNG_BUILD_PATCH    8 /* Can be OR'ed with
-                                       PNG_LIBPNG_BUILD_STABLE only */
-#define PNG_LIBPNG_BUILD_PRIVATE 16 /* Cannot be OR'ed with
-                                       PNG_LIBPNG_BUILD_SPECIAL */
-#define PNG_LIBPNG_BUILD_SPECIAL 32 /* Cannot be OR'ed with
-                                       PNG_LIBPNG_BUILD_PRIVATE */
-
-#define PNG_LIBPNG_BUILD_BASE_TYPE PNG_LIBPNG_BUILD_STABLE
-
-/* Careful here.  At one time, Guy wanted to use 082, but that would be octal.
- * We must not include leading zeros.
- * Versions 0.7 through 1.0.0 were in the range 0 to 100 here (only
- * version 1.0.0 was mis-numbered 100 instead of 10000).  From
- * version 1.0.1 it's    xxyyzz, where x=major, y=minor, z=release */
-#define PNG_LIBPNG_VER 10233 /* 1.2.33 */
-
-#ifndef PNG_VERSION_INFO_ONLY
-/* include the compression library's header */
-#include "zlib.h"
-#endif
-
-/* include all user configurable info, including optional assembler routines */
-#include "pngconf.h"
-
-/*
- * Added at libpng-1.2.8 */
-/* Ref MSDN: Private as priority over Special
- * VS_FF_PRIVATEBUILD File *was not* built using standard release
- * procedures. If this value is given, the StringFileInfo block must
- * contain a PrivateBuild string. 
- *
- * VS_FF_SPECIALBUILD File *was* built by the original company using
- * standard release procedures but is a variation of the standard
- * file of the same version number. If this value is given, the
- * StringFileInfo block must contain a SpecialBuild string. 
- */
-
-#if defined(PNG_USER_PRIVATEBUILD)
-#  define PNG_LIBPNG_BUILD_TYPE \
-          (PNG_LIBPNG_BUILD_BASE_TYPE | PNG_LIBPNG_BUILD_PRIVATE)
-#else
-#  if defined(PNG_LIBPNG_SPECIALBUILD)
-#    define PNG_LIBPNG_BUILD_TYPE \
-            (PNG_LIBPNG_BUILD_BASE_TYPE | PNG_LIBPNG_BUILD_SPECIAL)
-#  else
-#    define PNG_LIBPNG_BUILD_TYPE (PNG_LIBPNG_BUILD_BASE_TYPE)
-#  endif
-#endif
-
-#ifndef PNG_VERSION_INFO_ONLY
-
-/* Inhibit C++ name-mangling for libpng functions but not for system calls. */
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-/* This file is arranged in several sections.  The first section contains
- * structure and type definitions.  The second section contains the external
- * library functions, while the third has the internal library functions,
- * which applications aren't expected to use directly.
- */
-
-#ifndef PNG_NO_TYPECAST_NULL
-#define int_p_NULL                (int *)NULL
-#define png_bytep_NULL            (png_bytep)NULL
-#define png_bytepp_NULL           (png_bytepp)NULL
-#define png_doublep_NULL          (png_doublep)NULL
-#define png_error_ptr_NULL        (png_error_ptr)NULL
-#define png_flush_ptr_NULL        (png_flush_ptr)NULL
-#define png_free_ptr_NULL         (png_free_ptr)NULL
-#define png_infopp_NULL           (png_infopp)NULL
-#define png_malloc_ptr_NULL       (png_malloc_ptr)NULL
-#define png_read_status_ptr_NULL  (png_read_status_ptr)NULL
-#define png_rw_ptr_NULL           (png_rw_ptr)NULL
-#define png_structp_NULL          (png_structp)NULL
-#define png_uint_16p_NULL         (png_uint_16p)NULL
-#define png_voidp_NULL            (png_voidp)NULL
-#define png_write_status_ptr_NULL (png_write_status_ptr)NULL
-#else
-#define int_p_NULL                NULL
-#define png_bytep_NULL            NULL
-#define png_bytepp_NULL           NULL
-#define png_doublep_NULL          NULL
-#define png_error_ptr_NULL        NULL
-#define png_flush_ptr_NULL        NULL
-#define png_free_ptr_NULL         NULL
-#define png_infopp_NULL           NULL
-#define png_malloc_ptr_NULL       NULL
-#define png_read_status_ptr_NULL  NULL
-#define png_rw_ptr_NULL           NULL
-#define png_structp_NULL          NULL
-#define png_uint_16p_NULL         NULL
-#define png_voidp_NULL            NULL
-#define png_write_status_ptr_NULL NULL
-#endif
-
-/* variables declared in png.c - only it needs to define PNG_NO_EXTERN */
-#if !defined(PNG_NO_EXTERN) || defined(PNG_ALWAYS_EXTERN)
-/* Version information for C files, stored in png.c.  This had better match
- * the version above.
- */
-#ifdef PNG_USE_GLOBAL_ARRAYS
-PNG_EXPORT_VAR (PNG_CONST char) png_libpng_ver18;
-  /* need room for 99.99.99beta99z */
-#else
-#define png_libpng_ver png_get_header_ver(NULL)
-#endif
-
-#ifdef PNG_USE_GLOBAL_ARRAYS
-/* This was removed in version 1.0.5c */
-/* Structures to facilitate easy interlacing.  See png.c for more details */
-PNG_EXPORT_VAR (PNG_CONST int FARDATA) png_pass_start7;
-PNG_EXPORT_VAR (PNG_CONST int FARDATA) png_pass_inc7;
-PNG_EXPORT_VAR (PNG_CONST int FARDATA) png_pass_ystart7;
-PNG_EXPORT_VAR (PNG_CONST int FARDATA) png_pass_yinc7;
-PNG_EXPORT_VAR (PNG_CONST int FARDATA) png_pass_mask7;
-PNG_EXPORT_VAR (PNG_CONST int FARDATA) png_pass_dsp_mask7;
-/* This isn't currently used.  If you need it, see png.c for more details.
-PNG_EXPORT_VAR (PNG_CONST int FARDATA) png_pass_height7;
-*/
-#endif
-
-#endif /* PNG_NO_EXTERN */
-
-/* Three color definitions.  The order of the red, green, and blue, (and the
- * exact size) is not important, although the size of the fields need to
- * be png_byte or png_uint_16 (as defined below).
- */
-typedef struct png_color_struct
-{
-   png_byte red;
-   png_byte green;
-   png_byte blue;
-} png_color;
-typedef png_color FAR * png_colorp;
-typedef png_color FAR * FAR * png_colorpp;
-
-typedef struct png_color_16_struct
-{
-   png_byte index;    /* used for palette files */
-   png_uint_16 red;   /* for use in red green blue files */
-   png_uint_16 green;
-   png_uint_16 blue;
-   png_uint_16 gray;  /* for use in grayscale files */
-} png_color_16;
-typedef png_color_16 FAR * png_color_16p;
-typedef png_color_16 FAR * FAR * png_color_16pp;
-
-typedef struct png_color_8_struct
-{
-   png_byte red;   /* for use in red green blue files */
-   png_byte green;
-   png_byte blue;
-   png_byte gray;  /* for use in grayscale files */
-   png_byte alpha; /* for alpha channel files */
-} png_color_8;
-typedef png_color_8 FAR * png_color_8p;
-typedef png_color_8 FAR * FAR * png_color_8pp;
-
-/*
- * The following two structures are used for the in-core representation
- * of sPLT chunks.
- */
-typedef struct png_sPLT_entry_struct
-{
-   png_uint_16 red;
-   png_uint_16 green;
-   png_uint_16 blue;
-   png_uint_16 alpha;
-   png_uint_16 frequency;
-} png_sPLT_entry;
-typedef png_sPLT_entry FAR * png_sPLT_entryp;
-typedef png_sPLT_entry FAR * FAR * png_sPLT_entrypp;
-
-/*  When the depth of the sPLT palette is 8 bits, the color and alpha samples
- *  occupy the LSB of their respective members, and the MSB of each member
- *  is zero-filled.  The frequency member always occupies the full 16 bits.
- */
-
-typedef struct png_sPLT_struct
-{
-   png_charp name;           /* palette name */
-   png_byte depth;           /* depth of palette samples */
-   png_sPLT_entryp entries;  /* palette entries */
-   png_int_32 nentries;      /* number of palette entries */
-} png_sPLT_t;
-typedef png_sPLT_t FAR * png_sPLT_tp;
-typedef png_sPLT_t FAR * FAR * png_sPLT_tpp;
-
-#ifdef PNG_TEXT_SUPPORTED
-/* png_text holds the contents of a text/ztxt/itxt chunk in a PNG file,
- * and whether that contents is compressed or not.  The "key" field
- * points to a regular zero-terminated C string.  The "text", "lang", and
- * "lang_key" fields can be regular C strings, empty strings, or NULL pointers.
- * However, the * structure returned by png_get_text() will always contain
- * regular zero-terminated C strings (possibly empty), never NULL pointers,
- * so they can be safely used in printf() and other string-handling functions.
- */
-typedef struct png_text_struct
-{
-   int  compression;       /* compression value:
-                             -1: tEXt, none
-                              0: zTXt, deflate
-                              1: iTXt, none
-                              2: iTXt, deflate  */
-   png_charp key;          /* keyword, 1-79 character description of "text" */
-   png_charp text;         /* comment, may be an empty string (ie "")
-                              or a NULL pointer */
-   png_size_t text_length; /* length of the text string */
-#ifdef PNG_iTXt_SUPPORTED
-   png_size_t itxt_length; /* length of the itxt string */
-   png_charp lang;         /* language code, 0-79 characters
-                              or a NULL pointer */
-   png_charp lang_key;     /* keyword translated UTF-8 string, 0 or more
-                              chars or a NULL pointer */
-#endif
-} png_text;
-typedef png_text FAR * png_textp;
-typedef png_text FAR * FAR * png_textpp;
-#endif
-
-/* Supported compression types for text in PNG files (tEXt, and zTXt).
- * The values of the PNG_TEXT_COMPRESSION_ defines should NOT be changed. */
-#define PNG_TEXT_COMPRESSION_NONE_WR -3
-#define PNG_TEXT_COMPRESSION_zTXt_WR -2
-#define PNG_TEXT_COMPRESSION_NONE    -1
-#define PNG_TEXT_COMPRESSION_zTXt     0
-#define PNG_ITXT_COMPRESSION_NONE     1
-#define PNG_ITXT_COMPRESSION_zTXt     2
-#define PNG_TEXT_COMPRESSION_LAST     3  /* Not a valid value */
-
-/* png_time is a way to hold the time in an machine independent way.
- * Two conversions are provided, both from time_t and struct tm.  There
- * is no portable way to convert to either of these structures, as far
- * as I know.  If you know of a portable way, send it to me.  As a side
- * note - PNG has always been Year 2000 compliant!
- */
-typedef struct png_time_struct
-{
-   png_uint_16 year; /* full year, as in, 1995 */
-   png_byte month;   /* month of year, 1 - 12 */
-   png_byte day;     /* day of month, 1 - 31 */
-   png_byte hour;    /* hour of day, 0 - 23 */
-   png_byte minute;  /* minute of hour, 0 - 59 */
-   png_byte second;  /* second of minute, 0 - 60 (for leap seconds) */
-} png_time;
-typedef png_time FAR * png_timep;
-typedef png_time FAR * FAR * png_timepp;
-
-#if defined(PNG_UNKNOWN_CHUNKS_SUPPORTED)
-/* png_unknown_chunk is a structure to hold queued chunks for which there is
- * no specific support.  The idea is that we can use this to queue
- * up private chunks for output even though the library doesn't actually
- * know about their semantics.
- */
-#define PNG_CHUNK_NAME_LENGTH 5
-typedef struct png_unknown_chunk_t
-{
-    png_byte namePNG_CHUNK_NAME_LENGTH;
-    png_byte *data;
-    png_size_t size;
-
-    /* libpng-using applications should NOT directly modify this byte. */
-    png_byte location; /* mode of operation at read time */
-}
-png_unknown_chunk;
-typedef png_unknown_chunk FAR * png_unknown_chunkp;
-typedef png_unknown_chunk FAR * FAR * png_unknown_chunkpp;
-#endif
-
-/* png_info is a structure that holds the information in a PNG file so
- * that the application can find out the characteristics of the image.
- * If you are reading the file, this structure will tell you what is
- * in the PNG file.  If you are writing the file, fill in the information
- * you want to put into the PNG file, then call png_write_info().
- * The names chosen should be very close to the PNG specification, so
- * consult that document for information about the meaning of each field.
- *
- * With libpng < 0.95, it was only possible to directly set and read the
- * the values in the png_info_struct, which meant that the contents and
- * order of the values had to remain fixed.  With libpng 0.95 and later,
- * however, there are now functions that abstract the contents of
- * png_info_struct from the application, so this makes it easier to use
- * libpng with dynamic libraries, and even makes it possible to use
- * libraries that don't have all of the libpng ancillary chunk-handing
- * functionality.
- *
- * In any case, the order of the parameters in png_info_struct should NOT
- * be changed for as long as possible to keep compatibility with applications
- * that use the old direct-access method with png_info_struct.
- *
- * The following members may have allocated storage attached that should be
- * cleaned up before the structure is discarded: palette, trans, text,
- * pcal_purpose, pcal_units, pcal_params, hist, iccp_name, iccp_profile,
- * splt_palettes, scal_unit, row_pointers, and unknowns.   By default, these
- * are automatically freed when the info structure is deallocated, if they were
- * allocated internally by libpng.  This behavior can be changed by means
- * of the png_data_freer() function.
- *
- * More allocation details: all the chunk-reading functions that
- * change these members go through the corresponding png_set_*
- * functions.  A function to clear these members is available: see
- * png_free_data().  The png_set_* functions do not depend on being
- * able to point info structure members to any of the storage they are
- * passed (they make their own copies), EXCEPT that the png_set_text
- * functions use the same storage passed to them in the text_ptr or
- * itxt_ptr structure argument, and the png_set_rows and png_set_unknowns
- * functions do not make their own copies.
- */
-typedef struct png_info_struct
-{
-   /* the following are necessary for every PNG file */
-   png_uint_32 width;       /* width of image in pixels (from IHDR) */
-   png_uint_32 height;      /* height of image in pixels (from IHDR) */
-   png_uint_32 valid;       /* valid chunk data (see PNG_INFO_ below) */
-   png_uint_32 rowbytes;    /* bytes needed to hold an untransformed row */
-   png_colorp palette;      /* array of color values (valid & PNG_INFO_PLTE) */
-   png_uint_16 num_palette; /* number of color entries in "palette" (PLTE) */
-   png_uint_16 num_trans;   /* number of transparent palette color (tRNS) */
-   png_byte bit_depth;      /* 1, 2, 4, 8, or 16 bits/channel (from IHDR) */
-   png_byte color_type;     /* see PNG_COLOR_TYPE_ below (from IHDR) */
-   /* The following three should have been named *_method not *_type */
-   png_byte compression_type; /* must be PNG_COMPRESSION_TYPE_BASE (IHDR) */
-   png_byte filter_type;    /* must be PNG_FILTER_TYPE_BASE (from IHDR) */
-   png_byte interlace_type; /* One of PNG_INTERLACE_NONE, PNG_INTERLACE_ADAM7 */
-
-   /* The following is informational only on read, and not used on writes. */
-   png_byte channels;       /* number of data channels per pixel (1, 2, 3, 4) */
-   png_byte pixel_depth;    /* number of bits per pixel */
-   png_byte spare_byte;     /* to align the data, and for future use */
-   png_byte signature8;   /* magic bytes read by libpng from start of file */
-
-   /* The rest of the data is optional.  If you are reading, check the
-    * valid field to see if the information in these are valid.  If you
-    * are writing, set the valid field to those chunks you want written,
-    * and initialize the appropriate fields below.
-    */
-
-#if defined(PNG_gAMA_SUPPORTED) && defined(PNG_FLOATING_POINT_SUPPORTED)
-   /* The gAMA chunk describes the gamma characteristics of the system
-    * on which the image was created, normally in the range 1.0, 2.5.
-    * Data is valid if (valid & PNG_INFO_gAMA) is non-zero.
-    */
-   float gamma; /* gamma value of image, if (valid & PNG_INFO_gAMA) */
-#endif
-
-#if defined(PNG_sRGB_SUPPORTED)
-    /* GR-P, 0.96a */
-    /* Data valid if (valid & PNG_INFO_sRGB) non-zero. */
-   png_byte srgb_intent; /* sRGB rendering intent 0, 1, 2, or 3 */
-#endif
-
-#if defined(PNG_TEXT_SUPPORTED)
-   /* The tEXt, and zTXt chunks contain human-readable textual data in
-    * uncompressed, compressed, and optionally compressed forms, respectively.
-    * The data in "text" is an array of pointers to uncompressed,
-    * null-terminated C strings. Each chunk has a keyword that describes the
-    * textual data contained in that chunk.  Keywords are not required to be
-    * unique, and the text string may be empty.  Any number of text chunks may
-    * be in an image.
-    */
-   int num_text; /* number of comments read/to write */
-   int max_text; /* current size of text array */
-   png_textp text; /* array of comments read/to write */
-#endif /* PNG_TEXT_SUPPORTED */
-
-#if defined(PNG_tIME_SUPPORTED)
-   /* The tIME chunk holds the last time the displayed image data was
-    * modified.  See the png_time struct for the contents of this struct.
-    */
-   png_time mod_time;
-#endif
-
-#if defined(PNG_sBIT_SUPPORTED)
-   /* The sBIT chunk specifies the number of significant high-order bits
-    * in the pixel data.  Values are in the range 1, bit_depth, and are
-    * only specified for the channels in the pixel data.  The contents of
-    * the low-order bits is not specified.  Data is valid if
-    * (valid & PNG_INFO_sBIT) is non-zero.
-    */
-   png_color_8 sig_bit; /* significant bits in color channels */
-#endif
-
-#if defined(PNG_tRNS_SUPPORTED) || defined(PNG_READ_EXPAND_SUPPORTED) || \
-defined(PNG_READ_BACKGROUND_SUPPORTED)
-   /* The tRNS chunk supplies transparency data for paletted images and
-    * other image types that don't need a full alpha channel.  There are
-    * "num_trans" transparency values for a paletted image, stored in the
-    * same order as the palette colors, starting from index 0.  Values
-    * for the data are in the range 0, 255, ranging from fully transparent
-    * to fully opaque, respectively.  For non-paletted images, there is a
-    * single color specified that should be treated as fully transparent.
-    * Data is valid if (valid & PNG_INFO_tRNS) is non-zero.
-    */
-   png_bytep trans; /* transparent values for paletted image */
-   png_color_16 trans_values; /* transparent color for non-palette image */
-#endif
-
-#if defined(PNG_bKGD_SUPPORTED) || defined(PNG_READ_BACKGROUND_SUPPORTED)
-   /* The bKGD chunk gives the suggested image background color if the
-    * display program does not have its own background color and the image
-    * is needs to composited onto a background before display.  The colors
-    * in "background" are normally in the same color space/depth as the
-    * pixel data.  Data is valid if (valid & PNG_INFO_bKGD) is non-zero.
-    */
-   png_color_16 background;
-#endif
-
-#if defined(PNG_oFFs_SUPPORTED)
-   /* The oFFs chunk gives the offset in "offset_unit_type" units rightwards
-    * and downwards from the top-left corner of the display, page, or other
-    * application-specific co-ordinate space.  See the PNG_OFFSET_ defines
-    * below for the unit types.  Valid if (valid & PNG_INFO_oFFs) non-zero.
-    */
-   png_int_32 x_offset; /* x offset on page */
-   png_int_32 y_offset; /* y offset on page */
-   png_byte offset_unit_type; /* offset units type */
-#endif
-
-#if defined(PNG_pHYs_SUPPORTED)
-   /* The pHYs chunk gives the physical pixel density of the image for
-    * display or printing in "phys_unit_type" units (see PNG_RESOLUTION_
-    * defines below).  Data is valid if (valid & PNG_INFO_pHYs) is non-zero.
-    */
-   png_uint_32 x_pixels_per_unit; /* horizontal pixel density */
-   png_uint_32 y_pixels_per_unit; /* vertical pixel density */
-   png_byte phys_unit_type; /* resolution type (see PNG_RESOLUTION_ below) */
-#endif
-
-#if defined(PNG_hIST_SUPPORTED)
-   /* The hIST chunk contains the relative frequency or importance of the
-    * various palette entries, so that a viewer can intelligently select a
-    * reduced-color palette, if required.  Data is an array of "num_palette"
-    * values in the range 0,65535. Data valid if (valid & PNG_INFO_hIST)
-    * is non-zero.
-    */
-   png_uint_16p hist;
-#endif
-
-#ifdef PNG_cHRM_SUPPORTED
-   /* The cHRM chunk describes the CIE color characteristics of the monitor
-    * on which the PNG was created.  This data allows the viewer to do gamut
-    * mapping of the input image to ensure that the viewer sees the same
-    * colors in the image as the creator.  Values are in the range
-    * 0.0, 0.8.  Data valid if (valid & PNG_INFO_cHRM) non-zero.
-    */
-#ifdef PNG_FLOATING_POINT_SUPPORTED
-   float x_white;
-   float y_white;
-   float x_red;
-   float y_red;
-   float x_green;
-   float y_green;
-   float x_blue;
-   float y_blue;
-#endif
-#endif
-
-#if defined(PNG_pCAL_SUPPORTED)
-   /* The pCAL chunk describes a transformation between the stored pixel
-    * values and original physical data values used to create the image.
-    * The integer range 0, 2^bit_depth - 1 maps to the floating-point
-    * range given by pcal_X0, pcal_X1, and are further transformed by a
-    * (possibly non-linear) transformation function given by "pcal_type"
-    * and "pcal_params" into "pcal_units".  Please see the PNG_EQUATION_
-    * defines below, and the PNG-Group's PNG extensions document for a
-    * complete description of the transformations and how they should be
-    * implemented, and for a description of the ASCII parameter strings.
-    * Data values are valid if (valid & PNG_INFO_pCAL) non-zero.
-    */
-   png_charp pcal_purpose;  /* pCAL chunk description string */
-   png_int_32 pcal_X0;      /* minimum value */
-   png_int_32 pcal_X1;      /* maximum value */
-   png_charp pcal_units;    /* Latin-1 string giving physical units */
-   png_charpp pcal_params;  /* ASCII strings containing parameter values */
-   png_byte pcal_type;      /* equation type (see PNG_EQUATION_ below) */
-   png_byte pcal_nparams;   /* number of parameters given in pcal_params */
-#endif
-
-/* New members added in libpng-1.0.6 */
-#ifdef PNG_FREE_ME_SUPPORTED
-   png_uint_32 free_me;     /* flags items libpng is responsible for freeing */
-#endif
-
-#if defined(PNG_UNKNOWN_CHUNKS_SUPPORTED)
-   /* storage for unknown chunks that the library doesn't recognize. */
-   png_unknown_chunkp unknown_chunks;
-   png_size_t unknown_chunks_num;
-#endif
-
-#if defined(PNG_iCCP_SUPPORTED)
-   /* iCCP chunk data. */
-   png_charp iccp_name;     /* profile name */
-   png_charp iccp_profile;  /* International Color Consortium profile data */
-                            /* Note to maintainer: should be png_bytep */
-   png_uint_32 iccp_proflen;  /* ICC profile data length */
-   png_byte iccp_compression; /* Always zero */
-#endif
-
-#if defined(PNG_sPLT_SUPPORTED)
-   /* data on sPLT chunks (there may be more than one). */
-   png_sPLT_tp splt_palettes;
-   png_uint_32 splt_palettes_num;
-#endif
-
-#if defined(PNG_sCAL_SUPPORTED)
-   /* The sCAL chunk describes the actual physical dimensions of the
-    * subject matter of the graphic.  The chunk contains a unit specification
-    * a byte value, and two ASCII strings representing floating-point
-    * values.  The values are width and height corresponsing to one pixel
-    * in the image.  This external representation is converted to double
-    * here.  Data values are valid if (valid & PNG_INFO_sCAL) is non-zero.
-    */
-   png_byte scal_unit;         /* unit of physical scale */
-#ifdef PNG_FLOATING_POINT_SUPPORTED
-   double scal_pixel_width;    /* width of one pixel */
-   double scal_pixel_height;   /* height of one pixel */
-#endif
-#ifdef PNG_FIXED_POINT_SUPPORTED
-   png_charp scal_s_width;     /* string containing height */
-   png_charp scal_s_height;    /* string containing width */
-#endif
-#endif
-
-#if defined(PNG_INFO_IMAGE_SUPPORTED)
-   /* Memory has been allocated if (valid & PNG_ALLOCATED_INFO_ROWS) non-zero */
-   /* Data valid if (valid & PNG_INFO_IDAT) non-zero */
-   png_bytepp row_pointers;        /* the image bits */
-#endif
-
-#if defined(PNG_FIXED_POINT_SUPPORTED) && defined(PNG_gAMA_SUPPORTED)
-   png_fixed_point int_gamma; /* gamma of image, if (valid & PNG_INFO_gAMA) */
-#endif
-
-#if defined(PNG_cHRM_SUPPORTED) && defined(PNG_FIXED_POINT_SUPPORTED)
-   png_fixed_point int_x_white;
-   png_fixed_point int_y_white;
-   png_fixed_point int_x_red;
-   png_fixed_point int_y_red;
-   png_fixed_point int_x_green;
-   png_fixed_point int_y_green;
-   png_fixed_point int_x_blue;
-   png_fixed_point int_y_blue;
-#endif
-
-} png_info;
-
-typedef png_info FAR * png_infop;
-typedef png_info FAR * FAR * png_infopp;
-
-/* Maximum positive integer used in PNG is (2^31)-1 */
-#define PNG_UINT_31_MAX ((png_uint_32)0x7fffffffL)
-#define PNG_UINT_32_MAX ((png_uint_32)(-1))
-#define PNG_SIZE_MAX ((png_size_t)(-1))
-#if defined(PNG_1_0_X) || defined (PNG_1_2_X)
-/* PNG_MAX_UINT is deprecated; use PNG_UINT_31_MAX instead. */
-#define PNG_MAX_UINT PNG_UINT_31_MAX
-#endif
-
-/* These describe the color_type field in png_info. */
-/* color type masks */
-#define PNG_COLOR_MASK_PALETTE    1
-#define PNG_COLOR_MASK_COLOR      2
-#define PNG_COLOR_MASK_ALPHA      4
-
-/* color types.  Note that not all combinations are legal */
-#define PNG_COLOR_TYPE_GRAY 0
-#define PNG_COLOR_TYPE_PALETTE  (PNG_COLOR_MASK_COLOR | PNG_COLOR_MASK_PALETTE)
-#define PNG_COLOR_TYPE_RGB        (PNG_COLOR_MASK_COLOR)
-#define PNG_COLOR_TYPE_RGB_ALPHA  (PNG_COLOR_MASK_COLOR | PNG_COLOR_MASK_ALPHA)
-#define PNG_COLOR_TYPE_GRAY_ALPHA (PNG_COLOR_MASK_ALPHA)
-/* aliases */
-#define PNG_COLOR_TYPE_RGBA  PNG_COLOR_TYPE_RGB_ALPHA
-#define PNG_COLOR_TYPE_GA  PNG_COLOR_TYPE_GRAY_ALPHA
-
-/* This is for compression type. PNG 1.0-1.2 only define the single type. */
-#define PNG_COMPRESSION_TYPE_BASE 0 /* Deflate method 8, 32K window */
-#define PNG_COMPRESSION_TYPE_DEFAULT PNG_COMPRESSION_TYPE_BASE
-
-/* This is for filter type. PNG 1.0-1.2 only define the single type. */
-#define PNG_FILTER_TYPE_BASE      0 /* Single row per-byte filtering */
-#define PNG_INTRAPIXEL_DIFFERENCING 64 /* Used only in MNG datastreams */
-#define PNG_FILTER_TYPE_DEFAULT   PNG_FILTER_TYPE_BASE
-
-/* These are for the interlacing type.  These values should NOT be changed. */
-#define PNG_INTERLACE_NONE        0 /* Non-interlaced image */
-#define PNG_INTERLACE_ADAM7       1 /* Adam7 interlacing */
-#define PNG_INTERLACE_LAST        2 /* Not a valid value */
-
-/* These are for the oFFs chunk.  These values should NOT be changed. */
-#define PNG_OFFSET_PIXEL          0 /* Offset in pixels */
-#define PNG_OFFSET_MICROMETER     1 /* Offset in micrometers (1/10^6 meter) */
-#define PNG_OFFSET_LAST           2 /* Not a valid value */
-
-/* These are for the pCAL chunk.  These values should NOT be changed. */
-#define PNG_EQUATION_LINEAR       0 /* Linear transformation */
-#define PNG_EQUATION_BASE_E       1 /* Exponential base e transform */
-#define PNG_EQUATION_ARBITRARY    2 /* Arbitrary base exponential transform */
-#define PNG_EQUATION_HYPERBOLIC   3 /* Hyperbolic sine transformation */
-#define PNG_EQUATION_LAST         4 /* Not a valid value */
-
-/* These are for the sCAL chunk.  These values should NOT be changed. */
-#define PNG_SCALE_UNKNOWN         0 /* unknown unit (image scale) */
-#define PNG_SCALE_METER           1 /* meters per pixel */
-#define PNG_SCALE_RADIAN          2 /* radians per pixel */
-#define PNG_SCALE_LAST            3 /* Not a valid value */
-
-/* These are for the pHYs chunk.  These values should NOT be changed. */
-#define PNG_RESOLUTION_UNKNOWN    0 /* pixels/unknown unit (aspect ratio) */
-#define PNG_RESOLUTION_METER      1 /* pixels/meter */
-#define PNG_RESOLUTION_LAST       2 /* Not a valid value */
-
-/* These are for the sRGB chunk.  These values should NOT be changed. */
-#define PNG_sRGB_INTENT_PERCEPTUAL 0
-#define PNG_sRGB_INTENT_RELATIVE   1
-#define PNG_sRGB_INTENT_SATURATION 2
-#define PNG_sRGB_INTENT_ABSOLUTE   3
-#define PNG_sRGB_INTENT_LAST       4 /* Not a valid value */
-
-/* This is for text chunks */
-#define PNG_KEYWORD_MAX_LENGTH     79
-
-/* Maximum number of entries in PLTE/sPLT/tRNS arrays */
-#define PNG_MAX_PALETTE_LENGTH    256
-
-/* These determine if an ancillary chunk's data has been successfully read
- * from the PNG header, or if the application has filled in the corresponding
- * data in the info_struct to be written into the output file.  The values
- * of the PNG_INFO_<chunk> defines should NOT be changed.
- */
-#define PNG_INFO_gAMA 0x0001
-#define PNG_INFO_sBIT 0x0002
-#define PNG_INFO_cHRM 0x0004
-#define PNG_INFO_PLTE 0x0008
-#define PNG_INFO_tRNS 0x0010
-#define PNG_INFO_bKGD 0x0020
-#define PNG_INFO_hIST 0x0040
-#define PNG_INFO_pHYs 0x0080
-#define PNG_INFO_oFFs 0x0100
-#define PNG_INFO_tIME 0x0200
-#define PNG_INFO_pCAL 0x0400
-#define PNG_INFO_sRGB 0x0800   /* GR-P, 0.96a */
-#define PNG_INFO_iCCP 0x1000   /* ESR, 1.0.6 */
-#define PNG_INFO_sPLT 0x2000   /* ESR, 1.0.6 */
-#define PNG_INFO_sCAL 0x4000   /* ESR, 1.0.6 */
-#define PNG_INFO_IDAT 0x8000L  /* ESR, 1.0.6 */
-
-/* This is used for the transformation routines, as some of them
- * change these values for the row.  It also should enable using
- * the routines for other purposes.
- */
-typedef struct png_row_info_struct
-{
-   png_uint_32 width; /* width of row */
-   png_uint_32 rowbytes; /* number of bytes in row */
-   png_byte color_type; /* color type of row */
-   png_byte bit_depth; /* bit depth of row */
-   png_byte channels; /* number of channels (1, 2, 3, or 4) */
-   png_byte pixel_depth; /* bits per pixel (depth * channels) */
-} png_row_info;
-
-typedef png_row_info FAR * png_row_infop;
-typedef png_row_info FAR * FAR * png_row_infopp;
-
-/* These are the function types for the I/O functions and for the functions
- * that allow the user to override the default I/O functions with his or her
- * own.  The png_error_ptr type should match that of user-supplied warning
- * and error functions, while the png_rw_ptr type should match that of the
- * user read/write data functions.
- */
-typedef struct png_struct_def png_struct;
-typedef png_struct FAR * png_structp;
-
-typedef void (PNGAPI *png_error_ptr) PNGARG((png_structp, png_const_charp));
-typedef void (PNGAPI *png_rw_ptr) PNGARG((png_structp, png_bytep, png_size_t));
-typedef void (PNGAPI *png_flush_ptr) PNGARG((png_structp));
-typedef void (PNGAPI *png_read_status_ptr) PNGARG((png_structp, png_uint_32,
-   int));
-typedef void (PNGAPI *png_write_status_ptr) PNGARG((png_structp, png_uint_32,
-   int));
-
-#ifdef PNG_PROGRESSIVE_READ_SUPPORTED
-typedef void (PNGAPI *png_progressive_info_ptr) PNGARG((png_structp, png_infop));
-typedef void (PNGAPI *png_progressive_end_ptr) PNGARG((png_structp, png_infop));
-typedef void (PNGAPI *png_progressive_row_ptr) PNGARG((png_structp, png_bytep,
-   png_uint_32, int));
-#endif
-
-#if defined(PNG_READ_USER_TRANSFORM_SUPPORTED) || \
-    defined(PNG_WRITE_USER_TRANSFORM_SUPPORTED) || \
-    defined(PNG_LEGACY_SUPPORTED)
-typedef void (PNGAPI *png_user_transform_ptr) PNGARG((png_structp,
-    png_row_infop, png_bytep));
-#endif
-
-#if defined(PNG_USER_CHUNKS_SUPPORTED)
-typedef int (PNGAPI *png_user_chunk_ptr) PNGARG((png_structp, png_unknown_chunkp));
-#endif
-#if defined(PNG_UNKNOWN_CHUNKS_SUPPORTED)
-typedef void (PNGAPI *png_unknown_chunk_ptr) PNGARG((png_structp));
-#endif
-
-/* Transform masks for the high-level interface */
-#define PNG_TRANSFORM_IDENTITY       0x0000    /* read and write */
-#define PNG_TRANSFORM_STRIP_16       0x0001    /* read only */
-#define PNG_TRANSFORM_STRIP_ALPHA    0x0002    /* read only */
-#define PNG_TRANSFORM_PACKING        0x0004    /* read and write */
-#define PNG_TRANSFORM_PACKSWAP       0x0008    /* read and write */
-#define PNG_TRANSFORM_EXPAND         0x0010    /* read only */
-#define PNG_TRANSFORM_INVERT_MONO    0x0020    /* read and write */
-#define PNG_TRANSFORM_SHIFT          0x0040    /* read and write */
-#define PNG_TRANSFORM_BGR            0x0080    /* read and write */
-#define PNG_TRANSFORM_SWAP_ALPHA     0x0100    /* read and write */
-#define PNG_TRANSFORM_SWAP_ENDIAN    0x0200    /* read and write */
-#define PNG_TRANSFORM_INVERT_ALPHA   0x0400    /* read and write */
-#define PNG_TRANSFORM_STRIP_FILLER   0x0800    /* WRITE only */
-
-/* Flags for MNG supported features */
-#define PNG_FLAG_MNG_EMPTY_PLTE     0x01
-#define PNG_FLAG_MNG_FILTER_64      0x04
-#define PNG_ALL_MNG_FEATURES        0x05
-
-typedef png_voidp (*png_malloc_ptr) PNGARG((png_structp, png_size_t));
-typedef void (*png_free_ptr) PNGARG((png_structp, png_voidp));
-
-/* The structure that holds the information to read and write PNG files.
- * The only people who need to care about what is inside of this are the
- * people who will be modifying the library for their own special needs.
- * It should NOT be accessed directly by an application, except to store
- * the jmp_buf.
- */
-
-struct png_struct_def
-{
-#ifdef PNG_SETJMP_SUPPORTED
-   jmp_buf jmpbuf;            /* used in png_error */
-#endif
-   png_error_ptr error_fn;    /* function for printing errors and aborting */
-   png_error_ptr warning_fn;  /* function for printing warnings */
-   png_voidp error_ptr;       /* user supplied struct for error functions */
-   png_rw_ptr write_data_fn;  /* function for writing output data */
-   png_rw_ptr read_data_fn;   /* function for reading input data */
-   png_voidp io_ptr;          /* ptr to application struct for I/O functions */
-
-#if defined(PNG_READ_USER_TRANSFORM_SUPPORTED)
-   png_user_transform_ptr read_user_transform_fn; /* user read transform */
-#endif
-
-#if defined(PNG_WRITE_USER_TRANSFORM_SUPPORTED)
-   png_user_transform_ptr write_user_transform_fn; /* user write transform */
-#endif
-
-/* These were added in libpng-1.0.2 */
-#if defined(PNG_USER_TRANSFORM_PTR_SUPPORTED)
-#if defined(PNG_READ_USER_TRANSFORM_SUPPORTED) || \
-    defined(PNG_WRITE_USER_TRANSFORM_SUPPORTED)
-   png_voidp user_transform_ptr; /* user supplied struct for user transform */
-   png_byte user_transform_depth;    /* bit depth of user transformed pixels */
-   png_byte user_transform_channels; /* channels in user transformed pixels */
-#endif
-#endif
-
-   png_uint_32 mode;          /* tells us where we are in the PNG file */
-   png_uint_32 flags;         /* flags indicating various things to libpng */
-   png_uint_32 transformations; /* which transformations to perform */
-
-   z_stream zstream;          /* pointer to decompression structure (below) */
-   png_bytep zbuf;            /* buffer for zlib */
-   png_size_t zbuf_size;      /* size of zbuf */
-   int zlib_level;            /* holds zlib compression level */
-   int zlib_method;           /* holds zlib compression method */
-   int zlib_window_bits;      /* holds zlib compression window bits */
-   int zlib_mem_level;        /* holds zlib compression memory level */
-   int zlib_strategy;         /* holds zlib compression strategy */
-
-   png_uint_32 width;         /* width of image in pixels */
-   png_uint_32 height;        /* height of image in pixels */
-   png_uint_32 num_rows;      /* number of rows in current pass */
-   png_uint_32 usr_width;     /* width of row at start of write */
-   png_uint_32 rowbytes;      /* size of row in bytes */
-   png_uint_32 irowbytes;     /* size of current interlaced row in bytes */
-   png_uint_32 iwidth;        /* width of current interlaced row in pixels */
-   png_uint_32 row_number;    /* current row in interlace pass */
-   png_bytep prev_row;        /* buffer to save previous (unfiltered) row */
-   png_bytep row_buf;         /* buffer to save current (unfiltered) row */
-#ifndef PNG_NO_WRITE_FILTER
-   png_bytep sub_row;         /* buffer to save "sub" row when filtering */
-   png_bytep up_row;          /* buffer to save "up" row when filtering */
-   png_bytep avg_row;         /* buffer to save "avg" row when filtering */
-   png_bytep paeth_row;       /* buffer to save "Paeth" row when filtering */
-#endif
-   png_row_info row_info;     /* used for transformation routines */
-
-   png_uint_32 idat_size;     /* current IDAT size for read */
-   png_uint_32 crc;           /* current chunk CRC value */
-   png_colorp palette;        /* palette from the input file */
-   png_uint_16 num_palette;   /* number of color entries in palette */
-   png_uint_16 num_trans;     /* number of transparency values */
-   png_byte chunk_name5;    /* null-terminated name of current chunk */
-   png_byte compression;      /* file compression type (always 0) */
-   png_byte filter;           /* file filter type (always 0) */
-   png_byte interlaced;       /* PNG_INTERLACE_NONE, PNG_INTERLACE_ADAM7 */
-   png_byte pass;             /* current interlace pass (0 - 6) */
-   png_byte do_filter;        /* row filter flags (see PNG_FILTER_ below ) */
-   png_byte color_type;       /* color type of file */
-   png_byte bit_depth;        /* bit depth of file */
-   png_byte usr_bit_depth;    /* bit depth of users row */
-   png_byte pixel_depth;      /* number of bits per pixel */
-   png_byte channels;         /* number of channels in file */
-   png_byte usr_channels;     /* channels at start of write */
-   png_byte sig_bytes;        /* magic bytes read/written from start of file */
-
-#if defined(PNG_READ_FILLER_SUPPORTED) || defined(PNG_WRITE_FILLER_SUPPORTED)
-#ifdef PNG_LEGACY_SUPPORTED
-   png_byte filler;           /* filler byte for pixel expansion */
-#else
-   png_uint_16 filler;           /* filler bytes for pixel expansion */
-#endif
-#endif
-
-#if defined(PNG_bKGD_SUPPORTED)
-   png_byte background_gamma_type;
-#  ifdef PNG_FLOATING_POINT_SUPPORTED
-   float background_gamma;
-#  endif
-   png_color_16 background;   /* background color in screen gamma space */
-#if defined(PNG_READ_GAMMA_SUPPORTED)
-   png_color_16 background_1; /* background normalized to gamma 1.0 */
-#endif
-#endif /* PNG_bKGD_SUPPORTED */
-
-#if defined(PNG_WRITE_FLUSH_SUPPORTED)
-   png_flush_ptr output_flush_fn;/* Function for flushing output */
-   png_uint_32 flush_dist;    /* how many rows apart to flush, 0 - no flush */
-   png_uint_32 flush_rows;    /* number of rows written since last flush */
-#endif
-
-#if defined(PNG_READ_GAMMA_SUPPORTED) || defined(PNG_READ_BACKGROUND_SUPPORTED)
-   int gamma_shift;      /* number of "insignificant" bits 16-bit gamma */
-#ifdef PNG_FLOATING_POINT_SUPPORTED
-   float gamma;          /* file gamma value */
-   float screen_gamma;   /* screen gamma value (display_exponent) */
-#endif
-#endif
-
-#if defined(PNG_READ_GAMMA_SUPPORTED) || defined(PNG_READ_BACKGROUND_SUPPORTED)
-   png_bytep gamma_table;     /* gamma table for 8-bit depth files */
-   png_bytep gamma_from_1;    /* converts from 1.0 to screen */
-   png_bytep gamma_to_1;      /* converts from file to 1.0 */
-   png_uint_16pp gamma_16_table; /* gamma table for 16-bit depth files */
-   png_uint_16pp gamma_16_from_1; /* converts from 1.0 to screen */
-   png_uint_16pp gamma_16_to_1; /* converts from file to 1.0 */
-#endif
-
-#if defined(PNG_READ_GAMMA_SUPPORTED) || defined(PNG_sBIT_SUPPORTED)
-   png_color_8 sig_bit;       /* significant bits in each available channel */
-#endif
-
-#if defined(PNG_READ_SHIFT_SUPPORTED) || defined(PNG_WRITE_SHIFT_SUPPORTED)
-   png_color_8 shift;         /* shift for significant bit tranformation */
-#endif
-
-#if defined(PNG_tRNS_SUPPORTED) || defined(PNG_READ_BACKGROUND_SUPPORTED) \
- || defined(PNG_READ_EXPAND_SUPPORTED) || defined(PNG_READ_BACKGROUND_SUPPORTED)
-   png_bytep trans;           /* transparency values for paletted files */
-   png_color_16 trans_values; /* transparency values for non-paletted files */
-#endif
-
-   png_read_status_ptr read_row_fn;   /* called after each row is decoded */
-   png_write_status_ptr write_row_fn; /* called after each row is encoded */
-#ifdef PNG_PROGRESSIVE_READ_SUPPORTED
-   png_progressive_info_ptr info_fn; /* called after header data fully read */
-   png_progressive_row_ptr row_fn;   /* called after each prog. row is decoded */
-   png_progressive_end_ptr end_fn;   /* called after image is complete */
-   png_bytep save_buffer_ptr;        /* current location in save_buffer */
-   png_bytep save_buffer;            /* buffer for previously read data */
-   png_bytep current_buffer_ptr;     /* current location in current_buffer */
-   png_bytep current_buffer;         /* buffer for recently used data */
-   png_uint_32 push_length;          /* size of current input chunk */
-   png_uint_32 skip_length;          /* bytes to skip in input data */
-   png_size_t save_buffer_size;      /* amount of data now in save_buffer */
-   png_size_t save_buffer_max;       /* total size of save_buffer */
-   png_size_t buffer_size;           /* total amount of available input data */
-   png_size_t current_buffer_size;   /* amount of data now in current_buffer */
-   int process_mode;                 /* what push library is currently doing */
-   int cur_palette;                  /* current push library palette index */
-
-#  if defined(PNG_TEXT_SUPPORTED)
-     png_size_t current_text_size;   /* current size of text input data */
-     png_size_t current_text_left;   /* how much text left to read in input */
-     png_charp current_text;         /* current text chunk buffer */
-     png_charp current_text_ptr;     /* current location in current_text */
-#  endif /* PNG_TEXT_SUPPORTED */
-#endif /* PNG_PROGRESSIVE_READ_SUPPORTED */
-
-#if defined(__TURBOC__) && !defined(_Windows) && !defined(__FLAT__)
-/* for the Borland special 64K segment handler */
-   png_bytepp offset_table_ptr;
-   png_bytep offset_table;
-   png_uint_16 offset_table_number;
-   png_uint_16 offset_table_count;
-   png_uint_16 offset_table_count_free;
-#endif
-
-#if defined(PNG_READ_DITHER_SUPPORTED)
-   png_bytep palette_lookup;         /* lookup table for dithering */
-   png_bytep dither_index;           /* index translation for palette files */
-#endif
-
-#if defined(PNG_READ_DITHER_SUPPORTED) || defined(PNG_hIST_SUPPORTED)
-   png_uint_16p hist;                /* histogram */
-#endif
-
-#if defined(PNG_WRITE_WEIGHTED_FILTER_SUPPORTED)
-   png_byte heuristic_method;        /* heuristic for row filter selection */
-   png_byte num_prev_filters;        /* number of weights for previous rows */
-   png_bytep prev_filters;           /* filter type(s) of previous row(s) */
-   png_uint_16p filter_weights;      /* weight(s) for previous line(s) */
-   png_uint_16p inv_filter_weights;  /* 1/weight(s) for previous line(s) */
-   png_uint_16p filter_costs;        /* relative filter calculation cost */
-   png_uint_16p inv_filter_costs;    /* 1/relative filter calculation cost */
-#endif
-
-#if defined(PNG_TIME_RFC1123_SUPPORTED)
-   png_charp time_buffer;            /* String to hold RFC 1123 time text */
-#endif
-
-/* New members added in libpng-1.0.6 */
-
-#ifdef PNG_FREE_ME_SUPPORTED
-   png_uint_32 free_me;       /* flags items libpng is responsible for freeing */
-#endif
-
-#if defined(PNG_USER_CHUNKS_SUPPORTED)
-   png_voidp user_chunk_ptr;
-   png_user_chunk_ptr read_user_chunk_fn; /* user read chunk handler */
-#endif
-
-#if defined(PNG_UNKNOWN_CHUNKS_SUPPORTED)
-   int num_chunk_list;
-   png_bytep chunk_list;
-#endif
-
-/* New members added in libpng-1.0.3 */
-#if defined(PNG_READ_RGB_TO_GRAY_SUPPORTED)
-   png_byte rgb_to_gray_status;
-   /* These were changed from png_byte in libpng-1.0.6 */
-   png_uint_16 rgb_to_gray_red_coeff;
-   png_uint_16 rgb_to_gray_green_coeff;
-   png_uint_16 rgb_to_gray_blue_coeff;
-#endif
-
-/* New member added in libpng-1.0.4 (renamed in 1.0.9) */
-#if defined(PNG_MNG_FEATURES_SUPPORTED) || \
-    defined(PNG_READ_EMPTY_PLTE_SUPPORTED) || \
-    defined(PNG_WRITE_EMPTY_PLTE_SUPPORTED)
-/* changed from png_byte to png_uint_32 at version 1.2.0 */
-#ifdef PNG_1_0_X
-   png_byte mng_features_permitted;
-#else
-   png_uint_32 mng_features_permitted;
-#endif /* PNG_1_0_X */
-#endif
-
-/* New member added in libpng-1.0.7 */
-#if defined(PNG_READ_GAMMA_SUPPORTED) || defined(PNG_READ_BACKGROUND_SUPPORTED)
-   png_fixed_point int_gamma;
-#endif
-
-/* New member added in libpng-1.0.9, ifdef'ed out in 1.0.12, enabled in 1.2.0 */
-#if defined(PNG_MNG_FEATURES_SUPPORTED)
-   png_byte filter_type;
-#endif
-
-#if defined(PNG_1_0_X)
-/* New member added in libpng-1.0.10, ifdef'ed out in 1.2.0 */
-   png_uint_32 row_buf_size;
-#endif
-
-/* New members added in libpng-1.2.0 */
-#if defined(PNG_ASSEMBLER_CODE_SUPPORTED)
-#  if !defined(PNG_1_0_X)
-#    if defined(PNG_MMX_CODE_SUPPORTED)
-   png_byte     mmx_bitdepth_threshold;
-   png_uint_32  mmx_rowbytes_threshold;
-#    endif
-   png_uint_32  asm_flags;
-#  endif
-#endif
-
-/* New members added in libpng-1.0.2 but first enabled by default in 1.2.0 */
-#ifdef PNG_USER_MEM_SUPPORTED
-   png_voidp mem_ptr;                /* user supplied struct for mem functions */
-   png_malloc_ptr malloc_fn;         /* function for allocating memory */
-   png_free_ptr free_fn;             /* function for freeing memory */
-#endif
-
-/* New member added in libpng-1.0.13 and 1.2.0 */
-   png_bytep big_row_buf;         /* buffer to save current (unfiltered) row */
-
-#if defined(PNG_READ_DITHER_SUPPORTED)
-/* The following three members were added at version 1.0.14 and 1.2.4 */
-   png_bytep dither_sort;            /* working sort array */
-   png_bytep index_to_palette;       /* where the original index currently is */
-                                     /* in the palette */
-   png_bytep palette_to_index;       /* which original index points to this */
-                                     /* palette color */
-#endif
-
-/* New members added in libpng-1.0.16 and 1.2.6 */
-   png_byte compression_type;
-
-#ifdef PNG_SET_USER_LIMITS_SUPPORTED
-   png_uint_32 user_width_max;
-   png_uint_32 user_height_max;
-#endif
-
-/* New member added in libpng-1.0.25 and 1.2.17 */
-#if defined(PNG_UNKNOWN_CHUNKS_SUPPORTED)
-   /* storage for unknown chunk that the library doesn't recognize. */
-   png_unknown_chunk unknown_chunk;
-#endif
-
-/* New members added in libpng-1.2.26 */
-  png_uint_32 old_big_row_buf_size, old_prev_row_size;
-
-/* New member added in libpng-1.2.30 */
-  png_charp chunkdata;  /* buffer for reading chunk data */
-
-};
-
-
-/* This triggers a compiler error in png.c, if png.c and png.h
- * do not agree upon the version number.
- */
-typedef png_structp version_1_2_33;
-
-typedef png_struct FAR * FAR * png_structpp;
-
-/* Here are the function definitions most commonly used.  This is not
- * the place to find out how to use libpng.  See libpng.txt for the
- * full explanation, see example.c for the summary.  This just provides
- * a simple one line description of the use of each function.
- */
-
-/* Returns the version number of the library */
-extern PNG_EXPORT(png_uint_32,png_access_version_number) PNGARG((void));
-
-/* Tell lib we have already handled the first <num_bytes> magic bytes.
- * Handling more than 8 bytes from the beginning of the file is an error.
- */
-extern PNG_EXPORT(void,png_set_sig_bytes) PNGARG((png_structp png_ptr,
-   int num_bytes));
-
-/* Check sigstart through sigstart + num_to_check - 1 to see if it's a
- * PNG file.  Returns zero if the supplied bytes match the 8-byte PNG
- * signature, and non-zero otherwise.  Having num_to_check == 0 or
- * start > 7 will always fail (ie return non-zero).
- */
-extern PNG_EXPORT(int,png_sig_cmp) PNGARG((png_bytep sig, png_size_t start,
-   png_size_t num_to_check));
-
-/* Simple signature checking function.  This is the same as calling
- * png_check_sig(sig, n) := !png_sig_cmp(sig, 0, n).
- */
-extern PNG_EXPORT(int,png_check_sig) PNGARG((png_bytep sig, int num));
-
-/* Allocate and initialize png_ptr struct for reading, and any other memory. */
-extern PNG_EXPORT(png_structp,png_create_read_struct)
-   PNGARG((png_const_charp user_png_ver, png_voidp error_ptr,
-   png_error_ptr error_fn, png_error_ptr warn_fn));
-
-/* Allocate and initialize png_ptr struct for writing, and any other memory */
-extern PNG_EXPORT(png_structp,png_create_write_struct)
-   PNGARG((png_const_charp user_png_ver, png_voidp error_ptr,
-   png_error_ptr error_fn, png_error_ptr warn_fn));
-
-#ifdef PNG_WRITE_SUPPORTED
-extern PNG_EXPORT(png_uint_32,png_get_compression_buffer_size)
-   PNGARG((png_structp png_ptr));
-#endif
-
-#ifdef PNG_WRITE_SUPPORTED
-extern PNG_EXPORT(void,png_set_compression_buffer_size)
-   PNGARG((png_structp png_ptr, png_uint_32 size));
-#endif
-
-/* Reset the compression stream */
-extern PNG_EXPORT(int,png_reset_zstream) PNGARG((png_structp png_ptr));
-
-/* New functions added in libpng-1.0.2 (not enabled by default until 1.2.0) */
-#ifdef PNG_USER_MEM_SUPPORTED
-extern PNG_EXPORT(png_structp,png_create_read_struct_2)
-   PNGARG((png_const_charp user_png_ver, png_voidp error_ptr,
-   png_error_ptr error_fn, png_error_ptr warn_fn, png_voidp mem_ptr,
-   png_malloc_ptr malloc_fn, png_free_ptr free_fn));
-extern PNG_EXPORT(png_structp,png_create_write_struct_2)
-   PNGARG((png_const_charp user_png_ver, png_voidp error_ptr,
-   png_error_ptr error_fn, png_error_ptr warn_fn, png_voidp mem_ptr,
-   png_malloc_ptr malloc_fn, png_free_ptr free_fn));
-#endif
-
-/* Write a PNG chunk - size, type, (optional) data, CRC. */
-extern PNG_EXPORT(void,png_write_chunk) PNGARG((png_structp png_ptr,
-   png_bytep chunk_name, png_bytep data, png_size_t length));
-
-/* Write the start of a PNG chunk - length and chunk name. */
-extern PNG_EXPORT(void,png_write_chunk_start) PNGARG((png_structp png_ptr,
-   png_bytep chunk_name, png_uint_32 length));
-
-/* Write the data of a PNG chunk started with png_write_chunk_start(). */
-extern PNG_EXPORT(void,png_write_chunk_data) PNGARG((png_structp png_ptr,
-   png_bytep data, png_size_t length));
-
-/* Finish a chunk started with png_write_chunk_start() (includes CRC). */
-extern PNG_EXPORT(void,png_write_chunk_end) PNGARG((png_structp png_ptr));
-
-/* Allocate and initialize the info structure */
-extern PNG_EXPORT(png_infop,png_create_info_struct)
-   PNGARG((png_structp png_ptr));
-
-#if defined(PNG_1_0_X) || defined (PNG_1_2_X)
-/* Initialize the info structure (old interface - DEPRECATED) */
-extern PNG_EXPORT(void,png_info_init) PNGARG((png_infop info_ptr));
-#undef png_info_init
-#define png_info_init(info_ptr) png_info_init_3(&info_ptr,\
-    png_sizeof(png_info));
-#endif
-
-extern PNG_EXPORT(void,png_info_init_3) PNGARG((png_infopp info_ptr,
-    png_size_t png_info_struct_size));
-
-/* Writes all the PNG information before the image. */
-extern PNG_EXPORT(void,png_write_info_before_PLTE) PNGARG((png_structp png_ptr,
-   png_infop info_ptr));
-extern PNG_EXPORT(void,png_write_info) PNGARG((png_structp png_ptr,
-   png_infop info_ptr));
-
-#ifndef PNG_NO_SEQUENTIAL_READ_SUPPORTED
-/* read the information before the actual image data. */
-extern PNG_EXPORT(void,png_read_info) PNGARG((png_structp png_ptr,
-   png_infop info_ptr));
-#endif
-
-#if defined(PNG_TIME_RFC1123_SUPPORTED)
-extern PNG_EXPORT(png_charp,png_convert_to_rfc1123)
-   PNGARG((png_structp png_ptr, png_timep ptime));
-#endif
-
-#if !defined(_WIN32_WCE)
-/* "time.h" functions are not supported on WindowsCE */
-#if defined(PNG_WRITE_tIME_SUPPORTED)
-/* convert from a struct tm to png_time */
-extern PNG_EXPORT(void,png_convert_from_struct_tm) PNGARG((png_timep ptime,
-   struct tm FAR * ttime));
-
-/* convert from time_t to png_time.  Uses gmtime() */
-extern PNG_EXPORT(void,png_convert_from_time_t) PNGARG((png_timep ptime,
-   time_t ttime));
-#endif /* PNG_WRITE_tIME_SUPPORTED */
-#endif /* _WIN32_WCE */
-
-#if defined(PNG_READ_EXPAND_SUPPORTED)
-/* Expand data to 24-bit RGB, or 8-bit grayscale, with alpha if available. */
-extern PNG_EXPORT(void,png_set_expand) PNGARG((png_structp png_ptr));
-#if !defined(PNG_1_0_X)
-extern PNG_EXPORT(void,png_set_expand_gray_1_2_4_to_8) PNGARG((png_structp
-  png_ptr));
-#endif
-extern PNG_EXPORT(void,png_set_palette_to_rgb) PNGARG((png_structp png_ptr));
-extern PNG_EXPORT(void,png_set_tRNS_to_alpha) PNGARG((png_structp png_ptr));
-#if defined(PNG_1_0_X) || defined (PNG_1_2_X)
-/* Deprecated */
-extern PNG_EXPORT(void,png_set_gray_1_2_4_to_8) PNGARG((png_structp png_ptr));
-#endif
-#endif
-
-#if defined(PNG_READ_BGR_SUPPORTED) || defined(PNG_WRITE_BGR_SUPPORTED)
-/* Use blue, green, red order for pixels. */
-extern PNG_EXPORT(void,png_set_bgr) PNGARG((png_structp png_ptr));
-#endif
-
-#if defined(PNG_READ_GRAY_TO_RGB_SUPPORTED)
-/* Expand the grayscale to 24-bit RGB if necessary. */
-extern PNG_EXPORT(void,png_set_gray_to_rgb) PNGARG((png_structp png_ptr));
-#endif
-
-#if defined(PNG_READ_RGB_TO_GRAY_SUPPORTED)
-/* Reduce RGB to grayscale. */
-#ifdef PNG_FLOATING_POINT_SUPPORTED
-extern PNG_EXPORT(void,png_set_rgb_to_gray) PNGARG((png_structp png_ptr,
-   int error_action, double red, double green ));
-#endif
-extern PNG_EXPORT(void,png_set_rgb_to_gray_fixed) PNGARG((png_structp png_ptr,
-   int error_action, png_fixed_point red, png_fixed_point green ));
-extern PNG_EXPORT(png_byte,png_get_rgb_to_gray_status) PNGARG((png_structp
-   png_ptr));
-#endif
-
-extern PNG_EXPORT(void,png_build_grayscale_palette) PNGARG((int bit_depth,
-   png_colorp palette));
-
-#if defined(PNG_READ_STRIP_ALPHA_SUPPORTED)
-extern PNG_EXPORT(void,png_set_strip_alpha) PNGARG((png_structp png_ptr));
-#endif
-
-#if defined(PNG_READ_SWAP_ALPHA_SUPPORTED) || \
-    defined(PNG_WRITE_SWAP_ALPHA_SUPPORTED)
-extern PNG_EXPORT(void,png_set_swap_alpha) PNGARG((png_structp png_ptr));
-#endif
-
-#if defined(PNG_READ_INVERT_ALPHA_SUPPORTED) || \
-    defined(PNG_WRITE_INVERT_ALPHA_SUPPORTED)
-extern PNG_EXPORT(void,png_set_invert_alpha) PNGARG((png_structp png_ptr));
-#endif
-
-#if defined(PNG_READ_FILLER_SUPPORTED) || defined(PNG_WRITE_FILLER_SUPPORTED)
-/* Add a filler byte to 8-bit Gray or 24-bit RGB images. */
-extern PNG_EXPORT(void,png_set_filler) PNGARG((png_structp png_ptr,
-   png_uint_32 filler, int flags));
-/* The values of the PNG_FILLER_ defines should NOT be changed */
-#define PNG_FILLER_BEFORE 0
-#define PNG_FILLER_AFTER 1
-/* Add an alpha byte to 8-bit Gray or 24-bit RGB images. */
-#if !defined(PNG_1_0_X)
-extern PNG_EXPORT(void,png_set_add_alpha) PNGARG((png_structp png_ptr,
-   png_uint_32 filler, int flags));
-#endif
-#endif /* PNG_READ_FILLER_SUPPORTED || PNG_WRITE_FILLER_SUPPORTED */
-
-#if defined(PNG_READ_SWAP_SUPPORTED) || defined(PNG_WRITE_SWAP_SUPPORTED)
-/* Swap bytes in 16-bit depth files. */
-extern PNG_EXPORT(void,png_set_swap) PNGARG((png_structp png_ptr));
-#endif
-
-#if defined(PNG_READ_PACK_SUPPORTED) || defined(PNG_WRITE_PACK_SUPPORTED)
-/* Use 1 byte per pixel in 1, 2, or 4-bit depth files. */
-extern PNG_EXPORT(void,png_set_packing) PNGARG((png_structp png_ptr));
-#endif
-
-#if defined(PNG_READ_PACKSWAP_SUPPORTED) || defined(PNG_WRITE_PACKSWAP_SUPPORTED)
-/* Swap packing order of pixels in bytes. */
-extern PNG_EXPORT(void,png_set_packswap) PNGARG((png_structp png_ptr));
-#endif
-
-#if defined(PNG_READ_SHIFT_SUPPORTED) || defined(PNG_WRITE_SHIFT_SUPPORTED)
-/* Converts files to legal bit depths. */
-extern PNG_EXPORT(void,png_set_shift) PNGARG((png_structp png_ptr,
-   png_color_8p true_bits));
-#endif
-
-#if defined(PNG_READ_INTERLACING_SUPPORTED) || \
-    defined(PNG_WRITE_INTERLACING_SUPPORTED)
-/* Have the code handle the interlacing.  Returns the number of passes. */
-extern PNG_EXPORT(int,png_set_interlace_handling) PNGARG((png_structp png_ptr));
-#endif
-
-#if defined(PNG_READ_INVERT_SUPPORTED) || defined(PNG_WRITE_INVERT_SUPPORTED)
-/* Invert monochrome files */
-extern PNG_EXPORT(void,png_set_invert_mono) PNGARG((png_structp png_ptr));
-#endif
-
-#if defined(PNG_READ_BACKGROUND_SUPPORTED)
-/* Handle alpha and tRNS by replacing with a background color. */
-#ifdef PNG_FLOATING_POINT_SUPPORTED
-extern PNG_EXPORT(void,png_set_background) PNGARG((png_structp png_ptr,
-   png_color_16p background_color, int background_gamma_code,
-   int need_expand, double background_gamma));
-#endif
-#define PNG_BACKGROUND_GAMMA_UNKNOWN 0
-#define PNG_BACKGROUND_GAMMA_SCREEN  1
-#define PNG_BACKGROUND_GAMMA_FILE    2
-#define PNG_BACKGROUND_GAMMA_UNIQUE  3
-#endif
-
-#if defined(PNG_READ_16_TO_8_SUPPORTED)
-/* strip the second byte of information from a 16-bit depth file. */
-extern PNG_EXPORT(void,png_set_strip_16) PNGARG((png_structp png_ptr));
-#endif
-
-#if defined(PNG_READ_DITHER_SUPPORTED)
-/* Turn on dithering, and reduce the palette to the number of colors available. */
-extern PNG_EXPORT(void,png_set_dither) PNGARG((png_structp png_ptr,
-   png_colorp palette, int num_palette, int maximum_colors,
-   png_uint_16p histogram, int full_dither));
-#endif
-
-#if defined(PNG_READ_GAMMA_SUPPORTED)
-/* Handle gamma correction. Screen_gamma=(display_exponent) */
-#ifdef PNG_FLOATING_POINT_SUPPORTED
-extern PNG_EXPORT(void,png_set_gamma) PNGARG((png_structp png_ptr,
-   double screen_gamma, double default_file_gamma));
-#endif
-#endif
-
-#if defined(PNG_1_0_X) || defined (PNG_1_2_X)
-#if defined(PNG_READ_EMPTY_PLTE_SUPPORTED) || \
-    defined(PNG_WRITE_EMPTY_PLTE_SUPPORTED)
-/* Permit or disallow empty PLTE (0: not permitted, 1: permitted) */
-/* Deprecated and will be removed.  Use png_permit_mng_features() instead. */
-extern PNG_EXPORT(void,png_permit_empty_plte) PNGARG((png_structp png_ptr,
-   int empty_plte_permitted));
-#endif
-#endif
-
-#if defined(PNG_WRITE_FLUSH_SUPPORTED)
-/* Set how many lines between output flushes - 0 for no flushing */
-extern PNG_EXPORT(void,png_set_flush) PNGARG((png_structp png_ptr, int nrows));
-/* Flush the current PNG output buffer */
-extern PNG_EXPORT(void,png_write_flush) PNGARG((png_structp png_ptr));
-#endif
-
-/* optional update palette with requested transformations */
-extern PNG_EXPORT(void,png_start_read_image) PNGARG((png_structp png_ptr));
-
-/* optional call to update the users info structure */
-extern PNG_EXPORT(void,png_read_update_info) PNGARG((png_structp png_ptr,
-   png_infop info_ptr));
-
-#ifndef PNG_NO_SEQUENTIAL_READ_SUPPORTED
-/* read one or more rows of image data. */
-extern PNG_EXPORT(void,png_read_rows) PNGARG((png_structp png_ptr,
-   png_bytepp row, png_bytepp display_row, png_uint_32 num_rows));
-#endif
-
-#ifndef PNG_NO_SEQUENTIAL_READ_SUPPORTED
-/* read a row of data. */
-extern PNG_EXPORT(void,png_read_row) PNGARG((png_structp png_ptr,
-   png_bytep row,
-   png_bytep display_row));
-#endif
-
-#ifndef PNG_NO_SEQUENTIAL_READ_SUPPORTED
-/* read the whole image into memory at once. */
-extern PNG_EXPORT(void,png_read_image) PNGARG((png_structp png_ptr,
-   png_bytepp image));
-#endif
-
-/* write a row of image data */
-extern PNG_EXPORT(void,png_write_row) PNGARG((png_structp png_ptr,
-   png_bytep row));
-
-/* write a few rows of image data */
-extern PNG_EXPORT(void,png_write_rows) PNGARG((png_structp png_ptr,
-   png_bytepp row, png_uint_32 num_rows));
-
-/* write the image data */
-extern PNG_EXPORT(void,png_write_image) PNGARG((png_structp png_ptr,
-   png_bytepp image));
-
-/* writes the end of the PNG file. */
-extern PNG_EXPORT(void,png_write_end) PNGARG((png_structp png_ptr,
-   png_infop info_ptr));
-
-#ifndef PNG_NO_SEQUENTIAL_READ_SUPPORTED
-/* read the end of the PNG file. */
-extern PNG_EXPORT(void,png_read_end) PNGARG((png_structp png_ptr,
-   png_infop info_ptr));
-#endif
-
-/* free any memory associated with the png_info_struct */
-extern PNG_EXPORT(void,png_destroy_info_struct) PNGARG((png_structp png_ptr,
-   png_infopp info_ptr_ptr));
-
-/* free any memory associated with the png_struct and the png_info_structs */
-extern PNG_EXPORT(void,png_destroy_read_struct) PNGARG((png_structpp
-   png_ptr_ptr, png_infopp info_ptr_ptr, png_infopp end_info_ptr_ptr));
-
-/* free all memory used by the read (old method - NOT DLL EXPORTED) */
-extern void png_read_destroy PNGARG((png_structp png_ptr, png_infop info_ptr,
-   png_infop end_info_ptr));
-
-/* free any memory associated with the png_struct and the png_info_structs */
-extern PNG_EXPORT(void,png_destroy_write_struct)
-   PNGARG((png_structpp png_ptr_ptr, png_infopp info_ptr_ptr));
-
-/* free any memory used in png_ptr struct (old method - NOT DLL EXPORTED) */
-extern void png_write_destroy PNGARG((png_structp png_ptr));
-
-/* set the libpng method of handling chunk CRC errors */
-extern PNG_EXPORT(void,png_set_crc_action) PNGARG((png_structp png_ptr,
-   int crit_action, int ancil_action));
-
-/* Values for png_set_crc_action() to say how to handle CRC errors in
- * ancillary and critical chunks, and whether to use the data contained
- * therein.  Note that it is impossible to "discard" data in a critical
- * chunk.  For versions prior to 0.90, the action was always error/quit,
- * whereas in version 0.90 and later, the action for CRC errors in ancillary
- * chunks is warn/discard.  These values should NOT be changed.
- *
- *      value                       action:critical     action:ancillary
- */
-#define PNG_CRC_DEFAULT       0  /* error/quit          warn/discard data */
-#define PNG_CRC_ERROR_QUIT    1  /* error/quit          error/quit        */
-#define PNG_CRC_WARN_DISCARD  2  /* (INVALID)           warn/discard data */
-#define PNG_CRC_WARN_USE      3  /* warn/use data       warn/use data     */
-#define PNG_CRC_QUIET_USE     4  /* quiet/use data      quiet/use data    */
-#define PNG_CRC_NO_CHANGE     5  /* use current value   use current value */
-
-/* These functions give the user control over the scan-line filtering in
- * libpng and the compression methods used by zlib.  These functions are
- * mainly useful for testing, as the defaults should work with most users.
- * Those users who are tight on memory or want faster performance at the
- * expense of compression can modify them.  See the compression library
- * header file (zlib.h) for an explination of the compression functions.
- */
-
-/* set the filtering method(s) used by libpng.  Currently, the only valid
- * value for "method" is 0.
- */
-extern PNG_EXPORT(void,png_set_filter) PNGARG((png_structp png_ptr, int method,
-   int filters));
-
-/* Flags for png_set_filter() to say which filters to use.  The flags
- * are chosen so that they don't conflict with real filter types
- * below, in case they are supplied instead of the #defined constants.
- * These values should NOT be changed.
- */
-#define PNG_NO_FILTERS     0x00
-#define PNG_FILTER_NONE    0x08
-#define PNG_FILTER_SUB     0x10
-#define PNG_FILTER_UP      0x20
-#define PNG_FILTER_AVG     0x40
-#define PNG_FILTER_PAETH   0x80
-#define PNG_ALL_FILTERS (PNG_FILTER_NONE | PNG_FILTER_SUB | PNG_FILTER_UP | \
-                         PNG_FILTER_AVG | PNG_FILTER_PAETH)
-
-/* Filter values (not flags) - used in pngwrite.c, pngwutil.c for now.
- * These defines should NOT be changed.
- */
-#define PNG_FILTER_VALUE_NONE  0
-#define PNG_FILTER_VALUE_SUB   1
-#define PNG_FILTER_VALUE_UP    2
-#define PNG_FILTER_VALUE_AVG   3
-#define PNG_FILTER_VALUE_PAETH 4
-#define PNG_FILTER_VALUE_LAST  5
-
-#if defined(PNG_WRITE_WEIGHTED_FILTER_SUPPORTED) /* EXPERIMENTAL */
-/* The "heuristic_method" is given by one of the PNG_FILTER_HEURISTIC_
- * defines, either the default (minimum-sum-of-absolute-differences), or
- * the experimental method (weighted-minimum-sum-of-absolute-differences).
- *
- * Weights are factors >= 1.0, indicating how important it is to keep the
- * filter type consistent between rows.  Larger numbers mean the current
- * filter is that many times as likely to be the same as the "num_weights"
- * previous filters.  This is cumulative for each previous row with a weight.
- * There needs to be "num_weights" values in "filter_weights", or it can be
- * NULL if the weights aren't being specified.  Weights have no influence on
- * the selection of the first row filter.  Well chosen weights can (in theory)
- * improve the compression for a given image.
- *
- * Costs are factors >= 1.0 indicating the relative decoding costs of a
- * filter type.  Higher costs indicate more decoding expense, and are
- * therefore less likely to be selected over a filter with lower computational
- * costs.  There needs to be a value in "filter_costs" for each valid filter
- * type (given by PNG_FILTER_VALUE_LAST), or it can be NULL if you aren't
- * setting the costs.  Costs try to improve the speed of decompression without
- * unduly increasing the compressed image size.
- *
- * A negative weight or cost indicates the default value is to be used, and
- * values in the range 0.0, 1.0) indicate the value is to remain unchanged.
- * The default values for both weights and costs are currently 1.0, but may
- * change if good general weighting/cost heuristics can be found.  If both
- * the weights and costs are set to 1.0, this degenerates the WEIGHTED method
- * to the UNWEIGHTED method, but with added encoding time/computation.
- */
-#ifdef PNG_FLOATING_POINT_SUPPORTED
-extern PNG_EXPORT(void,png_set_filter_heuristics) PNGARG((png_structp png_ptr,
-   int heuristic_method, int num_weights, png_doublep filter_weights,
-   png_doublep filter_costs));
-#endif
-#endif /*  PNG_WRITE_WEIGHTED_FILTER_SUPPORTED */
-
-/* Heuristic used for row filter selection.  These defines should NOT be
- * changed.
- */
-#define PNG_FILTER_HEURISTIC_DEFAULT    0  /* Currently "UNWEIGHTED" */
-#define PNG_FILTER_HEURISTIC_UNWEIGHTED 1  /* Used by libpng < 0.95 */
-#define PNG_FILTER_HEURISTIC_WEIGHTED   2  /* Experimental feature */
-#define PNG_FILTER_HEURISTIC_LAST       3  /* Not a valid value */
-
-/* Set the library compression level.  Currently, valid values range from
- * 0 - 9, corresponding directly to the zlib compression levels 0 - 9
- * (0 - no compression, 9 - "maximal" compression).  Note that tests have
- * shown that zlib compression levels 3-6 usually perform as well as level 9
- * for PNG images, and do considerably fewer caclulations.  In the future,
- * these values may not correspond directly to the zlib compression levels.
- */
-extern PNG_EXPORT(void,png_set_compression_level) PNGARG((png_structp png_ptr,
-   int level));
-
-extern PNG_EXPORT(void,png_set_compression_mem_level)
-   PNGARG((png_structp png_ptr, int mem_level));
-
-extern PNG_EXPORT(void,png_set_compression_strategy)
-   PNGARG((png_structp png_ptr, int strategy));
-
-extern PNG_EXPORT(void,png_set_compression_window_bits)
-   PNGARG((png_structp png_ptr, int window_bits));
-
-extern PNG_EXPORT(void,png_set_compression_method) PNGARG((png_structp png_ptr,
-   int method));
-
-/* These next functions are called for input/output, memory, and error
- * handling.  They are in the file pngrio.c, pngwio.c, and pngerror.c,
- * and call standard C I/O routines such as fread(), fwrite(), and
- * fprintf().  These functions can be made to use other I/O routines
- * at run time for those applications that need to handle I/O in a
- * different manner by calling png_set_???_fn().  See libpng.txt for
- * more information.
- */
-
-#if !defined(PNG_NO_STDIO)
-/* Initialize the input/output for the PNG file to the default functions. */
-extern PNG_EXPORT(void,png_init_io) PNGARG((png_structp png_ptr, png_FILE_p fp));
-#endif
-
-/* Replace the (error and abort), and warning functions with user
- * supplied functions.  If no messages are to be printed you must still
- * write and use replacement functions. The replacement error_fn should
- * still do a longjmp to the last setjmp location if you are using this
- * method of error handling.  If error_fn or warning_fn is NULL, the
- * default function will be used.
- */
-
-extern PNG_EXPORT(void,png_set_error_fn) PNGARG((png_structp png_ptr,
-   png_voidp error_ptr, png_error_ptr error_fn, png_error_ptr warning_fn));
-
-/* Return the user pointer associated with the error functions */
-extern PNG_EXPORT(png_voidp,png_get_error_ptr) PNGARG((png_structp png_ptr));
-
-/* Replace the default data output functions with a user supplied one(s).
- * If buffered output is not used, then output_flush_fn can be set to NULL.
- * If PNG_WRITE_FLUSH_SUPPORTED is not defined at libpng compile time
- * output_flush_fn will be ignored (and thus can be NULL).
- */
-extern PNG_EXPORT(void,png_set_write_fn) PNGARG((png_structp png_ptr,
-   png_voidp io_ptr, png_rw_ptr write_data_fn, png_flush_ptr output_flush_fn));
-
-/* Replace the default data input function with a user supplied one. */
-extern PNG_EXPORT(void,png_set_read_fn) PNGARG((png_structp png_ptr,
-   png_voidp io_ptr, png_rw_ptr read_data_fn));
-
-/* Return the user pointer associated with the I/O functions */
-extern PNG_EXPORT(png_voidp,png_get_io_ptr) PNGARG((png_structp png_ptr));
-
-extern PNG_EXPORT(void,png_set_read_status_fn) PNGARG((png_structp png_ptr,
-   png_read_status_ptr read_row_fn));
-
-extern PNG_EXPORT(void,png_set_write_status_fn) PNGARG((png_structp png_ptr,
-   png_write_status_ptr write_row_fn));
-
-#ifdef PNG_USER_MEM_SUPPORTED
-/* Replace the default memory allocation functions with user supplied one(s). */
-extern PNG_EXPORT(void,png_set_mem_fn) PNGARG((png_structp png_ptr,
-   png_voidp mem_ptr, png_malloc_ptr malloc_fn, png_free_ptr free_fn));
-/* Return the user pointer associated with the memory functions */
-extern PNG_EXPORT(png_voidp,png_get_mem_ptr) PNGARG((png_structp png_ptr));
-#endif
-
-#if defined(PNG_READ_USER_TRANSFORM_SUPPORTED) || \
-    defined(PNG_LEGACY_SUPPORTED)
-extern PNG_EXPORT(void,png_set_read_user_transform_fn) PNGARG((png_structp
-   png_ptr, png_user_transform_ptr read_user_transform_fn));
-#endif
-
-#if defined(PNG_WRITE_USER_TRANSFORM_SUPPORTED) || \
-    defined(PNG_LEGACY_SUPPORTED)
-extern PNG_EXPORT(void,png_set_write_user_transform_fn) PNGARG((png_structp
-   png_ptr, png_user_transform_ptr write_user_transform_fn));
-#endif
-
-#if defined(PNG_READ_USER_TRANSFORM_SUPPORTED) || \
-    defined(PNG_WRITE_USER_TRANSFORM_SUPPORTED) || \
-    defined(PNG_LEGACY_SUPPORTED)
-extern PNG_EXPORT(void,png_set_user_transform_info) PNGARG((png_structp
-   png_ptr, png_voidp user_transform_ptr, int user_transform_depth,
-   int user_transform_channels));
-/* Return the user pointer associated with the user transform functions */
-extern PNG_EXPORT(png_voidp,png_get_user_transform_ptr)
-   PNGARG((png_structp png_ptr));
-#endif
-
-#ifdef PNG_USER_CHUNKS_SUPPORTED
-extern PNG_EXPORT(void,png_set_read_user_chunk_fn) PNGARG((png_structp png_ptr,
-   png_voidp user_chunk_ptr, png_user_chunk_ptr read_user_chunk_fn));
-extern PNG_EXPORT(png_voidp,png_get_user_chunk_ptr) PNGARG((png_structp
-   png_ptr));
-#endif
-
-#ifdef PNG_PROGRESSIVE_READ_SUPPORTED
-/* Sets the function callbacks for the push reader, and a pointer to a
- * user-defined structure available to the callback functions.
- */
-extern PNG_EXPORT(void,png_set_progressive_read_fn) PNGARG((png_structp png_ptr,
-   png_voidp progressive_ptr,
-   png_progressive_info_ptr info_fn, png_progressive_row_ptr row_fn,
-   png_progressive_end_ptr end_fn));
-
-/* returns the user pointer associated with the push read functions */
-extern PNG_EXPORT(png_voidp,png_get_progressive_ptr)
-   PNGARG((png_structp png_ptr));
-
-/* function to be called when data becomes available */
-extern PNG_EXPORT(void,png_process_data) PNGARG((png_structp png_ptr,
-   png_infop info_ptr, png_bytep buffer, png_size_t buffer_size));
-
-/* function that combines rows.  Not very much different than the
- * png_combine_row() call.  Is this even used?????
- */
-extern PNG_EXPORT(void,png_progressive_combine_row) PNGARG((png_structp png_ptr,
-   png_bytep old_row, png_bytep new_row));
-#endif /* PNG_PROGRESSIVE_READ_SUPPORTED */
-
-extern PNG_EXPORT(png_voidp,png_malloc) PNGARG((png_structp png_ptr,
-   png_uint_32 size));
-
-#if defined(PNG_1_0_X)
-#  define png_malloc_warn png_malloc
-#else
-/* Added at libpng version 1.2.4 */
-extern PNG_EXPORT(png_voidp,png_malloc_warn) PNGARG((png_structp png_ptr,
-   png_uint_32 size));
-#endif
-
-/* frees a pointer allocated by png_malloc() */
-extern PNG_EXPORT(void,png_free) PNGARG((png_structp png_ptr, png_voidp ptr));
-
-#if defined(PNG_1_0_X)
-/* Function to allocate memory for zlib. */
-extern PNG_EXPORT(voidpf,png_zalloc) PNGARG((voidpf png_ptr, uInt items,
-   uInt size));
-
-/* Function to free memory for zlib */
-extern PNG_EXPORT(void,png_zfree) PNGARG((voidpf png_ptr, voidpf ptr));
-#endif
-
-/* Free data that was allocated internally */
-extern PNG_EXPORT(void,png_free_data) PNGARG((png_structp png_ptr,
-   png_infop info_ptr, png_uint_32 free_me, int num));
-#ifdef PNG_FREE_ME_SUPPORTED
-/* Reassign responsibility for freeing existing data, whether allocated
- * by libpng or by the application */
-extern PNG_EXPORT(void,png_data_freer) PNGARG((png_structp png_ptr,
-   png_infop info_ptr, int freer, png_uint_32 mask));
-#endif
-/* assignments for png_data_freer */
-#define PNG_DESTROY_WILL_FREE_DATA 1
-#define PNG_SET_WILL_FREE_DATA 1
-#define PNG_USER_WILL_FREE_DATA 2
-/* Flags for png_ptr->free_me and info_ptr->free_me */
-#define PNG_FREE_HIST 0x0008
-#define PNG_FREE_ICCP 0x0010
-#define PNG_FREE_SPLT 0x0020
-#define PNG_FREE_ROWS 0x0040
-#define PNG_FREE_PCAL 0x0080
-#define PNG_FREE_SCAL 0x0100
-#define PNG_FREE_UNKN 0x0200
-#define PNG_FREE_LIST 0x0400
-#define PNG_FREE_PLTE 0x1000
-#define PNG_FREE_TRNS 0x2000
-#define PNG_FREE_TEXT 0x4000
-#define PNG_FREE_ALL  0x7fff
-#define PNG_FREE_MUL  0x4220 /* PNG_FREE_SPLT|PNG_FREE_TEXT|PNG_FREE_UNKN */
-
-#ifdef PNG_USER_MEM_SUPPORTED
-extern PNG_EXPORT(png_voidp,png_malloc_default) PNGARG((png_structp png_ptr,
-   png_uint_32 size));
-extern PNG_EXPORT(void,png_free_default) PNGARG((png_structp png_ptr,
-   png_voidp ptr));
-#endif
-
-extern PNG_EXPORT(png_voidp,png_memcpy_check) PNGARG((png_structp png_ptr,
-   png_voidp s1, png_voidp s2, png_uint_32 size));
-
-extern PNG_EXPORT(png_voidp,png_memset_check) PNGARG((png_structp png_ptr,
-   png_voidp s1, int value, png_uint_32 size));
-
-#if defined(USE_FAR_KEYWORD)  /* memory model conversion function */
-extern void *png_far_to_near PNGARG((png_structp png_ptr,png_voidp ptr,
-   int check));
-#endif /* USE_FAR_KEYWORD */
-
-#ifndef PNG_NO_ERROR_TEXT
-/* Fatal error in PNG image of libpng - can't continue */
-extern PNG_EXPORT(void,png_error) PNGARG((png_structp png_ptr,
-   png_const_charp error_message));
-
-/* The same, but the chunk name is prepended to the error string. */
-extern PNG_EXPORT(void,png_chunk_error) PNGARG((png_structp png_ptr,
-   png_const_charp error_message));
-#else
-/* Fatal error in PNG image of libpng - can't continue */
-extern PNG_EXPORT(void,png_err) PNGARG((png_structp png_ptr));
-#endif
-
-#ifndef PNG_NO_WARNINGS
-/* Non-fatal error in libpng.  Can continue, but may have a problem. */
-extern PNG_EXPORT(void,png_warning) PNGARG((png_structp png_ptr,
-   png_const_charp warning_message));
-
-#ifdef PNG_READ_SUPPORTED
-/* Non-fatal error in libpng, chunk name is prepended to message. */
-extern PNG_EXPORT(void,png_chunk_warning) PNGARG((png_structp png_ptr,
-   png_const_charp warning_message));
-#endif /* PNG_READ_SUPPORTED */
-#endif /* PNG_NO_WARNINGS */
-
-/* The png_set_<chunk> functions are for storing values in the png_info_struct.
- * Similarly, the png_get_<chunk> calls are used to read values from the
- * png_info_struct, either storing the parameters in the passed variables, or
- * setting pointers into the png_info_struct where the data is stored.  The
- * png_get_<chunk> functions return a non-zero value if the data was available
- * in info_ptr, or return zero and do not change any of the parameters if the
- * data was not available.
- *
- * These functions should be used instead of directly accessing png_info
- * to avoid problems with future changes in the size and internal layout of
- * png_info_struct.
- */
-/* Returns "flag" if chunk data is valid in info_ptr. */
-extern PNG_EXPORT(png_uint_32,png_get_valid) PNGARG((png_structp png_ptr,
-png_infop info_ptr, png_uint_32 flag));
-
-/* Returns number of bytes needed to hold a transformed row. */
-extern PNG_EXPORT(png_uint_32,png_get_rowbytes) PNGARG((png_structp png_ptr,
-png_infop info_ptr));
-
-#if defined(PNG_INFO_IMAGE_SUPPORTED)
-/* Returns row_pointers, which is an array of pointers to scanlines that was
-returned from png_read_png(). */
-extern PNG_EXPORT(png_bytepp,png_get_rows) PNGARG((png_structp png_ptr,
-png_infop info_ptr));
-/* Set row_pointers, which is an array of pointers to scanlines for use
-by png_write_png(). */
-extern PNG_EXPORT(void,png_set_rows) PNGARG((png_structp png_ptr,
-   png_infop info_ptr, png_bytepp row_pointers));
-#endif
-
-/* Returns number of color channels in image. */
-extern PNG_EXPORT(png_byte,png_get_channels) PNGARG((png_structp png_ptr,
-png_infop info_ptr));
-
-#ifdef PNG_EASY_ACCESS_SUPPORTED
-/* Returns image width in pixels. */
-extern PNG_EXPORT(png_uint_32, png_get_image_width) PNGARG((png_structp
-png_ptr, png_infop info_ptr));
-
-/* Returns image height in pixels. */
-extern PNG_EXPORT(png_uint_32, png_get_image_height) PNGARG((png_structp
-png_ptr, png_infop info_ptr));
-
-/* Returns image bit_depth. */
-extern PNG_EXPORT(png_byte, png_get_bit_depth) PNGARG((png_structp
-png_ptr, png_infop info_ptr));
-
-/* Returns image color_type. */
-extern PNG_EXPORT(png_byte, png_get_color_type) PNGARG((png_structp
-png_ptr, png_infop info_ptr));
-
-/* Returns image filter_type. */
-extern PNG_EXPORT(png_byte, png_get_filter_type) PNGARG((png_structp
-png_ptr, png_infop info_ptr));
-
-/* Returns image interlace_type. */
-extern PNG_EXPORT(png_byte, png_get_interlace_type) PNGARG((png_structp
-png_ptr, png_infop info_ptr));
-
-/* Returns image compression_type. */
-extern PNG_EXPORT(png_byte, png_get_compression_type) PNGARG((png_structp
-png_ptr, png_infop info_ptr));
-
-/* Returns image resolution in pixels per meter, from pHYs chunk data. */
-extern PNG_EXPORT(png_uint_32, png_get_pixels_per_meter) PNGARG((png_structp
-png_ptr, png_infop info_ptr));
-extern PNG_EXPORT(png_uint_32, png_get_x_pixels_per_meter) PNGARG((png_structp
-png_ptr, png_infop info_ptr));
-extern PNG_EXPORT(png_uint_32, png_get_y_pixels_per_meter) PNGARG((png_structp
-png_ptr, png_infop info_ptr));
-
-/* Returns pixel aspect ratio, computed from pHYs chunk data.  */
-#ifdef PNG_FLOATING_POINT_SUPPORTED
-extern PNG_EXPORT(float, png_get_pixel_aspect_ratio) PNGARG((png_structp
-png_ptr, png_infop info_ptr));
-#endif
-
-/* Returns image x, y offset in pixels or microns, from oFFs chunk data. */
-extern PNG_EXPORT(png_int_32, png_get_x_offset_pixels) PNGARG((png_structp
-png_ptr, png_infop info_ptr));
-extern PNG_EXPORT(png_int_32, png_get_y_offset_pixels) PNGARG((png_structp
-png_ptr, png_infop info_ptr));
-extern PNG_EXPORT(png_int_32, png_get_x_offset_microns) PNGARG((png_structp
-png_ptr, png_infop info_ptr));
-extern PNG_EXPORT(png_int_32, png_get_y_offset_microns) PNGARG((png_structp
-png_ptr, png_infop info_ptr));
-
-#endif /* PNG_EASY_ACCESS_SUPPORTED */
-
-/* Returns pointer to signature string read from PNG header */
-extern PNG_EXPORT(png_bytep,png_get_signature) PNGARG((png_structp png_ptr,
-png_infop info_ptr));
-
-#if defined(PNG_bKGD_SUPPORTED)
-extern PNG_EXPORT(png_uint_32,png_get_bKGD) PNGARG((png_structp png_ptr,
-   png_infop info_ptr, png_color_16p *background));
-#endif
-
-#if defined(PNG_bKGD_SUPPORTED)
-extern PNG_EXPORT(void,png_set_bKGD) PNGARG((png_structp png_ptr,
-   png_infop info_ptr, png_color_16p background));
-#endif
-
-#if defined(PNG_cHRM_SUPPORTED)
-#ifdef PNG_FLOATING_POINT_SUPPORTED
-extern PNG_EXPORT(png_uint_32,png_get_cHRM) PNGARG((png_structp png_ptr,
-   png_infop info_ptr, double *white_x, double *white_y, double *red_x,
-   double *red_y, double *green_x, double *green_y, double *blue_x,
-   double *blue_y));
-#endif
-#ifdef PNG_FIXED_POINT_SUPPORTED
-extern PNG_EXPORT(png_uint_32,png_get_cHRM_fixed) PNGARG((png_structp png_ptr,
-   png_infop info_ptr, png_fixed_point *int_white_x, png_fixed_point
-   *int_white_y, png_fixed_point *int_red_x, png_fixed_point *int_red_y,
-   png_fixed_point *int_green_x, png_fixed_point *int_green_y, png_fixed_point
-   *int_blue_x, png_fixed_point *int_blue_y));
-#endif
-#endif
-
-#if defined(PNG_cHRM_SUPPORTED)
-#ifdef PNG_FLOATING_POINT_SUPPORTED
-extern PNG_EXPORT(void,png_set_cHRM) PNGARG((png_structp png_ptr,
-   png_infop info_ptr, double white_x, double white_y, double red_x,
-   double red_y, double green_x, double green_y, double blue_x, double blue_y));
-#endif
-#ifdef PNG_FIXED_POINT_SUPPORTED
-extern PNG_EXPORT(void,png_set_cHRM_fixed) PNGARG((png_structp png_ptr,
-   png_infop info_ptr, png_fixed_point int_white_x, png_fixed_point int_white_y,
-   png_fixed_point int_red_x, png_fixed_point int_red_y, png_fixed_point
-   int_green_x, png_fixed_point int_green_y, png_fixed_point int_blue_x,
-   png_fixed_point int_blue_y));
-#endif
-#endif
-
-#if defined(PNG_gAMA_SUPPORTED)
-#ifdef PNG_FLOATING_POINT_SUPPORTED
-extern PNG_EXPORT(png_uint_32,png_get_gAMA) PNGARG((png_structp png_ptr,
-   png_infop info_ptr, double *file_gamma));
-#endif
-extern PNG_EXPORT(png_uint_32,png_get_gAMA_fixed) PNGARG((png_structp png_ptr,
-   png_infop info_ptr, png_fixed_point *int_file_gamma));
-#endif
-
-#if defined(PNG_gAMA_SUPPORTED)
-#ifdef PNG_FLOATING_POINT_SUPPORTED
-extern PNG_EXPORT(void,png_set_gAMA) PNGARG((png_structp png_ptr,
-   png_infop info_ptr, double file_gamma));
-#endif
-extern PNG_EXPORT(void,png_set_gAMA_fixed) PNGARG((png_structp png_ptr,
-   png_infop info_ptr, png_fixed_point int_file_gamma));
-#endif
-
-#if defined(PNG_hIST_SUPPORTED)
-extern PNG_EXPORT(png_uint_32,png_get_hIST) PNGARG((png_structp png_ptr,
-   png_infop info_ptr, png_uint_16p *hist));
-#endif
-
-#if defined(PNG_hIST_SUPPORTED)
-extern PNG_EXPORT(void,png_set_hIST) PNGARG((png_structp png_ptr,
-   png_infop info_ptr, png_uint_16p hist));
-#endif
-
-extern PNG_EXPORT(png_uint_32,png_get_IHDR) PNGARG((png_structp png_ptr,
-   png_infop info_ptr, png_uint_32 *width, png_uint_32 *height,
-   int *bit_depth, int *color_type, int *interlace_method,
-   int *compression_method, int *filter_method));
-
-extern PNG_EXPORT(void,png_set_IHDR) PNGARG((png_structp png_ptr,
-   png_infop info_ptr, png_uint_32 width, png_uint_32 height, int bit_depth,
-   int color_type, int interlace_method, int compression_method,
-   int filter_method));
-
-#if defined(PNG_oFFs_SUPPORTED)
-extern PNG_EXPORT(png_uint_32,png_get_oFFs) PNGARG((png_structp png_ptr,
-   png_infop info_ptr, png_int_32 *offset_x, png_int_32 *offset_y,
-   int *unit_type));
-#endif
-
-#if defined(PNG_oFFs_SUPPORTED)
-extern PNG_EXPORT(void,png_set_oFFs) PNGARG((png_structp png_ptr,
-   png_infop info_ptr, png_int_32 offset_x, png_int_32 offset_y,
-   int unit_type));
-#endif
-
-#if defined(PNG_pCAL_SUPPORTED)
-extern PNG_EXPORT(png_uint_32,png_get_pCAL) PNGARG((png_structp png_ptr,
-   png_infop info_ptr, png_charp *purpose, png_int_32 *X0, png_int_32 *X1,
-   int *type, int *nparams, png_charp *units, png_charpp *params));
-#endif
-
-#if defined(PNG_pCAL_SUPPORTED)
-extern PNG_EXPORT(void,png_set_pCAL) PNGARG((png_structp png_ptr,
-   png_infop info_ptr, png_charp purpose, png_int_32 X0, png_int_32 X1,
-   int type, int nparams, png_charp units, png_charpp params));
-#endif
-
-#if defined(PNG_pHYs_SUPPORTED)
-extern PNG_EXPORT(png_uint_32,png_get_pHYs) PNGARG((png_structp png_ptr,
-   png_infop info_ptr, png_uint_32 *res_x, png_uint_32 *res_y, int *unit_type));
-#endif
-
-#if defined(PNG_pHYs_SUPPORTED)
-extern PNG_EXPORT(void,png_set_pHYs) PNGARG((png_structp png_ptr,
-   png_infop info_ptr, png_uint_32 res_x, png_uint_32 res_y, int unit_type));
-#endif
-
-extern PNG_EXPORT(png_uint_32,png_get_PLTE) PNGARG((png_structp png_ptr,
-   png_infop info_ptr, png_colorp *palette, int *num_palette));
-
-extern PNG_EXPORT(void,png_set_PLTE) PNGARG((png_structp png_ptr,
-   png_infop info_ptr, png_colorp palette, int num_palette));
-
-#if defined(PNG_sBIT_SUPPORTED)
-extern PNG_EXPORT(png_uint_32,png_get_sBIT) PNGARG((png_structp png_ptr,
-   png_infop info_ptr, png_color_8p *sig_bit));
-#endif
-
-#if defined(PNG_sBIT_SUPPORTED)
-extern PNG_EXPORT(void,png_set_sBIT) PNGARG((png_structp png_ptr,
-   png_infop info_ptr, png_color_8p sig_bit));
-#endif
-
-#if defined(PNG_sRGB_SUPPORTED)
-extern PNG_EXPORT(png_uint_32,png_get_sRGB) PNGARG((png_structp png_ptr,
-   png_infop info_ptr, int *intent));
-#endif
-
-#if defined(PNG_sRGB_SUPPORTED)
-extern PNG_EXPORT(void,png_set_sRGB) PNGARG((png_structp png_ptr,
-   png_infop info_ptr, int intent));
-extern PNG_EXPORT(void,png_set_sRGB_gAMA_and_cHRM) PNGARG((png_structp png_ptr,
-   png_infop info_ptr, int intent));
-#endif
-
-#if defined(PNG_iCCP_SUPPORTED)
-extern PNG_EXPORT(png_uint_32,png_get_iCCP) PNGARG((png_structp png_ptr,
-   png_infop info_ptr, png_charpp name, int *compression_type,
-   png_charpp profile, png_uint_32 *proflen));
-   /* Note to maintainer: profile should be png_bytepp */
-#endif
-
-#if defined(PNG_iCCP_SUPPORTED)
-extern PNG_EXPORT(void,png_set_iCCP) PNGARG((png_structp png_ptr,
-   png_infop info_ptr, png_charp name, int compression_type,
-   png_charp profile, png_uint_32 proflen));
-   /* Note to maintainer: profile should be png_bytep */
-#endif
-
-#if defined(PNG_sPLT_SUPPORTED)
-extern PNG_EXPORT(png_uint_32,png_get_sPLT) PNGARG((png_structp png_ptr,
-   png_infop info_ptr, png_sPLT_tpp entries));
-#endif
-
-#if defined(PNG_sPLT_SUPPORTED)
-extern PNG_EXPORT(void,png_set_sPLT) PNGARG((png_structp png_ptr,
-   png_infop info_ptr, png_sPLT_tp entries, int nentries));
-#endif
-
-#if defined(PNG_TEXT_SUPPORTED)
-/* png_get_text also returns the number of text chunks in *num_text */
-extern PNG_EXPORT(png_uint_32,png_get_text) PNGARG((png_structp png_ptr,
-   png_infop info_ptr, png_textp *text_ptr, int *num_text));
-#endif
-
-/*
- *  Note while png_set_text() will accept a structure whose text,
- *  language, and  translated keywords are NULL pointers, the structure
- *  returned by png_get_text will always contain regular
- *  zero-terminated C strings.  They might be empty strings but
- *  they will never be NULL pointers.
- */
-
-#if defined(PNG_TEXT_SUPPORTED)
-extern PNG_EXPORT(void,png_set_text) PNGARG((png_structp png_ptr,
-   png_infop info_ptr, png_textp text_ptr, int num_text));
-#endif
-
-#if defined(PNG_tIME_SUPPORTED)
-extern PNG_EXPORT(png_uint_32,png_get_tIME) PNGARG((png_structp png_ptr,
-   png_infop info_ptr, png_timep *mod_time));
-#endif
-
-#if defined(PNG_tIME_SUPPORTED)
-extern PNG_EXPORT(void,png_set_tIME) PNGARG((png_structp png_ptr,
-   png_infop info_ptr, png_timep mod_time));
-#endif
-
-#if defined(PNG_tRNS_SUPPORTED)
-extern PNG_EXPORT(png_uint_32,png_get_tRNS) PNGARG((png_structp png_ptr,
-   png_infop info_ptr, png_bytep *trans, int *num_trans,
-   png_color_16p *trans_values));
-#endif
-
-#if defined(PNG_tRNS_SUPPORTED)
-extern PNG_EXPORT(void,png_set_tRNS) PNGARG((png_structp png_ptr,
-   png_infop info_ptr, png_bytep trans, int num_trans,
-   png_color_16p trans_values));
-#endif
-
-#if defined(PNG_tRNS_SUPPORTED)
-#endif
-
-#if defined(PNG_sCAL_SUPPORTED)
-#ifdef PNG_FLOATING_POINT_SUPPORTED
-extern PNG_EXPORT(png_uint_32,png_get_sCAL) PNGARG((png_structp png_ptr,
-   png_infop info_ptr, int *unit, double *width, double *height));
-#else
-#ifdef PNG_FIXED_POINT_SUPPORTED
-extern PNG_EXPORT(png_uint_32,png_get_sCAL_s) PNGARG((png_structp png_ptr,
-   png_infop info_ptr, int *unit, png_charpp swidth, png_charpp sheight));
-#endif
-#endif
-#endif /* PNG_sCAL_SUPPORTED */
-
-#if defined(PNG_sCAL_SUPPORTED)
-#ifdef PNG_FLOATING_POINT_SUPPORTED
-extern PNG_EXPORT(void,png_set_sCAL) PNGARG((png_structp png_ptr,
-   png_infop info_ptr, int unit, double width, double height));
-#else
-#ifdef PNG_FIXED_POINT_SUPPORTED
-extern PNG_EXPORT(void,png_set_sCAL_s) PNGARG((png_structp png_ptr,
-   png_infop info_ptr, int unit, png_charp swidth, png_charp sheight));
-#endif
-#endif
-#endif /* PNG_sCAL_SUPPORTED || PNG_WRITE_sCAL_SUPPORTED */
-
-#if defined(PNG_UNKNOWN_CHUNKS_SUPPORTED)
-/* provide a list of chunks and how they are to be handled, if the built-in
-   handling or default unknown chunk handling is not desired.  Any chunks not
-   listed will be handled in the default manner.  The IHDR and IEND chunks
-   must not be listed.
-      keep = 0: follow default behaviour
-           = 1: do not keep
-           = 2: keep only if safe-to-copy
-           = 3: keep even if unsafe-to-copy
-*/
-extern PNG_EXPORT(void, png_set_keep_unknown_chunks) PNGARG((png_structp
-   png_ptr, int keep, png_bytep chunk_list, int num_chunks));
-extern PNG_EXPORT(void, png_set_unknown_chunks) PNGARG((png_structp png_ptr,
-   png_infop info_ptr, png_unknown_chunkp unknowns, int num_unknowns));
-extern PNG_EXPORT(void, png_set_unknown_chunk_location)
-   PNGARG((png_structp png_ptr, png_infop info_ptr, int chunk, int location));
-extern PNG_EXPORT(png_uint_32,png_get_unknown_chunks) PNGARG((png_structp
-   png_ptr, png_infop info_ptr, png_unknown_chunkpp entries));
-#endif
-#ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED
-PNG_EXPORT(int,png_handle_as_unknown) PNGARG((png_structp png_ptr, png_bytep
-   chunk_name));
-#endif
-
-/* Png_free_data() will turn off the "valid" flag for anything it frees.
-   If you need to turn it off for a chunk that your application has freed,
-   you can use png_set_invalid(png_ptr, info_ptr, PNG_INFO_CHNK); */
-extern PNG_EXPORT(void, png_set_invalid) PNGARG((png_structp png_ptr,
-   png_infop info_ptr, int mask));
-
-#if defined(PNG_INFO_IMAGE_SUPPORTED)
-/* The "params" pointer is currently not used and is for future expansion. */
-extern PNG_EXPORT(void, png_read_png) PNGARG((png_structp png_ptr,
-                        png_infop info_ptr,
-                        int transforms,
-                        png_voidp params));
-extern PNG_EXPORT(void, png_write_png) PNGARG((png_structp png_ptr,
-                        png_infop info_ptr,
-                        int transforms,
-                        png_voidp params));
-#endif
-
-/* Define PNG_DEBUG at compile time for debugging information.  Higher
- * numbers for PNG_DEBUG mean more debugging information.  This has
- * only been added since version 0.95 so it is not implemented throughout
- * libpng yet, but more support will be added as needed.
- */
-#ifdef PNG_DEBUG
-#if (PNG_DEBUG > 0)
-#if !defined(PNG_DEBUG_FILE) && defined(_MSC_VER)
-#include <crtdbg.h>
-#if (PNG_DEBUG > 1)
-#define png_debug(l,m)  _RPT0(_CRT_WARN,m)
-#define png_debug1(l,m,p1)  _RPT1(_CRT_WARN,m,p1)
-#define png_debug2(l,m,p1,p2) _RPT2(_CRT_WARN,m,p1,p2)
-#endif
-#else /* PNG_DEBUG_FILE || !_MSC_VER */
-#ifndef PNG_DEBUG_FILE
-#define PNG_DEBUG_FILE stderr
-#endif /* PNG_DEBUG_FILE */
-#if (PNG_DEBUG > 1)
-#define png_debug(l,m) \
-{ \
-     int num_tabs=l; \
-     fprintf(PNG_DEBUG_FILE,"%s"m,(num_tabs==1 ? "\t" : \
-       (num_tabs==2 ? "\t\t":(num_tabs>2 ? "\t\t\t":"")))); \
-}
-#define png_debug1(l,m,p1) \
-{ \
-     int num_tabs=l; \
-     fprintf(PNG_DEBUG_FILE,"%s"m,(num_tabs==1 ? "\t" : \
-       (num_tabs==2 ? "\t\t":(num_tabs>2 ? "\t\t\t":""))),p1); \
-}
-#define png_debug2(l,m,p1,p2) \
-{ \
-     int num_tabs=l; \
-     fprintf(PNG_DEBUG_FILE,"%s"m,(num_tabs==1 ? "\t" : \
-       (num_tabs==2 ? "\t\t":(num_tabs>2 ? "\t\t\t":""))),p1,p2); \
-}
-#endif /* (PNG_DEBUG > 1) */
-#endif /* _MSC_VER */
-#endif /* (PNG_DEBUG > 0) */
-#endif /* PNG_DEBUG */
-#ifndef png_debug
-#define png_debug(l, m)
-#endif
-#ifndef png_debug1
-#define png_debug1(l, m, p1)
-#endif
-#ifndef png_debug2
-#define png_debug2(l, m, p1, p2)
-#endif
-
-extern PNG_EXPORT(png_charp,png_get_copyright) PNGARG((png_structp png_ptr));
-extern PNG_EXPORT(png_charp,png_get_header_ver) PNGARG((png_structp png_ptr));
-extern PNG_EXPORT(png_charp,png_get_header_version) PNGARG((png_structp png_ptr));
-extern PNG_EXPORT(png_charp,png_get_libpng_ver) PNGARG((png_structp png_ptr));
-
-#ifdef PNG_MNG_FEATURES_SUPPORTED
-extern PNG_EXPORT(png_uint_32,png_permit_mng_features) PNGARG((png_structp
-   png_ptr, png_uint_32 mng_features_permitted));
-#endif
-
-/* For use in png_set_keep_unknown, added to version 1.2.6 */
-#define PNG_HANDLE_CHUNK_AS_DEFAULT   0
-#define PNG_HANDLE_CHUNK_NEVER        1
-#define PNG_HANDLE_CHUNK_IF_SAFE      2
-#define PNG_HANDLE_CHUNK_ALWAYS       3
-
-/* Added to version 1.2.0 */
-#if defined(PNG_ASSEMBLER_CODE_SUPPORTED)
-#if defined(PNG_MMX_CODE_SUPPORTED)
-#define PNG_ASM_FLAG_MMX_SUPPORT_COMPILED  0x01  /* not user-settable */
-#define PNG_ASM_FLAG_MMX_SUPPORT_IN_CPU    0x02  /* not user-settable */
-#define PNG_ASM_FLAG_MMX_READ_COMBINE_ROW  0x04
-#define PNG_ASM_FLAG_MMX_READ_INTERLACE    0x08
-#define PNG_ASM_FLAG_MMX_READ_FILTER_SUB   0x10
-#define PNG_ASM_FLAG_MMX_READ_FILTER_UP    0x20
-#define PNG_ASM_FLAG_MMX_READ_FILTER_AVG   0x40
-#define PNG_ASM_FLAG_MMX_READ_FILTER_PAETH 0x80
-#define PNG_ASM_FLAGS_INITIALIZED          0x80000000  /* not user-settable */
-
-#define PNG_MMX_READ_FLAGS ( PNG_ASM_FLAG_MMX_READ_COMBINE_ROW  \
-                           | PNG_ASM_FLAG_MMX_READ_INTERLACE    \
-                           | PNG_ASM_FLAG_MMX_READ_FILTER_SUB   \
-                           | PNG_ASM_FLAG_MMX_READ_FILTER_UP    \
-                           | PNG_ASM_FLAG_MMX_READ_FILTER_AVG   \
-                           | PNG_ASM_FLAG_MMX_READ_FILTER_PAETH )
-#define PNG_MMX_WRITE_FLAGS ( 0 )
-
-#define PNG_MMX_FLAGS ( PNG_ASM_FLAG_MMX_SUPPORT_COMPILED \
-                      | PNG_ASM_FLAG_MMX_SUPPORT_IN_CPU   \
-                      | PNG_MMX_READ_FLAGS                \
-                      | PNG_MMX_WRITE_FLAGS )
-
-#define PNG_SELECT_READ   1
-#define PNG_SELECT_WRITE  2
-#endif /* PNG_MMX_CODE_SUPPORTED */
-
-#if !defined(PNG_1_0_X)
-/* pngget.c */
-extern PNG_EXPORT(png_uint_32,png_get_mmx_flagmask)
-   PNGARG((int flag_select, int *compilerID));
-
-/* pngget.c */
-extern PNG_EXPORT(png_uint_32,png_get_asm_flagmask)
-   PNGARG((int flag_select));
-
-/* pngget.c */
-extern PNG_EXPORT(png_uint_32,png_get_asm_flags)
-   PNGARG((png_structp png_ptr));
-
-/* pngget.c */
-extern PNG_EXPORT(png_byte,png_get_mmx_bitdepth_threshold)
-   PNGARG((png_structp png_ptr));
-
-/* pngget.c */
-extern PNG_EXPORT(png_uint_32,png_get_mmx_rowbytes_threshold)
-   PNGARG((png_structp png_ptr));
-
-/* pngset.c */
-extern PNG_EXPORT(void,png_set_asm_flags)
-   PNGARG((png_structp png_ptr, png_uint_32 asm_flags));
-
-/* pngset.c */
-extern PNG_EXPORT(void,png_set_mmx_thresholds)
-   PNGARG((png_structp png_ptr, png_byte mmx_bitdepth_threshold,
-   png_uint_32 mmx_rowbytes_threshold));
-
-#endif /* PNG_1_0_X */
-
-#if !defined(PNG_1_0_X)
-/* png.c, pnggccrd.c, or pngvcrd.c */
-extern PNG_EXPORT(int,png_mmx_support) PNGARG((void));
-#endif /* PNG_ASSEMBLER_CODE_SUPPORTED */
-
-/* Strip the prepended error numbers ("#nnn ") from error and warning
- * messages before passing them to the error or warning handler. */
-#ifdef PNG_ERROR_NUMBERS_SUPPORTED
-extern PNG_EXPORT(void,png_set_strip_error_numbers) PNGARG((png_structp
-   png_ptr, png_uint_32 strip_mode));
-#endif
-
-#endif /* PNG_1_0_X */
-
-/* Added at libpng-1.2.6 */
-#ifdef PNG_SET_USER_LIMITS_SUPPORTED
-extern PNG_EXPORT(void,png_set_user_limits) PNGARG((png_structp
-   png_ptr, png_uint_32 user_width_max, png_uint_32 user_height_max));
-extern PNG_EXPORT(png_uint_32,png_get_user_width_max) PNGARG((png_structp
-   png_ptr));
-extern PNG_EXPORT(png_uint_32,png_get_user_height_max) PNGARG((png_structp
-   png_ptr));
-#endif
-
-
-/* Maintainer: Put new public prototypes here ^, in libpng.3, and project defs */
-
-#ifdef PNG_READ_COMPOSITE_NODIV_SUPPORTED
-/* With these routines we avoid an integer divide, which will be slower on
- * most machines.  However, it does take more operations than the corresponding
- * divide method, so it may be slower on a few RISC systems.  There are two
- * shifts (by 8 or 16 bits) and an addition, versus a single integer divide.
- *
- * Note that the rounding factors are NOT supposed to be the same!  128 and
- * 32768 are correct for the NODIV code; 127 and 32767 are correct for the
- * standard method.
- *
- * Optimized code by Greg Roelofs and Mark Adler...blame us for bugs. :-) 
- */
-
- /* fg and bg should be in `gamma 1.0' space; alpha is the opacity          */
-
-#  define png_composite(composite, fg, alpha, bg)                            \
-     { png_uint_16 temp = (png_uint_16)((png_uint_16)(fg) * (png_uint_16)(alpha) \
-                        +        (png_uint_16)(bg)*(png_uint_16)(255 -       \
-                        (png_uint_16)(alpha)) + (png_uint_16)128);           \
-       (composite) = (png_byte)((temp + (temp >> 8)) >> 8); }
-
-#  define png_composite_16(composite, fg, alpha, bg)                         \
-     { png_uint_32 temp = (png_uint_32)((png_uint_32)(fg) * (png_uint_32)(alpha) \
-                        + (png_uint_32)(bg)*(png_uint_32)(65535L -           \
-                        (png_uint_32)(alpha)) + (png_uint_32)32768L);        \
-       (composite) = (png_uint_16)((temp + (temp >> 16)) >> 16); }
-
-#else  /* standard method using integer division */
-
-#  define png_composite(composite, fg, alpha, bg)                            \
-     (composite) = (png_byte)(((png_uint_16)(fg) * (png_uint_16)(alpha) +    \
-       (png_uint_16)(bg) * (png_uint_16)(255 - (png_uint_16)(alpha)) +       \
-       (png_uint_16)127) / 255)
-
-#  define png_composite_16(composite, fg, alpha, bg)                         \
-     (composite) = (png_uint_16)(((png_uint_32)(fg) * (png_uint_32)(alpha) + \
-       (png_uint_32)(bg)*(png_uint_32)(65535L - (png_uint_32)(alpha)) +      \
-       (png_uint_32)32767) / (png_uint_32)65535L)
-
-#endif /* PNG_READ_COMPOSITE_NODIV_SUPPORTED */
-
-/* Inline macros to do direct reads of bytes from the input buffer.  These
- * require that you are using an architecture that uses PNG byte ordering
- * (MSB first) and supports unaligned data storage.  I think that PowerPC
- * in big-endian mode and 680x0 are the only ones that will support this.
- * The x86 line of processors definitely do not.  The png_get_int_32()
- * routine also assumes we are using two's complement format for negative
- * values, which is almost certainly true.
- */
-#if defined(PNG_READ_BIG_ENDIAN_SUPPORTED)
-#  define png_get_uint_32(buf) ( *((png_uint_32p) (buf)))
-#  define png_get_uint_16(buf) ( *((png_uint_16p) (buf)))
-#  define png_get_int_32(buf)  ( *((png_int_32p)  (buf)))
-#else
-extern PNG_EXPORT(png_uint_32,png_get_uint_32) PNGARG((png_bytep buf));
-extern PNG_EXPORT(png_uint_16,png_get_uint_16) PNGARG((png_bytep buf));
-extern PNG_EXPORT(png_int_32,png_get_int_32) PNGARG((png_bytep buf));
-#endif /* !PNG_READ_BIG_ENDIAN_SUPPORTED */
-extern PNG_EXPORT(png_uint_32,png_get_uint_31)
-  PNGARG((png_structp png_ptr, png_bytep buf));
-/* No png_get_int_16 -- may be added if there's a real need for it. */
-
-/* Place a 32-bit number into a buffer in PNG byte order (big-endian).
- */
-extern PNG_EXPORT(void,png_save_uint_32)
-   PNGARG((png_bytep buf, png_uint_32 i));
-extern PNG_EXPORT(void,png_save_int_32)
-   PNGARG((png_bytep buf, png_int_32 i));
-
-/* Place a 16-bit number into a buffer in PNG byte order.
- * The parameter is declared unsigned int, not png_uint_16,
- * just to avoid potential problems on pre-ANSI C compilers.
- */
-extern PNG_EXPORT(void,png_save_uint_16)
-   PNGARG((png_bytep buf, unsigned int i));
-/* No png_save_int_16 -- may be added if there's a real need for it. */
-
-/* ************************************************************************* */
-
-/* These next functions are used internally in the code.  They generally
- * shouldn't be used unless you are writing code to add or replace some
- * functionality in libpng.  More information about most functions can
- * be found in the files where the functions are located.
- */
-
-
-/* Various modes of operation, that are visible to applications because
- * they are used for unknown chunk location.
- */
-#define PNG_HAVE_IHDR               0x01
-#define PNG_HAVE_PLTE               0x02
-#define PNG_HAVE_IDAT               0x04
-#define PNG_AFTER_IDAT              0x08 /* Have complete zlib datastream */
-#define PNG_HAVE_IEND               0x10
-
-#if defined(PNG_INTERNAL)
-
-/* More modes of operation.  Note that after an init, mode is set to
- * zero automatically when the structure is created.
- */
-#define PNG_HAVE_gAMA               0x20
-#define PNG_HAVE_cHRM               0x40
-#define PNG_HAVE_sRGB               0x80
-#define PNG_HAVE_CHUNK_HEADER      0x100
-#define PNG_WROTE_tIME             0x200
-#define PNG_WROTE_INFO_BEFORE_PLTE 0x400
-#define PNG_BACKGROUND_IS_GRAY     0x800
-#define PNG_HAVE_PNG_SIGNATURE    0x1000
-#define PNG_HAVE_CHUNK_AFTER_IDAT 0x2000 /* Have another chunk after IDAT */
-
-/* flags for the transformations the PNG library does on the image data */
-#define PNG_BGR                0x0001
-#define PNG_INTERLACE          0x0002
-#define PNG_PACK               0x0004
-#define PNG_SHIFT              0x0008
-#define PNG_SWAP_BYTES         0x0010
-#define PNG_INVERT_MONO        0x0020
-#define PNG_DITHER             0x0040
-#define PNG_BACKGROUND         0x0080
-#define PNG_BACKGROUND_EXPAND  0x0100
-                          /*   0x0200 unused */
-#define PNG_16_TO_8            0x0400
-#define PNG_RGBA               0x0800
-#define PNG_EXPAND             0x1000
-#define PNG_GAMMA              0x2000
-#define PNG_GRAY_TO_RGB        0x4000
-#define PNG_FILLER             0x8000L
-#define PNG_PACKSWAP          0x10000L
-#define PNG_SWAP_ALPHA        0x20000L
-#define PNG_STRIP_ALPHA       0x40000L
-#define PNG_INVERT_ALPHA      0x80000L
-#define PNG_USER_TRANSFORM   0x100000L
-#define PNG_RGB_TO_GRAY_ERR  0x200000L
-#define PNG_RGB_TO_GRAY_WARN 0x400000L
-#define PNG_RGB_TO_GRAY      0x600000L  /* two bits, RGB_TO_GRAY_ERR|WARN */
-                       /*    0x800000L     Unused */
-#define PNG_ADD_ALPHA       0x1000000L  /* Added to libpng-1.2.7 */
-#define PNG_EXPAND_tRNS     0x2000000L  /* Added to libpng-1.2.9 */
-                       /*   0x4000000L  unused */
-                       /*   0x8000000L  unused */
-                       /*  0x10000000L  unused */
-                       /*  0x20000000L  unused */
-                       /*  0x40000000L  unused */
-
-/* flags for png_create_struct */
-#define PNG_STRUCT_PNG   0x0001
-#define PNG_STRUCT_INFO  0x0002
-
-/* Scaling factor for filter heuristic weighting calculations */
-#define PNG_WEIGHT_SHIFT 8
-#define PNG_WEIGHT_FACTOR (1<<(PNG_WEIGHT_SHIFT))
-#define PNG_COST_SHIFT 3
-#define PNG_COST_FACTOR (1<<(PNG_COST_SHIFT))
-
-/* flags for the png_ptr->flags rather than declaring a byte for each one */
-#define PNG_FLAG_ZLIB_CUSTOM_STRATEGY     0x0001
-#define PNG_FLAG_ZLIB_CUSTOM_LEVEL        0x0002
-#define PNG_FLAG_ZLIB_CUSTOM_MEM_LEVEL    0x0004
-#define PNG_FLAG_ZLIB_CUSTOM_WINDOW_BITS  0x0008
-#define PNG_FLAG_ZLIB_CUSTOM_METHOD       0x0010
-#define PNG_FLAG_ZLIB_FINISHED            0x0020
-#define PNG_FLAG_ROW_INIT                 0x0040
-#define PNG_FLAG_FILLER_AFTER             0x0080
-#define PNG_FLAG_CRC_ANCILLARY_USE        0x0100
-#define PNG_FLAG_CRC_ANCILLARY_NOWARN     0x0200
-#define PNG_FLAG_CRC_CRITICAL_USE         0x0400
-#define PNG_FLAG_CRC_CRITICAL_IGNORE      0x0800
-#define PNG_FLAG_FREE_PLTE                0x1000
-#define PNG_FLAG_FREE_TRNS                0x2000
-#define PNG_FLAG_FREE_HIST                0x4000
-#define PNG_FLAG_KEEP_UNKNOWN_CHUNKS      0x8000L
-#define PNG_FLAG_KEEP_UNSAFE_CHUNKS       0x10000L
-#define PNG_FLAG_LIBRARY_MISMATCH         0x20000L
-#define PNG_FLAG_STRIP_ERROR_NUMBERS      0x40000L
-#define PNG_FLAG_STRIP_ERROR_TEXT         0x80000L
-#define PNG_FLAG_MALLOC_NULL_MEM_OK       0x100000L
-#define PNG_FLAG_ADD_ALPHA                0x200000L  /* Added to libpng-1.2.8 */
-#define PNG_FLAG_STRIP_ALPHA              0x400000L  /* Added to libpng-1.2.8 */
-                                  /*      0x800000L  unused */
-                                  /*     0x1000000L  unused */
-                                  /*     0x2000000L  unused */
-                                  /*     0x4000000L  unused */
-                                  /*     0x8000000L  unused */
-                                  /*    0x10000000L  unused */
-                                  /*    0x20000000L  unused */
-                                  /*    0x40000000L  unused */
-
-#define PNG_FLAG_CRC_ANCILLARY_MASK (PNG_FLAG_CRC_ANCILLARY_USE | \
-                                     PNG_FLAG_CRC_ANCILLARY_NOWARN)
-
-#define PNG_FLAG_CRC_CRITICAL_MASK  (PNG_FLAG_CRC_CRITICAL_USE | \
-                                     PNG_FLAG_CRC_CRITICAL_IGNORE)
-
-#define PNG_FLAG_CRC_MASK           (PNG_FLAG_CRC_ANCILLARY_MASK | \
-                                     PNG_FLAG_CRC_CRITICAL_MASK)
-
-/* save typing and make code easier to understand */
-
-#define PNG_COLOR_DIST(c1, c2) (abs((int)((c1).red) - (int)((c2).red)) + \
-   abs((int)((c1).green) - (int)((c2).green)) + \
-   abs((int)((c1).blue) - (int)((c2).blue)))
-
-/* Added to libpng-1.2.6 JB */
-#define PNG_ROWBYTES(pixel_bits, width) \
-    ((pixel_bits) >= 8 ? \
-    ((width) * (((png_uint_32)(pixel_bits)) >> 3)) : \
-    (( ((width) * ((png_uint_32)(pixel_bits))) + 7) >> 3) )
-
-/* PNG_OUT_OF_RANGE returns true if value is outside the range
-   ideal-delta..ideal+delta.  Each argument is evaluated twice.
-   "ideal" and "delta" should be constants, normally simple
-   integers, "value" a variable. Added to libpng-1.2.6 JB */
-#define PNG_OUT_OF_RANGE(value, ideal, delta) \
-        ( (value) < (ideal)-(delta) || (value) > (ideal)+(delta) )
-
-/* variables declared in png.c - only it needs to define PNG_NO_EXTERN */
-#if !defined(PNG_NO_EXTERN) || defined(PNG_ALWAYS_EXTERN)
-/* place to hold the signature string for a PNG file. */
-#ifdef PNG_USE_GLOBAL_ARRAYS
-   PNG_EXPORT_VAR (PNG_CONST png_byte FARDATA) png_sig8;
-#else
-#endif
-#endif /* PNG_NO_EXTERN */
-
-/* Constant strings for known chunk types.  If you need to add a chunk,
- * define the name here, and add an invocation of the macro in png.c and
- * wherever it's needed.
- */
-#define PNG_IHDR png_byte png_IHDR5 = { 73,  72,  68,  82, '\0'}
-#define PNG_IDAT png_byte png_IDAT5 = { 73,  68,  65,  84, '\0'}
-#define PNG_IEND png_byte png_IEND5 = { 73,  69,  78,  68, '\0'}
-#define PNG_PLTE png_byte png_PLTE5 = { 80,  76,  84,  69, '\0'}
-#define PNG_bKGD png_byte png_bKGD5 = { 98,  75,  71,  68, '\0'}
-#define PNG_cHRM png_byte png_cHRM5 = { 99,  72,  82,  77, '\0'}
-#define PNG_gAMA png_byte png_gAMA5 = {103,  65,  77,  65, '\0'}
-#define PNG_hIST png_byte png_hIST5 = {104,  73,  83,  84, '\0'}
-#define PNG_iCCP png_byte png_iCCP5 = {105,  67,  67,  80, '\0'}
-#define PNG_iTXt png_byte png_iTXt5 = {105,  84,  88, 116, '\0'}
-#define PNG_oFFs png_byte png_oFFs5 = {111,  70,  70, 115, '\0'}
-#define PNG_pCAL png_byte png_pCAL5 = {112,  67,  65,  76, '\0'}
-#define PNG_sCAL png_byte png_sCAL5 = {115,  67,  65,  76, '\0'}
-#define PNG_pHYs png_byte png_pHYs5 = {112,  72,  89, 115, '\0'}
-#define PNG_sBIT png_byte png_sBIT5 = {115,  66,  73,  84, '\0'}
-#define PNG_sPLT png_byte png_sPLT5 = {115,  80,  76,  84, '\0'}
-#define PNG_sRGB png_byte png_sRGB5 = {115,  82,  71,  66, '\0'}
-#define PNG_tEXt png_byte png_tEXt5 = {116,  69,  88, 116, '\0'}
-#define PNG_tIME png_byte png_tIME5 = {116,  73,  77,  69, '\0'}
-#define PNG_tRNS png_byte png_tRNS5 = {116,  82,  78,  83, '\0'}
-#define PNG_zTXt png_byte png_zTXt5 = {122,  84,  88, 116, '\0'}
-
-#ifdef PNG_USE_GLOBAL_ARRAYS
-PNG_EXPORT_VAR (png_byte FARDATA) png_IHDR5;
-PNG_EXPORT_VAR (png_byte FARDATA) png_IDAT5;
-PNG_EXPORT_VAR (png_byte FARDATA) png_IEND5;
-PNG_EXPORT_VAR (png_byte FARDATA) png_PLTE5;
-PNG_EXPORT_VAR (png_byte FARDATA) png_bKGD5;
-PNG_EXPORT_VAR (png_byte FARDATA) png_cHRM5;
-PNG_EXPORT_VAR (png_byte FARDATA) png_gAMA5;
-PNG_EXPORT_VAR (png_byte FARDATA) png_hIST5;
-PNG_EXPORT_VAR (png_byte FARDATA) png_iCCP5;
-PNG_EXPORT_VAR (png_byte FARDATA) png_iTXt5;
-PNG_EXPORT_VAR (png_byte FARDATA) png_oFFs5;
-PNG_EXPORT_VAR (png_byte FARDATA) png_pCAL5;
-PNG_EXPORT_VAR (png_byte FARDATA) png_sCAL5;
-PNG_EXPORT_VAR (png_byte FARDATA) png_pHYs5;
-PNG_EXPORT_VAR (png_byte FARDATA) png_sBIT5;
-PNG_EXPORT_VAR (png_byte FARDATA) png_sPLT5;
-PNG_EXPORT_VAR (png_byte FARDATA) png_sRGB5;
-PNG_EXPORT_VAR (png_byte FARDATA) png_tEXt5;
-PNG_EXPORT_VAR (png_byte FARDATA) png_tIME5;
-PNG_EXPORT_VAR (png_byte FARDATA) png_tRNS5;
-PNG_EXPORT_VAR (png_byte FARDATA) png_zTXt5;
-#endif /* PNG_USE_GLOBAL_ARRAYS */
-
-#if defined(PNG_1_0_X) || defined (PNG_1_2_X)
-/* Initialize png_ptr struct for reading, and allocate any other memory.
- * (old interface - DEPRECATED - use png_create_read_struct instead).
- */
-extern PNG_EXPORT(void,png_read_init) PNGARG((png_structp png_ptr));
-#undef png_read_init
-#define png_read_init(png_ptr) png_read_init_3(&png_ptr, \
-    PNG_LIBPNG_VER_STRING,  png_sizeof(png_struct));
-#endif
-
-extern PNG_EXPORT(void,png_read_init_3) PNGARG((png_structpp ptr_ptr,
-    png_const_charp user_png_ver, png_size_t png_struct_size));
-#if defined(PNG_1_0_X) || defined (PNG_1_2_X)
-extern PNG_EXPORT(void,png_read_init_2) PNGARG((png_structp png_ptr,
-    png_const_charp user_png_ver, png_size_t png_struct_size, png_size_t
-    png_info_size));
-#endif
-
-#if defined(PNG_1_0_X) || defined (PNG_1_2_X)
-/* Initialize png_ptr struct for writing, and allocate any other memory.
- * (old interface - DEPRECATED - use png_create_write_struct instead).
- */
-extern PNG_EXPORT(void,png_write_init) PNGARG((png_structp png_ptr));
-#undef png_write_init
-#define png_write_init(png_ptr) png_write_init_3(&png_ptr, \
-    PNG_LIBPNG_VER_STRING, png_sizeof(png_struct));
-#endif
-
-extern PNG_EXPORT(void,png_write_init_3) PNGARG((png_structpp ptr_ptr,
-    png_const_charp user_png_ver, png_size_t png_struct_size));
-extern PNG_EXPORT(void,png_write_init_2) PNGARG((png_structp png_ptr,
-    png_const_charp user_png_ver, png_size_t png_struct_size, png_size_t
-    png_info_size));
-
-/* Allocate memory for an internal libpng struct */
-PNG_EXTERN png_voidp png_create_struct PNGARG((int type));
-
-/* Free memory from internal libpng struct */
-PNG_EXTERN void png_destroy_struct PNGARG((png_voidp struct_ptr));
-
-PNG_EXTERN png_voidp png_create_struct_2 PNGARG((int type, png_malloc_ptr
-  malloc_fn, png_voidp mem_ptr));
-PNG_EXTERN void png_destroy_struct_2 PNGARG((png_voidp struct_ptr,
-   png_free_ptr free_fn, png_voidp mem_ptr));
-
-/* Free any memory that info_ptr points to and reset struct. */
-PNG_EXTERN void png_info_destroy PNGARG((png_structp png_ptr,
-   png_infop info_ptr));
-
-#ifndef PNG_1_0_X
-/* Function to allocate memory for zlib. */
-PNG_EXTERN voidpf png_zalloc PNGARG((voidpf png_ptr, uInt items, uInt size));
-
-/* Function to free memory for zlib */
-PNG_EXTERN void png_zfree PNGARG((voidpf png_ptr, voidpf ptr));
-
-#ifdef PNG_SIZE_T
-/* Function to convert a sizeof an item to png_sizeof item */
-   PNG_EXTERN png_size_t PNGAPI png_convert_size PNGARG((size_t size));
-#endif
-
-/* Next four functions are used internally as callbacks.  PNGAPI is required
- * but not PNG_EXPORT.  PNGAPI added at libpng version 1.2.3. */
-
-PNG_EXTERN void PNGAPI png_default_read_data PNGARG((png_structp png_ptr,
-   png_bytep data, png_size_t length));
-
-#ifdef PNG_PROGRESSIVE_READ_SUPPORTED
-PNG_EXTERN void PNGAPI png_push_fill_buffer PNGARG((png_structp png_ptr,
-   png_bytep buffer, png_size_t length));
-#endif
-
-PNG_EXTERN void PNGAPI png_default_write_data PNGARG((png_structp png_ptr,
-   png_bytep data, png_size_t length));
-
-#if defined(PNG_WRITE_FLUSH_SUPPORTED)
-#if !defined(PNG_NO_STDIO)
-PNG_EXTERN void PNGAPI png_default_flush PNGARG((png_structp png_ptr));
-#endif
-#endif
-#else /* PNG_1_0_X */
-#ifdef PNG_PROGRESSIVE_READ_SUPPORTED
-PNG_EXTERN void png_push_fill_buffer PNGARG((png_structp png_ptr,
-   png_bytep buffer, png_size_t length));
-#endif
-#endif /* PNG_1_0_X */
-
-/* Reset the CRC variable */
-PNG_EXTERN void png_reset_crc PNGARG((png_structp png_ptr));
-
-/* Write the "data" buffer to whatever output you are using. */
-PNG_EXTERN void png_write_data PNGARG((png_structp png_ptr, png_bytep data,
-   png_size_t length));
-
-/* Read data from whatever input you are using into the "data" buffer */
-PNG_EXTERN void png_read_data PNGARG((png_structp png_ptr, png_bytep data,
-   png_size_t length));
-
-/* Read bytes into buf, and update png_ptr->crc */
-PNG_EXTERN void png_crc_read PNGARG((png_structp png_ptr, png_bytep buf,
-   png_size_t length));
-
-/* Decompress data in a chunk that uses compression */
-#if defined(PNG_zTXt_SUPPORTED) || defined(PNG_iTXt_SUPPORTED) || \
-    defined(PNG_iCCP_SUPPORTED) || defined(PNG_sPLT_SUPPORTED)
-PNG_EXTERN void png_decompress_chunk PNGARG((png_structp png_ptr,
-   int comp_type, png_size_t chunklength,
-   png_size_t prefix_length, png_size_t *data_length));
-#endif
-
-/* Read "skip" bytes, read the file crc, and (optionally) verify png_ptr->crc */
-PNG_EXTERN int png_crc_finish PNGARG((png_structp png_ptr, png_uint_32 skip));
-
-/* Read the CRC from the file and compare it to the libpng calculated CRC */
-PNG_EXTERN int png_crc_error PNGARG((png_structp png_ptr));
-
-/* Calculate the CRC over a section of data.  Note that we are only
- * passing a maximum of 64K on systems that have this as a memory limit,
- * since this is the maximum buffer size we can specify.
- */
-PNG_EXTERN void png_calculate_crc PNGARG((png_structp png_ptr, png_bytep ptr,
-   png_size_t length));
-
-#if defined(PNG_WRITE_FLUSH_SUPPORTED)
-PNG_EXTERN void png_flush PNGARG((png_structp png_ptr));
-#endif
-
-/* simple function to write the signature */
-PNG_EXTERN void png_write_sig PNGARG((png_structp png_ptr));
-
-/* write various chunks */
-
-/* Write the IHDR chunk, and update the png_struct with the necessary
- * information.
- */
-PNG_EXTERN void png_write_IHDR PNGARG((png_structp png_ptr, png_uint_32 width,
-   png_uint_32 height,
-   int bit_depth, int color_type, int compression_method, int filter_method,
-   int interlace_method));
-
-PNG_EXTERN void png_write_PLTE PNGARG((png_structp png_ptr, png_colorp palette,
-   png_uint_32 num_pal));
-
-PNG_EXTERN void png_write_IDAT PNGARG((png_structp png_ptr, png_bytep data,
-   png_size_t length));
-
-PNG_EXTERN void png_write_IEND PNGARG((png_structp png_ptr));
-
-#if defined(PNG_WRITE_gAMA_SUPPORTED)
-#ifdef PNG_FLOATING_POINT_SUPPORTED
-PNG_EXTERN void png_write_gAMA PNGARG((png_structp png_ptr, double file_gamma));
-#endif
-#ifdef PNG_FIXED_POINT_SUPPORTED
-PNG_EXTERN void png_write_gAMA_fixed PNGARG((png_structp png_ptr, png_fixed_point
-    file_gamma));
-#endif
-#endif
-
-#if defined(PNG_WRITE_sBIT_SUPPORTED)
-PNG_EXTERN void png_write_sBIT PNGARG((png_structp png_ptr, png_color_8p sbit,
-   int color_type));
-#endif
-
-#if defined(PNG_WRITE_cHRM_SUPPORTED)
-#ifdef PNG_FLOATING_POINT_SUPPORTED
-PNG_EXTERN void png_write_cHRM PNGARG((png_structp png_ptr,
-   double white_x, double white_y,
-   double red_x, double red_y, double green_x, double green_y,
-   double blue_x, double blue_y));
-#endif
-#ifdef PNG_FIXED_POINT_SUPPORTED
-PNG_EXTERN void png_write_cHRM_fixed PNGARG((png_structp png_ptr,
-   png_fixed_point int_white_x, png_fixed_point int_white_y,
-   png_fixed_point int_red_x, png_fixed_point int_red_y, png_fixed_point
-   int_green_x, png_fixed_point int_green_y, png_fixed_point int_blue_x,
-   png_fixed_point int_blue_y));
-#endif
-#endif
-
-#if defined(PNG_WRITE_sRGB_SUPPORTED)
-PNG_EXTERN void png_write_sRGB PNGARG((png_structp png_ptr,
-   int intent));
-#endif
-
-#if defined(PNG_WRITE_iCCP_SUPPORTED)
-PNG_EXTERN void png_write_iCCP PNGARG((png_structp png_ptr,
-   png_charp name, int compression_type,
-   png_charp profile, int proflen));
-   /* Note to maintainer: profile should be png_bytep */
-#endif
-
-#if defined(PNG_WRITE_sPLT_SUPPORTED)
-PNG_EXTERN void png_write_sPLT PNGARG((png_structp png_ptr,
-   png_sPLT_tp palette));
-#endif
-
-#if defined(PNG_WRITE_tRNS_SUPPORTED)
-PNG_EXTERN void png_write_tRNS PNGARG((png_structp png_ptr, png_bytep trans,
-   png_color_16p values, int number, int color_type));
-#endif
-
-#if defined(PNG_WRITE_bKGD_SUPPORTED)
-PNG_EXTERN void png_write_bKGD PNGARG((png_structp png_ptr,
-   png_color_16p values, int color_type));
-#endif
-
-#if defined(PNG_WRITE_hIST_SUPPORTED)
-PNG_EXTERN void png_write_hIST PNGARG((png_structp png_ptr, png_uint_16p hist,
-   int num_hist));
-#endif
-
-#if defined(PNG_WRITE_TEXT_SUPPORTED) || defined(PNG_WRITE_pCAL_SUPPORTED) || \
-    defined(PNG_WRITE_iCCP_SUPPORTED) || defined(PNG_WRITE_sPLT_SUPPORTED)
-PNG_EXTERN png_size_t png_check_keyword PNGARG((png_structp png_ptr,
-   png_charp key, png_charpp new_key));
-#endif
-
-#if defined(PNG_WRITE_tEXt_SUPPORTED)
-PNG_EXTERN void png_write_tEXt PNGARG((png_structp png_ptr, png_charp key,
-   png_charp text, png_size_t text_len));
-#endif
-
-#if defined(PNG_WRITE_zTXt_SUPPORTED)
-PNG_EXTERN void png_write_zTXt PNGARG((png_structp png_ptr, png_charp key,
-   png_charp text, png_size_t text_len, int compression));
-#endif
-
-#if defined(PNG_WRITE_iTXt_SUPPORTED)
-PNG_EXTERN void png_write_iTXt PNGARG((png_structp png_ptr,
-   int compression, png_charp key, png_charp lang, png_charp lang_key,
-   png_charp text));
-#endif
-
-#if defined(PNG_TEXT_SUPPORTED)  /* Added at version 1.0.14 and 1.2.4 */
-PNG_EXTERN int png_set_text_2 PNGARG((png_structp png_ptr,
-   png_infop info_ptr, png_textp text_ptr, int num_text));
-#endif
-
-#if defined(PNG_WRITE_oFFs_SUPPORTED)
-PNG_EXTERN void png_write_oFFs PNGARG((png_structp png_ptr,
-   png_int_32 x_offset, png_int_32 y_offset, int unit_type));
-#endif
-
-#if defined(PNG_WRITE_pCAL_SUPPORTED)
-PNG_EXTERN void png_write_pCAL PNGARG((png_structp png_ptr, png_charp purpose,
-   png_int_32 X0, png_int_32 X1, int type, int nparams,
-   png_charp units, png_charpp params));
-#endif
-
-#if defined(PNG_WRITE_pHYs_SUPPORTED)
-PNG_EXTERN void png_write_pHYs PNGARG((png_structp png_ptr,
-   png_uint_32 x_pixels_per_unit, png_uint_32 y_pixels_per_unit,
-   int unit_type));
-#endif
-
-#if defined(PNG_WRITE_tIME_SUPPORTED)
-PNG_EXTERN void png_write_tIME PNGARG((png_structp png_ptr,
-   png_timep mod_time));
-#endif
-
-#if defined(PNG_WRITE_sCAL_SUPPORTED)
-#if defined(PNG_FLOATING_POINT_SUPPORTED) && !defined(PNG_NO_STDIO)
-PNG_EXTERN void png_write_sCAL PNGARG((png_structp png_ptr,
-   int unit, double width, double height));
-#else
-#ifdef PNG_FIXED_POINT_SUPPORTED
-PNG_EXTERN void png_write_sCAL_s PNGARG((png_structp png_ptr,
-   int unit, png_charp width, png_charp height));
-#endif
-#endif
-#endif
-
-/* Called when finished processing a row of data */
-PNG_EXTERN void png_write_finish_row PNGARG((png_structp png_ptr));
-
-/* Internal use only.   Called before first row of data */
-PNG_EXTERN void png_write_start_row PNGARG((png_structp png_ptr));
-
-#if defined(PNG_READ_GAMMA_SUPPORTED)
-PNG_EXTERN void png_build_gamma_table PNGARG((png_structp png_ptr));
-#endif
-
-/* combine a row of data, dealing with alpha, etc. if requested */
-PNG_EXTERN void png_combine_row PNGARG((png_structp png_ptr, png_bytep row,
-   int mask));
-
-#if defined(PNG_READ_INTERLACING_SUPPORTED)
-/* expand an interlaced row */
-/* OLD pre-1.0.9 interface:
-PNG_EXTERN void png_do_read_interlace PNGARG((png_row_infop row_info,
-   png_bytep row, int pass, png_uint_32 transformations));
- */
-PNG_EXTERN void png_do_read_interlace PNGARG((png_structp png_ptr));
-#endif
-
-/* GRR TO DO (2.0 or whenever):  simplify other internal calling interfaces */
-
-#if defined(PNG_WRITE_INTERLACING_SUPPORTED)
-/* grab pixels out of a row for an interlaced pass */
-PNG_EXTERN void png_do_write_interlace PNGARG((png_row_infop row_info,
-   png_bytep row, int pass));
-#endif
-
-/* unfilter a row */
-PNG_EXTERN void png_read_filter_row PNGARG((png_structp png_ptr,
-   png_row_infop row_info, png_bytep row, png_bytep prev_row, int filter));
-
-/* Choose the best filter to use and filter the row data */
-PNG_EXTERN void png_write_find_filter PNGARG((png_structp png_ptr,
-   png_row_infop row_info));
-
-/* Write out the filtered row. */
-PNG_EXTERN void png_write_filtered_row PNGARG((png_structp png_ptr,
-   png_bytep filtered_row));
-/* finish a row while reading, dealing with interlacing passes, etc. */
-PNG_EXTERN void png_read_finish_row PNGARG((png_structp png_ptr));
-
-/* initialize the row buffers, etc. */
-PNG_EXTERN void png_read_start_row PNGARG((png_structp png_ptr));
-/* optional call to update the users info structure */
-PNG_EXTERN void png_read_transform_info PNGARG((png_structp png_ptr,
-   png_infop info_ptr));
-
-/* these are the functions that do the transformations */
-#if defined(PNG_READ_FILLER_SUPPORTED)
-PNG_EXTERN void png_do_read_filler PNGARG((png_row_infop row_info,
-   png_bytep row, png_uint_32 filler, png_uint_32 flags));
-#endif
-
-#if defined(PNG_READ_SWAP_ALPHA_SUPPORTED)
-PNG_EXTERN void png_do_read_swap_alpha PNGARG((png_row_infop row_info,
-   png_bytep row));
-#endif
-
-#if defined(PNG_WRITE_SWAP_ALPHA_SUPPORTED)
-PNG_EXTERN void png_do_write_swap_alpha PNGARG((png_row_infop row_info,
-   png_bytep row));
-#endif
-
-#if defined(PNG_READ_INVERT_ALPHA_SUPPORTED)
-PNG_EXTERN void png_do_read_invert_alpha PNGARG((png_row_infop row_info,
-   png_bytep row));
-#endif
-
-#if defined(PNG_WRITE_INVERT_ALPHA_SUPPORTED)
-PNG_EXTERN void png_do_write_invert_alpha PNGARG((png_row_infop row_info,
-   png_bytep row));
-#endif
-
-#if defined(PNG_WRITE_FILLER_SUPPORTED) || \
-    defined(PNG_READ_STRIP_ALPHA_SUPPORTED)
-PNG_EXTERN void png_do_strip_filler PNGARG((png_row_infop row_info,
-   png_bytep row, png_uint_32 flags));
-#endif
-
-#if defined(PNG_READ_SWAP_SUPPORTED) || defined(PNG_WRITE_SWAP_SUPPORTED)
-PNG_EXTERN void png_do_swap PNGARG((png_row_infop row_info, png_bytep row));
-#endif
-
-#if defined(PNG_READ_PACKSWAP_SUPPORTED) || defined(PNG_WRITE_PACKSWAP_SUPPORTED)
-PNG_EXTERN void png_do_packswap PNGARG((png_row_infop row_info, png_bytep row));
-#endif
-
-#if defined(PNG_READ_RGB_TO_GRAY_SUPPORTED)
-PNG_EXTERN int png_do_rgb_to_gray PNGARG((png_structp png_ptr, png_row_infop
-   row_info, png_bytep row));
-#endif
-
-#if defined(PNG_READ_GRAY_TO_RGB_SUPPORTED)
-PNG_EXTERN void png_do_gray_to_rgb PNGARG((png_row_infop row_info,
-   png_bytep row));
-#endif
-
-#if defined(PNG_READ_PACK_SUPPORTED)
-PNG_EXTERN void png_do_unpack PNGARG((png_row_infop row_info, png_bytep row));
-#endif
-
-#if defined(PNG_READ_SHIFT_SUPPORTED)
-PNG_EXTERN void png_do_unshift PNGARG((png_row_infop row_info, png_bytep row,
-   png_color_8p sig_bits));
-#endif
-
-#if defined(PNG_READ_INVERT_SUPPORTED) || defined(PNG_WRITE_INVERT_SUPPORTED)
-PNG_EXTERN void png_do_invert PNGARG((png_row_infop row_info, png_bytep row));
-#endif
-
-#if defined(PNG_READ_16_TO_8_SUPPORTED)
-PNG_EXTERN void png_do_chop PNGARG((png_row_infop row_info, png_bytep row));
-#endif
-
-#if defined(PNG_READ_DITHER_SUPPORTED)
-PNG_EXTERN void png_do_dither PNGARG((png_row_infop row_info,
-   png_bytep row, png_bytep palette_lookup, png_bytep dither_lookup));
-
-#  if defined(PNG_CORRECT_PALETTE_SUPPORTED)
-PNG_EXTERN void png_correct_palette PNGARG((png_structp png_ptr,
-   png_colorp palette, int num_palette));
-#  endif
-#endif
-
-#if defined(PNG_READ_BGR_SUPPORTED) || defined(PNG_WRITE_BGR_SUPPORTED)
-PNG_EXTERN void png_do_bgr PNGARG((png_row_infop row_info, png_bytep row));
-#endif
-
-#if defined(PNG_WRITE_PACK_SUPPORTED)
-PNG_EXTERN void png_do_pack PNGARG((png_row_infop row_info,
-   png_bytep row, png_uint_32 bit_depth));
-#endif
-
-#if defined(PNG_WRITE_SHIFT_SUPPORTED)
-PNG_EXTERN void png_do_shift PNGARG((png_row_infop row_info, png_bytep row,
-   png_color_8p bit_depth));
-#endif
-
-#if defined(PNG_READ_BACKGROUND_SUPPORTED)
-#if defined(PNG_READ_GAMMA_SUPPORTED)
-PNG_EXTERN void png_do_background PNGARG((png_row_infop row_info, png_bytep row,
-   png_color_16p trans_values, png_color_16p background,
-   png_color_16p background_1,
-   png_bytep gamma_table, png_bytep gamma_from_1, png_bytep gamma_to_1,
-   png_uint_16pp gamma_16, png_uint_16pp gamma_16_from_1,
-   png_uint_16pp gamma_16_to_1, int gamma_shift));
-#else
-PNG_EXTERN void png_do_background PNGARG((png_row_infop row_info, png_bytep row,
-   png_color_16p trans_values, png_color_16p background));
-#endif
-#endif
-
-#if defined(PNG_READ_GAMMA_SUPPORTED)
-PNG_EXTERN void png_do_gamma PNGARG((png_row_infop row_info, png_bytep row,
-   png_bytep gamma_table, png_uint_16pp gamma_16_table,
-   int gamma_shift));
-#endif
-
-#if defined(PNG_READ_EXPAND_SUPPORTED)
-PNG_EXTERN void png_do_expand_palette PNGARG((png_row_infop row_info,
-   png_bytep row, png_colorp palette, png_bytep trans, int num_trans));
-PNG_EXTERN void png_do_expand PNGARG((png_row_infop row_info,
-   png_bytep row, png_color_16p trans_value));
-#endif
-
-/* The following decodes the appropriate chunks, and does error correction,
- * then calls the appropriate callback for the chunk if it is valid.
- */
-
-/* decode the IHDR chunk */
-PNG_EXTERN void png_handle_IHDR PNGARG((png_structp png_ptr, png_infop info_ptr,
-   png_uint_32 length));
-PNG_EXTERN void png_handle_PLTE PNGARG((png_structp png_ptr, png_infop info_ptr,
-   png_uint_32 length));
-PNG_EXTERN void png_handle_IEND PNGARG((png_structp png_ptr, png_infop info_ptr,
-   png_uint_32 length));
-
-#if defined(PNG_READ_bKGD_SUPPORTED)
-PNG_EXTERN void png_handle_bKGD PNGARG((png_structp png_ptr, png_infop info_ptr,
-   png_uint_32 length));
-#endif
-
-#if defined(PNG_READ_cHRM_SUPPORTED)
-PNG_EXTERN void png_handle_cHRM PNGARG((png_structp png_ptr, png_infop info_ptr,
-   png_uint_32 length));
-#endif
-
-#if defined(PNG_READ_gAMA_SUPPORTED)
-PNG_EXTERN void png_handle_gAMA PNGARG((png_structp png_ptr, png_infop info_ptr,
-   png_uint_32 length));
-#endif
-
-#if defined(PNG_READ_hIST_SUPPORTED)
-PNG_EXTERN void png_handle_hIST PNGARG((png_structp png_ptr, png_infop info_ptr,
-   png_uint_32 length));
-#endif
-
-#if defined(PNG_READ_iCCP_SUPPORTED)
-extern void png_handle_iCCP PNGARG((png_structp png_ptr, png_infop info_ptr,
-   png_uint_32 length));
-#endif /* PNG_READ_iCCP_SUPPORTED */
-
-#if defined(PNG_READ_iTXt_SUPPORTED)
-PNG_EXTERN void png_handle_iTXt PNGARG((png_structp png_ptr, png_infop info_ptr,
-   png_uint_32 length));
-#endif
-
-#if defined(PNG_READ_oFFs_SUPPORTED)
-PNG_EXTERN void png_handle_oFFs PNGARG((png_structp png_ptr, png_infop info_ptr,
-   png_uint_32 length));
-#endif
-
-#if defined(PNG_READ_pCAL_SUPPORTED)
-PNG_EXTERN void png_handle_pCAL PNGARG((png_structp png_ptr, png_infop info_ptr,
-   png_uint_32 length));
-#endif
-
-#if defined(PNG_READ_pHYs_SUPPORTED)
-PNG_EXTERN void png_handle_pHYs PNGARG((png_structp png_ptr, png_infop info_ptr,
-   png_uint_32 length));
-#endif
-
-#if defined(PNG_READ_sBIT_SUPPORTED)
-PNG_EXTERN void png_handle_sBIT PNGARG((png_structp png_ptr, png_infop info_ptr,
-   png_uint_32 length));
-#endif
-
-#if defined(PNG_READ_sCAL_SUPPORTED)
-PNG_EXTERN void png_handle_sCAL PNGARG((png_structp png_ptr, png_infop info_ptr,
-   png_uint_32 length));
-#endif
-
-#if defined(PNG_READ_sPLT_SUPPORTED)
-extern void png_handle_sPLT PNGARG((png_structp png_ptr, png_infop info_ptr,
-   png_uint_32 length));
-#endif /* PNG_READ_sPLT_SUPPORTED */
-
-#if defined(PNG_READ_sRGB_SUPPORTED)
-PNG_EXTERN void png_handle_sRGB PNGARG((png_structp png_ptr, png_infop info_ptr,
-   png_uint_32 length));
-#endif
-
-#if defined(PNG_READ_tEXt_SUPPORTED)
-PNG_EXTERN void png_handle_tEXt PNGARG((png_structp png_ptr, png_infop info_ptr,
-   png_uint_32 length));
-#endif
-
-#if defined(PNG_READ_tIME_SUPPORTED)
-PNG_EXTERN void png_handle_tIME PNGARG((png_structp png_ptr, png_infop info_ptr,
-   png_uint_32 length));
-#endif
-
-#if defined(PNG_READ_tRNS_SUPPORTED)
-PNG_EXTERN void png_handle_tRNS PNGARG((png_structp png_ptr, png_infop info_ptr,
-   png_uint_32 length));
-#endif
-
-#if defined(PNG_READ_zTXt_SUPPORTED)
-PNG_EXTERN void png_handle_zTXt PNGARG((png_structp png_ptr, png_infop info_ptr,
-   png_uint_32 length));
-#endif
-
-PNG_EXTERN void png_handle_unknown PNGARG((png_structp png_ptr,
-   png_infop info_ptr, png_uint_32 length));
-
-PNG_EXTERN void png_check_chunk_name PNGARG((png_structp png_ptr,
-   png_bytep chunk_name));
-
-/* handle the transformations for reading and writing */
-PNG_EXTERN void png_do_read_transformations PNGARG((png_structp png_ptr));
-PNG_EXTERN void png_do_write_transformations PNGARG((png_structp png_ptr));
-
-PNG_EXTERN void png_init_read_transformations PNGARG((png_structp png_ptr));
-
-#ifdef PNG_PROGRESSIVE_READ_SUPPORTED
-PNG_EXTERN void png_push_read_chunk PNGARG((png_structp png_ptr,
-   png_infop info_ptr));
-PNG_EXTERN void png_push_read_sig PNGARG((png_structp png_ptr,
-   png_infop info_ptr));
-PNG_EXTERN void png_push_check_crc PNGARG((png_structp png_ptr));
-PNG_EXTERN void png_push_crc_skip PNGARG((png_structp png_ptr,
-   png_uint_32 length));
-PNG_EXTERN void png_push_crc_finish PNGARG((png_structp png_ptr));
-PNG_EXTERN void png_push_save_buffer PNGARG((png_structp png_ptr));
-PNG_EXTERN void png_push_restore_buffer PNGARG((png_structp png_ptr,
-   png_bytep buffer, png_size_t buffer_length));
-PNG_EXTERN void png_push_read_IDAT PNGARG((png_structp png_ptr));
-PNG_EXTERN void png_process_IDAT_data PNGARG((png_structp png_ptr,
-   png_bytep buffer, png_size_t buffer_length));
-PNG_EXTERN void png_push_process_row PNGARG((png_structp png_ptr));
-PNG_EXTERN void png_push_handle_unknown PNGARG((png_structp png_ptr,
-   png_infop info_ptr, png_uint_32 length));
-PNG_EXTERN void png_push_have_info PNGARG((png_structp png_ptr,
-   png_infop info_ptr));
-PNG_EXTERN void png_push_have_end PNGARG((png_structp png_ptr,
-   png_infop info_ptr));
-PNG_EXTERN void png_push_have_row PNGARG((png_structp png_ptr, png_bytep row));
-PNG_EXTERN void png_push_read_end PNGARG((png_structp png_ptr,
-   png_infop info_ptr));
-PNG_EXTERN void png_process_some_data PNGARG((png_structp png_ptr,
-   png_infop info_ptr));
-PNG_EXTERN void png_read_push_finish_row PNGARG((png_structp png_ptr));
-#if defined(PNG_READ_tEXt_SUPPORTED)
-PNG_EXTERN void png_push_handle_tEXt PNGARG((png_structp png_ptr,
-   png_infop info_ptr, png_uint_32 length));
-PNG_EXTERN void png_push_read_tEXt PNGARG((png_structp png_ptr,
-   png_infop info_ptr));
-#endif
-#if defined(PNG_READ_zTXt_SUPPORTED)
-PNG_EXTERN void png_push_handle_zTXt PNGARG((png_structp png_ptr,
-   png_infop info_ptr, png_uint_32 length));
-PNG_EXTERN void png_push_read_zTXt PNGARG((png_structp png_ptr,
-   png_infop info_ptr));
-#endif
-#if defined(PNG_READ_iTXt_SUPPORTED)
-PNG_EXTERN void png_push_handle_iTXt PNGARG((png_structp png_ptr,
-   png_infop info_ptr, png_uint_32 length));
-PNG_EXTERN void png_push_read_iTXt PNGARG((png_structp png_ptr,
-   png_infop info_ptr));
-#endif
-
-#endif /* PNG_PROGRESSIVE_READ_SUPPORTED */
-
-#ifdef PNG_MNG_FEATURES_SUPPORTED
-PNG_EXTERN void png_do_read_intrapixel PNGARG((png_row_infop row_info,
-   png_bytep row));
-PNG_EXTERN void png_do_write_intrapixel PNGARG((png_row_infop row_info,
-   png_bytep row));
-#endif
-
-#if defined(PNG_ASSEMBLER_CODE_SUPPORTED)
-#if defined(PNG_MMX_CODE_SUPPORTED)
-/* png.c */ /* PRIVATE */
-PNG_EXTERN void png_init_mmx_flags PNGARG((png_structp png_ptr));
-#endif
-#endif
-
-#if defined(PNG_INCH_CONVERSIONS) && defined(PNG_FLOATING_POINT_SUPPORTED)
-PNG_EXTERN png_uint_32 png_get_pixels_per_inch PNGARG((png_structp png_ptr,
-png_infop info_ptr));
-
-PNG_EXTERN png_uint_32 png_get_x_pixels_per_inch PNGARG((png_structp png_ptr,
-png_infop info_ptr));
-
-PNG_EXTERN png_uint_32 png_get_y_pixels_per_inch PNGARG((png_structp png_ptr,
-png_infop info_ptr));
-
-PNG_EXTERN float png_get_x_offset_inches PNGARG((png_structp png_ptr,
-png_infop info_ptr));
-
-PNG_EXTERN float png_get_y_offset_inches PNGARG((png_structp png_ptr,
-png_infop info_ptr));
-
-#if defined(PNG_pHYs_SUPPORTED)
-PNG_EXTERN png_uint_32 png_get_pHYs_dpi PNGARG((png_structp png_ptr,
-png_infop info_ptr, png_uint_32 *res_x, png_uint_32 *res_y, int *unit_type));
-#endif /* PNG_pHYs_SUPPORTED */
-#endif  /* PNG_INCH_CONVERSIONS && PNG_FLOATING_POINT_SUPPORTED */
-
-/* Read the chunk header (length + type name) */
-PNG_EXTERN png_uint_32 png_read_chunk_header PNGARG((png_structp png_ptr));
-
-/* Maintainer: Put new private prototypes here ^ and in libpngpf.3 */
-
-#endif /* PNG_INTERNAL */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* PNG_VERSION_INFO_ONLY */
-/* do not put anything past this line */
-#endif /* PNG_H */

gpac-2.2.1.tar.gz/extra_lib/include/png/pngconf.h Deleted

@@ -1,1487 +0,0 @@
-
-/* pngconf.h - machine configurable file for libpng
- *
- * libpng version 1.2.33 - October 31, 2008
- * For conditions of distribution and use, see copyright notice in png.h
- * Copyright (c) 1998-2008 Glenn Randers-Pehrson
- * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
- * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
- */
-
-/* Any machine specific code is near the front of this file, so if you
- * are configuring libpng for a machine, you may want to read the section
- * starting here down to where it starts to typedef png_color, png_text,
- * and png_info.
- */
-
-#ifndef PNGCONF_H
-#define PNGCONF_H
-
-#define PNG_1_2_X
-
-/* 
- * PNG_USER_CONFIG has to be defined on the compiler command line. This
- * includes the resource compiler for Windows DLL configurations.
- */
-#ifdef PNG_USER_CONFIG
-#  ifndef PNG_USER_PRIVATEBUILD
-#    define PNG_USER_PRIVATEBUILD
-#  endif
-#include "pngusr.h"
-#endif
-
-/* PNG_CONFIGURE_LIBPNG is set by the "configure" script. */
-#ifdef PNG_CONFIGURE_LIBPNG
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-#endif
-
-/*
- * Added at libpng-1.2.8
- *  
- * If you create a private DLL you need to define in "pngusr.h" the followings:
- * #define PNG_USER_PRIVATEBUILD <Describes by whom and why this version of
- *        the DLL was built>
- *  e.g. #define PNG_USER_PRIVATEBUILD "Build by MyCompany for xyz reasons."
- * #define PNG_USER_DLLFNAME_POSTFIX <two-letter postfix that serve to
- *        distinguish your DLL from those of the official release. These
- *        correspond to the trailing letters that come after the version
- *        number and must match your private DLL name>
- *  e.g. // private DLL "libpng13gx.dll"
- *       #define PNG_USER_DLLFNAME_POSTFIX "gx"
- * 
- * The following macros are also at your disposal if you want to complete the 
- * DLL VERSIONINFO structure.
- * - PNG_USER_VERSIONINFO_COMMENTS
- * - PNG_USER_VERSIONINFO_COMPANYNAME
- * - PNG_USER_VERSIONINFO_LEGALTRADEMARKS
- */
-
-#ifdef __STDC__
-#ifdef SPECIALBUILD
-#  pragma message("PNG_LIBPNG_SPECIALBUILD (and deprecated SPECIALBUILD)\
- are now LIBPNG reserved macros. Use PNG_USER_PRIVATEBUILD instead.")
-#endif
-
-#ifdef PRIVATEBUILD
-# pragma message("PRIVATEBUILD is deprecated.\
- Use PNG_USER_PRIVATEBUILD instead.")
-# define PNG_USER_PRIVATEBUILD PRIVATEBUILD
-#endif
-#endif /* __STDC__ */
-
-#ifndef PNG_VERSION_INFO_ONLY
-
-/* End of material added to libpng-1.2.8 */
-
-/* Added at libpng-1.2.19, removed at libpng-1.2.20 because it caused trouble
-   Restored at libpng-1.2.21 */
-#if !defined(PNG_NO_WARN_UNINITIALIZED_ROW) && \
-    !defined(PNG_WARN_UNINITIALIZED_ROW)
-#  define PNG_WARN_UNINITIALIZED_ROW 1
-#endif
-/* End of material added at libpng-1.2.19/1.2.21 */
-
-/* This is the size of the compression buffer, and thus the size of
- * an IDAT chunk.  Make this whatever size you feel is best for your
- * machine.  One of these will be allocated per png_struct.  When this
- * is full, it writes the data to the disk, and does some other
- * calculations.  Making this an extremely small size will slow
- * the library down, but you may want to experiment to determine
- * where it becomes significant, if you are concerned with memory
- * usage.  Note that zlib allocates at least 32Kb also.  For readers,
- * this describes the size of the buffer available to read the data in.
- * Unless this gets smaller than the size of a row (compressed),
- * it should not make much difference how big this is.
- */
-
-#ifndef PNG_ZBUF_SIZE
-#  define PNG_ZBUF_SIZE 8192
-#endif
-
-/* Enable if you want a write-only libpng */
-
-#ifndef PNG_NO_READ_SUPPORTED
-#  define PNG_READ_SUPPORTED
-#endif
-
-/* Enable if you want a read-only libpng */
-
-#ifndef PNG_NO_WRITE_SUPPORTED
-#  define PNG_WRITE_SUPPORTED
-#endif
-
-/* Enabled by default in 1.2.0.  You can disable this if you don't need to
-   support PNGs that are embedded in MNG datastreams */
-#if !defined(PNG_1_0_X) && !defined(PNG_NO_MNG_FEATURES)
-#  ifndef PNG_MNG_FEATURES_SUPPORTED
-#    define PNG_MNG_FEATURES_SUPPORTED
-#  endif
-#endif
-
-#ifndef PNG_NO_FLOATING_POINT_SUPPORTED
-#  ifndef PNG_FLOATING_POINT_SUPPORTED
-#    define PNG_FLOATING_POINT_SUPPORTED
-#  endif
-#endif
-
-/* If you are running on a machine where you cannot allocate more
- * than 64K of memory at once, uncomment this.  While libpng will not
- * normally need that much memory in a chunk (unless you load up a very
- * large file), zlib needs to know how big of a chunk it can use, and
- * libpng thus makes sure to check any memory allocation to verify it
- * will fit into memory.
-#define PNG_MAX_MALLOC_64K
- */
-#if defined(MAXSEG_64K) && !defined(PNG_MAX_MALLOC_64K)
-#  define PNG_MAX_MALLOC_64K
-#endif
-
-/* Special munging to support doing things the 'cygwin' way:
- * 'Normal' png-on-win32 defines/defaults:
- *   PNG_BUILD_DLL -- building dll
- *   PNG_USE_DLL   -- building an application, linking to dll
- *   (no define)   -- building static library, or building an
- *                    application and linking to the static lib
- * 'Cygwin' defines/defaults:
- *   PNG_BUILD_DLL -- (ignored) building the dll
- *   (no define)   -- (ignored) building an application, linking to the dll
- *   PNG_STATIC    -- (ignored) building the static lib, or building an 
- *                    application that links to the static lib.
- *   ALL_STATIC    -- (ignored) building various static libs, or building an 
- *                    application that links to the static libs.
- * Thus,
- * a cygwin user should define either PNG_BUILD_DLL or PNG_STATIC, and
- * this bit of #ifdefs will define the 'correct' config variables based on
- * that. If a cygwin user *wants* to define 'PNG_USE_DLL' that's okay, but
- * unnecessary.
- *
- * Also, the precedence order is:
- *   ALL_STATIC (since we can't #undef something outside our namespace)
- *   PNG_BUILD_DLL
- *   PNG_STATIC
- *   (nothing) == PNG_USE_DLL
- * 
- * CYGWIN (2002-01-20): The preceding is now obsolete. With the advent
- *   of auto-import in binutils, we no longer need to worry about 
- *   __declspec(dllexport) / __declspec(dllimport) and friends.  Therefore,
- *   we don't need to worry about PNG_STATIC or ALL_STATIC when it comes
- *   to __declspec() stuff.  However, we DO need to worry about 
- *   PNG_BUILD_DLL and PNG_STATIC because those change some defaults
- *   such as CONSOLE_IO and whether GLOBAL_ARRAYS are allowed.
- */
-#if defined(__CYGWIN__)
-#  if defined(ALL_STATIC)
-#    if defined(PNG_BUILD_DLL)
-#      undef PNG_BUILD_DLL
-#    endif
-#    if defined(PNG_USE_DLL)
-#      undef PNG_USE_DLL
-#    endif
-#    if defined(PNG_DLL)
-#      undef PNG_DLL
-#    endif
-#    if !defined(PNG_STATIC)
-#      define PNG_STATIC
-#    endif
-#  else
-#    if defined (PNG_BUILD_DLL)
-#      if defined(PNG_STATIC)
-#        undef PNG_STATIC
-#      endif
-#      if defined(PNG_USE_DLL)
-#        undef PNG_USE_DLL
-#      endif
-#      if !defined(PNG_DLL)
-#        define PNG_DLL
-#      endif
-#    else
-#      if defined(PNG_STATIC)
-#        if defined(PNG_USE_DLL)
-#          undef PNG_USE_DLL
-#        endif
-#        if defined(PNG_DLL)
-#          undef PNG_DLL
-#        endif
-#      else
-#        if !defined(PNG_USE_DLL)
-#          define PNG_USE_DLL
-#        endif
-#        if !defined(PNG_DLL)
-#          define PNG_DLL
-#        endif
-#      endif  
-#    endif  
-#  endif
-#endif
-
-/* This protects us against compilers that run on a windowing system
- * and thus don't have or would rather us not use the stdio types:
- * stdin, stdout, and stderr.  The only one currently used is stderr
- * in png_error() and png_warning().  #defining PNG_NO_CONSOLE_IO will
- * prevent these from being compiled and used. #defining PNG_NO_STDIO
- * will also prevent these, plus will prevent the entire set of stdio
- * macros and functions (FILE *, printf, etc.) from being compiled and used,
- * unless (PNG_DEBUG > 0) has been #defined.
- *
- * #define PNG_NO_CONSOLE_IO
- * #define PNG_NO_STDIO
- */
-
-#if defined(_WIN32_WCE)
-#  include <windows.h>
-   /* Console I/O functions are not supported on WindowsCE */
-#  define PNG_NO_CONSOLE_IO
-#  ifdef PNG_DEBUG
-#    undef PNG_DEBUG
-#  endif
-#endif
-
-#ifdef PNG_BUILD_DLL
-#  ifndef PNG_CONSOLE_IO_SUPPORTED
-#    ifndef PNG_NO_CONSOLE_IO
-#      define PNG_NO_CONSOLE_IO
-#    endif
-#  endif
-#endif
-
-#  ifdef PNG_NO_STDIO
-#    ifndef PNG_NO_CONSOLE_IO
-#      define PNG_NO_CONSOLE_IO
-#    endif
-#    ifdef PNG_DEBUG
-#      if (PNG_DEBUG > 0)
-#        include <stdio.h>
-#      endif
-#    endif
-#  else
-#    if !defined(_WIN32_WCE)
-/* "stdio.h" functions are not supported on WindowsCE */
-#      include <stdio.h>
-#    endif
-#  endif
-
-/* This macro protects us against machines that don't have function
- * prototypes (ie K&R style headers).  If your compiler does not handle
- * function prototypes, define this macro and use the included ansi2knr.
- * I've always been able to use _NO_PROTO as the indicator, but you may
- * need to drag the empty declaration out in front of here, or change the
- * ifdef to suit your own needs.
- */
-#ifndef PNGARG
-
-#ifdef OF /* zlib prototype munger */
-#  define PNGARG(arglist) OF(arglist)
-#else
-
-#ifdef _NO_PROTO
-#  define PNGARG(arglist) ()
-#  ifndef PNG_TYPECAST_NULL
-#     define PNG_TYPECAST_NULL
-#  endif
-#else
-#  define PNGARG(arglist) arglist
-#endif /* _NO_PROTO */
-
-
-#endif /* OF */
-
-#endif /* PNGARG */
-
-/* Try to determine if we are compiling on a Mac.  Note that testing for
- * just __MWERKS__ is not good enough, because the Codewarrior is now used
- * on non-Mac platforms.
- */
-#ifndef MACOS
-#  if (defined(__MWERKS__) && defined(macintosh)) || defined(applec) || \
-      defined(THINK_C) || defined(__SC__) || defined(TARGET_OS_MAC)
-#    define MACOS
-#  endif
-#endif
-
-/* enough people need this for various reasons to include it here */
-#if !defined(MACOS) && !defined(RISCOS) && !defined(_WIN32_WCE)
-#  include <sys/types.h>
-#endif
-
-#if !defined(PNG_SETJMP_NOT_SUPPORTED) && !defined(PNG_NO_SETJMP_SUPPORTED)
-#  define PNG_SETJMP_SUPPORTED
-#endif
-
-#ifdef PNG_SETJMP_SUPPORTED
-/* This is an attempt to force a single setjmp behaviour on Linux.  If
- * the X config stuff didn't define _BSD_SOURCE we wouldn't need this.
- */
-
-#  ifdef __linux__
-#    ifdef _BSD_SOURCE
-#      define PNG_SAVE_BSD_SOURCE
-#      undef _BSD_SOURCE
-#    endif
-#    ifdef _SETJMP_H
-     /* If you encounter a compiler error here, see the explanation
-      * near the end of INSTALL.
-      */
-         __pngconf.h__ already includes setjmp.h;
-         __dont__ include it again.;
-#    endif
-#  endif /* __linux__ */
-
-   /* include setjmp.h for error handling */
-#  include <setjmp.h>
-
-#  ifdef __linux__
-#    ifdef PNG_SAVE_BSD_SOURCE
-#      ifndef _BSD_SOURCE
-#        define _BSD_SOURCE
-#      endif
-#      undef PNG_SAVE_BSD_SOURCE
-#    endif
-#  endif /* __linux__ */
-#endif /* PNG_SETJMP_SUPPORTED */
-
-#ifdef BSD
-#  include <strings.h>
-#else
-#  include <string.h>
-#endif
-
-/* Other defines for things like memory and the like can go here.  */
-#ifdef PNG_INTERNAL
-
-#include <stdlib.h>
-
-/* The functions exported by PNG_EXTERN are PNG_INTERNAL functions, which
- * aren't usually used outside the library (as far as I know), so it is
- * debatable if they should be exported at all.  In the future, when it is
- * possible to have run-time registry of chunk-handling functions, some of
- * these will be made available again.
-#define PNG_EXTERN extern
- */
-#define PNG_EXTERN
-
-/* Other defines specific to compilers can go here.  Try to keep
- * them inside an appropriate ifdef/endif pair for portability.
- */
-
-#if defined(PNG_FLOATING_POINT_SUPPORTED)
-#  if defined(MACOS)
-     /* We need to check that <math.h> hasn't already been included earlier
-      * as it seems it doesn't agree with <fp.h>, yet we should really use
-      * <fp.h> if possible.
-      */
-#    if !defined(__MATH_H__) && !defined(__MATH_H) && !defined(__cmath__)
-#      include <fp.h>
-#    endif
-#  else
-#    include <math.h>
-#  endif
-#  if defined(_AMIGA) && defined(__SASC) && defined(_M68881)
-     /* Amiga SAS/C: We must include builtin FPU functions when compiling using
-      * MATH=68881
-      */
-#    include <m68881.h>
-#  endif
-#endif
-
-/* Codewarrior on NT has linking problems without this. */
-#if (defined(__MWERKS__) && defined(WIN32)) || defined(__STDC__)
-#  define PNG_ALWAYS_EXTERN
-#endif
-
-/* This provides the non-ANSI (far) memory allocation routines. */
-#if defined(__TURBOC__) && defined(__MSDOS__)
-#  include <mem.h>
-#  include <alloc.h>
-#endif
-
-/* I have no idea why is this necessary... */
-#if defined(_MSC_VER) && (defined(WIN32) || defined(_Windows) || \
-    defined(_WINDOWS) || defined(_WIN32) || defined(__WIN32__))
-#  include <malloc.h>
-#endif
-
-/* This controls how fine the dithering gets.  As this allocates
- * a largish chunk of memory (32K), those who are not as concerned
- * with dithering quality can decrease some or all of these.
- */
-#ifndef PNG_DITHER_RED_BITS
-#  define PNG_DITHER_RED_BITS 5
-#endif
-#ifndef PNG_DITHER_GREEN_BITS
-#  define PNG_DITHER_GREEN_BITS 5
-#endif
-#ifndef PNG_DITHER_BLUE_BITS
-#  define PNG_DITHER_BLUE_BITS 5
-#endif
-
-/* This controls how fine the gamma correction becomes when you
- * are only interested in 8 bits anyway.  Increasing this value
- * results in more memory being used, and more pow() functions
- * being called to fill in the gamma tables.  Don't set this value
- * less then 8, and even that may not work (I haven't tested it).
- */
-
-#ifndef PNG_MAX_GAMMA_8
-#  define PNG_MAX_GAMMA_8 11
-#endif
-
-/* This controls how much a difference in gamma we can tolerate before
- * we actually start doing gamma conversion.
- */
-#ifndef PNG_GAMMA_THRESHOLD
-#  define PNG_GAMMA_THRESHOLD 0.05
-#endif
-
-#endif /* PNG_INTERNAL */
-
-/* The following uses const char * instead of char * for error
- * and warning message functions, so some compilers won't complain.
- * If you do not want to use const, define PNG_NO_CONST here.
- */
-
-#ifndef PNG_NO_CONST
-#  define PNG_CONST const
-#else
-#  define PNG_CONST
-#endif
-
-/* The following defines give you the ability to remove code from the
- * library that you will not be using.  I wish I could figure out how to
- * automate this, but I can't do that without making it seriously hard
- * on the users.  So if you are not using an ability, change the #define
- * to and #undef, and that part of the library will not be compiled.  If
- * your linker can't find a function, you may want to make sure the
- * ability is defined here.  Some of these depend upon some others being
- * defined.  I haven't figured out all the interactions here, so you may
- * have to experiment awhile to get everything to compile.  If you are
- * creating or using a shared library, you probably shouldn't touch this,
- * as it will affect the size of the structures, and this will cause bad
- * things to happen if the library and/or application ever change.
- */
-
-/* Any features you will not be using can be undef'ed here */
-
-/* GR-P, 0.96a: Set "*TRANSFORMS_SUPPORTED as default but allow user
- * to turn it off with "*TRANSFORMS_NOT_SUPPORTED" or *PNG_NO_*_TRANSFORMS
- * on the compile line, then pick and choose which ones to define without
- * having to edit this file. It is safe to use the *TRANSFORMS_NOT_SUPPORTED
- * if you only want to have a png-compliant reader/writer but don't need
- * any of the extra transformations.  This saves about 80 kbytes in a
- * typical installation of the library. (PNG_NO_* form added in version
- * 1.0.1c, for consistency)
- */
-
-/* The size of the png_text structure changed in libpng-1.0.6 when
- * iTXt support was added.  iTXt support was turned off by default through
- * libpng-1.2.x, to support old apps that malloc the png_text structure
- * instead of calling png_set_text() and letting libpng malloc it.  It
- * was turned on by default in libpng-1.3.0.
- */
-
-#if defined(PNG_1_0_X) || defined (PNG_1_2_X)
-#  ifndef PNG_NO_iTXt_SUPPORTED
-#    define PNG_NO_iTXt_SUPPORTED
-#  endif
-#  ifndef PNG_NO_READ_iTXt
-#    define PNG_NO_READ_iTXt
-#  endif
-#  ifndef PNG_NO_WRITE_iTXt
-#    define PNG_NO_WRITE_iTXt
-#  endif
-#endif
-
-#if !defined(PNG_NO_iTXt_SUPPORTED)
-#  if !defined(PNG_READ_iTXt_SUPPORTED) && !defined(PNG_NO_READ_iTXt)
-#    define PNG_READ_iTXt
-#  endif
-#  if !defined(PNG_WRITE_iTXt_SUPPORTED) && !defined(PNG_NO_WRITE_iTXt)
-#    define PNG_WRITE_iTXt
-#  endif
-#endif
-
-/* The following support, added after version 1.0.0, can be turned off here en
- * masse by defining PNG_LEGACY_SUPPORTED in case you need binary compatibility
- * with old applications that require the length of png_struct and png_info
- * to remain unchanged.
- */
-
-#ifdef PNG_LEGACY_SUPPORTED
-#  define PNG_NO_FREE_ME
-#  define PNG_NO_READ_UNKNOWN_CHUNKS
-#  define PNG_NO_WRITE_UNKNOWN_CHUNKS
-#  define PNG_NO_READ_USER_CHUNKS
-#  define PNG_NO_READ_iCCP
-#  define PNG_NO_WRITE_iCCP
-#  define PNG_NO_READ_iTXt
-#  define PNG_NO_WRITE_iTXt
-#  define PNG_NO_READ_sCAL
-#  define PNG_NO_WRITE_sCAL
-#  define PNG_NO_READ_sPLT
-#  define PNG_NO_WRITE_sPLT
-#  define PNG_NO_INFO_IMAGE
-#  define PNG_NO_READ_RGB_TO_GRAY
-#  define PNG_NO_READ_USER_TRANSFORM
-#  define PNG_NO_WRITE_USER_TRANSFORM
-#  define PNG_NO_USER_MEM
-#  define PNG_NO_READ_EMPTY_PLTE
-#  define PNG_NO_MNG_FEATURES
-#  define PNG_NO_FIXED_POINT_SUPPORTED
-#endif
-
-/* Ignore attempt to turn off both floating and fixed point support */
-#if !defined(PNG_FLOATING_POINT_SUPPORTED) || \
-    !defined(PNG_NO_FIXED_POINT_SUPPORTED)
-#  define PNG_FIXED_POINT_SUPPORTED
-#endif
-
-#ifndef PNG_NO_FREE_ME
-#  define PNG_FREE_ME_SUPPORTED
-#endif
-
-#if defined(PNG_READ_SUPPORTED)
-
-#if !defined(PNG_READ_TRANSFORMS_NOT_SUPPORTED) && \
-      !defined(PNG_NO_READ_TRANSFORMS)
-#  define PNG_READ_TRANSFORMS_SUPPORTED
-#endif
-
-#ifdef PNG_READ_TRANSFORMS_SUPPORTED
-#  ifndef PNG_NO_READ_EXPAND
-#    define PNG_READ_EXPAND_SUPPORTED
-#  endif
-#  ifndef PNG_NO_READ_SHIFT
-#    define PNG_READ_SHIFT_SUPPORTED
-#  endif
-#  ifndef PNG_NO_READ_PACK
-#    define PNG_READ_PACK_SUPPORTED
-#  endif
-#  ifndef PNG_NO_READ_BGR
-#    define PNG_READ_BGR_SUPPORTED
-#  endif
-#  ifndef PNG_NO_READ_SWAP
-#    define PNG_READ_SWAP_SUPPORTED
-#  endif
-#  ifndef PNG_NO_READ_PACKSWAP
-#    define PNG_READ_PACKSWAP_SUPPORTED
-#  endif
-#  ifndef PNG_NO_READ_INVERT
-#    define PNG_READ_INVERT_SUPPORTED
-#  endif
-#  ifndef PNG_NO_READ_DITHER
-#    define PNG_READ_DITHER_SUPPORTED
-#  endif
-#  ifndef PNG_NO_READ_BACKGROUND
-#    define PNG_READ_BACKGROUND_SUPPORTED
-#  endif
-#  ifndef PNG_NO_READ_16_TO_8
-#    define PNG_READ_16_TO_8_SUPPORTED
-#  endif
-#  ifndef PNG_NO_READ_FILLER
-#    define PNG_READ_FILLER_SUPPORTED
-#  endif
-#  ifndef PNG_NO_READ_GAMMA
-#    define PNG_READ_GAMMA_SUPPORTED
-#  endif
-#  ifndef PNG_NO_READ_GRAY_TO_RGB
-#    define PNG_READ_GRAY_TO_RGB_SUPPORTED
-#  endif
-#  ifndef PNG_NO_READ_SWAP_ALPHA
-#    define PNG_READ_SWAP_ALPHA_SUPPORTED
-#  endif
-#  ifndef PNG_NO_READ_INVERT_ALPHA
-#    define PNG_READ_INVERT_ALPHA_SUPPORTED
-#  endif
-#  ifndef PNG_NO_READ_STRIP_ALPHA
-#    define PNG_READ_STRIP_ALPHA_SUPPORTED
-#  endif
-#  ifndef PNG_NO_READ_USER_TRANSFORM
-#    define PNG_READ_USER_TRANSFORM_SUPPORTED
-#  endif
-#  ifndef PNG_NO_READ_RGB_TO_GRAY
-#    define PNG_READ_RGB_TO_GRAY_SUPPORTED
-#  endif
-#endif /* PNG_READ_TRANSFORMS_SUPPORTED */
-
-#if !defined(PNG_NO_PROGRESSIVE_READ) && \
- !defined(PNG_PROGRESSIVE_READ_SUPPORTED) /* if you don't do progressive   */
-#  define PNG_PROGRESSIVE_READ_SUPPORTED  /* reading.  This is not talking */
-#endif                            /* about interlacing capability!  You'll */
-           /* still have interlacing unless you change the following line: */
-
-#define PNG_READ_INTERLACING_SUPPORTED /* required in PNG-compliant decoders */
-
-#ifndef PNG_NO_READ_COMPOSITE_NODIV
-#  ifndef PNG_NO_READ_COMPOSITED_NODIV  /* libpng-1.0.x misspelling */
-#    define PNG_READ_COMPOSITE_NODIV_SUPPORTED  /* well tested on Intel, SGI */
-#  endif
-#endif
-
-#if defined(PNG_1_0_X) || defined (PNG_1_2_X)
-/* Deprecated, will be removed from version 2.0.0.
-   Use PNG_MNG_FEATURES_SUPPORTED instead. */
-#ifndef PNG_NO_READ_EMPTY_PLTE
-#  define PNG_READ_EMPTY_PLTE_SUPPORTED
-#endif
-#endif
-
-#endif /* PNG_READ_SUPPORTED */
-
-#if defined(PNG_WRITE_SUPPORTED)
-
-# if !defined(PNG_WRITE_TRANSFORMS_NOT_SUPPORTED) && \
-    !defined(PNG_NO_WRITE_TRANSFORMS)
-#  define PNG_WRITE_TRANSFORMS_SUPPORTED
-#endif
-
-#ifdef PNG_WRITE_TRANSFORMS_SUPPORTED
-#  ifndef PNG_NO_WRITE_SHIFT
-#    define PNG_WRITE_SHIFT_SUPPORTED
-#  endif
-#  ifndef PNG_NO_WRITE_PACK
-#    define PNG_WRITE_PACK_SUPPORTED
-#  endif
-#  ifndef PNG_NO_WRITE_BGR
-#    define PNG_WRITE_BGR_SUPPORTED
-#  endif
-#  ifndef PNG_NO_WRITE_SWAP
-#    define PNG_WRITE_SWAP_SUPPORTED
-#  endif
-#  ifndef PNG_NO_WRITE_PACKSWAP
-#    define PNG_WRITE_PACKSWAP_SUPPORTED
-#  endif
-#  ifndef PNG_NO_WRITE_INVERT
-#    define PNG_WRITE_INVERT_SUPPORTED
-#  endif
-#  ifndef PNG_NO_WRITE_FILLER
-#    define PNG_WRITE_FILLER_SUPPORTED   /* same as WRITE_STRIP_ALPHA */
-#  endif
-#  ifndef PNG_NO_WRITE_SWAP_ALPHA
-#    define PNG_WRITE_SWAP_ALPHA_SUPPORTED
-#  endif
-#  ifndef PNG_NO_WRITE_INVERT_ALPHA
-#    define PNG_WRITE_INVERT_ALPHA_SUPPORTED
-#  endif
-#  ifndef PNG_NO_WRITE_USER_TRANSFORM
-#    define PNG_WRITE_USER_TRANSFORM_SUPPORTED
-#  endif
-#endif /* PNG_WRITE_TRANSFORMS_SUPPORTED */
-
-#if !defined(PNG_NO_WRITE_INTERLACING_SUPPORTED) && \
-    !defined(PNG_WRITE_INTERLACING_SUPPORTED)
-#define PNG_WRITE_INTERLACING_SUPPORTED  /* not required for PNG-compliant
-                                            encoders, but can cause trouble
-                                            if left undefined */
-#endif
-
-#if !defined(PNG_NO_WRITE_WEIGHTED_FILTER) && \
-    !defined(PNG_WRITE_WEIGHTED_FILTER) && \
-     defined(PNG_FLOATING_POINT_SUPPORTED)
-#  define PNG_WRITE_WEIGHTED_FILTER_SUPPORTED
-#endif
-
-#ifndef PNG_NO_WRITE_FLUSH
-#  define PNG_WRITE_FLUSH_SUPPORTED
-#endif
-
-#if defined(PNG_1_0_X) || defined (PNG_1_2_X)
-/* Deprecated, see PNG_MNG_FEATURES_SUPPORTED, above */
-#ifndef PNG_NO_WRITE_EMPTY_PLTE
-#  define PNG_WRITE_EMPTY_PLTE_SUPPORTED
-#endif
-#endif
-
-#endif /* PNG_WRITE_SUPPORTED */
-
-#ifndef PNG_1_0_X
-#  ifndef PNG_NO_ERROR_NUMBERS
-#    define PNG_ERROR_NUMBERS_SUPPORTED
-#  endif
-#endif /* PNG_1_0_X */
-
-#if defined(PNG_READ_USER_TRANSFORM_SUPPORTED) || \
-    defined(PNG_WRITE_USER_TRANSFORM_SUPPORTED)
-#  ifndef PNG_NO_USER_TRANSFORM_PTR
-#    define PNG_USER_TRANSFORM_PTR_SUPPORTED
-#  endif
-#endif
-
-#ifndef PNG_NO_STDIO
-#  define PNG_TIME_RFC1123_SUPPORTED
-#endif
-
-/* This adds extra functions in pngget.c for accessing data from the
- * info pointer (added in version 0.99)
- * png_get_image_width()
- * png_get_image_height()
- * png_get_bit_depth()
- * png_get_color_type()
- * png_get_compression_type()
- * png_get_filter_type()
- * png_get_interlace_type()
- * png_get_pixel_aspect_ratio()
- * png_get_pixels_per_meter()
- * png_get_x_offset_pixels()
- * png_get_y_offset_pixels()
- * png_get_x_offset_microns()
- * png_get_y_offset_microns()
- */
-#if !defined(PNG_NO_EASY_ACCESS) && !defined(PNG_EASY_ACCESS_SUPPORTED)
-#  define PNG_EASY_ACCESS_SUPPORTED
-#endif
-
-/* PNG_ASSEMBLER_CODE was enabled by default in version 1.2.0 
- * and removed from version 1.2.20.  The following will be removed
- * from libpng-1.4.0
-*/
-
-#if defined(PNG_READ_SUPPORTED) && !defined(PNG_NO_OPTIMIZED_CODE)
-#  ifndef PNG_OPTIMIZED_CODE_SUPPORTED
-#    define PNG_OPTIMIZED_CODE_SUPPORTED
-#  endif
-#endif
-
-#if defined(PNG_READ_SUPPORTED) && !defined(PNG_NO_ASSEMBLER_CODE)
-#  ifndef PNG_ASSEMBLER_CODE_SUPPORTED
-#    define PNG_ASSEMBLER_CODE_SUPPORTED
-#  endif
-
-#  if defined(__GNUC__) && defined(__x86_64__) && (__GNUC__ < 4)
-     /* work around 64-bit gcc compiler bugs in gcc-3.x */
-#    if !defined(PNG_MMX_CODE_SUPPORTED) && !defined(PNG_NO_MMX_CODE)
-#      define PNG_NO_MMX_CODE
-#    endif
-#  endif
-
-#  if defined(__APPLE__)
-#    if !defined(PNG_MMX_CODE_SUPPORTED) && !defined(PNG_NO_MMX_CODE)
-#      define PNG_NO_MMX_CODE
-#    endif
-#  endif
-
-#  if (defined(__MWERKS__) && ((__MWERKS__ < 0x0900) || macintosh))
-#    if !defined(PNG_MMX_CODE_SUPPORTED) && !defined(PNG_NO_MMX_CODE)
-#      define PNG_NO_MMX_CODE
-#    endif
-#  endif
-
-#  if !defined(PNG_MMX_CODE_SUPPORTED) && !defined(PNG_NO_MMX_CODE)
-#    define PNG_MMX_CODE_SUPPORTED
-#  endif
-
-#endif
-/* end of obsolete code to be removed from libpng-1.4.0 */
-
-#if !defined(PNG_1_0_X)
-#if !defined(PNG_NO_USER_MEM) && !defined(PNG_USER_MEM_SUPPORTED)
-#  define PNG_USER_MEM_SUPPORTED
-#endif
-#endif /* PNG_1_0_X */
-
-/* Added at libpng-1.2.6 */
-#if !defined(PNG_1_0_X)
-#ifndef PNG_SET_USER_LIMITS_SUPPORTED
-#if !defined(PNG_NO_SET_USER_LIMITS) && !defined(PNG_SET_USER_LIMITS_SUPPORTED)
-#  define PNG_SET_USER_LIMITS_SUPPORTED
-#endif
-#endif
-#endif /* PNG_1_0_X */
-
-/* Added at libpng-1.0.16 and 1.2.6.  To accept all valid PNGS no matter
- * how large, set these limits to 0x7fffffffL
- */
-#ifndef PNG_USER_WIDTH_MAX
-#  define PNG_USER_WIDTH_MAX 1000000L
-#endif
-#ifndef PNG_USER_HEIGHT_MAX
-#  define PNG_USER_HEIGHT_MAX 1000000L
-#endif
-
-/* These are currently experimental features, define them if you want */
-
-/* very little testing */
-/*
-#ifdef PNG_READ_SUPPORTED
-#  ifndef PNG_READ_16_TO_8_ACCURATE_SCALE_SUPPORTED
-#    define PNG_READ_16_TO_8_ACCURATE_SCALE_SUPPORTED
-#  endif
-#endif
-*/
-
-/* This is only for PowerPC big-endian and 680x0 systems */
-/* some testing */
-/*
-#ifndef PNG_READ_BIG_ENDIAN_SUPPORTED
-#  define PNG_READ_BIG_ENDIAN_SUPPORTED
-#endif
-*/
-
-/* Buggy compilers (e.g., gcc 2.7.2.2) need this */
-/*
-#define PNG_NO_POINTER_INDEXING
-*/
-
-/* These functions are turned off by default, as they will be phased out. */
-/*
-#define  PNG_USELESS_TESTS_SUPPORTED
-#define  PNG_CORRECT_PALETTE_SUPPORTED
-*/
-
-/* Any chunks you are not interested in, you can undef here.  The
- * ones that allocate memory may be expecially important (hIST,
- * tEXt, zTXt, tRNS, pCAL).  Others will just save time and make png_info
- * a bit smaller.
- */
-
-#if defined(PNG_READ_SUPPORTED) && \
-    !defined(PNG_READ_ANCILLARY_CHUNKS_NOT_SUPPORTED) && \
-    !defined(PNG_NO_READ_ANCILLARY_CHUNKS)
-#  define PNG_READ_ANCILLARY_CHUNKS_SUPPORTED
-#endif
-
-#if defined(PNG_WRITE_SUPPORTED) && \
-    !defined(PNG_WRITE_ANCILLARY_CHUNKS_NOT_SUPPORTED) && \
-    !defined(PNG_NO_WRITE_ANCILLARY_CHUNKS)
-#  define PNG_WRITE_ANCILLARY_CHUNKS_SUPPORTED
-#endif
-
-#ifdef PNG_READ_ANCILLARY_CHUNKS_SUPPORTED
-
-#ifdef PNG_NO_READ_TEXT
-#  define PNG_NO_READ_iTXt
-#  define PNG_NO_READ_tEXt
-#  define PNG_NO_READ_zTXt
-#endif
-#ifndef PNG_NO_READ_bKGD
-#  define PNG_READ_bKGD_SUPPORTED
-#  define PNG_bKGD_SUPPORTED
-#endif
-#ifndef PNG_NO_READ_cHRM
-#  define PNG_READ_cHRM_SUPPORTED
-#  define PNG_cHRM_SUPPORTED
-#endif
-#ifndef PNG_NO_READ_gAMA
-#  define PNG_READ_gAMA_SUPPORTED
-#  define PNG_gAMA_SUPPORTED
-#endif
-#ifndef PNG_NO_READ_hIST
-#  define PNG_READ_hIST_SUPPORTED
-#  define PNG_hIST_SUPPORTED
-#endif
-#ifndef PNG_NO_READ_iCCP
-#  define PNG_READ_iCCP_SUPPORTED
-#  define PNG_iCCP_SUPPORTED
-#endif
-#ifndef PNG_NO_READ_iTXt
-#  ifndef PNG_READ_iTXt_SUPPORTED
-#    define PNG_READ_iTXt_SUPPORTED
-#  endif
-#  ifndef PNG_iTXt_SUPPORTED
-#    define PNG_iTXt_SUPPORTED
-#  endif
-#endif
-#ifndef PNG_NO_READ_oFFs
-#  define PNG_READ_oFFs_SUPPORTED
-#  define PNG_oFFs_SUPPORTED
-#endif
-#ifndef PNG_NO_READ_pCAL
-#  define PNG_READ_pCAL_SUPPORTED
-#  define PNG_pCAL_SUPPORTED
-#endif
-#ifndef PNG_NO_READ_sCAL
-#  define PNG_READ_sCAL_SUPPORTED
-#  define PNG_sCAL_SUPPORTED
-#endif
-#ifndef PNG_NO_READ_pHYs
-#  define PNG_READ_pHYs_SUPPORTED
-#  define PNG_pHYs_SUPPORTED
-#endif
-#ifndef PNG_NO_READ_sBIT
-#  define PNG_READ_sBIT_SUPPORTED
-#  define PNG_sBIT_SUPPORTED
-#endif
-#ifndef PNG_NO_READ_sPLT
-#  define PNG_READ_sPLT_SUPPORTED
-#  define PNG_sPLT_SUPPORTED
-#endif
-#ifndef PNG_NO_READ_sRGB
-#  define PNG_READ_sRGB_SUPPORTED
-#  define PNG_sRGB_SUPPORTED
-#endif
-#ifndef PNG_NO_READ_tEXt
-#  define PNG_READ_tEXt_SUPPORTED
-#  define PNG_tEXt_SUPPORTED
-#endif
-#ifndef PNG_NO_READ_tIME
-#  define PNG_READ_tIME_SUPPORTED
-#  define PNG_tIME_SUPPORTED
-#endif
-#ifndef PNG_NO_READ_tRNS
-#  define PNG_READ_tRNS_SUPPORTED
-#  define PNG_tRNS_SUPPORTED
-#endif
-#ifndef PNG_NO_READ_zTXt
-#  define PNG_READ_zTXt_SUPPORTED
-#  define PNG_zTXt_SUPPORTED
-#endif
-#ifndef PNG_NO_READ_UNKNOWN_CHUNKS
-#  define PNG_READ_UNKNOWN_CHUNKS_SUPPORTED
-#  ifndef PNG_UNKNOWN_CHUNKS_SUPPORTED
-#    define PNG_UNKNOWN_CHUNKS_SUPPORTED
-#  endif
-#  ifndef PNG_NO_HANDLE_AS_UNKNOWN
-#    define PNG_HANDLE_AS_UNKNOWN_SUPPORTED
-#  endif
-#endif
-#if !defined(PNG_NO_READ_USER_CHUNKS) && \
-     defined(PNG_READ_UNKNOWN_CHUNKS_SUPPORTED)
-#  define PNG_READ_USER_CHUNKS_SUPPORTED
-#  define PNG_USER_CHUNKS_SUPPORTED
-#  ifdef PNG_NO_READ_UNKNOWN_CHUNKS
-#    undef PNG_NO_READ_UNKNOWN_CHUNKS
-#  endif
-#  ifdef PNG_NO_HANDLE_AS_UNKNOWN
-#    undef PNG_NO_HANDLE_AS_UNKNOWN
-#  endif
-#endif
-#ifndef PNG_NO_READ_OPT_PLTE
-#  define PNG_READ_OPT_PLTE_SUPPORTED /* only affects support of the */
-#endif                      /* optional PLTE chunk in RGB and RGBA images */
-#if defined(PNG_READ_iTXt_SUPPORTED) || defined(PNG_READ_tEXt_SUPPORTED) || \
-    defined(PNG_READ_zTXt_SUPPORTED)
-#  define PNG_READ_TEXT_SUPPORTED
-#  define PNG_TEXT_SUPPORTED
-#endif
-
-#endif /* PNG_READ_ANCILLARY_CHUNKS_SUPPORTED */
-
-#ifdef PNG_WRITE_ANCILLARY_CHUNKS_SUPPORTED
-
-#ifdef PNG_NO_WRITE_TEXT
-#  define PNG_NO_WRITE_iTXt
-#  define PNG_NO_WRITE_tEXt
-#  define PNG_NO_WRITE_zTXt
-#endif
-#ifndef PNG_NO_WRITE_bKGD
-#  define PNG_WRITE_bKGD_SUPPORTED
-#  ifndef PNG_bKGD_SUPPORTED
-#    define PNG_bKGD_SUPPORTED
-#  endif
-#endif
-#ifndef PNG_NO_WRITE_cHRM
-#  define PNG_WRITE_cHRM_SUPPORTED
-#  ifndef PNG_cHRM_SUPPORTED
-#    define PNG_cHRM_SUPPORTED
-#  endif
-#endif
-#ifndef PNG_NO_WRITE_gAMA
-#  define PNG_WRITE_gAMA_SUPPORTED
-#  ifndef PNG_gAMA_SUPPORTED
-#    define PNG_gAMA_SUPPORTED
-#  endif
-#endif
-#ifndef PNG_NO_WRITE_hIST
-#  define PNG_WRITE_hIST_SUPPORTED
-#  ifndef PNG_hIST_SUPPORTED
-#    define PNG_hIST_SUPPORTED
-#  endif
-#endif
-#ifndef PNG_NO_WRITE_iCCP
-#  define PNG_WRITE_iCCP_SUPPORTED
-#  ifndef PNG_iCCP_SUPPORTED
-#    define PNG_iCCP_SUPPORTED
-#  endif
-#endif
-#ifndef PNG_NO_WRITE_iTXt
-#  ifndef PNG_WRITE_iTXt_SUPPORTED
-#    define PNG_WRITE_iTXt_SUPPORTED
-#  endif
-#  ifndef PNG_iTXt_SUPPORTED
-#    define PNG_iTXt_SUPPORTED
-#  endif
-#endif
-#ifndef PNG_NO_WRITE_oFFs
-#  define PNG_WRITE_oFFs_SUPPORTED
-#  ifndef PNG_oFFs_SUPPORTED
-#    define PNG_oFFs_SUPPORTED
-#  endif
-#endif
-#ifndef PNG_NO_WRITE_pCAL
-#  define PNG_WRITE_pCAL_SUPPORTED
-#  ifndef PNG_pCAL_SUPPORTED
-#    define PNG_pCAL_SUPPORTED
-#  endif
-#endif
-#ifndef PNG_NO_WRITE_sCAL
-#  define PNG_WRITE_sCAL_SUPPORTED
-#  ifndef PNG_sCAL_SUPPORTED
-#    define PNG_sCAL_SUPPORTED
-#  endif
-#endif
-#ifndef PNG_NO_WRITE_pHYs
-#  define PNG_WRITE_pHYs_SUPPORTED
-#  ifndef PNG_pHYs_SUPPORTED
-#    define PNG_pHYs_SUPPORTED
-#  endif
-#endif
-#ifndef PNG_NO_WRITE_sBIT
-#  define PNG_WRITE_sBIT_SUPPORTED
-#  ifndef PNG_sBIT_SUPPORTED
-#    define PNG_sBIT_SUPPORTED
-#  endif
-#endif
-#ifndef PNG_NO_WRITE_sPLT
-#  define PNG_WRITE_sPLT_SUPPORTED
-#  ifndef PNG_sPLT_SUPPORTED
-#    define PNG_sPLT_SUPPORTED
-#  endif
-#endif
-#ifndef PNG_NO_WRITE_sRGB
-#  define PNG_WRITE_sRGB_SUPPORTED
-#  ifndef PNG_sRGB_SUPPORTED
-#    define PNG_sRGB_SUPPORTED
-#  endif
-#endif
-#ifndef PNG_NO_WRITE_tEXt
-#  define PNG_WRITE_tEXt_SUPPORTED
-#  ifndef PNG_tEXt_SUPPORTED
-#    define PNG_tEXt_SUPPORTED
-#  endif
-#endif
-#ifndef PNG_NO_WRITE_tIME
-#  define PNG_WRITE_tIME_SUPPORTED
-#  ifndef PNG_tIME_SUPPORTED
-#    define PNG_tIME_SUPPORTED
-#  endif
-#endif
-#ifndef PNG_NO_WRITE_tRNS
-#  define PNG_WRITE_tRNS_SUPPORTED
-#  ifndef PNG_tRNS_SUPPORTED
-#    define PNG_tRNS_SUPPORTED
-#  endif
-#endif
-#ifndef PNG_NO_WRITE_zTXt
-#  define PNG_WRITE_zTXt_SUPPORTED
-#  ifndef PNG_zTXt_SUPPORTED
-#    define PNG_zTXt_SUPPORTED
-#  endif
-#endif
-#ifndef PNG_NO_WRITE_UNKNOWN_CHUNKS
-#  define PNG_WRITE_UNKNOWN_CHUNKS_SUPPORTED
-#  ifndef PNG_UNKNOWN_CHUNKS_SUPPORTED
-#    define PNG_UNKNOWN_CHUNKS_SUPPORTED
-#  endif
-#  ifndef PNG_NO_HANDLE_AS_UNKNOWN
-#     ifndef PNG_HANDLE_AS_UNKNOWN_SUPPORTED
-#       define PNG_HANDLE_AS_UNKNOWN_SUPPORTED
-#     endif
-#  endif
-#endif
-#if defined(PNG_WRITE_iTXt_SUPPORTED) || defined(PNG_WRITE_tEXt_SUPPORTED) || \
-    defined(PNG_WRITE_zTXt_SUPPORTED)
-#  define PNG_WRITE_TEXT_SUPPORTED
-#  ifndef PNG_TEXT_SUPPORTED
-#    define PNG_TEXT_SUPPORTED
-#  endif
-#endif
-
-#endif /* PNG_WRITE_ANCILLARY_CHUNKS_SUPPORTED */
-
-/* Turn this off to disable png_read_png() and
- * png_write_png() and leave the row_pointers member
- * out of the info structure.
- */
-#ifndef PNG_NO_INFO_IMAGE
-#  define PNG_INFO_IMAGE_SUPPORTED
-#endif
-
-/* need the time information for reading tIME chunks */
-#if defined(PNG_tIME_SUPPORTED)
-#  if !defined(_WIN32_WCE)
-     /* "time.h" functions are not supported on WindowsCE */
-#    include <time.h>
-#  endif
-#endif
-
-/* Some typedefs to get us started.  These should be safe on most of the
- * common platforms.  The typedefs should be at least as large as the
- * numbers suggest (a png_uint_32 must be at least 32 bits long), but they
- * don't have to be exactly that size.  Some compilers dislike passing
- * unsigned shorts as function parameters, so you may be better off using
- * unsigned int for png_uint_16.  Likewise, for 64-bit systems, you may
- * want to have unsigned int for png_uint_32 instead of unsigned long.
- */
-
-typedef unsigned long png_uint_32;
-typedef long png_int_32;
-typedef unsigned short png_uint_16;
-typedef short png_int_16;
-typedef unsigned char png_byte;
-
-/* This is usually size_t.  It is typedef'ed just in case you need it to
-   change (I'm not sure if you will or not, so I thought I'd be safe) */
-#ifdef PNG_SIZE_T
-   typedef PNG_SIZE_T png_size_t;
-#  define png_sizeof(x) png_convert_size(sizeof(x))
-#else
-   typedef size_t png_size_t;
-#  define png_sizeof(x) sizeof(x)
-#endif
-
-/* The following is needed for medium model support.  It cannot be in the
- * PNG_INTERNAL section.  Needs modification for other compilers besides
- * MSC.  Model independent support declares all arrays and pointers to be
- * large using the far keyword.  The zlib version used must also support
- * model independent data.  As of version zlib 1.0.4, the necessary changes
- * have been made in zlib.  The USE_FAR_KEYWORD define triggers other
- * changes that are needed. (Tim Wegner)
- */
-
-/* Separate compiler dependencies (problem here is that zlib.h always
-   defines FAR. (SJT) */
-#ifdef __BORLANDC__
-#  if defined(__LARGE__) || defined(__HUGE__) || defined(__COMPACT__)
-#    define LDATA 1
-#  else
-#    define LDATA 0
-#  endif
-   /* GRR:  why is Cygwin in here?  Cygwin is not Borland C... */
-#  if !defined(__WIN32__) && !defined(__FLAT__) && !defined(__CYGWIN__)
-#    define PNG_MAX_MALLOC_64K
-#    if (LDATA != 1)
-#      ifndef FAR
-#        define FAR __far
-#      endif
-#      define USE_FAR_KEYWORD
-#    endif   /* LDATA != 1 */
-     /* Possibly useful for moving data out of default segment.
-      * Uncomment it if you want. Could also define FARDATA as
-      * const if your compiler supports it. (SJT)
-#    define FARDATA FAR
-      */
-#  endif  /* __WIN32__, __FLAT__, __CYGWIN__ */
-#endif   /* __BORLANDC__ */
-
-
-/* Suggest testing for specific compiler first before testing for
- * FAR.  The Watcom compiler defines both __MEDIUM__ and M_I86MM,
- * making reliance oncertain keywords suspect. (SJT)
- */
-
-/* MSC Medium model */
-#if defined(FAR)
-#  if defined(M_I86MM)
-#    define USE_FAR_KEYWORD
-#    define FARDATA FAR
-#    include <dos.h>
-#  endif
-#endif
-
-/* SJT: default case */
-#ifndef FAR
-#  define FAR
-#endif
-
-/* At this point FAR is always defined */
-#ifndef FARDATA
-#  define FARDATA
-#endif
-
-/* Typedef for floating-point numbers that are converted
-   to fixed-point with a multiple of 100,000, e.g., int_gamma */
-typedef png_int_32 png_fixed_point;
-
-/* Add typedefs for pointers */
-typedef void            FAR * png_voidp;
-typedef png_byte        FAR * png_bytep;
-typedef png_uint_32     FAR * png_uint_32p;
-typedef png_int_32      FAR * png_int_32p;
-typedef png_uint_16     FAR * png_uint_16p;
-typedef png_int_16      FAR * png_int_16p;
-typedef PNG_CONST char  FAR * png_const_charp;
-typedef char            FAR * png_charp;
-typedef png_fixed_point FAR * png_fixed_point_p;
-
-#ifndef PNG_NO_STDIO
-#if defined(_WIN32_WCE)
-typedef HANDLE                png_FILE_p;
-#else
-typedef FILE                * png_FILE_p;
-#endif
-#endif
-
-#ifdef PNG_FLOATING_POINT_SUPPORTED
-typedef double          FAR * png_doublep;
-#endif
-
-/* Pointers to pointers; i.e. arrays */
-typedef png_byte        FAR * FAR * png_bytepp;
-typedef png_uint_32     FAR * FAR * png_uint_32pp;
-typedef png_int_32      FAR * FAR * png_int_32pp;
-typedef png_uint_16     FAR * FAR * png_uint_16pp;
-typedef png_int_16      FAR * FAR * png_int_16pp;
-typedef PNG_CONST char  FAR * FAR * png_const_charpp;
-typedef char            FAR * FAR * png_charpp;
-typedef png_fixed_point FAR * FAR * png_fixed_point_pp;
-#ifdef PNG_FLOATING_POINT_SUPPORTED
-typedef double          FAR * FAR * png_doublepp;
-#endif
-
-/* Pointers to pointers to pointers; i.e., pointer to array */
-typedef char            FAR * FAR * FAR * png_charppp;
-
-#if defined(PNG_1_0_X) || defined(PNG_1_2_X)
-/* SPC -  Is this stuff deprecated? */
-/* It'll be removed as of libpng-1.3.0 - GR-P */
-/* libpng typedefs for types in zlib. If zlib changes
- * or another compression library is used, then change these.
- * Eliminates need to change all the source files.
- */
-typedef charf *         png_zcharp;
-typedef charf * FAR *   png_zcharpp;
-typedef z_stream FAR *  png_zstreamp;
-#endif /* (PNG_1_0_X) || defined(PNG_1_2_X) */
-
-/*
- * Define PNG_BUILD_DLL if the module being built is a Windows
- * LIBPNG DLL.
- *
- * Define PNG_USE_DLL if you want to *link* to the Windows LIBPNG DLL.
- * It is equivalent to Microsoft predefined macro _DLL that is
- * automatically defined when you compile using the share
- * version of the CRT (C Run-Time library)
- *
- * The cygwin mods make this behavior a little different:
- * Define PNG_BUILD_DLL if you are building a dll for use with cygwin
- * Define PNG_STATIC if you are building a static library for use with cygwin,
- *   -or- if you are building an application that you want to link to the
- *   static library.
- * PNG_USE_DLL is defined by default (no user action needed) unless one of
- *   the other flags is defined.
- */
-
-#if !defined(PNG_DLL) && (defined(PNG_BUILD_DLL) || defined(PNG_USE_DLL))
-#  define PNG_DLL
-#endif
-/* If CYGWIN, then disallow GLOBAL ARRAYS unless building a static lib.
- * When building a static lib, default to no GLOBAL ARRAYS, but allow
- * command-line override
- */
-#if defined(__CYGWIN__)
-#  if !defined(PNG_STATIC)
-#    if defined(PNG_USE_GLOBAL_ARRAYS)
-#      undef PNG_USE_GLOBAL_ARRAYS
-#    endif
-#    if !defined(PNG_USE_LOCAL_ARRAYS)
-#      define PNG_USE_LOCAL_ARRAYS
-#    endif
-#  else
-#    if defined(PNG_USE_LOCAL_ARRAYS) || defined(PNG_NO_GLOBAL_ARRAYS)
-#      if defined(PNG_USE_GLOBAL_ARRAYS)
-#        undef PNG_USE_GLOBAL_ARRAYS
-#      endif
-#    endif
-#  endif
-#  if !defined(PNG_USE_LOCAL_ARRAYS) && !defined(PNG_USE_GLOBAL_ARRAYS)
-#    define PNG_USE_LOCAL_ARRAYS
-#  endif
-#endif
-
-/* Do not use global arrays (helps with building DLL's)
- * They are no longer used in libpng itself, since version 1.0.5c,
- * but might be required for some pre-1.0.5c applications.
- */
-#if !defined(PNG_USE_LOCAL_ARRAYS) && !defined(PNG_USE_GLOBAL_ARRAYS)
-#  if defined(PNG_NO_GLOBAL_ARRAYS) || \
-      (defined(__GNUC__) && defined(PNG_DLL)) || defined(_MSC_VER)
-#    define PNG_USE_LOCAL_ARRAYS
-#  else
-#    define PNG_USE_GLOBAL_ARRAYS
-#  endif
-#endif
-
-#if defined(__CYGWIN__)
-#  undef PNGAPI
-#  define PNGAPI __cdecl
-#  undef PNG_IMPEXP
-#  define PNG_IMPEXP
-#endif  
-
-/* If you define PNGAPI, e.g., with compiler option "-DPNGAPI=__stdcall",
- * you may get warnings regarding the linkage of png_zalloc and png_zfree.
- * Don't ignore those warnings; you must also reset the default calling
- * convention in your compiler to match your PNGAPI, and you must build
- * zlib and your applications the same way you build libpng.
- */
-
-#if defined(__MINGW32__) && !defined(PNG_MODULEDEF)
-#  ifndef PNG_NO_MODULEDEF
-#    define PNG_NO_MODULEDEF
-#  endif
-#endif
-
-#if !defined(PNG_IMPEXP) && defined(PNG_BUILD_DLL) && !defined(PNG_NO_MODULEDEF)
-#  define PNG_IMPEXP
-#endif
-
-#if defined (__SYMBIAN32__)
-# define PNGAPI
-#elif defined(PNG_DLL) || defined(_DLL) || defined(__DLL__ ) || \
-    (( defined(_Windows) || defined(_WINDOWS) || \
-       defined(WIN32) || defined(_WIN32) || defined(__WIN32__) ))
-
-#  ifndef PNGAPI
-#     if defined(__GNUC__) || (defined (_MSC_VER) && (_MSC_VER >= 800))
-#        define PNGAPI __cdecl
-#     else
-#        define PNGAPI _cdecl
-#     endif
-#  endif
-
-#  if !defined(PNG_IMPEXP) && (!defined(PNG_DLL) || \
-       0 /* WINCOMPILER_WITH_NO_SUPPORT_FOR_DECLIMPEXP */)
-#     define PNG_IMPEXP
-#  endif
-
-#  if !defined(PNG_IMPEXP)
-
-#     define PNG_EXPORT_TYPE1(type,symbol)  PNG_IMPEXP type PNGAPI symbol
-#     define PNG_EXPORT_TYPE2(type,symbol)  type PNG_IMPEXP PNGAPI symbol
-
-      /* Borland/Microsoft */
-#     if defined(_MSC_VER) || defined(__BORLANDC__)
-#        if (_MSC_VER >= 800) || (__BORLANDC__ >= 0x500)
-#           define PNG_EXPORT PNG_EXPORT_TYPE1
-#        else
-#           define PNG_EXPORT PNG_EXPORT_TYPE2
-#           if defined(PNG_BUILD_DLL)
-#              define PNG_IMPEXP __export
-#           else
-#              define PNG_IMPEXP /*__import */ /* doesn't exist AFAIK in
-                                                 VC++ */
-#           endif                             /* Exists in Borland C++ for
-                                                 C++ classes (== huge) */
-#        endif
-#     endif
-
-#     if !defined(PNG_IMPEXP)
-#        if defined(PNG_BUILD_DLL)
-#           define PNG_IMPEXP __declspec(dllexport)
-#        else
-#           define PNG_IMPEXP __declspec(dllimport)
-#        endif
-#     endif
-#  endif  /* PNG_IMPEXP */
-#else /* !(DLL || non-cygwin WINDOWS) */
-#   if (defined(__IBMC__) || defined(__IBMCPP__)) && defined(__OS2__)
-#      ifndef PNGAPI
-#         define PNGAPI _System
-#      endif
-#   else
-#      if 0 /* ... other platforms, with other meanings */
-#      endif
-#   endif
-#endif
-
-#ifndef PNGAPI
-#  define PNGAPI
-#endif
-#ifndef PNG_IMPEXP
-#  define PNG_IMPEXP
-#endif
-
-#ifdef PNG_BUILDSYMS
-#  ifndef PNG_EXPORT
-#    define PNG_EXPORT(type,symbol) PNG_FUNCTION_EXPORT symbol END
-#  endif
-#  ifdef PNG_USE_GLOBAL_ARRAYS
-#    ifndef PNG_EXPORT_VAR
-#      define PNG_EXPORT_VAR(type) PNG_DATA_EXPORT
-#    endif
-#  endif
-#endif
-
-#ifndef PNG_EXPORT
-#  define PNG_EXPORT(type,symbol) PNG_IMPEXP type PNGAPI symbol
-#endif
-
-#ifdef PNG_USE_GLOBAL_ARRAYS
-#  ifndef PNG_EXPORT_VAR
-#    define PNG_EXPORT_VAR(type) extern PNG_IMPEXP type
-#  endif
-#endif
-
-/* User may want to use these so they are not in PNG_INTERNAL. Any library
- * functions that are passed far data must be model independent.
- */
-
-#ifndef PNG_ABORT
-# if defined(_WIN32_WCE)
-#  define PNG_ABORT() 
-# else
-#  define PNG_ABORT() abort()
-# endif
-#endif
-
-#ifdef PNG_SETJMP_SUPPORTED
-#  define png_jmpbuf(png_ptr) ((png_ptr)->jmpbuf)
-#else
-#  define png_jmpbuf(png_ptr) \
-   (LIBPNG_WAS_COMPILED_WITH__PNG_SETJMP_NOT_SUPPORTED)
-#endif
-
-#if defined(USE_FAR_KEYWORD)  /* memory model independent fns */
-/* use this to make far-to-near assignments */
-#  define CHECK   1
-#  define NOCHECK 0
-#  define CVT_PTR(ptr) (png_far_to_near(png_ptr,ptr,CHECK))
-#  define CVT_PTR_NOCHECK(ptr) (png_far_to_near(png_ptr,ptr,NOCHECK))
-#  define png_snprintf _fsnprintf   /* Added to v 1.2.19 */
-#  define png_strlen  _fstrlen
-#  define png_memcmp  _fmemcmp    /* SJT: added */
-#  define png_memcpy  _fmemcpy
-#  define png_memset  _fmemset
-#else /* use the usual functions */
-#  define CVT_PTR(ptr)         (ptr)
-#  define CVT_PTR_NOCHECK(ptr) (ptr)
-#  ifndef PNG_NO_SNPRINTF
-#    ifdef _MSC_VER
-#      define png_snprintf _snprintf   /* Added to v 1.2.19 */
-#      define png_snprintf2 _snprintf
-#      define png_snprintf6 _snprintf
-#    else
-#      define png_snprintf snprintf   /* Added to v 1.2.19 */
-#      define png_snprintf2 snprintf
-#      define png_snprintf6 snprintf
-#    endif
-#  else
-     /* You don't have or don't want to use snprintf().  Caution: Using
-      * sprintf instead of snprintf exposes your application to accidental
-      * or malevolent buffer overflows.  If you don't have snprintf()
-      * as a general rule you should provide one (you can get one from
-      * Portable OpenSSH). */
-#    define png_snprintf(s1,n,fmt,x1) sprintf(s1,fmt,x1)
-#    define png_snprintf2(s1,n,fmt,x1,x2) sprintf(s1,fmt,x1,x2)
-#    define png_snprintf6(s1,n,fmt,x1,x2,x3,x4,x5,x6) \
-        sprintf(s1,fmt,x1,x2,x3,x4,x5,x6)
-#  endif
-#  define png_strlen  strlen
-#  define png_memcmp  memcmp      /* SJT: added */
-#  define png_memcpy  memcpy
-#  define png_memset  memset
-#endif
-/* End of memory model independent support */
-
-/* Just a little check that someone hasn't tried to define something
- * contradictory.
- */
-#if (PNG_ZBUF_SIZE > 65536L) && defined(PNG_MAX_MALLOC_64K)
-#  undef PNG_ZBUF_SIZE
-#  define PNG_ZBUF_SIZE 65536L
-#endif
-
-/* Added at libpng-1.2.8 */
-#endif /* PNG_VERSION_INFO_ONLY */
-
-#endif /* PNGCONF_H */

gpac-2.2.1.tar.gz/extra_lib/include/theora Deleted

gpac-2.2.1.tar.gz/extra_lib/include/theora/theora.h Deleted

@@ -1,794 +0,0 @@
-/********************************************************************
- *                                                                  *
- * THIS FILE IS PART OF THE OggTheora SOFTWARE CODEC SOURCE CODE.   *
- * USE, DISTRIBUTION AND REPRODUCTION OF THIS LIBRARY SOURCE IS     *
- * GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE *
- * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.       *
- *                                                                  *
- * THE Theora SOURCE CODE IS COPYRIGHT (C) 2002-2007                *
- * by the Xiph.Org Foundation http://www.xiph.org/                  *
- *                                                                  *
- ********************************************************************
-
-  function:
-  last mod: $Id: theora.h,v 1.2 2008-12-02 18:04:43 jeanlf Exp $
-
- ********************************************************************/
-
-#ifndef _O_THEORA_H_
-#define _O_THEORA_H_
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif /* __cplusplus */
-
-#include <stddef.h>	/* for size_t */
-
-#include <ogg/ogg.h>
-
-/** \defgroup oldfuncs Legacy pre-1.0 C API */
-/*  @{ */
-
-/** \mainpage
- * 
- * \section intro Introduction
- *
- * This is the documentation for the libtheora legacy C API, declared in 
- * the theora.h header, which describes the old interface used before
- * the 1.0 release. This API was widely deployed for several years and
- * remains supported, but for new code we recommend the cleaner API 
- * declared in theoradec.h and theoraenc.h.
- *
- * libtheora is the reference implementation for
- * <a href="http://www.theora.org/">Theora</a>, a free video codec.
- * Theora is derived from On2's VP3 codec with improved integration for
- * Ogg multimedia formats by <a href="http://www.xiph.org/">Xiph.Org</a>.
- * 
- * \section overview Overview
- *
- * This library will both decode and encode theora packets to/from raw YUV 
- * frames.  In either case, the packets will most likely either come from or
- * need to be embedded in an Ogg stream.  Use 
- * <a href="http://xiph.org/ogg/">libogg</a> or 
- * <a href="http://www.annodex.net/software/liboggz/index.html">liboggz</a>
- * to extract/package these packets.
- *
- * \section decoding Decoding Process
- *
- * Decoding can be separated into the following steps:
- * -# initialise theora_info and theora_comment structures using 
- *    theora_info_init() and theora_comment_init():
- \verbatim
- theora_info     info;
- theora_comment  comment;
-   
- theora_info_init(&info);
- theora_comment_init(&comment);
- \endverbatim
- * -# retrieve header packets from Ogg stream (there should be 3) and decode 
- *    into theora_info and theora_comment structures using 
- *    theora_decode_header().  See \ref identification for more information on 
- *    identifying which packets are theora packets.
- \verbatim
- int i;
- for (i = 0; i < 3; i++)
- {
-   (get a theora packet "op" from the Ogg stream)
-   theora_decode_header(&info, &comment, op);
- }
- \endverbatim
- * -# initialise the decoder based on the information retrieved into the
- *    theora_info struct by theora_decode_header().  You will need a 
- *    theora_state struct.
- \verbatim
- theora_state state;
- 
- theora_decode_init(&state, &info);
- \endverbatim
- * -# pass in packets and retrieve decoded frames!  See the yuv_buffer 
- *    documentation for information on how to retrieve raw YUV data.
- \verbatim
- yuf_buffer buffer;
- while (last packet was not e_o_s) {
-   (get a theora packet "op" from the Ogg stream)
-   theora_decode_packetin(&state, op);
-   theora_decode_YUVout(&state, &buffer);
- }
- \endverbatim
- *  
- *
- * \subsection identification Identifying Theora Packets
- *
- * All streams inside an Ogg file have a unique serial_no attached to the 
- * stream.  Typically, you will want to 
- *  - retrieve the serial_no for each b_o_s (beginning of stream) page 
- *    encountered within the Ogg file; 
- *  - test the first (only) packet on that page to determine if it is a theora 
- *    packet;
- *  - once you have found a theora b_o_s page then use the retrieved serial_no 
- *    to identify future packets belonging to the same theora stream.
- * 
- * Note that you \e cannot use theora_packet_isheader() to determine if a 
- * packet is a theora packet or not, as this function does not perform any
- * checking beyond whether a header bit is present.  Instead, use the
- * theora_decode_header() function and check the return value; or examine the
- * header bytes at the beginning of the Ogg page.
- *
- * \subsection example Example Decoder 
- *
- * See <a href="http://svn.xiph.org/trunk/theora/examples/dump_video.c">
- * examples/dump_video.c</a> for a simple decoder implementation.
- *
- * \section encoding Encoding Process
- *
- * See <a href="http://svn.xiph.org/trunk/theora/examples/encoder_example.c">
- * examples/encoder_example.c</a> for a simple encoder implementation.
- */
-
-/** \file
- * The libtheora pre-1.0 legacy C API.
- */
-
-/**
- * A YUV buffer for passing uncompressed frames to and from the codec.
- * This holds a Y'CbCr frame in planar format. The CbCr planes can be
- * subsampled and have their own separate dimensions and row stride
- * offsets. Note that the strides may be negative in some 
- * configurations. For theora the width and height of the largest plane
- * must be a multiple of 16. The actual meaningful picture size and 
- * offset are stored in the theora_info structure; frames returned by
- * the decoder may need to be cropped for display.
- *
- * All samples are 8 bits. Within each plane samples are ordered by
- * row from the top of the frame to the bottom. Within each row samples
- * are ordered from left to right.
- *
- * During decode, the yuv_buffer struct is allocated by the user, but all
- * fields (including luma and chroma pointers) are filled by the library.  
- * These pointers address library-internal memory and their contents should 
- * not be modified.
- *
- * Conversely, during encode the user allocates the struct and fills out all
- * fields.  The user also manages the data addressed by the luma and chroma
- * pointers.  See the encoder_example.c and dump_video.c example files in
- * theora/examples/ for more information.
- */
-typedef struct {
-    int   y_width;      /**< Width of the Y' luminance plane */
-    int   y_height;     /**< Height of the luminance plane */
-    int   y_stride;     /**< Offset in bytes between successive rows */
-
-    int   uv_width;     /**< Width of the Cb and Cr chroma planes */
-    int   uv_height;    /**< Height of the chroma planes */
-    int   uv_stride;    /**< Offset between successive chroma rows */
-    unsigned char *y;   /**< Pointer to start of luminance data */
-    unsigned char *u;   /**< Pointer to start of Cb data */
-    unsigned char *v;   /**< Pointer to start of Cr data */
-
-} yuv_buffer;
-
-/**
- * A Colorspace.
- */
-typedef enum {
-  OC_CS_UNSPECIFIED,    /**< The colorspace is unknown or unspecified */
-  OC_CS_ITU_REC_470M,   /**< This is the best option for 'NTSC' content */
-  OC_CS_ITU_REC_470BG,  /**< This is the best option for 'PAL' content */
-  OC_CS_NSPACES         /**< This marks the end of the defined colorspaces */
-} theora_colorspace;
-
-/**
- * A Chroma subsampling
- *
- * These enumerate the available chroma subsampling options supported
- * by the theora format. See Section 4.4 of the specification for
- * exact definitions.
- */
-typedef enum {
-  OC_PF_420,    /**< Chroma subsampling by 2 in each direction (4:2:0) */
-  OC_PF_RSVD,   /**< Reserved value */
-  OC_PF_422,    /**< Horizonatal chroma subsampling by 2 (4:2:2) */
-  OC_PF_444,    /**< No chroma subsampling at all (4:4:4) */
-} theora_pixelformat;
-
-/**
- * Theora bitstream info.
- * Contains the basic playback parameters for a stream,
- * corresponding to the initial 'info' header packet.
- * 
- * Encoded theora frames must be a multiple of 16 in width and height.
- * To handle other frame sizes, a crop rectangle is specified in
- * frame_height and frame_width, offset_x and * offset_y. The offset
- * and size should still be a multiple of 2 to avoid chroma sampling
- * shifts. Offset values in this structure are measured from the
- * upper left of the image.
- *
- * Frame rate, in frames per second, is stored as a rational
- * fraction. Aspect ratio is also stored as a rational fraction, and
- * refers to the aspect ratio of the frame pixels, not of the
- * overall frame itself.
- * 
- * See <a href="http://svn.xiph.org/trunk/theora/examples/encoder_example.c">
- * examples/encoder_example.c</a> for usage examples of the
- * other paramters and good default settings for the encoder parameters.
- */
-typedef struct {
-  ogg_uint32_t  width;		/**< encoded frame width  */
-  ogg_uint32_t  height;		/**< encoded frame height */
-  ogg_uint32_t  frame_width;	/**< display frame width  */
-  ogg_uint32_t  frame_height;	/**< display frame height */
-  ogg_uint32_t  offset_x;	/**< horizontal offset of the displayed frame */
-  ogg_uint32_t  offset_y;	/**< vertical offset of the displayed frame */
-  ogg_uint32_t  fps_numerator;	    /**< frame rate numerator **/
-  ogg_uint32_t  fps_denominator;    /**< frame rate denominator **/
-  ogg_uint32_t  aspect_numerator;   /**< pixel aspect ratio numerator */
-  ogg_uint32_t  aspect_denominator; /**< pixel aspect ratio denominator */
-  theora_colorspace colorspace;	    /**< colorspace */
-  int           target_bitrate;	    /**< nominal bitrate in bits per second */
-  int           quality;  /**< Nominal quality setting, 0-63 */
-  int           quick_p;  /**< Quick encode/decode */
-
-  /* decode only */
-  unsigned char version_major;
-  unsigned char version_minor;
-  unsigned char version_subminor;
-
-  void *codec_setup;
-
-  /* encode only */
-  int           dropframes_p;
-  int           keyframe_auto_p;
-  ogg_uint32_t  keyframe_frequency;
-  ogg_uint32_t  keyframe_frequency_force;  /* also used for decode init to
-                                              get granpos shift correct */
-  ogg_uint32_t  keyframe_data_target_bitrate;
-  ogg_int32_t   keyframe_auto_threshold;
-  ogg_uint32_t  keyframe_mindistance;
-  ogg_int32_t   noise_sensitivity;
-  ogg_int32_t   sharpness;
-
-  theora_pixelformat pixelformat;	/**< chroma subsampling mode to expect */
-
-} theora_info;
-
-/** Codec internal state and context.
- */
-typedef struct{
-  theora_info *i;
-  ogg_int64_t granulepos;
-
-  void *internal_encode;
-  void *internal_decode;
-
-} theora_state;
-
-/** 
- * Comment header metadata.
- *
- * This structure holds the in-stream metadata corresponding to
- * the 'comment' header packet.
- *
- * Meta data is stored as a series of (tag, value) pairs, in
- * length-encoded string vectors. The first occurence of the 
- * '=' character delimits the tag and value. A particular tag
- * may occur more than once. The character set encoding for
- * the strings is always UTF-8, but the tag names are limited
- * to case-insensitive ASCII. See the spec for details.
- *
- * In filling in this structure, theora_decode_header() will
- * null-terminate the user_comment strings for safety. However,
- * the bitstream format itself treats them as 8-bit clean,
- * and so the length array should be treated as authoritative
- * for their length.
- */
-typedef struct theora_comment{
-  char **user_comments;         /**< An array of comment string vectors */
-  int   *comment_lengths;       /**< An array of corresponding string vector lengths in bytes */
-  int    comments;              /**< The total number of comment string vectors */
-  char  *vendor;                /**< The vendor string identifying the encoder, null terminated */
-
-} theora_comment;
-
-
-/**\name theora_control() codes */
-
-/**\anchor decctlcodes
- * These are the available request codes for theora_control()
- * when called with a decoder instance.
- * By convention, these are odd, to distinguish them from the
- *  \ref encctlcodes "encoder control codes".
- * Keep any experimental or vendor-specific values above \c 0x8000.*/
-
-/**Get the maximum post-processing level.
- * The decoder supports a post-processing filter that can improve
- * the appearance of the decoded images. This returns the highest
- * level setting for this post-processor, corresponding to maximum
- * improvement and computational expense.
- */
-#define TH_DECCTL_GET_PPLEVEL_MAX (1)
-
-/**Set the post-processing level.
- * Sets the level of post-processing to use when decoding the 
- * compressed stream. This must be a value between zero (off)
- * and the maximum returned by TH_DECCTL_GET_PPLEVEL_MAX.
- */
-#define TH_DECCTL_SET_PPLEVEL (3)
-
-/**Sets the maximum distance between key frames.
- * This can be changed during an encode, but will be bounded by
- *  <tt>1<<th_info#keyframe_granule_shift</tt>.
- * If it is set before encoding begins, th_info#keyframe_granule_shift will
- *  be enlarged appropriately.
- *
- * \paramin  buf <tt>ogg_uint32_t</tt>: The maximum distance between key
- *                   frames.
- * \paramout buf <tt>ogg_uint32_t</tt>: The actual maximum distance set.
- * \retval TH_FAULT  \a theora_state or \a buf is <tt>NULL</tt>.
- * \retval TH_EINVAL \a buf_sz is not <tt>sizeof(ogg_uint32_t)</tt>.
- * \retval TH_IMPL   Not supported by this implementation.*/
-#define TH_ENCCTL_SET_KEYFRAME_FREQUENCY_FORCE (4)
-
-/**Set the granule position.
- * Call this after a seek, to update the internal granulepos
- * in the decoder, to insure that subsequent frames are marked
- * properly. If you track timestamps yourself and do not use
- * the granule postion returned by the decoder, then you do
- * not need to use this control.
- */
-#define TH_DECCTL_SET_GRANPOS (5)
-
-
-/**\anchor encctlcodes
- * These are the available request codes for theora_control()
- * when called with an encoder instance.
- * By convention, these are even, to distinguish them from the
- *  \ref decctlcodes "decoder control codes".
- * Keep any experimental or vendor-specific values above \c 0x8000.*/
-/*@{*/
-/**Sets the quantization parameters to use.
- * The parameters are copied, not stored by reference, so they can be freed
- *  after this call.
- * <tt>NULL</tt> may be specified to revert to the default parameters.
- * For the current encoder, <tt>scaleci!=0qi</tt> must be no greater than
- *  <tt>scaleci!=0qi-1</tt> and <tt>baseqtipliqici</tt> must be no
- *  greater than <tt>baseqtipliqi-1ci</tt>.
- * These two conditions ensure that the actual quantizer for a given \a qti,
- *  \a pli, and \a ci does not increase as \a qi increases.
- *
- * \paramin buf #th_quant_info
- * \retval TH_FAULT  \a theora_state is <tt>NULL</tt>.
- * \retval TH_EINVAL Encoding has already begun, the quantization parameters
- *                    do not meet one of the above stated conditions, \a buf
- *                    is <tt>NULL</tt> and \a buf_sz is not zero, or \a buf
- *                    is non-<tt>NULL</tt> and \a buf_sz is not
- *                    <tt>sizeof(#th_quant_info)</tt>.
- * \retval TH_IMPL   Not supported by this implementation.*/
-#define TH_ENCCTL_SET_QUANT_PARAMS (2)
-/**Disables any encoder features that would prevent lossless transcoding back
- *  to VP3.
- * This primarily means disabling block-level QI values and not using 4MV mode
- *  when any of the luma blocks in a macro block are not coded.
- * It also includes using the VP3 quantization tables and Huffman codes; if you
- *  set them explicitly after calling this function, the resulting stream will
- *  not be VP3-compatible.
- * If you enable VP3-compatibility when encoding 4:2:2 or 4:4:4 source
- *  material, or when using a picture region smaller than the full frame (e.g.
- *  a non-multiple-of-16 width or height), then non-VP3 bitstream features will
- *  still be disabled, but the stream will still not be VP3-compatible, as VP3
- *  was not capable of encoding such formats.
- * If you call this after encoding has already begun, then the quantization
- *  tables and codebooks cannot be changed, but the frame-level features will
- *  be enabled or disabled as requested.
- *
- * \paramin  buf <tt>int</tt>: a non-zero value to enable VP3 compatibility,
- *                   or 0 to disable it (the default).
- * \paramout buf <tt>int</tt>: 1 if all bitstream features required for
- *                   VP3-compatibility could be set, and 0 otherwise.
- *                  The latter will be returned if the pixel format is not
- *                   4:2:0, the picture region is smaller than the full frame,
- *                   or if encoding has begun, preventing the quantization
- *                   tables and codebooks from being set.
- * \retval TH_FAULT  \a theora_state or \a buf is <tt>NULL</tt>.
- * \retval TH_EINVAL \a buf_sz is not <tt>sizeof(int)</tt>.
- * \retval TH_IMPL   Not supported by this implementation.*/
-#define TH_ENCCTL_SET_VP3_COMPATIBLE (10)
-/**Gets the maximum speed level.
- * Higher speed levels favor quicker encoding over better quality per bit.
- * Depending on the encoding mode, and the internal algorithms used, quality
- *  may actually improve, but in this case bitrate will also likely increase.
- * In any case, overall rate/distortion performance will probably decrease.
- * The maximum value, and the meaning of each value, may change depending on
- *  the current encoding mode (VBR vs. CQI, etc.).
- *
- * \paramout buf int: The maximum encoding speed level.
- * \retval TH_FAULT  \a theora_state or \a buf is <tt>NULL</tt>.
- * \retval TH_EINVAL \a buf_sz is not <tt>sizeof(int)</tt>.
- * \retval TH_IMPL   Not supported by this implementation in the current
- *                    encoding mode.*/
-#define TH_ENCCTL_GET_SPLEVEL_MAX (12)
-/**Sets the speed level.
- * By default a speed value of 1 is used.
- *
- * \paramin buf int: The new encoding speed level.
- *                      0 is slowest, larger values use less CPU.
- * \retval TH_FAULT  \a theora_state or \a buf is <tt>NULL</tt>.
- * \retval TH_EINVAL \a buf_sz is not <tt>sizeof(int)</tt>, or the
- *                    encoding speed level is out of bounds.
- *                   The maximum encoding speed level may be
- *                    implementation- and encoding mode-specific, and can be
- *                    obtained via #TH_ENCCTL_GET_SPLEVEL_MAX.
- * \retval TH_IMPL   Not supported by this implementation in the current
- *                    encoding mode.*/
-#define TH_ENCCTL_SET_SPLEVEL (14)
-/*@}*/
-
-#define OC_FAULT       -1       /**< General failure */
-#define OC_EINVAL      -10      /**< Library encountered invalid internal data */
-#define OC_DISABLED    -11      /**< Requested action is disabled */
-#define OC_BADHEADER   -20      /**< Header packet was corrupt/invalid */
-#define OC_NOTFORMAT   -21      /**< Packet is not a theora packet */
-#define OC_VERSION     -22      /**< Bitstream version is not handled */
-#define OC_IMPL        -23      /**< Feature or action not implemented */
-#define OC_BADPACKET   -24      /**< Packet is corrupt */
-#define OC_NEWPACKET   -25      /**< Packet is an (ignorable) unhandled extension */
-#define OC_DUPFRAME    1        /**< Packet is a dropped frame */
-
-/** 
- * Retrieve a human-readable string to identify the encoder vendor and version.
- * \returns A version string.
- */
-extern const char *theora_version_string(void);
-
-/**
- * Retrieve a 32-bit version number.
- * This number is composed of a 16-bit major version, 8-bit minor version
- * and 8 bit sub-version, composed as follows:
-<pre>
-   (VERSION_MAJOR<<16) + (VERSION_MINOR<<8) + (VERSION_SUB)
-</pre>
-* \returns The version number.
-*/
-extern ogg_uint32_t theora_version_number(void);
-
-/**
- * Initialize the theora encoder.
- * \param th The theora_state handle to initialize for encoding.
- * \param ti A theora_info struct filled with the desired encoding parameters.
- * \retval 0 Success
- */
-extern int theora_encode_init(theora_state *th, theora_info *ti);
-
-/**
- * Submit a YUV buffer to the theora encoder.
- * \param t A theora_state handle previously initialized for encoding.
- * \param yuv A buffer of YUV data to encode.  Note that both the yuv_buffer
- *            struct and the luma/chroma buffers within should be allocated by
- *            the user.
- * \retval OC_EINVAL Encoder is not ready, or is finished.
- * \retval -1 The size of the given frame differs from those previously input
- * \retval 0 Success
- */
-extern int theora_encode_YUVin(theora_state *t, yuv_buffer *yuv);
-
-/**
- * Request the next packet of encoded video. 
- * The encoded data is placed in a user-provided ogg_packet structure.
- * \param t A theora_state handle previously initialized for encoding.
- * \param last_p whether this is the last packet the encoder should produce.
- * \param op An ogg_packet structure to fill. libtheora will set all
- *           elements of this structure, including a pointer to encoded
- *           data. The memory for the encoded data is owned by libtheora.
- * \retval 0 No internal storage exists OR no packet is ready
- * \retval -1 The encoding process has completed
- * \retval 1 Success
- */
-extern int theora_encode_packetout( theora_state *t, int last_p,
-                                    ogg_packet *op);
-
-/**
- * Request a packet containing the initial header.
- * A pointer to the header data is placed in a user-provided ogg_packet
- * structure.
- * \param t A theora_state handle previously initialized for encoding.
- * \param op An ogg_packet structure to fill. libtheora will set all
- *           elements of this structure, including a pointer to the header
- *           data. The memory for the header data is owned by libtheora.
- * \retval 0 Success
- */
-extern int theora_encode_header(theora_state *t, ogg_packet *op);
-
-/**
- * Request a comment header packet from provided metadata.
- * A pointer to the comment data is placed in a user-provided ogg_packet
- * structure.
- * \param tc A theora_comment structure filled with the desired metadata
- * \param op An ogg_packet structure to fill. libtheora will set all
- *           elements of this structure, including a pointer to the encoded
- *           comment data. The memory for the comment data is owned by
- *           libtheora.
- * \retval 0 Success
- */
-extern int theora_encode_comment(theora_comment *tc, ogg_packet *op);
-
-/**
- * Request a packet containing the codebook tables for the stream.
- * A pointer to the codebook data is placed in a user-provided ogg_packet
- * structure.
- * \param t A theora_state handle previously initialized for encoding.
- * \param op An ogg_packet structure to fill. libtheora will set all
- *           elements of this structure, including a pointer to the codebook
- *           data. The memory for the header data is owned by libtheora.
- * \retval 0 Success
- */
-extern int theora_encode_tables(theora_state *t, ogg_packet *op);
-
-/**
- * Decode an Ogg packet, with the expectation that the packet contains
- * an initial header, comment data or codebook tables.
- *
- * \param ci A theora_info structure to fill. This must have been previously
- *           initialized with theora_info_init(). If \a op contains an initial
- *           header, theora_decode_header() will fill \a ci with the
- *           parsed header values. If \a op contains codebook tables,
- *           theora_decode_header() will parse these and attach an internal
- *           representation to \a ci->codec_setup.
- * \param cc A theora_comment structure to fill. If \a op contains comment
- *           data, theora_decode_header() will fill \a cc with the parsed
- *           comments.
- * \param op An ogg_packet structure which you expect contains an initial
- *           header, comment data or codebook tables.
- *
- * \retval OC_BADHEADER \a op is NULL; OR the first byte of \a op->packet
- *                      has the signature of an initial packet, but op is
- *                      not a b_o_s packet; OR this packet has the signature
- *                      of an initial header packet, but an initial header
- *                      packet has already been seen; OR this packet has the
- *                      signature of a comment packet, but the initial header
- *                      has not yet been seen; OR this packet has the signature
- *                      of a comment packet, but contains invalid data; OR
- *                      this packet has the signature of codebook tables,
- *                      but the initial header or comments have not yet
- *                      been seen; OR this packet has the signature of codebook
- *                      tables, but contains invalid data;
- *                      OR the stream being decoded has a compatible version
- *                      but this packet does not have the signature of a
- *                      theora initial header, comments, or codebook packet
- * \retval OC_VERSION   The packet data of \a op is an initial header with
- *                      a version which is incompatible with this version of
- *                      libtheora.
- * \retval OC_NEWPACKET the stream being decoded has an incompatible (future)
- *                      version and contains an unknown signature.
- * \retval 0            Success
- *
- * \note The normal usage is that theora_decode_header() be called on the
- *       first three packets of a theora logical bitstream in succession.
- */
-extern int theora_decode_header(theora_info *ci, theora_comment *cc,
-                                ogg_packet *op);
-
-/**
- * Initialize a theora_state handle for decoding.
- * \param th The theora_state handle to initialize.
- * \param c  A theora_info struct filled with the desired decoding parameters.
- *           This is of course usually obtained from a previous call to
- *           theora_decode_header().
- * \retval 0 Success
- */
-extern int theora_decode_init(theora_state *th, theora_info *c);
-
-/**
- * Input a packet containing encoded data into the theora decoder.
- * \param th A theora_state handle previously initialized for decoding.
- * \param op An ogg_packet containing encoded theora data.
- * \retval 0 Success
- * \retval OC_BADPACKET \a op does not contain encoded video data
- */
-extern int theora_decode_packetin(theora_state *th,ogg_packet *op);
-
-/**
- * Output the next available frame of decoded YUV data.
- * \param th A theora_state handle previously initialized for decoding.
- * \param yuv A yuv_buffer in which libtheora should place the decoded data.
- *            Note that the buffer struct itself is allocated by the user, but
- *            that the luma and chroma pointers will be filled in by the 
- *            library.  Also note that these luma and chroma regions should be 
- *            considered read-only by the user.
- * \retval 0 Success
- */
-extern int theora_decode_YUVout(theora_state *th,yuv_buffer *yuv);
-
-/**
- * Report whether a theora packet is a header or not
- * This function does no verification beyond checking the header
- * flag bit so it should not be used for bitstream identification;
- * use theora_decode_header() for that.
- *
- * \param op An ogg_packet containing encoded theora data.
- * \retval 1 The packet is a header packet
- * \retval 0 The packet is not a header packet (and so contains frame data)
- *
- * Thus function was added in the 1.0alpha4 release.
- */
-extern int theora_packet_isheader(ogg_packet *op);
-
-/**
- * Report whether a theora packet is a keyframe or not
- *
- * \param op An ogg_packet containing encoded theora data.
- * \retval 1 The packet contains a keyframe image
- * \retval 0 The packet is contains an interframe delta
- * \retval -1 The packet is not an image data packet at all
- *
- * Thus function was added in the 1.0alpha4 release.
- */
-extern int theora_packet_iskeyframe(ogg_packet *op);
-
-/**
- * Report the granulepos shift radix
- *
- * When embedded in Ogg, Theora uses a two-part granulepos, 
- * splitting the 64-bit field into two pieces. The more-significant
- * section represents the frame count at the last keyframe,
- * and the less-significant section represents the count of
- * frames since the last keyframe. In this way the overall
- * field is still non-decreasing with time, but usefully encodes
- * a pointer to the last keyframe, which is necessary for
- * correctly restarting decode after a seek. 
- *
- * This function reports the number of bits used to represent
- * the distance to the last keyframe, and thus how the granulepos
- * field must be shifted or masked to obtain the two parts.
- * 
- * Since libtheora returns compressed data in an ogg_packet
- * structure, this may be generally useful even if the Theora
- * packets are not being used in an Ogg container. 
- *
- * \param ti A previously initialized theora_info struct
- * \returns The bit shift dividing the two granulepos fields
- *
- * This function was added in the 1.0alpha5 release.
- */
-int theora_granule_shift(theora_info *ti);
-
-/**
- * Convert a granulepos to an absolute frame index, starting at 0.
- * The granulepos is interpreted in the context of a given theora_state handle.
- * 
- * Note that while the granulepos encodes the frame count (i.e. starting
- * from 1) this call returns the frame index, starting from zero. Thus
- * One can calculate the presentation time by multiplying the index by
- * the rate.
- *
- * \param th A previously initialized theora_state handle (encode or decode)
- * \param granulepos The granulepos to convert.
- * \returns The frame index corresponding to \a granulepos.
- * \retval -1 The given granulepos is undefined (i.e. negative)
- *
- * Thus function was added in the 1.0alpha4 release.
- */
-extern ogg_int64_t theora_granule_frame(theora_state *th,ogg_int64_t granulepos);
-
-/**
- * Convert a granulepos to absolute time in seconds. The granulepos is
- * interpreted in the context of a given theora_state handle, and gives
- * the end time of a frame's presentation as used in Ogg mux ordering.
- *
- * \param th A previously initialized theora_state handle (encode or decode)
- * \param granulepos The granulepos to convert.
- * \returns The absolute time in seconds corresponding to \a granulepos.
- *          This is the "end time" for the frame, or the latest time it should
- *           be displayed.
- *          It is not the presentation time.
- * \retval -1. The given granulepos is undefined (i.e. negative), or
- * \retval -1. The function has been disabled because floating 
- *              point support is not available.
- */
-extern double theora_granule_time(theora_state *th,ogg_int64_t granulepos);
-
-/**
- * Initialize a theora_info structure. All values within the given theora_info
- * structure are initialized, and space is allocated within libtheora for
- * internal codec setup data.
- * \param c A theora_info struct to initialize.
- */
-extern void theora_info_init(theora_info *c);
-
-/**
- * Clear a theora_info structure. All values within the given theora_info
- * structure are cleared, and associated internal codec setup data is freed.
- * \param c A theora_info struct to initialize.
- */
-extern void theora_info_clear(theora_info *c);
-
-/**
- * Free all internal data associated with a theora_state handle.
- * \param t A theora_state handle.
- */
-extern void theora_clear(theora_state *t);
-
-/**
- * Initialize an allocated theora_comment structure
- * \param tc An allocated theora_comment structure 
- **/
-extern void theora_comment_init(theora_comment *tc);
-
-/**
- * Add a comment to an initialized theora_comment structure
- * \param tc A previously initialized theora comment structure
- * \param comment A null-terminated string encoding the comment in the form
- *                "TAG=the value"
- *
- * Neither theora_comment_add() nor theora_comment_add_tag() support
- * comments containing null values, although the bitstream format
- * supports this. To add such comments you will need to manipulate
- * the theora_comment structure directly.
- **/
-
-extern void theora_comment_add(theora_comment *tc, char *comment);
-
-/**
- * Add a comment to an initialized theora_comment structure.
- * \param tc A previously initialized theora comment structure
- * \param tag A null-terminated string containing the tag 
- *            associated with the comment.
- * \param value The corresponding value as a null-terminated string
- *
- * Neither theora_comment_add() nor theora_comment_add_tag() support
- * comments containing null values, although the bitstream format
- * supports this. To add such comments you will need to manipulate
- * the theora_comment structure directly.
- **/
-extern void theora_comment_add_tag(theora_comment *tc,
-                                       char *tag, char *value);
-
-/**
- * Look up a comment value by tag.
- * \param tc Tn initialized theora_comment structure
- * \param tag The tag to look up
- * \param count The instance of the tag. The same tag can appear multiple
- *              times, each with a distinct and ordered value, so an index
- *              is required to retrieve them all.
- * \returns A pointer to the queried tag's value
- * \retval NULL No matching tag is found
- *
- * \note Use theora_comment_query_count() to get the legal range for the
- * count parameter.
- **/
-
-extern char *theora_comment_query(theora_comment *tc, char *tag, int count);
-
-/** Look up the number of instances of a tag.
- *  \param tc An initialized theora_comment structure
- *  \param tag The tag to look up
- *  \returns The number on instances of a particular tag.
- * 
- *  Call this first when querying for a specific tag and then interate
- *  over the number of instances with separate calls to 
- *  theora_comment_query() to retrieve all instances in order.
- **/
-extern int   theora_comment_query_count(theora_comment *tc, char *tag);
-
-/**
- * Clear an allocated theora_comment struct so that it can be freed.
- * \param tc An allocated theora_comment structure.
- **/
-extern void  theora_comment_clear(theora_comment *tc);
-
-/**Encoder control function.
- * This is used to provide advanced control the encoding process.
- * \param th     A #theora_state handle.
- * \param req    The control code to process.
- *                See \ref encctlcodes "the list of available control codes"
- *                 for details.
- * \param buf    The parameters for this control code.
- * \param buf_sz The size of the parameter buffer.*/
-extern int theora_control(theora_state *th,int req,void *buf,size_t buf_sz);
-
-/* @} */ /* end oldfuncs doxygen group */
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* _O_THEORA_H_ */

gpac-2.2.1.tar.gz/extra_lib/include/vorbis Deleted

gpac-2.2.1.tar.gz/extra_lib/include/vorbis/codec.h Deleted

@@ -1,241 +0,0 @@
-/********************************************************************
- *                                                                  *
- * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE.   *
- * USE, DISTRIBUTION AND REPRODUCTION OF THIS LIBRARY SOURCE IS     *
- * GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE *
- * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.       *
- *                                                                  *
- * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
- * by the Xiph.Org Foundation http://www.xiph.org/                  *
-
- ********************************************************************
-
- function: libvorbis codec headers
- last mod: $Id: codec.h,v 1.2 2008-12-02 18:04:43 jeanlf Exp $
-
- ********************************************************************/
-
-#ifndef _vorbis_codec_h_
-#define _vorbis_codec_h_
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif /* __cplusplus */
-
-#include <ogg/ogg.h>
-
-typedef struct vorbis_info{
-  int version;
-  int channels;
-  long rate;
-
-  /* The below bitrate declarations are *hints*.
-     Combinations of the three values carry the following implications:
-
-     all three set to the same value:
-       implies a fixed rate bitstream
-     only nominal set:
-       implies a VBR stream that averages the nominal bitrate.  No hard
-       upper/lower limit
-     upper and or lower set:
-       implies a VBR bitstream that obeys the bitrate limits. nominal
-       may also be set to give a nominal rate.
-     none set:
-       the coder does not care to speculate.
-  */
-
-  long bitrate_upper;
-  long bitrate_nominal;
-  long bitrate_lower;
-  long bitrate_window;
-
-  void *codec_setup;
-} vorbis_info;
-
-/* vorbis_dsp_state buffers the current vorbis audio
-   analysis/synthesis state.  The DSP state belongs to a specific
-   logical bitstream ****************************************************/
-typedef struct vorbis_dsp_state{
-  int analysisp;
-  vorbis_info *vi;
-
-  float **pcm;
-  float **pcmret;
-  int      pcm_storage;
-  int      pcm_current;
-  int      pcm_returned;
-
-  int  preextrapolate;
-  int  eofflag;
-
-  long lW;
-  long W;
-  long nW;
-  long centerW;
-
-  ogg_int64_t granulepos;
-  ogg_int64_t sequence;
-
-  ogg_int64_t glue_bits;
-  ogg_int64_t time_bits;
-  ogg_int64_t floor_bits;
-  ogg_int64_t res_bits;
-
-  void       *backend_state;
-} vorbis_dsp_state;
-
-typedef struct vorbis_block{
-  /* necessary stream state for linking to the framing abstraction */
-  float  **pcm;       /* this is a pointer into local storage */
-  oggpack_buffer opb;
-
-  long  lW;
-  long  W;
-  long  nW;
-  int   pcmend;
-  int   mode;
-
-  int         eofflag;
-  ogg_int64_t granulepos;
-  ogg_int64_t sequence;
-  vorbis_dsp_state *vd; /* For read-only access of configuration */
-
-  /* local storage to avoid remallocing; it's up to the mapping to
-     structure it */
-  void               *localstore;
-  long                localtop;
-  long                localalloc;
-  long                totaluse;
-  struct alloc_chain *reap;
-
-  /* bitmetrics for the frame */
-  long glue_bits;
-  long time_bits;
-  long floor_bits;
-  long res_bits;
-
-  void *internal;
-
-} vorbis_block;
-
-/* vorbis_block is a single block of data to be processed as part of
-the analysis/synthesis stream; it belongs to a specific logical
-bitstream, but is independant from other vorbis_blocks belonging to
-that logical bitstream. *************************************************/
-
-struct alloc_chain{
-  void *ptr;
-  struct alloc_chain *next;
-};
-
-/* vorbis_info contains all the setup information specific to the
-   specific compression/decompression mode in progress (eg,
-   psychoacoustic settings, channel setup, options, codebook
-   etc). vorbis_info and substructures are in backends.h.
-*********************************************************************/
-
-/* the comments are not part of vorbis_info so that vorbis_info can be
-   static storage */
-typedef struct vorbis_comment{
-  /* unlimited user comment fields.  libvorbis writes 'libvorbis'
-     whatever vendor is set to in encode */
-  char **user_comments;
-  int   *comment_lengths;
-  int    comments;
-  char  *vendor;
-
-} vorbis_comment;
-
-
-/* libvorbis encodes in two abstraction layers; first we perform DSP
-   and produce a packet (see docs/analysis.txt).  The packet is then
-   coded into a framed OggSquish bitstream by the second layer (see
-   docs/framing.txt).  Decode is the reverse process; we sync/frame
-   the bitstream and extract individual packets, then decode the
-   packet back into PCM audio.
-
-   The extra framing/packetizing is used in streaming formats, such as
-   files.  Over the net (such as with UDP), the framing and
-   packetization aren't necessary as they're provided by the transport
-   and the streaming layer is not used */
-
-/* Vorbis PRIMITIVES: general ***************************************/
-
-extern void     vorbis_info_init(vorbis_info *vi);
-extern void     vorbis_info_clear(vorbis_info *vi);
-extern int      vorbis_info_blocksize(vorbis_info *vi,int zo);
-extern void     vorbis_comment_init(vorbis_comment *vc);
-extern void     vorbis_comment_add(vorbis_comment *vc, char *comment);
-extern void     vorbis_comment_add_tag(vorbis_comment *vc,
-				       char *tag, char *contents);
-extern char    *vorbis_comment_query(vorbis_comment *vc, char *tag, int count);
-extern int      vorbis_comment_query_count(vorbis_comment *vc, char *tag);
-extern void     vorbis_comment_clear(vorbis_comment *vc);
-
-extern int      vorbis_block_init(vorbis_dsp_state *v, vorbis_block *vb);
-extern int      vorbis_block_clear(vorbis_block *vb);
-extern void     vorbis_dsp_clear(vorbis_dsp_state *v);
-extern double   vorbis_granule_time(vorbis_dsp_state *v,
-				    ogg_int64_t granulepos);
-
-/* Vorbis PRIMITIVES: analysis/DSP layer ****************************/
-
-extern int      vorbis_analysis_init(vorbis_dsp_state *v,vorbis_info *vi);
-extern int      vorbis_commentheader_out(vorbis_comment *vc, ogg_packet *op);
-extern int      vorbis_analysis_headerout(vorbis_dsp_state *v,
-					  vorbis_comment *vc,
-					  ogg_packet *op,
-					  ogg_packet *op_comm,
-					  ogg_packet *op_code);
-extern float  **vorbis_analysis_buffer(vorbis_dsp_state *v,int vals);
-extern int      vorbis_analysis_wrote(vorbis_dsp_state *v,int vals);
-extern int      vorbis_analysis_blockout(vorbis_dsp_state *v,vorbis_block *vb);
-extern int      vorbis_analysis(vorbis_block *vb,ogg_packet *op);
-
-extern int      vorbis_bitrate_addblock(vorbis_block *vb);
-extern int      vorbis_bitrate_flushpacket(vorbis_dsp_state *vd,
-					   ogg_packet *op);
-
-/* Vorbis PRIMITIVES: synthesis layer *******************************/
-extern int      vorbis_synthesis_idheader(ogg_packet *op);
-extern int      vorbis_synthesis_headerin(vorbis_info *vi,vorbis_comment *vc,
-					  ogg_packet *op);
-
-extern int      vorbis_synthesis_init(vorbis_dsp_state *v,vorbis_info *vi);
-extern int      vorbis_synthesis_restart(vorbis_dsp_state *v);
-extern int      vorbis_synthesis(vorbis_block *vb,ogg_packet *op);
-extern int      vorbis_synthesis_trackonly(vorbis_block *vb,ogg_packet *op);
-extern int      vorbis_synthesis_blockin(vorbis_dsp_state *v,vorbis_block *vb);
-extern int      vorbis_synthesis_pcmout(vorbis_dsp_state *v,float ***pcm);
-extern int      vorbis_synthesis_lapout(vorbis_dsp_state *v,float ***pcm);
-extern int      vorbis_synthesis_read(vorbis_dsp_state *v,int samples);
-extern long     vorbis_packet_blocksize(vorbis_info *vi,ogg_packet *op);
-
-extern int      vorbis_synthesis_halfrate(vorbis_info *v,int flag);
-extern int      vorbis_synthesis_halfrate_p(vorbis_info *v);
-
-/* Vorbis ERRORS and return codes ***********************************/
-
-#define OV_FALSE      -1
-#define OV_EOF        -2
-#define OV_HOLE       -3
-
-#define OV_EREAD      -128
-#define OV_EFAULT     -129
-#define OV_EIMPL      -130
-#define OV_EINVAL     -131
-#define OV_ENOTVORBIS -132
-#define OV_EBADHEADER -133
-#define OV_EVERSION   -134
-#define OV_ENOTAUDIO  -135
-#define OV_EBADPACKET -136
-#define OV_EBADLINK   -137
-#define OV_ENOSEEK    -138
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif
-

gpac-2.2.1.tar.gz/extra_lib/include/vorbis/vorbisenc.h Deleted

@@ -1,112 +0,0 @@
-/********************************************************************
- *                                                                  *
- * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE.   *
- * USE, DISTRIBUTION AND REPRODUCTION OF THIS LIBRARY SOURCE IS     *
- * GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE *
- * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.       *
- *                                                                  *
- * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
- * by the Xiph.Org Foundation http://www.xiph.org/                  *
- *                                                                  *
- ********************************************************************
-
- function: vorbis encode-engine setup
- last mod: $Id: vorbisenc.h,v 1.2 2008-12-02 18:04:43 jeanlf Exp $
-
- ********************************************************************/
-
-#ifndef _OV_ENC_H_
-#define _OV_ENC_H_
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif /* __cplusplus */
-
-#include "codec.h"
-
-extern int vorbis_encode_init(vorbis_info *vi,
-			      long channels,
-			      long rate,
-
-			      long max_bitrate,
-			      long nominal_bitrate,
-			      long min_bitrate);
-
-extern int vorbis_encode_setup_managed(vorbis_info *vi,
-				       long channels,
-				       long rate,
-
-				       long max_bitrate,
-				       long nominal_bitrate,
-				       long min_bitrate);
-
-extern int vorbis_encode_setup_vbr(vorbis_info *vi,
-				  long channels,
-				  long rate,
-
-				  float quality /* quality level from 0. (lo) to 1. (hi) */
-				  );
-
-extern int vorbis_encode_init_vbr(vorbis_info *vi,
-				  long channels,
-				  long rate,
-
-				  float base_quality /* quality level from 0. (lo) to 1. (hi) */
-				  );
-
-extern int vorbis_encode_setup_init(vorbis_info *vi);
-
-extern int vorbis_encode_ctl(vorbis_info *vi,int number,void *arg);
-
-  /* deprecated rate management supported only for compatability */
-#define OV_ECTL_RATEMANAGE_GET       0x10
-#define OV_ECTL_RATEMANAGE_SET       0x11
-#define OV_ECTL_RATEMANAGE_AVG       0x12
-#define OV_ECTL_RATEMANAGE_HARD      0x13
-
-struct ovectl_ratemanage_arg {
-  int    management_active;
-
-  long   bitrate_hard_min;
-  long   bitrate_hard_max;
-  double bitrate_hard_window;
-
-  long   bitrate_av_lo;
-  long   bitrate_av_hi;
-  double bitrate_av_window;
-  double bitrate_av_window_center;
-};
-
-
-  /* new rate setup */
-#define OV_ECTL_RATEMANAGE2_GET      0x14
-#define OV_ECTL_RATEMANAGE2_SET      0x15
-
-struct ovectl_ratemanage2_arg {
-  int    management_active;
-
-  long   bitrate_limit_min_kbps;
-  long   bitrate_limit_max_kbps;
-  long   bitrate_limit_reservoir_bits;
-  double bitrate_limit_reservoir_bias;
-
-  long   bitrate_average_kbps;
-  double bitrate_average_damping;
-};
-
-
-
-#define OV_ECTL_LOWPASS_GET          0x20
-#define OV_ECTL_LOWPASS_SET          0x21
-
-#define OV_ECTL_IBLOCK_GET           0x30
-#define OV_ECTL_IBLOCK_SET           0x31
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif
-
-

gpac-2.2.1.tar.gz/extra_lib/include/vorbis/vorbisfile.h Deleted

@@ -1,183 +0,0 @@
-/********************************************************************
- *                                                                  *
- * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE.   *
- * USE, DISTRIBUTION AND REPRODUCTION OF THIS LIBRARY SOURCE IS     *
- * GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE *
- * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.       *
- *                                                                  *
- * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2007             *
- * by the Xiph.Org Foundation http://www.xiph.org/                  *
- *                                                                  *
- ********************************************************************
-
- function: stdio-based convenience library for opening/seeking/decoding
- last mod: $Id: vorbisfile.h,v 1.2 2008-12-02 18:04:43 jeanlf Exp $
-
- ********************************************************************/
-
-#ifndef _OV_FILE_H_
-#define _OV_FILE_H_
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif /* __cplusplus */
-
-#include <stdio.h>
-#include "codec.h"
-
-/* The function prototypes for the callbacks are basically the same as for
- * the stdio functions fread, fseek, fclose, ftell.
- * The one difference is that the FILE * arguments have been replaced with
- * a void * - this is to be used as a pointer to whatever internal data these
- * functions might need. In the stdio case, it's just a FILE * cast to a void *
- *
- * If you use other functions, check the docs for these functions and return
- * the right values. For seek_func(), you *MUST* return -1 if the stream is
- * unseekable
- */
-typedef struct {
-  size_t (*read_func)  (void *ptr, size_t size, size_t nmemb, void *datasource);
-  int    (*seek_func)  (void *datasource, ogg_int64_t offset, int whence);
-  int    (*close_func) (void *datasource);
-  long   (*tell_func)  (void *datasource);
-} ov_callbacks;
-
-/* a few sets of convenient callbacks, especially for use under
- * Windows where ov_open_callbacks() should always be used instead of
- * ov_open() to avoid problems with incompatable crt.o version linking
- * issues. */
-
-static int _ov_header_fseek_wrap(FILE *f,ogg_int64_t off,int whence){
-  if(f==NULL)return(-1);
-  return fseek(f,off,whence);
-}
-
-static ov_callbacks OV_CALLBACKS_DEFAULT = {
-  (size_t (*)(void *, size_t, size_t, void *))  fread,
-  (int (*)(void *, ogg_int64_t, int))           _ov_header_fseek_wrap,
-  (int (*)(void *))                             fclose,
-  (long (*)(void *))                            ftell
-};
-
-static ov_callbacks OV_CALLBACKS_NOCLOSE = {
-  (size_t (*)(void *, size_t, size_t, void *))  fread,
-  (int (*)(void *, ogg_int64_t, int))           _ov_header_fseek_wrap,
-  (int (*)(void *))                             NULL,
-  (long (*)(void *))                            ftell
-};
-
-static ov_callbacks OV_CALLBACKS_STREAMONLY = {
-  (size_t (*)(void *, size_t, size_t, void *))  fread,
-  (int (*)(void *, ogg_int64_t, int))           NULL,
-  (int (*)(void *))                             fclose,
-  (long (*)(void *))                            NULL
-};
-
-static ov_callbacks OV_CALLBACKS_STREAMONLY_NOCLOSE = {
-  (size_t (*)(void *, size_t, size_t, void *))  fread,
-  (int (*)(void *, ogg_int64_t, int))           NULL,
-  (int (*)(void *))                             NULL,
-  (long (*)(void *))                            NULL
-};
-
-#define  NOTOPEN   0
-#define  PARTOPEN  1
-#define  OPENED    2
-#define  STREAMSET 3
-#define  INITSET   4
-
-typedef struct OggVorbis_File {
-  void            *datasource; /* Pointer to a FILE *, etc. */
-  int              seekable;
-  ogg_int64_t      offset;
-  ogg_int64_t      end;
-  ogg_sync_state   oy;
-
-  /* If the FILE handle isn't seekable (eg, a pipe), only the current
-     stream appears */
-  int              links;
-  ogg_int64_t     *offsets;
-  ogg_int64_t     *dataoffsets;
-  long            *serialnos;
-  ogg_int64_t     *pcmlengths; /* overloaded to maintain binary
-				  compatability; x2 size, stores both
-				  beginning and end values */
-  vorbis_info     *vi;
-  vorbis_comment  *vc;
-
-  /* Decoding working state local storage */
-  ogg_int64_t      pcm_offset;
-  int              ready_state;
-  long             current_serialno;
-  int              current_link;
-
-  double           bittrack;
-  double           samptrack;
-
-  ogg_stream_state os; /* take physical pages, weld into a logical
-                          stream of packets */
-  vorbis_dsp_state vd; /* central working state for the packet->PCM decoder */
-  vorbis_block     vb; /* local working space for packet->PCM decode */
-
-  ov_callbacks callbacks;
-
-} OggVorbis_File;
-
-
-extern int ov_clear(OggVorbis_File *vf);
-extern int ov_fopen(char *path,OggVorbis_File *vf);
-extern int ov_open(FILE *f,OggVorbis_File *vf,char *initial,long ibytes);
-extern int ov_open_callbacks(void *datasource, OggVorbis_File *vf,
-		char *initial, long ibytes, ov_callbacks callbacks);
-
-extern int ov_test(FILE *f,OggVorbis_File *vf,char *initial,long ibytes);
-extern int ov_test_callbacks(void *datasource, OggVorbis_File *vf,
-		char *initial, long ibytes, ov_callbacks callbacks);
-extern int ov_test_open(OggVorbis_File *vf);
-
-extern long ov_bitrate(OggVorbis_File *vf,int i);
-extern long ov_bitrate_instant(OggVorbis_File *vf);
-extern long ov_streams(OggVorbis_File *vf);
-extern long ov_seekable(OggVorbis_File *vf);
-extern long ov_serialnumber(OggVorbis_File *vf,int i);
-
-extern ogg_int64_t ov_raw_total(OggVorbis_File *vf,int i);
-extern ogg_int64_t ov_pcm_total(OggVorbis_File *vf,int i);
-extern double ov_time_total(OggVorbis_File *vf,int i);
-
-extern int ov_raw_seek(OggVorbis_File *vf,ogg_int64_t pos);
-extern int ov_pcm_seek(OggVorbis_File *vf,ogg_int64_t pos);
-extern int ov_pcm_seek_page(OggVorbis_File *vf,ogg_int64_t pos);
-extern int ov_time_seek(OggVorbis_File *vf,double pos);
-extern int ov_time_seek_page(OggVorbis_File *vf,double pos);
-
-extern int ov_raw_seek_lap(OggVorbis_File *vf,ogg_int64_t pos);
-extern int ov_pcm_seek_lap(OggVorbis_File *vf,ogg_int64_t pos);
-extern int ov_pcm_seek_page_lap(OggVorbis_File *vf,ogg_int64_t pos);
-extern int ov_time_seek_lap(OggVorbis_File *vf,double pos);
-extern int ov_time_seek_page_lap(OggVorbis_File *vf,double pos);
-
-extern ogg_int64_t ov_raw_tell(OggVorbis_File *vf);
-extern ogg_int64_t ov_pcm_tell(OggVorbis_File *vf);
-extern double ov_time_tell(OggVorbis_File *vf);
-
-extern vorbis_info *ov_info(OggVorbis_File *vf,int link);
-extern vorbis_comment *ov_comment(OggVorbis_File *vf,int link);
-
-extern long ov_read_float(OggVorbis_File *vf,float ***pcm_channels,int samples,
-			  int *bitstream);
-extern long ov_read(OggVorbis_File *vf,char *buffer,int length,
-		    int bigendianp,int word,int sgned,int *bitstream);
-extern int ov_crosslap(OggVorbis_File *vf1,OggVorbis_File *vf2);
-
-extern int ov_halfrate(OggVorbis_File *vf,int flag);
-extern int ov_halfrate_p(OggVorbis_File *vf);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif
-
-

gpac-2.2.1.tar.gz/extra_lib/include/wiiuse.h Deleted

@@ -1,653 +0,0 @@
-/*
- *	wiiuse
- *
- *	Written By:
- *		Michael Laforest	< para >
- *		Email: < thepara (--AT--) g m a i l --DOT-- com >
- *
- *	Copyright 2006-2007
- *
- *	This file is part of wiiuse.
- *
- *	This program is free software; you can redistribute it and/or modify
- *	it under the terms of the GNU General Public License as published by
- *	the Free Software Foundation; either version 3 of the License, or
- *	(at your option) any later version.
- *
- *	This program 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 General Public License for more details.
- *
- *	You should have received a copy of the GNU General Public License
- *	along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- *	$Header: /home/bouqueau/Works/smb_moscovie/gpac/extra_lib/include/wiiuse.h,v 1.1 2009-05-20 17:11:40 jeanlf Exp $
- *
- */
-
-/**
- *	@file
- *
- *	@brief API header file.
- *
- *	If this file is included from inside the wiiuse source
- *	and not from a third party program, then wiimote_internal.h
- *	is also included which extends this file.
- */
-
-#ifndef WIIUSE_H_INCLUDED
-#define WIIUSE_H_INCLUDED
-
-#ifdef _WIN32
-	/* windows */
-	#include <windows.h>
-#else
-	/* nix */
-	#include <bluetooth/bluetooth.h>
-#endif
-
-#ifdef WIIUSE_INTERNAL_H_INCLUDED
-	#define WCONST
-#else
-	#define WCONST		const
-#endif
-
-/* led bit masks */
-#define WIIMOTE_LED_NONE				0x00
-#define WIIMOTE_LED_1					0x10
-#define WIIMOTE_LED_2					0x20
-#define WIIMOTE_LED_3					0x40
-#define WIIMOTE_LED_4					0x80
-
-/* button codes */
-#define WIIMOTE_BUTTON_TWO				0x0001
-#define WIIMOTE_BUTTON_ONE				0x0002
-#define WIIMOTE_BUTTON_B				0x0004
-#define WIIMOTE_BUTTON_A				0x0008
-#define WIIMOTE_BUTTON_MINUS			0x0010
-#define WIIMOTE_BUTTON_ZACCEL_BIT6		0x0020
-#define WIIMOTE_BUTTON_ZACCEL_BIT7		0x0040
-#define WIIMOTE_BUTTON_HOME				0x0080
-#define WIIMOTE_BUTTON_LEFT				0x0100
-#define WIIMOTE_BUTTON_RIGHT			0x0200
-#define WIIMOTE_BUTTON_DOWN				0x0400
-#define WIIMOTE_BUTTON_UP				0x0800
-#define WIIMOTE_BUTTON_PLUS				0x1000
-#define WIIMOTE_BUTTON_ZACCEL_BIT4		0x2000
-#define WIIMOTE_BUTTON_ZACCEL_BIT5		0x4000
-#define WIIMOTE_BUTTON_UNKNOWN			0x8000
-#define WIIMOTE_BUTTON_ALL				0x1F9F
-
-/* nunchul button codes */
-#define NUNCHUK_BUTTON_Z				0x01
-#define NUNCHUK_BUTTON_C				0x02
-#define NUNCHUK_BUTTON_ALL				0x03
-
-/* classic controller button codes */
-#define CLASSIC_CTRL_BUTTON_UP			0x0001
-#define CLASSIC_CTRL_BUTTON_LEFT		0x0002
-#define CLASSIC_CTRL_BUTTON_ZR			0x0004
-#define CLASSIC_CTRL_BUTTON_X			0x0008
-#define CLASSIC_CTRL_BUTTON_A			0x0010
-#define CLASSIC_CTRL_BUTTON_Y			0x0020
-#define CLASSIC_CTRL_BUTTON_B			0x0040
-#define CLASSIC_CTRL_BUTTON_ZL			0x0080
-#define CLASSIC_CTRL_BUTTON_FULL_R		0x0200
-#define CLASSIC_CTRL_BUTTON_PLUS		0x0400
-#define CLASSIC_CTRL_BUTTON_HOME		0x0800
-#define CLASSIC_CTRL_BUTTON_MINUS		0x1000
-#define CLASSIC_CTRL_BUTTON_FULL_L		0x2000
-#define CLASSIC_CTRL_BUTTON_DOWN		0x4000
-#define CLASSIC_CTRL_BUTTON_RIGHT		0x8000
-#define CLASSIC_CTRL_BUTTON_ALL			0xFEFF
-
-/* guitar hero 3 button codes */
-#define GUITAR_HERO_3_BUTTON_STRUM_UP	0x0001
-#define GUITAR_HERO_3_BUTTON_YELLOW		0x0008
-#define GUITAR_HERO_3_BUTTON_GREEN		0x0010
-#define GUITAR_HERO_3_BUTTON_BLUE		0x0020
-#define GUITAR_HERO_3_BUTTON_RED		0x0040
-#define GUITAR_HERO_3_BUTTON_ORANGE		0x0080
-#define GUITAR_HERO_3_BUTTON_PLUS		0x0400
-#define GUITAR_HERO_3_BUTTON_MINUS		0x1000
-#define GUITAR_HERO_3_BUTTON_STRUM_DOWN	0x4000
-#define GUITAR_HERO_3_BUTTON_ALL		0xFEFF
-
-
-/* wiimote option flags */
-#define WIIUSE_SMOOTHING				0x01
-#define WIIUSE_CONTINUOUS				0x02
-#define WIIUSE_ORIENT_THRESH			0x04
-#define WIIUSE_INIT_FLAGS				(WIIUSE_SMOOTHING | WIIUSE_ORIENT_THRESH)
-
-#define WIIUSE_ORIENT_PRECISION			100.0f
-
-/* expansion codes */
-#define EXP_NONE						0
-#define EXP_NUNCHUK						1
-#define EXP_CLASSIC						2
-#define EXP_GUITAR_HERO_3				3
-
-/* IR correction types */
-typedef enum ir_position_t {
-	WIIUSE_IR_ABOVE,
-	WIIUSE_IR_BELOW
-} ir_position_t;
-
-/**
- *	@brief Check if a button is pressed.
- *	@param dev		Pointer to a wiimote_t or expansion structure.
- *	@param button	The button you are interested in.
- *	@return 1 if the button is pressed, 0 if not.
- */
-#define IS_PRESSED(dev, button)		((dev->btns & button) == button)
-
-/**
- *	@brief Check if a button is being held.
- *	@param dev		Pointer to a wiimote_t or expansion structure.
- *	@param button	The button you are interested in.
- *	@return 1 if the button is held, 0 if not.
- */
-#define IS_HELD(dev, button)			((dev->btns_held & button) == button)
-
-/**
- *	@brief Check if a button is released on this event.					\n\n
- *			This does not mean the button is not pressed, it means		\n
- *			this button was just now released.
- *	@param dev		Pointer to a wiimote_t or expansion structure.
- *	@param button	The button you are interested in.
- *	@return 1 if the button is released, 0 if not.
- *
- */
-#define IS_RELEASED(dev, button)		((dev->btns_released & button) == button)
-
-/**
- *	@brief Check if a button has just been pressed this event.
- *	@param dev		Pointer to a wiimote_t or expansion structure.
- *	@param button	The button you are interested in.
- *	@return 1 if the button is pressed, 0 if not.
- */
-#define IS_JUST_PRESSED(dev, button)	(IS_PRESSED(dev, button) && !IS_HELD(dev, button))
-
-/**
- *	@brief Return the IR sensitivity level.
- *	@param wm		Pointer to a wiimote_t structure.
- *	@param lvl		out Pointer to an int that will hold the level setting.
- *	If no level is set 'lvl' will be set to 0.
- */
-#define WIIUSE_GET_IR_SENSITIVITY(dev, lvl)									\
-			do {														\
-				if ((wm->state & 0x0200) == 0x0200) 		*lvl = 1;	\
-				else if ((wm->state & 0x0400) == 0x0400) 	*lvl = 2;	\
-				else if ((wm->state & 0x0800) == 0x0800) 	*lvl = 3;	\
-				else if ((wm->state & 0x1000) == 0x1000) 	*lvl = 4;	\
-				else if ((wm->state & 0x2000) == 0x2000) 	*lvl = 5;	\
-				else									*lvl = 0;		\
-			} while (0)
-
-#define WIIUSE_USING_ACC(wm)			((wm->state & 0x020) == 0x020)
-#define WIIUSE_USING_EXP(wm)			((wm->state & 0x040) == 0x040)
-#define WIIUSE_USING_IR(wm)				((wm->state & 0x080) == 0x080)
-#define WIIUSE_USING_SPEAKER(wm)		((wm->state & 0x100) == 0x100)
-
-#define WIIUSE_IS_LED_SET(wm, num)		((wm->leds & WIIMOTE_LED_##num) == WIIMOTE_LED_##num)
-
-/*
- *	Largest known payload is 21 bytes.
- *	Add 2 for the prefix and round up to a power of 2.
- */
-#define MAX_PAYLOAD			32
-
-/*
- *	This is left over from an old hack, but it may actually
- *	be a useful feature to keep so it wasn't removed.
- */
-#ifdef WIN32
-	#define WIIMOTE_DEFAULT_TIMEOUT		10
-	#define WIIMOTE_EXP_TIMEOUT			10
-#endif
-
-typedef unsigned char byte;
-typedef char sbyte;
-
-struct wiimote_t;
-struct vec3b_t;
-struct orient_t;
-struct gforce_t;
-
-
-/**
- *      @brief Callback that handles a read event.
- *
- *      @param wm               Pointer to a wiimote_t structure.
- *      @param data             Pointer to the filled data block.
- *      @param len              Length in bytes of the data block.
- *
- *      @see wiiuse_init()
- *
- *      A registered function of this type is called automatically by the wiiuse
- *      library when the wiimote has returned the full data requested by a previous
- *      call to wiiuse_read_data().
- */
-typedef void (*wiiuse_read_cb)(struct wiimote_t* wm, byte* data, unsigned short len);
-
-
-/**
- *	@struct read_req_t
- *	@brief Data read request structure.
- */
-struct read_req_t {
-	wiiuse_read_cb cb;			/**< read data callback											*/
-	byte* buf;					/**< buffer where read data is written							*/
-	unsigned int addr;			/**< the offset that the read started at						*/
-	unsigned short size;		/**< the length of the data read								*/
-	unsigned short wait;		/**< num bytes still needed to finish read						*/
-	byte dirty;					/**< set to 1 if not using callback and needs to be cleaned up	*/
-
-	struct read_req_t* next;	/**< next read request in the queue								*/
-};
-
-
-/**
- *	@struct vec2b_t
- *	@brief Unsigned x,y byte vector.
- */
-typedef struct vec2b_t {
-	byte x, y;
-} vec2b_t;
-
-
-/**
- *	@struct vec3b_t
- *	@brief Unsigned x,y,z byte vector.
- */
-typedef struct vec3b_t {
-	byte x, y, z;
-} vec3b_t;
-
-
-/**
- *	@struct vec3f_t
- *	@brief Signed x,y,z float struct.
- */
-typedef struct vec3f_t {
-	float x, y, z;
-} vec3f_t;
-
-
-/**
- *	@struct orient_t
- *	@brief Orientation struct.
- *
- *	Yaw, pitch, and roll range from -180 to 180 degrees.
- */
-typedef struct orient_t {
-	float roll;						/**< roll, this may be smoothed if enabled	*/
-	float pitch;					/**< pitch, this may be smoothed if enabled	*/
-	float yaw;
-
-	float a_roll;					/**< absolute roll, unsmoothed				*/
-	float a_pitch;					/**< absolute pitch, unsmoothed				*/
-} orient_t;
-
-
-/**
- *	@struct gforce_t
- *	@brief Gravity force struct.
- */
-typedef struct gforce_t {
-	float x, y, z;
-} gforce_t;
-
-
-/**
- *	@struct accel_t
- *	@brief Accelerometer struct. For any device with an accelerometer.
- */
-typedef struct accel_t {
-	struct vec3b_t cal_zero;		/**< zero calibration					*/
-	struct vec3b_t cal_g;			/**< 1g difference around 0cal			*/
-
-	float st_roll;					/**< last smoothed roll value			*/
-	float st_pitch;					/**< last smoothed roll pitch			*/
-	float st_alpha;					/**< alpha value for smoothing 0-1	*/
-} accel_t;
-
-
-/**
- *	@struct ir_dot_t
- *	@brief A single IR source.
- */
-typedef struct ir_dot_t {
-	byte visible;					/**< if the IR source is visible		*/
-
-	unsigned int x;					/**< interpolated X coordinate			*/
-	unsigned int y;					/**< interpolated Y coordinate			*/
-
-	short rx;						/**< raw X coordinate (0-1023)			*/
-	short ry;						/**< raw Y coordinate (0-767)			*/
-
-	byte order;						/**< increasing order by x-axis value	*/
-
-	byte size;						/**< size of the IR dot (0-15)			*/
-} ir_dot_t;
-
-
-/**
- *	@enum aspect_t
- *	@brief Screen aspect ratio.
- */
-typedef enum aspect_t {
-	WIIUSE_ASPECT_4_3,
-	WIIUSE_ASPECT_16_9
-} aspect_t;
-
-
-/**
- *	@struct ir_t
- *	@brief IR struct. Hold all data related to the IR tracking.
- */
-typedef struct ir_t {
-	struct ir_dot_t dot4;			/**< IR dots							*/
-	byte num_dots;					/**< number of dots at this time		*/
-
-	enum aspect_t aspect;			/**< aspect ratio of the screen			*/
-
-	enum ir_position_t pos;			/**< IR sensor bar position				*/
-
-	unsigned int vres2;			/**< IR virtual screen resolution		*/
-	int offset2;					/**< IR XY correction offset			*/
-	int state;						/**< keeps track of the IR state		*/
-
-	int ax;							/**< absolute X coordinate				*/
-	int ay;							/**< absolute Y coordinate				*/
-
-	int x;							/**< calculated X coordinate			*/
-	int y;							/**< calculated Y coordinate			*/
-
-	float distance;					/**< pixel distance between first 2 dots*/
-	float z;						/**< calculated distance				*/
-} ir_t;
-
-
-/**
- *	@struct joystick_t
- *	@brief Joystick calibration structure.
- *
- *	The angle \a ang is relative to the positive y-axis into quadrant I
- *	and ranges from 0 to 360 degrees.  So if the joystick is held straight
- *	upwards then angle is 0 degrees.  If it is held to the right it is 90,
- *	down is 180, and left is 270.
- *
- *	The magnitude \a mag is the distance from the center to where the
- *	joystick is being held.  The magnitude ranges from 0 to 1.
- *	If the joystick is only slightly tilted from the center the magnitude
- *	will be low, but if it is closer to the outter edge the value will
- *	be higher.
- */
-typedef struct joystick_t {
-	struct vec2b_t max;				/**< maximum joystick values	*/
-	struct vec2b_t min;				/**< minimum joystick values	*/
-	struct vec2b_t center;			/**< center joystick values		*/
-
-	float ang;						/**< angle the joystick is being held		*/
-	float mag;						/**< magnitude of the joystick (range 0-1)	*/
-} joystick_t;
-
-
-/**
- *	@struct nunchuk_t
- *	@brief Nunchuk expansion device.
- */
-typedef struct nunchuk_t {
-	struct accel_t accel_calib;		/**< nunchuk accelerometer calibration		*/
-	struct joystick_t js;			/**< joystick calibration					*/
-
-	int* flags;						/**< options flag (points to wiimote_t.flags) */
-
-	byte btns;						/**< what buttons have just been pressed	*/
-	byte btns_held;					/**< what buttons are being held down		*/
-	byte btns_released;				/**< what buttons were just released this	*/
-
-	float orient_threshold;			/**< threshold for orient to generate an event */
-	int accel_threshold;			/**< threshold for accel to generate an event */
-
-	struct vec3b_t accel;			/**< current raw acceleration data			*/
-	struct orient_t orient;			/**< current orientation on each axis		*/
-	struct gforce_t gforce;			/**< current gravity forces on each axis	*/
-} nunchuk_t;
-
-
-/**
- *	@struct classic_ctrl_t
- *	@brief Classic controller expansion device.
- */
-typedef struct classic_ctrl_t {
-	short btns;						/**< what buttons have just been pressed	*/
-	short btns_held;				/**< what buttons are being held down		*/
-	short btns_released;			/**< what buttons were just released this	*/
-
-	float r_shoulder;				/**< right shoulder button (range 0-1)		*/
-	float l_shoulder;				/**< left shoulder button (range 0-1)		*/
-
-	struct joystick_t ljs;			/**< left joystick calibration				*/
-	struct joystick_t rjs;			/**< right joystick calibration				*/
-} classic_ctrl_t;
-
-
-/**
- *	@struct guitar_hero_3_t
- *	@brief Guitar Hero 3 expansion device.
- */
-typedef struct guitar_hero_3_t {
-	short btns;						/**< what buttons have just been pressed	*/
-	short btns_held;				/**< what buttons are being held down		*/
-	short btns_released;			/**< what buttons were just released this	*/
-
-	float whammy_bar;				/**< whammy bar (range 0-1)					*/
-
-	struct joystick_t js;			/**< joystick calibration					*/
-} guitar_hero_3_t;
-
-
-/**
- *	@struct expansion_t
- *	@brief Generic expansion device plugged into wiimote.
- */
-typedef struct expansion_t {
-	int type;						/**< type of expansion attached				*/
-
-	union {
-		struct nunchuk_t nunchuk;
-		struct classic_ctrl_t classic;
-		struct guitar_hero_3_t gh3;
-	};
-} expansion_t;
-
-
-/**
- *	@enum win32_bt_stack_t
- *	@brief	Available bluetooth stacks for Windows.
- */
-typedef enum win_bt_stack_t {
-	WIIUSE_STACK_UNKNOWN,
-	WIIUSE_STACK_MS,
-	WIIUSE_STACK_BLUESOLEIL
-} win_bt_stack_t;
-
-
-/**
- *	@struct wiimote_state_t
- *	@brief Significant data from the previous event.
- */
-typedef struct wiimote_state_t {
-	/* expansion_t */
-	float exp_ljs_ang;
-	float exp_rjs_ang;
-	float exp_ljs_mag;
-	float exp_rjs_mag;
-	unsigned short exp_btns;
-	struct orient_t exp_orient;
-	struct vec3b_t exp_accel;
-	float exp_r_shoulder;
-	float exp_l_shoulder;
-
-	/* ir_t */
-	int ir_ax;
-	int ir_ay;
-	float ir_distance;
-
-	struct orient_t orient;
-	unsigned short btns;
-
-	struct vec3b_t accel;
-} wiimote_state_t;
-
-
-/**
- *	@enum WIIUSE_EVENT_TYPE
- *	@brief Events that wiiuse can generate from a poll.
- */
-typedef enum WIIUSE_EVENT_TYPE {
-	WIIUSE_NONE = 0,
-	WIIUSE_EVENT,
-	WIIUSE_STATUS,
-	WIIUSE_CONNECT,
-	WIIUSE_DISCONNECT,
-	WIIUSE_UNEXPECTED_DISCONNECT,
-	WIIUSE_READ_DATA,
-	WIIUSE_NUNCHUK_INSERTED,
-	WIIUSE_NUNCHUK_REMOVED,
-	WIIUSE_CLASSIC_CTRL_INSERTED,
-	WIIUSE_CLASSIC_CTRL_REMOVED,
-	WIIUSE_GUITAR_HERO_3_CTRL_INSERTED,
-	WIIUSE_GUITAR_HERO_3_CTRL_REMOVED
-} WIIUSE_EVENT_TYPE;
-
-/**
- *	@struct wiimote_t
- *	@brief Wiimote structure.
- */
-typedef struct wiimote_t {
-	WCONST int unid;						/**< user specified id						*/
-
-	#ifndef WIN32
-		WCONST bdaddr_t bdaddr;				/**< bt address								*/
-		WCONST char bdaddr_str18;			/**< readable bt address					*/
-		WCONST int out_sock;				/**< output socket							*/
-		WCONST int in_sock;					/**< input socket 							*/
-	#else
-		WCONST HANDLE dev_handle;			/**< HID handle								*/
-		WCONST OVERLAPPED hid_overlap;		/**< overlap handle							*/
-		WCONST enum win_bt_stack_t stack;	/**< type of bluetooth stack to use			*/
-		WCONST int timeout;					/**< read timeout							*/
-		WCONST byte normal_timeout;			/**< normal timeout							*/
-		WCONST byte exp_timeout;			/**< timeout for expansion handshake		*/
-	#endif
-
-	WCONST int state;						/**< various state flags					*/
-	WCONST byte leds;						/**< currently lit leds						*/
-	WCONST float battery_level;				/**< battery level							*/
-
-	WCONST int flags;						/**< options flag							*/
-
-	WCONST byte handshake_state;			/**< the state of the connection handshake	*/
-
-	WCONST struct read_req_t* read_req;		/**< list of data read requests				*/
-	WCONST struct accel_t accel_calib;		/**< wiimote accelerometer calibration		*/
-	WCONST struct expansion_t exp;			/**< wiimote expansion device				*/
-
-	WCONST struct vec3b_t accel;			/**< current raw acceleration data			*/
-	WCONST struct orient_t orient;			/**< current orientation on each axis		*/
-	WCONST struct gforce_t gforce;			/**< current gravity forces on each axis	*/
-
-	WCONST struct ir_t ir;					/**< IR data								*/
-
-	WCONST unsigned short btns;				/**< what buttons have just been pressed	*/
-	WCONST unsigned short btns_held;		/**< what buttons are being held down		*/
-	WCONST unsigned short btns_released;	/**< what buttons were just released this	*/
-
-	WCONST float orient_threshold;			/**< threshold for orient to generate an event */
-	WCONST int accel_threshold;				/**< threshold for accel to generate an event */
-
-	WCONST struct wiimote_state_t lstate;	/**< last saved state						*/
-
-	WCONST WIIUSE_EVENT_TYPE event;			/**< type of event that occured				*/
-	WCONST byte event_bufMAX_PAYLOAD;		/**< event buffer							*/
-} wiimote;
-
-
-/*****************************************
- *
- *	Include API specific stuff
- *
- *****************************************/
-
-#ifdef _WIN32
-	#define WIIUSE_EXPORT_DECL __declspec(dllexport)
-	#define WIIUSE_IMPORT_DECL __declspec(dllimport)
-#else
-	#define WIIUSE_EXPORT_DECL
-	#define WIIUSE_IMPORT_DECL
-#endif
-
-#ifdef WIIUSE_COMPILE_LIB
-	#define WIIUSE_EXPORT WIIUSE_EXPORT_DECL
-#else
-	#define WIIUSE_EXPORT WIIUSE_IMPORT_DECL
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* wiiuse.c */
-WIIUSE_EXPORT extern const char* wiiuse_version();
-
-WIIUSE_EXPORT extern struct wiimote_t** wiiuse_init(int wiimotes);
-WIIUSE_EXPORT extern void wiiuse_disconnected(struct wiimote_t* wm);
-WIIUSE_EXPORT extern void wiiuse_cleanup(struct wiimote_t** wm, int wiimotes);
-WIIUSE_EXPORT extern void wiiuse_rumble(struct wiimote_t* wm, int status);
-WIIUSE_EXPORT extern void wiiuse_toggle_rumble(struct wiimote_t* wm);
-WIIUSE_EXPORT extern void wiiuse_set_leds(struct wiimote_t* wm, int leds);
-WIIUSE_EXPORT extern void wiiuse_motion_sensing(struct wiimote_t* wm, int status);
-WIIUSE_EXPORT extern int wiiuse_read_data(struct wiimote_t* wm, byte* buffer, unsigned int offset, unsigned short len);
-WIIUSE_EXPORT extern int wiiuse_write_data(struct wiimote_t* wm, unsigned int addr, byte* data, byte len);
-WIIUSE_EXPORT extern void wiiuse_status(struct wiimote_t* wm);
-WIIUSE_EXPORT extern struct wiimote_t* wiiuse_get_by_id(struct wiimote_t** wm, int wiimotes, int unid);
-WIIUSE_EXPORT extern int wiiuse_set_flags(struct wiimote_t* wm, int enable, int disable);
-WIIUSE_EXPORT extern float wiiuse_set_smooth_alpha(struct wiimote_t* wm, float alpha);
-WIIUSE_EXPORT extern void wiiuse_set_bluetooth_stack(struct wiimote_t** wm, int wiimotes, enum win_bt_stack_t type);
-WIIUSE_EXPORT extern void wiiuse_set_orient_threshold(struct wiimote_t* wm, float threshold);
-WIIUSE_EXPORT extern void wiiuse_resync(struct wiimote_t* wm);
-WIIUSE_EXPORT extern void wiiuse_set_timeout(struct wiimote_t** wm, int wiimotes, byte normal_timeout, byte exp_timeout);
-WIIUSE_EXPORT extern void wiiuse_set_accel_threshold(struct wiimote_t* wm, int threshold);
-
-/* connect.c */
-WIIUSE_EXPORT extern int wiiuse_find(struct wiimote_t** wm, int max_wiimotes, int timeout);
-WIIUSE_EXPORT extern int wiiuse_connect(struct wiimote_t** wm, int wiimotes);
-WIIUSE_EXPORT extern void wiiuse_disconnect(struct wiimote_t* wm);
-
-/* events.c */
-WIIUSE_EXPORT extern int wiiuse_poll(struct wiimote_t** wm, int wiimotes);
-
-/* ir.c */
-WIIUSE_EXPORT extern void wiiuse_set_ir(struct wiimote_t* wm, int status);
-WIIUSE_EXPORT extern void wiiuse_set_ir_vres(struct wiimote_t* wm, unsigned int x, unsigned int y);
-WIIUSE_EXPORT extern void wiiuse_set_ir_position(struct wiimote_t* wm, enum ir_position_t pos);
-WIIUSE_EXPORT extern void wiiuse_set_aspect_ratio(struct wiimote_t* wm, enum aspect_t aspect);
-WIIUSE_EXPORT extern void wiiuse_set_ir_sensitivity(struct wiimote_t* wm, int level);
-
-/* nunchuk.c */
-WIIUSE_EXPORT extern void wiiuse_set_nunchuk_orient_threshold(struct wiimote_t* wm, float threshold);
-WIIUSE_EXPORT extern void wiiuse_set_nunchuk_accel_threshold(struct wiimote_t* wm, int threshold);
-
-
-#ifdef __cplusplus
-}
-#endif
-
-
-#endif /* WIIUSE_H_INCLUDED */
-

gpac-2.2.1.tar.gz/extra_lib/include/xvid.h Deleted

@@ -1,786 +0,0 @@
-/*****************************************************************************
- *
- * XVID MPEG-4 VIDEO CODEC
- * - XviD Main header file -
- *
- *  Copyright(C) 2001-2004 Peter Ross <pross@xvid.org>
- *
- *  This program is free software ; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation ; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program 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 General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program ; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
- *
- * $Id: xvid.h,v 1.2 2008-12-02 18:04:43 jeanlf Exp $
- *
- ****************************************************************************/
-
-#ifndef _XVID_H_
-#define _XVID_H_
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*****************************************************************************
- * versioning
- ****************************************************************************/
-
-/* versioning
-	version takes the form "$major.$minor.$patch"
-	$patch is incremented when there is no api change
-	$minor is incremented when the api is changed, but remains backwards compatible
-	$major is incremented when the api is changed significantly
-
-	when initialising an xvid structure, you must always zero it, and set the version field.
-		memset(&struct,0,sizeof(struct));
-		struct.version = XVID_VERSION;
-
-	XVID_UNSTABLE is defined only during development.
-	*/
-
-#define XVID_MAKE_VERSION(a,b,c) ((((a)&0xff)<<16) | (((b)&0xff)<<8) | ((c)&0xff))
-#define XVID_VERSION_MAJOR(a)    ((char)(((a)>>16) & 0xff))
-#define XVID_VERSION_MINOR(a)    ((char)(((a)>> 8) & 0xff))
-#define XVID_VERSION_PATCH(a)    ((char)(((a)>> 0) & 0xff))
-
-#define XVID_MAKE_API(a,b)       ((((a)&0xff)<<16) | (((b)&0xff)<<0))
-#define XVID_API_MAJOR(a)        (((a)>>16) & 0xff)
-#define XVID_API_MINOR(a)        (((a)>> 0) & 0xff)
-
-#define XVID_VERSION             XVID_MAKE_VERSION(1,1,3)
-#define XVID_API                 XVID_MAKE_API(4, 1)
-
-/* Bitstream Version
- * this will be writen into the bitstream to allow easy detection of xvid
- * encoder bugs in the decoder, without this it might not possible to
- * automatically distinquish between a file which has been encoded with an
- * old & buggy XVID from a file which has been encoded with a bugfree version
- * see the infamous interlacing bug ...
- *
- * this MUST be increased if an encoder bug is fixed, increasing it too often
- * doesnt hurt but not increasing it could cause difficulty for decoders in the
- * future
- */
-#define XVID_BS_VERSION 46
-
-/*****************************************************************************
- * error codes
- ****************************************************************************/
-
-	/*	all functions return values <0 indicate error */
-
-#define XVID_ERR_FAIL		-1		/* general fault */
-#define XVID_ERR_MEMORY		-2		/* memory allocation error */
-#define XVID_ERR_FORMAT		-3		/* file format error */
-#define XVID_ERR_VERSION	-4		/* structure version not supported */
-#define XVID_ERR_END		-5		/* encoder only; end of stream reached */
-
-
-
-/*****************************************************************************
- * xvid_image_t
- ****************************************************************************/
-
-/* colorspace values */
-
-#define XVID_CSP_PLANAR   (1<< 0) /* 4:2:0 planar (==I420, except for pointers/strides) */
-#define XVID_CSP_USER	  XVID_CSP_PLANAR
-#define XVID_CSP_I420     (1<< 1) /* 4:2:0 planar */
-#define XVID_CSP_YV12     (1<< 2) /* 4:2:0 planar */
-#define XVID_CSP_YUY2     (1<< 3) /* 4:2:2 packed */
-#define XVID_CSP_UYVY     (1<< 4) /* 4:2:2 packed */
-#define XVID_CSP_YVYU     (1<< 5) /* 4:2:2 packed */
-#define XVID_CSP_BGRA     (1<< 6) /* 32-bit bgra packed */
-#define XVID_CSP_ABGR     (1<< 7) /* 32-bit abgr packed */
-#define XVID_CSP_RGBA     (1<< 8) /* 32-bit rgba packed */
-#define XVID_CSP_ARGB     (1<<15) /* 32-bit argb packed */
-#define XVID_CSP_BGR      (1<< 9) /* 24-bit bgr packed */
-#define XVID_CSP_RGB555   (1<<10) /* 16-bit rgb555 packed */
-#define XVID_CSP_RGB565   (1<<11) /* 16-bit rgb565 packed */
-#define XVID_CSP_SLICE    (1<<12) /* decoder only: 4:2:0 planar, per slice rendering */
-#define XVID_CSP_INTERNAL (1<<13) /* decoder only: 4:2:0 planar, returns ptrs to internal buffers */
-#define XVID_CSP_NULL     (1<<14) /* decoder only: dont output anything */
-#define XVID_CSP_VFLIP    (1<<31) /* vertical flip mask */
-
-/* xvid_image_t
-	for non-planar colorspaces use only plane0 and stride0
-	four plane reserved for alpha*/
-typedef struct {
-	int csp;				/* in colorspace; or with XVID_CSP_VFLIP to perform vertical flip */
-	void * plane4;		/* in image plane ptrs */
-	int stride4;			/* in image stride; "bytes per row"*/
-} xvid_image_t;
-
-/* video-object-sequence profiles */
-#define XVID_PROFILE_S_L0    0x08 /* simple */
-#define XVID_PROFILE_S_L1    0x01
-#define XVID_PROFILE_S_L2    0x02
-#define XVID_PROFILE_S_L3    0x03
-#define XVID_PROFILE_ARTS_L1 0x91 /* advanced realtime simple */
-#define XVID_PROFILE_ARTS_L2 0x92
-#define XVID_PROFILE_ARTS_L3 0x93
-#define XVID_PROFILE_ARTS_L4 0x94
-#define XVID_PROFILE_AS_L0   0xf0 /* advanced simple */
-#define XVID_PROFILE_AS_L1   0xf1
-#define XVID_PROFILE_AS_L2   0xf2
-#define XVID_PROFILE_AS_L3   0xf3
-#define XVID_PROFILE_AS_L4   0xf4
-
-/* aspect ratios */
-#define XVID_PAR_11_VGA    1 /* 1:1 vga (square), default if supplied PAR is not a valid value */
-#define XVID_PAR_43_PAL    2 /* 4:3 pal (12:11 625-line) */
-#define XVID_PAR_43_NTSC   3 /* 4:3 ntsc (10:11 525-line) */
-#define XVID_PAR_169_PAL   4 /* 16:9 pal (16:11 625-line) */
-#define XVID_PAR_169_NTSC  5 /* 16:9 ntsc (40:33 525-line) */
-#define XVID_PAR_EXT      15 /* extended par; use par_width, par_height */
-
-/* frame type flags */
-#define XVID_TYPE_VOL     -1 /* decoder only: vol was decoded */
-#define XVID_TYPE_NOTHING  0 /* decoder only (encoder stats): nothing was decoded/encoded */
-#define XVID_TYPE_AUTO     0 /* encoder: automatically determine coding type */
-#define XVID_TYPE_IVOP     1 /* intra frame */
-#define XVID_TYPE_PVOP     2 /* predicted frame */
-#define XVID_TYPE_BVOP     3 /* bidirectionally encoded */
-#define XVID_TYPE_SVOP     4 /* predicted+sprite frame */
-
-
-/*****************************************************************************
- * xvid_global()
- ****************************************************************************/
-
-/* cpu_flags definitions (make sure to sync this with cpuid.asm for ia32) */
-
-#define XVID_CPU_FORCE    (1<<31) /* force passed cpu flags */
-#define XVID_CPU_ASM      (1<< 7) /* native assembly */
-/* ARCH_IS_IA32 */
-#define XVID_CPU_MMX      (1<< 0) /*       mmx : pentiumMMX,k6 */
-#define XVID_CPU_MMXEXT   (1<< 1) /*   mmx-ext : pentium2, athlon */
-#define XVID_CPU_SSE      (1<< 2) /*       sse : pentium3, athlonXP */
-#define XVID_CPU_SSE2     (1<< 3) /*      sse2 : pentium4, athlon64 */
-#define XVID_CPU_3DNOW    (1<< 4) /*     3dnow : k6-2 */
-#define XVID_CPU_3DNOWEXT (1<< 5) /* 3dnow-ext : athlon */
-#define XVID_CPU_TSC      (1<< 6) /*       tsc : Pentium */
-/* ARCH_IS_PPC */
-#define XVID_CPU_ALTIVEC  (1<< 0) /* altivec */
-
-
-#define XVID_DEBUG_ERROR     (1<< 0)
-#define XVID_DEBUG_STARTCODE (1<< 1)
-#define XVID_DEBUG_HEADER    (1<< 2)
-#define XVID_DEBUG_TIMECODE  (1<< 3)
-#define XVID_DEBUG_MB        (1<< 4)
-#define XVID_DEBUG_COEFF     (1<< 5)
-#define XVID_DEBUG_MV        (1<< 6)
-#define XVID_DEBUG_RC        (1<< 7)
-#define XVID_DEBUG_DEBUG     (1<<31)
-
-/* XVID_GBL_INIT param1 */
-typedef struct {
-	int version;
-	unsigned int cpu_flags; /* in:opt zero = autodetect cpu; XVID_CPU_FORCE|{cpu features} = force cpu features */
-	int debug;     /* in:opt debug level */
-} xvid_gbl_init_t;
-
-
-/* XVID_GBL_INFO param1 */
-typedef struct {
-	int version;
-	int actual_version; /* out returns the actual xvidcore version */
-	const char * build; /* out if !null, points to description of this xvid core build */
-	unsigned int cpu_flags;      /* out detected cpu features */
-	int num_threads;    /* out detected number of cpus/threads */
-} xvid_gbl_info_t;
-
-
-/* XVID_GBL_CONVERT param1 */
-typedef struct {
-	int version;
-	xvid_image_t input;  /* in input image & colorspace */
-	xvid_image_t output; /* in output image & colorspace */
-	int width;           /* in width */
-	int height;          /* in height */
-	int interlacing;     /* in interlacing */
-} xvid_gbl_convert_t;
-
-
-#define XVID_GBL_INIT    0 /* initialize xvidcore; must be called before using xvid_decore, or xvid_encore) */
-#define XVID_GBL_INFO    1 /* return some info about xvidcore, and the host computer */
-#define XVID_GBL_CONVERT 2 /* colorspace conversion utility */
-
-extern int xvid_global(void *handle, int opt, void *param1, void *param2);
-
-
-/*****************************************************************************
- * xvid_decore()
- ****************************************************************************/
-
-#define XVID_DEC_CREATE  0 /* create decore instance; return 0 on success */
-#define XVID_DEC_DESTROY 1 /* destroy decore instance: return 0 on success */
-#define XVID_DEC_DECODE  2 /* decode a frame: returns number of bytes consumed >= 0 */
-
-extern int xvid_decore(void *handle, int opt, void *param1, void *param2);
-
-/* XVID_DEC_CREATE param 1
-	image width & height may be specified here when the dimensions are
-	known in advance. */
-typedef struct {
-	int version;
-	int width;     /* in:opt image width */
-	int height;    /* in:opt image width */
-	void * handle; /* out	   decore context handle */
-} xvid_dec_create_t;
-
-
-/* XVID_DEC_DECODE param1 */
-/* general flags */
-#define XVID_LOWDELAY      (1<<0) /* lowdelay mode  */
-#define XVID_DISCONTINUITY (1<<1) /* indicates break in stream */
-#define XVID_DEBLOCKY      (1<<2) /* perform luma deblocking */
-#define XVID_DEBLOCKUV     (1<<3) /* perform chroma deblocking */
-#define XVID_FILMEFFECT    (1<<4) /* adds film grain */
-#define XVID_DERINGUV      (1<<5) /* perform chroma deringing, requires deblocking to work */
-#define XVID_DERINGY       (1<<6) /* perform luma deringing, requires deblocking to work */
-
-#define XVID_DEC_FAST      (1<<29) /* disable postprocessing to decrease cpu usage *todo* */
-#define XVID_DEC_DROP      (1<<30) /* drop bframes to decrease cpu usage *todo* */
-#define XVID_DEC_PREROLL   (1<<31) /* decode as fast as you can, don't even show output *todo* */
-
-typedef struct {
-	int version;
-	int general;         /* in:opt general flags */
-	void *bitstream;     /* in     bitstream (read from)*/
-	int length;          /* in     bitstream length */
-	xvid_image_t output; /* in     output image (written to) */
-/* ------- v1.1.x ------- */
-	int brightness;		 /* in	 brightness offset (0=none) */
-} xvid_dec_frame_t;
-
-
-/* XVID_DEC_DECODE param2 :: optional */
-typedef struct
-{
-	int version;
-
-	int type;                   /* out output data type */
-	union {
-		struct { /* type>0 {XVID_TYPE_IVOP,XVID_TYPE_PVOP,XVID_TYPE_BVOP,XVID_TYPE_SVOP} */
-			int general;        /* out flags */
-			int time_base;      /* out time base */
-			int time_increment; /* out time increment */
-
-			/* XXX: external deblocking stuff */
-			int * qscale;	    /* out pointer to quantizer table */
-			int qscale_stride;  /* out quantizer scale stride */
-
-		} vop;
-		struct {	/* XVID_TYPE_VOL */
-			int general;        /* out flags */
-			int width;          /* out width */
-			int height;         /* out height */
-			int par;            /* out pixel aspect ratio (refer to XVID_PAR_xxx above) */
-			int par_width;      /* out aspect ratio width  1..255 */
-			int par_height;     /* out aspect ratio height 1..255 */
-		} vol;
-	} data;
-} xvid_dec_stats_t;
-
-#define XVID_ZONE_QUANT  (1<<0)
-#define XVID_ZONE_WEIGHT (1<<1)
-
-typedef struct
-{
-	int frame;
-	int mode;
-	int increment;
-	int base;
-} xvid_enc_zone_t;
-
-
-/*----------------------------------------------------------------------------
- * xvid_enc_stats_t structure
- *
- * Used in:
- *  - xvid_plg_data_t structure
- *  - optional parameter in xvid_encore() function
- *
- * .coding_type = XVID_TYPE_NOTHING if the stats are not given
- *--------------------------------------------------------------------------*/
-
-typedef struct {
-	int version;
-
-	/* encoding parameters */
-	int type;      /* out coding type */
-	int quant;     /* out frame quantizer */
-	int vol_flags; /* out vol flags (see above) */
-	int vop_flags; /* out vop flags (see above) */
-
-	/* bitrate */
-	int length;    /* out frame length */
-
-	int hlength;   /* out header length (bytes) */
-	int kblks;     /* out number of blocks compressed as Intra */
-	int mblks;     /* out number of blocks compressed as Inter */
-	int ublks;     /* out number of blocks marked as not_coded */
-
-	int sse_y;     /* out Y plane's sse */
-	int sse_u;     /* out U plane's sse */
-	int sse_v;     /* out V plane's sse */
-} xvid_enc_stats_t;
-
-/*****************************************************************************
-  xvid plugin system -- internals
-
-  xvidcore will call XVID_PLG_INFO and XVID_PLG_CREATE during XVID_ENC_CREATE
-  before encoding each frame xvidcore will call XVID_PLG_BEFORE
-  after encoding each frame xvidcore will call XVID_PLG_AFTER
-  xvidcore will call XVID_PLG_DESTROY during XVID_ENC_DESTROY
- ****************************************************************************/
-
-
-#define XVID_PLG_CREATE  (1<<0)
-#define XVID_PLG_DESTROY (1<<1)
-#define XVID_PLG_INFO    (1<<2)
-#define XVID_PLG_BEFORE  (1<<3)
-#define XVID_PLG_FRAME   (1<<4)
-#define XVID_PLG_AFTER   (1<<5)
-
-/* xvid_plg_info_t.flags */
-#define XVID_REQORIGINAL (1<<0) /* plugin requires a copy of the original (uncompressed) image */
-#define XVID_REQPSNR     (1<<1) /* plugin requires psnr between the uncompressed and compressed image*/
-#define XVID_REQDQUANTS  (1<<2) /* plugin requires access to the dquant table */
-
-
-typedef struct
-{
-	int version;
-	int flags;   /* in:opt plugin flags */
-} xvid_plg_info_t;
-
-
-typedef struct
-{
-	int version;
-
-	int num_zones;           /* out */
-	xvid_enc_zone_t * zones; /* out */
-
-	int width;               /* out */
-	int height;              /* out */
-	int mb_width;            /* out */
-	int mb_height;           /* out */
-	int fincr;               /* out */
-	int fbase;               /* out */
-
-	void * param;            /* out */
-} xvid_plg_create_t;
-
-
-typedef struct
-{
-	int version;
-
-	int num_frames; /* out total frame encoded */
-} xvid_plg_destroy_t;
-
-typedef struct
-{
-	int version;
-
-	xvid_enc_zone_t * zone; /* out current zone */
-
-	int width;              /* out */
-	int height;             /* out */
-	int mb_width;           /* out */
-	int mb_height;          /* out */
-	int fincr;              /* out */
-	int fbase;              /* out */
-
-	int min_quant3;       /* out */
-	int max_quant3;       /* out */
-
-	xvid_image_t reference; /* out -> out */
-	xvid_image_t current;   /* out -> in,out */
-	xvid_image_t original;  /* out after: points the original (uncompressed) copy of the current frame */
-	int frame_num;          /* out frame number */
-
-	int type;               /* in,out */
-	int quant;              /* in,out */
-
-	int * dquant;           /* in,out	pointer to diff quantizer table */
-	int dquant_stride;      /* in,out	diff quantizer stride */
-
-	int vop_flags;          /* in,out */
-	int vol_flags;          /* in,out */
-	int motion_flags;       /* in,out */
-
-/* Deprecated, use the stats field instead.
- * Will disapear before 1.0 */
-	int length;             /* out after: length of encoded frame */
-	int kblks;              /* out number of blocks compressed as Intra */
-	int mblks;              /* out number of blocks compressed as Inter */
-	int ublks;              /* out number of blocks marked not_coded */
-	int sse_y;              /* out Y plane's sse */
-	int sse_u;              /* out U plane's sse */
-	int sse_v;              /* out V plane's sse */
-/* End of duplicated data, kept only for binary compatibility */
-
-	int bquant_ratio;       /* in */
-	int bquant_offset;      /* in */
-
-	xvid_enc_stats_t stats; /* out frame statistics */
-} xvid_plg_data_t;
-
-/*****************************************************************************
-  xvid plugin system -- external
-
-  the application passes xvid an array of "xvid_plugin_t" at XVID_ENC_CREATE. the array
-  indicates the plugin function pointer and plugin-specific data.
-  xvidcore handles the rest. example:
-
-  xvid_enc_create_t create;
-  xvid_enc_plugin_t plugins2;
-
-  plugins0.func = xvid_psnr_func;
-  plugins0.param = NULL;
-  plugins1.func = xvid_cbr_func;
-  plugins1.param = &cbr_data;
-
-  create.num_plugins = 2;
-  create.plugins = plugins;
-
- ****************************************************************************/
-
-typedef int (xvid_plugin_func)(void * handle, int opt, void * param1, void * param2);
-
-typedef struct
-{
-	xvid_plugin_func * func;
-	void * param;
-} xvid_enc_plugin_t;
-
-
-extern xvid_plugin_func xvid_plugin_single;   /* single-pass rate control */
-extern xvid_plugin_func xvid_plugin_2pass1;   /* two-pass rate control: first pass */
-extern xvid_plugin_func xvid_plugin_2pass2;   /* two-pass rate control: second pass */
-
-extern xvid_plugin_func xvid_plugin_lumimasking;  /* lumimasking */
-
-extern xvid_plugin_func xvid_plugin_psnr;	/* write psnr values to stdout */
-extern xvid_plugin_func xvid_plugin_dump;	/* dump before and after yuvpgms */
-
-
-/* single pass rate control
- * CBR and Constant quantizer modes */
-typedef struct
-{
-	int version;
-
-	int bitrate;               /* in bits per second */
-	int reaction_delay_factor; /* in */
-	int averaging_period;      /* in */
-	int buffer;                /* in */
-} xvid_plugin_single_t;
-
-
-typedef struct {
-	int version;
-
-	char * filename;
-} xvid_plugin_2pass1_t;
-
-
-#define XVID_PAYBACK_BIAS 0 /* payback with bias */
-#define XVID_PAYBACK_PROP 1 /* payback proportionally */
-
-typedef struct {
-	int version;
-
-	int bitrate;                  /* in target bitrate (bits per second) */
-	char * filename;              /* in first pass stats filename */
-
-	int keyframe_boost;           /* in keyframe boost percentage: 0..100 */
-	int curve_compression_high;   /* in percentage of compression performed on the high part of the curve (above average) */
-	int curve_compression_low;    /* in percentage of compression performed on the low  part of the curve (below average) */
-	int overflow_control_strength;/* in Payback delay expressed in number of frames */
-	int max_overflow_improvement; /* in percentage of allowed range for a frame that gets bigger because of overflow bonus */
-	int max_overflow_degradation; /* in percentage of allowed range for a frame that gets smaller because of overflow penalty */
-
-	int kfreduction;              /* in maximum bitrate reduction applied to an iframe under the kfthreshold distance limit */
-	int kfthreshold;              /* in if an iframe is closer to the next iframe than this distance, a quantity of bits
-								   *      is substracted from its bit allocation. The reduction is computed as multiples of
-								   *      kfreduction/kthreshold. It reaches kfreduction when the distance == kfthreshold,
-								   *      0 for 1<distance<kfthreshold */
-
-	int container_frame_overhead; /* in How many bytes the controller has to compensate per frame due to container format overhead */
-
-/* ------- v1.1.x ------- */
-	int vbv_size;                 /* in buffer size (bits) */
-	int vbv_initial;              /* in initial buffer occupancy (bits) */
-	int vbv_maxrate;              /* in max processing bitrate (bits per second) */
-	int vbv_peakrate;             /* in:opt max average bitrate over 3 seconds (bits per second) */
-
-}xvid_plugin_2pass2_t;
-
-/*****************************************************************************
- *                             ENCODER API
- ****************************************************************************/
-
-/*----------------------------------------------------------------------------
- * Encoder operations
- *--------------------------------------------------------------------------*/
-
-#define XVID_ENC_CREATE  0 /* create encoder instance; returns 0 on success */
-#define XVID_ENC_DESTROY 1 /* destroy encoder instance; returns 0 on success */
-#define XVID_ENC_ENCODE  2 /* encode a frame: returns number of ouput bytes
-                            * 0 means this frame should not be written (ie. encoder lag) */
-
-
-/*----------------------------------------------------------------------------
- * Encoder entry point
- *--------------------------------------------------------------------------*/
-
-extern int xvid_encore(void *handle, int opt, void *param1, void *param2);
-
-/* Quick API reference
- *
- * XVID_ENC_CREATE operation
- *  - handle: ignored
- *  - opt: XVID_ENC_CREATE
- *  - param1: address of a xvid_enc_create_t structure
- *  - param2: ignored
- *
- * XVID_ENC_ENCODE operation
- *  - handle: an instance returned by a CREATE op
- *  - opt: XVID_ENC_ENCODE
- *  - param1: address of a xvid_enc_frame_t structure
- *  - param2: address of a xvid_enc_stats_t structure (optional)
- *            its return value is asynchronous to what is written to the buffer
- *            depending on the delay introduced by bvop use. It's display
- *            ordered.
- *
- * XVID_ENC_DESTROY operation
- *  - handle: an instance returned by a CREATE op
- *  - opt: XVID_ENC_DESTROY
- *  - param1: ignored
- *  - param2: ignored
- */
-
-
-/*----------------------------------------------------------------------------
- * "Global" flags
- *
- * These flags are used for xvid_enc_create_t->global field during instance
- * creation (operation XVID_ENC_CREATE)
- *--------------------------------------------------------------------------*/
-
-#define XVID_GLOBAL_PACKED            (1<<0) /* packed bitstream */
-#define XVID_GLOBAL_CLOSED_GOP        (1<<1) /* closed_gop:	was DX50BVOP dx50 bvop compatibility */
-#define XVID_GLOBAL_EXTRASTATS_ENABLE (1<<2)
-#if 0
-#define XVID_GLOBAL_VOL_AT_IVOP       (1<<3) /* write vol at every ivop: WIN32/divx compatibility */
-#define XVID_GLOBAL_FORCE_VOL         (1<<4) /* when vol-based parameters are changed, insert an ivop NOT recommended */
-#endif
-#define XVID_GLOBAL_DIVX5_USERDATA    (1<<5) /* write divx5 userdata string 
-                                                this is implied if XVID_GLOBAL_PACKED is set */
-
-/*----------------------------------------------------------------------------
- * "VOL" flags
- *
- * These flags are used for xvid_enc_frame_t->vol_flags field during frame
- * encoding (operation XVID_ENC_ENCODE)
- *--------------------------------------------------------------------------*/
-
-#define XVID_VOL_MPEGQUANT      (1<<0) /* enable MPEG type quantization */
-#define XVID_VOL_EXTRASTATS     (1<<1) /* enable plane sse stats */
-#define XVID_VOL_QUARTERPEL     (1<<2) /* enable quarterpel: frames will encoded as quarterpel */
-#define XVID_VOL_GMC            (1<<3) /* enable GMC; frames will be checked for gmc suitability */
-#define XVID_VOL_REDUCED_ENABLE (1<<4) /* enable reduced resolution vops: frames will be checked for rrv suitability */
-									   /* NOTE:  the reduced resolution feature is not supported anymore. This flag will have no effect! */
-#define XVID_VOL_INTERLACING    (1<<5) /* enable interlaced encoding */
-
-
-/*----------------------------------------------------------------------------
- * "VOP" flags
- *
- * These flags are used for xvid_enc_frame_t->vop_flags field during frame
- * encoding (operation XVID_ENC_ENCODE)
- *--------------------------------------------------------------------------*/
-
-/* Always valid */
-#define XVID_VOP_DEBUG                (1<< 0) /* print debug messages in frames */
-#define XVID_VOP_HALFPEL              (1<< 1) /* use halfpel interpolation */
-#define XVID_VOP_INTER4V              (1<< 2) /* use 4 motion vectors per MB */
-#define XVID_VOP_TRELLISQUANT         (1<< 3) /* use trellis based R-D "optimal" quantization */
-#define XVID_VOP_CHROMAOPT            (1<< 4) /* enable chroma optimization pre-filter */
-#define XVID_VOP_CARTOON              (1<< 5) /* use 'cartoon mode' */
-#define XVID_VOP_GREYSCALE            (1<< 6) /* enable greyscale only mode (even for  color input material chroma is ignored) */
-#define XVID_VOP_HQACPRED             (1<< 7) /* high quality ac prediction */
-#define XVID_VOP_MODEDECISION_RD      (1<< 8) /* enable DCT-ME and use it for mode decision */
-#define XVID_VOP_FAST_MODEDECISION_RD (1<<12) /* use simplified R-D mode decision */
-#define XVID_VOP_RD_BVOP              (1<<13) /* enable rate-distortion mode decision in b-frames */
-
-/* Only valid for vol_flags|=XVID_VOL_INTERLACING */
-#define XVID_VOP_TOPFIELDFIRST        (1<< 9) /* set top-field-first flag  */
-#define XVID_VOP_ALTERNATESCAN        (1<<10) /* set alternate vertical scan flag */
-
-/* only valid for vol_flags|=XVID_VOL_REDUCED_ENABLED */
-#define XVID_VOP_REDUCED              (1<<11) /* reduced resolution vop */
-											  /* NOTE: reduced resolution feature is not supported anymore. This flag will have no effect! */
-
-/*----------------------------------------------------------------------------
- * "Motion" flags
- *
- * These flags are used for xvid_enc_frame_t->motion field during frame
- * encoding (operation XVID_ENC_ENCODE)
- *--------------------------------------------------------------------------*/
-
-/* Motion Estimation Search Patterns */
-#define XVID_ME_ADVANCEDDIAMOND16     (1<< 0) /* use advdiamonds instead of diamonds as search pattern */
-#define XVID_ME_ADVANCEDDIAMOND8      (1<< 1) /* use advdiamond for XVID_ME_EXTSEARCH8 */
-#define XVID_ME_USESQUARES16          (1<< 2) /* use squares instead of diamonds as search pattern */
-#define XVID_ME_USESQUARES8           (1<< 3) /* use square for XVID_ME_EXTSEARCH8 */
-
-/* SAD operator based flags */
-#define XVID_ME_HALFPELREFINE16       (1<< 4)
-#define XVID_ME_HALFPELREFINE8        (1<< 6)
-#define XVID_ME_QUARTERPELREFINE16    (1<< 7)
-#define XVID_ME_QUARTERPELREFINE8     (1<< 8)
-#define XVID_ME_GME_REFINE            (1<< 9)
-#define XVID_ME_EXTSEARCH16           (1<<10) /* extend PMV by more searches */
-#define XVID_ME_EXTSEARCH8            (1<<11) /* use diamond/square for extended 8x8 search */
-#define XVID_ME_CHROMA_PVOP           (1<<12) /* also use chroma for P_VOP/S_VOP ME */
-#define XVID_ME_CHROMA_BVOP           (1<<13) /* also use chroma for B_VOP ME */
-#define XVID_ME_FASTREFINE16          (1<<25) /* use low-complexity refinement functions */
-#define XVID_ME_FASTREFINE8           (1<<29) /* low-complexity 8x8 sub-block refinement */
-
-/* Rate Distortion based flags
- * Valid when XVID_VOP_MODEDECISION_RD is enabled */
-#define XVID_ME_HALFPELREFINE16_RD    (1<<14) /* perform RD-based halfpel refinement */
-#define XVID_ME_HALFPELREFINE8_RD     (1<<15) /* perform RD-based halfpel refinement for 8x8 mode */
-#define XVID_ME_QUARTERPELREFINE16_RD (1<<16) /* perform RD-based qpel refinement */
-#define XVID_ME_QUARTERPELREFINE8_RD  (1<<17) /* perform RD-based qpel refinement for 8x8 mode */
-#define XVID_ME_EXTSEARCH_RD          (1<<18) /* perform RD-based search using square pattern enable XVID_ME_EXTSEARCH8 to do this in 8x8 search as well */
-#define XVID_ME_CHECKPREDICTION_RD    (1<<19) /* always check vector equal to prediction */
-
-/* Other */
-#define XVID_ME_DETECT_STATIC_MOTION  (1<<24) /* speed-up ME by detecting stationary scenes */
-#define XVID_ME_SKIP_DELTASEARCH      (1<<26) /* speed-up by skipping b-frame delta search */
-#define XVID_ME_FAST_MODEINTERPOLATE  (1<<27) /* speed-up by partly skipping interpolate mode */
-#define XVID_ME_BFRAME_EARLYSTOP      (1<<28) /* speed-up by early exiting b-search */
-
-/* Unused */
-#define XVID_ME_UNRESTRICTED16        (1<<20) /* unrestricted ME, not implemented */
-#define XVID_ME_OVERLAPPING16         (1<<21) /* overlapping ME, not implemented */
-#define XVID_ME_UNRESTRICTED8         (1<<22) /* unrestricted ME, not implemented */
-#define XVID_ME_OVERLAPPING8          (1<<23) /* overlapping ME, not implemented */
-
-
-/*----------------------------------------------------------------------------
- * xvid_enc_create_t structure definition
- *
- * This structure is passed as param1 during an instance creation (operation
- * XVID_ENC_CREATE)
- *--------------------------------------------------------------------------*/
-
-typedef struct {
-	int version;
-
-	int profile;                 /* in profile@level; refer to XVID_PROFILE_xxx */
-	int width;                   /* in frame dimensions; width, pixel units */
-	int height;                  /* in frame dimensions; height, pixel units */
-
-	int num_zones;               /* in:opt number of bitrate zones */
-	xvid_enc_zone_t * zones;     /*          ^^ zone array */
-
-	int num_plugins;             /* in:opt number of plugins */
-	xvid_enc_plugin_t * plugins; /*          ^^ plugin array */
-
-	int num_threads;             /* in:opt number of threads */
-	int max_bframes;             /* in:opt max sequential bframes (0=disable bframes) */
-
-	int global;                  /* in:opt global flags; controls encoding behavior */
-
-	/* --- vol-based stuff; included here for convenience */
-	int fincr;                   /* in:opt framerate increment; set to zero for variable framerate */
-	int fbase;                   /* in framerate base frame_duration = fincr/fbase seconds*/
-    /* ---------------------------------------------- */
-
-	/* --- vop-based; included here for convenience */
-	int max_key_interval;        /* in:opt the maximum interval between key frames */
-
-	int frame_drop_ratio;        /* in:opt frame dropping: 0=drop none... 100=drop all */
-
-	int bquant_ratio;            /* in:opt bframe quantizer multipier/offeset; used to decide bframes quant when bquant==-1 */
-	int bquant_offset;           /* bquant = (avg(past_ref_quant,future_ref_quant)*bquant_ratio + bquant_offset) / 100 */
-
-	int min_quant3;            /* in:opt */
-	int max_quant3;            /* in:opt */
-	/* ---------------------------------------------- */
-
-	void *handle;                /* out encoder instance handle */
-} xvid_enc_create_t;
-
-
-/*----------------------------------------------------------------------------
- * xvid_enc_frame_t structure definition
- *
- * This structure is passed as param1 during a frame encoding (operation
- * XVID_ENC_ENCODE)
- *--------------------------------------------------------------------------*/
-
-/* out value for the frame structure->type field
- * unlike stats output in param2, this field is not asynchronous and tells
- * the client app, if the frame written into the stream buffer is an ivop
- * usually used for indexing purpose in the container */
-#define XVID_KEYFRAME (1<<1)
-
-/* The structure */
-typedef struct {
-	int version;
-
-	/* VOL related stuff
-	 * unless XVID_FORCEVOL is set, the encoder will not react to any changes
-	 * here until the next VOL (keyframe). */
-
-	int vol_flags;                     /* in vol flags */
-	unsigned char *quant_intra_matrix; /* in:opt custom intra qmatrix */
-	unsigned char *quant_inter_matrix; /* in:opt custom inter qmatrix */
-
-	int par;                           /* in:opt pixel aspect ratio (refer to XVID_PAR_xxx above) */
-	int par_width;                     /* in:opt aspect ratio width */
-	int par_height;                    /* in:opt aspect ratio height */
-
-	/* Other fields that can change on a frame base */
-
-	int fincr;                         /* in:opt framerate increment, for variable framerate only */
-	int vop_flags;                     /* in (general)vop-based flags */
-	int motion;                        /* in ME options */
-
-	xvid_image_t input;                /* in input image (read from) */
-
-	int type;                          /* in:opt coding type */
-	int quant;                         /* in frame quantizer; if <=0, automatic (ratecontrol) */
-	int bframe_threshold;
-
-	void *bitstream;                   /* in:opt bitstream ptr (written to)*/
-	int length;                        /* in:opt bitstream length (bytes) */
-
-	int out_flags;                     /* out bitstream output flags */
-} xvid_enc_frame_t;
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif

gpac-2.2.1.tar.gz/extra_lib/include/zlib Deleted

gpac-2.2.1.tar.gz/extra_lib/include/zlib/zconf.h Deleted

@@ -1,332 +0,0 @@
-/* zconf.h -- configuration of the zlib compression library
- * Copyright (C) 1995-2005 Jean-loup Gailly.
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-/* @(#) $Id: zconf.h,v 1.2 2008-12-02 18:04:43 jeanlf Exp $ */
-
-#ifndef ZCONF_H
-#define ZCONF_H
-
-/*
- * If you *really* need a unique prefix for all types and library functions,
- * compile with -DZ_PREFIX. The "standard" zlib should be compiled without it.
- */
-#ifdef Z_PREFIX
-#  define deflateInit_          z_deflateInit_
-#  define deflate               z_deflate
-#  define deflateEnd            z_deflateEnd
-#  define inflateInit_          z_inflateInit_
-#  define inflate               z_inflate
-#  define inflateEnd            z_inflateEnd
-#  define deflateInit2_         z_deflateInit2_
-#  define deflateSetDictionary  z_deflateSetDictionary
-#  define deflateCopy           z_deflateCopy
-#  define deflateReset          z_deflateReset
-#  define deflateParams         z_deflateParams
-#  define deflateBound          z_deflateBound
-#  define deflatePrime          z_deflatePrime
-#  define inflateInit2_         z_inflateInit2_
-#  define inflateSetDictionary  z_inflateSetDictionary
-#  define inflateSync           z_inflateSync
-#  define inflateSyncPoint      z_inflateSyncPoint
-#  define inflateCopy           z_inflateCopy
-#  define inflateReset          z_inflateReset
-#  define inflateBack           z_inflateBack
-#  define inflateBackEnd        z_inflateBackEnd
-#  define compress              z_compress
-#  define compress2             z_compress2
-#  define compressBound         z_compressBound
-#  define uncompress            z_uncompress
-#  define adler32               z_adler32
-#  define crc32                 z_crc32
-#  define get_crc_table         z_get_crc_table
-#  define zError                z_zError
-
-#  define alloc_func            z_alloc_func
-#  define free_func             z_free_func
-#  define in_func               z_in_func
-#  define out_func              z_out_func
-#  define Byte                  z_Byte
-#  define uInt                  z_uInt
-#  define uLong                 z_uLong
-#  define Bytef                 z_Bytef
-#  define charf                 z_charf
-#  define intf                  z_intf
-#  define uIntf                 z_uIntf
-#  define uLongf                z_uLongf
-#  define voidpf                z_voidpf
-#  define voidp                 z_voidp
-#endif
-
-#if defined(__MSDOS__) && !defined(MSDOS)
-#  define MSDOS
-#endif
-#if (defined(OS_2) || defined(__OS2__)) && !defined(OS2)
-#  define OS2
-#endif
-#if defined(_WINDOWS) && !defined(WINDOWS)
-#  define WINDOWS
-#endif
-#if defined(_WIN32) || defined(_WIN32_WCE) || defined(__WIN32__)
-#  ifndef WIN32
-#    define WIN32
-#  endif
-#endif
-#if (defined(MSDOS) || defined(OS2) || defined(WINDOWS)) && !defined(WIN32)
-#  if !defined(__GNUC__) && !defined(__FLAT__) && !defined(__386__)
-#    ifndef SYS16BIT
-#      define SYS16BIT
-#    endif
-#  endif
-#endif
-
-/*
- * Compile with -DMAXSEG_64K if the alloc function cannot allocate more
- * than 64k bytes at a time (needed on systems with 16-bit int).
- */
-#ifdef SYS16BIT
-#  define MAXSEG_64K
-#endif
-#ifdef MSDOS
-#  define UNALIGNED_OK
-#endif
-
-#ifdef __STDC_VERSION__
-#  ifndef STDC
-#    define STDC
-#  endif
-#  if __STDC_VERSION__ >= 199901L
-#    ifndef STDC99
-#      define STDC99
-#    endif
-#  endif
-#endif
-#if !defined(STDC) && (defined(__STDC__) || defined(__cplusplus))
-#  define STDC
-#endif
-#if !defined(STDC) && (defined(__GNUC__) || defined(__BORLANDC__))
-#  define STDC
-#endif
-#if !defined(STDC) && (defined(MSDOS) || defined(WINDOWS) || defined(WIN32))
-#  define STDC
-#endif
-#if !defined(STDC) && (defined(OS2) || defined(__HOS_AIX__))
-#  define STDC
-#endif
-
-#if defined(__OS400__) && !defined(STDC)    /* iSeries (formerly AS/400). */
-#  define STDC
-#endif
-
-#ifndef STDC
-#  ifndef const /* cannot use !defined(STDC) && !defined(const) on Mac */
-#    define const       /* note: need a more gentle solution here */
-#  endif
-#endif
-
-/* Some Mac compilers merge all .h files incorrectly: */
-#if defined(__MWERKS__)||defined(applec)||defined(THINK_C)||defined(__SC__)
-#  define NO_DUMMY_DECL
-#endif
-
-/* Maximum value for memLevel in deflateInit2 */
-#ifndef MAX_MEM_LEVEL
-#  ifdef MAXSEG_64K
-#    define MAX_MEM_LEVEL 8
-#  else
-#    define MAX_MEM_LEVEL 9
-#  endif
-#endif
-
-/* Maximum value for windowBits in deflateInit2 and inflateInit2.
- * WARNING: reducing MAX_WBITS makes minigzip unable to extract .gz files
- * created by gzip. (Files created by minigzip can still be extracted by
- * gzip.)
- */
-#ifndef MAX_WBITS
-#  define MAX_WBITS   15 /* 32K LZ77 window */
-#endif
-
-/* The memory requirements for deflate are (in bytes):
-            (1 << (windowBits+2)) +  (1 << (memLevel+9))
- that is: 128K for windowBits=15  +  128K for memLevel = 8  (default values)
- plus a few kilobytes for small objects. For example, if you want to reduce
- the default memory requirements from 256K to 128K, compile with
-     make CFLAGS="-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7"
- Of course this will generally degrade compression (there's no free lunch).
-
-   The memory requirements for inflate are (in bytes) 1 << windowBits
- that is, 32K for windowBits=15 (default value) plus a few kilobytes
- for small objects.
-*/
-
-                        /* Type declarations */
-
-#ifndef OF /* function prototypes */
-#  ifdef STDC
-#    define OF(args)  args
-#  else
-#    define OF(args)  ()
-#  endif
-#endif
-
-/* The following definitions for FAR are needed only for MSDOS mixed
- * model programming (small or medium model with some far allocations).
- * This was tested only with MSC; for other MSDOS compilers you may have
- * to define NO_MEMCPY in zutil.h.  If you don't need the mixed model,
- * just define FAR to be empty.
- */
-#ifdef SYS16BIT
-#  if defined(M_I86SM) || defined(M_I86MM)
-     /* MSC small or medium model */
-#    define SMALL_MEDIUM
-#    ifdef _MSC_VER
-#      define FAR _far
-#    else
-#      define FAR far
-#    endif
-#  endif
-#  if (defined(__SMALL__) || defined(__MEDIUM__))
-     /* Turbo C small or medium model */
-#    define SMALL_MEDIUM
-#    ifdef __BORLANDC__
-#      define FAR _far
-#    else
-#      define FAR far
-#    endif
-#  endif
-#endif
-
-#if defined(WINDOWS) || defined(WIN32)
-   /* If building or using zlib as a DLL, define ZLIB_DLL.
-    * This is not mandatory, but it offers a little performance increase.
-    */
-#  ifdef ZLIB_DLL
-#    if defined(WIN32) && (!defined(__BORLANDC__) || (__BORLANDC__ >= 0x500))
-#      ifdef ZLIB_INTERNAL
-#        define ZEXTERN extern __declspec(dllexport)
-#      else
-#        define ZEXTERN extern __declspec(dllimport)
-#      endif
-#    endif
-#  endif  /* ZLIB_DLL */
-   /* If building or using zlib with the WINAPI/WINAPIV calling convention,
-    * define ZLIB_WINAPI.
-    * Caution: the standard ZLIB1.DLL is NOT compiled using ZLIB_WINAPI.
-    */
-#  ifdef ZLIB_WINAPI
-#    ifdef FAR
-#      undef FAR
-#    endif
-#    include <windows.h>
-     /* No need for _export, use ZLIB.DEF instead. */
-     /* For complete Windows compatibility, use WINAPI, not __stdcall. */
-#    define ZEXPORT WINAPI
-#    ifdef WIN32
-#      define ZEXPORTVA WINAPIV
-#    else
-#      define ZEXPORTVA FAR CDECL
-#    endif
-#  endif
-#endif
-
-#if defined (__BEOS__)
-#  ifdef ZLIB_DLL
-#    ifdef ZLIB_INTERNAL
-#      define ZEXPORT   __declspec(dllexport)
-#      define ZEXPORTVA __declspec(dllexport)
-#    else
-#      define ZEXPORT   __declspec(dllimport)
-#      define ZEXPORTVA __declspec(dllimport)
-#    endif
-#  endif
-#endif
-
-#ifndef ZEXTERN
-#  define ZEXTERN extern
-#endif
-#ifndef ZEXPORT
-#  define ZEXPORT
-#endif
-#ifndef ZEXPORTVA
-#  define ZEXPORTVA
-#endif
-
-#ifndef FAR
-#  define FAR
-#endif
-
-#if !defined(__MACTYPES__)
-typedef unsigned char  Byte;  /* 8 bits */
-#endif
-typedef unsigned int   uInt;  /* 16 bits or more */
-typedef unsigned long  uLong; /* 32 bits or more */
-
-#ifdef SMALL_MEDIUM
-   /* Borland C/C++ and some old MSC versions ignore FAR inside typedef */
-#  define Bytef Byte FAR
-#else
-   typedef Byte  FAR Bytef;
-#endif
-typedef char  FAR charf;
-typedef int   FAR intf;
-typedef uInt  FAR uIntf;
-typedef uLong FAR uLongf;
-
-#ifdef STDC
-   typedef void const *voidpc;
-   typedef void FAR   *voidpf;
-   typedef void       *voidp;
-#else
-   typedef Byte const *voidpc;
-   typedef Byte FAR   *voidpf;
-   typedef Byte       *voidp;
-#endif
-
-#if 0           /* HAVE_UNISTD_H -- this line is updated by ./configure */
-#  include <sys/types.h> /* for off_t */
-#  include <unistd.h>    /* for SEEK_* and off_t */
-#  ifdef VMS
-#    include <unixio.h>   /* for off_t */
-#  endif
-#  define z_off_t off_t
-#endif
-#ifndef SEEK_SET
-#  define SEEK_SET        0       /* Seek from beginning of file.  */
-#  define SEEK_CUR        1       /* Seek from current position.  */
-#  define SEEK_END        2       /* Set file pointer to EOF plus "offset" */
-#endif
-#ifndef z_off_t
-#  define z_off_t long
-#endif
-
-#if defined(__OS400__)
-#  define NO_vsnprintf
-#endif
-
-#if defined(__MVS__)
-#  define NO_vsnprintf
-#  ifdef FAR
-#    undef FAR
-#  endif
-#endif
-
-/* MVS linker does not support external names larger than 8 bytes */
-#if defined(__MVS__)
-#   pragma map(deflateInit_,"DEIN")
-#   pragma map(deflateInit2_,"DEIN2")
-#   pragma map(deflateEnd,"DEEND")
-#   pragma map(deflateBound,"DEBND")
-#   pragma map(inflateInit_,"ININ")
-#   pragma map(inflateInit2_,"ININ2")
-#   pragma map(inflateEnd,"INEND")
-#   pragma map(inflateSync,"INSY")
-#   pragma map(inflateSetDictionary,"INSEDI")
-#   pragma map(compressBound,"CMBND")
-#   pragma map(inflate_table,"INTABL")
-#   pragma map(inflate_fast,"INFA")
-#   pragma map(inflate_copyright,"INCOPY")
-#endif
-
-#endif /* ZCONF_H */

gpac-2.2.1.tar.gz/extra_lib/include/zlib/zlib.h Deleted

@@ -1,1357 +0,0 @@
-/* zlib.h -- interface of the 'zlib' general purpose compression library
-  version 1.2.3, July 18th, 2005
-
-  Copyright (C) 1995-2005 Jean-loup Gailly and Mark Adler
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-  Jean-loup Gailly        Mark Adler
-  jloup@gzip.org          madler@alumni.caltech.edu
-
-
-  The data format used by the zlib library is described by RFCs (Request for
-  Comments) 1950 to 1952 in the files http://www.ietf.org/rfc/rfc1950.txt
-  (zlib format), rfc1951.txt (deflate format) and rfc1952.txt (gzip format).
-*/
-
-#ifndef ZLIB_H
-#define ZLIB_H
-
-#include "zconf.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define ZLIB_VERSION "1.2.3"
-#define ZLIB_VERNUM 0x1230
-
-/*
-     The 'zlib' compression library provides in-memory compression and
-  decompression functions, including integrity checks of the uncompressed
-  data.  This version of the library supports only one compression method
-  (deflation) but other algorithms will be added later and will have the same
-  stream interface.
-
-     Compression can be done in a single step if the buffers are large
-  enough (for example if an input file is mmap'ed), or can be done by
-  repeated calls of the compression function.  In the latter case, the
-  application must provide more input and/or consume the output
-  (providing more output space) before each call.
-
-     The compressed data format used by default by the in-memory functions is
-  the zlib format, which is a zlib wrapper documented in RFC 1950, wrapped
-  around a deflate stream, which is itself documented in RFC 1951.
-
-     The library also supports reading and writing files in gzip (.gz) format
-  with an interface similar to that of stdio using the functions that start
-  with "gz".  The gzip format is different from the zlib format.  gzip is a
-  gzip wrapper, documented in RFC 1952, wrapped around a deflate stream.
-
-     This library can optionally read and write gzip streams in memory as well.
-
-     The zlib format was designed to be compact and fast for use in memory
-  and on communications channels.  The gzip format was designed for single-
-  file compression on file systems, has a larger header than zlib to maintain
-  directory information, and uses a different, slower check method than zlib.
-
-     The library does not install any signal handler. The decoder checks
-  the consistency of the compressed data, so the library should never
-  crash even in case of corrupted input.
-*/
-
-typedef voidpf (*alloc_func) OF((voidpf opaque, uInt items, uInt size));
-typedef void   (*free_func)  OF((voidpf opaque, voidpf address));
-
-struct internal_state;
-
-typedef struct z_stream_s {
-    Bytef    *next_in;  /* next input byte */
-    uInt     avail_in;  /* number of bytes available at next_in */
-    uLong    total_in;  /* total nb of input bytes read so far */
-
-    Bytef    *next_out; /* next output byte should be put there */
-    uInt     avail_out; /* remaining free space at next_out */
-    uLong    total_out; /* total nb of bytes output so far */
-
-    char     *msg;      /* last error message, NULL if no error */
-    struct internal_state FAR *state; /* not visible by applications */
-
-    alloc_func zalloc;  /* used to allocate the internal state */
-    free_func  zfree;   /* used to free the internal state */
-    voidpf     opaque;  /* private data object passed to zalloc and zfree */
-
-    int     data_type;  /* best guess about the data type: binary or text */
-    uLong   adler;      /* adler32 value of the uncompressed data */
-    uLong   reserved;   /* reserved for future use */
-} z_stream;
-
-typedef z_stream FAR *z_streamp;
-
-/*
-     gzip header information passed to and from zlib routines.  See RFC 1952
-  for more details on the meanings of these fields.
-*/
-typedef struct gz_header_s {
-    int     text;       /* true if compressed data believed to be text */
-    uLong   time;       /* modification time */
-    int     xflags;     /* extra flags (not used when writing a gzip file) */
-    int     os;         /* operating system */
-    Bytef   *extra;     /* pointer to extra field or Z_NULL if none */
-    uInt    extra_len;  /* extra field length (valid if extra != Z_NULL) */
-    uInt    extra_max;  /* space at extra (only when reading header) */
-    Bytef   *name;      /* pointer to zero-terminated file name or Z_NULL */
-    uInt    name_max;   /* space at name (only when reading header) */
-    Bytef   *comment;   /* pointer to zero-terminated comment or Z_NULL */
-    uInt    comm_max;   /* space at comment (only when reading header) */
-    int     hcrc;       /* true if there was or will be a header crc */
-    int     done;       /* true when done reading gzip header (not used
-                           when writing a gzip file) */
-} gz_header;
-
-typedef gz_header FAR *gz_headerp;
-
-/*
-   The application must update next_in and avail_in when avail_in has
-   dropped to zero. It must update next_out and avail_out when avail_out
-   has dropped to zero. The application must initialize zalloc, zfree and
-   opaque before calling the init function. All other fields are set by the
-   compression library and must not be updated by the application.
-
-   The opaque value provided by the application will be passed as the first
-   parameter for calls of zalloc and zfree. This can be useful for custom
-   memory management. The compression library attaches no meaning to the
-   opaque value.
-
-   zalloc must return Z_NULL if there is not enough memory for the object.
-   If zlib is used in a multi-threaded application, zalloc and zfree must be
-   thread safe.
-
-   On 16-bit systems, the functions zalloc and zfree must be able to allocate
-   exactly 65536 bytes, but will not be required to allocate more than this
-   if the symbol MAXSEG_64K is defined (see zconf.h). WARNING: On MSDOS,
-   pointers returned by zalloc for objects of exactly 65536 bytes *must*
-   have their offset normalized to zero. The default allocation function
-   provided by this library ensures this (see zutil.c). To reduce memory
-   requirements and avoid any allocation of 64K objects, at the expense of
-   compression ratio, compile the library with -DMAX_WBITS=14 (see zconf.h).
-
-   The fields total_in and total_out can be used for statistics or
-   progress reports. After compression, total_in holds the total size of
-   the uncompressed data and may be saved for use in the decompressor
-   (particularly if the decompressor wants to decompress everything in
-   a single step).
-*/
-
-                        /* constants */
-
-#define Z_NO_FLUSH      0
-#define Z_PARTIAL_FLUSH 1 /* will be removed, use Z_SYNC_FLUSH instead */
-#define Z_SYNC_FLUSH    2
-#define Z_FULL_FLUSH    3
-#define Z_FINISH        4
-#define Z_BLOCK         5
-/* Allowed flush values; see deflate() and inflate() below for details */
-
-#define Z_OK            0
-#define Z_STREAM_END    1
-#define Z_NEED_DICT     2
-#define Z_ERRNO        (-1)
-#define Z_STREAM_ERROR (-2)
-#define Z_DATA_ERROR   (-3)
-#define Z_MEM_ERROR    (-4)
-#define Z_BUF_ERROR    (-5)
-#define Z_VERSION_ERROR (-6)
-/* Return codes for the compression/decompression functions. Negative
- * values are errors, positive values are used for special but normal events.
- */
-
-#define Z_NO_COMPRESSION         0
-#define Z_BEST_SPEED             1
-#define Z_BEST_COMPRESSION       9
-#define Z_DEFAULT_COMPRESSION  (-1)
-/* compression levels */
-
-#define Z_FILTERED            1
-#define Z_HUFFMAN_ONLY        2
-#define Z_RLE                 3
-#define Z_FIXED               4
-#define Z_DEFAULT_STRATEGY    0
-/* compression strategy; see deflateInit2() below for details */
-
-#define Z_BINARY   0
-#define Z_TEXT     1
-#define Z_ASCII    Z_TEXT   /* for compatibility with 1.2.2 and earlier */
-#define Z_UNKNOWN  2
-/* Possible values of the data_type field (though see inflate()) */
-
-#define Z_DEFLATED   8
-/* The deflate compression method (the only one supported in this version) */
-
-#define Z_NULL  0  /* for initializing zalloc, zfree, opaque */
-
-#define zlib_version zlibVersion()
-/* for compatibility with versions < 1.0.2 */
-
-                        /* basic functions */
-
-ZEXTERN const char * ZEXPORT zlibVersion OF((void));
-/* The application can compare zlibVersion and ZLIB_VERSION for consistency.
-   If the first character differs, the library code actually used is
-   not compatible with the zlib.h header file used by the application.
-   This check is automatically made by deflateInit and inflateInit.
- */
-
-/*
-ZEXTERN int ZEXPORT deflateInit OF((z_streamp strm, int level));
-
-     Initializes the internal stream state for compression. The fields
-   zalloc, zfree and opaque must be initialized before by the caller.
-   If zalloc and zfree are set to Z_NULL, deflateInit updates them to
-   use default allocation functions.
-
-     The compression level must be Z_DEFAULT_COMPRESSION, or between 0 and 9:
-   1 gives best speed, 9 gives best compression, 0 gives no compression at
-   all (the input data is simply copied a block at a time).
-   Z_DEFAULT_COMPRESSION requests a default compromise between speed and
-   compression (currently equivalent to level 6).
-
-     deflateInit returns Z_OK if success, Z_MEM_ERROR if there was not
-   enough memory, Z_STREAM_ERROR if level is not a valid compression level,
-   Z_VERSION_ERROR if the zlib library version (zlib_version) is incompatible
-   with the version assumed by the caller (ZLIB_VERSION).
-   msg is set to null if there is no error message.  deflateInit does not
-   perform any compression: this will be done by deflate().
-*/
-
-
-ZEXTERN int ZEXPORT deflate OF((z_streamp strm, int flush));
-/*
-    deflate compresses as much data as possible, and stops when the input
-  buffer becomes empty or the output buffer becomes full. It may introduce some
-  output latency (reading input without producing any output) except when
-  forced to flush.
-
-    The detailed semantics are as follows. deflate performs one or both of the
-  following actions:
-
-  - Compress more input starting at next_in and update next_in and avail_in
-    accordingly. If not all input can be processed (because there is not
-    enough room in the output buffer), next_in and avail_in are updated and
-    processing will resume at this point for the next call of deflate().
-
-  - Provide more output starting at next_out and update next_out and avail_out
-    accordingly. This action is forced if the parameter flush is non zero.
-    Forcing flush frequently degrades the compression ratio, so this parameter
-    should be set only when necessary (in interactive applications).
-    Some output may be provided even if flush is not set.
-
-  Before the call of deflate(), the application should ensure that at least
-  one of the actions is possible, by providing more input and/or consuming
-  more output, and updating avail_in or avail_out accordingly; avail_out
-  should never be zero before the call. The application can consume the
-  compressed output when it wants, for example when the output buffer is full
-  (avail_out == 0), or after each call of deflate(). If deflate returns Z_OK
-  and with zero avail_out, it must be called again after making room in the
-  output buffer because there might be more output pending.
-
-    Normally the parameter flush is set to Z_NO_FLUSH, which allows deflate to
-  decide how much data to accumualte before producing output, in order to
-  maximize compression.
-
-    If the parameter flush is set to Z_SYNC_FLUSH, all pending output is
-  flushed to the output buffer and the output is aligned on a byte boundary, so
-  that the decompressor can get all input data available so far. (In particular
-  avail_in is zero after the call if enough output space has been provided
-  before the call.)  Flushing may degrade compression for some compression
-  algorithms and so it should be used only when necessary.
-
-    If flush is set to Z_FULL_FLUSH, all output is flushed as with
-  Z_SYNC_FLUSH, and the compression state is reset so that decompression can
-  restart from this point if previous compressed data has been damaged or if
-  random access is desired. Using Z_FULL_FLUSH too often can seriously degrade
-  compression.
-
-    If deflate returns with avail_out == 0, this function must be called again
-  with the same value of the flush parameter and more output space (updated
-  avail_out), until the flush is complete (deflate returns with non-zero
-  avail_out). In the case of a Z_FULL_FLUSH or Z_SYNC_FLUSH, make sure that
-  avail_out is greater than six to avoid repeated flush markers due to
-  avail_out == 0 on return.
-
-    If the parameter flush is set to Z_FINISH, pending input is processed,
-  pending output is flushed and deflate returns with Z_STREAM_END if there
-  was enough output space; if deflate returns with Z_OK, this function must be
-  called again with Z_FINISH and more output space (updated avail_out) but no
-  more input data, until it returns with Z_STREAM_END or an error. After
-  deflate has returned Z_STREAM_END, the only possible operations on the
-  stream are deflateReset or deflateEnd.
-
-    Z_FINISH can be used immediately after deflateInit if all the compression
-  is to be done in a single step. In this case, avail_out must be at least
-  the value returned by deflateBound (see below). If deflate does not return
-  Z_STREAM_END, then it must be called again as described above.
-
-    deflate() sets strm->adler to the adler32 checksum of all input read
-  so far (that is, total_in bytes).
-
-    deflate() may update strm->data_type if it can make a good guess about
-  the input data type (Z_BINARY or Z_TEXT). In doubt, the data is considered
-  binary. This field is only for information purposes and does not affect
-  the compression algorithm in any manner.
-
-    deflate() returns Z_OK if some progress has been made (more input
-  processed or more output produced), Z_STREAM_END if all input has been
-  consumed and all output has been produced (only when flush is set to
-  Z_FINISH), Z_STREAM_ERROR if the stream state was inconsistent (for example
-  if next_in or next_out was NULL), Z_BUF_ERROR if no progress is possible
-  (for example avail_in or avail_out was zero). Note that Z_BUF_ERROR is not
-  fatal, and deflate() can be called again with more input and more output
-  space to continue compressing.
-*/
-
-
-ZEXTERN int ZEXPORT deflateEnd OF((z_streamp strm));
-/*
-     All dynamically allocated data structures for this stream are freed.
-   This function discards any unprocessed input and does not flush any
-   pending output.
-
-     deflateEnd returns Z_OK if success, Z_STREAM_ERROR if the
-   stream state was inconsistent, Z_DATA_ERROR if the stream was freed
-   prematurely (some input or output was discarded). In the error case,
-   msg may be set but then points to a static string (which must not be
-   deallocated).
-*/
-
-
-/*
-ZEXTERN int ZEXPORT inflateInit OF((z_streamp strm));
-
-     Initializes the internal stream state for decompression. The fields
-   next_in, avail_in, zalloc, zfree and opaque must be initialized before by
-   the caller. If next_in is not Z_NULL and avail_in is large enough (the exact
-   value depends on the compression method), inflateInit determines the
-   compression method from the zlib header and allocates all data structures
-   accordingly; otherwise the allocation will be deferred to the first call of
-   inflate.  If zalloc and zfree are set to Z_NULL, inflateInit updates them to
-   use default allocation functions.
-
-     inflateInit returns Z_OK if success, Z_MEM_ERROR if there was not enough
-   memory, Z_VERSION_ERROR if the zlib library version is incompatible with the
-   version assumed by the caller.  msg is set to null if there is no error
-   message. inflateInit does not perform any decompression apart from reading
-   the zlib header if present: this will be done by inflate().  (So next_in and
-   avail_in may be modified, but next_out and avail_out are unchanged.)
-*/
-
-
-ZEXTERN int ZEXPORT inflate OF((z_streamp strm, int flush));
-/*
-    inflate decompresses as much data as possible, and stops when the input
-  buffer becomes empty or the output buffer becomes full. It may introduce
-  some output latency (reading input without producing any output) except when
-  forced to flush.
-
-  The detailed semantics are as follows. inflate performs one or both of the
-  following actions:
-
-  - Decompress more input starting at next_in and update next_in and avail_in
-    accordingly. If not all input can be processed (because there is not
-    enough room in the output buffer), next_in is updated and processing
-    will resume at this point for the next call of inflate().
-
-  - Provide more output starting at next_out and update next_out and avail_out
-    accordingly.  inflate() provides as much output as possible, until there
-    is no more input data or no more space in the output buffer (see below
-    about the flush parameter).
-
-  Before the call of inflate(), the application should ensure that at least
-  one of the actions is possible, by providing more input and/or consuming
-  more output, and updating the next_* and avail_* values accordingly.
-  The application can consume the uncompressed output when it wants, for
-  example when the output buffer is full (avail_out == 0), or after each
-  call of inflate(). If inflate returns Z_OK and with zero avail_out, it
-  must be called again after making room in the output buffer because there
-  might be more output pending.
-
-    The flush parameter of inflate() can be Z_NO_FLUSH, Z_SYNC_FLUSH,
-  Z_FINISH, or Z_BLOCK. Z_SYNC_FLUSH requests that inflate() flush as much
-  output as possible to the output buffer. Z_BLOCK requests that inflate() stop
-  if and when it gets to the next deflate block boundary. When decoding the
-  zlib or gzip format, this will cause inflate() to return immediately after
-  the header and before the first block. When doing a raw inflate, inflate()
-  will go ahead and process the first block, and will return when it gets to
-  the end of that block, or when it runs out of data.
-
-    The Z_BLOCK option assists in appending to or combining deflate streams.
-  Also to assist in this, on return inflate() will set strm->data_type to the
-  number of unused bits in the last byte taken from strm->next_in, plus 64
-  if inflate() is currently decoding the last block in the deflate stream,
-  plus 128 if inflate() returned immediately after decoding an end-of-block
-  code or decoding the complete header up to just before the first byte of the
-  deflate stream. The end-of-block will not be indicated until all of the
-  uncompressed data from that block has been written to strm->next_out.  The
-  number of unused bits may in general be greater than seven, except when
-  bit 7 of data_type is set, in which case the number of unused bits will be
-  less than eight.
-
-    inflate() should normally be called until it returns Z_STREAM_END or an
-  error. However if all decompression is to be performed in a single step
-  (a single call of inflate), the parameter flush should be set to
-  Z_FINISH. In this case all pending input is processed and all pending
-  output is flushed; avail_out must be large enough to hold all the
-  uncompressed data. (The size of the uncompressed data may have been saved
-  by the compressor for this purpose.) The next operation on this stream must
-  be inflateEnd to deallocate the decompression state. The use of Z_FINISH
-  is never required, but can be used to inform inflate that a faster approach
-  may be used for the single inflate() call.
-
-     In this implementation, inflate() always flushes as much output as
-  possible to the output buffer, and always uses the faster approach on the
-  first call. So the only effect of the flush parameter in this implementation
-  is on the return value of inflate(), as noted below, or when it returns early
-  because Z_BLOCK is used.
-
-     If a preset dictionary is needed after this call (see inflateSetDictionary
-  below), inflate sets strm->adler to the adler32 checksum of the dictionary
-  chosen by the compressor and returns Z_NEED_DICT; otherwise it sets
-  strm->adler to the adler32 checksum of all output produced so far (that is,
-  total_out bytes) and returns Z_OK, Z_STREAM_END or an error code as described
-  below. At the end of the stream, inflate() checks that its computed adler32
-  checksum is equal to that saved by the compressor and returns Z_STREAM_END
-  only if the checksum is correct.
-
-    inflate() will decompress and check either zlib-wrapped or gzip-wrapped
-  deflate data.  The header type is detected automatically.  Any information
-  contained in the gzip header is not retained, so applications that need that
-  information should instead use raw inflate, see inflateInit2() below, or
-  inflateBack() and perform their own processing of the gzip header and
-  trailer.
-
-    inflate() returns Z_OK if some progress has been made (more input processed
-  or more output produced), Z_STREAM_END if the end of the compressed data has
-  been reached and all uncompressed output has been produced, Z_NEED_DICT if a
-  preset dictionary is needed at this point, Z_DATA_ERROR if the input data was
-  corrupted (input stream not conforming to the zlib format or incorrect check
-  value), Z_STREAM_ERROR if the stream structure was inconsistent (for example
-  if next_in or next_out was NULL), Z_MEM_ERROR if there was not enough memory,
-  Z_BUF_ERROR if no progress is possible or if there was not enough room in the
-  output buffer when Z_FINISH is used. Note that Z_BUF_ERROR is not fatal, and
-  inflate() can be called again with more input and more output space to
-  continue decompressing. If Z_DATA_ERROR is returned, the application may then
-  call inflateSync() to look for a good compression block if a partial recovery
-  of the data is desired.
-*/
-
-
-ZEXTERN int ZEXPORT inflateEnd OF((z_streamp strm));
-/*
-     All dynamically allocated data structures for this stream are freed.
-   This function discards any unprocessed input and does not flush any
-   pending output.
-
-     inflateEnd returns Z_OK if success, Z_STREAM_ERROR if the stream state
-   was inconsistent. In the error case, msg may be set but then points to a
-   static string (which must not be deallocated).
-*/
-
-                        /* Advanced functions */
-
-/*
-    The following functions are needed only in some special applications.
-*/
-
-/*
-ZEXTERN int ZEXPORT deflateInit2 OF((z_streamp strm,
-                                     int  level,
-                                     int  method,
-                                     int  windowBits,
-                                     int  memLevel,
-                                     int  strategy));
-
-     This is another version of deflateInit with more compression options. The
-   fields next_in, zalloc, zfree and opaque must be initialized before by
-   the caller.
-
-     The method parameter is the compression method. It must be Z_DEFLATED in
-   this version of the library.
-
-     The windowBits parameter is the base two logarithm of the window size
-   (the size of the history buffer). It should be in the range 8..15 for this
-   version of the library. Larger values of this parameter result in better
-   compression at the expense of memory usage. The default value is 15 if
-   deflateInit is used instead.
-
-     windowBits can also be -8..-15 for raw deflate. In this case, -windowBits
-   determines the window size. deflate() will then generate raw deflate data
-   with no zlib header or trailer, and will not compute an adler32 check value.
-
-     windowBits can also be greater than 15 for optional gzip encoding. Add
-   16 to windowBits to write a simple gzip header and trailer around the
-   compressed data instead of a zlib wrapper. The gzip header will have no
-   file name, no extra data, no comment, no modification time (set to zero),
-   no header crc, and the operating system will be set to 255 (unknown).  If a
-   gzip stream is being written, strm->adler is a crc32 instead of an adler32.
-
-     The memLevel parameter specifies how much memory should be allocated
-   for the internal compression state. memLevel=1 uses minimum memory but
-   is slow and reduces compression ratio; memLevel=9 uses maximum memory
-   for optimal speed. The default value is 8. See zconf.h for total memory
-   usage as a function of windowBits and memLevel.
-
-     The strategy parameter is used to tune the compression algorithm. Use the
-   value Z_DEFAULT_STRATEGY for normal data, Z_FILTERED for data produced by a
-   filter (or predictor), Z_HUFFMAN_ONLY to force Huffman encoding only (no
-   string match), or Z_RLE to limit match distances to one (run-length
-   encoding). Filtered data consists mostly of small values with a somewhat
-   random distribution. In this case, the compression algorithm is tuned to
-   compress them better. The effect of Z_FILTERED is to force more Huffman
-   coding and less string matching; it is somewhat intermediate between
-   Z_DEFAULT and Z_HUFFMAN_ONLY. Z_RLE is designed to be almost as fast as
-   Z_HUFFMAN_ONLY, but give better compression for PNG image data. The strategy
-   parameter only affects the compression ratio but not the correctness of the
-   compressed output even if it is not set appropriately.  Z_FIXED prevents the
-   use of dynamic Huffman codes, allowing for a simpler decoder for special
-   applications.
-
-      deflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
-   memory, Z_STREAM_ERROR if a parameter is invalid (such as an invalid
-   method). msg is set to null if there is no error message.  deflateInit2 does
-   not perform any compression: this will be done by deflate().
-*/
-
-ZEXTERN int ZEXPORT deflateSetDictionary OF((z_streamp strm,
-                                             const Bytef *dictionary,
-                                             uInt  dictLength));
-/*
-     Initializes the compression dictionary from the given byte sequence
-   without producing any compressed output. This function must be called
-   immediately after deflateInit, deflateInit2 or deflateReset, before any
-   call of deflate. The compressor and decompressor must use exactly the same
-   dictionary (see inflateSetDictionary).
-
-     The dictionary should consist of strings (byte sequences) that are likely
-   to be encountered later in the data to be compressed, with the most commonly
-   used strings preferably put towards the end of the dictionary. Using a
-   dictionary is most useful when the data to be compressed is short and can be
-   predicted with good accuracy; the data can then be compressed better than
-   with the default empty dictionary.
-
-     Depending on the size of the compression data structures selected by
-   deflateInit or deflateInit2, a part of the dictionary may in effect be
-   discarded, for example if the dictionary is larger than the window size in
-   deflate or deflate2. Thus the strings most likely to be useful should be
-   put at the end of the dictionary, not at the front. In addition, the
-   current implementation of deflate will use at most the window size minus
-   262 bytes of the provided dictionary.
-
-     Upon return of this function, strm->adler is set to the adler32 value
-   of the dictionary; the decompressor may later use this value to determine
-   which dictionary has been used by the compressor. (The adler32 value
-   applies to the whole dictionary even if only a subset of the dictionary is
-   actually used by the compressor.) If a raw deflate was requested, then the
-   adler32 value is not computed and strm->adler is not set.
-
-     deflateSetDictionary returns Z_OK if success, or Z_STREAM_ERROR if a
-   parameter is invalid (such as NULL dictionary) or the stream state is
-   inconsistent (for example if deflate has already been called for this stream
-   or if the compression method is bsort). deflateSetDictionary does not
-   perform any compression: this will be done by deflate().
-*/
-
-ZEXTERN int ZEXPORT deflateCopy OF((z_streamp dest,
-                                    z_streamp source));
-/*
-     Sets the destination stream as a complete copy of the source stream.
-
-     This function can be useful when several compression strategies will be
-   tried, for example when there are several ways of pre-processing the input
-   data with a filter. The streams that will be discarded should then be freed
-   by calling deflateEnd.  Note that deflateCopy duplicates the internal
-   compression state which can be quite large, so this strategy is slow and
-   can consume lots of memory.
-
-     deflateCopy returns Z_OK if success, Z_MEM_ERROR if there was not
-   enough memory, Z_STREAM_ERROR if the source stream state was inconsistent
-   (such as zalloc being NULL). msg is left unchanged in both source and
-   destination.
-*/
-
-ZEXTERN int ZEXPORT deflateReset OF((z_streamp strm));
-/*
-     This function is equivalent to deflateEnd followed by deflateInit,
-   but does not free and reallocate all the internal compression state.
-   The stream will keep the same compression level and any other attributes
-   that may have been set by deflateInit2.
-
-      deflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source
-   stream state was inconsistent (such as zalloc or state being NULL).
-*/
-
-ZEXTERN int ZEXPORT deflateParams OF((z_streamp strm,
-                                      int level,
-                                      int strategy));
-/*
-     Dynamically update the compression level and compression strategy.  The
-   interpretation of level and strategy is as in deflateInit2.  This can be
-   used to switch between compression and straight copy of the input data, or
-   to switch to a different kind of input data requiring a different
-   strategy. If the compression level is changed, the input available so far
-   is compressed with the old level (and may be flushed); the new level will
-   take effect only at the next call of deflate().
-
-     Before the call of deflateParams, the stream state must be set as for
-   a call of deflate(), since the currently available input may have to
-   be compressed and flushed. In particular, strm->avail_out must be non-zero.
-
-     deflateParams returns Z_OK if success, Z_STREAM_ERROR if the source
-   stream state was inconsistent or if a parameter was invalid, Z_BUF_ERROR
-   if strm->avail_out was zero.
-*/
-
-ZEXTERN int ZEXPORT deflateTune OF((z_streamp strm,
-                                    int good_length,
-                                    int max_lazy,
-                                    int nice_length,
-                                    int max_chain));
-/*
-     Fine tune deflate's internal compression parameters.  This should only be
-   used by someone who understands the algorithm used by zlib's deflate for
-   searching for the best matching string, and even then only by the most
-   fanatic optimizer trying to squeeze out the last compressed bit for their
-   specific input data.  Read the deflate.c source code for the meaning of the
-   max_lazy, good_length, nice_length, and max_chain parameters.
-
-     deflateTune() can be called after deflateInit() or deflateInit2(), and
-   returns Z_OK on success, or Z_STREAM_ERROR for an invalid deflate stream.
- */
-
-ZEXTERN uLong ZEXPORT deflateBound OF((z_streamp strm,
-                                       uLong sourceLen));
-/*
-     deflateBound() returns an upper bound on the compressed size after
-   deflation of sourceLen bytes.  It must be called after deflateInit()
-   or deflateInit2().  This would be used to allocate an output buffer
-   for deflation in a single pass, and so would be called before deflate().
-*/
-
-ZEXTERN int ZEXPORT deflatePrime OF((z_streamp strm,
-                                     int bits,
-                                     int value));
-/*
-     deflatePrime() inserts bits in the deflate output stream.  The intent
-  is that this function is used to start off the deflate output with the
-  bits leftover from a previous deflate stream when appending to it.  As such,
-  this function can only be used for raw deflate, and must be used before the
-  first deflate() call after a deflateInit2() or deflateReset().  bits must be
-  less than or equal to 16, and that many of the least significant bits of
-  value will be inserted in the output.
-
-      deflatePrime returns Z_OK if success, or Z_STREAM_ERROR if the source
-   stream state was inconsistent.
-*/
-
-ZEXTERN int ZEXPORT deflateSetHeader OF((z_streamp strm,
-                                         gz_headerp head));
-/*
-      deflateSetHeader() provides gzip header information for when a gzip
-   stream is requested by deflateInit2().  deflateSetHeader() may be called
-   after deflateInit2() or deflateReset() and before the first call of
-   deflate().  The text, time, os, extra field, name, and comment information
-   in the provided gz_header structure are written to the gzip header (xflag is
-   ignored -- the extra flags are set according to the compression level).  The
-   caller must assure that, if not Z_NULL, name and comment are terminated with
-   a zero byte, and that if extra is not Z_NULL, that extra_len bytes are
-   available there.  If hcrc is true, a gzip header crc is included.  Note that
-   the current versions of the command-line version of gzip (up through version
-   1.3.x) do not support header crc's, and will report that it is a "multi-part
-   gzip file" and give up.
-
-      If deflateSetHeader is not used, the default gzip header has text false,
-   the time set to zero, and os set to 255, with no extra, name, or comment
-   fields.  The gzip header is returned to the default state by deflateReset().
-
-      deflateSetHeader returns Z_OK if success, or Z_STREAM_ERROR if the source
-   stream state was inconsistent.
-*/
-
-/*
-ZEXTERN int ZEXPORT inflateInit2 OF((z_streamp strm,
-                                     int  windowBits));
-
-     This is another version of inflateInit with an extra parameter. The
-   fields next_in, avail_in, zalloc, zfree and opaque must be initialized
-   before by the caller.
-
-     The windowBits parameter is the base two logarithm of the maximum window
-   size (the size of the history buffer).  It should be in the range 8..15 for
-   this version of the library. The default value is 15 if inflateInit is used
-   instead. windowBits must be greater than or equal to the windowBits value
-   provided to deflateInit2() while compressing, or it must be equal to 15 if
-   deflateInit2() was not used. If a compressed stream with a larger window
-   size is given as input, inflate() will return with the error code
-   Z_DATA_ERROR instead of trying to allocate a larger window.
-
-     windowBits can also be -8..-15 for raw inflate. In this case, -windowBits
-   determines the window size. inflate() will then process raw deflate data,
-   not looking for a zlib or gzip header, not generating a check value, and not
-   looking for any check values for comparison at the end of the stream. This
-   is for use with other formats that use the deflate compressed data format
-   such as zip.  Those formats provide their own check values. If a custom
-   format is developed using the raw deflate format for compressed data, it is
-   recommended that a check value such as an adler32 or a crc32 be applied to
-   the uncompressed data as is done in the zlib, gzip, and zip formats.  For
-   most applications, the zlib format should be used as is. Note that comments
-   above on the use in deflateInit2() applies to the magnitude of windowBits.
-
-     windowBits can also be greater than 15 for optional gzip decoding. Add
-   32 to windowBits to enable zlib and gzip decoding with automatic header
-   detection, or add 16 to decode only the gzip format (the zlib format will
-   return a Z_DATA_ERROR).  If a gzip stream is being decoded, strm->adler is
-   a crc32 instead of an adler32.
-
-     inflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
-   memory, Z_STREAM_ERROR if a parameter is invalid (such as a null strm). msg
-   is set to null if there is no error message.  inflateInit2 does not perform
-   any decompression apart from reading the zlib header if present: this will
-   be done by inflate(). (So next_in and avail_in may be modified, but next_out
-   and avail_out are unchanged.)
-*/
-
-ZEXTERN int ZEXPORT inflateSetDictionary OF((z_streamp strm,
-                                             const Bytef *dictionary,
-                                             uInt  dictLength));
-/*
-     Initializes the decompression dictionary from the given uncompressed byte
-   sequence. This function must be called immediately after a call of inflate,
-   if that call returned Z_NEED_DICT. The dictionary chosen by the compressor
-   can be determined from the adler32 value returned by that call of inflate.
-   The compressor and decompressor must use exactly the same dictionary (see
-   deflateSetDictionary).  For raw inflate, this function can be called
-   immediately after inflateInit2() or inflateReset() and before any call of
-   inflate() to set the dictionary.  The application must insure that the
-   dictionary that was used for compression is provided.
-
-     inflateSetDictionary returns Z_OK if success, Z_STREAM_ERROR if a
-   parameter is invalid (such as NULL dictionary) or the stream state is
-   inconsistent, Z_DATA_ERROR if the given dictionary doesn't match the
-   expected one (incorrect adler32 value). inflateSetDictionary does not
-   perform any decompression: this will be done by subsequent calls of
-   inflate().
-*/
-
-ZEXTERN int ZEXPORT inflateSync OF((z_streamp strm));
-/*
-    Skips invalid compressed data until a full flush point (see above the
-  description of deflate with Z_FULL_FLUSH) can be found, or until all
-  available input is skipped. No output is provided.
-
-    inflateSync returns Z_OK if a full flush point has been found, Z_BUF_ERROR
-  if no more input was provided, Z_DATA_ERROR if no flush point has been found,
-  or Z_STREAM_ERROR if the stream structure was inconsistent. In the success
-  case, the application may save the current current value of total_in which
-  indicates where valid compressed data was found. In the error case, the
-  application may repeatedly call inflateSync, providing more input each time,
-  until success or end of the input data.
-*/
-
-ZEXTERN int ZEXPORT inflateCopy OF((z_streamp dest,
-                                    z_streamp source));
-/*
-     Sets the destination stream as a complete copy of the source stream.
-
-     This function can be useful when randomly accessing a large stream.  The
-   first pass through the stream can periodically record the inflate state,
-   allowing restarting inflate at those points when randomly accessing the
-   stream.
-
-     inflateCopy returns Z_OK if success, Z_MEM_ERROR if there was not
-   enough memory, Z_STREAM_ERROR if the source stream state was inconsistent
-   (such as zalloc being NULL). msg is left unchanged in both source and
-   destination.
-*/
-
-ZEXTERN int ZEXPORT inflateReset OF((z_streamp strm));
-/*
-     This function is equivalent to inflateEnd followed by inflateInit,
-   but does not free and reallocate all the internal decompression state.
-   The stream will keep attributes that may have been set by inflateInit2.
-
-      inflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source
-   stream state was inconsistent (such as zalloc or state being NULL).
-*/
-
-ZEXTERN int ZEXPORT inflatePrime OF((z_streamp strm,
-                                     int bits,
-                                     int value));
-/*
-     This function inserts bits in the inflate input stream.  The intent is
-  that this function is used to start inflating at a bit position in the
-  middle of a byte.  The provided bits will be used before any bytes are used
-  from next_in.  This function should only be used with raw inflate, and
-  should be used before the first inflate() call after inflateInit2() or
-  inflateReset().  bits must be less than or equal to 16, and that many of the
-  least significant bits of value will be inserted in the input.
-
-      inflatePrime returns Z_OK if success, or Z_STREAM_ERROR if the source
-   stream state was inconsistent.
-*/
-
-ZEXTERN int ZEXPORT inflateGetHeader OF((z_streamp strm,
-                                         gz_headerp head));
-/*
-      inflateGetHeader() requests that gzip header information be stored in the
-   provided gz_header structure.  inflateGetHeader() may be called after
-   inflateInit2() or inflateReset(), and before the first call of inflate().
-   As inflate() processes the gzip stream, head->done is zero until the header
-   is completed, at which time head->done is set to one.  If a zlib stream is
-   being decoded, then head->done is set to -1 to indicate that there will be
-   no gzip header information forthcoming.  Note that Z_BLOCK can be used to
-   force inflate() to return immediately after header processing is complete
-   and before any actual data is decompressed.
-
-      The text, time, xflags, and os fields are filled in with the gzip header
-   contents.  hcrc is set to true if there is a header CRC.  (The header CRC
-   was valid if done is set to one.)  If extra is not Z_NULL, then extra_max
-   contains the maximum number of bytes to write to extra.  Once done is true,
-   extra_len contains the actual extra field length, and extra contains the
-   extra field, or that field truncated if extra_max is less than extra_len.
-   If name is not Z_NULL, then up to name_max characters are written there,
-   terminated with a zero unless the length is greater than name_max.  If
-   comment is not Z_NULL, then up to comm_max characters are written there,
-   terminated with a zero unless the length is greater than comm_max.  When
-   any of extra, name, or comment are not Z_NULL and the respective field is
-   not present in the header, then that field is set to Z_NULL to signal its
-   absence.  This allows the use of deflateSetHeader() with the returned
-   structure to duplicate the header.  However if those fields are set to
-   allocated memory, then the application will need to save those pointers
-   elsewhere so that they can be eventually freed.
-
-      If inflateGetHeader is not used, then the header information is simply
-   discarded.  The header is always checked for validity, including the header
-   CRC if present.  inflateReset() will reset the process to discard the header
-   information.  The application would need to call inflateGetHeader() again to
-   retrieve the header from the next gzip stream.
-
-      inflateGetHeader returns Z_OK if success, or Z_STREAM_ERROR if the source
-   stream state was inconsistent.
-*/
-
-/*
-ZEXTERN int ZEXPORT inflateBackInit OF((z_streamp strm, int windowBits,
-                                        unsigned char FAR *window));
-
-     Initialize the internal stream state for decompression using inflateBack()
-   calls.  The fields zalloc, zfree and opaque in strm must be initialized
-   before the call.  If zalloc and zfree are Z_NULL, then the default library-
-   derived memory allocation routines are used.  windowBits is the base two
-   logarithm of the window size, in the range 8..15.  window is a caller
-   supplied buffer of that size.  Except for special applications where it is
-   assured that deflate was used with small window sizes, windowBits must be 15
-   and a 32K byte window must be supplied to be able to decompress general
-   deflate streams.
-
-     See inflateBack() for the usage of these routines.
-
-     inflateBackInit will return Z_OK on success, Z_STREAM_ERROR if any of
-   the paramaters are invalid, Z_MEM_ERROR if the internal state could not
-   be allocated, or Z_VERSION_ERROR if the version of the library does not
-   match the version of the header file.
-*/
-
-typedef unsigned (*in_func) OF((void FAR *, unsigned char FAR * FAR *));
-typedef int (*out_func) OF((void FAR *, unsigned char FAR *, unsigned));
-
-ZEXTERN int ZEXPORT inflateBack OF((z_streamp strm,
-                                    in_func in, void FAR *in_desc,
-                                    out_func out, void FAR *out_desc));
-/*
-     inflateBack() does a raw inflate with a single call using a call-back
-   interface for input and output.  This is more efficient than inflate() for
-   file i/o applications in that it avoids copying between the output and the
-   sliding window by simply making the window itself the output buffer.  This
-   function trusts the application to not change the output buffer passed by
-   the output function, at least until inflateBack() returns.
-
-     inflateBackInit() must be called first to allocate the internal state
-   and to initialize the state with the user-provided window buffer.
-   inflateBack() may then be used multiple times to inflate a complete, raw
-   deflate stream with each call.  inflateBackEnd() is then called to free
-   the allocated state.
-
-     A raw deflate stream is one with no zlib or gzip header or trailer.
-   This routine would normally be used in a utility that reads zip or gzip
-   files and writes out uncompressed files.  The utility would decode the
-   header and process the trailer on its own, hence this routine expects
-   only the raw deflate stream to decompress.  This is different from the
-   normal behavior of inflate(), which expects either a zlib or gzip header and
-   trailer around the deflate stream.
-
-     inflateBack() uses two subroutines supplied by the caller that are then
-   called by inflateBack() for input and output.  inflateBack() calls those
-   routines until it reads a complete deflate stream and writes out all of the
-   uncompressed data, or until it encounters an error.  The function's
-   parameters and return types are defined above in the in_func and out_func
-   typedefs.  inflateBack() will call in(in_desc, &buf) which should return the
-   number of bytes of provided input, and a pointer to that input in buf.  If
-   there is no input available, in() must return zero--buf is ignored in that
-   case--and inflateBack() will return a buffer error.  inflateBack() will call
-   out(out_desc, buf, len) to write the uncompressed data buf0..len-1.  out()
-   should return zero on success, or non-zero on failure.  If out() returns
-   non-zero, inflateBack() will return with an error.  Neither in() nor out()
-   are permitted to change the contents of the window provided to
-   inflateBackInit(), which is also the buffer that out() uses to write from.
-   The length written by out() will be at most the window size.  Any non-zero
-   amount of input may be provided by in().
-
-     For convenience, inflateBack() can be provided input on the first call by
-   setting strm->next_in and strm->avail_in.  If that input is exhausted, then
-   in() will be called.  Therefore strm->next_in must be initialized before
-   calling inflateBack().  If strm->next_in is Z_NULL, then in() will be called
-   immediately for input.  If strm->next_in is not Z_NULL, then strm->avail_in
-   must also be initialized, and then if strm->avail_in is not zero, input will
-   initially be taken from strm->next_in0 .. strm->avail_in - 1.
-
-     The in_desc and out_desc parameters of inflateBack() is passed as the
-   first parameter of in() and out() respectively when they are called.  These
-   descriptors can be optionally used to pass any information that the caller-
-   supplied in() and out() functions need to do their job.
-
-     On return, inflateBack() will set strm->next_in and strm->avail_in to
-   pass back any unused input that was provided by the last in() call.  The
-   return values of inflateBack() can be Z_STREAM_END on success, Z_BUF_ERROR
-   if in() or out() returned an error, Z_DATA_ERROR if there was a format
-   error in the deflate stream (in which case strm->msg is set to indicate the
-   nature of the error), or Z_STREAM_ERROR if the stream was not properly
-   initialized.  In the case of Z_BUF_ERROR, an input or output error can be
-   distinguished using strm->next_in which will be Z_NULL only if in() returned
-   an error.  If strm->next is not Z_NULL, then the Z_BUF_ERROR was due to
-   out() returning non-zero.  (in() will always be called before out(), so
-   strm->next_in is assured to be defined if out() returns non-zero.)  Note
-   that inflateBack() cannot return Z_OK.
-*/
-
-ZEXTERN int ZEXPORT inflateBackEnd OF((z_streamp strm));
-/*
-     All memory allocated by inflateBackInit() is freed.
-
-     inflateBackEnd() returns Z_OK on success, or Z_STREAM_ERROR if the stream
-   state was inconsistent.
-*/
-
-ZEXTERN uLong ZEXPORT zlibCompileFlags OF((void));
-/* Return flags indicating compile-time options.
-
-    Type sizes, two bits each, 00 = 16 bits, 01 = 32, 10 = 64, 11 = other:
-     1.0: size of uInt
-     3.2: size of uLong
-     5.4: size of voidpf (pointer)
-     7.6: size of z_off_t
-
-    Compiler, assembler, and debug options:
-     8: DEBUG
-     9: ASMV or ASMINF -- use ASM code
-     10: ZLIB_WINAPI -- exported functions use the WINAPI calling convention
-     11: 0 (reserved)
-
-    One-time table building (smaller code, but not thread-safe if true):
-     12: BUILDFIXED -- build static block decoding tables when needed
-     13: DYNAMIC_CRC_TABLE -- build CRC calculation tables when needed
-     14,15: 0 (reserved)
-
-    Library content (indicates missing functionality):
-     16: NO_GZCOMPRESS -- gz* functions cannot compress (to avoid linking
-                          deflate code when not needed)
-     17: NO_GZIP -- deflate can't write gzip streams, and inflate can't detect
-                    and decode gzip streams (to avoid linking crc code)
-     18-19: 0 (reserved)
-
-    Operation variations (changes in library functionality):
-     20: PKZIP_BUG_WORKAROUND -- slightly more permissive inflate
-     21: FASTEST -- deflate algorithm with only one, lowest compression level
-     22,23: 0 (reserved)
-
-    The sprintf variant used by gzprintf (zero is best):
-     24: 0 = vs*, 1 = s* -- 1 means limited to 20 arguments after the format
-     25: 0 = *nprintf, 1 = *printf -- 1 means gzprintf() not secure!
-     26: 0 = returns value, 1 = void -- 1 means inferred string length returned
-
-    Remainder:
-     27-31: 0 (reserved)
- */
-
-
-                        /* utility functions */
-
-/*
-     The following utility functions are implemented on top of the
-   basic stream-oriented functions. To simplify the interface, some
-   default options are assumed (compression level and memory usage,
-   standard memory allocation functions). The source code of these
-   utility functions can easily be modified if you need special options.
-*/
-
-ZEXTERN int ZEXPORT compress OF((Bytef *dest,   uLongf *destLen,
-                                 const Bytef *source, uLong sourceLen));
-/*
-     Compresses the source buffer into the destination buffer.  sourceLen is
-   the byte length of the source buffer. Upon entry, destLen is the total
-   size of the destination buffer, which must be at least the value returned
-   by compressBound(sourceLen). Upon exit, destLen is the actual size of the
-   compressed buffer.
-     This function can be used to compress a whole file at once if the
-   input file is mmap'ed.
-     compress returns Z_OK if success, Z_MEM_ERROR if there was not
-   enough memory, Z_BUF_ERROR if there was not enough room in the output
-   buffer.
-*/
-
-ZEXTERN int ZEXPORT compress2 OF((Bytef *dest,   uLongf *destLen,
-                                  const Bytef *source, uLong sourceLen,
-                                  int level));
-/*
-     Compresses the source buffer into the destination buffer. The level
-   parameter has the same meaning as in deflateInit.  sourceLen is the byte
-   length of the source buffer. Upon entry, destLen is the total size of the
-   destination buffer, which must be at least the value returned by
-   compressBound(sourceLen). Upon exit, destLen is the actual size of the
-   compressed buffer.
-
-     compress2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
-   memory, Z_BUF_ERROR if there was not enough room in the output buffer,
-   Z_STREAM_ERROR if the level parameter is invalid.
-*/
-
-ZEXTERN uLong ZEXPORT compressBound OF((uLong sourceLen));
-/*
-     compressBound() returns an upper bound on the compressed size after
-   compress() or compress2() on sourceLen bytes.  It would be used before
-   a compress() or compress2() call to allocate the destination buffer.
-*/
-
-ZEXTERN int ZEXPORT uncompress OF((Bytef *dest,   uLongf *destLen,
-                                   const Bytef *source, uLong sourceLen));
-/*
-     Decompresses the source buffer into the destination buffer.  sourceLen is
-   the byte length of the source buffer. Upon entry, destLen is the total
-   size of the destination buffer, which must be large enough to hold the
-   entire uncompressed data. (The size of the uncompressed data must have
-   been saved previously by the compressor and transmitted to the decompressor
-   by some mechanism outside the scope of this compression library.)
-   Upon exit, destLen is the actual size of the compressed buffer.
-     This function can be used to decompress a whole file at once if the
-   input file is mmap'ed.
-
-     uncompress returns Z_OK if success, Z_MEM_ERROR if there was not
-   enough memory, Z_BUF_ERROR if there was not enough room in the output
-   buffer, or Z_DATA_ERROR if the input data was corrupted or incomplete.
-*/
-
-
-typedef voidp gzFile;
-
-ZEXTERN gzFile ZEXPORT gzopen  OF((const char *path, const char *mode));
-/*
-     Opens a gzip (.gz) file for reading or writing. The mode parameter
-   is as in fopen ("rb" or "wb") but can also include a compression level
-   ("wb9") or a strategy: 'f' for filtered data as in "wb6f", 'h' for
-   Huffman only compression as in "wb1h", or 'R' for run-length encoding
-   as in "wb1R". (See the description of deflateInit2 for more information
-   about the strategy parameter.)
-
-     gzopen can be used to read a file which is not in gzip format; in this
-   case gzread will directly read from the file without decompression.
-
-     gzopen returns NULL if the file could not be opened or if there was
-   insufficient memory to allocate the (de)compression state; errno
-   can be checked to distinguish the two cases (if errno is zero, the
-   zlib error is Z_MEM_ERROR).  */
-
-ZEXTERN gzFile ZEXPORT gzdopen  OF((int fd, const char *mode));
-/*
-     gzdopen() associates a gzFile with the file descriptor fd.  File
-   descriptors are obtained from calls like open, dup, creat, pipe or
-   fileno (in the file has been previously opened with fopen).
-   The mode parameter is as in gzopen.
-     The next call of gzclose on the returned gzFile will also close the
-   file descriptor fd, just like fclose(fdopen(fd), mode) closes the file
-   descriptor fd. If you want to keep fd open, use gzdopen(dup(fd), mode).
-     gzdopen returns NULL if there was insufficient memory to allocate
-   the (de)compression state.
-*/
-
-ZEXTERN int ZEXPORT gzsetparams OF((gzFile file, int level, int strategy));
-/*
-     Dynamically update the compression level or strategy. See the description
-   of deflateInit2 for the meaning of these parameters.
-     gzsetparams returns Z_OK if success, or Z_STREAM_ERROR if the file was not
-   opened for writing.
-*/
-
-ZEXTERN int ZEXPORT    gzread  OF((gzFile file, voidp buf, unsigned len));
-/*
-     Reads the given number of uncompressed bytes from the compressed file.
-   If the input file was not in gzip format, gzread copies the given number
-   of bytes into the buffer.
-     gzread returns the number of uncompressed bytes actually read (0 for
-   end of file, -1 for error). */
-
-ZEXTERN int ZEXPORT    gzwrite OF((gzFile file,
-                                   voidpc buf, unsigned len));
-/*
-     Writes the given number of uncompressed bytes into the compressed file.
-   gzwrite returns the number of uncompressed bytes actually written
-   (0 in case of error).
-*/
-
-ZEXTERN int ZEXPORTVA   gzprintf OF((gzFile file, const char *format, ...));
-/*
-     Converts, formats, and writes the args to the compressed file under
-   control of the format string, as in fprintf. gzprintf returns the number of
-   uncompressed bytes actually written (0 in case of error).  The number of
-   uncompressed bytes written is limited to 4095. The caller should assure that
-   this limit is not exceeded. If it is exceeded, then gzprintf() will return
-   return an error (0) with nothing written. In this case, there may also be a
-   buffer overflow with unpredictable consequences, which is possible only if
-   zlib was compiled with the insecure functions sprintf() or vsprintf()
-   because the secure snprintf() or vsnprintf() functions were not available.
-*/
-
-ZEXTERN int ZEXPORT gzputs OF((gzFile file, const char *s));
-/*
-      Writes the given null-terminated string to the compressed file, excluding
-   the terminating null character.
-      gzputs returns the number of characters written, or -1 in case of error.
-*/
-
-ZEXTERN char * ZEXPORT gzgets OF((gzFile file, char *buf, int len));
-/*
-      Reads bytes from the compressed file until len-1 characters are read, or
-   a newline character is read and transferred to buf, or an end-of-file
-   condition is encountered.  The string is then terminated with a null
-   character.
-      gzgets returns buf, or Z_NULL in case of error.
-*/
-
-ZEXTERN int ZEXPORT    gzputc OF((gzFile file, int c));
-/*
-      Writes c, converted to an unsigned char, into the compressed file.
-   gzputc returns the value that was written, or -1 in case of error.
-*/
-
-ZEXTERN int ZEXPORT    gzgetc OF((gzFile file));
-/*
-      Reads one byte from the compressed file. gzgetc returns this byte
-   or -1 in case of end of file or error.
-*/
-
-ZEXTERN int ZEXPORT    gzungetc OF((int c, gzFile file));
-/*
-      Push one character back onto the stream to be read again later.
-   Only one character of push-back is allowed.  gzungetc() returns the
-   character pushed, or -1 on failure.  gzungetc() will fail if a
-   character has been pushed but not read yet, or if c is -1. The pushed
-   character will be discarded if the stream is repositioned with gzseek()
-   or gzrewind().
-*/
-
-ZEXTERN int ZEXPORT    gzflush OF((gzFile file, int flush));
-/*
-     Flushes all pending output into the compressed file. The parameter
-   flush is as in the deflate() function. The return value is the zlib
-   error number (see function gzerror below). gzflush returns Z_OK if
-   the flush parameter is Z_FINISH and all output could be flushed.
-     gzflush should be called only when strictly necessary because it can
-   degrade compression.
-*/
-
-ZEXTERN z_off_t ZEXPORT    gzseek OF((gzFile file,
-                                      z_off_t offset, int whence));
-/*
-      Sets the starting position for the next gzread or gzwrite on the
-   given compressed file. The offset represents a number of bytes in the
-   uncompressed data stream. The whence parameter is defined as in lseek(2);
-   the value SEEK_END is not supported.
-     If the file is opened for reading, this function is emulated but can be
-   extremely slow. If the file is opened for writing, only forward seeks are
-   supported; gzseek then compresses a sequence of zeroes up to the new
-   starting position.
-
-      gzseek returns the resulting offset location as measured in bytes from
-   the beginning of the uncompressed stream, or -1 in case of error, in
-   particular if the file is opened for writing and the new starting position
-   would be before the current position.
-*/
-
-ZEXTERN int ZEXPORT    gzrewind OF((gzFile file));
-/*
-     Rewinds the given file. This function is supported only for reading.
-
-   gzrewind(file) is equivalent to (int)gzseek(file, 0L, SEEK_SET)
-*/
-
-ZEXTERN z_off_t ZEXPORT    gztell OF((gzFile file));
-/*
-     Returns the starting position for the next gzread or gzwrite on the
-   given compressed file. This position represents a number of bytes in the
-   uncompressed data stream.
-
-   gztell(file) is equivalent to gzseek(file, 0L, SEEK_CUR)
-*/
-
-ZEXTERN int ZEXPORT gzeof OF((gzFile file));
-/*
-     Returns 1 when EOF has previously been detected reading the given
-   input stream, otherwise zero.
-*/
-
-ZEXTERN int ZEXPORT gzdirect OF((gzFile file));
-/*
-     Returns 1 if file is being read directly without decompression, otherwise
-   zero.
-*/
-
-ZEXTERN int ZEXPORT    gzclose OF((gzFile file));
-/*
-     Flushes all pending output if necessary, closes the compressed file
-   and deallocates all the (de)compression state. The return value is the zlib
-   error number (see function gzerror below).
-*/
-
-ZEXTERN const char * ZEXPORT gzerror OF((gzFile file, int *errnum));
-/*
-     Returns the error message for the last error which occurred on the
-   given compressed file. errnum is set to zlib error number. If an
-   error occurred in the file system and not in the compression library,
-   errnum is set to Z_ERRNO and the application may consult errno
-   to get the exact error code.
-*/
-
-ZEXTERN void ZEXPORT gzclearerr OF((gzFile file));
-/*
-     Clears the error and end-of-file flags for file. This is analogous to the
-   clearerr() function in stdio. This is useful for continuing to read a gzip
-   file that is being written concurrently.
-*/
-
-                        /* checksum functions */
-
-/*
-     These functions are not related to compression but are exported
-   anyway because they might be useful in applications using the
-   compression library.
-*/
-
-ZEXTERN uLong ZEXPORT adler32 OF((uLong adler, const Bytef *buf, uInt len));
-/*
-     Update a running Adler-32 checksum with the bytes buf0..len-1 and
-   return the updated checksum. If buf is NULL, this function returns
-   the required initial value for the checksum.
-   An Adler-32 checksum is almost as reliable as a CRC32 but can be computed
-   much faster. Usage example:
-
-     uLong adler = adler32(0L, Z_NULL, 0);
-
-     while (read_buffer(buffer, length) != EOF) {
-       adler = adler32(adler, buffer, length);
-     }
-     if (adler != original_adler) error();
-*/
-
-ZEXTERN uLong ZEXPORT adler32_combine OF((uLong adler1, uLong adler2,
-                                          z_off_t len2));
-/*
-     Combine two Adler-32 checksums into one.  For two sequences of bytes, seq1
-   and seq2 with lengths len1 and len2, Adler-32 checksums were calculated for
-   each, adler1 and adler2.  adler32_combine() returns the Adler-32 checksum of
-   seq1 and seq2 concatenated, requiring only adler1, adler2, and len2.
-*/
-
-ZEXTERN uLong ZEXPORT crc32   OF((uLong crc, const Bytef *buf, uInt len));
-/*
-     Update a running CRC-32 with the bytes buf0..len-1 and return the
-   updated CRC-32. If buf is NULL, this function returns the required initial
-   value for the for the crc. Pre- and post-conditioning (one's complement) is
-   performed within this function so it shouldn't be done by the application.
-   Usage example:
-
-     uLong crc = crc32(0L, Z_NULL, 0);
-
-     while (read_buffer(buffer, length) != EOF) {
-       crc = crc32(crc, buffer, length);
-     }
-     if (crc != original_crc) error();
-*/
-
-ZEXTERN uLong ZEXPORT crc32_combine OF((uLong crc1, uLong crc2, z_off_t len2));
-
-/*
-     Combine two CRC-32 check values into one.  For two sequences of bytes,
-   seq1 and seq2 with lengths len1 and len2, CRC-32 check values were
-   calculated for each, crc1 and crc2.  crc32_combine() returns the CRC-32
-   check value of seq1 and seq2 concatenated, requiring only crc1, crc2, and
-   len2.
-*/
-
-
-                        /* various hacks, don't look :) */
-
-/* deflateInit and inflateInit are macros to allow checking the zlib version
- * and the compiler's view of z_stream:
- */
-ZEXTERN int ZEXPORT deflateInit_ OF((z_streamp strm, int level,
-                                     const char *version, int stream_size));
-ZEXTERN int ZEXPORT inflateInit_ OF((z_streamp strm,
-                                     const char *version, int stream_size));
-ZEXTERN int ZEXPORT deflateInit2_ OF((z_streamp strm, int  level, int  method,
-                                      int windowBits, int memLevel,
-                                      int strategy, const char *version,
-                                      int stream_size));
-ZEXTERN int ZEXPORT inflateInit2_ OF((z_streamp strm, int  windowBits,
-                                      const char *version, int stream_size));
-ZEXTERN int ZEXPORT inflateBackInit_ OF((z_streamp strm, int windowBits,
-                                         unsigned char FAR *window,
-                                         const char *version,
-                                         int stream_size));
-#define deflateInit(strm, level) \
-        deflateInit_((strm), (level),       ZLIB_VERSION, sizeof(z_stream))
-#define inflateInit(strm) \
-        inflateInit_((strm),                ZLIB_VERSION, sizeof(z_stream))
-#define deflateInit2(strm, level, method, windowBits, memLevel, strategy) \
-        deflateInit2_((strm),(level),(method),(windowBits),(memLevel),\
-                      (strategy),           ZLIB_VERSION, sizeof(z_stream))
-#define inflateInit2(strm, windowBits) \
-        inflateInit2_((strm), (windowBits), ZLIB_VERSION, sizeof(z_stream))
-#define inflateBackInit(strm, windowBits, window) \
-        inflateBackInit_((strm), (windowBits), (window), \
-        ZLIB_VERSION, sizeof(z_stream))
-
-
-#if !defined(ZUTIL_H) && !defined(NO_DUMMY_DECL)
-    struct internal_state {int dummy;}; /* hack for buggy compilers */
-#endif
-
-ZEXTERN const char   * ZEXPORT zError           OF((int));
-ZEXTERN int            ZEXPORT inflateSyncPoint OF((z_streamp z));
-ZEXTERN const uLongf * ZEXPORT get_crc_table    OF((void));
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* ZLIB_H */

gpac-2.2.1.tar.gz/include/gpac/modules/ipmp.h Deleted

@@ -1,148 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2012
- *					All rights reserved
- *
- *  This file is part of GPAC / modules interfaces
- *
- *  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.
- *
- */
-
-
-#ifndef _GF_MODULE_IPMP_H_
-#define _GF_MODULE_IPMP_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <gpac/module.h>
-
-/*
-	NOTE ON IPMP TOOLS
-
-  The current implementation is very basic and does not follow MPEG-4 IPMPX architecture
-  This is just a place holder for ISMA/OMA-like schemes
-  Currently all operations are synchronous...
-*/
-
-enum
-{
-	/*push some configuration data to the IPMP tool*/
-	GF_IPMP_TOOL_SETUP,
-	/*request access to the object (eg, PLAY)*/
-	GF_IPMP_TOOL_GRANT_ACCESS,
-	/*release access to the object (eg, STOP)*/
-	GF_IPMP_TOOL_RELEASE_ACCESS,
-	/*push some configuration data to the IPMP tool*/
-	GF_IPMP_TOOL_PROCESS_DATA,
-};
-
-typedef struct
-{
-	u32 scheme_version;
-	u32 scheme_type;
-	const char *scheme_uri;
-	const char *kms_uri;
-} GF_ISMACrypConfig;
-
-typedef struct
-{
-	u32 scheme_version;
-	u32 scheme_type;
-	u32 PSSH_count;
-	GF_NetComDRMConfigPSSH *PSSHs;
-} GF_CENCConfig;
-
-typedef struct
-{
-	u32 scheme_version;
-	u32 scheme_type;
-	const char *scheme_uri;
-	const char *kms_uri;
-	/*SHA-1 hash*/
-	u8 hash20;
-
-	const char *contentID;
-	u32 oma_drm_crypt_type;
-	Bool oma_drm_use_pad, oma_drm_use_hdr;
-	const char *oma_drm_textual_headers;
-	u32 oma_drm_textual_headers_len;
-} GF_OMADRM2Config;
-
-/*IPMP events*/
-typedef struct
-{
-	/*event type*/
-	u32 event_type;
-
-	/*gpac's channel triggering this event, NULL if unknown/unspecified*/
-	struct _es_channel *channel;
-
-	/*identifier of the config data (GF_IPMP_TOOL_SETUP)*/
-	u32 config_data_code;
-	/*config data (GF_IPMP_TOOL_SETUP). Type depends on the config_data_code*/
-	void *config_data;
-
-	Bool restart_requested;
-
-	/*data manipulation (GF_IPMP_TOOL_PROCESS_DATA) - data is always processed in-place in a
-	synchronous way*/
-	char *data;
-	u32 data_size;
-	u32 out_data_size;
-	/*indicates if payload passed is encrypted or not - this is used by ISMA, OMA and 3GP*/
-	Bool is_encrypted;
-	/*ISMA payload resync indicator*/
-	u64 isma_BSO;
-	/*CENC sample auxiliary information*/
-	char *sai;
-	u8 IV_size;
-	u32 saiz;
-	//for CENC pattern encryption mode
-	u8 crypt_byte_block, skip_byte_block;
-	u8 constant_IV_size;
-	bin128 constant_IV;
-} GF_IPMPEvent;
-
-/*interface name and version for IPMP tools*/
-#define GF_IPMP_TOOL_INTERFACE		GF_4CC('G','I','P', '1')
-
-typedef struct _ipmp_tool GF_IPMPTool;
-
-struct _ipmp_tool
-{
-	/* interface declaration*/
-	GF_DECL_MODULE_INTERFACE
-
-	/*process an ipmp event*/
-	GF_Err (*process)(GF_IPMPTool *dr, GF_IPMPEvent *evt);
-	/*tool private*/
-	void *udta;
-
-};
-
-
-#ifdef __cplusplus
-}
-#endif
-
-
-#endif	/*#define _GF_MODULE_IPMP_H_
-*/
-

gpac-2.2.1.tar.gz/.github/ISSUE_TEMPLATE.md -> gpac-2.4.0.tar.gz/.github/ISSUE_TEMPLATE.md Changed

gpac-2.4.0.tar.gz/.github/workflows Added

gpac-2.4.0.tar.gz/.github/workflows/ga.yml Added

@@ -0,0 +1,35 @@
+name: GitHub Actions
+run-name: build with docker
+on: push
+
+jobs:
+    master-build-and-deploy:
+        runs-on: ubuntu-latest
+        if:  ${{ github.ref == 'refs/heads/master' && github.event_name == 'push' }}
+        steps:
+            - name: Check out code
+              uses: actions/checkout@v3
+              with:
+                fetch-depth: 0
+            - name: build image
+              run: docker build -t gpac-ubuntu -f build/docker/ubuntu.Dockerfile .
+            - name: check docker images
+              run: docker image list
+            - name: check docker run
+              run: docker run gpac-ubuntu || true
+            - name: login docker hub
+              run: docker login --username gpac  --password ${{secrets.DOCKER_HUB_TOKEN}}
+            - name: tag docker image
+              run: docker tag gpac-ubuntu gpac/ubuntu:latest
+            - name: push docker image
+              run: docker push gpac/ubuntu:latest
+
+
+    other-builds:
+        runs-on: ubuntu-latest
+        if:  ${{ github.ref != 'refs/heads/master' || github.event_name != 'push' }}
+        steps:
+            - name: Check out code
+              uses: actions/checkout@v3
+            - name: build image
+              run: docker build -t gpac-ubuntu -f build/docker/ubuntu.Dockerfile .

gpac-2.2.1.tar.gz/.gitignore -> gpac-2.4.0.tar.gz/.gitignore Changed

gpac-2.2.1.tar.gz/Changelog -> gpac-2.4.0.tar.gz/Changelog Changed

@@ -1,7 +1,60 @@
-# 24/04/2023: GPAC 2.2.1
+#04/2024: GPAC 2.4
 
-## Security 
-- Backport of various CVE fixes
+## Emscripten|WebAssembly(WASM) support
+- Session can run in worker or in main browser loop
+- Automatic disable of ffdec and ffenc threads when not running in worker
+- Use fetch() api for downloader
+- Support for WebCodecs
+- Support for getUserMedia and canvas readable streams
+- gpac.html demo page
+
+## Media Formats
+- Fixes in text subtitle converters
+- Improved DolbyVision muxing from mkv
+- Dasher support for inputs with multiple stsd entries
+- Allow multiplexed representations for LL-HLS
+- Improved eac3 support
+- QT cmov support (reading and writing)
+- QT lpcm support
+- Improved chaptering support
+- Improved timecode inspection
+- Support for big-endian PCM formats
+- Support for uncv (raw video in mp4 and heif)
+- Support for forced subtitles
+- Support for HEVC bitstreams merging in dash (for multi-res tile adaptation)
+ 
+## Filters
+- Async HTTP request in all filters
+- JS/Python/NodeJS bindings for httpout server
+- Fixed CORS and mime types in httpout for wasm and sharedArrayuffer support
+- Allow compilation without threads
+- Allow compilation without network
+- Fixed GF_FileIO for async read and write modes
+- Added seeking in mp4dmx in mem mode
+- vout updated to use VBO (required for gles2)
+- libcaca video output support
+- Allow ffdmx to work as demux filter on gpac input file pids
+- GHI format for pre-indexing DASH/HLS session for JIT packaging/encryption/transcode
+- Zero-copy for mp4dmx and fragmented mp4mx
+- Various speed optimizations (filter session, isomedia lib, disk io, xml)
+- Allow running the session without mutexes
+- Closed Caption decoding filter (CEA708)
+- MPEG-H decoder using IIS mpeghdec
+- Templating for property assignment 
+- Conditional filter replacement to identify based on codecID 
+- Per-filter logging
+
+## MP4Box
+- Add track reordering option
+
+## Misc
+- Migrated doc from github's wiki to wiki.gpac.io
+- FFMPEG 7 support
+- Added features for configure (vout, aout, fonts, doc, evg)
+- Allow specifying network interface by name or IP (instead of IP only)
+- UDP/TCP filtering and recording to / playback from pcap, pcapng and GPAC gpc files
+- Added Nix and Docker build files
+- many bug fixes, improvements and security patches
 
 
 # 19/12/2022: GPAC 2.2
@@ -17,11 +70,11 @@
 - Improved DolbyVision muxing
 
 ## Media player
-- subtitle delay and position adjustment
-- audio delay adjustment
+- Subtitle delay and position adjustment
+- Audio delay adjustment
 
 ## MP4Box
-- allow numbers and media types as identifiers for track actions
+- Allow numbers and media types as identifiers for track actions
 - dlba option to update atmos+ec3 signaling
 
 ## Filters
@@ -29,11 +82,11 @@
 - Thumbnail generator filter
 - Added unframer filter
 - FFMPEG bitstream filters support
-- initseg support in mp4dmx filter
+- Initseg support in mp4dmx filter
 - Access to GPU textures of decoders in Python and JSF bindings (glpush filter for tests)
 - Chapters editing and original timestamp dispatch in reformer range extraction 
-- dual in-band and out-of-band parameter set support in dasher
-- non-blocking IO for RTSP and HTTP servers/clients
+- Dual in-band and out-of-band parameter set support in dasher
+- Non-blocking IO for RTSP and HTTP servers/clients
 - RTSP over HTTP in rtsp server
 - Source-Specific multicast for udp and rtp inputs
 - User Authentication for HTTP and RTSP servers
@@ -45,7 +98,7 @@
 
 ## Misc
 - QT metadata tags in MP4Box and qt muxer 
-- support for some packet properties in URL templates 
+- Support for some packet properties in URL templates
 
 ## DEPRECATED
 - Removed GF_Terminal API
@@ -328,7 +381,7 @@
     * Added temi periodic toggle and manual toggle in MP42TS
 
 # 26/04/2017: GPAC 0.7.1
- - Full changelog at https://github.com/gpac/gpac/wiki/GPAC-0.7.0
+ - Full changelog at https://github.com/gpac/gpac/releases/tag/v0.7.0
  - Many security fixes (static compile and fuzzing through AFL(http://lcamtuf.coredump.cx/afl/), always ongoing)
  - Colorized log.
  - Fix pkg-config Private.libs.
@@ -350,8 +403,8 @@
  - The counter source from the DASH sequences added to the public content.
  - HLS and DASH playback minor fixes.
  - Cleanup of DASH client logs.
- - Added support for DASH SRD in 360 for independent videos videos (NxM partial spheres) more(https://gpac.wp.imt.fr/2016/05/25/srd/)
- - Added support for DASH SRD in 360 for HEV Ctiled videos (NxM tiles on one sphere) - checkout tuto(https://gpac.wp.imt.fr/2017/02/01/hevc-tile-based-adaptation-guide/)
+ - Added support for DASH SRD in 360 for independent videos videos (NxM partial spheres) more(https://gpac.io/2016/05/25/srd/)
+ - Added support for DASH SRD in 360 for HEV Ctiled videos (NxM tiles on one sphere) - checkout tuto(https://gpac.io/2017/02/01/hevc-tile-based-adaptation-guide/)
  - Apple VideoToolBox hardware decoding support for OSX and iOS for AVC|H264.
  - Android hardware decoding hardware acceleration for AVC|H264 (HEVC on its way).
  - Android build is based on Android Studio.

gpac-2.2.1.tar.gz/README.md -> gpac-2.4.0.tar.gz/README.md Changed

@@ -25,13 +25,15 @@
 
 # GPAC Introduction
 
-Latest Release: 2.2.1
+Current version: 2.4
+
+Latest Release: 2.4
 
 GPAC is an open-source multimedia framework focused on modularity and standards compliance.
 GPAC provides tools to process, inspect, package, stream, playback and interact with media content. Such content can be any combination of audio, video, subtitles, metadata, scalable graphics, encrypted media, 2D/3D graphics and ECMAScript.
 GPAC is best-known for its wide MP4/ISOBMFF capabilities and is popular among video enthusiasts, academic researchers, standardization bodies, and professional broadcasters.
 
-For more information, visit GPAC website(http://gpac.io)
+For more information, visit https://gpac.io(https://gpac.io)
 
 GPAC is distributed under the LGPL v2.1 or later, and is also available, for most of it, under a commercial license(https://www.motionspell.com/gpac-licensing).
 
@@ -58,8 +60,8 @@
 - Python and NodeJS bindings
 
 Features are encapsulated in processing modules called filters:
-- to get the full list of available features, you can run the command line `gpac -h filters` or check filters' wiki(https://github.com/gpac/gpac/wiki/Filters).
-- to get the full list of playback features, check the dedicated wiki page(https://github.com/gpac/gpac/wiki/Player-Features).
+- to get the full list of available features, you can run the command line `gpac -h filters` or check filters' wiki(https://wiki.gpac.io/Filters/Filters/).
+- to get the full list of playback features, check the dedicated wiki page(https://wiki.gpac.io/Player/Player/).
 
 
 # Tools
@@ -70,16 +72,16 @@
 
 ## gpac 
 GPAC includes a filter engine in charge of stream management and used by most applications in GPAC - read this post(https://wiki.gpac.io/Rearchitecture) for more discussion on how this impacts MP4Box.
-The gpac application is a direct interface to the filter engine of GPAC, allowing any combinaison of filters not enabled by other applications. See `gpac -h`, `man gpac`, `man gpac-filters` or our wiki(https://wiki.gpac.io/Filters) for more details.
+The gpac application is a direct interface to the filter engine of GPAC, allowing any combination of filters not enabled by other applications. See `gpac -h`, `man gpac`, `man gpac-filters` or our wiki(https://wiki.gpac.io/Filters) for more details.
 
 # Getting started
 ## Download
-Stable and nightly builds installers for Windows, Linux, OSX, Android, iOS are available on gpac.io(https://gpac.wp.imt.fr/downloads/).
+Stable and nightly builds installers for Windows, Linux, OSX, Android, iOS are available on gpac.io(https://gpac.io/downloads/).
 
 If you want to compile GPAC yourself, please follow the instructions in the build section(https://wiki.gpac.io/Build-Introduction) of our wiki.
 
 ## Documentation
-The general GPAC framework documentation is available on wiki.gpac.io(https://wiki.gpac.io), including HowTos(https://github.com/gpac/gpac/wiki/Howtos).
+The general GPAC framework documentation is available on wiki.gpac.io(https://wiki.gpac.io), including HowTos(https://wiki.gpac.io/Howtos/howtos/).
 
 GPAC tools are mostly wrappers around an underlying library called libgpac which can easily be embedded in your projects. The libgpac developer documentation is available at doxygen.gpac.io(https://doxygen.gpac.io), including documentation of JS APIs(https://doxygen.gpac.io/group__jsapi__grp.html), Python APIs(https://doxygen.gpac.io/group__pyapi__grp.html) and NodeJS APIs(https://doxygen.gpac.io/group__nodejs__grp.html).
 
@@ -87,7 +89,7 @@
 ## Testing
 GPAC has a test suite exercising most features of the framework. The test suite is in a separate repository https://github.com/gpac/testsuite/(https://github.com/gpac/testsuite/), but is available as a submodule of the GPAC main repository. To initialize the testsuite submodule, do `git submodule update --init`.
 
-For more details on the test suite, read this page(https://github.com/gpac/gpac/wiki/GPAC_tests) and check the testsuite readme(https://github.com/gpac/testsuite).
+For more details on the test suite, read this page(https://wiki.gpac.io/Build/tests/GPAC_tests/) and check the testsuite readme(https://github.com/gpac/testsuite).
 
 Per-commit build(https://buildbot.gpac.io/) and tests results(https://tests.gpac.io) are available.
 
@@ -99,7 +101,7 @@
 ## Contributing
 A complex project like GPAC wouldn’t exist and persist without the support of its community. Please contribute: a nice message, supporting us in our communication, reporting issues when you see them… any gesture, even the smallest ones, counts. 
 
-If you want to contribute to GPAC, you can find ideas at GSoC page(https://gpac.wp.imt.fr/jobs/google-summer-of-code-ideas/) or look for a good first issue(https://github.com/gpac/gpac/labels/good%20first%20issue). In any doubt please feel free to contact us(mailto:contact@gpac.io).
+If you want to contribute to GPAC, you can find ideas at GSoC page(https://gpac.io/jobs/google-summer-of-code-ideas/) or look for a good first issue(https://github.com/gpac/gpac/labels/good%20first%20issue). In any doubt please feel free to contact us(mailto:contact@gpac.io).
 
 # Team
 GPAC is brought to you by an experienced team of developers with a wide track-record on media processing. 
@@ -114,7 +116,9 @@
 
 ## V2.X
 Targets:
--   Web integration (emscripten, Remotery UI)
 -   DASH event support
--   Better TTML2 / SMPTE ST 2052-1 support
--   GUI cleanup ?
+-   Web GUI
+-   QUIC support
+-   ROUTE file repair support
+-   FLUTE file repair support
+

gpac-2.2.1.tar.gz/applications/Makefile -> gpac-2.4.0.tar.gz/applications/Makefile Changed

gpac-2.2.1.tar.gz/applications/gpac/Makefile -> gpac-2.4.0.tar.gz/applications/gpac/Makefile Changed

@@ -10,15 +10,33 @@
 endif
 
 ifeq ($(GPROFBUILD),yes)
+ifeq ($(CONFIG_DARWIN),yes)
+CFLAGS+=-fprofile-instr-generate
+LDFLAGS+=-fprofile-instr-generate
+else
 CFLAGS+=-pg
 LDFLAGS+=-pg
 endif
+endif
 
 LINKFLAGS=-L../../bin/gcc
 ifeq ($(CONFIG_WIN32),yes)
 EXE=.exe
 PROG=gpac$(EXE)
 LINKFLAGS+=$(UNICODEFLAGS)
+else ifeq ($(CONFIG_EMSCRIPTEN),yes)
+EXT="."$(EM_TYPE)
+PROG="gpac"$(EXT)
+
+#export default symbols and modularize as libgpac
+exports=-sMODULARIZE=1 -sEXPORT_NAME=libgpac -sEXPORTED_RUNTIME_METHODS=cwrap,stackSave,stackRestore,stackAlloc,addFunction,FS,IDBFS,allocateUTF8OnStack,getValue,setValue,UTF8ToString -sEXPORTED_FUNCTIONS=_malloc,_free,_main
+ifeq ($(DISABLE_THREADS),no)
+LINKFLAGS+=$(exports),PThread -sPTHREAD_POOL_SIZE=1 -sPTHREAD_POOL_SIZE_STRICT=0
+else
+LINKFLAGS+=$(exports)
+endif
+#default demo uses IDBFS
+LINKFLAGS+=-lidbfs.js
 else
 EXT=
 PROG=gpac
@@ -36,7 +54,8 @@
 LINKFLAGS+=$(EXTRALIBS)
 else
 LINKFLAGS+=-lgpac
-ifeq ($(CONFIG_DARWIN),yes)
+ifeq ($(CONFIG_EMSCRIPTEN),yes)
+else ifeq ($(CONFIG_DARWIN),yes)
 #LINKFLAGS+= -Wl,-rpath,'@loader_path'
 else
 LINKFLAGS+= -Wl,-rpath,'$$ORIGIN' -Wl,-rpath-link,../../bin/gcc
@@ -46,6 +65,10 @@
 
 #common objs - insert after ../static if any to overwrite list of objects
 OBJS=gpac.o compositor_tools.o gpac_help.o
+ifeq ($(CONFIG_EMSCRIPTEN),yes)
+OBJS+= ../mp4box/mp4box.o ../mp4box/filedump.o ../mp4box/fileimport.o
+endif
+
 
 SRCS := $(OBJS:.o=.c)

gpac-2.2.1.tar.gz/applications/gpac/carbon_hook.c -> gpac-2.4.0.tar.gz/applications/gpac/carbon_hook.c Changed

gpac-2.2.1.tar.gz/applications/gpac/compositor_tools.c -> gpac-2.4.0.tar.gz/applications/gpac/compositor_tools.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2022
+ *			Copyright (c) Telecom ParisTech 2022-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / gpac application
@@ -25,7 +25,7 @@
 
 #include "gpac.h"
 
-#ifndef GPAC_DISABLE_PLAYER
+#ifndef GPAC_DISABLE_COMPOSITOR
 
 #include <gpac/main.h>
 #include <gpac/events.h>
@@ -792,10 +792,9 @@
 	case GF_EVENT_AUTHORIZATION:
 	{
 		u32 nb_retry = 4;
-		assert( evt->type == GF_EVENT_AUTHORIZATION);
-		assert( evt->auth.user);
-		assert( evt->auth.password);
-		assert( evt->auth.site_url);
+		gf_fatal_assert( evt->auth.user);
+		gf_fatal_assert( evt->auth.password);
+		gf_assert( evt->auth.site_url);
 		while ((!strlen(evt->auth.user) || !strlen(evt->auth.password)) && (nb_retry > 0) ) {
 			nb_retry--;
 			fprintf(stderr, "**** Authorization required for site %s ****\n", evt->auth.site_url);
@@ -1192,7 +1191,7 @@
 Bool mp4c_task()
 {
 	if (eos_seen && gf_sc_get_option(compositor, GF_OPT_IS_OVER)) {
-		if (!auto_exit) return GF_FALSE;
+		if (auto_exit) return GF_TRUE;
 		if (!loop_at_end) {
 			gf_sc_disconnect(compositor);
 			return GF_TRUE;
@@ -1515,7 +1514,7 @@
 			e = gf_sc_get_offscreen_buffer(compositor, &fb, offscreen_view-1, 0);
 		} else {
 			sprintf(szFileName, "gpac_video_dump_"LLU".png", gf_net_get_utc() );
-			e = gf_sc_get_screen_buffer(compositor, &fb, 0);
+			e = gf_sc_get_screen_buffer(compositor, &fb, GF_SC_GRAB_DEPTH_NONE);
 		}
 		offscreen_view++;
 		if (e) {
@@ -1639,4 +1638,4 @@
 
 #endif
 
-#endif //#ifndef GPAC_DISABLE_PLAYER
+#endif //#ifndef GPAC_DISABLE_COMPOSITOR

gpac-2.2.1.tar.gz/applications/gpac/gpac.c -> gpac-2.4.0.tar.gz/applications/gpac/gpac.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2017-2022
+ *			Copyright (c) Telecom ParisTech 2017-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / gpac application
@@ -26,6 +26,7 @@
 #include <gpac/main.h>
 #include <gpac/filters.h>
 #include <gpac/thread.h>
+#include <gpac/network.h>
 #include "gpac.h"
 
 /*
@@ -72,6 +73,7 @@
 static Bool runfor_fast = GF_FALSE;
 static u32 exit_mode = 0;
 static Bool enable_prompt = GF_FALSE;
+static Bool exit_nocleanup = GF_FALSE;
 static u32 enable_reports = 0;
 static char *report_filter = NULL;
 static Bool do_unit_tests = GF_FALSE;
@@ -82,24 +84,28 @@
 static Bool custom_event_proc=GF_FALSE;
 static u64 run_start_time = 0;
 
-#ifdef GPAC_CONFIG_ANDROID
-static void reset_static_vars()
+#ifdef GPAC_CONFIG_EMSCRIPTEN
+static Bool has_console;
+void SET_CONSOLE(int code)
 {
-	list_filters = print_filter_info = gen_doc = help_flags = 0;
-	strcpy(separator_set, GF_FS_DEFAULT_SEPS);
-
-	//bools
-	dump_stats = dump_graph = print_meta_filters = load_test_filters = GF_FALSE;
-	runfor_exit = runfor_fast = enable_prompt = use_step_mode = in_sig_handler = custom_event_proc = GF_FALSE;
-	//s32
-	nb_loops = runfor = 0;
-	//u32
-	exit_mode = enable_reports = loops_done = 0;
-	//u64
-	run_start_time = 0;
-	report_filter = NULL;
-	evt_ret_val = GF_OK;
+	if (!has_console) return;
+	switch (code) {
+	case GF_CONSOLE_CLEAR: code = 1; break;
+	case GF_CONSOLE_SAVE: code = 2; break;
+	case GF_CONSOLE_RESTORE: code = 3; break;
+	default: return;
+	}
+	MAIN_THREAD_EM_ASM({
+		libgpac.gpac_set_console($0);
+	}, code);
 }
+#else
+#define SET_CONSOLE(_code)	gf_sys_set_console_code(stderr, _code)
+#endif
+
+
+#if defined(ASAN_ENABLED) && defined(GPAC_CONFIG_EMSCRIPTEN)
+#include <sanitizer/lsan_interface.h>
 #endif
 
 
@@ -108,7 +114,7 @@
 static void cleanup_logs(void);
 static Bool gpac_handle_prompt(GF_FilterSession *fsess, char char_code);
 static void gpac_fsess_task_help(void);
-static const char *make_fileio(const char *inargs, const char **out_arg, Bool is_input, GF_Err *e);
+static const char *make_fileio(const char *inargs, const char **out_arg, u32 mode, GF_Err *e);
 static void cleanup_file_io(void);
 static GF_Filter *load_custom_filter(GF_FilterSession *sess, char *opts, GF_Err *e);
 static u32 gpac_unit_tests(GF_MemTrackerType mem_track);
@@ -133,7 +139,7 @@
 			evt_ret_val = event->message.error;
 		gf_fs_abort(fsess, GF_FS_FLUSH_ALL);
 	}
-#if !defined(GPAC_CONFIG_ANDROID) && !defined(GPAC_DISABLE_PLAYER)
+#if !defined(GPAC_CONFIG_ANDROID) && !defined(GPAC_DISABLE_COMPOSITOR)
 	else if (custom_event_proc) {
 		return mp4c_event_proc(opaque, event);
 	}
@@ -145,7 +151,7 @@
 static Bool gpac_fsess_task(GF_FilterSession *fsess, void *callback, u32 *reschedule_ms)
 {
 	if (enable_prompt && gf_prompt_has_input()) {
-#if !defined(GPAC_CONFIG_ANDROID) && !defined(GPAC_DISABLE_PLAYER)
+#if !defined(GPAC_CONFIG_ANDROID) && !defined(GPAC_DISABLE_COMPOSITOR)
 		if ((compositor_mode==LOAD_MP4C) && mp4c_handle_prompt(gf_prompt_get_char())) {
 
 		} else
@@ -154,7 +160,7 @@
 			return GF_FALSE;
 	}
 
-#if !defined(GPAC_CONFIG_ANDROID) && !defined(GPAC_DISABLE_PLAYER)
+#if !defined(GPAC_CONFIG_ANDROID) && !defined(GPAC_DISABLE_COMPOSITOR)
 	if ((compositor_mode==LOAD_MP4C) && mp4c_task()) {
 		gf_fs_abort(fsess, GF_FS_FLUSH_NONE);
 	}
@@ -194,6 +200,10 @@
 	return GF_TRUE;
 }
 
+#if defined(GPAC_CONFIG_EMSCRIPTEN) && defined(__EMSCRIPTEN_PTHREADS__)
+static void reset_em_thread();
+#endif
+
 static int gpac_exit_fun(int code)
 {
 	u32 i;
@@ -228,7 +238,7 @@
 			".br\nbuild: %s\n"
 			".br\nCopyright: %s\n.br\n"
 			".SH SEE ALSO\n"
-			".LP\ngpac(1), MP4Box(1)\n", gf_gpac_version(), gf_gpac_copyright());
+			".LP\ngpac(1), MP4Box(1)\n", GPAC_VERSION, gf_gpac_copyright());
 		}
 		gf_fclose(helpout);
 	}
@@ -242,20 +252,31 @@
 
 	gf_sys_close();
 
-#ifdef GPAC_CONFIG_ANDROID
-	reset_static_vars();
-#endif
-
-	if (code) return code;
-
 #ifdef GPAC_MEMORY_TRACKING
-	if (gf_memory_size() || gf_file_handles_count() ) {
+	if (!code && (gf_memory_size() || gf_file_handles_count() )) {
 		gf_log_set_tool_level(GF_LOG_MEMORY, GF_LOG_INFO);
 		gf_memory_print();
-		return 2;
+		code = 2;
 	}
 #endif
-	return 0;
+
+#ifdef GPAC_CONFIG_EMSCRIPTEN
+
+#ifdef ASAN_ENABLED
+	fprintf(stdout, "ASAN: checking mem leaks\n");
+	__lsan_do_leak_check();
+#endif
+
+#ifdef __EMSCRIPTEN_PTHREADS__
+	reset_em_thread();
+#endif
+
+	MAIN_THREAD_EM_ASM({
+		if (typeof libgpac.gpac_done == 'function') libgpac.gpac_done($0);
+	}, code);
+#endif
+
+	return code;
 }
 
 u32 get_u32(char *val, char *log_name)
@@ -294,45 +315,209 @@
 }
 #endif
 
+//the main on emscriptem is structured as:
+// main
+//  gpac_run - ends with calling emscripten_set_main_loop_arg
+//
+//  gpac_done (end of main in regular build) is called after last task in em_main_loop
+//
+#ifdef GPAC_CONFIG_EMSCRIPTEN
+#ifdef __EMSCRIPTEN_PTHREADS__
+#include <emscripten/threading.h>
+#endif
+
+static int gpac_run();
+static int gpac_done(GF_Err e, Bool exit_only);
+
+static Bool use_video_display;
+static Bool window_swap;
+static s32 run_steps;
+void gpac_on_video_swap()
+{
+	window_swap = GF_TRUE;
+}
+
+static void em_main_loop(void*arg)
+{
+	u32 run = run_steps;
+	window_swap = GF_FALSE;
+	while (session && run) {
+		GF_Err e = gf_fs_run(session);
+
+		if (gf_fs_is_last_task(session)) {
+			gf_fs_stop(session);
+			gpac_done(GF_OK, GF_FALSE);
+			emscripten_cancel_main_loop();
+			return;
+		}
+		if (e==GF_NOT_READY)
+			break;
+		if (use_video_display && window_swap) {
+			break;
+		}
+		run--;
+	}
+}
+
+s32 em_raf_fps;
+
+void gf_fs_force_non_blocking(GF_FilterSession *fs);
+
+void gpac_force_step_mode(Bool for_display)
+{
+	if (!session) return;
+
+	if (!use_step_mode) {
+		use_step_mode = GF_TRUE;
+		fprintf(stdout, "forcing step mode\n");
+		gf_fs_force_non_blocking(session);
+	}
+	if (for_display) {
+		use_video_display = GF_TRUE;
+		//main loop callback not set, use 0 (let browser choose) since we display
+		if (em_raf_fps<0) em_raf_fps = 0;
+	}
+	else {
+		//audio out, don't force num_steps
+		//if (run_steps<0) run_steps = 1;
+	}
+}
+
+GF_EXPORT
+void gpac_em_sig_handler(int type)
+{
+	if (!session) return;
+	switch (type) {
+	case 1:
+		fprintf(stderr, "Aborting with full flush ...\n");
+		gf_fs_abort(session, GF_FS_FLUSH_ALL);
+		break;
+	case 2:
+		fprintf(stderr, "Aborting with fast flush ...\n");
+		gf_fs_abort(session, GF_FS_FLUSH_FAST);
+		break;
+	case 3:
+		fprintf(stderr, "Aborting without flush %s...\n", nb_loops ? "and stoping loops" : "");
+		gf_fs_abort(session, GF_FS_FLUSH_NONE);
+		nb_loops=0;
+		break;
+	case 4:
+		if (!enable_reports) {
+			enable_reports = 2;
+			report_filter = NULL;
+			gf_fs_set_ui_callback(session, gpac_event_proc, session);
+			gf_fs_enable_reporting(session, GF_TRUE);
+			gpac_print_report(session, GF_TRUE, GF_FALSE);
+		} else {
+			enable_reports = 0;
+			gf_fs_enable_reporting(session, GF_FALSE);
+			SET_CONSOLE(GF_CONSOLE_CLEAR);
+			SET_CONSOLE(GF_CONSOLE_RESTORE);
+		}
+		break;
+	}
+}
+
+#endif
+
+//all vars valid for all loops (-sloop)
+static Bool alias_is_play = GF_FALSE;
+static u32 nb_filters = 0;
+static GF_List *links_directive=NULL;
+static GF_List *loaded_filters=NULL;
+static char *view_conn_for_filter = NULL;
+static GF_SysArgMode argmode = GF_ARGMODE_BASE;
+static u32 sflags=0;
+static Bool override_seps=GF_FALSE;
+static int argc;
+static char **argv;
+static Bool view_filter_conn = GF_FALSE;
+static Bool dump_codecs = GF_FALSE;
+static Bool dump_formats = GF_FALSE;
+static Bool dump_proto_schemes = GF_FALSE;
+static Bool write_profile=GF_FALSE;
+static Bool write_core_opts=GF_FALSE;
+static Bool write_extensions=GF_FALSE;
+static const char *session_js=NULL;
+static Bool has_xopt = GF_FALSE;
+static Bool nothing_to_do = GF_TRUE;
+
+
+#ifndef GPAC_DISABLE_NETWORK
+static Bool enum_net_ifces(void *cbk, const char *name, const char *IP, u32 flags)
+{
+	char *prev_name = cbk;
+	if (strcmp(prev_name, name)) {
+		if (prev_name0) fprintf(stdout, "\n");
+		strcpy(prev_name, name);
+		fprintf(stdout, "%s", name);
+		fprintf(stdout, ": %s", (flags & GF_NETIF_ACTIVE) ? "Up" : "Down");
+		if (flags & GF_NETIF_NO_MCAST) fprintf(stdout, " NoMulticast");
+		if (flags & GF_NETIF_RECV_ONLY) fprintf(stdout, " ReceiveOnly");
+		if (flags & GF_NETIF_LOOPBACK) fprintf(stdout, " Loopback");
+		fprintf(stdout, "\n");
+	}
+	fprintf(stdout, "\tIPv%d %s\n", (flags & GF_NETIF_IPV6) ? 6 : 4, IP ? IP : "address not assigned");
+	return GF_FALSE;
+}
+#endif
+
 #ifndef GPAC_CONFIG_ANDROID
 static
 #endif
-int gpac_main(int argc, char **argv)
+int gpac_main(int _argc, char **_argv)
 {
 	GF_Err e=GF_OK;
 	int i;
 	const char *profile=NULL;
-	const char *session_js=NULL;
-	u32 sflags=0;
-	Bool override_seps=GF_FALSE;
-	Bool write_profile=GF_FALSE;
-	Bool write_core_opts=GF_FALSE;
-	Bool write_extensions=GF_FALSE;
-	GF_List *links_directive=NULL;
-	GF_List *loaded_filters=NULL;
-	GF_SysArgMode argmode = GF_ARGMODE_BASE;
-	u32 nb_filters = 0;
-	Bool nothing_to_do = GF_TRUE;
 	GF_MemTrackerType mem_track=GF_MemTrackerNone;
-	char *view_conn_for_filter = NULL;
-	Bool view_filter_conn = GF_FALSE;
-	Bool dump_codecs = GF_FALSE;
-	Bool dump_formats = GF_FALSE;
-	Bool dump_proto_schemes = GF_FALSE;
 	Bool has_alias = GF_FALSE;
 	Bool alias_set = GF_FALSE;
-	GF_FilterSession *tmp_sess;
-	Bool alias_is_play = GF_FALSE;
-	Bool prev_filter_is_sink;
-	Bool prev_filter_is_not_source;
-	u32 current_subsession_id;
-	u32 current_source_id;
 	Bool do_creds = GF_FALSE;
 	char *creds_args=NULL;
-	Bool has_xopt = GF_FALSE;
 
+	//init static vars
 	helpout = stdout;
-	
+	list_filters = print_filter_info = gen_doc = help_flags = 0;
+	strcpy(separator_set, GF_FS_DEFAULT_SEPS);
+
+	//bools
+	dump_stats = dump_graph = print_meta_filters = load_test_filters = GF_FALSE;
+	runfor_exit = runfor_fast = enable_prompt = use_step_mode = in_sig_handler = custom_event_proc = GF_FALSE;
+	//s32
+	nb_loops = runfor = 0;
+	//u32
+	exit_mode = enable_reports = loops_done = 0;
+	//u64
+	run_start_time = 0;
+	report_filter = NULL;
+	evt_ret_val = GF_OK;
+
+	//initialize all vars valid for all loops (-sloop)
+	argc = _argc;
+	argv = _argv;
+	alias_is_play = GF_FALSE;
+	nb_filters = 0;
+	links_directive=NULL;
+	loaded_filters=NULL;
+	view_conn_for_filter = NULL;
+	session_js=NULL;
+	argmode = GF_ARGMODE_BASE;
+	sflags=0;
+	override_seps = view_filter_conn = dump_codecs = dump_formats = dump_proto_schemes = GF_FALSE;
+	write_profile = write_core_opts = write_extensions = has_xopt = GF_FALSE;
+	nothing_to_do = GF_TRUE;
+
+
+
+#ifdef GPAC_CONFIG_EMSCRIPTEN
+	window_swap = GF_FALSE;
+	use_video_display = GF_FALSE;
+	//default requestAnimationFrame frequency is disabled, if step mode is forced without target fps use 200
+	em_raf_fps = -1;
+	run_steps = -1;
+#endif
+
 #ifdef WIN32
 	Bool gpac_is_global_launch();
 	char *argv_w2;
@@ -372,6 +557,7 @@
 #endif
 
 	if (do_creds) {
+		gf_sys_set_args(argc, (const char **)argv);
 		return gpac_do_creds(creds_args);
 	}
 
@@ -419,7 +605,7 @@
 		gpac_exit(1);
 	}
 
-	if (!profile || strcmp(profile, "0") )
+	if (!profile || (strcmp(profile, "0") && strcmp(profile, "n")) )
 		gpac_load_suggested_filter_args();
 
 #ifndef GPAC_DISABLE_LOG
@@ -433,6 +619,11 @@
 	}
 #endif
 
+	//emscripten, always use step mode by default, unless explicitly disabled by -step=N<0
+#ifdef GPAC_CONFIG_EMSCRIPTEN
+	use_step_mode = GF_TRUE;
+#endif
+
 	for (i=1; i<argc; i++) {
 		char szArgName1024;
 		char *arg = argvi;
@@ -466,8 +657,13 @@
 			} else if (!strcmp(argvi+1, "core")) {
 				gpac_core_help(argmode, GF_FALSE);
 				gpac_exit(0);
-			} else if (!strcmp(argvi+1, "modules")) {
-				gpac_modules_help();
+			} else if (!strcmp(argvi+1, "modules") || !strcmp(argvi+1, "module")) {
+				if (i+2<argc) {
+					gf_sys_mark_arg_used(i+2, GF_TRUE);
+					gpac_modules_help(argvi+2);
+				} else {
+					gpac_modules_help(NULL);
+				}
 				gpac_exit(0);
 			} else if (!strcmp(argvi+1, "doc")) {
 				gpac_filter_help();
@@ -496,7 +692,7 @@
 				gpac_fsess_task_help();
 				gpac_exit(0);
 			} else if (!strcmp(argvi+1, "mp4c")) {
-#if defined(GPAC_CONFIG_ANDROID) || defined(GPAC_DISABLE_PLAYER)
+#if defined(GPAC_CONFIG_ANDROID) || defined(GPAC_DISABLE_COMPOSITOR)
 				gf_sys_format_help(helpout, help_flags, "-mp4c unavailable for android\n");
 #else
 				mp4c_help(argmode);
@@ -526,6 +722,13 @@
 				dump_proto_schemes = GF_TRUE;
 				sflags |= GF_FS_FLAG_LOAD_META | GF_FS_FLAG_NO_GRAPH_CACHE;
 				i++;
+			} else if (!strcmp(argvi+1, "net")) {
+#ifndef GPAC_DISABLE_NETWORK
+				char szName100;
+				szName0=0;
+				gf_net_enum_interfaces(enum_net_ifces, szName);
+#endif
+				gpac_exit(0);
 			} else if (!strcmp(argvi+1, "links")) {
 				view_filter_conn = GF_TRUE;
 				if ((i+2<argc)	&& (argvi+20 != '-')) {
@@ -643,7 +846,7 @@
 				".br\nbuild: %s\n"
 				".br\nCopyright: %s\n.br\n"
 				".SH SEE ALSO\n"
-				".LP\ngpac-filters(1),MP4Box(1)\n", gf_gpac_version(), gf_gpac_copyright());
+				".LP\ngpac-filters(1),MP4Box(1)\n", GPAC_VERSION, gf_gpac_copyright());
 				gf_fclose(helpout);
 
 				helpout = gf_fopen("gpac-filters.1", "w");
@@ -740,6 +943,8 @@
 				enable_prompt = GF_FALSE;
 			else
 				enable_prompt = GF_TRUE;
+		} else if (!strcmp(arg, "-qe")) {
+			exit_nocleanup = GF_TRUE;
 		} else if (!strcmp(arg, "-js")) {
 			session_js = arg_val;
 		} else if (!strcmp(arg, "-r")) {
@@ -755,7 +960,24 @@
 			sflags |= GF_FS_FLAG_NO_IMPLICIT;
 		} else if (!strcmp(arg, "-step")) {
 			use_step_mode = GF_TRUE;
-			sflags |= GF_FS_FLAG_NON_BLOCKING;
+#ifdef GPAC_CONFIG_EMSCRIPTEN
+			if (arg_val) {
+				char *sep = strchr(arg_val, ':');
+				if (sep) sep0 = 0;
+				if (arg_val0) {
+					em_raf_fps = atoi(arg_val);
+					if (em_raf_fps<0) {
+						use_step_mode = GF_FALSE;
+					}
+				}
+				if (sep) {
+					if (sep1) {
+						run_steps = atoi(sep+1);
+					}
+					sep0 = 0;
+				}
+			}
+#endif
 		} else if (!strcmp(arg, "-xopt")) {
 			has_xopt = GF_TRUE;
 #ifdef GPAC_CONFIG_IOS
@@ -765,6 +987,7 @@
 			if (!strcmp(arg, "-i") || !strcmp(arg, "-src")
 				|| !strcmp(arg, "-o") || !strcmp(arg, "-dst")
 				|| !strcmp(arg, "-ib") || !strcmp(arg, "-ob")
+				|| !strcmp(arg, "-ibx")
 			) {
 				//skip next arg: input or output, could start with '-'
 				i++;
@@ -776,7 +999,7 @@
 			}
 			else if (gf_sys_is_gpac_arg(arg) ) {
 			}
-#if !defined(GPAC_CONFIG_ANDROID) && !defined(GPAC_DISABLE_PLAYER)
+#if !defined(GPAC_CONFIG_ANDROID) && !defined(GPAC_DISABLE_COMPOSITOR)
 			else if ((compositor_mode==LOAD_MP4C) && mp4c_parse_arg(arg, arg_val)) {
 			}
 #endif
@@ -791,6 +1014,9 @@
 		}
 	}
 
+	if (use_step_mode)
+		sflags |= GF_FS_FLAG_NON_BLOCKING;
+
 	if (do_unit_tests) {
 		gpac_exit( gpac_unit_tests(mem_track) );
 	}
@@ -804,9 +1030,6 @@
 	}
 	if ((list_filters>=2) || print_meta_filters || dump_codecs || dump_formats || print_filter_info) sflags |= GF_FS_FLAG_LOAD_META;
 
-	if (view_filter_conn || list_filters || (print_filter_info && (argmode == GF_ARGMODE_ALL)) )
-		gf_opts_set_key("temp", "gendoc", "yes");
-
 	if (list_filters || print_filter_info)
 		gf_opts_set_key("temp", "helponly", "yes");
 
@@ -823,13 +1046,39 @@
 	}
 #endif
 
+#ifdef GPAC_CONFIG_EMSCRIPTEN
+	return gpac_run();
+}
+
+static int gpac_run()
+{
+	int i;
+	GF_Err e = GF_OK;
+
+#define ERR_EXIT	return gpac_done(e, GF_TRUE);
+
+#endif
+
+	Bool prev_filter_is_sink = 0;
+	u32 current_subsession_id = 0;
+	Bool prev_filter_is_not_source = 0;
+	u32 current_source_id = 0;
+
+#ifndef GPAC_CONFIG_EMSCRIPTEN
+
+#define ERR_EXIT	goto exit;
+
+//on non-emscrypten, we use goto to avoid recursion - we cannot with emscripten with video support
 restart:
+
 	prev_filter_is_sink = 0;
 	current_subsession_id = 0;
 	prev_filter_is_not_source = 0;
 	current_source_id = 0;
+#endif
+
 
-	if (view_conn_for_filter && argmode>=GF_ARGMODE_EXPERT)
+	if (view_conn_for_filter && (argmode>=GF_ARGMODE_EXPERT))
 		sflags |= GF_FS_FLAG_PRINT_CONNECTIONS;
 
 	session = gf_fs_new_defaults(sflags);
@@ -853,24 +1102,24 @@
 		}
 
 		if (print_filters(argc, argv, argmode)==GF_FALSE)
-			e = GF_FILTER_NOT_FOUND;
-		goto exit;
+			e = GF_NOT_FOUND;
+		ERR_EXIT
 	}
 	if (view_filter_conn) {
 		gf_fs_print_all_connections(session, view_conn_for_filter, gf_sys_format_help);
-		goto exit;
+		ERR_EXIT
 	}
 	if (dump_codecs) {
 		dump_all_codecs(argmode);
-		goto exit;
+		ERR_EXIT
 	}
 	if (dump_formats) {
 		dump_all_formats(argmode);
-		goto exit;
+		ERR_EXIT
 	}
 	if (dump_proto_schemes) {
 		dump_all_proto_schemes(argmode);
-		goto exit;
+		ERR_EXIT
 	}
 	if (write_profile || write_extensions || write_core_opts) {
 		if (write_core_opts)
@@ -879,14 +1128,14 @@
 			write_file_extensions();
 		if (write_profile)
 			write_filters_options();
-		goto exit;
+		ERR_EXIT
 	}
 
 	if (session_js) {
 		e = gf_fs_load_script(session, session_js);
 		if (e) {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_APP, ("Failed to load JS for session: %s\n", gf_error_to_string(e) ));
-			goto exit;
+		ERR_EXIT
 		}
 	}
 
@@ -900,10 +1149,11 @@
 		Bool f_loaded = GF_FALSE;
 		char *arg = argvi;
 
-		if (!strcmp(arg, "-src") || !strcmp(arg, "-i") || !strcmp(arg, "-ib") ) {
-			if (!strcmp(arg, "-ib")) {
+		if (!strcmp(arg, "-src") || !strcmp(arg, "-i") || !strcmp(arg, "-ib")  || !strcmp(arg, "-ibx") ) {
+			if (!strcmp(arg, "-ib") || !strcmp(arg, "-ibx")) {
 				const char *fargs=NULL;
-				const char *fio_url = make_fileio(argvi+1, &fargs, GF_TRUE, &e);
+				Bool test_nocache = !strcmp(arg, "-ibx") ? GF_TRUE : GF_FALSE;
+				const char *fio_url = make_fileio(argvi+1, &fargs, test_nocache ? 2 : 1, &e);
 				if (fio_url)
 					filter = gf_fs_load_source(session, fio_url, fargs, NULL, &e);
 			} else {
@@ -915,7 +1165,7 @@
 		} else if (!strcmp(arg, "-dst") || !strcmp(arg, "-o")  || !strcmp(arg, "-ob") ) {
 			if (!strcmp(arg, "-ob")) {
 				const char *fargs=NULL;
-				const char *fio_url = make_fileio(argvi+1, &fargs, GF_FALSE, &e);
+				const char *fio_url = make_fileio(argvi+1, &fargs, 0, &e);
 				if (fio_url)
 					filter = gf_fs_load_destination(session, fio_url, fargs, NULL, &e);
 			} else {
@@ -957,7 +1207,7 @@
 					strncpy(updated_args, arg, len);
 					updated_argslen=0;
 
-					fio_url = make_fileio(need_gfio+7, &fargs, need_gfio3=='i' ? GF_TRUE : GF_FALSE, &e);
+					fio_url = make_fileio(need_gfio+7, &fargs, need_gfio3=='i' ? 1 : 0, &e);
 					if (fio_url) {
 						gf_dynstrcat(&updated_args, fio_url, NULL);
 						if (fargs)
@@ -968,7 +1218,7 @@
 					gf_free(updated_args);
 				} else {
 					filter = gf_fs_load_filter(session, arg, &e);
-#if !defined(GPAC_CONFIG_ANDROID) && !defined(GPAC_DISABLE_PLAYER)
+#if !defined(GPAC_CONFIG_ANDROID) && !defined(GPAC_DISABLE_COMPOSITOR)
 					if (filter && compositor_mode && !strncmp(arg, "compositor", 10)) {
 						load_compositor(filter);
 					}
@@ -993,7 +1243,7 @@
 				gpac_suggest_filter(arg, GF_FALSE, GF_TRUE);
 				nb_filters=0;
 			}
-			goto exit;
+			ERR_EXIT
 		}
 		nb_filters++;
 
@@ -1022,7 +1272,7 @@
 					if (link_filter_idx < 0) {
 						GF_LOG(GF_LOG_ERROR, GF_LOG_APP, ("Wrong filter index %d, must be positive\n", link_filter_idx));
 						e = GF_BAD_PARAM;
-						goto exit;
+						ERR_EXIT
 					}
 				}
 			} else {
@@ -1038,7 +1288,7 @@
 			if (!link_from) {
 				GF_LOG(GF_LOG_ERROR, GF_LOG_APP, ("Wrong filter index @%d\n", link_filter_idx));
 				e = GF_BAD_PARAM;
-				goto exit;
+				ERR_EXIT
 			}
 			gf_filter_set_source(filter, link_from, link_prev_filter_ext);
 		}
@@ -1072,12 +1322,17 @@
 	if (!gf_list_count(loaded_filters) && !session_js) {
 		if (nothing_to_do && !gen_doc) {
 			GF_LOG(GF_LOG_INFO, GF_LOG_APP, ("Nothing to do, check usage \"gpac -h\"\ngpac - GPAC command line filter engine - version %s\n%s\n", gf_gpac_version(), gf_gpac_copyright_cite()));
-			e = GF_BAD_PARAM;
+			if (argc > 1)
+				e = GF_BAD_PARAM;
 		} else {
 			e = GF_EOS;
 		}
-		goto exit;
+		ERR_EXIT
 	}
+
+	if (gf_opts_get_bool("temp", "use_libcaca"))
+		enable_reports = 0;
+
 	if (enable_reports) {
 		if (enable_reports==2)
 			gf_fs_set_ui_callback(session, gpac_event_proc, session);
@@ -1111,7 +1366,9 @@
 #endif
 			gf_fs_post_user_task(session, gpac_fsess_task, NULL, "gpac_fsess_task");
 	}
-	if (!enable_prompt) {
+	//always enable signal catch even if prompt
+	//if (!enable_prompt)
+	{
 #ifdef WIN32
 		SetConsoleCtrlHandler((PHANDLER_ROUTINE)gpac_sig_handler, TRUE);
 #else
@@ -1125,44 +1382,91 @@
 		gpac_print_report(session, GF_TRUE, GF_FALSE);
 	}
 
+#ifdef GPAC_CONFIG_EMSCRIPTEN
+	if (use_step_mode) {
+		//default is 100 fps (values higher than this tend to have no effect), 10000 steps per frame
+		if (em_raf_fps<0) em_raf_fps=100;
+		if (run_steps<0) {
+			run_steps = 100;
+#ifdef __EMSCRIPTEN_PTHREADS__
+			if (!emscripten_is_main_browser_thread()) run_steps = 10000;
+#endif
+		}
+
+		emscripten_set_main_loop_arg(em_main_loop, session, em_raf_fps, 1);
+		//we are done (rest of function is NOT called)
+	} else {
+		e = gf_fs_run(session);
+		if (e>0) e = GF_OK;
+	}
+#else
 	if (use_step_mode) {
 		do {
 			gf_fs_run(session);
 		} while (!gf_fs_is_last_task(session));
 
+		gf_fs_stop(session);
 	} else {
 		e = gf_fs_run(session);
 		if (e>0) e = GF_OK;
 	}
+#endif
 
-	if (e) {
-		fprintf(stderr, "session error %s\n", gf_error_to_string(e) );
-	} else {
-		e = gf_fs_get_last_connect_error(session);
-		if (e<0) fprintf(stderr, "session last connect error %s\n", gf_error_to_string(e) );
 
-		if (!e) {
-			e = gf_fs_get_last_process_error(session);
-			if (e<0) fprintf(stderr, "session last process error %s\n", gf_error_to_string(e) );
+#ifdef GPAC_CONFIG_EMSCRIPTEN
+
+	return gpac_done(e, GF_FALSE);
+}
+
+static int gpac_done(GF_Err e, Bool exit_only)
+{
+	if (!exit_only)
+#else
+
+exit:
+
+#endif
+
+	{
+		if (e) {
+			if (e!=GF_NOT_FOUND)
+				fprintf(stderr, "session error: %s\n", gf_error_to_string(e) );
+		} else {
+			e = gf_fs_get_last_connect_error(session);
+			if (e<0) fprintf(stderr, "session last connect error %s\n", gf_error_to_string(e) );
+
+			if (!e) {
+				e = gf_fs_get_last_process_error(session);
+				if (e<0) fprintf(stderr, "session last process error %s\n", gf_error_to_string(e) );
+
+				if (evt_ret_val<0) {
+					e = evt_ret_val;
+					fprintf(stderr, "UI last error %s\n", gf_error_to_string(e) );
+				}
+			}
+			if (!exit_nocleanup)
+				gpac_check_session_args();
+		}
 
-			if (evt_ret_val<0) {
-				e = evt_ret_val;
-				fprintf(stderr, "UI last error %s\n", gf_error_to_string(e) );
+		if (enable_reports) {
+			if (enable_reports==2) {
+				SET_CONSOLE(GF_CONSOLE_RESTORE);
 			}
+			gpac_print_report(session, GF_FALSE, GF_TRUE);
+		}
+		if (exit_nocleanup) {
+			gf_fs_stop(session);
+			exit(e ? 1 : 0);
 		}
-		gpac_check_session_args();
-	}
 
-	if (enable_reports) {
-		if (enable_reports==2) {
-			gf_sys_set_console_code(stderr, GF_CONSOLE_RESTORE);
+		if (!dump_graph) {
+			//don't print when generating doc, JS filters are loaded and not connected
+			if (!gf_opts_get_bool("temp", "gendoc") && !gf_opts_get_bool("temp", "helponly") && !view_filter_conn)
+				gf_fs_print_non_connected_ex(session, alias_is_play);
+			alias_is_play = GF_FALSE;
 		}
-		gpac_print_report(session, GF_FALSE, GF_TRUE);
 	}
-	if (!dump_graph)
-		gf_fs_print_non_connected_ex(session, alias_is_play);
 
-exit:
 	if (enable_reports==2) {
 		gf_log_set_callback(session, NULL);
 	}
@@ -1175,16 +1479,18 @@
 	if (dump_graph)
 		gf_fs_print_connections(session);
 
-#if !defined(GPAC_CONFIG_ANDROID) && !defined(GPAC_DISABLE_PLAYER)
+#if !defined(GPAC_CONFIG_ANDROID) && !defined(GPAC_DISABLE_COMPOSITOR)
 	if (compositor_mode)
 		unload_compositor();
 #endif
 
-	tmp_sess = session;
+	GF_FilterSession *tmp_sess = session;
 	session = NULL;
 	gf_fs_del(tmp_sess);
 	if (loaded_filters) gf_list_del(loaded_filters);
 	if (links_directive) gf_list_del(links_directive);
+	links_directive=NULL;
+	loaded_filters=NULL;
 
 	cleanup_file_io();
 
@@ -1197,7 +1503,13 @@
 		fflush(stderr);
 #endif
 		gf_log_reset_file();
+
+#ifdef GPAC_CONFIG_EMSCRIPTEN
+		emscripten_cancel_main_loop();
+		return gpac_run();
+#else
 		goto restart;
+#endif
 	}
 
 	gpac_exit(e<0 ? 1 : 0);
@@ -1236,6 +1548,119 @@
     return gpac_main(argc, argv);
 }
 
+#elif defined(GPAC_CONFIG_EMSCRIPTEN)
+
+int mp4box_main(int argc, char **argv);
+
+#ifdef __EMSCRIPTEN_PTHREADS__
+#include <pthread.h>
+#include <emscripten/stack.h>
+#include <emscripten/eventloop.h>
+
+typedef struct
+{
+	Bool is_mp4box;
+	int argc;
+	char **argv;
+	pthread_t th;
+} RunArgs;
+
+RunArgs run_args = {0};
+
+static void reset_em_thread()
+{
+	memset(&run_args, 0, sizeof(RunArgs));
+}
+static void *_main_thread(void *_ptr)
+{
+	int ret_code;
+
+	emscripten_set_thread_name(pthread_self(), run_args.is_mp4box ? "MP4Box main thread" : "gpac main thread");
+	if (run_args.is_mp4box) {
+		ret_code = mp4box_main(run_args.argc, run_args.argv);
+		//only for mp4box, for gpac we do this in gpac_exit_fun to deal with step mode
+		reset_em_thread();
+		MAIN_THREAD_EM_ASM({
+			if (typeof libgpac.gpac_done == 'function') libgpac.gpac_done($0);
+		}, ret_code);
+	} else {
+		ret_code = gpac_main(run_args.argc, run_args.argv);
+	}
+	return NULL;
+}
+#endif
+
+GF_EXPORT
+Bool gpac_has_threads()
+{
+#ifdef __EMSCRIPTEN_PTHREADS__
+	return GF_TRUE;
+#else
+	return GF_FALSE;
+#endif
+}
+
+void gf_set_mainloop_thread(u32 thread_id);
+
+int main(int argc, char **argv)
+{
+	int ret_code;
+	if (!argc || !argv || !argv0) return 0;
+	int is_mp4box = !stricmp(argv0, "MP4Box") ? 1 : 0;
+
+	//reset mainloop thread id - if using a worker for main, no need to check for sync IOs
+	gf_set_mainloop_thread(0);
+
+	has_console = EM_ASM_INT({
+		if (typeof libgpac.gpac_set_console == 'function') return 1;
+		return 0;
+	});
+
+#ifdef __EMSCRIPTEN_PTHREADS__
+	int use_worker = EM_ASM_INT({
+		if (typeof libgpac.gpac_worker == 'boolean') return libgpac.gpac_worker ? 1 : 0;
+		if (typeof libgpac.gpac_worker == 'number') return libgpac.gpac_worker;
+		return 0;
+	});
+
+	//use proxy thread
+	if (use_worker) {
+		if (run_args.th) {
+			EM_ASM({ throw "Already running"; });
+			return 1;
+		}
+		memset(&run_args, 0, sizeof(RunArgs));
+		run_args.is_mp4box = is_mp4box;
+		run_args.argc = argc;
+		run_args.argv = argv;
+
+		//this is a copy of _emscripten_proxy_main
+		pthread_attr_t attr;
+		pthread_attr_init(&attr);
+		pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
+		pthread_attr_setstacksize(&attr, emscripten_stack_get_base() - emscripten_stack_get_end());
+		emscripten_pthread_attr_settransferredcanvases(&attr, (const char*)-1);
+		int rc = pthread_create(&run_args.th, &attr, _main_thread, NULL);
+		pthread_attr_destroy(&attr);
+		return rc;
+	}
+#endif
+
+	//no proxy, indicate thread id of main loop to debug any blocking fread calls
+	gf_set_mainloop_thread( gf_th_id() );
+
+	if (is_mp4box) {
+		ret_code = mp4box_main(argc, argv);
+		EM_ASM({
+			if (typeof libgpac.gpac_done == 'function')
+				libgpac.gpac_done($0);
+		}, ret_code);
+	} else {
+		ret_code = gpac_main(argc, argv);
+	}
+	return ret_code;
+}
+
 #elif !defined(GPAC_CONFIG_ANDROID)
 
 GF_MAIN_FUNC(gpac_main)
@@ -1567,7 +1992,7 @@
 
 	if (is_init) {
 		if (enable_reports==2)
-			gf_sys_set_console_code(stderr, GF_CONSOLE_SAVE);
+			SET_CONSOLE(GF_CONSOLE_SAVE);
 
 		logs_to_file = gf_log_use_file();
 		if (!logs_to_file && (enable_reports==2) ) {
@@ -1586,14 +2011,14 @@
 
 	last_report_clock_us = now;
 	if (!is_final)
-		gf_sys_set_console_code(stderr, GF_CONSOLE_CLEAR);
+		SET_CONSOLE(GF_CONSOLE_CLEAR);
 
 	gf_sys_get_rti(100, &rti, 0);
-	gf_sys_set_console_code(stderr, GF_CONSOLE_CYAN);
+	SET_CONSOLE(GF_CONSOLE_CYAN);
 	print_date(gf_net_get_utc());
 	fprintf(stderr, "GPAC Session Status: ");
-	gf_sys_set_console_code(stderr, GF_CONSOLE_RESET);
-	fprintf(stderr, "mem % 10"LLD_SUF" kb CPU % 2d", rti.gpac_memory/1000, rti.process_cpu_time);
+	SET_CONSOLE(GF_CONSOLE_RESET);
+	fprintf(stderr, "mem % 10"LLD_SUF" kb CPU % 2d", rti.gpac_memory/1000, rti.process_cpu_usage);
 	fprintf(stderr, "\n");
 
 	gf_fs_lock_filters(fsess, GF_TRUE);
@@ -1608,9 +2033,9 @@
 		if (report_filter && (!strstr(report_filter, stats.reg_name)))
 			continue;
 
-		gf_sys_set_console_code(stderr, GF_CONSOLE_GREEN);
+		SET_CONSOLE(GF_CONSOLE_GREEN);
 		fprintf(stderr, "%s", stats.name ? stats.name : stats.reg_name);
-		gf_sys_set_console_code(stderr, GF_CONSOLE_RESET);
+		SET_CONSOLE(GF_CONSOLE_RESET);
 		if (stats.name && strcmp(stats.name, stats.reg_name))
 			fprintf(stderr, " (%s)", stats.reg_name);
 		fprintf(stderr, ": ");
@@ -1648,10 +2073,10 @@
 
 		fprintf(stderr, "\nLogs:\n");
 		for (i=0; i<log_write; i++) {
-			if (static_logsi.level==GF_LOG_ERROR) gf_sys_set_console_code(stderr, GF_CONSOLE_RED);
-			else if (static_logsi.level==GF_LOG_WARNING) gf_sys_set_console_code(stderr, GF_CONSOLE_YELLOW);
-			else if (static_logsi.level==GF_LOG_INFO) gf_sys_set_console_code(stderr, GF_CONSOLE_GREEN);
-			else gf_sys_set_console_code(stderr, GF_CONSOLE_CYAN);
+			if (static_logsi.level==GF_LOG_ERROR) SET_CONSOLE(GF_CONSOLE_RED);
+			else if (static_logsi.level==GF_LOG_WARNING) SET_CONSOLE(GF_CONSOLE_YELLOW);
+			else if (static_logsi.level==GF_LOG_INFO) SET_CONSOLE(GF_CONSOLE_GREEN);
+			else SET_CONSOLE(GF_CONSOLE_CYAN);
 
 			print_date(static_logsi.clock);
 
@@ -1659,7 +2084,7 @@
 				fprintf(stderr, "repeated %d ", static_logsi.nb_repeat);
 
 			fprintf(stderr, "%s", static_logsi.szMsg);
-			gf_sys_set_console_code(stderr, GF_CONSOLE_RESET);
+			SET_CONSOLE(GF_CONSOLE_RESET);
 		}
 		fprintf(stderr, "\n");
 	}
@@ -1669,6 +2094,7 @@
 
 static Bool revert_cache_file(void *cbck, char *item_name, char *item_path, GF_FileEnumInfo *file_info)
 {
+#ifndef GPAC_DISABLE_NETWORK
 	const char *url;
 	GF_Config *cached;
 	if (strncmp(item_name, "gpac_cache_", 11)) return GF_FALSE;
@@ -1714,6 +2140,7 @@
 	}
 	gf_cfg_del(cached);
 	gf_file_delete(item_path);
+#endif // GPAC_DISABLE_NETWORK
 	return GF_FALSE;
 }
 
@@ -1723,6 +2150,7 @@
 	FILE *filep;
 	char *path;
 	Bool write;
+	u32 io_mode;
 	u32 nb_refs;
 } FileIOCtx;
 
@@ -1741,6 +2169,8 @@
 {
 	FileIOCtx *ioctx = gf_fileio_get_udta(fileio);
 	if (!ioctx || !ioctx->filep) return 0;
+	//flush eos
+	if (!bytes) bytes=1;
 	return (u32) gf_fread(buffer, bytes, ioctx->filep);
 }
 static u32 fio_write(GF_FileIO *fileio, u8 *buffer, u32 bytes)
@@ -1803,7 +2233,8 @@
 		GF_SAFEALLOC(ioctx, FileIOCtx);
 		if (!ioctx) return NULL;
 		ioctx->path = gf_url_concatenate(ioctx_ref->path, url);
-		gfio = gf_fileio_new(ioctx->path, ioctx, fio_open, fio_seek, fio_read, fio_write, fio_tell, fio_eof, fio_printf);
+		ioctx->io_mode = ioctx_ref->io_mode;
+		gfio = gf_fileio_new(ioctx->path, ioctx, fio_open, fio_seek, ioctx->io_mode ? fio_read : NULL, ioctx->io_mode ? NULL : fio_write, fio_tell, fio_eof, fio_printf);
 		if (!gfio) {
 			if (ioctx->path) gf_free(ioctx->path);
 			gf_free(ioctx);
@@ -1841,7 +2272,7 @@
 		file_size = gf_fsize(ioctx_ref->filep);
 		//in test mode we want to use our ftell and fseek wrappers
 		if (strchr(mode, 'r')) {
-			gf_fileio_set_stats(fileio_ref, file_size, file_size, GF_TRUE, 0);
+			gf_fileio_set_stats(fileio_ref, file_size, file_size, (ioctx_ref->io_mode==2) ? GF_FILEIO_NO_CACHE : GF_FILEIO_CACHE_DONE, 0);
 		}
 		return fileio_ref;
 	}
@@ -1877,14 +2308,14 @@
 		} else {
 			ioctx->path = gf_strdup(ioctx_ref->path);
 		}
-		gfio = gf_fileio_new(ioctx->path, ioctx, fio_open, fio_seek, fio_read, fio_write, fio_tell, fio_eof, fio_printf);
+		gfio = gf_fileio_new(ioctx->path, ioctx, fio_open, fio_seek, ioctx_ref->io_mode ? fio_read : NULL, ioctx_ref->io_mode ? NULL : fio_write, fio_tell, fio_eof, fio_printf);
 		if (!gfio) {
 			if (ioctx->path) gf_free(ioctx->path);
 			gf_free(ioctx);
 			*out_err = GF_OUT_OF_MEM;
 		}
 	}
-
+	ioctx->io_mode = ioctx_ref->io_mode;
 	if (strnicmp(url, "gfio://", 7)) {
 		ioctx->filep = gf_fopen(ioctx->path, mode);
 	} else {
@@ -1902,12 +2333,12 @@
 
 	file_size = gf_fsize(ioctx->filep);
 	if (strchr(mode, 'r'))
-		gf_fileio_set_stats(gfio, file_size,file_size, GF_TRUE, 0);
+		gf_fileio_set_stats(gfio, file_size,file_size, (ioctx->io_mode==2) ? GF_FILEIO_NO_CACHE : GF_FILEIO_CACHE_DONE, 0);
 	return gfio;
 }
 
 
-static const char *make_fileio(const char *inargs, const char **out_arg, Bool is_input, GF_Err *e)
+static const char *make_fileio(const char *inargs, const char **out_arg, u32 io_mode, GF_Err *e)
 {
 	FileIOCtx *ioctx;
 	GF_FileIO *fio;
@@ -1926,7 +2357,7 @@
 		sep0 = ':';
 		*out_arg = sep+1;
 	}
-	fio = gf_fileio_new(ioctx->path, ioctx, fio_open, fio_seek, fio_read, fio_write, fio_tell, fio_eof, fio_printf);
+	fio = gf_fileio_new(ioctx->path, ioctx, fio_open, fio_seek, io_mode ? fio_read : NULL, io_mode ? NULL : fio_write, fio_tell, fio_eof, fio_printf);
 	if (!fio) {
 		gf_free(ioctx->path);
 		gf_free(ioctx);
@@ -1940,6 +2371,7 @@
 	gf_list_add(all_gfio_defined, fio);
 	//keep alive until end
 	ioctx->nb_refs = 1;
+	ioctx->io_mode = io_mode;
 	return gf_fileio_url(fio);
 }
 
@@ -2041,8 +2473,10 @@
 			signal_catched = GF_TRUE;
 			if (is_inter) {
 				char input;
+				GF_SessionDebugFlag flags=0;
 				in_sig_handler = GF_TRUE;
-				fprintf(stderr, "\nToggle reports (r), or exit with fast (Y), full (f) or no (n) session flush ? \n");
+				fprintf(stderr, "\nToggle reports (r), print state (s for short, e for extended + shift: sticky)\n"
+					"\tor exit with fast (Y), full (f) or no (n) session flush ? \n");
 rescan:
 				input = gf_getch();
 				if (!input || input == 0x0A || input == 0x0D) input = 'Y'; // user pressed "return"
@@ -2060,6 +2494,7 @@
 				case 0:
 					break;
 				case 'x':
+				case 'X':
 					exit(0);
 					break;
 				case '\n':
@@ -2083,12 +2518,26 @@
 					} else {
 						enable_reports = 0;
 						gf_fs_enable_reporting(session, GF_FALSE);
-						gf_sys_set_console_code(stderr, GF_CONSOLE_CLEAR);
-						gf_sys_set_console_code(stderr, GF_CONSOLE_RESTORE);
+						SET_CONSOLE(GF_CONSOLE_CLEAR);
+						SET_CONSOLE(GF_CONSOLE_RESTORE);
 					}
 					signal_catched = GF_FALSE;
 					signal_processed = GF_FALSE;
 					break;
+				case 'S':
+					flags = GF_FS_DEBUG_CONTINUOUS;
+				case 's':
+					signal_catched = GF_FALSE;
+					signal_processed = GF_FALSE;
+					gf_fs_print_debug_info(session, flags|GF_FS_DEBUG_TASKS|GF_FS_DEBUG_FILTERS);
+					break;
+				case 'E':
+					flags = GF_FS_DEBUG_CONTINUOUS;
+				case 'e':
+					signal_catched = GF_FALSE;
+					signal_processed = GF_FALSE;
+					gf_fs_print_debug_info(session, flags|GF_FS_DEBUG_ALL);
+					break;
 				default:
 					signal_processed = GF_TRUE;
 					gf_fs_abort(session, GF_FS_FLUSH_NONE);
@@ -2500,8 +2949,8 @@
 	gpac_suggest_arg("blcksize");
 	gpac_suggest_filter("outf", GF_FALSE, GF_FALSE);
 	//todo: build tests for these two
-	gf_filter_pid_negociate_property_str(NULL, NULL, NULL);
-	gf_filter_pid_negociate_property_dyn(NULL, NULL, NULL);
+	gf_filter_pid_negotiate_property_str(NULL, NULL, NULL);
+	gf_filter_pid_negotiate_property_dyn(NULL, NULL, NULL);
 
 	gf_props_parse_type("uint");
 	//this one is just a wrapper around an internal function
@@ -2565,6 +3014,8 @@
 	return 0;
 }
 
+#ifndef GPAC_DISABLE_NETWORK
+
 #include <gpac/token.h>
 
 static void to_hex(u8 *data, u32 len, char *out)
@@ -2642,8 +3093,11 @@
 		gf_cfg_set_key(creds, "groups", group, "");
 	}
 }
+#endif
+
 static int gpac_do_creds(char *creds_args)
 {
+#ifndef GPAC_DISABLE_NETWORK
 	GF_Config *creds = NULL;
 
 	const char *cred_file = gf_opts_get_key("core", "users");
@@ -2757,6 +3211,10 @@
 				fprintf(stdout, "Users in group: %s\n", g);
 			} else {
 				fprintf(stdout, "No such group %s\n", creds_args);
+				if (gf_sys_is_test_mode()) {
+					if (creds) gf_cfg_del(creds);
+					return 0;
+				}
 				goto err_exit;
 			}
 		}
@@ -2766,6 +3224,10 @@
 	u32 keys = gf_cfg_get_key_count(creds, creds_args);
 	if (!keys && !is_add) {
 		fprintf(stderr, "No such user %s\n", creds_args);
+		if (gf_sys_is_test_mode()) {
+			if (creds) gf_cfg_del(creds);
+			return 0;
+		}
 		goto err_exit;
 	}
 
@@ -2932,4 +3394,7 @@
 err_exit:
 	if (creds) gf_cfg_del(creds);
 	return 1;
+#else
+	return 1;
+#endif
 }

gpac-2.2.1.tar.gz/applications/gpac/gpac.h -> gpac-2.4.0.tar.gz/applications/gpac/gpac.h Changed

gpac-2.2.1.tar.gz/applications/gpac/gpac.rc -> gpac-2.4.0.tar.gz/applications/gpac/gpac.rc Changed

gpac-2.2.1.tar.gz/applications/gpac/gpac_help.c -> gpac-2.4.0.tar.gz/applications/gpac/gpac_help.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2017-2022
+ *			Copyright (c) Telecom ParisTech 2017-2024
  *					All rights reserved
  *
  *  This file is part of GPAC / gpac application
@@ -81,11 +81,14 @@
 "- pointer: pointer address as formatted by `%p` in C.\n"
 "- string lists: formatted as `val1,val2,...`. Each value can also use `file@FILE` syntax.\n"
 "- integer lists: formatted as `val1,val2,...`\n"
+"\n"
 "Note: The special characters in property formats (0x,/,-,+I,-I,x) cannot be configured.\n"
+"\n"
+"Numbers and fraction can be expressed as `THH:MM:SS.ms`, `TMM:SS.ms`, `THH:MM:SS` or `TMM:SS`, translated into milliseconds.\n"
 "# Filter declaration __FILTER__\n"
 "## Generic declaration\n"
 "Each filter is declared by its name, with optional filter arguments appended as a list of colon-separated `name=value` pairs. Additional syntax is provided for:\n"
-"- boolean: `value` can be omitted, defaulting to `true` (e.g. `:noedit`). Using `!` before the name negates the result (e.g. `:!moof_first`)\n"
+"- boolean: `value` can be omitted, defaulting to `true` (e.g. `:allt`). Using `!` before the name negates the result (e.g. `:!moof_first`)\n"
 "- enumerations: name can be omitted, e.g. `:disp=pbo` is equivalent to `:pbo`.\n"
 "\n  \n"
 "When string parameters are used (e.g. URLs), it is recommended to escape the string using the keyword `gpac`.  \n"
@@ -143,7 +146,6 @@
 "The inverse operation (forcing a decode to happen) is possible using the __reframer__ filter.\n"
 "EX gpac -i file.mp4 reframer:raw=av -o null\n"
 "This will force decoding media from `file.mp4` and trash (send to `null`) the result (doing a decoder benchmark for example).\n"
-"\n"
 "## Escaping option separators\n"
 "When a filter uses an option defined as a string using the same separator character as gpac, you can either "
 "modify the set of separators, or escape the separator by duplicating it. The options enclosed by duplicated "
@@ -244,6 +246,7 @@
 "- name#TYPE: accepts only PIDs of matching media type. TYPE can be `audio`, `video`, `scene`, `text`, `font`, `meta`\n"
 "- name#TYPEN: accepts only `N` (1-based index) PID of matching type from source (e.g. `video2` to only accept second video PID)\n"
 "- name#TAG=VAL: accepts the PID if its parent filter has no tag or a tag matching `VAL`\n"
+"- name#ITAG=VAL: accepts the PID if its parent filter has no inherited tag or an inherited tag matching `VAL`\n"
 "- name#P4CC=VAL: accepts only PIDs with builtin property of type `P4CC` and value `VAL`.\n"
 "- name#PName=VAL: same as above, using the builtin name corresponding to the property.\n"
 "- name#AnyName=VAL: same as above, using the name of a non built-in property.\n"
@@ -330,6 +333,8 @@
 "  \n"
 "A filter may be assigned a tag (any string) using `:TAG=name` option. This tag does not need to be unique, and can be used to exclude filter in link resolution. Tags are not inherited, therefore dynamically loaded filters never have a tag.\n"
 "  \n"
+"A filter may also be assigned an inherited tag (any string) using `:ITAG=name` option. Such tags are inherited, and are typically used to track dynamically loaded filters.\n"
+"  \n"
 "# URL templating\n"
 "Destination URLs can be dynamically constructed using templates. Pattern `$KEYWORD$` is replaced in the template with the "
 "resolved value and `$KEYWORD%%0Nd$` is replaced in the template with the resolved integer, padded with up to N zeros if needed.\n"
@@ -339,6 +344,7 @@
 "- URL: URL of source file\n"
 "- File: path on disk for source file; if not found, use URL if set, or PID name otherwise\n"
 "- Type: name of stream type of PID (`video`, `audio` ...)\n"
+"- OType: same as `Type` but uses original type when stream is encrypted (e.g. move from `crypt` to `video`)\n"
 "- p4cc=ABCD: uses PID property with 4CC value `ABCD`\n"
 "- pname=VAL: uses PID property with name `VAL`\n"
 "- cts, dts, dur, sap: uses properties of first packet in PID at template resolution time\n"
@@ -347,7 +353,7 @@
 "`$$` is an escape for $\n"
 "\n"
 "Templating can be useful when encoding several qualities in one pass.\n"
-"EX gpac -i dump.yuv:size=640x360 vcrop:wnd=0x0x320x180 c=avc:b=1M @2 c=avc:b=750k -o dump_$CropOrigin$x$Width$x$Height$.264:clone\n"
+"EX gpac -i dump.yuv:size=640x360 vcrop:wnd=0x0x320x180 c=avc:b=1M @2 c=avc:b=750k -o dump_$CropOrigin$x$Width$x$Height$.264\n"
 "This will create a cropped version of the source, encoded in AVC at 1M, and a full version of the content in AVC at 750k. "
 "Outputs will be `dump_0x0x320x180.264` for the cropped version and `dump_0x0x640x360.264` for the non-cropped one.\n"
 "# Cloning filters\n"
@@ -356,10 +362,9 @@
 "EX gpac -i img.heif -o dump_$ItemID$.jpg\n"
 "In this case, only one item (likely the first declared in the file) will connect to the destination.\n"
 "Other items will not be connected since the destination only accepts one input PID.\n"
-"There is a special option `clone` allowing filters to be cloned with the same arguments. The cloned filters have the same ID as the original one.\n"
-"EX gpac -i img.heif -o dump_$ItemID$.jpg:clone\n"
+"EX gpac -i img.heif -o dump_$ItemID$.jpg\n"
 "In this case, the destination will be cloned for each item, and all will be exported to different JPEGs thanks to URL templating.\n"
-"EX gpac -i vid.mpd c=avc:FID=1:clone -o transcode.mpd:SID=1\n"
+"EX gpac -i vid.mpd c=avc:FID=1 -o transcode.mpd:SID=1\n"
 "In this case, the encoder will be cloned for each video PIDs in the source, and the destination will only use PIDs coming from the encoders.\n"
 "\n"
 "When implicit linking is enabled, all filters are by default clonable. This allows duplicating the processing for each PIDs of the same type.\n"
@@ -418,6 +423,15 @@
 "This will assign property `MyProp` to `Super Audio` for first audio PID declared.\n"
 "EX gpac -i source.mp4:#MyProp=(Width+1280)HD\n"
 "This will assign property `MyProp` to `HD` for PIDs with property `Width` greater than 1280.\n"
+"\n"
+"The property value can use templates with the following keywords:\n"
+"- $GINC(init,inc) or @GINC(...): replaced by integer for each new output PID of the filter (see specific filter options for details on syntax)\n"
+"- PROP (enclosed between `$` or `@`): replaced by serialized value of property `PROP` (name or 4CC) of the PID or with empty string if no such property\n"
+"EX gpac -i source.ts:#ASID=$PID$\n"
+"This will assign DASH AdaptationSet ID to the PID ID value.\n"
+"EX gpac -i source.ts:#RepresentationID=$ServiceID$\n"
+"This will assign DASH Representation ID to the PID ServiceID value.\n"
+"\n"
 "# Using option files\n"
 "It is possible to use a file to define options of a filter, by specifying the target file name as an option without value, i.e. `:myopts.txt`.\n"
 "Warning: Only local files are allowed.\n"
@@ -428,6 +442,18 @@
 "An option file declaration (`filter:myopts.txt`) follows the same inheritance rules as regular options.\n"
 "EX gpac -i source.mp4:myopts.txt:foo=bar -o dst\n"
 "Any filter loaded between `source.mp4` and `dst` will inherit both `myopts.txt` and `foo` options and will resolve options and PID properties given in `myopts.txt`.\n"
+"\n"
+"# Ignoring filters at run-time\n"
+"The special option `ccp` can be used to replace filters with an identity filter at run-time based on the input codec ID.\n"
+"The option is a list of codec IDs to check. For encoder filters, an empty list reuses the encoder codec type.\n"
+"When the PID codec ID matches one of the specified codec, the filter is replaced with a reframer filter with single PID input and same name and ID.\n"
+"EX -i src c=avc:b=1m:ccp -o mux\n"
+"This will replace the encoder filter with a reframer if the input PID is in AVC|H264 format, or uses the encoder for other visual PIDs.\n"
+"EX -i src c=avc:b=1m:ccp=avc,hevc -o mux\n"
+"This will replace the encoder filter with a reframer if the input PID is in AVC|H264 or HEVC format, or uses the encoder for other visual PIDs.\n"
+"EX -i src cecrypt:cfile=drm.xml:ccp=aac -o mux\n"
+"This will replace the encryptor filter with a reframer if the input PID is in AAC format, or uses the encryptor for other PIDs.\n"
+"\n"
 "# Specific filter options\n"
 "Some specific keywords are replaced when processing filter options.\n"
 "Warning: These keywords do not apply to PID properties. Multiple keywords cannot be defined for a single option.\n"
@@ -453,15 +479,20 @@
 "- FS: sub-session identifier (unsigned int value)\n"
 "- RSID: require sourceID to be present on target filters (no value)\n"
 "- TAG: filter tag (string value)\n"
+"- ITAG: filter inherited tag (string value)\n"
 "- FBT: buffer time in microseconds (unsigned int value)\n"
 "- FBU: buffer units (unsigned int value)\n"
 "- FBD: decode buffer time in microseconds (unsigned int value)\n"
-"- clone: filter cloning flag (no value)\n"
+"- clone: explicitly enable/disable filter cloning flag (no value)\n"
 "- nomux: enable/disable direct file copy (no value)\n"
 "- gfreg: preferred filter registry names for link solving (string value)\n"
 "- gfloc: following options are local to filter declaration, not inherited (no value)\n"
 "- gfopt: following options are not tracked (no value)\n"
 "- gpac: argument separator for URLs (no value)\n"
+"- ccp: filter replacement control (string list value)\n"
+"- NCID: ID of netcap configuration to use (string)\n"
+"- LT: set additionnal log tools and levels for the filter usin same syntax as -logs, e.g. `:LT=filter@debug` (string value)\n"
+"- DBG: debug missing input PID property (`=pid`), missing input packet property (`=pck`) or both (`=all`)\n"
 "\n"
 "The buffer control options are used to change the default buffering of PIDs of a filter:\n"
 "- `FBT` controls the maximum buffer time of output PIDs of a filter\n"
@@ -470,7 +501,7 @@
 "\n"
 "If another filter sends a buffer requirement messages, the maximum value of `FBT` (resp. `FBD`) and the user requested buffer time will be used for output buffer time (resp. decoding buffer time).\n"
 "\n"
-"These options can be set:\n"
+"The options `FBT`, `FBU`, `FBD`  and `DBG` can be set:\n"
 "- per filter instance: `fA reframer:FBU=2`\n"
 "- per filter class for the run: `--reframer@FBU=2`\n"
 "- in the GPAC config file in a per-filter section: `filter@reframerFBU=2`\n"
@@ -503,38 +534,64 @@
 #include <gpac/modules/hardcoded_proto.h>
 #include <gpac/modules/font.h>
 
-void gpac_modules_help(void)
+void gpac_modules_help(char *mod_name)
 {
 	u32 i;
+	if (mod_name) {
+		gf_opts_set_key("temp", "gendoc", "yes");
+		GF_BaseInterface *ifce = gf_modules_load_by_name(mod_name, GF_VIDEO_OUTPUT_INTERFACE, GF_TRUE);
+		if (!ifce) ifce = gf_modules_load_by_name(mod_name, GF_AUDIO_OUTPUT_INTERFACE, GF_TRUE);
+		if (!ifce) ifce = gf_modules_load_by_name(mod_name, GF_FONT_READER_INTERFACE, GF_TRUE);
+		if (!ifce) ifce = gf_modules_load_by_name(mod_name, GF_COMPOSITOR_EXT_INTERFACE, GF_TRUE);
+		if (!ifce) ifce = gf_modules_load_by_name(mod_name, GF_HARDCODED_PROTO_INTERFACE, GF_TRUE);
+
+		if (!ifce) {
+			fprintf(stderr, "No such module %s\n", mod_name);
+			return;
+		}
+		gf_sys_format_help(helpout, help_flags, "%s\n", ifce->description ? ifce->description : "No description available");
+		if (ifce->args) {
+			gf_sys_format_help(helpout, help_flags, "Options:\n");
+			i=0;
+			while (ifce->args && ifce->argsi.name) {
+				gf_sys_print_arg(helpout, help_flags, &ifce->argsi, ifce->module_name);
+				i++;
+			}
+		} else {
+			gf_sys_format_help(helpout, help_flags, "No Option\n");
+		}
+		gf_modules_close_interface(ifce);
+		return;
+	}
 	gf_sys_format_help(helpout, help_flags, "Available modules:\n");
 	for (i=0; i<gf_modules_count(); i++) {
 		char *str = (char *) gf_modules_get_file_name(i);
 		if (!str) continue;
 		gf_sys_format_help(helpout, help_flags | GF_PRINTARG_HIGHLIGHT_FIRST, "%s: implements ", str);
 		if (!strncmp(str, "gm_", 3) || !strncmp(str, "gsm_", 4)) {
-			GF_BaseInterface *ifce = gf_modules_load_by_name(str, GF_VIDEO_OUTPUT_INTERFACE);
+			GF_BaseInterface *ifce = gf_modules_load_by_name(str, GF_VIDEO_OUTPUT_INTERFACE, GF_FALSE);
 			if (ifce) {
-				gf_sys_format_help(helpout, help_flags, "VideoOutput ");
+				gf_sys_format_help(helpout, help_flags, "VideoOutput (%s) ", ifce->module_name);
 				gf_modules_close_interface(ifce);
 			}
-			ifce = gf_modules_load_by_name(str, GF_AUDIO_OUTPUT_INTERFACE);
+			ifce = gf_modules_load_by_name(str, GF_AUDIO_OUTPUT_INTERFACE, GF_FALSE);
 			if (ifce) {
-				gf_sys_format_help(helpout, help_flags, "AudioOutput ");
+				gf_sys_format_help(helpout, help_flags, "AudioOutput (%s) ", ifce->module_name);
 				gf_modules_close_interface(ifce);
 			}
-			ifce = gf_modules_load_by_name(str, GF_FONT_READER_INTERFACE);
+			ifce = gf_modules_load_by_name(str, GF_FONT_READER_INTERFACE, GF_FALSE);
 			if (ifce) {
-				gf_sys_format_help(helpout, help_flags, "FontReader ");
+				gf_sys_format_help(helpout, help_flags, "FontReader (%s) ", ifce->module_name);
 				gf_modules_close_interface(ifce);
 			}
-			ifce = gf_modules_load_by_name(str, GF_COMPOSITOR_EXT_INTERFACE);
+			ifce = gf_modules_load_by_name(str, GF_COMPOSITOR_EXT_INTERFACE, GF_FALSE);
 			if (ifce) {
-				gf_sys_format_help(helpout, help_flags, "CompositorExtension ");
+				gf_sys_format_help(helpout, help_flags, "CompositorExtension (%s) ", ifce->module_name);
 				gf_modules_close_interface(ifce);
 			}
-			ifce = gf_modules_load_by_name(str, GF_HARDCODED_PROTO_INTERFACE);
+			ifce = gf_modules_load_by_name(str, GF_HARDCODED_PROTO_INTERFACE, GF_FALSE);
 			if (ifce) {
-				gf_sys_format_help(helpout, help_flags, "HardcodedProto ");
+				gf_sys_format_help(helpout, help_flags, "HardcodedProto (%s) ", ifce->module_name);
 				gf_modules_close_interface(ifce);
 			}
 		} else {
@@ -663,6 +720,7 @@
 
 	GF_DEF_ARG("stats", NULL, "print stats after execution", NULL, NULL, GF_ARG_BOOL, 0),
 	GF_DEF_ARG("graph", NULL, "print graph after execution", NULL, NULL, GF_ARG_BOOL, 0),
+	GF_DEF_ARG("qe", NULL, "enable quick exit (no mem cleanup)", NULL, NULL, GF_ARG_BOOL, GF_ARG_HINT_EXPERT),
 	GF_DEF_ARG("k", NULL, "enable keyboard interaction from command line", NULL, NULL, GF_ARG_BOOL, GF_ARG_HINT_EXPERT),
 	GF_DEF_ARG("r", NULL, "enable reporting\n"
 			"- r: runtime reporting\n"
@@ -680,9 +738,21 @@
 	GF_DEF_ARG("i", "src", "specify an input file - see filters help (-h doc)(filters_general)", NULL, NULL, GF_ARG_STRING, 0),
 	GF_DEF_ARG("o", "dst", "specify an output file - see filters help (-h doc)(filters_general)", NULL, NULL, GF_ARG_STRING, 0),
 	GF_DEF_ARG("ib", NULL, "specify an input file to wrap as GF_FileIO object (testing of GF_FileIO)", NULL, NULL, GF_ARG_STRING, GF_ARG_HINT_EXPERT),
+	GF_DEF_ARG("ibx", NULL, "specify an input file to wrap as GF_FileIO object without caching (testing of GF_FileIO)", NULL, NULL, GF_ARG_STRING, GF_ARG_HINT_EXPERT),
 	GF_DEF_ARG("ob", NULL, "specify an output file to wrap as GF_FileIO object (testing of GF_FileIO)", NULL, NULL, GF_ARG_STRING, GF_ARG_HINT_EXPERT),
 	GF_DEF_ARG("cl", NULL, "force complete mode when no link directive are set - see filters help (-h doc)(filters_general)", NULL, NULL, GF_ARG_BOOL, GF_ARG_HINT_EXPERT),
+
+#ifdef GPAC_CONFIG_EMSCRIPTEN
+	GF_DEF_ARG("step=FPS:STEPS", NULL, "configure step mode in non-blocking session (enabled by default if no worker). Step mode is driven by requestAnimationFrame\n"
+		"- if `FPS` is 0, let the browser decide (default if video output is used)\n"
+		"- if `FPS` is negative, disable step mode\n"
+		"- if `FPS` is positive, forces the time interval to 1/FPS (default FPS=100)\n"
+		"- if STEPS is set, runs at most STEPS times before returning to the main thread (default is 100)"
+	, NULL, NULL, GF_ARG_BOOL, GF_ARG_HINT_EXPERT),
+#else
 	GF_DEF_ARG("step", NULL, "test step mode in non-blocking session", NULL, NULL, GF_ARG_BOOL, GF_ARG_HINT_EXPERT),
+#endif
+
 	GF_DEF_ARG("h", "help,-ha,-hx,-hh", "print help. Use `-help` or `-h` for basic options, `-ha` for advanced options, `-hx` for expert options and `-hh` for all.  \nNote: The `@` character can be used in place of the `*` character. String parameter can be:\n"
 			"- empty: print command line options help\n"
 			"- doc: print the general filter info\n"
@@ -690,8 +760,10 @@
 			"- log: print the log system help\n"
 			"- core: print the supported libgpac core options. Use -ha/-hx/-hh for advanced/expert options\n"
 			"- cfg: print the GPAC configuration help\n"
+			"- net: print network interfaces\n"
 			"- prompt: print the GPAC prompt help when running in interactive mode (see -k(GPAC) )\n"
 			"- modules: print available modules\n"
+			"- module NAME: print info and options of module `NAME`\n"
 			"- creds: print credential help\n"
 			"- filters: print name of all available filters\n"
 			"- filters:*: print name of all available filters, including meta filters\n"
@@ -712,7 +784,10 @@
 			"- OPT: look in filter names and options for `OPT` and suggest possible matches if none found. Use `-hx` to look for keyword in all option descriptions\n"
 		, NULL, NULL, GF_ARG_STRING, 0),
 
- 	GF_DEF_ARG("p", NULL, "use indicated profile for the global GPAC config. If not found, config file is created. If a file path is indicated, this will load profile from that file. Otherwise, this will create a directory of the specified name and store new config there. Reserved name `0` means a new profile, not stored to disk. Appending `:reload` to the profile name will force recreating a new configuration file", NULL, NULL, GF_ARG_STRING, GF_ARG_HINT_ADVANCED),
+	GF_DEF_ARG("p", NULL, "use indicated profile for the global GPAC config. If not found, config file is created. If a file path is indicated, this will load profile from that file. Otherwise, this will create a directory of the specified name and store new config there. The following reserved names create a temporary profile (not stored on disk):\n"
+		"- 0: full profile\n"
+		"- n: null profile disabling shared modules/filters and system paths in config (may break GUI and other filters)\n"
+		"Appending `:reload` to the profile name will force recreating a new configuration file", NULL, NULL, GF_ARG_STRING, GF_ARG_HINT_ADVANCED),
  	GF_DEF_ARG("alias", NULL, "assign a new alias or remove an alias. Can be specified several times. See alias usage (-h alias)(#using-aliases)", NULL, NULL, GF_ARG_STRING, GF_ARG_HINT_ADVANCED),
  	GF_DEF_ARG("aliasdoc", NULL, "assign documentation for a given alias (optional). Can be specified several times", NULL, NULL, GF_ARG_STRING, GF_ARG_HINT_ADVANCED),
 
@@ -788,6 +863,11 @@
 			gf_sys_format_help(helpout, help_flags, "\n");
 			gpac_alias_help(GF_ARGMODE_BASE);
 		}
+		gf_sys_format_help(helpout, help_flags, "\nReturn codes are 0 for no error, 1 for error"
+#ifdef GPAC_MEMORY_TRACKING
+			" and 2 for memory leak detection when -mem-track is used"
+#endif
+			"\n");
 
 		gf_sys_format_help(helpout, help_flags, "\ngpac - GPAC command line filter engine - version %s\n%s\n", gf_gpac_version(), gf_gpac_copyright_cite() );
 	}
@@ -884,7 +964,7 @@
 "- `reset`: deletes the `users.cfg` file (i.e. deletes all users and groups)\n"
 "- `NAME`: show information of user `NAME`\n"
 "- `+NAME`: adds user `NAME`\n"
-"- `+NAME:I1=V1,I2=V2`: sets info `I1` with value `V1` to user `NAME`. the info name `password` resets password without prompt.\n"
+"- `+NAME:I1=V1,I2=V2`: sets info `I1` with value `V1` to user `NAME`. The info name `password` resets password without prompt.\n"
 "- `-NAME`: removes user `NAME`\n"
 "- `_NAME`: force password change of user `NAME`\n"
 "- `@NAME`: show information of group `NAME`\n"
@@ -896,7 +976,7 @@
 "Passwords are not stored, only a SHA256 hash is stored.\n"
 "\n"
 "Servers using authentication rules can use a configuration file instead of a directory name.\n"
-"This configuration file is organized in sections, each section name descibing a directory.\n"
+"This configuration file is organized in sections, each section name describing a directory.\n"
 "EX somedir\n"
 "EX ru=foo\n"
 "EX rg=bar\n"
@@ -1050,12 +1130,13 @@
 	}
 }
 
-void gpac_suggest_filter(char *fname, Bool is_help, Bool filter_only)
+Bool gpac_suggest_filter(char *fname, Bool is_help, Bool filter_only)
 {
 	Bool found = GF_FALSE;
+	Bool exact_match = GF_FALSE;
 	Bool first = GF_FALSE;
 	u32 i, count, pass_exact = GF_TRUE;
-	if (!fname) return;
+	if (!fname) return GF_FALSE;
 
 	if (filter_only || !is_help) pass_exact = GF_FALSE;
 
@@ -1083,7 +1164,7 @@
 	if (is_help) {
 		if (!pass_exact) {
 			const char *doc_helps = {
-				"log", "core", "modules", "doc", "alias", "props", "colors", "layouts", "cfg", "prompt", "codecs", "formats", "exts", "protocols", "links", "bin", "filters", "filters:*", "filters:@", "mp4c", NULL
+				"log", "core", "modules", "doc", "alias", "props", "colors", "layouts", "cfg", "prompt", "codecs", "formats", "exts", "protocols", "links", "bin", "filters", "filters:*", "filters:@", "mp4c", "net", NULL
 			};
 			first = GF_FALSE;
 			i=0;
@@ -1115,6 +1196,7 @@
 						if (!doc) doc = "Not documented";
 						GF_LOG(GF_LOG_INFO, GF_LOG_APP, ("%s: %s\n", alias, doc));
 						found = GF_TRUE;
+						if (is_help) return GF_TRUE;
 					}
 				}
 				else if (gf_sys_word_match(fname, alias)) {
@@ -1138,15 +1220,21 @@
 				i++;
 
 				if (gf_sys_word_match(fname, arg->name)) {
-					if (!first) {
+					if (!strcmp(fname, arg->name)) {
+						gf_sys_format_help(helpout, help_flags | GF_PRINTARG_HIGHLIGHT_FIRST, "-%s: %s\n", arg->name, arg->description);
 						first = GF_TRUE;
-						if (!found) {
-							GF_LOG(GF_LOG_ERROR, GF_LOG_APP, ("No such filter %s\n", fname));
-							found = GF_TRUE;
+						exact_match = GF_TRUE;
+					} else {
+						if (!first) {
+							first = GF_TRUE;
+							if (!found) {
+								GF_LOG(GF_LOG_ERROR, GF_LOG_APP, ("No such filter %s\n", fname));
+								found = GF_TRUE;
+							}
+							GF_LOG(GF_LOG_WARNING, GF_LOG_APP, ("\nClosest core option: \n"));
 						}
-						GF_LOG(GF_LOG_WARNING, GF_LOG_APP, ("\nClosest core option: \n"));
+						GF_LOG(GF_LOG_INFO, GF_LOG_APP, ("-%s: %s\n", arg->name, arg->description));
 					}
-					GF_LOG(GF_LOG_INFO, GF_LOG_APP, ("-%s: %s\n", arg->name, arg->description));
 				}
 			}
 
@@ -1163,11 +1251,13 @@
 
 					if (pass_exact) {
 						if (!strcmp(fname, arg->arg_name)) {
-							gf_sys_format_help(helpout, help_flags | GF_PRINTARG_HIGHLIGHT_FIRST, "%s.%s %s\n", reg->name, arg->arg_name, arg->arg_desc);
+							gf_sys_format_help(helpout, help_flags | GF_PRINTARG_HIGHLIGHT_FIRST, "%s.%s: %s\n", reg->name, arg->arg_name, arg->arg_desc);
 							found = GF_TRUE;
+							exact_match = GF_TRUE;
 						}
 						continue;
 					}
+
 					if (!gf_sys_word_match(fname, arg->arg_name)) continue;
 
 					if (!first) {
@@ -1176,7 +1266,7 @@
 							GF_LOG(GF_LOG_ERROR, GF_LOG_APP, ("No such filter %s\n", fname));
 							found = GF_TRUE;
 						}
-						GF_LOG(GF_LOG_WARNING, GF_LOG_APP, ("\nClosest matching filter options:\n", fname));
+						GF_LOG(GF_LOG_WARNING, GF_LOG_APP, ("\nClosest matching filter options:\n"));
 					}
 					gf_sys_format_help(helpout, help_flags | GF_PRINTARG_HIGHLIGHT_FIRST, "%s.%s \n", reg->name, arg->arg_name);
 				}
@@ -1188,7 +1278,7 @@
 			const GF_BuiltInProperty *prop_info;
 			while ((prop_info = gf_props_get_description(i))) {
 				i++;
-				if (!prop_info->name || !prop_info->description) continue;
+				if (!prop_info->name) continue;
 				
 				if (gf_sys_word_match(fname, prop_info->name)) {
 					if (!first) {
@@ -1199,12 +1289,17 @@
 						}
 						GF_LOG(GF_LOG_WARNING, GF_LOG_APP, ("\nClosest property name: \n"));
 					}
+#ifndef GPAC_DISABLE_DOC
 					GF_LOG(GF_LOG_INFO, GF_LOG_APP, ("%s: %s\n", prop_info->name, prop_info->description));
+#else
+					GF_LOG(GF_LOG_INFO, GF_LOG_APP, ("%s\n", prop_info->name));
+#endif
 				}
 			}
 
 		}
 	}
+	if (exact_match) return GF_TRUE;
 	if (!found) {
 		if (pass_exact) {
 			pass_exact = GF_FALSE;
@@ -1216,6 +1311,7 @@
 			is_help ? ", gpac -h or search all help using gpac -hx" : ""
 		));
 	}
+	return GF_FALSE;
 }
 
 static void gpac_suggest_filter_arg(GF_Config *opts, const char *argname, u32 atype)
@@ -1324,7 +1420,7 @@
 		if (gf_fs_enum_unmapped_options(session, &idx, &argname, &argtype, &meta_name, &meta_opt)==GF_FALSE)
 			break;
 
-		if (meta_name) {
+		if (meta_name && (argtype!=1)) {
 			if (meta_opt) {
 				GF_LOG(GF_LOG_ERROR, GF_LOG_APP, ("Filter %s:%s value \"%s\" set but not used\n", meta_name, meta_opt, argname));
 			} else {
@@ -1400,7 +1496,10 @@
 		gf_sys_format_help(helpout, help_flags | GF_PRINTARG_HIGHLIGHT_FIRST, "%s", a->arg_name);
 		gf_sys_format_help(helpout, help_flags, "</a> (%s", is_enum ? "enum" : gf_props_get_type_name(a->arg_type));
 	} else {
-		gf_sys_format_help(helpout, help_flags | GF_PRINTARG_HIGHLIGHT_FIRST, "%s (%s", a->arg_name, is_enum ? "enum" : gf_props_get_type_name(a->arg_type));
+		gf_sys_format_help(helpout, help_flags | GF_PRINTARG_HIGHLIGHT_FIRST, "%s (%s%s", a->arg_name,
+			is_enum ? "enum" : gf_props_get_type_name(a->arg_type),
+			(a->flags & GF_FS_ARG_META_ARRAY) ? " array" : ""
+		);
 	}
 	if (a->arg_default_val) {
 		if (!strcmp(a->arg_default_val, "2147483647"))
@@ -1413,10 +1512,11 @@
 //		gf_sys_format_help(helpout, help_flags, ", no default");
 	}
 	if (a->min_max_enum && !is_enum) {
+		const char *min_max_type = strchr(a->min_max_enum, '|') ? "Enum" : "minmax";
 		if (!strcmp(a->min_max_enum, "-2147483648-I"))
-			gf_sys_format_help(helpout, help_flags, ", %s: -I-I", /*strchr(a->min_max_enum, '|') ? "Enum" : */"minmax");
+			gf_sys_format_help(helpout, help_flags, ", %s: -I-I", min_max_type);
 		else
-			gf_sys_format_help(helpout, help_flags, ", %s: %s", /*strchr(a->min_max_enum, '|') ? "Enum" : */"minmax", a->min_max_enum);
+			gf_sys_format_help(helpout, help_flags, ", %s: %s", min_max_type, a->min_max_enum);
 	}
 	if (a->flags & GF_FS_ARG_UPDATE) gf_sys_format_help(helpout, help_flags, ", updatable");
 //		if (a->flags & GF_FS_ARG_META) gf_sys_format_help(helpout, help_flags, ", meta");
@@ -1432,7 +1532,9 @@
 		GF_GPACArg _a;
 		memset(&_a, 0, sizeof(GF_GPACArg));
 		_a.name = a->arg_name;
+#ifndef GPAC_DISABLE_DOC
 		_a.description = a->arg_desc;
+#endif
 		_a.flags = GF_ARG_HINT_HIDE;
 		gf_sys_print_arg(NULL, 0, &_a, "");
 	}
@@ -1739,7 +1841,12 @@
 
 			if (a->min_max_enum) {
 				//check format
-                if ((a->arg_type!=GF_PROP_UINT_LIST) && !(a->flags&GF_FS_ARG_META) && strchr(a->min_max_enum, '|') && (!a->arg_default_val || strcmp(a->arg_default_val, "-1")) ) {
+                if ((a->arg_type!=GF_PROP_UINT_LIST)
+					&& (a->arg_type<GF_PROP_FIRST_ENUM)
+					&& !(a->flags&GF_FS_ARG_META)
+					&& strchr(a->min_max_enum, '|')
+					&& (!a->arg_default_val || strcmp(a->arg_default_val, "-1"))
+				) {
 					const char *a_val = a->min_max_enum;
 					while (a_val0 == '|') a_val++;
 					if (strstr(a->arg_desc, "see filter "))
@@ -2087,13 +2194,17 @@
 
 	if (found) return GF_TRUE;
 
-	gpac_suggest_filter(fname, GF_TRUE, GF_FALSE);
+	if (gpac_suggest_filter(fname, GF_TRUE, GF_FALSE))
+		return GF_TRUE;
 	return GF_FALSE;
 }
 
 void dump_all_props(char *pname)
 {
-	u32 i=0, pname_len = pname ? (u32) strlen(pname) : 0;
+	u32 i=0;
+#ifndef GPAC_DISABLE_DOC
+	u32 pname_len = pname ? (u32) strlen(pname) : 0;
+#endif
 	const GF_BuiltInProperty *prop_info;
 
 	if (gen_doc==1) {
@@ -2102,7 +2213,7 @@
 
 		gf_sys_format_help(helpout, help_flags, "Name | Description  \n");
 		gf_sys_format_help(helpout, help_flags, "--- | ---  \n");
-		for (i=GF_PROP_FORBIDEN+1; i<GF_PROP_LAST_DEFINED; i++) {
+		for (i=GF_PROP_FORBIDDEN+1; i<GF_PROP_LAST_DEFINED; i++) {
 			if (i==GF_PROP_STRING_NO_COPY) continue;
 			if (i==GF_PROP_DATA_NO_COPY) continue;
 			if (i==GF_PROP_STRING_LIST_COPY) continue;
@@ -2122,7 +2233,7 @@
 		gf_sys_format_help(helpout, help_flags, "Built-in properties matching `%s` for PIDs and packets listed as `Name (4CC type FLAGS): description`\n`FLAGS` can be D (droppable - see GSF multiplexer filter help), P (packet property)\n", pname);
 	} else {
 		gf_sys_format_help(helpout, help_flags, "Built-in property types\n");
-		for (i=GF_PROP_FORBIDEN+1; i<GF_PROP_LAST_DEFINED; i++) {
+		for (i=GF_PROP_FORBIDDEN+1; i<GF_PROP_LAST_DEFINED; i++) {
 			if (i==GF_PROP_STRING_NO_COPY) continue;
 			if (i==GF_PROP_DATA_NO_COPY) continue;
 			if (i==GF_PROP_STRING_LIST_COPY) continue;
@@ -2151,21 +2262,32 @@
 
 			gf_sys_format_help(helpout, help_flags | GF_PRINTARG_NL_TO_BR, "%s | %s | %s | %s | %s  \n", prop_info->name,  gf_props_get_type_name(prop_info->data_type),
 				szFlags,
+#ifndef GPAC_DISABLE_DOC
 			 	prop_info->description,
+#else
+				"not available in build",
+#endif
 			 	gf_4cc_to_str(prop_info->type)
 			);
 		} else if (gen_doc==2) {
 			gf_sys_format_help(helpout, help_flags, ".TP\n.B %s (%s,%s,%s%s)\n%s\n", prop_info->name, gf_4cc_to_str(prop_info->type), gf_props_get_type_name(prop_info->data_type),
 			 	(prop_info->flags & GF_PROP_FLAG_GSF_REM) ? "D" : " ",
 			 	(prop_info->flags & GF_PROP_FLAG_PCK) ? "P" : " ",
-				prop_info->description);
+#ifndef GPAC_DISABLE_DOC
+				prop_info->description
+#else
+				"not available in build"
+#endif
+			);
 		} else {
 			u32 len;
 			const char *ptype;
 
 			if (pname) {
 				if (gf_sys_word_match(prop_info->name, pname)) {}
+#ifndef GPAC_DISABLE_DOC
 				else if (gf_strnistr(prop_info->description, pname, pname_len)) {}
+#endif
 				else continue;
 			}
 			szFlags0=0;
@@ -2186,8 +2308,13 @@
 				len++;
 			}
 
-			gf_sys_format_help(helpout, help_flags, "%s", prop_info->description);
-
+			gf_sys_format_help(helpout, help_flags, "%s",
+#ifndef GPAC_DISABLE_DOC
+				prop_info->description
+#else
+				"not available in build"
+#endif
+			);
 			if (prop_info->data_type==GF_PROP_PIXFMT) {
 				gf_sys_format_help(helpout, help_flags, "\n\tNames: %s\n\tFile extensions: %s", gf_pixel_fmt_all_names(), gf_pixel_fmt_all_shortnames() );
 			} else if (prop_info->data_type==GF_PROP_PCMFMT) {
@@ -2331,6 +2458,7 @@
 	const char *name;
 	u64 layout;
 
+	gf_sys_format_help(helpout, help_flags, "CICP Layouts as \"name (index): flags\"\n");
 	while ((cicp = gf_audio_fmt_cicp_enum(i, &name, &layout)) ) {
 		gf_sys_format_help(helpout, help_flags|GF_PRINTARG_HIGHLIGHT_FIRST, "%s (%d): 0x%016"LLX_SUF"\n", name, cicp, layout);
 		i++;
@@ -2478,7 +2606,7 @@
 				break;
 			}
 			for (k=0; k<count; k++) {
-				if (k==i) continue;;
+				if (k==i) continue;
 				reg = gf_list_get(meta_codecs, k);
 				const char *rname = strchr(reg->name, ':');
 				if (rname) rname++;
@@ -3012,6 +3140,7 @@
 		Language file creation / update functions
 *********************************************************/
 
+#ifndef GPAC_DISABLE_DOC
 static Bool lang_updated = GF_FALSE;
 static void gpac_lang_set_key(GF_Config *cfg, const char *sec_name,  const char *key_name, const char *key_val)
 {
@@ -3042,9 +3171,11 @@
 		lang_updated = GF_TRUE;
 	}
 }
+#endif
 
 int gpac_make_lang(char *filename)
 {
+#ifndef GPAC_DISABLE_DOC
 	GF_Config *cfg;
 	u32 i;
 	gf_sys_init(GF_MemTrackerNone, NULL);
@@ -3130,6 +3261,10 @@
 	gf_fs_del(session);
 	gf_sys_close();
 	return 0;
+#else
+	gf_sys_format_help(helpout, help_flags, "Documentation disabled in build, cannot create language file\n");
+	return 1;
+#endif
 }
 
 
@@ -3335,7 +3470,7 @@
 		argva_idx = o_argvi;
 		a_idx++;
 	}
-	assert(argc==a_idx);
+	gf_assert(argc==a_idx);
 
 	for (i=0; i< (u32) argc; i++) {
 		char *arg = argvi;

gpac-2.2.1.tar.gz/applications/gpac/ios-Info.plist -> gpac-2.4.0.tar.gz/applications/gpac/ios-Info.plist Changed

gpac-2.2.1.tar.gz/applications/mp4box/Makefile -> gpac-2.4.0.tar.gz/applications/mp4box/Makefile Changed

gpac-2.2.1.tar.gz/applications/mp4box/filedump.c -> gpac-2.4.0.tar.gz/applications/mp4box/filedump.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2022
+ *			Copyright (c) Telecom ParisTech 2000-2024
  *					All rights reserved
  *
  *  This file is part of GPAC / mp4box application
@@ -25,7 +25,7 @@
 
 #include "mp4box.h"
 
-#if defined(GPAC_DISABLE_ISOM) || defined(GPAC_DISABLE_ISOM_WRITE)
+#if defined(GPAC_DISABLE_ISOM)
 
 #error "Cannot compile MP4Box if GPAC is not built with ISO File Format support"
 
@@ -597,19 +597,22 @@
 		if (graph_type==0) {
 			u32 all;
 			gf_node_mpeg4_type_by_class_name(name);
+#ifndef GPAC_DISABLE_BIFS
 			gf_bifs_get_child_table(node);
 			all = gf_node_get_num_fields_in_mode(node, GF_SG_FIELD_CODING_ALL);
 			for (i=0; i<all; i++) {
 				u32 res;
 				gf_sg_script_get_field_index(node, i, GF_SG_FIELD_CODING_ALL, &res);
 			}
-
 			gf_node_get_num_fields_in_mode(node, GF_SG_FIELD_CODING_DEF);
 			gf_node_get_num_fields_in_mode(node, GF_SG_FIELD_CODING_IN);
 			gf_node_get_num_fields_in_mode(node, GF_SG_FIELD_CODING_OUT);
 			gf_node_get_num_fields_in_mode(node, GF_SG_FIELD_CODING_DYN);
+#endif
 		}
+#ifndef GPAC_DISABLE_X3D
 		else if (graph_type==1) gf_node_x3d_type_by_class_name(name);
+#endif
 		for (ndt=NDT_SFWorldNode; ndt<NDT_LAST; ndt++) {
 			gf_node_in_table_by_tag(gf_node_get_tag(node), ndt);
 		}
@@ -820,6 +823,7 @@
 #ifndef GPAC_DISABLE_ISOM_DUMP
 		gf_isom_dump_supported_box(i, stdout);
 #endif
+#ifndef GPAC_DISABLE_ISOM_WRITE
         if (do_cov) {
 			u32 btype = gf_isom_get_supported_box_type(i);
             GF_Box *b=gf_isom_box_new(btype);
@@ -830,6 +834,7 @@
                 gf_isom_box_del(b);
             }
         }
+#endif
 	}
 	fprintf(stdout, "</Boxes>\n");
 	if (do_cov) {
@@ -1009,9 +1014,11 @@
 
 			gf_isom_sample_del(&samp);
 
+#ifndef GPAC_DISABLE_ISOM_FRAGMENTS
 			if (is_fragmented) {
 				fprintf(dump, "\t%d", gf_isom_sample_is_fragment_start(file, i+1, j+1, NULL) );
 			}
+#endif
 			fprintf(dump, "\n");
 			gf_set_progress("Dumping track timing", j+1, count);
 		}
@@ -1041,7 +1048,7 @@
 	return nal_size;
 }
 
-#ifndef GPAC_DISABLE_AV_PARSERS
+#if !defined(GPAC_DISABLE_AV_PARSERS) && !defined(GPAC_DISABLE_INSPECT)
 void gf_inspect_dump_nalu(FILE *dump, u8 *ptr, u32 ptr_size, Bool is_svc, HEVCState *hevc, AVCState *avc, VVCState *vvc, u32 nalh_size, Bool dump_crc, Bool is_encrypted);
 #endif
 
@@ -1082,7 +1089,7 @@
 
 	fprintf(dump, "<NALUTrack trackID=\"%d\" SampleCount=\"%d\" TimeScale=\"%d\">\n", trackID, count, timescale);
 
-#ifndef GPAC_DISABLE_AV_PARSERS
+#if !defined(GPAC_DISABLE_AV_PARSERS) && !defined(GPAC_DISABLE_INSPECT)
 
 #define DUMP_ARRAY(arr, name, loc, _is_svc)\
 	if (arr) {\
@@ -1277,7 +1284,7 @@
 
 		dts = samp->DTS;
 		cts = dts + (s32) samp->CTS_Offset;
-		is_rap = samp->IsRAP;
+		is_rap = samp->IsRAP ? GF_TRUE : GF_FALSE;
 		if (!is_rap) gf_isom_get_sample_rap_roll_info(file, track, i+1, &is_rap, NULL, NULL);
 
 		if (dump_flags&2) {
@@ -1319,7 +1326,7 @@
 				break;
 			} else {
 				fprintf(dump, "   <NALU size=\"%d\" ", nal_size);
-#ifndef GPAC_DISABLE_AV_PARSERS
+#if !defined(GPAC_DISABLE_AV_PARSERS) && !defined(GPAC_DISABLE_INSPECT)
 				Bool is_encrypted = 0;
 				if (is_cenc_protected) {
 					e = gf_isom_get_sample_cenc_info(file, track, i + 1, &is_encrypted, NULL, NULL, NULL, NULL);
@@ -1368,41 +1375,41 @@
 	Bool is_prores = GF_FALSE;
     Bool is_opus = GF_FALSE;
 
-	FILE *dump;
-	if (inName) {
-		GF_ESD* esd;
-
-		strcpy(szFileName, inName);
-
-		u32 track = gf_isom_get_track_by_id(file, trackID);
-		esd = gf_isom_get_esd(file, track, 1);
+	u32 track = gf_isom_get_track_by_id(file, trackID);
+	GF_ESD* esd = gf_isom_get_esd(file, track, 1);
 
-		if (!esd || !esd->decoderConfig) {
-			switch (gf_isom_get_media_subtype(file, track, 1)) {
-			case GF_ISOM_SUBTYPE_AV01:
-				is_av1 = GF_TRUE;
-				break;
-			case GF_QT_SUBTYPE_APCH:
-			case GF_QT_SUBTYPE_APCO:
-			case GF_QT_SUBTYPE_APCN:
-			case GF_QT_SUBTYPE_APCS:
-			case GF_QT_SUBTYPE_AP4X:
-			case GF_QT_SUBTYPE_AP4H:
-				is_prores = GF_TRUE;
-				break;
-            case GF_ISOM_SUBTYPE_OPUS:
-                is_opus = GF_TRUE;
-                break;
-			}
-		}
-		else if (esd->decoderConfig->objectTypeIndication == GF_CODECID_AV1) {
+	if (!esd || !esd->decoderConfig) {
+		switch (gf_isom_get_media_subtype(file, track, 1)) {
+		case GF_ISOM_SUBTYPE_AV01:
 			is_av1 = GF_TRUE;
-        } else if (esd->decoderConfig->objectTypeIndication == GF_CODECID_OPUS) {
-            is_opus = GF_TRUE;
-        }
-		if (esd) gf_odf_desc_del((GF_Descriptor*)esd);
+			break;
+		case GF_QT_SUBTYPE_APCH:
+		case GF_QT_SUBTYPE_APCO:
+		case GF_QT_SUBTYPE_APCN:
+		case GF_QT_SUBTYPE_APCS:
+		case GF_QT_SUBTYPE_AP4X:
+		case GF_QT_SUBTYPE_AP4H:
+			is_prores = GF_TRUE;
+			break;
+		case GF_ISOM_SUBTYPE_OPUS:
+			is_opus = GF_TRUE;
+			break;
+		}
+	}
+	else if (esd->decoderConfig->objectTypeIndication == GF_CODECID_AV1) {
+		is_av1 = GF_TRUE;
+	} else if (esd->decoderConfig->objectTypeIndication == GF_CODECID_OPUS) {
+		is_opus = GF_TRUE;
+	}
+	if (esd) gf_odf_desc_del((GF_Descriptor*)esd);
 
-		if (!is_final_name) sprintf(szFileName, "%s_%d_%s.xml", inName, trackID, is_av1 ? "obu" : "nalu");
+	FILE *dump;
+	if (inName) {
+		if (is_final_name) {
+			strcpy(szFileName, inName);
+		} else {
+			sprintf(szFileName, "%s_%d_%s.xml", inName, trackID, is_av1 ? "obu" : "nalu");
+		}
 		dump = gf_fopen(szFileName, "wt");
 		if (!dump) {
 			M4_LOG(GF_LOG_ERROR, ("Failed to open %s for dumping\n", szFileName));
@@ -1439,14 +1446,14 @@
 	return e;
 }
 
-#ifndef GPAC_DISABLE_AV_PARSERS
+#if !defined(GPAC_DISABLE_AV_PARSERS) && !defined(GPAC_DISABLE_INSPECT)
 void gf_inspect_dump_opus(FILE *dump, u8 *ptr, u64 size, u32 channel_count, Bool dump_crc);
 #endif
 
 static GF_Err dump_isom_opus(GF_ISOFile *file, GF_ISOTrackID trackID, FILE *dump, Bool dump_crc)
 {
     GF_Err e = GF_OK;
-#ifndef GPAC_DISABLE_AV_PARSERS
+#if !defined(GPAC_DISABLE_AV_PARSERS) && !defined(GPAC_DISABLE_INSPECT)
     u32 i, count, track, timescale, channel_count;
     GF_OpusConfig opcfg;
     track = gf_isom_get_track_by_id(file, trackID);
@@ -1507,14 +1514,14 @@
     return e;
 }
 
-#ifndef GPAC_DISABLE_AV_PARSERS
+#if !defined(GPAC_DISABLE_AV_PARSERS) && !defined(GPAC_DISABLE_INSPECT)
 void gf_inspect_dump_obu(FILE *dump, AV1State *av1, u8 *obu, u64 obu_length, ObuType obu_type, u64 obu_size, u32 hdr_size, Bool dump_crc);
 #endif
 
 static GF_Err dump_isom_obu(GF_ISOFile *file, GF_ISOTrackID trackID, FILE *dump, Bool dump_crc)
 {
 	GF_Err e = GF_OK;
-#ifndef GPAC_DISABLE_AV_PARSERS
+#if !defined(GPAC_DISABLE_AV_PARSERS) && !defined(GPAC_DISABLE_INSPECT)
 	u32 i, count, track, timescale;
 	AV1State av1;
 	ObuType obu_type = 0;
@@ -1610,7 +1617,7 @@
 static GF_Err dump_qt_prores(GF_ISOFile *file, u32 trackID, FILE *dump, Bool dump_crc)
 {
 	GF_Err e = GF_OK;
-#ifndef GPAC_DISABLE_AV_PARSERS
+#if !defined(GPAC_DISABLE_AV_PARSERS) && !defined(GPAC_DISABLE_INSPECT)
 	u32 i, count, track, timescale;
 
 	track = gf_isom_get_track_by_id(file, trackID);
@@ -1688,8 +1695,9 @@
 		
 		GF_ISOSample *samp = gf_isom_get_sample_info(file, track, i+1, &di, &doffset);
 
+#ifndef GPAC_DISABLE_ISOM_FRAGMENTS
 		traf_start = gf_isom_sample_is_fragment_start(file, track, i+1, NULL);
-
+#endif
 		sap_type = samp->IsRAP;
 		if (!sap_type) {
 			Bool is_rap;
@@ -2135,8 +2143,10 @@
 			else if ((mtype==GF_ISOM_MEDIA_TEXT) || (mtype==GF_ISOM_MEDIA_SUBT) ) {
 
 				if (msubtype==GF_ISOM_SUBTYPE_WVTT) {
+#ifndef GPAC_DISABLE_VTT
 					e = gf_webvtt_dump_iso_track(&dumper, i+1, merge_vtt_cues, GF_TRUE);
 					fmt_handled = GF_TRUE;
+#endif
 				} else if ((msubtype==GF_ISOM_SUBTYPE_TX3G) || (msubtype==GF_ISOM_SUBTYPE_TEXT)) {
 					e = gf_isom_text_dump(the_file, i+1, dump, GF_TEXTDUMPTYPE_TTXT_BOXES);
 					fmt_handled = GF_TRUE;
@@ -2154,10 +2164,8 @@
 			}
 			if (e) break;
 		}
-#else
-		return GF_NOT_SUPPORTED;
-#endif /*GPAC_DISABLE_MEDIA_EXPORT*/
 		gf_isom_delete(the_file);
+#endif /*GPAC_DISABLE_MEDIA_EXPORT*/
 		fprintf(dump, "</Tracks>\n");
 		fprintf(dump, "</ISOBaseMediaFileTrace>\n");
 	}
@@ -2238,9 +2246,8 @@
 			u32 type;
 			bin128 uuid;
 			gf_isom_get_udta_type(file, track_number, i+1, &type, &uuid);
-			if (type == GF_ISOM_BOX_TYPE_META) {
+			if ((type == GF_ISOM_BOX_TYPE_META) || (type==GF_ISOM_UDTA_GPAC_SRD)) {
 				count--;
-				break;
 			}
 		}
 		if (!count) return;
@@ -2252,6 +2259,7 @@
 		u32 j, type, nb_items;
 		bin128 uuid;
 		gf_isom_get_udta_type(file, track_number, i+1, &type, &uuid);
+		if (type==GF_ISOM_UDTA_GPAC_SRD) continue;
 		nb_items = gf_isom_get_user_data_count(file, track_number, type, uuid);
 		if (!nb_items) continue;
 
@@ -2522,7 +2530,7 @@
 					}
 					fprintf(stderr, " bpc)");
 				}
-				if (img_props.hOffset || img_props.vOffset)
+				if (img_props.hOffset || img_props.vOffset || (it_type==GF_ISOM_SUBTYPE_HVT1))
 					fprintf(stderr, " Offset %ux%u", img_props.hOffset, img_props.vOffset);
 				if (img_props.alpha) fprintf(stderr, " Alpha");
 				if (img_props.hidden) fprintf(stderr, " Hidden");
@@ -2535,7 +2543,7 @@
 
 		if (cenc_scheme) {
 			Bool is_protected;
-			u8 skip_byte_block, crypt_byte_block;
+			u32 skip_byte_block, crypt_byte_block;
 			const u8 *key_info;
 			u32 key_info_size;
 			fprintf(stderr, " - Protection scheme: %s v0x%08X", gf_4cc_to_str(cenc_scheme), cenc_version);
@@ -2568,12 +2576,12 @@
 }
 
 void dump_hevc_track_info(GF_ISOFile *file, u32 trackNum, GF_HEVCConfig *hevccfg
-#if !defined(GPAC_DISABLE_AV_PARSERS) && !defined(GPAC_DISABLE_HEVC)
+#if !defined(GPAC_DISABLE_AV_PARSERS)
 	, HEVCState *hevc_state
-#endif /*GPAC_DISABLE_AV_PARSERS  && defined(GPAC_DISABLE_HEVC)*/
+#endif /*GPAC_DISABLE_AV_PARSERS*/
 	)
 {
-#if !defined(GPAC_DISABLE_AV_PARSERS) && !defined(GPAC_DISABLE_HEVC)
+#if !defined(GPAC_DISABLE_AV_PARSERS)
 	u32 idx;
 #endif
 	u32 k;
@@ -2598,7 +2606,7 @@
 		if (ar->type==GF_HEVC_NALU_VID_PARAM) {
 			fprintf(stderr, "%d VPS ", gf_list_count(ar->nalus));
 
-#if !defined(GPAC_DISABLE_AV_PARSERS) && !defined(GPAC_DISABLE_HEVC)
+#if !defined(GPAC_DISABLE_AV_PARSERS)
 			for (idx=0; idx<gf_list_count(ar->nalus); idx++) {
 				GF_NALUFFParam *vps = gf_list_get(ar->nalus, idx);
 				s32 ps_idx=gf_hevc_read_vps(vps->data, vps->size, hevc_state);
@@ -2612,7 +2620,7 @@
 	}
 
 	fprintf(stderr, "\n");
-#if !defined(GPAC_DISABLE_AV_PARSERS) && !defined(GPAC_DISABLE_HEVC)
+#if !defined(GPAC_DISABLE_AV_PARSERS)
 	for (k=0; k<gf_list_count(hevccfg->param_array); k++) {
 		GF_NALUFFParamArray *ar=gf_list_get(hevccfg->param_array, k);
 		u32 width, height;
@@ -2657,13 +2665,10 @@
 void dump_vvc_track_info(GF_ISOFile *file, u32 trackNum, GF_VVCConfig *vvccfg
 #if !defined(GPAC_DISABLE_AV_PARSERS)
 	, VVCState *vvc_state
-#endif /*GPAC_DISABLE_AV_PARSERS  && defined(GPAC_DISABLE_HEVC)*/
+#endif /*GPAC_DISABLE_AV_PARSERS*/
 	)
 {
-#if !defined(GPAC_DISABLE_AV_PARSERS)
-	u32 idx;
-#endif
-	u32 k;
+	u32 idx, k;
 	fprintf(stderr, "\tNAL Unit length bits: %d", 8*vvccfg->nal_unit_size);
 	if (vvccfg->ptl_present) {
 		fprintf(stderr, " Profile %d @ Level %d - Chroma Format %s", vvccfg->general_profile_idc, vvccfg->general_level_idc, gf_avc_hevc_get_chroma_format_name(vvccfg->chroma_format));
@@ -2738,7 +2743,9 @@
 	}
 }
 
+#if !defined(GPAC_DISABLE_INSPECT)
 void gf_inspect_format_timecode(const u8 *data, u32 size, u32 tmcd_flags, u32 tc_num, u32 tc_den, u32 tmcd_fpt, char szFmt100);
+#endif
 
 static void DumpStsdInfo(GF_ISOFile *file, u32 trackNum, Bool full_dump, Bool dump_m4sys, u32 mtype, u32 stsd_idx, Bool *is_od_track)
 {
@@ -2812,6 +2819,9 @@
 
 	gf_isom_get_audio_info(file, trackNum, stsd_idx, &sr, &nb_ch, &bps);
 	gf_isom_set_nalu_extract_mode(file, trackNum, GF_ISOM_NALU_EXTRACT_INSPECT);
+	if (stsd_type == GF_ISOM_SUBTYPE_RESV) {
+		gf_isom_get_original_format_type(file, trackNum, stsd_idx, &msub_type);
+	}
 
 	if ((msub_type==GF_ISOM_SUBTYPE_MPEG4)
 	        || (msub_type==GF_ISOM_SUBTYPE_AVC_H264)
@@ -2974,7 +2984,7 @@
 				          ) {
 					GF_HEVCConfig *hevccfg, *lhvccfg;
 					GF_OperatingPointsInformation *oinf;
-#if !defined(GPAC_DISABLE_AV_PARSERS) && !defined(GPAC_DISABLE_HEVC)
+#if !defined(GPAC_DISABLE_AV_PARSERS)
 					HEVCState hevc_state;
 					memset(&hevc_state, 0, sizeof(HEVCState));
 					hevc_state.sps_active_idx = -1;
@@ -3007,7 +3017,7 @@
 					}
 					if (hevccfg) {
 						dump_hevc_track_info(file, trackNum, hevccfg
-#if !defined(GPAC_DISABLE_AV_PARSERS) && !defined(GPAC_DISABLE_HEVC)
+#if !defined(GPAC_DISABLE_AV_PARSERS)
 							, &hevc_state
 #endif
 						);
@@ -3016,7 +3026,7 @@
 					}
 					if (lhvccfg) {
 						dump_hevc_track_info(file, trackNum, lhvccfg
-#if !defined(GPAC_DISABLE_AV_PARSERS) && !defined(GPAC_DISABLE_HEVC)
+#if !defined(GPAC_DISABLE_AV_PARSERS)
 							, &hevc_state
 #endif
 						);
@@ -3340,6 +3350,7 @@
 		u32 w, h;
 		s16 l;
 		s32 tx, ty;
+		Bool check_tx3g=GF_FALSE;
 		const char *content_encoding = NULL;
 		const char *mime = NULL;
 		const char *config  = NULL;
@@ -3379,9 +3390,24 @@
 			}
 		} else if (mtype == GF_ISOM_MEDIA_SUBT) {
 			fprintf(stderr, "\tQT/3GPP subtitle");
+			check_tx3g = GF_TRUE;
+		} else if (mtype == GF_ISOM_MEDIA_TEXT) {
+			fprintf(stderr, "\tQT/3GPP text");
+			check_tx3g = GF_TRUE;
 		} else {
 			fprintf(stderr, "\tUnknown Text Stream");
 		}
+		if (check_tx3g) {
+			GF_TextSampleDescriptor *txtcfg = NULL;
+			gf_isom_get_text_description(file, trackNum, stsd_idx, &txtcfg);
+			if (txtcfg) {
+				if (txtcfg->displayFlags & GF_TXT_ALL_SAMPLES_FORCED)
+					fprintf(stderr, " - all samples forced");
+				else if (txtcfg->displayFlags & GF_TXT_SOME_SAMPLES_FORCED)
+					fprintf(stderr, " - forced samples");
+				gf_odf_desc_del((GF_Descriptor *) txtcfg);
+			}
+		}
 		fprintf(stderr, "\n\tSize %d x %d - Translation X=%d Y=%d - Layer %d\n", w, h, tx, ty, l);
 	} else if (mtype == GF_ISOM_MEDIA_META) {
 		const char *content_encoding = NULL;
@@ -3457,6 +3483,7 @@
 			|| !esd->decoderConfig->decoderSpecificInfo->data
 		) {
 			if (allow_inband) {
+#ifndef GPAC_DISABLE_AV_PARSERS
 				GF_ISOSample *samp = gf_isom_get_sample(file, trackNum, 1, NULL);
 				if (samp) {
 					u64 ch_layout=0;
@@ -3469,6 +3496,7 @@
 					}
 					gf_isom_sample_del(&samp);
 				}
+#endif
 				valid = GF_TRUE;
 			}
 		} else if (esd->decoderConfig->decoderSpecificInfo->dataLength>=5) {
@@ -3494,14 +3522,28 @@
 			fprintf(stderr, "\tInvalid TrueHD audio config\n");
 		}
 		fprintf(stderr, "\tTrueHD Audio stream - Sample Rate %u - channels %u - format %u peak rate %u\n", sr, nb_ch, fmt, prate);
+	} else if (msub_type==GF_QT_SUBTYPE_LPCM) {
+		Double pcm_sr;
+		u32 pcm_flags, pcm_size;
+		if (gf_isom_get_lpcm_config(file, trackNum, stsd_idx, &pcm_sr, &nb_ch, &pcm_flags, &pcm_size) == GF_OK) {
+			fprintf(stderr, "\tPCM Audio - Sample Rate %f channels %u %u-bits %s %s-endian\n", pcm_sr, nb_ch, pcm_size, (pcm_flags & 1) ? "float" : "int", (pcm_flags & (1<<1)) ? "big" : "little");
+		} else {
+			fprintf(stderr, "\tInvalid LPCM audio config\n");
+		}
 	} else if (codecid) {
 		if (gf_isom_is_video_handler_type(mtype) ) {
 			u32 w, h;
 			gf_isom_get_visual_info(file, trackNum, stsd_idx, &w, &h);
 			fprintf(stderr, "\t%s - Resolution %d x %d\n", gf_codecid_name(codecid), w, h);
 		} else if (mtype==GF_ISOM_MEDIA_AUDIO) {
+			u32 size, flags;
 			gf_isom_get_audio_info(file, trackNum, stsd_idx, &sr, &nb_ch, NULL);
-			fprintf(stderr, "\t%s - Sample Rate %d - %d channel(s)\n", gf_codecid_name(codecid), sr, nb_ch);
+			if (gf_isom_get_pcm_config(file, trackNum, stsd_idx, &flags, &size)==GF_OK) {
+				fprintf(stderr, "\tPCM Audio Sample Rate %d %d channel(s) %u-bits %s-endian", sr, nb_ch, size, (flags&1) ? "little" : "big");
+			} else {
+				fprintf(stderr, "\t%s - Sample Rate %d - %d channel(s)", gf_codecid_name(codecid), sr, nb_ch);
+			}
+			fprintf(stderr, "\n");
 		} else {
 			fprintf(stderr, "\t%s\n", gf_codecid_name(codecid) );
 		}
@@ -3517,11 +3559,13 @@
 			u32 tmcd_flags, tmcd_num, tmcd_den, tmcd_fpt;
 
 			gf_isom_get_tmcd_config(file, trackNum, a_stsd_idx, &tmcd_flags, &tmcd_num, &tmcd_den, &tmcd_fpt);
+#if !defined(GPAC_DISABLE_INSPECT)
 			if (sample->data) {
 				char szTimecode100;
 				gf_inspect_format_timecode(sample->data, sample->dataLength, tmcd_flags, tmcd_num, tmcd_den, tmcd_fpt, szTimecode);
 				fprintf(stderr, "\tFirst timecode: %s\n", szTimecode);
 			}
+#endif
 			gf_isom_sample_del(&sample);
 		}
 	} else if (msub_type==GF_ISOM_SUBTYPE_OPUS) {
@@ -3555,7 +3599,7 @@
 
 
 	/*Crypto info*/
-	if (gf_isom_is_track_encrypted(file, trackNum)) {
+	if (gf_isom_is_media_encrypted(file, trackNum, stsd_idx)) {
 		const char *scheme_URI, *KMS_URI;
 		u32 scheme_type, version;
 		u32 IV_size;
@@ -3602,7 +3646,7 @@
 			const u8 *def_key;
 			u32 def_key_size;
 			Bool IsEncrypted;
-			u8 crypt_byte_block, skip_byte_block;
+			u32 crypt_byte_block, skip_byte_block;
 			IV_size = 0;
 			gf_isom_get_cenc_info(file, trackNum, stsd_idx, NULL, &scheme_type, &version);
 
@@ -3695,7 +3739,32 @@
 	msub_type = gf_isom_get_mpeg4_subtype(file, trackNum, 1);
 	if (!msub_type) msub_type = gf_isom_get_media_subtype(file, trackNum, 1);
 
-	fprintf(stderr, "Media Samples: %d\n", gf_isom_get_sample_count(file, trackNum));
+	if (gf_isom_is_track_referenced(file, trackNum, GF_ISOM_REF_CHAP)) {
+		if (gf_isom_is_video_handler_type(mtype)) fprintf(stderr, "Chapter Thumbnails\n");
+		else if ((mtype==GF_ISOM_MEDIA_TEXT) || (mtype==GF_ISOM_MEDIA_SUBT)) fprintf(stderr, "Chapter Labels\n");
+	}
+
+	fprintf(stderr, "Media Samples: %d", gf_isom_get_sample_count(file, trackNum));
+	cdur = gf_isom_get_constant_sample_duration(file, trackNum);
+	if (cdur) {
+		u32 ts = timescale;
+		gf_media_get_reduced_frame_rate(&ts, &cdur);
+		if (cdur>1)
+			fprintf(stderr, " - CFR %f/sec", ((Float)ts)/cdur);
+		else
+			fprintf(stderr, " - CFR %u/sec", ts);
+	}
+	fprintf(stderr, "\n");
+
+	u32 idx=0;
+	while (1) {
+		u32 track_group_type, track_group_id;
+		if (!gf_isom_enum_track_group(file, trackNum, &idx, &track_group_type, &track_group_id)) break;
+		if (idx==1) fprintf(stderr, "Track Groups:");
+		fprintf(stderr, " %s (ID=%d)", gf_4cc_to_str(track_group_type), track_group_id);
+	}
+	if (idx) fprintf(stderr, "\n");
+
 
 	count = gf_isom_get_track_kind_count(file, trackNum);
 	for (i = 0; i < count; i++) {
@@ -3706,6 +3775,7 @@
 		if (kind_value) gf_free(kind_value);
 	}
 
+#ifndef GPAC_DISABLE_ISOM_FRAGMENTS
 	if (gf_isom_is_track_fragmented(file, trackID) ) {
 		u32 defaultDuration, defaultSize, defaultDescriptionIndex, defaultRandomAccess;
 		u8 defaultPadding;
@@ -3722,11 +3792,29 @@
 				(u32) defaultPadding, (u32) defaultDegradationPriority
 		);
 	}
-
+#endif
 	if (full_dump) {
 		const char *handler_name;
 		gf_isom_get_handler_name(file, trackNum, &handler_name);
 		fprintf(stderr, "Handler name: %s\n", handler_name);
+
+		u32 ridx=0;
+		while (1) {
+			u32 rtype, rcount, j;
+			const GF_ISOTrackID *refs = gf_isom_enum_track_references(file, trackNum, ridx, &rtype, &rcount);
+			if (!refs) break;
+			if (!ridx)
+				fprintf(stderr, "Track References: ");
+			else
+				fprintf(stderr, ", ");
+			ridx++;
+			fprintf(stderr, "%s to", gf_4cc_to_str(rtype));
+			for (j=0; j<rcount; j++) {
+				fprintf(stderr, " %d", refsj);
+			}
+		}
+		if (ridx)
+			fprintf(stderr, "\n");
 	}
 
 	print_udta(file, trackNum, GF_FALSE);
@@ -3892,6 +3980,7 @@
 
 	DumpMetaItem(file, 1, 0, "# File Meta");
 	if (!gf_isom_has_movie(file)) {
+#ifndef GPAC_DISABLE_ISOM_FRAGMENTS
 		if (gf_isom_has_segment(file, &brand, &min)) {
 			count = gf_isom_segment_get_fragment_count(file);
 			fprintf(stderr, "File is a segment - %d movie fragments - Brand %s (version %d):\n", count, gf_4cc_to_str(brand), min);
@@ -3907,7 +3996,9 @@
 				}
 				fprintf(stderr, "\n");
 			}
-		} else {
+		} else
+#endif
+		{
 			fprintf(stderr, "File has no movie (moov) - static data container\n");
 		}
 		return;
@@ -3947,7 +4038,7 @@
 	gf_isom_get_creation_time(file, &create, &modif);
 	fprintf(stderr, "Created: %s", format_date(create, szDur));
 	if (create != modif)
-		fprintf(stderr, "Modified: %s", format_date(modif, szDur));
+		fprintf(stderr, " - Modified: %s", format_date(modif, szDur));
 	fprintf(stderr, "\n");
 
 	DumpMetaItem(file, 0, 0, "# Movie Meta");
@@ -3990,7 +4081,37 @@
 		fprintf(stderr, "\nChapters:\n");
 		for (i=0; i<count; i++) {
 			gf_isom_get_chapter(file, 0, i+1, &time, &name);
-			fprintf(stderr, "\tChapter #%d - %s - \"%s\"\n", i+1, format_duration(time, 1000, szDur), name);
+			fprintf(stderr, "\t#%d - %s - \"%s\"\n", i+1, format_duration(time, 1000, szDur), name);
+		}
+	} else {
+		u32 chap_tk=0;
+		count = gf_isom_get_track_count(file);
+		for (i=0; i<count; i++) {
+			u32 nb_ref = gf_isom_get_reference_count(file, i+1, GF_ISOM_REF_CHAP);
+			if (nb_ref) {
+				gf_isom_get_reference(file, i+1, GF_ISOM_REF_CHAP, 1, &chap_tk);
+				break;
+			}
+		}
+		if (chap_tk) {
+			count = gf_isom_get_sample_count(file, chap_tk);
+			if (!count) chap_tk=0;
+		}
+		if (chap_tk) {
+			fprintf(stderr, "\nChapter Track:\n");
+			for (i=0; i<count; i++) {
+				u32 di;
+				GF_ISOSample *s = gf_isom_get_sample(file, chap_tk, i+1, &di);
+				if (!s) continue;
+				GF_BitStream *bs = gf_bs_new(s->data, s->dataLength, GF_BITSTREAM_READ);
+				GF_TextSample *txt = gf_isom_parse_text_sample(bs);
+				if (txt) {
+					fprintf(stderr, "\t#%d - %s - \"%s\"\n", i+1, format_duration(s->DTS, 1000, szDur), txt->text);
+					gf_isom_delete_text_sample(txt);
+				}
+				gf_bs_del(bs);
+				gf_isom_sample_del(&s);
+			}
 		}
 	}
 
@@ -4478,6 +4599,7 @@
 #endif /*GPAC_DISABLE_MPEG2TS*/
 
 
+#ifndef GPAC_DISABLE_NETWORK
 void get_file_callback(void *usr_cbk, GF_NETIO_Parameter *parameter)
 {
 	if (parameter->msg_type==GF_NETIO_DATA_EXCHANGE) {
@@ -4562,9 +4684,11 @@
 	gf_cfg_del(cached);
 	gf_file_delete(szPATH);
 }
+#endif
 
 GF_Err rip_mpd(const char *mpd_src, const char *output_dir)
 {
+#if !defined(GPAC_DISABLE_NETWORK) && !defined(GPAC_DISABLE_MPD)
 	GF_DownloadSession *sess;
 	u32 i, connect_time, reply_time, download_time, req_hdr_size, rsp_hdr_size;
 	GF_Err e;
@@ -4742,4 +4866,7 @@
 	if (mpd) gf_mpd_del(mpd);
 	gf_dm_del(dm);
 	return e;
+#else
+	return GF_NOT_SUPPORTED;
+#endif
 }

gpac-2.2.1.tar.gz/applications/mp4box/fileimport.c -> gpac-2.4.0.tar.gz/applications/mp4box/fileimport.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2022
+ *			Copyright (c) Telecom ParisTech 2000-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / mp4box application
@@ -368,6 +368,8 @@
 	return GF_FALSE;
 }
 
+#include <gpac/internal/media_dev.h>
+
 static GF_Err set_dv_profile(GF_ISOFile *dest, u32 track, char *dv_profile_str)
 {
 	GF_Err e;
@@ -432,29 +434,44 @@
 	_dovi.force_dv = force_dv;
 
 	u32 w, h;
-	Bool is_avc = GF_FALSE;
-
+	u32 codec_id = 0;
+	u32 probe_frames=50;
 	e = gf_isom_get_visual_info(dest, track, 1, &w, &h);
 	if (e) return e;
 	//no DV profile present in file, we need to guess
 	GF_AVCConfig *avcc = gf_isom_avc_config_get(dest, track, 1);
 	GF_HEVCConfig *hvcc = gf_isom_hevc_config_get(dest, track, 1);
+//	GF_VVCConfig *vvcc = gf_isom_vvc_config_get(dest, track, 1);
+	GF_AV1Config *av1c = gf_isom_av1_config_get(dest, track, 1);
 
-	if (!avcc && !hvcc) {
-		M4_LOG(GF_LOG_WARNING, ("DV profile can only be set on AVC or HEVC tracks\n"));
-		return GF_BAD_PARAM;
-	}
-
-	u32 nalu_length = avcc ? avcc->nal_unit_size : hvcc->nal_unit_size;
+	u32 nalu_length = 0;
 	if (avcc) {
-		is_avc = GF_TRUE;
+		nalu_length = avcc->nal_unit_size;
+		codec_id = GF_CODECID_AVC;
 		gf_odf_avc_cfg_del(avcc);
 	}
-	if (hvcc) gf_odf_hevc_cfg_del(hvcc);
+	else if (hvcc) {
+		codec_id = GF_CODECID_HEVC;
+		nalu_length = hvcc->nal_unit_size;
+		gf_odf_hevc_cfg_del(hvcc);
+	}
+/*	else if (vvcc) {
+		codec_id = GF_CODECID_VVC;
+		nalu_length = 4;
+		probe_frames = 0; //parsing not supported for VVC
+		gf_odf_vvc_cfg_del(vvcc);
+	}
+*/	else if (av1c) {
+		codec_id = GF_CODECID_AV1;
+		gf_odf_av1_cfg_del(av1c);
+	} else {
+		M4_LOG(GF_LOG_WARNING, ("DV profile can only be set on AVC, HEVC and AV1 tracks\n"));
+		return GF_BAD_PARAM;
+	}
 
-	//inspect at most first 50 samples
+	//inspect at most first 50 samples for NAL based
 	u32 i;
-	for (i=0; i<50; i++) {
+	for (i=0; i<probe_frames; i++) {
 		u32 stsd_idx;
 		GF_BitStream *bs;
 
@@ -464,25 +481,65 @@
 		bs = gf_bs_new(samp->data, samp->dataLength, GF_BITSTREAM_READ);
 
 		while (gf_bs_available(bs)) {
-			u32 nal_type;
-			u32 nal_size = gf_bs_read_int(bs, nalu_length*8);
-			if (is_avc) {
-				nal_type = gf_bs_read_u8(bs);
+			if (codec_id==GF_CODECID_AVC) {
+				u32 nal_size = gf_bs_read_int(bs, nalu_length*8);
+				u32 nal_type = gf_bs_read_u8(bs);
 				nal_type = nal_type & 0x1F;
 				nal_size--;
 				if (nal_type == GF_AVC_NALU_DV_RPU) _dovi.rpu_present_flag = 1;
 				else if (nal_type == GF_AVC_NALU_DV_EL) _dovi.el_present_flag = 1;
 				else if (nal_type <= GF_AVC_NALU_IDR_SLICE) _dovi.bl_present_flag = 1;
-			} else {
+
+				gf_bs_skip_bytes(bs, nal_size-1);
+			} else if (codec_id==GF_CODECID_HEVC) {
+				u32 nal_size = gf_bs_read_int(bs, nalu_length*8);
 				gf_bs_read_int(bs, 1);
-				nal_type = gf_bs_read_int(bs, 6);
+				u32 nal_type = gf_bs_read_int(bs, 6);
 				gf_bs_read_int(bs, 1);
 				nal_size--;
 				if (nal_type == GF_HEVC_NALU_DV_RPU) _dovi.rpu_present_flag = 1;
 				else if (nal_type == GF_HEVC_NALU_DV_EL) _dovi.el_present_flag = 1;
 				else if (nal_type <= GF_HEVC_NALU_SLICE_CRA) _dovi.bl_present_flag = 1;
+
+				gf_bs_skip_bytes(bs, nal_size-1);
+			}
+			else if (codec_id==GF_CODECID_AV1) {
+				u64 obu_size, obu_start = (u32) gf_bs_get_position(bs);
+				u32 obu_hdr_size;
+				ObuType obu_type;
+				Bool obu_extension_flag, obu_has_size_field;
+				u8 temporal_id, spatial_id;
+
+				gf_av1_parse_obu_header(bs, &obu_type, &obu_extension_flag, &obu_has_size_field, &temporal_id, &spatial_id);
+				obu_hdr_size = (u32) (gf_bs_get_position(bs) - obu_start);
+
+				if (obu_has_size_field) {
+					obu_size = (u32)gf_av1_leb128_read(bs, NULL);
+					obu_hdr_size = (u32) (gf_bs_get_position(bs) - obu_start);
+				} else {
+					obu_size = samp->dataLength - (u32) gf_bs_get_position(bs);
+				}
+				obu_size += obu_hdr_size;
+				if (obu_type==OBU_METADATA) {
+					gf_bs_seek(bs, obu_start+obu_hdr_size);
+					u32 metadata_type = (u32)gf_av1_leb128_read(bs, NULL);
+					if (metadata_type==OBU_METADATA_TYPE_ITUT_T35) {
+						//cf issue #2549
+						if (gf_bs_read_u8(bs)==0xB5) {
+							const u8 rpu_hdr = {0x00, 0x3B, 0x00, 0x00, 0x08, 0x00, 0x37, 0xCD, 0x08};
+							const u32 rpu_hdr_len = sizeof (rpu_hdr);
+							u32 pos = (u32) gf_bs_get_position(bs);
+							u8 *t35_start = samp->data + pos;
+							if (!memcmp(t35_start, rpu_hdr, rpu_hdr_len)) {
+								_dovi.rpu_present_flag = 1;
+							}
+						}
+					}
+				} else if (obu_type<=OBU_TILE_LIST) {
+					_dovi.bl_present_flag = 1;
+				}
+				gf_bs_seek(bs, obu_start+obu_size);
 			}
-			gf_bs_skip_bytes(bs, nal_size);
 		}
 		gf_bs_del(bs);
 		gf_isom_sample_del(&samp);
@@ -490,7 +547,7 @@
 
 	//get dur and timescale to compute fps
 	//we don't divide mdur by nb_samples but rather multiple timescale with nb_samples
-	//this avoid rounding errors with non FPS-aligned input timescale (eg mkv using 1000 regardless of FPS)
+	//this avoids rounding errors with non FPS-aligned input timescale (eg mkv using 1000 regardless of FPS)
 	u64 mdur;
 	u64 timescale = gf_isom_get_media_timescale(dest, track);
 	mdur = gf_isom_get_media_duration(dest, track);
@@ -504,7 +561,7 @@
 	}
 	timescale *= nb_samples;
 
-	_dovi.dv_level = gf_dolby_vision_level(w, h, timescale, mdur, is_avc ? GF_CODECID_AVC : GF_CODECID_HEVC);
+	_dovi.dv_level = gf_dolby_vision_level(w, h, timescale, mdur, codec_id);
 	return gf_isom_set_dolby_vision_profile(dest, track, 1, &_dovi);
 }
 
@@ -532,8 +589,7 @@
 			if (e) goto error;
 		}
 		else if (edits0=='e') {
-			u64 movie_t, media_t, edur;
-			u32 rate;
+			u64 movie_t, edur;
 			GF_Fraction64 movie_time, media_time, media_rate, edit_dur;
 			char *mtime_sep;
 
@@ -571,29 +627,43 @@
 			}
 			movie_t = movie_time.num * movie_ts / movie_time.den;
 			if (!edit_dur.den || !edit_dur.num) {
-				edur = media_dur;
-				edur *= movie_ts;
-				edur /= media_ts;
+				edur = gf_timestamp_rescale(media_dur, media_ts, movie_ts);
 			} else {
-				edur = edit_dur.num;
-				edur *= movie_ts;
-				edur /= edit_dur.den;
-				if (edur>media_dur)
-					edur = media_dur;
+				edur = gf_timestamp_rescale(edit_dur.num, edit_dur.den, movie_ts);
 			}
+			//empty edit
 			if (!media_time.den) {
 				e = gf_isom_set_edit(dest, track, movie_t, edur, 0, GF_ISOM_EDIT_EMPTY);
 			} else {
-				rate = 0;
+				//adjust media duration based on media time
+				u64 media_t = media_time.num * media_ts / media_time.den;
+				if (media_dur<media_t) {
+					fprintf(stderr, "Media time "LLU" larger than duration "LLU", using last media frame\n", media_t, media_dur);
+					media_t = media_dur;
+					media_dur = 0;
+				} else {
+					media_dur -= media_t;
+				}
+				u32 rate = 0;
 				if (media_rate.den) {
 					u64 frac;
 					rate = (u32) ( media_rate.num / media_rate.den );
 					frac = media_rate.num - rate*media_rate.den;
 					frac *= 0xFFFF;
 					frac /= media_rate.den;
-					rate = (rate<<16) | (u32) frac;
+					rate = (rate<<16) | (u16) frac;
+					//adjust media dur if rate > 1
+					if (media_rate.num > (s64) media_rate.den) {
+						media_dur = media_dur*media_rate.den / media_rate.num;
+					}
 				}
-				media_t = media_time.num * media_ts / media_time.den;
+				//clamp edit dur to available media time
+				if (gf_timestamp_greater(edur, movie_ts, media_dur, media_ts)) {
+					u64 ndur = gf_timestamp_rescale(media_dur, media_ts, movie_ts);
+					fprintf(stderr, "Clamping edit duration from "LLU"/%u to "LLU"/%u due to available media duration "LLU"/%u\n", edur, movie_ts, ndur, movie_ts, media_dur, media_ts);
+					edur = ndur;
+				}
+
 				e = gf_isom_set_edit_with_rate(dest, track, movie_t, edur, media_t, rate);
 			}
 			if (e==GF_EOS) {
@@ -676,6 +746,12 @@
 	s32 roll = 0;
 	Bool src_is_isom = GF_FALSE;
 	s32 dlb_mode = -2;
+	u32 tkgp_type=0;
+	s32 tkgp_id=0;
+	Bool tkgp_add = GF_TRUE;
+	u32 set_tk_idx=0;
+	u32 *reorder_tk_ids = NULL;
+	u32 reorder_tk_ids_count = 0;
 
 	dv_profile0 = 0;
 	rvc_predefined = 0;
@@ -1220,10 +1296,10 @@
 				GOTO_EXIT("invalid format for fullrange")
 			}
 		}
-		else if (!strnicmp(ext+1, "videofmt=", 10)) {
+		else if (!strnicmp(ext+1, "videofmt=", 9)) {
 			u32 idx, count = GF_ARRAY_LENGTH(videofmt_names);
 			for (idx=0; idx<count; idx++) {
-				if (!strcmp(ext+11, videofmt_namesidx)) {
+				if (!strcmp(ext+10, videofmt_namesidx)) {
 					videofmt = idx;
 					break;
 				}
@@ -1247,8 +1323,8 @@
 				GOTO_EXIT("invalid format for colortfc")
 			}
 		}
-		else if (!strnicmp(ext+1, "colormx=", 10)) {
-			colormx = gf_cicp_parse_color_matrix(ext+11);
+		else if (!strnicmp(ext+1, "colormx=", 8)) {
+			colormx = gf_cicp_parse_color_matrix(ext+9);
 			if (colormx==-1) {
 				e = GF_BAD_PARAM;
 				GOTO_EXIT("invalid format for colormx")
@@ -1301,6 +1377,28 @@
 		else if (!strnicmp(ext+1, "ID=", 3)) {
 			import.target_trackID = (u32) parse_u32(ext+4, "ID");
 		}
+		else if (!strnicmp(ext+1, "tkgp=", 5)) {
+			e = GF_BAD_PARAM;
+			char *sep=strchr(ext+1, ',');
+			if (!sep) {
+				GOTO_EXIT("invalid format for tkgp")
+			}
+			sep0 = 0;
+			tkgp_id = atoi(sep+1);
+			if (strlen(ext+6)==4) tkgp_type=GF_4CC(ext6, ext7, ext8, ext9);
+			sep0 = ',';
+			if (!tkgp_type) {
+				GOTO_EXIT("invalid format for tkgp")
+			}
+			e = GF_OK;
+			if (tkgp_id<0) {
+				tkgp_id = -tkgp_id;
+				tkgp_add = GF_FALSE;
+			}
+		}
+		else if (!strnicmp(ext+1, "tkidx=", 6)) {
+			set_tk_idx = atoi(ext+7);
+		}
 		/*unrecognized, assume name has colon in it*/
 		else {
 			M4_LOG(GF_LOG_ERROR, ("Unrecognized import option %s, ignoring\n", ext+1));
@@ -1330,9 +1428,11 @@
 
 	/*check duration import (old syntax)*/
 	ext = strrchr(final_name, '%');
-	if (ext) {
-		gf_parse_frac(ext+1, &import.duration);
-		ext0 = 0;
+	if (ext && gf_sys_old_arch_compat()) {
+		if (gf_parse_frac(ext+1, &import.duration))
+			ext0 = 0;
+		else
+			ext = NULL;
 	}
 
 	/*select switches for av containers import*/
@@ -1599,7 +1699,7 @@
 				GOTO_EXIT("changing color info")
 			}
 			if (hdr_file) {
-				e = parse_high_dynamc_range_xml_desc(dest, track, hdr_file);
+				e = apply_high_dynamc_range_xml_desc(dest, track, hdr_file);
 				GOTO_EXIT("setting HDR info")
 			}
 			if (dv_profile0) {
@@ -1651,6 +1751,10 @@
 			e = gf_isom_set_alternate_group_id(dest, track, group);
 			GOTO_EXIT("setting alternate group")
 		}
+		if (tkgp_type) {
+			e = gf_isom_set_track_group(dest, track, tkgp_id, tkgp_type, tkgp_add);
+			GOTO_EXIT("setting trackGroup")
+		}
 
 		if (track_layout) {
 			e = gf_isom_set_track_layout_info(dest, track, tw<<16, th<<16, tx<<16, ty<<16, tz);
@@ -1755,7 +1859,7 @@
 			e = gf_file_load_data(rvc_config, (u8 **) &data, &size);
 			GOTO_EXIT("loading RVC config file")
 
-			gf_gz_compress_payload(&data, size, &size);
+			gf_gz_compress_payload_ex (&data, size, &size, 0, GF_FALSE, NULL, GF_TRUE);
 			e |= gf_isom_set_rvc_config(dest, track, 1, 0, "application/rvc-config+xml+gz", data, size);
 			gf_free(data);
 			GOTO_EXIT("compressing and assigning RVC config")
@@ -1820,6 +1924,7 @@
 					ac3c->atmos_ec3_ext=0;
 					ac3c->complexity_index_type=0;
 				} else {
+#ifndef GPAC_DISABLE_AV_PARSERS
 					u32 di;
 					GF_ISOSample *samp = gf_isom_get_sample(dest, track, 1, &di);
 					u32 pos;
@@ -1829,11 +1934,28 @@
 						ac3c->atmos_ec3_ext = 1;
 						ac3c->complexity_index_type = dlb_mode;
 					}
+#endif
 				}
 				gf_isom_ac3_config_update(dest, track, 1, ac3c);
 				gf_free(ac3c);
 			}
 		}
+
+		//if track order is required, gather track IDs - we cannot change directly track order since this impacts track number
+		//and would break this loop
+		if (set_tk_idx) {
+			reorder_tk_ids = gf_realloc(reorder_tk_ids, sizeof(u32)*(reorder_tk_ids_count+1));
+			reorder_tk_idsreorder_tk_ids_count = gf_isom_get_track_id(dest, track);
+			reorder_tk_ids_count++;
+		}
+	}
+
+	if (reorder_tk_ids_count) {
+		for (i=0; i<reorder_tk_ids_count; i++) {
+			u32 tk = gf_isom_get_track_by_id(dest, reorder_tk_idsi);
+			gf_isom_set_track_index(dest, tk, set_tk_idx, NULL, NULL);
+			set_tk_idx++;
+		}
 	}
 
 	if (chapter_name) {
@@ -1906,7 +2028,6 @@
 			//TODO - merge, temporal sublayers
 		}
 	}
-#ifndef GPAC_DISABLE_HEVC
 	if (check_track_for_hevc) {
 		if (split_tile_mode) {
 			e = gf_media_split_hevc_tiles(dest, split_tile_mode - 1);
@@ -1918,7 +2039,6 @@
 			GOTO_EXIT("splitting HEVC temporal sublayers")
 		}
 	}
-#endif
 
 	if (tc_fps_num) {
 		u32 desc_index=0;
@@ -2004,6 +2124,7 @@
 	if (szLan) gf_free((char *)szLan);
 	if (icc_data) gf_free(icc_data);
 	if (final_name) gf_free(final_name);
+	if (reorder_tk_ids) gf_free(reorder_tk_ids);
 
 	if (!e) return GF_OK;
 	if (fail_msg) {
@@ -2398,7 +2519,6 @@
 	return dst_tk;
 }
 
-#ifndef GPAC_DISABLE_HEVC
 static u32 merge_hevc_config(GF_ISOFile *dest, u32 tk_id, GF_ISOFile **o_orig, u32 src_track, Bool force_cat, u32 *orig_nal_len, u32 *dst_nal_len)
 {
 	u32 i;
@@ -2453,7 +2573,6 @@
 	}
 	return dst_tk;
 }
-#endif /*GPAC_DISABLE_HEVC */
 
 static GF_Err rewrite_nal_size_field(GF_ISOSample *samp, u32 orig_nal_len, u32 dst_nal_len)
 {
@@ -2526,7 +2645,7 @@
 	opts = gf_url_colon_suffix(fileName, '=');
 	e = GF_OK;
 
-	/*if options are specified, reimport the file*/
+	/*if options are specified, re-import the file*/
 	if (opts) opts0 = 0;
 	is_isom = gf_isom_probe_file(fileName);
 
@@ -2760,6 +2879,8 @@
 			if (gf_isom_get_sample_description_count(orig, i+1) != gf_isom_get_sample_description_count(dest, dst_tk)) dst_tk = 0;
 			/*if not forcing cat, check the media codec config is the same*/
 			if (!gf_isom_is_same_sample_description(orig, i+1, 0, dest, dst_tk, 0)) {
+				//we will need to merge the same descriptions
+				if (!force_cat && !dst_tk_sample_entry) dst_tk_sample_entry = dst_tk;
 				dst_tk = 0;
 			}
 			/*we force the same visual resolution*/
@@ -2780,7 +2901,6 @@
 				        || (stype == GF_ISOM_SUBTYPE_AVC4_H264) ) {
 					dst_tk = merge_avc_config(dest, tk_id, &orig, i+1, force_cat, &orig_nal_len, &dst_nal_len);
 				}
-#ifndef GPAC_DISABLE_HEVC
 				/*merge HEVC config if possible*/
 				else if ((stype == GF_ISOM_SUBTYPE_HVC1)
 				         || (stype == GF_ISOM_SUBTYPE_HEV1)
@@ -2788,7 +2908,6 @@
 				         || (stype == GF_ISOM_SUBTYPE_HEV2)) {
 					dst_tk = merge_hevc_config(dest, tk_id, &orig, i+1, force_cat, &orig_nal_len, &dst_nal_len);
 				}
-#endif /*GPAC_DISABLE_HEVC*/
 				else if (force_cat) {
 					dst_tk = found_dst_tk;
 				}
@@ -3168,7 +3287,8 @@
 	}
 	strcpy(cat_enum.szRad2, sep+1);
 	sep0 = 0;
-	sep = strchr(cat_enum.szRad2, '%');
+	sep = NULL;
+	if (gf_sys_old_arch_compat()) sep = strchr(cat_enum.szRad2, '%');
 	if (!sep) sep = strchr(cat_enum.szRad2, '#');
 	if (!sep) sep = gf_url_colon_suffix(cat_enum.szRad2, '=');
 	strcpy(cat_enum.szOpt, "");
@@ -3666,9 +3786,10 @@
 }
 static Bool wgt_enum_dir(void *cbck, char *file_name, char *file_path, GF_FileEnumInfo *file_info)
 {
-	if (!stricmp(file_name, "cvs") || !stricmp(file_name, ".svn") || !stricmp(file_name, ".git")) return 0;
+	if (!stricmp(file_name, "cvs") || !stricmp(file_name, ".svn") || !stricmp(file_name, ".git")) return GF_FALSE;
 	gf_enum_directory(file_path, 0, wgt_enum_files, cbck, NULL);
-	return gf_enum_directory(file_path, 1, wgt_enum_dir, cbck, NULL);
+	gf_enum_directory(file_path, 1, wgt_enum_dir, cbck, NULL);
+	return GF_TRUE;
 }
 
 GF_ISOFile *package_file(char *file_name, char *fcc, Bool make_wgt)
@@ -3865,7 +3986,7 @@
 	return file;
 }
 
-GF_Err parse_high_dynamc_range_xml_desc(GF_ISOFile *movie, u32 track, char *file_name)
+GF_Err apply_high_dynamc_range_xml_desc(GF_ISOFile *movie, u32 track, char *file_name)
 {
 	GF_DOMParser *parser;
 	GF_XMLNode *root, *stream;

gpac-2.2.1.tar.gz/applications/mp4box/live.c -> gpac-2.4.0.tar.gz/applications/mp4box/live.c Changed

gpac-2.2.1.tar.gz/applications/mp4box/mp4box.c -> gpac-2.4.0.tar.gz/applications/mp4box/mp4box.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2022
+ *			Copyright (c) Telecom ParisTech 2000-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / mp4box application
@@ -196,11 +196,13 @@
 
 #ifndef GPAC_DISABLE_SCENE_ENCODER
 GF_SMEncodeOptions smenc_opts;
+#endif
+#ifndef GPAC_DISABLE_SWF_IMPORT
 u32 swf_flags;
 #endif
 GF_Fraction import_fps;
 
-#ifdef GPAC_CONFIG_ANDROID
+#if defined(GPAC_CONFIG_ANDROID) || defined(GPAC_CONFIG_EMSCRIPTEN)
 u32 mp4b_help_flags;
 FILE *mp4b_helpout;
 
@@ -216,12 +218,13 @@
 
 Bool arg_parse_res, dash_duration_strict, dvbhdemux, keep_sys_tracks, align_cat;
 Bool do_hint, do_save, full_interleave, do_frag, hint_interleave, dump_rtp, regular_iod, remove_sys_tracks, remove_hint, remove_root_od;
-Bool print_sdp, open_edit, dump_cr, force_ocr, encode, do_scene_log, dump_srt, dump_ttxt, do_saf, dump_m2ts, dump_cart, dump_chunk, dump_check_xml;
+Bool print_sdp, open_edit, dump_cr, force_ocr, encode, do_scene_log, dump_srt, dump_ttxt, do_saf, dump_m2ts, dump_cart, dump_chunk, dump_check_xml, fuzz_chk;
 Bool do_hash, verbose, force_cat, pack_wgt, single_group, clean_groups, dash_live, no_fragments_defaults, single_traf_per_moof, tfdt_per_traf;
 Bool hls_clock, do_mpd_rip, merge_vtt_cues, get_nb_tracks, no_inplace, merge_last_seg, freeze_box_order, no_odf_conf;
 Bool insert_utc, chunk_mode, HintCopy, hint_no_offset, do_bin_xml, frag_real_time, force_co64, live_scene, use_mfra, dump_iod, samplegroups_in_traf;
 Bool mvex_after_traks, daisy_chain_sidx, use_ssix, single_segment, single_file, segment_timeline, has_add_image;
 Bool strict_cues, use_url_template, seg_at_rap, frag_at_rap, memory_frags, keep_utc, has_next_arg, no_cache, no_loop;
+Bool conv_type_from_ext;
 
 u32 stat_level, hint_flags, import_flags, nb_add, nb_cat, crypt, agg_samples, nb_sdp_ex, max_ptime, split_size, nb_meta_act;
 u32 nb_track_act, rtp_rate, major_brand, nb_alt_brand_add, nb_alt_brand_rem, old_interleave, minor_version, conv_type, nb_tsel_acts;
@@ -276,13 +279,14 @@
 	dash_duration_strict = dvbhdemux = keep_sys_tracks = do_hint = do_save = full_interleave = do_frag = hint_interleave = GF_FALSE;
 	dump_rtp = regular_iod = remove_sys_tracks = remove_hint = remove_root_od = print_sdp = open_edit = GF_FALSE;
 	dump_cr = force_ocr = encode = do_scene_log = dump_srt = dump_ttxt = do_saf = dump_m2ts = dump_cart = dump_chunk = GF_FALSE;
-	dump_check_xml = do_hash = verbose = force_cat = pack_wgt = single_group = clean_groups = dash_live = no_fragments_defaults = GF_FALSE;
+	dump_check_xml = do_hash = verbose = force_cat = pack_wgt = single_group = clean_groups = dash_live = no_fragments_defaults = fuzz_chk = GF_FALSE;
 	single_traf_per_moof = tfdt_per_traf = hls_clock = do_mpd_rip = merge_vtt_cues = get_nb_tracks = GF_FALSE;
 	no_inplace = merge_last_seg = freeze_box_order = no_odf_conf = GF_FALSE;
 	insert_utc = chunk_mode = HintCopy = hint_no_offset = do_bin_xml = frag_real_time = force_co64 = live_scene = GF_FALSE;
 	use_mfra = dump_iod = samplegroups_in_traf = mvex_after_traks = daisy_chain_sidx = use_ssix = single_segment = single_file = GF_FALSE;
 	segment_timeline = has_add_image = strict_cues = use_url_template = seg_at_rap = frag_at_rap = memory_frags = keep_utc = GF_FALSE;
 	has_next_arg = no_cache = no_loop = GF_FALSE;
+	conv_type_from_ext = GF_FALSE;
 
 	/*align cat is the new default behavior for -cat*/
 	align_cat=GF_TRUE;
@@ -322,6 +326,8 @@
 
 #ifndef GPAC_DISABLE_SCENE_ENCODER
 	memset(&smenc_opts, 0, sizeof(GF_SMEncodeOptions));
+#endif
+#ifndef GPAC_DISABLE_SWF_IMPORT
 	swf_flags = GF_SM_SWF_SPLIT_TIMELINE;
 #endif
 	import_fps.num = 0;
@@ -558,7 +564,7 @@
 	MP4BOX_ARG("group-rem-track", "remove given track from its group", GF_ARG_INT, GF_ARG_HINT_ADVANCED, parse_tsel_args, TSEL_ACTION_REMOVE_TSEL, ARG_IS_FUN),
 	MP4BOX_ARG("group-rem", "remove the track's group", GF_ARG_INT, GF_ARG_HINT_ADVANCED, parse_tsel_args, TSEL_ACTION_REMOVE_ALL_TSEL_IN_GROUP, ARG_IS_FUN),
 	MP4BOX_ARG("group-clean", "remove all group information from all tracks", GF_ARG_BOOL, GF_ARG_HINT_ADVANCED, &clean_groups, 0, ARG_OPEN_EDIT),
-	MP4BOX_ARG_S("ref", "tkID:XXXX:refID", "add a reference of type 4CC from track ID to track refID", GF_ARG_HINT_ADVANCED, parse_track_action, TRACK_ACTION_REFERENCE, ARG_IS_FUN),
+	MP4BOX_ARG_S("ref", "tkID:R4CC:refID", "add a reference of type R4CC from track ID to track refID (remove track reference if refID is 0)", GF_ARG_HINT_ADVANCED, parse_track_action, TRACK_ACTION_REFERENCE, ARG_IS_FUN),
 	MP4BOX_ARG("keep-utc", "keep UTC timing in the file after edit", GF_ARG_BOOL, GF_ARG_HINT_ADVANCED, &keep_utc, 0, 0),
 	MP4BOX_ARG_S("udta", "tkID:OPTS", "set udta for given track or movie if tkID is 0. OPTS is a colon separated list of:\n"
 	        "- type=CODE: 4CC code of the UDTA (not needed for `box=` option)\n"
@@ -571,7 +577,7 @@
 	MP4BOX_ARG_S("patch", "tkID=FILE", "apply box patch described in FILE, for given trackID if set", GF_ARG_HINT_ADVANCED, parse_boxpatch, 0, ARG_IS_FUN),
 	MP4BOX_ARG("bo", "freeze the order of boxes in input file", GF_ARG_BOOL, GF_ARG_HINT_ADVANCED, &freeze_box_order, 0, 0),
 	MP4BOX_ARG("init-seg", "use the given file as an init segment for dumping or for encryption", GF_ARG_STRING, GF_ARG_HINT_ADVANCED, &use_init_seg, 0, 0),
-	MP4BOX_ARG("zmov", "compress movie box according to ISOBMFF box compression", GF_ARG_BOOL, GF_ARG_HINT_ADVANCED, parse_compress, 0, ARG_IS_FUN),
+	MP4BOX_ARG("zmov", "compress movie box according to ISOBMFF box compression or QT if mov extension", GF_ARG_BOOL, GF_ARG_HINT_ADVANCED, parse_compress, 0, ARG_IS_FUN),
 	MP4BOX_ARG("xmov", "same as zmov and wraps ftyp in otyp", GF_ARG_BOOL, GF_ARG_HINT_ADVANCED, parse_compress, 1, ARG_IS_FUN),
  	MP4BOX_ARG_S("edits", "tkID=EDITS", "set edit list. The following syntax is used (no separators between entries):\n"
 			" - `r`: removes all edits\n"
@@ -610,7 +616,7 @@
 		"- `audioN`, `videoN`, `textN`: target is the `N`th `audio`, `video` or `text` track, with `N=1` being the first track of desired type\n"
 		"  \n"
 		"Option values:\n"
-		"Unless specified otherwise, a track operation option of type `integer` expects a track identifer value following it.\n"
+		"Unless specified otherwise, a track operation option of type `integer` expects a track identifier value following it.\n"
 		"An option of type `boolean` expects no following value.\n"
 		"  \n"
 	);
@@ -677,7 +683,7 @@
 		"  \n"
 		"The default output storage mode is to full interleave and will require a temp file for each output. This behavior can be modified using `-flat`, `-newfs`, `-inter` and `-frag`.\n"
 		"The output file name(s) can be specified using `-out` and templates (e.g. `-out split$num%%04d$.mp4` produces split0001.mp4, split0002.mp4, ...).\n"
-		"Multiple time ranges can be specified as a comma-seperated list for `-splitx`, `-splitz` and `-splitg`.\n"
+		"Multiple time ranges can be specified as a comma-separated list for `-splitx`, `-splitz` and `-splitg`.\n"
 		"  \n"
 	);
 
@@ -810,10 +816,10 @@
 		"- :xlink=VALUE: set the xlink value for the period containing this element. Only the xlink declared on the first rep of a period will be used\n"
 		"- :asID=VALUE: set the AdaptationSet ID to VALUE (unsigned int)\n"
 		"- :role=VALUE: set the role of this representation (cf DASH spec). Media with different roles belong to different adaptation sets.\n"
-		"- :desc_p=VALUE: add a descriptor at the Period level. Value must be a properly formatted XML element.\n"
-		"- :desc_as=VALUE: add a descriptor at the AdaptationSet level. Value must be a properly formatted XML element. Two input files with different values will be in different AdaptationSet elements.\n"
-		"- :desc_as_c=VALUE: add a descriptor at the AdaptationSet level. Value must be a properly formatted XML element. Value is ignored while creating AdaptationSet elements.\n"
-		"- :desc_rep=VALUE: add a descriptor at the Representation level. Value must be a properly formatted XML element. Value is ignored while creating AdaptationSet elements.\n"
+		"- :desc_p=VALUE: add a descriptor at the Period level.\n"
+		"- :desc_as=VALUE: add a descriptor at the AdaptationSet level. Two input files with different values will be in different AdaptationSet elements.\n"
+		"- :desc_as_c=VALUE: add a descriptor at the AdaptationSet level. Value is ignored while creating AdaptationSet elements.\n"
+		"- :desc_rep=VALUE: add a descriptor at the Representation level. Value is ignored while creating AdaptationSet elements.\n"
 		"- :sscale: force movie timescale to match media timescale of the first track in the segment.\n"
 		"- :trackID=N: only use the track ID N from the source file\n"
 		"- @f1:args@fN:args@@fK:args: set a filter chain to insert between the source and the dasher. Each filter in the chain is formatted as a regular filter, see filter doc `gpac -h doc`(filters_general). If several filters are set:\n"
@@ -826,6 +832,7 @@
 		"\n"
 		"Note: `@f` must be placed after all other options.\n"
 		"\n"
+		"Note: Descriptors value must be a properly formatted XML element(s), value is not checked. Syntax can use `file@FILENAME` to load content from file.\n"
 		"# Options\n"
 		);
 
@@ -948,7 +955,7 @@
 	GF_DEF_ARG("dlba", NULL, "`S` force DolbyAtmos mode for EAC3. Value can be\n"
 		"- no: disable Atmos signaling\n"
 		"- auto: use Atmos signaling from first sample\n"
-		"- N: force Atmos signaling using complexibility type index N", NULL, NULL, GF_ARG_STRING, 0),
+		"- N: force Atmos signaling using compatibility type index N", NULL, NULL, GF_ARG_STRING, 0),
 	GF_DEF_ARG("font", NULL, "specify font name for text import (default `Serif`)", NULL, NULL, GF_ARG_STRING, 0),
 	GF_DEF_ARG("size", NULL, "specify font size for text import (default `18`)", NULL, NULL, GF_ARG_INT, 0),
 	GF_DEF_ARG("text_layout", NULL, "specify the track text layout as WxHxXxY\n"
@@ -1002,6 +1009,8 @@
 		"  - a value of -1 will ignore source track ID\n"
 		"  - other value will try to set track ID to this value if no other track with same ID is present"
 		"", NULL, NULL, GF_ARG_INT, 0),
+	GF_DEF_ARG("tkgp", NULL, "`S` assign track group to track. Value is formatted as `TYPE,N` with TYPE the track group type (4CC) and N the track group ID. A negative ID removes from track group ID -N", NULL, NULL, GF_ARG_STRING, 0),
+	GF_DEF_ARG("tkidx", NULL, "`S` set track position in track list, 1 being first track in file", NULL, NULL, GF_ARG_STRING, 0),
 	GF_DEF_ARG("stats", "fstat", "`C` print filter session stats after import", NULL, NULL, GF_ARG_BOOL, 0),
 	GF_DEF_ARG("graph", "fgraph", "`C` print filter session graph after import", NULL, NULL, GF_ARG_BOOL, 0),
 	{"sopt:OPTS", NULL, "set `OPTS` as additional arguments to source filter. `OPTS` can be any usual filter argument, see filter doc `gpac -h doc`(Filters)"},
@@ -1315,6 +1324,7 @@
  	MP4BOX_ARG("wget", "fetch resource from http(s) URL", GF_ARG_STRING, GF_FS_ARG_HINT_EXPERT, &do_wget, 0, 0),
  	MP4BOX_ARG("dm2ts", "dump timing of an input MPEG-2 TS stream sample timing", GF_ARG_BOOL, 0, &dump_m2ts, 0, 0),
  	MP4BOX_ARG("check-xml", "check XML output format for -dnal*, -diso* and -dxml options", GF_ARG_BOOL, 0, &dump_check_xml, 0, 0),
+ 	MP4BOX_ARG("fuzz-chk", "open file without probing and exit (for fuzz tests)", GF_ARG_BOOL, GF_FS_ARG_HINT_EXPERT, &fuzz_chk, 0, 0),
  	{0}
 };
 
@@ -1415,7 +1425,7 @@
 
 MP4BoxArg m4b_swf_args =
 {
-#ifndef GPAC_DISABLE_SCENE_ENCODER
+#ifndef GPAC_DISABLE_SWF_IMPORT
  	MP4BOX_ARG("global", "all SWF defines are placed in first scene replace rather than when needed", GF_ARG_BOOL, 0, &swf_flags, GF_SM_SWF_STATIC_DICT, ARG_BIT_MASK),
  	MP4BOX_ARG("no-ctrl", "use a single stream for movie control and dictionary (this will disable ActionScript)", GF_ARG_BOOL, 0, &swf_flags, GF_SM_SWF_SPLIT_TIMELINE, ARG_BIT_MASK_REM),
  	MP4BOX_ARG("no-text", "remove all SWF text", GF_ARG_BOOL, 0, &swf_flags, GF_SM_SWF_NO_TEXT, ARG_BIT_MASK),
@@ -1519,7 +1529,7 @@
 	"- `tag_name` starts with `QT/`\n"
 	"- or `tag_name` is not recognized and longer than 4 characters\n"
 	"  \n"
-	"The `tag_name` can optionnally be prefixed with `HDLR@`, indicating the tag namespace 4CC, the default namespace being `mdta`.\n"
+	"The `tag_name` can optionally be prefixed with `HDLR@`, indicating the tag namespace 4CC, the default namespace being `mdta`.\n"
 	"The `tag_value` can be prefixed with:\n"
 	"- S: force string encoding (must be placed first) instead of parsing the tag value\n"
 	"- b: use 8-bit encoding for signed or unsigned int\n"
@@ -1657,6 +1667,11 @@
 		i++;
 		gf_sys_print_arg(helpout, help_flags, arg, "mp4box-general");
 	}
+	gf_sys_format_help(helpout, help_flags, "\nReturn codes are 0 for no error, 1 for error"
+#ifdef GPAC_MEMORY_TRACKING
+		" and 2 for memory leak detection when -mem-track is used"
+#endif
+		"\n");
 }
 
 /*
@@ -1896,9 +1911,9 @@
 }
 
 
-#ifndef GPAC_DISABLE_ISOM_WRITE
 static u32 parse_meta_args(char *opts, MetaActionType act_type)
 {
+#ifndef GPAC_DISABLE_ISOM_WRITE
 	MetaAction *meta;
 
 	metas = gf_realloc(metas, sizeof(MetaAction) * (nb_meta_act + 1));
@@ -2196,14 +2211,14 @@
 		opts += strlen(szSlot);
 		next0 = ':';
 	}
+#endif //GPAC_DISABLE_ISOM_WRITE
 	return 0;
 }
-#endif //GPAC_DISABLE_ISOM_WRITE
 
 
-#ifndef GPAC_DISABLE_ISOM_WRITE
 static Bool parse_tsel_args(char *opts, TSELActionType act)
 {
+#ifndef GPAC_DISABLE_ISOM_WRITE
 	TrackIdentifier refTrackID = {0, 0};
 	Bool has_switch_id;
 	u32 switch_id = 0;
@@ -2276,9 +2291,9 @@
 		}
 		opts += strlen(szSlot);
 	}
+#endif // GPAC_DISABLE_ISOM_WRITE
 	return 0;
 }
-#endif // GPAC_DISABLE_ISOM_WRITE
 
 
 GF_DashSegmenterInput *set_dash_input(GF_DashSegmenterInput *dash_inputs, char *name, u32 *nb_dash_inputs)
@@ -2342,11 +2357,11 @@
 					nb_descs = &di->nb_as_descs;
 					descs = &di->as_descs;
 					opt_offset = 8;
-				} else if (!strnicmp(opts, "desc_as_c=", 8)) {
+				} else if (!strnicmp(opts, "desc_as_c=", 10)) {
 					nb_descs = &di->nb_as_c_descs;
 					descs = &di->as_c_descs;
 					opt_offset = 10;
-				} else if (!strnicmp(opts, "desc_rep=", 8)) {
+				} else if (!strnicmp(opts, "desc_rep=", 9)) {
 					nb_descs = &di->nb_rep_descs;
 					descs = &di->rep_descs;
 					opt_offset = 9;
@@ -2499,7 +2514,8 @@
 		ext0 = '=';
 		if (!stricmp(ext + 1, "none")) {
 			memset(tka->mx, 0, sizeof(s32)*9);
-			tka->mx0 = tka->mx4 = tka->mx8 = 1;
+			tka->mx0 = tka->mx4 = 0x00010000;
+			tka->mx8 = 0x40000000;
 		} else {
 			s32 res;
 			if (strstr(ext+1, "0x")) {
@@ -3049,6 +3065,7 @@
 {
 	compress_moov = opt ? 2 : 1;
 	open_edit = GF_TRUE;
+	do_save = GF_TRUE;
 	return 0;
 }
 
@@ -3274,7 +3291,7 @@
 		".br\nbuild: %s\n"
 		".br\nCopyright: %s\n.br\n"
 		".SH SEE ALSO\n"
-		".LP\ngpac(1)\n", gf_gpac_version(), gf_gpac_copyright());
+		".LP\ngpac(1)\n", GPAC_VERSION, gf_gpac_copyright());
 
 		gf_fclose(helpout);
 	}
@@ -4231,6 +4248,7 @@
 
 static u32 do_write_udp()
 {
+#ifndef GPAC_DISABLE_NETWORK
 	GF_Err e;
 	u32 res = 0;
 	GF_Socket *sock = gf_sk_new(GF_SOCK_TYPE_UDP);
@@ -4254,6 +4272,9 @@
 	}
 	gf_sk_del(sock);
 	return res;
+#else
+	return 0;
+#endif // GPAC_DISABLE_NETWORK
 }
 
 #ifndef GPAC_DISABLE_MPD
@@ -4264,7 +4285,11 @@
 	GF_MPD *mpd;
 	char *mpd_base_url = NULL;
 	if (!strnicmp(inName, "http://", 7) || !strnicmp(inName, "https://", 8)) {
+#ifndef GPAC_DISABLE_NETWORK
 		e = gf_dm_wget(inName, "tmp_main.m3u8", 0, 0, &mpd_base_url);
+#else
+		e = GF_NOT_SUPPORTED;
+#endif
 		if (e != GF_OK) {
 			M4_LOG(GF_LOG_ERROR, ("Cannot retrieve M3U8 (%s): %s\n", inName, gf_error_to_string(e)));
 			if (mpd_base_url) gf_free(mpd_base_url);
@@ -4443,9 +4468,11 @@
 		}
 	}
 
+#ifndef GPAC_DISABLE_ISOM_WRITE
 	if (file && keep_utc && open_edit) {
 		gf_isom_keep_utc_times(file, 1);
 	}
+#endif
 
 	if (do_flat && interleaving_time) {
 		char szSubArg100;
@@ -4469,7 +4496,6 @@
 	}
 
 	for (ipass=0; ipass<nb_pass; ipass++) {
-		u32 tk_idx = 1;
 		for (i=0; i<(u32) argc; i++) {
 			char *margs=NULL;
 			char *msid = NULL;
@@ -4480,7 +4506,7 @@
 					char *loc_src = src;
 					char *sep = NULL;
 					while (1) {
-						char *opt_sep;
+						char *opt_sep, *frag_sep;
 						sep = strchr(loc_src, '+');
 						if (!sep) break;
 
@@ -4488,26 +4514,33 @@
 						if (strstr(src, "://"))
 							break;
 
-						opt_sep = gf_url_colon_suffix(src, '=');
-						if (opt_sep)
-							opt_sep0 = 0;
-						if (gf_file_exists(src)) {
-							if (opt_sep)
-								opt_sep0 = ':';
+						opt_sep = gf_url_colon_suffix(sep+1, '=');
+						frag_sep = gf_url_colon_suffix(sep+1, '#');
+						if (frag_sep && opt_sep && (frag_sep<opt_sep)) {
+							opt_sep=NULL;
+						}
+						if (opt_sep) opt_sep0 = 0;
+						if (frag_sep) frag_sep0 = 0;
+						if (gf_file_exists(sep+1)) {
+							if (opt_sep) opt_sep0 = ':';
+							if (frag_sep) frag_sep0 = '#';
 							break;
 						}
-						if (opt_sep)
-							opt_sep0 = ':';
+						if (opt_sep) opt_sep0 = ':';
+						if (frag_sep) frag_sep0 = '#';
 
 						sep0 = '+';
 						loc_src = sep+1;
 					}
+					u32 tk_idx = gf_isom_get_track_count(file);
+					//if existing tracks in file, set default index to next track
+					if (tk_idx) tk_idx++;
+
 					if (fs && (ipass==0)) {
 						e = import_file(file, src, import_flags, import_fps, agg_samples, fs, &margs, &msid, tk_idx);
 					} else {
 						e = import_file(file, src, import_flags, import_fps, agg_samples, fs, NULL, NULL, tk_idx);
 					}
-					tk_idx++;
 
 					if (margs) {
 						gf_dynstrcat(&mux_args, margs, ":");
@@ -4878,6 +4911,7 @@
 
 static GF_Err do_export_tracks_non_isobmf()
 {
+#ifndef GPAC_DISABLE_MEDIA_EXPORT
 	u32 i;
 
 	GF_MediaExporter mdump;
@@ -4911,6 +4945,9 @@
 		if (e) return e;
 	}
 	return GF_OK;
+#else
+	return GF_NOT_SUPPORTED;
+#endif
 }
 
 
@@ -4981,6 +5018,7 @@
 
 static GF_Err do_export_tracks()
 {
+#ifndef GPAC_DISABLE_MEDIA_EXPORT
 	GF_Err e;
 	u32 i;
 	char szFileGF_MAX_PATH+24;
@@ -5026,6 +5064,9 @@
 		}
 	}
 	return GF_OK;
+#else
+	return GF_NOT_SUPPORTED;
+#endif
 }
 
 static GF_Err do_meta_act()
@@ -5292,6 +5333,7 @@
 
 static GF_Err do_tsel_act()
 {
+#ifndef GPAC_DISABLE_ISOM_WRITE
 	u32 i;
 	GF_Err e;
 	for (i=0; i<nb_tsel_acts; i++) {
@@ -5338,10 +5380,14 @@
 		}
 	}
 	return GF_OK;
+#else
+	return GF_NOT_SUPPORTED;
+#endif
 }
 
 static void do_ipod_conv()
 {
+#ifndef GPAC_DISABLE_ISOM_WRITE
 	u32 i, ipod_major_brand = 0;
 	M4_LOG(GF_LOG_INFO, ("Setting up iTunes/iPod file\n"));
 
@@ -5388,10 +5434,12 @@
 	gf_isom_set_brand_info(file, ipod_major_brand, 1);
 	gf_isom_modify_alternate_brand(file, GF_ISOM_BRAND_MP42, GF_TRUE);
 	do_save = GF_TRUE;
+#endif
 }
 
 static GF_Err do_track_act()
 {
+#ifndef GPAC_DISABLE_ISOM_WRITE
 	u32 j;
 	for (j=0; j<nb_track_act; j++) {
 		u32 i;
@@ -5553,7 +5601,10 @@
 			}
 			break;
 		case TRACK_ACTION_REFERENCE:
-			e = gf_isom_set_track_reference(file, track, GF_4CC(tka->lang0, tka->lang1, tka->lang2, tka->lang3), newTrackID);
+			if (newTrackID)
+				e = gf_isom_set_track_reference(file, track, GF_4CC(tka->lang0, tka->lang1, tka->lang2, tka->lang3), newTrackID);
+			else
+				e = gf_isom_remove_track_reference(file, track, GF_4CC(tka->lang0, tka->lang1, tka->lang2, tka->lang3) );
 			do_save = GF_TRUE;
 			break;
 		case TRACK_ACTION_REM_NON_RAP:
@@ -5569,7 +5620,11 @@
 			do_save = GF_TRUE;
 			break;
 		case TRACK_ACTION_SET_EDITS:
+#ifndef GPAC_DISABLE_MEDIA_IMPORT
 			e = apply_edits(file, track, tka->string);
+#else
+			e = GF_NOT_SUPPORTED;
+#endif
 			do_save = GF_TRUE;
 			break;
 		case TRACK_ACTION_SET_TIME:
@@ -5599,20 +5654,28 @@
 		if (e) return e;
 	}
 	return GF_OK;
+#else
+	return GF_NOT_SUPPORTED;
+#endif
 }
 
 
 
 static Bool do_qt_keys(char *name, char *val)
 {
+#ifndef GPAC_DISABLE_ISOM_WRITE
 	GF_Err e = gf_media_isom_apply_qt_key(file, name, val);
 	if (e) return GF_FALSE;
 	do_save = GF_TRUE;
 	return GF_TRUE;
+#else
+	return GF_FALSE;
+#endif
 }
 
 static GF_Err do_itunes_tag()
 {
+#ifndef GPAC_DISABLE_ISOM_WRITE
 	GF_Err e;
 	char *itunes_data = NULL;
 	char *tags = itunes_tags;
@@ -5743,6 +5806,9 @@
 	}
 	if (itunes_data) gf_free(itunes_data);
 	return GF_OK;
+#else
+	return GF_NOT_SUPPORTED;
+#endif
 }
 
 #if !defined(GPAC_DISABLE_ISOM_HINTING) && !defined(GPAC_DISABLE_SENG)
@@ -5783,6 +5849,7 @@
 
 static GF_Err do_remux_file()
 {
+#ifndef GPAC_DISABLE_MEDIA_EXPORT
 	GF_MediaExporter mdump;
 	memset(&mdump, 0, sizeof(GF_MediaExporter));
 	mdump.in_name = inName;
@@ -5790,6 +5857,9 @@
 	mdump.flags = GF_EXPORT_REMUX;
 	mdump.print_stats_graph = fs_dump_flags;
 	return gf_media_export(&mdump);
+#else
+	return GF_NOT_SUPPORTED;
+#endif
 }
 
 static u32 mp4box_cleanup(u32 ret_code) {
@@ -5910,7 +5980,6 @@
 		gf_memory_print();
 	}
 #endif
-
 	return ret_code;
 }
 
@@ -5975,7 +6044,7 @@
 	if (i) {
 		return mp4box_cleanup(i - 1);
 	}
-#if !defined(GPAC_DISABLE_STREAMING) && !defined(GPAC_DISABLE_SENG)
+#if !defined(GPAC_DISABLE_STREAMING) && !defined(GPAC_DISABLE_SENG) && !defined(GPAC_CONFIG_EMSCRIPTEN)
 	if (live_scene) {
 		int ret = live_session(argc, argv);
 		return mp4box_cleanup(ret);
@@ -6048,6 +6117,16 @@
 		gf_log_set_tool_level(GF_LOG_MEMORY, level);
 #endif
 
+	if (fuzz_chk) {
+		file = gf_isom_open(inName, GF_ISOM_OPEN_READ_DUMP, NULL);
+		if (file) gf_isom_close(file);
+		file = gf_isom_open(inName, GF_ISOM_OPEN_READ, NULL);
+		if (file) gf_isom_close(file);
+		file = gf_isom_open(inName, GF_ISOM_OPEN_KEEP_FRAGMENTS, NULL);
+		if (file) gf_isom_close(file);
+		return mp4box_cleanup(0);
+	}
+
 	e = gf_sys_set_args(argc, (const char **) argv);
 	if (e) {
 		M4_LOG(GF_LOG_ERROR, ("Error assigning libgpac arguments: %s\n", gf_error_to_string(e) ));
@@ -6074,7 +6153,11 @@
 	}
 
 	if (do_wget != NULL) {
+#ifndef GPAC_DISABLE_NETWORK
 		e = gf_dm_wget(do_wget, inName, 0, 0, NULL);
+#else
+		e = GF_NOT_SUPPORTED;
+#endif
 		if (e != GF_OK) {
 			M4_LOG(GF_LOG_ERROR, ("Cannot retrieve %s: %s\n", do_wget, gf_error_to_string(e) ));
 			return mp4box_cleanup(1);
@@ -6158,10 +6241,10 @@
 			fileName0 = ':';
 		} else {
 			file = package_file(pack_file, NULL, pack_wgt);
-			if (!file) {
-				M4_LOG(GF_LOG_ERROR, ("Failed to package file\n"));
-				return mp4box_cleanup(1);
-			}
+		}
+		if (!file) {
+			M4_LOG(GF_LOG_ERROR, ("Failed to package file\n"));
+			return mp4box_cleanup(1);
 		}
 		if (!outName) outName = inName;
 		do_save = GF_TRUE;
@@ -6207,7 +6290,11 @@
 			if (!crypt && use_init_seg) {
 				file = gf_isom_open(use_init_seg, GF_ISOM_OPEN_READ_DUMP, NULL);
 				if (file) {
+#ifndef GPAC_DISABLE_ISOM_FRAGMENTS
 					e = gf_isom_open_segment(file, inName, 0, 0, 0);
+#else
+					e = GF_NOT_SUPPORTED;
+#endif
 					if (e==GF_ISOM_INCOMPLETE_FILE) {
 						M4_LOG(GF_LOG_WARNING, ("Segment %s: %s\n", inName, gf_error_to_string(e) ));
 					} else if (e) {
@@ -6237,8 +6324,10 @@
 					return mp4box_cleanup(1);
 				}
 			}
+#ifndef GPAC_DISABLE_ISOM_WRITE
 			if (freeze_box_order)
 				gf_isom_freeze_order(file);
+#endif
 			break;
 		/*allowed for bt<->xmt*/
 		case 2:
@@ -6329,14 +6418,16 @@
 		}
 	}
 
+#ifndef GPAC_DISABLE_ISOM_WRITE
 	if (high_dynamc_range_filename) {
-		e = parse_high_dynamc_range_xml_desc(file, 0, high_dynamc_range_filename);
+		e = apply_high_dynamc_range_xml_desc(file, 0, high_dynamc_range_filename);
 		if (e) goto err_exit;
 	}
 
 	if (file && keep_utc) {
 		gf_isom_keep_utc_times(file, 1);
 	}
+#endif
 
 	if ( gf_strlcpy(outfile, outName ? outName : inName, sizeof(outfile)) >= sizeof(outfile) ) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("Filename too long (limit is %d)\n", GF_MAX_PATH));
@@ -6355,6 +6446,12 @@
 		else if (!stricmp(szExt, ".mov") || !stricmp(szExt, ".qt"))
 			conv_type = GF_ISOM_CONV_TYPE_MOV;
 
+		if (conv_type)
+			conv_type_from_ext = GF_TRUE;
+		//if not same ext, force conversion
+		char *szExtOrig = gf_file_ext_start(inName);
+		if (szExtOrig && strcmp(szExtOrig, szExt))
+			conv_type_from_ext = GF_FALSE;
 		//remove extension from outfile
 		*szExt = 0;
 	}
@@ -6467,6 +6564,7 @@
 
 #if !defined(GPAC_DISABLE_ISOM_WRITE) && !defined(GPAC_DISABLE_MEDIA_IMPORT)
 	if (split_duration || split_size || split_range_str) {
+		if (force_new && !outName) outName = inName;
 		e = split_isomedia_file(file, split_duration, split_size, inName, interleaving_time, split_start, adjust_split_end, outName, seg_at_rap, split_range_str, fs_dump_flags);
 		if (e) goto err_exit;
 
@@ -6569,6 +6667,12 @@
 				strcat(outfile, ".m21");
 			}
 		}
+
+		if (conv_type_from_ext) {
+			if (!no_inplace && gf_isom_is_inplace_rewrite(file))
+				conv_type = 0;
+		}
+
 #ifndef GPAC_DISABLE_MEDIA_IMPORT
 		if ((conv_type == GF_ISOM_CONV_TYPE_ISMA) || (conv_type == GF_ISOM_CONV_TYPE_ISMA_EX)) {
 			M4_LOG(GF_LOG_INFO, ("Converting to ISMA Audio-Video MP4 file\n"));
@@ -6841,7 +6945,7 @@
 	return 0;
 }
 
-#ifndef GPAC_CONFIG_ANDROID
+#if !defined(GPAC_CONFIG_ANDROID) && !defined(GPAC_CONFIG_EMSCRIPTEN)
 
 GF_MAIN_FUNC(mp4box_main)

gpac-2.2.1.tar.gz/applications/mp4box/mp4box.h -> gpac-2.4.0.tar.gz/applications/mp4box/mp4box.h Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2021
+ *			Copyright (c) Telecom ParisTech 2000-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / mp4box application
@@ -73,14 +73,14 @@
 
 Bool mp4box_check_isom_fileopt(char *opt);
 
-GF_Err parse_high_dynamc_range_xml_desc(GF_ISOFile* movie, u32 track, char* file_name);
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
+GF_Err apply_high_dynamc_range_xml_desc(GF_ISOFile* movie, u32 track, char* file_name);
 
 #ifndef GPAC_DISABLE_MEDIA_IMPORT
 GF_Err import_file(GF_ISOFile *dest, char *inName, u32 import_flags, GF_Fraction force_fps, u32 frames_per_sample, GF_FilterSession *fsess, char **mux_args_if_first_pass, char **mux_sid_if_first_pass, u32 tk_idx);
 #else
-GF_Err import_file(GF_ISOFile *dest, char *inName, u32 import_flags, GF_Fraction force_fps, u32 frames_per_sample, GF_FilterSession *fsess, Bool second_pass) {
+static GF_Err import_file(GF_ISOFile *dest, char *inName, u32 import_flags, GF_Fraction force_fps, u32 frames_per_sample, GF_FilterSession *fsess, char **mux_args_if_first_pass, char **mux_sid_if_first_pass, u32 tk_idx) {
 	return GF_NOT_SUPPORTED;
 }
 #endif
@@ -99,7 +99,7 @@
 #endif
 
 GF_Err dump_isom_cover_art(GF_ISOFile *file, char *inName, Bool is_final_name);
-GF_Err dump_isom_chapters(GF_ISOFile *file, char *inName, Bool is_final_name, Bool dump_ogg);
+GF_Err dump_isom_chapters(GF_ISOFile *file, char *inName, Bool is_final_name, u32 dump_ogg);
 GF_Err dump_isom_udta(GF_ISOFile *file, char *inName, Bool is_final_name, 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, Bool is_string);
@@ -129,7 +129,7 @@
 void dump_isom_sdp(GF_ISOFile *file, char *inName, Bool is_final_name);
 #endif
 
-void dump_isom_timestamps(GF_ISOFile *file, char *inName, Bool is_final_name, Bool skip_offset);
+void dump_isom_timestamps(GF_ISOFile *file, char *inName, Bool is_final_name, u32 skip_offset);
 GF_Err dump_isom_nal(GF_ISOFile *file, GF_ISOTrackID trackID, char *inName, Bool is_final_name, u32 dump_flags);
 void dump_isom_saps(GF_ISOFile *file, GF_ISOTrackID trackID, u32 dump_saps_mode, char *inName, Bool is_final_name);

gpac-2.4.0.tar.gz/applications/testapps/mp4mux Added

gpac-2.4.0.tar.gz/applications/testapps/mp4mux/main.c Added

@@ -0,0 +1,138 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom Paris 2024
+ *					All rights reserved
+ *
+ *  This file is part of GPAC - test MP4 muxer
+ *
+ */
+
+#include <gpac/tools.h>
+#include <gpac/isomedia.h>
+
+
+static GF_Err _on_data(void *cbk, u8 *data, u32 block_size, void *cbk_data, u32 cbk_magic)
+{
+	FILE *f = cbk;
+	gf_fwrite(data, block_size, f);
+	return GF_OK;
+}
+static GF_Err _on_data_patch(void *cbk, u8 *block, u32 block_size, u64 block_offset, Bool is_insert)
+{
+	FILE *f = cbk;
+	u64 pos = gf_ftell(f);
+	gf_fseek(f, block_offset, SEEK_SET);
+	gf_fwrite(block, block_size, f);
+	gf_fseek(f, pos, SEEK_SET);
+	return GF_OK;
+}
+
+void mp4mux_api_test(u32 frag_type, Bool moov_first, const char *fileName)
+{
+	GF_Err e;
+	//open target file
+	FILE *f = gf_fopen(fileName, "w");
+	//open movie
+	GF_ISOFile *nf = gf_isom_open("_gpac_isobmff_redirect", (!frag_type && moov_first) ? GF_ISOM_WRITE_EDIT : GF_ISOM_OPEN_WRITE, NULL);
+
+	//set storage mode to interlleaved
+	if (moov_first && !frag_type) {
+		e = gf_isom_set_storage_mode(nf, GF_ISOM_STORE_INTERLEAVED); //or GF_ISOM_STORE_STREAMABLE since we only have one track
+		assert(!e);
+	}
+	//setup our callbacks, we don't use the last_block callback
+	e =	gf_isom_set_write_callback(nf, _on_data, _on_data_patch, NULL, f, 1000);
+	assert(!e);
+
+	//movie setup
+	e = gf_isom_set_brand_info(nf, GF_ISOM_BRAND_MP42, 0);
+	assert(!e);
+	e = gf_isom_set_timescale(nf, 1000);
+	assert(!e);
+	u32 track_id = gf_isom_new_track(nf, 0, GF_ISOM_MEDIA_SUBT, 1000);
+	assert(track_id);
+	e = gf_isom_set_track_enabled(nf, track_id, GF_TRUE);
+	assert(!e);
+	u32 i, di;
+	e = gf_isom_new_stxt_description(nf, 1, GF_ISOM_SUBTYPE_STXT, "text/text", NULL, NULL, &di);
+	assert(!e);
+
+	//setup fragmentation
+	if (frag_type) {
+		e = gf_isom_setup_track_fragment(nf, track_id, di, 2000, 0, 1, 0, 0, 0);
+		assert(!e);
+		//will write init segment
+		e = gf_isom_finalize_for_fragment(nf, (frag_type==2) ? 1 : 0, GF_TRUE);
+		assert(!e);
+	}
+	//add samples
+	u64 first_dts=0;
+	u64 dts=0;
+	u32 duration=2000;
+	for (i=0; i<10000; i++) {
+		char szTxt100;
+		GF_ISOSample s;
+
+		if (frag_type && ((i%100)==0)) {
+			if (frag_type==2) {
+				if (i) {
+					e = gf_isom_close_segment(nf, 0, track_id, first_dts, 0, dts+duration, GF_FALSE, GF_FALSE, GF_FALSE, GF_FALSE, 0, NULL, NULL, NULL);
+					assert(!e);
+				}
+				//use either NULL if you store in same file or "_gpac_isobmff_redirect" for multiple files (to setup styp and indexing)
+				e = gf_isom_start_segment(nf, NULL, GF_FALSE);
+				assert(!e);
+				first_dts = dts;
+				//in this demo, one fragment per segment
+			}
+
+			//starting a fragment will flush all pending data
+			e = gf_isom_start_fragment(nf, GF_ISOM_FRAG_MOOF_FIRST);
+			assert(!e);
+		}
+
+		sprintf(szTxt, "Text sample #%d", i+1);
+		memset(&s, 0, sizeof(GF_ISOSample));
+		s.dataLength = (u32) strlen(szTxt);
+		s.data = (u8 *)szTxt;
+		s.DTS = dts;
+		s.IsRAP = 1;
+		if (frag_type) {
+			e = gf_isom_fragment_add_sample(nf, track_id, &s, di, 2000, 0, 0, GF_FALSE);
+		} else {
+			e = gf_isom_add_sample(nf, 1, di, &s);
+		}
+		assert(!e);
+		dts+=duration;
+	}
+	//close segment
+	if (frag_type==2) {
+		e = gf_isom_close_segment(nf, 0, track_id, first_dts, 0, dts+duration, GF_FALSE, GF_FALSE, GF_FALSE, GF_FALSE, 0, NULL, NULL, NULL);
+		assert(!e);
+	}
+
+	//flush all pending data and delete
+	e = gf_isom_close(nf);
+	assert(!e);
+	gf_fclose(f);
+}
+
+int main(int argc, char **argv)
+{
+
+	gf_sys_init(0, "0");
+
+	//mux using callbacks, no fragments and mdat first
+	mp4mux_api_test(0, GF_FALSE, "mux_flat.mp4");
+	//mux using callbacks, no fragments and moov first
+	mp4mux_api_test(0, GF_TRUE, "mux_inter.mp4");
+	//mux using callbacks and fragments
+	mp4mux_api_test(1, GF_FALSE, "mux_frag.mp4");
+	//mux using callbacks and segments
+	mp4mux_api_test(2, GF_FALSE, "mux_seg.mp4");
+
+	gf_sys_close();
+}
+

gpac-2.2.1.tar.gz/applications/testapps/ts2hds/main.c -> gpac-2.4.0.tar.gz/applications/testapps/ts2hds/main.c Changed

gpac-2.2.1.tar.gz/build/android/jni/Application.mk -> gpac-2.4.0.tar.gz/build/android/jni/Application.mk Changed

gpac-2.2.1.tar.gz/build/android/jni/libgpac/Android.mk -> gpac-2.4.0.tar.gz/build/android/jni/libgpac/Android.mk Changed

@@ -15,12 +15,12 @@
 LOCAL_C_INCLUDES 	+= $(LOCAL_PATH)/../../../../extra_lib/include/png/
 LOCAL_C_INCLUDES 	+= $(LOCAL_PATH)/../../../../extra_lib/include/faad
 LOCAL_C_INCLUDES 	+= $(LOCAL_PATH)/../../../../extra_lib/include/openjpeg
-+LOCAL_C_INCLUDES 	+= $(LOCAL_PATH)/../../../../extra_lib/include/openssl_android/
+LOCAL_C_INCLUDES 	+= $(LOCAL_PATH)/../../../../extra_lib/include/openssl_android/
 LOCAL_C_INCLUDES 	+= $(LOCAL_PATH)/../../../../modules
 
 LOCAL_LDLIBS    += -L$(LOCAL_PATH)/../../../../extra_lib/lib/android/$(TARGET_ARCH_ABI)
 LOCAL_LDLIBS    += -lGLESv2 -ldl
-LOCAL_LDLIBS    += -lft2 -ljpegdroid -lopenjpeg -lpng -lfaad -lmad -lnghttp2 -lz -lssl -lcrypto
+LOCAL_LDLIBS    += -lft2 -ljpegdroid -lopenjpeg -lpng -lfaad -lmad -lnghttp2 -lz -lssl -lcrypto -lcaption
 
 #ffmpeg
 LOCAL_LDLIBS    += -lavcodec -lavformat -lswresample -lavfilter -lavutil -lavdevice -lswscale
@@ -28,6 +28,9 @@
 #mediacodec
 LOCAL_LDLIBS    += -llog -lOpenMAXAL -lmediandk -landroid
 
+#mpegh
+LOCAL_LDLIBS    += -lMpeghDec -lMpegTPDec -lPCMutils -lIGFdec -lArithCoding -lFormatConverter -lgVBAPRenderer -lDRCdec -lUIManager -lSYS -lFDK -lm
+
 LOCAL_CFLAGS +=	-DGPAC_HAVE_CONFIG_H
 LOCAL_CFLAGS += -DNO_MALLINFO
 LOCAL_CFLAGS += -DGPAC_CONFIG_ANDROID
@@ -151,6 +154,7 @@
 	../../../../src/filters/dasher.c \
 	../../../../src/filters/dec_ac52.c \
 	../../../../src/filters/dec_bifs.c \
+	../../../../src/filters/dec_cc.c \
 	../../../../src/filters/dec_faad.c \
 	../../../../src/filters/dec_img.c \
 	../../../../src/filters/dec_j2k.c \
@@ -163,14 +167,17 @@
 	../../../../src/filters/dec_theora.c \
 	../../../../src/filters/dec_ttml.c \
 	../../../../src/filters/dec_ttxt.c \
+	../../../../src/filters/dec_uncv.c \
 	../../../../src/filters/dec_vorbis.c \
 	../../../../src/filters/dec_vtb.c \
 	../../../../src/filters/dec_webvtt.c \
 	../../../../src/filters/dec_xvid.c \
 	../../../../src/filters/dec_mediacodec.c \
 	../../../../src/filters/dec_mediacodec_jni.c \
+	../../../../src/filters/dec_mpeghdec.c \
 	../../../../src/filters/dmx_avi.c \
 	../../../../src/filters/dmx_dash.c \
+	../../../../src/filters/dmx_ghi.c \
 	../../../../src/filters/dmx_gsf.c \
 	../../../../src/filters/dmx_m2ts.c \
 	../../../../src/filters/dmx_mpegps.c \
@@ -182,6 +189,7 @@
 	../../../../src/filters/enc_jpg.c \
 	../../../../src/filters/enc_png.c \
 	../../../../src/filters/encrypt_cenc_isma.c \
+	../../../../src/filters/evg_rescale.c \
 	../../../../src/filters/ff_common.c \
 	../../../../src/filters/ff_avf.c \
 	../../../../src/filters/ff_bsf.c \

gpac-2.2.1.tar.gz/build/android/jni/libgpac/config.h -> gpac-2.4.0.tar.gz/build/android/jni/libgpac/config.h Changed

gpac-2.4.0.tar.gz/build/docker Added

gpac-2.4.0.tar.gz/build/docker/ubuntu-deps.Dockerfile Added

@@ -0,0 +1,18 @@
+FROM ubuntu:latest
+
+
+# set up the machine
+RUN apt-get -yqq update && apt-get install -y --no-install-recommends build-essential pkg-config g++ git cmake yasm fakeroot dpkg-dev devscripts debhelper ccache
+RUN apt-get install -y --no-install-recommends zlib1g-dev libfreetype6-dev libjpeg62-dev libpng-dev libmad0-dev libfaad-dev libogg-dev libvorbis-dev libtheora-dev liba52-0.7.4-dev libavcodec-dev libavformat-dev libavutil-dev libswscale-dev libavdevice-dev libnghttp2-dev libopenjp2-7-dev libcaca-dev libxv-dev x11proto-video-dev libgl1-mesa-dev libglu1-mesa-dev x11proto-gl-dev libxvidcore-dev libssl-dev libjack-jackd2-dev libasound2-dev libpulse-dev libsdl2-dev dvb-apps mesa-utils
+RUN apt-get autoremove -y && apt-get clean -y
+
+
+WORKDIR /gpac-deps
+
+# get manually built dependencies
+RUN git clone --depth=1 https://github.com/gpac/deps_unix
+WORKDIR /gpac-deps/deps_unix
+RUN git submodule update --init --recursive --force --checkout
+RUN ./build_all.sh linux
+
+CMD "bash"

gpac-2.4.0.tar.gz/build/docker/ubuntu.Dockerfile Added

gpac-2.4.0.tar.gz/build/msvc14/caca_out.vcxproj Added

@@ -0,0 +1,299 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.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">
+    
+    <RootNamespace>caca_out</RootNamespace>
+    <ProjectGuid>{95A030CF-71A5-4A1B-8399-8B16D69451DF}</ProjectGuid>
+  </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>
+    <PlatformToolset>v140</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v140</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v140</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v140</PlatformToolset>
+  </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/caca_out_rel/caca_out.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>../../include;../../extra_lib/include/libcaca;%(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>
+      <AdditionalDependencies>winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <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)</AdditionalLibraryDirectories>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+    </Bscmake>
+    <Manifest>
+      <AdditionalManifestFiles>$(SolutionDir)gpac_manifest.xml %(AdditionalManifestFiles)</AdditionalManifestFiles>
+    </Manifest>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TypeLibraryName>.\obj/caca_out_rel/caca_out.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>Full</Optimization>
+      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>../../include;../../extra_lib/include/libcaca;%(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>
+      <AdditionalDependencies>winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <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)</AdditionalLibraryDirectories>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+    </Bscmake>
+    <Manifest>
+      <AdditionalManifestFiles>$(SolutionDir)gpac_manifest.xml %(AdditionalManifestFiles)</AdditionalManifestFiles>
+    </Manifest>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>.\obj/caca_out_deb/caca_out.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>../../include;../../extra_lib/include/libcaca;%(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>
+      <AdditionalDependencies>winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <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)</AdditionalLibraryDirectories>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </Bscmake>
+    <Manifest>
+      <AdditionalManifestFiles>$(SolutionDir)gpac_manifest.xml %(AdditionalManifestFiles)</AdditionalManifestFiles>
+    </Manifest>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Midl>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TypeLibraryName>.\obj/caca_out_deb/caca_out.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>../../include;../../extra_lib/include/libcaca;%(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>
+      <AdditionalDependencies>winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <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)</AdditionalLibraryDirectories>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </Bscmake>
+    <Manifest>
+      <AdditionalManifestFiles>$(SolutionDir)gpac_manifest.xml %(AdditionalManifestFiles)</AdditionalManifestFiles>
+    </Manifest>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\modules\modules_export.cpp" />
+    <ClCompile Include="..\..\modules\caca_out\caca_out.c">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="libgpac_dll.vcxproj">
+      <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

gpac-2.2.1.tar.gz/build/msvc14/gpac.sln -> gpac-2.4.0.tar.gz/build/msvc14/gpac.sln Changed

@@ -36,6 +36,8 @@
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "out_dektec", "..\..\modules\dektec_out\out_dektec.vcxproj", "{042E3638-67F3-4C6C-8C00-CD9BFA416974}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "caca_out", "caca_out.vcxproj", "{95A030CF-71A5-4A1B-8399-8B16D69451DF}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug - MP4Box_only|Win32 = Debug - MP4Box_only|Win32
@@ -188,6 +190,18 @@
 		{042E3638-67F3-4C6C-8C00-CD9BFA416974}.Release|Win32.Build.0 = Release|Win32
 		{042E3638-67F3-4C6C-8C00-CD9BFA416974}.Release|x64.ActiveCfg = Release|x64
 		{042E3638-67F3-4C6C-8C00-CD9BFA416974}.Release|x64.Build.0 = Release|x64
+		{95A030CF-71A5-4A1B-8399-8B16D69451DF}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
+		{95A030CF-71A5-4A1B-8399-8B16D69451DF}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
+		{95A030CF-71A5-4A1B-8399-8B16D69451DF}.Debug|Win32.ActiveCfg = Debug|Win32
+		{95A030CF-71A5-4A1B-8399-8B16D69451DF}.Debug|Win32.Build.0 = Debug|Win32
+		{95A030CF-71A5-4A1B-8399-8B16D69451DF}.Debug|x64.ActiveCfg = Debug|x64
+		{95A030CF-71A5-4A1B-8399-8B16D69451DF}.Debug|x64.Build.0 = Debug|x64
+		{95A030CF-71A5-4A1B-8399-8B16D69451DF}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
+		{95A030CF-71A5-4A1B-8399-8B16D69451DF}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
+		{95A030CF-71A5-4A1B-8399-8B16D69451DF}.Release|Win32.ActiveCfg = Release|Win32
+		{95A030CF-71A5-4A1B-8399-8B16D69451DF}.Release|Win32.Build.0 = Release|Win32
+		{95A030CF-71A5-4A1B-8399-8B16D69451DF}.Release|x64.ActiveCfg = Release|x64
+		{95A030CF-71A5-4A1B-8399-8B16D69451DF}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -204,6 +218,7 @@
 		{042D3628-67F3-4B6C-8CC0-CD9AFA416974} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
 		{F728CC74-D7D0-41D2-8A28-05CE9F2EF0D0} = {B7FFDE3D-6BF0-4EE1-B6FD-BD15A503DBBA}
 		{042E3638-67F3-4C6C-8C00-CD9BFA416974} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
+		{95A030CF-71A5-4A1B-8399-8B16D69451DF} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {2516E9BA-1B96-4935-ABF3-0D6D3F959230}

gpac-2.2.1.tar.gz/build/msvc14/libgpac.vcxproj -> gpac-2.4.0.tar.gz/build/msvc14/libgpac.vcxproj Changed

@@ -251,28 +251,31 @@
     <ClCompile Include="..\..\src\filters\decrypt_cenc_isma.c" />
     <ClCompile Include="..\..\src\filters\dec_nvdec.c" />
     <ClCompile Include="..\..\src\filters\dec_nvdec_sdk.c" />
-    <ClCompile Include="..\..\src\filters\dmx_gsf.c" />
-    <ClCompile Include="..\..\src\filters\encrypt_cenc_isma.c" />
     <ClCompile Include="..\..\src\filters\dec_ac52.c" />
     <ClCompile Include="..\..\src\filters\dec_bifs.c" />
+    <ClCompile Include="..\..\src\filters\dec_cc.c" />
     <ClCompile Include="..\..\src\filters\dec_faad.c" />
     <ClCompile Include="..\..\src\filters\dec_img.c" />
     <ClCompile Include="..\..\src\filters\dec_j2k.c" />
     <ClCompile Include="..\..\src\filters\dec_laser.c" />
     <ClCompile Include="..\..\src\filters\dec_mad.c" />
     <ClCompile Include="..\..\src\filters\dec_mediacodec.c" />
+    <ClCompile Include="..\..\src\filters\dec_mpeghdec.c" />
     <ClCompile Include="..\..\src\filters\dec_odf.c" />
     <ClCompile Include="..\..\src\filters\dec_openhevc.c" />
     <ClCompile Include="..\..\src\filters\dec_opensvc.c" />
     <ClCompile Include="..\..\src\filters\dec_theora.c" />
     <ClCompile Include="..\..\src\filters\dec_ttml.c" />
     <ClCompile Include="..\..\src\filters\dec_ttxt.c" />
+    <ClCompile Include="..\..\src\filters\dec_uncv.c" />
     <ClCompile Include="..\..\src\filters\dec_vorbis.c" />
     <ClCompile Include="..\..\src\filters\dec_vtb.c" />
     <ClCompile Include="..\..\src\filters\dec_webvtt.c" />
     <ClCompile Include="..\..\src\filters\dec_xvid.c" />
     <ClCompile Include="..\..\src\filters\dmx_avi.c" />
     <ClCompile Include="..\..\src\filters\dmx_dash.c" />
+    <ClCompile Include="..\..\src\filters\dmx_ghi.c" />
+    <ClCompile Include="..\..\src\filters\dmx_gsf.c" />
     <ClCompile Include="..\..\src\filters\dmx_m2ts.c" />
     <ClCompile Include="..\..\src\filters\dmx_mpegps.c" />
     <ClCompile Include="..\..\src\filters\dmx_nhml.c" />
@@ -282,6 +285,8 @@
     <ClCompile Include="..\..\src\filters\dmx_vobsub.c" />
     <ClCompile Include="..\..\src\filters\enc_jpg.c" />
     <ClCompile Include="..\..\src\filters\enc_png.c" />
+    <ClCompile Include="..\..\src\filters\encrypt_cenc_isma.c" />
+    <ClCompile Include="..\..\src\filters\evg_rescale.c" />
     <ClCompile Include="..\..\src\filters\ff_common.c" />
     <ClCompile Include="..\..\src\filters\ff_avf.c" />
     <ClCompile Include="..\..\src\filters\ff_bsf.c" />

gpac-2.2.1.tar.gz/build/msvc14/libgpac.vcxproj.filters -> gpac-2.4.0.tar.gz/build/msvc14/libgpac.vcxproj.filters Changed

@@ -1154,6 +1154,9 @@
     <ClCompile Include="..\..\src\filters\dec_bifs.c">
       <Filter>filters</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\filters\dec_cc.c">
+      <Filter>filters</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\src\filters\dec_faad.c">
       <Filter>filters</Filter>
     </ClCompile>
@@ -1169,6 +1172,9 @@
     <ClCompile Include="..\..\src\filters\dec_mad.c">
       <Filter>filters</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\filters\dec_mpeghdec.c">
+      <Filter>filters</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\src\filters\dec_odf.c">
       <Filter>filters</Filter>
     </ClCompile>
@@ -1187,6 +1193,9 @@
     <ClCompile Include="..\..\src\filters\dec_ttxt.c">
       <Filter>filters</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\filters\dec_uncv.c">
+      <Filter>filters</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\src\filters\dec_vorbis.c">
       <Filter>filters</Filter>
     </ClCompile>
@@ -1208,6 +1217,12 @@
     <ClCompile Include="..\..\src\filters\dmx_dash.c">
       <Filter>filters</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\filters\dmx_ghi.c">
+      <Filter>filters</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\filters\dmx_gsf.c">
+      <Filter>filters</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\src\filters\dmx_m2ts.c">
       <Filter>filters</Filter>
     </ClCompile>
@@ -1235,6 +1250,9 @@
     <ClCompile Include="..\..\src\filters\enc_png.c">
       <Filter>filters</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\filters\evg_rescale.c">
+      <Filter>filters</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\src\filters\ff_common.c">
       <Filter>filters</Filter>
     </ClCompile>
@@ -1421,9 +1439,6 @@
     <ClCompile Include="..\..\src\filters\bsrw.c">
       <Filter>filters</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\filters\dmx_gsf.c">
-      <Filter>filters</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\filters\in_pipe.c">
       <Filter>filters</Filter>
     </ClCompile>

gpac-2.2.1.tar.gz/build/xcode/gpac.xcodeproj/project.pbxproj -> gpac-2.4.0.tar.gz/build/xcode/gpac.xcodeproj/project.pbxproj Changed

@@ -168,11 +168,19 @@
 		9206822C20EA41530041169F /* in_pipe.c in Sources */ = {isa = PBXBuildFile; fileRef = 9206822B20EA41530041169F /* in_pipe.c */; };
 		9206822E20EA69680041169F /* out_pipe.c in Sources */ = {isa = PBXBuildFile; fileRef = 9206822D20EA69680041169F /* out_pipe.c */; };
 		9206823420EA96AA0041169F /* mux_gsf.c in Sources */ = {isa = PBXBuildFile; fileRef = 9206823320EA96AA0041169F /* mux_gsf.c */; };
+		920D52AF29CAF7CE00105401 /* dec_uncv.c in Sources */ = {isa = PBXBuildFile; fileRef = 920D52AE29CAF7CE00105401 /* dec_uncv.c */; };
+		920F4C9B29950A9D00EC9D21 /* dec_webcodec.c in Sources */ = {isa = PBXBuildFile; fileRef = 920F4C9A29950A9D00EC9D21 /* dec_webcodec.c */; };
+		920F4C9D299D20CE00EC9D21 /* enc_webcodec.c in Sources */ = {isa = PBXBuildFile; fileRef = 920F4C9C299D20CE00EC9D21 /* enc_webcodec.c */; };
+		920F4C9F299FB3CC00EC9D21 /* avin_web.c in Sources */ = {isa = PBXBuildFile; fileRef = 920F4C9E299FB3CC00EC9D21 /* avin_web.c */; };
 		9210D007237041C2007AFB48 /* ftgrays.c in Sources */ = {isa = PBXBuildFile; fileRef = 9210D006237041C2007AFB48 /* ftgrays.c */; };
+		9210D8222A0E64B00047019A /* evg_rescale.c in Sources */ = {isa = PBXBuildFile; fileRef = 9210D8212A0E64B00047019A /* evg_rescale.c */; };
 		9212C0FB222D7AC000FE3580 /* vflip.c in Sources */ = {isa = PBXBuildFile; fileRef = 9212C0FA222D7AC000FE3580 /* vflip.c */; };
 		92256CCD20E0DA26004EB243 /* encrypt_cenc_isma.c in Sources */ = {isa = PBXBuildFile; fileRef = 92256CCC20E0DA26004EB243 /* encrypt_cenc_isma.c */; };
 		9225DD752326790C00F94C42 /* mpd.h in Headers */ = {isa = PBXBuildFile; fileRef = 9225DD742326790C00F94C42 /* mpd.h */; };
 		92261A87239A6E4600C14199 /* out_http.c in Sources */ = {isa = PBXBuildFile; fileRef = 92261A86239A6E4600C14199 /* out_http.c */; };
+		922B0FAA2A5E81EB003690BB /* dec_mpeghdec.c in Sources */ = {isa = PBXBuildFile; fileRef = 922B0FA92A5E81EB003690BB /* dec_mpeghdec.c */; };
+		922B0FC72A602176003690BB /* caca_out.c in Sources */ = {isa = PBXBuildFile; fileRef = 922B0FC62A602176003690BB /* caca_out.c */; };
+		922B0FC82A6028C5003690BB /* libgpac.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 9201F93718D5A38A003D1ACA /* libgpac.dylib */; };
 		922B27722445D5CE001D4F72 /* dec_ttml.c in Sources */ = {isa = PBXBuildFile; fileRef = 922B27712445D5CE001D4F72 /* dec_ttml.c */; };
 		922CF1251FCEE5D600F2F6A4 /* dmx_mpegps.c in Sources */ = {isa = PBXBuildFile; fileRef = 922CF1241FCEE5D600F2F6A4 /* dmx_mpegps.c */; };
 		922CF1271FCF169900F2F6A4 /* dmx_avi.c in Sources */ = {isa = PBXBuildFile; fileRef = 922CF1261FCF169900F2F6A4 /* dmx_avi.c */; };
@@ -207,6 +215,7 @@
 		923E89CF20B6F04600F299B2 /* g_crypt_tinyaes.c in Sources */ = {isa = PBXBuildFile; fileRef = 923E89CA20B6F04600F299B2 /* g_crypt_tinyaes.c */; };
 		923E89D020B6F2D300F299B2 /* filter_props.c in Sources */ = {isa = PBXBuildFile; fileRef = 92F8D4721F71642E00616F7C /* filter_props.c */; };
 		923EB53223D1B78D00E1FFA1 /* libbf.c in Sources */ = {isa = PBXBuildFile; fileRef = 923EB53123D1B78D00E1FFA1 /* libbf.c */; };
+		92455F8C2A52B4B90080321C /* dec_cc.c in Sources */ = {isa = PBXBuildFile; fileRef = 92455F8B2A52B4B90080321C /* dec_cc.c */; };
 		9246EE7524A0DA2700F72EAD /* filter_session_js.c in Sources */ = {isa = PBXBuildFile; fileRef = 9246EE7424A0DA2700F72EAD /* filter_session_js.c */; };
 		92493D8020E2A64000203C2C /* crypt_tools.c in Sources */ = {isa = PBXBuildFile; fileRef = 92493D7F20E2A64000203C2C /* crypt_tools.c */; };
 		92493D8220E2A81700203C2C /* crypt_tools.h in Headers */ = {isa = PBXBuildFile; fileRef = 92493D8120E2A81700203C2C /* crypt_tools.h */; };
@@ -496,6 +505,7 @@
 		92C0F37E21EC7BB0002961C8 /* out_rtp.c in Sources */ = {isa = PBXBuildFile; fileRef = 92C0F37D21EC7BB0002961C8 /* out_rtp.c */; };
 		92C236DD25769BA500CD59A9 /* tilesplit.c in Sources */ = {isa = PBXBuildFile; fileRef = 92C236DC25769BA500CD59A9 /* tilesplit.c */; };
 		92C23723257841A100CD59A9 /* CoreAudio.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 28C5AA6C1A15FE4A00372C59 /* CoreAudio.framework */; };
+		92C3486529E5B31700C63E8A /* dmx_ghi.c in Sources */ = {isa = PBXBuildFile; fileRef = 92C3486429E5B31700C63E8A /* dmx_ghi.c */; };
 		92C403DD2181F17E00331F39 /* dec_openhevc.c in Sources */ = {isa = PBXBuildFile; fileRef = 92C403DC2181F17E00331F39 /* dec_openhevc.c */; };
 		92C403EA2181F57600331F39 /* libgpac.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 9201F93718D5A38A003D1ACA /* libgpac.dylib */; };
 		92C69C5C281315B400051866 /* carbon_hook.c in Sources */ = {isa = PBXBuildFile; fileRef = 92C69C5B281315B400051866 /* carbon_hook.c */; };
@@ -548,11 +558,18 @@
 			isEditable = 1;
 			outputFiles = (
 			);
-			script = "";
+			script = "# Type a script or drag a script file from your workspace to insert its path.\n";
 		};
 /* End PBXBuildRule section */
 
 /* Begin PBXContainerItemProxy section */
+		922B0FC92A6029AD003690BB /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 9201F92918D5A359003D1ACA /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 922B0FC02A602153003690BB;
+			remoteInfo = caca_out;
+		};
 		92BD5562205AB89D007C4C06 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 9201F92918D5A359003D1ACA /* Project object */;
@@ -786,11 +803,19 @@
 		9206822B20EA41530041169F /* in_pipe.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = in_pipe.c; path = filters/in_pipe.c; sourceTree = "<group>"; };
 		9206822D20EA69680041169F /* out_pipe.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = out_pipe.c; path = filters/out_pipe.c; sourceTree = "<group>"; };
 		9206823320EA96AA0041169F /* mux_gsf.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = mux_gsf.c; path = filters/mux_gsf.c; sourceTree = "<group>"; };
+		920D52AE29CAF7CE00105401 /* dec_uncv.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = dec_uncv.c; path = filters/dec_uncv.c; sourceTree = "<group>"; };
+		920F4C9A29950A9D00EC9D21 /* dec_webcodec.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = dec_webcodec.c; path = filters/dec_webcodec.c; sourceTree = "<group>"; };
+		920F4C9C299D20CE00EC9D21 /* enc_webcodec.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = enc_webcodec.c; path = filters/enc_webcodec.c; sourceTree = "<group>"; };
+		920F4C9E299FB3CC00EC9D21 /* avin_web.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = avin_web.c; path = filters/avin_web.c; sourceTree = "<group>"; };
 		9210D006237041C2007AFB48 /* ftgrays.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ftgrays.c; path = evg/ftgrays.c; sourceTree = "<group>"; };
+		9210D8212A0E64B00047019A /* evg_rescale.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = evg_rescale.c; path = filters/evg_rescale.c; sourceTree = "<group>"; };
 		9212C0FA222D7AC000FE3580 /* vflip.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = vflip.c; path = filters/vflip.c; sourceTree = "<group>"; };
 		92256CCC20E0DA26004EB243 /* encrypt_cenc_isma.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = encrypt_cenc_isma.c; path = filters/encrypt_cenc_isma.c; sourceTree = "<group>"; };
 		9225DD742326790C00F94C42 /* mpd.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = mpd.h; path = ../include/gpac/mpd.h; sourceTree = "<group>"; };
 		92261A86239A6E4600C14199 /* out_http.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = out_http.c; path = filters/out_http.c; sourceTree = "<group>"; };
+		922B0FA92A5E81EB003690BB /* dec_mpeghdec.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = dec_mpeghdec.c; path = filters/dec_mpeghdec.c; sourceTree = "<group>"; };
+		922B0FC12A602153003690BB /* gm_caca_out.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = gm_caca_out.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
+		922B0FC62A602176003690BB /* caca_out.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = caca_out.c; path = ../../modules/caca_out/caca_out.c; sourceTree = "<group>"; };
 		922B27712445D5CE001D4F72 /* dec_ttml.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = dec_ttml.c; path = filters/dec_ttml.c; sourceTree = "<group>"; };
 		922B48781A5ADAB3006CBBBA /* os_module.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = os_module.c; sourceTree = "<group>"; };
 		922CF1241FCEE5D600F2F6A4 /* dmx_mpegps.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = dmx_mpegps.c; path = filters/dmx_mpegps.c; sourceTree = "<group>"; };
@@ -823,6 +848,7 @@
 		923E89C920B6F04600F299B2 /* tiny_aes.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = tiny_aes.c; path = crypto/tiny_aes.c; sourceTree = "<group>"; };
 		923E89CA20B6F04600F299B2 /* g_crypt_tinyaes.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = g_crypt_tinyaes.c; path = crypto/g_crypt_tinyaes.c; sourceTree = "<group>"; };
 		923EB53123D1B78D00E1FFA1 /* libbf.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = libbf.c; path = quickjs/libbf.c; sourceTree = "<group>"; };
+		92455F8B2A52B4B90080321C /* dec_cc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = dec_cc.c; path = filters/dec_cc.c; sourceTree = "<group>"; };
 		9246EE7424A0DA2700F72EAD /* filter_session_js.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = filter_session_js.c; path = filter_core/filter_session_js.c; sourceTree = "<group>"; };
 		92493D7F20E2A64000203C2C /* crypt_tools.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = crypt_tools.c; sourceTree = "<group>"; };
 		92493D8120E2A81700203C2C /* crypt_tools.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = crypt_tools.h; path = ../include/gpac/crypt_tools.h; sourceTree = "<group>"; };
@@ -1118,6 +1144,7 @@
 		92BE509018D6325E00AA59D8 /* MP4Box */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = MP4Box; sourceTree = BUILT_PRODUCTS_DIR; };
 		92C0F37D21EC7BB0002961C8 /* out_rtp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = out_rtp.c; path = filters/out_rtp.c; sourceTree = "<group>"; };
 		92C236DC25769BA500CD59A9 /* tilesplit.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = tilesplit.c; path = filters/tilesplit.c; sourceTree = "<group>"; };
+		92C3486429E5B31700C63E8A /* dmx_ghi.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = dmx_ghi.c; path = filters/dmx_ghi.c; sourceTree = "<group>"; };
 		92C403D72181F10500331F39 /* gf_openhevc_dec.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = gf_openhevc_dec.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
 		92C403DC2181F17E00331F39 /* dec_openhevc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = dec_openhevc.c; path = ../../src/filters/dec_openhevc.c; sourceTree = "<group>"; };
 		92C69C5B281315B400051866 /* carbon_hook.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = carbon_hook.c; path = ../../applications/gpac/carbon_hook.c; sourceTree = "<group>"; };
@@ -1183,6 +1210,14 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
+		922B0FBF2A602153003690BB /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				922B0FC82A6028C5003690BB /* libgpac.dylib in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 		927AACFA1E44EEDC008C8E69 /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
@@ -1403,6 +1438,7 @@
 				92AAF16518D6F40400E2FF12 /* gm_ft_font.dylib */,
 				927AACFD1E44EEDC008C8E69 /* gpac */,
 				92C403D72181F10500331F39 /* gf_openhevc_dec.dylib */,
+				922B0FC12A602153003690BB /* gm_caca_out.dylib */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -1599,6 +1635,14 @@
 			path = isomedia;
 			sourceTree = "<group>";
 		};
+		922B0FC52A60215F003690BB /* caca_out */ = {
+			isa = PBXGroup;
+			children = (
+				922B0FC62A602176003690BB /* caca_out.c */,
+			);
+			name = caca_out;
+			sourceTree = "<group>";
+		};
 		92334C8E2333A8B800DA6051 /* quickjs */ = {
 			isa = PBXGroup;
 			children = (
@@ -1866,6 +1910,7 @@
 		92BE50AD18D6376A00AA59D8 /* modules */ = {
 			isa = PBXGroup;
 			children = (
+				922B0FC52A60215F003690BB /* caca_out */,
 				92C403DB2181F15A00331F39 /* dec_openhevc */,
 				92586A6E1EA7663A00A0838A /* ft_font */,
 				92AAF0D718D6DB3400E2FF12 /* sdl_out */,
@@ -1951,6 +1996,7 @@
 		92F8D47E1F71643600616F7C /* filters */ = {
 			isa = PBXGroup;
 			children = (
+				920F4C9E299FB3CC00EC9D21 /* avin_web.c */,
 				925E564B2798B87300BBD530 /* bs_agg.c */,
 				926D48FC27957D8400E3C68C /* bs_split.c */,
 				9274295724647AB8009ADD8D /* bsrw.c */,
@@ -1958,25 +2004,30 @@
 				92FE596C2088E52900CF0C5A /* dasher.c */,
 				92BB85821F7C5773009BC9C8 /* dec_ac52.c */,
 				92BB85521F7BFB60009BC9C8 /* dec_bifs.c */,
+				92455F8B2A52B4B90080321C /* dec_cc.c */,
 				92BB85551F7BFB60009BC9C8 /* dec_faad.c */,
 				92BB85571F7BFB60009BC9C8 /* dec_img.c */,
 				92BB857E1F7C30AE009BC9C8 /* dec_j2k.c */,
 				92B9A5BC1F868CFF00A24FE4 /* dec_laser.c */,
 				92BB855D1F7BFB61009BC9C8 /* dec_mad.c */,
 				92BA0AD3243B68AF006FC74E /* dec_mediacodec.c */,
+				922B0FA92A5E81EB003690BB /* dec_mpeghdec.c */,
 				92BB85511F7BFB60009BC9C8 /* dec_odf.c */,
 				92B9A5C01F86ACDF00A24FE4 /* dec_opensvc.c */,
 				926656C31F7D3DF700299CC6 /* dec_theora.c */,
 				922B27712445D5CE001D4F72 /* dec_ttml.c */,
 				9234CF381FD6A6E400CCDFA1 /* dec_ttxt.c */,
+				920D52AE29CAF7CE00105401 /* dec_uncv.c */,
 				926656C11F7D10F400299CC6 /* dec_vorbis.c */,
 				92B9A5081F840A6700A24FE4 /* dec_vtb.c */,
+				920F4C9A29950A9D00EC9D21 /* dec_webcodec.c */,
 				9234CF3E1FD8311400CCDFA1 /* dec_webvtt.c */,
 				92BB857C1F7BFD7F009BC9C8 /* dec_xvid.c */,
 				925CE3441FA2E641004EC6F5 /* decrypt_cenc_isma.c */,
 				92BA0AD9243B6E2B006FC74E /* dektec_video_decl.c */,
 				922CF1261FCF169900F2F6A4 /* dmx_avi.c */,
 				92BB9A661F9C827600524E5B /* dmx_dash.c */,
+				92C3486429E5B31700C63E8A /* dmx_ghi.c */,
 				9203644A20ECF67C0087883E /* dmx_gsf.c */,
 				926656C51F7D45F700299CC6 /* dmx_ogg.c */,
 				926656C71F7E92C200299CC6 /* dmx_m2ts.c */,
@@ -1987,7 +2038,9 @@
 				926998B31FEACE8F00AA759D /* dmx_vobsub.c */,
 				9239B8D5207369E5005F7264 /* enc_jpg.c */,
 				9239B8D72073AFEF005F7264 /* enc_png.c */,
+				920F4C9C299D20CE00EC9D21 /* enc_webcodec.c */,
 				92256CCC20E0DA26004EB243 /* encrypt_cenc_isma.c */,
+				9210D8212A0E64B00047019A /* evg_rescale.c */,
 				92B7DC102549A1310086EC57 /* ffmpeg */,
 				92754D5F207D24F600170383 /* filelist.c */,
 				92B2A4A8229D64EF002A65A7 /* hevcmerge.c */,
@@ -2212,6 +2265,13 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
+		922B0FBD2A602153003690BB /* Headers */ = {
+			isa = PBXHeadersBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 		92AAF0D118D6DB2D00E2FF12 /* Headers */ = {
 			isa = PBXHeadersBuildPhase;
 			buildActionMask = 2147483647;
@@ -2256,6 +2316,23 @@
 			productReference = 9201F93718D5A38A003D1ACA /* libgpac.dylib */;
 			productType = "com.apple.product-type.library.dynamic";
 		};
+		922B0FC02A602153003690BB /* caca_out */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 922B0FC22A602154003690BB /* Build configuration list for PBXNativeTarget "caca_out" */;
+			buildPhases = (
+				922B0FBD2A602153003690BB /* Headers */,
+				922B0FBE2A602153003690BB /* Sources */,
+				922B0FBF2A602153003690BB /* Frameworks */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = caca_out;
+			productName = caca_out;
+			productReference = 922B0FC12A602153003690BB /* gm_caca_out.dylib */;
+			productType = "com.apple.product-type.library.dynamic";
+		};
 		927AACFC1E44EEDC008C8E69 /* gpac */ = {
 			isa = PBXNativeTarget;
 			buildConfigurationList = 927AAD011E44EEDC008C8E69 /* Build configuration list for PBXNativeTarget "gpac" */;
@@ -2269,6 +2346,7 @@
 			dependencies = (
 				92C403DF2181F1ED00331F39 /* PBXTargetDependency */,
 				92BD5563205AB89D007C4C06 /* PBXTargetDependency */,
+				922B0FCA2A6029AD003690BB /* PBXTargetDependency */,
 			);
 			name = gpac;
 			productName = gpac;
@@ -2354,6 +2432,10 @@
 				LastUpgradeCheck = 1210;
 				ORGANIZATIONNAME = "Telecom ParisTech";
 				TargetAttributes = {
+					922B0FC02A602153003690BB = {
+						CreatedOnToolsVersion = 14.3.1;
+						ProvisioningStyle = Automatic;
+					};
 					927AACFC1E44EEDC008C8E69 = {
 						CreatedOnToolsVersion = 8.2.1;
 						DevelopmentTeam = Q46G522WGV;
@@ -2384,6 +2466,7 @@
 				92AAF16418D6F40400E2FF12 /* ft_font */,
 				927AACFC1E44EEDC008C8E69 /* gpac */,
 				92C403D62181F10500331F39 /* openhevc_dec */,
+				922B0FC02A602153003690BB /* caca_out */,
 			);
 		};
 /* End PBXProject section */
@@ -2415,6 +2498,7 @@
 				92B9A5981F8660D700A24FE4 /* media_object.c in Sources */,
 				92F930821A5ADB870072A85C /* os_divers.c in Sources */,
 				92F930831A5ADB870072A85C /* os_file.c in Sources */,
+				920F4C9B29950A9D00EC9D21 /* dec_webcodec.c in Sources */,
 				92B9A5A61F8660D700A24FE4 /* mpeg4_grouping.c in Sources */,
 				925730822056A610009DB328 /* rewrite_mp4v.c in Sources */,
 				9212C0FB222D7AC000FE3580 /* vflip.c in Sources */,
@@ -2446,6 +2530,7 @@
 				920100B618D5A444003D1ACA /* field_decode.c in Sources */,
 				92BB85721F7BFB63009BC9C8 /* ff_common.c in Sources */,
 				920100B718D5A444003D1ACA /* field_encode.c in Sources */,
+				92455F8C2A52B4B90080321C /* dec_cc.c in Sources */,
 				9234CF471FD8344000CCDFA1 /* in_rtp.c in Sources */,
 				92B9A5911F8660D700A24FE4 /* mpeg4_geometry_2d.c in Sources */,
 				92F8D47D1F71642E00616F7C /* filter.c in Sources */,
@@ -2505,6 +2590,7 @@
 				9201011118D5A444003D1ACA /* rtsp_response.c in Sources */,
 				9201011218D5A444003D1ACA /* rtsp_session.c in Sources */,
 				92B2A4AB229D64EF002A65A7 /* hevcsplit.c in Sources */,
+				922B0FAA2A5E81EB003690BB /* dec_mpeghdec.c in Sources */,
 				92B9A5711F8660D700A24FE4 /* drawable.c in Sources */,
 				9201011318D5A444003D1ACA /* sdp.c in Sources */,
 				925975032215BA3A0007E02B /* surface.c in Sources */,
@@ -2522,6 +2608,7 @@
 				9201011918D5A444003D1ACA /* box_code_drm.c in Sources */,
 				92C236DD25769BA500CD59A9 /* tilesplit.c in Sources */,
 				9201011A18D5A444003D1ACA /* box_code_meta.c in Sources */,
+				920F4C9D299D20CE00EC9D21 /* enc_webcodec.c in Sources */,
 				9201011B18D5A444003D1ACA /* box_dump.c in Sources */,
 				9201011C18D5A444003D1ACA /* box_funcs.c in Sources */,
 				9201011D18D5A444003D1ACA /* data_map.c in Sources */,
@@ -2581,6 +2668,7 @@
 				92B9A57C1F8660D700A24FE4 /* svg_filters.c in Sources */,
 				92B9A5A01F8660D700A24FE4 /* mpeg4_sensors.c in Sources */,
 				9201014518D5A445003D1ACA /* dash_client.c in Sources */,
+				920F4C9F299FB3CC00EC9D21 /* avin_web.c in Sources */,
 				928E0BDA28E328A100F2BA27 /* ff_bsf.c in Sources */,
 				925975052215BA3A0007E02B /* raster_yuv.c in Sources */,
 				92E318D120651834007BE021 /* vcrop.c in Sources */,
@@ -2610,6 +2698,7 @@
 				9234CF481FD8344000CCDFA1 /* in_rtp_sdp.c in Sources */,
 				9201015518D5A445003D1ACA /* mpd.c in Sources */,
 				92B9A58F1F8660D700A24FE4 /* mpeg4_bitmap.c in Sources */,
+				9210D8222A0E64B00047019A /* evg_rescale.c in Sources */,
 				9201015618D5A445003D1ACA /* mpeg2_ps.c in Sources */,
 				9201015818D5A445003D1ACA /* mpegts.c in Sources */,
 				92B9A5AD1F8660D700A24FE4 /* clock.c in Sources */,
@@ -2638,6 +2727,7 @@
 				92B9A5B31F8660D700A24FE4 /* mesh_collide.c in Sources */,
 				9290F5111FAB4C2C0038C30D /* mux_isom.c in Sources */,
 				92BB85731F7BFB63009BC9C8 /* dec_mad.c in Sources */,
+				92C3486529E5B31700C63E8A /* dmx_ghi.c in Sources */,
 				9201016318D5A445003D1ACA /* oci_codec.c in Sources */,
 				9201016418D5A445003D1ACA /* odf_code.c in Sources */,
 				9201016518D5A445003D1ACA /* odf_codec.c in Sources */,
@@ -2727,6 +2817,7 @@
 				92B9A5BD1F868D0000A24FE4 /* dec_laser.c in Sources */,
 				9203644F20EE12480087883E /* out_sock.c in Sources */,
 				9201018A18D5A445003D1ACA /* vrml_route.c in Sources */,
+				920D52AF29CAF7CE00105401 /* dec_uncv.c in Sources */,
 				9201018B18D5A445003D1ACA /* vrml_script.c in Sources */,
 				9201018D18D5A445003D1ACA /* vrml_tools.c in Sources */,
 				92BB856C1F7BFB63009BC9C8 /* reframe_adts.c in Sources */,
@@ -2801,6 +2892,14 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
+		922B0FBE2A602153003690BB /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				922B0FC72A602176003690BB /* caca_out.c in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 		927AACF91E44EEDC008C8E69 /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
@@ -2852,6 +2951,11 @@
 /* End PBXSourcesBuildPhase section */
 
 /* Begin PBXTargetDependency section */
+		922B0FCA2A6029AD003690BB /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 922B0FC02A602153003690BB /* caca_out */;
+			targetProxy = 922B0FC92A6029AD003690BB /* PBXContainerItemProxy */;
+		};
 		92BD5563205AB89D007C4C06 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			target = 92AAF0D218D6DB2D00E2FF12 /* sdl_out */;
@@ -3091,7 +3195,29 @@
 					"-framework",
 					Metal,
 					"-lovvc",
+					"-lsrt",
 					"-lvvdec",
+					"-lcaption",
+					"-lSYS",
+					"-lFDK",
+					"-lDRCdec",
+					"-lPCMutils",
+					"-lMpeghDec",
+					"-lIGFdec",
+					"-lArithCoding",
+					"-lFormatConverter",
+					"-lUIManager",
+					"-lgVBAPRenderer",
+					"-lMpegTPDec",
+					"-lxcb",
+					"-lxcb-shm",
+					"-lxcb-shape",
+					"-lxcb-xfixes",
+					"-lXv",
+					"-lX11",
+					"-lXext",
+					"-lvvenc",
+					"-lcaca",
 				);
 				PRODUCT_NAME = gpac;
 				SDKROOT = macosx;
@@ -3221,7 +3347,29 @@
 					"-framework",
 					Metal,
 					"-lovvc",
+					"-lsrt",
 					"-lvvdec",
+					"-lcaption",
+					"-lSYS",
+					"-lFDK",
+					"-lDRCdec",
+					"-lPCMutils",
+					"-lMpeghDec",
+					"-lIGFdec",
+					"-lArithCoding",
+					"-lFormatConverter",
+					"-lUIManager",
+					"-lgVBAPRenderer",
+					"-lMpegTPDec",
+					"-lxcb",
+					"-lxcb-shm",
+					"-lxcb-shape",
+					"-lxcb-xfixes",
+					"-lXv",
+					"-lX11",
+					"-lXext",
+					"-lvvenc",
+					"-lcaca",
 				);
 				PRODUCT_NAME = gpac;
 				SDKROOT = macosx;
@@ -3230,6 +3378,110 @@
 			};
 			name = Release;
 		};
+		922B0FC32A602154003690BB /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+				CLANG_CXX_LANGUAGE_STANDARD = "compiler-default";
+				CLANG_ENABLE_MODULES = NO;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_ENABLE_OBJC_WEAK = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_STRICT_PROTOTYPES = NO;
+				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+				CODE_SIGN_IDENTITY = "-";
+				CODE_SIGN_STYLE = Automatic;
+				COPY_PHASE_STRIP = NO;
+				DEBUG_INFORMATION_FORMAT = dwarf;
+				DEVELOPMENT_TEAM = "";
+				DYLIB_COMPATIBILITY_VERSION = 1;
+				DYLIB_CURRENT_VERSION = 1;
+				DYLIB_INSTALL_NAME_BASE = "";
+				EXECUTABLE_PREFIX = gm_;
+				GCC_C_LANGUAGE_STANDARD = gnu11;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"DEBUG=1",
+					"$(inherited)",
+				);
+				GCC_WARN_ABOUT_MISSING_PROTOTYPES = NO;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				HEADER_SEARCH_PATHS = (
+					../../include,
+					../../extra_lib/include,
+					/opt/local/include,
+				);
+				INSTALL_PATH = "";
+				LIBRARY_SEARCH_PATHS = (
+					../../extra_lib/lib/gcc,
+					/opt/local/lib,
+				);
+				MACOSX_DEPLOYMENT_TARGET = 10.9;
+				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
+				MTL_FAST_MATH = YES;
+				OTHER_LDFLAGS = " -lcaca ";
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SDKROOT = macosx;
+				SKIP_INSTALL = YES;
+			};
+			name = Debug;
+		};
+		922B0FC42A602154003690BB /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+				CLANG_CXX_LANGUAGE_STANDARD = "compiler-default";
+				CLANG_ENABLE_MODULES = NO;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_ENABLE_OBJC_WEAK = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_STRICT_PROTOTYPES = NO;
+				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+				CODE_SIGN_IDENTITY = "-";
+				CODE_SIGN_STYLE = Automatic;
+				COPY_PHASE_STRIP = NO;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				DEVELOPMENT_TEAM = "";
+				DYLIB_COMPATIBILITY_VERSION = 1;
+				DYLIB_CURRENT_VERSION = 1;
+				DYLIB_INSTALL_NAME_BASE = "";
+				ENABLE_NS_ASSERTIONS = NO;
+				EXECUTABLE_PREFIX = gm_;
+				GCC_C_LANGUAGE_STANDARD = gnu11;
+				GCC_WARN_ABOUT_MISSING_PROTOTYPES = NO;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				HEADER_SEARCH_PATHS = (
+					../../include,
+					../../extra_lib/include,
+					/opt/local/include,
+				);
+				INSTALL_PATH = "";
+				LIBRARY_SEARCH_PATHS = (
+					../../extra_lib/lib/gcc,
+					/opt/local/lib,
+				);
+				MACOSX_DEPLOYMENT_TARGET = 10.9;
+				MTL_ENABLE_DEBUG_INFO = NO;
+				MTL_FAST_MATH = YES;
+				ONLY_ACTIVE_ARCH = YES;
+				OTHER_LDFLAGS = " -lcaca ";
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SDKROOT = macosx;
+				SKIP_INSTALL = YES;
+			};
+			name = Release;
+		};
 		927AAD021E44EEDC008C8E69 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
@@ -3667,6 +3919,15 @@
 			);
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
+		};
+		922B0FC22A602154003690BB /* Build configuration list for PBXNativeTarget "caca_out" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				922B0FC32A602154003690BB /* Debug */,
+				922B0FC42A602154003690BB /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
 		};
 		927AAD011E44EEDC008C8E69 /* Build configuration list for PBXNativeTarget "gpac" */ = {
 			isa = XCConfigurationList;

gpac-2.2.1.tar.gz/build/xcode/gpac4ios.xcodeproj/project.pbxproj -> gpac-2.4.0.tar.gz/build/xcode/gpac4ios.xcodeproj/project.pbxproj Changed

@@ -319,14 +319,18 @@
 		8959AC8F211C9C77004D2C87 /* Remotery.c in Sources */ = {isa = PBXBuildFile; fileRef = 8959AC8E211C9C77004D2C87 /* Remotery.c */; };
 		896CBC872110598E00220377 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 896CBC862110598E00220377 /* Security.framework */; };
 		896CBC8921105A6900220377 /* libaom.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 896CBC8821105A6900220377 /* libaom.a */; };
+		89F956CB2A6595470049D6D3 /* libmpegh.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 89F956CA2A6595470049D6D3 /* libmpegh.a */; };
 		9210BA1D234A909400ED2DFF /* evg.c in Sources */ = {isa = PBXBuildFile; fileRef = 9210BA1C234A909400ED2DFF /* evg.c */; };
+		9210D8242A0E82CB0047019A /* evg_rescale.c in Sources */ = {isa = PBXBuildFile; fileRef = 9210D8232A0E82CB0047019A /* evg_rescale.c */; };
 		9212C0FD222D7B3700FE3580 /* vflip.c in Sources */ = {isa = PBXBuildFile; fileRef = 9212C0FC222D7B3700FE3580 /* vflip.c */; };
 		9212C69F281847660058F76A /* gpac.icns in Resources */ = {isa = PBXBuildFile; fileRef = 9212C69E281847660058F76A /* gpac.icns */; };
+		921E055D29CDDF1800ED745E /* dec_uncv.c in Sources */ = {isa = PBXBuildFile; fileRef = 921E055C29CDDF1800ED745E /* dec_uncv.c */; };
 		921FEBA01CF8670A00B437C2 /* CoreLocation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 921FEB9E1CF8665900B437C2 /* CoreLocation.framework */; };
 		921FEBA11CF8671300B437C2 /* CoreMotion.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 921FEB9C1CF8664800B437C2 /* CoreMotion.framework */; };
 		92261A89239E326900C14199 /* out_http.c in Sources */ = {isa = PBXBuildFile; fileRef = 92261A88239E326900C14199 /* out_http.c */; };
 		9227B8582799F8E700BF3D1B /* bs_agg.c in Sources */ = {isa = PBXBuildFile; fileRef = 9227B8562799F8E600BF3D1B /* bs_agg.c */; };
 		9227B8592799F8E700BF3D1B /* bs_split.c in Sources */ = {isa = PBXBuildFile; fileRef = 9227B8572799F8E600BF3D1B /* bs_split.c */; };
+		922B0FAC2A5EBCF2003690BB /* dec_mpeghdec.c in Sources */ = {isa = PBXBuildFile; fileRef = 922B0FAB2A5EBCF2003690BB /* dec_mpeghdec.c */; };
 		922B2774244625B0001D4F72 /* dec_ttml.c in Sources */ = {isa = PBXBuildFile; fileRef = 922B2773244625B0001D4F72 /* dec_ttml.c */; };
 		922EB5801AAE13C500DF46D0 /* dash.h in Headers */ = {isa = PBXBuildFile; fileRef = 922EB5781AAE13C500DF46D0 /* dash.h */; };
 		922EB5811AAE13C500DF46D0 /* html5_media.h in Headers */ = {isa = PBXBuildFile; fileRef = 922EB5791AAE13C500DF46D0 /* html5_media.h */; };
@@ -349,6 +353,8 @@
 		92359C88250F652700525A42 /* route_dmx.c in Sources */ = {isa = PBXBuildFile; fileRef = 92359C87250F652700525A42 /* route_dmx.c */; };
 		92359C8A250F657B00525A42 /* in_route.c in Sources */ = {isa = PBXBuildFile; fileRef = 92359C89250F657A00525A42 /* in_route.c */; };
 		923EB53423D1B87E00E1FFA1 /* libbf.c in Sources */ = {isa = PBXBuildFile; fileRef = 923EB53323D1B87E00E1FFA1 /* libbf.c */; };
+		92455F8E2A530F560080321C /* dec_cc.c in Sources */ = {isa = PBXBuildFile; fileRef = 92455F8D2A530F560080321C /* dec_cc.c */; };
+		92455FDB2A540A640080321C /* libcaption.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 92455FDA2A540A640080321C /* libcaption.a */; };
 		9246EE7724A1240600F72EAD /* filter_session_js.c in Sources */ = {isa = PBXBuildFile; fileRef = 9246EE7624A1240600F72EAD /* filter_session_js.c */; };
 		924AB67F281438E100EC006F /* default.cfg in Resources */ = {isa = PBXBuildFile; fileRef = 924AB67E281438E000EC006F /* default.cfg */; };
 		924AB68128143DF500EC006F /* ios_main.m in Sources */ = {isa = PBXBuildFile; fileRef = 924AB68028143DF500EC006F /* ios_main.m */; };
@@ -409,6 +415,7 @@
 		92BC213716EF8E7A000E0620 /* video.c in Sources */ = {isa = PBXBuildFile; fileRef = 71A1999E1278778800ACFF58 /* video.c */; };
 		92C0F38021EDFA8E002961C8 /* out_rtp.c in Sources */ = {isa = PBXBuildFile; fileRef = 92C0F37F21EDFA8D002961C8 /* out_rtp.c */; };
 		92C236E82576DC4E00CD59A9 /* tilesplit.c in Sources */ = {isa = PBXBuildFile; fileRef = 92C236E72576DC4E00CD59A9 /* tilesplit.c */; };
+		92C3486729E69CBF00C63E8A /* dmx_ghi.c in Sources */ = {isa = PBXBuildFile; fileRef = 92C3486629E69CBF00C63E8A /* dmx_ghi.c */; };
 		92C69C62281323B800051866 /* compositor_tools.c in Sources */ = {isa = PBXBuildFile; fileRef = 92C69C5F281323B800051866 /* compositor_tools.c */; };
 		92C69C63281323B800051866 /* gpac_help.c in Sources */ = {isa = PBXBuildFile; fileRef = 92C69C60281323B800051866 /* gpac_help.c */; };
 		92C69C65281323D700051866 /* ios-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 92C69C64281323D700051866 /* ios-Info.plist */; };
@@ -922,14 +929,18 @@
 		8959AC8E211C9C77004D2C87 /* Remotery.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = Remotery.c; sourceTree = "<group>"; };
 		896CBC862110598E00220377 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; };
 		896CBC8821105A6900220377 /* libaom.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libaom.a; path = ../../extra_lib/lib/iOS/libaom.a; sourceTree = "<group>"; };
+		89F956CA2A6595470049D6D3 /* libmpegh.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libmpegh.a; path = ../../extra_lib/lib/iOS/libmpegh.a; sourceTree = "<group>"; };
 		9210BA1C234A909400ED2DFF /* evg.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = evg.c; path = ../../src/jsmods/evg.c; sourceTree = "<group>"; };
+		9210D8232A0E82CB0047019A /* evg_rescale.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = evg_rescale.c; path = ../../src/filters/evg_rescale.c; sourceTree = "<group>"; };
 		9212C0FC222D7B3700FE3580 /* vflip.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = vflip.c; path = ../../src/filters/vflip.c; sourceTree = "<group>"; };
 		9212C69E281847660058F76A /* gpac.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = gpac.icns; path = ../../applications/gpac/ios_res/gpac.icns; sourceTree = "<group>"; };
+		921E055C29CDDF1800ED745E /* dec_uncv.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = dec_uncv.c; path = ../../src/filters/dec_uncv.c; sourceTree = "<group>"; };
 		921FEB9C1CF8664800B437C2 /* CoreMotion.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMotion.framework; path = System/Library/Frameworks/CoreMotion.framework; sourceTree = SDKROOT; };
 		921FEB9E1CF8665900B437C2 /* CoreLocation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreLocation.framework; path = System/Library/Frameworks/CoreLocation.framework; sourceTree = SDKROOT; };
 		92261A88239E326900C14199 /* out_http.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = out_http.c; path = ../../src/filters/out_http.c; sourceTree = "<group>"; };
 		9227B8562799F8E600BF3D1B /* bs_agg.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = bs_agg.c; path = ../../src/filters/bs_agg.c; sourceTree = "<group>"; };
 		9227B8572799F8E600BF3D1B /* bs_split.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = bs_split.c; path = ../../src/filters/bs_split.c; sourceTree = "<group>"; };
+		922B0FAB2A5EBCF2003690BB /* dec_mpeghdec.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = dec_mpeghdec.c; path = ../../src/filters/dec_mpeghdec.c; sourceTree = "<group>"; };
 		922B2773244625B0001D4F72 /* dec_ttml.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = dec_ttml.c; path = ../../src/filters/dec_ttml.c; sourceTree = "<group>"; };
 		922EB5781AAE13C500DF46D0 /* dash.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = dash.h; sourceTree = "<group>"; };
 		922EB5791AAE13C500DF46D0 /* html5_media.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = html5_media.h; sourceTree = "<group>"; };
@@ -952,6 +963,8 @@
 		92359C87250F652700525A42 /* route_dmx.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = route_dmx.c; sourceTree = "<group>"; };
 		92359C89250F657A00525A42 /* in_route.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = in_route.c; path = ../../src/filters/in_route.c; sourceTree = "<group>"; };
 		923EB53323D1B87E00E1FFA1 /* libbf.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = libbf.c; path = ../../src/quickjs/libbf.c; sourceTree = "<group>"; };
+		92455F8D2A530F560080321C /* dec_cc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = dec_cc.c; path = ../../src/filters/dec_cc.c; sourceTree = "<group>"; };
+		92455FDA2A540A640080321C /* libcaption.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libcaption.a; path = ../../extra_lib/lib/iOS/libcaption.a; sourceTree = "<group>"; };
 		9246EE7624A1240600F72EAD /* filter_session_js.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = filter_session_js.c; path = ../../src/filter_core/filter_session_js.c; sourceTree = "<group>"; };
 		924AB67E281438E000EC006F /* default.cfg */ = {isa = PBXFileReference; lastKnownFileType = text; name = default.cfg; path = ../../share/default.cfg; sourceTree = "<group>"; };
 		924AB68028143DF500EC006F /* ios_main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ios_main.m; path = ../../applications/gpac/ios_main.m; sourceTree = "<group>"; };
@@ -1005,6 +1018,7 @@
 		92B2A4AD229D6646002A65A7 /* hevcsplit.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = hevcsplit.c; path = ../../src/filters/hevcsplit.c; sourceTree = "<group>"; };
 		92C0F37F21EDFA8D002961C8 /* out_rtp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = out_rtp.c; path = ../../src/filters/out_rtp.c; sourceTree = "<group>"; };
 		92C236E72576DC4E00CD59A9 /* tilesplit.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = tilesplit.c; path = ../../src/filters/tilesplit.c; sourceTree = "<group>"; };
+		92C3486629E69CBF00C63E8A /* dmx_ghi.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = dmx_ghi.c; path = ../../src/filters/dmx_ghi.c; sourceTree = "<group>"; };
 		92C69C5E281323B800051866 /* gpac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = gpac.h; path = ../../applications/gpac/gpac.h; sourceTree = "<group>"; };
 		92C69C5F281323B800051866 /* compositor_tools.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = compositor_tools.c; path = ../../applications/gpac/compositor_tools.c; sourceTree = "<group>"; };
 		92C69C60281323B800051866 /* gpac_help.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = gpac_help.c; path = ../../applications/gpac/gpac_help.c; sourceTree = "<group>"; };
@@ -1181,6 +1195,8 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				89F956CB2A6595470049D6D3 /* libmpegh.a in Frameworks */,
+				92455FDB2A540A640080321C /* libcaption.a in Frameworks */,
 				924AB6852816F1E200EC006F /* GameController.framework in Frameworks */,
 				924AB6832816F1DA00EC006F /* Metal.framework in Frameworks */,
 				8925C0EE25DD6F8900AFB064 /* libnghttp2.a in Frameworks */,
@@ -1254,6 +1270,8 @@
 		7184780712785F7B00917298 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
+				89F956CA2A6595470049D6D3 /* libmpegh.a */,
+				92455FDA2A540A640080321C /* libcaption.a */,
 				924AB6862816F20300EC006F /* CoreHaptics.framework */,
 				924AB6842816F1E200EC006F /* GameController.framework */,
 				924AB6822816F1DA00EC006F /* Metal.framework */,
@@ -1915,26 +1933,28 @@
 		92EB6D5E20E4E16700A97A49 /* filters */ = {
 			isa = PBXGroup;
 			children = (
-				92AB30C027ADA66F00A5CCCB /* restamp.c */,
 				9227B8562799F8E600BF3D1B /* bs_agg.c */,
 				9227B8572799F8E600BF3D1B /* bs_split.c */,
-				92C236E72576DC4E00CD59A9 /* tilesplit.c */,
 				9274295924647B98009ADD8D /* bsrw.c */,
 				92EB6D8B20E4E19300A97A49 /* compose.c */,
 				92EB6D9420E4E19400A97A49 /* dasher.c */,
 				92EB6DB020E4E19600A97A49 /* dec_ac52.c */,
 				92EB6D7220E4E19200A97A49 /* dec_bifs.c */,
+				92455F8D2A530F560080321C /* dec_cc.c */,
 				92EB6DA020E4E19500A97A49 /* dec_faad.c */,
+				92C3486629E69CBF00C63E8A /* dmx_ghi.c */,
 				92EB6DA220E4E19500A97A49 /* dec_img.c */,
 				92EB6D7B20E4E19200A97A49 /* dec_j2k.c */,
 				92EB6D9520E4E19400A97A49 /* dec_laser.c */,
 				92EB6DA820E4E19600A97A49 /* dec_mad.c */,
+				922B0FAB2A5EBCF2003690BB /* dec_mpeghdec.c */,
 				92EB6DB220E4E19600A97A49 /* dec_odf.c */,
 				92EB6D7420E4E19200A97A49 /* dec_openhevc.c */,
 				92EB6DC020E4E19700A97A49 /* dec_opensvc.c */,
 				92EB6DB920E4E19600A97A49 /* dec_theora.c */,
 				922B2773244625B0001D4F72 /* dec_ttml.c */,
 				92EB6D7E20E4E19200A97A49 /* dec_ttxt.c */,
+				921E055C29CDDF1800ED745E /* dec_uncv.c */,
 				92EB6D9820E4E19400A97A49 /* dec_vorbis.c */,
 				92EB6D7F20E4E19300A97A49 /* dec_vtb_glctx.m */,
 				92EB6DC320E4E19700A97A49 /* dec_vtb.c */,
@@ -1954,6 +1974,7 @@
 				92EB6DBF20E4E19700A97A49 /* enc_jpg.c */,
 				92EB6D8F20E4E19400A97A49 /* enc_png.c */,
 				92EB6D8D20E4E19400A97A49 /* encrypt_cenc_isma.c */,
+				9210D8232A0E82CB0047019A /* evg_rescale.c */,
 				92EB6D7A20E4E19200A97A49 /* ff_common.c */,
 				92EB6DBD20E4E19700A97A49 /* ff_common.h */,
 				928607142398F4C800FDA1ED /* ff_avf.c */,
@@ -2021,6 +2042,7 @@
 				9288A4B325ADDCED006F7355 /* reframe_truehd.c */,
 				92EB6D9D20E4E19500A97A49 /* reframer.c */,
 				92EB6DB620E4E19600A97A49 /* resample_audio.c */,
+				92AB30C027ADA66F00A5CCCB /* restamp.c */,
 				92EB6D9320E4E19400A97A49 /* rewind.c */,
 				92EB6D8120E4E19300A97A49 /* rewrite_adts.c */,
 				928EB67425271B5800E47747 /* rewrite_mhas.c */,
@@ -2028,6 +2050,7 @@
 				92EB6DB420E4E19600A97A49 /* rewrite_nalu.c */,
 				8959AC83211C9C3C004D2C87 /* rewrite_obu.c */,
 				92EB6DB520E4E19600A97A49 /* tileagg.c */,
+				92C236E72576DC4E00CD59A9 /* tilesplit.c */,
 				928607102395C0DE00FDA1ED /* tssplit.c */,
 				929A29252801EBD700635DEB /* ttml_conv.c */,
 				92EB6DC620E4E19700A97A49 /* unit_test_filter.c */,
@@ -2483,6 +2506,7 @@
 				71CCF2AC1277045100339E12 /* box_code_base.c in Sources */,
 				71CCF2AD1277045100339E12 /* box_code_drm.c in Sources */,
 				71CCF2AE1277045100339E12 /* box_code_meta.c in Sources */,
+				922B0FAC2A5EBCF2003690BB /* dec_mpeghdec.c in Sources */,
 				71CCF2AF1277045100339E12 /* box_dump.c in Sources */,
 				71CCF2B01277045100339E12 /* box_funcs.c in Sources */,
 				71CCF2B11277045100339E12 /* data_map.c in Sources */,
@@ -2558,6 +2582,7 @@
 				92EB6DE420E4E19700A97A49 /* dmx_saf.c in Sources */,
 				71CCF2EB1277045100339E12 /* ipmpx_parse.c in Sources */,
 				92C236E82576DC4E00CD59A9 /* tilesplit.c in Sources */,
+				92C3486729E69CBF00C63E8A /* dmx_ghi.c in Sources */,
 				71CCF2EC1277045100339E12 /* oci_codec.c in Sources */,
 				71CCF2ED1277045100339E12 /* odf_code.c in Sources */,
 				71CCF2EE1277045100339E12 /* odf_codec.c in Sources */,
@@ -2587,6 +2612,7 @@
 				71CCF2FC1277045100339E12 /* scene_manager.c in Sources */,
 				71CCF2FD1277045100339E12 /* scene_stats.c in Sources */,
 				92EB6DD020E4E19700A97A49 /* reframe_rawvid.c in Sources */,
+				92455F8E2A530F560080321C /* dec_cc.c in Sources */,
 				71CCF2FE1277045100339E12 /* swf_bifs.c in Sources */,
 				71CCF2FF1277045100339E12 /* swf_parse.c in Sources */,
 				928607112395C0DE00FDA1ED /* tssplit.c in Sources */,
@@ -2608,6 +2634,7 @@
 				71CCF30B1277045100339E12 /* svg_properties.c in Sources */,
 				71CCF30D1277045100339E12 /* svg_types.c in Sources */,
 				71CCF30E1277045100339E12 /* vrml_interpolators.c in Sources */,
+				9210D8242A0E82CB0047019A /* evg_rescale.c in Sources */,
 				71CCF30F1277045100339E12 /* vrml_proto.c in Sources */,
 				71CCF3101277045100339E12 /* vrml_route.c in Sources */,
 				92EB6E3820E4E58E00A97A49 /* object_manager.c in Sources */,
@@ -2646,6 +2673,7 @@
 				92E9DFB32215CEA700628420 /* raster_argb.c in Sources */,
 				71CCF32B1277045100339E12 /* base_encoding.c in Sources */,
 				71CCF32C1277045100339E12 /* bitstream.c in Sources */,
+				921E055D29CDDF1800ED745E /* dec_uncv.c in Sources */,
 				928607152398F4C800FDA1ED /* ff_avf.c in Sources */,
 				71CCF32D1277045100339E12 /* color.c in Sources */,
 				92EB6E0120E4E19700A97A49 /* reframe_ac3.c in Sources */,
@@ -2726,6 +2754,7 @@
 				COPY_PHASE_STRIP = NO;
 				DEAD_CODE_STRIPPING = NO;
 				DEPLOYMENT_LOCATION = YES;
+				DEVELOPMENT_TEAM = Q46G522WGV;
 				ENABLE_BITCODE = NO;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_OBJC_CALL_CXX_CDTORS = YES;
@@ -2774,6 +2803,7 @@
 				"CODE_SIGN_IDENTITYsdk=iphoneos*" = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
 				DEPLOYMENT_LOCATION = YES;
+				DEVELOPMENT_TEAM = Q46G522WGV;
 				ENABLE_BITCODE = NO;
 				GCC_PRECOMPILE_PREFIX_HEADER = NO;
 				GCC_PREFIX_HEADER = "";

gpac-2.2.1.tar.gz/check_revision.sh -> gpac-2.4.0.tar.gz/check_revision.sh Changed

gpac-2.2.1.tar.gz/configure -> gpac-2.4.0.tar.gz/configure Changed

@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # GPAC configure script
-#     (c) 2003-2022 Telecom ParisTech
+#     (c) 2003-2024 Telecom ParisTech
 #     Authors: Jean Le Feuvre, Romain Bouqueau, Aurelien David
 #
 #set -v
@@ -48,10 +48,26 @@
 cxx_orig="g++"
 fi
 
+ar="$AR"
+if test "$ar" = "" ; then
 ar="ar"
+fi
+
+ranlib="$RANLIB"
+if test "$ranlib" = "" ; then
 ranlib="ranlib"
+fi
+
+make="$MAKE"
+if test "$make" = "" ; then
 make="make"
+fi
+
+strip="$STRIP"
+if test "$strip" = "" ; then
 strip="strip"
+fi
+
 pkg_config="pkg-config"
 windres="windres"
 readelf="readelf"
@@ -93,12 +109,19 @@
 need_inet_aton="no"
 CFLAGS=""
 CXXFLAGS=""
-GPAC_SH_FLAGS=-lpthread
+PTHREAD_CFLAGS=""
+PTHREAD_LDFLAGS=-lpthread
+GPAC_SH_FLAGS=""
 DYN_LIB_SUFFIX=".so"
 X11_PATH="/usr/X11R6"
 INSTFLAGS=""
 is_64="no"
-
+is_em="no"
+is_emcfg="no"
+has_remotery="yes"
+em_type="js"
+em_size="0"
+fatal_assert="no"
 
 #flags not set by generic lib config
 has_x11="no"
@@ -111,9 +134,16 @@
 
 ffmpeg_extra_ldflags=""
 
+case "$cc_orig" in
+    *emcc) is_emcfg="yes"
+        ;;
+esac
+
 nb_features=0
 all_features=""
 all_descs=""
+nb_filters=0
+all_filters=""
 
 push_feature()
 {
@@ -129,6 +159,18 @@
         eval "disable_$var=\"no\""
     fi
 
+    if test "$fc" = "*" ; then
+        desc=`echo $desc | cut -c2-`
+        desc="$desc filter"
+        if  -z $all_filters  ; then
+            all_filters="$1"
+        else
+            all_filters="$all_filters|$1"
+        fi
+        nb_filters=$((nb_filters+1))
+    fi
+
+
     if  -z $all_features  ; then
         all_features="$1"
         all_descs="$desc"
@@ -144,7 +186,10 @@
 
 push_feature "log" "logging support"
 push_feature "3d" "3D rendering"
+push_feature "threads" "Threading support"
+push_feature "network" "Network support (including RTP streaming)"
 push_feature "crypto" "crypto support"
+push_feature "restrict" "!restriction configuration file"
 push_feature "svg" "SVG 1.2 support"
 push_feature "vrml" "MPEG-4/VRML/X3D support"
 push_feature "x3d" "X3D-only support"
@@ -183,21 +228,92 @@
 push_feature "isoff-frag" "ISOBMFF fragments support"
 push_feature "isoff-hds" "Adobe HDS in ISOBMFF support"
 push_feature "streaming" "RTP/RTSP/SDP support"
-push_feature "player" "player (compositor)"
+push_feature "fonts" "Font and Text engine (used by compositor and EVG.js"
+push_feature "player" "deprecated - old name for compositor feature"
 push_feature "dvbx" "!DVB-specific tools (MPE, FEC, DSM-CC)"
 push_feature "vobsub" "VobSub support"
 push_feature "ttxt" "TTXT (3GPP / MPEG-4 Timed Text) support"
 push_feature "ttml" "TTML/EBU TTD support"
 push_feature "vtt" "WebVTT support"
-push_feature "mpd" "DASH MPD read/write support"
-push_feature "dash" "DASH and HLS support"
-push_feature "hevc" "HEVC support"
 push_feature "route" "ROUTE (ATSC3) support"
 push_feature "qjs" "QuickJS support"
 push_feature "qjs-libc" "QuickJS libc module support"
 push_feature "qjs-stack" "!stack depth checking in QuickJS (WILL CRASH in multithreaded modes)"
-push_feature "nvdec" "NVDec support"
 push_feature "tinygl" "!TinyGL support"
+push_feature "doc" "Embedded documentation"
+push_feature "evg" "EVG (GPAC vector graphics tools)"
+push_feature "avdevice" "avdevice support in FFMPEG"
+push_feature "avfilter" "avfilter support in FFMPEG"
+push_feature "net-cap" "network grab and replay support"
+
+push_feature "compositor" "*Compositor"
+push_feature "vout" "*video output"
+push_feature "aout" "*audio output"
+push_feature "bsagg" "*scalable bitstream aggregator"
+push_feature "bssplit" "*scalable bitstream spliter"
+push_feature "bsrw" "*bitstream rewriter"
+push_feature "dasher" "*DASH/HLS mux"
+push_feature "dashin" "*DASH/HLS demux"
+push_feature "imgdec" "*image decoder"
+push_feature "uncvdec" "*uncompressed video decoder"
+push_feature "cdcrypt" "*CENC decryptor"
+push_feature "ghidmx" "*GPAC HTTP Streaming index demuxer"
+push_feature "gsfdmx" "*GPAC serialized format demuxer"
+push_feature "nhmlr" "*NHML demuxer"
+push_feature "nhntr" "*NHNT demuxer"
+push_feature "cecrypt" "*CENC Encryptor"
+push_feature "flist" "*Playlist concetenator"
+push_feature "hevcmerge" "*HEVC tile merger"
+push_feature "hevcsplit" "*HEVC tile spliter"
+push_feature "fin" "*File input"
+push_feature "pin" "*Pipe input"
+push_feature "inspect" "*Inspecter"
+push_feature "cryptfile" "*Crypted input and output file"
+push_feature "mp4dmx" "*MP4/QT demuxer"
+push_feature "txtin" "*Subtitle loader"
+push_feature "gsfmx" "*GPAC serialized format demuxer"
+push_feature "mp4mx" "*MP4/QT muxer"
+push_feature "fout" "*File output"
+push_feature "pout" "*Pipe output"
+push_feature "rfac3" "*AC3 parser"
+push_feature "rfadts" "*ADTS parser"
+push_feature "rfamr" "*AMR parser"
+push_feature "rfav1" "*AV1/VP9 parser"
+push_feature "rfflac" "*FLAC parser"
+push_feature "rfh263" "*H263 parser"
+push_feature "rfimg" "*Image parser"
+push_feature "rflatm" "*LATM parser"
+push_feature "rfmhas" "*MPEG-H Audio parser"
+push_feature "rfmp3" "*MP3 parser"
+push_feature "rfmpgvid" "*MPEG 1/2/4 video parser"
+push_feature "rfnalu" "*NALU-based video parser"
+push_feature "rfprores" "*QT ProRes parser"
+push_feature "rfqcp" "*QCP file parser"
+push_feature "rfpcm" "*Raw PCM and wav parser"
+push_feature "rfrawvid" "*Raw video parser"
+push_feature "rftruehd" "*Dolby TrueHD parser"
+push_feature "reframer" "*Reframer"
+push_feature "resample" "*Audio resampler"
+push_feature "restamp" "*Restamper"
+push_feature "rewind" "*Reverse playback"
+push_feature "ufaac" "*ADTS and LATM rewriter"
+push_feature "ufmhas" "*MPEG-H Audio rewriter"
+push_feature "ufm4v" "*MPEG 1/2/4 and VC1 video rewriter"
+push_feature "ufnalu" "*NALU-based video rewriter"
+push_feature "ufobu" "*AV1/VP9 video rewriter"
+push_feature "tileagg" "*HEVC Tile aggregator"
+push_feature "tilesplit" "*HEVC Tile spliter"
+push_feature "ttmlconv" "*TTML conversion"
+push_feature "unframer" "*Unframer"
+push_feature "vcrop" "*Video croping"
+push_feature "vflip" "*Video flip"
+push_feature "writegen" "*Generic rewriter"
+push_feature "nhmlw" "*NHML writer"
+push_feature "nhntw" "*NHNT writer"
+push_feature "writeqcp" "*QCP writer"
+push_feature "units" "*unit tests"
+push_feature "nvdec" "*NVDec decoder"
+push_feature "vtbdec" "*VideoToolBox (OSX/iOS) decoder"
 
 ar_it=""
 get_item()
@@ -223,8 +339,8 @@
 }
 
 #zlib MUST be first
-all_packages="zlib opensvc openhevc platinum freetype ssl jpeg openjpeg png mad a52 xvid faad ffmpeg freenect vorbis theora ogg nghttp2"
-all_packages="$all_packages oss dvb4linux alsa pulseaudio jack directfb hid lzma tinygl vtb"
+all_packages="zlib opensvc openhevc platinum freetype ssl jpeg openjpeg png mad a52 xvid faad ffmpeg freenect vorbis theora nghttp2"
+all_packages="$all_packages oss dvb4linux alsa pulseaudio jack directfb hid lzma tinygl vtb ogg sdl caption mpeghdec libcaca"
 disabled_packages=""
 
 #init all has_FOO=no and set FOO_cflags=
@@ -265,6 +381,7 @@
   --enable-gprof           enable profiling
   --enable-gcov            enable coverage
   --enable-pic             enable Position Independant Code for shared objects
+  --fatal-assert           make any call to assert abort program
   --strip                  enable strip
   --std-allocator          uses standard lib memory allocator
   --enable-sanitizer       enable address sanitizer
@@ -278,12 +395,16 @@
   --X11-path=X11_PATH      specify path for X11 includes and libraries $X11_PATH
   --dxsdk-path=DX_PATH     specify DirectX SDK for MinGW $dxsdk_path
   --extra-ff-ldflags=EF    add EF flags to FFMPEG LDFLAGS $ffmpeg_extra_ldflags
+  --emscripten             configure for emscripten build (same as running emconfigure configure) - this will disable some features by default (network, avdevice), use --enable-FOO to re-enable
+  --em-type=EXT            output type, can be js, html or wasm $em_type
+  --em-size=V              total memory in bytes to use for emscripten - if 0, dynamic memory growth will be used $em_size
 
 GPAC core configuration:
   --static-modules         embed modules in libgpac rather than using dynamic library modules
   --enable-fixed-point     enable fixed-point math
   --disable-ipv6           disable IPV6 support
   --enable-mem-track       enable tracking of all memory allocated by gpac
+  --disable-remotery       disable Remotery support
   --disable-x11            disable X11
   --disable-x11-shm        disable X11 shared memory support
   --disable-x11-xv         disable X11 Xvideo support
@@ -337,6 +458,7 @@
 
 NOTE: The object files are built at the place where configure is launched
 EOF
+
 exit 1
 fi
 #end help
@@ -426,7 +548,6 @@
 #disable all features
 disable_all_features()
 {
-
     idx=1
     while  $idx -le $nb_features ; do
         get_item $idx "$all_features"
@@ -472,6 +593,7 @@
     exit 1
 }
 
+
 #parse all options
 for opt do
     case "$opt" in
@@ -515,6 +637,8 @@
             ;;
         --enable-afl-clang) cc_orig="afl-clang"; cxx_orig="afl-clang++"
             ;;
+        --fatal-assert) fatal_assert="yes";
+            ;;
         --verbose) verbose="yes";
             ;;
         --static-bin) static_bin="yes"
@@ -538,8 +662,6 @@
             ;;
         --disable-pulseaudio) has_pulseaudio="no"
             ;;
-        --disable-oggvorbis) has_oggvorbis="no"
-            ;;
         --disable-jack) has_jack="no"
             ;;
         --disable-alsa) has_alsa="no"
@@ -558,6 +680,8 @@
             ;;
         --enable-mem-track) use_memory_tracking="yes"
             ;;
+        --disable-remotery) has_remotery="no"
+            ;;
         --disable-x11) append disabled_packages "x11"
             ;;
         --disable-x11-shm) append disabled_packages "x11_shm"
@@ -584,14 +708,59 @@
         --enable-*) v=`echo $opt | cut -c10-`
         	set_feature "$v" "no"
             ;;
+        --emscripten) is_em="yes"
+            disable_network="yes"
+            ;;
+        --em-type=*) em_type=`echo $opt | cut -d '=' -f 2`
+            ;;
+        --em-size=*) em_size=`echo $opt | cut -d '=' -f 2`
+            ;;
         *) echo "! Unrecognized option $opt, ignoring !"
             ;;
     esac
 done
 
+
+if test "$is_em" = "yes" ; then
+cc_orig="emcc"
+cxx_orig="em++"
+ar="emar"
+ranlib="emranlib"
+make="make"
+strip="emstrip"
+else
+
+case "$cc_orig" in
+    *emcc) is_em="yes"
+        ;;
+esac
+fi
+
+if test "$is_em" = "yes" ; then
+    cpu="wasm"
+    static_modules="yes"
+    static_build="yes"
+    targetos="wasm"
+    pkg_cfg_path=$PKG_CONFIG_PATH
+    if test "$pkg_cfg_path" = "" ; then
+        echo "Emscripten missing PKG_CONFIG_PATH, disabling pkg-config"
+        pkg_config="no"
+    fi
+    has_remotery="no"
+
+    #to refine
+    append disabled_packages "freenect platinum vtb oss alsa jack pulseaudio directfb x11 dvb4linux directx"
+
+    if test "$disable_threads" = "yes" ; then
+        GPAC_SH_FLAGS=""
+    fi
+fi
+
 cc="${cc_orig}"
 cxx="${cxx_orig}"
 
+
+
 case "$cpu" in
     i386|i486|i586|i686|i86pc|BePC)
         cpu="x86"
@@ -655,6 +824,9 @@
             want_pic="yes"
         fi
         ;;
+    wasm)
+        cpu="wasm"
+        ;;
     *)
         cpu="unknown"
         ;;
@@ -692,7 +864,7 @@
 fi
 
 #check pkg_config
-if test "$cross_prefix" = "" ; then
+if test "$cross_prefix" = "" -a "$pkg_config" != "no"; then
     if ! $pkg_config --version >/dev/null 2>>$logs ; then
         pkg_config="no"
     fi
@@ -771,8 +943,8 @@
     FreeBSD)
         make="gmake"
         LDFLAGS="$LDFLAGS -export-dynamic"
-        CFLAGS="$CFLAGS -pthread"
-        GPAC_SH_FLAGS=-pthread
+        PTHREAD_CFLAGS=-pthread
+        PTHREAD_LDFLAGS=-pthread
         freebsd="yes"
         ;;
 
@@ -788,15 +960,19 @@
         else
             LDFLAGS="$LDFLAGS -L$prefix/$libdir"
         fi
-        if test -d /sw/bin ; then
-            alt_macosx_dir="/sw"
-            CFLAGS_DIR="-I/sw/include $CFLAGS_DIR"
-            LDFLAGS="-L/sw/lib $LDFLAGS"
-        elif test -d /opt/local/bin ; then
-            alt_macosx_dir="/opt/local"
-            CFLAGS_DIR="-I/opt/local/include $CFLAGS_DIR"
-            LDFLAGS="-L/opt/local/lib $LDFLAGS"
+
+        if test "$is_em" != "yes" ; then
+            if test -d /sw/bin ; then
+                alt_macosx_dir="/sw"
+            elif test -d /opt/local/bin ; then
+                alt_macosx_dir="/opt/local"
+            fi
+            if test "$alt_macosx_dir" != "" ; then
+                CFLAGS_DIR="-I$alt_macosx_dir $CFLAGS_DIR"
+                LDFLAGS="-L$alt_macosx_dir $LDFLAGS"
+            fi
         fi
+
         CFLAGS="$CFLAGS_DIR $CFLAGS"
         Mac_Applications="/Applications"
         SHFLAGS="-dynamiclib"
@@ -877,6 +1053,17 @@
 esac
 
 
+
+
+if test "$disable_threads" = "no" ; then
+CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+GPAC_SH_FLAGS=$PTHREAD_LDFLAGS
+else
+PTHREAD_LDFLAGS=""
+fi
+
+
+
 #defines directory for binaries and libs (ex. for TinyGL)
 target_bin_dir=""
 if test "$cross_prefix" = "" ; then
@@ -901,10 +1088,13 @@
 dolog() {
  rv=$?
  if  $rv -eq 0  ; then
- return 0;
+     echo "*** CC/CXX Test Passed (args $@) : ">>$logs
+     rv=0
+ else
+     echo "*** CC/CXX Test Failed (res $rv args $@) : ">>$logs
+     rv=1
  fi
 
- echo "*** CC/CXX Test Failed (args $@) : ">>$logs
  echo "">>$logs
  cat $TMPL >> $logs
  echo "">>$logs
@@ -912,7 +1102,7 @@
  cat $TMPC >> $logs
  echo "">>$logs
  echo "">>$logs
- return 1;
+ return $rv;
 }
 
 docc() {
@@ -924,7 +1114,7 @@
 docxx() {
  #for logs
  cat $TMPCXX > $TMPC
- $cc -o $TMPO $TMPCXX $@ 0>/dev/null 2>$TMPL
+ $cxx -o $TMPO $TMPCXX $@ 0>/dev/null 2>$TMPL
  dolog $@
 }
 
@@ -947,8 +1137,14 @@
 if test "$no_gcc_opt" = "no"; then
     CFLAGS="-O3 $CFLAGS"
 else
+
+#on emscripten+asan, failure to load wasm when build with -00, use -01
+if test "$is_em" = "yes" -a "$enable_sanitizer" = "yes"; then
+    CFLAGS="-O1 $CFLAGS"
+else
     CFLAGS="-O0 $CFLAGS"
 fi
+fi
 
 
 #GCC PIC
@@ -978,8 +1174,14 @@
 int main( void ) { return 0; }
 EOF
 
-if docc -msse2 $LDFLAGS ; then
-  CFLAGS="$CFLAGS -msse2"
+sseflags="-msse2"
+#experimental in emscriptem, we doon't enable it
+#if test "$is_em" = "yes" ; then
+#sseflags="$sseflags -msimd128"
+#fi
+
+if docc $sseflags $LDFLAGS ; then
+  CFLAGS="$CFLAGS $sseflags"
 fi
 
 
@@ -1031,7 +1233,7 @@
 #include <stdint.h>
 int main(void) {
     int i4 = 4;
-    __int64_t i8 = 8;
+    int64_t i8 = 8;
     __sync_add_and_fetch(&i4, 12);
     __sync_add_and_fetch(&i8, 12);
 }
@@ -1044,7 +1246,7 @@
 #include <stdint.h>
 int main(void) {
     int i4 = 4;
-    __int64_t i8 = 8;
+    int64_t i8 = 8;
     __atomic_add_fetch(&i4, 12, __ATOMIC_SEQ_CST);
     __atomic_add_fetch(&i8, 12, __ATOMIC_SEQ_CST);
 }
@@ -1081,6 +1283,17 @@
 fi
 
 
+#look for ifaddrs support
+cat > $TMPC << EOF
+#include <ifaddrs.h>
+#include <net/if.h>
+int main( void ) {  struct ifaddrs *ifap; getifaddrs(&ifap); return 0; }
+EOF
+has_ifaddrs="no"
+if docc $LDFLAGS ; then
+    has_ifaddrs="yes"
+fi
+
 #package config helpers
 
 
@@ -1094,6 +1307,24 @@
     local_inc_dir=$5
     package_src="$6"
 
+    sysname="system"
+    if test "$is_em" = "yes" ; then
+        is_port="yes";
+        case "$package_name" in
+            "zlib") package_cflags="-sUSE_ZLIB=1" ;;
+            "jpeg") package_cflags="-sUSE_LIBJPEG=1" ;;
+            "png") package_cflags="-sUSE_LIBPNG=1" ;;
+            "vorbis") package_cflags="-sUSE_VORBIS" ;;
+            "freetype") package_cflags="-sUSE_FREETYPE=1" ;;
+            *) is_port="no" ;;
+        esac
+
+        if test "$is_port" = "yes" ; then
+            package_ldflags="$package_cflags"
+            sysname="emcc-ports"
+        fi
+    fi
+
     forced=""
     custom="no"
     optname="$package_name="
@@ -1114,6 +1345,7 @@
             ;;
         "local") ;;
         "system") ;;
+        "emcc-ports") ;;
         "") ;;
         *)  if  -d "$forced" ; then
                 custom="yes"
@@ -1127,12 +1359,24 @@
 
     #test pkgconfig
     if test "$forced" != "local" -a "$custom" != "yes" ; then
-        if test "$cross_prefix" = "" -a "$pkg_config" != "no"; then
+        if test "$cross_prefix" = "" -a "$is_port" != "yes" -a "$pkg_config" != "no"; then
             if $pkg_config --exists $pkg_cfg_name ; then
                 pck_cflags=`$pkg_config --cflags $pkg_cfg_name`
                 pck_ldflags=`$pkg_config --libs $pkg_cfg_name`
-                has_pck="system (pkgconfig)"
-                return
+
+                if test "$pck_cxx" = "yes" ; then
+                    echo "$package_src" > $TMPCXX
+                    if docxx $pck_cflags $pck_ldflags ; then
+                        has_pck="$sysname (pkgconfig)"
+                        return
+                    fi
+                else
+                    echo "$package_src" > $TMPC
+                    if docc $pck_cflags $pck_ldflags ; then
+                        has_pck="$sysname (pkgconfig)"
+                        return
+                    fi
+                fi
             fi
         fi
     fi
@@ -1149,7 +1393,7 @@
             if docxx $package_cflags $LDFLAGS $package_ldflags ; then
                 pck_cflags="$package_cflags"
                 pck_ldflags="$package_ldflags"
-                has_pck="system"
+                has_pck="$sysname"
                 return
             fi
         fi
@@ -1158,14 +1402,14 @@
             return
         fi
 
-        if docxx -I"$local_inc/$local_inc_dir" -L$local_lib $package_ldflags ; then
+        if docxx -I"$local_inc/$local_inc_dir" $package_cflags $LDFLAGS -L$local_lib $package_ldflags ; then
             pck_cflags="-I$local_inc/$local_inc_dir $package_cflags"
             pck_ldflags="-L$local_lib $package_ldflags"
             has_pck="local"
             return
         fi
 
-        if docxx -I"$local_inc/$local_inc_dir" -L$execdir $package_ldflags ; then
+        if docxx -I"$local_inc/$local_inc_dir" $package_cflags $LDFLAGS -L$execdir $package_ldflags ; then
             pck_cflags="-I$local_inc/$local_inc_dir $package_cflags"
             pck_ldflags="-L$execdir $package_ldflags"
             has_pck="local (bin dir)"
@@ -1177,7 +1421,7 @@
     echo "$package_src" > $TMPC
 
     if test "$custom" = "yes" ; then
-        if docc -I"$forced//include" -L$forced//lib $package_ldflags ; then
+        if docc -I"$forced//include" $package_cflags -L$forced//lib $package_ldflags ; then
             pck_cflags="-I$forced//include $package_cflags"
             pck_ldflags="-L$forced//lib $package_ldflags"
             has_pck="custom"
@@ -1189,7 +1433,7 @@
         if docc $package_cflags $LDFLAGS $package_ldflags ; then
             pck_cflags="$package_cflags"
             pck_ldflags="$package_ldflags"
-            has_pck="system"
+            has_pck="$sysname"
             return
         fi
 
@@ -1208,14 +1452,14 @@
         return
     fi
 
-    if docc -I"$local_inc/$local_inc_dir" -L$local_lib $package_ldflags ; then
+    if docc -I"$local_inc/$local_inc_dir" $package_cflags $LDFLAGS -L$local_lib $package_ldflags ; then
         pck_cflags="-I$local_inc/$local_inc_dir $package_cflags"
         pck_ldflags="-L$local_lib $package_ldflags"
         has_pck="local"
         return
     fi
 
-    if docc -I"$local_inc/$local_inc_dir" -L$execdir $package_ldflags ; then
+    if docc -I"$local_inc/$local_inc_dir" $package_cflags $LDFLAGS -L$execdir $package_ldflags ; then
         pck_cflags="-I$local_inc/$local_inc_dir $package_cflags"
         pck_ldflags="-L$execdir $package_ldflags"
         has_pck="local"
@@ -1276,7 +1520,7 @@
 
 
 if test "$disable_codecs" = "yes"; then
-    append disabled_packages "jpeg png mad a52 faad xvid opensvc openjpeg ffmpeg ogg theora vorbis openhevc"
+    append disabled_packages "jpeg png mad a52 faad xvid opensvc openjpeg ffmpeg theora vorbis openhevc"
 fi
 
 if test "$static_bin" = "yes"; then
@@ -1284,7 +1528,7 @@
     static_build="yes"
 
     #we cannot use these to produce a static bin, no static lib on most distributions
-    append disabled_packages "openjpeg ffmpeg ogg theora vorbis openhevc freenect platinum"
+    append disabled_packages "openjpeg ffmpeg theora vorbis openhevc freenect platinum"
 
     #we cannot use openssl vanilla since it is usually built with DSO and requires dlopen
     append disabled_packages "ssl"
@@ -1315,26 +1559,25 @@
 fi
 
 config_package opensvc "OpenSVC" "" "-lOpenSVCDec" "" '#include <OpenSVCDecoder/SVCDecoder_ietr_api.h>
-int main( void ) { return 0; }'
+int main( void ) { void *codec; SVCDecoder_init(&codec); return 0; }'
 
 
 #look for openhevc support
-config_package openhevc "openhevc" "" "-lopenhevc -lm -lpthread" "" '#include <stdio.h>
+config_package openhevc "openhevc" "" "-lopenhevc -lm $PTHREAD_LDFLAGS" "" '#include <stdio.h>
 #include <libopenhevc/openhevc.h>
 int main( void ) { oh_init(1, 1); return 0; }
 '
 
 pck_cxx="yes"
-config_package platinum "platinum" "" "-lPlatinum -lPltMediaServer -lPltMediaConnect -lPltMediaRenderer -lNeptune -lZlib -lpthread" "platinum" '#include <Platinum.h>
-int main( void ) { return 0; }'
+config_package platinum "platinum" "" "-lPlatinum -lPltMediaServer -lPltMediaConnect -lPltMediaRenderer -lNeptune -lZlib -laxTLS $PTHREAD_LDFLAGS" "platinum" '#include <Platinum.h>
+int main( void ) { new PLT_UPnP(); return 0; }'
 
 
 config_package freetype "freetype2" "" "-lfreetype" "freetype" '#include <ft2build.h>
 #include FT_FREETYPE_H
 #include FT_GLYPH_H
 #include FT_OUTLINE_H
-int main( void ) { return 0; }
-'
+int main( void ) { FT_Library library; FT_Init_FreeType(&library); return 0; }'
 
 if test "$mingw32" = "yes" ; then
     ssl_lflags="-lssl -lcrypto"
@@ -1348,57 +1591,77 @@
 #include <openssl/x509.h>
 #include <openssl/err.h>
 #include <openssl/rand.h>
-int main( void ) { return 0; }'
+int main( void ) {  SSL_CTX_set_options(NULL, SSL_OP_ALL); return 0; }'
 
 
 config_package jpeg "libjpeg" "" "-ljpeg" "jpeg" '#include <stdio.h>
 #include <jpeglib.h>
-int main( void ) { return 0; }'
+int main( void ) { struct jpeg_decompress_struct cinfo; jpeg_create_decompress(&cinfo); return 0; }'
 
 
 
 config_package openjpeg "libopenjp2" "" "-lopenjp2" "openjp2" '#include <stdio.h>
 #include <openjpeg.h>
-int main( void ) { return 0; }'
+int main( void ) { opj_create_decompress(OPJ_CODEC_J2K); return 0; }'
 
-if test "has_openjpeg" = "no" ; then
-config_package openjpeg "libopenjpeg" "" "-lopenjpeg" "openjpeg" '#include <stdio.h>
+if test "$has_openjpeg" = "no" ; then
+config_package openjpeg "libopenjpeg" "" "-lopenjpeg -lm" "openjpeg" '#include <stdio.h>
 #include <openjpeg.h>
-int main( void ) { return 0; }'
+int main( void ) { opj_create_decompress(CODEC_J2K); return 0; }'
 fi
 
+if test "$has_openjpeg" = "no" ; then
+config_package openjpeg "libopenjpeg" "-DOPJ_STATIC" "-lopenjpeg -lm" "openjpeg" '#include <stdio.h>
+#include <openjpeg.h>
+int main( void ) { opj_create_decompress(CODEC_J2K); return 0; }'
+fi
 
 config_package png "libpng" "" "-lpng -lz" "png" '#include <png.h>
-int main( void ) { return 0; }'
+int main( void ) {  png_struct *png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL); return 0; }'
 
 
 config_package mad "mad" "" "-lmad" "" '#include <mad.h>
-int main( void ) { return 0; }'
+int main( void ) {  struct mad_stream stream; mad_stream_finish(&stream); return 0; }'
 
-config_package a52 "liba52" "" "-la52" "" '#include <inttypes.h>
+config_package a52 "liba52" "" "-la52 -lm" "" '#include <inttypes.h>
 #define uint32_t unsigned int
 #define uint8_t unsigned char
 #include <a52dec/mm_accel.h>
 #include <a52dec/a52.h>
-int main( void ) { return 0; }'
+int main( void ) { a52_state_t *codec; a52_free(codec); return 0; }'
 
 
 
-config_package xvid "xvid" "" "-lxvidcore -lpthread" "" '#include <xvid.h>
-int main( void ) { return 0; }'
+config_package xvid "xvid" "" "-lxvidcore $PTHREAD_LDFLAGS" "" '#include <xvid.h>
+int main( void ) { void *codec; xvid_decore(codec, XVID_DEC_DESTROY, NULL, NULL); return 0; }'
 
-config_package faad "faad2" "" "-lfaad" "" '#include <faad.h>
-int main( void ) { return 0; }'
+config_package faad "faad2" "" "-lfaad -lm" "" '#include <faad.h>
+int main( void ) { NeAACDecOpen(); return 0; }'
 
 
-ffmpeg_lflags="-lz -lavcodec -lavformat -lavutil -lavdevice -lswscale -lavfilter $ffmpeg_extra_ldflags"
+ffmpeg_lflags="-lz -lavcodec -lavformat -lavutil -lswscale -lpostproc"
+ffmpeg_pck_names="libavcodec libavformat libswscale libavutil"
 
-config_package ffmpeg "libavcodec libavformat libswscale libavdevice libavutil libavfilter" "" "$ffmpeg_lflags" "" '#include <libavcodec/avcodec.h>
-int main(void) {
-    return 0;
-}'
+if test "$is_em" = "yes" ; then
+disable_avdevice="yes"
+fi
+
+if test "$disable_avdevice" = "no" ; then
+ffmpeg_lflags="$ffmpeg_lflags -lavdevice"
+ffmpeg_pck_names="$ffmpeg_pck_names libavdevice"
+fi
+
+if test "$disable_avfilter" = "no" ; then
+ffmpeg_lflags="$ffmpeg_lflags -lavfilter"
+ffmpeg_pck_names="$ffmpeg_pck_names libavfilter"
+fi
+
+ffmpeg_lflags="$ffmpeg_lflags $ffmpeg_extra_ldflags"
 
-if test "$has_ffmpeg" != no ; then
+config_package ffmpeg "$ffmpeg_pck_names" "" "$ffmpeg_lflags" "" '#include <libavformat/avformat.h>
+int main(void) { avformat_alloc_context(); return 0; }'
+
+if test "$has_ffmpeg" != "no" ; then
 
 #detect vvc support in ffmpeg
 cat > $TMPC << EOF
@@ -1418,27 +1681,38 @@
 fi
 
 fi
+
 #end ffmpeg specific tests
 
 
 config_package freenect "libfreenect" "" "-lfreenect" "freenect" '#include <libfreenect/libfreenect.h>
-int main( void ) { return 0; }'
+int main( void ) { freenect_context *f_ctx; freenect_init(&f_ctx, NULL); return 0; }'
 
 
 config_package vorbis "vorbis" "" "-lvorbis" "" '#include <vorbis/codec.h>
-int main( void ) { return 0; }'
+int main( void ) { vorbis_info vi; vorbis_info_init(&vi); return 0; }'
 
 
 config_package theora "theora" "" "-ltheora -logg" "" '#include <theora/theora.h>
-int main( void ) { return 0; }'
-
-
-config_package ogg "ogg" "" "-logg" "" '#include <ogg/ogg.h>
-int main( void ) { return 0; }'
+int main( void ) { theora_info ti; theora_info_init(&ti); return 0; }'
 
 config_package nghttp2 "libnghttp2" "" "-lnghttp2" "" '#include <stdio.h>
 #include <nghttp2/nghttp2.h>
-int main( void ) { return 0; }'
+int main( void ) {  nghttp2_session *ng_sess; nghttp2_session_del(ng_sess); return 0; }'
+
+config_package caption "libcaption" "" "-lcaption" "" '#include <caption/cea708.h>
+int main( void ) { caption_frame_t ccframe; caption_frame_init(&ccframe); return 0; }'
+
+config_package libcaca "caca" "" "-lcaca" "" '#include <caca.h>
+int main( void ) { caca_canvas_t *canvas = caca_create_canvas(20, 20); return 0; }'
+
+
+config_package mpeghdec "mpeghdec" "" "-lMpeghDec -lMpegTPDec -lPCMutils -lIGFdec -lArithCoding -lFormatConverter -lgVBAPRenderer -lDRCdec -lUIManager -lSYS -lFDK -lm" "" '
+#ifndef bool
+typedef int bool;
+#endif
+#include <mpeghdecoder.h>
+int main( void ) { HANDLE_MPEGH_DECODER_CONTEXT codec = mpeghdecoder_init(2); return 0; }'
 
 
 #look for VideoToolBox support
@@ -1595,6 +1869,7 @@
 
 #look for OpenGL support or for TinyGL support
 has_opengl="no"
+if test "$is_em" != "yes" ; then
 LINK3D=""
 INCL3D=""
 DarwinGL="no"
@@ -1640,7 +1915,8 @@
         LINK3D=""
     fi
 fi
-
+fi
+#end GL test
 
 #look for tinyGL only if desired
 has_tinygl=no
@@ -1687,14 +1963,23 @@
     sdl_static="yes"
 fi
 
-if type $sdl_config >/dev/null 2>>$logs; then
-
     cat > $TMPC << EOF
 #include <SDL.h>
 #undef main
 int main( void ) { return SDL_Init (SDL_INIT_VIDEO); }
 EOF
 
+
+if test "$is_em" = "yes"; then
+    if docc $sdl_cflags $LDFLAGS -sUSE_SDL=2 ; then
+        has_sdl="emcc-ports"
+        sdl_cflags="-sUSE_SDL=2"
+        sdl_lib_flags="-sUSE_SDL=2"
+        if test "$disable_3d" = "no" ; then
+            has_opengl="yes"
+        fi
+    fi
+elif type $sdl_config >/dev/null 2>>$logs; then
     if test "$sdl_static" = "yes"; then
         sdl_lib_flags=`$sdl_config --static-libs`
     else
@@ -1753,7 +2038,7 @@
 
 
 #look at endianess
-if test -z "$cross_prefix" ; then
+if test -z "$cross_prefix" -a "$is_em" != "yes" ; then
 
 # big/little endian test
 cat > $TMPC << EOF
@@ -1797,6 +2082,10 @@
 
 
 if test "$disable_player" = "yes" ; then
+disable_compositor=$disable_player;
+fi
+
+if test "$disable_compositor" = "yes" ; then
     disable_scenegraph="yes"
 fi
 
@@ -1818,13 +2107,8 @@
     disable_loader_bt="yes"
     disable_loader_xmt="yes"
     disable_streaming="yes"
-    disable_player="yes"
+    disable_compositor="yes"
     disable_smgr="yes"
-    disable_nvdec="yes"
-fi
-
-if test "$disable_mpd" = "yes"; then
-    disable_dash="yes"
 fi
 
 if test "$disable_od_parse" = "yes" ; then
@@ -1850,7 +2134,13 @@
 echo "/* Automatically generated by configure */" > $TMPH
 echo "#ifndef GF_CONFIG_H" >> $TMPH
 echo "#define GF_CONFIG_H" >> $TMPH
+
+#don't print full config for emscripten, we usually have local FS paths in the command line for custom builds
+if test "$is_em" = "yes" ; then
+echo "#define GPAC_CONFIGURATION \"(emscripten build)\"" >> $TMPH
+else
 echo "#define GPAC_CONFIGURATION \"$GPAC_CONFIGURATION\"" >> $TMPH
+fi
 
 version="`grep '#define GPAC_VERSION ' \"$source_path/include/gpac/version.h\" | cut -d '"' -f 2`"
 version_major=`grep '#define GPAC_VERSION_MAJOR ' $source_path/include/gpac/version.h | sed 's/^0-9*//g'`
@@ -1879,6 +2169,7 @@
 echo "** GPAC $version rev$revision Core Configuration **"
 if test "$static_bin" = "yes" ; then
     echo "Static binaries enabled"
+    echo "#define GPAC_STATIC_BIN" >> $TMPH
     echo "#define GPAC_STATIC_BUILD" >> $TMPH
 elif test "$static_build" = "yes" ; then
     echo "Static build enabled"
@@ -1906,12 +2197,17 @@
 fi
 
 
-if test "$disable_player" = "yes" ; then
-    echo "Player disabled"
-    echo "#define GPAC_DISABLE_PLAYER" >> $TMPH
+if test "$disable_compositor" = "yes" ; then
+    echo "Compositor disabled"
+    echo "#define GPAC_DISABLE_COMPOSITOR" >> $TMPH
     disable_laser="yes"
 fi
 
+if test "$disable_fonts" = "yes" ; then
+    echo "Font Engine disabled"
+    echo "#define GPAC_DISABLE_FONTS" >> $TMPH
+fi
+
 if test "$has_st_nsec" = "yes" ; then
     echo "#define GPAC_HAS_MTIM_NSEC" >> $TMPH
 fi
@@ -1992,6 +2288,11 @@
     echo "MPEG-2 TS disabled"
     echo "#define GPAC_DISABLE_MPEG2TS" >> $TMPH
 fi
+
+if test "$disable_parsers" = "yes" ; then
+    disable_m2ts_mux="yes"
+fi
+
 if test "$disable_m2ts_mux" = "yes" ; then
     echo "MPEG-2 TS Multiplexer disabled"
     echo "#define GPAC_DISABLE_MPEG2TS_MUX" >> $TMPH
@@ -2110,19 +2411,14 @@
     echo "#define GPAC_QJS_STACK_CHECK" >> $TMPH
 fi
 
-if test "$disable_mpd" = "yes" ; then
-    echo "HLS and DASH Manifest Disabled"
-    echo "#define GPAC_DISABLE_MPD" >> $TMPH
-fi
-
-if test "$disable_dash" = "yes" ; then
-    echo "Adaptive HTTP Streaming Client disabled"
-    echo "#define GPAC_DISABLE_DASH_CLIENT" >> $TMPH
+if test "$disable_doc" = "yes" ; then
+    echo "Doc disabled"
+    echo "#define GPAC_DISABLE_DOC" >> $TMPH
 fi
 
-if test "$disable_hevc" = "yes" ; then
-    echo "HEVC Support disabled"
-    echo "#define GPAC_DISABLE_HEVC" >> $TMPH
+if test "$disable_evg" = "yes" ; then
+    echo "EVG disabled"
+    echo "#define GPAC_DISABLE_EVG" >> $TMPH
 fi
 
 if test "$disable_route" = "yes" ; then
@@ -2140,6 +2436,26 @@
     echo "#define GPAC_DISABLE_LOG" >> $TMPH
 fi
 
+if test "$disable_vout" = "yes" ; then
+    echo "Filter vout disabled"
+    echo "#define GPAC_DISABLE_VOUT" >> $TMPH
+fi
+
+if test "$disable_aout" = "yes" ; then
+    echo "Filter aout disabled"
+    echo "#define GPAC_DISABLE_AOUT" >> $TMPH
+fi
+
+if test "$disable_restrict" = "no" ; then
+    echo "#define GPAC_ENABLE_RESTRICT" >> $TMPH
+fi
+
+if test "$disable_net_cap" = "yes" ; then
+    echo "Network record/playback disabled"
+    echo "#define GPAC_DISABLE_NETCAP" >> $TMPH
+fi
+
+
 echo ""
 
 echo "** Detected libraries **"
@@ -2159,10 +2475,10 @@
     echo "Pulse Audio: $has_pulseaudio"
     echo "DirectFB: $has_directfb"
 
-    if  -z $X11_PATH  ; then
-        echo "X11: $has_x11"
-    else
+    if test "$has_x11" != "no" ; then
         echo "X11: $has_x11 (path: $X11_PATH)"
+    else
+        echo "X11: $has_x11"
     fi
 
     if test "$has_x11" != "no" ; then
@@ -2189,6 +2505,9 @@
 echo "MAD: $has_mad"
 echo "FAAD: $has_faad"
 echo "XVID: $has_xvid"
+echo "libcaption: $has_caption"
+echo "MpeghDecoder: $has_mpeghdec"
+echo "libcaca: $has_libcaca"
 
 ffopts=""
 if test "$has_ffmpeg" != "no" ; then
@@ -2200,23 +2519,17 @@
 if  -z $ffopts  ; then
 echo "FFMPEG: $has_ffmpeg"
 else
-echo "FFMPEG: $has_ffmpeg - "$ffopts"supported"
+echo "FFMPEG: $has_ffmpeg - \"$ffopts\" supported"
 fi
 
 
 echo "LZMA: $has_lzma"
-echo "Xiph OGG: $has_ogg"
-echo "Platinum UPnP: $has_platinum"
-
-if test "$has_ogg" = "no"; then
-    has_ogg="no"
-else
-    echo "Xiph Vorbis: $has_vorbis"
-    echo "Xiph Theora: $has_theora"
-fi
+echo "Xiph Vorbis: $has_vorbis"
+echo "Xiph Theora: $has_theora"
 echo "A52 (AC3): $has_a52"
 echo "OpenSVCDecoder: $has_opensvc"
 echo "OpenHEVCDecoder: $has_openhevc"
+echo "Platinum UPnP: $has_platinum"
 echo "Freenect: $has_freenect"
 
 
@@ -2237,11 +2550,37 @@
 fi
 
 
+if test "$is_em" = "yes" ; then
+
+extralibs="$extralibs -sALLOW_TABLE_GROWTH -sWASM_BIGINT"
+
+if test "$disable_threads" = "no" ; then
+    CFLAGS="$CFLAGS -sUSE_PTHREADS"
+    extralibs="$extralibs -sUSE_PTHREADS"
+fi
+
+if test "$em_size" = "0" ; then
+    extralibs="$extralibs -sALLOW_MEMORY_GROWTH"
+    if test "$has_ffmpeg" != "no"; then
+        extralibs="$extralibs -sSTACK_SIZE=1MB"
+    fi
+else
+    extralibs="$extralibs -sTOTAL_MEMORY=$em_size"
+fi
+
+if test "$enable_sanitizer" = "yes" ; then
+    CFLAGS="$CFLAGS -fsanitize=address -g2 -DASAN_ENABLED"
+    LDFLAGS="$LDFLAGS -fsanitize=address -ldl"
+fi
+
+else
+
 if test "$enable_sanitizer" = "yes" ; then
     CFLAGS="$CFLAGS -fsanitize=address,undefined -fno-sanitize-recover -g -fno-omit-frame-pointer -DASAN_ENABLED"
     LDFLAGS="$LDFLAGS -fsanitize=address,undefined -ldl"
 fi
 
+fi
 
 ldir=`pwd`
 CFLAGS="$CFLAGS -DGPAC_HAVE_CONFIG_H -I\"$ldir\""
@@ -2259,7 +2598,6 @@
 echo "prefix=$prefix" >> config.mak
 echo "DESTDIR=$DESTDIR" >> config.mak
 echo "moddir=gpac" >> config.mak
-echo "tinygl_target_bin_dir=$target_bin_dir" >> config.mak
 echo "MAKE=$make" >> config.mak
 
 if test "$verbose" = "yes" ; then
@@ -2314,7 +2652,6 @@
     echo "TARGET_ARCH_MIPS=yes" >> config.mak
 fi
 
-
 if test "$bigendian" = "yes" ; then
     echo "IS_BIGENDIAN=yes" >> config.mak
     echo "#define GPAC_BIG_ENDIAN" >> $TMPH
@@ -2341,7 +2678,6 @@
 
 if test "$win32" = "yes" ; then
     echo "CONFIG_WIN32=yes" >> config.mak
-    echo "CONFIG_OS=CONFIG_WIN32" >> config.mak
     echo "#define GPAC_CONFIG_WIN32" >> $TMPH
     if test "$cygwin" = "yes" ; then
         echo "#define ftello64 ftell" >> $TMPH
@@ -2371,15 +2707,12 @@
     fi
 elif test "$linux" = "yes" ; then
     echo "CONFIG_LINUX=yes" >> config.mak
-    echo "CONFIG_OS=CONFIG_LINUX" >> config.mak
     echo "#define GPAC_CONFIG_LINUX" >> $TMPH
 elif test "$freebsd" = "yes" ; then
     echo "CONFIG_FREEBSD=yes" >> config.mak
-    echo "CONFIG_OS=CONFIG_FREEBSD" >> config.mak
     echo "#define GPAC_CONFIG_FREEBSD" >> $TMPH
 elif test "$darwin" = "yes" ; then
     echo "CONFIG_DARWIN=yes" >> config.mak
-    echo "CONFIG_OS=CONFIG_DARWIN" >> config.mak
     echo "#define GPAC_CONFIG_DARWIN" >> $TMPH
     if test "$DarwinGL" = "yes" ; then
         echo "#define CONFIG_DARWIN_GL" >> $TMPH
@@ -2387,10 +2720,12 @@
     echo "mac_apps=$Mac_Applications" >> config.mak
 elif test "$sunos" = "yes" ; then
     echo "CONFIG_SUNOS=yes" >> config.mak
-    echo "CONFIG_OS=CONFIG_SUNOS" >> config.mak
     echo "#define GPAC_CONFIG_SUNOS" >> $TMPH
+elif test "$is_em" = "yes" ; then
+    echo "CONFIG_EMSCRIPTEN=yes" >> config.mak
+    echo "EM_TYPE=$em_type" >> config.mak
+    echo "#define GPAC_CONFIG_EMSCRIPTEN" >> $TMPH
 else
-    echo "CONFIG_OS=CONFIG_GEN" >> config.mak
     echo "#define GPAC_CONFIG_GENERIC" >> $TMPH
 fi
 
@@ -2415,6 +2750,35 @@
 
 fi
 
+if test "$fatal_assert" = "yes" ; then
+echo "#define GPAC_ASSERT_FATAL" >> $TMPH
+fi
+
+
+echo "HAS_OPENSSL=$has_ssl" >> config.mak
+if test "$has_ssl" != "no" ; then
+    echo "#define GPAC_HAS_SSL" >> $TMPH
+fi
+
+if test "$has_poll" = "yes" ; then
+    echo "#define GPAC_HAS_POLL" >> $TMPH
+fi
+
+if test "$is_64" = "yes" ; then
+    echo "#define GPAC_64_BITS" >> $TMPH
+fi
+
+echo "DISABLE_THREADS=$disable_threads" >> config.mak
+if test "$disable_threads" = "yes" ; then
+    echo "#define GPAC_DISABLE_THREADS" >> $TMPH
+fi
+
+if test "$disable_network" = "yes" ; then
+    echo "Network disabled"
+    echo "#define GPAC_DISABLE_NETWORK" >> $TMPH
+fi
+
+
 if test "$has_zlib" = "no" -o "$has_zlib" = "force-no" ; then
     echo "#define GPAC_DISABLE_ZLIB" >> $TMPH
     echo "CONFIG_ZLIB=no" >> config.mak
@@ -2423,6 +2787,11 @@
 fi
 echo "CONFIG_FT=$has_freetype" >> config.mak
 
+if test "$has_remotery" = "no" ; then
+    echo "#define GPAC_DISABLE_REMOTERY" >> $TMPH
+fi
+
+
 if test "$has_jpeg" != "no" ; then
     echo "#define GPAC_HAS_JPEG" >> $TMPH
 fi
@@ -2444,6 +2813,10 @@
     echo "#define GPAC_HAS_SOCK_UN" >> $TMPH
 fi
 
+if test "$has_ifaddrs" != "no" ; then
+    echo "#define GPAC_HAS_IFADDRS" >> $TMPH
+fi
+
 echo "CONFIG_LZMA=$has_lzma" >> config.mak
 if test "$has_lzma" != "no"; then
 echo "#define GPAC_HAS_LZMA" >> $TMPH
@@ -2465,7 +2838,6 @@
 if test "$has_xvid" != "no" ; then
     echo "#define GPAC_HAS_XVID" >> $TMPH
 fi
-echo "CONFIG_OGG=$has_ogg" >> config.mak
 
 if test "$has_vorbis" != "no" ; then
     echo "#define GPAC_HAS_VORBIS" >> $TMPH
@@ -2480,6 +2852,12 @@
     if test "$ffmpeg_vvc" = "yes"; then
       echo "#define FFMPEG_ENABLE_VVC" >> $TMPH
     fi
+    if test "$disable_avdevice" = "yes" ; then
+      echo "#define FFMPEG_DISABLE_AVDEVICE" >> $TMPH
+    fi
+    if test "$disable_avfilter" = "yes" ; then
+      echo "#define FFMPEG_DISABLE_AVFILTER" >> $TMPH
+    fi
 fi
 
 echo "CONFIG_OSS_AUDIO=$has_oss" >> config.mak
@@ -2505,6 +2883,22 @@
     echo "#define GPAC_HAS_HTTP2" >> $TMPH
 fi
 
+if test "$has_caption" != "no" ; then
+    echo "#define GPAC_HAS_LIBCAPTION" >> $TMPH
+fi
+
+
+if test "$has_libcaca" != "no" ; then
+    echo "#define GPAC_HAS_LIBCACA" >> $TMPH
+    echo "CONFIG_CACA=yes" >> config.mak
+else
+    echo "CONFIG_CACA=no" >> config.mak
+fi
+
+if test "$has_mpeghdec" != "no" ; then
+    echo "#define GPAC_HAS_MPEGHDECODER" >> $TMPH
+fi
+
 #dump all cflags
 for pcklib in $all_packages ; do
     eval "has_pck=\$has_$pcklib"
@@ -2520,8 +2914,21 @@
 done
 
 
+idx=1
+while  $idx -le $nb_filters ; do
+    get_item $idx "$all_filters"
+    name="$ar_it"
+    var=$(printf '%s' "$name" | tr '-' '_')
+    ret=""
+    eval "ret=\${disable_$var}"
+    uvar=`echo $var | tr a-z A-Z`
+    if test "$ret" = "yes" ; then
+        echo "#define GPAC_DISABLE_$uvar" >> $TMPH
+    fi
+    idx=$((idx+1))
+done
 
-echo "DISABLE_PLAYER=$disable_player" >> config.mak
+echo "DISABLE_COMPOSITOR=$disable_compositor" >> config.mak
 echo "DISABLE_STREAMING=$disable_streaming" >> config.mak
 echo "DISABLE_SVG=$disable_svg" >> config.mak
 echo "DISABLE_LASER=$disable_laser" >> config.mak
@@ -2551,8 +2958,6 @@
 echo "DISABLE_AV_PARSERS=$disable_parsers" >> config.mak
 echo "DISABLE_MEDIA_IMPORT=$disable_import" >> config.mak
 echo "DISABLE_MEDIA_EXPORT=$disable_export" >> config.mak
-echo "DISABLE_MPD=$disable_mpd" >> config.mak
-echo "DISABLE_DASH_CLIENT=$disable_dash" >> config.mak
 echo "DISABLE_CORE_TOOLS=$disable_core" >> config.mak
 echo "DISABLE_OD_DUMP=$disable_od_dump" >> config.mak
 echo "DISABLE_OD_PARSE=$disable_od_parse" >> config.mak
@@ -2561,10 +2966,6 @@
 echo "DISABLE_VRML=$disable_vrml" >> config.mak
 echo "DISABLE_ROUTE=$disable_route" >> config.mak
 echo "DISABLE_CRYPTO=$disable_crypto" >> config.mak
-
-if test "$disable_parsers" = "yes" ; then
-    disable_m2ts_mux="yes"
-fi
 echo "DISABLE_M2TS_MUX=$disable_m2ts_mux" >> config.mak
 echo "DISABLE_M2TS=$disable_m2ts" >> config.mak
 
@@ -2576,6 +2977,9 @@
 
 if test "$has_opengl" = "yes" ; then
     echo "OGL_LIBS=$LINK3D" >> config.mak
+    if test "$is_em" = "yes" ; then
+        echo "#define GPAC_USE_GLES2" >> $TMPH
+    fi
 else
     echo "#define GPAC_DISABLE_3D" >> $TMPH
 fi
@@ -2584,19 +2988,12 @@
     echo "#define GPAC_USE_TINYGL" >> $TMPH
 fi
 
-if test "$disable_nvdec" = "yes" ; then
-    echo "#define GPAC_DISABLE_NVDEC" >> $TMPH
-fi
-
-echo "HAS_OPENSSL=$has_ssl" >> config.mak
-if test "$has_ssl" != "no" ; then
-    echo "#define GPAC_HAS_SSL" >> $TMPH
-fi
-
-echo "CONFIG_SDL=$has_sdl" >> config.mak
 if test "$has_sdl" != "no" ; then
+    echo "CONFIG_SDL=yes" >> config.mak
     echo "sdl_cflags=$sdl_cflags" >> config.mak
     echo "sdl_ldflags=$sdl_lib_flags" >> config.mak
+else
+    echo "CONFIG_SDL=no" >> config.mak
 fi
 
 
@@ -2610,14 +3007,6 @@
     echo "#define GPAC_HAS_IPV6" >> $TMPH
 fi
 
-if test "$has_poll" = "yes" ; then
-    echo "#define GPAC_HAS_POLL" >> $TMPH
-fi
-
-if test "$is_64" = "yes" ; then
-    echo "#define GPAC_64_BITS" >> $TMPH
-fi
-
 if test "$win32" = "yes" ; then
     echo "CONFIG_DIRECTX=$has_directx" >> config.mak
     if test "$has_directx" = "yes" ; then
@@ -2645,10 +3034,13 @@
 fi
 
 echo "CONFIG_DIRECTFB=$has_directfb" >> config.mak
+if test "$has_directfb" != "no"; then
 echo "DIRECTFB_INC_PATH=$directfb_inc" >> config.mak
 echo "DIRECTFB_LIB=$directfb_lib" >> config.mak
+fi
 
 echo "CONFIG_X11=$has_x11" >> config.mak
+if test "$has_x11" != "no"; then
 
 if test "$has_x11_shm" = "yes"; then
     echo "USE_X11_SHM=$has_x11_shm" >> config.mak
@@ -2660,10 +3052,6 @@
     echo "USE_X11_GLX=$has_x11_glx" >> config.mak
 fi
 
-echo "CONFIG_HID=$has_hid" >> config.mak
-echo "HID_LDFLAGS=$hid_lib" >> config.mak
-
-echo "PKG_CONFIG=$pkg_config" >> config.mak
 
 if  -n "$X11_PATH"  ; then
 if test "$is_64" = "yes"; then
@@ -2679,6 +3067,17 @@
 echo "X11_INC_PATH=$X11_PATH/include" >> config.mak
 fi
 
+fi
+#end x11!=no
+
+echo "CONFIG_HID=$has_hid" >> config.mak
+if test "$has_hid" != "no"; then
+echo "HID_LDFLAGS=$hid_lib" >> config.mak
+fi
+
+echo "PKG_CONFIG=$pkg_config" >> config.mak
+
+
 #build tree in object directory if source path is different from current one
 if test "$source_path_used" = "yes" ; then
 
@@ -2723,10 +3122,6 @@
     fi
 
     cd "$cur_dir"
-
-    echo "SRC_LOCAL_PATH=no" >> config.mak
-else
-    echo "SRC_LOCAL_PATH=yes" >> config.mak
 fi
 
 echo "SRC_PATH=$source_path" >> config.mak
@@ -2760,6 +3155,10 @@
     mkdir ./bin/gcc/temp
 fi
 
+if test "$is_em" = "yes" ; then
+    ln -sf "$source_path/share/emscripten/gpac.html" "bin/gcc/gpac.html"
+fi
+
 
 echo '%.opic : %.c' >> config.mak
 if test "$verbose" = "no" ; then
@@ -2795,7 +3194,7 @@
 	echo ""
 	echo "Name: gpac"
 	echo "Description: GPAC Multimedia Framework"
-	echo "URL: http://gpac.io"
+	echo "URL: https://gpac.io"
 	echo "Version:$version"
 	echo "Cflags: -I\${prefix}/include"
 	echo "Libs: -L\${libdir} -lgpac"

gpac-2.2.1.tar.gz/debian/changelog -> gpac-2.4.0.tar.gz/debian/changelog Changed

gpac-2.2.1.tar.gz/debian/compat -> gpac-2.4.0.tar.gz/debian/compat Changed

gpac-2.2.1.tar.gz/debian/control -> gpac-2.4.0.tar.gz/debian/control Changed

@@ -3,10 +3,10 @@
 Priority: optional
 Maintainer: Jean Le Feuvre <jeanlf@gpac.io>
 Bugs: mailto:jeanlf@gpac.io
-Homepage: http://gpac.io
+Homepage: https://gpac.io
 Standards-Version: 3.8.0
 Build-Conflicts: libgpac-dev
-Build-Depends: debhelper (>= 6), libc6, libc6-dev, libx11-dev (>= 1.3), zlib1g-dev (>= 1), libfreetype6-dev, libjpeg62-dev | libjpeg62-turbo-dev, libpng-dev, libmad0-dev, libfaad-dev, libogg-dev, libvorbis-dev, libtheora-dev, liba52-dev | liba52-0.7.4-dev, libavcodec-dev, libavformat-dev, libavutil-dev, libswscale-dev, libavdevice-dev, libavfilter-dev, libxv-dev, x11proto-video-dev, libgl1-mesa-dev, x11proto-gl-dev, libxvidcore-dev, libssl-dev (>= 0.9.8), libjack-dev (>= 0.118), libasound2-dev (>= 1.0), libpulse-dev (>= 0.9), libsdl-dev (>= 1.2) | libsdl2-dev, libnghttp2-dev, ccache
+Build-Depends: debhelper (>= 6), libc6, libc6-dev, libx11-dev (>= 1.3), zlib1g-dev (>= 1), libfreetype6-dev, libjpeg62-dev | libjpeg62-turbo-dev, libpng-dev, libmad0-dev, libfaad-dev, libogg-dev, libvorbis-dev, libtheora-dev, liba52-dev | liba52-0.7.4-dev, libavcodec-dev, libavformat-dev, libavutil-dev, libswscale-dev, libavdevice-dev, libavfilter-dev, libxv-dev, x11proto-video-dev, libgl1-mesa-dev, libglu1-mesa-dev, x11proto-gl-dev, libxvidcore-dev, libssl-dev (>= 0.9.8), libjack-jackd2-dev, libasound2-dev (>= 1.0), libpulse-dev (>= 0.9), libsdl-dev (>= 1.2) | libsdl2-dev, libnghttp2-dev, libopenjp2-7-dev, libcaca-dev, ccache
 
 Package: gpac
 Architecture: any
@@ -23,7 +23,7 @@
 Architecture: any
 Section: libdevel
 Depends: gpac
-Replaces: gpac (<= 2.2.0)
+Replaces: gpac (<= 2.0.0)
 Description: Framework for production, encoding, delivery and interactive playback of multimedia content
  GPAC supports many AV codecs, multimedia containers (MP4,fMP4, TS, avi, mov, mpg, mkv ...), complex
  presentation formats (MPEG-4 Systems, SVG Tiny 1.2, VRML/X3D) and subtitles (SRT, WebVTT, TTXT/TX3G, TTML).

gpac-2.2.1.tar.gz/debian/rules -> gpac-2.4.0.tar.gz/debian/rules Changed

gpac-2.4.0.tar.gz/extra_lib/.gitkeep Added

gpac-2.4.0.tar.gz/flake.lock Added

gpac-2.4.0.tar.gz/flake.nix Added

@@ -0,0 +1,55 @@
+{
+  description = "GPAC Multimedia Open Source Project";
+  inputs =  {
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
+  };
+  outputs = { self, nixpkgs }@inputs: 
+  let
+    pkgs = nixpkgs.legacyPackages.x86_64-linux;
+    buildInputs = with pkgs;  
+      zlib 
+      git
+      freetype 
+      libjpeg_turbo 
+      libpng 
+      libmad 
+      faad2 
+      libogg 
+      libvorbis 
+      libtheora
+      a52dec
+      ffmpeg
+      xorg.libX11
+      xorg.libXv
+      xorg.xorgproto
+      mesa
+      xvidcore
+      openssl
+      alsa-lib
+      jack2
+      pulseaudio
+      SDL2
+      mesa-demos
+    ;
+    nativeBuildInputs = with pkgs;  pkg-config ;
+ in
+  with pkgs; {  
+    devShells.x86_64-linux.default = mkShell {
+        inherit buildInputs nativeBuildInputs;
+    };
+    packages.x86_64-linux.default =  with import nixpkgs { system = "x86_64-linux"; };
+      stdenv.mkDerivation {
+        name = "gpac";
+        src = self;
+        inherit buildInputs nativeBuildInputs;
+        configurePhase = ''
+          runHook preConfigure
+          ./configure --prefix=$out
+          runHook postConfigure
+        '';
+        buildPhase = "make -j $NIX_BUILD_CORES";
+        installPhase = "make install";
+      }; 
+
+  };
+}

gpac-2.2.1.tar.gz/gpac.spec -> gpac-2.4.0.tar.gz/gpac.spec Changed

gpac-2.2.1.tar.gz/include/gpac/00_doxy.h -> gpac-2.4.0.tar.gz/include/gpac/00_doxy.h Changed

gpac-2.2.1.tar.gz/include/gpac/Remotery.h -> gpac-2.4.0.tar.gz/include/gpac/Remotery.h Changed

gpac-2.2.1.tar.gz/include/gpac/bitstream.h -> gpac-2.4.0.tar.gz/include/gpac/bitstream.h Changed

gpac-2.2.1.tar.gz/include/gpac/color.h -> gpac-2.4.0.tar.gz/include/gpac/color.h Changed

gpac-2.2.1.tar.gz/include/gpac/configuration.h -> gpac-2.4.0.tar.gz/include/gpac/configuration.h Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2008-2022
+ *			Copyright (c) Telecom ParisTech 2008-2023
  *					All rights reserved
  *
  *  This file is part of GPAC
@@ -66,6 +66,9 @@
 #define GPAC_HAS_FFMPEG
 #define GPAC_HAS_DTAPI
 #define GPAC_HAS_HTTP2
+#define GPAC_HAS_LIBCAPTION
+#define GPAC_HAS_MPEGHDECODER
+#define GPAC_HAS_LIBCACA
 
 /*IPv6 enabled - for win32, this is evaluated at compile time, !! do not uncomment !!*/
 
@@ -127,6 +130,9 @@
 #define GPAC_HAS_JPEG
 #define GPAC_HAS_PNG
 #define GPAC_HAS_HTTP2
+#define GPAC_HAS_IFADDRS
+#define GPAC_HAS_LIBCAPTION
+#define GPAC_HAS_MPEGHDECODER
 
 /*Configuration for XCode OSX (not iOS) */
 #elif defined(GPAC_CONFIG_DARWIN) && !defined(GPAC_CONFIG_IOS)
@@ -137,6 +143,9 @@
 //#endif
 #define GPAC_HAS_SOCK_UN
 
+#define GPAC_HAS_FD
+#define GPAC_HAS_IFADDRS
+
 //64-bits OSX
 #ifdef __LP64__
 /*! macro defined for 64-bits platforms*/
@@ -151,9 +160,13 @@
 #define GPAC_HAS_VTB
 #define GPAC_HAS_HTTP2
 #define GPAC_HAS_POLL
+#define GPAC_HAS_LIBCACA
 
 #define GPAC_MEMORY_TRACKING
 
+#define GPAC_HAS_LIBCAPTION
+#define GPAC_HAS_MPEGHDECODER
+
 /*Configuration for XCode iOS*/
 #elif defined(GPAC_CONFIG_DARWIN) && defined(GPAC_CONFIG_IOS)
 
@@ -167,6 +180,7 @@
 #define GPAC_HAS_JPEG
 #define GPAC_HAS_PNG
 #define GPAC_HAS_SOCK_UN
+#define GPAC_HAS_IFADDRS
 
 /*don't use fixed-point version on iOS, not needed*/
 //#define GPAC_FIXED_POINT
@@ -191,6 +205,8 @@
 #define GPAC_HAS_VTB
 #define GPAC_HAS_HTTP2
 #define GPAC_HAS_POLL
+#define GPAC_HAS_LIBCAPTION
+#define GPAC_HAS_MPEGHDECODER
 
 /*Configuration for Symbian*/
 #elif defined(__SYMBIAN32__)
@@ -209,7 +225,7 @@
 
 
 /*disables player */
-//#define GPAC_DISABLE_PLAYER
+//#define GPAC_DISABLE_COMPOSITOR
 
 /*disables scene manager */
 //#define GPAC_DISABLE_SMGR
@@ -322,9 +338,6 @@
 /*disables IETF RTP/SDP/RTSP*/
 //#define GPAC_DISABLE_STREAMING
 
-/*disables dashclient */
-//#define GPAC_DISABLE_DASH_CLIENT
-
 /*disables Timed Text support */
 //#define GPAC_DISABLE_TTXT
 
@@ -337,16 +350,9 @@
 /*disables DASH MPD */
 //#define GPAC_DISABLE_MPD
 
-/*disables HEVC */
-//#define GPAC_DISABLE_HEVC
-
-/*disables AOM AV1 */
-//#define GPAC_DISABLE_AV1
-
 /*disables VOBSUB */
 //#define GPAC_DISABLE_VOBSUB
 
-
 /*! @} */
 
 #endif		/*_GF_CONFIG_H_*/

gpac-2.2.1.tar.gz/include/gpac/constants.h -> gpac-2.4.0.tar.gz/include/gpac/constants.h Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2022
+ *			Copyright (c) Telecom ParisTech 2000-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / exported constants
@@ -351,6 +351,15 @@
 */
 u32 gf_pixel_fmt_to_qt_type(GF_PixelFormat pixfmt);
 
+/*! gets uncC configuration (ISO 23001-17)  of pixel format. The configuration is made of the boxes uncC and cmpd in full mode, and uncC only in restricted mode
+\param pixfmt the desired pixel format
+\param profile_mode if 1, sets profile if known. If 2 and profile is known, use reduced version
+\param dsi set to the generated configuration, must be freed by user
+\param dsi_size set to the generated configuration size
+\return GF_TRU if success, GF_FALSE otherwise
+*/
+Bool gf_pixel_fmt_get_uncc(GF_PixelFormat pixfmt, u32 profile_mode, u8 **dsi, u32 *dsi_size);
+
 /*!
 \brief Codec IDs
 
@@ -446,6 +455,8 @@
 
 	/*! codecid for HEVC tiles */
 	GF_CODECID_HEVC_TILES = GF_4CC( 'h', 'v', 't', '1' ),
+	/*! codecid for explicitly loading HEVC merger , internal to gpac */
+	GF_CODECID_HEVC_MERGE = GF_4CC( 'h', 'v', 'c', 'm' ),
 
 	/*! codecid for EVRC Voice streams*/
 	GF_CODECID_EVRC	= GF_4CC('s','e','v','c'),
@@ -474,16 +485,18 @@
 	GF_CODECID_DRA = GF_4CC('d','r','a','1'),
 	/*! codecid for ITU G719 audio streams*/
 	GF_CODECID_G719 = GF_4CC('g','7','1','9'),
-	/*! codecid for DTS  Express low bit rate audio*/
-	GF_CODECID_DTS_LBR = GF_4CC('d','t','s','e'),
+	/*! codecid for DTS Express low bit rate audio*/
+	GF_CODECID_DTS_EXPRESS_LBR = GF_4CC('d','t','s','e'),
 	/*! codecid for DTS Coherent Acoustics audio streams*/
 	GF_CODECID_DTS_CA = GF_4CC('d','t','s','c'),
-	/*! codecid for DTS-HD High Resolution audio streams*/
-	GF_CODECID_DTS_HD_HR = GF_4CC('d','t','s','h'),
-	/*! codecid for DTS-HD Master audio streams*/
-	GF_CODECID_DTS_HD_MASTER = GF_4CC('d','t','s','l'),
-	/*! codecid for DTS-X Master audio streams*/
+	/*! codecid for DTS-HD High Resolution and Master audio streams*/
+	GF_CODECID_DTS_HD_HR_MASTER = GF_4CC('d','t','s','h'),
+	/*! codecid for DTS-HD Lossless (no core)*/
+	GF_CODECID_DTS_HD_LOSSLESS = GF_4CC('d','t','s','l'),
+	/*! codecid for DTS-X UHD Profile 2 audio streams*/
 	GF_CODECID_DTS_X = GF_4CC('d','t','s','x'),
+	/*! codecid for DTS-X UHD Profile 3 audio streams*/
+	GF_CODECID_DTS_Y = GF_4CC('d','t','s','y'),
 
 	/*! codecid for DVB EPG*/
 	GF_CODECID_DVB_EIT = GF_4CC('e','i','t',' '),
@@ -575,6 +588,8 @@
 	GF_CODECID_FLASH = GF_4CC( 'f', 'l', 's', 'h' ),
 	/*! codecid for RAW media streams. No decoder config associated (config through PID properties)*/
 	GF_CODECID_RAW = GF_4CC('R','A','W','M'),
+	/*! codecid for RAW media streams using UNCV  decoder config*/
+	GF_CODECID_RAW_UNCV = GF_4CC('U','N','C','V'),
 
 	GF_CODECID_AV1 = GF_4CC('A','V','1',' '),
 
@@ -835,12 +850,20 @@
 	GF_AUDIO_FMT_S16_BE,
 	/*! sample = signed integer, interleaved channels*/
 	GF_AUDIO_FMT_S32,
+	/*! sample = signed integer big-endian, interleaved channels*/
+	GF_AUDIO_FMT_S32_BE,
 	/*! sample = 1 float, interleaved channels*/
 	GF_AUDIO_FMT_FLT,
+	/*! sample = 1 float bytes in big endian, interleaved channels*/
+	GF_AUDIO_FMT_FLT_BE,
 	/*! sample = 1 double, interleaved channels*/
 	GF_AUDIO_FMT_DBL,
+	/*! sample = 1 double bytes in big-endian order, interleaved channels*/
+	GF_AUDIO_FMT_DBL_BE,
 	/*! sample = signed integer, interleaved channels*/
 	GF_AUDIO_FMT_S24,
+	/*! sample = signed integer gig-endian, interleaved channels*/
+	GF_AUDIO_FMT_S24_BE,
 	/*! not a format, indicates the value of last packed format*/
 	GF_AUDIO_FMT_LAST_PACKED,
 	/*! sample = unsigned byte, planar channels*/
@@ -887,7 +910,7 @@
 */
 const char *gf_audio_fmt_all_shortnames();
 
-/*! returns number of bots per sample for the given format
+/*! returns number of bits per sample for the given format
 \param afmt desired audio format
 \return bit depth of format
 */
@@ -978,6 +1001,24 @@
 \return CICP code point, or 0 if no more to enumerate*/
 u32 gf_audio_fmt_cicp_enum(u32 idx, const char **short_name, u64 *ch_mask);
 
+/*! get CICP code  from name
+\param name channel layout name
+\return channel CICP code
+*/
+u32 gf_audio_fmt_get_cicp_from_name(const char *name);
+
+/*! get CICP name from code
+\param cicp_code channel cicp code
+\return channel CICP name
+*/
+const char *gf_audio_fmt_get_cicp_name(u32 cicp_code);
+
+/*! get all CICP layout names
+\return CICP names separated with '|'
+*/
+const char *gf_audio_fmt_cicp_all_names();
+
+
 /*! Color primaries as defined by ISO/IEC 23001-8 / 23091-2
   */
 typedef enum
@@ -1673,6 +1714,9 @@
 	GF_PROJ360_MESH
 };
 
+/*! user data used by GPAC to store SRD info*/
+#define GF_ISOM_UDTA_GPAC_SRD	GF_4CC('G','S','R','D')
+
 /*! @} */
 
 #ifdef __cplusplus

gpac-2.2.1.tar.gz/include/gpac/crypt_tools.h -> gpac-2.4.0.tar.gz/include/gpac/crypt_tools.h Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2022
+ *			Copyright (c) Telecom ParisTech 2000-2024
  *					All rights reserved
  *
  *  This file is part of GPAC / Media Tools sub-project
@@ -113,6 +113,14 @@
 	u8 IV_size;
 	/*! constant IV size */
 	u8 constant_IV_size;
+
+
+	/*! DASH representation ID or NULL */
+	char *repID;
+	/*! DASH period ID or NULL */
+	char *periodID;
+	/*! DASH adaptationSet ID or NULL */
+	u32 ASID;
 } GF_CryptKeyInfo;
 
 /*! key roll modes*/
@@ -154,7 +162,7 @@
 		THIS IS DEPRECATED IN GPAC
 	*/
 	u32 ipmp_desc_id;
-	/*! type of box where sample auxiliary informations is saved, either "senc" or "PSEC" (PIFF)*/
+	/*! type of box where sample auxiliary information is saved, either "senc" or "PSEC" (PIFF)*/
 	u32 sai_saved_box_type;
 
 	/*! OMA encryption type: 0: none, 1: AES CBC, 2: AES CTR*/
@@ -183,7 +191,9 @@
 	u32 clear_bytes;
 
 	/*! CENS/CBCS pattern */
-	u8 crypt_byte_block, skip_byte_block;
+	u32 crypt_byte_block, skip_byte_block;
+	/*! forces a minimum clear range for subsamples (ignored otherwise) - the final offset is at least the slice header size*/
+	u32 crypt_byte_offset;
 
 	/* ! for avc1 ctr CENC edition 1 */
 	Bool allow_encrypted_slice_header;
@@ -232,7 +242,7 @@
 	GF_Err last_parse_error;
 } GF_CryptInfo;
 
-/*! loads a given crypto configuration file. Full doc is available at https://gpac.wp.imt.fr/mp4box/encryption/common-encryption/
+/*! loads a given crypto configuration file. Full doc is available at https://gpac.io/mp4box/encryption/common-encryption/
 \param file name of the crypt XML file
 \param out_err set to return error
 \return the crypt info

gpac-2.2.1.tar.gz/include/gpac/dash.h -> gpac-2.4.0.tar.gz/include/gpac/dash.h Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2012-2022
+ *			Copyright (c) Telecom ParisTech 2012-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / Adaptive HTTP Streaming sub-project
@@ -47,7 +47,7 @@
 #include <gpac/tools.h>
 #include <gpac/list.h>
 
-#ifndef GPAC_DISABLE_DASH_CLIENT
+#ifndef GPAC_DISABLE_DASHIN
 
 /*!
  * All the possible Mime-types for MPD files
@@ -149,6 +149,8 @@
 	u32 (*get_total_size)(GF_DASHFileIO *dashio, GF_DASHFileIOSession session);
 	/*! get the total size on bytes for the session*/
 	u32 (*get_bytes_done)(GF_DASHFileIO *dashio, GF_DASHFileIOSession session);
+	/*! get the status of the session - GF_OK for done, GF_NOT_READY for in progress, other error code indicate download error*/
+	GF_Err (*get_status)(GF_DASHFileIO *dashio, GF_DASHFileIOSession session);
 
 	/*! callback when manifest (DASH, HLS) or sub-playlist (HLS) is updated*/
 	void (*manifest_updated)(GF_DASHFileIO *dashio, const char *manifest_name, const char *local_path, s32 group_idx);
@@ -342,6 +344,12 @@
 */
 s32 gf_dash_group_get_id(GF_DashClient *dash, u32 group_idx);
 
+/*! gets cuirrent period ID
+\param dash the target dash client
+\return ID of the current period or NULL
+*/
+const char*gf_dash_get_period_id(GF_DashClient *dash);
+
 /*! enables group selection  through the group attribute
 \param dash the target dash client
 \param enable if GF_TRUE, group selection will be done whenever selecting a new group
@@ -1100,6 +1108,13 @@
 */
 Bool gf_dash_group_has_init_segment(GF_DashClient *dash, u32 group_idx);
 
+/*! get sample aspect ratio for video group
+\param dash the target dash client
+\param group_idx the 0-based index of the target group
+\param sar filled with representation SAR if any, set to 0 otherwise - may be NULL
+*/
+void gf_dash_group_get_sar(GF_DashClient *dash, u32 group_idx, GF_Fraction *sar);
+
 //any change to the structure below MUST be reflected in libgpac.py !!
 
 /*! Information passed to DASH custom algorithm*/
@@ -1127,7 +1142,7 @@
 	u32 buffer_occupancy_ms;
 	/*! degradation hint, 0 means no degradation, 100 means tile completely hidden*/
 	u32 quality_degradation_hint;
-	/*! cumulated download rate of all active groups - 0 means all files are local*/
+	/*! cumulated download rate of all active groups in bytes per seconds - 0 means all files are local*/
 	u32 total_rate;
 } GF_DASHCustomAlgoInfo;
 
@@ -1170,7 +1185,7 @@
 		gf_dash_download_monitor download_monitor_custom);
 
 
-#endif //GPAC_DISABLE_DASH_CLIENT
+#endif //GPAC_DISABLE_DASHIN
 
 /*!	@} */

gpac-2.2.1.tar.gz/include/gpac/download.h -> gpac-2.4.0.tar.gz/include/gpac/download.h Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2022
+ *			Copyright (c) Telecom ParisTech 2000-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / common tools sub-project
@@ -48,99 +48,11 @@
 #endif
 
 #include <gpac/tools.h>
-#include <gpac/config_file.h>
-#include <gpac/cache.h>
 
-/*!the download manager object. This is usually not used by GPAC modules*/
-typedef struct __gf_download_manager GF_DownloadManager;
+#ifdef GPAC_USE_DOWNLOADER
+
 /*!the download manager session.*/
 typedef struct __gf_download_session GF_DownloadSession;
-/*!the optional filter session.*/
-typedef struct __gf_filter_session GF_DownloadFilterSession;
-
-/*! URL information object*/
-typedef struct GF_URL_Info_Struct {
-	const char * protocol;
-	char * server_name;
-	char * remotePath;
-	char * canonicalRepresentation;
-	char * userName;
-	char * password;
-	u16 port;
-} GF_URL_Info;
-
-/*!
-Extracts the information from an URL. A call to gf_dm_url_info_init() must have been issue before calling this method.
-\param url The URL to fill
-\param info This structure will be initialized properly and filled with the data
-\param baseURL The baseURL to use if any (can be null)
-\return GF_OK if URL is well formed and supported by GPAC
- */
-GF_Err gf_dm_get_url_info(const char * url, GF_URL_Info * info, const char * baseURL);
-
-/**
-Inits the GF_URL_Info structure before it can be used
-\param info The structure to initialize
- */
-void gf_dm_url_info_init(GF_URL_Info * info);
-
-/*!
-Frees the inner structures of a GF_URL_Info_Struct
-\param info The info to free
- */
-void gf_dm_url_info_del(GF_URL_Info * info);
-
-/*!
-\brief download manager constructor
-
-Creates a new download manager object.
-\param fsess optional filter session. If not NULL, the filter session will be used for async downloads. Otherwise, threads will be created
-\return the download manager object
-*/
-GF_DownloadManager *gf_dm_new(GF_DownloadFilterSession *fsess);
-/*!
-\brief download manager destructor
-
-Deletes the download manager. All running sessions are aborted
-\param dm the download manager object
- */
-void gf_dm_del(GF_DownloadManager *dm);
-
-/*!
-\brief callback function for authentication
-
-This function is called back after user and password has been entered
-\param usr_cbk opaque user data passed by download manager
-\param usr_name the user name for the desired site, or NULL if the authentication was canceled
-\param password the password for the desired site and user, or NULL if the authentication was canceled
-\param store_info if TRUE, credentials will be stored in gpac config
-*/
-typedef void (*gf_dm_on_usr_pass)(void *usr_cbk, const char *usr_name, const char *password, Bool store_info);
-/*!
-\brief function for authentication
-
-The gf_dm_get_usr_pass type is the type for the callback of the \ref gf_dm_set_auth_callback function used for password retrieval
-
-\param usr_cbk opaque user data
-\param secure indicates if TLS is used
-\param site_url url of the site the user and password are requested for
-\param usr_name the user name for this site. The allocated space for this buffer is 50 bytes. \note this varaibale may already be formatted.
-\param password the password for this site and user. The allocated space for this buffer is 50 bytes.
-\param async_pass async function to call back when user and pass have been entered. If NULL, sync call will be performed
-\param async_udta async user data to pass back to the async function. If NULL, sync call will be performed
-\return GF_FALSE if user didn't fill in the information which will result in an authentication failure, GF_TRUE otherwise (info was filled if not async, or request was posted).
-*/
-typedef Bool (*gf_dm_get_usr_pass)(void *usr_cbk, Bool secure, const char *site_url, char *usr_name, char *password, gf_dm_on_usr_pass async_pass, void *async_udta);
-
-/*!
-\brief password retrieval assignment
-
-Assigns the callback function used for user password retrieval. If no such function is assigned to the download manager, all downloads requiring authentication will fail.
-\param dm the download manager object
-\param get_pass specifies \ref gf_dm_get_usr_pass callback function for user and password retrieval.
-\param usr_cbk opaque user data passed to callback function
- */
-void gf_dm_set_auth_callback(GF_DownloadManager *dm, gf_dm_get_usr_pass get_pass, void *usr_cbk);
 
 /*!downloader session message types*/
 typedef enum
@@ -188,7 +100,7 @@
 	GF_NETIO_SESSION_NOTIFY_DATA = 1<<2,
 	/*indicates that the connection to the server should be kept once the download is successfully completed*/
 	GF_NETIO_SESSION_PERSISTENT = 1<<3,
-	/*file is stored in memory, and the cache name is set to gpac://%u@%p, where %d is the size in bytes and %d is the the pointer to the memory.
+	/*file is stored in memory, and the cache name is set to gmem://%p, where %p is the blob object address.
 	Memory cached files are destroyed upon downloader destruction*/
 	GF_NETIO_SESSION_MEMORY_CACHE = 1<<4,
 	/*! do not delete files after download*/
@@ -238,6 +150,101 @@
 */
 typedef void (*gf_dm_user_io)(void *usr_cbk, GF_NETIO_Parameter *parameter);
 
+/*!the download manager object. This is usually not used by GPAC modules*/
+typedef struct __gf_download_manager GF_DownloadManager;
+/*!the optional filter session.*/
+typedef struct __gf_filter_session GF_DownloadFilterSession;
+
+
+#ifndef GPAC_DISABLE_NETWORK
+
+#include <gpac/config_file.h>
+#include <gpac/cache.h>
+
+/*! URL information object*/
+typedef struct GF_URL_Info_Struct {
+	const char * protocol;
+	char * server_name;
+	char * remotePath;
+	char * canonicalRepresentation;
+	char * userName;
+	char * password;
+	u16 port;
+} GF_URL_Info;
+
+/*!
+Extracts the information from an URL. A call to gf_dm_url_info_init() must have been issue before calling this method.
+\param url The URL to fill
+\param info This structure will be initialized properly and filled with the data
+\param baseURL The baseURL to use if any (can be null)
+\return GF_OK if URL is well formed and supported by GPAC
+ */
+GF_Err gf_dm_get_url_info(const char * url, GF_URL_Info * info, const char * baseURL);
+
+/**
+Inits the GF_URL_Info structure before it can be used
+\param info The structure to initialize
+ */
+void gf_dm_url_info_init(GF_URL_Info * info);
+
+/*!
+Frees the inner structures of a GF_URL_Info_Struct
+\param info The info to free
+ */
+void gf_dm_url_info_del(GF_URL_Info * info);
+
+/*!
+\brief download manager constructor
+
+Creates a new download manager object.
+\param fsess optional filter session. If not NULL, the filter session will be used for async downloads. Otherwise, threads will be created
+\return the download manager object
+*/
+GF_DownloadManager *gf_dm_new(GF_DownloadFilterSession *fsess);
+/*!
+\brief download manager destructor
+
+Deletes the download manager. All running sessions are aborted
+\param dm the download manager object
+ */
+void gf_dm_del(GF_DownloadManager *dm);
+
+/*!
+\brief callback function for authentication
+
+This function is called back after user and password has been entered
+\param usr_cbk opaque user data passed by download manager
+\param usr_name the user name for the desired site, or NULL if the authentication was canceled
+\param password the password for the desired site and user, or NULL if the authentication was canceled
+\param store_info if TRUE, credentials will be stored in gpac config
+*/
+typedef void (*gf_dm_on_usr_pass)(void *usr_cbk, const char *usr_name, const char *password, Bool store_info);
+/*!
+\brief function for authentication
+
+The gf_dm_get_usr_pass type is the type for the callback of the \ref gf_dm_set_auth_callback function used for password retrieval
+
+\param usr_cbk opaque user data
+\param secure indicates if TLS is used
+\param site_url url of the site the user and password are requested for
+\param usr_name the user name for this site. The allocated space for this buffer is 50 bytes. \note this varaibale may already be formatted.
+\param password the password for this site and user. The allocated space for this buffer is 50 bytes.
+\param async_pass async function to call back when user and pass have been entered. If NULL, sync call will be performed
+\param async_udta async user data to pass back to the async function. If NULL, sync call will be performed
+\return GF_FALSE if user didn't fill in the information which will result in an authentication failure, GF_TRUE otherwise (info was filled if not async, or request was posted).
+*/
+typedef Bool (*gf_dm_get_usr_pass)(void *usr_cbk, Bool secure, const char *site_url, char *usr_name, char *password, gf_dm_on_usr_pass async_pass, void *async_udta);
+
+/*!
+\brief password retrieval assignment
+
+Assigns the callback function used for user password retrieval. If no such function is assigned to the download manager, all downloads requiring authentication will fail.
+\param dm the download manager object
+\param get_pass specifies \ref gf_dm_get_usr_pass callback function for user and password retrieval.
+\param usr_cbk opaque user data passed to callback function
+ */
+void gf_dm_set_auth_callback(GF_DownloadManager *dm, gf_dm_get_usr_pass get_pass, void *usr_cbk);
+
 
 
 /*!
@@ -353,8 +360,9 @@
 Marks the cache file for this session to be deleted once the file is not used anymore by any session
 \param sess the download session
 \param url The URL associate to the cache entry to be deleted
+\param force if TRUE will remove the active cache entry regardless of the URL
  */
-void gf_dm_delete_cached_file_entry_session(const GF_DownloadSession * sess, const char * url);
+void gf_dm_delete_cached_file_entry_session(const GF_DownloadSession * sess, const char * url, Bool force);
 
 /*!
 \brief get statistics
@@ -462,6 +470,14 @@
 GF_Err gf_dm_sess_enum_headers(GF_DownloadSession *sess, u32 *idx, const char **hdr_name, const char **hdr_val);
 
 /*!
+\brief set netcap rule ID
+
+Sets ID of netcap rules for this session
+\param sess the current session
+\param netcap_id ID of netcap configuration to use, may be null (see gpac -h netcap)
+ */
+void gf_dm_sess_set_netcap_id(GF_DownloadSession *sess, const char *netcap_id);
+/*!
 \brief sets download manager max rate per session
 
 Sets the maximum rate (per session only at the current time).
@@ -616,17 +632,59 @@
  \param server_name sever name without protocol scheme - must not be NULL
  \param username user name, must not be NULL
  \param password user password, must not be NULL
- \param valid indicates if credentials are valid (successfull authentication)
+ \param valid indicates if credentials are valid (successful authentication)
  \return credential object or NULL if error
 */
 GF_UserCredentials * gf_user_credentials_register(GF_DownloadManager * dm, Bool secure, const char * server_name, const char * username, const char * password, Bool valid);
 
-/*! @} */
+
+//end GPAC_DISABLE_NETWORK
+#elif defined(GPAC_CONFIG_EMSCRIPTEN)
+
+GF_DownloadSession *gf_dm_sess_new(GF_DownloadManager *dm, const char *url, u32 dl_flags,
+                                   gf_dm_user_io user_io,
+                                   void *usr_cbk,
+                                   GF_Err *e);
+void gf_dm_sess_abort(GF_DownloadSession * sess);
+void gf_dm_sess_del(GF_DownloadSession *sess);
+const char *gf_dm_sess_get_cache_name(GF_DownloadSession *sess);
+void gf_dm_sess_force_memory_mode(GF_DownloadSession *sess, u32 force_keep);
+GF_Err gf_dm_sess_setup_from_url(GF_DownloadSession *sess, const char *url, Bool allow_direct_reuse);
+GF_Err gf_dm_sess_set_range(GF_DownloadSession *sess, u64 start_range, u64 end_range, Bool discontinue_cache);
+GF_Err gf_dm_sess_fetch_data(GF_DownloadSession *sess, char *buffer, u32 buffer_size, u32 *read_size);
+GF_Err gf_dm_sess_get_stats(GF_DownloadSession * sess, const char **server, const char **path, u64 *total_size, u64 *bytes_done, u32 *bytes_per_sec, GF_NetIOStatus *net_status);
+const char *gf_dm_sess_mime_type(GF_DownloadSession * sess);
+GF_Err gf_dm_sess_enum_headers(GF_DownloadSession *sess, u32 *idx, const char **hdr_name, const char **hdr_val);
+void gf_dm_delete_cached_file_entry_session(const GF_DownloadSession * sess, const char * url, Bool force);
+GF_Err gf_dm_sess_process_headers(GF_DownloadSession * sess);
+GF_Err gf_dm_sess_process(GF_DownloadSession *sess);
+const char *gf_dm_sess_get_resource_name(GF_DownloadSession *sess);
+const char *gf_dm_sess_get_header(GF_DownloadSession *sess, const char *name);
+u64 gf_dm_sess_get_utc_start(GF_DownloadSession *sess);
+u32 gf_dm_get_data_rate(GF_DownloadManager *dm);
+u32 gf_dm_get_global_rate(GF_DownloadManager *dm);
+void gf_dm_set_data_rate(GF_DownloadManager *dm, u32 rate_in_bits_per_sec);
+GF_DownloadManager *gf_dm_new(GF_DownloadFilterSession *fsess);
+void gf_dm_del(GF_DownloadManager *dm);
+void gf_dm_sess_set_netcap_id(GF_DownloadSession *sess, const char *netcap_id);
+
+
+#endif //GPAC_CONFIG_EMSCRIPTEN
+
+#else
+//! @cond Doxygen_Suppress
+typedef void GF_DownloadManager;
+typedef void GF_DownloadSession;
+//! @endcond
+#endif //GPAC_USE_DOWNLOADER
+
 
 #ifdef __cplusplus
 }
 #endif
 
+/*! @} */
+
 
 #endif		/*_GF_DOWNLOAD_H_*/

gpac-2.2.1.tar.gz/include/gpac/events.h -> gpac-2.4.0.tar.gz/include/gpac/events.h Changed

gpac-2.2.1.tar.gz/include/gpac/evg.h -> gpac-2.4.0.tar.gz/include/gpac/evg.h Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2022
+ *			Copyright (c) Telecom ParisTech 2000-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / Embedded Vector Graphics engine
@@ -35,6 +35,7 @@
 #include <gpac/module.h>
 #include <gpac/color.h>
 
+
 /*!
 \file "gpac/evg.h"
 \brief 2D vector graphics rasterizer
@@ -136,6 +137,8 @@
 	GF_RASTER_HIGH_QUALITY
 } GF_RasterQuality;
 
+#ifndef GPAC_DISABLE_EVG
+
 
 /*! common constructor for all stencil types
 \param type the stencil type
@@ -267,6 +270,13 @@
 */
 u8 gf_evg_stencil_get_alpha(GF_EVGStencil *stencil);
 
+/*! checks if pixel format is supported for a texture stencil
+\param pixelFormat the target pixel format
+\return GF_TRUE if supported, GF_FALSE otherwise
+*/
+Bool gf_evg_texture_format_ok(GF_PixelFormat pixelFormat);
+
+
 /*! sets pixel data for a texture stencil
 \param stencil the target stencil
 \param pixels texture data starting from top row
@@ -444,9 +454,15 @@
 */
 GF_Err gf_evg_surface_attach_to_texture(GF_EVGSurface *surf, GF_EVGStencil *sten);
 
+/*! checks if pixel format is supported for a surface
+\param pixelFormat the target pixel format
+\return GF_TRUE if supported, GF_FALSE otherwise
+*/
+Bool gf_evg_surface_format_ok(GF_PixelFormat pixelFormat);
+
 /*! attaches a surface object to a memory buffer
 \param surf the surface object
-\param pixels: texture data
+\param pixels texture data
 \param width texture width in pixels
 \param height texture height in pixels
 \param pitch_x texture horizontal pitch (bytes to skip to get to next pixel). O means linear frame buffer (eg pitch_x==bytes per pixel)
@@ -988,7 +1004,7 @@
  */
 GF_Err gf_evg_surface_write_depth(GF_EVGSurface *surf, Bool do_write);
 /*! sets  depth buffer
- The 3D rasterizer does not allocate any surface (depth or color buffers), it is the user responsability to set these buffers
+ The 3D rasterizer does not allocate any surface (depth or color buffers), it is the user responsibility to set these buffers
  \warning do NOT forget to resize your depth buffer when resizing the canvas !
 \note this is only used for 3D rasterizer, and fails 2D mode
 \param surf the target 3D surface
@@ -1096,6 +1112,8 @@
 
 /*! @} */
 
+#endif //GPAC_DISABLE_EVG
+
 #ifdef __cplusplus
 }
 #endif

gpac-2.2.1.tar.gz/include/gpac/filters.h -> gpac-2.4.0.tar.gz/include/gpac/filters.h Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2017-2022
+ *			Copyright (c) Telecom ParisTech 2017-2024
  *					All rights reserved
  *
  *  This file is part of GPAC / filters sub-project
@@ -203,33 +203,46 @@
 	GF_FS_SCHEDULER_DIRECT
 } GF_FilterSchedulerType;
 
-/*! Flag set to indicate meta filters should be loaded. A meta filter is a filter providing various sub-filters.
-The sub-filters are usually not exposed as filters, only the parent one is.
-When set, all sub-filters are exposed. This should only be set when inspecting filters help*/
-#define GF_FS_FLAG_LOAD_META	1<<1
-/*! Flag set to run session in non-blocking mode. Each call to \ref gf_fs_run will return as soon as there are no more pending tasks on the main thread */
-#define GF_FS_FLAG_NON_BLOCKING	1<<2
-/*! Flag set to disable internal caching of filter graph connections. If disabled, the graph will be recomputed at each link resolution (less memory occupancy but slower)*/
-#define GF_FS_FLAG_NO_GRAPH_CACHE	1<<3
-/*! Flag set to disable session regulation (no sleep)*/
-#define GF_FS_FLAG_NO_REGULATION	1<<4
-/*! Flag set to disable data probe*/
-#define GF_FS_FLAG_NO_PROBE	(1<<5)
-/*! Flag set to disable source reassignment (e.g. switching from fin to ffdmx) in PID resolution*/
-#define GF_FS_FLAG_NO_REASSIGN	(1<<6)
-/*! Flag set to print enabled/disabled edges for debug of PID resolution*/
-#define GF_FS_FLAG_PRINT_CONNECTIONS	(1<<7)
-/*! Flag set to disable argument checking*/
-#define GF_FS_FLAG_NO_ARG_CHECK	(1<<8)
-/*! Disables reservoir for packets and properties, uses much less memory but much more alloc/free*/
-#define GF_FS_FLAG_NO_RESERVOIR (1<<9)
-/*! Throws an error if any PID in the filter graph cannot be linked. The default behavior is to run the session even when some PIDs are not connected*/
-#define GF_FS_FLAG_FULL_LINK (1<<10)
-/*! Flag set to disable implicit linking
- By default the session runs in implicit linking when no link directives are set on any filter: linking aborts after the first successfull pid if destination is not a sink, or links only to sinks otherwise.
- \note This implies that the order in which filters are added to the session matters
-*/
-#define GF_FS_FLAG_NO_IMPLICIT	(1<<11)
+/*! Filter session flags */
+typedef enum
+{
+	/*! Flag set to indicate meta filters should be loaded. A meta filter is a filter providing various sub-filters.
+	The sub-filters are usually not exposed as filters, only the parent one is.
+	When set, all sub-filters are exposed. This should only be set when inspecting filters help*/
+	GF_FS_FLAG_LOAD_META = 1<<1,
+	/*! Flag set to run session in non-blocking mode. Each call to \ref gf_fs_run will return as soon as there are no more pending tasks on the main thread */
+	GF_FS_FLAG_NON_BLOCKING = 1<<2,
+	/*! Flag set to disable internal caching of filter graph connections. If disabled, the graph will be recomputed at each link resolution (less memory occupancy but slower)*/
+	GF_FS_FLAG_NO_GRAPH_CACHE = 1<<3,
+	/*! Flag set to disable session regulation (no sleep)*/
+	GF_FS_FLAG_NO_REGULATION = 1<<4,
+	/*! Flag set to disable data probe*/
+	GF_FS_FLAG_NO_PROBE = 1<<5,
+	/*! Flag set to disable source reassignment (e.g. switching from fin to ffdmx) in PID resolution*/
+	GF_FS_FLAG_NO_REASSIGN = 1<<6,
+	/*! Flag set to print enabled/disabled edges for debug of PID resolution*/
+	GF_FS_FLAG_PRINT_CONNECTIONS = 1<<7,
+	/*! Flag set to disable argument checking*/
+	GF_FS_FLAG_NO_ARG_CHECK = 1<<8,
+	/*! Disables reservoir for packets and properties, uses much less memory but much more alloc/free*/
+	GF_FS_FLAG_NO_RESERVOIR = 1<<9,
+	/*! Throws an error if any PID in the filter graph cannot be linked. The default behavior is to run the session even when some PIDs are not connected*/
+	GF_FS_FLAG_FULL_LINK = 1<<10,
+	/*! Flag set to disable implicit linking
+	 By default the session runs in implicit linking when no link directives are set on any filter: linking aborts after the first successful pid if destination is not a sink, or links only to sinks otherwise.
+	 \note This implies that the order in which filters are added to the session matters
+	*/
+	GF_FS_FLAG_NO_IMPLICIT = 1<<11,
+	/*! Flag set to force all filters to require a source ID (same as setting RSID option on all filters). This is typically used when the app sets links on all used filters while declaring more, unused filters.
+	*/
+	GF_FS_FLAG_REQUIRE_SOURCE_ID = 1<<12,
+	/*! Flag set to force all explicitly added filters to be loaded in deferred link state - linking will only happen once  \ref gf_filter_reconnect_output is called on the filter.
+	*/
+	GF_FS_FLAG_FORCE_DEFER_LINK = 1<<13,
+	/*! Flag set to ignore all PLAY events from sinks - use \ref gf_fs_send_deferred_play to start playback
+	*/
+	GF_FS_FLAG_PREVENT_PLAY = 1<<14
+} GF_FilterSessionFlags;
 
 /*! Creates a new filter session. This will also load all available filter registers not blacklisted.
 \param nb_threads number of extra threads to allocate. A negative value means all core used by session (eg nb_cores-1 extra threads)
@@ -238,22 +251,47 @@
 \param blacklist string containing comma-separated names of filters to disable. If first character is '-', this describes a whitelist, i.e. only filters listed in this string will be allowed
 \return the created filter session
 */
-GF_FilterSession *gf_fs_new(s32 nb_threads, GF_FilterSchedulerType type, u32 flags, const char *blacklist);
+GF_FilterSession *gf_fs_new(s32 nb_threads, GF_FilterSchedulerType type, GF_FilterSessionFlags flags, const char *blacklist);
 
 /*! Creates a new filter session, loading parameters from gpac config. This will also load all available filter registers not blacklisted.
 \param flags set of flags for the session. Only \ref GF_FS_FLAG_LOAD_META,  \ref GF_FS_FLAG_NON_BLOCKING , \ref GF_FS_FLAG_NO_GRAPH_CACHE and \ref GF_FS_FLAG_PRINT_CONNECTIONS are used, other flags are set from config file or command line
 \return the created filter session
 */
-GF_FilterSession *gf_fs_new_defaults(u32 flags);
+GF_FilterSession *gf_fs_new_defaults(GF_FilterSessionFlags flags);
 
 /*! Destructs the filter session
 \param session the filter session to destruct
 */
 void gf_fs_del(GF_FilterSession *session);
 /*! Loads a given filter by its register name. Filter are created using their register name, with options appended as a list of colon-separated Name=Value pairs.
-Value can be omitted for boolean, defaulting to true (eg :noedit). Using '!' before the name negates the result (eg :!moof_first).
+Value can be omitted for boolean, defaulting to true (eg :allt). Using '!' before the name negates the result (eg :!moof_first).
 Name can be omitted for enumerations (eg :disp=pbo is equivalent to :pbo), provided that filter developers pay attention to not reuse enum names in one filter.
 
+Options are either options for the target filter class, options to be inherited between the new filter and its implicit source(s) or implici destination(s), or generic filter options.
+
+Generic filter options are:
+- FID: filter identifier (string value)
+- SID: filter source(s) (string value)
+- N=NAME: filter name (string value)
+- FS: sub-session identifier (unsigned int value)
+- RSID: require sourceID to be present on target filters (no value)
+- TAG: filter tag (string value)
+- ITAG: filter inherited tag (string value)
+- FBT: buffer time in microseconds (unsigned int value)
+- FBU: buffer units (unsigned int value)
+- FBD: decode buffer time in microseconds (unsigned int value)
+- clone: explicitly enable/disable filter cloning flag (no value)
+- nomux: enable/disable direct file copy (no value)
+- gfreg: preferred filter registry names for link solving (string value)
+- gfloc: following options are local to filter declaration, not inherited (no value)
+- gfopt: following options are not tracked (no value)
+- gpac: argument separator for URLs (no value)
+- ccp: filter replacement control (string list value)
+- NCID: ID of netcap configuration to use (string)
+- DBG: debug missing input PID property (`=pid`), missing input packet property (`=pck`) or both (`=all`)
+- DL: enable defer linking of filter (no value) - the filter output pids will not be connected until a call to \ref gf_filter_reconnect_output
+
+
 \param session filter session
 \param name name and arguments of the filter register to instantiate.
 \param err_code set to error code if any - may be NULL. If initially set to GF_EOS, disables log messages.
@@ -344,7 +382,7 @@
 /*! Loads a source filter from a URL and arguments
 \param session filter session
 \param url URL of the source to load. Can be a local file name, a full path (/.., \\...) or a full URL with scheme (eg http://, tcp://)
-\param args arguments for the filter, see \ref gf_fs_load_filter
+\param args arguments for the filter, see \ref gf_fs_load_filter - the arguments can also be set in the url, typycally using `:gpac:` option delimiter
 \param parent_url parent URL of the source, or NULL if none
 \param err if not NULL, is set to error code if any
 \return the filter loaded or NULL if error
@@ -354,7 +392,7 @@
 /*! Loads a destination filter from a URL and arguments
 \param session filter session
 \param url URL of the source to load. Can be a local file name, a full path (/.., \\...) or a full URL with scheme (eg http://, tcp://)
-\param args arguments for the filter, see \ref gf_fs_load_filter
+\param args arguments for the filter, see \ref gf_fs_load_filter - the arguments can also be set in the url, typycally using `:gpac:` option delimiter
 \param parent_url parent URL of the source, or NULL if none
 \param err if not NULL, is set to error code if any
 \return the filter loaded or NULL if error
@@ -373,7 +411,7 @@
 */
 GF_Err gf_fs_get_last_process_error(GF_FilterSession *session);
 
-/*! Adds a user-defined register to the session
+/*! Adds a user-defined register to the session - the register is added regardless of the session blacklist
 \param session filter session
 \param freg filter register to add
 */
@@ -385,6 +423,11 @@
 */
 void gf_fs_remove_filter_register(GF_FilterSession *session, GF_FilterRegister *freg);
 
+/*! Sends PLAY event on all sinks, ignored if GF_FS_FLAG_PREVENT_PLAY flag is not set
+\param session filter session
+*/
+void gf_fs_send_deferred_play(GF_FilterSession *session);
+
 /*! Posts a user task to the session
 \param session filter session
 \param task_execute the callback function for the task. The callback can return:
@@ -475,7 +518,7 @@
 /*! Prints the list of arguments specified but not used by the filter session using \code LOG_APP@LOG_WARNING \endcode
  \note This is simply a wrapper to \ref gf_fs_enum_unmapped_options
 \param session filter session
-\param ignore_args ignore unused arguments if present in this comma-seperated list - may be NULL
+\param ignore_args ignore unused arguments if present in this comma-separated list - may be NULL
 */
 void gf_fs_print_unused_args(GF_FilterSession *session, const char *ignore_args);
 
@@ -732,6 +775,33 @@
  */
 GF_Err gf_fs_set_external_gl_provider(GF_FilterSession *session, gf_fs_gl_activate on_gl_activate, void *udta);
 
+/*! Flags for debug info*/
+typedef enum
+{
+	/*! print filter graph*/
+	GF_FS_DEBUG_GRAPH = 1,
+	/*! print filter stats*/
+	GF_FS_DEBUG_STATS = 1<<1,
+	/*! print tasks present in scheduler*/
+	GF_FS_DEBUG_TASKS = 1<<2,
+	/*! print filter status and task scheduled on filter*/
+	GF_FS_DEBUG_FILTERS = 1<<3,
+	/*! print all info*/
+	GF_FS_DEBUG_ALL = 0x00FFFFFF,
+	/*! enable continuous reporting*/
+	GF_FS_DEBUG_CONTINUOUS = 0x80000000,
+} GF_SessionDebugFlag;
+
+/*! prints session debug info on stderr
+
+ To turn on (resp.off) continous reporting, set (resp. unset) the flag GF_FS_DEBUG_CONTINUOUS. Continuous reporting is done in the main thread using the last flags provided
+
+\param session filter session
+\param dbg_flags set of flags indicating what to print
+ */
+void gf_fs_print_debug_info(GF_FilterSession *session, GF_SessionDebugFlag dbg_flags);
+
+
 /*! @} */
 
 
@@ -754,7 +824,7 @@
 typedef enum
 {
 	/*! not allowed*/
-	GF_PROP_FORBIDEN	=	0,
+	GF_PROP_FORBIDDEN	=	0,
 	/*! signed 32 bit integer*/
 	GF_PROP_SINT		=	1,
 	/*! unsigned 32 bit integer*/
@@ -831,6 +901,8 @@
 	GF_PROP_CICP_COL_TFC	=	GF_PROP_FIRST_ENUM+3,
 	/*! CICP Color Matrix*/
 	GF_PROP_CICP_COL_MX		=	GF_PROP_FIRST_ENUM+4,
+	/*! CICP Layout*/
+	GF_PROP_CICP_LAYOUT		=	GF_PROP_FIRST_ENUM+5,
 	/*! not allowed*/
 	GF_PROP_LAST_DEFINED
 } GF_PropType;
@@ -1032,6 +1104,7 @@
 	GF_PROP_PID_PROFILE_LEVEL = GF_4CC('P','R','P','L'),
 	GF_PROP_PID_DECODER_CONFIG = GF_4CC('D','C','F','G'),
 	GF_PROP_PID_DECODER_CONFIG_ENHANCEMENT = GF_4CC('E','C','F','G'),
+	GF_PROP_PID_DSI_SUPERSET = GF_4CC('D','C','F','S'),
 	GF_PROP_PID_CONFIG_IDX =  GF_4CC('I','C','F','G'),
 	GF_PROP_PID_SAMPLE_RATE = GF_4CC('A','U','S','R'),
 	GF_PROP_PID_SAMPLES_PER_FRAME = GF_4CC('F','R','M','S'),
@@ -1055,7 +1128,6 @@
 	GF_PROP_PID_FPS = GF_4CC('V','F','P','F'),
 	GF_PROP_PID_INTERLACED = GF_4CC('V','I','L','C'),
 	GF_PROP_PID_SAR = GF_4CC('P','S','A','R'),
-	GF_PROP_PID_PAR = GF_4CC('V','P','A','R'),
 	GF_PROP_PID_WIDTH_MAX = GF_4CC('M', 'W','I','D'),
 	GF_PROP_PID_HEIGHT_MAX = GF_4CC('M', 'H','E','I'),
 	GF_PROP_PID_ZORDER = GF_4CC('V', 'Z','I','X'),
@@ -1103,6 +1175,7 @@
 	GF_PROP_PID_HAS_SYNC = GF_4CC('P','S','Y','N'),
 	GF_PROP_SERVICE_WIDTH = GF_4CC('D','W','D','T'),
 	GF_PROP_SERVICE_HEIGHT = GF_4CC('D','H','G','T'),
+	GF_PROP_PID_IS_DEFAULT = GF_4CC('P','D','E','F'),
 	GF_PROP_PID_CAROUSEL_RATE = GF_4CC('C','A','R','A'),
 	GF_PROP_PID_AUDIO_VOLUME = GF_4CC('A','V','O','L'),
 	GF_PROP_PID_AUDIO_PAN = GF_4CC('A','P','A','N'),
@@ -1144,6 +1217,7 @@
 	GF_PROP_PCK_CUE_START = GF_4CC('P','C','U','S'),
 	GF_PROP_PCK_UTC_TIME = GF_4CC('U','T','C','D'),
 	GF_PROP_PCK_MEDIA_TIME = GF_4CC('M','T','I','M'),
+	GF_PROP_PCK_MPD_SEGSTART = GF_4CC('F','M','S','S'),
 
 	GF_PROP_PID_MAX_FRAME_SIZE = GF_4CC('M','F','R','S'),
 	GF_PROP_PID_AVG_FRAME_SIZE = GF_4CC('A','F','R','S'),
@@ -1153,6 +1227,8 @@
 	GF_PROP_PID_ISOM_TRACK_TEMPLATE = GF_4CC('I','T','K','T'),
 	GF_PROP_PID_ISOM_TREX_TEMPLATE = GF_4CC('I','T','X','T'),
 	GF_PROP_PID_ISOM_STSD_TEMPLATE = GF_4CC('I','S','T','D'),
+	GF_PROP_PID_ISOM_STSD_TEMPLATE_IDX = GF_4CC('I','S','T','I'),
+	GF_PROP_PID_ISOM_STSD_ALL_TEMPLATES = GF_4CC('I','S','T','A'),
 	GF_PROP_PID_ISOM_UDTA = GF_4CC('I','M','U','D'),
 	GF_PROP_PID_ISOM_HANDLER = GF_4CC('I','H','D','L'),
 	GF_PROP_PID_ISOM_TRACK_FLAGS = GF_4CC('I','T','K','F'),
@@ -1184,6 +1260,7 @@
 	GF_PROP_PID_CLAMP_DUR = GF_4CC('D','C','M','D'),
 	GF_PROP_PID_HLS_PLAYLIST = GF_4CC('H','L','V','P'),
 	GF_PROP_PID_HLS_GROUPID = GF_4CC('H','L','G','I'),
+	GF_PROP_PID_HLS_FORCE_INF = GF_4CC('H','L','F','I'),
 	GF_PROP_PID_HLS_EXT_MASTER = GF_4CC('H','L','M','X'),
 	GF_PROP_PID_HLS_EXT_VARIANT = GF_4CC('H','L','V','X'),
 	GF_PROP_PID_DASH_CUE = GF_4CC('D','C','U','E'),
@@ -1214,6 +1291,7 @@
 	GF_PROP_PID_MHA_COMPATIBLE_PROFILES = GF_4CC('M','H','C','P'),
 	GF_PROP_PCK_FRAG_START = GF_4CC('P','F','R','B'),
 	GF_PROP_PCK_FRAG_RANGE = GF_4CC('P','F','R','R'),
+	GF_PROP_PCK_FRAG_TFDT = GF_4CC('P','F','R','T'),
 	GF_PROP_PCK_SIDX_RANGE = GF_4CC('P','F','S','R'),
 	GF_PROP_PCK_MOOF_TEMPLATE = GF_4CC('M','F','T','P'),
 	GF_PROP_PCK_INIT = GF_4CC('P','C','K','I'),
@@ -1234,6 +1312,8 @@
 	GF_PROP_PID_CUBE_MAP_PAD = GF_4CC('P','C','M','P'),
 	GF_PROP_PID_EQR_CLAMP = GF_4CC('P','E','Q','C'),
 	GF_PROP_PID_SPARSE = GF_4CC('P','S','P','A'),
+	GF_PROP_PID_CHARSET = GF_4CC('P','C','H','S'),
+	GF_PROP_PID_FORCED_SUB = GF_4CC('P','F','C','S'),
 
 	GF_PROP_PID_SCENE_NODE = GF_4CC('P','S','N','D'),
 	GF_PROP_PID_ORIG_CRYPT_SCHEME = GF_4CC('P','O','C','S'),
@@ -1241,6 +1321,13 @@
 
 	GF_PROP_PID_CHAP_TIMES = GF_4CC('C','H','P','T'),
 	GF_PROP_PID_CHAP_NAMES = GF_4CC('C','H','P','N'),
+	GF_PROP_PID_IS_CHAP = GF_4CC('P','C','H','P'),
+	//internal prop indicating the (main) streamtype of a PID before mux, only used for route setup
+	GF_PROP_PID_PREMUX_STREAM_TYPE = GF_4CC('P','P','S','T'),
+
+	GF_PROP_PID_CODEC_MERGEABLE = GF_4CC('P','C','M','B'),
+	GF_PROP_PID_FILE_REL = GF_4CC('F','N','R','L'),
+
 
 	//internal for HLS playlist reference, gives a unique ID identifying media mux, and indicated in packets carrying child playlists
 	GF_PROP_PCK_HLS_REF = GF_4CC('H','P','L','R'),
@@ -1261,16 +1348,20 @@
 	GF_PROP_PID_CLEARKEY_URI = GF_4CC('C','C','K','U'),
 	//internal
 	GF_PROP_PID_CLEARKEY_KID = GF_4CC('C','C','K','I'),
-
+	//internal, indicate DASH segments are generated in sparse mode (from context)
+	GF_PROP_PID_DASH_SPARSE = GF_4CC('D','S','S','G'),
+	//internal, indicate DASH dependency group
+	GF_PROP_PID_DASH_DEP_GROUP = GF_4CC('D','G','D','I'),
 
 	//internal property indicating pointer to associated GF_DownloadSession
 	GF_PROP_PID_DOWNLOAD_SESSION = GF_4CC('G','H','T','T'),
 
 	//PID has temi information
 	GF_PROP_PID_HAS_TEMI = GF_4CC('P','T','E','M'),
-	//PID has no init segment associated (file foward mode of dasher)
+	//PID has no init segment associated (file forward mode of dasher)
 	GF_PROP_PID_NO_INIT = GF_4CC('P','N','I','N'),
 
+	//PID carries a manifest
 	GF_PROP_PID_IS_MANIFEST = GF_4CC('P','H','S','M'),
 
 	GF_PROP_PCK_XPS_MASK = GF_4CC('P','X','P','M'),
@@ -1279,6 +1370,9 @@
 	//internal, force creation of rewriter filter (only used for forcing reparse of NALU-based codecs)
 	GF_PROP_PID_FORCE_UNFRAME = GF_4CC('P','F','U','F'),
 
+	GF_PROP_PCK_SPLIT_START = GF_4CC('P','S','P','S'),
+	GF_PROP_PCK_SPLIT_END = GF_4CC('P','S','P','E'),
+
 
 	/*! Internal property used for meta demuxers ( FFMPEG, ...) codec ID
 
@@ -1343,9 +1437,9 @@
 */
 const char *gf_props_get_type_desc(GF_PropType type);
 
-/*! Gets the description type for a given  property type name
+/*! Gets the description type for a given property type name
 \param name property type name
-\return property type or GF_PROP_FORBIDEN
+\return property type or GF_PROP_FORBIDDEN
 */
 GF_PropType gf_props_parse_type(const char *name);
 
@@ -1371,7 +1465,7 @@
 
 /*! Get the possible names of an enum type property
 \param type  property type
-\return comma-seperated list of possible values
+\return comma-separated list of possible values
 */
 const char *gf_props_enum_all_names(u32 type);
 
@@ -1404,16 +1498,18 @@
 	GF_PROP_DUMP_DATA_INFO,
 	/*! dump data to parsable property, as ADDRESS+'@'+POINTER*/
 	GF_PROP_DUMP_DATA_PTR,
+	/*! do not reduce fractions when dumping*/
+	GF_PROP_DUMP_NO_REDUCE = 1<<16,
 } GF_PropDumpDataMode;
 
 /*! Dumps a property value to string
 \param att property value
 \param dump buffer holding the resulting value for types requiring string conversions (integers, ...)
-\param dump_data_mode data dump mode
+\param dump_data_flags data dump mode and flags
 \param min_max_enum optional, gives the min/max or enum string when the property is a filter argument
 \return string
 */
-const char *gf_props_dump_val(const GF_PropertyValue *att, char dumpGF_PROP_DUMP_ARG_SIZE, GF_PropDumpDataMode dump_data_mode, const char *min_max_enum);
+const char *gf_props_dump_val(const GF_PropertyValue *att, char dumpGF_PROP_DUMP_ARG_SIZE, GF_PropDumpDataMode dump_data_flags, const char *min_max_enum);
 
 /*! Dumps a property value to string, resolving any built-in types (pix formats, codec id, ...)
 \param p4cc property 4CC
@@ -1440,8 +1536,10 @@
 	u32 type;
 	/*! name */
 	const char *name;
+#ifndef GPAC_DISABLE_DOC
 	/*! description */
 	const char *description;
+#endif
 	/*! data type  (uint, float, etc ..) */
 	u8 data_type;
 	/*! flags for the property */
@@ -1535,7 +1633,7 @@
 \ingroup filters_grp
 \brief Filter Events
 
-PIDs may receive commands and may emit messages using this system.
+PIDs may receive commands and may emit messages using an event system.
 
 Events may flow downwards (towards the source), in which case they are commands, or upwards (towards the sink), in which case they are informative event.
 
@@ -1553,6 +1651,19 @@
 
 GF_FEVT_STOP and GF_FEVT_SOURCE_SEEK events are filtered to reset the PID buffers.
 
+The following events may be used globally on a filter, e.g. without a  PID associated to the event:
+
+GF_FEVT_FILE_DELETE: used for source and sinks, indicata a file deletion
+
+GF_FEVT_SOURCE_SWITCH: used for source filters only, indicate URL switching
+
+GF_FEVT_QUALITY_SWITCH: globally change quality of of the filters for all pids (typically used in scalable contexts)
+
+GF_FEVT_USER:
+
+The filter session does not maintain a notion of paused or resume streams, it is up to the consummer to stop processing the data wgile paused.
+The GF_FEVT_PAUSE and GF_FEVT_RESUME events are only used to trigger pause and resume on interactive channels such as an RTSP session, i.e. to tell the remote peer to stop and resume.
+
 @{
  */
 
@@ -1569,7 +1680,7 @@
 	GF_FEVT_PAUSE,
 	/*! PID resume, usually triggered by sink - see \ref GF_FilterPidPlaybackMode*/
 	GF_FEVT_RESUME,
-	/*! PID source seek, allows seeking in bytes the source*/
+	/*! PID byte-seek of source, allows seeking in bytes the source - typically used by demuxer to convert time ranges to byte ranges*/
 	GF_FEVT_SOURCE_SEEK,
 	/*! PID source switch, allows a source filter to switch its source URL for the same protocol*/
 	GF_FEVT_SOURCE_SWITCH,
@@ -1588,7 +1699,7 @@
 	/*! buffer requirement event. This event is NOT sent to filters, it is internaly processed by the filter session. Filters may however send this
 	event to indicate their buffereing preference (real-time sinks mostly)*/
 	GF_FEVT_BUFFER_REQ,
-	/*! filter session capability change, sent whenever global capabilities (max width, max heoght, ... ) are changed*/
+	/*! filter session capability change, sent whenever global capabilities (max width, max height, ... ) are changed*/
 	GF_FEVT_CAPS_CHANGE,
 	/*! inidicates the PID could not be connected - the PID passed is an output PID of the filter, no specific event structure is associated*/
 	GF_FEVT_CONNECT_FAIL,
@@ -1637,7 +1748,7 @@
 	/*! params for GF_FEVT_PLAY and GF_FEVT_SET_SPEED*/
 	Double speed;
 
-	/*! GF_FEVT_PLAY only, indicates playback should start from given packet number - used by dasher when reloading sources*/
+	/*! GF_FEVT_PLAY only, indicates playback should start from given packet number - used by dasher and GHI when reloading sources*/
 	u32 from_pck;
 
 	/*! GF_FEVT_PLAY only, set when PLAY event is sent upstream to audio out, indicates HW buffer reset*/
@@ -1666,6 +1777,18 @@
 	/*! GF_FEVT_PLAY only, indicates  that a demuxer must not forward this event as a source seek because seek has already been done
 	(typically this play request is a segment play and byte range access within the file has already been performed by DASH client)*/
 	u8 no_byterange_forward;
+
+	/*! GF_FEVT_PLAY only, indicates playback should stop from given packet number - used by GHI when loading sources*/
+	u32 to_pck;
+	/*! GF_FEVT_PLAY only, indicates orginal delay applied to dts - used by GHI when loading sources*/
+	u32 orig_delay;
+	/*! GF_FEVT_PLAY only, hint DTS of first sample at ot just after start offset, in media timescale*/
+	u64 hint_first_dts;
+	/*! GF_FEVT_PLAY only, start offset in source - used by GHI when loading sources*/
+	u64 hint_start_offset;
+	/*! GF_FEVT_PLAY only, end offset in source - used by GHI when loading sources*/
+	u64 hint_end_offset;
+
 } GF_FEVT_Play;
 
 /*! Event structure for GF_FEVT_SOURCE_SEEK and GF_FEVT_SOURCE_SWITCH*/
@@ -1804,7 +1927,8 @@
 
 	/*! duration of intra (IDR, closed GOP) as expected by the dasher */
 	GF_Fraction intra_period;
-
+	/*! if TRUE codec should only generate DSI (possibly no input frame, and all output packets will be discarded) */
+	Bool gen_dsi_only;
 } GF_FEVT_EncodeHints;
 
 
@@ -1903,6 +2027,8 @@
 		The filter should lock itself whenever appropriate using \ref gf_filter_lock
 	*/
 	GF_FS_ARG_UPDATE_SYNC = 1<<8,
+	/*! internal flag used by meta filters (ffmpeg & co) to indicate the argument is an array of the indicated type*/
+	GF_FS_ARG_META_ARRAY = 1<<9,
 } GF_FSArgumentFlags;
 
 /*! Structure holding arguments for a filter*/
@@ -1991,7 +2117,7 @@
 	GF_CAPFLAG_EXCLUDED = 1<<3,
 	/*! when set, the capability is validated only for filter loaded for this destination filter*/
 	GF_CAPFLAG_LOADED_FILTER = 1<<4,
-	/*! Only used for output capabilities, indicates that this capability applies to all bundles. This avoids repeating capabilities common to all bundles by setting them only in the first*/
+	/*! indicates that this capability (input or output) applies to all following bundles. This avoids repeating capabilities common to all bundles by setting them only in the first*/
 	GF_CAPFLAG_STATIC = 1<<5,
 	/*! Only used for input capabilities, indicates that this capability is optional in the input PID */
 	GF_CAPFLAG_OPTIONAL = 1<<6,
@@ -2088,7 +2214,7 @@
 
 
 
-/*! Lock global filter session. This is needed when assigning source IDs after a connect  source or destination to the loaded source to connect in an async way
+/*! Lock global filter session. This is needed when assigning source IDs after a connect source or destination to the loaded source to connect in an async way
 \param filter target filter
 \param do_lock if GF_TRUE, locks the filter session global mutex, otherwise unlocks it
 */
@@ -2099,7 +2225,7 @@
  This is used by filters loading subchains to enforce that filters from these subchain only connect to each other or the target filter but not other filters outside this chain.
  Filters using this function must setup source IDs on filters of the sunchain(s) they load.
 
- Noye: This has the same effect has setting `:RSID` option on the filter
+ Note: This has the same effect as setting the `:RSID` option on the filter
 
 \param filter target filter
 */
@@ -2124,7 +2250,8 @@
 	/*! (de)mux format is not supported*/
 	GF_FPROBE_NOT_SUPPORTED = 0,
 	/*!
-		For demux only: format is maybe a match but garbage data was found at the start
+		For demux: format is maybe a match but garbage data was found at the start
+		For mux: protocol is supported but format is not - if :ext=foo is set on sink URL, probe_url will be recall with URL=test.foo
 	*/
 	GF_FPROBE_MAYBE_NOT_SUPPORTED,
 	/*!
@@ -2198,8 +2325,18 @@
 	GF_FS_REG_FORCE_REMUX = 1<<12,
 	/*! Indicates the filter must always be run by the same thread, except for the initialize and finalize methods*/
 	GF_FS_REG_SINGLE_THREAD = 1<<13,
-	/*! Indicates the filter needs to be initialized even if temoorary - see \ref gf_filter_is_temporary. Always enabled if GF_FS_REG_META is set */
+	/*! Indicates the filter needs to be initialized even if temporary - see \ref gf_filter_is_temporary. Always enabled if GF_FS_REG_META is set */
 	GF_FS_REG_TEMP_INIT = 1<<14,
+	/*! Indicates the filter uses libc sync file read - only needed for emscripten multithreaded support for now, translated into GF_FS_REG_MAIN_THREAD */
+	GF_FS_REG_USE_SYNC_READ = 1<<15,
+	/*! Indicates the filter may block the main thread (configure, process) - only needed for emscripten multithreaded support*/
+	GF_FS_REG_BLOCK_MAIN = 1<<16,
+	/*! Indicates the filter uses async tools (JS promises & co) blocking the calling thread until resolved - only needed for emscripten multithreaded support*/
+	GF_FS_REG_ASYNC_BLOCK = 1<<17,
+	/*! Indicates a dynamic instance of the filter can be reused in resolver even if the source PID already has a possible link to an explicit non-sink filter
+		This is typically required by PID merger filters allowing implicit loading (tileagg, hevcmerge, etc)
+	*/
+	GF_FS_REG_DYNAMIC_REUSE = 1<<18,
 
 
 	/*! flag dynamically set at runtime for custom filters*/
@@ -2270,14 +2407,14 @@
 	*/
 	GF_Err (*initialize)(GF_Filter *filter);
 
-	/*! optional - callback for filter desctruction -  private stack of filter is freed by framework
+	/*! optional - callback for filter destruction -  private stack of filter is freed by framework
 	\param filter the target filter
 	*/
 	void (*finalize)(GF_Filter *filter);
 
 	/*! optional - callback for arguments update. If GF_OK is returned, the filter private stack is updated accordingly.
 	If function is NULL, all updatable arguments will be changed in the filter private stack without the filter being notified.
-	If argument is a meta argument, it is the filter responsability to handle the update, as meta arguments do not live on the filter private stack.
+	If argument is a meta argument, it is the filter responsibility to handle the update, as meta arguments do not live on the filter private stack.
 	If the filter is a meta filter and argument is not declared in the argument list, the function is always called.
 
 	\param filter the target filter
@@ -2287,8 +2424,8 @@
 	*/
 	GF_Err (*update_arg)(GF_Filter *filter, const char *arg_name, const GF_PropertyValue *new_val);
 
-	/*! optional - process a given event. Retruns TRUE if the event has to be canceled, FALSE otherwise
-		- If a downstream (towards source)  event is not canceled, it will be forwarded to each input PID of the filter.
+	/*! optional - process a given event. Returns TRUE if the event has to be canceled, FALSE otherwise
+		- If a downstream (towards source) event is not canceled, it will be forwarded to each input PID of the filter.
 		- If you need to forward the event only to one input pid, send a copy of the event to the desired input and cancel the event.
 	\param filter the target filter
 	\param evt the event to process
@@ -2296,7 +2433,7 @@
 	*/
 	Bool (*process_event)(GF_Filter *filter, const GF_FilterEvent *evt);
 
-	/*! optional - Called whenever an output PID needs format renegotiaition. If not set, a filter chain will be loaded to solve the negotiation
+	/*! optional - Called whenever an output PID needs format renegotiation. If not set, a filter chain will be loaded to solve the negotiation
 
 	\param filter the target filter
 	\param PID the filter output PID being reconfigured
@@ -2788,7 +2925,7 @@
 
 If the propentry pointer references a non-null value, this value will be released using \ref gf_filter_release_property,
 so make sure to initialize the pointer to a NULL value on the first call.
-This avoid calling  \ref gf_filter_release_property after each get_info in the calling code:
+This avoids calling  \ref gf_filter_release_property after each get_info in the calling code:
 
 \code{.c}
 GF_PropertyEntry *pe=NULL;
@@ -3116,9 +3253,10 @@
 \param filter target filter
 \param data buffer to probe
 \param size size of buffer
+\param score ste to the probing score, may be NULL
 \return the mime type probed, or NULL if not recognized
 */
-const char *gf_filter_probe_data(GF_Filter *filter, u8 *data, u32 size);
+const char *gf_filter_probe_data(GF_Filter *filter, u8 *data, u32 size, GF_FilterProbeScore *score);
 
 /*! checks if the given filter is an alias filter created by a multiple sink filter
 \param filter target filter
@@ -3161,6 +3299,23 @@
 Bool gf_filter_relocate_url(GF_Filter *filter, const char *service_url, const char *parent_url, char *out_relocated_url, char *out_localized_url);
 
 
+/*! Probes for link resolution towards a given filter description
+\param filter target filter
+\param opid_idx output pid index of target filter
+\param fname textual description of filter - If a source is used, returns an error. Destination can be identified using dst=URL pattern
+\param result_chain resulting chain as comma-separated list, or NULL if error. MUST be freed by caller
+\return error if any
+*/
+GF_Err gf_filter_probe_link(GF_Filter *filter, u32 opid_idx, const char *fname, char **result_chain);
+
+/*! Gets list of possible destinations for this filter
+\param filter target filter
+\param opid_idx output pid index of target filter. If negative, will check destinations for any of the output pids
+\param result_list resulting list as comma-separated list, or NULL if error. MUST be freed by caller
+\return error if any
+*/
+GF_Err gf_filter_get_possible_destinations(GF_Filter *filter, s32 opid_idx, char **result_list);
+
 /*! Returns the register of a given filter
 \param filter target filter
 \return the register object, or NULL if error
@@ -3202,12 +3357,14 @@
 If filters do not have the same subsession ID, they cannot link to each
 If filters do not have the same sourceID, they cannot link to each other except if destination is a sink
 
+Function does nothing if the filter is allready assigned to a subsession
+
 \note In non-implicit mode, subsession tagging must be done through filter option :FS=
 
 \param filter target filter
 \param subsession_id subsession identifier
 \param source_id subsession identifier
-\return error if any
+\return error if any, GF_OK or the value of the already assigned subsession ID
 */
 GF_Err gf_filter_tag_subsession(GF_Filter *filter, u32 subsession_id, u32 source_id);
 
@@ -3217,6 +3374,12 @@
 */
 Bool gf_filter_has_connect_errors(GF_Filter *filter);
 
+/*! Get ID of netcap configuration associated with filter, if any
+\param filter target filter
+\return netcap ID if set, NULL otherwise
+*/
+const char *gf_filter_get_netcap_id(GF_Filter *filter);
+
 
 /*! Sets names of sub-instances involved in a meta-filter instance
 \param filter target filter
@@ -3230,6 +3393,14 @@
 */
 const char *gf_filter_meta_get_instances(GF_Filter *filter);
 
+
+/*! Locates start of gpac option separator in a url path
+\param filter target filter
+\param path path to analyze
+\return NULL or first option found (including option separator)
+*/
+const char *gf_filter_path_escape_colon(GF_Filter *filter, const char *path);
+
 /*! @} */
 
 
@@ -3467,33 +3638,33 @@
 
 
 /*! Negotiate a given property on an input PID for built-in properties
-Filters may accept some PID connection but may need an adaptaion chain to be able to process packets, eg change pixel format or sample rate
+Filters may accept some PID connection but may need an adaptation chain to be able to process packets, eg change pixel format or sample rate
 This function will trigger a reconfiguration of the filter chain to try to adapt this. If failing, the filter chain will disconnect
-This process is asynchronous, the filter asking for a PID negociation will see the notification through a pid_reconfigure if success.
+This process is asynchronous, the filter asking for a PID negotiation will see the notification through a pid_reconfigure if success.
 \param PID the target filter PID - this MUST be an input PID
 \param prop_4cc the built-in property code to negotiate
 \param value the new value to negotiate, SHALL NOT be NULL
 \return error code if any
 */
-GF_Err gf_filter_pid_negociate_property(GF_FilterPid *PID, u32 prop_4cc, const GF_PropertyValue *value);
+GF_Err gf_filter_pid_negotiate_property(GF_FilterPid *PID, u32 prop_4cc, const GF_PropertyValue *value);
 
 /*! Negotiate a given property on an input PID for regular properties
-see \ref gf_filter_pid_negociate_property
+see \ref gf_filter_pid_negotiate_property
 \param PID the target filter PID - this MUST be an input PID
 \param name name of the property to negotiate
 \param value the new value to negotiate, SHALL NOT be NULL
 \return error code if any
 */
-GF_Err gf_filter_pid_negociate_property_str(GF_FilterPid *PID, const char *name, const GF_PropertyValue *value);
+GF_Err gf_filter_pid_negotiate_property_str(GF_FilterPid *PID, const char *name, const GF_PropertyValue *value);
 
 /*! Negotiate a given property on an input PID for regular properties
-see \ref gf_filter_pid_negociate_property
+see \ref gf_filter_pid_negotiate_property
 \param PID the target filter PID - this MUST be an input PID
 \param name the name of the property to modify. The name will be copied to the property, and memory destruction performed by the filter session
 \param value the new value to negotiate, SHALL NOT be NULL
 \return error code if any
 */
-GF_Err gf_filter_pid_negociate_property_dyn(GF_FilterPid *PID, char *name, const GF_PropertyValue *value);
+GF_Err gf_filter_pid_negotiate_property_dyn(GF_FilterPid *PID, char *name, const GF_PropertyValue *value);
 
 /*! Queries a negotiated built-in capability on an output PID
 Filters may check if a property negotiation was done on an output PID, and check the property value.
@@ -3502,14 +3673,14 @@
 
 \param PID the target filter PID
 \param prop_4cc the built-in property code to negotiate
-\return the negociated property value
+\return the negotiated property value
 */
 const GF_PropertyValue *gf_filter_pid_caps_query(GF_FilterPid *PID, u32 prop_4cc);
 
 /*! Queries a negotiated capability on an output PID - see \ref gf_filter_pid_caps_query
 \param PID the target filter PID
 \param prop_name the property name to negotiate
-\return the negociated property value
+\return the negotiated property value
 */
 const GF_PropertyValue *gf_filter_pid_caps_query_str(GF_FilterPid *PID, const char *prop_name);
 
@@ -3565,6 +3736,13 @@
 	/*! loss rate in per-thousand - input pid only */
 	u32 loss_rate;
 
+	/*! timestamp and timescale of last packet droped
+		- For input PID, set to last packet dropped
+		- For output PID, set to maximum TS value of last packet dropped on all PID destinations
+	*/
+	GF_Fraction64 last_ts_drop;
+	/*! timestamp and timescale of last packet send on PID (for output PID) or on parent PID (for input PID)	*/
+	GF_Fraction64 last_ts_sent;
 } GF_FilterPidStatistics;
 
 /*! Direction for stats querying*/
@@ -3707,6 +3885,12 @@
 */
 void gf_filter_pid_set_eos(GF_FilterPid *PID);
 
+/*! Signals end of stream on a PID but force stream to be kept alive - used by source filters triggering a pipeline flush, the source filter will remain active after this call
+ The flush signal sets all receiving PIDs into end of stream mode
+\param PID the target filter PID
+*/
+void gf_filter_pid_send_flush(GF_FilterPid *PID);
+
 /*! Checks for end of stream has been signaled a PID input chain.
 This is a recursive call on input chain. The function is typically used to abort buffering or synchronisation init in muxers.
 \param PID the target filter PID
@@ -3726,6 +3910,14 @@
 */
 Bool gf_filter_pid_is_eos(GF_FilterPid *PID);
 
+/*! Checks for flush-only end of stream signaling on a PID. Some filters may request a flush of the pipeline but will send further packets later on. This is signaled by a flush end of stream state
+ Only filters storing the state of the pids internally should need to check this state.
+
+\param PID the target filter PID
+\return GF_TRUE if end of stream is temporary set on that PID (no more packet in queue)
+*/
+Bool gf_filter_pid_is_flush_eos(GF_FilterPid *PID);
+
 /*! Checks if there is a packet ready on an input PID.
 \param PID the target filter PID
 \return GF_TRUE if no packet in buffers
@@ -3745,6 +3937,11 @@
 The returned packet is only valid for the current filter execution (process callback, task, ...), and may be discarded in-between calls, typically when the session is aborted.
 If a filter needs to keep a packet across calls, it must use \ref gf_filter_pck_ref and \ref gf_filter_pck_unref
 
+If no packet is returned, the pid may be empty, in end of stream (cf \ref gf_filter_pid_is_eos) or in flush (cf \ref gf_filter_pid_is_flush_eos).
+
+The first time this function is called on a PID at a flush point, it will return NULL even if some packets are pending. This allows the calling filter to detect if a flush point is reached and take appropriate actions.
+Subsequent calls will return the pending packet if any.
+
 \param PID the target filter PID
 \return packet or NULL of empty or reconfigure error
 */
@@ -3828,7 +4025,7 @@
 - num: replaced by file_number (usually matches GF_PROP_PCK_FILENUM, but this property is not used in the solving mechanism)
 - PID: ID of the source PID
 - URL: URL of source file
-- File: path on disk for source file
+- File: path on disk for source file - if resolved value contains a URL scheme (e.g. foo://), it is ignored
 - p4cc=ABCD: uses PID property with 4CC ABCD
 - pname=VAL: uses PID property with name VAL (either built-in prop name or other peroperty name)
 
@@ -3839,7 +4036,7 @@
 \param file_suffix if not null, will be appended after the value of the §File$ keyword if present
 \return error if any
 */
-GF_Err gf_filter_pid_resolve_file_template(GF_FilterPid *PID, char szTemplateGF_MAX_PATH, char szFinalNameGF_MAX_PATH, u32 file_number, const char *file_suffix);
+GF_Err gf_filter_pid_resolve_file_template(GF_FilterPid *PID, const char szTemplateGF_MAX_PATH, char szFinalNameGF_MAX_PATH, u32 file_number, const char *file_suffix);
 
 
 /*! Same as \ref  gf_filter_pid_resolve_file_template but overrides file name with given name
@@ -3851,7 +4048,7 @@
 \param file_name if not null, will be used instead of PID URL or local path
 \return error if any
 */
-GF_Err gf_filter_pid_resolve_file_template_ex(GF_FilterPid *PID, char szTemplateGF_MAX_PATH, char szFinalNameGF_MAX_PATH, u32 file_number, const char *file_suffix, const char *file_name);
+GF_Err gf_filter_pid_resolve_file_template_ex(GF_FilterPid *PID, const char szTemplateGF_MAX_PATH, char szFinalNameGF_MAX_PATH, u32 file_number, const char *file_suffix, const char *file_name);
 
 
 /*! Sets discard mode on or off on an input PID. When discard is on, all input packets for this PID are no longer dispatched.
@@ -3996,6 +4193,19 @@
 */
 GF_Err gf_filter_pid_set_rt_stats(GF_FilterPid *PID, u32 rtt_ms, u32 jitter_us, u32 loss_rate);
 
+
+/*! Returns RFC6381 "codec" string of a PID
+
+\param PID the target filter PID
+\param szCodec string to be written, must be RFC6381_CODEC_NAME_SIZE_MAX at least
+\param force_inband forces inband signaling for avc/hevc/etc
+\param force_sbr forces SBR signaling for AAC
+\param tile_base_dcd decoder config of tiled base track if known, may be NULL otherwise
+\param out_inband_forced set to 1 if inband is to be forced (dasher only) - may be NULL
+\return error if any
+*/
+GF_Err gf_filter_pid_get_rfc_6381_codec_string(GF_FilterPid *PID, char *szCodec, Bool force_inband, Bool force_sbr, const GF_PropertyValue *tile_base_dcd, u32 *out_inband_forced);
+
 /*! @} */
 
 
@@ -4082,6 +4292,17 @@
 */
 GF_FilterPacket *gf_filter_pck_new_ref(GF_FilterPid *PID, u32 data_offset, u32 data_size, GF_FilterPacket *source_packet);
 
+/*! Same as  \ref gf_filter_pck_new_ref with packet destructor callbacl
+
+\param PID the target output PID
+\param data_offset offset in the source data block
+\param data_size the size of the data block to dispatch - if 0, the entire data of the source packet beginning at offset is used
+\param source_packet the source packet this data belongs to (at least from the filter point of view).
+\param destruct the callback function used to destroy the packet when no longer used - may be NULL
+\return new packet or NULL if allocation error or not an output PID
+*/
+GF_FilterPacket *gf_filter_pck_new_ref_destructor(GF_FilterPid *PID, u32 data_offset, u32 data_size, GF_FilterPacket *source_packet, gf_fsess_packet_destructor destruct);
+
 /*! Allocates a new packet on the output PID with associated allocated data.
 The packet has by default no DTS, no CTS, no duration framing set to full frame (start=end=1) and all other flags set to 0 (including SAP type).
 \param PID the target output PID
@@ -4136,6 +4357,20 @@
 */
 GF_Err gf_filter_pck_set_readonly(GF_FilterPacket *pck);
 
+
+/*! Checks if packet data has been reallocated
+
+There are cases where memory allocated by \ref gf_filter_pck_new_ref allow needs to be reallocated without using \ref gf_filter_pck_expand .
+This function allows checking if the data has changed, and if so reassign the new block to the packet.
+If the data pointer was not changed, the packet data size is updated to the new size (acts as gf_filter_pck_truncate).
+The data shall have been reallocated with \ref gf_realloc.
+
+\param pck the target  packet to send
+\param data the reallocated data pointer
+\param size the reallocated data size
+*/
+void gf_filter_pck_check_realloc(GF_FilterPacket *pck, u8 *data, u32 size);
+
 /*! Sends the packet on its output PID. Packets SHALL be sent in processing order (eg, decoding order for video).
 However, packets don't have to be sent in their allocation order.
 \param pck the target output packet to send
@@ -4159,7 +4394,7 @@
 /*! Gets data associated with the packet.
 \param pck the target packet
 \param size set to the packet data size
-\return packet data if any, NULL if empty or if the packet uses a frame interface object. see \ref gf_filter_pck_get_frame_interface
+\return packet data if any, NULL if empty or if the packet uses a frame interface object. See \ref gf_filter_pck_get_frame_interface
 */
 const u8 *gf_filter_pck_get_data(GF_FilterPacket *pck, u32 *size);
 
@@ -4347,14 +4582,17 @@
 
 /*! Sets packet video interlacing flag
 \param pck target packet
-\param is_interlaced set to 0 if not interlaced, 1 for top field first/contains only top field, 2 for bottom field first/contains only bottom field.
+\param is_interlaced set to
+	0:  not interlaced
+	1:  top field first or contains only top field if packet not full frame
+	2:  bottom field first or contains only bottom field.
 \return error code if any
 */
 GF_Err gf_filter_pck_set_interlaced(GF_FilterPacket *pck, u32 is_interlaced);
 
 /*! Gets packet video interlacing flag
 \param pck target packet
-\return interlaced flag, set to 0 if not interlaced, 1 for top field first, 2 otherwise.
+\return interlaced flag, see \ref gf_filter_pck_set_interlaced
 */
 u32 gf_filter_pck_get_interlaced(GF_FilterPacket *pck);
 
@@ -4377,7 +4615,7 @@
 inserting bytes located at gf_filter_pck_get_byte_offset in file if the interlaced flag of the packet is set.
 If the corrupted flag is set, this indicates the data will be replaced later on.
 A seek packet is not meant to be displayed but is needed for decoding.
-\note If a packet is partially skiped but completely decoded, it shall not be marked as seek but have the property "SkipBegin" set.
+\note If a packet is partially skipped but completely decoded, it shall not be marked as seek but have the property "SkipBegin" set.
 \note Raw audio packets MUST be split at the proper boundary
 \param pck target packet
 \param is_seek indicates packet is seek frame
@@ -4616,7 +4854,7 @@
 
 Custom filters are filters created by the app with no associated registry.
 The app is responsible for assigning capabilities to the filter, and setting callback functions.
-Each callback is optionnal, but a custom filter should at least have a process callback, and a configure_pid callback if not a source filter.
+Each callback is optional, but a custom filter should at least have a process callback, and a configure_pid callback if not a source filter.
 
 Custom filters do not have any arguments exposed, and cannot be selected for sink or source filters.
 If your app requires custom I/Os for source or sinks, use \ref GF_FileIO.

gpac-2.2.1.tar.gz/include/gpac/ietf.h -> gpac-2.4.0.tar.gz/include/gpac/ietf.h Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2022
+ *			Copyright (c) Telecom ParisTech 2000-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / IETF RTP/RTSP/SDP sub-project
@@ -666,6 +666,13 @@
 */
 GF_Err gf_rtsp_merge_tunnel(GF_RTSPSession *sess, GF_RTSPSession *post_sess);
 
+/*! sets associated netcap rules
+\param sess the target RTSP session
+\param netcap_id ID of netcap configuration to use, may be null (see gpac -h netcap)
+
+*/
+void gf_rtsp_session_set_netcap_id(GF_RTSPSession *sess, const char *netcap_id);
+
 /*
 		RTP LIB EXPORTS
 */
@@ -719,6 +726,13 @@
 \return a newly allocated RTP channel
 */
 GF_RTPChannel *gf_rtp_new();
+
+/*! creates a new RTP channel
+\param netcap_id ID of netcap configuration to use, may be null (see gpac -h netcap)
+\return a newly allocated RTP channel
+*/
+GF_RTPChannel *gf_rtp_new_ex(const char *netcap_id);
+
 /*! destroys an RTP channel
 \param ch the target RTP channel
 */
@@ -897,7 +911,6 @@
 /*! forces loss rate for next Receiver report
 \param ch the target RTP channel
 \param loss_rate loss rate in per-thousand
-\return error if any
 */
 void gf_rtp_set_loss_rate(GF_RTPChannel *ch, u32 loss_rate);
 
@@ -994,7 +1007,7 @@
 
 		  SDP is mainly a text protocol with
 	well defined containers. The following structures are used to write / read
-	SDP informations, and the library also provides consistency checking
+	SDP information, and the library also provides consistency checking
 
   When reading SDP, all text items/structures are allocated by the lib, and you
   must call gf_sdp_info_reset(GF_SDPInfo *sdp) or gf_sdp_info_del(GF_SDPInfo *sdp) to release the memory

gpac-2.2.1.tar.gz/include/gpac/internal/compositor_dev.h -> gpac-2.4.0.tar.gz/include/gpac/internal/compositor_dev.h Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2022
+ *			Copyright (c) Telecom ParisTech 2000-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / Scene Rendering sub-project
@@ -236,7 +236,7 @@
 
 	/*the main scene graph*/
 	GF_SceneGraph *scene;
-	/*extra scene graphs (OSD, etc), always registered in draw order. That's the module responsability
+	/*extra scene graphs (OSD, etc), always registered in draw order. That's the module responsibility
 	to draw them*/
 	GF_List *extra_scenes;
 
@@ -707,6 +707,7 @@
 
 	Bool gazer_enabled, sgaze;
 	s32 gaze_x, gaze_y;
+	Bool gaze_changed;
 
 	Bool validator_mode;
 
@@ -1343,7 +1344,7 @@
 } GF_AudioInput;
 /*setup interface with audio renderer - overwrite any functions needed after setup EXCEPT callback object*/
 void gf_sc_audio_setup(GF_AudioInput *ai, GF_Compositor *sr, GF_Node *node);
-/*unregister interface from renderer/mixer and stops source - deleteing the interface is the caller responsability*/
+/*unregister interface from renderer/mixer and stops source - deleteing the interface is the caller responsibility*/
 void gf_sc_audio_predestroy(GF_AudioInput *ai);
 /*open audio object*/
 GF_Err gf_sc_audio_open(GF_AudioInput *ai, MFURL *url, Double clipBegin, Double clipEnd, Bool lock_timeline);
@@ -1638,9 +1639,6 @@
 void gf_sc_queue_node_traverse(GF_Compositor *compositor, GF_Node *node);
 void gf_sc_unqueue_node_traverse(GF_Compositor *compositor, GF_Node *node);
 
-
-GF_DownloadManager *gf_sc_get_downloader(GF_Compositor *compositor);
-
 typedef struct
 {
 	/*od_manager owning service, NULL for services created for remote channels*/
@@ -2068,6 +2066,9 @@
 
 	/*flag indicates this visual pid is a text subtitle*/
 	GF_ODM_IS_SPARSE = (1<<18),
+
+	/*flag set when ODM is a forced subtitle in normal play mode*/
+	GF_ODM_SUB_FORCED = (1<<19),
 };
 
 enum
@@ -2365,6 +2366,7 @@
 
 	Bool is_eos;
 	Bool config_changed;
+	Bool srd_map_changed;
 
 	/*currently valid properties of the object*/
 	u32 width, height, stride, pixel_ar, pixelformat, bitrate;
@@ -2372,7 +2374,8 @@
 	u32 sample_rate, num_channels, afmt, bytes_per_sec;
 	u64 channel_config;
 	Bool planar_audio;
-	u32 srd_x, srd_y, srd_w, srd_h, srd_full_w, srd_full_h;
+	u32 srd_x, srd_y, srd_w, srd_h;
+	u32 srd_full_w, srd_full_h, srd_map_ox, srd_map_oy;
 	u32 flip, rotate;
 
 	u32 quality_degradation_hint;

gpac-2.2.1.tar.gz/include/gpac/internal/dvb_mpe_dev.h -> gpac-2.4.0.tar.gz/include/gpac/internal/dvb_mpe_dev.h Changed

gpac-2.2.1.tar.gz/include/gpac/internal/ietf_dev.h -> gpac-2.4.0.tar.gz/include/gpac/internal/ietf_dev.h Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2022
+ *			Copyright (c) Telecom ParisTech 2000-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / IETF RTP/RTSP/SDP sub-project
@@ -67,13 +67,15 @@
 	u32 MaxCount;
 	u32 IsInit;
 	u32 MaxDelay, LastTime;
+	u32 TimeScale;
+	struct __PRO_item *disc;
 } GF_RTPReorder;
 
 /* creates new RTP reorderer
 	@MaxCount: forces automatic packet flush. 0 means no flush
 	@MaxDelay: is the max time in ms the queue will wait for a missing packet
 */
-GF_RTPReorder *gf_rtp_reorderer_new(u32 MaxCount, u32 MaxDelay);
+GF_RTPReorder *gf_rtp_reorderer_new(u32 MaxCount, u32 MaxDelay, u32 rtp_timescale);
 void gf_rtp_reorderer_del(GF_RTPReorder *po);
 /*reset the Queue*/
 void gf_rtp_reorderer_reset(GF_RTPReorder *po);
@@ -81,7 +83,7 @@
 /*Adds a packet to the queue. Packet Data is memcopied*/
 GF_Err gf_rtp_reorderer_add(GF_RTPReorder *po, const void * pck, u32 pck_size, u32 pck_seqnum);
 /*gets the output of the queue. Packet Data IS YOURS to delete*/
-void *gf_rtp_reorderer_get(GF_RTPReorder *po, u32 *pck_size, Bool force_flush);
+void *gf_rtp_reorderer_get(GF_RTPReorder *po, u32 *pck_size, Bool force_flush, Bool *is_disc);
 
 #define MAX_RTCP_RR	4
 
@@ -183,9 +185,10 @@
 	GF_RTCP_Report rtcp_rrMAX_RTCP_RR;
 	u32 nb_rctp_rr;
 
-
+	const char *netcap_id;
 	const char **ssm, **ssmx;
 	u32 nb_ssm, nb_ssmx;
+	u8 disc_state;
 };
 
 /*gets UTC in the channel RTP timescale*/
@@ -195,6 +198,8 @@
 /*updates the time for the next report (SR, RR)*/
 void gf_rtp_get_next_report_time(GF_RTPChannel *ch);
 
+Bool gf_rtp_is_disc(GF_RTPChannel *ch);
+
 
 /*
 			RTSP intern
@@ -299,6 +304,8 @@
 	char *HTTP_Cookie;
 	u32 tunnel_state;
 
+	const char *netcap_id;
+
 	/*RTSP CHANNEL*/
 	GF_Socket *connection;
 	u32 SockBufferSize;

gpac-2.2.1.tar.gz/include/gpac/internal/isomedia_dev.h -> gpac-2.4.0.tar.gz/include/gpac/internal/isomedia_dev.h Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2022
+ *			Copyright (c) Telecom ParisTech 2000-2024
  *					All rights reserved
  *
  *  This file is part of GPAC / ISO Media File Format sub-project
@@ -62,6 +62,7 @@
 	GF_ISOM_BOX_TYPE_MDAT	= GF_4CC( 'm', 'd', 'a', 't' ),
 	GF_ISOM_BOX_TYPE_IDAT	= GF_4CC( 'i', 'd', 'a', 't' ),
 	GF_ISOM_BOX_TYPE_IMDA	= GF_4CC( 'i', 'm', 'd', 'a' ),
+	GF_ISOM_BOX_TYPE_IMDT	= GF_4CC( 'i', 'm', 'd', 't' ),
 	GF_ISOM_BOX_TYPE_MDHD	= GF_4CC( 'm', 'd', 'h', 'd' ),
 	GF_ISOM_BOX_TYPE_MINF	= GF_4CC( 'm', 'i', 'n', 'f' ),
 	GF_ISOM_BOX_TYPE_MOOV	= GF_4CC( 'm', 'o', 'o', 'v' ),
@@ -260,7 +261,6 @@
 	GF_ISOM_BOX_TYPE_IREF	= GF_4CC( 'i', 'r', 'e', 'f' ),
 	GF_ISOM_BOX_TYPE_ENCA	= GF_4CC( 'e', 'n', 'c', 'a' ),
 	GF_ISOM_BOX_TYPE_ENCV	= GF_4CC( 'e', 'n', 'c', 'v' ),
-	GF_ISOM_BOX_TYPE_RESV	= GF_4CC( 'r', 'e', 's', 'v' ),
 	GF_ISOM_BOX_TYPE_ENCT	= GF_4CC( 'e', 'n', 'c', 't' ),
 	GF_ISOM_BOX_TYPE_ENCS	= GF_4CC( 'e', 'n', 'c', 's' ),
 	GF_ISOM_BOX_TYPE_ENCF	= GF_4CC( 'e', 'n', 'c', 'f' ),
@@ -271,11 +271,23 @@
 	GF_ISOM_BOX_TYPE_SCHM	= GF_4CC( 's', 'c', 'h', 'm' ),
 	GF_ISOM_BOX_TYPE_SCHI	= GF_4CC( 's', 'c', 'h', 'i' ),
 
+	GF_ISOM_BOX_TYPE_RESV	= GF_4CC( 'r', 'e', 's', 'v' ),
+	GF_ISOM_BOX_TYPE_RESA	= GF_4CC( 'r', 'e', 's', 'a' ),
+	GF_ISOM_BOX_TYPE_RESM	= GF_4CC( 'r', 'e', 's', 'm' ),
+	GF_ISOM_BOX_TYPE_REST	= GF_4CC( 'r', 'e', 's', 't' ),
+	GF_ISOM_BOX_TYPE_RESU	= GF_4CC( 'r', 'e', 's', 'u' ),
+	GF_ISOM_BOX_TYPE_RESS	= GF_4CC( 'r', 'e', 's', 's' ),
+	GF_ISOM_BOX_TYPE_RESF	= GF_4CC( 'r', 'e', 's', 'f' ),
+	GF_ISOM_BOX_TYPE_RESP	= GF_4CC( 'r', 'e', 's', 'p' ),
+	GF_ISOM_BOX_TYPE_RES3	= GF_4CC( 'r', 'e', 's', '3' ),
+
 	GF_ISOM_BOX_TYPE_STVI	= GF_4CC( 's', 't', 'v', 'i' ),
 
 
 	GF_ISOM_BOX_TYPE_METX	= GF_4CC( 'm', 'e', 't', 'x' ),
 	GF_ISOM_BOX_TYPE_METT	= GF_4CC( 'm', 'e', 't', 't' ),
+	GF_ISOM_BOX_TYPE_URIM	= GF_4CC( 'u', 'r', 'i', 'm' ),
+	GF_ISOM_BOX_TYPE_MEBX	= GF_4CC( 'm', 'e', 'b', 'x' ),
 
 	/* ISMA 1.0 Encryption and Authentication V 1.0 */
 	GF_ISOM_BOX_TYPE_IKMS	= GF_4CC( 'i', 'K', 'M', 'S' ),
@@ -367,7 +379,6 @@
 	GF_ISOM_BOX_TYPE_DIMC	= GF_4CC( 'd', 'i', 'm', 'C' ),
 	GF_ISOM_BOX_TYPE_DIST	= GF_4CC( 'd', 'i', 'S', 'T' ),
 
-
 	GF_ISOM_BOX_TYPE_AC3	= GF_4CC( 'a', 'c', '-', '3' ),
 	GF_ISOM_BOX_TYPE_DAC3	= GF_4CC( 'd', 'a', 'c', '3' ),
 	GF_ISOM_BOX_TYPE_EC3	= GF_4CC( 'e', 'c', '-', '3' ),
@@ -423,6 +434,7 @@
 	GF_ISOM_BOX_TYPE_TOLS	= GF_4CC( 't', 'o', 'l', 's' ),
 	GF_ISOM_BOX_TYPE_IENC	= GF_4CC( 'i', 'e', 'n', 'c' ),
 	GF_ISOM_BOX_TYPE_IAUX 	= GF_4CC('i', 'a', 'u', 'x'),
+	GF_ISOM_BOX_TYPE_ILCE   = GF_4CC( 'i', 'l', 'c', 'e' ),
 
 	/* MIAF Boxes */
 	GF_ISOM_BOX_TYPE_CLLI	= GF_4CC('c', 'l', 'l', 'i'),
@@ -490,6 +502,8 @@
 	GF_QT_BOX_TYPE_CHRM = GF_4CC('c','h','r','m'),
 	GF_QT_BOX_TYPE_STPS = GF_4CC('s','t','p','s'),
 	GF_QT_BOX_TYPE_CIOS = GF_4CC('c','i','o','s'),
+	GF_QT_BOX_TYPE_ENCD	= GF_4CC( 'e', 'n', 'c', 'd' ),
+	GF_QT_BOX_TYPE_FRCD	= GF_4CC( 'f', 'r', 'c', 'd' ),
 
 	/* from drm_sample.c */
 	GF_ISOM_BOX_TYPE_264B 	= GF_4CC('2','6','4','b'),
@@ -514,6 +528,16 @@
 	GF_ISOM_BOX_TYPE_FLAC	= GF_4CC( 'f', 'L', 'a', 'C' ),
 	GF_ISOM_BOX_TYPE_DFLA	= GF_4CC( 'd', 'f', 'L', 'a' ),
 
+	/* DTS audio */
+	GF_ISOM_BOX_TYPE_DDTS = GF_4CC('d','d','t','s'),
+	GF_ISOM_BOX_TYPE_DTSC = GF_4CC('d','t','s','c'),
+	GF_ISOM_BOX_TYPE_DTSH = GF_4CC('d','t','s','h'),
+	GF_ISOM_BOX_TYPE_DTSL = GF_4CC('d','t','s','l'),
+	GF_ISOM_BOX_TYPE_DTSE = GF_4CC('d','t','s','e'),
+	GF_ISOM_BOX_TYPE_DTSX = GF_4CC('d','t','s','x'),
+	GF_ISOM_BOX_TYPE_DTSY = GF_4CC('d','t','s','y'),
+	GF_ISOM_BOX_TYPE_UDTS = GF_4CC('u','d','t','s'),
+
 	//internal only
 	GF_QT_SUBTYPE_RAW_AUD 	= GF_4CC('Q','T','R','A'),
 	GF_QT_SUBTYPE_RAW_VID 	= GF_4CC('Q','T','R','V'),
@@ -530,6 +554,9 @@
 	GF_ISOM_BOX_TYPE_MSHP	= GF_4CC( 'm', 's', 'h', 'p' ),
 	GF_ISOM_BOX_TYPE_MESH	= GF_4CC( 'm', 'e', 's', 'h' ),
 
+	GF_QT_BOX_TYPE_CMOV	= GF_4CC( 'c', 'm', 'o', 'v' ),
+	GF_QT_BOX_TYPE_DCOM	= GF_4CC( 'd', 'c', 'o', 'm' ),
+	GF_QT_BOX_TYPE_CMVD	= GF_4CC( 'c', 'm', 'v', 'd' ),
 
 	GF_ISOM_BOX_TYPE_AVCE	= GF_4CC( 'a', 'v', 'c', 'E' ),
 	GF_ISOM_BOX_TYPE_HVCE	= GF_4CC( 'h', 'v', 'c', 'E' ),
@@ -558,6 +585,7 @@
 #define GF_ISOM_BS_COOKIE_VISUAL_TRACK	(1<<1)
 #define GF_ISOM_BS_COOKIE_QT_CONV		(1<<2)
 #define GF_ISOM_BS_COOKIE_CLONE_TRACK	(1<<3)
+#define GF_ISOM_BS_COOKIE_IN_UDTA		(1<<4)
 
 
 #ifndef GPAC_DISABLE_ISOM
@@ -621,13 +649,13 @@
 	tmp->type = __4cc;
 
 #define ISOM_DECREASE_SIZE(__ptr, bytes)	if (__ptr->size < (bytes) ) {\
-			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("isom not enough bytes in box %s: %d left, reading %d (file %s, line %d)\n", gf_4cc_to_str(__ptr->type), (u32) __ptr->size, (bytes), __FILE__, __LINE__ )); \
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("isom not enough bytes in box %s: %d left, reading %d (file %s, line %d) - try specifying -no-check (might crash)\n", gf_4cc_to_str(__ptr->type), (u32) __ptr->size, (bytes), __FILE__, __LINE__ )); \
 			return GF_ISOM_INVALID_FILE; \
 		}\
 		__ptr->size -= bytes; \
 
 #define ISOM_DECREASE_SIZE_GOTO_EXIT(__ptr, bytes)	if (__ptr->size < (bytes) ) {\
-			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("isom not enough bytes in box %s: %d left, reading %d (file %s, line %d)\n", gf_4cc_to_str(__ptr->type), (u32) __ptr->size, (bytes), __FILE__, __LINE__ )); \
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("isom not enough bytes in box %s: %d left, reading %d (file %s, line %d) - try specifying -no-check (might crash)\n", gf_4cc_to_str(__ptr->type), (u32) __ptr->size, (bytes), __FILE__, __LINE__ )); \
 			e = GF_ISOM_INVALID_FILE; \
 			goto exit;\
 		}\
@@ -635,7 +663,7 @@
 
 
 #define ISOM_DECREASE_SIZE_NO_ERR(__ptr, bytes)	if (__ptr->size < (bytes) ) {\
-			GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("isom not enough bytes in box %s: %d left, reading %d (file %s, line %d), skipping box\n", gf_4cc_to_str(__ptr->type), (u32) __ptr->size, (bytes), __FILE__, __LINE__ )); \
+			GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("isom not enough bytes in box %s: %d left, reading %d (file %s, line %d), skipping box - try specifying -no-check (might crash)\n", gf_4cc_to_str(__ptr->type), (u32) __ptr->size, (bytes), __FILE__, __LINE__ )); \
 			return GF_OK; \
 		}\
 		__ptr->size -= bytes; \
@@ -644,7 +672,7 @@
 /*constructor*/
 GF_Box *gf_isom_box_new(u32 boxType);
 //some boxes may have different syntax based on container. Use this constructor for this case
-GF_Box *gf_isom_box_new_ex(u32 boxType, u32 parentType, Bool skip_logs, Bool is_root_box);
+GF_Box *gf_isom_box_new_ex(u32 boxType, u32 parentType, Bool skip_logs, Bool is_root_box, Bool is_uuid);
 
 GF_Err gf_isom_box_write(GF_Box *ptr, GF_BitStream *bs);
 GF_Err gf_isom_box_read(GF_Box *ptr, GF_BitStream *bs);
@@ -711,6 +739,7 @@
 	u8 *data;
 
 	u32 imda_id;
+	//0: regular mdat, 1: imda, 2: imda with items refering to it (edit/write mode)
 	u8 is_imda;
 } GF_MediaDataBox;
 
@@ -752,7 +781,7 @@
 	GF_ISOM_BOX
 	u8 *data;
 	u32 dataSize;
-	u32 original_4cc;
+	u32 original_4cc, parent_4cc;
 	u32 sai_type, sai_aux_info;
 	u64 sai_offset;
 	struct _gf_saio_box *saio_box;
@@ -855,6 +884,7 @@
 	GF_ISOFile *mov;
 
 	Bool mvex_after_traks;
+	Bool has_cmvd;
 	//for compressed mov, stores the difference between compressed and uncompressed payload
 	s32 compressed_diff;
 	//for compressed mov, indicates the file offset of the moov box start
@@ -932,6 +962,9 @@
 	u32 index;
 	u32 nb_base_refs;
 
+	u8 *(*sample_alloc_cbk)(u32 size, void *cbk);
+	void *sample_alloc_udta;
+
 #ifndef GPAC_DISABLE_ISOM_WRITE
 	u64 first_dts_chunk;
 	u32 nb_samples_in_cache;
@@ -940,11 +973,11 @@
 	GF_BitStream *chunk_cache;
 #endif
 
+	u32 sample_count_at_seg_start;
 #ifndef	GPAC_DISABLE_ISOM_FRAGMENTS
 	//dts value when at refererence fragment start (first frag ever or first after a table reset), usually current segment start
 	u64 dts_at_seg_start;
 	//number of samples at refererence fragment start (first frag ever or first after a table reset), usually current segment start
-	u32 sample_count_at_seg_start;
 	Bool first_traf_merged;
 	Bool present_in_scalable_segment;
 	u32 current_traf_stsd_idx;
@@ -1103,6 +1136,7 @@
 {
 	GF_ISOM_FULL_BOX
 	GF_ISOM_DATAENTRY_FIELDS
+	u32 imda_ref_id;
 } GF_DataEntryURLBox;
 
 typedef struct
@@ -1130,7 +1164,7 @@
 	GF_SttsEntry *entries;
 	u32 nb_entries, alloc_size;
 
-#ifndef GPAC_DISABLE_ISOM_WRITE
+#if !defined(GPAC_DISABLE_ISOM_WRITE) || !defined(GPAC_DISABLE_ISOM_FRAGMENTS)
 	/*cache for WRITE*/
 	u32 w_currentSampleNum;
 	u64 w_LastDTS;
@@ -1139,6 +1173,8 @@
 	u32 r_FirstSampleInEntry;
 	u32 r_currentEntryIndex;
 	u64 r_CurrentDTS;
+	//when removing samples, this is the DTS of first sample after all removed samples
+	u64 cumulated_start_dts;
 
 	//stats for read
 	u32 max_ts_delta;
@@ -1158,7 +1194,7 @@
 	GF_DttsEntry *entries;
 	u32 nb_entries, alloc_size;
 
-#ifndef GPAC_DISABLE_ISOM_WRITE
+#if !defined(GPAC_DISABLE_ISOM_WRITE) || !defined(GPAC_DISABLE_ISOM_FRAGMENTS)
 	u32 w_LastSampleNumber;
 	/*force one sample per entry*/
 	Bool unpack_mode;
@@ -1681,6 +1717,21 @@
 	GF_OpusConfig opcfg;
 } GF_OpusSpecificBox;
 
+
+typedef struct
+{
+	GF_ISOM_BOX
+	GF_DTSConfig cfg;
+} GF_DTSSpecificBox;
+
+
+typedef struct
+{
+	GF_ISOM_BOX
+	GF_UDTSConfig cfg;
+} GF_UDTSSpecificBox;
+
+
 typedef struct
 {
 	GF_ISOM_BOX
@@ -2034,12 +2085,15 @@
 	u64 sidx_end;
 	u64 moof_start;
 	u64 mdat_end;
+	u64 first_dts;
 } GF_TrafMapEntry;
 
 typedef struct
 {
 	u32 nb_entries, nb_alloc;
 	GF_TrafMapEntry *frag_starts;
+	//read cache
+	u32 r_cur_sample, r_cur_idx;
 } GF_TrafToSampleMap;
 
 typedef struct
@@ -2083,7 +2137,7 @@
 	u8 patch_piff_psec;
 } GF_SampleTableBox;
 
-GF_Err stbl_AppendTrafMap(GF_ISOFile *mov, GF_SampleTableBox *stbl, Bool is_seg_start, u64 seg_start_offset, u64 frag_start_offset, u8 *moof_template, u32 moof_template_size, u64 sidx_start, u64 sidx_end, u32 nb_pack_samples);
+GF_Err stbl_AppendTrafMap(GF_ISOFile *mov, GF_SampleTableBox *stbl, Bool is_seg_start, u64 seg_start_offset, u64 frag_start_offset, u64 tfdt, u8 *moof_template, u32 moof_template_size, u64 sidx_start, u64 sidx_end, u32 nb_pack_samples);
 
 typedef struct __tag_media_info_box
 {
@@ -2611,8 +2665,13 @@
 	u64 ntp, timestamp;
 
 	//emsg to inject before moof, not part of the moof hierarchy !
-
 	GF_List *emsgs;
+
+	//when using packet reference, we serialize the segment start (emsg, prft, moof+mdat) header here
+	u8 *moof_data;
+	u32 moof_data_len, trun_ref_size;
+
+	GF_List *trun_list;
 } GF_MovieFragmentBox;
 
 
@@ -2683,7 +2742,6 @@
 #endif
 
 	u32 interleave_id;
-	u8 merge_sample_interleave;
 	u8 use_sample_interleave;
 	u8 force_new_trun;
 	u8 IFrameSwitching;
@@ -2692,6 +2750,9 @@
 	u8 truns_v1;
 	u8 large_tfdt;
 	u8 no_sdtp_first_flags;
+	//when using packet refs, cumulated size of all data aded to child truns
+	u32 trun_ref_size;
+
 } GF_TrackFragmentBox;
 
 GF_TrackFragmentBox *gf_isom_get_traf(GF_ISOFile *mov, GF_ISOTrackID TrackID);
@@ -2750,6 +2811,7 @@
 
 	/*only for trun, ignored for ctrn*/
 	u32 first_sample_flags;
+	u32 run_size;
 
 	/*in write mode with data caching*/
 	GF_BitStream *cache;
@@ -2772,8 +2834,20 @@
 	u32 interleave_id;
 	u32 first_sample_idx;
 	u32 *sample_order;
+
+	u32 min_duration;
+
+	GF_List *sample_refs;
 } GF_TrackFragmentRunBox;
 
+typedef struct
+{
+	u8 *data;
+	u32 len;
+	void *ref;
+	u32 ref_offset;
+} GF_TrafSampleRef;
+
 #ifdef GF_ENABLE_CTRN
 u32 gf_isom_ctrn_field_size_bits(u32 field_idx);
 #endif
@@ -3335,6 +3409,7 @@
 
 	u32 default_description_index;
 	GF_List *group_descriptions;
+	Bool is_opaque;
 } GF_SampleGroupDescriptionBox;
 
 /*default entry */
@@ -3480,6 +3555,19 @@
 	u16 *groupIDs;
 } GF_SubpictureLayoutMapEntry;
 
+typedef struct
+{
+	u32 nb_types;
+	u32 *group_types;
+} GF_EssentialSamplegroupEntry;
+
+/*interlace group - 'ilce' type*/
+typedef struct
+{
+	u8 ilce_type;
+} GF_FieldInterlaceType;
+
+
 /*
 		CENC stuff
 */
@@ -3487,7 +3575,7 @@
 /*CENCSampleEncryptionGroupEntry - 'seig' type*/
 typedef struct
 {
-	u8 crypt_byte_block, skip_byte_block;
+	u32 crypt_byte_block, skip_byte_block;
 	u8 IsProtected;
 	u8 *key_info;
 	u32 key_info_size;
@@ -3509,7 +3597,7 @@
 {
 	GF_ISOM_FULL_BOX
 
-	u8 crypt_byte_block, skip_byte_block;
+	u32 crypt_byte_block, skip_byte_block;
 	u8 isProtected;
 
 	//single key
@@ -3598,7 +3686,7 @@
 GF_SampleEncryptionBox *gf_isom_create_piff_psec_box(u8 version, u32 flags, u32 AlgorithmID, u8 IV_size, bin128 KID);
 GF_SampleEncryptionBox * gf_isom_create_samp_enc_box(u8 version, u32 flags);
 
-void gf_isom_cenc_get_default_info_internal(GF_TrackBox *trak, u32 sampleDescriptionIndex, u32 *container_type, Bool *default_IsEncrypted, u8 *crypt_byte_block, u8 *skip_byte_block, const u8 **key_info, u32 *key_info_size);
+void gf_isom_cenc_get_default_info_internal(GF_TrackBox *trak, u32 sampleDescriptionIndex, u32 *container_type, Bool *default_IsEncrypted, u32 *crypt_byte_block, u32 *skip_byte_block, const u8 **key_info, u32 *key_info_size);
 
 
 GF_Err gf_isom_get_sample_cenc_info_internal(GF_TrackBox *trak,
@@ -3607,7 +3695,7 @@
 #else
 	void *traf,
 #endif
-	GF_SampleEncryptionBox *senc, u32 sample_number, Bool *IsEncrypted, u8 *crypt_byte_block, u8 *skip_byte_block, const u8 **key_info, u32 *key_info_size);
+	GF_SampleEncryptionBox *senc, u32 sample_number, Bool *IsEncrypted, u32 *crypt_byte_block, u32 *skip_byte_block, const u8 **key_info, u32 *key_info_size);
 
 
 GF_Err senc_Parse(GF_BitStream *bs, GF_TrackBox *trak,
@@ -3616,7 +3704,7 @@
 #else
 	void *traf,
 #endif
-	GF_SampleEncryptionBox *ptr);
+	GF_SampleEncryptionBox *ptr, u32 samples_in_traf);
 
 
 /*
@@ -3707,6 +3795,11 @@
 	u8 axis;
 } GF_ImageMirrorBox;
 
+typedef struct {
+	GF_ISOM_BOX
+	u8 interlace_type;
+} GF_FieldInterlaceTypeBox;
+
 typedef struct
 {
 	u8 essential;
@@ -3936,6 +4029,9 @@
 	char *temp_file;
 #endif
 	GF_Blob *blob;
+#ifdef GPAC_HAS_FD
+	s32 fd;
+#endif
 } GF_FileDataMap;
 
 /*file mapping handler. used if supported, only on read mode for complete files  (not in file download)*/
@@ -4049,27 +4145,38 @@
 	s64 read_byte_offset;
 	u64 bytes_removed;
 
+#ifndef GPAC_DISABLE_ISOM_WRITE
 	GF_ISOCompressMode compress_mode;
 	u32 compress_flags;
+	u32 pad_cmov;
+#endif
 
 	void (*progress_cbk)(void *udta, u64 nb_done, u64 nb_total);
 	void *progress_cbk_udta;
 
+	/*in WRITE mode, this is the current MDAT where data is written*/
+	/*in READ mode this is the last valid file position before a gf_isom_box_read failed*/
+	u64 current_top_box_start;
+
+	Bool signal_frag_bounds;
+	Bool sample_groups_in_traf;
 	u32 FragmentsFlags;
+
 #ifndef	GPAC_DISABLE_ISOM_FRAGMENTS
 	u32 NextMoofNumber;
 	/*active fragment*/
 	GF_MovieFragmentBox *moof;
-	/*in WRITE mode, this is the current MDAT where data is written*/
-	/*in READ mode this is the last valid file position before a gf_isom_box_read failed*/
-	u64 current_top_box_start;
 	u64 segment_start;
 
 	GF_List *moof_list;
-	Bool use_segments, moof_first, append_segment, styp_written, force_moof_base_offset;
+	Bool use_segments, moof_first, append_segment, force_moof_base_offset;
+	//0: don' write, 1: write and modif, 2: write as is
+	u32 write_styp;
 
 	GF_List *emsgs;
 
+	Bool in_sidx_write;
+
 	/*used when building single-indexed self initializing media segments*/
 	GF_SegmentIndexBox *root_sidx;
 	u64 root_sidx_offset;
@@ -4084,14 +4191,12 @@
 	Bool single_moof_mode;
 	u32 single_moof_state;
 
-	Bool sample_groups_in_traf;
 	Bool force_sidx_v1;
 
 	/* optional mfra box used in write mode */
 	GF_MovieFragmentRandomAccessBox *mfra;
 
 	Bool store_traf_map;
-	Bool signal_frag_bounds;
 	u64 root_sidx_start_offset, root_sidx_end_offset;
 	u64 sidx_start_offset, sidx_end_offset;
 	u64 styp_start_offset;
@@ -4116,7 +4221,7 @@
 
 	Bool is_smooth;
 
-	GF_Err (*on_block_out)(void *usr_data, u8 *block, u32 block_size);
+	GF_Err (*on_block_out)(void *usr_data, u8 *block, u32 block_size, void *cbk_data, u32 cbk_magic);
 	GF_Err (*on_block_patch)(void *usr_data, u8 *block, u32 block_size, u64 block_offset, Bool is_insert);
 	void (*on_last_block_start)(void *usr_data);
 	void *on_block_out_usr_data;
@@ -4126,6 +4231,7 @@
 	u64 fragmented_file_pos;
 	u8 *block_buffer;
 	u32 block_buffer_size;
+	Bool blocks_sent;
 
 	u32 nb_box_init_seg;
 
@@ -4170,7 +4276,7 @@
 GF_Err Track_FindRef(GF_TrackBox *trak, u32 ReferenceType, GF_TrackReferenceTypeBox **dpnd);
 /*Time and sample*/
 GF_Err GetMediaTime(GF_TrackBox *trak, Bool force_non_empty, u64 movieTime, u64 *MediaTime, s64 *SegmentStartTime, s64 *MediaOffset, u8 *useEdit, u64 *next_edit_start_plus_one);
-GF_Err Media_GetSample(GF_MediaBox *mdia, u32 sampleNumber, GF_ISOSample **samp, u32 *sampleDescriptionIndex, Bool no_data, u64 *out_offset);
+GF_Err Media_GetSample(GF_MediaBox *mdia, u32 sampleNumber, GF_ISOSample **samp, u32 *sampleDescriptionIndex, Bool no_data, u64 *out_offset, Bool ext_realloc);
 GF_Err Media_CheckDataEntry(GF_MediaBox *mdia, u32 dataEntryIndex);
 GF_Err Media_FindSyncSample(GF_SampleTableBox *stbl, u32 searchFromTime, u32 *sampleNumber, u8 mode);
 GF_Err Media_RewriteODFrame(GF_MediaBox *mdia, GF_ISOSample *sample);
@@ -4213,6 +4319,7 @@
 GF_Err stbl_UnpackOffsets(GF_SampleTableBox *stbl);
 GF_Err stbl_unpackCTS(GF_SampleTableBox *stbl);
 GF_Err SetTrackDuration(GF_TrackBox *trak);
+GF_Err SetTrackDurationEx(GF_TrackBox *trak, Bool keep_utc);
 GF_Err Media_SetDuration(GF_TrackBox *trak);
 
 /*rewrites 3GP samples desc as MPEG-4 ESD*/
@@ -4223,10 +4330,12 @@
 GF_UserDataMap *udta_getEntry(GF_UserDataBox *ptr, u32 box_type, bin128 *uuid);
 
 
-GF_Err gf_isom_set_sample_group_description_internal(GF_ISOFile *movie, u32 track, u32 sample_number, u32 grouping_type, u32 grouping_type_parameter, void *data, u32 data_size, Bool check_access);
+GF_Err gf_isom_set_sample_group_description_internal(GF_ISOFile *movie, u32 track, u32 sample_number, u32 grouping_type, u32 grouping_type_parameter, void *data, u32 data_size, Bool check_access, u32 sgpd_flags);
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
+GF_Err isom_on_block_out(void *cbk, u8 *data, u32 block_size);
+
 GF_Err FlushCaptureMode(GF_ISOFile *movie);
 GF_Err CanAccessMovie(GF_ISOFile *movie, GF_ISOOpenMode Mode);
 GF_ISOFile *gf_isom_create_movie(const char *fileName, GF_ISOOpenMode OpenMode, const char *tmp_dir);
@@ -4275,6 +4384,9 @@
 GF_Err stbl_AddRedundant(GF_SampleTableBox *stbl, u32 sampleNumber);
 
 /*REMOVE functions*/
+#endif
+
+#if !defined(GPAC_DISABLE_ISOM_WRITE) || !defined(GPAC_DISABLE_ISOM_FRAGMENTS)
 GF_Err stbl_RemoveDTS(GF_SampleTableBox *stbl, u32 sampleNumber, u32 nb_samples, u32 LastAUDefDuration);
 GF_Err stbl_RemoveCTS(GF_SampleTableBox *stbl, u32 sampleNumber, u32 nb_samples);
 GF_Err stbl_RemoveSize(GF_SampleTableBox *stbl, u32 sampleNumber, u32 nb_samples);
@@ -4286,6 +4398,9 @@
 GF_Err stbl_RemoveSubSample(GF_SampleTableBox *stbl, u32 SampleNumber);
 GF_Err stbl_RemoveSampleGroup(GF_SampleTableBox *stbl, u32 SampleNumber);
 GF_Err stbl_RemoveRAPs(GF_SampleTableBox *stbl, u32 nb_samples);
+#endif
+
+#ifndef	GPAC_DISABLE_ISOM_WRITE
 
 #ifndef	GPAC_DISABLE_ISOM_FRAGMENTS
 GF_Err gf_isom_close_fragments(GF_ISOFile *movie);
@@ -4298,7 +4413,8 @@
 Bool gf_isom_is_identical_sgpd(void *ptr1, void *ptr2, u32 grouping_type);
 void sgpd_del_entry(u32 grouping_type, void *entry);
 
-GF_DefaultSampleGroupDescriptionEntry * gf_isom_get_sample_group_info_entry(GF_ISOFile *the_file, GF_TrackBox *trak, u32 grouping_type, u32 sample_description_index, u32 *default_index, GF_SampleGroupDescriptionBox **out_sgdp);
+/*return type is either GF_DefaultSampleGroupDescriptionEntry if opaque sample group, or the structure associated with the grouping type*/
+void *gf_isom_get_sample_group_info_entry(GF_ISOFile *the_file, GF_TrackBox *trak, u32 grouping_type, u32 sample_description_index, u32 *default_index, GF_SampleGroupDescriptionBox **out_sgdp);
 
 GF_Err GetNextMediaTime(GF_TrackBox *trak, u64 movieTime, u64 *OutMovieTime);
 GF_Err GetPrevMediaTime(GF_TrackBox *trak, u64 movieTime, u64 *OutMovieTime);
@@ -4611,6 +4727,7 @@
 	GF_TextScrollDelayBox *scroll_delay;
 	GF_TextBoxBox *box;
 	GF_TextWrapBox *wrap;
+	Bool is_forced;
 
 	GF_List *others;
 	GF_TextKaraokeBox *cur_karaoke;
@@ -4692,8 +4809,9 @@
 
 GF_Err gf_isom_read_null_terminated_string(GF_Box *s, GF_BitStream *bs, u64 size, char **out_str);
 
+#ifndef GPAC_DISABLE_ISOM_FRAGMENTS
 GF_Err MergeTrack(GF_TrackBox *trak, GF_TrackFragmentBox *traf, GF_MovieFragmentBox *moof, u64 moof_offset, s32 compressed_diff, u64 *cumulated_offset);
-
+#endif
 
 #endif //GPAC_DISABLE_ISOM

gpac-2.2.1.tar.gz/include/gpac/internal/m3u8.h -> gpac-2.4.0.tar.gz/include/gpac/internal/m3u8.h Changed

gpac-2.2.1.tar.gz/include/gpac/internal/media_dev.h -> gpac-2.4.0.tar.gz/include/gpac/internal/media_dev.h Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2022
+ *			Copyright (c) Telecom ParisTech 2000-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / Media Tools sub-project
@@ -51,6 +51,15 @@
 	Bool full_range;
 } COLR;
 
+u32 gf_bs_read_ue(GF_BitStream *bs);
+s32 gf_bs_read_se(GF_BitStream *bs);
+void gf_bs_write_ue(GF_BitStream *bs, u32 num);
+void gf_bs_write_se(GF_BitStream *bs, s32 num);
+
+
+#ifndef GPAC_DISABLE_ISOM
+GF_Err gf_media_get_color_info(GF_ISOFile *file, u32 track, u32 sampleDescriptionIndex, u32 *colour_type, u16 *colour_primaries, u16 *transfer_characteristics, u16 *matrix_coefficients, Bool *full_range_flag);
+#endif
 
 #ifndef GPAC_DISABLE_AV_PARSERS
 
@@ -65,11 +74,6 @@
 u32 gf_media_nalu_emulation_bytes_remove_count(const u8 *buffer, u32 nal_size);
 u32 gf_media_nalu_remove_emulation_bytes(const u8 *buffer_src, u8 *buffer_dst, u32 nal_size);
 
-u32 gf_bs_read_ue(GF_BitStream *bs);
-s32 gf_bs_read_se(GF_BitStream *bs);
-void gf_bs_write_ue(GF_BitStream *bs, u32 num);
-void gf_bs_write_se(GF_BitStream *bs, s32 num);
-
 
 enum
 {
@@ -141,9 +145,9 @@
 	s32 profile_idc;
 	s32 level_idc;
 	s32 prof_compat;
-	s32 log2_max_frame_num;
+	u32 log2_max_frame_num;
 	u32 poc_type, poc_cycle_length;
-	s32 log2_max_poc_lsb;
+	u32 log2_max_poc_lsb;
 	s32 delta_pic_order_always_zero_flag;
 	s32 offset_for_non_ref_pic, offset_for_top_to_bottom_field;
 	Bool frame_mbs_only_flag;
@@ -287,9 +291,7 @@
 /*nota: 'buffer' remains unmodified but cannot be set const*/
 u32 gf_avc_reformat_sei(u8 *buffer, u32 nal_size, Bool isobmf_rewrite, AVCState *avc);
 
-#ifndef GPAC_DISABLE_ISOM
-
-GF_Err gf_media_get_color_info(GF_ISOFile *file, u32 track, u32 sampleDescriptionIndex, u32 *colour_type, u16 *colour_primaries, u16 *transfer_characteristics, u16 *matrix_coefficients, Bool *full_range_flag);
+#ifndef GPAC_DISABLE_AV_PARSERS
 
 /*! VUI modification parameters*/
 typedef struct
@@ -614,7 +616,7 @@
 	GF_VVC_SLICE_TYPE_UNKNOWN = 10,
 };
 
-#define VVC_MAX_REF_PICS	29
+#define VVC_MAX_REF_PICS	64
 
 #define VVC_RPL_ST 0
 #define VVC_RPL_LT 1
@@ -638,6 +640,16 @@
 #define VVC_MAX_TILE_COLS 30
 #define VVC_MAX_TILE_ROWS 33
 
+//max number of subpics supported in GPAC
+#define VVC_MAX_SUBPIC	200
+
+typedef struct
+{
+	u16 x, y, w, h;
+	u16 id;
+	u16 num_slices;
+} VVC_SubpicInfo;
+
 typedef struct
 {
 	s32 id;
@@ -660,8 +672,9 @@
 
 	//subpic info, not fully implemented yet
 	u8 subpic_info_present, independent_subpic_flags, subpic_same_size, subpicid_mapping_explicit, subpicid_mapping_present;
-	u32 nb_subpics; //up to 600
+	u32 nb_subpics; //up to VVC_MAX_SUBPIC
 	u32 subpicid_len;
+	VVC_SubpicInfo subpicsVVC_MAX_SUBPIC;
 
 	Bool has_timing_info;
 	u32 num_units_in_tick, time_scale;
@@ -716,6 +729,8 @@
 	u8 conf_window;
 	u32 cw_left, cw_right, cw_top, cw_bottom;
 
+	VVC_SubpicInfo subpicsVVC_MAX_SUBPIC;
+
 	//tile info
 	u32 tile_rows_height_ctbVVC_MAX_TILE_ROWS;
 	u32 tile_cols_width_ctbVVC_MAX_TILE_COLS;
@@ -930,6 +945,8 @@
 	u8 operating_points_count;
 	u8 decoder_model_present_for_this_op32;
 	u8 operating_point_idc32;
+	u8 initial_display_delay_present_for_this_op32;
+	u8 initial_display_delay_minus1_for_this_op32;
 
 	u32 tileRows, tileCols, tileRowsLog2, tileColsLog2;
 	u8 tile_size_bytes; /*coding tile header size*/
@@ -974,6 +991,9 @@
 	u8 mdcv_data24;
 	u8 clli_valid, mdcv_valid;
 
+	//set to one if a temporal delim is found when calling aom_av1_parse_temporal_unit_from_section5
+	u8 has_temporal_delim;
+	u8 has_frame_data;
 } AV1State;
 
 GF_Err aom_av1_parse_temporal_unit_from_section5(GF_BitStream *bs, AV1State *state);
@@ -1156,10 +1176,12 @@
 #define M2V_SEQ_START_CODE					0xB3
 #define M2V_EXT_START_CODE					0xB5
 #define M2V_GOP_START_CODE					0xB8
+#define M2V_UDTA_START_CODE					0xB2
 
 
 /*build isobmf dec info from sequence header+ephdr (only seq hdr is parsed, only advanced profile is supprted) */
 GF_Err gf_media_vc1_seq_header_to_dsi(const u8 *seq_hdr, u32 seq_hdr_len, u8 **dsi, u32 *dsi_size);
 
+
 #endif		/*_GF_MEDIA_DEV_H_*/

gpac-2.2.1.tar.gz/include/gpac/internal/scenegraph_dev.h -> gpac-2.4.0.tar.gz/include/gpac/internal/scenegraph_dev.h Changed

gpac-2.2.1.tar.gz/include/gpac/internal/swf_dev.h -> gpac-2.4.0.tar.gz/include/gpac/internal/swf_dev.h Changed

gpac-2.2.1.tar.gz/include/gpac/isomedia.h -> gpac-2.4.0.tar.gz/include/gpac/isomedia.h Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2022
+ *			Copyright (c) Telecom ParisTech 2000-2024
  *					All rights reserved
  *
  *  This file is part of GPAC / ISO Media File Format sub-project
@@ -216,6 +216,10 @@
 	but it is encrypted.*/
 	GF_ISOM_SUBTYPE_MPEG4_CRYP	= GF_4CC( 'E', 'N', 'C', 'M' ),
 
+	/*restricted video subtype*/
+	GF_ISOM_SUBTYPE_RESV	= GF_4CC( 'r', 'e', 's', 'v' ),
+
+
 	/*AVC/H264 media type - not listed as an MPEG-4 type, ALTHOUGH this library automatically remaps
 	GF_AVCConfig to MPEG-4 ESD*/
 	GF_ISOM_SUBTYPE_AVC_H264		= GF_4CC( 'a', 'v', 'c', '1' ),
@@ -362,6 +366,7 @@
 	GF_QT_SUBTYPE_RGBA = GF_4CC('R','G','B','A'),
 	GF_QT_SUBTYPE_ABGR = GF_4CC('A','B','G','R'),
 	GF_QT_SUBTYPE_ALAC =  GF_4CC('a','l','a','c'),
+	GF_QT_SUBTYPE_LPCM =  GF_4CC('l','p','c','m'),
 	GF_ISOM_SUBTYPE_FFV1		= GF_4CC( 'F', 'F', 'V', '1' ),
 
 	GF_ISOM_ITEM_TYPE_AUXI 	= GF_4CC('a', 'u', 'x', 'i'),
@@ -379,7 +384,11 @@
 	GF_ISOM_SUBTYPE_DTSH = GF_4CC('d','t','s','h'),
 	GF_ISOM_SUBTYPE_DTSL = GF_4CC('d','t','s','l'),
 	GF_ISOM_SUBTYPE_DTSE = GF_4CC('d','t','s','e'),
+	GF_ISOM_SUBTYPE_DTSX = GF_4CC('d','t','s','x'),
+	GF_ISOM_SUBTYPE_DTSY = GF_4CC('d','t','s','y'),
 
+	GF_ISOM_SUBTYPE_UNCV	= GF_4CC( 'u', 'n', 'c', 'v' ),
+	GF_ISOM_ITEM_TYPE_UNCI	= GF_4CC( 'u', 'n', 'c', 'i' ),
 };
 
 
@@ -584,6 +593,9 @@
 	/*! number of packed samples in this sample. If 0 or 1, only 1 sample is present
 	only used for constant size and constant duration samples*/
 	u32 nb_pack;
+
+	/*! read API only - sample duration (multiply by nb_pack to get full duration)*/
+	u32 duration;
 } GF_ISOSample;
 
 
@@ -653,15 +665,14 @@
 u32 gf_isom_probe_data(const u8*inBuf, u32 inSize);
 
 /*! opens an isoMedia File.
-If fileName is NULL data will be written in memory ; write with gf_isom_write() ; use gf_isom_get_bs() to get the data ; use gf_isom_delete() to delete the internal data.
-\param fileName name of the file to open, , gmem:// or gfio:// resource. The special name "_gpac_isobmff_redirect" is used to indicate that segment shall be written to a memory buffer passed to callback function set through \ref gf_isom_set_write_callback.
+\param fileName name of the file to open, , gmem:// or gfio:// resource. The special name "_gpac_isobmff_redirect" is used to indicate that segment shall be written to a memory buffer passed to callback function set through \ref gf_isom_set_write_callback. SHALL not be NULL.
 \param OpenMode file opening mode
 \param tmp_dir for the 2 edit modes only, specifies a location for temp file. If NULL, the library will use the default libgpac temporary file management schemes.
 \return the created ISO file if no error
 */
 GF_ISOFile *gf_isom_open(const char *fileName, GF_ISOOpenMode OpenMode, const char *tmp_dir);
 
-/*! closes the file, write it if new/edited - equivalent to gf_isom_write()+gf_isom_delete()
+/*! closes the file, write it if new/edited or if pending fragment
 \param isom_file the target ISO file
 \return error if any
 */
@@ -872,12 +883,18 @@
 */
 u32 gf_isom_get_track_flags(GF_ISOFile *isom_file, u32 trackNumber);
 
-/*! gets the track duration
+/*! gets the track duration - this will try to fix any discrepencies between media duration+edit lists vs track duration
 \param isom_file the target ISO file
 \param trackNumber the target track
 \return the track duration in movie timescale, or 0 if error*/
 u64 gf_isom_get_track_duration(GF_ISOFile *isom_file, u32 trackNumber);
 
+/*! gets the unmodified track duration - mus be called before any call to \ref gf_isom_get_track_duration
+\param isom_file the target ISO file
+\param trackNumber the target track
+\return the track duration in movie timescale, or 0 if error*/
+u64 gf_isom_get_track_duration_orig(GF_ISOFile *isom_file, u32 trackNumber);
+
 /*! gets the media type (audio, video, etc) of a track
 \param isom_file the target ISO file
 \param trackNumber the target track
@@ -1005,7 +1022,7 @@
 \param isom_file the target ISO file
 \param trackNumber the target track
 \param pack_num_samples the target number of samples to pack in one ISOSample
-\return GF_TRUE if packing was successfull, GF_FALSE otherwise (non constant size and non constant duration)
+\return GF_TRUE if packing was successful, GF_FALSE otherwise (non constant size and non constant duration)
 */
 Bool gf_isom_enable_raw_pack(GF_ISOFile *isom_file, u32 trackNumber, u32 pack_num_samples);
 
@@ -1220,6 +1237,13 @@
 \return the reference index if the given track has a reference of type referenceType to refTreckID, 0 otherwise*/
 u32 gf_isom_has_track_reference(GF_ISOFile *isom_file, u32 trackNumber, u32 referenceType, GF_ISOTrackID refTrackID);
 
+/*! checks if a track is referenced by another track wuth the given reference type
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param referenceType the four character code of the reference to query
+\return the track number of the first track  referencing the target track, 0 otherwise*/
+u32 gf_isom_is_track_referenced(GF_ISOFile *isom_file, u32 trackNumber, u32 referenceType);
+
 /*! fetches a sample for a given movie time, handling possible track edit lists.
 
 if no sample is playing, an empty sample is returned with no data and a DTS set to MovieTime when searching in sync modes
@@ -1440,9 +1464,23 @@
 {
 	/*! stream structure flags, 1: has channel layout, 2: has objects*/
 	u8 stream_structure;
+	/*!  order of formats in the stream : 0 unknown, 1: Channels, possibly followed by Objects, 2 Objects, possibly followed by Channels*/
+	u8 format_ordering;
+	/*! combined channel count of the channel layout and the object count*/
+	u8 base_channel_count;
 
 	/*! defined CICP channel layout*/
 	u8 definedLayout;
+	/*! indicates where the ordering of the audio channels for the definedLayout are specified
+	0: as listed for the ChannelConfigurations in ISO/IEC 23091-3
+	1: Default order of audio codec specification
+	2: Channel ordering #2 of audio codec specification
+	3: Channel ordering #3 of audio codec specification
+	4: Channel ordering #4 of audio codec specification
+	*/
+	u8 channel_order_definition;
+	/*! indicates if omittedChannelsMap is present*/
+	u8 omitted_channels_present;
 
 	/*! number of channels*/
 	u32 channels_count;
@@ -1615,6 +1653,16 @@
 */
 u32 gf_isom_get_track_group(GF_ISOFile *isom_file, u32 trackNumber, u32 track_group_type);
 
+/*! gets track group ID of a given track group type for this track
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param idx 0-based index of enumeration, incremented by the function if success
+\param track_group_type set to the track group type - may be NULL
+\param track_group_id set to the track group ID - may be NULL
+\return GF_TRUE if success, GF_FALSE otherwise
+*/
+Bool gf_isom_enum_track_group(GF_ISOFile *isom_file, u32 trackNumber, u32 *idx, u32 *track_group_type, u32 *track_group_id);
+
 /*! checks if file is a single AV file with max one audio, one video, one text and basic od/bifs
 \param isom_file the target ISO file
 \return GF_TRUE if file is single AV, GF_FALSE otherwise
@@ -1782,12 +1830,6 @@
 	GF_ISOM_STORE_FASTSTART,
 } GF_ISOStorageMode;
 
-/*! writes the file without deleting (see \ref gf_isom_delete)
-\param isom_file the target ISO file
-\return error if any
-*/
-GF_Err gf_isom_write(GF_ISOFile *isom_file);
-
 /*! freezes order of the current box tree in the file.
 By default the library always reorder boxes in the recommended order in the various specifications implemented.
 New created tracks or meta items will not have a frozen order of boxes, but the function can be called several time
@@ -1802,12 +1844,16 @@
 */
 void gf_isom_keep_utc_times(GF_ISOFile *isom_file, Bool keep_utc);
 
+#endif
+
 /*! Checks if UTC keeping is enabled
 \param isom_file the target ISO file
 \return GF_TRUE if UTC keeping is enabled
 */
 Bool gf_isom_has_keep_utc_times(GF_ISOFile *isom_file);
 
+#ifndef GPAC_DISABLE_ISOM_WRITE
+
 /*! sets the timescale of the movie. This rescales times expressed in movie timescale in edit lists and mvex boxes
 \param isom_file the target ISO file
 \param timeScale the target timescale
@@ -1871,6 +1917,7 @@
 	GF_ISOM_TKFLAGS_ADD,
 } GF_ISOMTrackFlagOp;
 
+#endif //GPAC_DISABLE_ISOM_WRITE
 
 /*! Track header flags*/
 enum
@@ -1885,6 +1932,8 @@
 	GF_ISOM_TK_SIZE_IS_AR = 1<<3
 };
 
+#ifndef GPAC_DISABLE_ISOM_WRITE
+
 /*! toggles track flags on or off
 \param isom_file the target ISO file
 \param trackNumber the target track
@@ -2008,7 +2057,7 @@
 */
 GF_Err gf_isom_set_last_sample_duration_ex(GF_ISOFile *isom_file, u32 trackNumber, u32 dur_num, u32 dur_den);
 
-/*! patches last stts entry to make sure the cumulated duration equals the given next_dts value
+/*! patches last stts entry to make sure the cumulated duration equals the given next_dts value - this will overrite timing of all previous samples using an average dur
 \param isom_file the target ISO file
 \param trackNumber the target track
 \param next_dts target decode time of next sample
@@ -2777,19 +2826,46 @@
 */
 void gf_isom_set_progress_callback(GF_ISOFile *isom_file, void (*progress_cbk)(void *udta, u64 nb_done, u64 nb_total), void *progress_cbk_udta);
 
+/*! Callback function to receive new data blocks
+\param usr_data user callback, as passed to \ref gf_isom_set_write_callback
+\param block data block to write
+\param block_size data block size in bytes
+\param sample_cbk_data callback data of sample or NULL
+\param sample_cbk_magic callback magic of sample or 0
+\return error if any
+*/
+typedef GF_Err (*gf_isom_on_block_out)(void *usr_data, u8 *block, u32 block_size, void *sample_cbk_data, u32 sample_cbk_magic);
+
+/*! Callback function to receive new data blocks, only used in non-fragmented mode:
+ -  to patch mdat size
+ - to inject moov for GF_ISOM_STORE_FASTSTART mode
+\param usr_data user callback, as passed to \ref gf_isom_set_write_callback
+\param block data block to write
+\param block_size data block size in bytes
+\param block_offset offset in file for block to patch
+\param is_insert if GF_TRUE, indicates the bytes must be inserted at the given offset. Otherwise bytes are to be replaced
+\return error if any
+*/
+typedef GF_Err (*gf_isom_on_block_patch)(void *usr_data, u8 *block, u32 block_size, u64 block_offset, Bool is_insert);
+
+/*! Callback function to indicate the last call to \ref gf_isom_on_block_out is about to be produced for a segment, unused for non-fragmented or non-dash cases
+ \param usr_data user callback, as passed to \ref gf_isom_set_write_callback
+*/
+typedef void (*gf_isom_on_last_block_start)(void *usr_data);
+
 /*! sets write callback functions for in-memory file writing
 \param isom_file the target ISO file
-\param on_block_out the block write callback function
-\param on_block_patch the block patch callback function
+\param on_block_out the block write callback function, mandatory
+\param on_block_patch the block patch callback function, may be NULL if only fragmented files or very small files are being produced
 \param on_last_block_start called before writing the last block of a sequence of movie fragments
 \param usr_data opaque user data passed to callback functions
 \param block_size desired block size in bytes
 \return error if any
 */
 GF_Err gf_isom_set_write_callback(GF_ISOFile *isom_file,
- 			GF_Err (*on_block_out)(void *cbk, u8 *data, u32 block_size),
-			GF_Err (*on_block_patch)(void *usr_data, u8 *block, u32 block_size, u64 block_offset, Bool is_insert),
- 			void (*on_last_block_start)(void *cbk),
+			gf_isom_on_block_out on_block_out,
+			gf_isom_on_block_patch on_block_patch,
+			gf_isom_on_last_block_start on_last_block_start,
  			void *usr_data,
  			u32 block_size);
 
@@ -3088,6 +3164,8 @@
 	u16 bits_per_sample;
 	/*! indicates if QTFF signaling should be used, audio codecs only*/
 	Bool is_qtff;
+	/*! for lpcm only, indicates format flags*/
+	u32 lpcm_flags;
 
 	/*optional, sample description specific configuration*/
 	u8 *extension_buf;
@@ -3556,7 +3634,7 @@
 */
 GF_Err gf_isom_lhvc_force_inband_config(GF_ISOFile *isom_file, u32 trackNumber, u32 sampleDescriptionIndex);
 
-/*! sets hvt1 entry type (tile track) or hev2/hvc2 type if is_base_track is set. It is the use responsability to set the tbas track reference to the base hevc track
+/*! sets hvt1 entry type (tile track) or hev2/hvc2 type if is_base_track is set. It is the use responsibility to set the tbas track reference to the base hevc track
 \param isom_file the target ISO file
 \param trackNumber the target track
 \param sampleDescriptionIndex the target sample description index
@@ -3725,6 +3803,17 @@
 GF_Err gf_isom_new_dims_description(GF_ISOFile *isom_file, u32 trackNumber, GF_DIMSDescription *desc, const char *URLname, const char *URNname, u32 *outDescriptionIndex);
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
+
+/*! gets a UDTS Specific Configuration sample description
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param sampleDescriptionIndex the target sample description index
+\param cfg set to the UDTS Specific Configuration
+\return error if any
+*/
+GF_Err gf_isom_get_udts_config(GF_ISOFile *isom_file, u32 trackNumber, u32 sampleDescriptionIndex, GF_UDTSConfig *cfg);
+
+
 /*! gets an AC3 sample description
 \param isom_file the target ISO file
 \param trackNumber the target track
@@ -3885,12 +3974,23 @@
 \param isom_file the target ISO file
 \param trackNumber the target track
 \param sampleDescriptionIndex the target sample description index
-\param flags set to the pcm config flags (0: big endian, 1: little endian)
-\param pcm_size  set to PCM sample size (per channel, 16, 24, 32, 64
+\param flags set to the pcm config flags (0: big endian, 1: little endian), may be NULL
+\param pcm_size  set to PCM sample size (per channel, 16, 24, 32, 64, may be NULL
 \return error if any
 */
 GF_Err gf_isom_get_pcm_config(GF_ISOFile *isom_file, u32 trackNumber, u32 sampleDescriptionIndex, u32 *flags, u32 *pcm_size);
 
+/*! gets information of a raw PCM  sample description, QT style (lpcm codecid)
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param sampleDescriptionIndex the target sample description index
+\param sample_rate set to the pcm sample rate, may be NULL
+\param nb_channels set to the pcm channel count, may be NULL
+\param flags set to the pcm config flags (1: float, 2: big endian, 4: signed, other flags cf QTFF), may be NULL
+\param pcm_size  set to PCM sample size (per channel, 16, 24, 32, 64, may be NULL
+\return error if any
+*/
+GF_Err gf_isom_get_lpcm_config(GF_ISOFile *isom_file, u32 trackNumber, u32 sampleDescriptionIndex, Double *sample_rate, u32 *nb_channels, u32 *flags, u32 *pcm_size);
 
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
@@ -3991,7 +4091,6 @@
 /*! @} */
 
 
-#ifndef GPAC_DISABLE_ISOM_FRAGMENTS
 /*!
 \addtogroup isofragred_grp Fragmented ISOBMFF Read
 \ingroup iso_grp
@@ -4006,12 +4105,15 @@
 \return GF_FALSE if movie isn't fragmented, GF_TRUE otherwise
 */
 Bool gf_isom_is_fragmented(GF_ISOFile *isom_file);
+
 /*! checks if a movie file is fragmented
 \param isom_file the target ISO file
 \param TrackID the target track
 \return GF_FALSE if track isn't fragmented, GF_TRUE otherwise*/
 Bool gf_isom_is_track_fragmented(GF_ISOFile *isom_file, GF_ISOTrackID TrackID);
 
+#ifndef GPAC_DISABLE_ISOM_FRAGMENTS
+
 /*! checks if a file has a top styp box
 \param isom_file the target ISO file
 \param brand set to the major brand of the styp box
@@ -4139,7 +4241,6 @@
 */
 Bool gf_isom_get_last_producer_time_box(GF_ISOFile *isom_file, GF_ISOTrackID *refTrackID, u64 *ntp, u64 *timestamp, Bool reset_info);
 
-#ifndef GPAC_DISABLE_ISOM_WRITE
 /*! enables storage of traf templates (serialized sidx/moof/traf without trun/senc) at segment boundaries
 This is mostly used to recreate identical segment information when refragmenting a file
 \param isom_file the target ISO file
@@ -4174,6 +4275,8 @@
 	u64 sidx_start;
 	/*! sidx end, 0 if absent*/
 	u64 sidx_end;
+	/*! DTS of first sample in this fragment fotr the queried track*/
+	u64 first_dts;
 } GF_ISOFragmentBoundaryInfo;
 
 /*! checks if a sample is a fragment start
@@ -4184,7 +4287,19 @@
 \param frag_info filled with information on fragment boundaries (optional - can be NULL)
 \return GF_TRUE if this sample was the first sample of a traf in the fragmented source file, GF_FALSE otherwise*/
 Bool gf_isom_sample_is_fragment_start(GF_ISOFile *isom_file, u32 trackNumber, u32 sampleNum, GF_ISOFragmentBoundaryInfo *frag_info);
-#endif //GPAC_DISABLE_ISOM_WRITE
+
+/*! releases current movie segment. This closes the associated file IO object.
+\note seeking in the file is no longer possible when tables are rested
+\warning The sample count is not reseted after the release of tables. use \ref gf_isom_reset_tables for this
+
+\param isom_file the target ISO file
+\param reset_tables if set, sample information for all tracks setup as segment are destroyed, along with all PSSH boxes. This allows keeping the memory footprint low when playing segments.
+\return error if any
+*/
+GF_Err gf_isom_release_segment(GF_ISOFile *isom_file, Bool reset_tables);
+
+#endif //GPAC_DISABLE_ISOM_FRAGMENTS
+
 
 /*! resets sample information for all tracks setup. This allows keeping the memory footprint low when playing DASH/CMAF segments
 \note seeking in the file is then no longer possible
@@ -4196,22 +4311,11 @@
 
 /*! sets the offset for parsing from the input buffer to 0 (used to reclaim input buffer)
 \param isom_file the target ISO file
-\param top_box_start set to the byte offset in the source buffer of the first top level box
+\param top_box_start set to the byte offset in the source buffer of the first top level box, may be NULL
 \return error if any
 */
 GF_Err gf_isom_reset_data_offset(GF_ISOFile *isom_file, u64 *top_box_start);
 
-
-/*! releases current movie segment. This closes the associated file IO object.
-\note seeking in the file is no longer possible when tables are rested
-\warning The sample count is not reseted after the release of tables. use \ref gf_isom_reset_tables for this
-
-\param isom_file the target ISO file
-\param reset_tables if set, sample information for all tracks setup as segment are destroyed, along with all PSSH boxes. This allows keeping the memory footprint low when playing segments.
-\return error if any
-*/
-GF_Err gf_isom_release_segment(GF_ISOFile *isom_file, Bool reset_tables);
-
 /*! Flags for gf_isom_open_segment*/
 typedef enum
 {
@@ -4221,6 +4325,8 @@
 	GF_ISOM_SEGMENT_SCALABLE_FLAG = 1<<1,
 } GF_ISOSegOpenMode;
 
+#ifndef GPAC_DISABLE_ISOM_FRAGMENTS
+
 /*! opens a new segment file. Access to samples in previous segments is no longer possible
 if end_range>start_range, restricts the URL to the given byterange when parsing
 
@@ -4718,6 +4824,11 @@
 \return error if any
 */
 GF_Err gf_isom_fragment_set_cenc_sai(GF_ISOFile *isom_file, GF_ISOTrackID trackID, u8 *sai_b, u32 sai_b_size, Bool use_subsample, Bool use_saio_32bit, Bool use_multikey);
+
+#endif // !defined(GPAC_DISABLE_ISOM_FRAGMENTS) && !defined(GPAC_DISABLE_ISOM_WRITE)
+
+#if !defined(GPAC_DISABLE_ISOM_WRITE)
+
 /*! clones PSSH data between two files
 \param dst_file the target ISO file
 \param src_file the source ISO file
@@ -4726,6 +4837,10 @@
 */
 GF_Err gf_isom_clone_pssh(GF_ISOFile *dst_file, GF_ISOFile *src_file, Bool in_moof);
 
+#endif
+
+
+#if !defined(GPAC_DISABLE_ISOM_FRAGMENTS) && !defined(GPAC_DISABLE_ISOM_WRITE)
 
 /*! sets roll information for a sample in a track fragment
 \param isom_file the target ISO file
@@ -5110,6 +5225,15 @@
 */
 GF_Err gf_isom_text_get_encoded_tx3g(GF_ISOFile *isom_file, u32 trackNumber, u32 sampleDescriptionIndex, u32 sidx_offset, u8 **tx3g, u32 *tx3g_size);
 
+/*! sets TX3G flags for forced samples
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param sampleDescriptionIndex the sample description index
+\param force_type if 0, no forced subs are present. If 1, some forced subs are present; if 2, all samples are forced subs
+\return error if any
+*/
+GF_Err gf_isom_set_forced_text(GF_ISOFile *isom_file, u32 trackNumber, u32 sampleDescriptionIndex, u32 force_type);
+
 /*! text sample formatting*/
 typedef struct _3gpp_text_sample GF_TextSample;
 /*! creates text sample handle
@@ -5384,6 +5508,13 @@
 */
 GF_Err gf_isom_text_set_wrap(GF_TextSample *tx_samp, u8 wrap_flags);
 
+/*! sets force for the sample
+\param tx_samp the target text sample
+\param is_forced for ce sample if TRUE
+\return error if any
+*/
+GF_Err gf_isom_text_set_forced(GF_TextSample *tx_samp, Bool is_forced);
+
 /*! formats sample as a regular GF_ISOSample payload in a bitstream object.
 \param tx_samp the target text sample
 \param bs thetarget bitstream
@@ -5444,6 +5575,8 @@
 @{
 */
 
+#endif // GPAC_DISABLE_ISOM
+
 /*! DRM related code points*/
 enum
 {
@@ -5473,12 +5606,6 @@
 	GF_ISOM_SVE1_SCHEME	= GF_4CC('s','v','e','1'),
 };
 
-/*! checks if a track is encrypted or protected
-\param isom_file the target ISO file
-\param trackNumber the target track
-\return GF_TRUE if track is protected, GF_FALSE otherwise*/
-Bool gf_isom_is_track_encrypted(GF_ISOFile *isom_file, u32 trackNumber);
-
 
 /*! flags for GF_ISMASample*/
 typedef enum
@@ -5489,6 +5616,17 @@
 	GF_ISOM_ISMA_IS_ENCRYPTED = 2,
 } GF_ISOISMACrypFlags;
 
+
+#ifndef GPAC_DISABLE_ISOM
+
+/*! checks if a track is encrypted or protected
+\param isom_file the target ISO file
+\param trackNumber the target track
+\return GF_TRUE if track is protected, GF_FALSE otherwise*/
+Bool gf_isom_is_track_encrypted(GF_ISOFile *isom_file, u32 trackNumber);
+
+
+
 /*! ISMA sample*/
 typedef struct
 {
@@ -5716,7 +5854,7 @@
 \return error if any
 */
 GF_Err gf_isom_set_cenc_protection(GF_ISOFile *isom_file, u32 trackNumber, u32 sampleDescriptionIndex, u32 scheme_type,
-                                   u32 scheme_version, u32 default_IsEncrypted, u8 default_crypt_byte_block, u8 default_skip_byte_block,
+                                   u32 scheme_version, u32 default_IsEncrypted, u32 default_crypt_byte_block, u32 default_skip_byte_block,
 								    u8 *key_info, u32 key_info_size);
 
 
@@ -5734,7 +5872,7 @@
 \return error if any
 */
 GF_Err gf_isom_set_cenc_protection_mkey(GF_ISOFile *isom_file, u32 trackNumber, u32 sampleDescriptionIndex, u32 scheme_type,
-                                   u32 scheme_version, u32 default_IsEncrypted, u8 default_crypt_byte_block, u8 default_skip_byte_block,
+                                   u32 scheme_version, u32 default_IsEncrypted, u32 default_crypt_byte_block, u32 default_skip_byte_block,
 								    u8 *key_info, u32 key_info_size);
 
 
@@ -5847,7 +5985,7 @@
 \param key_info_size set to multikey descriptor size
 \return error if any
 */
-GF_Err gf_isom_cenc_get_default_info(GF_ISOFile *isom_file, u32 trackNumber, u32 sampleDescriptionIndex, u32 *container_type, Bool *default_IsEncrypted, u8 *crypt_byte_block, u8 *skip_byte_block, const u8 **key_info, u32 *key_info_size);
+GF_Err gf_isom_cenc_get_default_info(GF_ISOFile *isom_file, u32 trackNumber, u32 sampleDescriptionIndex, u32 *container_type, Bool *default_IsEncrypted, u32 *crypt_byte_block, u32 *skip_byte_block, const u8 **key_info, u32 *key_info_size);
 
 /*! gets the number of PSSH defined
 \param isom_file the target ISO file
@@ -5897,7 +6035,7 @@
 \param key_info_size set to key descriptor size
 \return error if any
 */
-GF_Err gf_isom_get_sample_cenc_info(GF_ISOFile *isom_file, u32 trackNumber, u32 sampleNumber, Bool *IsEncrypted, u8 *crypt_byte_block, u8 *skip_byte_block, const u8 **key_info, u32 *key_info_size);
+GF_Err gf_isom_get_sample_cenc_info(GF_ISOFile *isom_file, u32 trackNumber, u32 sampleNumber, Bool *IsEncrypted, u32 *crypt_byte_block, u32 *skip_byte_block, const u8 **key_info, u32 *key_info_size);
 
 /*! @} */
 
@@ -6025,7 +6163,7 @@
 \return error if any
 */
 GF_Err gf_isom_extract_meta_item_get_cenc_info(GF_ISOFile *isom_file, Bool root_meta, u32 track_num, u32 item_id, Bool *is_protected,
-	u8 *skip_byte_block, u8 *crypt_byte_block, const u8 **key_info, u32 *key_info_size, u32 *aux_info_type_parameter,
+	u32 *skip_byte_block, u32 *crypt_byte_block, const u8 **key_info, u32 *key_info_size, u32 *aux_info_type_parameter,
 	u8 **sai_out_data, u32 *sai_out_size, u32 *sai_out_alloc_size);
 
 /*! gets primary item ID
@@ -6054,6 +6192,16 @@
 \return ID if the referred item*/
 u32 gf_isom_meta_get_item_ref_id(GF_ISOFile *isom_file, Bool root_meta, u32 track_num, u32 from_id, u32 type, u32 ref_idx);
 
+/*! gets number of references of a given type to a given item ID
+\param isom_file the target ISO file
+\param root_meta if GF_TRUE uses meta at the file, otherwise uses meta at the movie level if track number is 0
+\param track_num if GF_TRUE and root_meta is GF_FALSE, uses meta at the track level
+\param to_id item ID to check
+\param type reference type to check
+\return number of referenced items*/
+u32 gf_isom_meta_item_has_ref(GF_ISOFile *isom_file, Bool root_meta, u32 track_num, u32 to_id, u32 type);
+
+
 /*! item tile mode*/
 typedef enum {
 	/*! not a tile item*/
@@ -6079,8 +6227,8 @@
 {
 	u32 scheme_type;
 	u32 scheme_version;
-	u8 crypt_byte_block;
-	u8 skip_byte_block;
+	u32 crypt_byte_block;
+	u32 skip_byte_block;
 	const u8 *key_info;
 	u32 key_info_size;
 	const u8 *sai_data;
@@ -6165,6 +6313,9 @@
 	/*AV1 operation point index*/
 	u8 av1_op_index;
 
+	/*interlace type - uncv*/
+	u8 interlace_type;
+
 	const char *aux_urn;
 	const u8 *aux_data;
 	u32 aux_data_len;
@@ -6234,6 +6385,8 @@
 */
 GF_Err gf_isom_add_meta_item(GF_ISOFile *isom_file, Bool root_meta, u32 track_num, Bool self_reference, char *resource_path, const char *item_name, u32 item_id, u32 item_type, const char *mime_type, const char *content_encoding, const char *URL, const char *URN, GF_ImageItemProperties *image_props);
 
+#endif //GPAC_DISABLE_ISOM
+
 /*! item extend description*/
 typedef struct
 {
@@ -6249,6 +6402,7 @@
 #endif
 } GF_ItemExtentEntry;
 
+#ifndef GPAC_DISABLE_ISOM_WRITE
 
 /*! adds an item to a meta box from memory
 \param isom_file the target ISO file
@@ -6841,6 +6995,8 @@
 	GF_ISOM_SAMPLE_GROUP_AVCB = GF_4CC( 'a', 'v', 'c', 'b'), //avif
 	GF_ISOM_SAMPLE_GROUP_SPOR = GF_4CC( 's', 'p', 'o', 'r'), //p15
 	GF_ISOM_SAMPLE_GROUP_SULM = GF_4CC( 's', 'u', 'l', 'm'), //p15
+	GF_ISOM_SAMPLE_GROUP_ESGH = GF_4CC( 'e', 's', 'g', 'h'), //p12
+	GF_ISOM_SAMPLE_GROUP_ILCE = GF_4CC( 'i', 'l', 'c', 'e'), //uncv
 };
 
 /*! gets 'rap ' and 'roll' group info for the given sample
@@ -6905,12 +7061,13 @@
 \param sample_number the target sample
 \param sgrp_idx the current index. Must be set to 0 on first call, incremented by this call on each success, must not be NULL
 \param sgrp_type set to the grouping type, or set to 0 if no more sample group descriptions, must not be NULL
+\param sgrp_flags set to the grouping flags, (0x1: static_group_description, 0x2: static_mapping)
 \param sgrp_parameter set to the grouping_type_parameter or 0 if not defined
-\param sgrp_data set to the sample group description data
-\param sgrp_size set to the sample group description size
+\param sgrp_data set to the sample group description data, may be NULL - MUST be freed by caller
+\param sgrp_size set to the sample group description size, may be NULL
 \return error if any
 */
-GF_Err gf_isom_enum_sample_group(GF_ISOFile *isom_file, u32 trackNumber, u32 sample_number, u32 *sgrp_idx, u32 *sgrp_type, u32 *sgrp_parameter, const u8 **sgrp_data, u32 *sgrp_size);
+GF_Err gf_isom_enum_sample_group(GF_ISOFile *isom_file, u32 trackNumber, u32 sample_number, u32 *sgrp_idx, u32 *sgrp_type, u32 *sgrp_flags, u32 *sgrp_parameter, u8 **sgrp_data, u32 *sgrp_size);
 
 /*! enumerates custom sample auxiliary data (not natively supported by this library) for a given sample
 \param isom_file the target ISO file
@@ -6962,7 +7119,7 @@
 \param key_info_size multikey descriptor size
 \return error if any
 */
-GF_Err gf_isom_set_sample_cenc_group(GF_ISOFile *isom_file, u32 trackNumber, u32 sampleNumber, u8 isEncrypted, u8 crypt_byte_block, u8 skip_byte_block, u8 *key_info, u32 key_info_size);
+GF_Err gf_isom_set_sample_cenc_group(GF_ISOFile *isom_file, u32 trackNumber, u32 sampleNumber, u8 isEncrypted, u32 crypt_byte_block, u32 skip_byte_block, u8 *key_info, u32 key_info_size);
 
 
 /*! sets a sample using the default CENC parameters in a CENC saig sample group SEIG, creating a sample group description if needed (when seig is already defined)
@@ -7001,9 +7158,10 @@
 \param grouping_type_parameter associated grouping type parameter (usually 0)
 \param data the payload of the sample group description
 \param data_size the size of the payload
+\param sgpd_flags flags for sgpd: 1: static description, 2, static mapping, 1<<30: essential sample group, 1<<31: default sample description
 \return error if any
 */
-GF_Err gf_isom_set_sample_group_description(GF_ISOFile *isom_file, u32 trackNumber, u32 sampleNumber, u32 grouping_type, u32 grouping_type_parameter, void *data, u32 data_size);
+GF_Err gf_isom_set_sample_group_description(GF_ISOFile *isom_file, u32 trackNumber, u32 sampleNumber, u32 grouping_type, u32 grouping_type_parameter, void *data, u32 data_size, u32 sgpd_flags);
 
 
 /*! adds a sample to the given sample group

gpac-2.2.1.tar.gz/include/gpac/list.h -> gpac-2.4.0.tar.gz/include/gpac/list.h Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2019
+ *			Copyright (c) Telecom ParisTech 2000-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / common tools sub-project
@@ -62,7 +62,7 @@
 
 Destructs a list object
 \param ptr list object to destruct
-\note It is the caller responsability to destroy the content of the list if needed
+\note It is the caller responsibility to destroy the content of the list if needed
  */
 void gf_list_del(GF_List *ptr);
 
@@ -103,7 +103,7 @@
 \param ptr target list object
 \param position position of the item to remove. It is expressed between 0 and gf_list_count-1.
 \return error if any
-\note It is the caller responsability to destroy the content of the list if needed
+\note It is the caller responsibility to destroy the content of the list if needed
  */
 GF_Err gf_list_rem(GF_List *ptr, u32 position);
 
@@ -142,7 +142,7 @@
 
 Resets the content of the list
 \param ptr target list object.
-\note It is the caller responsability to destroy the content of the list if needed
+\note It is the caller responsibility to destroy the content of the list if needed
  */
 void gf_list_reset(GF_List *ptr);
 
@@ -161,7 +161,7 @@
 Removes the last item of the list
 \param ptr target list object
 \return error if any
-\note It is the caller responsability to destroy the content of the list if needed
+\note It is the caller responsibility to destroy the content of the list if needed
  */
 GF_Err gf_list_rem_last(GF_List *ptr);

gpac-2.2.1.tar.gz/include/gpac/maths.h -> gpac-2.4.0.tar.gz/include/gpac/maths.h Changed

gpac-2.2.1.tar.gz/include/gpac/media_tools.h -> gpac-2.4.0.tar.gz/include/gpac/media_tools.h Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2022
+ *			Copyright (c) Telecom ParisTech 2000-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / Authoring Tools sub-project
@@ -180,7 +180,6 @@
 */
 #define GF_IMPORT_DEFAULT_FPS	25.0
 
-#ifndef GPAC_DISABLE_MEDIA_IMPORT
 
 /*
 	All these can import a file into a dedicated track. If esd is NULL the track is blindly added
@@ -263,6 +262,8 @@
 	//GF_IMPORT_FILTER_STATS = 0x80000000	//(=1<<31)
 };
 
+#ifndef GPAC_DISABLE_MEDIA_IMPORT
+
 /*! max supported numbers of tracks in importer*/
 #define GF_IMPORT_MAX_TRACKS	100
 /*!
@@ -537,6 +538,10 @@
  */
 GF_Err gf_media_change_pl(GF_ISOFile *isom_file, u32 trackNumber, u32 profile, u32 compat, u32 level);
 
+#endif
+
+#ifndef GPAC_DISABLE_ISOM
+
 /*!
  Rewrite NAL-based samples (AVC/HEVC/...) samples if nalu size_length has to be changed
 \param isom_file the target ISOBMF file
@@ -546,6 +551,9 @@
  */
 GF_Err gf_media_nal_rewrite_samples(GF_ISOFile *isom_file, u32 trackNumber, u32 new_size_in_bits);
 
+#endif
+
+#ifndef GPAC_DISABLE_MEDIA_IMPORT
 /*!
  Split SVC layers
 \param isom_file the target ISOBMF file
@@ -1154,8 +1162,6 @@
 @{
  */
 
-#ifndef GPAC_DISABLE_MEDIA_EXPORT
-
 /*!
 Track dumper formats and flags
 \hideinitializer
@@ -1211,6 +1217,8 @@
 	GF_EXPORT_DO_ABORT = 0x80000000 //(1<<31)
 };
 
+#ifndef GPAC_DISABLE_MEDIA_EXPORT
+
 /*!
   track dumper
  */

gpac-2.2.1.tar.gz/include/gpac/mediaobject.h -> gpac-2.4.0.tar.gz/include/gpac/mediaobject.h Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2022
+ *			Copyright (c) Telecom ParisTech 2000-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / Stream Management sub-project
@@ -106,13 +106,13 @@
 void gf_mo_resume(GF_MediaObject *mo);
 
 /*!
-	Note on mediaControl: mediaControl is the media management app responsability, therefore
+	Note on mediaControl: mediaControl is the media management app responsibility, therefore
 is hidden from the rendering app. Since MediaControl overrides default settings of the node (speed and loop)
 you must use the gf_mo_get_speed and gf_mo_get_loop in order to know whether the related field applies or not
 */
 
 /*! sets speed of media - speed is not always applied, depending on media control settings.
-\note audio pitching is the responsability of the rendering app
+\note audio pitching is the responsibility of the rendering app
 \param mo the target media object
 \param speed the playback speed to set
 */
@@ -233,6 +233,18 @@
 \return GF_TRUE if success*/
 Bool gf_mo_get_visual_info(GF_MediaObject *mo, u32 *width, u32 *height, u32 *stride, u32 *pixel_ar, u32 *pixelFormat, Bool *is_flipped);
 
+/*! gets visual information of a media object
+\param mo the target media object
+\param width set to width in pixels
+\param height set to height in pixels
+\param stride set to stride in bytes for visual objects with data frame, 0 if unknown
+\param pixel_ar set to the pixel aspect ratio as \code (PAR_NUM<<16)|PAR_DEN \endcode
+\param pixelFormat set to the pixel format of the video
+\param is_flipped set to GF_TRUE if the pixels are vertically flipped (happens when reading back OpenGL textures)
+\param for_texture if true check for texture dimensions otherwise for SRD dimensions
+\return GF_TRUE if success*/
+Bool gf_mo_get_visual_info_ex(GF_MediaObject *mo, u32 *width, u32 *height, u32 *stride, u32 *pixel_ar, u32 *pixelFormat, Bool *is_flipped, Bool for_texture);
+
 /*! gets number of views for 3D video object
 \param mo the target media object
 \param nb_views set to the number of views in the object, vertically packed

gpac-2.2.1.tar.gz/include/gpac/module.h -> gpac-2.4.0.tar.gz/include/gpac/module.h Changed

@@ -66,6 +66,7 @@
  */
 
 #include <gpac/config_file.h>
+#include <gpac/main.h>
 
 /*!
 \brief common module interface
@@ -78,7 +79,9 @@
 	const char *module_name;		\
 	const char *author_name;		\
 	void *HPLUG;					\
- 
+	GF_GPACArg *args; 				\
+	char *description;				\
+
 /*!
 \brief Base Interface
  *
@@ -116,7 +119,7 @@
 	_ifce->InterfaceType = _ifce_type;	\
 	_ifce->module_name = _ifce_name ? _ifce_name : "unknown";	\
 	_ifce->author_name = _ifce_author ? _ifce_author : "gpac distribution";	\
-	
+
 /*!
 \brief static module declaration
  \hideinitializer
@@ -163,7 +166,7 @@
 		reg->ShutdownInterface = ShutdownInterface;	\
 		return reg;\
 	}	\
- 
+
 #else
 #define GPAC_MODULE_STATIC_DECLARATION(__name)
 #endif
@@ -244,9 +247,10 @@
 Loads an interface in the desired module
 \param mod_name the name of the module (shared library file) or of the interface as declared when registered.
 \param InterfaceFamily type of the interface to load
+\param rebrowse_all if GF_TRUE, locate an interface for this type if not found by name
 \return the interface object if found and loaded, NULL otherwise.
  */
-GF_BaseInterface *gf_modules_load_by_name(const char *mod_name, u32 InterfaceFamily);
+GF_BaseInterface *gf_modules_load_by_name(const char *mod_name, u32 InterfaceFamily, Bool rebrowse_all);
 
 /*!
 \brief interface shutdown
@@ -281,6 +285,36 @@
 */
 void *gf_modules_load_filter(u32 index, void *fsess);
 
+/*!
+\brief query module option
+
+Loads a key from config in the module options.
+\param ifce the module instance to query
+\param key the key to query
+\return the key value or null
+*/
+const char *gf_module_get_key(GF_BaseInterface *ifce, char *key);
+
+/*!
+\brief query module option as boolean
+
+Loads a boolean key from config in the module options.
+\param ifce the module instance to query
+\param key_name the key to query
+\return GF_TRUE if key is found and equals yes, true or 1, GF_FALSE otherwise
+*/
+Bool gf_module_get_bool(GF_BaseInterface *ifce, char *key_name);
+
+/*!
+\brief query module option as int
+
+Loads an integer key from config in the module options.
+\param ifce the module instance to query
+\param key_name the key to query
+\return integer value of key, 0 if not found
+*/
+Bool gf_module_get_int(GF_BaseInterface *ifce, char *key_name);
+
 /*! @} */
 
 #ifdef __cplusplus

gpac-2.2.1.tar.gz/include/gpac/modules/audio_out.h -> gpac-2.4.0.tar.gz/include/gpac/modules/audio_out.h Changed

gpac-2.2.1.tar.gz/include/gpac/modules/font.h -> gpac-2.4.0.tar.gz/include/gpac/modules/font.h Changed

gpac-2.2.1.tar.gz/include/gpac/modules/hardcoded_proto.h -> gpac-2.4.0.tar.gz/include/gpac/modules/hardcoded_proto.h Changed

gpac-2.2.1.tar.gz/include/gpac/modules/video_out.h -> gpac-2.4.0.tar.gz/include/gpac/modules/video_out.h Changed

gpac-2.2.1.tar.gz/include/gpac/mpd.h -> gpac-2.4.0.tar.gz/include/gpac/mpd.h Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre - Cyril Concolato
- *			Copyright (c) Telecom ParisTech 2010-2022
+ *			Copyright (c) Telecom ParisTech 2010-2024
  *					All rights reserved
  *
  *  This file is part of GPAC / 3GPP/MPEG Media Presentation Description input module
@@ -82,9 +82,10 @@
 \param bandwidth bandwidth used for the representation
 \param segment_number number of the target segment
 \param use_segment_timeline indicates if segmentTimeline is used for segment addressing in the MPD
+\param forced if true, do not append extension or missing $Number$ or $Time$  when resolving template
 \return error if any
 */
-GF_Err gf_media_mpd_format_segment_name(GF_DashTemplateSegmentType seg_type, Bool is_bs_switching, char *segment_name, const char *rep_id, const char *base_url, const char *seg_rad_name, const char *seg_ext, u64 start_time, u32 bandwidth, u32 segment_number, Bool use_segment_timeline);
+GF_Err gf_media_mpd_format_segment_name(GF_DashTemplateSegmentType seg_type, Bool is_bs_switching, char *segment_name, const char *rep_id, const char *base_url, const char *seg_rad_name, const char *seg_ext, u64 start_time, u32 bandwidth, u32 segment_number, Bool use_segment_timeline, Bool forced);
 
 /*! metrics, not yet supported*/
 typedef struct
@@ -170,6 +171,8 @@
 
 	/*!GPAC internal: redirection for that URL */
 	char *redirection;
+	/*!GPAC internal: original URL relative to HLS  variant playlist  */
+	const char *hls_vp_rel_url;
 } GF_MPD_BaseURL;
 
 /*! MPD URL*/
@@ -233,6 +236,7 @@
 	u64 duration;	\
 	u32 start_number;	\
 	GF_MPD_SegmentTimeline *segment_timeline;	\
+	u32 tsb_first_entry;	\
 	GF_MPD_URL *bitstream_switching_url;	\
 
 /*! Multiple segment base*/
@@ -269,6 +273,10 @@
 	u8 can_merge;
 	/*! merge flag for byte-range subsegs 0: cannot merge, 1: can merge */
 	u8 is_first_part;
+
+
+	u64 first_tfdt, first_pck_seq, frag_start_offset, frag_tfdt;
+	u32 split_first_dur, split_last_dur;
 } GF_MPD_SegmentURL;
 
 /*! SegmentList*/
@@ -289,6 +297,11 @@
 	char *dasher_segment_name;
 	/*! GPAC internal, we store the previous xlink before resolution*/
 	char *previous_xlink_href;
+	/*! GPAC internal for index mode*/
+	Bool index_mode;
+	Bool use_split_dur;
+	u32 sample_duration, src_timescale, pid_delay;
+	s32 first_cts_offset;
 } GF_MPD_SegmentList;
 
 /*! SegmentTemplate*/
@@ -617,6 +630,7 @@
 	GF_DASH_SegmenterContext *dasher_ctx;
 	/*! list of segment states*/
 	GF_List *state_seg_list;
+	s32 tsb_first_entry;
 	/*! segment timescale (for HLS)*/
 	u32 timescale;
 	/*! stream type (for HLS)*/
@@ -660,6 +674,13 @@
 
 	GF_Fraction hls_max_seg_dur;
 
+	//download in progress for m3u8
+	Bool in_progress;
+	char *res_url;
+	u32 trackID;
+
+	Bool sub_forced;
+	const char *hls_forced;
 } GF_MPD_Representation;
 
 /*! AdaptationSet*/
@@ -873,8 +894,13 @@
 	GF_List *supplemental_properties;
 
 	/* internal variables for dasher*/
+
+	/*! inject DASHIF-LL profile service desc*/
 	Bool inject_service_desc;
 
+	/*Generate index mode instead of MPD*/
+	Bool index_mode;
+
 	/*! dasher init NTP clock in ms - GPAC internal*/
 	u64 gpac_init_ntp_ms;
 	/*! dasher next generation time NTP clock in ms - GPAC internal*/
@@ -904,6 +930,13 @@
 	Double llhls_part_holdback;
 	//als absolute url flag
 	u32 hls_abs_url;
+	Bool m3u8_use_repid;
+	Bool hls_audio_primary;
+
+	/*! requested segment duration for index mode */
+	u32 segment_duration;
+	char *segment_template;
+	Bool allow_empty_reps;
 } GF_MPD;
 
 /*! parses an MPD Element (and subtree) from DOM
@@ -958,7 +991,6 @@
 \param _item the MPD Period to free*/
 void gf_mpd_period_free(void *_item);
 /*! writes an MPD to a file stream
-GF_Err gf_mpd_write(GF_MPD const * const mpd, FILE *out, Bool compact);
 \param mpd the target MPD to write
 \param out the target file object
 \param compact if set, removes all new line and indentation in the output
@@ -966,25 +998,35 @@
 */
 GF_Err gf_mpd_write(GF_MPD const * const mpd, FILE *out, Bool compact);
 /*! writes an MPD to a local file
-GF_Err gf_mpd_write(GF_MPD const * const mpd, FILE *out, Bool compact);
 \param mpd the target MPD to write
 \param file_name the target file name
 \return error if any
 */
 GF_Err gf_mpd_write_file(GF_MPD const * const mpd, const char *file_name);
 
+/*! write mode for M3U8 */
+typedef enum
+{
+	/*! write both master and child playlists */
+	GF_M3U8_WRITE_ALL=0,
+	/*! write master  playlist only */
+	GF_M3U8_WRITE_MASTER,
+	/*! write child playlist only */
+	GF_M3U8_WRITE_CHILD,
+} GF_M3U8WriteMode;
+
 /*! writes an MPD to a m3u8 playlist
-GF_Err gf_mpd_write(GF_MPD const * const mpd, FILE *out, Bool compact);
 \param mpd the target MPD to write
 \param out the target file object
 \param m3u8_name the base m3u8 name to use (needed when generating variant playlist file names)
 \param period the MPD period for that m3u8
+\param mode the write operation desired
 \return error if any
 */
-GF_Err gf_mpd_write_m3u8_master_playlist(GF_MPD const * const mpd, FILE *out, const char* m3u8_name, GF_MPD_Period *period);
+GF_Err gf_mpd_write_m3u8_master_playlist(GF_MPD const * const mpd, FILE *out, const char* m3u8_name, GF_MPD_Period *period, GF_M3U8WriteMode mode);
+
 
 /*! parses an MPD Period and appends it to the MPD period list
-GF_Err gf_mpd_write(GF_MPD const * const mpd, FILE *out, Bool compact);
 \param mpd the target MPD to write
 \param root the DOM element describing the period
 \return error if any
@@ -1015,6 +1057,11 @@
 	void (*del_session)(GF_FileDownload *getter);
 	/*! callback function to get the local file name*/
 	const char *(*get_cache_name)(GF_FileDownload *getter);
+	/*! callback function to get download status - returns:
+		- GF_OK: session is done
+		- GF_NOT_READY: session is in progress
+		- Any other error: session done with error*/
+	GF_Err (*get_status)(GF_FileDownload *getter);
 	/*! user private*/
 	void *udta;
 	/*! created by user after new_session*/

gpac-2.2.1.tar.gz/include/gpac/mpeg4_odf.h -> gpac-2.4.0.tar.gz/include/gpac/mpeg4_odf.h Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2022
+ *			Copyright (c) Telecom ParisTech 2000-2024
  *					All rights reserved
  *
  *  This file is part of GPAC / MPEG-4 Object Descriptor sub-project
@@ -855,7 +855,7 @@
 } GF_ContentCreatorInfo;
 
 /*! Content Creator Name GF_Descriptor
-\note The desctructor will delete all the items in the list
+\note The destructor will delete all the items in the list
 (GF_ContentCreatorInfo items) */
 typedef struct {
 	BASE_DESCRIPTOR
@@ -1330,7 +1330,7 @@
 /*! special function for authoring - convert DSI to BIFSConfig
 \param dsi BIFS decoder specific info
 \param codecid BIFS codecid/object type indication
-\return decoded BIFS Config descriptor - It is the caller responsability of freeing it
+\return decoded BIFS Config descriptor - It is the caller responsibility of freeing it
  */
 GF_BIFSConfig *gf_odf_get_bifs_config(GF_DefaultDescriptor *dsi, u32 codecid);
 /*! special function for authoring - convert DSI to LASERConfig
@@ -1349,7 +1349,7 @@
 GF_Err gf_odf_get_text_config(u8 *data, u32 data_len, u32 codecid, GF_TextConfig *cfg);
 /*! converts UIConfig to dsi - does not destroy input descr but does create output one
 \param cfg the UI config object
-\param out_dsi the decoder specific info created. It is the caller responsability of freeing it
+\param out_dsi the decoder specific info created. It is the caller responsibility of freeing it
 \return error if any
  */
 GF_Err gf_odf_encode_ui_config(GF_UIConfig *cfg, GF_DefaultDescriptor **out_dsi);
@@ -1368,7 +1368,7 @@
 GF_AVCConfig *gf_odf_avc_cfg_read(u8 *dsi, u32 dsi_size);
 /*! writes GF_AVCConfig
 \param cfg the AVC config to encode
-\param outData encoded dsi buffer - it is the caller responsability to free this
+\param outData encoded dsi buffer - it is the caller responsibility to free this
 \param outSize  encoded dsi buffer size
 \return error if any
  */
@@ -1413,7 +1413,7 @@
 
 /*! writes GF_HEVCConfig as MPEG-4 DSI
 \param cfg the HEVC config to encode
-\param outData encoded dsi buffer - it is the caller responsability to free this
+\param outData encoded dsi buffer - it is the caller responsibility to free this
 \param outSize  encoded dsi buffer size
 \return error if any
  */
@@ -1452,7 +1452,7 @@
 
 /*! writes GF_VVCConfig as MPEG-4 DSI
 \param cfg the VVC config to encode
-\param outData encoded dsi buffer - it is the caller responsability to free this
+\param outData encoded dsi buffer - it is the caller responsibility to free this
 \param outSize  encoded dsi buffer size
 \return error if any
  */
@@ -1481,7 +1481,7 @@
 
 /*! writes AV1 config to buffer
 \param cfg the AV1 config to write
-\param outData set to an allocated encoded buffer - it is the caller responsability to free this
+\param outData set to an allocated encoded buffer - it is the caller responsibility to free this
 \param outSize set to the encoded dsi buffer size
 \return error if any
 */
@@ -1531,7 +1531,7 @@
 GF_Err gf_odf_vp_cfg_write_bs(GF_VPConfig *cfg, GF_BitStream *bs, Bool is_v0);
 /*! writes VPx config to buffer
 \param cfg the VPx config to write
-\param outData set to an allocated encoded buffer - it is the caller responsability to free this
+\param outData set to an allocated encoded buffer - it is the caller responsibility to free this
 \param outSize set to the encoded buffer size
 \param is_v0 if GF_TRUE, this is a version 0 config
 \return error if any
@@ -1718,7 +1718,7 @@
 a new desc is created and you must delete it when done
 \param raw_desc encoded descriptor to decode
 \param descSize size of descriptor to decode
-\param outDesc output decoded descriptor - it is the caller responsability to free this
+\param outDesc output decoded descriptor - it is the caller responsibility to free this
 \return error if any
 */
 GF_Err gf_odf_desc_read(u8 *raw_desc, u32 descSize, GF_Descriptor **outDesc);
@@ -1727,7 +1727,7 @@
 the desc will be formatted with tag and size field
 the output buffer is allocated and you must delete it when done
 \param desc descriptor to encode
-\param outEncDesc output encoded descriptor - it is the caller responsability to free this
+\param outEncDesc output encoded descriptor - it is the caller responsibility to free this
 \param outSize size of encoded descriptor
 \return error if any
  */
@@ -1748,7 +1748,7 @@
 
 /*! duplicate descriptors
 \param inDesc descriptor to copy
-\param outDesc copied descriptor - it is the caller responsability to free this
+\param outDesc copied descriptor - it is the caller responsibility to free this
 \return error if any
  */
 GF_Err gf_odf_desc_copy(GF_Descriptor *inDesc, GF_Descriptor **outDesc);
@@ -1795,6 +1795,46 @@
  */
 GF_Err gf_odf_desc_list_size(GF_List *descList, u32 *outSize);
 
+/*! DTS audio configuration*/
+typedef struct
+{
+	u32 SamplingFrequency;
+	u32 MaxBitrate;
+	u32 AvgBitrate;
+	u8 SampleDepth;
+	u8 FrameDuration;
+	u8 StreamConstruction;
+	u8 CoreLFEPresent;
+	u8 CoreLayout;
+	u16 CoreSize;
+	u8 StereoDownmix;
+	u8 RepresentationType;
+	u16 ChannelLayout;
+	u8 MultiAssetFlag;
+	u8 LBRDurationMod;
+} GF_DTSConfig;
+
+
+/*! UDTS audio configuration*/
+typedef struct
+{
+	u8 DecoderProfileCode;
+	u8 FrameDurationCode;
+	u8 MaxPayloadCode;
+	u8 NumPresentationsCode;
+	u32 ChannelMask;
+	u8 BaseSamplingFrequencyCode;
+	u8 SampleRateMod;
+	u8 RepresentationType;
+	u8 StreamIndex;
+	u8 ExpansionBoxPresent;
+	u8 IDTagPresent32;
+	u8 *PresentationIDTagData;
+	u16 PresentationIDTagDataSize;
+	u8 *ExpansionBoxData;
+	u32 ExpansionBoxDataSize;
+} GF_UDTSConfig;
+
 
 //! @cond Doxygen_Suppress

gpac-2.2.1.tar.gz/include/gpac/mpegts.h -> gpac-2.4.0.tar.gz/include/gpac/mpegts.h Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre, Cyril Concolato, Romain Bouqueau
- *			Copyright (c) Telecom ParisTech 2006-2022
+ *			Copyright (c) Telecom ParisTech 2006-2023
  *
  *  This file is part of GPAC / MPEG2-TS sub-project
  *
@@ -863,9 +863,10 @@
 	u64 before_last_pcr_value;
 	/*! packet number of before last PCR*/
 	u32 before_last_pcr_value_pck_number;
+	/*! packet number of preceeding PAT before the PES header*/
+	u32 last_pat_packet_number, before_last_pat_pn, before_last_pes_start_pn;
 
-
-	/*! PES reframer callback. If NULL, pes processing is skiped
+	/*! PES reframer callback. If NULL, pes processing is skipped
 
 	returns the number of bytes NOT consumed from the input data buffer - these bytes are kept when reassembling the next PES packet*/
 	u32 (*reframe)(struct tag_m2ts_demux *ts, struct tag_m2ts_pes *pes, Bool same_pts, u8 *data, u32 data_len, GF_M2TS_PESHeader *hdr);
@@ -1136,6 +1137,8 @@
 	/*! current TS packet number*/
 	u32 pck_number;
 
+	/*! TS packet number of last seen packet containing PAT start */
+	u32 last_pat_start_num;
 	/*! remote file handling - created and destroyed by user*/
 	struct __gf_download_session *dnload;
 	/*! channel config path*/
@@ -1214,9 +1217,9 @@
 /*! flushes a given stream. This is used to flush internal demultiplexer buffers on end of stream
 \param demux the target MPEG-2 demultiplexer
 \param pes the target stream to flush
-\param force_flush if GF_TRUE, flushes all streams, otherwise do not flush stream with known PES length and not yet completed (for HLS)
+\param force_flush if >0, flushes all streams, otherwise do not flush stream with known PES length and not yet completed (for HLS)
 */
-void gf_m2ts_flush_pes(GF_M2TS_Demuxer *demux, GF_M2TS_PES *pes, Bool force_flush);
+void gf_m2ts_flush_pes(GF_M2TS_Demuxer *demux, GF_M2TS_PES *pes, u32 force_flush);
 
 /*! flushes all streams in the mux. This is used to flush internal demultiplexer buffers on end of stream
 \param demux the target MPEG-2 demultiplexer
@@ -2001,6 +2004,11 @@
 */
 void gf_m2ts_mux_program_set_name(GF_M2TS_Mux_Program *program, const char *program_name, const char *mux_provider_name);
 
+/*! forces keeping DTS CTS untouched (no remap of first packet to 0) - needed when doing stateless dashing
+\param program the target program
+*/
+void gf_m2ts_mux_program_force_keep_ts(GF_M2TS_Mux_Program *program);
+
 /*! enables sending DVB SDT
 \param muxer the target program
 \param refresh_rate_ms the refresh rate for the SDT. A value of 0 only sends the SDT once

gpac-2.2.1.tar.gz/include/gpac/network.h -> gpac-2.4.0.tar.gz/include/gpac/network.h Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2022
+ *			Copyright (c) Telecom ParisTech 2000-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / common tools sub-project
@@ -180,6 +180,7 @@
 @{
 */
 
+#ifndef GPAC_DISABLE_NETWORK
 
 /*!
 \brief gets ipv6 support
@@ -199,6 +200,39 @@
  */
 Bool gf_net_is_ipv6(const char *address);
 
+/*! Flags for interface enumeration result*/
+enum {
+	/*! set if interface is active*/
+	GF_NETIF_ACTIVE = 1,
+	/*! set if interface has no multicast support*/
+	GF_NETIF_NO_MCAST = 1<<1,
+	/*! set if interface is receive only*/
+	GF_NETIF_RECV_ONLY = 1<<2,
+	/*! set if interface is loopback*/
+	GF_NETIF_LOOPBACK = 1<<3,
+	/*! set if IP address is IPv6*/
+	GF_NETIF_IPV6 = 1<<4,
+};
+/*!  network interface enumeration callback
+\param cbk user data passed to \ref gf_net_enum_interfaces
+\param name interface name
+\param IP interface IP address string, may be NULL
+\param flags flags for interface and address
+\return true to cancel enumeration
+*/
+typedef Bool (*gf_net_ifce_enum)(void *cbk, const char *name, const char *IP, u32 flags);
+
+/*!
+\brief enumerate network interfaces
+
+Enumerates available network interfaces with IP. The callback function is called for each defined IP address of the interface
+\param enum_cbk user data passed to callback function, may be NULL
+\param do_enum  callback function
+\return true if enumeration succeeded, false if not supported
+ */
+Bool gf_net_enum_interfaces(gf_net_ifce_enum do_enum, void *enum_cbk);
+
+#endif
 
 /*!
 host to network conversion of integer
@@ -303,14 +337,6 @@
  */
 s32 gf_net_ntp_diff_ms(u64 ntp_a, u64 ntp_b);
 
-/*! @} */
-
-/*!
-\addtogroup sock_grp
-\brief Sockets (TCP, UDP unicast, multicast)
-@{
-*/
-
 /*!
 \brief error code description
 
@@ -320,6 +346,15 @@
  */
 const char *gf_errno_str(int errnoval);
 
+/*! @} */
+
+#ifndef GPAC_DISABLE_NETWORK
+
+/*!
+\addtogroup sock_grp
+\brief Sockets (TCP, UDP unicast, multicast)
+@{
+*/
 
 /*!
 Socket options
@@ -373,6 +408,17 @@
 \return the socket object or NULL if network initialization failure
  */
 GF_Socket *gf_sk_new(u32 SocketType);
+
+/*!
+\brief socket constructor
+
+Constructs a socket object with a specific netcap configuration ID
+\param SocketType the socket type to create, either UDP or TCP
+\param netcap_id ID of netcap configuration to use, may be null (see gpac -h netcap)
+\return the socket object or NULL if network initialization failure
+ */
+GF_Socket *gf_sk_new_ex(u32 SocketType, const char *netcap_id);
+
 /*!
 \brief socket destructor
 
@@ -559,10 +605,10 @@
 \param multi_port the multicast port number
 \param TTL the multicast TTL (Time-To-Live)
 \param no_bind if sets, only join the multicast
-\param local_interface_ip the local interface IP address if desired. If NULL, the default interface will be used.
+\param ifce_ip_or_name the local interface IP address or name if desired. If NULL, the default interface will be used.
 \return error if any
  */
-GF_Err gf_sk_setup_multicast(GF_Socket *sock, const char *multi_ip_add, u16 multi_port, u32 TTL, Bool no_bind, char *local_interface_ip);
+GF_Err gf_sk_setup_multicast(GF_Socket *sock, const char *multi_ip_add, u16 multi_port, u32 TTL, Bool no_bind, const char *ifce_ip_or_name);
 
 /*!
 \brief source-specific multicast setup
@@ -573,14 +619,14 @@
 \param multi_port the multicast port number
 \param TTL the multicast TTL (Time-To-Live)
 \param no_bind if sets, only join the multicast
-\param local_interface_ip the local interface IP address if desired. If NULL, the default interface will be used.
+\param ifce_ip_or_name the local interface IP address or name if desired. If NULL, the default interface will be used.
 \param src_ip_inc IP of sources to receive from
 \param nb_src_ip_inc number of sources to receive from
 \param src_ip_exc IP of sources to exclude
 \param nb_src_ip_exc number of sources to exclude
 \return error if any
  */
-GF_Err gf_sk_setup_multicast_ex(GF_Socket *sock, const char *multi_ip_add, u16 multi_port, u32 TTL, Bool no_bind, char *local_interface_ip, const char **src_ip_inc, u32 nb_src_ip_inc, const char **src_ip_exc, u32 nb_src_ip_exc);
+GF_Err gf_sk_setup_multicast_ex(GF_Socket *sock, const char *multi_ip_add, u16 multi_port, u32 TTL, Bool no_bind, const char *ifce_ip_or_name, const char **src_ip_inc, u32 nb_src_ip_inc, const char **src_ip_exc, u32 nb_src_ip_exc);
 
 /*!
  \brief multicast address test
@@ -680,7 +726,7 @@
 \param sg socket group object
 \param wait_usec microseconds to wait (must be less than one second)
 \param mode the operation mode desired
-\return error if any
+\return error if any - if using a capture file and the capture is done, returns GF_IP_CONNECTION_CLOSED if TCP sockets are present, otherwise GF_EOS
  */
 GF_Err gf_sk_group_select(GF_SockGroup *sg, u32 wait_usec, GF_SockSelectMode mode);
 
@@ -694,6 +740,7 @@
 Bool gf_sk_group_sock_is_set(GF_SockGroup *sg, GF_Socket *sk, GF_SockSelectMode mode);
 
 /*! @} */
+#endif //GPAC_DISABLE_NETWORK
 
 
 #ifdef __cplusplus

gpac-2.2.1.tar.gz/include/gpac/route.h -> gpac-2.4.0.tar.gz/include/gpac/route.h Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2017-2020
+ *			Copyright (c) Telecom ParisTech 2017-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / ROUTE (ATSC3, DVB-I) demuxer
@@ -36,17 +36,17 @@
 
 /*!
 \file <gpac/route.h>
-\brief Specific extensions for ROUTE ( ATSC3, DVB-I) protocol
+\brief Specific extensions for ROUTE (ATSC3, DVB-I) protocol
 */
 
 /*!
 \addtogroup route_grp ROUTE
 \ingroup media_grp
-\brief ROUTE ATSC 3.0 reciever
+\brief ROUTE ATSC 3.0 receiver
 
 The ROUTE receiver implements part of the ATSC 3.0 specification, mostly low-level signaling and ROUTE reception.
 It gathers objects from a ROUTE session and sends them back to the user through a callback, or deletes them if no callback is sent.
-The route demuxer does not try to repairing files, it is the user responsability to do so.
+The route demuxer does not try to repairing files, it is the user responsibility to do so.
 
 @{
 */
@@ -143,23 +143,48 @@
 /*! Creates a new ROUTE ATSC3.0 demultiplexer
 \param ifce network interface to monitor, NULL for INADDR_ANY
 \param sock_buffer_size default buffer size for the udp sockets. If 0, uses 0x2000
- \param on_event the user callback function
- \param udta the user data passed back by the callback
+\param on_event the user callback function
+\param udta the user data passed back by the callback
 \return the ROUTE demultiplexer created
 */
 GF_ROUTEDmx *gf_route_atsc_dmx_new(const char *ifce, u32 sock_buffer_size, void (*on_event)(void *udta, GF_ROUTEEventType evt, u32 evt_param, GF_ROUTEEventFileInfo *finfo), void *udta);
 
+
+/*! Creates a new ROUTE ATSC3.0 demultiplexer
+\param ifce network interface to monitor, NULL for INADDR_ANY
+\param sock_buffer_size default buffer size for the udp sockets. If 0, uses 0x2000
+\param netcap_id ID of netcap configuration to use, may be null (see gpac -h netcap)
+\param on_event the user callback function
+\param udta the user data passed back by the callback
+\return the ROUTE demultiplexer created
+*/
+GF_ROUTEDmx *gf_route_atsc_dmx_new_ex(const char *ifce, u32 sock_buffer_size, const char *netcap_id, void (*on_event)(void *udta, GF_ROUTEEventType evt, u32 evt_param, GF_ROUTEEventFileInfo *finfo), void *udta);
+
+
 /*! Creates a new ROUTE demultiplexer
 \param ip IP address of ROUTE session
 \param port port of ROUTE session
 \param ifce network interface to monitor, NULL for INADDR_ANY
 \param sock_buffer_size default buffer size for the udp sockets. If 0, uses 0x2000
- \param on_event the user callback function
- \param udta the user data passed back by the callback
+\param on_event the user callback function
+\param udta the user data passed back by the callback
 \return the ROUTE demultiplexer created
 */
 GF_ROUTEDmx *gf_route_dmx_new(const char *ip, u32 port, const char *ifce, u32 sock_buffer_size, void (*on_event)(void *udta, GF_ROUTEEventType evt, u32 evt_param, GF_ROUTEEventFileInfo *finfo), void *udta);
 
+
+/*! Creates a new ROUTE demultiplexer
+\param ip IP address of ROUTE session
+\param port port of ROUTE session
+\param ifce network interface to monitor, NULL for INADDR_ANY
+\param sock_buffer_size default buffer size for the udp sockets. If 0, uses 0x2000
+\param netcap_id ID of netcap configuration to use, may be null (see gpac -h netcap)
+\param on_event the user callback function
+\param udta the user data passed back by the callback
+\return the ROUTE demultiplexer created
+*/
+GF_ROUTEDmx *gf_route_dmx_new_ex(const char *ip, u32 port, const char *ifce, u32 sock_buffer_size, const char *netcap_id, void (*on_event)(void *udta, GF_ROUTEEventType evt, u32 evt_param, GF_ROUTEEventFileInfo *finfo), void *udta);
+
 /*! Deletes an ROUTE demultiplexer
 \param routedmx the ROUTE demultiplexer to delete
 */

gpac-2.2.1.tar.gz/include/gpac/rtp_streamer.h -> gpac-2.4.0.tar.gz/include/gpac/rtp_streamer.h Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2019
+ *			Copyright (c) Telecom ParisTech 2000-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / media tools sub-project
@@ -49,7 +49,7 @@
 
 #include <gpac/ietf.h>
 
-#if !defined(GPAC_DISABLE_STREAMING) && !defined(GPAC_DISABLE_ISOM)
+#if !defined(GPAC_DISABLE_STREAMING)
 
 /*! RTP streamer object*/
 typedef struct __rtp_streamer GF_RTPStreamer;
@@ -94,6 +94,72 @@
         Bool is_crypted, u32 IV_length, u32 KI_length,
         u32 MinSize, u32 MaxSize, u32 avgTS, u32 maxDTSDelta, u32 const_dur, u32 bandwidth, u32 max_ptime, u32 au_sn_len, Bool for_rtsp);
 
+/*! RTP streamer configuration*/
+typedef struct
+{
+	//! type of the stream (GF_STREAM_* as defined in <gpac/constants.h>
+	u32 streamType;
+	//! codec ID for the stream (GF_CODEC_* as defined in <gpac/constants.h>)
+	u32 codecid;
+	//! unit to express timestamps of access units
+	u32 timeScale;
+	//! IP address of the destination
+	const char *ip_dest;
+	//! port number of the destination
+	u16 port;
+	//! Maximum Transmission Unit size to use
+	u32 MTU;
+	//! Time To Leave
+	u8 TTL;
+	//! IP of the local interface to use (may be NULL)
+	const char *ifce_addr;
+	//! set of RTP flags passed to the streamer
+	u32 flags;
+	//! MPEG-4 Decoder Specific Info for the stream
+	const u8 *dsi;
+	//! length of the dsi parameter
+	u32 dsi_len;
+	//! RTP payload type
+	u32 PayloadType;
+	//!  audio sample rate
+	u32 sample_rate;
+	//! number of channels in audio streams
+	u32 nb_ch;
+	//! indicating if the stream is crypted
+	Bool is_crypted;
+	//! length of the Initialisation Vector used for ISMA encryption
+	u32 IV_length;
+	//! length of the key index
+	u32 KI_length;
+	//! minimum AU size, 0 if unknown
+	u32 MinSize;
+	//maximum AU size, 0 if unknown
+	u32 MaxSize;
+	//! average TS delta in timeScale, 0 if unknown
+	u32 avgTS;
+	//! maximum DTS delta in timeScale, 0 if unknown
+	u32 maxDTSDelta;
+	//! constant duration in timeScale, 0 if unknown
+	u32 const_dur;
+	//! bandwidth, 0 if unknown
+	u32 bandwidth;
+	//! maximum packet duration in timeScale, 0 if unknown
+	u32 max_ptime;
+	//! length of the MPEG-4 SL descriptor AU sequence number field, 0 if unknown
+	u32 au_sn_len;
+	//! ID of netcap configuration to use, may be null (see gpac -h netcap)
+	const char *netcap_id;
+} GF_RTPStreamerConfig;
+
+/*!
+\brief RTP Streamer constructor with extended parameters
+
+Constructs a new RTP file streamer
+\param cfg configuration of the streamer
+\param for_rtsp indicates this is an RTP channel in an RTSP session, RTP channel will not be created, use \ref gf_rtp_streamer_init_rtsp
+\return a new RTP streamer, or NULL of error or not supported
+ */GF_RTPStreamer *gf_rtp_streamer_new_ex(const GF_RTPStreamerConfig *cfg, Bool for_rtsp);
+
 /*!
 \brief RTP file streamer destructor

gpac-2.2.1.tar.gz/include/gpac/scene_engine.h -> gpac-2.4.0.tar.gz/include/gpac/scene_engine.h Changed

gpac-2.2.1.tar.gz/include/gpac/scenegraph.h -> gpac-2.4.0.tar.gz/include/gpac/scenegraph.h Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2019
+ *			Copyright (c) Telecom ParisTech 2000-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / Scene Graph sub-project
@@ -247,7 +247,7 @@
 typedef void (*gf_sg_node_callback)(GF_Node *n, void *traverse_state, Bool is_destroy);
 
 /*! sets traversal callback function. If a node has no associated callback, the traversing of the
-graph won't propagate below it. It is the app responsability to setup traversing functions as needed
+graph won't propagate below it. It is the app responsibility to setup traversing functions as needed
 VRML/MPEG4:  Instantiated Protos are handled internally as well as interpolators, valuators and scripts
 \param n the target node
 \param NodeFunction the callback function
@@ -344,7 +344,7 @@
 	GF_SG_NODE_DIRTY = 1,
 	/*flag set whenever a child node of this node has been modified
 	\note Unloaded extern protos always invalidate their parent subgraph to get a chance
-	of being loaded. It is the user responsability to clear the CHILD_DIRTY flag before traversing
+	of being loaded. It is the user responsibility to clear the CHILD_DIRTY flag before traversing
 	if relying on this flag for sub-tree discarding (eg, culling or similar)*/
 	GF_SG_CHILD_DIRTY = 1<<1,
 
@@ -403,7 +403,7 @@
 */
 void gf_node_dirty_parents(GF_Node *n);
 
-/*! sets dirty flag off. It is the user responsability to clear dirty flags
+/*! sets dirty flag off. It is the user responsibility to clear dirty flags
 \param n the target node
 \param flags if 0, all flags are set off; otherwise, removes the indicated flags from the node dirty state
 */

gpac-2.2.1.tar.gz/include/gpac/scenegraph_vrml.h -> gpac-2.4.0.tar.gz/include/gpac/scenegraph_vrml.h Changed

gpac-2.2.1.tar.gz/include/gpac/setup.h -> gpac-2.4.0.tar.gz/include/gpac/setup.h Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2019
+ *			Copyright (c) Telecom ParisTech 2000-2024
  *					All rights reserved
  *
  *  This file is part of GPAC / general OS configuration file
@@ -311,6 +311,9 @@
 #include <string.h>
 #include <assert.h>
 
+/*! file descriptor support*/
+#define GPAC_HAS_FD
+
 #if __APPLE__ && defined GPAC_CONFIG_IOS
 #include <TargetConditionals.h>
 #endif
@@ -550,7 +553,11 @@
 
 
 #if !defined(GF_EXPORT)
-#if defined(__GNUC__) && __GNUC__ >= 4 && !defined(GPAC_CONFIG_IOS)
+#if defined(GPAC_CONFIG_EMSCRIPTEN)
+//global include for using EM_ASM
+#include <emscripten/emscripten.h>
+#define GF_EXPORT EMSCRIPTEN_KEEPALIVE
+#elif defined(__GNUC__) && __GNUC__ >= 4 && !defined(GPAC_CONFIG_IOS)
 /*! macro for cross-platform signaling of exported function of libgpac*/
 #define GF_EXPORT __attribute__((visibility("default")))
 #else
@@ -568,13 +575,49 @@
 #define GPAC_STATIC_MODULES
 #endif
 
-/*safety checks on macros*/
+/*dependency checks on macros*/
+
+#ifdef GPAC_DISABLE_NETWORK
+# ifndef GPAC_DISABLE_STREAMING
+# define GPAC_DISABLE_STREAMING
+# endif
+# ifndef GPAC_DISABLE_ROUTE
+# define GPAC_DISABLE_ROUTE
+# endif
+# ifdef GPAC_HAS_IPV6
+# undef GPAC_HAS_IPV6
+# endif
+# ifdef GPAC_HAS_SOCK_UN
+# undef GPAC_HAS_SOCK_UN
+# endif
+# ifndef GPAC_DISABLE_NETCAP
+# define GPAC_DISABLE_NETCAP
+# endif
+#endif
+
+
+#if !defined(GPAC_DISABLE_NETWORK) || defined(GPAC_CONFIG_EMSCRIPTEN)
+#define GPAC_USE_DOWNLOADER
+#endif
+
 
 #ifdef GPAC_DISABLE_ZLIB
 # define GPAC_DISABLE_LOADER_BT
 # define GPAC_DISABLE_SWF_IMPORT
 #endif
 
+#ifdef GPAC_DISABLE_EVG
+# ifndef GPAC_DISABLE_COMPOSITOR
+# define GPAC_DISABLE_COMPOSITOR
+# endif
+# ifndef GPAC_DISABLE_SVG
+# define GPAC_DISABLE_SVG
+# endif
+# ifndef GPAC_DISABLE_FONTS
+# define GPAC_DISABLE_FONTS
+# endif
+#endif
+
 #ifdef GPAC_DISABLE_VRML
 # ifndef GPAC_DISABLE_BIFS
 # define GPAC_DISABLE_BIFS
@@ -669,11 +712,25 @@
 # endif
 #endif
 
+#ifdef GPAC_DISABLE_MEDIA_IMPORT
+# ifndef GPAC_DISABLE_VTT
+# define GPAC_DISABLE_VTT
+# endif
+#endif
+
 //we currently disable all extra IPMP/IPMPX/OCI/extra MPEG-4 descriptors parsing
 #ifndef GPAC_MINIMAL_ODF
 #define GPAC_MINIMAL_ODF
 #endif
 
+#ifdef GPAC_CONFIG_EMSCRIPTEN
+#define EM_CAST_PTR	(int)
+#endif
+
+#if defined(GPAC_DISABLE_DASHER) && defined(GPAC_DISABLE_DASHIN)
+#define GPAC_DISABLE_MPD
+#endif
+
 //define this to remove most of built-in doc of libgpac - for now filter description and help is removed, but argument help is not
 //#define GPAC_DISABLE_DOC
 
@@ -762,6 +819,44 @@
 */
 size_t gf_strlcpy(char *dst, const char *src, size_t dsize);
 
+#ifdef GPAC_ASSERT_FATAL
+/*! fatal error assert, will always kill the program if condition is false
+ \param _cond condition to test
+*/
+#define gf_fatal_assert(_cond) if (! (_cond)) { fprintf(stderr, "Fatal error " #_cond " file %s line %d, exiting\n", (strstr(__FILE__, "gpac") ? strstr(__FILE__, "gpac") + 5 : __FILE__), __LINE__ ); exit(10); }
+/*!  error assert, will assert if condition is false but will not always kill the program
+ \param _cond condition to test
+*/
+#define gf_assert(_cond) gf_fatal_assert(_cond)
+#elif defined(NDEBUG)
+//! @cond Doxygen_Suppress
+#define gf_assert(_cond)
+#define gf_fatal_assert(_cond) if (! (_cond)) { fprintf(stderr, "Fatal error " #_cond " file %s line %d, exiting\n", (strstr(__FILE__, "gpac") ? strstr(__FILE__, "gpac") + 5 : __FILE__), __LINE__ ); exit(10); }
+//! @endcond
+#else
+//! @cond Doxygen_Suppress
+#define gf_assert(_cond) assert(_cond)
+#define gf_fatal_assert(_cond) assert(_cond)
+//! @endcond
+#endif
+
+#if defined(_DEBUG)
+#ifdef NDEBUG
+#undef NDEBUG
+#endif
+#endif
+
+#if defined(NDEBUG)
+#ifdef GPAC_ENABLE_DEBUG
+#undef GPAC_ENABLE_DEBUG
+#endif
+#else
+#ifndef GPAC_ENABLE_DEBUG
+/*! Macro for detecting debug configurations*/
+#define GPAC_ENABLE_DEBUG
+#endif
+#endif
+
 #ifdef __cplusplus
 }
 #endif

gpac-2.2.1.tar.gz/include/gpac/sync_layer.h -> gpac-2.4.0.tar.gz/include/gpac/sync_layer.h Changed

gpac-2.2.1.tar.gz/include/gpac/thread.h -> gpac-2.4.0.tar.gz/include/gpac/thread.h Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2021
+ *			Copyright (c) Telecom ParisTech 2000-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / common tools sub-project
@@ -184,6 +184,42 @@
 	GF_THREAD_STATUS_DEAD = 2
 };
 
+/*! thread priorities */
+enum
+{
+	/*!Idle Priority*/
+	GF_THREAD_PRIORITY_IDLE=0,
+	/*!Less Idle Priority*/
+	GF_THREAD_PRIORITY_LESS_IDLE,
+	/*!Lowest Priority*/
+	GF_THREAD_PRIORITY_LOWEST,
+	/*!Low Priority*/
+	GF_THREAD_PRIORITY_LOW,
+	/*!Normal Priority (the default one)*/
+	GF_THREAD_PRIORITY_NORMAL,
+	/*!High Priority*/
+	GF_THREAD_PRIORITY_HIGH,
+	/*!Highest Priority*/
+	GF_THREAD_PRIORITY_HIGHEST,
+	/*!First real-time priority*/
+	GF_THREAD_PRIORITY_REALTIME,
+	/*!Last real-time priority*/
+	GF_THREAD_PRIORITY_REALTIME_END=255
+};
+
+
+/*!
+\brief thread run function callback
+
+The gf_thread_run type is the type for the callback of the \ref gf_thread_run function
+\param par opaque user data
+\return exit code of the thread, usually 1 for error and 0 if normal execution
+ */
+typedef u32 (*gf_thread_run)(void *par);
+
+
+#ifndef GPAC_DISABLE_THREADS
+
 /*!
 \brief abstracted thread object
 */
@@ -206,15 +242,6 @@
 void gf_th_del(GF_Thread *th);
 
 /*!
-\brief thread run function callback
-
-The gf_thread_run type is the type for the callback of the \ref gf_thread_run function
-\param par opaque user data
-\return exit code of the thread, usually 1 for error and 0 if normal execution
- */
-typedef u32 (*gf_thread_run)(void *par);
-
-/*!
 \brief thread execution
 
 Executes the thread with the given function
@@ -241,29 +268,6 @@
  */
 u32 gf_th_status(GF_Thread *th);
 
-/*! thread priorities */
-enum
-{
-	/*!Idle Priority*/
-	GF_THREAD_PRIORITY_IDLE=0,
-	/*!Less Idle Priority*/
-	GF_THREAD_PRIORITY_LESS_IDLE,
-	/*!Lowest Priority*/
-	GF_THREAD_PRIORITY_LOWEST,
-	/*!Low Priority*/
-	GF_THREAD_PRIORITY_LOW,
-	/*!Normal Priority (the default one)*/
-	GF_THREAD_PRIORITY_NORMAL,
-	/*!High Priority*/
-	GF_THREAD_PRIORITY_HIGH,
-	/*!Highest Priority*/
-	GF_THREAD_PRIORITY_HIGHEST,
-	/*!First real-time priority*/
-	GF_THREAD_PRIORITY_REALTIME,
-	/*!Last real-time priority*/
-	GF_THREAD_PRIORITY_REALTIME_END=255
-};
-
 /*!
 \brief thread priority
 
@@ -405,7 +409,7 @@
 
 Waits for the semaphore to be accessible (eg, may wait an infinite time).
 \param sm the semaphore object
-\return GF_TRUE if successfull wait, GF_FALSE if wait failed
+\return GF_TRUE if successful wait, GF_FALSE if wait failed
 */
 Bool gf_sema_wait(GF_Semaphore *sm);
 /*!
@@ -419,6 +423,40 @@
 Bool gf_sema_wait_for(GF_Semaphore *sm, u32 time_out);
 
 
+#else
+
+typedef void * GF_Thread;
+#define gf_th_new(_name) NULL
+#define gf_th_del(_th)
+#define gf_th_run(_th, _run, _par) GF_OK
+#define gf_th_stop(_th)
+#define gf_th_status(_th) GF_THREAD_STATUS_DEAD
+#define gf_th_set_priority(_th, _priority)
+#define gf_th_id() 0
+
+#ifdef GPAC_CONFIG_ANDROID
+#define gf_register_before_exit_function(_t, _fun)
+#define gf_th_current() NULL
+#endif /* GPAC_CONFIG_ANDROID */
+
+typedef void *GF_Mutex;
+#define gf_mx_new(_name) NULL
+#define gf_mx_del(_mx)
+#define gf_mx_p(_mx) 1
+#define gf_mx_v(_mx)
+#define gf_mx_try_lock(_mx) GF_TRUE
+#define gf_mx_get_num_locks(_mx) 0
+
+typedef void *GF_Semaphore;
+#define gf_sema_new(_MaxCount, _InitCount) NULL
+#define gf_sema_del(_sm)
+#define gf_sema_notify(_sm, _nb_rel) GF_TRUE
+#define gf_sema_wait(_sm) GF_TRUE
+#define gf_sema_wait_for(_sm, _time_out) GF_TRUE
+
+#endif
+
+
 /*! @} */
 
 #ifdef __cplusplus

gpac-2.2.1.tar.gz/include/gpac/tools.h -> gpac-2.4.0.tar.gz/include/gpac/tools.h Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2022
+ *			Copyright (c) Telecom ParisTech 2000-2024
  *					All rights reserved
  *
  *  This file is part of GPAC / common tools sub-project
@@ -82,6 +82,13 @@
 */
 const char *gf_4cc_to_str(u32 type);
 
+/*! converts four character code to string in the provided buffer - thread-safe version of \ref gf_4cc_to_str
+\param type a four character code
+\param szType buffer to write the code to
+\return the onput buffer
+*/
+const char *gf_4cc_to_str_safe(u32 type, char szTypeGF_4CC_MSIZE);
+
 /*! converts a 4CC string to its 32 bits value
 \param val  four character string
 \return code value or 0 if error
@@ -188,8 +195,8 @@
 
 	/*! Authentication with the remote host has failed*/
 	GF_AUTHENTICATION_FAILURE				= -50,
-	/*! Script not ready for playback */
-	GF_SCRIPT_NOT_READY						= -51,
+	/*! Not ready for execution, later retry is needed */
+	GF_NOT_READY						= -51,
 	/*! Bad configuration for the current context */
 	GF_INVALID_CONFIGURATION				= -52,
 	/*! The element has not been found */
@@ -281,7 +288,7 @@
 /*!
 \brief search string without case
 
-Search a aubstring in a string witout checking for case
+Search a substring in a string without checking for case
 \param text text to search
 \param subtext string to find
 \param subtext_len length of string to find
@@ -289,6 +296,16 @@
  */
 Bool gf_strnistr(const char *text, const char *subtext, u32 subtext_len);
 
+/*!
+\brief search string in buffer
+
+Search for a substring in a memory buffer of characters that may not be null-terminated
+\param data buffer of chars in which to search
+\param data_size size of data buffer
+\param pat pattern to search for as a null-terminated string
+\return a pointer to the first occurrence of pat in data, or null if not found (may not be null-terminated)
+ */
+const char* gf_strmemstr(const char *data, u32 data_size, const char *pat);
 
 /*!
 \brief safe timestamp rescale
@@ -372,6 +389,27 @@
  */
 Bool gf_timestamp_equal(u64 value1, u64 timescale1, u64 value2, u64 timescale2);
 
+/*!
+\brief strict convert str into integer
+
+Validate and parse str into integer
+\param str text to convert to integer
+\param ans integer to fill
+\return GF_TRUE if str represents an integer without any leading space nor extra chars
+ */
+Bool gf_strict_atoi(const char* str, s32* ans);
+
+/*!
+\brief strict convert str into unsigned integer
+
+Validate and parse str into integer
+\param str text to convert to integer
+\param ans unsigned integer to fill
+\return GF_TRUE if str represents an unsigned integer without any leading space nor extra chars
+*/
+Bool gf_strict_atoui(const char* str, u32* ans);
+
+
 /*! @} */
 
 /*!
@@ -594,6 +632,12 @@
 GF_Err gf_sys_profiler_set_callback(void *udta, gf_rmt_user_callback rmt_usr_cbk);
 
 
+/*! Sends a log message to remotery web client
+\param msg text message to send. The message format should be json
+\return GF_OK if success, GF_BAD_PARAM if profiler is not running, GF_NOT_SUPPORTED if profiler not supported
+*/
+GF_Err gf_sys_profiler_log(const char *msg);
+
 /*! Sends a message to remotery web client
 \param msg text message to send. The message format should be json
 \return GF_OK if success, GF_BAD_PARAM if profiler is not running, GF_NOT_SUPPORTED if profiler not supported
@@ -771,6 +815,7 @@
 	/*! special value used to set a level for all tools*/
 	GF_LOG_ALL,
 	GF_LOG_TOOL_MAX = GF_LOG_ALL,
+	GF_LOG_TOOL_UNDEFINED
 } GF_LOG_Tool;
 
 /*!
@@ -912,7 +957,30 @@
 */
 void gf_log_reset_file();
 
+//! Extra log instructions
+typedef struct log_extra
+{
+	//! number of tools and levels
+	u32 nb_tools;
+	//! additionnal  tools
+	GF_LOG_Tool *tools;
+	//! additionnal  levels for the tools
+	GF_LOG_Level *levels;
+	//! exit if error
+	Bool strict;
+} GF_LogExtra;
 
+/*! Register a new extra log levels
+ \param log extra levels to add - may be NULL but shall be valid until call to \ref gf_log_pop_extra or \ref gf_log_reset_extras or  end of app
+*/
+void gf_log_push_extra(const GF_LogExtra *log);
+/*! Unregister an extra log levels
+ \param log extra levels to add - may be NULL
+*/
+void gf_log_pop_extra(const GF_LogExtra *log);
+/*! Unregister all  extra log levels
+*/
+void gf_log_reset_extras();
 
 /*!	@} */
 
@@ -1053,8 +1121,12 @@
 	u32 size;
     /*! blob flags */
     u32 flags;
+#ifdef GPAC_DISABLE_THREADS
+    void *mx;
+#else
     /*! blob mutex for multi-thread access */
     struct __tag_mutex *mx;
+#endif
 } GF_Blob;
 
 /*!
@@ -1102,7 +1174,7 @@
 \param showContent boolean indicating if the line read should be printed on stderr or not
 \return GF_TRUE if some content was read, GF_FALSE otherwise
 */
-u32 gf_read_line_input(char * line, int maxSize, Bool showContent);
+Bool gf_read_line_input(char * line, int maxSize, Bool showContent);
 
 
 /*!
@@ -1508,7 +1580,7 @@
 u64 gf_fsize(FILE *fp);
 
 /*!
-\brief file IO helper
+\brief file IO checker
 
 Checks if the given FILE object is a native FILE or a GF_FileIO wrapper.
 \param fp FILE object to check
@@ -1516,6 +1588,25 @@
 */
 Bool gf_fileio_check(FILE *fp);
 
+/*! FileIO write state*/
+typedef enum
+{
+	/*! FileIO object is ready for write operations*/
+	GF_FIO_WRITE_READY=0,
+	/*! FileIO object is not yet ready for write operations*/
+	GF_FIO_WRITE_WAIT,
+	/*! FileIO object has been canceled*/
+	GF_FIO_WRITE_CANCELED,
+} GF_FileIOWriteState;
+/*!
+\brief file IO write checker
+
+Checks if the given FILE object is ready for write.
+\param fp FILE object to check
+\return write state of GF_FileIO object, GF_FIO_WRITE_READY if not a GF_FileIO object
+*/
+GF_FileIOWriteState gf_fileio_write_ready(FILE *fp);
+
 /*!
 \brief file opening
 
@@ -1532,7 +1623,7 @@
 Opens a file, potentially using file IO if the parent URL is a File IO wrapper
 \param file_name same as fopen
 \param parent_url URL of parent file. If not a file io wrapper (gfio://), the function is equivalent to gf_fopen
-\param mode same as fopen
+\param mode same as fopen - value "mkdir" checks if parent dir(s) need to be created, create them if needed and returns NULL (no file open)
 \param no_warn if GF_TRUE, do not throw log message if failure
 \return stream handle of the file object
 \note You only need to call this function if you're suspecting the file to be a large one (usually only media files), otherwise use regular stdio.
@@ -1747,7 +1838,7 @@
 
 /*! Creates a new file IO object
 
-There is no guarantee that the corresponding resource will be opened by the framework, it is therefore the caller responsability to track objects created by
+There is no guarantee that the corresponding resource will be opened by the framework, it is therefore the caller responsibility to track objects created by
 gf_fileio_new or as a response to open with mode "url".
 
 \param url the original URL this file IO object wraps
@@ -1788,24 +1879,50 @@
 */
 const char * gf_fileio_url(GF_FileIO *fileio);
 
+/*! Gets a fileIO object from memory - the resulting fileIO can only be opened once at any time but can be closed/reopen.
+\param URL of source data, may be null
+\param data memory, must be valid until next close
+\param size memory size
+\return new file IO - use gf_fclose() on this object to close it
+*/
+GF_FileIO *gf_fileio_from_mem(const char *URL, const u8 *data, u32 size);
+
+/*! Cache state for file IO object*/
+typedef enum
+{
+	/*! File caching is in progress*/
+	GF_FILEIO_CACHE_IN_PROGRESS=0,
+	/*! File caching is done */
+	GF_FILEIO_CACHE_DONE,
+	/*! No file caching (file is not stored to disk)) */
+	GF_FILEIO_NO_CACHE,
+} GF_FileIOCacheState;
+
+
 /*! Sets statistics on a fileIO object.
 \param fileio target file IO object
 \param bytes_done number of bytes fetched for this file
 \param file_size total size of this file, 0 if unknown
-\param cache_complete if GF_TRUE, means the file is completely available
+\param cache_state if GF_TRUE, means the file is completely available
 \param bytes_per_sec reception bytes per second, 0 if unknown
 */
-void gf_fileio_set_stats(GF_FileIO *fileio, u64 bytes_done, u64 file_size, Bool cache_complete, u32 bytes_per_sec);
+void gf_fileio_set_stats(GF_FileIO *fileio, u64 bytes_done, u64 file_size, GF_FileIOCacheState cache_state, u32 bytes_per_sec);
 
 /*! Gets statistics on a fileIO object.
 \param fileio target file IO object
 \param bytes_done number of bytes fetched for this file (may be NULL)
 \param file_size total size of this file, 0 if unknown (may be NULL)
-\param cache_complete if GF_TRUE, means the file is completely available (may be NULL)
+\param cache_state set to caching state for this object (may be NULL)
 \param bytes_per_sec reception bytes per second, 0 if unknown (may be NULL)
 \return GF_TRUE if success, GF_FALSE otherwise
 */
-Bool gf_fileio_get_stats(GF_FileIO *fileio, u64 *bytes_done, u64 *file_size, Bool *cache_complete, u32 *bytes_per_sec);
+Bool gf_fileio_get_stats(GF_FileIO *fileio, u64 *bytes_done, u64 *file_size, GF_FileIOCacheState *cache_state, u32 *bytes_per_sec);
+
+/*! Sets write state of a  fileIO object.
+\param fileio target file IO object
+\param write_state the state to set
+*/
+void gf_fileio_set_write_state(GF_FileIO *fileio, GF_FileIOWriteState write_state);
 
 /*! Checks if a FileIO object can write
 \param fileio target file IO object
@@ -1912,21 +2029,34 @@
 \param data_offset offset in source buffer - the input payload size is data_len - data_offset
 \param skip_if_larger if GF_TRUE, will not override source buffer if compressed version is larger than input data
 \param out_comp_data if not NULL, the compressed result is set in this pointer rather than doing inplace compression
+\param use_gz if true, GZ header is present
 \return error if any
  */
-GF_Err gf_gz_compress_payload_ex(u8 **data, u32 data_len, u32 *out_size, u8 data_offset, Bool skip_if_larger, u8 **out_comp_data);
+GF_Err gf_gz_compress_payload_ex(u8 **data, u32 data_len, u32 *out_size, u8 data_offset, Bool skip_if_larger, u8 **out_comp_data, Bool use_gz);
 
 /**
-Decompresses a data buffer using zlib/deflate.
+Decompresses a data buffer using zlib/inflate.
 \param data data buffer to be decompressed
 \param data_len length of the data buffer to be decompressed
-\param uncompressed_data pointer to the uncompressed data buffer. It is the responsibility of the caller to free this buffer.
+\param uncompressed_data pointer to the uncompressed data buffer. The resulting buffer is NULL-terminated. It is the responsibility of the caller to free this buffer.
 \param out_size size of the uncompressed buffer
 \return error if any
  */
 GF_Err gf_gz_decompress_payload(u8 *data, u32 data_len, u8 **uncompressed_data, u32 *out_size);
 
 /**
+Decompresses a data buffer using zlib/inflate.
+\param data data buffer to be decompressed
+\param data_len length of the data buffer to be decompressed
+\param uncompressed_data pointer to the uncompressed data buffer. The resulting buffer is NULL-terminated. It is the responsibility of the caller to free this buffer.
+\param out_size size of the uncompressed buffer
+\param use_gz if true, gz header is present
+\return error if any
+ */
+GF_Err gf_gz_decompress_payload_ex(u8 *data, u32 data_len, u8 **uncompressed_data, u32 *out_size, Bool use_gz);
+
+
+/**
 Compresses a data buffer in place using LZMA. Buffer may be reallocated in the process.
 \param data pointer to the data buffer to be compressed
 \param data_len length of the data buffer to be compressed
@@ -2186,7 +2316,7 @@
 
 //! @cond Doxygen_Suppress
 
-#ifdef GPAC_DISABLE_3D
+#if defined(GPAC_DISABLE_3D) && !defined(GPAC_DISABLE_REMOTERY)
 #define GPAC_DISABLE_REMOTERY 1
 #endif
 
@@ -2223,7 +2353,7 @@
 
 /*to call whenever the OpenGL library is opened - this function is needed to bind OpenGL and remotery, and to load
 OpenGL extensions on windows
-not exported, and not included in src/compositor/gl_inc.h since it may be needed even when no OpenGL 
+not exported, and not included in src/compositor/gl_inc.h since it may be needed even when no OpenGL
 calls are made by the caller*/
 void gf_opengl_init();
 
@@ -2288,4 +2418,3 @@
 
 
 #endif		/*_GF_CORE_H_*/
-

gpac-2.2.1.tar.gz/include/gpac/utf.h -> gpac-2.4.0.tar.gz/include/gpac/utf.h Changed

@@ -83,17 +83,18 @@
 u32 gf_utf8_wcslen(const unsigned short *s);
 
 /*!
-\brief returns a UTF8 string from a string started with BOM
+\brief returns a string from a string started with BOM
 
-Returns UTF8 from data
+Returns string from data, potentially converting utf16 to utf8
 \param data the string or wide-char string
 \param size of the data buffer
   size of the data buffer
 \param out_ptr set to an allocated buffer if needed for conversion, shall be destroyed by caller. Must not be NULL
-\param result set to resulting UTF8 string. Must not be NULL
+\param result set to resulting string. Must not be NULL
+\param res_size set to length of resulting string. May be NULL
 \return error if any: GF_IO_ERR if UTF decode error or GF_BAD_PARAM
  */
-GF_Err gf_utf_get_utf8_string_from_bom(const u8 *data, u32 size, char **out_ptr, char **result);
+GF_Err gf_utf_get_string_from_bom(const u8 *data, u32 size, char **out_ptr, char **result, u32 *res_size);
 
 /*!
 \brief Checks validity of a UTF8 string

gpac-2.2.1.tar.gz/include/gpac/version.h -> gpac-2.4.0.tar.gz/include/gpac/version.h Changed

gpac-2.2.1.tar.gz/include/gpac/xml.h -> gpac-2.4.0.tar.gz/include/gpac/xml.h Changed

gpac-2.2.1.tar.gz/modules/Makefile -> gpac-2.4.0.tar.gz/modules/Makefile Changed

gpac-2.2.1.tar.gz/modules/alsa/alsa.c -> gpac-2.4.0.tar.gz/modules/alsa/alsa.c Changed

@@ -48,12 +48,9 @@
 	ALSAContext *ctx = (ALSAContext*)dr->opaque;
 
 
-	ctx->force_sr = gf_opts_get_int("core", "force-alsarate");
-	ctx->dev_name = gf_opts_get_key("core", "alsa-devname");
-	if (!ctx->dev_name) {
-		ctx->dev_name = "hw:0,0";
-		gf_opts_set_key("core", "alsa-devname", ctx->dev_name);
-	}
+	ctx->force_sr = gf_module_get_int((GF_BaseInterface *)dr, "force-rate");
+	ctx->dev_name = gf_module_get_key((GF_BaseInterface *)dr, "devname");
+	if (!ctx->dev_name) ctx->dev_name = "hw:0,0";
 
 	/*test device*/
 	err = snd_pcm_open(&ctx->playback_handle, ctx->dev_name, SND_PCM_STREAM_PLAYBACK, 0);
@@ -305,6 +302,12 @@
 	return GF_IO_ERR;
 }
 
+static GF_GPACArg ALSAArgs = {
+	GF_DEF_ARG("devname", NULL, "alsa device name", "hw:0,0", NULL, GF_ARG_STRING, 0),
+	GF_DEF_ARG("force-rate", NULL, "force alsa sample rate", "0", NULL, GF_ARG_INT, 0),
+	{0},
+};
+
 void *NewALSAOutput()
 {
 	ALSAContext *ctx;
@@ -325,7 +328,10 @@
 	driv->GetAudioDelay = ALSA_GetAudioDelay;
 	driv->QueryOutputSampleRate = ALSA_QueryOutputSampleRate;
 	driv->WriteAudio = ALSA_WriteAudio;
-	GF_REGISTER_MODULE_INTERFACE(driv, GF_AUDIO_OUTPUT_INTERFACE, "ALSA Audio Output", "gpac distribution");
+	driv->args = ALSAArgs;
+	driv->description = "Audio output using ASLA";
+
+	GF_REGISTER_MODULE_INTERFACE(driv, GF_AUDIO_OUTPUT_INTERFACE, "alsa", "gpac distribution");
 	return driv;
 }

gpac-2.4.0.tar.gz/modules/caca_out Added

gpac-2.4.0.tar.gz/modules/caca_out/Makefile Added

gpac-2.4.0.tar.gz/modules/caca_out/caca_out.c Added

@@ -0,0 +1,575 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2023
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / libcaca output filter
+ *
+ *  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/constants.h>
+#include <gpac/color.h>
+#include <gpac/list.h>
+#include <gpac/modules/video_out.h>
+
+#ifdef GPAC_HAS_LIBCACA
+
+#if defined(WIN32) && !defined(_WIN32_WCE) && !defined(__GNUC__)
+#  pragma comment(lib, "libcaca.lib")
+#endif
+
+#include <caca.h>
+
+typedef struct
+{
+	u32 w, h, pfmt;
+	caca_dither_t *dither;
+} CacaDither;
+
+typedef struct
+{
+	const char *drv;
+
+	u32 wnd_w, wnd_h;
+	u32 mouse_x, mouse_y;
+	caca_canvas_t *canvas;
+	caca_display_t *display;
+	GF_List *dithers;
+
+	u8 *backbuffer;
+	caca_dither_t *bb_dither;
+} CacaOutCtx;
+
+static void cacao_shutdown(GF_VideoOutput *dr)
+{
+	CacaOutCtx *ctx = (CacaOutCtx *)dr->opaque;
+	if (ctx->display) caca_free_display(ctx->display);
+	ctx->display=NULL;
+
+	while (gf_list_count(ctx->dithers)) {
+		CacaDither *d = gf_list_pop_back(ctx->dithers);
+		if (d->dither) caca_free_dither(d->dither);
+		gf_free(d);
+	}
+
+	if (ctx->canvas) caca_free_canvas(ctx->canvas);
+	ctx->canvas=NULL;
+}
+
+
+static GF_Err cacao_setup(struct _video_out *dr, void *os_handle, void *os_display, u32 init_flags)
+{
+	CacaOutCtx *ctx = (CacaOutCtx *)dr->opaque;
+	cacao_shutdown(dr);
+	ctx->canvas = caca_create_canvas(0, 0);
+    if (!ctx->canvas) {
+        GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("Caca Failed to create canvas\n"));
+        return GF_IO_ERR;
+    }
+
+	ctx->display = NULL;
+	const char *opt = gf_module_get_key((GF_BaseInterface *)dr, "driver");
+
+#ifdef GPAC_CONFIG_DARWIN
+	//if running in xcode disable color logs (not supported by output console)
+	if (!opt && getenv("__XCODE_BUILT_PRODUCTS_DIR_PATHS") != NULL) {
+		opt = "raw";
+	}
+#endif
+
+	if (opt)
+		ctx->display = caca_create_display_with_driver(ctx->canvas, opt);
+	else
+		ctx->display = caca_create_display(ctx->canvas);
+
+	if (!ctx->display) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("Caca Failed to create display using driver %s\n", opt ? opt : "defaul"));
+		return GF_IO_ERR;
+	}
+
+//    caca_set_mouse(ctx->display, 0);
+	caca_set_display_time(ctx->display, 0);
+    GF_LOG(GF_LOG_INFO, GF_LOG_MMIO, ("Caca Canvas setup size %d %d driver %s\n", caca_get_canvas_width(ctx->canvas), caca_get_canvas_height(ctx->canvas), caca_get_display_driver(ctx->display) ));
+	return GF_OK;
+}
+
+static GF_Err cacao_fullscreen(GF_VideoOutput *dr, Bool bFullScreenOn, u32 *screen_width, u32 *screen_height)
+{
+	return GF_OK;
+}
+
+static GF_Err cacao_flush(GF_VideoOutput *dr, GF_Window *dest)
+{
+	CacaOutCtx *ctx = (CacaOutCtx *)dr->opaque;
+	if (ctx->backbuffer) {
+		caca_dither_bitmap(ctx->canvas, 0, 0, caca_get_canvas_width(ctx->canvas), caca_get_canvas_height(ctx->canvas), ctx->bb_dither, ctx->backbuffer);
+	}
+    caca_refresh_display(ctx->display);
+    return GF_OK;
+}
+
+static void cacao_check_event(GF_VideoOutput *dr)
+{
+	caca_event_t ev;
+	CacaOutCtx *ctx = (CacaOutCtx *)dr->opaque;
+
+	while (caca_get_event(ctx->display, CACA_EVENT_ANY, &ev, 0)) {
+		GF_Event evt;
+		u32 etype=0;
+		Bool is_key=GF_FALSE, is_mouse=GF_FALSE;
+		if (caca_get_event_type(&ev) & CACA_EVENT_KEY_PRESS) {
+			etype = GF_EVENT_KEYDOWN;
+			is_key = GF_TRUE;
+		}
+		if (caca_get_event_type(&ev) & CACA_EVENT_KEY_RELEASE) {
+			etype = GF_EVENT_KEYUP;
+			is_key = GF_TRUE;
+		}
+		if (caca_get_event_type(&ev) & CACA_EVENT_MOUSE_MOTION) {
+			etype = GF_EVENT_MOUSEMOVE;
+			is_mouse = GF_TRUE;
+			ctx->mouse_x = caca_get_event_mouse_x(&ev);
+			ctx->mouse_x *= ctx->wnd_w;
+			ctx->mouse_x /= caca_get_canvas_width(ctx->canvas);
+
+			ctx->mouse_y = caca_get_event_mouse_y(&ev);
+			ctx->mouse_y *= ctx->wnd_h;
+			ctx->mouse_y /= caca_get_canvas_height(ctx->canvas);
+		}
+		if (caca_get_event_type(&ev) & CACA_EVENT_MOUSE_PRESS) {
+			etype = GF_EVENT_MOUSEDOWN;
+			is_mouse = GF_TRUE;
+		}
+		if (caca_get_event_type(&ev) & CACA_EVENT_MOUSE_RELEASE) {
+			etype = GF_EVENT_MOUSEUP;
+			is_mouse = GF_TRUE;
+		}
+		if (caca_get_event_type(&ev) & CACA_EVENT_QUIT) {
+			memset(&evt, 0, sizeof(GF_Event));
+			evt.type = GF_EVENT_QUIT;
+			dr->on_event(dr->evt_cbk_hdl, &evt);
+		}
+		if (caca_get_event_type(&ev) & CACA_EVENT_RESIZE) {
+			memset(&evt, 0, sizeof(GF_Event));
+			evt.type = GF_EVENT_SIZE;
+//			evt.size.width = caca_get_event_resize_width(&ev);
+//			evt.size.height = caca_get_event_resize_height(&ev);
+//			dr->on_event(dr->evt_cbk_hdl, &evt);
+		}
+		if (is_key) {
+			memset(&evt, 0, sizeof(GF_Event));
+			evt.type = etype;
+			evt.key.key_code = caca_get_event_key_ch(&ev);
+			switch (evt.key.key_code) {
+			case CACA_KEY_ESCAPE: evt.type = GF_EVENT_QUIT; break;
+			case CACA_KEY_CTRL_C: evt.type = GF_EVENT_QUIT; break;
+			case CACA_KEY_LEFT: evt.key.key_code = GF_KEY_LEFT; break;
+			case CACA_KEY_RIGHT: evt.key.key_code = GF_KEY_RIGHT; break;
+			case CACA_KEY_UP: evt.key.key_code = GF_KEY_UP; break;
+			case CACA_KEY_DOWN: evt.key.key_code = GF_KEY_DOWN; break;
+			case CACA_KEY_RETURN: evt.key.key_code = GF_KEY_ENTER; break;
+			case CACA_KEY_BACKSPACE: evt.key.key_code = GF_KEY_BACKSPACE; break;
+			case CACA_KEY_TAB: evt.key.key_code = GF_KEY_TAB; break;
+			case CACA_KEY_DELETE: evt.key.key_code = GF_KEY_DEL; break;
+			case CACA_KEY_PAUSE: evt.key.key_code = GF_KEY_PAUSE; break;
+			case CACA_KEY_INSERT: evt.key.key_code = GF_KEY_INSERT; break;
+			case CACA_KEY_HOME: evt.key.key_code = GF_KEY_HOME; break;
+			case CACA_KEY_END: evt.key.key_code = GF_KEY_END; break;
+			case CACA_KEY_PAGEUP: evt.key.key_code = GF_KEY_PAGEUP; break;
+			case CACA_KEY_PAGEDOWN: evt.key.key_code = GF_KEY_PAGEDOWN; break;
+			case CACA_KEY_F1: evt.key.key_code = GF_KEY_F1; break;
+			case CACA_KEY_F2: evt.key.key_code = GF_KEY_F2; break;
+			case CACA_KEY_F3: evt.key.key_code = GF_KEY_F3; break;
+			case CACA_KEY_F4: evt.key.key_code = GF_KEY_F4; break;
+			case CACA_KEY_F5: evt.key.key_code = GF_KEY_F5; break;
+			case CACA_KEY_F6: evt.key.key_code = GF_KEY_F6; break;
+			case CACA_KEY_F7: evt.key.key_code = GF_KEY_F7; break;
+			case CACA_KEY_F8: evt.key.key_code = GF_KEY_F8; break;
+			case CACA_KEY_F9: evt.key.key_code = GF_KEY_F9; break;
+			case CACA_KEY_F10: evt.key.key_code = GF_KEY_F10; break;
+			case CACA_KEY_F11: evt.key.key_code = GF_KEY_F11; break;
+			case CACA_KEY_F12: evt.key.key_code = GF_KEY_F12; break;
+			case CACA_KEY_F13: evt.key.key_code = GF_KEY_F13; break;
+			case CACA_KEY_F14: evt.key.key_code = GF_KEY_F14; break;
+			case CACA_KEY_F15: evt.key.key_code = GF_KEY_F15; break;
+			default:
+				if ((evt.key.key_code>=0x30) && (evt.key.key_code<=0x39))
+					evt.key.key_code = GF_KEY_0 + evt.key.key_code-0x30;
+				else if ((evt.key.key_code>=0x41) && (evt.key.key_code<=0x5A))
+					evt.key.key_code = GF_KEY_A + evt.key.key_code-0x41;
+				else if ((evt.key.key_code>=0x61) && (evt.key.key_code<=0x7A))
+					evt.key.key_code = GF_KEY_A + evt.key.key_code-0x61;
+				break;
+			}
+			dr->on_event(dr->evt_cbk_hdl, &evt);
+		}
+		if (is_mouse) {
+			memset(&evt, 0, sizeof(GF_Event));
+			evt.type = etype;
+			evt.mouse.x = ctx->mouse_x;
+			evt.mouse.y = ctx->mouse_y;
+			dr->on_event(dr->evt_cbk_hdl, &evt);
+		}
+
+	}
+}
+
+static void cacao_print_message(CacaOutCtx *ctx, char *msg)
+{
+	u32 y = 2;
+	char *src = msg;
+	while (1) {
+		char *sep = strchr(src, '\n');
+		if (sep) sep0 = 0;
+		if (src0)
+			caca_put_str(ctx->canvas, 10, y, src);
+		y++;
+		if (!sep) break;
+		sep0 = '\n';
+		src = sep+1;
+	}
+}
+
+
+static GF_Err cacao_process_event(GF_VideoOutput *dr, GF_Event *evt)
+{
+	if (!evt) {
+		cacao_check_event(dr);
+		return GF_OK;
+	}
+	CacaOutCtx *ctx = (CacaOutCtx *)dr->opaque;
+	switch (evt->type) {
+	case GF_EVENT_SET_CURSOR:
+		caca_set_mouse(ctx->display, evt->cursor.cursor_type ? 1 : 0);
+		caca_set_cursor(ctx->display, evt->cursor.cursor_type ? 1 : 0);
+		break;
+	case GF_EVENT_SET_CAPTION:
+	    caca_set_display_title(ctx->display, evt->caption.caption);
+		break;
+	case GF_EVENT_SIZE:
+	    ctx->wnd_w = evt->size.width;
+	    ctx->wnd_h = evt->size.height;
+	    if (ctx->backbuffer) gf_free(ctx->backbuffer);
+	    ctx->backbuffer = NULL;
+	    if (ctx->bb_dither) caca_free_dither(ctx->bb_dither);
+	    ctx->bb_dither = NULL;
+		break;
+	case GF_EVENT_VIDEO_SETUP:
+	    ctx->wnd_w = evt->setup.width;
+	    ctx->wnd_h = evt->setup.height;
+	    if (ctx->backbuffer) gf_free(ctx->backbuffer);
+	    ctx->backbuffer = NULL;
+	    if (ctx->bb_dither) caca_free_dither(ctx->bb_dither);
+	    ctx->bb_dither = NULL;
+		break;
+	case GF_EVENT_MESSAGE:
+		cacao_print_message(ctx, (char *) evt->message.message);
+		break;
+	}
+	return GF_OK;
+}
+
+static void set_dither_options(GF_VideoOutput *dr, caca_dither_t *dither)
+{
+	const char *opt	= gf_module_get_key((GF_BaseInterface *)dr, "antialias");
+	if (opt) caca_set_dither_antialias(dither, opt);
+	opt	= gf_module_get_key((GF_BaseInterface *)dr, "colors");
+	if (opt) caca_set_dither_color(dither, opt);
+	opt	= gf_module_get_key((GF_BaseInterface *)dr, "charset");
+	if (opt) caca_set_dither_charset(dither, opt);
+	opt	= gf_module_get_key((GF_BaseInterface *)dr, "algorithm");
+	if (opt) caca_set_dither_algorithm(dither, opt);
+	opt	= gf_module_get_key((GF_BaseInterface *)dr, "brightness");
+	if (opt) caca_set_dither_brightness(dither, (float)atof(opt));
+	opt	= gf_module_get_key((GF_BaseInterface *)dr, "gamma");
+	if (opt) caca_set_dither_gamma(dither, (float)atof(opt));
+	opt	= gf_module_get_key((GF_BaseInterface *)dr, "contrast");
+	if (opt) caca_set_dither_contrast(dither, (float)atof(opt));
+}
+
+static GF_Err cacao_blit(GF_VideoOutput *dr, GF_VideoSurface *video_src, GF_Window *src_wnd, GF_Window *dst_wnd, u32 overlay_type)
+{
+	CacaOutCtx *ctx = (CacaOutCtx *)dr->opaque;
+
+	if (ctx->backbuffer) return GF_NOT_SUPPORTED;
+
+	CacaDither *d = NULL;
+	u32 i, count = gf_list_count(ctx->dithers);
+	for (i=0; i<count; i++) {
+		d = gf_list_get(ctx->dithers, i);
+		if (d->pfmt == video_src->pixel_format) break;
+		d = NULL;
+	}
+
+
+	if (!d
+		|| (d->w != video_src->width)
+		|| (d->h != video_src->height)
+	) {
+		u32 rmask=0, bmask=0, gmask=0, amask=0;
+		switch (video_src->pixel_format) {
+		case GF_PIXEL_RGBA:
+			amask = 0xff000000;
+		case GF_PIXEL_RGB:
+		case GF_PIXEL_RGBX:
+			rmask = 0x0000ff;
+			gmask = 0x00ff00;
+			bmask = 0xff0000;
+			break;
+		case GF_PIXEL_BGRA:
+			amask = 0xff000000;
+		case GF_PIXEL_BGR:
+		case GF_PIXEL_BGRX:
+			bmask = 0x0000ff;
+			gmask = 0x00ff00;
+			rmask = 0xff0000;
+			break;
+		case GF_PIXEL_ARGB:
+			amask = 0x000000ff;
+			rmask = 0x0000ff00;
+			gmask = 0x00ff0000;
+			bmask = 0xff000000;
+			break;
+		case GF_PIXEL_ABGR:
+			amask = 0x000000ff;
+			bmask = 0x0000ff00;
+			gmask = 0x00ff0000;
+			rmask = 0xff000000;
+			break;
+		default:
+			return GF_NOT_SUPPORTED;
+		}
+		if (!d) {
+			GF_SAFEALLOC(d, CacaDither);
+			d->pfmt = video_src->pixel_format;
+			gf_list_add(ctx->dithers, d);
+		}
+		d->w = video_src->width;
+		d->h = video_src->height;
+
+		if (d->dither) caca_free_dither(d->dither);
+		u32 bpp = gf_pixel_get_bytes_per_pixel(video_src->pixel_format);
+		d->dither = caca_create_dither(bpp*8, d->w, d->h, (video_src->pitch_y>0) ? video_src->pitch_y : (bpp * d->w),
+			rmask, gmask, bmask, amask);
+
+		if (!d->dither) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("Caca Failed to create dither\n"));
+			return GF_IO_ERR;
+		}
+
+		//set options
+		set_dither_options(dr, d->dither);
+	}
+	int x=0;
+	int y=0;
+	int w=caca_get_canvas_width(ctx->canvas);
+	int h=caca_get_canvas_height(ctx->canvas);
+	if (dst_wnd) {
+		x = dst_wnd->x * w / ctx->wnd_w;
+		y = dst_wnd->y * h / ctx->wnd_h;
+		w = dst_wnd->w * w / ctx->wnd_w;
+		h = dst_wnd->h * h / ctx->wnd_h;
+	}
+
+    caca_dither_bitmap(ctx->canvas, x, y, w, h, d->dither, video_src->video_buffer);
+	return GF_OK;
+}
+
+static GF_Err cacao_lock_backbuffer(GF_VideoOutput *driv, GF_VideoSurface *video_info, Bool do_lock)
+{
+	CacaOutCtx *ctx = (CacaOutCtx *)driv->opaque;
+	if (!do_lock) return GF_OK;
+
+	if (!ctx->backbuffer) {
+		ctx->backbuffer = gf_malloc(3*ctx->wnd_w*ctx->wnd_h);
+		if (!ctx->backbuffer) return GF_OUT_OF_MEM;
+
+		ctx->bb_dither = caca_create_dither(24, ctx->wnd_w, ctx->wnd_h, ctx->wnd_w*3, 0x0000ff, 0x00ff00, 0xff0000, 0);
+		if (!ctx->bb_dither) return GF_OUT_OF_MEM;
+		set_dither_options(driv, ctx->bb_dither);
+	}
+	memset(video_info, 0, sizeof(GF_VideoSurface));
+	video_info->width = ctx->wnd_w;
+	video_info->height = ctx->wnd_h;
+	video_info->pitch_x = 3;
+	video_info->pitch_y = ctx->wnd_w*3;
+	video_info->pixel_format = GF_PIXEL_RGB;
+	video_info->video_buffer = ctx->backbuffer;
+	return GF_OK;
+}
+
+
+//do not change order
+static GF_GPACArg CacaArgs = {
+	GF_DEF_ARG("driver", NULL, NULL, NULL, NULL, GF_ARG_STRING, 0),
+	GF_DEF_ARG("antialias", NULL, NULL, NULL, NULL, GF_ARG_STRING, 0),
+	GF_DEF_ARG("colors", NULL, NULL, NULL, NULL, GF_ARG_STRING, 0),
+	GF_DEF_ARG("charset", NULL, NULL, NULL, NULL, GF_ARG_STRING, 0),
+	GF_DEF_ARG("algorithm", NULL, NULL, NULL, NULL, GF_ARG_STRING, 0),
+	GF_DEF_ARG("brightness", NULL, "image brightness", "1", NULL, GF_ARG_DOUBLE, 0),
+	GF_DEF_ARG("gamma", NULL, "image gamma", "1", NULL, GF_ARG_DOUBLE, 0),
+	GF_DEF_ARG("contrast", NULL, "image contrast", "1", NULL, GF_ARG_DOUBLE, 0),
+	{0},
+};
+
+static GF_GPACArg *cacao_push_arg(GF_VideoOutput *driv, u32 *nb_args, const char *opt_desc)
+{
+	GF_GPACArg *arg = &driv->args *nb_args ;
+	(*nb_args) ++;
+	if (opt_desc) arg->description = gf_strdup(opt_desc);
+	return arg;
+}
+
+static void print_opts(GF_VideoOutput *driv, u32 *nb_args, const char *opt_name, const char *opt_desc, char const * const * values, const char *def)
+{
+	GF_GPACArg *arg = cacao_push_arg(driv, nb_args, opt_desc);
+	arg->val = def ? gf_strdup(def) : NULL;
+
+    u32 i;
+    for (i=0; valuesi; i+=2) {
+		gf_dynstrcat((char **)&arg->description, valuesi, "- ");
+		gf_dynstrcat((char **)&arg->description, valuesi+1, ": ");
+		if (valuesi+2)
+			gf_dynstrcat((char **)&arg->description, "\n", NULL);
+	}
+}
+
+static void cacao_load_options(GF_VideoOutput *drv)
+{
+	u32 nb_args=0;
+
+	caca_canvas_t *cv = caca_create_canvas(0, 0);
+	caca_display_t *dp = NULL;
+#ifdef GPAC_CONFIG_DARWIN
+		//if running in xcode disable color logs (not supported by output console)
+		if (getenv("__XCODE_BUILT_PRODUCTS_DIR_PATHS") != NULL) {
+			dp = caca_create_display_with_driver(cv, "raw");
+		}
+#endif
+	if (!dp) dp = caca_create_display(cv);
+
+	print_opts(drv, &nb_args, "driver", "rendering backend\n", caca_get_display_driver_list(), NULL);
+	caca_free_display(dp);
+	caca_free_canvas(cv);
+
+
+	caca_dither_t *d = caca_create_dither(24, 2, 2, 6, 0x0000FF, 0x00FF00, 0xFF0000, 0xFF000000);
+	print_opts(drv, &nb_args, "antialias", "image dither mode\n", caca_get_dither_antialias_list(d), caca_get_dither_antialias(d));
+	print_opts(drv, &nb_args, "colors", "image color mode\n", caca_get_dither_color_list(d), caca_get_dither_color(d));
+	print_opts(drv, &nb_args, "charset", "image charset\n", caca_get_dither_charset_list(d), caca_get_dither_charset(d));
+	print_opts(drv, &nb_args, "algorithm", "image dithering algo\n", caca_get_dither_algorithm_list(d), caca_get_dither_algorithm(d));
+
+	caca_free_dither(d);
+}
+
+static void *cacao_new()
+{
+	CacaOutCtx *ctx;
+	GF_VideoOutput *driv;
+
+	GF_SAFEALLOC(driv, GF_VideoOutput);
+	GF_REGISTER_MODULE_INTERFACE(driv, GF_VIDEO_OUTPUT_INTERFACE, "caca", "gpac distribution");
+
+	GF_SAFEALLOC(ctx, CacaOutCtx);
+
+	driv->opaque = ctx;
+	driv->Setup = cacao_setup;
+	driv->Shutdown = cacao_shutdown;
+	driv->SetFullScreen = cacao_fullscreen;
+	driv->Flush = cacao_flush;
+	driv->ProcessEvent = cacao_process_event;
+	driv->hw_caps = GF_VIDEO_HW_HAS_RGB | GF_VIDEO_HW_HAS_RGBA | GF_VIDEO_HW_HAS_STRETCH;
+	driv->Blit = cacao_blit;
+	driv->LockBackBuffer = cacao_lock_backbuffer;
+	driv->LockOSContext = NULL;
+	ctx->dithers = gf_list_new();
+	driv->args = CacaArgs;
+	driv->description = "Video output in terminal using libcaca";
+	if (gf_opts_get_bool("temp", "gendoc"))
+		cacao_load_options(driv);
+
+	gf_opts_set_key("temp", "use_libcaca", "true");
+
+	return driv;
+}
+
+static void cacao_del(void *ifce)
+{
+	GF_VideoOutput *dr = (GF_VideoOutput *)ifce;
+	CacaOutCtx *ctx = dr->opaque;
+	if (ctx->display) caca_free_display(ctx->display);
+	if (ctx->canvas) caca_free_canvas(ctx->canvas);
+
+	while (gf_list_count(ctx->dithers)) {
+		CacaDither *d = gf_list_pop_back(ctx->dithers);
+		if (d->dither) caca_free_dither(d->dither);
+		gf_free(d);
+	}
+	if (dr->args) {
+		for (u32 i=0; i<5; i++) {
+			if (dr->argsi.description) gf_free((char *) dr->argsi.description);
+			if (dr->argsi.val) gf_free((char *) dr->argsi.val);
+		}
+	}
+	gf_list_del(ctx->dithers);
+
+	if (ctx->bb_dither) caca_free_dither(ctx->bb_dither);
+	if (ctx->backbuffer) gf_free(ctx->backbuffer);
+
+	gf_opts_set_key("temp", "use_libcaca", NULL);
+	gf_free(ctx);
+	gf_free(dr);
+}
+
+
+
+/*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*)cacao_new();
+	return NULL;
+}
+
+/*interface destroy*/
+GPAC_MODULE_EXPORT
+void ShutdownInterface(GF_BaseInterface *ifce)
+{
+	switch (ifce->InterfaceType) {
+	case GF_VIDEO_OUTPUT_INTERFACE:
+		cacao_del(ifce);
+		break;
+	}
+}
+
+GPAC_MODULE_STATIC_DECLARATION( caca_out )
+
+#endif // GPAC_HAS_LIBCACA

gpac-2.2.1.tar.gz/modules/dektec_out/dektec_video.cpp -> gpac-2.4.0.tar.gz/modules/dektec_out/dektec_video.cpp Changed

gpac-2.2.1.tar.gz/modules/dektec_out/dektec_video_decl.c -> gpac-2.4.0.tar.gz/modules/dektec_out/dektec_video_decl.c Changed

gpac-2.2.1.tar.gz/modules/dektec_out/dektec_video_old.cpp -> gpac-2.4.0.tar.gz/modules/dektec_out/dektec_video_old.cpp Changed

@@ -225,15 +225,8 @@
 		dtc->isSending = false;
 		Dektec_resize(dr, DWIDTH, DHEIGHT);
 
-		int port = 1;
-		const char *opt;
-		opt = gf_opts_get_key("DektecVideo", "SDIOutput");
-		if (opt) {
-			port = atoi(opt);
-			GF_LOG(GF_LOG_INFO, GF_LOG_MODULE, ("Dektec Out Using port %d (%s)\n", port, opt));
-		} else {
-			GF_LOG(GF_LOG_INFO, GF_LOG_MODULE, ("Dektec Out No port specified, using default port: %d\n", port));
-		}
+		int port = gf_module_get_int((GF_BaseInterface*)dr, "sdi-port");
+		GF_LOG(GF_LOG_INFO, GF_LOG_MODULE, ("Dektec Out Using port %d (%s)\n", port));
 
 		DtDevice *dvc = dtc->dvc;
 		DtFrameBuffer *dtf = dtc->dtf;
@@ -280,11 +273,16 @@
 		return GF_OK;
 	}
 
+	static GF_GPACArg DekTecArgs = {
+		GF_DEF_ARG("sdi-port", NULL, "port number of the card", "1", NULL, GF_ARG_INT, 0),
+		{0},
+	};
+
 	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")
+		GF_REGISTER_MODULE_INTERFACE(driv, GF_VIDEO_OUTPUT_INTERFACE, "dektec", "gpac distribution")
 
 		DtDevice *dvc = new DtDevice;
 		DtFrameBuffer *dtf = new DtFrameBuffer;
@@ -301,6 +299,8 @@
 		dtc->dvc = dvc;
 		dtc->dtf = dtf;
 		driv->opaque = (void*)dtc;
+		driv->args = DekTecArgs;
+		driv->description = "Video output using Dektec cards";
 
 		driv->Flush = Dektec_Flush;
 		driv->LockBackBuffer = Dektec_LockBackBuffer;

gpac-2.2.1.tar.gz/modules/deprecated/old_arch/platinum/GPACPlatinum.cpp -> gpac-2.4.0.tar.gz/modules/deprecated/old_arch/platinum/GPACPlatinum.cpp Changed

@@ -417,7 +417,7 @@
 
 		PLT_DeviceHostReference device(m_pMediaRenderer );
 		device->m_ModelDescription = "GPAC Media Renderer";
-		device->m_ModelURL = "http://gpac.io";
+		device->m_ModelURL = "https://gpac.io";
 		device->m_ModelNumber = gf_gpac_version();
 		device->m_ModelName = "GPAC Media Renderer";
 		device->m_Manufacturer = "Telecom ParisTech";
@@ -476,7 +476,7 @@
 		}
 		PLT_DeviceHostReference device(m_pMediaServer);
 		device->m_ModelDescription = "GPAC Media Server";
-		device->m_ModelURL = "http://gpac.io";
+		device->m_ModelURL = "https://gpac.io";
 		device->m_ModelNumber = gf_gpac_version();
 		device->m_ModelName = "GPAC Media Server";
 		device->m_Manufacturer = "Telecom ParisTech";
@@ -1387,7 +1387,7 @@
 	str = NULL;
 	if (JS_LookupProperty(device->m_pUPnP->m_pJSCtx, obj, "ModelURL", &sval) && JSVAL_IS_STRING(sval))
 		str = SMJS_CHARS(c, sval);
-	device->m_ModelURL = str ? str : "http://gpac.io";
+	device->m_ModelURL = str ? str : "https://gpac.io";
 	SMJS_FREE(c, str);
 
 	str = NULL;

gpac-2.2.1.tar.gz/modules/directfb_out/directfb_out.c -> gpac-2.4.0.tar.gz/modules/directfb_out/directfb_out.c Changed

@@ -46,13 +46,12 @@
 	// initialisation and surface creation
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_MMIO, ("DirectFB Initialization\n"));
 	// check window mode used - SDL or X11
-	opt = gf_opts_get_key("core", "dfb-sys");
+	opt = gf_module_get_key((GF_BaseInterface *)driv, "devsys");
 	DirectFBVid_InitAndCreateSurface(ctx, opt);
 
 	// set flip mode
 	FLIP_MODE flip_mode = 0;
-	opt = gf_opts_get_key("core", "dfb-flip");
-	if (!opt) gf_opts_set_key("core", "dfb-flip", "waitsync");
+	opt = gf_module_get_key((GF_BaseInterface *)driv, "flipmode");
 	if (!opt || !strcmp(opt, "waitsync")) flip_mode = FLIP_WAITFORSYNC;
 	else if (!strcmp(opt, "wait")) flip_mode = FLIP_WAIT;
 	else if (!strcmp(opt, "sync")) flip_mode = FLIP_ONSYNC;
@@ -229,6 +228,16 @@
 	return GF_OK;
 }
 
+static GF_GPACArg DirectFBArgs = {
+	GF_DEF_ARG("devsys", NULL, "device for DFB", "false", NULL, GF_ARG_BOOL, 0),
+	GF_DEF_ARG("flipmode", NULL, "fliping mode for directFB\n" flip
+	"- waitsync: wait for vsync\n"
+	"- wait: wait only\n"
+	"- sync: sync only\n"
+	"- swap: swap only", "waitsync", NULL, GF_ARG_BOOL, 0),
+	{0},
+};
+
 
 /**
  *	function DirectFBNewVideo
@@ -241,7 +250,7 @@
 
 	driv = gf_malloc(sizeof(GF_VideoOutput));
 	memset(driv, 0, sizeof(GF_VideoOutput));
-	GF_REGISTER_MODULE_INTERFACE(driv, GF_VIDEO_OUTPUT_INTERFACE, "DirectFB Video Output", "gpac distribution");
+	GF_REGISTER_MODULE_INTERFACE(driv, GF_VIDEO_OUTPUT_INTERFACE, "directfb", "gpac distribution");
 
 	ctx = gf_malloc(DirectFBVid_GetCtxSizeOf());
 	memset(ctx, 0, DirectFBVid_GetCtxSizeOf());
@@ -257,7 +266,8 @@
 	driv->LockOSContext = NULL;
 	driv->Blit = DirectFBVid_Blit;
 	driv->hw_caps |= GF_VIDEO_HW_HAS_RGB | GF_VIDEO_HW_HAS_RGBA | GF_VIDEO_HW_HAS_YUV | GF_VIDEO_HW_HAS_STRETCH;
-
+	driv->args = DirectFBArgs;
+	driv->description = "Video output using DirectFB";
 	return driv;
 }

gpac-2.2.1.tar.gz/modules/droid_audio/droidaudio.c -> gpac-2.4.0.tar.gz/modules/droid_audio/droidaudio.c Changed

gpac-2.2.1.tar.gz/modules/droid_out/droid_vout-bitmap.c -> gpac-2.4.0.tar.gz/modules/droid_out/droid_vout-bitmap.c Changed

gpac-2.2.1.tar.gz/modules/droid_out/droid_vout.c -> gpac-2.4.0.tar.gz/modules/droid_out/droid_vout.c Changed

gpac-2.2.1.tar.gz/modules/dx_hw/dx_2d.c -> gpac-2.4.0.tar.gz/modules/dx_hw/dx_2d.c Changed

@@ -154,7 +154,7 @@
 
 	DDCONTEXT;
 
-	opt = gf_opts_get_key("core", "hwvmem");
+	opt = gf_module_get_key((GF_BaseInterface*)dr, "hwvmem");
 	if (opt) {
 		if (use_system_memory) {
 			if (!strcmp(opt, "always")) use_system_memory = GF_FALSE;
@@ -710,14 +710,13 @@
 	h = 576;
 
 
-	opt = gf_opts_get_key("core", "pref-yuv4cc");
+	opt = gf_module_get_key((GF_BaseInterface *)dr, "yuv-4cc");
 	if (opt) {
 		char a, b, c, d;
 		if (sscanf(opt, "%c%c%c%c", &a, &b, &c, &d)==4) {
 			dr->yuv_pixel_format = GF_4CC(a, b, c, d);
 			dr->hw_caps |= GF_VIDEO_HW_HAS_YUV;
-			opt = gf_opts_get_key("core", "yuv-overlay");
-			if (opt && !strcmp(opt, "yes"))
+			if (gf_module_get_bool((GF_BaseInterface *)dr, "yuv-overlay"))
 				dr->hw_caps |= GF_VIDEO_HW_HAS_YUV_OVERLAY;
 			dd->yuv_init = GF_TRUE;
 			num_yuv = 1;
@@ -816,11 +815,11 @@
 
 		/*store our options*/
 		sprintf(szOpt, "%c%c%c%c", (dr->yuv_pixel_format>>24) & 0xFF, (dr->yuv_pixel_format>>16) & 0xFF, (dr->yuv_pixel_format>>8) & 0xFF, (dr->yuv_pixel_format) & 0xFF);
-		gf_opts_set_key("core", "pref-yuv4cc", szOpt);
-		gf_opts_set_key("core", "yuv-overlay", (dr->hw_caps & GF_VIDEO_HW_HAS_YUV_OVERLAY) ? "yes" : "no");
+		gf_opts_set_key("directx", "yuv-4cc", szOpt);
+		gf_opts_set_key("directx", "yuv-overlay", (dr->hw_caps & GF_VIDEO_HW_HAS_YUV_OVERLAY) ? "yes" : "no");
 	}
 
-	opt = gf_opts_get_key("core", "hwvmem");
+	opt = gf_module_get_key((GF_BaseInterface*)dr, "hwvmem");
 	if (opt && !strcmp(opt, "never")) num_yuv = 0;
 
 	/*too bad*/
@@ -834,24 +833,22 @@
 	GF_LOG(GF_LOG_INFO, GF_LOG_MMIO, ("DX Out Picked YUV format %s - drawn in %d ms\n", gf_4cc_to_str(dr->yuv_pixel_format), min_planar));
 
 	/*enable YUV->RGB on the backbuffer ?*/
-	opt = gf_opts_get_key("core", "offscreen-yuv");
-	/*no set is the default*/
-	if (!opt) {
-		opt = "yes";
-		gf_opts_set_key("core", "offscreen-yuv", "yes");
+	if (gf_module_get_bool((GF_BaseInterface *)dr, "offscreen-yuv")) {
+		dr->hw_caps &= ~GF_VIDEO_HW_HAS_YUV;
+	} else {
+		dd->offscreen_yuv_to_rgb = GF_TRUE;
 	}
-	if (opt && strcmp(opt, "yes")) dr->hw_caps &= ~GF_VIDEO_HW_HAS_YUV;
-	else dd->offscreen_yuv_to_rgb = GF_TRUE;
 
 	/*get YUV overlay key*/
-	opt = gf_opts_get_key("core", "overlay-color-key");
+	opt = gf_module_get_key((GF_BaseInterface *)dr, "overlay-color-key");
 	/*no set is the default*/
 	if (!opt) {
 		opt = "0101FE";
-		gf_opts_set_key("core", "overlay-color-key", "0101FE");
+		gf_opts_set_key("directx", "overlay-color-key", "0101FE");
 	}
 	sscanf(opt, "%06x", &dr->overlay_color_key);
 	if (dr->overlay_color_key) dr->overlay_color_key |= 0xFF000000;
+
 	GF_LOG(GF_LOG_INFO, GF_LOG_MMIO, ("DX Out YUV->RGB enabled: %s - ColorKey enabled: %s (key %x)\n",
 	                                  (dr->hw_caps & GF_VIDEO_HW_HAS_YUV) ? "Yes" : "No",
 	                                  dr->overlay_color_key ? "Yes" : "No", dr->overlay_color_key
@@ -872,6 +869,19 @@
 	return CreateBackBuffer(dr, width, height, use_system_memory);
 }
 
+static GF_GPACArg DirectDrawArgs = {
+	GF_DEF_ARG("yuv-overlay", NULL, "enable yuv overlays", "false", NULL, GF_ARG_BOOL, 0),
+	GF_DEF_ARG("yuv-4cc", NULL, "prefered YUV 4CC for overlays", NULL, NULL, GF_ARG_STRING, 0),
+	GF_DEF_ARG("offscreen-yuv", NULL, "enable offscreen yuv", "true", NULL, GF_ARG_BOOL, 0),
+	GF_DEF_ARG("overlay-color-key", NULL, "color key value for overlay", "0101FE", NULL, GF_ARG_STRING, 0),
+	GF_DEF_ARG("no-vsync", NULL, "disable vertical synchro", "false", NULL, GF_ARG_BOOL, 0),
+	GF_DEF_ARG("switch-vres", NULL, "enable resolution switching of display", "false", NULL, GF_ARG_BOOL, 0),
+	GF_DEF_ARG("hwvmem", NULL, "specify (2D rendering only) memory type of main video backbuffer. Depending on the scene type, this may drastically change the playback speed\n"
+ "- always: always on hardware\n"
+ "- never: always on system memory\n"
+ "- auto: selected by GPAC based on content type (graphics or video)", "auto", "auto|always|never", GF_ARG_INT, GF_ARG_HINT_EXPERT|GF_ARG_SUBSYS_VIDEO),
+	{0},
+};
 
 void DD_SetupDDraw(GF_VideoOutput *driv)
 {
@@ -879,5 +889,7 @@
 	driv->Blit = DD_Blit;
 	driv->LockBackBuffer = DD_LockBackBuffer;
 	driv->LockOSContext = LockOSContext;
+	driv->args = DirectDrawArgs;
+	driv->description = "Video output using DirectDraw";
 }

gpac-2.2.1.tar.gz/modules/dx_hw/dx_audio.c -> gpac-2.4.0.tar.gz/modules/dx_hw/dx_audio.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2012
+ *			Copyright (c) Telecom ParisTech 2000-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / DirectX audio and video render module
@@ -181,7 +181,7 @@
 	while (ctx->buffer_size % ctx->format.nBlockAlign) ctx->buffer_size++;
 
 	ctx->use_notif = GF_TRUE;
-	if (gf_opts_get_bool("core", "ds-disable-notif"))
+	if (gf_module_get_bool((GF_BaseInterface*)dr, "disable-notif"))
 		ctx->use_notif = GF_FALSE;
 
 	memset(&dsbBufferDesc, 0, sizeof(DSBUFFERDESC));
@@ -218,7 +218,7 @@
 	hr = ctx->pDS->lpVtbl->CreateSoundBuffer(ctx->pDS, &dsbBufferDesc, &ctx->pOutput, NULL );
 	if (FAILED(hr)) {
 retry:
-		if (ctx->use_notif) gf_opts_set_key("core", "ds-disable-notif", "yes");
+		if (ctx->use_notif) gf_opts_set_key("directsnd", "disable-notif", "yes");
 		ctx->use_notif = GF_FALSE;
 		dsbBufferDesc.dwFlags = DSBCAPS_GETCURRENTPOSITION2 | DSBCAPS_GLOBALFOCUS;
 		hr = ctx->pDS->lpVtbl->CreateSoundBuffer(ctx->pDS, &dsbBufferDesc, &ctx->pOutput, NULL );
@@ -312,7 +312,7 @@
 		return;
 	}
 
-	assert(size == ctx->buffer_size);
+	gf_assert(size == ctx->buffer_size);
 
 	dr->FillBuffer(dr->audio_renderer, pLock, size);
 
@@ -441,6 +441,11 @@
 	return ctx->total_audio_buffer_ms;
 }
 
+static GF_GPACArg DSAudioArgs = {
+	GF_DEF_ARG("disable-notif", NULL, "disable buffer position notifications", "false", NULL, GF_ARG_BOOL, 0),
+	{0},
+};
+
 void *NewAudioOutput()
 {
 	HRESULT hr;
@@ -469,7 +474,7 @@
 
 	driv = (GF_AudioOutput*)gf_malloc(sizeof(GF_AudioOutput));
 	memset(driv, 0, sizeof(GF_AudioOutput));
-	GF_REGISTER_MODULE_INTERFACE(driv, GF_AUDIO_OUTPUT_INTERFACE, "DirectSound Audio Output", "gpac distribution");
+	GF_REGISTER_MODULE_INTERFACE(driv, GF_AUDIO_OUTPUT_INTERFACE, "directsnd", "gpac distribution");
 
 	driv->opaque = ctx;
 
@@ -486,6 +491,8 @@
 	driv->QueryOutputSampleRate = DS_QueryOutputSampleRate;
 	/*never threaded*/
 	driv->SelfThreaded = GF_FALSE;
+	driv->args = DSAudioArgs;
+	driv->description = "DirectSound Audio output";
 	return driv;
 }

gpac-2.2.1.tar.gz/modules/dx_hw/dx_hw.rc -> gpac-2.4.0.tar.gz/modules/dx_hw/dx_hw.rc Changed

gpac-2.2.1.tar.gz/modules/dx_hw/dx_video.c -> gpac-2.4.0.tar.gz/modules/dx_hw/dx_video.c Changed

@@ -495,7 +495,7 @@
 #endif
 	GetWindowRect(dd->cur_hwnd, &rc);
 
-	dd->disable_vsync = gf_opts_get_bool("core", "disable-vsync");
+	dd->disable_vsync = gf_module_get_bool((GF_BaseInterface *) dr, "no-vsync");
 
 	return GF_OK;
 }
@@ -546,7 +546,7 @@
 	on the dest pixel format)*/
 	dd->yuv_init = GF_FALSE;
 	if (dd->fullscreen) {
-		dd->switch_res = gf_opts_get_bool("core", "switch-vres");
+		dd->switch_res = gf_module_get_bool((GF_BaseInterface *)dr, "switch-vres");
 		/*get current or best fitting mode*/
 		if (GetDisplayMode(dd) != GF_OK) return GF_IO_ERR;
 	}
@@ -758,7 +758,7 @@
 	DDContext *pCtx;
 	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, "DirectX Video Output", "gpac distribution");
+	GF_REGISTER_MODULE_INTERFACE(driv, GF_VIDEO_OUTPUT_INTERFACE, "directx", "gpac distribution");
 
 	pCtx = (DDContext*)gf_malloc(sizeof(DDContext));
 	memset(pCtx, 0, sizeof(DDContext));

gpac-2.2.1.tar.gz/modules/ft_font/ft_font.c -> gpac-2.4.0.tar.gz/modules/ft_font/ft_font.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2022
+ *			Copyright (c) Telecom ParisTech 2000-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / FreeType font engine module
@@ -29,6 +29,9 @@
 #include <gpac/utf.h>
 #include <gpac/tools.h>
 
+#ifndef GPAC_DISABLE_EVG
+
+
 #if !defined(__GNUC__)
 # if defined(_WIN32_WCE)
 #  pragma comment(lib, "freetype")
@@ -92,8 +95,6 @@
  */
 static Bool isBestFontFor(const char * listOfFonts, const char * currentBestFont, const char * fontName) {
 	u32 i;
-	assert( fontName );
-	assert( listOfFonts );
 	for (i = 0 ; listOfFontsi; i++) {
 		const char * best = listOfFontsi;
 		if (!stricmp(best, fontName))
@@ -140,17 +141,6 @@
 			if (!szfont) continue;
 			strcpy(szfont, face->family_name);
 
-			/*remember first font found which looks like a alphabetical one*/
-			if (!ftpriv->font_default) {
-				u32 gidx;
-				FT_Select_Charmap(face, FT_ENCODING_UNICODE);
-				gidx = FT_Get_Char_Index(face, (u32) 'a');
-				if (gidx) gidx = FT_Get_Char_Index(face, (u32) 'z');
-				if (gidx) gidx = FT_Get_Char_Index(face, (u32) '1');
-				if (gidx) gidx = FT_Get_Char_Index(face, (u32) '@');
-				if (gidx) ftpriv->font_default = gf_strdup(szfont);
-			}
-
 			bold = italic = 0;
 
 			if (face->style_name) {
@@ -173,6 +163,17 @@
 			}
 			gf_opts_set_key("FontCache", szfont, file_path);
 
+			/*remember first font found which looks like a alphabetical one*/
+			if (!ftpriv->font_default) {
+				u32 gidx;
+				FT_Select_Charmap(face, FT_ENCODING_UNICODE);
+				gidx = FT_Get_Char_Index(face, (u32) 'a');
+				if (gidx) gidx = FT_Get_Char_Index(face, (u32) 'z');
+				if (gidx) gidx = FT_Get_Char_Index(face, (u32) '1');
+				if (gidx) gidx = FT_Get_Char_Index(face, (u32) '@');
+				if (gidx) ftpriv->font_default = gf_strdup(szfont);
+			}
+
 			/*try to assign default fixed fonts*/
 			if (!bold && !italic) {
 				strcpy(szfont, face->family_name);
@@ -252,6 +253,7 @@
 		const char *opt;
 		char fkeyGF_MAX_PATH;
 		const char *key = gf_opts_get_key_name("FontCache", i);
+		if (!key) continue;
 		opt = gf_opts_get_key("FontCache", key);
 		if (!strchr(opt, '/') && !strchr(opt, '\\')) continue;
 
@@ -302,7 +304,7 @@
 	gf_opts_set_key("FontCache", "FontSans", ftpriv->font_sans);
 	gf_opts_save();
 
-	GF_LOG(GF_LOG_INFO, GF_LOG_MODULE, ("FreeType Font directories scanned\n"));
+	GF_LOG(GF_LOG_INFO, GF_LOG_MODULE, ("FreeType Font directories scanned - defaults: SANS %s FIXED %s SERIF %s\n", ftpriv->font_sans, ftpriv->font_fixed, ftpriv->font_serif));
 }
 
 
@@ -407,7 +409,7 @@
 	}
 	if (rescan==2) {
 		void gf_get_default_font_dir(char szPathGF_MAX_PATH);
-		
+
 		char szPathGF_MAX_PATH;
 		//check if font directory is default one, if not reset and rescan
 		gf_get_default_font_dir(szPath);
@@ -672,7 +674,7 @@
 	s32 last_x, last_y;
 } ft_outliner;
 
-#if defined(GPAC_CONFIG_IOS) || defined(GPAC_CONFIG_ANDROID)
+#if defined(GPAC_CONFIG_ANDROID)
 #define FTCST
 #else
 #define FTCST const
@@ -790,7 +792,7 @@
 	FTBuilder *ftpriv;
 	dr = gf_malloc(sizeof(GF_FontReader));
 	memset(dr, 0, sizeof(GF_FontReader));
-	GF_REGISTER_MODULE_INTERFACE(dr, GF_FONT_READER_INTERFACE, "FreeType Font Reader", "gpac distribution");
+	GF_REGISTER_MODULE_INTERFACE(dr, GF_FONT_READER_INTERFACE, "freetype", "gpac distribution");
 
 	ftpriv = gf_malloc(sizeof(FTBuilder));
 	memset(ftpriv, 0, sizeof(FTBuilder));
@@ -829,8 +831,6 @@
 	if (ftpriv->font_sans) gf_free(ftpriv->font_sans);
 	if (ftpriv->font_fixed) gf_free(ftpriv->font_fixed);
 	if (ftpriv->font_default) gf_free(ftpriv->font_default);
-	assert(!gf_list_count(ftpriv->loaded_fonts) );
-
 	gf_list_del(ftpriv->loaded_fonts);
 
 	gf_free(dr->udta);
@@ -870,3 +870,4 @@
 
 #endif
 
+#endif //GPAC_DISABLE_EVG

gpac-2.2.1.tar.gz/modules/jack/jack.c -> gpac-2.4.0.tar.gz/modules/jack/jack.c Changed

@@ -215,11 +215,9 @@
 	memset (ctx->jackClientName, 0, MAX_JACK_CLIENT_NAME_SZ);
 	snprintf (ctx->jackClientName, MAX_JACK_CLIENT_NAME_SZ, "gpac-%d", gf_sys_get_process_id() );
 
-	ctx->autoConnect = GF_TRUE;
-	if (gf_opts_get_bool("Jack", "NoAutoConnect"))
-		ctx->autoConnect = GF_FALSE;
+	ctx->autoConnect = gf_module_get_bool((GF_BaseInterface *)dr, "auto-connect");
 
-	if (gf_opts_get_bool("Jack", "NoStartServer"))
+	if (!gf_module_get_bool((GF_BaseInterface *)dr, "start-server"))
 		options |= JackNoStartServer;
 
 	ctx->jack = jack_client_open (ctx->jackClientName, options, &status, NULL);
@@ -413,6 +411,12 @@
 	return GF_OK;
 }
 
+static GF_GPACArg JackArgs = {
+	GF_DEF_ARG("auto-connect", NULL, "automatically connect to jackd", "true", NULL, GF_ARG_BOOL, 0),
+	GF_DEF_ARG("start-server", NULL, "automatically start JACK server if not running", "true", NULL, GF_ARG_BOOL, 0),
+	{0},
+};
+
 void *
 NewJackOutput ()
 {
@@ -437,6 +441,8 @@
 	driv->SetPan = Jack_SetPan;
 	driv->SetPriority = Jack_SetPriority;
 	driv->QueryOutputSampleRate = Jack_QueryOutputSampleRate;
+	driv->args = JackArgs;
+	driv->description = "Audio output using JACK";
 
 	ctx->jack = NULL;
 	ctx->numChannels = 0;
@@ -450,8 +456,7 @@
 	ctx->autoConnect = GF_FALSE;
 	ctx->volume = 1.0;
 
-	GF_REGISTER_MODULE_INTERFACE (driv, GF_AUDIO_OUTPUT_INTERFACE,
-	                              "Jack Audio Output", "gpac distribution");
+	GF_REGISTER_MODULE_INTERFACE (driv, GF_AUDIO_OUTPUT_INTERFACE, "jack", "gpac distribution");
 	return driv;
 }

gpac-2.2.1.tar.gz/modules/pulseaudio/pulseaudio.c -> gpac-2.4.0.tar.gz/modules/pulseaudio/pulseaudio.c Changed

@@ -67,10 +67,10 @@
 	PulseAudioContext *ctx = (PulseAudioContext *) dr->opaque;
 	if (ctx == NULL)
 		return GF_BAD_PARAM;
-	opt = gf_opts_get_key("PulseAudio", "Name");
+	opt = gf_module_get_key((GF_BaseInterface *)dr, "name");
 	ctx->output_name = opt ? ctx->output_name : "GPAC";
 
-	opt = gf_opts_get_key("PulseAudio", "Description");
+	opt = gf_module_get_key((GF_BaseInterface *)dr, "description");
 	ctx->output_description = opt  ? opt  : "GPAC Output";
 	return GF_OK;
 }
@@ -212,6 +212,11 @@
 	return ms_delay;
 }
 
+static GF_GPACArg PulseAudioArgs = {
+	GF_DEF_ARG("name", NULL, "name for PulseAudio", "GPAC", NULL, GF_ARG_STRING, 0),
+	GF_DEF_ARG("description", NULL, "description for PulseAudio", "GPAC output", NULL, GF_ARG_STRING, 0),
+	{0},
+};
 
 void *
 NewPulseAudioOutput ()
@@ -237,7 +242,10 @@
 	driv->Configure = PulseAudio_Configure;
 	driv->GetAudioDelay = PulseAudio_GetAudioDelay;
 	driv->WriteAudio = PulseAudio_WriteAudio;
-	GF_REGISTER_MODULE_INTERFACE (driv, GF_AUDIO_OUTPUT_INTERFACE, "PulseAudio", "gpac distribution");
+	driv->description = "Audio output using PulseAudio";
+	driv->args = PulseAudioArgs;
+
+	GF_REGISTER_MODULE_INTERFACE (driv, GF_AUDIO_OUTPUT_INTERFACE, "pulse", "gpac distribution");
 	return driv;
 }

gpac-2.2.1.tar.gz/modules/sdl_out/audio.c -> gpac-2.4.0.tar.gz/modules/sdl_out/audio.c Changed

gpac-2.2.1.tar.gz/modules/sdl_out/sdl_out.c -> gpac-2.4.0.tar.gz/modules/sdl_out/sdl_out.c Changed

gpac-2.2.1.tar.gz/modules/sdl_out/sdl_out.h -> gpac-2.4.0.tar.gz/modules/sdl_out/sdl_out.h Changed

gpac-2.2.1.tar.gz/modules/sdl_out/video.c -> gpac-2.4.0.tar.gz/modules/sdl_out/video.c Changed

@@ -2,7 +2,7 @@
 *			GPAC - Multimedia Framework C SDK
 *
 *			Authors: Jean Le Feuvre - Romain Bouqueau
-*			Copyright (c) Telecom ParisTech 2000-2022
+*			Copyright (c) Telecom ParisTech 2000-2023
 *					All rights reserved
 *
 *  This file is part of GPAC / SDL audio and video module
@@ -428,10 +428,10 @@
 #endif
 #endif
 
-#if SDL_VERSION_ATLEAST(2,0,0) && !defined(GPAC_CONFIG_IOS)
 #include <gpac/media_tools.h>
 void SDLVid_SetIcon(SDLVidCtx *ctx)
 {
+#if SDL_VERSION_ATLEAST(2,0,0) && !defined(GPAC_CONFIG_IOS) && !defined(GPAC_DISABLE_AV_PARSERS)
 	u8 *buffer, *dec_buf;
 	u32 size, w, h, pf, Bpp, dst_size=0;
 	const char cfgGF_MAX_PATH;
@@ -457,8 +457,8 @@
 	}
 	gf_free(buffer);
 	gf_free(dec_buf);
-}
 #endif
+}
 
 
 GF_Err SDLVid_ResizeWindow(GF_VideoOutput *dr, u32 width, u32 height)
@@ -467,6 +467,8 @@
 	SDLVID();
 	GF_Event evt;
 
+	if (!width || !height) return GF_BAD_PARAM;
+
 	/*lock X mutex to make sure the event queue is not being processed*/
 	gf_mx_p(ctx->evt_mx);
 
@@ -507,9 +509,6 @@
 		SDL_GL_SetAttribute(SDL_GL_GREEN_SIZE, nb_bits);
 		SDL_GL_SetAttribute(SDL_GL_BLUE_SIZE, nb_bits);
 
-		assert(width);
-		assert(height);
-
 #if SDL_VERSION_ATLEAST(2,0,0)
 		if (ctx->hidden)
 			flags |= SDL_WINDOW_HIDDEN;
@@ -520,6 +519,9 @@
 		/* Set the correct attributes for MASK and MAJOR version */
 		SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, SDL_GL_CONTEXT_PROFILE_ES);
 		SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 2);
+#ifdef GPAC_CONFIG_EMSCRIPTEN
+		SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 0);
+#endif
 #endif
 
 		if (!ctx->screen) {
@@ -531,9 +533,7 @@
 			GF_LOG(GF_LOG_INFO, GF_LOG_MMIO, ("SDL Window created\n"));
 			dr->window_id = SDL_GetWindowID(ctx->screen);
 
-#if !defined(GPAC_CONFIG_IOS)
 			SDLVid_SetIcon(ctx);
-#endif
 
 			/*creating a window, at least on OSX, changes the locale and screws up float parsing !!
 			force setting the local back and pray that it will be changed before any other atof/strtod is called
@@ -584,7 +584,7 @@
 
 
 		if (!ctx->disable_vsync)
-			ctx->disable_vsync = gf_opts_get_bool("core", "disable-vsync");
+			ctx->disable_vsync = !gf_module_get_bool((GF_BaseInterface *)dr, "vsync");
 
 		if (ctx->disable_vsync) {
 #if defined(__APPLE__) && !defined(GPAC_CONFIG_IOS)
@@ -650,9 +650,7 @@
 			}
 			dr->window_id = SDL_GetWindowID(ctx->screen);
 
-#if SDL_VERSION_ATLEAST(2,0,0) && !defined(GPAC_CONFIG_IOS)
 			SDLVid_SetIcon(ctx);
-#endif
 
 			/*see above note*/
 #ifndef _WIN32_WCE
@@ -663,7 +661,7 @@
 		}
 		if ( !ctx->renderer ) {
 			u32 flags = SDL_RENDERER_ACCELERATED;
-			if (! gf_opts_get_bool("core", "disable-vsync")) {
+			if (gf_module_get_bool((GF_BaseInterface *)dr, "vsync")) {
 				flags |= SDL_RENDERER_PRESENTVSYNC;
 			}
 
@@ -777,12 +775,11 @@
 	{
 		SDL_Rect** modes;
 		modes = SDL_ListModes(NULL, SDL_FULLSCREEN|SDL_HWSURFACE);
-		assert( (modes != (SDL_Rect**)0));
 		if ( modes == (SDL_Rect**)-1 ) {
 			fprintf(stderr, "SDL : DONT KNOW WHICH MODE TO USE, using 640x480\n");
 			dr->max_screen_width = 640;
 			dr->max_screen_height = 480;
-		} else {
+		} else if (modes) {
 			int i;
 			dr->max_screen_width = 0;
 			for (i=0; modesi; ++i) {
@@ -993,14 +990,14 @@
 		case SDL_TEXTINPUT: /* Since SDL 1.3, text-input is handled in a specific event */
 		{
 			u32 len = (u32) strlen( sdl_evt.text.text);
-			u32 ucs4_len;
-			assert( len < 5 );
-			ucs4_len = utf8_to_ucs4 (&(gpac_evt.character.unicode_char), len, (unsigned char*)(sdl_evt.text.text));
-			if (ucs4_len) {
-				gpac_evt.type = GF_EVENT_TEXTINPUT;
-				dr->on_event(dr->evt_cbk_hdl, &gpac_evt);
+			if (len < 5 ) {
+				gpac_evt.character.window_id = dr->window_id;
+				u32 ucs4_len = utf8_to_ucs4 (&(gpac_evt.character.unicode_char), len, (unsigned char*)(sdl_evt.text.text));
+				if (ucs4_len) {
+					gpac_evt.type = GF_EVENT_TEXTINPUT;
+					dr->on_event(dr->evt_cbk_hdl, &gpac_evt);
+				}
 			}
-			gpac_evt.character.window_id = dr->window_id;
 			break;
 		}
 #endif /* SDL_TEXTINPUTEVENT_TEXT_SIZE */
@@ -1350,7 +1347,7 @@
 #if ! ( SDL_VERSION_ATLEAST(2,0,0) )
 		u32 flags = ctx->output_3d ? SDL_GL_FULLSCREEN_FLAGS : SDL_FULLSCREEN_FLAGS;
 #endif
-		Bool switch_res = gf_opts_get_bool("core", "switch-vres");
+		Bool switch_res = gf_module_get_bool((GF_BaseInterface*)dr, "switch-vres");
 		if (!dr->max_screen_width || !dr->max_screen_height) switch_res = GF_TRUE;
 
 		ctx->store_width = *screen_width;
@@ -1434,7 +1431,7 @@
 
 	if (ctx->output_3d) return GF_BAD_PARAM;
 
-	opt = gf_opts_get_key("core", "hwvmem");
+	opt = gf_module_get_key((GF_BaseInterface*)dr, "hwvmem");
 	if (system_mem) {
 		if (opt && !strcmp(opt, "always")) system_mem = GF_FALSE;
 	} else {
@@ -1568,13 +1565,19 @@
 
 	if (ctx->output_3d) {
 		//with SDL2 we have to disable vsync by overriding swap interval
-#if defined(__APPLE__) && !defined(GPAC_CONFIG_IOS)
+#if defined(__APPLE__) && !defined(GPAC_CONFIG_IOS) && !defined(GPAC_DISABLE_3D)
 		if (ctx->disable_vsync) {
 			GLint sync = 0;
 			CGLContextObj gl_ctx = CGLGetCurrentContext();
 			CGLSetParameter(gl_ctx, kCGLCPSwapInterval, &sync);
 		}
 #endif
+
+#ifdef GPAC_CONFIG_EMSCRIPTEN
+		void gpac_on_video_swap();
+		gpac_on_video_swap();
+#endif
+
 		SDL_GL_SwapWindow(ctx->screen);
 		return GF_OK;
 	}
@@ -1957,7 +1960,7 @@
 	case GF_PIXEL_YUV_10:
 		need_copy=1;
 		pool = &ctx->pool_yuv;
-		format=SDL_PIXELFORMAT_YV12;
+		format=SDL_PIXELFORMAT_IYUV;
 		break;
 	/*FIXME we need to upgrade our SDL build*/
 #if !defined(GPAC_CONFIG_IOS) && SDL_VERSION_ATLEAST(2,0,0)
@@ -2165,17 +2168,25 @@
 
 #endif
 
+static GF_GPACArg SDLArgs = {
+	GF_DEF_ARG("vsync", NULL, "enable vertical synchro", "true", NULL, GF_ARG_BOOL, 0),
+	GF_DEF_ARG("switch-vres", NULL, "enable resolution switching of display", "false", NULL, GF_ARG_BOOL, 0),
+	GF_DEF_ARG("defer", NULL, "enable defer mode when bliting", "false", NULL, GF_ARG_BOOL, 0),
+	GF_DEF_ARG("hwvmem", NULL, "specify (2D rendering only) memory type of main video backbuffer. Depending on the scene type, this may drastically change the playback speed\n"
+ "- always: always on hardware\n"
+ "- never: always on system memory\n"
+ "- auto: selected by GPAC based on content type (graphics or video)", "auto", "auto|always|never", GF_ARG_INT, GF_ARG_HINT_EXPERT|GF_ARG_SUBSYS_VIDEO),
+	{0},
+};
+
 void *SDL_NewVideo()
 {
-#if SDL_VERSION_ATLEAST(2,0,0)
-	const char *opt;
-#endif
 	SDLVidCtx *ctx;
 	GF_VideoOutput *driv;
 
 	driv = (GF_VideoOutput*)gf_malloc(sizeof(GF_VideoOutput));
 	memset(driv, 0, sizeof(GF_VideoOutput));
-	GF_REGISTER_MODULE_INTERFACE(driv, GF_VIDEO_OUTPUT_INTERFACE, "SDL Video Output", "gpac distribution");
+	GF_REGISTER_MODULE_INTERFACE(driv, GF_VIDEO_OUTPUT_INTERFACE, "sdl", "gpac distribution");
 
 	ctx = (SDLVidCtx*)gf_malloc(sizeof(SDLVidCtx));
 	memset(ctx, 0, sizeof(SDLVidCtx));
@@ -2191,9 +2202,12 @@
 	driv->SetFullScreen = SDLVid_SetFullScreen;
 	driv->Flush = SDLVid_Flush;
 	driv->ProcessEvent = SDLVid_ProcessEvent;
+
+	driv->args = SDLArgs;
+	driv->description = "Video output using SDL";
+
 	/*no offscreen opengl with SDL*/
 	driv->hw_caps |= GF_VIDEO_HW_OPENGL;
-
 	/*no YUV hardware blitting in SDL (only overlays)*/
 	driv->hw_caps |= GF_VIDEO_HW_HAS_RGB ;
 
@@ -2201,11 +2215,7 @@
 
 	driv->hw_caps |= GF_VIDEO_HW_HAS_YUV | GF_VIDEO_HW_HAS_STRETCH | GF_VIDEO_HW_HAS_RGBA;
 
-
-	opt = gf_opts_get_key("core", "sdl-defer");
-	ctx->enable_defer_mode = 0;
-	if (opt && !strcmp(opt, "yes"))
-		ctx->enable_defer_mode = 1;
+	ctx->enable_defer_mode = gf_module_get_bool((GF_BaseInterface *)driv, "defer");
 
 	if (! ctx->enable_defer_mode)
 		driv->hw_caps |= GF_VIDEO_HW_DIRECT_ONLY;

gpac-2.2.1.tar.gz/modules/validator/validator.c -> gpac-2.4.0.tar.gz/modules/validator/validator.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Cyril Concolato, Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2010-2022
+ *			Copyright (c) Telecom ParisTech 2010-2023
  *			All rights reserved
  *
  *  This file is part of GPAC / Test Suite Validator Recorder sub-project
@@ -29,7 +29,7 @@
 #include <gpac/internal/media_dev.h>
 #include <gpac/xml.h>
 
-#ifndef GPAC_DISABLE_PLAYER
+#ifndef GPAC_DISABLE_COMPOSITOR
 
 typedef struct __validation_module
 {
@@ -143,7 +143,7 @@
 
 	dumpname = validator_get_snapshot_name(validator, validator->is_recording, validator->snapshot_number);
 
-	e = gf_sc_get_screen_buffer(compositor, &fb, 0);
+	e = gf_sc_get_screen_buffer(compositor, &fb, GF_SC_GRAB_DEPTH_NONE);
 	if (e) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_MODULE, ("Validator Error dumping screen buffer %s\n", gf_error_to_string(e)));
 	} else {
@@ -992,19 +992,19 @@
 		validator->compositor = (GF_Compositor *) param;
 
 		/* Check if the validator should be loaded and in which mode */
-		opt = gf_opts_get_key("Validator", "Mode");
+		opt = gf_module_get_key((GF_BaseInterface *)termext, "mode");
 		if (!opt) {
 			GF_LOG(GF_LOG_DEBUG, GF_LOG_MODULE, ("Validator missing configuration, stopping.\n"));
 			return GF_FALSE;
-		} else if (!strcmp(opt, "Play") ) {
+		} else if (!strcmp(opt, "play") ) {
 			GF_LOG(GF_LOG_INFO, GF_LOG_MODULE, ("Validator starting in playback mode.\n"));
 			validator->is_recording = GF_FALSE;
 			//this will indicate to the compositor to increment scene time even though no new changes
 			validator->compositor->validator_mode = GF_TRUE;
-		} else if (!strcmp(opt, "Record")) {
+		} else if (!strcmp(opt, "record")) {
 			GF_LOG(GF_LOG_INFO, GF_LOG_MODULE, ("Validator starting in recording mode.\n"));
 			validator->is_recording = GF_TRUE;
-		} else if (!strcmp(opt, "Disable")) {
+		} else if (!strcmp(opt, "disable")) {
 			GF_LOG(GF_LOG_INFO, GF_LOG_MODULE, ("Validator is disabled.\n"));
 			return GF_FALSE;
 		} else {
@@ -1012,15 +1012,15 @@
 			return GF_FALSE;
 		}
 
-		gf_opts_set_key("Validator", "Mode", "Disable");
+		gf_opts_set_key("validator", "mode", "disable");
 
 		/* initializes the validator and starts */
 		validator->xvs_filename = NULL;
-		validator->xvl_filename = (char *)gf_opts_get_key("Validator", "XVL");
+		validator->xvl_filename = (char *)gf_module_get_key((GF_BaseInterface *)termext, "xvl");
 		if (!validator->xvl_filename) {
-			validator->xvs_filename = (char *)gf_opts_get_key("Validator", "XVS");
+			validator->xvs_filename = (char *)gf_module_get_key((GF_BaseInterface *)termext, "xvs");
 			if (!validator->xvs_filename) {
-				validator->xvs_filename = (char *)gf_opts_get_key("Validator", "Trace");
+				validator->xvs_filename = (char *)gf_module_get_key((GF_BaseInterface *)termext, "trace");
 				if (!validator->xvs_filename) {
 					GF_LOG(GF_LOG_ERROR, GF_LOG_MODULE, ("Validator configuration without input, stopping.\n"));
 					return GF_FALSE;
@@ -1094,9 +1094,9 @@
 		/*auto-disable the recording by default*/
 		if (!validator->trace_mode) {
 			if (validator->is_recording ) {
-				gf_opts_set_key("Validator", "Mode", "Play");
+				gf_opts_set_key("validator", "mode", "play");
 			} else {
-				gf_opts_set_key("Validator", "Mode", "Disable");
+				gf_opts_set_key("validator", "mode", "disable");
 			}
 		}
 		GF_LOG(GF_LOG_INFO, GF_LOG_MODULE, ("Stopping validator\n"));
@@ -1149,6 +1149,16 @@
 	return GF_FALSE;
 }
 
+static GF_GPACArg ValidatorArgs = {
+	GF_DEF_ARG("mode", NULL, "operationg mode\n"
+	"- play: replay events\n"
+	"- record: record events\n"
+	"- disable: disable validator", NULL, NULL, GF_ARG_STRING, 0),
+	GF_DEF_ARG("xvl", NULL, "filename for XVL", NULL, NULL, GF_ARG_STRING, 0),
+	GF_DEF_ARG("xvs", NULL, "filename for XVS", NULL, NULL, GF_ARG_STRING, 0),
+	GF_DEF_ARG("trace", NULL, "filename for event trace", NULL, NULL, GF_ARG_STRING, 0),
+	{0},
+};
 
 GF_CompositorExt *validator_new()
 {
@@ -1156,7 +1166,7 @@
 	GF_Validator *validator;
 	dr = (GF_CompositorExt*)gf_malloc(sizeof(GF_CompositorExt));
 	memset(dr, 0, sizeof(GF_CompositorExt));
-	GF_REGISTER_MODULE_INTERFACE(dr, GF_COMPOSITOR_EXT_INTERFACE, "GPAC Test Validator", "gpac distribution");
+	GF_REGISTER_MODULE_INTERFACE(dr, GF_COMPOSITOR_EXT_INTERFACE, "validator", "gpac distribution");
 
 	GF_SAFEALLOC(validator, GF_Validator);
 	if (!validator) {
@@ -1165,6 +1175,8 @@
 	}
 	dr->process = validator_process;
 	dr->udta = validator;
+	dr->description = "Compositor Validator Extension";
+	dr->args = ValidatorArgs;
 	return dr;
 }
 
@@ -1207,5 +1219,5 @@
 GPAC_MODULE_STATIC_DECLARATION( validator )
 
 
-#endif //#ifndef GPAC_DISABLE_PLAYER
+#endif //#ifndef GPAC_DISABLE_COMPOSITOR

gpac-2.2.1.tar.gz/modules/wav_out/wav_out.c -> gpac-2.4.0.tar.gz/modules/wav_out/wav_out.c Changed

gpac-2.2.1.tar.gz/modules/x11_out/x11_out.c -> gpac-2.4.0.tar.gz/modules/x11_out/x11_out.c Changed

@@ -748,7 +748,7 @@
 	if ( ! glXMakeCurrent(xWin->display, xWin->fullscreen ? xWin->full_wnd : xWin->wnd, xWin->glx_context) ) return GF_IO_ERR;
 
 #ifdef GPAC_HAS_OPENGL
-	if (gf_opts_get_bool("core", "disable-vsync")) {
+	if (gf_module_get_bool((GF_BaseInterface*)vout, "no-vsync")) {
 		my_glXSwapIntervalEXT = (PFNGLXSWAPINTERVALEXTPROC)glXGetProcAddress( (const GLubyte*)"glXSwapIntervalEXT");
 		if (my_glXSwapIntervalEXT != NULL) {
 			my_glXSwapIntervalEXT(xWin->display, xWin->wnd, 0);
@@ -1306,8 +1306,8 @@
 	xWindow->use_shared_memory = 0;
 
 #ifdef GPAC_HAS_X11_SHM
-	sOpt = gf_opts_get_key("core", "hwvmem");
-	if (!sOpt || strcmp(sOpt, "no")) {
+	sOpt = gf_module_get_key((GF_BaseInterface*)vout, "hwvmem");
+	if (!sOpt || strcmp(sOpt, "never")) {
 		int XShmMajor, XShmMinor;
 		Bool XShmPixmaps;
 		if (XShmQueryVersion(xWindow->display, &XShmMajor, &XShmMinor, &XShmPixmaps)) {
@@ -1322,8 +1322,7 @@
 #endif
 
 #ifdef GPAC_HAS_X11_XV
-	sOpt = gf_opts_get_key("core", "no-colorkey");
-	if (sOpt && !strcmp(sOpt, "yes")) {
+	if (!gf_module_get_bool((GF_BaseInterface *)vout, "colorkey")) {
 		xWindow->xvport = X11_GetXVideoPort(vout, GF_PIXEL_YV12, 0);
 	} else {
 		xWindow->xvport = X11_GetXVideoPort(vout, GF_PIXEL_YV12, 1);
@@ -1345,7 +1344,7 @@
 
 #ifdef GPAC_HAS_X11_SHM
 		/*if user asked for YUV->RGB on offscreen, do it (it may crash the system)*/
-		if (gf_opts_get_bool("core", "offscreen-yuv")) {
+		if (gf_module_get_bool((GF_BaseInterface *)vout, "offscreen-yuv")) {
 			vout->hw_caps |= GF_VIDEO_HW_HAS_YUV;
 			GF_LOG(GF_LOG_INFO, GF_LOG_MMIO, ("X11 Using XV Offscreen YUV2RGB acceleration\n"));
 		}
@@ -1566,6 +1565,16 @@
 }
 
 
+static GF_GPACArg X11Args = {
+	GF_DEF_ARG("offscreen-yuv", NULL, "enable offscreen yuv", "true", NULL, GF_ARG_BOOL, 0),
+	GF_DEF_ARG("no-vsync", NULL, "disable vertical synchro", "false", NULL, GF_ARG_BOOL, 0),
+	GF_DEF_ARG("hwvmem", NULL, "specify (2D rendering only) memory type of main video backbuffer. Depending on the scene type, this may drastically change the playback speed\n"
+ "- always: always on hardware\n"
+ "- never: always on system memory\n"
+ "- auto: selected by GPAC based on content type (graphics or video)", "auto", "auto|always|never", GF_ARG_INT, GF_ARG_HINT_EXPERT|GF_ARG_SUBSYS_VIDEO),
+	GF_DEF_ARG("colorkey", NULL, "enable colorkey for overlays", "true", NULL, GF_ARG_BOOL, 0),
+	{0},
+};
 
 
 void *NewX11VideoOutput ()
@@ -1579,7 +1588,7 @@
 		gf_free(driv);
 		return NULL;
 	}
-	GF_REGISTER_MODULE_INTERFACE(driv, GF_VIDEO_OUTPUT_INTERFACE, "X11 Video Output", "gpac distribution")
+	GF_REGISTER_MODULE_INTERFACE(driv, GF_VIDEO_OUTPUT_INTERFACE, "x11", "gpac distribution")
 
 	driv->opaque = xWindow;
 
@@ -1598,6 +1607,9 @@
 		x11_translate_key(XK_BackSpace, &evt.key);
 		X11_BadAccess_ByPass(NULL, NULL);
 	}
+	driv->args = X11Args;
+	driv->description = "Video output using X11";
+
 	return (void *) driv;
 
 }

gpac-2.2.1.tar.gz/packagers/osx/GPAC.app/Contents/Info.plist -> gpac-2.4.0.tar.gz/packagers/osx/GPAC.app/Contents/Info.plist Changed

gpac-2.2.1.tar.gz/packagers/win32_64/nsis/gpac_installer.nsi -> gpac-2.4.0.tar.gz/packagers/win32_64/nsis/gpac_installer.nsi Changed

@@ -1,6 +1,6 @@
 ;--------------------------------
 ;General
-!define GPAC_VERSION 2.2.1
+!define GPAC_VERSION 2.4
 !include default.out
 
 !define GPAC_ROOT ..\..\..
@@ -39,8 +39,8 @@
   !include "MUI2.nsh"
 
 WindowIcon on
-Icon "${GPAC_ROOT}\share\doc\gpac.ico"
-UninstallIcon "${GPAC_ROOT}\share\doc\gpac.ico"
+Icon "${GPAC_ROOT}\share\res\gpac.ico"
+UninstallIcon "${GPAC_ROOT}\share\res\gpac.ico"
 
 ;--------------------------------
 ;Interface Settings
@@ -211,7 +211,7 @@
   File /oname=ReadMe.txt "${GPAC_ROOT}\README.md"
   File /oname=License.txt "${GPAC_ROOT}\COPYING"
   File /oname=Changelog.txt "${GPAC_ROOT}\Changelog"
-  File "${GPAC_ROOT}\share\doc\gpac.ico"
+  File "${GPAC_ROOT}\share\res\gpac.ico"
 
   File "${GPAC_BIN}\gpac.exe"
   File "${GPAC_BIN}\libgpac.dll"
@@ -307,6 +307,12 @@
   File "${GPAC_BIN}\gm_validator.dll"
 SectionEnd
 
+Section "Libcaca Output" SecCACA
+  SectionIn 1
+  File "${GPAC_BIN}\libcaca.dll"
+  File "${GPAC_BIN}\gm_caca_out.dll"
+SectionEnd
+
 SubSectionEnd
 
 
@@ -409,6 +415,7 @@
   !insertmacro MUI_DESCRIPTION_TEXT ${SecPython} "Python bindings for libgpac"
   !insertmacro MUI_DESCRIPTION_TEXT ${SecRMT} "Remotery HTML visualizer"
   !insertmacro MUI_DESCRIPTION_TEXT ${SecSDL} "SDL Audio and Video output"
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecCACA} "Support for ASCII video output"
   !insertmacro MUI_DESCRIPTION_TEXT ${SecValidator} "GPAC Test Validator"
   !insertmacro MUI_DESCRIPTION_TEXT ${SecShortcuts} "System menu shortucts"
 !insertmacro MUI_FUNCTION_DESCRIPTION_END

gpac-2.2.1.tar.gz/share/deprecated/iphone_wm_gui.js -> gpac-2.4.0.tar.gz/share/deprecated/iphone_wm_gui.js Changed

gpac-2.2.1.tar.gz/share/doc/doxyfile -> gpac-2.4.0.tar.gz/share/doc/doxyfile Changed

@@ -1,4 +1,4 @@
-# Doxyfile 1.8.10
+# Doxyfile 1.9.1
 
 # This file describes the settings to be used by the documentation system
 # doxygen (www.doxygen.org) for a project.
@@ -17,11 +17,11 @@
 # Project related configuration options
 #---------------------------------------------------------------------------
 
-# This tag specifies the encoding used for all characters in the config file
-# that follow. The default is UTF-8 which is also the encoding used for all text
-# before the first occurrence of this tag. Doxygen uses libiconv (or the iconv
-# built into libc) for the transcoding. See http://www.gnu.org/software/libiconv
-# for the list of possible encodings.
+# This tag specifies the encoding used for all characters in the configuration
+# file that follow. The default is UTF-8 which is also the encoding used for all
+# text before the first occurrence of this tag. Doxygen uses libiconv (or the
+# iconv built into libc) for the transcoding. See
+# https://www.gnu.org/software/libiconv/ for the list of possible encodings.
 # The default value is: UTF-8.
 
 DOXYFILE_ENCODING      = UTF-8
@@ -93,6 +93,14 @@
 
 OUTPUT_LANGUAGE        = English
 
+# The OUTPUT_TEXT_DIRECTION tag is used to specify the direction in which all
+# documentation generated by doxygen is written. Doxygen will use this
+# information to generate all generated output in the proper direction.
+# Possible values are: None, LTR, RTL and Context.
+# The default value is: None.
+
+OUTPUT_TEXT_DIRECTION  = None
+
 # If the BRIEF_MEMBER_DESC tag is set to YES, doxygen will include brief member
 # descriptions after the members that are listed in the file and class
 # documentation (similar to Javadoc). Set to NO to disable this.
@@ -189,6 +197,16 @@
 
 JAVADOC_AUTOBRIEF      = NO
 
+# If the JAVADOC_BANNER tag is set to YES then doxygen will interpret a line
+# such as
+# /***************
+# as being the beginning of a Javadoc-style comment "banner". If set to NO, the
+# Javadoc-style will behave just like regular comments and it will not be
+# interpreted by doxygen.
+# The default value is: NO.
+
+JAVADOC_BANNER         = NO
+
 # If the QT_AUTOBRIEF tag is set to YES then doxygen will interpret the first
 # line (until the first dot) of a Qt-style comment as the brief description. If
 # set to NO, the Qt-style will behave just like regular Qt-style comments (thus
@@ -209,6 +227,14 @@
 
 MULTILINE_CPP_IS_BRIEF = NO
 
+# By default Python docstrings are displayed as preformatted text and doxygen's
+# special commands cannot be used. By setting PYTHON_DOCSTRING to NO the
+# doxygen's special commands can be used and the contents of the docstring
+# documentation blocks is shown as doxygen documentation.
+# The default value is: YES.
+
+PYTHON_DOCSTRING       = YES
+
 # If the INHERIT_DOCS tag is set to YES then an undocumented member inherits the
 # documentation from any documented member that it re-implements.
 # The default value is: YES.
@@ -236,16 +262,15 @@
 # will allow you to put the command \sideeffect (or @sideeffect) in the
 # documentation, which will result in a user-defined paragraph with heading
 # "Side Effects:". You can put \n's in the value part of an alias to insert
-# newlines.
+# newlines (in the resulting output). You can put ^^ in the value part of an
+# alias to insert a newline as if a physical newline was in the original file.
+# When you need a literal { or } or , in the value part of an alias you have to
+# escape them by means of a backslash (\), this can lead to conflicts with the
+# commands \{ and \} for these it is advised to use the version @{ and @} or use
+# a double escape (\\{ and \\})
 
 ALIASES                =
 
-# This tag can be used to specify a number of word-keyword mappings (TCL only).
-# A mapping has the form "name=value". For example adding "class=itcl::class"
-# will allow you to use the command class in the itcl::class meaning.
-
-TCL_SUBST              =
-
 # Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
 # only. Doxygen will then generate output that is more tailored for C. For
 # instance, some of the names that are used will be different. The list of all
@@ -274,28 +299,40 @@
 
 OPTIMIZE_OUTPUT_VHDL   = NO
 
+# Set the OPTIMIZE_OUTPUT_SLICE tag to YES if your project consists of Slice
+# sources only. Doxygen will then generate output that is more tailored for that
+# language. For instance, namespaces will be presented as modules, types will be
+# separated into more groups, etc.
+# The default value is: NO.
+
+OPTIMIZE_OUTPUT_SLICE  = NO
+
 # Doxygen selects the parser to use depending on the extension of the files it
 # parses. With this tag you can assign which parser to use for a given
 # extension. Doxygen has a built-in mapping, but you can override or extend it
 # using this tag. The format is ext=language, where ext is a file extension, and
-# language is one of the parsers supported by doxygen: IDL, Java, Javascript,
-# C#, C, C++, D, PHP, Objective-C, Python, Fortran (fixed format Fortran:
-# FortranFixed, free formatted Fortran: FortranFree, unknown formatted Fortran:
-# Fortran. In the later case the parser tries to guess whether the code is fixed
-# or free formatted code, this is the default for Fortran type files), VHDL. For
-# instance to make doxygen treat .inc files as Fortran files (default is PHP),
-# and .f files as C (default is Fortran), use: inc=Fortran f=C.
+# language is one of the parsers supported by doxygen: IDL, Java, JavaScript,
+# Csharp (C#), C, C++, D, PHP, md (Markdown), Objective-C, Python, Slice, VHDL,
+# Fortran (fixed format Fortran: FortranFixed, free formatted Fortran:
+# FortranFree, unknown formatted Fortran: Fortran. In the later case the parser
+# tries to guess whether the code is fixed or free formatted code, this is the
+# default for Fortran type files). For instance to make doxygen treat .inc files
+# as Fortran files (default is PHP), and .f files as C (default is Fortran),
+# use: inc=Fortran f=C.
 #
 # Note: For files without extension you can use no_extension as a placeholder.
 #
 # Note that for custom extensions you also need to set FILE_PATTERNS otherwise
-# the files are not read by doxygen.
+# the files are not read by doxygen. When specifying no_extension you should add
+# * to the FILE_PATTERNS.
+#
+# Note see also the list of default file extension mappings.
 
 EXTENSION_MAPPING      =
 
 # If the MARKDOWN_SUPPORT tag is enabled then doxygen pre-processes all comments
 # according to the Markdown format, which allows for more readable
-# documentation. See http://daringfireball.net/projects/markdown/ for details.
+# documentation. See https://daringfireball.net/projects/markdown/ for details.
 # The output of markdown processing is further processed by doxygen, so you can
 # mix doxygen, HTML, and XML commands with Markdown formatting. Disable only in
 # case of backward compatibilities issues.
@@ -303,6 +340,15 @@
 
 MARKDOWN_SUPPORT       = YES
 
+# When the TOC_INCLUDE_HEADINGS tag is set to a non-zero value, all headings up
+# to that level are automatically included in the table of contents, even if
+# they do not have an id attribute.
+# Note: This feature currently applies only to Markdown headings.
+# Minimum value: 0, maximum value: 99, default value: 5.
+# This tag requires that the tag MARKDOWN_SUPPORT is set to YES.
+
+TOC_INCLUDE_HEADINGS   = 5
+
 # When enabled doxygen tries to link words that correspond to documented
 # classes, or namespaces to their corresponding documentation. Such a link can
 # be prevented in individual cases by putting a % sign in front of the word or
@@ -328,7 +374,7 @@
 CPP_CLI_SUPPORT        = NO
 
 # Set the SIP_SUPPORT tag to YES if your project consists of sip (see:
-# http://www.riverbankcomputing.co.uk/software/sip/intro) sources only. Doxygen
+# https://www.riverbankcomputing.com/software/sip/intro) sources only. Doxygen
 # will parse them like normal C++ but will assume all classes use public instead
 # of private inheritance when no explicit protection keyword is present.
 # The default value is: NO.
@@ -414,6 +460,19 @@
 
 LOOKUP_CACHE_SIZE      = 0
 
+# The NUM_PROC_THREADS specifies the number threads doxygen is allowed to use
+# during processing. When set to 0 doxygen will based this on the number of
+# cores available in the system. You can set it explicitly to a value larger
+# than 0 to get more control over the balance between CPU load and processing
+# speed. At this moment only the input processing can be done using multiple
+# threads. Since this is still an experimental feature the default is set to 1,
+# which efficively disables parallel processing. Please report any issues you
+# encounter. Generating dot graphs in parallel is controlled by the
+# DOT_NUM_THREADS setting.
+# Minimum value: 0, maximum value: 32, default value: 1.
+
+NUM_PROC_THREADS       = 1
+
 #---------------------------------------------------------------------------
 # Build related configuration options
 #---------------------------------------------------------------------------
@@ -434,6 +493,12 @@
 
 EXTRACT_PRIVATE        = YES
 
+# If the EXTRACT_PRIV_VIRTUAL tag is set to YES, documented private virtual
+# methods of a class will be included in the documentation.
+# The default value is: NO.
+
+EXTRACT_PRIV_VIRTUAL   = NO
+
 # If the EXTRACT_PACKAGE tag is set to YES, all members with package or internal
 # scope will be included in the documentation.
 # The default value is: NO.
@@ -471,6 +536,13 @@
 
 EXTRACT_ANON_NSPACES   = NO
 
+# If this flag is set to YES, the name of an unnamed parameter in a declaration
+# will be determined by the corresponding definition. By default unnamed
+# parameters remain unnamed in the output.
+# The default value is: YES.
+
+RESOLVE_UNNAMED_PARAMS = YES
+
 # If the HIDE_UNDOC_MEMBERS tag is set to YES, doxygen will hide all
 # undocumented members inside documented classes or files. If set to NO these
 # members will be included in the various overviews, but no documentation
@@ -488,8 +560,8 @@
 HIDE_UNDOC_CLASSES     = NO
 
 # If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend
-# (class|struct|union) declarations. If set to NO, these declarations will be
-# included in the documentation.
+# declarations. If set to NO, these declarations will be included in the
+# documentation.
 # The default value is: NO.
 
 HIDE_FRIEND_COMPOUNDS  = NO
@@ -508,11 +580,18 @@
 
 INTERNAL_DOCS          = NO
 
-# If the CASE_SENSE_NAMES tag is set to NO then doxygen will only generate file
-# names in lower-case letters. If set to YES, upper-case letters are also
-# allowed. This is useful if you have classes or files whose names only differ
-# in case and if your file system supports case sensitive file names. Windows
-# and Mac users are advised to set this option to NO.
+# With the correct setting of option CASE_SENSE_NAMES doxygen will better be
+# able to match the capabilities of the underlying filesystem. In case the
+# filesystem is case sensitive (i.e. it supports files in the same directory
+# whose names only differ in casing), the option must be set to YES to properly
+# deal with such files in case they appear in the input. For filesystems that
+# are not case sensitive the option should be be set to NO to properly deal with
+# output files written for symbols that only differ in casing, such as for two
+# classes, one named CLASS and the other named Class, and to also support
+# references to files without having to specify the exact matching casing. On
+# Windows (including Cygwin) and MacOS, users should typically set this option
+# to NO, whereas on Linux or other Unix flavors it should typically be set to
+# YES.
 # The default value is: system dependent.
 
 CASE_SENSE_NAMES       = NO
@@ -699,7 +778,7 @@
 # The CITE_BIB_FILES tag can be used to specify one or more bib files containing
 # the reference definitions. This must be a list of .bib files. The .bib
 # extension is automatically appended if omitted. This requires the bibtex tool
-# to be installed. See also http://en.wikipedia.org/wiki/BibTeX for more info.
+# to be installed. See also https://en.wikipedia.org/wiki/BibTeX for more info.
 # For LaTeX the style of the bibliography can be controlled using
 # LATEX_BIB_STYLE. To use this feature you need bibtex and perl available in the
 # search path. See also \cite for info how to create references.
@@ -744,11 +823,22 @@
 # This WARN_NO_PARAMDOC option can be enabled to get warnings for functions that
 # are documented, but have no documentation for their parameters or return
 # value. If set to NO, doxygen will only warn about wrong or incomplete
-# parameter documentation, but not about the absence of documentation.
+# parameter documentation, but not about the absence of documentation. If
+# EXTRACT_ALL is set to YES then this flag will automatically be disabled.
 # The default value is: NO.
 
 WARN_NO_PARAMDOC       = YES
 
+# If the WARN_AS_ERROR tag is set to YES then doxygen will immediately stop when
+# a warning is encountered. If the WARN_AS_ERROR tag is set to FAIL_ON_WARNINGS
+# then doxygen will continue running as if WARN_AS_ERROR tag is set to NO, but
+# at the end of the doxygen process doxygen will return with a non-zero status.
+# Possible values are: NO, YES and FAIL_ON_WARNINGS.
+# The default value is: NO.
+
+#WARN_AS_ERROR          = FAIL_ON_WARNINGS
+WARN_AS_ERROR          = NO
+
 # The WARN_FORMAT tag determines the format of the warning messages that doxygen
 # can produce. The string should contain the $file, $line, and $text tags, which
 # will be replaced by the file and line number from which the warning originated
@@ -765,9 +855,6 @@
 
 WARN_LOGFILE           = doxygen_warnings.txt
 
-WARN_AS_ERROR	 = FAIL_ON_WARNINGS
-
-
 #---------------------------------------------------------------------------
 # Configuration options related to the input files
 #---------------------------------------------------------------------------
@@ -778,14 +865,26 @@
 # spaces. See also FILE_PATTERNS and EXTENSION_MAPPING
 # Note: If this tag is empty the current directory is searched.
 
-#for some weird reason on OSX enumeration does not work properly, add IDL files by hand
-INPUT=../../include/gpac/ ../../README.md ../../share/doc/idl/core.idl ../../share/doc/idl/jsf.idl ../../share/doc/idl/xhr.idl ../../share/doc/idl/evg.idl ../../share/doc/idl/scenejs.idl ../../share/doc/idl/storage.idl ../../share/doc/idl/webgl.idl ../../share/doc/idl/filtersession.idl ../../share/doc/idl/dash_algo.idl  ../../share/doc/idl/nodejs.idl ../../share/python/libgpac/libgpac.py
+INPUT                  = ../../include/gpac/ \
+                         ../../README.md \
+                         ../../share/doc/idl/core.idl \
+                         ../../share/doc/idl/jsf.idl \
+                         ../../share/doc/idl/xhr.idl \
+                         ../../share/doc/idl/evg.idl \
+                         ../../share/doc/idl/scenejs.idl \
+                         ../../share/doc/idl/storage.idl \
+                         ../../share/doc/idl/webgl.idl \
+                         ../../share/doc/idl/filtersession.idl \
+                         ../../share/doc/idl/dash_algo.idl \
+                         ../../share/doc/idl/httpout.idl \
+                         ../../share/doc/idl/nodejs.idl \
+                         ../../share/python/libgpac/libgpac.py
 
 # This tag can be used to specify the character encoding of the source files
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
 # libiconv (or the iconv built into libc) for the transcoding. See the libiconv
-# documentation (see: http://www.gnu.org/software/libiconv) for the list of
-# possible encodings.
+# documentation (see:
+# https://www.gnu.org/software/libiconv/) for the list of possible encodings.
 # The default value is: UTF-8.
 
 INPUT_ENCODING         = UTF-8
@@ -798,11 +897,15 @@
 # need to set EXTENSION_MAPPING for the extension otherwise the files are not
 # read by doxygen.
 #
+# Note the list of default checked file patterns might differ from the list of
+# default file extension mappings.
+#
 # If left blank the following patterns are tested:*.c, *.cc, *.cxx, *.cpp,
 # *.c++, *.java, *.ii, *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h,
 # *.hh, *.hxx, *.hpp, *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc,
-# *.m, *.markdown, *.md, *.mm, *.dox, *.py, *.f90, *.f, *.for, *.tcl, *.vhd,
-# *.vhdl, *.ucf, *.qsf, *.as and *.js.
+# *.m, *.markdown, *.md, *.mm, *.dox (to be provided as doxygen C comment),
+# *.py, *.pyw, *.f90, *.f95, *.f03, *.f08, *.f18, *.f, *.for, *.vhd, *.vhdl,
+# *.ucf, *.qsf and *.ice.
 
 FILE_PATTERNS          = *.c \
                          *.cc \
@@ -845,14 +948,14 @@
 # run.
 
 EXCLUDE                = ../../include/gpac/nodes_mpeg4.h \
-				../../include/gpac/nodes_svg.h \
-				../../include/gpac/nodes_x3d.h \
-				../../include/gpac/nodes_xbl.h \
-				../../include/gpac/configuration.h \
-				../../include/gpac/revision.h \
-				../../include/gpac/ait.h \
-				../../include/gpac/dsmcc.h \
-				../../include/gpac/dvb_mpe.h 
+                         ../../include/gpac/nodes_svg.h \
+                         ../../include/gpac/nodes_x3d.h \
+                         ../../include/gpac/nodes_xbl.h \
+                         ../../include/gpac/configuration.h \
+                         ../../include/gpac/revision.h \
+                         ../../include/gpac/ait.h \
+                         ../../include/gpac/dsmcc.h \
+                         ../../include/gpac/dvb_mpe.h
 
 # The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
 # directories that are symbolic links (a Unix file system feature) are excluded
@@ -926,6 +1029,10 @@
 # Note that the filter must not add or remove lines; it is applied before the
 # code is scanned, but not when the output code is generated. If lines are added
 # or removed, the anchors will not be placed correctly.
+#
+# Note that for custom extensions or not directly supported extensions you also
+# need to set EXTENSION_MAPPING for the extension otherwise the files are not
+# properly processed by doxygen.
 
 INPUT_FILTER           =
 
@@ -935,6 +1042,10 @@
 # (like *.cpp=my_cpp_filter). See INPUT_FILTER for further information on how
 # filters are used. If the FILTER_PATTERNS tag is empty or if none of the
 # patterns match the file name, INPUT_FILTER is applied.
+#
+# Note that for custom extensions or not directly supported extensions you also
+# need to set EXTENSION_MAPPING for the extension otherwise the files are not
+# properly processed by doxygen.
 
 FILTER_PATTERNS        =
 
@@ -987,7 +1098,7 @@
 STRIP_CODE_COMMENTS    = YES
 
 # If the REFERENCED_BY_RELATION tag is set to YES then for each documented
-# function all documented functions referencing it will be listed.
+# entity all documented functions referencing it will be listed.
 # The default value is: NO.
 
 REFERENCED_BY_RELATION = NO
@@ -1019,12 +1130,12 @@
 # If the USE_HTAGS tag is set to YES then the references to source code will
 # point to the HTML generated by the htags(1) tool instead of doxygen built-in
 # source browser. The htags tool is part of GNU's global source tagging system
-# (see http://www.gnu.org/software/global/global.html). You will need version
+# (see https://www.gnu.org/software/global/global.html). You will need version
 # 4.8.6 or higher.
 #
 # To use it do the following:
 # - Install the latest version of global
-# - Enable SOURCE_BROWSER and USE_HTAGS in the config file
+# - Enable SOURCE_BROWSER and USE_HTAGS in the configuration file
 # - Make sure the INPUT points to the root of the source tree
 # - Run doxygen as normal
 #
@@ -1046,6 +1157,44 @@
 
 VERBATIM_HEADERS       = NO
 
+# If the CLANG_ASSISTED_PARSING tag is set to YES then doxygen will use the
+# clang parser (see:
+# http://clang.llvm.org/) for more accurate parsing at the cost of reduced
+# performance. This can be particularly helpful with template rich C++ code for
+# which doxygen's built-in parser lacks the necessary type information.
+# Note: The availability of this option depends on whether or not doxygen was
+# generated with the -Duse_libclang=ON option for CMake.
+# The default value is: NO.
+
+CLANG_ASSISTED_PARSING = NO
+
+# If clang assisted parsing is enabled and the CLANG_ADD_INC_PATHS tag is set to
+# YES then doxygen will add the directory of each input to the include path.
+# The default value is: YES.
+
+CLANG_ADD_INC_PATHS    = YES
+
+# If clang assisted parsing is enabled you can provide the compiler with command
+# line options that you would normally use when invoking the compiler. Note that
+# the include paths will already be set by doxygen for the files and directories
+# specified with INPUT and INCLUDE_PATH.
+# This tag requires that the tag CLANG_ASSISTED_PARSING is set to YES.
+
+CLANG_OPTIONS          =
+
+# If clang assisted parsing is enabled you can provide the clang parser with the
+# path to the directory containing a file called compile_commands.json. This
+# file is the compilation database (see:
+# http://clang.llvm.org/docs/HowToSetupToolingForLLVM.html) containing the
+# options used when the source files were built. This is equivalent to
+# specifying the -p option to a clang tool, such as clang-check. These options
+# will then be passed to the parser. Any options specified with CLANG_OPTIONS
+# will be added as well.
+# Note: The availability of this option depends on whether or not doxygen was
+# generated with the -Duse_libclang=ON option for CMake.
+
+CLANG_DATABASE_PATH    =
+
 #---------------------------------------------------------------------------
 # Configuration options related to the alphabetical class index
 #---------------------------------------------------------------------------
@@ -1057,13 +1206,6 @@
 
 ALPHABETICAL_INDEX     = NO
 
-# The COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns in
-# which the alphabetical index list will be split.
-# Minimum value: 1, maximum value: 20, default value: 5.
-# This tag requires that the tag ALPHABETICAL_INDEX is set to YES.
-
-COLS_IN_ALPHA_INDEX    = 5
-
 # In case all classes in a project start with a common prefix, all classes will
 # be put under the same header in the alphabetical index. The IGNORE_PREFIX tag
 # can be used to specify a prefix (or a list of prefixes) that should be ignored
@@ -1164,7 +1306,7 @@
 # The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen
 # will adjust the colors in the style sheet and background images according to
 # this color. Hue is specified as an angle on a colorwheel, see
-# http://en.wikipedia.org/wiki/Hue for more information. For instance the value
+# https://en.wikipedia.org/wiki/Hue for more information. For instance the value
 # 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300
 # purple, and 360 is red again.
 # Minimum value: 0, maximum value: 359, default value: 220.
@@ -1200,6 +1342,17 @@
 
 HTML_TIMESTAMP         = YES
 
+# If the HTML_DYNAMIC_MENUS tag is set to YES then the generated HTML
+# documentation will contain a main index with vertical navigation menus that
+# are dynamically created via JavaScript. If disabled, the navigation index will
+# consists of multiple levels of tabs that are statically embedded in every HTML
+# page. Disable this option to support browsers that do not have JavaScript,
+# like the Qt help browser.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_DYNAMIC_MENUS     = YES
+
 # If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
 # documentation will contain sections that can be hidden and shown after the
 # page has loaded.
@@ -1223,13 +1376,14 @@
 
 # If the GENERATE_DOCSET tag is set to YES, additional index files will be
 # generated that can be used as input for Apple's Xcode 3 integrated development
-# environment (see: http://developer.apple.com/tools/xcode/), introduced with
-# OSX 10.5 (Leopard). To create a documentation set, doxygen will generate a
-# Makefile in the HTML output directory. Running make will produce the docset in
-# that directory and running make install will install the docset in
+# environment (see:
+# https://developer.apple.com/xcode/), introduced with OSX 10.5 (Leopard). To
+# create a documentation set, doxygen will generate a Makefile in the HTML
+# output directory. Running make will produce the docset in that directory and
+# running make install will install the docset in
 # ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find it at
-# startup. See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html
-# for more information.
+# startup. See https://developer.apple.com/library/archive/featuredarticles/Doxy
+# genXcode/_index.html for more information.
 # The default value is: NO.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
@@ -1268,8 +1422,8 @@
 # If the GENERATE_HTMLHELP tag is set to YES then doxygen generates three
 # additional HTML index files: index.hhp, index.hhc, and index.hhk. The
 # index.hhp is a project file that can be read by Microsoft's HTML Help Workshop
-# (see: http://www.microsoft.com/en-us/download/details.aspx?id=21138) on
-# Windows.
+# (see:
+# https://www.microsoft.com/en-us/download/details.aspx?id=21138) on Windows.
 #
 # The HTML Help Workshop contains a compiler that can convert all HTML output
 # generated by doxygen into a single compiled HTML file (.chm). Compiled HTML
@@ -1299,7 +1453,7 @@
 HHC_LOCATION           =
 
 # The GENERATE_CHI flag controls if a separate .chi index file is generated
-# (YES) or that it should be included in the master .chm file (NO).
+# (YES) or that it should be included in the main .chm file (NO).
 # The default value is: NO.
 # This tag requires that the tag GENERATE_HTMLHELP is set to YES.
 
@@ -1344,7 +1498,8 @@
 
 # The QHP_NAMESPACE tag specifies the namespace to use when generating Qt Help
 # Project output. For more information please see Qt Help Project / Namespace
-# (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#namespace).
+# (see:
+# https://doc.qt.io/archives/qt-4.8/qthelpproject.html#namespace).
 # The default value is: org.doxygen.Project.
 # This tag requires that the tag GENERATE_QHP is set to YES.
 
@@ -1352,8 +1507,8 @@
 
 # The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating Qt
 # Help Project output. For more information please see Qt Help Project / Virtual
-# Folders (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#virtual-
-# folders).
+# Folders (see:
+# https://doc.qt.io/archives/qt-4.8/qthelpproject.html#virtual-folders).
 # The default value is: doc.
 # This tag requires that the tag GENERATE_QHP is set to YES.
 
@@ -1361,30 +1516,30 @@
 
 # If the QHP_CUST_FILTER_NAME tag is set, it specifies the name of a custom
 # filter to add. For more information please see Qt Help Project / Custom
-# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom-
-# filters).
+# Filters (see:
+# https://doc.qt.io/archives/qt-4.8/qthelpproject.html#custom-filters).
 # This tag requires that the tag GENERATE_QHP is set to YES.
 
 QHP_CUST_FILTER_NAME   =
 
 # The QHP_CUST_FILTER_ATTRS tag specifies the list of the attributes of the
 # custom filter to add. For more information please see Qt Help Project / Custom
-# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom-
-# filters).
+# Filters (see:
+# https://doc.qt.io/archives/qt-4.8/qthelpproject.html#custom-filters).
 # This tag requires that the tag GENERATE_QHP is set to YES.
 
 QHP_CUST_FILTER_ATTRS  =
 
 # The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this
 # project's filter section matches. Qt Help Project / Filter Attributes (see:
-# http://qt-project.org/doc/qt-4.8/qthelpproject.html#filter-attributes).
+# https://doc.qt.io/archives/qt-4.8/qthelpproject.html#filter-attributes).
 # This tag requires that the tag GENERATE_QHP is set to YES.
 
 QHP_SECT_FILTER_ATTRS  =
 
-# The QHG_LOCATION tag can be used to specify the location of Qt's
-# qhelpgenerator. If non-empty doxygen will try to run qhelpgenerator on the
-# generated .qhp file.
+# The QHG_LOCATION tag can be used to specify the location (absolute path
+# including file name) of Qt's qhelpgenerator. If non-empty doxygen will try to
+# run qhelpgenerator on the generated .qhp file.
 # This tag requires that the tag GENERATE_QHP is set to YES.
 
 QHG_LOCATION           =
@@ -1461,6 +1616,17 @@
 
 EXT_LINKS_IN_WINDOW    = NO
 
+# If the HTML_FORMULA_FORMAT option is set to svg, doxygen will use the pdf2svg
+# tool (see https://github.com/dawbarton/pdf2svg) or inkscape (see
+# https://inkscape.org) to generate formulas as SVG images instead of PNGs for
+# the HTML output. These images will generally look nicer at scaled resolutions.
+# Possible values are: png (the default) and svg (looks nicer but requires the
+# pdf2svg or inkscape tool).
+# The default value is: png.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_FORMULA_FORMAT    = png
+
 # Use this tag to change the font size of LaTeX formulas included as images in
 # the HTML documentation. When you change the font size after a successful
 # doxygen run you need to manually remove any form_*.png images from the HTML
@@ -1470,7 +1636,7 @@
 
 FORMULA_FONTSIZE       = 10
 
-# Use the FORMULA_TRANPARENT tag to determine whether or not the images
+# Use the FORMULA_TRANSPARENT tag to determine whether or not the images
 # generated for formulas are transparent PNGs. Transparent PNGs are not
 # supported properly for IE 6.0, but are supported on all modern browsers.
 #
@@ -1481,8 +1647,14 @@
 
 FORMULA_TRANSPARENT    = YES
 
+# The FORMULA_MACROFILE can contain LaTeX \newcommand and \renewcommand commands
+# to create new LaTeX commands to be used in formulas as building blocks. See
+# the section "Including formulas" for details.
+
+FORMULA_MACROFILE      =
+
 # Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see
-# http://www.mathjax.org) which uses client side Javascript for the rendering
+# https://www.mathjax.org) which uses client side JavaScript for the rendering
 # instead of using pre-rendered bitmaps. Use this if you do not have LaTeX
 # installed or if you want to formulas look prettier in the HTML output. When
 # enabled you may also need to install MathJax separately and configure the path
@@ -1494,7 +1666,7 @@
 
 # When MathJax is enabled you can set the default output format to be used for
 # the MathJax output. See the MathJax site (see:
-# http://docs.mathjax.org/en/latest/output.html) for more details.
+# http://docs.mathjax.org/en/v2.7-latest/output.html) for more details.
 # Possible values are: HTML-CSS (which is slower, but has the best
 # compatibility), NativeMML (i.e. MathML) and SVG.
 # The default value is: HTML-CSS.
@@ -1509,8 +1681,8 @@
 # MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax
 # Content Delivery Network so you can quickly see the result without installing
 # MathJax. However, it is strongly recommended to install a local copy of
-# MathJax from http://www.mathjax.org before deployment.
-# The default value is: http://cdn.mathjax.org/mathjax/latest.
+# MathJax from https://www.mathjax.org before deployment.
+# The default value is: https://cdn.jsdelivr.net/npm/mathjax@2.
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
 MATHJAX_RELPATH        = http://cdn.mathjax.org/mathjax/latest
@@ -1524,7 +1696,8 @@
 
 # The MATHJAX_CODEFILE tag can be used to specify a file with javascript pieces
 # of code that will be used on startup of the MathJax code. See the MathJax site
-# (see: http://docs.mathjax.org/en/latest/output.html) for more details. For an
+# (see:
+# http://docs.mathjax.org/en/v2.7-latest/output.html) for more details. For an
 # example see the documentation.
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
@@ -1552,7 +1725,7 @@
 SEARCHENGINE           = YES
 
 # When the SERVER_BASED_SEARCH tag is enabled the search engine will be
-# implemented using a web server instead of a web client using Javascript. There
+# implemented using a web server instead of a web client using JavaScript. There
 # are two flavors of web server based searching depending on the EXTERNAL_SEARCH
 # setting. When disabled, doxygen will generate a PHP script for searching and
 # an index file used by the script. When EXTERNAL_SEARCH is enabled the indexing
@@ -1571,7 +1744,8 @@
 #
 # Doxygen ships with an example indexer (doxyindexer) and search engine
 # (doxysearch.cgi) which are based on the open source search engine library
-# Xapian (see: http://xapian.org/).
+# Xapian (see:
+# https://xapian.org/).
 #
 # See the section "External Indexing and Searching" for details.
 # The default value is: NO.
@@ -1584,8 +1758,9 @@
 #
 # Doxygen ships with an example indexer (doxyindexer) and search engine
 # (doxysearch.cgi) which are based on the open source search engine library
-# Xapian (see: http://xapian.org/). See the section "External Indexing and
-# Searching" for details.
+# Xapian (see:
+# https://xapian.org/). See the section "External Indexing and Searching" for
+# details.
 # This tag requires that the tag SEARCHENGINE is set to YES.
 
 SEARCHENGINE_URL       =
@@ -1636,21 +1811,35 @@
 # The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be
 # invoked.
 #
-# Note that when enabling USE_PDFLATEX this option is only used for generating
-# bitmaps for formulas in the HTML output, but not in the Makefile that is
-# written to the output directory.
-# The default file is: latex.
+# Note that when not enabling USE_PDFLATEX the default is latex when enabling
+# USE_PDFLATEX the default is pdflatex and when in the later case latex is
+# chosen this is overwritten by pdflatex. For specific output languages the
+# default can have been set differently, this depends on the implementation of
+# the output language.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
 LATEX_CMD_NAME         = latex
 
 # The MAKEINDEX_CMD_NAME tag can be used to specify the command name to generate
 # index for LaTeX.
+# Note: This tag is used in the Makefile / make.bat.
+# See also: LATEX_MAKEINDEX_CMD for the part in the generated output file
+# (.tex).
 # The default file is: makeindex.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
 MAKEINDEX_CMD_NAME     = makeindex
 
+# The LATEX_MAKEINDEX_CMD tag can be used to specify the command name to
+# generate index for LaTeX. In case there is no backslash (\) as first character
+# it will be automatically added in the LaTeX code.
+# Note: This tag is used in the generated output file (.tex).
+# See also: MAKEINDEX_CMD_NAME for the part in the Makefile / make.bat.
+# The default value is: makeindex.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_MAKEINDEX_CMD    = makeindex
+
 # If the COMPACT_LATEX tag is set to YES, doxygen generates more compact LaTeX
 # documents. This may be useful for small projects and may help to save some
 # trees in general.
@@ -1666,7 +1855,7 @@
 # The default value is: a4.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
-PAPER_TYPE             = a4wide
+PAPER_TYPE             = a4
 
 # The EXTRA_PACKAGES tag can be used to specify one or more LaTeX package names
 # that should be included in the LaTeX output. The package can be specified just
@@ -1735,9 +1924,11 @@
 
 PDF_HYPERLINKS         = NO
 
-# If the USE_PDFLATEX tag is set to YES, doxygen will use pdflatex to generate
-# the PDF file directly from the LaTeX files. Set this option to YES, to get a
-# higher quality PDF documentation.
+# If the USE_PDFLATEX tag is set to YES, doxygen will use the engine as
+# specified with LATEX_CMD_NAME to generate the PDF file directly from the LaTeX
+# files. Set this option to YES, to get a higher quality PDF documentation.
+#
+# See also section LATEX_CMD_NAME for selecting the engine.
 # The default value is: YES.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
@@ -1771,12 +1962,28 @@
 
 # The LATEX_BIB_STYLE tag can be used to specify the style to use for the
 # bibliography, e.g. plainnat, or ieeetr. See
-# http://en.wikipedia.org/wiki/BibTeX and \cite for more info.
+# https://en.wikipedia.org/wiki/BibTeX and \cite for more info.
 # The default value is: plain.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
 LATEX_BIB_STYLE        = plain
 
+# If the LATEX_TIMESTAMP tag is set to YES then the footer of each generated
+# page will contain the date and time when the page was generated. Setting this
+# to NO can help when comparing the output of multiple runs.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_TIMESTAMP        = NO
+
+# The LATEX_EMOJI_DIRECTORY tag is used to specify the (relative or absolute)
+# path from which the emoji images will be read. If a relative path is entered,
+# it will be relative to the LATEX_OUTPUT directory. If left blank the
+# LATEX_OUTPUT directory will be used.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_EMOJI_DIRECTORY  =
+
 #---------------------------------------------------------------------------
 # Configuration options related to the RTF output
 #---------------------------------------------------------------------------
@@ -1816,9 +2023,9 @@
 
 RTF_HYPERLINKS         = NO
 
-# Load stylesheet definitions from file. Syntax is similar to doxygen's config
-# file, i.e. a series of assignments. You only have to provide replacements,
-# missing definitions are set to their default value.
+# Load stylesheet definitions from file. Syntax is similar to doxygen's
+# configuration file, i.e. a series of assignments. You only have to provide
+# replacements, missing definitions are set to their default value.
 #
 # See also section "Doxygen usage" for information on how to generate the
 # default style sheet that doxygen normally uses.
@@ -1827,8 +2034,8 @@
 RTF_STYLESHEET_FILE    =
 
 # Set optional variables used in the generation of an RTF document. Syntax is
-# similar to doxygen's config file. A template extensions file can be generated
-# using doxygen -e rtf extensionFile.
+# similar to doxygen's configuration file. A template extensions file can be
+# generated using doxygen -e rtf extensionFile.
 # This tag requires that the tag GENERATE_RTF is set to YES.
 
 RTF_EXTENSIONS_FILE    =
@@ -1914,6 +2121,13 @@
 
 XML_PROGRAMLISTING     = YES
 
+# If the XML_NS_MEMB_FILE_SCOPE tag is set to YES, doxygen will include
+# namespace members in file scope as well, matching the HTML output.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_XML is set to YES.
+
+XML_NS_MEMB_FILE_SCOPE = NO
+
 #---------------------------------------------------------------------------
 # Configuration options related to the DOCBOOK output
 #---------------------------------------------------------------------------
@@ -1946,9 +2160,9 @@
 #---------------------------------------------------------------------------
 
 # If the GENERATE_AUTOGEN_DEF tag is set to YES, doxygen will generate an
-# AutoGen Definitions (see http://autogen.sf.net) file that captures the
-# structure of the code including all documentation. Note that this feature is
-# still experimental and incomplete at the moment.
+# AutoGen Definitions (see http://autogen.sourceforge.net/) file that captures
+# the structure of the code including all documentation. Note that this feature
+# is still experimental and incomplete at the moment.
 # The default value is: NO.
 
 GENERATE_AUTOGEN_DEF   = NO
@@ -2115,12 +2329,6 @@
 
 EXTERNAL_PAGES         = YES
 
-# The PERL_PATH should be the absolute path and name of the perl script
-# interpreter (i.e. the result of 'which perl').
-# The default file (with absolute path) is: /usr/bin/perl.
-
-PERL_PATH              = /usr/bin/perl
-
 #---------------------------------------------------------------------------
 # Configuration options related to the dot tool
 #---------------------------------------------------------------------------
@@ -2134,15 +2342,6 @@
 
 CLASS_DIAGRAMS         = YES
 
-# You can define message sequence charts within doxygen comments using the \msc
-# command. Doxygen will then run the mscgen tool (see:
-# http://www.mcternan.me.uk/mscgen/)) to produce the chart and insert it in the
-# documentation. The MSCGEN_PATH tag allows you to specify the directory where
-# the mscgen tool resides. If left empty the tool is assumed to be found in the
-# default search path.
-
-MSCGEN_PATH            =
-
 # You can include diagrams made with dia in doxygen documentation. Doxygen will
 # then run dia to produce the diagram and insert it in the documentation. The
 # DIA_PATH tag allows you to specify the directory where the dia binary resides.
@@ -2161,7 +2360,7 @@
 # http://www.graphviz.org/), a graph visualization toolkit from AT&T and Lucent
 # Bell Labs. The other options in this section have no effect if this option is
 # set to NO
-# The default value is: NO.
+# The default value is: YES.
 
 HAVE_DOT               = YES
 
@@ -2240,10 +2439,32 @@
 # but if the number exceeds 15, the total amount of fields shown is limited to
 # 10.
 # Minimum value: 0, maximum value: 100, default value: 10.
-# This tag requires that the tag HAVE_DOT is set to YES.
+# This tag requires that the tag UML_LOOK is set to YES.
 
 UML_LIMIT_NUM_FIELDS   = 10
 
+# If the DOT_UML_DETAILS tag is set to NO, doxygen will show attributes and
+# methods without types and arguments in the UML graphs. If the DOT_UML_DETAILS
+# tag is set to YES, doxygen will add type and arguments for attributes and
+# methods in the UML graphs. If the DOT_UML_DETAILS tag is set to NONE, doxygen
+# will not generate fields with class member information in the UML graphs. The
+# class diagrams will look similar to the default class diagrams but using UML
+# notation for the relationships.
+# Possible values are: NO, YES and NONE.
+# The default value is: NO.
+# This tag requires that the tag UML_LOOK is set to YES.
+
+DOT_UML_DETAILS        = NO
+
+# The DOT_WRAP_THRESHOLD tag can be used to set the maximum number of characters
+# to display on a single line. If the actual line length exceeds this threshold
+# significantly it will wrapped across multiple lines. Some heuristics are apply
+# to avoid ugly line breaks.
+# Minimum value: 0, maximum value: 1000, default value: 17.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_WRAP_THRESHOLD     = 17
+
 # If the TEMPLATE_RELATIONS tag is set to YES then the inheritance and
 # collaboration graphs will show the relations between templates and their
 # instances.
@@ -2317,7 +2538,9 @@
 # Note: If you choose svg you need to set HTML_FILE_EXTENSION to xhtml in order
 # to make the SVG files visible in IE 9+ (other browsers do not have this
 # requirement).
-# Possible values are: png, jpg, gif, svg, png:gd, png:gd:gd, png:cairo,
+# Possible values are: png, png:cairo, png:cairo:cairo, png:cairo:gd, png:gd,
+# png:gd:gd, jpg, jpg:cairo, jpg:cairo:gd, jpg:gd, jpg:gd:gd, gif, gif:cairo,
+# gif:cairo:gd, gif:gd, gif:gd:gd, svg, png:gd, png:gd:gd, png:cairo,
 # png:cairo:gd, png:cairo:cairo, png:cairo:gdiplus, png:gdiplus and
 # png:gdiplus:gdiplus.
 # The default value is: png.
@@ -2370,6 +2593,11 @@
 
 PLANTUML_JAR_PATH      =
 
+# When using plantuml, the PLANTUML_CFG_FILE tag can be used to specify a
+# configuration file for plantuml.
+
+PLANTUML_CFG_FILE      =
+
 # When using plantuml, the specified paths are searched for files specified by
 # the !include statement in a plantuml block.
 
@@ -2428,9 +2656,11 @@
 
 GENERATE_LEGEND        = YES
 
-# If the DOT_CLEANUP tag is set to YES, doxygen will remove the intermediate dot
+# If the DOT_CLEANUP tag is set to YES, doxygen will remove the intermediate
 # files that are used to generate the various graphs.
+#
+# Note: This setting is not only used for dot files but also for msc and
+# plantuml temporary files.
 # The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
 
 DOT_CLEANUP            = YES

gpac-2.2.1.tar.gz/share/doc/idl/core.idl -> gpac-2.4.0.tar.gz/share/doc/idl/core.idl Changed

gpac-2.2.1.tar.gz/share/doc/idl/dash_algo.idl -> gpac-2.4.0.tar.gz/share/doc/idl/dash_algo.idl Changed

gpac-2.2.1.tar.gz/share/doc/idl/filtersession.idl -> gpac-2.4.0.tar.gz/share/doc/idl/filtersession.idl Changed

@@ -37,9 +37,22 @@
 
 The JSFilterSession interface has a single instance exposed to the script under the name "session".
 It implements binding to the underlying filter session object, see \ref GF_FilterSession.
+
 */
 interface JSFilterSession {
 
+/*!
+Constructor for creating a user-defined filter session
+\return a filter session, created in blocking mode
+*/
+JSFilterSession FilterSession();
+
+/*!
+Constructor for creating a user-defined filter session
+\param config configuration for session
+\return a filter session
+*/
+JSFilterSession FilterSession(JSFilterSessionConfig config);
 
 /*! posts a task to the main scheduler - see \ref gf_fs_post_user_task
 \param task_callback the callback function to use. This callback functions has no parameters, and returns false or an exception to abort the task, true to reschedule the task immediately or a reschedule time in milliseconds
@@ -97,6 +110,12 @@
 */
 JSFSFilter add_filter(DOMString filter_to_add, optional JSFSFilter link_from=null, optional DOMString link_args=null, optional boolean relative_to_script=false);
 
+/*! removes a filter in the media session
+\param filter filter object to remove, can be a JSFSFilter object (in this case, function is equivalent to JSFSFilter.remove) or a JSFilter object
+*/
+void remove_filter(Object filter);
+
+
 /*! sets callback function to get notifications upon each new filter creation.
 \param callback callback function - it is passed a single parameter, the filter object
 */
@@ -136,7 +155,7 @@
 /*! creates a new custom JS filter. This filter will share the same script context as the filter session script - see \ref JSFilter
 \note A custom filter cannot use default arguments, and will not have the initialize callback function called.
 
-\param name name for the filter
+\param name name for the filter. Optional internal filter arguments may be set after the name, e.g. `MyName:ITAG=test`
 \return new filter
 */
 JSFilter new_filter(DOMString name=null);
@@ -149,8 +168,29 @@
 */
 Array filter_args(DOMString desciption);
 
+/*! print graph for session*/
+void print_connections();
+
+/*! print stats for session*/
+void print_stats();
+
+/*! run a session, only valid for user-created sessions
+\return error code if any
+*/
+long run();
+
+/*! stop a session, only valid for user-created sessions
+\return error code if any
+*/
+long stop();
 
-/*! number of filters in the session - see \ref gf_fs_get_filters_count. 
+/*! abort a session, only valid for user-created sessions
+\param flush_type flush type, cf \ref GF_FSFlushType
+\return error code if any
+*/
+long abort(optional unsigned long flush_type);
+
+/*! number of filters in the session - see \ref gf_fs_get_filters_count.
 This number is only valid when session is locked*/
 attribute long nb_filters;
 
@@ -176,6 +216,18 @@
 
 };
 
+/*! Configuration object for user-defined sessions*/
+interface JSFilterSessionConfig
+{
+/*! number of extra threads to use, -1 means all available cores*/
+readonly signed long threads;
+/*! scheduler mode, cf \ref GF_FilterSchedulerType*/
+readonly unsigned long scheduler;
+/*! flags for session, cf \ref GF_FilterSessionFlags*/
+readonly unsigned long flags;
+/*! blacklist of filters for session, same as -blcakclist option, cf \ref gf_fs_new*/
+readonly DOMString blacklist;
+};
 
 /*!\brief JSFSFilter API
 
@@ -189,6 +241,10 @@
 attribute readonly DOMString ID;
 /*! filter registry name */
 attribute readonly DOMString type;
+/*! filter TAG */
+attribute readonly DOMString tag;
+/*! filter inherited TAG */
+attribute readonly DOMString itag;
 /*! number of input PIDs for the filter*/
 attribute readonly unsigned long nb_ipid;
 /*! number of output PIDs for the filter*/
@@ -293,7 +349,7 @@
 void require_source_id();
 
 
-/*! computes link from an output pid of the filter to a given filter description
+/*! computes link from an output pid of the filter to a given filter description - cf \ref gf_filter_probe_link
 \param idx the index of the output pid to query
 \param description filter descrition, destination can be specified using dst=URL
 \param load_args if set, will load all possible arguments for each filter
@@ -307,6 +363,13 @@
 Array compute_link(unsigned long idx, DOMString description, optional Boolean load_args=false);
 
 
+
+/*! get possible direct destinations for a filter - cf \ref gf_filter_get_possible_destinations
+\param pid_idx the index of the output pid to query, -1 to consider all output pids
+\return comma-separated string of found filters, NULL if not found
+*/
+DOMString get_destinations(unsigned long pid_idx=-1);
+
 /*! Gets source filter for an input pid
 \param idx the index of the input pid to query
 \return input filter or null
@@ -347,7 +410,13 @@
 */
 void insert(DOMString filter_to_add, optional DOMString link_args=null);
 
-/*! binds a JSObject with underlying filter javascript extensions, if any. Currently only dashin filter has such an extension (see \ref JSDASHClient).
+
+/*! reconnects a filter ouput(s)
+\param pid_idx output pid to reconnect, -1 for all output pids
+*/
+void reconnect(long pid_idx=-1);
+
+/*! binds a JSObject with underlying filter javascript extensions, if any. Currently only dashin  (see \ref JSDASHClient) and httpout  (see \ref JSHTTPServer) filters have such an extension.
 This will throw an exception if failure or no JS binding available
 \param obj the JS object to use as interface for the underlying filter script
 */

gpac-2.4.0.tar.gz/share/doc/idl/httpout.idl Added

@@ -0,0 +1,126 @@
+/*
+\file
+\brief silence !
+*/
+
+typedef char *DOMString;
+
+/*!
+
+\defgroup httpout_grp JS HTTP output API
+\ingroup jsapi_grp
+\brief JavaScript API for httpout filter.
+
+This section documents the JavaScript API available for implementing your own logic in GPAC HTTP server.
+
+The logic is enabled using the option `js` option of the httpout filter :
+```
+gpac httpout:js=myserv.js vout
+```
+
+The loaded JavaScript context has all JS modules available in GPAC, except WebGL. 
+
+It is also possible to bind the logic from a JSFilterSession using JSFSFilter.bind
+@{
+
+*/
+
+/*! global context property representing the one and only JSHTTPServer object attached to the loaded script*/
+attribute JSHTTPServer httpout;
+
+/*!\brief JSHTTPServer API
+
+The JSHTTPServer interface has a single instance exposed to the script under the name "httpout".
+It implements callbacks from the HTTP server .
+The object can also be bound to a running filter using JSFSFilter.bind
+*/
+interface JSHTTPServer {
+
+/*! indicate a new request is being processed
+
+The request is pending until the send method is used (can be asynchronous)
+
+\note this function is mandatory
+\param req the request being processed
+*/
+attribute void on_request(JSHTTPRequest req);
+};
+
+
+/*!\brief JSHTTPRequest API
+
+The JSHTTPRequest object provides an interface to the HTTP request being processed.
+*/
+interface JSHTTPRequest {
+
+/*! send the response to the request*/
+attribute void send();
+
+/*! HTTP reply code to use. If 0, the request is handled by GPAC as usual. Otherwise, the request is handled by your script if the reply does not indicate an error*/
+attribute unsigned long reply;
+
+/*! HTTP method of the request */
+attribute readonly DOMString method;
+
+/*! HTTP URL of the request */
+attribute readonly DOMString url;
+
+/*! Authentication reply code - requests are pre-identified using GPAC credentials: a value of 401 indicates no identification, 200 indicates identification OK, 403 indicates failure */
+attribute readonly unsigned long auth_code;
+
+/*! HTTP headers of the request, array of JSHTTPHeader objects*/
+attribute readonly Array headers_in;
+
+/*! HTTP headers to set on the response, array of JSHTTPHeader objects (initialized as empty)*/
+attribute Array headers_out;
+
+/*! reply body. It is undefined by default
+ - if reply is 0, this can be set to a file path to serve. If not set, usual URL resolving of httpout is done
+ - if reply is not 0, this can be set to a string containing the body. To deliver a binary file or a large file, use the read function
+*/
+attribute DOMString body
+
+
+/*! callback function used to throttle the download, can be used even if the request is handled by gpac. It is set to null by default
+\param done amount of bytes already sent in request
+\param total total amount of bytes in request
+\return a delay for next send in milliseconds
+*/
+attribute signed long throttle(unsigned long long done, unsigned long long total);
+
+/*! callback function used to get data (GET requests). It is set to null by default
+\param buffer array buffer to fill (shared array, do NOT keep)
+\return the number of bytes read, negative value means no data available yet, 0 means end of file
+*/
+attribute signed long read(ArrayBuffer buffer);
+
+/*! callback function used to receive data (PUT/POST requests). It is set to null by default
+\param buffer array buffer received. If null, end of stream is reached
+*/
+attribute void write(ArrayBuffer buffer);
+
+/*! callback function used to monitor end of session. It is set to null by default
+\param error GPAC error code for the session
+*/
+attribute void close(unsigned long error);
+
+
+};
+
+/*!\brief JSHTTPHeader Object
+
+The JSHTTPHeader object provides a description of a n HTTP header.
+*/
+interface JSHTTPHeader {
+
+/*! header name */
+attribute readonly DOMString name;
+
+/*! header value */
+attribute readonly DOMString value;
+};
+
+
+
+/*! @} */
+

gpac-2.2.1.tar.gz/share/doc/idl/jsf.idl -> gpac-2.4.0.tar.gz/share/doc/idl/jsf.idl Changed

@@ -581,7 +581,7 @@
 - if the value is an object with properties 'n' and 'd', NTP timestamp is computed using 'n' as seconds and 'd' as fractional part
 
 \param name the ID or name of the builtin property
-\param prop the property to set. If not set, removes the property.
+\param prop the property to set. If null, removes the property.
 \param is_user if set, indicates the queried property is a user-defined property rather than a built-in property
 */
 void set_prop(DOMString name, FilterProperty prop, optional boolean is_user=false);
@@ -593,12 +593,12 @@
 */
 void set_info(DOMString name, FilterProperty prop, optional boolean is_user=false);
 
-/*! negociates property on an output pid - see \ref gf_filter_pid_negociate_property and \ref gf_filter_pid_negociate_property_str
+/*! negotiates property on an output pid - see \ref gf_filter_pid_negotiate_property and \ref gf_filter_pid_negotiate_property_str
 \param name the ID or name of the builtin property
 \param prop the property to set
 \param is_user if set, indicates the queried property is a user-defined property rather than a built-in property
 */
-void negociate_prop(DOMString name, FilterProperty prop, optional boolean is_user=false);
+void negotiate_prop(DOMString name, FilterProperty prop, optional boolean is_user=false);
 /*! removes an output pid - see \ref gf_filter_pid_remove*/
 void remove();
 
@@ -779,9 +779,10 @@
 
 /*! sets a property on packet - see \ref gf_filter_pck_set_property 
 \param name the ID or name of the builtin property
+\param prop the property to set. If null, removes the property.
 \param is_user if set, indicates the queried property is a user-defined property rather than a built-in property
 */
-void set_prop(DOMString name, optional boolean is_user=false);
+void set_prop(DOMString name, FilterProperty prop, optional boolean is_user=false);
 
 /*! appends data to packet - see \ref gf_filter_pck_expand. New data can be accessed by through the data field.
 \warning any previous access to the packet data will be in detached state (no more data in the array buffer) after the call.

gpac-2.2.1.tar.gz/share/doc/idl/nodejs.idl -> gpac-2.4.0.tar.gz/share/doc/idl/nodejs.idl Changed

@@ -71,6 +71,11 @@
 */
 void set_rmt_fun(function callback);
 
+/*! send log message to profiler (Remotery) - see \ref gf_sys_profiler_log
+\param text text to send
+*/
+void rmt_log(DOMString text);
+
 /*! send message to profiler (Remotery) - see \ref gf_sys_profiler_send
 \param text text to send
 */
@@ -153,7 +158,7 @@
 
 const run_task = () => {
 	return new Promise((resolve, reject) => {
-	  resolve( fs.run_step() );
+	  resolve( fs.run() );
 	});
 }
 FilterSessionPromise(run_task).then( ).finally( ()=> { console.log('session is done'); } ) );
@@ -171,7 +176,7 @@
 The consequences are:
 - any custom JS filter will run on the main thread (EventLoop or worker thread)
 - any packet dispatched by a custom filter and requiring a JS callback upon packet destruction (shared data dispatch) will force filters consuming these packets to run on the main thread as well.
-- any filter assigned with a JS binding (only `dashin` for now) will be scheduled on the main thread
+- any filter assigned with a JS binding will be scheduled on the main thread
 
 For better multithreaded usage, it is therefore not recommended to use packets with shared JS data.
 
@@ -295,11 +300,13 @@
 
 \note Custom filters are always created with the flag GF_FS_REG_MAIN_THREAD set, so that they always run in the main thread
 
+\note If the custom filter is a source, it must be initially scheduled using reschedule
+
 \param name name for the filter
 \param flags filter flags
 \return new custom filter
 */
-CustomFilter new_filter(DOMString name="Custom", unsigend long flags=0);
+CustomFilter new_filter(DOMString name="Custom", unsigned long flags=0);
 
 };
 
@@ -362,6 +369,25 @@
 */
 void insert(_Filter f, long pid_idx=-1, DOMString link_args=null);
 
+
+/*! reconnect the filter output - see \ref gf_filter_set_source and \ref gf_filter_reconnect_output
+\param pid_idx index of output pid to reconnect, -1 for all pids
+*/
+void reconnect(long pid_idx=-1);
+
+/*! Resolves link from given output pid of filter to a filter description. The described filter is not loaded in the graph - see \ref gf_filter_probe_link
+\param pid_idx 0-based index of the output pid
+\param name filter description to link to; this can be any filter description
+\return comma-spearated string list of the filter names in the resolved chain from current filter to destination
+*/
+DOMString probe_link(long pid_idx, DOMString name);
+
+/*! Gets all possible destination filter for this filter or one of its output PID - see \ref gf_filter_get_possible_destinations
+\param pid_idx 0-based index of the output pid, use -1 to check all output pids
+\return None if no possible connections to known filter, or a comma-separated string list containing all possible direct connections
+*/
+DOMString get_destinations(long pid_idx=-1);
+
 /*! get an input pid property by name
 \param idx index of input pid
 \param prop_name name of property
@@ -434,9 +460,10 @@
 /*! enforces sourceID to be present for output pids of this filter - see \ref gf_filter_require_source_id*/
 void require_source_id();
 
-/*!  Binds the given object to the underlying filter for callbacks override - only supported by DASH demuxer for the current time
+/*!  Binds the given object to the underlying filter for callbacks override - only supported by DASH demuxer and httpout  for the current time
 
-For DASH, the object must derive implement the methods of the \ref _DASHCustomAlgorithm interface
+For DASH, the object must implement the methods of the \ref _DASHCustomAlgorithm interface
+For DASH, the object must implement the methods of the \ref _HTTPRequestHandler interface
 
 \param interf interface object to bind
 */
@@ -538,7 +565,7 @@
 - configure_pid: callback for PID configuration, mandatory if your filter is not a source
 - process: callback for processing
 - process_event: callback for processing and event
-- reconfigure_output: callback for output reconfiguration (PID capability negociation)
+- reconfigure_output: callback for output reconfiguration (PID capability negotiation)
 
 A custom filter must also declare its capabilities, input and output, using push_cap method 
 \code
@@ -838,7 +865,7 @@
 \param prop property value to set, or null to remove property
 \param custom_type type of property if user-defined property. If not set and user-defined, property is a string
 */
-void set_prop(DOMString pcode, PropertyValue prop, unsigend long custom_type);
+void set_prop(DOMString pcode, PropertyValue prop, unsigned long custom_type);
 
 /*! set a info property the current pid - see \ref gf_filter_pid_set_info and \ref gf_filter_pid_set_info_str
 \param pcode property type
@@ -914,12 +941,12 @@
 */
 PropertyValue query_cap(DOMString pcode);
 
-/*! negociates a capability property on input PID - see \ref gf_filter_pid_negociate_property and \ref gf_filter_pid_negociate_property_dyn
+/*! negotiates a capability property on input PID - see \ref gf_filter_pid_negotiate_property and \ref gf_filter_pid_negotiate_property_dyn
 \param pcode property to negotiate
 \param prop property to negotiate
 \param custom_type type of property if user-defined property. If not set and user-defined, property is a string
 */
-void negociate_cap(DOMString pcode, PropertyValue prop, unsigned long custom_type=0);
+void negotiate_cap(DOMString pcode, PropertyValue prop, unsigned long custom_type=0);
 
 /*! resolves a template string - see \ref gf_filter_pid_resolve_file_template
 \param template the template string
@@ -1143,7 +1170,7 @@
 \brief DASH and HLS user-defined rate adaptation algorithms
 
 
-The DASH demuxer can be provided with a custom JS algorithm, provided as an object implementing the the DASHAlgorithm interface.
+The DASH demuxer can be provided with a custom JS algorithm, provided as an object implementing the DASHAlgorithm interface.
 
 When running the session in multithreaded mode, the dash demuxer will always be scheduled on the main thread if a custom algorithm is bound.
 
@@ -1314,7 +1341,7 @@
 /*! degradation hint, 0 means no degradation, 100 means tile completely hidden*/
 attribute readonly unsigned long self.quality_degradation_hint;
 
-/*! cumulated download rate of all active groups - 0 means all files are local*/
+/*! cumulated download rate of all active groups in bytes per seconds - 0 means all files are local*/
 attribute readonly unsigned long self.total_rate;
 
 };
@@ -1517,6 +1544,106 @@
 
 };
 
+/*! @} */
+
+
+
+/*!
+
+\defgroup nodehttp_grp HTTPRequestHandler interface
+\ingroup nodejs_grp
+\brief HTTP server user-defined request handler
+
+
+The httpout server can use a custom request handler, provided as an object implementing the HTTPRequestHandler interface.
+
+When running the session in multithreaded mode, the httpout filter  will always be scheduled on the main thread if a custom request handler is bound.
+
+@{
+
+*/
+
+/*! interface for HTTP custom request handler
+*/
+interface _HTTPRequestHandler
+{
+
+/*! Callback called upon a period reset.
+\param request the request to process
+*/
+void on_request(_HTTPRequest request);
+
+};
+
+
+/*! interface for HTTP request */
+interface _HTTPRequest
+{
+
+/*! send the response to the request*/
+attribute void send();
+
+/*! HTTP reply code to use. If 0, the request is handled by GPAC as usual. Otherwise, the request is handled by your script if the reply does not indicate an error*/
+attribute unsigned long reply;
+
+/*! HTTP method of the request */
+attribute readonly DOMString method;
+
+/*! HTTP URL of the request */
+attribute readonly DOMString url;
+
+/*! Authentication reply code - requests are pre-identified using GPAC credentials: a value of 401 indicates no identification, 200 indicates identification OK, 403 indicates failure */
+attribute readonly unsigned long auth_code;
+
+/*! HTTP headers of the request, array of _HTTPHeader objects*/
+attribute readonly Array headers_in;
+
+/*! HTTP headers to set on the response, array of _HTTPHeader objects (initialized as empty)*/
+attribute Array headers_out;
+
+/*! reply body. It is undefined by default
+ - if reply is 0, this can be set to a file path to serve. If not set, usual URL resolving of httpout is done
+ - if reply is not 0, this can be set to a string containing the body. To deliver a binary file or a large file, use the read function
+*/
+attribute DOMString body
+
+
+/*! callback function used to throttle the download, can be used even if the request is handled by gpac. It is undefined by default
+\param done amount of bytes already sent in request
+\param total total amount of bytes in request
+\return a delay for next send in milliseconds
+*/
+attribute unsigned long throttle(unsigned long long done, unsigned long long total);
+
+/*! callback function used to get data (GET requests). It is undefined by default
+\param buffer array buffer to fill (shared array, do NOT keep)
+\return the number of bytes read, negative value means no data available yet, 0 means end of file
+*/
+attribute signed long read(ArrayBuffer buffer);
+
+/*! callback function used to receive data (PUT/POST requests). It is undefined by default
+\param buffer array buffer received. If null, end of stream is reached
+\return the number of bytes written (informative only)
+*/
+attribute unsigned long write(ArrayBuffer buffer);
+
+/*! callback function used to monitor end of session. It is undefined by default
+\param error GPAC error code for the session
+*/
+attribute void close(unsigned long error);
+
+};
+
+/*! interface for HTTP header */
+interface _HTTPHeader
+{
+
+/*! header name */
+attribute readonly DOMString name;
+
+/*! header value */
+attribute readonly DOMString value;
+};
 
 /*! @} */

gpac-2.2.1.tar.gz/share/doc/man/gpac-filters.1 -> gpac-2.4.0.tar.gz/share/doc/man/gpac-filters.1 Changed

@@ -36,7 +36,7 @@
 .br
 
 .br
-.SH Custom property duming
+.SH Custom property dumping
 .LP
 .br
 The packet inspector can be configured to dump specific properties of packets using .I fmt.
@@ -168,14 +168,26 @@
 .br
 
 .br
-This will play the session at 2x speed, using 30s of maximum buffering, consumming packets after 10s of media are ready and rebuffering if less than 1s of media.
+This will play the session at 2x speed, using 30s of maximum buffering, consuming packets after 10s of media are ready and rebuffering if less than 1s of media.
 .br
 
 .br
 .SH Options (expert):
 .LP
 .br
-log (str, default: stdout, minmax: fileName, stderr, stdout, GLOG or null): set probe log filename to print number of streams, GLOG uses GPAC logs app@info(default for android)
+log (str, default: stdout, Enum: _any|stderr|stdout|GLOG|null): set probe log filename
+.br
+* _any: target file path and name
+.br
+* stderr: dump to stderr
+.br
+* stdout: dump to stdout
+.br
+* GLOG: use GPAC logs app@info
+.br
+* null: silent mode
+.br
+
 .br
 mode (enum, default: pck):     dump mode
 .br
@@ -215,7 +227,7 @@
 .br
 dur (frac, default: 0/0):      set inspect duration
 .br
-analyze (enum, default: off, updatable): analyze sample content (NALU, OBU)
+analyze (enum, default: off, updatable): analyze sample content (NALU, OBU), similar to -bsdbg option of reframer filters
 .br
 * off: no analyzing
 .br
@@ -283,7 +295,19 @@
 .SH Options (expert):
 .LP
 .br
-log (str, default: stdout, minmax: fileName, stderr, stdout GLOG or null): set probe log filename to print number of streams, GLOG uses GPAC logs app@info(default for android)
+log (str, default: stdout, Enum: _any|stderr|stdout|GLOG|null): set probe log filename to print number of streams
+.br
+* _any: target file path and name
+.br
+* stderr: dump to stderr
+.br
+* stdout: dump to stdout
+.br
+* GLOG: use GPAC logs app@info
+.br
+* null: silent mode
+.br
+
 .br
 
 .br
@@ -498,7 +522,9 @@
 .br
 alayout (uint, default: 0):    force output channel layout (0 for auto)
 .br
-afmt (afmt, default: s16, minmax: none,u8,s16,s16b,s24,s32,flt,dbl,u8p,s16p,s24p,s32p,fltp,dblp): force output channel format (0 for auto)
+afmt (afmt, default: s16, Enum: none|u8|s16|s16b|s24|s24b|s32|s32b|flt|fltb|dbl|dblb|u8p|s16p|s24p|s32p|fltp|dblp): force output channel format (0 for auto)
+.br
+
 .br
 asize (uint, default: 1024):   audio output packet size in samples
 .br
@@ -724,7 +750,9 @@
 .br
 noaudio (bool, default: false): disable audio output
 .br
-opfmt (pfmt, default: none, minmax: none,yuv420,yvu420,yuv420_10,yuv422,yuv422_10,yuv444,yuv444_10,uyvy,vyuy,yuyv,yvyu,uyvl,vyul,yuyl,yvyl,nv12,nv21,nv1l,nv2l,yuva,yuvd,yuv444a,yuv444p,v308,yuv444ap,v408,v410,v210,grey,algr,gral,rgb4,rgb5,rgb6,rgba,argb,bgra,abgr,rgb,bgr,xrgb,rgbx,xbgr,bgrx,rgbd,rgbds,uncv): pixel format to use for output. Ignored in .I player mode
+opfmt (pfmt, default: none, Enum: none|yuv420|yvu420|yuv420_10|yuv422|yuv422_10|yuv444|yuv444_10|uyvy|vyuy|yuyv|yvyu|uyvl|vyul|yuyl|yvyl|nv12|nv21|nv1l|nv2l|yuva|yuvd|yuv444a|yuv444p|v308|yuv444ap|v408|v410|v210|grey|algr|gral|rgb4|rgb5|rgb6|rgba|argb|bgra|abgr|rgb|bgr|xrgb|rgbx|xbgr|bgrx|rgbd|rgbds|uncv): pixel format to use for output. Ignored in .I player mode
+.br
+
 .br
 drv (enum, default: auto):     indicate if graphics driver should be used
 .br
@@ -822,7 +850,15 @@
 .br
 allt (bool, default: false):   load all tracks even if unknown media type
 .br
-noedit (bool, default: false): do not use edit lists
+edits (enum, default: auto):   do not use edit lists
+.br
+* auto: track delay and no edit list when possible
+.br
+* no: ignore edit list
+.br
+* strict: use edit list even if only signaling a delay
+.br
+
 .br
 itt (bool, default: false):    convert all items of root meta into a single PID
 .br
@@ -844,7 +880,7 @@
 .br
 expart (bool, default: false): expose cover art as a dedicated video PID
 .br
-sigfrag (bool, default: false): signal fragment and segment boundaries of source on output packets
+sigfrag (bool, default: false): signal fragment and segment boundaries of source on output packets, fails if source is not fragmented
 .br
 tkid (str):                    declare only track based on given param
 .br
@@ -876,11 +912,21 @@
 .br
 * rem: removes all inband xPS and notify configuration changes accordingly
 .br
-* auto: resolves to keep for smode=splix (dasher mode), rem otherwise
+* auto: resolves to keep for smode=splitx (dasher mode), rem otherwise
+.br
+
+.br
+nodata (enum, default: no):    control sample data loading
+.br
+* no: regular load
+.br
+* yes: skip data loading
+.br
+* fake: allocate sample but no data copy
 .br
 
 .br
-nodata (bool, default: false): do not load sample data
+lightp (bool, default: false): load minimal set of properties
 .br
 initseg (str):                 local init segment name when input is a single ISOBMFF segment
 .br
@@ -1016,7 +1062,7 @@
 .br
 block_size (uint, default: 100000): block size used to read file
 .br
-cache (enum, default: disk):   set cache mode
+cache (enum, default: none):   set cache mode
 .br
 * auto: cache to disk if content length is known, no cache otherwise
 .br
@@ -1222,32 +1268,6 @@
 .br
 
 .br
-.SH xviddec
-.LP
-.br
-Description: XVid decoder
-.br
-
-.br
-This filter decodes MPEG-4 part 2 (and DivX) through libxvidcore library.
-.br
-
-.br
-.SH Options (expert):
-.LP
-.br
-deblock_y (bool, default: false): enable Y deblocking
-.br
-deblock_uv (bool, default: false): enable UV deblocking
-.br
-film_effect (bool, default: false): enable film effect
-.br
-dering_y (bool, default: false): enable Y deblocking
-.br
-dering_uv (bool, default: false): enable UV deblocking
-.br
-
-.br
 .SH j2kdec
 .LP
 .br
@@ -1425,6 +1445,14 @@
 .br
 
 .br
+When the socket is listening in keep-alive .I ka mode:
+.br
+- a single connection is allowed and a single output PID will be produced
+.br
+- each connection close event will triger a pipeline flush
+.br
+
+.br
 On OSX with VM packet replay you will need to force multicast routing, e.g. route add -net 239.255.1.4/32 -interface vboxnet0
 .br
 
@@ -1617,7 +1645,7 @@
 .br
 Example
 .br
-gpac -i MANIFEST_URL:split_as -o dst=$File$.mp4:clone
+gpac -i MANIFEST_URL:split_as -o dst=$File$.mp4
 .br
 
 .br
@@ -1760,7 +1788,7 @@
 .br
 
 .br
-algo (str, default: gbuf, minmax: none|grate|gbuf|bba0|bolaf|bolab|bolau|bolao|JS): adaptation algorithm to use
+algo (str, default: gbuf, Enum: none|grate|gbuf|bba0|bolaf|bolab|bolau|bolao|JS): adaptation algorithm to use
 .br
 * none: no adaptation logic
 .br
@@ -1910,6 +1938,8 @@
 .br
 asloop (bool, default: false): when auto switch is enabled, iterates back and forth from highest to lowest qualities
 .br
+bsmerge (bool, default: true): allow merging of video bitstreams (only HEVC for now)
+.br
 
 .br
 .SH cdcrypt
@@ -1948,6 +1978,12 @@
 .br
 * skip: decrypt nothing
 .br
+* pad0: decrypt nothing and replace all crypted bits with 0
+.br
+* pad1: decrypt nothing and replace all crypted bits with 1
+.br
+* padsc: decrypt nothing and replace all crypted bytes with start codes
+.br
 
 .br
 drop_keys (uintl):             consider keys with given 1-based indexes as not available (multi-key debug)
@@ -1963,7 +1999,7 @@
 .SH cecrypt
 .LP
 .br
-Description: CENC  encryptor
+Description: CENC encryptor
 .br
 
 .br
@@ -1988,6 +2024,8 @@
 .br
 allc (bool):                   throw error if no DRM config file is found for a PID
 .br
+bk_stats (bool):               print number of encrypted blocks to stdout upon exit
+.br
 
 .br
 .SH mp4mx
@@ -2108,6 +2146,8 @@
 .br
 * `mudta_U4CC`: set movie user-data box entry of type U4CC to property value
 .br
+* `tkgp_T4CC`: set/remove membership to track group with type T4CC and ID given by property value. A negative value N removes from track group with ID -N
+.br
   
 .br
 Example
@@ -2172,6 +2212,28 @@
 .br
 - if Sparse is false, empty packet is never injected
 .br
+  
+.br
+The default media type used for a PID can be overriden using property StreamSubtype. 
+.br
+Example
+.br
+-i src.srt:#StreamSubtype=sbtl -i ...  -o test.mp4 
+.br
+
+.br
+This will force the text stream to use sbtl handler type instead of default text one.
+.br
+Subtitle streams may be used as chapters by setting the property IsChap on the desired PID.
+.br
+Example
+.br
+-i src.srt:#IsChap  -i ... -o test.mp4 
+.br
+
+.br
+This will force the text stream to be used as a QT chapter track.  
+.br
 
 .br
 .SH Options (expert):
@@ -2247,9 +2309,19 @@
 .br
 fsap (bool, default: true):    split truns in video fragments at SAPs to reduce file size
 .br
-subs_sidx (sint, default: -1): number of subsegments per sidx. negative value disables sidx, -2 removes sidx if present in source PID
+subs_sidx (sint, default: -1): number of subsegments per sidx
+.br
+* 0: single sidx
+.br
+* >0: hierarchical or daisy-chained sidx
 .br
-m4cc (str):                    4 character code of empty box to append at the end of a segment
+* <0: disables sidx
+.br
+* -2: removes sidx if present in source PID
+.br
+
+.br
+m4cc (str):                    4 character code of empty box to append at the end of a segment (DASH mode) or of a fragment (non-DASH mode)
 .br
 chain_sidx (bool, default: false): use daisy-chaining of SIDX
 .br
@@ -2345,6 +2417,8 @@
 .br
 * v1qt: use v1 signaling, QTFF style
 .br
+* v2qt: use v2 signaling, QTFF style (lpcm entry type)
+.br
 
 .br
 ssix (bool, default: false):   create ssix box when sidx box is present, level 1 mapping I-frames byte ranges, level 0xFF mapping the rest
@@ -2365,7 +2439,7 @@
 .br
 * no: disable box compression
 .br
-* moov: compress only moov box
+* moov: compress only moov box (uses cmov for QT)
 .br
 * moof: compress only moof boxes
 .br
@@ -2427,7 +2501,37 @@
 .br
 force_dv (bool, default: false): force DV sample entry types even when AVC/HEVC compatibility is signaled
 .br
-tsalign (bool, default: true): enable timeline realignment to 0 for first sample in fragmented mode
+dvsingle (bool, default: false): ignore DolbyVision profile 8 in xps inband mode if profile 5 is already set
+.br
+tsalign (bool, default: true): enable timeline realignment to 0 for first sample - if false, this will keep original timing with empty edit (possibly long) at begin)
+.br
+chapm (enum, default: both):   chapter storage mode
+.br
+* off: disable chapters
+.br
+* tk: use chapter track (QT-style)
+.br
+* udta: use user-data box chapters
+.br
+* both: use both chapter tracks and udta
+.br
+
+.br
+patch_dts (bool, default: false): patch previous samples duration when dts do not increase monotonically
+.br
+uncv (enum, default: prof):    use uncv (ISO 23001-17) for raw video
+.br
+* off: disabled (always the case when muxing to QT)
+.br
+* gen: enabled, do not write profile
+.br
+* prof: enabled and write profile if known
+.br
+* tiny: enabled and write reduced version if profile known and compatible
+.br
+
+.br
+trunv1 (bool, default: false): force using version 1 of trun regardless of media type or CMAF brand
 .br
 
 .br
@@ -2844,7 +2948,9 @@
 .br
 stxtdur (frac, default: 1):    duration for simple text
 .br
-stxtmod (enum, default: none): simple text stream mode- none: declares output PID as simple text stream
+stxtmod (enum, default: none): simple text stream mode
+.br
+* none: declares output PID as simple text stream
 .br
 * tx3g: declares output PID as TX3G/Apple stream
 .br
@@ -3170,7 +3276,15 @@
 .br
 
 .br
-ow (bool, default: true):      overwrite output if existing
+ow (enum, default: yes):       overwrite output mode when concatenation is not used
+.br
+* yes: override file if existing
+.br
+* no: throw error if file existing
+.br
+* ask: interactive prompt
+.br
+
 .br
 mvbk (uint, default: 8192):    block size used when moving parts of the file around in patch mode
 .br
@@ -3178,6 +3292,8 @@
 .br
 max_cache_segs (sint, default: 0): maximum number of segments cached per HAS quality when recording live sessions (0 means no limit)
 .br
+force_null (bool, default: false): force no output regardless of file name
+.br
 
 .br
 .SH uflatm
@@ -3328,7 +3444,7 @@
 .br
 * 'D'INT, 'D'FLOAT, 'D'NUM/DEN: specify end time as offset to start time in seconds (number or fraction) - only valid for .I xe
 .br
-* 'F'NUM: specify time as frame number
+* 'F'NUM: specify time as frame number, 1 being first
 .br
 * XML DateTime: specify absolute UTC time
 .br
@@ -3489,7 +3605,7 @@
 .br
 exporter (bool, default: false): compatibility with old exporter, displays export results
 .br
-rt (enum, default: off):       real-time regulation mode of input
+rt (enum, default: off, updatable): real-time regulation mode of input
 .br
 * off: disables real-time regulation
 .br
@@ -3499,13 +3615,13 @@
 .br
 
 .br
-saps (uintl, minmax: 0|1|2|3|4): list of SAP types (0,1,2,3,4) to forward, other packets are dropped (forwarding only sap 0 will break the decoding)
+saps (uintl, Enum: 0|1|2|3|4, updatable): list of SAP types (0,1,2,3,4) to forward, other packets are dropped (forwarding only sap 0 will break the decoding)
 .br
 
 .br
-refs (bool, default: false):   forward only frames used as reference frames, if indicated in the input stream
+refs (bool, default: false, updatable): forward only frames used as reference frames, if indicated in the input stream
 .br
-speed (dbl, default: 0.0):     speed for real-time regulation mode, a value of 0 uses speed from play commands
+speed (dbl, default: 0.0, updatable): speed for real-time regulation mode, a value of 0 uses speed from play commands
 .br
 raw (enum, default: no):       force input AV streams to be in raw format
 .br
@@ -3519,7 +3635,7 @@
 .br
 
 .br
-frames (sintl):                drop all except listed frames (first being 1). A negative value -V keeps only first frame every V frames
+frames (sintl, updatable):     drop all except listed frames (first being 1). A negative value -V keeps only first frame every V frames
 .br
 xs (strl):                     extraction start time(s)
 .br
@@ -3567,6 +3683,20 @@
 .br
 utc_probe (uint, default: 5000): timeout in milliseconds to try to acquire UTC reference from media
 .br
+copy (bool, default: false, updatable): try copying frame interface into packets
+.br
+cues (enum, default: no, updatable): cue filtering mode
+.br
+* no: do no filter frames based on cue info
+.br
+* segs: only forward frames marked as segment start
+.br
+* frags: only forward frames marked as fragment start
+.br
+
+.br
+rmseek (bool, default: false, updatable): remove seek flag of all sent packets
+.br
 
 .br
 .SH writegen
@@ -3587,9 +3717,13 @@
 .br
 exporter (bool, default: false): compatibility with old exporter, displays export results
 .br
-pfmt (pfmt, default: none, minmax: none,yuv420,yvu420,yuv420_10,yuv422,yuv422_10,yuv444,yuv444_10,uyvy,vyuy,yuyv,yvyu,uyvl,vyul,yuyl,yvyl,nv12,nv21,nv1l,nv2l,yuva,yuvd,yuv444a,yuv444p,v308,yuv444ap,v408,v410,v210,grey,algr,gral,rgb4,rgb5,rgb6,rgba,argb,bgra,abgr,rgb,bgr,xrgb,rgbx,xbgr,bgrx,rgbd,rgbds,uncv): pixel format for raw extract. If not set, derived from extension
+pfmt (pfmt, default: none, Enum: none|yuv420|yvu420|yuv420_10|yuv422|yuv422_10|yuv444|yuv444_10|uyvy|vyuy|yuyv|yvyu|uyvl|vyul|yuyl|yvyl|nv12|nv21|nv1l|nv2l|yuva|yuvd|yuv444a|yuv444p|v308|yuv444ap|v408|v410|v210|grey|algr|gral|rgb4|rgb5|rgb6|rgba|argb|bgra|abgr|rgb|bgr|xrgb|rgbx|xbgr|bgrx|rgbd|rgbds|uncv): pixel format for raw extract. If not set, derived from extension
+.br
+
+.br
+afmt (afmt, default: none, Enum: none|u8|s16|s16b|s24|s24b|s32|s32b|flt|fltb|dbl|dblb|u8p|s16p|s24p|s32p|fltp|dblp): audio format for raw extract. If not set, derived from extension
 .br
-afmt (afmt, default: none, minmax: none,u8,s16,s16b,s24,s32,flt,dbl,u8p,s16p,s24p,s32p,fltp,dblp): audio format for raw extract. If not set, derived from extension
+
 .br
 decinfo (enum, default: auto): decoder config insert mode
 .br
@@ -3615,6 +3749,16 @@
 .br
 merge_region (bool, default: false): merge TTML regions with same ID while reassembling TTML doc
 .br
+vtth (enum, default: seg):     vtt header injection mode
+.br
+* single: inject only at first frame of the stream
+.br
+* seg: inject at each non-empty segment
+.br
+* all: inject at each segment even empty ones
+.br
+
+.br
 
 .br
 .SH ufnalu
@@ -3919,7 +4063,9 @@
 .br
 osfmt (afmt, default: none):   desired sample format of output audio (none for auto)
 .br
-olayout (str, minmax: mono,stereo,3/0.0,3/1.0,3/2.0,3/2.1,5/2.1,1+1,2/1.0,2/2.0,3/3.1,3/4.1,11/11.2,5/2.1,5/5.2,5/4.1,6/5.1,6/7.1,5/6.1,7/6.1): desired CICP layout of output audio (null for auto)
+olayout (alay, Enum: mono|stereo|3/0.0|3/1.0|3/2.0|3/2.1|5/2.1|1+1|2/1.0|2/2.0|3/3.1|3/4.1|11/11.2|5/2.1|5/5.2|5/4.1|6/5.1|6/7.1|5/6.1|7/6.1): desired CICP layout of output audio (null for auto)
+.br
+
 .br
 
 .br
@@ -4129,7 +4275,9 @@
 .br
 size (v2di, default: 0x0):     source video resolution
 .br
-spfmt (pfmt, default: none, minmax: none,yuv420,yvu420,yuv420_10,yuv422,yuv422_10,yuv444,yuv444_10,uyvy,vyuy,yuyv,yvyu,uyvl,vyul,yuyl,yvyl,nv12,nv21,nv1l,nv2l,yuva,yuvd,yuv444a,yuv444p,v308,yuv444ap,v408,v410,v210,grey,algr,gral,rgb4,rgb5,rgb6,rgba,argb,bgra,abgr,rgb,bgr,xrgb,rgbx,xbgr,bgrx,rgbd,rgbds,uncv): source pixel format. When not set, derived from file extension
+spfmt (pfmt, default: none, Enum: none|yuv420|yvu420|yuv420_10|yuv422|yuv422_10|yuv444|yuv444_10|uyvy|vyuy|yuyv|yvyu|uyvl|vyul|yuyl|yvyl|nv12|nv21|nv1l|nv2l|yuva|yuvd|yuv444a|yuv444p|v308|yuv444ap|v408|v410|v210|grey|algr|gral|rgb4|rgb5|rgb6|rgba|argb|bgra|abgr|rgb|bgr|xrgb|rgbx|xbgr|bgrx|rgbd|rgbds|uncv): source pixel format. When not set, derived from file extension
+.br
+
 .br
 fps (frac, default: 25/1):     number of frames per second
 .br
@@ -4153,7 +4301,9 @@
 .br
 sr (uint, default: 44100):     sample rate
 .br
-safmt (afmt, default: none, minmax: none,u8,s16,s16b,s24,s32,flt,dbl,u8p,s16p,s24p,s32p,fltp,dblp): audio format
+safmt (afmt, default: none, Enum: none|u8|s16|s16b|s24|s24b|s32|s32b|flt|fltb|dbl|dblb|u8p|s16p|s24p|s32p|fltp|dblp): audio format
+.br
+
 .br
 ch (uint, default: 2):         number of channels
 .br
@@ -4574,6 +4724,8 @@
 .br
 fdel (bool, default: false):   delete source files after processing in playlist mode (does not delete the playlist)
 .br
+keepts (bool, default: false): keep initial timestamps unmodified (no reset to 0)
+.br
 raw (enum, default: no):       force input AV streams to be in raw format
 .br
 * no: do not force decoding of inputs
@@ -4586,6 +4738,8 @@
 .br
 
 .br
+flush (bool, default: false):  send a flush signal once playlist is done before entering keepalive
+.br
 
 .br
 .SH m2tsmx
@@ -4730,6 +4884,13 @@
 .br
 
 .br
+.SH Notes
+.LP
+.br
+In LATM mux mode, the decoder configuration is inserted at the given .I repeat_rate or CarouselRate PID property if defined.
+.br
+
+.br
 .SH Options (expert):
 .LP
 .br
@@ -4813,6 +4974,8 @@
 .br
 subs_sidx (sint, default: -1): number of subsegments per sidx (negative value disables sidx)
 .br
+keepts (bool, default: false): keep cts/dts untouched and adjust PCR accordingly, used to keep TS unmodified when dashing
+.br
 
 .br
 .SH dasher
@@ -4892,12 +5055,16 @@
 .br
 * $XInit=NAME$: complete replace by NAME for init segment, ignored otherwise
 .br
+* $InitExt=EXT$: replaced by EXT for init segment file extensions, ignored otherwise
+.br
 * $Index=NAME$: replaced by NAME for index segments, ignored otherwise
 .br
 * $Path=PATH$: replaced by PATH when creating segments, ignored otherwise
 .br
 * $Segment=NAME$: replaced by NAME for media segments, ignored for init segments
 .br
+* $SegExt=EXT$: replaced by EXT for media segment file extensions, ignored for init segments
+.br
 * $FS$ (FileSuffix): replaced by _trackN in case the input is an AV multiplex, or kept empty otherwise
 .br
 Note: these strings are replaced in the manifest templates elements.
@@ -4940,6 +5107,8 @@
 .br
 * `SRDRef`: indicates global width and height of SRD, ignored if CropOrigin is set
 .br
+* `HLSPL`: name of variant playlist, can use templates
+.br
 * `HLSMExt`: list of extensions to add to master playlist entries, 'foo','bar=val' added as ,foo,bar=val
 .br
 * `HLSVExt`: list of extensions to add to variant playlist, '#foo','#bar=val' added as #foo \n #bar=val
@@ -5046,12 +5215,24 @@
 .br
 
 .br
-For HLS, the output PID will deliver the master playlist and the variant playlists.
+For HLS, the output manifest PID will deliver the master playlist and the variant playlists.
 .br
 The default variant playlist are $NAME_$N.m3u8, where $NAME is the radical of the output file name and $N is the 1-based index of the variant.
 .br
 
 .br
+When HLS mode is enabled, the segment .I template is relative to the variant playlist file, which can also be templated.
+.br
+Example
+.br
+gpac -i av.mp4:#HLSPL=$Type$/index.m3u8 -o dash/live.m3u8:dual:template='$Number$'
+.br
+
+.br
+This will put video segments and playlist in dash/video/ and audio segments and playlist in dash/audio/
+.br
+
+.br
 .SS Segmentation
 .br
 The default behavior of the segmenter is to estimate the theoretical start time of each segment based on target segment duration, and start a new segment when a packet with SAP type 1,2,3 or 4 with time greater than the theoretical time is found.
@@ -5072,11 +5253,11 @@
 .br
 
 .br
-The segmenter will by default announce a new segment in the manifest(s) as soon as its size/offset is known or its name is known, but the segment (or part in LL-HLS) may still not be completely written/sent.
+When .I seg_sync is disabled, the segmenter will by default announce a new segment in the manifest(s) as soon as its size/offset is known or its name is known, but the segment (or part in LL-HLS) may still not be completely written/sent.
 .br
 This may result in temporary mismatches between segment/part size currently received versus size as advertized in manifest.
 .br
-If the target destination cannot support this, use .I seg_sync to update manifest(s) only once segments/parts are completely flushed; this will however slightly increase the latency of manifest updates.
+When .I seg_sync is enabled, the segmenter will wait for the last byte of the fragment/segment to be pushed before announcing a new segment in the manifest(s). This can however slightly increase the latency in MPEG-DASH low-latency.
 .br
 
 .br
@@ -5104,7 +5285,7 @@
 .br
 
 .br
-Note: .I llhls will force CMAF to cmfc if .I cmaf is not set.
+Note: .I llhls does not force cmaf mode to allow for multiplexed media in segments but it enforces to tfdt_traf in the muxer.
 .br
 
 .br
@@ -5334,6 +5515,56 @@
 .br
 
 .br
+.SS Forced-Template mode
+.br
+When .I tpl_force is set, the .I template string is not analyzed nor modified for missing elements.
+.br
+This is typically used to redirect segments to a given destination regardless of the dash profile.
+.br
+Example
+.br
+gpac -i SRC -o null:ext=mpd:tpl_force --template=pipe://mypipe
+.br
+
+.br
+This will trash the manifest and open mypipe as destination for the muxer result.
+.br
+Warning: Options for segment destination cannot be set through the .I template, global options must be used.
+.br
+
+.br
+.SS Output redirecting
+.br
+When loaded implicitly during link resolution, the dasher will only link its outputs to the target sink
+.br
+Example
+.br
+gpac -i SRC -o URL1:OPTS1 -o URL2:OPTS1
+.br
+
+.br
+This will create one dasher (with options OPTS1) for the URL1 and one dasher (with options OPTS1) for URL2.
+.br
+This allows dashing to multiple outputs with different formats, dash durations, etc.
+.br
+
+.br
+It can be useful to redirect all the filter outputs to several sinks, for example to push through ROUTE and through HTTP the same segments.
+.br
+In order to do this, the filter MUST be explicitly loaded and all options related to dash and MP4 must be set either globally or on the dasher filter.
+.br
+Example
+.br
+gpac -i SRC dasher:cmfc:segdur=2 -o URL1 -o URL2
+.br
+
+.br
+This will create a single dasher whose outputs (manifests and segments) will be redirected to the given URLs.
+.br
+When explicitly loading the filter, the .I dual option will be disabled unless .I mname is set to the alternate output name.
+.br
+
+.br
 .SS Multiplexer development considerations
 .br
 Output multiplexers allowing segmented output must obey the following:
@@ -5395,6 +5626,8 @@
 .br
 * dynlast: last call for live, will turn the MPD into static
 .br
+* dynauto: live generation and move to static manifest upon end of stream
+.br
 
 .br
 sseg (bool, default: false):   single segment is used
@@ -5489,7 +5722,7 @@
 .br
 
 .br
-profX (str):                   list of profile extensions, as used by DASH-IF and DVB. The string will be colon-concatenated with the profile used
+profX (str):                   list of profile extensions, as used by DASH-IF and DVB. The string will be colon-concatenated with the profile used. If starting with +, the profile string by default is erased and + is skipped
 .br
 cp (enum, default: set):       content protection element location
 .br
@@ -5545,6 +5778,8 @@
 .br
 tsb (dbl, default: 30):        time-shift buffer depth in seconds (a negative value means infinity)
 .br
+keep_segs (bool, default: false): do not delete segments no longer in time-shift buffer
+.br
 subdur (dbl, default: 0):      maximum duration of the input file to be segmented. This does not change the segment duration, segmentation stops once segments produced exceeded the duration
 .br
 ast (str):                     set start date (as xs:date, e.g. YYYY-MM-DDTHH:MM:SSZ) for live mode. Default is now. !! Do not use with multiple periods, nor when DASH duration is not a multiple of GOP size !!
@@ -5621,7 +5856,7 @@
 .br
 
 .br
-mname (str):                   output manifest name for ATSC3 multiplexing
+mname (str):                   output manifest name for ATSC3 multiplexing (using 'm3u8' only toggles HLS generation)
 .br
 llhls (enum, default: off):    HLS low latency type
 .br
@@ -5659,7 +5894,17 @@
 .br
 
 .br
-seg_sync (bool, default: false): force waiting for last packet of fragment/segment to be written before announcing segment in DASH/HLS playlist
+hls_ap (bool, default: false): use audio as primary media instead of video when generating playlists
+.br
+seg_sync (enum, default: auto): control how waiting on last packet P of fragment/segment to be written impacts segment injection in manifest
+.br
+* no: do not wait for P
+.br
+* yes: wait for P
+.br
+* auto: wait for P if HLS is used
+.br
+
 .br
 cmaf (enum, default: no):      use cmaf guidelines
 .br
@@ -5671,6 +5916,16 @@
 .br
 
 .br
+pswitch (enum, default: single): period switch control mode
+.br
+* single: change period if PID configuration changes
+.br
+* force: force period switch at each PID reconfiguration instead of absorbing PID reconfiguration (for splicing or add insertion not using periodID)
+.br
+* stsd: change period if PID configuration changes unless new configuration was advertised in initial config
+.br
+
+.br
 chain (str):                   URL of next MPD for regular chaining
 .br
 chain_fbk (str):               URL of fallback MPD
@@ -5693,6 +5948,8 @@
 .br
 
 .br
+tpl_force (bool, default: false): use template string as is without trying to add extension or solve conflicts in names
+.br
 
 .br
 .SH tileagg
@@ -5814,7 +6071,7 @@
 .br
 - any potential pipe close on the writing side will be ignored
 .br
-- end of stream will be triggered upon pipe close if .I sigeos is set
+- pipeline flushing will be triggered upon pipe close if .I sigflush is set
 .br
 - final end of stream will be triggered upon session close.
 .br
@@ -5826,7 +6083,13 @@
 .br
 * Sender side: cat raw1.264 > mypipe && gpac -i raw2.264 -o pipe://mypipe:ext=.264  
 .br
-The pipe input can be created in blocking mode or non-blocking mode.
+The pipeline flush is signaled as EOS while keeping the stream active.
+.br
+This is typically needed for mux filters waiting for EOS to flush their data.
+.br
+  
+.br
+If .I marker is set, the following strings (all 8-bytes with 
 .br
 
 .br
@@ -5847,7 +6110,13 @@
 .br
 mkp (bool, default: false):    create pipe if not found
 .br
-sigeos (bool, default: false): signal end of stream whenever a pipe breaks in keep-alive mode
+sigflush (bool, default: false): signal end of stream upon pipe close - cf filter help
+.br
+marker (bool, default: false): inspect payload for flush and reconfigure signals - cf filter help
+.br
+bpcnt (uint, default: 0):      number of broken pipe allowed before exiting, 0 means forever
+.br
+timeout (uint, default: 0):    timeout in ms before considering input is in end of stream (0: no timeout)
 .br
 
 .br
@@ -5890,6 +6159,10 @@
 .br
 It is therefore recommended to use this mode with real-time inputs (use a reframer if needed).
 .br
+If .I marker is set, the string GPACPIF (8 bytes including 0-terminator) will be written to the pipe at each detected pipeline flush.
+.br
+Pipeline flushing is currently triggered by DASH segment end or ISOBMF fragment end.
+.br
 
 .br
 .SH Options (expert):
@@ -5909,10 +6182,12 @@
 .br
 mkp (bool, default: false):    create pipe if not found
 .br
-block_size (uint, default: 5000): buffer size used to write to pipe, windows only
+block_size (uint, default: 5000): buffer size used to write to pipe, Windows only
 .br
 ka (bool, default: false):     keep pipe alive when broken pipe is detected
 .br
+marker (bool, default: false): inject marker upon pipeline flush events
+.br
 
 .br
 .SH gsfmx
@@ -5983,7 +6258,7 @@
 .br
 Example
 .br
-gpac -i mux.gsf gsfdmx -o dump/$File$:dynext:clone
+gpac -i mux.gsf gsfdmx -o dump/$File$:dynext
 .br
 
 .br
@@ -6253,6 +6528,12 @@
 .br
 
 .br
+The absolute path to cuda lib can be set using the cuda_lib option in core or temp section of the config file, e.g. -cfg=temp:cuda_lib=PATH_TO_CUDA
+.br
+The absolute path to cuvid lib can be set using the cuvid_lib option in core or temp section of the config file, e.g. -cfg=temp:cuvid_lib=PATH_TO_CUDA
+.br
+
+.br
 .SH Options (expert):
 .LP
 .br
@@ -6857,6 +7138,14 @@
 .br
   
 .br
+Custom headers can be specified using .I hdrs, they apply to all requests. For more advanced control on requests, use a javascript binding (see .I js and howtos).
+.br
+  
+.br
+Text files are compressed using gzip or deflate if the client accepts these encodings, unless .I no_z is set.
+.br
+  
+.br
 .SH Simple HTTP server
 .LP
 .br
@@ -7054,7 +7343,7 @@
 .br
 Example
 .br
-gpac -i dash.mpd dashin:forward=file:SID=D1 dashin:forward=segb:SID=D2 -o http://localhost:80/live.mpd:SID=D1:rdirs=dash -o http://localhost:80/live_rw.mpd:SID=D2:sigfrag
+gpac -i dash.mpd dashin:forward=file:FID=D1 dashin:forward=segb:FID=D2 -o http://localhost:80/live.mpd:SID=D1:rdirs=dash -o http://localhost:80/live_rw.mpd:SID=D2:sigfrag
 .br
 
 .br
@@ -7107,7 +7396,7 @@
 .br
 
 .br
-timeout (uint, default: 5):    timeout in seconds for persistent connections (0 disable timeout)
+timeout (uint, default: 30):   timeout in seconds for persistent connections (0 disable timeout)
 .br
 ext (cstr):                    set extension for graph resolution, regardless of file extension
 .br
@@ -7131,7 +7420,7 @@
 .br
 
 .br
-reqlog (str):                  provide short log of the requests indicated in this option (comma separated list, * for all) regardless of HTTP log settings. Value REC logs file writing start/end
+reqlog (str):                  provide short log of the requests indicated in this option (comma separated list, * for all) regardless of HTTP log settings. Value REC logs file writing start/end. If prefix - is set, do not log request end
 .br
 ice (bool, default: false):    insert ICE meta-data in response headers in sink mode
 .br
@@ -7145,6 +7434,14 @@
 .br
 blockio (bool, default: false): use blocking IO in push or source mode or in server mode with no read dir
 .br
+ka (bool, default: true):      keep input alive if failure in push mode
+.br
+hdrs (strl):                   additional HTTP headers to inject, even values are names, odd values are values 
+.br
+js (str):                      javascript logic for server
+.br
+zmax (uint, default: 50000):   maximum uncompressed size allowed for gzip or deflate compression for text files (only enabled if client indicates it), 0 will disable compression
+.br
 
 .br
 .SH hevcsplit
@@ -7290,7 +7587,7 @@
 .br
 By default the reframer will only check CRC footer of frames if a change in sample rate or channel mapping is detected.
 .br
-This should accomodate for most configurations, but CRC check can be enforced using .I docrc.
+This should accommodate for most configurations, but CRC check can be enforced using .I docrc.
 .br
 
 .br
@@ -7439,11 +7736,17 @@
 .SH Options (expert):
 .LP
 .br
-cprim (cprm, default: -1, minmax: reserved0,BT709,undef,reserved3,BT470M,BT470G,SMPTE170,SMPTE240,FILM,BT2020,SMPTE428,SMPTE431,SMPTE432,EBU3213, updatable): color primaries according to ISO/IEC 23001-8 / 23091-2
+cprim (cprm, default: -1, Enum: reserved0|BT709|undef|reserved3|BT470M|BT470G|SMPTE170|SMPTE240|FILM|BT2020|SMPTE428|SMPTE431|SMPTE432|EBU3213, updatable): color primaries according to ISO/IEC 23001-8 / 23091-2
+.br
+
+.br
+ctfc (ctfc, default: -1, Enum: reserved0|BT709|undef|reserved3|BT470M|BT470BG|SMPTE170|SMPTE249|Linear|Log100|Log316|IEC61966|BT1361|sRGB|BT2020_10|BT2020_12|SMPTE2084|SMPTE428|STDB67, updatable): color transfer characteristics according to ISO/IEC 23001-8 / 23091-2
+.br
+
 .br
-ctfc (ctfc, default: -1, minmax: reserved0,BT709,undef,reserved3,BT470M,BT470BG,SMPTE170,SMPTE249,Linear,Log100,Log316,IEC61966,BT1361,sRGB,BT2020_10,BT2020_12,SMPTE2084,SMPTE428,STDB67, updatable): color transfer characteristics according to ISO/IEC 23001-8 / 23091-2
+cmx (cmxc, default: -1, Enum: GBR|BT709|undef|FCC|BT601|SMPTE170|SMPTE240|YCgCo|BT2020|BT2020cl|YDzDx, updatable): color matrix coeficients according to ISO/IEC 23001-8 / 23091-2
 .br
-cmx (cmxc, default: -1, minmax: GBR,BT709,undef,FCC,BT601,SMPTE170,SMPTE240,YCgCo,BT2020,BT2020cl,YDzDx, updatable): color matrix coeficients according to ISO/IEC 23001-8 / 23091-2
+
 .br
 sar (frac, default: -1/-1, updatable): aspect ratio to rewrite
 .br
@@ -7735,8 +8038,9 @@
 .br
 
 .br
-This filter converts TTML frames to unframed WebVTT
-.
+This filter converts TTML frames to unframed WebVTT.
+.br
+
 .br
 Conversion is quite limited: only the first div is analyzed and only basic styling is implemented.
 .br
@@ -7753,8 +8057,9 @@
 .br
 
 .br
-This filter converts TTML frames to unframed SRT
-.
+This filter converts TTML frames to unframed SRT.
+.br
+
 .br
 Conversion is quite limited: only the first div is analyzed and only basic styling is implemented.
 .br
@@ -7764,12 +8069,30 @@
 .br
 
 .br
+.SH mpeghdec
+.LP
+.br
+Description: MPEG-H Audio decoder
+.br
+
+.br
+This filter decodes MPEG-H audio streams through IIS MpeghDecoder library.
+.br
+
+.br
+.SH Options (expert):
+.LP
+.br
+cicp_idx (uint, default: 2):   target output layout CICP index (see gpac -h layouts)
+.br
+
+.br
 .SH ffdmx
 .LP
 .br
 Description: FFMPEG demultiplexer
 .br
-Version: Lavf59.34.102
+Version: Lavf61.3.100
 .br
 
 .br
@@ -7792,6 +8115,12 @@
 .br
 src (cstr):                    URL of source content
 .br
+reparse (bool, default: false): force reparsing of stream content (AVC,HEVC,VVC,AV1 only for now)
+.br
+block_size (uint, default: 4096): block size used to read file when using GFIO context
+.br
+strbuf_min (uint, default: 1MB): internal buffer size when demuxing from GPAC's input stream
+.br
 * (str):                       any possible options defined for AVFormatContext and sub-classes. See gpac -hx ffdmx and gpac -hx ffdmx:*
 .br
 
@@ -7801,7 +8130,7 @@
 .br
 Description: FFMPEG decoder
 .br
-Version: Lavc59.55.100
+Version: Lavc61.5.101
 .br
 
 .br
@@ -7860,7 +8189,7 @@
 .br
 Description: FFMPEG AV Capture
 .br
-Version: Lavd59.8.101
+Version: Lavd61.2.100
 .br
 
 .br
@@ -7944,8 +8273,6 @@
 .br
 probes (uint, default: 10, minmax: 0-100): probe a given number of video frames before emitting (this usually helps with bad timing of the first frames)
 .br
-block_size (uint, default: 4096): block size used to read file when using avio context
-.br
 * (str):                       any possible options defined for AVInputFormat and AVFormatContext (see gpac -hx ffavin and gpac -hx ffavin:*)
 .br
 
@@ -7955,7 +8282,7 @@
 .br
 Description: FFMPEG video rescaler
 .br
-Version: SwS6.8.112
+Version: SwS8.2.100
 .br
 
 .br
@@ -8030,7 +8357,9 @@
 .br
 osize (v2di):                  osize of output video
 .br
-ofmt (pfmt, default: none, minmax: none,yuv420,yvu420,yuv420_10,yuv422,yuv422_10,yuv444,yuv444_10,uyvy,vyuy,yuyv,yvyu,uyvl,vyul,yuyl,yvyl,nv12,nv21,nv1l,nv2l,yuva,yuvd,yuv444a,yuv444p,v308,yuv444ap,v408,v410,v210,grey,algr,gral,rgb4,rgb5,rgb6,rgba,argb,bgra,abgr,rgb,bgr,xrgb,rgbx,xbgr,bgrx,rgbd,rgbds,uncv): pixel format for output video. When not set, input format is used
+ofmt (pfmt, default: none, Enum: none|yuv420|yvu420|yuv420_10|yuv422|yuv422_10|yuv444|yuv444_10|uyvy|vyuy|yuyv|yvyu|uyvl|vyul|yuyl|yvyl|nv12|nv21|nv1l|nv2l|yuva|yuvd|yuv444a|yuv444p|v308|yuv444ap|v408|v410|v210|grey|algr|gral|rgb4|rgb5|rgb6|rgba|argb|bgra|abgr|rgb|bgr|xrgb|rgbx|xbgr|bgrx|rgbd|rgbds|uncv): pixel format for output video. When not set, input format is used
+.br
+
 .br
 scale (enum, default: bicubic): scaling mode (see filter help) (fastbilinear|bilinear|bicubic|X|point|area|bicublin|gauss|sinc|lanzcos|spline)
 .br
@@ -8073,7 +8402,7 @@
 .br
 Description: FFMPEG encoder
 .br
-Version: Lavc59.55.100
+Version: Lavc61.5.101
 .br
 
 .br
@@ -8151,7 +8480,7 @@
 .br
 Description: FFMPEG multiplexer
 .br
-Version: Lavf59.34.102
+Version: Lavf61.3.100
 .br
 
 .br
@@ -8179,6 +8508,10 @@
 .br
 
 .br
+All PID properties prefixed with meta: will be added as metadata.
+.br
+
+.br
 .SH Options (expert):
 .LP
 .br
@@ -8211,7 +8544,7 @@
 .br
 Description: FFMPEG AVFilter
 .br
-Version: Lavf59.34.102
+Version: Lavfi10.2.101
 .br
 
 .br
@@ -8354,7 +8687,7 @@
 .br
 Description: FFMPEG BitStream filter
 .br
-Version: Lavc59.55.100
+Version: Lavu59.13.100
 .br
 
 .br
@@ -8517,7 +8850,21 @@
 .br
 
 .br
-The ATSC short service name can be set using PID property ShortServiceName. If not found, ServiceName is checked, otherwise default to GPAC.
+ATSC 3.0 attributes set by using the following PID properties:
+.br
+* ATSC3ShortServiceName: set the short service name, maxiumu of 7 characters.  If not found, ServiceName is checked, otherwise default to GPAC.
+.br
+* ATSC3MajorChannel: set major channel number of service. Default to 2.  This really should be set and should not use the default.
+.br
+* ATSC3MinorChannel: set minor channel number of service. Default of 1.
+.br
+* ATSC3ServiceCat: set service category, default to 1 if not found. 1=Linear a/v service. 2=Linear audio only service. 3=App-based service. 4=ESg service. 5=EA service. 6=DRM service.
+.br
+* ATSC3hidden: set if service is hidden.  Boolean true or false. Default of false.
+.br
+* ATSC3hideInGuide: set if service is hidden in ESG.  Boolean true or false. Default of false.
+.br
+* ATSC3configuration: set service configuration.  Choices are Broadcast or Broadband.  Default of Broadcast
 .br
 
 .br
@@ -8675,6 +9022,8 @@
 .br
 runfor (uint, default: 0):     run for the given time in ms
 .br
+nozip (bool, default: false):  do not zip signaling package (STSID+manifest)
+.br
 
 .br
 .SH rftruehd
@@ -8794,6 +9143,12 @@
 .br
 
 .br
+When .I align is not 0, if the difference between two consecutive timestamps is greater than the specified threshold, the new timestamp 
+.br
+is set to the last computed timestamp plus the minimum packet duration for the stream.
+.br
+
+.br
 .SH Options (expert):
 .LP
 .br
@@ -8821,6 +9176,10 @@
 .br
 tsinit (lfrac, default: -1/1): initial timestamp to resync to, negative values disables resync
 .br
+align (uint, default: 0):      timestamp alignment threshold (0 disables alignment) - see filter help
+.br
+reorder (bool, default: false): reorder input packets by CTS (resulting PID may fail decoding)
+.br
 
 .br
 .SH oggmx
@@ -8834,7 +9193,7 @@
 .br
 
 .br
-The .I cdur option allows specifiying the interleaving duration (max time difference between consecutive packets of different streams). 
+The .I cdur option allows specifying the interleaving duration (max time difference between consecutive packets of different streams). 
 .br
 
 .br
@@ -8868,7 +9227,7 @@
 .br
 - trigger reframers to be instanciated after the unframer filter.
 .br
-Using the unframer filter avoids doing a dump to disk then reimport or other complex data piping.
+Using the unframer filter avoids doing a dump to disk then re-import or other complex data piping.
 .br
 
 .br
@@ -8891,6 +9250,337 @@
 .br
 
 .br
+.SH uncvdec
+.LP
+.br
+Description: UNCV decoder
+.br
+
+.br
+This filter translates UNCV pixel format to a usable pixel format.
+.br
+
+.br
+.SH Options (expert):
+.LP
+.br
+force_pf (bool, default: false): ignore possible mapping to GPAC pixel formats
+.br
+no_tile (bool, default: false): ignore tiling info (debug)
+.br
+
+.br
+.SH ghidmx
+.LP
+.br
+Description: GHI demultiplexer
+.br
+
+.br
+This filter handles pre-indexed content for just-in-time processing of HAS manifest, init segment and segments
+.br
+
+.br
+Warning: This is work in progress, the format of indexes (binary or XML) may change until finalization of this filter.
+.br
+
+.br
+.SH Generating indexes
+.LP
+.br
+Indexes are constructed using the dasher filter and a given segment duration.
+.br
+Example
+.br
+gpac -i SRC ... -i SRCn -o index.ghi:segdur=2
+.br
+
+.br
+This constructs a binary index for the DASH session.
+.br
+Example
+.br
+gpac -i SRC -o index.ghix:segdur=2
+.br
+
+.br
+This constructs an XML index for the DASH session.
+.br
+
+.br
+Warning: XML indexes should only be used for debug purposes as they can take a significant amount of time to be parsed.
+.br
+
+.br
+When indexing, the default template used is $Representation$_$Number$. The template is stored in the index and shouldn't be re-specified when generating content.
+.br
+
+.br
+.SH Using indexes
+.LP
+.br
+The index can be used to generate manifest, child variants for HLS, init segments and segments.
+.br
+Example
+.br
+gpac -i index.ghi:gm=all -o dash/vod.mpd
+.br
+
+.br
+This generates manifest(s) and init segment(s).
+.br
+
+.br
+Example
+.br
+gpac -i index.ghi:rep=FOO:sn=10 -o dash/vod.mpd
+.br
+
+.br
+This generates the 10th segment of representation with ID FOO.
+.br
+
+.br
+Note: The manifest file(s) and init segment(s) are not written when generating a segment. The manifest target (mpd or m3u8) is only used to setup the filter chain and target output path.
+.br
+
+.br
+Example
+.br
+gpac -i index.ghi:gm=main -o dash/vod.m3u8
+.br
+
+.br
+This generates main manifest only (MPD or master HLS playlist).
+.br
+
+.br
+Example
+.br
+gpac -i index.ghi:gm=child:rep=FOO:out=BAR -o dash/vod.m3u8
+.br
+
+.br
+This generates child manifest for representation FOO in file BAR.
+.br
+
+.br
+Example
+.br
+gpac -i index.ghi:gm=init:rep=FOO:out=BAR2 -o dash/vod.m3u8
+.br
+
+.br
+This generates init segment for representation FOO in file BAR2.
+.br
+
+.br
+The filter outputs are PIDs using framed packets marked with segment boundaries and can be chained to other filters before entering the dasher (e.g. for encryption, transcode...).
+.br
+
+.br
+If representation IDs are not assigned during index creation, they default to the 1-based index of the source. You can check them using:
+.br
+EX: gpac -i src.ghi inspect:full
+.br
+
+.br
+.SH Muxed Representations
+.LP
+.br
+The filter can be used to generate muxed representations, either at manifest generation time or when generating a segment.
+.br
+Example
+.br
+gpac -i index.ghi:mux=A@V1@V2 -o dash/vod.mpd
+.br
+
+.br
+This will generate a manifest muxing representations A with representations V1 and V2.
+.br
+
+.br
+Example
+.br
+gpac -i index.ghi:mux=A@V1@V2,T@V1@V2 -o dash/vod.mpd
+.br
+
+.br
+This will generate a manifest muxing representations A and T with representations V1 and V2.
+.br
+
+.br
+Example
+.br
+gpac -i index.ghi:rep=V2:sn=5:mux=A@V2 -o dash/vod.mpd
+.br
+
+.br
+This will generate the 5th segment containing representations A and V2.
+.br
+
+.br
+The filter does not store any state, it is the user responsibility to use consistent information across calls:
+.br
+- do not change segment templates
+.br
+- do not change muxed representations to configurations not advertised in the generated manifests
+.br
+
+.br
+.SH Recommendations
+.LP
+.br
+Indexing supports fragmented and non-fragmented MP4, MPEG-2 TS and seekable inputs.
+.br
+- It is recommended to use fragmented MP4 as input format since this greatly reduces file loading times.
+.br
+- If non-fragmented MP4 are used, it is recommended to use single-track files to decrease the movie box size and speedup parsing.
+.br
+- MPEG-2 TS sources will be slower since they require PES reframing and AU reformating, resulting in more IOs than with mp4.
+.br
+- other seekable sources will likely be slower (seeking, reframing) and are not recommended.
+.br
+
+.br
+.SH Options (expert):
+.LP
+.br
+gm (enum, default: main):      manifest generation mode
+.br
+* none: no manifest generation (implied if sn is not 0)
+.br
+* all: generate all manifests and init segments
+.br
+* main: generate main manifest (MPD or master M3U8)
+.br
+* child: generate child playlist for HLS
+.br
+* init: generate init segment
+.br
+
+.br
+force (bool, default: false):  force loading sources in manifest generation for debug
+.br
+rep (str):                     representation to generate
+.br
+sn (uint):                     segment number to generate, 0 means init segment
+.br
+mux (strl):                    representation to mux - cf filter help
+.br
+out (str):                     output filename to generate
+.br
+
+.br
+.SH evgs
+.LP
+.br
+Description: EVG video rescaler
+.br
+
+.br
+This filter rescales raw video data using GPAC's EVG library to the specified size and pixel format.
+.br
+.SS Output size assignment
+.br
+If .I osize is {0,0}, the output dimensions will be set to the input size, and input aspect ratio will be ignored.
+.br
+
+.br
+If .I osize is {0,H} (resp. {W,0}), the output width (resp. height) will be set to respect input aspect ratio. If .I keepar=nosrc, input sample aspect ratio is ignored.
+.br
+.SS Aspect Ratio and Sample Aspect Ratio
+.br
+When output sample aspect ratio is set, the output dimensions are divided by the output sample aspect ratio.
+.br
+Example
+.br
+evgs:osize=288x240:osar=3/2
+.br
+
+.br
+The output dimensions will be 192x240.
+.br
+
+.br
+When aspect ratio is not kept (.I keepar=off):
+.br
+- source is resampled to desired dimensions
+.br
+- if output aspect ratio is not set, output will use source sample aspect ratio
+.br
+
+.br
+When aspect ratio is partially kept (.I keepar=nosrc):
+.br
+- resampling is done on the input data without taking input sample aspect ratio into account
+.br
+- if output sample aspect ratio is not set (.I osar=0/N), source aspect ratio is forwarded to output.
+.br
+
+.br
+When aspect ratio is fully kept (.I keepar=full), output aspect ratio is force to 1/1 if not set.
+.br
+
+.br
+When sample aspect ratio is kept, the filter will:
+.br
+- center the rescaled input frame on the output frame
+.br
+- fill extra pixels with .I padclr
+.br
+
+.br
+.SH Options (expert):
+.LP
+.br
+osize (v2di):                  osize of output video
+.br
+ofmt (pfmt, default: none):    pixel format for output video. When not set, input format is used
+.br
+ofr (bool, default: false):    force output full range
+.br
+keepar (enum, default: off):   keep aspect ratio
+.br
+* off: ignore aspect ratio
+.br
+* full: respect aspect ratio, applying input sample aspect ratio info
+.br
+* nosrc: respect aspect ratio but ignore input sample aspect ratio
+.br
+
+.br
+padclr (str, default: black):  clear color when aspect ration preservation is used
+.br
+osar (frac, default: 0/1):     force output pixel aspect ratio
+.br
+nbth (sint, default: -1):      number of threads to use, -1 means all cores
+.br
+hq (bool, default: false):     use bilinear interpolation instead of closest pixel
+.br
+
+.br
+.SH ccdec
+.LP
+.br
+Description: Closed-Caption decoder
+.br
+
+.br
+This filter decodes Closed Captions to unframed SRT.
+.br
+Supported video media types are MPEG2, AVC, HEVC, VVC and AV1 streams.
+.br
+
+.br
+Only a subset of CEA 608/708 is supported.
+.br
+
+.br
+No options
+.br
+
+.br
 .SH dtout
 .LP
 .br
@@ -8957,6 +9647,140 @@
 .br
 
 .br
+.SH uncvg
+.LP
+.br
+Description: Uncompressed Video File Format Generator Utility
+.br
+Version: 1.0
+.br
+Author: GPAC team - (c) Telecom ParisTech 2023 - license LGPL v2
+.br
+
+.br
+This filter provides generation of test images for ISO/IEC 23001-17
+.br
+Generated pixels can be:
+.br
+- a pattern of colors in columns, or in rectangles if .I sq is set, using the specified palette.
+.br
+- an image source if .I img is used.
+.br
+
+.br
+Colors specified in the palette can be default GPAC colors (see gpac -h colors), 0xRRGGBB or 0xAARRGGBB
+.br
+
+.br
+When generating video, the pixels are shifted to the left at every frame
+.br
+
+.br
+Components are described as Nbpc+k with
+.br
+* N: component type, one of M(mono), Y, U, V, R, G, B, A, d(depth), disp, p(palette), f(filterArray), x (pad)
+.br
+* bpc: bits per component value, default is 8. Non-integer values must be one of
+.br
+  * sft: floating-point value on 16 bits
+.br
+  * flt: floating-point value on 32 bits
+.br
+  * dbl: floating-point value on 64 bits
+.br
+  * dblx: floating-point value on 128 bits
+.br
+  * cps: complex value as two floats on 16 bits each
+.br
+  * cpf: complex value as two floats on 32 bits each
+.br
+  * cpd: complex value as two floats on 64 bits each
+.br
+  * cpx: complex value as two floats on 128 bits each
+.br
+* k: force component alignment on k bytes, default is 0 (no alignment)
+.br
+
+.br
+.SH Options (expert):
+.LP
+.br
+vsize (v2d, default: 128x128): width and height of output image
+.br
+c (strl, default: R8,G8,B8):   image components
+.br
+tiles (v2d, default: 1x1):     number of horizontal and vertical tiles
+.br
+interleave (enum, default: pix): interleave type
+.br
+* comp: component-based interleaving (planar modes)
+.br
+* pix: pixel-based interleaving (packed modes)
+.br
+* mix: pixel-based interleaving for UV (semi-planar modes)
+.br
+* row: row-based interleaving
+.br
+* tile: tile-component interleaving
+.br
+* multi: pixel-based interleaving (packed modes) for sub-sampled modes
+.br
+
+.br
+sampling (enum, default: none): sampling types
+.br
+* none: no sub-sampling
+.br
+* 422: YUV 4:2:2 sub-sampling
+.br
+* 420: YUV 4:2:0 sub-sampling
+.br
+* 411: YUV 4:1:1 sub-sampling
+.br
+
+.br
+block_size (uint, default: 0): block size in bytes
+.br
+pad_lsb (bool, default: false): padded bits are at LSB in the block
+.br
+ble (bool, default: false):    block is little endian
+.br
+br (bool, default: false):     block has reversed components
+.br
+pixel_size (uint, default: 0): size of pixel in bytes
+.br
+row_align (uint, default: 0):  row alignment in bytes
+.br
+tile_align (uint, default: 0): tile alignment in bytes
+.br
+cle (bool, default: false):    byte-aligned components are little endian
+.br
+img (str, default: ):          use specified image as input instead of RGB generation
+.br
+asize (bool, default: false):  use input image size
+.br
+pal (strl, default: red,green,blue,white,black,yellow,cyan,grey,orange,violet): default palette for color generation
+.br
+fa (strl, default: B,G,G,R):   bayer-like filter - only 2x2 on R,G,B components is supported
+.br
+bpm (strl, default: ):         set sensor bad pixel map as a list of cN (broken column), rM (broken row) or NxM (single pixel)
+.br
+fps (frac, default: 25/1):     frame rate to generate - using 0 will trigger item muxing
+.br
+dur (frac, default: 1/1):      duration to generate - using 0 will trigger item muxing
+.br
+cloc (uint, default: -1, minmax: -1,6): set chroma location type
+.br
+stereo (bool, default: false): dump a stereo image
+.br
+sq (flt, default: 0):          generate square patterns instead of columns
+.br
+shade (bool, default: false):  shade pixels from black at bottom to full intensity at top
+.br
+scpt (bool, default: false):   use single color per tile, first tile using the first color in palette
+.br
+
+.br
 .SH glpush
 .LP
 .br
@@ -8991,7 +9815,7 @@
 .br
 
 .br
-The input video is downsampled by the .I scale factor. The output size is configured based on the number of images per line and per column in the .I grid. 
+The input video is down-sampled by the .I scale factor. The output size is configured based on the number of images per line and per column in the .I grid. 
 .br
 Once configured, the output size is no longer modified.
 .br
@@ -9167,7 +9991,7 @@
 .br
 list (str, default: null):     export json list of frame times and positions to given file
 .br
-lxy (bool, default: false):    add explict x and y in json export
+lxy (bool, default: false):    add explicit x and y in json export
 .br
 
 .br
@@ -11118,9 +11942,9 @@
 .br
 For bug reports, feature requests, more information and source code, visit https://github.com/gpac/gpac
 .br
-build: 2.2-rev655-g65430e305-master
+build: 2.4
 .br
-Copyright: (c) 2000-2022 Telecom Paris distributed under LGPL v2.1+ - http://gpac.io
+Copyright: (c) 2000-2023 Telecom Paris distributed under LGPL v2.1+ - https://gpac.io
 .br
 .SH SEE ALSO
 .LP

gpac-2.2.1.tar.gz/share/doc/man/gpac.1 -> gpac-2.4.0.tar.gz/share/doc/man/gpac.1 Changed

@@ -97,6 +97,11 @@
 print graph after execution
 .br
 .TP
+.B \-qe
+.br
+enable quick exit (no mem cleanup)
+.br
+.TP
 .B \-k
 .br
 enable keyboard interaction from command line
@@ -145,6 +150,11 @@
 specify an input file to wrap as GF_FileIO object (testing of GF_FileIO)
 .br
 .TP
+.B \-ibx (string)
+.br
+specify an input file to wrap as GF_FileIO object without caching (testing of GF_FileIO)
+.br
+.TP
 .B \-ob (string)
 .br
 specify an output file to wrap as GF_FileIO object (testing of GF_FileIO)
@@ -178,10 +188,14 @@
 .br
 * cfg: print the GPAC configuration help
 .br
+* net: print network interfaces
+.br
 * prompt: print the GPAC prompt help when running in interactive mode (see .I -k )
 .br
 * modules: print available modules
 .br
+* module NAME: print info and options of module NAME
+.br
 * creds: print credential help
 .br
 * filters: print name of all available filters
@@ -223,7 +237,13 @@
 .TP
 .B \-p (string)
 .br
-use indicated profile for the global GPAC config. If not found, config file is created. If a file path is indicated, this will load profile from that file. Otherwise, this will create a directory of the specified name and store new config there. Reserved name 0 means a new profile, not stored to disk. Appending :reload to the profile name will force recreating a new configuration file
+use indicated profile for the global GPAC config. If not found, config file is created. If a file path is indicated, this will load profile from that file. Otherwise, this will create a directory of the specified name and store new config there. The following reserved names create a temporary profile (not stored on disk):
+.br
+* 0: full profile
+.br
+* n: null profile disabling shared modules/filters and system paths in config (may break GUI and other filters)
+.br
+Appending :reload to the profile name will force recreating a new configuration file
 .br
 .TP
 .B \-alias (string)
@@ -286,7 +306,7 @@
 .TP
 .B \-dbg-edges
 .br
-log edges status in filter graph before dijkstra resolution (for debug). Edges are logged as edge_source(status, weight, src_cap_idx, dst_cap_idx)
+log edges status in filter graph before dijkstra resolution (for debug). Edges are logged as edge_source(status(disable_depth), weight, src_cap_idx -> dst_cap_idx)
 .br
 .TP
 .B \-full-link
@@ -294,6 +314,11 @@
 throw error if any PID in the filter graph cannot be linked
 .br
 .TP
+.B \-no-dynf
+.br
+disable dynamically loaded filters
+.br
+.TP
 .B \-no-block (Enum, default: no)
 .br
 disable blocking mode of filters
@@ -507,7 +532,7 @@
 .br
 * `+NAME`: adds user NAME
 .br
-* `+NAME:I1=V1,I2=V2`: sets info I1 with value V1 to user NAME. the info name password resets password without prompt.
+* `+NAME:I1=V1,I2=V2`: sets info I1 with value V1 to user NAME. The info name password resets password without prompt.
 .br
 * `-NAME`: removes user NAME
 .br
@@ -531,7 +556,7 @@
 .br
 Servers using authentication rules can use a configuration file instead of a directory name.
 .br
-This configuration file is organized in sections, each section name descibing a directory.
+This configuration file is organized in sections, each section name describing a directory.
 .br
 Example
 .br
@@ -755,7 +780,7 @@
 .TP
 .B \-ifce (string)
 .br
-set default multicast interface through interface IP address (default is 127.0.0.1)
+set default multicast interface (default is ANY), either an IP address or a device name as listed by gpac -h net. Prefix '+' will force using IPv6 for dual interface
 .br
 .TP
 .B \-lang (string)
@@ -827,7 +852,7 @@
 .TP
 .B \-docs-dir (string)
 .br
-default documents directoty (for GUI on iOS and Android)
+default documents directory (for GUI on iOS and Android)
 .br
 .TP
 .B \-last-dir (string)
@@ -842,7 +867,84 @@
 .TP
 .B \-no-tls-rcfg
 .br
-disble automatic TCP to TLS reconfiguration
+disable automatic TCP to TLS reconfiguration
+.br
+.TP
+.B \-no-fd
+.br
+use buffered IO instead of file descriptor for read/write - this can speed up operations on small files
+.br
+.TP
+.B \-no-mx
+.br
+disable all mutexes, threads and semaphores (do not use if unsure about threading used)
+.br
+.TP
+.B \-netcap (string)
+.br
+set packet capture and filtering rules formatted as CFGRULES. Each -netcap argument will define a configuration
+.br
+CFG is an optional comma-separated list of:
+.br
+* id=ID: ID (string) for this configuration. If NULL, configuration will apply to all sockets not specifying a netcap ID
+.br
+* src=F: read packets from F, as produced by GPAC or a pcap or pcapng file
+.br
+* dst=F: output packets to F (GPAC or pcap/pcapng file), cannot be set if src is set
+.br
+* loop=N: loop capture file N times, or forever if N is not set or negative
+.br
+* nrt: disable real-time playback
+.br
+RULES is an optional list of OPT,OPT2... with OPT in:
+.br
+* m=N: set rule mode - N can be r for reception only (default), w for send only or rw for both
+.br
+* s=N: set packet start range to N
+.br
+* e=N: set packet end range to N (only used for r and f rules)
+.br
+* n=N: set number of packets to drop to N - not set, 0 or 1 means single packet
+.br
+* r=N: random drop one packet every N
+.br
+* f=N: drop first packet every N
+.br
+* p=P: local port number to filter, if not set the rule applies to all packets
+.br
+* o=N: patch packet instead of droping (always true for TCP), replacing byte at offset N (0 is first byte, <0 for random)
+.br
+* v=N: set patch byte value to N (hexa) or negative value for random (default)
+.br
+
+.br
+Example
+.br
+-netcap=dst=dump.gpc
+.br
+
+.br
+This will record packets to dump.gpc
+.br
+
+.br
+Example
+.br
+-netcap=src=dump.gpc,id=NC1 -i session1.sdp:NCID=NC1 -i session2.sdp
+.br
+
+.br
+This will read packets from dump.gpc only for session1.sdp and let session2.sdp use regular sockets
+.br
+
+.br
+Example
+.br
+-netcap=p=1234,s=100,n=20r=200,s=500,o=10,v=FE
+.br
+
+.br
+This will use regular network interface and drop packets 100 to 119 on port 1234 and patch one random packet every 200 starting from packet 500, setting byte 10 to FE
 .br
 .TP
 .B \-cache (string)
@@ -897,7 +999,7 @@
 .TP
 .B \-req-timeout (int, default: 10000)
 .br
-time in milliseconds to wait on HTTP/RTSP request before error
+time in milliseconds to wait on HTTP/RTSP request before error (0 disables timeout)
 .br
 .TP
 .B \-no-timeout
@@ -962,7 +1064,7 @@
 .TP
 .B \-dbg-edges
 .br
-log edges status in filter graph before dijkstra resolution (for debug). Edges are logged as edge_source(status, weight, src_cap_idx, dst_cap_idx)
+log edges status in filter graph before dijkstra resolution (for debug). Edges are logged as edge_source(status(disable_depth), weight, src_cap_idx -> dst_cap_idx)
 .br
 .TP
 .B \-full-link
@@ -970,6 +1072,11 @@
 throw error if any PID in the filter graph cannot be linked
 .br
 .TP
+.B \-no-dynf
+.br
+disable dynamically loaded filters
+.br
+.TP
 .B \-no-block (Enum, default: no)
 .br
 disable blocking mode of filters
@@ -1061,37 +1168,6 @@
 default buffer size in frames when timing is not available
 .br
 .TP
-.B \-switch-vres
-.br
-select smallest video resolution larger than scene size, otherwise use current video resolution
-.br
-.TP
-.B \-hwvmem (Enum, default: auto)
-.br
-specify (2D rendering only) memory type of main video backbuffer. Depending on the scene type, this may drastically change the playback speed
-.br
-* always: always on hardware
-.br
-* never: always on system memory
-.br
-* auto: selected by GPAC based on content type (graphics or video)
-.br
-.TP
-.B \-pref-yuv4cc (string)
-.br
-set preferred YUV 4CC for overlays (used by DirectX only)
-.br
-.TP
-.B \-offscreen-yuv
-.br
-indicate if offscreen yuv->rgb is enabled. can be set to false to force disabling
-.br
-.TP
-.B \-overlay-color-key (string)
-.br
-color to use for overlay keying, hex format
-.br
-.TP
 .B \-gl-bits-comp (int, default: 8)
 .br
 number of bits per color component in OpenGL
@@ -1107,16 +1183,6 @@
 enable OpenGL double buffering
 .br
 .TP
-.B \-sdl-defer
-.br
-use defer rendering for SDL
-.br
-.TP
-.B \-no-colorkey
-.br
-disable color keying at the video output level
-.br
-.TP
 .B \-glfbo-txid (int)
 .br
 set output texture ID when using glfbo output. The OpenGL context shall be initialized and gf_term_process shall be called with the OpenGL context active
@@ -1127,36 +1193,11 @@
 indicate the name of the video output module to use (see gpac -h modules). The reserved name glfbo is used in player mode to draw in the OpenGL texture identified by .I glfbo-txid.  In this mode, the application is responsible for sending event to the compositor
 .br
 .TP
-.B \-dfb-sys (string, default: x11)
-.br
-system DirectFB (x11, sdl, vnc, fbdev, osx ordevmem)
-.br
-.TP
-.B \-dfb-flip (string, default: waitsync)
-.br
-vsync mode for DirectFB (waitsync, wait, sync or swap)
-.br
-.TP
 .B \-audio-output (string)
 .br
 indicate the name of the audio output module to use
 .br
 .TP
-.B \-alsa-devname (string)
-.br
-set ALSA dev name
-.br
-.TP
-.B \-force-alsarate (int)
-.br
-force ALSA and OSS output sample rate
-.br
-.TP
-.B \-ds-disable-notif
-.br
-disable DirectSound audio buffer notifications when supported
-.br
-.TP
 .B \-font-reader (string)
 .br
 indicate name of font reader module
@@ -1259,6 +1300,11 @@
 .br
 use HEVC URN for alpha and depth in HEIF instead of MPEG-B URN (HEIF first edition)
 .br
+.TP
+.B \-boxdir (string)
+.br
+use box definitions in the given directory for XML dump
+.br
 .SH libgpac logs options:
 .LP
 .br
@@ -1387,6 +1433,11 @@
 .br
 use new line at each progress messages
 .br
+.TP
+.B \-log-dual,-ld
+.br
+output to both file and stderr
+.br
 .SH Overview
 .LP
 .br
@@ -1445,8 +1496,14 @@
 .br
 * integer lists: formatted as val1,val2,...
 .br
+
+.br
 Note: The special characters in property formats (0x,/,-,+I,-I,x) cannot be configured.
 .br
+
+.br
+Numbers and fraction can be expressed as THH:MM:SS.ms, TMM:SS.ms, THH:MM:SS or TMM:SS, translated into milliseconds.
+.br
 .SH Filter declaration FILTER
 .LP
 .br
@@ -1454,7 +1511,7 @@
 .br
 Each filter is declared by its name, with optional filter arguments appended as a list of colon-separated name=value pairs. Additional syntax is provided for:
 .br
-* boolean: value can be omitted, defaulting to true (e.g. :noedit). Using ! before the name negates the result (e.g. :!moof_first)
+* boolean: value can be omitted, defaulting to true (e.g. :allt). Using ! before the name negates the result (e.g. :!moof_first)
 .br
 * enumerations: name can be omitted, e.g. :disp=pbo is equivalent to :pbo.
 .br
@@ -1602,8 +1659,6 @@
 .br
 This will force decoding media from file.mp4 and trash (send to null) the result (doing a decoder benchmark for example).
 .br
-
-.br
 .SS Escaping option separators
 .br
 When a filter uses an option defined as a string using the same separator character as gpac, you can either modify the set of separators, or escape the separator by duplicating it. The options enclosed by duplicated separator are not parsed. This is mostly used for meta filters, such as ffmpeg, to pass options to sub-filters such as libx264 (cf x264opts parameter).
@@ -1857,6 +1912,8 @@
 .br
 * name#TAG=VAL: accepts the PID if its parent filter has no tag or a tag matching VAL
 .br
+* name#ITAG=VAL: accepts the PID if its parent filter has no inherited tag or an inherited tag matching VAL
+.br
 * name#P4CC=VAL: accepts only PIDs with builtin property of type P4CC and value VAL.
 .br
 * name#PName=VAL: same as above, using the builtin name corresponding to the property.
@@ -2096,6 +2153,10 @@
 .br
   
 .br
+A filter may also be assigned an inherited tag (any string) using :ITAG=name option. Such tags are inherited, and are typically used to track dynamically loaded filters.
+.br
+  
+.br
 .SH URL templating
 .LP
 .br
@@ -2113,6 +2174,8 @@
 .br
 * Type: name of stream type of PID (video, audio ...)
 .br
+* OType: same as Type but uses original type when stream is encrypted (e.g. move from crypt to video)
+.br
 * p4cc=ABCD: uses PID property with 4CC value ABCD
 .br
 * pname=VAL: uses PID property with name VAL
@@ -2131,7 +2194,7 @@
 .br
 Example
 .br
-gpac -i dump.yuv:size=640x360 vcrop:wnd=0x0x320x180 c=avc:b=1M @2 c=avc:b=750k -o dump_$CropOrigin$x$Width$x$Height$.264:clone
+gpac -i dump.yuv:size=640x360 vcrop:wnd=0x0x320x180 c=avc:b=1M @2 c=avc:b=750k -o dump_$CropOrigin$x$Width$x$Height$.264
 .br
 
 .br
@@ -2152,11 +2215,9 @@
 .br
 Other items will not be connected since the destination only accepts one input PID.
 .br
-There is a special option clone allowing filters to be cloned with the same arguments. The cloned filters have the same ID as the original one.
-.br
 Example
 .br
-gpac -i img.heif -o dump_$ItemID$.jpg:clone
+gpac -i img.heif -o dump_$ItemID$.jpg
 .br
 
 .br
@@ -2164,7 +2225,7 @@
 .br
 Example
 .br
-gpac -i vid.mpd c=avc:FID=1:clone -o transcode.mpd:SID=1
+gpac -i vid.mpd c=avc:FID=1 -o transcode.mpd:SID=1
 .br
 
 .br
@@ -2310,6 +2371,32 @@
 .br
 This will assign property MyProp to HD for PIDs with property Width greater than 1280.
 .br
+
+.br
+The property value can use templates with the following keywords:
+.br
+* $GINC(init,inc) or @GINC(...): replaced by integer for each new output PID of the filter (see specific filter options for details on syntax)
+.br
+* PROP (enclosed between `$` or `@`): replaced by serialized value of property PROP (name or 4CC) of the PID or with empty string if no such property
+.br
+Example
+.br
+gpac -i source.ts:#ASID=$PID$
+.br
+
+.br
+This will assign DASH AdaptationSet ID to the PID ID value.
+.br
+Example
+.br
+gpac -i source.ts:#RepresentationID=$ServiceID$
+.br
+
+.br
+This will assign DASH Representation ID to the PID ServiceID value.
+.br
+
+.br
 .SH Using option files
 .LP
 .br
@@ -2335,6 +2422,43 @@
 .br
 Any filter loaded between source.mp4 and dst will inherit both myopts.txt and foo options and will resolve options and PID properties given in myopts.txt.
 .br
+
+.br
+.SH Ignoring filters at run-time
+.LP
+.br
+The special option ccp can be used to replace filters with an identity filter at run-time based on the input codec ID.
+.br
+The option is a list of codec IDs to check. For encoder filters, an empty list reuses the encoder codec type.
+.br
+When the PID codec ID matches one of the specified codec, the filter is replaced with a reframer filter with single PID input and same name and ID.
+.br
+Example
+.br
+-i src c=avc:b=1m:ccp -o mux
+.br
+
+.br
+This will replace the encoder filter with a reframer if the input PID is in AVC|H264 format, or uses the encoder for other visual PIDs.
+.br
+Example
+.br
+-i src c=avc:b=1m:ccp=avc,hevc -o mux
+.br
+
+.br
+This will replace the encoder filter with a reframer if the input PID is in AVC|H264 or HEVC format, or uses the encoder for other visual PIDs.
+.br
+Example
+.br
+-i src cecrypt:cfile=drm.xml:ccp=aac -o mux
+.br
+
+.br
+This will replace the encryptor filter with a reframer if the input PID is in AAC format, or uses the encryptor for other PIDs.
+.br
+
+.br
 .SH Specific filter options
 .LP
 .br
@@ -2390,13 +2514,15 @@
 .br
 * TAG: filter tag (string value)
 .br
+* ITAG: filter inherited tag (string value)
+.br
 * FBT: buffer time in microseconds (unsigned int value)
 .br
 * FBU: buffer units (unsigned int value)
 .br
 * FBD: decode buffer time in microseconds (unsigned int value)
 .br
-* clone: filter cloning flag (no value)
+* clone: explicitly enable/disable filter cloning flag (no value)
 .br
 * nomux: enable/disable direct file copy (no value)
 .br
@@ -2408,6 +2534,14 @@
 .br
 * gpac: argument separator for URLs (no value)
 .br
+* ccp: filter replacement control (string list value)
+.br
+* NCID: ID of netcap configuration to use (string)
+.br
+* LT: set additionnal log tools and levels for the filter usin same syntax as -logs, e.g. :LT=filter@debug (string value)
+.br
+* DBG: debug missing input PID property (=pid), missing input packet property (=pck) or both (=all)
+.br
 
 .br
 The buffer control options are used to change the default buffering of PIDs of a filter:
@@ -2424,7 +2558,7 @@
 .br
 
 .br
-These options can be set:
+The options FBT, FBU, FBD  and DBG can be set:
 .br
 * per filter instance: fA reframer:FBU=2
 .br
@@ -2595,6 +2729,11 @@
 .br
 color matrix coefficients, string or int value from ISO/IEC 23091-2
 .br
+.TP
+.B alay
+.br
+channel layout configuration, string or int value from ISO/IEC 23091-3
+.br
 
 .br
 Built-in properties for PIDs and packets listed as Name (4CC type FLAGS): description
@@ -2790,6 +2929,11 @@
 Decoder configuration data of the enhancement layer(s). Also used by 3GPP/Apple text streams to give the full sample description table used in SDP.
 .br
 .TP
+.B DSISuperset (DCFS,bool,  )
+.br
+Decoder config is a superset of previous decoder config
+.br
+.TP
 .B DecoderConfigIndex (ICFG,uint,  )
 .br
 1-based index of decoder config for ISO base media files
@@ -2900,11 +3044,6 @@
 Sample (i.e. pixel) aspect ratio
 .br
 .TP
-.B PAR (VPAR,frac,D )
-.br
-Picture aspect ratio
-.br
-.TP
 .B MaxWidth (MWID,uint,  )
 .br
 Maximum width (video / text / graphics) of all enhancement layers
@@ -3134,6 +3273,11 @@
 Display height of service
 .br
 .TP
+.B IsDefault (PDEF,bool,D )
+.br
+Default PID for this stream type
+.br
+.TP
 .B CarouselRate (CARA,uint,D )
 .br
 Repeat rate in ms for systems carousel data
@@ -3532,6 +3676,11 @@
 Name of HLS Group of a stream
 .br
 .TP
+.B HLSForce (HLFI,str,D )
+.br
+Force writing EXT-X-STREAM-INF if stream is in a rendition group, value is the name of associated groups (can be empty)
+.br
+.TP
 .B HLSMExt (HLMX,strl,D )
 .br
 List of extensions to add to the master playlist for this PID
@@ -3662,7 +3811,7 @@
 Magic number to store in the track, only used by importers
 .br
 .TP
-.B MuxIndex (TIDX,luint,D )
+.B MuxIndex (TIDX,uint,D )
 .br
 Target track index in destination file, stored by lowest value first (not set by demultiplexers)
 .br
@@ -3687,6 +3836,11 @@
 Start and end position in bytes of fragment if packet is a fragment or segment start
 .br
 .TP
+.B FragTFDT (PFRT,luint,DP)
+.br
+Decode time of first packet in fragmentt
+.br
+.TP
 .B SIDXRange (PFSR,lfrac,DP)
 .br
 Start and end position in bytes of sidx if packet is a fragment or segment start
@@ -3807,9 +3961,17 @@
 Time shift in number of segments for HAS streams, only set by dashin and dasher filters
 .br
 .TP
-.B IsManifest (PHSM,bool,D )
+.B IsManifest (PHSM,uint,D )
+.br
+PID is a HAS manifest (MSB=1 if live)
+.br
+* 0: not a manifest
 .br
-PID is a HAS manifest
+* 1: DASH manifest
+.br
+* 2: HLS manifest
+.br
+* 3: GHI(X) manifest
 .br
 .TP
 .B Sparse (PSPA,bool,D )
@@ -3817,6 +3979,22 @@
 PID has potentially empty times between packets
 .br
 .TP
+.B CharSet (PCHS,str,D )
+.br
+Character set for input text PID
+.br
+.TP
+.B ForcedSub (PFCS,uint,D )
+.br
+PID or Packet is forced sub
+.br
+0: not forced
+.br
+1: forced frame
+.br
+2: all frames are forced (PID only)
+.br
+.TP
 .B ChapTimes (CHPT,uintl,D )
 .br
 Chapter start times
@@ -3827,6 +4005,11 @@
 Chapter names
 .br
 .TP
+.B IsChap (PCHP,bool,D )
+.br
+Subtitle PID is chapter (for QT-like chapters)
+.br
+.TP
 .B SkipBegin (PCKS,uint, P)
 .br
 Amount of media to skip from beginning of packet in PID timescale
@@ -4140,21 +4323,41 @@
 24 bit PCM
 .br
 .TP
+.B s24b (ext *.s24b)
+.br
+24 bit Big-Endian PCM
+.br
+.TP
 .B s32 (ext *.s32)
 .br
 32 bit PCM Little Endian
 .br
 .TP
+.B s32b (ext *.s32b)
+.br
+32 bit PCM Big Endian
+.br
+.TP
 .B flt (ext *.flt)
 .br
 32-bit floating point PCM
 .br
 .TP
+.B fltb (ext *.fltb)
+.br
+32-bit floating point PCM Big Endian
+.br
+.TP
 .B dbl (ext *.dbl)
 .br
 64-bit floating point PCM
 .br
 .TP
+.B dblb (ext *.dblb)
+.br
+64-bit floating point PCM Big Endian
+.br
+.TP
 .B u8p (ext *.pc8p)
 .br
 8 bit PCM planar
@@ -4526,26 +4729,36 @@
 G719 Audio
 .br
 .TP
-.B dstca
+.B dstc
 .br
-DTS Coherent Acoustics Audio
+DTS Coherent Acoustics and Digital Surround Audio
 .br
 .TP
 .B dtsh
 .br
-DTS-HD High Resolution Audio
+DTS-HD High Resolution Audio and DTS-Master Audio
 .br
 .TP
-.B dstm
+.B dstl
 .br
-DTS-HD Master Audio
+DTS-HD Substream containing only XLLAudio
 .br
 .TP
-.B dtsl
+.B dtse
 .br
 DTS Express low bit rate Audio
 .br
 .TP
+.B dtsx
+.br
+DTS-X UHD Audio Profile 2
+.br
+.TP
+.B dtsy
+.br
+DTS-X UHD Audio Profile 3
+.br
+.TP
 .B opus
 .br
 Opus Audio
@@ -4721,6 +4934,11 @@
 Raw media
 .br
 .TP
+.B uncv
+.br
+Raw Video
+.br
+.TP
 .B av1|ivf|obu|av1b
 .br
 AOM AV1 Video
@@ -4942,9 +5160,9 @@
 .br
 For bug reports, feature requests, more information and source code, visit https://github.com/gpac/gpac
 .br
-build: 2.2-rev655-g65430e305-master
+build: 2.4
 .br
-Copyright: (c) 2000-2022 Telecom Paris distributed under LGPL v2.1+ - http://gpac.io
+Copyright: (c) 2000-2023 Telecom Paris distributed under LGPL v2.1+ - https://gpac.io
 .br
 .SH SEE ALSO
 .LP

gpac-2.2.1.tar.gz/share/doc/man/mp4box.1 -> gpac-2.4.0.tar.gz/share/doc/man/mp4box.1 Changed

@@ -42,7 +42,7 @@
 .br
 Option values:
 .br
-Unless specified otherwise, a track operation option of type integer expects a track identifer value following it.
+Unless specified otherwise, a track operation option of type integer expects a track identifier value following it.
 .br
 An option of type boolean expects no following value.
 .br
@@ -322,9 +322,9 @@
 remove all group information from all tracks
 .br
 .TP
-.B \-ref tkID:XXXX:refID
+.B \-ref tkID:R4CC:refID
 .br
-add a reference of type 4CC from track ID to track refID
+add a reference of type R4CC from track ID to track refID (remove track reference if refID is 0)
 .br
 .TP
 .B \-keep-utc
@@ -370,7 +370,7 @@
 .TP
 .B \-zmov
 .br
-compress movie box according to ISOBMFF box compression
+compress movie box according to ISOBMFF box compression or QT if mov extension
 .br
 .TP
 .B \-xmov
@@ -556,13 +556,13 @@
 .br
 * :role=VALUE: set the role of this representation (cf DASH spec). Media with different roles belong to different adaptation sets.
 .br
-* :desc_p=VALUE: add a descriptor at the Period level. Value must be a properly formatted XML element.
+* :desc_p=VALUE: add a descriptor at the Period level.
 .br
-* :desc_as=VALUE: add a descriptor at the AdaptationSet level. Value must be a properly formatted XML element. Two input files with different values will be in different AdaptationSet elements.
+* :desc_as=VALUE: add a descriptor at the AdaptationSet level. Two input files with different values will be in different AdaptationSet elements.
 .br
-* :desc_as_c=VALUE: add a descriptor at the AdaptationSet level. Value must be a properly formatted XML element. Value is ignored while creating AdaptationSet elements.
+* :desc_as_c=VALUE: add a descriptor at the AdaptationSet level. Value is ignored while creating AdaptationSet elements.
 .br
-* :desc_rep=VALUE: add a descriptor at the Representation level. Value must be a properly formatted XML element. Value is ignored while creating AdaptationSet elements.
+* :desc_rep=VALUE: add a descriptor at the Representation level. Value is ignored while creating AdaptationSet elements.
 .br
 * :sscale: force movie timescale to match media timescale of the first track in the segment.
 .br
@@ -596,6 +596,8 @@
 .br
 
 .br
+Note: Descriptors value must be a properly formatted XML element(s), value is not checked. Syntax can use file@FILENAME to load content from file.
+.br
 .SH Options
 .LP
 .br
@@ -1017,7 +1019,7 @@
 .br
 The output file name(s) can be specified using -out and templates (e.g. -out split$num%04d$.mp4 produces split0001.mp4, split0002.mp4, ...).
 .br
-Multiple time ranges can be specified as a comma-seperated list for -splitx, -splitz and -splitg.
+Multiple time ranges can be specified as a comma-separated list for -splitx, -splitz and -splitg.
 .br
   
 .br
@@ -1369,6 +1371,11 @@
 .br
 check XML output format for -dnal*, -diso* and -dxml options
 .br
+.TP
+.B \-fuzz-chk
+.br
+open file without probing and exit (for fuzz tests)
+.br
 .SH Importing Options
 .LP
 .br
@@ -1830,7 +1837,7 @@
 .br
 * auto: use Atmos signaling from first sample
 .br
-* N: force Atmos signaling using complexibility type index N
+* N: force Atmos signaling using compatibility type index N
 .br
 .TP
 .B font (string)
@@ -2030,6 +2037,16 @@
   - other value will try to set track ID to this value if no other track with same ID is present
 .br
 .TP
+.B tkgp (string)
+.br
+S assign track group to track. Value is formatted as TYPE,N with TYPE the track group type (4CC) and N the track group ID. A negative ID removes from track group ID -N
+.br
+.TP
+.B tkidx (string)
+.br
+S set track position in track list, 1 being first track in file
+.br
+.TP
 .B stats,-fstat
 .br
 C print filter session stats after import
@@ -2657,7 +2674,7 @@
 .br
   
 .br
-The tag_name can optionnally be prefixed with HDLR@, indicating the tag namespace 4CC, the default namespace being mdta.
+The tag_name can optionally be prefixed with HDLR@, indicating the tag namespace 4CC, the default namespace being mdta.
 .br
 The tag_value can be prefixed with:
 .br
@@ -2924,9 +2941,9 @@
 .br
 For bug reports, feature requests, more information and source code, visit https://github.com/gpac/gpac
 .br
-build: 2.2-rev655-g65430e305-master
+build: 2.4
 .br
-Copyright: (c) 2000-2022 Telecom Paris distributed under LGPL v2.1+ - http://gpac.io
+Copyright: (c) 2000-2023 Telecom Paris distributed under LGPL v2.1+ - https://gpac.io
 .br
 .SH SEE ALSO
 .LP

gpac-2.4.0.tar.gz/share/emscripten Added

gpac-2.4.0.tar.gz/share/emscripten/favicon-32x32.png Added

gpac-2.4.0.tar.gz/share/emscripten/gpac.html Added

@@ -0,0 +1,2570 @@
+<!doctype html>
+<html lang="en-us" data-theme="light">
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+    <title>Run MP4Box & GPAC in your browser !</title>
+    <link rel="icon" type="image/x-icon" href="favicon-32x32.png">
+    <link
+    rel="stylesheet"
+    href="https://cdn.jsdelivr.net/npm/@picocss/pico@2/css/pico.red.min.css"
+    />
+      <style>
+      :root {
+        font-size: 14px;
+      }
+      body {
+        font-family: arial;
+        margin: 0;
+        padding: none;
+      }
+
+      #logo {
+        display: flex;
+        justify-content: flex-start;
+        align-items: center;
+      }
+
+      #menu {
+        height: 5em;
+        color: rgb(20, 20, 20);
+      }
+
+      nav#menu li {
+        padding-top: 0;
+        padding-bottom: 0;
+      }
+
+      #menu label {
+        margin: 0;
+      }
+
+      #logo svg:first-child {
+        margin-right: .5em;
+      }
+
+      svg.icon-theme-toggle.moon g circle {
+          transform: scale(1.4);
+          transition-delay: 0s;
+      }
+
+      svg.icon-theme-toggle.moon g path {
+          transform: scale(.75);
+          transition-delay: 0s;
+      }
+      svg.icon-theme-toggle g circle, svg.icon-theme-toggle g path {
+          transform-origin: center;
+          transition: transform calc(var(--theme-toggle-duration)* .65) cubic-bezier(0,0,0,1.25) calc(var(--theme-toggle-duration)* .35);
+      }
+      svg.icon-theme-toggle :first-child path {
+          transition-duration: calc(var(--theme-toggle-duration)* .6);
+          transition-property: transform, d;
+          transition-timing-function: cubic-bezier(0,0,.5,1);
+      }
+      svg.icon-theme-toggle.moon :first-child path {
+          d: path("M-9 3h25a1 1 0 0017 13v30H0Z");
+          transition-delay: calc(var(--theme-toggle-duration)* .4);
+          transition-timing-function: cubic-bezier(0,0,0,1.25);
+      }
+      .console-wrapper { 
+        background-color: rgb(8, 8, 8);
+      }
+      .console {
+        width: 100%;
+        background-color: black;
+        color: white;
+        font-family: 'Lucida Console', Monaco, monospace;
+        overflow-y: scroll;
+        padding: 0.5rem !important;
+      }
+      .cwd {
+        color: var(--pico-primary-hover);
+        height: 8vh;
+      }
+
+      #cmd_div {
+        font-size: small;
+      }
+      #cmd {
+        height: 9vh;
+        margin: 0;
+      }
+
+      #run, #cancel {
+        width: 6em;
+      }
+
+      #fsRunForm{
+        display: flex;
+        gap: 10px;
+      }
+
+      #flush{
+        width: 8em;
+      }
+
+      #output-wrapper {
+        display: flex;
+        align-items: top;
+        gap: 0;
+        margin: none;
+        padding: none;
+      }
+      #output {
+        height: 65vh;
+        resize: vertical;
+      }
+      #output:not(readonly):is(:active,:focus) {
+        border: var(--pico-border-width) solid var(--pico-border-color);
+      }
+
+      #controls {
+        height: 10vh;
+        gap: 1em;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+      }
+      /* @FIXME overlay fullscren on canvas */
+      #fullscreen {
+        display: none;
+      }
+
+      #status {
+        font-size: small;
+        font-weight: bold;
+        align-items: center;
+        margin-bottom: 0.5em;
+        color: var(--pico-primary);
+      }
+    </style>
+  </head>
+
+  <body>
+    <nav id="menu" class="container-fluid">
+      <ul>
+        <li>
+          <a id="logo" href="https://gpac.io/" target="_blank">
+            <svg viewBox="0 0 2000 2000" width="2.5em" height="2.5em" xml:space="preserve">
+              <defs>
+                <style>
+                  .cls-1{fill:#8f182b;}
+                  .cls-2{fill:#ef524f;}
+                  .cls-3{fill:#ba2030;}
+                  .cls-4{fill:#cd2044;}
+                  .cls-5{fill:#d92f32;}
+                  .cls-6{fill:#1a1c4a;}
+                </style>
+              </defs>
+              <g transform-origin="997.7 537.6">
+                <polygon class="cls-1" points="1291.1 306.35 704.27 306.35 997.68 768.75 1291.1 306.35 1291.1 306.35"/>
+                <rect class="cls-6" x="542.76" y="761.44" width="906.68" height="906.68" rx="453.34"/>
+                <animateTransform id="logo_anim" attributeName="transform" attributeType="XML" type="scale" values="1 1; -1 1; 1 1" keyTimes="0; 0.5; 1" dur="1s" repeatCount="indefinite"/>
+              </g>
+              <g>
+                <path class="cls-2" d="M1000,330.1a666.82,666.82,0,1,1-260.67,52.52A665.55,665.55,0,0,1,1000,330.1m0-284.51C472.89,45.59,45.59,472.89,45.59,1000s427.3,954.41,954.41,954.41,954.41-427.3,954.41-954.41S1527.11,45.59,1000,45.59Z"/>
+                <path class="cls-3" d="M1408.86,1857.84a950.83,950.83,0,0,1-403.56,89.25c-527.12,0-954.42-427.3-954.42-954.41,0-188.39,54.58-364,148.81-512-1.85,5.14-3.66,10.31-5.39,15.49C121.83,627.22,81,775.58,81,932.75c0,531.12,466.61,961.67,1042.19,961.67A1124.55,1124.55,0,0,0,1408.86,1857.84Z"/>
+                <path class="cls-4" d="M1683.45,1664.24a957,957,0,0,1-274.59,193.6,1124.55,1124.55,0,0,1-285.7,36.58C547.58,1894.42,81,1463.87,81,932.75c0-157.17,40.86-305.53,113.33-436.54-.49,1.45-1,2.9-1.46,4.34,0,0,0,0,0,0s0,0,0,.05A881.86,881.86,0,0,0,118,856.32c0,523.63,460,948.1,1027.47,948.1C1342.73,1804.42,1527,1753.14,1683.45,1664.24Z"/>
+                <path class="cls-5" d="M1834.94,1464.76a956.45,956.45,0,0,1-151.47,199.46s0,0,0,0c-156.46,88.9-340.72,140.18-537.94,140.18C578.06,1804.42,118,1380,118,856.32A881.86,881.86,0,0,1,192.8,500.64a865.83,865.83,0,0,0-44,272.85c0,514.46,452,931.5,1009.5,931.5C1418.62,1705,1655.92,1614.09,1834.94,1464.76Z"/>
+              </g>
+              <g transform="translate(5.6 15)">
+                <text id="progress" stroke="black" stroke-width="0.1" fill="white" font-size="3.5" font-weight="bold"> </text>
+              </g>
+            </svg>
+            <svg id="gpac-brand" data-name="gpac-brand" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 671.14 188.48" height="1em" >
+              <defs>
+                  <style>.cls-1{fill:#1a1c4a;}</style>
+              </defs>
+              <path class="cls-1" d="M509.26,203h-79.6L415,243.58H389.86l66-187.82h27.49l65.72,187.82H523.93ZM469.46,85.08l-33,98.54h66Z" transform="translate(-64.43 -55.76)"/>
+              <path class="cls-1" d="M651,56.9c39.54,0,71,19.9,84.58,55.25H707c-9.95-22-29.33-34.3-56-34.3-38.22,0-66.77,27.75-66.77,72.53,0,44.51,28.55,72.27,66.77,72.27,26.71,0,46.09-12.31,56-34h28.54c-13.62,35.08-45,54.72-84.58,54.72-51,0-91.12-38.23-91.12-93S599.94,56.9,651,56.9Z" transform="translate(-64.43 -55.76)"/>
+              <path class="cls-1" d="M240.13,113.06H211.59c-10-21.21-29.85-33.52-55.51-33.52-38.49,0-67.3,27.76-67.3,71.75,0,43.73,28.81,71.48,67.3,71.48,35.87,0,60.48-23,64.15-59.18h-72.8V144.22h98.2v18.33c-4.19,45.3-40.07,81.69-89.55,81.69-51.32,0-91.65-38.23-91.65-93s40.33-93.22,91.65-93.22C194.57,58.07,226.51,78,240.13,113.06Z" transform="translate(-64.43 -55.76)"/>
+              <path class="cls-1" d="M336,162.84H300.88v80.74H277.05v-187H336c42.94,0,63.1,23.57,63.1,53.42C399.07,137.7,381.26,162.84,336,162.84Zm0-19.64c27.23,0,38.75-12.83,38.75-33.25,0-21.21-11.52-33.78-38.75-33.78H300.88v67Z" transform="translate(-64.43 -55.76)"/>
+              <rect class="cls-1" x="145.07" y="88.42" width="97.98" height="18.62"/>
+          </svg>
+          </a>
+        </li>
+        <li>
+          <em>experimental wasm playground</em>
+        </li>
+        <li>
+            <label>
+              <input id="threading" name="threading" type="checkbox" role="switch" />
+              <em>threaded</em>
+            </label>
+        </li>
+      </ul>
+      <ul>
+        <li>
+          <a class="contrast" aria-label="Switch to dark mode" onclick="
+            const html = document.getElementsByTagName('html')0;
+            const theme = html.getAttribute('data-theme'); 
+            const target = theme == 'light' ? 'dark' : 'light';
+            html.setAttribute('data-theme', target);
+            this.setAttribute('aria-label', `Switch to ${theme} mode`);
+            const toggle = document.querySelector('svg.icon-theme-toggle');
+            if(target == 'light'){
+              toggle.classList.remove('moon');
+            } else {
+              toggle.classList.add('moon');
+            }
+            ">
+            <svg id="icon-theme-toggle" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 32 32" fill="currentColor" class="icon-theme-toggle">
+              <clipPath id="theme-toggle-cutout"><path d="M0-11h25a1 1 0 0017 13v30H0Z"></path></clipPath>
+              <g clip-path="url(#theme-toggle-cutout)">
+                <circle cx="16" cy="16" r="8.4"></circle>
+                <path d="M18.3 3.2c0 1.3-1 2.3-2.3 2.3s-2.3-1-2.3-2.3S14.7.9 16 .9s2.3 1 2.3 2.3zm-4.6 25.6c0-1.3 1-2.3 2.3-2.3s2.3 1 2.3 2.3-1 2.3-2.3 2.3-2.3-1-2.3-2.3zm15.1-10.5c-1.3 0-2.3-1-2.3-2.3s1-2.3 2.3-2.3 2.3 1 2.3 2.3-1 2.3-2.3 2.3zM3.2 13.7c1.3 0 2.3 1 2.3 2.3s-1 2.3-2.3 2.3S.9 17.3.9 16s1-2.3 2.3-2.3zm5.8-7C9 7.9 7.9 9 6.7 9S4.4 8 4.4 6.7s1-2.3 2.3-2.3S9 5.4 9 6.7zm16.3 21c-1.3 0-2.3-1-2.3-2.3s1-2.3 2.3-2.3 2.3 1 2.3 2.3-1 2.3-2.3 2.3zm2.4-21c0 1.3-1 2.3-2.3 2.3S23 7.9 23 6.7s1-2.3 2.3-2.3 2.4 1 2.4 2.3zM6.7 23C8 23 9 24 9 25.3s-1 2.3-2.3 2.3-2.3-1-2.3-2.3 1-2.3 2.3-2.3z"></path>
+              </g>
+            </svg>
+          </a>
+        </li>
+        <li>
+          <a href="#help" target="blank">Console usage</a>
+        </li>
+        <li>
+          <a href="https://wiki.gpac.io/" target="blank">GPAC's wiki</a>
+        </li>
+        <li>
+          <a href="https://github.com/gpac/gpac/labels/wasm" target="blank">Support</a>
+        </li>
+        <li>
+          <a href="https://github.com/gpac/gpac" target="blank">Github</a>
+        </li>
+      </ul>
+    </nav>
+
+    <div id="status" class="container-fluid">
+        Downloading...  
+    </div>
+
+    <div id="output-wrapper" class="container-fluid">
+      <div class="console-wrapper">
+        <canvas id="canvas" tabindex=-1 width="0" height="0"></canvas>
+      </div>
+      <div id="output" class="console"></div>    
+    </div>
+
+    
+    <div id="cmd_div" class="container-fluid">
+      <fieldset class="console-wrapper">
+        <textarea id="cmd" class="console" placeholder="Enter a command ..." spellcheck="false" autofocus autocomplete="false"
+          onkeypress="
+          if (event.keyCode == 13) {
+            if (!is_custfs) {
+              var cwd = FS.cwd() == '/' ? '~' : FS.cwd();
+              document.getElementById('output').innerHTML += this.value + '<br>';
+            } 
+            process_command();
+            event.preventDefault();
+          }
+        " onkeyup="
+          let idx=cmd_idx;
+          if (event.keyCode == 38) { idx++; } // UP
+          else if (event.keyCode == 40) { idx--;} // DOWN
+          else {
+            if (event.keyCode == 17) ctrl_down=false;  
+            else if (event.keyCode == 18) opt_down=false;
+            if (document.activeElement === LIBGPAC'canvas') {
+              event.preventDefault();
+              set_status('canvas is def');
+            }
+            return;
+          }
+          if (idx>=cmd_history.length) return;
+          var cmd_e = document.getElementById('cmd');
+          if (idx<0) {
+            cmd_idx = -1;
+            cmd_e.value = '';
+            return;
+          }
+          cmd_idx = idx;
+          cmd_e.value = cmd_historycmd_history.length-1-idx;
+
+          if (event.ctrlKey) {
+            switch (event.keyCode) {
+              case 67: // Ctrl+C
+                setCommand('');
+                break;
+              case 76: // Ctrl+L
+                outputElement.innerHTML = '';
+                break;
+              case 65: // Ctrl+A
+                cmdElement.selectionStart = 0;
+                cmdElement.selectionEnd = 0;
+                break;
+              case 69: // Ctrl+E
+                cmdElement.selectionStart = cmdElement.value.length;
+                cmdElement.selectionEnd = cmdElement.value.length;
+                break;
+            }
+          }
+      " onkeydown="
+            if (event.keyCode == 17) ctrl_down=true;
+            else if (event.keyCode == 18) opt_down=true;
+            if (document.activeElement === LIBGPAC'canvas') 
+            {
+              event.preventDefault();
+            }
+      "></textarea>
+      </fieldset>
+    </div>
+    
+    
+    <div id="controls" class="container-fluid">
+
+      <select disabled id="commands" aria-label="select an example">
+        <option selected="" value="-1">Select an example</option>
+      </select>
+
+      <input id="run" type="button" value="Run &#10550;" disabled/>
+      <input id="cancel" type="button" value="Cancel" hidden/>
+      
+      <form id="fsRunForm" hidden>
+
+        <label>
+          <input id="reports" type="checkbox" role="switch" onclick="GPAC.toggle_reporting(4);"/>
+          reporting
+        </label>
+
+        <fieldset role="group">
+          <select name="flush" aria-label="Select Flush behavior on abort" id="flush">
+            <option value="1">Full Flush</option>
+            <option value="2">Fast Flush</option>
+            <option value="3" selected>No Flush</option>
+          </select>
+          <input id="abort" type="button" name="abort" value="Abort" onclick="
+            let el = document.getElementById('flush');
+            let val = el.optionsel.selectedIndex.value;
+            GPAC.toggle_reporting(val);
+            console.log(val);
+          " />
+        </fieldset>
+
+      </form>
+
+      <input type="button" value="Fullscreen" id="fullscreen" onclick="
+        LIBGPAC'canvas'.requestFullscreen();
+      ">
+
+    </div>
+
+    <div id="help" class="container-fluid">
+      <h2>Console usage</h2>
+      <p>This page allows running the <strong>MP4Box</strong> and <strong>GPAC</strong> applications in web browsers.</p>
+      <p>The webassembly build is experimental. It tries to uses webcodecs whenever decoding or encoding is involved. If webcodecs can't be used, it falls back to software implementation running in wasm.</p>
+      <p>Select an exemple and make edits, or type in your own command. Finally press <code>Enter</code> key or click the <code>Run</code> button.</p>
+      <p>Remote <strong>DASH</strong> and <strong>HLS</strong> playlists can be used as input, provided that they are hosted with proper <strong>CORS</strong> configurations.</p>
+      <p>The console also provides basic shell file system, commands to import media export media files, and support advanced gpac configuration, as described below:</p>
+      <h3>
+        File import / export
+      </h3>
+      <ul>
+        <li><code>imp -d N</code>: imports files or directory <code>-d</code> to local filesystem file.</li>
+        <li><code>imp</code> : imports single file to current dir using its native name</li>
+        <li><code>imp NAME</code> : imports single file as <code>NAME</code></li>
+        <li><code>imp NAME/</code> : imports one or more files in <code>NAME</code> using their native name</li>
+        <li><code>imp -d</code> : imports a directory to current dir</li>
+        <li><code>imp -d NAME</code> : imports a directory as <code>NAME</code></li>
+        <li><code>exp NAME</code>: exports given file <code>NAME</code></li>
+      </ul>
+
+      <p><a href="https://developer.mozilla.org/en-US/docs/Web/API/IndexedDB_API">IndexedDB</a> is used for persistent storage, mounted at <code>/idbfs</code>. Typing any command will synchronize the file system.</p>
+      
+      <h4>Handling large files</h4>
+      
+      <p>The variable <code>$(NAME)</code> can be used to design a file not on Emscripten's file system.
+      The file will be handled as a stream (not copied). This is the recommended methods for handling large files.</p>
+      
+      <p>If <code>NAME</code> is an absolute URL other than <code>file://</code> scheme:
+      </p><ul>
+        <li>
+          if used for an input, it will be pulled progressively using <a href="https://developer.mozilla.org/en-US/docs/Web/API/Fetch_API">Fetch API</a>.
+        </li>
+        <li>
+          if used for an output, it will be pushed progressively using <a href="https://developer.mozilla.org/en-US/docs/Web/API/Fetch_API">Fetch API</a>. If writable streams fail, the file will be stored in memory until final PUT or canceled.<p></p>
+        </li>  
+      </ul>
+      
+      <p>Otherwise, <code>NAME</code> designs a file to be picked on the user's file system
+        </p><ul>
+          <li>
+            if used for an input, a file picker will be shown and status text will indicate the corresponding <code>NAME</code>
+          </li>
+          <li>
+            if used for an output, a file saver will be shown with the given <code>NAME</code>. If writable stream failure, the file will be stored in memory until final write or canceled.<p></p>
+          </li>
+        </ul>
+      
+      <p>For output files, the extension will be used to derive the output format, e.g. <code>($file.ts)</code> will use MPEG-2 TS.
+      Use <code>$(file):ext=ts</code> to override format if desired. <em>This syntax CANNOT work when editing files (MP4Box, dasher context, etc...).</em></p>
+    
+
+    <h3>Shell commands</h3>
+    
+    <ul>
+      <li><code>↑</code><code>↓</code> : Use up &amp; down arrows can be used for command history.</li>
+      <li><code>ls N</code>: list files in <code>N</code> or in current directory if <code>N</code> not set or print file N info - use 'ls -l N' for details.</li>
+      <li><code>cd NAME</code>: changes current working directory, use Emscripten home if <code>NAME</code> not provided</li>
+      <li><code>cwd</code>: prints current working directory</li>
+      <li><code>clear</code>: clears console output</li>
+      <li><code>mkdir NAME</code>: creates directory <code>NAME</code></li>
+      <li><code>rm NAME</code>: removes file or empty directory <code>NAME</code></li>
+      <li><code>mv N1 N2</code>: moves file <code>N1</code> to <code>N2</code></li>
+      <li><code>cp N1 N2</code>: copies file <code>N1</code> to <code>N2</code> (no recursive copy support)</li>
+      <li><code>show NAME</code>: shows content of file <code>NAME</code></li>
+      <li><code>edit NAME</code>: edits content of file <code>NAME</code>, use <code>save</code> to save and close, <code>close</code> to discard and close</li>
+    </ul>
+    
+    <h3>Configuration commands</h3>
+    
+    <ul>
+      <li class="threaded"><code>worker</code>: toggles worker mode on or off (off)</li>
+      <li class="threaded"><code>threads</code>: views number of pre-allocated workers</li>
+      <li><code>stack</code>: prints available size in stack</li>
+      <li><code>clearh N</code>: clears command history. If <code>N</code> is set, only keeps last <code>N</code> items, otherwise clears everything</li>
+      <li><code>fetch</code>: toggles fetch support in libgpac</li>
+      <li><code>bsize</code>: sets block size used to read from local disk (default 10000)</li>
+      <li><code>eval</code>: evaluates JS code</li>
+    </ul>
+    
+    <h4>Performances</h4>
+    
+    <p>The default behaviour for gpac app is to run on the browser/worker main loop in non-blocking mode, running the session at most 100 times before returning control.</p>
+    
+    <p>This can be configured when calling gpac (see <code>gpac -hx</code>), for example:
+      </p><ul>
+        <li>
+          <code>-step=-1</code> will block the main browser/worker thread (WILL DEADLOCK if some filters use JS promises or other async tools)
+        </li>
+        <li>
+          <code>-step=0</code> will use browser defaults for requestAnimationFrame frequency
+        </li>
+        <li>
+          <code>-step=100</code> will request callback every 10 ms
+        </li>
+        <li>
+          <code>-step=100:1000</code> will request callback every 10 ms, calling at most 1000 times the session<p></p>
+        </li>
+      </ul>
+   
+    <p class="threaded">When running without worker, internal threading of filters (e.g. ffmpeg &amp; co) will be disabled if the session runs only on the main thread.</p>
+    
+    <p class="threaded">Use <code>-threads=N</code> with <code>N</code> &gt; 0 (typically <code>-threads=1</code>) to enable threading in these filters.</p>
+    
+    </div>
+
+    <script>
+      const cmd_history = ;
+      const statusElement = document.getElementById('status');
+      const progressTxt = document.getElementById('progress').childNodes0;
+      const animElement = document.getElementById('logo_anim');
+      const runElement = document.getElementById('run');
+      const cancelElement = document.getElementById('cancel');
+      const flushElement = document.getElementById('flush');
+      const cmdElement = document.getElementById('cmd');
+      const reportElement = document.getElementById('reports');
+      const selCmdElement = document.getElementById('commands');
+      const outputElement = document.getElementById('output');
+      const abortElement = document.getElementById('abort');
+      const threadingElement = document.getElementById('threading');
+
+      let console_bck = '';
+      let cmd_idx = -1;
+      let ctrl_down=false;
+      let opt_down=false;
+      let use_idbfs = false;
+      let edit_name = null;
+      let is_eval = false;
+      let is_bsize = false;
+      let is_custfs = false;
+      let fsess = null;
+      let prev_filter = null;
+      let defer_mode = false;
+      let suspend_sess = false;
+      let fs_steps = 20;
+      let FS = null;
+      
+      let STATIC_SRC;
+      if (window.location.origin.indexOf('.gpac.io')>0) STATIC_SRC = `${window.location.origin}/data`;
+      else if (window.location.origin.startsWith('http://')) STATIC_SRC = 'http://wasm.gpac.io/data';
+      else STATIC_SRC = 'https://wasm.gpac.io/data';
+
+      const examples = 
+        {
+          "name": "media playback",
+          "cmd": `gpac -graph -i ${STATIC_SRC}/video_180.mp4 -i ${STATIC_SRC}/audio.mp4 aout vout`,
+          "info": '<a href="https://wiki.gpac.io/Player/filters-playback/">simple playback</a> of audio and video files. The <code>-graph</code> option prints out the internal graph showing all filters involved in the media processing pipeline.'
+        },
+        {
+          "name": "describe streams available in a media",
+          "cmd": `gpac -i ${STATIC_SRC}/video_180.mp4 inspect:full`,
+          "info": 'inspect a media and print its <a href="https://wiki.gpac.io/Filters/Rearchitecture/?h=pid#pid-description">PIDs</a> information, eg. information about the streams it contains.'
+        },
+        {
+          "name": "extract the first 2 seconds of a video",
+          "cmd": `gpac -i ${STATIC_SRC}/video_180.mp4 reframer:xs=0:xe=T00:00:02 -o xs0-xe02.mp4`,
+          "info": 'extract the first 2 seconds of a video.'
+        },
+        {
+          "name": "trick play: mux all IDR frames to a single MP4",
+          "cmd": `gpac -logs=all@info -i ${STATIC_SRC}/video_180.mp4 @#Video reframer:saps=1 @ -o trick_play.mp4`,
+          "info": "creates a video containing only the IDR frames (SAP=1) from the input source."
+        },
+        {
+          "name": "download remote DASH content",
+          "cmd": `gpac -stats -i ${STATIC_SRC}/dash/bbb_30fps.mpd dashin:forward=file -o dump/$File$:dynext`,
+          "info": null
+        }
+      ;
+      examples.forEach((el, i) => {
+        if (el.cmd){
+          let opt = document.createElement("option");
+          opt.text = el.name;
+          opt.value = i;
+          selCmdElement.add(opt);
+        }
+      });
+
+      selCmdElement.onchange = () => {
+        let idx = parseInt(selCmdElement.value);
+        if (idx<0) return;
+        let item = examplesidx;
+        setCommand(item.cmd.trim());
+      };
+
+      function setCommand(value) {
+        cmdElement.value = value == '' ? null : value;
+      };
+
+      function onGpacReady() {
+        cmdElement.removeAttribute("disabled");       
+        selCmdElement.removeAttribute("disabled");
+        runElement.removeAttribute("disabled");
+        cmdElement.setAttribute("placeholder", "Enter a command ...");
+        outputElement.setAttribute("aria-busy", "false");
+        outputElement.innerHTML += '<span class="version">GPAC' + LIBGPAC.version() + '</span><br><br>' + consolePrefix();
+      };
+
+      function toggle_eval_mode() {
+        is_eval = !is_eval;
+        let cmdDiv = document.getElementById('cmd_div');
+        if (is_eval){
+          outputElement.readonly = false;
+          outputElement.setAttribute('contenteditable', true);
+          outputElement.innerText = '';
+          set_status('Edit your JS and click run to evaluate, cancel to abort');
+          runElement.hidden = false;
+          cancelElement.hidden = false;
+          cmdDiv.hidden = true;
+          selCmdElement.hidden = true;
+          fsRunForm.hidden = true;
+          reportElement.hidden = true;
+        } else {
+          outputElement.setAttribute('contenteditable', false);
+          outputElement.readonly = true;
+          runElement.hidden = false;
+          cancelElement.hidden = true;
+          cmdDiv.hidden = false;
+          selCmdElement.hidden = false;
+          fsRunForm.hidden = true;
+          reportElement.hidden = false;
+        }
+        displayStatus('');
+      }
+
+      function run_session() {
+        let i=fs_steps;
+        while (i) {
+          let e = LIBGPAC.fs_run(fsess);
+          if (e) break;
+          i--;
+        }
+        if (suspend_sess || LIBGPAC.fs_last_task(fsess)) {
+            animElement.stop();
+            if (!suspend_sess) set_status('Session done');
+            suspend_sess=false;
+        } else {
+          setTimeout(run_session, 0);
+        }
+      }
+
+      //start anim on logo
+      animElement.start = function() {
+          if (! this.started) {
+            this.setAttribute('dur', '2s');
+            this.beginElement();
+            this.started=true;
+          }
+      };
+      //stop anim on logo
+      animElement.stop = function() {
+        this.endElementAt(0);
+        this.setAttribute('dur', 'indefinite');
+        this.started=false;
+      };
+
+      runElement.onclick = function() {
+        if (is_eval){
+          run_script();
+        } else {
+          if (!GPAC.running){
+            if ( cmdElement.value.trim() == '' ) return;
+            process_command();
+            setCommand('');
+            return;
+          }
+          if(GPAC.running){
+            GPAC.toggle_reporting(flushElement.value);      
+          }
+        }
+      }
+      cancelElement.onclick = toggle_eval_mode
+
+      //create missing dirs in an output path 
+      function check_file_dir(fname, is_directory) {
+        let paths = fname.split('/');
+        let path ='/';
+        while (paths.length) {
+          if (!paths0.length) {
+            paths.shift();
+            continue;
+          }
+          path += paths0;
+          if ((paths.length==1) && !is_directory) break;
+          if (paths.length>1) path+='/';
+          try {
+              FS.mkdir(path);
+          } catch(e) {
+          }
+          paths.shift();
+        }
+      }
+      //set status
+      function set_status(str)
+      {
+       statusElement.innerHTML = str;
+      }
+      function do_log(str) {
+        LIBGPAC.print(str);
+      }
+      function do_log_err(str) {
+        LIBGPAC.printErr(str);
+      }
+
+      //load command history from /idbfs/.gpac/history.txt
+      function load_history() {
+        let s = FS.analyzePath('/idbfs', true);
+        if (s.error) {
+          set_status('IDBFS not mounted');
+          return;
+        }
+        use_idbfs = true;
+        s = FS.analyzePath('/idbfs/.gpac', true);
+        if (s.error) FS.mkdir('/idbfs/.gpac');
+        s = FS.analyzePath('/idbfs/.gpac/history.txt', true);
+        if (s.error) return;
+        let strs = FS.readFile('/idbfs/.gpac/history.txt', { encoding: "utf8"}).split('\n');
+        strs.forEach(s => { if (s.length) cmd_history.push(s); });
+      }
+      //save command history to /idbfs/.gpac/history.txt
+      function save_history() {
+        if (!use_idbfs) {
+          return;
+        }
+        let txt='';
+        cmd_history.forEach( c => { txt += c + '\n';});
+        FS.writeFile('/idbfs/.gpac/history.txt', txt);
+        FS.syncfs(false, () => {
+          if (arguments.length) {
+            err('Failed to sync IDBFS: ' + arguments0);
+          }
+        });
+      }
+
+      //runs a given script
+      function run_script(cmd) {
+        toggle_eval_mode();
+        var js_txt = outputElement.innerText;
+        outputElement.removeAttribute('contenteditable');
+        outputElement.innerText = '';
+        set_status('');
+        err = '';
+        console.log('text is ' + js_txt);
+        if (!cmd.length || (cmd=='go')) {
+            var fun = Function(js_txt);
+            try {
+              fun();
+            } catch (e) {
+              err = e.message;
+            }
+        }
+        return com_exit(err);
+      }
+
+      function set_text(txt)
+      {
+          if (txt.length) outputElement.innerText += txt;
+          else outputElement.innerText = '';
+      }
+
+      //utility to log command error and append '/cwd/ %' at end of textArea
+      function com_exit() {
+        if (arguments.length && arguments0.length) {
+           do_log('Error: ' + arguments0); 
+        }
+        GPAC.no_log = true;
+        outputElement.innerHTML += `<br>${consolePrefix()}`;
+        selCmdElement.hidden = false;
+        fsRunForm.hidden = true;
+        runElement.hidden = false;
+        setCommand('');
+      }
+
+      const onCommandRun = (cmd) => {
+        // reset select example 
+        selCmdElement.value = -1;
+        selCmdElement.hidden = true;
+        runElement.hidden = true;
+        fsRunForm.removeAttribute("hidden");
+        set_status('');
+      };
+
+      //our basic terminal emulation
+      function process_command() {
+       const cmd = cmdElement.value;
+        if (cmd.trim() == ''){
+          return;
+        }
+        onCommandRun(cmd);
+        GPAC.no_log = false;
+
+       args = cmd.trim().split(' ');
+
+       //evaluates a script - turns textArea in write mode and wait for go/cancel
+       if (args0=='eval') {
+          toggle_eval_mode();
+          return;
+       }
+
+       //in eval mode, run
+       if (is_eval) {
+        run_script(cmd);
+        return;
+       }
+              
+       if (is_custfs) {
+        run_prompt(cmd);
+        return;
+       }
+
+       if (is_bsize) {
+        let s = parseInt(cmd);
+        is_bsize = false;
+        set_status('');
+        if (s != s) return com_exit('Inavlid value ' + cmd);
+        GPAC.read_block_size = s;
+        return com_exit();
+       }
+
+       //nothing to do
+       if (!cmd.length) {
+        return com_exit();
+       }
+
+       //in edit mode, save/discard content
+       if (edit_name != null) {
+        let do_save = false;
+        if (args0=='save') {
+          do_save = true;
+        } else if (args0 != 'close') {
+           set_status('Use save or close to exit editor, not ' + args0);
+           return;
+        }
+        outputElement.removeAttribute('contenteditable');
+        if (do_save) {
+          FS.writeFile(edit_name, outputElement.innerText);
+        }
+        outputElement.innerHTML = '';
+        edit_name = null;
+        return com_exit();
+       }
+
+       //save history
+       cmd_history.push(cmd);
+       save_history();
+       cmd_idx = -1;
+       
+       //file or directory import
+       if (args0=='imp') {
+        let is_dir = false;
+        let is_mdir = false;
+        args.shift();
+        if (args.length && (args0=='-d')) {
+          is_mdir = true;
+          args.shift();
+        }
+        let file_name = null;
+        if (args.length) file_name = args0;
+
+        if (file_name && (file_name.charAt(file_name.length-1) == '/'))
+          is_dir = true;
+
+        if (file_name && !is_dir && is_mdir) {
+          file_name += '/';
+        }
+        if (is_mdir) is_dir=true;
+
+        if (file_name)
+          check_file_dir(file_name, is_dir);
+
+        let input = document.createElement('input'); 
+        input'type' = 'file';
+        if (!is_mdir) {
+          input.multiple = is_dir;
+        } else {
+          input.directory = true;
+          input.mozDirectory = true;
+          input.webkitdirectory = true;
+        }
+        input.click();
+        input.onchange = function() {
+          for (const file of event.target.files) {
+            if (file.name.charAt(0) == '.') continue;
+            let read = new FileReader();
+            let fname = file_name; //can be null
+            if (is_dir) {
+              if (is_mdir) {
+                if (fname) {
+                  //strip dir name
+                  let name = file.webkitRelativePath.substring(file.webkitRelativePath.indexOf("/") + 1);
+                  fname += name;
+                } else {
+                  //copy as is
+                  fname = file.webkitRelativePath;                   
+                }
+              } else {
+                fname += file.name;
+              }
+            }
+            if (!fname) fname = file.name;
+            read.addEventListener('loadend', (e) => {
+              const uint8_view = new Uint8Array(read.result);
+              if (is_mdir) check_file_dir(fname, false);
+              FS.writeFile(fname, uint8_view);
+            });
+            read.readAsArrayBuffer(file);
+          }
+        }
+        return com_exit();
+       }
+       //file or directory listing
+       if (args0=='ls') {
+        let list=0;
+        if ((args.length>1) && (args1=='-l')) {
+          list=1;
+          args.splice(1, 1);
+        }
+        else if ((args.length>1) && (args1=='-la')) {
+          list=2;
+          args.splice(1, 1);
+        }
+        var d = ((args.length>1) && args1.length) ? args1 : FS.cwd();
+
+        try {
+
+        let stats = FS.stat(d);
+        if (FS.isDir(stats.mode)) {
+          var children = FS.readdir(d, { parent: false });
+          //do_log('Contents of ' + d + ':');
+          children.forEach(i => {
+            let text;
+            if ((i=='.') || (i=='..')) return;
+            text=i;
+            if (list) {
+              stats = FS.stat(d+'/'+i);
+              if (list==1) {
+                if (FS.isDir(stats.mode)) text += ' directory';
+                else text += ' size ' + stats.size;
+
+                text += ' modified ' + stats.mtime.toUTCString();
+              } else {
+                  text = JSON.stringify(stats);
+              }
+            }
+            do_log(text);
+          });
+        } else {
+          let text;
+          if (list==2) text = JSON.stringify(stats);
+          else {
+            text = '' + stats.size + ' modified ' + stats.mtime;
+          }
+          do_log(text);
+        }
+        return com_exit();
+        } catch (e) {
+          return com_exit('No such file');
+        }
+       }
+       //get current working directory
+       if (args0=='cwd') {
+        do_log(FS.cwd());
+        return com_exit();
+       }
+       //change directory
+       if (args0=='cd') {
+        var d = (args.length>1) ? args1 : '/home/web_user';
+        FS.chdir(d);
+        return com_exit();
+       }
+       //creates directory
+       if (args0=='mkdir') {
+        if (args.length>1)
+          FS.mkdir(args1);
+        return com_exit();
+       }
+       //remove file
+       if (args0=='rm') {
+        if (args.length<2) return com_exit('Missing name');
+        let stats = FS.stat(args1);
+        if (FS.isDir(stats.mode)) FS.rmdir(args1);
+        else FS.unlink(args1);
+        return com_exit();
+       }
+       //rename file
+       if (args0=='mv') {
+        if (args.length<3) return com_exit('Missing file names');
+        let stats = FS.stat(args1);
+        if (FS.isDir(stats.mode)) return com_exit(args1 + ' is a directory');
+        FS.rename(args1, args2);
+        return com_exit();
+       }
+       //copy file
+       if (args0=='cp') {
+        if (args.length<3) return com_exit('Missing file names');
+        let stats = FS.stat(args1);
+        if (FS.isDir(stats.mode)) return com_exit(args1 + ' is a directory');
+        FS.writeFile(args2, FS.readFile(args1, {encoding: "binary"}));
+        return com_exit();
+       }
+       //export file to user file system
+       if (args0=='exp') {
+        if (args.length<2) return com_exit('Missing file name');
+        let stats = FS.stat(args1);
+        if (FS.isDir(stats.mode)) return com_exit(args1 + ' is a directory');
+        var blob = new Blob(FS.readFile(args1, {encoding: "binary"}), {type: "application/octet-stream"});
+        var a = document.createElement("a");
+        var url = window.URL.createObjectURL(blob);
+        a.href = url;
+        a.download = args1;
+        a.click();
+        window.URL.revokeObjectURL(url);
+        return com_exit();
+       }
+       //show file
+       if (args0=='show') {
+        if (args.length<2) return com_exit('Missing file name');
+        let stats = FS.stat(args1);
+        if (FS.isDir(stats.mode)) return com_exit(args1 + ' is a directory');
+        let str = FS.readFile(args1, { encoding: "utf8"});
+        do_log(str);
+        return com_exit();
+       }
+       //edit file
+       if (args0=='edit') {
+        if (args.length<2) return com_exit('Missing file name');;
+        let stats = FS.stat(args1);
+        if (FS.isDir(stats.mode)) return com_exit(args1 + ' is a directory');
+        let str = FS.readFile(args1, { encoding: "utf8"});
+        edit_name = args1;
+        if (outputElement) {
+          outputElement.setAttribute('contenteditable', true);
+          outputElement.innerText = str;
+        }
+        return;
+       }
+       //worker tag set
+       if (args0=='worker') {
+          if (!LIBGPAC.has_threads) {
+            LIBGPAC.gpac_worker=false;
+            return com_exit('GPAC compiled without threads');
+          }
+          LIBGPAC.gpac_worker = !LIBGPAC.gpac_worker;
+          do_log('Worker Thread for main: ' + (LIBGPAC.gpac_worker ? 'on' : 'off') );
+          return com_exit();
+       }
+       //print stack free size
+       if (args0=='stack') {
+          const get_stack_free = LIBGPAC.cwrap('emscripten_stack_get_free', 'number', )
+          do_log('Free stack: ' + get_stack_free() + ' bytes');
+          return com_exit();
+       }
+       //clear console
+       if (args0=='clear') {
+        if (outputElement) outputElement.innerText = '';
+        return com_exit();
+       }
+       //clear history
+       if (args0=='clearh') {
+          if (args.length>1)
+              cmd_history = cmd_history.slice(- parseInt(args1) );
+          else
+              cmd_history=;
+          save_history();
+          return com_exit();
+       }
+       //show allocated threads - usefull to check how many threads were indeed created by the previous run
+       if (args0=='threads') {
+          if (LIBGPAC.has_threads) {
+            do_log('Threads Pool Size: ' + LIBGPAC'PThread'.unusedWorkers.length);
+            return com_exit();
+          }
+          return com_exit('GPAC compiled without threads');
+       }
+
+       //worker tag set
+       if (args0=='fetch') {
+          LIBGPAC.gpac_fetch = !LIBGPAC.gpac_fetch;
+          do_log('libgpac fetch() ' + (LIBGPAC.gpac_fetch ? 'on' : 'off') );
+          return com_exit();
+       }
+       if (args0=='fs') {
+            set_status('Starting interactive graph builder');
+            set_text('');
+            defer_mode=true;
+            fs_steps=20;
+            is_custfs = true;
+            return;
+       }
+       if (args0=='bsize') {
+          set_status('Enter new block size to use (current ' + GPAC.read_block_size + ')');
+          is_bsize = true;
+          return;
+       }
+       //set logs at runtime (doesn't work when video output is used, text input is always directed to SDL in this case...)
+       if (args0=='logs') {
+         if (!GPAC.running) {
+          do_log('GPAC not running');
+          return;
+        }
+        if (args.length>1) {
+          LIBGPAC.log_set_tools_levels(args1, 1);
+        }
+        return;
+       }
+       //
+       //end of commands
+
+       //
+       //run gpac or mp4box
+       if (GPAC.running) {
+          set_status('Already running, ignoring command');
+          return;
+       }
+
+       let will_block=false;
+       let is_mp4box=false;
+       if (args0.toLowerCase()=='gpac') {
+          args.shift();
+       }
+       else if (args0.toLowerCase()=='mp4box') {
+          args.shift();
+          is_mp4box = true;
+          if (LIBGPAC.gpac_worker==false) will_block=true;
+       }
+       //when using vout or compositor in standalone mode, don't use a worker thread since we run through emscripten_main_loop
+       let use_video=false;
+       let has_report = false;
+       for (let i=0; i<args.length; i++) {
+        a = argsi;
+        if (a.includes('vout') || a.includes('-play') || a.includes('-gui')) {
+          use_video=true;
+        } else if (a.includes('compositor')) {
+          if (a.includes('base') || a.includes('gui')) use_video=true;
+        } else if ((LIBGPAC.gpac_worker==false) && (a.startsWith('-step='))) {
+         var val = parseInt(a.substring(6));
+         if (val<0) will_block = true;
+        }
+        else if (a.startsWith('-r')) {
+          has_report = true;
+        }
+        //input file io
+        else if (a=='-ib') {
+          argsi = '-i';
+          let f = argsi+1;
+          let fio = GFIO.create(f, 1);
+          let wrap_url = fio.gfio_url();
+          argsi+1 = wrap_url;
+          i++;
+        }
+        //output file io
+        else if (a=='-ob') {
+          argsi = '-o';
+          let f = argsi+1;
+          let fio = GFIO.create(f, 2);
+          let wrap_url = fio.gfio_url();
+          argsi+1 = wrap_url;
+          i++;
+        }
+        //look for automated wrappers $(NAME), create fileIOs and replace names
+        else {
+          let select_start = a.indexOf('$(');
+          let select_end = (select_start>=0) ? a.indexOf(')') : 0;
+          if (select_end) {
+            let hint = a.substring(select_start, select_end+1);
+            let fio = GFIO.create(hint, 0); //can only use this for read mode at the time being
+            let wrap_url = fio.gfio_url();
+            argsi = a.replace(hint, wrap_url);
+          }
+        }
+       }
+       function run_prompt(cmd) {
+          let args = cmd.split(' ');
+          if (!args.length) return;
+          if (args0=='q') {
+            is_custfs=false;
+            if (fsess) {
+              LIBGPAC.fs_del(fsess);
+              fsess=null;
+              LIBGPAC.uninit();
+              set_status("leaving interactive mode");
+            }
+            return;
+          }
+          if (args0=='d') {
+            if (!fsess) {
+              defer_mode = !defer_mode;
+              set_status("will use defer linking mode: " + (defer_mode ? "yes" : "no"));
+            }
+            return;
+          }
+          if (args0=='s') {
+            if (args.length>1) {
+              fs_steps = parseInt(args1);
+              if (fs_steps<=0) fs_steps=1;
+              set_status("will use " + fs_steps + " steps per callback");
+            }
+            return;
+          }
+          if (args0=='a') {
+            if (args.length<2) return set_status('Invalid add command');
+            if (!fsess) {
+              let flag = 1<<2; //always run async
+              if (defer_mode) flag |= (1<<13);
+
+              LIBGPAC.init(0, null);
+              fsess = LIBGPAC.fs_new_defaults(flag);
+              set_status("Creating filter session in non-blocking mode" + (defer_mode ? ' - deferred linking' : '') );
+            }
+            if (prev_filter && defer_mode) {
+              LIBGPAC.filter_reconnect_output(prev_filter, null);
+              prev_filter=null;
+            }
+
+            let fdesc = args1; 
+            let select_start = fdesc.indexOf('$(');
+            let select_end = (select_start>=0) ? fdesc.indexOf(')') : 0;
+            if (select_end) {
+              let hint = fdesc.substring(select_start, select_end+1);
+              let fio = GFIO.create(hint, 0); //can only use this for read mode at the time being
+              let wrap_url = fio.gfio_url();
+              fdesc = fdesc.replace(hint, wrap_url);
+            }
+
+            const e = LIBGPAC._malloc(LIBGPAC.HEAP32.BYTES_PER_ELEMENT);
+            LIBGPAC.HEAP32.set(0, e/LIBGPAC.HEAP32.BYTES_PER_ELEMENT);
+            let f;
+            if (fdesc.startsWith('src=')) {
+              fdesc = fdesc.substring(4);
+              f = LIBGPAC.fs_load_source(fsess, fdesc, null, null, e);
+            } else if (fdesc.startsWith('dst=')) {
+              fdesc = fdesc.substring(4);
+              f = LIBGPAC.fs_load_destination(fsess, fdesc, null, null, e);
+            } else {
+              f = LIBGPAC.fs_load_filter(fsess, fdesc, e);
+            }
+            prev_filter = f;
+            let res = LIBGPAC.getValue(e, 'i32');
+            LIBGPAC._free(e);
+            set_status("added filter "+args1+ " returned " + res);
+            return;
+          }
+          if (args0=='r') {
+            if (!fsess) return set_status('No valid session, add a filter first');
+            animElement.start();
+            run_session();
+            return;
+          }
+          if (args0=='c') {
+            if (fsess) {
+              suspend_sess = true;
+              set_status("Suspending session");
+            }
+            return;
+          }
+
+
+          if (args0=='p') {
+            let idx=0;
+            let n;
+            if (!fsess) return set_status('No valid session, add a filter first');
+            if (!prev_filter) return set_status('No filter loaded, cannot probe');
+            if (args.length<2) return set_status('No name provided');
+            if (args.length>2) {
+              idx=parseInt(args1);
+              n=args2;
+            } else {
+              n=args1;
+            }
+            var p_str = LIBGPAC._malloc(LIBGPAC.HEAP32.BYTES_PER_ELEMENT);
+            var res = LIBGPAC.filter_probe_link(prev_filter, idx, n, p_str);
+            if (!res) {
+              var c_str = LIBGPAC.getValue(p_str, "i32");
+              var chain = LIBGPAC.UTF8ToString(c_str);
+              LIBGPAC.free(c_str);
+              set_text('resolved chain from ' + LIBGPAC.filter_get_name(prev_filter) + ' to ' + n + ' is: ' + chain);
+            }
+            LIBGPAC._free(p_str);
+            return set_status(res ? ('Failed'+res) : 'OK');
+          }
+          if (args0=='l') {
+            let idx=-1;
+            let n;
+            if (!fsess) return set_status('No valid session, add a filter first');
+            if (!prev_filter) return set_status('No filter loaded, cannot check destinations');
+            if (args.length>1) {
+              idx=parseInt(args1);
+            }
+            var p_str = LIBGPAC._malloc(LIBGPAC.HEAP32.BYTES_PER_ELEMENT);
+            var res = LIBGPAC.filter_get_destinations(prev_filter, idx, p_str);
+            if (!res) {
+              var c_str = LIBGPAC.getValue(p_str, "i32");
+              var chain = LIBGPAC.UTF8ToString(c_str);
+              LIBGPAC.free(c_str);
+              set_text('possible destinations for ' + LIBGPAC.filter_get_name(prev_filter) +': ' + chain);
+            }
+            LIBGPAC._free(p_str);
+            return set_status(res ? ('Failed'+res) : 'OK');
+          }
+          if (args0=='v') {
+            if (!fsess) return set_status('No valid session, add a filter first');
+            LIBGPAC.fs_print_stats(fsess);
+            LIBGPAC.fs_print_connections(fsess);
+            return;
+          }
+          if (args0=='i') {
+            if (!prev_filter) return set_status('No current fiter, add a filter first');
+            txt='Filter ' + LIBGPAC.filter_get_name(prev_filter) + ' PID info:\n';
+
+            let c_i =  LIBGPAC.filter_get_ipid_count(prev_filter);
+            if (c_i) {
+              for (let idx=0; idx<c_i; idx++) {
+                let pid = LIBGPAC.filter_get_ipid(prev_filter, idx);
+                txt+='Input PID ' + (idx+1) + ' Properties:\n';
+                let props = LIBGPAC.filter_pid_get_props(pid);
+                txt+=JSON.stringify(props);
+                txt+='\n\n';
+              }
+            }
+            let c_o =  LIBGPAC.filter_get_opid_count(prev_filter);
+            if (c_o) {
+              for (let idx=0; idx<c_o; idx++) {
+                let pid = LIBGPAC.filter_get_opid(prev_filter, idx);
+                txt+='Output PID ' + (idx+1) + ' Properties:\n';
+                let props = LIBGPAC.filter_pid_get_props(pid);
+                txt+=JSON.stringify(props);
+                txt+='\n\n';
+              }
+            }
+            if (!c_i && !c_o) txt+='No PIDs - run session';
+            set_text(txt);
+            return;
+          }
+
+          set_status("Unknown command "+cmd);
+          
+          let help="Possible commands:\n";
+          help+= "- d: set defer linking mode (default: "+ defer_mode + ")\n";
+          help+= "- s: set number of steps before returning control to JS (default: "+ fs_steps + ")\n";
+          help+= "- a DESC: add filter, use src=URL for source, dst=URL for sinks. $(name) replacement rules are allowed\n";
+          help+= "- r: run or resume session\n";
+          help+= "- c: suspend session while running\n";
+          help+= "- v: view connections and stats\n";
+          help+= "\nThe following only apply to the last added filter:\n";
+          help+= "- i: print pid properties\n";
+          help+= "- p pid_idx=0 DESC: probe resolution from pid with index pid_idx of last added filter to filter description DESC\n";
+          help+= "- l pid_idx=-1: list possible destinations for pid of index pid_idx (-1 for all pids) of last added filter\n";
+          help+= "\n";
+          set_text(help);
+       }
+
+
+       let controlElement = document.getElementById('controls');
+       // controlElement.hidden = is_mp4box ? true : false;
+       // controlElement.style.display = is_mp4box ? 'none' : 'inline-block';
+       flushElement.selectedIndex = 0;
+       reportElement.checked = has_report;
+       let fsElement = document.getElementById('fullscreen');
+       fsElement.hidden = use_video ? false : true;
+
+       GPAC.running = true;
+       set_status('Running ' + (is_mp4box ? "MP4Box " : "gpac ") + cmd);
+       animElement.start();
+
+       if (use_video && LIBGPAC.gpac_worker) {
+          LIBGPAC.gpac_worker = false;
+          GPAC.restore_worker = true;
+          //cannot run SDL + main_loop in thread unless for offscreen canvas
+          do_log('Main video output used, disabling worker mode for this run');
+       }
+
+       //our own version of callMain to deal with:
+       //- stack save/restore missing in emscripten callMain
+       //- even if it where there, we may exit aynchronously and can only restore stack on main thread in gpac.on_done
+       function call_gpac() {
+         GPAC.stack = LIBGPAC.stackSave();
+         args.unshift(is_mp4box ? "MP4Box" : "gpac");
+         var argc = args.length;
+         var argv = LIBGPAC.stackAlloc((argc + 1) * 4);
+         var argv_ptr = argv >> 2;
+         args.forEach(arg => {
+          LIBGPAC.HEAP32argv_ptr++ = LIBGPAC.allocateUTF8OnStack(arg);
+         });
+         LIBGPAC.HEAP32argv_ptr = 0;
+
+         try {
+          LIBGPAC"_main"(argc, argv);
+         } catch (e) {
+          //unwind thrown by emscripten main 
+          if (e != 'unwind') {
+            GPAC.on_done();
+            return com_exit('Exception while running - ' + e);
+          }
+         }          
+       };
+
+       if (will_block) {
+          let warn='Worker for main disabled - web page will be blocked!';
+          do_log(warn);
+          set_status(warn);
+          //use setTimeout to have time to display above warning...
+          setTimeout(call_gpac, 1);
+       } else {
+         call_gpac();
+       }
+      }
+      //end of command line processing
+
+      // Include ANSI escape codes convert
+      // @link: https://www.npmjs.com/package/ansi-html
+      // Reference to https://github.com/sindresorhus/ansi-regex
+      var _regANSI = /(?:(?:\u001b\)|\u009b)(?:(?:0-9{1,3})?(?:(?:;0-9{0,3})*)?A-M|f-m)|\u001bA-M/
+
+      var _defColors = {
+        reset: 'fff', '000', // FOREGROUD_COLOR, BACKGROUND_COLOR
+        black: '000',
+        red: 'ff0000',
+        green: '209805',
+        yellow: 'e8bf03',
+        blue: '0000ff',
+        magenta: 'ff00ff',
+        cyan: '00ffee',
+        lightgrey: 'f0f0f0',
+        darkgrey: '888'
+      }
+      var _styles = {
+        30: 'black',
+        31: 'red',
+        32: 'green',
+        33: 'yellow',
+        34: 'blue',
+        35: 'magenta',
+        36: 'cyan',
+        37: 'lightgrey'
+      }
+      var _openTags = {
+        '1': 'font-weight:bold', // bold
+        '2': 'opacity:0.5', // dim
+        '3': '<i>', // italic
+        '4': '<u>', // underscore
+        '8': 'display:none', // hidden
+        '9': '<del>' // delete
+      }
+      var _closeTags = {
+        '23': '</i>', // reset italic
+        '24': '</u>', // reset underscore
+        '29': '</del>' // reset delete
+      }
+
+      ;0, 21, 22, 27, 28, 39, 49.forEach(function (n) {
+        _closeTagsn = '</span>'
+      })
+
+      /**
+       * Converts text with ANSI color codes to HTML markup.
+       * @param {String} text
+       * @returns {*}
+       */
+      function ansiHTML (text) {
+        // Returns the text if the string has no ANSI escape code.
+        if (!_regANSI.test(text)) {
+          return text
+        }
+
+        // Cache opened sequence.
+        var ansiCodes = 
+        // Replace with markup.
+        var ret = text.replace(/\033\(\d+)m/g, function (match, seq) {
+          if (seq=='0') {
+              r = '';
+              ansiCodes.forEach( c => {
+                if (c == '3') r+='</i>';
+                else if (c == '4') r+='</b>';
+              });
+              ansiCodes.length=0;
+              return r+'</span>';
+          }
+          var ot = _openTagsseq
+          if (ot) {
+            // If current sequence has been opened, close it.
+            if (!!~ansiCodes.indexOf(seq)) { // eslint-disable-line no-extra-boolean-cast
+              ansiCodes.pop()
+              return '</span>'
+            }
+            // Open tag.
+            ansiCodes.push(seq)
+            return ot0 === '<' ? ot : '<span style="' + ot + ';">'
+          }
+
+          var ct = _closeTagsseq
+          if (ct) {
+            // Pop sequence
+            ansiCodes.pop()
+            return ct
+          }
+          return ''
+        })
+
+        // Make sure tags are closed.
+        var l = ansiCodes.length
+        ;(l > 0) && (ret += Array(l + 1).join('</span>'))
+
+        return ret
+      }
+
+      /**
+       * Customize colors.
+       * @param {Object} colors reference to _defColors
+       */
+      ansiHTML.setColors = function (colors) {
+        if (typeof colors !== 'object') {
+          throw new Error('`colors` parameter must be an Object.')
+        }
+
+        var _finalColors = {}
+        for (var key in _defColors) {
+          var hex = colors.hasOwnProperty(key) ? colorskey : null
+          if (!hex) {
+            _finalColorskey = _defColorskey
+            continue
+          }
+          if ('reset' === key) {
+            if (typeof hex === 'string') {
+              hex = hex
+            }
+            if (!Array.isArray(hex) || hex.length === 0 || hex.some(function (h) {
+              return typeof h !== 'string'
+            })) {
+              throw new Error('The value of `' + key + '` property must be an Array and each item could only be a hex string, e.g.: FF0000')
+            }
+            var defHexColor = _defColorskey
+            if (!hex0) {
+              hex0 = defHexColor0
+            }
+            if (hex.length === 1 || !hex1) {
+              hex = hex0
+              hex.push(defHexColor1)
+            }
+
+            hex = hex.slice(0, 2)
+          } else if (typeof hex !== 'string') {
+            throw new Error('The value of `' + key + '` property must be a hex string, e.g.: FF0000')
+          }
+          _finalColorskey = hex
+        }
+        _setTags(_finalColors)
+      }
+
+      /**
+       * Reset colors.
+       */
+      ansiHTML.reset = function () {
+        _setTags(_defColors)
+      }
+
+      /**
+       * Expose tags, including open and close.
+       * @type {Object}
+       */
+      ansiHTML.tags = {}
+
+      if (Object.defineProperty) {
+        Object.defineProperty(ansiHTML.tags, 'open', {
+          get: function () { return _openTags }
+        })
+        Object.defineProperty(ansiHTML.tags, 'close', {
+          get: function () { return _closeTags }
+        })
+      } else {
+        ansiHTML.tags.open = _openTags
+        ansiHTML.tags.close = _closeTags
+      }
+
+      function _setTags (colors) {
+        // reset all
+        _openTags'0' = 'font-weight:normal;opacity:1;color:#' + colors.reset0 + ';background:#' + colors.reset1
+        // inverse
+        _openTags'7' = 'color:#' + colors.reset1 + ';background:#' + colors.reset0
+        // dark grey
+        _openTags'90' = 'color:#' + colors.darkgrey
+
+        for (var code in _styles) {
+          var color = _stylescode
+          var oriColor = colorscolor || '000'
+          _openTagscode = 'color:#' + oriColor
+          code = parseInt(code)
+          _openTags(code + 10).toString() = 'background:#' + oriColor
+        }
+      }
+
+      ansiHTML.reset()
+
+      //
+      //Until end of this script: GFIO wrapper
+      //
+      //This demo comes with a GF_FileIO wrapper for 
+      // - Emscripten FS file access
+      // - User file system access
+      // - protocols supported by Fetch() API
+      //
+      // It is not optimized but can help you design your own fileIOs for custom GPAC@WASM integration
+
+      const consolePrefix = () => {
+        return "<span class=\"cwd\">~"+FS.cwd()+"</span>$ ";
+      };
+
+      //check support for fetch upload using readable stream
+      const supportsRequestStreams = (() => {
+        let duplexAccessed = false;
+
+        const hasContentType = new Request('', {
+          body: new ReadableStream(),
+          method: 'POST',
+          get duplex() {
+            duplexAccessed = true;
+            return 'half';
+          },
+        }).headers.has('Content-Type');
+
+        return duplexAccessed && !hasContentType;
+      })();
+
+      //our GFIO object
+      var GFIO = {
+        //all defined GF_IOs
+        dict: ,
+        //constants used by gf_fileio_set_write_state
+        WRITE_READY: 0,
+        WRITE_WAIT: 1,
+        WRITE_CANCEL: 2,
+        //default method used for upload
+        UPLOAD_METHOD: 'POST',
+        //allow defer upload of file (aggregates to mem then basic POST/PUT or ar->blob->download)
+        ALLOW_WRITE_DEFER: true,
+
+        //open for read a file on user disk (input'type'='file')
+        _open_read_local: function (fio) {
+          let input = document.createElement('input');
+          input'type' = 'file';
+
+          //no cancel handler, set a timer to 20s
+          fio._timer = window.setTimeout( ()=> {
+            if (!fio._select) return;
+            set_status('timeout on file selection for ' + fio.url);
+            fio._select = 2;
+            fio._timer = null;
+          }, 20000);
+
+          input.addEventListener("change", e => {
+            set_status('');
+            if (e.target.files0) {
+              fio._file = e.target.files0;
+              fio._select = 0;
+              fio._pos = 0;
+              fio._size = fio._file.size;
+              //if more than 1G, load by 10M blocks
+              if ((fio._size>1000000000) && (fio._max_bsize<10000000)) fio._max_bsize = 10000000;
+              //if more than 1m, load by 500k blocks
+              else if ((fio._size>1000000) && (fio._max_bsize<500000)) fio._max_bsize = 500000;
+
+              GFIO.set_stats(fio._gfio, BigInt(0), BigInt(fio._size), 2, 0);
+              GFIO._load_block(fio);
+            } else {
+              _fio._select = 2;
+            }
+            window.clearTimeout(fio._timer);
+            fio._timer = null;
+          });
+          input.click();
+          set_status('Select input file for ' + fio.url);
+          return LIBGPAC.OK;
+        },
+
+        //open for write a file on user disk - showSaveFilePicker->createWitable, or blob->download if not supported
+        _open_write_local: function (fio) {
+          if (typeof window.showSaveFilePicker == 'undefined') {
+            if (GFIO.ALLOW_WRITE_DEFER) {
+              fio._defer_write = new Uint8Array();
+              fio._select = 0;
+              return LIBGPAC.OK;
+            }
+            do_log_err('File System Access API not supported');
+            return LIBGPAC.NOT_SUPPORTED;
+          }
+          //create file writer
+          GFIO.set_ready(fio._gfio, GFIO.WRITE_WAIT);
+          set_status('Select output file for ' + fio.url);
+          fio._writer = null;
+          const options = { suggestedName: fio.url, types:  { description: fio.url, accept: { '*/*': , } }  };
+          window.showSaveFilePicker(options).then( filep => {
+            return filep.createWritable();
+          }).then( writer => {
+            fio._writer = writer;
+            fio._select = 0;
+            GFIO.set_ready(fio._gfio, GFIO.WRITE_READY);
+          }).catch(val => {
+              GFIO.set_ready(fio._gfio, GFIO.WRITE_CANCEL);
+              fio._select = 2;
+          });
+          return LIBGPAC.OK;
+        },
+
+        //open a remote file (fetch)
+        _open_read_remote: function (fio) {
+          let res = LIBGPAC.OK;
+          fio._controller = new AbortController();
+          let options = {
+            signal: fio._controller.signal,
+            mode: 'no-cors',
+          };
+          options.headers = {};
+          if (fio._pos) {
+            options.headers'range' = 'bytes='+ fio._pos+'-';
+          }
+          options.headers'cross-origin-embedder-policy' = 'credentialless';
+          options.headers'cross-origin-resource-policy' = 'cross-origin';
+
+          GFIO.set_stats(fio._gfio, BigInt(0), BigInt(0), 2, 0);
+          fetch(fio.url, options).then((response) => {
+            if (response.ok) {
+              fio._select=0;
+              fio._fetch_wait=true;
+              fio._fetch = response.body.getReader();
+              fio._size = response.headers.get('Content-Length') || 0;
+              GFIO.set_stats(fio._gfio, BigInt(0), BigInt(fio._size), 2, 0);
+            } else {
+              GFIO.set_ready(fio._gfio, GFIO.WRITE_CANCEL);
+              fio._select=2;
+            }
+          })
+          .catch( (e) => {
+            fio._select=2;
+            GFIO.set_ready(fio._gfio, GFIO.WRITE_CANCEL);
+            res = LIBGPAC.URL_ERROR;
+            do_log_err('Fetch error: ' + e);
+          });
+          return res;
+        },
+
+        //write a remote file (fetch with readableStream if supported or fetch at end of file)
+        _open_write_remote: function (fio) {
+          let res = LIBGPAC.OK;
+          fio._defer_write = null;
+          if (!GFIO.supportsRequestStreams) {
+            if (GFIO.ALLOW_WRITE_DEFER) {
+              fio._defer_write = new Uint8Array();
+              fio._select=0;
+              return LIBGPAC.OK;
+            }
+            do_log_err('Fetch upload with readable streams not supported');
+            return LIBGPAC.NOT_SUPPORTED;
+          }
+          fio._controller = new AbortController();
+          GFIO.set_ready(fio._gfio, GFIO.WRITE_WAIT);
+          fio._upstream_dst=null;
+          fio._upstream = new ReadableStream({
+            start(controller) {
+              fio._select=0;
+              fio._upstream_dst = controller;
+              GFIO.set_ready(fio._gfio, GFIO.WRITE_READY);
+            },
+            pull(controller) {
+              fio._upstream_dst = controller;
+            },
+            cancel() {
+              GFIO.set_ready(fio._gfio, GFIO.WRITE_CANCEL);
+            }
+          });
+          let options = {
+            method: GFIO.UPLOAD_METHOD,
+            signal: fio._controller.signal,
+            body: fio._upstream,
+            duplex: 'half',
+            headers: { 'Content-Type': 'application/octet-stream' },
+            AllowHTTP1ForStreamingUpload: true
+          };
+          if (fio._pos) {
+            options.headers = {
+              'range': 'bytes='+ fio._pos+'-'
+            };
+          }
+
+          fetch(fio.url, options).then((response) => {
+            fio._select=0;
+            fio._size = fio._pos;
+            do_log('PUT got response ' + response.ok);
+          })
+          .catch( (e) => {
+            if (GFIO.ALLOW_WRITE_DEFER) {
+              fio._defer_write = new Uint8Array();
+              fio._select=0;
+              res = LIBGPAC.OK;
+              fio._upstream = null;
+              fio._upstream_dst = null;
+              fio._controller = null;
+              GFIO.set_ready(fio._gfio, GFIO.WRITE_READY);
+            } else {
+              GFIO.set_ready(fio._gfio, GFIO.WRITE_CANCEL);
+              res = LIBGPAC.NOT_SUPPORTED;
+            }
+          });
+          return res;
+        },
+
+        _close: function(fio) {
+          if (fio._stream) FS.close(fio._stream);
+          if (fio._writer) fio._writer.close();
+          if (fio._fetch) {
+              fio._controller.abort();
+              fio._controller = null;
+          }
+          if (fio._defer_write) {
+            if ((fio.url.indexOf('://')>0) && !fio.url.startsWith('file://')) {
+              let options = {
+                method: GFIO.UPLOAD_METHOD,
+                body: fio._defer_write,
+                headers: { 'Content-Type': 'application/octet-stream' },
+              };
+              if (fio._pos&&0) {
+                options.headers = {
+                  'range': 'bytes='+ fio._pos+'-'
+                };
+              }
+              fetch(fio.url, options).then((response) => {
+                if (!response.ok) do_log('Error uploading ' + fio.url);
+              })
+              .catch( (e) => {
+                do_log('Error uploading ' + fio.url + ': ' + e);
+              });
+            } else {
+              var blob = new Blob(fio._defer_write.buffer, {type: 'application/octet-stream'});
+              var a = document.createElement("a");
+              var blob_url = window.URL.createObjectURL(blob);
+              a.href = blob_url;
+              a.download = fio.url;
+              a.click();
+              window.URL.revokeObjectURL(blob_url);
+            }
+          }
+          fio._stream = null;
+          fio._writer = null;
+          fio._fetch = null;
+          fio._defer_write = null;
+          fio._upstream = null;
+          fio._pos = 0;
+        },
+
+        //open callback from libgpac for GF_FileIO objects
+        open: function(fileio_ref, _url, _mode, out_e) {
+          let fio = GFIO.to_obj(fileio_ref);
+          let url = _url ? LIBGPAC.UTF8ToString(_url) : null;
+          let mode = LIBGPAC.UTF8ToString(_mode);
+
+          //close file
+          if (mode=='close') {
+            GFIO._close(fio);
+            LIBGPAC.setValue(out_e, LIBGPAC.OK, 'i32');
+            return 0;
+          }
+          //checks if file exists - we only probe for EM's FS for now
+          if (mode=='probe') {
+            let rurl = url.startsWith('gfio://') ? fio.url : url;
+            try {
+              let stats = FS.stat(rurl);
+              LIBGPAC.setValue(out_e, LIBGPAC.OK, 'i32');
+            } catch (e) {
+              LIBGPAC.setValue(out_e, LIBGPAC.URL_ERROR, 'i32');
+            }
+            return 0;
+          }
+          //add ref to this object 
+          if (mode=='ref') {
+            fio._refs++;
+            return fileio_ref;
+          }
+          //remove ref from this object 
+          if (mode=='unref') {
+            if (!fio._refs) return null;
+            fio._refs--;
+            if (fio._refs) return fileio_ref;
+            url = null;
+          }
+          //special mode URL to create a new GFIO from parent file name but without creating the file (used in dashing)
+          if (mode=="url") {
+            if (!url) return null;
+            let _newurl = LIBGPAC.url_cat(fio.url, url);
+            var new_gfio = GFIO.create( LIBGPAC.UTF8ToString(_newurl), 0);
+            LIBGPAC.free(newurl);
+            return new_gfio._gfio;
+          }
+          //no URL, close file
+          if (!url) {
+            GFIO._close(fio);
+            //TODO, cleanup of unused gfio refs ?
+            //if (!fio._refs) {}
+            return null;
+          }
+
+          mode = mode.replace('b', '');
+          mode = mode.replace('t', '');
+          mode = mode.replace('+', '');
+          //we don't support append modes
+          if ((mode != "r") && (mode != "w")) {
+            LIBGPAC.setValue(out_e, LIBGPAC.NOT_SUPPORTED, 'i32');
+            set_status('Unsupported open mode ' + mode);
+            return null;
+          }
+
+          //file handle not opened, we can use the current gfio
+          if (!fio._stream && !fio._file && !fio._fetch && !fio._upstream
+              && (url.startsWith("gfio://") || (url == fio.url)) 
+          ) {
+            var res=LIBGPAC.OK;
+            fio._pos = 0;
+            // URL is NOT an EM's FS file
+            if (fio._wrap_io) {
+                fio._select = 1;
+                if (mode=='r') {
+                  if ((fio.url.indexOf('://')>0) && !fio.url.startsWith('file://')) {
+                    res = GFIO._open_read_remote(fio);
+                  } else {
+                    res = GFIO._open_read_local(fio);
+                  }
+                }
+                else if (mode=='w') {
+                  if ((fio.url.indexOf('://')>0) && !fio.url.startsWith('file://')) {
+                    res = GFIO._open_write_remote(fio);
+                  } else {
+                    res = GFIO._open_write_local(fio);
+                  }
+                }
+            }
+            // URL is an EM's FS file
+            else {
+              try {
+                fio._stream = FS.open(fio.url, mode);
+                if (mode.startsWith('r')) {
+                  let stats = FS.stat(fio.url);
+                  fio._size = stats.size;
+                  GFIO.set_stats(fio._gfio, BigInt(stats.size), BigInt(stats.size), 1, 0);
+                }
+              } catch (e) {
+                res = LIBGPAC.URL_ERROR;
+              }
+            }
+            LIBGPAC.setValue(out_e, res, 'i32');
+            if (res != LIBGPAC.OK) return null;
+            //return ourself
+            return fio._gfio;
+          }
+
+          //file handle already open (file is being opened twice), create a new gfio or check if we have already created one
+          //we only support this for local files 
+          if (!fio._stream) {
+            LIBGPAC.setValue(out_e, LIBGPAC.NOT_SUPPORTED, 'i32');
+            return null;
+          }
+          let fio_ref = fio;
+          fio = null;
+          let no_concatenate=false;
+          GFIO.dict.forEach(a_gfio => {
+            if (fio) return;
+            if (a_gfio.url != url) return;
+            if (a_gfio._stream) {
+              no_concatenate = true;
+            } else {
+              fio = a_gfio;
+            }
+          });
+
+          if (!fio) {
+            let _path = null;
+            let path = null;
+            if (!url.startsWith("gfio://")) {
+              if (no_concatenate) {
+                path = url;
+              } else {
+                _path = LIBGPAC.url_cat(fio_ref.url, url);
+                path = LIBGPAC.UTF8ToString(_path);
+              }
+            } else {
+              path = fio_ref.url;
+            }
+            let res=LIBGPAC.OK;
+            try {
+              fio = GFIO.create(path, 0);
+            } catch (e) {
+              res = LIBGPAC.OUT_OF_MEM;
+            }
+            if (_path) LIBGPAC.free(_path);
+            LIBGPAC.setValue(out_e, res, 'i32');
+            if (res) return null;
+          }
+          try {
+            if (!url.startsWith("gfio://")) {
+              fio._stream = FS.open(fio.url, mode);
+            } else {
+              fio._stream = FS.open(fio_ref.url, mode);
+            }
+          } catch (e) {
+            //todo cleanup of old gfios
+            LIBGPAC.setValue(out_e, LIBGPAC.IO_ERR, 'i32');
+            return null;
+          }
+
+          if (mode.startsWith('r')) {
+            let stats = FS.stat(fio.url);
+            fio._size = stats.size;
+            GFIO.set_stats(fio._gfio, BigInt(stats.size), BigInt(stats.size), 1, 0);
+          }
+          return fio._gfio;
+        },
+        //seek callback from libgpac
+        seek: function(fileio, offset, whence) {
+          let fio = GFIO.to_obj(fileio);
+          if (fio._select==1) return LIBGPAC.OK;
+          if (fio._defer_write) return LIBGPAC.NOT_SUPPORTED;
+
+          if (fio._file || fio._writer || fio._fetch) {
+            let abspos = Number(offset);
+            if (whence==1) abspos += fio._pos;
+            else if (whence==2) abspos = fio._size;
+
+            if (fio._writer) {
+              fio._pos = abspos;
+              fio._writer.seek(abspos);
+              return LIBGPAC.OK;
+            }
+
+            if (abspos != fio._pos) {
+              fio._discard_next = true;
+              fio._pos = abspos;
+              fio._block_pos_in_file = abspos;
+            }
+            return LIBGPAC.OK;
+          }
+          try {
+             fio._pos = FS.llseek(fio._stream, Number(offset), whence);
+          } catch (e) {
+            return LIBGPAC.IO_ERR;
+          }
+          return LIBGPAC.OK;
+        },
+        //read callback from libgpac
+        read: function(fileio, buffer, bytes) {
+          let fio = GFIO.to_obj(fileio);
+          //IO being created, wait
+          if (fio._select) return 0;
+
+          //file system stream or fetch
+          if (fio._file || fio._fetch) {
+            let load_next=false;
+            if (bytes>fio._max_bsize) fio._max_bsize = bytes;
+            if (!fio._ab) {
+              //fetch
+              if (fio._fetch_wait) {
+                fio._fetch_wait = false;
+                fio._fetch.read().then( block => {
+                  if (block.done) {
+                    //done, force size in case it was not set
+                    fio._size = fio._pos;
+                  } else {
+                    fio._ab = block.value; fio._block_pos = 0;
+                  }
+                });
+              }
+              return 0;
+            }
+
+            if (fio._discard_next) {
+              fio._ab = null;
+              fio._block_pos = 0;
+              fio._discard_next = 0;
+              if (fio._fetch) {
+                fio._controller.abort();
+                fio._controller = null;
+                GFIO._open_read_remote(fio);
+              } else {
+                GFIO._load_block(fio);
+              }
+              return 0;
+            }
+            let remain = fio._ab.byteLength - fio._block_pos;
+            if (bytes > remain) {
+              load_next = true;
+              bytes = remain;
+            }
+
+            //copy array buffer
+            let src;
+            if (fio._fetch)
+              src = fio._ab.subarray(fio._block_pos, fio._block_pos+bytes);
+            else
+              src = new Uint8Array(fio._ab, fio._block_pos, bytes);
+
+            let dst = new Uint8Array(LIBGPAC.HEAPU8.buffer, buffer, bytes);
+            dst.set(src);
+
+            fio._pos += bytes;
+            if (load_next) {
+              fio._block_pos_in_file += fio._ab.byteLength;
+              fio._ab = null;
+              fio._block_pos = 0;
+              if (fio._file && (fio._pos < fio._size)) {
+                GFIO._load_block(fio);
+              }
+              if (fio._fetch) fio._fetch_wait = true;
+            } else {
+              fio._block_pos += bytes;
+            }
+            return bytes;
+          }
+          //Emscripten's FS
+          if (!fio._stream) return 0;
+          if (bytes + fio._pos > fio._size) {
+            bytes = fio._size - fio._pos;
+          }
+          fio._pos += bytes;
+          let ab = new Uint8Array(LIBGPAC.HEAPU8.buffer, buffer, bytes);
+          FS.read(fio._stream, ab, 0, bytes);
+          return bytes;
+        },
+        //write callback from libgpac
+        write: function(fileio, buffer, bytes) {
+          let fio = GFIO.to_obj(fileio);
+          //IO being created, wait
+          if (fio._select) return 0;
+
+          //defer write, cat arrays
+          if (fio._defer_write) {
+            let ab = new Uint8Array(LIBGPAC.HEAPU8.buffer, buffer, bytes);
+            let new_st = new Uint8Array(bytes + fio._defer_write.length);
+            new_st.set(fio._defer_write);
+            new_st.set(ab, fio._defer_write.length);
+            fio._defer_write = new_st;
+            return bytes;
+          }
+          //writable stream API
+          if (fio._writer) {
+            let ab = new Uint8Array(LIBGPAC.HEAPU8.buffer, buffer, bytes);
+            fio._writer.write( new Uint8Array(ab) );
+            return bytes;
+          }
+          //fetch+PUT+readableStream API
+          if (fio._upstream) {
+            let ab = new Uint8Array(LIBGPAC.HEAPU8.buffer, buffer, bytes);
+            fio._upstream_dst.enqueue(ab);
+            return bytes;
+          }
+          //EM's FS
+          if (!fio._stream) return 0;
+          fio._pos+=bytes;
+          if (fio._size < fio._pos) fio._size = fio._pos;
+          let ab = new Uint8Array(LIBGPAC.HEAPU8.buffer, buffer, bytes);
+          FS.write(fio._stream, ab, 0, bytes);
+          return bytes;
+        },
+        //tell callback from libgpac - we maintain position in resource ourself, so tell/eof are valid for all methods 
+        tell: function(fileio) {
+          let fio = GFIO.to_obj(fileio);
+          if (fio._select) return BigInt(0);
+          return BigInt(fio._pos);
+        },
+        //eof callback from libgpac
+        eof: function(fileio) {
+          let fio = GFIO.to_obj(fileio);
+          if (fio._select==2) return 1;
+          if (fio._select) return 0;
+          if (fio._fetch && !fio._size) return 0;
+          if (fio._pos == fio._size) return 1;
+          return 0;
+        },
+        //get fileIO object from its userdata - for now we just use an index in the global dict that we reset upon gpac.on_done
+        to_obj: function(fileio) {
+          let udta = this.get_udta(fileio);
+          return this.dictudta;
+        },
+        //create file IO from URL and mode (0: r/w, 1: r, 2: w), used by command line parser
+        create: function (url, mode) {
+          if (typeof this.wrap_new == 'undefined') {
+            //gf_fileio_new(url, udta, open, seek, read, write, tell, eof, printf)
+            this.wrap_new = LIBGPAC.cwrap('gf_fileio_new', 'number', 'string', 'number', 'number', 'number', 'number', 'number', 'number', 'number', 'number');
+            this.wrap_del = LIBGPAC.cwrap('gf_fileio_del', '', 'number');
+            this.get_udta = LIBGPAC.cwrap('gf_fileio_get_udta', 'number', 'number');
+            this.get_url = LIBGPAC.cwrap('gf_fileio_url', 'string', 'number');
+            this.tag_main = LIBGPAC.cwrap('gf_fileio_tag_main_thread', 'number', 'number');
+            this.set_stats = LIBGPAC.cwrap('gf_fileio_set_stats', null, 'number', 'bigint', 'bigint', 'boolean', 'number');
+            this.set_ready = LIBGPAC.cwrap('gf_fileio_set_write_state', null, 'number', 'number');
+
+            //create function pointers
+            //
+            this._pf_open = LIBGPAC.addFunction(this.open, 'iiiii');
+            this._pf_seek = LIBGPAC.addFunction(this.seek, 'iiji');
+            this._pf_read = LIBGPAC.addFunction(this.read, 'iiii');
+            this._pf_write = LIBGPAC.addFunction(this.write, 'iiii');
+            this._pf_tell = LIBGPAC.addFunction(this.tell, 'ji');
+            this._pf_eof = LIBGPAC.addFunction(this.eof, 'ii');
+          }
+
+          let wrap_io = false;
+          if (url.startsWith('$(')) {
+            let select_end = url.indexOf(')');
+            url = url.substring(2, select_end);
+            wrap_io = true;
+          }
+
+          let fio = {
+            udta: this.dict.length,
+            url: url,
+            _wrap_io: wrap_io,
+            _pos: 0,
+            _size: 0,
+            _stream: null, //FS.open stream object
+            _file: null, //fileSelector file object
+            _refs: 0,
+            _select: 0,
+            _block_pos_in_file: 0,
+            _block_pos: 0, //amount of bytes read from block
+            _ab: null,
+            _max_bsize: GPAC.read_block_size, //min size, will grow to block_size of fin filter
+            _discard_next: null,
+            _timer: null,
+            _writer: null,
+            _fetch: null,
+            _fetch_wait: null,
+            gfio_url: function() {
+              return GFIO.get_url(fio._gfio);
+            }
+          };
+          this.dict.push(fio);
+          fio._gfio = this.wrap_new(url, fio.udta, this._pf_open, this._pf_seek, (mode==2) ? 0 : this._pf_read, (mode==1) ? 0 : this._pf_write, this._pf_tell, this._pf_eof, 0);
+          //only run gfio on main thread ?
+          this.tag_main(fio._gfio);
+          return fio;
+        },
+        //for file system read, loads next block from file
+        _load_block: function(fio) {
+          let max_bsize = fio._max_bsize;
+          let bsize = (fio._block_pos_in_file + max_bsize > fio._size) ? (fio._size - fio._block_pos_in_file) : max_bsize;
+          let blob = fio._file.slice(fio._block_pos_in_file, fio._block_pos_in_file + bsize);
+          let read = new FileReader();
+          read.onload = function(evt) {
+            fio._ab = evt.target.result;
+          };
+          read.readAsArrayBuffer(blob);
+        }
+      };
+  </script> 
+
+
+    
+    <script type='text/javascript'>
+
+       function prop_to_js(_p, p4cc) {
+          //TODO: for now we only dump the property to string, we don't map it to JS values
+          let res = LIBGPAC.props_dump_alloc(p4cc, _p, 0);
+          if (!res) return null;
+          let val = LIBGPAC.UTF8ToString(res);
+          LIBGPAC._free(res);
+          return val;
+      }
+
+      function load_libgpac(_lib, _lib)
+      {
+        let gpac_has_threads = LIBGPAC.cwrap('gpac_has_threads', 'number', );
+        _lib.has_threads = gpac_has_threads();
+        _lib.in_logs = false;
+        //error codes
+        _lib.SCRIPT_INFO = 3;
+        _lib.PENDING_PACKET = 2;
+        _lib.EOS = 1;
+        _lib.OK = 0;
+        _lib.BAD_PARAM = -1;
+        _lib.OUT_OF_MEM = -2;
+        _lib.IO_ERR = -3;
+        _lib.NOT_SUPPORTED = -4;
+        _lib.CORRUPTED_DATA = -5;
+        _lib.SCRIPT_ERROR = -8;
+        _lib.BUFFER_TOO_SMALL = -9;
+        _lib.NON_COMPLIANT_BITSTREAM = -10;
+        _lib.FILTER_NOT_FOUND = -11;
+        _lib.URL_ERROR = -12;
+        _lib.SERVICE_ERROR = -13;
+        _lib.REMOTE_SERVICE_ERROR = -14;
+        _lib.STREAM_NOT_FOUND = -15;
+        _lib.URL_REMOVED = -16;
+        _lib.IP_ADDRESS_NOT_FOUND = -40;
+        _lib.IP_CONNECTION_FAILURE = -41;
+        _lib.IP_NETWORK_FAILURE = -42;
+        _lib.IP_CONNECTION_CLOSED = -43;
+        _lib.IP_NETWORK_EMPTY = -44;
+        _lib.IP_UDP_TIMEOUT = -46;
+        _lib.AUTHENTICATION_FAILURE = -50;
+        _lib.NOT_READY = -51;
+        _lib.INVALID_CONFIGURATION = -52;
+        _lib.NOT_FOUND = -53;
+        _lib.PROFILE_NOT_SUPPORTED = -54;
+        _lib.REQUIRES_NEW_INSTANCE = -56;
+        _lib.FILTER_NOT_SUPPORTED = -57;
+
+        //functions
+        _lib.init = LIBGPAC.cwrap('gf_sys_init', 'number', 'number', 'string');
+        _lib.uninit = LIBGPAC.cwrap('gf_sys_close', null, );
+        _lib.version = LIBGPAC.cwrap('gf_gpac_version', 'string', );
+        _lib.copyright = LIBGPAC.cwrap('gf_gpac_copyright', 'string', );
+        _lib.url_cat = LIBGPAC.cwrap('gf_url_concatenate', 'number', 'string', 'string');
+        _lib.free = LIBGPAC.cwrap('gf_url_free', null, 'number');
+
+        _lib.log_set_tools_levels = LIBGPAC.cwrap('gf_log_set_tools_levels', 'number', 'string', 'number');
+
+        //load basic filter session api
+        _lib.fs_new_defaults = LIBGPAC.cwrap('gf_fs_new_defaults', 'number', 'number');
+        _lib.fs_del = LIBGPAC.cwrap('gf_fs_del', null, 'number');
+        _lib.fs_print_stats = LIBGPAC.cwrap('gf_fs_print_stats', null, 'number');
+        _lib.fs_print_connections = LIBGPAC.cwrap('gf_fs_print_connections', null, 'number');
+
+        _lib.fs_load_filter = LIBGPAC.cwrap('gf_fs_load_filter', 'number', 'number', 'string', 'number');
+        _lib.fs_load_source = LIBGPAC.cwrap('gf_fs_load_source', 'number', 'number', 'string', 'string', 'string', 'number');
+        _lib.fs_load_destination = LIBGPAC.cwrap('gf_fs_load_destination', 'number', 'number', 'string', 'string', 'string', 'number');
+
+        _lib.fs_run = LIBGPAC.cwrap('gf_fs_run', 'number', 'number');
+        _lib.fs_last_task = LIBGPAC.cwrap('gf_fs_is_last_task', 'number', 'number');
+        _lib.filter_get_name = LIBGPAC.cwrap('gf_filter_get_name', 'string', 'number');
+        _lib.filter_reconnect_output = LIBGPAC.cwrap('gf_filter_reconnect_output', 'number', 'number','number');
+        _lib.filter_probe_link = LIBGPAC.cwrap('gf_filter_probe_link', 'number', 'number','number','string', 'number');
+        _lib.filter_get_destinations = LIBGPAC.cwrap('gf_filter_get_possible_destinations', 'number', 'number','number', 'number');
+        _lib.filter_get_ipid_count = LIBGPAC.cwrap('gf_filter_get_ipid_count', 'number', 'number');
+        _lib.filter_get_ipid = LIBGPAC.cwrap('gf_filter_get_ipid', 'number', 'number','number');
+        _lib.filter_get_opid_count = LIBGPAC.cwrap('gf_filter_get_opid_count', 'number', 'number');
+        _lib.filter_get_opid = LIBGPAC.cwrap('gf_filter_get_opid', 'number', 'number','number');
+        _lib.filter_is_sink = LIBGPAC.cwrap('gf_filter_is_sink', 'number', 'number');
+        _lib.filter_is_source = LIBGPAC.cwrap('gf_filter_is_source', 'number', 'number');
+        _lib.filter_get_max_extra_input_pids = LIBGPAC.cwrap('gf_filter_get_max_extra_input_pids', 'number', 'number');
+        _lib.filter_pid_get_property = LIBGPAC.cwrap('gf_filter_pid_get_property', 'number', 'number', 'number');
+        _lib.filter_pid_get_property_str = LIBGPAC.cwrap('gf_filter_pid_get_property', 'number', 'number', 'string');
+        _lib.filter_pid_enum_properties = LIBGPAC.cwrap('gf_filter_pid_enum_properties', 'number', 'number', 'number', 'number', 'string');
+        _lib.props_4cc_name = LIBGPAC.cwrap('gf_props_4cc_get_name', 'string', 'number');
+        _lib.props_dump_alloc = LIBGPAC.cwrap('gf_props_dump_alloc', 'number', 'number','number','number');
+
+        _lib.filter_pid_get_props = (pid) => {
+            props = ;
+            const p_idx = LIBGPAC._malloc(LIBGPAC.HEAP32.BYTES_PER_ELEMENT);
+            const p_4cc = LIBGPAC._malloc(LIBGPAC.HEAP32.BYTES_PER_ELEMENT);
+            const p_name = LIBGPAC._malloc(LIBGPAC.HEAP32.BYTES_PER_ELEMENT);
+            LIBGPAC.HEAP32.set(0, p_idx/LIBGPAC.HEAP32.BYTES_PER_ELEMENT);
+            while (1) {
+              let _p = _lib.filter_pid_enum_properties(pid, p_idx, p_4cc, p_name);
+              if (!_p) break;
+
+              let prop_4cc = LIBGPAC.getValue(p_4cc, 'i32');
+              let c_str = LIBGPAC.getValue(p_name, "i32"); //const, no need to free
+              let prop_name = c_str ? LIBGPAC.UTF8ToString(c_str) : null;
+
+              p = {};
+              p.name = prop_4cc ? _lib.props_4cc_name(prop_4cc) : prop_name;
+
+              p.value = prop_to_js(_p, prop_4cc);
+              if (p.value)
+                props.push(p);
+            }
+            LIBGPAC._free(p_idx);
+            LIBGPAC._free(p_4cc);
+            LIBGPAC._free(p_name);
+            return props;
+        };
+      }
+
+
+      var GPAC = {
+
+        on_done: function() {
+          LIBGPAC.gpac_set_console(3);
+          set_status('');
+          GPAC.running = false;
+          GPAC.do_log = false;
+          //in case we had an exception, force a gf_sys_close
+          LIBGPAC.uninit();
+          if (GPAC.restore_worker) {
+            LIBGPAC.gpac_worker = true;
+            GPAC.restore_worker = false;
+          }
+
+          GFIO.dict.forEach(fio => {
+            if (fio._timer) {
+              window.clearTimeout(fio._timer);
+              fio._timer=null;
+            }
+          });
+          GFIO.dict = ;
+
+          animElement.stop();
+          cmdElement.readonly = false;
+
+          //restore emscripten stack
+          if (GPAC.stack != null) {
+            var stack_init = GPAC.stack;
+            GPAC.stack = null;
+            function restore_stack() {
+              LIBGPAC.stackRestore(stack_init);
+            }
+            //we may be called asynchronously here if emscripten main loop is used, so restore stack on main thread only
+            setTimeout(restore_stack, 1);
+          }
+        },
+        running: false,
+        no_log: true,
+        stack: null,
+        anim: animElement,
+        restore_worker: false,
+        read_block_size: 10000
+      };
+      
+      function displayStatus(text, busy = false, progress = null){
+        statusElement.innerHTML = text;
+        progressTxt.nodeValue = progress !== null ? `${Math.floor(val)} %` : '';
+        if (busy){
+          animElement.start();
+        } else {
+          animElement.stop();
+        }
+      }
+
+      function check_threading() {
+        const threaded = LIBGPAC.has_threads;
+        const threadedOnly = ...document.getElementsByClassName('threaded');
+        threadedOnly.forEach(el => el.hidden = !threaded);
+        const thStatus = document.getElementById('threading_status');
+
+        threadingElement.checked = threaded;
+        if (window.location.href.indexOf('.gpac.io')<0) {
+          threadingElement.disabled = true;
+        } else {
+          threadingElement.onchange = () => {
+            const hostname = threaded ? 'wasm.gpac.io' : 'wasmth.gpac.io';
+            window.location.href = `https://${hostname}/`;
+            console.log('Reloading to ' + window.location.href);
+          }
+        }
+      }
+      const LIBGPAC = {
+        preRun: 
+          // function() { LIBGPAC.ENV.SDL_EMSCRIPTEN_KEYBOARD_ELEMENT = "#canvas"; }
+        ,
+        postRun: 
+        ,
+        print: (function() {
+          if (outputElement) outputElement.innerHTML = ''; // clear browser cache
+          return function(text) {
+            if (arguments.length > 1) text = Array.prototype.slice.call(arguments).join(' ');
+            // These replacements are necessary if you render to raw HTML
+            text = text.replace(/&/g, "&amp;");
+            text = text.replace(/</g, "&lt;");
+            text = text.replace(/>/g, "&gt;");
+            text = text.replace(/\n/g, '<br>', 'g');
+            text = text.replace(/\t/g, '&nbsp;&nbsp;&nbsp;&nbsp;');
+
+            // handle \r
+            var prevPos = 0;
+            var output = '';
+            for (var i = 0; i < text.length; i++) {
+              if (text.charCodeAt(i) == 13) {
+                output += text.substring(prevPos, i);
+                prevPos = i + 1;
+              }
+            }
+
+            // convert ANSI colors to HTML
+            text = ansiHTML(text);
+
+            if (GPAC.no_log)
+              console.log(text);
+            else if (outputElement) {
+              outputElement.innerHTML += text + "<br>";
+              outputElement.scrollTop = outputElement.scrollHeight; // focus on bottom
+            }
+          };
+        })(),
+        printErr: function(text) {
+          if (LIBGPAC.in_logs)
+            console.log(text);
+          else
+            LIBGPAC.print(text);
+        },
+
+        canvas: (function() {
+          var canvas = document.getElementById('canvas');
+
+          // As a default initial behavior, pop up an alert when webgl context is lost. To make your
+          // application robust, you may want to override this behavior before shipping!
+          // See http://www.khronos.org/registry/webgl/specs/latest/1.0/#5.15.2
+          canvas.addEventListener("webglcontextlost", function(e) { alert('WebGL context lost. You will need to reload the page.'); e.preventDefault(); }, false);
+
+          return canvas;
+        })(),
+        setStatus: function(text) {
+          if (!LIBGPAC.setStatus.last) LIBGPAC.setStatus.last = { time: Date.now(), text: '' };
+          if (text === LIBGPAC.setStatus.last.text) return;
+          var m = text.match(/(^(+)$(\d+(\.\d+)?)\/(\d+)$/);
+          var now = Date.now();
+          if (m && now - LIBGPAC.setStatus.last.time < 30) return; // if this is a progress update, skip it if too soon
+          LIBGPAC.setStatus.last.time = now;
+          LIBGPAC.setStatus.last.text = text;
+          
+          const busy = !!m;
+          let progress = null;
+          if (busy) {
+            text = m1;
+            progress = parseInt(m2)*100 / parseInt(m4);
+          }
+          displayStatus(text, busy, progress);
+        },
+
+        totalDependencies: 0,
+        monitorRunDependencies: function(left) {
+          this.totalDependencies = Math.max(this.totalDependencies, left);
+          LIBGPAC.setStatus(left ? 'Preparing... (' + (this.totalDependencies-left) + '/' + this.totalDependencies + ')' : 'All downloads complete.');
+        },
+        onRuntimeInitialized: function() {
+          FS = LIBGPAC'FS';
+          load_libgpac(LIBGPAC, LIBGPAC);
+          GPAC.toggle_reporting = function(value) {
+            const gpac_em_sig_handler = LIBGPAC.cwrap('gpac_em_sig_handler', null, 'number');
+            gpac_em_sig_handler(value);
+          };
+
+          document.addEventListener("keydown", (event) => {
+            if (event.ctrlKey) {
+              switch (event.keyCode) {
+                case 76: // Ctrl+L
+                case 65: // Ctrl+A
+                case 69: // Ctrl+E
+                  event.preventDefault();
+                  break;
+              }
+            }
+          })
+
+          //mount IDBFS
+          FS.mkdir('/idbfs');
+          FS.mount(LIBGPAC'IDBFS', {}, '/idbfs');
+          FS.syncfs(true, () => { 
+            if (arguments.length) { 
+              err('Failed to sync IDBFS: ' + arguments0 + ' - will use Emscripten $HOME for config');
+            } else {
+              load_history();
+            }
+          });
+          check_threading();
+
+          onGpacReady();
+        },
+        //do not run until we have something to run
+        noInitialRun: true,
+        //do not exit runtime on exit()
+        noExitRuntime: true,
+
+        //GPAC-specific extensions of the module object, only used by gpac_main.c (NOT USED by libgpac functions)
+        //callback function called by gpac_main when exiting
+        gpac_done: function(code) { 
+          if (code) do_log('(exit code ' + code +')');
+          GPAC.on_done();
+          com_exit();
+        },
+        //set console function called by gpac_main
+        //code is 1 for console clear, 2 for console save and 3 for console restore (color codes are not forwarded)
+        gpac_set_console: function(code) {
+          if (!outputElement) return;
+          switch (code) {
+          //clear
+          case 1:
+            outputElement.value = '';
+            return;
+          //save
+          case 2:
+            if (console_bck.length) return;
+            console_bck = outputElement.value;
+            outputElement.value = '';
+            return;
+          //restore
+          case 3:
+            if (!console_bck) return;
+            outputElement.value = console_bck;
+            console_bck = '';
+            return;
+          }
+        },
+        //worker flag used by gpac_main to launch as worker
+        gpac_worker: false,
+        //boolean flag disabling/enabling fetch() - if undefined or not false, fetch() is enabled
+        gpac_fetch: true,
+        //fetch mode or cors
+        gpac_fetch_mode: 'cors',
+        //extra headers to add to fetch requests
+        gpac_extra_headers: {}
+      };
+
+      displayStatus('Downloading...', true);
+
+      window.onerror = function(event) {
+        // TODO: do not warn on ok events like simulating an infinite loop or exitStatus
+        displayStatus('Exception thrown, see JavaScript console');
+        if (LIBGPAC){
+          LIBGPAC.setStatus = function(text) {
+            if (text) console.error('post-exception status ' + text);
+          };
+        }
+      };
+    </script>
+
+     
+    <script async type="text/javascript" src="gpac.js"></script>
+    <script>
+      window.addEventListener('load', function() {
+        libgpac(LIBGPAC);
+
+      });
+    </script>
+
+  </body>
+</html>
+
+

gpac-2.2.1.tar.gz/share/gui/extensions/about/info.js -> gpac-2.4.0.tar.gz/share/gui/extensions/about/info.js Changed

gpac-2.2.1.tar.gz/share/gui/extensions/about/init.js -> gpac-2.4.0.tar.gz/share/gui/extensions/about/init.js Changed

gpac-2.2.1.tar.gz/share/gui/extensions/bifs_tests/init.js -> gpac-2.4.0.tar.gz/share/gui/extensions/bifs_tests/init.js Changed

gpac-2.2.1.tar.gz/share/gui/extensions/player/player.js -> gpac-2.4.0.tar.gz/share/gui/extensions/player/player.js Changed

@@ -1796,10 +1796,12 @@
 				
 				if (m.type == 'Video') nb_video++;
 				else if (m.type == 'Audio') nb_audio++;
-				else if (m.type == 'Text') nb_subs++;
+				else if (m.type == 'Text') {
+                    nb_subs++;
+                }
 			}
 		}
-		if ((nb_video > 1) || (nb_audio > 1) || (nb_subs > 1)) {
+		if ((nb_video > 1) || (nb_audio > 1) || (nb_subs >= 1)) {
 			this.controler.media_list.show();
 		} else {
 			this.controler.media_list.hide();
@@ -1811,7 +1813,8 @@
 			
 			if (this.extension.medialist_wnd) {
 				this.extension.medialist_wnd.close();
-				return;
+				this.extension.medialist_wnd=null;
+                return;
 			}
 			var wnd = gw_new_popup(this.extension.controler.media_list, 'up');
 			this.extension.medialist_wnd = wnd;
@@ -1819,15 +1822,21 @@
 			
             //todo - cleanup the rest of the code to use closures to pass the extension object
 			wnd.on_close = ( function (e) {
-                return function () { e.medialist_wnd = null; }
+                return function () { e.medialist_wnd = null;}
 			} ) (extension);
 
 			wnd.make_item = function (text, obj) {
                 let pref = "";
-                if (m.status == 'Playing') pref= "* ";
-                else if (m.status == 'Paused') pref= "* ";
+                if ((obj.status == 'Playing') || (obj.status == 'Paused')) {
+                    switch (obj.forced) {
+                    case 2: pref='!! '; break;
+                    case 3: pref='!* '; break;
+                    case 1: pref='! '; break;
+                    default: pref= "* "; break;
+                    }
+                }
 				wnd.add_menu_item(pref+text, function () {
-				  obj.select();
+                  obj.select();
 			  });
 			}

gpac-2.2.1.tar.gz/share/gui/extensions/showroom/init.js -> gpac-2.4.0.tar.gz/share/gui/extensions/showroom/init.js Changed

gpac-2.2.1.tar.gz/share/lang/fr.txt -> gpac-2.4.0.tar.gz/share/lang/fr.txt Changed

@@ -31,7 +31,7 @@
 o_crc=3724167134
 h=@affiche l'aide. Par défaut, seules les options de base sont imprimées. -ha affiche les options avancées, -hx imprime les options expertes et -hh imprime toutes les options. Le paramètre de chaîne peut être:
 	vide: affiche l'aide de base de la ligne de commande.
-	doc: affiche les informations générales sur le filtre.
+	doc: affiche les information générales sur le filtre.
 	log: affiche l'aide du système de journalisation.
 	core: affiche les options de base de libgpac supportées. Utilisez -ha / -hx / -hh pour les options en mode avancé / expert / complet.
 	filtres: affiche le nom de tous les filtres disponibles.
@@ -39,7 +39,7 @@
 	codecs: affiche les codecs pris en charge.
 	props: affiche les propriétés de pid intégrées prises en charge.
 	links: affiche les connexions possibles entre chaque filtre.
-	FNAME: imprime les informations de filtre FNAME (plusieurs FNAME peuvent être spécifiés). Pour les méta-filtres, utilisez FNAME: INST, par exemple ffavin: avfoundation. Utilisez * pour imprimer des informations sur tous les filtres (avertissement, grande sortie!), *: * Pour imprimer des informations sur tous les filtres, y compris les instances de méta filtres (avertissement, grande sortie!). Par défaut, seules les options de filtre de base et la description sont affichées. Utilisez -ha pour afficher les options avancées et filtrer les capacités d'E / S, -hx pour les options expertes, -hh pour toutes les options@
+	FNAME: imprime les information de filtre FNAME (plusieurs FNAME peuvent être spécifiés). Pour les méta-filtres, utilisez FNAME: INST, par exemple ffavin: avfoundation. Utilisez * pour imprimer des information sur tous les filtres (avertissement, grande sortie!), *: * Pour imprimer des information sur tous les filtres, y compris les instances de méta filtres (avertissement, grande sortie!). Par défaut, seules les options de filtre de base et la description sont affichées. Utilisez -ha pour afficher les options avancées et filtrer les capacités d'E / S, -hx pour les options expertes, -hh pour toutes les options@
 h_crc=4136223486
 doc=@Aide de l'outil en ligne de commande de GPAC pour la mise en place et l'execution de chaînes de filtres.
 Voir -h pour les options disponibles.
@@ -1268,7 +1268,7 @@
 desc=CENC, ISMA and adobe decryptor
 desc_crc=3286015280
 help=@The CENC/ISMA decryptor uses a configuration file for retrieving keys. The syntax is available at:
-https://gpac.wp.imt.fr/mp4box/encryption/common-encryption/
+https://gpac.io/mp4box/encryption/common-encryption/
 The file can be set per PID using the property DecryptFile (highest priority), CryptFile (lower priority)
 or set at the filter option level (lowest priority).
 When the file set per PID, the first CrypTrack with the same ID is used, otherwise the first CrypTrack is used.@
@@ -1279,7 +1279,7 @@
 desc=CENC and ISMA encryptor
 desc_crc=2608147056
 help=@The CENC/ISMA encryptor uses a configuration file for declaring keys. The syntax is available at:
-https://gpac.wp.imt.fr/mp4box/encryption/common-encryption/
+https://gpac.io/mp4box/encryption/common-encryption/
 The file can be set per PID using the property CryptFile, or set at the filter option level.
 When the file is set per PID, the first CrypTrack with the same ID is used, otherwise the first CrypTrack is used.@
 help_crc=1527605354

gpac-2.2.1.tar.gz/share/nodejs/src/gpac_napi.c -> gpac-2.4.0.tar.gz/share/nodejs/src/gpac_napi.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2021-2022
+ *			Copyright (c) Telecom ParisTech 2021-2024
  *					All rights reserved
  *
  *  This file is part of GPAC / NodeJS module
@@ -135,11 +135,15 @@
 napi_type_tag filterpck_tag = {0x475041434e4f4445, 0x47465041434b4554};
 napi_type_tag filterevent_tag = {0x475041434e4f4445, 0x4746464556454e54};
 napi_type_tag dashbind_tag = {0x475041434e4f4445, 0x44415348494e4a53};
-napi_type_tag fileio_tag = {0x475041434e4f4445, 0x474646494c45494f};
+napi_type_tag fileio_tag = {0x475041434e4f4445,   0x474646494c45494f};
+napi_type_tag httpsess_tag = {0x475041434e4f4445, 0x474646494cf0df5c};
 
 napi_value dashin_bind(napi_env env, napi_callback_info info);
 void dashin_detach_binding(NAPI_Filter *napi_f);
 
+napi_value httpout_bind(napi_env env, napi_callback_info info);
+void httpout_detach_binding(NAPI_Filter *napi_f);
+
 
 void dummy_finalize(napi_env env, void* finalize_data, void* finalize_hint)
 {
@@ -159,7 +163,7 @@
 		if (gpac->str_buf) gf_free(gpac->str_buf);
 		gpac->str_buf = NULL;
 		gpac->str_buf_alloc = 0;
-		gf_sys_close(mem_track, profile);
+		gf_sys_close();
 		gf_sys_init(mem_track, profile);
 		gpac->is_init = GF_TRUE;
 		if (profile) free(profile);
@@ -286,6 +290,16 @@
 	napi_create_reference(env, argv0, 1, &gpac->rmt_ref);
 	return NULL;
 }
+
+napi_value gpac_rmt_log(napi_env env, napi_callback_info info)
+{
+	NARG_ARGS(1, 1)
+	NARG_STR(msg, 0, NULL);
+	if (msg)
+		gf_sys_profiler_log(msg);
+	return NULL;
+}
+
 napi_value gpac_rmt_send(napi_env env, napi_callback_info info)
 {
 	NARG_ARGS(1, 1)
@@ -938,7 +952,7 @@
 	if (p4cc) {
 		e = gf_filter_pck_set_property(pck, p4cc, is_null ? NULL : &p);
 	} else {
-		e = gf_filter_pck_set_property_str(pck, pname, is_null ? NULL : &p);
+		e = gf_filter_pck_set_property_dyn(pck, pname, is_null ? NULL : &p);
 	}
 	if (e) {
 		napi_throw_error(env, gf_error_to_string(e), "Cannot set packet property");
@@ -1228,9 +1242,9 @@
 		}
 	} else {
 		if (is_info) {
-			e = gf_filter_pid_set_info_str(pid, pname, is_null ? NULL : &p);
+			e = gf_filter_pid_set_info_dyn(pid, pname, is_null ? NULL : &p);
 		} else {
-			e = gf_filter_pid_set_property_str(pid, pname, is_null ? NULL : &p);
+			e = gf_filter_pid_set_property_dyn(pid, pname, is_null ? NULL : &p);
 		}
 	}
 	if (e) {
@@ -1449,7 +1463,7 @@
 	return ret;
 }
 
-napi_value filterpid_negociate_cap(napi_env env, napi_callback_info info)
+napi_value filterpid_negotiate_cap(napi_env env, napi_callback_info info)
 {
 	u32 p4cc;
 	GF_Err e;
@@ -1464,12 +1478,12 @@
 	NAPI_CALL( prop_from_napi(env, argv1, p4cc, pname, custom_type, &p) );
 
 	if (p4cc) {
-		e = gf_filter_pid_negociate_property(pid, p4cc, &p);
+		e = gf_filter_pid_negotiate_property(pid, p4cc, &p);
 	} else {
-		e = gf_filter_pid_negociate_property_dyn(pid, pname, &p);
+		e = gf_filter_pid_negotiate_property_dyn(pid, pname, &p);
 	}
 	if (e) {
-		napi_throw_error(env, gf_error_to_string(e), "Failed to negociate cap for PID");
+		napi_throw_error(env, gf_error_to_string(e), "Failed to negotiate cap for PID");
 	}
 	gf_props_reset_single(&p);
 	return NULL;
@@ -2004,16 +2018,96 @@
 			}
 		}
 	}
-	NARG_STR(link_ext, offset, NULL);
+	NARG_STR(link_ext, (u32)offset, NULL);
 
 	e = gf_filter_set_source(f, ins_f, link_ext);
-	if (e)
+	if (e) {
 		napi_throw_error(env, gf_error_to_string(e), "Failed to set source");
-	else
-		gf_filter_reconnect_output(f, opid);
+		return NULL;
+	}
+	e = gf_filter_reconnect_output(f, opid);
+	if (e)
+		napi_throw_error(env, gf_error_to_string(e), "Failed to reconnect output");
 	return NULL;
 }
 
+napi_value filter_reconnect(napi_env env, napi_callback_info info)
+{
+	GF_FilterPid *opid=NULL;
+	GF_Err e;
+	NARG_ARGS_THIS(1, 0)
+	FILTER
+
+	//check if 2nd param is int, get opid
+	if (argc) {
+		s32 idx = -1;
+		if (napi_get_value_int32(env, argv0, &idx) == napi_ok) {
+			if (idx>=0) {
+				opid = gf_filter_get_opid(f, (u32) idx);
+				if (!opid) {
+					napi_throw_error(env, NULL, "Invalid output PID index");
+					return NULL;
+				}
+			}
+		}
+	}
+	e = gf_filter_reconnect_output(f, opid);
+	if (e)
+		napi_throw_error(env, gf_error_to_string(e), "Failed to reconnect output");
+	return NULL;
+}
+
+napi_value filter_probe_link(napi_env env, napi_callback_info info)
+{
+	GF_Err e;
+	char *res=NULL;
+	s32 idx = -1;
+	s32 offset=1;
+	NARG_ARGS_THIS(2, 1)
+	FILTER
+
+	//check if 2nd param is int, get opid
+	if (argc>1) {
+		if (napi_get_value_int32(env, argv0, &idx) == napi_ok) {
+			offset=2;
+		}
+	}
+	NARG_STR(fdesc, (u32)offset, NULL);
+
+	e = gf_filter_probe_link(f, idx, fdesc, &res);
+	if (e) {
+		napi_throw_error(env, gf_error_to_string(e), "Failed to probe links");
+		return NULL;
+	}
+	napi_value val;
+	NAPI_CALL( napi_create_string_utf8(env, res, NAPI_AUTO_LENGTH, &val) );
+	gf_free(res);
+	return val;
+}
+
+napi_value filter_get_destinations(napi_env env, napi_callback_info info)
+{
+	GF_Err e;
+	char *res=NULL;
+	s32 idx = -1;
+	NARG_ARGS_THIS(1, 0)
+	FILTER
+
+	//check if 2nd param is int, get opid
+	if (argc && (napi_get_value_int32(env, argv0, &idx) == napi_ok)) {
+	}
+
+	e = gf_filter_get_possible_destinations(f, idx, &res);
+	if (e) {
+		napi_throw_error(env, gf_error_to_string(e), "Failed to get destinations");
+		return NULL;
+	}
+	napi_value val;
+	NAPI_CALL( napi_create_string_utf8(env, res, NAPI_AUTO_LENGTH, &val) );
+	gf_free(res);
+	return val;
+}
+
 napi_value filter_require_source_id(napi_env env, napi_callback_info info)
 {
 	NARG_THIS
@@ -2038,7 +2132,9 @@
 	const char *fname = gf_filter_get_name(f);
 	if (fname && !strcmp(fname, "dashin")) {
 		return dashin_bind(env, info);
-
+	}
+	if (fname && !strcmp(fname, "httpout")) {
+		return httpout_bind(env, info);
 	}
 	napi_throw_error(env, NULL, "Failed to bind to filter, not dashin filter");
 	return NULL;
@@ -2769,6 +2865,8 @@
 	SET_U32(rtt)
 	SET_U32(jitter)
 	SET_U32(loss_rate)
+	NAPI_CALL(napi_set_named_property(env, res, "last_ts_sent", frac64_to_napi(env, &stats.last_ts_sent)) );
+	NAPI_CALL(napi_set_named_property(env, res, "last_ts_drop", frac64_to_napi(env, &stats.last_ts_drop)) );
 	return res;
 }
 napi_value filter_ipid_stats(napi_env env, napi_callback_info info)
@@ -2991,7 +3089,7 @@
 		{ "recompute_dts", 0, filterpid_recompute_dts, 0, 0, 0, napi_enumerable, 0 },
 		{ "resolve_template", 0, filterpid_resolve_template, 0, 0, 0, napi_enumerable, 0 },
 		{ "query_cap", 0, filterpid_query_cap, 0, 0, 0, napi_enumerable, 0 },
-		{ "negociate_cap", 0, filterpid_negociate_cap, 0, 0, 0, napi_enumerable, 0 },
+		{ "negotiate_cap", 0, filterpid_negotiate_cap, 0, 0, 0, napi_enumerable, 0 },
 		{ "get_packet", 0, filterpid_get_packet, 0, 0, 0, napi_enumerable, 0 },
 		{ "drop_packet", 0, filterpid_drop_packet, 0, 0, 0, napi_enumerable, 0 },
 		{ "send_event", 0, filterpid_send_event, 0, 0, 0, napi_enumerable, 0 },
@@ -3469,6 +3567,7 @@
 		{ "set_source", 0, filter_set_source, 0, 0, 0, napi_enumerable, 0 },
 		{ "set_source_restricted", 0, filter_set_source_restricted, 0, 0, 0, napi_enumerable, 0 },
 		{ "insert", 0, filter_insert, 0, 0, 0, napi_enumerable, 0 },
+		{ "reconnect", 0, filter_reconnect, 0, 0, 0, napi_enumerable, 0 },
 		{ "ipid_prop", 0, filter_ipid_prop, 0, 0, 0, napi_enumerable, 0 },
 		{ "ipid_enum_props", 0, filter_ipid_enum_props, 0, 0, 0, napi_enumerable, 0 },
 		{ "opid_prop", 0, filter_opid_prop, 0, 0, 0, napi_enumerable, 0 },
@@ -3482,6 +3581,8 @@
 		{ "bind", 0, filter_bind, 0, 0, 0, napi_enumerable, 0 },
 		{ "ipid_stats", 0, filter_ipid_stats, 0, 0, 0, napi_enumerable, 0 },
 		{ "opid_stats", 0, filter_opid_stats, 0, 0, 0, napi_enumerable, 0 },
+		{ "probe_link", 0, filter_probe_link, 0, 0, 0, napi_enumerable, 0 },
+		{ "get_destinations", 0, filter_get_destinations, 0, 0, 0, napi_enumerable, 0 },
 	};
 
 	if (napi_f) {
@@ -3907,6 +4008,9 @@
 			if (fname && !strcmp(fname, "dashin"))
 				dashin_detach_binding(napi_f);
 
+			if (fname && !strcmp(fname, "httpour"))
+				httpout_detach_binding(napi_f);
+
 			napi_reference_unref(napi_f->env, napi_f->binding_ref, &rcount);
 			napi_delete_reference(napi_f->env, napi_f->binding_ref);
 		}
@@ -4125,6 +4229,11 @@
 static u32 FEVT_PROP_NAME = 63;
 static u32 FEVT_PROP_UI_NAME = 64;
 static u32 FEVT_PROP_PID = 65;
+static u32 FEVT_PROP_TO_PCK = 66;
+static u32 FEVT_PROP_ORIG_DELAY = 67;
+static u32 FEVT_PROP_HINT_FIRST_DTS = 68;
+static u32 FEVT_PROP_HINT_START_OFFSET = 69;
+static u32 FEVT_PROP_HINT_END_OFFSET = 70;
 
 
 #define FILTEREVENT\
@@ -4150,6 +4259,11 @@
 	EVT_BOOL(FEVT_PROP_FORCED_DASH_SWITCH, evt->play.forced_dash_segment_switch);\
 	EVT_BOOL(FEVT_PROP_DROP_NON_REF, evt->play.drop_non_ref);\
 	EVT_BOOL(FEVT_PROP_NO_BYTERANGE, evt->play.no_byterange_forward);\
+	EVT_U32(FEVT_PROP_TO_PCK, evt->play.to_pck);\
+	EVT_U32(FEVT_PROP_ORIG_DELAY, evt->play.orig_delay);\
+	EVT_U64(FEVT_PROP_HINT_FIRST_DTS, evt->play.hint_first_dts);\
+	EVT_U64(FEVT_PROP_HINT_START_OFFSET, evt->play.hint_start_offset);\
+	EVT_U64(FEVT_PROP_HINT_END_OFFSET, evt->play.hint_end_offset);\
 	EVT_U64(FEVT_PROP_START_OFFSET, evt->seek.start_offset);\
 	EVT_U64(FEVT_PROP_END_OFFSET, evt->seek.end_offset);\
 	EVT_U32(FEVT_PROP_HINT_BLOCK_SIZE, evt->seek.hint_block_size);\
@@ -4410,6 +4524,11 @@
 			{ "forced_dash_segment_switch", NULL, NULL, fevt_getter, evt_set, NULL, napi_enumerable, &FEVT_PROP_FORCED_DASH_SWITCH},
 			{ "drop_non_ref", NULL, NULL, fevt_getter, evt_set, NULL, napi_enumerable, &FEVT_PROP_DROP_NON_REF},
 			{ "no_byterange_forward", NULL, NULL, fevt_getter, evt_set, NULL, napi_enumerable, &FEVT_PROP_NO_BYTERANGE},
+			{ "to_pck", NULL, NULL, fevt_getter, evt_set, NULL, napi_enumerable, &FEVT_PROP_TO_PCK},
+			{ "orig_delay", NULL, NULL, fevt_getter, evt_set, NULL, napi_enumerable, &FEVT_PROP_ORIG_DELAY},
+			{ "hint_first_dts", NULL, NULL, fevt_getter, evt_set, NULL, napi_enumerable, &FEVT_PROP_HINT_FIRST_DTS},
+			{ "hint_start_offset", NULL, NULL, fevt_getter, evt_set, NULL, napi_enumerable, &FEVT_PROP_HINT_START_OFFSET},
+			{ "hint_end_offset", NULL, NULL, fevt_getter, evt_set, NULL, napi_enumerable, &FEVT_PROP_HINT_END_OFFSET},
 		};
 		NAPI_CALL( napi_define_properties(env, obj, sizeof(fevt_properties)/sizeof(napi_property_descriptor), fevt_properties) );
 	}
@@ -4751,6 +4870,7 @@
 	DEF_CONST(GF_LOG_INFO)
 	DEF_CONST(GF_LOG_DEBUG)
 
+	DEF_CONST(GF_PROP_FORBIDDEN)
 	DEF_CONST(GF_PROP_BOOL)
 	DEF_CONST(GF_PROP_UINT)
 	DEF_CONST(GF_PROP_SINT)
@@ -4778,12 +4898,14 @@
 	DEF_CONST(GF_PROP_4CC)
 	DEF_CONST(GF_PROP_4CC_LIST)
 
+	DEF_CONST(GF_PROP_FIRST_ENUM)
 	DEF_CONST(GF_PROP_PIXFMT)
 	DEF_CONST(GF_PROP_PCMFMT)
 	DEF_CONST(GF_PROP_CICP_COL_PRIM)
 	DEF_CONST(GF_PROP_CICP_COL_TFC)
 	DEF_CONST(GF_PROP_CICP_COL_MX)
-
+	DEF_CONST(GF_PROP_CICP_LAYOUT)
+	DEF_CONST(GF_PROP_FIRST_ENUM)
 
 	DEF_CONST(GF_FEVT_PLAY)
 	DEF_CONST(GF_FEVT_SET_SPEED)
@@ -4855,7 +4977,7 @@
 	DEF_CONST(GF_IP_NETWORK_EMPTY)
 	DEF_CONST(GF_IP_UDP_TIMEOUT)
 	DEF_CONST(GF_AUTHENTICATION_FAILURE)
-	DEF_CONST(GF_SCRIPT_NOT_READY)
+	DEF_CONST(GF_NOT_READY)
 	DEF_CONST(GF_INVALID_CONFIGURATION)
 	DEF_CONST(GF_NOT_FOUND)
 	DEF_CONST(GF_PROFILE_NOT_SUPPORTED)
@@ -5128,41 +5250,9 @@
 	DEF_CONST(GF_FS_FLAG_NO_RESERVOIR)
 	DEF_CONST(GF_FS_FLAG_FULL_LINK)
 	DEF_CONST(GF_FS_FLAG_NO_IMPLICIT)
-
-
-	DEF_CONST(GF_PROP_FORBIDEN)
-	DEF_CONST(GF_PROP_SINT)
-	DEF_CONST(GF_PROP_UINT)
-	DEF_CONST(GF_PROP_LSINT)
-	DEF_CONST(GF_PROP_LUINT)
-	DEF_CONST(GF_PROP_BOOL)
-	DEF_CONST(GF_PROP_FRACTION)
-	DEF_CONST(GF_PROP_FRACTION64)
-	DEF_CONST(GF_PROP_FLOAT)
-	DEF_CONST(GF_PROP_DOUBLE)
-	DEF_CONST(GF_PROP_VEC2I)
-	DEF_CONST(GF_PROP_VEC2)
-	DEF_CONST(GF_PROP_VEC3I)
-	DEF_CONST(GF_PROP_VEC4I)
-	DEF_CONST(GF_PROP_STRING)
-	DEF_CONST(GF_PROP_STRING_NO_COPY)
-	DEF_CONST(GF_PROP_DATA)
-	DEF_CONST(GF_PROP_NAME)
-	DEF_CONST(GF_PROP_DATA_NO_COPY)
-	DEF_CONST(GF_PROP_CONST_DATA)
-	DEF_CONST(GF_PROP_POINTER)
-	DEF_CONST(GF_PROP_STRING_LIST)
-	DEF_CONST(GF_PROP_UINT_LIST)
-	DEF_CONST(GF_PROP_SINT_LIST)
-	DEF_CONST(GF_PROP_VEC2I_LIST)
-	DEF_CONST(GF_PROP_4CC)
-	DEF_CONST(GF_PROP_4CC_LIST)
-	DEF_CONST(GF_PROP_FIRST_ENUM)
-	DEF_CONST(GF_PROP_PIXFMT)
-	DEF_CONST(GF_PROP_PCMFMT)
-	DEF_CONST(GF_PROP_CICP_COL_PRIM)
-	DEF_CONST(GF_PROP_CICP_COL_TFC)
-	DEF_CONST(GF_PROP_CICP_COL_MX)
+	DEF_CONST(GF_FS_FLAG_REQUIRE_SOURCE_ID)
+	DEF_CONST(GF_FS_FLAG_FORCE_DEFER_LINK)
+	DEF_CONST(GF_FS_FLAG_PREVENT_PLAY)
 
 	DEF_CONST(GF_FS_ARG_HINT_NORMAL)
 	DEF_CONST(GF_FS_ARG_HINT_ADVANCED)
@@ -5594,6 +5684,374 @@
 	gf_free(napi_dash);
 }
 
+typedef struct
+{
+	napi_ref ref;
+	napi_env env;
+} NAPI_HTTPOut;
+
+void httpoutbind_finalize(napi_env env, void* finalize_data, void* finalize_hint)
+{
+}
+
+typedef struct
+{
+	void *httpout_session;
+	napi_env env;
+	napi_ref req_ref;
+} NAPI_HTTPSession;
+
+void napi_http_del(napi_env env, void *finalize_data, void* finalize_hint)
+{
+	NAPI_HTTPSession *napi_http = (NAPI_HTTPSession *)finalize_data;
+	if (napi_http) gf_free(napi_http);
+}
+
+
+static u32 httpout_throttle_cbk(void *udta, u64 done, u64 total)
+{
+	napi_value req;
+	napi_value fun_val, args2, res;
+	u32 retval=0;
+	NAPI_HTTPSession *napi_sess = (NAPI_HTTPSession *)udta;
+
+	//call
+	napi_get_reference_value(napi_sess->env, napi_sess->req_ref, &req);
+	napi_get_named_property(napi_sess->env, req, "throttle", &fun_val);
+	napi_create_int64(napi_sess->env, done, &args0);
+	napi_create_int64(napi_sess->env, total, &args1);
+	napi_call_function(napi_sess->env, req, fun_val, 2, args, &res);
+	napi_get_value_uint32(napi_sess->env, res, &retval);
+
+	return retval;
+}
+static s32 httpout_read_cbk(void *udta, u8 *buffer, u32 buffer_size)
+{
+	napi_value req;
+	napi_value fun_val, arg, ab, res;
+	u32 nb_bytes=0;
+	napi_status status;
+	NAPI_HTTPSession *napi_sess = (NAPI_HTTPSession *)udta;
+
+
+	//call
+	napi_get_reference_value(napi_sess->env, napi_sess->req_ref, &req);
+	napi_get_named_property(napi_sess->env, req, "read", &fun_val);
+
+	//create arg
+#if NAPI_VERSION >= 7
+	status = napi_create_external_arraybuffer(napi_sess->env, buffer, buffer_size, NULL, NULL, &ab);
+#else
+	void *buf_data=NULL;
+	status = napi_create_arraybuffer(napi_sess->env, buffer_size, &buf_data, &ab);
+#endif
+
+	if (status==napi_ok)
+		status = napi_create_typedarray(napi_sess->env, napi_uint8_array, buffer_size, ab, 0, &arg);
+
+	//call
+	if (status==napi_ok)
+		status = napi_call_function(napi_sess->env, req, fun_val, 1, &arg, &res);
+
+	if (status==napi_ok)
+		status = napi_get_value_uint32(napi_sess->env, res, &nb_bytes);
+
+#if NAPI_VERSION >= 7
+	//detach array buffer
+	napi_detach_arraybuffer(napi_sess->env, ab);
+#else
+	if ((status==napi_ok) && buf_data && nb_bytes)
+		memcpy(buffer, buf_data, nb_bytes);
+#endif
+	return nb_bytes;
+}
+static u32 httpout_write_cbk(void *udta, const u8 *buffer, u32 buffer_size)
+{
+	napi_value req;
+	napi_value fun_val, arg, ab, res;
+	u32 nb_bytes=0;
+	napi_status status;
+	NAPI_HTTPSession *napi_sess = (NAPI_HTTPSession *)udta;
+
+	//call
+	napi_get_reference_value(napi_sess->env, napi_sess->req_ref, &req);
+	napi_get_named_property(napi_sess->env, req, "write", &fun_val);
+
+	//create arg
+#if NAPI_VERSION >= 7
+	status = napi_create_external_arraybuffer(napi_sess->env, (void *)buffer, buffer_size, NULL, NULL, &ab);
+#else
+	void *buf_data=NULL;
+	status = napi_create_arraybuffer(napi_sess->env, buffer_size, &buf_data, &ab);
+	if (status == napi_ok) {
+		memcpy(buf_data, buffer, buffer_size);
+	}
+#endif
+
+	if (status==napi_ok)
+		status = napi_create_typedarray(napi_sess->env, napi_uint8_array, buffer_size, ab, 0, &arg);
+
+	//call
+	if (status==napi_ok)
+		status = napi_call_function(napi_sess->env, req, fun_val, 1, &arg, &res);
+
+	if (status==napi_ok)
+		status = napi_get_value_uint32(napi_sess->env, res, &nb_bytes);
+
+#if NAPI_VERSION >= 7
+	//detach arraybuffer
+	napi_detach_arraybuffer(napi_sess->env, ab);
+#endif
+
+	if (status!=napi_ok) return 0;
+	return nb_bytes;
+}
+static void httpout_on_close_cbk(void *udta, GF_Err reason)
+{
+	napi_value req;
+	NAPI_HTTPSession *napi_sess = (NAPI_HTTPSession *)udta;
+
+	//call
+	napi_get_reference_value(napi_sess->env, napi_sess->req_ref, &req);
+
+	Bool has_p = GF_FALSE;
+	napi_has_named_property(napi_sess->env, req, "close", (bool *) &has_p);
+	if (has_p) {
+		napi_value fun_val, arg, res;
+		napi_get_named_property(napi_sess->env, req, "close", &fun_val);
+		napi_create_uint32(napi_sess->env, reason, &arg);
+		napi_call_function(napi_sess->env, req, fun_val, 1, &arg, &res);
+	}
+	napi_delete_reference(napi_sess->env, napi_sess->req_ref);
+}
+
+GF_Err gf_httpout_send_request(void *sess, void *udta,
+	u32 reply,
+	char *body_or_file,
+	u32 nb_headers,
+	const char **headers,
+	u32 (*throttle)(void *udta, u64 done, u64 total),
+	s32 (*read)(void *udta, u8 *buffer, u32 buffer_size),
+	u32 (*write)(void *udta, const u8 *buffer, u32 buffer_size),
+	void (*close)(void *udta, GF_Err reason)
+);
+
+napi_value httpout_send_cbk(napi_env env, napi_callback_info info)
+{
+	napi_value val;
+	u32 i, reply=0;
+	size_t size;
+	char *body_or_file=NULL;
+	u32 nb_headers=0;
+	char **headers=NULL;
+	Bool use_throttle=GF_FALSE;
+	Bool use_read=GF_FALSE;
+	Bool use_write=GF_FALSE;
+
+	NARG_THIS
+
+	NAPI_HTTPSession *napi_hsess;
+	bool _tag;
+	NAPI_CALL( napi_check_object_type_tag(env, this_val, &httpsess_tag, &_tag) );
+	if (!_tag) {
+		napi_throw_error(env, NULL, "Not a HTTP session object");
+		return NULL;
+	}
+	NAPI_CALL( napi_unwrap(env, this_val, (void**) &napi_hsess) );
+
+	napi_get_named_property(env, this_val, "reply", &val);
+	napi_get_value_uint32(env, val, &reply);
+
+	Bool has_p = GF_FALSE;
+	napi_has_named_property(env, this_val, "body", (bool *) &has_p);
+	if (has_p) {
+		napi_get_named_property(env, this_val, "body", &val);
+		napi_get_value_string_utf8(env, val, NULL, 0, &size);
+		body_or_file = gf_malloc(sizeof(char) * (size+1) );
+		napi_get_value_string_utf8(env, val, body_or_file, size+1, &size);
+		body_or_filesize=0;
+	}
+
+	napi_has_named_property(env, this_val, "headers_out", (bool *) &has_p);
+	if (has_p) {
+		napi_value hdrs;
+		u32 nb_items;
+		napi_get_named_property(env, this_val, "headers_out", &hdrs);
+		napi_get_array_length(env, hdrs, &nb_items);
+		for (i=0; i<nb_items; i++) {
+			napi_value h;
+			napi_get_element(env, hdrs, i, &h);
+			napi_has_named_property(env, h, "name", (bool *) &has_p);
+			if (!has_p) continue;
+			napi_has_named_property(env, h, "value", (bool *) &has_p);
+			if (!has_p) continue;
+
+			headers = gf_realloc(headers, sizeof(char *) * (nb_headers+2));
+
+			napi_get_named_property(env, h, "name", &val);
+			napi_get_value_string_utf8(env, val, NULL, 0, &size);
+			headersnb_headers = gf_malloc(sizeof(char) * (size+1) );
+			napi_get_value_string_utf8(env, val, headersnb_headers, size+1, &size);
+			headersnb_headerssize=0;
+
+			napi_get_named_property(env, h, "value", &val);
+			napi_get_value_string_utf8(env, val, NULL, 0, &size);
+			headersnb_headers+1 = gf_malloc(sizeof(char) * (size+1) );
+			napi_get_value_string_utf8(env, val, headersnb_headers+1, size+1, &size);
+			headersnb_headers+1size=0;
+			nb_headers += 2;
+		}
+	}
+
+	napi_has_named_property(env, this_val, "throttle", (bool *) &has_p);
+	if (has_p) use_throttle = GF_TRUE;
+	napi_has_named_property(env, this_val, "read", (bool *) &has_p);
+	if (has_p) use_read = GF_TRUE;
+	napi_has_named_property(env, this_val, "write", (bool *) &has_p);
+	if (has_p) use_write = GF_TRUE;
+
+	gf_httpout_send_request(napi_hsess->httpout_session, napi_hsess, reply, body_or_file, nb_headers, (const char**) headers,
+		use_throttle ? httpout_throttle_cbk : NULL,
+		use_read ? httpout_read_cbk : NULL,
+		use_write ? httpout_write_cbk : NULL,
+		httpout_on_close_cbk);
+
+	if (body_or_file) gf_free(body_or_file);
+	if (headers) {
+		for (i=0; i<nb_headers; i++) {
+			gf_free(headersi);
+		}
+		gf_free(headers);
+	}
+	return NULL;
+}
+
+s32 httpout_on_request(void *udta, void *session, const char *method, const char *url, u32 auth_code, u32 nb_hdrs, const char **hdrs)
+{
+	napi_status status;
+	napi_value req_obj;
+	u32 i;
+	napi_value obj, fun_val, res;
+	NAPI_HTTPOut *napi_http = (NAPI_HTTPOut *)udta;
+	NAPI_HTTPSession *napi_sess;
+
+	//create request object
+	GF_SAFEALLOC(napi_sess, NAPI_HTTPSession);
+	if (!napi_sess) return 1;
+	napi_sess->httpout_session = session;
+	napi_sess->env = napi_http->env;
+
+	napi_create_object(napi_http->env, &req_obj);
+	napi_create_reference(napi_http->env, req_obj, 1, &napi_sess->req_ref);
+	napi_type_tag_object(napi_http->env, req_obj, &httpsess_tag);
+	napi_wrap(napi_http->env, req_obj, napi_sess, napi_http_del, NULL, NULL);
+
+	//set properties
+	napi_value val;
+	status = napi_create_string_utf8(napi_http->env, method, NAPI_AUTO_LENGTH, &val);
+	if (status==napi_ok) status = napi_set_named_property(napi_http->env, req_obj, "method", val);
+	if (status!=napi_ok) return 1;
+
+	status = napi_create_string_utf8(napi_http->env, url, NAPI_AUTO_LENGTH, &val);
+	if (status==napi_ok) status = napi_set_named_property(napi_http->env, req_obj, "url", val);
+	if (status!=napi_ok) return 1;
+
+	status = napi_create_uint32(napi_http->env, auth_code, &val);
+	if (status==napi_ok) status = napi_set_named_property(napi_http->env, req_obj, "auth_code", val);
+	if (status!=napi_ok) return 1;
+
+	status = napi_create_uint32(napi_http->env, 0, &val);
+	if (status==napi_ok) status = napi_set_named_property(napi_http->env, req_obj, "reply", val);
+	if (status!=napi_ok) return 1;
+
+	status = napi_create_function(napi_http->env, "send", NAPI_AUTO_LENGTH, httpout_send_cbk, napi_http, &val);
+	if (status==napi_ok) status = napi_set_named_property(napi_http->env, req_obj, "send", val);
+	if (status!=napi_ok) return 1;
+
+	napi_value in_headers;
+	napi_create_array(napi_http->env, &in_headers);
+	for (i=0; i<nb_hdrs;i+=2) {
+		napi_value h;
+		napi_create_object(napi_http->env, &h);
+		napi_create_string_utf8(napi_http->env, hdrsi, NAPI_AUTO_LENGTH, &val);
+		napi_set_named_property(napi_http->env, h, "name", val);
+		napi_create_string_utf8(napi_http->env, hdrsi+1, NAPI_AUTO_LENGTH, &val);
+		napi_set_named_property(napi_http->env, h, "value", val);
+		napi_set_element(napi_http->env, in_headers, i/2, h);
+	}
+	napi_set_named_property(napi_http->env, req_obj, "headers_in", in_headers);
+
+	napi_value out_headers;
+	napi_create_array(napi_http->env, &out_headers);
+	napi_set_named_property(napi_http->env, req_obj, "headers_out", out_headers);
+
+	//call
+	napi_get_reference_value(napi_http->env, napi_http->ref, &obj);
+	status = napi_get_named_property(napi_http->env, obj, "on_request", &fun_val);
+	if (status!=napi_ok) return 1;
+	napi_call_function(napi_http->env, obj, fun_val, 1, &req_obj, &res);
+	return 0;
+}
+
+GF_Err gf_filter_bind_httpout_callbacks(GF_Filter *filter, void *udta,
+	s32 (*on_request)(void *udta, void *session, const char *method, const char *url, u32 auth_code, u32 nb_hdrs, const char **hdrs)
+);
+
+napi_value httpout_bind(napi_env env, napi_callback_info info)
+{
+	GF_Err e;
+	NAPI_HTTPOut *napi_http;
+
+	NARG_ARGS_THIS(1,1)
+	FILTER
+
+	NAPI_Filter *napi_f = (NAPI_Filter *) gf_filter_get_rt_udta(f);
+
+	Bool has_fun = GF_FALSE;
+	napi_has_named_property(napi_f->env, argv0, "on_request", (bool *) &has_fun);
+	if (!has_fun) {
+		napi_throw_error(env, NULL, "Invalid httpout binding object, missing on_request callback");
+		return NULL;
+	}
+
+	GF_SAFEALLOC(napi_http, NAPI_HTTPOut);
+	if (!napi_http) {
+		napi_throw_error(env, NULL, "Failed to allocate httpout binding");
+		return NULL;
+	}
+
+	napi_create_reference(env, argv0, 1, &napi_f->binding_ref);
+	napi_http->ref = napi_f->binding_ref;
+	napi_http->env = env;
+	napi_f->binding_stack = napi_http;
+
+	napi_type_tag_object(env, argv0, &dashbind_tag);
+	NAPI_CALL( napi_wrap(env, argv0, napi_http, httpoutbind_finalize, NULL, NULL) );
+
+	e = gf_filter_bind_httpout_callbacks(f, napi_http, httpout_on_request);
+	if (e) {
+		u32 rcount;
+		napi_reference_unref(env, napi_f->binding_ref, &rcount);
+		napi_delete_reference(env, napi_f->binding_ref);
+		napi_f->binding_ref = NULL;
+		napi_f->binding_stack = NULL;
+		gf_free(napi_http);
+
+		napi_throw_error(env, gf_error_to_string(e), "Failed to bind httpout callbacks");
+		return NULL;
+	}
+	//tag httpout filter to run on main thread only
+	gf_filter_force_main_thread(napi_f->f, GF_TRUE);
+	return NULL;
+}
+
+void httpout_detach_binding(NAPI_Filter *napi_f)
+{
+	NAPI_HTTPOut *napi_http = (NAPI_HTTPOut *) napi_f->binding_stack;
+	if (!napi_http) return;
+	gf_free(napi_http);
+}
+
 typedef struct _napi_fio
 {
 	//points to factory object (passed in FileIO constructor)

gpac-2.2.1.tar.gz/share/nodejs/test/gpac.js -> gpac-2.4.0.tar.gz/share/nodejs/test/gpac.js Changed

@@ -27,6 +27,7 @@
 let is_verbose=false;
 let start_time=0;
 let custom_dash=false;
+let custom_httpout=false;
 
 let fileio_sources=false;
 let fileio_sinks=false;
@@ -73,6 +74,7 @@
 	console.log("-task=N:      runs user test task every second for N seconds (0 means until end)");
 	console.log("-play=N:      overrides PLAY event in forward mode to the given start time in seconds");
 	console.log("-cdash:       test custom DASH algo");
+	console.log("-chttp:       test custom HTTP request handler");
 	console.log("-v:           enables info dump, property dump for PIDs and packets");
 	console.log("-h:           prints help");
 	console.log();
@@ -262,6 +264,7 @@
 	else if (val == '-ib') fileio_sources = true;
 	else if (val == '-ob') fileio_sinks = true;
 	else if (val == '-cdash') custom_dash = true;
+	else if (val == '-chttp') custom_httpout = true;
 
 	else if (val.startsWith('-')) {
 		other_args.push(val);
@@ -296,6 +299,21 @@
 	};
 }
 
+let http_req = null;
+if (custom_httpout) {
+	http_req = {
+		on_request: function (req) {
+			console.log('got resquest ' + JSON.stringify(req));
+			req.headers_out = {name: "x-GPAC", value: "foo"};
+			req.close = function(error) {
+				console.log("Closing: " + gpac.e2s(error));
+			}
+			req.replys=0;
+			req.send();
+		}
+	};
+}
+
 
 gpac.set_rmt_fun( (msg) => {
 	console.log('RMT got message ' + msg);
@@ -320,6 +338,13 @@
 			console.log('Failed to bind dash algo: ' + e);
 		}
 	}
+	else if (http_req && (f.name=="httpout")) {
+		try {
+			f.bind(http_req);
+		} catch (e) {
+			console.log('Failed to bind http request handler: ' + e);
+		}
+	}
 }
 fs.on_filter_del = function(f) {
 	if (is_verbose)

gpac-2.2.1.tar.gz/share/python/libgpac/libgpac.py -> gpac-2.4.0.tar.gz/share/python/libgpac/libgpac.py Changed

@@ -2,7 +2,7 @@
 #          GPAC - Multimedia Framework C SDK
 #
 #          Authors: Jean Le Feuvre
-#          Copyright (c) Telecom Paris 2020-2022
+#          Copyright (c) Telecom Paris 2020-2024
 #                  All rights reserved
 #
 #  Python ctypes bindings for GPAC (core initialization and filters API only)
@@ -44,7 +44,7 @@
 #
 # Properties types are automatically converted to and from string. If the property name is not a built-in property type, the property is assumed to be a user-defined property. 
 # For example, when querying or setting a stream type property, use the property name `StreamType`.
-# See `gpac -h props`(https://github.com/gpac/gpac/wiki/filters_properties) for the complete list of built-in property names.
+# See `gpac -h props`(https://wiki.gpac.io/Filters/filters_properties/) for the complete list of built-in property names.
 #
 # Properties values are automatically converted to or from python types whenever possible. Types with no python equivalent (vectors, fractions) are defined as classes in python.
 # For example:
@@ -137,7 +137,7 @@
 # - process: callback for processing
 # - process_event: callback for processing and event
 # - probe_data: callback for probing a data format
-# - reconfigure_output: callback for output reconfiguration (PID capability negociation)
+# - reconfigure_output: callback for output reconfiguration (PID capability negotiation)
 #
 # A custom filter must also declare its capabilities, input and output, using push_cap method 
 # \code
@@ -242,7 +242,7 @@
 
 #change this to reflect API we encapsulate. An incomatibility in either of these will throw a warning
 GF_ABI_MAJOR=12
-GF_ABI_MINOR=10
+GF_ABI_MINOR=14
 
 gpac_abi_major=_libgpac.gf_gpac_abi_major()
 gpac_abi_minor=_libgpac.gf_gpac_abi_minor()
@@ -297,6 +297,7 @@
 _libgpac.gf_sys_clock.restype = c_uint
 _libgpac.gf_sys_clock_high_res.restype = c_ulonglong
 
+_libgpac.gf_sys_profiler_log.argtypes = c_char_p
 _libgpac.gf_sys_profiler_send.argtypes = c_char_p
 _libgpac.gf_sys_profiler_sampling_enabled.restype = gf_bool
 _libgpac.gf_sys_profiler_enable_sampling.argtypes = gf_bool
@@ -310,6 +311,9 @@
 _libgpac.gf_sleep.argtypes = c_uint
 _libgpac.gf_sleep.restype = c_uint
 
+_libgpac.gf_props_enum_name.argtypes = c_uint, c_uint
+_libgpac.gf_props_enum_name.restype = c_char_p
+
 #default init of libgpac
 _libgpac.user_init = False
 err = _libgpac.gf_sys_init(0, None)
@@ -423,6 +427,15 @@
         return False
     return True
 
+## send message to profiler (Remotery) - see \ref gf_sys_profiler_log
+# \param text text to send
+# \return True if success, False if no Remotery support
+def rmt_log(text):
+    err = _libgpac.gf_sys_profiler_log(text.encode('utf-8'))
+    if err<0:
+        return False
+    return True
+
 ## send message to profiler (Remotery) - see \ref gf_sys_profiler_send
 # \param text text to send
 # \return True if success, False if no Remotery support
@@ -547,7 +560,9 @@
 		("last_rt_report", c_ulonglong),
 		("rtt", c_uint),
 		("jitter", c_uint),
-		("loss_rate", c_uint)
+		("loss_rate", c_uint),
+		("last_ts_drop", Fraction64),
+		("last_ts_sent", Fraction64)
 	
     ## \endcond
 ## filter argument object, as defined in libgpac and usable as a Python object
@@ -732,7 +747,12 @@
         ("full_file_only", c_ubyte),
         ("forced_dash_segment_switch", c_ubyte),
         ("drop_non_ref", c_ubyte),
-        ("no_byterange_forward", c_ubyte)
+        ("no_byterange_forward", c_ubyte),
+        ("to_pck", c_uint),
+        ("orig_delay", c_uint),
+        ("hint_first_dts", c_ulonglong),
+        ("hint_start_offset", c_ulonglong),
+        ("hint_end_offset", c_ulonglong)
     
     ## \endcond
 
@@ -764,7 +784,24 @@
         ("media_range_start", c_ulonglong),
         ("media_range_end", c_ulonglong),
         ("idx_range_start", c_ulonglong),
-        ("idx_range_end", c_ulonglong)
+        ("idx_range_end", c_ulonglong),
+        ("is_init", c_ubyte),
+        ("is_shift", c_ubyte)
+    
+    ## \endcond
+
+## event value, as defined in libgpac and usable as a Python object
+#Fields have the same types, names and semantics as \ref GF_FEVT_FragmentSize
+class FEVT_FragmentSize(Structure):
+    ## \cond private
+    _fields_ =  
+        ("type", c_uint),
+        ("on_pid", _gf_filter_pid),
+        ("is_last", gf_bool),
+        ("offset", c_ulonglong),
+        ("size", c_ulonglong),
+        ("duration", Fraction64),
+        ("independent", gf_bool),
     
     ## \endcond
 
@@ -839,12 +876,144 @@
     ## \endcond
 
 ## event value, as defined in libgpac and usable as a Python object
+#Fields have the same types, names and semantics as \ref GF_FEVT_EncodeHints
+class FEVT_EncodeHints(Structure):
+    ## \cond private
+    _fields_ =  
+        ("type", c_uint),
+        ("on_pid", _gf_filter_pid),
+        ("intra_period", Fraction),
+        ("gen_dsi_only", gf_bool)
+    
+    ## \endcond
+
+## event value, as defined in libgpac and usable as a Python object
+#Fields have the same types, names and semantics as \ref GF_FEVT_NTPRef
+class FEVT_NTPRef(Structure):
+    ## \cond private
+    _fields_ =  
+        ("type", c_uint),
+        ("on_pid", _gf_filter_pid),
+        ("ntp", c_ulonglong)
+    
+    ## \endcond
+
+
+## event value, as defined in libgpac and usable as a Python object
+#Fields have the same types, names and semantics as \ref GF_EventMouse
+class EVT_mouse(Structure):
+    ## \cond private
+    _fields_ =  
+        ("type", c_ubyte),
+        ("x", c_int),
+        ("y", c_int),
+        ("wheel", c_float),
+        ("button", c_int),
+        ("keys", c_uint),
+        ("window_id", c_uint)
+    
+    ## \endcond
+
+## event value, as defined in libgpac and usable as a Python object
+#Fields have the same types, names and semantics as \ref GF_EventMultiTouch
+class EVT_mtouch(Structure):
+    ## \cond private
+    _fields_ =  
+        ("type", c_ubyte),
+        ("x", c_float),
+        ("y", c_float),
+        ("rotation", c_float),
+        ("pinch", c_float),
+        ("num_fingers", c_uint),
+        ("window_id", c_uint)
+    
+    ## \endcond
+
+## event value, as defined in libgpac and usable as a Python object
+#Fields have the same types, names and semantics as \ref GF_EventKey
+class EVT_keys(Structure):
+    ## \cond private
+    _fields_ =  
+        ("type", c_ubyte),
+        ("key_code", c_uint),
+        ("hw_code", c_uint),
+        ("flags", c_uint),
+        ("window_id", c_uint)
+    
+    ## \endcond
+
+## event value, as defined in libgpac and usable as a Python object
+#Fields have the same types, names and semantics as \ref GF_EventChar
+class EVT_char(Structure):
+    ## \cond private
+    _fields_ =  
+        ("type", c_ubyte),
+        ("unicode_char", c_uint),
+        ("window_id", c_uint)
+    
+    ## \endcond
+
+## event value, as defined in libgpac and usable as a Python object
+#Fields have the same types, names and semantics as \ref GF_EventSize
+class EVT_size(Structure):
+    ## \cond private
+    _fields_ =  
+        ("type", c_ubyte),
+        ("width", c_uint),
+        ("height", c_uint),
+        ("orientation", c_uint),
+        ("window_id", c_uint)
+    
+    ## \endcond
+
+## event value, as defined in libgpac and usable as a Python object
+#Fields have the same types, names and semantics as \ref GF_EventShow
+class EVT_show(Structure):
+    ## \cond private
+    _fields_ =  
+        ("type", c_ubyte),
+        ("show_type", c_uint),
+        ("window_id", c_uint)
+    
+    ## \endcond
+
+
+## event value, as defined in libgpac and usable as a Python object
+#Fields have the same types, names and semantics as GF_Event
+#only common events from GPAC video ouput are mapped
+class EVT_base(Union):
+    ## \cond private
+    _fields_ =  
+        ("type", c_ubyte),
+        ("mouse", EVT_mouse),
+        ("mtouch", EVT_mtouch),
+        ("keys", EVT_keys),
+        ("char", EVT_char),
+        ("size", EVT_size),
+        ("show", EVT_show)
+    
+    ## \endcond
+
+
+## event value, as defined in libgpac and usable as a Python object
+#Fields have the same types, names and semantics as \ref GF_FEVT_Event
+class FEVT_UserEvent(Structure):
+    ## \cond private
+    _fields_ =  
+        ("type", c_uint),
+        ("on_pid", _gf_filter_pid),
+        ("event", EVT_base)
+    
+    ## \endcond
+
+
+## event value, as defined in libgpac and usable as a Python object
 #Fields have the same types, names and semantics as GF_FilterEvent
 class FilterEvent(Union):
     ## constructor
-    #\param type type of event
-    def __init__(self, type=0):
-        self.base.type = type
+    #\param evt_type type of event
+    def __init__(self, evt_type=0):
+        self.base.type = evt_type
     ## \cond private
         _libgpac.user_init = True
 
@@ -853,12 +1022,15 @@
         ("play", FEVT_Play),
         ("seek", FEVT_SourceSeek),
         ("attach_scene", FEVT_AttachScene),
-        #("user_event", FEVT_Event,
+        ("user", FEVT_UserEvent),
         ("quality_switch", FEVT_QualitySwitch),
         ("visibility_hint", FEVT_VisibilityHint),
         ("buffer_req", FEVT_BufferRequirement),
         ("seg_size", FEVT_SegmentSize),
-        ("file_del", FEVT_FileDelete)
+        ("frag_size", FEVT_FragmentSize),
+        ("file_del", FEVT_FileDelete),
+        ("encode_hints", FEVT_EncodeHints),
+        ("ntp", FEVT_NTPRef)
     
     ## \endcond
 
@@ -944,11 +1116,19 @@
 ##\hideinitializer
 #see \ref GF_FS_FLAG_NO_IMPLICIT
 GF_FS_FLAG_NO_IMPLICIT=1<<11
-
+##\hideinitializer
+#see \ref GF_FS_FLAG_REQUIRE_SOURCE_ID
+GF_FS_FLAG_REQUIRE_SOURCE_ID=1<<12
+##\hideinitializer
+#see \ref GF_FS_FLAG_FORCE_DEFER_LINK
+GF_FS_FLAG_FORCE_DEFER_LINK = 1<<13
+##\hideinitializer
+#see \ref GF_FS_FLAG_PREVENT_PLAY
+GF_FS_FLAG_PREVENT_PLAY = 1<<14
 
 ##\hideinitializer
-#see \ref GF_PROP_FORBIDEN
-GF_PROP_FORBIDEN=0
+#see \ref GF_PROP_FORBIDDEN
+GF_PROP_FORBIDDEN=0
 ##\hideinitializer
 #see \ref GF_PROP_SINT
 GF_PROP_SINT=1
@@ -1046,6 +1226,9 @@
 ##\hideinitializer
 #see \ref GF_PROP_CICP_COL_MX
 GF_PROP_CICP_COL_MX=GF_PROP_FIRST_ENUM+4
+##\hideinitializer
+#see \ref GF_PROP_CICP_LAYOUT
+GF_PROP_CICP_LAYOUT=GF_PROP_FIRST_ENUM+5
 
 ##\hideinitializer
 #see GF_FEVT_PLAY
@@ -1295,8 +1478,8 @@
 #see \ref GF_AUTHENTICATION_FAILURE
 GF_AUTHENTICATION_FAILURE = -50
 ##\hideinitializer
-#see \ref GF_SCRIPT_NOT_READY
-GF_SCRIPT_NOT_READY = -51
+#see \ref GF_NOT_READY
+GF_NOT_READY = -51
 ##\hideinitializer
 #see \ref GF_INVALID_CONFIGURATION
 GF_INVALID_CONFIGURATION = -52
@@ -1500,15 +1683,15 @@
         ##\endcond private
 
     ## called whenever a new filter is added, typically used by classes deriving from FilterSession
-    #\param filter Filter object being added
+    #\param _filter Filter object being added
     #\return
-    def on_filter_new(self, filter):
+    def on_filter_new(self, _filter):
         pass
 
     ## called whenever a filter is destroyed, typically used by classes deriving from FilterSession
-    #\param filter Filter object being removed
+    #\param _filter Filter object being removed
     #\return
-    def on_filter_del(self, filter):
+    def on_filter_del(self, _filter):
         pass
 
     ## called whenever a GL context must be activated, typically used by classes deriving from FilterSession
@@ -1527,9 +1710,9 @@
         for i, a_f in enumerate(self._filters):
             if a_f._filter == f:
                 return a_f
-        filter = Filter(self, f)
-        self._filters.append(filter)
-        return filter
+        _filter = Filter(self, f)
+        self._filters.append(_filter)
+        return _filter
     ##\endcond private
 
     ##run the session - see \ref gf_fs_run
@@ -1546,13 +1729,13 @@
     def load_src(self, URL, parentURL=None):
         errp = c_int(0)
         if parentURL:
-            filter = _libgpac.gf_fs_load_source(self._sess, URL.encode('utf-8'), None, parentURL.encode('utf-8'), byref(errp))
+            _filter = _libgpac.gf_fs_load_source(self._sess, URL.encode('utf-8'), None, parentURL.encode('utf-8'), byref(errp))
         else:
-            filter = _libgpac.gf_fs_load_source(self._sess, URL.encode('utf-8'), None, None, byref(errp))
+            _filter = _libgpac.gf_fs_load_source(self._sess, URL.encode('utf-8'), None, None, byref(errp))
         err = errp.value
         if err<0: 
             raise Exception('Failed to load source filter ' + URL + ': ' + e2s(err))
-        return self._to_filter(filter)
+        return self._to_filter(_filter)
 
     ##load destination filter - see \ref gf_fs_load_destination
     #\param URL source URL to load
@@ -1561,13 +1744,13 @@
     def load_dst(self, URL, parentURL=None):
         errp = c_int(0)
         if parentURL:
-            filter = _libgpac.gf_fs_load_destination(self._sess, URL.encode('utf-8'), None, parentURL.encode('utf-8'), byref(errp))
+            _filter = _libgpac.gf_fs_load_destination(self._sess, URL.encode('utf-8'), None, parentURL.encode('utf-8'), byref(errp))
         else:
-            filter = _libgpac.gf_fs_load_destination(self._sess, URL.encode('utf-8'), None, None, byref(errp))
+            _filter = _libgpac.gf_fs_load_destination(self._sess, URL.encode('utf-8'), None, None, byref(errp))
         err = errp.value
         if err<0: 
             raise Exception('Failed to load destination filter ' + URL + ': ' + e2s(err))
-        return self._to_filter(filter)
+        return self._to_filter(_filter)
 
 
     ##load a filter - see \ref gf_fs_load_filter
@@ -1575,11 +1758,11 @@
     #\return new Filter object
     def load(self, fname):
         errp = c_int(0)
-        filter = _libgpac.gf_fs_load_filter(self._sess, fname.encode('utf-8'), byref(errp))
+        _filter = _libgpac.gf_fs_load_filter(self._sess, fname.encode('utf-8'), byref(errp))
         err = errp.value
         if err<0: 
             raise Exception('Failed to load filter ' + fname + ': ' + e2s(err))
-        return self._to_filter(filter)
+        return self._to_filter(_filter)
 
     ##post a user task to the filter sesison - see \ref gf_fs_post_user_task
     #\param task task object to post
@@ -1638,12 +1821,12 @@
 
     ##fire an event on the given filter if any, or on any filter accepting user events
     # \param evt FilterEvent to fire
-    # \param filter Filter to use as target
+    # \param _filter Filter to use as target
     # \param upstream if true, walks the chain towards the sink, otehrwise towards the source
     #\return
-    def fire_event(self, evt, filter=None, upstream=False):
-        if filter:
-            return _libgpac.gf_fs_fire_event(self._sess, filter._filter, byref(evt), upstream)
+    def fire_event(self, evt, _filter=None, upstream=False):
+        if _filter:
+            return _libgpac.gf_fs_fire_event(self._sess, _filter._filter, byref(evt), upstream)
         return _libgpac.gf_fs_fire_event(self._sess, None, byref(evt), upstream)
 
     ##checks if a given mime is supported - see \ref gf_fs_is_supported_mime
@@ -1774,6 +1957,162 @@
 
 _libgpac.gf_filter_require_source_id.argtypes = _gf_filter
 
+_libgpac.gf_filter_probe_link.argtypes = _gf_filter, c_uint, c_char_p, POINTER(c_char_p)
+_libgpac.gf_filter_get_possible_destinations.argtypes = _gf_filter, c_int, POINTER(c_char_p)
+
+
+_libgpac.gf_httpout_send_request.argtypes = c_void_p, py_object, c_uint, c_char_p, c_uint, POINTER(POINTER(c_char)), c_void_p, c_void_p, c_void_p, c_void_p
+
+@CFUNCTYPE(c_uint, c_void_p, c_ulonglong, c_ulonglong)
+def httpout_cbk_throttle(cbk, done, total):
+    obj = cast(cbk, py_object).value
+    return obj.throttle(done, total)
+
+@CFUNCTYPE(c_int, c_void_p, POINTER(c_ubyte), c_uint)
+def httpout_cbk_read(cbk, buf, size):
+    obj = cast(cbk, py_object).value
+    if numpy_support:
+        ar_data = np.ctypeslib.as_array(buf, shape=(size,))
+        ar_data.flags.writeable=True
+        return obj.read(ar_data, size)
+    return obj.read(buf, size)
+
+@CFUNCTYPE(c_uint, c_void_p, POINTER(c_ubyte), c_uint)
+def httpout_cbk_write(cbk, buf, size):
+    obj = cast(cbk, py_object).value
+    if buf==None:
+        obj.write(None, 0)
+    else:
+        if numpy_support:
+            ar_data = np.ctypeslib.as_array(buf, shape=(size,))
+            ar_data.flags.writeable=False
+            obj.write(ar_data, size)
+        else:
+            obj.write(buf, size)
+    return 0
+
+@CFUNCTYPE(None, c_void_p, c_int)
+def httpout_cbk_close(cbk, err):
+    obj = cast(cbk, py_object).value
+    obj._root.gc_exclude.remove(obj)
+    if not obj._skip_close:
+        obj.close(err)
+    return 0
+
+## \endcond
+
+##
+#  \defgroup pyhttpout_grp HTTP server bindings
+#  \ingroup pyapi_grp
+#  \brief Python API for libgpac httpout module.
+#
+# HTTP server requests can be monitored and/or handled in Python. This is achieved by calling \ref Filter.bind on the httpout filter using an object deriving from HTTPOutRequest.
+#
+# The requests can either be handled by GPAC as usual, or by the python script.
+# @{
+
+## HTTP request handler object
+class HTTPOutRequest:
+    ## Constructor
+    def __init__(self):
+        ## \cond private
+        self._session=None
+        self._skip_close=0
+        ## \endcond
+
+        ## reply code
+        ## A reply code of 0 means httpout will serve the resource as usual
+        self.reply=0
+
+        ## reply body
+        ## - if reply is 0, this can be set to a file path to serve. If not set, usual URL resolving of httpout is done
+        ## - if reply is not 0, this can be set to a string containing the body. To deliver a binary file or a large file, use read function
+        self.body=None
+
+        ## list of headers to add
+        ## even values are header names, odd values are header values
+        self.headers_out=
+
+    ## throttle the connection - if not overriden by subclass, not used
+    #\param done amount of bytes of ressource sent
+    #\param total total size of ressource
+    #\return a timeout in microseconds, or 0 to process immediately
+    def throttle(self, done, total):
+        return 0
+
+    ## read data for the request - if not overriden by subclass, not used
+    #\param buf NP array (or c_ubyte pointer if no numpy support) to write data to
+    #\param size size of array to fill
+    #\return amount of bytes read, negative value means no data available yet, 0 means end of file
+    def read(self, buf, size):
+        return 0
+
+    ## write data for the request (PUT/POST) - if not overriden by subclass, not used
+    #\param buf NP array (or c_ubyte pointer if no numpy support) containing data from client
+    #\param size number of valid bytes in the array
+    #\return
+    def write(self, buf, size):
+        pass
+
+    ## close callback for the request - if not overriden by subclass, not used
+    #\param reason GPAC error code of the end of session
+    #\return
+    def close(self, reason):
+        pass
+
+    ## callback for the request - this shoulld be overriden by subclass, default behaviour being to delegate to GPAC
+    #\param method HTTP method used, as string
+    #\param url URL of the HTTP request
+    #\param auth_code Authentication reply code - requests are pre-identified using GPAC credentials: a value of 401 indicates no identification, 200 indicates identification OK, 403 indicates failure
+    #\param headers list of headers of input request, even values are header names, odd values are header values
+    #\return
+    def on_request(self, method, url, auth_code, headers):
+        self.send()
+
+    ## Send the reply to the client. This can be called aither upon \ref on_request or later (asynchronously)
+    #\return
+    def send(self):
+        hdrs = None
+        nb_hdrs=len(self.headers_out)
+        if nb_hdrs:
+            hdrs = (POINTER(c_char)*nb_hdrs)()
+            i=0
+            for str in self.headers_out:
+                hdrsi = create_string_buffer(str.encode('utf-8'))
+                i+=1
+        body = None;
+        if self.body:
+            body = self.body.encode('utf-8')
+        ret = _libgpac.gf_httpout_send_request(self._session, py_object(self), self.reply, body, nb_hdrs, hdrs,
+            None if type(self).throttle == HTTPOutRequest.throttle else httpout_cbk_throttle,
+            None if type(self).read == HTTPOutRequest.read else httpout_cbk_read,
+            None if type(self).write == HTTPOutRequest.write else httpout_cbk_write,
+            httpout_cbk_close
+        )
+        ## \cond private
+        self._skip_close = True if type(self).close == HTTPOutRequest.close else False;
+        ## \endcond
+
+## @}
+
+## \cond private
+
+_libgpac.gf_filter_bind_httpout_callbacks.argtypes = _gf_filter, py_object, c_void_p
+@CFUNCTYPE(c_int, c_void_p, c_void_p, c_char_p, c_char_p, c_uint, c_uint, POINTER(c_char_p))
+def httpout_on_request(cbk, sess, method, url, auth_code, nb_hdrs, hdrs):
+    obj = cast(cbk, py_object).value
+    _ck = obj.__class__
+    req = _ck()
+    req._session = sess
+    req._root = obj
+    obj.gc_exclude.append(req)
+    headers=
+    for i in range(nb_hdrs):
+        headers.append(hdrsi.decode('utf-8'))
+    req.on_request(method.decode('utf-8'), url.decode('utf-8'), auth_code, headers);
+    return 0
+
+
 _libgpac.gf_filter_bind_dash_algo_callbacks.argtypes = _gf_filter, py_object, c_void_p, c_void_p, c_void_p, c_void_p
 @CFUNCTYPE(c_int, c_void_p, c_uint)
 def dash_period_reset(cbk, reset_type):
@@ -1838,13 +2177,14 @@
 ## 
 #  \defgroup pydash_grp DASH custom algorithm
 #  \ingroup pyapi_grp
-#  \brief Python API for libgpac.
+#  \brief Python API for libgpac DASH client.
 #
+# DASH client logic can be controlled in Python. This is achieved by calling \ref Filter.bind on the dashin filter using an object deriving from DASHCustomAlgorithm.
 # @{
 
 ## DASH media quality information (Representation info)
 class DASHQualityInfo:
-    ## \cond priv
+    ## \cond private
     def __init__(self, qinfon):
     ## \endcond
         ## bandwidth in bits per second
@@ -1879,7 +2219,7 @@
         self.avg_duration = qinfon.avg_duration
         ## list of segment sizes for VoD cases, None otherwise or if unknown
         self.sizes = None
-        ## \cond priv
+        ## \cond private
         if qinfon.sizes == None:
             return
         count = _libgpac.gf_list_count(qinfon.sizes)
@@ -1891,7 +2231,7 @@
 
 ##DASH Spatial Relation Descriptor object, used for tiling
 class DASHSRD:
-    ## \cond priv
+    ## \cond private
     def __init__(self, id, x, y, w, h, fw, fh):
     ## \endcond
         ## ID of SRD source - all SRD with same source describe the same video composition, possibly with different grid sizes
@@ -1909,7 +2249,7 @@
         ## total height of SRD descriptor for this tile
         self.fh = fh
 
-##\cond priv
+##\cond private
 def make_srd(dashptr, groupidx):
     srd_id=c_uint(0)
     srd_x=c_uint(0)
@@ -1927,7 +2267,7 @@
 
 ## DASH group object
 class DASHGroup:
-    ## \cond priv
+    ## \cond private
     def __init__(self, ptr_dash, groupidx):
     ## \endcond
         ## Index of group, as used in callbacks
@@ -1938,7 +2278,7 @@
         self.duration = _libgpac.gf_dash_get_period_duration(ptr_dash)
         ## SRD object or None if no SRD defined
         self.SRD = make_srd(ptr_dash, groupidx)
-        ## \cond priv
+        ## \cond private
         self._dash = ptr_dash
         nb_qualities = _libgpac.gf_dash_group_get_num_qualities(ptr_dash, groupidx)
         for i in range(nb_qualities):
@@ -1950,7 +2290,7 @@
 
 ## DASH groups statistics object
 class DASHGroupStatistics(Structure):
-    ## \cond priv
+    ## \cond private
     def __init__(self):
     ## \endcond
         ##download rate of last segment in bits per second, divided by current playback speed
@@ -1975,7 +2315,7 @@
         self.buffer = 0
         ##degradation hint, 0 means no degradation, 100 means tile completely hidden
         self.quality_degradation_hint = 0
-        ##cumulated download rate of all active groups - 0 means all files are local
+        ##cumulated download rate of all active groups in bytes per seconds - 0 means all files are local
         self.total_rate = 0
 
     ## \cond private
@@ -2003,7 +2343,7 @@
 
 ## DASH group current segment download statistics object
 class DASHGroupDownloadStatistics(Structure):
-    ## \cond priv
+    ## \cond private
     def __init__(self):
     ## \endcond
         ##download rate of last segment in bits per second
@@ -2084,7 +2424,7 @@
 ## @}
 
 
-## \cond priv
+## \cond private
 
 
 @CFUNCTYPE(c_int, c_void_p, c_uint, c_void_p)
@@ -2126,11 +2466,11 @@
 
 
 def _prop_to_python(pname, prop):
-    type = prop.type
+    ptype = prop.type
 
-    if type==GF_PROP_SINT:
+    if ptype==GF_PROP_SINT:
         return prop.value.sint
-    if type==GF_PROP_UINT:
+    if ptype==GF_PROP_UINT:
         if pname=="StreamType":
             return _libgpac.gf_stream_type_name(prop.value.uint).decode('utf-8')
         if pname=="PixelFormat":
@@ -2141,72 +2481,72 @@
             return names0
         return prop.value.uint
 
-    if _libgpac.gf_props_type_is_enum(type):
-        pname = _libgpac.gf_props_enum_name(type, prop.value.uint)
+    if _libgpac.gf_props_type_is_enum(ptype):
+        pname = _libgpac.gf_props_enum_name(ptype, prop.value.uint)
         return pname.decode('utf-8')
 
-    if type==GF_PROP_4CC:
+    if ptype==GF_PROP_4CC:
         return _libgpac.gf_4cc_to_str(prop.value.uint).decode('utf-8')
-    if type==GF_PROP_LSINT:
+    if ptype==GF_PROP_LSINT:
         return prop.value.longsint
-    if type==GF_PROP_LUINT:
+    if ptype==GF_PROP_LUINT:
         return prop.value.longuint
-    if type==GF_PROP_BOOL:
+    if ptype==GF_PROP_BOOL:
         return prop.value.boolean
-    if type==GF_PROP_FRACTION:
+    if ptype==GF_PROP_FRACTION:
         return prop.value.frac
-    if type==GF_PROP_FRACTION64:
+    if ptype==GF_PROP_FRACTION64:
         return prop.value.lfrac
-    if type==GF_PROP_FLOAT:
+    if ptype==GF_PROP_FLOAT:
         return prop.value.fnumber
-    if type==GF_PROP_DOUBLE:
+    if ptype==GF_PROP_DOUBLE:
         return prop.value.number
-    if type==GF_PROP_VEC2I:
+    if ptype==GF_PROP_VEC2I:
         return prop.value.vec2i
-    if type==GF_PROP_VEC2:
+    if ptype==GF_PROP_VEC2:
         return prop.value.vec2
-    if type==GF_PROP_VEC3I:
+    if ptype==GF_PROP_VEC3I:
         return prop.value.vec3i
-    if type==GF_PROP_VEC4I:
+    if ptype==GF_PROP_VEC4I:
         return prop.value.vec4i
-    if type==GF_PROP_STRING or type==GF_PROP_STRING_NO_COPY or type==GF_PROP_NAME:
+    if ptype==GF_PROP_STRING or ptype==GF_PROP_STRING_NO_COPY or ptype==GF_PROP_NAME:
         return prop.value.string.decode('utf-8')
-    if type==GF_PROP_DATA or type==GF_PROP_DATA_NO_COPY or type==GF_PROP_CONST_DATA:
+    if ptype==GF_PROP_DATA or ptype==GF_PROP_DATA_NO_COPY or ptype==GF_PROP_CONST_DATA:
         return prop.value.data
-    if type==GF_PROP_POINTER:
+    if ptype==GF_PROP_POINTER:
         return prop.value.ptr
-    if type==GF_PROP_STRING_LIST:
+    if ptype==GF_PROP_STRING_LIST:
         res = 
         for i in range(prop.value.string_list.nb_items):
             val = prop.value.string_list.valsi.decode('utf-8')
             res.append(val)
         return res
-    if type==GF_PROP_UINT_LIST:
+    if ptype==GF_PROP_UINT_LIST:
         res = 
         for i in range(prop.value.uint_list.nb_items):
             val = prop.value.uint_list.valsi
             res.append(val)
         return res
-    if type==GF_PROP_4CC_LIST:
+    if ptype==GF_PROP_4CC_LIST:
         res = 
         for i in range(prop.value.uint_list.nb_items):
             val = _libgpac.gf_4cc_to_str(prop.value.uint).decode('utf-8')
             res.append(val)
         return res
-    if type==GF_PROP_SINT_LIST:
+    if ptype==GF_PROP_SINT_LIST:
         res = 
         for i in range(prop.value.uint_list.nb_items):
             val = prop.value.sint_list.valsi
             res.append(val)
         return res
-    if type==GF_PROP_VEC2I_LIST:
+    if ptype==GF_PROP_VEC2I_LIST:
         res = 
         for i in range(prop.value.v2i_list.nb_items):
             val = prop.value.v2i_list.valsi
             res.append(val)
         return res
 
-    raise Exception('Unknown property type ' + str(type))
+    raise Exception('Unknown property type ' + str(ptype))
 
 ## \endcond
 
@@ -2214,8 +2554,8 @@
 ## filter object
 class Filter:
     ## \cond  private
-    def __init__(self, session, filter):
-        self._filter = filter
+    def __init__(self, session, _filter):
+        self._filter = _filter
         self._session = session
     ## \endcond
         #hack for doxygen to generate member vars (not support for parsing @property)
@@ -2260,7 +2600,7 @@
     #\return
     def set_source(self, f, link_args=None):
         if f:
-            _libgpac.gf_filter_set_source(self._filter, f._filter, link_args)
+            _libgpac.gf_filter_set_source(self._filter, f._filter, None if not link_args else link_args.encode('utf-8'))
 
     ## set a given filter as restricted source for this filter - see \ref gf_filter_set_source_restricted
     #\param f source Filter
@@ -2268,7 +2608,7 @@
     #\return
     def set_source_restricted(self, f, link_args=None):
         if f:
-            _libgpac.gf_filter_set_source_restricted(self._filter, f._filter, link_args)
+            _libgpac.gf_filter_set_source_restricted(self._filter, f._filter, None if not link_args else link_args.encode('utf-8'))
 
 
     ## insert a given filter after this filter - see \ref gf_filter_set_source and \ref gf_filter_reconnect_output
@@ -2278,7 +2618,7 @@
     #\return
     def insert(self, f, opid=-1, link_args=None):
         if f:
-            _libgpac.gf_filter_set_source(f._filter, self._filter, link_args)
+            _libgpac.gf_filter_set_source(f._filter, self._filter, None if not link_args else link_args.encode('utf-8'))
             pid = None
             if opid>=0:
                 pid = _libgpac.gf_filter_get_opid(self._filter, opid)
@@ -2288,6 +2628,19 @@
             if err<0:
                 raise Exception('Failed to reconnect output: ' + e2s(err))
 
+    ## reconnect the filter output - see \ref gf_filter_set_source and \ref gf_filter_reconnect_output
+    #\param opid index of output pid to reconnect, -1 for all pids
+    #\return
+    def reconnect(self, opid=-1):
+        pid = None
+        if opid>=0:
+            pid = _libgpac.gf_filter_get_opid(self._filter, opid)
+            if not pid:
+                raise Exception('No output PID with index ' + str(opid) + ' in filter ' + self.name )
+        err = _libgpac.gf_filter_reconnect_output(self._filter, pid)
+        if err<0:
+            raise Exception('Failed to reconnect output: ' + e2s(err))
+
     ## \cond private
     def _pid_prop_ex(self, prop_name, pid, IsInfo):
         _name = prop_name.encode('utf-8')
@@ -2434,8 +2787,8 @@
             f_idx+=1        
             if f==None:
                 break
-            filter = self._session._to_filter(f)
-            res.append(filter)
+            _filter = self._session._to_filter(f)
+            res.append(_filter)
         return res
 
     ##gets all defined options / arguments for a filter
@@ -2482,11 +2835,38 @@
     ##enforces sourceID to be present for output pids of this filter - see \ref gf_filter_require_source_id
     #\return
     def require_source_id(self):
-        err = _libgpac.gf_filter_require_source_id(self._filter)
-        if err<0:
-            raise Exception('Failed to require sourceID for filter: ' + e2s(err))
+        _libgpac.gf_filter_require_source_id(self._filter)
         return
 
+    ##Resolves link from given output pid of filter to a filter description. The described filter is not loaded in the graph - see \ref gf_filter_probe_link
+    #\param opid_idx 0-based index of the output pid
+    #\param name filter description to link to; this can be any filter description
+    #\return None if no possible link or a list containing the filters in the resolved chain from current filter to destination
+    def probe_link(self, opid_idx, name):
+        links = c_char_p(0)
+        ret = _libgpac.gf_filter_probe_link(self._filter, opid_idx, name.encode("utf-8"), byref(links))
+        if ret<0:
+            return None
+        if not links:
+            return None
+        link_list = links.value.decode('utf-8').split(",")
+        _libgpac.gf_url_free(links)
+        return link_list
+
+    ##Gets all possible destination filter for this filter or one of its output PID - see \ref gf_filter_get_possible_destinations
+    #\param opid_idx 0-based index of the output pid, use -1 to check all output pids
+    #\return None if no possible connections to known filter, or a list containing all possible direct connections
+    def get_destinations(self, opid_idx):
+        dests = c_char_p(0)
+        ret = _libgpac.gf_filter_get_possible_destinations(self._filter, opid_idx, byref(dests))
+        if ret<0:
+            return None
+        if not dests:
+            return None
+        dests_list = dests.value.decode('utf-8').split(",")
+        _libgpac.gf_url_free(dests)
+        return dests_list
+
     ##\cond private
     def _bind_dash_algo(self, object):
         if not hasattr(object, 'on_rate_adaptation'):
@@ -2499,6 +2879,16 @@
         if err<0: 
             raise Exception('Failed to bind dash algo: ' + e2s(err))
         return 0
+
+    def _bind_httpout(self, object):
+        if not hasattr(object, 'on_request'):
+            raise Exception('Missing on_request member function on object, cannot bind')
+        object.sessions = 
+        err = _libgpac.gf_filter_bind_httpout_callbacks(self._filter, py_object(object), httpout_on_request)
+        if err<0:
+            raise Exception('Failed to bind httpout: ' + e2s(err))
+        object.gc_exclude=
+        return 0
     ##\endcond private
 
 
@@ -2513,6 +2903,8 @@
     def bind(self, object):
         if self.name=="dashin":
             return self._bind_dash_algo(object)
+        if self.name=="httpout":
+            return self._bind_httpout(object)
         raise Exception('No possible binding to filter class ' + self.name)
 
     ##\cond private: until end, properties
@@ -2580,11 +2972,11 @@
             prop_val.type = GF_PROP_STRING
             prop_val.value.string = str(prop).encode('utf-8')
             return prop_val
-        type = custom_type
+        ptype = custom_type
     else:
-        type = _libgpac.gf_props_4cc_get_type(prop4cc)
+        ptype = _libgpac.gf_props_4cc_get_type(prop4cc)
 
-    prop_val.type = type
+    prop_val.type = ptype
     if propname=="StreamType":
         prop_val.value.uint = _libgpac.gf_stream_type_by_name(prop.encode('utf-8'))
         return prop_val
@@ -2592,19 +2984,19 @@
         prop_val.value.uint = _libgpac.gf_codecid_parse(prop.encode('utf-8'))
         return prop_val
 
-    if type==GF_PROP_SINT:
+    if ptype==GF_PROP_SINT:
         prop_val.value.sint = prop
-    elif type==GF_PROP_UINT:
+    elif ptype==GF_PROP_UINT:
         prop_val.value.uint = prop
-    elif type==GF_PROP_4CC:
+    elif ptype==GF_PROP_4CC:
         prop_val.value.uint = _libgpac.gf_4cc_parse(prop.encode('utf-8'))
-    elif type==GF_PROP_LSINT:
+    elif ptype==GF_PROP_LSINT:
         prop_val.value.longsint = prop
-    elif type==GF_PROP_LUINT:
+    elif ptype==GF_PROP_LUINT:
         prop_val.value.longuint = prop
-    elif type==GF_PROP_BOOL:
+    elif ptype==GF_PROP_BOOL:
         prop_val.value.boolean = prop
-    elif type==GF_PROP_FRACTION:
+    elif ptype==GF_PROP_FRACTION:
         if hasattr(prop, 'den') and hasattr(prop, 'num'):
             prop_val.value.frac.num = prop.num
             prop_val.value.frac.den = prop.den
@@ -2614,7 +3006,7 @@
         else:
             prop_val.value.frac.num = 1000*prop
             prop_val.value.frac.den = 1000
-    elif type==GF_PROP_FRACTION64:
+    elif ptype==GF_PROP_FRACTION64:
         if hasattr(prop, 'den') and hasattr(prop, 'num'):
             prop_val.value.lfrac.num = prop.num
             prop_val.value.lfrac.den = prop.den
@@ -2624,30 +3016,30 @@
         else:
             prop_val.value.lfrac.num = 1000000*prop
             prop_val.value.lfrac.den = 1000000
-    elif type==GF_PROP_FLOAT:
+    elif ptype==GF_PROP_FLOAT:
         prop_val.value.fnumber = prop
-    elif type==GF_PROP_DOUBLE:
+    elif ptype==GF_PROP_DOUBLE:
         prop_val.value.number = prop
-    elif type==GF_PROP_VEC2I:
+    elif ptype==GF_PROP_VEC2I:
         if hasattr(prop, 'x') and hasattr(prop, 'y'):
             prop_val.value.vec2i.x = prop.x
             prop_val.value.vec2i.y = prop.y
         else:
             raise Exception('Invalid property value for vec2i: ' + str(prop))
-    elif type==GF_PROP_VEC2:
+    elif ptype==GF_PROP_VEC2:
         if hasattr(prop, 'x') and hasattr(prop, 'y'):
             prop_val.value.vec2.x = prop.x
             prop_val.value.vec2.y = prop.y
         else:
             raise Exception('Invalid property value for vec2: ' + str(prop))
-    elif type==GF_PROP_VEC3I:
+    elif ptype==GF_PROP_VEC3I:
         if hasattr(prop, 'x') and hasattr(prop, 'y') and hasattr(prop, 'z'):
             prop_val.value.vec3i.x = prop.x
             prop_val.value.vec3i.y = prop.y
             prop_val.value.vec3i.z = prop.z
         else:
             raise Exception('Invalid property value for vec3i: ' + str(prop))
-    elif type==GF_PROP_VEC4I:
+    elif ptype==GF_PROP_VEC4I:
         if hasattr(prop, 'x') and hasattr(prop, 'y') and hasattr(prop, 'z') and hasattr(prop, 'w'):
             prop_val.value.vec4i.x = prop.x
             prop_val.value.vec4i.y = prop.y
@@ -2655,41 +3047,41 @@
             prop_val.value.vec4i.w = prop.w
         else:
             raise Exception('Invalid property value for vec4i: ' + str(prop))
-    elif type==GF_PROP_STRING or type==GF_PROP_STRING_NO_COPY or type==GF_PROP_NAME:
+    elif ptype==GF_PROP_STRING or ptype==GF_PROP_STRING_NO_COPY or ptype==GF_PROP_NAME:
         prop_val.value.string = str(prop).encode('utf-8')
-    elif type==GF_PROP_DATA or type==GF_PROP_DATA_NO_COPY or type==GF_PROP_CONST_DATA:
+    elif ptype==GF_PROP_DATA or ptype==GF_PROP_DATA_NO_COPY or ptype==GF_PROP_CONST_DATA:
         raise Exception('Setting data property from python not yet implemented !')
-    elif type==GF_PROP_POINTER:
+    elif ptype==GF_PROP_POINTER:
         raise Exception('Setting pointer property from python not yet implemented !')
-    elif type==GF_PROP_STRING_LIST:
+    elif ptype==GF_PROP_STRING_LIST:
         if isinstance(prop, list)==False:
             raise Exception('Property is not a list')
         prop_val.value.string_list.nb_items = len(prop)
-        prop_val.value.string_list.vals = (ctypes.c_char_p * len(prop))
+        prop_val.value.string_list.vals = (POINTER(c_char) * len(prop))()
         i=0
         for str in list:
-            prop_val.value.string_list.valsi = str.encode('utf-8')
+            prop_val.value.string_list.valsi = create_string_buffer(str.encode('utf-8'))
             i+=1
-    elif type==GF_PROP_UINT_LIST:
+    elif ptype==GF_PROP_UINT_LIST:
         if isinstance(prop, list)==False:
             raise Exception('Property is not a list')
         prop_val.value.uint_list.nb_items = len(prop)
-        prop_val.value.uint_list.vals = (ctypes.c_uint * len(prop))(*prop)
-    elif type==GF_PROP_4CC_LIST:
+        prop_val.value.uint_list.vals = (c_uint * len(prop))(*prop)
+    elif ptype==GF_PROP_4CC_LIST:
         if isinstance(prop, list)==False:
             raise Exception('Property is not a list')
         prop_val.value.uint_list.nb_items = len(prop)
-        prop_val.value.uint_list.vals = (ctypes.c_uint * len(prop))
+        prop_val.value.uint_list.vals = (c_uint * len(prop))
         i=0
         for str in list:
             prop_val.value.uint_list.valsi = _libgpac.gf_4cc_parse( str.encode('utf-8') )
             i+=1
-    elif type==GF_PROP_SINT_LIST:
+    elif ptype==GF_PROP_SINT_LIST:
         if isinstance(prop, list)==False:
             raise Exception('Property is not a list')
         prop_val.value.sint_list.nb_items = len(prop)
-        prop_val.value.sint_list.vals = (ctypes.c_int * len(prop))(*prop)
-    elif type==GF_PROP_VEC2I_LIST:
+        prop_val.value.sint_list.vals = (c_int * len(prop))(*prop)
+    elif ptype==GF_PROP_VEC2I_LIST:
         if isinstance(prop, list)==False:
             raise Exception('Property is not a list')
         prop_val.value.sint_list.nb_items = len(prop)
@@ -2698,11 +3090,11 @@
             prop_val.value.v2i_list.valsi.x = propi.x
             prop_val.value.v2i_list.valsi.y = propi.y
 
-    elif _libgpac.gf_props_type_is_enum(type):
-        prop_val.value.uint = _libgpac.gf_props_parse_enum(type, prop.encode('utf-8'))
+    elif _libgpac.gf_props_type_is_enum(ptype):
+        prop_val.value.uint = _libgpac.gf_props_parse_enum(ptype, prop.encode('utf-8'))
         return prop_val
     else:
-        raise Exception('Unsupported property type ' + str(type) )
+        raise Exception('Unsupported property type ' + str(ptype) )
 
     return prop_val
 
@@ -2722,7 +3114,7 @@
 @CFUNCTYPE(c_int, _gf_filter, _gf_filter_pid, gf_bool)
 def filter_cbk_configure(_f, _pid, is_remove):
     obj = _libgpac.gf_filter_get_rt_udta(_f)
-    filter = cast(obj, py_object).value
+    _filter = cast(obj, py_object).value
     obj = _libgpac.gf_filter_pid_get_udta(_pid)
     if obj:
         pid_obj = cast(obj, py_object).value
@@ -2733,17 +3125,18 @@
     if pid_obj:
         first=False
     else:
-        pid_obj = FilterPid(filter, _pid, True)
+        pid_obj = FilterPid(_filter, _pid, True)
         _libgpac.gf_filter_pid_set_udta(_pid, py_object(pid_obj))
-    res = filter.configure_pid(pid_obj, is_remove)
+    res = _filter.configure_pid(pid_obj, is_remove)
 
     if is_remove:
         _libgpac.gf_filter_pid_set_udta(_pid, None)
-        filter.ipids.remove(pid_obj)
-        return
+        if pid_obj in _filter.ipids:
+            _filter.ipids.remove(pid_obj)
+        return res
 
     if first:
-        filter.ipids.append(pid_obj)
+        _filter.ipids.append(pid_obj)
 
     return res
 
@@ -2752,15 +3145,15 @@
 @CFUNCTYPE(c_int, _gf_filter)
 def filter_cbk_process(_f):
     obj = _libgpac.gf_filter_get_rt_udta(_f)
-    filter = cast(obj, py_object).value
-    return filter.process()
+    _filter = cast(obj, py_object).value
+    return _filter.process()
 
 _libgpac.gf_filter_set_process_event_ckb.argtypes = _gf_filter, c_void_p
 @CFUNCTYPE(c_int, _gf_filter, POINTER(FilterEvent) )
 def filter_cbk_process_event(_f, _evt):
     obj = _libgpac.gf_filter_get_rt_udta(_f)
-    filter = cast(obj, py_object).value
-    res = filter.process_event(_evt.contents)
+    _filter = cast(obj, py_object).value
+    res = _filter.process_event(_evt.contents)
     if res:
         return 1
     return 0
@@ -2769,13 +3162,13 @@
 @CFUNCTYPE(c_int, POINTER(c_ubyte), c_uint, POINTER(c_uint) )
 def filter_cbk_probe_data(_data, _size, _probe):
     obj = _libgpac.gf_filter_get_rt_udta(_f)
-    filter = cast(obj, py_object).value
+    _filter = cast(obj, py_object).value
     if numpy_support:
         ar_data = np.ctypeslib.as_array(_data, (_size,))
         ar_data.flags.writeable=False
-        res = filter.probe_data(ar_data, _size)
+        res = _filter.probe_data(ar_data, _size)
     else:
-        res = filter.probe_data(_data, _size)
+        res = _filter.probe_data(_data, _size)
     if res==None:
         _probe.contents=0
         return None
@@ -2787,14 +3180,14 @@
 @CFUNCTYPE(c_int, _gf_filter, _gf_filter_pid )
 def filter_cbk_reconfigure_output(_f, _pid):
     obj = _libgpac.gf_filter_get_rt_udta(_f)
-    filter = cast(obj, py_object).value
+    _filter = cast(obj, py_object).value
     obj = _libgpac.gf_filter_pid_get_udta(_pid)
     if obj:
         pid_obj = cast(obj, py_object).value
     else:
         pid_obj=None
     if pid_obj:
-        return filter.reconfigure_output(_f)
+        return _filter.reconfigure_output(_f)
     raise Exception('Reconfigure on unknown output pid !')
 
 
@@ -2808,11 +3201,9 @@
 
 _libgpac.gf_filter_update_status.argtypes = _gf_filter, c_uint, c_char_p
 
-_libgpac.gf_filter_ask_rt_reschedule.argtypes = _gf_filter
+_libgpac.gf_filter_ask_rt_reschedule.argtypes = _gf_filter, c_uint
 _libgpac.gf_filter_post_process_task.argtypes = _gf_filter
 
-
-_libgpac.gf_filter_ask_rt_reschedule.argtypes = _gf_filter, c_int, gf_bool
 _libgpac.gf_filter_setup_failure.argtypes = _gf_filter, c_int
 _libgpac.gf_filter_make_sticky.argtypes = _gf_filter
 _libgpac.gf_filter_prevent_blocking.argtypes = _gf_filter, gf_bool
@@ -2944,10 +3335,10 @@
         _libgpac.gf_filter_update_status(self._filter, percent, status.encode('utf-8'))
 
     ##reschedule the filter after a given delay - see \ref gf_filter_ask_rt_reschedule and \ref gf_filter_post_process_task
-    #\param when delay in microseconds
+    #\param when delay in microseconds, negative value will just post a process task. A value of 0 will mark filter as active even if no packet was dropped/sent
     #\return
     def reschedule(self, when=0):
-        if when:
+        if when>=0:
             _libgpac.gf_filter_ask_rt_reschedule(self._filter, when)
         else:
             _libgpac.gf_filter_post_process_task(self._filter)
@@ -3053,9 +3444,9 @@
 _libgpac.gf_filter_pck_forward.argtypes = _gf_filter_packet, _gf_filter_pid
 
 _libgpac.gf_filter_pid_set_property.argtypes = _gf_filter_pid, c_uint, POINTER(PropertyValue)
-_libgpac.gf_filter_pid_set_property_str.argtypes = _gf_filter_pid, c_char_p, POINTER(PropertyValue)
+_libgpac.gf_filter_pid_set_property_dyn.argtypes = _gf_filter_pid, c_char_p, POINTER(PropertyValue)
 _libgpac.gf_filter_pid_set_info.argtypes = _gf_filter_pid, c_uint, POINTER(PropertyValue)
-_libgpac.gf_filter_pid_set_info_str.argtypes = _gf_filter_pid, c_char_p, POINTER(PropertyValue)
+_libgpac.gf_filter_pid_set_info_dyn.argtypes = _gf_filter_pid, c_char_p, POINTER(PropertyValue)
 _libgpac.gf_filter_pid_clear_eos.argtypes = _gf_filter_pid, gf_bool
 _libgpac.gf_filter_pid_check_caps.argtypes = _gf_filter_pid
 _libgpac.gf_filter_pid_check_caps.restype = gf_bool
@@ -3129,8 +3520,8 @@
 _libgpac.gf_filter_pid_caps_query_str.argtypes = _gf_filter_pid, c_char_p
 _libgpac.gf_filter_pid_caps_query_str.restype = POINTER(PropertyValue)
 
-_libgpac.gf_filter_pid_negociate_property.argtypes = _gf_filter_pid, c_uint, POINTER(PropertyValue)
-_libgpac.gf_filter_pid_negociate_property_dyn.argtypes = _gf_filter_pid, c_char_p, POINTER(PropertyValue)
+_libgpac.gf_filter_pid_negotiate_property.argtypes = _gf_filter_pid, c_uint, POINTER(PropertyValue)
+_libgpac.gf_filter_pid_negotiate_property_dyn.argtypes = _gf_filter_pid, c_char_p, POINTER(PropertyValue)
 
 _libgpac.gf_filter_pck_new_ref.argtypes = _gf_filter_pid, c_uint, c_uint, _gf_filter_packet
 _libgpac.gf_filter_pck_new_ref.restype = _gf_filter_packet
@@ -3156,7 +3547,7 @@
 @CFUNCTYPE(c_int, _gf_filter, _gf_filter_pid, _gf_filter_packet)
 def filter_cbk_release_packet(_f, _pid, _pck):
     obj = _libgpac.gf_filter_get_rt_udta(_f)
-    filter = cast(obj, py_object).value
+    _filter = cast(obj, py_object).value
     pck_obj=None
     obj = _libgpac.gf_filter_pid_get_udta(_pid)
     if obj:
@@ -3172,7 +3563,7 @@
     if not pck_obj:
         raise Exception('unknown packet on packet destruction callback')
     pid_obj.pck_refs.remove(pck_obj)
-    filter.packet_release(pid_obj, pck_obj)
+    _filter.packet_release(pid_obj, pck_obj)
     return 0
 
 ## \endcond private
@@ -3180,8 +3571,8 @@
 ## Object representing a PID of a custom filter
 class FilterPid:
     ## \cond private
-    def __init__(self, filter, pid, IsInput):
-        self._filter = filter
+    def __init__(self, _filter, pid, IsInput):
+        self._filter = _filter
         self._pid = pid
         self._cur_pck = None
         self._input = IsInput
@@ -3348,14 +3739,14 @@
             if prop_4cc:
                 _libgpac.gf_filter_pid_set_property(self._pid, prop_4cc, None)
             else:
-                _libgpac.gf_filter_pid_set_property_str(self._pid, prop_name, None)
+                _libgpac.gf_filter_pid_set_property_dyn(self._pid, prop_name, None)
             return
 
         prop_val = _make_prop(prop_4cc, pcode, prop, custom_type)
         if prop_4cc:
             _libgpac.gf_filter_pid_set_property(self._pid, prop_4cc, byref(prop_val))
         else:
-            _libgpac.gf_filter_pid_set_property_str(self._pid, prop_name, byref(prop_val))
+            _libgpac.gf_filter_pid_set_property_dyn(self._pid, prop_name, byref(prop_val))
 
     ##set a info property the current pid - see \ref gf_filter_pid_set_info and \ref gf_filter_pid_set_info_str
     #\param pcode property type
@@ -3378,14 +3769,14 @@
             if prop_4cc:
                 _libgpac.gf_filter_pid_set_info(self._pid, prop_4cc, None)
             else:
-                _libgpac.gf_filter_pid_set_info_str(self._pid, prop_name, None)
+                _libgpac.gf_filter_pid_set_info_dyn(self._pid, prop_name, None)
             return
 
         prop_val = _make_prop(prop_4cc, pcode, prop, custom_type)
         if prop_4cc:
             _libgpac.gf_filter_pid_set_info(self._pid, prop_4cc, byref(prop_val))
         else:
-            _libgpac.gf_filter_pid_set_info_str(self._pid, prop_name, byref(prop_val))
+            _libgpac.gf_filter_pid_set_info_dyn(self._pid, prop_name, byref(prop_val))
 
     ##clears EOS on the current PID - see \ref gf_filter_pid_clear_eos
     #\param all_pids if True, clears eos on all input pids
@@ -3425,10 +3816,10 @@
         return v
 
     ##check if a filter is in the parent filter chain of the pid - see \ref gf_filter_pid_is_filter_in_parents
-    #\param filter Filter to check
+    #\param _filter Filter to check
     #\return True or False
-    def is_filter_in_parents(self, filter):
-        return _libgpac.gf_filter_pid_is_filter_in_parents(self._pid, filter._f)
+    def is_filter_in_parents(self, _filter):
+        return _libgpac.gf_filter_pid_is_filter_in_parents(self._pid, _filter._f)
 
     ##get buffer occupancy - see \ref gf_filter_pid_get_buffer_occupancy
     #\return BufferOccupancy object
@@ -3502,14 +3893,14 @@
             return _prop_to_python(pname, prop.contents)
         return None
 
-    ##negociates a capability property on input PID - see \ref gf_filter_pid_negociate_property and \ref gf_filter_pid_negociate_property_dyn
+    ##negotiates a capability property on input PID - see \ref gf_filter_pid_negotiate_property and \ref gf_filter_pid_negotiate_property_dyn
     #\param pcode property to negotiate
     #\param prop property to negotiate
     #\param custom_type type of property if user-defined property. If not set and user-defined, property is a string
     #\return
-    def negociate_cap(self, pcode, prop, custom_type=0):
+    def negotiate_cap(self, pcode, prop, custom_type=0):
         if not self._input:
-            raise Exception('Cannot negociate caps on output PID')
+            raise Exception('Cannot negotiate caps on output PID')
             return
         prop_4cc = pcode
         prop_name = None
@@ -3521,9 +3912,9 @@
 
         prop_val = _make_prop(prop_4cc, pcode, prop, custom_type)
         if prop_4cc:
-            _libgpac.gf_filter_pid_negociate_property(self._pid, prop_4cc, byref(prop_val))
+            _libgpac.gf_filter_pid_negotiate_property(self._pid, prop_4cc, byref(prop_val))
         else:
-            _libgpac.gf_filter_pid_negociate_property_dyn(self._pid, prop_name, byref(prop_val))
+            _libgpac.gf_filter_pid_negotiate_property_dyn(self._pid, prop_name, byref(prop_val))
 
     ##resolves a template string - see \ref gf_filter_pid_resolve_file_template
     #\param template the template string
@@ -3657,7 +4048,7 @@
     ##True if end of stream was seen on pid but some packets are still pending - see \ref gf_filter_pid_eos_received
     #\return
     @property
-    def eos_receievd(self):
+    def eos_received(self):
         return _libgpac.gf_filter_pid_eos_received(self._pid)
 
     ##True if PID would block - see \ref gf_filter_pid_would_block
@@ -3865,7 +4256,7 @@
 _libgpac.gf_filter_pck_merge_properties.argtypes = _gf_filter_packet, _gf_filter_packet
 
 _libgpac.gf_filter_pck_set_property.argtypes = _gf_filter_packet, c_uint, POINTER(PropertyValue)
-_libgpac.gf_filter_pck_set_property_str.argtypes = _gf_filter_packet, c_char_p, POINTER(PropertyValue)
+_libgpac.gf_filter_pck_set_property_dyn.argtypes = _gf_filter_packet, c_char_p, POINTER(PropertyValue)
 _libgpac.gf_filter_pck_truncate.argtypes = _gf_filter_packet, c_uint
 
 _libgpac.gf_filter_pck_dangling_copy.argtypes = _gf_filter_packet, _gf_filter_packet
@@ -4093,14 +4484,14 @@
             if prop_4cc:
                 _libgpac.gf_filter_pck_set_property(self._pck, prop_4cc, None)
             else:
-                _libgpac.gf_filter_pck_set_property_str(self._pck, prop_name, None)
+                _libgpac.gf_filter_pck_set_property_dyn(self._pck, prop_name, None)
             return
 
         prop_val = _make_prop(prop_4cc, pcode, prop, custom_type)
         if prop_4cc:
             _libgpac.gf_filter_pck_set_property(self._pck, prop_4cc, byref(prop_val))
         else:
-            _libgpac.gf_filter_pck_set_property_str(self._pck, prop_name, byref(prop_val))
+            _libgpac.gf_filter_pck_set_property_dyn(self._pck, prop_name, byref(prop_val))
 
     ##truncates an output packet to the given size - see \ref gf_filter_pck_truncate
     #\param size new size of packet

gpac-2.2.1.tar.gz/share/python/setup.py -> gpac-2.4.0.tar.gz/share/python/setup.py Changed

gpac-2.4.0.tar.gz/share/res/gpac.ico Changed

gpac-2.2.1.tar.gz/share/scripts/jsf/avmix/init.js -> gpac-2.4.0.tar.gz/share/scripts/jsf/avmix/init.js Changed

@@ -784,8 +784,8 @@
 		pid.afmt = pid.get_prop('AudioFormat');
 		let sr = pid.get_prop('SampleRate');
 		if ((sr != filter.sr) || (pid.afmt != filter.afmt)) {
-			pid.negociate_prop('SampleRate', filter.sr);
-			pid.negociate_prop('AudioFormat', filter.afmt);
+			pid.negotiate_prop('SampleRate', filter.sr);
+			pid.negotiate_prop('AudioFormat', filter.afmt);
 		}
 
 		pid.ch_buf = new Float32Array(pid.channels);
@@ -1062,7 +1062,7 @@
 		return GF_OK;
 
 	//we had pending events, waiting for import module resolutions, flush them
-	if (watchers_defered.length) {
+	if (watchers_deferred.length) {
 		flush_watchers();
 	}
 
@@ -3448,7 +3448,7 @@
 
 		if (port==='pipe') {
 			src.local_pipe = "gpipe_avmix_" + current_pipe;
-			local_filter = "pipe://" + src.local_pipe + ":mkp:sigeos:block_size=10M";
+			local_filter = "pipe://" + src.local_pipe + ":mkp:sigflush:block_size=10M";
 			if (s.keep_alive) {
 				local_filter += ':ka';
 			  s.has_ka_process = true;
@@ -4475,7 +4475,7 @@
 
 let watchers=;
 let defer_parse_watchers = null;
-let watchers_defered = ;
+let watchers_deferred = ;
 let event_watchers=;
 
 function remove_watcher(watcher, parent_only)
@@ -4669,17 +4669,17 @@
 
 function flush_watchers()
 {
-	watchers_defered.forEach(evt => {
+	watchers_deferred.forEach(evt => {
 		trigger_watcher(evt.elem, evt.prop, evt.val);
 	});
-	watchers_defered.length = 0;
+	watchers_deferred.length = 0;
 }
 
 function trigger_watcher(src, prop_name, value)
 {
 	if (defer_parse_watchers) {
 		let evt = {elem: src, prop: prop_name, val: value};
-		watchers_defered.push(evt);
+		watchers_deferred.push(evt);
 		return;
 	}
 
@@ -4912,7 +4912,7 @@
 
 	//reset root
 	root_scene.scenes.length = 0;
-	watchers_defered.length = 0;
+	watchers_deferred.length = 0;
 	defer_parse_watchers = ;
 
 	if (Array.isArray(pl) ) {
@@ -5868,7 +5868,7 @@
 			}
 			let update_type = target.update_type;
 
-			//update type was defered (scene not loaded)
+			//update type was deferred (scene not loaded)
 			if ((update_type == -3) && target.scene) {
 				if (typeof target.scene.modtarget.field != 'undefined') {
 					update_type = scene_mod_option_update_time(target.scene, target.field);

gpac-2.2.1.tar.gz/share/scripts/jsf/glpush.js -> gpac-2.4.0.tar.gz/share/scripts/jsf/glpush.js Changed

gpac-2.2.1.tar.gz/share/scripts/jsf/thumbs/init.js -> gpac-2.4.0.tar.gz/share/scripts/jsf/thumbs/init.js Changed

@@ -9,7 +9,7 @@
 filter.set_author("GPAC team");
 filter.set_help(`This filter generates screenshots from a video stream.
 
-The input video is downsampled by the -scale() factor. The output size is configured based on the number of images per line and per column in the -grid(). 
+The input video is down-sampled by the -scale() factor. The output size is configured based on the number of images per line and per column in the -grid(). 
 Once configured, the output size is no longer modified.
 
 The -snap() option indicates to use one video frame every given seconds. If value is 0, all input frames are used.
@@ -90,7 +90,7 @@
 filter.set_arg({ name: "scref", desc: "use last inserted image as reference for scene change detection", type: GF_PROP_BOOL, def: "false", hint:"expert"} );
 filter.set_arg({ name: "dropfirst", desc: "drop first image", type: GF_PROP_BOOL, def: "false", hint:"expert"} );
 filter.set_arg({ name: "list", desc: "export json list of frame times and positions to given file", type: GF_PROP_STRING, def: null, hint:"expert"} );
-filter.set_arg({ name: "lxy", desc: "add explict x and y in json export", type: GF_PROP_BOOL, def: "false", hint:"expert"} );
+filter.set_arg({ name: "lxy", desc: "add explicit x and y in json export", type: GF_PROP_BOOL, def: "false", hint:"expert"} );
 
 
 filter.initialize = function() {

gpac-2.4.0.tar.gz/share/scripts/jsf/uncvg.js Added

@@ -0,0 +1,1471 @@
+import { Bitstream as BS } from 'gpaccore'
+import { Sys as sys } from 'gpaccore'
+import * as evg from 'evg'
+
+filter.pids = ;
+
+const SAMPLING_NONE=0;
+const SAMPLING_422=1;
+const SAMPLING_420=2;
+const SAMPLING_411=3;
+
+const INTERLEAVE_COMPONENT=0;
+const INTERLEAVE_PIXEL=1;
+const INTERLEAVE_MIXED=2;
+const INTERLEAVE_ROW=3;
+const INTERLEAVE_TILE=4;
+const INTERLEAVE_MULTIY=5;
+
+//metadata
+filter.set_name("uncvg");
+filter.set_desc("Uncompressed Video File Format Generator Utility");
+filter.set_version("1.0");
+filter.set_author("GPAC team - (c) Telecom ParisTech 2023 - license LGPL v2");
+filter.set_help("This filter provides generation of test images for ISO/IEC 23001-17\n"
++"Generated pixels can be:\n"
++"- a pattern of colors in columns, or in rectangles if -sq() is set, using the specified palette.\n"
++"- an image source if -img() is used.\n"
++"\n"
++"Colors specified in the palette can be default GPAC colors (see gpac -h colors), 0xRRGGBB or 0xAARRGGBB\n"
++"\n"
++"When generating video, the pixels are shifted to the left at every frame\n"
++"\n"
++"Components are described as Nbpc+k with\n"
++"- N: component type, one of M(mono), Y, U, V, R, G, B, A, d(depth), disp, p(palette), f(filterArray), x (pad)\n"
++"- bpc: bits per component value, default is 8. Non-integer values must be one of\n"
++"  - sft: floating-point value on 16 bits\n"
++"  - flt: floating-point value on 32 bits\n"
++"  - dbl: floating-point value on 64 bits\n"
++"  - dblx: floating-point value on 128 bits\n"
++"  - cps: complex value as two floats on 16 bits each\n"
++"  - cpf: complex value as two floats on 32 bits each\n"
++"  - cpd: complex value as two floats on 64 bits each\n"
++"  - cpx: complex value as two floats on 128 bits each\n"
++"- k: force component alignment on k bytes, default is 0 (no alignment)\n"
+);
+
+filter.set_arg({ name: "vsize", desc: "width and height of output image", type: GF_PROP_VEC2, def: "128x128"} );
+filter.set_arg({ name: "c", desc: "image components", type: GF_PROP_STRING_LIST, def: "R8", "G8", "B8"} );
+filter.set_arg({ name: "tiles", desc: "number of horizontal and vertical tiles", type: GF_PROP_VEC2, def: "1x1"} );
+filter.set_arg({ name: "interleave", desc: `interleave type
+- comp: component-based interleaving (planar modes)
+- pix: pixel-based interleaving (packed modes)
+- mix: pixel-based interleaving for UV (semi-planar modes)
+- row: row-based interleaving
+- tile: tile-component interleaving
+- multi: pixel-based interleaving (packed modes) for sub-sampled modes`, type: GF_PROP_UINT, def: "pix", minmax_enum: "comp|pix|mix|row|tile|multi"} );
+filter.set_arg({ name: "sampling", desc: `sampling types
+- none: no sub-sampling
+- 422: YUV 4:2:2 sub-sampling
+- 420: YUV 4:2:0 sub-sampling
+- 411: YUV 4:1:1 sub-sampling`, type: GF_PROP_UINT, def: "none", minmax_enum: "none|422|420|411"} );
+filter.set_arg({ name: "block_size", desc: "block size in bytes", type: GF_PROP_UINT, def: "0"} );
+filter.set_arg({ name: "pad_lsb", desc: "padded bits are at LSB in the block", type: GF_PROP_BOOL, def: "false"} );
+filter.set_arg({ name: "ble", desc: "block is little endian", type: GF_PROP_BOOL, def: "false"} );
+filter.set_arg({ name: "br", desc: "block has reversed components", type: GF_PROP_BOOL, def: "false"} );
+filter.set_arg({ name: "pixel_size", desc: "size of pixel in bytes", type: GF_PROP_UINT, def: "0"} );
+filter.set_arg({ name: "row_align", desc: "row alignment in bytes", type: GF_PROP_UINT, def: "0"} );
+filter.set_arg({ name: "tile_align", desc: "tile alignment in bytes", type: GF_PROP_UINT, def: "0"} );
+filter.set_arg({ name: "cle", desc: "byte-aligned components are little endian", type: GF_PROP_BOOL, def: "false"} );
+
+filter.set_arg({ name: "img", desc: "use specified image as input instead of RGB generation", type: GF_PROP_STRING, def: ""} );
+filter.set_arg({ name: "asize", desc: "use input image size", type: GF_PROP_BOOL, def: "false"} );
+filter.set_arg({ name: "pal", desc: "default palette for color generation", type: GF_PROP_STRING_LIST, def: "red", "green", "blue", "white", "black", "yellow", "cyan", "grey", "orange", "violet"} );
+filter.set_arg({ name: "fa", desc: "bayer-like filter - only 2x2 on R,G,B components is supported", type: GF_PROP_STRING_LIST, def: "B", "G", "G", "R"} );
+filter.set_arg({ name: "bpm", desc: "set sensor bad pixel map as a list of cN (broken column), rM (broken row) or NxM (single pixel)", type: GF_PROP_STRING_LIST, def: } );
+filter.set_arg({ name: "fps", desc: "frame rate to generate - using 0 will trigger item muxing", type: GF_PROP_FRACTION, def: "25/1"} );
+filter.set_arg({ name: "dur", desc: "duration to generate - using 0 will trigger item muxing", type: GF_PROP_FRACTION, def: "1/1"} );
+filter.set_arg({ name: "cloc", desc: "set chroma location type", type: GF_PROP_UINT, def: "-1", minmax_enum: "-1,6"} );
+filter.set_arg({ name: "stereo", desc: "dump a stereo image", type: GF_PROP_BOOL, def: "false"} );
+filter.set_arg({ name: "sq", desc: "generate square patterns instead of columns", type: GF_PROP_FLOAT, def: "0"} );
+filter.set_arg({ name: "shade", desc: "shade pixels from black at bottom to full intensity at top", type: GF_PROP_BOOL, def: "false"} );
+filter.set_arg({ name: "scpt", desc: "use single color per tile, first tile using the first color in palette", type: GF_PROP_BOOL, def: "false"} );
+
+let components = ;
+
+let tx = null;
+let tx_width, tx_height;
+let col_width;
+
+let out_size=0;
+let cts=0;
+let max_cts=0;
+let pid;
+
+let pixel = ;
+let min_bits=0;
+let pix_len;
+
+let r_y_idx = -1;
+let g_u_idx = -1;
+let b_v_idx = -1;
+let a_idx = -1;
+let d_idx = -1;
+let is_playing=false;
+let use_palette=false;
+let use_fa=false;
+let fa_width=2;
+let fa_height=2;
+let fa=;
+let palette_alpha=false;
+
+filter.set_cap({id: "StreamType", value: "Video", output: true} );
+filter.set_cap({id: "CodecID", value: "raw", output: true} );
+
+filter.initialize = function()
+{
+	/*create a texture from a local file*/
+	if (this.img != "") {
+		tx = new evg.Texture(this.img);
+		tx_width = tx.width;
+		tx_height = tx.height;
+		if (this.asize) {
+			this.vsize.x = tx.width;
+			this.vsize.y = tx.height;
+		}
+	}
+	col_width = Math.ceil(filter.vsize.x / filter.pal.length);
+	while (col_width%4) col_width++;
+
+	if (filter.stereo && (filter.vsize.x%2))
+		filter.vsize.x++;
+
+	setup_uncv();
+
+	pid = this.new_pid();
+	pid.set_prop('StreamType', 'Visual');
+	pid.set_prop('CodecID', 'uncv');
+	pid.set_prop('Width', this.vsize.x);
+	pid.set_prop('Height', this.vsize.y);
+	pid.set_prop('Timescale', filter.fps.n ? filter.fps.n : 1000);
+	pid.set_prop('PixelFormat', 'uncv');
+
+	if (!filter.fps.n || !filter.fps.d || !filter.dur.n || !filter.dur.d) {
+		max_cts = 1;
+		pid.set_prop('ItemID', 1);
+	} else {
+		if (filter.fps.n && filter.fps.d)
+			pid.set_prop('FPS', filter.fps);
+		max_cts = filter.dur.n * filter.fps.n / filter.dur.d / filter.fps.d;
+	}
+
+	//write dec config as a box array
+	let bs = new BS();
+	let size, pos = 0;
+
+	//component definition
+	bs.put_u32(0);
+	bs.put_4cc("cmpd");
+	if (use_palette || use_fa) {
+		if (palette_alpha)
+			bs.put_u32(components.length+4);
+		else
+			bs.put_u32(components.length+3);
+	}
+	else
+		bs.put_u32(components.length);
+	for (let i=0; i<components.length; i++) {
+		let c = componentsi;
+		bs.put_u16(c.type);
+	}
+	if (use_palette || use_fa) {
+		bs.put_u16(4); //R
+		bs.put_u16(5); //G
+		bs.put_u16(6); //B	
+		if (palette_alpha)
+			bs.put_u16(7); //A	
+	}
+
+	size = bs.pos;
+	bs.pos = 0;
+	bs.put_u32(size);
+	bs.pos = size;
+
+	//uncC
+	pos = bs.pos;
+	bs.put_u32(0);
+	bs.put_4cc("uncC");
+	bs.put_u32(0); //version+flags
+	bs.put_u32(0); //profile
+	bs.put_u32(components.length);
+	for (let i=0; i<components.length; i++) {
+		let c = componentsi;
+		bs.put_u16(i); //index
+		bs.put_u8(c.bits-1); //nb_bits_minus_one
+		bs.put_u8(c.mode); //component_format
+		bs.put_u8(c.align); //component_align_size
+	}
+	bs.put_u8(filter.sampling);
+	bs.put_u8(filter.interleave);
+	bs.put_u8(filter.block_size);
+	bs.put_bits(filter.cle, 1); //components_little_endian
+	if (filter.block_size) {
+		bs.put_bits(filter.pad_lsb ? 1 : 0, 1); //pad_lsb
+		bs.put_bits(filter.ble ? 1 : 0, 1); //block_little_endian
+		bs.put_bits(filter.br ? 1 : 0, 1); //block_reversed
+	} else {
+		bs.put_bits(0, 3);
+	}
+	bs.put_bits(0, 1); //pad_unknown
+	bs.put_bits(0, 3); //reserved
+
+	bs.put_u32(filter.pixel_size);
+	bs.put_u32(filter.row_align);
+	bs.put_u32(filter.tile_align);
+	bs.put_u32(filter.tiles.x-1);
+	bs.put_u32(filter.tiles.y-1);
+	//write size
+	size = bs.pos - pos;
+	bs.pos = pos;
+	bs.put_u32(size);
+	bs.pos = size + pos;
+
+	if (use_palette) {
+		pos = bs.pos;
+		bs.put_u32(0);
+		bs.put_4cc("cpal");
+		bs.put_u32(0); //version 0 no flags
+		bs.put_u16(palette_alpha ? 4 : 3); //nb_comp, only (A)RGB palette 8 bits int for now
+		bs.put_u32(components.length); //R idx
+		bs.put_u8(7); //bits minus 1
+		bs.put_u8(0); //format
+		bs.put_u32(components.length+1); //G idx
+		bs.put_u8(7); //bits minus 1
+		bs.put_u8(0); //format
+		bs.put_u32(components.length+2); //B idx
+		bs.put_u8(7); //bits minus 1
+		bs.put_u8(0); //format
+		if (palette_alpha) {
+			bs.put_u32(components.length+3); //A idx
+			bs.put_u8(7); //bits minus 1
+			bs.put_u8(0); //format
+		}
+
+		bs.put_u32(filter.pal.length);
+		for (let i=0; i<filter.pal.length; i++) {
+			let col = filter.pali;
+			bs.put_u8( sys.color_component(col, 1) * 255);
+			bs.put_u8( sys.color_component(col, 2) * 255 );
+			bs.put_u8( sys.color_component(col, 3) * 255 );
+			if (palette_alpha)
+				bs.put_u8( sys.color_component(col, 0) * 255 );
+		}
+		//write size
+		let size = bs.pos - pos;
+		bs.pos = pos;
+		bs.put_u32(size);
+		bs.pos = size + pos;
+	}
+	if (use_fa) {
+		pos = bs.pos;
+		bs.put_u32(0);
+		bs.put_4cc("cpat");
+		bs.put_u32(0); //version 0 no flags
+		bs.put_u16(fa_width); //pattern width
+		bs.put_u16(fa_height); //pattern height
+
+		for (let i=0; i<fa_height; i++) {
+			for (let j=0; j<fa_width; j++) {
+				let ctype = fai*fa_height + j;
+				//ctype is 4->6 (R->B), so index us ctype-4 + components.length
+				bs.put_u32(ctype-4 + components.length);
+				bs.put_float(1.0);
+			}
+		}
+
+		//write size
+		let size = bs.pos - pos;
+		bs.pos = pos;
+		bs.put_u32(size);
+		bs.pos = size + pos;
+	}
+
+	let bad_rows=;
+	let bad_cols=;
+	let bad_pix=;
+	let use_sbpm=false;
+	for (let i=0; i<filter.bpm.length; i++) {
+		let c = filter.bpmi;
+		if (c.indexOf('r')==0) {
+			bad_rows.push( parseInt(c.slice(1) ) );
+			use_sbpm=true;
+		}
+		else if (c.indexOf('c')==0) {
+			bad_cols.push( parseInt(c.slice(1) ) );
+			use_sbpm=true;
+		}
+		else {
+			let s = c.indexOf('x');
+			if (s>0) {
+				let x = parseInt(c.slice(0, s) );
+				let y = parseInt(c.slice(s+1) );
+				bad_pix.push({x: x, y: y});
+				use_sbpm=true;
+			}
+		}
+	}
+	if (use_sbpm) {
+		pos = bs.pos;
+		bs.put_u32(0);
+		bs.put_4cc("sbpm");
+		bs.put_u32(0); //version 0 no flags
+		bs.put_u32(0); //component count, applies to all
+		bs.put_u8(0); //correction applied + reserved7=0
+		bs.put_u32(bad_rows.length);
+		bs.put_u32(bad_cols.length);
+		bs.put_u32(bad_pix.length);
+
+		for (let i=0; i<bad_rows.length; i++) {
+			bs.put_u32(bad_rowsi);
+		}
+		for (let i=0; i<bad_cols.length; i++) {
+			bs.put_u32(bad_colsi);
+		}
+		for (let i=0; i<bad_pix.length; i++) {
+			bs.put_u32(bad_pixi.y); //bad row
+			bs.put_u32(bad_pixi.x); //bad col
+		}
+
+		//write size
+		let size = bs.pos - pos;
+		bs.pos = pos;
+		bs.put_u32(size);
+		bs.pos = size + pos;
+	}
+	if ((filter.cloc>=0) && gen_yuv) {
+		bs.put_u32(13);
+		bs.put_4cc("cloc");
+		bs.put_u32(0); //version 0 no flags
+		bs.put_u8(filter.cloc); 
+	}
+
+	if (filter.stereo) {
+		bs.put_u32(14);
+		bs.put_4cc("fpac");
+		bs.put_u32(0); //version 0 no flags
+		bs.put_bits(3, 4); //video_frame_packing side by side
+		bs.put_bits(1, 4); //PackedContentInterpretationType left is left view
+		bs.put_bits(0, 1); //QuincunxSamplingFlag
+		bs.put_bits(0, 7); //reserved		
+	}
+
+	/* todo - write if needed
+		NUC
+		polarization
+		reference level
+		disparity info
+		depth mapping info
+	*/
+
+	pid.set_prop('DecoderConfig', bs.get_content());
+
+	/*todo - set field interlace sample group if needed*/
+}
+
+let blocksize_bits;
+let gen_yuv;
+
+function line_size(comp_bits)
+{
+	let clen = comp_bits.length;
+	let size=0;
+
+	if (!filter.block_size) {		
+		for (let j=0; j<tile_width; j++) {
+			for (let c=0; c<clen; c++) {
+				let cbits;
+				if (comp_bitsc.align) {
+					cbits = 8*comp_bitsc.align; 
+					while (size%8) size++;
+				} else {
+					cbits = comp_bitsc.bits; 
+				}
+				size += cbits;
+			}
+		}
+		while (size % 8) size++;
+		return size / 8;
+	}
+	//block size, figure out how many blocks
+	let nb_bits = 0;
+	for (let i=0; i<tile_width; i++) {
+		for (let c=0; c<clen; c++) {
+			let cbits;
+			if (comp_bitsc.align) {
+				cbits = 8*comp_bitsc.align; 
+				while (size%8) size++;
+			} else {
+				cbits = comp_bitsc.bits; 
+			}
+			if (nb_bits + cbits > blocksize_bits) {
+				nb_bits=0;
+				size += filter.block_size;
+				//if first comp in block is first comp, pattern is done
+				if (c==0) {
+					let nb_pix = i;
+					let nb_blocks = 1;
+					while ((nb_blocks+1) * nb_pix < tile_width)	nb_blocks++;
+					size *= nb_blocks;
+					//jump to last non-full pattern
+					i += nb_pix * (nb_blocks-1);
+				} 
+			}
+			nb_bits += cbits;
+		}
+	}
+	if (nb_bits)
+		size += filter.block_size;
+	return size;
+}
+
+let tile_width, tile_height;
+let row_align_bytes, tile_align_bytes, subsample_x;
+
+const comp_types = 
+	{ type: 8, name: "depth", alias: "d"},
+	{ type: 9, name: "disp"},
+	{ type: 10, name: "pal", alias: "p"},
+	{ type: 11, name: "fa", alias: "f"},
+	{ type: 12, name: "pad", alias: "x"},
+
+	//do not change order of these types otherwise we conflict with 'u', 'v' and 'g'
+	{ type: 0, name: "mono", alias: "m"},
+	{ type: 1, name: "y"},
+	{ type: 2, name: "u"},
+	{ type: 3, name: "v"},
+	{ type: 4, name: "r"},
+	{ type: 5, name: "g"},
+	{ type: 6, name: "b"},
+	{ type: 7, name: "a"},
+;
+
+let comp_le_buf = null;
+let comp_le_bs = null;
+let comp_le_view = null;
+
+let has_a=false;
+let has_depth=false;
+let has_disp=false;
+
+
+function setup_uncv()
+{
+	components.length=0;
+	if (filter.c.length==0)
+		throw "At least one component must be specified";
+
+	let max_align_size=0;
+	let has_rgb=false;
+
+	for (let i=0; i<filter.pal.length; i++) {
+		if (sys.color_component(filter.pali, 0) < 1.0) {
+			palette_alpha = true;
+			break;
+		}
+	}
+
+	for (let i=0; i<filter.c.length; i++) {
+		let depth=0;
+		let fmt=0;
+		let c_str = filter.ci.toLowerCase();
+		let type=0;
+		for (let j=0; j<comp_types.length; j++) {
+			let match=0;
+			if (c_str.startsWith(comp_typesj.name)) {
+				match = comp_typesj.name.length;
+			}
+			else if (!match && (typeof comp_typesj.alias == 'string') && c_str.startsWith(comp_typesj.alias)) {
+				match = comp_typesj.alias.length;
+			}
+			if (match) {
+				type = comp_typesj.type + 1;
+				if (typeof comp_typesj.fmt != 'undefined')
+					fmt = comp_typesj.fmt;
+				c_str = c_str.slice(match);
+				break;
+			}
+		}
+		if (!type) {
+			throw "Invalid component declaration "+c_str;			
+		}
+		type--;
+		let align_size=0;
+		let ws = c_str.indexOf('+');
+		if (ws>0) {
+			let a_str = c_str.slice(ws + 1);
+			align_size = parseInt(a_str);
+			c_str = c_str.slice(0, ws);
+			if (align_size>max_align_size) max_align_size = align_size; 
+		}
+
+		if (c_str=='') { fmt=0; depth = 8; }
+		else if (c_str=='flt') {fmt = 1; depth=32; }
+		else if (c_str=='sft') {fmt = 1; depth=16; }
+		else if (c_str=='dbl') {fmt = 1; depth=64; }
+		else if (c_str=='dbx') {fmt = 1; depth=128; }
+		else if (c_str=='cps') {fmt = 2; depth=32; }
+		else if (c_str=='cpf') {fmt = 2; depth=64; }
+		else if (c_str=='cpd') {fmt = 2; depth=128; }
+		else if (c_str=='cpx') {fmt = 2; depth=256; }
+		else if (!isNaN(c_str)) { fmt=0; depth = parseInt(c_str); }
+
+		if (!depth) {
+			throw "Invalid component declaration "+c_str;
+		}
+		if (fmt==2) {
+			throw "Complex types not supported yet";
+		}
+		if (align_size && (align_size*8<depth)) {
+			throw "Align size must be greater than component bit depth";			
+		}
+		components.push({type: type, bits: depth, mode: fmt, align: align_size});
+
+		if (type==10) use_palette=true;
+		else if (type==11) use_fa=true;
+		else if ((type>=4) && (type<=6)) {
+			has_rgb = true;
+		}
+		else if (type==7) {
+			palette_alpha = false;
+			has_a=true;
+		}
+		else if (type==8) has_depth = true;
+		else if (type==9) has_disp = true;
+	}
+
+	if (use_palette && has_rgb) {
+		throw "Cannot use R,G or B component with palette (already RGB)"+c_str;
+	}
+	if (use_fa) {
+		if (has_rgb) {
+			throw "Cannot use R,G or B component with filter array (already RGB)"+c_str;
+		}
+		if (use_palette) {
+			throw "Cannot use palette with filter array"+c_str;
+		}
+		if (filter.fa.length != 4) {
+			throw "Filter array must be 2x2 size, got "+ JSON.stringify(filter.fa);		
+		}
+
+		fa=;
+		for (let i=0; i<filter.fa.length; i++) {
+			let c_str = filter.fai.toLowerCase();
+			let type=0;
+			if (c_str=='r') type=4;
+			else if (c_str=='g') type=5;
+			else if (c_str=='b') type=6;
+			else {
+				throw "Only RGB component types supported in filter array";
+			}
+			fa.push(type);
+		}
+	}
+
+
+	pixel = ;
+	for (let i=0; i<components.length; i++) {
+		pixel.push(0);
+	}
+	pix_len = pixel.length;
+
+	blocksize_bits = 8 * filter.block_size;
+	if (!filter.vsize.x || !filter.vsize.y)
+		throw "Image size shall not be 0";
+	if (!filter.tiles.x || !filter.tiles.y)
+		throw "Image tiling shall not be 0";
+
+	if (filter.vsize.x % filter.tiles.x)
+		throw "Image width not a multiple of num horizontal tiles";
+
+	if (filter.vsize.y % filter.tiles.y)
+		throw "Image height not a multiple of num vertical tiles";
+
+	if (filter.interleave==INTERLEAVE_MULTIY) {
+		let nb_y=0, nb_u=0, nb_v=0;
+		for (let i=0; i<components.length; i++) {
+			let comp = componentsi;
+			if (comp.type==1) nb_y++;
+			if (comp.type==2) nb_u++;
+			if (comp.type==3) nb_v++;
+		}
+		if ((nb_u!=1) && (nb_v!=1))
+			throw "Component pattern must have 1 U/Cb and 1 V/Cr";
+		if (filter.sampling==SAMPLING_422) {
+			if (nb_y != 2)
+				throw "Component pattern must have 2 Y, not " + nb_y;
+		}
+		else if (filter.sampling==SAMPLING_411) {
+			if (nb_y != 4)
+				throw "Component pattern must have 4 Y, not " + nb_y;
+		}
+		else {
+			throw "Unsupported interleave type for sampling type " +filter.sampling;
+		}
+		if (components.length % 2)
+			throw "Component pattern must have an even number of components";
+	}
+
+	tile_width = filter.vsize.x / filter.tiles.x;
+	tile_height = filter.vsize.y / filter.tiles.y;
+
+	if (filter.sampling) {
+		switch (filter.interleave) {
+		case INTERLEAVE_COMPONENT:
+		case INTERLEAVE_MIXED:
+		case INTERLEAVE_MULTIY:
+			break;
+		default:
+			if (filter.sampling==SAMPLING_420)
+				throw "Sub-sampling must use interleave mode 0 or 2";
+			else
+				throw "Sub-sampling must use interleave mode 0, 2 or 5";
+			break;
+		}
+		if (filter.sampling==SAMPLING_420) {
+			if (tile_width%2)
+				throw "Tile width must be a multiple of 2 for YUV 420 sampling";
+			if (tile_height%2)
+				throw "Tile height must be a multiple of 2 for YUV 420 sampling";
+		}
+		else if (filter.sampling==SAMPLING_422) {
+			if (tile_width%2)
+				throw "Tile width must be a multiple of 2 for YUV 422 sampling";
+		}
+		else if (filter.sampling==SAMPLING_411) {
+			if (tile_width%4)
+				throw "Tile width must be a multiple of 4 for YUV 411 sampling";
+		}
+	}
+
+
+	let num_tiles = filter.tiles.x * filter.tiles.y;
+	row_align_bytes = tile_align_bytes = 0;
+
+
+	if ((filter.interleave==INTERLEAVE_TILE) && (num_tiles==1)) {
+		throw "Tile-Component interleaving requires more than one tile";
+	}
+
+	gen_yuv = false;
+	let nb_y=0;
+	for (let i=0; i<components.length; i++) {
+		let comp = componentsi;
+		if (comp.type==1) { nb_y++; gen_yuv = true; }
+		else if ((comp.type==2) || (comp.type==3)) gen_yuv = true;
+
+		comp.row_align_size = 0;
+		comp.tile_align_size = 0;
+	}
+	if ((nb_y>1) && (filter.interleave!=INTERLEAVE_MULTIY))
+		print(GF_LOG_WARNING, 'Multiple Y component but interleaving is not 5, undefined results');
+
+	if ((filter.interleave==INTERLEAVE_COMPONENT) || (filter.interleave==INTERLEAVE_ROW) || (filter.interleave==INTERLEAVE_TILE)) {
+		out_size = 0;
+		let tile_size=0;
+		filter.write_pixel = writepix_interleave_0;
+		//write component-interleave (planar), get the size of each component
+		for (let i=0; i<components.length; i++) {
+			let comp = componentsi;
+			comp.line_size = line_size( {bits: comp.bits, align: comp.align}  );
+			if ((comp.type==2) || (comp.type==3)) {
+				if ((filter.sampling==SAMPLING_422) || (filter.sampling==SAMPLING_420))
+					comp.line_size /= 2;
+				else if (filter.sampling==SAMPLING_411)
+					comp.line_size /= 4;
+			}
+			if (filter.row_align) {
+				while (comp.line_size % filter.row_align) {
+					comp.line_size++;
+				}
+				comp.row_align_size = comp.line_size;
+			}
+
+			comp.plane_size = comp.line_size * tile_height;
+
+			//for tile-component mode, tile align is on the plane size
+			if (filter.tile_align && (filter.interleave==INTERLEAVE_TILE)) {
+				while (comp.plane_size % filter.tile_align) {
+					comp.plane_size++;
+				}
+				comp.tile_align_size = comp.plane_size;
+			}
+
+			if ((comp.type==2) || (comp.type==3)) {
+				if (filter.sampling==SAMPLING_420)
+					comp.plane_size /= 2;
+			}
+			tile_size += comp.plane_size;
+		}
+
+		//except for tile-component mode, tile align is on cumulated size of all components in tile
+		if (filter.interleave!=INTERLEAVE_TILE) {
+			if (filter.tile_align) {
+				while (tile_size % filter.tile_align) {
+					tile_size++;
+				}
+				tile_align_bytes = tile_size;
+			} else {
+				tile_align_bytes = tile_size;
+			}
+		}
+		out_size += tile_size * num_tiles;
+
+		if (gen_yuv) {
+			if (filter.sampling==SAMPLING_420)
+				filter.write_pixel = writepix_interleave_0_420;
+			else if (filter.sampling==SAMPLING_422)
+				filter.write_pixel = writepix_interleave_0_422;
+			else if (filter.sampling==SAMPLING_411)
+				filter.write_pixel = writepix_interleave_0_411;
+		}
+	} else if (filter.interleave==INTERLEAVE_MIXED) {
+		out_size = 0;
+
+		if (!filter.sampling || (filter.sampling>SAMPLING_411))
+			throw "bad sampling type for mixed interleave mode";
+
+		if (filter.row_align)
+			throw "row align not supported in interleave=2 mode";
+		if (filter.tile_align)
+			throw "tile align not supported in interleave=2 mode";
+
+		let uv_found=false;
+		//write component-interleave (planar), get the size of each component
+		for (let i=0; i<components.length; i++) {
+			let comp = componentsi;
+			comp.line_size = line_size( {bits: comp.bits, align: comp.align}  );
+			if ((comp.type==2) || (comp.type==3)) {
+				if (uv_found) {
+					comp.line_size = 0;
+					comp.plane_size = 0;
+					continue;
+				}
+				uv_found = true;
+			}
+
+			comp.plane_size = comp.line_size * tile_height;
+			if ((comp.type==2) || (comp.type==3)) {
+				if (filter.sampling==SAMPLING_420)
+					comp.plane_size /= 2;
+			}
+			out_size += comp.plane_size * num_tiles;
+		}
+
+		if (filter.sampling==SAMPLING_420)
+			filter.write_pixel = writepix_interleave_2_420;
+		else if (filter.sampling==SAMPLING_422)
+			filter.write_pixel = writepix_interleave_2_422;
+		else if (filter.sampling==SAMPLING_411)
+			filter.write_pixel = writepix_interleave_2_411;
+
+	} else if ((filter.interleave==INTERLEAVE_PIXEL) || (filter.interleave==INTERLEAVE_MULTIY)) {
+		let comp_bits=;
+		for (let i=0; i<components.length; i++) {
+			let comp = componentsi;
+			comp_bits.push( {bits: comp.bits, align: comp.align} );			
+			comp.line_size = 0;
+			comp.plane_size = 0;
+		}
+		let lsize = line_size( comp_bits );
+		if (filter.pixel_size) {
+			let lsize2 = tile_width * filter.pixel_size;
+			if (lsize2<lsize) {
+				throw "Invalid pixel size, smaller than required bits";
+			}
+			lsize = lsize2;
+		}
+
+		if (filter.row_align) {
+			while (lsize % filter.row_align) {
+				lsize++;
+			}
+			row_align_bytes = lsize;
+		}
+		let psize = lsize * tile_height;
+
+		tile_align_bytes = psize;
+		if (filter.tile_align) {
+			while (psize % filter.tile_align) {
+				psize++;
+			}
+			tile_align_bytes = psize;
+		}
+
+		out_size = psize * num_tiles;
+		filter.write_pixel = writepix_interleave_1;
+		if (filter.interleave==INTERLEAVE_MULTIY) {
+			if (filter.sampling==SAMPLING_422) subsample_x = 2;
+			else if (filter.sampling==SAMPLING_411) subsample_x = 4;
+			filter.write_pixel = writepix_interleave_multiy;
+		}
+	} else {
+		throw "Unsupported interleave type";
+	}
+
+	for (let i=0; i<components.length; i++) {
+		let comp = componentsi;
+		let nbb = comp.bits;
+		comp.max_val = 1;
+		//palette is an index - for other types we normalize between 0 and 1
+		if (comp.type != 10) {
+			while (nbb) {
+				comp.max_val *= 2;
+				nbb--;
+			}
+			comp.max_val--;
+		}
+
+		if (!min_bits || (min_bits>comp.bits))
+			min_bits = comp.bits;
+
+		//map monochrome, Y or R to first comp
+		if ((comp.type==0) || (comp.type==1) || (comp.type==4)) {
+			if (r_y_idx<0) r_y_idx = i;
+			comp.base_idx = r_y_idx;
+		}
+		else if ((comp.type==2) || (comp.type==5)) {
+			if (g_u_idx<0) g_u_idx = i;
+			comp.base_idx = g_u_idx;
+		}
+		else if ((comp.type==3) || (comp.type==6)) {
+			if (b_v_idx<0) b_v_idx = i;
+			comp.base_idx = b_v_idx;
+		}
+		//alpha
+		else if (comp.type==7) {
+			if (a_idx<0) a_idx = i;
+			comp.base_idx = a_idx;
+		}
+		//depth or disp
+		else if ((comp.type==8) || (comp.type==9)) {
+			if (d_idx<0) d_idx = i;
+			comp.base_idx = d_idx;
+		}
+		//palette
+		else if (comp.type==10) {
+			if (r_y_idx<0) r_y_idx = i;
+			comp.base_idx = r_y_idx;
+		}
+		//filter array
+		else if (comp.type==11) {
+			if (r_y_idx<0) r_y_idx = i;
+			comp.base_idx = r_y_idx;
+		}
+		else {
+			comp.base_idx = -1;
+		}
+	}
+	//print('Components setup: ' + JSON.stringify(components));
+
+	if (filter.cle && max_align_size) {
+		comp_le_buf = new ArrayBuffer(max_align_size);
+		comp_le_bs = new BS(comp_le_buf, true); 
+		comp_le_view = new Uint8Array(comp_le_buf); 
+	}
+}
+
+function get_pixel(i, j)
+{
+	i -= cts * filter.vsize.x / max_cts;
+	if (i<0) i += filter.vsize.x;
+
+	if (filter.stereo && (i>=filter.vsize.x/2))
+		i-=filter.vsize.x/2;
+
+	let r=0, g=0, b=0;
+	let a=1;
+	let d=0;
+	if (tx) {
+		let t_x = Math.floor(i * tx.width / filter.vsize.x);
+		if (filter.stereo) t_x *= 2;
+		let t_y = Math.floor(j * tx.height / filter.vsize.y);
+		let tx_p = tx.get_pixel(t_x, t_y);
+		r = tx_p.r;
+		g = tx_p.g;
+		b = tx_p.b;
+		if (d_idx>=0)
+			d = tx_p.a;
+		else
+			a = tx_p.a;
+	} else {
+		let tidx;
+		if (filter.scpt) {
+			let tile_x = Math.floor(i / tile_width);
+			let tile_y = Math.floor(j / tile_height);
+			tidx = (tile_x * filter.tiles.x + tile_y) % filter.pal.length;
+		} else {
+			tidx = Math.floor(i / col_width);
+			if (filter.sq!=0) {
+				let ridx = Math.floor(filter.sq*j / col_width);
+				tidx += ridx;
+				
+				while (tidx>=filter.pal.length)
+					tidx -= filter.pal.length;
+				while (tidx<0)
+					tidx += filter.pal.length;
+			}
+		}
+
+		if (use_palette) {
+			pixelr_y_idx = tidx;
+			return;
+		}
+		let scale = 1 - j/filter.vsize.y;
+		let col = filter.paltidx;
+		r = sys.color_component(col, 1);
+		g = sys.color_component(col, 2);
+		b = sys.color_component(col, 3);
+		if (a_idx>=0) {
+			if ((d_idx<0) && palette_alpha)
+				a = sys.color_component(col, 0);
+			else
+				a = scale;
+		} else if (filter.shade) {
+			r *= scale;
+			g *= scale;
+			b *= scale;
+		}
+		if (d_idx>=0) {
+			if (palette_alpha)
+				d = sys.color_component(col, 0);
+			else
+				d = scale;
+		}
+	}
+
+	if (gen_yuv) {
+		let y = 0.299*r + 0.587 * g + 0.114 * b;
+		let cb = -0.169*r - 0.331*g + 0.499*b + 0.5;
+		let cr = 0.499*r - 0.418*g - 0.0813*b + 0.5;
+		r = y;
+		g = cb;
+		b = cr;
+	}
+	else if (use_fa) {
+		let p_x = i % fa_width;
+		let p_y = j % fa_height;
+		let type = fap_x + p_y*fa_height;
+		if (type==5) r = g;
+		else if (type==6) r = b;
+	}
+	if (r_y_idx>=0) pixelr_y_idx = r;
+	if (g_u_idx>=0) pixelg_u_idx = g;
+	if (b_v_idx>=0) pixelb_v_idx = b;
+	if (a_idx>=0) pixela_idx = a;
+	if (d_idx>=0) pixeld_idx = d;
+}
+
+
+//array of bitstream wrapper objects, one if pixel-interleave, one per comp if component-interleave (planar)
+let bs_array = ;
+
+function setup_block(bsw)
+{
+	if (!blocksize_bits) return;
+
+	bsw.next_block_idx = 0;
+	bsw.nb_bits_block = 0;
+	bsw.block_comps = ;
+	if (filter.ble) {
+		bsw.le_buf = new ArrayBuffer(filter.block_size);
+		bsw.le_bs = new BS(bsw.le_buf, true); 
+		bsw.le_view = new Uint8Array(bsw.le_buf); 
+	}
+	let max_comp = Math.ceil(blocksize_bits / min_bits);
+	for (let i=0; i<max_comp; i++) {
+		bsw.block_comps.push({val: 0, component: null});
+	}
+}
+
+let tile_start_offset = 0;
+function start_frame(data)
+{
+	bs_array.length=0;
+	tile_start_offset=0;
+
+	//component interleave
+	if ((filter.interleave==INTERLEAVE_PIXEL) || (filter.interleave==INTERLEAVE_MULTIY)) {
+		let bsw = {};
+		bsw.bs = new BS(data, true);
+		setup_block(bsw);
+		bs_array.push(bsw);
+		bsw.init_offset = 0;
+		bsw.line_start_pos = 0;
+		bsw.row_align_size = row_align_bytes;
+		bsw.tile_align_size = 0;
+		bsw.tile_size = tile_align_bytes;
+		return;
+	}
+
+	//all other are planar modes
+	let offset = 0;
+	let tile_size=0;
+	let comp_row_size=0;
+	for (let i=0; i<components.length; i++) {
+		let comp = componentsi;
+		let bsw = {};
+		bsw.bs = new BS(data, true);
+		bsw.bs.pos = offset;
+		bsw.init_offset = offset;
+		bsw.tile_start_pos = offset;
+		bsw.line_start_pos = offset;
+		bsw.row_align_size = comp.row_align_size;
+
+		bsw.tile_align_size = 0;
+
+		setup_block(bsw);
+		//row-interleave, first row of next comp starts after first row of this comp
+		if (filter.interleave==INTERLEAVE_ROW)
+			offset += comp.line_size;
+		//tile-interleave, first row of next comp starts after last value of last tile of this comp
+		else if (filter.interleave==INTERLEAVE_TILE) {
+			offset += comp.plane_size * filter.tiles.x * filter.tiles.y;
+			bsw.tile_align_size = comp.tile_align_size;
+		}
+		//otherwise next comp starts after last value for this comp
+		else	
+			offset += comp.plane_size;
+
+		comp_row_size += comp.line_size;
+		tile_size += comp.plane_size;
+		bsw.plane_size = comp.plane_size;
+		bs_array.push(bsw);
+
+		//tile size is per comp in this mode, not for the cumulated size
+		if (filter.interleave==INTERLEAVE_TILE)
+			bsw.tile_size = bsw.plane_size;
+	}
+	if (tile_align_bytes)
+		tile_size = tile_align_bytes;
+
+	bs_array.forEach(bsw => {
+		bsw.comp_row_size = comp_row_size;
+		if (filter.interleave!=INTERLEAVE_TILE)
+			bsw.tile_size = tile_size;
+	});
+
+}
+
+function start_tile(tile_x, tile_y)
+{
+	if ((filter.tiles.x==1) && (filter.tiles.y==1)) return;
+
+	tile_start_offset = tile_align_bytes * (tile_x + filter.tiles.x * tile_y);
+
+	bs_array.forEach(bsw  => {
+		let offs = tile_align_bytes ? tile_start_offset : (bsw.tile_size * (tile_x + filter.tiles.x * tile_y));
+		offs += bsw.init_offset;
+		bsw.bs.pos = offs;
+		bsw.tile_start_pos = offs;
+		bsw.line_start_pos = offs;
+	});
+}
+
+function end_tile()
+{
+	let max_pos=0;
+	let max_bs=null;
+	bs_array.forEach (bsw => {
+		//per comp tile alignment, only in INTERLEAVE_TILE mode
+		if (bsw.tile_align_size) {
+			let remain = bsw.bs.pos - bsw.tile_start_pos;
+			while (remain<bsw.tile_align_size) {
+				bsw.bs.put_u8(0);
+				remain++;
+			}
+		}
+		if (max_pos<bsw.bs.pos) {
+			max_pos = bsw.bs.pos;
+			max_bs = bsw.bs;
+		}
+	});
+
+	if (tile_align_bytes) {		
+		let remain = max_pos - tile_start_offset;
+		if (remain<0) throw "Internal error in tile padding: remainder is negative " + remain;
+		if (remain>tile_align_bytes) throw "Internal error in tile padding: remainder " + remain + " is greater than tile size " + tile_align_bytes + ' tile start ' + tile_start_offset;
+
+		while (remain<tile_align_bytes) {
+			max_bs.put_u8(0);
+			remain++;
+		}
+	}
+}
+
+function end_line(last_line_in_tile)
+{
+	bs_array.forEach (bsw => {
+		if (filter.block_size && bsw.next_block_idx) {
+			flush_block(bsw); 
+		}
+		//rows of tiles shall be byte-aligned at the end of the row
+		bsw.bs.align();
+		if (bsw.row_align_size) {
+			let remain = bsw.bs.pos - bsw.line_start_pos;
+			while (remain<bsw.row_align_size) {
+				bsw.bs.put_u8(0);
+				remain++;
+			}
+		}
+		//not last line of tile, update offsets
+		//for last line we don't update, so that padding can be properly computed. We update the line offset at the beginning of next tile 
+		if (!last_line_in_tile) {
+			//row interleave, seek to next row start
+			if (filter.interleave==INTERLEAVE_ROW) {
+				bsw.bs.pos = bsw.line_start_pos + bsw.comp_row_size;
+			}
+			bsw.line_start_pos = bsw.bs.pos;
+		}
+	});
+}
+
+function write_val(bs, val, comp)
+{
+
+	if (comp.align) bs.align();
+
+	if (comp.mode==0) {
+		if (comp.align) {
+			if (comp_le_buf) {
+				comp_le_bs.pos = 0;
+				comp_le_bs.put_bits(val * comp.max_val, 8*comp.align);
+				for (let i=comp.align; i>0; i--) {
+					bs.put_u8(comp_le_viewi-1);
+				}
+			} else {
+				bs.put_bits(val * comp.max_val, 8*comp.align);
+			}
+		}
+		else
+			bs.put_bits(val * comp.max_val, comp.bits);
+	}
+	else if (comp.mode==1) {
+		if (comp.bits==32)
+			bs.put_float(val);
+		else if (comp.bits==64)
+			bs.put_double(val);
+	}
+}
+
+function flush_block(bsw)
+{
+	let i, bits=0;
+	for (i=0; i<bsw.next_block_idx; i++) {
+		let comp = bsw.block_compsi.component;
+		if (!comp) break;
+		if (comp.align) {
+			while (bits % 8) bits++;
+			bits += comp.align*8;
+		} else {
+			bits += comp.bits;
+		}
+	}
+	let pad = blocksize_bits - bits;
+	if (pad<0)
+		throw "Wrong block size " + blocksize_bits + " vs " + bits + " nb comps " + bsw.next_block_idx;
+
+	if (filter.ble) {
+		let bs_le = bsw.le_bs;
+		bs_le.pos = 0;
+
+		if (!filter.pad_lsb)
+			bs_le.put_bits(0, pad);
+
+		for (i=0; i<bsw.next_block_idx; i++) {
+			//check block reverse
+			let b_idx = filter.br ? (bsw.next_block_idx - i - 1) : i;
+			let cval = bsw.block_compsb_idx;
+			write_val(bs_le, cval.val, cval.component);
+			cval.component = null;
+		}
+
+		if (filter.pad_lsb)
+			bs_le.put_bits(0, pad);
+
+		for (i=filter.block_size; i>0; i--) {
+			bsw.bs.put_u8(bsw.le_viewi-1);
+		}
+	} else {
+		if (!filter.pad_lsb)
+			bsw.bs.put_bits(0, pad);
+
+		//big endian, no block reverse
+		for (i=0; i<bsw.next_block_idx; i++) {
+			let cval = bsw.block_compsi;
+			if (!cval.component) break;
+			write_val(bsw.bs, cval.val, cval.component);
+			cval.component = null;
+		}
+
+		if (filter.pad_lsb)
+			bsw.bs.put_bits(0, pad);
+	}
+
+	bsw.nb_bits_block=0;
+	bsw.next_block_idx = 0;
+}
+
+
+
+function push_val(bsw, c, comp)
+{
+	if (filter.block_size) {
+		if (comp.align) {
+			while (bsw.nb_bits_block % 8)
+				bsw.nb_bits_block++;
+		}
+		let cbits = comp.align ? (comp.align*8) : comp.bits;
+		if (bsw.nb_bits_block + cbits > blocksize_bits) {
+			flush_block(bsw);
+		}
+
+		bsw.block_compsbsw.next_block_idx.val = c;
+		bsw.block_compsbsw.next_block_idx.component = comp;
+		bsw.next_block_idx++;
+		bsw.nb_bits_block += cbits;
+	} else {
+		write_val(bsw.bs, c, comp);
+	}
+}
+
+function writepix_interleave_0(x, y)
+{
+	for (let i=0; i<components.length; i++) {
+		let comp = componentsi;
+		let c = (pix_len>i) ? pixeli : 0;
+		push_val(bs_arrayi, c, comp);
+	}
+}
+
+function writepix_interleave_0_420(x, y)
+{
+	for (let i=0; i<components.length; i++) {
+		let comp = componentsi;
+		let c = (pix_len>i) ? pixeli : 0;
+		if ((comp.type==2) || (comp.type==3)) {
+			if (x%2) continue;
+			if (y%2) continue;
+		}
+		push_val(bs_arrayi, c, comp);
+	}
+}
+
+function writepix_interleave_0_422(x, y)
+{
+	for (let i=0; i<components.length; i++) {
+		let comp = componentsi;
+		let c = (pix_len>i) ? pixeli : 0;
+		if ((comp.type==2) || (comp.type==3)) {
+			if (x%2) continue;
+		}
+		push_val(bs_arrayi, c, comp);
+	}
+}
+
+function writepix_interleave_0_411(x, y)
+{
+	for (let i=0; i<components.length; i++) {
+		let comp = componentsi;
+		let c = (pix_len>i) ? pixeli : 0;
+		if ((comp.type==2) || (comp.type==3)) {
+			if (x%4) continue;
+		}
+		push_val(bs_arrayi, c, comp);
+	}
+}
+
+function writepix_interleave_1(x, y)
+{
+	let bsw = bs_array0;
+	let psize = bsw.bs.pos;
+	for (let i=0; i<components.length; i++) {
+		let comp = componentsi;
+		let c = (pix_len>i) ? pixeli : 0;
+
+		push_val(bsw, c, comp);
+	}
+	if (filter.pixel_size) {
+		if (filter.block_size) {
+			if (bsw.next_block_idx) {
+				flush_block(bsw);
+			}
+		}
+		else
+			bsw.bs.align();
+
+		psize = bsw.bs.pos - psize;
+		if (psize>filter.pixel_size) {
+			throw "Invalid pixel_size " + filter.pixel_size + ", less than total size of components " + psize;
+		}
+		while (psize<filter.pixel_size) {
+			bsw.bs.put_u8(0);
+			psize++;
+		}
+	}
+}
+
+function writepix_interleave_2_420(x, y)
+{
+	let bs_uv=null;
+	for (let i=0; i<components.length; i++) {
+		let comp = componentsi;
+		let c = (pix_len>i) ? pixeli : 0;
+		let bs = bs_arrayi;
+		if ((comp.type==2) || (comp.type==3)) {
+			if (x%2) continue;
+			if (y%2) continue;
+			if (!bs_uv) bs_uv = bs;
+			bs = bs_uv;
+		}
+		push_val(bs, c, comp);
+	}
+}
+
+function writepix_interleave_2_422(x, y)
+{
+	let bs_uv=null;
+	for (let i=0; i<components.length; i++) {
+		let comp = componentsi;
+		let c = (pix_len>i) ? pixeli : 0;
+		let bs = bs_arrayi;
+		if ((comp.type==2) || (comp.type==3)) {
+			if (x%2) continue;
+			if (!bs_uv) bs_uv = bs;
+			bs = bs_uv;
+		}
+		push_val(bs, c, comp);
+	}
+}
+
+function writepix_interleave_2_411(x, y)
+{
+	let bs_uv=null;
+	for (let i=0; i<components.length; i++) {
+		let comp = componentsi;
+		let c = (pix_len>i) ? pixeli : 0;
+		let bs = bs_arrayi;
+		if ((comp.type==2) || (comp.type==3)) {
+			if (x%4) continue;
+			if (!bs_uv) bs_uv = bs;
+			bs = bs_uv;
+		}
+		push_val(bs, c, comp);
+	}
+}
+
+function writepix_interleave_multiy(x, y)
+{
+	if (! (x % subsample_x)) {
+		for (let i=0; i<components.length; i++) {
+			let comp = componentsi;
+			comp.stored = false;
+
+			if (comp.type==2) comp.store_val = pixelg_u_idx;
+			else if (comp.type==3) comp.store_val = pixelb_v_idx;
+		}
+	}
+	let types=;
+	let bsw = bs_array0;
+	let psize = bsw.bs.pos;
+	for (let i=0; i<components.length; i++) {
+		let comp = componentsi;
+
+		if (comp.stored) continue;
+		//we already wrote a component of that type, we need next pixel
+		if (types.includes(comp.type) ) break;
+
+		let c;
+		if ((comp.type==2) || (comp.type==3)) { 
+			c = comp.store_val;
+		} else if (comp.base_idx>=0) {
+			c = pixelcomp.base_idx;
+		} else {
+			c = 0;
+		}
+		push_val(bsw, c, comp);
+		comp.stored = true;
+		types.push(comp.type);
+	}
+
+
+	if (filter.pixel_size) {
+		if (filter.block_size) {
+			if (bsw.next_block_idx)
+				flush_block(bws)
+		}
+		else
+			bsw.bs.align();
+		psize = bsw.bs.pos - psize;
+		if (psize>filter.pixel_size) {
+			throw "Invalid pixel_size " + filter.pixel_size + ", less than total size of components " + psize;
+		}
+		while (psize<filter.pixel_size) {
+			bsw.bs.put_u8(0);
+			psize++;
+		}
+	}
+}
+
+
+filter.process = function()
+{
+	if (!is_playing)
+		return GF_EOS;
+	if (cts >= max_cts) {
+		return GF_EOS;
+	}
+//	try {
+
+	let pck = pid.new_packet(out_size);
+
+	start_frame(pck.data);
+
+	for (let t_j=0; t_j<filter.tiles.y; t_j++) {	
+		for (let t_i=0; t_i<filter.tiles.x; t_i++) {
+			let t_y = t_j * tile_height;
+			let t_x = t_i * tile_width;
+			start_tile(t_i, t_j);
+
+			for (let j=0; j<tile_height; j++) {	
+				for (let i=0; i<tile_width; i++) {
+					get_pixel(t_x + i, t_y + j);
+					this.write_pixel(t_x + i, t_y + j);
+				}
+				end_line((j+1==tile_height) ? true : false);
+			}
+			end_tile();
+		}
+	}
+
+	/*set packet properties and send it*/
+	pck.cts = cts;
+	pck.sap = GF_FILTER_SAP_1;
+	pck.send();
+	cts ++;
+	if (cts == max_cts) {
+		pid.eos = true;
+		return GF_EOS;
+	}
+	print('Frame done ' + cts + '/' + max_cts + '\r');
+	return GF_OK;
+
+/*	} catch (e) {
+		print('Error writing frame ' + e);
+		is_playing=false;
+		return GF_EOS;
+	}
+*/
+}
+
+filter.process_event = function(pid, evt)
+{
+	if (evt.type == GF_FEVT_STOP) {
+		is_playing = false;
+	} 
+	else if (evt.type == GF_FEVT_PLAY) {
+		is_playing = true;
+	} 
+}
+
+
+

gpac-2.2.1.tar.gz/share/scripts/vout.js -> gpac-2.4.0.tar.gz/share/scripts/vout.js Changed

@@ -3,7 +3,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2020-2022
+ *			Copyright (c) Telecom ParisTech 2020-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / vout default ui
@@ -71,13 +71,31 @@
 let task_reschedule = 500;
 let rot = 0;
 let flip = 0;
+let use_libcaca=false;
 
 let do_coverage=0;
 if (sys.get_opt('temp', 'vout_cov') == 'yes') do_coverage = 1;
 
 
-if (parent_filter && parent_filter.type=='vout')
+function check_vout()
+{
+	let drv = vout.get_arg('drv');
+	if (!drv) drv = sys.get_opt('core', 'video-output');
+	if (drv == 'caca') {
+		session.set_auth_fun( null );
+		use_libcaca=true;
+	}
+
+	speed = vout.get_arg('speed');
+	drop = vout.get_arg('drop');
+	fullscreen = vout.get_arg('fullscreen');
+	win_id = vout.get_arg('wid');
+}
+
+if (parent_filter && parent_filter.type=='vout') {
 	vout = parent_filter;
+	check_vout();
+}
 
 function check_filters()
 {
@@ -86,13 +104,10 @@
 	for (i=0; i< session.nb_filters; i++) {
 		let f = session.get_filter(i);
 		if (!aout && (f.type==="aout")) aout = f;
-		else if (!vout && (f.type==="vout")) vout = f;
-	}
-	if (vout) {
-		speed = vout.get_arg('speed');
-		drop = vout.get_arg('drop');
-		fullscreen = vout.get_arg('fullscreen');
-		win_id = vout.get_arg('wid');
+		else if (!vout && (f.type==="vout")) {
+			vout = f;
+			check_vout();
+		}
 	}
 }
 check_filters();
@@ -103,6 +118,7 @@
 	let target_width=ol_width;
 	let target_height=ol_height;
 
+	if (vout.nb_ipid) audio_only=false;
 	disp_size = vout.get_arg('owsize');
 	if (disp_size==null) return false;
 	if (audio_only && !disp_size.x) {
@@ -151,7 +167,10 @@
 		ol_width = target_width;
 		ol_height = target_height;
 	}
-	if (ol_buffer) return true;
+
+	if (use_libcaca) return true;
+
+	if (ol_buffer != null) return true;
 	ol_buffer = new ArrayBuffer(ol_width*ol_height*4);
 	ol_canvas = new evg.Canvas(ol_width, ol_height, 'rgba', ol_buffer);
 	ol_canvas.clearf(0.2, 0.2, 0.2, 0.6);
@@ -191,7 +210,6 @@
 		codec_slow = (evt.ui_type == GF_EVENT_CODEC_SLOW) ? true : false;
 
 		if (overlay_type==OL_AUTH) return 0;
-		print('trigger overlay');
 		ol_visible = false;
 		overlay_type=OL_PLAY;
 		toggle_overlay();
@@ -207,11 +225,13 @@
 
 	switch (evt.ui_type) {
 	case GF_EVENT_MOUSEDOWN:
+		if (use_libcaca) return GF_FALSE;
 		last_x = evt.mouse_x;
 		last_y = evt.mouse_y;
 		break;
 
 	case GF_EVENT_MOUSEUP:
+		if (use_libcaca) return GF_FALSE;
 		if ((last_x != evt.mouse_x) || (last_y != evt.mouse_y)) return 0;
 		if (overlay_type==OL_AUTH) return 0;
 
@@ -374,7 +394,9 @@
 {
 	let args = ; //'Shortcuts for vout', '  ';
 
-	shortcuts.forEach( (key) => {
+	shortcuts.forEach( (key, index) => {
+		if (use_libcaca && (index>10))
+			return;
 		args.push( '' + sys.keyname(key.code) + ': ' + key.desc);
 	});
 	if (audio_only)
@@ -383,6 +405,15 @@
 		text.fontsize = Math.floor(0.6*ol_height/args.length);
 	text.set_text(args);
 
+	if (use_libcaca) {
+		let str = '';
+		args.forEach(a => {
+			str+=''+a+'\n';
+		});
+		vout.update('oltxt', str);
+		return;
+	}
+
 	//lock vout since we will modify data of the canvas
 	vout.lock(true);
 
@@ -461,12 +492,15 @@
 		progress_bar_path=null;
 	}
 
-	ol_canvas.clearf(0.2, 0.2, 0.2, 0.6);
+	if (!use_libcaca)
+		ol_canvas.clearf(0.2, 0.2, 0.2, 0.6);
+
 	let length = ol_width - 20;
 	let last_ts_f = vout.last_ts_drop;
 	if (!last_ts_f && aout)
 		last_ts_f = aout.last_ts_drop;
 	if (!last_ts_f) {
+		vout.update('oltxt', null);
 		return;
 	}
 
@@ -496,6 +530,26 @@
 	str+=m+':';
 	if (s<10) str+='0';
 	str+=s;
+
+	if (use_libcaca) {
+		if (duration) {
+			let progress = Math.ceil(100 * last_ts / duration);
+			let i=0;
+			str += ' ';
+			while (i*10<progress) {
+				str += '=';
+				i++;
+			}
+			while (i<10) {
+				str += '-';
+				i++;
+			}
+			str += ' ' + progress + ' %';
+		}
+		vout.update('oltxt', str);
+		return;
+	}
+
 	let fs = Math.floor(0.5*ol_height);
 	if (fs > 60) fs=60;
 	text.fontsize = fs; 
@@ -585,8 +639,12 @@
 			num_tiles++;
 			for (j=i+1; j<f.nb_opid; j++) {
 				let p = f.opid_props(j, 'CodecID');
-				if (p == 'hvt1')
-					num_tiles++;
+				if (p == 'hvt1') {
+					//check this tile pid sinks intersect the current pid sinks
+					let t_sinks = f.opid_sinks(j);
+					const found = t_sinks.some(r => sinks.includes(r))
+					if (found) num_tiles++;
+				}
 			}
 		}
 
@@ -754,6 +812,15 @@
 	 stats_graph.forEach(str => { stats.push(str);});
 
 
+	if (use_libcaca) {
+		let str = '';
+		stats.forEach(a => {
+			str+=''+a+'\n';
+		});
+		vout.update('oltxt', str);
+		return;
+	}
+
 	text.fontsize = 20; 
 	text.set_text(stats);
 
@@ -886,6 +953,7 @@
 	if (!ol_visible) {
 		//we don't lock vout because the overlay buffer is still valid
 		vout.update('oldata', null);
+		vout.update('oltxt', '');
 		overlay_type=OL_NONE;
 		return;
 	}
@@ -933,9 +1001,9 @@
 	{ "code": GF_KEY_LEFT, "desc": "seek backward "},
 	{ "code": GF_KEY_UP, "desc": "seek forward by 30s, 10m if alt down, 30m if ctrl down"},
 	{ "code": GF_KEY_DOWN, "desc": "seek backward"},
-	{ "code": GF_KEY_F, "desc": "fullscreen mode"},
 	{ "code": GF_KEY_I, "desc": "show info and statistics"},
 	{ "code": GF_KEY_P, "desc": "show playback info"},
+	{ "code": GF_KEY_F, "desc": "fullscreen mode"},
 	{ "code": GF_KEY_M, "desc": "flip video"},
 	{ "code": GF_KEY_R, "desc": "rotate video by 90 degree"},
 ;
@@ -1072,6 +1140,7 @@
 	return false;
 }
 
+
 session.set_auth_fun( (site, user, pass, secure, auth_cbk) => {
 	overlay_type_bck = overlay_type;
 	overlay_type = OL_AUTH;

gpac-2.2.1.tar.gz/src/Makefile -> gpac-2.4.0.tar.gz/src/Makefile Changed

@@ -11,17 +11,22 @@
 endif
 
 ifeq ($(GPROFBUILD),yes)
+ifeq ($(CONFIG_DARWIN),yes)
+CFLAGS+=-fprofile-instr-generate
+LDFLAGS+=-fprofile-instr-generate
+else
 CFLAGS+=-pg
 LDFLAGS+=-pg
 endif
+endif
 
 ## libgpac objects gathering: src/utils
 LIBGPAC_UTILS=utils/os_divers.o utils/os_file.o utils/list.o utils/bitstream.o utils/constants.o utils/error.o utils/alloc.o utils/url.o utils/configfile.o utils/gltools.o utils/gzio.o utils/xml_parser.o
 LIBGPAC_UTILS+=utils/sha1.o utils/sha256.o utils/base_encoding.o utils/math.o utils/os_net.o utils/os_thread.o utils/os_config_init.o utils/cache.o utils/downloader.o utils/utf.o utils/token.o utils/color.o utils/Remotery.o
 
-ifeq ($(DISABLE_PLAYER),no)
+# ifeq ($(DISABLE_PLAYER),no)
 LIBGPAC_UTILS+=utils/uni_bidi.o utils/unicode.o
-endif
+# endif
 LIBGPAC_UTILS+=utils/os_module.o utils/module.o utils/path2d.o utils/path2d_stroker.o
 
 ## libgpac objects gathering: src/ietf
@@ -91,18 +96,13 @@
 ifeq ($(DISABLE_AV_PARSERS),no)
 LIBGPAC_MEDIATOOLS+=media_tools/img.o
 endif
-ifeq ($(DISABLE_MEDIA_IMPORT),no)
 LIBGPAC_MEDIATOOLS+=media_tools/media_import.o
+ifeq ($(DISABLE_MEDIA_IMPORT),no)
 endif
 ifeq ($(DISABLE_M2TS),no)
 LIBGPAC_MEDIATOOLS+=media_tools/mpegts.o
 endif
-ifeq ($(DISABLE_MPD),no)
-LIBGPAC_MEDIATOOLS+=media_tools/m3u8.o media_tools/mpd.o
-endif
-ifeq ($(DISABLE_DASH_CLIENT),no)
-LIBGPAC_MEDIATOOLS+=media_tools/dash_client.o
-endif
+LIBGPAC_MEDIATOOLS+=media_tools/m3u8.o media_tools/mpd.o media_tools/dash_client.o
 ifeq ($(DISABLE_MEDIA_EXPORT),no)
 LIBGPAC_MEDIATOOLS+=media_tools/media_export.o
 endif
@@ -188,13 +188,14 @@
 LIBGPAC_SCENEMANAGER+=scene_manager/encode_isom.o
 endif
 
+LIBGPAC_COMPOSITOR=compositor/audio_mixer.o compositor/font_engine.o compositor/mesh.o compositor/mesh_collide.o compositor/mesh_tesselate.o 
+
+ifeq ($(DISABLE_COMPOSITOR),no)
 ## libgpac objects gathering: src/compositor
-LIBGPAC_COMPOSITOR=compositor/audio_input.o compositor/audio_mixer.o compositor/audio_render.o compositor/bindable.o compositor/camera.o compositor/compositor.o compositor/compositor_2d.o compositor/compositor_3d.o compositor/compositor_node_init.o compositor/drawable.o compositor/events.o compositor/font_engine.o compositor/hardcoded_protos.o compositor/mesh.o compositor/mesh_collide.o compositor/mesh_tesselate.o compositor/mpeg4_animstream.o compositor/mpeg4_audio.o compositor/mpeg4_background.o compositor/mpeg4_background2d.o compositor/mpeg4_bitmap.o compositor/mpeg4_composite.o compositor/mpeg4_form.o compositor/mpeg4_geometry_2d.o compositor/mpeg4_geometry_3d.o compositor/mpeg4_geometry_ifs2d.o compositor/mpeg4_geometry_ils2d.o compositor/mpeg4_gradients.o compositor/mpeg4_grouping.o compositor/mpeg4_grouping_2d.o compositor/mpeg4_grouping_3d.o compositor/mpeg4_layer_2d.o compositor/mpeg4_layer_3d.o compositor/mpeg4_layout.o compositor/mpeg4_lighting.o compositor/mpeg4_path_layout.o compositor/mpeg4_sensors.o compositor/mpeg4_sound.o compositor/mpeg4_text.o compositor/mpeg4_textures.o compositor/mpeg4_timesensor.o compositor/mpeg4_viewport.o compositor/navigate.o compositor/offscreen_cache.o compositor/svg_base.o compositor/svg_font.o compositor/svg_geometry.o compositor/svg_grouping.o compositor/svg_media.o compositor/svg_paint_servers.o compositor/svg_text.o compositor/texturing.o compositor/texturing_gl.o compositor/visual_manager.o compositor/visual_manager_2d.o compositor/visual_manager_2d_draw.o compositor/visual_manager_3d.o compositor/visual_manager_3d_gl.o compositor/x3d_geometry.o compositor/clock.o compositor/mpeg4_inputsensor.o compositor/mpeg4_mediacontrol.o compositor/media_object.o compositor/mpeg4_mediasensor.o compositor/mpeg4_inline.o compositor/scene_ns.o compositor/object_manager.o compositor/scene.o compositor/svg_external.o compositor/scene_node_init.o
+LIBGPAC_COMPOSITOR+=compositor/audio_input.o compositor/audio_render.o compositor/bindable.o compositor/camera.o compositor/compositor.o compositor/compositor_2d.o compositor/compositor_3d.o compositor/compositor_node_init.o compositor/drawable.o compositor/events.o compositor/hardcoded_protos.o compositor/mpeg4_animstream.o compositor/mpeg4_audio.o compositor/mpeg4_background.o compositor/mpeg4_background2d.o compositor/mpeg4_bitmap.o compositor/mpeg4_composite.o compositor/mpeg4_form.o compositor/mpeg4_geometry_2d.o compositor/mpeg4_geometry_3d.o compositor/mpeg4_geometry_ifs2d.o compositor/mpeg4_geometry_ils2d.o compositor/mpeg4_gradients.o compositor/mpeg4_grouping.o compositor/mpeg4_grouping_2d.o compositor/mpeg4_grouping_3d.o compositor/mpeg4_layer_2d.o compositor/mpeg4_layer_3d.o compositor/mpeg4_layout.o compositor/mpeg4_lighting.o compositor/mpeg4_path_layout.o compositor/mpeg4_sensors.o compositor/mpeg4_sound.o compositor/mpeg4_text.o compositor/mpeg4_textures.o compositor/mpeg4_timesensor.o compositor/mpeg4_viewport.o compositor/navigate.o compositor/offscreen_cache.o compositor/svg_base.o compositor/svg_font.o compositor/svg_geometry.o compositor/svg_grouping.o compositor/svg_media.o compositor/svg_paint_servers.o compositor/svg_text.o compositor/texturing.o compositor/texturing_gl.o compositor/visual_manager.o compositor/visual_manager_2d.o compositor/visual_manager_2d_draw.o compositor/visual_manager_3d.o compositor/visual_manager_3d_gl.o compositor/x3d_geometry.o compositor/clock.o compositor/mpeg4_inputsensor.o compositor/mpeg4_mediacontrol.o compositor/media_object.o compositor/mpeg4_mediasensor.o compositor/mpeg4_inline.o compositor/scene_ns.o compositor/object_manager.o compositor/scene.o compositor/svg_external.o compositor/scene_node_init.o
 #LIBGPAC_COMPOSITOR+=compositor/hc_flash_shape.o compositor/svg_filters.o
-
-ifeq ($(DISABLE_PLAYER),yes)
-LIBGPAC_COMPOSITOR=compositor/font_engine.o
 endif
+
 ifeq ($(DISABLE_SCENEGRAPH),yes)
 LIBGPAC_SCENE=scenegraph/vrml_js.o
 endif
@@ -214,8 +215,14 @@
 SCENEGRAPH_CFLAGS=
 MEDIATOOLS_CFLAGS=
 
-LIBGPAC_FILTERS+=filters/bs_agg.o filters/bs_split.o filters/bsrw.o filters/compose.o filters/dasher.o filters/dec_ac52.o filters/dec_bifs.o filters/dec_faad.o filters/dec_img.o filters/dec_j2k.o filters/dec_laser.o filters/dec_mad.o filters/dec_mediacodec.o filters/dec_nvdec.o filters/dec_nvdec_sdk.o filters/dec_odf.o filters/dec_theora.o filters/dec_ttml.o filters/dec_ttxt.o filters/dec_vorbis.o filters/dec_vtb.o filters/dec_webvtt.o filters/dec_xvid.o filters/decrypt_cenc_isma.o filters/dmx_avi.o filters/dmx_dash.o filters/dmx_gsf.o filters/dmx_m2ts.o filters/dmx_mpegps.o filters/dmx_nhml.o filters/dmx_nhnt.o filters/dmx_ogg.o filters/dmx_saf.o filters/dmx_vobsub.o filters/enc_jpg.o filters/enc_png.o filters/encrypt_cenc_isma.o filters/filelist.o filters/hevcmerge.o filters/hevcsplit.o filters/in_dvb4linux.o filters/in_file.o filters/in_http.o filters/in_pipe.o filters/in_route.o filters/in_rtp.o filters/in_rtp_rtsp.o filters/in_rtp_sdp.o filters/in_rtp_signaling.o filters/in_rtp_stream.o filters/in_sock.o filters/inspect.o filters/io_fcryp.o filters/isoffin_load.o filters/isoffin_read.o filters/isoffin_read_ch.o filters/jsfilter.o filters/load_bt_xmt.o filters/load_svg.o filters/load_text.o filters/mux_avi.o filters/mux_gsf.o filters/mux_isom.o filters/mux_ts.o filters/mux_ogg.o filters/out_audio.o  filters/out_file.o filters/out_http.o filters/out_pipe.o filters/out_route.o filters/out_rtp.o filters/out_rtsp.o filters/out_sock.o filters/out_video.o filters/reframer.o filters/reframe_ac3.o filters/reframe_adts.o filters/reframe_latm.o filters/reframe_amr.o filters/reframe_av1.o filters/reframe_flac.o filters/reframe_h263.o filters/reframe_img.o filters/reframe_mhas.o filters/reframe_mp3.o filters/reframe_mpgvid.o filters/reframe_nalu.o filters/reframe_prores.o filters/reframe_qcp.o filters/reframe_rawvid.o filters/reframe_rawpcm.o filters/reframe_truehd.o filters/resample_audio.o filters/restamp.o  filters/tileagg.o filters/tilesplit.o filters/tssplit.o filters/ttml_conv.o filters/unit_test_filter.o filters/rewind.o filters/rewrite_adts.o filters/rewrite_mhas.o filters/rewrite_mp4v.o filters/rewrite_nalu.o filters/rewrite_obu.o filters/vflip.o filters/vcrop.o filters/write_generic.o filters/write_nhml.o filters/write_nhnt.o filters/write_qcp.o filters/write_tx3g.o filters/write_vtt.o ../modules/dektec_out/dektec_video_decl.o filters/dec_opensvc.o filters/unframer.o
+LIBGPAC_FILTERS+=filters/bs_agg.o filters/bs_split.o filters/bsrw.o filters/compose.o filters/dasher.o filters/dec_ac52.o filters/dec_bifs.o filters/dec_faad.o filters/dec_img.o filters/dec_j2k.o filters/dec_laser.o filters/dec_mad.o filters/dec_mediacodec.o filters/dec_nvdec.o filters/dec_nvdec_sdk.o filters/dec_odf.o filters/dec_theora.o filters/dec_ttml.o filters/dec_ttxt.o filters/dec_uncv.o filters/dec_vorbis.o filters/dec_vtb.o filters/dec_webvtt.o filters/dec_xvid.o filters/decrypt_cenc_isma.o filters/dmx_avi.o filters/dmx_dash.o filters/dmx_ghi.o  filters/dmx_gsf.o filters/dmx_m2ts.o filters/dmx_mpegps.o filters/dmx_nhml.o filters/dmx_nhnt.o filters/dmx_ogg.o filters/dmx_saf.o filters/dmx_vobsub.o filters/enc_jpg.o filters/enc_png.o filters/encrypt_cenc_isma.o filters/evg_rescale.o filters/filelist.o filters/hevcmerge.o filters/hevcsplit.o filters/in_dvb4linux.o filters/in_file.o filters/in_http.o filters/in_pipe.o filters/in_route.o filters/in_rtp.o filters/in_rtp_rtsp.o filters/in_rtp_sdp.o filters/in_rtp_signaling.o filters/in_rtp_stream.o filters/in_sock.o filters/inspect.o filters/io_fcryp.o filters/isoffin_load.o filters/isoffin_read.o filters/isoffin_read_ch.o filters/jsfilter.o filters/load_bt_xmt.o filters/load_svg.o filters/load_text.o filters/mux_avi.o filters/mux_gsf.o filters/mux_isom.o filters/mux_ts.o filters/mux_ogg.o filters/out_audio.o  filters/out_file.o filters/out_http.o filters/out_pipe.o filters/out_route.o filters/out_rtp.o filters/out_rtsp.o filters/out_sock.o filters/out_video.o filters/reframer.o filters/reframe_ac3.o filters/reframe_adts.o filters/reframe_latm.o filters/reframe_amr.o filters/reframe_av1.o filters/reframe_flac.o filters/reframe_h263.o filters/reframe_img.o filters/reframe_mhas.o filters/reframe_mp3.o filters/reframe_mpgvid.o filters/reframe_nalu.o filters/reframe_prores.o filters/reframe_qcp.o filters/reframe_rawvid.o filters/reframe_rawpcm.o filters/reframe_truehd.o filters/resample_audio.o filters/restamp.o  filters/tileagg.o filters/tilesplit.o filters/tssplit.o filters/ttml_conv.o filters/unit_test_filter.o filters/rewind.o filters/rewrite_adts.o filters/rewrite_mhas.o filters/rewrite_mp4v.o filters/rewrite_nalu.o filters/rewrite_obu.o filters/vflip.o filters/vcrop.o filters/write_generic.o filters/write_nhml.o filters/write_nhnt.o filters/write_qcp.o filters/write_tx3g.o filters/write_vtt.o ../modules/dektec_out/dektec_video_decl.o filters/dec_opensvc.o filters/unframer.o
 LIBGPAC_FILTERS_FFMPEG=filters/ff_common.o filters/ff_avf.o filters/ff_dec.o filters/ff_dmx.o filters/ff_enc.o filters/ff_rescale.o filters/ff_mx.o filters/ff_bsf.o
+LIBGPAC_FILTERS_LIBCAPTION=filters/dec_cc.o
+LIBGPAC_FILTERS_MPEGHDEC=filters/dec_mpeghdec.o
+
+ifeq ($(CONFIG_EMSCRIPTEN),yes)
+LIBGPAC_FILTERS+=filters/dec_webcodec.o filters/enc_webcodec.o filters/avin_web.o
+endif
 
 ifeq ($(STATIC_MODULES),yes)
 LIBGPAC_FILTERS_OHEVC=filters/dec_openhevc.o
@@ -223,7 +230,7 @@
 endif
 
 ## libgpac objects gathering:
-OBJS=$(LIBGPAC_UTILS) $(LIBGPAC_CRYPTO) $(LIBGPAC_SCENE) $(LIBGPAC_IETF) $(LIBGPAC_BIFS) $(LIBGPAC_ISOM) $(LIBGPAC_ODF) $(LIBGPAC_MEDIATOOLS) $(LIBGPAC_SCENEMANAGER) $(LIBGPAC_COMPOSITOR) $(LIBGPAC_LASER) $(LIBGPAC_EVG) $(LIBGPAC_FILTERS) $(LIBGPAC_FILTERS_FFMPEG) $(LIBGPAC_FILTERS_OHEVC) $(LIBGPAC_QUICKJS) $(LIBGPAC_JSMODS)
+OBJS=$(LIBGPAC_UTILS) $(LIBGPAC_CRYPTO) $(LIBGPAC_SCENE) $(LIBGPAC_IETF) $(LIBGPAC_BIFS) $(LIBGPAC_ISOM) $(LIBGPAC_ODF) $(LIBGPAC_MEDIATOOLS) $(LIBGPAC_SCENEMANAGER) $(LIBGPAC_COMPOSITOR) $(LIBGPAC_LASER) $(LIBGPAC_EVG) $(LIBGPAC_FILTERS) $(LIBGPAC_FILTERS_FFMPEG) $(LIBGPAC_FILTERS_LIBCAPTION) $(LIBGPAC_FILTERS_MPEGHDEC) $(LIBGPAC_FILTERS_OHEVC) $(LIBGPAC_QUICKJS) $(LIBGPAC_JSMODS)
 
 
 ##include static modules and other deps for libgpac
@@ -231,8 +238,7 @@
 
 #todo, we may need to trick ld for library path...
 EXTRALIBS+=$(zlib_ldflags) $(opensvc_ldflags) $(ssl_ldflags) $(jpeg_ldflags) $(openjpeg_ldflags) $(png_ldflags) $(mad_ldflags) $(a52_ldflags) $(xvid_ldflags) $(faad_ldflags)
-EXTRALIBS+=$(ffmpeg_ldflags) $(ogg_ldflags) $(vorbis_ldflags) $(theora_ldflags) $(nghttp2_ldflags) $(vtb_ldflags)
-
+EXTRALIBS+=$(ffmpeg_ldflags) $(ogg_ldflags) $(vorbis_ldflags) $(theora_ldflags) $(nghttp2_ldflags) $(vtb_ldflags) $(caption_ldflags) $(mpeghdec_ldflags)
 
 ##libgpac library output
 LIB=libgpac$(DYN_LIB_SUFFIX)
@@ -293,6 +299,13 @@
 filters_ffmpeg: $(LIBGPAC_FILTERS_FFMPEG)
 .deps/filters/%: CFLAGS += $(FILTERS_CFLAGS) $(ffmpeg_cflags)
 
+filters_libcaption: CFLAGS += $(FILTERS_CFLAGS) $(caption_cflags)
+filters_libcaption: $(LIBGPAC_FILTERS_LIBCAPTION)
+.deps/filters/%: CFLAGS += $(FILTERS_CFLAGS) $(caption_cflags)
+
+filters_mpeghdec: CFLAGS += $(FILTERS_CFLAGS) $(mpeghdec_cflags)
+filters_mpeghdec: $(LIBGPAC_FILTERS_MPEGHDEC)
+.deps/filters/%: CFLAGS += $(FILTERS_CFLAGS) $(mpeghdec_cflags)
 
 filters_ohevc: CFLAGS += $(FILTERS_OHEVC_CFLAGS)
 filters_ohevc: $(LIBGPAC_FILTERS_OHEVC)
@@ -355,7 +368,7 @@
 crypto/g_crypt_openssl.o: crypto/g_crypt_openssl.c
 
 
-../bin/gcc/$(LIB): $(LIBGPAC_UTILS) $(LIBGPAC_IETF) $(LIBGPAC_BIFS) $(LIBGPAC_ODF) $(LIBGPAC_LASER) $(LIBGPAC_ISOM) $(LIBGPAC_SCENEMANAGER) compositor scenegraph media_tools crypto filters filters_ffmpeg filters_ohevc jsmods $(OBJS)
+../bin/gcc/$(LIB): $(LIBGPAC_UTILS) $(LIBGPAC_IETF) $(LIBGPAC_BIFS) $(LIBGPAC_ODF) $(LIBGPAC_LASER) $(LIBGPAC_ISOM) $(LIBGPAC_SCENEMANAGER) compositor scenegraph media_tools crypto filters filters_ffmpeg filters_libcaption filters_mpeghdec filters_ohevc jsmods $(OBJS)
 #	@echo "OBJS $(OBJS)"
 #	@echo "LIBS $(ALL_LIBS)"
 
@@ -391,7 +404,7 @@
 -include .depend
 
 .depend: $(DEPS)
-	cat $^ > "$@"
+	@cat $^ > "$@"
 
 .deps/%.dep: %.c
 	@mkdir -p $(dir $@)

gpac-2.2.1.tar.gz/src/bifs/bifs_codec.c -> gpac-2.4.0.tar.gz/src/bifs/bifs_codec.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2012
+ *			Copyright (c) Telecom ParisTech 2000-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / BIFS codec sub-project
@@ -130,19 +130,18 @@
 	Bool new_cfg = GF_FALSE;
 	GF_Err e;
 
+	if (!codec) return GF_BAD_PARAM;
 	if (!DecoderSpecificInfo) {
+		if (!codec->streamInfo) return GF_BAD_PARAM;
 		/* Hack for T-DMB non compliant streams */
 		GF_SAFEALLOC(pInfo, BIFSStreamInfo);
 		if (!pInfo) return GF_OUT_OF_MEM;
 		pInfo->ESID = ESID;
 		pInfo->config.PixelMetrics = GF_TRUE;
 		pInfo->config.version = (objectTypeIndication==2) ? 1 : 2;
-		assert( codec );
-		assert( codec->streamInfo );
 		return gf_list_add(codec->streamInfo, pInfo);
 	}
 
-	assert( codec );
 	pInfo = gf_bifs_dec_get_stream(codec, ESID);
 	//we allow reconfigure of the BIFS stream
 	if (pInfo == NULL) {
@@ -172,7 +171,7 @@
 	}
 	gf_bs_del(bs);
 
-	assert( codec->streamInfo );
+	gf_assert( codec->streamInfo );
 	//first stream, configure size
 	if (!codec->ignore_size && !gf_list_count(codec->streamInfo)) {
 		gf_sg_set_scene_size_info(codec->scenegraph, pInfo->config.Width, pInfo->config.Height, pInfo->config.PixelMetrics);
@@ -225,7 +224,7 @@
 GF_EXPORT
 void gf_bifs_decoder_del(GF_BifsDecoder *codec)
 {
-	assert(gf_list_count(codec->QPs)==0);
+	gf_assert(gf_list_count(codec->QPs)==0);
 	gf_list_del(codec->QPs);
 
 	/*destroy all config*/
@@ -293,9 +292,11 @@
 
 GF_Node *gf_bifs_enc_find_node(GF_BifsEncoder *codec, u32 nodeID)
 {
-	if (codec->current_proto_graph) return gf_sg_find_node(codec->current_proto_graph, nodeID);
-	assert(codec->scene_graph);
-	return gf_sg_find_node(codec->scene_graph, nodeID);
+	if (codec->current_proto_graph)
+		return gf_sg_find_node(codec->current_proto_graph, nodeID);
+	if (codec->scene_graph)
+		return gf_sg_find_node(codec->scene_graph, nodeID);
+	return NULL;
 }
 
 
@@ -328,7 +329,7 @@
 GF_EXPORT
 void gf_bifs_encoder_del(GF_BifsEncoder *codec)
 {
-	assert(gf_list_count(codec->QPs)==0);
+	gf_assert(gf_list_count(codec->QPs)==0);
 	gf_list_del(codec->QPs);
 	/*destroy all config*/
 	while (gf_list_count(codec->streamInfo)) {
@@ -501,14 +502,14 @@
 GF_EXPORT
 u32 gf_bifs_get_child_table(GF_Node *Node)
 {
-	assert(Node);
+	if (!Node) return 0;
 	return gf_sg_mpeg4_node_get_child_ndt(Node);
 }
 
 
 GF_Err gf_bifs_get_field_index(GF_Node *Node, u32 inField, u8 IndexMode, u32 *allField)
 {
-	assert(Node);
+	if (!Node) return GF_BAD_PARAM;
 	switch (Node->sgprivate->tag) {
 	case TAG_ProtoNode:
 		return gf_sg_proto_get_field_ind_static(Node, inField, IndexMode, allField);

gpac-2.2.1.tar.gz/src/bifs/com_dec.c -> gpac-2.4.0.tar.gz/src/bifs/com_dec.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2012
+ *			Copyright (c) Telecom ParisTech 2000-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / BIFS codec sub-project
@@ -30,8 +30,8 @@
 #ifndef GPAC_DISABLE_BIFS
 
 
-GF_Err BD_DecMFFieldList(GF_BifsDecoder * codec, GF_BitStream *bs, GF_Node *node, GF_FieldInfo *field);
-GF_Err BD_DecMFFieldVec(GF_BifsDecoder * codec, GF_BitStream *bs, GF_Node *node, GF_FieldInfo *field);
+GF_Err BD_DecMFFieldList(GF_BifsDecoder * codec, GF_BitStream *bs, GF_Node *node, GF_FieldInfo *field, Bool is_mem_com);
+GF_Err BD_DecMFFieldVec(GF_BifsDecoder * codec, GF_BitStream *bs, GF_Node *node, GF_FieldInfo *field, Bool is_mem_com);
 
 
 
@@ -860,6 +860,7 @@
 		pos = 0;
 		break;
 	case 3:
+		if (!field.far_ptr) return GF_NON_COMPLIANT_BITSTREAM;
 		pos = ((GenMFField *) field.far_ptr)->count - 1;
 		break;
 	default:
@@ -999,7 +1000,7 @@
 GF_Err gf_bifs_dec_proto_list(GF_BifsDecoder * codec, GF_BitStream *bs, GF_List *proto_list)
 {
 	u8 flag, field_type, event_type, useQuant, useAnim, f;
-	u32 i, NbRoutes, ID, numProtos, numFields, count, qpsftype, QP_Type, NumBits, nb_cmd_bufs;
+	u32 i, NbRoutes, ID, /*numProtos, */ numFields, count, qpsftype, QP_Type, NumBits, nb_cmd_bufs;
 	GF_Node *node;
 	char name1000;
 	GF_ProtoFieldInterface *proto_field;
@@ -1017,7 +1018,7 @@
 	e = GF_OK;
 
 	nb_cmd_bufs = gf_list_count(codec->command_buffers);
-	numProtos = 0;
+	//numProtos = 0;
 	proto = NULL;
 	flag = gf_bs_read_int(bs, 1);
 	while (flag) {
@@ -1073,15 +1074,15 @@
 					if (codec->info->config.UsePredictiveMFField) {
 						f = gf_bs_read_int(bs, 1);
 						/*predictive encoding of proto field is not possible since QP info is not present yet*/
-						assert(!f);
+						gf_assert(!f);
 					}
 					/*reserved*/
 					f = gf_bs_read_int(bs, 1);
 					if (!f) {
 						if (gf_bs_read_int(bs, 1)) {
-							e = BD_DecMFFieldList(codec, bs, NULL, &field);
+							e = BD_DecMFFieldList(codec, bs, NULL, &field, GF_FALSE);
 						} else {
-							e = BD_DecMFFieldVec(codec, bs, NULL, &field);
+							e = BD_DecMFFieldVec(codec, bs, NULL, &field, GF_FALSE);
 						}
 					}
 				}
@@ -1106,7 +1107,7 @@
 
 			if (codec->info->config.UsePredictiveMFField) {
 				flag = gf_bs_read_int(bs, 1);
-				assert(!flag);
+				gf_assert(!flag);
 			}
 			/*reserved*/
 			gf_bs_read_int(bs, 1);
@@ -1114,9 +1115,9 @@
 			/*list or vector*/
 			flag = gf_bs_read_int(bs, 1);
 			if (flag) {
-				e = BD_DecMFFieldList(codec, bs, NULL, &field);
+				e = BD_DecMFFieldList(codec, bs, NULL, &field, GF_FALSE);
 			} else {
-				e = BD_DecMFFieldVec(codec, bs, NULL, &field);
+				e = BD_DecMFFieldVec(codec, bs, NULL, &field, GF_FALSE);
 			}
 			if (e) goto exit;
 		}
@@ -1254,7 +1255,7 @@
 			}
 		}
 
-		numProtos ++;
+		//numProtos ++;
 
 		/*4- get next proto*/
 		flag = gf_bs_read_int(bs, 1);

gpac-2.2.1.tar.gz/src/bifs/conditional.c -> gpac-2.4.0.tar.gz/src/bifs/conditional.c Changed

gpac-2.2.1.tar.gz/src/bifs/field_decode.c -> gpac-2.4.0.tar.gz/src/bifs/field_decode.c Changed

gpac-2.2.1.tar.gz/src/bifs/field_encode.c -> gpac-2.4.0.tar.gz/src/bifs/field_encode.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2020
+ *			Copyright (c) Telecom ParisTech 2000-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / BIFS codec sub-project
@@ -294,7 +294,7 @@
 			gf_sg_vrml_mf_get_item(field->far_ptr, field->fieldType, &sffield.far_ptr, i);
 			e = gf_bifs_enc_sf_field(codec, bs, node, &sffield);
 		} else {
-			assert(list);
+			if (!list) return GF_NON_COMPLIANT_BITSTREAM;
 			e = gf_bifs_enc_node(codec, list->node, field->NDTtype, bs, node);
 
 			/*activate QP*/
@@ -330,7 +330,7 @@
 
 GF_Err gf_bifs_enc_field(GF_BifsEncoder * codec, GF_BitStream *bs, GF_Node *node, GF_FieldInfo *field)
 {
-	assert(node);
+	if (!node) return GF_BAD_PARAM;
 	if (field->fieldType == GF_SG_VRML_UNKNOWN)
 		return GF_NON_COMPLIANT_BITSTREAM;
 
@@ -568,7 +568,7 @@
 	Bool flag, reset_qp14;
 	GF_Err e;
 
-	assert(codec->info);
+	if (!codec->info) return GF_BAD_PARAM;
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("BIFS Encode node %s\n", gf_node_get_class_name(node) ));
 
 	/*NULL node is a USE of maxID*/

gpac-2.2.1.tar.gz/src/bifs/memory_decoder.c -> gpac-2.4.0.tar.gz/src/bifs/memory_decoder.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2012
+ *			Copyright (c) Telecom ParisTech 2000-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / BIFS codec sub-project
@@ -770,6 +770,7 @@
 		pos = 0;
 		break;
 	case 3:
+		if (!field.far_ptr) return GF_NON_COMPLIANT_BITSTREAM;
 		pos = ((GenMFField *) field.far_ptr)->count - 1;
 		break;
 	default:
@@ -901,6 +902,8 @@
 	GF_SceneGraph *cur_graph = codec->current_graph;
 	GF_Proto *cur_proto = codec->pCurrentProto;
 
+	u32 nbBufs = gf_list_count(codec->command_buffers);
+
 	codec->LastError = GF_OK;
 	while (go) {
 		type = gf_bs_read_int(bs, 2);
@@ -925,6 +928,15 @@
 		gf_bifs_dec_qp_remove(codec, GF_TRUE);
 	}
 
+	if (e) {
+		while (gf_list_count(codec->command_buffers) > nbBufs) {
+			CommandBufferItem *cbi;
+			cbi = (CommandBufferItem *)gf_list_pop_back(codec->command_buffers);
+			if (cbi->node) gf_node_unregister(cbi->node, NULL);
+			gf_free(cbi);
+		}
+	}
+
 	codec->current_graph = cur_graph;
 	codec->pCurrentProto = cur_proto;
 	return e;
@@ -1027,7 +1039,7 @@
 	if (codec->info->config.elementaryMasks ) return GF_NOT_SUPPORTED;
 
 	/*root parse (not conditionals)*/
-	assert(codec->scenegraph);
+	if (!codec->scenegraph) return GF_BAD_PARAM;
 	/*setup current scene graph*/
 	codec->current_graph = codec->scenegraph;

gpac-2.2.1.tar.gz/src/bifs/script_enc.c -> gpac-2.4.0.tar.gz/src/bifs/script_enc.c Changed

gpac-2.2.1.tar.gz/src/bifs/unquantize.c -> gpac-2.4.0.tar.gz/src/bifs/unquantize.c Changed

gpac-2.2.1.tar.gz/src/compositor/audio_input.c -> gpac-2.4.0.tar.gz/src/compositor/audio_input.c Changed

gpac-2.2.1.tar.gz/src/compositor/audio_mixer.c -> gpac-2.4.0.tar.gz/src/compositor/audio_mixer.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2021
+ *			Copyright (c) Telecom ParisTech 2000-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / Scene Compositor sub-project
@@ -25,9 +25,11 @@
 
 #include <gpac/internal/compositor_dev.h>
 
+#if !defined(GPAC_DISABLE_COMPOSITOR) &&  !defined(GPAC_DISABLE_RESAMPLE)
+
 /*
 	Notes about the mixer:
-	1- spatialization is out of scope for the mixer (eg that's the sound node responsability)
+	1- spatialization is out of scope for the mixer (eg that's the sound node responsibility)
 	2- mixing is performed by resampling input source & deinterleaving its channels into dedicated buffer.
 	We could directly deinterleave in the main mixer output buffer, but this would prevent any future
 	gain correction.
@@ -84,6 +86,10 @@
 	u32 output_size;
 };
 
+#define swap_16(x) (( (x) << 8 & 0xff00) | ((x) >> 8 & 0x00ff))
+#define swap_32(x) (swap_16(x) << 16 | swap_16((x) >> 16))
+#define swap_64(x) ( swap_32(x) << 32 | swap_32((x) >> 32))
+
 #define GF_S24_MAX	8388607
 #define GF_S24_MIN	-8388608
 
@@ -306,47 +312,45 @@
 	return val;
 }
 
+static GFINLINE s32 make_s24_be_int(u8 *ptr)
+{
+	s32 val = (s8) ptr0;
+	val *= 256;
+	val |= ptr1;
+	val *= 256;
+	val |= ptr2;
+	return val;
+}
 #define MIX_S16_SCALE	65535
 #define MIX_S24_SCALE	255
 #define MIX_U8_SCALE	16777215
 
 s32 input_sample_s32(u8 *data, u32 nb_ch, u32 sample_offset, u32 channel, u32 planar_stride)
 {
+	u32 psamp = * ((u32*) (data + 4 * (sample_offset*nb_ch + channel)));
 #ifdef GPAC_BIG_ENDIAN
-	u8 *src = data + 2*(sample_offset*nb_ch + channel);
-	s32 res = src4;
-	res<<=8;
-	res |= src3;
-	res<<=8;
-	res |= src2;
-	res<<=8;
-	res |= src1;
-	res<<=8;
-	res |= src0;
-	return res;
-#else
-	s32 *src = (s32 *)data;
-	return srcsample_offset*nb_ch + channel;
+	psamp = swap_32(psamp);
 #endif
+	s32 res = *(s32 *)&psamp;
+	return res;
 }
 s32 input_sample_s32p(u8 *data, u32 nb_ch, u32 sample_offset, u32 channel, u32 planar_stride)
 {
+	u32 psamp = * ((u32*) (data + 4 * (sample_offset + planar_stride*channel/4)));
 #ifdef GPAC_BIG_ENDIAN
-	u8 *src = data + 4 * (sample_offset + planar_stride*channel/4);
-	s32 res = src4;
-	res<<=8;
-	res |= src3;
-	res<<=8;
-	res |= src2;
-	res<<=8;
-	res |= src1;
-	res<<=8;
-	res |= src0;
+	psamp = swap_32(psamp);
+#endif
+	s32 res = *(s32 *)&psamp;
 	return res;
-#else
-	s32 *src = (s32 *)data;
-	return srcsample_offset + planar_stride*channel/4;
+}
+s32 input_sample_s32_be(u8 *data, u32 nb_ch, u32 sample_offset, u32 channel, u32 planar_stride)
+{
+	u32 psamp = * ((u32*) (data + 4 * (sample_offset*nb_ch + channel)));
+#ifndef GPAC_BIG_ENDIAN
+	psamp = swap_32(psamp);
 #endif
+	s32 res = *(s32 *)&psamp;
+	return res;
 }
 s32 input_sample_s24(u8 *data, u32 nb_ch, u32 sample_offset, u32 channel, u32 planar_stride)
 {
@@ -356,6 +360,11 @@
 {
 	return make_s24_int(&datasample_offset*3 + channel*planar_stride) * MIX_S24_SCALE;
 }
+s32 input_sample_s24_be(u8 *data, u32 nb_ch, u32 sample_offset, u32 channel, u32 planar_stride)
+{
+	return make_s24_be_int(&datasample_offset*nb_ch*3 + 3*channel) * MIX_S24_SCALE;
+}
+
 
 #define TRUNC_FLT_DBL(_a) \
 	if (_a<-1.0) return GF_INT_MIN;\
@@ -364,70 +373,86 @@
 
 s32 input_sample_flt(u8 *data, u32 nb_ch, u32 sample_offset, u32 channel, u32 planar_stride)
 {
-	Float *src = (Float *)data;
-	Float samp = srcsample_offset*nb_ch + channel;
+	u32 psamp = *((u32 *) (data + 4*(sample_offset*nb_ch + channel)));
+#ifdef GPAC_BIG_ENDIAN
+	psamp = swap_32(psamp);
+#endif
+	Float samp = *(Float *)&psamp;
 	TRUNC_FLT_DBL(samp);
 }
 s32 input_sample_fltp(u8 *data, u32 nb_ch, u32 sample_offset, u32 channel, u32 planar_stride)
 {
-	Float *src = (Float *)data;
-	Float samp = srcsample_offset + planar_stride*channel/4;
+	u32 psamp = * ((u32 *) (data + 4 * (sample_offset + planar_stride*channel/4)));
+#ifdef GPAC_BIG_ENDIAN
+	psamp = swap_32(psamp);
+#endif
+	Float samp = *(Float *)&psamp;
+	TRUNC_FLT_DBL(samp);
+}
+s32 input_sample_flt_be(u8 *data, u32 nb_ch, u32 sample_offset, u32 channel, u32 planar_stride)
+{
+	u32 psamp = *((u32 *) (data + 4*(sample_offset*nb_ch + channel)));
+#ifndef GPAC_BIG_ENDIAN
+	psamp = swap_32(psamp);
+#endif
+	Float samp = *(Float *)&psamp;
 	TRUNC_FLT_DBL(samp);
 }
 s32 input_sample_dbl(u8 *data, u32 nb_ch, u32 sample_offset, u32 channel, u32 planar_stride)
 {
-	Double *src = (Double *)data;
-	Double samp = srcsample_offset*nb_ch + channel;
+	u64 psamp = *((u64 *) (data + 8*(sample_offset*nb_ch + channel)));
+#ifdef GPAC_BIG_ENDIAN
+	psamp = swap_64(psamp);
+#endif
+	Double samp = *(Double *)&psamp;
 	TRUNC_FLT_DBL(samp);
 }
 s32 input_sample_dblp(u8 *data, u32 nb_ch, u32 sample_offset, u32 channel, u32 planar_stride)
 {
-	Double *src = (Double *)data;
-	Double samp = srcsample_offset + planar_stride * channel / 8;
+	u64 psamp = *((u64 *) (data + 8*(sample_offset + planar_stride * channel / 8)));
+#ifdef GPAC_BIG_ENDIAN
+	psamp = swap_64(psamp);
+#endif
+	Double samp = *(Double *)&psamp;
+	TRUNC_FLT_DBL(samp);
+}
+s32 input_sample_dbl_be(u8 *data, u32 nb_ch, u32 sample_offset, u32 channel, u32 planar_stride)
+{
+	u64 psamp = *((u64 *) (data + 8*(sample_offset*nb_ch + channel)));
+#ifndef GPAC_BIG_ENDIAN
+	psamp = swap_64(psamp);
+#endif
+	Double samp = *(Double *)&psamp;
 	TRUNC_FLT_DBL(samp);
 }
+
 s32 input_sample_s16(u8 *data, u32 nb_ch, u32 sample_offset, u32 channel, u32 planar_stride)
 {
+	u16 psamp = * ((u16 *) (data + 2*(sample_offset*nb_ch + channel)));
 #ifdef GPAC_BIG_ENDIAN
-	u8 *src = data + 2*(sample_offset*nb_ch + channel);
-	s16 res = src1;
-	res<<=8;
-	res |= src0;
-	return ((s32)res) * MIX_S16_SCALE;
-#else
-	s16 *src = (s16 *)data;
-	s32 res = srcsample_offset*nb_ch + channel;
-	return res * MIX_S16_SCALE;
+	psamp = swap_16(psamp);
 #endif
+	s32 res = * (s16*)&psamp;
+	return res * MIX_S16_SCALE;
 }
 s32 input_sample_s16_be(u8 *data, u32 nb_ch, u32 sample_offset, u32 channel, u32 planar_stride)
 {
-#ifdef GPAC_BIG_ENDIAN
-	s16 *src = (s16 *)data;
-	s32 res = srcsample_offset*nb_ch + channel;
-	return res * MIX_S16_SCALE;
-#else
-	u8 *src = data + 2*(sample_offset*nb_ch + channel);
-	s16 res = src0;
-	res<<=8;
-	res |= src1;
-	return ((s32)res) * MIX_S16_SCALE;
+	u16 psamp = * ((u16 *) (data + 2*(sample_offset*nb_ch + channel)));
+#ifndef GPAC_BIG_ENDIAN
+	psamp = swap_16(psamp);
 #endif
+	s32 res = * (s16*)&psamp;
+	return res * MIX_S16_SCALE;
 }
 
 s32 input_sample_s16p(u8 *data, u32 nb_ch, u32 sample_offset, u32 channel, u32 planar_stride)
 {
+	u16 psamp = * ((u16*) (data + 2* (sample_offset + planar_stride*channel / 2)));
 #ifdef GPAC_BIG_ENDIAN
-	u8 *src = data + 2 * (sample_offset + planar_stride*channel / 2);
-	s16 res = src1;
-	res<<=8;
-	res |= src0;
-	return ((s32)res) * MIX_S16_SCALE;
-#else
-	s16 *src = (s16 *)data;
-	s32 res = srcsample_offset + planar_stride*channel / 2;
-	return res * MIX_S16_SCALE;
+	psamp = swap_16(psamp);
 #endif
+	s32 res = *(s16 *) &psamp;
+	return res * MIX_S16_SCALE;
 }
 s32 input_sample_u8(u8 *data, u32 nb_ch, u32 sample_offset, u32 channel, u32 planar_stride)
 {
@@ -441,6 +466,10 @@
 	res -= 128;
 	return res * MIX_U8_SCALE;
 }
+s32 input_sample_null(u8 *data, u32 nb_ch, u32 sample_offset, u32 channel, u32 planar_stride)
+{
+	return 0;
+}
 
 static void gf_am_configure_source(MixerInput *in)
 {
@@ -457,6 +486,9 @@
 	case GF_AUDIO_FMT_S24:
 		in->get_sample = input_sample_s24;
 		break;
+	case GF_AUDIO_FMT_S24_BE:
+		in->get_sample = input_sample_s24_be;
+		break;
 	case GF_AUDIO_FMT_S24P:
 		in->get_sample = input_sample_s24p;
 		break;
@@ -466,18 +498,27 @@
 	case GF_AUDIO_FMT_FLTP:
 		in->get_sample = input_sample_fltp;
 		break;
+	case GF_AUDIO_FMT_FLT_BE:
+		in->get_sample = input_sample_flt_be;
+		break;
 	case GF_AUDIO_FMT_DBL:
 		in->get_sample = input_sample_dbl;
 		break;
 	case GF_AUDIO_FMT_DBLP:
 		in->get_sample = input_sample_dblp;
 		break;
+	case GF_AUDIO_FMT_DBL_BE:
+		in->get_sample = input_sample_dbl_be;
+		break;
 	case GF_AUDIO_FMT_S16:
 		in->get_sample = input_sample_s16;
 		break;
 	case GF_AUDIO_FMT_S16_BE:
 		in->get_sample = input_sample_s16_be;
 		break;
+	case GF_AUDIO_FMT_S32_BE:
+		in->get_sample = input_sample_s32_be;
+		break;
 	case GF_AUDIO_FMT_S16P:
 		in->get_sample = input_sample_s16p;
 		break;
@@ -487,6 +528,10 @@
 	case GF_AUDIO_FMT_U8P:
 		in->get_sample = input_sample_u8p;
 		break;
+	default:
+		GF_LOG(GF_LOG_ERROR, GF_LOG_AUDIO, ("AudioMixer Unsupported input format %s\n", gf_audio_fmt_sname(in->src->afmt) ));
+		in->get_sample = input_sample_null;
+		break;
 	}
 }
 
@@ -516,7 +561,7 @@
 	ch_layout = 0;
 
 	count = gf_list_count(am->sources);
-	assert(count);
+	gf_assert(count);
 	for (i=0; i<count; i++) {
 		Bool has_cfg;
 		MixerInput *in = (MixerInput *) gf_list_get(am->sources, i);
@@ -689,7 +734,7 @@
 				if (ch==10) return;
 			}
 			pos = get_channel_out_pos((1<<ch), out_ch_layout);
-			assert(pos != GF_AUDIO_MIXER_MAX_CHANNELS);
+			gf_assert(pos != GF_AUDIO_MIXER_MAX_CHANNELS);
 			inChanpos = bckupi;
 			ch++;
 			cfg>>=1;
@@ -897,12 +942,6 @@
 	in->in_bytes_used += 1;
 }
 
-#ifdef GPAC_BIG_ENDIAN
-#endif
-
-#define swap_16(x) (( (x) << 8 & 0xff00) | ((x) >> 8 & 0x00ff))
-#define swap_32(x) (swap_16(x) << 16 | swap_16((x) >> 16))
-
 GF_EXPORT
 u32 gf_mixer_get_output(GF_AudioMixer *am, void *buffer, u32 buffer_size, u32 delay)
 {
@@ -1055,7 +1094,7 @@
 			in->out_samples_to_write = 0;
 			in->out_samples_written = 0;
 		} else {
-			assert(in->src->samplerate);
+			gf_assert(in->src->samplerate);
 			in->out_samples_to_write = nb_samples;
 
 			if (!force_mix && !in->src->GetChannelVolume(in->src->callback, in->pan)) {
@@ -1134,9 +1173,7 @@
 		return 0;
 	}
 
-	//TODO big-endian support (output is assumed to be little endian PCM)
-
-	//we do not re-normalize based on the number of input, this is the author's responsability
+	//we do not re-normalize based on the number of input, this is the author's responsibility
 	out_mix = am->output;
 	if (am->afmt == GF_AUDIO_FMT_S32) {
 		s32 *out_s32 = (s32 *)buffer;
@@ -1169,53 +1206,136 @@
 			}
 		}
 	}
+	if (am->afmt == GF_AUDIO_FMT_S32_BE) {
+		s32 *out_s32 = (s32 *)buffer;
+		for (i = 0; i < nb_written; i++) {
+			for (j = 0; j < am->nb_channels; j++) {
+				s32 samp = (*out_mix);
+#ifndef GPAC_BIG_ENDIAN
+				(*out_s32) = swap_32(samp);
+#else
+				(*out_s32) = samp;
+#endif
+				out_s32 += 1;
+				out_mix += 1;
+			}
+		}
+	}
 	else if (am->afmt == GF_AUDIO_FMT_FLT) {
 		Float *out_flt = (Float *)buffer;
+#ifdef GPAC_BIG_ENDIAN
+		s32 *out_u32 = (s32 *)buffer;
+#endif
 		for (i = 0; i < nb_written; i++) {
 			for (j = 0; j < am->nb_channels; j++) {
 				s32 samp = (*out_mix);
 				(*out_flt) = ((Float)samp) / GF_INT_MAX;
 				out_flt += 1;
+
+#ifdef GPAC_BIG_ENDIAN
+				(*out_u32) = swap_32(*out_u32);
+				out_u32 += 1;
+#endif
+				out_mix += 1;
+			}
+		}
+	}
+	else if (am->afmt == GF_AUDIO_FMT_FLT_BE) {
+		Float *out_flt = (Float *)buffer;
+#ifndef GPAC_BIG_ENDIAN
+		u32 *out_u32 = (u32 *)buffer;
+#endif
+		for (i = 0; i < nb_written; i++) {
+			for (j = 0; j < am->nb_channels; j++) {
+				s32 samp = (*out_mix);
+				(*out_flt) = ((Float)samp) / GF_INT_MAX;
+				out_flt += 1;
+
+#ifndef GPAC_BIG_ENDIAN
+				(*out_u32) = swap_32(*out_u32);
+				out_u32 += 1;
+#endif
 				out_mix += 1;
 			}
 		}
 	}
 	else if (am->afmt == GF_AUDIO_FMT_FLTP) {
 		Float *out_flt = (Float *)buffer;
+#ifdef GPAC_BIG_ENDIAN
+		u32 *out_u32 = (u32 *)buffer;
+#endif
 		for (j = 0; j < am->nb_channels; j++) {
 			out_mix = am->output + j;
 			for (i = 0; i < nb_written; i++) {
 				s32 samp = (*out_mix);
 				(*out_flt) = ((Float)samp) / GF_INT_MAX;
 				out_flt += 1;
+
+#ifdef GPAC_BIG_ENDIAN
+				(*out_u32) = swap_32(*out_u32);
+				out_u32 += 1;
+#endif
 				out_mix += am->nb_channels;
 			}
 		}
 	}
 	else if (am->afmt == GF_AUDIO_FMT_DBL) {
 		Double *out_dbl = (Double *)buffer;
+#ifdef GPAC_BIG_ENDIAN
+		u64 *out_u64 = (u64 *)buffer;
+#endif
 		for (i = 0; i < nb_written; i++) {
 			for (j = 0; j < am->nb_channels; j++) {
 				s32 samp = (*out_mix);
 				(*out_dbl) = ((Double)samp) / GF_INT_MAX;
 				out_dbl += 1;
+
+#ifdef GPAC_BIG_ENDIAN
+				(*out_u64) = swap_64(*out_u64);
+				out_u64 += 1;
+#endif
 				out_mix += 1;
 			}
 		}
 	}
 	else if (am->afmt == GF_AUDIO_FMT_DBLP) {
 		Double *out_dbl = (Double *)buffer;
+#ifdef GPAC_BIG_ENDIAN
+		u64 *out_u64 = (u64 *)buffer;
+#endif
 		for (j = 0; j < am->nb_channels; j++) {
 			out_mix = am->output + j;
 			for (i = 0; i < nb_written; i++) {
 				s32 samp = (*out_mix);
 				(*out_dbl) = ((Double)samp) / GF_INT_MAX;
 				out_dbl += 1;
+#ifdef GPAC_BIG_ENDIAN
+				(*out_u64) = swap_64(*out_u64);
+				out_u64 += 1;
+#endif
 				out_mix += am->nb_channels;
 			}
 		}
 	}
-	else if (am->afmt == GF_AUDIO_FMT_S24) {
+	else if (am->afmt == GF_AUDIO_FMT_DBL_BE) {
+		Double *out_dbl = (Double *)buffer;
+#ifndef GPAC_BIG_ENDIAN
+		u64 *out_u64 = (u64 *)buffer;
+#endif
+		for (i = 0; i < nb_written; i++) {
+			for (j = 0; j < am->nb_channels; j++) {
+				s32 samp = (*out_mix);
+				(*out_dbl) = ((Double)samp) / GF_INT_MAX;
+				out_dbl += 1;
+
+#ifndef GPAC_BIG_ENDIAN
+				(*out_u64) = swap_64(*out_u64);
+				out_u64 += 1;
+#endif
+				out_mix += 1;
+			}
+		}
+	} else if (am->afmt == GF_AUDIO_FMT_S24) {
 		s8 *out_s24 = (s8 *)buffer;
 		for (i = 0; i<nb_written; i++) {
 			for (j = 0; j<am->nb_channels; j++) {
@@ -1246,6 +1366,21 @@
 				out_mix += am->nb_channels;
 			}
 		}
+	} else if (am->afmt == GF_AUDIO_FMT_S24_BE) {
+		s8 *out_s24 = (s8 *)buffer;
+		for (i = 0; i<nb_written; i++) {
+			for (j = 0; j<am->nb_channels; j++) {
+				s32 samp = (*out_mix);
+				samp /= MIX_S24_SCALE;
+				if (samp > GF_S24_MAX) samp = GF_S24_MAX;
+				else if (samp < GF_S24_MIN) samp = GF_S24_MIN;
+				out_s240 = (samp>>16) & 0xFF;
+				out_s241 = (samp>>8) & 0xFF;
+				out_s242 = samp & 0xFF;
+				out_s24 += 3;
+				out_mix += 1;
+			}
+		}
 	} else if (am->afmt == GF_AUDIO_FMT_S16) {
 		s16 *out_s16 = (s16 *)buffer;
 		for (i = 0; i<nb_written; i++) {
@@ -1282,6 +1417,24 @@
 				out_mix += am->nb_channels;
 			}
 		}
+	} else if (am->afmt == GF_AUDIO_FMT_S16_BE) {
+		s16 *out_s16 = (s16 *)buffer;
+		for (i = 0; i<nb_written; i++) {
+			for (j = 0; j<am->nb_channels; j++) {
+				s32 samp = (*out_mix);
+				samp /= MIX_S16_SCALE;
+				if (samp > GF_SHORT_MAX) samp = GF_SHORT_MAX;
+				else if (samp < GF_SHORT_MIN) samp = GF_SHORT_MIN;
+
+#ifndef GPAC_BIG_ENDIAN
+				(*out_s16) = swap_16(samp);
+#else
+				(*out_s16) = samp;
+#endif
+				out_s16 += 1;
+				out_mix += 1;
+			}
+		}
 	} else if (am->afmt == GF_AUDIO_FMT_U8) {
 		u8 *out_u8 = (u8 *) buffer;
 		for (i=0; i<nb_written; i++) {
@@ -1318,3 +1471,4 @@
 }
 
 
+#endif // !defined(GPAC_DISABLE_COMPOSITOR) &&  !defined(GPAC_DISABLE_RESAMPLE)

gpac-2.2.1.tar.gz/src/compositor/audio_render.c -> gpac-2.4.0.tar.gz/src/compositor/audio_render.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2022
+ *			Copyright (c) Telecom ParisTech 2000-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / Scene Compositor sub-project
@@ -25,17 +25,20 @@
 
 #include <gpac/internal/compositor_dev.h>
 
+#ifndef GPAC_DISABLE_COMPOSITOR
+
 void gf_ar_rcfg_done(GF_Filter *filter, GF_FilterPid *pid, GF_FilterPacket *pck)
 {
 	u32 size;
 	GF_AudioRenderer *ar = (GF_AudioRenderer *) gf_filter_pck_get_data(pck, &size);
-	assert(!size);
-	assert(ar->wait_for_rcfg);
-	ar->wait_for_rcfg --;
+	gf_assert(!size);
+	if (ar->wait_for_rcfg)
+		ar->wait_for_rcfg --;
+
 	if (ar->wait_for_rcfg) {
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_AUDIO, ("Compositor Reconfigure negociation %d still pending\n", ar->wait_for_rcfg));
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_AUDIO, ("Compositor Reconfigure negotiation %d still pending\n", ar->wait_for_rcfg));
 	} else {
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_AUDIO, ("Compositor Reconfigure negociation done\n"));
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_AUDIO, ("Compositor Reconfigure negotiation done\n"));
 	}
 }
 
@@ -230,9 +233,9 @@
 	Bool recfg;
 	if (!ar) return;
 
-#ifndef GPAC_DISABLE_PLAYER
+#ifndef GPAC_DISABLE_COMPOSITOR
 	compositor_setup_aout(ar->compositor);
-#endif //GPAC_DISABLE_PLAYER
+#endif //GPAC_DISABLE_COMPOSITOR
 
 	/*lock mixer*/
 	gf_mixer_lock(ar->mixer, GF_TRUE);
@@ -284,8 +287,10 @@
 	/*data = */gf_filter_pck_get_data(pck, &size);
 	if (!size) return;
 	
-	assert(size <= compositor->audio_renderer->nb_bytes_out);
-	compositor->audio_renderer->nb_bytes_out -= size;
+	if (size <= compositor->audio_renderer->nb_bytes_out)
+		compositor->audio_renderer->nb_bytes_out -= size;
+	else//should never happen but we can live with it
+		compositor->audio_renderer->nb_bytes_out = 0;
 }
 
 void gf_ar_send_packets(GF_AudioRenderer *ar)
@@ -451,3 +456,4 @@
 
 
 
+#endif //GPAC_DISABLE_COMPOSITOR

gpac-2.2.1.tar.gz/src/compositor/bindable.c -> gpac-2.4.0.tar.gz/src/compositor/bindable.c Changed

gpac-2.2.1.tar.gz/src/compositor/camera.c -> gpac-2.4.0.tar.gz/src/compositor/camera.c Changed

gpac-2.2.1.tar.gz/src/compositor/clock.c -> gpac-2.4.0.tar.gz/src/compositor/clock.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2022
+ *			Copyright (c) Telecom ParisTech 2000-2023
  *					All rights reserved
  *
  *  This file scene part of GPAC / Scene Compositor sub-project
@@ -24,6 +24,7 @@
  */
 
 #include <gpac/internal/compositor_dev.h>
+#ifndef GPAC_DISABLE_COMPOSITOR
 
 static GF_Clock *gf_clock_new(GF_Compositor *compositor)
 {
@@ -176,11 +177,8 @@
 void gf_clock_resume(GF_Clock *ck)
 {
 	gf_mx_p(ck->mx);
-	assert(ck->nb_paused);
-	if (!ck->nb_paused) {
-		assert(!ck->nb_buffering);
-	}
-	ck->nb_paused -= 1;
+	if (ck->nb_paused)
+		ck->nb_paused -= 1;
 	//in player mode, increment the start time to reflect how long we have been buffering
 	//in non-player mode, since we don't care about real-time, don't update the clock start time
 	//this avoids cases where the first composed frame is dispatched while the object(s) are buffering
@@ -194,7 +192,7 @@
 u32 gf_clock_real_time(GF_Clock *ck)
 {
 	u32 time;
-	assert(ck);
+	if (!ck) return 0;
 	if (!ck->clock_init) return ck->start_time;
 	time = ck->nb_paused > 0 ? ck->pause_time : gf_sc_get_clock(ck->compositor);
 
@@ -275,7 +273,7 @@
 void gf_clock_buffer_off(GF_Clock *ck)
 {
 	gf_mx_p(ck->mx);
-	//assert(ck->nb_buffering);
+
 	if (ck->nb_buffering) {
 		ck->nb_buffering -= 1;
 		if (!ck->nb_buffering)
@@ -344,3 +342,4 @@
 
 	return (s32) ts_diff;
 }
+#endif //GPAC_DISABLE_COMPOSITOR

gpac-2.2.1.tar.gz/src/compositor/compositor.c -> gpac-2.4.0.tar.gz/src/compositor/compositor.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2022
+ *			Copyright (c) Telecom ParisTech 2000-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / Scene Compositor sub-project
@@ -28,6 +28,8 @@
 #include <gpac/modules/hardcoded_proto.h>
 #include <gpac/modules/compositor_ext.h>
 
+#ifndef GPAC_DISABLE_COMPOSITOR
+
 #include "nodes_stacks.h"
 
 #include "visual_manager.h"
@@ -160,7 +162,7 @@
 		}
 		/*scene size has been overridden*/
 		if (compositor->msg_type & GF_SR_CFG_OVERRIDE_SIZE) {
-			assert(!(compositor->override_size_flags & 2));
+			gf_assert(!(compositor->override_size_flags & 2));
 			compositor->msg_type &= ~GF_SR_CFG_OVERRIDE_SIZE;
 			compositor->override_size_flags |= 2;
 			width = compositor->scene_width;
@@ -239,9 +241,10 @@
 		}
 		compositor->msg_type &= ~GF_SR_IN_RECONFIG;
 	}
-	if (notif_size) {
+	if (notif_size && compositor->vout) {
 		gf_filter_pid_set_property(compositor->vout, GF_PROP_PID_WIDTH, &PROP_UINT(compositor->display_width));
 		gf_filter_pid_set_property(compositor->vout, GF_PROP_PID_HEIGHT, &PROP_UINT(compositor->display_height));
+		gf_filter_pid_set_property(compositor->vout, GF_PROP_PID_MIRROR, compositor->is_opengl ? &PROP_UINT(1) : NULL );
 	}
 
 	/*3D driver changed message, recheck extensions*/
@@ -285,7 +288,7 @@
 	if (plane_idx==0) {
 		e = GF_OK;
 		if (!compositor->fb.video_buffer)
-			e = gf_sc_get_screen_buffer(compositor, &compositor->fb, 0);
+			e = gf_sc_get_screen_buffer(compositor, &compositor->fb, GF_SC_GRAB_DEPTH_NONE);
 	}
 	*outPlane = compositor->fb.video_buffer;
 	*outStride = compositor->fb.pitch_y;
@@ -328,7 +331,8 @@
 	Bool ret = GF_FALSE;
 
 	gf_sc_ar_send_or_reconfig(compositor->audio_renderer);
-
+	if (!compositor->vout) return GF_FALSE;
+	
 	//frame still pending
 	if (compositor->frame_ifce.user_data)
 		return GF_TRUE;
@@ -666,6 +670,15 @@
 		return GF_IO_ERR;
 	}
 
+#ifdef GPAC_CONFIG_EMSCRIPTEN
+	if (compositor->player) {
+		void gpac_force_step_mode(Bool for_display);
+		gpac_force_step_mode(compositor->player ? GF_TRUE : GF_FALSE);
+	}
+#endif
+
+
+
 	sOpt = gf_opts_get_key("temp", "window-display");
 	if (sOpt) sscanf(sOpt, "%p", &os_disp);
 
@@ -696,6 +709,8 @@
 	} else if (compositor->needs_offscreen_gl && (compositor->ogl!=GF_SC_GLMODE_OFF) ) {
 		force_gl_out = GF_TRUE;
 	}
+	if (compositor->root_scene && (compositor->root_scene->is_tiled_srd || compositor->root_scene->vr_type))
+		force_gl_out = GF_TRUE;
 
 	if (force_gl_out) {
 		GF_Err e;
@@ -1243,7 +1258,7 @@
 	}
 #endif
 
-	assert(!compositor->visual->overlays);
+	gf_assert(!compositor->visual->overlays);
 
 	compositor->reset_graphics = 0;
 	compositor->trans_x = compositor->trans_y = 0;
@@ -1492,7 +1507,7 @@
 	compositor->new_width = NewWidth;
 	compositor->new_height = NewHeight;
 	compositor->msg_type |= GF_SR_CFG_SET_SIZE;
-	assert(compositor->new_width);
+	gf_assert(compositor->new_width);
 
 	/*if same size only request for video setup */
 	compositor->msg_type &= ~GF_SR_CFG_WINDOWSIZE_NOTIF;
@@ -1863,9 +1878,11 @@
 
 	case GF_OPT_HTTP_MAX_RATE:
 	{
+#ifndef GPAC_DISABLE_NETWORK
 		GF_DownloadManager *dm = gf_filter_get_download_manager(compositor->filter);
 		if (!dm) return GF_SERVICE_ERROR;
 		gf_dm_set_data_rate(dm, value);
+#endif
 		e = GF_OK;
 		break;
 	}
@@ -2035,7 +2052,7 @@
 
 
 GF_EXPORT
-GF_Err gf_sc_get_screen_buffer(GF_Compositor *compositor, GF_VideoSurface *framebuffer, u32 depth_dump_mode)
+GF_Err gf_sc_get_screen_buffer(GF_Compositor *compositor, GF_VideoSurface *framebuffer, GF_CompositorGrabMode depth_dump_mode)
 {
 	GF_Err e;
 	if (!compositor || !framebuffer) return GF_BAD_PARAM;
@@ -2048,6 +2065,7 @@
 #endif
 		/*no depth dump in 2D mode*/
 		if (depth_dump_mode) e = GF_NOT_SUPPORTED;
+		else if (!compositor->video_out->LockBackBuffer) e = GF_NOT_SUPPORTED;
 		else e = compositor->video_out->LockBackBuffer(compositor->video_out, framebuffer, 1);
 
 	if (e != GF_OK) gf_mx_v(compositor->mx);
@@ -2120,7 +2138,7 @@
 		diff -= compositor->frame_timefidx;
 		if (diff<0) {
 			diff += 0xFFFFFFFFUL;
-			assert(diff >= 0);
+			gf_assert(diff >= 0);
 		}
 		run_time = (u32) diff;
 		frames = GF_SR_FPS_COMPUTE_SIZE-1;
@@ -2253,6 +2271,8 @@
 			gf_filter_pid_set_property(compositor->vout, GF_PROP_PID_WIDTH, &PROP_UINT(compositor->output_width) );
 			gf_filter_pid_set_property(compositor->vout, GF_PROP_PID_HEIGHT, &PROP_UINT(compositor->output_height) );
 			gf_filter_pid_set_property(compositor->vout, GF_PROP_PID_FPS, &PROP_FRAC(compositor->fps) );
+
+			gf_filter_pid_set_property(compositor->vout, GF_PROP_PID_MIRROR, compositor->is_opengl ? &PROP_UINT(1) : NULL );
 		}
 	}
 }
@@ -2453,6 +2473,7 @@
 	}
 	compositor->zoom_changed = 0;
 	compositor->audio_renderer->scene_ready = GF_TRUE;
+	compositor->gaze_changed = GF_FALSE;
 	return GF_TRUE;
 }
 
@@ -3030,7 +3051,7 @@
 					if (compositor->video_out==&raw_vout) {
 						src = compositor->framebuffer;
 					} else {
-						if (gf_sc_get_screen_buffer(compositor, &compositor->fb, 0) == GF_OK) {
+						if (gf_sc_get_screen_buffer(compositor, &compositor->fb, GF_SC_GRAB_DEPTH_NONE) == GF_OK) {
 							src = compositor->fb.video_buffer;
 							release_fb = GF_TRUE;
 						}
@@ -3100,7 +3121,7 @@
 						next_frame = pck_frame_ts + gf_filter_pck_get_duration(pck);
 						next_frame *= 1000;
 						next_frame /= compositor->passthrough_timescale;
-						assert(next_frame>=compositor->scene_sampled_clock);
+						gf_assert(next_frame>=compositor->scene_sampled_clock);
 						compositor->scene_sampled_clock = (u32) next_frame;
 					}
 					// if buffering, remember to update clock at next frame
@@ -3197,7 +3218,7 @@
 				res *= compositor->fps.den;
 				res *= 1000;
 				res /= compositor->fps.num;
-				assert(res >= compositor->scene_sampled_clock);
+				gf_assert(res >= compositor->scene_sampled_clock);
 				compositor->scene_sampled_clock = (u32) res;
 			}
 
@@ -4205,12 +4226,6 @@
 	gf_sc_lock(compositor, GF_FALSE);
 }
 
-GF_EXPORT
-GF_DownloadManager *gf_sc_get_downloader(GF_Compositor *compositor)
-{
-	return gf_filter_get_download_manager(compositor->filter);
-}
-
 void gf_sc_sys_frame_pending(GF_Compositor *compositor, u32 cts, u32 obj_time, GF_Filter *from_filter)
 {
 	if (!compositor->player) {
@@ -4261,7 +4276,7 @@
 Bool gf_sc_check_sys_frame(GF_Scene *scene, GF_ObjectManager *odm, GF_FilterPid *for_pid, GF_Filter *from_filter, u64 cts_in_ms, u32 dur_in_ms)
 {
 	Bool is_early=GF_FALSE;
-	assert(odm);
+	gf_assert(odm);
 
 	if (for_pid)
 		gf_odm_check_buffering(odm, for_pid);
@@ -4273,6 +4288,18 @@
 		is_early = GF_TRUE;
 
 	if (is_early) {
+		//little opt: if single resource, more than 10s in future and we dump in VFR, non player mode
+		//jump to the target time
+		if (scene->compositor->vfr
+			&& !scene->compositor->player
+			&& (gf_list_count(scene->resources)==1)
+			&& (cts_in_ms > obj_time + 10000)
+		) {
+			gf_clock_reset(odm->ck);
+			gf_clock_set_time(odm->ck, cts_in_ms, 1000);
+			return GF_TRUE;
+		}
+
 		gf_sc_sys_frame_pending(scene->compositor, (u32)cts_in_ms, obj_time, from_filter);
 		return GF_FALSE;
 	}
@@ -4444,11 +4471,15 @@
 	case GF_OPT_CAN_SELECT_STREAMS:
 		return (compositor->root_scene && compositor->root_scene->is_dynamic_scene) ? 1 : 0;
 	case GF_OPT_HTTP_MAX_RATE:
+#ifndef GPAC_DISABLE_NETWORK
 	{
 		GF_DownloadManager *dm = gf_filter_get_download_manager(compositor->filter);
 		if (!dm) return 0;
 		return gf_dm_get_data_rate(dm);
 	}
+#else
+		return 0;
+#endif
 	case GF_OPT_VIDEO_BENCH:
 		return compositor->bench_mode ? GF_TRUE : GF_FALSE;
 	case GF_OPT_ORIENTATION_SENSORS_ACTIVE:
@@ -4675,7 +4706,7 @@
 	}
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPTIME, ("Compositor Connecting to %s\n", URL));
 
-	assert(!compositor->root_scene);
+	gf_assert(!compositor->root_scene);
 
 	/*create a new scene*/
 	scene = gf_scene_new(compositor, NULL);
@@ -5043,9 +5074,7 @@
 void gf_sc_select_service(GF_Compositor *compositor, u32 service_id)
 {
 	if (!compositor || !compositor->root_scene) return;
-#ifndef GPAC_DISABLE_VRML
 	gf_scene_set_service_id(compositor->root_scene, service_id);
-#endif
 }
 
 
@@ -5181,3 +5210,5 @@
 	if (mo && mo->odm) return mo->odm->ServiceID;
 	return 0;
 }
+
+#endif // GPAC_DISABLE_COMPOSITOR

gpac-2.2.1.tar.gz/src/compositor/compositor_2d.c -> gpac-2.4.0.tar.gz/src/compositor/compositor_2d.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2022
+ *			Copyright (c) Telecom ParisTech 2000-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / Scene Compositor sub-project
@@ -26,6 +26,8 @@
 
 
 #include "visual_manager.h"
+#ifndef GPAC_DISABLE_COMPOSITOR
+
 #include "nodes_stacks.h"
 #include "texturing.h"
 
@@ -302,7 +304,7 @@
 {
 	GF_Err e;
 	GF_Compositor *compositor = visual->compositor;
-
+	if (!compositor->video_out->LockBackBuffer) return GF_NOT_SUPPORTED;
 	compositor->hw_locked = GF_FALSE;
 
 	e = compositor->video_out->LockBackBuffer(compositor->video_out, &compositor->hw_surface, GF_TRUE);
@@ -843,11 +845,14 @@
 			txh->flags |= GF_SR_TEXTURE_DISABLE_BLIT;
 			return GF_FALSE;
 		}
+		if (!visual->compositor->video_out->LockBackBuffer)
+			e = GF_NOT_SUPPORTED;
+		else
+			e = visual->compositor->video_out->LockBackBuffer(visual->compositor->video_out, &backbuffer, GF_TRUE);
 
-		e = visual->compositor->video_out->LockBackBuffer(visual->compositor->video_out, &backbuffer, GF_TRUE);
 		if (!e) {
 			u32 push_time = gf_sys_clock();
-#ifndef GPAC_DISABLE_PLAYER
+#ifndef GPAC_DISABLE_COMPOSITOR
 			e = gf_stretch_bits(&backbuffer, &video_src, &dst_wnd, &src_wnd, alpha, GF_FALSE, tr_state->col_key, ctx->col_mat);
 #else
 			e = GF_NOT_SUPPORTED;
@@ -1459,3 +1464,5 @@
 {
 	compositor->visual->DrawBitmap = compositor_2d_draw_bitmap;
 }
+
+#endif //GPAC_DISABLE_COMPOSITOR

gpac-2.2.1.tar.gz/src/compositor/compositor_3d.c -> gpac-2.4.0.tar.gz/src/compositor/compositor_3d.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2022
+ *			Copyright (c) Telecom ParisTech 2000-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / Scene Compositor sub-project
@@ -29,7 +29,7 @@
 #include "texturing.h"
 #include "nodes_stacks.h"
 
-#ifndef GPAC_DISABLE_3D
+#if !defined(GPAC_DISABLE_3D) && !defined(GPAC_DISABLE_COMPOSITOR)
 
 #ifdef GPAC_USE_TINYGL
 #include <GL/oscontext.h>
@@ -228,7 +228,20 @@
 
 				stack->mesh = new_mesh();
 				if (txh->stream) {
-					mesh_new_rectangle_ex(stack->mesh, size, NULL, txh->stream->flip, txh->stream->rotate);
+					const GF_PropertyValue *srd = NULL;
+					const GF_PropertyValue *srd_ref = NULL;
+					if (txh->stream->odm && txh->stream->odm->pid) {
+						srd = gf_filter_pid_get_property(txh->stream->odm->pid, GF_PROP_PID_SRD_MAP);
+						srd_ref = gf_filter_pid_get_property(txh->stream->odm->pid, GF_PROP_PID_SRD_REF);
+					}
+
+					if (srd && srd_ref) {
+void mesh_new_planar_srd(GF_Mesh *mesh, SFVec2f size, u32 flip, u32 rotate, const GF_PropertyValue *srd_map, const GF_PropertyValue *srd_ref);
+						mesh_new_planar_srd(stack->mesh, size, txh->stream->flip, txh->stream->rotate, srd, srd_ref);
+
+					} else {
+						mesh_new_rectangle_ex(stack->mesh, size, NULL, txh->stream->flip, txh->stream->rotate);
+					}
 				} else {
 					mesh_new_rectangle(stack->mesh, size, NULL, GF_FALSE);
 				}
@@ -267,5 +280,5 @@
 	}
 }
 
-#endif
 
+#endif //!defined(GPAC_DISABLE_3D) && !defined(GPAC_DISABLE_COMPOSITOR)

gpac-2.2.1.tar.gz/src/compositor/compositor_node_init.c -> gpac-2.4.0.tar.gz/src/compositor/compositor_node_init.c Changed

gpac-2.2.1.tar.gz/src/compositor/drawable.c -> gpac-2.4.0.tar.gz/src/compositor/drawable.c Changed

gpac-2.2.1.tar.gz/src/compositor/drawable.h -> gpac-2.4.0.tar.gz/src/compositor/drawable.h Changed

gpac-2.2.1.tar.gz/src/compositor/events.c -> gpac-2.4.0.tar.gz/src/compositor/events.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2022
+ *			Copyright (c) Telecom ParisTech 2000-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / Scene Compositor sub-project
@@ -28,6 +28,8 @@
 #include "mpeg4_grouping.h"
 #include <gpac/utf.h>
 
+#ifndef GPAC_DISABLE_COMPOSITOR
+
 static GF_Node *browse_parent_for_focus(GF_Compositor *compositor, GF_Node *elt, Bool prev_focus);
 
 static void gf_sc_reset_collide_cursor(GF_Compositor *compositor)
@@ -893,7 +895,7 @@
 	}
 
 	count = gf_list_count(compositor->sensors);
-	/*if we have a hit node at the compositor level, use "touch" as default cursor - this avoid
+	/*if we have a hit node at the compositor level, use "touch" as default cursor - this avoids
 	resetting the cursor when the picked node is a DOM node in a composite texture*/
 //	stype = (compositor->hit_node!=NULL) ? GF_CURSOR_TOUCH : GF_CURSOR_NORMAL;
 	stype = GF_CURSOR_NORMAL;
@@ -1991,8 +1993,11 @@
 	Bool ret = GF_FALSE;
 	if (evt->type <= GF_EVENT_LAST_MOUSE) {
 		if (compositor->sgaze) {
-			compositor->gaze_x = evt->mouse.x;
-			compositor->gaze_y = evt->mouse.y;
+			if ((compositor->gaze_x != evt->mouse.x) || (compositor->gaze_y != evt->mouse.y)) {
+				compositor->gaze_changed = GF_TRUE;
+				compositor->gaze_x = evt->mouse.x;
+				compositor->gaze_y = evt->mouse.y;
+			}
 		}
 #ifndef GPAC_DISABLE_3D
 		else if ((compositor->visual->autostereo_type==GF_3D_STEREO_SIDE) || (compositor->visual->autostereo_type==GF_3D_STEREO_HEADSET)) {
@@ -2088,4 +2093,4 @@
 }
 
 
-
+#endif //GPAC_DISABLE_COMPOSITOR

gpac-2.2.1.tar.gz/src/compositor/font_engine.c -> gpac-2.4.0.tar.gz/src/compositor/font_engine.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2022
+ *			Copyright (c) Telecom ParisTech 2000-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / Scene Rendering sub-project
@@ -24,11 +24,15 @@
  */
 
 #include <gpac/internal/compositor_dev.h>
+
+#ifndef GPAC_DISABLE_FONTS
+
 #include <gpac/modules/font.h>
 #include "visual_manager.h"
 #include "nodes_stacks.h"
 #include "texturing.h"
 
+
 struct _gf_ft_mgr
 {
 	GF_FontReader *reader;
@@ -84,7 +88,7 @@
 		while (gf_list_count(font->spans)) {
 			GF_TextSpan *ts = gf_list_get(font->spans, 0);
 			gf_list_rem(font->spans, 0);
-#ifndef GPAC_DISABLE_PLAYER
+#ifndef GPAC_DISABLE_COMPOSITOR
 			gf_node_dirty_set(ts->user, 0, 0);
 #endif
 			ts->user=NULL;
@@ -437,7 +441,7 @@
 }
 
 
-#ifndef GPAC_DISABLE_PLAYER
+#ifndef GPAC_DISABLE_COMPOSITOR
 
 typedef struct _span_internal
 {
@@ -470,7 +474,7 @@
 	if (span->dy) gf_free(span->dy);
 	if (span->rot) gf_free(span->rot);
 
-#ifndef GPAC_DISABLE_PLAYER
+#ifndef GPAC_DISABLE_COMPOSITOR
 	if (span->ext) {
 		if (span->ext->path) gf_path_del(span->ext->path);
 #ifndef GPAC_DISABLE_3D
@@ -622,7 +626,7 @@
 	return path;
 }
 
-#ifndef GPAC_DISABLE_PLAYER
+#ifndef GPAC_DISABLE_COMPOSITOR
 
 static void span_alloc_extensions(GF_TextSpan *span)
 {
@@ -1505,4 +1509,54 @@
 	}
 }
 
-#endif // GPAC_DISABLE_PLAYER
+#endif // GPAC_DISABLE_COMPOSITOR
+
+#else
+GF_TextSpan *gf_font_manager_create_span(GF_FontManager *fm, GF_Font *font, char *text, Fixed font_size, Bool needs_x_offset, Bool needs_y_offset, Bool needs_rotate, const char *xml_lang, Bool fliped_text, u32 styles, GF_Node *user)
+{
+	return NULL;
+}
+void gf_font_manager_delete_span(GF_FontManager *fm, GF_TextSpan *span)
+{
+}
+void gf_font_manager_refresh_span_bounds(GF_TextSpan *span)
+{
+}
+GF_Err gf_font_manager_register_font(GF_FontManager *fm, GF_Font *font)
+{
+	return GF_NOT_SUPPORTED;
+}
+GF_Err gf_font_manager_unregister_font(GF_FontManager *fm, GF_Font *font)
+{
+	return GF_NOT_SUPPORTED;
+}
+GF_Font *gf_font_manager_set_font(GF_FontManager *fm, char **alt_fonts, u32 nb_fonts, u32 styles)
+{
+	return NULL;
+}
+GF_Font *gf_font_manager_set_font_ex(GF_FontManager *fm, char **alt_fonts, u32 nb_fonts, u32 styles, Bool check_only)
+{
+	return NULL;
+}
+GF_Path *gf_font_span_create_path(GF_TextSpan *span)
+{
+	return NULL;
+}
+#ifndef GPAC_DISABLE_COMPOSITOR
+#include "visual_manager.h"
+
+void gf_font_spans_draw_2d(GF_List *spans, GF_TraverseState *tr_state, u32 hl_color, Bool force_texture_text, GF_Rect *bounds)
+{
+}
+void gf_font_spans_draw_3d(GF_List *spans, GF_TraverseState *tr_state, DrawAspect2D *asp, u32 text_hl, Bool force_texturing)
+{
+}
+void gf_font_spans_get_selection(GF_Node *node, GF_List *spans, GF_TraverseState *tr_state)
+{
+}
+void gf_font_spans_pick(GF_Node *node, GF_List *spans, GF_TraverseState *tr_state, GF_Rect *node_bounds, Bool use_dom_events, Drawable *drawable)
+{
+}
+#endif
+
+#endif // GPAC_DISABLE_FONTS

gpac-2.2.1.tar.gz/src/compositor/hardcoded_protos.c -> gpac-2.4.0.tar.gz/src/compositor/hardcoded_protos.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2022
+ *			Copyright (c) Telecom ParisTech 2000-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / Scene Compositor sub-project
@@ -26,6 +26,8 @@
 #include "nodes_stacks.h"
 #include "visual_manager.h"
 
+#ifndef GPAC_DISABLE_COMPOSITOR
+
 #include "offscreen_cache.h"
 #include "mpeg4_grouping.h"
 
@@ -1403,7 +1405,7 @@
 				stack->mesh->flags &= ~MESH_WAS_VISIBLE;
 			}
 
-			if (visible && (vrinfo.srd_w != vrinfo.srd_max_x) && tr_state->visual->compositor->gazer_enabled) {
+			if (visible && (vrinfo.srd_w != vrinfo.srd_max_x) && tr_state->visual->compositor->gaze_changed) {
 				s32 gx, gy;
 				tr_state->visual->compositor->hit_node = NULL;
 				tr_state->visual->compositor->hit_square_dist = 0;
@@ -1428,10 +1430,11 @@
 				if (visible) {
 					if (!txh->is_open) {
 						GF_LOG(GF_LOG_INFO, GF_LOG_COMPOSE, ("Compositor Texture %s stopped on visible partial sphere - starting it\n", pid_name));
-						assert(txh->stream && txh->stream->odm);
-						txh->stream->odm->disable_buffer_at_next_play = GF_TRUE;
-						txh->stream->odm->flags |= GF_ODM_TILED_SHARED_CLOCK;
-						gf_sc_texture_play_from_to(txh, NULL, -1, -1, 1, 0);
+						if (txh->stream->odm) {
+							txh->stream->odm->disable_buffer_at_next_play = GF_TRUE;
+							txh->stream->odm->flags |= GF_ODM_TILED_SHARED_CLOCK;
+							gf_sc_texture_play_from_to(txh, NULL, -1, -1, 1, 0);
+						}
 					}
 
 					if (txh->data) {
@@ -1661,6 +1664,135 @@
 	}
 }
 
+void get_tx_coords_from_angle(GF_TraverseState *tr_state, GF_TextureHandler *txh, Bool horizontal, u32 *min_coord, u32 *max_coord);
+
+static void TraverseSRDSphere(GF_Node *node, void *rs, Bool is_destroy)
+{
+	GF_TextureHandler *txh;
+	GF_MediaObjectVRInfo vrinfo;
+	GF_TraverseState *tr_state = (GF_TraverseState *)rs;
+	Drawable3D *stack = (Drawable3D *)gf_node_get_private(node);
+
+	if (is_destroy) {
+		drawable_3d_del(node);
+		return;
+	}
+
+	if (!tr_state->appear || ! ((M_Appearance *)tr_state->appear)->texture)
+		return;
+
+	txh = gf_sc_texture_get_handler( ((M_Appearance *) tr_state->appear)->texture );
+	if (!txh->stream) return;
+
+	if (gf_node_dirty_get(node) || txh->stream->srd_map_changed || (tr_state->traversing_mode==TRAVERSE_DRAW_3D)) {
+		if (! gf_mo_get_srd_info(txh->stream, &vrinfo))
+			return;
+
+		if (gf_node_dirty_get(node) || txh->stream->srd_map_changed) {
+			u32 radius;
+			mesh_reset(stack->mesh);
+
+			radius = MAX(vrinfo.scene_width, vrinfo.scene_height) / 4;
+			//may happen that we don't have a scene width/height, use hardcoded 100 units radius (size actually doesn't matter
+			//since our VP/camera is at the center of the sphere
+			if (!radius) radius = 100;
+
+			const GF_PropertyValue *srd = NULL;
+			const GF_PropertyValue *srd_ref = NULL;
+			if (txh->stream->odm && txh->stream->odm->pid) {
+				srd = gf_filter_pid_get_property(txh->stream->odm->pid, GF_PROP_PID_SRD_MAP);
+				srd_ref = gf_filter_pid_get_property(txh->stream->odm->pid, GF_PROP_PID_SRD_REF);
+			}
+			if (srd && srd_ref) {
+void mesh_new_spherical_srd(GF_Mesh *mesh, Fixed radius, const GF_PropertyValue *srd_map, const GF_PropertyValue *srd_ref);
+				mesh_new_spherical_srd(stack->mesh, -1 * INT2FIX(radius), srd, srd_ref);
+			} else {
+				mesh_new_sphere(stack->mesh, -1 * INT2FIX(radius), GF_FALSE, NULL);
+			}
+			txh->flags &= ~GF_SR_TEXTURE_REPEAT_S;
+			txh->flags &= ~GF_SR_TEXTURE_REPEAT_T;
+			gf_node_dirty_clear(node, GF_SG_NODE_DIRTY);
+			txh->stream->srd_map_changed = GF_FALSE;
+		}
+
+		if (tr_state->traversing_mode==TRAVERSE_DRAW_3D) {
+#ifndef GPAC_DISABLE_LOG
+			const char *pid_name = gf_filter_pid_get_name(txh->stream->odm->pid);
+#endif
+			stack->mesh->flags |= MESH_WAS_VISIBLE;
+
+			visual_3d_enable_depth_buffer(tr_state->visual, GF_FALSE);
+			visual_3d_enable_antialias(tr_state->visual, GF_FALSE);
+			visual_3d_draw(tr_state, stack->mesh);
+			visual_3d_enable_depth_buffer(tr_state->visual, GF_TRUE);
+
+			if (!tr_state->visual->compositor->gazer_enabled) {
+				u32 min_x, max_x, min_y, max_y;
+
+				get_tx_coords_from_angle(tr_state, txh, GF_TRUE, &min_x, &max_x);
+				get_tx_coords_from_angle(tr_state, txh, GF_FALSE, &min_y, &max_y);
+				if (min_x!=max_x) {
+					gf_mo_hint_visible_rect(txh->stream, min_x, max_x, min_y, max_y);
+				}
+			}
+			else if (tr_state->visual->compositor->gaze_changed) {
+				s32 gx, gy;
+				tr_state->visual->compositor->hit_node = NULL;
+				tr_state->visual->compositor->hit_square_dist = 0;
+
+				//gaze coords are 0,0 in top-left
+				gx = (s32)( tr_state->visual->compositor->gaze_x - tr_state->camera->width/2 );
+				gy = (s32)( tr_state->camera->height/2 - tr_state->visual->compositor->gaze_y );
+
+				visual_3d_setup_ray(tr_state->visual, tr_state, gx, gy);
+				visual_3d_vrml_drawable_pick(node, tr_state, stack->mesh, NULL);
+				if (tr_state->visual->compositor->hit_node) {
+					const GF_PropertyValue *srd = NULL;
+					const GF_PropertyValue *srd_ref = NULL;
+					if (txh->stream->odm && txh->stream->odm->pid) {
+						srd = gf_filter_pid_get_property(txh->stream->odm->pid, GF_PROP_PID_SRD_MAP);
+						srd_ref = gf_filter_pid_get_property(txh->stream->odm->pid, GF_PROP_PID_SRD_REF);
+					}
+					if (srd && srd_ref) {
+						s32 orig_x = FIX2INT( tr_state->visual->compositor->hit_texcoords.x * srd_ref->value.vec2i.x );
+						s32 orig_y = FIX2INT( (FIX_ONE - tr_state->visual->compositor->hit_texcoords.y) * srd_ref->value.vec2i.y);
+
+						u32 i, nb_items = srd->value.uint_list.nb_items / 8;
+						u32 *vals = srd->value.uint_list.vals;
+						for (i=0; i<nb_items; i++) {
+							if ((u32) orig_x < vals8*i+4) continue;
+							if ((u32) orig_x > vals8*i+4 + vals8*i+6) continue;
+
+							if ((u32) orig_y < vals8*i+5) continue;
+							if ((u32) orig_y > vals8*i+5 + vals8*i+7) continue;
+
+							orig_x -= vals8*i+4; //remove tx orig
+							orig_y -= vals8*i+5; //remove ty orig
+
+							s32 srd_x = vals8*i + orig_x * vals8*i+2 / vals8*i+6;
+							s32 srd_y = vals8*i+1 + orig_y * vals8*i+3 / vals8*i+7;
+
+							gf_mo_hint_gaze(txh->stream, (u32)srd_x, (u32)srd_y);
+							break;
+						}
+					}
+					GF_LOG(GF_LOG_INFO, GF_LOG_COMPOSE, ("Compositor Texture %s Partial sphere is under gaze coord %d %d\n", pid_name, tr_state->visual->compositor->gaze_x, tr_state->visual->compositor->gaze_y));
+
+					tr_state->visual->compositor->hit_node = NULL;
+				}
+			}
+		}
+	}
+
+	if (tr_state->traversing_mode==TRAVERSE_GET_BOUNDS) {
+		tr_state->bbox = stack->mesh->bounds;
+	}
+}
+static void compositor_init_srd_sphere(GF_Compositor *compositor, GF_Node *node)
+{
+	drawable_3d_new(node);
+	gf_node_set_callback_function(node, TraverseSRDSphere);
+}
 
 #endif //GPAC_DISABLE_3D
 
@@ -1701,6 +1833,10 @@
             compositor_init_vrhud(compositor, node);
             return;
         }
+        if (!strcmp(url, "urn:inet:gpac:builtin:SRDSphere")) {
+            compositor_init_srd_sphere(compositor, node);
+            return;
+        }
 #endif
 		if (!strcmp(url, "urn:inet:gpac:builtin:OffscreenGroup")) {
 			compositor_init_offscreen_group(compositor, node);
@@ -1792,3 +1928,5 @@
 }
 
 #endif /*GPAC_DISABLE_VRML*/
+
+#endif // GPAC_DISABLE_COMPOSITOR

gpac-2.2.1.tar.gz/src/compositor/hc_flash_shape.c -> gpac-2.4.0.tar.gz/src/compositor/hc_flash_shape.c Changed

gpac-2.2.1.tar.gz/src/compositor/media_object.c -> gpac-2.4.0.tar.gz/src/compositor/media_object.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2022
+ *			Copyright (c) Telecom ParisTech 2000-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / Scene Compositor sub-project
@@ -29,6 +29,7 @@
 #include <gpac/nodes_svg.h>
 #include <gpac/network.h>
 
+#ifndef GPAC_DISABLE_COMPOSITOR
 
 #ifndef GPAC_DISABLE_SVG
 static GF_MediaObject *get_sync_reference(GF_Scene *scene, XMLRI *iri, u32 o_type, GF_Node *orig_ref, Bool *post_pone)
@@ -207,8 +208,31 @@
 	return mo;
 }
 
+void compositor_get_srdmap_size(const GF_PropertyValue *srd_map, u32 *width, u32 *height, u32 *min_x, u32 *min_y)
+{
+	u32 i, nb_items = srd_map->value.uint_list.nb_items / 8;
+	u32 min_x_plus_one=0, min_y_plus_one=0;
+	u32 max_x=0, max_y=0;
+	u32 *vals = srd_map->value.uint_list.vals;
+	for (i=0; i<nb_items; i++) {
+		if (!min_x_plus_one || (min_x_plus_one-1 > vals8*i))
+			min_x_plus_one = vals8*i + 1;
+		if (!min_y_plus_one || (min_y_plus_one-1 > vals8*i+1))
+			min_y_plus_one = vals8*i+1 + 1;
+		if (max_x < vals8*i + vals8*i+2)
+			max_x = vals8*i + vals8*i+2;
+
+		if (max_y < vals8*i+1 + vals8*i+3)
+			max_y = vals8*i+1 + vals8*i+3;
+	}
+	*width = max_x - (min_x_plus_one-1);
+	*height = max_y - (min_y_plus_one-1);
+	if (min_x) *min_x = min_x_plus_one-1;
+	if (min_y) *min_y = min_y_plus_one-1;
+}
+
 GF_EXPORT
-Bool gf_mo_get_visual_info(GF_MediaObject *mo, u32 *width, u32 *height, u32 *stride, u32 *pixel_ar, u32 *pixelFormat, Bool *is_flipped)
+Bool gf_mo_get_visual_info_ex(GF_MediaObject *mo, u32 *width, u32 *height, u32 *stride, u32 *pixel_ar, u32 *pixelFormat, Bool *is_flipped, Bool for_texture)
 {
 	if ((mo->type != GF_MEDIA_OBJECT_VIDEO) && (mo->type!=GF_MEDIA_OBJECT_TEXT)) return GF_FALSE;
 
@@ -221,9 +245,19 @@
 	if (pixel_ar) *pixel_ar = mo->pixel_ar;
 	if (pixelFormat) *pixelFormat = mo->pixelformat;
 	if (is_flipped) *is_flipped = mo->is_flipped;
+	if (for_texture) return GF_TRUE;
+	if (!width || !height) return GF_FALSE;
+	if (!mo->odm || !mo->odm->pid) return GF_TRUE;
+	const GF_PropertyValue *srd_map = gf_filter_pid_get_property(mo->odm->pid, GF_PROP_PID_SRD_MAP);
+	if (!srd_map) return GF_TRUE;
+	compositor_get_srdmap_size(srd_map, width, height, NULL, NULL);
 	return GF_TRUE;
 }
+Bool gf_mo_get_visual_info(GF_MediaObject *mo, u32 *width, u32 *height, u32 *stride, u32 *pixel_ar, u32 *pixelFormat, Bool *is_flipped)
+{
+	return gf_mo_get_visual_info_ex(mo, width, height, stride, pixel_ar, pixelFormat, is_flipped, GF_TRUE);
 
+}
 GF_EXPORT
 void gf_mo_get_nb_views(GF_MediaObject *mo, u32 *nb_views)
 {
@@ -397,6 +431,8 @@
 				mo->srd_full_h = v2->value.vec2i.y;
 			}
 		}
+		v = gf_filter_pid_get_property(mo->odm->pid, GF_PROP_PID_SRD_MAP);
+		if (v) compositor_get_srdmap_size(v, &mo->srd_full_w, &mo->srd_full_h, &mo->srd_map_ox, &mo->srd_map_oy);
 
 		v = gf_filter_pid_get_property(mo->odm->pid, GF_PROP_PID_NUM_VIEWS);
 		mo->nb_views = v ? v->value.uint : 0;
@@ -444,7 +480,7 @@
 		evt.type = GF_EVENT_QUALITY_SWITCHED;
 		gf_sc_send_event(scene->compositor, &evt);
 	} else if (check_unchanged) {
-		//reset config changed if nothing changed, this avoid resetting up texture or mixer input
+		//reset config changed if nothing changed, this avoids resetting up texture or mixer input
 		mo->config_changed = GF_FALSE;
 	}
 }
@@ -619,7 +655,8 @@
 		}
 		is_first = GF_TRUE;
 	}
-	assert(mo->pck);
+	if (!mo->pck) return NULL;
+
 	mo->first_frame_fetched = GF_TRUE;
 	*eos = mo->is_eos = GF_FALSE;
 
@@ -720,7 +757,7 @@
 		//if no buffer playout we are in low latency configuration, don"t skip resync
 		&& mo->odm->buffer_playout_ms
 	) {
-		assert(mo->odm->parentscene);
+		gf_assert(mo->odm->parentscene);
 		if (! mo->odm->parentscene->compositor->drop) {
 			if (mo->odm->parentscene->compositor->force_late_frame_draw) {
 				mo->flags |= GF_MO_IN_RESYNC;
@@ -795,7 +832,7 @@
 			gf_filter_pck_unref(mo->pck);
 			mo->pck = gf_filter_pid_get_packet(mo->odm->pid);
 			gf_odm_check_clock_mediatime(mo->odm);
-			assert(mo->pck);
+			gf_fatal_assert(mo->pck);
 			gf_filter_pck_ref( &mo->pck);
 			check_temi(mo);
 
@@ -988,7 +1025,7 @@
 	if (nb_bytes==0xFFFFFFFF) {
 		mo->RenderedLength = mo->size;
 	} else {
-		assert(mo->RenderedLength + nb_bytes <= mo->size);
+		gf_assert(mo->RenderedLength + nb_bytes <= mo->size);
 		mo->RenderedLength += nb_bytes;
 	}
 
@@ -1074,7 +1111,7 @@
 			}
 		}
 		/*done prefetching*/
-		assert(! (mo->odm->flags & GF_ODM_PREFETCH) );
+		gf_assert(! (mo->odm->flags & GF_ODM_PREFETCH) );
 
 		gf_odm_start(mo->odm);
 	} else if (mo->odm) {
@@ -1652,7 +1689,7 @@
 
 void gf_mo_del(GF_MediaObject *mo)
 {
-	assert(gf_list_count(mo->evt_targets) == 0);
+	gf_assert(gf_list_count(mo->evt_targets) == 0);
 	gf_list_del(mo->evt_targets);
 	if (mo->pck) gf_filter_pck_unref(mo->pck);
 	gf_sg_mfurl_del(mo->URLs);
@@ -1747,3 +1784,4 @@
 
 
 
+#endif //GPAC_DISABLE_COMPOSITOR

gpac-2.2.1.tar.gz/src/compositor/mesh.c -> gpac-2.4.0.tar.gz/src/compositor/mesh.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2012
+ *			Copyright (c) Telecom ParisTech 2000-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / Scene Compositor sub-project
@@ -29,8 +29,9 @@
 #include <gpac/nodes_x3d.h>
 #include <gpac/color.h>
 
-#ifndef GPAC_DISABLE_3D
+#if !defined(GPAC_DISABLE_3D) && !defined(GPAC_DISABLE_EVG)
 
+void compositor_get_srdmap_size(const GF_PropertyValue *srd_map, u32 *width, u32 *height, u32 *min_x, u32 *min_y);
 
 /*for GPAC_HAS_GLU and glDeleteBuffersARB */
 #include "gl_inc.h"
@@ -708,6 +709,117 @@
 	if (radius != FIX_ONE) gf_mesh_build_aabbtree(mesh);
 }
 
+void mesh_new_spherical_srd(GF_Mesh *mesh, Fixed radius, const GF_PropertyValue *srd_map, const GF_PropertyValue *srd_ref)
+{
+	u32 i, nb_items = srd_map->value.uint_list.nb_items / 8;
+	u32 *vals = srd_map->value.uint_list.vals;
+	u32 width, height;
+
+	mesh_reset(mesh);
+	if (!nb_items) return;
+	compositor_get_srdmap_size(srd_map, &width, &height, NULL, NULL);
+
+	u32 num_steps = 8;
+	if (radius<0) radius = -radius;
+
+	u32 nb_vx=0;
+	for (i=0; i<nb_items; i++) {
+		//get rect coords
+		Fixed s_x = INT2FIX(vals8*i);
+		Fixed s_y = INT2FIX(vals8*i+1);
+		Fixed s_w = INT2FIX(vals8*i+2);
+		Fixed s_h = INT2FIX(vals8*i+3);
+		//normalize
+		s_x = gf_divfix(s_x, width);
+		s_y = gf_divfix(s_y, height);
+		s_w = gf_divfix(s_w, width);
+		s_h = gf_divfix(s_h, height);
+
+		//get texture coords
+		Fixed tx_tl = INT2FIX(vals8*i+4);
+		Fixed ty_tl = INT2FIX(vals8*i+5);
+		Fixed tx_br = INT2FIX(vals8*i+4 + vals8*i+6);
+		Fixed ty_br = INT2FIX(vals8*i+5 + vals8*i+7);
+		tx_tl /= srd_ref->value.vec2i.x;
+		tx_br /= srd_ref->value.vec2i.x;
+		ty_tl /= srd_ref->value.vec2i.y;
+		ty_br /= srd_ref->value.vec2i.y;
+		ty_tl = FIX_ONE - ty_tl;
+		ty_br = FIX_ONE - ty_br;
+
+		//build sphere x=0 is top , y=0 is left
+		Fixed angle_top = GF_PI2 - GF_PI * s_y;
+		Fixed angle_bottom = GF_PI2 - GF_PI * (s_y+s_h);
+
+		Fixed angle_left = GF_2PI * s_x + GF_PI2;
+		Fixed angle_right = GF_2PI * (s_x+s_w) + GF_PI2;
+
+		u32 idx_h, idx_v;
+		for (idx_v=0; idx_v<num_steps-1; idx_v++) {
+			Fixed h1_angle, h2_angle;
+			Fixed ty_top, ty_bottom;
+			h1_angle = angle_top + idx_v * (angle_bottom-angle_top) / (num_steps-1);
+
+			ty_top = ty_tl + idx_v * (ty_br-ty_tl) / (num_steps-1);
+			if (idx_v+1<num_steps-1) {
+				h2_angle = angle_top + (idx_v+1) * (angle_bottom-angle_top) / (num_steps-1);
+				ty_bottom = ty_tl + (idx_v+1) * (ty_br-ty_tl) / (num_steps-1);
+			}
+			//avoid potential rounding for last step
+			else {
+				h2_angle = angle_bottom;
+				ty_bottom = ty_br;
+			}
+
+			Fixed y_top = gf_sin(h1_angle);
+			Fixed y_bottom = gf_sin(h2_angle);
+			Fixed r_top = gf_sqrt(FIX_ONE - gf_mulfix(y_top, y_top));
+			Fixed r_bottom = gf_sqrt(FIX_ONE - gf_mulfix(y_bottom, y_bottom));
+
+			r_top = gf_mulfix(r_top, radius);
+			r_bottom = gf_mulfix(r_bottom, radius);
+			y_top = gf_mulfix(y_top, radius);
+			y_bottom = gf_mulfix(y_bottom, radius);
+
+			for (idx_h=0; idx_h<num_steps-1; idx_h++) {
+				Fixed v1_angle, v2_angle;
+				Fixed tx_left, tx_right;
+				v1_angle = angle_left + idx_h * (angle_right-angle_left) / (num_steps-1);
+				tx_left = tx_tl + idx_h * (tx_br-tx_tl) / (num_steps-1);
+				if (idx_h+1<num_steps-1) {
+					v2_angle = angle_left + (idx_h+1) * (angle_right-angle_left) / (num_steps-1);
+					tx_right = tx_tl + (idx_h+1) * (tx_br-tx_tl) / (num_steps-1);
+				}
+				//avoid potential rounding for last step
+				else {
+					v2_angle = angle_right;
+					tx_right = tx_br;
+				}
+				Fixed x_tl = gf_mulfix(gf_cos(v1_angle), r_top);
+				Fixed z_tl = gf_mulfix(gf_sin(v1_angle), r_top);
+
+				Fixed x_tr = gf_mulfix(gf_cos(v2_angle), r_top);
+				Fixed z_tr = gf_mulfix(gf_sin(v2_angle), r_top);
+
+				Fixed x_bl = gf_mulfix(gf_cos(v1_angle), r_bottom);
+				Fixed z_bl = gf_mulfix(gf_sin(v1_angle), r_bottom);
+
+				Fixed x_br = gf_mulfix(gf_cos(v2_angle), r_bottom);
+				Fixed z_br = gf_mulfix(gf_sin(v2_angle), r_bottom);
+
+				mesh_set_vertex(mesh, x_tl, y_top, z_tl, x_tl, y_top,  z_tl, tx_left, ty_top);
+				mesh_set_vertex(mesh, x_bl, y_bottom, z_bl, x_bl, y_bottom, z_bl, tx_left, ty_bottom);
+				mesh_set_vertex(mesh, x_br, y_bottom, z_br, x_br, y_bottom, z_br, tx_right, ty_bottom);
+				mesh_set_vertex(mesh, x_tr, y_top, z_tr, x_tr, y_top, z_tr, tx_right, ty_top);
+
+				mesh_set_triangle(mesh, nb_vx, nb_vx+1, nb_vx+2);
+				mesh_set_triangle(mesh, nb_vx, nb_vx+2, nb_vx+3);
+				nb_vx+=4;
+			}
+		}
+	}
+	mesh_update_bounds(mesh);
+}
 void mesh_new_rectangle_ex(GF_Mesh *mesh, SFVec2f size, SFVec2f *orig, u32 flip, u32 rotate)
 {
 	Fixed x = - size.x / 2;
@@ -790,8 +902,82 @@
 void mesh_new_rectangle(GF_Mesh *mesh, SFVec2f size, SFVec2f *orig, Bool flip)
 {
 	mesh_new_rectangle_ex(mesh, size, orig, flip ? 2 : 0, 0);
+}
+
+void mesh_new_planar_srd(GF_Mesh *mesh, SFVec2f size, u32 flip, u32 rotate, const GF_PropertyValue *srd_map, const GF_PropertyValue *srd_ref)
+{
+	Bool flip_h = GF_FALSE;
+	Bool flip_v = GF_FALSE;
+	u32 i, nb_items = srd_map->value.uint_list.nb_items / 8;
+	u32 *vals = srd_map->value.uint_list.vals;
+	u32 width, height;
+	compositor_get_srdmap_size(srd_map, &width, &height, NULL, NULL);
 
+	Fixed ox = - size.x / 2;
+	Fixed oy = size.y / 2;
+	switch (flip) {
+	case 2:
+		flip_v = GF_TRUE;
+		break;
+	case 1:
+		flip_h = GF_TRUE;
+		break;
+	case 3:
+		flip_v = GF_TRUE;
+		flip_h = GF_TRUE;
+		break;
+	}
+
+	u32 nb_vx=0;
+	mesh_reset(mesh);
+	for (i=0; i<nb_items; i++) {
+		Fixed x = INT2FIX(vals8*i);
+		Fixed y = INT2FIX(vals8*i+1);
+		Fixed w = INT2FIX(vals8*i+2);
+		Fixed h = INT2FIX(vals8*i+3);
+
+		x = gf_mulfix(x, size.x) / width;
+		y = gf_mulfix(y, size.y) / height;
+		w = gf_mulfix(w, size.x) / width;
+		h = gf_mulfix(h, size.y) / height;
+
+		Fixed tx_tl = INT2FIX(vals8*i+4);
+		Fixed ty_tl = INT2FIX(vals8*i+5);
+		Fixed tx_br = INT2FIX(vals8*i+4 + vals8*i+6);
+		Fixed ty_br = INT2FIX(vals8*i+5 + vals8*i+7);
+		tx_tl /= srd_ref->value.vec2i.x;
+		tx_br /= srd_ref->value.vec2i.x;
+		ty_tl /= srd_ref->value.vec2i.y;
+		ty_br /= srd_ref->value.vec2i.y;
+		ty_tl = FIX_ONE - ty_tl;
+		ty_br = FIX_ONE - ty_br;
+
+		if (flip_h) {
+			Fixed v = tx_tl;
+			tx_tl = tx_br;
+			tx_br = v;
+		}
+		if (flip_v) {
+			Fixed v = ty_tl;
+			ty_tl = ty_br;
+			ty_br = v;
+		}
+
+		mesh_set_vertex(mesh, ox + x, oy - y - h,  0,  0,  0,  FIX_ONE, tx_tl, ty_br);
+		mesh_set_vertex(mesh, ox + x + w, oy - y - h,  0,  0,  0,  FIX_ONE, tx_br, ty_br);
+		mesh_set_vertex(mesh, ox + x + w, oy - y,  0,  0,  0,  FIX_ONE, tx_br, ty_tl);
+		mesh_set_vertex(mesh, ox + x, oy - y,  0,  0,  0,  FIX_ONE, tx_tl, ty_tl);
+
+		mesh_set_triangle(mesh, nb_vx, nb_vx+1, nb_vx+2);
+		mesh_set_triangle(mesh, nb_vx, nb_vx+2, nb_vx+3);
+		nb_vx+=4;
+	}
+
+	mesh->flags |= MESH_IS_2D;
+	mesh_update_bounds(mesh);
 }
+
+
 #define ELLIPSE_SUBDIV		32
 void mesh_new_ellipse(GF_Mesh *mesh, Fixed a_dia, Fixed b_dia, Bool low_res)
 {
@@ -2003,7 +2189,7 @@
 	}
 	/*not colinear*/
 	else {
-		assert(nb_scp<=nb_spine);
+		gf_assert(nb_scp<=nb_spine);
 
 		/*now non-cap SCPs axis*/
 		for (i=1; i<nb_scp-1; i++) {
@@ -2213,7 +2399,7 @@
 
 		if (smooth_normals) {
 			faces_infobegin_face.nor = n;
-			assert(gf_vec_len(n));
+			gf_assert(gf_vec_len(n));
 		}
 		cur_pts_in_cross = 0;
 		cur = 0;
@@ -2269,7 +2455,7 @@
 
 		if (smooth_normals) {
 			faces_infoend_face.nor = n;
-			assert(gf_vec_len(n));
+			gf_assert(gf_vec_len(n));
 		}
 		cur_pts_in_cross = 0;
 
@@ -2433,6 +2619,6 @@
 }
 
 
-#endif	/* GPAC_DISABLE_3D*/
-
 #endif /*GPAC_DISABLE_VRML*/
+
+#endif //!defined(GPAC_DISABLE_3D) && !defined(GPAC_DISABLE_EVG)

gpac-2.2.1.tar.gz/src/compositor/mesh_collide.c -> gpac-2.4.0.tar.gz/src/compositor/mesh_collide.c Changed

gpac-2.2.1.tar.gz/src/compositor/mesh_tesselate.c -> gpac-2.4.0.tar.gz/src/compositor/mesh_tesselate.c Changed

gpac-2.2.1.tar.gz/src/compositor/mpeg4_animstream.c -> gpac-2.4.0.tar.gz/src/compositor/mpeg4_animstream.c Changed

gpac-2.2.1.tar.gz/src/compositor/mpeg4_audio.c -> gpac-2.4.0.tar.gz/src/compositor/mpeg4_audio.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2022
+ *			Copyright (c) Telecom ParisTech 2000-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / Scene Compositor sub-project
@@ -26,7 +26,7 @@
 
 #include "nodes_stacks.h"
 
-#ifndef GPAC_DISABLE_VRML
+#if !defined(GPAC_DISABLE_VRML) && !defined(GPAC_DISABLE_COMPOSITOR)
 
 
 static void audioclip_activate(AudioClipStack *st, M_AudioClip *ac)
@@ -464,7 +464,7 @@
 			written = gf_mixer_get_output(st->am, st->buffer + st->write_pos, st->buffer_size - st->write_pos, 0);
 			if (!written) break;
 			st->write_pos += written;
-			assert(st->write_pos<=st->buffer_size);
+			gf_fatal_assert(st->write_pos<=st->buffer_size);
 		}
 	}
 	/*not playing*/
@@ -477,7 +477,7 @@
 {
 	AudioBufferStack *st = (AudioBufferStack *) gf_node_get_private( ((GF_AudioInput *) callback)->owner);
 	st->read_pos += nb_bytes;
-	assert(st->read_pos<=st->write_pos);
+	gf_fatal_assert(st->read_pos<=st->write_pos);
 	if (st->read_pos==st->write_pos) {
 		if (st->write_pos<st->buffer_size) {
 			/*reading faster than buffering - let's still attempt to fill the buffer*/
@@ -541,9 +541,11 @@
 			aifc->afmt = GF_AUDIO_FMT_S16;
 			break;
 		case GF_AUDIO_FMT_S24P:
+		case GF_AUDIO_FMT_S24_BE:
 			aifc->afmt = GF_AUDIO_FMT_S24;
 			break;
 		case GF_AUDIO_FMT_S32P:
+		case GF_AUDIO_FMT_S32_BE:
 			aifc->afmt = GF_AUDIO_FMT_S32;
 			break;
 		case GF_AUDIO_FMT_FLTP:
@@ -560,7 +562,7 @@
 			gf_mixer_set_config(st->am, aifc->samplerate, aifc->chan, aifc->afmt, aifc->ch_layout);
 		}
 		st->is_init = (aifc->samplerate && aifc->chan && aifc->afmt) ? GF_TRUE : GF_FALSE;
-		assert(st->is_init);
+		gf_assert(st->is_init);
 		if (!st->is_init) {
 			aifc->samplerate = aifc->chan = aifc->afmt = 0;
 			aifc->ch_layout = 0;
@@ -641,4 +643,5 @@
 		st->time_handle.needs_unregister = GF_FALSE;
 }
 
-#endif /*GPAC_DISABLE_VRML*/
+#endif //!defined(GPAC_DISABLE_VRML) && !defined(GPAC_DISABLE_COMPOSITOR)
+

gpac-2.2.1.tar.gz/src/compositor/mpeg4_background.c -> gpac-2.4.0.tar.gz/src/compositor/mpeg4_background.c Changed

gpac-2.2.1.tar.gz/src/compositor/mpeg4_background2d.c -> gpac-2.4.0.tar.gz/src/compositor/mpeg4_background2d.c Changed

gpac-2.2.1.tar.gz/src/compositor/mpeg4_bitmap.c -> gpac-2.4.0.tar.gz/src/compositor/mpeg4_bitmap.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2022
+ *			Copyright (c) Telecom ParisTech 2000-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / Scene Compositor sub-project
@@ -29,7 +29,7 @@
 #include "visual_manager.h"
 #include "texturing.h"
 
-#ifndef GPAC_DISABLE_VRML
+#if !defined(GPAC_DISABLE_VRML) && !defined(GPAC_DISABLE_COMPOSITOR)
 
 typedef struct _bitmap_stack
 {
@@ -41,6 +41,7 @@
 } BitmapStack;
 
 
+Bool rectangle_check_adaptation(GF_Node *node, Drawable *stack, GF_TraverseState *tr_state);
 
 static void Bitmap_BuildGraph(GF_Node *node, BitmapStack *st, GF_TraverseState *tr_state, GF_Rect *out_rc, Bool notify_changes)
 {
@@ -64,8 +65,27 @@
 		return;
 	}
 
+	//srd map changed, reset mesh if any
+	if (txh->stream && txh->stream->srd_map_changed) {
+		txh->stream->srd_map_changed = GF_FALSE;
+#ifndef GPAC_DISABLE_3D
+		if (st->s_graph.mesh) {
+			mesh_free(st->s_graph.mesh);
+			st->s_graph.mesh = NULL;
+		}
+#endif
+	}
+
+	//single instance
+	if ((gf_node_get_num_instances(node)==1) && !gf_node_dirty_get(node) && st->rc.width) {
+		*out_rc = st->rc;
+		return;
+	}
 	w = txh->width;
 	h = txh->height;
+	if (txh->stream) {
+		gf_mo_get_visual_info_ex(txh->stream, &w, &h, NULL, NULL, NULL, NULL, GF_FALSE);
+	}
 	if (txh->stream && txh->stream->c_w && txh->stream->c_h) {
 		w = (u32) txh->stream->c_w;
 		h = (u32) txh->stream->c_h;
@@ -110,6 +130,7 @@
 		size.x = gf_divfix(size.x, tr_state->min_hsize);
 		size.y = gf_divfix(size.y, tr_state->min_hsize);
 	}
+
 	*out_rc = st->rc = gf_rect_center(size.x, size.y);
 
 	gf_node_dirty_clear(node, 0);
@@ -326,5 +347,4 @@
 	gf_node_set_callback_function(node, TraverseBitmap);
 }
 
-#endif
-
+#endif // !defined(GPAC_DISABLE_VRML) && !defined(GPAC_DISABLE_COMPOSITOR)

gpac-2.2.1.tar.gz/src/compositor/mpeg4_composite.c -> gpac-2.4.0.tar.gz/src/compositor/mpeg4_composite.c Changed

gpac-2.2.1.tar.gz/src/compositor/mpeg4_form.c -> gpac-2.4.0.tar.gz/src/compositor/mpeg4_form.c Changed

gpac-2.2.1.tar.gz/src/compositor/mpeg4_geometry_2d.c -> gpac-2.4.0.tar.gz/src/compositor/mpeg4_geometry_2d.c Changed

gpac-2.2.1.tar.gz/src/compositor/mpeg4_geometry_3d.c -> gpac-2.4.0.tar.gz/src/compositor/mpeg4_geometry_3d.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2022
+ *			Copyright (c) Telecom ParisTech 2000-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / Scene Compositor sub-project
@@ -28,9 +28,7 @@
 #include "nodes_stacks.h"
 
 
-#ifndef GPAC_DISABLE_VRML
-
-#ifndef GPAC_DISABLE_3D
+#if !defined(GPAC_DISABLE_VRML) && !defined(GPAC_DISABLE_COMPOSITOR) && !defined(GPAC_DISABLE_3D)
 
 #include <gpac/mediaobject.h>
 
@@ -125,7 +123,7 @@
 	mesh_new_sphere(stack->mesh, sp->radius, tr_state->visual->compositor->fast, NULL);
 }
 
-static void get_tx_coords_from_angle(GF_TraverseState *tr_state, GF_TextureHandler *txh, Bool horizontal, u32 *min_coord, u32 *max_coord)
+void get_tx_coords_from_angle(GF_TraverseState *tr_state, GF_TextureHandler *txh, Bool horizontal, u32 *min_coord, u32 *max_coord)
 {
 	GF_Vec target, ref;
 	Fixed dot, det, hfov, theta_angle, angle_start, angle_end, min_tx, max_tx;
@@ -671,6 +669,4 @@
 	gf_node_set_callback_function(node, TraverseNonLinearDeformer);
 }
 
-#endif /*GPAC_DISABLE_3D*/
-
-#endif /*GPAC_DISABLE_VRML*/
+#endif // !defined(GPAC_DISABLE_VRML) && !defined(GPAC_DISABLE_COMPOSITOR) && !defined(GPAC_DISABLE_3D)

gpac-2.2.1.tar.gz/src/compositor/mpeg4_geometry_ifs2d.c -> gpac-2.4.0.tar.gz/src/compositor/mpeg4_geometry_ifs2d.c Changed

gpac-2.2.1.tar.gz/src/compositor/mpeg4_geometry_ils2d.c -> gpac-2.4.0.tar.gz/src/compositor/mpeg4_geometry_ils2d.c Changed

gpac-2.2.1.tar.gz/src/compositor/mpeg4_gradients.c -> gpac-2.4.0.tar.gz/src/compositor/mpeg4_gradients.c Changed

gpac-2.2.1.tar.gz/src/compositor/mpeg4_grouping.c -> gpac-2.4.0.tar.gz/src/compositor/mpeg4_grouping.c Changed

gpac-2.2.1.tar.gz/src/compositor/mpeg4_grouping_2d.c -> gpac-2.4.0.tar.gz/src/compositor/mpeg4_grouping_2d.c Changed

gpac-2.2.1.tar.gz/src/compositor/mpeg4_grouping_3d.c -> gpac-2.4.0.tar.gz/src/compositor/mpeg4_grouping_3d.c Changed

gpac-2.2.1.tar.gz/src/compositor/mpeg4_inline.c -> gpac-2.4.0.tar.gz/src/compositor/mpeg4_inline.c Changed

gpac-2.2.1.tar.gz/src/compositor/mpeg4_inputsensor.c -> gpac-2.4.0.tar.gz/src/compositor/mpeg4_inputsensor.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2022
+ *			Copyright (c) Telecom ParisTech 2000-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / Scene Compositor sub-project
@@ -29,7 +29,7 @@
 #include <gpac/nodes_x3d.h>
 #include <gpac/constants.h>
 
-#ifndef GPAC_DISABLE_VRML
+#if !defined(GPAC_DISABLE_VRML) && !defined(GPAC_DISABLE_COMPOSITOR)
 
 enum
 {
@@ -399,8 +399,8 @@
 	/*apply it*/
 	i=0;
 	while ((st = (ISStack*)gf_list_enum(is_ctx->is_nodes, &i))) {
-		assert(st->is);
-		assert(st->mo);
+		gf_assert(st->is);
+		gf_assert(st->mo);
 		if (!st->is->enabled) continue;
 
 		count = gf_list_count(st->is->buffer.commandList);
@@ -432,8 +432,7 @@
 
 	odm = st->mo->odm;
 	if (!odm) return;
-
-	assert(odm->type == GF_STREAM_INTERACT);
+	if (odm->type != GF_STREAM_INTERACT) return;
 
 	/*get IS dec*/
 	is_ctx = locate_is_ctx_for_odm(odm->parentscene, odm);
@@ -460,8 +459,6 @@
 	odm = st->mo->odm;
 	if (!odm || (odm->type != GF_STREAM_INTERACT)) return;
 
-	assert(odm->type == GF_STREAM_INTERACT);
-
 	/*get IS dec*/
 	is_ctx = locate_is_ctx_for_odm(odm->parentscene, odm);
 	if (!is_ctx) return;
@@ -996,4 +993,4 @@
 {
 }
 
-#endif /*GPAC_DISABLE_VRML*/
+#endif // !defined(GPAC_DISABLE_VRML) && !defined(GPAC_DISABLE_COMPOSITOR)

gpac-2.2.1.tar.gz/src/compositor/mpeg4_layer_2d.c -> gpac-2.4.0.tar.gz/src/compositor/mpeg4_layer_2d.c Changed

gpac-2.2.1.tar.gz/src/compositor/mpeg4_layer_3d.c -> gpac-2.4.0.tar.gz/src/compositor/mpeg4_layer_3d.c Changed

gpac-2.2.1.tar.gz/src/compositor/mpeg4_layout.c -> gpac-2.4.0.tar.gz/src/compositor/mpeg4_layout.c Changed

gpac-2.2.1.tar.gz/src/compositor/mpeg4_lighting.c -> gpac-2.4.0.tar.gz/src/compositor/mpeg4_lighting.c Changed

gpac-2.2.1.tar.gz/src/compositor/mpeg4_mediacontrol.c -> gpac-2.4.0.tar.gz/src/compositor/mpeg4_mediacontrol.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2022
+ *			Copyright (c) Telecom ParisTech 2000-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / Scene Compositor sub-project
@@ -27,6 +27,8 @@
 #include <gpac/constants.h>
 #include <gpac/internal/compositor_dev.h>
 
+#if !defined(GPAC_DISABLE_COMPOSITOR)
+
 
 void mediacontrol_restart(GF_ObjectManager *odm)
 {
@@ -146,8 +148,8 @@
 
 	in_scene = odm->parentscene;
 	if (odm->subscene) {
-		assert(odm->subscene->root_od==odm);
-		assert(odm->subscene->is_dynamic_scene || gf_odm_shares_clock(odm, ck) );
+		gf_assert(odm->subscene->root_od==odm);
+		gf_assert(odm->subscene->is_dynamic_scene || gf_odm_shares_clock(odm, ck) );
 		/*resume root*/
 		gf_odm_resume(odm);
 		in_scene = odm->subscene;
@@ -194,8 +196,8 @@
 
 	in_scene = odm->parentscene;
 	if (odm->subscene) {
-		assert(odm->subscene->root_od==odm);
-		assert(odm->subscene->is_dynamic_scene || gf_odm_shares_clock(odm, ck) );
+		gf_assert(odm->subscene->root_od==odm);
+		gf_assert(odm->subscene->is_dynamic_scene || gf_odm_shares_clock(odm, ck) );
 		/*pause root*/
 		gf_odm_pause(odm);
 		in_scene = odm->subscene;
@@ -238,7 +240,7 @@
 
 	in_scene = odm->parentscene;
 	if (odm->subscene) {
-		assert(odm->subscene->root_od==odm);
+		gf_assert(odm->subscene->root_od==odm);
 		in_scene = odm->subscene;
 
 		//dynamic scene with speed direction, we need to re-start everything to issue new PLAY requests
@@ -712,3 +714,5 @@
 
 
 #endif /*GPAC_DISABLE_VRML*/
+
+#endif //!defined(GPAC_DISABLE_COMPOSITOR)

gpac-2.2.1.tar.gz/src/compositor/mpeg4_mediasensor.c -> gpac-2.4.0.tar.gz/src/compositor/mpeg4_mediasensor.c Changed

gpac-2.2.1.tar.gz/src/compositor/mpeg4_path_layout.c -> gpac-2.4.0.tar.gz/src/compositor/mpeg4_path_layout.c Changed

gpac-2.2.1.tar.gz/src/compositor/mpeg4_sensors.c -> gpac-2.4.0.tar.gz/src/compositor/mpeg4_sensors.c Changed

gpac-2.2.1.tar.gz/src/compositor/mpeg4_sound.c -> gpac-2.4.0.tar.gz/src/compositor/mpeg4_sound.c Changed

gpac-2.2.1.tar.gz/src/compositor/mpeg4_text.c -> gpac-2.4.0.tar.gz/src/compositor/mpeg4_text.c Changed

gpac-2.2.1.tar.gz/src/compositor/mpeg4_textures.c -> gpac-2.4.0.tar.gz/src/compositor/mpeg4_textures.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2020
+ *			Copyright (c) Telecom ParisTech 2000-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / Scene Compositor sub-project
@@ -29,11 +29,7 @@
 #include <gpac/nodes_mpeg4.h>
 #include <gpac/nodes_x3d.h>
 
-#ifndef GPAC_DISABLE_VRML
-
-#ifdef __cplusplus
-extern "C" {
-#endif
+#if !defined(GPAC_DISABLE_VRML) && !defined(GPAC_DISABLE_COMPOSITOR)
 
 /*for cache texture decode and hash*/
 #include <gpac/avparse.h>
@@ -629,7 +625,9 @@
 		((Background2DStack *)st)->txh.stream = NULL;
 		break;
 	case TAG_MPEG4_Background:
+#ifndef GPAC_DISABLE_X3D
 	case TAG_X3D_Background:
+#endif
 #ifndef GPAC_DISABLE_3D
 		((BackgroundStack *)st)->txh_back.stream = NULL;
 		((BackgroundStack *)st)->txh_front.stream = NULL;
@@ -640,11 +638,15 @@
 #endif
 		break;
 	case TAG_MPEG4_ImageTexture:
+#ifndef GPAC_DISABLE_X3D
 	case TAG_X3D_ImageTexture:
+#endif
 		((GF_TextureHandler *)st)->stream = NULL;
 		break;
 	case TAG_MPEG4_MovieTexture:
+#ifndef GPAC_DISABLE_X3D
 	case TAG_X3D_MovieTexture:
+#endif
 		((MovieTextureStack *)st)->txh.stream = NULL;
 		break;
 	case TAG_MPEG4_MediaSensor:
@@ -657,7 +659,9 @@
 		((AudioSourceStack *)st)->input.stream = NULL;
 		break;
 	case TAG_MPEG4_AudioClip:
+#ifndef GPAC_DISABLE_X3D
 	case TAG_X3D_AudioClip:
+#endif
 		((AudioClipStack *)st)->input.stream = NULL;
 		break;
 #ifndef GPAC_DISABLE_SVG
@@ -674,7 +678,4 @@
 	}
 }
 
-#ifdef __cplusplus
-}
-#endif
-#endif /*GPAC_DISABLE_VRML*/
+#endif //!defined(GPAC_DISABLE_VRML) && !defined(GPAC_DISABLE_COMPOSITOR)

gpac-2.2.1.tar.gz/src/compositor/mpeg4_timesensor.c -> gpac-2.4.0.tar.gz/src/compositor/mpeg4_timesensor.c Changed

gpac-2.2.1.tar.gz/src/compositor/mpeg4_viewport.c -> gpac-2.4.0.tar.gz/src/compositor/mpeg4_viewport.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2022
+ *			Copyright (c) Telecom ParisTech 2000-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / Scene Compositor sub-project
@@ -26,6 +26,7 @@
 #include "nodes_stacks.h"
 #include "visual_manager.h"
 
+#if !defined(GPAC_DISABLE_COMPOSITOR)
 
 GF_EXPORT
 GF_Err gf_sc_get_viewpoint(GF_Compositor *compositor, u32 viewpoint_idx, const char **outName, Bool *is_bound)
@@ -168,8 +169,8 @@
 	/*first traverse, bound if needed*/
 	if (gf_list_find(tr_state->viewpoints, node) < 0) {
 		gf_list_add(tr_state->viewpoints, node);
-		assert(gf_list_find(st->reg_stacks, tr_state->viewpoints)==-1);
-		gf_list_add(st->reg_stacks, tr_state->viewpoints);
+		if (gf_list_find(st->reg_stacks, tr_state->viewpoints)<0)
+			gf_list_add(st->reg_stacks, tr_state->viewpoints);
 
 		if (gf_list_get(tr_state->viewpoints, 0) == vp) {
 			if (!vp->isBound) Bindable_SetIsBound(node, 1);
@@ -357,8 +358,8 @@
 	/*first traverse, bound if needed*/
 	if (gf_list_find(tr_state->viewpoints, node) < 0) {
 		gf_list_add(tr_state->viewpoints, node);
-		assert(gf_list_find(st->reg_stacks, tr_state->viewpoints)==-1);
-		gf_list_add(st->reg_stacks, tr_state->viewpoints);
+		if (gf_list_find(st->reg_stacks, tr_state->viewpoints)<0)
+			gf_list_add(st->reg_stacks, tr_state->viewpoints);
 
 		if (gf_list_get(tr_state->viewpoints, 0) == vp) {
 			if (!vp->isBound) Bindable_SetIsBound(node, 1);
@@ -473,8 +474,8 @@
 		if (gf_list_get(tr_state->navigations, 0) == ni) {
 			if (!ni->isBound) Bindable_SetIsBound(node, 1);
 		}
-		assert(gf_list_find(st->reg_stacks, tr_state->navigations)==-1);
-		gf_list_add(st->reg_stacks, tr_state->navigations);
+		if (gf_list_find(st->reg_stacks, tr_state->navigations)<0)
+			gf_list_add(st->reg_stacks, tr_state->navigations);
 		gf_mx_copy(st->world_view_mx, tr_state->model_matrix);
 		/*in any case don't draw the first time*/
 		gf_sc_invalidate(tr_state->visual->compositor, NULL);
@@ -601,8 +602,8 @@
 		if (gf_list_get(tr_state->fogs, 0) == fog) {
 			if (!fog->isBound) Bindable_SetIsBound(node, 1);
 		}
-		assert(gf_list_find(st->reg_stacks, tr_state->fogs)==-1);
-		gf_list_add(st->reg_stacks, tr_state->fogs);
+		if (gf_list_find(st->reg_stacks, tr_state->fogs)<0)
+			gf_list_add(st->reg_stacks, tr_state->fogs);
 
 		gf_mx_copy(st->world_view_mx, tr_state->model_matrix);
 		/*in any case don't draw the first time*/
@@ -657,3 +658,6 @@
 #endif	/*GPAC_DISABLE_3D*/
 
 #endif /*GPAC_DISABLE_VRML*/
+
+
+#endif //!defined(GPAC_DISABLE_COMPOSITOR)

gpac-2.2.1.tar.gz/src/compositor/navigate.c -> gpac-2.4.0.tar.gz/src/compositor/navigate.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2022
+ *			Copyright (c) Telecom ParisTech 2000-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / Scene Compositor sub-project
@@ -26,6 +26,7 @@
 #include "nodes_stacks.h"
 #include "visual_manager.h"
 
+#if !defined(GPAC_DISABLE_COMPOSITOR)
 
 #ifndef GPAC_DISABLE_3D
 
@@ -359,8 +360,6 @@
 
 	if (!cam) {
 		cam = &compositor->visual->camera;
-		assert(compositor);
-		assert(compositor->scene);
 	}
 	if (!cam || (cam->navigate_mode==GF_NAVIGATE_NONE)) return 0;
 
@@ -412,6 +411,7 @@
 			compositor->grab_x = x;
 			compositor->grab_y = y;
 			compositor->navigation_state = 1;
+			compositor->auto_rotate=0;
 
 			/*change vp and examine center to current location*/
 			if ((keys & GF_KEY_MOD_CTRL) && compositor->hit_square_dist) {
@@ -453,7 +453,8 @@
 		else if (x >= 0.49) compositor->auto_rotate = 2;
 		else if (y <= -0.49) compositor->auto_rotate = 3;
 		else if (y >= 0.49) compositor->auto_rotate = 4;
-		else compositor->auto_rotate = 0;
+		else
+			compositor->auto_rotate = 0;
 
 		handle_mouse_move_3d(compositor, cam, keys, dx, dy);
 
@@ -512,8 +513,9 @@
 		return 0;
 
 	case GF_EVENT_MOUSEUP:
-		compositor->auto_rotate=0;
-		if (ev->mouse.button==GF_MOUSE_LEFT) compositor->navigation_state = 0;
+		if (ev->mouse.button==GF_MOUSE_LEFT) {
+			compositor->navigation_state = 0;
+		}
 		break;
 
 	case GF_EVENT_KEYDOWN:
@@ -931,13 +933,17 @@
 		break;
 	case 3:
 		dy = FIX_ONE/100;
+		if (cam->up.z>0.9999) compositor->auto_rotate=4;
 		break;
 	case 4:
 		dy = -FIX_ONE/100;
+		if (cam->up.z<-0.9999) compositor->auto_rotate=3;
 		break;
 	default:
 		return;
 	}
+	if (compositor->gazer_enabled)
+		compositor->gaze_changed = GF_FALSE;
 	handle_mouse_move_3d(compositor, cam, 0, dx, dy);
 #endif
 }
@@ -951,3 +957,5 @@
 #endif
 	return compositor_handle_navigation_2d(compositor->visual, ev);
 }
+
+#endif //!defined(GPAC_DISABLE_COMPOSITOR)

gpac-2.2.1.tar.gz/src/compositor/nodes_stacks.h -> gpac-2.4.0.tar.gz/src/compositor/nodes_stacks.h Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2012
+ *			Copyright (c) Telecom ParisTech 2000-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / Scene Compositor sub-project
@@ -131,27 +131,6 @@
 } BackgroundStack;
 #endif
 
-#ifndef GPAC_DISABLE_SVG
-typedef struct
-{
-	GF_TextureHandler txh;
-	Drawable *drawable;
-	MFURL txurl;
-	Bool first_frame_fetched;
-	GF_Node *audio;
-	Bool audio_dirty;
-	Bool stop_requested;
-} SVG_video_stack;
-
-typedef struct
-{
-	GF_AudioInput input;
-	Bool is_active, is_error;
-	MFURL aurl;
-} SVG_audio_stack;
-
-#endif
-
 
 typedef struct
 {
@@ -357,6 +336,24 @@
 
 void compositor_svg_video_modified(GF_Compositor *compositor, GF_Node *node);
 
+typedef struct
+{
+	GF_TextureHandler txh;
+	Drawable *drawable;
+	MFURL txurl;
+	Bool first_frame_fetched;
+	GF_Node *audio;
+	Bool audio_dirty;
+	Bool stop_requested;
+} SVG_video_stack;
+
+typedef struct
+{
+	GF_AudioInput input;
+	Bool is_active, is_error;
+	MFURL aurl;
+} SVG_audio_stack;
+
 #endif

gpac-2.2.1.tar.gz/src/compositor/object_manager.c -> gpac-2.4.0.tar.gz/src/compositor/object_manager.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2022
+ *			Copyright (c) Telecom ParisTech 2000-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / Scene Compositor sub-project
@@ -27,6 +27,8 @@
 #include <gpac/internal/compositor_dev.h>
 #include <gpac/constants.h>
 
+#if !defined(GPAC_DISABLE_COMPOSITOR)
+
 GF_EXPORT
 GF_ObjectManager *gf_odm_new()
 {
@@ -372,7 +374,7 @@
 
 	/*empty object, use a dynamic scene*/
 	if (! odm->pid && odm->subscene) {
-		assert(odm->subscene->root_od==odm);
+		gf_assert(odm->subscene->root_od==odm);
 		odm->subscene->is_dynamic_scene = GF_TRUE;
 	} else if (odm->pid) {
 		GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPTIME, ("Compositor Setting up object streams\n"));
@@ -487,7 +489,7 @@
 	}
 	/*object is the root, always start*/
 	else if (!odm->parentscene) {
-		assert(odm->subscene && (odm->subscene->root_od==odm));
+		gf_assert(odm->subscene && (odm->subscene->root_od==odm));
 		odm->flags &= ~GF_ODM_NOT_SETUP;
 		gf_odm_start(odm);
 	}
@@ -687,7 +689,7 @@
 		GF_Scene *parent = gf_scene_get_root_scene(scene);
 		clockID = scene->root_od->ck->clock_id;
 		ck_namespace = parent->root_od->scene_ns->clocks;
-		assert(ck_namespace);
+		gf_fatal_assert(ck_namespace);
 	}
 
 
@@ -701,7 +703,7 @@
 		scene->root_od->ck = ck;
 
 clock_setup:
-	assert(ck);
+	gf_fatal_assert(ck);
 	odm->ck = ck;
 	odm->clock_inherited = clock_inherited;
 
@@ -761,7 +763,7 @@
 		/*look for a given segment name to play*/
 		if (odm->subscene) {
 			char *url, *frag=NULL;
-			assert(odm->subscene->root_od==odm);
+			gf_assert(odm->subscene->root_od==odm);
 
 			url = (odm->mo && odm->mo->URLs.count) ? odm->mo->URLs.vals0.url : odm->scene_ns->url;
 			frag = strrchr(url, '#');
@@ -1085,7 +1087,7 @@
 		odm->parentscene->root_od->addon->started = 0;
 	}
 	if (odm->nb_buffering) {
-		assert(scene->nb_buffering>=odm->nb_buffering);
+		gf_assert(scene->nb_buffering>=odm->nb_buffering);
 		scene->nb_buffering -= odm->nb_buffering;
 		while (odm->nb_buffering && odm->ck) {
 			gf_clock_buffer_off(odm->ck);
@@ -1531,8 +1533,8 @@
 	//TODO abort buffering when errors are found on the input chain !!
 	if (odm->blocking_media || (buffer_duration >= odm->buffer_playout_ms)) {
 		odm->nb_buffering--;
-		assert(scene->nb_buffering);
-		scene->nb_buffering--;
+		if (scene->nb_buffering)
+			scene->nb_buffering--;
 		if (!scene->nb_buffering) {
 			*signal_eob = GF_TRUE;
 		}
@@ -1540,8 +1542,8 @@
 			gf_clock_buffer_off(odm->ck);
 	} else if (gf_filter_pid_has_seen_eos(pid) ) {
 		odm->nb_buffering--;
-		assert(scene->nb_buffering);
-		scene->nb_buffering--;
+		if (scene->nb_buffering)
+			scene->nb_buffering--;
 		//if eos while buffering, consider the last rebuffer an error
 		//fixeme, we need a way to probe for eos being "close" but not yet detected
 		if (odm->nb_rebuffer)
@@ -1571,7 +1573,7 @@
 	Bool check_disc = GF_FALSE;
 	Bool check_full_buffer = GF_TRUE;
 
-	assert(odm);
+	gf_assert(odm);
 
 	if (!pid) {
 		check_full_buffer = GF_FALSE;
@@ -2111,3 +2113,4 @@
 	}
 }
 
+#endif //!defined(GPAC_DISABLE_COMPOSITOR)

gpac-2.2.1.tar.gz/src/compositor/offscreen_cache.c -> gpac-2.4.0.tar.gz/src/compositor/offscreen_cache.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2006-2012
+ *			Copyright (c) Telecom ParisTech 2006-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / Scene Compositor sub-project
@@ -29,6 +29,8 @@
 #include "mpeg4_grouping.h"
 #include "texturing.h"
 
+#if !defined(GPAC_DISABLE_COMPOSITOR)
+
 #define NUM_STATS_FRAMES		2
 #define MIN_OBJECTS_IN_CACHE	2
 
@@ -487,7 +489,7 @@
 
 	if (bytes_remove == 0) return 0;
 
-	assert(compositor->video_cache_current_size >= bytes_remove);
+	gf_fatal_assert(compositor->video_cache_current_size >= bytes_remove);
 	compositor->video_cache_current_size -= bytes_remove;
 
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_CACHE, ("CACHE Removing cache %s:\t Objects: %d\tSlope: %g\tBytes: %d\tTime: %d\n",
@@ -519,7 +521,7 @@
 	/*draw mode*/
 	if (tr_state->traversing_mode == TRAVERSE_DRAW_2D) {
 		/*shall never happen*/
-		assert(group->cache);
+		gf_fatal_assert(group->cache);
 		/*draw it*/
 		group_cache_draw(group->cache, tr_state);
 		return 1;
@@ -891,3 +893,4 @@
 	if (group->sensors) gf_list_del(group->sensors);
 }
 
+#endif //!defined(GPAC_DISABLE_COMPOSITOR)

gpac-2.2.1.tar.gz/src/compositor/scene.c -> gpac-2.4.0.tar.gz/src/compositor/scene.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2022
+ *			Copyright (c) Telecom ParisTech 2000-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / Scene Compositor sub-project
@@ -32,6 +32,8 @@
 #include <gpac/internal/compositor_dev.h>
 #include <gpac/nodes_x3d.h>
 
+#if !defined(GPAC_DISABLE_COMPOSITOR)
+
 /*SVG properties*/
 #ifndef GPAC_DISABLE_SVG
 #include <gpac/scenegraph_svg.h>
@@ -44,10 +46,8 @@
 #if 1
 	u64 ret;
 	GF_Clock *ck;
-	assert(scene);
-	assert(scene->root_od);
+	if (!scene || !scene->root_od || !scene->root_od->ck) return 0.0;
 	ck = scene->root_od->ck;
-	if (!ck) return 0.0;
 	ret = gf_clock_time_absolute(ck);
 	if ((scene->root_od->media_stop_time>0) && ((u64) scene->root_od->media_stop_time<ret))
 		ret = scene->root_od->media_stop_time;
@@ -297,7 +297,7 @@
 	/*init inline scene*/
 	if (parentScene) {
 		tmp->graph = gf_sg_new_subscene(parentScene->graph);
-		assert(!compositor || (compositor==parentScene->compositor));
+		gf_assert(!compositor || (compositor==parentScene->compositor));
 		tmp->compositor = parentScene->compositor;
 	} else {
 		tmp->graph = gf_sg_new();
@@ -345,7 +345,7 @@
 void gf_scene_del(GF_Scene *scene)
 {
 	gf_list_del(scene->resources);
-	assert(!gf_list_count(scene->extra_scenes) );
+	gf_assert(!gf_list_count(scene->extra_scenes) );
 	gf_list_del(scene->extra_scenes);
 
 #ifndef GPAC_DISABLE_VRML
@@ -1070,7 +1070,7 @@
 static void gf_scene_get_video_size(GF_MediaObject *mo, u32 *w, u32 *h)
 {
 	u32 pixel_ar;
-	if (!gf_mo_get_visual_info(mo, w, h, NULL, &pixel_ar, NULL, NULL)) return;
+	if (!gf_mo_get_visual_info_ex(mo, w, h, NULL, &pixel_ar, NULL, NULL, GF_FALSE)) return;
 	if (mo->c_w && mo->c_h) {
 		*w = (u32) mo->c_w;
 		*h = (u32) mo->c_h;
@@ -1113,7 +1113,6 @@
 		if (obj->odm && (odm->source_id != obj->odm->source_id)) continue;
 
 		if (obj->OD_ID==GF_MEDIA_EXTERNAL_ID) {
-			//assert(obj->odm);
 			if (obj->odm == odm) {
 				/*assign FINAL OD, not parent*/
 				obj->odm = odm;
@@ -1609,7 +1608,11 @@
 		((M_Appearance *)app)->material = n2;
 		gf_node_register(n2, app);
 	} else if (scene->vr_type && !is_untransform) {
-		n2 = is_create_node(scene->graph, TAG_MPEG4_Sphere, name_geo);
+		if (scene->vr_type==2) {
+			n2 = load_vr_proto_node(scene->graph, "urn:inet:gpac:builtin:SRDSphere", name_geo);
+		} else {
+			n2 = is_create_node(scene->graph, TAG_MPEG4_Sphere, name_geo);
+		}
 		((M_Shape *)n1)->geometry = n2;
 		gf_node_register(n2, n1);
 	} else {
@@ -1844,8 +1847,8 @@
 				create_movie(scene, n1, szName, szTex, szGeom, GF_FALSE);
 			}
 		}
-		assert(max_x>min_x);
-		assert(max_y>min_y);
+		gf_assert(max_x>min_x);
+		gf_assert(max_y>min_y);
 
 		scene->srd_min_x = min_x;
 		scene->srd_min_y = min_y;
@@ -2022,6 +2025,7 @@
 
 	gf_node_changed(n, NULL);
 }
+#endif
 
 GF_EXPORT
 void gf_scene_set_service_id(GF_Scene *scene, u32 service_id)
@@ -2038,7 +2042,7 @@
 			if (odm->ServiceID != scene->selected_service_id) continue;
 			if (odm->redirect_url) {
 				remote_odm = odm;
-				assert(remote_odm->scene_ns->nb_odm_users);
+				gf_assert(remote_odm->scene_ns->nb_odm_users);
 				remote_odm->scene_ns->nb_odm_users--;
 				remote_odm->scene_ns = scene->root_od->scene_ns;
 				remote_odm->scene_ns->nb_odm_users++;
@@ -2083,6 +2087,8 @@
 	gf_sc_lock(scene->compositor, 0);
 }
 
+#ifndef GPAC_DISABLE_VRML
+
 GF_EXPORT
 void gf_scene_select_object(GF_Scene *scene, GF_ObjectManager *odm)
 {
@@ -2107,6 +2113,24 @@
 	else if (check_odm_deactivate(&scene->subs_url, odm, gf_sg_find_node_by_name(scene->graph, "DYN_SUBT_IMG") )) pre_selected=GF_TRUE;
 	if (pre_selected) {
 		if (odm->state) {
+			if (odm->pid) {
+				const GF_PropertyValue *p = gf_filter_pid_get_property(odm->pid, GF_PROP_PID_FORCED_SUB);
+				if (p && p->value.uint) {
+					if (p->value.uint==2) return;
+					//toggle forced on/off
+					GF_FilterEvent evt;
+					GF_FEVT_INIT(evt, GF_FEVT_QUALITY_SWITCH, odm->pid);
+					if (odm->flags & GF_ODM_SUB_FORCED) {
+						evt.quality_switch.up = 0;
+						odm->flags &= ~GF_ODM_SUB_FORCED;
+					} else {
+						evt.quality_switch.up = 1;
+						odm->flags |= GF_ODM_SUB_FORCED;
+					}
+					gf_filter_pid_send_event(odm->pid, &evt);
+					return;
+				}
+			}
 			gf_odm_stop(odm, GF_FALSE);
 		} else {
 			gf_odm_play(odm);
@@ -3227,8 +3251,8 @@
 		addon->media_pts = addon_time->media_pts;
 		addon->media_timestamp = addon_time->media_timestamp;
 		addon->media_timescale = addon_time->media_timescale;
-		assert(addon_time->media_timescale);
-		assert(!addon->loop_detected);
+		gf_assert(addon_time->media_timescale);
+		gf_assert(!addon->loop_detected);
 	}
 
 	if (!addon->timeline_ready) {
@@ -3277,7 +3301,7 @@
 	addon->media_pts = addon->past_media_pts;
 	addon->media_timestamp = addon->past_media_timestamp;
 	addon->media_timescale = addon->past_media_timescale;
-	assert(addon->past_media_timescale);
+	gf_assert(addon->past_media_timescale);
 	addon->past_media_pts = 0;
 	addon->past_media_timestamp = 0;
 	addon->past_media_timescale = 0;
@@ -3329,7 +3353,7 @@
 s64 gf_scene_adjust_timestamp_for_addon(GF_AddonMedia *addon, u64 orig_ts)
 {
 	s64 media_ts_ms;
-	assert(addon->timeline_ready);
+	gf_assert(addon->timeline_ready);
 	if (addon->is_splicing) {
 		if (!addon->min_dts_set || (orig_ts<addon->splice_min_dts)) {
 			addon->splice_min_dts = orig_ts;
@@ -3375,3 +3399,5 @@
 			gf_scene_switch_quality(odm->subscene, up);
 	}
 }
+
+#endif //!defined(GPAC_DISABLE_COMPOSITOR)

gpac-2.2.1.tar.gz/src/compositor/scene_node_init.c -> gpac-2.4.0.tar.gz/src/compositor/scene_node_init.c Changed

gpac-2.2.1.tar.gz/src/compositor/scene_ns.c -> gpac-2.4.0.tar.gz/src/compositor/scene_ns.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2022
+ *			Copyright (c) Telecom ParisTech 2000-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / Scene Compositor sub-project
@@ -26,17 +26,19 @@
 #include <gpac/internal/compositor_dev.h>
 #include <gpac/network.h>
 
+#if !defined(GPAC_DISABLE_COMPOSITOR)
+
 
 Bool scene_ns_on_setup_error(GF_Filter *failed_filter, void *udta, GF_Err err)
 {
 	GF_SceneNamespace *scene_ns;
 	GF_Scene *scene;
 	GF_ObjectManager *root = (GF_ObjectManager *)udta;
-	assert(root);
+	if (!root) return GF_FALSE;;
 	scene_ns = root->scene_ns;
-	assert(scene_ns);
+	gf_fatal_assert(scene_ns);
 	scene = root->subscene ? root->subscene : root->parentscene;
-	assert(scene);
+	gf_fatal_assert(scene);
 
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPTIME, ("ODM Service connection failure received from %s - %s\n", scene_ns->url, gf_error_to_string(err) ));
 
@@ -498,7 +500,7 @@
 		return;
 	}
 	odm->scene_ns->nb_odm_users++;
-	assert(odm->scene_ns->owner == odm);
+	gf_assert(odm->scene_ns->owner == odm);
 
 	if (frag && !odm->scene_ns->url_frag) {
 		odm->scene_ns->url_frag = gf_strdup(frag+1);
@@ -590,3 +592,5 @@
 	/*OK connect*/
 	gf_odm_service_media_event(odm, GF_EVENT_MEDIA_SETUP_BEGIN);
 }
+
+#endif //!defined(GPAC_DISABLE_COMPOSITOR)

gpac-2.2.1.tar.gz/src/compositor/svg_base.c -> gpac-2.4.0.tar.gz/src/compositor/svg_base.c Changed

gpac-2.2.1.tar.gz/src/compositor/svg_external.c -> gpac-2.4.0.tar.gz/src/compositor/svg_external.c Changed

gpac-2.2.1.tar.gz/src/compositor/svg_filters.c -> gpac-2.4.0.tar.gz/src/compositor/svg_filters.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean le Feuvre
- *			Copyright (c) Telecom ParisTech 2005-2012
+ *			Copyright (c) Telecom ParisTech 2005-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / Scene Compositor sub-project
@@ -25,7 +25,9 @@
 
 #include "visual_manager.h"
 
-#ifndef GPAC_DISABLE_SVG
+
+#if !defined(GPAC_DISABLE_SVG) &&  !defined(GPAC_DISABLE_COMPOSITOR)
+
 #include "nodes_stacks.h"
 #include "texturing.h"
 
@@ -105,10 +107,10 @@
 			else ptr = source->data+3;
 			break;
 		}
+		if (!ptr) return;
 
 		if ((type==SVG_FILTER_TRANSFER_LINEAR) && (intercept || (slope!=FIX_ONE)) ) {
 			intercept *= 255;
-			assert( ptr );
 			for (i=0; i<source->height; i++) {
 				for (j=0; j<source->width; j++) {
 					Fixed p = (*ptr) * slope + intercept;
@@ -117,7 +119,6 @@
 				}
 			}
 		} else if (type==SVG_FILTER_TRANSFER_GAMMA) {
-			assert( ptr );
 			for (i=0; i<source->height; i++) {
 				for (j=0; j<source->width; j++) {
 					Fixed p = 255 * gf_mulfix(amplitude,  FLT2FIX( pow( INT2FIX(*ptr)/255, FIX2FLT(exponent) ) ) ) + offset;
@@ -128,7 +129,6 @@
 		} else if ((type==SVG_FILTER_TRANSFER_TABLE) && table && (gf_list_count(table)>=2) ) {
 			u32 count = gf_list_count(table);
 			u32 N = count-1;
-			assert( ptr );
 			for (i=0; i<source->height; i++) {
 				for (j=0; j<source->width; j++) {
 					SVG_Number *vk, *vk1;
@@ -145,7 +145,6 @@
 			}
 		} else if ((type==SVG_FILTER_TRANSFER_DISCRETE) && table && gf_list_count(table) ) {
 			u32 count = gf_list_count(table);
-			assert( ptr );
 			for (i=0; i<source->height; i++) {
 				for (j=0; j<source->width; j++) {
 					SVG_Number *vk;
@@ -202,7 +201,7 @@
 	GF_Matrix2D backup;
 	SVGAllAttributes all_atts;
 	GF_FilterStack *st = gf_node_get_private(filter);
-	assert(tr_state->traversing_mode==TRAVERSE_SORT);
+	gf_assert(tr_state->traversing_mode==TRAVERSE_SORT);
 
 	/*store the current transform matrix, create a new one for group_cache*/
 	gf_mx2d_copy(backup, tr_state->transform);
@@ -446,6 +445,4 @@
 
 #endif //GPAC_ENABLE_SVG_FILTERS
 
-#endif
-
-
+#endif // !defined(GPAC_DISABLE_SVG) &&  !defined(GPAC_DISABLE_COMPOSITOR)

gpac-2.2.1.tar.gz/src/compositor/svg_font.c -> gpac-2.4.0.tar.gz/src/compositor/svg_font.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2007-2012
+ *			Copyright (c) Telecom ParisTech 2007-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / Scene Compositor sub-project
@@ -25,7 +25,7 @@
 
 #include <gpac/utf.h>
 
-#ifndef GPAC_DISABLE_SVG
+#if !defined(GPAC_DISABLE_SVG) &&  !defined(GPAC_DISABLE_COMPOSITOR)
 
 #include "visual_manager.h"
 #include "nodes_stacks.h"
@@ -195,8 +195,8 @@
 static void svg_font_on_load(GF_Node *handler, GF_DOM_Event *event, GF_Node *observer)
 {
 	GF_Font *font;
-	assert(event->currentTarget->ptr_type==GF_DOM_EVENT_TARGET_NODE);
-	assert(gf_node_get_tag((GF_Node*)event->currentTarget->ptr)==TAG_SVG_font);
+	gf_assert(event->currentTarget->ptr_type==GF_DOM_EVENT_TARGET_NODE);
+	gf_assert(gf_node_get_tag((GF_Node*)event->currentTarget->ptr)==TAG_SVG_font);
 	font = gf_node_get_private((GF_Node*)event->currentTarget->ptr);
 	font->not_loaded = 0;
 
@@ -562,5 +562,4 @@
 }
 
 
-#endif /*GPAC_DISABLE_SVG*/
-
+#endif //!defined(GPAC_DISABLE_SVG) &&  !defined(GPAC_DISABLE_COMPOSITOR)

gpac-2.2.1.tar.gz/src/compositor/svg_geometry.c -> gpac-2.4.0.tar.gz/src/compositor/svg_geometry.c Changed

gpac-2.2.1.tar.gz/src/compositor/svg_grouping.c -> gpac-2.4.0.tar.gz/src/compositor/svg_grouping.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Cyril Concolato - Jean le Feuvre
- *			Copyright (c) Telecom ParisTech 2005-2012
+ *			Copyright (c) Telecom ParisTech 2005-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / Scene Compositor sub-project
@@ -25,7 +25,8 @@
 
 #include "visual_manager.h"
 
-#ifndef GPAC_DISABLE_SVG
+#if !defined(GPAC_DISABLE_SVG) &&  !defined(GPAC_DISABLE_COMPOSITOR)
+
 #include "nodes_stacks.h"
 #include "offscreen_cache.h"
 
@@ -62,7 +63,7 @@
 	Fixed scale, vp_w, vp_h;
 	Fixed parent_width, parent_height, doc_width, doc_height;
 
-	/*canvas size negociation has already been done when attaching the scene to the compositor*/
+	/*canvas size negotiation has already been done when attaching the scene to the compositor*/
 	if (atts->width && (atts->width->type==SVG_NUMBER_PERCENTAGE) ) {
 		parent_width = gf_mulfix(tr_state->vp_size.x, atts->width->value/100);
 		doc_width = 0;
@@ -921,7 +922,7 @@
 
 	if (event->event_phase & GF_DOM_EVENT_PHASE_PREVENT) return;
 
-	assert(gf_node_get_tag((GF_Node*)event->currentTarget->ptr)==TAG_SVG_a);
+	gf_assert(gf_node_get_tag((GF_Node*)event->currentTarget->ptr)==TAG_SVG_a);
 	a = (SVG_Element *) event->currentTarget->ptr;
 	gf_svg_flatten_attributes(a, &all_atts);
 
@@ -1442,6 +1443,4 @@
 #endif
 
 
-#endif
-
-
+#endif //!defined(GPAC_DISABLE_SVG) &&  !defined(GPAC_DISABLE_COMPOSITOR)

gpac-2.2.1.tar.gz/src/compositor/svg_media.c -> gpac-2.4.0.tar.gz/src/compositor/svg_media.c Changed

gpac-2.2.1.tar.gz/src/compositor/svg_paint_servers.c -> gpac-2.4.0.tar.gz/src/compositor/svg_paint_servers.c Changed

gpac-2.2.1.tar.gz/src/compositor/svg_text.c -> gpac-2.4.0.tar.gz/src/compositor/svg_text.c Changed

gpac-2.2.1.tar.gz/src/compositor/texturing.c -> gpac-2.4.0.tar.gz/src/compositor/texturing.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2022
+ *			Copyright (c) Telecom ParisTech 2000-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / Scene Compositor sub-project
@@ -25,6 +25,8 @@
 
 #include "texturing.h"
 
+#if !defined(GPAC_DISABLE_COMPOSITOR)
+
 #include "nodes_stacks.h"
 
 static void update_texture_void(GF_TextureHandler *txh)
@@ -49,14 +51,18 @@
 GF_EXPORT
 void gf_sc_texture_destroy(GF_TextureHandler *txh)
 {
+#ifndef GPAC_DISABLE_THREADS
 	GF_Compositor *compositor = txh->compositor;
 	Bool lock = gf_mx_try_lock(compositor->mx);
+#endif
 
 	gf_sc_texture_release(txh);
 	if (txh->is_open) gf_sc_texture_stop(txh);
 	gf_list_del_item(txh->compositor->textures, txh);
 
+#ifndef GPAC_DISABLE_THREADS
 	if (lock) gf_mx_v(compositor->mx);
+#endif
 }
 
 GF_EXPORT
@@ -343,8 +349,8 @@
 void gf_sc_texture_release_stream(GF_TextureHandler *txh)
 {
 	txh->needs_refresh = 0;
+	if (!txh->stream) return;
 	if (txh->needs_release) {
-		assert(txh->stream);
 		gf_mo_release_data(txh->stream, 0xFFFFFFFF, (txh->needs_release==2) ? 3 :0);
 		if (txh->needs_release==2) {
 			txh->last_frame_time = -1;
@@ -353,7 +359,7 @@
 		txh->frame_ifce = NULL;
 
 	}
-	if (txh->stream) txh->stream->config_changed = GF_FALSE;
+	txh->stream->config_changed = GF_FALSE;
 }
 
 
@@ -413,3 +419,5 @@
 		return NULL;
 	}
 }
+
+#endif //!defined(GPAC_DISABLE_COMPOSITOR)

gpac-2.2.1.tar.gz/src/compositor/texturing_gl.c -> gpac-2.4.0.tar.gz/src/compositor/texturing_gl.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2022
+ *			Copyright (c) Telecom ParisTech 2000-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / Scene Compositor sub-project
@@ -29,6 +29,7 @@
 #include "nodes_stacks.h"
 #include "gl_inc.h"
 
+#if !defined(GPAC_DISABLE_COMPOSITOR)
 
 
 /*tx flags*/
@@ -198,13 +199,11 @@
 
 GF_Err gf_sc_texture_set_data(GF_TextureHandler *txh)
 {
-#ifndef GPAC_DISABLE_3D
+#if !defined(GPAC_DISABLE_3D) && !defined(GPAC_USE_TINYGL) && !defined(GPAC_USE_GLES1X) && !defined(GPAC_USE_GLES2)
 	u8 *data=NULL;
 	GF_FilterFrameInterface *fifce = txh->frame_ifce;
-#endif
 	txh->tx_io->flags |= TX_NEEDS_RASTER_LOAD | TX_NEEDS_HW_LOAD;
 
-#ifndef GPAC_DISABLE_3D
 	data = txh->data;
 	//10->8 bit conversion
 	if (txh->flags & TX_CONV_8BITS) {
@@ -240,10 +239,7 @@
 		fifce = NULL;
 		data = dst.video_buffer;
 	}
-#endif
-
 
-#if !defined(GPAC_DISABLE_3D) && !defined(GPAC_USE_TINYGL) && !defined(GPAC_USE_GLES1X) && !defined(GPAC_USE_GLES2)
 	//PBO mode: start pushing the texture
 	if (data && !fifce && (txh->tx_io->tx.pbo_state!=GF_GL_PBO_NONE)) {
 		txh->tx_io->tx.pbo_state = GF_GL_PBO_PUSH;
@@ -397,8 +393,11 @@
 
 static Bool tx_setup_format(GF_TextureHandler *txh)
 {
+#ifndef GPAC_USE_GLES2
 	u32 npow_w, npow_h;
-	Bool is_pow2, use_rect, flip;
+	Bool is_pow2;
+#endif
+	Bool use_rect, flip;
 	GF_Compositor *compositor = (GF_Compositor *)txh->compositor;
 
 	/*first setup, this will force recompute bounds in case used with bitmap - we could refine and only
@@ -406,11 +405,12 @@
 	if (txh->owner)
 		gf_node_dirty_set(txh->owner, 0, 1);
 
+	flip = (txh->tx_io->flags & TX_IS_FLIPPED);
+#ifndef GPAC_USE_GLES2
 	npow_w = gf_get_next_pow2(txh->width);
 	npow_h = gf_get_next_pow2(txh->height);
-
-	flip = (txh->tx_io->flags & TX_IS_FLIPPED);
 	is_pow2 = ((npow_w==txh->width) && (npow_h==txh->height)) ? 1 : 0;
+#endif
 	txh->tx_io->flags = 0;
 	txh->tx_io->gl_type = GL_TEXTURE_2D;
 
@@ -480,6 +480,7 @@
 	case GF_PIXEL_VYUY:
 	case GF_PIXEL_UYVY:
 	case GF_PIXEL_GL_EXTERNAL:
+	case GF_PIXEL_YUV444_PACK:
 	case GF_PIXEL_YUV444_10_PACK:
 	case GF_PIXEL_V210:
 #if !defined(GPAC_USE_TINYGL) && !defined(GPAC_USE_GLES1X)
@@ -601,8 +602,7 @@
 			txh->tx_io->conv_data = gf_malloc(sizeof(char)*txh->stride*txh->height);
 			txh->tx_io->conv_format = txh->pixelformat;
 		}
-		assert(txh->tx_io->conv_data );
-		assert(txh->data );
+		if (!txh->tx_io->conv_data || txh->data) return 0;
 		/*if texture is using RECT extension, flip image manually because
 				texture transforms are not supported in this case ...*/
 		for (i=0; i<txh->height; i++) {
@@ -1315,3 +1315,4 @@
 	}
 }
 
+#endif //!defined(GPAC_DISABLE_COMPOSITOR)

gpac-2.2.1.tar.gz/src/compositor/visual_manager.c -> gpac-2.4.0.tar.gz/src/compositor/visual_manager.c Changed

gpac-2.2.1.tar.gz/src/compositor/visual_manager_2d.c -> gpac-2.4.0.tar.gz/src/compositor/visual_manager_2d.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2022
+ *			Copyright (c) Telecom ParisTech 2000-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / Scene Compositor sub-project
@@ -28,6 +28,8 @@
 #include "visual_manager.h"
 #include "nodes_stacks.h"
 
+#if !defined(GPAC_DISABLE_COMPOSITOR)
+
 //#define SKIP_CONTEXT
 
 Bool gf_irect_overlaps(GF_IRect *rc1, GF_IRect *rc2)
@@ -87,7 +89,6 @@
 		visual->num_nodes_current_frame ++;
 		return visual->context;
 	}
-//	assert(visual->cur_context);
 	/*current context is OK*/
 	if (!visual->cur_context->drawable) {
 		/*reset next context in display list for next call*/
@@ -98,7 +99,6 @@
 	/*need a new context and next one is OK*/
 	if (visual->cur_context->next) {
 		visual->cur_context = visual->cur_context->next;
-//		assert(visual->cur_context->drawable == NULL);
 		/*reset next context in display list for next call*/
 		if (visual->cur_context->next) visual->cur_context->next->drawable = NULL;
 		drawctx_reset(visual->cur_context);
@@ -131,7 +131,7 @@
 
 void visual_2d_remove_last_context(GF_VisualManager *visual)
 {
-	assert(visual->cur_context);
+	gf_assert(visual->cur_context);
 	visual->cur_context->drawable = NULL;
 }
 
@@ -376,34 +376,13 @@
 /*is list empty*/
 #define ra_is_empty(ra) (!((ra)->count))
 
-/*adds @rc2 to @rc1 - the new @rc1 contains the old @rc1 and @rc2*/
-GF_EXPORT
-void gf_irect_union(GF_IRect *rc1, GF_IRect *rc2)
-{
-	if (!rc1->width || !rc1->height) {
-		*rc1=*rc2;
-		return;
-	}
-
-	if (rc2->x < rc1->x) {
-		rc1->width += rc1->x - rc2->x;
-		rc1->x = rc2->x;
-	}
-	if (rc2->x + rc2->width > rc1->x+rc1->width) rc1->width = rc2->x + rc2->width - rc1->x;
-	if (rc2->y > rc1->y) {
-		rc1->height += rc2->y - rc1->y;
-		rc1->y = rc2->y;
-	}
-	if (rc2->y - rc2->height < rc1->y - rc1->height) rc1->height = rc1->y - rc2->y + rc2->height;
-}
-
 
 /*adds rectangle to the list performing union test*/
 void ra_union_rect(GF_RectArray *ra, GF_IRect *rc)
 {
 	u32 i;
 
-	assert(rc->width && rc->height);
+	gf_assert(rc->width && rc->height);
 
 	for (i=0; i<ra->count; i++) {
 		if (gf_irect_overlaps(&ra->listi.rect, rc)) {
@@ -477,7 +456,7 @@
 	Bool is_transparent = 1;
 #endif
 	GF_IRect *rc = &ctx->bi->clip;
-	assert(rc->width && rc->height);
+	gf_assert(rc->width && rc->height);
 
 	/*node is modified*/
 	needs_redraw = (ctx->flags & CTX_REDRAW_MASK) ? 1 : 0;
@@ -655,7 +634,6 @@
 		drawctx_update_info(ctx, visual);
 		if (!redraw_all) {
 			u32 res;
-//			assert( gf_irect_inside(&visual->top_clipper, &ctx->bi->clip) );
 			res = register_context_rect(&visual->to_redraw, ctx, num_nodes, &first_opaque);
 			if (res) {
 				num_changed ++;
@@ -675,7 +653,6 @@
 	while (it) {
 		while (drawable_get_previous_bound(it->drawable, &refreshRect, visual)) {
 			if (!redraw_all) {
-				//assert( gf_irect_inside(&visual->top_clipper, &refreshRect) );
 				gf_irect_intersect(&refreshRect, &visual->top_clipper);
 				register_dirty_rect(&visual->to_redraw, &refreshRect);
 				has_clear=1;
@@ -817,7 +794,7 @@
 
 		for (i=0; i<visual->to_redraw.count; i++) {
 			GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPOSE, ("\tDirtyRect #%d: %d:%d@%dx%d\n", i+1, visual->to_redraw.listi.rect.x, visual->to_redraw.listi.rect.y, visual->to_redraw.listi.rect.width, visual->to_redraw.listi.rect.height));
-			assert(visual->to_redraw.listi.rect.width);
+			gf_assert(visual->to_redraw.listi.rect.width);
 		}
 	}
 #endif
@@ -987,3 +964,5 @@
 	gf_mx2d_copy(tr_state->transform, backup);
 }
 
+
+#endif //!defined(GPAC_DISABLE_COMPOSITOR)

gpac-2.2.1.tar.gz/src/compositor/visual_manager_2d.h -> gpac-2.4.0.tar.gz/src/compositor/visual_manager_2d.h Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2012
+ *			Copyright (c) Telecom ParisTech 2000-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / Scene Compositor sub-project
@@ -63,7 +63,7 @@
 
 /*adds rect to list - expand if needed*/
 #define ra_add(ra, rc) {	\
-	assert((rc)->width); 	\
+	gf_assert((rc)->width); 	\
 	if ((ra)->count==(ra)->alloc) { \
 		(ra)->alloc += RA_DEFAULT_STEP; \
 		(ra)->list = (GF_RectArrayEntry*)gf_realloc((ra)->list, sizeof(GF_RectArrayEntry) * (ra)->alloc); \
@@ -76,10 +76,6 @@
 /*refreshes the content of the array to have only non-overlapping rects*/
 void ra_refresh(GF_RectArray *ra);
 
-
-/*adds @rc2 to @rc1 - the new @rc1 contains the old @rc1 and @rc2*/
-void gf_irect_union(GF_IRect *rc1, GF_IRect *rc2);
-
 struct _drawable_store
 {
 	struct _drawable *drawable;
@@ -114,7 +110,7 @@
 void visual_2d_draw_path(GF_VisualManager *visual, GF_Path *path, DrawableContext *ctx, GF_EVGStencil * brush, GF_EVGStencil * pen, GF_TraverseState *tr_state);
 /*special texturing extension for text, using a given path (text rectangle) and texture*/
 void visual_2d_texture_path_text(GF_VisualManager *visual, DrawableContext *txt_ctx, GF_Path *path, GF_Rect *object_bounds, GF_TextureHandler *txh, GF_TraverseState *tr_state);
-/*fill given rect with given color with given ctx transform and clipper (used for text hilighting only)
+/*fill given rect with given color with given ctx transform and clipper (used for text highlighting only)
 if rc is NULL, fills object bounds*/
 void visual_2d_fill_rect(GF_VisualManager *visual, DrawableContext *ctx, GF_Rect *rc, u32 color, u32 strike_color, GF_TraverseState *tr_state);

gpac-2.2.1.tar.gz/src/compositor/visual_manager_2d_draw.c -> gpac-2.4.0.tar.gz/src/compositor/visual_manager_2d_draw.c Changed

gpac-2.2.1.tar.gz/src/compositor/visual_manager_3d.c -> gpac-2.4.0.tar.gz/src/compositor/visual_manager_3d.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2022
+ *			Copyright (c) Telecom ParisTech 2000-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / Scene Compositor sub-project
@@ -29,9 +29,7 @@
 #include "texturing.h"
 #include "nodes_stacks.h"
 
-#ifndef GPAC_DISABLE_3D
-
-
+#if !defined(GPAC_DISABLE_3D) && !defined(GPAC_DISABLE_COMPOSITOR)
 
 /*generic drawable 3D constructor/destructor*/
 Drawable3D *drawable_3d_new(GF_Node *node)
@@ -727,7 +725,7 @@
 	Drawable3DContext *ctx;
 	Drawable3D *drawable;
 
-	assert(tr_state->traversing_mode == TRAVERSE_SORT);
+	gf_assert(tr_state->traversing_mode == TRAVERSE_SORT);
 
 	drawable = (Drawable3D*)gf_node_get_private(geometry);
 
@@ -1026,7 +1024,7 @@
 	Bool go;
 	Fixed diff, pos_diff;
 
-	assert(tr_state->visual && tr_state->camera);
+	if (!tr_state->visual || !tr_state->camera) return;
 	/*don't collide on VP animations or when modes discard collision*/
 	if ((tr_state->camera->anim_len && !tr_state->camera->jumping) || !tr_state->visual->compositor->collide_mode || (tr_state->camera->navigate_mode>=GF_NAVIGATE_EXAMINE)) {
 		/*reset ground flag*/
@@ -1176,7 +1174,7 @@
 	SFVec3f cdiff, vertices8;
 
 	if (!tr_state->camera || (tr_state->cull_flag == CULL_INSIDE)) return 1;
-	assert(tr_state->cull_flag != CULL_OUTSIDE);
+	gf_assert(tr_state->cull_flag != CULL_OUTSIDE);
 
 	/*empty bounds*/
 	if (!bbox->is_set) {
@@ -2199,5 +2197,4 @@
 	visual->fog_visibility = visibility;
 }
 
-#endif
-
+#endif //!defined(GPAC_DISABLE_3D) && !defined(GPAC_DISABLE_COMPOSITOR)

gpac-2.2.1.tar.gz/src/compositor/visual_manager_3d.h -> gpac-2.4.0.tar.gz/src/compositor/visual_manager_3d.h Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2012
+ *			Copyright (c) Telecom ParisTech 2000-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / Scene Compositor sub-project
@@ -235,7 +235,7 @@
 /*setup rectangular cliper (clip: top-left, width, height)
 NOTE: 2D clippers can only be set from a 2D context, and will always use glScissor.
 In order to allow multiple Layer2D in Layer2D, THERE IS ALWAYS AT MOST ONE 2D CLIPPER USED AT ANY TIME,
-it is the caller responsability to restore previous 2D clipers
+it is the caller responsibility to restore previous 2D clipers
 
 the matrix is not copied, care should be taken to keep it unmodified until the cliper is reset (unless desired otherwise)
 if NULL, no specific clipping transform will be used*/
@@ -290,7 +290,7 @@
 
 /*set fog*/
 void visual_3d_set_fog(GF_VisualManager *visual, const char *type, SFColor color, Fixed density, Fixed visibility);
-/*fill given rect with given color (used for text hilighting only) - context shall not be altered*/
+/*fill given rect with given color (used for text highlighting only) - context shall not be altered*/
 void visual_3d_fill_rect(GF_VisualManager *visual, GF_Rect rc, SFColorRGBA color);
 
 void visual_3d_point_sprite(GF_VisualManager *visual, Drawable *stack, GF_TextureHandler *txh, GF_TraverseState *tr_state);

gpac-2.2.1.tar.gz/src/compositor/visual_manager_3d_gl.c -> gpac-2.4.0.tar.gz/src/compositor/visual_manager_3d_gl.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2022
+ *			Copyright (c) Telecom ParisTech 2000-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / Scene Compositor sub-project
@@ -26,7 +26,7 @@
 #include "visual_manager.h"
 #include "texturing.h"
 
-#ifndef GPAC_DISABLE_3D
+#if !defined(GPAC_DISABLE_3D) && !defined(GPAC_DISABLE_COMPOSITOR)
 
 #include <gpac/nodes_mpeg4.h>
 #include "gl_inc.h"
@@ -2423,7 +2423,7 @@
 	//setup mesh normal vertex attribute - only available for some shaders
 	if (!visual->has_material_2d && num_lights && (mesh->mesh_type==MESH_TRIANGLES) ) {
 		GF_Matrix normal_mx;
-		assert(flags & GF_GL_HAS_LIGHT);
+		gf_assert(flags & GF_GL_HAS_LIGHT);
 
 		gf_mx_copy(normal_mx, tr_state->camera->modelview);
 		gf_mx_add_matrix(&normal_mx, &tr_state->model_matrix);
@@ -3021,10 +3021,11 @@
 }
 
 
+#if !defined(GPAC_USE_GLES2)
 /*note we don't perform any culling for normal drawing...*/
 static void visual_3d_draw_normals(GF_TraverseState *tr_state, GF_Mesh *mesh)
 {
-#if !defined( GPAC_USE_TINYGL) && !defined(GPAC_USE_GLES2)
+#if !defined( GPAC_USE_TINYGL)
 
 	GF_Vec pt, end;
 	u32 i, j;
@@ -3102,6 +3103,7 @@
 
 #endif	/*GPAC_USE_TINYGL*/
 }
+#endif //GPAC_USE_GLES2
 
 
 void visual_3d_draw_aabb_nodeBounds(GF_TraverseState *tr_state, AABBNode *node)
@@ -3963,7 +3965,7 @@
 		glGenRenderbuffers(1, depth_id);
 
 	glBindRenderbuffer(GL_RENDERBUFFER, *depth_id);
-#if defined(GPAC_CONFIG_IOS) ||  defined(GPAC_CONFIG_ANDROID)
+#if defined(GPAC_CONFIG_IOS) ||  defined(GPAC_CONFIG_ANDROID) || defined(GPAC_USE_GLES2)
 	glRenderbufferStorage(GL_RENDERBUFFER, GL_DEPTH_COMPONENT16, width, height);
 #else
 	glRenderbufferStorage(GL_RENDERBUFFER, GL_DEPTH_COMPONENT24, width, height);
@@ -4024,4 +4026,4 @@
 	glGetError();
 }
 
-#endif // GPAC_DISABLE_3D
+#endif //!defined(GPAC_DISABLE_3D) && !defined(GPAC_DISABLE_COMPOSITOR)

gpac-2.2.1.tar.gz/src/compositor/x3d_geometry.c -> gpac-2.4.0.tar.gz/src/compositor/x3d_geometry.c Changed

gpac-2.2.1.tar.gz/src/crypto/tiny_aes.c -> gpac-2.4.0.tar.gz/src/crypto/tiny_aes.c Changed

gpac-2.2.1.tar.gz/src/evg/ftgrays.c -> gpac-2.4.0.tar.gz/src/evg/ftgrays.c Changed

@@ -63,10 +63,13 @@
 		* bypassed Y-sorting of cells by using an array of scanlines: a bit more consuming
 		in memory, but faster cell sorting (X-sorting only)
 		* deferred coverage push for 3D
+		* threading support
 */
 
 #include "rast_soft.h"
 
+#ifndef GPAC_DISABLE_EVG
+
 
 void gray_record_cell(GF_EVGSurface *surf)
 {
@@ -583,7 +586,7 @@
 
 		span = raster->gray_spans;
 	} else {
-		if (count==raster->alloc_gray_spans) {
+		if ((u32) count==raster->alloc_gray_spans) {
 			raster->alloc_gray_spans*=2;
 			raster->gray_spans = gf_realloc(raster->gray_spans, sizeof(EVG_Span)*raster->alloc_gray_spans);
 			span = raster->gray_spans + count - 1;
@@ -617,7 +620,7 @@
 		x      = start->x;
 		area   = start->area;
 		cover += start->cover;
-		assert(sl->num);
+
 		/* accumulate all start cells */
 		while(--sl->num) {
 			++cur ;
@@ -669,7 +672,7 @@
 	EVGRasterCtx *rctx = par;
 
 	while (rctx->th_state == 1) {
-		u32 i, nb_lines=0;
+		u32 i;
 		u32 first_patch, last_patch;
 
 		//only for threads, wait for start raster event
@@ -704,7 +707,6 @@
 					if (first_patch > i) first_patch = i;
 					if (last_patch < i) last_patch = i;
 				}
-				nb_lines++;
 			}
 			if (!th_fetch_lines(rctx))
 				break;
@@ -737,15 +739,19 @@
 		if (surf->frag_shader_init)
 			surf->frag_shader_init(surf->frag_shader_udta, &surf->raster_ctx.frag_param, 0, GF_FALSE);
 
+#ifndef GPAC_DISABLE_THREADS
 		//shaders are not thread-safe yet
 		for (i=0; i<surf->nb_threads; i++) {
 			surf->th_raster_ctxi.frag_param = *fparam;
 			if (surf->frag_shader_init)
 				surf->frag_shader_init(surf->frag_shader_udta, &surf->th_raster_ctxi.frag_param, i+1, GF_FALSE);
 		}
+#endif
 	}
 
+#ifndef GPAC_DISABLE_THREADS
 	if (!surf->nb_threads) {
+#endif
 		for (i=surf->first_scanline; i<size_y; i++) {
 			AAScanline *sl = &surf->scanlinesi;
 			if (sl->num) {
@@ -762,6 +768,7 @@
 			}
 		}
 		return GF_OK;
+#ifndef GPAC_DISABLE_THREADS
 	}
 
 	surf->raster_ctx.fill_rule = fill_rule;
@@ -825,6 +832,7 @@
 	}
 
 	return GF_OK;
+#endif
 }
 
 
@@ -884,3 +892,4 @@
 
 
 /* END */
+#endif //GPAC_DISABLE_EVG

gpac-2.2.1.tar.gz/src/evg/rast_soft.h -> gpac-2.4.0.tar.gz/src/evg/rast_soft.h Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2022
+ *			Copyright (c) Telecom ParisTech 2000-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / software 2D rasterizer
@@ -30,6 +30,8 @@
 
 #include <gpac/evg.h>
 
+#ifndef GPAC_DISABLE_EVG
+
 typedef struct _traster_ctx EVGRasterCtx;
 
 /*base stencil stack*/
@@ -73,7 +75,7 @@
 
 typedef void (*EVG_SpanFunc)(int y, int count, EVG_Span *spans, GF_EVGSurface *surf, EVGRasterCtx *rctx);
 
-GF_Err evg_sweep_lines(GF_EVGSurface *surf, u32 size_y, Bool zero_non_zero_rule, Bool is_tri_raster, GF_EVGFragmentParam *fparam);
+GF_Err evg_sweep_lines(GF_EVGSurface *surf, u32 size_y, u32 zero_non_zero_rule, Bool is_tri_raster, GF_EVGFragmentParam *fparam);
 
 GF_Err evg_raster_render(GF_EVGSurface *surf);
 
@@ -536,8 +538,10 @@
 	EVG_Surface3DExt *ext3d;
 
 	EVGRasterCtx raster_ctx;
+#ifndef GPAC_DISABLE_THREADS
 	EVGRasterCtx *th_raster_ctx;
 	u32 nb_threads;
+#endif
 	GF_Mutex *raster_mutex;
 	GF_Semaphore *raster_sem;
 	u32 last_dispatch_line;
@@ -601,5 +605,7 @@
 GF_Err gf_evg_setup_multi_texture(GF_EVGSurface *surf, GF_EVGMultiTextureMode operand, GF_EVGStencil *sten2, GF_EVGStencil *sten3, Float *params);
 
 
+#endif // GPAC_DISABLE_EVG
+
 #endif

gpac-2.2.1.tar.gz/src/evg/raster3d.c -> gpac-2.4.0.tar.gz/src/evg/raster3d.c Changed

gpac-2.2.1.tar.gz/src/evg/raster_565.c -> gpac-2.4.0.tar.gz/src/evg/raster_565.c Changed

gpac-2.2.1.tar.gz/src/evg/raster_argb.c -> gpac-2.4.0.tar.gz/src/evg/raster_argb.c Changed

gpac-2.2.1.tar.gz/src/evg/raster_rgb.c -> gpac-2.4.0.tar.gz/src/evg/raster_rgb.c Changed

gpac-2.2.1.tar.gz/src/evg/raster_yuv.c -> gpac-2.4.0.tar.gz/src/evg/raster_yuv.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2019
+ *			Copyright (c) Telecom ParisTech 2019-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / software 2D rasterizer module
@@ -27,6 +27,8 @@
 
 #include "rast_soft.h"
 
+#ifndef GPAC_DISABLE_EVG
+
 //TODO: support for color spaces, support for more than 10 bits and BigEndian format ?
 
 #if 1
@@ -444,6 +446,8 @@
 		u32 a, a11, a12, a21, a22;
 		u32 idx1 = 3*i;
 		u32 idx2 = idx1 + 3;
+		gf_assert(idx1 < surf->uv_alpha_alloc );
+		gf_assert(idx2 < surf->uv_alpha_alloc );
 		//get alpha
 		a11 = (u32)rctx->uv_alphaidx1;
 		a12 = (u32)rctx->uv_alphaidx2;
@@ -590,7 +594,7 @@
 
 	gf_evg_rgb_to_yuv(surf, col, &cy, &cb, &cr);
 
-	if (!rc.x && !rc.y && (rc.width==_surf->width) && (rc.height==_surf->height)) {
+	if (!rc.x && !rc.y && ((u32) rc.width==_surf->width) && ((u32) rc.height==_surf->height)) {
 		memset(pY, cy, _surf->pitch_y * _surf->height);
 		memset(pU, cb, _surf->pitch_y/2 * _surf->height/2);
 		memset(pV, cr, _surf->pitch_y/2 * _surf->height/2);
@@ -887,7 +891,7 @@
 
 	gf_evg_rgb_to_yuv(surf, col, &cy, &cb, &cr);
 
-	if (!rc.x && !rc.y && (rc.width==_surf->width) && (rc.height==_surf->height)) {
+	if (!rc.x && !rc.y && ((u32) rc.width==_surf->width) && ((u32) rc.height==_surf->height)) {
 		memset(pY, cy, _surf->pitch_y * _surf->height);
 		memset(pU, cb, _surf->pitch_y/2 * _surf->height);
 		memset(pV, cr, _surf->pitch_y/2 * _surf->height);
@@ -1070,7 +1074,7 @@
 
 	gf_evg_rgb_to_yuv(surf, col, &cy, &cb, &cr);
 
-	if (!rc.x && !rc.y && (rc.width==_surf->width) && (rc.height==_surf->height)) {
+	if (!rc.x && !rc.y && ((u32) rc.width==_surf->width) && ((u32) rc.height==_surf->height)) {
 		memset(pY, cy, _surf->pitch_y * _surf->height);
 		memset(pU, cb, _surf->pitch_y * _surf->height);
 		memset(pV, cr, _surf->pitch_y * _surf->height);
@@ -2257,3 +2261,5 @@
 	}
 	return GF_OK;
 }
+
+#endif //GPAC_DISABLE_EVG

gpac-2.2.1.tar.gz/src/evg/stencil.c -> gpac-2.4.0.tar.gz/src/evg/stencil.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2022
+ *			Copyright (c) Telecom ParisTech 2000-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / software 2D rasterizer module
@@ -25,6 +25,8 @@
 
 #include "rast_soft.h"
 
+#ifndef GPAC_DISABLE_EVG
+
 static GF_EVGStencil *evg_solid_brush();
 static GF_EVGStencil *evg_texture_brush();
 static GF_EVGStencil *evg_linear_gradient_brush();
@@ -322,8 +324,8 @@
 //we map texture coords, pt1 is {0,0} pt2 is {1,0} pt3 is {0,1}
 //y flip is done by switching the points in evg_raster_render_path_3d
 #define PERSP_APPLY \
-	Float ix = ((Float) pbc2) / persp_denum;\
-	Float iy = ((Float) pbc3) / persp_denum;\
+	Fixed ix = FLT2FIX(pbc2 / persp_denum);\
+	Fixed iy = FLT2FIX(pbc3 / persp_denum);\
 	pbc2 += pbc2_inc;\
 	pbc3 += pbc3_inc;\
 	persp_denum += pers_denum_inc;
@@ -341,7 +343,7 @@
 	u64 *data_wide = rctx->surf->not_8bits ? rctx->stencil_pix_run : NULL;
 	EVG_LinearGradient *_this = (EVG_LinearGradient *) p;
 
-	assert(data);
+	gf_assert(data);
 
 	if (rctx->surf->is_3d_matrix) {
 		PERSP_VARS_DECL
@@ -438,8 +440,8 @@
 	u64 *data_wide = rctx->surf->not_8bits ? rctx->stencil_pix_run : NULL;
 	EVG_RadialGradient *_this = (EVG_RadialGradient *) p;
 
-	assert(data);
-	
+	gf_assert(data);
+
 	if (rctx->surf->is_3d_matrix) {
 		PERSP_VARS_DECL
 
@@ -992,7 +994,7 @@
 	if (_this->is_yuv && !yuv_type) conv_type = 1;
 	else if (!_this->is_yuv && yuv_type) conv_type = 2;
 
-	
+
 	while (count) {
 		x0 = FIX2INT(x);
 		if (x0 > m_width) {
@@ -1860,7 +1862,7 @@
 #define GET_LE_10BIT_AS_16(_ptr) ( (((u16)(_ptr)1)<<8 | (u16)(_ptr)0 ) << 6 )
 
 //#define GET_LE_10BIT_LEFT_AS_8(_ptr) ( (((u16)(_ptr)1)<<8 | (u16)(_ptr)0 ) >> 8 )
-#define GET_LE_10BIT_LEFT_AS_8(_ptr) (_ptr1 )
+#define GET_LE_10BIT_LEFT_AS_8(_ptr) ((_ptr)1 )
 #define GET_LE_10BIT_LEFT_AS_16(_ptr) ( (((u16)(_ptr)1)<<8 | (u16)(_ptr)0 ) & 0xFFC0 )
 
 #define GET_BE_10BIT_AS_8(_ptr) ( (*(u16 *)(_ptr)) >> 2 )
@@ -2590,7 +2592,7 @@
 	}
 	if (!stride)
 		stride = _this->Bpp * width;
-		
+
 	_this->pixel_format = pixelFormat;
 	_this->width = width;
 	_this->height = height;
@@ -2616,6 +2618,18 @@
 }
 
 GF_EXPORT
+Bool gf_evg_texture_format_ok(GF_PixelFormat pixelFormat)
+{
+	EVG_Texture _tx;
+	memset(&_tx, 0, sizeof(EVG_Texture));
+	_tx.type = GF_STENCIL_TEXTURE;
+	GF_Err e = gf_evg_stencil_set_texture_internal((GF_EVGStencil *) &_tx, 2, 2, pixelFormat, (const u8 *) &_tx, 0, NULL, NULL, 0, NULL, 0);
+	if (e==GF_OK) return GF_TRUE;
+	return GF_FALSE;
+}
+
+
+GF_EXPORT
 GF_Err gf_evg_stencil_set_palette(GF_EVGStencil *stencil, const u8 *palette, u32 pix_fmt, u32 nb_cols)
 {
 	EVG_Texture *_this = (EVG_Texture *) stencil;
@@ -3520,7 +3534,6 @@
 
 GF_Err gf_evg_setup_multi_texture(GF_EVGSurface *surf, GF_EVGMultiTextureMode operand, GF_EVGStencil *sten2, GF_EVGStencil *sten3, Float *params)
 {
-	u32 i;
 	Float param1 = params ? params0 : 0;
 	surf->sten2 = surf->sten3 = NULL;
 	surf->odd_fill = 0;
@@ -3642,6 +3655,8 @@
 		if (!surf->raster_ctx.stencil_pix_run3) return GF_OUT_OF_MEM;
 	}
 
+#ifndef GPAC_DISABLE_THREADS
+	u32 i;
 	for (i=0; i<surf->nb_threads; i++) {
 		EVGRasterCtx *rctx = &surf->th_raster_ctxi;
 		if (surf->sten2 && !rctx->stencil_pix_run2) {
@@ -3653,5 +3668,8 @@
 			if (!rctx->stencil_pix_run3) return GF_OUT_OF_MEM;
 		}
 	}
+#endif
 	return GF_OK;
 }
+
+#endif //GPAC_DISABLE_EVG

gpac-2.2.1.tar.gz/src/evg/surface.c -> gpac-2.4.0.tar.gz/src/evg/surface.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2022
+ *			Copyright (c) Telecom ParisTech 2000-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / software 2D rasterizer module
@@ -27,6 +27,8 @@
 
 #include "rast_soft.h"
 
+#ifndef GPAC_DISABLE_EVG
+
 static void get_surface_world_matrix(GF_EVGSurface *surf, GF_Matrix2D *mat)
 {
 	gf_mx2d_init(*mat);
@@ -89,9 +91,12 @@
 GF_EXPORT
 GF_Err gf_evg_enable_threading(GF_EVGSurface *surf, s32 nb_threads)
 {
+#ifndef GPAC_DISABLE_THREADS
 	u32 i, run_size;
 	char szName100;
-	if (!surf || surf->nb_threads) return GF_BAD_PARAM;
+	if (!surf) return GF_BAD_PARAM;
+	if (surf->nb_threads) return GF_OK;
+	if (gf_opts_get_bool("core", "no-mx")) return GF_OK;
 
 	if (nb_threads<0) {
 		GF_SystemRTInfo rti;
@@ -145,6 +150,7 @@
 		EVGRasterCtx *rctx = &surf->th_raster_ctxi;
 		gf_th_run(rctx->th, th_sweep_lines, rctx);
 	}
+#endif //GPAC_DISABLE_THREADS
 	return GF_OK;
 }
 
@@ -176,6 +182,7 @@
 	if (surf->ext3d) {
 		gf_free(surf->ext3d);
 	}
+#ifndef GPAC_DISABLE_THREADS
 	if (surf->nb_threads) {
 		for (i=0; i<surf->nb_threads; i++) {
 			EVGRasterCtx *rctx = &surf->th_raster_ctxi;
@@ -196,6 +203,7 @@
 		gf_mx_del(surf->raster_mutex);
 		gf_sema_del(surf->raster_sem);
 	}
+#endif
 	gf_free(surf);
 }
 
@@ -206,8 +214,10 @@
 	if (!surf) return GF_BAD_PARAM;
 	get_surface_world_matrix(surf, &surf->mat);
 	surf->is_3d_matrix = GF_FALSE;
-	if (!mat) return GF_OK;
-
+	if (!mat) {
+		gf_mx2d_init(surf->shader_mx);
+		return GF_OK;
+	}
 	gf_mx2d_init(tmp);
 	gf_mx2d_add_matrix(&tmp, mat);
 	gf_mx2d_add_matrix(&tmp, &surf->mat);
@@ -340,15 +350,16 @@
 	}
 }
 
-GF_EXPORT
-GF_Err gf_evg_surface_attach_to_buffer(GF_EVGSurface *surf, u8 *pixels, u32 width, u32 height, s32 pitch_x, s32 pitch_y, GF_PixelFormat pixelFormat)
+static GF_Err gf_evg_surface_attach_to_buffer_internal(GF_EVGSurface *surf, u8 *pixels, u32 width, u32 height, s32 pitch_x, s32 pitch_y, GF_PixelFormat pixelFormat, Bool probe_only)
 {
 	u32 BPP;
 	Bool size_changed=GF_FALSE;
-	if (!surf || !pixels) return GF_BAD_PARAM;
 
-	surf->is_transparent = GF_FALSE;
-	surf->not_8bits = GF_FALSE;
+	if (!probe_only) {
+		if (!surf || !pixels) return GF_BAD_PARAM;
+		surf->is_transparent = GF_FALSE;
+		surf->not_8bits = GF_FALSE;
+	}
 	switch (pixelFormat) {
 	case GF_PIXEL_GREYSCALE:
 		BPP = 1;
@@ -356,7 +367,8 @@
 	case GF_PIXEL_ALPHAGREY:
 	case GF_PIXEL_GREYALPHA:
 		BPP = 2;
-		surf->is_transparent = GF_TRUE;
+		if (!probe_only)
+			surf->is_transparent = GF_TRUE;
 		break;
 	case GF_PIXEL_RGB_444:
 	case GF_PIXEL_RGB_555:
@@ -367,7 +379,8 @@
 	case GF_PIXEL_BGRA:
 	case GF_PIXEL_RGBA:
 	case GF_PIXEL_ABGR:
-		surf->is_transparent = GF_TRUE;
+		if (!probe_only)
+			surf->is_transparent = GF_TRUE;
 	case GF_PIXEL_RGBX:
 	case GF_PIXEL_BGRX:
 	case GF_PIXEL_XRGB:
@@ -396,11 +409,13 @@
 	case GF_PIXEL_YUV422_10:
 	case GF_PIXEL_YUV444_10:
 		BPP = 2;
-		surf->not_8bits = GF_TRUE;
+		if (!probe_only)
+			surf->not_8bits = GF_TRUE;
 		break;
 	case GF_PIXEL_YUVA444_PACK:
 	case GF_PIXEL_UYVA444_PACK:
-		surf->is_transparent = GF_TRUE;
+		if (!probe_only)
+			surf->is_transparent = GF_TRUE;
 		BPP = 4;
 		break;
 	case GF_PIXEL_YUV444_PACK:
@@ -410,6 +425,8 @@
 	default:
 		return GF_NOT_SUPPORTED;
 	}
+	if (probe_only) return GF_OK;
+
 	if (!pitch_x) pitch_x = BPP;
 	if (!pitch_y) {
 		gf_pixel_get_size_info(pixelFormat, width, height, NULL, &pitch_y, NULL, NULL, NULL);
@@ -418,7 +435,6 @@
 	surf->pitch_x = pitch_x;
 	surf->pitch_y = pitch_y;
 	if (!surf->raster_ctx.stencil_pix_run || (surf->width != width)) {
-		u32 i;
 		u32 run_size = sizeof(u32) * (width+2);
 		if (surf->not_8bits) run_size *= 2;
 		surf->raster_ctx.stencil_pix_run = gf_realloc(surf->raster_ctx.stencil_pix_run, run_size);
@@ -433,6 +449,8 @@
 			if (!surf->raster_ctx.stencil_pix_run3) return GF_OUT_OF_MEM;
 		}
 
+#ifndef GPAC_DISABLE_THREADS
+		u32 i;
 		for (i=0; i<surf->nb_threads; i++) {
 			EVGRasterCtx *rctx = &surf->th_raster_ctxi;
 			rctx->stencil_pix_run = gf_realloc(rctx->stencil_pix_run, run_size);
@@ -447,6 +465,7 @@
 				if (!rctx->stencil_pix_run3) return GF_OUT_OF_MEM;
 			}
 		}
+#endif
 	}
 	if (surf->width != width) {
 		surf->width = width;
@@ -479,6 +498,11 @@
 	return GF_OK;
 }
 
+GF_EXPORT
+GF_Err gf_evg_surface_attach_to_buffer(GF_EVGSurface *surf, u8 *pixels, u32 width, u32 height, s32 pitch_x, s32 pitch_y, GF_PixelFormat pixelFormat)
+{
+	return gf_evg_surface_attach_to_buffer_internal(surf, pixels, width, height, pitch_x, pitch_y, pixelFormat, GF_FALSE);
+}
 
 GF_EXPORT
 GF_Err gf_evg_surface_attach_to_texture(GF_EVGSurface *surf, GF_EVGStencil * sten)
@@ -486,10 +510,16 @@
 	EVG_Texture *tx = (EVG_Texture *) sten;
 	if (!surf || (tx->type != GF_STENCIL_TEXTURE)) return GF_BAD_PARAM;
 
-	return gf_evg_surface_attach_to_buffer(surf, tx->pixels, tx->width, tx->height, 0, tx->stride, tx->pixel_format);
+	return gf_evg_surface_attach_to_buffer_internal(surf, tx->pixels, tx->width, tx->height, 0, tx->stride, tx->pixel_format, GF_FALSE);
 }
 
-
+GF_EXPORT
+Bool gf_evg_surface_format_ok(GF_PixelFormat pixelFormat)
+{
+	GF_Err e = gf_evg_surface_attach_to_buffer_internal(NULL, NULL, 0, 0, 0, 0, pixelFormat, GF_TRUE);
+	if (e==GF_OK) return GF_TRUE;
+	return GF_FALSE;
+}
 
 GF_EXPORT
 GF_Err gf_evg_surface_clear(GF_EVGSurface *surf, GF_IRect *rc, u32 color)
@@ -1077,22 +1107,30 @@
 	}
 
 	if (uv_alpha_size) {
+#ifndef GPAC_DISABLE_THREADS
 		u32 i;
+#endif
+		//safety for uneven size in 422/420 rounding (fuzz)
+		uv_alpha_size += 4;
 		if (surf->uv_alpha_alloc < uv_alpha_size) {
 			surf->uv_alpha_alloc = uv_alpha_size;
 			surf->raster_ctx.uv_alpha = gf_realloc(surf->raster_ctx.uv_alpha, uv_alpha_size);
 			if (!surf->raster_ctx.uv_alpha) return GF_FALSE;
+#ifndef GPAC_DISABLE_THREADS
 			for (i=0;i<surf->nb_threads; i++) {
 				EVGRasterCtx *rctx = &surf->th_raster_ctxi;
 				rctx->uv_alpha = gf_realloc(rctx->uv_alpha, uv_alpha_size);
 				if (!rctx->uv_alpha) return GF_FALSE;
 			}
+#endif
 		}
 		memset(surf->raster_ctx.uv_alpha, 0, sizeof(char)*surf->uv_alpha_alloc);
+#ifndef GPAC_DISABLE_THREADS
 		for (i=0;i<surf->nb_threads; i++) {
 			EVGRasterCtx *rctx = &surf->th_raster_ctxi;
 			memset(rctx->uv_alpha, 0, sizeof(char)*surf->uv_alpha_alloc);
 		}
+#endif
 	}
 	if (surf->yuv_type && for_3d) {
 		surf->sten = &surf->ext3d->yuv_sten;
@@ -1583,3 +1621,5 @@
 	if (!surf) return GF_EVGMASK_NONE;
 	return surf->mask_mode;
 }
+
+#endif // GPAC_DISABLE_EVG

gpac-2.2.1.tar.gz/src/export.cpp -> gpac-2.4.0.tar.gz/src/export.cpp Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2022
+ *			Copyright (c) Telecom ParisTech 2000-2024
  *					All rights reserved
  *
  *  This file is part of GPAC
@@ -73,6 +73,7 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_sys_format_help) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_sys_word_match) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_sys_profiler_set_callback) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_sys_profiler_log) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_sys_profiler_send) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_sys_profiler_enable_sampling) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_sys_profiler_sampling_enabled) )
@@ -89,6 +90,7 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_get_default_cache_directory) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_get_default_font_dir) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_4cc_to_str) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_4cc_to_str_safe) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_4cc_parse) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_error_to_string) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_rand_init) )
@@ -134,6 +136,7 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_fileio_set_stats) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_fileio_tag_main_thread) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_fileio_is_main_thread) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_fileio_set_write_state) )
 
 #pragma comment (linker, EXPORT_SYMBOL(gf_set_progress) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_set_progress_callback) )
@@ -162,6 +165,7 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_gz_compress_payload) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_gz_compress_payload_ex) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_gz_decompress_payload) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_gz_decompress_payload_ex) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_lz_compress_payload) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_lz_decompress_payload) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_file_handles_count) )
@@ -182,7 +186,6 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_mem_strdup) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_memory_print) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_memory_size) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_mem_enable_tracker) )
 #else
 #pragma comment (linker, EXPORT_SYMBOL(gf_malloc) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_calloc) )
@@ -194,7 +197,7 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_strlcpy) )
 
 /* Sound */
-#ifndef GPAC_DISABLE_PLAYER
+#if !defined(GPAC_DISABLE_COMPOSITOR) &&  !defined(GPAC_DISABLE_RESAMPLE)
 #pragma comment (linker, EXPORT_SYMBOL(gf_mixer_set_config) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_mixer_get_config) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_mixer_reconfig) )
@@ -307,6 +310,7 @@
 
 /* Socket */
 #pragma comment (linker, EXPORT_SYMBOL(gf_sk_new) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_sk_new_ex) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_sk_del) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_sk_reset) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_sk_set_buffer_size) )
@@ -361,6 +365,7 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_net_get_timezone) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_net_has_ipv6) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_net_is_ipv6) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_net_enum_interfaces) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_base64_encode) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_base64_decode) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_base16_encode) )
@@ -404,7 +409,7 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_creds_check_membership) )
 
 
-#ifndef GPAC_DISABLE_PLAYER
+#ifndef GPAC_DISABLE_COMPOSITOR
 #pragma comment (linker, EXPORT_SYMBOL(gf_modules_new) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_modules_del) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_modules_count) )
@@ -415,6 +420,9 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_modules_load_by_name) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_modules_close_interface) )
 #endif
+#pragma comment (linker, EXPORT_SYMBOL(gf_module_get_key) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_module_get_bool) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_module_get_int) )
 
 #pragma comment (linker, EXPORT_SYMBOL(gf_utf8_wcstombs) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_utf8_mbstowcs) )
@@ -422,7 +430,8 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_utf8_to_wcs) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_wcs_to_utf8) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_utf8_is_legal) )
-#ifndef GPAC_DISABLE_PLAYER
+
+#if !defined(GPAC_DISABLE_SVG) && !defined(GPAC_DISABLE_COMPOSITOR)
 #pragma comment (linker, EXPORT_SYMBOL(gf_utf8_is_right_to_left) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_utf8_reorder_bidi) )
 #endif
@@ -523,7 +532,7 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_asin) )
 #endif /*GPAC_FIXED_POINT*/
 
-#ifndef GPAC_DISABLE_PLAYER
+#ifndef GPAC_DISABLE_COMPOSITOR
 #pragma comment (linker, EXPORT_SYMBOL(gf_angle_diff) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_v2d_len) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_v2d_from_polar) )
@@ -661,7 +670,7 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_path_clone) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_path_is_empty) )
 
-#endif //GPAC_DISABLE_PLAYER
+#endif //GPAC_DISABLE_COMPOSITOR
 
 /*mpeg4_odf.h exports*/
 #pragma comment (linker, EXPORT_SYMBOL(gf_odf_desc_new) )
@@ -766,8 +775,8 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_probe_file) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_open) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_close) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_isom_write) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_delete) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_set_write_callback) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_mode) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_moov_first) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_box_new) )
@@ -804,6 +813,7 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_track_by_id) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_is_track_enabled) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_track_flags) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_enum_track_group) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_is_track_encrypted) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_track_duration) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_media_type) )
@@ -887,7 +897,6 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_cenc_get_sample_aux_info) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_cenc_get_default_info) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_avc_svc_type) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_isom_clone_config_box) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_avc_config_get) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_svc_config_get) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_3gp_config_get) )
@@ -932,6 +941,7 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_next_alternate_group_id) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_meta_primary_item_id) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_meta_get_item_ref_count) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_meta_item_has_ref) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_meta_get_item_ref_id) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_is_JPEG2000) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_rvc_config) )
@@ -979,6 +989,11 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_clean_aperture) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_dovi_config_get) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_opus_config_get_desc) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_pcm_config) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_lpcm_config) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_enum_track_references) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_text_description) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_is_track_referenced) )
 
 # ifndef GPAC_DISABLE_ISOM_DUMP
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_dump) )
@@ -1034,6 +1049,7 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_set_last_sample_duration_ex) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_set_track_reference) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_remove_track_references) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_remove_track_reference) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_update_sample) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_update_sample_reference) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_remove_sample) )
@@ -1119,6 +1135,7 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_text_set_box) )
 #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_set_forced) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_text_set_display_flags) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_text_to_sample) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_set_ismacryp_protection) )
@@ -1183,6 +1200,7 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_vvc_config_new) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_vvc_set_inband_config) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_subtitle_set_mime) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_set_track_index) )
 
 
 #ifndef GPAC_DISABLE_ISOM_HINTING
@@ -1233,6 +1251,7 @@
 
 #ifndef GPAC_DISABLE_STREAMING
 #pragma comment (linker, EXPORT_SYMBOL(gf_rtp_streamer_new) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_rtp_streamer_new_ex) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_rtp_streamer_del) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_rtp_streamer_append_sdp) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_rtp_streamer_append_sdp_extended) )
@@ -1275,7 +1294,7 @@
 
 
 /*service.h exports*/
-#ifndef GPAC_DISABLE_PLAYER
+#ifndef GPAC_DISABLE_COMPOSITOR
 
 /*mediaobject.h exports*/
 #pragma comment (linker, EXPORT_SYMBOL(gf_mo_register) )
@@ -1489,7 +1508,6 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_avc_read_pps_bs ) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_avc_hevc_get_chroma_format_name) )
 
-#ifndef GPAC_DISABLE_HEVC
 #pragma comment (linker, EXPORT_SYMBOL(gf_hevc_read_vps) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_hevc_read_vps_ex) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_hevc_read_vps_bs) )
@@ -1503,13 +1521,13 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_hevc_parse_nalu) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_vvc_get_sps_info) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_vvc_get_profile_name) )
-#endif //GPAC_DISABLE_HEVC
-
 
 #pragma comment (linker, EXPORT_SYMBOL(gf_av1_parse_obu) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_av1_get_obu_name) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_av1_reset_state) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_av1_init_state) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_av1_leb128_read) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_av1_parse_obu_header) )
 
 #endif /*GPAC_DISABLE_AV_PARSERS*/
 
@@ -1914,7 +1932,7 @@
 #endif
 
 
-#ifndef GPAC_DISABLE_PLAYER
+#ifndef GPAC_DISABLE_COMPOSITOR
 //compositor exports
 #pragma comment (linker, EXPORT_SYMBOL(gf_sc_disconnect) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_sc_navigate_to) )
@@ -2026,7 +2044,6 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_sc_connect_from_time) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_sc_disconnect) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_sc_send_event) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_sc_get_downloader) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_scene_switch_quality) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_scene_set_service_id) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_odm_get_object_info) )
@@ -2183,7 +2200,7 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_dvb_mpe_print_info) )
 #endif
 
-#ifndef GPAC_DISABLE_DASH_CLIENT
+#ifndef GPAC_DISABLE_DASHIN
 #pragma comment (linker, EXPORT_SYMBOL(gf_dash_new) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_dash_del) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_dash_open) )
@@ -2282,7 +2299,10 @@
 #pragma comment (linker, EXPORT_SYMBOL(utf8_to_ucs4) )
 
 
+#pragma comment (linker, EXPORT_SYMBOL(gf_route_atsc_dmx_new) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_route_atsc_dmx_new_ex) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_route_dmx_new) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_route_dmx_new_ex) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_route_dmx_del) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_route_atsc3_tune_in) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_route_dmx_process) )
@@ -2368,6 +2388,7 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_props_get_type_desc) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_props_parse_type) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_props_dump_val) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_props_dump_alloc) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_props_get_id) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_props_get_description) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_props_4cc_get_type) )
@@ -2377,12 +2398,14 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_props_parse_enum) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_props_enum_name) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_props_enum_all_names) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_props_reset_single) )
 
 #pragma comment (linker, EXPORT_SYMBOL(gf_fs_new) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_fs_new_defaults) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_fs_del) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_fs_load_filter) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_fs_run) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_fs_stop) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_fs_print_stats) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_fs_print_connections) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_fs_print_non_connected) )
@@ -2391,6 +2414,7 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_fs_set_separators) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_fs_filters_registers_count) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_fs_get_filter_register) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_fs_send_deferred_play) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_fs_lock_filters) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_fs_get_filters_count) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_fs_get_filter) )
@@ -2432,6 +2456,7 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_fs_set_filter_creation_callback) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_fs_get_rt_udta) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_fs_set_external_gl_provider) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_fs_print_debug_info) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_filter_send_update ) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_filter_get_arg ) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_filter_get_arg_str ) )
@@ -2490,6 +2515,7 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_filter_hint_single_clock ) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_filter_get_clock_hint ) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_filter_override_caps ) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_get_netcap_id ) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_filter_get_name ) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_filter_set_name ) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_filter_reset_source ) )
@@ -2516,6 +2542,8 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_filter_is_temporary ) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_filter_meta_set_instances ) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_filter_meta_get_instances ) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_probe_link ) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_get_possible_destinations ) )
 
 #pragma comment (linker, EXPORT_SYMBOL(gf_filter_pck_discard ) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_filter_pck_ref ) )
@@ -2570,6 +2598,7 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_filter_pck_new_shared_internal ) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_filter_pck_new_shared ) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_filter_pck_new_ref ) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_pck_new_ref_destructor ) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_filter_pck_new_frame_interface) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_filter_pck_forward ) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_filter_pck_send ) )
@@ -2579,6 +2608,7 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_filter_pck_ref_ex) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_filter_pck_set_readonly) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_filter_pck_dangling_copy) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_pck_check_realloc) )
 
 #pragma comment (linker, EXPORT_SYMBOL(gf_filter_pid_check_caps ) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_filter_pid_copy_properties ) )
@@ -2630,16 +2660,18 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_filter_pid_get_info_str) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_filter_pid_set_property ) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_filter_pid_set_property_str ) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_pid_set_property_dyn ) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_filter_pid_set_info) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_filter_pid_set_info_str) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_pid_set_info_dyn) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_filter_pid_set_framing_mode ) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_filter_pid_new ) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_filter_pid_allow_direct_dispatch ) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_filter_pid_get_alias_udta ) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_filter_pid_init_play_event ) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_filter_pid_negociate_property ) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_filter_pid_negociate_property_str) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_filter_pid_negociate_property_dyn) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_pid_negotiate_property ) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_pid_negotiate_property_str) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_pid_negotiate_property_dyn) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_filter_pid_get_source_filter) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_filter_pid_enum_destinations) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_filter_pid_discard_block) )
@@ -2652,10 +2684,13 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_filter_pid_get_next_ts) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_filter_pid_has_decoder) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_filter_pid_set_rt_stats) )
-
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_pid_get_rfc_6381_codec_string) )
 
 #pragma comment (linker, EXPORT_SYMBOL(gf_filter_bind_dash_algo_callbacks) )
 
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_bind_httpout_callbacks) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_httpout_send_request) )
+
 
 #pragma comment (linker, EXPORT_SYMBOL(gf_cicp_parse_color_primaries) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_cicp_parse_color_transfer) )

gpac-2.2.1.tar.gz/src/filter_core/filter.c -> gpac-2.4.0.tar.gz/src/filter_core/filter.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2017-2022
+ *			Copyright (c) Telecom ParisTech 2017-2024
  *					All rights reserved
  *
  *  This file is part of GPAC / filters sub-project
@@ -95,7 +95,7 @@
 	if (sep && ((sep5==sess->sep_args) || (sep5==0)))
 		return sep;
 	//for local files, check if file/dir exists for each ':' specified
-	//this allows for file path with ':' 
+	//this allows for file path with ':'
 	if (!strncmp(path, "file://", 7) || !strstr(path, "://")) {
 		sep = (char*)res;
 		while (1) {
@@ -131,7 +131,11 @@
 const char *gf_fs_path_escape_colon(GF_FilterSession *sess, const char *path)
 {
 	return gf_fs_path_escape_colon_ex(sess, path, NULL, GF_FALSE);
-
+}
+const char *gf_filter_path_escape_colon(GF_Filter *f, const char *path)
+{
+	if (!f) return NULL;
+	return gf_fs_path_escape_colon_ex(f->session, path, NULL, GF_FALSE);
 }
 
 static const char *gf_filter_get_args_stripped(GF_FilterSession *fsess, const char *in_args, Bool is_dst)
@@ -251,9 +255,13 @@
 		}
 		else if (!strncmp(in_args, "RSID", 4) && (!in_args4 || (in_args4==fsess->sep_args))) {
 		}
-		else if (!strncmp(in_args, "FBT", 2) && (in_args3==fsess->sep_name)) {
+		else if (!strncmp(in_args, "FBT", 3) && (in_args3==fsess->sep_name)) {
+		}
+		else if (!strncmp(in_args, "FBU", 3) && (in_args3==fsess->sep_name)) {
+		}
+		else if (!strncmp(in_args, "DL", 2) && (in_args2==fsess->sep_name)) {
 		}
-		else if (!strncmp(in_args, "FBU", 2) && (in_args3==fsess->sep_name)) {
+		else if (!strncmp(in_args, "LT", 2) && (in_args2==fsess->sep_name)) {
 		}
 		else if (!is_src && (in_args0==fsess->sep_frag)) {
 
@@ -285,7 +293,7 @@
 	GF_Filter *filter;
 	GF_Err e;
 	u32 i;
-	assert(fsess);
+	if (!fsess) return NULL;
 
 	GF_SAFEALLOC(filter, GF_Filter);
 	if (!filter) {
@@ -296,6 +304,7 @@
 	filter->session = fsess;
 	filter->max_extra_pids = freg->max_extra_pids;
 	filter->dynamic_filter = is_dynamic_filter ? 1 : 0;
+	filter->require_source_id = (fsess->flags & GF_FS_FLAG_REQUIRE_SOURCE_ID) ? GF_TRUE : GF_FALSE;
 
 #ifdef GPAC_HAS_QJS
 	filter->jsval = JS_UNDEFINED;
@@ -423,11 +432,16 @@
 			gf_dynstrcat(&all_args, "gpac", NULL);
 			dst_sep_inserted = GF_TRUE;
 		} else if (all_args) {
-			gf_dynstrcat(&all_args, szDBSep, NULL);
+			if (strlen(all_args))
+				gf_dynstrcat(&all_args, szDBSep, NULL);
 			dst_sep_inserted = GF_TRUE;
 		}
 		//push dst args
 		filter_push_args(fsess, &all_args, (char *) dst_striped, GF_FALSE, dst_sep_inserted);
+		if (all_args && (!strcmp(all_args, szDBSep) || !all_args0)) {
+			gf_free(all_args);
+			all_args=NULL;
+		}
 
 
 		localarg_marker = all_args ? strstr(all_args, "gfloc") : NULL;
@@ -484,6 +498,7 @@
 		GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("Created filter register %s (%p) args %s\n", freg->name, filter, filter->orig_args ? filter->orig_args : "none"));
 	}
 
+#ifndef GPAC_DISABLE_THREADS
 	if ((freg->flags & GF_FS_REG_SINGLE_THREAD) && gf_list_count(filter->session->threads)) {
 		u32 count = gf_list_count(filter->session->threads);
 		GF_SessionThread *ft;
@@ -500,15 +515,38 @@
 		safe_int_inc(&ft->nb_filters_pinned);
 		filter->restrict_th_idx = idx;
 	}
+#endif
 	return filter;
 }
 
+void gf_filter_check_pending_pids(GF_Filter *filter)
+{
+	//flush all pending pid init requests
+	if (filter->has_pending_pids && !filter->deferred_link) {
+		filter->has_pending_pids=GF_FALSE;
+		while (gf_fq_count(filter->pending_pids)) {
+			GF_FilterPid *pid=gf_fq_pop(filter->pending_pids);
+			gf_filter_pid_post_init_task(filter, pid);
+		}
+	}
+}
+
 GF_Err gf_filter_new_finalize(GF_Filter *filter, const char *args, GF_FilterArgType arg_type)
 {
 	gf_filter_set_name(filter, NULL);
 
 	gf_filter_parse_args(filter, args, arg_type, GF_FALSE);
 
+	if (! filter->dynamic_filter && (filter->session->flags & GF_FS_FLAG_FORCE_DEFER_LINK)) {
+		filter->deferred_link = GF_TRUE;
+	}
+
+#ifdef GPAC_CONFIG_EMSCRIPTEN
+	//not runing as worker and using sync read, force main thread
+	if ((filter->freg->flags & GF_FS_REG_USE_SYNC_READ) && !filter->session->is_worker)
+		gf_filter_force_main_thread(filter, GF_TRUE);
+#endif
+
 	if (filter->removed) {
 		if (!(filter->freg->flags & (GF_FS_REG_TEMP_INIT|GF_FS_REG_META))) {
 			filter->finalized = GF_TRUE;
@@ -536,13 +574,7 @@
 	}
 
 	//flush all pending pid init requests
-	if (filter->has_pending_pids) {
-		filter->has_pending_pids=GF_FALSE;
-		while (gf_fq_count(filter->pending_pids)) {
-			GF_FilterPid *pid=gf_fq_pop(filter->pending_pids);
-			gf_filter_pid_post_init_task(filter, pid);
-		}
-	}
+	gf_filter_check_pending_pids(filter);
 
 #ifdef GPAC_HAS_QJS
 	jsfs_on_filter_created(filter);
@@ -577,12 +609,10 @@
 
 void gf_filter_del(GF_Filter *filter)
 {
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("Filter %s destruction\n", filter->name));
-	assert(filter);
-//	assert(!filter->detached_pid_inst);
-	assert(!filter->detach_pid_tasks_pending);
-//	assert(!filter->swap_pidinst_dst);
-	assert(!filter->swap_pidinst_src);
+	gf_assert(filter);
+	GF_LOG(GF_LOG_INFO, GF_LOG_FILTER, ("Filter %s destruction\n", filter->name));
+	gf_assert(!filter->detach_pid_tasks_pending);
+	gf_assert(!filter->swap_pidinst_src);
 
 
 #ifdef GPAC_HAS_QJS
@@ -657,6 +687,8 @@
 	if (filter->name) gf_free(filter->name);
 	if (filter->status_str) gf_free(filter->status_str);
 	if (filter->restricted_source_id) gf_free(filter->restricted_source_id);
+	if (filter->tag) gf_free(filter->tag);
+	if (filter->itag) gf_free(filter->itag);
 
 	if (!filter->session->in_final_flush && !filter->session->run_status) {
 		u32 i, count;
@@ -672,6 +704,8 @@
 				a_filter->cap_dst_filter = NULL;
 			if (a_filter->cloned_from == filter)
 				a_filter->cloned_from = NULL;
+			if (a_filter->cloned_instance == filter)
+				a_filter->cloned_instance = NULL;
 			if (a_filter->on_setup_error_filter == filter)
 				a_filter->on_setup_error_filter = NULL;
 			if (a_filter->target_filter == filter)
@@ -682,6 +716,13 @@
 		}
 		gf_mx_v(filter->session->filters_mx);
 	}
+	if (filter->skip_cids.vals) {
+		GF_PropertyValue prop;
+		prop.value.string_list = filter->skip_cids;
+		prop.type = GF_PROP_STRING_LIST;
+		gf_props_reset_single(&prop);
+	}
+
 	if (filter->instance_description)
 		gf_free(filter->instance_description);
 	if (filter->instance_version)
@@ -694,15 +735,29 @@
 	if (filter->meta_instances)
 		gf_free(filter->meta_instances);
 
+	if (filter->netcap_id)
+		gf_free(filter->netcap_id);
+
+#ifndef GPAC_DISABLE_LOG
+	if (filter->logs) {
+		gf_log_pop_extra(filter->logs);
+		if (filter->logs->tools) gf_free(filter->logs->tools);
+		if (filter->logs->levels) gf_free(filter->logs->levels);
+		gf_free(filter->logs);
+	}
+#endif
+
 #ifdef GPAC_HAS_QJS
 	if (filter->iname)
 		gf_free(filter->iname);
 #endif
 
+#ifndef GPAC_DISABLE_THREADS
 	if (filter->restrict_th_idx) {
 		GF_SessionThread *ft = gf_list_get(filter->session->threads, filter->restrict_th_idx-1);
 		safe_int_dec(&ft->nb_filters_pinned);
 	}
+#endif
 
 	if (filter->freg && (filter->freg->flags & GF_FS_REG_CUSTOM)) {
 		//external custom filters
@@ -724,7 +779,7 @@
 GF_EXPORT
 void *gf_filter_get_udta(GF_Filter *filter)
 {
-	assert(filter);
+	gf_assert(filter);
 
 	return filter->filter_udta;
 }
@@ -732,7 +787,7 @@
 GF_EXPORT
 const char * gf_filter_get_name(GF_Filter *filter)
 {
-	assert(filter);
+	gf_assert(filter);
 	if (filter->name)
 		return (const char *)filter->name;
 	return (const char *)filter->freg->name;
@@ -741,15 +796,15 @@
 GF_EXPORT
 void gf_filter_set_name(GF_Filter *filter, const char *name)
 {
-	assert(filter);
+	gf_assert(filter);
 
 	if (filter->name) gf_free(filter->name);
 	filter->name = gf_strdup(name ? name : filter->freg->name);
 }
 
-static void gf_filter_set_id(GF_Filter *filter, const char *ID)
+void gf_filter_set_id(GF_Filter *filter, const char *ID)
 {
-	assert(filter);
+	gf_assert(filter);
 
 	if (filter->id) gf_free(filter->id);
 	filter->id = ID ? gf_strdup(ID) : NULL;
@@ -768,7 +823,7 @@
 
 static void gf_filter_set_sources(GF_Filter *filter, const char *sources_ID)
 {
-	assert(filter);
+	gf_assert(filter);
 
 	gf_mx_p(filter->session->filters_mx);
 
@@ -957,8 +1012,9 @@
 }
 
 
-static void filter_translate_autoinc(GF_Filter *filter, char *value)
+void filter_solve_prop_template(GF_Filter *filter, GF_FilterPid *pid, char **value)
 {
+	char ref_prop_dumpGF_PROP_DUMP_ARG_SIZE;
 	u32 ainc_crc, i;
 	GF_FSAutoIncNum *auto_int=NULL;
 	u32 inc_count;
@@ -967,18 +1023,53 @@
 	s32 increment=1;
 	char szInt100;
 
+	char *search_str = *value;
 	while (1) {
 		char *step_sep;
 		char *inc_end, *inc_sep;
-		inc_sep = strstr(value, "$GINC(");
+		char *s1 = strchr(search_str, '$');
+		char *s2 = strchr(search_str, '@');
+		if (s1 && s2 && (s2<s1)) s1 = NULL;
+		inc_sep = s1 ? s1 : s2;
+
 		if (!inc_sep) return;
+		if (strncmp(inc_sep+1, "GINC(", 5)) {
+			char *next = pid ?  strchr(inc_sep+1, inc_sep0) : NULL;
+			if (!next) {
+				search_str = inc_sep+1;
+				continue;
+			}
+			//check for prop
+			next0 = 0;
+
+			const GF_PropertyValue *src_prop=NULL;
+			u32 ref_p4cc = gf_props_get_id(inc_sep+1);
+
+			if (ref_p4cc)
+				src_prop = gf_filter_pid_get_property(pid, ref_p4cc);
+			else
+				src_prop = gf_filter_pid_get_property_str(pid, inc_sep+1);
+
+			char *solved = src_prop ? (char*) gf_props_dump(ref_p4cc, src_prop, ref_prop_dump, GF_PROP_DUMP_DATA_INFO) : "";
+			inc_sep0 = 0;
+			char *new_val = gf_strdup(*value);
+			gf_dynstrcat(&new_val, solved, NULL);
+			u32 len = (u32) strlen(new_val);
+			gf_dynstrcat(&new_val, next+1, NULL);
+			gf_free(*value);
+			*value = new_val;
+			search_str = new_val + len;
+			continue;
+		}
+
 		inc_end = strstr(inc_sep, ")");
 		if (!inc_end) return;
 
 		inc_sep0 = 0;
 		inc_end0 = 0;
 		inc_end+=1;
-		strcpy(szInt, inc_sep+6);
+		strncpy(szInt, inc_sep+6, GF_ARRAY_LENGTH(szInt));
+		szInt GF_ARRAY_LENGTH(szInt) - 1  = 0;
 		ainc_crc = (u32) gf_crc_32(szInt, (u32) strlen(szInt) );
 		step_sep = strchr(szInt, ',');
 		if (step_sep) {
@@ -993,10 +1084,11 @@
 				auto_int=NULL;
 				continue;
 			}
-			if (auto_int->filter == filter) {
+			if ((auto_int->filter == filter) && (auto_int->pid==pid)) {
 				sprintf(szInt, "%d", auto_int->inc_val);
 				break;
 			}
+
 			if (!assigned)
 				max_int = auto_int->inc_val;
 			else if ((increment>0) && (max_int < auto_int->inc_val))
@@ -1011,6 +1103,7 @@
 			GF_SAFEALLOC(auto_int, GF_FSAutoIncNum);
 			if (auto_int) {
 				auto_int->filter = filter;
+				auto_int->pid = pid;
 				auto_int->crc = ainc_crc;
 				if (assigned) auto_int->inc_val = max_int + increment;
 				else sscanf(szInt, "%d", &auto_int->inc_val);
@@ -1019,8 +1112,15 @@
 		}
 		if (auto_int) {
 			sprintf(szInt, "%d", auto_int->inc_val);
-			strcat(value, szInt);
-			strcat(value, inc_end);
+			char *new_val = gf_strdup(*value);
+			gf_dynstrcat(&new_val, szInt, NULL);
+			gf_dynstrcat(&new_val, inc_end, NULL);
+			u32 len = (u32) strlen(new_val);
+			gf_free(*value);
+			*value = new_val;
+			search_str = new_val + len;
+		} else {
+			search_str = inc_sep + 1;
 		}
 	}
 }
@@ -1037,12 +1137,13 @@
 #endif
 
 	if (path && path0) {
-		strcpy(szPath, path);
+		strncpy(szPath, path, GF_MAX_PATH-1);
+		szPathGF_MAX_PATH-1 = 0;
 		u32 len = (u32) strlen(szPath);
 		if ((szPathlen-1=='/') || (szPathlen-1=='\\'))
 			szPathlen-1=0;
 
-		strcat(szPath, url+6);
+		strncat(szPath, url+6, GF_MAX_PATH-strlen(szPath)-1);
 		return GF_TRUE;
 	}
 	return GF_FALSE;
@@ -1055,44 +1156,46 @@
 
 	if (!value) return gf_props_parse_value(type, name, NULL, enum_values, fs->sep_list);
 
-
-	if (!strnicmp(value, "$GSHARE", 7)) {
-		if (gf_opts_default_shared_directory(szPath)) {
-			strcat(szPath, value+7);
-			value = szPath;
-		} else {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Failed to query GPAC shared resource directory location\n"));
-		}
+	if (f && strstr(value, "$GINC(")) {
+		char *a_value = gf_strdup(value);
+		filter_solve_prop_template(f, NULL, &a_value);
+		argv = gf_props_parse_value(type, name, a_value, enum_values, fs->sep_list);
+		gf_free(a_value);
+		return argv;
 	}
-	else if (!strnicmp(value, "$GDOCS", 6)) {
-		if (filter_solve_gdocs(value, szPath)) {
-			value = szPath;
-		} else {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Failed to query GPAC user document directory location\n"));
+	if (value0=='$') {
+		if (!strnicmp(value, "$GSHARE", 7)) {
+			if (gf_opts_default_shared_directory(szPath)) {
+				strcat(szPath, value+7);
+				value = szPath;
+			} else {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Failed to query GPAC shared resource directory location\n"));
+			}
 		}
-	}
-	else if (!strnicmp(value, "$GJS", 4)) {
-		Bool gf_fs_solve_js_script(char *szPath, const char *file_name, const char *file_ext);
+		else if (!strnicmp(value, "$GDOCS", 6)) {
+			if (filter_solve_gdocs(value, szPath)) {
+				value = szPath;
+			} else {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Failed to query GPAC user document directory location\n"));
+			}
+		}
+		else if (!strnicmp(value, "$GJS", 4)) {
+			Bool gf_fs_solve_js_script(char *szPath, const char *file_name, const char *file_ext);
 
-		Bool found = gf_fs_solve_js_script(szPath, value+4, NULL);
+			Bool found = gf_fs_solve_js_script(szPath, value+4, NULL);
 
-		if (!found) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Failed solve to %s in GPAC script directories, file not found\n", value));
+			if (!found) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Failed solve to %s in GPAC script directories, file not found\n", value));
+			}
+		}
+		else if (!strnicmp(value, "$GLANG", 6)) {
+			value = gf_opts_get_key("core", "lang");
+			if (!value) value = "en";
+		}
+		else if (!strnicmp(value, "$GUA", 4)) {
+			value = gf_opts_get_key("core", "user-agent");
+			if (!value) value = "GPAC " GPAC_VERSION;
 		}
-	}
-	else if (!strnicmp(value, "$GLANG", 6)) {
-		value = gf_opts_get_key("core", "lang");
-		if (!value) value = "en";
-	}
-	else if (!strnicmp(value, "$GUA", 4)) {
-		value = gf_opts_get_key("core", "user-agent");
-		if (!value) value = "GPAC " GPAC_VERSION;
-	} else if (f && strstr(value, "$GINC(")) {
-		char *a_value = gf_strdup(value);
-		filter_translate_autoinc(f, a_value);
-		argv = gf_props_parse_value(type, name, a_value, enum_values, fs->sep_list);
-		gf_free(a_value);
-		return argv;
 	}
 	argv = gf_props_parse_value(type, name, value, enum_values, fs->sep_list);
 	return argv;
@@ -1129,7 +1232,7 @@
 
 		argv = gf_filter_parse_prop_solve_env_var(filter->session, filter, a->arg_type, a->arg_name, arg_value, a->min_max_enum);
 
-		if (argv.type != GF_PROP_FORBIDEN) {
+		if (argv.type != GF_PROP_FORBIDDEN) {
 			GF_Err e = GF_OK;
 			if (!is_sync_call) {
 				FSESS_CHECK_THREAD(filter)
@@ -1208,6 +1311,90 @@
 	gf_free(arg);
 }
 
+#ifndef GPAC_DISABLE_LOG
+u32 gf_log_parse_tool(const char *logs);
+void filter_parse_logs(GF_Filter *filter, const char *_logs)
+{
+	if (filter->logs) {
+		if (filter->logs->tools) gf_free(filter->logs->tools);
+		if (filter->logs->levels) gf_free(filter->logs->levels);
+		gf_free(filter->logs);
+	}
+	GF_SAFEALLOC(filter->logs, GF_LogExtra);
+	if (!filter->logs) return;
+
+	GF_LogExtra *lf = filter->logs;
+	char *c_logs = gf_strdup(_logs);
+	char *logs=c_logs;
+
+	while (logs) {
+		u32 i, level = 0;
+		char *l_str=NULL;
+		char *l_tool=NULL;
+
+		char *sep = strchr(logs, '@');
+		char *next = sep ? strchr(sep, ':') : NULL;
+		if (next) next0 = 0;
+
+		l_str = logs;
+		if (sep) {
+			sep0 = 0;
+			l_str = sep+1;
+			l_tool = logs;
+		} else {
+			l_tool = "all";
+		}
+
+		if (!strcmp(l_str, "error")) level = GF_LOG_ERROR;
+		else if (!strcmp(l_str, "warning")) level = GF_LOG_WARNING;
+		else if (!strcmp(l_str, "info")) level = GF_LOG_INFO;
+		else if (!strcmp(l_str, "debug")) level = GF_LOG_DEBUG;
+		else if (!strcmp(l_str, "quiet")) level = GF_LOG_QUIET;
+		else if (!strcmp(l_str, "ncl") || !strcmp(l_str, "cl")) {
+			if (!next) break;
+			logs = next+1;
+		} else if (!strcmp(l_str, "strict")) {
+			lf->strict = GF_TRUE;
+		} else {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_FILTER, ("Unsupported log level %s, ignoring\n", l_str));
+			l_tool=NULL;
+		}
+
+		while (l_tool) {
+			char *n_tool = strchr(l_tool, ':');
+			if (n_tool) n_tool0=0;
+
+			u32 found=0, tool = gf_log_parse_tool(l_tool);
+			if (tool==GF_LOG_TOOL_UNDEFINED) {
+				GF_LOG(GF_LOG_WARNING, GF_LOG_FILTER, ("Unsupported log tool %s, ignoring\n", l_tool));
+			} else {
+				for (i=0; i<lf->nb_tools; i++) {
+					if (lf->toolsi == tool) {
+						lf->levelsi = level;
+						found=1;
+						break;
+					}
+				}
+				if (!found) {
+					lf->tools = gf_realloc(lf->tools, sizeof(u32) * (lf->nb_tools+1));
+					lf->levels = gf_realloc(lf->levels, sizeof(u32) * (lf->nb_tools+1));
+					lf->toolslf->nb_tools = tool;
+					lf->levelslf->nb_tools = level;
+					lf->nb_tools++;
+				}
+			}
+
+			if (!n_tool) break;
+			l_tool = n_tool+1;
+		}
+
+		if (!next) break;
+		logs = next+1;
+	}
+	gf_free(c_logs);
+}
+#endif
+
 static const char *gf_filter_load_arg_config(GF_Filter *filter, const char *sec_name, const char *arg_name, const char *arg_val, Bool first_arg)
 {
 	char szArg101;
@@ -1275,6 +1462,28 @@
 					is_ok = 2;
 					loc_alen=3;
 				}
+#ifdef GPAC_ENABLE_DEBUG
+				else if (!strncmp(arg, "DBG", len)) {
+					const char *val = sep+1;
+					if (val && !stricmp(val, "pid")) filter->prop_dump = 1;
+					else if (val && !stricmp(val, "pck")) filter->prop_dump = 2;
+					else if (val && !stricmp(val, "all")) filter->prop_dump = 3;
+					else if (!val) filter->prop_dump = 3;
+					else {
+						GF_LOG(GF_LOG_WARNING, GF_LOG_FILTER, ("Invalid DBG param syntax %s, expecting pid, pck or all\n", arg));
+					}
+					is_ok = 2;
+					loc_alen=3;
+				}
+#endif
+				else if (!strncmp(arg, "LT", len)) {
+					is_ok = 2;
+					loc_alen=2;
+#ifndef GPAC_DISABLE_LOG
+					filter_parse_logs(filter, sep+1);
+#endif
+				}
+
 			}
 			if (!is_ok) continue;
 
@@ -1312,8 +1521,10 @@
 			ap = gf_props_parse_value(GF_PROP_UINT, "FBD", opt, NULL, filter->session->sep_list);
 			filter->pid_decode_buffer_max_us = ap.value.uint;
 		}
+		opt = gf_opts_get_key(sec_name, "LT");
+		if (opt) filter_parse_logs(filter, opt);
 	}
-	
+
 	//ifce (used by socket and other filters), use core default
 	if (!strcmp(arg_name, "ifce")) {
 		opt = gf_opts_get_key("core", "ifce");
@@ -1439,9 +1650,9 @@
 		&& !filter->multi_sink_target
 		&& (filter->freg->flags & GF_FS_REG_FORCE_REMUX)
 	) {
-		filter->force_demux = GF_TRUE;
+		filter->force_demux = 1;
 	}
-	//implicit linking mode: if not a script or if script init (initialized called) and no extra pid set, enable clonable 
+	//implicit linking mode: if not a script or if script init (initialized called) and no extra pid set, enable clonable
 	if ( (filter->session->flags & GF_FS_FLAG_IMPLICIT_MODE)
 		&& !filter->max_extra_pids
 		&& (for_script || !(filter->freg->flags&GF_FS_REG_SCRIPT))
@@ -1486,6 +1697,7 @@
 		}
 
 		if (!opaque_arg) {
+			Bool check_url_esc=GF_FALSE;
 			//we don't use gf_fs_path_escape_colon here because we also analyse whether the URL is internal or not, and we don't want to do that on each arg
 			if (sep) {
 				//escape XML inputs: simply search for ">:" (: being the arg sep), if not found consider the entire string the arg value
@@ -1604,6 +1816,7 @@
 							//get first : after root
 							if (sep) sep = strchr(sep+1, ':');
 						}
+						check_url_esc = GF_TRUE;
 					}
 				}
 
@@ -1613,10 +1826,13 @@
 				}
 				//escape data/time
 				if (sep) {
-					char *prev_date = sep-3;
-					if (prev_date0=='T') {}
-					else if (prev_date1=='T') { prev_date ++; }
-					else { prev_date = NULL; }
+					char *prev_date = NULL;
+					if ((u32) (sep - args)>=3) {
+						prev_date = sep-3;
+						if (prev_date0=='T') {}
+						else if (prev_date1=='T') { prev_date ++; }
+						else { prev_date = NULL; }
+					}
 
 skip_date:
 					if (prev_date) {
@@ -1673,6 +1889,10 @@
 			if (sep) {
 				escaped = (sep1 == filter->session->sep_args) ? NULL : strstr(sep, szEscape);
 				if (escaped && xml_start && (escaped>xml_start)) escaped = NULL;
+				//if we have a :gfopt: or :gfloc: set without :gpac: on a source, consider this as a valid escape pattern
+				if (check_url_esc && !escaped && !strncmp(args, szSrc, 4) && (!strncmp(sep, ":gfopt:", 7) ||!strncmp(sep, ":gfloc:", 7)))
+					escaped = sep;
+
 				if (escaped) {
 					sep = escaped;
 				}
@@ -1807,16 +2027,15 @@
 				if (reverse_bool && (argv.type==GF_PROP_BOOL))
 					argv.value.boolean = !argv.value.boolean;
 
-				if (argv.type != GF_PROP_FORBIDEN) {
+				if (argv.type != GF_PROP_FORBIDDEN) {
 					if (!for_script && (a->offset_in_private>=0)) {
 						gf_filter_set_arg(filter, a, &argv);
 					} else if (filter->freg->update_arg) {
 						FSESS_CHECK_THREAD(filter)
 						filter->freg->update_arg(filter, a->arg_name, &argv);
 						opaque_arg = GF_FALSE;
-
-						if ((argv.type==GF_PROP_STRING) && argv.value.string)
-							gf_free(argv.value.string);
+						if ((argv.type==GF_PROP_STRING) || (argv.type==GF_PROP_STRING_LIST))
+							gf_props_reset_single(&argv);
 					}
 				}
 				break;
@@ -1861,7 +2080,7 @@
 				internal_arg = GF_TRUE;
 			}
 			if (!strcmp("FS", szArg)) {
-				if (arg_type != GF_FILTER_ARG_INHERIT)
+				if (value && arg_type != GF_FILTER_ARG_INHERIT)
 					filter->subsession_id = atoi(value);
 
 				found = GF_TRUE;
@@ -1875,18 +2094,36 @@
 			}
 			//per-filter buffer times
 			else if (!strcmp("FBT", szArg)) {
-				if (arg_type!=GF_FILTER_ARG_INHERIT)
+				if (value && arg_type!=GF_FILTER_ARG_INHERIT)
 					filter->pid_buffer_max_us = atoi(value);
 				found = GF_TRUE;
 				internal_arg = GF_TRUE;
 			}
 			//per-filter buffer units
 			else if (!strcmp("FBU", szArg)) {
-				if (arg_type!=GF_FILTER_ARG_INHERIT)
+				if (value && arg_type!=GF_FILTER_ARG_INHERIT)
 					filter->pid_buffer_max_units = atoi(value);
 				found = GF_TRUE;
 				internal_arg = GF_TRUE;
 			}
+			else if (!strcmp("DL", szArg)) {
+				if (! filter->dynamic_filter) {
+					filter->deferred_link = GF_TRUE;
+					GF_LOG(GF_LOG_INFO, GF_LOG_FILTER, ("Deferred linking enabled for filter %s\n", filter->freg->name));
+				}
+				found = GF_TRUE;
+				internal_arg = GF_TRUE;
+			}
+			else if (!strcmp("LT", szArg)) {
+				found = GF_TRUE;
+				internal_arg = GF_TRUE;
+#ifndef GPAC_DISABLE_LOG
+				if (value)
+					filter_parse_logs(filter, value);
+#endif
+			}
+
+
 			//internal options, nothing to do here
 			else if (
 				//generic encoder load
@@ -1901,6 +2138,20 @@
 				found = GF_TRUE;
 				internal_arg = GF_TRUE;
 			}
+			else if (!strcmp("ccp", szArg)) {
+				found = GF_TRUE;
+				internal_arg = GF_TRUE;
+				if (!filter->dynamic_filter) {
+					if (value) {
+						GF_PropertyValue res = gf_filter_parse_prop_solve_env_var(filter->session, filter, GF_PROP_STRING_LIST, "ccp", value, NULL);
+						filter->skip_cids = res.value.string_list;
+					} else {
+						filter->skip_cids.nb_items = 1;
+						filter->skip_cids.vals = gf_malloc(sizeof(char*));
+						filter->skip_cids.vals0 = gf_strdup("AUTO");
+					}
+				}
+			}
 			//non tracked options
 			else if (!strcmp("gfopt", szArg)) {
 				found = GF_TRUE;
@@ -1916,6 +2167,13 @@
 				found = GF_TRUE;
 				internal_arg = GF_TRUE;
 			}
+			//filter itag
+			else if (!strcmp("ITAG", szArg)) {
+				if (filter->itag) gf_free(filter->itag);
+				filter->itag = value ? gf_strdup(value) : NULL;
+				found = GF_TRUE;
+				internal_arg = GF_TRUE;
+			}
 			//temporary filter
 			else if (!strcmp("_GFTMP", szArg)) {
 				filter->removed = GF_TRUE;
@@ -1927,21 +2185,37 @@
 				//only apply fo explicit sink, not dynamic and no multi-sink target
 				if ((arg_type==GF_FILTER_ARG_EXPLICIT_SINK) && !filter->dynamic_filter && !filter->multi_sink_target) {
 					if (value && (!strcmp(value, "0") || !strcmp(value, "false") || !strcmp(value, "no"))) {
-						filter->force_demux = GF_TRUE;
+						filter->force_demux = 2;
 					} else {
-						filter->force_demux = GF_FALSE;
+						filter->force_demux = 0;
 					}
 				}
 				found = GF_TRUE;
 				internal_arg = GF_TRUE;
 			}
+			else if (!strcmp("NCID", szArg)) {
+				if (filter->netcap_id) gf_free(filter->netcap_id);
+				filter->netcap_id = value ? gf_strdup(value) : NULL;
+				found = GF_TRUE;
+				internal_arg = GF_TRUE;
+			}
+#ifdef GPAC_ENABLE_DEBUG
+			else if (!strcmp("DBG", szArg)) {
+				if (value && !stricmp(value, "pid")) filter->prop_dump = 1;
+				else if (value && !stricmp(value, "pck")) filter->prop_dump = 2;
+				else if (value && !stricmp(value, "all")) filter->prop_dump = 3;
+				else if (!value) filter->prop_dump = 3;
+				found = GF_TRUE;
+				internal_arg = GF_TRUE;
+			}
+#endif
 			else if (!value && gf_file_exists(szArg)) {
 				internal_arg = GF_TRUE;
 				if (!for_script && (argfile_level<5) ) {
 					char szLine2001;
 					FILE *arg_file = gf_fopen(szArg, "rt");
 					szLine2000=0;
-					while (!gf_feof(arg_file)) {
+					while (arg_file && !gf_feof(arg_file)) {
 						u32 llen;
 						char *subarg, *res_line;
 						szLine0 = 0;
@@ -1970,7 +2244,11 @@
 
 						filter_parse_dyn_args(filter, subarg, arg_type, for_script, szSrc, szDst, szEscape, szSecName, has_meta_args, argfile_level+1);
 					}
-					gf_fclose(arg_file);
+					if (arg_file) {
+						gf_fclose(arg_file);
+					} else {
+						GF_LOG(GF_LOG_WARNING, GF_LOG_FILTER, ("Failed to open argument file %s, ignoring\n", szArg));
+					}
 				} else if (!for_script) {
 					GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Filter argument file has too many nested levels of sub-files, maximum allowed is 5\n"));
 				}
@@ -1995,7 +2273,7 @@
 			}
 		}
 
-		if (!internal_arg && !opaque_arg && !opts_optional)
+		if (!internal_arg && (!has_meta_args || !opaque_arg) && !opts_optional)
 			gf_fs_push_arg(filter->session, szArg, found, GF_ARGTYPE_LOCAL, meta_filter, NULL);
 
 skip_arg:
@@ -2045,7 +2323,11 @@
 
 	snprintf(szSecName, 200, "filter@%s", filter->freg->name);
 
-	//instantiate all args with defauts value
+#ifdef GPAC_CONFIG_EMSCRIPTEN
+	const GF_FilterArgs *index_arg = NULL;
+#endif
+
+	//instantiate all args with defaults value
 	f_args = filter->freg->args;
 	if (for_script)
 		f_args = filter->instance_args;
@@ -2056,6 +2338,12 @@
 		const GF_FilterArgs *a = &f_argsi;
 		if (!a || !a->arg_name) break;
 		i++;
+
+#ifdef GPAC_CONFIG_EMSCRIPTEN
+		if (!strcmp(a->arg_name, "index") && (a->arg_type==GF_PROP_SINT) && (a->offset_in_private>=0))
+			index_arg = a;
+#endif
+
 		if (a->flags & GF_FS_ARG_META) {
 			has_meta_args = GF_TRUE;
 			continue;
@@ -2068,7 +2356,7 @@
 
 		argv = gf_filter_parse_prop_solve_env_var(filter->session, filter, a->arg_type, a->arg_name, def_val, a->min_max_enum);
 
-		if (argv.type != GF_PROP_FORBIDEN) {
+		if (argv.type != GF_PROP_FORBIDDEN) {
 			if (!for_script && (a->offset_in_private>=0)) {
 				gf_filter_set_arg(filter, a, &argv);
 			} else if (filter->freg->update_arg) {
@@ -2086,6 +2374,19 @@
 
 
 	filter_parse_dyn_args(filter, args, arg_type, for_script, szSrc, szDst, szEscape, szSecName, has_meta_args, 0);
+
+#ifdef GPAC_CONFIG_EMSCRIPTEN
+	//index arg present on filter: if not 0, reframer will open file in read sync mode, force using main thread
+	if (index_arg) {
+#ifdef WIN32
+		void *ptr = (void *) (((char*) filter->filter_udta) + index_arg->offset_in_private);
+#else
+		void *ptr = filter->filter_udta + index_arg->offset_in_private;
+#endif
+		if (*(s32 *)ptr != 0)
+			gf_filter_force_main_thread(filter, GF_TRUE);
+	}
+#endif
 }
 
 static void reset_filter_args(GF_Filter *filter)
@@ -2094,14 +2395,14 @@
 	//removed or no stack
 	if (!filter->filter_udta) return;
 
-	//instantiate all args with defauts value
+	//instantiate all args with defaults value
 	while (filter->freg->args) {
 		GF_PropertyValue argv;
 		const GF_FilterArgs *a = &filter->freg->argsi;
 		i++;
 		if (!a || !a->arg_name) break;
 
-		if (a->arg_type != GF_PROP_FORBIDEN) {
+		if (a->arg_type != GF_PROP_FORBIDDEN) {
 			memset(&argv, 0, sizeof(GF_PropertyValue));
 			argv.type = a->arg_type;
 			gf_filter_set_arg(filter, a, &argv);
@@ -2122,10 +2423,10 @@
 			GF_FilterPidInst *pidi = gf_list_get(pid->destinations, j);
 			//PID was reconfigured, update props
 			if (pidi->reconfig_pid_props) {
-				assert(pidi->props);
+				gf_assert(pidi->props);
 				if (pidi->props != pidi->reconfig_pid_props) {
 					//unassign old property list and set the new one
-					assert(pidi->props->reference_count);
+					gf_assert(pidi->props->reference_count);
 					if (safe_int_dec(& pidi->props->reference_count) == 0) {
 						//see \ref gf_filter_pid_merge_properties_internal for mutex
 						gf_mx_p(pidi->pid->filter->tasks_mx);
@@ -2153,9 +2454,9 @@
 		if (pidinst->filter->num_input_pids != 1) break;
 		if (pidinst->filter->num_output_pids != 1) break;
 		//filter was explicitly loaded, cannot go beyond
-		if (! pidinst->filter->dynamic_filter) break;
+		if (! pidinst->filter->dynamic_filter && !pidinst->filter->encoder_codec_id) break;
 		opid = gf_list_get(pidinst->filter->output_pids, 0);
-		assert(opid);
+		if (!opid) break;
 		//we have a fan-out, we cannot replace the filter graph after that point
 		//this would affect the other branches of the upper graph
 		if (opid->num_destinations != 1) break;
@@ -2174,6 +2475,7 @@
 void gf_filter_relink_task(GF_FSTask *task)
 {
 	Bool needs_flush;
+	GF_Err e;
 	GF_FilterPidInst *cur_pidinst = task->udta;
 	/*GF_FilterPidInst *pidinst = */filter_relink_get_upper_pid(cur_pidinst, &needs_flush);
 	if (needs_flush) {
@@ -2181,32 +2483,39 @@
 		return;
 	}
 	//good do go, unprotect pid
-	assert(cur_pidinst->detach_pending);
+	gf_assert(cur_pidinst->detach_pending);
 	safe_int_dec(&cur_pidinst->detach_pending);
 	task->filter->removed = 0;
+	e = cur_pidinst->loss_rate;
+	cur_pidinst->loss_rate = 0;
 
- 	gf_filter_relink_dst(cur_pidinst);
+	gf_filter_relink_dst(cur_pidinst, e);
 }
 
-void gf_filter_relink_dst(GF_FilterPidInst *from_pidinst)
+void gf_filter_relink_dst(GF_FilterPidInst *from_pidinst, GF_Err reason)
 {
 	GF_Filter *filter_dst;
 	GF_FilterPid *link_from_pid = NULL;
 	u32 min_chain_len = 0;
+	Bool is_encoder = GF_FALSE;
 	Bool needs_flush = GF_FALSE;
 	GF_FilterPidInst *src_pidinst = from_pidinst;
-	GF_FilterPidInst *dst_pidinst;
+	GF_FilterPidInst *dst_pidinst = NULL;
 	GF_Filter *cur_filter = from_pidinst->filter;
 
+	if (from_pidinst->filter->encoder_codec_id) {
+		is_encoder = GF_TRUE;
+	}
 	//locate the true destination
 	dst_pidinst = filter_relink_get_upper_pid(src_pidinst, &needs_flush);
-	assert(dst_pidinst);
+	gf_fatal_assert(dst_pidinst);
 
 	//make sure we flush the end of the pipeline  !
 	if (needs_flush) {
 		cur_filter->removed = 2;
 		//prevent any fetch from pid
 		safe_int_inc(&src_pidinst->detach_pending);
+		src_pidinst->loss_rate = reason;
 		gf_fs_post_task(cur_filter->session, gf_filter_relink_task, cur_filter, NULL, "relink_dst", src_pidinst);
 		return;
 	}
@@ -2230,7 +2539,7 @@
 			gf_mx_v(cur_filter->tasks_mx);
 			break;
 		}
-		if (gf_filter_pid_caps_match((GF_FilterPid *)an_inpid, filter_dst->freg, filter_dst, NULL, NULL, NULL, -1)) {
+		if (is_encoder || gf_filter_pid_caps_match((GF_FilterPid *)an_inpid, filter_dst->freg, filter_dst, NULL, NULL, NULL, -1)) {
 			link_from_pid = an_inpid->pid;
 			gf_mx_v(cur_filter->tasks_mx);
 			break;
@@ -2258,21 +2567,24 @@
 			gf_filter_pid_send_event_internal(ipid, &evt, GF_TRUE);
 			GF_FEVT_INIT(evt, GF_FEVT_STOP, ipid);
 			gf_filter_pid_send_event_internal(ipid, &evt, GF_TRUE);
+			from_pidinst->filter->session->last_connect_error = reason;
 		}
 		gf_fs_post_task(cur_filter->session, gf_filter_pid_disconnect_task, from_pidinst->filter, from_pidinst->pid, "pidinst_disconnect", NULL);
 		return;
 	}
 	//detach the pidinst, and relink from the new input pid
-	gf_filter_renegociate_output_dst(link_from_pid, link_from_pid->filter, filter_dst, dst_pidinst, src_pidinst);
+	gf_filter_renegotiate_output_dst(link_from_pid, link_from_pid->filter, filter_dst, dst_pidinst, src_pidinst);
 }
 
-void gf_filter_renegociate_output_dst(GF_FilterPid *pid, GF_Filter *filter, GF_Filter *filter_dst, GF_FilterPidInst *dst_pidi, GF_FilterPidInst *src_pidi)
+GF_Filter *gf_fs_load_encoder(GF_FilterSession *fsess, const char *args, GF_List *filter_blacklist, GF_Err *err_code);
+
+void gf_filter_renegotiate_output_dst(GF_FilterPid *pid, GF_Filter *filter, GF_Filter *filter_dst, GF_FilterPidInst *dst_pidi, GF_FilterPidInst *src_pidi)
 {
 	Bool is_new_chain = GF_TRUE;
 	GF_Filter *new_f, *src_f;
 	Bool reconfig_only = src_pidi ? GF_FALSE: GF_TRUE;
 
-	assert(filter);
+	gf_assert(filter);
 
 	if (!filter_dst) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Internal error, lost destination for pid %s in filter %s while negotiating caps !!\n", pid->name, filter->name));
@@ -2281,15 +2593,25 @@
 
 	src_f = src_pidi ? src_pidi->pid->filter : pid->pid->filter;
 
+	if (src_pidi && src_pidi->filter->encoder_codec_id) {
+		new_f = gf_fs_load_encoder(filter->session, src_pidi->filter->orig_args, filter->blacklisted, NULL);
+
+		//store destination
+		if (new_f) {
+			gf_free(new_f->name);
+			new_f->name = gf_strdup("SOMETEST");
+			gf_list_add(new_f->destination_filters, filter_dst);
+		}
+	}
 	//try to load filters to reconnect output pid
 	//we pass the source pid if given, so that we are sure the active property set is used to match the caps
-	if (!reconfig_only
+	else if (!reconfig_only
 		&& (gf_list_find(src_f->blacklisted, (void*)filter_dst->freg)<0)
 		&& gf_filter_pid_caps_match(src_pidi ? (GF_FilterPid *)src_pidi : pid, filter_dst->freg, filter_dst, NULL, NULL, NULL, -1)
 	) {
 		GF_FilterPidInst *a_dst_pidi;
 		new_f = pid->filter;
-		assert(pid->num_destinations==1);
+		gf_assert(pid->num_destinations==1);
 		a_dst_pidi = gf_list_get(pid->destinations, 0);
 		//we are replacing the chain, remove filters until dest, keeping the final PID connected since we will detach
 		// and reattach it
@@ -2298,8 +2620,9 @@
 		is_new_chain = GF_FALSE;
 
 		//we will reassign packets from that pid instance to the new connection
-		assert(!filter_dst->swap_pidinst_dst);
+		gf_assert(!filter_dst->swap_pidinst_dst);
 		filter_dst->swap_pidinst_dst = a_dst_pidi;
+		filter_dst->swap_pending = GF_TRUE;
 
 		src_pidi->filter->removed = 2;
 
@@ -2317,7 +2640,7 @@
 		if (!new_f && filter_dst->forced_caps) {
 			new_f = gf_filter_pid_resolve_link_for_caps(pid, filter_dst, GF_FALSE);
 			if (new_f) {
-				//drop caps negociate
+				//drop caps negotiate
 				reconfig_only = GF_FALSE;
 			}
 		}
@@ -2360,13 +2683,14 @@
 		if (is_new_chain) {
 			//signal a stream reset is pending to prevent filter entering endless loop
 			safe_int_inc(&dst_pidi->filter->stream_reset_pending);
-			assert(!new_f->swap_pidinst_dst);
-			assert(!new_f->swap_pidinst_src);
+			gf_assert(!new_f->swap_pidinst_dst);
+			gf_assert(!new_f->swap_pidinst_src);
 			//keep track of the pidinst being detached in the target filter
 			new_f->swap_pidinst_dst = dst_pidi;
 			//keep track of the pidinst being detached from the source filter
 			new_f->swap_pidinst_src = src_pidi;
 			new_f->swap_needs_init = GF_TRUE;
+			new_f->swap_pending = GF_TRUE;
 		}
 		//we directly detach the pid
 		else {
@@ -2377,9 +2701,9 @@
 	}
 
 	if (reconfig_only) {
-		assert(pid->caps_negociate);
-		new_f->caps_negociate = pid->caps_negociate;
-		safe_int_inc(&new_f->caps_negociate->reference_count);
+		gf_fatal_assert(pid->caps_negotiate);
+		new_f->caps_negotiate = pid->caps_negotiate;
+		safe_int_inc(&new_f->caps_negotiate->reference_count);
 	}
 
 	if (is_new_chain) {
@@ -2403,12 +2727,12 @@
 	if (filter->is_pid_adaptation_filter) {
 		//do not remove from destination_filters, needed for end of pid_init task
 		if (!filter->dst_filter) filter->dst_filter = gf_list_get(filter->destination_filters, 0);
-		assert(filter->dst_filter);
-		assert(filter->num_input_pids==1);
+		gf_assert(filter->dst_filter);
+		gf_assert(filter->num_input_pids==1);
 	}
 	//swap to pid
-	pid->caps_negociate = filter->caps_negociate;
-	filter->caps_negociate = NULL;
+	pid->caps_negotiate = filter->caps_negotiate;
+	filter->caps_negotiate = NULL;
 	if (filter->freg->reconfigure_output) {
 		e = filter->freg->reconfigure_output(filter, pid);
 	} else {
@@ -2431,11 +2755,11 @@
 		gf_list_del(pid->adapters_blacklist);
 		src_pid->adapters_blacklist = NULL;
 	}
-	assert(pid->caps_negociate->reference_count);
-	if (safe_int_dec(&pid->caps_negociate->reference_count) == 0) {
-		gf_props_del(pid->caps_negociate);
+	gf_assert(pid->caps_negotiate->reference_count);
+	if (safe_int_dec(&pid->caps_negotiate->reference_count) == 0) {
+		gf_props_del(pid->caps_negotiate);
 	}
-	pid->caps_negociate = NULL;
+	pid->caps_negotiate = NULL;
 	if (filter->is_pid_adaptation_filter) {
 		filter->dst_filter = NULL;
 	}
@@ -2443,27 +2767,27 @@
 	return GF_TRUE;
 }
 
-static void gf_filter_renegociate_output(GF_Filter *filter, Bool force_afchain_insert)
+static void gf_filter_renegotiate_output(GF_Filter *filter, Bool force_afchain_insert)
 {
 	u32 i, j;
-	assert(filter->nb_caps_renegociate );
-	safe_int_dec(& filter->nb_caps_renegociate );
+	gf_assert(filter->nb_caps_renegotiate );
+	safe_int_dec(& filter->nb_caps_renegotiate );
 
 	gf_mx_p(filter->tasks_mx);
 
 	for (i=0; i<filter->num_output_pids; i++) {
 		GF_FilterPid *pid = gf_list_get(filter->output_pids, i);
-		if (pid->caps_negociate) {
+		if (pid->caps_negotiate) {
 			Bool is_ok = GF_FALSE;
 			Bool reconfig_direct = GF_FALSE;
 
-			//the caps_negociate property map is create with ref count 1
+			//the caps_negotiate property map is create with ref count 1
 
 			//no fanout, we can try direct reconfigure of the filter
 			if (pid->num_destinations<=1)
 				reconfig_direct = GF_TRUE;
-			//fanout but we have as many pid instances being negociated as there are destinations, we can try direct reconfigure
-			else if (pid->num_destinations==gf_list_count(pid->caps_negociate_pidi_list) && pid->caps_negociate_direct)
+			//fanout but we have as many pid instances being negotiated as there are destinations, we can try direct reconfigure
+			else if (pid->num_destinations==gf_list_count(pid->caps_negotiate_pidi_list) && pid->caps_negotiate_direct)
 				reconfig_direct = GF_TRUE;
 
 			//we cannot reconfigure output if more than one destination
@@ -2476,19 +2800,19 @@
 
 						GF_LOG(GF_LOG_WARNING, GF_LOG_FILTER, ("PID Adaptation Filter %s output reconfiguration error %s, discarding filter and reloading new adaptation chain\n", filter->name, gf_error_to_string(e)));
 
-						assert(filter->num_input_pids==1);
+						gf_assert(filter->num_input_pids==1);
 
 						gf_filter_pid_retry_caps_negotiate(src_pidi->pid, pid, pidi->filter);
 
 						continue;
 					}
-					GF_LOG(GF_LOG_WARNING, GF_LOG_FILTER, ("Filter %s output reconfiguration error %s, loading filter chain for renegociation\n", filter->name, gf_error_to_string(e)));
+					GF_LOG(GF_LOG_WARNING, GF_LOG_FILTER, ("Filter %s output reconfiguration error %s, loading filter chain for renegotiation\n", filter->name, gf_error_to_string(e)));
 				} else {
 					is_ok = GF_TRUE;
 					gf_filter_check_output_reconfig(filter);
 				}
 			} else {
-				GF_LOG(GF_LOG_INFO, GF_LOG_FILTER, ("Filter %s cannot reconfigure output pids, loading filter chain for renegociation\n", filter->name));
+				GF_LOG(GF_LOG_INFO, GF_LOG_FILTER, ("Filter %s cannot reconfigure output pids, loading filter chain for renegotiation\n", filter->name));
 			}
 
 			if (!is_ok) {
@@ -2497,43 +2821,43 @@
 				if (pid->num_destinations) {
 					for (j=0; j<pid->num_destinations; j++) {
 						GF_FilterPidInst *pidi = gf_list_get(pid->destinations, j);
-						if (gf_list_find(pid->caps_negociate_pidi_list, pidi)<0)
+						if (gf_list_find(pid->caps_negotiate_pidi_list, pidi)<0)
 							continue;
 						filter_dst = pidi->filter;
 
 						//prevent filter from unloading in case we have to disconnect the pid
 						if (!filter_dst->sticky) filter_dst->sticky = 2;
-						gf_filter_renegociate_output_dst(pid, filter, filter_dst, pidi, NULL);
+						gf_filter_renegotiate_output_dst(pid, filter, filter_dst, pidi, NULL);
 
 					}
 				}
 				//we are disconnected (unload of a previous adaptation filter)
 				else {
 					filter_dst = pid->caps_dst_filter;
-					assert(pid->num_destinations==0);
+					gf_assert(pid->num_destinations==0);
 					pid->caps_dst_filter = NULL;
-					gf_filter_renegociate_output_dst(pid, filter, filter_dst, NULL, NULL);
+					gf_filter_renegotiate_output_dst(pid, filter, filter_dst, NULL, NULL);
 				}
 			}
-			assert(pid->caps_negociate->reference_count);
-			if (safe_int_dec(&pid->caps_negociate->reference_count) == 0) {
-				gf_props_del(pid->caps_negociate);
-			}
-			pid->caps_negociate = NULL;
-			if (pid->caps_negociate_pidi_list) {
-				gf_list_del(pid->caps_negociate_pidi_list);
-				pid->caps_negociate_pidi_list = NULL;
+			gf_assert(pid->caps_negotiate->reference_count);
+			if (safe_int_dec(&pid->caps_negotiate->reference_count) == 0) {
+				gf_props_del(pid->caps_negotiate);
+			}
+			pid->caps_negotiate = NULL;
+			if (pid->caps_negotiate_pidi_list) {
+				gf_list_del(pid->caps_negotiate_pidi_list);
+				pid->caps_negotiate_pidi_list = NULL;
 			}
 		}
 	}
 	gf_mx_v(filter->tasks_mx);
 }
 
-void gf_filter_renegociate_output_task(GF_FSTask *task)
+void gf_filter_renegotiate_output_task(GF_FSTask *task)
 {
-	//it is possible that the cap renegociation was already done at the time we process this task
-	if (task->filter->nb_caps_renegociate)
-		gf_filter_renegociate_output(task->filter, GF_TRUE);
+	//it is possible that the cap renegotiation was already done at the time we process this task
+	if (task->filter->nb_caps_renegotiate)
+		gf_filter_renegotiate_output(task->filter, GF_TRUE);
 }
 
 static Bool session_should_abort(GF_FilterSession *fs)
@@ -2553,11 +2877,11 @@
 	//TODO: find a way to bypass this mutex ?
 	gf_mx_p(filter->tasks_mx);
 
-	assert(filter->scheduled_for_next_task || filter->session->direct_mode);
-	assert(filter->process_task_queued);
+	gf_assert(filter->scheduled_for_next_task || filter->session->direct_mode);
+	gf_assert(filter->process_task_queued);
 	if (safe_int_dec(&filter->process_task_queued) == 0) {
 		//we have pending packets, auto-post and requeue
-		if (filter->pending_packets) {
+		if (filter->pending_packets && filter->num_input_pids) {
 			safe_int_inc(&filter->process_task_queued);
 			task->requeue_request = GF_TRUE;
 		}
@@ -2652,7 +2976,7 @@
 		//give it at most one second
 		diff = gf_sys_clock_high_res() - filter->time_at_first_error;
 		if (diff >= 1000000) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Filter %s in error / not responding properly: %d consecutive errors in "LLU" us with no packet discarded or sent\n\tdiscarding all inputs and notifying end of stream on all outputs\n", filter->name, filter->nb_consecutive_errors, diff));
+			GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Filter %s (idx %u) in error / not responding properly: %d consecutive errors in "LLU" us with no packet discarded or sent\n\tdiscarding all inputs and notifying end of stream on all outputs\n", filter->name, 1+gf_list_find(filter->session->filters, filter), filter->nb_consecutive_errors, diff));
 			kill_filter = GF_TRUE;
 		}
 	} else {
@@ -2664,9 +2988,9 @@
 			out_e = GF_SERVICE_ERROR;
 			if (filter->nb_consecutive_errors >= 100000) {
 				if (for_reconnection) {
-					GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Filter %s not responding properly: %d consecutive attempts at reconfiguring\n\tdiscarding all inputs and notifying end of stream on all outputs\n", filter->name, filter->nb_consecutive_errors));
+					GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Filter %s (idx %u) not responding properly: %d consecutive attempts at reconfiguring\n\tdiscarding all inputs and notifying end of stream on all outputs\n", filter->name, 1+gf_list_find(filter->session->filters, filter), filter->nb_consecutive_errors));
 				} else if (!filter->session->in_final_flush) {
-					GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Filter %s not responding properly: %d consecutive process with no packet discarded or sent, but %d packets pending\n\tdiscarding all inputs and notifying end of stream on all outputs\n", filter->name, filter->nb_consecutive_errors, filter->pending_packets));
+					GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Filter %s (idx %u) not responding properly: %d consecutive process with no packet discarded or sent, but %d packets pending\n\tdiscarding all inputs and notifying end of stream on all outputs\n", filter->name, 1+gf_list_find(filter->session->filters, filter), filter->nb_consecutive_errors, filter->pending_packets));
 				} else {
 					out_e = GF_OK;
 				}
@@ -2701,9 +3025,9 @@
 	Bool skip_block_mode = GF_FALSE;
 	GF_Filter *filter = task->filter;
 	Bool force_block_state_check=GF_FALSE;
-	assert(task->filter);
-	assert(filter->freg);
-	assert(filter->freg->process);
+	gf_assert(task->filter);
+	gf_assert(filter->freg);
+	gf_assert(filter->freg->process);
 	task->can_swap = 1;
 
 	filter->schedule_next_time = 0;
@@ -2716,13 +3040,13 @@
 		return;
 	}
 
-	if (filter->out_pid_connection_pending || filter->detached_pid_inst || filter->caps_negociate) {
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("Filter %s has %s pending, requeuing process\n", filter->name, filter->out_pid_connection_pending ? "connections" : filter->caps_negociate ? "caps negociation" : "input pid reassignments"));
+	if (filter->out_pid_connection_pending || filter->detached_pid_inst || filter->caps_negotiate) {
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("Filter %s has %s pending, requeuing process\n", filter->name, filter->out_pid_connection_pending ? "connections" : filter->caps_negotiate ? "caps negotiation" : "input pid reassignments"));
 		//do not cancel the process task since it might have been triggered by the filter itself,
 		//we would not longer call it
 		task->requeue_request = GF_TRUE;
 
- 		assert(filter->process_task_queued);
+ 		gf_assert(filter->process_task_queued);
 		//in we are during the graph resolution phase, to not ask for RT reschedule: this can post-pone process tasks and change their initial
 		//scheduling order, resulting in random change of input pid declaration, for example:
 		//fin1 -> reframe1 -> fA
@@ -2742,6 +3066,7 @@
 	}
 
 	if (filter->prevent_blocking) skip_block_mode = GF_TRUE;
+	else if (filter->in_eos_resume) skip_block_mode = GF_TRUE;
 	else if (filter->session->in_final_flush) skip_block_mode = GF_TRUE;
 
 	//blocking filter: remove filter process task - task will be reinserted upon unblock()
@@ -2761,11 +3086,14 @@
 		GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("Filter %s has stream reset pending, postponing process\n", filter->name));
 		filter->nb_tasks_done--;
 		task->requeue_request = GF_TRUE;
-		assert(filter->process_task_queued);
+		gf_assert(filter->process_task_queued);
+		return;
+	}
+	gf_assert(filter->process_task_queued);
+	if (filter->multi_sink_target) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Filter %s is a multi-sink target, process disabled\n", filter->name));
 		return;
 	}
-	assert(filter->process_task_queued);
-	assert(!filter->multi_sink_target);
 
 	//the following breaks demuxers where PIDs are not all known from start: if we filter some pids due to user request,
 	//we may end up with the following test true but not all PIDs yet declared, hence no more processing
@@ -2786,7 +3114,7 @@
 				//packet is pending so was added at the end of our postponed queue - remove from queue and reinsert in front
 				gf_list_del_item(task->filter->postponed_packets, pck);
 				gf_list_insert(task->filter->postponed_packets, pck, 0);
-				task->requeue_request = GF_TRUE;
+				task->requeue_request = filter->deferred_link ? GF_FALSE : GF_TRUE;
 				GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("Filter %s still has postponed packets, postponing process\n", filter->name));
 				return;
 			}
@@ -2798,8 +3126,8 @@
 
 	filter->nb_pck_io = 0;
 
-	if (filter->nb_caps_renegociate) {
-		gf_filter_renegociate_output(filter, GF_FALSE);
+	if (filter->nb_caps_renegotiate) {
+		gf_filter_renegotiate_output(filter, GF_FALSE);
 	}
 
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("Filter %s process\n", filter->name));
@@ -2819,13 +3147,9 @@
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("Filter %s process done\n", filter->name));
 
 	//flush all pending pid init requests following the call to init
-	if (filter->has_pending_pids) {
-		filter->has_pending_pids=GF_FALSE;
-		while (gf_fq_count(filter->pending_pids)) {
-			GF_FilterPid *pid=gf_fq_pop(filter->pending_pids);
-			gf_filter_pid_post_init_task(filter, pid);
-		}
-	}
+	gf_filter_check_pending_pids(filter);
+
+
 	//no requeue if end of session
 	if (session_should_abort(filter->session)) {
 		return;
@@ -2859,7 +3183,7 @@
 
 			gf_list_add(a_pidinst->pid->filter->blacklisted, (void *) filter->freg);
 
-			gf_filter_relink_dst(a_pidinst);
+			gf_filter_relink_dst(a_pidinst, e);
 		}
 		filter->process_task_queued = 0;
 		gf_mx_v(filter->tasks_mx);
@@ -2876,14 +3200,14 @@
 		if (filter->schedule_next_time)
 			task->schedule_next_time = filter->schedule_next_time;
 		task->requeue_request = GF_TRUE;
-		assert(filter->process_task_queued);
+		gf_assert(filter->process_task_queued);
 	}
 	//filter requested a requeue
 	else if (filter->schedule_next_time) {
 		if (!filter->session->in_final_flush) {
 			task->schedule_next_time = filter->schedule_next_time;
 			task->requeue_request = GF_TRUE;
-			assert(filter->process_task_queued);
+			gf_assert(filter->process_task_queued);
 		}
 	}
 	//last task for filter but pending packets and not blocking, requeue in main scheduler
@@ -2903,14 +3227,14 @@
 		}
 		task->requeue_request = GF_TRUE;
 		task->can_swap = 2;
-		assert(filter->process_task_queued);
+		gf_assert(filter->process_task_queued);
 	}
 	else {
-		assert (!filter->schedule_next_time);
+		gf_assert (!filter->schedule_next_time);
 		gf_filter_check_pending_tasks(filter, task);
 		if (task->requeue_request) {
 			task->can_swap = 2;
-			assert(filter->process_task_queued);
+			gf_assert(filter->process_task_queued);
 		}
 	}
 }
@@ -2957,13 +3281,9 @@
 	filter->in_process = GF_FALSE;
 
 	//flush all pending pid init requests following the call to init
-	if (filter->has_pending_pids) {
-		filter->has_pending_pids=GF_FALSE;
-		while (gf_fq_count(filter->pending_pids)) {
-			GF_FilterPid *pid=gf_fq_pop(filter->pending_pids);
-			gf_filter_pid_post_init_task(filter, pid);
-		}
-	}
+	gf_filter_check_pending_pids(filter);
+
+
 	//no requeue if end of session
 	if (session_should_abort(filter->session)) {
 		return;
@@ -2989,7 +3309,7 @@
 		GF_Filter *old_source;
 		GF_FilterPidInst *first_in = gf_list_get(filter->input_pids, 0);
 		//if source filter is set, this is a clone due to a new instance request, so we have at least one input
-		assert(first_in);
+		if (!first_in) return NULL;
 		old_source = first_in->pid->filter;
 		//get source arguments for new source filter connecting to the clone
 		const char *args_src_new = gf_filter_get_args_stripped(filter->session, source_filter->src_args ? source_filter->src_args : source_filter->orig_args, GF_FALSE);
@@ -3022,6 +3342,7 @@
 	}
 	if (!new_filter) return NULL;
 	new_filter->cloned_from = filter;
+	new_filter->dynamic_filter = filter->dynamic_filter ? 1 : 0;
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("Filter cloned (register %s, args %s)\n", filter->freg->name, filter->orig_args ? filter->orig_args : "none"));
 
 	return new_filter;
@@ -3068,7 +3389,7 @@
 
 	//lock task mx to take the decision whether to post a new task or not (cf gf_filter_check_pending_tasks)
 	gf_mx_p(filter->tasks_mx);
-	assert((s32)filter->process_task_queued>=0);
+	gf_assert((s32)filter->process_task_queued>=0);
 
 	if (use_direct_dispatch) {
 		safe_int_inc(&filter->process_task_queued);
@@ -3078,7 +3399,7 @@
 		gf_fs_post_task(filter->session, gf_filter_process_task, filter, NULL, "process", NULL);
 	} else {
 		GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("Filter %s skip post process task\n", filter->name));
-		assert(filter->session->run_status
+		gf_assert(filter->session->run_status
 		 		|| filter->session->in_final_flush
 		 		|| filter->disabled
 				|| filter->scheduled_for_next_task
@@ -3087,7 +3408,7 @@
 		);
 	}
 	if (!filter->session->direct_mode && !use_direct_dispatch) {
-		assert(filter->process_task_queued);
+		gf_assert(filter->process_task_queued);
 	}
 	gf_mx_v(filter->tasks_mx);
 }
@@ -3303,11 +3624,10 @@
 
 //#define DUMP_TASKS
 #if !defined(GPAC_DISABLE_LOG) && defined DUMP_TASKS
-static Bool task_postponed_log(void *udta, void *item)
+static void task_postponed_log(void *udta, void *item)
 {
 	GF_FSTask *at = (GF_FSTask *)item;
 	GF_LOG(GF_LOG_INFO, GF_LOG_FILTER, ("\ttask %s\n", at->log_name));
-	return GF_FALSE;
 }
 #endif
 
@@ -3323,7 +3643,7 @@
 		return;
 	}
 
-	assert(f->finalized);
+	gf_assert(f->finalized);
 
 	if (count!=1) {
 		task->requeue_request = GF_TRUE;
@@ -3371,9 +3691,9 @@
 {
 	//session about to be destroy, don't post task
 	if (filter->session->run_status==GF_EOS) return;
-	assert(!filter->swap_pidinst_dst);
-	assert(!filter->swap_pidinst_src);
-	assert(!filter->finalized);
+	gf_assert(!filter->swap_pidinst_dst);
+	gf_assert(!filter->swap_pidinst_src);
+	gf_assert(!filter->finalized);
 	filter->finalized = GF_TRUE;
 
 	//post remove task ON THE FILTER, otherwise we might end up having 2 threads on the active filter
@@ -3462,7 +3782,7 @@
 		GF_LOG(GF_LOG_INFO, GF_LOG_FILTER, ("Disconnecting filter %s from session\n", filter->name));
 	}
 	//get all dest pids, post disconnect and mark filters as removed
-	assert(!filter->removed);
+	gf_assert(!filter->removed);
 	filter->removed = 1;
 	for (i=0; i<filter->num_output_pids; i++) {
 		GF_FilterPid *pid = gf_list_get(filter->output_pids, i);
@@ -3522,14 +3842,48 @@
 	gf_filter_remove_internal(src_filter, filter, GF_FALSE);
 }
 
-GF_EXPORT
-void gf_filter_remove(GF_Filter *filter)
+static void gf_filter_remove_local(GF_Filter *filter, GF_FSTask *task);
+static void gf_filter_remove_reschedule(GF_FSTask *task)
+{
+	gf_filter_remove_local(task->filter, task);
+}
+
+static void gf_filter_remove_local(GF_Filter *filter, GF_FSTask *task)
 {
 	u32 i;
+	Bool has_pending=GF_FALSE;
 	if (!filter) return;
 
-	//locate source filter(s)
 	gf_mx_p(filter->tasks_mx);
+	//check the sources for filter does not have any pending PID init task or PID configure task
+	//this avoids deleting the filter before a new filter is inserted at the same source, triggering
+	//destruction of the chain
+	//we don't check for any other pending connections at the session level
+	for (i=0; i<filter->num_input_pids; i++) {
+		GF_FilterPidInst *pidi = gf_list_get(filter->input_pids, i);
+		if (pidi->pid->init_task_pending || pidi->pid->filter->out_pid_connection_pending) {
+			has_pending=GF_TRUE;
+			break;
+		}
+	}
+
+	if (has_pending) {
+		if (task) {
+			task->can_swap = GF_TRUE;
+			task->requeue_request = GF_TRUE;
+		} else {
+			gf_fs_post_task(filter->session, gf_filter_remove_reschedule, filter, NULL, "filter_remove", NULL);
+		}
+		gf_mx_v(filter->tasks_mx);
+		return;
+	}
+
+	//disconnect all output pids, this will remove all filters up the chain if no more inputs and outputs
+	for (i=0; i<filter->num_output_pids; i++) {
+		GF_FilterPid *pid = gf_list_get(filter->output_pids, i);
+		gf_filter_pid_remove(pid);
+	}
+	//locate source filter(s)
 	for (i=0; i<filter->num_input_pids; i++) {
 		GF_FilterPidInst *pidi = gf_list_get(filter->input_pids, i);
 		//fanout, only disconnect this pid instance
@@ -3551,7 +3905,7 @@
 		} else {
 			GF_FilterEvent fevt;
 			//source filter still active, mark output pid as not connected, send a stop and post disconnect
-			assert(pidi->pid->num_destinations==1);
+			gf_assert(pidi->pid->num_destinations==1);
 			pidi->pid->not_connected=1;
 			pidi->pid->filter->num_out_pids_not_connected++;
 			GF_FEVT_INIT(fevt, GF_FEVT_STOP, (GF_FilterPid *) pidi);
@@ -3564,6 +3918,13 @@
 	gf_mx_v(filter->tasks_mx);
 }
 
+GF_EXPORT
+void gf_filter_remove(GF_Filter *filter)
+{
+	//always post a task for remove, this allows users to do remove() followed by add filter() without triggering stops
+	gf_fs_post_task(filter->session, gf_filter_remove_reschedule, filter, NULL, "filter_remove", NULL);
+}
+
 #if 0
 GF_EXPORT
 void gf_filter_remove_dst(GF_Filter *filter, GF_Filter *dst_filter)
@@ -3801,7 +4162,7 @@
 
 	args = inherit_args ? gf_filter_get_dst_args(filter) : NULL;
 	if (args) {
-		char *rem_opts = {"FID", "SID", "N", "RSID", "clone", NULL};
+		char *rem_opts = {"FID", "SID", "N", "RSID", "clone", "DL", NULL};
 		char szSep10;
 		char *loc_args;
 		u32 opt_idx;
@@ -3924,16 +4285,16 @@
 GF_EXPORT
 u32 gf_filter_get_num_events_queued(GF_Filter *filter)
 {
-	u32 res;
-	GF_FilterSession *fsess;
 	if (!filter) return 0;
-	fsess = filter->session;
-
+#ifndef GPAC_DISABLE_THREADS
+	GF_FilterSession *fsess = filter->session;
 	gf_mx_p(fsess->filters_mx);
-	res = gf_filter_get_num_events_queued_internal(filter);
+	u32 res = gf_filter_get_num_events_queued_internal(filter);
 	gf_mx_v(fsess->filters_mx);
-
 	return res;
+#else
+	return gf_filter_get_num_events_queued_internal(filter);
+#endif
 }
 
 GF_EXPORT
@@ -4027,6 +4388,8 @@
 	//we accept caps override event on a running filter, this will only impact the next link solving
 	filter->forced_caps = nb_caps ? caps : NULL;
 	filter->nb_forced_caps = nb_caps;
+	filter->nb_forced_bundles = nb_caps ? gf_filter_caps_bundle_count(caps, nb_caps) : 0;
+
 	filter->bundle_idx_at_resolution = -1;
 	return GF_OK;
 }
@@ -4131,7 +4494,7 @@
 	gf_filter_pid_set_property(pid, GF_PROP_PID_STREAM_TYPE, &PROP_UINT(GF_STREAM_FILE) );
 
 	if (local_file)
-        	gf_filter_pid_set_property(pid, GF_PROP_PID_FILEPATH, &PROP_STRING(local_file));
+		gf_filter_pid_set_property(pid, GF_PROP_PID_FILEPATH, &PROP_STRING(local_file));
 
 
 	if (url) {
@@ -4164,7 +4527,15 @@
 			gf_filter_pid_set_property(pid, GF_PROP_PID_FILE_EXT, &PROP_STRING(tmp_ext));
 			ext_len = (u32) strlen(tmp_ext);
 		} else {
-			char *ext = gf_file_ext_start(url);
+			char *ext=NULL;
+			char *scheme = strncmp(url, "gfio://", 7) ? strstr(url, "://") : NULL;
+			if (scheme) {
+				scheme = strchr(scheme+3, '/');
+				if (scheme)
+					ext = gf_file_ext_start(scheme);
+			} else {
+				ext = gf_file_ext_start(url);
+			}
 			if (ext) ext++;
 
 			if (ext) {
@@ -4260,11 +4631,12 @@
 }
 
 GF_EXPORT
-const char *gf_filter_probe_data(GF_Filter *filter, u8 *data, u32 size)
+const char *gf_filter_probe_data(GF_Filter *filter, u8 *data, u32 size, GF_FilterProbeScore *pscore)
 {
 	u32 i, count;
 	GF_FilterProbeScore score, max_score = GF_FPROBE_NOT_SUPPORTED;
 	const char *probe_mime = NULL;
+	if (pscore) *pscore = GF_FPROBE_NOT_SUPPORTED;
 	if (!size) return NULL;
 	gf_mx_p(filter->session->filters_mx);
 	count = gf_list_count(filter->session->registry);
@@ -4285,6 +4657,7 @@
 		}
 	}
 	gf_mx_v(filter->session->filters_mx);
+	if (pscore) *pscore = max_score;
 	return probe_mime;
 }
 
@@ -4422,19 +4795,21 @@
 	for (i=0; i<count; i++) {
 		u32 j;
 		GF_Filter *f = gf_list_get(filter->session->filters, i);
-		if (f->num_output_pids) continue;
+		if (!f || f->num_output_pids) continue;
+		gf_mx_v(filter->session->filters_mx);
 		gf_mx_p(f->tasks_mx);
 		for (j=0; j<f->num_input_pids; j++) {
 			GF_FilterPidInst *pidi = gf_list_get(f->input_pids, j);
 			if (pidi->pid->is_playing && !pidi->is_end_of_stream) {
 				res = GF_FALSE;
 				gf_mx_v(f->tasks_mx);
-				goto exit;
+				return res;
 			}
 		}
 		gf_mx_v(f->tasks_mx);
+		gf_mx_p(filter->session->filters_mx);
 	}
-exit:
+
 	gf_mx_v(filter->session->filters_mx);
 	return res;
 }
@@ -4508,7 +4883,7 @@
 		const char *args;
 		GF_Filter *src = gf_list_get(filter->session->filters, i);
 		//check only sinks
-		if (src->freg->configure_pid) continue;
+		if (!src || src->freg->configure_pid) continue;
 		args = src->src_args;
 		if (!args) args = src->orig_args;
 		if (!args || (strlen(args)<5) ) continue;
@@ -4516,10 +4891,15 @@
 		if (strncmp(args + 4, protocol_scheme, len)) continue;
 		if (!expand_proto && (argslen != ':')) continue;
 
+		//release session mutex as gf_filter_in_parent_chain may block on filter if it is waiting for the session mutex
+		gf_mx_v(filter->session->filters_mx);
 		if (! gf_filter_in_parent_chain(filter, src)) {
 			u32 j=0;
 			Bool found=GF_FALSE;
-			if (!enum_pids) continue;
+			if (!enum_pids) {
+				gf_mx_p(filter->session->filters_mx);
+				continue;
+			}
 			while (1) {
 				GF_FilterPid *pid = enum_pids(udta, &j);
 				if (!pid) break;
@@ -4529,10 +4909,14 @@
 					break;
 				}
 			}
-			if (!found) continue;
+			if (!found) {
+				gf_mx_p(filter->session->filters_mx);
+				continue;
+			}
 		}
 
 		res++;
+		gf_mx_p(filter->session->filters_mx);
 	}
 
 	gf_mx_v(filter->session->filters_mx);
@@ -4590,15 +4974,17 @@
 GF_EXPORT
 Bool gf_filter_has_pid_connection_pending(GF_Filter *filter, GF_Filter *stop_at_filter)
 {
-	GF_FilterSession *fsess;
-	Bool res;
 	if (!filter) return GF_FALSE;
+#ifndef GPAC_DISABLE_THREADS
 	//lock session, this is an unsafe call
-	fsess = filter->session;
+	GF_FilterSession *fsess = filter->session;
 	gf_mx_p(fsess->filters_mx);
-	res = gf_filter_has_pid_connection_pending_internal(filter, stop_at_filter);
+	Bool res = gf_filter_has_pid_connection_pending_internal(filter, stop_at_filter);
 	gf_mx_v(fsess->filters_mx);
 	return res;
+#else
+	return gf_filter_has_pid_connection_pending_internal(filter, stop_at_filter);
+#endif
 }
 
 GF_EXPORT
@@ -4781,8 +5167,9 @@
 	for (i=0; i<count; i++) {
 		u32 j;
 		GF_Filter *f = gf_list_get(filter->session->filters, i);
-		if (f->removed || f->finalized) continue;
+		if (!f || f->removed || f->finalized) continue;
 
+		gf_mx_v(filter->session->filters_mx);
 		gf_mx_p(f->tasks_mx);
 		for (j=0; j<f->num_output_pids; j++) {
 			GF_FilterPid *pid = gf_list_get(f->output_pids, j);
@@ -4793,11 +5180,13 @@
 		}
 		if (res) {
 			gf_mx_v(f->tasks_mx);
+			gf_mx_p(filter->session->filters_mx);
 			break;
 		}
 
 		if (f==filter) {
 			gf_mx_v(f->tasks_mx);
+			gf_mx_p(filter->session->filters_mx);
 			continue;
 		}
 
@@ -4817,6 +5206,7 @@
 			}
 		}
 		gf_mx_v(f->tasks_mx);
+		gf_mx_p(filter->session->filters_mx);
 		if (res)
 			break;
 	}
@@ -4853,6 +5243,17 @@
 	if (for_pid) {
 		if (PID_IS_INPUT(for_pid)) return GF_BAD_PARAM;
 	}
+	//in case we had pending output pids
+	if (filter->deferred_link) {
+		filter->deferred_link = GF_FALSE;
+		if (filter->has_pending_pids) {
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("Applying defer linking of filter %s\n", filter->name));
+			gf_filter_check_pending_pids(filter);
+		}
+		return GF_OK;
+	}
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("Relinking filter %s PID %s\n", filter->name, for_pid ? for_pid->name : "all"));
+
 	for (i=0; i<filter->num_output_pids; i++) {
 		GF_FilterPid *pid = gf_list_get(filter->output_pids, i);
 		if (for_pid && (pid != for_pid)) continue;
@@ -4889,6 +5290,7 @@
 	capsnb_caps.flags = flags;
 	filter->nb_forced_caps++;
 	filter->forced_caps = caps;
+	filter->nb_forced_bundles = filter->nb_forced_caps ? gf_filter_caps_bundle_count(filter->forced_caps, filter->nb_forced_caps) : 0;
 
 	//reload graph for this updated registry!
 	GF_FilterRegister *freg = (GF_FilterRegister *)filter->freg;
@@ -5041,6 +5443,7 @@
 	if (filter && dst_filter) {
 		filter->forced_caps = dst_filter->forced_caps;
 		filter->nb_forced_caps = dst_filter->nb_forced_caps;
+		filter->nb_forced_bundles = dst_filter->nb_forced_bundles;
 	}
 }
 
@@ -5097,6 +5500,8 @@
 	if (!filter) return GF_BAD_PARAM;
 	//ignored in non implicit mode
 	if (! (filter->session->flags & GF_FS_FLAG_IMPLICIT_MODE)) return GF_OK;
+	//subsession explicitly assigned
+	if (filter->subsession_id) return filter->subsession_id;
 	filter->subsession_id = subsession_id;
 	if (gf_filter_is_sink(filter))
 		filter->subsource_id = 0;
@@ -5131,3 +5536,158 @@
 {
 	return filter ? filter->meta_instances : NULL;
 }
+
+void gf_filter_skip_seg_size_events(GF_Filter *filter)
+{
+	if (filter) filter->no_segsize_evts=GF_TRUE;
+}
+
+	//filter netcap_id
+GF_EXPORT
+const char *gf_filter_get_netcap_id(GF_Filter *filter)
+{
+	return filter ? filter->netcap_id : NULL;
+}
+
+
+#if 0
+void gf_filter_pid_dump_buffers(GF_FilterPid *pid)
+{
+	u32 i, j, count;
+	if (!pid) return;
+	if (PID_IS_OUTPUT(pid)) {
+		for (i=0; i<pid->num_destinations; i++) {
+			GF_FilterPidInst *pidi = gf_list_get(pid->destinations, i);
+			GF_LOG(GF_LOG_WARNING, GF_LOG_APP, ("%s (%s->%s) %d packets\n", pid->name, pid->filter->name, pidi->filter->name, gf_fq_count(pidi->packets)));
+			count = gf_list_count(pidi->filter->output_pids);
+			for (j=0; j<count; j++) {
+				gf_filter_pid_dump_buffers( gf_list_get(pidi->filter->output_pids, j) );
+			}
+		}
+		return;
+	}
+	GF_FilterPidInst *pid_inst = (GF_FilterPidInst *) pid;
+	GF_LOG(GF_LOG_WARNING, GF_LOG_APP, ("%s (%s->%s) %d packets\n", pid_inst->pid->name, pid_inst->pid->filter->name, pid_inst->filter->name, gf_fq_count(pid_inst->packets)));
+	for (i=0; i<pid_inst->pid->filter->num_input_pids; i++) {
+		pid = gf_list_get(pid_inst->pid->filter->input_pids, i);
+		gf_filter_pid_dump_buffers(pid);
+	}
+}
+GF_EXPORT
+void gf_filter_dump_buffers(GF_Filter *f)
+{
+	u32 i;
+	for (i=0; i<f->num_input_pids; i++) {
+		gf_filter_pid_dump_buffers(gf_list_get(f->input_pids, i) );
+	}
+	for (i=0; i<f->num_output_pids; i++) {
+		gf_filter_pid_dump_buffers(gf_list_get(f->output_pids, i) );
+	}
+}
+#endif
+
+GF_EXPORT
+GF_Err gf_filter_probe_link(GF_Filter *filter, u32 opid_idx, const char *fname, char **res_chain)
+{
+	char *fdesc=NULL;
+	char szFmt20;
+	GF_Filter *new_f;
+	GF_Err e;
+	GF_FilterPid *opid=NULL;
+	GF_FilterSession *fs;
+	if (!filter || !fname || !res_chain) return GF_BAD_PARAM;
+	*res_chain = NULL;
+	fs = filter->session;
+
+	opid = gf_filter_get_opid(filter, opid_idx);
+	if (!opid) return GF_BAD_PARAM;
+
+	if (!strncmp(fname, "src=", 4) || !strlen(fname)) return GF_BAD_PARAM;
+
+	fdesc = gf_strdup(fname);
+	sprintf(szFmt, "%cgpac", fs->sep_args);
+	if (strstr(fdesc, szFmt)) {
+		sprintf(szFmt, "%c_GFTMP", fs->sep_args);
+	} else {
+		sprintf(szFmt, "%c%cgpac%c%c_GFTMP", fs->sep_args, fs->sep_args, fs->sep_args, fs->sep_args);
+	}
+	gf_dynstrcat(&fdesc, szFmt, NULL);
+
+	gf_fs_lock_filters(fs, GF_TRUE);
+	if (!strncmp(fname, "dst=", 4)) {
+		new_f = gf_fs_load_destination(fs, fdesc+4, NULL, NULL, &e);
+	} else {
+		new_f = gf_fs_load_filter(fs, fdesc, &e);
+	}
+	gf_free(fdesc);
+
+	if (!new_f) {
+		gf_fs_lock_filters(fs, GF_FALSE);
+		return e;
+	}
+
+	GF_List *fchain = gf_filter_pid_compute_link(opid, new_f);
+	if (fchain) {
+		u32 i, count = gf_list_count(fchain);
+		for (i=0; i<count; i+=2) {
+			const GF_FilterRegister *freg = gf_list_get(fchain, i);
+			gf_dynstrcat(res_chain, freg->name, ",");
+		}
+		gf_list_del(fchain);
+	} else {
+		e = GF_FILTER_NOT_FOUND;
+	}
+	gf_list_del_item(fs->filters, new_f);
+	if (!new_f->finalized && new_f->freg->finalize) {
+		new_f->freg->finalize(new_f);
+	}
+	gf_filter_del(new_f);
+	gf_fs_lock_filters(fs, GF_FALSE);
+	return e;
+}
+
+
+
+GF_EXPORT
+GF_Err gf_filter_get_possible_destinations(GF_Filter *filter, s32 opid_idx, char **res_list)
+{
+	u32 i, j, k, count;
+	GF_FilterPid *opid=NULL;
+	if (!filter || !res_list) return GF_BAD_PARAM;
+	if (opid_idx>=0) {
+		opid = gf_list_get(filter->output_pids, opid_idx);
+		if (opid==NULL) return GF_BAD_PARAM;
+	}
+	*res_list = NULL;
+	count = gf_list_count(filter->session->links);
+	for (i=0; i<count; i++) {
+		Bool is_match=GF_FALSE;
+		const GF_FilterRegDesc *src = gf_list_get(filter->session->links, i);
+		if (!src->nb_edges)
+			continue;
+
+		for (j=0; j<src->nb_edges; j++) {
+			GF_FilterRegEdge *edge = &src->edgesj;
+			if (edge->src_reg->freg != filter->freg) continue;
+			//check pid caps match
+
+			for (k=0; k<filter->num_output_pids; k++) {
+				if ((opid_idx>=0) && ((u32)opid_idx==k)) continue;
+				opid = gf_list_get(filter->output_pids, k);
+				if (!opid) break;
+
+				u8 priority=0;
+				u32 dst_bundle_idx;
+				//check path weight for the given dst cap - we MUST give the target cap otherwise we might get a default match to another cap
+				u32 path_weight = gf_filter_pid_caps_match(opid, src->freg, NULL, &priority, &dst_bundle_idx, opid->filter->dst_filter, edge->dst_cap_idx);
+				if (!path_weight) continue;
+				is_match = GF_TRUE;
+				break;
+			}
+		}
+		if (is_match) {
+			gf_dynstrcat(res_list, src->freg->name, ",");
+		}
+	}
+	return GF_OK;
+}

gpac-2.2.1.tar.gz/src/filter_core/filter_pck.c -> gpac-2.4.0.tar.gz/src/filter_core/filter_pck.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2017-2022
+ *			Copyright (c) Telecom ParisTech 2017-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / filters sub-project
@@ -80,7 +80,7 @@
 	GF_FilterPacket *closest;
 } GF_PckQueueEnum;
 
-static Bool pck_queue_enum(void *udta, void *item)
+static void pck_queue_enum(void *udta, void *item)
 {
 	GF_PckQueueEnum *enum_state = (GF_PckQueueEnum *) udta;
 	GF_FilterPacket *cur = (GF_FilterPacket *) item;
@@ -97,7 +97,6 @@
 	}
 	//otherwise find largest one below our target size
 	else if (enum_state->closest->alloc_size < cur->alloc_size) enum_state->closest = cur;
-	return GF_FALSE;
 }
 
 static GF_FilterPacket *gf_filter_pck_new_alloc_internal(GF_FilterPid *pid, u32 data_size, u8 **data)
@@ -112,7 +111,16 @@
 	}
 
 	count = gf_fq_count(pid->filter->pcks_alloc_reservoir);
+
 	if (count) {
+		//don't let reservoir grow too large (may happen if burst of packets are stored/consumed in the upper chain)
+		while (count>30) {
+			GF_FilterPacket *head_pck = gf_fq_pop(pid->filter->pcks_alloc_reservoir);
+			gf_free(head_pck->data);
+			gf_free(head_pck);
+			count--;
+		}
+
 		GF_PckQueueEnum pck_enum_state;
 		memset(&pck_enum_state, 0, sizeof(GF_PckQueueEnum));
 		pck_enum_state.data_size = data_size;
@@ -128,7 +136,7 @@
 		max_reservoir_size = 1;
 
 	if (!pck && (count>=max_reservoir_size)) {
-		assert(closest);
+		if (!closest) return NULL;
 		closest->alloc_size = data_size;
 		closest->data = gf_realloc(closest->data, closest->alloc_size);
 		if (!closest->data) {
@@ -370,7 +378,6 @@
 		dst->pck = dst;
 		dst->is_dangling = 1;
 
-		assert(pck_source->reference_count);
 		//cf gf_filter_pck_new_ref for these
 		safe_int_inc(&pck_source->reference_count);
 		safe_int_inc(&pck_source->pid->nb_shared_packets_out);
@@ -448,8 +455,6 @@
 
 	if (destruct && pid->filter->nb_main_thread_forced)
 		pck->info.flags |= GF_PCKF_FORCE_MAIN;
-
-	assert(pck->pid);
 	return pck;
 }
 
@@ -461,7 +466,7 @@
 }
 
 GF_EXPORT
-GF_FilterPacket *gf_filter_pck_new_ref(GF_FilterPid *pid, u32 data_offset, u32 data_size, GF_FilterPacket *reference)
+GF_FilterPacket *gf_filter_pck_new_ref_destructor(GF_FilterPid *pid, u32 data_offset, u32 data_size, GF_FilterPacket *reference, gf_fsess_packet_destructor destruct)
 {
 	GF_FilterPacket *pck;
 	if (!reference) return NULL;
@@ -478,13 +483,13 @@
 			return NULL;
 	}
 
-	pck = gf_filter_pck_new_shared(pid, reference->data, data_size, NULL);
+	pck = gf_filter_pck_new_shared(pid, reference->data, data_size, destruct);
 	if (!pck) return NULL;
 	pck->reference = reference;
 	//apply offset
 	if (reference->data)
 		pck->data += data_offset;
-	assert(reference->reference_count);
+	gf_assert(reference->reference_count);
 	safe_int_inc(&reference->reference_count);
 	if (!data_offset && (!data_size || (data_size==reference->data_length))) {
 		pck->data = reference->data;
@@ -500,6 +505,12 @@
 }
 
 GF_EXPORT
+GF_FilterPacket *gf_filter_pck_new_ref(GF_FilterPid *pid, u32 data_offset, u32 data_size, GF_FilterPacket *reference)
+{
+	return gf_filter_pck_new_ref_destructor(pid, data_offset, data_size, reference, NULL);
+}
+
+GF_EXPORT
 GF_Err gf_filter_pck_set_readonly(GF_FilterPacket *pck)
 {
 	if (PCK_IS_INPUT(pck)) {
@@ -535,7 +546,7 @@
 	pck = gf_filter_pck_new_shared(pid, NULL, 0, NULL);
 	if (!pck) return GF_OUT_OF_MEM;
 	pck->reference = reference;
-	assert(reference->reference_count);
+	gf_assert(reference->reference_count);
 	safe_int_inc(&reference->reference_count);
 	safe_int_inc(&reference->pid->nb_shared_packets_out);
 	safe_int_inc(&reference->pid->filter->nb_shared_packets_out);
@@ -564,9 +575,9 @@
 		is_filter_destroyed = GF_TRUE;
 		pck->src_filter = NULL;
 		pck->pid = NULL;
-		assert(!pck->destructor);
-		assert(!pck->filter_owns_mem);
-		assert(!pck->reference);
+		gf_assert(!pck->destructor);
+		gf_assert(!pck->filter_owns_mem);
+		gf_assert(!pck->reference);
 
 		if (pck->info.cts != GF_FILTER_NO_TS) {
 			GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("Destroying packet property reference CTS "LLU" size %d\n", pck->info.cts, pck->data_length));
@@ -580,8 +591,7 @@
 	}
 
 	if (!is_filter_destroyed && !pck->is_dangling) {
-		assert(pck->pid);
-		if (pck->pid->filter) {
+		if (pck->pid && pck->pid->filter) {
 			if (pck->info.cts != GF_FILTER_NO_TS) {
 				GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("Filter %s PID %s destroying packet CTS "LLU"\n", pck->pid->filter->name, pck->pid->name, pck->info.cts));
 			} else {
@@ -598,12 +608,12 @@
 		pck->pid_props = NULL;
 
 		if (is_ref_props_packet) {
-			assert(props->pckrefs_reference_count);
+			gf_assert(props->pckrefs_reference_count);
 			if (safe_int_dec(&props->pckrefs_reference_count) == 0) {
 				gf_props_del(props);
 			}
 		} else {
-			assert(props->reference_count);
+			gf_assert(props->reference_count);
 			if (safe_int_dec(&props->reference_count) == 0) {
 				if (!is_filter_destroyed) {
 					if (pck->pid->filter) {
@@ -623,19 +633,21 @@
 	if (pck->props) {
 		GF_PropertyMap *props = pck->props;
 		pck->props=NULL;
-		assert(props->reference_count);
+		gf_assert(props->reference_count);
 		if (safe_int_dec(&props->reference_count) == 0) {
 			gf_props_del(props);
 		}
 	}
 	//never set for dangling packets, they are either standalone mem or packet references
 	if (pck->filter_owns_mem && !(pck->info.flags & GF_PCK_CMD_MASK) ) {
-		assert(pck->pid);
-		assert(pck->pid->nb_shared_packets_out);
-		assert(pck->pid->filter);
-		assert(pck->pid->filter->nb_shared_packets_out);
-		safe_int_dec(&pck->pid->nb_shared_packets_out);
-		safe_int_dec(&pck->pid->filter->nb_shared_packets_out);
+		if (pck->pid) {
+			gf_assert(pck->pid->nb_shared_packets_out);
+			safe_int_dec(&pck->pid->nb_shared_packets_out);
+			if (pck->pid->filter) {
+				gf_assert(pck->pid->filter->nb_shared_packets_out);
+				safe_int_dec(&pck->pid->filter->nb_shared_packets_out);
+			}
+		}
 		GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("Filter %s PID %s has %d shared packets out\n", pck->pid->filter->name, pck->pid->name, pck->pid->nb_shared_packets_out));
 	}
 
@@ -643,13 +655,13 @@
 	pck->pid = NULL;
 
 	if (pck->reference) {
-		assert(pck->reference->pid->nb_shared_packets_out);
-		assert(pck->reference->pid->filter->nb_shared_packets_out);
+		gf_assert(pck->reference->pid->nb_shared_packets_out);
+		gf_assert(pck->reference->pid->filter->nb_shared_packets_out);
 		safe_int_dec(&pck->reference->pid->nb_shared_packets_out);
 		safe_int_dec(&pck->reference->pid->filter->nb_shared_packets_out);
 
 		GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("Filter %s PID %s has %d shared packets out\n", pck->reference->pid->filter->name, pck->reference->pid->name, pck->reference->pid->nb_shared_packets_out));
-		assert(pck->reference->reference_count);
+		gf_assert(pck->reference->reference_count);
 		if (safe_int_dec(&pck->reference->reference_count) == 0) {
 			gf_filter_packet_destroy(pck->reference);
 		}
@@ -659,9 +671,7 @@
 	}
 	/*this is a property reference packet, its destruction may happen at ANY time*/
 	if (is_ref_props_packet) {
-		if (pck->session->pcks_refprops_reservoir) {
-			gf_fq_add(pck->session->pcks_refprops_reservoir, pck);
-		} else {
+		if (gf_fq_res_add(pck->session->pcks_refprops_reservoir, pck)) {
 			gf_free(pck);
 		}
 	} else if (is_filter_destroyed) {
@@ -672,15 +682,11 @@
 		gf_free(pck);
 	}
 	else if (pck->filter_owns_mem ) {
-		if (pid->filter && pid->filter->pcks_shared_reservoir) {
-			gf_fq_add(pid->filter->pcks_shared_reservoir, pck);
-		} else {
+		if (!pid->filter || gf_fq_res_add(pid->filter->pcks_shared_reservoir, pck)) {
 			gf_free(pck);
 		}
 	} else {
-		if (pid->filter && pid->filter->pcks_alloc_reservoir) {
-			gf_fq_add(pid->filter->pcks_alloc_reservoir, pck);
-		} else {
+		if (!pid->filter || gf_fq_res_add(pid->filter->pcks_alloc_reservoir, pck)) {
 			if (pck->data) gf_free(pck->data);
 			gf_free(pck);
 		}
@@ -720,8 +726,8 @@
 
 	for (i=0; i<count; i++) {
 		GF_FilterPacketInstance *pck = gf_list_get(dst->pck_reassembly, i);
-		assert(pck);
-		assert(! (pck->pck->info.flags & GF_PCKF_BLOCK_START) || ! (pck->pck->info.flags & GF_PCKF_BLOCK_END) );
+		if (!pck) break;
+		gf_assert(! (pck->pck->info.flags & GF_PCKF_BLOCK_START) || ! (pck->pck->info.flags & GF_PCKF_BLOCK_END) );
 		size += pck->pck->data_length;
 		if (!i) {
 			first_offset = byte_offset = pck->pck->info.byte_offset;
@@ -739,7 +745,7 @@
 	for (i=0; i<count; i++) {
 		GF_FilterPacket *pck;
 		GF_FilterPacketInstance *pcki = gf_list_get(dst->pck_reassembly, i);
-		assert(pcki);
+		if (!pcki) break;
 		pck = pcki->pck;
 
 		if (!pos) {
@@ -779,9 +785,7 @@
 			pcki->pck = NULL;
 			pcki->pid = NULL;
 
-			if (pck->pid->filter->pcks_inst_reservoir) {
-				gf_fq_add(pck->pid->filter->pcks_inst_reservoir, pcki);
-			} else {
+			if (gf_fq_res_add(pck->pid->filter->pcks_inst_reservoir, pcki)) {
 				gf_free(pcki);
 			}
 		} else {
@@ -804,7 +808,7 @@
 
 		}
 		//unref pck
-		assert(pck->reference_count);
+		gf_assert(pck->reference_count);
 		if (safe_int_dec(&pck->reference_count) == 0) {
 			gf_filter_packet_destroy(pck);
 		}
@@ -835,7 +839,7 @@
 
 GF_Err gf_filter_pck_send_internal(GF_FilterPacket *pck, Bool from_filter)
 {
-	u32 i, count, nb_dispatch=0, nb_discard=0;
+	u32 i, count, nb_dispatch=0;
 	GF_FilterPid *pid;
 	s64 duration=0;
 	u32 timescale=0;
@@ -853,8 +857,8 @@
 		gf_mem_get_stats(&prev_nb_allocs, NULL, &prev_nb_reallocs, NULL);
 #endif
 
-	assert(pck);
-	assert(pck->pid);
+	gf_assert(pck);
+	gf_assert(pck->pid);
 	pid = pck->pid;
 
 	if (PCK_IS_INPUT(pck)) {
@@ -896,6 +900,7 @@
 		//reset eos only if not a command and not a clock signaling
 		else if (pid->has_seen_eos && !is_cmd && !cktype) {
 			pid->has_seen_eos = GF_FALSE;
+			pid->eos_keepalive = GF_FALSE;
 		}
 
 
@@ -960,7 +965,7 @@
 	//now dispatched
 	pck->src_filter = NULL;
 
-	assert(pck->pid);
+	gf_assert(pck->pid);
 	if (! is_cmd_pck ) {
 		pid->nb_pck_sent++;
 		if (pck->data_length) {
@@ -1026,9 +1031,11 @@
 			} else if (!pck->info.duration && !(pck->info.flags & GF_PCKF_DUR_SET) ) {
 				if (!unreliable_dts && (pck->info.dts!=GF_FILTER_NO_TS)) {
 					duration = pck->info.dts - pid->last_pck_dts;
-					if (duration<0) duration = -duration;
+					if (duration<GF_INT_MIN) duration=GF_INT_MAX;
+					else if (duration<0) duration = -duration;
 				} else if (pck->info.cts!=GF_FILTER_NO_TS) {
 					duration = pck->info.cts - pid->last_pck_cts;
+					if (duration<GF_INT_MIN) duration=GF_INT_MAX;
 					if (duration<0) duration = -duration;
 				}
 
@@ -1104,7 +1111,7 @@
 	//by its destination before we are done adding to the other destination
 	safe_int_inc(&pck->reference_count);
 
-	assert(pck->pid);
+	gf_assert(pck->pid);
 	count = pck->pid->num_destinations;
 	//check if processing this packet must be done on main thread (OpenGL interface or source filter asked for this)
 	Bool force_main_thread = (pck->info.flags & GF_PCKF_FORCE_MAIN) ? GF_TRUE : GF_FALSE;
@@ -1120,7 +1127,7 @@
 			if ((pck->info.flags & GF_PCKF_PROPS_CHANGED) && (dst->props != pck->pid_props)) {
 				//unassign old property list and set the new one
 				if (dst->props) {
-					assert(dst->props->reference_count);
+					gf_assert(dst->props->reference_count);
 					if (safe_int_dec(& dst->props->reference_count) == 0) {
 						//see \ref gf_filter_pid_merge_properties_internal for mutex
 						gf_mx_p(dst->pid->filter->tasks_mx);
@@ -1132,7 +1139,7 @@
 				dst->props = pck->pid_props;
 				safe_int_inc( & dst->props->reference_count);
 
-				assert(dst->filter->freg->configure_pid);
+				gf_assert(dst->filter->freg->configure_pid);
 				//reset the blacklist whenever reconfiguring, since we may need to reload a new filter chain
 				//in which a previously blacklisted filter (failing (re)configure for previous state) could
 				//now work, eg moving from formatA to formatB then back to formatA
@@ -1142,7 +1149,6 @@
 				gf_fs_post_task(dst->filter->session, gf_filter_pid_reconfigure_task_discard, dst->filter, (GF_FilterPid *)dst, "pidinst_reconfigure", NULL);
 				//keep packets, they will be trashed if we are still in discard when executing gf_filter_pid_reconfigure_task_discard
 			} else {
-				nb_discard++;
 				continue;
 			}
 		}
@@ -1205,7 +1211,7 @@
 				}
 				//single block packet, direct dispatch in packet queue (aggregation done before)
 				else {
-					assert(dst->last_block_ended);
+					gf_assert(dst->last_block_ended);
 					if (!is_cmd_pck)
 						dst->nb_reagg_pck++;
 
@@ -1264,7 +1270,7 @@
 						safe_int_inc(&inst->pck->pid_props->reference_count);
 					}
 					
-					assert(pck->reference_count);
+					gf_assert(pck->reference_count);
 					safe_int_dec(&pck->reference_count);
 					safe_int_inc(&inst->pck->reference_count);
 				}
@@ -1300,6 +1306,13 @@
 			post_task = GF_TRUE;
 		}
 		if (post_task) {
+			if (!is_cmd_pck) {
+				if (dst->is_end_of_stream) {
+					dst->is_end_of_stream = GF_FALSE;
+					dst->filter->in_eos_resume = GF_TRUE;
+				}
+				pid->filter->in_eos_resume = GF_FALSE;
+			}
 
 			//make sure we lock the tasks mutex before getting the packet count, otherwise we might end up with a wrong number of packets
 			//if one thread consumes one packet while the dispatching thread  (the caller here) is still upddating the state for that pid
@@ -1333,7 +1346,7 @@
 	gf_filter_pid_would_block(pid);
 
 	//unprotect the packet now that it is safely dispatched
-	assert(pck->reference_count);
+	gf_assert(pck->reference_count);
 	if (safe_int_dec(&pck->reference_count) == 0) {
 		if (!nb_dispatch) {
 			if (count) {
@@ -1356,7 +1369,7 @@
 		gf_filter_pck_discard(pck);
 		return GF_OK;
 	}
-	assert(pck->pid);
+	gf_assert(pck->pid);
 	return gf_filter_pck_send_internal(pck, GF_TRUE);
 }
 
@@ -1370,6 +1383,7 @@
 	safe_int_inc(& (*pck)->reference_count);
 	//keep track of number of ref packets for this pid at filter level
 	safe_int_inc(& (*pck)->pid->filter->nb_ref_packets);
+	(*pck)->pid->filter->ref_bytes += (*pck)->data_length;
 	return GF_OK;
 }
 
@@ -1382,6 +1396,7 @@
 	safe_int_inc(& ref_pck->reference_count);
 	//keep track of number of ref packets for this pid at filter level
 	safe_int_inc(& ref_pck->pid->filter->nb_ref_packets);
+	ref_pck->pid->filter->ref_bytes += ref_pck->data_length;
 	return ref_pck;
 }
 
@@ -1428,14 +1443,15 @@
 GF_EXPORT
 void gf_filter_pck_unref(GF_FilterPacket *pck)
 {
-	assert(pck);
+	gf_assert(pck);
 	pck=pck->pck;
 
-	assert(pck->reference_count);
+	gf_assert(pck->reference_count);
 	//decrease number of ref packets for this pid at filter level if not a props reference
 	if (! (pck->info.flags & GF_PCKF_PROPS_REFERENCE)) {
-		assert(pck->pid->filter->nb_ref_packets);
+		gf_assert(pck->pid->filter->nb_ref_packets);
 		safe_int_dec(&pck->pid->filter->nb_ref_packets);
+		pck->pid->filter->ref_bytes -= pck->data_length;
 	}
 	if (safe_int_dec(&pck->reference_count) == 0) {
 		gf_filter_packet_destroy(pck);
@@ -1445,9 +1461,9 @@
 GF_EXPORT
 const u8 *gf_filter_pck_get_data(GF_FilterPacket *pck, u32 *size)
 {
-	assert(pck);
-	assert(pck->pck);
-	assert(size);
+	gf_assert(pck);
+	gf_assert(pck->pck);
+	gf_assert(size);
 	//get true packet pointer
 	pck=pck->pck;
 	*size = pck->data_length;
@@ -1457,8 +1473,8 @@
 static GF_Err gf_filter_pck_set_property_full(GF_FilterPacket *pck, u32 prop_4cc, const char *prop_name, char *dyn_name, const GF_PropertyValue *value)
 {
 	u32 hash;
-	assert(pck);
-	assert(pck->pid);
+	gf_assert(pck);
+	gf_assert(pck->pid);
 	if (PCK_IS_INPUT(pck)) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Attempt to set property on an input packet in filter %s\n", pck->pid->filter->name));
 		return GF_BAD_PARAM;
@@ -1504,22 +1520,59 @@
 	return GF_TRUE;
 }
 
+#ifdef GPAC_ENABLE_DEBUG
+static GFINLINE const GF_PropertyValue *pck_check_prop(GF_FilterPacket *pck, u32 prop_4cc, const char *prop_name, const GF_PropertyValue *ret)
+{
+	if (!ret && (pck!=pck->pck)) {
+		GF_FilterPacketInstance *pcki = (GF_FilterPacketInstance *)pck;
+		if (!(pcki->pid->filter->prop_dump&2)) return ret;
+		u32 i, count;
+		GF_PropCheck *p;
+		if (!pcki->pid->prop_dump) pcki->pid->prop_dump = gf_list_new();
+		count = gf_list_count(pcki->pid->prop_dump);
+		for (i=0;i<count; i++) {
+			p = gf_list_get(pcki->pid->prop_dump, i);
+			if (prop_4cc) {
+				if (p->p4cc==prop_4cc) return ret;
+			} else if (p->name && !strcmp(p->name, prop_name)) {
+				return ret;
+			}
+		}
+
+		const char *pidname = pck->pid->pid->name;
+		if (prop_4cc) {
+			const char *name = gf_props_4cc_get_name(prop_4cc);
+			if (!name) name = "internal";
+			GF_LOG(GF_LOG_WARNING, GF_LOG_FILTER, ("Filter %s PID %s input packet property %s (%s) not found\n", pck->pid->filter->name, pidname, gf_4cc_to_str(prop_4cc), name));
+		} else if (prop_name) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_FILTER, ("Filter %s PID %s input packet property %s not found\n", pck->pid->filter->name, pidname, prop_name));
+		}
+		GF_SAFEALLOC(p, GF_PropCheck);
+		p->name = prop_name;
+		p->p4cc = prop_4cc;
+		gf_list_add(pcki->pid->prop_dump, p);
+	}
+	return ret;
+}
+#else
+#define pck_check_prop(_a, _b, _str, c) c
+#endif
 GF_EXPORT
-const GF_PropertyValue *gf_filter_pck_get_property(GF_FilterPacket *pck, u32 prop_4cc)
+const GF_PropertyValue *gf_filter_pck_get_property(GF_FilterPacket *_pck, u32 prop_4cc)
 {
 	//get true packet pointer
-	pck = pck->pck;
+	GF_FilterPacket *pck = _pck->pck;
 	if (!pck->props) return NULL;
-	return gf_props_get_property(pck->props, prop_4cc, NULL);
+	return pck_check_prop(_pck, prop_4cc, NULL, gf_props_get_property(pck->props, prop_4cc, NULL));
 }
 
 GF_EXPORT
-const GF_PropertyValue *gf_filter_pck_get_property_str(GF_FilterPacket *pck, const char *prop_name)
+const GF_PropertyValue *gf_filter_pck_get_property_str(GF_FilterPacket *_pck, const char *prop_name)
 {
 	//get true packet pointer
-	pck = pck->pck;
+	GF_FilterPacket *pck = _pck->pck;
 	if (!pck->props) return NULL;
-	return gf_props_get_property(pck->props, 0, prop_name);
+	return pck_check_prop(_pck, 0, prop_name, gf_props_get_property(pck->props, 0, prop_name) );
 }
 
 GF_EXPORT
@@ -1552,7 +1605,7 @@
 GF_EXPORT
 GF_Err gf_filter_pck_get_framing(GF_FilterPacket *pck, Bool *is_start, Bool *is_end)
 {
-	assert(pck);
+	gf_assert(pck);
 	//get true packet pointer
 	pck=pck->pck;
 	if (is_start) *is_start = (pck->info.flags & GF_PCKF_BLOCK_START) ? GF_TRUE : GF_FALSE;
@@ -1572,7 +1625,7 @@
 GF_EXPORT
 u64 gf_filter_pck_get_dts(GF_FilterPacket *pck)
 {
-	assert(pck);
+	gf_assert(pck);
 	//get true packet pointer
 	return pck->pck->info.dts;
 }
@@ -1588,7 +1641,7 @@
 GF_EXPORT
 u64 gf_filter_pck_get_cts(GF_FilterPacket *pck)
 {
-	assert(pck);
+	gf_assert(pck);
 	//get true packet pointer
 	return pck->pck->info.cts;
 }
@@ -1596,7 +1649,7 @@
 GF_EXPORT
 u32 gf_filter_pck_get_timescale(GF_FilterPacket *pck)
 {
-	assert(pck);
+	gf_assert(pck);
 	//get true packet pointer
 	return pck->pck->pid_props->timescale ? pck->pck->pid_props->timescale : 1000;
 }
@@ -1614,7 +1667,7 @@
 GF_EXPORT
 GF_FilterSAPType gf_filter_pck_get_sap(GF_FilterPacket *pck)
 {
-	assert(pck);
+	gf_assert(pck);
 	//get true packet pointer
 	return (GF_FilterSAPType) ( (pck->pck->info.flags & GF_PCK_SAP_MASK) >> GF_PCK_SAP_POS);
 }
@@ -1630,7 +1683,7 @@
 GF_EXPORT
 s16 gf_filter_pck_get_roll_info(GF_FilterPacket *pck)
 {
-	assert(pck);
+	gf_assert(pck);
 	//get true packet pointer
 	return pck->pck->info.roll;
 }
@@ -1647,7 +1700,7 @@
 GF_EXPORT
 u32 gf_filter_pck_get_interlaced(GF_FilterPacket *pck)
 {
-	assert(pck);
+	gf_assert(pck);
 	//get true packet pointer
 	return (pck->pck->info.flags & GF_PCK_ILACE_MASK) >> GF_PCK_ILACE_POS;
 }
@@ -1664,7 +1717,7 @@
 GF_EXPORT
 Bool gf_filter_pck_get_corrupted(GF_FilterPacket *pck)
 {
-	assert(pck);
+	gf_assert(pck);
 	//get true packet pointer
 	return (pck->pck->info.flags & GF_PCKF_CORRUPTED) ? GF_TRUE : GF_FALSE;
 }
@@ -1681,7 +1734,7 @@
 GF_EXPORT
 u32 gf_filter_pck_get_duration(GF_FilterPacket *pck)
 {
-	assert(pck);
+	gf_assert(pck);
 	//get true packet pointer
 	return pck->pck->info.duration;
 }
@@ -1698,7 +1751,7 @@
 GF_EXPORT
 Bool gf_filter_pck_get_seek_flag(GF_FilterPacket *pck)
 {
-	assert(pck);
+	gf_assert(pck);
 	//get true packet pointer
 	return (pck->pck->info.flags & GF_PCKF_SEEK) ? GF_TRUE : GF_FALSE;
 }
@@ -1715,7 +1768,7 @@
 GF_EXPORT
 u8 gf_filter_pck_get_dependency_flags(GF_FilterPacket *pck)
 {
-	assert(pck);
+	gf_assert(pck);
 	//get true packet pointer
 	return pck->pck->info.flags & 0xFF;
 }
@@ -1731,7 +1784,7 @@
 GF_EXPORT
 u8 gf_filter_pck_get_carousel_version(GF_FilterPacket *pck)
 {
-	assert(pck);
+	gf_assert(pck);
 	//get true packet pointer
 	return pck->pck->info.carousel_version_number;
 }
@@ -1747,7 +1800,7 @@
 GF_EXPORT
 u64 gf_filter_pck_get_byte_offset(GF_FilterPacket *pck)
 {
-	assert(pck);
+	gf_assert(pck);
 	//get true packet pointer
 	return pck->pck->info.byte_offset;
 }
@@ -1755,7 +1808,7 @@
 GF_EXPORT
 GF_Err gf_filter_pck_set_crypt_flags(GF_FilterPacket *pck, u8 crypt_flag)
 {
-	PCK_SETTER_CHECK("byteOffset")
+	PCK_SETTER_CHECK("cryptFlag")
 	pck->info.flags &= ~GF_PCK_CRYPT_MASK;
 	pck->info.flags |= crypt_flag << GF_PCK_CRYPT_POS;
 	return GF_OK;
@@ -1802,14 +1855,14 @@
 GF_EXPORT
 GF_FilterFrameInterface *gf_filter_pck_get_frame_interface(GF_FilterPacket *pck)
 {
-	assert(pck);
+	gf_assert(pck);
 	return pck->pck->frame_ifce;
 }
 
 GF_EXPORT
 GF_Err gf_filter_pck_expand(GF_FilterPacket *pck, u32 nb_bytes_to_add, u8 **data_start, u8 **new_range_start, u32 *new_size)
 {
-	assert(pck);
+	gf_assert(pck);
 	if (PCK_IS_INPUT(pck)) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Attempt to reallocate input packet on output PID in filter %s\n", pck->pid->filter->name));
 		return GF_BAD_PARAM;
@@ -1844,7 +1897,7 @@
 GF_EXPORT
 GF_Err gf_filter_pck_truncate(GF_FilterPacket *pck, u32 size)
 {
-	assert(pck);
+	gf_assert(pck);
 	if (PCK_IS_INPUT(pck)) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Attempt to truncate input packet on output PID in filter %s\n", pck->pid->filter->name));
 		return GF_BAD_PARAM;
@@ -1875,3 +1928,17 @@
 	return GF_FALSE;
 }
 
+GF_EXPORT
+void gf_filter_pck_check_realloc(GF_FilterPacket *pck, u8 *data, u32 size)
+{
+	if (PCK_IS_INPUT(pck)) return;
+	if (((u8*)pck->data != data)
+		//in case realloc returned the same address !!
+		|| (size > pck->data_length)
+	) {
+		pck->alloc_size = pck->data_length = size;
+		pck->data = data;
+	} else {
+		pck->data_length = size;
+	}
+}

gpac-2.2.1.tar.gz/src/filter_core/filter_pid.c -> gpac-2.4.0.tar.gz/src/filter_core/filter_pid.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2017-2022
+ *			Copyright (c) Telecom ParisTech 2017-2024
  *					All rights reserved
  *
  *  This file is part of GPAC / filters sub-project
@@ -31,7 +31,7 @@
 
 static void pcki_del(GF_FilterPacketInstance *pcki)
 {
-	assert(pcki->pck->reference_count);
+	gf_assert(pcki->pck->reference_count);
 	if (safe_int_dec(&pcki->pck->reference_count) == 0) {
 		gf_filter_packet_destroy(pcki->pck);
 	}
@@ -40,7 +40,7 @@
 
 void gf_filter_pid_inst_reset(GF_FilterPidInst *pidinst)
 {
-	assert(pidinst);
+	gf_assert(pidinst);
 	while (gf_fq_count(pidinst->packets)) {
 		GF_FilterPacketInstance *pcki = gf_fq_pop(pidinst->packets);
 		pcki_del(pcki);
@@ -54,14 +54,14 @@
 
 void gf_filter_pid_inst_del(GF_FilterPidInst *pidinst)
 {
-	assert(pidinst);
+	gf_assert(pidinst);
 	gf_filter_pid_inst_reset(pidinst);
 
  	gf_fq_del(pidinst->packets, (gf_destruct_fun) pcki_del);
 	gf_mx_del(pidinst->pck_mx);
 	gf_list_del(pidinst->pck_reassembly);
 	if (pidinst->props) {
-		assert(pidinst->props->reference_count);
+		gf_assert(pidinst->props->reference_count);
 		gf_mx_p(pidinst->pid->filter->tasks_mx);
 		//not in parent pid, may happen when reattaching a pid inst to a different pid
 		//in this case do NOT delete the props
@@ -74,6 +74,16 @@
 		}
 		gf_mx_v(pidinst->pid->filter->tasks_mx);
 	}
+#ifdef GPAC_ENABLE_DEBUG
+	if (pidinst->prop_dump) {
+		while (1) {
+			GF_PropCheck *p = gf_list_pop_back(pidinst->prop_dump);
+			if (!p) break;
+			gf_free(p);
+		}
+		gf_list_del(pidinst->prop_dump);
+	}
+#endif
 	gf_free(pidinst);
 }
 
@@ -108,18 +118,18 @@
 		return;
 	}
 	//if we are in end of stream state and done with all packets, stay blocked
-	if (pid->has_seen_eos && !pid->nb_buffer_unit) {
+	if (pid->has_seen_eos && !pid->nb_buffer_unit && !pid->eos_keepalive) {
 		if (!pid->would_block) {
 			safe_int_inc(&pid->would_block);
 			safe_int_inc(&pid->filter->would_block);
-			assert(pid->filter->would_block + pid->filter->num_out_pids_not_connected <= pid->filter->num_output_pids);
+			gf_assert(pid->filter->would_block + pid->filter->num_out_pids_not_connected <= pid->filter->num_output_pids);
 		}
 		return;
 	}
 
 	unblock=GF_FALSE;
 
-	assert(pid->playback_speed_scaler);
+	gf_assert(pid->playback_speed_scaler);
 
 	//we block according to the number of dispatched units (decoder output) or to the requested buffer duration
 	//for other streams - unblock accordingly
@@ -141,10 +151,12 @@
 	if (pid->would_block) {
 		safe_int_dec(&pid->would_block);
 
-		assert(pid->filter->would_block);
+		gf_assert(pid->filter->would_block);
+
 		safe_int_dec(&pid->filter->would_block);
-		assert((s32)pid->filter->would_block>=0);
-		assert(pid->filter->would_block + pid->filter->num_out_pids_not_connected <= pid->filter->num_output_pids);
+
+		gf_assert((s32)pid->filter->would_block>=0);
+		gf_assert(pid->filter->would_block + pid->filter->num_out_pids_not_connected <= pid->filter->num_output_pids);
 
 		GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("Filter %s PID %s unblocked (filter has %d blocking pids)\n", pid->pid->filter->name, pid->pid->name, pid->pid->filter->would_block));
 
@@ -318,12 +330,30 @@
 					gf_filter_pid_inst_check_dependencies(pidi);
 			}
 		}
-		//same media type, different codec if is raw stream
-		 else if (mtype==i_type) {
+		//same media type, same codec: raw stream
+		else if (mtype==i_type) {
 			pid->raw_media = GF_TRUE;
+			//special case if single input pid filter, copy buffer props from input
+			if (pid->filter->num_input_pids==1) {
+				GF_FilterPidInst *pid_in = gf_list_get(pid->filter->input_pids, i);
+				if ((pid_in->pid->max_buffer_unit>1) || pid_in->pid->max_buffer_time) {
+					pid->max_buffer_unit = pid_in->pid->max_buffer_unit;
+					pid->filter->pid_buffer_max_units = pid_in->pid->max_buffer_unit;
+					pid->max_buffer_time = pid_in->pid->max_buffer_time;
+					pid->filter->pid_buffer_max_us = (u32) pid_in->pid->max_buffer_time;
+				}
+				//if input has a single destination, reset buffer props to default
+				if (pid_in->pid->num_destinations==1) {
+					pid_in->pid->max_buffer_unit = 1;
+					pid_in->pid->max_buffer_time = 0;
+				}
+			}
+			//if we have max_buffer_time set, don't use buffer units
+			if (pid->max_buffer_time)
+				pid->max_buffer_unit = 0;
 		}
 		//input is file, output is not and codec ID is raw, this is a raw media pid
-		 else if ((i_type==GF_STREAM_FILE) && (mtype!=GF_STREAM_FILE) && (codecid==GF_CODECID_RAW) ) {
+		else if ((i_type==GF_STREAM_FILE) && (mtype!=GF_STREAM_FILE) && (codecid==GF_CODECID_RAW) ) {
 			pid->raw_media = GF_TRUE;
 		}
 	}
@@ -345,7 +375,7 @@
 	GF_Filter *filter = pid->filter;
 	Bool pid_still_alive = GF_FALSE;
 
-	assert(filter);
+	gf_assert(filter);
 	//reset in process
 	if ((pidinst->filter && pidinst->discard_packets) || filter->stream_reset_pending || filter->abort_pending) {
 		TASK_REQUEUE(task)
@@ -379,7 +409,7 @@
 	gf_mx_v(filter->tasks_mx);
 
 	if (pidinst->is_decoder_input) {
-		assert(pid->nb_decoder_inputs);
+		gf_assert(pid->nb_decoder_inputs);
 		safe_int_dec(&pid->nb_decoder_inputs);
 	}
 	gf_filter_pid_inst_del(pidinst);
@@ -401,7 +431,7 @@
 		pid->buffer_duration = 0;
 	}
 
-	assert(pid->filter == filter);
+	gf_assert(pid->filter == filter);
 
 	if (pid_still_alive)
 		return;
@@ -423,7 +453,7 @@
 	}
 	//no more destinations on pid, unblock if blocking
 	if (pid->would_block) {
-		assert(pid->filter->would_block);
+		gf_assert(pid->filter->would_block);
 		safe_int_dec(&pid->filter->would_block);
 	}
 
@@ -471,7 +501,7 @@
 
 
 	if (pidinst->is_decoder_input) {
-		assert(pid->nb_decoder_inputs);
+		gf_assert(pid->nb_decoder_inputs);
 		safe_int_dec(&pid->nb_decoder_inputs);
 	}
 	//this pid instance is registered to destination filter for chain reconfigure, don't discard it
@@ -526,17 +556,20 @@
 	u32 nb_pck_transfer=0;
 	GF_FilterPidInst *src = filter->swap_pidinst_src;
 	if (!src) src = filter->swap_pidinst_dst;
-	
+
 	if (src) {
 		GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("Filter %s swaping PID %s to PID %s\n", filter->name, src->pid->name, dst->pid->name));
 	}
 
-	
+
 	if (filter->swap_needs_init) {
 		//we are in detach state, the packet queue of the old PID is never read
-		assert(filter->swap_pidinst_dst && filter->swap_pidinst_dst->detach_pending);
+		if (!filter->swap_pidinst_dst || !filter->swap_pidinst_dst->detach_pending) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Filter %s swaping PID %s failed\n", filter->name, src->pid->name));
+			return;
+		}
 		//we are in pending state, the origin of the old PID is never dispatching
-//		assert(dst->pid && dst->pid->filter && dst->pid->filter->out_pid_connection_pending);
+//		gf_assert(dst->pid && dst->pid->filter && dst->pid->filter->out_pid_connection_pending);
 		//we can therefore swap the packet queues safely and other important info
 	}
 	//otherwise we actually swap the pid instance on the same PID
@@ -565,11 +598,11 @@
 		while (1) {
 			pcki = gf_fq_pop(src->packets);
 			if (!pcki) break;
-			assert(src->filter->pending_packets);
+			gf_assert(src->filter->pending_packets);
 			safe_int_dec(&src->filter->pending_packets);
 
 			if (pcki->pck->info.flags & GF_PCKF_FORCE_MAIN) {
-				assert(src->filter->nb_main_thread_forced);
+				gf_assert(src->filter->nb_main_thread_forced);
 				safe_int_dec(&src->filter->nb_main_thread_forced);
 				safe_int_inc(&dst->filter->nb_main_thread_forced);
 			}
@@ -606,7 +639,7 @@
 		if (prev_dst_props) {
 			if (dst->props) {
 				gf_props_merge_property(dst->props, prev_dst_props, NULL, NULL);
-				assert(prev_dst_props->reference_count);
+				gf_assert(prev_dst_props->reference_count);
 				if (safe_int_dec(&prev_dst_props->reference_count) == 0) {
 					gf_props_del(prev_dst_props);
 				}
@@ -625,17 +658,17 @@
 	if (src) {
 		if (filter->swap_needs_init) {
 			//exit out special handling of the pid since we are ready to detach
-			assert(src->filter->stream_reset_pending);
+			gf_assert(src->filter->stream_reset_pending);
 			safe_int_dec(&src->filter->stream_reset_pending);
 
 			//post detach task, we will reset the swap_pidinst only once truly deconnected from filter
 			safe_int_inc(&src->pid->filter->detach_pid_tasks_pending);
 			safe_int_inc(&filter->detach_pid_tasks_pending);
-			gf_fs_post_task(filter->session, gf_filter_pid_detach_task, src->filter, src->pid, "pidinst_detach", filter);
+			gf_fs_post_task(filter->session, gf_filter_pid_detach_task_no_flush, src->filter, src->pid, "pidinst_detach", filter);
 		} else {
 			GF_Filter *src_filter = src->filter;
-			assert(!src->filter->sticky);
-			assert(src->filter->num_input_pids==1);
+			gf_assert(!src->filter->sticky);
+			gf_assert(src->filter->num_input_pids==1);
 
 			gf_mx_p(src_filter->tasks_mx);
 			gf_list_del_item(src_filter->input_pids, src);
@@ -653,11 +686,12 @@
 			gf_filter_post_remove(src_filter);
 		}
 	}
-	
+
 	if (filter->swap_pidinst_src) {
 		src = filter->swap_pidinst_src;
-		assert(!src->filter->swap_pidinst_dst);
+		gf_assert(!src->filter->swap_pidinst_dst);
 		src->filter->swap_pidinst_dst = filter->swap_pidinst_dst;
+		src->filter->swap_pending = GF_TRUE;
 		gf_fs_post_task(filter->session, gf_filter_pid_inst_swap_delete_task, src->filter, src->pid, "pid_inst_delete", src);
 	}
 }
@@ -675,7 +709,7 @@
 		GF_FilterPacketInstance *pcki = gf_fq_get(pidinst->packets, i);
 		if (!pcki) break;
 		if (pcki->pck->info.flags & GF_PCKF_FORCE_MAIN) {
-			assert(pidinst->filter->nb_main_thread_forced);
+			gf_assert(pidinst->filter->nb_main_thread_forced);
 			safe_int_dec(&pidinst->filter->nb_main_thread_forced);
 		}
 	}
@@ -684,7 +718,7 @@
 		GF_FilterPacketInstance *pcki = gf_list_get(pidinst->pck_reassembly, i);
 		if (!pcki) break;
 		if (pcki->pck->info.flags & GF_PCKF_FORCE_MAIN) {
-			assert(pidinst->filter->nb_main_thread_forced);
+			gf_assert(pidinst->filter->nb_main_thread_forced);
 			safe_int_dec(&pidinst->filter->nb_main_thread_forced);
 		}
 	}
@@ -714,11 +748,28 @@
 	GF_PID_CONF_REMOVE,
 } GF_PidConnectType;
 
+static void gf_filter_pid_connect_failure(GF_FilterPid *pid)
+{
+	GF_FilterEvent evt;
+	GF_FEVT_INIT(evt, GF_FEVT_PLAY, pid);
+	gf_filter_pid_send_event_internal(pid, &evt, GF_TRUE);
+
+	GF_FEVT_INIT(evt, GF_FEVT_STOP, pid);
+	gf_filter_pid_send_event_internal(pid, &evt, GF_TRUE);
+
+	gf_filter_pid_set_eos(pid);
+
+	if (pid->filter->freg->process_event) {
+		GF_FEVT_INIT(evt, GF_FEVT_CONNECT_FAIL, pid);
+		gf_filter_pid_send_event_internal(pid, &evt, GF_TRUE);
+	}
+}
 static GF_Err gf_filter_pid_configure(GF_Filter *filter, GF_FilterPid *pid, GF_PidConnectType ctype)
 {
 	u32 i, count;
 	GF_Err e;
-	Bool refire_events=GF_FALSE;
+	Bool is_pid_swap = GF_FALSE;
+	Bool refire_events = GF_FALSE;
 	Bool new_pid_inst=GF_FALSE;
 	Bool remove_filter=GF_FALSE;
 	GF_FilterPidInst *pidinst=NULL;
@@ -729,11 +780,11 @@
 		filter = filter->multi_sink_target;
 	}
 
-	assert(filter->freg->configure_pid);
+	gf_assert(filter->freg->configure_pid);
 	if (filter->finalized) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Trying to configure PID %s in finalized filter %s\n",  pid->name, filter->name));
 		if (ctype==GF_PID_CONF_CONNECT) {
-			assert(pid->filter->out_pid_connection_pending);
+			gf_assert(pid->filter->out_pid_connection_pending);
 			safe_int_dec(&pid->filter->out_pid_connection_pending);
 		}
 		return GF_SERVICE_ERROR;
@@ -749,7 +800,7 @@
 				pidinst->filter = filter;
 				pidinst->pid = pid;
 
-				assert(!pidinst->props);
+				gf_assert(!pidinst->props);
 
 				//and treat as new pid inst
 				if (ctype == GF_PID_CONF_CONNECT) {
@@ -757,7 +808,7 @@
 					if (!pid->filter->nb_pids_playing && (pidinst->is_playing || pidinst->is_paused))
 						refire_events = GF_TRUE;
 				}
-				assert(pidinst->detach_pending);
+				gf_assert(pidinst->detach_pending);
 				safe_int_dec(&pidinst->detach_pending);
 				//revert temp sticky flag
 				if (filter->sticky == 2)
@@ -796,7 +847,7 @@
 
 	//if new, add the PID to input/output before calling configure
 	if (new_pid_inst) {
-		assert(pidinst);
+		if (!pidinst) return GF_OUT_OF_MEM;
 		gf_mx_p(pid->filter->tasks_mx);
 
 		GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("Registering %s:%s as destination for %s:%s\n", pid->filter->name, pid->name, pidinst->filter->name, pidinst->pid->name));
@@ -825,8 +876,10 @@
 	//we are swaping a PID instance (dyn insert of a filter), do it before reconnecting
 	//in order to have properties in place
 	//TODO: handle error case, we might need to re-switch the pid inst!
-	if (filter->swap_pidinst_src || filter->swap_pidinst_dst) {
+	if (filter->swap_pending) {
 		gf_filter_pid_inst_swap(filter, pidinst);
+		filter->swap_pending = GF_FALSE;
+		is_pid_swap = GF_TRUE;
 	}
 
 	filter->in_connect_err = GF_EOS;
@@ -858,7 +911,7 @@
 		e = filter->in_connect_err;
 
 	filter->in_connect_err = GF_OK;
-	
+
 	if (e==GF_OK) {
 		//if new, register the new pid instance, and the source pid as input to this filter
 		if (new_pid_inst) {
@@ -870,6 +923,8 @@
 	}
 	//failure on reconfigure, try reloading a filter chain
 	else if ((ctype==GF_PID_CONF_RECONFIG) && (e != GF_FILTER_NOT_SUPPORTED)) {
+		//mark pid as end of stream to let filter flush
+		pidinst->is_end_of_stream = GF_TRUE;
 		if (e==GF_BAD_PARAM) {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Failed to reconfigure PID %s:%s in filter %s: %s\n", pid->filter->name, pid->name, filter->name, gf_error_to_string(e) ));
 
@@ -877,7 +932,7 @@
 		} else {
 			GF_LOG(GF_LOG_INFO, GF_LOG_FILTER, ("Failed to reconfigure PID %s:%s in filter %s: %s, reloading filter graph\n", pid->filter->name, pid->name, filter->name, gf_error_to_string(e) ));
 			gf_list_add(pid->filter->blacklisted, (void *) filter->freg);
-			gf_filter_relink_dst(pidinst);
+			gf_filter_relink_dst(pidinst, e);
 		}
 	} else {
 
@@ -916,14 +971,28 @@
 
 			//destroy pid instance
 			gf_filter_pid_inst_del(pidinst);
+			pidinst = NULL;
 			gf_mx_v(pid->filter->tasks_mx);
 		}
 
 
 		if (e==GF_REQUIRES_NEW_INSTANCE) {
 			//TODO: copy over args from current filter
+
+			//we already created a clone for a new instance, forward the task to the clone.
+			//This allows solving fan-in connections requiring new instances (tileagg, scalable dec)
+			//which cannot be solved at graph resolution stage
+			//we disable this for non fan-in cases
+			if (filter->max_extra_pids && filter->cloned_instance) {
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("Reuse cloned filter %s for pid %s\n", filter->name, pid->name));
+				gf_filter_pid_post_connect_task(filter->cloned_instance, pid);
+				return GF_OK;
+			}
 			GF_Filter *new_filter = gf_filter_clone(filter, pid->filter);
 			if (new_filter) {
+				if (filter->max_extra_pids)
+					filter->cloned_instance = new_filter;
+
 				GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("Clone filter %s, new instance for pid %s\n", filter->name, pid->name));
 				gf_filter_pid_post_connect_task(new_filter, pid);
 				return GF_OK;
@@ -955,19 +1024,8 @@
 				}
 
 				if (ctype==GF_PID_CONF_CONNECT) {
-					GF_FilterEvent evt;
-					GF_FEVT_INIT(evt, GF_FEVT_PLAY, pid);
-					gf_filter_pid_send_event_internal(pid, &evt, GF_TRUE);
+					gf_filter_pid_connect_failure(pid);
 
-					GF_FEVT_INIT(evt, GF_FEVT_STOP, pid);
-					gf_filter_pid_send_event_internal(pid, &evt, GF_TRUE);
-
-					gf_filter_pid_set_eos(pid);
-
-					if (pid->filter->freg->process_event) {
-						GF_FEVT_INIT(evt, GF_FEVT_CONNECT_FAIL, pid);
-						gf_filter_pid_send_event_internal(pid, &evt, GF_TRUE);
-					}
 					if (!filter->num_input_pids && !filter->num_output_pids) {
 						remove_filter = GF_TRUE;
 					}
@@ -1000,14 +1058,14 @@
 				//do not assign session->last_connect_error since we are retrying a connection
 
 				if (ctype==GF_PID_CONF_CONNECT) {
-					assert(pid->filter->out_pid_connection_pending);
+					gf_assert(pid->filter->out_pid_connection_pending);
 					safe_int_dec(&pid->filter->out_pid_connection_pending);
 				}
 				//3- post a re-init on this pid
 				gf_filter_pid_post_init_task(pid->filter, pid);
 
 				if (unload_filter) {
-					assert(!gf_list_count(filter->input_pids));
+					gf_assert(!gf_list_count(filter->input_pids));
 
 					if (filter->num_output_pids) {
 						for (i=0; i<filter->num_output_pids; i++) {
@@ -1025,23 +1083,24 @@
 					filter->swap_pidinst_src = NULL;
 					if (filter->swap_pidinst_dst) {
 						GF_Filter *target = filter->swap_pidinst_dst->filter;
-						assert(target);
-						if (!target->detached_pid_inst) {
+						if (target && !target->detached_pid_inst) {
 							target->detached_pid_inst = gf_list_new();
 						}
 						//detach props
 						if (filter->swap_pidinst_dst->props) {
 							GF_FilterPidInst *swap_pidi = filter->swap_pidinst_dst;
 							if (safe_int_dec(&swap_pidi->props->reference_count)==0) {
-								gf_mx_p(swap_pidi->pid->filter->tasks_mx);
-								gf_list_del_item(swap_pidi->pid->properties, pidinst->props);
-								gf_mx_v(swap_pidi->pid->filter->tasks_mx);
-								gf_props_del(pidinst->props);
+								if (pidinst) {
+									gf_mx_p(swap_pidi->pid->filter->tasks_mx);
+									gf_list_del_item(swap_pidi->pid->properties, pidinst->props);
+									gf_mx_v(swap_pidi->pid->filter->tasks_mx);
+									gf_props_del(pidinst->props);
+								}
 							}
 							filter->swap_pidinst_dst->props = NULL;
 						}
 						filter->swap_pidinst_dst->pid = NULL;
-						if (gf_list_find(target->detached_pid_inst, filter->swap_pidinst_dst)<0)
+						if (target && (gf_list_find(target->detached_pid_inst, filter->swap_pidinst_dst)<0))
 							gf_list_add(target->detached_pid_inst, filter->swap_pidinst_dst);
 					}
 					filter->swap_pidinst_dst = NULL;
@@ -1072,21 +1131,22 @@
 
 	//flush all pending pid init requests following the call to init
 	if (filter->has_pending_pids) {
-		filter->has_pending_pids = GF_FALSE;
-		while (gf_fq_count(filter->pending_pids)) {
-			GF_FilterPid *a_pid=gf_fq_pop(filter->pending_pids);
-			//filter is a pid adaptation filter (dynamically loaded to solve prop negociation)
-			//copy over play state if the input PID was already playing
-			if (pid->is_playing && filter->is_pid_adaptation_filter)
+		//filter is a pid adaptation filter (dynamically loaded to solve prop negotiation)
+		//copy over play state if the input PID was already playing
+		if (pid->is_playing && filter->is_pid_adaptation_filter) {
+			u32 k=0, p_count=gf_fq_count(filter->pending_pids);
+			for (k=0; k<p_count; k++) {
+				GF_FilterPid *a_pid = gf_fq_get(filter->pending_pids, k);
 				a_pid->is_playing = GF_TRUE;
-
-			gf_filter_pid_post_init_task(filter, a_pid);
+			}
 		}
+		gf_filter_check_pending_pids(filter);
 	}
 
 	if (ctype==GF_PID_CONF_REMOVE) {
 		gf_mx_p(filter->tasks_mx);
-		gf_list_del_item(filter->input_pids, pidinst);
+		if (pidinst)
+			gf_list_del_item(filter->input_pids, pidinst);
 		filter->num_input_pids = gf_list_count(filter->input_pids);
 		if (!filter->num_input_pids)
 			filter->single_source = NULL;
@@ -1098,12 +1158,14 @@
 		//on the first gf_filter_pid_inst_delete_task executed.
 		//we therefore track at the PID level the number of gf_filter_pid_inst_delete_task tasks pending and
 		//won't destroy the PID until that number is O
-		gf_mx_p(pidinst->pid->filter->tasks_mx);
-		pidinst->pid->num_pidinst_del_pending ++;
-		gf_list_del_item(pidinst->pid->destinations, pidinst);
-		pidinst->pid->num_destinations = gf_list_count(pidinst->pid->destinations);
-		gf_filter_instance_detach_pid(pidinst);
-		gf_mx_v(pidinst->pid->filter->tasks_mx);
+		if (pidinst) {
+			gf_mx_p(pidinst->pid->filter->tasks_mx);
+			pidinst->pid->num_pidinst_del_pending ++;
+			gf_list_del_item(pidinst->pid->destinations, pidinst);
+			pidinst->pid->num_destinations = gf_list_count(pidinst->pid->destinations);
+			gf_filter_instance_detach_pid(pidinst);
+			gf_mx_v(pidinst->pid->filter->tasks_mx);
+		}
 
 		//disconnected the last input, flag as removed
 		if (!filter->num_input_pids && !filter->sticky) {
@@ -1111,18 +1173,19 @@
 			filter->removed = 1;
 		}
 		//post a pid_delete task to also trigger removal of the filter if needed
-		gf_fs_post_task(filter->session, gf_filter_pid_inst_delete_task, pid->filter, pid, "pid_inst_delete", pidinst);
+		if (pidinst)
+			gf_fs_post_task(filter->session, gf_filter_pid_inst_delete_task, pid->filter, pid, "pid_inst_delete", pidinst);
 
 		return e;
 	}
 
 	if (ctype==GF_PID_CONF_CONNECT) {
-		assert(pid->filter->out_pid_connection_pending);
+		gf_assert(pid->filter->out_pid_connection_pending);
 		if (safe_int_dec(&pid->filter->out_pid_connection_pending) == 0) {
 
 			//we must resent play/pause events when a new pid is reattached to an old pid instance
 			//in case one of the injected filter(s) monitors play state of the pids (eg reframers)
-			if (refire_events) {
+			if (refire_events && pidinst) {
 				GF_FilterEvent evt;
 				if (pidinst->is_playing) {
 					pidinst->is_playing = GF_FALSE;
@@ -1139,13 +1202,20 @@
 			if (e==GF_OK) {
 				//postponed packets dispatched by source while setting up PID, flush through process()
 				//pending packets (not yet consumed but in PID buffer), start processing
-				if (pid->filter->postponed_packets || pid->filter->pending_packets || pid->filter->nb_caps_renegociate) {
+				if (pid->filter->postponed_packets || pid->filter->pending_packets || pid->filter->nb_caps_renegotiate) {
 					gf_filter_post_process_task(pid->filter);
 				}
 			}
 		}
 		if (remove_filter && !filter->sticky)
 			gf_filter_post_remove(filter);
+		//we injected a filter to adapt on an already playing PID, move pid instance to playing
+		if (filter->is_pid_adaptation_filter && pid->is_playing)
+			pidinst->is_playing = GF_TRUE;
+
+		//new pid instance creating a fanout on an already playing pid: force discarding input packets until we have a PLAY
+		if (!is_pid_swap && new_pid_inst && !filter->is_pid_adaptation_filter && pid->is_playing && pid->nb_pck_sent && (pid->num_destinations>1))
+			pidinst->discard_inputs = GF_TRUE;
 	}
 	//once all pid have been (re)connected, update any internal caps
 	gf_filter_pid_update_caps(pid);
@@ -1158,20 +1228,28 @@
 	GF_FilterSession *fsess = filter->session;
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("Filter %s pid %s connecting to %s (%p)\n", task->pid->pid->filter->name, task->pid->pid->name, task->filter->name, filter));
 
-	//filter will require a new instance, clone it
+	//filter will require a new instance, clone it unless user-instantiated filter
 	if (filter->num_input_pids && (filter->max_extra_pids <= filter->num_input_pids - 1)) {
-		GF_Filter *new_filter = gf_filter_clone(filter, task->pid->pid->filter);
+		Bool is_custom = (filter->freg->flags & GF_FS_REG_CUSTOM) ? GF_TRUE : GF_FALSE;
+		GF_Filter *new_filter = is_custom ? NULL : gf_filter_clone(filter, task->pid->pid->filter);
 		if (new_filter) {
 			filter = new_filter;
 		} else {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Failed to clone filter %s\n", filter->name));
-			assert(filter->in_pid_connection_pending);
+			if (is_custom) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Cannot clone user custom filter %s\n", filter->name));
+			} else {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Failed to clone filter %s\n", filter->name));
+			}
+			gf_assert(filter->in_pid_connection_pending);
 			safe_int_dec(&filter->in_pid_connection_pending);
 			if (task->pid->pid) {
 				gf_mx_p(filter->tasks_mx);
 				gf_list_del_item(filter->temp_input_pids, task->pid->pid);
 				gf_mx_v(filter->tasks_mx);
 			}
+			if (task->pid->pid) {
+				gf_filter_pid_connect_failure(task->pid->pid);
+			}
 			return;
 		}
 	}
@@ -1186,9 +1264,9 @@
 			task->pid->pid->pid_info_changed = GF_FALSE;
 		}
 	}
-	
+
 	//filter may now be the clone, decrement on original filter
-	assert(task->filter->in_pid_connection_pending);
+	gf_assert(task->filter->in_pid_connection_pending);
 	safe_int_dec(&task->filter->in_pid_connection_pending);
 
 	gf_fs_cleanup_filters(fsess);
@@ -1250,7 +1328,7 @@
 	gf_mx_v(task->filter->tasks_mx);
 }
 
-void gf_filter_pid_detach_task(GF_FSTask *task)
+static void gf_filter_pid_detach_task_ex(GF_FSTask *task, Bool no_flush)
 {
 	u32 i, count;
 	GF_Filter *filter = task->filter;
@@ -1269,11 +1347,6 @@
 		return;
 	}
 
-	assert(filter->freg->configure_pid);
-	GF_LOG(GF_LOG_INFO, GF_LOG_FILTER, ("Filter %s pid %s detach from %s\n", task->pid->pid->filter->name, task->pid->pid->name, task->filter->name));
-
-	assert(pid->filter->detach_pid_tasks_pending);
-	safe_int_dec(&pid->filter->detach_pid_tasks_pending);
 	count = pid->num_destinations;
 	for (i=0; i<count; i++) {
 		pidinst = gf_list_get(pid->destinations, i);
@@ -1282,19 +1355,38 @@
 		}
 		pidinst=NULL;
 	}
+	//flush any packets dispatched before detaching
+	if (no_flush && pidinst && gf_fq_count(pidinst->packets)) {
+		Bool in_process = filter->in_process;
+		filter->in_process = GF_FALSE;
+		//prevent pid_would_block calls
+		filter->in_force_flush = GF_TRUE;
+		pidinst->force_flush = GF_TRUE;
+		gf_filter_process_inline(filter);
+		pidinst->force_flush = GF_FALSE;
+		filter->in_force_flush = GF_FALSE;
+		filter->in_process = in_process;
+		TASK_REQUEUE(task)
+		return;
+	}
+
+	gf_assert(filter->freg->configure_pid);
+	GF_LOG(GF_LOG_INFO, GF_LOG_FILTER, ("Filter %s pid %s detach from %s\n", task->pid->pid->filter->name, task->pid->pid->name, task->filter->name));
+	gf_assert(pid->filter->detach_pid_tasks_pending);
+	safe_int_dec(&pid->filter->detach_pid_tasks_pending);
 
 	//first connection of this PID to this filter
 	if (!pidinst) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Trying to detach PID %s not present in filter %s inputs\n",  pid->name, filter->name));
 		//when swaping encoder, we may have swap_pidinst_dst not NULL so only check swap_pidinst_src
-		assert(!new_chain_input->swap_pidinst_src);
+		gf_assert(!new_chain_input->swap_pidinst_src);
 		new_chain_input->swap_needs_init = GF_FALSE;
 		return;
 	}
 
 	//detach props
 	if (pidinst->props) {
-		assert(pidinst->props->reference_count);
+		gf_assert(pidinst->props->reference_count);
 		if (safe_int_dec(& pidinst->props->reference_count) == 0) {
 			//see \ref gf_filter_pid_merge_properties_internal for mutex
 			gf_mx_p(pidinst->pid->filter->tasks_mx);
@@ -1308,7 +1400,7 @@
 	gf_mx_p(filter->tasks_mx);
 	//detach pid - remove all packets in our pid instance and also update filter pending_packets
 	count = gf_fq_count(pidinst->packets);
-	assert(count <= filter->pending_packets);
+	gf_assert(count <= filter->pending_packets);
 	safe_int_sub(&filter->pending_packets, (s32) count);
 	gf_filter_pid_inst_reset(pidinst);
 	pidinst->pid = NULL;
@@ -1332,10 +1424,20 @@
 		new_chain_input->swap_pidinst_src = NULL;
 		new_chain_input->swap_needs_init = GF_FALSE;
 	}
-	assert(new_chain_input->detach_pid_tasks_pending);
+	gf_assert(new_chain_input->detach_pid_tasks_pending);
 	safe_int_dec(&new_chain_input->detach_pid_tasks_pending);
 }
 
+void gf_filter_pid_detach_task(GF_FSTask *task)
+{
+	gf_filter_pid_detach_task_ex(task, GF_TRUE);
+}
+
+void gf_filter_pid_detach_task_no_flush(GF_FSTask *task)
+{
+	gf_filter_pid_detach_task_ex(task, GF_FALSE);
+}
+
 GF_EXPORT
 void gf_filter_pid_set_name(GF_FilterPid *pid, const char *name)
 {
@@ -1587,7 +1689,7 @@
 	pent=NULL;
 
 	//special case for tag
-	if (!strcmp(frag_name, "TAG")) {
+	if (!strcmp(frag_name, "TAG") || !strcmp(frag_name, "ITAG")) {
 		psep0 = c;
 		if (src_pid->filter->tag) {
 			Bool is_eq;
@@ -1610,8 +1712,6 @@
 
 	//check for built-in property
 	p4cc = gf_props_get_id(frag_name);
-	if (!p4cc && !strcmp(frag_name, "PID") )
-		p4cc = GF_PROP_PID_ID;
 
 	if (!p4cc && (strlen(frag_name)==4))
 		p4cc = GF_4CC(frag_name0, frag_name1, frag_name2, frag_name3);
@@ -1734,7 +1834,7 @@
 sourceid_reassign:
 	source_ids = resolved_source_ids ? resolved_source_ids : dst_filter->source_ids;
 	if (!first_pass) {
-		assert(dst_filter->dynamic_source_ids);
+		gf_assert(dst_filter->dynamic_source_ids);
 		source_ids = dst_filter->dynamic_source_ids;
 	}
 	has_default_match = GF_FALSE;
@@ -1788,7 +1888,7 @@
 		if (!last) {
 			frag_clone = gf_strdup(frag_name);
 			char *nsep = strchr(frag_clone, src_pid->filter->session->sep_list);
-			assert(nsep);
+			gf_assert(nsep);
 			nsep0 = 0;
 			frag_name = frag_clone;
 		}
@@ -1807,7 +1907,7 @@
 					if (first_pass) {
 						char *sid = resolved_source_ids ? resolved_source_ids : dst_filter->source_ids;
 						char *frag_sep = strchr(frag_name, dst_filter->session->sep_name);
-						assert(frag_sep);
+						gf_assert(frag_sep);
 						if (next_frag) next_frag0 = src_pid->filter->session->sep_frag;
 
 						char *new_source_ids = gf_malloc(sizeof(char) * (strlen(sid) + strlen(prop_dump_buffer)+1));
@@ -1950,7 +2050,7 @@
 	u32 nb_in_caps;
 
 	if (!freg) {
-		assert(dst_filter);
+		if (!dst_filter) return GF_FALSE;
 		freg = dst_filter->freg;
 		skip_explicit_load = GF_TRUE;
 	}
@@ -1979,9 +2079,9 @@
 		if (!has_mime_cap) ext_not_trusted = GF_FALSE;
 	}
 
-	if (filter_inst && filter_inst->encoder_stream_type) {
+	if (filter_inst && filter_inst->encoder_codec_id) {
 		const GF_PropertyValue *pid_st = gf_filter_pid_get_property_first(src_pid_or_ipid, GF_PROP_PID_STREAM_TYPE);
-		if (pid_st && (pid_st->value.uint != filter_inst->encoder_stream_type))
+		if (pid_st && (pid_st->value.uint != gf_codecid_type(filter_inst->encoder_codec_id) ))
 			return GF_FALSE;
 	}
 
@@ -2205,347 +2305,327 @@
 	return gf_filter_has_in_out_caps(caps, nb_caps, GF_TRUE);
 }
 
-u32 gf_filter_caps_to_caps_match(const GF_FilterRegister *src, u32 src_bundle_idx, const GF_FilterRegister *dst_reg, GF_Filter *dst_filter, u32 *dst_bundle_idx, u32 for_dst_bundle, u32 *loaded_filter_flags, GF_CapsBundleStore *capstore)
+static void cache_bundle_free(GF_BundleDesc *b)
+{
+	if (b->caps) {
+		u32 i;
+		for (i=0; i<b->alloc_caps;i++) {
+			GF_CapBundleDesc *cap = &b->capsi;
+			if (cap->vals) gf_free((GF_FilterCapability **)cap->vals);
+		}
+		if (b->caps) gf_free(b->caps);
+	}
+	gf_free(b);
+}
+
+static GF_BundleDesc *caps_load_bundle(const GF_FilterRegister *freg, u32 b_idx, GF_BundleCache *bundle_cache, const GF_FilterCapability *caps, u32 nb_caps, Bool for_output)
+{
+	GF_BundleDesc *bundle;
+	u32 cur_idx=0, nb_st=0;
+
+	if (for_output) {
+		if (b_idx<bundle_cache->nb_src) return bundle_cache->bundles_srcb_idx;
+		gf_assert(b_idx==bundle_cache->nb_src);
+	} else {
+		if (b_idx<bundle_cache->nb_dst) return bundle_cache->bundles_dstb_idx;
+		gf_assert(b_idx==bundle_cache->nb_dst);
+	}
+
+	GF_SAFEALLOC(bundle, GF_BundleDesc);
+	if (!bundle) return NULL;
+
+	while (nb_caps--) {
+		u32 j;
+		const GF_FilterCapability *a_cap = &caps0;
+		u32 cap_flags = a_cap->flags;
+		caps++;
+		//move to next bundle
+		if (!(cap_flags & GF_CAPFLAG_IN_BUNDLE)) {
+			cur_idx++;
+			//we are done (static cap flag only applies to the following bundles, not the previous ones)
+			if (cur_idx>b_idx)
+				break;
+		}
+		//not our bundle
+		if ((cur_idx!=b_idx) && !(cap_flags & GF_CAPFLAG_STATIC)) continue;
+		//not our type
+		if (for_output) {
+			if (!(cap_flags & GF_CAPFLAG_OUTPUT)) continue;
+		} else {
+			if (!(cap_flags & GF_CAPFLAG_INPUT)) continue;
+		}
+		//cap is in our cap bundle
+		GF_CapBundleDesc *bundle_cap = NULL;
+		for (j=0; j<bundle->nb_caps; j++) {
+			bundle_cap = &bundle->capsj;
+			if (bundle_cap->code) {
+				if (cap_code_match(bundle_cap->code, a_cap->code)) break;
+			} else {
+				if (a_cap->name && !strcmp(bundle_cap->name, a_cap->name)) break;
+			}
+			bundle_cap=NULL;
+		}
+		if (!bundle_cap) {
+			//not found
+			if (bundle->nb_caps >= bundle->alloc_caps) {
+				bundle->caps = gf_realloc(bundle->caps, (bundle->alloc_caps+10) * sizeof(GF_CapBundleDesc));
+				if (!bundle->caps) {
+					cache_bundle_free(bundle);
+					return NULL;
+				}
+				u32 k, max=bundle->alloc_caps+10;
+				//reset all vals pointers in allocated area, don't memzero the rest (done when using the value)
+				for (k=bundle->alloc_caps;k<max;k++)
+					bundle->capsk.vals = NULL;
+
+				bundle->alloc_caps+=10;
+			}
+			bundle_cap = &bundle->capsbundle->nb_caps;
+			bundle->nb_caps++;
+			bundle_cap->code = a_cap->code;
+			bundle_cap->name = a_cap->name;
+			bundle_cap->nb_vals = bundle_cap->alloc_vals = 0;
+		}
+		if (bundle_cap->nb_vals >= bundle_cap->alloc_vals) {
+			bundle_cap->alloc_vals += 10;
+			bundle_cap->vals = gf_realloc((GF_FilterCapability **)bundle_cap->vals, bundle_cap->alloc_vals * sizeof(GF_FilterCapability *));
+			if (!bundle_cap->vals) {
+				cache_bundle_free(bundle);
+				return NULL;
+			}
+		}
+		bundle_cap->valsbundle_cap->nb_vals = a_cap;
+		bundle_cap->nb_vals++;
+
+		if (!(cap_flags & GF_CAPFLAG_EXCLUDED)) {
+			u32 cap_stype=0;
+			if (a_cap->code==GF_PROP_PID_STREAM_TYPE)
+				cap_stype = a_cap->val.value.uint;
+			else if ((a_cap->code == GF_PROP_PID_MIME) || (a_cap->code == GF_PROP_PID_FILE_EXT) )
+				cap_stype = GF_STREAM_FILE;
+
+			if (cap_stype && (bundle->stream_type!=cap_stype)) {
+				bundle->stream_type = (s32) cap_stype;
+				nb_st++;
+			}
+		}
+	}
+	if (nb_st>1)
+		bundle->stream_type = -1;
+
+	if (for_output) {
+		if (bundle_cache->nb_src>=bundle_cache->nb_src_alloc) {
+			bundle_cache->nb_src_alloc += 10;
+			bundle_cache->bundles_src = gf_realloc(bundle_cache->bundles_src, sizeof(GF_BundleDesc*)*bundle_cache->nb_src_alloc);
+		}
+		bundle_cache->bundles_srcbundle_cache->nb_src = bundle;
+		bundle_cache->nb_src++;
+	} else {
+		if (bundle_cache->nb_dst>=bundle_cache->nb_dst_alloc) {
+			bundle_cache->nb_dst_alloc += 10;
+			bundle_cache->bundles_dst = gf_realloc(bundle_cache->bundles_dst, sizeof(GF_BundleDesc*)*bundle_cache->nb_dst_alloc);
+		}
+		bundle_cache->bundles_dstbundle_cache->nb_dst = bundle;
+		bundle_cache->nb_dst++;
+	}
+	return bundle;
+}
+
+u32 gf_filter_caps_to_caps_match(const GF_FilterRegister *src, u32 src_bundle_idx, const GF_FilterRegister *dst_reg, GF_Filter *dst_filter, u32 dst_bundle_idx, u32 *loaded_filter_flags, s32 *src_stream_type, GF_BundleCache *bundle_cache_src, GF_BundleCache *bundle_cache_dst)
 {
 	u32 i=0;
-	s32 first_static_cap=-1;
-	u32 cur_bundle_start = 0;
-	u32 cur_bundle_idx = 0;
-	u32 nb_matched=0;
-	u32 nb_out_caps=0;
-	u32 nb_in_bundles=0;
-	u32 bundle_score = 0;
-	u32 *bundles_in_ok = NULL;
-	u32 *bundles_cap_found = NULL;
-	u32 *bundles_in_scores = NULL;
-	//initialize caps matched to true for first cap bundle
-	Bool all_caps_matched = GF_TRUE;
+	u32 bundle_in_matched = 0;
+	u32 bundle_in_score = 0;
 	const GF_FilterCapability *dst_caps = dst_reg->caps;
 	u32 nb_dst_caps = dst_reg->nb_caps;
+	gf_assert(bundle_cache_src && bundle_cache_dst);
 
 	if (dst_filter && dst_filter->freg==dst_reg && dst_filter->forced_caps) {
 		dst_caps = dst_filter->forced_caps;
 		nb_dst_caps = dst_filter->nb_forced_caps;
 	}
-
-	//check all input caps of dst filter, count bundles
-	if (! gf_filter_has_out_caps(src->caps, src->nb_caps)) {
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("Filter %s has no output caps, cannot match filter %s inputs\n", src->name, dst_reg->name));
+	//build out cap
+	GF_BundleDesc *src_bundle = caps_load_bundle(src, src_bundle_idx, bundle_cache_src, src->caps, src->nb_caps, GF_TRUE);
+	if (!src_bundle) return 0;
+	if (!src_bundle->nb_caps) {
+		if (!src_bundle_idx) {
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("Filter %s has no output caps, cannot match filter %s inputs\n", src->name, dst_reg->name));
+		}
 		return 0;
 	}
 
-	//check all input caps of dst filter, count bundles
-	nb_in_bundles = gf_filter_caps_bundle_count(dst_caps, nb_dst_caps);
-	if (!nb_in_bundles) {
+	//build in cap
+	GF_BundleDesc *dst_bundle = caps_load_bundle(dst_reg, dst_bundle_idx, bundle_cache_dst, dst_caps, nb_dst_caps, GF_FALSE);
+	if (!dst_bundle) return 0;
+	if (!dst_bundle->nb_caps) {
 		if (dst_reg->configure_pid) {
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("Filter %s has no caps but pid configure possible, assuming possible connection\n", dst_reg->name));
+			if (!dst_bundle_idx) {
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("Filter %s has no caps but pid configure possible, assuming possible connection\n", dst_reg->name));
+			}
+			if (src_stream_type)
+				*src_stream_type = src_bundle->stream_type;
 			return 1;
 		}
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("Filter %s has no caps and no pid configure, no possible connection\n", dst_reg->name));
+		if (!dst_bundle_idx) {
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("Filter %s has no caps and no pid configure, no possible connection\n", dst_reg->name));
+		}
 		return 0;
 	}
-	if (capstore->nb_allocs < nb_in_bundles) {
-		capstore->nb_allocs = nb_in_bundles;
-		capstore->bundles_in_ok = gf_realloc(capstore->bundles_in_ok, sizeof(u32) * nb_in_bundles);
-		capstore->bundles_cap_found = gf_realloc(capstore->bundles_cap_found, sizeof(u32) * nb_in_bundles);
-		capstore->bundles_in_scores = gf_realloc(capstore->bundles_in_scores,  sizeof(u32) * nb_in_bundles);
-	}
-	bundles_in_ok =	capstore->bundles_in_ok;
-	bundles_cap_found = capstore->bundles_cap_found;
-	bundles_in_scores = capstore->bundles_in_scores;
-
-	for (i=0; i<nb_in_bundles; i++) {
-		bundles_in_oki = 1;
-		bundles_cap_foundi = 0;
-		bundles_in_scoresi = 0;
-	}
 
 	//check all output caps of src filter
-	for (i=0; i<src->nb_caps; i++) {
+	for (i=0; i<src_bundle->nb_caps; i++) {
 		u32 j, k;
-		Bool already_tested = GF_FALSE;
-		const GF_FilterCapability *out_cap = &src->capsi;
-
-		if (i<cur_bundle_start) {
-			if (!(out_cap->flags & GF_CAPFLAG_STATIC))
-				continue;
-		}
-
-		if (!(out_cap->flags & GF_CAPFLAG_IN_BUNDLE) ) {
-			all_caps_matched = GF_TRUE;
-			cur_bundle_start = i+1;
-			cur_bundle_idx++;
-			if (src_bundle_idx < cur_bundle_idx)
-				break;
-
-			if (first_static_cap>=0)
-				i = (u32) (first_static_cap-1);
-			continue;
-		}
-
-		//not our selected output and not static cap
-		if ((src_bundle_idx != cur_bundle_idx) && ! (out_cap->flags & GF_CAPFLAG_STATIC) ) {
-			continue;
-		}
-
-		//not an output cap
-		if (!(out_cap->flags & GF_CAPFLAG_OUTPUT) ) continue;
-
-		if ((first_static_cap==-1) && (out_cap->flags & GF_CAPFLAG_STATIC)) {
-			first_static_cap = i;
-		}
-
-
-		//no match possible for this cap, wait until next cap start
-		if (!all_caps_matched) continue;
+		u32 bundle_caps_matched = 0;
+		Bool bundle_caps_excluded=GF_FALSE;
+		GF_CapBundleDesc *src_cap = &src_bundle->capsi;
+
+		GF_CapBundleDesc *dst_cap = NULL;
+		for (j=0; j<dst_bundle->nb_caps; j++) {
+			dst_cap = &dst_bundle->capsj;
 
-		//check we didn't test a cap with same name/code before us
-		for (k=cur_bundle_start; k<i; k++) {
-			const GF_FilterCapability *an_out_cap = &src->capsk;
-			if (! (an_out_cap->flags & GF_CAPFLAG_IN_BUNDLE) ) {
-				break;
-			}
-			if (! (an_out_cap->flags & GF_CAPFLAG_OUTPUT) ) {
-				continue;
-			}
-			if (out_cap->code && (out_cap->code == an_out_cap->code) ) {
-				already_tested = GF_TRUE;
-				break;
-			}
-			if (out_cap->name && an_out_cap->name && !strcmp(out_cap->name, an_out_cap->name)) {
-				already_tested = GF_TRUE;
-				break;
+			if (dst_cap->code) {
+				if (cap_code_match(dst_cap->code, src_cap->code))
+					break;
+			} else {
+				if (dst_cap->name && src_cap->name && !strcmp(dst_cap->name, src_cap->name))
+					break;
 			}
+			dst_cap = NULL;
 		}
-		if (already_tested) {
-			continue;
-		}
-		nb_out_caps++;
-
-		//set cap as OK in all bundles
-		for (k=0; k<nb_in_bundles; k++) {
-			bundles_cap_foundk = 0;
-		}
-
-		//check all output caps in this bundle with the same code/name, consider OK if one is matched
-		if (first_static_cap>=0)
-			k = first_static_cap-1;
-		else
-			k = cur_bundle_start;
 
-		for (; k<src->nb_caps; k++) {
-			u32 cur_dst_bundle=0;
-			Bool static_matched = GF_FALSE;
-			u32 nb_caps_tested = 0;
+		for (k=0; k<src_cap->nb_vals; k++) {
 			u32 cap_loaded_filter_only = 0;
-			Bool matched=GF_FALSE;
-			Bool exclude=GF_FALSE;
+			Bool prop_matched=GF_FALSE;
+			Bool prop_exclude=GF_FALSE;
 			Bool prop_found=GF_FALSE;
-			const GF_FilterCapability *an_out_cap = &src->capsk;
-
-			if (k<cur_bundle_start) {
-				if (!(an_out_cap->flags & GF_CAPFLAG_STATIC))
-					continue;
-			}
-			if (! (an_out_cap->flags & GF_CAPFLAG_IN_BUNDLE) ) {
-				break;
-			}
-			if (! (an_out_cap->flags & GF_CAPFLAG_OUTPUT) ) {
-				continue;
-			}
-			if (out_cap->code && !cap_code_match(out_cap->code, an_out_cap->code) )
-				continue;
 
-			if (out_cap->name && (!an_out_cap->name || strcmp(out_cap->name, an_out_cap->name)))
-				continue;
+			const GF_FilterCapability *out_cap = src_cap->valsk;
+			u32 out_cap_flags = out_cap->flags;
+			register Bool out_cap_flags_excl = out_cap_flags & GF_CAPFLAG_EXCLUDED;
 
-			//not our selected output and not static cap
-			if ((src_bundle_idx != cur_bundle_idx) && ! (an_out_cap->flags & GF_CAPFLAG_STATIC) ) {
-				continue;
-			}
-
-			nb_matched = 0;
+			u32 nb_matched = 0;
+			u32 nb_caps_in_dst_bundle = dst_cap ? dst_cap->nb_vals : 0;
 			//check all input caps of dst filter, count ones that are matched
-			for (j=0; j<nb_dst_caps; j++) {
-				Bool prop_equal;
-				const GF_FilterCapability *in_cap = &dst_capsj;
-
-				if (! (in_cap->flags & GF_CAPFLAG_IN_BUNDLE)) {
-					if (((cur_dst_bundle >= for_dst_bundle) || (in_cap->flags & GF_CAPFLAG_STATIC))) {
-						if (!matched && !nb_caps_tested && (out_cap->flags & GF_CAPFLAG_EXCLUDED)) {
-							matched = GF_TRUE;
-						}
-					}
-
-					//we found a prop, excluded but with != value hence acceptable, default matching to true
-					if (!matched && prop_found) matched = GF_TRUE;
-
-					//match, flag this bundle as ok
-					if (matched) {
-						if (!bundles_cap_foundcur_dst_bundle)
-							bundles_cap_foundcur_dst_bundle = cap_loaded_filter_only ? 2 : 1;
-
-						nb_matched++;
-					}
+			for (j=0; j<nb_caps_in_dst_bundle; j++) {
+				const GF_FilterCapability *in_cap = dst_cap->valsj;
+				u32 in_cap_flags = in_cap->flags;
+				register Bool in_cap_flags_excl = in_cap_flags & GF_CAPFLAG_EXCLUDED;
 
-					matched = static_matched ? GF_TRUE : GF_FALSE;
-					if (exclude) {
-						bundles_cap_foundcur_dst_bundle = 0;
-						exclude = GF_FALSE;
-					}
-					prop_found = GF_FALSE;
-					nb_caps_tested = 0;
-					cur_dst_bundle++;
-					if (cur_dst_bundle > for_dst_bundle)
-						break;
-
-					continue;
-				}
-				//not an input cap
-				if (!(in_cap->flags & GF_CAPFLAG_INPUT) )
-					continue;
-
-				//optional cap, ignore
-				if (in_cap->flags & GF_CAPFLAG_OPTIONAL)
-					continue;
-
-				if ((cur_dst_bundle < for_dst_bundle) && !(in_cap->flags & GF_CAPFLAG_STATIC))
-					continue;
-
-				//prop was excluded, cannot match in bundle
-				if (exclude) continue;
-				//prop was matched, no need to check other caps in the current bundle
-				if (matched) continue;
-
-				if (out_cap->code && !cap_code_match(out_cap->code, in_cap->code) )
-					continue;
-
-				if (out_cap->name && (!in_cap->name || strcmp(out_cap->name, in_cap->name)))
-					continue;
-
-				nb_caps_tested++;
 				//we found a property of that type , check if equal equal
-				prop_equal = gf_props_equal(&in_cap->val, &an_out_cap->val);
-				if ((in_cap->flags & GF_CAPFLAG_EXCLUDED) && !(an_out_cap->flags & GF_CAPFLAG_EXCLUDED) ) {
+				if (in_cap_flags_excl && !out_cap_flags_excl) {
+					Bool prop_equal;
 					//special case for excluded output caps marked for loaded filter only and optional:
 					//always consider no match, the actual pid link resolving will sort this out
 					//this fixes a bug in reframer -> ffdec links: since ffdec only specifies excluded GF_CODEC_ID caps,
 					//not doing so will always force reframer->ufnalu->rfnalu->ffdec
-					if (an_out_cap->flags & (GF_CAPFLAG_OPTIONAL|GF_CAPFLAG_LOADED_FILTER))
+					if (out_cap_flags & (GF_CAPFLAG_OPTIONAL|GF_CAPFLAG_LOADED_FILTER))
 						prop_equal = GF_FALSE;
+					else
+						prop_equal = gf_props_equal(&in_cap->val, &out_cap->val);
 
 					//prop type matched, output includes it and input excludes it: no match, don't look any further
 					if (prop_equal) {
-						matched = GF_FALSE;
-						exclude = GF_TRUE;
-						prop_found = GF_FALSE;
+						//ignore if we have a previous match for same cap - this is needed for filters declaring multiple stream types
+						//which are only known after filter loading
+						if (!bundle_caps_matched) {
+							prop_exclude = GF_TRUE;
+							//we may have prop_found = TRUE here if a previous prop was found, force reset
+							prop_found = GF_FALSE;
+							//prop excluded, cannot match in bundle
+							break;
+						}
 					} else {
 						//remember we found a prop of same type but excluded value
 						// we will match unless we match an excluded value
 						prop_found = GF_TRUE;
+						if (in_cap_flags & GF_CAPFLAG_LOADED_FILTER)
+							cap_loaded_filter_only = 1;
 					}
-				} else if (!(in_cap->flags & GF_CAPFLAG_EXCLUDED) && (an_out_cap->flags & GF_CAPFLAG_EXCLUDED) ) {
+				} else if (!in_cap_flags_excl && out_cap_flags_excl) {
 					//prop type matched, input includes it and output excludes it: no match, don't look any further
-					if (prop_equal) {
-						matched = GF_FALSE;
-						exclude = GF_TRUE;
+					if (gf_props_equal(&in_cap->val, &out_cap->val)) {
+						prop_exclude = GF_TRUE;
+						//we may have prop_found = TRUE here if a previous prop was found, force reset
 						prop_found = GF_FALSE;
+						//prop excluded, cannot match in bundle
+						break;
 					} else {
 						//remember we found a prop of same type but excluded value
 						//we will match unless we match an excluded value
 						prop_found = GF_TRUE;
+						if (in_cap_flags & GF_CAPFLAG_LOADED_FILTER)
+							cap_loaded_filter_only = 1;
 					}
-				} else if (prop_equal) {
-					matched = GF_TRUE;
-//					if (an_out_cap->flags & GF_CAPFLAG_STATIC)
-//						static_matched = GF_TRUE;
-				} else if ((in_cap->flags & GF_CAPFLAG_EXCLUDED) && (an_out_cap->flags & GF_CAPFLAG_EXCLUDED) ) {
-					//prop type matched, input excludes it and output excludes it and no match, remmeber we found the prop type
+				} else if (gf_props_equal(&in_cap->val, &out_cap->val)) {
+					prop_matched = GF_TRUE;
+					if (in_cap_flags & GF_CAPFLAG_LOADED_FILTER)
+						cap_loaded_filter_only = 1;
+					//prop matched, no need to check other caps in the current bundle
+					break;
+				} else if ((in_cap_flags & GF_CAPFLAG_EXCLUDED) && (out_cap_flags & GF_CAPFLAG_EXCLUDED) ) {
+					//prop type matched, input excludes it and output excludes it and no match, remember we found the prop type
 					prop_found = GF_TRUE;
+					if (in_cap_flags & GF_CAPFLAG_LOADED_FILTER)
+						cap_loaded_filter_only = 1;
 				}
-
-				if (prop_found && (in_cap->flags & GF_CAPFLAG_LOADED_FILTER))
-					cap_loaded_filter_only = 1;
 			}
-			if (nb_caps_tested) {
-				//we found a prop, excluded but with != value hence acceptable, default matching to true
-				if (!matched && prop_found) matched = GF_TRUE;
-				//not match, flag this bundle as not ok
-				if (matched) {
-					if (!bundles_cap_foundcur_dst_bundle)
-						bundles_cap_foundcur_dst_bundle = cap_loaded_filter_only ? 2 : 1;
+			//done checking all possible dest values for source cap
 
+			if (nb_caps_in_dst_bundle) {
+				//we have a match
+				if (prop_matched
+					//or we found a prop excluded but with != value hence acceptable, match it
+					|| prop_found
+				) {
+					bundle_caps_matched = cap_loaded_filter_only ? 2 : 1;
 					nb_matched++;
 				}
 				//excluded cap was found, disable bundle (might have been activated before we found the excluded cap)
-				else if (exclude) {
-					bundles_cap_foundcur_dst_bundle = 0;
+				else if (prop_exclude) {
+					bundle_caps_matched = 0;
+					bundle_caps_excluded = GF_TRUE;
 				}
 			} else if (!nb_dst_caps) {
-				if (!bundles_cap_foundcur_dst_bundle)
-					bundles_cap_foundcur_dst_bundle = cap_loaded_filter_only ? 2 : 1;
-
+				bundle_caps_matched = cap_loaded_filter_only ? 2 : 1;
 				nb_matched++;
-			} else if (!nb_matched && !prop_found && (an_out_cap->flags & (GF_CAPFLAG_EXCLUDED|GF_CAPFLAG_OPTIONAL)) && (cur_dst_bundle<nb_in_bundles) ) {
-				if (!bundles_cap_foundcur_dst_bundle)
-					bundles_cap_foundcur_dst_bundle = cap_loaded_filter_only ? 2 : 1;
-
+			} else if (!nb_matched && !prop_found && (out_cap_flags & (GF_CAPFLAG_EXCLUDED|GF_CAPFLAG_OPTIONAL)) ) {
+				bundle_caps_matched = cap_loaded_filter_only ? 2 : 1;
 				nb_matched++;
 			}
 		}
-		//merge bundle cap
-		nb_matched=0;
-		for (k=0; k<nb_in_bundles; k++) {
-			if (!bundles_cap_foundk)
-				bundles_in_okk = 0;
-			else {
-				nb_matched += 1;
-				//we matched this property, keep score for the bundle
-				bundles_in_scoresk ++;
-				//mark if connection is only valid for loaded inputs
-				if (bundles_cap_foundk==2)
-				 	bundles_in_okk |= 1<<1;
-				//mark if connection is only valid for loaded outputs
-				if (out_cap->flags & GF_CAPFLAG_LOADED_FILTER)
-					bundles_in_okk |= 1<<2;
+		//done checking all source caps, check if we found a match
+		if (!bundle_caps_matched) {
+			bundle_in_matched = 0;
+			//caps were found but explicitly excluded, no possible match
+			if (bundle_caps_excluded)
+				break;
+			//not matched and not excluded, cannot link to this bundle
+			if (!(src_cap->vals0->flags & (GF_CAPFLAG_EXCLUDED|GF_CAPFLAG_OPTIONAL))) {
+				bundle_in_matched = 0;
+				break;
 			}
-		}
-
-		//not matched and not excluded, skip until next bundle
-		if (!nb_matched && !(out_cap->flags & (GF_CAPFLAG_EXCLUDED|GF_CAPFLAG_OPTIONAL))) {
-			all_caps_matched = GF_FALSE;
+		} else {
+			bundle_in_matched |= 1;
+			//we matched this property, keep score for the bundle
+			bundle_in_score ++;
+			//mark if connection is only valid for loaded inputs
+			if (bundle_caps_matched==2)
+				bundle_in_matched |= 1<<1;
+			//mark if connection is only valid for loaded outputs
+			if (src_cap->vals0->flags & GF_CAPFLAG_LOADED_FILTER)
+				bundle_in_matched |= 1<<2;
 		}
 	}
 
-	//get bundle with highest score
-	bundle_score = 0;
-	nb_matched = 0;
-
-	for (i=0; i<nb_in_bundles; i++) {
-		if (bundles_in_oki) {
-			nb_matched++;
-			if (bundle_score < bundles_in_scoresi) {
-				*dst_bundle_idx = i;
-				bundle_score = bundles_in_scoresi;
-				if (loaded_filter_flags) {
-					*loaded_filter_flags = (bundles_in_oki>>1);
-				}
-			}
-			if (for_dst_bundle==i) {
-				*dst_bundle_idx = i;
-				if (loaded_filter_flags) {
-					*loaded_filter_flags = (bundles_in_oki>>1);
-				}
-				return bundles_in_scoresi;
-			}
-		}
+	if (bundle_in_matched) {
+		if (loaded_filter_flags) {
+			*loaded_filter_flags = (bundle_in_matched>>1);
+		}
+		if (src_stream_type)
+			*src_stream_type = src_bundle->stream_type;
+		return bundle_in_score;
 	}
-	if (!bundle_score) {
-//		GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("Filter %s outputs cap bundle %d do not match filter %s inputs\n", src->name, src_bundle_idx, dst_reg->name));
-	} else {
-//		GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("Filter %s outputs cap bundle %d matches filter %s inputs caps bundle %d (%d total bundle matches, bundle matched %d/%d caps)\n", src->name, src_bundle_idx, dst_reg->name, *dst_bundle_idx, nb_matched, bundle_score, nb_out_caps));
-	}
-	return bundle_score;
+	return 0;
 }
 
 GF_EXPORT
@@ -2631,43 +2711,6 @@
 	return GF_FALSE;
 }
 
-static s32 gf_filter_reg_get_bundle_stream_type(const GF_FilterRegister *freg, u32 cap_idx, Bool for_output)
-{
-	u32 i, cur_bundle, stype=0, nb_stype=0;
-
-	cur_bundle = 0;
-	for (i=0; i<freg->nb_caps; i++) {
-		u32 cap_stype=0;
-		const GF_FilterCapability *cap = &freg->capsi;
-		if (!(cap->flags & GF_CAPFLAG_IN_BUNDLE)) {
-			cur_bundle++;
-			continue;
-		}
-		if (for_output) {
-			if (!(cap->flags & GF_CAPFLAG_OUTPUT)) continue;
-		} else {
-			if (!(cap->flags & GF_CAPFLAG_INPUT)) continue;
-		}
-		if ((cur_bundle != cap_idx) && !(cap->flags & GF_CAPFLAG_STATIC) ) continue;
-		//output type is file or same media type, allow looking for filter chains
-		if (cap->flags & GF_CAPFLAG_EXCLUDED) continue;
-
-		if (cap->code == GF_PROP_PID_STREAM_TYPE)
-			cap_stype = cap->val.value.uint;
-		else if ((cap->code == GF_PROP_PID_MIME) || (cap->code == GF_PROP_PID_FILE_EXT) )
-			cap_stype = GF_STREAM_FILE;
-
-		if (!cap_stype) continue;
-
-		if (stype != cap_stype) {
-			stype = cap_stype;
-			nb_stype++;
-		}
-	}
-	if (nb_stype==1) return (s32) stype;
-	if (nb_stype) return -1;
-	return 0;
-}
 
 /*recursively enable edges of the graph.
 	returns 0 if subgraph shall be disabled (will marke edge at the root of the subgraph disabled)
@@ -2791,31 +2834,39 @@
 	return 0;
 }
 
-static void gf_filter_reg_build_graph_single(GF_FilterRegDesc *reg_desc, const GF_FilterRegister *freg, GF_FilterRegDesc *a_reg, Bool freg_has_output, u32 nb_dst_caps, GF_CapsBundleStore *capstore, GF_Filter *dst_filter)
+static void gf_filter_reg_build_graph_single(GF_FilterRegDesc *reg_desc, GF_FilterRegDesc *a_reg, u32 nb_dst_caps, GF_Filter *dst_filter)
 {
 	u32 nb_src_caps, k, l;
 	u32 path_weight;
+	const GF_FilterRegister *freg = reg_desc->freg;
+	Bool freg_has_input = reg_desc->has_input ? 1 : 0;
+	Bool freg_has_output = reg_desc->has_output ? 1 : 0;
+	Bool a_reg_has_input = a_reg->has_input ? 1 : 0;
+	Bool a_reg_has_output = a_reg->has_output ? 1 : 0;
+
+	if (!reg_desc->bundle_cache) GF_SAFEALLOC(reg_desc->bundle_cache, GF_BundleCache);
+	if (!a_reg->bundle_cache) GF_SAFEALLOC(a_reg->bundle_cache, GF_BundleCache);
 
 	//check which cap of this filter matches our destination
-	nb_src_caps = gf_filter_caps_bundle_count(a_reg->freg->caps, a_reg->freg->nb_caps);
+	nb_src_caps = a_reg->nb_bundles;
 	for (k=0; k<nb_src_caps; k++) {
 		for (l=0; l<nb_dst_caps; l++) {
-			s32 bundle_idx;
 
-			if (gf_filter_has_out_caps(a_reg->freg->caps, a_reg->freg->nb_caps)) {
+			if (freg_has_input && a_reg_has_output) {
 				u32 loaded_filter_only_flags = 0;
+				s32 src_stream_type=0;
 
-				path_weight = gf_filter_caps_to_caps_match(a_reg->freg, k, (const GF_FilterRegister *) freg, dst_filter, &bundle_idx, l, &loaded_filter_only_flags, capstore);
+				path_weight = gf_filter_caps_to_caps_match(a_reg->freg, k, (const GF_FilterRegister *) freg, dst_filter, l, &loaded_filter_only_flags, &src_stream_type, a_reg->bundle_cache, reg_desc->bundle_cache);
 
-				if (path_weight && (bundle_idx == l)) {
+				if (path_weight) {
 					GF_FilterRegEdge *edge;
 					if (reg_desc->nb_edges==reg_desc->nb_alloc_edges) {
 						reg_desc->nb_alloc_edges += 10;
 						reg_desc->edges = gf_realloc(reg_desc->edges, sizeof(GF_FilterRegEdge) * reg_desc->nb_alloc_edges);
 					}
-					assert(path_weight<0xFF);
-					assert(k<0xFFFF);
-					assert(l<0xFFFF);
+					gf_assert(path_weight<0xFF);
+					gf_assert(k<0xFFFF);
+					gf_assert(l<0xFFFF);
 					edge = &reg_desc->edgesreg_desc->nb_edges;
 					memset(edge, 0, sizeof(GF_FilterRegEdge));
 					edge->src_reg = a_reg;
@@ -2828,17 +2879,18 @@
 						edge->loaded_filter_only |= EDGE_LOADED_DEST_ONLY;
 					if (loaded_filter_only_flags & EDGE_LOADED_DEST_ONLY)
 						edge->loaded_filter_only |= EDGE_LOADED_SOURCE_ONLY;
-					edge->src_stream_type = gf_filter_reg_get_bundle_stream_type(edge->src_reg->freg, edge->src_cap_idx, GF_TRUE);
+					edge->src_stream_type = src_stream_type;
 					reg_desc->nb_edges++;
 				}
 			}
 
-			if ( freg_has_output ) {
+			if ( freg_has_output && a_reg_has_input) {
 				u32 loaded_filter_only_flags = 0;
+				s32 src_stream_type=0;
 
-				path_weight = gf_filter_caps_to_caps_match(freg, l, a_reg->freg, dst_filter, &bundle_idx, k, &loaded_filter_only_flags, capstore);
+				path_weight = gf_filter_caps_to_caps_match(freg, l, a_reg->freg, dst_filter, k, &loaded_filter_only_flags, &src_stream_type, reg_desc->bundle_cache, a_reg->bundle_cache);
 
-				if (path_weight && (bundle_idx == k)) {
+				if (path_weight) {
 					GF_FilterRegEdge *edge;
 					if (a_reg->nb_edges==a_reg->nb_alloc_edges) {
 						a_reg->nb_alloc_edges += 10;
@@ -2851,7 +2903,7 @@
 					edge->dst_cap_idx = (u16) k;
 					edge->priority = 0;
 					edge->loaded_filter_only = loaded_filter_only_flags;
-					edge->src_stream_type = gf_filter_reg_get_bundle_stream_type(edge->src_reg->freg, edge->src_cap_idx, GF_TRUE);
+					edge->src_stream_type = src_stream_type;
 					a_reg->nb_edges++;
 				}
 			}
@@ -2859,31 +2911,36 @@
 	}
 }
 
-static GF_FilterRegDesc *gf_filter_reg_build_graph(GF_List *links, const GF_FilterRegister *freg, GF_CapsBundleStore *capstore, GF_FilterPid *src_pid, GF_Filter *dst_filter)
+static GF_FilterRegDesc *gf_filter_reg_build_graph(GF_List *links, const GF_FilterRegister *freg, GF_FilterPid *src_pid, GF_Filter *dst_filter, u32 orig_nb_bundles)
 {
 	u32 nb_dst_caps, nb_regs, i, nb_caps;
-	Bool freg_has_output;
-
 	GF_FilterRegDesc *reg_desc = NULL;
 	const GF_FilterCapability *caps = freg->caps;
 	nb_caps = freg->nb_caps;
 	if (dst_filter && ((freg->flags & (GF_FS_REG_SCRIPT|GF_FS_REG_CUSTOM)) || (src_pid && dst_filter->forced_caps) ) ) {
 		caps = dst_filter->forced_caps;
 		nb_caps = dst_filter->nb_forced_caps;
+		orig_nb_bundles = dst_filter->nb_forced_bundles;
 	}
 
-	freg_has_output = gf_filter_has_out_caps(caps, nb_caps);
-
 	GF_SAFEALLOC(reg_desc, GF_FilterRegDesc);
 	if (!reg_desc) return NULL;
 
 	reg_desc->freg = freg;
-
-	nb_dst_caps = gf_filter_caps_bundle_count(caps, nb_caps);
-
+	reg_desc->nb_bundles = nb_dst_caps = orig_nb_bundles ? orig_nb_bundles : gf_filter_caps_bundle_count(caps, nb_caps);
+	//for scripts force checking inputs
+	if (freg->flags & GF_FS_REG_SCRIPT) {
+		reg_desc->has_input = GF_TRUE;
+	} else {
+		reg_desc->has_input = gf_filter_has_in_caps(caps, nb_caps);
+	}
 
 	//we are building a register descriptor acting as destination, ignore any output caps
-	if (src_pid || dst_filter) freg_has_output = GF_FALSE;
+	//this only happens during dijkstra resolver
+	if (src_pid || dst_filter)
+		reg_desc->has_output = GF_FALSE;
+	else
+		reg_desc->has_output = gf_filter_has_out_caps(caps, nb_caps);
 
 	//setup all connections
 	nb_regs = gf_list_count(links);
@@ -2891,25 +2948,51 @@
 		GF_FilterRegDesc *a_reg = gf_list_get(links, i);
 		if (a_reg->freg == freg) continue;
 
-		gf_filter_reg_build_graph_single(reg_desc, freg, a_reg, freg_has_output, nb_dst_caps, capstore, dst_filter);
+		gf_filter_reg_build_graph_single(reg_desc, a_reg, nb_dst_caps, dst_filter);
 	}
 
 	if (!dst_filter && (freg->flags & GF_FS_REG_ALLOW_CYCLIC)) {
-		gf_filter_reg_build_graph_single(reg_desc, freg, reg_desc, freg_has_output, nb_dst_caps, capstore, NULL);
+		gf_filter_reg_build_graph_single(reg_desc, reg_desc, nb_dst_caps, NULL);
 	}
 	return reg_desc;
 }
 
+void bundle_cache_free(GF_FilterRegDesc *reg_desc)
+{
+	u32 j;
+	if (!reg_desc->bundle_cache) return;
+	if (reg_desc->bundle_cache->bundles_src) {
+		for (j=0; j<reg_desc->bundle_cache->nb_src; j++) {
+			cache_bundle_free(reg_desc->bundle_cache->bundles_srcj);
+		}
+		gf_free(reg_desc->bundle_cache->bundles_src);
+	}
+	if (reg_desc->bundle_cache->nb_dst) {
+		for (j=0; j<reg_desc->bundle_cache->nb_dst; j++) {
+			cache_bundle_free(reg_desc->bundle_cache->bundles_dstj);
+		}
+		gf_free(reg_desc->bundle_cache->bundles_dst);
+	}
+	gf_free(reg_desc->bundle_cache);
+	reg_desc->bundle_cache=NULL;
+}
+
+void reset_bundle_cache(GF_FilterSession *fsess)
+{
+	u32 i, count = gf_list_count(fsess->links);
+	for (i=0; i<count; i++) {
+		bundle_cache_free( gf_list_get(fsess->links, i) );
+	}
+}
+
 void gf_filter_sess_build_graph(GF_FilterSession *fsess, const GF_FilterRegister *for_reg)
 {
 	u32 i, count;
-	GF_CapsBundleStore capstore;
-	memset(&capstore, 0, sizeof(GF_CapsBundleStore));
 
 	if (!fsess->links) fsess->links = gf_list_new();
 
 	if (for_reg) {
-		GF_FilterRegDesc *freg_desc = gf_filter_reg_build_graph(fsess->links, for_reg, &capstore, NULL, NULL);
+		GF_FilterRegDesc *freg_desc = gf_filter_reg_build_graph(fsess->links, for_reg, NULL, NULL, 0);
 		if (!freg_desc) {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Failed to build graph entry for filter %s\n", for_reg->name));
 		} else {
@@ -2922,7 +3005,7 @@
 		count = gf_list_count(fsess->registry);
 		for (i=0; i<count; i++) {
 			const GF_FilterRegister *freg = gf_list_get(fsess->registry, i);
-			GF_FilterRegDesc *freg_desc = gf_filter_reg_build_graph(fsess->links, freg, &capstore, NULL, NULL);
+			GF_FilterRegDesc *freg_desc = gf_filter_reg_build_graph(fsess->links, freg, NULL, NULL, 0);
 			if (!freg_desc) {
 				GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Failed to build graph entry for filter %s\n", freg->name));
 			} else {
@@ -2944,9 +3027,7 @@
 			}
 		}
 	}
-	if (capstore.bundles_cap_found) gf_free(capstore.bundles_cap_found);
-	if (capstore.bundles_in_ok) gf_free(capstore.bundles_in_ok);
-	if (capstore.bundles_in_scores) gf_free(capstore.bundles_in_scores);
+	reset_bundle_cache(fsess);
 }
 
 void gf_filter_sess_reset_graph(GF_FilterSession *fsess, const GF_FilterRegister *freg)
@@ -2990,13 +3071,13 @@
 }
 
 #ifndef GPAC_DISABLE_LOG
-void dump_dijstra_edges(Bool is_before, GF_FilterRegDesc *reg_dst, GF_List *dijkstra_nodes)
+void dump_graph_edges(Bool is_before, GF_FilterRegDesc *reg_dst, GF_List *dijkstra_nodes)
 {
 	u32 i, count;
 	if (! gf_log_tool_level_on(GF_LOG_FILTER, GF_LOG_DEBUG))
 		return;
 
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("Dijstra edges %s edge solving\n", is_before ? "before" : "after"));
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("Graph edges %s solving\n", is_before ? "before" : "after"));
 
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("Filter %s sources: ", reg_dst->freg->name));
 	for (i=0; i<reg_dst->nb_edges; i++) {
@@ -3022,11 +3103,11 @@
 static void gf_filter_pid_resolve_link_dijkstra(GF_FilterPid *pid, GF_Filter *dst, const char *prefRegister, Bool reconfigurable_only, GF_List *out_reg_chain)
 {
 	GF_FilterRegDesc *reg_dst, *result;
+	u32 orig_nb_bundles=0;
 	GF_List *dijkstra_nodes;
 	GF_FilterSession *fsess = pid->filter->session;
 	//build all edges
 	u32 i, dijsktra_node_count, dijsktra_edge_count, count;
-	GF_CapsBundleStore capstore;
 	Bool first;
 	Bool check_codec_id_raw = GF_FALSE;
 	u32 path_weight, pid_stream_type, max_weight=0;
@@ -3038,7 +3119,6 @@
 	dijkstra_nodes = gf_list_new();
 
 	result = NULL;
-
 	pid_stream_type = 0;
 	p = gf_filter_pid_get_property(pid, GF_PROP_PID_STREAM_TYPE);
 	if (p) pid_stream_type = p->value.uint;
@@ -3048,17 +3128,17 @@
 	//and if present consider this filter suitable
 	//note that encoders must use reconfigure output
 	if (reconfigurable_only
-		&& pid->caps_negociate
-		&& (gf_list_count(pid->caps_negociate->properties)==1)
+		&& pid->caps_negotiate
+		&& (gf_list_count(pid->caps_negotiate->properties)==1)
 	) {
-		const GF_PropertyValue *cid = gf_props_get_property(pid->caps_negociate, GF_PROP_PID_CODECID, NULL);
+		const GF_PropertyValue *cid = gf_props_get_property(pid->caps_negotiate, GF_PROP_PID_CODECID, NULL);
 		//for now we only check decoders, encoders must use reconfigure output
 		if (cid && (cid->value.uint==GF_CODECID_RAW)) {
 			check_codec_id_raw = cid->value.uint;
 		}
 	}
 
-	//1: select all elligible filters for the graph resolution: exclude sources, sinks, explicits, blacklisted and not reconfigurable if we reconfigure
+	//1: select all eligible filters for the graph resolution: exclude sources, sinks, explicits, blacklisted and not reconfigurable if we reconfigure
 	count = gf_list_count(fsess->links);
 	for (i=0; i<count; i++) {
 		u32 j;
@@ -3100,35 +3180,35 @@
 
 		//don't add source filters except if PID is from source
 		if (!freg->configure_pid && (freg!=pid->filter->freg)) {
-			assert(freg != dst->freg);
+			gf_assert(freg != dst->freg);
 			disable_filter = GF_TRUE;
 		}
 		//freg shall be instantiated
 		else if ((freg->flags & (GF_FS_REG_EXPLICIT_ONLY|GF_FS_REG_SCRIPT|GF_FS_REG_CUSTOM)) && (freg != pid->filter->freg) && (freg != dst->freg) ) {
-			assert(freg != dst->freg);
+			gf_assert(freg != dst->freg);
 			disable_filter = GF_TRUE;
 		}
 		//no output caps, cannot add
-		else if ((freg != dst->freg) && !gf_filter_has_out_caps(freg->caps, freg->nb_caps)) {
+		else if ((freg != dst->freg) && !reg_desc->has_output) {
 			disable_filter = GF_TRUE;
 		}
 		//we only want reconfigurable output filters
 		else if (reconf_only && !freg->reconfigure_output && (freg != dst->freg)) {
-			assert(freg != dst->freg);
+			gf_assert(freg != dst->freg);
 			disable_filter = GF_TRUE;
 		}
 		//blacklisted filter
 		else if (gf_list_find(pid->filter->blacklisted, (void *) freg)>=0) {
 			//this commented because not true for multi-pids inputs (tiling) to a decoder
-			//assert(freg != dst->freg);
+			//gf_assert(freg != dst->freg);
 			if (!reconfigurable_only) {
-				assert(freg != pid->filter->freg);
+				gf_assert(freg != pid->filter->freg);
 			}
 			disable_filter = GF_TRUE;
 		}
 		//blacklisted adaptation filter
 		else if (pid->adapters_blacklist && (gf_list_find(pid->adapters_blacklist, (void *) freg)>=0)) {
-			assert(freg != dst->freg);
+			gf_assert(freg != dst->freg);
 			disable_filter = GF_TRUE;
 		}
 
@@ -3177,17 +3257,23 @@
 		if (dst->freg == reg_desc->freg) {
 			reg_desc->dist = 0;
 			reg_desc->priority = 0;
+			orig_nb_bundles = reg_desc->nb_bundles;
 		} else {
 			gf_list_add(dijkstra_nodes, reg_desc);
 		}
 	}
-	//create a new node for the destination based on elligible filters in the graph
-	memset(&capstore, 0, sizeof(GF_CapsBundleStore));
-	reg_dst = gf_filter_reg_build_graph(dijkstra_nodes, dst->freg, &capstore, pid, dst);
+	//create a new node for the destination based on eligible filters in the graph
+	reg_dst = gf_filter_reg_build_graph(dijkstra_nodes, dst->freg, pid, dst, orig_nb_bundles);
 	reg_dst->dist = 0;
 	reg_dst->priority = 0;
 	reg_dst->in_edges_enabling = 0;
 
+#ifndef GPAC_DISABLE_LOG
+	if (fsess->flags & GF_FS_FLAG_PRINT_CONNECTIONS) {
+		dump_graph_edges(GF_TRUE, reg_dst, dijkstra_nodes);
+	}
+#endif
+
 	//enable edges of destination, potentially disabling edges from source filters to dest
 	for (i=0; i<reg_dst->nb_edges; i++) {
 		GF_FilterRegEdge *edge = &reg_dst->edgesi;
@@ -3233,13 +3319,11 @@
 		gf_filter_pid_enable_edges(fsess, edge->src_reg, edge->src_cap_idx, pid->filter->freg, 1, edge->src_stream_type, reg_dst, pid, pid_stream_type);
 	}
 
-	if (capstore.bundles_cap_found) gf_free(capstore.bundles_cap_found);
-	if (capstore.bundles_in_ok) gf_free(capstore.bundles_in_ok);
-	if (capstore.bundles_in_scores) gf_free(capstore.bundles_in_scores);
+	reset_bundle_cache(fsess);
 
 #ifndef GPAC_DISABLE_LOG
 	if (fsess->flags & GF_FS_FLAG_PRINT_CONNECTIONS) {
-		dump_dijstra_edges(GF_FALSE, reg_dst, dijkstra_nodes);
+		dump_graph_edges(GF_FALSE, reg_dst, dijkstra_nodes);
 	}
 #endif
 
@@ -3382,6 +3466,7 @@
 	}
 	gf_list_del(dijkstra_nodes);
 
+	bundle_cache_free(reg_dst);
 	gf_free(reg_dst->edges);
 	gf_free(reg_dst);
 }
@@ -3478,7 +3563,7 @@
 		GF_Filter *prev_af;
 
 		if (skip_if_in_filter_list) {
-			assert(skipped);
+			gf_assert(skipped);
 			*skipped = GF_FALSE;
 			u32 nb_skip = gf_list_count(skip_if_in_filter_list);
 			const GF_FilterRegister *chain_start_freg = gf_list_get(filter_chain, 0);
@@ -3513,6 +3598,20 @@
 				}
 
 				if (f->freg == chain_start_freg) {
+					//if we link to a sink
+					if (dst_is_sink
+						//and intermediate filter already has a destination (ie graph is loaded)
+						&& gf_list_count(f->destination_filters)
+						//and this destination is not the target sink
+						&& (gf_list_find(f->destination_filters, dst)<0)
+					) {
+						//do not skip filter but force resolving the graph
+						//this allows e.g. fin->DMX-> -o dash1.mpd -o dash2.mpd
+						//the filter loaded for DMX->dasher->fout(dash1.mpd) will be rejected when checking DMX->dash2.mpd link
+						//cf https://github.com/gpac/gpac/issues/2453#issuecomment-1548112064
+						continue;
+					}
+
 					//store destination as future destination link for this new filter
 					if (gf_list_find(f->destination_links, dst)<0)
 						gf_list_add(f->destination_links, dst);
@@ -3545,9 +3644,8 @@
 			GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("Solved %sfilter chain from filter %s PID %s to filter %s - dumping chain:\n", reconfigurable_only_type ? "adaptation " : "", pid->filter->name, pid->name, dst->freg->name));
 		}
 #endif
-		char szLocSep8;
-		sprintf(szLocSep, "gfloc%c", fsess->sep_args);
-		gfloc = strstr(args, "gfloc");
+
+		gfloc = args ? strstr(args, "gfloc") : NULL;
 		if (gfloc) {
 			if ((gfloc>args) && (gfloc-1==fsess->sep_args))
 				gfloc --;
@@ -3622,6 +3720,8 @@
 			af = gf_filter_new(fsess, freg, args, dst_args, pid->filter->no_dst_arg_inherit ? GF_FILTER_ARG_INHERIT_SOURCE_ONLY : GF_FILTER_ARG_INHERIT, NULL, NULL, GF_TRUE);
 			if (!af) goto exit;
 			af->subsession_id = dst->subsession_id;
+			if (dst->itag) af->itag = gf_strdup(dst->itag);
+
 			//destination is sink, check if af is a mux (output cap type STREAM=FILE present)
 			//if not, copy subsource_id from pid
 			Bool af_is_mux = GF_FALSE;
@@ -3652,7 +3752,7 @@
 			}
 			if (pid->require_source_id)
 				af->require_source_id = GF_TRUE;
-			
+
 			//copy source IDs for all filters in the chain
 			//we cannot figure out the destination sourceID when initializing PID connection tasks
 			//by walking up the filter chain because PIDs connection might be pending
@@ -3797,8 +3897,9 @@
 
 	//parse each arg
 	while (args) {
+		char ref_prop_dumpGF_PROP_DUMP_ARG_SIZE;
 		u32 p4cc=0;
-		u32 prop_type=GF_PROP_FORBIDEN;
+		u32 prop_type=GF_PROP_FORBIDDEN;
 		Bool parse_prop = GF_TRUE;
 		char *value_next_list = NULL;
 		char *value_sep = NULL;
@@ -3885,7 +3986,7 @@
 			p4cc = GF_4CC(name0, name1, name2, name3);
 			if (p4cc) prop_type = gf_props_4cc_get_type(p4cc);
 		}
-		if (prop_type==GF_PROP_FORBIDEN) {
+		if (prop_type==GF_PROP_FORBIDDEN) {
 			p4cc = gf_props_get_id(name);
 			if (p4cc) prop_type = gf_props_4cc_get_type(p4cc);
 		}
@@ -3942,10 +4043,28 @@
 		if (!parse_prop)
 			goto skip_arg;
 
+		//the following properties are templates, do not try to solve them here
+		switch (p4cc) {
+		case GF_PROP_PID_HLS_PLAYLIST:
+		case GF_PROP_PID_TEMPLATE:
+			parse_prop = GF_FALSE;
+			break;
+		}
+
+		if (parse_prop && value && strpbrk(value, "$@")) {
+			char *a_value = gf_strdup(value);
+			filter_solve_prop_template(filter, pid, &a_value);
+			strncpy(ref_prop_dump, a_value, GF_PROP_DUMP_ARG_SIZE-1);
+			ref_prop_dumpGF_PROP_DUMP_ARG_SIZE-1=0;
+			gf_free(a_value);
+			value = (char*) ref_prop_dump;
+			if (!value0)
+				goto skip_arg;
+		}
 
-		if (prop_type != GF_PROP_FORBIDEN) {
+		if (prop_type != GF_PROP_FORBIDDEN) {
 			GF_PropertyValue p;
-			p.type = GF_PROP_FORBIDEN;
+			p.type = GF_PROP_FORBIDDEN;
 
 			//specific parsing for clli: it's a data prop but we allow textual specifiers
 			if ((p4cc == GF_PROP_PID_CONTENT_LIGHT_LEVEL) && strchr(value, sep_list) ){
@@ -4003,11 +4122,11 @@
 			}
 			//pix formats and others are parsed as specific prop types
 
-			if (p.type == GF_PROP_FORBIDEN) {
+			if (p.type == GF_PROP_FORBIDDEN) {
 				p = gf_props_parse_value(prop_type, name, value, NULL, sep_list);
 			}
 
-			if (p.type != GF_PROP_FORBIDEN) {
+			if (p.type != GF_PROP_FORBIDDEN) {
 				if (prop_type==GF_PROP_NAME) {
 					p.type = GF_PROP_STRING;
 					gf_filter_pid_set_property(pid, p4cc, &p);
@@ -4040,12 +4159,12 @@
 				p = gf_props_parse_value(GF_PROP_STRING, name, value, NULL, sep_list);
 				p.type = GF_PROP_STRING_NO_COPY;
 			} else {
-				u32 ptype = GF_PROP_FORBIDEN;
+				u32 ptype = GF_PROP_FORBIDDEN;
 				char *type_sep = strchr(value, '@');
 				if (type_sep) {
 					type_sep0 = 0;
 					ptype = gf_props_parse_type(value);
-					if (ptype==GF_PROP_FORBIDEN) {
+					if (ptype==GF_PROP_FORBIDDEN) {
 						GF_LOG(GF_LOG_WARNING, GF_LOG_FILTER, ("Unrecognized property type %s, defaulting to string\n", value));
 					} else {
 						value = type_sep+1;
@@ -4053,7 +4172,7 @@
 					type_sep0 = '@';
 				}
 				memset(&p, 0, sizeof(GF_PropertyValue));
-				if (ptype == GF_PROP_FORBIDEN) {
+				if (ptype == GF_PROP_FORBIDDEN) {
 					p.type = GF_PROP_STRING;
 					p.value.string = value;
 				} else {
@@ -4085,7 +4204,7 @@
 {
 	if (!args) return GF_OK;
 	if (PID_IS_INPUT(pid)) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Attempt to write property on input PID in filter %s - ignoring\n", pid->filter->name));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Attempt to write property on input PID in filter %s - ignoring\n", pid->filter->name ? pid->filter->name : pid->filter->freg->name));
 		return GF_BAD_PARAM;
 	}
 
@@ -4148,15 +4267,15 @@
 
 void gf_filter_pid_retry_caps_negotiate(GF_FilterPid *src_pid, GF_FilterPid *pid, GF_Filter *dst_filter)
 {
-	assert(dst_filter);
-	src_pid->caps_negociate = pid->caps_negociate;
-	pid->caps_negociate = NULL;
+	gf_assert(dst_filter);
+	src_pid->caps_negotiate = pid->caps_negotiate;
+	pid->caps_negotiate = NULL;
 	src_pid->caps_dst_filter = dst_filter;
 	//blacklist filter for adaptation
 	if (!src_pid->adapters_blacklist) src_pid->adapters_blacklist = gf_list_new();
 	gf_list_add(src_pid->adapters_blacklist, (void *) pid->filter->freg);
 	//once != 0 will trigger reconfiguration, so set this once all vars have been set
-	safe_int_inc(& src_pid->filter->nb_caps_renegociate );
+	safe_int_inc(& src_pid->filter->nb_caps_renegotiate );
 
 	//disconnect source pid from filter - this will unload the filter itself
 	gf_fs_post_task(src_pid->filter->session, gf_filter_pid_disconnect_task, pid->filter, src_pid, "pidinst_disconnect", NULL);
@@ -4300,6 +4419,12 @@
 	return GF_FALSE;
 }
 
+enum
+{
+	PID_FORCE_SINGLE = 1,
+	PID_DISABLE_CLONE = 1<<1,
+};
+
 static void gf_filter_pid_init_task(GF_FSTask *task)
 {
 	u32 f_idx, count;
@@ -4323,7 +4448,7 @@
 	const char *filter_id;
 
 	if (pid->destroyed || pid->removed) {
-		assert(pid->init_task_pending);
+		gf_assert(pid->init_task_pending);
 		safe_int_dec(&pid->init_task_pending);
 		return;
 	}
@@ -4335,7 +4460,7 @@
 		task->can_swap = 1;
 		return;
 	}
-	if (filter->caps_negociate) {
+	if (filter->caps_negotiate) {
 		if (! gf_filter_reconf_output(filter, pid))
 			return;
 	}
@@ -4399,7 +4524,7 @@
 		//the third pid init (demux.video) will
 		//- match cdcrypt and link to it, but will not remove vout from demux destinations, resulting in further linking (this pass)
 		//- create a new cdcrypt to solve demux.video -> vout
-		
+
 //		loaded_filters = gf_list_new();
 		loaded_filters = gf_list_clone(linked_dest_filters);
 	}
@@ -4442,6 +4567,11 @@
 		if (!filter_dst->freg->configure_pid) continue;
 		if (filter_dst->finalized || filter_dst->removed || filter_dst->disabled || filter_dst->marked_for_removal || filter_dst->no_inputs) continue;
 		if (filter_dst->target_filter == pid->filter) continue;
+		//PID requires a sourceID on target filter and none is set, ignore
+		if (pid->require_source_id && !filter_dst->source_ids) {
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("PID %s requires source ID, not set for filter %s\n", pid->name, filter_dst->name));
+			continue;
+		}
 
 		//handle re-entrant filter registries (eg filter foo of type A output usually cannot connect to filter bar of type A)
 		if (pid->pid->filter->freg == filter_dst->freg) {
@@ -4524,6 +4654,22 @@
 					ignore_source_ids = GF_TRUE;
 			}
 		}
+		/*	Special case for adaptation filters:
+			if destination is set (first pid init) do not link to any other filter
+			else only link if destination is present in dest lists
+
+		This avoids relinking to other filters having trigger similar adaptaion chains which would then be cloned
+		cf issue 2548:
+			flac @ enc1 @1 enc2 will trigger one resampler R1 for flac->enc1 and one R2 for flac->enc2
+		we don't want R2 to try connecting to enc1
+		*/
+		if (pid->filter->is_pid_adaptation_filter) {
+			if (pid->filter->dst_filter) {
+				if (pid->filter->dst_filter != filter_dst) continue;
+			} else {
+				if (gf_list_find(pid->filter->destination_filters, filter_dst)<0) continue;
+			}
+		}
 
 		if (num_pass && gf_list_count(filter->destination_links)) {
 			s32 ours = gf_list_find(pid->filter->destination_links, filter_dst);
@@ -4578,6 +4724,10 @@
 				continue;
 			}
 
+			//pid does not allow linking to a new clone
+			if (pid->link_flags & PID_DISABLE_CLONE)
+				continue;
+
 			//explicitly clonable but caps don't match, don't connect to it
 			if (!gf_filter_pid_caps_match(pid, filter_dst->freg, filter_dst, NULL, NULL, pid->filter->dst_filter, -1)) {
 				GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("PID %s caps does not match clonable filter %s\n", pid->name, filter_dst->name));
@@ -4683,11 +4833,29 @@
 
 		//if the original filter is in the parent chain of this PID's filter, don't connect (equivalent to re-entrant)
 		if (filter_dst->cloned_from) {
-			if (gf_filter_in_parent_chain(filter, filter_dst->cloned_from) ) {
+			u32 par_type=0;
+			GF_Filter *clone = filter_dst->cloned_from;
+			while (clone) {
+				GF_Filter *f = filter;
+				while (f) {
+					if (gf_filter_in_parent_chain(f, clone) ) {
+						par_type = 1;
+						break;
+					}
+					if (gf_filter_in_parent_chain(clone, f) ) {
+						par_type = 2;
+						break;
+					}
+					f = f->cloned_from;
+				}
+				if (par_type) break;
+				clone = clone->cloned_from;
+			}
+			if (par_type==1) {
 				GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("PID %s has the original of cloned filter %s in its parent chain\n", pid->name, filter_dst->name));
 				continue;
 			}
-			if (gf_filter_in_parent_chain(filter_dst->cloned_from, filter) ) {
+			else if (par_type==2) {
 				GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("PID %s has the original of cloned filter %s in its output filter chain\n", pid->name, filter_dst->name));
 				continue;
 			}
@@ -4695,8 +4863,17 @@
 
 		//if the filter is in the parent chain of this PID's original filter, don't connect (equivalent to re-entrant)
 		if (filter->cloned_from) {
-			if (gf_filter_in_parent_chain(filter->cloned_from, filter_dst) ) {
-				GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("PID %s filter is cloned and has filter %s in its clone parent chain\n", pid->name, filter_dst->name));
+			Bool in_par = GF_FALSE;
+			GF_Filter *clone = filter->cloned_from;
+			while (clone) {
+				if (gf_filter_in_parent_chain(clone, filter_dst) ) {
+					in_par = GF_TRUE;
+					break;
+				}
+				clone = clone->cloned_from;
+			}
+			if (in_par) {
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("PID %s filter %s is cloned and has filter %s in its clone parent chain\n", pid->name, filter->name, filter_dst->name));
 				continue;
 			}
 		}
@@ -4737,11 +4914,14 @@
 					use_explicit_link = GF_TRUE;
 			}
 			//if no source ID on the dst filter, this means the dst filter accepts any possible connections from out filter
+
+#if 0	//this is now checked above regardless of whether a filterID is set
 			//unless prevented for this pid
 			else if (pid->require_source_id) {
 				GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("PID %s requires source ID, not set for filter %s\n", pid->name, filter_dst->name));
 				continue;
 			}
+#endif
 		}
 		//no filterID and dst expects only specific filters, continue
 		else if (filter_dst->source_ids && !ignore_source_ids) {
@@ -4784,6 +4964,45 @@
 		//remember we had a sourceid match
 		found_matching_sourceid = GF_TRUE;
 
+		//per codec-ID filter
+		if (filter_dst->skip_cids.nb_items) {
+			u32 stream_type = 0;
+			const GF_PropertyValue *p = gf_filter_pid_get_property_first(pid, GF_PROP_PID_STREAM_TYPE);
+			if (p) stream_type = p->value.uint;
+
+			p = gf_filter_pid_get_property_first(pid, GF_PROP_PID_CODECID);
+			if (p) {
+				Bool do_skip = GF_FALSE;
+				u32 idx;
+				for (idx=0; idx<filter_dst->skip_cids.nb_items; idx++) {
+					u32 cid;
+					if (!strcmp(filter_dst->skip_cids.valsidx, "AUTO")) {
+						cid = filter_dst->encoder_codec_id;
+					} else {
+						cid = gf_codecid_parse(filter_dst->skip_cids.valsidx);
+					}
+					if (!cid) {
+						GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Invalid codecid %s in ccp, ignoring\n", filter_dst->skip_cids.valsidx));
+						continue;
+					}
+					if (cid!=p->value.uint) continue;
+					if (stream_type != gf_codecid_type(cid)) continue;
+					do_skip=GF_TRUE;
+					break;
+				}
+				if (do_skip) {
+					GF_Err e;
+					GF_Filter *f = gf_fs_load_filter(filter->session, "reframer", &e);
+					gf_filter_set_id(f, filter_dst->id);
+					gf_filter_set_name(f, filter_dst->name);
+					if (filter_dst->source_ids) f->source_ids = gf_strdup(filter_dst->source_ids);
+					f->cloned_from = filter_dst;
+					f->max_extra_pids = 0;
+					filter_dst->filter_skiped = GF_TRUE;
+					filter_dst = f;
+				}
+			}
+		}
 		//we have a match, check if caps are OK
 		cap_matched = gf_filter_pid_caps_match(pid, filter_dst->freg, filter_dst, NULL, NULL, pid->filter->dst_filter, -1);
 
@@ -4794,6 +5013,10 @@
 				pid_is_file = 2;
 			continue;
 		}
+		else if (cap_matched && !pid->filter->dynamic_filter && (filter_dst->force_demux==2) && (pid_is_file!=1)) {
+			pid_is_file = 2;
+			continue;
+		}
 
 		can_try_link_resolution = GF_TRUE;
 
@@ -4825,6 +5048,19 @@
 			cap_matched = gf_filter_pid_caps_match(pid, filter_dst->freg, NULL, NULL, NULL, pid->filter->dst_filter, -1);
 		}
 
+		//implicit mode with a possible link found and this destination is:
+		//- a sink
+		//- or an explicit filter
+		//- or a filter not allowing reuse in linker when dynamically loaded
+		//then do not match caps in first pass
+		//otherwise we could link directly to destination (due to caps mismatch) while a valid path could be found to a previously
+		//specified filter
+		//see testsuite restamp-fps
+		if (!num_pass && possible_link_found_implicit_mode
+			&& (is_sink || !filter_dst->dynamic_filter || !(filter_dst->freg->flags & GF_FS_REG_DYNAMIC_REUSE)) ) {
+			cap_matched = GF_FALSE;
+		}
+
 		if (!cap_matched) {
 			Bool skipped = GF_FALSE;
 			Bool reassigned=GF_FALSE;
@@ -4847,6 +5083,7 @@
 				if (old_dst->dynamic_filter
 					&& !old_dst->has_pending_pids
 					&& !old_dst->num_input_pids
+					&& !old_dst->num_output_pids
 					&& !old_dst->out_pid_connection_pending
 				) {
 					Bool skip = ((old_dst==filter_dst) && (filter_dst->dynamic_filter!=2)) ? GF_TRUE : GF_FALSE;
@@ -4901,7 +5138,7 @@
 				if (pid->filter->session->run_status!=GF_OK) {
 					GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("PID %s:%s init canceled (session abort)\n", pid->filter->name, pid->name));
 					gf_mx_v(filter->session->filters_mx);
-					assert(pid->init_task_pending);
+					gf_assert(pid->init_task_pending);
 					safe_int_dec(&pid->init_task_pending);
 					if (loaded_filters) gf_list_del(loaded_filters);
 					gf_list_del(linked_dest_filters);
@@ -4917,7 +5154,7 @@
 						continue;
 					}
 					gf_mx_v(filter->session->filters_mx);
-					assert(pid->init_task_pending);
+					gf_assert(pid->init_task_pending);
 					safe_int_dec(&pid->init_task_pending);
 					if (loaded_filters) gf_list_del(loaded_filters);
 					gf_list_del(linked_dest_filters);
@@ -4935,13 +5172,13 @@
 							gf_filter_post_remove(f);
 						}
 					}
-					
+
 					pid->filter->dst_filter = NULL;
 					new_f = gf_filter_pid_resolve_link(pid, new_dst, &reassigned);
 					if (!new_f) {
 						if (reassigned) {
 							gf_mx_v(filter->session->filters_mx);
-							assert(pid->init_task_pending);
+							gf_assert(pid->init_task_pending);
 							safe_int_dec(&pid->init_task_pending);
 							if (loaded_filters) gf_list_del(loaded_filters);
 							gf_list_del(linked_dest_filters);
@@ -4982,7 +5219,7 @@
 		}
 
 		if (!(filter_dst->freg->flags & (GF_FS_REG_ALLOW_CYCLIC|GF_FS_REG_SCRIPT|GF_FS_REG_CUSTOM))) {
-			assert(pid->pid->filter->freg != filter_dst->freg);
+			gf_assert(pid->pid->filter->freg != filter_dst->freg);
 		}
 
 		safe_int_inc(&pid->filter->out_pid_connection_pending);
@@ -5022,6 +5259,8 @@
 				implicit_link_found = GF_TRUE;
 			}
 		}
+		if (pid->link_flags & PID_FORCE_SINGLE)
+			break;
     }
 
 	if (!num_pass) {
@@ -5092,7 +5331,7 @@
 
     //connection task posted, nothing left to do
 	if (found_dest) {
-		assert(pid->init_task_pending);
+		gf_assert(pid->init_task_pending);
 		safe_int_dec(&pid->init_task_pending);
 		gf_mx_v(filter->session->filters_mx);
 		pid->filter->disabled = GF_FILTER_ENABLED;
@@ -5102,7 +5341,7 @@
 		gf_fs_check_graph_load(filter->session, GF_FALSE);
 		if (pid->not_connected) {
 			pid->not_connected = 0;
-			assert(pid->filter->num_out_pids_not_connected);
+			gf_assert(pid->filter->num_out_pids_not_connected);
 			pid->filter->num_out_pids_not_connected--;
 		}
 		return;
@@ -5112,7 +5351,7 @@
 	if (dynamic_filter_clone && !num_pass) {
 		GF_Filter *clone = gf_filter_clone(dynamic_filter_clone, NULL);
 		if (clone) {
-			assert(dynamic_filter_clone->dynamic_source_ids);
+			gf_assert(dynamic_filter_clone->dynamic_source_ids);
 			gf_free(clone->source_ids);
 			clone->source_ids = gf_strdup(dynamic_filter_clone->dynamic_source_ids);
 			clone->cloned_from = NULL;
@@ -5166,14 +5405,14 @@
 	gf_mx_v(filter->session->filters_mx);
 
 	if (pid->num_destinations && !pid->not_connected) {
-		assert(pid->init_task_pending);
+		gf_assert(pid->init_task_pending);
 		safe_int_dec(&pid->init_task_pending);
 		return;
 	}
 	filter->num_out_pids_not_connected ++;
 	//remove sparse info
 	if (pid->is_sparse) {
-		assert(filter->nb_sparse_pids);
+		gf_assert(filter->nb_sparse_pids);
 		safe_int_dec(&filter->nb_sparse_pids);
 		pid->is_sparse = 0;
 	}
@@ -5190,7 +5429,7 @@
 			filter->session->last_connect_error = GF_FILTER_NOT_FOUND;
 			filter->session->run_status = GF_FILTER_NOT_FOUND;
 			filter->session->in_final_flush = GF_TRUE;
-			assert(pid->init_task_pending);
+			gf_assert(pid->init_task_pending);
 			safe_int_dec(&pid->init_task_pending);
 			return;
 		}
@@ -5227,19 +5466,19 @@
 		filter->session->last_connect_error = GF_FILTER_NOT_FOUND;
 	}
 
-	assert(pid->init_task_pending);
+	gf_assert(pid->init_task_pending);
 	safe_int_dec(&pid->init_task_pending);
 	return;
 }
 
 void gf_filter_pid_post_connect_task(GF_Filter *filter, GF_FilterPid *pid)
 {
-	assert(pid->pid);
-	assert(pid->filter != filter);
+	gf_assert(pid->pid);
+	gf_assert(pid->filter != filter);
 	if (!(filter->freg->flags & (GF_FS_REG_ALLOW_CYCLIC|GF_FS_REG_SCRIPT|GF_FS_REG_CUSTOM))) {
-		assert(pid->filter->freg != filter->freg);
+		gf_assert(pid->filter->freg != filter->freg);
 	}
-	assert(filter->freg->configure_pid);
+	gf_assert(filter->freg->configure_pid);
 	safe_int_inc(&filter->session->pid_connect_tasks_pending);
 	safe_int_inc(&filter->in_pid_connection_pending);
 	gf_fs_post_task_ex(filter->session, gf_filter_pid_connect_task, filter, pid, "pid_connect", NULL, GF_TRUE, GF_FALSE, GF_FALSE, TASK_TYPE_NONE);
@@ -5304,6 +5543,7 @@
 		GF_FilterPid *pidi = gf_list_get(filter->input_pids, 0);
 		gf_filter_pid_copy_properties(pid, pidi);
 	}
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("Filter %s created new PID - defer link %d\n", filter->name, filter->deferred_link));
 	gf_mx_v(filter->tasks_mx);
 	return pid;
 }
@@ -5318,17 +5558,17 @@
 
 	while (gf_list_count(pid->properties)) {
 		GF_PropertyMap *prop = gf_list_pop_back(pid->properties);
-		assert(prop->reference_count);
+		gf_assert(prop->reference_count);
 		if (safe_int_dec(&prop->reference_count) == 0) {
 			gf_props_del(prop);
 		}
 	}
 	gf_list_del(pid->properties);
 
-	if(pid->caps_negociate) {
-		assert(pid->caps_negociate->reference_count);
-		if (safe_int_dec(&pid->caps_negociate->reference_count) == 0) {
-			gf_props_del(pid->caps_negociate);
+	if(pid->caps_negotiate) {
+		gf_assert(pid->caps_negotiate->reference_count);
+		if (safe_int_dec(&pid->caps_negotiate->reference_count) == 0) {
+			gf_props_del(pid->caps_negotiate);
 		}
 	}
 
@@ -5336,7 +5576,7 @@
 		gf_list_del(pid->adapters_blacklist);
 
 	if (pid->infos) {
-		assert(pid->infos->reference_count);
+		gf_assert(pid->infos->reference_count);
 		if (safe_int_dec(&pid->infos->reference_count) == 0) {
 			gf_props_del(pid->infos);
 		}
@@ -5381,7 +5621,7 @@
 		if (merge_props)
 			gf_props_merge_property(map, old_map, NULL, NULL);
 
-		assert(old_map->reference_count);
+		gf_assert(old_map->reference_count);
 		if (safe_int_dec(&old_map->reference_count) == 0) {
 			//see \ref gf_filter_pid_merge_properties_internal for mutex
 			gf_mx_p(pid->filter->tasks_mx);
@@ -5396,7 +5636,7 @@
 	nb_recf = 0;
 	for (i=0; i<pid->num_destinations; i++) {
 		GF_FilterPidInst *pidi = gf_list_get(pid->destinations, i);
-		if (!pidi->filter->process_task_queued) {
+		if (!pidi->filter || !pidi->filter->process_task_queued) {
 			//remember the pid prop map to use
 			pidi->reconfig_pid_props = map;
 			nb_recf++;
@@ -5412,7 +5652,7 @@
 	GF_PropertyMap *map;
 	const GF_PropertyValue *oldp;
 	if (PID_IS_INPUT(pid)) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Attempt to write property on input PID in filter %s - ignoring\n", pid->filter->name));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Attempt to write property on input PID in filter %s - ignoring\n", pid->filter->name ? pid->filter->name : pid->filter->freg->name));
 		return GF_BAD_PARAM;
 	}
 
@@ -5450,6 +5690,24 @@
 	if (value && (prop_4cc==GF_PROP_PID_TIMESCALE))
 		map->timescale = value->value.uint;
 
+	//if change of codecid or streamtype, remove ISOBMFF templates and subtype for codec
+	if (oldp && value) {
+		u32 reset=0;
+		if (prop_4cc == GF_PROP_PID_CODECID) {
+			reset = 2;
+		} else if (prop_4cc == GF_PROP_PID_STREAM_TYPE) {
+			if ((oldp->value.uint==GF_STREAM_ENCRYPTED) || (value->value.uint==GF_STREAM_ENCRYPTED))
+				reset = 1;
+		}
+		if (reset) {
+			gf_props_set_property(map, GF_PROP_PID_ISOM_STSD_ALL_TEMPLATES, NULL, NULL, NULL);
+			if (reset==2) {
+				gf_props_set_property(map, GF_PROP_PID_ISOM_STSD_TEMPLATE, NULL, NULL, NULL);
+				gf_props_set_property(map, GF_PROP_PID_ISOM_SUBTYPE, NULL, NULL, NULL);
+			}
+		}
+	}
+
 	if (value && (prop_4cc == GF_PROP_PID_ID) && !pid->name) {
 		char szName100;
 		sprintf(szName, "PID%d", value->value.uint);
@@ -5500,71 +5758,81 @@
 	return gf_filter_pid_set_property_full(pid, 0, NULL, name, value, GF_TRUE);
 }
 
-static GF_Err gf_filter_pid_negociate_property_full(GF_FilterPid *pid, u32 prop_4cc, const char *prop_name, char *dyn_name, const GF_PropertyValue *value)
+static GF_Err gf_filter_pid_negotiate_property_full(GF_FilterPid *pid, u32 prop_4cc, const char *prop_name, char *dyn_name, const GF_PropertyValue *value)
 {
 	GF_FilterPidInst *pidi = (GF_FilterPidInst *) pid;
 	if (!prop_4cc) return GF_BAD_PARAM;
 
 	if (PID_IS_OUTPUT(pid)) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Attempt to negociate property on output PID in filter %s - ignoring\n", pid->filter->name));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Attempt to negotiate property on output PID in filter %s - ignoring\n", pid->filter->name));
 		return GF_BAD_PARAM;
 	}
 	pid = pid->pid;
-	if (!pid->caps_negociate) {
-		assert(!pid->caps_negociate_pidi_list);
-		pid->caps_negociate = gf_props_new(pid->filter);
-		pid->caps_negociate_pidi_list = gf_list_new();
-		pid->caps_negociate_direct = GF_TRUE;
-		gf_list_add(pid->caps_negociate_pidi_list, pidi);
+	if (!pid->caps_negotiate) {
+		gf_assert(!pid->caps_negotiate_pidi_list);
+		pid->caps_negotiate = gf_props_new(pid->filter);
+		pid->caps_negotiate_pidi_list = gf_list_new();
+		pid->caps_negotiate_direct = GF_TRUE;
+		gf_list_add(pid->caps_negotiate_pidi_list, pidi);
 		//we start a new caps negotiation step, reset any blacklist on pid
 		if (pid->adapters_blacklist) {
 			gf_list_del(pid->adapters_blacklist);
 			pid->adapters_blacklist = NULL;
 		}
-		safe_int_inc(&pid->filter->nb_caps_renegociate);
+		safe_int_inc(&pid->filter->nb_caps_renegotiate);
 	}
 	else {
 		const GF_PropertyValue *p;
-		//new PID instance asking for cap negociation
-		if (gf_list_find(pid->caps_negociate_pidi_list, pidi)<0) {
-			gf_list_add(pid->caps_negociate_pidi_list, pidi);
+		//new PID instance asking for cap negotiation
+		if (gf_list_find(pid->caps_negotiate_pidi_list, pidi)<0) {
+			gf_list_add(pid->caps_negotiate_pidi_list, pidi);
 		}
 
 		//check if same property to list
-		p = gf_props_get_property(pid->caps_negociate, prop_4cc, prop_name);
+		p = gf_props_get_property(pid->caps_negotiate, prop_4cc, prop_name);
 		if (p) {
 			if (gf_props_equal(p, value))
 				return GF_OK;
-			//not the same value, disable direct caps negociate
-			pid->caps_negociate_direct = GF_FALSE;
+			//not the same value, disable direct caps negotiate
+			pid->caps_negotiate_direct = GF_FALSE;
 		}
 	}
+#ifndef GPAC_DISABLE_LOG
+	if (gf_log_tool_level_on(GF_LOG_FILTER, GF_LOG_INFO)) {
+		char p_dumpGF_PROP_DUMP_ARG_SIZE;
+		GF_LOG(GF_LOG_INFO, GF_LOG_FILTER, ("PID %s negotiate property %s to %s\n",
+			pid->filter->name, 	prop_name ? prop_name : gf_props_4cc_get_name(prop_4cc),
+			gf_props_dump(prop_4cc, value, p_dump, GF_PROP_DUMP_DATA_NONE)
+		));
+	}
+#endif
+
 	//pid is end of stream or pid instance has packet pendings, we will need a new chain to adapt these packets formats
 	if (pid->has_seen_eos || gf_fq_count(pidi->packets)) {
-		gf_fs_post_task(pid->filter->session, gf_filter_renegociate_output_task, pid->filter, NULL, "filter renegociate", NULL);
+		gf_fs_post_task(pid->filter->session, gf_filter_renegotiate_output_task, pid->filter, NULL, "filter renegotiate", NULL);
 	}
-	return gf_props_set_property(pid->caps_negociate, prop_4cc, prop_name, dyn_name, value);
+	return gf_props_set_property(pid->caps_negotiate, prop_4cc, prop_name, dyn_name, value);
 }
 
 GF_EXPORT
-GF_Err gf_filter_pid_negociate_property(GF_FilterPid *pid, u32 prop_4cc, const GF_PropertyValue *value)
+GF_Err gf_filter_pid_negotiate_property(GF_FilterPid *pid, u32 prop_4cc, const GF_PropertyValue *value)
 {
 	if (!prop_4cc) return GF_BAD_PARAM;
-	return gf_filter_pid_negociate_property_full(pid, prop_4cc, NULL, NULL, value);
+	return gf_filter_pid_negotiate_property_full(pid, prop_4cc, NULL, NULL, value);
 }
 
 GF_EXPORT
-GF_Err gf_filter_pid_negociate_property_str(GF_FilterPid *pid, const char *name, const GF_PropertyValue *value)
+GF_Err gf_filter_pid_negotiate_property_str(GF_FilterPid *pid, const char *name, const GF_PropertyValue *value)
 {
 	if (!name) return GF_BAD_PARAM;
-	return gf_filter_pid_negociate_property_full(pid, 0, name, NULL, value);
+	return gf_filter_pid_negotiate_property_full(pid, 0, name, NULL, value);
 }
 
 GF_EXPORT
-GF_Err gf_filter_pid_negociate_property_dyn(GF_FilterPid *pid, char *name, const GF_PropertyValue *value)
+GF_Err gf_filter_pid_negotiate_property_dyn(GF_FilterPid *pid, char *name, const GF_PropertyValue *value)
 {
 	if (!name) return GF_BAD_PARAM;
-	return gf_filter_pid_negociate_property_full(pid, 0, NULL, name, value);
+	return gf_filter_pid_negotiate_property_full(pid, 0, NULL, name, value);
 }
 
 
@@ -5578,7 +5846,7 @@
 			gf_mx_p(pid->filter->tasks_mx);
 			pidi->props = gf_list_get(pid->pid->properties, 0);
 			gf_mx_v(pid->filter->tasks_mx);
-			assert(pidi->props);
+			gf_fatal_assert(pidi->props);
 			safe_int_inc(&pidi->props->reference_count);
 		}
 		return pidi->props;
@@ -5599,13 +5867,49 @@
 	return NULL;
 }
 
+#ifdef GPAC_ENABLE_DEBUG
+static GFINLINE const GF_PropertyValue *pid_check_prop(GF_FilterPid *pid, u32 prop_4cc, const char *prop_name, const GF_PropertyValue *ret)
+{
+	if (!ret && (pid!=pid->pid) &&(pid->filter->prop_dump&1)) {
+		u32 i, count;
+		GF_PropCheck *p;
+		GF_FilterPidInst *pidi = (GF_FilterPidInst *)pid;
+		if (!pidi->prop_dump) pidi->prop_dump = gf_list_new();
+		count = gf_list_count(pidi->prop_dump);
+		for (i=0;i<count; i++) {
+			p = gf_list_get(pidi->prop_dump, i);
+			if (prop_4cc) {
+				if (p->p4cc==prop_4cc) return ret;
+			} else if (p->name && !strcmp(p->name, prop_name)) {
+				return ret;
+			}
+		}
+		const char *pidname = pid->pid->name;
+		if (prop_4cc) {
+			const char *name = gf_props_4cc_get_name(prop_4cc);
+			if (!name) name = "internal";
+			GF_LOG(GF_LOG_WARNING, GF_LOG_FILTER, ("Filter %s input PID %s property %s (%s) not found\n", pid->filter->name, pidname, gf_4cc_to_str(prop_4cc), name));
+		} else if (prop_name) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_FILTER, ("Filter %s input PID %s property %s not found\n", pid->filter->name, pidname, prop_name));
+		}
+		GF_SAFEALLOC(p, GF_PropCheck);
+		p->name = prop_name;
+		p->p4cc = prop_4cc;
+		gf_list_add(pidi->prop_dump, p);
+	}
+	return ret;
+}
+#else
+#define pid_check_prop(_a, _b, _str, c) c
+#endif
+
 GF_EXPORT
 const GF_PropertyValue *gf_filter_pid_get_property(GF_FilterPid *pid, u32 prop_4cc)
 {
 	GF_PropertyMap *map = filter_pid_get_prop_map(pid, GF_FALSE);
 	if (!map)
 		return NULL;
-	return gf_props_get_property(map, prop_4cc, NULL);
+	return pid_check_prop(pid, prop_4cc, NULL, gf_props_get_property(map, prop_4cc, NULL) );
 }
 
 const GF_PropertyValue *gf_filter_pid_get_property_first(GF_FilterPid *pid, u32 prop_4cc)
@@ -5613,7 +5917,7 @@
 	GF_PropertyMap *map = filter_pid_get_prop_map(pid, GF_TRUE);
 	if (!map)
 		return NULL;
-	return gf_props_get_property(map, prop_4cc, NULL);
+	return pid_check_prop(pid, prop_4cc, NULL, gf_props_get_property(map, prop_4cc, NULL) );
 }
 
 GF_EXPORT
@@ -5622,7 +5926,7 @@
 	GF_PropertyMap *map = filter_pid_get_prop_map(pid, GF_FALSE);
 	if (!map)
 		return NULL;
-	return gf_props_get_property(map, 0, prop_name);
+	return pid_check_prop(pid, 0, prop_name, gf_props_get_property(map, 0, prop_name) );
 }
 
 const GF_PropertyValue *gf_filter_pid_get_property_str_first(GF_FilterPid *pid, const char *prop_name)
@@ -5630,7 +5934,7 @@
 	GF_PropertyMap *map = filter_pid_get_prop_map(pid, GF_TRUE);
 	if (!map)
 		return NULL;
-	return gf_props_get_property(map, 0, prop_name);
+	return pid_check_prop(pid, 0, prop_name, gf_props_get_property(map, 0, prop_name) );
 }
 
 const GF_PropertyEntry *gf_filter_pid_get_property_entry(GF_FilterPid *pid, u32 prop_4cc)
@@ -5656,7 +5960,7 @@
 	const GF_PropertyEntry *prop_ent = NULL;
 	GF_PropertyMap *map;
 	*propentry = NULL;
-	
+
 	if (first_call) {
 		gf_mx_p(pid->filter->session->info_mx);
 	}
@@ -5735,8 +6039,7 @@
 	return gf_filter_pid_get_info_internal(pid, 0, prop_name, GF_TRUE, propentry);
 }
 
-GF_EXPORT
-const GF_PropertyValue *gf_filter_pid_enum_info(GF_FilterPid *pid, u32 *idx, u32 *prop_4cc, const char **prop_name)
+static const GF_PropertyValue *gf_filter_pid_enum_info_local(GF_FilterPid *pid, u32 *idx, u32 *prop_4cc, const char **prop_name, GF_List **list)
 {
 	u32 i, cur_idx=0, nb_in_pid=0;
 
@@ -5746,6 +6049,9 @@
 	pid = pid->pid;
 	cur_idx = *idx;
 	if (pid->infos) {
+		//we already checked that pid
+		if (*list && gf_list_find(* list, pid)>=0)
+			return NULL;
 		cur_idx = *idx;
 		const GF_PropertyValue *prop = gf_props_enum_property(pid->infos, &cur_idx, prop_4cc, prop_name);
 		if (prop) {
@@ -5754,14 +6060,26 @@
 		}
 		nb_in_pid = cur_idx;
 		cur_idx = *idx - nb_in_pid;
+		//remember we checked that pid to avoid counting it twice (demuxers...)
+		if (! *list) *list = gf_list_new();
+		gf_list_add(*list, pid);
 	}
 
+	if (!pid->filter->num_input_pids) return NULL;
+
 	gf_mx_p(pid->filter->tasks_mx);
 	for (i=0; i<pid->filter->num_input_pids; i++) {
 		u32 sub_idx = cur_idx;
 		const GF_PropertyValue * prop;
 		GF_FilterPid *pidinst = gf_list_get(pid->filter->input_pids, i);
-		prop = gf_filter_pid_enum_info((GF_FilterPid *)pidinst, &sub_idx, prop_4cc, prop_name);
+
+		if (*list && gf_list_find(* list, pidinst)>=0)
+			continue;
+
+		if (! *list) *list = gf_list_new();
+		gf_list_add(*list, pid);
+
+		prop = gf_filter_pid_enum_info_local((GF_FilterPid *)pidinst, &sub_idx, prop_4cc, prop_name, list);
 		if (prop) {
 			*idx = nb_in_pid + sub_idx;
 			gf_mx_v(pid->filter->tasks_mx);
@@ -5773,7 +6091,14 @@
 	gf_mx_v(pid->filter->tasks_mx);
 	return NULL;
 }
-
+GF_EXPORT
+const GF_PropertyValue *gf_filter_pid_enum_info(GF_FilterPid *pid, u32 *idx, u32 *prop_4cc, const char **prop_name)
+{
+	GF_List *list=NULL;
+	const GF_PropertyValue *p = gf_filter_pid_enum_info_local(pid, idx, prop_4cc, prop_name, &list);
+	if (list) gf_list_del(list);
+	return p;
+}
 
 static const GF_PropertyValue *gf_filter_get_info_internal(GF_Filter *filter, u32 prop_4cc, const char *prop_name, GF_PropertyEntry **propentry)
 {
@@ -5886,7 +6211,7 @@
 			gf_mx_p(src_pid->filter->tasks_mx);
 			pidi->props = gf_list_get(src_pid->pid->properties, 0);
 			gf_mx_v(src_pid->filter->tasks_mx);
-			assert(pidi->props);
+			gf_fatal_assert(pidi->props);
 			safe_int_inc(&pidi->props->reference_count);
 		}
 		src_props = pidi->props;
@@ -5931,6 +6256,7 @@
 	return gf_filter_pid_merge_properties_internal(dst_pid, src_pid, NULL, NULL, GF_FALSE);
 }
 
+
 GF_EXPORT
 u32 gf_filter_pid_get_packet_count(GF_FilterPid *pid)
 {
@@ -5953,7 +6279,7 @@
 	if (ctype == GF_PCK_CMD_PID_EOS ) {
 		pcki->pid->is_end_of_stream = pcki->pid->pid->has_seen_eos ? GF_TRUE : GF_FALSE;
 		GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("Found EOS packet in PID %s in filter %s - eos %d\n", pidi->pid->name, pidi->filter->name, pcki->pid->pid->has_seen_eos));
-		assert(pcki->pid->nb_eos_signaled);
+		gf_assert(pcki->pid->nb_eos_signaled);
 		safe_int_dec(&pcki->pid->nb_eos_signaled);
 		is_internal = GF_TRUE;
 	} else if (ctype == GF_PCK_CMD_PID_REM) {
@@ -5966,10 +6292,10 @@
 	if (ctype) {
 		u32 timescale;
 		if (pcki->pid->handles_clock_references) return GF_FALSE;
-		assert(pcki->pid->nb_clocks_signaled);
+		gf_assert(pcki->pid->nb_clocks_signaled);
 		safe_int_dec(&pcki->pid->nb_clocks_signaled);
 		//signal destination
-		assert(!pcki->pid->filter->next_clock_dispatch_type || !pcki->pid->filter->num_output_pids);
+		gf_assert(!pcki->pid->filter->next_clock_dispatch_type || !pcki->pid->filter->num_output_pids);
 
 		timescale = pcki->pck->pid_props ? pcki->pck->pid_props->timescale : 0;
 		pcki->pid->filter->next_clock_dispatch = pcki->pck->info.cts;
@@ -5983,7 +6309,7 @@
 			pcki->pid->last_clock_type = ctype;
 
 		if (ctype == GF_FILTER_CLOCK_PCR_DISC) {
-			assert(pcki->pid->last_clock_type == GF_FILTER_CLOCK_PCR_DISC);
+			gf_assert(pcki->pid->last_clock_type == GF_FILTER_CLOCK_PCR_DISC);
 		}
 		GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("Internal clock reference packet filtered - PID %s clock ref "LLU"/%d - type %d\n", pcki->pid->pid->name, pcki->pid->last_clock_value, pcki->pid->last_clock_timescale, pcki->pid->last_clock_type));
 		//the following call to drop_packet will trigger clock forwarding to all output pids
@@ -6009,7 +6335,7 @@
 			if (pidinst->force_reconfig || (pidinst->props != pcki->pck->pid_props)) {
 				//destroy if last occurence, removing it from pid as well
 				//only remove if last about to be destroyed, since we may have several pid instances consuming from this pid
-				assert(pidinst->props->reference_count);
+				gf_assert(pidinst->props->reference_count);
 				if (safe_int_dec(& pidinst->props->reference_count) == 0) {
 					//see \ref gf_filter_pid_merge_properties_internal for mutex
 					gf_mx_p(pidinst->pid->filter->tasks_mx);
@@ -6034,7 +6360,7 @@
 			if (do_notif) {
 				GF_LOG(GF_LOG_INFO, GF_LOG_FILTER, ("Filter %s PID %s property changed at this packet, triggering reconfigure\n", pidinst->pid->filter->name, pidinst->pid->name));
 
-				assert(pidinst->filter->freg->configure_pid);
+				gf_assert(pidinst->filter->freg->configure_pid);
 			}
 
 			//reset the blacklist whenever reconfiguring, since we may need to reload a new filter chain
@@ -6045,7 +6371,7 @@
 			if (do_notif) {
 				e = gf_filter_pid_configure(pidinst->filter, pidinst->pid, GF_PID_CONF_RECONFIG);
 				if (e != GF_OK) return GF_TRUE;
-				if (pidinst->pid->caps_negociate)
+				if (pidinst->pid->caps_negotiate)
 					return GF_TRUE;
 			}
 		}
@@ -6058,12 +6384,15 @@
 {
 	GF_FilterPacketInstance *pcki;
 	GF_FilterPidInst *pidinst = (GF_FilterPidInst *)pid;
-
+	if (!pid) {
+		GF_LOG(GF_LOG_WARNING, GF_LOG_FILTER, ("Attempt to fetch a packet on a NULL pid, please report to GPAC devs!\n"));
+		return NULL;
+	}
 	if (PID_IS_OUTPUT(pid)) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Attempt to fetch a packet on an output PID in filter %s\n", pid->filter->name));
 		return NULL;
 	}
-	if (pidinst->discard_packets || pidinst->detach_pending) {
+	if (pidinst->discard_packets || (!pidinst->force_flush && pidinst->detach_pending)) {
 		pidinst->filter->nb_pck_io++;
 		return NULL;
 	}
@@ -6081,13 +6410,20 @@
 		pidinst->filter->nb_pck_io++;
 		return NULL;
 	}
-	assert(pcki->pck);
+	gf_assert(pcki->pck);
 
 	if (gf_filter_pid_filter_internal_packet(pidinst, pcki)) {
+		//first time we get here in keepalive, return NULL even if we have a packet to force flush
+		if (pid->pid->eos_keepalive && !pidinst->keepalive_signaled) {
+			pidinst->keepalive_signaled=GF_TRUE;
+			pid->filter->nb_pck_io++;
+			return NULL;
+		}
 		//avoid recursion
 		goto restart;
 	}
 	pcki->pid->is_end_of_stream = GF_FALSE;
+	pidinst->keepalive_signaled = GF_FALSE;
 
 	if (filter_pck_check_prop_change(pidinst, pcki, GF_TRUE))
 		return NULL;
@@ -6110,7 +6446,7 @@
 			//FSESS_CHECK_THREAD(pidinst->filter)
 			res = pidinst->filter->freg->process_event(pidinst->filter, &evt);
 		}
-		
+
 		if (!res) {
 			pidinst->filter->pid_info_changed = GF_TRUE;
 		}
@@ -6165,7 +6501,7 @@
 	if (!pcki) {
 		return GF_FALSE;
 	}
-	assert(pcki->pck);
+	gf_assert(pcki->pck);
 	if (pidinst->requires_full_data_block && !(pcki->pck->info.flags & GF_PCKF_BLOCK_END))
 		return GF_FALSE;
 
@@ -6193,7 +6529,7 @@
 	if (!pcki) {
 		return GF_TRUE;
 	}
-	assert(pcki->pck);
+	gf_assert(pcki->pck);
 
 	if (pidinst->requires_full_data_block && !(pcki->pck->info.flags & GF_PCKF_BLOCK_END))
 		return GF_TRUE;
@@ -6216,7 +6552,7 @@
 	if (!pcki) {
 		return GF_FALSE;
 	}
-	assert(pcki->pck);
+	gf_assert(pcki->pck);
 	return gf_filter_pck_is_blocking_ref(pcki->pck);
 }
 
@@ -6253,7 +6589,7 @@
 		} else {
 			has_ts = GF_FALSE;
 		}
-		
+
 		if (!pidi->cur_bit_size) {
 			pidi->stats_start_ts = ts;
 			pidi->stats_start_us = now;
@@ -6354,7 +6690,7 @@
 
 	//if not detached, undo main_thread flag - cf gf_filter_instance_detach_pid
 	if (pidinst->filter && (pck->info.flags & GF_PCKF_FORCE_MAIN)) {
-		assert(pidinst->filter->nb_main_thread_forced);
+		gf_assert(pidinst->filter->nb_main_thread_forced);
 		safe_int_dec(&pidinst->filter->nb_main_thread_forced);
 	}
 
@@ -6378,7 +6714,7 @@
 			GF_LOG(GF_LOG_WARNING, GF_LOG_FILTER, ("Corrupted buffer level in PID instance %s (%s -> %s), dropping packet duration "LLD" us greater than buffer duration "LLU" us\n", pid->name, pid->filter->name, pidinst->filter ? pidinst->filter->name : "disconnected", d, pidinst->buffer_duration));
 			d = pidinst->buffer_duration;
 		}
-		assert(d <= pidinst->buffer_duration);
+		gf_assert(d <= pidinst->buffer_duration);
 		safe_int64_sub(&pidinst->buffer_duration, (s32) d);
 	}
 
@@ -6439,13 +6775,11 @@
 	}
 #endif
 
-	if (pid->filter->pcks_inst_reservoir) {
-		gf_fq_add(pid->filter->pcks_inst_reservoir, pcki);
-	} else {
+	if (gf_fq_res_add(pid->filter->pcks_inst_reservoir, pcki)) {
 		gf_free(pcki);
 	}
 	//unref pck
-	assert(pck->reference_count);
+	gf_assert(pck->reference_count);
 	if (safe_int_dec(&pck->reference_count) == 0) {
 		gf_filter_packet_destroy(pck);
 	}
@@ -6461,7 +6795,7 @@
 
 	//decrement number of pending packet on target filter if this is not a destroy
 	if (pidinst->filter) {
-		assert(pidinst->filter->pending_packets);
+		gf_assert(pidinst->filter->pending_packets);
 		safe_int_dec(&pidinst->filter->pending_packets);
 
 		gf_filter_forward_clock(pidinst->filter);
@@ -6476,16 +6810,17 @@
 	GF_FilterPacketInstance *pcki;
 	GF_FilterPidInst *pidi = (GF_FilterPidInst *)pid;
 
-	if (pidi->detach_pending)
-		return GF_FALSE;
-		
 	if (PID_IS_OUTPUT(pid)) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Attempt to query EOS on output PID %s in filter %s\n", pid->pid->name, pid->filter->name));
 		return GF_FALSE;
 	}
+	if (pidi->detach_pending)
+		return GF_FALSE;
+
 	if (!pid->pid) return GF_TRUE;
 	if (!pid->pid->has_seen_eos && !pidi->discard_inputs && !pidi->discard_packets) {
 		pidi->is_end_of_stream = GF_FALSE;
+		pidi->keepalive_signaled = GF_FALSE;
 		return GF_FALSE;
 	}
 	//peek next for eos
@@ -6501,6 +6836,22 @@
 }
 
 GF_EXPORT
+Bool gf_filter_pid_is_flush_eos(GF_FilterPid *pid)
+{
+	GF_FilterPidInst *pidi = (GF_FilterPidInst *)pid;
+	if (PID_IS_OUTPUT(pid)) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Attempt to query EOS on output PID %s in filter %s\n", pid->pid->name, pid->filter->name));
+		return GF_FALSE;
+	}
+	if (pidi->detach_pending)
+		return GF_FALSE;
+
+	if (!pid->pid) return GF_FALSE;
+	return pid->pid->eos_keepalive&&pidi->keepalive_signaled;
+}
+
+
+GF_EXPORT
 void gf_filter_pid_set_eos(GF_FilterPid *pid)
 {
 	GF_FilterPacket *pck;
@@ -6511,18 +6862,35 @@
 		GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Attempt to signal EOS on input PID %s in filter %s\n", pid->pid->name, pid->filter->name));
 		return;
 	}
-	if (pid->has_seen_eos) return;
-
-	GF_LOG(GF_LOG_INFO, GF_LOG_FILTER, ("EOS signaled on PID %s in filter %s\n", pid->name, pid->filter->name));
-	//we create a fake packet for eos signaling
-	pck = gf_filter_pck_new_shared_internal(pid, NULL, 0, NULL, GF_TRUE);
-	if (!pck) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Failed to allocate new packet for EOS on PID %s in filter %s\n", pid->name, pid->filter->name));
+	//don't resend EOS if not keepalive - in keepalive we need to reevaluate and potentially trigger eos from filters
+	if (pid->has_seen_eos && !pid->eos_keepalive) {
 		return;
 	}
-	gf_filter_pck_set_framing(pck, GF_TRUE, GF_TRUE);
-	pck->pck->info.flags |= GF_PCK_CMD_PID_EOS;
-	gf_filter_pck_send(pck);
+	//reset eos keepalive at each first eos signal. If a source pid is in keepalive, we propagate below
+	pid->eos_keepalive = GF_FALSE;
+	if (!pid->has_seen_eos) {
+		GF_LOG(GF_LOG_INFO, GF_LOG_FILTER, ("EOS signaled on PID %s in filter %s\n", pid->name, pid->filter->name));
+		//we create a fake packet for eos signaling
+		pck = gf_filter_pck_new_shared_internal(pid, NULL, 0, NULL, GF_TRUE);
+		if (!pck) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Failed to allocate new packet for EOS on PID %s in filter %s\n", pid->name, pid->filter->name));
+			return;
+		}
+		gf_filter_pck_set_framing(pck, GF_TRUE, GF_TRUE);
+		pck->pck->info.flags |= GF_PCK_CMD_PID_EOS;
+		gf_filter_pck_send(pck);
+	}
+
+	gf_mx_p(pid->filter->tasks_mx);
+	u32 i;
+	for (i=0; i<pid->filter->num_input_pids; i++) {
+		GF_FilterPidInst *apidi = gf_list_get(pid->filter->input_pids, i);
+		if (apidi->pid && apidi->pid->eos_keepalive) {
+			pid->eos_keepalive = GF_TRUE;
+			break;
+		}
+	}
+	gf_mx_v(pid->filter->tasks_mx);
 }
 
 GF_EXPORT
@@ -6531,12 +6899,11 @@
 	GF_PropertyMap *props;
 
 	if (PID_IS_INPUT(pid)) {
+		GF_FilterPidInst *pidi = (GF_FilterPidInst *)pid;
 		gf_mx_p(pid->filter->tasks_mx);
-		props = gf_list_last(pid->pid->properties);
+		props = pidi->props;
 		gf_mx_v(pid->filter->tasks_mx);
 	} else {
-		//props = check_new_pid_props(pid, GF_FALSE);
-
 		gf_mx_p(pid->filter->tasks_mx);
 		props = gf_list_last(pid->properties);
 		gf_mx_v(pid->filter->tasks_mx);
@@ -6558,11 +6925,16 @@
 	Bool blockmode_broken=GF_FALSE;
 #endif
 	if (PID_IS_INPUT(pid)) {
+		pid = pid->pid;
+		if (pid->would_block) return GF_TRUE;
 		return GF_FALSE;
 	}
 
 	if (pid->filter->session->blocking_mode==GF_FS_NOBLOCK)
 		return GF_FALSE;
+	//input pid(s) are being flushed, prevent blocking
+	if (pid->filter->in_force_flush)
+		return GF_FALSE;
 
 	gf_mx_p(pid->filter->tasks_mx);
 	//either block according to the number of dispatched units (decoder output) or to the requested buffer duration
@@ -6610,7 +6982,7 @@
 	if (would_block && !pid->would_block) {
 		safe_int_inc(&pid->would_block);
 		safe_int_inc(&pid->filter->would_block);
-		assert(pid->filter->would_block + pid->filter->num_out_pids_not_connected <= pid->filter->num_output_pids);
+		gf_assert(pid->filter->would_block + pid->filter->num_out_pids_not_connected <= pid->filter->num_output_pids);
 
 #ifndef GPAC_DISABLE_LOG
 		if (gf_log_tool_level_on(GF_LOG_FILTER, GF_LOG_DEBUG)) {
@@ -6622,7 +6994,7 @@
 		}
 #endif
 	}
-	assert(pid->filter->would_block <= pid->filter->num_output_pids);
+	gf_assert(pid->filter->would_block <= pid->filter->num_output_pids);
 	gf_mx_v(pid->filter->tasks_mx);
 	return result;
 }
@@ -6818,18 +7190,19 @@
 
 	gf_filter_pidinst_reset_stats(pidi);
 
-	assert(pidi->discard_packets);
+	gf_assert(pidi->discard_packets);
 	safe_int_dec(&pidi->discard_packets);
 
 	pidi->last_block_ended = GF_TRUE;
 	pidi->first_block_started = GF_FALSE;
 	pidi->is_end_of_stream = GF_FALSE;
+	pidi->keepalive_signaled = GF_FALSE;
 	pidi->buffer_duration = 0;
 	pidi->nb_eos_signaled = 0;
 	pidi->pid->has_seen_eos = GF_FALSE;
 	pidi->last_clock_type = 0;
 
-	assert(pidi->pid->filter->stream_reset_pending);
+	gf_assert(pidi->pid->filter->stream_reset_pending);
 	safe_int_dec(& pidi->pid->filter->stream_reset_pending );
 
 	pidi->pid->nb_buffer_unit = 0;
@@ -6888,7 +7261,7 @@
 {
 	GF_RefString *rstr = evt_get_refstr(evt);
 	if (rstr) {
-		assert(rstr->ref_count);
+		gf_assert(rstr->ref_count);
 		if (safe_int_dec(&rstr->ref_count) == 0) {
 			gf_free(rstr);
 		}
@@ -6982,7 +7355,7 @@
 	}
 
 	if (evt->base.on_pid) {
-		assert(evt->base.on_pid->filter->num_events_queued);
+		gf_assert(evt->base.on_pid->filter->num_events_queued);
 		safe_int_dec(&evt->base.on_pid->filter->num_events_queued);
 	}
 	if (f->finalized) {
@@ -7210,7 +7583,7 @@
 		pid->nb_reaggregation_pending = 0;
 		gf_mx_v(pid->filter->tasks_mx);
 	}
-	
+
 	gf_mx_p(f->tasks_mx);
 
 	//after  play or seek, request a process task for source filters or filters having pending packets
@@ -7299,7 +7672,7 @@
 		an_evt->base.on_pid = task->pid ? pid : NULL;
 
 		safe_int_inc(&pid->filter->num_events_queued);
-		
+
 		gf_fs_post_task_class(pid->filter->session, gf_filter_pid_send_event_downstream, pid->filter, task->pid ? (GF_FilterPid *) pid_inst : NULL, "downstream_event", an_evt, TASK_TYPE_EVENT);
 	}
 	gf_mx_v(f->tasks_mx);
@@ -7346,6 +7719,12 @@
 		pid = evt->base.on_pid;
 		if (!pid) return;
 	}
+	if ((pid->filter->session->flags & GF_FS_FLAG_PREVENT_PLAY) && (evt->base.type==GF_FEVT_PLAY)) {
+		//only for sinks
+		if (!pid->filter->has_out_caps)
+			return;
+	}
+
 	//filter is being shut down, prevent any event posting
 	if (pid->filter->finalized) return;
 
@@ -7440,6 +7819,9 @@
 
 		gf_mx_v(pid->pid->filter->tasks_mx);
 	}
+	else if (pid->filter->no_segsize_evts && (evt->base.type==GF_FEVT_SEGMENT_SIZE) ) {
+		return;
+	}
 
 	an_evt = init_evt(evt);
 	if (evt->base.on_pid) {
@@ -7489,18 +7871,39 @@
 		}
 	}
 
-	an_evt = init_evt(evt);
-
-	if (evt->base.on_pid) {
-		safe_int_inc(&evt->base.on_pid->filter->num_events_queued);
+	//check if we need to force the event on each input pid or just use a global filter event
+	u32 i, nb_pids = 1;
+	Bool all_pids=GF_FALSE;
+	if (!evt->base.on_pid && !upstream) {
+		switch (evt->base.type) {
+		case GF_FEVT_FILE_DELETE:
+		case GF_FEVT_SOURCE_SWITCH:
+		case GF_FEVT_QUALITY_SWITCH:
+		case GF_FEVT_USER:
+			break;
+		default:
+			if (filter->num_input_pids) {
+				nb_pids = filter->num_input_pids;
+				all_pids = GF_TRUE;
+			}
+			break;
+		}
+	}
+	for (i=0;i<nb_pids; i++) {
+		an_evt = init_evt(evt);
+		if (all_pids) {
+			an_evt->base.on_pid = gf_list_get(upstream ? filter->output_pids : filter->input_pids, i);
+		}
+		if (an_evt->base.on_pid) {
+			safe_int_inc(&an_evt->base.on_pid->filter->num_events_queued);
+		}
+		if (upstream)
+			gf_fs_post_task_class(filter->session, gf_filter_pid_send_event_upstream, filter, an_evt->base.on_pid, "upstream_event", an_evt, TASK_TYPE_EVENT);
+		else
+			gf_fs_post_task_class(filter->session, gf_filter_pid_send_event_downstream, filter, an_evt->base.on_pid, "downstream_event", an_evt, TASK_TYPE_EVENT);
 	}
-	if (upstream)
-		gf_fs_post_task_class(filter->session, gf_filter_pid_send_event_upstream, filter, evt->base.on_pid, "upstream_event", an_evt, TASK_TYPE_EVENT);
-	else
-		gf_fs_post_task_class(filter->session, gf_filter_pid_send_event_downstream, filter, evt->base.on_pid, "downstream_event", an_evt, TASK_TYPE_EVENT);
 }
 
-
 GF_EXPORT
 void gf_filter_pid_exec_event(GF_FilterPid *pid, GF_FilterEvent *evt)
 {
@@ -7580,6 +7983,17 @@
 	if (stats->buffer_time < pidi->pid->buffer_duration)
 		stats->buffer_time = pidi->pid->buffer_duration;
 
+	if (!stats->last_ts_drop.den
+		|| gf_timestamp_less(stats->last_ts_drop.num, stats->last_ts_drop.den, pidi->last_ts_drop.num, pidi->last_ts_drop.den)
+	) {
+		stats->last_ts_drop = pidi->last_ts_drop;
+	}
+	if (!stats->last_ts_sent.den
+		|| gf_timestamp_less(stats->last_ts_sent.num, stats->last_ts_sent.den, pidi->pid->last_ts_sent.num, pidi->pid->last_ts_sent.den)
+	) {
+		stats->last_ts_sent = pidi->pid->last_ts_sent;
+	}
+
 	if (pidi->last_rt_report) {
 		stats->last_rt_report = pidi->last_rt_report;
 		stats->rtt = pidi->rtt;
@@ -7757,11 +8171,13 @@
 		return;
 	}
 	pid = pid->pid;
+#ifndef GPAC_DISABLE_THREADS
 	if (pid->filter->session->threads) {
 		GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("Filter pull in multithread mode not yet implementing - defaulting to 1 ms sleep\n", pid->pid->name, pid->filter->name));
 		gf_sleep(1);
 		return;
 	}
+#endif
 
 	gf_filter_process_inline(pid->filter);
 }
@@ -7817,6 +8233,7 @@
 
 			if (apidi->is_end_of_stream) {
 				apidi->is_end_of_stream = GF_FALSE;
+				apidi->keepalive_signaled = GF_FALSE;
 			}
 			if (apid->has_seen_eos) {
 				apid->has_seen_eos = GF_FALSE;
@@ -7904,7 +8321,7 @@
 const GF_PropertyValue *gf_filter_pid_caps_query(GF_FilterPid *pid, u32 prop_4cc)
 {
 	u32 i;
-	GF_PropertyMap *map = pid->pid->caps_negociate;
+	GF_PropertyMap *map = pid->pid->caps_negotiate;
 	if (PID_IS_INPUT(pid)) {
 		u32 k;
 		GF_Filter *dst = pid->filter->cap_dst_filter;
@@ -7991,24 +8408,24 @@
 		GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Reconfig caps query on input PID %s in filter %s not allowed\n", pid->pid->name, pid->filter->name));
 		return NULL;
 	}
-	map = pid->caps_negociate;
+	map = pid->caps_negotiate;
 	return map ? gf_props_get_property(map, 0, prop_name) : NULL;
 }
 
 
 GF_EXPORT
-GF_Err gf_filter_pid_resolve_file_template_ex(GF_FilterPid *pid, char szTemplateGF_MAX_PATH, char szFinalNameGF_MAX_PATH, u32 file_idx, const char *file_suffix, const char *filename)
+GF_Err gf_filter_pid_resolve_file_template_ex(GF_FilterPid *pid, const char szTemplateGF_MAX_PATH, char szFinalNameGF_MAX_PATH, u32 file_idx, const char *file_suffix, const char *filename)
 {
 	u32 k;
 	GF_FilterPacket *pck;
 	char szFormat30, szTemplateValGF_MAX_PATH, szPropValGF_PROP_DUMP_ARG_SIZE;
-	char *name = szTemplate;
+	const char *name = szTemplate;
 	if (!strchr(szTemplate, '$')) {
 		strcpy(szFinalName, szTemplate);
 		return GF_OK;
 	}
 	pck = gf_filter_pid_get_packet(pid);
-	
+
 	k = 0;
 	while (name0) {
 		char *sep=NULL;
@@ -8076,6 +8493,10 @@
 				if (!prop_val)
 					prop_val = gf_filter_pid_get_property_first(pid, GF_PROP_PID_URL);
 
+				//if file/url contains URL scheme, do not use it
+				if (prop_val && prop_val->value.string && strstr(prop_val->value.string, "://"))
+					prop_val = NULL;
+
 				if (!prop_val && pid->pid->name) {
 					prop_val_patched.type = GF_PROP_STRING;
 					prop_val_patched.value.string = pid->pid->name;
@@ -8088,8 +8509,12 @@
 		} else if (!strcmp(name, "FS")) {
 			str_val = file_suffix ? file_suffix : "";
 			is_ok = GF_TRUE;
-		} else if (!strcmp(name, "Type")) {
+		} else if (!strcmp(name, "Type") || !strcmp(name, "OType")) {
 			prop_val = gf_filter_pid_get_property_first(pid, GF_PROP_PID_STREAM_TYPE);
+			//for OType resolve to original type if encrypted
+			if (!strcmp(name, "OType") && prop_val && (prop_val->value.uint==GF_STREAM_ENCRYPTED)) {
+				prop_val = gf_filter_pid_get_property_first(pid, GF_PROP_PID_ORIG_STREAM_TYPE);
+			}
 			if (prop_val) {
 				str_val = gf_stream_type_short_name(prop_val->value.uint);
 				is_ok = GF_TRUE;
@@ -8135,6 +8560,10 @@
 			do_skip = GF_TRUE;
 		} else if (!strncmp(name, "XInit", 5) && (name5=='=')) {
 			do_skip = GF_TRUE;
+		} else if (!strncmp(name, "InitExt", 7) && (name7=='=')) {
+			do_skip = GF_TRUE;
+		} else if (!strncmp(name, "SegExt", 6) && (name6=='=')) {
+			do_skip = GF_TRUE;
 		} else if (!strncmp(name, "Path", 4) && (name4=='=')) {
 			do_skip = GF_TRUE;
 		} else {
@@ -8306,7 +8735,7 @@
 }
 
 GF_EXPORT
-GF_Err gf_filter_pid_resolve_file_template(GF_FilterPid *pid, char szTemplateGF_MAX_PATH, char szFinalNameGF_MAX_PATH, u32 file_idx, const char *file_suffix)
+GF_Err gf_filter_pid_resolve_file_template(GF_FilterPid *pid, const char szTemplateGF_MAX_PATH, char szFinalNameGF_MAX_PATH, u32 file_idx, const char *file_suffix)
 {
 	return gf_filter_pid_resolve_file_template_ex(pid, szTemplate, szFinalName, file_idx, file_suffix, NULL);
 }
@@ -8371,7 +8800,7 @@
 
 
 GF_EXPORT
-char *gf_filter_pid_get_destination(GF_FilterPid *pid)
+char *gf_filter_pid_get_destination_ex(GF_FilterPid *pid, u32 dst_idx)
 {
 	const char *dst_args;
 	char *res;
@@ -8389,6 +8818,7 @@
 	//if not set this means we have explicitly loaded the filter
 	for (i=0; i<pid->num_destinations; i++) {
 		GF_FilterPidInst *pidi = gf_list_get(pid->destinations, i);
+		if (dst_idx && (i + 1 != dst_idx)) continue;
 
 		dst_args = pidi->filter->dst_args;
 		if (!dst_args) dst_args = pidi->filter->src_args;
@@ -8403,6 +8833,11 @@
 	}
 	return NULL;
 }
+GF_EXPORT
+char *gf_filter_pid_get_destination(GF_FilterPid *pid)
+{
+	return gf_filter_pid_get_destination_ex(pid, 0);
+}
 
 GF_EXPORT
 char *gf_filter_pid_get_source(GF_FilterPid *pid)
@@ -8473,7 +8908,7 @@
 	gf_mx_p(pid->filter->tasks_mx);
 	if (pid->would_block) {
 		safe_int_dec(&pid->would_block);
-		assert(pid->filter->would_block);
+		gf_assert(pid->filter->would_block);
 		safe_int_dec(&pid->filter->would_block);
 	}
 	gf_mx_v(pid->filter->tasks_mx);
@@ -8525,8 +8960,10 @@
 		GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Attempt to set direct dispatch mode on input pid %s in filter %s not allowed\n", pid->pid->name, pid->filter->name));
 		return GF_BAD_PARAM;
 	}
+#ifndef GPAC_DISABLE_THREADS
 	if (pid->filter->session->threads)
 		return GF_OK;
+#endif
 	pid->direct_dispatch = GF_TRUE;
 	return GF_OK;
 }
@@ -8653,3 +9090,352 @@
 	return GF_OK;
 }
 
+
+#include <gpac/internal/media_dev.h>
+GF_Err rfc_6381_get_codec_aac(char *szCodec, u32 codec_id,  u8 *dsi, u32 dsi_size, Bool force_sbr);
+GF_Err rfc_6381_get_codec_m4v(char *szCodec, u32 codec_id, u8 *dsi, u32 dsi_size);
+GF_Err rfc_6381_get_codec_avc(char *szCodec, u32 subtype, GF_AVCConfig *avcc);
+GF_Err rfc_6381_get_codec_hevc(char *szCodec, u32 subtype, GF_HEVCConfig *hvcc);
+GF_Err rfc_6381_get_codec_av1(char *szCodec, u32 subtype, GF_AV1Config *av1c, COLR colr);
+GF_Err rfc_6381_get_codec_vpx(char *szCodec, u32 subtype, GF_VPConfig *vpcc, COLR colr);
+GF_Err rfc_6381_get_codec_dolby_vision(char *szCodec, u32 subtype, GF_DOVIDecoderConfigurationRecord *dovi);
+GF_Err rfc_6381_get_codec_vvc(char *szCodec, u32 subtype, GF_VVCConfig *vvcc);
+GF_Err rfc_6381_get_codec_mpegha(char *szCodec, u32 subtype, u8 *dsi, u32 dsi_size, s32 pl);
+GF_Err rfc_6381_get_codec_uncv(char *szCodec, u32 subtype, u8 *dsi, u32 dsi_size);
+GF_Err rfc6381_codec_name_default(char *szCodec, u32 subtype, u32 codec_id);
+
+
+GF_EXPORT
+GF_Err gf_filter_pid_get_rfc_6381_codec_string(GF_FilterPid *pid, char *szCodec, Bool force_inband, Bool force_sbr, const GF_PropertyValue *tile_base_dcd, u32 *out_inband_forced)
+{
+	u32 subtype=0, subtype_src=0, codec_id, stream_type;
+	s32 mha_pl=-1;
+	Bool is_tile_base = GF_FALSE;
+	const GF_PropertyValue *p, *dcd, *dcd_enh, *dovi, *codec;
+	COLR colr;
+
+	memset(&colr, 0, sizeof(colr));
+	szCodec0 = 0;
+	if (!pid) return GF_BAD_PARAM;
+
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_CODECID);
+	if (!p) return GF_BAD_PARAM;
+	codec_id = p->value.uint;
+
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_STREAM_TYPE);
+	if (!p) return GF_BAD_PARAM;
+	stream_type = p->value.uint;
+
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_ISOM_SUBTYPE);
+	if (p) subtype_src = p->value.uint;
+
+	dcd = gf_filter_pid_get_property(pid, GF_PROP_PID_DECODER_CONFIG);
+	dcd_enh = gf_filter_pid_get_property(pid, GF_PROP_PID_DECODER_CONFIG_ENHANCEMENT);
+
+	// If colour information is supplied in the colr box, and also in the video bitstream, the box takes precedence
+	{
+		const GF_PropertyValue *p1 = gf_filter_pid_get_property(pid, GF_PROP_PID_COLR_PRIMARIES),
+		                       *p2 = gf_filter_pid_get_property(pid, GF_PROP_PID_COLR_TRANSFER),
+		                       *p3 = gf_filter_pid_get_property(pid, GF_PROP_PID_COLR_MX),
+		                       *p4 = gf_filter_pid_get_property(pid, GF_PROP_PID_COLR_RANGE);
+		if (p1 && p2 && p3 && p4) {
+			colr.override = GF_TRUE;
+			colr.colour_primaries = p1->value.uint;
+			colr.transfer_characteristics = p2->value.uint;
+			colr.matrix_coefficients = p3->value.uint;
+			colr.full_range = p4->value.boolean;
+		} else if (!p1 && !p2 && !p3 && !p4) {
+		} else {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("RFC6381 Incomplete upstream-filter 'colr' information. Ignoring.\n"));
+		}
+	}
+
+	if (!force_inband) {
+		const GF_PropertyValue *p = gf_filter_pid_get_property(pid, GF_PROP_PID_ISOM_SUBTYPE);
+		if (p) {
+			//input uses inband parameters, force it on output regardless of bitstream switching mode
+			switch (p->value.uint) {
+			case GF_ISOM_SUBTYPE_AVC3_H264:
+			case GF_ISOM_SUBTYPE_AVC4_H264:
+			case GF_ISOM_SUBTYPE_LHE1:
+			case GF_ISOM_SUBTYPE_HEV1:
+			case GF_ISOM_SUBTYPE_VVI1:
+			case GF_ISOM_SUBTYPE_DVAV:
+			case GF_ISOM_SUBTYPE_DVHE:
+				force_inband = GF_TRUE;
+				if (out_inband_forced) *out_inband_forced = 1;
+				break;
+			}
+		}
+	}
+
+	codec = gf_filter_pid_get_property(pid, GF_PROP_PID_CODEC);
+	if (codec && (codec->type==GF_PROP_STRING) && codec->value.string) {
+		const char *codec_str = codec->value.string;
+		if (codec_str0 != '.') {
+			snprintf(szCodec, RFC6381_CODEC_NAME_SIZE_MAX, "%s", codec_str);
+			return GF_OK;
+		}
+		if (!subtype_src)
+			subtype_src = gf_codecid_4cc_type(codec_id);
+		snprintf(szCodec, RFC6381_CODEC_NAME_SIZE_MAX, "%s%s", gf_4cc_to_str(subtype_src), codec_str);
+		return GF_OK;
+	}
+
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_TILE_BASE);
+	if (p && p->value.boolean) is_tile_base = GF_TRUE;
+
+
+	dovi = gf_filter_pid_get_property(pid, GF_PROP_PID_DOLBY_VISION);
+	if (dovi) {
+		GF_Err e;
+		GF_BitStream *bs = gf_bs_new(dovi->value.data.ptr, dovi->value.data.size, GF_BITSTREAM_READ);
+		GF_DOVIDecoderConfigurationRecord *dvcc = gf_odf_dovi_cfg_read_bs(bs);
+		gf_bs_del(bs);
+		if (!dvcc) {
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("RFC6381 No config found for Dolby Vision file (\"%s\")\n", gf_4cc_to_str(subtype)));
+			return GF_BAD_PARAM;
+		}
+
+		switch (codec_id) {
+		case GF_CODECID_HEVC:
+			e = rfc_6381_get_codec_dolby_vision(szCodec, force_inband ? GF_ISOM_SUBTYPE_DVHE : GF_ISOM_SUBTYPE_DVH1, dvcc);
+			break;
+		case GF_CODECID_AVC:
+			e = rfc_6381_get_codec_dolby_vision(szCodec, force_inband ? GF_ISOM_SUBTYPE_DVAV : GF_ISOM_SUBTYPE_DVA1, dvcc);
+			break;
+		case GF_CODECID_AV1:
+			e = rfc_6381_get_codec_dolby_vision(szCodec, GF_ISOM_SUBTYPE_DAV1, dvcc);
+			break;
+		default:
+			e = GF_NOT_SUPPORTED;
+		}
+		gf_odf_dovi_cfg_del(dvcc);
+		return e;
+	}
+
+	switch (codec_id) {
+	case GF_CODECID_AAC_MPEG4:
+	case GF_CODECID_AAC_MPEG2_MP:
+	case GF_CODECID_AAC_MPEG2_LCP:
+	case GF_CODECID_AAC_MPEG2_SSRP:
+	case GF_CODECID_USAC:
+		return rfc_6381_get_codec_aac(szCodec, codec_id, dcd ? dcd->value.data.ptr : NULL, dcd ? dcd->value.data.size : 0, force_sbr);
+
+	case GF_CODECID_MPEG4_PART2:
+		return rfc_6381_get_codec_m4v(szCodec, codec_id, dcd ? dcd->value.data.ptr : NULL, dcd ? dcd->value.data.size : 0);
+		break;
+	case GF_CODECID_SVC:
+	case GF_CODECID_MVC:
+		if (dcd_enh) dcd = dcd_enh;
+		subtype = (codec_id==GF_CODECID_SVC) ? GF_ISOM_SUBTYPE_SVC_H264 : GF_ISOM_SUBTYPE_MVC_H264;
+	case GF_CODECID_AVC:
+		if (!subtype) {
+			if (force_inband) {
+				subtype = dcd_enh ? GF_ISOM_SUBTYPE_AVC4_H264 : GF_ISOM_SUBTYPE_AVC3_H264;
+			} else {
+				subtype = dcd_enh ? GF_ISOM_SUBTYPE_AVC2_H264 : GF_ISOM_SUBTYPE_AVC_H264;
+			}
+		}
+		if (dcd) {
+			GF_AVCConfig *avcc = gf_odf_avc_cfg_read(dcd->value.data.ptr, dcd->value.data.size);
+			if (avcc) {
+				GF_Err e = rfc_6381_get_codec_avc(szCodec, subtype, avcc);
+				gf_odf_avc_cfg_del(avcc);
+				return e;
+			}
+		}
+		snprintf(szCodec, RFC6381_CODEC_NAME_SIZE_MAX, "%s", gf_4cc_to_str(subtype));
+		GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("RFC6381 Cannot find AVC config, using default %s\n", szCodec));
+		return GF_OK;
+
+	case GF_CODECID_LHVC:
+		subtype = force_inband ? GF_ISOM_SUBTYPE_LHE1 : GF_ISOM_SUBTYPE_LHV1;
+		//fallthrough
+	case GF_CODECID_HEVC_TILES:
+		if (!subtype) subtype = GF_ISOM_SUBTYPE_HVT1;
+		if (!dcd && tile_base_dcd) dcd = tile_base_dcd;
+
+		//fallthrough
+	case GF_CODECID_HEVC:
+		if (!subtype) {
+			if (is_tile_base) {
+				subtype = force_inband ? GF_ISOM_SUBTYPE_HEV2 : GF_ISOM_SUBTYPE_HVC2;
+			} else if (dcd_enh) {
+				if (dcd) {
+					subtype = force_inband ? GF_ISOM_SUBTYPE_HEV2 : GF_ISOM_SUBTYPE_HVC2;
+				} else {
+					subtype = force_inband ? GF_ISOM_SUBTYPE_LHE1 : GF_ISOM_SUBTYPE_LHV1;
+				}
+			} else {
+				subtype = force_inband ? GF_ISOM_SUBTYPE_HEV1 : GF_ISOM_SUBTYPE_HVC1;
+			}
+		}
+		if (dcd || dcd_enh) {
+			GF_HEVCConfig *hvcc = dcd ? gf_odf_hevc_cfg_read(dcd->value.data.ptr, dcd->value.data.size, GF_FALSE) : NULL;
+			if (hvcc) {
+				GF_Err e = rfc_6381_get_codec_hevc(szCodec, subtype, hvcc);
+				gf_odf_hevc_cfg_del(hvcc);
+				return e;
+			}
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("RFC6381 HEVC config not compliant !\n"));
+			return GF_NON_COMPLIANT_BITSTREAM;
+		}
+
+		snprintf(szCodec, RFC6381_CODEC_NAME_SIZE_MAX, "%s", gf_4cc_to_str(subtype));
+		if (codec_id!=GF_CODECID_HEVC_TILES) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("RFC6381  Cannot find HEVC config, using default %s\n", szCodec));
+		}
+		return GF_OK;
+
+	case GF_CODECID_AV1:
+		if (!subtype) subtype = GF_ISOM_SUBTYPE_AV01;
+
+		if (dcd) {
+			GF_AV1Config *av1c = gf_odf_av1_cfg_read(dcd->value.data.ptr, dcd->value.data.size);
+			if (av1c) {
+				GF_Err e = rfc_6381_get_codec_av1(szCodec, subtype, av1c, colr);
+				gf_odf_av1_cfg_del(av1c);
+				return e;
+			}
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("RFC6381 AV1 config not conformant\n"));
+			return GF_NON_COMPLIANT_BITSTREAM;
+		}
+		snprintf(szCodec, RFC6381_CODEC_NAME_SIZE_MAX, "%s", gf_4cc_to_str(subtype));
+		GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("RFC6381 Cannot find AV1 config, using default %s\n", szCodec));
+		return GF_OK;
+
+	case GF_CODECID_VP8:
+		if (!subtype) subtype = GF_ISOM_SUBTYPE_VP08;
+	case GF_CODECID_VP9:
+		if (!subtype) subtype = GF_ISOM_SUBTYPE_VP09;
+
+		if (dcd) {
+			GF_VPConfig *vpcc = gf_odf_vp_cfg_read(dcd->value.data.ptr, dcd->value.data.size);
+
+			if (vpcc) {
+				GF_Err e = rfc_6381_get_codec_vpx(szCodec, subtype, vpcc, colr);
+				if (vpcc->level == 0 && !strcmp(pid->filter->name, "dasher"))
+					GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("RFC6381 DASHing VPx codec with undefined level=0: stream might not play. Consider adding \"#Codec=foo.bar\" to force value.\n"));
+				gf_odf_vp_cfg_del(vpcc);
+				return e;
+			}
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("RFC6381 No config found for VP file (\"%s\").\n", gf_4cc_to_str(subtype)));
+			return GF_NON_COMPLIANT_BITSTREAM;
+		}
+		snprintf(szCodec, RFC6381_CODEC_NAME_SIZE_MAX, "%s", gf_4cc_to_str(subtype));
+		GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("RFC6381 Cannot find VPX config, using default %s\n", szCodec));
+		return GF_OK;
+
+	case GF_CODECID_MHAS:
+		subtype = subtype_src ? subtype_src : GF_ISOM_SUBTYPE_MH3D_MHM1;
+		if (!dcd) {
+			const GF_PropertyValue *pl = gf_filter_pid_get_property(pid, GF_PROP_PID_PROFILE_LEVEL);
+			if (pl) mha_pl = (s32) pl->value.uint;
+		}
+		//fallthrough
+	case GF_CODECID_MPHA:
+		if (!subtype)
+			subtype = subtype_src ? subtype_src : GF_ISOM_SUBTYPE_MH3D_MHA1;
+
+		return rfc_6381_get_codec_mpegha(szCodec, subtype, dcd ? dcd->value.data.ptr : NULL, dcd ? dcd->value.data.size : 0, mha_pl);
+
+	case GF_CODECID_VVC:
+		if (!subtype) {
+			subtype = force_inband ? GF_ISOM_SUBTYPE_VVI1 : GF_ISOM_SUBTYPE_VVC1;
+		}
+		if (dcd) {
+			GF_VVCConfig *vvcc = gf_odf_vvc_cfg_read(dcd->value.data.ptr, dcd->value.data.size);
+
+			snprintf(szCodec, RFC6381_CODEC_NAME_SIZE_MAX, "%s.", gf_4cc_to_str(subtype));
+			if (vvcc) {
+				GF_Err e = rfc_6381_get_codec_vvc(szCodec, subtype, vvcc);
+				gf_odf_vvc_cfg_del(vvcc);
+				return e;
+			}
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("RFC6381 No config found for VP file (\"%s\")\n", gf_4cc_to_str(subtype)));
+			return GF_NON_COMPLIANT_BITSTREAM;
+		}
+		snprintf(szCodec, RFC6381_CODEC_NAME_SIZE_MAX, "%s", gf_4cc_to_str(subtype));
+		GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("RFC6381 Cannot find VVC config, using default %s\n", szCodec));
+		return GF_OK;
+
+	case GF_CODECID_RAW_UNCV:
+		if (!subtype) subtype = subtype_src;
+		if (dcd) {
+			return rfc_6381_get_codec_uncv(szCodec, subtype, dcd->value.data.ptr, dcd->value.data.size);
+		}
+		snprintf(szCodec, RFC6381_CODEC_NAME_SIZE_MAX, "%s", gf_4cc_to_str(subtype));
+		GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("RFC6381 Cannot find RAW UNCV config, using default %s\n", szCodec));
+		return GF_OK;
+	default:
+		subtype = gf_codecid_4cc_type(codec_id);
+		if (!subtype) {
+			const GF_PropertyValue *p = gf_filter_pid_get_property(pid, GF_PROP_PID_ISOM_SUBTYPE);
+			if (p) subtype = p->value.uint;
+		}
+		if (!subtype && (codec_id==GF_CODECID_RAW)) {
+			if (stream_type==GF_STREAM_VISUAL) {
+				p = gf_filter_pid_get_property(pid, GF_PROP_PID_PIXFMT);
+				if (p) subtype = gf_pixel_fmt_to_qt_type(p->value.uint);
+			}
+			else if (stream_type==GF_STREAM_AUDIO) {
+				p = gf_filter_pid_get_property(pid, GF_PROP_PID_AUDIO_FORMAT);
+				if (p) subtype = gf_audio_fmt_to_isobmf(p->value.uint);
+			}
+		}
+
+		if (!subtype) {
+			const char *mime = gf_codecid_mime(codec_id);
+			if (mime) mime = strchr(mime, '/');
+			if (mime) mime++;
+			if (mime && mime0 && strcmp(mime, "octet-string")) {
+				GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("RFC6381 Codec parameters not known, using mime type %s\n", mime));
+				strcpy(szCodec, mime);
+				return GF_OK;
+			}
+			GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("RFC6381 Codec parameters not known, cannot set codec string\n" ));
+			strcpy(szCodec, "unkn");
+			return GF_OK;
+		}
+
+		return rfc6381_codec_name_default(szCodec, subtype, codec_id);
+	}
+	return GF_OK;
+}
+
+GF_EXPORT
+void gf_filter_pid_send_flush(GF_FilterPid *pid)
+{
+	//allow NULL as input (most filters blindly call set_eos on output even if no output)
+	if (!pid) return;
+	if (PID_IS_INPUT(pid)) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Attempt to signal flush on input PID %s in filter %s\n", pid->pid->name, pid->filter->name));
+		return;
+	}
+	if (pid->eos_keepalive)
+		return;
+
+	gf_filter_pid_set_eos(pid);
+	//set keepalive once eos has been called
+	pid->eos_keepalive = GF_TRUE;
+}
+
+void gf_filter_pid_force_single_link(GF_FilterPid *pid)
+{
+	if (!pid) return;
+	if (PID_IS_INPUT(pid)) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Attempt to force single link mode on input PID %s in filter %s\n", pid->pid->name, pid->filter->name));
+		return;
+	}
+	pid->link_flags |= PID_FORCE_SINGLE;
+}
+void gf_filter_pid_disable_clone(GF_FilterPid *pid)
+{
+	if (!pid) return;
+	if (PID_IS_INPUT(pid)) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Attempt to set disable clone on input PID %s in filter %s\n", pid->pid->name, pid->filter->name));
+		return;
+	}
+	pid->link_flags |= PID_DISABLE_CLONE;
+}

gpac-2.2.1.tar.gz/src/filter_core/filter_props.c -> gpac-2.4.0.tar.gz/src/filter_core/filter_props.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2017-2022
+ *			Copyright (c) Telecom ParisTech 2017-2024
  *					All rights reserved
  *
  *  This file is part of GPAC / filters sub-project
@@ -43,7 +43,8 @@
 	{GF_PROP_PCMFMT, (cst_parse_proto) gf_audio_fmt_parse, (cst_name_proto) gf_audio_fmt_name, gf_audio_fmt_all_names},
 	{GF_PROP_CICP_COL_PRIM, gf_cicp_parse_color_primaries, gf_cicp_color_primaries_name, gf_cicp_color_primaries_all_names},
 	{GF_PROP_CICP_COL_TFC, gf_cicp_parse_color_transfer, gf_cicp_color_transfer_name, gf_cicp_color_transfer_all_names},
-	{GF_PROP_CICP_COL_MX, gf_cicp_parse_color_matrix, gf_cicp_color_matrix_name, gf_cicp_color_matrix_all_names}
+	{GF_PROP_CICP_COL_MX, gf_cicp_parse_color_matrix, gf_cicp_color_matrix_name, gf_cicp_color_matrix_all_names},
+	{GF_PROP_CICP_LAYOUT, gf_audio_fmt_get_cicp_from_name, gf_audio_fmt_get_cicp_name, gf_audio_fmt_cicp_all_names}
 };
 
 GF_EXPORT
@@ -88,9 +89,34 @@
 	return GF_FALSE;
 }
 
+static Bool parse_time(const char *str, u64 *val)
+{
+	u32 h=0, m=0, s=0, ms=0;
+	if (!str) return GF_FALSE;
+	if ((str0!='t') && (str0!='T')) return GF_FALSE;
+	str += 1;
+	if (sscanf(str, "%02u:%02u:%02u.%02u", &h, &m, &s, &ms) == 4) {
+	}
+	else if (sscanf(str, "%02u:%02u:%02u", &h, &m, &s) == 3) {
+		ms=0;
+	}
+	else if (sscanf(str, "%02u:%02u.%02u", &m, &s, &ms) == 3) {
+		h=0;
+	}
+	else if (sscanf(str, "%02u:%02u", &m, &s) == 2) {
+		h=ms=0;
+	}
+	*val = 3600*h;
+	*val += 60*m;
+	*val += s;
+	*val = *val * 1000 + ms;
+	return GF_TRUE;
+}
+
 GF_PropertyValue gf_props_parse_value(u32 type, const char *name, const char *value, const char *enum_values, char list_sep_char)
 {
 	GF_PropertyValue p;
+	u64 tval;
 	char *unit_sep=NULL;
 	s32 unit = 0;
 	memset(&p, 0, sizeof(GF_PropertyValue));
@@ -101,7 +127,7 @@
 	unit_sep = NULL;
 	if (value) {
 		u32 len = (u32) strlen(value);
-		unit_sep = len ? strrchr("kKgGmMsS", valuelen-1) : NULL;
+		unit_sep = len ? strchr("SsMmGgKk", valuelen-1) : NULL;
 		if (unit_sep) {
 			u8 unit_char = unit_sep0;
 			if ((unit_char=='k') || (unit_char=='K')) unit = 1000;
@@ -135,6 +161,7 @@
 	case GF_PROP_SINT:
 		if (value && !strcmp(value, "+I")) p.value.sint = GF_INT_MAX;
 		else if (value && !strcmp(value, "-I")) p.value.sint = GF_INT_MIN;
+		else if (parse_time(value, &tval)) p.value.sint = (s32) tval;
 		else if (!value || (sscanf(value, "%d", &p.value.sint)!=1)) {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Wrong argument value %s for int arg %s - using 0\n", value, name));
 			p.value.sint = 0;
@@ -199,7 +226,8 @@
 				p.value.uint *= unit;
 			}
 		} else if (value) {
-			if (sscanf(value, "%d", &p.value.uint)!=1) {
+			if (parse_time(value, &tval)) p.value.uint = (u32) tval;
+			else if (sscanf(value, "%d", &p.value.uint)!=1) {
 				if (strlen(value)==4) {
 					p.value.uint = GF_4CC(value0,value1,value2,value3);
 				} else {
@@ -224,6 +252,7 @@
 	case GF_PROP_LSINT:
 		if (value && !strcmp(value, "+I")) p.value.longsint = 0x7FFFFFFFFFFFFFFFUL;
 		else if (value && !strcmp(value, "-I")) p.value.longsint = 0x8000000000000000UL;
+		else if (parse_time(value, &tval)) p.value.longsint = (s64) tval;
 		else if (!value || (sscanf(value, ""LLD, &p.value.longsint)!=1) ) {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Wrong argument value %s for long int arg %s - using 0\n", value, name));
 			p.value.uint = 0;
@@ -233,6 +262,7 @@
 		break;
 	case GF_PROP_LUINT:
 		if (value && !strcmp(value, "+I")) p.value.longuint = 0xFFFFFFFFFFFFFFFFUL;
+		else if (parse_time(value, &tval)) p.value.longuint = (u64) tval;
 		else if (!value || (sscanf(value, ""LLU, &p.value.longuint)!=1) ) {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Wrong argument value %s for long unsigned int arg %s - using 0\n", value, name));
 			p.value.uint = 0;
@@ -241,14 +271,22 @@
 		}
 		break;
 	case GF_PROP_FRACTION:
-		if (gf_parse_frac(value, &p.value.frac)==GF_FALSE) {
+		if (parse_time(value, &tval)) {
+			p.value.frac.num = (s32) tval;
+			p.value.frac.den = 1000;
+		}
+		else if (gf_parse_frac(value, &p.value.frac)==GF_FALSE) {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Wrong argument value %s for fraction arg %s - using 0/1\n", value, name));
 			p.value.frac.num = 0;
 			p.value.frac.den = 1;
 		}
 		break;
 	case GF_PROP_FRACTION64:
-		if (gf_parse_lfrac(value, &p.value.lfrac)==GF_FALSE) {
+		if (parse_time(value, &tval)) {
+			p.value.lfrac.num = (s64) tval;
+			p.value.lfrac.den = 1000;
+		}
+		else if (gf_parse_lfrac(value, &p.value.lfrac)==GF_FALSE) {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Wrong argument value %s for fraction arg %s - using 0/1\n", value, name));
 			p.value.lfrac.num = 0;
 			p.value.lfrac.den = 1;
@@ -257,6 +295,7 @@
 	case GF_PROP_FLOAT:
 		if (value && !strcmp(value, "+I")) p.value.fnumber = FIX_MAX;
 		else if (value && !strcmp(value, "-I")) p.value.fnumber = FIX_MIN;
+		else if (parse_time(value, &tval)) p.value.fnumber = INT2FIX(tval);
 		else if (!value) {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Wrong argument value %s for float arg %s - using 0\n", value, name));
 			p.value.fnumber = 0;
@@ -274,6 +313,40 @@
 	case GF_PROP_DOUBLE:
 		if (value && !strcmp(value, "+I")) p.value.number = GF_MAX_DOUBLE;
 		else if (value && !strcmp(value, "-I")) p.value.number = GF_MIN_DOUBLE;
+		else if (parse_time(value, &tval)) p.value.number = (Double) tval;
+		else if (value && (value0=='T')) {
+			u32 h=0, m=0, s=0, ms=0;
+			if (sscanf(value+1, "%u:%u:%u.%u", &h, &m, &s, &ms)==4) {
+				p.value.number = h*3600 + m*60 + s;
+				p.value.number += ((Double)ms)/1000;
+			}
+			else if (sscanf(value+1, "%u:%u.%u", &m, &s, &ms)==3) {
+				p.value.number = m*60 + s;
+				p.value.number += ((Double)ms)/1000;
+			}
+			else if (sscanf(value+1, "%u.%u", &s, &ms)==2) {
+				p.value.number = s;
+				p.value.number += ((Double)ms)/1000;
+			}
+			else if (sscanf(value+1, "%u:%u", &m, &s)==2) {
+				if (unit_sep && ( (unit_sep0== 'm') || !strcmp(unit_sep, "min") ) )
+					p.value.number = m*3600 + s*60;
+				else
+					p.value.number = m*60 + s;
+			} else if (sscanf(value+1, "%u", &m)==1) {
+				if (unit_sep && ( (unit_sep0== 'm') || !strcmp(unit_sep, "min") ) )
+					p.value.number = m*60;
+				else if (unit_sep && !strcmp(unit_sep, "sec"))
+					p.value.number = m*3600;
+				else if (unit_sep && !strcmp(unit_sep, "ms"))
+					p.value.number = ((Double)m)/1000;
+				else
+					p.value.number = m*3600;
+			} else {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Wrong time argument value %s for double arg %s - using 0\n", value, name));
+				p.value.number = 0;
+			}
+		}
 		else if (!value || (sscanf(value, "%lg", &p.value.number) != 1) ) {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Wrong argument value %s for double arg %s - using 0\n", value, name));
 			p.value.number = 0;
@@ -430,13 +503,13 @@
 				p.value.data.size = gf_base64_decode((u8 *)b64, size, p.value.data.ptr, size);
 				if (!p.value.data.size) {
 					GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Failed to decode base64 value %s\n", value, name));
-					p.type=GF_PROP_FORBIDEN;
+					p.type=GF_PROP_FORBIDDEN;
 				}
 				p.value.data.ptrp.value.data.size = 0;
 			} else {
 				GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Failed to allocate memory for decoding base64 value %s\n", value, name));
 				p.value.data.size = 0;
-				p.type=GF_PROP_FORBIDEN;
+				p.type=GF_PROP_FORBIDDEN;
 			}
 		} else {
 			p.value.data.size = (u32) strlen(value);
@@ -563,7 +636,7 @@
 		}
 	}
 		break;
-	case GF_PROP_FORBIDEN:
+	case GF_PROP_FORBIDDEN:
 	default:
 		if (gf_props_type_is_enum(type)) {
 			p.type = type;
@@ -571,7 +644,7 @@
 			break;
 		}
 		GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Forbidden property type %d for arg %s - ignoring\n", type, name));
-		p.type=GF_PROP_FORBIDEN;
+		p.type=GF_PROP_FORBIDDEN;
 		break;
 	}
 //	if (unit_sep) unit_sep0 = unit_char;
@@ -647,6 +720,9 @@
 			if (!strcmp(p1->value.string, "*")) return GF_TRUE;
 			if (!strcmp(p2->value.string, "*")) return GF_TRUE;
 		}
+		if (!strcmp(p1->value.string, p2->value.string))
+			return GF_TRUE;
+
 		if (strchr(p2->value.string, '|')) {
 			u32 len = (u32) strlen(p1->value.string);
 			char *cur = p2->value.string;
@@ -671,8 +747,7 @@
 			}
 			return GF_FALSE;
 		}
-		assert(strchr(p1->value.string, '|')==NULL);
-		return !strcmp(p1->value.string, p2->value.string) ? GF_TRUE : GF_FALSE;
+		return GF_FALSE;
 
 	case GF_PROP_DATA:
 	case GF_PROP_DATA_NO_COPY:
@@ -767,18 +842,19 @@
 	if (!map) {
 		GF_SAFEALLOC(map, GF_PropertyMap);
 		if (!map) return NULL;
-		
+
 		map->session = filter->session;
 #if GF_PROPS_HASHTABLE_SIZE
 #else
 		map->properties = gf_list_new();
 #endif
 	}
-	assert(!map->reference_count);
+	gf_assert(!map->reference_count);
 	map->reference_count = 1;
 	return map;
 }
 
+GF_EXPORT
 void gf_props_reset_single(GF_PropertyValue *p)
 {
 	if (p->type==GF_PROP_STRING) {
@@ -809,7 +885,7 @@
 }
 void gf_props_del_property(GF_PropertyEntry *it)
 {
-	assert(it->reference_count);
+	gf_assert(it->reference_count);
 	if (safe_int_dec(&it->reference_count) == 0 ) {
 		if (it->pname && it->name_alloc)
 			gf_free(it->pname);
@@ -821,7 +897,7 @@
 			it->prop.value.string = NULL;
 		}
 		else if (it->prop.type==GF_PROP_DATA) {
-			assert(it->alloc_size);
+			gf_assert(it->alloc_size);
 			//DATA props are collected at session level for future reuse
 		}
 		//string list are destroyed
@@ -844,17 +920,13 @@
 		}
 		it->prop.value.data.size = 0;
 		if (it->alloc_size) {
-			assert(it->prop.type==GF_PROP_DATA);
-			if (it->session->prop_maps_entry_data_alloc_reservoir) {
-				gf_fq_add(it->session->prop_maps_entry_data_alloc_reservoir, it);
-			} else {
+			gf_assert(it->prop.type==GF_PROP_DATA);
+			if (gf_fq_res_add(it->session->prop_maps_entry_data_alloc_reservoir, it)) {
 				if (it->prop.value.data.ptr) gf_free(it->prop.value.data.ptr);
 				gf_free(it);
 			}
 		} else {
-			if (it->session->prop_maps_entry_reservoir) {
-				gf_fq_add(it->session->prop_maps_entry_reservoir, it);
-			} else {
+			if (gf_fq_res_add(it->session->prop_maps_entry_reservoir, it)) {
 				gf_free(it);
 			}
 		}
@@ -883,9 +955,7 @@
 				gf_props_del_property((GF_PropertyEntry *) gf_list_pop_back(l) );
 			}
 			prop->hash_tablei = NULL;
-			if (prop->session->prop_maps_list_reservoir) {
-				gf_fq_add(prop->session->prop_maps_list_reservoir, l);
-			} else {
+			if (gf_fq_res_add(prop->session->prop_maps_list_reservoir, l)) {
 				gf_list_del(l);
 			}
 		}
@@ -899,16 +969,14 @@
 
 void gf_props_del(GF_PropertyMap *map)
 {
-	assert(!map->pckrefs_reference_count || !map->reference_count);
+	gf_assert(!map->pckrefs_reference_count || !map->reference_count);
 	//we still have a ref
 	if (map->pckrefs_reference_count || map->reference_count) return;
 
 	gf_props_reset(map);
 	map->reference_count = 0;
 	map->timescale = 0;
-	if (map->session->prop_maps_reservoir) {
-		gf_fq_add(map->session->prop_maps_reservoir, map);
-	} else {
+	if (!map->session || gf_fq_res_add(map->session->prop_maps_reservoir, map)) {
 		gf_list_del(map->properties);
 		gf_free(map);
 	}
@@ -986,13 +1054,13 @@
 				prop->alloc_size = 0;
 				return GF_OUT_OF_MEM;
 			}
-			assert(prop->alloc_size);
+			gf_assert(prop->alloc_size);
 		}
 		memcpy(prop->prop.value.data.ptr, value->value.data.ptr, value->value.data.size);
 	} else if (prop->prop.type == GF_PROP_DATA_NO_COPY) {
 		prop->prop.type = GF_PROP_DATA;
 		prop->alloc_size = value->value.data.size;
-		assert(prop->alloc_size);
+		gf_assert(prop->alloc_size);
 	}
 	//use uint_list as base type for list
 	else if ((prop->prop.type == GF_PROP_UINT_LIST) || (prop->prop.type == GF_PROP_4CC_LIST) || (prop->prop.type == GF_PROP_SINT_LIST) || (prop->prop.type == GF_PROP_VEC2I_LIST)) {
@@ -1047,7 +1115,7 @@
 			for (i=0; i<count; i++) {
 				GF_PropertyEntry *prop_c = gf_list_get(map->hash_tablehash, i);
 				GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("\t%s\n\n", prop_c->pname ? prop_c->pname : gf_4cc_to_str(prop_c->p4cc)  ));
-				assert(!prop_c->p4cc || (prop_c->p4cc != p4cc));
+				gf_assert(!prop_c->p4cc || (prop_c->p4cc != p4cc));
 			}
 		}
 	}
@@ -1184,7 +1252,7 @@
 			count = gf_list_count(list);
 			for (i=0; i<count; i++) {
 				GF_PropertyEntry *prop = gf_list_get(list, i);
-				assert(prop->reference_count);
+				gf_assert(prop->reference_count);
 				if (!filter_prop || filter_prop(cbk, prop->p4cc, prop->pname, &prop->prop)) {
 					safe_int_inc(&prop->reference_count);
 
@@ -1214,7 +1282,7 @@
 	u32 i, nb_items = 0;
 #endif
 	u32 idx, count;
-	
+
 	const GF_PropertyEntry *pe;
 	if (!io_idx) return NULL;
 
@@ -1300,7 +1368,8 @@
 	{GF_PROP_PCMFMT, "afmt", "raw audio format"},
 	{GF_PROP_CICP_COL_PRIM, "cprm", "color primaries, string or int value from ISO/IEC 23091-2"},
 	{GF_PROP_CICP_COL_TFC, "ctfc", "color transfer characteristics, string or int value from ISO/IEC 23091-2"},
-	{GF_PROP_CICP_COL_MX, "cmxc", "color matrix coefficients, string or int value from ISO/IEC 23091-2"}
+	{GF_PROP_CICP_COL_MX, "cmxc", "color matrix coefficients, string or int value from ISO/IEC 23091-2"},
+	{GF_PROP_CICP_LAYOUT, "alay", "channel layout configuration, string or int value from ISO/IEC 23091-3"}
 };
 
 GF_EXPORT
@@ -1333,284 +1402,306 @@
 		if (!strcmp(PropTypesi.name, name)) return PropTypesi.type;
 	}
 	GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Unknown property type %s\n", name));
-	return GF_PROP_FORBIDEN;
+	return GF_PROP_FORBIDDEN;
 }
 
+#ifndef GPAC_DISABLE_DOC
+#define DEC_PROP(_a, _b, _c, _d) { _a, _b, _c, _d}
+#define DEC_PROP_F(_a, _b, _c, _d, _e) { _a, _b, _c, _d, _e}
+#else
+#define DEC_PROP(_a, _b, _c, _d) { _a, _b, _d}
+#define DEC_PROP_F(_a, _b, _c, _d, _e) { _a, _b, _d, _e}
+#endif
+
+
 GF_BuiltInProperty GF_BuiltInProps  =
 {
-	{ GF_PROP_PID_ID, "ID", "Stream ID", GF_PROP_UINT},
-	{ GF_PROP_PID_ESID, "ESID", "MPEG-4 ESID of PID", GF_PROP_UINT, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PID_ITEM_ID, "ItemID", "ID of image item in HEIF, same value as ID", GF_PROP_UINT},
-	{ GF_PROP_PID_ITEM_NUM, "ItemNumber", "Number (1-based) of image item in HEIF, in order of declaration in file", GF_PROP_UINT},
-	{ GF_PROP_PID_TRACK_NUM, "TrackNumber", "Number (1-based) of track in order of declaration in file", GF_PROP_UINT},
-	{ GF_PROP_PID_SERVICE_ID, "ServiceID", "ID of parent service", GF_PROP_UINT, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PID_CLOCK_ID, "ClockID", "ID of clock reference PID", GF_PROP_UINT, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PID_DEPENDENCY_ID, "DependencyID", "ID of layer depended on", GF_PROP_UINT},
-	{ GF_PROP_PID_SUBLAYER, "SubLayer", "PID is a sublayer of the stream depended on rather than an enhancement layer", GF_PROP_BOOL},
-	{ GF_PROP_PID_PLAYBACK_MODE, "PlaybackMode", "Playback mode supported:\n- 0: no time control\n- 1: play/pause/seek,speed=1\n- 2: play/pause/seek,speed>=0\n- 3: play/pause/seek, reverse playback", GF_PROP_UINT, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PID_SCALABLE, "Scalable", "Scalable stream", GF_PROP_BOOL},
-	{ GF_PROP_PID_TILE_BASE, "TileBase", "Tile base stream", GF_PROP_BOOL},
-	{ GF_PROP_PID_TILE_ID, "TileID", "ID of the tile for hvt1/hvt2 PIDs", GF_PROP_UINT},
-	{ GF_PROP_PID_LANGUAGE, "Language", "Language code: ISO639 2/3 character code or RFC 4646", GF_PROP_NAME},
-	{ GF_PROP_PID_SERVICE_NAME, "ServiceName", "Name of parent service", GF_PROP_STRING, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PID_SERVICE_PROVIDER, "ServiceProvider", "Provider of parent service", GF_PROP_STRING, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PID_STREAM_TYPE, "StreamType", "Media stream type", GF_PROP_UINT},
-	{ GF_PROP_PID_SUBTYPE, "StreamSubtype", "Media subtype 4CC (auxiliary, pic sequence, etc ..), matches ISOM handler type", GF_PROP_4CC, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PID_ISOM_SUBTYPE, "ISOMSubtype", "ISOM media subtype 4CC (avc1 avc2...)", GF_PROP_4CC, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PID_ORIG_STREAM_TYPE, "OrigStreamType", "Original stream type before encryption", GF_PROP_UINT},
-	{ GF_PROP_PID_CODECID, "CodecID", "Codec ID (MPEG-4 OTI or ISOBMFF 4CC)", GF_PROP_UINT},
-	{ GF_PROP_PID_IN_IOD, "InitialObjectDescriptor", "PID is declared in the IOD for MPEG-4", GF_PROP_BOOL},
-	{ GF_PROP_PID_UNFRAMED, "Unframed", "The media data is not framed, i.e. each packet is not a complete AU/frame or is not in internal format (e.g. annexB for avc/hevc, adts for aac)", GF_PROP_BOOL},
-	{ GF_PROP_PID_UNFRAMED_FULL_AU, "UnframedAU", "The unframed media still has correct AU boundaries: one packet is one full AU, but the packet format might not be the internal one (e.g. annexB for avc/hevc, adts for aac)", GF_PROP_BOOL},
-	{ GF_PROP_PID_UNFRAMED_LATM, "LATM", "Media is unframed AAC in LATM format", GF_PROP_BOOL},
-	{ GF_PROP_PID_DURATION, "Duration", "Media duration (a negative value means an estimated duration based on rate)", GF_PROP_FRACTION64},
-	{ GF_PROP_PID_NB_FRAMES, "NumFrames", "Number of frames in the stream", GF_PROP_UINT, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PID_FRAME_OFFSET, "FrameOffset", "Index of first frame in the stream (used for reporting)", GF_PROP_UINT, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PID_FRAME_SIZE, "ConstantFrameSize", "Size of the frames for constant frame size streams", GF_PROP_UINT},
-	{ GF_PROP_PID_TIMESHIFT_DEPTH, "TimeshiftDepth", "Depth of the timeshift buffer", GF_PROP_FRACTION, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PID_TIMESHIFT_TIME, "TimeshiftTime", "Time in the timeshift buffer in seconds - changes are signaled through PID info (no reconfigure)", GF_PROP_DOUBLE, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PID_TIMESHIFT_STATE, "TimeshiftState", "State of timeshift buffer: 0 is OK, 1 is underflow, 2 is overflow - changes are signaled through PID info (no reconfigure)", GF_PROP_UINT, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PID_TIMESCALE, "Timescale", "Media timescale (a timestamp delta of N is N/timescale seconds)", GF_PROP_UINT},
-	{ GF_PROP_PID_PROFILE_LEVEL, "ProfileLevel", "MPEG-4 profile and level", GF_PROP_UINT, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PID_DECODER_CONFIG, "DecoderConfig", "Decoder configuration data", GF_PROP_DATA},
-	{ GF_PROP_PID_DECODER_CONFIG_ENHANCEMENT, "DecoderConfigEnhancement", "Decoder configuration data of the enhancement layer(s). Also used by 3GPP/Apple text streams to give the full sample description table used in SDP.", GF_PROP_DATA},
-	{ GF_PROP_PID_CONFIG_IDX, "DecoderConfigIndex", "1-based index of decoder config for ISO base media files", GF_PROP_UINT},
-	{ GF_PROP_PID_SAMPLE_RATE, "SampleRate", "Audio sample rate", GF_PROP_UINT},
-	{ GF_PROP_PID_SAMPLES_PER_FRAME, "SamplesPerFrame", "Number of audio sample in one coded frame", GF_PROP_UINT},
-	{ GF_PROP_PID_NUM_CHANNELS, "NumChannels", "Number of audio channels", GF_PROP_UINT},
-	{ GF_PROP_PID_AUDIO_BPS, "BPS", "Number of bits per sample in compressed source", GF_PROP_UINT},
-	{ GF_PROP_PID_CHANNEL_LAYOUT, "ChannelLayout", "Channel Layout mask", GF_PROP_LUINT},
-	{ GF_PROP_PID_AUDIO_FORMAT, "AudioFormat", "Audio sample format", GF_PROP_PCMFMT},
-	{ GF_PROP_PID_AUDIO_SPEED, "AudioPlaybackSpeed", "Audio playback speed, only used for audio output reconfiguration", GF_PROP_DOUBLE, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PID_DELAY, "Delay", "Delay of presentation compared to composition timestamps, in media timescale. Positive value imply holding (delaying) the stream. Negative value imply skipping the beginning of stream", GF_PROP_LSINT},
-	{ GF_PROP_PID_CTS_SHIFT, "CTSShift", "CTS offset to apply in case of negative ctts", GF_PROP_UINT},
-	{ GF_PROP_PID_NO_PRIMING, "SkipPriming", "Audio priming shall not to be removed when initializing decoding", GF_PROP_BOOL},
-	{ GF_PROP_PID_WIDTH, "Width", "Visual Width (video / text / graphics)", GF_PROP_UINT},
-	{ GF_PROP_PID_HEIGHT, "Height", "Visual Height (video / text / graphics)", GF_PROP_UINT},
-	{ GF_PROP_PID_PIXFMT, "PixelFormat", "Pixel format", GF_PROP_PIXFMT},
-	{ GF_PROP_PID_PIXFMT_WRAPPED, "PixelFormatWrapped", "Underlying pixel format of video stream if pixel format is external GL texture", GF_PROP_PIXFMT},
-	{ GF_PROP_PID_STRIDE, "Stride", "Image or Y/alpha plane stride", GF_PROP_UINT},
-	{ GF_PROP_PID_STRIDE_UV, "StrideUV", "UV plane or U/V planes stride", GF_PROP_UINT},
-	{ GF_PROP_PID_BIT_DEPTH_Y, "BitDepthLuma", "Bit depth for luma components", GF_PROP_UINT},
-	{ GF_PROP_PID_BIT_DEPTH_UV, "BitDepthChroma", "Bit depth for chroma components", GF_PROP_UINT},
-	{ GF_PROP_PID_FPS, "FPS", "Video framerate", GF_PROP_FRACTION},
-	{ GF_PROP_PID_INTERLACED, "Interlaced", "Video is interlaced", GF_PROP_BOOL},
-	{ GF_PROP_PID_SAR, "SAR", "Sample (i.e. pixel) aspect ratio", GF_PROP_FRACTION},
-	{ GF_PROP_PID_PAR, "PAR", "Picture aspect ratio", GF_PROP_FRACTION, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PID_WIDTH_MAX, "MaxWidth", "Maximum width (video / text / graphics) of all enhancement layers", GF_PROP_UINT},
-	{ GF_PROP_PID_HEIGHT_MAX, "MaxHeight", "Maximum height (video / text / graphics) of all enhancement layers", GF_PROP_UINT},
-	{ GF_PROP_PID_ZORDER, "ZOrder", "Z-order of the video, from 0 (first) to max int (last)", GF_PROP_SINT},
-	{ GF_PROP_PID_TRANS_X, "TransX", "Horizontal translation of the video (positive towards right)", GF_PROP_SINT},
-	{ GF_PROP_PID_TRANS_Y, "TransY", "Vertical translation of the video (positive towards up)", GF_PROP_SINT},
-	{ GF_PROP_PID_TRANS_X_INV, "TransXRight", "Horizontal offset of the video from right (positive towards right), for cases where reference width is unknown", GF_PROP_SINT},
-	{ GF_PROP_PID_TRANS_Y_INV, "TransYTop", "Vertical translation of the video (0 is top, positive towards down), for cases where reference height is unknown", GF_PROP_SINT},
-	{ GF_PROP_PID_HIDDEN, "Hidden", "PID is hidden in visual/audio rendering", GF_PROP_BOOL},
-
-	{ GF_PROP_PID_CROP_POS, "CropOrigin", "Position in source window, X,Y indicate coordinates in source (0,0 for top-left)", GF_PROP_VEC2I},
-	{ GF_PROP_PID_ORIG_SIZE, "OriginalSize", "Original resolution of video", GF_PROP_VEC2I},
-	{ GF_PROP_PID_SRD, "SRD", "Position and size of the video in the referential given by SRDRef", GF_PROP_VEC4I},
-	{ GF_PROP_PID_SRD_REF, "SRDRef", "Width and Height of the SRD referential", GF_PROP_VEC2I},
-	{ GF_PROP_PID_SRD_MAP, "SRDMap", "Mapping of input videos in reconstructed video, expressed as {Ox,Oy,Ow,Oh,Dx,Dy,Dw,Dh} per input, with:\n"
+	DEC_PROP( GF_PROP_PID_ID, "ID", "Stream ID", GF_PROP_UINT),
+	DEC_PROP_F( GF_PROP_PID_ESID, "ESID", "MPEG-4 ESID of PID", GF_PROP_UINT, GF_PROP_FLAG_GSF_REM),
+	DEC_PROP( GF_PROP_PID_ITEM_ID, "ItemID", "ID of image item in HEIF, same value as ID", GF_PROP_UINT),
+	DEC_PROP( GF_PROP_PID_ITEM_NUM, "ItemNumber", "Number (1-based) of image item in HEIF, in order of declaration in file", GF_PROP_UINT),
+	DEC_PROP( GF_PROP_PID_TRACK_NUM, "TrackNumber", "Number (1-based) of track in order of declaration in file", GF_PROP_UINT),
+	DEC_PROP_F( GF_PROP_PID_SERVICE_ID, "ServiceID", "ID of parent service", GF_PROP_UINT, GF_PROP_FLAG_GSF_REM),
+	DEC_PROP_F( GF_PROP_PID_CLOCK_ID, "ClockID", "ID of clock reference PID", GF_PROP_UINT, GF_PROP_FLAG_GSF_REM),
+	DEC_PROP( GF_PROP_PID_DEPENDENCY_ID, "DependencyID", "ID of layer depended on", GF_PROP_UINT),
+	DEC_PROP( GF_PROP_PID_SUBLAYER, "SubLayer", "PID is a sublayer of the stream depended on rather than an enhancement layer", GF_PROP_BOOL),
+	DEC_PROP_F( GF_PROP_PID_PLAYBACK_MODE, "PlaybackMode", "Playback mode supported:\n- 0: no time control\n- 1: play/pause/seek,speed=1\n- 2: play/pause/seek,speed>=0\n- 3: play/pause/seek, reverse playback", GF_PROP_UINT, GF_PROP_FLAG_GSF_REM),
+	DEC_PROP( GF_PROP_PID_SCALABLE, "Scalable", "Scalable stream", GF_PROP_BOOL),
+	DEC_PROP( GF_PROP_PID_TILE_BASE, "TileBase", "Tile base stream", GF_PROP_BOOL),
+	DEC_PROP( GF_PROP_PID_TILE_ID, "TileID", "ID of the tile for hvt1/hvt2 PIDs", GF_PROP_UINT),
+	DEC_PROP( GF_PROP_PID_LANGUAGE, "Language", "Language code: ISO639 2/3 character code or RFC 4646", GF_PROP_NAME),
+	DEC_PROP_F( GF_PROP_PID_SERVICE_NAME, "ServiceName", "Name of parent service", GF_PROP_STRING, GF_PROP_FLAG_GSF_REM),
+	DEC_PROP_F( GF_PROP_PID_SERVICE_PROVIDER, "ServiceProvider", "Provider of parent service", GF_PROP_STRING, GF_PROP_FLAG_GSF_REM),
+	DEC_PROP( GF_PROP_PID_STREAM_TYPE, "StreamType", "Media stream type", GF_PROP_UINT),
+	DEC_PROP_F( GF_PROP_PID_SUBTYPE, "StreamSubtype", "Media subtype 4CC (auxiliary, pic sequence, etc ..), matches ISOM handler type", GF_PROP_4CC, GF_PROP_FLAG_GSF_REM),
+	DEC_PROP_F( GF_PROP_PID_ISOM_SUBTYPE, "ISOMSubtype", "ISOM media subtype 4CC (avc1 avc2...)", GF_PROP_4CC, GF_PROP_FLAG_GSF_REM),
+	DEC_PROP( GF_PROP_PID_ORIG_STREAM_TYPE, "OrigStreamType", "Original stream type before encryption", GF_PROP_UINT),
+	DEC_PROP( GF_PROP_PID_CODECID, "CodecID", "Codec ID (MPEG-4 OTI or ISOBMFF 4CC)", GF_PROP_UINT),
+	DEC_PROP( GF_PROP_PID_IN_IOD, "InitialObjectDescriptor", "PID is declared in the IOD for MPEG-4", GF_PROP_BOOL),
+	DEC_PROP( GF_PROP_PID_UNFRAMED, "Unframed", "The media data is not framed, i.e. each packet is not a complete AU/frame or is not in internal format (e.g. annexB for avc/hevc, adts for aac)", GF_PROP_BOOL),
+	DEC_PROP( GF_PROP_PID_UNFRAMED_FULL_AU, "UnframedAU", "The unframed media still has correct AU boundaries: one packet is one full AU, but the packet format might not be the internal one (e.g. annexB for avc/hevc, adts for aac)", GF_PROP_BOOL),
+	DEC_PROP( GF_PROP_PID_UNFRAMED_LATM, "LATM", "Media is unframed AAC in LATM format", GF_PROP_BOOL),
+	DEC_PROP( GF_PROP_PID_DURATION, "Duration", "Media duration (a negative value means an estimated duration based on rate)", GF_PROP_FRACTION64),
+	DEC_PROP_F( GF_PROP_PID_NB_FRAMES, "NumFrames", "Number of frames in the stream", GF_PROP_UINT, GF_PROP_FLAG_GSF_REM),
+	DEC_PROP_F( GF_PROP_PID_FRAME_OFFSET, "FrameOffset", "Index of first frame in the stream (used for reporting)", GF_PROP_UINT, GF_PROP_FLAG_GSF_REM),
+	DEC_PROP( GF_PROP_PID_FRAME_SIZE, "ConstantFrameSize", "Size of the frames for constant frame size streams", GF_PROP_UINT),
+	DEC_PROP_F( GF_PROP_PID_TIMESHIFT_DEPTH, "TimeshiftDepth", "Depth of the timeshift buffer", GF_PROP_FRACTION, GF_PROP_FLAG_GSF_REM),
+	DEC_PROP_F( GF_PROP_PID_TIMESHIFT_TIME, "TimeshiftTime", "Time in the timeshift buffer in seconds - changes are signaled through PID info (no reconfigure)", GF_PROP_DOUBLE, GF_PROP_FLAG_GSF_REM),
+	DEC_PROP_F( GF_PROP_PID_TIMESHIFT_STATE, "TimeshiftState", "State of timeshift buffer: 0 is OK, 1 is underflow, 2 is overflow - changes are signaled through PID info (no reconfigure)", GF_PROP_UINT, GF_PROP_FLAG_GSF_REM),
+	DEC_PROP( GF_PROP_PID_TIMESCALE, "Timescale", "Media timescale (a timestamp delta of N is N/timescale seconds)", GF_PROP_UINT),
+	DEC_PROP_F( GF_PROP_PID_PROFILE_LEVEL, "ProfileLevel", "MPEG-4 profile and level", GF_PROP_UINT, GF_PROP_FLAG_GSF_REM),
+	DEC_PROP( GF_PROP_PID_DECODER_CONFIG, "DecoderConfig", "Decoder configuration data", GF_PROP_DATA),
+	DEC_PROP( GF_PROP_PID_DECODER_CONFIG_ENHANCEMENT, "DecoderConfigEnhancement", "Decoder configuration data of the enhancement layer(s). Also used by 3GPP/Apple text streams to give the full sample description table used in SDP.", GF_PROP_DATA),
+	DEC_PROP( GF_PROP_PID_DSI_SUPERSET, "DSISuperset", "Decoder config is a superset of previous decoder config", GF_PROP_BOOL),
+	DEC_PROP( GF_PROP_PID_CONFIG_IDX, "DecoderConfigIndex", "1-based index of decoder config for ISO base media files", GF_PROP_UINT),
+	DEC_PROP( GF_PROP_PID_SAMPLE_RATE, "SampleRate", "Audio sample rate", GF_PROP_UINT),
+	DEC_PROP( GF_PROP_PID_SAMPLES_PER_FRAME, "SamplesPerFrame", "Number of audio sample in one coded frame", GF_PROP_UINT),
+	DEC_PROP( GF_PROP_PID_NUM_CHANNELS, "NumChannels", "Number of audio channels", GF_PROP_UINT),
+	DEC_PROP( GF_PROP_PID_AUDIO_BPS, "BPS", "Number of bits per sample in compressed source", GF_PROP_UINT),
+	DEC_PROP( GF_PROP_PID_CHANNEL_LAYOUT, "ChannelLayout", "Channel Layout mask", GF_PROP_LUINT),
+	DEC_PROP( GF_PROP_PID_AUDIO_FORMAT, "AudioFormat", "Audio sample format", GF_PROP_PCMFMT),
+	DEC_PROP_F( GF_PROP_PID_AUDIO_SPEED, "AudioPlaybackSpeed", "Audio playback speed, only used for audio output reconfiguration", GF_PROP_DOUBLE, GF_PROP_FLAG_GSF_REM),
+	DEC_PROP( GF_PROP_PID_DELAY, "Delay", "Delay of presentation compared to composition timestamps, in media timescale. Positive value imply holding (delaying) the stream. Negative value imply skipping the beginning of stream", GF_PROP_LSINT),
+	DEC_PROP( GF_PROP_PID_CTS_SHIFT, "CTSShift", "CTS offset to apply in case of negative ctts", GF_PROP_UINT),
+	DEC_PROP( GF_PROP_PID_NO_PRIMING, "SkipPriming", "Audio priming shall not to be removed when initializing decoding", GF_PROP_BOOL),
+	DEC_PROP( GF_PROP_PID_WIDTH, "Width", "Visual Width (video / text / graphics)", GF_PROP_UINT),
+	DEC_PROP( GF_PROP_PID_HEIGHT, "Height", "Visual Height (video / text / graphics)", GF_PROP_UINT),
+	DEC_PROP( GF_PROP_PID_PIXFMT, "PixelFormat", "Pixel format", GF_PROP_PIXFMT),
+	DEC_PROP( GF_PROP_PID_PIXFMT_WRAPPED, "PixelFormatWrapped", "Underlying pixel format of video stream if pixel format is external GL texture", GF_PROP_PIXFMT),
+	DEC_PROP( GF_PROP_PID_STRIDE, "Stride", "Image or Y/alpha plane stride", GF_PROP_UINT),
+	DEC_PROP( GF_PROP_PID_STRIDE_UV, "StrideUV", "UV plane or U/V planes stride", GF_PROP_UINT),
+	DEC_PROP( GF_PROP_PID_BIT_DEPTH_Y, "BitDepthLuma", "Bit depth for luma components", GF_PROP_UINT),
+	DEC_PROP( GF_PROP_PID_BIT_DEPTH_UV, "BitDepthChroma", "Bit depth for chroma components", GF_PROP_UINT),
+	DEC_PROP( GF_PROP_PID_FPS, "FPS", "Video framerate", GF_PROP_FRACTION),
+	DEC_PROP( GF_PROP_PID_INTERLACED, "Interlaced", "Video is interlaced", GF_PROP_BOOL),
+	DEC_PROP( GF_PROP_PID_SAR, "SAR", "Sample (i.e. pixel) aspect ratio", GF_PROP_FRACTION),
+	DEC_PROP( GF_PROP_PID_WIDTH_MAX, "MaxWidth", "Maximum width (video / text / graphics) of all enhancement layers", GF_PROP_UINT),
+	DEC_PROP( GF_PROP_PID_HEIGHT_MAX, "MaxHeight", "Maximum height (video / text / graphics) of all enhancement layers", GF_PROP_UINT),
+	DEC_PROP( GF_PROP_PID_ZORDER, "ZOrder", "Z-order of the video, from 0 (first) to max int (last)", GF_PROP_SINT),
+	DEC_PROP( GF_PROP_PID_TRANS_X, "TransX", "Horizontal translation of the video (positive towards right)", GF_PROP_SINT),
+	DEC_PROP( GF_PROP_PID_TRANS_Y, "TransY", "Vertical translation of the video (positive towards up)", GF_PROP_SINT),
+	DEC_PROP( GF_PROP_PID_TRANS_X_INV, "TransXRight", "Horizontal offset of the video from right (positive towards right), for cases where reference width is unknown", GF_PROP_SINT),
+	DEC_PROP( GF_PROP_PID_TRANS_Y_INV, "TransYTop", "Vertical translation of the video (0 is top, positive towards down), for cases where reference height is unknown", GF_PROP_SINT),
+	DEC_PROP( GF_PROP_PID_HIDDEN, "Hidden", "PID is hidden in visual/audio rendering", GF_PROP_BOOL),
+
+	DEC_PROP( GF_PROP_PID_CROP_POS, "CropOrigin", "Position in source window, X,Y indicate coordinates in source (0,0 for top-left)", GF_PROP_VEC2I),
+	DEC_PROP( GF_PROP_PID_ORIG_SIZE, "OriginalSize", "Original resolution of video", GF_PROP_VEC2I),
+	DEC_PROP( GF_PROP_PID_SRD, "SRD", "Position and size of the video in the referential given by SRDRef", GF_PROP_VEC4I),
+	DEC_PROP( GF_PROP_PID_SRD_REF, "SRDRef", "Width and Height of the SRD referential", GF_PROP_VEC2I),
+	DEC_PROP( GF_PROP_PID_SRD_MAP, "SRDMap", "Mapping of input videos in reconstructed video, expressed as {Ox,Oy,Ow,Oh,Dx,Dy,Dw,Dh} per input, with:\n"
 	"- Ox,Oy,Ow,Oh: position and size of the input video (usually matching its `SRD` property), expressed in the output referential given by `SRDRef`\n"
-	"- Dx,Dy,Dw,Dh: Position and Size of the input video in the reconstructed output, expressed in the output referential given by `SRDRef`", GF_PROP_UINT_LIST},
-
-	{ GF_PROP_PID_ALPHA, "Alpha", "Video in this PID is an alpha map", GF_PROP_BOOL},
-	{ GF_PROP_PID_MIRROR, "Mirror", "Mirror mode (as bit mask with flags 0: no mirror, 1: along Y-axis, 2: along X-axis)", GF_PROP_UINT},
-	{ GF_PROP_PID_ROTATE, "Rotate", "Video rotation as value*90 degree anti-clockwise", GF_PROP_UINT},
-	{ GF_PROP_PID_CLAP_W, "ClapW", "Width of clean aperture in luma pixels", GF_PROP_FRACTION},
-	{ GF_PROP_PID_CLAP_H, "ClapH", "Height of clean aperture in luma pixels", GF_PROP_FRACTION},
-	{ GF_PROP_PID_CLAP_X, "ClapX", "Horizontal offset of clean aperture center in luma pixels, 0 at image center", GF_PROP_FRACTION},
-	{ GF_PROP_PID_CLAP_Y, "ClapY", "Vertical offset of clean aperture center in luma pixels, 0 at image center", GF_PROP_FRACTION},
-	{ GF_PROP_PID_NUM_VIEWS, "NumViews", "Number of views packed in a frame (top-to-bottom only)", GF_PROP_UINT},
-	{ GF_PROP_PID_BITRATE, "Bitrate", "Bitrate in bps", GF_PROP_UINT},
-	{ GF_PROP_PID_MAXRATE, "Maxrate", "Max bitrate in bps", GF_PROP_UINT},
-	{ GF_PROP_PID_TARGET_RATE, "TargetRate", "Target bitrate in bps, used to setup encoders", GF_PROP_UINT},
-	{ GF_PROP_PID_DBSIZE, "DBSize", "Decode buffer size in bytes", GF_PROP_UINT},
-	{ GF_PROP_PID_MEDIA_DATA_SIZE, "MediaDataSize", "Size in bytes of media data", GF_PROP_LUINT, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PID_CAN_DATAREF, "DataRef", "Data referencing is possible (each compressed frame is a continuous set of bytes in source, with no transformation)", GF_PROP_BOOL, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PID_URL, "URL", "URL of source", GF_PROP_STRING, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PID_REMOTE_URL, "RemoteURL", "Remote URL of source - used for MPEG-4 systems", GF_PROP_STRING, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PID_REDIRECT_URL, "RedirectURL", "Redirection URL of source", GF_PROP_STRING, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PID_FILEPATH, "SourcePath", "Path of source file on file system", GF_PROP_STRING, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PID_MIME, "MIMEType", "MIME type of source", GF_PROP_STRING, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PID_FILE_EXT, "Extension", "File extension of source", GF_PROP_STRING, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PID_FILE_CACHED, "Cached", "File is completely cached", GF_PROP_BOOL, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PID_DOWN_RATE, "DownloadRate", "Download rate of resource in bits per second - changes are signaled through PID info (no reconfigure)", GF_PROP_UINT, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PID_DOWN_SIZE, "DownloadSize", "Size of resource in bytes", GF_PROP_LUINT, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PID_DOWN_BYTES, "DownBytes", "Number of bytes downloaded - changes are signaled through PID info (no reconfigure)", GF_PROP_LUINT, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PID_FILE_RANGE, "ByteRange", "Byte range of resource", GF_PROP_FRACTION64, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PID_DISABLE_PROGRESSIVE, "DisableProgressive", "Some blocks in file need patching (replace or insertion) upon closing, potentially disabling progressive upload", GF_PROP_UINT, 0},
-	{ GF_PROP_PID_ISOM_BRANDS, "IsoAltBrands", "ISOBMFF brands associated with PID/file", GF_PROP_4CC_LIST, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PID_ISOM_MBRAND, "IsoBrand", "ISOBMFF major brand associated with PID/file", GF_PROP_4CC, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PID_ISOM_MOVIE_TIME, "MovieTime", "ISOBMFF movie header duration and timescale", GF_PROP_FRACTION64, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PID_HAS_SYNC, "HasSync", "PID has sync points", GF_PROP_BOOL, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_SERVICE_WIDTH, "ServiceWidth", "Display width of service", GF_PROP_UINT, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_SERVICE_HEIGHT, "ServiceHeight", "Display height of service", GF_PROP_UINT, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PID_CAROUSEL_RATE, "CarouselRate", "Repeat rate in ms for systems carousel data", GF_PROP_UINT, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PID_AUDIO_VOLUME, "AudioVolume", "Volume of audio", GF_PROP_UINT, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PID_AUDIO_PAN, "AudioPan", "Balance/Pan of audio", GF_PROP_UINT, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PID_AUDIO_PRIORITY, "AudioPriority", "Audio thread priority", GF_PROP_UINT, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PID_PROTECTION_SCHEME_TYPE, "ProtectionScheme", "Protection scheme type (4CC) used", GF_PROP_4CC},
-	{ GF_PROP_PID_PROTECTION_SCHEME_VERSION, "SchemeVersion", "Protection scheme version used", GF_PROP_UINT},
-	{ GF_PROP_PID_PROTECTION_SCHEME_URI, "SchemeURI", "Protection scheme URI", GF_PROP_STRING},
-	{ GF_PROP_PID_PROTECTION_KMS_URI, "KMS_URI", "URI for key management system", GF_PROP_STRING},
-	{ GF_PROP_PID_ISMA_SELECTIVE_ENC, "SelectiveEncryption", "ISMA/OMA selective encryption is used", GF_PROP_BOOL},
-	{ GF_PROP_PID_ISMA_IV_LENGTH, "IVLength", "ISMA IV size", GF_PROP_UINT},
-	{ GF_PROP_PID_ISMA_KI_LENGTH, "KILength", "ISMA KeyIndication size", GF_PROP_UINT},
-	{ GF_PROP_PID_OMA_CRYPT_TYPE, "CryptType", "OMA encryption type", GF_PROP_UINT},
-	{ GF_PROP_PID_OMA_CID, "ContentID", "OMA Content ID", GF_PROP_STRING},
-	{ GF_PROP_PID_OMA_TXT_HDR, "TextualHeaders", "OMA textual headers", GF_PROP_STRING},
-	{ GF_PROP_PID_OMA_CLEAR_LEN, "PlaintextLen", "OMA size of plaintext data", GF_PROP_LUINT},
-	{ GF_PROP_PID_CRYPT_INFO, "CryptInfo", "URL (local file only) of crypt info file for this PID, use `clear` to force passthrough", GF_PROP_STRING, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PID_DECRYPT_INFO, "DecryptInfo", "URL (local file only) of crypt info file for this PID - see decrypter help", GF_PROP_STRING, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PCK_SENDER_NTP, "SenderNTP", "NTP 64 bits timestamp at sender side or grabber side", GF_PROP_LUINT, GF_PROP_FLAG_PCK | GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PCK_RECEIVER_NTP, "ReceiverNTP", "Receiver NTP (64 bits timestamp) usually associated with the sender NTP property", GF_PROP_LUINT, GF_PROP_FLAG_PCK | GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PCK_UTC_TIME, "UTC", "UTC timestamp (in milliseconds) of parent packet", GF_PROP_LUINT, GF_PROP_FLAG_PCK | GF_PROP_FLAG_GSF_REM},
-
-	{ GF_PROP_PID_ENCRYPTED, "Encrypted", "Packets for the stream are by default encrypted (however the encryption state is carried in packet crypt flags) - changes are signaled through PID info change (no reconfigure)", GF_PROP_BOOL},
-	{ GF_PROP_PID_OMA_PREVIEW_RANGE, "OMAPreview", "OMA Preview range ", GF_PROP_LUINT},
-	{ GF_PROP_PID_CENC_PSSH, "CENC_PSSH", "PSSH blob for CENC, formatted as (u32)NbSystems  (bin128)SystemID(u32)version(u32)KID_count (bin128)keyID  (u32)priv_size(char*priv_size)priv_data", GF_PROP_DATA},
-	{ GF_PROP_PCK_CENC_SAI, "CENC_SAI", "CENC SAI for the packet, formatted as (char(IV_Size))IV(u16)NbSubSamples (u16)ClearBytes(u32)CryptedBytes", GF_PROP_DATA, GF_PROP_FLAG_PCK},
-	{ GF_PROP_PID_CENC_KEY_INFO, "KeyInfo", "Multi key info formatted as:\n `is_mkey(u8);\nnb_keys(u16);\n\n\tIV_size(u8);\n\tKID(bin128);\n\tif (!IV_size) {;\n\t\tconst_IV_size(u8);\n\t\tconstIV(const_IV_size);\n}\n\n`", GF_PROP_DATA},
-	{ GF_PROP_PID_CENC_PATTERN, "CENCPattern", "CENC crypt pattern, CENC pattern, skip as frac.num crypt as frac.den", GF_PROP_FRACTION},
-	{ GF_PROP_PID_CENC_STORE, "CENCStore", "Storage location 4CC of SAI data", GF_PROP_4CC},
-	{ GF_PROP_PID_CENC_STSD_MODE, "CENCstsdMode", "Mode for CENC sample description when using clear samples:\n"
+	"- Dx,Dy,Dw,Dh: Position and Size of the input video in the reconstructed output, expressed in the output referential given by `SRDRef`", GF_PROP_UINT_LIST),
+
+	DEC_PROP( GF_PROP_PID_ALPHA, "Alpha", "Video in this PID is an alpha map", GF_PROP_BOOL),
+	DEC_PROP( GF_PROP_PID_MIRROR, "Mirror", "Mirror mode (as bit mask with flags 0: no mirror, 1: along Y-axis, 2: along X-axis)", GF_PROP_UINT),
+	DEC_PROP( GF_PROP_PID_ROTATE, "Rotate", "Video rotation as value*90 degree anti-clockwise", GF_PROP_UINT),
+	DEC_PROP( GF_PROP_PID_CLAP_W, "ClapW", "Width of clean aperture in luma pixels", GF_PROP_FRACTION),
+	DEC_PROP( GF_PROP_PID_CLAP_H, "ClapH", "Height of clean aperture in luma pixels", GF_PROP_FRACTION),
+	DEC_PROP( GF_PROP_PID_CLAP_X, "ClapX", "Horizontal offset of clean aperture center in luma pixels, 0 at image center", GF_PROP_FRACTION),
+	DEC_PROP( GF_PROP_PID_CLAP_Y, "ClapY", "Vertical offset of clean aperture center in luma pixels, 0 at image center", GF_PROP_FRACTION),
+	DEC_PROP( GF_PROP_PID_NUM_VIEWS, "NumViews", "Number of views packed in a frame (top-to-bottom only)", GF_PROP_UINT),
+	DEC_PROP( GF_PROP_PID_BITRATE, "Bitrate", "Bitrate in bps", GF_PROP_UINT),
+	DEC_PROP( GF_PROP_PID_MAXRATE, "Maxrate", "Max bitrate in bps", GF_PROP_UINT),
+	DEC_PROP( GF_PROP_PID_TARGET_RATE, "TargetRate", "Target bitrate in bps, used to setup encoders", GF_PROP_UINT),
+	DEC_PROP( GF_PROP_PID_DBSIZE, "DBSize", "Decode buffer size in bytes", GF_PROP_UINT),
+	DEC_PROP_F( GF_PROP_PID_MEDIA_DATA_SIZE, "MediaDataSize", "Size in bytes of media data", GF_PROP_LUINT, GF_PROP_FLAG_GSF_REM),
+	DEC_PROP_F( GF_PROP_PID_CAN_DATAREF, "DataRef", "Data referencing is possible (each compressed frame is a continuous set of bytes in source, with no transformation)", GF_PROP_BOOL, GF_PROP_FLAG_GSF_REM),
+	DEC_PROP_F( GF_PROP_PID_URL, "URL", "URL of source", GF_PROP_STRING, GF_PROP_FLAG_GSF_REM),
+	DEC_PROP_F( GF_PROP_PID_REMOTE_URL, "RemoteURL", "Remote URL of source - used for MPEG-4 systems", GF_PROP_STRING, GF_PROP_FLAG_GSF_REM),
+	DEC_PROP_F( GF_PROP_PID_REDIRECT_URL, "RedirectURL", "Redirection URL of source", GF_PROP_STRING, GF_PROP_FLAG_GSF_REM),
+	DEC_PROP_F( GF_PROP_PID_FILEPATH, "SourcePath", "Path of source file on file system", GF_PROP_STRING, GF_PROP_FLAG_GSF_REM),
+	DEC_PROP_F( GF_PROP_PID_MIME, "MIMEType", "MIME type of source", GF_PROP_STRING, GF_PROP_FLAG_GSF_REM),
+	DEC_PROP_F( GF_PROP_PID_FILE_EXT, "Extension", "File extension of source", GF_PROP_STRING, GF_PROP_FLAG_GSF_REM),
+	DEC_PROP_F( GF_PROP_PID_FILE_CACHED, "Cached", "File is completely cached", GF_PROP_BOOL, GF_PROP_FLAG_GSF_REM),
+	DEC_PROP_F( GF_PROP_PID_DOWN_RATE, "DownloadRate", "Download rate of resource in bits per second - changes are signaled through PID info (no reconfigure)", GF_PROP_UINT, GF_PROP_FLAG_GSF_REM),
+	DEC_PROP_F( GF_PROP_PID_DOWN_SIZE, "DownloadSize", "Size of resource in bytes", GF_PROP_LUINT, GF_PROP_FLAG_GSF_REM),
+	DEC_PROP_F( GF_PROP_PID_DOWN_BYTES, "DownBytes", "Number of bytes downloaded - changes are signaled through PID info (no reconfigure)", GF_PROP_LUINT, GF_PROP_FLAG_GSF_REM),
+	DEC_PROP_F( GF_PROP_PID_FILE_RANGE, "ByteRange", "Byte range of resource", GF_PROP_FRACTION64, GF_PROP_FLAG_GSF_REM),
+	DEC_PROP( GF_PROP_PID_DISABLE_PROGRESSIVE, "DisableProgressive", "Some blocks in file need patching (replace or insertion) upon closing, potentially disabling progressive upload", GF_PROP_UINT),
+	DEC_PROP_F( GF_PROP_PID_ISOM_BRANDS, "IsoAltBrands", "ISOBMFF brands associated with PID/file", GF_PROP_4CC_LIST, GF_PROP_FLAG_GSF_REM),
+	DEC_PROP_F( GF_PROP_PID_ISOM_MBRAND, "IsoBrand", "ISOBMFF major brand associated with PID/file", GF_PROP_4CC, GF_PROP_FLAG_GSF_REM),
+	DEC_PROP_F( GF_PROP_PID_ISOM_MOVIE_TIME, "MovieTime", "ISOBMFF movie header duration and timescale", GF_PROP_FRACTION64, GF_PROP_FLAG_GSF_REM),
+	DEC_PROP_F( GF_PROP_PID_HAS_SYNC, "HasSync", "PID has sync points", GF_PROP_BOOL, GF_PROP_FLAG_GSF_REM),
+	DEC_PROP_F( GF_PROP_SERVICE_WIDTH, "ServiceWidth", "Display width of service", GF_PROP_UINT, GF_PROP_FLAG_GSF_REM),
+	DEC_PROP_F( GF_PROP_SERVICE_HEIGHT, "ServiceHeight", "Display height of service", GF_PROP_UINT, GF_PROP_FLAG_GSF_REM),
+	DEC_PROP_F( GF_PROP_PID_IS_DEFAULT, "IsDefault", "Default PID for this stream type", GF_PROP_BOOL, GF_PROP_FLAG_GSF_REM),
+	DEC_PROP_F( GF_PROP_PID_CAROUSEL_RATE, "CarouselRate", "Repeat rate in ms for systems carousel data", GF_PROP_UINT, GF_PROP_FLAG_GSF_REM),
+	DEC_PROP_F( GF_PROP_PID_AUDIO_VOLUME, "AudioVolume", "Volume of audio", GF_PROP_UINT, GF_PROP_FLAG_GSF_REM),
+	DEC_PROP_F( GF_PROP_PID_AUDIO_PAN, "AudioPan", "Balance/Pan of audio", GF_PROP_UINT, GF_PROP_FLAG_GSF_REM),
+	DEC_PROP_F( GF_PROP_PID_AUDIO_PRIORITY, "AudioPriority", "Audio thread priority", GF_PROP_UINT, GF_PROP_FLAG_GSF_REM),
+	DEC_PROP( GF_PROP_PID_PROTECTION_SCHEME_TYPE, "ProtectionScheme", "Protection scheme type (4CC) used", GF_PROP_4CC),
+	DEC_PROP( GF_PROP_PID_PROTECTION_SCHEME_VERSION, "SchemeVersion", "Protection scheme version used", GF_PROP_UINT),
+	DEC_PROP( GF_PROP_PID_PROTECTION_SCHEME_URI, "SchemeURI", "Protection scheme URI", GF_PROP_STRING),
+	DEC_PROP( GF_PROP_PID_PROTECTION_KMS_URI, "KMS_URI", "URI for key management system", GF_PROP_STRING),
+	DEC_PROP( GF_PROP_PID_ISMA_SELECTIVE_ENC, "SelectiveEncryption", "ISMA/OMA selective encryption is used", GF_PROP_BOOL),
+	DEC_PROP( GF_PROP_PID_ISMA_IV_LENGTH, "IVLength", "ISMA IV size", GF_PROP_UINT),
+	DEC_PROP( GF_PROP_PID_ISMA_KI_LENGTH, "KILength", "ISMA KeyIndication size", GF_PROP_UINT),
+	DEC_PROP( GF_PROP_PID_OMA_CRYPT_TYPE, "CryptType", "OMA encryption type", GF_PROP_UINT),
+	DEC_PROP( GF_PROP_PID_OMA_CID, "ContentID", "OMA Content ID", GF_PROP_STRING),
+	DEC_PROP( GF_PROP_PID_OMA_TXT_HDR, "TextualHeaders", "OMA textual headers", GF_PROP_STRING),
+	DEC_PROP( GF_PROP_PID_OMA_CLEAR_LEN, "PlaintextLen", "OMA size of plaintext data", GF_PROP_LUINT),
+	DEC_PROP_F( GF_PROP_PID_CRYPT_INFO, "CryptInfo", "URL (local file only) of crypt info file for this PID, use `clear` to force passthrough", GF_PROP_STRING, GF_PROP_FLAG_GSF_REM),
+	DEC_PROP_F( GF_PROP_PID_DECRYPT_INFO, "DecryptInfo", "URL (local file only) of crypt info file for this PID - see decrypter help", GF_PROP_STRING, GF_PROP_FLAG_GSF_REM),
+	DEC_PROP_F( GF_PROP_PCK_SENDER_NTP, "SenderNTP", "NTP 64 bits timestamp at sender side or grabber side", GF_PROP_LUINT, GF_PROP_FLAG_PCK | GF_PROP_FLAG_GSF_REM),
+	DEC_PROP_F( GF_PROP_PCK_RECEIVER_NTP, "ReceiverNTP", "Receiver NTP (64 bits timestamp) usually associated with the sender NTP property", GF_PROP_LUINT, GF_PROP_FLAG_PCK | GF_PROP_FLAG_GSF_REM),
+	DEC_PROP_F( GF_PROP_PCK_UTC_TIME, "UTC", "UTC timestamp (in milliseconds) of parent packet", GF_PROP_LUINT, GF_PROP_FLAG_PCK | GF_PROP_FLAG_GSF_REM),
+
+	DEC_PROP( GF_PROP_PID_ENCRYPTED, "Encrypted", "Packets for the stream are by default encrypted (however the encryption state is carried in packet crypt flags) - changes are signaled through PID info change (no reconfigure)", GF_PROP_BOOL),
+	DEC_PROP( GF_PROP_PID_OMA_PREVIEW_RANGE, "OMAPreview", "OMA Preview range ", GF_PROP_LUINT),
+	DEC_PROP( GF_PROP_PID_CENC_PSSH, "CENC_PSSH", "PSSH blob for CENC, formatted as (u32)NbSystems  (bin128)SystemID(u32)version(u32)KID_count (bin128)keyID  (u32)priv_size(char*priv_size)priv_data", GF_PROP_DATA),
+	DEC_PROP_F( GF_PROP_PCK_CENC_SAI, "CENC_SAI", "CENC SAI for the packet, formatted as (char(IV_Size))IV(u16)NbSubSamples (u16)ClearBytes(u32)CryptedBytes", GF_PROP_DATA, GF_PROP_FLAG_PCK),
+	DEC_PROP( GF_PROP_PID_CENC_KEY_INFO, "KeyInfo", "Multi key info formatted as:\n `is_mkey(u8);\nnb_keys(u16);\n\n\tIV_size(u8);\n\tKID(bin128);\n\tif (!IV_size) {;\n\t\tconst_IV_size(u8);\n\t\tconstIV(const_IV_size);\n}\n\n`", GF_PROP_DATA),
+	DEC_PROP( GF_PROP_PID_CENC_PATTERN, "CENCPattern", "CENC crypt pattern, CENC pattern, skip as frac.num crypt as frac.den", GF_PROP_FRACTION),
+	DEC_PROP( GF_PROP_PID_CENC_STORE, "CENCStore", "Storage location 4CC of SAI data", GF_PROP_4CC),
+	DEC_PROP( GF_PROP_PID_CENC_STSD_MODE, "CENCstsdMode", "Mode for CENC sample description when using clear samples:\n"
 	"- 0: single sample description is used\n"
 	"- 1: a clear clone of the sample description is created, inserted before the CENC sample description\n"
-	"- 2: a clear clone of the sample description is created, inserted after the CENC sample description", GF_PROP_UINT},
-	{ GF_PROP_PID_AMR_MODE_SET, "AMRModeSet", "ModeSet for AMR and AMR-WideBand", GF_PROP_UINT},
-	{ GF_PROP_PCK_SUBS, "SubSampleInfo", "Binary blob describing N subsamples of the sample, formatted as N (u32)flags(u32)size(u32)codec_param(u8)priority(u8) discardable. Subsamples for a given flag MUST appear in order, however flags can be interleaved", GF_PROP_DATA},
-	{ GF_PROP_PID_MAX_NALU_SIZE, "NALUMaxSize", "Max size of NAL units in stream - changes are signaled through PID info change (no reconfigure)", GF_PROP_UINT},
-	{ GF_PROP_PCK_FILENUM, "FileNumber", "Index of file when dumping to files", GF_PROP_UINT, GF_PROP_FLAG_PCK},
-	{ GF_PROP_PCK_FILENAME, "FileName", "Name of output file when dumping / dashing. Must be set on first packet belonging to new file", GF_PROP_STRING, GF_PROP_FLAG_PCK},
-	{ GF_PROP_PCK_IDXFILENAME, "IDXName", "Name of index file when dashing MPEG-2 TS. Must be set on first packet belonging to new file", GF_PROP_STRING, GF_PROP_FLAG_PCK},
-	{ GF_PROP_PCK_FILESUF, "FileSuffix", "File suffix name, replacement for $FS$ in tile templates", GF_PROP_STRING, GF_PROP_FLAG_PCK},
-	{ GF_PROP_PCK_EODS, "EODS", "End of DASH segment", GF_PROP_BOOL, GF_PROP_FLAG_PCK},
-	{ GF_PROP_PCK_CUE_START, "CueStart", "Set on packets marking the beginning of a DASH/HLS segment for cue-driven segmentation - see dasher help", GF_PROP_BOOL, GF_PROP_FLAG_PCK},
-	{ GF_PROP_PCK_MEDIA_TIME, "MediaTime", "Corresponding media time of the parent packet (0 being the origin)", GF_PROP_DOUBLE, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PID_MAX_FRAME_SIZE, "MaxFrameSize", "Max size of frame in stream - changes are signaled through PID info change (no reconfigure)", GF_PROP_UINT, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PID_AVG_FRAME_SIZE, "AvgFrameSize", "Average size of frame in stream (ISOBMFF only, static property)", GF_PROP_UINT, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PID_MAX_TS_DELTA, "MaxTSDelta", "Maximum DTS delta between frames (ISOBMFF only, static property)", GF_PROP_UINT, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PID_MAX_CTS_OFFSET, "MaxCTSOffset", "Maximum absolute CTS offset (ISOBMFF only, static property)", GF_PROP_UINT, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PID_CONSTANT_DURATION, "ConstantDuration", "Constant duration of samples, 0 means variable duration (ISOBMFF only, static property)", GF_PROP_UINT, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PID_ISOM_TRACK_TEMPLATE, "TrackTemplate", "ISOBMFF serialized track box for this PID, without any sample info (empty stbl and empty dref)", GF_PROP_DATA, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PID_ISOM_TREX_TEMPLATE, "TrexTemplate", "ISOBMFF serialized trex box for this PID", GF_PROP_DATA, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PID_ISOM_STSD_TEMPLATE, "STSDTemplate", "ISOBMFF serialized sample description box (stsd entry) for this PID", GF_PROP_DATA, GF_PROP_FLAG_GSF_REM},
-
-	{ GF_PROP_PID_ISOM_UDTA, "MovieUserData", "ISOBMFF serialized moov UDTA and other moov-level boxes (list) for this PID", GF_PROP_DATA, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PID_ISOM_HANDLER, "HandlerName", "ISOBMFF track handler name", GF_PROP_STRING, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PID_ISOM_TRACK_FLAGS, "TrackFlags", "ISOBMFF track header flags", GF_PROP_UINT, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PID_ISOM_TRACK_MATRIX, "TrackMatrix", "ISOBMFF track header matrix", GF_PROP_SINT_LIST, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PID_ISOM_ALT_GROUP, "AltGroup", "ISOBMFF alt group ID", GF_PROP_UINT, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PID_ISOM_FORCE_NEGCTTS, "ForceNCTTS", "ISOBMFF force negative CTS offsets", GF_PROP_BOOL, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PID_DISABLED, "Disable", "ISOBMFF disable flag", GF_PROP_BOOL, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PID_PERIOD_ID, "Period", "ID of DASH period", GF_PROP_STRING, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PID_PERIOD_START, "PStart", "DASH Period start - cf dasher help", GF_PROP_FRACTION64, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PID_PERIOD_DUR, "PDur", "DASH Period duration - cf dasher help", GF_PROP_FRACTION64, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PID_REP_ID, "Representation", "ID of DASH representation", GF_PROP_STRING, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PID_AS_ID, "ASID", "ID of parent DASH AS", GF_PROP_UINT, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PID_MUX_SRC, "MuxSrc", "Name of mux source(s), set by dasher to direct its outputs", GF_PROP_STRING, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PID_DASH_MODE, "DashMode", "DASH mode to be used by multiplexer if any, set by dasher. 0 is no DASH, 1 is regular DASH, 2 is VoD", GF_PROP_UINT, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PID_FORCE_SEG_SYNC, "SegSync", "Indicate segment must be completely flushed before sending segment/fragment size events", GF_PROP_BOOL, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PID_DASH_DUR, "DashDur", "DASH target segment duration in seconds", GF_PROP_FRACTION, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PID_DASH_MULTI_PID, NULL, "Pointer to the GF_List of input PIDs for multi-stsd entries segments, set by dasher", GF_PROP_POINTER, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PID_DASH_MULTI_PID_IDX, NULL, "1-based index of PID in the multi PID list, set by dasher", GF_PROP_UINT, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PID_DASH_MULTI_TRACK, NULL, "Pointer to the GF_List of input PIDs for multi-tracks segments, set by dasher", GF_PROP_POINTER, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PID_ROLE, "Role", "List of roles for this PID, where each role string can be a DASH role, a `URN:role-value` or any other string (this will throw a warning and use a custom URI for the role)", GF_PROP_STRING_LIST, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PID_PERIOD_DESC, "PDesc", "List of descriptors for the DASH period containing this PID", GF_PROP_STRING_LIST, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PID_AS_COND_DESC, "ASDesc", "List of conditional descriptors for the DASH AdaptationSet containing this PID. If a PID with the same property type but different value is found, the PIDs will be in different AdaptationSets", GF_PROP_STRING_LIST, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PID_AS_ANY_DESC, "ASCDesc", "List of common descriptors for the DASH AdaptationSet containing this PID", GF_PROP_STRING_LIST, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PID_REP_DESC, "RDesc", "List of descriptors for the DASH Representation containing this PID", GF_PROP_STRING_LIST, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PID_BASE_URL, "BUrl", "List of base URLs for this PID", GF_PROP_STRING_LIST, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PID_TEMPLATE, "Template", "Template to use for DASH generation for this PID", GF_PROP_STRING, 0},
-	{ GF_PROP_PID_START_NUMBER, "StartNumber", "Start number to use for this PID - cf dasher help", GF_PROP_UINT, 0},
-	{ GF_PROP_PID_XLINK, "xlink", "Remote period URL for DASH - cf dasher help", GF_PROP_STRING, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PID_CLAMP_DUR, "ClampDur", "Max media duration to process from PID in DASH mode", GF_PROP_FRACTION64, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PID_HLS_PLAYLIST, "HLSPL", "Name of the HLS variant playlist for this media", GF_PROP_STRING, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PID_HLS_GROUPID, "HLSGroup", "Name of HLS Group of a stream", GF_PROP_STRING, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PID_HLS_EXT_MASTER, "HLSMExt", "List of extensions to add to the master playlist for this PID", GF_PROP_STRING_LIST, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PID_HLS_EXT_VARIANT, "HLSVExt", "List of extensions to add to the variant playlist for this PID", GF_PROP_STRING_LIST, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PID_DASH_CUE, "DCue", "Name of a cue list file for this PID - see dasher help", GF_PROP_STRING, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PID_DASH_SEGMENTS, "DSegs", "Number of DASH segments defined by the DASH cue info", GF_PROP_UINT, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PID_CODEC, "Codec", "codec parameter string to force. If starting with '.', appended to ISOBMFF code point; otherwise replace the codec string", GF_PROP_STRING, GF_PROP_FLAG_GSF_REM},
-
-	{ GF_PROP_PID_SINGLE_SCALE, "SingleScale", "Movie header should use the media timescale of the first track added", GF_PROP_BOOL, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PID_UDP, "RequireReorder", "PID packets come from source with losses and reordering happening (UDP)", GF_PROP_BOOL, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PID_PRIMARY_ITEM, "Primary", "Primary item in ISOBMFF", GF_PROP_BOOL, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PID_DASH_FWD, "DFMode", "DASH forward mode is used for this PID. If 2, the manifest is also carried in packet propery", GF_PROP_UINT, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PCK_DASH_MANIFEST, "DFManifest", "Value of manifest in forward mode", GF_PROP_STRING, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PCK_HLS_VARIANT, "DFVariant", "Value of variant playlist in forward mode", GF_PROP_STRING_LIST, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PCK_HLS_VARIANT_NAME, "DFVariantName", "Value of variant playlist name in forward mode", GF_PROP_STRING_LIST, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PID_DASH_PERIOD_START, "DFPStart", "Value of active period start time in forward mode", GF_PROP_LUINT, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PID_HLS_KMS, "HLSKey", "URI, KEYFORMAT and KEYFORMATVERSIONS for HLS full segment encryption creation, Key URI otherwise ( decoding and sample-AES)", GF_PROP_STRING},
-	{ GF_PROP_PID_HLS_IV, "HLSIV", "Init Vector for HLS decode", GF_PROP_DATA},
-	{ GF_PROP_PID_CLEARKEY_URI, "CKUrl", "URL for ClearKey licence server", GF_PROP_STRING},
-
-	{ GF_PROP_PID_COLR_PRIMARIES, "ColorPrimaries", "Color primaries", GF_PROP_CICP_COL_PRIM, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PID_COLR_TRANSFER, "ColorTransfer", "Color transfer characteristics", GF_PROP_CICP_COL_TFC, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PID_COLR_MX, "ColorMatrix", "Color matrix coefficient", GF_PROP_CICP_COL_MX, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PID_COLR_RANGE, "FullRange", "Color full range flag", GF_PROP_BOOL, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PID_COLR_CHROMAFMT, "Chroma", "Chroma format (see ISO/IEC 23001-8 / 23091-2)", GF_PROP_UINT, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PID_COLR_CHROMALOC, "ChromaLoc", "Chroma location (see ISO/IEC 23001-8 / 23091-2)", GF_PROP_UINT, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PID_CONTENT_LIGHT_LEVEL, "ContentLightLevel", "Content light level, payload of clli box (see ISO/IEC 14496-12), can be set as a list of 2 integers in fragment declaration (e.g. \"=max_cll,max_pic_avg_ll\")", GF_PROP_DATA, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PID_MASTER_DISPLAY_COLOUR, "MasterDisplayColour", "Master display colour info, payload of mdcv box (see ISO/IEC 14496-12), can be set as a list of 10 integers in fragment declaration (e.g. \"=dpx0,dpy0,dpx1,dpy1,dpx2,dpy2,wpx,wpy,max,min\")", GF_PROP_DATA, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PID_ICC_PROFILE, "ICC", "ICC profile (see ISO 15076-1 or ICC.1)", GF_PROP_DATA, GF_PROP_FLAG_GSF_REM},
-
-	{ GF_PROP_PID_SRC_MAGIC, "SrcMagic", "Magic number to store in the track, only used by importers", GF_PROP_LUINT, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PID_MUX_INDEX, "MuxIndex", "Target track index in destination file, stored by lowest value first (not set by demultiplexers)", GF_PROP_LUINT, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_NO_TS_LOOP, "NoTSLoop", "Timestamps on this PID are adjusted in case of loops (used by TS multiplexer output)", GF_PROP_BOOL, 0},
-	{ GF_PROP_PID_MHA_COMPATIBLE_PROFILES, "MHAProfiles", "List of compatible profiles for this MPEG-H Audio object", GF_PROP_UINT_LIST, GF_PROP_FLAG_GSF_REM},
-
-	{ GF_PROP_PCK_FRAG_START, "FragStart", "Packet is a fragment start (value 1) or a segment start (value 2)", GF_PROP_UINT, GF_PROP_FLAG_PCK|GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PCK_FRAG_RANGE, "FragRange", "Start and end position in bytes of fragment if packet is a fragment or segment start", GF_PROP_FRACTION64, GF_PROP_FLAG_PCK|GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PCK_SIDX_RANGE, "SIDXRange", "Start and end position in bytes of sidx if packet is a fragment or segment start", GF_PROP_FRACTION64, GF_PROP_FLAG_PCK|GF_PROP_FLAG_GSF_REM},
-
-	{ GF_PROP_PCK_MOOF_TEMPLATE, "MoofTemplate", "Serialized moof box corresponding to the start of a movie fragment or segment (with styp and optionally sidx)", GF_PROP_DATA, GF_PROP_FLAG_PCK|GF_PROP_FLAG_GSF_REM},
-
-	{ GF_PROP_PCK_INIT, "InitSeg", "Set to true if packet is a complete DASH init segment file", GF_PROP_BOOL, GF_PROP_FLAG_PCK},
-
-	{ GF_PROP_PID_RAWGRAB, "RawGrab", "PID is a raw media grabber (webcam, microphone, etc...). Value 2 is used for front camera", GF_PROP_UINT, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PID_KEEP_AFTER_EOS, "KeepAfterEOS", "PID must be kept alive after EOS (LASeR and BIFS)", GF_PROP_BOOL, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PID_COVER_ART, "CoverArt", "PID cover art image data. If associated data is NULL, the data is carried in the PID", GF_PROP_DATA, GF_PROP_FLAG_GSF_REM},
-
-	{ GF_PROP_PID_PLAY_BUFFER, "BufferLength", "Playout buffer in ms", GF_PROP_UINT, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PID_MAX_BUFFER, "MaxBuffer", "Maximum buffer occupancy in ms", GF_PROP_UINT, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PID_RE_BUFFER, "ReBuffer", "Rebuffer threshold in ms, 0 disable rebuffering", GF_PROP_UINT, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PID_VIEW_IDX, "ViewIdx", "View index for multiview (1 being left)", GF_PROP_UINT, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PID_ORIG_FRAG_URL, "FragURL", "Fragment URL (without '#') of original URL (used by some filters to set the property on media PIDs)", GF_PROP_STRING, GF_PROP_FLAG_GSF_REM},
-
-	{ GF_PROP_PID_ROUTE_IP, "ROUTEIP", "ROUTE session IP address", GF_PROP_STRING, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PID_ROUTE_PORT, "ROUTEPort", "ROUTE session port number", GF_PROP_UINT, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PID_ROUTE_NAME, "ROUTEName", "Name (location) of raw file to advertise in ROUTE session", GF_PROP_STRING, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PID_ROUTE_CAROUSEL, "ROUTECarousel", "Carousel period in seconds of raw file in ROUTE session", GF_PROP_FRACTION, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PID_ROUTE_SENDTIME, "ROUTEUpload", "Upload time in seconds of raw file in ROUTE session", GF_PROP_FRACTION, GF_PROP_FLAG_GSF_REM},
-
-	{ GF_PROP_PID_STEREO_TYPE, "Stereo", "Stereo type of video", GF_PROP_UINT, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PID_PROJECTION_TYPE, "Projection", "Projection type of video", GF_PROP_UINT, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PID_VR_POSE, "InitalPose", "Initial pose for 360 video, in degrees expressed as 16.16 bits (x is yaw, y is pitch, z is roll)", GF_PROP_VEC3I, GF_PROP_FLAG_GSF_REM},
-
-	{ GF_PROP_PID_CUBE_MAP_PAD, "CMPad", "Number of pixels to pad from edge of each face in cube map", GF_PROP_UINT, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PID_EQR_CLAMP, "EQRClamp", "Clamping of frame for EQR as 0.32 fixed point (x is top, y is bottom, z is left and w is right)", GF_PROP_VEC4I, GF_PROP_FLAG_GSF_REM},
-
-	{ GF_PROP_PID_SCENE_NODE, "SceneNode", "PID is a scene node decoder (AFX BitWrapper in BIFS)", GF_PROP_BOOL, 0},
-	{ GF_PROP_PID_ORIG_CRYPT_SCHEME, "OrigCryptoScheme", "Original crypto scheme on a decrypted PID", GF_PROP_4CC, 0},
-	{ GF_PROP_PID_TIMESHIFT_SEGS, "TSBSegs", "Time shift in number of segments for HAS streams, only set by dashin and dasher filters", GF_PROP_UINT, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PID_IS_MANIFEST, "IsManifest", "PID is a HAS manifest", GF_PROP_BOOL, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PID_SPARSE, "Sparse", "PID has potentially empty times between packets", GF_PROP_BOOL, GF_PROP_FLAG_GSF_REM},
-
-	{ GF_PROP_PID_CHAP_TIMES, "ChapTimes", "Chapter start times", GF_PROP_UINT_LIST, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PID_CHAP_NAMES, "ChapNames", "Chapter names", GF_PROP_STRING_LIST, GF_PROP_FLAG_GSF_REM},
-
-	{ GF_PROP_PCK_SKIP_BEGIN, "SkipBegin", "Amount of media to skip from beginning of packet in PID timescale", GF_PROP_UINT, GF_PROP_FLAG_PCK},
-	{ GF_PROP_PCK_SKIP_PRES, "SkipPres", "Packet and any following with CTS greater than this packet shall not be presented (used by reframer to create edit lists)", GF_PROP_BOOL, GF_PROP_FLAG_PCK},
-
-	{ GF_PROP_PCK_HLS_REF, "HLSRef", "HLS playlist reference, gives a unique ID identifying media mux, and indicated in packets carrying child playlists", GF_PROP_LUINT, GF_PROP_FLAG_PCK|GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PID_LLHLS, "LLHLS", "HLS low latency mode", GF_PROP_UINT, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PCK_HLS_FRAG_NUM, "LLHLSFragNum", "LLHLS fragment number", GF_PROP_UINT, GF_PROP_FLAG_PCK},
-	{ GF_PROP_PID_DOWNLOAD_SESSION, "DownloadSession", "Pointer to download session", GF_PROP_POINTER, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PID_HAS_TEMI, "HasTemi", "TEMI present flag", GF_PROP_BOOL, GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PCK_XPS_MASK, "XPSMask", "Parameter set mask", GF_PROP_UINT, GF_PROP_FLAG_PCK|GF_PROP_FLAG_GSF_REM},
-	{ GF_PROP_PCK_END_RANGE, "RangeEnd", "Signal packet is the last in the desired play range", GF_PROP_BOOL, GF_PROP_FLAG_PCK},
+	"- 2: a clear clone of the sample description is created, inserted after the CENC sample description", GF_PROP_UINT),
+	DEC_PROP( GF_PROP_PID_AMR_MODE_SET, "AMRModeSet", "ModeSet for AMR and AMR-WideBand", GF_PROP_UINT),
+	DEC_PROP( GF_PROP_PCK_SUBS, "SubSampleInfo", "Binary blob describing N subsamples of the sample, formatted as N (u32)flags(u32)size(u32)codec_param(u8)priority(u8) discardable. Subsamples for a given flag MUST appear in order, however flags can be interleaved", GF_PROP_DATA),
+	DEC_PROP( GF_PROP_PID_MAX_NALU_SIZE, "NALUMaxSize", "Max size of NAL units in stream - changes are signaled through PID info change (no reconfigure)", GF_PROP_UINT),
+	DEC_PROP_F( GF_PROP_PCK_FILENUM, "FileNumber", "Index of file when dumping to files", GF_PROP_UINT, GF_PROP_FLAG_PCK),
+	DEC_PROP_F( GF_PROP_PCK_FILENAME, "FileName", "Name of output file when dumping / dashing. Must be set on first packet belonging to new file", GF_PROP_STRING, GF_PROP_FLAG_PCK),
+	DEC_PROP_F( GF_PROP_PCK_IDXFILENAME, "IDXName", "Name of index file when dashing MPEG-2 TS. Must be set on first packet belonging to new file", GF_PROP_STRING, GF_PROP_FLAG_PCK),
+	DEC_PROP_F( GF_PROP_PCK_FILESUF, "FileSuffix", "File suffix name, replacement for $FS$ in tile templates", GF_PROP_STRING, GF_PROP_FLAG_PCK),
+	DEC_PROP_F( GF_PROP_PCK_EODS, "EODS", "End of DASH segment", GF_PROP_BOOL, GF_PROP_FLAG_PCK),
+	DEC_PROP_F( GF_PROP_PCK_CUE_START, "CueStart", "Set on packets marking the beginning of a DASH/HLS segment for cue-driven segmentation - see dasher help", GF_PROP_BOOL, GF_PROP_FLAG_PCK),
+	DEC_PROP_F( GF_PROP_PCK_MEDIA_TIME, "MediaTime", "Corresponding media time of the parent packet (0 being the origin)", GF_PROP_DOUBLE, GF_PROP_FLAG_GSF_REM),
+	DEC_PROP_F( GF_PROP_PID_MAX_FRAME_SIZE, "MaxFrameSize", "Max size of frame in stream - changes are signaled through PID info change (no reconfigure)", GF_PROP_UINT, GF_PROP_FLAG_GSF_REM),
+	DEC_PROP_F( GF_PROP_PID_AVG_FRAME_SIZE, "AvgFrameSize", "Average size of frame in stream (ISOBMFF only, static property)", GF_PROP_UINT, GF_PROP_FLAG_GSF_REM),
+	DEC_PROP_F( GF_PROP_PID_MAX_TS_DELTA, "MaxTSDelta", "Maximum DTS delta between frames (ISOBMFF only, static property)", GF_PROP_UINT, GF_PROP_FLAG_GSF_REM),
+	DEC_PROP_F( GF_PROP_PID_MAX_CTS_OFFSET, "MaxCTSOffset", "Maximum absolute CTS offset (ISOBMFF only, static property)", GF_PROP_UINT, GF_PROP_FLAG_GSF_REM),
+	DEC_PROP_F( GF_PROP_PID_CONSTANT_DURATION, "ConstantDuration", "Constant duration of samples, 0 means variable duration (ISOBMFF only, static property)", GF_PROP_UINT, GF_PROP_FLAG_GSF_REM),
+	DEC_PROP_F( GF_PROP_PID_ISOM_TRACK_TEMPLATE, "TrackTemplate", "ISOBMFF serialized track box for this PID, without any sample info (empty stbl and empty dref)", GF_PROP_DATA, GF_PROP_FLAG_GSF_REM),
+	DEC_PROP_F( GF_PROP_PID_ISOM_TREX_TEMPLATE, "TrexTemplate", "ISOBMFF serialized trex box for this PID", GF_PROP_DATA, GF_PROP_FLAG_GSF_REM),
+	DEC_PROP_F( GF_PROP_PID_ISOM_STSD_TEMPLATE, "STSDTemplate", "ISOBMFF serialized sample description box (stsd entry) for this PID", GF_PROP_DATA, GF_PROP_FLAG_GSF_REM),
+
+	DEC_PROP_F( GF_PROP_PID_ISOM_UDTA, "MovieUserData", "ISOBMFF serialized moov UDTA and other moov-level boxes (list) for this PID", GF_PROP_DATA, GF_PROP_FLAG_GSF_REM),
+	DEC_PROP_F( GF_PROP_PID_ISOM_HANDLER, "HandlerName", "ISOBMFF track handler name", GF_PROP_STRING, GF_PROP_FLAG_GSF_REM),
+	DEC_PROP_F( GF_PROP_PID_ISOM_TRACK_FLAGS, "TrackFlags", "ISOBMFF track header flags", GF_PROP_UINT, GF_PROP_FLAG_GSF_REM),
+	DEC_PROP_F( GF_PROP_PID_ISOM_TRACK_MATRIX, "TrackMatrix", "ISOBMFF track header matrix", GF_PROP_SINT_LIST, GF_PROP_FLAG_GSF_REM),
+	DEC_PROP_F( GF_PROP_PID_ISOM_ALT_GROUP, "AltGroup", "ISOBMFF alt group ID", GF_PROP_UINT, GF_PROP_FLAG_GSF_REM),
+	DEC_PROP_F( GF_PROP_PID_ISOM_FORCE_NEGCTTS, "ForceNCTTS", "ISOBMFF force negative CTS offsets", GF_PROP_BOOL, GF_PROP_FLAG_GSF_REM),
+	DEC_PROP_F( GF_PROP_PID_DISABLED, "Disable", "ISOBMFF disable flag", GF_PROP_BOOL, GF_PROP_FLAG_GSF_REM),
+	DEC_PROP_F( GF_PROP_PID_PERIOD_ID, "Period", "ID of DASH period", GF_PROP_STRING, GF_PROP_FLAG_GSF_REM),
+	DEC_PROP_F( GF_PROP_PID_PERIOD_START, "PStart", "DASH Period start - cf dasher help", GF_PROP_FRACTION64, GF_PROP_FLAG_GSF_REM),
+	DEC_PROP_F( GF_PROP_PID_PERIOD_DUR, "PDur", "DASH Period duration - cf dasher help", GF_PROP_FRACTION64, GF_PROP_FLAG_GSF_REM),
+	DEC_PROP_F( GF_PROP_PID_REP_ID, "Representation", "ID of DASH representation", GF_PROP_STRING, GF_PROP_FLAG_GSF_REM),
+	DEC_PROP_F( GF_PROP_PID_AS_ID, "ASID", "ID of parent DASH AS", GF_PROP_UINT, GF_PROP_FLAG_GSF_REM),
+	DEC_PROP_F( GF_PROP_PID_MUX_SRC, "MuxSrc", "Name of mux source(s), set by dasher to direct its outputs", GF_PROP_STRING, GF_PROP_FLAG_GSF_REM),
+	DEC_PROP_F( GF_PROP_PID_DASH_MODE, "DashMode", "DASH mode to be used by multiplexer if any, set by dasher. 0 is no DASH, 1 is regular DASH, 2 is VoD", GF_PROP_UINT, GF_PROP_FLAG_GSF_REM),
+	DEC_PROP_F( GF_PROP_PID_FORCE_SEG_SYNC, "SegSync", "Indicate segment must be completely flushed before sending segment/fragment size events", GF_PROP_BOOL, GF_PROP_FLAG_GSF_REM),
+	DEC_PROP_F( GF_PROP_PID_DASH_DUR, "DashDur", "DASH target segment duration in seconds", GF_PROP_FRACTION, GF_PROP_FLAG_GSF_REM),
+	DEC_PROP_F( GF_PROP_PID_DASH_MULTI_PID, NULL, "Pointer to the GF_List of input PIDs for multi-stsd entries segments, set by dasher", GF_PROP_POINTER, GF_PROP_FLAG_GSF_REM),
+	DEC_PROP_F( GF_PROP_PID_DASH_MULTI_PID_IDX, NULL, "1-based index of PID in the multi PID list, set by dasher", GF_PROP_UINT, GF_PROP_FLAG_GSF_REM),
+	DEC_PROP_F( GF_PROP_PID_DASH_MULTI_TRACK, NULL, "Pointer to the GF_List of input PIDs for multi-tracks segments, set by dasher", GF_PROP_POINTER, GF_PROP_FLAG_GSF_REM),
+	DEC_PROP_F( GF_PROP_PID_ROLE, "Role", "List of roles for this PID, where each role string can be a DASH role, a `URN:role-value` or any other string (this will throw a warning and use a custom URI for the role)", GF_PROP_STRING_LIST, GF_PROP_FLAG_GSF_REM),
+	DEC_PROP_F( GF_PROP_PID_PERIOD_DESC, "PDesc", "List of descriptors for the DASH period containing this PID", GF_PROP_STRING_LIST, GF_PROP_FLAG_GSF_REM),
+	DEC_PROP_F( GF_PROP_PID_AS_COND_DESC, "ASDesc", "List of conditional descriptors for the DASH AdaptationSet containing this PID. If a PID with the same property type but different value is found, the PIDs will be in different AdaptationSets", GF_PROP_STRING_LIST, GF_PROP_FLAG_GSF_REM),
+	DEC_PROP_F( GF_PROP_PID_AS_ANY_DESC, "ASCDesc", "List of common descriptors for the DASH AdaptationSet containing this PID", GF_PROP_STRING_LIST, GF_PROP_FLAG_GSF_REM),
+	DEC_PROP_F( GF_PROP_PID_REP_DESC, "RDesc", "List of descriptors for the DASH Representation containing this PID", GF_PROP_STRING_LIST, GF_PROP_FLAG_GSF_REM),
+	DEC_PROP_F( GF_PROP_PID_BASE_URL, "BUrl", "List of base URLs for this PID", GF_PROP_STRING_LIST, GF_PROP_FLAG_GSF_REM),
+	DEC_PROP( GF_PROP_PID_TEMPLATE, "Template", "Template to use for DASH generation for this PID", GF_PROP_STRING),
+	DEC_PROP( GF_PROP_PID_START_NUMBER, "StartNumber", "Start number to use for this PID - cf dasher help", GF_PROP_UINT),
+	DEC_PROP_F( GF_PROP_PID_XLINK, "xlink", "Remote period URL for DASH - cf dasher help", GF_PROP_STRING, GF_PROP_FLAG_GSF_REM),
+	DEC_PROP_F( GF_PROP_PID_CLAMP_DUR, "ClampDur", "Max media duration to process from PID in DASH mode", GF_PROP_FRACTION64, GF_PROP_FLAG_GSF_REM),
+	DEC_PROP_F( GF_PROP_PID_HLS_PLAYLIST, "HLSPL", "Name of the HLS variant playlist for this media", GF_PROP_STRING, GF_PROP_FLAG_GSF_REM),
+	DEC_PROP_F( GF_PROP_PID_HLS_GROUPID, "HLSGroup", "Name of HLS Group of a stream", GF_PROP_STRING, GF_PROP_FLAG_GSF_REM),
+	DEC_PROP_F( GF_PROP_PID_HLS_FORCE_INF, "HLSForce", "Force writing EXT-X-STREAM-INF if stream is in a rendition group, value is the name of associated groups (can be empty)", GF_PROP_STRING, GF_PROP_FLAG_GSF_REM),
+	DEC_PROP_F( GF_PROP_PID_HLS_EXT_MASTER, "HLSMExt", "List of extensions to add to the master playlist for this PID", GF_PROP_STRING_LIST, GF_PROP_FLAG_GSF_REM),
+	DEC_PROP_F( GF_PROP_PID_HLS_EXT_VARIANT, "HLSVExt", "List of extensions to add to the variant playlist for this PID", GF_PROP_STRING_LIST, GF_PROP_FLAG_GSF_REM),
+	DEC_PROP_F( GF_PROP_PID_DASH_CUE, "DCue", "Name of a cue list file for this PID - see dasher help", GF_PROP_STRING, GF_PROP_FLAG_GSF_REM),
+	DEC_PROP_F( GF_PROP_PID_DASH_SEGMENTS, "DSegs", "Number of DASH segments defined by the DASH cue info", GF_PROP_UINT, GF_PROP_FLAG_GSF_REM),
+	DEC_PROP_F( GF_PROP_PID_CODEC, "Codec", "codec parameter string to force. If starting with '.', appended to ISOBMFF code point; otherwise replace the codec string", GF_PROP_STRING, GF_PROP_FLAG_GSF_REM),
+
+	DEC_PROP_F( GF_PROP_PID_SINGLE_SCALE, "SingleScale", "Movie header should use the media timescale of the first track added", GF_PROP_BOOL, GF_PROP_FLAG_GSF_REM),
+	DEC_PROP_F( GF_PROP_PID_UDP, "RequireReorder", "PID packets come from source with losses and reordering happening (UDP)", GF_PROP_BOOL, GF_PROP_FLAG_GSF_REM),
+	DEC_PROP_F( GF_PROP_PID_PRIMARY_ITEM, "Primary", "Primary item in ISOBMFF", GF_PROP_BOOL, GF_PROP_FLAG_GSF_REM),
+	DEC_PROP_F( GF_PROP_PID_DASH_FWD, "DFMode", "DASH forward mode is used for this PID. If 2, the manifest is also carried in packet propery", GF_PROP_UINT, GF_PROP_FLAG_GSF_REM),
+	DEC_PROP_F( GF_PROP_PCK_DASH_MANIFEST, "DFManifest", "Value of manifest in forward mode", GF_PROP_STRING, GF_PROP_FLAG_GSF_REM),
+	DEC_PROP_F( GF_PROP_PCK_HLS_VARIANT, "DFVariant", "Value of variant playlist in forward mode", GF_PROP_STRING_LIST, GF_PROP_FLAG_GSF_REM),
+	DEC_PROP_F( GF_PROP_PCK_HLS_VARIANT_NAME, "DFVariantName", "Value of variant playlist name in forward mode", GF_PROP_STRING_LIST, GF_PROP_FLAG_GSF_REM),
+	DEC_PROP_F( GF_PROP_PID_DASH_PERIOD_START, "DFPStart", "Value of active period start time in forward mode", GF_PROP_LUINT, GF_PROP_FLAG_GSF_REM),
+	DEC_PROP( GF_PROP_PID_HLS_KMS, "HLSKey", "URI, KEYFORMAT and KEYFORMATVERSIONS for HLS full segment encryption creation, Key URI otherwise ( decoding and sample-AES)", GF_PROP_STRING),
+	DEC_PROP( GF_PROP_PID_HLS_IV, "HLSIV", "Init Vector for HLS decode", GF_PROP_DATA),
+	DEC_PROP( GF_PROP_PID_CLEARKEY_URI, "CKUrl", "URL for ClearKey licence server", GF_PROP_STRING),
+
+	DEC_PROP_F( GF_PROP_PID_COLR_PRIMARIES, "ColorPrimaries", "Color primaries", GF_PROP_CICP_COL_PRIM, GF_PROP_FLAG_GSF_REM),
+	DEC_PROP_F( GF_PROP_PID_COLR_TRANSFER, "ColorTransfer", "Color transfer characteristics", GF_PROP_CICP_COL_TFC, GF_PROP_FLAG_GSF_REM),
+	DEC_PROP_F( GF_PROP_PID_COLR_MX, "ColorMatrix", "Color matrix coefficient", GF_PROP_CICP_COL_MX, GF_PROP_FLAG_GSF_REM),
+	DEC_PROP_F( GF_PROP_PID_COLR_RANGE, "FullRange", "Color full range flag", GF_PROP_BOOL, GF_PROP_FLAG_GSF_REM),
+	DEC_PROP_F( GF_PROP_PID_COLR_CHROMAFMT, "Chroma", "Chroma format (see ISO/IEC 23001-8 / 23091-2)", GF_PROP_UINT, GF_PROP_FLAG_GSF_REM),
+	DEC_PROP_F( GF_PROP_PID_COLR_CHROMALOC, "ChromaLoc", "Chroma location (see ISO/IEC 23001-8 / 23091-2)", GF_PROP_UINT, GF_PROP_FLAG_GSF_REM),
+	DEC_PROP_F( GF_PROP_PID_CONTENT_LIGHT_LEVEL, "ContentLightLevel", "Content light level, payload of clli box (see ISO/IEC 14496-12), can be set as a list of 2 integers in fragment declaration (e.g. \"=max_cll,max_pic_avg_ll\")", GF_PROP_DATA, GF_PROP_FLAG_GSF_REM),
+	DEC_PROP_F( GF_PROP_PID_MASTER_DISPLAY_COLOUR, "MasterDisplayColour", "Master display colour info, payload of mdcv box (see ISO/IEC 14496-12), can be set as a list of 10 integers in fragment declaration (e.g. \"=dpx0,dpy0,dpx1,dpy1,dpx2,dpy2,wpx,wpy,max,min\")", GF_PROP_DATA, GF_PROP_FLAG_GSF_REM),
+	DEC_PROP_F( GF_PROP_PID_ICC_PROFILE, "ICC", "ICC profile (see ISO 15076-1 or ICC.1)", GF_PROP_DATA, GF_PROP_FLAG_GSF_REM),
+
+	DEC_PROP_F( GF_PROP_PID_SRC_MAGIC, "SrcMagic", "Magic number to store in the track, only used by importers", GF_PROP_LUINT, GF_PROP_FLAG_GSF_REM),
+	DEC_PROP_F( GF_PROP_PID_MUX_INDEX, "MuxIndex", "Target track index in destination file, stored by lowest value first (not set by demultiplexers)", GF_PROP_UINT, GF_PROP_FLAG_GSF_REM),
+	DEC_PROP( GF_PROP_NO_TS_LOOP, "NoTSLoop", "Timestamps on this PID are adjusted in case of loops (used by TS multiplexer output)", GF_PROP_BOOL),
+	DEC_PROP_F( GF_PROP_PID_MHA_COMPATIBLE_PROFILES, "MHAProfiles", "List of compatible profiles for this MPEG-H Audio object", GF_PROP_UINT_LIST, GF_PROP_FLAG_GSF_REM),
+
+	DEC_PROP_F( GF_PROP_PCK_FRAG_START, "FragStart", "Packet is a fragment start (value 1) or a segment start (value 2)", GF_PROP_UINT, GF_PROP_FLAG_PCK|GF_PROP_FLAG_GSF_REM),
+	DEC_PROP_F( GF_PROP_PCK_FRAG_RANGE, "FragRange", "Start and end position in bytes of fragment if packet is a fragment or segment start", GF_PROP_FRACTION64, GF_PROP_FLAG_PCK|GF_PROP_FLAG_GSF_REM),
+	DEC_PROP_F( GF_PROP_PCK_FRAG_TFDT, "FragTFDT", "Decode time of first packet in fragmentt", GF_PROP_LUINT, GF_PROP_FLAG_PCK|GF_PROP_FLAG_GSF_REM),
+	DEC_PROP_F( GF_PROP_PCK_SIDX_RANGE, "SIDXRange", "Start and end position in bytes of sidx if packet is a fragment or segment start", GF_PROP_FRACTION64, GF_PROP_FLAG_PCK|GF_PROP_FLAG_GSF_REM),
+
+	DEC_PROP_F( GF_PROP_PCK_MOOF_TEMPLATE, "MoofTemplate", "Serialized moof box corresponding to the start of a movie fragment or segment (with styp and optionally sidx)", GF_PROP_DATA, GF_PROP_FLAG_PCK|GF_PROP_FLAG_GSF_REM),
+
+	DEC_PROP_F( GF_PROP_PCK_INIT, "InitSeg", "Set to true if packet is a complete DASH init segment file", GF_PROP_BOOL, GF_PROP_FLAG_PCK),
+
+	DEC_PROP_F( GF_PROP_PID_RAWGRAB, "RawGrab", "PID is a raw media grabber (webcam, microphone, etc...). Value 2 is used for front camera", GF_PROP_UINT, GF_PROP_FLAG_GSF_REM),
+	DEC_PROP_F( GF_PROP_PID_KEEP_AFTER_EOS, "KeepAfterEOS", "PID must be kept alive after EOS (LASeR and BIFS)", GF_PROP_BOOL, GF_PROP_FLAG_GSF_REM),
+	DEC_PROP_F( GF_PROP_PID_COVER_ART, "CoverArt", "PID cover art image data. If associated data is NULL, the data is carried in the PID", GF_PROP_DATA, GF_PROP_FLAG_GSF_REM),
+
+	DEC_PROP_F( GF_PROP_PID_PLAY_BUFFER, "BufferLength", "Playout buffer in ms", GF_PROP_UINT, GF_PROP_FLAG_GSF_REM),
+	DEC_PROP_F( GF_PROP_PID_MAX_BUFFER, "MaxBuffer", "Maximum buffer occupancy in ms", GF_PROP_UINT, GF_PROP_FLAG_GSF_REM),
+	DEC_PROP_F( GF_PROP_PID_RE_BUFFER, "ReBuffer", "Rebuffer threshold in ms, 0 disable rebuffering", GF_PROP_UINT, GF_PROP_FLAG_GSF_REM),
+	DEC_PROP_F( GF_PROP_PID_VIEW_IDX, "ViewIdx", "View index for multiview (1 being left)", GF_PROP_UINT, GF_PROP_FLAG_GSF_REM),
+	DEC_PROP_F( GF_PROP_PID_ORIG_FRAG_URL, "FragURL", "Fragment URL (without '#') of original URL (used by some filters to set the property on media PIDs)", GF_PROP_STRING, GF_PROP_FLAG_GSF_REM),
+
+	DEC_PROP_F( GF_PROP_PID_ROUTE_IP, "ROUTEIP", "ROUTE session IP address", GF_PROP_STRING, GF_PROP_FLAG_GSF_REM),
+	DEC_PROP_F( GF_PROP_PID_ROUTE_PORT, "ROUTEPort", "ROUTE session port number", GF_PROP_UINT, GF_PROP_FLAG_GSF_REM),
+	DEC_PROP_F( GF_PROP_PID_ROUTE_NAME, "ROUTEName", "Name (location) of raw file to advertise in ROUTE session", GF_PROP_STRING, GF_PROP_FLAG_GSF_REM),
+	DEC_PROP_F( GF_PROP_PID_ROUTE_CAROUSEL, "ROUTECarousel", "Carousel period in seconds of raw file in ROUTE session", GF_PROP_FRACTION, GF_PROP_FLAG_GSF_REM),
+	DEC_PROP_F( GF_PROP_PID_ROUTE_SENDTIME, "ROUTEUpload", "Upload time in seconds of raw file in ROUTE session", GF_PROP_FRACTION, GF_PROP_FLAG_GSF_REM),
+
+	DEC_PROP_F( GF_PROP_PID_STEREO_TYPE, "Stereo", "Stereo type of video", GF_PROP_UINT, GF_PROP_FLAG_GSF_REM),
+	DEC_PROP_F( GF_PROP_PID_PROJECTION_TYPE, "Projection", "Projection type of video", GF_PROP_UINT, GF_PROP_FLAG_GSF_REM),
+	DEC_PROP_F( GF_PROP_PID_VR_POSE, "InitalPose", "Initial pose for 360 video, in degrees expressed as 16.16 bits (x is yaw, y is pitch, z is roll)", GF_PROP_VEC3I, GF_PROP_FLAG_GSF_REM),
+
+	DEC_PROP_F( GF_PROP_PID_CUBE_MAP_PAD, "CMPad", "Number of pixels to pad from edge of each face in cube map", GF_PROP_UINT, GF_PROP_FLAG_GSF_REM),
+	DEC_PROP_F( GF_PROP_PID_EQR_CLAMP, "EQRClamp", "Clamping of frame for EQR as 0.32 fixed point (x is top, y is bottom, z is left and w is right)", GF_PROP_VEC4I, GF_PROP_FLAG_GSF_REM),
+
+	DEC_PROP( GF_PROP_PID_SCENE_NODE, "SceneNode", "PID is a scene node decoder (AFX BitWrapper in BIFS)", GF_PROP_BOOL),
+	DEC_PROP( GF_PROP_PID_ORIG_CRYPT_SCHEME, "OrigCryptoScheme", "Original crypto scheme on a decrypted PID", GF_PROP_4CC),
+	DEC_PROP_F( GF_PROP_PID_TIMESHIFT_SEGS, "TSBSegs", "Time shift in number of segments for HAS streams, only set by dashin and dasher filters", GF_PROP_UINT, GF_PROP_FLAG_GSF_REM),
+	DEC_PROP_F( GF_PROP_PID_IS_MANIFEST, "IsManifest", "PID is a HAS manifest (MSB=1 if live)\n"
+	"- 0: not a manifest\n"
+	"- 1: DASH manifest\n"
+	"- 2: HLS manifest\n"
+	"- 3: GHI(X) manifest", GF_PROP_UINT, GF_PROP_FLAG_GSF_REM),
+	DEC_PROP_F( GF_PROP_PID_SPARSE, "Sparse", "PID has potentially empty times between packets", GF_PROP_BOOL, GF_PROP_FLAG_GSF_REM),
+	DEC_PROP_F( GF_PROP_PID_CHARSET, "CharSet", "Character set for input text PID", GF_PROP_STRING, GF_PROP_FLAG_GSF_REM),
+	DEC_PROP_F( GF_PROP_PID_FORCED_SUB, "ForcedSub", "PID or Packet is forced sub\n"
+	"0: not forced\n"
+	"1: forced frame\n"
+	"2: all frames are forced (PID only)", GF_PROP_UINT, GF_PROP_FLAG_GSF_REM),
+
+	DEC_PROP_F( GF_PROP_PID_CHAP_TIMES, "ChapTimes", "Chapter start times", GF_PROP_UINT_LIST, GF_PROP_FLAG_GSF_REM),
+	DEC_PROP_F( GF_PROP_PID_CHAP_NAMES, "ChapNames", "Chapter names", GF_PROP_STRING_LIST, GF_PROP_FLAG_GSF_REM),
+	DEC_PROP_F( GF_PROP_PID_IS_CHAP, "IsChap", "Subtitle PID is chapter (for QT-like chapters)", GF_PROP_BOOL, GF_PROP_FLAG_GSF_REM),
+
+	DEC_PROP_F( GF_PROP_PCK_SKIP_BEGIN, "SkipBegin", "Amount of media to skip from beginning of packet in PID timescale", GF_PROP_UINT, GF_PROP_FLAG_PCK),
+	DEC_PROP_F( GF_PROP_PCK_SKIP_PRES, "SkipPres", "Packet and any following with CTS greater than this packet shall not be presented (used by reframer to create edit lists)", GF_PROP_BOOL, GF_PROP_FLAG_PCK),
+
+	DEC_PROP_F( GF_PROP_PCK_HLS_REF, "HLSRef", "HLS playlist reference, gives a unique ID identifying media mux, and indicated in packets carrying child playlists", GF_PROP_LUINT, GF_PROP_FLAG_PCK|GF_PROP_FLAG_GSF_REM),
+	DEC_PROP_F( GF_PROP_PID_LLHLS, "LLHLS", "HLS low latency mode", GF_PROP_UINT, GF_PROP_FLAG_GSF_REM),
+	DEC_PROP_F( GF_PROP_PCK_HLS_FRAG_NUM, "LLHLSFragNum", "LLHLS fragment number", GF_PROP_UINT, GF_PROP_FLAG_PCK),
+	DEC_PROP_F( GF_PROP_PID_DOWNLOAD_SESSION, "DownloadSession", "Pointer to download session", GF_PROP_POINTER, GF_PROP_FLAG_GSF_REM),
+	DEC_PROP_F( GF_PROP_PID_HAS_TEMI, "HasTemi", "TEMI present flag", GF_PROP_BOOL, GF_PROP_FLAG_GSF_REM),
+	DEC_PROP_F( GF_PROP_PCK_XPS_MASK, "XPSMask", "Parameter set mask", GF_PROP_UINT, GF_PROP_FLAG_PCK|GF_PROP_FLAG_GSF_REM),
+	DEC_PROP_F( GF_PROP_PCK_END_RANGE, "RangeEnd", "Signal packet is the last in the desired play range", GF_PROP_BOOL, GF_PROP_FLAG_PCK),
 };
 
 static u32 gf_num_props = sizeof(GF_BuiltInProps) / sizeof(GF_BuiltInProperty);
@@ -1618,20 +1709,30 @@
 GF_EXPORT
 u32 gf_props_get_id(const char *name)
 {
-	u32 i, len;
+	u32 i, len, prop_id=0;
 	if (!name) return 0;
 	len = (u32) strlen(name);
+	if (len==4) {
+		prop_id = GF_4CC(name0, name1, name2, name3);
+	} else if ((len==3) && !strcmp(name, "PID")) {
+		return GF_PROP_PID_ID;
+	}
+
 	for (i=0; i<gf_num_props; i++) {
-		if (GF_BuiltInPropsi.name) {
+		GF_BuiltInProperty *prop = &GF_BuiltInPropsi;
+		if (prop_id && (prop->type==prop_id))
+			return prop->type;
+
+		if (prop->name) {
 			u32 j;
 			for (j=0; j<=len; j++) {
-				char c = GF_BuiltInPropsi.namej;
+				char c = prop->namej;
 				if (!c) break;
 				if (c != namej)
 					break;
 			}
-			if ((j==len) && !GF_BuiltInPropsi.namej)
-				return GF_BuiltInPropsi.type;
+			if ((j==len) && !prop->namej)
+				return prop->type;
 		}
 	}
 	return 0;
@@ -1671,7 +1772,7 @@
 	for (i=0; i<gf_num_props; i++) {
 		if (GF_BuiltInPropsi.type==prop_4cc) return GF_BuiltInPropsi.data_type;
 	}
-	return GF_PROP_FORBIDEN;
+	return GF_PROP_FORBIDDEN;
 }
 
 Bool gf_props_4cc_check_props()
@@ -1690,7 +1791,7 @@
 }
 
 GF_EXPORT
-const char *gf_props_dump_val(const GF_PropertyValue *att, char dumpGF_PROP_DUMP_ARG_SIZE, u32 dump_data_type, const char *min_max_enum)
+const char *gf_props_dump_val(const GF_PropertyValue *att, char dumpGF_PROP_DUMP_ARG_SIZE, GF_PropDumpDataMode dump_data_flags, const char *min_max_enum)
 {
 	switch (att->type) {
 	case GF_PROP_NAME:
@@ -1701,6 +1802,8 @@
 		if (!dump) return NULL;
 		break;
 	}
+	Bool no_reduce = dump_data_flags & GF_PROP_DUMP_NO_REDUCE;
+	u32 dump_data_type = dump_data_flags&0xFF;
 
 	dump0 = 0;
 	switch (att->type) {
@@ -1747,7 +1850,7 @@
 		break;
 	case GF_PROP_FRACTION:
 		//reduce fraction
-		if (att->value.frac.den && ((att->value.frac.num/att->value.frac.den) * att->value.frac.den == att->value.frac.num)) {
+		if (!no_reduce && att->value.frac.den && ((att->value.frac.num/att->value.frac.den) * att->value.frac.den == att->value.frac.num)) {
 			sprintf(dump, "%d", att->value.frac.num / att->value.frac.den);
 		} else {
 			sprintf(dump, "%d/%u", att->value.frac.num, att->value.frac.den);
@@ -1755,7 +1858,7 @@
 		break;
 	case GF_PROP_FRACTION64:
 		//reduce fraction
-		if (att->value.lfrac.den && ((att->value.lfrac.num/att->value.lfrac.den) * att->value.lfrac.den == att->value.lfrac.num)) {
+		if (!no_reduce && att->value.lfrac.den && ((att->value.lfrac.num/att->value.lfrac.den) * att->value.lfrac.den == att->value.lfrac.num)) {
 			sprintf(dump, LLD, att->value.lfrac.num / att->value.lfrac.den);
 		} else {
 			sprintf(dump, LLD"/"LLU, att->value.lfrac.num, att->value.lfrac.den);
@@ -1859,8 +1962,8 @@
 		}
 		return dump;
 	}
-	case GF_PROP_FORBIDEN:
-		sprintf(dump, "forbiden");
+	case GF_PROP_FORBIDDEN:
+		sprintf(dump, "forbidden");
 		break;
 	case GF_PROP_LAST_DEFINED:
 		sprintf(dump, "lastDefined");
@@ -1875,7 +1978,7 @@
 
 
 GF_EXPORT
-const char *gf_props_dump(u32 p4cc, const GF_PropertyValue *att, char dumpGF_PROP_DUMP_ARG_SIZE, u32 dump_data_mode)
+const char *gf_props_dump(u32 p4cc, const GF_PropertyValue *att, char dumpGF_PROP_DUMP_ARG_SIZE, GF_PropDumpDataMode dump_data_mode)
 {
 	switch (p4cc) {
 	case GF_PROP_PID_STREAM_TYPE:
@@ -1925,6 +2028,14 @@
 	return "";
 }
 
+GF_EXPORT
+char *gf_props_dump_alloc(u32 p4cc, const GF_PropertyValue *att, GF_PropDumpDataMode dump_data_mode)
+{
+	char dumpGF_PROP_DUMP_ARG_SIZE;
+	const char *res = gf_props_dump(p4cc, att, dump, dump_data_mode);
+	if (!res) return NULL;
+	return gf_strdup(res);
+}
 
 GF_Err gf_prop_matrix_decompose(const GF_PropertyValue *p, u32 *flip_mode, u32 *rot_mode)
 {
@@ -1965,4 +2076,3 @@
 	}
 	return GF_OK;
 }
-

gpac-2.2.1.tar.gz/src/filter_core/filter_queue.c -> gpac-2.4.0.tar.gz/src/filter_core/filter_queue.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2017-2018
+ *			Copyright (c) Telecom ParisTech 2017-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / filters sub-project
@@ -56,6 +56,7 @@
 	volatile u32 nb_items;
 
 	GF_Mutex *mx;
+	u8 use_mx;
 };
 
 
@@ -68,7 +69,8 @@
 	if (!q) return NULL;
 
 	q->mx = (GF_Mutex *) mx;
-	if (mx) return q;
+	if (mx || gf_opts_get_bool("core", "no-mx")) q->use_mx = 1;
+	if (q->use_mx) return q;
 
 
 	//lock-free mode, create dummuy slot for head
@@ -95,7 +97,7 @@
 {
 	GF_LFQItem *it = q->head;
 	//first item is dummy if lock-free mode, doesn't hold a valid pointer
-	if (! q->mx) it->data=NULL;
+	if (! q->use_mx) it->data=NULL;
 
 	while (it) {
 		GF_LFQItem *ptr = it;
@@ -158,7 +160,7 @@
 				//swap back tail at next
 				atomic_compare_and_swap(tail_ptr, tail, next);
 			} else {
-				assert(next);
+				gf_assert(next);
 				data = next->data;
 				//try to advance q->head to next
 				if (atomic_compare_and_swap(head_ptr, head, next))
@@ -173,7 +175,7 @@
 void gf_lfq_add(GF_FilterQueue *q, void *item)
 {
 	GF_LFQItem *it=NULL;
-	assert(q);
+	gf_assert(q);
 
 	gf_fq_lockfree_dequeue( &q->res_head, &q->res_tail, &it);
 	if (!it) {
@@ -195,7 +197,7 @@
 	void *data = gf_fq_lockfree_dequeue( &q->head, &q->tail, &slot);
 	if (!data) return NULL;
 	safe_int_dec(&q->nb_items);
-	assert(slot);
+	gf_assert(slot);
 
 	slot->data = NULL;
 	slot->next = NULL;
@@ -213,9 +215,9 @@
 void gf_fq_add(GF_FilterQueue *fq, void *item)
 {
 	GF_LFQItem *it;
-	assert(fq);
+	gf_assert(fq);
 
-	if (! fq->mx) {
+	if (! fq->use_mx) {
 		gf_lfq_add(fq, item);
 	} else {
 		gf_mx_p(fq->mx);
@@ -249,7 +251,7 @@
 		return NULL;
 
 	void *data=NULL;
-	if (! fq->mx) {
+	if (! fq->use_mx) {
 		return gf_lfq_pop(fq);
 	}
 
@@ -268,7 +270,7 @@
 		} else {
 			fq->res_head = fq->res_tail = it;
 		}
-		assert(fq->nb_items);
+		gf_assert(fq->nb_items);
 		fq->nb_items--;
 
 		if (! fq->head) fq->tail = NULL;
@@ -284,7 +286,7 @@
 	void *data;
 	if (!fq) return NULL;
 
-	if (fq->mx) {
+	if (fq->use_mx) {
 		gf_mx_p(fq->mx);
 		data = fq->head ? fq->head->data : NULL;
 		gf_mx_v(fq->mx);
@@ -299,9 +301,9 @@
 {
 	void *data;
 	GF_LFQItem *it;
-	assert(fq);
+	gf_assert(fq);
 
-	if (fq->mx) {
+	if (fq->use_mx) {
 		gf_mx_p(fq->mx);
 		it = fq->head;
 
@@ -325,28 +327,36 @@
 	return data;
 }
 
-void gf_fq_enum(GF_FilterQueue *fq, Bool (*enum_func)(void *udta1, void *item), void *udta)
+void gf_fq_enum(GF_FilterQueue *fq, void (*enum_func)(void *udta1, void *item), void *udta)
 {
 	GF_LFQItem *it;
 	if (!enum_func) return;
-	assert(fq);
+	gf_assert(fq);
 
-	if (fq->mx) {
+	if (fq->use_mx) {
 		gf_mx_p(fq->mx);
 		it = fq->head;
 
 		while (it) {
-			if (!enum_func(udta, it->data))
-				break;
+			enum_func(udta, it->data);
 			it = it->next;
 		}
 		gf_mx_v(fq->mx);
 	} else {
 		it = fq->head->next;
 		while (it) {
-			if (!enum_func(udta, it->data))
-				break;
+			enum_func(udta, it->data);
 			it = it->next;
 		}
 	}
 }
+
+Bool gf_fq_res_add(GF_FilterQueue *fq, void *item)
+{
+	if (!fq) return GF_TRUE;
+	//avoid queuing up too many entries in a reservoir queue, this could grow memory
+	//way too much when packet bursts happen
+	if (fq->nb_items>=50) return GF_TRUE;
+	gf_fq_add(fq, item);
+	return GF_FALSE;
+}

gpac-2.2.1.tar.gz/src/filter_core/filter_register.c -> gpac-2.4.0.tar.gz/src/filter_core/filter_register.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2017-2022
+ *			Copyright (c) Telecom ParisTech 2017-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / filters sub-project
@@ -25,319 +25,422 @@
 
 #include "filter_session.h"
 #include <gpac/network.h>
+#include <gpac/module.h>
 
 
 const GF_FilterRegister *ut_filter_register(GF_FilterSession *session);
 const GF_FilterRegister *ut_source_register(GF_FilterSession *session);
 const GF_FilterRegister *ut_sink_register(GF_FilterSession *session);
 const GF_FilterRegister *ut_sink2_register(GF_FilterSession *session);
-const GF_FilterRegister *ffdmx_register(GF_FilterSession *session);
-const GF_FilterRegister *ffdec_register(GF_FilterSession *session);
-const GF_FilterRegister *ffenc_register(GF_FilterSession *session);
-const GF_FilterRegister *ffavin_register(GF_FilterSession *session);
-const GF_FilterRegister *ffsws_register(GF_FilterSession *session);
-const GF_FilterRegister *ffmx_register(GF_FilterSession *session);
-const GF_FilterRegister *ffavf_register(GF_FilterSession *session);
-const GF_FilterRegister *ffbsf_register(GF_FilterSession *session);
-const GF_FilterRegister *inspect_register(GF_FilterSession *session);
-const GF_FilterRegister *probe_register(GF_FilterSession *session);
-const GF_FilterRegister *compose_filter_register(GF_FilterSession *session);
-const GF_FilterRegister *isoffin_register(GF_FilterSession *session);
-const GF_FilterRegister *bifs_dec_register(GF_FilterSession *session);
-const GF_FilterRegister *odf_dec_register(GF_FilterSession *session);
-const GF_FilterRegister *filein_register(GF_FilterSession *session);
-const GF_FilterRegister *ctxload_register(GF_FilterSession *session);
-const GF_FilterRegister *httpin_register(GF_FilterSession *session);
-const GF_FilterRegister *svgin_register(GF_FilterSession *session);
-const GF_FilterRegister *img_reframe_register(GF_FilterSession *session);
-const GF_FilterRegister *imgdec_register(GF_FilterSession *session);
-const GF_FilterRegister *adts_dmx_register(GF_FilterSession *session);
-const GF_FilterRegister *latm_dmx_register(GF_FilterSession *session);
-const GF_FilterRegister *mp3_dmx_register(GF_FilterSession *session);
-const GF_FilterRegister *faad_register(GF_FilterSession *session);
-const GF_FilterRegister *maddec_register(GF_FilterSession *session);
-const GF_FilterRegister *xviddec_register(GF_FilterSession *session);
-const GF_FilterRegister *j2kdec_register(GF_FilterSession *session);
-const GF_FilterRegister *ac3dmx_register(GF_FilterSession *session);
-const GF_FilterRegister *a52dec_register(GF_FilterSession *session);
-const GF_FilterRegister *amrdmx_register(GF_FilterSession *session);
-const GF_FilterRegister *oggdmx_register(GF_FilterSession *session);
-const GF_FilterRegister *vorbisdec_register(GF_FilterSession *session);
-const GF_FilterRegister *theoradec_register(GF_FilterSession *session);
-const GF_FilterRegister *m2tsdmx_register(GF_FilterSession *session);
-const GF_FilterRegister *sockin_register(GF_FilterSession *session);
-const GF_FilterRegister *dvblin_register(GF_FilterSession *session);
-const GF_FilterRegister *vtbdec_register(GF_FilterSession *session);
-const GF_FilterRegister *lsrdec_register(GF_FilterSession *session);
-const GF_FilterRegister *safdmx_register(GF_FilterSession *session);
-const GF_FilterRegister *osvcdec_register(GF_FilterSession *session);
+
+#define REG_DEC(__n) const GF_FilterRegister *__n##_register(GF_FilterSession *session);
+REG_DEC(ffdmx)
+REG_DEC(ffdmxpid)
+REG_DEC(ffdec)
+REG_DEC(ffenc)
+REG_DEC(ffavin)
+REG_DEC(ffsws)
+REG_DEC(ffmx)
+REG_DEC(ffavf)
+REG_DEC(ffbsf)
+REG_DEC(inspect)
+REG_DEC(probe)
+REG_DEC(compositor)
+REG_DEC(mp4dmx)
+REG_DEC(bifsdec)
+REG_DEC(odfdec)
+REG_DEC(fin)
+REG_DEC(btplay)
+REG_DEC(httpin)
+REG_DEC(svgplay)
+REG_DEC(rfimg)
+REG_DEC(imgdec)
+REG_DEC(rfadts)
+REG_DEC(rflatm)
+REG_DEC(rfmp3)
+REG_DEC(faad)
+REG_DEC(maddec)
+REG_DEC(xviddec)
+REG_DEC(j2kdec)
+REG_DEC(rfac3)
+REG_DEC(a52dec)
+REG_DEC(rfamr)
+REG_DEC(oggdmx)
+REG_DEC(vorbisdec)
+REG_DEC(theoradec)
+REG_DEC(m2tsdmx)
+REG_DEC(sockin)
+REG_DEC(dvbin)
+REG_DEC(vtbdec)
+REG_DEC(lsrdec)
+REG_DEC(safdmx)
+REG_DEC(osvcdec)
 #ifdef GPAC_OPENHEVC_STATIC
-const GF_FilterRegister *ohevcdec_register(GF_FilterSession *session);
+REG_DEC(ohevcdec)
 #endif
-const GF_FilterRegister *dashdmx_register(GF_FilterSession *session);
-const GF_FilterRegister *cenc_decrypt_register(GF_FilterSession *session);
-const GF_FilterRegister *cenc_encrypt_register(GF_FilterSession *session);
-const GF_FilterRegister *mp4_mux_register(GF_FilterSession *session);
-const GF_FilterRegister *qcpdmx_register(GF_FilterSession *session);
-const GF_FilterRegister *h263dmx_register(GF_FilterSession *session);
-const GF_FilterRegister *mpgviddmx_register(GF_FilterSession *session);
-const GF_FilterRegister *nhntdmx_register(GF_FilterSession *session);
-const GF_FilterRegister *nhmldmx_register(GF_FilterSession *session);
-const GF_FilterRegister *naludmx_register(GF_FilterSession *session);
-const GF_FilterRegister *m2psdmx_register(GF_FilterSession *session);
-const GF_FilterRegister *avidmx_register(GF_FilterSession *session);
-const GF_FilterRegister *txtin_register(GF_FilterSession *session);
-const GF_FilterRegister *ttxtdec_register(GF_FilterSession *session);
-const GF_FilterRegister *vttdec_register(GF_FilterSession *session);
-const GF_FilterRegister *ttmldec_register(GF_FilterSession *session);
-const GF_FilterRegister *rtpin_register(GF_FilterSession *session);
-const GF_FilterRegister *fileout_register(GF_FilterSession *session);
-const GF_FilterRegister *adtsmx_register(GF_FilterSession *session);
-const GF_FilterRegister *latm_mx_register(GF_FilterSession *session);
-const GF_FilterRegister *reframer_register(GF_FilterSession *session);
-const GF_FilterRegister *writegen_register(GF_FilterSession *session);
-const GF_FilterRegister *nalumx_register(GF_FilterSession *session);
-const GF_FilterRegister *qcpmx_register(GF_FilterSession *session);
-const GF_FilterRegister *vttmx_register(GF_FilterSession *session);
-const GF_FilterRegister *nhntdump_register(GF_FilterSession *session);
-const GF_FilterRegister *nhmldump_register(GF_FilterSession *session);
-const GF_FilterRegister *vobsubdmx_register(GF_FilterSession *session);
-const GF_FilterRegister *avimux_register(GF_FilterSession *session);
-const GF_FilterRegister *aout_register(GF_FilterSession *session);
-const GF_FilterRegister *m4vmx_register(GF_FilterSession *session);
-const GF_FilterRegister *vc1mx_register(GF_FilterSession *session);
-const GF_FilterRegister *resample_register(GF_FilterSession *session);
+REG_DEC(dashin)
+REG_DEC(cdcrypt)
+REG_DEC(cecrypt)
+REG_DEC(mp4mx)
+REG_DEC(rfqcp)
+REG_DEC(rfh263)
+REG_DEC(rfmpgvid)
+REG_DEC(nhntr)
+REG_DEC(nhmlr)
+REG_DEC(rfnalu)
+REG_DEC(m2psdmx)
+REG_DEC(avidmx)
+REG_DEC(txtin)
+REG_DEC(ttxtdec)
+REG_DEC(vttdec)
+REG_DEC(ttmldec)
+REG_DEC(rtpin)
+REG_DEC(fout)
+REG_DEC(ufadts)
+REG_DEC(uflatm)
+REG_DEC(reframer)
+REG_DEC(writegen)
+REG_DEC(ufnalu)
+REG_DEC(writeqcp)
+REG_DEC(ufvtt)
+REG_DEC(nhntw)
+REG_DEC(nhmlw)
+REG_DEC(vobsubdmx)
+REG_DEC(avimx)
+REG_DEC(aout)
+REG_DEC(ufm4v)
+REG_DEC(ufvc1)
+REG_DEC(resample)
 #if !defined(GPAC_CONFIG_ANDROID)
-const GF_FilterRegister *vout_register(GF_FilterSession *session);
+REG_DEC(vout)
 #endif
-const GF_FilterRegister *vcrop_register(GF_FilterSession *session);
-const GF_FilterRegister *vflip_register(GF_FilterSession *session);
-const GF_FilterRegister *rawvidreframe_register(GF_FilterSession *session);
-const GF_FilterRegister *pcmreframe_register(GF_FilterSession *session);
-const GF_FilterRegister *jpgenc_register(GF_FilterSession *session);
-const GF_FilterRegister *pngenc_register(GF_FilterSession *session);
-const GF_FilterRegister *rewind_register(GF_FilterSession *session);
-const GF_FilterRegister *filelist_register(GF_FilterSession *session);
-const GF_FilterRegister *tsmux_register(GF_FilterSession *session);
-const GF_FilterRegister *dasher_register(GF_FilterSession *session);
-const GF_FilterRegister *tileagg_register(GF_FilterSession *session);
-const GF_FilterRegister *tilesplit_register(GF_FilterSession *session);
+REG_DEC(vcrop)
+REG_DEC(vflip)
+REG_DEC(rfrawvid)
+REG_DEC(rfpcm)
+REG_DEC(jpgenc)
+REG_DEC(pngenc)
+REG_DEC(rewind)
+REG_DEC(flist)
+REG_DEC(m2tsmx)
+REG_DEC(dasher)
+REG_DEC(tileagg)
+REG_DEC(tilesplit)
 
 #if !defined(GPAC_CONFIG_ANDROID)
-const GF_FilterRegister *pipein_register(GF_FilterSession *session);
-const GF_FilterRegister *pipeout_register(GF_FilterSession *session);
+REG_DEC(pin)
+REG_DEC(pout)
 #endif
-const GF_FilterRegister *gsfmx_register(GF_FilterSession *session);
-const GF_FilterRegister *gsfdmx_register(GF_FilterSession *session);
-const GF_FilterRegister *sockout_register(GF_FilterSession *session);
-const GF_FilterRegister *av1dmx_register(GF_FilterSession *session);
-const GF_FilterRegister *obumx_register(GF_FilterSession *session);
+REG_DEC(gsfmx)
+REG_DEC(gsfdmx)
+REG_DEC(sockout)
+REG_DEC(rfav1)
+REG_DEC(ufobu)
 #if !defined(GPAC_CONFIG_IOS) && !defined(GPAC_CONFIG_ANDROID)
-const GF_FilterRegister *nvdec_register(GF_FilterSession *session);
+REG_DEC(nvdec)
 #endif
-const GF_FilterRegister *routein_register(GF_FilterSession *session);
-const GF_FilterRegister *rtpout_register(GF_FilterSession *session);
-const GF_FilterRegister *rtspout_register(GF_FilterSession *session);
-const GF_FilterRegister *hevcsplit_register(GF_FilterSession *session);
-const GF_FilterRegister *hevcmerge_register(GF_FilterSession *session);
+REG_DEC(routein)
+REG_DEC(rtpout)
+REG_DEC(rtspout)
+REG_DEC(hevcsplit)
+REG_DEC(hevcmerge)
 
-const GF_FilterRegister *jsfilter_register(GF_FilterSession *session);
-const GF_FilterRegister *m2tssplit_register(GF_FilterSession *session);
-const GF_FilterRegister *httpout_register(GF_FilterSession *session);
+REG_DEC(jsf)
+REG_DEC(tssplit)
+REG_DEC(httpout)
+REG_DEC(uncvdec)
 
 #if !defined(GPAC_CONFIG_IOS) && !defined(GPAC_CONFIG_ANDROID) && !defined(GPAC_HAVE_DTAPI) && !defined(WIN32) 
-const GF_FilterRegister *dtout_register(GF_FilterSession *session);
+REG_DEC(dtout)
 #endif
 
 #if !defined(GPAC_CONFIG_IOS)
-const GF_FilterRegister *mcdec_register(GF_FilterSession *session);
+REG_DEC(mcdec)
 #endif
 
-const GF_FilterRegister *flac_dmx_register(GF_FilterSession *session);
-const GF_FilterRegister *proresdmx_register(GF_FilterSession *session);
-const GF_FilterRegister *bsrw_register(GF_FilterSession *session);
-const GF_FilterRegister *bs_split_register(GF_FilterSession *session);
-const GF_FilterRegister *bs_agg_register(GF_FilterSession *session);
-const GF_FilterRegister *mhas_dmx_register(GF_FilterSession *session);
-const GF_FilterRegister *mhasmx_register(GF_FilterSession *session);
-const GF_FilterRegister *routeout_register(GF_FilterSession *session);
-const GF_FilterRegister *truehd_register(GF_FilterSession *session);
-const GF_FilterRegister *cryptfin_register(GF_FilterSession *session);
-const GF_FilterRegister *cryptfout_register(GF_FilterSession *session);
-const GF_FilterRegister *restamp_register(GF_FilterSession *session);
-const GF_FilterRegister *oggmux_register(GF_FilterSession *session);
-const GF_FilterRegister *vtt2tx3g_register(GF_FilterSession *session);
-const GF_FilterRegister *rfsrt_register(GF_FilterSession *session);
-const GF_FilterRegister *ttxtuf_register(GF_FilterSession *session);
-const GF_FilterRegister *tx3g2srt_register(GF_FilterSession *session);
-const GF_FilterRegister *tx3g2vtt_register(GF_FilterSession *session);
-const GF_FilterRegister *tx3g2ttml_register(GF_FilterSession *session);
-const GF_FilterRegister *ttmlconv_register(GF_FilterSession *session);
-const GF_FilterRegister *ttmlconv2_register(GF_FilterSession *session);
-const GF_FilterRegister *unframer_register(GF_FilterSession *session);
-const GF_FilterRegister *writeuf_register(GF_FilterSession *session);
+#if defined(GPAC_CONFIG_EMSCRIPTEN)
+REG_DEC(wcdec)
+REG_DEC(wcenc)
+REG_DEC(webgrab)
+#endif
 
-void gf_fs_reg_all(GF_FilterSession *fsess, GF_FilterSession *a_sess)
+
+REG_DEC(rfflac)
+REG_DEC(rfprores)
+REG_DEC(bsrw)
+REG_DEC(bssplit)
+REG_DEC(bsagg)
+REG_DEC(rfmhas)
+REG_DEC(ufmhas)
+REG_DEC(routeout)
+REG_DEC(rftruehd)
+REG_DEC(cryptin)
+REG_DEC(cryptout)
+REG_DEC(restamp)
+REG_DEC(oggmx)
+REG_DEC(vtt2tx3g)
+REG_DEC(rfsrt)
+REG_DEC(ufttxt)
+REG_DEC(tx3g2srt)
+REG_DEC(tx3g2vtt)
+REG_DEC(tx3g2ttml)
+REG_DEC(ttml2vtt)
+REG_DEC(ttml2srt)
+REG_DEC(unframer)
+REG_DEC(writeuf)
+REG_DEC(ghidmx)
+REG_DEC(evgs)
+REG_DEC(ccdec)
+REG_DEC(mpeghdec)
+
+typedef const GF_FilterRegister *(*filter_reg_fun)(GF_FilterSession *session);
+
+typedef struct
 {
-	gf_fs_add_filter_register(fsess, inspect_register(a_sess) );
-	gf_fs_add_filter_register(fsess, probe_register(a_sess) );
-	gf_fs_add_filter_register(fsess, compose_filter_register(a_sess) );
-	gf_fs_add_filter_register(fsess, isoffin_register(a_sess) );
-	gf_fs_add_filter_register(fsess, bifs_dec_register(a_sess) );
-	gf_fs_add_filter_register(fsess, odf_dec_register(a_sess) );
-	gf_fs_add_filter_register(fsess, filein_register(a_sess) );
-	gf_fs_add_filter_register(fsess, ctxload_register(a_sess) );
-	gf_fs_add_filter_register(fsess, httpin_register(a_sess) );
-	gf_fs_add_filter_register(fsess, svgin_register(a_sess) );
-	gf_fs_add_filter_register(fsess, img_reframe_register(a_sess) );
-	gf_fs_add_filter_register(fsess, imgdec_register(a_sess) );
-	gf_fs_add_filter_register(fsess, adts_dmx_register(a_sess) );
-	gf_fs_add_filter_register(fsess, latm_dmx_register(a_sess) );
-	gf_fs_add_filter_register(fsess, mp3_dmx_register(a_sess) );
-	gf_fs_add_filter_register(fsess, faad_register(a_sess) );
-	gf_fs_add_filter_register(fsess, maddec_register(a_sess) );
-	gf_fs_add_filter_register(fsess, xviddec_register(a_sess) );
-	gf_fs_add_filter_register(fsess, j2kdec_register(a_sess) );
-	gf_fs_add_filter_register(fsess, ac3dmx_register(a_sess) );
-	gf_fs_add_filter_register(fsess, a52dec_register(a_sess) );
-	gf_fs_add_filter_register(fsess, amrdmx_register(a_sess) );
-	gf_fs_add_filter_register(fsess, oggdmx_register(a_sess) );
-	gf_fs_add_filter_register(fsess, vorbisdec_register(a_sess) );
-	gf_fs_add_filter_register(fsess, theoradec_register(a_sess) );
-	gf_fs_add_filter_register(fsess, m2tsdmx_register(a_sess) );
-	gf_fs_add_filter_register(fsess, sockin_register(a_sess) );
-	gf_fs_add_filter_register(fsess, dvblin_register(a_sess) );
-	gf_fs_add_filter_register(fsess, osvcdec_register(a_sess) );
-	gf_fs_add_filter_register(fsess, vtbdec_register(a_sess) );
+	const char *name;
+	filter_reg_fun fun;
+} BuiltinReg;
 
+#define REG_IT(__n) { #__n , __n##_register }
+
+BuiltinReg BuiltinFilters  = {
+	REG_IT(inspect),
+	REG_IT(probe),
+	REG_IT(compositor),
+	REG_IT(mp4dmx),
+	REG_IT(bifsdec),
+	REG_IT(odfdec),
+	REG_IT(fin),
+	REG_IT(btplay),
+	REG_IT(httpin),
+	REG_IT(svgplay),
+	REG_IT(rfimg),
+	REG_IT(imgdec),
+	REG_IT(rfadts),
+	REG_IT(rflatm),
+	REG_IT(rfmp3),
+	REG_IT(faad),
+	REG_IT(maddec),
+	REG_IT(xviddec),
+	REG_IT(j2kdec),
+	REG_IT(rfac3),
+	REG_IT(a52dec),
+	REG_IT(rfamr),
+	REG_IT(oggdmx),
+	REG_IT(vorbisdec),
+	REG_IT(theoradec),
+	REG_IT(m2tsdmx),
+	REG_IT(sockin),
+	REG_IT(dvbin),
+	REG_IT(osvcdec),
+	REG_IT(vtbdec),
 #if !defined(GPAC_CONFIG_IOS)
-	gf_fs_add_filter_register(fsess, mcdec_register(a_sess) );
+	REG_IT(mcdec),
 #endif
-
-	gf_fs_add_filter_register(fsess, lsrdec_register(a_sess) );
-	gf_fs_add_filter_register(fsess, safdmx_register(a_sess) );
+	REG_IT(lsrdec),
+	REG_IT(safdmx),
 #ifdef GPAC_OPENHEVC_STATIC
-	gf_fs_add_filter_register(fsess, ohevcdec_register(a_sess) );
+	REG_IT(ohevcdec),
 #endif
-	gf_fs_add_filter_register(fsess, dashdmx_register(a_sess) );
-	gf_fs_add_filter_register(fsess, cenc_decrypt_register(a_sess) );
-	gf_fs_add_filter_register(fsess, cenc_encrypt_register(a_sess) );
-	gf_fs_add_filter_register(fsess, mp4_mux_register(a_sess) );
-	gf_fs_add_filter_register(fsess, qcpdmx_register(a_sess) );
-	gf_fs_add_filter_register(fsess, h263dmx_register(a_sess) );
-	gf_fs_add_filter_register(fsess, mpgviddmx_register(a_sess) );
-	gf_fs_add_filter_register(fsess, nhntdmx_register(a_sess) );
-	gf_fs_add_filter_register(fsess, nhmldmx_register(a_sess) );
-	gf_fs_add_filter_register(fsess, naludmx_register(a_sess) );
-	gf_fs_add_filter_register(fsess, m2psdmx_register(a_sess) );
-	gf_fs_add_filter_register(fsess, avidmx_register(a_sess) );
-	gf_fs_add_filter_register(fsess, txtin_register(a_sess) );
-	gf_fs_add_filter_register(fsess, ttxtdec_register(a_sess) );
-	gf_fs_add_filter_register(fsess, vttdec_register(a_sess) );
-	gf_fs_add_filter_register(fsess, ttmldec_register(a_sess) );
-	gf_fs_add_filter_register(fsess, rtpin_register(a_sess) );
-	gf_fs_add_filter_register(fsess, fileout_register(a_sess) );
-	gf_fs_add_filter_register(fsess, latm_mx_register(a_sess) );
-	gf_fs_add_filter_register(fsess, adtsmx_register(a_sess) );
-	gf_fs_add_filter_register(fsess, mhasmx_register(a_sess) );
-
-	gf_fs_add_filter_register(fsess, reframer_register(a_sess) );
-	gf_fs_add_filter_register(fsess, writegen_register(a_sess) );
-	gf_fs_add_filter_register(fsess, nalumx_register(a_sess) );
-	gf_fs_add_filter_register(fsess, qcpmx_register(a_sess) );
-	gf_fs_add_filter_register(fsess, vttmx_register(a_sess) );
-	gf_fs_add_filter_register(fsess, nhntdump_register(a_sess) );
-	gf_fs_add_filter_register(fsess, nhmldump_register(a_sess) );
-	gf_fs_add_filter_register(fsess, vobsubdmx_register(a_sess) );
-	gf_fs_add_filter_register(fsess, avimux_register(a_sess) );
-	gf_fs_add_filter_register(fsess, aout_register(a_sess) );
-	gf_fs_add_filter_register(fsess, m4vmx_register(a_sess) );
-	gf_fs_add_filter_register(fsess, vc1mx_register(a_sess) );
-	gf_fs_add_filter_register(fsess, resample_register(a_sess) );
+	REG_IT(dashin),
+	REG_IT(cdcrypt),
+	REG_IT(cecrypt),
+	REG_IT(mp4mx),
+	REG_IT(rfqcp),
+	REG_IT(rfh263),
+	REG_IT(rfmpgvid),
+	REG_IT(nhntr),
+	REG_IT(nhmlr),
+	REG_IT(rfnalu),
+	REG_IT(m2psdmx),
+	REG_IT(avidmx),
+	REG_IT(txtin),
+	REG_IT(ttxtdec),
+	REG_IT(vttdec),
+	REG_IT(ttmldec),
+	REG_IT(rtpin),
+	REG_IT(fout),
+	REG_IT(uflatm),
+	REG_IT(ufadts),
+	REG_IT(ufmhas),
+	REG_IT(reframer),
+	REG_IT(writegen),
+	REG_IT(ufnalu),
+	REG_IT(writeqcp),
+	REG_IT(ufvtt),
+	REG_IT(nhntw),
+	REG_IT(nhmlw),
+	REG_IT(vobsubdmx),
+	REG_IT(avimx),
+	REG_IT(aout),
+	REG_IT(ufm4v),
+	REG_IT(ufvc1),
+	REG_IT(resample),
 #if !defined(GPAC_CONFIG_ANDROID)
-	gf_fs_add_filter_register(fsess, vout_register(a_sess) );
+	REG_IT(vout),
 #endif
-	gf_fs_add_filter_register(fsess, vcrop_register(a_sess) );
-	gf_fs_add_filter_register(fsess, vflip_register(a_sess) );
-	gf_fs_add_filter_register(fsess, rawvidreframe_register(a_sess) );
-	gf_fs_add_filter_register(fsess, pcmreframe_register(a_sess) );
-	gf_fs_add_filter_register(fsess, jpgenc_register(a_sess) );
-	gf_fs_add_filter_register(fsess, pngenc_register(a_sess) );
-	gf_fs_add_filter_register(fsess, rewind_register(a_sess) );
-	gf_fs_add_filter_register(fsess, filelist_register(a_sess) );
-	gf_fs_add_filter_register(fsess, tsmux_register(a_sess) );
-	gf_fs_add_filter_register(fsess, dasher_register(a_sess) );
-	gf_fs_add_filter_register(fsess, tileagg_register(a_sess) );
-	gf_fs_add_filter_register(fsess, tilesplit_register(a_sess) );
-
+	REG_IT(vcrop),
+	REG_IT(vflip),
+	REG_IT(rfrawvid),
+	REG_IT(rfpcm),
+	REG_IT(jpgenc),
+	REG_IT(pngenc),
+	REG_IT(rewind),
+	REG_IT(flist),
+	REG_IT(m2tsmx),
+	REG_IT(dasher),
+	REG_IT(tileagg),
+	REG_IT(tilesplit),
 #if !defined(GPAC_CONFIG_ANDROID)
-	gf_fs_add_filter_register(fsess, pipein_register(a_sess) );
-	gf_fs_add_filter_register(fsess, pipeout_register(a_sess) );
+	REG_IT(pin),
+	REG_IT(pout),
 #endif
-	gf_fs_add_filter_register(fsess, gsfmx_register(a_sess) );
-	gf_fs_add_filter_register(fsess, gsfdmx_register(a_sess) );
-	gf_fs_add_filter_register(fsess, sockout_register(a_sess) );
-	gf_fs_add_filter_register(fsess, av1dmx_register(a_sess) );
-	gf_fs_add_filter_register(fsess, obumx_register(a_sess) );
+	REG_IT(gsfmx),
+	REG_IT(gsfdmx),
+	REG_IT(sockout),
+	REG_IT(rfav1),
+	REG_IT(ufobu),
 #if !defined(GPAC_CONFIG_IOS) && !defined(GPAC_CONFIG_ANDROID)
-	gf_fs_add_filter_register(fsess, nvdec_register(a_sess));
+	REG_IT(nvdec),
+#endif
+	REG_IT(routein),
+	REG_IT(rtpout),
+	REG_IT(rtspout),
+	REG_IT(httpout),
+	REG_IT(hevcsplit),
+	REG_IT(hevcmerge),
+	REG_IT(rfflac),
+	REG_IT(rfmhas),
+	REG_IT(rfprores),
+	REG_IT(tssplit),
+	REG_IT(bsrw),
+	REG_IT(bssplit),
+	REG_IT(bsagg),
+	REG_IT(ufttxt),
+	REG_IT(tx3g2srt),
+	REG_IT(tx3g2vtt),
+	REG_IT(tx3g2ttml),
+	REG_IT(vtt2tx3g),
+	REG_IT(rfsrt),
+	REG_IT(ttml2vtt),
+	REG_IT(ttml2srt),
+	REG_IT(mpeghdec),
+
+	REG_IT(ffdmx),
+	REG_IT(ffdmxpid),
+	REG_IT(ffdec),
+	REG_IT(ffavin),
+	REG_IT(ffsws),
+	REG_IT(ffenc),
+	REG_IT(ffmx),
+	REG_IT(ffavf),
+	REG_IT(ffbsf),
+
+	REG_IT(jsf),
+	REG_IT(routeout),
+	REG_IT(rftruehd),
+	REG_IT(cryptin),
+	REG_IT(cryptout),
+	REG_IT(restamp),
+	REG_IT(oggmx),
+	REG_IT(unframer),
+	REG_IT(writeuf),
+	REG_IT(uncvdec),
+	REG_IT(ghidmx),
+	REG_IT(evgs),
+	REG_IT(ccdec),
+
+#if defined(GPAC_CONFIG_EMSCRIPTEN)
+	REG_IT(wcdec),
+	REG_IT(wcenc),
+	REG_IT(webgrab),
+#endif
+#if !defined(GPAC_CONFIG_IOS) && !defined(GPAC_CONFIG_ANDROID) && !defined(GPAC_HAVE_DTAPI) && !defined(WIN32)
+	REG_IT(dtout),
 #endif
-	gf_fs_add_filter_register(fsess, routein_register(a_sess));
-	gf_fs_add_filter_register(fsess, rtpout_register(a_sess));
-	gf_fs_add_filter_register(fsess, rtspout_register(a_sess));
-	gf_fs_add_filter_register(fsess, httpout_register(a_sess));
+};
 
-	gf_fs_add_filter_register(fsess, hevcsplit_register(a_sess));
-	gf_fs_add_filter_register(fsess, hevcmerge_register(a_sess));
-	gf_fs_add_filter_register(fsess, flac_dmx_register(a_sess));
-	gf_fs_add_filter_register(fsess, mhas_dmx_register(a_sess));
 
-	gf_fs_add_filter_register(fsess, proresdmx_register(a_sess));
-	gf_fs_add_filter_register(fsess, m2tssplit_register(a_sess));
-	gf_fs_add_filter_register(fsess, bsrw_register(a_sess));
-	gf_fs_add_filter_register(fsess, bs_split_register(a_sess));
-	gf_fs_add_filter_register(fsess, bs_agg_register(a_sess));
-	gf_fs_add_filter_register(fsess, ttxtuf_register(a_sess));
-	gf_fs_add_filter_register(fsess, tx3g2srt_register(a_sess));
-	gf_fs_add_filter_register(fsess, tx3g2vtt_register(a_sess));
-	gf_fs_add_filter_register(fsess, tx3g2ttml_register(a_sess));
-	gf_fs_add_filter_register(fsess, vtt2tx3g_register(a_sess) );
-	gf_fs_add_filter_register(fsess, rfsrt_register(a_sess) );
-	gf_fs_add_filter_register(fsess, ttmlconv_register(a_sess) );
-	gf_fs_add_filter_register(fsess, ttmlconv2_register(a_sess) );
+void gf_fs_reg_all(GF_FilterSession *fsess, GF_FilterSession *a_sess)
+{
+	Bool is_whitelist = GF_FALSE;
+	GF_PropertyValue _bl;
+	u32 nb_blacklist=0;
+	char **bls=NULL;
 
-	gf_fs_add_filter_register(fsess, ffdmx_register(a_sess) );
-	gf_fs_add_filter_register(fsess, ffdec_register(a_sess) );
-	gf_fs_add_filter_register(fsess, ffavin_register(a_sess) );
-	gf_fs_add_filter_register(fsess, ffsws_register(a_sess) );
-	gf_fs_add_filter_register(fsess, ffenc_register(a_sess) );
-	gf_fs_add_filter_register(fsess, ffmx_register(a_sess) );
-	gf_fs_add_filter_register(fsess, ffavf_register(a_sess) );
-	gf_fs_add_filter_register(fsess, ffbsf_register(a_sess) );
+	if (fsess->blacklist) {
+		const char *blacklist = fsess->blacklist;
+		if (blacklist0=='-') {
+			blacklist++;
+			is_whitelist = GF_TRUE;
+		}
+		_bl = gf_props_parse_value(GF_PROP_STRING_LIST, "blacklist", blacklist, NULL, fsess->sep_list);
+		nb_blacklist = _bl.value.string_list.nb_items;
+		bls = _bl.value.string_list.vals;
+	}
 
-	gf_fs_add_filter_register(fsess, jsfilter_register(a_sess) );
-	gf_fs_add_filter_register(fsess, routeout_register(a_sess) );
-	gf_fs_add_filter_register(fsess, truehd_register(a_sess) );
-	gf_fs_add_filter_register(fsess, cryptfin_register(a_sess) );
-	gf_fs_add_filter_register(fsess, cryptfout_register(a_sess) );
-	gf_fs_add_filter_register(fsess, restamp_register(a_sess) );
-	gf_fs_add_filter_register(fsess, oggmux_register(a_sess) );
+	u32 i, j, count = GF_ARRAY_LENGTH(BuiltinFilters);
+	for (i=0; i<count; i++) {
+		const char *reg_name = BuiltinFiltersi.name;
 
-	gf_fs_add_filter_register(fsess, unframer_register(a_sess) );
-	gf_fs_add_filter_register(fsess, writeuf_register(a_sess) );
+		if (nb_blacklist) {
+			Bool match = GF_FALSE;
+			for (j=0; j<nb_blacklist; j++) {
+				if (!strcmp(blsj, reg_name)) {
+					match = GF_TRUE;
+					break;
+				}
+			}
+			if (is_whitelist) match = !match;
+			if (match) continue;
+		}
 
-#if !defined(GPAC_CONFIG_IOS) && !defined(GPAC_CONFIG_ANDROID) && !defined(GPAC_HAVE_DTAPI) && !defined(WIN32) 
-	gf_fs_add_filter_register(fsess, dtout_register(a_sess) );
-#endif
+		const GF_FilterRegister *freg = BuiltinFiltersi.fun(a_sess);
+		if (!freg) continue;
+		gf_assert( !strcmp(freg->name, BuiltinFiltersi.name));
+		gf_fs_add_filter_register(fsess, freg);
+
+	}
+
+	//load external modules
+	if (!gf_opts_get_bool("core", "no-dynf")) {
+		count = gf_modules_count();
+		for (i=0; i<count; i++) {
+			GF_FilterRegister *freg = (GF_FilterRegister *) gf_modules_load_filter(i, a_sess);
+			if (!freg) continue;
+
+			if (nb_blacklist) {
+				Bool match = GF_FALSE;
+				for (j=0; j<nb_blacklist; j++) {
+					if (!strcmp(blsj, freg->name)) {
+						match = GF_TRUE;
+						break;
+					}
+				}
+				if (is_whitelist) match = !match;
+				if (match) {
+					if (freg->register_free) freg->register_free(fsess, (GF_FilterRegister *)freg);
+					continue;
+				}
+			}
+			gf_fs_add_filter_register(fsess, freg);
+		}
+	}
+
+	if (nb_blacklist) {
+		gf_props_reset_single(&_bl);
+	}
 }
 
 GF_EXPORT
 void gf_fs_register_test_filters(GF_FilterSession *fsess)
 {
+#ifndef GPAC_DISABLE_UNITS
 	gf_fs_add_filter_register(fsess, ut_source_register(NULL) );
 	gf_fs_add_filter_register(fsess, ut_filter_register(NULL) );
 	gf_fs_add_filter_register(fsess, ut_sink_register(NULL) );
 	gf_fs_add_filter_register(fsess, ut_sink2_register(NULL) );
+#endif
 }

gpac-2.2.1.tar.gz/src/filter_core/filter_session.c -> gpac-2.4.0.tar.gz/src/filter_core/filter_session.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2017-2022
+ *			Copyright (c) Telecom ParisTech 2017-2024
  *					All rights reserved
  *
  *  This file is part of GPAC / filters sub-project
@@ -29,18 +29,18 @@
 #ifndef GPAC_DISABLE_3D
 #include <gpac/modules/video_out.h>
 #endif
-#include <gpac/module.h>
 
 //#define CHECK_TASK_LIST_INTEGRITY
 
-#ifndef GPAC_DISABLE_PLAYER
+#ifndef GPAC_DISABLE_FONTS
 struct _gf_ft_mgr *gf_font_manager_new();
 void gf_font_manager_del(struct _gf_ft_mgr *fm);
 #endif
 
-
 static GFINLINE void gf_fs_sema_io(GF_FilterSession *fsess, Bool notify, Bool main)
 {
+	//we don't use sema on emscripten, we always give control back to main caller or pthread
+#ifndef GPAC_CONFIG_EMSCRIPTEN
 	GF_Semaphore *sem = main ? fsess->semaphore_main : fsess->semaphore_other;
 	if (sem) {
 		if (notify) {
@@ -52,7 +52,7 @@
 			u32 nb_tasks;
 			//if not main and no tasks in main list, this could be the last task to process.
 			//if main thread is sleeping force a wake to take further actions (only the main thread decides the exit)
-			//this also ensures that tha main thread will process tasks from secondary task lists if no
+			//this also ensures that the main thread will process tasks from secondary task lists if no
 			//dedicated main thread tasks are present (eg no GL filters)
 			if (!main && fsess->in_main_sem_wait && !gf_fq_count(fsess->main_thread_tasks)) {
 				gf_fs_sema_io(fsess, GF_TRUE, GF_TRUE);
@@ -86,56 +86,42 @@
 			}
 		}
 	}
+#endif // GPAC_CONFIG_EMSCRIPTEN
 }
 
+
 GF_EXPORT
 void gf_fs_add_filter_register(GF_FilterSession *fsess, const GF_FilterRegister *freg)
 {
-	if (!freg || !fsess) return;
+	if (!freg) return;
+	if (!fsess) {
+		if (freg->register_free) freg->register_free(fsess, (GF_FilterRegister *)freg);
+		return;
+	}
 
 	if (!freg->name) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Filter missing name - ignoring\n"));
+		if (freg->register_free) freg->register_free(fsess, (GF_FilterRegister *)freg);
 		return;
 	}
 #if 0
 	if (strchr(freg->name, fsess->sep_args)	) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Filter name cannot contain argument separator %c - ignoring\n", fsess->sep_args));
+		if (freg->register_free) freg->register_free(fsess, (GF_FilterRegister *)freg);
 		return;
 	}
 	if (strchr(freg->name, fsess->sep_name)) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Filter name cannot contain argument value separator %c - ignoring\n", fsess->sep_name));
+		if (freg->register_free) freg->register_free(fsess, (GF_FilterRegister *)freg);
 		return;
 	}
 #endif
 	if (!freg->process) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Filter %s missing process function - ignoring\n", freg->name));
+		if (freg->register_free) freg->register_free(fsess, (GF_FilterRegister *)freg);
 		return;
 	}
-	if (fsess->blacklist) {
-		Bool match = GF_FALSE;
-		const char *blacklist = fsess->blacklist;
-		Bool is_whitelist=GF_FALSE;
-		if (blacklist0=='-') {
-			blacklist++;
-			is_whitelist = GF_TRUE;
-		}
-		while (blacklist) {
-			char *fname = strstr(blacklist, freg->name);
-			if (!fname) break;
-			u32 len = (u32) strlen(freg->name);
-			if (!fnamelen || (fnamelen == fsess->sep_list)) {
-				match = GF_TRUE;
-				break;
-			}
-			blacklist = fname+len;
-		}
-		if (is_whitelist) match = !match;
 
-		if (match) {
-			if (freg->register_free) freg->register_free(fsess, (GF_FilterRegister *)freg);
-			return;
-		}
-	}
 	//except for meta filters, don't accept a filter with input caps but no output caps
 	//meta filters do follow the same rule, however when expanding them for help we may have weird cases
 	//where no config is set but inputs are listed to expose mime types or extensions (cf ffdmx)
@@ -157,8 +143,6 @@
 	}
 }
 
-
-
 static Bool fs_default_event_proc(void *ptr, GF_Event *evt)
 {
 	GF_FilterSession *fs = (GF_FilterSession *)ptr;
@@ -189,10 +173,8 @@
 		if (gf_sys_is_test_mode()) {
 			return GF_FALSE;
 		}
-		assert( evt->type == GF_EVENT_AUTHORIZATION);
-		assert( evt->auth.user);
-		assert( evt->auth.password);
-		assert( evt->auth.site_url);
+		if (!evt->auth.user || !evt->auth.password || !evt->auth.site_url)
+			return GF_FALSE;
 
 		fprintf(stderr, "**** Authorization required for site %s %s ****\n", evt->auth.site_url, evt->auth.secure ? "(secure)" : "- NOT SECURE");
 		fprintf(stderr, "login   : ");
@@ -218,19 +200,21 @@
 static Bool fs_check_locales(void *__self, const char *locales_parent_path, const char *rel_path, char *relocated_path, char *localized_rel_path);
 #endif
 
+#ifdef __EMSCRIPTEN_PTHREADS__
+#include <emscripten/threading.h>
+#endif
 
 GF_EXPORT
-GF_FilterSession *gf_fs_new(s32 nb_threads, GF_FilterSchedulerType sched_type, u32 flags, const char *blacklist)
+GF_FilterSession *gf_fs_new(s32 nb_threads, GF_FilterSchedulerType sched_type, GF_FilterSessionFlags flags, const char *blacklist)
 {
 	const char *opt;
 	Bool gf_sys_has_filter_global_args();
 	Bool gf_sys_has_filter_global_meta_args();
-
-	u32 i, count;
+	u32 i;
 	GF_FilterSession *fsess, *a_sess;
 
 	//safety check: all built-in properties shall have unique 4CCs
-	if ( ! gf_props_4cc_check_props())
+	if (gf_sys_is_test_mode() && ! gf_props_4cc_check_props())
 		return NULL;
 
 	GF_SAFEALLOC(fsess, GF_FilterSession);
@@ -246,6 +230,17 @@
 
 	fsess->flags = flags;
 
+	if (gf_opts_get_bool("core", "no-mx"))
+		nb_threads=0;
+
+#ifdef __EMSCRIPTEN_PTHREADS__
+	//detect if we run as a worker
+	if (!emscripten_is_main_runtime_thread()) {
+		fsess->is_worker = GF_TRUE;
+		GF_LOG(GF_LOG_INFO, GF_LOG_FILTER, ("Session running in worker mode\n"));
+	}
+#endif
+
 	fsess->filters = gf_list_new();
 	fsess->main_th.fsess = fsess;
 
@@ -295,12 +290,17 @@
 	fsess->ui_event_proc = fs_default_event_proc;
 	fsess->ui_opaque = fsess;
 
-	if (flags & GF_FS_FLAG_NON_BLOCKING)
+	if (flags & GF_FS_FLAG_NON_BLOCKING) {
 		fsess->non_blocking = 1;
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("Creating session in non-blocking mode\n"));
+	} else {
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("Creating session in blocking mode\n"));
+	}
 
 	if (!fsess->semaphore_main)
 		nb_threads=0;
 
+#ifndef GPAC_DISABLE_THREADS
 	if (nb_threads) {
 		fsess->threads = gf_list_new();
 		if (!fsess->threads) {
@@ -311,7 +311,9 @@
 			nb_threads=0;
 		}
 		fsess->use_locks = (sched_type==GF_FS_SCHEDULER_LOCK) ? GF_TRUE : GF_FALSE;
-	} else {
+	} else
+#endif
+	{
 #ifdef GPAC_MEMORY_TRACKING
 		extern int gf_mem_track_enabled;
 		fsess->check_allocs = gf_mem_track_enabled;
@@ -350,6 +352,7 @@
 		fsess->ui_mx = gf_mx_new("FilterSessionUIProc");
 	}
 
+#ifndef GPAC_DISABLE_THREADS
 	for (i=0; i<(u32) nb_threads; i++) {
 		char szName30;
 		GF_SessionThread *sess_thread;
@@ -367,23 +370,23 @@
 		sess_thread->fsess = fsess;
 		gf_list_add(fsess->threads, sess_thread);
 	}
+#endif
 
 	gf_fs_set_separators(fsess, NULL);
 
 	fsess->registry = gf_list_new();
-	fsess->blacklist = blacklist;
+#ifdef GPAC_HAS_QJS
+	//keep copy of blacklist for JS
+	fsess->blacklist = blacklist ? gf_strdup(blacklist) : NULL;
+#else
+	fsess->blacklist = (char*)blacklist;
+#endif
 	a_sess = (flags & GF_FS_FLAG_LOAD_META) ? fsess : NULL;
 	gf_fs_reg_all(fsess, a_sess);
 
-	//load external modules
-	count = gf_modules_count();
-	for (i=0; i<count; i++) {
-		GF_FilterRegister *freg = (GF_FilterRegister *) gf_modules_load_filter(i, a_sess);
-		if (freg) {
-			gf_fs_add_filter_register(fsess, freg);
-		}
-	}
+#ifndef GPAC_HAS_QJS
 	fsess->blacklist = NULL;
+#endif
 
 	//todo - find a way to handle events without mutex ...
 	fsess->evt_mx = gf_mx_new("Event mutex");
@@ -509,7 +512,7 @@
 		}
 		if (was_found)
 			ai->meta_state = 2;
-	} else if (was_found && !ai->meta_state) {
+	} else if (was_found && (!ai->meta_state || !meta_filter) ) {
 		ai->opt_found = 1;
 		//initial declaration from filter setup: meta args are declared as true by default
 		if (type==GF_ARGTYPE_LOCAL) {
@@ -517,13 +520,14 @@
 			ai->meta_state = 1;
 			//meta option, mark as not found
 			if (meta_filter) ai->meta_state = 3;
+			else ai->meta_filter = NULL;
 		}
 	}
 }
 
 
 GF_EXPORT
-GF_FilterSession *gf_fs_new_defaults(u32 inflags)
+GF_FilterSession *gf_fs_new_defaults(GF_FilterSessionFlags inflags)
 {
 	GF_FilterSession *fsess;
 	GF_FilterSchedulerType sched_type = GF_FS_SCHEDULER_LOCK_FREE;
@@ -557,6 +561,15 @@
 	if (inflags & GF_FS_FLAG_NO_IMPLICIT)
 		flags |= GF_FS_FLAG_NO_IMPLICIT;
 
+	if (inflags & GF_FS_FLAG_REQUIRE_SOURCE_ID)
+		flags |= GF_FS_FLAG_REQUIRE_SOURCE_ID;
+
+	if (inflags & GF_FS_FLAG_FORCE_DEFER_LINK)
+		flags |= GF_FS_FLAG_FORCE_DEFER_LINK;
+
+	if (inflags & GF_FS_FLAG_PREVENT_PLAY)
+		flags |= GF_FS_FLAG_PREVENT_PLAY;
+
 	if (gf_opts_get_bool("core", "dbg-edges"))
 		flags |= GF_FS_FLAG_PRINT_CONNECTIONS;
 
@@ -706,7 +719,7 @@
 GF_EXPORT
 void gf_fs_del(GF_FilterSession *fsess)
 {
-	assert(fsess);
+	gf_assert(fsess);
 
 	gf_fs_stop(fsess);
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("Session destroy begin\n"));
@@ -721,7 +734,7 @@
 	}
 
 	//temporary until we don't introduce fsess_stop
-	assert(fsess->run_status != GF_OK);
+	gf_assert(fsess->run_status != GF_OK);
 	if (fsess->filters) {
 		u32 i, pass, count=gf_list_count(fsess->filters);
 		//first pass: disconnect all filters, since some may have references to property maps or packets 
@@ -785,8 +798,11 @@
 
 	gf_fs_unload_script(fsess, NULL);
 
+#ifdef GPAC_USE_DOWNLOADER
 	if (fsess->download_manager) gf_dm_del(fsess->download_manager);
-#ifndef GPAC_DISABLE_PLAYER
+#endif
+
+#ifndef GPAC_DISABLE_FONTS
 	if (fsess->font_manager) gf_font_manager_del(fsess->font_manager);
 #endif
 
@@ -804,6 +820,7 @@
 	if (fsess->tasks_reservoir)
 		gf_fq_del(fsess->tasks_reservoir, gf_void_del);
 
+#ifndef GPAC_DISABLE_THREADS
 	if (fsess->threads) {
 		if (fsess->main_thread_tasks)
 			gf_fq_del(fsess->main_thread_tasks, gf_task_del);
@@ -815,6 +832,7 @@
 		}
 		gf_list_del(fsess->threads);
 	}
+#endif
 
 	if (fsess->prop_maps_reservoir)
 		gf_fq_del(fsess->prop_maps_reservoir, gf_propmap_del);
@@ -880,6 +898,7 @@
 	if (fsess->uri_relocators) gf_list_del(fsess->uri_relocators);
 	if (fsess->locales.szAbsRelocatedPath) gf_free(fsess->locales.szAbsRelocatedPath);
 #endif
+	if (fsess->blacklist) gf_free(fsess->blacklist);
 
 	gf_free(fsess);
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("Session destroyed\n"));
@@ -898,10 +917,9 @@
 }
 
 #ifdef CHECK_TASK_LIST_INTEGRITY
-static Bool check_task_list_enum(void *udta, void *item)
+static void check_task_list_enum(void *udta, void *item)
 {
-	assert(udta != item);
-	return GF_FALSE;
+	gf_fatal_assert(udta != item);
 }
 static void check_task_list(GF_FilterQueue *fq, GF_FSTask *task)
 {
@@ -911,13 +929,13 @@
 }
 #endif
 
-void gf_fs_post_task_ex(GF_FilterSession *fsess, gf_fs_task_callback task_fun, GF_Filter *filter, GF_FilterPid *pid, const char *log_name, void *udta, Bool is_configure, Bool force_main_thread, Bool force_direct_call, u32 class_type)
+void gf_fs_post_task_ex(GF_FilterSession *fsess, gf_fs_task_callback task_fun, GF_Filter *filter, GF_FilterPid *pid, const char *log_name, void *udta, Bool is_configure, Bool force_main_thread, Bool force_direct_call, GF_TaskClassType class_type)
 {
 	GF_FSTask *task;
 	Bool notified = GF_FALSE;
 
-	assert(fsess);
-	assert(task_fun);
+	gf_assert(fsess);
+	gf_assert(task_fun);
 
 	//only flatten calls if in main thread (we still have some broken filters using threading that could trigger tasks)
 	if ((force_direct_call || fsess->direct_mode)
@@ -959,21 +977,21 @@
 	We must use safe_int_dec/safe_int_inc here for multi thread cases - cf issue #1778
 	*/
 	if (force_direct_call) {
-		assert(filter);
+		gf_assert(filter);
 		safe_int_dec(&filter->process_task_queued);
 		if (safe_int_inc(&filter->process_task_queued) > 1) {
 			return;
 		}
 	}
 	task = gf_fq_pop(fsess->tasks_reservoir);
-
 	if (!task) {
-		GF_SAFEALLOC(task, GF_FSTask);
+		task = gf_malloc(sizeof(GF_FSTask));
 		if (!task) {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_SCHEDULER, ("No more memory to post new task\n"));
 			return;
 		}
 	}
+	memset(task, 0, sizeof(GF_FSTask));
 	task->filter = filter;
 	task->pid = pid;
 	task->run_task = task_fun;
@@ -1003,6 +1021,12 @@
 			}
 #endif
 		}
+
+#ifdef GPAC_CONFIG_EMSCRIPTEN
+		if (filter->freg->flags & GF_FS_REG_BLOCK_MAIN)
+			task->blocking = GF_TRUE;
+		else
+#endif
 		if (!force_main_thread)
 			task->blocking = (filter->is_blocking_source) ? GF_TRUE : GF_FALSE;
 		else
@@ -1026,10 +1050,10 @@
 		check_task_list(fsess->tasks, task);
 		check_task_list(fsess->tasks_reservoir, task);
 #endif
-		assert(task->run_task);
+		gf_assert(task->run_task);
 		if (filter) {
 			GF_LOG(GF_LOG_DEBUG, GF_LOG_SCHEDULER, ("Thread %u posting filter task, scheduled_for_next_task %d\n", gf_th_id(), filter->scheduled_for_next_task));
-			assert(!filter->scheduled_for_next_task);
+			gf_assert(!filter->scheduled_for_next_task);
 		}
 
 		//notify/count tasks posted on the main task or regular task lists
@@ -1038,7 +1062,7 @@
 			gf_fq_add(fsess->main_thread_tasks, task);
 			gf_fs_sema_io(fsess, GF_TRUE, GF_TRUE);
 		} else {
-			assert(task->run_task);
+			gf_assert(task->run_task);
 			gf_fq_add(fsess->tasks, task);
 			gf_fs_sema_io(fsess, GF_TRUE, GF_FALSE);
 		}
@@ -1050,7 +1074,7 @@
 	gf_fs_post_task_ex(fsess, task_fun, filter, pid, log_name, udta, GF_FALSE, GF_FALSE, GF_FALSE, TASK_TYPE_NONE);
 }
 
-void gf_fs_post_task_class(GF_FilterSession *fsess, gf_fs_task_callback task_fun, GF_Filter *filter, GF_FilterPid *pid, const char *log_name, void *udta, u32 class_id)
+void gf_fs_post_task_class(GF_FilterSession *fsess, gf_fs_task_callback task_fun, GF_Filter *filter, GF_FilterPid *pid, const char *log_name, void *udta, GF_TaskClassType class_id)
 {
 	gf_fs_post_task_ex(fsess, task_fun, filter, pid, log_name, udta, GF_FALSE, GF_FALSE, GF_FALSE, class_id);
 }
@@ -1117,7 +1141,7 @@
 	return gf_fs_check_filter_register_cap_ex(f_reg, incode, cap_input, outcode, cap_output, exact_match_only, GF_FALSE);
 }
 
-static GF_Filter *gf_fs_load_encoder(GF_FilterSession *fsess, const char *args)
+GF_Filter *gf_fs_load_encoder(GF_FilterSession *fsess, const char *args, GF_List *filter_blacklist, GF_Err *out_err)
 {
 	GF_Err e;
 	char szCodec3;
@@ -1133,9 +1157,11 @@
 	szCodec1 = fsess->sep_name;
 	szCodec2 = 0;
 
+	if (out_err) *out_err = GF_OK;
 	cid = args ? strstr(args, szCodec) : NULL;
 	if (!cid) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Missing codec identifier in \"enc\" definition: %s\n", args ? args : "no arguments"));
+		if (out_err) *out_err = GF_BAD_PARAM;
 		return NULL;
 	}
 	sep = strchr(cid, fsess->sep_args);
@@ -1146,6 +1172,7 @@
 	if (codecid==GF_CODECID_NONE) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Unrecognized codec identifier in \"enc\" definition: %s\n", cid));
 		if (sep) sep0 = fsess->sep_args;
+		if (out_err) *out_err = GF_BAD_PARAM;
 		return NULL;
 	}
 #endif
@@ -1168,6 +1195,8 @@
 		const GF_FilterRegister *f_reg = gf_list_get(fsess->registry, i);
 		if (blacklist && (gf_list_find(blacklist, (void *) f_reg)>=0) )
 			continue;
+		if (filter_blacklist && (gf_list_find(filter_blacklist, (void *) f_reg)>=0) )
+			continue;
 
 		if ( gf_fs_check_filter_register_cap_ex(f_reg, GF_PROP_PID_CODECID, &cap_in, GF_PROP_PID_CODECID, &cap_out, GF_FALSE, ocap_excluded)) {
 			if (!candidate || (candidate->priority>f_reg->priority))
@@ -1177,6 +1206,7 @@
 	if (!candidate) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Cannot find any filter providing encoding for %s\n", cid));
 		if (blacklist) gf_list_del(blacklist);
+		if (out_err) *out_err = GF_FILTER_NOT_FOUND;
 		return NULL;
 	}
 	filter = gf_filter_new(fsess, candidate, args, NULL, GF_FILTER_ARG_EXPLICIT, &e, NULL, GF_FALSE);
@@ -1186,9 +1216,10 @@
 			gf_list_add(blacklist, (void *) candidate);
 			goto retry;
 		}
+		if (out_err) *out_err = e;
 		GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Failed to load filter %s: %s\n", candidate->name, gf_error_to_string(e) ));
 	} else {
-		filter->encoder_stream_type = gf_codecid_type(codecid);
+		filter->encoder_codec_id = codecid;
 	}
 	if (blacklist) gf_list_del(blacklist);
 	return filter;
@@ -1227,6 +1258,7 @@
 		strncpy(path, apath, GF_MAX_PATH-1);
 		pathGF_MAX_PATH-1 = 0;
 		gf_free(apath);
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("Found %s for file %s\n", path, file_name));
 		return GF_TRUE;
 	}
 
@@ -1236,6 +1268,7 @@
 			strncpy(path, apath, GF_MAX_PATH-1);
 			pathGF_MAX_PATH-1 = 0;
 			gf_free(apath);
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("Found %s for file %s\n", path, file_name));
 			return GF_TRUE;
 		}
 	}
@@ -1246,6 +1279,7 @@
 		strncpy(path, apath, GF_MAX_PATH-1);
 		pathGF_MAX_PATH-1 = 0;
 		gf_free(apath);
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("Found %s for file %s\n", path, file_name));
 		return GF_TRUE;
 	}
 	gf_free(apath);
@@ -1296,8 +1330,8 @@
 	u32 i, len, count = gf_list_count(fsess->registry);
 	Bool quiet = (err_code && (*err_code == GF_EOS)) ? GF_TRUE : GF_FALSE;
 
-	assert(fsess);
-	assert(name);
+	gf_assert(fsess);
+	gf_assert(name);
 	if (err_code) *err_code = GF_OK;
 
 	//the first string before any option sep MUST be the filter registry name, so we don't use gf_fs_path_escape_colon here
@@ -1311,14 +1345,15 @@
 		if (!quiet) {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Missing filter name in %s\n", name));
 		}
+		if (err_code) *err_code = GF_FILTER_NOT_FOUND;
 		return NULL;
 	}
 
 	if (!strncmp(name, "enc", len)) {
-		return gf_fs_load_encoder(fsess, args);
+		return gf_fs_load_encoder(fsess, args, NULL, err_code);
 	}
 	if ((strlen(name)>2) && (name0=='c') && (name1==fsess->sep_name)) {
-		return gf_fs_load_encoder(fsess, name);
+		return gf_fs_load_encoder(fsess, name, NULL, err_code);
 	}
 
 	/*regular filter loading*/
@@ -1410,44 +1445,234 @@
 	return gf_fs_load_filter_internal(fsess, name, err_code, NULL);
 }
 
+static void print_task(u32 *taskn, GF_FSTask *task, Bool for_filter)
+{
+	(*taskn)++;
+	fprintf(stderr, "%sT%d \"%s\"", for_filter ? " " : "", *taskn, task->log_name );
+	if (task->thid) {
+		if (task->thid==1)
+			fprintf(stderr, " exec in main");
+		else
+			fprintf(stderr, " exec in th %d", task->thid-1);
+	}
+	if (for_filter && task->notified)
+		fprintf(stderr, " notified");
+
+	if (task->filter)
+		fprintf(stderr, " filter \"%s\" (%s)", task->filter->name, task->filter->freg->name);
+	if (task->pid) {
+		Bool output = task->pid == task->pid->pid;
+		fprintf(stderr, " %s PID %s", output ? "output" : "input", gf_filter_pid_get_name(task->pid));
+	}
+	if (task->force_main)
+		fprintf(stderr, " force_main");
+	if (task->blocking)
+		fprintf(stderr, " blocking");
+	if (task->schedule_next_time)
+		fprintf(stderr, " scheduled in "LLD" us", task->schedule_next_time - gf_sys_clock_high_res());
+
+	switch (task->class_type) {
+	case TASK_TYPE_EVENT:
+		fprintf(stderr, " FilterEvent");
+		if (task->udta)
+			fprintf(stderr, " type %s", gf_filter_event_name( ((GF_FilterEvent*)task->udta)->base.type) );
+		break;
+	case TASK_TYPE_SETUP: fprintf(stderr, " SetupFailure"); break;
+	case TASK_TYPE_USER: fprintf(stderr, " UserData"); break;
+	}
+
+	fprintf(stderr, "\n");
+}
+
+static void print_task_list(void *udta, void *item)
+{
+	print_task(udta, item, GF_FALSE);
+}
+
+static void print_task_list_filter(void *udta, void *item)
+{
+	print_task(udta, item, GF_TRUE);
+}
+
+struct __pck_size_info
+{
+	u32 nb_packets;
+	u64 all_size;
+	u64 all_alloc_size;
+};
+
+static void gather_pck_size(void *udta, void *item)
+{
+	struct __pck_size_info *sinfo = (struct __pck_size_info*)udta;
+	GF_FilterPacketInstance *pcki = item;
+	sinfo->nb_packets++;
+	sinfo->all_size += pcki->pck->data_length;
+	sinfo->all_alloc_size += pcki->pck->alloc_size;
+}
+
+GF_EXPORT
+void gf_fs_print_debug_info(GF_FilterSession *fsess, GF_SessionDebugFlag dbg_flags)
+{
+	u32 count, i=0;
+	fsess->dbg_flags = dbg_flags;
+	fprintf(stderr, "Session debug info (UTC "LLU")\n", gf_net_get_utc());
+
+	if (dbg_flags & GF_FS_DEBUG_GRAPH)
+		gf_fs_print_connections(fsess);
+
+	if (dbg_flags & GF_FS_DEBUG_STATS)
+		gf_fs_print_stats(fsess);
+
+	if (dbg_flags & GF_FS_DEBUG_TASKS) {
+		fprintf(stderr, "Main thread tasks:\n");
+		gf_fq_enum(fsess->main_thread_tasks, print_task_list, &i);
+		if (fsess->tasks!=fsess->main_thread_tasks) {
+			fprintf(stderr, "Other tasks:\n");
+			i=0;
+			gf_fq_enum(fsess->tasks, print_task_list, &i);
+		}
+	}
+
+	if (dbg_flags & GF_FS_DEBUG_FILTERS) {
+		fprintf(stderr, "Filters status:\n");
+		gf_mx_p(fsess->filters_mx);
+		count = gf_list_count(fsess->filters);
+		for (i=0; i<count; i++) {
+			u32 j=0;
+			GF_Filter *f = gf_list_get(fsess->filters, i);
+			fprintf(stderr, "F%d \"%s\" (%s)", i+1, f->name, f->freg->name);
+			if (f->id) fprintf(stderr, " ID %s", f->id);
+			if (f->is_pid_adaptation_filter) fprintf(stderr, " adaptation");
+			else if (f->dynamic_filter) fprintf(stderr, " dynamic");
+			fprintf(stderr, " - %d PIDs playing", f->nb_pids_playing);
+			if (f->would_block) fprintf(stderr, " %d blocked", f->would_block);
+
+			if (f->removed) { fprintf(stderr, " - removed\n"); continue; }
+			if (f->disabled) { fprintf(stderr, " - disabled\n"); continue; }
+			if (f->finalized) { fprintf(stderr, " - finalized\n"); continue; }
+			if (f->eos_probe_state==1) fprintf(stderr, " in eos");
+
+			if (gf_fq_count(f->tasks)) {
+				fprintf(stderr, " tasks:\n");
+				gf_fq_enum(f->tasks, print_task_list_filter, &j);
+			} else {
+				fprintf(stderr, " no tasks\n");
+			}
+
+			struct __pck_size_info pcki;
+			memset(&pcki, 0, sizeof(struct __pck_size_info));
+			pcki.nb_packets = gf_list_count(f->postponed_packets);
+			for (j=0; j<f->num_input_pids; j++) {
+				u32 k=0;
+				GF_FilterPidInst *pidi = gf_list_get(f->input_pids, k);
+				gf_fq_enum(pidi->packets, gather_pck_size, &pcki);
+			}
+			if (pcki.nb_packets)
+				fprintf(stderr, " %d packets to process on %d input PIDs "LLU" KBytes\n", pcki.nb_packets, f->num_input_pids, pcki.all_size/1000);
+			if (f->ref_bytes)
+				fprintf(stderr, " "LLU" KBytes of detached packets in destinations\n", f->ref_bytes/1000);
+		}
+		gf_mx_v(fsess->filters_mx);
+	}
+	fprintf(stderr, "\n");
+}
+
 //in mono thread mode, we cannot always sleep for the requested timeout in case there are more tasks to be processed
 //this defines the number of pending tasks above which we limit sleep
 #define MONOTH_MIN_TASKS	2
 //this defines the sleep time for this case
 #define MONOTH_MIN_SLEEP	5
 
+#if defined(GPAC_CONFIG_EMSCRIPTEN) && !defined(GPAC_DISABLE_THREADS)
+#include <emscripten/threading.h>
+GF_Err gf_th_async_call(GF_Thread *t, u32 (*Run)(void *param), void *param);
+static u32 gf_fs_thread_proc(GF_SessionThread *sess_thread);
+
+Bool em_check_yield_th_proc(u32 thid, GF_SessionThread *sess_thread, u64 enter_time)
+{
+	if (thid
+		&& (sess_thread->fsess->run_status == GF_OK)
+	) {
+		sess_thread->run_time += gf_sys_clock_high_res() - enter_time;
+		safe_int_dec(&sess_thread->fsess->active_threads);
+		gf_th_async_call(sess_thread->th, (gf_thread_run) gf_fs_thread_proc, sess_thread);
+		return GF_TRUE;
+	}
+	return GF_FALSE;
+}
+#endif
+
+#ifndef GPAC_DISABLE_THREADS
+const char *gf_th_log_name(GF_Thread *t);
+#else
+#define gf_th_log_name(_t) "Main Process"
+#endif
+
 static u32 gf_fs_thread_proc(GF_SessionThread *sess_thread)
 {
 	GF_FilterSession *fsess = sess_thread->fsess;
-	u32 i, th_count = fsess->threads ? gf_list_count(fsess->threads) : 0;
+#ifndef GPAC_DISABLE_THREADS
+	u32 i;
+	u32 th_count = fsess->threads ? gf_list_count(fsess->threads) : 0;
 	u32 thid =  1 + gf_list_find(fsess->threads, sess_thread);
+#else
+	u32 th_count = 0;
+	u32 thid = 0;
+#endif
 	u64 enter_time = gf_sys_clock_high_res();
 	Bool use_main_sema = thid ? GF_FALSE : GF_TRUE;
 #ifndef GPAC_DISABLE_LOG
-	u32 sys_thid = gf_th_id();
+	const char *sys_thid = gf_th_log_name(sess_thread->th);
 #endif
 	u64 next_task_schedule_time = 0;
 	Bool do_regulate = (fsess->flags & GF_FS_FLAG_NO_REGULATION) ? GF_FALSE : GF_TRUE;
 	u32 consecutive_filter_tasks=0;
 	Bool force_secondary_tasks = GF_FALSE;
 	Bool skip_next_sema_wait = GF_FALSE;
-
 	GF_Filter *current_filter = NULL;
-	sess_thread->th_id = gf_th_id();
+
+#if defined(GPAC_CONFIG_EMSCRIPTEN) && !defined(GPAC_DISABLE_THREADS)
+	Bool flush_main_blocking = (!thid && !fsess->is_worker) ? GF_TRUE : GF_FALSE;
+	if (flush_main_blocking) do_regulate = GF_FALSE;
+#endif
+
+	//main thread
+	if (!thid) {
+		if (!sess_thread->run_time) {
+			sess_thread->run_time = enter_time;
+		}
+		if (fsess->non_blocking) {
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_SCHEDULER, ("Main thread proc enter\n"));
+		}
+#ifdef GPAC_CONFIG_EMSCRIPTEN
+	} else {
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_SCHEDULER, ("Thread %s proc enter\n", sys_thid));
+#endif
+	}
+
+	//first time we enter the thread proc
+	if (!sess_thread->th_id) {
+		sess_thread->th_id = gf_th_id();
+#ifdef GPAC_CONFIG_EMSCRIPTEN
+		if (fsess->non_blocking && thid) {
+			sess_thread->run_time = 0;
+			safe_int_dec(&fsess->pending_threads);
+		}
+#endif
+
+#ifndef GPAC_DISABLE_REMOTERY
+		gf_rmt_set_thread_name(sess_thread->rmt_name);
+#endif
+	}
 
 #ifndef GPAC_DISABLE_REMOTERY
 	sess_thread->rmt_tasks=40;
-	gf_rmt_set_thread_name(sess_thread->rmt_name);
 #endif
 
 	gf_rmt_begin(fs_thread, 0);
 
 	safe_int_inc(&fsess->active_threads);
 
-	if (!thid && fsess->non_blocking) {
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_SCHEDULER, ("Main thread proc enter\n"));
-	}
-
 	while (1) {
 		Bool notified;
 		Bool requeue = GF_FALSE;
@@ -1458,6 +1683,10 @@
 		Bool skip_filter_task_check = GF_FALSE;
 #endif
 
+		if ((fsess->dbg_flags & GF_FS_DEBUG_CONTINUOUS) && !thid) {
+			gf_fs_print_debug_info(fsess, fsess->dbg_flags ? fsess->dbg_flags : GF_FS_DEBUG_ALL);
+		}
+
 #ifndef GPAC_DISABLE_REMOTERY
 		sess_thread->rmt_tasks--;
 		if (!sess_thread->rmt_tasks) {
@@ -1467,11 +1696,16 @@
 		}
 #endif
 
+#if defined(GPAC_CONFIG_EMSCRIPTEN) && !defined(GPAC_DISABLE_THREADS)
+		if (flush_main_blocking)
+			emscripten_main_thread_process_queued_calls();
+#endif
+
 		safe_int_dec(&fsess->active_threads);
 
 		if (!skip_next_sema_wait && (current_filter==NULL)) {
 			gf_rmt_begin(sema_wait, GF_RMT_AGGREGATE);
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_SCHEDULER, ("Thread %u Waiting scheduler %s semaphore\n", sys_thid, use_main_sema ? "main" : "secondary"));
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_SCHEDULER, ("Thread %s Waiting scheduler %s semaphore\n", sys_thid, use_main_sema ? "main" : "secondary"));
 			//wait for something to be done
 			gf_fs_sema_io(fsess, GF_FALSE, use_main_sema);
 			consecutive_filter_tasks = 0;
@@ -1498,6 +1732,14 @@
 					}
 				}
 				force_secondary_tasks = GF_FALSE;
+#ifdef GPAC_CONFIG_EMSCRIPTEN
+				//no tasks on main thread, exit setting in_main_sem_wait to trigger a NOT_READY on fs_run
+				//this will give control back to JS
+				if (fsess->non_blocking && !task) {
+					fsess->in_main_sem_wait = GF_TRUE;
+					break;
+				}
+#endif
 			} else {
 				task = gf_fq_pop(fsess->tasks);
 				if (task && (task->force_main || (task->filter && task->filter->nb_main_thread_forced) ) ) {
@@ -1507,14 +1749,14 @@
 					continue;
 				}
 			}
-			assert(!task || task->run_task );
-			assert(!task || task->notified );
+			gf_assert(!task || task->run_task );
+			gf_assert(!task || task->notified );
 		} else {
 			//keep task in filter tasks list until done
 			task = gf_fq_head(current_filter->tasks);
 			if (task) {
-				assert( task->run_task );
-				assert( ! task->notified );
+				gf_assert( task->run_task );
+				gf_assert( ! task->notified );
 
 				//task was requested for main thread
 				if ((task->force_main || current_filter->nb_main_thread_forced) && thid) {
@@ -1525,6 +1767,9 @@
 					//post to main
 					gf_fq_add(fsess->main_thread_tasks, task);
 					gf_fs_sema_io(fsess, GF_TRUE, GF_TRUE);
+#ifndef GPAC_DISABLE_LOG
+					gf_log_pop_extra(current_filter->logs);
+#endif
 					//disable current filter
 					current_filter = NULL;
 					continue;
@@ -1543,6 +1788,7 @@
 				//check all threads
 				Bool all_done = GF_TRUE;
 
+#ifndef GPAC_DISABLE_THREADS
 				for (i=0; i<th_count; i++) {
 					GF_SessionThread *st = gf_list_get(fsess->threads, i);
 					if (!st->has_seen_eot) {
@@ -1550,14 +1796,18 @@
 						force_nb_notif++;
 					}
 				}
+#endif
 				if (all_done)
 					break;
 			}
 			if (current_filter) {
 				current_filter->scheduled_for_next_task = GF_FALSE;
 				current_filter->process_th_id = 0;
-				assert(current_filter->in_process);
+				gf_assert(current_filter->in_process);
 				current_filter->in_process = GF_FALSE;
+#ifndef GPAC_DISABLE_LOG
+				gf_log_pop_extra(current_filter->logs);
+#endif
 			}
 			current_filter = NULL;
 			sess_thread->active_time += gf_sys_clock_high_res() - active_start;
@@ -1588,13 +1838,20 @@
 				gf_sema_notify(fsess->semaphore_other, th_count);
 			}
 
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_SCHEDULER, ("Thread %u: no task available\n", sys_thid));
-
 			//no main thread, return
 			if (!thid && fsess->non_blocking) {
 				GF_LOG(GF_LOG_DEBUG, GF_LOG_SCHEDULER, ("Main thread proc exit\n"));
+				safe_int_dec(&fsess->active_threads);
+				return 0;
+			}
+
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_SCHEDULER, ("Thread %s: no task available\n", sys_thid));
+
+#if defined(GPAC_CONFIG_EMSCRIPTEN) && !defined(GPAC_DISABLE_THREADS)
+			if (em_check_yield_th_proc(thid, sess_thread, enter_time)) {
 				return 0;
 			}
+#endif
 
 			if (do_regulate) {
 				gf_sleep(0);
@@ -1606,12 +1863,19 @@
 		check_task_list(fsess->main_thread_tasks, task);
 		check_task_list(fsess->tasks, task);
 #endif
-		if (current_filter) {
-			assert(current_filter==task->filter);
-		}
+		gf_assert(!current_filter || (current_filter==task->filter));
+
+#ifndef GPAC_DISABLE_LOG
+		//moving to new filter, register log
+		if (!current_filter && task->filter) gf_log_push_extra(task->filter->logs);
+#endif
 		current_filter = task->filter;
 
-		if (current_filter && current_filter->restrict_th_idx && (thid != current_filter->restrict_th_idx)) {
+		//unless task was explicitly forced to main (pid init mostly), reschedule if filter is not on desired thread
+		if (current_filter && !task->force_main
+			&& current_filter->restrict_th_idx
+			&& (thid != current_filter->restrict_th_idx)
+		) {
 			//reschedule task to secondary list
 			if (!task->notified) {
 				task->notified = GF_TRUE;
@@ -1619,12 +1883,13 @@
 			}
 			gf_fq_add(fsess->tasks, task);
 			gf_fs_sema_io(fsess, GF_TRUE, GF_FALSE);
+#ifndef GPAC_DISABLE_LOG
+			gf_log_pop_extra(current_filter->logs);
+#endif
 			current_filter = NULL;
 			continue;
 		}
 
-		assert(!current_filter || !current_filter->restrict_th_idx || (thid == current_filter->restrict_th_idx));
-
 		//this is a crude way of scheduling the next task, we should
 		//1- have a way to make sure we will not repost after a time-consuming task
 		//2- have a way to wait for the given amount of time rather than just do a sema_wait/notify in loop
@@ -1647,7 +1912,7 @@
 #endif
 					next = gf_fq_head(fsess->tasks);
 					next_task_schedule_time = task->schedule_next_time;
-					assert(task->run_task);
+					gf_assert(task->run_task);
 #ifdef CHECK_TASK_LIST_INTEGRITY
 					check_task_list(fsess->main_thread_tasks, task);
 					check_task_list(fsess->tasks, task);
@@ -1657,7 +1922,7 @@
 					gf_fq_add(fsess->tasks, task);
 					if (next) {
 						if (next->schedule_next_time <= (u64) now) {
-							GF_LOG(GF_LOG_DEBUG, GF_LOG_SCHEDULER, ("Thread %u: task %s reposted, next task time ready for execution\n", sys_thid, task_log_name));
+							GF_LOG(GF_LOG_DEBUG, GF_LOG_SCHEDULER, ("Thread %s: task %s reposted, next task time ready for execution\n", sys_thid, task_log_name));
 
 							skip_next_sema_wait = GF_TRUE;
 							continue;
@@ -1666,7 +1931,7 @@
 						ndiff -= now;
 						ndiff /= 1000;
 						if (ndiff<diff) {
-							GF_LOG(GF_LOG_DEBUG, GF_LOG_SCHEDULER, ("Thread %u: task %s scheduled after next task %s:%s (in %d ms vs %d ms)\n", sys_thid, task_log_name, next->log_name, next->filter ? next->filter->name : "", (s32) diff, (s32) ndiff));
+							GF_LOG(GF_LOG_DEBUG, GF_LOG_SCHEDULER, ("Thread %s: task %s scheduled after next task %s:%s (in %d ms vs %d ms)\n", sys_thid, task_log_name, next->log_name, next->filter ? next->filter->name : "", (s32) diff, (s32) ndiff));
 							diff = ndiff;
 						}
 					}
@@ -1682,10 +1947,10 @@
 							if ( gf_fq_count(fsess->tasks) > MONOTH_MIN_TASKS)
 								diff = MONOTH_MIN_SLEEP;
 						}
-						GF_LOG(GF_LOG_DEBUG, GF_LOG_SCHEDULER, ("Thread %u: task %s reposted, %s task scheduled after this task, sleeping for %d ms (task diff %d - next diff %d)\n", sys_thid, task_log_name, next ? "next" : "no", diff, tdiff, ndiff));
+						GF_LOG(GF_LOG_DEBUG, GF_LOG_SCHEDULER, ("Thread %s: task %s reposted, %s task scheduled after this task, sleeping for %d ms (task diff %d - next diff %d)\n", sys_thid, task_log_name, next ? "next" : "no", diff, tdiff, ndiff));
 						gf_sleep((u32) diff);
 					} else {
-						GF_LOG(GF_LOG_DEBUG, GF_LOG_SCHEDULER, ("Thread %u: task %s reposted, next task scheduled after this task, rerun\n", sys_thid, task_log_name));
+						GF_LOG(GF_LOG_DEBUG, GF_LOG_SCHEDULER, ("Thread %s: task %s reposted, next task scheduled after this task, rerun\n", sys_thid, task_log_name));
 					}
 					skip_next_sema_wait = GF_TRUE;
 					continue;
@@ -1694,7 +1959,7 @@
 				if (!task->filter->finalized) {
 #ifdef CHECK_TASK_LIST_INTEGRITY
 					next = gf_fq_head(current_filter->tasks);
-					assert(next == task);
+					gf_assert(next == task);
 					check_task_list(fsess->main_thread_tasks, task);
 					check_task_list(fsess->tasks_reservoir, task);
 #endif
@@ -1703,16 +1968,21 @@
 					next = gf_fq_get(current_filter->tasks, 1);
 					if (next && next->schedule_next_time < task->schedule_next_time) {
 						if (task->notified) {
-							assert(fsess->tasks_pending);
+							gf_assert(fsess->tasks_pending);
 							safe_int_dec(&fsess->tasks_pending);
 							task->notified = GF_FALSE;
 						}
-						GF_LOG(GF_LOG_DEBUG, GF_LOG_SCHEDULER, ("Thread %u: task %s:%s reposted to filter task until task exec time is reached (%d us)\n", sys_thid, current_filter->name, task->log_name, (s32) (task->schedule_next_time - next->schedule_next_time) ));
+						GF_LOG(GF_LOG_DEBUG, GF_LOG_SCHEDULER, ("Thread %s: task %s:%s reposted to filter task until task exec time is reached (%d us)\n", sys_thid, current_filter->name, task->log_name, (s32) (task->schedule_next_time - next->schedule_next_time) ));
 						//remove task
 						gf_fq_pop(current_filter->tasks);
 						//and queue it after the next one
 						gf_fq_add(current_filter->tasks, task);
 						//and continue with the same filter
+#if defined(GPAC_CONFIG_EMSCRIPTEN) && !defined(GPAC_DISABLE_THREADS)
+						if (em_check_yield_th_proc(thid, sess_thread, enter_time)) {
+							return 0;
+						}
+#endif
 						continue;
 					}
 					//little optim here: if this is the main thread and we have other tasks pending
@@ -1736,7 +2006,7 @@
 							}
 
 							if (next_time_secondary<next_time_main) {
-								GF_LOG(GF_LOG_DEBUG, GF_LOG_SCHEDULER, ("Thread %u: forcing secondary task list on main - current task schedule time "LLU" (diff to now %d) vs next time secondary "LLU" (%s::%s)\n", sys_thid, task->schedule_next_time, (s32) diff, next_time_secondary, next->filter ? next->filter->freg->name : "", next->log_name));
+								GF_LOG(GF_LOG_DEBUG, GF_LOG_SCHEDULER, ("Thread %s: forcing secondary task list on main - current task schedule time "LLU" (diff to now %d) vs next time secondary "LLU" (%s::%s)\n", sys_thid, task->schedule_next_time, (s32) diff, next_time_secondary, next->filter ? next->filter->freg->name : "", next->log_name));
 								diff = 0;
 								force_secondary_tasks = GF_TRUE;
 								break;
@@ -1757,10 +2027,10 @@
 						tdiff -= now;
 						if (tdiff < 0) tdiff=0;
 						if (tdiff<diff) {
-							GF_LOG(GF_LOG_DEBUG, GF_LOG_SCHEDULER, ("Thread %u: next task has earlier exec time than current task %s:%s, adjusting sleep (old %d - new %d)\n", sys_thid, current_filter->name, task->log_name, (s32) diff, (s32) tdiff));
+							GF_LOG(GF_LOG_DEBUG, GF_LOG_SCHEDULER, ("Thread %s: next task has earlier exec time than current task %s:%s, adjusting sleep (old %d - new %d)\n", sys_thid, current_filter->name, task->log_name, (s32) diff, (s32) tdiff));
 							diff = tdiff;
 						} else {
-							GF_LOG(GF_LOG_DEBUG, GF_LOG_SCHEDULER, ("Thread %u: next task has earlier exec time#2 than current task %s:%s, adjusting sleep (old %d - new %d)\n", sys_thid, current_filter->name, task->log_name, (s32) diff, (s32) tdiff));
+							GF_LOG(GF_LOG_DEBUG, GF_LOG_SCHEDULER, ("Thread %s: next task has earlier exec time#2 than current task %s:%s, adjusting sleep (old %d - new %d)\n", sys_thid, current_filter->name, task->log_name, (s32) diff, (s32) tdiff));
 
 						}
 					}
@@ -1772,7 +2042,7 @@
 							if ( gf_fq_count(fsess->tasks) > MONOTH_MIN_TASKS)
 								diff = MONOTH_MIN_SLEEP;
 						}
-						GF_LOG(GF_LOG_DEBUG, GF_LOG_SCHEDULER, ("Thread %u: task %s:%s postponed for %d ms (scheduled time "LLU" us, next task schedule "LLU" us)\n", sys_thid, current_filter->name, task->log_name, (s32) diff, task->schedule_next_time, next_task_schedule_time));
+						GF_LOG(GF_LOG_DEBUG, GF_LOG_SCHEDULER, ("Thread %s: task %s:%s postponed for %d ms (scheduled time "LLU" us, next task schedule "LLU" us)\n", sys_thid, current_filter->name, task->log_name, (s32) diff, task->schedule_next_time, next_task_schedule_time));
 
 						gf_sleep((u32) diff);
 						active_start = gf_sys_clock_high_res();
@@ -1780,22 +2050,27 @@
 					diff = (s64)task->schedule_next_time;
 					diff -= (s64) gf_sys_clock_high_res();
 					if (diff > 100 ) {
+						u32 pending_tasks;
 						Bool use_main = (current_filter->freg->flags & GF_FS_REG_MAIN_THREAD) ? GF_TRUE : GF_FALSE;
-						GF_LOG(GF_LOG_DEBUG, GF_LOG_SCHEDULER, ("Thread %u: releasing current filter %s, exec time due in "LLD" us\n", sys_thid, current_filter->name, diff));
+						GF_LOG(GF_LOG_DEBUG, GF_LOG_SCHEDULER, ("Thread %s: releasing current filter %s, exec time for %s due in "LLD" us\n", sys_thid, current_filter->name, task->log_name, diff));
 						current_filter->process_th_id = 0;
 						current_filter->in_process = GF_FALSE;
 						//don't touch the current filter tasks, just repost the task to the main/secondary list
-						assert(gf_fq_count(current_filter->tasks));
+						gf_assert(gf_fq_count(current_filter->tasks));
+#ifndef GPAC_DISABLE_LOG
+						gf_log_pop_extra(current_filter->logs);
+#endif
 						current_filter = NULL;
 
 #ifdef CHECK_TASK_LIST_INTEGRITY
 						check_task_list(fsess->main_thread_tasks, task);
 						check_task_list(fsess->tasks, task);
 						check_task_list(fsess->tasks_reservoir, task);
-						assert(task->run_task);
+						gf_assert(task->run_task);
 #endif
 
 						if (use_main) {
+							pending_tasks = gf_fq_count(fsess->main_thread_tasks);
 							gf_fq_add(fsess->main_thread_tasks, task);
 							//we are the main thread and reposting to the main task list, don't notify/wait for the sema, just retry
 							//we are sure to get a task from main list at next iteration
@@ -1805,6 +2080,7 @@
 								gf_fs_sema_io(fsess, GF_TRUE, GF_TRUE);
 							}
 						} else {
+							pending_tasks = gf_fq_count(fsess->main_thread_tasks);
 							gf_fq_add(fsess->tasks, task);
 							//we are not the main thread and we are reposting to the secondary task list, don't notify/wait for the sema, just retry
 							//we are not sure to get a task from secondary list at next iteration, but the end of thread check will make
@@ -1819,36 +2095,44 @@
 						//because the first main task was not yet due for execution
 						//it is likely that the execution of the next task will not wake up the main thread
 						//but we must reevaluate the previous main task timing, so we force a notification of the main sema
-						if (force_secondary_tasks)
+						if (force_secondary_tasks) {
 							gf_fs_sema_io(fsess, GF_TRUE, GF_TRUE);
+						} else if (!thid && fsess->non_blocking && !pending_tasks) {
+							GF_LOG(GF_LOG_DEBUG, GF_LOG_SCHEDULER, ("Main thread proc exit\n"));
+							safe_int_dec(&fsess->active_threads);
+							return 0;
+						}
 
+#if defined(GPAC_CONFIG_EMSCRIPTEN) && !defined(GPAC_DISABLE_THREADS)
+						if (em_check_yield_th_proc(thid, sess_thread, enter_time)) {
+							return 0;
+						}
+#endif
 						continue;
 					}
 					force_secondary_tasks=GF_FALSE;
 				}
 			}
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_SCHEDULER, ("Thread %u: task %s:%s schedule time "LLU" us reached (diff %d ms)\n", sys_thid, current_filter ? current_filter->name : "", task->log_name, task->schedule_next_time, (s32) diff));
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_SCHEDULER, ("Thread %s: task %s:%s schedule time "LLU" us reached (diff %d ms)\n", sys_thid, current_filter ? current_filter->name : "", task->log_name, task->schedule_next_time, (s32) diff));
 
 		}
 		next_task_schedule_time = 0;
 
 		if (current_filter) {
 			current_filter->scheduled_for_next_task = GF_TRUE;
-			assert(!current_filter->in_process);
+			gf_assert(!current_filter->in_process);
 			current_filter->in_process = GF_TRUE;
 			current_filter->process_th_id = gf_th_id();
 		}
 
 		sess_thread->nb_tasks++;
 		sess_thread->has_seen_eot = GF_FALSE;
-		if (task->filter) {
-			assert(gf_fq_count(task->filter->tasks));
-		}
+		gf_assert(!task->filter || gf_fq_count(task->filter->tasks));
 
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_SCHEDULER, ("Thread %u task#%d %p executing Filter %s::%s (%d tasks pending, %d(%d) process task queued)\n", sys_thid, sess_thread->nb_tasks, task, task->filter ? task->filter->name : "none", task->log_name, fsess->tasks_pending, task->filter ? task->filter->process_task_queued : 0, task->filter ? gf_fq_count(task->filter->tasks) : 0));
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_SCHEDULER, ("Thread %s task#%d %p executing Filter %s::%s (%d tasks pending, %d(%d) process task queued)\n", sys_thid, sess_thread->nb_tasks, task, task->filter ? task->filter->name : "none", task->log_name, fsess->tasks_pending, task->filter ? task->filter->process_task_queued : 0, task->filter ? gf_fq_count(task->filter->tasks) : 0));
 
 		safe_int_inc(& fsess->tasks_in_process );
-		assert( task->run_task );
+		gf_assert( task->run_task );
 		task_time = gf_sys_clock_high_res();
 		//remember the last time we scheduled this filter
 		if (task->filter)
@@ -1856,7 +2140,9 @@
 
 		task->can_swap = 0;
 		task->requeue_request = GF_FALSE;
+		task->thid = 1+thid;
 		task->run_task(task);
+		task->thid = 0;
 		requeue = task->requeue_request;
 
 		task_time = gf_sys_clock_high_res() - task_time;
@@ -1876,6 +2162,15 @@
 			current_filter->time_process += task_time;
 			consecutive_filter_tasks++;
 
+#if defined(GPAC_CONFIG_EMSCRIPTEN)
+			//for mono-thread case non blocking: if filter is marked as async blocking, abort and release
+			//control to caller
+			if  (!thid && fsess->non_blocking && (current_filter->freg->flags & GF_FS_REG_ASYNC_BLOCK)) {
+				consecutive_filter_tasks=11;
+				fsess->in_main_sem_wait = GF_TRUE;
+			}
+#endif
+
 			gf_mx_p(current_filter->tasks_mx);
 			if (gf_fq_count(current_filter->tasks)==1) {
 				//if task is set to immediate reschedule, don't consider this is the last task
@@ -1889,12 +2184,12 @@
 			}
 			//if last task
 			if ( last_task
-				//if requeue request and stream reset pending (we must exit the filter task loop for the reset task to pe processed)
+				//if requeue request and stream reset pending (we must exit the filter task loop for the reset task to be processed)
 				|| (requeue && current_filter->stream_reset_pending)
-				//or requeue request and pid swap pending (we must exit the filter task loop for the swap task to pe processed)
+				//or requeue request and pid swap pending (we must exit the filter task loop for the swap task to be processed)
 				|| (requeue && (current_filter->swap_pidinst_src ||  current_filter->swap_pidinst_dst) )
 				//or requeue request and pid detach / cap negotiate pending
-				|| (requeue && (current_filter->out_pid_connection_pending || current_filter->detached_pid_inst || current_filter->caps_negociate) )
+				|| (requeue && (current_filter->out_pid_connection_pending || current_filter->detached_pid_inst || current_filter->caps_negotiate) )
 
 				//or requeue request and we have been running on that filter for more than 10 times, abort
 				|| (requeue && (consecutive_filter_tasks>10))
@@ -1945,6 +2240,10 @@
 #ifdef CHECK_TASK_LIST_INTEGRITY
 				if (requeue && !skip_filter_task_check) check_task_list(current_filter->tasks, task);
 #endif
+
+#ifndef GPAC_DISABLE_LOG
+				gf_log_pop_extra(current_filter->logs);
+#endif
 				current_filter = NULL;
 			} else {
 				//drop task from filter task list
@@ -1956,6 +2255,9 @@
 					current_filter->in_process = GF_FALSE;
 					current_filter->scheduled_for_next_task = GF_FALSE;
 					gf_mx_v(current_filter->tasks_mx);
+#ifndef GPAC_DISABLE_LOG
+					gf_log_pop_extra(current_filter->logs);
+#endif
 					current_filter = NULL;
 				} else {
 #ifdef CHECK_TASK_LIST_INTEGRITY
@@ -1978,11 +2280,11 @@
 		if (requeue) {
 			//if requeue on a filter active, use filter queue to avoid another thread grabing the task (we would have concurrent access to the filter)
 			if (current_filter) {
-				GF_LOG(GF_LOG_DEBUG, GF_LOG_SCHEDULER, ("Thread %u re-posted task Filter %s::%s in filter tasks (%d pending)\n", sys_thid, task->filter->name, task->log_name, fsess->tasks_pending));
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_SCHEDULER, ("Thread %s re-posted task Filter %s::%s in filter tasks (%d pending)\n", sys_thid, task->filter->name, task->log_name, fsess->tasks_pending));
 				task->notified = GF_FALSE;
 				//keep this thread running on the current filter no signaling of semaphore
 			} else {
-				GF_LOG(GF_LOG_DEBUG, GF_LOG_SCHEDULER, ("Thread %u re-posted task Filter %s::%s in %s tasks (%d pending)\n", sys_thid, task->filter ? task->filter->name : "none", task->log_name, (task->filter && (task->filter->freg->flags & GF_FS_REG_MAIN_THREAD)) ? "main" : "secondary", fsess->tasks_pending));
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_SCHEDULER, ("Thread %s re-posted task Filter %s::%s in %s tasks (%d pending)\n", sys_thid, task->filter ? task->filter->name : "none", task->log_name, (task->filter && (task->filter->freg->flags & GF_FS_REG_MAIN_THREAD)) ? "main" : "secondary", fsess->tasks_pending));
 
 				task->notified = GF_TRUE;
 				safe_int_inc(&fsess->tasks_pending);
@@ -1998,11 +2300,13 @@
 				if (task->filter && (task->filter->freg->flags & GF_FS_REG_MAIN_THREAD)) {
 					gf_fq_add(fsess->main_thread_tasks, task);
 
+#ifndef GPAC_DISABLE_THREADS
 					//FIXME, we sometimes miss a sema notfiy resulting in secondary tasks being locked
 					//until we find the cause, notify secondary sema if non-main-thread tasks are scheduled and we are the only task in main
 					if (use_main_sema && (thid==0) && fsess->threads && (gf_fq_count(fsess->main_thread_tasks)==1) && gf_fq_count(fsess->tasks)) {
 						gf_fs_sema_io(fsess, GF_TRUE, GF_FALSE);
 					}
+#endif
 				} else {
 					gf_fq_add(fsess->tasks, task);
 				}
@@ -2026,19 +2330,16 @@
 				gf_mx_v(fsess->filters_mx);
 			}
 #endif
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_SCHEDULER, ("Thread %u task#%d %p pushed to reservoir\n", sys_thid, sess_thread->nb_tasks, task));
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_SCHEDULER, ("Thread %s task#%d %p pushed to reservoir\n", sys_thid, sess_thread->nb_tasks, task));
 
-			if (fsess->tasks_reservoir) {
-				memset(task, 0, sizeof(GF_FSTask));
-				gf_fq_add(fsess->tasks_reservoir, task);
-			} else {
+			if (gf_fq_res_add(fsess->tasks_reservoir, task)) {
 				gf_free(task);
 			}
 		}
 
 		//decrement task counter
 		if (notified) {
-			assert(fsess->tasks_pending);
+			gf_assert(fsess->tasks_pending);
 			safe_int_dec(&fsess->tasks_pending);
 		}
 		if (current_filter) {
@@ -2063,18 +2364,26 @@
 		if (!thid && fsess->non_blocking && !current_filter && !fsess->pid_connect_tasks_pending) {
 			gf_rmt_end();
 			GF_LOG(GF_LOG_DEBUG, GF_LOG_SCHEDULER, ("Main thread proc exit\n"));
+			safe_int_dec(&fsess->active_threads);
 			return 0;
 		}
 	}
 
 	gf_rmt_end();
 
+	safe_int_dec(&fsess->active_threads);
 	//no main thread, return
 	if (!thid && fsess->non_blocking) {
 		GF_LOG(GF_LOG_DEBUG, GF_LOG_SCHEDULER, ("Main thread proc exit\n"));
 		return 0;
 	}
-	sess_thread->run_time = gf_sys_clock_high_res() - enter_time;
+
+#if defined(GPAC_CONFIG_EMSCRIPTEN) && !defined(GPAC_DISABLE_THREADS)
+	if (thid) {
+		sess_thread->run_time += gf_sys_clock_high_res() - enter_time;
+	} else
+#endif
+		sess_thread->run_time = gf_sys_clock_high_res() - enter_time;
 
 	safe_int_inc(&fsess->nb_threads_stopped);
 
@@ -2096,12 +2405,20 @@
 GF_EXPORT
 GF_Err gf_fs_run(GF_FilterSession *fsess)
 {
-	u32 i, nb_threads;
-	assert(fsess);
+	if (!fsess) return GF_BAD_PARAM;
 
 	//non blocking mode and threads created, only run main thread proc
 	if (fsess->non_blocking && (fsess->non_blocking==2) ) {
+#ifdef GPAC_CONFIG_EMSCRIPTEN
+		if (fsess->pending_threads) return GF_NOT_READY;
+#endif
 		gf_fs_thread_proc(&fsess->main_th);
+#ifdef GPAC_CONFIG_EMSCRIPTEN
+		if (fsess->in_main_sem_wait) {
+			fsess->in_main_sem_wait = GF_FALSE;
+			return GF_NOT_READY;
+		}
+#endif
 		return fsess->run_status;
 	}
 
@@ -2110,14 +2427,29 @@
 	fsess->main_th.has_seen_eot = GF_FALSE;
 	fsess->nb_threads_stopped = 0;
 
+#ifndef GPAC_DISABLE_THREADS
+	u32 i, nb_threads;
 	nb_threads = gf_list_count(fsess->threads);
 	for (i=0;i<nb_threads; i++) {
 		GF_SessionThread *sess_th = gf_list_get(fsess->threads, i);
-		gf_th_run(sess_th->th, (gf_thread_run) gf_fs_thread_proc, sess_th);
+		if ( gf_th_run(sess_th->th, (gf_thread_run) gf_fs_thread_proc, sess_th) ==GF_OK) {
+#ifdef GPAC_CONFIG_EMSCRIPTEN
+			if (fsess->non_blocking) {
+				safe_int_inc(&fsess->pending_threads);
+			}
+#endif
+		}
 	}
+#endif
 
-	//run main thread
-	gf_fs_thread_proc(&fsess->main_th);
+
+	//run main thread - for emscripten, we only call if no pending threads
+#ifdef GPAC_CONFIG_EMSCRIPTEN
+	if (!fsess->pending_threads)
+#endif
+	{
+		gf_fs_thread_proc(&fsess->main_th);
+	}
 
 	//non blocking mode init, don't wait for other threads
 	if (fsess->non_blocking) {
@@ -2125,10 +2457,12 @@
 		return fsess->run_status;
 	}
 
+#ifndef GPAC_DISABLE_THREADS
 	//blocking mode, wait for all threads to be done
 	while (nb_threads+1 != fsess->nb_threads_stopped) {
 		gf_sleep(1);
 	}
+#endif
 
 	return fsess->run_status;
 }
@@ -2167,12 +2501,14 @@
 	//disable all sources
 	for (i=0; i<count; i++) {
 		GF_Filter *filter = gf_list_get(fsess->filters, i);
+		if (!filter) continue;
 		//force end of session on all sources, and on all filters connected to these sources, and dispatch end of stream on all outputs pids of these filters
 		//if we don't propagate on connected filters, we take the risk of not deactivating demuxers working from file
 		//(eg ignoring input packets)
 		//
 		//we shortcut the thread execution state here by directly calling set_eos, we need to lock/unlock our filters carefully
 		//to avoid deadlocks or crashes
+		gf_mx_v(fsess->filters_mx);
 		gf_mx_p(filter->tasks_mx);
 
 		if (!filter->num_input_pids) {
@@ -2261,6 +2597,7 @@
 		}
 
 		gf_mx_v(filter->tasks_mx);
+		gf_mx_p(fsess->filters_mx);
 	}
 	gf_mx_v(fsess->filters_mx);
 	return GF_OK;
@@ -2269,8 +2606,12 @@
 GF_EXPORT
 GF_Err gf_fs_stop(GF_FilterSession *fsess)
 {
-	u32 i, count = fsess->threads ? gf_list_count(fsess->threads) : 0;
-
+	u32 i;
+#ifndef GPAC_DISABLE_THREADS
+	u32 count = fsess->threads ? gf_list_count(fsess->threads) : 0;
+#else
+	u32 count=0;
+#endif
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("Session stop\n"));
 	if (count+1 == fsess->nb_threads_stopped) {
 		return GF_OK;
@@ -2281,6 +2622,12 @@
 		fsess->run_status = GF_EOS;
 	}
 
+	//update runtime for main thread in non-blocking mode
+	if (fsess->non_blocking) {
+		fsess->main_th.run_time = gf_sys_clock_high_res() - fsess->main_th.run_time;
+	}
+
+
 	for (i=0; i < count; i++) {
 		gf_fs_sema_io(fsess, GF_TRUE, GF_FALSE);
 	}
@@ -2347,8 +2694,13 @@
 GF_EXPORT
 void gf_fs_print_stats(GF_FilterSession *fsess)
 {
-	u64 run_time=0, active_time=0, nb_tasks=0, nb_filters=0;
+#ifndef GPAC_DISABLE_THREADS
+	u64 run_time=0, active_time=0, nb_tasks=0;
+#endif
 	u32 i, count;
+#ifndef GPAC_DISABLE_LOG
+	u32 nb_filters=0;
+#endif
 
 	GF_LOG(GF_LOG_INFO, GF_LOG_APP, ("\n"));
 	gf_mx_p(fsess->filters_mx);
@@ -2357,15 +2709,18 @@
 	for (i=0; i<count; i++) {
 		GF_Filter *f = gf_list_get(fsess->filters, i);
 		if (f->multi_sink_target) continue;
+#ifndef GPAC_DISABLE_LOG
 		nb_filters++;
+#endif
 	}
 
 	GF_LOG(GF_LOG_INFO, GF_LOG_APP, ("Filter stats - %d filters\n", nb_filters));
 	for (i=0; i<count; i++) {
 		u32 k, ipids, opids;
 		GF_Filter *f = gf_list_get(fsess->filters, i);
-		if (f->multi_sink_target) continue;
+		if (!f || f->multi_sink_target) continue;
 
+		gf_mx_v(fsess->filters_mx);
 		gf_mx_p(f->tasks_mx);
 
 		ipids = f->num_input_pids;
@@ -2417,14 +2772,20 @@
 #endif
 
 		gf_mx_v(f->tasks_mx);
+		gf_mx_p(fsess->filters_mx);
 	}
 	gf_mx_v(fsess->filters_mx);
 
+#ifndef GPAC_DISABLE_THREADS
 	count=gf_list_count(fsess->threads);
-	GF_LOG(GF_LOG_INFO, GF_LOG_APP, ("Session stats - threads %d\n", 1+count));
+	GF_LOG(GF_LOG_INFO, GF_LOG_APP, ("Session stats - threads %d\n\tThread 1: ", 1+count));
+#else
+	GF_LOG(GF_LOG_INFO, GF_LOG_APP, ("Session stats: "));
+#endif
 
-	GF_LOG(GF_LOG_INFO, GF_LOG_APP, ("\tThread %u: run_time "LLU" us active_time "LLU" us nb_tasks "LLU"\n", 1, fsess->main_th.run_time, fsess->main_th.active_time, fsess->main_th.nb_tasks));
+	GF_LOG(GF_LOG_INFO, GF_LOG_APP, ("run_time "LLU" us active_time "LLU" us nb_tasks "LLU"\n", fsess->main_th.run_time, fsess->main_th.active_time, fsess->main_th.nb_tasks));
 
+#ifndef GPAC_DISABLE_THREADS
 	run_time+=fsess->main_th.run_time;
 	active_time+=fsess->main_th.active_time;
 	nb_tasks+=fsess->main_th.nb_tasks;
@@ -2439,6 +2800,7 @@
 		nb_tasks+=s->nb_tasks;
 	}
 	GF_LOG(GF_LOG_INFO, GF_LOG_APP, ("\nTotal: run_time "LLU" us active_time "LLU" us nb_tasks "LLU"\n", run_time, active_time, nb_tasks));
+#endif
 }
 
 static void gf_fs_print_filter_outputs(GF_Filter *f, GF_List *filters_done, u32 indent, GF_FilterPid *pid, GF_Filter *alias_for, u32 src_num_tiled_pids, Bool skip_print, s32 nb_recursion, u32 max_length)
@@ -2450,7 +2812,6 @@
 			GF_LOG(GF_LOG_INFO, GF_LOG_APP, ("-"));
 			i++;
 		}
-
 		if (src_num_tiled_pids>1) {
 			GF_LOG(GF_LOG_INFO, GF_LOG_APP, ("(tilePID%d) ", src_num_tiled_pids));
 		}
@@ -2512,6 +2873,8 @@
 		}
 		GF_LOG(GF_LOG_INFO, GF_LOG_APP, (")\n"));
 	}
+	if (f->num_output_pids<=1)
+		src_num_tiled_pids = 0;
 
 	GF_List *dests = gf_list_new();
 	for (i=0; i<f->num_output_pids; i++) {
@@ -2548,10 +2911,16 @@
 				for (j=0; j<f->num_output_pids; j++) {
 					GF_FilterPid *apid = gf_list_get(f->output_pids, j);
 					p = gf_filter_pid_get_property(apid, GF_PROP_PID_CODECID);
+					//if this is a tile pid, check if it is connected to our destination
 					if (p &&
 						((p->value.uint==GF_CODECID_HEVC_TILES) || (p->value.uint==GF_CODECID_VVC_SUBPIC))
 					) {
-						num_tile_pids++;
+						u32 k;
+						for (k=0; k<apid->num_destinations; k++) {
+							GF_FilterPidInst *pidi = gf_list_get(apid->destinations, k);
+							if (pidi->filter != dest) continue;
+							num_tile_pids++;
+						}
 					}
 				}
 				plen = 5;
@@ -2629,6 +2998,7 @@
 		//only dump not connected ones
 		if (f->num_input_pids || f->num_output_pids || f->multi_sink_target || f->nb_tasks_done) continue;
 		if (f->disabled==GF_FILTER_DISABLED_HIDE) continue;
+		if (f->filter_skiped) continue;
 
 		if (ignore_sinks) {
 			Bool has_outputs;
@@ -2689,6 +3059,7 @@
 	for (i=0; i<count; i++) {
 		GF_Filter *f = gf_list_get(fsess->filters, i);
 		if (f->multi_sink_target) continue;
+		if (f->filter_skiped) continue;
 		if (gf_list_find(filters_done, f)>=0) continue;
 		if (f->disabled==GF_FILTER_DISABLED_HIDE) continue;
 		if (!has_undefined) {
@@ -2782,6 +3153,10 @@
 		sep = strchr(name, fsess->sep_name);
 		if (sep) sep0 = 0;
 	}
+	if (!strcmp(name, "LT")) {
+		filter_parse_logs(filter, val);
+		return;
+	}
 
 	//find arg and check if it is only a sync update - if so do it now
 	i=0;
@@ -2989,6 +3364,8 @@
 			szForceExt19=0;
 			ext = strchr(szForceExt, fsess->sep_args);
 			if (ext) ext0 = 0;
+		} else {
+			szForceExt0 = 0;
 		}
 	}
 	sURL = NULL;
@@ -3126,8 +3503,9 @@
 			continue;
 
 		s = freg->probe_url(sURL, mime_type);
-		if (szForceExt0 && (s==GF_FPROBE_NOT_SUPPORTED))
-			s = freg->probe_url(szForceExt, mime_type);
+		if (!for_source && (s==GF_FPROBE_MAYBE_NOT_SUPPORTED)) {
+			s = szForceExt0 ? freg->probe_url(szForceExt, mime_type) : GF_FPROBE_NOT_SUPPORTED;
+		}
 		/* destination meta filter: change GF_FPROBE_SUPPORTED to GF_FPROBE_MAYBE_SUPPORTED for internal mux formats
 		in order to avoid always giving the hand to the meta filter*/
 		if (!for_source && (s == GF_FPROBE_SUPPORTED) && (freg->flags & GF_FS_REG_META)) {
@@ -3347,13 +3725,13 @@
 
 static void gf_fs_print_jsf_connection(GF_FilterSession *session, char *filter_name, GF_Filter *js_filter, void (*print_fn)(FILE *output, GF_SysPrintArgFlags flags, const char *fmt, ...) )
 {
-	GF_CapsBundleStore capstore;
 	const char *js_name = NULL;
 	GF_Err e=GF_OK;
 	u32 i, j, count, nb_js_caps;
 	GF_List *sources, *sinks;
 	GF_FilterRegister loaded_freg;
 	Bool has_output, has_input;
+	GF_FilterRegDesc local_reg;
 
 	if (!js_filter) {
 		if (!filter_name) return;
@@ -3378,7 +3756,8 @@
 	has_output = gf_filter_has_out_caps(js_filter->forced_caps, js_filter->nb_forced_caps);
 	has_input = gf_filter_has_in_caps(js_filter->forced_caps, js_filter->nb_forced_caps);
 
-	memset(&capstore, 0, sizeof(GF_CapsBundleStore));
+	memset(&local_reg, 0, sizeof(GF_FilterRegDesc));
+	GF_SAFEALLOC(local_reg.bundle_cache, GF_BundleCache);
 	sources = gf_list_new();
 	sinks = gf_list_new();
 	//edges for JS are for the unloaded JSF (eg accept anything, output anything).
@@ -3393,21 +3772,21 @@
 
 		//check which cap of this filter matches our destination
 		nb_src_caps = gf_filter_caps_bundle_count(a_reg->freg->caps, a_reg->freg->nb_caps);
+		GF_SAFEALLOC(a_reg->bundle_cache, GF_BundleCache);
 		for (k=0; k<nb_src_caps; k++) {
 			for (l=0; l<nb_js_caps; l++) {
-				s32 bundle_idx;
 				u32 loaded_filter_only_flags = 0;
 				u32 path_weight;
 				if (has_input && !src_match) {
-					path_weight = gf_filter_caps_to_caps_match(a_reg->freg, k, (const GF_FilterRegister *) &loaded_freg, NULL, &bundle_idx, l, &loaded_filter_only_flags, &capstore);
-					if (path_weight && (bundle_idx == l))
+					path_weight = gf_filter_caps_to_caps_match(a_reg->freg, k, (const GF_FilterRegister *) &loaded_freg, NULL, l, &loaded_filter_only_flags, NULL, a_reg->bundle_cache, local_reg.bundle_cache);
+					if (path_weight)
 						src_match = GF_TRUE;
 				}
 				if (has_output && !sink_match) {
 					loaded_filter_only_flags = 0;
-					path_weight = gf_filter_caps_to_caps_match(&loaded_freg, l, a_reg->freg, NULL, &bundle_idx, k, &loaded_filter_only_flags, &capstore);
+					path_weight = gf_filter_caps_to_caps_match(&loaded_freg, l, a_reg->freg, NULL, k, &loaded_filter_only_flags, NULL, local_reg.bundle_cache, a_reg->bundle_cache);
 
-					if (path_weight && (bundle_idx == k))
+					if (path_weight)
 						sink_match = GF_TRUE;
 				}
 			}
@@ -3416,7 +3795,10 @@
 		}
 		if (src_match) gf_list_add(sources, (void *) a_reg->freg);
 		if (sink_match) gf_list_add(sinks, (void *) a_reg->freg);
+
+		bundle_cache_free(a_reg);
 	}
+	bundle_cache_free(&local_reg);
 
 	for (i=0; i<2; i++) {
 		GF_List *from = i ? sinks : sources;
@@ -3427,7 +3809,7 @@
 			if (print_fn)
 				print_fn(stderr, 1, "%s: no %s\n", js_name, type);
 			else {
-				GF_LOG(GF_LOG_INFO, GF_LOG_APP, ("%s: no %s\n", type));
+				GF_LOG(GF_LOG_INFO, GF_LOG_APP, ("%s: no %s\n", js_name, type));
 			}
 			continue;
 		}
@@ -3452,9 +3834,7 @@
 		}
 	}
 
-	if (capstore.bundles_cap_found) gf_free(capstore.bundles_cap_found);
-	if (capstore.bundles_in_ok) gf_free(capstore.bundles_in_ok);
-	if (capstore.bundles_in_scores) gf_free(capstore.bundles_in_scores);
+	reset_bundle_cache(session);
 	gf_list_del(sources);
 	gf_list_del(sinks);
 }
@@ -3484,9 +3864,9 @@
 
 		found = GF_TRUE;
 		if (print_fn)
-			print_fn(stderr, 1, "%s sources:%s", src->freg->name, src->nb_edges ? "" : " none");
+			print_fn(stderr, 1, "%s sources:%s", src->freg->name, src->nb_edges ? "" : " none\n");
 		else {
-			GF_LOG(GF_LOG_INFO, GF_LOG_APP, ("%s sources:%s", src->freg->name, src->nb_edges ? "" : " none"));
+			GF_LOG(GF_LOG_INFO, GF_LOG_APP, ("%s sources:%s", src->freg->name, src->nb_edges ? "" : " none\n"));
 		}
 		if (!src->nb_edges)
 			continue;
@@ -3506,7 +3886,7 @@
 						GF_LOG(GF_LOG_INFO, GF_LOG_APP, (" ( ", src->edgesj.src_reg->freg->name));
 					}
 					for (k=0; k<src->nb_edges; k++) {
-						if (src->edgesj.src_reg != src->edgesk.src_reg) continue;;
+						if (src->edgesj.src_reg != src->edgesk.src_reg) continue;
 
 						if (print_fn)
 							print_fn(stderr, 0, "%d->%d ", src->edgesk.src_cap_idx, src->edgesk.dst_cap_idx);
@@ -3605,6 +3985,7 @@
 	gf_log_set_tool_level(GF_LOG_FILTER, llev);
 }
 
+
 GF_EXPORT
 void gf_filter_print_all_connections(GF_Filter *filter, void (*print_fn)(FILE *output, GF_SysPrintArgFlags flags, const char *fmt, ...) )
 {
@@ -3650,6 +4031,7 @@
 	}
 }
 
+#ifndef GPAC_DISABLE_NETWORK
 static Bool gf_fsess_get_user_pass(void *usr_cbk, Bool secure, const char *site_url, char *usr_name, char *password, gf_dm_on_usr_pass async_pass, void *async_udta)
 {
 	GF_Event evt;
@@ -3663,15 +4045,22 @@
 	evt.auth.async_usr_data = async_udta;
 	return gf_fs_forward_gf_event(fsess, &evt, GF_FALSE, GF_FALSE);
 }
+#endif
 
 static GF_DownloadManager *gf_fs_get_download_manager(GF_FilterSession *fs)
 {
+#ifdef GPAC_USE_DOWNLOADER
 	if (!fs->download_manager) {
 		fs->download_manager = gf_dm_new(fs);
 
+#ifndef GPAC_DISABLE_NETWORK
 		gf_dm_set_auth_callback(fs->download_manager, gf_fsess_get_user_pass, fs);
+#endif
 	}
 	return fs->download_manager;
+#else
+	return NULL;
+#endif
 }
 
 GF_EXPORT
@@ -3684,7 +4073,7 @@
 GF_EXPORT
 struct _gf_ft_mgr *gf_fs_get_font_manager(GF_FilterSession *fsess)
 {
-#ifdef GPAC_DISABLE_PLAYER
+#ifdef GPAC_DISABLE_FONTS
 	return NULL;
 #else
 	if (!fsess->font_manager) {
@@ -3703,7 +4092,7 @@
 
 void gf_fs_cleanup_filters(GF_FilterSession *fsess)
 {
-	assert(fsess->pid_connect_tasks_pending);
+	gf_assert(fsess->pid_connect_tasks_pending);
 	safe_int_dec(&fsess->pid_connect_tasks_pending);
 }
 
@@ -3763,7 +4152,7 @@
 		gf_free((char *) task->log_name);
 		task->requeue_request = GF_FALSE;
 	} else {
-		assert(task->requeue_request);
+		gf_assert(task->requeue_request);
 		task->schedule_next_time = gf_sys_clock_high_res() + 1000*reschedule_ms;
 	}
 }
@@ -3959,6 +4348,9 @@
 		if ((f->num_input_pids!=1) && f->num_output_pids)
 			continue;
 
+		if (!pidi->pid)
+			continue;
+
 		if (!stats->codecid)
 			stats->codecid = pidi->pid->codecid;
 		if (!stats->stream_type)
@@ -4011,7 +4403,7 @@
 GF_Filter *gf_fs_new_filter(GF_FilterSession *fsess, const char *name, u32 flags, GF_Err *e)
 {
 	GF_Filter *f;
-	char szRegName25;
+	char *sep, szRegName25;
 	GF_FilterRegister *reg;
 
 	GF_SAFEALLOC(reg, GF_FilterRegister);
@@ -4028,16 +4420,18 @@
 #endif
 	reg->version = "custom";
 	sprintf(szRegName, "custom%p", reg);
+	sep = strchr(name, fsess->sep_args);
+	if (sep) sep0 = 0;
 	reg->name = gf_strdup(name ? name : szRegName);
 	reg->flags = GF_FS_REG_CUSTOM | GF_FS_REG_EXPLICIT_ONLY;
 
 	if (flags & GF_FS_REG_MAIN_THREAD)
 		reg->flags |= GF_FS_REG_MAIN_THREAD;
 
-	f = gf_filter_new(fsess, reg, NULL, NULL, 0, e, NULL, GF_FALSE);
-	if (!f) return NULL;
-	if (name)
+	f = gf_filter_new(fsess, reg, sep ? sep+1 : NULL, NULL, 0, e, NULL, GF_FALSE);
+	if (f && name)
 		gf_filter_set_name(f, name);
+	if (sep) sep0 = fsess->sep_args;
 	return f;
 }
 
@@ -4175,33 +4569,43 @@
 GF_EXPORT
 u32 gf_fs_get_http_max_rate(GF_FilterSession *fs)
 {
+#ifdef GPAC_USE_DOWNLOADER
 	if (!fs->download_manager) {
 		gf_fs_get_download_manager(fs);
 		if (!fs->download_manager) return 0;
 	}
 	return gf_dm_get_data_rate(fs->download_manager);
+#else
+	return 0;
+#endif
 }
 
 GF_EXPORT
 GF_Err gf_fs_set_http_max_rate(GF_FilterSession *fs, u32 rate)
 {
+#ifdef GPAC_USE_DOWNLOADER
 	if (!fs) return GF_OK;
 	if (!fs->download_manager) {
 		gf_fs_get_download_manager(fs);
 		if (!fs->download_manager) return GF_OUT_OF_MEM;
 	}
 	gf_dm_set_data_rate(fs->download_manager, rate);
+#endif
 	return GF_OK;
 }
 
 GF_EXPORT
 u32 gf_fs_get_http_rate(GF_FilterSession *fs)
 {
+#ifdef GPAC_USE_DOWNLOADER
 	if (!fs->download_manager) {
 		gf_fs_get_download_manager(fs);
 		if (!fs->download_manager) return 0;
 	}
 	return gf_dm_get_global_rate(fs->download_manager);
+#else
+	return 0;
+#endif
 }
 
 GF_EXPORT
@@ -4406,3 +4810,46 @@
 	return gf_fs_relocate_url(filter->session, service_url, parent_url, out_relocated_url, out_localized_url);
 }
 
+GF_EXPORT
+void gf_fs_send_deferred_play(GF_FilterSession *fsess)
+{
+	if (!fsess || !(fsess->flags & GF_FS_FLAG_PREVENT_PLAY)) return;
+	fsess->flags &= ~GF_FS_FLAG_PREVENT_PLAY;
+
+	gf_mx_p(fsess->filters_mx);
+	u32 i, count=gf_list_count(fsess->filters);
+	for (i=0;i<count;i++) {
+		GF_Filter *f = gf_list_get(fsess->filters, i);
+		u32 j;
+		if (f->has_out_caps) continue;;
+		for (j=0;j<f->num_input_pids; j++) {
+			GF_PropertyValue p;
+			GF_FilterEvent evt;
+			GF_FilterPid *pid = gf_list_get(f->input_pids, j);
+			Double start = 0;
+			Double speed = 1;
+
+			if (gf_filter_get_arg(f, "start", &p)) start = p.value.number;
+			if (gf_filter_get_arg(f, "speed", &p)) speed = p.value.number;
+
+			gf_filter_pid_init_play_event(pid, &evt, start, speed, f->name);
+			gf_filter_pid_send_event(pid, &evt);
+		}
+	}
+	gf_mx_v(fsess->filters_mx);
+}
+
+
+#ifdef GPAC_CONFIG_EMSCRIPTEN
+void gf_fs_force_non_blocking(GF_FilterSession *fs)
+{
+	if (fs) fs->non_blocking = GF_TRUE;
+}
+Bool gf_filter_on_main_thread(GF_Filter *filter)
+{
+	if (!filter) return GF_TRUE;
+	if (gf_th_id() != filter->session->main_th.th_id) return GF_FALSE;
+	if (filter->session->is_worker) return GF_FALSE;
+	return GF_TRUE;
+}
+#endif

gpac-2.2.1.tar.gz/src/filter_core/filter_session.h -> gpac-2.4.0.tar.gz/src/filter_core/filter_session.h Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2017-2022
+ *			Copyright (c) Telecom ParisTech 2017-2024
  *					All rights reserved
  *
  *  This file is part of GPAC / filters sub-project
@@ -42,7 +42,7 @@
 #define PCK_IS_INPUT(__pck) ((__pck->pck==__pck) ? GF_FALSE : GF_TRUE)
 #define PCK_IS_OUTPUT(__pck) ((__pck->pck==__pck) ? GF_TRUE : GF_FALSE)
 
-#define FSESS_CHECK_THREAD(__f) assert( !(__f)->process_th_id || ( (__f)->process_th_id == gf_th_id() ) );
+#define FSESS_CHECK_THREAD(__f) gf_assert( !(__f)->process_th_id || ( (__f)->process_th_id == gf_th_id() ) );
 
 struct __gf_prop_entry
 {
@@ -60,6 +60,7 @@
 //we use the same value internally but with reverse meaning
 #define GF_FS_FLAG_IMPLICIT_MODE	GF_FS_FLAG_NO_IMPLICIT
 
+#define GF_FS_FLAG_FORCE_DEBUG	(1<<30)
 
 #ifndef GF_PROPS_HASHTABLE_SIZE
 #define GF_PROPS_HASHTABLE_SIZE 0
@@ -121,7 +122,7 @@
 void *gf_fq_head(GF_FilterQueue *fq);
 u32 gf_fq_count(GF_FilterQueue *fq);
 void *gf_fq_get(GF_FilterQueue *fq, u32 idx);
-void gf_fq_enum(GF_FilterQueue *fq, Bool (*enum_func)(void *udta1, void *item), void *udta);
+void gf_fq_enum(GF_FilterQueue *fq, void (*enum_func)(void *udta1, void *item), void *udta);
 
 
 typedef void (*gf_destruct_fun)(void *cbck);
@@ -296,6 +297,7 @@
 	const char *log_name;
 	void *udta;
 	u32 class_type;
+	u32 thid;
 };
 
 void gf_fs_post_task(GF_FilterSession *fsess, gf_fs_task_callback fun, GF_Filter *filter, GF_FilterPid *pid, const char *log_name, void *udta);
@@ -421,7 +423,9 @@
 
 	GF_Mutex *ui_mx;
 
+#ifndef GPAC_DISABLE_THREADS
 	GF_List *threads;
+#endif
 	GF_SessionThread main_th;
 
 	//only used in forced lock mode
@@ -458,7 +462,7 @@
 
 	GF_DownloadManager *download_manager;
 
-#ifndef GPAC_DISABLE_PLAYER
+#ifndef GPAC_DISABLE_FONTS
 	struct _gf_ft_mgr *font_manager;
 #endif
 
@@ -489,7 +493,7 @@
 	GF_List *parsed_args;
 
 	char sep_args, sep_name, sep_frag, sep_list, sep_neg;
-	const char *blacklist;
+	char *blacklist;
 	Bool init_done;
 
 	GF_List *auto_inc_nums;
@@ -517,6 +521,14 @@
 	GF_List *uri_relocators;
 	GF_FSLocales locales;
 #endif
+
+#ifdef GPAC_CONFIG_EMSCRIPTEN
+	Bool is_worker;
+	volatile u32 pending_threads;
+#endif
+
+
+	u32 dbg_flags;
 };
 
 #ifdef GPAC_HAS_QJS
@@ -533,6 +545,7 @@
 	u32 crc;
 	s32 inc_val;
 	GF_Filter *filter;
+	GF_FilterPid *pid;
 } GF_FSAutoIncNum;
 
 #ifndef GPAC_DISABLE_3D
@@ -610,7 +623,11 @@
 	char *dst_args;
 	//filter tag
 	char *tag;
-	
+	//filter itag
+	char *itag;
+	//ID of netcap configuration for the filter
+	char *netcap_id;
+
 	//tasks pending for this filter. The first task in this list is also present in the filter session
 	//task list in order to avoid locking the main task list with a mutex
 	GF_FilterQueue *tasks;
@@ -624,6 +641,7 @@
 	void *filter_udta;
 
 	Bool has_out_caps;
+	Bool in_force_flush;
 
 	GF_FilterDisableType disabled;
 	//set to true before calling filter process() callback, and reset to false right after
@@ -631,7 +649,8 @@
 	Bool no_probe;
 	Bool no_inputs;
 	Bool is_blocking_source;
-	Bool force_demux;
+	//0: no action, 1: force demux if input is file, 2: force demux if input is not file (i.e :nomux=0)
+	u32 force_demux;
 
 	s32 nb_pids_playing;
 
@@ -666,6 +685,7 @@
 	volatile u32 out_pid_connection_pending;
 	volatile u32 pending_packets;
 	volatile u32 nb_ref_packets;
+	volatile u64 ref_bytes;
 
 	volatile u32 stream_reset_pending;
 	volatile u32 num_events_queued;
@@ -731,6 +751,8 @@
 
 	//requested by a filter to disable blocking
 	Bool prevent_blocking;
+	Bool in_eos_resume;
+	Bool deferred_link;
 
 	//filter destroy task has been posted
 	Bool finalized;
@@ -755,7 +777,7 @@
 	//set to true during pid link resolution for filters accepting a single pid
 	Bool in_link_resolution;
 	//one of the output PID needs reconfiguration
-	volatile u32 nb_caps_renegociate;
+	volatile u32 nb_caps_renegotiate;
 
 	//number of process tasks queued. There is only one "process" task allocated for the filter, but it is automatically reposted based on this value
 	volatile u32 process_task_queued;
@@ -770,7 +792,7 @@
 
 	GF_Filter *cap_dst_filter;
 	//capability negotiation for the input pid
-	GF_PropertyMap *caps_negociate;
+	GF_PropertyMap *caps_negotiate;
 	//set to true of this filter was instantiated to resolve a capability negotiation between two filters
 	Bool is_pid_adaptation_filter;
 	/*destination pid instance we are swapping*/
@@ -778,10 +800,11 @@
 	/*source pid instance we are swapping*/
 	GF_FilterPidInst *swap_pidinst_src;
 	Bool swap_needs_init;
+	Bool swap_pending;
 
 	//overloaded caps of the filter
 	const GF_FilterCapability *forced_caps;
-	u32 nb_forced_caps;
+	u32 nb_forced_caps, nb_forced_bundles;
 	//valid when a pid inst is waiting for a reconnection, NULL otherwise
 	GF_List *detached_pid_inst;
 
@@ -794,9 +817,14 @@
 	Bool reconfigure_outputs;
 	//when set, indicates the filter uses PID property overwrite in its arguments, needed to rewrite the props at pid init time
 	Bool user_pid_props;
+#ifdef GPAC_ENABLE_DEBUG
+	u32 prop_dump;
+#endif
 
 	//for encoder filters, set to the corresponding stream type - used to discard filters during the resolution
-	u32 encoder_stream_type;
+	u32 encoder_codec_id;
+	GF_PropStringList skip_cids;
+	Bool filter_skiped;
 
 	Bool act_as_sink;
 	Bool require_source_id;
@@ -834,6 +862,10 @@
 	GF_Filter *multi_sink_target;
 
 	Bool event_target;
+	//clone of filter for new instance handling - if  new instance is required by configure
+	//if NULL, clone and rememeber here the clone
+	//if not NULL, post configure to the cloned instance
+	struct __gf_filter *cloned_instance;
 
 	u64 last_schedule_task_time;
 
@@ -844,6 +876,11 @@
 	GF_Filter *single_source;
 
 	char *meta_instances;
+	Bool no_segsize_evts;
+
+#ifndef GPAC_DISABLE_LOG
+	GF_LogExtra *logs;
+#endif
 
 #ifdef GPAC_HAS_QJS
 	char *iname;
@@ -878,6 +915,8 @@
 
 void gf_filter_instance_detach_pid(GF_FilterPidInst *pidi);
 
+void filter_parse_logs(GF_Filter *filter, const char *_logs);
+
 typedef struct
 {
 	char *name;
@@ -918,6 +957,7 @@
 	volatile s64 buffer_duration;
 
 	volatile s32 detach_pending;
+	Bool force_flush;
 
 	void *udta;
 	u32 udta_flags;
@@ -932,6 +972,7 @@
 	u64 max_process_time, max_sap_process_time;
 	u64 first_frame_time;
 	Bool is_end_of_stream;
+	Bool keepalive_signaled;
 	Bool is_playing, is_paused;
 	u8 play_queued, stop_queued;
 	
@@ -970,8 +1011,17 @@
 	/*! loss rate in per-thousand - input pid only */
 	u32 loss_rate;
 
+#ifndef GPAC_DISABLE_DEBUG
+	GF_List *prop_dump;
+#endif
 };
 
+typedef struct
+{
+	u32 p4cc;
+	const char *name;
+}GF_PropCheck;
+
 struct __gf_filter_pid
 {
 	//first two fields are the same as in GF_FilterPidInst for typecast
@@ -998,6 +1048,7 @@
 	
 	//set whenever an eos packet is dispatched, reset whenever a regular packet is dispatched
 	Bool has_seen_eos;
+	Bool eos_keepalive;
 	u32 nb_reaggregation_pending;
 
 	//only valid for decoder output pids
@@ -1038,9 +1089,9 @@
 	void *udta;
 	u32 udta_flags;
 
-	GF_PropertyMap *caps_negociate;
-	Bool caps_negociate_direct;
-	GF_List *caps_negociate_pidi_list;
+	GF_PropertyMap *caps_negotiate;
+	Bool caps_negotiate_direct;
+	GF_List *caps_negotiate_pidi_list;
 	GF_List *adapters_blacklist;
 	GF_Filter *caps_dst_filter;
 
@@ -1051,6 +1102,9 @@
 	//only used in filter_check_caps
 	GF_PropertyMap *local_props;
 	volatile u32 num_pidinst_del_pending;
+
+	u32 link_flags;
+
 };
 
 
@@ -1072,30 +1126,54 @@
 void gf_filter_pid_disconnect_task(GF_FSTask *task);
 void gf_filter_remove_task(GF_FSTask *task);
 void gf_filter_pid_detach_task(GF_FSTask *task);
+void gf_filter_pid_detach_task_no_flush(GF_FSTask *task);
 
 u32 gf_filter_caps_bundle_count(const GF_FilterCapability *caps, u32 nb_caps);
+void gf_filter_set_id(GF_Filter *filter, const char *ID);
 
 void gf_filter_post_remove(GF_Filter *filter);
 
+void gf_filter_check_pending_pids(GF_Filter *filter);
+
+typedef struct
+{
+	u32 code;
+	const char *name;
+	u32 nb_vals, alloc_vals;
+	const GF_FilterCapability **vals;
+} GF_CapBundleDesc;
+
+typedef struct
+{
+	u32 magic;
+
+	//streamtype of bundle, 0 if not specified and -1 if multiple stream type values
+	s32 stream_type;
+	u32 nb_caps, alloc_caps;
+	GF_CapBundleDesc *caps;
+} GF_BundleDesc;
+
 typedef struct
 {
-	u32 *bundles_in_ok;
-	u32 *bundles_cap_found;
-	u32 *bundles_in_scores;
-	u32 nb_allocs;
-} GF_CapsBundleStore;
+	u32 nb_src, nb_src_alloc;
+	GF_BundleDesc **bundles_src;
+	u32 nb_dst, nb_dst_alloc;
+	GF_BundleDesc **bundles_dst;
+} GF_BundleCache;
+
+void reset_bundle_cache(GF_FilterSession *session);
 
 #define CAP_MATCH_LOADED_INPUT_ONLY		1
 #define CAP_MATCH_LOADED_OUTPUT_ONLY	1<<1
 
-u32 gf_filter_caps_to_caps_match(const GF_FilterRegister *src, u32 src_bundle_idx, const GF_FilterRegister *dst, GF_Filter *dst_filter, u32 *dst_bundle_idx, u32 for_dst_bundle, u32 *loaded_filter_flags, GF_CapsBundleStore *capstore);
+u32 gf_filter_caps_to_caps_match(const GF_FilterRegister *src, u32 src_bundle_idx, const GF_FilterRegister *dst, GF_Filter *dst_filter, u32 for_dst_bundle, u32 *loaded_filter_flags, s32 *src_stream_type, GF_BundleCache *bundle_cache_src, GF_BundleCache *bundle_cache_dst);
 Bool gf_filter_has_out_caps(const GF_FilterCapability *caps, u32 nb_caps);
 Bool gf_filter_has_in_caps(const GF_FilterCapability *caps, u32 nb_caps);
 
 void gf_filter_check_output_reconfig(GF_Filter *filter);
 Bool gf_filter_reconf_output(GF_Filter *filter, GF_FilterPid *pid);
 
-void gf_filter_renegociate_output_dst(GF_FilterPid *pid, GF_Filter *filter, GF_Filter *filter_dst, GF_FilterPidInst *dst_pidi, GF_FilterPidInst *src_pidi);
+void gf_filter_renegotiate_output_dst(GF_FilterPid *pid, GF_Filter *filter, GF_Filter *filter_dst, GF_FilterPidInst *dst_pidi, GF_FilterPidInst *src_pidi);
 
 GF_Filter *gf_filter_pid_resolve_link(GF_FilterPid *pid, GF_Filter *dst, Bool *filter_reassigned);
 GF_Filter *gf_filter_pid_resolve_link_check_loaded(GF_FilterPid *pid, GF_Filter *dst, Bool *filter_reassigned, GF_List *skip_if_in_filter_list, Bool *skipped);
@@ -1105,7 +1183,7 @@
 
 Bool gf_filter_pid_caps_match(GF_FilterPid *src_pid, const GF_FilterRegister *freg, GF_Filter *filter_inst, u8 *priority, u32 *dst_bundle_idx, GF_Filter *dst_filter, s32 for_bundle_idx);
 
-void gf_filter_relink_dst(GF_FilterPidInst *pidinst);
+void gf_filter_relink_dst(GF_FilterPidInst *pidinst, GF_Err reason);
 
 void gf_filter_remove_internal(GF_Filter *filter, GF_Filter *until_filter, Bool keep_end_connections);
 
@@ -1129,6 +1207,10 @@
 void gf_filter_pid_set_args(GF_Filter *filter, GF_FilterPid *pid);
 
 Bool gf_filter_aggregate_packets(GF_FilterPidInst *dst);
+
+//solve property template, or jusr GINC() if pid is NULL
+void filter_solve_prop_template(GF_Filter *filter, GF_FilterPid *pid, char **value);
+
 enum
 {
 	EDGE_STATUS_NONE=0,
@@ -1159,15 +1241,20 @@
 typedef struct __freg_desc
 {
 	const GF_FilterRegister *freg;
-	u32 nb_edges, nb_alloc_edges;
+	u32 nb_edges, nb_alloc_edges, nb_bundles;
 	GF_FilterRegEdge *edges;
 	u32 dist;
 	struct __freg_desc *destination;
 	u32 cap_idx;
+	GF_BundleCache *bundle_cache;
 	u8 priority;
 	u8 in_edges_enabling;
+	u8 has_input; //cache value of gf_filter_has_in_caps
+	u8 has_output; //cache value of gf_filter_has_out_caps
 } GF_FilterRegDesc;
 
+void bundle_cache_free(GF_FilterRegDesc *reg_desc);
+
 #ifdef GPAC_MEMORY_TRACKING
 size_t gf_mem_get_stats(unsigned int *nb_allocs, unsigned int *nb_callocs, unsigned int *nb_reallocs, unsigned int *nb_free);
 #endif
@@ -1180,7 +1267,7 @@
 
 void gf_fs_check_graph_load(GF_FilterSession *fsess, Bool for_load);
 
-void gf_filter_renegociate_output_task(GF_FSTask *task);
+void gf_filter_renegotiate_output_task(GF_FSTask *task);
 
 void gf_fs_unload_script(GF_FilterSession *fs, void *js_ctx);
 
@@ -1193,6 +1280,10 @@
 GF_List *gf_filter_pid_compute_link(GF_FilterPid *pid, GF_Filter *dst);
 
 GF_PropertyValue gf_filter_parse_prop_solve_env_var(GF_FilterSession *fs, GF_Filter *f, u32 type, const char *name, const char *value, const char *enum_values);
+
+//check if item can be added to a reservoir queue, returns GF_TRUE if not added
+Bool gf_fq_res_add(GF_FilterQueue *fq, void *item);
+
 #endif //_GF_FILTER_SESSION_H_

gpac-2.2.1.tar.gz/src/filter_core/filter_session_js.c -> gpac-2.4.0.tar.gz/src/filter_core/filter_session_js.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2017-2022
+ *			Copyright (c) Telecom ParisTech 2017-2024
  *					All rights reserved
  *
  *  This file is part of GPAC / filters sub-project
@@ -71,10 +71,22 @@
 		gf_fs_lock_filters(fs, GF_FALSE);
     }
 }
+#define GF_FS_FLAG_USER_SESSION	(1<<29)
+
+static void jsfs_finalizer(JSRuntime *rt, JSValue val)
+{
+    GF_FilterSession *fs = JS_GetOpaque(val, fs_class_id);
+    if (!fs) return;
+
+	if (fs->flags & GF_FS_FLAG_USER_SESSION ) {
+		gf_fs_del(fs);
+	}
+}
 
 static JSClassDef fs_class = {
     "FilterSession",
-	.gc_mark = jsfs_mark
+	.gc_mark = jsfs_mark,
+	.finalizer = jsfs_finalizer
 };
 
 
@@ -119,7 +131,7 @@
 	} else if (new_filter) {
 		arg = jsfs_new_filter_obj(task->ctx, new_filter);
 	} else {
-		assert(del_filter);
+		gf_assert(del_filter);
 		arg = JS_DupValue(task->ctx, del_filter->jsval);
 	}
 
@@ -162,13 +174,17 @@
 		return fs->pid_connect_tasks_pending ? JS_FALSE : JS_TRUE;
 
 	case JSFS_HTTP_MAX_RATE:
+#ifdef GPAC_USE_DOWNLOADER
 		if (fs->download_manager)
 			return JS_NewInt32(ctx, gf_dm_get_data_rate(fs->download_manager) );
+#endif
 		return JS_NULL;
 
 	case JSFS_HTTP_RATE:
+#ifdef GPAC_USE_DOWNLOADER
 		if (fs->download_manager)
 			return JS_NewInt32(ctx, gf_dm_get_global_rate(fs->download_manager) );
+#endif
 		return JS_NULL;
 	case JSFS_RMT_SAMPLING:
 		return JS_NewBool(ctx, gf_sys_profiler_sampling_enabled() );
@@ -184,17 +200,19 @@
 
 static JSValue jsfs_prop_set(JSContext *ctx, JSValueConst this_val, JSValueConst value, int magic)
 {
-	s32 ival;
 	GF_FilterSession *fs = JS_GetOpaque(this_val, fs_class_id);
 	if (!fs)
 		return GF_JS_EXCEPTION(ctx);
 
 	switch (magic) {
 	case JSFS_HTTP_MAX_RATE:
+#ifdef GPAC_USE_DOWNLOADER
 		if (fs->download_manager) {
+			s32 ival;
 			if (JS_ToInt32(ctx, &ival, value)) return GF_JS_EXCEPTION(ctx);
 			gf_dm_set_data_rate(fs->download_manager, (u32) ival);
 		}
+#endif
 		break;
 	case JSFS_RMT_SAMPLING:
 		gf_sys_profiler_enable_sampling(JS_ToBool(ctx, value) ? GF_TRUE : GF_FALSE);
@@ -301,6 +319,18 @@
 	return JS_UNDEFINED;
 }
 
+static JSValue jsfs_rmt_log(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	const char *msg;
+	GF_FilterSession *fs = JS_GetOpaque(this_val, fs_class_id);
+	if (!fs ||!argc) return GF_JS_EXCEPTION(ctx);
+	msg = JS_ToCString(ctx, argv0);
+	if (!msg) return GF_JS_EXCEPTION(ctx);
+	gf_sys_profiler_log(msg);
+	JS_FreeCString(ctx, msg);
+	return JS_UNDEFINED;
+}
+
 static JSValue jsfs_rmt_send(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
 {
 	const char *msg;
@@ -349,7 +379,7 @@
 
 	JSValue arg, ret;
 	Bool res;
-	assert(fs->on_evt_task);
+	gf_assert(fs->on_evt_task);
 	gf_js_lock(fs->on_evt_task->ctx, GF_TRUE);
 
 	memset(&fevt, 0, sizeof(GF_FilterEvent));
@@ -444,7 +474,7 @@
 	JSValue args5, ret, obj;
 	Bool res = GF_TRUE;
 	JSContext *ctx;
-	assert(fs->on_auth_task);
+	gf_assert(fs->on_auth_task);
 	ctx = fs->on_auth_task->ctx;
 	gf_js_lock(ctx, GF_TRUE);
 
@@ -629,6 +659,8 @@
 	JSFF_EVENT_TARGET,
 	JSFF_LAST_TS_SENT,
 	JSFF_LAST_TS_DROP,
+	JSFF_TAG,
+	JSFF_ITAG,
 };
 
 
@@ -647,6 +679,10 @@
 		return JS_NewString(ctx, gf_filter_get_name(f) );
 	case JSFF_TYPE:
 		return JS_NewString(ctx, f->freg->name );
+	case JSFF_TAG:
+		return f->tag ? JS_NewString(ctx, f->tag ) : JS_NULL;
+	case JSFF_ITAG:
+		return f->itag ? JS_NewString(ctx, f->itag ) : JS_NULL;
 	case JSFF_ID:
 		val_s = gf_filter_get_id(f);
 		if (!val_s) return JS_NULL;
@@ -911,11 +947,10 @@
 
 static void get_filter_args(JSContext *ctx, GF_FilterSession *fs,  const GF_FilterRegister *freg, GF_Filter *f_inst, Bool val_only, JSValue array)
 {
-	u32 idx, a_idx;
+	u32 idx;
 	const GF_FilterArgs *args;
 
 	idx=0;
-	a_idx=0;
 	args = (f_inst && f_inst->instance_args) ? f_inst->instance_args : freg->args;
 
 	while (args && argsidx.arg_name) {
@@ -998,7 +1033,6 @@
 		}
 		JS_SetPropertyUint32(ctx, array, idx, aval);
 		idx++;
-		a_idx++;
 	}
 }
 
@@ -1062,17 +1096,9 @@
 		(*meta_fs)->registry = gf_list_new();
 		(*meta_fs)->blacklist = fs->blacklist;
 
-		//load internal filters
+		//load filters
 		gf_fs_reg_all(*meta_fs, *meta_fs);
 
-		//load external modules
-		u32 i, count = gf_modules_count();
-		for (i=0; i<count; i++) {
-			GF_FilterRegister *a_freg = (GF_FilterRegister *) gf_modules_load_filter(i, *meta_fs);
-			if (a_freg) {
-				gf_fs_add_filter_register(*meta_fs, a_freg);
-			}
-		}
 		(*meta_fs)->blacklist = NULL;
 	}
 
@@ -1172,6 +1198,44 @@
 }
 
 
+static JSValue jsfs_run_sess(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	GF_FilterSession *fs = JS_GetOpaque(this_val, fs_class_id);
+	if (!fs) return GF_JS_EXCEPTION(ctx);
+	if (!(fs->flags & GF_FS_FLAG_USER_SESSION))
+		return GF_JS_EXCEPTION(ctx);
+
+	GF_Err e = gf_fs_run(fs);
+	return JS_NewInt32(ctx, e);
+}
+
+
+static JSValue jsfs_stop_sess(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	GF_FilterSession *fs = JS_GetOpaque(this_val, fs_class_id);
+	if (!fs) return GF_JS_EXCEPTION(ctx);
+	if (!(fs->flags & GF_FS_FLAG_USER_SESSION))
+		return GF_JS_EXCEPTION(ctx);
+
+	GF_Err e = gf_fs_stop(fs);
+	return JS_NewInt32(ctx, e);
+}
+static JSValue jsfs_print_connections(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	GF_FilterSession *fs = JS_GetOpaque(this_val, fs_class_id);
+	if (!fs) return GF_JS_EXCEPTION(ctx);
+	gf_fs_print_connections(fs);
+	return JS_UNDEFINED;
+}
+
+static JSValue jsfs_print_stats(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	GF_FilterSession *fs = JS_GetOpaque(this_val, fs_class_id);
+	if (!fs) return GF_JS_EXCEPTION(ctx);
+	gf_fs_print_stats(fs);
+	return JS_UNDEFINED;
+}
+
 static JSValue jsff_get_arg(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
 {
 	u32 idx;
@@ -1277,19 +1341,27 @@
 	return JS_UNDEFINED;
 }
 
+GF_Filter *jsf_custom_filter_opaque(JSContext *ctx, JSValueConst this_val);
+
 static JSValue jsff_insert_filter(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
 {
-	const char *fname, *link_args;
+	const char *fname=NULL, *link_args;
 	GF_Filter *new_f;
 	GF_Err e;
 	Bool is_source = GF_FALSE;
 	GF_FilterPid *opid=NULL;
+	GF_Filter *inserted = NULL;
 	GF_Filter *f = JS_GetOpaque(this_val, fs_f_class_id);
 	if (!f || !argc)
 		return GF_JS_EXCEPTION(ctx);
 
-	fname = JS_ToCString(ctx, argv0);
-	if (!fname) return GF_JS_EXCEPTION(ctx);
+	if (JS_IsObject(argv0)) {
+		inserted = jsf_custom_filter_opaque(ctx, argv0);
+		if (!inserted) return GF_JS_EXCEPTION(ctx);
+	} else {
+		fname = JS_ToCString(ctx, argv0);
+		if (!fname) return GF_JS_EXCEPTION(ctx);
+	}
 	link_args = NULL;
 	if (argc>1) {
 		u32 offset=1;
@@ -1304,13 +1376,16 @@
 		if ((u32) argc>offset) {
 			link_args = JS_ToCString(ctx, argvoffset);
 			if (!link_args) {
-				JS_FreeCString(ctx, fname);
+				if (fname) JS_FreeCString(ctx, fname);
 				return GF_JS_EXCEPTION(ctx);
 			}
 		}
 	}
 	gf_fs_lock_filters(f->session, GF_TRUE);
-	if (!strncmp(fname, "src=", 4)) {
+	if (inserted) {
+		new_f = inserted;
+	}
+	else if (!strncmp(fname, "src=", 4)) {
 		new_f = gf_fs_load_source(f->session, fname+4, NULL, NULL, &e);
 		is_source = GF_TRUE;
 	} else if (!strncmp(fname, "dst=", 4)) {
@@ -1320,8 +1395,8 @@
 	}
 
 	if (!new_f) {
-		JSValue ret = js_throw_err_msg(ctx, e, "Cannot load filter %s: %s\n", fname, gf_error_to_string(e));
-		JS_FreeCString(ctx, fname);
+		JSValue ret = js_throw_err_msg(ctx, e, "Cannot load filter %s: %s\n", fname ? fname : "custom", gf_error_to_string(e));
+		if (fname) JS_FreeCString(ctx, fname);
 		if (link_args) JS_FreeCString(ctx, link_args);
 		gf_fs_lock_filters(f->session, GF_FALSE);
 		return ret;
@@ -1338,12 +1413,56 @@
 	//reconnect outputs of source
 	gf_filter_reconnect_output((GF_Filter *) f, opid);
 
-	JS_FreeCString(ctx, fname);
+	if (fname) JS_FreeCString(ctx, fname);
 	if (link_args) JS_FreeCString(ctx, link_args);
 
 	return jsfs_new_filter_obj(ctx, new_f);
 }
 
+static JSValue jsff_reconnect_filter(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	GF_Err e;
+	GF_FilterPid *opid=NULL;
+	GF_Filter *f = JS_GetOpaque(this_val, fs_f_class_id);
+	if (!f)
+		return GF_JS_EXCEPTION(ctx);
+
+	if (argc>1) {
+		s32 opid_idx=-1;
+		if (JS_ToInt32(ctx, &opid_idx, argv1)) return GF_JS_EXCEPTION(ctx);
+		if (opid_idx>=0) {
+			opid = gf_filter_get_opid(f, opid_idx);
+			if (!opid) return GF_JS_EXCEPTION(ctx);
+		}
+	}
+	//reconnect outputs of source
+	e = gf_filter_reconnect_output((GF_Filter *) f, opid);
+	if (e)
+		return js_throw_err_msg(ctx, e, "Cannot reconnect output: %s\n", gf_error_to_string(e));
+	return JS_UNDEFINED;
+}
+
+static JSValue jsff_get_destinations(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	GF_Err e;
+	s32 opid_idx=-1;
+	GF_Filter *f = JS_GetOpaque(this_val, fs_f_class_id);
+	if (!f)
+		return GF_JS_EXCEPTION(ctx);
+
+	if (argc && JS_ToInt32(ctx, &opid_idx, argv0)) return GF_JS_EXCEPTION(ctx);
+
+	char *res=NULL;
+	//reconnect outputs of source
+	e = gf_filter_get_possible_destinations(f, opid_idx, &res);
+
+	if (e)
+		return js_throw_err_msg(ctx, e, "Cannot get possible destinations: %s\n", gf_error_to_string(e));
+	if (!res) return JS_NULL;
+	JSValue ret = JS_NewString(ctx, res);
+	gf_free(res);
+	return ret;
+}
 static Bool jsfs_get_filter_args(JSContext *ctx, GF_FilterSession *fs, GF_FilterSession **meta_fs, char *regname, GF_Filter *finst, JSValue args);
 static void del_meta_fs(GF_FilterSession *metafs);
 
@@ -1454,8 +1573,20 @@
 		return GF_JS_EXCEPTION(ctx);
 
 	if (!strcmp(f->freg->name, "dashin")) {
+#ifndef GPAC_DISABLE_DASHIN
 		JSValue dashdmx_bind_js(GF_Filter *f, JSContext *jsctx, JSValueConst obj);
 		return dashdmx_bind_js(f, ctx, argv0);
+#else
+		return js_throw_err_msg(ctx, GF_BAD_PARAM, "DASH client disabled in build");
+#endif
+	}
+	if (!strcmp(f->freg->name, "httpout")) {
+#ifndef GPAC_DISABLE_NETWORK
+		JSValue httpout_bind_js(GF_Filter *f, JSContext *jsctx, JSValueConst obj);
+		return httpout_bind_js(f, ctx, argv0);
+#else
+		return js_throw_err_msg(ctx, GF_BAD_PARAM, "HTTPOut disabled in build");
+#endif
 	}
 
 	return js_throw_err_msg(ctx, GF_BAD_PARAM, "filter class %s has no JS bind capabilities", f->freg->name);
@@ -1534,6 +1665,8 @@
 static const JSCFunctionListEntry fs_f_funcs = {
 	JS_CGETSET_MAGIC_DEF_ENUM("name", jsfs_f_prop_get, NULL, JSFF_NAME),
 	JS_CGETSET_MAGIC_DEF_ENUM("type", jsfs_f_prop_get, NULL, JSFF_TYPE),
+	JS_CGETSET_MAGIC_DEF_ENUM("tag", jsfs_f_prop_get, NULL, JSFF_TAG),
+	JS_CGETSET_MAGIC_DEF_ENUM("itag", jsfs_f_prop_get, NULL, JSFF_ITAG),
 	JS_CGETSET_MAGIC_DEF_ENUM("ID", jsfs_f_prop_get, NULL, JSFF_ID),
 	JS_CGETSET_MAGIC_DEF_ENUM("nb_ipid", jsfs_f_prop_get, NULL, JSFF_NB_IPID),
 	JS_CGETSET_MAGIC_DEF_ENUM("nb_opid", jsfs_f_prop_get, NULL, JSFF_NB_OPID),
@@ -1569,12 +1702,14 @@
 	JS_CFUNC_DEF("update", 0, jsff_update),
 	JS_CFUNC_DEF("remove", 0, jsff_remove),
 	JS_CFUNC_DEF("insert", 0, jsff_insert_filter),
+	JS_CFUNC_DEF("reconnect", 0, jsff_reconnect_filter),
 	JS_CFUNC_DEF("bind", 0, jsff_bind),
 	JS_CFUNC_DEF("lock", 0, jsff_lock),
 	JS_CFUNC_DEF("ipid_stats", 0, jsff_ipid_stats),
 	JS_CFUNC_DEF("opid_stats", 0, jsff_opid_stats),
 	JS_CFUNC_DEF("compute_link", 0, jsff_compute_link),
 	JS_CFUNC_DEF("require_source_id", 0, jsff_require_source_id),
+	JS_CFUNC_DEF("get_destinations", 0, jsff_get_destinations),
 };
 
 static JSValue jsfs_new_filter_obj(JSContext *ctx, GF_Filter *f)
@@ -1679,8 +1814,6 @@
 	return jsfs_new_filter_obj(ctx, new_f);
 }
 
-Bool gf_fs_fire_event(GF_FilterSession *fs, GF_Filter *f, GF_FilterEvent *evt, Bool upstream);
-
 static JSValue jsfs_fire_event(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
 {
 	Bool upstream = GF_FALSE;
@@ -1738,6 +1871,23 @@
 	return jsfilter_initialize_custom(f, ctx);
 }
 
+static JSValue jsfs_remove_filter(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	GF_Filter *to_remove=NULL;
+	GF_FilterSession *fs = JS_GetOpaque(this_val, fs_class_id);
+	if (!fs || !argc) return GF_JS_EXCEPTION(ctx);
+	if (!JS_IsObject(argv0) ) return GF_JS_EXCEPTION(ctx);
+
+	to_remove = JS_GetOpaque(argv0, fs_f_class_id);
+	if (!to_remove)
+		to_remove = jsf_custom_filter_opaque(ctx, argv0);
+
+	if (!to_remove)
+		return GF_JS_EXCEPTION(ctx);
+
+	gf_filter_remove(to_remove);
+	return JS_UNDEFINED;
+}
 
 static const JSCFunctionListEntry fs_funcs = {
     JS_CGETSET_MAGIC_DEF_ENUM("nb_filters", jsfs_prop_get, NULL, JSFS_NB_FILTERS),
@@ -1756,6 +1906,7 @@
     JS_CFUNC_DEF("lock_filters", 0, jsfs_lock_filters),
     JS_CFUNC_DEF("enable_rmt", 0, jsfs_enable_rmt),
     JS_CFUNC_DEF("rmt_send", 0, jsfs_rmt_send),
+    JS_CFUNC_DEF("rmt_log", 0, jsfs_rmt_log),
     JS_CFUNC_DEF("set_rmt_fun", 0, jsfs_set_rmt_fun),
     JS_CFUNC_DEF("set_new_filter_fun", 0, jsfs_set_new_filter_fun),
     JS_CFUNC_DEF("set_del_filter_fun", 0, jsfs_set_del_filter_fun),
@@ -1764,9 +1915,13 @@
     JS_CFUNC_DEF("fire_event", 0, jsfs_fire_event),
     JS_CFUNC_DEF("reporting", 0, jsfs_reporting),
     JS_CFUNC_DEF("new_filter", 0, jsfs_new_filter),
+    JS_CFUNC_DEF("remove_filter", 0, jsfs_remove_filter),
     JS_CFUNC_DEF("set_auth_fun", 0, jsfs_set_auth_fun),
 	JS_CFUNC_DEF("filter_args", 0, jsfs_filter_args),
-
+	JS_CFUNC_DEF("run", 0, jsfs_run_sess),
+	JS_CFUNC_DEF("stop", 0, jsfs_stop_sess),
+	JS_CFUNC_DEF("print_connections", 0, jsfs_print_connections),
+	JS_CFUNC_DEF("print_stats", 0, jsfs_print_stats)
 };
 
 void gf_fs_unload_js_api(JSContext *c, GF_FilterSession *fs)
@@ -1787,6 +1942,54 @@
 	gf_mx_v(fs->filters_mx);
 }
 
+
+static JSValue session_constructor(JSContext *ctx, JSValueConst new_target, int argc, JSValueConst *argv)
+{
+	JSValue anobj;
+	GF_FilterSession *fs;
+
+	if (!argc) {
+		fs = gf_fs_new_defaults(0);
+	} else if (JS_IsObject(argv0)) {
+		s32 nb_threads=0;
+		u32 sched_type=0;
+		u32 flags=0;
+		const char *blacklist=NULL;
+		JSValue val = JS_GetPropertyStr(ctx, argv0, "threads");
+		if (!JS_IsUndefined(val))
+			JS_ToInt32(ctx, &nb_threads, val);
+		JS_FreeValue(ctx, val);
+
+		val = JS_GetPropertyStr(ctx, argv0, "scheduler");
+		if (!JS_IsUndefined(val))
+			JS_ToInt32(ctx, &sched_type, val);
+		JS_FreeValue(ctx, val);
+
+		val = JS_GetPropertyStr(ctx, argv0, "flags");
+		if (!JS_IsUndefined(val))
+			JS_ToInt32(ctx, &flags, val);
+		JS_FreeValue(ctx, val);
+
+		val = JS_GetPropertyStr(ctx, argv0, "blacklist");
+		if (JS_IsString(val))
+			blacklist = JS_ToCString(ctx, val);
+		JS_FreeValue(ctx, val);
+
+		fs = gf_fs_new(nb_threads, sched_type, flags, blacklist);
+		JS_FreeCString(ctx, blacklist);
+	} else {
+		return GF_JS_EXCEPTION(ctx);
+	}
+	fs->flags |= GF_FS_FLAG_USER_SESSION;
+
+	anobj = JS_NewObjectClass(ctx, fs_class_id);
+	if (JS_IsException(anobj)) {
+		gf_fs_del(fs);
+		return anobj;
+	}
+    JS_SetOpaque(anobj, fs);
+	return anobj;
+}
 GF_Err gf_fs_load_js_api(JSContext *c, GF_FilterSession *fs)
 {
 	JSValue fs_obj;
@@ -1835,6 +2038,15 @@
     JS_SetOpaque(fs_obj, fs);
 	JS_SetPropertyStr(c, global_obj, "session", fs_obj);
 
+	//filtersession constructor
+	proto = JS_NewObjectClass(c, fs_class_id);
+	JS_SetPropertyFunctionList(c, proto, fs_funcs, countof(fs_funcs));
+	JS_SetClassProto(c, fs_class_id, proto);
+	JSValue ctor = JS_NewCFunction2(c, session_constructor, "FilterSession", 1, JS_CFUNC_constructor, 0);
+	JS_SetPropertyStr(c, global_obj, "FilterSession", ctor);
+    /*JS_SetModuleExport(c, m, "FilterSession", ctor);
+	*/
+
     JS_FreeValue(c, global_obj);
     return GF_OK;
 }
@@ -1886,7 +2098,9 @@
 		e = gf_file_load_data(jsfile, &buf, &buf_len);
 	}
 	if (e) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_SCRIPT, ("JSF Error loading script file %s: %s\n", jsfile, gf_error_to_string(e) ));
+		if (e!=GF_NOT_FOUND) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_SCRIPT, ("JSF Error loading script file %s: %s\n", jsfile, gf_error_to_string(e) ));
+		}
 		return e;
 	}
 
@@ -1954,6 +2168,14 @@
 		count--;
 	}
 	if (fs->js_ctx) {
+		gf_js_lock(fs->js_ctx, GF_TRUE);
+		JSValue global_obj = JS_GetGlobalObject(fs->js_ctx);
+		JSValue fsobj = JS_GetPropertyStr(fs->js_ctx, global_obj, "session");
+		JS_SetOpaque(fsobj, NULL);
+		JS_SetPropertyStr(fs->js_ctx, global_obj, "session", JS_NULL);
+		JS_FreeValue(fs->js_ctx, global_obj);
+		JS_FreeValue(fs->js_ctx, fsobj);
+		gf_js_lock(fs->js_ctx, GF_FALSE);
 		gf_js_delete_context(fs->js_ctx);
 		fs->js_ctx = NULL;
 	}

gpac-2.4.0.tar.gz/src/filters/avin_web.c Added

@@ -0,0 +1,554 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2023
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / Camera/Mic/Canvas grabber filter
+ *
+ *  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/media_dev.h>
+#include <gpac/constants.h>
+
+#if defined(GPAC_CONFIG_EMSCRIPTEN)
+#include <gpac/network.h>
+
+typedef struct
+{
+	char *src;
+	GF_PropVec2i vsize;
+	Bool back, ntp, alpha;
+	GF_Fraction fps;
+
+	GF_Err init_err;
+	Bool a_playing, v_playing;
+	GF_Filter *filter;
+	GF_FilterPid *vpid, *apid;
+	u32 w, h, pfmt, out_size;
+	u32 samplerate, channels, afmt;
+	GF_FilterPacket *pck_v;
+
+	Bool init_play_done;
+	Bool is_canvas;
+	u32 bytes_per_sample;
+	u64 canvas_last_ts, canvas_init_ts;
+	u32 nb_frames;
+	u64 next_time;
+
+	GF_List *video_pcks;
+	GF_List *audio_pcks;
+} GF_WebGrab;
+
+EM_JS(int, webgrab_next_video, (int wg_ctx),
+{
+	let c = libgpac._to_webgrab(wg_ctx);
+	if (!c) {
+		libgpac._on_wgrab_error(c._wg_ctx, 2, "Invalid source");
+		return;
+	}
+	if (c.canvas) {
+		try {
+			c._frame = new VideoFrame(c.canvas, {timestamp: 0, alpha: c.keep_alpha ? "keep" : "discard"} );
+			libgpac._on_wgrab_video_frame(c._wg_ctx, c._frame.codedWidth, c._frame.codedHeight, c._frame.format, BigInt(c._frame.timestamp));
+		} catch (e) {
+			libgpac._on_wgrab_error(wg_ctx, 2, ""+e);
+		}
+		return;
+	}
+	if (c.video_reader==null) return;
+
+	c.video_reader.read().then( result => {
+		if (result.done) {
+			libgpac._on_wgrab_error(c._wg_ctx, 3, null);
+			return;
+		}
+		c._frame = result.value;
+		libgpac._on_wgrab_video_frame(c._wg_ctx, c._frame.codedWidth, c._frame.codedHeight, c._frame.format, BigInt(c._frame.timestamp));
+	}).catch(e => {
+		libgpac._on_wgrab_error(wg_ctx, 2, ""+e);
+	});
+})
+
+EM_JS(int, webgrab_next_audio, (int wg_ctx),
+{
+	let c = libgpac._to_webgrab(wg_ctx);
+	if (!c) {
+		libgpac._on_wgrab_error(c._wg_ctx, 2, "Invalid source");
+		return;
+	}
+	if (c.audio_reader==null) return;
+
+	c.audio_reader.read().then( result => {
+		if (result.done) {
+			libgpac._on_wgrab_error(c._wg_ctx, 3, null);
+			return;
+		}
+		c._frame = result.value;
+		libgpac._on_wgrab_audio_data(c._wg_ctx, c._frame.sampleRate, c._frame.numberOfChannels, c._frame.format, c._frame.numberOfFrames, BigInt(c._frame.timestamp));
+		c._frame.close();
+		c._frame = null;
+
+	}).catch(e => {
+		libgpac._on_wgrab_error(wg_ctx, 2, ""+e);
+	});
+})
+
+
+static GF_Err webgrab_process(GF_Filter *filter)
+{
+    GF_WebGrab *ctx = gf_filter_get_udta(filter);
+	if (ctx->init_err) return ctx->init_err;
+	if (!ctx->init_play_done) return GF_OK;
+
+	if (!ctx->v_playing && !ctx->a_playing && ctx->init_play_done) return GF_EOS;
+
+	while (gf_list_count(ctx->video_pcks)) {
+		GF_FilterPacket *pck = gf_list_pop_front(ctx->video_pcks);
+		gf_filter_pck_send(pck);
+
+		if (ctx->is_canvas && (ctx->fps.num<=0)) {
+			gf_filter_pid_set_eos(ctx->vpid);
+		}
+	}
+
+	while (gf_list_count(ctx->audio_pcks)) {
+		GF_FilterPacket *pck = gf_list_pop_front(ctx->audio_pcks);
+		gf_filter_pck_send(pck);
+	}
+
+	if (ctx->is_canvas && ctx->next_time) {
+		u64 now = gf_sys_clock_high_res();
+		if (now > ctx->next_time) {
+			ctx->next_time = 0;
+			webgrab_next_video(EM_CAST_PTR ctx);
+		}
+	}
+	return GF_OK;
+}
+
+
+static Bool webgrab_process_event(GF_Filter *filter, const GF_FilterEvent *evt)
+{
+    GF_WebGrab *ctx = gf_filter_get_udta(filter);
+	switch (evt->base.type) {
+	case GF_FEVT_PLAY:
+		if (evt->base.on_pid==ctx->vpid) {
+			if (!ctx->v_playing) webgrab_next_video(EM_CAST_PTR ctx);
+			ctx->v_playing = GF_TRUE;
+		} else {
+			if (!ctx->a_playing) webgrab_next_audio(EM_CAST_PTR ctx);
+			ctx->a_playing = GF_TRUE;
+		}
+		ctx->init_play_done = GF_TRUE;
+		break;
+	case GF_FEVT_STOP:
+		if (evt->base.on_pid==ctx->vpid) {
+			ctx->v_playing = GF_FALSE;
+		} else {
+			ctx->a_playing = GF_FALSE;
+		}
+		break;
+	default:
+		break;
+	}
+	return GF_TRUE;
+}
+GF_EXPORT
+void webgrab_on_error(GF_WebGrab *ctx, int res_code, char *msg)
+{
+	if (res_code) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("WebGrab Failed to %s: %s\n", (res_code==1) ? "initialize" : "grab frame", msg ? msg : "unknown error"));
+		if (res_code==1) {
+			ctx->init_err = GF_SERVICE_ERROR;
+			gf_filter_setup_failure(ctx->filter, GF_SERVICE_ERROR);
+		}
+	}
+}
+
+u32 webcodec_pixfmt_to_gpac(char *format);
+
+EM_JS(int, wgrab_copy_frame, (int wg_ctx, int dst_pck, int buf, int buf_size), {
+	let c = libgpac._to_webgrab(wg_ctx);
+	if (!c || !c._frame || !dst_pck) return;
+
+	//setup dst
+	let ab = new Uint8Array(libgpac.HEAPU8.buffer, buf, buf_size);
+	let frame = c._frame;
+	c._frame = null;
+	frame.copyTo(ab).then( layout => {
+		libgpac._on_wgrab_frame_copy(c._wg_ctx, dst_pck, 1);
+		frame.close();
+	}).catch( e => {
+		libgpac._on_wgrab_frame_copy(c._wg_ctx, dst_pck, 0);
+		frame.close();
+	});
+})
+
+GF_EXPORT
+void webgrab_on_frame_copy(GF_WebGrab *ctx, GF_FilterPacket *pck, int res_ok)
+{
+	if (!ctx) return;
+	if (!res_ok) gf_filter_pck_discard(ctx->pck_v);
+	else gf_list_add(ctx->video_pcks, ctx->pck_v);
+
+	gf_filter_post_process_task(ctx->filter);
+	if (ctx->v_playing && !ctx->is_canvas)
+		webgrab_next_video(EM_CAST_PTR ctx);
+}
+
+GF_EXPORT
+void webgrab_on_video_frame(GF_WebGrab *ctx, u32 width, u32 height, char * pixfmt, u64 ts)
+{
+	Bool first=GF_FALSE;
+
+	u32 pf = webcodec_pixfmt_to_gpac(pixfmt);
+	if (!ctx->vpid) {
+		ctx->vpid = gf_filter_pid_new(ctx->filter);
+		first = GF_TRUE;
+		gf_filter_pid_set_property(ctx->vpid, GF_PROP_PID_STREAM_TYPE, &PROP_UINT(GF_STREAM_VISUAL));
+		gf_filter_pid_set_property(ctx->vpid, GF_PROP_PID_CODECID, &PROP_UINT(GF_CODECID_RAW));
+		gf_filter_pid_set_property(ctx->vpid, GF_PROP_PID_TIMESCALE, &PROP_UINT(1000000));
+		gf_filter_pid_set_property(ctx->vpid, GF_PROP_PID_RAWGRAB, &PROP_UINT(ctx->back ? 2 : 1) );
+	}
+	if ((width != ctx->w) || (height != ctx->h) || (pf != ctx->pfmt)) {
+		gf_filter_pid_set_property(ctx->vpid, GF_PROP_PID_WIDTH, &PROP_UINT(width));
+		gf_filter_pid_set_property(ctx->vpid, GF_PROP_PID_HEIGHT, &PROP_UINT(height));
+		gf_filter_pid_set_property(ctx->vpid, GF_PROP_PID_PIXFMT, &PROP_UINT(pf));
+		ctx->w = width;
+		ctx->h = height;
+		ctx->pfmt = pf;
+		gf_pixel_get_size_info(pf, width, height, &ctx->out_size, NULL, NULL, NULL, NULL);
+	}
+	if (first) {
+		return;
+	}
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_MMIO, ("WebGrab Got frame ts "LLU"\n", ts));
+
+	u8 *output;
+	ctx->pck_v = gf_filter_pck_new_alloc(ctx->vpid, ctx->out_size, &output);
+	if (!ctx->pck_v) return;
+
+	if (ctx->is_canvas) {
+		u64 now = gf_sys_clock_high_res();
+		if (!ctx->canvas_init_ts) ctx->canvas_init_ts = now;
+		ctx->canvas_last_ts = now;
+		ts = now - ctx->canvas_init_ts;
+		ctx->nb_frames++;
+		if ((ctx->fps.num>0) && (ctx->fps.den>0)) {
+			ctx->next_time = ctx->canvas_init_ts + gf_timestamp_rescale(ctx->nb_frames*ctx->fps.den, ctx->fps.num, 1000000);
+		}
+	}
+
+	gf_filter_pck_set_cts(ctx->pck_v, ts);
+	if (ctx->ntp) {
+		u64 ntp = gf_net_get_ntp_ts();
+		gf_filter_pck_set_property(ctx->pck_v, GF_PROP_PCK_SENDER_NTP, &PROP_LONGUINT(ntp) );
+	}
+
+	wgrab_copy_frame(EM_CAST_PTR ctx,
+		EM_CAST_PTR ctx->pck_v,
+		EM_CAST_PTR output, ctx->out_size);
+
+}
+
+u32 webcodec_audiofmt_to_gpac(char *format);
+
+EM_JS(int, wgrab_copy_audio, (int wg_ctx, int buf, int buf_size, int plane_index), {
+	let c = libgpac._to_webgrab(wg_ctx);
+	if (!c || !c._frame) return;
+
+	//setup dst
+	let ab = new Uint8Array(libgpac.HEAPU8.buffer, buf, buf_size);
+	c._frame.copyTo(ab, { planeIndex: plane_index });
+})
+
+GF_EXPORT
+void webgrab_on_audio_data(GF_WebGrab *ctx, u32 sr, u32 channels, char * afmt, u32 num_frames, u64 ts)
+{
+	Bool first=GF_FALSE;
+
+	u32 af = webcodec_audiofmt_to_gpac(afmt);
+	if (!ctx->apid) {
+		ctx->apid = gf_filter_pid_new(ctx->filter);
+		first = GF_TRUE;
+		gf_filter_pid_set_property(ctx->apid, GF_PROP_PID_STREAM_TYPE, &PROP_UINT(GF_STREAM_AUDIO));
+		gf_filter_pid_set_property(ctx->apid, GF_PROP_PID_CODECID, &PROP_UINT(GF_CODECID_RAW));
+		gf_filter_pid_set_property(ctx->apid, GF_PROP_PID_TIMESCALE, &PROP_UINT(1000000));
+		gf_filter_pid_set_property(ctx->apid, GF_PROP_PID_RAWGRAB, &PROP_UINT(1) );
+	}
+	if ((sr != ctx->samplerate) || (channels != ctx->channels) || (af != ctx->afmt)) {
+		gf_filter_pid_set_property(ctx->apid, GF_PROP_PID_SAMPLE_RATE, &PROP_UINT(sr));
+		gf_filter_pid_set_property(ctx->apid, GF_PROP_PID_NUM_CHANNELS, &PROP_UINT(channels));
+		gf_filter_pid_set_property(ctx->apid, GF_PROP_PID_AUDIO_FORMAT, &PROP_UINT(af));
+		ctx->samplerate = sr;
+		ctx->channels = channels;
+		ctx->afmt = af;
+		ctx->bytes_per_sample = gf_audio_fmt_bit_depth(af) / 8;
+	}
+	if (first) {
+		return;
+	}
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_MMIO, ("WebGrab Got audio frame ts "LLU"\n", ts));
+
+	u32 i, output_size = ctx->bytes_per_sample*num_frames*channels;
+	u8 *output;
+	GF_FilterPacket *dst = gf_filter_pck_new_alloc(ctx->apid, output_size, &output);
+	if (!dst) return;
+
+	gf_filter_pck_set_cts(dst, ts);
+	if (ctx->ntp) {
+		u64 ntp = gf_net_get_ntp_ts();
+		gf_filter_pck_set_property(dst, GF_PROP_PCK_SENDER_NTP, &PROP_LONGUINT(ntp) );
+	}
+
+	//audioData copyTo is sync
+	u32 num_planes, plane_size;
+	if (gf_audio_fmt_is_planar(af)) {
+		num_planes = channels;
+		plane_size = ctx->bytes_per_sample*num_frames;
+	} else {
+		num_planes = 1;
+		plane_size = ctx->bytes_per_sample*num_frames*channels;
+	}
+
+	for (i=0; i<num_planes; i++) {
+		u8 *buf = output + i * plane_size;
+		wgrab_copy_audio(EM_CAST_PTR ctx, EM_CAST_PTR buf, plane_size, i);
+	}
+
+	gf_list_add(ctx->audio_pcks, dst);
+	gf_filter_post_process_task(ctx->filter);
+	if (ctx->a_playing)
+		webgrab_next_audio(EM_CAST_PTR ctx);
+}
+
+EM_JS(int, webgrab_start_usermedia, (int wg_ctx, int vid, int aud, int canv_id, int w, int h, int back, int alpha),
+{
+	if (typeof libgpac._to_webgrab != 'function') {
+		libgpac._web_grabs = ;
+		libgpac._to_webgrab = (ctx) => {
+          for (let i=0; i<libgpac._web_grabs.length; i++) {
+            if (libgpac._web_grabsi._wg_ctx==ctx) return libgpac._web_grabsi;
+          }
+          return null;
+		};
+		libgpac._on_wgrab_error = libgpac.cwrap('webgrab_on_error', null, 'number', 'number', 'string');
+		libgpac._on_wgrab_video_frame = libgpac.cwrap('webgrab_on_video_frame', null, 'number', 'number', 'number', 'string', 'bigint');
+		libgpac._on_wgrab_audio_data = libgpac.cwrap('webgrab_on_audio_data', null, 'number', 'number', 'number', 'string', 'number', 'bigint');
+		libgpac._on_wgrab_frame_copy = libgpac.cwrap('webgrab_on_frame_copy', null, 'number', 'number', 'number');
+	}
+
+	let c = libgpac._to_webgrab(wg_ctx);
+	if (!c) {
+		c = {_wg_ctx: wg_ctx, stream: null, canvas: null, video_reader: null, audio_reader: null, _frame: null};
+		libgpac._web_grabs.push(c);
+	}
+	if (canv_id) {
+		let canvas_id = libgpac.UTF8ToString(canv_id);
+		c.canvas = document.getElementById(canvas_id);
+		c.keep_alpha = alpha;
+		if (!c.canvas) {
+			libgpac._on_wgrab_error(wg_ctx, 1, "No such element "+canvas_id);
+			return;
+		}
+		try {
+			let frame = new VideoFrame(c.canvas, {timestamp: 0, alpha: c.keep_alpha ? "keep" : "discard"} );
+			libgpac._on_wgrab_video_frame(c._wg_ctx, frame.codedWidth, frame.codedHeight, frame.format, BigInt(frame.timestamp));
+			frame.close();
+		} catch (e) {
+			libgpac._on_wgrab_error(wg_ctx, 1, ""+e);
+		}
+		return;
+	}
+
+	let constraints = {
+		audio: aud ? true : false,
+		video: vid ? true : false,
+	};
+	if (w || h || back) {
+		constraints.video = { };
+		if (w) constraints.video.width = {ideal: w};
+		if (h) constraints.video.height = {ideal: h};
+		if (back) constraints.video.facingMode = {ideal: 'environment'};
+	}
+
+	navigator.mediaDevices.getUserMedia(constraints).then( stream => {
+		c.stream = stream;
+		stream.getTracks().forEach(track => {
+			if (track.kind=='audio') {
+				let trackProcessor = new MediaStreamTrackProcessor(track);
+				c.audio_reader = trackProcessor.readable.getReader();
+				c.audio_reader.read().then( result => {
+					if (result.done) return;
+					const frame = result.value;
+					libgpac._on_wgrab_audio_data(c._wg_ctx, frame.sampleRate, frame.numberOfChannels, frame.format, frame.numberOfFrames, BigInt(frame.timestamp));
+					frame.close();
+				}).catch(e => {
+					libgpac._on_wgrab_error(wg_ctx, 2, ""+e);
+				});
+			}
+			else if (track.kind=='video') {
+				let trackProcessor = new MediaStreamTrackProcessor(track);
+				c.video_reader = trackProcessor.readable.getReader();
+				c.video_reader.read().then( result => {
+					if (result.done) return;
+					const frame = result.value;
+					libgpac._on_wgrab_video_frame(c._wg_ctx, frame.codedWidth, frame.codedHeight, frame.format, BigInt(frame.timestamp));
+					frame.close();
+				}).catch(e => {
+					libgpac._on_wgrab_error(wg_ctx, 2, ""+e);
+				});
+			}
+		});
+	}).catch(e => {
+		libgpac._on_wgrab_error(wg_ctx, 1, ""+e);
+
+	});
+
+})
+
+GF_Err webgrab_initialize(GF_Filter *filter)
+{
+	Bool use_video=GF_FALSE, use_audio=GF_FALSE;
+	char *canvas_id=NULL;
+    GF_WebGrab *ctx = gf_filter_get_udta(filter);
+    ctx->filter = filter;
+
+    if (!ctx->src) return GF_BAD_PARAM;
+
+    if (!strcmp(ctx->src, "video://")) use_video = GF_TRUE;
+	else if (!strncmp(ctx->src, "video://", 8)) {
+		canvas_id = ctx->src+8;
+		ctx->is_canvas = GF_TRUE;
+    }
+    else if (!strcmp(ctx->src, "audio://")) use_audio = GF_TRUE;
+    else if (!strcmp(ctx->src, "av://")) use_video = use_audio = GF_TRUE;
+    else
+		return GF_BAD_PARAM;
+
+	gf_filter_prevent_blocking(filter, GF_TRUE);
+	webgrab_start_usermedia(EM_CAST_PTR ctx, use_video, use_audio, EM_CAST_PTR canvas_id, ctx->vsize.x, ctx->vsize.y, ctx->back, ctx->alpha);
+
+	ctx->video_pcks = gf_list_new();
+	ctx->audio_pcks = gf_list_new();
+    return GF_OK;
+}
+
+EM_JS(int, wgrab_del, (int wg_ctx), {
+	if (! Array.isArray(libgpac._web_grabs) ) return;
+	for (let i=0; i<libgpac._web_grabs.length; i++) {
+		if (libgpac._web_grabsi._wg_ctx == wg_ctx) {
+			libgpac._web_grabsi._wg_ctx = null;
+			if (libgpac._web_grabsi.stream) {
+				libgpac._web_grabsi.stream.getTracks().forEach(function(track) {
+				  track.stop();
+				});
+			}
+			libgpac._web_grabs.splice(i, 1);
+			return;
+		}
+	}
+})
+
+void webgrab_finalize(GF_Filter *filter)
+{
+    GF_WebGrab *ctx = gf_filter_get_udta(filter);
+	wgrab_del(EM_CAST_PTR ctx);
+	while (gf_list_count(ctx->video_pcks)) {
+		GF_FilterPacket *pck = gf_list_pop_front(ctx->video_pcks);
+		gf_filter_pck_discard(pck);
+	}
+	gf_list_del(ctx->video_pcks);
+	while (gf_list_count(ctx->audio_pcks)) {
+		GF_FilterPacket *pck = gf_list_pop_front(ctx->audio_pcks);
+		gf_filter_pck_discard(pck);
+	}
+	gf_list_del(ctx->audio_pcks);
+}
+
+static GF_FilterProbeScore webgrab_probe_url(const char *url, const char *mime)
+{
+	if (!strncmp(url, "video://", 8)) return GF_FPROBE_MAYBE_SUPPORTED;
+	if (!strncmp(url, "audio://", 8)) return GF_FPROBE_MAYBE_SUPPORTED;
+	if (!strncmp(url, "av://", 5)) return GF_FPROBE_MAYBE_SUPPORTED;
+	if (!strncmp(url, "canvas://", 9)) return GF_FPROBE_MAYBE_SUPPORTED;
+	return GF_FPROBE_NOT_SUPPORTED;
+}
+
+static GF_FilterCapability WebGrabCaps =
+{
+	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_VISUAL),
+	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_CODECID, GF_CODECID_RAW),
+	{0},
+	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_AUDIO),
+	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_CODECID, GF_CODECID_RAW),
+};
+
+#define OFFS(_n)	#_n, offsetof(GF_WebGrab, _n)
+
+static const GF_FilterArgs WebGrabArgs =
+{
+	{ OFFS(src), "source url", GF_PROP_STRING, NULL, NULL, 0},
+	{ OFFS(vsize), "desired webcam resolution", GF_PROP_VEC2I, "0x0", NULL, GF_FS_ARG_HINT_ADVANCED},
+	{ OFFS(back), "use back camera", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_ADVANCED},
+	{ OFFS(ntp), "mark packets with NTP", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_ADVANCED},
+	{ OFFS(alpha), "keep alpha when brabbing canvas", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_ADVANCED},
+	{ OFFS(fps), "framerate to use when grabbing images - 0 FPS means single image", GF_PROP_FRACTION, "0/1", NULL, GF_FS_ARG_HINT_ADVANCED},
+	{0}
+};
+
+GF_FilterRegister GF_WebGrabRegister = {
+	.name = "webgrab",
+	GF_FS_SET_DESCRIPTION("Frame grabber for web audio and video")
+	GF_FS_SET_HELP("This filter grabs audio and video streams MediaStreamTrackProcessor of the browser\n"
+	"\n"
+	"Supported URL schemes:\n"
+	"- video:// grabs from camera\n"
+	"- audio:// grabs from microphone\n"
+	"- av:// grabs both audio from microphone and video from camera\n"
+	"- video://ELTID grabs from DOM element with ID `ELTID` (the element must be a valid element accepted by `VideoFrame` constructor)\n"
+	)
+	.args = WebGrabArgs,
+	SETCAPS(WebGrabCaps),
+	//getUserMedia only available on main thread
+	.flags = GF_FS_REG_MAIN_THREAD|GF_FS_REG_ASYNC_BLOCK,
+	.private_size = sizeof(GF_WebGrab),
+	.initialize = webgrab_initialize,
+	.finalize = webgrab_finalize,
+	.process = webgrab_process,
+	.process_event = webgrab_process_event,
+	.probe_url = webgrab_probe_url,
+};
+
+
+const GF_FilterRegister *webgrab_register(GF_FilterSession *session)
+{
+	
+	int has_media_track_processor = EM_ASM_INT({
+		if (typeof MediaStreamTrackProcessor == 'undefined') return 0;
+		return 1;
+	});
+	if (!has_media_track_processor) {
+		GF_LOG(GF_LOG_INFO, GF_LOG_CODEC, ("WebGrab No MediaStreamTrackProcessor support\n"));
+		return NULL;
+	}
+	return &GF_WebGrabRegister;
+}
+#endif

gpac-2.2.1.tar.gz/src/filters/bs_agg.c -> gpac-2.4.0.tar.gz/src/filters/bs_agg.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2022
+ *			Copyright (c) Telecom ParisTech 2022-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / compressed split bitstream aggregator filter
@@ -28,6 +28,8 @@
 #include <gpac/internal/media_dev.h>
 #include <gpac/mpeg4_odf.h>
 
+#ifndef GPAC_DISABLE_BSAGG
+
 #define MAX_LID	64
 #define MAX_TID	7
 
@@ -37,6 +39,13 @@
 	u32 size, alloc_size, lid, tid;
 } NALStore;
 
+
+typedef struct
+{
+	u32 layer_id_plus_one;
+	u32 min_temporal_id, max_temporal_id;
+} LHVCLayerInfo;
+
 typedef struct _bs_agg_ctx BSAggCtx;
 typedef struct _bs_agg_pid BSAggOut;
 
@@ -54,6 +63,8 @@
 	GF_List *nal_stores;
 
 	GF_List *ipids;
+
+	LHVCLayerInfo linf64;
 };
 
 struct _bs_agg_ctx
@@ -180,6 +191,7 @@
 
 		gf_filter_pid_set_property(pctx->opid, GF_PROP_PID_CODECID, &PROP_UINT(GF_CODECID_AVC));
 		gf_filter_pid_set_property(pctx->opid, GF_PROP_PID_ISOM_STSD_TEMPLATE, NULL);
+		gf_filter_pid_set_property(pctx->opid, GF_PROP_PID_ISOM_STSD_ALL_TEMPLATES, NULL);
 		gf_filter_pid_set_property(pctx->opid, GF_PROP_PID_BITRATE, NULL);
 
 		u8 *data;
@@ -252,10 +264,8 @@
 	GF_Err e;
 	u32 i, count;
 	Bool is_vvc = GF_FALSE;
-#ifndef GPAC_DISABLE_HEVC
 	GF_HEVCConfig *hvcc_out = NULL;
 	GF_HEVCConfig *hvcc_enh_out = NULL;
-#endif
 	GF_VVCConfig *vvcc_out = NULL;
 	GF_FilterPid *base = NULL;
 	const GF_PropertyValue *dv_cfg = NULL;
@@ -265,10 +275,8 @@
 		vvcc_out = gf_odf_vvc_cfg_new();
 		if (!vvcc_out) return GF_OUT_OF_MEM;
 	} else {
-#ifndef GPAC_DISABLE_HEVC
 		hvcc_out = gf_odf_hevc_cfg_new();
 		if (!hvcc_out) return GF_OUT_OF_MEM;
-#endif
 	}
 
 #define GOTO_ERR(_e) { e = _e; goto err_exit; }
@@ -323,7 +331,6 @@
 				if (e) goto err_exit;
 			}
 		} else {
-#ifndef GPAC_DISABLE_HEVC
 			GF_HEVCConfig *hvcc = NULL;
 			Bool dsi_lhvc=GF_FALSE;
 			if ((pctx->codec_id==GF_CODECID_LHVC) && !dsi_enh) dsi_lhvc=GF_TRUE;
@@ -366,7 +373,6 @@
 				gf_odf_hevc_cfg_del(hvcc);
 				if (e) goto err_exit;
 			}
-#endif
 		}
 	}
 
@@ -376,6 +382,7 @@
 
 		gf_filter_pid_set_property(pctx->opid, GF_PROP_PID_CODECID, &PROP_UINT(GF_CODECID_HEVC));
 		gf_filter_pid_set_property(pctx->opid, GF_PROP_PID_ISOM_STSD_TEMPLATE, NULL);
+		gf_filter_pid_set_property(pctx->opid, GF_PROP_PID_ISOM_STSD_ALL_TEMPLATES, NULL);
 		gf_filter_pid_set_property(pctx->opid, GF_PROP_PID_BITRATE, NULL);
 
 		if (dv_cfg)
@@ -390,7 +397,6 @@
 			gf_filter_pid_set_property(pctx->opid, GF_PROP_PID_DECODER_CONFIG, &PROP_DATA_NO_COPY(data, size) );
 			gf_filter_pid_set_property(pctx->opid, GF_PROP_PID_DECODER_CONFIG_ENHANCEMENT, NULL);
 		}
-#ifndef GPAC_DISABLE_HEVC
 		if (hvcc_out) {
 			hvcc_out->nal_unit_size = 4;
 			hvcc_out->is_lhvc = GF_FALSE;
@@ -405,16 +411,13 @@
 				gf_filter_pid_set_property(pctx->opid, GF_PROP_PID_DECODER_CONFIG_ENHANCEMENT, NULL);
 			}
 		}
-#endif
 	}
 
 
 err_exit:
 
-#ifndef GPAC_DISABLE_HEVC
 	if (hvcc_out) gf_odf_hevc_cfg_del(hvcc_out);
 	if (hvcc_enh_out) gf_odf_hevc_cfg_del(hvcc_enh_out);
-#endif
 	if (vvcc_out) gf_odf_vvc_cfg_del(vvcc_out);
 	return e;
 }
@@ -447,6 +450,51 @@
 	return GF_OK;
 }
 
+static Bool bsagg_filter_prop(void *cbk, u32 prop_4cc, const char *prop_name, const GF_PropertyValue *src_prop)
+{
+
+	if (!prop_name) return GF_TRUE;
+	if (!strncmp(prop_name, "grp_linf", 8))
+		return GF_FALSE;
+	return GF_TRUE;
+}
+
+static void bsagg_set_linf(BSAggOut *pctx)
+{
+	u32 i, nb_layers=0, nb_sublayers=0;
+	u8 *data;
+	u32 data_size;
+	GF_BitStream *bs;
+	if (pctx->codec_id!=GF_CODECID_HEVC)
+		return;
+
+	for (i=0; i<64; i++) {
+		if (pctx->linfi.layer_id_plus_one) nb_layers++;
+		if (pctx->linfi.min_temporal_id != pctx->linfi.max_temporal_id) nb_sublayers++;
+	}
+	//only set linf if more than one layer
+	if ((nb_layers<=1) && !nb_sublayers)
+		return;
+
+	bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
+
+	gf_bs_write_int(bs, 0, 2);
+	gf_bs_write_int(bs, nb_layers, 6);
+	for (i=0; i<nb_layers; i++) {
+		if (! pctx->linfi.layer_id_plus_one) continue;
+		gf_bs_write_int(bs, 0, 4);
+		gf_bs_write_int(bs, pctx->linfi.layer_id_plus_one - 1, 6);
+		gf_bs_write_int(bs, pctx->linfi.min_temporal_id, 3);
+		gf_bs_write_int(bs, pctx->linfi.max_temporal_id, 3);
+		gf_bs_write_int(bs, 0, 1);
+		gf_bs_write_int(bs, 0xFF, 7);
+
+	}
+	gf_bs_get_content(bs, &data, &data_size);
+	gf_bs_del(bs);
+	gf_filter_pid_set_info_str(pctx->opid, "hevc:linf", &PROP_DATA_NO_COPY(data, data_size) );
+}
+
 static GF_Err nalu_process(BSAggCtx *ctx, BSAggOut *pctx, u32 codec_type)
 {
 	u32 size, pck_size, i, count, tot_size=0, nb_done=0;
@@ -486,6 +534,7 @@
 		}
 	}
 	if (nb_done==count) {
+		bsagg_set_linf(pctx);
 		gf_filter_pid_set_eos(pctx->opid);
 		return GF_EOS;
 	}
@@ -679,7 +728,7 @@
 				e = GF_OUT_OF_MEM;
 				break;
 			}
-			gf_filter_pck_merge_properties(pck, pctx->pck);
+			gf_filter_pck_merge_properties_filter(pck, pctx->pck, bsagg_filter_prop, ctx);
 		}
 		//drop packet
 		gf_filter_pid_drop_packet(pid);
@@ -696,7 +745,16 @@
 	for (u32 j=0; j<nal_count; j++) {
 		NALStore *ns = gf_list_get(pctx->nal_stores, j);
 		if (!ns->size) continue;
+		if (ns->lid<64) {
+			LHVCLayerInfo *linf = &pctx->linfns->lid;
+
+			linf->layer_id_plus_one = ns->lid + 1;
+			if (!linf->min_temporal_id || (linf->min_temporal_id > ns->tid))
+				linf->min_temporal_id = ns->tid;
 
+			if (linf->max_temporal_id < ns->tid)
+				linf->max_temporal_id = ns->tid;
+		}
 		memcpy(output, ns->data, ns->size);
 		output+= ns->size;
 		ns->size = 0;
@@ -729,7 +787,7 @@
 		const GF_PropertyValue *p = gf_filter_pid_get_property(ipid, GF_PROP_PID_ID);
 		if (p && (p->value.uint==dep_id)) return GF_TRUE;
 		p = gf_filter_pid_get_property(ipid, GF_PROP_PID_DEPENDENCY_ID);
-		if (!p || !p->value.uint) continue;;
+		if (!p || !p->value.uint) continue;
 
 		if (bs_agg_is_base(pctx, codec_id, p->value.uint, rec_level+1))
 			return GF_TRUE;
@@ -814,14 +872,12 @@
 		pctx->rewrite_pid_config = avc_rewrite_pid_config;
 		pctx->agg_process = avc_process;
 		break;
-#ifndef GPAC_DISABLE_HEVC
 	case GF_CODECID_HEVC:
 	case GF_CODECID_LHVC:
 		codec_id = GF_CODECID_HEVC;
 		pctx->rewrite_pid_config = vvc_hevc_rewrite_pid_config;
 		pctx->agg_process = hevc_process;
 		break;
-#endif
 	case GF_CODECID_VVC:
 		pctx->rewrite_pid_config = vvc_hevc_rewrite_pid_config;
 		pctx->agg_process = vvc_process;
@@ -928,7 +984,14 @@
 	.process = bs_agg_process
 };
 
-const GF_FilterRegister *bs_agg_register(GF_FilterSession *session)
+const GF_FilterRegister *bsagg_register(GF_FilterSession *session)
 {
 	return (const GF_FilterRegister *) &BSAggRegister;
 }
+#else
+const GF_FilterRegister *bsagg_register(GF_FilterSession *session)
+{
+	return NULL;
+}
+#endif
+

gpac-2.2.1.tar.gz/src/filters/bs_split.c -> gpac-2.4.0.tar.gz/src/filters/bs_split.c Changed

gpac-2.2.1.tar.gz/src/filters/bsrw.c -> gpac-2.4.0.tar.gz/src/filters/bsrw.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2020-2022
+ *			Copyright (c) Telecom ParisTech 2020-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / compressed bitstream metadata rewrite filter
@@ -28,6 +28,8 @@
 #include <gpac/internal/media_dev.h>
 #include <gpac/mpeg4_odf.h>
 
+#ifndef GPAC_DISABLE_BSRW
+
 typedef struct _bsrw_pid_ctx BSRWPid;
 typedef struct _bsrw_ctx GF_BSRWCtx;
 
@@ -303,8 +305,6 @@
 	return GF_OK;
 }
 
-#ifndef GPAC_DISABLE_HEVC
-
 static GF_Err hevc_rewrite_pid_config(GF_BSRWCtx *ctx, BSRWPid *pctx)
 {
 	GF_HEVCConfig *hvcc;
@@ -350,8 +350,6 @@
 	}
 	return GF_OK;
 }
-#endif // GPAC_DISABLE_HEVC
-
 
 static GF_Err vvc_rewrite_pid_config(GF_BSRWCtx *ctx, BSRWPid *pctx)
 {
@@ -541,20 +539,18 @@
 	}
 
 	prop = gf_filter_pid_get_property(pid, GF_PROP_PID_CODECID);
-	assert(prop);
+	gf_fatal_assert(prop);
 	switch (prop->value.uint) {
 	case GF_CODECID_AVC:
 	case GF_CODECID_SVC:
 	case GF_CODECID_MVC:
 		pctx->rewrite_pid_config = avc_rewrite_pid_config;
 		break;
-#ifndef GPAC_DISABLE_HEVC
 	case GF_CODECID_HEVC:
 	case GF_CODECID_HEVC_TILES:
 	case GF_CODECID_LHVC:
 		pctx->rewrite_pid_config = hevc_rewrite_pid_config;
 		break;
-#endif
 	case GF_CODECID_VVC:
 	case GF_CODECID_VVC_SUBPIC:
 		pctx->rewrite_pid_config = vvc_rewrite_pid_config;
@@ -753,3 +749,10 @@
 	}
 	return (const GF_FilterRegister *) &BSRWRegister;
 }
+#else
+const GF_FilterRegister *bsrw_register(GF_FilterSession *session)
+{
+	return NULL;
+}
+#endif // GPAC_DISABLE_BSRW
+

gpac-2.2.1.tar.gz/src/filters/compose.c -> gpac-2.4.0.tar.gz/src/filters/compose.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2017-2022
+ *			Copyright (c) Telecom ParisTech 2017-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / compositor filter
@@ -29,7 +29,7 @@
 //to set caps in filter session, to cleanup!
 #include "../filter_core/filter_session.h"
 
-#ifndef GPAC_DISABLE_PLAYER
+#ifndef GPAC_DISABLE_COMPOSITOR
 
 GF_Err compose_bifs_dec_config_input(GF_Scene *scene, GF_FilterPid *pid, u32 oti, Bool is_remove);
 GF_Err compose_bifs_dec_process(GF_Scene *scene, GF_FilterPid *pid);
@@ -45,8 +45,10 @@
 	Bool ret;
 	GF_Compositor *ctx = (GF_Compositor *) gf_filter_get_udta(filter);
 	if (!ctx) return GF_BAD_PARAM;
-	if (!ctx->vout) return GF_OK;
-
+	//if acting as a source, we may not have a vout setup yet if we have not traversed the graph
+	if (!ctx->vout && !ctx->src) {
+		return GF_OK;
+	}
 	if (ctx->check_eos_state == 2)
 		return GF_EOS;
 
@@ -113,14 +115,17 @@
 		Bool was_over = GF_FALSE;
 		/*remember to check for eos*/
 		if (ctx->dur<0) {
-			if (ctx->frame_number >= (u32) -ctx->dur)
+			if (ctx->frame_number >= (u32) -ctx->dur) {
 				ctx->check_eos_state = 2;
+				gf_filter_abort(filter);
+			}
 		} else if (ctx->dur>0) {
 			Double n = ctx->scene_sampled_clock;
 			n /= 1000;
-			if (n>=ctx->dur)
+			if (n>=ctx->dur) {
 				ctx->check_eos_state = 2;
-			else if (!ret && ctx->vfr && !ctx->check_eos_state && !nb_sys_streams_active && ctx->scene_sampled_clock && !ctx->validator_mode) {
+				gf_filter_abort(filter);
+			} else if (!ret && ctx->vfr && !ctx->check_eos_state && !nb_sys_streams_active && ctx->scene_sampled_clock && !ctx->validator_mode) {
 				ctx->check_eos_state = 1;
 				if (!ctx->validator_mode)
 					ctx->force_next_frame_redraw = GF_TRUE;
@@ -130,6 +135,9 @@
 			was_over = GF_TRUE;
 		} else if (ctx->sys_frames_pending) {
 			ctx->check_eos_state = 0;
+		} else if (gf_filter_end_of_session(filter)) {
+			ctx->check_eos_state = 2;
+			gf_filter_abort(filter);
 		}
 
 		if (ctx->timeout && (ctx->check_eos_state == 1) && !gf_filter_connections_pending(filter)) {
@@ -183,8 +191,8 @@
 
 	//player mode
 	
-	//quit event seen, do not flush, just abort and return last error
-	if (ctx->check_eos_state) {
+	//quit event seen or session is ending, do not flush, just abort and return last error
+	if (ctx->check_eos_state || gf_filter_end_of_session(filter)) {
 		gf_filter_abort(filter);
 		return ctx->last_error ? ctx->last_error : GF_EOS;
 	}
@@ -301,7 +309,7 @@
 
 	odm = gf_filter_pid_get_udta(pid);
 
-	//in filter mode, check we can handle creating a canvas from input video format. If not, negociate a supported format
+	//in filter mode, check we can handle creating a canvas from input video format. If not, negotiate a supported format
 	if (!ctx->player) {
 		prop = gf_filter_pid_get_property(pid, GF_PROP_PID_PIXFMT);
 		if (prop && (!odm || (odm->mo && (odm->mo->pixelformat != prop->value.uint)))) {
@@ -320,7 +328,7 @@
 				} else {
 					new_fmt = transparent ? GF_PIXEL_RGBA : GF_PIXEL_RGB;
 				}
-				gf_filter_pid_negociate_property(pid, GF_PROP_PID_PIXFMT, &PROP_UINT(new_fmt) );
+				gf_filter_pid_negotiate_property(pid, GF_PROP_PID_PIXFMT, &PROP_UINT(new_fmt) );
 				return GF_OK;
 			}
 		}
@@ -343,6 +351,9 @@
 				return GF_NOT_SUPPORTED;
 			if (odm->mo) {
 				odm->mo->config_changed = GF_TRUE;
+				if (gf_filter_pid_get_property(pid, GF_PROP_PID_SRD_MAP))
+					odm->mo->srd_map_changed  = GF_TRUE;
+
 				gf_mo_update_caps_ex(odm->mo, GF_TRUE);
 				if (odm->mo->config_changed && (odm->type == GF_STREAM_VISUAL) && odm->parentscene && odm->parentscene->is_dynamic_scene) {
 					gf_scene_force_size_to_video(odm->parentscene, odm->mo);
@@ -422,7 +433,7 @@
 			}
 			continue;
 		}
-		assert(sns->owner);
+		gf_fatal_assert(sns->owner);
 		if (gf_filter_pid_is_filter_in_parents(pid, sns->source_filter)) {
 			Bool scene_setup = GF_FALSE;
 			if (!sns->owner->subscene && sns->owner->parentscene && (mtype!=GF_STREAM_OD) && (mtype!=GF_STREAM_SCENE)) {
@@ -469,7 +480,7 @@
 					return GF_OK;
 				}
 
-				assert(sns->owner->parentscene);
+				gf_fatal_assert(sns->owner->parentscene);
 				sns->owner->subscene = gf_scene_new(ctx, sns->owner->parentscene);
 				sns->owner->subscene->root_od = sns->owner;
 			}
@@ -478,7 +489,7 @@
 		}
 	}
 	if (!scene) scene = def_scene;
-	assert(scene);
+	if (!scene) return GF_SERVICE_ERROR;
 
 	GF_LOG(GF_LOG_INFO, GF_LOG_COMPOSE, ("Compositor Configuring PID %s\n", gf_stream_type_name(mtype)));
 
@@ -566,6 +577,10 @@
 			if (prop && (prop->value.uint==GF_PROJ360_EQR)) scene_vr_type = 1;
 		}
 		if (scene_vr_type) {
+			prop = gf_filter_pid_get_property(pid, GF_PROP_PID_SRD_MAP);
+			if (prop) scene_vr_type = 2;
+		}
+		if (scene_vr_type) {
 			if (scene->vr_type != scene_vr_type) reset = GF_TRUE;
 			scene->vr_type = scene_vr_type;
 		}
@@ -819,6 +834,8 @@
 	} else if (ctx->noback) {
 		ctx->forced_alpha = GF_TRUE;
 	}
+	if (ctx->src)
+		ctx->vfr = GF_TRUE;
 
 	//playout buffer not greater than max buffer
 	if (ctx->buffer > ctx->mbuffer)
@@ -899,6 +916,8 @@
 	else if (ctx->src) {
 		gf_sc_connect_from_time(ctx, ctx->src, 0, 0, 0, NULL);
 	}
+
+	gf_opts_set_key("temp", "compositor", "yes");
 	return GF_OK;
 }
 
@@ -1204,7 +1223,7 @@
 	.probe_url = compose_probe_url,
 };
 
-const GF_FilterRegister *compose_filter_register(GF_FilterSession *session)
+const GF_FilterRegister *compositor_register(GF_FilterSession *session)
 {
 	u32 i=0;
 	u32 nb_args = sizeof(CompositorArgs) / sizeof(GF_FilterArgs) - 1;
@@ -1220,9 +1239,9 @@
 	return &CompositorFilterRegister;
 }
 #else
-const GF_FilterRegister *compose_filter_register(GF_FilterSession *session)
+const GF_FilterRegister *compositor_register(GF_FilterSession *session)
 {
 	return NULL;
 }
-#endif // GPAC_DISABLE_PLAYER
+#endif // GPAC_DISABLE_COMPOSITOR

gpac-2.2.1.tar.gz/src/filters/dasher.c -> gpac-2.4.0.tar.gz/src/filters/dasher.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2018-2022
+ *			Copyright (c) Telecom ParisTech 2018-2024
  *					All rights reserved
  *
  *  This file is part of GPAC / MPEG-DASH/HLS segmenter
@@ -32,7 +32,7 @@
 #include <gpac/network.h>
 #include <gpac/crypt_tools.h>
 
-#if !defined(GPAC_DISABLE_MPD)
+#ifndef GPAC_DISABLE_DASHER
 
 #define DEFAULT_PERIOD_ID	 "_gf_dash_def_period"
 
@@ -137,6 +137,39 @@
 	DASHER_DEFKID_AUTO
 };
 
+enum
+{
+	DASHER_PSWITCH_SINGLE=0,
+	DASHER_PSWITCH_FORCE,
+	DASHER_PSWITCH_STSD
+};
+enum
+{
+	DASHER_SEGSYNC_NO=0,
+	DASHER_SEGSYNC_YES,
+	DASHER_SEGSYNC_AUTO
+};
+
+enum
+{
+	IDXMODE_NONE=0,
+	IDXMODE_ALL,
+	IDXMODE_MANIFEST,
+	IDXMODE_CHILD,
+	IDXMODE_INIT,
+	IDXMODE_SEG,
+};
+
+//these are not exported for now
+//get destination name by index
+char *gf_filter_pid_get_destination_ex(GF_FilterPid *pid, u32 dst_idx);
+//skip segment_size events
+void gf_filter_skip_seg_size_events(GF_Filter *f);
+//prevent pid to link to multiple filters - only valid for this pid, not for remaining connections
+void gf_filter_pid_force_single_link(GF_FilterPid *pid);
+//prevent filter cloning in pid link
+void gf_filter_pid_disable_clone(GF_FilterPid *pid);
+
 typedef struct
 {
 	u32 bs_switch, profile, spd, cp, ntp;
@@ -163,13 +196,13 @@
 	char *title, *source, *info, *cprt, *lang;
 	char *chain, *chain_fbk;
 	GF_PropStringList location, base;
-	Bool check_dur, skip_seg, loop, reschedule, scope_deps, keep_src;
+	Bool check_dur, skip_seg, loop, reschedule, scope_deps, keep_src, tpl_force, keep_segs;
 	Double refresh, tsb, subdur;
 	u64 *_p_gentime, *_p_mpdtime;
-	Bool cmpd, dual, sreg, pswitch;
+	Bool cmpd, dual, sreg;
 	char *styp;
 	Bool sigfrag;
-	u32 sbound;
+	u32 sbound, pswitch;
 	char *utcs;
 	char *mname;
 	char *hlsdrm;
@@ -178,10 +211,11 @@
 	u32 llhls;
 	//inherited from mp4mx
 	GF_Fraction cdur;
-	Bool ll_preload_hint, ll_rend_rep, seg_sync;
+	Bool ll_preload_hint, ll_rend_rep;
 	Bool gencues, force_init, gxns;
 	Double ll_part_hb;
-	u32 hls_absu;
+	u32 hls_absu, seg_sync;
+	Bool hls_ap;
 
 	//internal
 	Bool in_error;
@@ -218,6 +252,7 @@
 	Double nb_secs_to_discard;
 	Bool first_context_load, store_init_params;
 	Bool do_m3u8, do_mpd;
+	u32 do_index;
 	Bool is_period_restore, is_empty_period;
 
 	Bool store_seg_states;
@@ -240,16 +275,18 @@
 
 	Bool no_seg_dur;
 
-	Bool utc_initialized;
+	u32 utc_initialized;
+#ifdef GPAC_USE_DOWNLOADER
+	GF_DownloadSession *utc_sess;
+#endif
+
 	DasherUTCTimingType utc_timing_type;
 	s32 utc_diff;
 
-	Bool is_route;
-
 	Bool force_hls_ll_manifest;
 
 	u32 forward_mode;
-	
+
 	u8 last_hls_signatureGF_SHA1_DIGEST_SIZE, last_mpd_signatureGF_SHA1_DIGEST_SIZE, last_hls2_signatureGF_SHA1_DIGEST_SIZE;
 
 	GF_CryptInfo *cinfo;
@@ -261,7 +298,15 @@
 
 	u32 def_max_seg_dur;
 
+	u32 index_max_seg_dur;
+	u64 index_media_duration;
 	GF_Fraction64 min_cts_period;
+
+	u32 from_index;
+	u32 def_template;
+
+	Bool move_to_static;
+	Bool explicit_mode;
 } GF_DasherCtx;
 
 typedef enum
@@ -318,6 +363,8 @@
 
 	u32 nb_comp, nb_comp_done;
 
+	Bool is_av;
+
 	u32 nb_rep, nb_rep_done;
 	Double set_seg_duration;
 
@@ -390,6 +437,7 @@
 	Bool segment_started;
 	u64 first_cts_in_seg;
 	u64 first_cts_in_next_seg;
+	u64 min_cts_in_seg_plus_one;
 	//used for last segment computation of segmentTimeline
 	u64 est_first_cts_in_next_seg;
 	u64 last_cts, last_dts;
@@ -422,7 +470,7 @@
 	Bool cues_use_edits;
 	s32 cues_ts_offset;
 	Bool inband_cues;
-	
+
 	Bool clamp_done;
 	u32 dcd_not_ready;
 
@@ -463,7 +511,10 @@
 	Bool stl;
 
 	Bool set_period_switch;
+	u32 all_stsd_crc;
 
+	u64 frag_start_offset, frag_first_ftdt;
+	u32 tpl_use_time;
 } GF_DashStream;
 
 static void dasher_flush_segment(GF_DasherCtx *ctx, GF_DashStream *ds, Bool is_last_in_period);
@@ -526,9 +577,6 @@
 				}
 			}
 		}
-		//check if we have a route/atsc output, in which we will case assign hls ref prop
-		if (!strncmp(ctx->out_path, "route://", 8) || !strncmp(ctx->out_path, "atsc://", 7))
-			ctx->is_route = GF_TRUE;
 	}
 	//for routeout
 	if (ctx->opid)
@@ -630,7 +678,7 @@
 	}
 
 	if (!ds->rate_first_dts_plus_one) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Dasher Couldn't compute bitrate in time for manifest generation, please report to GPAC devs !\n"));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Dasher Couldn't compute bitrate of PID %s in time for manifest generation, please specify #Bitrate property\n", gf_filter_pid_get_name(ds->ipid)));
 		return;
 	}
 
@@ -805,12 +853,36 @@
 		GF_FEVT_INIT(evt, GF_FEVT_ENCODE_HINTS, ds->ipid)
 		if (!ds->dash_dur.num)
 			dasher_get_dash_dur(ctx, ds);
-		evt.encode_hints.intra_period = ds->dash_dur;
+
+		switch (ctx->from_index) {
+		case IDXMODE_NONE:
+			evt.encode_hints.intra_period = ds->dash_dur;
+			break;
+		case IDXMODE_SEG:
+		case IDXMODE_CHILD:
+			break;
+		case IDXMODE_ALL:
+		case IDXMODE_INIT:
+		case IDXMODE_MANIFEST:
+			evt.encode_hints.gen_dsi_only = GF_TRUE;
+			break;
+		}
 
 		gf_filter_pid_send_event(ds->ipid, &evt);
 	}
 }
 
+static Bool dasher_template_use_source_url(const char *template)
+{
+	if (!template) return GF_FALSE;
+	if (strstr(template, "$File$") != NULL) return GF_TRUE;
+	else if (strstr(template, "$FSRC$") != NULL) return GF_TRUE;
+	else if (strstr(template, "$SourcePath$") != NULL) return GF_TRUE;
+	else if (strstr(template, "$FURL$") != NULL) return GF_TRUE;
+	else if (strstr(template, "$URL$") != NULL) return GF_TRUE;
+	return GF_FALSE;
+}
+
 static GF_Err dasher_configure_pid(GF_Filter *filter, GF_FilterPid *pid, Bool is_remove)
 {
 	Bool period_switch = GF_FALSE;
@@ -844,71 +916,72 @@
 		for (i=0; i < nb_opids; i++) {
 			char *segext=NULL;
 			char *force_ext=NULL;
-			GF_FilterPid *opid;
+			GF_FilterPid *opid=NULL;
 			if (i==0) {
 				ctx->opid = gf_filter_pid_new(filter);
 				gf_filter_pid_set_name(ctx->opid, "MANIFEST");
 				opid = ctx->opid;
-			} else {
-				if (!ctx->alt_dst && ctx->out_path) {
-					char szSRC100;
-					GF_FileIO *gfio = NULL;
-					char *mpath = ctx->out_path;
-					u32 len;
-					if (!strncmp(mpath, "gfio://", 7)) {
-						gfio = gf_fileio_from_url(mpath);
-						if (!gfio) return GF_BAD_PARAM;
-						//only use basename as we will create the new resource through factory
-						mpath = (char *) gf_file_basename(gf_fileio_resource_url(gfio));
-						if (!mpath) return GF_OUT_OF_MEM;
-					}
-
-					len = (u32) strlen(mpath);
-					char *out_path = gf_malloc(len+10);
+			} else if (!ctx->alt_dst && (ctx->out_path || ctx->mname)) {
+				char szSRC100;
+				GF_FileIO *gfio = NULL;
+				char *mpath = ctx->out_path ? ctx->out_path : ctx->mname;
+				u32 len;
+				if (!strncmp(mpath, "gfio://", 7)) {
+					gfio = gf_fileio_from_url(mpath);
+					if (!gfio) return GF_BAD_PARAM;
+					//only use basename as we will create the new resource through factory
+					mpath = (char *) gf_file_basename(gf_fileio_resource_url(gfio));
+					if (!mpath) return GF_OUT_OF_MEM;
+				}
+
+				len = (u32) strlen(mpath);
+				char *out_path = gf_malloc(len+10);
+				if (!out_path) return GF_OUT_OF_MEM;
+				memcpy(out_path, mpath, len);
+				out_pathlen=0;
+				char *sep = gf_file_ext_start(out_path);
+				if (sep) sep0 = 0;
+				if (ctx->do_m3u8) {
+					strcat(out_path, ".mpd");
+					force_ext = "mpd";
+				} else {
+					ctx->opid_alt_m3u8 = GF_TRUE;
+					ctx->do_m3u8 = GF_TRUE;
+					strcat(out_path, ".m3u8");
+					force_ext = "m3u8";
+				}
+				if (gfio) {
+					const char *rel = gf_fileio_factory(gfio, out_path);
+					gf_free(out_path);
+					out_path = gf_strdup(rel);
 					if (!out_path) return GF_OUT_OF_MEM;
-					memcpy(out_path, mpath, len);
-					out_pathlen=0;
-					char *sep = gf_file_ext_start(out_path);
-					if (sep) sep0 = 0;
-					if (ctx->do_m3u8) {
-						strcat(out_path, ".mpd");
-						force_ext = "mpd";
-					} else {
-						ctx->opid_alt_m3u8 = GF_TRUE;
-						ctx->do_m3u8 = GF_TRUE;
-						strcat(out_path, ".m3u8");
-						force_ext = "m3u8";
-					}
-					if (gfio) {
-						const char *rel = gf_fileio_factory(gfio, out_path);
-						gf_free(out_path);
-						out_path = gf_strdup(rel);
-						if (!out_path) return GF_OUT_OF_MEM;
-					}
+				}
 
-					ctx->alt_dst = gf_filter_connect_destination(filter, out_path, &e);
-					if (e) {
-						GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Dasher Couldn't create secondary manifest output %s: %s\n", out_path, gf_error_to_string(e) ));
-						gf_free(out_path);
-						break;
-					}
+				ctx->alt_dst = gf_filter_connect_destination(filter, out_path, &e);
+				if (e) {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Dasher Couldn't create secondary manifest output %s: %s\n", out_path, gf_error_to_string(e) ));
 					gf_free(out_path);
-
-					//reset any sourceID given in the dst_arg and assign sourceID to be the dasher filter
-					gf_filter_reset_source(ctx->alt_dst);
-					snprintf(szSRC, 100, "MuxSrc%cdasher_%p", gf_filter_get_sep(filter, GF_FS_SEP_NAME), ctx->alt_dst);
-					gf_filter_set_source(ctx->alt_dst, filter, szSRC);
-
-					ctx->opid_alt = gf_filter_pid_new(filter);
-					gf_filter_pid_set_name(ctx->opid_alt, "MANIFEST_ALT");
-
-					snprintf(szSRC, 100, "dasher_%p", ctx->alt_dst);
-					gf_filter_pid_set_property(ctx->opid_alt, GF_PROP_PID_MUX_SRC, &PROP_STRING(szSRC) );
-					//we also need to set the property on main output just to avoid the connection
-					snprintf(szSRC, 100, "dasher_%p", ctx);
-					gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_MUX_SRC, &PROP_STRING(szSRC) );
+					break;
 				}
+				gf_free(out_path);
+
+				//reset any sourceID given in the dst_arg and assign sourceID to be the dasher filter
+				gf_filter_reset_source(ctx->alt_dst);
+				snprintf(szSRC, 100, "MuxSrc%cdasher_%p", gf_filter_get_sep(filter, GF_FS_SEP_NAME), ctx->alt_dst);
+				gf_filter_set_source(ctx->alt_dst, filter, szSRC);
+
+				ctx->opid_alt = gf_filter_pid_new(filter);
+				gf_filter_pid_set_name(ctx->opid_alt, "MANIFEST_ALT");
+
+				snprintf(szSRC, 100, "dasher_%p", ctx->alt_dst);
+				gf_filter_pid_set_property(ctx->opid_alt, GF_PROP_PID_MUX_SRC, &PROP_STRING(szSRC) );
+				//we also need to set the property on main output just to avoid the connection
+				snprintf(szSRC, 100, "dasher_%p", ctx);
+				gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_MUX_SRC, &PROP_STRING(szSRC) );
 				opid = ctx->opid_alt;
+			} else {
+				GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("Dasher Cannot guess output file name when explicitly loaded, disabling dual output mode."
+					"\n\tUse --mname=URL to specify output location for alternate manifest\n"));
 			}
 			if (!opid)
 				continue;
@@ -921,8 +994,7 @@
 			gf_filter_pid_set_property(opid, GF_PROP_PID_UNFRAMED, NULL);
 			gf_filter_pid_set_property(opid, GF_PROP_PID_STREAM_TYPE, &PROP_UINT(GF_STREAM_FILE) );
 			//for routeout
-			gf_filter_pid_set_property(opid, GF_PROP_PID_ORIG_STREAM_TYPE, &PROP_UINT(GF_STREAM_FILE) );
-			gf_filter_pid_set_property(opid, GF_PROP_PID_IS_MANIFEST, &PROP_BOOL(GF_TRUE));
+			gf_filter_pid_set_property(opid, GF_PROP_PID_PREMUX_STREAM_TYPE, &PROP_UINT(GF_STREAM_FILE) );
 
 			dasher_check_outpath(ctx);
 
@@ -937,27 +1009,69 @@
 				} else if (ctx->mname) {
 					segext = gf_file_ext_start(ctx->mname);
 				}
-				if (!segext) segext = "mpd";
-				else segext++;
+				if (!segext) {
+					if (!ctx->dual && ctx->do_m3u8) segext = "m3u8" ;
+					else segext = i ? "m3u8" : "mpd";
+				} else {
+					segext++;
+				}
 				if (force_ext)
 					segext = force_ext;
 				gf_filter_pid_set_property(opid, GF_PROP_PID_FILE_EXT, &PROP_STRING(segext) );
 
-				if (!strcmp(segext, "m3u8")) {
+				if (ctx->explicit_mode) {
+					//prevent the second pid from linking to another output in case of a graph such as
+					// dasher:dual -o live.mpd
+					//the explicit dasher will link mpd to mpd and will try to clone fout(live.mpd) for the manifest pid
+					//since the default ext is * and cloning is enabled by default in implicit linking
+					if (i)
+						gf_filter_pid_disable_clone(opid);
+
+					//override URL/path when loaded dynamically in case output filter(s) do not set a manifest name
+					gf_filter_pid_set_property(opid, GF_PROP_PID_URL, ctx->out_path ? &PROP_STRING(ctx->out_path) : NULL );
+					gf_filter_pid_set_property(opid, GF_PROP_PID_FILEPATH, ctx->out_path ? &PROP_STRING(ctx->out_path) : NULL );
+				}
 
+				if (!strcmp(segext, "m3u8")) {
 					gf_filter_pid_set_property(opid, GF_PROP_PID_MIME, &PROP_STRING("video/mpegurl"));
+				} else if (!strcmp(segext, "ghi")) {
+					gf_filter_pid_set_property(opid, GF_PROP_PID_MIME, &PROP_STRING("application/x-gpac-ghi"));
+				} else if (!strcmp(segext, "ghix")) {
+					gf_filter_pid_set_property(opid, GF_PROP_PID_MIME, &PROP_STRING("application/x-gpac-ghix"));
 				} else {
 					gf_filter_pid_set_property(opid, GF_PROP_PID_MIME, &PROP_STRING("application/dash+xml"));
 				}
 			}
 
+			u32 manifest_type = 0;
 			if (!strcmp(segext, "m3u8")) {
 				ctx->do_m3u8 = GF_TRUE;
 				gf_filter_pid_set_name(opid, "manifest_m3u8" );
+				manifest_type = 2;
+			} else if (!strcmp(segext, "ghix") || !strcmp(segext, "ghi")) {
+				ctx->do_index = !strcmp(segext, "ghix") ? 2 : 1;
+				ctx->sigfrag = GF_FALSE;
+				ctx->align = ctx->sap = GF_TRUE;
+				ctx->sseg = ctx->sfile = ctx->tpl = GF_FALSE;
+				if (ctx->state) {
+					gf_free(ctx->state);
+					ctx->state = NULL;
+					GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("Dasher Index generation mode, disabling state\n" ));
+				}
+				if (!ctx->template)
+					ctx->template = gf_strdup("$RepresentationID$-$Number$$Init=init$");
+
+				gf_filter_pid_set_name(opid, "dash_index" );
+				manifest_type = 3;
 			} else {
 				ctx->do_mpd = GF_TRUE;
 				gf_filter_pid_set_name(opid, "manifest_mpd" );
+				manifest_type = 1;
 			}
+			if (!gf_sys_is_test_mode() && (ctx->dmode>=GF_DASH_DYNAMIC))
+				manifest_type |= 0x80000000;
+
+			gf_filter_pid_set_property(opid, GF_PROP_PID_IS_MANIFEST, &PROP_UINT(manifest_type));
 		}
 
 		ctx->store_seg_states = GF_FALSE;
@@ -975,6 +1089,7 @@
 		period_switch = GF_TRUE;
 		gf_filter_pid_set_udta(pid, ds);
 		ds->sbound = ctx->sbound;
+		ds->startNumber = 1;
 		if (ctx->sbound!=DASHER_BOUNDS_OUT)
 			ds->packet_queue = gf_list_new();
 
@@ -1052,6 +1167,15 @@
 	prev_stream_type = ds->stream_type;
 	CHECK_PROP(GF_PROP_PID_STREAM_TYPE, ds->stream_type, GF_NOT_SUPPORTED)
 
+	if (ctx->sigfrag) {
+		p = gf_filter_pid_get_property_str(pid, "nofrag");
+		if (p && p->value.boolean) {
+			p = gf_filter_pid_get_property(pid, GF_PROP_PID_URL);
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("IsoMedia sigfrag requested but file %s is not fragmented\n", p->value.string));
+			return GF_BAD_PARAM;
+		}
+	}
+
 	ds->tile_base = GF_FALSE;
 
 	if (ds->stream_type != GF_STREAM_FILE) {
@@ -1078,6 +1202,11 @@
 		CHECK_PROP(GF_PROP_PID_CODECID, ds->codec_id, GF_NOT_SUPPORTED)
 		CHECK_PROP(GF_PROP_PID_TIMESCALE, ds->timescale, GF_NOT_SUPPORTED)
 
+		if (!ds->timescale) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("Dasher Input PID %s has no timescale, cannot dash\n", gf_filter_pid_get_name(pid) ));
+			return GF_NON_COMPLIANT_BITSTREAM;
+		}
+
 		if (ds->stream_type==GF_STREAM_VISUAL) {
 			CHECK_PROP(GF_PROP_PID_WIDTH, ds->width, GF_EOS)
 			CHECK_PROP(GF_PROP_PID_HEIGHT, ds->height, GF_EOS)
@@ -1132,15 +1261,19 @@
 		CHECK_PROP_FRAC64(GF_PROP_PID_DURATION, ds->duration, GF_EOS)
 		CHECK_PROP_STR(GF_PROP_PID_URL, ds->src_url, GF_EOS)
 		period_switch = old_period_switch;
+		if (ds->duration.num<0) ds->duration.num = 0;
 
 		CHECK_PROP(GF_PROP_PID_ID, ds->id, GF_EOS)
+		if (!p) GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("Dasher Input PID %s has no explicit ID. Segment names may not be correct.\n", gf_filter_pid_get_name(pid)));
 		CHECK_PROP(GF_PROP_PID_DEPENDENCY_ID, ds->dep_id, GF_EOS)
 
 		p = gf_filter_pid_get_property(pid, GF_PROP_PID_HAS_SYNC);
 		u32 sync_type = DASHER_SYNC_UNKNOWN;
 		if (p) sync_type = p->value.boolean ? DASHER_SYNC_PRESENT : DASHER_SYNC_NONE;
-		if (sync_type != ds->sync_points_type) period_switch = GF_TRUE;
-		ds->sync_points_type = sync_type;
+		if ((sync_type != DASHER_SYNC_UNKNOWN) && (sync_type != ds->sync_points_type)) {
+			period_switch = GF_TRUE;
+			ds->sync_points_type = sync_type;
+		}
 
 		if (ds->inband_cues)
 			period_switch = old_period_switch;
@@ -1151,6 +1284,24 @@
 				ds->src_id = gf_crc_32(src_args, (u32) strlen(src_args));
 			}
 		}
+
+		//check if we had up-front declarations of codec configs
+		if (ctx->pswitch==DASHER_PSWITCH_STSD) {
+			p = gf_filter_pid_get_property(pid, GF_PROP_PID_ISOM_STSD_ALL_TEMPLATES);
+			if (p) {
+				u32 all_stsd_crc = gf_crc_32(p->value.data.ptr, p->value.data.size);
+				//same config, we assume the muxer dealt with this at setup, reset dsi crc to skip period switch test below
+				if (all_stsd_crc==ds->all_stsd_crc) {
+					ds->dsi_crc = 0;
+					ds->dsi_enh_crc = 0;
+				} else {
+					ds->all_stsd_crc = all_stsd_crc;
+				}
+			} else {
+				ds->all_stsd_crc = 0;
+			}
+		}
+
 		dc_crc = 0;
 		dsi = p = gf_filter_pid_get_property(pid, GF_PROP_PID_DECODER_CONFIG);
 		if (p && (p->type==GF_PROP_DATA))
@@ -1173,6 +1324,11 @@
 				if (!ctx->bs_switch)
 					period_switch = GF_TRUE;
 				break;
+			//ignore reconfig for these subtitle formats
+			case GF_CODECID_SIMPLE_TEXT:
+			case GF_CODECID_WEBVTT:
+			case GF_CODECID_SUBS_XML:
+				break;
 			default:
 				period_switch = GF_TRUE;
 				break;
@@ -1247,13 +1403,14 @@
 
 		if (!ds->src_url)
 			ds->src_url = gf_strdup("file");
-		ds->startNumber = 1;
+
 		CHECK_PROP(GF_PROP_PID_START_NUMBER, ds->startNumber, GF_EOS)
 
 		ds->no_seg_dur = ctx->no_seg_dur;
 		dasher_get_dash_dur(ctx, ds);
 
 		ds->splitable = GF_FALSE;
+		ds->is_av = GF_FALSE;
 		switch (ds->stream_type) {
 		case GF_STREAM_TEXT:
 		case GF_STREAM_METADATA:
@@ -1261,6 +1418,10 @@
 		case GF_STREAM_SCENE:
 			ds->splitable = ctx->split;
 			break;
+		case GF_STREAM_VISUAL:
+		case GF_STREAM_AUDIO:
+			ds->is_av = GF_TRUE;
+			break;
 		}
 
 		old_clamp_dur = ds->clamped_dur.num;
@@ -1269,10 +1430,28 @@
 		p = gf_filter_pid_get_property(pid, GF_PROP_PID_CLAMP_DUR);
 		if (p && p->value.lfrac.den) ds->clamped_dur = p->value.lfrac;
 
+		//HLS variant playlist is allowed to use templates, resolve
+		if (ds->hls_vp_name) {
+			char szTempNameGF_MAX_PATH, szFinalNameGF_MAX_PATH;
+			e = gf_filter_pid_resolve_file_template(ds->ipid, ds->hls_vp_name, szTempName, 0, NULL);
+
+			if (!e) {
+				e = gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_INITIALIZATION_SKIPINIT, GF_FALSE, szFinalName, ds->rep_id, NULL, szTempName, NULL, 0, ds->bitrate, 0, ds->stl, ctx->tpl_force);
+			}
+
+			if (!e) {
+				gf_free(ds->hls_vp_name);
+				ds->hls_vp_name = gf_strdup(szFinalName);
+			} else {
+				GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("Dasher Failed to solve HLS variant playlist template %s: %s - will use default\n", ds->hls_vp_name, gf_error_to_string(e)));
+				gf_free(ds->hls_vp_name);
+				ds->hls_vp_name = NULL;
+			}
+		}
+
 		//HDR
 #if !defined(GPAC_DISABLE_AV_PARSERS)
 		if (dsi) {
-#if !defined(GPAC_DISABLE_HEVC)
 			if (ds->codec_id == GF_CODECID_LHVC || ds->codec_id == GF_CODECID_HEVC_TILES || ds->codec_id == GF_CODECID_HEVC) {
 				GF_HEVCConfig* hevccfg = gf_odf_hevc_cfg_read(dsi->value.data.ptr, dsi->value.data.size, GF_FALSE);
 				if (hevccfg) {
@@ -1298,23 +1477,23 @@
 					gf_odf_hevc_cfg_del(hevccfg);
 				}
 			}
-			else
-#endif
-			if (ds->codec_id == GF_CODECID_AVC || ds->codec_id == GF_CODECID_SVC || ds->codec_id == GF_CODECID_MVC) {
+			else if (ds->codec_id == GF_CODECID_AVC || ds->codec_id == GF_CODECID_SVC || ds->codec_id == GF_CODECID_MVC) {
 				AVCState avc;
 				GF_AVCConfig* avccfg = gf_odf_avc_cfg_read(dsi->value.data.ptr, dsi->value.data.size);
-				GF_NALUFFParam *sl = (GF_NALUFFParam *)gf_list_get(avccfg->sequenceParameterSets, 0);
-				if (sl) {
-					s32 idx;
-					memset(&avc, 0, sizeof(AVCState));
-					idx = gf_avc_read_sps(sl->data, sl->size, &avc, 0, NULL);
-					if (idx>=0) {
-						Bool is_interlaced = avc.spsidx.frame_mbs_only_flag ? GF_FALSE : GF_TRUE;
-						if (ds->interlaced != is_interlaced) period_switch = GF_TRUE;
-						ds->interlaced = is_interlaced;
+				if (avccfg) {
+					GF_NALUFFParam *sl = (GF_NALUFFParam *)gf_list_get(avccfg->sequenceParameterSets, 0);
+					if (sl) {
+						s32 idx;
+						memset(&avc, 0, sizeof(AVCState));
+						idx = gf_avc_read_sps(sl->data, sl->size, &avc, 0, NULL);
+						if (idx>=0) {
+							Bool is_interlaced = avc.spsidx.frame_mbs_only_flag ? GF_FALSE : GF_TRUE;
+							if (ds->interlaced != is_interlaced) period_switch = GF_TRUE;
+							ds->interlaced = is_interlaced;
+						}
 					}
+					gf_odf_avc_cfg_del(avccfg);
 				}
-				gf_odf_avc_cfg_del(avccfg);
 			}
 		}
 #endif /*!GPAC_DISABLE_AV_PARSERS*/
@@ -1345,7 +1524,6 @@
 			case GF_CODECID_AC3:
 			case GF_CODECID_EAC3:
 				if (dsi) {
-					u32 i;
 					GF_AC3Config ac3;
 					gf_odf_ac3_config_parse(dsi->value.data.ptr, dsi->value.data.size, (ds->codec_id==GF_CODECID_EAC3) ? GF_TRUE : GF_FALSE, &ac3);
 
@@ -1353,8 +1531,7 @@
 					ds->nb_surround = gf_ac3_get_surround_channels(ac3.streams0.acmod);
 					ds->atmos_complexity_type = ac3.is_ec3 ? ac3.complexity_index_type : 0;
 					_nb_ch = gf_ac3_get_total_channels(ac3.streams0.acmod);
-					for (i=0; i<ac3.streams0.nb_dep_sub; ++i) {
-						assert(ac3.streams0.nb_dep_sub == 1);
+					if (ac3.streams0.nb_dep_sub) {
 						_nb_ch += gf_eac3_get_chan_loc_count(ac3.streams0.chan_loc);
 					}
                     if (ds->nb_lfe) _nb_ch++;
@@ -1394,12 +1571,37 @@
 						if (p && p->value.uint)
 							ctx->forward_mode = p->value.uint;
 					}
+				} else if (!strcmp(cue_file, "idx_all")) {
+					ds->inband_cues = GF_TRUE;
+					ctx->from_index = IDXMODE_ALL;
+				} else if (!strcmp(cue_file, "idx_man")) {
+					ds->inband_cues = GF_TRUE;
+					ctx->from_index = IDXMODE_MANIFEST;
+				} else if (!strcmp(cue_file, "idx_init")) {
+					ds->inband_cues = GF_TRUE;
+					ctx->from_index = IDXMODE_INIT;
+				} else if (!strcmp(cue_file, "idx_child")) {
+					ds->inband_cues = GF_TRUE;
+					ctx->from_index = IDXMODE_CHILD;
+				} else if (!strcmp(cue_file, "idx_seg")) {
+					ds->inband_cues = GF_TRUE;
+					ctx->from_index = IDXMODE_SEG;
 				} else if (strcmp(cue_file, "none")) {
 					e = gf_mpd_load_cues(cue_file, ds->id, &ds->cues_timescale, &ds->cues_use_edits, &ds->cues_ts_offset, &ds->cues, &ds->nb_cues);
 					if (e) return e;
 					if (!ds->cues_timescale)
 						ds->cues_timescale = ds->timescale;
 				}
+
+
+				if (ctx->from_index==IDXMODE_CHILD) {
+					p = gf_filter_pid_get_property_str(ds->ipid, "idx_out");
+					if (p) {
+						if (ds->hls_vp_name) gf_free(ds->hls_vp_name);
+						ds->hls_vp_name = gf_strdup(p->value.string);
+					}
+				}
+
 			}
 		}
 	} else {
@@ -1411,6 +1613,33 @@
 		CHECK_PROP_STR(GF_PROP_PID_XLINK, ds->xlink, GF_EOS)
 	}
 
+
+	if (ctx->do_index || ctx->from_index) {
+		if (!ds->template && ctx->def_template) {
+			p = gf_filter_pid_get_property_str(ds->ipid, "idx_template");
+			if (p) {
+				ds->template = gf_strdup(p->value.string);
+				GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("Dasher Using template from index pass %s\n", ds->template));
+			}
+		}
+		char *template = ds->template;
+
+		if (!ds->template) {
+			if ((ctx->def_template==1) && ctx->do_index) {
+				gf_free(ctx->template);
+				ctx->template = gf_strdup("$RepresentationID$-$Number$$Init=init$");
+				ctx->def_template = 2;
+				GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("Dasher No template assigned in index mode, using %s\n", ctx->template));
+			}
+			template = ctx->template;
+		}
+
+		if (dasher_template_use_source_url(template)) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Dasher Cannot use file-based templates with index mode\n"));
+			return GF_BAD_PARAM;
+		}
+	}
+
 	//stream representation was not yet setup but is scheduled for this period, do not trigger period switch
 	//this typically happens when we post-poned representation setup waiting for the decoder config
 	if (!ds->rep && (gf_list_find(ctx->current_period->streams, ds)>=0))
@@ -1420,22 +1649,22 @@
 	period_switch = GF_FALSE;
 	CHECK_PROP_STR(GF_PROP_PID_PERIOD_ID, ds->period_id, GF_EOS)
 	CHECK_PROP_PROP(GF_PROP_PID_PERIOD_DESC, ds->p_period_desc, GF_EOS)
-	if (!period_switch && ctx->pswitch)
+	if (!period_switch && (ctx->pswitch==DASHER_PSWITCH_FORCE))
 		period_switch = GF_TRUE;
 
 	if (gf_filter_pid_get_property_str(pid, "period_switch"))
 		period_switch = GF_TRUE;
 
 	p = gf_filter_pid_get_property(pid, GF_PROP_PID_PERIOD_START);
-	if (p) {
+	if (p && p->value.lfrac.den) {
 		if (ds->period_start.num * p->value.lfrac.den != p->value.lfrac.num * ds->period_start.den) period_switch = GF_TRUE;
 		ds->period_start = p->value.lfrac;
 	} else {
 		if (ds->period_start.num) period_switch = GF_TRUE;
 		ds->period_start.num = 0;
-		ds->period_start.den = 1;
+		ds->period_start.den = 1000;
 	}
-	assert(ds->period_start.den);
+	gf_assert(ds->period_start.den);
 
 	if (period_switch) {
 		new_period_request = GF_TRUE;
@@ -1474,6 +1703,11 @@
 	p = gf_filter_pid_get_property(pid, GF_PROP_PID_PERIOD_DUR);
 	if (p) ds->period_dur = p->value.lfrac;
 
+	p = gf_filter_pid_get_property_str(pid, "max_seg_dur");
+	ctx->index_max_seg_dur = p ? p->value.uint : 0;
+	p = gf_filter_pid_get_property_str(pid, "mpd_duration");
+	ctx->index_media_duration = p ? p->value.longuint : 0;
+
 	if (ds->stream_type==GF_STREAM_FILE) {
 		if (!ds->xlink && !ds->period_start.num && !ds->period_dur.num) {
 			ds->done = 1;
@@ -1530,11 +1764,20 @@
 		if (ds->opid) {
 			gf_filter_pid_copy_properties(ds->opid, pid);
 			//for route out
-			if (ctx->is_route && ctx->do_m3u8)
+			if (ctx->do_m3u8)
 				gf_filter_pid_set_property(ds->opid, GF_PROP_PCK_HLS_REF, &PROP_LONGUINT( ds->hls_ref_id ) );
 			if (ctx->llhls)
 				gf_filter_pid_set_property(ds->opid, GF_PROP_PID_LLHLS, &PROP_UINT(ctx->llhls) );
-
+			if (ds->rep && ds->rep->segment_template)
+				gf_filter_pid_set_property(ds->opid, GF_PROP_PID_TEMPLATE, &PROP_STRING(ds->rep->segment_template->media));
+			else if (ds->set && ds->set->segment_template)
+				gf_filter_pid_set_property(ds->opid, GF_PROP_PID_TEMPLATE, &PROP_STRING(ds->set->segment_template->media));
+			if (ctx->do_m3u8)
+				gf_filter_pid_set_property(ds->opid, GF_PROP_PCK_HLS_REF, &PROP_LONGUINT( ds->hls_ref_id ) );
+			gf_filter_pid_set_property(ds->opid, GF_PROP_PID_REP_ID, &PROP_STRING( ds->rep_id ) );
+			gf_filter_pid_set_property(ds->opid, GF_PROP_PID_DASH_DUR, &PROP_FRAC( ds->dash_dur ) );
+			gf_filter_pid_set_property(ds->opid, GF_PROP_PID_PREMUX_STREAM_TYPE, &PROP_UINT(ds->stream_type) );
+			//end route
 			if (ctx->gencues)
 				gf_filter_pid_set_property(ds->opid, GF_PROP_PID_DASH_CUE, &PROP_STRING("inband") );
 		}
@@ -1629,10 +1872,16 @@
 	}
 
 	if (ctx->profX) {
-		char profiles_w_extGF_MAX_PATH+256;
-		sprintf(profiles_w_ext, "%s,%s", profiles_string, ctx->profX);
-		if (ctx->mpd->profiles) gf_free(ctx->mpd->profiles);
-		ctx->mpd->profiles = gf_strdup(profiles_w_ext);
+		if (ctx->profX0 == '+') {
+			if (ctx->mpd->profiles) gf_free(ctx->mpd->profiles);
+			ctx->mpd->profiles = gf_strdup(ctx->profX+1);
+			ctx->mpd->profiles = gf_strdup(ctx->profX+1);
+		} else {
+			char profiles_w_extGF_MAX_PATH+256;
+			sprintf(profiles_w_ext, "%s,%s", profiles_string, ctx->profX);
+			if (ctx->mpd->profiles) gf_free(ctx->mpd->profiles);
+			ctx->mpd->profiles = gf_strdup(profiles_w_ext);
+		}
 	} else {
 		if (ctx->mpd->profiles) gf_free(ctx->mpd->profiles);
 		ctx->mpd->profiles = gf_strdup(profiles_string);
@@ -1672,6 +1921,27 @@
 	}
 	dasher_check_chaining(ctx, "urn:mpeg:dash:mpd-chaining:2016", ctx->chain);
 	dasher_check_chaining(ctx, "urn:mpeg:dash:fallback:2016", ctx->chain_fbk);
+
+	//final move from dynamic to static, reset all tsb entry indexes to write the complete manifest
+	if (ctx->move_to_static && (ctx->dmode == GF_MPD_TYPE_DYNAMIC_LAST) && ctx->keep_segs) {
+		u32 i=0;
+		GF_MPD_Period *p;
+		while ((p=gf_list_enum(ctx->mpd->periods, &i))) {
+			u32 j=0;
+			GF_MPD_AdaptationSet *as;
+			while ((as=gf_list_enum(p->adaptation_sets, &j))) {
+				u32 k=0;
+				if (as->segment_template) as->segment_template->tsb_first_entry = 0;
+				if (as->segment_list) as->segment_list->tsb_first_entry=0;
+				GF_MPD_Representation *rep;
+				while ((rep=gf_list_enum(as->representations, &k))) {
+					rep->tsb_first_entry=0;
+					if (rep->segment_template) rep->segment_template->tsb_first_entry = 0;
+					if (rep->segment_list) rep->segment_list->tsb_first_entry = 0;
+				}
+			}
+		}
+	}
 	return GF_OK;
 }
 static GF_Err dasher_setup_mpd(GF_DasherCtx *ctx)
@@ -1679,6 +1949,8 @@
 	u32 i, count;
 	GF_MPD_ProgramInfo *info;
 	ctx->mpd = gf_mpd_new();
+	ctx->mpd->index_mode = ctx->do_index;
+	ctx->mpd->segment_duration = (u32) gf_timestamp_rescale(ctx->segdur.num, ctx->segdur.den, 1000);
 	ctx->mpd->xml_namespace = "urn:mpeg:dash:schema:mpd:2011";
 	ctx->mpd->base_URLs = gf_list_new();
 	ctx->mpd->locations = gf_list_new();
@@ -1688,8 +1960,14 @@
 	//created by default because we store xmlns in it
 	ctx->mpd->x_attributes = gf_list_new();
 	if (ctx->buf<0) {
+		GF_Fraction segdur = ctx->segdur;
 		s32 buf = -ctx->buf;
-		ctx->mpd->min_buffer_time = (u32) ( ctx->segdur.num * 10 * buf / ctx->segdur.den); //*1000 (ms) / 100 (percent)
+		if (ctx->no_seg_dur && ctx->from_index) {
+			GF_DashStream *ds = gf_list_get(ctx->current_period->streams, 0);
+			if (ds && ds->dash_dur.num && ds->dash_dur.den)
+				segdur = ds->dash_dur;
+		}
+		ctx->mpd->min_buffer_time = (u32) ( segdur.num * 10 * buf / segdur.den); //*1000 (ms) / 100 (percent)
 	} else
 		ctx->mpd->min_buffer_time = ctx->buf;
 
@@ -1718,7 +1996,8 @@
 		}
 		if (ctx->cprt) info->copyright = gf_strdup(ctx->cprt);
 		if (ctx->info) info->more_info_url = gf_strdup(ctx->info);
-		else info->more_info_url = gf_strdup("http://gpac.io");
+		else if (gf_sys_is_test_mode()) info->more_info_url = gf_strdup("http://gpac.io");
+		else info->more_info_url = gf_strdup("https://gpac.io");
 		if (ctx->source) info->source = gf_strdup(ctx->source);
 		if (ctx->lang) info->lang = gf_strdup(ctx->lang);
 	}
@@ -1742,305 +2021,28 @@
 }
 
 
-GF_Err rfc_6381_get_codec_aac(char *szCodec, u32 codec_id,  u8 *dsi, u32 dsi_size, Bool force_sbr);
-GF_Err rfc_6381_get_codec_m4v(char *szCodec, u32 codec_id, u8 *dsi, u32 dsi_size);
-GF_Err rfc_6381_get_codec_avc(char *szCodec, u32 subtype, GF_AVCConfig *avcc);
-GF_Err rfc_6381_get_codec_hevc(char *szCodec, u32 subtype, GF_HEVCConfig *hvcc);
-GF_Err rfc_6381_get_codec_av1(char *szCodec, u32 subtype, GF_AV1Config *av1c, COLR colr);
-GF_Err rfc_6381_get_codec_vpx(char *szCodec, u32 subtype, GF_VPConfig *vpcc, COLR colr);
-GF_Err rfc_6381_get_codec_dolby_vision(char *szCodec, u32 subtype, GF_DOVIDecoderConfigurationRecord *dovi);
-GF_Err rfc_6381_get_codec_vvc(char *szCodec, u32 subtype, GF_VVCConfig *vvcc);
-GF_Err rfc_6381_get_codec_mpegha(char *szCodec, u32 subtype, u8 *dsi, u32 dsi_size, s32 pl);
-GF_Err rfc6381_codec_name_default(char *szCodec, u32 subtype, u32 codec_id);
-
-
 static GF_Err dasher_get_rfc_6381_codec_name(GF_DasherCtx *ctx, GF_DashStream *ds, char *szCodec, Bool force_inband, Bool force_sbr)
 {
-	u32 subtype=0, subtype_src=0;
-	s32 mha_pl=-1;
-	const GF_PropertyValue *dcd, *dcd_enh, *dovi, *codec;
-	COLR colr;
-
-	memset(&colr, 0, sizeof(colr));
-
-	dcd = gf_filter_pid_get_property(ds->ipid, GF_PROP_PID_ISOM_SUBTYPE);
-	if (dcd) subtype_src = dcd->value.uint;
-
-	dcd = gf_filter_pid_get_property(ds->ipid, GF_PROP_PID_DECODER_CONFIG);
-	dcd_enh = gf_filter_pid_get_property(ds->ipid, GF_PROP_PID_DECODER_CONFIG_ENHANCEMENT);
-
-	// If colour information is supplied in the colr box, and also in the video bitstream, the box takes precedence
-	{
-		const GF_PropertyValue *p1 = gf_filter_pid_get_property(ds->ipid, GF_PROP_PID_COLR_PRIMARIES),
-		                       *p2 = gf_filter_pid_get_property(ds->ipid, GF_PROP_PID_COLR_TRANSFER),
-		                       *p3 = gf_filter_pid_get_property(ds->ipid, GF_PROP_PID_COLR_MX),
-		                       *p4 = gf_filter_pid_get_property(ds->ipid, GF_PROP_PID_COLR_RANGE);
-		if (p1 && p2 && p3 && p4) {
-			colr.override = GF_TRUE;
-			colr.colour_primaries = p1->value.uint;
-			colr.transfer_characteristics = p2->value.uint;
-			colr.matrix_coefficients = p3->value.uint;
-			colr.full_range = p4->value.boolean;
-		} else if (!p1 && !p2 && !p3 && !p4) {
-		} else {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("ISOM Tools Incomplete upstream-filter 'colr' information when computing RFC6381. Ignoring.\n"));
-		}
-	}
-
-	if (!force_inband) {
-		force_inband = ds->inband_params;
-	}
-	if (!force_inband) {
-		const GF_PropertyValue *p = gf_filter_pid_get_property(ds->ipid, GF_PROP_PID_ISOM_SUBTYPE);
-		if (p) {
-			//input uses inband parameters, force it on output regardless of bitstream switching mode
-			switch (p->value.uint) {
-			case GF_ISOM_SUBTYPE_AVC3_H264:
-			case GF_ISOM_SUBTYPE_AVC4_H264:
-			case GF_ISOM_SUBTYPE_LHE1:
-			case GF_ISOM_SUBTYPE_HEV1:
-			case GF_ISOM_SUBTYPE_VVI1:
-			case GF_ISOM_SUBTYPE_DVAV:
-			case GF_ISOM_SUBTYPE_DVHE:
-				force_inband = GF_TRUE;
-				ds->inband_params = 1;
-				break;
-			}
-		}
-	}
-
-	codec = gf_filter_pid_get_property(ds->ipid, GF_PROP_PID_CODEC);
-	if (codec && (codec->type==GF_PROP_STRING) && codec->value.string) {
-		const char *codec_str = codec->value.string;
-		if (codec_str0 != '.') {
-			snprintf(szCodec, RFC6381_CODEC_NAME_SIZE_MAX, "%s", codec_str);
-			return GF_OK;
-		}
-		if (!subtype_src)
-			subtype_src = gf_codecid_4cc_type(ds->codec_id);
-		snprintf(szCodec, RFC6381_CODEC_NAME_SIZE_MAX, "%s%s", gf_4cc_to_str(subtype_src), codec_str);
-		return GF_OK;
-	}
-
-	dovi = gf_filter_pid_get_property(ds->ipid, GF_PROP_PID_DOLBY_VISION);
-	if (dovi) {
-		GF_Err e;
-		GF_BitStream *bs = gf_bs_new(dovi->value.data.ptr, dovi->value.data.size, GF_BITSTREAM_READ);
-		GF_DOVIDecoderConfigurationRecord *dvcc = gf_odf_dovi_cfg_read_bs(bs);
-		gf_bs_del(bs);
-		if (!dvcc) {
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("ISOM Tools No config found for Dolby Vision file (\"%s\") when computing RFC6381.\n", gf_4cc_to_str(subtype)));
-			return GF_BAD_PARAM;
-		}
-
-		switch (ds->codec_id) {
-		case GF_CODECID_HEVC:
-			e = rfc_6381_get_codec_dolby_vision(szCodec, ds->inband_params ? GF_ISOM_SUBTYPE_DVHE : GF_ISOM_SUBTYPE_DVH1, dvcc);
-			break;
-		case GF_CODECID_AVC:
-			e = rfc_6381_get_codec_dolby_vision(szCodec, ds->inband_params ? GF_ISOM_SUBTYPE_DVAV : GF_ISOM_SUBTYPE_DVA1, dvcc);
-			break;
-		case GF_CODECID_AV1:
-			e = rfc_6381_get_codec_dolby_vision(szCodec, GF_ISOM_SUBTYPE_DAV1, dvcc);
-			break;
-		default:
-			e = GF_NOT_SUPPORTED;
-		}
-		gf_odf_dovi_cfg_del(dvcc);
-		return e;
-	}
-
-	switch (ds->codec_id) {
-	case GF_CODECID_AAC_MPEG4:
-	case GF_CODECID_AAC_MPEG2_MP:
-	case GF_CODECID_AAC_MPEG2_LCP:
-	case GF_CODECID_AAC_MPEG2_SSRP:
-	case GF_CODECID_USAC:
-		return rfc_6381_get_codec_aac(szCodec, ds->codec_id, dcd ? dcd->value.data.ptr : NULL, dcd ? dcd->value.data.size : 0, force_sbr);
-
-	case GF_CODECID_MPEG4_PART2:
-		return rfc_6381_get_codec_m4v(szCodec, ds->codec_id, dcd ? dcd->value.data.ptr : NULL, dcd ? dcd->value.data.size : 0);
-		break;
-	case GF_CODECID_SVC:
-	case GF_CODECID_MVC:
-		if (dcd_enh) dcd = dcd_enh;
-		subtype = (ds->codec_id==GF_CODECID_SVC) ? GF_ISOM_SUBTYPE_SVC_H264 : GF_ISOM_SUBTYPE_MVC_H264;
-	case GF_CODECID_AVC:
-		if (!subtype) {
-			if (force_inband) {
-				subtype = dcd_enh ? GF_ISOM_SUBTYPE_AVC4_H264 : GF_ISOM_SUBTYPE_AVC3_H264;
-			} else {
-				subtype = dcd_enh ? GF_ISOM_SUBTYPE_AVC2_H264 : GF_ISOM_SUBTYPE_AVC_H264;
-			}
-		}
-		if (dcd) {
-			GF_AVCConfig *avcc = gf_odf_avc_cfg_read(dcd->value.data.ptr, dcd->value.data.size);
-			if (avcc) {
-				GF_Err e = rfc_6381_get_codec_avc(szCodec, subtype, avcc);
-				gf_odf_avc_cfg_del(avcc);
-				return e;
-			}
-		}
-		snprintf(szCodec, RFC6381_CODEC_NAME_SIZE_MAX, "%s", gf_4cc_to_str(subtype));
-		GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("Dasher Cannot find AVC config, using default %s\n", szCodec));
-		return GF_OK;
-
-#ifndef GPAC_DISABLE_HEVC
-	case GF_CODECID_LHVC:
-		subtype = force_inband ? GF_ISOM_SUBTYPE_LHE1 : GF_ISOM_SUBTYPE_LHV1;
-		//fallthrough
-	case GF_CODECID_HEVC_TILES:
-		if (!subtype) subtype = GF_ISOM_SUBTYPE_HVT1;
+	const GF_PropertyValue *tile_base_dcd = NULL;
+	if (ds->codec_id==GF_CODECID_HEVC_TILES) {
+		const GF_PropertyValue *dcd = gf_filter_pid_get_property(ds->ipid, GF_PROP_PID_DECODER_CONFIG);
 		if (!dcd && ds->dep_id) {
 			u32 i, count = gf_list_count(ctx->current_period->streams);
 			for (i=0; i<count; i++) {
 				GF_DashStream *a_ds = gf_list_get(ctx->current_period->streams, i);
 				if (a_ds->id != ds->dep_id) continue;
-				dcd = gf_filter_pid_get_property(a_ds->ipid, GF_PROP_PID_DECODER_CONFIG);
+				tile_base_dcd = gf_filter_pid_get_property(a_ds->ipid, GF_PROP_PID_DECODER_CONFIG);
 				break;
 			}
 		}
-		//fallthrough
-	case GF_CODECID_HEVC:
-		if (!subtype) {
-			if (ds->tile_base) {
-				subtype = force_inband ? GF_ISOM_SUBTYPE_HEV2 : GF_ISOM_SUBTYPE_HVC2;
-			} else if (dcd_enh) {
-				if (dcd) {
-					subtype = force_inband ? GF_ISOM_SUBTYPE_HEV2 : GF_ISOM_SUBTYPE_HVC2;
-				} else {
-					subtype = force_inband ? GF_ISOM_SUBTYPE_LHE1 : GF_ISOM_SUBTYPE_LHV1;
-				}
-			} else {
-				subtype = force_inband ? GF_ISOM_SUBTYPE_HEV1 : GF_ISOM_SUBTYPE_HVC1;
-			}
-		}
-		if (dcd || dcd_enh) {
-			GF_HEVCConfig *hvcc = dcd ? gf_odf_hevc_cfg_read(dcd->value.data.ptr, dcd->value.data.size, GF_FALSE) : NULL;
-			if (hvcc) {
-				GF_Err e = rfc_6381_get_codec_hevc(szCodec, subtype, hvcc);
-				gf_odf_hevc_cfg_del(hvcc);
-				return e;
-			}
-			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Dasher HEVC config not compliant !\n"));
-			return GF_NON_COMPLIANT_BITSTREAM;
-		}
-
-		snprintf(szCodec, RFC6381_CODEC_NAME_SIZE_MAX, "%s", gf_4cc_to_str(subtype));
-		GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("Dasher Cannot find HEVC config, using default %s\n", szCodec));
-		return GF_OK;
-#endif
-
-#ifndef GPAC_DISABLE_AV1
-	case GF_CODECID_AV1:
-		if (!subtype) subtype = GF_ISOM_SUBTYPE_AV01;
-
-		if (dcd) {
-			GF_AV1Config *av1c = gf_odf_av1_cfg_read(dcd->value.data.ptr, dcd->value.data.size);
-			if (av1c) {
-				GF_Err e = rfc_6381_get_codec_av1(szCodec, subtype, av1c, colr);
-				gf_odf_av1_cfg_del(av1c);
-				return e;
-			}
-			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("DASHER AV1 config not conformant\n"));
-			return GF_NON_COMPLIANT_BITSTREAM;
-		}
-		snprintf(szCodec, RFC6381_CODEC_NAME_SIZE_MAX, "%s", gf_4cc_to_str(subtype));
-		GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("Dasher Cannot find AV1 config, using default %s\n", szCodec));
-		return GF_OK;
-#endif /*GPAC_DISABLE_AV1*/
-
-
-	case GF_CODECID_VP8:
-		if (!subtype) subtype = GF_ISOM_SUBTYPE_VP08;
-	case GF_CODECID_VP9:
-		if (!subtype) subtype = GF_ISOM_SUBTYPE_VP09;
-
-		if (dcd) {
-			GF_VPConfig *vpcc = gf_odf_vp_cfg_read(dcd->value.data.ptr, dcd->value.data.size);
-
-			if (vpcc) {
-				GF_Err e = rfc_6381_get_codec_vpx(szCodec, subtype, vpcc, colr);
-				gf_odf_vp_cfg_del(vpcc);
-				return e;
-			}
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("Dasher No config found for VP file (\"%s\") when computing RFC6381.\n", gf_4cc_to_str(subtype)));
-			return GF_NON_COMPLIANT_BITSTREAM;
-		}
-		snprintf(szCodec, RFC6381_CODEC_NAME_SIZE_MAX, "%s", gf_4cc_to_str(subtype));
-		GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("Dasher Cannot find VPX config, using default %s\n", szCodec));
-		return GF_OK;
-
-	case GF_CODECID_MHAS:
-		subtype = subtype_src ? subtype_src : GF_ISOM_SUBTYPE_MH3D_MHM1;
-		if (!dcd) {
-			const GF_PropertyValue *pl = gf_filter_pid_get_property(ds->ipid, GF_PROP_PID_PROFILE_LEVEL);
-			if (pl) mha_pl = (s32) pl->value.uint;
-		}
-		//fallthrough
-	case GF_CODECID_MPHA:
-		if (!subtype)
-			subtype = subtype_src ? subtype_src : GF_ISOM_SUBTYPE_MH3D_MHA1;
-
-		return rfc_6381_get_codec_mpegha(szCodec, subtype, dcd ? dcd->value.data.ptr : NULL, dcd ? dcd->value.data.size : 0, mha_pl);
-
-	case GF_CODECID_VVC:
-		if (!subtype) {
-			subtype = force_inband ? GF_ISOM_SUBTYPE_VVI1 : GF_ISOM_SUBTYPE_VVC1;
-		}
-		if (dcd) {
-			GF_VVCConfig *vvcc = gf_odf_vvc_cfg_read(dcd->value.data.ptr, dcd->value.data.size);
-
-			snprintf(szCodec, RFC6381_CODEC_NAME_SIZE_MAX, "%s.", gf_4cc_to_str(subtype));
-			if (vvcc) {
-				GF_Err e = rfc_6381_get_codec_vvc(szCodec, subtype, vvcc);
-				gf_odf_vvc_cfg_del(vvcc);
-				return e;
-			}
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("Dasher No config found for VP file (\"%s\") when computing RFC6381.\n", gf_4cc_to_str(subtype)));
-			return GF_NON_COMPLIANT_BITSTREAM;
-		}
-		snprintf(szCodec, RFC6381_CODEC_NAME_SIZE_MAX, "%s", gf_4cc_to_str(subtype));
-		GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("Dasher Cannot find VVC config, using default %s\n", szCodec));
-		return GF_OK;
-
-	default:
-		subtype = gf_codecid_4cc_type(ds->codec_id);
-		if (!subtype) {
-			const GF_PropertyValue *p = gf_filter_pid_get_property(ds->ipid, GF_PROP_PID_ISOM_SUBTYPE);
-			if (p) subtype = p->value.uint;
-		}
-		if (!subtype && (ds->codec_id==GF_CODECID_RAW)) {
-			if (ds->stream_type==GF_STREAM_VISUAL) {
-				const GF_PropertyValue *p = gf_filter_pid_get_property(ds->ipid, GF_PROP_PID_PIXFMT);
-				if (p) subtype = gf_pixel_fmt_to_qt_type(p->value.uint);
-			}
-			else if (ds->stream_type==GF_STREAM_AUDIO) {
-				const GF_PropertyValue *p = gf_filter_pid_get_property(ds->ipid, GF_PROP_PID_AUDIO_FORMAT);
-				if (p) subtype = gf_audio_fmt_to_isobmf(p->value.uint);
-			}
-		}
-
-		if (!subtype) {
-			const char *mime = gf_codecid_mime(ds->codec_id);
-			if (mime) mime = strchr(mime, '/');
-			if (mime) mime++;
-			if (mime && mime0) {
-				GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("Dasher codec parameters not known, using mime type %s\n", mime));
-				strcpy(szCodec, mime);
-				return GF_OK;
-			}
-			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("Dasher codec parameters not known, cannot set codec string\n" ));
-			strcpy(szCodec, "unkn");
-			return GF_OK;
-		}
+	}
 
-		return rfc6381_codec_name_default(szCodec, subtype, ds->codec_id);
+	if (!force_inband) {
+		force_inband = ds->inband_params;
 	}
-	return GF_OK;
+	return gf_filter_pid_get_rfc_6381_codec_string(ds->ipid, szCodec, force_inband, force_sbr, tile_base_dcd, &ds->inband_params);
 }
 
-
 static GF_DashStream *get_base_ds(GF_DasherCtx *ctx, GF_DashStream *for_ds)
 {
 	u32 i, count;
@@ -2329,6 +2331,10 @@
 	if (out_subtype) *out_subtype = subtype;
 	if (!mux_ext) mux_ext = "mp4";
 	if (out_ext) *out_ext = mux_ext;
+	//if not muxing in isom, force raw subs
+	if (strcmp(subtype, "mp4") && (ds->stream_type==GF_STREAM_TEXT))
+		ctx->rawsub = GF_TRUE;
+
 }
 
 
@@ -2378,15 +2384,21 @@
 	else if (ds->stream_type==GF_STREAM_AUDIO) {
 		Bool use_cicp = GF_FALSE;
 		Bool use_dolbyx = GF_FALSE;
+		Bool use_dtshd = GF_FALSE;
+		Bool use_dtsx = GF_FALSE;
 		GF_MPD_Descriptor *desc;
 		char value256;
 		ds->rep->samplerate = ds->sr;
 
 		if (ds->nb_surround || ds->nb_lfe) use_cicp = GF_TRUE;
 		if ((ds->codec_id==GF_CODECID_MHAS) || (ds->codec_id==GF_CODECID_MPHA)) use_cicp = GF_TRUE;
-		if ((ds->codec_id==GF_CODECID_DTS_LBR) || (ds->codec_id==GF_CODECID_DTS_CA) || (ds->codec_id==GF_CODECID_DTS_HD_HR)
-		    || (ds->codec_id==GF_CODECID_DTS_HD_MASTER) || (ds->codec_id==GF_CODECID_DTS_X))
-			use_cicp = GF_TRUE;
+		if ((ds->codec_id==GF_CODECID_DTS_EXPRESS_LBR) || (ds->codec_id==GF_CODECID_DTS_CA) || (ds->codec_id==GF_CODECID_DTS_HD_HR_MASTER)
+			|| (ds->codec_id==GF_CODECID_DTS_HD_LOSSLESS)) {
+			use_dtshd = GF_TRUE;
+		}
+		if ((ds->codec_id==GF_CODECID_DTS_X) || (ds->codec_id==GF_CODECID_DTS_Y)) {
+			if (ds->ch_layout) use_dtsx = GF_TRUE;
+		}
 
 		if ((ds->codec_id==GF_CODECID_AC3) || (ds->codec_id==GF_CODECID_EAC3)) {
 			//if regular MPEG-DASH, use CICP, otherwise use Dolby signaling
@@ -2403,8 +2415,13 @@
 
 			sprintf(value, "%X", gf_audio_fmt_get_dolby_chanmap(cicp_layout) );
 			desc = gf_mpd_descriptor_new(NULL, "tag:dolby.com,2014:dash:audio_channel_configuration:2011", value);
-		}
-		else if (!use_cicp) {
+		} else if (use_dtshd) {
+			sprintf(value, "%d", ds->nb_ch);
+			desc = gf_mpd_descriptor_new(NULL, "tag:dts.com,2014:dash:audio_channel_configuration:2012", value);
+		} else if (use_dtsx) {
+			sprintf(value, LLX, ds->ch_layout);
+			desc = gf_mpd_descriptor_new(NULL, "tag:dts.com,2018:uhd:audio_channel_configuration", value);
+		} else if (!use_cicp) {
 			sprintf(value, "%d", ds->nb_ch);
 			desc = gf_mpd_descriptor_new(NULL, "urn:mpeg:dash:23003:3:audio_channel_configuration:2011", value);
 		} else {
@@ -2423,12 +2440,17 @@
 			desc = gf_mpd_descriptor_new(NULL, "tag:dolby.com,2018:dash:EC3_ExtensionComplexityIndex:2018", value);
 			gf_list_add(ds->rep->supplemental_properties, desc);
 		}
-	} else {
+	}
+	else if (ds->stream_type==GF_STREAM_TEXT) {
+		const GF_PropertyValue *p = gf_filter_pid_get_property(ds->ipid, GF_PROP_PID_FORCED_SUB);
+		if (p && p->value.uint) ds->rep->sub_forced = GF_TRUE;
 	}
 
-	dasher_get_rfc_6381_codec_name(ctx, ds, szCodec, ((ctx->bs_switch==DASHER_BS_SWITCH_INBAND) || (ctx->bs_switch==DASHER_BS_SWITCH_INBAND_PPS)) ? GF_TRUE : GF_FALSE, GF_TRUE);
-	if (ds->rep->codecs) gf_free(ds->rep->codecs);
-	ds->rep->codecs = gf_strdup(szCodec);
+	if (ctx->from_index <= IDXMODE_MANIFEST) {
+		dasher_get_rfc_6381_codec_name(ctx, ds, szCodec, ((ctx->bs_switch==DASHER_BS_SWITCH_INBAND) || (ctx->bs_switch==DASHER_BS_SWITCH_INBAND_PPS)) ? GF_TRUE : GF_FALSE, GF_TRUE);
+		if (ds->rep->codecs) gf_free(ds->rep->codecs);
+		ds->rep->codecs = gf_strdup(szCodec);
+	}
 
 	if (ds->interlaced) ds->rep->scan_type = GF_MPD_SCANTYPE_INTERLACED;
 	else {
@@ -2450,7 +2472,7 @@
 {
 	const GF_PropertyValue *p;
 
-	assert(ds->rep==NULL);
+	gf_assert(ds->rep==NULL);
 	ds->rep = gf_mpd_representation_new();
 	ds->rep->playback.udta = ds;
 	if (ds->tci)
@@ -2459,6 +2481,7 @@
 		ds->rep->crypto_type = ds->is_encrypted ? 2 : 0;
 
 	dasher_update_rep(ctx, ds);
+	ds->rep->streamtype = ds->stream_type;
 
 	p = gf_filter_pid_get_property(ds->ipid, GF_PROP_PID_AS_ID);
 	//do not reset as id in case of period continuity
@@ -2500,6 +2523,120 @@
 		ds->rep->nb_hls_variant_tags = p->value.string_list.nb_items;
 		ds->rep->hls_variant_tags = (const char **) p->value.string_list.vals;
 	}
+
+	p = gf_filter_pid_get_property(ds->ipid, GF_PROP_PID_URL);
+	if (p && ctx->do_index) {
+		char *dst = gf_filter_pid_get_destination(ctx->opid);
+		if (dst) {
+			char *opath=NULL, *ipath=NULL;
+			if (gf_url_is_relative(p->value.string) && (p->value.string0!='.'))
+				gf_dynstrcat(&opath, "./", NULL);
+			gf_dynstrcat(&opath, p->value.string, NULL);
+			if (gf_url_is_relative(dst) && (dst0!='.'))
+				gf_dynstrcat(&ipath, "./", NULL);
+			gf_dynstrcat(&ipath, dst, NULL);
+
+			ds->rep->res_url = gf_url_concatenate_parent(ipath, opath);
+			gf_free(ipath);
+			gf_free(opath);
+		} else {
+			ds->rep->res_url = gf_strdup(p->value.string);
+		}
+		if (dst) gf_free(dst);
+		p = gf_filter_pid_get_property(ds->ipid, GF_PROP_PID_ID);
+		ds->rep->trackID = p ? p->value.uint : 0;
+
+		if (ctx->do_index==2) {
+			if (!ds->rep->x_children) ds->rep->x_children = gf_list_new();
+			u32 idx=0;
+			char *obuf=NULL;
+			u32 obuf_alloc = 0;
+			while (1) {
+				u32 p4cc;
+				const char *pname;
+				p = gf_filter_pid_enum_properties(ds->ipid, &idx, &p4cc, &pname);
+				if (!p) break;
+				switch (p4cc) {
+				case GF_PROP_PID_ID:
+				case GF_PROP_PID_URL:
+				case GF_PROP_PID_FILEPATH:
+				case GF_PROP_PID_FILE_EXT:
+				case GF_PROP_PID_FILE_CACHED:
+				case GF_PROP_PID_DOWN_SIZE:
+				case GF_PROP_PID_DOWNLOAD_SESSION:
+				case GF_PROP_PID_TRACK_NUM:
+				case GF_PROP_PID_MEDIA_DATA_SIZE:
+				case GF_PROP_PID_MAX_FRAME_SIZE:
+				case GF_PROP_PID_AVG_FRAME_SIZE:
+				case GF_PROP_PID_MAX_TS_DELTA:
+				case GF_PROP_PID_CONSTANT_DURATION:
+				case GF_PROP_PID_PLAYBACK_MODE:
+				case GF_PROP_PID_CHAP_TIMES:
+				case GF_PROP_PID_CHAP_NAMES:
+				case GF_PROP_PID_ISOM_UDTA:
+					continue;
+				default:
+					break;
+				}
+				if (p->type == GF_PROP_POINTER) continue;
+
+				GF_XMLNode *prop = gf_xml_dom_node_new(NULL, "prop");
+				prop->attributes = gf_list_new();
+				gf_list_add(ds->rep->x_children,  prop);
+				prop->orig_pos = -1;
+				GF_XMLAttribute *att;
+				if (p4cc) {
+					att = gf_xml_dom_create_attribute("type", gf_props_4cc_get_name(p4cc));
+					gf_list_add(prop->attributes, att);
+				} else {
+					att = gf_xml_dom_create_attribute("name", pname);
+					gf_list_add(prop->attributes, att);
+					att = gf_xml_dom_create_attribute("ptype", gf_props_get_type_name(p->type));
+					gf_list_add(prop->attributes, att);
+				}
+				char szDumpGF_PROP_DUMP_ARG_SIZE;
+				u32 res, obuf_size, j;
+				char *cdata=NULL;
+
+				switch (p->type) {
+				case GF_PROP_DATA:
+				case GF_PROP_DATA_NO_COPY:
+				case GF_PROP_CONST_DATA:
+					obuf_size = p->value.data.size*3;
+					if (obuf_size>obuf_alloc) {
+						obuf = gf_realloc(obuf, sizeof(char)*obuf_size);
+						obuf_alloc = obuf_size;
+					}
+					res = gf_base64_encode(p->value.data.ptr, p->value.data.size, obuf, obuf_size);
+					obufres = 0;
+					att = gf_xml_dom_create_attribute("value", obuf);
+					gf_list_add(prop->attributes, att);
+					break;
+				case GF_PROP_STRING_LIST:
+					for (j=0; j<p->value.string_list.nb_items; j++) {
+						gf_dynstrcat( &cdata, p->value.string_list.valsj, ",");
+					}
+					j = (u32) (strlen(cdata)+1);
+					obuf_size = j*3;
+					if (obuf_size>obuf_alloc) {
+						obuf = gf_realloc(obuf, sizeof(char)*obuf_size);
+						obuf_alloc = obuf_size;
+					}
+					res = gf_base64_encode(cdata, j, obuf, obuf_size);
+					obufres = 0;
+					att = gf_xml_dom_create_attribute("value", obuf);
+					gf_list_add(prop->attributes, att);
+					gf_free(cdata);
+					break;
+				default:
+					att = gf_xml_dom_create_attribute("value", gf_props_dump(p4cc, p, szDump, GF_PROP_DUMP_NO_REDUCE));
+					gf_list_add(prop->attributes, att);
+					break;
+				}
+			}
+			if (obuf) gf_free(obuf);
+		}
+	}
 }
 
 static Bool dasher_same_roles(GF_DashStream *ds1, GF_DashStream *ds2)
@@ -2542,7 +2679,7 @@
 	//in all forward mode we don't rewrite the manifest, make each source file a single as
 	if (ctx->forward_mode==DASHER_FWD_ALL)
 		return GF_FALSE;
-		
+
 	//muxed representations
 	if (ds_test->muxed_base) {
 		if (ds_test->muxed_base == ds)
@@ -2558,6 +2695,11 @@
 	//not the same roles
 	if (!dasher_same_roles(ds, ds_test)) return GF_FALSE;
 
+	//avoid text streams with no roles and same language to be in the same AS
+	if (ds->stream_type==GF_STREAM_TEXT) {
+		if (ds->codec_id==ds_test->codec_id) return GF_FALSE;
+	}
+
 	//intra-only trick mode belongs to a separate AS
 	if ((ds->stream_type == GF_STREAM_VISUAL) && (ds->sync_points_type != ds_test->sync_points_type)) {
 		//assign trickmode as id for dashif
@@ -2597,10 +2739,24 @@
 	if ((!p1 && p2) || (p1 && !p2) || (p1 && gf_props_equal(p1, p2)))
 		return GF_FALSE;
 
-	if (ds->srd.x != ds_test->srd.x) return GF_FALSE;
-	if (ds->srd.y != ds_test->srd.y) return GF_FALSE;
-	if (ds->srd.z != ds_test->srd.z) return GF_FALSE;
-	if (ds->srd.w != ds_test->srd.w) return GF_FALSE;
+	u32 ow = 1, oh = 1, ow_t = 1, oh_t = 1;
+	if (!ds->dep_id && !ds_test->dep_id) {
+		const GF_PropertyValue *p = gf_filter_pid_get_property(ds->ipid, GF_PROP_PID_ORIG_SIZE);
+		if (p) {
+			ow = p->value.vec2i.x;
+			oh = p->value.vec2i.y;
+		}
+		p = gf_filter_pid_get_property(ds_test->ipid, GF_PROP_PID_ORIG_SIZE);
+		if (p) {
+			ow_t = p->value.vec2i.x;
+			oh_t = p->value.vec2i.y;
+		}
+	}
+
+	if (ow_t * ds->srd.x != ow * ds_test->srd.x) return GF_FALSE;
+	if (oh_t * ds->srd.y != oh * ds_test->srd.y) return GF_FALSE;
+	if (ow_t * ds->srd.z != ow * ds_test->srd.z) return GF_FALSE;
+	if (oh_t * ds->srd.w != oh * ds_test->srd.w) return GF_FALSE;
 
 	if (ds->view_id != ds_test->view_id) return GF_FALSE;
 	//according to DASH spec mixing interlaced and progressive is OK
@@ -2705,6 +2861,7 @@
 			gf_list_add(set->essential_properties, desc);
 		}
 		/*set role*/
+		Bool has_sub_forced=GF_FALSE;
 		if (ds->p_role) {
 			u32 j, role_count;
 			role_count = ds->p_role->value.string_list.nb_items;
@@ -2716,12 +2873,13 @@
 				if (!strcmp(role, "caption") || !strcmp(role, "subtitle") || !strcmp(role, "main")
 			        || !strcmp(role, "alternate") || !strcmp(role, "supplementary") || !strcmp(role, "commentary")
 			        || !strcmp(role, "dub") || !strcmp(role, "description") || !strcmp(role, "sign")
-					 || !strcmp(role, "metadata") || !strcmp(role, "enhanced-audio-intelligibility")
+					 || !strcmp(role, "metadata") || !strcmp(role, "enhanced-audio-inteligibility")
 					 || !strcmp(role, "emergency") || !strcmp(role, "forced-subtitle")
 					 || !strcmp(role, "easyreader") || !strcmp(role, "karaoke")
 				) {
 					uri = "urn:mpeg:dash:role:2011";
 					if (!strcmp(role, "main")) main_role_set = GF_TRUE;
+					if (!strcmp(role, "forced-subtitle")) has_sub_forced = GF_TRUE;
 				} else {
 					char *sep = strrchr(role, ':');
 					if (sep) {
@@ -2739,14 +2897,16 @@
 				gf_list_add(set->role, desc);
 			}
 		}
+		if (!has_sub_forced && ds->rep->sub_forced) {
+			GF_MPD_Descriptor *desc = gf_mpd_descriptor_new(NULL, "urn:mpeg:dash:role:2011", "forced-subtitle");
+			gf_list_add(set->role, desc);
+		}
 		//set SRD
 		if (!i && ds->srd.z && ds->srd.w) {
 			char value256;
 			GF_MPD_Descriptor *desc;
 			if (ds->dep_id) {
 				sprintf(value, "1,%d,%d,%d,%d", ds->srd.x, ds->srd.y, ds->srd.z, ds->srd.w);
-				desc = gf_mpd_descriptor_new(NULL, "urn:mpeg:dash:srd:2014", value);
-				gf_list_add(set->supplemental_properties, desc);
 			} else {
 				if (ds->tile_base) {
 					sprintf(value, "1,0,0,0,0,%d,%d", ds->srd.z, ds->srd.w);
@@ -2758,8 +2918,13 @@
 						sprintf(value, "1,%d,%d,%d,%d", ds->srd.x, ds->srd.y, ds->srd.z, ds->srd.w);
 					}
 				}
-				desc = gf_mpd_descriptor_new(NULL, "urn:mpeg:dash:srd:2014", value);
-				gf_list_add(set->essential_properties, desc);
+			}
+			desc = gf_mpd_descriptor_new(NULL, "urn:mpeg:dash:srd:2014", value);
+			gf_list_add(ds->tile_base ? set->essential_properties : set->supplemental_properties, desc);
+
+			if (!ds->dep_id && !ds->tile_base && (ds->codec_id==GF_CODECID_HEVC)) {
+				desc = gf_mpd_descriptor_new(NULL, "urn:gpac:video:merge:2023", "1");
+				gf_list_add(set->supplemental_properties, desc);
 			}
 		}
 		//set HDR
@@ -2904,7 +3069,17 @@
 
 GF_Err gf_cryptfout_push_key(GF_Filter *filter, bin128 *key, bin128 *IV);
 
-static void dasher_open_destination(GF_Filter *filter, GF_DasherCtx *ctx, GF_MPD_Representation *rep, const char *szInitURL, Bool trash_init)
+enum
+{
+	//init segment valid
+	DASH_INITSEG_PRESENT=0,
+	//no init segment for given format
+	DASH_INITSEG_NONE,
+	//init segment for given format but skipped due to bitstream switching constraints
+	DASH_INITSEG_SKIP
+};
+
+static void dasher_open_destination(GF_Filter *filter, GF_DasherCtx *ctx, GF_MPD_Representation *rep, const char *szInitURL, u32 trash_init)
 {
 	GF_Err e;
 	Bool has_frag=GF_FALSE;
@@ -2916,20 +3091,38 @@
 	const GF_PropertyValue *p;
 	char sep_args = gf_filter_get_sep(filter, GF_FS_SEP_ARGS);
 	char sep_name = gf_filter_get_sep(filter, GF_FS_SEP_NAME);
-	const char *dst_args, *trailer_args=NULL;
+	const char *dst_args, *trailer_args=NULL, *dst_forced=NULL;
 	char *szDST = NULL;
 	char szSRC100;
 
-	if (ctx->sigfrag || ctx->gencues)
+	if (ctx->sigfrag || ctx->gencues || ctx->do_index)
 		return;
 
 	GF_DashStream *ds = rep->playback.udta;
 	if (ds->muxed_base) return;
 
+	switch (ctx->from_index) {
+	case IDXMODE_MANIFEST:
+	case IDXMODE_CHILD:
+		if (trash_init==DASH_INITSEG_NONE) return;
+		trash_init = DASH_INITSEG_SKIP;
+		break;
+	case IDXMODE_ALL:
+		if (trash_init==DASH_INITSEG_NONE) return;
+		break;
+	case IDXMODE_INIT:
+		if (trash_init==DASH_INITSEG_NONE) return;
+		p = gf_filter_pid_get_property_str(ds->ipid, "idx_out");
+		if (p) dst_forced = p->value.string;
+		break;
+	}
 
 	ctx->check_connections = GF_TRUE;
-	gf_dynstrcat(&szDST, szInitURL, NULL);
-	if (ctx->out_path) {
+	if (dst_forced) {
+		gf_dynstrcat(&szDST, dst_forced, NULL);
+		szInitURL = dst_forced; //for logs
+	}
+	else if (ctx->out_path) {
 		char *rel = NULL;
 		if (ctx->do_m3u8 && ds->hls_vp_name) {
 			char *tmp = gf_url_concatenate(ctx->out_path, ds->hls_vp_name);
@@ -2941,10 +3134,13 @@
 		if (!rel)
 			rel = gf_url_concatenate(ctx->out_path, szInitURL);
 		if (rel) {
-			gf_free(szDST);
 			szDST = rel;
 		}
 	}
+	else
+		gf_dynstrcat(&szDST, szInitURL, NULL);
+
+
 	if (ds->tci) {
 		char *tmp = szDST;
 		szDST = NULL;
@@ -2952,6 +3148,7 @@
 		gf_dynstrcat(&szDST, tmp, NULL);
 		gf_free(tmp);
 	}
+	u32 dst_len = (u32) strlen(szDST);
 
 	sprintf(szSRC, "%cgfopt", sep_args);
 	gf_dynstrcat(&szDST, szSRC, NULL);
@@ -2961,7 +3158,7 @@
 		char szKey20, *sep;
 		sprintf(szSRC, "%c", sep_args);
 		gf_dynstrcat(&szDST, szSRC, NULL);
-		
+
 		gf_dynstrcat(&szDST, dst_args, NULL);
 		sprintf(szKey, "%c%c", sep_args, sep_args);
 		sep = strstr(szDST, szKey);
@@ -2992,6 +3189,8 @@
 		sprintf(szKey, "%cpsshs", sep_args);
 		if (strstr(dst_args, szKey)) has_psshs = GF_TRUE;
 	}
+	if ((ctx->from_index==IDXMODE_SEG) && !gf_sys_is_test_mode())
+		trash_init = DASH_INITSEG_SKIP;
 
 	if (trash_init) {
 		if (ds->rawmux)
@@ -3098,15 +3297,17 @@
 		sprintf(szSRC, "%ccmaf%c%s", sep_args, sep_name, (ctx->cmaf==DASHER_CMAF_CMF2) ? "cmf2" : "cmfc");
 		gf_dynstrcat(&szDST, szSRC, NULL);
 	}
-
+	if (ctx->explicit_mode) {
+		sprintf(szSRC, "%cuse_rel", sep_args);
+		gf_dynstrcat(&szDST, szSRC, NULL);
+	}
 
 	if (trailer_args)
 		gf_dynstrcat(&szDST, trailer_args, NULL);
-		
+
 	ds->dst_filter = gf_filter_connect_destination(filter, szDST, &e);
-	gf_free(szDST);
-	szDST = NULL;
 	if (e) {
+		gf_free(szDST);
 		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Dasher Couldn't create output file %s: %s\n", szInitURL, gf_error_to_string(e) ));
 		ctx->in_error = GF_TRUE;
 		return;
@@ -3116,10 +3317,36 @@
 	gf_filter_reset_source(ds->dst_filter);
 	gf_filter_set_source(ds->dst_filter, filter, szSRC);
 
+	u32 j=2;
+	while (ctx->explicit_mode && !dst_forced) {
+		char *opt = szDST + dst_len;
+		char *alt_dst = NULL;
+		alt_dst = gf_filter_pid_get_destination_ex(ctx->opid, j);
+		if (!alt_dst) break;
+		char *new_dst = gf_url_concatenate(alt_dst, szInitURL);
+
+		gf_dynstrcat(&new_dst, opt, NULL);
+		gf_free(alt_dst);
+		j++;
+
+		GF_Filter *alt = gf_filter_connect_destination(filter, new_dst, &e);
+		gf_free(new_dst);
+		if (e) {
+			gf_free(szDST);
+			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Dasher Couldn't create output file %s: %s\n", szInitURL, gf_error_to_string(e) ));
+			ctx->in_error = GF_TRUE;
+			return;
+		}
+		gf_filter_reset_source(alt);
+		gf_filter_set_source(alt, filter, szSRC);
+		gf_filter_skip_seg_size_events(alt);
+	}
+
 	if (ds->tci && !trash_init) {
 		//push NULL key, we are not encrypting the init segment
 		gf_cryptfout_push_key(ds->dst_filter, NULL, NULL);
 	}
+	gf_free(szDST);
 }
 
 static void dasher_gather_deps(GF_DasherCtx *ctx, u32 dependency_id, GF_List *multi_tracks)
@@ -3130,7 +3357,7 @@
 		if (ds->id == dependency_id) {
 			if (ds->tile_base) continue;
 
-			assert(ds->opid);
+			gf_assert(ds->opid);
 			gf_list_insert(multi_tracks, ds->opid, 0);
 			if (ds->dep_id) dasher_gather_deps(ctx, ds->dep_id, multi_tracks);
 		}
@@ -3160,11 +3387,21 @@
 	GF_DashStream *base_ds = ds->muxed_base ? ds->muxed_base : ds;
 	char szSRC1024;
 
-	if (ctx->sigfrag || ctx->in_error || ctx->gencues)
+	if (ctx->sigfrag || ctx->in_error || ctx->gencues || ctx->do_index)
 		return;
 
-	assert(!ds->opid);
-	assert(base_ds->dst_filter);
+	switch (ctx->from_index) {
+	case IDXMODE_MANIFEST:
+	case IDXMODE_CHILD:
+	case IDXMODE_ALL:
+	case IDXMODE_INIT:
+		if (init_trashed) return;
+		if (ds->muxed_base && !base_ds->dst_filter) return;
+		break;
+	}
+
+	gf_assert(!ds->opid);
+	gf_assert(base_ds->dst_filter);
 
 	if (ds->tile_base && !init_trashed) {
 		s32 res = gf_list_find(ctx->postponed_pids, ds);
@@ -3198,6 +3435,10 @@
 	sprintf(szSRC, "dasher_%p", base_ds->dst_filter);
 	ds->opid = gf_filter_pid_new(filter);
 
+	if (ctx->explicit_mode) {
+		gf_filter_pid_force_single_link(ds->opid);
+	}
+
 #ifdef GPAC_64_BITS
 	ds->hls_ref_id = (u64) ds->opid;
 #else
@@ -3216,32 +3457,49 @@
 		gf_filter_pid_set_property(ds->opid, GF_PROP_PID_DASH_SEGMENTS, &PROP_UINT(ncues) );
 	}
 	//for route out
-	if (ctx->is_route) {
-		if (ctx->do_m3u8)
-			gf_filter_pid_set_property(ds->opid, GF_PROP_PCK_HLS_REF, &PROP_LONGUINT( ds->hls_ref_id ) );
-
-		gf_filter_pid_set_property(ds->opid, GF_PROP_PID_REP_ID, &PROP_STRING( ds->rep->id ) );
-
-
-		gf_filter_pid_set_property(ds->opid, GF_PROP_PID_DASH_DUR, &PROP_FRAC( ds->dash_dur ) );
-	}
+	if (ctx->do_m3u8)
+		gf_filter_pid_set_property(ds->opid, GF_PROP_PCK_HLS_REF, &PROP_LONGUINT( ds->hls_ref_id ) );
+	gf_filter_pid_set_property(ds->opid, GF_PROP_PID_REP_ID, &PROP_STRING( ds->rep_id ) );
+	gf_filter_pid_set_property(ds->opid, GF_PROP_PID_DASH_DUR, &PROP_FRAC( ds->dash_dur ) );
+	//end route_out
 
 	gf_filter_pid_require_source_id(ds->opid);
 
 	if (ctx->pssh == GF_DASH_PSSH_MPD) {
 		gf_filter_pid_set_property(ds->opid, GF_PROP_PID_CENC_PSSH, NULL);
 	}
-
+	//multi-stsd disabled, remove stsd template (only needed at init)
+	if (ctx->pswitch != DASHER_PSWITCH_STSD) {
+		gf_filter_pid_set_property(ds->opid, GF_PROP_PID_ISOM_STSD_ALL_TEMPLATES, NULL);
+	}
 
 	//force PID ID
 	gf_filter_pid_set_property(ds->opid, GF_PROP_PID_ID, &PROP_UINT(ds->pid_id) );
 	if (ds->dep_pid_id)
 		gf_filter_pid_set_property(ds->opid, GF_PROP_PID_DEPENDENCY_ID, &PROP_UINT(ds->dep_pid_id) );
+
+	if (ctx->from_index || ctx->state)
+		gf_filter_pid_set_property(ds->opid, GF_PROP_PID_DASH_SPARSE, &PROP_BOOL(GF_TRUE) );
+
 	gf_filter_pid_set_property(ds->opid, GF_PROP_PID_MUX_SRC, &PROP_STRING(szSRC) );
 	gf_filter_pid_set_property(ds->opid, GF_PROP_PID_DASH_MODE, &PROP_UINT(ctx->sseg ? 2 : 1) );
 	gf_filter_pid_set_property(ds->opid, GF_PROP_PID_DASH_DUR, &PROP_FRAC(ds->dash_dur) );
-	if (ctx->seg_sync)
+	switch (ctx->seg_sync) {
+	case DASHER_SEGSYNC_AUTO:
+		//if not HLS or test mode, don't wait for seg sync
+		if (!ctx->do_m3u8 || gf_sys_is_test_mode()) break;
+		//fallthrough
+	case DASHER_SEGSYNC_YES:
 		gf_filter_pid_set_property(ds->opid, GF_PROP_PID_FORCE_SEG_SYNC, &PROP_BOOL(GF_TRUE) );
+		break;
+	case DASHER_SEGSYNC_NO:
+		break;
+	}
+
+	if (init_trashed)
+		gf_filter_pid_set_property(ds->opid, GF_PROP_PID_NO_INIT, &PROP_BOOL(GF_TRUE));
+	//for routeout
+	gf_filter_pid_set_property(ds->opid, GF_PROP_PID_PREMUX_STREAM_TYPE, &PROP_UINT(ds->stream_type) );
 
 	if (ds->id != ds->pid_id) {
 		dasher_update_dep_list(ctx, ds, "isom:scal");
@@ -3266,7 +3524,7 @@
 
 	if (multi_pids) {
 		s32 idx = 1+gf_list_find(multi_pids, ds->ipid);
-		assert(idx>0);
+		gf_fatal_assert(idx>0);
 		gf_filter_pid_set_property(ds->opid, GF_PROP_PID_DASH_MULTI_PID, &PROP_POINTER(multi_pids) );
 		gf_filter_pid_set_property(ds->opid, GF_PROP_PID_DASH_MULTI_PID_IDX, &PROP_UINT(idx) );
 	}
@@ -3280,7 +3538,7 @@
 		//gather all streams depending on our base
 		for (i=0; i<count; i++) {
 			GF_DashStream *a_ds = gf_list_get(ds->complementary_streams, i);
-			assert(a_ds->opid);
+			gf_assert(a_ds->opid);
 			gf_list_add(ds->multi_tracks, a_ds->opid);
 		}
 		gf_filter_pid_set_property(ds->opid, GF_PROP_PID_DASH_MULTI_TRACK, &PROP_POINTER(ds->multi_tracks) );
@@ -3301,7 +3559,7 @@
 		gf_filter_pid_set_property(ds->opid, GF_PROP_PID_LLHLS, &PROP_UINT(ctx->llhls) );
 	}
 
-	if ((ctx->dmode > GF_DASH_STATIC) && (ctx->tsb>=0)) {
+	if ((ctx->dmode > GF_DASH_STATIC) && (ctx->tsb>=0) && !ctx->keep_segs) {
 		u32 tsb_seg = ds->dash_dur.num ? ((u32) (ctx->tsb * ds->dash_dur.den / ds->dash_dur.num)) : 0;
 		tsb_seg++;
 		gf_filter_pid_set_property(ds->opid, GF_PROP_PID_TIMESHIFT_SEGS, &PROP_UINT(tsb_seg) );
@@ -3310,21 +3568,14 @@
 	}
 }
 
-static Bool dasher_template_use_source_url(const char *template)
-{
-	if (!template) return GF_FALSE;
-	if (strstr(template, "$File$") != NULL) return GF_TRUE;
-	else if (strstr(template, "$FSRC$") != NULL) return GF_TRUE;
-	else if (strstr(template, "$SourcePath$") != NULL) return GF_TRUE;
-	else if (strstr(template, "$FURL$") != NULL) return GF_TRUE;
-	else if (strstr(template, "$URL$") != NULL) return GF_TRUE;
-	return GF_FALSE;
-}
-
 static void dasher_set_content_components(GF_DashStream *ds)
 {
 	GF_MPD_ContentComponent *component;
 	GF_DashStream *base_ds = ds->muxed_base ? ds->muxed_base : ds;
+	u32 i=0;
+	while ((component = gf_list_enum(base_ds->set->content_component, &i))) {
+		if (component->id == ds->pid_id) return;
+	}
 
 	GF_SAFEALLOC(component, GF_MPD_ContentComponent);
 	if (!component) return;
@@ -3353,6 +3604,16 @@
 	gf_list_add(base_ds->set->content_component, component);
 }
 
+static char * dasher_cat_mpd_url(GF_DasherCtx *ctx, GF_DashStream *ds, const char *url)
+{
+	//if M3U8 and custom variant name, we must do the concatenation since the input URL is relative to the variant playlist
+	//but we produce a URL for the MPD
+	if (ctx->do_m3u8 && ds->hls_vp_name) {
+		char *rel = gf_url_concatenate(ds->hls_vp_name, url);
+		if (rel) return rel;
+	}
+	return gf_strdup(url);
+}
 typedef struct
 {
 	//this is not the template string, this is the resolved segment name for first segment, startNumber=0 and time=0
@@ -3360,7 +3621,7 @@
 	u32 nb_reused;
 } DashTemplateRecord;
 
-static u32 dasher_check_template_reuse(GF_DasherCtx *ctx, const char *tpl)
+static u32 dasher_check_template_reuse(GF_DasherCtx *ctx, GF_DashStream *ds, const char *tpl)
 {
 	DashTemplateRecord *tr;
 	u32 i, count = gf_list_count(ctx->tpl_records);
@@ -3372,11 +3633,26 @@
 		}
 	}
 	GF_SAFEALLOC(tr, DashTemplateRecord)
-	tr->tpl = gf_strdup(tpl);
+	tr->tpl = dasher_cat_mpd_url(ctx, ds, tpl);
 	gf_list_add(ctx->tpl_records, tr);
 	return 0;
 }
 
+static Bool dasher_check_hls_variant_path(GF_DasherCtx *ctx, GF_DashStream *ds, GF_DashStream *a_ds)
+{
+	if (ctx->do_m3u8 && a_ds->hls_vp_name && ds->hls_vp_name && strcmp(a_ds->hls_vp_name, ds->hls_vp_name)) {
+		Bool same_path = GF_FALSE;
+		char * n1 = gf_url_concatenate(a_ds->hls_vp_name, "test.mp4");
+		char * n2 = gf_url_concatenate(ds->hls_vp_name, "test.mp4");
+		if (n1 && n2 && !strcmp(n1, n2)) same_path = GF_TRUE;
+		if (n1) gf_free(n1);
+		if (n2) gf_free(n2);
+		if (!same_path)
+			return GF_TRUE;
+	}
+	return GF_FALSE;
+}
+
 static void dasher_setup_sources(GF_Filter *filter, GF_DasherCtx *ctx, GF_MPD_AdaptationSet *set)
 {
 	char szDASHTemplateGF_MAX_PATH;
@@ -3401,7 +3677,7 @@
 	GF_DashStream *ds;
 	GF_MPD_Representation *rep = gf_list_get(set->representations, 0);
 	if (!rep) {
-		assert(0);
+		gf_assert(0);
 		return;
 	}
 	ds = rep->playback.udta;
@@ -3409,7 +3685,7 @@
 	count = gf_list_count(set->representations);
 
 	if (!ctx->sigfrag) {
-		assert(ctx->template);
+		gf_assert(ctx->template);
 		template = ((GF_DashStream *)set->udta)->template;
 	}
 
@@ -3440,13 +3716,16 @@
 				GF_SAFEALLOC(set->par, GF_MPD_Fractional);
 			}
 			if (set->par) {
-				set->par->num = ds->width;
-				set->par->den = ds->height;
+				set->par->num = ds->width * ds->sar.num;
+				set->par->den = ds->height * ds->sar.den;
 				gf_media_reduce_aspect_ratio(&set->par->num, &set->par->den);
 			}
 		}
 	}
 	if (!template) template = ctx->template;
+	ds->tpl_use_time = GF_FALSE;
+	if (template && !strstr(template, "$Number") && strstr(template, "$Time"))
+		ds->tpl_use_time = GF_TRUE;
 
 	if (as_id) {
 		set->id = ds->as_id;
@@ -3486,6 +3765,10 @@
 		}
 
 		if (ads->set == set) continue;
+		//custom HLS variant files are set and differ, no need to split set names
+		if (dasher_check_hls_variant_path(ctx, ds, ads))
+				continue;
+
 		frag_uri = strrchr(ds->src_url, '#');
 		if (frag_uri) len1 = (u32) (frag_uri-1 - ds->src_url);
 		else len1 = (u32) strlen(ds->src_url);
@@ -3539,6 +3822,10 @@
 			if (a_ds->muxed_base == ds)
 				continue;
 
+			//custom HLS variant files are set and differ, no need to split rep names
+			if (dasher_check_hls_variant_path(ctx, ds, a_ds))
+				continue;
+
 			p1 = gf_filter_pid_get_property(ds->ipid, GF_PROP_PID_FILEPATH);
 			p2 = gf_filter_pid_get_property(a_ds->ipid, GF_PROP_PID_FILEPATH);
 			if (p1 && p2 && gf_props_equal(p1, p2)) split_rep_names = GF_TRUE;
@@ -3643,7 +3930,7 @@
 #if 0
 		GF_MPD_URL *force_init_seg_sl;
 #endif
-		Bool skip_init = GF_FALSE;
+		u32 skip_init_type = DASH_INITSEG_PRESENT;
 		GF_DashStream *tile_base_ds = NULL;
 		Bool is_bs_switch;
 		u32 reused_template_idx;
@@ -3657,9 +3944,9 @@
 			gf_list_rem(set->representations, i);
 			i--;
 			count--;
-			assert(ds_set->nb_rep);
+			gf_assert(ds_set->nb_rep);
 			ds_set->nb_rep--;
-			assert(ctx->sigfrag || ds->muxed_base->dst_filter);
+			gf_assert(ctx->sigfrag || ds->muxed_base->dst_filter || ctx->from_index);
 			gf_list_transfer(ds->muxed_base->rep->audio_channels, rep->audio_channels);
 			gf_list_transfer(ds->muxed_base->rep->base_URLs, rep->base_URLs);
 			gf_list_transfer(ds->muxed_base->rep->content_protection , rep->content_protection);
@@ -3678,7 +3965,7 @@
 				dasher_set_content_components(ds->muxed_base);
 			}
 			dasher_set_content_components(ds);
-			assert(!multi_pids);
+			gf_assert(!multi_pids);
 			//open PID
 			dasher_open_pid(filter, ctx, ds, NULL, GF_FALSE);
 			continue;
@@ -3728,7 +4015,7 @@
 		}
 		//we need dash suffix in template, but the template may be user-provided without dash suffix. If so add it
 		//we don't add suffic if we have $RepresentationID or $Path set, we assume the user knows what he's doing
-		if (use_dash_suffix && !strstr(szTemplate, "$FS$") && !strstr(szTemplate, "$RepresentationID$") && !strstr(szTemplate, "$Path=")) {
+		if (!ctx->tpl_force && use_dash_suffix && !strstr(szTemplate, "$FS$") && !strstr(szTemplate, "$RepresentationID$") && !strstr(szTemplate, "$Path=")) {
 			strcat(szTemplate, "$FS$");
 		}
 
@@ -3741,16 +4028,17 @@
 			continue;
 		}
 
-
-		if (single_template && ds->split_set_names && !use_dash_suffix) {
-			char szStrName20;
-			sprintf(szStrName, "_set%d", 1 + gf_list_find(ctx->current_period->period->adaptation_sets, set)  );
-			strcat(szDASHTemplate, szStrName);
-		}
-		else if (split_rep_names) {
-			char szStrName20;
-			sprintf(szStrName, "_rep%d", 1 + gf_list_find(set->representations, ds->rep)  );
-			strcat(szDASHTemplate, szStrName);
+		if (!ctx->tpl_force) {
+			if (single_template && ds->split_set_names && !use_dash_suffix) {
+				char szStrName20;
+				sprintf(szStrName, "_set%d", 1 + gf_list_find(ctx->current_period->period->adaptation_sets, set)  );
+				strcat(szDASHTemplate, szStrName);
+			}
+			else if (split_rep_names) {
+				char szStrName20;
+				sprintf(szStrName, "_rep%d", 1 + gf_list_find(set->representations, ds->rep)  );
+				strcat(szDASHTemplate, szStrName);
+			}
 		}
 
 		ds->rawmux = GF_FALSE;
@@ -3801,7 +4089,7 @@
 				ext_sub = strchr(szRawExt, '|');
 				if (ext_sub) ext_sub0 = 0;
 				def_ext = szRawExt;
-				skip_init = GF_TRUE;
+				skip_init_type = DASH_INITSEG_NONE;
 				ds->rawmux = GF_TRUE;
 
 				if (ds->rep->mime_type) gf_free(ds->rep->mime_type);
@@ -3854,9 +4142,9 @@
 			//we however don't want to change templates if they are indeed reused but resolve to something different due to representationID
 			//we therefore resolve the segment template with startNumber 0 time 0, use this resolved name as base check.
 
-			gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_SEGMENT, is_bs_switch, szInitSegmentFilename, ds->rep_id, NULL, szDASHTemplate, is_source_template ? NULL : "mp4", 0, ds->bitrate, 0, ds->stl);
+			gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_SEGMENT, is_bs_switch, szInitSegmentFilename, ds->rep_id, NULL, szDASHTemplate, is_source_template ? NULL : "mp4", 0, ds->bitrate, 0, ds->stl, ctx->tpl_force);
 
-			reused_template_idx = dasher_check_template_reuse(ctx, szInitSegmentFilename);
+			reused_template_idx = dasher_check_template_reuse(ctx, ds, szInitSegmentFilename);
 			if (reused_template_idx) {
 				char szExName20;
 				sprintf(szExName, "_r%d_", reused_template_idx);
@@ -3866,27 +4154,28 @@
 					single_template = GF_FALSE;
 			}
 		}
-		
+
 		//get final segment template with path resolution - output file name is NULL, we already have solved this
-		gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_TEMPLATE_WITH_PATH, is_bs_switch, szSegmentName, ds->rep_id, NULL, szDASHTemplate, seg_ext, 0, 0, 0, ds->stl);
+		gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_TEMPLATE_WITH_PATH, is_bs_switch, szSegmentName, ds->rep_id, NULL, szDASHTemplate, seg_ext, 0, 0, 0, ds->stl, ctx->tpl_force);
 		ds->seg_template = gf_strdup(szSegmentName);
 
 		//get final segment template - output file name is NULL, we already have solved this
-		gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_TEMPLATE, is_bs_switch, szSegmentName, ds->rep_id, NULL, szDASHTemplate, seg_ext, 0, 0, 0, ds->stl);
+		gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_TEMPLATE, is_bs_switch, szSegmentName, ds->rep_id, NULL, szDASHTemplate, seg_ext, 0, 0, 0, ds->stl, ctx->tpl_force);
+
 
 		//get index templates
 		if (idx_ext) {
-			gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_REPINDEX_TEMPLATE_WITH_PATH, is_bs_switch, szIndexSegmentName, ds->rep_id, NULL, szDASHTemplate, idx_ext, 0, 0, 0, ds->stl);
+			gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_REPINDEX_TEMPLATE_WITH_PATH, is_bs_switch, szIndexSegmentName, ds->rep_id, NULL, szDASHTemplate, idx_ext, 0, 0, 0, ds->stl, ctx->tpl_force);
 			ds->idx_template = gf_strdup(szIndexSegmentName);
 
-			gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_REPINDEX_TEMPLATE, is_bs_switch, szIndexSegmentName, ds->rep_id, NULL, szDASHTemplate, idx_ext, 0, 0, 0, ds->stl);
+			gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_REPINDEX_TEMPLATE, is_bs_switch, szIndexSegmentName, ds->rep_id, NULL, szDASHTemplate, idx_ext, 0, 0, 0, ds->stl, ctx->tpl_force);
 		}
 
 		//get final init name - output file name is NULL, we already have solved this
-		gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_INITIALIZATION, is_bs_switch, szInitSegmentFilename, ds->rep_id, NULL, szDASHTemplate, init_ext, 0, ds->bitrate, 0, ds->stl);
+		gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_INITIALIZATION, is_bs_switch, szInitSegmentFilename, ds->rep_id, NULL, szDASHTemplate, init_ext, 0, ds->bitrate, 0, ds->stl, ctx->tpl_force);
 
 		//get final init template name - output file name is NULL, we already have solved this
-		gf_media_mpd_format_segment_name(init_template_mode, is_bs_switch, szInitSegmentTemplate, ds->rep_id, NULL, szDASHTemplate, init_ext, 0, 0, 0, ds->stl);
+		gf_media_mpd_format_segment_name(init_template_mode, is_bs_switch, szInitSegmentTemplate, ds->rep_id, NULL, szDASHTemplate, init_ext, 0, 0, 0, ds->stl, ctx->tpl_force);
 
 		if (ctx->sigfrag) {
 			if (ctx->template || ds->template) {
@@ -3969,7 +4258,7 @@
 		}
 
 		if (ctx->store_seg_states) {
-			assert(!ds->pending_segment_states);
+			gf_assert(!ds->pending_segment_states);
 			ds->pending_segment_states = gf_list_new();
 		}
 		/* baseURLs */
@@ -3990,18 +4279,18 @@
 #endif
 		if (ds->codec_id==GF_CODECID_HEVC_TILES) {
 			tile_base_ds = get_base_ds(ctx, ds);
-			skip_init = GF_TRUE;
-			if (tile_base_ds->rep->segment_template) force_init_seg_tpl = tile_base_ds->rep->segment_template->initialization;
-			if (!force_init_seg_tpl && tile_base_ds->set->segment_template) force_init_seg_tpl = tile_base_ds->set->segment_template->initialization;
+			skip_init_type = DASH_INITSEG_SKIP;
+			if (tile_base_ds && tile_base_ds->rep && tile_base_ds->rep->segment_template) force_init_seg_tpl = tile_base_ds->rep->segment_template->initialization;
+			if (!force_init_seg_tpl && tile_base_ds && tile_base_ds->set && tile_base_ds->set->segment_template) force_init_seg_tpl = tile_base_ds->set->segment_template->initialization;
 
 #if 0
 			if (tile_base_ds->rep->segment_list) force_init_seg_sl = tile_base_ds->rep->segment_list->initialization_segment;
 			if (!force_init_seg_sl && tile_base_ds->set->segment_list) force_init_seg_sl = tile_base_ds->set->segment_list->initialization_segment;
 #endif
 		}
-		if (ctx->muxtype==DASHER_MUX_RAW) skip_init = GF_TRUE;
-		else if (ctx->muxtype==DASHER_MUX_TS) skip_init = GF_TRUE;
-		else if (ctx->muxtype==DASHER_MUX_OGG) skip_init = GF_TRUE;
+		if (ctx->muxtype==DASHER_MUX_RAW) skip_init_type = DASH_INITSEG_NONE;
+		else if (ctx->muxtype==DASHER_MUX_TS) skip_init_type = DASH_INITSEG_NONE;
+		else if (ctx->muxtype==DASHER_MUX_OGG) skip_init_type = DASH_INITSEG_NONE;
 
 
 		//forward mode, change segment names
@@ -4030,7 +4319,7 @@
 				}
 				//same init segment used (bs switching)
 				if (!strcmp(p->value.string, src))
-					skip_init = GF_TRUE;
+					skip_init_type = DASH_INITSEG_SKIP;
 			}
 			strcpy(szInitSegmentFilename, src);
 			strcpy(szInitSegmentTemplate, src);
@@ -4070,30 +4359,30 @@
 			if (!i && use_single_init ) {
 				init_template_done = GF_TRUE;
 				seg_template = NULL;
-				if (!skip_init || force_init_seg_tpl || single_template) {
+				if (!skip_init_type || force_init_seg_tpl || single_template) {
 					GF_SAFEALLOC(seg_template, GF_MPD_SegmentTemplate);
 					if (seg_template) {
-						if (skip_init) {
-							seg_template->initialization = force_init_seg_tpl ? gf_strdup(force_init_seg_tpl) : NULL;
+						if (skip_init_type) {
+							seg_template->initialization = force_init_seg_tpl ? dasher_cat_mpd_url(ctx, ds, force_init_seg_tpl) : NULL;
 							seg_template->hls_init_name = force_init_seg_tpl ? tile_base_ds->init_seg : NULL;
 						} else {
 							//bs switching, if we have still template fields init segment template use resolved init file name - cf #2141
 							if (!force_init_template && is_bs_switch && strchr(szInitSegmentTemplate, '$'))
-								seg_template->initialization = gf_strdup(szInitSegmentFilename);
+								seg_template->initialization = dasher_cat_mpd_url(ctx, ds, szInitSegmentFilename);
 							else
-								seg_template->initialization = gf_strdup(szInitSegmentTemplate);
+								seg_template->initialization = dasher_cat_mpd_url(ctx, ds, szInitSegmentTemplate);
 							seg_template->hls_init_name = ds->init_seg;
 						}
 					}
 				}
 				set->segment_template = seg_template;
 
-				dasher_open_destination(filter, ctx, rep, szInitSegmentFilename, skip_init);
+				dasher_open_destination(filter, ctx, rep, szInitSegmentFilename, skip_init_type);
 
 				if (single_template) {
-					seg_template->media = gf_strdup(szSegmentName);
+					seg_template->media = dasher_cat_mpd_url(ctx, ds, szSegmentName);
 					if (ds->idx_template)
-						seg_template->index = gf_strdup(szIndexSegmentName);
+						seg_template->index = dasher_cat_mpd_url(ctx, ds, szIndexSegmentName);
 
 					seg_template->timescale = ds->mpd_timescale;
 					seg_template->start_number = start_number;
@@ -4108,7 +4397,8 @@
 			}
 			//non-first rep in set and single template, only open destination
 			if (i && single_template) {
-				dasher_open_destination(filter, ctx, rep, szInitSegmentFilename, (set->bitstream_switching || skip_init) ? GF_TRUE : GF_FALSE);
+				dasher_open_destination(filter, ctx, rep, szInitSegmentFilename,
+					(skip_init_type==DASH_INITSEG_NONE) ? DASH_INITSEG_NONE : (set->bitstream_switching ? DASH_INITSEG_SKIP : DASH_INITSEG_PRESENT));
 			}
 			//first rep in set and no bs switching or mutliple templates, create segment template at rep level
 			else if (i || !single_template) {
@@ -4116,20 +4406,21 @@
 				if (seg_template) {
 					rep->segment_template = seg_template;
 					if (!init_template_done) {
-						if (skip_init) {
-							seg_template->initialization = force_init_seg_tpl ? gf_strdup(force_init_seg_tpl) : NULL;
+						if (skip_init_type) {
+							seg_template->initialization = force_init_seg_tpl ? dasher_cat_mpd_url(ctx, ds, force_init_seg_tpl) : NULL;
 							seg_template->hls_init_name = force_init_seg_tpl ? tile_base_ds->init_seg : NULL;
 						} else {
-							seg_template->initialization = gf_strdup(szInitSegmentTemplate);
+							seg_template->initialization = dasher_cat_mpd_url(ctx, ds, szInitSegmentTemplate);
 							seg_template->hls_init_name = ds->init_seg;
 						}
-						dasher_open_destination(filter, ctx, rep, szInitSegmentFilename, skip_init);
+						dasher_open_destination(filter, ctx, rep, szInitSegmentFilename, skip_init_type);
 					} else if (i) {
-						dasher_open_destination(filter, ctx, rep, szInitSegmentFilename, (set->bitstream_switching || skip_init) ? GF_TRUE : GF_FALSE);
+						dasher_open_destination(filter, ctx, rep, szInitSegmentFilename,
+							(skip_init_type==DASH_INITSEG_NONE) ? DASH_INITSEG_NONE : (set->bitstream_switching ? DASH_INITSEG_SKIP : DASH_INITSEG_PRESENT) );
 					}
-					seg_template->media = gf_strdup(szSegmentName);
+					seg_template->media = dasher_cat_mpd_url(ctx, ds, szSegmentName);
 					if (ds->idx_template)
-						seg_template->index = gf_strdup(szIndexSegmentName);
+						seg_template->index = dasher_cat_mpd_url(ctx, ds, szIndexSegmentName);
 					seg_template->duration = seg_duration;
 					seg_template->timescale = ds->mpd_timescale;
 					seg_template->start_number = start_number;
@@ -4154,11 +4445,12 @@
 
 			if (ctx->sseg) {
 				GF_MPD_SegmentBase *segment_base;
-				baseURL->URL = gf_strdup(szInitSegmentFilename);
+				baseURL->URL = dasher_cat_mpd_url(ctx, ds, szInitSegmentFilename);
+				baseURL->hls_vp_rel_url = ds->init_seg;
 				GF_SAFEALLOC(segment_base, GF_MPD_SegmentBase);
 				if (!segment_base) continue;
 				rep->segment_base = segment_base;
-				dasher_open_destination(filter, ctx, rep, szInitSegmentFilename, GF_FALSE);
+				dasher_open_destination(filter, ctx, rep, szInitSegmentFilename, 0);
 			} else {
 				GF_MPD_SegmentList *seg_list;
 				GF_SAFEALLOC(seg_list, GF_MPD_SegmentList);
@@ -4166,7 +4458,8 @@
 				GF_SAFEALLOC(seg_list->initialization_segment, GF_MPD_URL);
 				if (!seg_list->initialization_segment) continue;
 				seg_list->start_number = (u32) -1;
-				baseURL->URL = gf_strdup(szInitSegmentFilename);
+				baseURL->URL = dasher_cat_mpd_url(ctx, ds, szInitSegmentFilename);
+				baseURL->hls_vp_rel_url = ds->init_seg;
 				seg_list->dasher_segment_name = gf_strdup(szSegmentName);
 				seg_list->timescale = ds->mpd_timescale;
 				seg_list->duration = (u64) (ds->dash_dur.num) * ds->mpd_timescale / ds->dash_dur.den;
@@ -4174,7 +4467,7 @@
 				rep->segment_list = seg_list;
 				ds->pending_segment_urls = gf_list_new();
 
-				dasher_open_destination(filter, ctx, rep, szInitSegmentFilename, skip_init);
+				dasher_open_destination(filter, ctx, rep, szInitSegmentFilename, skip_init_type);
 			}
 		}
 		//no template, no single file, we need a file list
@@ -4183,11 +4476,11 @@
 			GF_SAFEALLOC(seg_list, GF_MPD_SegmentList);
 			if (!seg_list) continue;
 
-			if (!skip_init) {
+			if (!skip_init_type) {
 				GF_SAFEALLOC(seg_list->initialization_segment, GF_MPD_URL);
 				if (!seg_list->initialization_segment) continue;
 
-				seg_list->initialization_segment->sourceURL = gf_strdup(szInitSegmentFilename);
+				seg_list->initialization_segment->sourceURL = dasher_cat_mpd_url(ctx, ds, szInitSegmentFilename);
 			}
 			seg_list->dasher_segment_name = gf_strdup(szSegmentName);
 			seg_list->timescale = ds->mpd_timescale;
@@ -4197,11 +4490,11 @@
 			rep->segment_list = seg_list;
 			ds->pending_segment_urls = gf_list_new();
 
-			dasher_open_destination(filter, ctx, rep, szInitSegmentFilename, skip_init);
+			dasher_open_destination(filter, ctx, rep, szInitSegmentFilename, skip_init_type);
 		}
 
 		//open PID
-		dasher_open_pid(filter, ctx, ds, multi_pids, skip_init);
+		dasher_open_pid(filter, ctx, ds, multi_pids, skip_init_type ? GF_TRUE : GF_FALSE);
 	}
 }
 
@@ -4257,11 +4550,13 @@
 		if (!ds->rep) continue;
 		if (!ds->rep->state_seg_list) continue;
 
+		ds->rep->tsb_first_entry = 0;
+		u32 state_idx=0;
 		while (1) {
 			Double time, dur;
 			Bool seg_url_found = GF_FALSE;
 			Bool has_seg_list = GF_FALSE;
-			GF_DASH_SegmentContext *sctx = gf_list_get(ds->rep->state_seg_list, 0);
+			GF_DASH_SegmentContext *sctx = gf_list_get(ds->rep->state_seg_list, state_idx);
 			if (!sctx) break;
 			/*not yet flushed*/
 			if (gf_list_find(ds->pending_segment_states, sctx)>=0) break;
@@ -4269,7 +4564,26 @@
 			time /= ds->mpd_timescale;
 			dur = (Double) sctx->dur;
 			dur/= ds->timescale;
-			if (time + dur >= min_valid_mpd_time) break;
+			if (time + dur >= min_valid_mpd_time) {
+				if (ctx->keep_segs) {
+					ds->rep->tsb_first_entry = state_idx;
+
+					if (ds->rep->segment_template) ds->rep->segment_template->tsb_first_entry = state_idx;
+					if (ds->rep->segment_list) ds->rep->segment_list->tsb_first_entry = state_idx;
+
+					if (ds->owns_set) {
+						if (ds->set->segment_template) ds->set->segment_template->tsb_first_entry = state_idx;
+						if (ds->set->segment_list) ds->set->segment_list->tsb_first_entry = state_idx;
+					}
+				}
+				break;
+			}
+			//we found our first segment
+
+			if (ctx->keep_segs) {
+				state_idx++;
+				continue;
+			}
 			if (sctx->filepath) {
 				GF_FilterEvent evt;
 				GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("Dasher removing segment %s\n", sctx->filename ? sctx->filename : sctx->filepath));
@@ -4283,7 +4597,7 @@
 			if (ds->rep->segment_list) {
 				GF_MPD_SegmentURL *surl = gf_list_pop_front(ds->rep->segment_list->segment_URLs);
 				has_seg_list = GF_TRUE;
-				//can be NULL if we mutualize everything at AdaptatioSet level
+				//can be NULL if we mutualize everything at AdaptationSet level
 				if (surl) {
 					gf_mpd_segment_url_free(surl);
 					seg_url_found = GF_TRUE;
@@ -4293,7 +4607,7 @@
 			if (ds->owns_set && ds->set->segment_list) {
 				GF_MPD_SegmentURL *surl = gf_list_pop_front(ds->set->segment_list->segment_URLs);
 				has_seg_list = GF_TRUE;
-				//can be NULL if we don't mutualize at AdaptatioSet level
+				//can be NULL if we don't mutualize at AdaptationSet level
 				if (surl) {
 					gf_mpd_segment_url_free(surl);
 					seg_url_found = GF_TRUE;
@@ -4319,7 +4633,7 @@
 
 			ds->nb_segments_purged ++;
 			ds->dur_purged += dur;
-			assert(gf_list_find(ds->pending_segment_states, sctx)<0);
+			gf_fatal_assert(gf_list_find(ds->pending_segment_states, sctx)<0);
 			if (sctx->filename) gf_free(sctx->filename);
 			if (sctx->hls_key_uri) gf_free(sctx->hls_key_uri);
 			gf_free(sctx);
@@ -4395,7 +4709,7 @@
 
 	dasher_purge_segments(ctx, &pdur);
 
-	if (ctx->current_period->period) {
+	if (ctx->current_period->period && !ctx->index_media_duration) {
 		ctx->current_period->period->duration = pdur;
 
 		//update MPD duration in any case
@@ -4423,7 +4737,10 @@
 	if (ctx->dmode != GF_MPD_TYPE_DYNAMIC) {
 		return;
 	}
-	assert(ctx->current_period->period);
+	if (!ctx->current_period->period) {
+		gf_assert(0);
+		return;
+	}
 	//dynamic mode only, reset durations
 
 	ctx->mpd->gpac_mpd_time = ctx->mpd->media_presentation_duration;
@@ -4461,7 +4778,7 @@
 	}
 }
 
-static void dasher_transfer_file(FILE *f, GF_FilterPid *opid, const char *name, GF_DashStream *ds)
+static void dasher_transfer_file(FILE *f, GF_FilterPid *opid, const char *name, GF_DashStream *ds, Bool is_rel_url)
 {
 	GF_FilterPacket *pck;
 	u32 size, nb_read;
@@ -4485,6 +4802,8 @@
 	if (ds) {
 		gf_filter_pck_set_property(pck, GF_PROP_PCK_HLS_REF, &PROP_LONGUINT( ds->hls_ref_id ) );
 	}
+	if (is_rel_url)
+		gf_filter_pck_set_property(pck, GF_PROP_PID_FILE_REL, &PROP_BOOL( GF_TRUE ) );
 	gf_filter_pck_send(pck);
 }
 
@@ -4693,7 +5012,7 @@
 		e = GF_OK;
 		goto err_exit;
 	}
-	dasher_transfer_file(tmp, ctx->opid, NULL, NULL);
+	dasher_transfer_file(tmp, ctx->opid, NULL, NULL, GF_FALSE);
 
 err_exit:
 	if (tmp) gf_fclose(tmp);
@@ -4704,13 +5023,289 @@
 		ctx->in_error = GF_TRUE;
 }
 
+static GF_Err dasher_write_index(GF_DasherCtx *ctx, GF_FilterPid *opid)
+{
+	u8 *data;
+	u32 i, pos, count = gf_list_count(ctx->pids);
+	u32 nb_rep_pos, nb_reps=0;
+	GF_BitStream *bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
+
+	gf_bs_write_u32(bs, GF_4CC('G','H','I','D'));
+	gf_bs_write_u32(bs, 0); //for future ext ?
+	gf_bs_write_u32 (bs, ctx->mpd->segment_duration);
+	gf_bs_write_u32 (bs, ctx->mpd->max_segment_duration);
+	gf_bs_write_u64 (bs, ctx->mpd->media_presentation_duration);
+	gf_bs_write_u64(bs, ctx->current_period->period->duration);
+	gf_bs_write_utf8(bs, ctx->mpd->segment_template);
+
+	nb_rep_pos = (u32) gf_bs_get_position(bs);
+	gf_bs_write_u32(bs, 0);
+
+	for (i=0; i<count; i++) {
+		u8 flags=0;
+		u32 j, nb_segs, rep_start;
+		u32 props_start;
+		GF_MPD_SegmentURL *s;
+		GF_DashStream *ds = gf_list_get(ctx->pids, i);
+		if (!ds || !ds->rep || !ds->rep->res_url || !ds->rep->segment_list) continue;
+
+		nb_reps++;
+		rep_start = (u32) gf_bs_get_position(bs);
+		gf_bs_write_u32(bs, 0);
+
+		gf_bs_write_utf8(bs, ds->rep->id);
+		gf_bs_write_utf8(bs, ds->rep->res_url);
+		gf_bs_write_u32(bs, ds->rep->trackID);
+		s = gf_list_get(ds->rep->segment_list->segment_URLs, 0);
+		gf_bs_write_u32(bs, s ? (u32) s->frag_start_offset : 0);
+		gf_bs_write_u32(bs, ds->timescale);
+		gf_bs_write_u32(bs, ds->rep->segment_list->timescale);
+		gf_bs_write_u32(bs, ds->rep->bandwidth);
+		gf_bs_write_u32(bs, (ds->pts_minus_cts<0) ? (u32) (-ds->pts_minus_cts) : 0);
+		gf_bs_write_u32(bs, ds->rep->segment_list->sample_duration);
+		gf_bs_write_u32(bs, ds->rep->segment_list->first_cts_offset);
+		gf_bs_write_u32(bs, gf_list_count(ds->rep->segment_list->segment_URLs) );
+
+		GF_MPD_SegmentURL *surl = gf_list_last(ds->rep->segment_list->segment_URLs);
+		gf_bs_write_u8(bs, ds->set ? ds->set->starts_with_sap : ds->rep->starts_with_sap);
+		if (surl->first_tfdt>0xFFFFFFFFUL) {
+			flags |= 1;
+		}
+		if (surl->first_pck_seq>0xFFFFFFFFUL) {
+			flags |= 1<<1;
+		}
+		if (ds->frag_start_offset) {
+			flags |= 1<<2;
+			if (surl->frag_start_offset > 0xFFFFFFFFUL) {
+				flags |= 1<<3;
+			}
+		}
+		if (ds->frag_first_ftdt) {
+			flags |= 1<<4;
+			if (surl->frag_tfdt > 0xFFFFFFFFUL) {
+				flags |= 1<<5;
+			}
+		}
+		if (ds->rep->segment_list->use_split_dur) {
+			flags |= 1<<6;
+		}
+		gf_bs_write_u8(bs, flags);
+		gf_bs_write_u16(bs, 0);
+		//serialize all props
+		props_start = (u32) gf_bs_get_position(bs);
+		gf_bs_write_u32(bs, 0);
+
+		u32 idx=0;
+		while (1) {
+			u32 k;
+			u32 p4cc;
+			const char *pname;
+			const GF_PropertyValue *p = gf_filter_pid_enum_properties(ds->ipid, &idx, &p4cc, &pname);
+			if (!p) break;
+			switch (p4cc) {
+			case GF_PROP_PID_ID:
+			case GF_PROP_PID_URL:
+			case GF_PROP_PID_FILEPATH:
+			case GF_PROP_PID_FILE_EXT:
+			case GF_PROP_PID_FILE_CACHED:
+			case GF_PROP_PID_DOWN_SIZE:
+			case GF_PROP_PID_DOWNLOAD_SESSION:
+			case GF_PROP_PID_TRACK_NUM:
+			case GF_PROP_PID_MEDIA_DATA_SIZE:
+			case GF_PROP_PID_MAX_FRAME_SIZE:
+			case GF_PROP_PID_AVG_FRAME_SIZE:
+			case GF_PROP_PID_MAX_TS_DELTA:
+			case GF_PROP_PID_CONSTANT_DURATION:
+			case GF_PROP_PID_PLAYBACK_MODE:
+			case GF_PROP_PID_CHAP_TIMES:
+			case GF_PROP_PID_CHAP_NAMES:
+				continue;
+			default:
+				break;
+			}
+			if (p->type == GF_PROP_POINTER) continue;
+
+			if (p4cc) gf_bs_write_u32(bs, p4cc);
+			else {
+				gf_bs_write_u32(bs, 0);
+				gf_bs_write_utf8(bs, pname);
+				gf_bs_write_u32(bs, p->type);
+			}
+
+			switch (p->type) {
+			case GF_PROP_SINT:
+			case GF_PROP_UINT:
+			case GF_PROP_4CC:
+				gf_bs_write_u32(bs, p->value.uint);
+				break;
+			case GF_PROP_LSINT:
+			case GF_PROP_LUINT:
+				gf_bs_write_u64(bs, p->value.longuint);
+				break;
+			case GF_PROP_BOOL:
+				gf_bs_write_u8(bs, p->value.boolean ? 1 : 0);
+				break;
+			case GF_PROP_FRACTION:
+				gf_bs_write_u32(bs, p->value.frac.num);
+				gf_bs_write_u32(bs, p->value.frac.den);
+				break;
+			case GF_PROP_FRACTION64:
+				gf_bs_write_u64(bs, p->value.lfrac.num);
+				gf_bs_write_u64(bs, p->value.lfrac.den);
+				break;
+			case GF_PROP_FLOAT:
+				gf_bs_write_float(bs, FIX2FLT(p->value.fnumber) );
+				break;
+			case GF_PROP_DOUBLE:
+				gf_bs_write_double(bs, p->value.number);
+				break;
+			case GF_PROP_VEC2I:
+				gf_bs_write_u32(bs, p->value.vec2i.x);
+				gf_bs_write_u32(bs, p->value.vec2i.y);
+				break;
+			case GF_PROP_VEC2:
+				gf_bs_write_double(bs, p->value.vec2.x);
+				gf_bs_write_double(bs, p->value.vec2.y);
+				break;
+			case GF_PROP_VEC3I:
+				gf_bs_write_u32(bs, p->value.vec3i.x);
+				gf_bs_write_u32(bs, p->value.vec3i.y);
+				gf_bs_write_u32(bs, p->value.vec3i.z);
+				break;
+			case GF_PROP_VEC4I:
+				gf_bs_write_u32(bs, p->value.vec4i.x);
+				gf_bs_write_u32(bs, p->value.vec4i.y);
+				gf_bs_write_u32(bs, p->value.vec4i.z);
+				gf_bs_write_u32(bs, p->value.vec4i.w);
+				break;
+			case GF_PROP_STRING:
+			case GF_PROP_STRING_NO_COPY:
+			case GF_PROP_NAME:
+				if (p4cc == GF_PROP_PID_DECODER_CONFIG_ENHANCEMENT) {
+					u32 len = (u32) strlen(p->value.string)+1;
+					gf_bs_write_u32(bs, len);
+					gf_bs_write_data(bs, p->value.string, len);
+				} else {
+					gf_bs_write_utf8(bs, p->value.string);
+				}
+				break;
+
+			case GF_PROP_DATA:
+			case GF_PROP_DATA_NO_COPY:
+			case GF_PROP_CONST_DATA:
+				gf_bs_write_u32(bs, p->value.data.size);
+				gf_bs_write_data(bs, p->value.data.ptr, p->value.data.size);
+				break;
+
+			//string list: memory is ALWAYS duplicated
+			case GF_PROP_STRING_LIST:
+				gf_bs_write_u32(bs, p->value.string_list.nb_items);
+				for (k=0; k<p->value.string_list.nb_items; k++) {
+					const char *str = p->value.string_list.valsk;
+					gf_bs_write_utf8(bs, str);
+				}
+				break;
+
+			case GF_PROP_UINT_LIST:
+			case GF_PROP_SINT_LIST:
+			case GF_PROP_4CC_LIST:
+				gf_bs_write_u32(bs, p->value.uint_list.nb_items);
+				for (k=0; k<p->value.uint_list.nb_items; k++) {
+					gf_bs_write_u32(bs, p->value.uint_list.valsk);
+				}
+				break;
+			case GF_PROP_VEC2I_LIST:
+				gf_bs_write_u32(bs, p->value.v2i_list.nb_items);
+				for (k=0; k<p->value.uint_list.nb_items; k++) {
+					gf_bs_write_u32(bs, p->value.v2i_list.valsk.x );
+					gf_bs_write_u32(bs, p->value.v2i_list.valsk.y );
+				}
+				break;
+			default:
+				break;
+			}
+		}
+		//last prop
+		gf_bs_write_u32(bs, 0xFFFFFFFF);
+
+		pos = (u32) gf_bs_get_position(bs);
+		u32 psize = pos - props_start;
+		gf_bs_seek(bs, props_start);
+		gf_bs_write_u32(bs, psize);
+		gf_bs_seek(bs, pos);
+
+		//serialize all segments
+		nb_segs = gf_list_count(ds->rep->segment_list->segment_URLs);
+		for (j=0; j<nb_segs; j++) {
+			s = gf_list_get(ds->rep->segment_list->segment_URLs, j);
+
+			if (flags & 1) gf_bs_write_u64(bs, s->first_tfdt);
+			else gf_bs_write_u32(bs, (u32) s->first_tfdt);
+
+			if (flags & (1<<1)) gf_bs_write_u64(bs, s->first_pck_seq);
+			else gf_bs_write_u32(bs, (u32) s->first_pck_seq);
+
+			gf_bs_write_u32(bs, (u32) s->duration);
+
+			if (flags & (1<<2)) {
+				if (flags & (1<<3)) gf_bs_write_u64(bs, s->frag_start_offset);
+				else gf_bs_write_u32(bs, (u32) s->frag_start_offset);
+			}
+			if (flags & (1<<4)) {
+				if (flags & (1<<5)) gf_bs_write_u64(bs, s->frag_tfdt);
+				else gf_bs_write_u32(bs, (u32) s->frag_tfdt);
+			}
+			if (flags & (1<<6)) {
+				gf_bs_write_u32(bs, s->split_first_dur);
+				gf_bs_write_u32(bs, s->split_last_dur);
+			}
+		}
+
+		pos = (u32) gf_bs_get_position(bs);
+		psize = pos - rep_start;
+		gf_bs_seek(bs, rep_start);
+		gf_bs_write_u32(bs, psize);
+		gf_bs_seek(bs, pos);
+	}
+
+	pos = (u32) gf_bs_get_position(bs);
+	gf_bs_seek(bs, nb_rep_pos);
+	gf_bs_write_u32(bs, nb_reps);
+	gf_bs_seek(bs, pos);
+
+	GF_FilterPacket *dst = gf_filter_pck_new_alloc(opid, 1, &data);
+	gf_free(data);
+	u32 osize;
+	gf_bs_get_content(bs, &data, &osize);
+	gf_filter_pck_check_realloc(dst, data, osize);
+	gf_filter_pck_set_framing(dst, GF_TRUE, GF_TRUE);
+	gf_filter_pck_send(dst);
+	gf_bs_del(bs);
+	ctx->mpd->segment_template = NULL;
+	return GF_OK;
+}
+
+
 static GF_Err dasher_write_and_send_manifest(GF_DasherCtx *ctx, u64 last_period_dur, Bool do_m3u8, Bool m3u8_second_pass, GF_FilterPid *opid, char *alt_name)
 {
 	void *last_signature;
 	u8 sigGF_SHA1_DIGEST_SIZE;
 	GF_Err e;
-	FILE *tmp = gf_file_temp(NULL);
+	FILE *tmp;
+
+	ctx->mpd->segment_template = ctx->template;
+	if (ctx->do_index==1) {
+		return dasher_write_index(ctx, opid);
+	}
+	if (ctx->from_index)
+		ctx->mpd->m3u8_use_repid = GF_TRUE;
+
+	tmp = gf_file_temp(NULL);
 	if (do_m3u8) {
+		GF_M3U8WriteMode mode = GF_M3U8_WRITE_ALL;
+		if (ctx->from_index==IDXMODE_MANIFEST) mode = GF_M3U8_WRITE_MASTER;
+		else if (ctx->from_index==IDXMODE_CHILD) mode = GF_M3U8_WRITE_CHILD;
+
 		ctx->mpd->m3u8_time = ctx->hlsc;
 		ctx->mpd->nb_hls_ext_master = ctx->hlsx.nb_items;
 		ctx->mpd->hls_ext_master = (const char **) ctx->hlsx.vals;
@@ -4718,20 +5313,19 @@
 		ctx->mpd->llhls_rendition_reports = ctx->ll_rend_rep;
 		ctx->mpd->llhls_part_holdback = ctx->ll_part_hb;
 		ctx->mpd->hls_abs_url = ctx->hls_absu;
+		ctx->mpd->hls_audio_primary = ctx->hls_ap;
 
 		if (ctx->llhls==3)
 			ctx->mpd->force_llhls_mode = m3u8_second_pass ? 2 : 1;
 		else
 			ctx->mpd->force_llhls_mode = 0;
 
-		if (m3u8_second_pass) {
-			e = gf_mpd_write_m3u8_master_playlist(ctx->mpd, tmp, ctx->out_path, gf_list_last(ctx->mpd->periods) );
-		} else {
-			e = gf_mpd_write_m3u8_master_playlist(ctx->mpd, tmp, ctx->out_path, gf_list_last(ctx->mpd->periods) );
-		}
+		char *opath = ctx->explicit_mode ? gf_file_basename(ctx->out_path) : ctx->out_path;
+		e = gf_mpd_write_m3u8_master_playlist(ctx->mpd, tmp, opath, gf_list_last(ctx->mpd->periods), mode);
 	} else {
 		e = gf_mpd_write(ctx->mpd, tmp, ctx->cmpd);
 	}
+	ctx->mpd->segment_template = NULL;
 
 	if (e) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Dasher failed to write %s file: %s\n", do_m3u8 ? "M3U8" : "MPD", gf_error_to_string(e) ));
@@ -4756,7 +5350,8 @@
 	if (memcmp(sig, last_signature, GF_SHA1_DIGEST_SIZE)) {
 		memcpy(last_signature, sig, GF_SHA1_DIGEST_SIZE);
 
-		dasher_transfer_file(tmp, opid, alt_name, NULL);
+		if (ctx->from_index!=IDXMODE_CHILD)
+			dasher_transfer_file(tmp, opid, alt_name, NULL, GF_FALSE);
 	}
 	gf_fclose(tmp);
 	return GF_OK;
@@ -4784,6 +5379,9 @@
 	if (ctx->forward_mode == DASHER_FWD_ALL)
 		return GF_OK;
 
+	if (ctx->from_index>=IDXMODE_INIT)
+		return GF_OK;
+
 	if (ctx->dyn_rate)
 		dasher_update_dyn_bitrates(ctx);
 
@@ -4844,6 +5442,13 @@
 		}
 	}
 
+	if (ctx->index_max_seg_dur) {
+		ctx->mpd->max_segment_duration = ctx->index_max_seg_dur;
+		ctx->mpd->allow_empty_reps = 1;
+	}
+	if (ctx->index_media_duration)
+		ctx->mpd->media_presentation_duration = ctx->index_media_duration;
+
 	max_opid = (ctx->dual && ctx->opid_alt) ? 2 : 1;
 	for (i=0; i < max_opid; i++) {
 		Bool do_m3u8 = GF_FALSE;
@@ -4877,6 +5482,7 @@
 	if (store_mpd_dur) {
 		ctx->mpd->media_presentation_duration = store_mpd_dur;
 	}
+
 	if (max_seg_dur) {
 		ctx->mpd->max_segment_duration = (u32) max_seg_dur;
 		ctx->mpd->max_subsegment_duration = 0;
@@ -4891,7 +5497,7 @@
 		GF_MPD_AdaptationSet *as;
 		GF_MPD_Representation *rep;
 		GF_FilterPid *opid;
-		assert(period);
+		gf_assert(period);
 		if (ctx->opid_alt_m3u8) opid = ctx->opid_alt;
 		else opid = ctx->opid;
 
@@ -4907,7 +5513,7 @@
 
 					if (rep->m3u8_name) {
 						outfile = (char *) rep->m3u8_name;
-						if (ctx->out_path) {
+						if (ctx->out_path && (ctx->from_index<=IDXMODE_ALL) && !ctx->explicit_mode) {
 							outfile = gf_url_concatenate(ctx->out_path, rep->m3u8_name);
 							do_free = GF_TRUE;
 						}
@@ -4928,7 +5534,7 @@
 						do_free = GF_TRUE;
 					}
 					ds = rep->playback.udta;
-					dasher_transfer_file(rep->m3u8_var_file, opid, outfile, ds);
+					dasher_transfer_file(rep->m3u8_var_file, opid, outfile, ds, ctx->explicit_mode ? GF_TRUE : GF_FALSE);
 					gf_fclose(rep->m3u8_var_file);
 					rep->m3u8_var_file = NULL;
 					if (do_free) gf_free(outfile);
@@ -5013,6 +5619,18 @@
 		RESET_PROP_STR(ds->period_continuity_id)
 
 #undef RESET_PROP_STR
+
+		if (ds->packet_queue) {
+			while (gf_list_count(ds->packet_queue)) {
+				GF_FilterPacket *pck = gf_list_pop_front(ds->packet_queue);
+				gf_filter_pck_unref(pck);
+			}
+			gf_list_del(ds->packet_queue);
+		}
+#ifndef GPAC_DISABLE_CRYPTO
+		if (ds->cinfo) gf_crypt_info_del(ds->cinfo);
+#endif
+
 		return;
 	}
 	ds->init_seg = ds->seg_template = ds->idx_template = NULL;
@@ -5085,9 +5703,9 @@
 		ds->rep->dasher_ctx->mpd_timescale = ds->mpd_timescale;
 		ds->rep->dasher_ctx->last_dyn_period_id = ctx->last_dyn_period_id;
 
-		assert(ds->rep->dasher_ctx->init_seg);
-		assert(ds->rep->dasher_ctx->src_url);
-		assert(ds->rep->dasher_ctx->template_seg);
+		gf_assert(ds->rep->dasher_ctx->init_seg);
+		gf_assert(ds->rep->dasher_ctx->src_url);
+		gf_assert(ds->rep->dasher_ctx->template_seg);
 	}
 }
 
@@ -5108,11 +5726,11 @@
 
 		ds->rep->dasher_ctx->done = 0;
 
-		assert(ds->init_seg);
+		gf_assert(ds->init_seg);
 		ds->rep->dasher_ctx->init_seg = gf_strdup(ds->init_seg);
-		assert(ds->src_url);
+		gf_assert(ds->src_url);
 		ds->rep->dasher_ctx->src_url = gf_strdup(ds->src_url);
-		assert(ds->seg_template);
+		gf_assert(ds->seg_template);
 		ds->rep->dasher_ctx->template_seg = gf_strdup(ds->seg_template);
 		if (ds->idx_template)
 			ds->rep->dasher_ctx->template_idx = gf_strdup(ds->idx_template);
@@ -5318,7 +5936,7 @@
 			}
 		}
 		if (nb_remain_in_period) {
-			assert(i+1==nb_p);
+			gf_assert(i+1==nb_p);
 			last_period_active = GF_TRUE;
 		}
 		else if (nb_done_in_period && ctx->subdur  ) {
@@ -5385,7 +6003,7 @@
 			ds->period_start = rep->dasher_ctx->period_start;
 			if (!ds->period_start.den) {
 				ds->period_start.num = 0;
-				ds->period_start.den = 1;
+				ds->period_start.den = 1000;
 			}
 			ds->period_dur = rep->dasher_ctx->period_duration;
 			if (!ds->period_dur.den) {
@@ -5474,7 +6092,11 @@
 				if (e) return e;
 			}
 		}
-		assert(set_ds);
+		if (!set_ds) {
+			gf_assert(0);
+			//in case some edits of the ocntext broke everything, just ignore
+			continue;
+		}
 		set_ds->nb_rep = gf_list_count(set->representations);
 
 		//if multi PID init, gather pids
@@ -5496,7 +6118,7 @@
 			if (ds->dst_filter || ds->opid) continue;
 
 			//open destination, trashing init
-			assert(!ds->muxed_base);
+			gf_assert(!ds->muxed_base);
 			dasher_open_destination(filter, ctx, rep, ds->init_seg, GF_TRUE);
 
 			dasher_open_pid(filter, ctx, ds, multi_pids, GF_TRUE);
@@ -5581,12 +6203,13 @@
 
 static void dasher_init_utc(GF_Filter *filter, GF_DasherCtx *ctx)
 {
-	const char *cache_name;
-	u32 size;
-	u8 *data;
+	u8 *data=NULL;
 	u64 remote_utc;
+#ifdef GPAC_USE_DOWNLOADER
 	GF_Err e;
-	GF_DownloadSession *sess;
+	const char *cache_name;
+	u32 size;
+#endif
 	GF_DownloadManager *dm;
 	char *url;
 	DasherUTCTimingType def_type = DASHER_UTCREF_NONE;
@@ -5602,35 +6225,57 @@
 		url += 4;
 	}
 
-	dm  = gf_filter_get_download_manager(filter);
-	if (!dm) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("DASH Failed to get download manager, cannot sync to remote UTC clock\n"));
-		return;
-	}
 	if (!strcmp(ctx->utcs, "inband")) {
 		ctx->utc_timing_type = DASHER_UTCREF_INBAND;
 		return;
 	}
+#ifndef GPAC_USE_DOWNLOADER
+	GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("DASH No download manager, cannot sync to remote UTC clock\n"));
+	ctx->utc_timing_type = DASHER_UTCREF_NONE;
+	return;
+#else
+	//create session
+	if (!ctx->utc_sess) {
+		dm  = gf_filter_get_download_manager(filter);
+		if (!dm) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("DASH Failed to get download manager, cannot sync to remote UTC clock\n"));
+			return;
+		}
+		ctx->utc_sess = gf_dm_sess_new(dm, url, GF_NETIO_SESSION_MEMORY_CACHE, NULL, NULL, &e);
+		if (e) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("DASH Failed to create session for remote UTC source %s: %s - local clock will be used instead\n", url, gf_error_to_string(e) ));
+			return;
+		}
+		e = gf_dm_sess_process(ctx->utc_sess);
+		if (e==GF_IP_NETWORK_EMPTY) {
+			ctx->utc_initialized = GF_FALSE;
+			return;
+		}
+	}
+	//check we are done
+	GF_NetIOStatus status;
+	e = gf_dm_sess_get_stats(ctx->utc_sess, NULL, NULL, NULL, NULL, NULL, &status);
+	if (status==GF_NETIO_DATA_TRANSFERED) e = GF_OK;
+	else if (status==GF_NETIO_DATA_EXCHANGE) e = GF_NOT_READY;
+	else if (status==GF_NETIO_STATE_ERROR) {}
+	else if ((status==GF_NETIO_DISCONNECTED) && (e>=GF_OK))
+		e = GF_OK;
+	else
+		e = GF_NOT_READY;
 
-	sess = gf_dm_sess_new(dm, url, GF_NETIO_SESSION_MEMORY_CACHE|GF_NETIO_SESSION_NOT_THREADED, NULL, NULL, &e);
-	if (e) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("DASH Failed to create session for remote UTC source %s: %s - local clock will be used instead\n", url, gf_error_to_string(e) ));
+	if (e==GF_NOT_READY) {
+		ctx->utc_initialized = GF_FALSE;
 		return;
 	}
-	while (1) {
-		GF_NetIOStatus status;
-		e = gf_dm_sess_process(sess);
-		if (e) break;
-		gf_dm_sess_get_stats(sess, NULL, NULL, NULL, NULL, NULL, &status);
-		if (status>=GF_NETIO_DATA_TRANSFERED) break;
-	}
 	if (e<0) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("DASH Failed to fetch remote UTC source %s: %s\n", url, gf_error_to_string(e) ));
-		gf_dm_sess_del(sess);
+		gf_dm_sess_del(ctx->utc_sess);
+		ctx->utc_sess = NULL;
 		return;
 	}
-	cache_name = gf_dm_sess_get_cache_name(sess);
+	cache_name = gf_dm_sess_get_cache_name(ctx->utc_sess);
 	gf_blob_get(cache_name, &data, &size, NULL);
+
 	if (data) {
 		//xsDate or isoDate - we always signal using iso
 		if (strchr(data, 'T')) {
@@ -5654,7 +6299,7 @@
 
 	//not match, try http date
 	if (!ctx->utc_timing_type) {
-		const char *hdr = gf_dm_sess_get_header(sess, "Date");
+		const char *hdr = gf_dm_sess_get_header(ctx->utc_sess, "Date");
 		if (hdr) {
 			//http-head
 			remote_utc = gf_net_parse_date(hdr);
@@ -5673,44 +6318,9 @@
 		} else {
 			GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("Dasher Synchronized clock to remote %s - UTC diff (local - remote) %d ms\n", url, ctx->utc_diff));
 		}
-
-		if (!gf_list_count(ctx->mpd->utc_timings) ) {
-			Bool dashif_ok = GF_FALSE;
-			GF_MPD_Descriptor *utc_t;
-			GF_SAFEALLOC(utc_t, GF_MPD_Descriptor);
-			utc_t->value = gf_strdup(url);
-			switch (ctx->utc_timing_type) {
-			case DASHER_UTCREF_HTTP_HEAD:
-				utc_t->scheme_id_uri = gf_strdup("urn:mpeg:dash:utc:http-head:2014");
-				break;
-			case DASHER_UTCREF_XSDATE:
-				utc_t->scheme_id_uri = gf_strdup("urn:mpeg:dash:utc:http-xsdate:2014");
-				dashif_ok = GF_TRUE;
-				break;
-			case DASHER_UTCREF_ISO:
-				utc_t->scheme_id_uri = gf_strdup("urn:mpeg:dash:utc:http-iso:2014");
-				dashif_ok = GF_TRUE;
-				break;
-			case DASHER_UTCREF_NTP:
-				utc_t->scheme_id_uri = gf_strdup("urn:mpeg:dash:utc:http-ntp:2014");
-				dashif_ok = GF_TRUE;
-				break;
-			case DASHER_UTCREF_INBAND:
-				utc_t->scheme_id_uri = gf_strdup("urn:mpeg:dash:utc:direct:2014");
-				break;
-			default:
-				break;
-			}
-			if (!dashif_ok && (ctx->profile==GF_DASH_PROFILE_DASHIF_LL)) {
-				GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("Dasher UTC reference %s allowed in DASH-IF Low Latency profile\n\tswitching to regular live profile\n", utc_t->scheme_id_uri));
-				ctx->profile = GF_DASH_PROFILE_LIVE;
-			}
-			if (!ctx->mpd->utc_timings)
-				ctx->mpd->utc_timings = gf_list_new();
-			gf_list_add(ctx->mpd->utc_timings, utc_t);
-		}
 	}
-	gf_dm_sess_del(sess);
+	gf_dm_sess_del(ctx->utc_sess);
+#endif
 }
 
 
@@ -5792,7 +6402,7 @@
 		} else {
 			if ((period_start.num<0) || (ds->period_start.num * period_start.den < period_start.num * ds->period_start.den)) {
 				period_start = ds->period_start;
-				assert(ds->period_start.den);
+				gf_assert(ds->period_start.den);
 			}
 		}
 	}
@@ -5913,7 +6523,7 @@
 	}
 
 
-	assert(period_id);
+	gf_assert(period_id);
 
 	next_period_start.num = -1;
 	next_period_start.den = 1;
@@ -5942,7 +6552,7 @@
 				else
 					dur.num += ds->period_dur.num;
 			}
-			
+
 			if ((next_period_start.num < 0) || (next_period_start.num * dur.den > dur.num * next_period_start.den))
 				next_period_start = dur;
 		}
@@ -6314,6 +6924,8 @@
 			}
 		}
 		ds->period_continuity_next_cts = 0;
+		prop = gf_filter_pid_get_property_str(ds->ipid, "start_with_sap");
+		if (prop) ds->set->starts_with_sap = prop->value.uint;
 
 
 		if (ctx->mha_compat && ((ds->codec_id==GF_CODECID_MHAS) || (ds->codec_id==GF_CODECID_MPHA))) {
@@ -6352,6 +6964,8 @@
 				ds->nb_rep++;
 				//add non-conditional adaptation set descriptors
 				dasher_add_descriptors(&ds->set->x_children, a_ds->p_as_any_desc);
+			} else if (ds->as_id && (ds->as_id==a_ds->as_id)){
+				GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("DASH Streams not switchable (codec %s vs %s) but same ASID requested, ignoring ASID\n", gf_codecid_file_ext(ds->codec_id), gf_codecid_file_ext(a_ds->codec_id) ));
 			}
 		}
 	}
@@ -6381,9 +6995,9 @@
 			break;
 
 		set = gf_list_get(ctx->current_period->period->adaptation_sets, i);
-		assert(set);
+		gf_assert(set);
 		rep = gf_list_get(set->representations, 0);
-		assert(rep);
+		gf_assert(rep);
 		ds = rep->playback.udta;
 
 		if (inject_ds && (ds != inject_ds))
@@ -6399,7 +7013,7 @@
 
 			set = gf_list_get(ctx->current_period->period->adaptation_sets, j);
 			rep = gf_list_get(set->representations, 0);
-			assert(rep);
+			gf_assert(rep);
 			a_ds = rep->playback.udta;
 
 			if (!dasher_template_use_source_url(a_ds->template ? a_ds->template : ctx->template))
@@ -6414,7 +7028,7 @@
 				p2 = gf_filter_pid_get_property(a_ds->ipid, GF_PROP_PID_FILEPATH);
 				if (p1 && p2 && gf_props_equal(p1, p2)) split_init = GF_TRUE;
 			}
-			
+
 			if (split_init) {
 				ds->split_set_names = GF_TRUE;
 				a_ds->split_set_names = GF_TRUE;
@@ -6449,15 +7063,52 @@
 	if (!ctx->mpd->availabilityStartTime && (ctx->dmode!=GF_MPD_TYPE_STATIC) && !inject_ds) {
 		u64 dash_start_date = ctx->ast ? gf_net_parse_date(ctx->ast) : 0;
 
-		if (!ctx->utc_initialized) {
-			dasher_init_utc(filter, ctx);
-
-			//setup service description
-			if (ctx->profile == GF_DASH_PROFILE_DASHIF_LL) {
-				ctx->mpd->inject_service_desc = GF_TRUE;
+		if (ctx->utc_timing_type != DASHER_UTCREF_NONE) {
+			if (!gf_list_count(ctx->mpd->utc_timings) ) {
+				Bool dashif_ok = GF_FALSE;
+				GF_MPD_Descriptor *utc_t;
+				char *url = ctx->utcs;
+				if (!strncmp(url, "xsd@", 4)) url += 4;
+
+				GF_SAFEALLOC(utc_t, GF_MPD_Descriptor);
+				utc_t->value = gf_strdup(url);
+				switch (ctx->utc_timing_type) {
+				case DASHER_UTCREF_HTTP_HEAD:
+					utc_t->scheme_id_uri = gf_strdup("urn:mpeg:dash:utc:http-head:2014");
+					break;
+				case DASHER_UTCREF_XSDATE:
+					utc_t->scheme_id_uri = gf_strdup("urn:mpeg:dash:utc:http-xsdate:2014");
+					dashif_ok = GF_TRUE;
+					break;
+				case DASHER_UTCREF_ISO:
+					utc_t->scheme_id_uri = gf_strdup("urn:mpeg:dash:utc:http-iso:2014");
+					dashif_ok = GF_TRUE;
+					break;
+				case DASHER_UTCREF_NTP:
+					utc_t->scheme_id_uri = gf_strdup("urn:mpeg:dash:utc:http-ntp:2014");
+					dashif_ok = GF_TRUE;
+					break;
+				case DASHER_UTCREF_INBAND:
+					utc_t->scheme_id_uri = gf_strdup("urn:mpeg:dash:utc:direct:2014");
+					break;
+				default:
+					break;
+				}
+				if (!dashif_ok && (ctx->profile==GF_DASH_PROFILE_DASHIF_LL)) {
+					GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("Dasher UTC reference %s allowed in DASH-IF Low Latency profile\n\tswitching to regular live profile\n", utc_t->scheme_id_uri));
+					ctx->profile = GF_DASH_PROFILE_LIVE;
+				}
+				if (!ctx->mpd->utc_timings)
+					ctx->mpd->utc_timings = gf_list_new();
+				gf_list_add(ctx->mpd->utc_timings, utc_t);
 			}
 		}
 
+		//setup service description
+		if (ctx->profile == GF_DASH_PROFILE_DASHIF_LL) {
+			ctx->mpd->inject_service_desc = GF_TRUE;
+		}
+
 		ctx->mpd->gpac_init_ntp_ms = gf_net_get_ntp_ms();
 		ctx->mpd->availabilityStartTime = dasher_get_utc(ctx);
 		GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("Dasher MPD Availability start time initialized to "LLU" ms\n", ctx->mpd->availabilityStartTime));
@@ -6506,6 +7157,8 @@
 	//good to go !
 	for (i=0; i<count; i++) {
 		GF_DashStream *ds = gf_list_get(ctx->current_period->streams, i);
+		if (ctx->force_period_switch) return GF_OK;
+
 		if (inject_ds && (ds != inject_ds))
 			continue;
 		//setup segmentation
@@ -6513,9 +7166,16 @@
 		ds->presentation_time_offset = 0;
 		ds->seg_done = GF_FALSE;
 		ds->next_seg_start = (u32) ( ((u64) ds->dash_dur.num * ds->timescale) / ds->dash_dur.den);
-		//adjust next_seg_start of first seg to presentation time if skip edit
-		if (!ds->cues && (ds->pts_minus_cts<0) && (ds->next_seg_start> (u32) -ds->pts_minus_cts))
+
+		//in sbound=0 mode, if stream has sync and non-sync and uses skip samples, allow spliting
+		//slightly before - typically needed for audio with sync points (usac, mpegh) where the segment duration is set
+		//to the intra interval, we need to take into account the skip samples
+		if (!ctx->sbound && !ds->cues && (ds->sync_points_type==DASHER_SYNC_PRESENT)
+			&& (ds->pts_minus_cts<0) && (ds->next_seg_start > (u32) -ds->pts_minus_cts)
+		) {
 			ds->next_seg_start -= (u32) -ds->pts_minus_cts;
+		}
+
 		ds->adjusted_next_seg_start = ds->next_seg_start;
 		ds->segment_started = GF_FALSE;
 		ds->seg_number = ds->startNumber;
@@ -6550,7 +7210,7 @@
 static void dasher_insert_timeline_entry(GF_DasherCtx *ctx, GF_DashStream *ds)
 {
 	GF_MPD_SegmentTimelineEntry *s;
-	u64 duration, pto;
+	u64 duration, pto, prev_patch_dur=0;
 	Bool is_first = GF_FALSE;
 	Bool seg_align = GF_FALSE;
 	GF_MPD_SegmentTimeline *tl=NULL;
@@ -6563,17 +7223,30 @@
 		if (sctx)
 			sctx->dur = ds->first_cts_in_next_seg - ds->first_cts_in_seg;
 	}
-
 	//we only use segment timeline with templates
-	if (!ds->stl) return;
+	if (!ds->stl && !ctx->do_index) return;
 
 	if (gf_list_find(ds->set->representations, ds->rep)==0) is_first = GF_TRUE;
-	assert(ds->first_cts_in_next_seg > ds->first_cts_in_seg);
-	duration = ds->first_cts_in_next_seg - ds->first_cts_in_seg;
+	if (ds->first_cts_in_next_seg > ds->first_cts_in_seg)
+		duration = ds->first_cts_in_next_seg - ds->first_cts_in_seg;
+	else {
+		duration = 0;
+		gf_assert(0);
+	}
+
+	//handle sap time adjustment (first_cts_in_seg is the SAP cts, we may have lower cts whith sap 2 or 3)
+	if (ds->min_cts_in_seg_plus_one && (ds->min_cts_in_seg_plus_one-1 < ds->first_cts_in_seg)) {
+		prev_patch_dur = ds->first_cts_in_seg - (ds->min_cts_in_seg_plus_one-1);
+		if (ds->timescale != ds->mpd_timescale)
+			prev_patch_dur = gf_timestamp_rescale(prev_patch_dur, ds->timescale, ds->mpd_timescale);
+		ds->first_cts_in_seg = ds->min_cts_in_seg_plus_one-1;
+		duration += prev_patch_dur;
+		ds->seg_start_time -= prev_patch_dur;
+	}
+
 	pto = ds->presentation_time_offset;
 	if (ds->timescale != ds->mpd_timescale) {
-		duration *= ds->mpd_timescale;
-		duration /= ds->timescale;
+		duration = gf_timestamp_rescale(duration, ds->timescale, ds->mpd_timescale);
 
 		pto = gf_timestamp_rescale(pto, ds->timescale, ds->mpd_timescale);
 	}
@@ -6582,6 +7255,11 @@
 	if (!is_first && seg_align) {
 		return;
 	}
+	if (ctx->do_index) {
+		GF_MPD_SegmentURL *surl = gf_list_last(ds->rep->segment_list->segment_URLs);
+		surl->duration = duration;
+	}
+	if (!ds->stl) return;
 
 	//no segment alignment store in each rep
 	if (!seg_align) {
@@ -6610,7 +7288,7 @@
 			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Dasher failed to store timeline entry, no AdpatationSet assigned !\n"));
 			return;
 		}
-		assert(ds->set);
+		gf_assert(ds->set);
 		if (ctx->tpl) {
 			//in case we had no template at set level
 			if (!ds->set->segment_template) {
@@ -6655,10 +7333,41 @@
 
 	//append to previous entry if possible
 	s = gf_list_last(tl->entries);
-	if (s && (s->duration == duration) && (s->start_time + (s->repeat_count+1) * s->duration == ds->seg_start_time + pto)) {
+
+	if (prev_patch_dur) {
+		u32 nb_ent = gf_list_count(tl->entries);
+		//split entry
+		if (s->repeat_count) {
+			GF_MPD_SegmentTimelineEntry *next;
+			s->repeat_count--;
+			GF_SAFEALLOC(next, GF_MPD_SegmentTimelineEntry);
+			if (!next) return;
+			next->duration = (u32) (s->duration - prev_patch_dur);
+			next->start_time = s->start_time + (s->repeat_count+1) * s->duration;
+			gf_list_add(tl->entries, next);
+			s = next;
+		} else {
+			//update entry
+			s->duration -= (u32) prev_patch_dur;
+			//merge with old one if possible
+			if (!ctx->keep_segs) {
+				GF_MPD_SegmentTimelineEntry *prev = (nb_ent>1) ? gf_list_get(tl->entries, nb_ent-2) : NULL;
+				if (prev && (prev->duration==s->duration) && (prev->start_time + (prev->repeat_count+1) * prev->duration == s->start_time)) {
+					prev->repeat_count++;
+					gf_list_pop_back(tl->entries);
+					gf_free(s);
+					s=prev;
+				}
+			}
+		}
+	}
+
+	//add to last entry ONLY if not keeping segments
+	if (!ctx->keep_segs && s && (s->duration == duration) && (s->start_time + (s->repeat_count+1) * s->duration == ds->seg_start_time + pto)) {
 		s->repeat_count++;
 		return;
 	}
+
 	//nope, allocate
 	GF_SAFEALLOC(s, GF_MPD_SegmentTimelineEntry);
 	if (!s) return;
@@ -6673,11 +7382,11 @@
 	u32 i, j, count, nb_s;
 	//get as level segment timeline, set it to NULL, reassign it to first rep and clone for other reps
 	if (ctx->tpl) {
-		assert(set->segment_template->segment_timeline);
+		gf_assert(set->segment_template->segment_timeline);
 		src_tl = set->segment_template->segment_timeline;
 		set->segment_template->segment_timeline = NULL;
 	} else {
-		assert(set->segment_list->segment_timeline);
+		gf_assert(set->segment_list->segment_timeline);
 		src_tl = set->segment_list->segment_timeline;
 		set->segment_list->segment_timeline = NULL;
 	}
@@ -6715,7 +7424,7 @@
 			}
 			tl = rep->segment_list->segment_timeline;
 		}
-		assert(tl);
+		gf_assert(tl);
 		for (j=0; j<nb_s; j++) {
 			GF_MPD_SegmentTimelineEntry *s;
 			GF_MPD_SegmentTimelineEntry *src_s = gf_list_get(src_tl->entries, j);
@@ -6805,8 +7514,18 @@
 		if (ctx->do_m3u8) {
 			u64 segdur = base_ds->first_cts_in_next_seg - ds->first_cts_in_seg;
 			if (gf_timestamp_less(base_ds->rep->hls_max_seg_dur.num, base_ds->rep->hls_max_seg_dur.den, segdur, base_ds->timescale)) {
-				base_ds->rep->hls_max_seg_dur.num = (s32) segdur;
-				base_ds->rep->hls_max_seg_dur.den = base_ds->timescale;
+				s64 diff = gf_timestamp_rescale(base_ds->rep->hls_max_seg_dur.num, base_ds->rep->hls_max_seg_dur.den, 1000);
+				diff -= gf_timestamp_rescale(segdur, base_ds->timescale, 1000);
+				//allow 50ms variation
+				if (diff < -50) {
+					GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("Dasher Changing HLS target duration from %u to %u, either increase the segment duration or re-encode the content\n",
+							(u32) gf_ceil( ((Double) base_ds->rep->hls_max_seg_dur.num) / base_ds->rep->hls_max_seg_dur.den),
+							(u32) gf_ceil( ((Double) segdur) / base_ds->timescale)
+					));
+
+					base_ds->rep->hls_max_seg_dur.num = (s32) segdur;
+					base_ds->rep->hls_max_seg_dur.den = base_ds->timescale;
+				}
 			}
 		}
 
@@ -6894,6 +7613,7 @@
 
 		if (!ds->done) {
 			ds->first_cts_in_next_seg = ds->first_cts_in_seg = ds->est_first_cts_in_next_seg = 0;
+			ds->min_cts_in_seg_plus_one = 0;
 		}
 
 		if (ds->muxed_base) {
@@ -6939,17 +7659,19 @@
 			}
 #endif
 
-			assert(base_ds->segment_started);
-			base_ds->segment_started = GF_FALSE;
+			//it may happen that we get a reconfigure triggered while no segment is active
+			if (base_ds->segment_started) {
+				base_ds->segment_started = GF_FALSE;
 
-			base_ds->next_seg_start += (u64) (base_ds->dash_dur.num) * base_ds->timescale / base_ds->dash_dur.den;
-			while (base_ds->next_seg_start <= base_ds->adjusted_next_seg_start) {
 				base_ds->next_seg_start += (u64) (base_ds->dash_dur.num) * base_ds->timescale / base_ds->dash_dur.den;
-				if (ctx->skip_seg)
-					base_ds->seg_number ++;
+				while (base_ds->next_seg_start <= base_ds->adjusted_next_seg_start) {
+					base_ds->next_seg_start += (u64) (base_ds->dash_dur.num) * base_ds->timescale / base_ds->dash_dur.den;
+					if (ctx->skip_seg)
+						base_ds->seg_number ++;
+				}
+				base_ds->adjusted_next_seg_start = base_ds->next_seg_start;
+				base_ds->seg_number ++;
 			}
-			base_ds->adjusted_next_seg_start = base_ds->next_seg_start;
-			base_ds->seg_number ++;
 		}
 	}
 
@@ -6957,8 +7679,9 @@
 		GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("Dasher Rep#%s flush seg %d start %g duration %g next seg end time %g\n", ds_log->rep->id, ds_log->seg_number-1, ((Double)first_cts_in_cur_seg)/ds_log->timescale, ((Double)seg_dur_ms)/1000, ((Double)ds_log->adjusted_next_seg_start)/ds_log->timescale));
 	}
 
-	//muxed representation with unaligned duration,
+	//muxed representation with unaligned duration, report all done reps to number of components done
 	if (has_ds_done) {
+		base_ds->nb_comp_done = 0;
 		for (i=0; i<count; i++) {
 			ds = gf_list_get(ctx->current_period->streams, i);
 			//otherwise reset only media components for this rep
@@ -6969,6 +7692,10 @@
 			}
 		}
 	}
+	else if (ds->muxed_base) {
+		//force reset if muxed base and no rep is over
+		base_ds->nb_comp_done = 0;
+	}
 
 	//some reps are done, other not, force a max time on all AS in the period
 	if (ds_done && ds_not_done) {
@@ -7041,6 +7768,7 @@
 
 static void dasher_mark_segment_start(GF_DasherCtx *ctx, GF_DashStream *ds, GF_FilterPacket *pck, GF_FilterPacket *in_pck)
 {
+	Bool no_concat;
 	GF_DASH_SegmentContext *seg_state=NULL;
 	char szSegmentNameGF_MAX_PATH, szSegmentFullPathGF_MAX_PATH, szIndexNameGF_MAX_PATH;
 	GF_DashStream *base_ds = ds->muxed_base ? ds->muxed_base : ds;
@@ -7120,6 +7848,8 @@
 		}
 
 		gf_filter_pck_set_property(pck, GF_PROP_PCK_FILENUM, &PROP_UINT(base_ds->seg_number ) );
+		if (base_ds->tpl_use_time)
+			gf_filter_pck_set_property(pck, GF_PROP_PCK_MPD_SEGSTART, &PROP_FRAC64_INT(base_ds->seg_start_time, base_ds->mpd_timescale ) );
 
 		if (ctx->gencues) {
 			gf_filter_pck_set_property(pck, GF_PROP_PCK_CUE_START, &PROP_BOOL(GF_TRUE));
@@ -7147,7 +7877,7 @@
 	if (ctx->store_seg_states) {
 		char *kms_uri;
 		const GF_PropertyValue *p;
-		assert(!ctx->gencues);
+		gf_assert(!ctx->gencues);
 		if (!ds->rep->state_seg_list) {
 			ds->rep->state_seg_list = gf_list_new();
 		}
@@ -7158,6 +7888,9 @@
 			p = gf_filter_pid_get_property(ds->ipid, GF_PROP_PID_HLS_GROUPID);
 			if (p)
 				ds->rep->groupID = p->value.string;
+			p = gf_filter_pid_get_property(ds->ipid, GF_PROP_PID_HLS_FORCE_INF);
+			if (p)
+				ds->rep->hls_forced = p->value.string;
 
 			ds->rep->dash_dur = ds->dash_dur;
 			ds->rep->hls_max_seg_dur = ds->dash_dur;
@@ -7169,6 +7902,9 @@
 				case DASHER_MUX_RAW:
 					break;
 				default:
+					//rawmux, don't inject init segment URI
+					if (ds->rawmux)
+						break;
 					if (ds->set->bitstream_switching && ds->set->segment_template)
 						ds->rep->hls_single_file_name = ds->set->segment_template->hls_init_name;
 					else
@@ -7294,7 +8030,7 @@
 				GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Dasher Manifest generation only but not fragment information in packet, source demux not properly configured\n"));
 				ctx->in_error = GF_TRUE;
 			}
-		} else {
+		} else if (!ctx->index_media_duration) {
 			gf_list_add(ds->pending_segment_states, seg_state);
 			ctx->nb_seg_url_pending++;
 		}
@@ -7303,10 +8039,10 @@
 	szIndexName0 = 0;
 	if (ds->idx_template) {
 		//get final segment template - output file name is NULL, we already have solved this in source_setup
-		gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_REPINDEX, ds->set->bitstream_switching, szIndexName, base_ds->rep_id, NULL, base_ds->idx_template, NULL, base_ds->seg_start_time, base_ds->rep->bandwidth, base_ds->seg_number, base_ds->stl);
+		gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_REPINDEX, ds->set->bitstream_switching, szIndexName, base_ds->rep_id, NULL, base_ds->idx_template, NULL, base_ds->seg_start_time, base_ds->rep->bandwidth, base_ds->seg_number, base_ds->stl, ctx->tpl_force);
 
 		strcpy(szSegmentFullPath, szIndexName);
-		if (ctx->out_path) {
+		if (ctx->out_path && !ctx->explicit_mode) {
 			char *rel = gf_url_concatenate(ctx->out_path, szIndexName);
 			if (rel) {
 				strcpy(szSegmentFullPath, rel);
@@ -7359,7 +8095,7 @@
 
 	if (ctx->sfile) {
 		GF_MPD_SegmentURL *seg_url;
-		assert(ds->rep->segment_list);
+		gf_assert(ds->rep->segment_list);
 
 		if (ctx->gencues) return;
 
@@ -7368,7 +8104,7 @@
 
 		gf_list_add(ds->rep->segment_list->segment_URLs, seg_url);
 		if (szIndexName0)
-			seg_url->index = gf_strdup(szIndexName);
+			seg_url->index = dasher_cat_mpd_url(ctx, ds, szIndexName);
 
 		if (ctx->sigfrag) {
 			const GF_PropertyValue *frag_range = gf_filter_pck_get_property(in_pck, GF_PROP_PCK_FRAG_RANGE);
@@ -7417,7 +8153,7 @@
 		return;
 	}
 
-	if (!ds->stl && !ctx->cues && !ctx->forward_mode) {
+	if (!ds->stl && !ctx->cues && !ctx->forward_mode && (pck || in_pck) ) {
 		Double drift, seg_start = (Double) ds->seg_start_time;
 		seg_start /= ds->mpd_timescale;
 		drift = seg_start - ((Double)(ds->seg_number - ds->startNumber)) * ds->dash_dur.num / ds->dash_dur.den;
@@ -7426,6 +8162,8 @@
 			u64 cts = 0;
 			if (pck) {
 				cts = dasher_translate_cts(ds, gf_filter_pck_get_cts(pck) );
+			} else if (in_pck) {
+				cts = gf_filter_pck_get_cts(in_pck);
 			}
 			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("Dasher First CTS "LLU" in segment %d drifting by %g (more than half a segment duration) from segment time, consider reencoding or using segment timeline\n", cts, ds->seg_number,  drift));
 		}
@@ -7439,14 +8177,29 @@
 			pto = gf_timestamp_rescale(pto, base_ds->timescale, base_ds->mpd_timescale);
 		}
 
-		gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_SEGMENT, ds->set->bitstream_switching, szSegmentName, base_ds->rep_id, NULL, base_ds->seg_template, NULL, base_ds->seg_start_time + pto, base_ds->rep->bandwidth, base_ds->seg_number, ds->stl);
+		gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_SEGMENT, ds->set->bitstream_switching, szSegmentName, base_ds->rep_id, NULL, base_ds->seg_template, NULL, base_ds->seg_start_time + pto, base_ds->rep->bandwidth, base_ds->seg_number, ds->stl, ctx->tpl_force);
+
 	}
 
 
 send_packet:
-	strcpy(szSegmentFullPath, szSegmentName);
 
-	if (ctx->out_path) {
+	no_concat=GF_FALSE;
+	if (ctx->from_index==IDXMODE_SEG) {
+		const GF_PropertyValue *p = gf_filter_pid_get_property_str(ds->ipid, "idx_out");
+		if (p) {
+			strcpy(szSegmentName, p->value.string);
+			strcpy(szSegmentFullPath, p->value.string);
+			no_concat = GF_TRUE;
+		}
+	}
+	if (!no_concat)
+		strcpy(szSegmentFullPath, szSegmentName);
+
+	if (ctx->explicit_mode) {
+
+	}
+	else if (!no_concat && ctx->out_path) {
 		char *rel = NULL;
 		if (ctx->do_m3u8 && ds->hls_vp_name && !ctx->forward_mode) {
 			char *tmp = gf_url_concatenate(ctx->out_path, ds->hls_vp_name);
@@ -7474,12 +8227,36 @@
 		GF_SAFEALLOC(seg_url, GF_MPD_SegmentURL);
 		if (seg_url) {
 			gf_list_add(ds->rep->segment_list->segment_URLs, seg_url);
-			seg_url->media = gf_strdup(szSegmentName);
-			gf_list_add(ds->pending_segment_urls, seg_url);
+			if (!ctx->do_index) {
+				seg_url->media = dasher_cat_mpd_url(ctx, ds, szSegmentName);
+				if (!ctx->index_media_duration) {
+					gf_list_add(ds->pending_segment_urls, seg_url);
+					ctx->nb_seg_url_pending++;
+				}
+			} else {
+				seg_url->first_tfdt = in_pck ? gf_filter_pck_get_dts(in_pck) : 0;
+				seg_url->first_pck_seq = in_pck ? ds->nb_pck : 0;
+				seg_url->frag_start_offset = ds->frag_start_offset;
+				seg_url->frag_tfdt = ds->frag_first_ftdt;
+				//set constant duration to first packet duration (as used by mp4mx to compute defaults)
+				//this will avoid generating trex with different default duration if working with or without sample
+				if (!ds->rep->segment_list->sample_duration) {
+					if (in_pck) {
+						ds->rep->segment_list->sample_duration = gf_filter_pck_get_duration(in_pck);
+					} else {
+						const GF_PropertyValue *p = gf_filter_pid_get_property(ds->ipid, GF_PROP_PID_CONSTANT_DURATION);
+						if (p) ds->rep->segment_list->sample_duration = p->value.uint;
+					}
+
+					ds->rep->segment_list->index_mode = GF_TRUE;
+					if (ds->pts_minus_cts<0)
+						ds->rep->segment_list->pid_delay = (u32) (-ds->pts_minus_cts);
+					ds->rep->segment_list->src_timescale = ds->timescale;
+				}
+			}
 			if (szIndexName0)
-				seg_url->index = gf_strdup(szIndexName);
+				seg_url->index = dasher_cat_mpd_url(ctx, ds, szIndexName);
 		}
-		ctx->nb_seg_url_pending++;
 	}
 	if (pck)
 		gf_filter_pck_set_property(pck, GF_PROP_PCK_FILENAME, &PROP_STRING(szSegmentFullPath) );
@@ -7615,7 +8392,7 @@
 
 void dasher_format_report(GF_Filter *filter, GF_DasherCtx *ctx)
 {
-	u32 i, count;
+	u32 i, count, nb_pc=0;
 	Double max_ts=0;
 	u32 total_pc = 0;
 	char szDS200;
@@ -7659,7 +8436,7 @@
 			if (ctx->cues) {
 				done = (Double) (ds->last_dts);
 				done /= ds->timescale;
-				snprintf(szDS, 200, "AS#%d.%d(%c) seg #%d %.2fs", set_idx, rep_idx, stype, ds->seg_number, done);
+				snprintf(szDS, 200, "AS#%d.%d(%c) seg #%d %02.2fs", set_idx, rep_idx, stype, ds->seg_number, done);
 			} else {
 				Double pcent, ddur;
 				done = (Double) ds->adjusted_next_seg_start;
@@ -7674,7 +8451,7 @@
 					done=0;
 				pcent = done / ddur;
 				pc = (s32) (done * 10000);
-				snprintf(szDS, 200, "AS#%d.%d(%c) seg #%d %.2fs (%.2f %%)", set_idx, rep_idx, stype, ds->seg_number, done, 100*pcent);
+				snprintf(szDS, 200, "AS#%d.%d(%c) seg #%d %02.2fs (%02.2f %%)", set_idx, rep_idx, stype, ds->seg_number, done, 100*pcent);
 			}
 
 			mpdtime = (Double) ds->last_dts;
@@ -7694,10 +8471,11 @@
 		}
 		//don't use max, do an average
 		total_pc += pc;
+		nb_pc++;
 		gf_dynstrcat(&szStatus, szDS, " ");
 	}
-	if (count)
-		total_pc /= count;
+	if (nb_pc)
+		total_pc /= nb_pc;
 
 	if (total_pc!=10000) {
 		sprintf(szDS, " / MPD %.2fs %d %%", max_ts, total_pc/100);
@@ -7713,8 +8491,8 @@
 		while (gf_list_count(ds->packet_queue)) {
 			GF_FilterPacket *pck = gf_list_pop_front(ds->packet_queue);
 			if (gf_filter_pck_get_sap(pck)) {
-				assert(ds->nb_sap_in_queue);
-				ds->nb_sap_in_queue --;
+				if (ds->nb_sap_in_queue)
+					ds->nb_sap_in_queue --;
 			}
 			gf_filter_pck_unref(pck);
 			if (!discard_all) break;
@@ -7727,14 +8505,14 @@
 	}
 }
 
-static void dasher_inject_eods(GF_DasherCtx *ctx, GF_DashStream *ds)
+static void dasher_inject_eods(GF_DasherCtx *ctx, GF_DashStream *ds, Bool forced)
 {
 	//in dynamic mode, send end of dash segment marker to flush segment right away, otherwise we will
 	//flush the segment at next segment start which could be after the segment AST => 404
 	//
 	//if subdur no need to do so as we will close the muxer right after
 	//if sigfrag no need to do so since we don't generate media packets
-	if (!ctx->subdur && (ctx->dmode>=GF_DASH_DYNAMIC) && !ctx->sigfrag) {
+	if (!ctx->subdur && ((ctx->dmode>=GF_DASH_DYNAMIC) || forced) && !ctx->sigfrag && !ctx->do_index) {
 		GF_FilterPacket *eods_pck;
 		eods_pck = gf_filter_pck_new_alloc(ds->opid, 0, NULL);
 		if (eods_pck) {
@@ -7748,54 +8526,68 @@
 
 static void dasher_send_empty_segment(GF_DasherCtx *ctx, GF_DashStream *ds)
 {
-	GF_FilterPacket *pck;
+	GF_FilterPacket *pck=NULL;
 	u8 *data;
 
 	if (ds->segment_started) {
+		if (ds->nb_comp_done >= ds->nb_comp) {
+			gf_assert(0);
+			return;
+		}
 		u64 next_cts = ds->first_cts_in_seg + gf_timestamp_rescale(ds->dash_dur.num, ds->dash_dur.den, ds->timescale);
 		ds->first_cts_in_next_seg = next_cts;
 		ds->nb_comp_done ++;
 		ds->split_dur_next = 0;
 		ds->seg_done = GF_TRUE;
 
-		dasher_inject_eods(ctx, ds);
+		dasher_inject_eods(ctx, ds, GF_FALSE);
 
+		//force to be last rep in set to be done
+		ds->nb_rep_done = ds->nb_rep-1;
 		dasher_flush_segment(ctx, ds, GF_FALSE);
 
 		ds->first_cts_in_seg = next_cts;
-		ds->nb_comp_done = 0;
 		ds->split_dur_next = 0;
 	}
 
-	if (ds->codec_id == GF_CODECID_SUBS_XML) {
-		//write empty TTML doc
-		u32 len = (u32) strlen(empty_ttml);
-		pck = gf_filter_pck_new_alloc(ds->opid, len+1, &data);
-		memcpy(data, empty_ttml, len);
-		datalen = 0;
-	} else if (ds->codec_id == GF_CODECID_WEBVTT) {
-		//write empty cue box, 8 byte size of type vtte
-		pck = gf_filter_pck_new_alloc(ds->opid, 8, &data);
-		data0 = data1 = data2 = 0; data3 = 8;
-		data4 = 'v'; data5 = 't'; data6 = 't'; data7 = 'e';
-	} else if (ds->codec_id == GF_CODECID_TX3G) {
-		//write empty tx3g sample, 2 bytes text len=0
-		pck = gf_filter_pck_new_alloc(ds->opid, 2, &data);
-		data0 = data1 = 0;
-	} else {
-		pck = gf_filter_pck_new_alloc(ds->opid, 0, &data);
-	}
+	if (ds->opid && (!ctx->from_index || (ctx->from_index==IDXMODE_SEG) )) {
+
+		if (ds->codec_id == GF_CODECID_SUBS_XML) {
+			//write empty TTML doc
+			u32 len = (u32) strlen(empty_ttml);
+			pck = gf_filter_pck_new_alloc(ds->opid, len+1, &data);
+			memcpy(data, empty_ttml, len);
+			datalen = 0;
+		} else if (ds->codec_id == GF_CODECID_WEBVTT) {
+			//write empty cue box, 8 byte size of type vtte
+			pck = gf_filter_pck_new_alloc(ds->opid, 8, &data);
+			data0 = data1 = data2 = 0; data3 = 8;
+			data4 = 'v'; data5 = 't'; data6 = 't'; data7 = 'e';
+		} else if (ds->codec_id == GF_CODECID_TX3G) {
+			//write empty tx3g sample, 2 bytes text len=0
+			pck = gf_filter_pck_new_alloc(ds->opid, 2, &data);
+			data0 = data1 = 0;
+		} else {
+			pck = gf_filter_pck_new_alloc(ds->opid, 0, &data);
+		}
 
-	gf_filter_pck_set_dts(pck, ds->first_cts_in_seg);
-	gf_filter_pck_set_cts(pck, ds->first_cts_in_seg);
-	gf_filter_pck_set_sap(pck, GF_FILTER_SAP_1);
-	//we don't assign a duration
+		gf_filter_pck_set_dts(pck, ds->first_cts_in_seg);
+		gf_filter_pck_set_cts(pck, ds->first_cts_in_seg);
+		gf_filter_pck_set_sap(pck, GF_FILTER_SAP_1);
+		//we don't assign a duration
 
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("Dasher Sending empty text packet CTS "LLU"/%d\n", ds->first_cts_in_seg, ds->timescale));
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("Dasher Sending empty text packet CTS "LLU"/%d\n", ds->first_cts_in_seg, ds->timescale));
+	}
 
 	dasher_mark_segment_start(ctx, ds, pck, NULL);
 	ds->segment_started = GF_TRUE;
-	gf_filter_pck_send(pck);
+	if (pck)
+		gf_filter_pck_send(pck);
+
+	if (ctx->do_index) {
+		GF_MPD_SegmentURL *s = gf_list_last(ds->rep->segment_list->segment_URLs);
+		s->first_tfdt = ds->first_cts_in_seg;
+	}
 
 	ds->first_cts_in_next_seg = ds->first_cts_in_seg + gf_timestamp_rescale(ds->dash_dur.num, ds->dash_dur.den, ds->timescale);
 	ds->est_first_cts_in_next_seg = ds->first_cts_in_next_seg;
@@ -7816,6 +8608,10 @@
 		gf_filter_abort(filter);
 		return GF_SERVICE_ERROR;
 	}
+	if (!ctx->utc_initialized) {
+		dasher_init_utc(filter, ctx);
+		if (!ctx->utc_initialized) return GF_OK;
+	}
 
 	//session regulation is on and we have a an MPD (setup done) and a next time (first seg processed)
 	//check if we have reached the next time
@@ -7856,10 +8652,14 @@
 	count = gf_list_count(ctx->current_period->streams);
 	if (!ctx->min_cts_period.den) {
 		u64 min_ts=0, min_timescale = 0;
+		u32 num_ready=0, num_blocked=0;
 		for (i=0; i<count; i++) {
 			GF_DashStream *ds = gf_list_get(ctx->current_period->streams, i);
+			if (ctx->force_period_switch) {
+				break;
+			}
 			GF_FilterPacket *pck = gf_filter_pid_get_packet(ds->ipid);
-			if (!pck) return GF_OK;
+			if (!pck) continue;
 			u64 ts = gf_filter_pck_get_cts(pck);
 			//only adjust if delay is negative (skip), otherwise (delay) keep mints as is.
 			//Not doing so will set the rep PTO to the delay, canceling the delay ...
@@ -7869,9 +8669,17 @@
 				min_ts = ts;
 				min_timescale = ds->timescale;
 			}
+			num_ready++;
+			if (gf_filter_pid_would_block(ds->ipid)) num_blocked++;
+		}
+		if (count) {
+			if (num_ready < num_blocked) return GF_OK;
 		}
 		ctx->min_cts_period.num = min_ts;
 		ctx->min_cts_period.den = min_timescale;
+
+		if (ctx->force_period_switch)
+			count = gf_list_count(ctx->current_period->streams);
 	}
 
 	nb_init = has_init = nb_reg_done = 0;
@@ -7879,7 +8687,7 @@
 	for (i=0; i<count; i++) {
 		GF_DashStream *base_ds;
 		GF_DashStream *ds = gf_list_get(ctx->current_period->streams, i);
-		assert(ds);
+		gf_assert(ds);
 		if (ds->done) continue;
 		base_ds = ds->muxed_base ? ds->muxed_base : ds;
 		//subdur mode abort, don't process
@@ -7889,6 +8697,7 @@
 		if (ds->seg_done) continue;
 
 		if (ctx->dmode == GF_MPD_TYPE_DYNAMIC_LAST) {
+			if (!ds->done && ds->opid) gf_filter_pid_set_eos(ds->opid);
 			ds->done = 1;
 			continue;
 		}
@@ -7905,13 +8714,13 @@
 			GF_FilterPacket *pck = NULL;
 
 			if (!ds->request_period_switch) {
-				assert(ds->period == ctx->current_period);
+				gf_assert(ds->period == ctx->current_period);
 				pck = gf_filter_pid_get_packet(ds->ipid);
 				//we may change period after a packet fetch (reconfigure of input pid)
 				if ((ds->period != ctx->current_period) || ds->request_period_switch) {
 					//in closest mode, flush queue
 					if (!ds->sbound || !gf_list_count(ds->packet_queue)) {
-						assert(gf_list_find(ctx->current_period->streams, ds)<0);
+						gf_assert(gf_list_find(ctx->current_period->streams, ds)<0);
 						count = gf_list_count(ctx->current_period->streams);
 						i--;
 						break;
@@ -7981,6 +8790,7 @@
 
 
 			if (!pck) {
+				Bool ds_is_done=GF_FALSE;
 				if (ds->request_period_switch) {
 					e = dasher_stream_period_changed(filter, ctx, ds, (ds->request_period_switch==2) ? GF_TRUE : GF_FALSE);
 					if (e < 0) {
@@ -7988,14 +8798,34 @@
 						i--;
 						break;
 					}
-					assert(gf_list_find(ctx->current_period->streams, ds)<0);
+					gf_assert(gf_list_find(ctx->current_period->streams, ds)<0);
 					count = gf_list_count(ctx->current_period->streams);
 					i--;
 					break;
 				}
 
-
-				if (gf_filter_pid_is_eos(ds->ipid) || ds->clamp_done) {
+				if (ds->clamp_done) ds_is_done=GF_TRUE;
+				else if (gf_filter_pid_is_eos(ds->ipid)) {
+					if (gf_filter_pid_is_flush_eos(ds->ipid)) {
+						if (ds->segment_started && !ds->seg_done) {
+							ds->seg_done = GF_TRUE;
+							ds->first_cts_in_next_seg = ds->est_first_cts_in_next_seg;
+							ds->est_first_cts_in_next_seg = 0;
+							if (base_ds->nb_comp_done < base_ds->nb_comp) {
+								base_ds->nb_comp_done ++;
+								if (base_ds->nb_comp_done == base_ds->nb_comp) {
+									dasher_flush_segment(ctx, base_ds, GF_FALSE);
+									dasher_inject_eods(ctx, base_ds, GF_TRUE);
+								}
+							} else {
+								gf_assert(0);
+							}
+						}
+ 					} else {
+						ds_is_done=GF_TRUE;
+					}
+				}
+				if (ds_is_done) {
 					u32 ds_done = 1;
 
 					if (!ds->clamp_done && !ds->muxed_base && (ds->stream_type==GF_STREAM_TEXT)) {
@@ -8041,11 +8871,13 @@
 					seg_done = GF_TRUE;
 					ds->first_cts_in_next_seg = ds->est_first_cts_in_next_seg;
 					ds->est_first_cts_in_next_seg = 0;
-					assert(base_ds->nb_comp_done < base_ds->nb_comp);
-					base_ds->nb_comp_done ++;
-					if (base_ds->nb_comp_done == base_ds->nb_comp) {
-						dasher_flush_segment(ctx, base_ds, GF_FALSE);
-						base_ds->nb_comp_done = 0;
+					if (base_ds->nb_comp_done < base_ds->nb_comp) {
+						base_ds->nb_comp_done ++;
+						if (base_ds->nb_comp_done == base_ds->nb_comp) {
+							dasher_flush_segment(ctx, base_ds, GF_FALSE);
+						}
+					} else {
+						gf_assert(0);
 					}
 					//loop on the entire source, mark as done for subdur and check if all other streams are done
 					if (!ds->done) {
@@ -8072,6 +8904,21 @@
 						gf_filter_pid_discard_block(ds->opid);
 					}
 				}
+				//no packet, muxed rep and base DS done, flush - required if no packet is present for the segment
+				//typically for subs
+				else if (ds->muxed_base && base_ds->seg_done && !ds->seg_done && !ds->is_av) {
+					ds->seg_done = GF_TRUE;
+					ds->first_cts_in_next_seg = ds->est_first_cts_in_next_seg;
+					ds->est_first_cts_in_next_seg = 0;
+					if (base_ds->nb_comp_done < base_ds->nb_comp) {
+						base_ds->nb_comp_done ++;
+						if (base_ds->nb_comp_done == base_ds->nb_comp) {
+							dasher_flush_segment(ctx, base_ds, GF_FALSE);
+						}
+					} else {
+						gf_assert(0);
+					}
+				}
 				break;
 			}
 			if (ds->seek_to_pck) {
@@ -8098,6 +8945,18 @@
 			dts = gf_filter_pck_get_dts(pck);
 			if (dts==GF_FILTER_NO_TS) dts = cts;
 
+			if (!sap_type && (ds->sync_points_type != DASHER_SYNC_PRESENT)) {
+				ds->sync_points_type = DASHER_SYNC_PRESENT;
+				//cf setup_period: in sbound=0 mode, if stream has sync and non-sync and uses skip samples, allow spliting
+				//slightly before - typically needed for audio with sync points (usac, mpegh) where the segment duration is set
+				//to the intra interval, we need to take into account the skip samples
+				if (!ctx->sbound && !ds->cues
+					&& (ds->pts_minus_cts<0) && (ds->next_seg_start> (u32) -ds->pts_minus_cts)
+				) {
+					ds->next_seg_start -= (u32) -ds->pts_minus_cts;
+				}
+			}
+
 			if ((ctx->strict_sap==DASHER_SAP_INTRA_ONLY) && (sap_type>=4))
 				sap_type = 0;
 
@@ -8155,8 +9014,8 @@
 					//in case we droped frames
 					if (ds->presentation_time_offset)
 						check_ts = ds->presentation_time_offset - 1;
-					//The code below assumes that the first frame in the stream has a presentation time of 0
 					ds->presentation_time_offset = 0;
+					//The code below assumes that the first frame in the stream has a presentation time of 0
 					if ((s64) check_ts + ds->pts_minus_cts > 0) {
 						u64 pto = check_ts + ds->pts_minus_cts;
 						u64 pto_adj = pto;
@@ -8190,6 +9049,9 @@
 
 				ds->first_cts = cts;
 				ds->first_dts = dts;
+				if (ctx->do_index) {
+					ds->rep->segment_list->first_cts_offset = (s32) ((s64) ds->first_cts - (s64) ds->first_dts);
+				}
 				ds->rep_init++;
 				has_init++;
 			}
@@ -8224,8 +9086,9 @@
 			split_dur_next = 0;
 
 			//patch to align old arch with new
+			//but if audio has sync frames, check_dur of sample duration would start the next segment one audio sample early
 			check_dur = 0;
-			if (ds->stream_type==GF_STREAM_AUDIO)
+			if ((ds->stream_type==GF_STREAM_AUDIO) && (ds->sync_points_type!=DASHER_SYNC_PRESENT))
 				check_dur = dur;
 
 			//perform regulation of inputs to avoid dashing one stream faster than the others
@@ -8248,7 +9111,7 @@
 			orig_cts = cts;
 			if (ds->split_dur_next) {
 				cts += ds->split_dur_next;
-				assert(dur > ds->split_dur_next);
+				gf_assert(dur > ds->split_dur_next);
 				dur -= ds->split_dur_next;
 				split_dur_next = ds->split_dur_next;
 				ds->split_dur_next = 0;
@@ -8289,7 +9152,7 @@
 			//base rep has been forced to another period, we switch asap
 			else if (base_ds->forced_period_switch) {
 				ds->seg_done = GF_TRUE;
-				dasher_inject_eods(ctx, ds);
+				dasher_inject_eods(ctx, ds, GF_FALSE);
 				seg_done = GF_TRUE;
 				dasher_stream_period_changed(filter, ctx, ds, GF_FALSE);
 				i--;
@@ -8312,11 +9175,38 @@
 			//inband-cue based segmentation
 			else if (ds->inband_cues) {
 				const GF_PropertyValue *p = gf_filter_pck_get_property(pck, GF_PROP_PCK_CUE_START);
-				if (p && p->value.boolean && base_ds->segment_started) {
-					seg_over = GF_TRUE;
-					if (ds == base_ds) {
-						base_ds->adjusted_next_seg_start = cts;
+				if (p && p->value.boolean) {
+					u32 size;
+					gf_filter_pck_get_data(pck, &size);
+					if (base_ds->segment_started) {
+						seg_over = GF_TRUE;
+						if (ds == base_ds) {
+							base_ds->adjusted_next_seg_start = cts;
+						}
+					}
+					//packet with no size, used by GHI demuxer:
+					//- if seek flag is set, this is a dummy packet sent to generate segment timeline / child HLS
+					//- if seek flag is not set, this is an empty segment for sparse streams
+					else if (!size) {
+						if (!gf_filter_pck_get_seek_flag(pck) ) {
+							ds->first_cts_in_seg = gf_filter_pck_get_cts(pck);
+							dasher_send_empty_segment(ctx, ds);
+							dasher_drop_input(ctx, ds, GF_TRUE);
+							continue;
+						}
 					}
+					p = gf_filter_pck_get_property(pck, GF_PROP_PCK_SPLIT_START);
+					if (p && (dur > p->value.uint)) {
+						cts += p->value.uint;
+						dur -= p->value.uint;
+						split_dur_next = p->value.uint;
+						ds->split_dur_next = 0;
+						is_packet_split = GF_TRUE;
+					}
+				}
+				p = gf_filter_pck_get_property(pck, GF_PROP_PCK_SPLIT_END);
+				if (p && (dur > p->value.uint)) {
+					dur -= p->value.uint;
 				}
 			}
 			//cue-list based segmentation
@@ -8443,7 +9333,7 @@
 				u32 idx, nb_queued, nb_pck = gf_list_count(ds->packet_queue);
 				nb_queued = nb_pck;
 				if (is_queue_flush) nb_queued += 1;
-				
+
 				for (idx=1; idx<nb_queued; idx++) {
 					GF_FilterPacket *next;
 					if (idx==nb_pck) {
@@ -8508,6 +9398,15 @@
 			//we exceed segment duration - if segment was started, check if we need to stop segment
 			//if segment was not started we insert the packet anyway
 			else if (!ds->sbound && ds->segment_started && gf_timestamp_greater_or_equal(cts + check_dur, ds->timescale, base_ds->adjusted_next_seg_start, base_ds->timescale) ) {
+
+
+				//we have a base (muxed rep) and it is not yet done, and we exceed estimated next seg start on base
+				//wait for the base to be done as the next seg estimate may change if next segment duration is quite
+				//different from requested duration - cf #2488
+				if ((ds != base_ds) && !base_ds->seg_done) {
+					break;
+				}
+
 				//no sap, segment is over
 				if (! ctx->sap) {
 					seg_over = GF_TRUE;
@@ -8549,6 +9448,14 @@
 							ds->set->starts_with_sap = sap_type;
 					}
 
+					//if sap2, silently move startWithSAP to 2 if previsouly 0,1 or 2
+					if (sap_type == GF_FILTER_SAP_2) {
+						if (ctx->sseg)
+							ds->set->subsegment_starts_with_sap = MAX(ds->set->subsegment_starts_with_sap, sap_type);
+						else
+							ds->set->starts_with_sap = MAX(ds->set->starts_with_sap, sap_type);
+					}
+
 					seg_over = GF_TRUE;
 					if (ds == base_ds) {
 						base_ds->adjusted_next_seg_start = cts;
@@ -8577,7 +9484,7 @@
 			}
 			//if dur=0 (some text streams), don't flush segment
 			if (seg_over && dur) {
-				assert(!ds->seg_done);
+				gf_assert(!ds->seg_done);
 
 				if (ds->request_period_switch && !gf_list_count(ds->packet_queue)) {
 					e = dasher_stream_period_changed(filter, ctx, ds, (ds->request_period_switch==2) ? GF_TRUE : GF_FALSE);
@@ -8585,19 +9492,28 @@
 						GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Dasher Period switch request failed.\n"));
 						break;
 					}
-					assert(gf_list_find(ctx->current_period->streams, ds)<0);
+					gf_assert(gf_list_find(ctx->current_period->streams, ds)<0);
 					count = gf_list_count(ctx->current_period->streams);
 					i--;
 					break;
 				}
 
 				ds->seg_done = GF_TRUE;
+				if (split_dur_next && ctx->do_index) {
+					GF_MPD_SegmentURL *s = gf_list_last(ds->rep->segment_list->segment_URLs);
+					s->split_last_dur = dur;
+					gf_assert(gf_filter_pck_get_duration(pck) > dur);
+					ds->rep->segment_list->use_split_dur = GF_TRUE;
+				}
 
-				dasher_inject_eods(ctx, ds);
+				dasher_inject_eods(ctx, ds, GF_FALSE);
 
 				ds->first_cts_in_next_seg = cts;
-				assert(base_ds->nb_comp_done < base_ds->nb_comp);
-				base_ds->nb_comp_done ++;
+				if (base_ds->nb_comp_done < base_ds->nb_comp) {
+					base_ds->nb_comp_done ++;
+				} else {
+					gf_assert(0);
+				}
 
 				if (split_dur_next)
 					ds->split_dur_next = (u32) split_dur_next;
@@ -8627,7 +9543,15 @@
 				ds->last_dts = dts;
 				ds->est_next_dts = dts + o_dur;
 			}
-			ds->nb_pck ++;
+
+			if (!is_packet_split)
+				ds->nb_pck ++;
+
+			if (!ds->min_cts_in_seg_plus_one)
+				ds->min_cts_in_seg_plus_one = cts+1;
+			else if (ds->min_cts_in_seg_plus_one - 1 > cts)
+				ds->min_cts_in_seg_plus_one = cts+1;
+
 
 			if (ctx->sigfrag) {
 				if (!ds->segment_started) {
@@ -8649,36 +9573,63 @@
 				}
 				continue;
 			}
-			//create new ref to input
-			dst = gf_filter_pck_new_ref(ds->opid, 0, 0, pck);
-			if (!dst) return GF_OUT_OF_MEM;
 
-			//merge all props
-			gf_filter_pck_merge_properties(pck, dst);
-			//we have ts offset, use computed cts and dts
-			if (ds->ts_offset) {
-				gf_filter_pck_set_cts(dst, gf_filter_pck_get_cts(pck) + ds->ts_offset);
-				gf_filter_pck_set_dts(dst, gf_filter_pck_get_dts(pck) + ds->ts_offset);
+			if (ctx->do_index) {
+				//frag range may be set for TS and other sources
+				const GF_PropertyValue *p = gf_filter_pck_get_property(pck, GF_PROP_PCK_FRAG_RANGE);
+				if (p) {
+					ds->frag_start_offset = p->value.lfrac.num;
+					//frag start only for fmp4
+					p = gf_filter_pck_get_property(pck, GF_PROP_PCK_FRAG_START);
+					if (p && p->value.boolean) {
+						p = gf_filter_pck_get_property(pck, GF_PROP_PCK_FRAG_TFDT);
+						if (p)
+							ds->frag_first_ftdt = p->value.longuint;
+					}
+				}
 			}
+			//create new ref to input
+			dst = NULL;
+			if (!ctx->do_index && !ctx->index_media_duration) {
+				dst = gf_filter_pck_new_ref(ds->opid, 0, 0, pck);
+				if (!dst) return GF_OUT_OF_MEM;
+
+				//merge all props
+				gf_filter_pck_merge_properties(pck, dst);
+				//we have ts offset, use computed cts and dts
+				if (ds->ts_offset) {
+					gf_filter_pck_set_cts(dst, gf_filter_pck_get_cts(pck) + ds->ts_offset);
+					gf_filter_pck_set_dts(dst, gf_filter_pck_get_dts(pck) + ds->ts_offset);
+				}
 
-			if (gf_sys_old_arch_compat() && ds->clamped_dur.num && ctx->loop
-				&& (cts + 2*o_dur >= ds->ts_offset + base_ds->clamped_dur.num * ds->timescale / base_ds->clamped_dur.den)
-			) {
-				u32 _dur = dur;
-				/* simple round with (int)+.5 to avoid trucating .99999 to 0 */
-				dur = (u32) (ds->clamped_dur.num * ds->timescale / ds->clamped_dur.den - (dts - ds->ts_offset) + 0.5);
-				//it may happen that the sample duration is 0 if the clamp duration is right after the sample DTS and timescale is not big enough to express it - force to 1
-				if (dur==0)
-					dur=1;
+				if (gf_sys_old_arch_compat() && ds->clamped_dur.num && ctx->loop
+					&& (cts + 2*o_dur >= ds->ts_offset + base_ds->clamped_dur.num * ds->timescale / base_ds->clamped_dur.den)
+				) {
+					u32 _dur = dur;
+					/* simple round with (int)+.5 to avoid trucating .99999 to 0 */
+					dur = (u32) (ds->clamped_dur.num * ds->timescale / ds->clamped_dur.den - (dts - ds->ts_offset) + 0.5);
+					//it may happen that the sample duration is 0 if the clamp duration is right after the sample DTS and timescale is not big enough to express it - force to 1
+					if (dur==0)
+						dur=1;
 
-				gf_filter_pck_set_duration(dst, dur);
-				ds->est_next_dts += (s32) dur - (s32) _dur;;
+					gf_filter_pck_set_duration(dst, dur);
+					ds->est_next_dts += (s32) dur - (s32) _dur;
+				}
 			}
 
 			if (!ds->segment_started) {
 				ds->first_cts_in_seg = cts;
+				if (split_dur_next && (ctx->from_index==IDXMODE_SEG)) {
+					ds->first_cts_in_seg -= split_dur_next;
+				}
 				dasher_mark_segment_start(ctx, ds, dst, pck);
 				ds->segment_started = GF_TRUE;
+				if (split_dur_next && ctx->do_index) {
+					GF_MPD_SegmentURL *s = gf_list_last(ds->rep->segment_list->segment_URLs);
+					s->split_first_dur = (u32) split_dur_next;
+					gf_assert(gf_filter_pck_get_duration(pck) > split_dur_next);
+					ds->rep->segment_list->use_split_dur = GF_TRUE;
+				}
 			}
 			//prev packet was split
 			if (is_packet_split) {
@@ -8687,41 +9638,49 @@
 				u64 ts = gf_filter_pck_get_cts(pck);
 				if (ts != GF_FILTER_NO_TS) {
 					cts += ds->first_cts;
-					assert(cts >= ts);
+					gf_assert(cts >= ts);
 					diff = cts - ts;
 				} else {
 					cts = ds->last_cts;
 				}
-				gf_filter_pck_set_cts(dst, cts + ds->ts_offset);
+				if (dst) {
+					gf_filter_pck_set_cts(dst, cts + ds->ts_offset);
 
-				ts = gf_filter_pck_get_dts(pck);
-				if (ts != GF_FILTER_NO_TS)
-					gf_filter_pck_set_dts(dst, ts + diff + ds->ts_offset);
-
-				//add sample is redundant flag
-				dep_flags |= 0x1;
-				gf_filter_pck_set_dependency_flags(dst, dep_flags);
-				//this one might be incorrect of this split packet is also split, but we update the duration right below
-				gf_filter_pck_set_duration(dst, dur);
+					ts = gf_filter_pck_get_dts(pck);
+					if (ts != GF_FILTER_NO_TS)
+						gf_filter_pck_set_dts(dst, ts + diff + ds->ts_offset);
+
+					//add sample is redundant flag
+					dep_flags |= 0x1;
+					gf_filter_pck_set_dependency_flags(dst, dep_flags);
+					//this one might be incorrect of this split packet is also split, but we update the duration right below
+					gf_filter_pck_set_duration(dst, dur);
+				}
+
+				//undo cts shift, we use it just below to compute cumulated dur using orig_cts (stored before shift)
+				if (diff)
+					cts -= ds->first_cts;
 			}
 
 			//if split, adjust duration - this may happen on a split packet, if it covered 3 or more segments
 			if (split_dur) {
 				u32 cumulated_split_dur = split_dur;
-				gf_filter_pck_set_duration(dst, split_dur);
+				if (dst)
+					gf_filter_pck_set_duration(dst, split_dur);
 				//adjust dur
 				cumulated_split_dur += (u32) (cts - orig_cts);
-				assert( dur > split_dur);
+				gf_assert( dur > split_dur);
+				gf_assert( cumulated_split_dur <= gf_filter_pck_get_duration(pck) );
 				ds->split_dur_next = cumulated_split_dur;
 				dur = split_dur;
 			}
 
 			//remove NTP
-			if (ctx->ntp != DASHER_NTP_KEEP)
+			if (dst && (ctx->ntp != DASHER_NTP_KEEP))
 				gf_filter_pck_set_property(dst, GF_PROP_PCK_SENDER_NTP, NULL);
 
 			//change packet times
-			if (ds->force_timescale) {
+			if (ds->force_timescale && dst) {
 				u64 ats;
 				ats = gf_filter_pck_get_dts(dst);
 				if (ats!=GF_FILTER_NO_TS) {
@@ -8746,12 +9705,13 @@
 				ds->current_seg_state->encrypted = GF_TRUE;
 			//TODO check drift between MPD start time and min CTS in segment (not just first CTS in segment)
 
-			if (ctx->gxns && !ds->rep->first_tfdt_plus_one && !ds->muxed_base) {
+			if (ctx->gxns && dst && !ds->rep->first_tfdt_plus_one && !ds->muxed_base) {
 				ds->rep->first_tfdt_plus_one = 1 + gf_filter_pck_get_dts(dst);
 				ds->rep->first_tfdt_timescale = ds->timescale;
 			}
 			//send packet
-			gf_filter_pck_send(dst);
+			if (dst)
+				gf_filter_pck_send(dst);
 
 			if (ctx->update_report>=0)
 				ctx->update_report++;
@@ -8787,6 +9747,7 @@
 		else if (ds->seg_done && ctx->force_period_switch) nb_init++;
 		else if (ds->seg_done && ds->muxed_base && ds->muxed_base->done) {
 			nb_init++;
+			if (!ds->done && ds->opid) gf_filter_pid_set_eos(ds->opid);
 			ds->done = 1;
 		}
 	}
@@ -8802,12 +9763,10 @@
 		Bool update_manifest = GF_FALSE;
 		if (ctx->purge_segments) update_period = GF_TRUE;
 		if (ctx->mpd) {
-			//segment timeline used, always update manifest
-			if (ctx->stl)
-				update_manifest = GF_TRUE;
-			else if (ctx->dmode==GF_DASH_DYNAMIC) {
+			if (ctx->dmode>=GF_DASH_DYNAMIC) {
 				//publish time not set, we never send the manifest, do it
-				if (!ctx->mpd->publishTime) {
+				//segment timeline used, always update manifest
+				if (!ctx->mpd->publishTime || ctx->stl) {
 					update_manifest = GF_TRUE;
 				}
 				//whenever we have a new seg in HLS, push new manifest
@@ -8873,7 +9832,7 @@
 		ctx->nb_seg_url_pending = 0;
 		return GF_SERVICE_ERROR;
 	}
-	if (ctx->sseg && !ctx->on_demand_done && !ctx->sigfrag) {
+	if (ctx->sseg && !ctx->on_demand_done && !ctx->sigfrag && !ctx->do_index && !ctx->index_media_duration) {
 		return GF_OK;
 	}
 	gf_filter_prevent_blocking(filter, GF_FALSE);
@@ -8883,6 +9842,15 @@
 	//no more periods
 	if (e==GF_EOS) {
 		if (!ctx->is_eos) {
+			if (ctx->move_to_static) {
+				ctx->dmode = GF_MPD_TYPE_DYNAMIC_LAST;
+				if (ctx->mpd) {
+					ctx->mpd->type = ctx->dmode;
+					GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("Dasher EOS, flushing manifest as static\n"));
+					dasher_send_manifest(filter, ctx, GF_FALSE);
+				}
+				ctx->move_to_static = GF_FALSE;
+			}
 			ctx->is_eos = GF_TRUE;
 			gf_filter_pid_set_eos(ctx->opid);
 		}
@@ -9035,7 +10003,19 @@
 			for (i=0; i<count; i++) {
 				GF_DashStream *ds = gf_list_get(ctx->pids, i);
 				anevt.base.on_pid = ds->ipid;
-				anevt.encode_hints.intra_period = ds->dash_dur;
+				switch (ctx->from_index) {
+				case IDXMODE_NONE:
+					anevt.encode_hints.intra_period = ds->dash_dur;
+					break;
+				case IDXMODE_SEG:
+				case IDXMODE_CHILD:
+					break;
+				case IDXMODE_ALL:
+				case IDXMODE_INIT:
+				case IDXMODE_MANIFEST:
+					anevt.encode_hints.gen_dsi_only = GF_TRUE;
+					break;
+				}
 				gf_filter_pid_send_event(ds->ipid, &anevt);
 			}
 		}
@@ -9070,9 +10050,9 @@
 				GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Dasher Broken muxer, received segment size info event but no pending segments\n"));
 				return GF_TRUE;
 			}
-			assert(sctx);
-			assert(ctx->nb_seg_url_pending);
 			ctx->nb_seg_url_pending--;
+
+			gf_filter_post_process_task(filter);
 			sctx->file_size = 1 + (u32) (evt->seg_size.media_range_end - evt->seg_size.media_range_start);
 			sctx->file_offset = evt->seg_size.media_range_start;
 			sctx->index_size = 1 + (u32) (evt->seg_size.idx_range_end - evt->seg_size.idx_range_start);
@@ -9171,11 +10151,11 @@
 			if (ds->rep->segment_base) {
 				if (evt->seg_size.media_range_end) s_url = &ds->rep->segment_base->initialization_segment;
 			} else {
-				assert(ds->rep->segment_list);
+				gf_assert(ds->rep->segment_list);
 				if (evt->seg_size.media_range_end) s_url = &ds->rep->segment_list->initialization_segment;
 				else s_url = &ds->rep->segment_list->representation_index;
 			}
-			assert(s_url);
+			gf_assert(s_url);
 			if (*s_url) gf_mpd_url_free(*s_url);
 			*s_url = url;
 		} else if (ds->rep->segment_list && !evt->seg_size.is_init) {
@@ -9292,14 +10272,20 @@
 		ctx->sseg = ctx->sfile = GF_FALSE;
 		ctx->no_fragments_defaults = ctx->align = ctx->tpl = ctx->sap = GF_TRUE;
 		if (!ctx->utcs) {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("Dasher DASH-IF LL requires UTCTiming but none specified, using http://time.akamai.com/?iso \n"));
-			ctx->utcs = gf_strdup("http://time.akamai.com/?iso");
+			const char *default_utc_timing_server = "https://time.akamai.com/?iso&ms";
+			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("Dasher DASH-IF LL requires UTCTiming but none specified, using %s \n", default_utc_timing_server));
+			ctx->utcs = gf_strdup(default_utc_timing_server);
 		}
 		break;
 	default:
 		break;
 	}
 
+	if ((ctx->bs_switch == DASHER_BS_SWITCH_MULTI) && (ctx->pswitch == DASHER_PSWITCH_STSD)) {
+		GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("Dasher Cannot use `stsd` period switch with `multi` bitstream switching, disabling pswitch\n"));
+		ctx->pswitch = DASHER_PSWITCH_SINGLE;
+	}
+
 	if (ctx->sseg)
 		ctx->tpl = GF_FALSE;
 
@@ -9333,6 +10319,7 @@
 		if (!ctx->sigfrag) {
 			ctx->template = gf_strdup( ctx->sfile ? "$File$$FS$_dash" : (ctx->stl ? "$File$_dash$FS$$Time$" : "$File$_dash$FS$$Number$") );
 			GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("Dasher No template assigned, using %s\n", ctx->template));
+			ctx->def_template = 1;
 		}
 
 		if (ctx->profile == GF_DASH_PROFILE_FULL) {
@@ -9362,10 +10349,16 @@
 	GF_DasherCtx *ctx = gf_filter_get_udta(filter);
 	gf_filter_set_max_extra_input_pids(filter, -1);
 
+	if (ctx->mname && !strcmp(ctx->mname, "m3u8")) {
+		gf_free(ctx->mname);
+		ctx->mname = NULL;
+		ctx->do_m3u8 = GF_TRUE;
+	}
+
+	ctx->explicit_mode = !gf_filter_is_dynamic(filter);
 	ctx->pids = gf_list_new();
 	ctx->postponed_pids = gf_list_new();
 	ctx->tpl_records = gf_list_new();
-
 	if (!ctx->initext && (ctx->muxtype==DASHER_MUX_AUTO))
 		ctx->muxtype = DASHER_MUX_ISOM;
 
@@ -9374,6 +10367,10 @@
 		ctx->segdur.den = 1;
 		ctx->no_seg_dur = GF_TRUE;
 	}
+	if (ctx->dmode==GF_DASH_DYNAMIC_LAST+1) {
+		ctx->dmode = GF_DASH_DYNAMIC;
+		ctx->move_to_static = GF_TRUE;
+	}
 
 	e = dasher_setup_profile(ctx);
 	if (e) return e;
@@ -9412,10 +10409,6 @@
 	if ((ctx->tsb>=0) && (ctx->dmode!=GF_DASH_STATIC))
 		ctx->purge_segments = GF_TRUE;
 
-	if (ctx->llhls && !ctx->cmaf && !gf_sys_is_test_mode()) {
-		//cmaf is required for ll hls (at least tfdt per traf is)
-		ctx->cmaf = DASHER_CMAF_CMFC;
-	}
 	if (ctx->state && ctx->sreg) {
 		u32 diff;
 		u64 next_gen_ntp;
@@ -9428,6 +10421,15 @@
 			return e;
 		}
 	}
+
+
+	dasher_init_utc(filter, ctx);
+
+#ifdef GPAC_CONFIG_EMSCRIPTEN
+	//we need to read the state file so we must run on main thread
+	if (ctx->state)
+		gf_filter_force_main_thread(filter, GF_TRUE);
+#endif
 	return GF_OK;
 }
 
@@ -9439,10 +10441,6 @@
 	while (gf_list_count(ctx->pids)) {
 		GF_DashStream *ds = gf_list_pop_back(ctx->pids);
 		dasher_reset_stream(filter, ds, GF_TRUE);
-		if (ds->packet_queue) gf_list_del(ds->packet_queue);
-#ifndef GPAC_DISABLE_CRYPTO
-		if (ds->cinfo) gf_crypt_info_del(ds->cinfo);
-#endif
 		gf_free(ds);
 	}
 	gf_list_del(ctx->pids);
@@ -9467,8 +10465,8 @@
 #endif
 }
 
-#define MPD_EXTS "mpd|m3u8|3gm|ism"
-#define MPD_MIMES "application/dash+xml|video/vnd.3gpp.mpd|audio/vnd.3gpp.mpd|video/vnd.mpeg.dash.mpd|audio/vnd.mpeg.dash.mpd|audio/mpegurl|video/mpegurl|application/vnd.ms-sstr+xml"
+#define MPD_EXTS "mpd|m3u8|3gm|ism|ghix|ghi"
+#define MPD_MIMES "application/dash+xml|video/vnd.3gpp.mpd|audio/vnd.3gpp.mpd|video/vnd.mpeg.dash.mpd|audio/vnd.mpeg.dash.mpd|audio/mpegurl|video/mpegurl|application/vnd.ms-sstr+xml|application/x-gpac-ghi|application/x-gpac-ghix"
 
 static const GF_FilterCapability DasherCaps =
 {
@@ -9522,8 +10520,9 @@
 	{ OFFS(dmode), "dash content mode\n"
 		"- static: static content\n"
 		"- dynamic: live generation\n"
-		"- dynlast: last call for live, will turn the MPD into static"
-		"", GF_PROP_UINT, "static", "static|dynamic|dynlast", GF_FS_ARG_UPDATE},
+		"- dynlast: last call for live, will turn the MPD into static\n"
+		"- dynauto: live generation and move to static manifest upon end of stream"
+		"", GF_PROP_UINT, "static", "static|dynamic|dynlast|dynauto", GF_FS_ARG_UPDATE},
 	{ OFFS(sseg), "single segment is used", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_ADVANCED},
 	{ OFFS(sfile), "use a single file for all segments (default in on_demand)", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_ADVANCED},
 	{ OFFS(align), "enable segment time alignment between representations", GF_PROP_BOOL, "true", NULL, GF_FS_ARG_HINT_ADVANCED},
@@ -9567,7 +10566,7 @@
 		"- dashavc264.onDemand: DASH-IF onDemand profile\n"
 		"- dashif.ll: DASH IF low-latency profile (set UTC server to time.akamai.com if none set)"
 		"", GF_PROP_UINT, "auto", "auto|live|onDemand|main|full|hbbtv1.5.live|dashavc264.live|dashavc264.onDemand|dashif.ll", 0 },
-	{ OFFS(profX), "list of profile extensions, as used by DASH-IF and DVB. The string will be colon-concatenated with the profile used", GF_PROP_STRING, NULL, NULL, GF_FS_ARG_HINT_ADVANCED },
+	{ OFFS(profX), "list of profile extensions, as used by DASH-IF and DVB. The string will be colon-concatenated with the profile used. If starting with `+`, the profile string by default is erased and `+` is skipped", GF_PROP_STRING, NULL, NULL, GF_FS_ARG_HINT_ADVANCED },
 	{ OFFS(cp), "content protection element location\n"
 	"- set: in adaptation set element\n"
 	"- rep: in representation element\n"
@@ -9594,6 +10593,7 @@
 	{ OFFS(base), "set base URLs of MPD", GF_PROP_STRING_LIST, NULL, NULL, GF_FS_ARG_HINT_ADVANCED},
 	{ OFFS(refresh), "refresh rate for dynamic manifests, in seconds (a negative value sets the MPD duration, value 0 uses dash duration)", GF_PROP_DOUBLE, "0", NULL, GF_FS_ARG_HINT_ADVANCED},
 	{ OFFS(tsb), "time-shift buffer depth in seconds (a negative value means infinity)", GF_PROP_DOUBLE, "30", NULL, 0},
+	{ OFFS(keep_segs), "do not delete segments no longer in time-shift buffer", GF_PROP_BOOL, "false", NULL, 0},
 	{ OFFS(subdur), "maximum duration of the input file to be segmented. This does not change the segment duration, segmentation stops once segments produced exceeded the duration", GF_PROP_DOUBLE, "0", NULL, GF_FS_ARG_HINT_ADVANCED},
 	{ OFFS(ast), "set start date (as xs:date, e.g. YYYY-MM-DDTHH:MM:SSZ) for live mode. Default is now. !! Do not use with multiple periods, nor when DASH duration is not a multiple of GOP size !!", GF_PROP_STRING, NULL, NULL, GF_FS_ARG_HINT_ADVANCED},
 	{ OFFS(state), "path to file used to store/reload state info when simulating live. This is stored as a valid MPD with GPAC XML extensions", GF_PROP_STRING, NULL, NULL, GF_FS_ARG_HINT_EXPERT},
@@ -9633,7 +10633,7 @@
 		"- comp: only generate the adaptation sets for all compatible profiles\n"
 		"- all: generate the adaptation set for the main profile and all compatible profiles"
 		, GF_PROP_UINT, "no", "no|comp|all", GF_FS_ARG_HINT_EXPERT},
-	{ OFFS(mname), "output manifest name for ATSC3 multiplexing", GF_PROP_STRING, NULL, NULL, GF_FS_ARG_HINT_EXPERT},
+	{ OFFS(mname), "output manifest name for ATSC3 multiplexing (using 'm3u8' only toggles HLS generation)", GF_PROP_STRING, NULL, NULL, GF_FS_ARG_HINT_EXPERT},
 	{ OFFS(llhls), "HLS low latency type\n"
 		"- off: do not use LL-HLS\n"
 		"- br: use LL-HLS with byte-range for segment parts, pointing to full segment (DASH-LL compatible)\n"
@@ -9653,14 +10653,22 @@
 	"- mas: use absolute URL only in master playlist\n"
 	"- both: use absolute URL everywhere"
 		, GF_PROP_UINT, "no", "no|var|mas|both", GF_FS_ARG_HINT_ADVANCED},
-	{ OFFS(seg_sync), "force waiting for last packet of fragment/segment to be written before announcing segment in DASH/HLS playlist", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_EXPERT},
+	{ OFFS(hls_ap), "use audio as primary media instead of video when generating playlists", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_EXPERT},
+	{ OFFS(seg_sync), "control how waiting on last packet P of fragment/segment to be written impacts segment injection in manifest\n"
+	"- no: do not wait for P\n"
+	"- yes: wait for P\n"
+	"- auto: wait for P if HLS is used"
+	, GF_PROP_UINT, "auto", "no|yes|auto", GF_FS_ARG_HINT_EXPERT},
 
 	{ OFFS(cmaf), "use cmaf guidelines\n"
 		"- no: CMAF not enforced\n"
 		"- cmfc: use CMAF `cmfc` guidelines\n"
 		"- cmf2: use CMAF `cmf2` guidelines"
 		, GF_PROP_UINT, "no", "no|cmfc|cmf2", GF_FS_ARG_HINT_ADVANCED},
-	{ OFFS(pswitch), "force period switch instead of absorbing PID reconfiguration (for splicing or add insertion not using periodID)", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_HIDE},
+	{ OFFS(pswitch), "period switch control mode\n"
+		"- single: change period if PID configuration changes\n"
+		"- force: force period switch at each PID reconfiguration instead of absorbing PID reconfiguration (for splicing or add insertion not using periodID)\n"
+		"- stsd: change period if PID configuration changes unless new configuration was advertised in initial config", GF_PROP_UINT, "single", "single|force|stsd", GF_FS_ARG_HINT_EXPERT},
 	{ OFFS(chain), "URL of next MPD for regular chaining", GF_PROP_STRING, NULL, NULL, GF_FS_ARG_HINT_ADVANCED},
 	{ OFFS(chain_fbk), "URL of fallback MPD", GF_PROP_STRING, NULL, NULL, GF_FS_ARG_HINT_ADVANCED},
 	{ OFFS(gencues), "only insert segment boundaries and do not generate manifests", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_ADVANCED},
@@ -9672,6 +10680,7 @@
 		"- on: default KID always injected\n"
 		"- auto: default KID only injected if no key roll is detected (as per DASH-IF guidelines)"
 		, GF_PROP_UINT, "auto", "off|on|auto", GF_FS_ARG_HINT_EXPERT},
+	{ OFFS(tpl_force), "use template string as is without trying to add extension or solve conflicts in names", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_EXPERT},
 
 	{0}
 };
@@ -9711,9 +10720,11 @@
 "Additional replacement strings (not DASH, not generic GPAC replacements but may occur multiple times in template):\n"
 "- $Init=NAME$: replaced by NAME for init segment, ignored otherwise\n"
 "- $XInit=NAME$: complete replace by NAME for init segment, ignored otherwise\n"
+"- $InitExt=EXT$: replaced by EXT for init segment file extensions, ignored otherwise\n"
 "- $Index=NAME$: replaced by NAME for index segments, ignored otherwise\n"
 "- $Path=PATH$: replaced by PATH when creating segments, ignored otherwise\n"
 "- $Segment=NAME$: replaced by NAME for media segments, ignored for init segments\n"
+"- $SegExt=EXT$: replaced by EXT for media segment file extensions, ignored for init segments\n"
 "- $FS$ (FileSuffix): replaced by `_trackN` in case the input is an AV multiplex, or kept empty otherwise\n"
 "Note: these strings are replaced in the manifest templates elements.\n"
 "\n"
@@ -9735,6 +10746,7 @@
 "- `CropOrigin`: indicates x and y coordinates of video for SRD (size is video size)\n"
 "- `SRD`: indicates SRD position and size of video for SRD, ignored if `CropOrigin` is set\n"
 "- `SRDRef`: indicates global width and height of SRD, ignored if `CropOrigin` is set\n"
+"- `HLSPL`: name of variant playlist, can use templates\n"
 "- `HLSMExt`: list of extensions to add to master playlist entries, 'foo','bar=val' added as `,foo,bar=val`\n"
 "- `HLSVExt`: list of extensions to add to variant playlist, '#foo','#bar=val' added as `#foo \\n #bar=val`\n"
 "- Non-dash properties: `Bitrate`, `SAR`, `Language`, `Width`, `Height`, `SampleRate`, `NumChannels`, `Language`, `ID`, `DependencyID`, `FPS`, `Interlaced`, `Codec`. These properties are used to setup each representation and can be overridden on input PIDs using the general PID property settings (cf global help).\n"
@@ -9766,9 +10778,13 @@
 "\n"
 "The segmenter will create multiplexing filter chains for each representation and will reassign PID IDs so that each media component (video, audio, ...) in an adaptation set has the same ID.\n"
 "\n"
-"For HLS, the output PID will deliver the master playlist **and** the variant playlists.\n"
+"For HLS, the output manifest PID will deliver the master playlist **and** the variant playlists.\n"
 "The default variant playlist are $NAME_$N.m3u8, where $NAME is the radical of the output file name and $N is the 1-based index of the variant.\n"
 "\n"
+"When HLS mode is enabled, the segment -template() is relative to the variant playlist file, which can also be templated.\n"
+"EX gpac -i av.mp4:#HLSPL=$Type$/index.m3u8 -o dash/live.m3u8:dual:template='$Number$'\n"
+"This will put video segments and playlist in `dash/video/` and audio segments and playlist in `dash/audio/`\n"
+"\n"
 "## Segmentation\n"
 "The default behavior of the segmenter is to estimate the theoretical start time of each segment based on target segment duration, and start a new segment when a packet with SAP type 1,2,3 or 4 with time greater than the theoretical time is found.\n"
 "This behavior can be changed to find the best SAP packet around a segment theoretical boundary using -sbound():\n"
@@ -9779,9 +10795,9 @@
 "- completely ignore SAP when segmenting using -sap().\n"
 "- ignore SAP on non-video streams when segmenting using -strict_sap().\n"
 "\n"
-"The segmenter will by default announce a new segment in the manifest(s) as soon as its size/offset is known or its name is known, but the segment (or part in LL-HLS) may still not be completely written/sent.\n"
+"When -seg_sync() is disabled, the segmenter will by default announce a new segment in the manifest(s) as soon as its size/offset is known or its name is known, but the segment (or part in LL-HLS) may still not be completely written/sent.\n"
 "This may result in temporary mismatches between segment/part size currently received versus size as advertized in manifest.\n"
-"If the target destination cannot support this, use -seg_sync() to update manifest(s) only once segments/parts are completely flushed; this will however slightly increase the latency of manifest updates.\n"
+"When -seg_sync() is enabled, the segmenter will wait for the last byte of the fragment/segment to be pushed before announcing a new segment in the manifest(s). This can however slightly increase the latency in MPEG-DASH low-latency.\n"
 "\n"
 "## Dynamic (real-time live) Mode\n"
 "The dasher does not perform real-time regulation by default.\n"
@@ -9793,7 +10809,7 @@
 "- asto: set the availability time offset for DASH. This value should be equal or slightly greater than segment duration minus cdur\n"
 "- llhls: enable low latency for HLS\n"
 "\n"
-"Note: -llhls() will force CMAF to `cmfc` if -cmaf() is not set.\n"
+"Note: -llhls() does not force `cmaf` mode to allow for multiplexed media in segments but it enforces to `tfdt_traf` in the muxer.\n"
 "\n"
 "If your sources are not real-time, insert a reframer filter with real-time regulation\n"
 "EX gpac -i source.mp4 reframer:rt=on -o live.mpd:segdur=2:cdur=0.2:asto=1.8:profile=live:dmode=dynamic\n"
@@ -9881,6 +10897,25 @@
 "- second period clear\n"
 "- third period crypted with another key\n"
 "\n"
+"## Forced-Template mode\n"
+"When -tpl_force() is set, the -template() string is not analyzed nor modified for missing elements.\n"
+"This is typically used to redirect segments to a given destination regardless of the dash profile.\n"
+"EX gpac -i SRC -o null:ext=mpd:tpl_force --template=pipe://mypipe\n"
+"This will trash the manifest and open `mypipe` as destination for the muxer result.\n"
+"Warning: Options for segment destination cannot be set through the -template(), global options must be used.\n"
+"\n"
+"## Output redirecting\n"
+"When loaded implicitly during link resolution, the dasher will only link its outputs to the target sink\n"
+"EX gpac -i SRC -o URL1:OPTS1 -o URL2:OPTS1\n"
+"This will create one dasher (with options OPTS1) for the URL1 and one dasher (with options OPTS1) for URL2.\n"
+"This allows dashing to multiple outputs with different formats, dash durations, etc.\n"
+"\n"
+"It can be useful to redirect all the filter outputs to several sinks, for example to push through ROUTE and through HTTP the same segments.\n"
+"In order to do this, the filter MUST be explicitly loaded and all options related to dash and MP4 must be set either globally or on the dasher filter.\n"
+"EX gpac -i SRC dasher:cmfc:segdur=2 -o URL1 -o URL2\n"
+"This will create a single dasher whose outputs (manifests and segments) will be redirected to the given URLs.\n"
+"When explicitly loading the filter, the -dual() option will be disabled unless -mname() is set to the alternate output name.\n"
+"\n"
 "## Multiplexer development considerations\n"
 "Output multiplexers allowing segmented output must obey the following:\n"
 "- inspect packet properties\n"
@@ -9924,4 +10959,4 @@
 {
 	return NULL;
 }
-#endif /*#if !defined(GPAC_DISABLE_MPD)*/
+#endif // GPAC_DISABLE_DASHER

gpac-2.2.1.tar.gz/src/filters/dec_bifs.c -> gpac-2.4.0.tar.gz/src/filters/dec_bifs.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2022
+ *			Copyright (c) Telecom ParisTech 2000-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / BIFS decoder filter
@@ -29,7 +29,7 @@
 #include <gpac/compositor.h>
 #include <gpac/internal/compositor_dev.h>
 
-#ifndef GPAC_DISABLE_BIFS
+#if !defined(GPAC_DISABLE_BIFS) && !defined(GPAC_DISABLE_COMPOSITOR)
 
 
 typedef struct
@@ -167,9 +167,8 @@
 		GF_FilterPid *opid = gf_filter_pid_get_udta(pid);
 
 		GF_ObjectManager *odm = gf_filter_pid_get_udta(opid);
-		if (!odm) continue;
 		//object clock shall be valid
-		assert(odm->ck);
+		if (!odm || !odm->ck) continue;
 
 		pck = gf_filter_pid_get_packet(pid);
 		if (!pck) {
@@ -280,14 +279,14 @@
 	.process_event = bifs_dec_process_event,
 };
 
-#endif /*GPAC_DISABLE_BIFS*/
+#endif //!defined(GPAC_DISABLE_BIFS) && !defined(GPAC_DISABLE_COMPOSITOR)
 
-const GF_FilterRegister *bifs_dec_register(GF_FilterSession *session)
+const GF_FilterRegister *bifsdec_register(GF_FilterSession *session)
 {
-#ifdef GPAC_DISABLE_BIFS
-	return NULL;
-#else
+#if !defined(GPAC_DISABLE_BIFS) && !defined(GPAC_DISABLE_COMPOSITOR)
 	return &BIFSDecRegister;
+#else
+	return NULL;
 #endif /*GPAC_DISABLE_BIFS*/
 }

gpac-2.4.0.tar.gz/src/filters/dec_cc.c Added

@@ -0,0 +1,600 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2023
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / Closed captions decode filter
+ *
+ *  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/filters.h>
+#include <gpac/tools.h>
+#include <gpac/avparse.h>
+#include <gpac/internal/media_dev.h>
+
+#define GF_ITU_T35_PROVIDER_ATSC	49
+
+#ifdef GPAC_HAS_LIBCAPTION
+#include <caption/cea708.h>
+
+#if defined(WIN32) || defined(_WIN32_WCE)
+#if !defined(__GNUC__)
+#pragma comment(lib, "libcaption")
+#endif
+#endif
+
+enum
+{
+	CCTYPE_UNK=0,
+	CCTYPE_M2V,
+	CCTYPE_M4V,
+	CCTYPE_OBU,
+	CCTYPE_AVC,
+	CCTYPE_HEVC,
+	CCTYPE_VVC,
+};
+
+typedef struct
+{
+	u8 *data;
+	u32 size;
+	Bool is_m2v;
+	u64 timestamp;
+} CCItem;
+
+typedef struct
+{
+	GF_FilterPid *ipid;
+	GF_FilterPid *opid;
+	u32 cctype;
+	u32 nalu_size_len;
+	GF_List *cc_queue;
+
+	u32 timescale;
+#ifdef GPAC_HAS_LIBCAPTION
+	caption_frame_t *ccframe;
+	u32 cc_last_crc;
+	u64 last_ts_plus_one;
+#endif
+	GF_BitStream *bs;
+} CCDecCtx;
+
+
+GF_Err ccdec_configure_pid(GF_Filter *filter, GF_FilterPid *pid, Bool is_remove)
+{
+	CCDecCtx *ctx = gf_filter_get_udta(filter);
+	GF_FilterPid *out_pid;
+	const GF_PropertyValue *prop;
+
+	if (is_remove) {
+		out_pid = gf_filter_pid_get_udta(pid);
+		if (out_pid==ctx->opid)
+			ctx->opid = NULL;
+		if (out_pid)
+			gf_filter_pid_remove(out_pid);
+		return GF_OK;
+	}
+
+	if (!gf_filter_pid_check_caps(pid))
+		return GF_NOT_SUPPORTED;
+
+	if (!ctx->opid) {
+		ctx->opid = gf_filter_pid_new(filter);
+		if (!ctx->opid) return GF_OUT_OF_MEM;
+		gf_filter_pid_set_udta(pid, ctx->opid);
+	}
+	ctx->ipid = pid;
+	gf_filter_pid_set_framing_mode(pid, GF_TRUE);
+
+	//copy properties at init or reconfig
+	gf_filter_pid_copy_properties(ctx->opid, pid);
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_STREAM_TYPE, &PROP_UINT(GF_STREAM_TEXT) );
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_CODECID, &PROP_UINT(GF_CODECID_SIMPLE_TEXT) );
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_UNFRAMED, &PROP_BOOL(GF_TRUE) );
+
+	prop = gf_filter_pid_get_property(pid, GF_PROP_PID_TIMESCALE);
+	ctx->timescale = prop ? prop->value.uint : 1000;
+
+	ctx->cctype = CCTYPE_UNK;
+	prop = gf_filter_pid_get_property(pid, GF_PROP_PID_CODECID);
+	if (!prop) return GF_BAD_PARAM;
+	switch (prop->value.uint) {
+#ifndef GPAC_DISABLE_AV_PARSERS
+	case GF_CODECID_MPEG2_422:
+	case GF_CODECID_MPEG2_SNR:
+	case GF_CODECID_MPEG2_HIGH:
+	case GF_CODECID_MPEG2_MAIN:
+	case GF_CODECID_MPEG2_SIMPLE:
+	case GF_CODECID_MPEG2_SPATIAL:
+		ctx->cctype = CCTYPE_M2V;
+		break;
+	case GF_CODECID_MPEG4_PART2:
+		ctx->cctype = CCTYPE_M4V;
+		break;
+#endif
+	case GF_CODECID_AV1:
+		ctx->cctype = CCTYPE_OBU;
+		break;
+	case GF_CODECID_AVC:
+		prop = gf_filter_pid_get_property(pid, GF_PROP_PID_DECODER_CONFIG);
+		if (prop) {
+			GF_AVCConfig *avcc = gf_odf_avc_cfg_read(prop->value.data.ptr, prop->value.data.size);
+			if (avcc) {
+				ctx->nalu_size_len = avcc->nal_unit_size;
+				gf_odf_avc_cfg_del(avcc);
+				ctx->cctype = CCTYPE_AVC;
+			} else {
+				return GF_NON_COMPLIANT_BITSTREAM;
+			}
+		} else {
+			return GF_OK;
+		}
+		break;
+	case GF_CODECID_HEVC:
+		prop = gf_filter_pid_get_property(pid, GF_PROP_PID_DECODER_CONFIG);
+		if (prop) {
+			GF_HEVCConfig *hvcc = gf_odf_hevc_cfg_read(prop->value.data.ptr, prop->value.data.size, GF_FALSE);
+			if (hvcc) {
+				ctx->nalu_size_len = hvcc->nal_unit_size;
+				gf_odf_hevc_cfg_del(hvcc);
+				ctx->cctype = CCTYPE_HEVC;
+			} else {
+				return GF_NON_COMPLIANT_BITSTREAM;
+			}
+		} else {
+			return GF_OK;
+		}
+		break;
+	case GF_CODECID_VVC:
+		prop = gf_filter_pid_get_property(pid, GF_PROP_PID_DECODER_CONFIG);
+		if (prop) {
+			GF_VVCConfig *vvcc = gf_odf_vvc_cfg_read(prop->value.data.ptr, prop->value.data.size);
+			if (vvcc) {
+				ctx->nalu_size_len = vvcc->nal_unit_size;
+				gf_odf_vvc_cfg_del(vvcc);
+				ctx->cctype = CCTYPE_VVC;
+			} else {
+				return GF_NON_COMPLIANT_BITSTREAM;
+			}
+		} else {
+			return GF_OK;
+		}
+		break;
+	}
+	if (ctx->cctype == CCTYPE_UNK) return GF_NOT_SUPPORTED;
+
+	return GF_OK;
+}
+
+u32 gf_m4v_parser_get_obj_type(GF_M4VParser *m4v);
+void gf_m4v_parser_set_inspect(GF_M4VParser *m4v);
+
+static GF_Err ccdec_flush_queue(CCDecCtx *ctx)
+{
+	CCItem *cc = gf_list_pop_front(ctx->cc_queue);
+	if (!cc) return GF_EOS;
+
+	cea708_t scc;
+	cea708_init(&scc, 0);
+	if (cc->is_m2v)
+		cea708_parse_h262(cc->data, cc->size, &scc);
+	else
+		cea708_parse_h264(cc->data, cc->size, &scc);
+
+	u64 ts = cc->timestamp;
+	u32 i, count = cea708_cc_count(&scc.user_data);
+	libcaption_stauts_t status = LIBCAPTION_OK;
+	if (!ctx->ccframe) {
+		GF_SAFEALLOC(ctx->ccframe, caption_frame_t);
+		caption_frame_init(ctx->ccframe);
+	}
+	Double timestamp = (Double) cc->timestamp;
+	timestamp /= ctx->timescale;
+	Bool dump_frame = GF_FALSE;
+	if (!ctx->last_ts_plus_one)
+		ctx->last_ts_plus_one = ts+1;
+
+	for (i = 0; i < count; ++i) {
+		int valid;
+		cea708_cc_type_t type;
+		uint16_t cc_data = cea708_cc_data(&scc.user_data, i, &valid, &type);
+
+		if (valid
+			&& ((cc_type_ntsc_cc_field_1 == type) || (cc_type_ntsc_cc_field_2 == type))
+		) {
+			status = libcaption_status_update(status, caption_frame_decode(ctx->ccframe, cc_data, timestamp));
+			if (status == LIBCAPTION_READY) {
+				dump_frame = GF_TRUE;
+			}
+		}
+	}
+	gf_free(cc->data);
+	gf_free(cc);
+
+	if (!dump_frame) return GF_OK;
+
+	u8 txtdataCAPTION_FRAME_TEXT_BYTES+1;
+	u32 size = (u32) caption_frame_to_text(ctx->ccframe, txtdata);
+	u32 crc = gf_crc_32(txtdata, size);
+	if (crc!=ctx->cc_last_crc) {
+		ctx->cc_last_crc = crc;
+	} else {
+		size=0;
+	}
+	if (!size) {
+		ctx->last_ts_plus_one = ts+1;
+		return GF_OK;
+	}
+	u8 *output;
+	GF_FilterPacket *pck = gf_filter_pck_new_alloc(ctx->opid, size+1, &output);
+	if (!pck) return GF_OUT_OF_MEM;
+	memcpy(output, txtdata, size);
+	outputsize = 0;
+	gf_filter_pck_truncate(pck, size);
+	gf_filter_pck_set_framing(pck, GF_TRUE, GF_TRUE);
+	gf_filter_pck_set_sap(pck, GF_FILTER_SAP_1);
+	gf_filter_pck_set_cts(pck, ctx->last_ts_plus_one-1);
+	gf_filter_pck_set_duration(pck, (u32) (ts - ctx->last_ts_plus_one+1));
+	ctx->last_ts_plus_one = ts+1;
+
+	gf_filter_pck_send(pck);
+	return GF_OK;
+}
+
+static GF_Err ccdec_queue_data(CCDecCtx *ctx, u64 ts, u8 *data, u32 max_size, Bool m2v, Bool keep_data)
+{
+	//for m2v, check if the udta is indeed a CC
+	if (m2v) {
+		if (max_size<7) {
+			if (keep_data) gf_free(data);
+			return GF_OK;
+		}
+		u32 udta_id = GF_4CC(data0, data1, data2, data3);
+		u32 udta_code = 0;
+		if (udta_id==GF_4CC('G','A','9','4'))
+			udta_code = data4;
+		else if (udta_id==GF_4CC('D','T','G','1'))
+			udta_code = data4;
+
+		if (udta_code == 3) {
+			u32 cc_count = (data5 & 0x1F);
+			cc_count *= 3;
+			if (max_size<7+cc_count) {
+				if (keep_data) gf_free(data);
+				return GF_OK;
+			}
+			max_size = 7+cc_count;
+		}
+	}
+	//otherwise check was done in sei / OBU Metadata parsing
+
+	CCItem *it;
+	GF_SAFEALLOC(it, CCItem);
+	if (!it) {
+		if (keep_data) gf_free(data);
+		return GF_OUT_OF_MEM;
+	}
+	if (!keep_data) {
+		it->data = gf_malloc(sizeof(u8)*max_size);
+		if (!it->data) return GF_OUT_OF_MEM;
+		memcpy(it->data, data, sizeof(u8)*max_size);
+	} else {
+		it->data = data;
+	}
+	it->size = max_size;
+	it->timestamp = ts;
+	it->is_m2v = m2v;
+	Bool can_flush = GF_FALSE;
+	u32 i, count=gf_list_count(ctx->cc_queue);
+	for (i=0; i<count; i++) {
+		CCItem *an_it = gf_list_get(ctx->cc_queue, i);
+		if (an_it->timestamp > it->timestamp) {
+			gf_list_insert(ctx->cc_queue, it, i);
+			if (i)
+				can_flush = GF_TRUE;
+			it=NULL;
+			break;
+		}
+	}
+	if (it) gf_list_add(ctx->cc_queue, it);
+
+	while (can_flush) {
+		it = gf_list_get(ctx->cc_queue, 0);
+		if (it->timestamp>=ts) break;
+		ccdec_flush_queue(ctx);
+	}
+	return GF_OK;
+}
+
+
+GF_Err ccdec_process(GF_Filter *filter)
+{
+	GF_Err e;
+	u64 ts;
+	CCDecCtx *ctx = gf_filter_get_udta(filter);
+	const u8 *data;
+	u32 size;
+	GF_FilterPacket *pck = gf_filter_pid_get_packet(ctx->ipid);
+	if (!pck) {
+		if (gf_filter_pid_is_eos(ctx->ipid)) {
+			while (gf_list_count(ctx->cc_queue)) {
+				ccdec_flush_queue(ctx);
+			}
+			gf_filter_pid_set_eos(ctx->opid);
+			return GF_EOS;
+		}
+		return GF_OK;
+	}
+	data = gf_filter_pck_get_data(pck, &size);
+	if (!data || !size) {
+		gf_filter_pid_drop_packet(ctx->ipid);
+		return GF_OK;
+	}
+	ts = gf_filter_pck_get_cts(pck);
+
+#ifndef GPAC_DISABLE_AV_PARSERS
+	if (ctx->cctype<=CCTYPE_M4V) {
+		GF_M4VParser *m4v = gf_m4v_parser_new((u8*)data, size, (ctx->cctype==CCTYPE_M2V) ? GF_TRUE : GF_FALSE);
+		gf_m4v_parser_set_inspect(m4v);
+
+		while (1) {
+			u8 ftype = 0;
+			u32 tinc, o_type;
+			u64 fsize;
+			u64 start;
+			GF_M4VDecSpecInfo dsi;
+			Bool is_coded = GF_FALSE;
+			e = gf_m4v_parse_frame(m4v, &dsi, &ftype, &tinc, &fsize, &start, &is_coded);
+			if (e<0)
+				break;
+
+			o_type = gf_m4v_parser_get_obj_type(m4v);
+			if (ctx->cctype==CCTYPE_M4V) {
+				switch (o_type) {
+				case M4V_UDTA_START_CODE:
+					ccdec_queue_data(ctx, ts, (u8*) data + start+4, (u32) (size-start-4), GF_TRUE, GF_FALSE);
+					break;
+				default:
+					break;
+				}
+			} else {
+				switch (o_type) {
+				case M2V_UDTA_START_CODE:
+					start = gf_m4v_get_object_start(m4v);
+					ccdec_queue_data(ctx, ts, (u8*) data + start+4, (u32) (size-start-4), GF_TRUE, GF_FALSE);
+					break;
+				}
+			}
+			if (e)
+				break;
+		}
+		gf_m4v_parser_del(m4v);
+	} else if (ctx->cctype==CCTYPE_OBU) {
+		if (!ctx->bs) ctx->bs = gf_bs_new(data, size, GF_BITSTREAM_READ);
+		else gf_bs_reassign_buffer(ctx->bs, data, size);
+
+		while (size) {
+			ObuType obu_type = 0;
+			u32 obu_hdr_size;
+			u8 temporal_id, spatial_id;
+			u64 obu_size = 0;
+			Bool obu_extension_flag, obu_has_size_field;
+			u64 obu_start = (u32) gf_bs_get_position(ctx->bs);
+
+			gf_av1_parse_obu_header(ctx->bs, &obu_type, &obu_extension_flag, &obu_has_size_field, &temporal_id, &spatial_id);
+			obu_hdr_size = (u32) (gf_bs_get_position(ctx->bs) - obu_start);
+
+			if (obu_has_size_field) {
+				obu_size = (u32)gf_av1_leb128_read(ctx->bs, NULL);
+				obu_hdr_size = (u32) (gf_bs_get_position(ctx->bs) - obu_start);
+			} else {
+				obu_size = size - (u32) gf_bs_get_position(ctx->bs);
+			}
+			gf_bs_seek(ctx->bs, obu_start);
+
+			if (obu_type==OBU_METADATA) {
+				gf_bs_skip_bytes(ctx->bs, obu_hdr_size);
+				u32 country_code = gf_bs_read_u8(ctx->bs);
+				if (country_code == 0xFF) {
+					/*u32 country_code_extension = */gf_bs_read_u8(ctx->bs);
+				}
+				u32 terminal_provider_code = gf_bs_read_u16(ctx->bs);
+				if (terminal_provider_code==GF_ITU_T35_PROVIDER_ATSC) {
+					ccdec_queue_data(ctx, ts, (u8*) data + obu_start + obu_hdr_size, (u32) obu_size, GF_FALSE, GF_FALSE);
+				}
+				gf_bs_seek(ctx->bs, obu_start);
+			}
+			obu_size += obu_hdr_size;
+			if (size < obu_size) break;
+			gf_bs_skip_bytes(ctx->bs, obu_size);
+			size -= (u32) ( obu_size + obu_hdr_size);
+		}
+	} else
+#endif // GPAC_DISABLE_AV_PARSERS
+
+	//NALU-based: look for SEI messages
+	{
+		while (size) {
+			u32 sei_h_size=0;
+			u8 nal_type;
+			u32 nal_size = 0;
+			u32 v = ctx->nalu_size_len;
+			while (v) {
+				nal_size |= (u8) *data;
+				data++;
+				v -= 1;
+				if (v) nal_size <<= 8;
+			}
+			if (ctx->nalu_size_len + nal_size > size) {
+				break;
+			}
+			if (ctx->cctype==CCTYPE_AVC) {
+				nal_type = data0 & 0x1F;
+				if (nal_type==GF_AVC_NALU_SEI) sei_h_size = 1;
+			} else if (ctx->cctype==CCTYPE_HEVC) {
+				nal_type = (data0 & 0x7E) >> 1;
+				if (nal_type==GF_HEVC_NALU_SEI_PREFIX) sei_h_size = 2;
+				else if (nal_type==GF_HEVC_NALU_SEI_SUFFIX) sei_h_size = 2;
+			} else {
+				nal_type = data1>>3;
+				if (nal_type==GF_VVC_NALU_SEI_PREFIX) sei_h_size = 2;
+				else if (nal_type==GF_VVC_NALU_SEI_SUFFIX) sei_h_size = 2;
+			}
+			//we have an sei message, parse it using EBP removal
+			if (sei_h_size) {
+				if (!ctx->bs) ctx->bs = gf_bs_new(data, nal_size, GF_BITSTREAM_READ);
+				else gf_bs_reassign_buffer(ctx->bs, data, nal_size);
+				gf_bs_enable_emulation_byte_removal(ctx->bs, GF_TRUE);
+
+				//skip nal header
+				gf_bs_read_int(ctx->bs, sei_h_size*8);
+
+				while (gf_bs_available(ctx->bs) ) {
+					u32 i;
+					u32 sei_type = 0;
+					u32 sei_size = 0;
+					while (gf_bs_peek_bits(ctx->bs, 8, 0) == 0xFF) {
+						sei_type += 255;
+						gf_bs_read_int(ctx->bs, 8);
+					}
+					sei_type += gf_bs_read_int(ctx->bs, 8);
+					while (gf_bs_peek_bits(ctx->bs, 8, 0) == 0xFF) {
+						sei_size += 255;
+						gf_bs_read_int(ctx->bs, 8);
+					}
+					sei_size += gf_bs_read_int(ctx->bs, 8);
+
+					i=0;
+					if (sei_type == 4) {
+						//queuue
+						u32 pos = (u32) gf_bs_get_position(ctx->bs);
+						u32 country_code = gf_bs_read_u8(ctx->bs);
+						i++;
+						if (country_code == 0xFF) {
+							/*u32 country_code_extension = */gf_bs_read_u8(ctx->bs);
+							i++;
+						}
+						u32 terminal_provider_code = gf_bs_read_u16(ctx->bs);
+						i+=2;
+						if (terminal_provider_code==GF_ITU_T35_PROVIDER_ATSC) {
+							u8 *data = gf_malloc(sizeof(u8)*sei_size);
+							gf_bs_seek(ctx->bs, pos);
+							i=0;
+							while (i<sei_size) {
+								datai = gf_bs_read_u8(ctx->bs);
+								i++;
+							}
+							ccdec_queue_data(ctx, ts, (u8*) data, sei_size, GF_FALSE, GF_TRUE);
+						}
+					}
+					while (i < sei_size) {
+						gf_bs_read_u8(ctx->bs);
+						i++;
+					}
+					if (gf_bs_peek_bits(ctx->bs, 8, 0) == 0x80) {
+						break;
+					}
+				}
+			}
+			data += nal_size;
+			size -= nal_size + ctx->nalu_size_len;
+		}
+	}
+
+	gf_filter_pid_drop_packet(ctx->ipid);
+	return GF_OK;
+}
+
+static GF_Err ccdec_initialize(GF_Filter *filter)
+{
+	CCDecCtx *ctx = gf_filter_get_udta(filter);
+	ctx->cc_queue = gf_list_new();
+	if (!ctx->cc_queue) return GF_OUT_OF_MEM;
+	return GF_OK;
+}
+
+static void ccdec_finalize(GF_Filter *filter)
+{
+	CCDecCtx *ctx = gf_filter_get_udta(filter);
+	while (gf_list_count(ctx->cc_queue)) {
+		CCItem *cc = gf_list_pop_back(ctx->cc_queue);
+		gf_free(cc->data);
+		gf_free(cc);
+	}
+	gf_list_del(ctx->cc_queue);
+	if (ctx->bs) gf_bs_del(ctx->bs);
+	if (ctx->ccframe) gf_free(ctx->ccframe);
+}
+
+static Bool ccdec_process_event(GF_Filter *filter, const GF_FilterEvent *evt)
+{
+	CCDecCtx *ctx = gf_filter_get_udta(filter);
+	if (evt->base.type==GF_FEVT_PLAY) {
+		if (ctx->ccframe) caption_frame_init(ctx->ccframe);
+	}
+	return GF_FALSE;
+}
+
+static const GF_FilterCapability CCDecCaps =
+{
+	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_STREAM_TYPE, GF_STREAM_VISUAL),
+	CAP_BOOL(GF_CAPS_INPUT_EXCLUDED, GF_PROP_PID_UNFRAMED, GF_TRUE),
+	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_CODECID, GF_CODECID_MPEG2_422),
+	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_CODECID, GF_CODECID_MPEG2_SNR),
+	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_CODECID, GF_CODECID_MPEG2_HIGH),
+	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_CODECID, GF_CODECID_MPEG2_MAIN),
+	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_CODECID, GF_CODECID_MPEG2_SIMPLE),
+	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_CODECID, GF_CODECID_MPEG2_SPATIAL),
+	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_CODECID, GF_CODECID_MPEG4_PART2),
+	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_CODECID, GF_CODECID_AVC),
+	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_CODECID, GF_CODECID_HEVC),
+	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_CODECID, GF_CODECID_VVC),
+	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_CODECID, GF_CODECID_AV1),
+
+	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_TEXT),
+	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_CODECID, GF_CODECID_SIMPLE_TEXT),
+	CAP_BOOL(GF_CAPS_OUTPUT, GF_PROP_PID_UNFRAMED, GF_TRUE),
+};
+
+GF_FilterRegister CCDecRegister = {
+	.name = "ccdec",
+	GF_FS_SET_DESCRIPTION("Closed-Caption decoder")
+	GF_FS_SET_HELP("This filter decodes Closed Captions to unframed SRT.\n"
+	"Supported video media types are MPEG2, AVC, HEVC, VVC and AV1 streams.\n"
+	"\nOnly a subset of CEA 608/708 is supported.")
+	.private_size = sizeof(CCDecCtx),
+	.flags = GF_FS_REG_EXPLICIT_ONLY,
+	SETCAPS(CCDecCaps),
+	.initialize = ccdec_initialize,
+	.finalize = ccdec_finalize,
+	.process = ccdec_process,
+	.configure_pid = ccdec_configure_pid,
+	.process_event = ccdec_process_event,
+};
+
+const GF_FilterRegister *ccdec_register(GF_FilterSession *session)
+{
+	return &CCDecRegister;
+}
+#else //GPAC_HAS_LIBCAPTION
+const GF_FilterRegister *ccdec_register(GF_FilterSession *session)
+{
+	return NULL;
+}
+#endif // GPAC_DISABLE_CCDEC

gpac-2.2.1.tar.gz/src/filters/dec_faad.c -> gpac-2.4.0.tar.gz/src/filters/dec_faad.c Changed

gpac-2.2.1.tar.gz/src/filters/dec_img.c -> gpac-2.4.0.tar.gz/src/filters/dec_img.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2021
+ *			Copyright (c) Telecom ParisTech 2000-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / libjpeg and libpng decoder filter
@@ -27,6 +27,8 @@
 #include <gpac/constants.h>
 #include <gpac/avparse.h>
 
+#ifndef GPAC_DISABLE_IMGDEC
+
 typedef struct
 {
 	u32 codecid;
@@ -62,6 +64,8 @@
 	//copy properties at init or reconfig
 	gf_filter_pid_copy_properties(ctx->opid, ctx->ipid);
 	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_CODECID, & PROP_UINT( GF_CODECID_RAW ));
+	//declare a default pixel format - this avoids bad reconfigurations of ffavf
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_PIXFMT, & PROP_UINT( GF_PIXEL_RGB ));
 
 	if (ctx->codecid==GF_CODECID_JPEG) {
 		gf_filter_set_name(filter, "imgdec:libjpeg");
@@ -174,3 +178,10 @@
 {
 	return &ImgDecRegister;
 }
+#else
+const GF_FilterRegister *imgdec_register(GF_FilterSession *session)
+{
+	return NULL;
+}
+#endif // GPAC_DISABLE_IMGDEC
+

gpac-2.2.1.tar.gz/src/filters/dec_laser.c -> gpac-2.4.0.tar.gz/src/filters/dec_laser.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2005-2022
+ *			Copyright (c) Telecom ParisTech 2005-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / LASeR decoder filter
@@ -25,7 +25,7 @@
 
 #include <gpac/filters.h>
 
-#ifndef GPAC_DISABLE_LASER
+#if !defined(GPAC_DISABLE_LASER) && !defined(GPAC_DISABLE_COMPOSITOR)
 
 #include <gpac/internal/compositor_dev.h>
 #include <gpac/laser.h>
@@ -178,9 +178,8 @@
 		GF_FilterPid *opid = gf_filter_pid_get_udta(pid);
 
 		GF_ObjectManager *odm = gf_filter_pid_get_udta(opid);
-		if (!odm) continue;
 		//object clock shall be valid
-		assert(odm->ck);
+		if (!odm || !odm->ck) continue;
 
 		pck = gf_filter_pid_get_packet(pid);
 		if (!pck) {
@@ -263,14 +262,14 @@
 	.process_event = lsrdec_process_event,
 };
 
-#endif /*GPAC_DISABLE_LASER*/
+#endif //!defined(GPAC_DISABLE_LASER) && !defined(GPAC_DISABLE_COMPOSITOR)
 
 const GF_FilterRegister *lsrdec_register(GF_FilterSession *session)
 {
-#ifdef GPAC_DISABLE_LASER
-	return NULL;
-#else
+#if !defined(GPAC_DISABLE_LASER) && !defined(GPAC_DISABLE_COMPOSITOR)
 	return &LSRDecRegister;
+#else
+	return NULL;
 #endif /*GPAC_DISABLE_LASER*/
 }

gpac-2.2.1.tar.gz/src/filters/dec_mediacodec.c -> gpac-2.4.0.tar.gz/src/filters/dec_mediacodec.c Changed

gpac-2.4.0.tar.gz/src/filters/dec_mpeghdec.c Added

@@ -0,0 +1,359 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2023
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / MPEG-H Audio decoder using IIS MPEGHDecoder filter
+ *
+ *  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/filters.h>
+#include <gpac/constants.h>
+
+#ifdef GPAC_HAS_MPEGHDECODER
+
+#ifdef __GNUC__
+#pragma GCC diagnostic ignored "-Wunknown-pragmas"
+#endif
+
+#if !defined(__GNUC__)
+# if defined(_WIN32_WCE) || defined (WIN32)
+#  pragma comment(lib, "SYS")
+#  pragma comment(lib, "FDK")
+#  pragma comment(lib, "DRCdec")
+#  pragma comment(lib, "PCMutils")
+#  pragma comment(lib, "MpeghDec")
+#  pragma comment(lib, "IGFdec")
+#  pragma comment(lib, "ArithCoding")
+#  pragma comment(lib, "FormatConverter")
+#  pragma comment(lib, "UIManager")
+#  pragma comment(lib, "gVBAPRenderer")
+#  pragma comment(lib, "MpegTPDec")
+# endif
+#endif
+
+#ifndef bool
+typedef int bool;
+#endif
+
+#include <mpeghdecoder.h>
+#include <gpac/constants.h>
+#include <gpac/avparse.h>
+
+
+typedef struct
+{
+	u32 cicp_idx;
+	HANDLE_MPEGH_DECODER_CONTEXT codec;
+
+	u32 sample_rate, timescale;
+	s64 delay;
+	u8 num_channels;
+
+	GF_FilterPid *ipid, *opid;
+	u32 cfg_crc;
+	u32 osize;
+	u32 flush_state;
+	GF_List *src_pcks;
+} MPEGHDecCtx;
+
+#define MPEGH_MAX_FRAME_SIZE	3072
+
+static GF_Err mpegh_dec_configure_pid(GF_Filter *filter, GF_FilterPid *pid, Bool is_remove)
+{
+	const GF_PropertyValue *p, *dsi;
+	u32 codec_id;
+	MPEGHDecCtx *ctx = gf_filter_get_udta(filter);
+
+	if (is_remove) {
+		if (ctx->opid) {
+			gf_filter_pid_remove(ctx->opid);
+			ctx->opid = NULL;
+		}
+		ctx->ipid = NULL;
+		return GF_OK;
+	}
+	if (! gf_filter_pid_check_caps(pid))
+		return GF_NOT_SUPPORTED;
+
+	if (!ctx->opid) {
+		ctx->opid = gf_filter_pid_new(filter);
+	}
+	//copy properties at init or reconfig
+	gf_filter_pid_copy_properties(ctx->opid, pid);
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_CODECID, &PROP_UINT(GF_CODECID_RAW) );
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_AUDIO_FORMAT, &PROP_UINT(GF_AUDIO_FMT_S32) );
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_DECODER_CONFIG, NULL );
+	ctx->ipid = pid;
+
+
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_CODECID);
+	codec_id = p ? p->value.uint : 0;
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_TIMESCALE);
+	ctx->timescale = p ? p->value.uint : 1000;
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_SAMPLE_RATE);
+	ctx->sample_rate = p ? p->value.uint : 44100;
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_NUM_CHANNELS);
+	ctx->num_channels = p ? p->value.uint : 1;
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_DELAY);
+	ctx->delay = p ? p->value.longsint : 0;
+
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_NO_PRIMING);
+	//force re-priming
+	if (p && !p->value.boolean) {
+		ctx->cfg_crc = 0;
+	}
+
+	if (codec_id==GF_CODECID_MPHA) {
+		dsi = gf_filter_pid_get_property(pid, GF_PROP_PID_DECODER_CONFIG);
+		if (dsi && dsi->value.data.ptr && dsi->value.data.size) {
+			u32 ex_crc = gf_crc_32(dsi->value.data.ptr, dsi->value.data.size);
+			if (ctx->cfg_crc == ex_crc)
+				return GF_OK;
+			ctx->cfg_crc = ex_crc;
+			//do not reset, use API
+		} else {
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("MPEGHDec Reconfiguring but no DSI set, skipping\n"));
+			return GF_OK;
+		}
+	} else {
+		dsi = NULL;
+	}
+
+	if (!ctx->codec)
+		ctx->codec = mpeghdecoder_init(ctx->cicp_idx);
+
+	if (!ctx->codec) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("MPEGHDec Error initializing decoder\n"));
+		return GF_IO_ERR;
+	}
+
+	//init dec
+	if (dsi) {
+		//remove first 5 bytes of mhaC
+		if (dsi->value.data.size>5) {
+			MPEGH_DECODER_ERROR err = mpeghdecoder_setMhaConfig(ctx->codec, dsi->value.data.ptr+5, dsi->value.data.size-5);
+			if (err != MPEGH_DEC_OK) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("MPEGHDec Failed to set decoder params\n"));
+				return GF_NON_COMPLIANT_BITSTREAM;
+			}
+		} else {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("MPEGHDec Invalid decoder config, at least 5 bytes expected got %d\n", dsi->value.data.size));
+			return GF_NON_COMPLIANT_BITSTREAM;
+		}
+	}
+	ctx->osize = MPEGH_MAX_FRAME_SIZE * ctx->num_channels;
+
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_SAMPLE_RATE, &PROP_UINT(ctx->sample_rate) );
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_NUM_CHANNELS, &PROP_UINT(ctx->num_channels) );
+
+	gf_filter_pid_set_framing_mode(pid, GF_TRUE);
+	return GF_OK;
+}
+
+static GF_Err mpegh_dec_process(GF_Filter *filter)
+{
+	MPEGHDecCtx *ctx = gf_filter_get_udta(filter);
+	u32 pck_size;
+	Bool is_eos = GF_FALSE;
+	MPEGH_DECODER_ERROR err;
+	GF_FilterPacket *dst_pck;
+	GF_FilterPacket *pck = gf_filter_pid_get_packet(ctx->ipid);
+
+	if (!pck) {
+		is_eos = gf_filter_pid_is_eos(ctx->ipid);
+		if (!is_eos) return GF_OK;
+		//eos
+		if (!ctx->flush_state) {
+			err = mpeghdecoder_flushAndGet(ctx->codec);
+			if (err != MPEGH_DEC_OK) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("MPEGHDec Error flushing: %d\n", err));
+			}
+			ctx->flush_state = 1;
+		} else if (ctx->flush_state == 2) {
+			return GF_EOS;
+		}
+	} else {
+		const u8 *data = gf_filter_pck_get_data(pck, &pck_size);
+		u64 ts = gf_filter_pck_get_cts(pck);
+		Bool is_seek = gf_filter_pck_get_seek_flag(pck);
+		if (is_seek)
+			mpeghdecoder_flush(ctx->codec);
+
+		ts = gf_timestamp_rescale(ts, ctx->timescale, 1000000000);
+		err = mpeghdecoder_process(ctx->codec, data, pck_size, ts);
+
+		if (err == MPEGH_DEC_NEEDS_RESTART) {
+			mpeghdecoder_destroy(ctx->codec);
+			ctx->codec = NULL;
+			//reconfig and keep packet
+			return mpegh_dec_configure_pid(filter, ctx->ipid, GF_FALSE);
+		}
+		if (err != MPEGH_DEC_OK) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("MPEGHDec Error queuing frame: %d\n", err));
+		}
+
+		if (!is_seek) {
+			gf_filter_pck_ref_props(&pck);
+			gf_list_add(ctx->src_pcks, pck);
+		}
+
+		gf_filter_pid_drop_packet(ctx->ipid);
+	}
+
+	while (1) {
+		u8 *output;
+		MPEGH_DECODER_OUTPUT_INFO mphInfo;
+
+		dst_pck = gf_filter_pck_new_alloc(ctx->opid, ctx->osize*4, &output);
+		if (!dst_pck) return GF_OUT_OF_MEM;
+
+		err = mpeghdecoder_getSamples(ctx->codec, (s32*) output, ctx->osize, &mphInfo);
+		if (err != MPEGH_DEC_OK) {
+			gf_filter_pck_discard(dst_pck);
+			if (err == MPEGH_DEC_FEED_DATA) {
+				if (is_eos) {
+					gf_filter_pid_set_eos(ctx->opid);
+					ctx->flush_state = 2;
+					return GF_EOS;
+				}
+				return GF_OK;
+			}
+			if (err==MPEGH_DEC_BUFFER_ERROR) {
+				if (ctx->osize == MPEGH_MAX_FRAME_SIZE*24) return GF_NON_COMPLIANT_BITSTREAM;
+				ctx->osize += MPEGH_MAX_FRAME_SIZE;
+				continue;
+			}
+			return GF_NON_COMPLIANT_BITSTREAM;
+		}
+		if (!mphInfo.numSamplesPerChannel) {
+			gf_filter_pck_discard(dst_pck);
+			return GF_OK;
+		}
+
+		if (mphInfo.sampleRate != ctx->sample_rate) {
+			ctx->sample_rate = mphInfo.sampleRate;
+			gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_SAMPLE_RATE, &PROP_UINT(ctx->sample_rate) );
+		}
+		if (mphInfo.numChannels != ctx->num_channels) {
+			ctx->num_channels = mphInfo.numChannels;
+			gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_NUM_CHANNELS, &PROP_UINT(ctx->num_channels) );
+		}
+		gf_filter_pck_truncate(dst_pck, 4*mphInfo.numChannels*mphInfo.numSamplesPerChannel);
+
+		//look for src with same timestamp, copy over properties
+		u64 ts = gf_timestamp_rescale(mphInfo.pts, 1000000000, ctx->timescale);
+		while (1) {
+			pck = gf_list_get(ctx->src_pcks, 0);
+			if (!pck) break;
+			u64 src_ts = gf_filter_pck_get_cts(pck);
+			s64 diff = gf_timestamp_rescale_signed( (s64) src_ts - (s64) ts, ctx->timescale, 1000);
+			if (diff > -10) {
+				if (!diff) ts = src_ts;
+				break;
+			}
+			//ts too old, purge
+			gf_filter_pck_unref(pck);
+			gf_list_pop_front(ctx->src_pcks);
+			pck = NULL;
+		}
+		if (pck)
+			gf_filter_pck_merge_properties(pck, dst_pck);
+
+		gf_filter_pck_set_cts(dst_pck, ts);
+		gf_filter_pck_set_dts(dst_pck, ts);
+		gf_filter_pck_send(dst_pck);
+	}
+	return GF_OK;
+}
+
+static Bool mpegh_dec_process_event(GF_Filter *filter, const GF_FilterEvent *evt)
+{
+	if (evt->base.type==GF_FEVT_STOP) {
+		MPEGHDecCtx *ctx = gf_filter_get_udta(filter);
+		if (ctx->codec) mpeghdecoder_flush(ctx->codec);
+		ctx->flush_state = 0;
+		while (gf_list_count(ctx->src_pcks)) {
+			GF_FilterPacket *pck = gf_list_pop_back(ctx->src_pcks);
+			gf_filter_pck_unref(pck);
+		}
+	}
+	return GF_FALSE;
+}
+
+static GF_Err mpegh_dec_initialize(GF_Filter *filter)
+{
+	MPEGHDecCtx *ctx = gf_filter_get_udta(filter);
+	ctx->src_pcks = gf_list_new();
+	return GF_OK;
+}
+
+static void mpegh_dec_finalize(GF_Filter *filter)
+{
+	MPEGHDecCtx *ctx = gf_filter_get_udta(filter);
+	if (ctx->codec) mpeghdecoder_destroy(ctx->codec);
+	while (gf_list_count(ctx->src_pcks)) {
+		GF_FilterPacket *pck = gf_list_pop_back(ctx->src_pcks);
+		gf_filter_pck_unref(pck);
+	}
+	gf_list_del(ctx->src_pcks);
+}
+
+#define OFFS(_n)	#_n, offsetof(MPEGHDecCtx, _n)
+static GF_FilterArgs MPEGHDArgs =
+{
+	{ OFFS(cicp_idx), "target output layout CICP index (see gpac -h layouts)", GF_PROP_UINT, "2", NULL, 0},
+	{0}
+};
+
+static const GF_FilterCapability MPEGHDCaps =
+{
+	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_STREAM_TYPE, GF_STREAM_AUDIO),
+	CAP_BOOL(GF_CAPS_INPUT_EXCLUDED, GF_PROP_PID_UNFRAMED, GF_TRUE),
+	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_CODECID, GF_CODECID_MPHA),
+	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_CODECID, GF_CODECID_MHAS),
+	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_AUDIO),
+	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_CODECID, GF_CODECID_RAW),
+};
+
+GF_FilterRegister MPEGHDRegister = {
+	.name = "mpeghdec",
+	GF_FS_SET_DESCRIPTION("MPEG-H Audio decoder")
+	GF_FS_SET_HELP("This filter decodes MPEG-H audio streams through IIS MpeghDecoder library.")
+	.private_size = sizeof(MPEGHDecCtx),
+	SETCAPS(MPEGHDCaps),
+	.args = MPEGHDArgs,
+	.configure_pid = mpegh_dec_configure_pid,
+	.initialize = mpegh_dec_initialize,
+	.finalize = mpegh_dec_finalize,
+	.process = mpegh_dec_process,
+	.process_event = mpegh_dec_process_event,
+};
+
+const GF_FilterRegister *mpeghdec_register(GF_FilterSession *session)
+{
+	return &MPEGHDRegister;
+}
+#else
+const GF_FilterRegister *mpeghdec_register(GF_FilterSession *session)
+{
+	return NULL;
+}
+#endif //GPAC_HAS_MPEGHDECODER
+

gpac-2.2.1.tar.gz/src/filters/dec_nvdec.c -> gpac-2.4.0.tar.gz/src/filters/dec_nvdec.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2017-2022
+ *			Copyright (c) Telecom ParisTech 2017-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / NVidia Hardware decoder filter
@@ -28,11 +28,11 @@
 #include <gpac/constants.h>
 #include <gpac/filters.h>
 
-#if defined(GPAC_CONFIG_DARWIN) && defined(__arm64__)
+#if defined(GPAC_CONFIG_DARWIN) && defined(__arm64__) && !defined(GPAC_DISABLE_NVDEC)
 #define GPAC_DISABLE_NVDEC
 #endif
 
-#if (!defined(GPAC_STATIC_BUILD) && (defined(WIN32) || defined(GPAC_CONFIG_LINUX) || defined(GPAC_CONFIG_DARWIN)) && !defined(GPAC_DISABLE_NVDEC))
+#if (!defined(GPAC_STATIC_BIN) && (defined(WIN32) || defined(GPAC_CONFIG_LINUX) || defined(GPAC_CONFIG_DARWIN)) && !defined(GPAC_DISABLE_NVDEC))
 
 #include "dec_nvdec_sdk.h"
 
@@ -158,7 +158,7 @@
 	CUresult res;
 	CUVIDDECODECREATEINFO cuvid_info;
 
-	assert(ctx->dec_inst);
+	gf_assert(ctx->dec_inst);
 
 	memset(&cuvid_info, 0, sizeof(CUVIDDECODECREATEINFO));
 	cuvid_info.CodecType = ctx->codec_type;
@@ -191,7 +191,7 @@
 		return GF_IO_ERR;
 	}
 	global_nb_loaded_decoders++;
-	assert(global_nb_loaded_decoders);
+	gf_assert(global_nb_loaded_decoders);
 	ctx->dec_inst->id = global_nb_loaded_decoders;
 	ctx->dec_inst->th_id = gf_th_id();
 	GF_LOG(GF_LOG_INFO, GF_LOG_CODEC, ("NVDec decoder instance %d created (%dx%d) - %d total decoders loaded\n", ctx->dec_inst->id, ctx->width, ctx->height, global_nb_loaded_decoders) );
@@ -378,8 +378,8 @@
 	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_PIXFMT, &PROP_UINT(ctx->pix_fmt));
 
 
-	assert(ctx->out_size);
-	assert(ctx->stride);
+	gf_assert(ctx->out_size);
+	gf_assert(ctx->stride);
 	ctx->dec_inst->stride = ctx->stride;
 
 	if (! ctx->dec_inst->cu_decoder) {
@@ -603,7 +603,7 @@
 		if (ctx->unload == 2) {
 			global_nb_loaded_nvdec--;
 			if (ctx->dec_inst) {
-				assert(global_unactive_decoders);
+				gf_assert(global_unactive_decoders);
 				gf_mx_p(global_inst_mutex);
 				ctx->dec_inst->ctx = NULL;
 				gf_list_add(global_unactive_decoders, ctx->dec_inst);
@@ -658,6 +658,8 @@
 	if (!ctx->opid) {
 		ctx->opid = gf_filter_pid_new(filter);
 		nvdec_copy_props(ctx);
+		ctx->pix_fmt = GF_PIXEL_NV12;
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_PIXFMT, &PROP_UINT(ctx->pix_fmt));
 	}
 
 	gf_filter_pid_set_framing_mode(ctx->ipid, GF_TRUE);
@@ -763,6 +765,37 @@
 			gf_list_add(ctx->frames_res, f);
 		}
 	}
+	else if (evt->base.type == GF_FEVT_STOP) {
+		while (gf_list_count(ctx->frames)) {
+			NVDecFrame *f = gf_list_pop_back(ctx->frames);
+			gf_list_add(ctx->frames_res, f);
+		}
+		if (ctx->unload == 2) {
+			if (ctx->dec_inst) {
+				gf_assert(global_unactive_decoders);
+				gf_mx_p(global_inst_mutex);
+				if (ctx->decode_error) {
+					GF_LOG(GF_LOG_INFO, GF_LOG_CODEC, ("NVDec deactivating decoder %dx%d and destroying instance\n", ctx->width, ctx->height ) );
+					nvdec_destroy_decoder(ctx->dec_inst);
+				} else {
+					GF_LOG(GF_LOG_INFO, GF_LOG_CODEC, ("NVDec deactivating decoder %dx%d\n", ctx->width, ctx->height ) );
+				}
+				ctx->dec_inst->ctx = NULL;
+				gf_list_add(global_unactive_decoders, ctx->dec_inst);
+				ctx->dec_inst = NULL;
+				gf_mx_v(global_inst_mutex);
+			}
+			ctx->needs_resetup = 1;
+			ctx->dec_create_error = CUDA_SUCCESS;
+		} else {
+			if (ctx->dec_inst) {
+				nvdec_destroy_decoder(ctx->dec_inst);
+				ctx->dec_inst=0;
+			}
+			ctx->needs_resetup = 1;
+			ctx->dec_create_error = CUDA_SUCCESS;
+		}
+	}
 	return GF_FALSE;
 }
 
@@ -776,7 +809,7 @@
 		}
 		if (ctx->unload == 2) {
 			if (ctx->dec_inst) {
-				assert(global_unactive_decoders);
+				gf_assert(global_unactive_decoders);
 				gf_mx_p(global_inst_mutex);
 				if (ctx->decode_error) {
 					GF_LOG(GF_LOG_INFO, GF_LOG_CODEC, ("NVDec deactivating decoder %dx%d and destroying instance\n", ctx->width, ctx->height ) );
@@ -1015,7 +1048,7 @@
 		return nvdec_send_hw_frame(ctx, f);
 	}
 
-	assert(ctx->out_size);
+	gf_assert(ctx->out_size);
 	dst_pck = gf_filter_pck_new_alloc(ctx->opid, ctx->out_size, &output);
 	if (!dst_pck) return GF_OUT_OF_MEM;
 
@@ -1200,7 +1233,7 @@
 		GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("NVDec failed to map GL texture data %s\n", cudaGetErrorEnum(res) ) );
 		return GF_IO_ERR;
 	}
-	assert(tx_pitch != 0);
+	gf_assert(tx_pitch != 0);
 
 	memset(&params, 0, sizeof(params));
 	params.progressive_frame = f->frame_info.progressive_frame;
@@ -1212,7 +1245,7 @@
 		GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("NVDec failed to map decoded picture data %s\n", cudaGetErrorEnum(res) ) );
 		return GF_IO_ERR;
 	}
-	assert(vid_pitch != 0);
+	gf_assert(vid_pitch != 0);
 
 	memset(&mcpi, 0, sizeof(CUDA_MEMCPY2D));
 	mcpi.srcMemoryType = CU_MEMORYTYPE_DEVICE;
@@ -1430,7 +1463,16 @@
 #else
 		CUresult res;
 		int device_count;
-	    res = cuInit(0, __CUDA_API_VERSION);
+			const char *cuda_path = gf_opts_get_key("core", "cuda_lib");
+		if (!cuda_path) cuda_path = gf_opts_get_key("temp", "cuda_lib");
+		const char *cuvid_path = gf_opts_get_key("core", "cuvid_lib");
+		if (!cuvid_path) cuvid_path = gf_opts_get_key("temp", "cuvid_lib");
+
+	    res = cuInit(0, __CUDA_API_VERSION, cuda_path, cuvid_path);
+		if ((cuda_path||cuvid_path) && (res != CUDA_SUCCESS)) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_CODEC, ("NVDec loading cuda/cuvid with custom path failed, retrying with system path\n") );
+		    res = cuInit(0, __CUDA_API_VERSION, NULL, NULL);
+		}
 		cuvid_load_state = 1;
 		if (res == CUDA_ERROR_SHARED_OBJECT_INIT_FAILED) {
 			GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("NVDec cuda lib not found on system\n") );
@@ -1552,7 +1594,11 @@
 	GF_FS_SET_DESCRIPTION("NVidia decoder")
 	GF_FS_SET_HELP("This filter decodes MPEG-2, MPEG-4 Part 2, AVC|H264 and HEVC streams through NVidia decoder. It allows GPU frame dispatch or direct frame copy."
 	"\n"
-	"If the SDK is not available, the configuration key `nvdec@disabled` will be written in configuration file to avoid future load attempts.")
+	"If the SDK is not available, the configuration key `nvdec@disabled` will be written in configuration file to avoid future load attempts.\n"
+	"\n"
+	"The absolute path to cuda lib can be set using the `cuda_lib` option in `core` or `temp` section of the config file, e.g. `-cfg=temp:cuda_lib=PATH_TO_CUDA`\n"
+	"The absolute path to cuvid lib can be set using the `cuvid_lib` option in `core` or `temp` section of the config file, e.g. `-cfg=temp:cuvid_lib=PATH_TO_CUDA`\n"
+	)
 	.private_size = sizeof(NVDecCtx),
 	SETCAPS(NVDecCaps),
 	.flags = GF_FS_REG_CONFIGURE_MAIN_THREAD,
@@ -1581,6 +1627,10 @@
 	if (!gf_opts_get_bool("temp", "gendoc") && gf_opts_get_key("filter@nvdec", "disabled"))
 		return NULL;
 
+#ifdef GPAC_CONFIG_EMSCRIPTEN
+	return NULL;
+#endif
+
 	//check if nvdec is not globally blacklisted - if so, do not try to load CUDA SDK which may be time consuming on some devices
 	const char *blacklist = gf_opts_get_key("core", "blacklist");
 	if (blacklist && (blacklist0!='-') && strstr(blacklist, "nvdec"))
@@ -1606,4 +1656,4 @@
 {
 	return NULL;
 }
-#endif // (!defined(GPAC_STATIC_BUILD) && (defined(WIN32) || defined(GPAC_CONFIG_LINUX) || defined(GPAC_CONFIG_DARWIN)) && !defined(GPAC_DISABLE_NVDEC))
+#endif // (!defined(GPAC_STATIC_BIN) && (defined(WIN32) || defined(GPAC_CONFIG_LINUX) || defined(GPAC_CONFIG_DARWIN)) && !defined(GPAC_DISABLE_NVDEC))

gpac-2.2.1.tar.gz/src/filters/dec_nvdec_sdk.c -> gpac-2.4.0.tar.gz/src/filters/dec_nvdec_sdk.c Changed

@@ -197,7 +197,7 @@
 tcuvidMapVideoFrame                   *cuvidMapVideoFrame;
 tcuvidUnmapVideoFrame                 *cuvidUnmapVideoFrame;
 
-#if defined(WIN64) || defined(_WIN64) || defined(__x86_64) || defined(AMD64) || defined(_M_AMD64)
+#if defined(WIN64) || defined(_WIN64) || defined(__x86_64) || defined(AMD64) || defined(_M_AMD64) || defined(__aarch64__)
 tcuvidMapVideoFrame64                 *cuvidMapVideoFrame64;
 tcuvidUnmapVideoFrame64               *cuvidUnmapVideoFrame64;
 #endif
@@ -226,9 +226,9 @@
 typedef HMODULE CUDADRIVER;
 typedef HMODULE CUVIDDRIVER;
 
-static CUresult LOAD_LIBRARY_CUDA(CUDADRIVER *pInstance)
+static CUresult LOAD_LIBRARY_CUDA(CUDADRIVER *pInstance, const char *lib_path)
 {
-    *pInstance = LoadLibrary(__CudaLibName);
+    *pInstance = LoadLibrary(lib_path ? lib_path : __CudaLibName);
     if (*pInstance == NULL) {
 		GF_LOG(GF_LOG_INFO, GF_LOG_CODEC, ("NVDec LoadLibrary \"%s\" failed!\n", __CudaLibName));
         return CUDA_ERROR_SHARED_OBJECT_INIT_FAILED;
@@ -236,9 +236,9 @@
     return CUDA_SUCCESS;
 }
 
-static CUresult LOAD_LIBRARY_CUVID(CUVIDDRIVER *pInstance)
+static CUresult LOAD_LIBRARY_CUVID(CUVIDDRIVER *pInstance, const char *lib_path)
 {
-    *pInstance = LoadLibrary(__CuvidLibName);
+    *pInstance = LoadLibrary(lib_path ? lib_path : __CuvidLibName);
     if (*pInstance == NULL) {
 		GF_LOG(GF_LOG_INFO, GF_LOG_CODEC, ("NVDec LoadLibrary \"%s\" failed!\n", __CuvidLibName));
         return CUDA_ERROR_UNKNOWN;
@@ -274,9 +274,9 @@
 
 typedef void *CUVIDDRIVER;
 
-static CUresult LOAD_LIBRARY_CUDA(CUDADRIVER *pInstance)
+static CUresult LOAD_LIBRARY_CUDA(CUDADRIVER *pInstance, const char *lib_path)
 {
-    *pInstance = dlopen(__CudaLibName, RTLD_NOW);
+    *pInstance = dlopen(lib_path ? lib_path : __CudaLibName, RTLD_NOW);
     if (*pInstance == NULL) {
         GF_LOG(GF_LOG_INFO, GF_LOG_CODEC, ("NVDec dlopen \"%s\" failed!\n", __CudaLibName));
         return CUDA_ERROR_SHARED_OBJECT_INIT_FAILED;
@@ -284,9 +284,9 @@
     return CUDA_SUCCESS;
 }
 
-static CUresult LOAD_LIBRARY_CUVID(CUVIDDRIVER *pInstance)
+static CUresult LOAD_LIBRARY_CUVID(CUVIDDRIVER *pInstance, const char *lib_path)
 {
-    *pInstance = dlopen(__CuvidLibName, RTLD_NOW);
+    *pInstance = dlopen(lib_path ? lib_path : __CuvidLibName, RTLD_NOW);
     if (*pInstance == NULL) {
 		GF_LOG(GF_LOG_INFO, GF_LOG_CODEC, ("NVDecdlopen \"%s\" failed!\n", __CuvidLibName));
         return CUDA_ERROR_UNKNOWN;
@@ -347,20 +347,23 @@
 	CuvidDrvLib = 0;
 }
 
-CUresult CUDAAPI cuInit(unsigned int Flags, int cudaVersion)
+CUresult CUDAAPI cuInit(unsigned int Flags, int cudaVersion, const char *cuda_path, const char *cuvid_path)
 {
     int driverVer = 1000;
 	CUDADRIVER curr_lib ;
 
 	if (CudaDrvLib) return CUDA_SUCCESS;
 
-	assert(CudaDrvLib == 0);
-
-	CHECKED_CALL(LOAD_LIBRARY_CUDA(&CudaDrvLib));
+	CHECKED_CALL(LOAD_LIBRARY_CUDA(&CudaDrvLib, cuda_path));
 	curr_lib = CudaDrvLib;
 
 	// cuInit is required; alias it to _cuInit
     GET_PROC_EX(cuInit, _cuInit, 1);
+    if (_cuInit==NULL) {
+ 		cuUninit();
+        CudaDrvLib=NULL;
+        return CUDA_ERROR_SHARED_OBJECT_INIT_FAILED;
+    }
     CHECKED_CALL(_cuInit(Flags));
 
     // available since 2.2. if not present, version 1.0 is assumed
@@ -613,7 +616,12 @@
     }
 
 	//init cuvid
-    CHECKED_CALL(LOAD_LIBRARY_CUVID(&CuvidDrvLib));
+    CUresult result = LOAD_LIBRARY_CUVID(&CuvidDrvLib, cuvid_path);
+    if (result !=CUDA_SUCCESS) {
+ 		cuUninit();
+        CudaDrvLib=NULL;
+        return result;
+    }
 
 	curr_lib = CuvidDrvLib;
 #if !defined(__APPLE__)
@@ -630,7 +638,11 @@
     GET_PROC(cuvidCreateVideoParser);
     GET_PROC(cuvidParseVideoData);
     GET_PROC(cuvidDestroyVideoParser);
-
+    if (cuvidCreateVideoParser==NULL) {
+ 		cuUninit();
+        CudaDrvLib=NULL;
+        return CUDA_ERROR_SHARED_OBJECT_INIT_FAILED;
+    }
     GET_PROC(cuvidCreateDecoder);
     GET_PROC(cuvidDestroyDecoder);
     GET_PROC(cuvidDecodePicture);

gpac-2.2.1.tar.gz/src/filters/dec_nvdec_sdk.h -> gpac-2.4.0.tar.gz/src/filters/dec_nvdec_sdk.h Changed

@@ -1280,7 +1280,7 @@
 typedef CUresult CUDAAPI tcuMemHostGetFlags(unsigned int *pFlags, void *p);
 
 typedef CUresult CUDAAPI tcuMemHostRegister(void *p, size_t bytesize, unsigned int Flags);
-typedef CUresult CUDAAPI tcuMemHostUnregister(void *p);;
+typedef CUresult CUDAAPI tcuMemHostUnregister(void *p);
 typedef CUresult CUDAAPI tcuMemcpy(CUdeviceptr dst, CUdeviceptr src, size_t ByteCount);
 typedef CUresult CUDAAPI tcuMemcpyPeer(CUdeviceptr dstDevice, CUcontext dstContext, CUdeviceptr srcDevice, CUcontext srcContext, size_t ByteCount);
 
@@ -1685,7 +1685,7 @@
 extern tcuGraphicsResourceGetMappedPointer   *cuGraphicsResourceGetMappedPointer;
 
 /************************************/
-CUresult CUDAAPI cuInit   (unsigned int, int cudaVersion);
+CUresult CUDAAPI cuInit   (unsigned int, int cudaVersion, const char *cuda_path, const char *cuvid_path);
 void CUDAAPI cuUninit();
 /************************************/
 
@@ -1821,7 +1821,7 @@
 
 
 
-#if defined(__x86_64) || defined(AMD64) || defined(_M_AMD64)
+#if defined(__x86_64) || defined(AMD64) || defined(_M_AMD64) || defined(__aarch64__)
 #if (CUDA_VERSION >= 3020) && (!defined(CUDA_FORCE_API_VERSION) || (CUDA_FORCE_API_VERSION >= 3020))
 #define __CUVID_DEVPTR64
 #endif
@@ -2526,7 +2526,7 @@
 typedef CUresult CUDAAPI tcuvidUnmapVideoFrame(CUvideodecoder hDecoder, unsigned int DevPtr);
 #endif
 
-#if defined(WIN64) || defined(_WIN64) || defined(__x86_64) || defined(AMD64) || defined(_M_AMD64)
+#if defined(WIN64) || defined(_WIN64) || defined(__x86_64) || defined(AMD64) || defined(_M_AMD64) || defined(__aarch64__)
 /**
  * \fn CUresult CUDAAPI cuvidMapVideoFrame64(CUvideodecoder hDecoder, int nPicIdx, unsigned long long *pDevPtr, unsigned int *pPitch, CUVIDPROCPARAMS *pVPP);
  * map a video frame

gpac-2.2.1.tar.gz/src/filters/dec_odf.c -> gpac-2.4.0.tar.gz/src/filters/dec_odf.c Changed

gpac-2.2.1.tar.gz/src/filters/dec_openhevc.c -> gpac-2.4.0.tar.gz/src/filters/dec_openhevc.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2010-2022
+ *			Copyright (c) Telecom ParisTech 2010-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / OpenHEVC decoder filter
@@ -312,6 +312,10 @@
 	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_SAR, &PROP_FRAC(ctx->sar) );
 }
 
+#ifdef GPAC_CONFIG_EMSCRIPTEN
+Bool gf_filter_on_main_thread(GF_Filter *filter);
+#endif
+
 static GF_Err ohevcdec_configure_pid(GF_Filter *filter, GF_FilterPid *pid, Bool is_remove)
 {
 	u32 i, dep_id=0, id=0, cfg_crc=0, codecid;
@@ -586,6 +590,15 @@
 		}
 	}
 
+
+#ifdef GPAC_CONFIG_EMSCRIPTEN
+	//disable threading if running on main thread
+	if (gf_filter_on_main_thread(filter)) {
+		ctx->nb_threads = 0;
+		GF_LOG(GF_LOG_INFO, GF_LOG_CODEC, ("OpenHEVCDec Running on main thread, disabling threads\n"));
+	}
+#endif
+
 	if (!ctx->codec) {
 #ifdef  OPENHEVC_HAS_AVC_BASE
 		if (ctx->avc_base_id) {
@@ -1081,7 +1094,7 @@
 	u64 min_dts = GF_FILTER_NO_TS;
 	u64 min_cts = GF_FILTER_NO_TS;
 	u32 idx, nb_eos=0;
-	u32 data_size, nbpck;
+	u32 data_size;
 	char *data;
 	Bool has_pic = GF_FALSE;
 	GF_FilterPacket *pck_ref = NULL;
@@ -1239,7 +1252,6 @@
 	ctx->dec_frames++;
 	got_pic = 0;
 	ctx->reaggregation_size = 0;
-	nbpck = 0;
 
 	for (idx=0; idx<ctx->nb_streams; idx++) {
 		u64 dts, cts;
@@ -1312,7 +1324,6 @@
 			has_pic = GF_TRUE;
 
 		gf_filter_pid_drop_packet(ctx->streamsidx.ipid);
-		nbpck++;
 	}
 
 	if (ctx->reaggregation_size) {
@@ -1407,6 +1418,7 @@
 	.configure_pid = ohevcdec_configure_pid,
 	.process = ohevcdec_process,
 	.process_event = ohevcdec_process_event,
+	.flags = GF_FS_REG_BLOCK_MAIN,
 	.max_extra_pids = (HEVC_MAX_STREAMS-1),
 	//by default take over FFMPEG
 	.priority = 100

gpac-2.2.1.tar.gz/src/filters/dec_opensvc.c -> gpac-2.4.0.tar.gz/src/filters/dec_opensvc.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2010-2022
+ *			Copyright (c) Telecom ParisTech 2010-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / OpenSVC Decoder filter
@@ -277,7 +277,7 @@
 		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_HEIGHT, &PROP_UINT(ctx->height) );
 		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_STRIDE, &PROP_UINT(ctx->stride) );
 		if (ctx->pixel_ar.num)
-			gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_PAR, &PROP_FRAC(ctx->pixel_ar) );
+			gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_SAR, &PROP_FRAC(ctx->pixel_ar) );
 		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_PIXFMT, &PROP_UINT(GF_PIXEL_YUV) );
 	}
 	return GF_OK;
@@ -440,7 +440,7 @@
 			u32 size = gf_media_nalu_next_start_code((u8 *) data, data_size, &sc_size);
 			if (sc_size) {
 				ptr += size+sc_size;
-				assert(data_size >= size+sc_size);
+				gf_assert(data_size >= size+sc_size);
 				data_size -= size+sc_size;
 			} else
 #endif
@@ -526,8 +526,8 @@
 		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_WIDTH, &PROP_UINT(ctx->width) );
 		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_HEIGHT, &PROP_UINT(ctx->height) );
 		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_STRIDE, &PROP_UINT(ctx->stride) );
-		if (ctx->pixel_ar.num)
-			gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_PAR, &PROP_FRAC(ctx->pixel_ar) );
+		if (ctx->pixel_ar.num && !gf_filter_pid_get_property(ctx->streams0.ipid, GF_PROP_PID_SAR))
+			gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_SAR, &PROP_FRAC(ctx->pixel_ar) );
 
 		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_PIXFMT, &PROP_UINT(GF_PIXEL_YUV) );
 	}

gpac-2.2.1.tar.gz/src/filters/dec_ttml.c -> gpac-2.4.0.tar.gz/src/filters/dec_ttml.c Changed

@@ -2,7 +2,7 @@
  *					GPAC Multimedia Framework
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2020-2022
+ *			Copyright (c) Telecom ParisTech 2020-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / TTML decoder filter
@@ -27,7 +27,7 @@
 #include <gpac/filters.h>
 #include <gpac/constants.h>
 
-#if !defined(GPAC_DISABLE_SVG) && defined(GPAC_HAS_QJS)
+#if !defined(GPAC_DISABLE_SVG) && defined(GPAC_HAS_QJS) && !defined(GPAC_DISABLE_COMPOSITOR)
 
 #include <gpac/internal/scenegraph_dev.h>
 #include <gpac/internal/compositor_dev.h>
@@ -171,7 +171,7 @@
 	}
 	//TODO: we need to cleanup cap checking upon reconfigure
 	if (ctx->ipid && !gf_filter_pid_check_caps(pid)) return GF_NOT_SUPPORTED;
-	assert(!ctx->ipid || (ctx->ipid == pid));
+	gf_assert(!ctx->ipid || (ctx->ipid == pid));
 
 	ctx->ipid = pid;
 	if (!ctx->opid) {
@@ -587,7 +587,7 @@
 
 const GF_FilterRegister *ttmldec_register(GF_FilterSession *session)
 {
-#if !defined(GPAC_DISABLE_SVG) && defined(GPAC_HAS_QJS)
+#if !defined(GPAC_DISABLE_SVG) && defined(GPAC_HAS_QJS) && !defined(GPAC_DISABLE_COMPOSITOR)
 	return &TTMLDecRegister;
 #else
 	return NULL;

gpac-2.2.1.tar.gz/src/filters/dec_ttxt.c -> gpac-2.4.0.tar.gz/src/filters/dec_ttxt.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2022
+ *			Copyright (c) Telecom ParisTech 2000-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / 3GPP/MPEG4 text renderer filter
@@ -32,7 +32,7 @@
 #include <gpac/internal/compositor_dev.h>
 
 
-#if !defined(GPAC_DISABLE_VRML) && !defined(GPAC_DISABLE_ISOM)
+#if !defined(GPAC_DISABLE_VRML) && !defined(GPAC_DISABLE_ISOM) && !defined(GPAC_DISABLE_COMPOSITOR)
 
 
 /*
@@ -40,7 +40,7 @@
 	this scene graph is then used as an extra graph by the renderer, and manipulated by the decoder
 	for any time animation handling.
 	Translation from text to MPEG-4 scene graph:
-		* all modifiers (styles, hilight, etc) are unrolled into chunks forming a unique, linear
+		* all modifiers (styles, highlight, etc) are unrolled into chunks forming a unique, linear
 	sequence of text data (startChar, endChar) with associated styles & modifs
 		* chunks are mapped to classic MPEG-4/VRML text
 		* these chunks are then gathered in a Form node (supported by 2D and 3D renderers), with
@@ -54,7 +54,7 @@
 		* text color
 		* proper alignment (H and V) with horizontal text. Vertical text may not be properly layed out (not fully tested)
 		* style Records (font, size, fontstyles, and colors change) - any nb per sample supported
-		* hilighting (static only) with color or reverse video - any nb per sample supported
+		* highlighting (static only) with color or reverse video - any nb per sample supported
 		* hypertext links - any nb per sample supported
 		* blinking - any nb per sample supported
 		* complete scrolling: in, out, in+out, up, down, right and left directions. All other
@@ -62,7 +62,7 @@
 		* scroll delay
 
 	It does NOT support:
-		* dynamic hilighting (karaoke)
+		* dynamic highlighting (karaoke)
 		* wrap
 
 	The decoder only accepts complete timed text units TTU(1). In band reconfig (TTU(5) is not supported,
@@ -109,6 +109,8 @@
 	u8 *static_text;
 	u32 txt_static_alloc;
 	u64 sample_end;
+
+	u32 forced_sub;
 } GF_TTXTDec;
 
 
@@ -261,7 +263,7 @@
 	}
 	//TODO: we need to cleanup cap checking upon reconfigure
 	if (ctx->ipid && !gf_filter_pid_check_caps(pid)) return GF_NOT_SUPPORTED;
-	assert(!ctx->ipid || (ctx->ipid == pid));
+	gf_assert(!ctx->ipid || (ctx->ipid == pid));
 
 	st = codecid = 0;
 	p = gf_filter_pid_get_property(pid, GF_PROP_PID_STREAM_TYPE);
@@ -291,6 +293,9 @@
 	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_STREAM_TYPE, &PROP_UINT(GF_STREAM_TEXT));
 	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_CODECID, &PROP_UINT(GF_CODECID_RAW));
 
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_FORCED_SUB);
+	ctx->forced_sub = p ? p->value.uint : 0;
+
 	if (ctx->simple_text) {
 		if (!ctx->cfg) ctx->cfg = (GF_TextConfig *) gf_odf_desc_new(GF_ODF_TEXT_CFG_TAG);
 		if (!gf_list_count(ctx->cfg->sample_descriptions)) {
@@ -328,6 +333,13 @@
 				return e;
 			}
 			ctx->is_tx3g = GF_FALSE;
+
+			GF_TextSampleDescriptor *sd = gf_list_get(ctx->cfg->sample_descriptions, 0);
+			if (sd && (sd->displayFlags & GF_TXT_ALL_SAMPLES_FORCED))
+				ctx->forced_sub = 2;
+			else if (sd && (sd->displayFlags & GF_TXT_SOME_SAMPLES_FORCED))
+				ctx->forced_sub = 1;
+
 		} else if (codecid == GF_CODECID_TX3G) {
 			GF_TextSampleDescriptor * sd = gf_odf_tx3g_read(dsi->value.data.ptr, dsi->value.data.size);
 			if (!sd) {
@@ -338,10 +350,17 @@
 			if (!sd->default_style.text_color)
 				sd->default_style.text_color = 0xFFFFFFFF;
 
+			if (sd->displayFlags & GF_TXT_ALL_SAMPLES_FORCED)
+				ctx->forced_sub = 2;
+			if (sd->displayFlags & GF_TXT_SOME_SAMPLES_FORCED)
+				ctx->forced_sub = 1;
+
 			gf_list_add(ctx->cfg->sample_descriptions, sd);
 			ctx->is_tx3g = GF_TRUE;
 		}
 
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_FORCED_SUB, &PROP_UINT(ctx->forced_sub));
+
 		if (needs_init && ctx->odm && ctx->scene) {
 			ttd_setup_scene(ctx);
 			ttd_toggle_display(ctx);
@@ -573,8 +592,8 @@
 {
 	u32 start_char, end_char;
 	GF_StyleRecord *srec;
-	Bool is_hilight;
-	u32 hilight_col;	/*0 means RV*/
+	Bool is_highlight;
+	u32 highlight_col;	/*0 means RV*/
 	GF_TextHyperTextBox *hlink;
 	Bool has_blink;
 	/*karaoke not done yet*/
@@ -663,10 +682,10 @@
 	if ((styleFlags & GF_TXT_STYLE_UNDERLINED) || (tc->hlink && tc->hlink->URL)) strcat(szStyle, " UNDERLINED");
 	if (styleFlags & GF_TXT_STYLE_STRIKETHROUGH) strcat(szStyle, " STRIKETHROUGH");
 
-	if (tc->is_hilight) {
-		if (tc->hilight_col) {
+	if (tc->is_highlight) {
+		if (tc->highlight_col) {
 			char szTxt50;
-			sprintf(szTxt, " HIGHLIGHT#%x", tc->hilight_col);
+			sprintf(szTxt, " HIGHLIGHT#%x", tc->highlight_col);
 			strcat(szStyle, szTxt);
 		} else {
 			strcat(szStyle, " HIGHLIGHT#RV");
@@ -811,8 +830,8 @@
 		/*assign mod*/
 		switch (mod->type) {
 		case GF_ISOM_BOX_TYPE_HLIT:
-			tc->is_hilight = GF_TRUE;
-			if (txt->highlight_color) tc->hilight_col = txt->highlight_color->hil_color;
+			tc->is_highlight = GF_TRUE;
+			if (txt->highlight_color) tc->highlight_col = txt->highlight_color->hil_color;
 			break;
 		case GF_ISOM_BOX_TYPE_HREF:
 			tc->hlink = (GF_TextHyperTextBox *) mod;
@@ -856,6 +875,7 @@
 
 	ttd_reset_display(ctx);
 	if (!sample_desc_index || !txt || !txt->len) return;
+	if ((ctx->forced_sub==1) && !txt->is_forced) return;
 
 	if (ctx->is_tx3g) {
 		td = (GF_TextSampleDescriptor *)gf_list_get(ctx->cfg->sample_descriptions, 0);
@@ -1276,6 +1296,10 @@
 		ctx->is_playing = GF_FALSE;
 		ttd_toggle_display(ctx);
 		return GF_FALSE;
+	case GF_FEVT_QUALITY_SWITCH:
+		if ((ctx->forced_sub==1) && evt->quality_switch.up) ctx->forced_sub = 3;
+		else if ((ctx->forced_sub==3) && !evt->quality_switch.up) ctx->forced_sub = 1;
+		return GF_TRUE;
 	default:
 		return GF_FALSE;
 	}
@@ -1348,7 +1372,9 @@
 	ctx->is_eos = GF_FALSE;
 
 	//object clock shall be valid
-	assert(ctx->odm->ck);
+	if (!ctx->odm || !ctx->odm->ck)
+		return GF_OK;
+
 	if (pck) {
 		s64 delay;
 		cts = gf_filter_pck_get_cts( pck );
@@ -1422,6 +1448,7 @@
 		txt = gf_isom_parse_text_sample(ctx->bs_r);
 		if (!txt) return GF_NON_COMPLIANT_BITSTREAM;
 		GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("TTXTDec Applying new sample - duration %d text \"%s\"\n", sample_duration, txt->text ? txt->text : ""));
+
 		ttd_apply_sample(ctx, txt, sample_index, is_utf_16, sample_duration);
 		gf_isom_delete_text_sample(txt);
 
@@ -1430,7 +1457,7 @@
 			break;
 		} else {
 			//tx3g mode, single sample per AU
-			assert(gf_bs_available(ctx->bs_r)==0);
+			gf_assert(gf_bs_available(ctx->bs_r)==0);
 			break;
 		}
 	}
@@ -1507,7 +1534,7 @@
 
 const GF_FilterRegister *ttxtdec_register(GF_FilterSession *session)
 {
-#if !defined(GPAC_DISABLE_VRML) && !defined(GPAC_DISABLE_ISOM)
+#if !defined(GPAC_DISABLE_VRML) && !defined(GPAC_DISABLE_ISOM) && !defined(GPAC_DISABLE_COMPOSITOR)
 	return &TTXTDecRegister;
 #else
 	return NULL;

gpac-2.4.0.tar.gz/src/filters/dec_uncv.c Added

@@ -0,0 +1,1700 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2023
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / uncv pixel format translator filter
+ *
+ *  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/filters.h>
+#include <gpac/constants.h>
+#include <gpac/avparse.h>
+
+#ifndef GPAC_DISABLE_UNCVDEC
+
+enum {
+	SAMPLING_NONE=0,
+	SAMPLING_422=1,
+	SAMPLING_420=2,
+	SAMPLING_411=3,
+};
+
+enum {
+	INTERLEAVE_COMPONENT=0,
+	INTERLEAVE_PIXEL=1,
+	INTERLEAVE_MIXED=2,
+	INTERLEAVE_ROW=3,
+	INTERLEAVE_TILE=4,
+	INTERLEAVE_MULTIY=5,
+};
+
+enum
+{
+	UNCV_OUT_NONE=0,
+	UNCV_OUT_YUV=1,
+	UNCV_OUT_RGB,
+	UNCV_OUT_MONO,
+};
+
+typedef struct
+{
+	u32 type;
+	char *uri;
+} UNCVComponentDefinition;
+
+typedef struct
+{
+	u16 idx;
+	u32 bits, format, align_size;
+	u32 type; //copied from def
+
+	//internal
+	u64 max_val;
+	s32 p_idx;
+	u32 line_size, plane_size;
+	u32 row_align_size;
+	u32 comp_idx;
+	u8 value;
+} UNCVComponentInfo;
+
+typedef struct
+{
+	u32 nb_comps;
+	UNCVComponentInfo *comps;
+	u32 nb_values;
+	u8 *values;
+
+} UNCVPalette;
+
+typedef struct
+{
+	u32 nb_comp_defs;
+	UNCVComponentDefinition *comp_defs;
+	UNCVPalette *palette;
+
+	u8 version;
+	u32 flags;
+	u32 profile;
+	u32 nb_comps;
+	UNCVComponentInfo *comps;
+	u32 sampling, interleave, block_size;
+	Bool components_little_endian, block_pad_lsb, block_little_endian, block_reversed, pad_unknown;
+	u32 pixel_size;
+	u32 row_align_size, tile_align_size, num_tile_cols, num_tile_rows;
+
+
+	u16 fa_width, fa_height;
+	u16 *fa_map;
+} UNCVConfig;
+
+typedef struct
+{
+	UNCVComponentInfo *component;
+	u32 val;
+} BlockComp;
+
+typedef struct
+{
+	GF_BitStream *bs;
+	u32 init_offset;
+	u32 line_start_pos;
+	u32 row_align_size;
+	u32 plane_size, tile_size, comp_row_size;
+
+	u32 loaded_comps;
+	u32 first_comp_idx;
+
+	u8 *le_buf;
+	GF_BitStream *le_bs;
+	BlockComp *block_comps;
+} BSRead;
+
+typedef struct __uncvdec
+{
+	Bool force_pf, no_tile;
+
+	GF_FilterPid *ipid, *opid;
+	u32 width, height, pixel_format, bpp, stride;
+	Bool passthrough;
+
+	u32 output_size, tile_width, tile_height;
+
+	UNCVConfig *cfg;
+	u32 tile_size, row_line_size;
+	u32 color_type;
+	Bool alpha;
+	u32 blocksize_bits;
+
+	u32 subsample_x;
+	BSRead *bsrs;
+	u32 nb_bsrs;
+	u32 max_comp_per_block;
+	Bool use_palette;
+	u8 *pixel;
+
+	u8 *comp_le_buf;
+	GF_BitStream *comp_le_bs;
+
+	void (*read_pixel)(struct __uncvdec* ctx, UNCVConfig *config, u32 x, u32 y, u8 *output, u32 offset);
+} UNCVDecCtx;
+
+static u8 uncv_get_val(GF_BitStream *bs, UNCVComponentInfo *comp, UNCVDecCtx *ctx);
+
+static void read_pixel_interleave_comp_yuv_420(UNCVDecCtx *ctx, UNCVConfig *config, u32 x, u32 y, u8 *output, u32 offset);
+static void read_pixel_interleave_comp_yuv(UNCVDecCtx *ctx, UNCVConfig *config, u32 x, u32 y, u8 *output, u32 offset);
+static void read_pixel_interleave_comp(UNCVDecCtx *ctx, UNCVConfig *config, u32 x, u32 y, u8 *output, u32 offset);
+static void read_pixel_interleave_pixel(UNCVDecCtx *ctx, UNCVConfig *config, u32 x, u32 y, u8 *output, u32 offset);
+static void read_pixel_interleave_mixed(UNCVDecCtx *ctx, UNCVConfig *config, u32 x, u32 y, u8 *output, u32 offset);
+static void read_pixel_interleave_multiy(UNCVDecCtx *ctx, UNCVConfig *config, u32 x, u32 y, u8 *output, u32 offset);
+static void read_pixel_interleave_comp(UNCVDecCtx *ctx, UNCVConfig *config, u32 x, u32 y, u8 *output, u32 offset);
+static void read_pixel_interleave_comp(UNCVDecCtx *ctx, UNCVConfig *config, u32 x, u32 y, u8 *output, u32 offset);
+
+static void uncv_del(UNCVConfig *cfg)
+{
+	u32 i;
+	if (cfg->comp_defs) {
+		for (i=0; i<cfg->nb_comp_defs; i++) {
+			if (cfg->comp_defsi.uri) gf_free(cfg->comp_defsi.uri);
+		}
+		gf_free(cfg->comp_defs);
+	}
+	if (cfg->comps) gf_free(cfg->comps);
+	if (cfg->palette) {
+		if (cfg->palette->comps) gf_free(cfg->palette->comps);
+		if (cfg->palette->values) gf_free(cfg->palette->values);
+		gf_free(cfg->palette);
+	}
+	gf_free(cfg);
+}
+
+static GF_Err uncv_load_profile(UNCVConfig *uncv)
+{
+	u32 nb_comps=0, abgr=GF_FALSE;
+	switch (uncv->profile) {
+	case GF_4CC('r','g','b','3'): nb_comps = 3; break;
+	case GF_4CC('r','g','b','a'): nb_comps = 4; break;
+	case GF_4CC('a','b','g','r'): nb_comps = 4; abgr=GF_TRUE; break;
+	default: return GF_NON_COMPLIANT_BITSTREAM;
+	}
+
+	if (!uncv->nb_comp_defs) {
+		uncv->nb_comp_defs = nb_comps;
+		uncv->comp_defs = gf_malloc(sizeof(UNCVComponentDefinition)*nb_comps);
+		if (!uncv->comp_defs) return GF_OUT_OF_MEM;
+		memset(uncv->comp_defs, 0, sizeof(UNCVComponentDefinition)*nb_comps);
+		uncv->comp_defs0.type = abgr ? 7 : 4;
+		uncv->comp_defs1.type = abgr ? 6 : 5;
+		uncv->comp_defs2.type = abgr ? 5 : 6;
+		if (nb_comps>3)
+			uncv->comp_defs3.type = abgr ? 4 : 7;
+	}
+	uncv->nb_comps = nb_comps;
+	uncv->comps = gf_malloc(sizeof(UNCVComponentInfo)*nb_comps);
+	if (!uncv->comps) return GF_OUT_OF_MEM;
+	memset(uncv->comps, 0, sizeof(UNCVComponentInfo)*nb_comps);
+	uncv->comps0.idx = 0;
+	uncv->comps0.bits = 8;
+	uncv->comps1.idx = 1;
+	uncv->comps1.bits = 8;
+	uncv->comps2.idx = 2;
+	uncv->comps2.bits = 8;
+	if (nb_comps>3) {
+		uncv->comps3.idx = 3;
+		uncv->comps3.bits = 8;
+	}
+	uncv->interleave = 1;
+	return GF_OK;
+}
+
+static UNCVConfig *uncv_parse_config(u8 *dsi, u32 dsi_size, GF_Err *out_err)
+{
+	Bool has_pal=GF_FALSE;
+	Bool has_fa=GF_FALSE;
+	*out_err = GF_OK;
+	u32 i;
+	Bool has_cmpd=0, has_uncc=0;
+	if (!dsi) {
+		*out_err = GF_BAD_PARAM;
+		return NULL;
+	}
+	UNCVConfig *uncv;
+	GF_SAFEALLOC(uncv, UNCVConfig);
+
+	uncv->num_tile_cols = uncv->num_tile_rows = 1; // defaults to prevent FPE
+
+	GF_BitStream *bs = gf_bs_new(dsi, dsi_size, GF_BITSTREAM_READ);
+	while (gf_bs_available(bs)) {
+		s32 size = gf_bs_read_u32(bs);
+		u32 type = gf_bs_read_u32(bs);
+		u32 pos = (u32) gf_bs_get_position(bs);
+
+		if (type==GF_4CC('c','m','p','d')) {
+			s32 bsize = (u32) size - 8;
+
+			uncv->nb_comp_defs = gf_bs_read_u32(bs);
+			bsize -= 4 + uncv->nb_comp_defs * 2;
+			if (bsize<0) {
+				*out_err = GF_NON_COMPLIANT_BITSTREAM;
+				goto exit;
+			}
+			uncv->comp_defs = gf_malloc(sizeof(UNCVComponentDefinition) * uncv->nb_comp_defs);
+			memset(uncv->comp_defs, 0, sizeof(UNCVComponentDefinition) * uncv->nb_comp_defs);
+			if (!uncv->comp_defs) {
+				*out_err = GF_OUT_OF_MEM;
+				goto exit;
+			}
+			for (i=0; i<uncv->nb_comp_defs; i++) {
+				uncv->comp_defsi.type = gf_bs_read_u16(bs);
+				if (uncv->comp_defsi.type>=0x8000) {
+					uncv->comp_defsi.uri = gf_bs_read_utf8(bs);
+				}
+			}
+			has_cmpd=1;
+		} else if (type==GF_4CC('u','n','c','C')) {
+			s32 bsize = (u32) size - 8;
+			uncv->version = gf_bs_read_u8(bs);
+			uncv->flags = gf_bs_read_int(bs, 24);
+			uncv->profile = gf_bs_read_u32(bs);
+			if (uncv->version==1) {
+				*out_err = uncv_load_profile(uncv);
+				if (*out_err) goto exit;
+				has_cmpd = has_uncc = 1;
+				goto uncc_done;
+			}
+
+			uncv->nb_comps = gf_bs_read_u32(bs);
+			bsize -= 12 + uncv->nb_comps * 5 + 24;
+			if (bsize < 0) {
+				*out_err = GF_NON_COMPLIANT_BITSTREAM;
+				goto exit;
+			}
+			uncv->comps = gf_malloc(sizeof(UNCVComponentInfo) * uncv->nb_comps);
+			if (!uncv->comps) {
+				*out_err = GF_OUT_OF_MEM;
+				goto exit;
+			}
+			memset(uncv->comps, 0, sizeof(UNCVComponentInfo) * uncv->nb_comps);
+			for (i=0; i<uncv->nb_comps; i++) {
+				uncv->compsi.idx = gf_bs_read_u16(bs);
+				uncv->compsi.bits = 1 + gf_bs_read_u8(bs);
+				uncv->compsi.format = gf_bs_read_u8(bs);
+				uncv->compsi.align_size = gf_bs_read_u8(bs);
+			}
+			uncv->sampling = gf_bs_read_u8(bs);
+			uncv->interleave = gf_bs_read_u8(bs);
+			uncv->block_size = gf_bs_read_u8(bs);
+			uncv->components_little_endian = gf_bs_read_int(bs, 1);
+			uncv->block_pad_lsb = gf_bs_read_int(bs, 1);
+			uncv->block_little_endian = gf_bs_read_int(bs, 1);
+			uncv->block_reversed = gf_bs_read_int(bs, 1);
+			uncv->pad_unknown = gf_bs_read_int(bs, 1);
+			gf_bs_read_int(bs, 3);
+			uncv->pixel_size = gf_bs_read_u32(bs);
+			uncv->row_align_size = gf_bs_read_u32(bs);
+			uncv->tile_align_size = gf_bs_read_u32(bs);
+			uncv->num_tile_cols = 1 + gf_bs_read_u32(bs);
+			uncv->num_tile_rows = 1 + gf_bs_read_u32(bs);
+			//todo, validate profile ?
+
+uncc_done:
+			has_uncc = 1;
+		} else if (type==GF_4CC('c','p','a','l')) {
+			u32 bit_size=0;
+			s32 bsize = (u32) size-8;
+			u32 max_bits=0;
+			u32 cpal_count;
+			u8 version = gf_bs_read_u8(bs);
+			if (version)
+				*out_err = GF_NON_COMPLIANT_BITSTREAM;
+
+			gf_bs_read_int(bs, 24);
+			cpal_count = gf_bs_read_u16(bs);
+			bsize -= 6 + cpal_count*6 + 4;
+			if (bsize<0) {
+				*out_err = GF_NON_COMPLIANT_BITSTREAM;
+				goto exit;
+			}
+			GF_SAFEALLOC(uncv->palette, UNCVPalette);
+			if (!uncv->palette) {
+				*out_err = GF_OUT_OF_MEM;
+				goto exit;
+			}
+			uncv->palette->nb_comps = cpal_count;
+
+			uncv->palette->comps = gf_malloc(sizeof(UNCVComponentInfo)*uncv->palette->nb_comps);
+			if (!uncv->palette->comps) {
+				*out_err = GF_OUT_OF_MEM;
+				goto exit;
+			}
+			memset(uncv->palette->comps, 0, sizeof(UNCVComponentInfo)*uncv->palette->nb_comps);
+			for (i=0; i<uncv->palette->nb_comps; i++) {
+				UNCVComponentInfo *comp = &uncv->palette->compsi;
+				comp->idx = gf_bs_read_u32(bs);
+				comp->bits = gf_bs_read_u8(bs) + 1;
+				comp->format = gf_bs_read_u8(bs);
+				if (!comp->format && (max_bits<comp->bits))
+					max_bits = comp->bits;
+
+				bit_size+=comp->bits;
+				while (bit_size%8) bit_size++;
+			}
+			uncv->palette->nb_values = gf_bs_read_u32(bs);
+			bsize -= uncv->palette->nb_values * bit_size/8;
+			if (bsize<0) {
+				*out_err = GF_NON_COMPLIANT_BITSTREAM;
+				goto exit;
+			}
+
+			uncv->palette->values = gf_malloc(sizeof(u8) * uncv->palette->nb_values * uncv->palette->nb_comps);
+			if (!uncv->palette->values) {
+				*out_err = GF_OUT_OF_MEM;
+				goto exit;
+			}
+			for (i=0; i<uncv->palette->nb_values; i++) {
+				u8 *vals = uncv->palette->values + i*uncv->palette->nb_comps;
+				for (u32 j=0; j<uncv->palette->nb_comps; j++) {
+					UNCVComponentInfo *c = &uncv->palette->compsj;
+					valsj = uncv_get_val(bs, c, NULL);
+					gf_bs_align(bs);
+				}
+			}
+		} else if (type==GF_4CC('c','p','a','t')) {
+			s32 bsize = (u32) size-8;
+			u8 version = gf_bs_read_u8(bs);
+			if (version) {
+				*out_err = GF_NON_COMPLIANT_BITSTREAM;
+				goto exit;
+			}
+
+			gf_bs_read_int(bs, 24);
+			uncv->fa_width = gf_bs_read_u16(bs);
+			uncv->fa_height = gf_bs_read_u16(bs);
+			bsize -= 8 + (uncv->fa_width * uncv->fa_height * 8);
+			if (bsize<0) {
+				*out_err = GF_NON_COMPLIANT_BITSTREAM;
+				goto exit;
+			}
+			uncv->fa_map = gf_malloc(sizeof(u16)*uncv->fa_width * uncv->fa_height);
+			if (!uncv->fa_map) {
+				*out_err = GF_OUT_OF_MEM;
+				goto exit;
+			}
+			for (i=0; i<uncv->fa_height; i++) {
+				u32 j;
+				for (j=0; j<uncv->fa_width; j++) {
+					uncv->fa_mapj + i*uncv->fa_height = gf_bs_read_u32(bs);
+					gf_bs_read_float(bs);
+				}
+			}
+		}
+		pos = (u32) gf_bs_get_position(bs) - pos;
+		pos += 8;
+		if ((pos > (u32) size) || gf_bs_is_overflow(bs) )
+			*out_err = GF_NON_COMPLIANT_BITSTREAM;
+		else if (pos < (u32) size)
+			gf_bs_skip_bytes(bs, size-pos);
+	}
+	gf_bs_del(bs);
+
+	if (!has_cmpd) {
+		*out_err = GF_NON_COMPLIANT_BITSTREAM;
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("UNCV Missing cmpd box\n"));
+		goto exit;
+	}
+	if (!has_uncc) {
+		*out_err = GF_NON_COMPLIANT_BITSTREAM;
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("UNCV Missing uncC box\n"));
+		goto exit;
+	}
+
+	for (i=0; i<uncv->nb_comps; i++) {
+		if (uncv->compsi.idx>=uncv->nb_comp_defs) {
+			*out_err = GF_NON_COMPLIANT_BITSTREAM;
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("UNCV Invalid component index %d\n", uncv->compsi.idx))
+		}
+		uncv->compsi.type = uncv->comp_defsuncv->compsi.idx.type;
+		if (uncv->compsi.type == 10) has_pal = 1;
+		if (uncv->compsi.type == 11) has_fa = 1;
+		if (uncv->compsi.align_size && (uncv->compsi.align_size*8 < uncv->compsi.bits)) {
+			*out_err = GF_NON_COMPLIANT_BITSTREAM;
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("UNCV Component idx %d align size (%d) less than its bit depth (%d)\n", uncv->compsi.idx, uncv->compsi.align_size, uncv->compsi.bits));
+		}
+		if (uncv->block_size) {
+			if (uncv->compsi.align_size && (uncv->block_size<uncv->compsi.align_size)) {
+				*out_err = GF_NON_COMPLIANT_BITSTREAM;
+				GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("UNCV Component idx %d align size (%d) is larger than block size\n", uncv->compsi.idx, uncv->compsi.align_size, uncv->block_size));
+			}
+			if (!uncv->compsi.align_size && (uncv->block_size*8<uncv->compsi.bits)) {
+				*out_err = GF_NON_COMPLIANT_BITSTREAM;
+				GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("UNCV Component idx %d bit depth (%d) is larger than block size\n", uncv->compsi.idx, uncv->compsi.bits, uncv->block_size));
+			}
+		}
+	}
+
+	if (uncv->block_reversed && !uncv->block_little_endian) {
+		*out_err = GF_NON_COMPLIANT_BITSTREAM;
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("UNCV Usage of block_reversed with big-endian block is forbidden\n"));
+	}
+
+	if (has_pal && !uncv->palette) {
+		*out_err = GF_NON_COMPLIANT_BITSTREAM;
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("UNCV Missing palette box\n"));
+	}
+	else if (uncv->palette) {
+		for (i=0; i<uncv->palette->nb_comps; i++) {
+			if (uncv->palette->compsi.idx>=uncv->nb_comp_defs) {
+				*out_err = GF_NON_COMPLIANT_BITSTREAM;
+				GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("UNCV Invalid component index %d in palette\n", uncv->compsi.idx))
+			}
+			uncv->palette->compsi.type = uncv->comp_defsuncv->palette->compsi.idx.type;
+			if (uncv->palette->compsi.type == 10) {
+				*out_err = GF_NON_COMPLIANT_BITSTREAM;
+				GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("UNCV Palette cannot refer to palette component type"));
+			}
+			else if (uncv->palette->compsi.type == 11) {
+				*out_err = GF_NON_COMPLIANT_BITSTREAM;
+				GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("UNCV Palette cannot refer to filter array type"));
+			}
+		}
+	}
+
+	if (has_fa && !uncv->fa_map) {
+		*out_err = GF_NON_COMPLIANT_BITSTREAM;
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("UNCV Missing pattern box\n"));
+	} else if (uncv->fa_map) {
+		u32 nb_maps = uncv->fa_width * uncv->fa_height;
+		for (i=0; i<nb_maps; i++) {
+			if (uncv->fa_mapi >= uncv->nb_comp_defs) {
+				*out_err = GF_NON_COMPLIANT_BITSTREAM;
+				GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("UNCV Invalid component index %d in palette\n", uncv->compsi.idx))
+			}
+		}
+	}
+
+	if (uncv->sampling > SAMPLING_411) {
+		*out_err = GF_NON_COMPLIANT_BITSTREAM;
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("UNCV Unrecognized sampling mode %d", uncv->sampling));
+	}
+	if (uncv->interleave > INTERLEAVE_MULTIY) {
+		*out_err = GF_NON_COMPLIANT_BITSTREAM;
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("UNCV Unrecognized  interleave mode %d", uncv->interleave));
+	}
+
+exit:
+	if (*out_err) {
+		uncv_del(uncv);
+		uncv = NULL;
+	}
+	return uncv;
+}
+
+
+GF_Err rfc_6381_get_codec_uncv(char *szCodec, u32 subtype, u8 *dsi, u32 dsi_size)
+{
+	GF_Err e;
+	u32 i;
+	if (!dsi) {
+		snprintf(szCodec, RFC6381_CODEC_NAME_SIZE_MAX, "%s", gf_4cc_to_str(subtype));
+		return GF_OK;
+	}
+
+	UNCVConfig *uncv = uncv_parse_config(dsi, dsi_size, &e);
+	if (!uncv) return e;
+
+	if (!uncv->profile) {
+		snprintf(szCodec, RFC6381_CODEC_NAME_SIZE_MAX, "%s.gene.%x.%x.%x.%xT%x", gf_4cc_to_str(subtype)
+			, uncv->sampling, uncv->interleave, uncv->block_size, uncv->num_tile_cols, uncv->num_tile_rows);
+
+		for (i=0; i<uncv->nb_comps; i++) {
+			char szComp100;
+			if (uncv->compsi.idx>uncv->nb_comp_defs) continue;
+			sprintf(szComp, ".%xL%x", uncv->compsi.type, uncv->compsi.bits);
+			if (strlen(szCodec) + strlen(szComp) + 1 <= RFC6381_CODEC_NAME_SIZE_MAX) {
+				strcat(szCodec, szComp);
+			} else {
+				break;
+			}
+		}
+	} else {
+		snprintf(szCodec, RFC6381_CODEC_NAME_SIZE_MAX, "%s.%s", gf_4cc_to_str(subtype), gf_4cc_to_str(uncv->profile));
+	}
+	uncv_del(uncv);
+	return e;
+}
+
+
+static void uncv_check_comp_type(u32 type, Bool *has_mono, Bool *has_yuv, Bool *has_rgb, Bool *has_alpha, Bool *has_depth, Bool *has_disp, Bool *has_pal, Bool *has_fa, Bool *has_pad, Bool *has_non_int)
+{
+	switch (type) {
+	case 0: *has_mono=1; break;
+	case 1:
+	case 2:
+	case 3:
+		*has_yuv=1;
+		break;
+	case 4:
+	case 5:
+	case 6:
+		*has_rgb=1;
+		break;
+	case 7: *has_alpha = 1; break;
+	case 8: *has_depth = 1; break;
+	case 9: *has_disp = 1; break;
+	case 10: *has_pal = 1; break;
+	case 11: *has_fa = 1; break;
+	case 12: *has_pad = 1; break;
+	}
+}
+static void uncv_check_comps_type(UNCVComponentInfo *comps, u32 nb_comps, Bool *has_mono, Bool *has_yuv, Bool *has_rgb, Bool *has_alpha, Bool *has_depth, Bool *has_disp, Bool *has_pal, Bool *has_fa, Bool *has_pad, Bool *has_non_int)
+{
+	u32 i;
+	for (i=0;i<nb_comps; i++) {
+		uncv_check_comp_type(compsi.type, has_mono, has_yuv, has_rgb, has_alpha, has_depth, has_disp, has_pal, has_fa, has_pad, has_non_int);
+		if (compsi.format) *has_non_int = 1;
+	}
+}
+
+static u32 uncv_get_compat(UNCVDecCtx *ctx)
+{
+	Bool has_mono=0, has_yuv=0, has_rgb=0, has_alpha=0, has_depth=0, has_disp=0, has_pal=0, has_fa=0, has_pad=0;
+	Bool has_non_int=0;
+	UNCVConfig *cfg = ctx->cfg;
+	UNCVComponentInfo *c = cfg->comps;
+
+	uncv_check_comps_type(cfg->comps, cfg->nb_comps, &has_mono, &has_yuv, &has_rgb, &has_alpha, &has_depth, &has_disp, &has_pal, &has_fa, &has_pad, &has_non_int);
+
+	if (has_pal) {
+		gf_assert(cfg->palette);
+		uncv_check_comps_type(cfg->palette->comps, cfg->palette->nb_comps, &has_mono, &has_yuv, &has_rgb, &has_alpha, &has_depth, &has_disp, &has_pal, &has_fa, &has_pad, &has_non_int);
+	}
+	if (cfg->fa_map) {
+		u32 i, nb_map = cfg->fa_width*cfg->fa_height;
+		for (i=0;i<nb_map; i++) {
+			u32 type = cfg->comp_defscfg->fa_mapi.type;
+			uncv_check_comp_type(type, &has_mono, &has_yuv, &has_rgb, &has_alpha, &has_depth, &has_disp, &has_pal, &has_fa, &has_pad, &has_non_int);
+		}
+	}
+
+	if (has_yuv) ctx->color_type = UNCV_OUT_YUV;
+	else if (has_rgb) ctx->color_type = UNCV_OUT_RGB;
+	else if (has_mono) ctx->color_type = UNCV_OUT_MONO;
+	else ctx->color_type = UNCV_OUT_NONE;
+	ctx->alpha = has_alpha;
+
+	if (has_non_int) return 0;
+	if (has_pal) {
+		ctx->use_palette=GF_TRUE;
+		return 0;
+	}
+	if (has_fa) return 0;
+	if (cfg->row_align_size) return 0;
+	if (cfg->tile_align_size) return 0;
+	if (cfg->pixel_size) return 0;
+	if (cfg->num_tile_cols>1) return 0;
+	if (cfg->num_tile_rows>1) return 0;
+	if (cfg->components_little_endian) return 0;
+
+	if (has_mono) {
+		if ((cfg->nb_comps==1) && (c0.bits==7)) return GF_PIXEL_GREYSCALE;
+		if (has_alpha && (cfg->nb_comps==2) && (c0.bits==7) && (c1.bits==7)) {
+			if (c0.type==0) return GF_PIXEL_GREYALPHA;
+			return GF_PIXEL_ALPHAGREY;
+		}
+		return 0;
+	}
+
+	if (cfg->nb_comps==3) {
+		if ((c0.type==4) && (c0.bits==8) && (c1.type==5) && (c1.bits==8) && (c2.type==6) && (c2.bits==8)
+			&& (!cfg->block_size || (cfg->block_size==3))
+			&& (cfg->interleave==INTERLEAVE_PIXEL) && !cfg->block_little_endian && !cfg->block_reversed
+		) {
+			return GF_PIXEL_RGB;
+		}
+		if ((c0.type==6) && (c0.bits==8) && (c1.type==5) && (c1.bits==8) && (c2.type==4) && (c2.bits==8)
+			&& (!cfg->block_size || (cfg->block_size==3))
+			&& (cfg->interleave==INTERLEAVE_PIXEL) && !cfg->block_little_endian
+			&& !cfg->block_reversed && !cfg->sampling
+		) {
+			return GF_PIXEL_BGR;
+		}
+		if ((c0.type==4) && (c0.bits==5) && (c1.type==5) && (c1.bits==6) && (c2.type==6) && (c2.bits==5)
+			&& (!cfg->block_size || (cfg->block_size==2))
+			&& (cfg->interleave==INTERLEAVE_PIXEL) && !cfg->block_little_endian
+			&& !cfg->block_reversed && !cfg->sampling
+		) {
+			return GF_PIXEL_RGB_565;
+		}
+		if ((c0.type==4) && (c0.bits==5) && (c1.type==5) && (c1.bits==5) && (c2.type==6) && (c2.bits==5)
+			&& (cfg->block_size==2) && (cfg->interleave==INTERLEAVE_PIXEL)
+			&& !cfg->block_little_endian && !cfg->block_pad_lsb
+			&& !cfg->block_reversed && !cfg->sampling
+		) {
+			return GF_PIXEL_RGB_555;
+		}
+
+		if ((c0.type==1) && (c0.bits==8) && (c1.type==2) && (c1.bits==8) && (c2.type==3) && (c2.bits==8)
+			&& !cfg->block_size
+		) {
+			if (cfg->interleave==INTERLEAVE_COMPONENT) {
+				if (cfg->sampling==SAMPLING_NONE) return GF_PIXEL_YUV444;
+				if (cfg->sampling==SAMPLING_422) return GF_PIXEL_YUV422;
+				if (cfg->sampling==SAMPLING_420) return GF_PIXEL_YUV;
+			}
+			if (cfg->interleave==INTERLEAVE_MIXED) {
+				if (cfg->sampling==SAMPLING_420) return GF_PIXEL_NV12;
+			}
+		}
+		if ((c0.type==1) && (c0.bits==8) && (c1.type==3) && (c1.bits==8) && (c2.type==2) && (c2.bits==8)
+			&& !cfg->block_size
+		) {
+			if (cfg->interleave==INTERLEAVE_COMPONENT) {
+				if (cfg->sampling==SAMPLING_420) return GF_PIXEL_YVU;
+			}
+			if (cfg->interleave==INTERLEAVE_MIXED) {
+				if (cfg->sampling==SAMPLING_420) return GF_PIXEL_NV21;
+			}
+		}
+	}
+
+	if (cfg->nb_comps==4) {
+		if ((c0.type==12) && (c0.bits==1)
+			&& (c1.type==4) && (c1.bits==5)
+			&& (c2.type==5) && (c2.bits==5)
+			&& (c3.type==6) && (c3.bits==5)
+			&& !cfg->block_size
+			&& (cfg->interleave==INTERLEAVE_PIXEL)
+		) {
+			return GF_PIXEL_RGB_565;
+		}
+
+		if ((cfg->sampling==SAMPLING_422) && (cfg->interleave==INTERLEAVE_MULTIY)
+			&& (!cfg->block_size || (cfg->block_size==4)) && !cfg->block_little_endian
+			&& (c0.type==1) && (c0.bits==8) && (c1.type==2) && (c1.bits==8)
+			&& (c2.type==1) && (c2.bits==8) && (c3.type==3) && (c3.bits==8)
+		) {
+			return GF_PIXEL_YUYV;
+		}
+		if ((cfg->sampling==SAMPLING_422) && (cfg->interleave==INTERLEAVE_MULTIY)
+			&& (!cfg->block_size || (cfg->block_size==4)) && !cfg->block_little_endian
+			&& (c0.type==2) && (c0.bits==8) && (c1.type==1) && (c1.bits==8)
+			&& (c2.type==3) && (c2.bits==8) && (c3.type==1) && (c3.bits==8)
+		) {
+			return GF_PIXEL_UYVY;
+		}
+
+		if ((cfg->sampling==SAMPLING_422) && (cfg->interleave==INTERLEAVE_MULTIY)
+			&& (!cfg->block_size || (cfg->block_size==4)) && !cfg->block_little_endian
+			&& (c0.type==1) && (c0.bits==8) && (c1.type==3) && (c1.bits==8)
+			&& (c2.type==1) && (c2.bits==8) && (c3.type==2) && (c3.bits==8)
+		) {
+			return GF_PIXEL_YVYU;
+		}
+		if ((cfg->sampling==SAMPLING_422) && (cfg->interleave==INTERLEAVE_MULTIY)
+			&& (!cfg->block_size || (cfg->block_size==4)) && !cfg->block_little_endian
+			&& (c0.type==3) && (c0.bits==8) && (c1.type==1) && (c1.bits==8)
+			&& (c2.type==2) && (c2.bits==8) && (c3.type==1) && (c3.bits==8)
+		) {
+			return GF_PIXEL_VYUY;
+		}
+	}
+	return 0;
+}
+
+static u32 uncv_get_line_size(UNCVDecCtx *ctx, u32 *comp_bits, u32 clen)
+{
+	UNCVConfig *config = ctx->cfg;
+	u32 size=0;
+
+	if (!config->block_size) {
+		for (u32 i=0;i<ctx->tile_width; i++) {
+			for (u32 c=0; c < clen; c+=2) {
+				u32 bits = comp_bitsc;
+				u32 align = comp_bitsc+1;
+				if (align) {
+					while (size%8) size++;
+					bits = align*8;
+				}
+				size += bits;
+			}
+		}
+		while (size % 8) size++;
+		return size / 8;
+	}
+	//block size, figure out how many blocks
+	u32 nb_bits = 0;
+	for (u32 i=0; i<ctx->tile_width; i++) {
+		for (u32 c=0; c<clen; c+=2) {
+			u32 cbits = comp_bitsc;
+			u32 align = comp_bitsc+1;
+			if (align) {
+				while (nb_bits%8) nb_bits++;
+				cbits = align*8;
+			}
+
+			if (nb_bits + cbits > ctx->blocksize_bits) {
+				nb_bits=0;
+				size += config->block_size;
+				//if first comp in block is first comp, pattern is done
+				if (c==0) {
+					u32 nb_pix = i+1;
+					u32 nb_blocks = 1;
+					while ((nb_blocks+1) * nb_pix < ctx->tile_width)
+						nb_blocks++;
+
+					size *= nb_blocks;
+					//jump to last non-full pattern
+					i += nb_pix * (nb_blocks-1);
+				}
+			}
+			nb_bits += cbits;
+		}
+	}
+	if (nb_bits)
+		size += config->block_size;
+	return size;
+}
+
+static void uncv_reset(UNCVDecCtx *ctx)
+{
+	if (ctx->cfg) uncv_del(ctx->cfg);
+	ctx->cfg = NULL;
+
+	if (ctx->bsrs) {
+		for (u32 i=0; i<ctx->nb_bsrs; i++) {
+			BSRead *bsr = &ctx->bsrsi;
+			if (bsr->bs) gf_bs_del(bsr->bs);
+			if (bsr->le_bs) gf_bs_del(bsr->le_bs);
+			if (bsr->le_buf) gf_free(bsr->le_buf);
+			if (bsr->block_comps) gf_free(bsr->block_comps);
+		}
+		gf_free(ctx->bsrs);
+		ctx->bsrs = NULL;
+	}
+	if (ctx->pixel) {
+		gf_free(ctx->pixel);
+		ctx->pixel = NULL;
+	}
+	if (ctx->comp_le_bs) {
+		gf_bs_del(ctx->comp_le_bs);
+		ctx->comp_le_bs = NULL;
+	}
+	if (ctx->comp_le_buf) {
+		gf_free(ctx->comp_le_buf);
+		ctx->comp_le_buf = NULL;
+	}
+}
+
+static GF_Err uncv_config(UNCVDecCtx *ctx, u8 *dsi, u32 dsi_size)
+{
+	GF_Err e;
+
+	uncv_reset(ctx);
+
+	ctx->cfg = uncv_parse_config(dsi, dsi_size, &e);
+	if (!ctx->cfg) return e;
+	UNCVConfig *config = ctx->cfg;
+
+	if (ctx->no_tile) {
+		config->num_tile_cols = config->num_tile_rows = 1;
+		if (config->interleave==INTERLEAVE_TILE)
+			config->interleave = INTERLEAVE_COMPONENT;
+	}
+
+	//get our compatible configs
+	ctx->pixel_format = uncv_get_compat(ctx);
+	if (ctx->force_pf) ctx->pixel_format = 0;
+	if (ctx->pixel_format) {
+		ctx->passthrough = GF_TRUE;
+		return GF_OK;
+	}
+
+	//not natively supported, we need a format - we only use 8 bits in reconstruction
+	if (ctx->color_type==UNCV_OUT_YUV) {
+		ctx->pixel_format = ctx->alpha ? GF_PIXEL_YUVA444_PACK : GF_PIXEL_YUV444_PACK;
+		ctx->bpp = ctx->alpha ? 4 : 3;
+	} else if (ctx->color_type==UNCV_OUT_RGB) {
+		ctx->pixel_format = ctx->alpha ? GF_PIXEL_RGBA : GF_PIXEL_RGB;
+		ctx->bpp = ctx->alpha ? 4 : 3;
+	} else if (ctx->color_type==UNCV_OUT_MONO) {
+		ctx->pixel_format = ctx->alpha ? GF_PIXEL_GREYALPHA : GF_PIXEL_GREYSCALE;
+		ctx->bpp = ctx->alpha ? 2 : 1;
+	} else {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("UNCV No visual components present, cannot convert\n"));
+		return GF_NOT_SUPPORTED;
+	}
+	GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("UNCV No native format found, reconstructing as %s\n", gf_pixel_fmt_name(ctx->pixel_format)));
+
+	ctx->stride = ctx->bpp * ctx->width;
+	ctx->output_size = ctx->stride * ctx->height;
+	ctx->tile_width = ctx->width / config->num_tile_cols;
+	ctx->tile_height = ctx->height / config->num_tile_rows;
+	ctx->blocksize_bits = config->block_size * 8;
+
+	if (config->interleave==INTERLEAVE_COMPONENT) {
+		if (config->sampling==SAMPLING_420) ctx->read_pixel = read_pixel_interleave_comp_yuv_420;
+		else if (config->sampling) ctx->read_pixel = read_pixel_interleave_comp_yuv;
+		else ctx->read_pixel = read_pixel_interleave_comp;
+	}
+	else if (config->interleave==INTERLEAVE_PIXEL) {
+		ctx->read_pixel = read_pixel_interleave_pixel;
+	}
+	else if (config->interleave==INTERLEAVE_MIXED) {
+		if (config->sampling)
+			ctx->read_pixel = read_pixel_interleave_mixed;
+		else {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("UNCV Interleave mode 2 is set but no sampling type\n"));
+			return GF_NON_COMPLIANT_BITSTREAM;
+		}
+	}
+	else if (config->interleave==INTERLEAVE_MULTIY) {
+		if ((config->sampling==SAMPLING_422) || (config->sampling==SAMPLING_411))
+			ctx->read_pixel = read_pixel_interleave_multiy;
+		else {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("UNCV Invalid interleave mode 5 for sampling type %d\n", config->sampling));
+			return GF_NON_COMPLIANT_BITSTREAM;
+		}
+	} else if (config->interleave==INTERLEAVE_ROW) {
+		if (config->sampling) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("UNCV Invalid interleave mode 3 for sampling type %d\n", config->sampling));
+			return GF_NON_COMPLIANT_BITSTREAM;
+		}
+		ctx->read_pixel = read_pixel_interleave_comp;
+	} else if (config->interleave==INTERLEAVE_TILE) {
+		if (config->sampling) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("UNCV Invalid interleave mode 4 for sampling type %d\n", config->sampling));
+			return GF_NON_COMPLIANT_BITSTREAM;
+		}
+		if (config->num_tile_cols * config->num_tile_rows == 1) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("UNCV Invalid interleave mode 4 with no tiling"));
+			return GF_NON_COMPLIANT_BITSTREAM;
+		}
+		ctx->read_pixel = read_pixel_interleave_comp;
+	} else {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("UNCV Invalid interleave mode %d\n", config->interleave));
+		return GF_NON_COMPLIANT_BITSTREAM;
+	}
+
+	if (config->pixel_size) {
+		if ((config->interleave!=INTERLEAVE_PIXEL) && (config->interleave!=INTERLEAVE_MULTIY)) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("UNCV pixel_size shall be 0 for interleave mode %d\n", config->interleave));
+			return GF_NON_COMPLIANT_BITSTREAM;
+		}
+	}
+
+	UNCVComponentInfo *comps = config->comps;
+/*	pixel = ;
+*/
+	u32 *bits = gf_malloc(sizeof(u32) * config->nb_comps*2);
+	u32 nb_bits=0;
+	u32 i, min_bits = 0;
+	ctx->subsample_x = 1;
+	u32 nb_out_comp=0;
+	s32 first_comp_uv_idx = 0;
+	if (config->sampling==SAMPLING_411) ctx->subsample_x = 4;
+	else if (config->sampling) ctx->subsample_x = 2;
+
+	ctx->tile_size = 0;
+
+	if (config->palette) {
+		for (i=0; i<config->palette->nb_comps; i++) {
+			UNCVComponentInfo *comp = &config->palette->compsi;
+			if ((comp->type==0) || (comp->type==1) || (comp->type==4))
+				comp->p_idx = 0;
+			else if ((comp->type==2) || (comp->type==5))
+				comp->p_idx = 1;
+			else if ((comp->type==3) || (comp->type==6))
+				comp->p_idx = 2;
+			else if (comp->type==7)
+				comp->p_idx = 3;
+			else
+				comp->p_idx = -1;
+		}
+	}
+	u32 max_align_size=0;
+	for (i=0; i<config->nb_comps; i++) {
+		UNCVComponentInfo *comp = &compsi;
+		u32 nbb = comp->bits;
+		comp->max_val = 1;
+		while (nbb) {
+			comp->max_val *= 2;
+			nbb--;
+		}
+		comp->max_val--;
+
+		if (!min_bits || (min_bits > comp->bits))
+			min_bits = comp->bits;
+
+		if ((comp->type==0) || (comp->type==1) || (comp->type==4))
+			comp->p_idx = 0;
+		else if ((comp->type==2) || (comp->type==5))
+			comp->p_idx = 1;
+		else if ((comp->type==3) || (comp->type==6))
+			comp->p_idx = 2;
+		else if (comp->type==7)
+			comp->p_idx = 3;
+		//palette, set to 'r' index but not used as is
+		else if (comp->type==10)
+			comp->p_idx = 0;
+		//filter array, set to 'r' index but not used as is
+		else if (comp->type==11)
+			comp->p_idx = 0;
+		else
+			comp->p_idx = -1;
+
+		if (nb_out_comp < (u32) (comp->p_idx+1))
+			nb_out_comp = comp->p_idx+1;
+
+		if (max_align_size < comp->align_size)
+			max_align_size = comp->align_size;
+
+		comp->line_size=0;
+		comp->row_align_size = 0;
+		if ((config->interleave==INTERLEAVE_COMPONENT)
+			|| (config->interleave==INTERLEAVE_MIXED)
+			|| (config->interleave==INTERLEAVE_ROW)
+			|| (config->interleave==INTERLEAVE_TILE)
+		) {
+			bits0 = comp->bits;
+			bits1 = comp->align_size;
+			comp->line_size = uncv_get_line_size(ctx, bits, 2);
+			u32 row_align = config->row_align_size;
+
+			if (config->interleave==INTERLEAVE_MIXED) {
+
+				if ((comp->type==2) || (comp->type==3)) {
+					if (!first_comp_uv_idx) {
+						first_comp_uv_idx = i+1;
+						//skip below check
+						row_align = 0;
+					} else {
+						if (first_comp_uv_idx-1 + 1 != i) {
+							GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("UNCV Invalid interleave 2 with non-consecutive U and V components"));
+							return GF_NON_COMPLIANT_BITSTREAM;
+						}
+						bits0 = compsfirst_comp_uv_idx-1.bits;
+						bits1 = compsfirst_comp_uv_idx-1.align_size;
+						bits2 = comp->bits;
+						bits3 = comp->align_size;
+						comp->line_size = uncv_get_line_size(ctx, bits, 4);
+						if (config->sampling==SAMPLING_422) comp->line_size /= 2;
+						else if (config->sampling==SAMPLING_420) comp->line_size /= 2;
+						else if (config->sampling==SAMPLING_411) comp->line_size /= 4;
+					}
+				}
+			} else {
+				if ((comp->type==2) || (comp->type==3)) {
+					comp->line_size /= ctx->subsample_x;
+					row_align /= ctx->subsample_x;
+				}
+			}
+
+			if (row_align) {
+				while (comp->line_size % row_align) {
+					comp->line_size++;
+				}
+				comp->row_align_size = comp->line_size;
+			}
+
+			comp->plane_size = comp->line_size * ctx->tile_height;
+
+			if ((config->sampling==SAMPLING_420) && ((comp->type==2) || (comp->type==3)))
+				comp->plane_size /= 2;
+
+			if (config->interleave!=INTERLEAVE_TILE) {
+				ctx->tile_size += comp->plane_size;
+			}
+			else if (config->tile_align_size) {
+				while (comp->plane_size % config->tile_align_size) {
+					comp->plane_size++;
+				}
+			}
+			if (((comp->type==2) || (comp->type==3)) && first_comp_uv_idx && (first_comp_uv_idx-1 != i) ) {
+				compsfirst_comp_uv_idx-1.line_size = comp->line_size;
+				compsfirst_comp_uv_idx-1.plane_size = comp->plane_size;
+				//remove plane size from tile size, as it counts the two U and V  component and is added for each U and V
+				ctx->tile_size -= comp->plane_size;
+				comp->line_size = 0;
+				comp->plane_size = 0;
+			}
+		} else {
+			bitsnb_bits = comp->bits;
+			bitsnb_bits+1 = comp->align_size;
+			nb_bits+=2;
+		}
+
+//		pixel.push(0);
+		comp->comp_idx = i;
+	}
+
+	ctx->row_line_size=0;
+	u32 lsize = uncv_get_line_size(ctx, bits, nb_bits);
+	gf_free(bits);
+
+	if (config->pixel_size &&
+		((config->interleave==INTERLEAVE_PIXEL) || (config->interleave==INTERLEAVE_MULTIY))
+	) {
+		u32 lsize2 = config->pixel_size * ctx->tile_width;
+		if (lsize2 < lsize) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("UNCV Invalid pixel size %d\n", config->pixel_size));
+			return GF_NON_COMPLIANT_BITSTREAM;
+		}
+		lsize = lsize2;
+	}
+
+	if (config->row_align_size) {
+		while (lsize % config->row_align_size) {
+			lsize++;
+		}
+		ctx->row_line_size = lsize;
+	}
+
+	if ((config->interleave==INTERLEAVE_PIXEL) || (config->interleave==INTERLEAVE_MULTIY)) {
+		ctx->tile_size = lsize * ctx->tile_height;
+	}
+
+	if (config->tile_align_size && (config->interleave!=INTERLEAVE_TILE)) {
+		while (ctx->tile_size % config->tile_align_size) {
+			ctx->tile_size++;
+		}
+	}
+
+	ctx->max_comp_per_block = (u32) gf_floor(ctx->blocksize_bits / min_bits);
+
+
+	ctx->nb_bsrs = 1;
+	if ((config->interleave==INTERLEAVE_COMPONENT)
+		|| (config->interleave==INTERLEAVE_MIXED)
+		|| (config->interleave==INTERLEAVE_ROW)
+		|| (config->interleave==INTERLEAVE_TILE)
+	) {
+		ctx->nb_bsrs = config->nb_comps;
+	}
+
+	ctx->bsrs = gf_malloc(sizeof(BSRead) * ctx->nb_bsrs);
+	memset(ctx->bsrs, 0, sizeof(BSRead) * ctx->nb_bsrs);
+	for (i=0; i<ctx->nb_bsrs; i++) {
+		BSRead *bsr = &ctx->bsrsi;
+		bsr->bs = gf_bs_new((u8*)&ctx, 1, GF_BITSTREAM_READ);
+
+		if (config->block_size && config->block_little_endian) {
+			bsr->le_buf = gf_malloc(sizeof(u8) * config->block_size);
+			bsr->le_bs = gf_bs_new((u8*)&ctx, 1, GF_BITSTREAM_READ);
+		}
+
+		if (ctx->blocksize_bits) {
+			bsr->block_comps = gf_malloc(sizeof(BlockComp) * ctx->max_comp_per_block);
+		}
+	}
+
+	if (ctx->use_palette) nb_out_comp += ctx->cfg->palette->nb_comps;
+	else if (ctx->cfg->fa_map) nb_out_comp += 3;
+	//we always write 3 comp in pixels
+	if (nb_out_comp<ctx->bpp) nb_out_comp = ctx->bpp;
+
+	ctx->pixel = gf_malloc(sizeof(u8)*nb_out_comp);
+	memset(ctx->pixel, 0, sizeof(u8)*nb_out_comp);
+
+	if (config->components_little_endian && max_align_size) {
+		ctx->comp_le_buf = gf_malloc(sizeof(u8)*max_align_size);
+		ctx->comp_le_bs = gf_bs_new(ctx->comp_le_buf, max_align_size, GF_BITSTREAM_READ);
+	}
+	return GF_OK;
+}
+
+static GF_Err uncvdec_configure_pid(GF_Filter *filter, GF_FilterPid *pid, Bool is_remove)
+{
+	const GF_PropertyValue *prop;
+	UNCVDecCtx *ctx = (UNCVDecCtx *) gf_filter_get_udta(filter);
+
+	//disconnect of src pid (not yet supported)
+	if (is_remove) {
+		if (ctx->opid) {
+			gf_filter_pid_remove(ctx->opid);
+			ctx->opid = NULL;
+		}
+		ctx->ipid = NULL;
+		return GF_OK;
+	}
+	if (! gf_filter_pid_check_caps(pid))
+		return GF_NOT_SUPPORTED;
+
+	prop = gf_filter_pid_get_property(pid, GF_PROP_PID_CODECID);
+	if (!prop) return GF_NOT_SUPPORTED;
+	if (prop->value.uint != GF_CODECID_RAW_UNCV) return GF_NOT_SUPPORTED;
+
+	prop = gf_filter_pid_get_property(pid, GF_PROP_PID_WIDTH);
+	if (!prop) return GF_NOT_SUPPORTED;
+	ctx->width = prop->value.uint;
+	prop = gf_filter_pid_get_property(pid, GF_PROP_PID_HEIGHT);
+	if (!prop) return GF_NOT_SUPPORTED;
+	ctx->height = prop->value.uint;
+
+	prop = gf_filter_pid_get_property(pid, GF_PROP_PID_DECODER_CONFIG);
+	if (!prop) return GF_NOT_SUPPORTED;
+	ctx->ipid = pid;
+
+	GF_Err e = uncv_config(ctx, prop->value.data.ptr, prop->value.data.size);
+	if (e) return e;
+
+	if (!ctx->opid) {
+		ctx->opid = gf_filter_pid_new(filter);
+	}
+	gf_filter_pid_copy_properties(ctx->opid, ctx->ipid);
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_CODECID, & PROP_UINT( GF_CODECID_RAW ));
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_PIXFMT, & PROP_UINT( ctx->pixel_format ));
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_DECODER_CONFIG, NULL);
+	return GF_OK;
+}
+
+
+static void uncv_setup_block(UNCVDecCtx *ctx, BSRead *bsr)
+{
+	if (!ctx->blocksize_bits) return;
+
+	bsr->loaded_comps = 0;
+	bsr->first_comp_idx = 0;
+	if (ctx->cfg->block_little_endian) {
+		gf_bs_reassign_buffer(bsr->le_bs, bsr->le_buf, ctx->cfg->block_size);
+	}
+	for (u32 i=0; i<ctx->max_comp_per_block; i++) {
+		bsr->block_compsi.component = NULL;
+		bsr->block_compsi.val = 0;
+	}
+}
+
+
+static void uncv_start_frame(UNCVDecCtx *ctx, const u8 *data, u32 size)
+{
+	UNCVConfig *config = ctx->cfg;
+
+	if ((ctx->nb_bsrs>1) || (ctx->cfg->nb_comps==1)) {
+		u32 offset = 0;
+		u32 comp_row_size=0;
+		for (u32 i=0; i<config->nb_comps; i++) {
+			UNCVComponentInfo *comp = &config->compsi;
+			BSRead *bsr = &ctx->bsrsi;
+			gf_bs_reassign_buffer(bsr->bs, data, size);
+			gf_bs_seek(bsr->bs, offset);
+			bsr->init_offset = offset;
+			bsr->line_start_pos = offset;
+			bsr->row_align_size = comp->row_align_size;
+			bsr->tile_size = 0;
+			uncv_setup_block(ctx, bsr);
+
+			if (config->interleave==INTERLEAVE_ROW)
+				offset += comp->line_size;
+			else if (config->interleave==INTERLEAVE_TILE)
+				offset += comp->plane_size * config->num_tile_cols * config->num_tile_rows;
+			else
+				offset += comp->plane_size;
+
+			bsr->plane_size = comp->plane_size;
+			comp_row_size += comp->line_size;
+			//tile size is per comp in this mode, not for the cumulated size
+			if (config->interleave==INTERLEAVE_TILE) {
+				bsr->tile_size = bsr->plane_size;
+			} else if (config->interleave==INTERLEAVE_MIXED) {
+				if ((comp->type==2) || (comp->type==3)) i++;
+			}
+		}
+
+		for (u32 i=0; i<config->nb_comps; i++) {
+			UNCVComponentInfo *comp = &config->compsi;
+			BSRead *bsr = &ctx->bsrsi;
+			bsr->comp_row_size = comp_row_size;
+			if (config->interleave!=INTERLEAVE_TILE) {
+				bsr->tile_size = ctx->tile_size;
+				if (config->interleave==INTERLEAVE_MIXED) {
+					if ((comp->type==2) || (comp->type==3)) i++;
+				}
+			}
+		}
+	} else {
+		BSRead *bsr = &ctx->bsrs0;
+		gf_bs_reassign_buffer(bsr->bs, data, size);
+		uncv_setup_block(ctx, bsr);
+		bsr->line_start_pos = 0;
+		bsr->init_offset = 0;
+		bsr->row_align_size = ctx->row_line_size;
+		bsr->tile_size = ctx->tile_size;
+	}
+}
+
+
+static void uncv_start_tile(UNCVDecCtx *ctx, UNCVConfig *config, u32 tile_x, u32 tile_y)
+{
+	if ((config->num_tile_cols==1) && (config->num_tile_rows==1)) return;
+	for (u32 i=0; i<ctx->nb_bsrs; i++) {
+		BSRead *bsr = &ctx->bsrsi;
+		u32 offs = bsr->init_offset + bsr->tile_size * (tile_x + config->num_tile_cols * tile_y);
+		gf_bs_seek(bsr->bs, offs);
+
+		if (config->interleave==INTERLEAVE_MIXED) {
+			UNCVComponentInfo *comp = &config->compsi;
+			if ((comp->type==2) || (comp->type==3)) i++;
+		}
+	}
+}
+
+static void uncv_end_tile(UNCVDecCtx *ctx)
+{
+}
+
+static void uncv_end_line(UNCVDecCtx *ctx, UNCVConfig *config)
+{
+	for (u32 i=0; i<ctx->nb_bsrs; i++) {
+		BSRead *bsr = &ctx->bsrsi;
+
+		gf_bs_align(bsr->bs);
+		if (config->block_size) {
+			bsr->loaded_comps = 0;
+		}
+
+		if (bsr->row_align_size) {
+			u32 remain = (u32) (gf_bs_get_position(bsr->bs) - bsr->line_start_pos);
+			while (remain < bsr->row_align_size) {
+				gf_bs_skip_bytes(bsr->bs, 1);
+				remain++;
+			}
+		}
+
+		if (config->interleave==INTERLEAVE_ROW) {
+			gf_bs_seek(bsr->bs, bsr->line_start_pos + bsr->comp_row_size);
+		}
+		bsr->line_start_pos = (u32) gf_bs_get_position(bsr->bs);
+	}
+}
+
+
+static u8 uncv_get_val(GF_BitStream *bs, UNCVComponentInfo *comp, UNCVDecCtx *ctx)
+{
+	if (comp->format == 1) {
+		Double d;
+		if (comp->bits==32)
+			d = gf_bs_read_float(bs);
+		else if (comp->bits==64)
+			d = gf_bs_read_double(bs);
+		else
+			d=0;
+		if (comp->type<9)
+			d *= 255;
+		return (u8) d;
+	}
+	u64 c;
+	if (comp->align_size) {
+		if (!ctx) return 0;
+		gf_bs_align(bs);
+		if (ctx->comp_le_buf) {
+			u32 i;
+			for (i=0;i<comp->align_size; i++) {
+				ctx->comp_le_bufcomp->align_size-i-1 = gf_bs_read_u8(bs);
+			}
+			gf_bs_seek(ctx->comp_le_bs, 0);
+			c = gf_bs_read_long_int(ctx->comp_le_bs, comp->align_size*8);
+		} else {
+			c = gf_bs_read_long_int(bs, comp->align_size*8);
+		}
+	} else {
+		c = gf_bs_read_long_int(bs, comp->bits);
+	}
+
+	if (comp->bits != 8) {
+		c *= 255;
+		c /= comp->max_val;
+	}
+	return (u8) c;
+}
+
+static void uncv_pull_block(UNCVDecCtx *ctx, UNCVConfig *config, BSRead *bsr, u32 comp_idx)
+{
+	u32 i, bits=0, nb_vals=0, bk_idx=0;
+
+	for (i=comp_idx; i< config->nb_comps; ) {
+		UNCVComponentInfo *comp = &config->compsi;
+		if (bits + comp->bits > ctx->blocksize_bits)
+			break;
+
+		if (comp->align_size) {
+			while (bits % 8) bits++;
+			bits += comp->align_size*8;
+		} else {
+			bits += comp->bits;
+		}
+
+		bsr->block_compsbk_idx.component = comp;
+		bk_idx++;
+		nb_vals++;
+
+		if (config->interleave) {
+			i++;
+			if (i==config->nb_comps) {
+				//interleave mode with pixel size, do not loop over components
+				if (config->pixel_size) break;
+				i=0;
+			}
+		}
+	}
+
+	u32 pad = ctx->blocksize_bits - bits;
+
+	if (config->block_little_endian) {
+		GF_BitStream *bs_le = bsr->le_bs;
+		gf_bs_seek(bs_le, 0);
+
+		for (i=config->block_size; i>0; i--) {
+			bsr->le_bufi-1 = gf_bs_read_u8(bsr->bs);
+		}
+
+		if (!config->block_pad_lsb)
+			gf_bs_read_int(bs_le, pad);
+
+		for (i=0;i<nb_vals; i++) {
+			//check block reverse
+			u32 b_idx = config->block_reversed ? (nb_vals-i-1) : i;
+			BlockComp *bcomp = &bsr->block_compsb_idx;
+			bcomp->val = uncv_get_val(bs_le, bcomp->component, ctx);
+		}
+		if (config->block_pad_lsb)
+			gf_bs_read_int(bs_le, pad);
+	} else {
+		if (!config->block_pad_lsb)
+			gf_bs_read_int(bsr->bs, pad);
+
+		//no block reverse in big endian
+		for (i=0; i<nb_vals; i++) {
+			BlockComp *bcomp = &bsr->block_compsi;
+			bcomp->val = uncv_get_val(bsr->bs, bcomp->component, ctx);
+		}
+
+		if (config->block_pad_lsb)
+			gf_bs_read_int(bsr->bs, pad);
+	}
+	bsr->loaded_comps = nb_vals;
+	bsr->first_comp_idx = 0;
+}
+
+static void uncv_set_pix_val(UNCVDecCtx *ctx, UNCVComponentInfo *comp, u8 val, u32 x, u32 y)
+{
+	if (comp->p_idx<0) return;
+	if (comp->type==10) {
+		UNCVPalette *pal = ctx->cfg->palette;
+		if (val >= pal->nb_values) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("UNCV Invalid palette index %d\n", val));
+			return;
+		}
+
+		u8 *values = pal->values + val * pal->nb_comps;
+		for (u32 i=0; i<pal->nb_comps; i++) {
+			UNCVComponentInfo *p_comp = &pal->compsi;
+			uncv_set_pix_val(ctx, p_comp, valuesi, x, y);
+		}
+	} else if (comp->type==11) {
+		x = x % ctx->cfg->fa_width;
+		y = y % ctx->cfg->fa_height;
+		UNCVComponentDefinition *cdef = &ctx->cfg->comp_defsctx->cfg->fa_mapx + y*ctx->cfg->fa_height;
+		//only write if R, G or B
+		if ((cdef->type>=4) && (cdef->type<=6)) {
+			u32 c_idx = cdef->type-4;
+			ctx->pixelc_idx = val;
+		}
+	} else {
+		ctx->pixelcomp->p_idx = val;
+	}
+}
+
+static void uncv_pull_val(UNCVDecCtx *ctx, UNCVConfig *config, BSRead *bsr, UNCVComponentInfo *comp, Bool no_write, u32 x, u32 y)
+{
+	if (config->block_size) {
+		if (bsr->first_comp_idx >= bsr->loaded_comps)
+			bsr->loaded_comps = 0;
+
+		if (!bsr->loaded_comps)
+			uncv_pull_block(ctx, config, bsr, comp->comp_idx);
+
+		BlockComp *bcomp = &bsr->block_comps bsr->first_comp_idx ;
+
+		if (bcomp->component->p_idx>=0) {
+			if (no_write)
+				bcomp->component->value = bcomp->val;
+			else
+				uncv_set_pix_val(ctx, bcomp->component, bcomp->val, x, y);
+		}
+
+		bsr->first_comp_idx++;
+	} else {
+		u8 c = uncv_get_val(bsr->bs, comp, ctx);
+		if (no_write) {
+			comp->value = c;
+		}
+		else if (comp->p_idx>=0) {
+			uncv_set_pix_val(ctx, comp, c, x, y);
+		}
+	}
+}
+
+static void read_pixel_interleave_pixel(UNCVDecCtx *ctx, UNCVConfig *config, u32 x, u32 y, u8 *out_data, u32 offset)
+{
+	BSRead *bsr = &ctx->bsrs0;
+	u32 psize = (u32) gf_bs_get_position(bsr->bs);
+	for (u32 i=0; i<config->nb_comps; i++) {
+		uncv_pull_val(ctx, config, bsr, &ctx->cfg->compsi, GF_FALSE, x, y);
+	}
+	if (config->pixel_size) {
+		if (ctx->blocksize_bits) {
+			bsr->loaded_comps = 0;
+		} else {
+			gf_bs_align(bsr->bs);
+		}
+		psize = (u32) ( gf_bs_get_position(bsr->bs) - psize );
+		if (psize > config->pixel_size) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("UNCV Invalid pixel_size %u, less than total size of components %u\n", config->pixel_size, psize));
+		}
+		while (psize < config->pixel_size) {
+			gf_bs_read_u8(bsr->bs);
+			psize++;
+		}
+	}
+}
+
+static void read_pixel_interleave_multiy(UNCVDecCtx *ctx, UNCVConfig *config, u32 x, u32 y, u8 *out_data, u32 offset)
+{
+	BSRead *bsr = &ctx->bsrs0;
+	u32 psize =(u32) gf_bs_get_position(bsr->bs);
+	Bool load_uv = GF_FALSE;
+	u32 pix_idx = x % ctx->subsample_x;
+	if (pix_idx == 0) {
+		for (u32 i=0; i<config->nb_comps; i++) {
+			uncv_pull_val(ctx, config, bsr, &config->compsi, GF_TRUE, x, y);
+		}
+		load_uv=GF_TRUE;
+	}
+
+	if (config->pixel_size) {
+		gf_bs_align(bsr->bs);
+		psize = (u32) (gf_bs_get_position(bsr->bs) - psize);
+		if (psize > config->pixel_size) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("UNCV Invalid pixel_size %d, less than total size of components %d\n", config->pixel_size, psize));
+		}
+		while (psize < config->pixel_size) {
+			gf_bs_read_u8(bsr->bs);
+			psize++;
+		}
+	}
+
+	u32 idx=0;
+	for (u32 i=0; i < config->nb_comps; i++) {
+		UNCVComponentInfo *comp = &config->compsi;
+		if (comp->p_idx<0) continue;
+
+		if ((comp->type==2) || (comp->type==3)) {
+			if (load_uv) {
+				uncv_set_pix_val(ctx, comp, comp->value, x, y);
+			}
+			continue;
+		}
+		if (idx == pix_idx) {
+			uncv_set_pix_val(ctx, comp, comp->value, x, y);
+		}
+		idx++;
+	}
+}
+
+
+static void read_pixel_interleave_comp(UNCVDecCtx *ctx, UNCVConfig *config, u32 x, u32 y, u8 *out_data, u32 offset)
+{
+	for (u32 i=0; i<config->nb_comps; i++) {
+		uncv_pull_val(ctx, config, &ctx->bsrsi, &config->compsi, GF_FALSE, x, y);
+	}
+}
+
+static void read_pixel_interleave_comp_yuv(UNCVDecCtx *ctx, UNCVConfig *config, u32 x, u32 y, u8 *out_data, u32 offset)
+{
+	Bool pull_uv = (x % ctx->subsample_x) ? GF_FALSE : GF_TRUE;
+	for (u32 i=0; i<config->nb_comps; i++) {
+		UNCVComponentInfo *comp = &config->compsi;
+		if (pull_uv || ((comp->type!=2) && (comp->type!=3)))
+			uncv_pull_val(ctx, config, &ctx->bsrsi, comp, GF_FALSE, x, y);
+	}
+}
+
+static void read_pixel_interleave_comp_yuv_420(UNCVDecCtx *ctx, UNCVConfig *config, u32 x, u32 y, u8 *out_data, u32 offset)
+{
+	Bool pull_uv = (x % ctx->subsample_x) ? GF_FALSE : GF_TRUE;
+	if (y%2) {
+		pull_uv = GF_FALSE;
+		ctx->pixel1 = out_dataoffset - ctx->stride + 1;
+		ctx->pixel2 = out_dataoffset - ctx->stride + 2;
+	}
+
+	for (u32 i=0; i<config->nb_comps; i++) {
+		UNCVComponentInfo *comp = &config->compsi;
+		if (pull_uv || ((comp->type!=2) && (comp->type!=3)))
+			uncv_pull_val(ctx, config, &ctx->bsrsi, comp, GF_FALSE, x, y);
+	}
+}
+
+static void read_pixel_interleave_mixed(UNCVDecCtx *ctx, UNCVConfig *config, u32 x, u32 y, u8 *out_data, u32 offset)
+{
+	Bool pull_uv = (x % ctx->subsample_x) ? GF_FALSE : GF_TRUE;
+	if ((config->sampling==SAMPLING_420) && (y%2)) {
+		pull_uv = GF_FALSE;
+		ctx->pixel1 = out_dataoffset - ctx->stride + 1;
+		ctx->pixel2 = out_dataoffset - ctx->stride + 2;
+	}
+
+	for (u32 i=0; i<config->nb_comps; i++) {
+		UNCVComponentInfo *comp = &config->compsi;
+		if ((comp->type!=2) && (comp->type!=3)) {
+			uncv_pull_val(ctx, config, &ctx->bsrsi, comp, GF_FALSE, x, y);
+			continue;
+		}
+		if (pull_uv && comp->plane_size) {
+			uncv_pull_val(ctx, config, &ctx->bsrsi, comp, GF_FALSE, x, y);
+			comp = &config->compsi+1;
+			uncv_pull_val(ctx, config, &ctx->bsrsi, comp, GF_FALSE, x, y);
+			i++;
+		}
+	}
+}
+
+
+
+static GF_Err uncvdec_process(GF_Filter *filter)
+{
+	GF_FilterPacket *pck;
+	UNCVDecCtx *ctx = (UNCVDecCtx *) gf_filter_get_udta(filter);
+
+	pck = gf_filter_pid_get_packet(ctx->ipid);
+	if (!pck) {
+			if (gf_filter_pid_is_eos(ctx->ipid)) {
+			gf_filter_pid_set_eos(ctx->opid);
+			return GF_EOS;
+		}
+		return GF_OK;
+	}
+	if (ctx->passthrough) {
+		gf_filter_pck_forward(pck, ctx->opid);
+		gf_filter_pid_drop_packet(ctx->ipid);
+		return GF_OK;
+	}
+
+	u32 in_size;
+	const u8 *in_data = gf_filter_pck_get_data(pck, &in_size);
+	if (!in_data) {
+		gf_filter_pid_drop_packet(ctx->ipid);
+		return GF_SERVICE_ERROR;
+	}
+
+	u8 *out_data;
+	GF_FilterPacket *dst = gf_filter_pck_new_alloc(ctx->opid, ctx->output_size, &out_data);
+	gf_filter_pck_merge_properties(pck, dst);
+	if (ctx->cfg->fa_map)
+		memset(out_data, 0, ctx->output_size);
+
+	uncv_start_frame(ctx, in_data, in_size);
+
+	for (u32 t_j=0; t_j<ctx->cfg->num_tile_rows; t_j++) {
+		for (u32 t_i=0; t_i<ctx->cfg->num_tile_cols; t_i++) {
+			u32 t_y = t_j * ctx->tile_height;
+			u32 t_x = t_i * ctx->tile_width;
+
+			uncv_start_tile(ctx, ctx->cfg, t_i, t_j);
+			u32 offset_tile = ctx->stride * t_y + ctx->bpp * t_x;
+
+			for (u32 j=0; j<ctx->tile_height; j++) {
+				u32 offset = offset_tile + ctx->stride * j;
+				for (u32 i=0; i<ctx->tile_width; i++) {
+					ctx->read_pixel(ctx, ctx->cfg, t_x + i, t_y+j, out_data, offset);
+					out_dataoffset = ctx->pixel0;
+					if (ctx->bpp==2) {
+						out_dataoffset+1 = ctx->pixel3;
+					} else if (ctx->bpp>2) {
+						out_dataoffset+1 = ctx->pixel1;
+						out_dataoffset+2 = ctx->pixel2;
+						if (ctx->bpp==4)
+							out_dataoffset+3 = ctx->pixel3;
+					}
+
+					offset += ctx->bpp;
+				}
+				uncv_end_line(ctx, ctx->cfg);
+			}
+			uncv_end_tile(ctx);
+		}
+	}
+	gf_filter_pck_send(dst);
+	gf_filter_pid_drop_packet(ctx->ipid);
+	return GF_OK;
+}
+
+static void uncvdec_finalize(GF_Filter *filter)
+{
+	UNCVDecCtx *ctx = (UNCVDecCtx *) gf_filter_get_udta(filter);
+	uncv_reset(ctx);
+}
+
+static const GF_FilterCapability UNCVDecCaps =
+{
+	CAP_UINT(GF_CAPS_INPUT_OUTPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_VISUAL),
+	CAP_BOOL(GF_CAPS_INPUT_EXCLUDED, GF_PROP_PID_UNFRAMED, GF_TRUE),
+	CAP_UINT(GF_CAPS_INPUT, GF_PROP_PID_CODECID, GF_CODECID_RAW_UNCV),
+	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_PIXFMT, GF_PIXEL_UNCV),
+	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_CODECID, GF_CODECID_RAW),
+};
+
+#define OFFS(_n)	#_n, offsetof(UNCVDecCtx, _n)
+
+static const GF_FilterArgs UNCVDecArgs =
+{
+	{ OFFS(force_pf), "ignore possible mapping to GPAC pixel formats", GF_PROP_BOOL, "false", NULL, 0},
+	{ OFFS(no_tile), "ignore tiling info (debug)", GF_PROP_BOOL, "false", NULL, 0},
+	{0}
+};
+
+
+GF_FilterRegister UNCVDecRegister = {
+	.name = "uncvdec",
+	GF_FS_SET_DESCRIPTION("UNCV decoder")
+	GF_FS_SET_HELP("This filter translates UNCV pixel format to a usable pixel format.")
+	.private_size = sizeof(UNCVDecCtx),
+	.priority = 1,
+	.args = UNCVDecArgs,
+	SETCAPS(UNCVDecCaps),
+	.finalize = uncvdec_finalize,
+	.configure_pid = uncvdec_configure_pid,
+	.process = uncvdec_process,
+};
+
+const GF_FilterRegister *uncvdec_register(GF_FilterSession *session)
+{
+	return &UNCVDecRegister;
+}
+#else
+const GF_FilterRegister *uncvdec_register(GF_FilterSession *session)
+{
+	return NULL;
+}
+
+GF_Err rfc_6381_get_codec_uncv(char *szCodec, u32 subtype, u8 *dsi, u32 dsi_size)
+{
+	snprintf(szCodec, RFC6381_CODEC_NAME_SIZE_MAX, "%s", gf_4cc_to_str(subtype));
+	return GF_OK;
+}
+#endif // GPAC_DISABLE_UNCVDEC

gpac-2.2.1.tar.gz/src/filters/dec_vorbis.c -> gpac-2.4.0.tar.gz/src/filters/dec_vorbis.c Changed

gpac-2.2.1.tar.gz/src/filters/dec_vtb.c -> gpac-2.4.0.tar.gz/src/filters/dec_vtb.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2022
+ *			Copyright (c) Telecom ParisTech 2000-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / VideoToolBox decoder filter
@@ -28,7 +28,7 @@
 
 #include <gpac/thread.h>
 
-#if !defined(GPAC_DISABLE_AV_PARSERS) && ( defined(GPAC_CONFIG_DARWIN) || defined(GPAC_CONFIG_IOS) ) && defined(GPAC_HAS_VTB)
+#if !defined(GPAC_DISABLE_AV_PARSERS) && ( defined(GPAC_CONFIG_DARWIN) || defined(GPAC_CONFIG_IOS) ) && defined(GPAC_HAS_VTB) && !defined(GPAC_DISABLE_VTBDEC)
 
 #include <stdint.h>
 
@@ -187,7 +187,7 @@
 	GF_VTBHWFrame *frame;
 	u32 i, count, timescale;
 	u64 cts, dts;
-	assert(ctx->cur_pck);
+	gf_assert(ctx->cur_pck);
 
     if (!image) {
 		if (status != kCVReturnSuccess) {
@@ -228,7 +228,7 @@
 		memset(frame, 0, sizeof(GF_VTBHWFrame));
 	}
 
-	assert( gf_filter_pck_get_seek_flag(ctx->cur_pck) == 0 );
+	gf_assert( gf_filter_pck_get_seek_flag(ctx->cur_pck) == 0 );
 
 	frame->frame_ifce.user_data = frame;
 	frame->frame = CVPixelBufferRetain(image);
@@ -829,7 +829,8 @@
 	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_WIDTH, &PROP_UINT(ctx->width) );
 	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_HEIGHT, &PROP_UINT(ctx->height) );
 	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_STRIDE, &PROP_UINT(ctx->stride) );
-	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_PAR, &PROP_FRAC(ctx->pixel_ar) );
+	if (!gf_filter_pid_get_property(pid, GF_PROP_PID_SAR))
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_SAR, &PROP_FRAC(ctx->pixel_ar) );
 	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_PIXFMT, &PROP_UINT(ctx->pix_fmt) );
 	ctx->profile_supported = GF_FALSE;
 	ctx->can_reconfig = !gf_opts_get_bool("core", "no-reassign");
@@ -854,7 +855,6 @@
 	else gf_bs_reassign_buffer(ctx->ps_bs, data, size);
 
 	if (hevc_nal_type) {
-#if !defined(GPAC_DISABLE_HEVC)
 		if (hevc_nal_type==GF_HEVC_NALU_SEQ_PARAM) {
 			dest = ctx->SPSs;
 			ps_id = gf_hevc_read_sps_bs(ctx->ps_bs, &ctx->hevc);
@@ -870,8 +870,6 @@
 			ps_id = gf_hevc_read_vps_bs(ctx->ps_bs, &ctx->hevc);
 			if (ps_id<0) return;
 		}
-#endif //GPAC_DISABLE_HEVC
-
 	} else {
 		dest = is_sps ? ctx->SPSs : ctx->PPSs;
 
@@ -1032,7 +1030,7 @@
 		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_WIDTH, &PROP_UINT(ctx->width) );
 		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_HEIGHT, &PROP_UINT(ctx->height) );
 		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_STRIDE, &PROP_UINT(ctx->stride) );
-		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_PAR, &PROP_FRAC(ctx->pixel_ar) );
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_SAR, &PROP_FRAC(ctx->pixel_ar) );
 		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_PIXFMT, &PROP_UINT(ctx->pix_fmt) );
 
 		if (ctx->full_range)
@@ -1212,7 +1210,7 @@
 	}
 
 	if (ctx->vtb_session) {
-		assert(ctx->reconfig_needed);
+		gf_assert(ctx->reconfig_needed);
 		return GF_OK;
 	}
 
@@ -1267,7 +1265,10 @@
 		nal_size = gf_media_nalu_next_start_code((u8 *) inBuffer, inBufferLength, &sc_size);
 		if (!sc_size) return GF_NON_COMPLIANT_BITSTREAM;
 		ptr += nal_size + sc_size;
-		assert(inBufferLength >= nal_size + sc_size);
+		if (inBufferLength < nal_size + sc_size) {
+			gf_assert(0);
+			return GF_NON_COMPLIANT_BITSTREAM;
+		}
 		inBufferLength -= nal_size + sc_size;
 	}
 	
@@ -1340,9 +1341,6 @@
 				}
 			}
 		} else if (ctx->is_hevc) {
-#if defined(GPAC_DISABLE_HEVC)
-			return GF_NOT_SUPPORTED;
-#else
 			u8 temporal_id, ayer_id;
 
 			if (!ctx->nal_bs) ctx->nal_bs = gf_bs_new(ptr, nal_size, GF_BITSTREAM_READ);
@@ -1377,8 +1375,6 @@
 					}
 				}
 			}
-#endif
-
 		}
 		
 		//if sps and pps are ready, init decoder
@@ -1579,9 +1575,9 @@
 		gf_filter_pid_set_eos(ctx->opid);
 		return GF_EOS;
 	}
-	assert(ref_pid);
+	gf_assert(ref_pid);
 	pck = gf_filter_pid_get_packet(ref_pid);
-	assert(pck);
+	gf_assert(pck);
 
 	if (ctx->drop_non_refs && !gf_filter_pck_get_sap(pck)) {
 		gf_filter_pid_drop_packet(ref_pid);
@@ -1794,7 +1790,7 @@
 	GF_VTBHWFrame *f = (GF_VTBHWFrame *)frame->user_data;
 	if (! outPlane || !outStride) return GF_BAD_PARAM;
 	*outPlane = NULL;
-	assert(f->frame);
+	gf_assert(f->frame);
 	if (!f->locked) {
 		status = CVPixelBufferLockBaseAddress(f->frame, kCVPixelBufferLock_ReadOnly);
 		if (status != kCVReturnSuccess) {
@@ -2107,7 +2103,7 @@
 
 const GF_FilterRegister *vtbdec_register(GF_FilterSession *session)
 {
-#if !defined(GPAC_DISABLE_AV_PARSERS) && ( defined(GPAC_CONFIG_DARWIN) || defined(GPAC_CONFIG_IOS) ) && defined(GPAC_HAS_VTB)
+#if !defined(GPAC_DISABLE_AV_PARSERS) && ( defined(GPAC_CONFIG_DARWIN) || defined(GPAC_CONFIG_IOS) ) && defined(GPAC_HAS_VTB) && !defined(GPAC_DISABLE_VTBDEC)
 	return &GF_VTBDecCtxRegister;
 #else
 	return NULL;

gpac-2.4.0.tar.gz/src/filters/dec_webcodec.c Added

@@ -0,0 +1,683 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2023
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / WebCodec decoder filter
+ *
+ *  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/media_dev.h>
+#include <gpac/constants.h>
+
+#if defined(GPAC_CONFIG_EMSCRIPTEN)
+
+typedef struct
+{
+	u32 queued;
+
+	GF_Filter *filter;
+	u32 codecid, cfg_crc, timescale;
+	u32 width, height;
+	Bool codec_init;
+	u32 pf, out_size, in_flush;
+
+	u32 af, sample_rate, num_channels, bytes_per_sample;
+
+	GF_FilterPid *ipid, *opid;
+	GF_List *src_pcks;
+	GF_Err error, dec_error;
+	u32 pending_frames, nb_frames;
+	Bool playing;
+	char szCodecRFC6381_CODEC_NAME_SIZE_MAX;
+} GF_WCDecCtx;
+
+GF_EXPORT
+void wcdec_on_error(GF_WCDecCtx *ctx, int state, char *msg)
+{
+	if (!ctx) return;
+	//decode error
+	if (state > 1)
+		ctx->dec_error = GF_BAD_PARAM;
+	else if (state==1) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("WebDec Failed to initialize for codec %s: %s\n", ctx->szCodec, msg ? msg : ""));
+		ctx->error = GF_PROFILE_NOT_SUPPORTED;
+	}
+	else {
+		ctx->error = GF_OK;
+		ctx->codec_init = GF_TRUE;
+	}
+}
+
+EM_JS(int, wcdec_init, (int wc_ctx, int _codec_str, int width, int height, int sample_rate, int num_channels, int dsi, int dsi_size), {
+	let codec_str = _codec_str ? libgpac.UTF8ToString(_codec_str) : null;
+	let config = {};
+	config.codec = codec_str;
+	let dec_class = null;
+	if (width) {
+		config.codedWidth = width;
+		config.codedHeight = height;
+		dec_class = VideoDecoder;
+	} else {
+		config.sampleRate = sample_rate;
+		config.numberOfChannels = num_channels;
+		dec_class = AudioDecoder;
+	}
+	if (dsi_size) {
+		config.description = new Uint8Array(libgpac.HEAPU8.buffer, dsi, dsi_size);
+	}
+
+	if (typeof libgpac._to_webdec != 'function') {
+		libgpac._web_decs = ;
+		libgpac._to_webdec = (ctx) => {
+          for (let i=0; i<libgpac._web_decs.length; i++) {
+            if (libgpac._web_decsi._wc_ctx==ctx) return libgpac._web_decsi;
+          }
+          return null;
+		};
+		libgpac._on_wcdec_error = libgpac.cwrap('wcdec_on_error', null, 'number', 'number', 'string');
+		libgpac._on_wcdec_frame = libgpac.cwrap('wcdec_on_video', null, 'number', 'bigint', 'string', 'number', 'number');
+		libgpac._on_wcdec_audio = libgpac.cwrap('wcdec_on_audio', null, 'number', 'bigint', 'string', 'number', 'number', 'number');
+		libgpac._on_wcdec_flush = libgpac.cwrap('wcdec_on_flush', null, 'number');
+		libgpac._on_wcdec_frame_copy = libgpac.cwrap('wcdec_on_frame_copy', null, 'number', 'number', 'number');
+	}
+	let c = libgpac._to_webdec(wc_ctx);
+	if (!c) {
+		c = {_wc_ctx: wc_ctx, dec: null, _frame: null};
+		libgpac._web_decs.push(c);
+	}
+	dec_class.isConfigSupported(config).then( supported => {
+		if (supported.supported) {
+			if (!c.dec) {
+				let init_info = {
+					error: (e) => {
+						libgpac._on_wcdec_error(c._wc_ctx, 1, ""+e);
+					}
+				};
+				if (width && height) {
+					init_info.output = (frame) => {
+						c._frame = frame;
+						libgpac._on_wcdec_frame(c._wc_ctx, BigInt(frame.timestamp), frame.format, frame.codedWidth, frame.codedHeight);
+						if (c._frame) frame.close();
+					};
+				} else {
+					init_info.output = (frame) => {
+						c._frame = frame;
+						libgpac._on_wcdec_audio(c._wc_ctx, BigInt(frame.timestamp), frame.format, frame.numberOfFrames, frame.numberOfChannels, frame.sampleRate);
+						if (c._frame) frame.close();
+					};
+				}
+
+				c.dec = new dec_class(init_info);
+			}
+			c.dec.configure(config);
+			libgpac._on_wcdec_error(c._wc_ctx, 0, null);
+		} else {
+			libgpac._on_wcdec_error(c._wc_ctx, 1, null);
+		}
+	}).catch( (e) => {
+		libgpac._on_wcdec_error(c._wc_ctx, 1, ""+e);
+	});
+})
+
+static GF_Err wcdec_configure_pid(GF_Filter *filter, GF_FilterPid *pid, Bool is_remove)
+{
+	const GF_PropertyValue *p, *dsi;
+	u32 codecid, dsi_crc;
+	u32 streamtype;
+    GF_WCDecCtx *ctx = gf_filter_get_udta(filter);
+
+	if (is_remove) {
+		if (ctx->opid) {
+			gf_filter_pid_remove(ctx->opid);
+			ctx->opid = NULL;
+		}
+		return GF_OK;
+	}
+	if (! gf_filter_pid_check_caps(pid)) {
+		return GF_NOT_SUPPORTED;
+	}
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_CODECID);
+	if (!p) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("WebDec Missing codecid, cannot initialize\n"));
+		return GF_NOT_SUPPORTED;
+	}
+	codecid = p->value.uint;
+
+
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_STREAM_TYPE);
+	if (!p) return GF_NOT_SUPPORTED;
+	streamtype = p->value.uint;
+
+	dsi = gf_filter_pid_get_property(pid, GF_PROP_PID_DECODER_CONFIG);
+	dsi_crc = dsi ? gf_crc_32(dsi->value.data.ptr, dsi->value.data.size) : 0;
+	if (ctx->codec_init && (codecid==ctx->codecid) && (dsi_crc == ctx->cfg_crc)) return GF_OK;
+
+	ctx->in_flush = 0;
+	ctx->cfg_crc = dsi_crc;
+	ctx->ipid = pid;
+
+	if (!ctx->opid) {
+		ctx->opid = gf_filter_pid_new(filter);
+		gf_filter_pid_set_framing_mode(pid, GF_TRUE);
+	}
+
+	//copy properties at init or reconfig
+	gf_filter_pid_copy_properties(ctx->opid, pid);
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_CODECID, &PROP_UINT(GF_CODECID_RAW) );
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_DECODER_CONFIG, NULL );
+
+	switch (codecid) {
+	//codecs for which we will need a reframer (DSI rebuild, DTS recompute and metadata extraction)
+	case GF_CODECID_AVC:
+	case GF_CODECID_HEVC:
+	case GF_CODECID_VVC:
+	case GF_CODECID_AV1:
+	case GF_CODECID_VP8:
+	case GF_CODECID_VP9:
+	case GF_CODECID_AAC_MPEG2_MP:
+	case GF_CODECID_AAC_MPEG2_LCP:
+	case GF_CODECID_AAC_MPEG2_SSRP:
+	case GF_CODECID_AAC_MPEG4:
+		//check decoder config is ready
+		p = gf_filter_pid_get_property(pid, GF_PROP_PID_DECODER_CONFIG);
+		if (!p) return GF_OK;
+		break;
+	}
+
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_TIMESCALE);
+	ctx->timescale = p ? p->value.uint : 1000;
+	ctx->codecid = codecid;
+	ctx->codec_init = GF_FALSE;
+
+	if (streamtype==GF_STREAM_VISUAL) {
+		p = gf_filter_pid_get_property(pid, GF_PROP_PID_WIDTH);
+		if (!p) return GF_BAD_PARAM;
+		ctx->width = p->value.uint;
+		p = gf_filter_pid_get_property(pid, GF_PROP_PID_HEIGHT);
+		if (!p) return GF_BAD_PARAM;
+		ctx->height = p->value.uint;
+
+		//default to nv12 for most codecs, will be reconfigured when fetching first frame
+		ctx->pf = GF_PIXEL_NV12;
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_PIXFMT, &PROP_UINT(ctx->pf) );
+	} else {
+		p = gf_filter_pid_get_property(pid, GF_PROP_PID_SAMPLE_RATE);
+		if (!p) return GF_BAD_PARAM;
+		ctx->sample_rate = p->value.uint;
+		p = gf_filter_pid_get_property(pid, GF_PROP_PID_NUM_CHANNELS);
+		ctx->num_channels = p ? p->value.uint : 1;
+
+		//default to 32-bit float for most codecs, will be reconfigured when fetching first frame
+		ctx->af = GF_AUDIO_FMT_FLT;
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_AUDIO_FORMAT, &PROP_UINT(ctx->af));
+	}
+	if (codecid==GF_CODECID_OPUS) {
+		strcpy(ctx->szCodec, "opus");
+		dsi = NULL; //if description is set, WebCodec assumes ogg+opus
+	} else {
+		gf_filter_pid_get_rfc_6381_codec_string(pid, ctx->szCodec, GF_FALSE, GF_FALSE, NULL, NULL);
+		strlwr(ctx->szCodec);
+	}
+
+	//create decoder
+	wcdec_init(EM_CAST_PTR ctx,
+		EM_CAST_PTR ctx->szCodec,
+		ctx->width,
+		ctx->height,
+		ctx->sample_rate,
+		ctx->num_channels,
+		dsi ? EM_CAST_PTR dsi->value.data.ptr : 0,
+		dsi ? dsi->value.data.size : 0);
+	return GF_OK;
+}
+
+
+
+EM_JS(int, wcdec_push_frame, (int wc_ctx, int buf, int buf_size, int key, u64 ts), {
+	let c = libgpac._to_webdec(wc_ctx);
+	if (!c || !c.dec) return;
+	const chunk = new EncodedVideoChunk({
+		timestamp: Number(ts),
+		type: key ? "key" : "delta",
+		data: new Uint8Array(libgpac.HEAPU8.buffer, buf, buf_size)
+  });
+  c.dec.decode(chunk);
+})
+
+EM_JS(int, wcdec_push_audio, (int wc_ctx, int buf, int buf_size, int key, u64 ts), {
+	let c = libgpac._to_webdec(wc_ctx);
+	if (!c || !c.dec) return;
+	const chunk = new EncodedAudioChunk({
+		timestamp: Number(ts),
+		type: key ? "key" : "delta",
+		data: new Uint8Array(libgpac.HEAPU8.buffer, buf, buf_size)
+  });
+  c.dec.decode(chunk);
+})
+
+EM_JS(int, wcdec_copy_frame, (int wc_ctx, int dst_pck, int buf, int buf_size), {
+	let c = libgpac._to_webdec(wc_ctx);
+	if (!c || !c._frame || !dst_pck) return;
+
+	//setup dst
+	let ab = new Uint8Array(libgpac.HEAPU8.buffer, buf, buf_size);
+	let frame = c._frame;
+	c._frame = null;
+	frame.copyTo(ab).then( layout => {
+		libgpac._on_wcdec_frame_copy(c._wc_ctx, dst_pck, 1);
+		frame.close();
+	}).catch( e => {
+		libgpac._on_wcdec_frame_copy(c._wc_ctx, dst_pck, 0);
+		frame.close();
+	});
+
+})
+
+GF_EXPORT
+void wcdec_on_frame_copy(GF_WCDecCtx *ctx, GF_FilterPacket *pck, int res_ok)
+{
+	if (!ctx) {
+		return;
+	}
+	ctx->pending_frames--;
+	if (res_ok)
+		gf_filter_pck_send(pck);
+	else
+		gf_filter_pck_discard(pck);
+
+	if (!ctx->pending_frames && (ctx->in_flush==2))
+		gf_filter_pid_set_eos(ctx->opid);
+}
+
+u32 webcodec_pixfmt_to_gpac(char *format)
+{
+	if (!stricmp(format, "I420")) return GF_PIXEL_YUV;
+	else if (!stricmp(format, "I420A")) return GF_PIXEL_YUVA;
+	else if (!stricmp(format, "I422")) return GF_PIXEL_YUV422;
+	else if (!stricmp(format, "I444")) return GF_PIXEL_YUV444;
+	else if (!stricmp(format, "NV12")) return GF_PIXEL_NV12;
+	else if (!stricmp(format, "RGBA")) return GF_PIXEL_RGBA;
+	else if (!stricmp(format, "RGBX")) return GF_PIXEL_RGBX;
+	else if (!stricmp(format, "BGRA")) return GF_PIXEL_BGRA;
+	else if (!stricmp(format, "BGRX")) return GF_PIXEL_BGRX;
+	return 0;
+}
+GF_EXPORT
+void wcdec_on_video(GF_WCDecCtx *ctx, u64 timestamp, char *format, u32 width, u32 height)
+{
+	u32 pf = 0;
+	u8 *output;
+	GF_FilterPacket *dst;
+	if (!ctx) return;
+
+	pf = webcodec_pixfmt_to_gpac(format);
+	if (!pf) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("WebDec Unrecognized pixel format %s\n", format));
+		return;
+	}
+	if ((pf != ctx->pf) || (width != ctx->width) || (height != ctx->height) || !ctx->out_size) {
+		ctx->pf = pf;
+		ctx->width = width;
+		ctx->height = height;
+		gf_pixel_get_size_info(pf, width, height, &ctx->out_size, NULL, NULL, NULL, NULL);
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_WIDTH, &PROP_UINT(width));
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_HEIGHT, &PROP_UINT(height));
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_PIXFMT, &PROP_UINT(pf));
+	}
+
+	s64 cts = gf_timestamp_rescale(timestamp, 1000000, ctx->timescale);
+	GF_FilterPacket *src_pck = NULL;
+	u32 i, count = gf_list_count(ctx->src_pcks);
+	for (i=0; i<count; i++) {
+		src_pck = gf_list_get(ctx->src_pcks, i);
+		if (!src_pck) {
+			continue;
+		}
+		s64 ts = gf_filter_pck_get_cts(src_pck);
+		if (ABS(ts - cts) <= 1) {
+			gf_list_rem(ctx->src_pcks, i);
+			break;
+		}
+		src_pck = NULL;
+	}
+
+	dst = gf_filter_pck_new_alloc(ctx->opid, ctx->out_size, &output);
+	if (!dst) {
+		if (src_pck) gf_filter_pck_unref(src_pck);
+		return;
+	}
+	gf_filter_pck_set_cts(dst, cts);
+	if (src_pck) {
+		gf_filter_pck_merge_properties(src_pck, dst);
+		gf_filter_pck_unref(src_pck);
+	}
+
+	ctx->pending_frames++;
+	ctx->nb_frames++;
+	wcdec_copy_frame(EM_CAST_PTR ctx,
+		EM_CAST_PTR dst,
+		EM_CAST_PTR output, ctx->out_size);
+}
+
+EM_JS(int, wcdec_copy_audio, (int wc_ctx, int buf, int buf_size, int plane_index), {
+	let c = libgpac._to_webdec(wc_ctx);
+	if (!c || !c._frame) return;
+
+	//setup dst
+	let ab = new Uint8Array(libgpac.HEAPU8.buffer, buf, buf_size);
+	c._frame.copyTo(ab, { planeIndex: plane_index });
+})
+
+
+u32 webcodec_audiofmt_to_gpac(char *format)
+{
+	if (!stricmp(format, "u8")) return GF_AUDIO_FMT_U8;
+	else if (!stricmp(format, "s16")) return GF_AUDIO_FMT_S16;
+	else if (!stricmp(format, "s32")) return GF_AUDIO_FMT_S32;
+	else if (!stricmp(format, "f32")) return GF_AUDIO_FMT_FLT;
+	else if (!stricmp(format, "u8-planar")) return GF_AUDIO_FMT_U8P;
+	else if (!stricmp(format, "s16-planar")) return GF_AUDIO_FMT_S16P;
+	else if (!stricmp(format, "s32-planar")) return GF_AUDIO_FMT_S32P;
+	else if (!stricmp(format, "f32-planar")) return GF_AUDIO_FMT_FLTP;
+	return 0;
+}
+
+GF_EXPORT
+void wcdec_on_audio(GF_WCDecCtx *ctx, u64 timestamp, char *format, u32 num_frames, u32 num_channels, u32 sample_rate)
+{
+	u32 af = 0;
+	u8 *output;
+	GF_FilterPacket *dst;
+	if (!ctx) return;
+
+	af = webcodec_audiofmt_to_gpac(format);
+	if (!af) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("WebDec Unrecognized pixel format %s\n", format));
+		return;
+	}
+	if ((sample_rate != ctx->sample_rate) || (af != ctx->af) || (num_channels != ctx->num_channels)) {
+		ctx->sample_rate = sample_rate;
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_SAMPLE_RATE, &PROP_UINT(sample_rate));
+		ctx->af = af;
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_AUDIO_FORMAT, &PROP_UINT(af));
+		ctx->num_channels = num_channels;
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_NUM_CHANNELS, &PROP_UINT(num_channels));
+		ctx->bytes_per_sample = gf_audio_fmt_bit_depth(af) / 8;
+	}
+
+	s64 cts = gf_timestamp_rescale(timestamp, 1000000, ctx->timescale);
+
+	GF_FilterPacket *src_pck = NULL;
+	u32 i, count = gf_list_count(ctx->src_pcks);
+	for (i=0; i<count; i++) {
+		src_pck = gf_list_get(ctx->src_pcks, i);
+		if (!src_pck) {
+			continue;
+		}
+		s64 ts = gf_filter_pck_get_cts(src_pck);
+		if (ABS(ts - cts) <= 1) {
+			gf_list_rem(ctx->src_pcks, i);
+			break;
+		}
+		src_pck = NULL;
+	}
+	u32 output_size = ctx->bytes_per_sample*num_frames*num_channels;
+	dst = gf_filter_pck_new_alloc(ctx->opid, output_size, &output);
+	if (!dst) {
+		if (src_pck) gf_filter_pck_unref(src_pck);
+		return;
+	}
+	gf_filter_pck_set_cts(dst, cts);
+	if (src_pck) {
+		gf_filter_pck_merge_properties(src_pck, dst);
+		gf_filter_pck_unref(src_pck);
+	}
+
+	//audioData copyTo is sync
+	u32 num_planes, plane_size;
+	if (gf_audio_fmt_is_planar(af)) {
+		num_planes = num_channels;
+		plane_size = ctx->bytes_per_sample*num_frames;
+	} else {
+		num_planes = 1;
+		plane_size = ctx->bytes_per_sample*num_frames*num_channels;
+	}
+
+	for (i=0; i<num_planes; i++) {
+		u8 *buf = output + i * plane_size;
+		wcdec_copy_audio(EM_CAST_PTR ctx, EM_CAST_PTR buf, plane_size, i);
+	}
+	gf_filter_pck_send(dst);
+}
+
+GF_EXPORT
+void wcdec_on_flush(GF_WCDecCtx *ctx)
+{
+	ctx->in_flush = 2;
+	if (!ctx->pending_frames)
+		gf_filter_pid_set_eos(ctx->opid);
+}
+
+EM_JS(int, wcdec_flush, (int wc_ctx), {
+	let c = libgpac._to_webdec(wc_ctx);
+	if (!c || !c.dec) return;
+	c.dec.flush().then( () => { libgpac._on_wcdec_flush(c._wc_ctx); }).catch ( (e) => { libgpac._on_wcdec_flush(c._wc_ctx); } );
+})
+
+
+static GF_Err wcdec_process(GF_Filter *filter)
+{
+	u64 cts=0;
+	GF_Err e;
+	const u8 *in_buffer;
+	u32 in_buffer_size;
+	GF_FilterSAPType sap;
+	GF_WCDecCtx *ctx = gf_filter_get_udta(filter);
+	GF_FilterPacket *pck;
+
+	if (ctx->error)
+		return ctx->error;
+
+	if (!ctx->codec_init) {
+		//force fetch first packet if not init, in case decoder config was not ready at setup
+		gf_filter_pid_get_packet(ctx->ipid);
+		return GF_OK;
+	}
+
+	if (!ctx->playing) {
+		if (ctx->pending_frames) {
+			gf_filter_post_process_task(filter);
+		}
+		return GF_OK;
+	}
+
+	while (!ctx->dec_error) {
+		pck = gf_filter_pid_get_packet(ctx->ipid);
+		if (!pck) {
+			if (gf_filter_pid_is_eos(ctx->ipid)) {
+				if (!ctx->in_flush) {
+					ctx->in_flush = 1;
+					wcdec_flush(EM_CAST_PTR ctx);
+				}
+				if ((ctx->in_flush==1) || ((ctx->in_flush==2) && ctx->pending_frames)) {
+					gf_filter_post_process_task(filter);
+					return GF_OK;
+				}
+				return GF_EOS;
+			}
+			//keep filter alive while we have pending frames to make sure session is not destroyed while waiting for video frame copy promise to complete
+			else if (ctx->pending_frames) {
+				gf_filter_post_process_task(filter);
+			}
+			return GF_OK;
+		}
+		ctx->in_flush = 0;
+		//don't push too fast
+		if (gf_list_count(ctx->src_pcks) > ctx->queued) {
+			//ask for later processing to trigger breaking of scheduler loop in case of threading
+			gf_filter_ask_rt_reschedule(filter, 500);
+			return GF_OK;
+		}
+		in_buffer = (u8 *) gf_filter_pck_get_data(pck, &in_buffer_size);
+		cts = gf_timestamp_rescale(gf_filter_pck_get_cts(pck), ctx->timescale, 1000000);
+		sap = gf_filter_pck_get_sap(pck);
+		//queue input
+		if (ctx->width) {
+			wcdec_push_frame(EM_CAST_PTR ctx, EM_CAST_PTR in_buffer, in_buffer_size, sap ? 1 : 0, cts);
+		} else {
+			wcdec_push_audio(EM_CAST_PTR ctx, EM_CAST_PTR in_buffer, in_buffer_size, sap ? 1 : 0, cts);
+		}
+
+		gf_filter_pck_ref_props(&pck);
+		gf_list_add(ctx->src_pcks, pck);
+		gf_filter_pid_drop_packet(ctx->ipid);
+	}
+	e = ctx->dec_error;
+	ctx->dec_error = GF_OK;
+	return e;
+}
+
+static Bool wcdec_process_event(GF_Filter *filter, const GF_FilterEvent *evt)
+{
+    GF_WCDecCtx *ctx = gf_filter_get_udta(filter);
+	switch (evt->base.type) {
+	case GF_FEVT_PLAY:
+		ctx->playing = GF_TRUE;
+		break;
+	case GF_FEVT_STOP:
+		ctx->playing = GF_FALSE;
+		break;
+	default:
+		break;
+	}
+	return GF_FALSE;
+}
+
+GF_Err wcdec_initialize(GF_Filter *filter)
+{
+    GF_WCDecCtx *ctx = gf_filter_get_udta(filter);
+    ctx->filter = filter;
+	ctx->src_pcks = gf_list_new();
+    return GF_OK;
+}
+
+EM_JS(int, wcdec_del, (int wc_ctx), {
+	if (! Array.isArray(libgpac._web_decs) ) return;
+	for (let i=0; i<libgpac._web_decs.length; i++) {
+		if (libgpac._web_decsi._wc_ctx == wc_ctx) {
+			libgpac._web_decsi._wc_ctx = null;
+			libgpac._web_decs.splice(i, 1);
+			return;
+		}
+	}
+})
+
+
+void wcdec_finalize(GF_Filter *filter)
+{
+    GF_WCDecCtx *ctx = gf_filter_get_udta(filter);
+    wcdec_del(EM_CAST_PTR ctx);
+
+    while (gf_list_count(ctx->src_pcks)) {
+		GF_FilterPacket *pck = gf_list_pop_back(ctx->src_pcks);
+		gf_filter_pck_unref(pck);
+	}
+	gf_list_del(ctx->src_pcks);
+}
+
+static GF_FilterCapability WCDecCapsV =
+{
+	CAP_UINT(GF_CAPS_INPUT_OUTPUT,GF_PROP_PID_STREAM_TYPE, GF_STREAM_VISUAL),
+	CAP_BOOL(GF_CAPS_INPUT_EXCLUDED, GF_PROP_PID_UNFRAMED, GF_TRUE),
+	CAP_UINT(GF_CAPS_INPUT_EXCLUDED, GF_PROP_PID_CODECID, GF_CODECID_RAW),
+	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_CODECID, GF_CODECID_RAW),
+};
+
+static GF_FilterCapability WCDecCapsA =
+{
+	CAP_UINT(GF_CAPS_INPUT_OUTPUT,GF_PROP_PID_STREAM_TYPE, GF_STREAM_AUDIO),
+	CAP_BOOL(GF_CAPS_INPUT_EXCLUDED, GF_PROP_PID_UNFRAMED, GF_TRUE),
+	CAP_UINT(GF_CAPS_INPUT_EXCLUDED, GF_PROP_PID_CODECID, GF_CODECID_RAW),
+	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_CODECID, GF_CODECID_RAW),
+};
+
+static GF_FilterCapability WCDecCapsAV =
+{
+	CAP_UINT(GF_CAPS_INPUT_OUTPUT,GF_PROP_PID_STREAM_TYPE, GF_STREAM_VISUAL),
+	CAP_BOOL(GF_CAPS_INPUT_EXCLUDED, GF_PROP_PID_UNFRAMED, GF_TRUE),
+	CAP_UINT(GF_CAPS_INPUT_EXCLUDED, GF_PROP_PID_CODECID, GF_CODECID_RAW),
+	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_CODECID, GF_CODECID_RAW),
+	{0},
+	CAP_UINT(GF_CAPS_INPUT_OUTPUT,GF_PROP_PID_STREAM_TYPE, GF_STREAM_AUDIO),
+	CAP_BOOL(GF_CAPS_INPUT_EXCLUDED, GF_PROP_PID_UNFRAMED, GF_TRUE),
+	CAP_UINT(GF_CAPS_INPUT_EXCLUDED, GF_PROP_PID_CODECID, GF_CODECID_RAW),
+	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_CODECID, GF_CODECID_RAW)
+};
+
+#define OFFS(_n)	#_n, offsetof(GF_WCDecCtx, _n)
+
+static const GF_FilterArgs WCDecArgs =
+{
+	{ OFFS(queued), "Maximum number of packets to queue in webcodec instance", GF_PROP_UINT, "10", NULL, 0},
+	{0}
+};
+
+GF_FilterRegister GF_WCDecCtxRegister = {
+	.name = "wcdec",
+	GF_FS_SET_DESCRIPTION("WebCodec decoder")
+	GF_FS_SET_HELP("This filter decodes video streams using WebCodec decoder of the browser")
+	.args = WCDecArgs,
+	SETCAPS(WCDecCapsAV),
+	.flags = GF_FS_REG_SINGLE_THREAD|GF_FS_REG_ASYNC_BLOCK,
+	.private_size = sizeof(GF_WCDecCtx),
+	.initialize = wcdec_initialize,
+	.finalize = wcdec_finalize,
+	.configure_pid = wcdec_configure_pid,
+	.process = wcdec_process,
+	.process_event = wcdec_process_event,
+};
+
+
+const GF_FilterRegister *wcdec_register(GF_FilterSession *session)
+{
+	int has_webv_decode = EM_ASM_INT({
+		if (typeof VideoDecoder == 'undefined') return 0;
+		return 1;
+	});
+	int has_weba_decode = EM_ASM_INT({
+		if (typeof AudioDecoder == 'undefined') return 0;
+		return 1;
+	});
+
+	if (!has_webv_decode && !has_weba_decode) {
+		GF_LOG(GF_LOG_INFO, GF_LOG_CODEC, ("WebDec No WebDecoder support\n"));
+		return NULL;
+	}
+	if (!has_webv_decode) {
+		GF_WCDecCtxRegister.caps = WCDecCapsA;
+		GF_WCDecCtxRegister.nb_caps = sizeof(WCDecCapsA)/sizeof(GF_FilterCapability);
+	} else if (!has_weba_decode) {
+		GF_WCDecCtxRegister.caps = WCDecCapsV;
+		GF_WCDecCtxRegister.nb_caps = sizeof(WCDecCapsV)/sizeof(GF_FilterCapability);
+	}
+	GF_LOG(GF_LOG_INFO, GF_LOG_CODEC, ("WebDec AudioDecoder %d - VideoDecoder %d\n", has_weba_decode, has_webv_decode));
+	return &GF_WCDecCtxRegister;
+}
+#endif

gpac-2.2.1.tar.gz/src/filters/dec_webvtt.c -> gpac-2.4.0.tar.gz/src/filters/dec_webvtt.c Changed

@@ -2,7 +2,7 @@
  *					GPAC Multimedia Framework
  *
  *			Authors: Cyril Concolato - Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2013-2022
+ *			Copyright (c) Telecom ParisTech 2013-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / WebVTT decoder filter
@@ -27,7 +27,7 @@
 #include <gpac/filters.h>
 #include <gpac/constants.h>
 
-#if !defined(GPAC_DISABLE_VTT) && !defined(GPAC_DISABLE_SVG) && defined(GPAC_HAS_QJS)
+#if !defined(GPAC_DISABLE_VTT) && !defined(GPAC_DISABLE_SVG) && defined(GPAC_HAS_QJS) && !defined(GPAC_DISABLE_COMPOSITOR)
 
 #include <gpac/internal/isomedia_dev.h>
 #include <gpac/internal/media_dev.h>
@@ -183,7 +183,7 @@
 	}
 	//TODO: we need to cleanup cap checking upon reconfigure
 	if (ctx->ipid && !gf_filter_pid_check_caps(pid)) return GF_NOT_SUPPORTED;
-	assert(!ctx->ipid || (ctx->ipid == pid));
+	gf_assert(!ctx->ipid || (ctx->ipid == pid));
 
 	p = gf_filter_pid_get_property(pid, GF_PROP_PID_DELAY);
 	ctx->delay = p ? p->value.longsint : 0;
@@ -594,7 +594,7 @@
 
 const GF_FilterRegister *vttdec_register(GF_FilterSession *session)
 {
-#if !defined(GPAC_DISABLE_VTT) && !defined(GPAC_DISABLE_SVG) && defined(GPAC_HAS_QJS)
+#if !defined(GPAC_DISABLE_VTT) && !defined(GPAC_DISABLE_SVG) && defined(GPAC_HAS_QJS) && !defined(GPAC_DISABLE_COMPOSITOR)
 	return &VTTDecRegister;
 #else
 	return NULL;

gpac-2.2.1.tar.gz/src/filters/dec_xvid.c -> gpac-2.4.0.tar.gz/src/filters/dec_xvid.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2021
+ *			Copyright (c) Telecom ParisTech 2000-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / MPEG-4 visual p2 xvid decoder filter
@@ -224,7 +224,8 @@
 	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_WIDTH, &PROP_UINT(ctx->width) );
 	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_HEIGHT, &PROP_UINT(ctx->height) );
 	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_STRIDE, &PROP_UINT(ctx->width) );
-	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_PAR, &PROP_FRAC(ctx->pixel_ar) );
+	if (!gf_filter_pid_get_property(ctx->ipid, GF_PROP_PID_SAR))
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_SAR, &PROP_FRAC(ctx->pixel_ar) );
 	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_PIXFMT, &PROP_UINT(GF_PIXEL_YUV) );
 
 	return GF_OK;
@@ -259,13 +260,13 @@
 	GF_FilterPacket *pck, *pck_ref, *src_pck, *dst_pck;
 
 	pck = gf_filter_pid_get_packet(ctx->ipid);
-
 	if (!ctx->codec)
 		return ctx->cfg_crc ? GF_SERVICE_ERROR : GF_OK;
 
+flush_dec:
 	memset(&frame, 0, sizeof(frame));
 	if (pck) {
-		u64 cts = gf_filter_pck_get_cts(pck);;
+		u64 cts = gf_filter_pck_get_cts(pck);
 		frame.bitstream = (char *) gf_filter_pck_get_data(pck, &frame.length);
 
 		//append in cts order since we get output frames in cts order
@@ -415,7 +416,8 @@
 	}
 	//flush all frames if eos is detected
 	else if (gf_filter_pid_is_eos(ctx->ipid)) {
-		return xviddec_process(filter);
+		//avoid recursive call
+		goto flush_dec;
 	}
 
 	return GF_OK;

gpac-2.2.1.tar.gz/src/filters/decrypt_cenc_isma.c -> gpac-2.4.0.tar.gz/src/filters/decrypt_cenc_isma.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2018-2022
+ *			Copyright (c) Telecom ParisTech 2018-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / CENC and ISMA decrypt filter
@@ -32,10 +32,15 @@
 #include <gpac/network.h>
 #include <gpac/internal/media_dev.h>
 
-#ifndef GPAC_DISABLE_CRYPTO
+#if !defined(GPAC_DISABLE_CRYPTO) && !defined(GPAC_DISABLE_CDCRYPT)
 
 //#define OLD_KEY_FETCHERS
 
+//old key fetchers require sync download
+#if defined(GPAC_CONFIG_EMSCRIPTEN) && defined(OLD_KEY_FETCHERS)
+#undef OLD_KEY_FETCHERS
+#endif
+
 enum
 {
 	DECRYPT_STATE_ERROR=1,
@@ -48,6 +53,9 @@
 	DECRYPT_FULL=0,
 	DECRYPT_NOKEY,
 	DECRYPT_SKIP,
+	DECRYPT_PAD0,
+	DECRYPT_PAD1,
+	DECRYPT_PADSC,
 };
 
 typedef struct
@@ -59,6 +67,26 @@
 
 typedef struct
 {
+	const char *cfile;
+	u32 decrypt;
+	GF_PropUIntList drop_keys;
+	GF_PropStringList kids;
+	GF_PropStringList keys;
+	GF_CryptInfo *cinfo;
+	Bool hls_cenc_patch_iv;
+
+	GF_Filter *filter;
+	GF_List *streams;
+	GF_BitStream *bs_r;
+
+	GF_DownloadManager *dm;
+	u32 pending_keys;
+
+} GF_CENCDecCtx;
+
+typedef struct
+{
+	GF_CENCDecCtx *ctx;
 	GF_FilterPid *ipid, *opid;
 
 	u32 state;
@@ -107,24 +135,14 @@
 	bin128 master_key;
 
 	u32 clearkey_crc;
-} GF_CENCDecStream;
-
-typedef struct
-{
-	const char *cfile;
-	u32 decrypt;
-	GF_PropUIntList drop_keys;
-	GF_PropStringList kids;
-	GF_PropStringList keys;
-	GF_CryptInfo *cinfo;
-	Bool hls_cenc_patch_iv;
+	char *body;
+	u32 res_size;
+	Bool hdr_done;
+	GF_DownloadSession *sess;
 
-	GF_Filter *filter;
-	GF_List *streams;
-	GF_BitStream *bs_r;
 
-	GF_DownloadManager *dm;
-} GF_CENCDecCtx;
+	u32 rep_crc, per_crc, as_id;
+} GF_CENCDecStream;
 
 
 #ifdef OLD_KEY_FETCHERS
@@ -337,7 +355,7 @@
 		char IV16;
 		if (cstr->state != DECRYPT_STATE_SETUP)
 			return GF_SERVICE_ERROR;
-		assert(!cstr->crypts0.crypt);
+		gf_assert(!cstr->crypts0.crypt);
 
 		//if (!ctx->nb_allow_play) return GF_AUTHENTICATION_FAILURE;
 		//ctx->nb_allow_play--;
@@ -595,15 +613,13 @@
 			Bool match = GF_FALSE;
 			if (cstr->is_hls) {
 				match = GF_TRUE;
-			} else if (cstr->KIDsj) {
-				if (!memcmp(KID, cstr->KIDsj, 16) || !memcmp(blank_KID, cstr->KIDsj, 16) ) {
-					match = GF_TRUE;
-				}
+			} else if (!memcmp(KID, cstr->KIDsj, 16) || !memcmp(blank_KID, cstr->KIDsj, 16) ) {
+				match = GF_TRUE;
 			}
 			if (match) {
 				memcpy(cstr->cryptsi.key, cstr->keysj, 16);
 				found = GF_TRUE;
-				if (ctx->decrypt==DECRYPT_SKIP) {
+				if (ctx->decrypt>=DECRYPT_SKIP) {
 					cstr->cryptsi.key_valid = GF_FALSE;
 				} else {
 					cstr->cryptsi.key_valid = GF_TRUE;
@@ -639,63 +655,144 @@
 	return GF_OK;
 }
 
-typedef struct
+static GF_Err rfmt_dec_b64(u8 *data, u8 *output, u32 osize)
 {
-	u8 *data;
-	u32 data_len;
-	Bool hdr_done;
-} ClearKeyParam;
+	u32 len, i=0;
+	while (datai) {
+		if (datai == '-') datai = '+';
+		else if (datai == '_') datai = '/';
+		i++;
+	}
+	len = (u32) strlen(data);
+	switch (len%4) {
+	case 0: break;
+	case 2: strcat(data, "=="); break;
+	case 3: strcat(data, "="); break;
+	default: return GF_NON_COMPLIANT_BITSTREAM;
+	}
+	len = gf_base64_decode(data, (u32) strlen(data), output, osize);
+	if (len != 16) return GF_NON_COMPLIANT_BITSTREAM;
+	return GF_OK;
+}
 
+#ifdef GPAC_USE_DOWNLOADER
 static void ck_http_io(void *usr_cbk, GF_NETIO_Parameter *par)
 {
+	GF_CENCDecStream *cstr = usr_cbk;
 	switch (par->msg_type) {
 	case GF_NETIO_GET_METHOD:
 		par->name = "POST";
 		break;
 	case GF_NETIO_GET_HEADER:
-		if (! ((ClearKeyParam*)usr_cbk)->hdr_done) {
-			((ClearKeyParam*)usr_cbk)->hdr_done = GF_TRUE;
+		if (!cstr->hdr_done) {
+			cstr->hdr_done = GF_TRUE;
 			par->name = "Content-Type";
 			par->value = "application/json";
 		}
 		break;
 	case GF_NETIO_GET_CONTENT:
-		par->data = ((ClearKeyParam*)usr_cbk)->data;
-		par->size = ((ClearKeyParam*)usr_cbk)->data_len;
+		par->data = cstr->body;
+		par->size = (u32) strlen(cstr->body);
+		cstr->res_size = 0;
 		break;
-	default:
+	case GF_NETIO_DATA_EXCHANGE:
+		if (!cstr->res_size) {
+			if (cstr->body) gf_free(cstr->body);
+			cstr->body = NULL;
+		}
+		cstr->body = gf_realloc(cstr->body, (cstr->res_size + par->size + 1));
+		if (!cstr->body) {
+			cstr->state = DECRYPT_STATE_ERROR;
+			break;
+		}
+		memcpy(cstr->body + cstr->res_size, par->data, par->size);
+		cstr->res_size+=par->size;
+		cstr->bodycstr->res_size = 0;
 		break;
-	}
-}
+	case GF_NETIO_DATA_TRANSFERED:
+	{
+		//extract kids and keys from json
+		GF_Err e = GF_OK;
+		u32 key_idx=0;
+		char *ptr = cstr->body;
+		while (1) {
+			char *k = strstr(ptr, "\"k\"");
+			char *kid = strstr(ptr, "\"kid\"");
+			if (!k || !kid) break;
+			k+=3;
+			kid+=5;
+			while (k0 && (k0 != '"')) k++;
+			while (kid0 && (kid0 != '"')) kid++;
+			if ((k0 != '"') || (kid0 != '"')) {
+				e = GF_NON_COMPLIANT_BITSTREAM;
+				break;
+			}
 
-static GF_Err rfmt_dec_b64(u8 *data, u8 *output, u32 osize)
-{
-	u32 len, i=0;
-	while (datai) {
-		if (datai == '-') datai = '+';
-		else if (datai == '_') datai = '/';
-		i++;
+			k++;
+			kid++;
+			char *s1 = strchr(k, '"');
+			char *s2 = strchr(kid, '"');
+			if (!s1 || !s2) {
+				e = GF_NON_COMPLIANT_BITSTREAM;
+				break;
+			}
+			s10 = 0;
+			s20 = 0;
+
+			u8 key_val20, kid_val20;
+			e = rfmt_dec_b64(k, key_val, 20);
+			if (e) break;
+			e = rfmt_dec_b64(kid, kid_val, 20);
+			if (e) break;
+
+			cstr->keys = gf_realloc(cstr->keys, sizeof(bin128)*(key_idx+1));
+			cstr->KIDs = gf_realloc(cstr->KIDs, sizeof(bin128)*(key_idx+1));
+			memcpy(cstr->keyskey_idx, key_val, sizeof(bin128));
+			memcpy(cstr->KIDskey_idx, kid_val, sizeof(bin128));
+			key_idx++;
+			if (s1 < s2) ptr = s2+1;
+			else ptr = s1+1;
+		}
+		if (!e) {
+			cstr->KID_count = key_idx;
+
+			if (!cstr->crypts) {
+				cstr->crypts = gf_malloc(sizeof(CENCDecKey));
+				memset(cstr->crypts, 0, sizeof(CENCDecKey));
+			}
+			memcpy(cstr->crypts0.key, cstr->keys0, sizeof(bin128));
+			cstr->crypts0.key_valid = 1;
+		} else {
+			cstr->state = DECRYPT_STATE_ERROR;
+		}
+		if (cstr->body) gf_free(cstr->body);
+		cstr->body = NULL;
+		gf_dm_sess_del(cstr->sess);
+		cstr->sess = NULL;
+		cstr->ctx->pending_keys--;
 	}
-	len = (u32) strlen(data);
-	switch (len%4) {
-	case 0: break;
-	case 2: strcat(data, "=="); break;
-	case 3: strcat(data, "="); break;
-	default: return GF_NON_COMPLIANT_BITSTREAM;
+		break;
+	case GF_NETIO_STATE_ERROR:
+		if (cstr->sess) {
+			gf_dm_sess_del(cstr->sess);
+			cstr->sess = NULL;
+			cstr->ctx->pending_keys--;
+			if (cstr->body) gf_free(cstr->body);
+			cstr->body = NULL;
+		}
+		break;
+	default:
+		break;
 	}
-	len = gf_base64_decode(data, (u32) strlen(data), output, osize);
-	if (len != 16) return GF_NON_COMPLIANT_BITSTREAM;
-	return GF_OK;
 }
+#endif
+
 
-#define CK_MAX_BUF	1000
 static GF_Err cenc_dec_set_clearkey(GF_CENCDecCtx *ctx, GF_CENCDecStream *cstr, char *ck_url, u8 *ck_kid)
 {
 	GF_Err e;
-	char data6432, bodyCK_MAX_BUF;
-	ClearKeyParam ckp;
-	memset(&ckp, 0, sizeof(ClearKeyParam));
-	u32 i, res = gf_base64_encode(ck_kid, 16, data64, 32);
+	char data6432;
+	u32 i, cklen, res = gf_base64_encode(ck_kid, 16, data64, 32);
 	data64res=0;
 	for (i=0; i<res; i++) {
 		if (data64i=='+') data64i = '-';
@@ -706,92 +803,86 @@
 		res--;
 		if (!res) break;
 	}
-	strcpy(body, "{\"kids\": \"");
-	strcat(body, data64);
-	strcat(body, "\", \"type\":\"temporary\"}");
-	ckp.data = body;
-	ckp.data_len = (u32) strlen(body);
+	if (cstr->body) gf_free(cstr->body);
+	cstr->body = NULL;
+	gf_dynstrcat(&cstr->body, "{\"kids\": \"", NULL);
+	gf_dynstrcat(&cstr->body, data64, NULL);
+	gf_dynstrcat(&cstr->body, "\", \"type\":\"temporary\"}", NULL);
 
-	u32 crc = gf_crc_32(ckp.data, ckp.data_len);
+	cklen = (u32) strlen(cstr->body);
+	u32 crc = gf_crc_32(cstr->body, cklen);
 	if (cstr->clearkey_crc == crc) return GF_OK;
-	cstr->clearkey_crc = crc;
 
+#ifdef GPAC_USE_DOWNLOADER
 	GF_DownloadManager *dm = gf_filter_get_download_manager(ctx->filter);
-	GF_DownloadSession *sess = gf_dm_sess_new(dm, ck_url, GF_NETIO_SESSION_NOT_THREADED | GF_NETIO_SESSION_NOT_CACHED, ck_http_io, &ckp, &e);
+	cstr->sess = gf_dm_sess_new(dm, ck_url, 0, ck_http_io, cstr, &e);
 	if (e) return e;
+	ctx->pending_keys++;
+	return gf_dm_sess_process(cstr->sess);
+#else
+	return GF_NOT_SUPPORTED;
+#endif
+}
 
-	u32 nb_read=0;
-	while (1) {
-		u32 nread=0;
-		e = gf_dm_sess_fetch_data(sess, body + nb_read, CK_MAX_BUF-nb_read, &nread);
-		nb_read += nread;
-		if (nb_read >= CK_MAX_BUF) e = GF_BUFFER_TOO_SMALL;
-
-		if ((e<0) && (e != GF_IP_NETWORK_EMPTY)) break;
-		if (e == GF_EOS) {
-			break;
-		}
-	}
-	gf_dm_sess_del(sess);
-	if (e<GF_OK) return e;
-
-	//extract kids and keys from json
-	u32 key_idx=0;
-	char *ptr = body;
-	while (1) {
-		char *k = strstr(ptr, "\"k\"");
-		char *kid = strstr(ptr, "\"kid\"");
-		if (!k || !kid) break;
-		k+=3;
-		kid+=5;
-		while (k0 && (k0 != '"')) k++;
-		while (kid0 && (kid0 != '"')) kid++;
-		if ((k0 != '"') || (kid0 != '"')) {
-			e = GF_NON_COMPLIANT_BITSTREAM;
-			break;
-		}
-
-		k++;
-		kid++;
-		char *s1 = strchr(k, '"');
-		char *s2 = strchr(kid, '"');
-		if (!s1 || !s2) {
-			e = GF_NON_COMPLIANT_BITSTREAM;
-			break;
+#ifdef GPAC_USE_DOWNLOADER
+static void hls_kms_io(void *usr_cbk, GF_NETIO_Parameter *par)
+{
+	GF_CENCDecStream *cstr = (GF_CENCDecStream *)usr_cbk;
+	if (par->msg_type==GF_NETIO_DATA_EXCHANGE) {
+		if (cstr->state == DECRYPT_STATE_ERROR)
+			return;
+
+		if (!cstr->res_size) {
+			if (cstr->body) gf_free(cstr->body);
+			cstr->body = NULL;
+		}
+		if (cstr->res_size > 32) {
+			cstr->state = DECRYPT_STATE_ERROR;
+			return;
+		}
+		cstr->body = gf_realloc(cstr->body, (cstr->res_size + par->size + 1));
+		if (!cstr->body) {
+			cstr->state = DECRYPT_STATE_ERROR;
+			return;
+		}
+		memcpy(cstr->body + cstr->res_size, par->data, par->size);
+		cstr->res_size+=par->size;
+		cstr->bodycstr->res_size = 0;
+	} else if (par->msg_type==GF_NETIO_DATA_TRANSFERED) {
+		if (cstr->body && (cstr->res_size <= 32)) {
+			//first 16 bytes is the key, in some case we have IV repeated after the key (to do ?)
+			memcpy(cstr->keys0, cstr->body, sizeof(bin128));
+
+			//load keys
+			if (!cstr->crypts) {
+				cstr->crypts = gf_malloc(sizeof(CENCDecKey));
+				memset(cstr->crypts, 0, sizeof(CENCDecKey));
+			}
+			memcpy(cstr->crypts0.key, cstr->keys0, sizeof(bin128));
+			cstr->crypts0.key_valid = 1;
+		} else {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("CENC/HLS Invalid key size, greater than 16 bytes\n"))
+			cstr->state = DECRYPT_STATE_ERROR;
+		}
+		if (cstr->body) gf_free(cstr->body);
+		cstr->body = NULL;
+		gf_dm_sess_del(cstr->sess);
+		cstr->sess = NULL;
+		cstr->ctx->pending_keys--;
+	} else if (par->msg_type==GF_NETIO_STATE_ERROR) {
+		if (cstr->sess) {
+			gf_dm_sess_del(cstr->sess);
+			cstr->sess = NULL;
+			cstr->ctx->pending_keys--;
+			if (cstr->body) gf_free(cstr->body);
+			cstr->body = NULL;
 		}
-		s10 = 0;
-		s20 = 0;
-
-		u8 key_val20, kid_val20;
-		e = rfmt_dec_b64(k, key_val, 20);
-		if (e) break;
-		e = rfmt_dec_b64(kid, kid_val, 20);
-		if (e) break;
-
-		cstr->keys = gf_realloc(cstr->keys, sizeof(bin128)*(key_idx+1));
-		cstr->KIDs = gf_realloc(cstr->KIDs, sizeof(bin128)*(key_idx+1));
-		memcpy(cstr->keyskey_idx, key_val, sizeof(bin128));
-		memcpy(cstr->KIDskey_idx, kid_val, sizeof(bin128));
-		key_idx++;
-		if (s1 < s2) ptr = s2+1;
-		else ptr = s1+1;
-	}
-	if (e) return e;
-	cstr->KID_count = key_idx;
-
-	if (!cstr->crypts) {
-		cstr->crypts = gf_malloc(sizeof(CENCDecKey));
-		memset(cstr->crypts, 0, sizeof(CENCDecKey));
 	}
-	memcpy(cstr->crypts0.key, cstr->keys0, sizeof(bin128));
-	cstr->crypts0.key_valid = 1;
-	return GF_OK;
 }
+#endif
 
 static GF_Err cenc_dec_set_hls_key(GF_CENCDecCtx *ctx, GF_CENCDecStream *cstr, char *key_url, u8 *key_IV)
 {
-	GF_Err e;
-
 	cstr->is_hls = GF_TRUE;
 
 	//copy IV
@@ -858,35 +949,19 @@
 	}
 	//load key
 	else {
-		u32 nb_read=0;
-		u8 key_data100;
+		GF_Err e = GF_SERVICE_ERROR;
+#ifdef GPAC_USE_DOWNLOADER
 		GF_DownloadManager *dm = gf_filter_get_download_manager(ctx->filter);
-		GF_DownloadSession *sess = gf_dm_sess_new(dm, key_url, GF_NETIO_SESSION_NOT_THREADED | GF_NETIO_SESSION_NOT_CACHED, NULL, NULL, &e);
+		GF_DownloadSession *sess = gf_dm_sess_new(dm, key_url, GF_NETIO_SESSION_NOT_CACHED, hls_kms_io, cstr, &e);
 		if (e) {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("CENC/HLS Failed to setup download session for key %s: %s\n", key_url, gf_error_to_string(e)))
 			return e;
 		}
-		while (1) {
-			u32 nread=0;
-			e = gf_dm_sess_fetch_data(sess, key_data + nb_read, 100-nb_read, &nread);
-			nb_read += nread;
-			if (nb_read > 16) break;
-
-			if ((e<0) && (e != GF_IP_NETWORK_EMPTY)) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("CENC/HLS Failed to download key %s: %s\n", key_url, gf_error_to_string(e)))
-				return e;
-			}
-			if (e == GF_EOS) {
-				break;
-			}
-		}
-		//first 16 bytes is the key, in some case we have IV repeated after the key (to do ?)
-		if (nb_read <= 32) {
-			memcpy(cstr->keys0, key_data, sizeof(bin128));
-		} else {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("CENC/HLS Invalid key size, greater than 16 bytes\n"))
-			return GF_SERVICE_ERROR;
-		}
+		ctx->pending_keys++;
+		return gf_dm_sess_process(sess);
+#else
+		e = GF_NOT_SUPPORTED;
+#endif
 	}
 
 	if (!cstr->crypts) {
@@ -1093,6 +1168,7 @@
 	u32 i, pssh_crc=0, ki_crc=0;
 	const GF_PropertyValue *prop, *cinfo_prop, *pssh_prop;
 	GF_FilterPid *pid = cstr->ipid;
+	Bool is_valid=GF_TRUE;
 	Bool is_playing = (cstr->state == DECRYPT_STATE_PLAY) ? GF_TRUE : GF_FALSE;
 
 	cstr->state = DECRYPT_STATE_ERROR;
@@ -1145,9 +1221,31 @@
 		cstr->cenc_ki = NULL;
 	}
 
+	if (cstr->rep_crc) {
+		prop = gf_filter_pid_get_property(pid, GF_PROP_PID_REP_ID);
+		if (!prop) is_valid = GF_FALSE;
+		else {
+			u32 crc = gf_crc_32(prop->value.string, (u32) strlen(prop->value.string));
+			if (crc!=cstr->rep_crc) is_valid = GF_FALSE;
+		}
+	}
+	if (cstr->per_crc) {
+		prop = gf_filter_pid_get_property(pid, GF_PROP_PID_PERIOD_ID);
+		if (!prop) is_valid = GF_FALSE;
+		else {
+			u32 crc = gf_crc_32(prop->value.string, (u32) strlen(prop->value.string));
+			if (crc!=cstr->per_crc) is_valid = GF_FALSE;
+		}
+	}
+	if (cstr->as_id) {
+		prop = gf_filter_pid_get_property(pid, GF_PROP_PID_PERIOD_ID);
+		if (!prop) is_valid = GF_FALSE;
+		else if (prop->value.uint!=cstr->as_id) is_valid = GF_FALSE;
+	}
+
 	cstr->state = is_playing ? DECRYPT_STATE_PLAY : DECRYPT_STATE_SETUP;
 
-	if ((cstr->scheme_type==scheme_type) && (cstr->scheme_version==scheme_version) && (cstr->pssh_crc==pssh_crc) )
+	if ((cstr->scheme_type==scheme_type) && (cstr->scheme_version==scheme_version) && (cstr->pssh_crc==pssh_crc) && is_valid)
 		return GF_OK;
 
 	cstr->scheme_version = scheme_version;
@@ -1197,6 +1295,9 @@
 		if (!tci && any_tci) tci = any_tci;
 
 		if (tci) {
+			cstr->rep_crc = 0;
+			cstr->per_crc = 0;
+			cstr->as_id = 0;
 			cstr->KID_count = tci->nb_keys;
 			cstr->KIDs = (bin128 *)gf_realloc(cstr->KIDs, tci->nb_keys*sizeof(bin128));
 			cstr->keys = (bin128 *)gf_realloc(cstr->keys, tci->nb_keys*sizeof(bin128));
@@ -1204,6 +1305,37 @@
 				memcpy(cstr->KIDsi, tci->keysi.KID, sizeof(bin128));
 				memcpy(cstr->keysi, tci->keysi.key, sizeof(bin128));
 				memcpy(cstr->hls_IV, tci->keysi.IV, sizeof(bin128));
+
+				//reset KID if not for our period/as/rep
+				is_valid = GF_TRUE;
+				if (tci->keysi.repID) {
+					prop = gf_filter_pid_get_property(pid, GF_PROP_PID_REP_ID);
+					if (prop && prop->value.string && !strcmp(prop->value.string, tci->keysi.repID)) {
+						cstr->rep_crc = gf_crc_32(prop->value.string, (u32) strlen(prop->value.string));
+					} else {
+						is_valid = GF_FALSE;
+					}
+				}
+				if (tci->keysi.periodID) {
+					prop = gf_filter_pid_get_property(pid, GF_PROP_PID_PERIOD_ID);
+					if (prop && prop->value.string && !strcmp(prop->value.string, tci->keysi.periodID)) {
+						cstr->per_crc = gf_crc_32(prop->value.string, (u32) strlen(prop->value.string));
+					} else {
+						is_valid = GF_FALSE;
+					}
+				}
+				if (tci->keysi.ASID) {
+					prop = gf_filter_pid_get_property(pid, GF_PROP_PID_AS_ID);
+					if (prop && (prop->value.uint == tci->keysi.ASID)) {
+						cstr->as_id = tci->keysi.ASID;
+					} else {
+						is_valid = GF_FALSE;
+					}
+				}
+				if (!is_valid) {
+					memset(cstr->KIDsi, 0xFF, sizeof(bin128));
+					memset(cstr->keysi, 0xFF, sizeof(bin128));
+				}
 			}
 			if (cinfo != ctx->cinfo)
 				gf_crypt_info_del(cinfo);
@@ -1372,7 +1504,7 @@
 
 		/*open decrypter - we do NOT initialize decrypter; it wil be done when we decrypt the first crypted sample*/
 		for (i=0; i<cstr->nb_crypts; i++) {
-			assert(!cstr->cryptsi.crypt);
+			gf_assert(!cstr->cryptsi.crypt);
 			if (cstr->is_cenc)
 				cstr->cryptsi.crypt = gf_crypt_open(GF_AES_128, GF_CTR);
 			else
@@ -1399,7 +1531,7 @@
 	if (is_play) {
 		if (cstr->state != DECRYPT_STATE_SETUP)
 			return GF_SERVICE_ERROR;
-		assert(!cstr->crypts0.crypt);
+		gf_assert(!cstr->crypts0.crypt);
 
 		cstr->crypts0.crypt = gf_crypt_open(GF_AES_128, GF_CBC);
 		if (!cstr->crypts0.crypt) return GF_IO_ERR;
@@ -1459,7 +1591,25 @@
 
 u8 key_info_get_iv_size(const u8 *key_info, u32 nb_keys, u32 idx, u8 *const_iv_size, const u8 **const_iv);
 
-
+static GFINLINE void cenc_decrypt_block(GF_CENCDecCtx *ctx, GF_Crypt *crypt, Bool valid_key, u8 *data, u32 size)
+{
+	if (!valid_key) {
+		if (ctx->decrypt==DECRYPT_PAD1) {
+			memset(data, 0xFF, size);
+		}
+		else if (ctx->decrypt==DECRYPT_PAD0) {
+			memset(data, 0x0, size);
+		}
+		else if (ctx->decrypt==DECRYPT_PADSC) {
+			memset(data, 0x0, size-1);
+			datasize-1 = 1;
+		} else {
+			//skip, do nothing
+		}
+	} else {
+		gf_crypt_decrypt(crypt, data, size);
+	}
+}
 static GF_Err cenc_dec_process_cenc(GF_CENCDecCtx *ctx, GF_CENCDecStream *cstr, GF_FilterPacket *in_pck)
 {
 	GF_Err e = GF_OK;
@@ -1574,7 +1724,7 @@
 		}
 
 		if (!sai_payload && !skey_const_iv_size) {
-			if (ctx->decrypt == DECRYPT_SKIP) {
+			if (ctx->decrypt >= DECRYPT_SKIP) {
 				GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("CENC Packet encrypted but no SAI info nor constant IV\n" ) );
 				e = GF_OK;
 				goto send_packet;
@@ -1624,6 +1774,7 @@
 		u32 cur_pos = 0;
 
 		while (cur_pos < data_size) {
+			Bool valid_key;
 			u8 const_iv_size=0;
 			const u8 *const_iv=NULL;
 			u32 kidx = 0;
@@ -1687,8 +1838,8 @@
 			}
 			/*skip clear data*/
 			cur_pos += bytes_clear_data;
-
-			if (!cstr->cryptskidx.key_valid) {
+			valid_key = (ctx->decrypt>=DECRYPT_SKIP) ? GF_FALSE : cstr->cryptskidx.key_valid;
+			if (!valid_key && (ctx->decrypt==DECRYPT_SKIP)) {
 				cur_pos += bytes_encrypted_data;
 				continue;
 			}
@@ -1706,10 +1857,12 @@
 				}
 
 				while (res) {
-					gf_crypt_decrypt(cstr->cryptskidx.crypt, out_data + pos, (res >= cryp_block) ? cryp_block : res);
+					u32 c_len = (res >= cryp_block) ? cryp_block : res;
+					cenc_decrypt_block(ctx, cstr->cryptskidx.crypt, valid_key, out_data + pos, c_len);
+
 					if (res >= full_block) {
 						pos += full_block;
-						assert(res>=full_block);
+						gf_assert(res>=full_block);
 						res -= full_block;
 					} else {
 						res = 0;
@@ -1727,21 +1880,26 @@
 					u32 clear_trailing = res % 16;
 					res -= clear_trailing;
 				}
-				gf_crypt_decrypt(cstr->cryptskidx.crypt, out_data+cur_pos, res);
+				cenc_decrypt_block(ctx, cstr->cryptskidx.crypt, valid_key, out_data+cur_pos, res);
 			}
 			cur_pos += bytes_encrypted_data;
 		}
 	}
 	//full sample encryption in single key mode
 	else {
-		if (cstr->is_cenc) {
-			gf_crypt_decrypt(cstr->crypts0.crypt, out_data, data_size);
-		} else {
+		u32 cbytes = data_size;
+		if (!cstr->is_cenc) {
 			u32 ret = data_size % 16;
 			if (data_size >= 16) {
-				gf_crypt_decrypt(cstr->crypts0.crypt, out_data, data_size-ret);
+				cbytes = data_size-ret;
+			} else {
+				cbytes = 0;
 			}
 		}
+		if (cbytes) {
+			Bool valid_key = (ctx->decrypt>=DECRYPT_SKIP) ? GF_FALSE : cstr->crypts0.key_valid;
+			cenc_decrypt_block(ctx, cstr->crypts0.crypt, valid_key, out_data, cbytes);
+		}
 	}
 
 send_packet:
@@ -1783,7 +1941,7 @@
 	//packet has been fetched, we now MUST have a key info
 
 	if (!cstr->hls_key_url && !cstr->cenc_ki && !ctx->cinfo) {
-		if (ctx->decrypt == DECRYPT_SKIP) {
+		if (ctx->decrypt >= DECRYPT_SKIP) {
 			GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("HLS_SAES Packet encrypted but no KEY info\n" ) );
 			e = GF_OK;
 			goto send_packet;
@@ -1843,11 +2001,13 @@
 			nal_start = data;
 			nal_size_o = nal_size;
 			//remove EPB
-			u32 nb_epb = gf_media_nalu_emulation_bytes_remove_count(data, nal_size);
+			u32 nb_epb = 0;
+#ifndef GPAC_DISABLE_AV_PARSERS
+			nb_epb = gf_media_nalu_emulation_bytes_remove_count(data, nal_size);
 			if (nb_epb) {
 				nal_size = gf_media_nalu_remove_emulation_bytes(data, data, nal_size);
 			}
-
+#endif
 			//unencrypted header
 			data += 32;
 			cur_pos += 32;
@@ -2004,7 +2164,10 @@
 	if (cstr->keys) gf_free(cstr->keys);
 	if (cstr->hls_key_url) gf_free(cstr->hls_key_url);
 
-
+	if (cstr->body) gf_free(cstr->body);
+#ifdef GPAC_USE_DOWNLOADER
+	if (cstr->sess) gf_dm_sess_del(cstr->sess);
+#endif
 	gf_free(cstr);
 }
 
@@ -2026,6 +2189,7 @@
 
 	if (is_remove) {
 		cstr = gf_filter_pid_get_udta(pid);
+		if (!cstr) return GF_OK; //configure failure
 		if (cstr->opid) {
 			gf_filter_pid_remove(cstr->opid);
 		}
@@ -2043,6 +2207,7 @@
 		if (!cstr) return GF_OUT_OF_MEM;
 		cstr->opid = gf_filter_pid_new(filter);
 		cstr->ipid = pid;
+		cstr->ctx = ctx;
 		gf_list_add(ctx->streams, cstr);
 		gf_filter_pid_set_udta(pid, cstr);
 		gf_filter_pid_set_udta(cstr->opid, cstr);
@@ -2161,7 +2326,7 @@
 	gf_filter_pid_set_property(cstr->opid, GF_PROP_PID_ORIG_CRYPT_SCHEME, &PROP_4CC(scheme_type) );
 
 
-	cstr->is_nalu = GF_FALSE;;
+	cstr->is_nalu = GF_FALSE;
 	prop = gf_filter_pid_get_property(pid, GF_PROP_PID_CODECID);
 	if (prop) {
 		switch (prop->value.uint) {
@@ -2173,7 +2338,7 @@
 		case GF_CODECID_LHVC:
 		case GF_CODECID_VVC:
 		case GF_CODECID_VVC_SUBPIC:
-			cstr->is_nalu = GF_TRUE;;
+			cstr->is_nalu = GF_TRUE;
 			break;
 		}
 	}
@@ -2220,6 +2385,9 @@
 	GF_CENCDecCtx *ctx = (GF_CENCDecCtx *)gf_filter_get_udta(filter);
 	u32 i, nb_eos, count = gf_list_count(ctx->streams);
 
+	if (ctx->pending_keys)
+		return GF_OK;
+
 	nb_eos = 0;
 	for (i=0; i<count; i++) {
 		GF_Err e;
@@ -2324,8 +2492,11 @@
 	{ OFFS(decrypt), "decrypt mode (CENC only)\n"
 		"- full: decrypt everything, throwing error if keys are not found\n"
 		"- nokey: decrypt everything for which a key is found, skip decryption otherwise\n"
-		"- skip: decrypt nothing"
-		, GF_PROP_UINT, "full", "full|nokey|skip", GF_ARG_HINT_ADVANCED},
+		"- skip: decrypt nothing\n"
+		"- pad0: decrypt nothing and replace all crypted bits with 0\n"
+		"- pad1: decrypt nothing and replace all crypted bits with 1\n"
+		"- padsc: decrypt nothing and replace all crypted bytes with start codes"
+		, GF_PROP_UINT, "full", "full|nokey|skip|pad0|pad1|padsc", GF_ARG_HINT_ADVANCED},
 	{ OFFS(drop_keys), "consider keys with given 1-based indexes as not available (multi-key debug)", GF_PROP_UINT_LIST, NULL, NULL, GF_ARG_HINT_EXPERT},
 	{ OFFS(kids), "define KIDs. If `keys` is empty, consider keys with given KID (as hex string) as not available (debug)", GF_PROP_STRING_LIST, NULL, NULL, GF_ARG_HINT_EXPERT},
 	{ OFFS(keys), "define key values for each of the specified KID", GF_PROP_STRING_LIST, NULL, NULL, GF_ARG_HINT_EXPERT},
@@ -2347,6 +2518,7 @@
 	"When the file is set globally (not per PID), the first `CrypTrack` in the DRM config file with the same ID is used, otherwise the first `CrypTrack` with ID 0 or not set is used.\n"
 	)
 	.private_size = sizeof(GF_CENCDecCtx),
+	.flags = GF_FS_REG_USE_SYNC_READ,
 	.max_extra_pids=-1,
 	.args = GF_CENCDecArgs,
 	SETCAPS(CENCDecCaps),
@@ -2360,9 +2532,9 @@
 
 #endif /*GPAC_DISABLE_CRYPTO*/
 
-const GF_FilterRegister *cenc_decrypt_register(GF_FilterSession *session)
+const GF_FilterRegister *cdcrypt_register(GF_FilterSession *session)
 {
-#ifndef GPAC_DISABLE_CRYPTO
+#if !defined(GPAC_DISABLE_CRYPTO) && !defined(GPAC_DISABLE_CDCRYPT)
 	return &CENCDecRegister;
 #else
 	return NULL;

gpac-2.2.1.tar.gz/src/filters/dmx_avi.c -> gpac-2.4.0.tar.gz/src/filters/dmx_avi.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2005-2022
+ *			Copyright (c) Telecom ParisTech 2005-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / AVI demuxer filter
@@ -81,6 +81,7 @@
 	if (ctx->use_file_fps) {
 		Double fps = AVI_frame_rate(ctx->avi);
 		gf_media_get_video_timing(fps, &ctx->fps.num, &ctx->fps.den);
+		if (!ctx->fps.num) ctx->fps.num = ctx->fps.den = 1000;
 	}
 
 	dur.den = ctx->fps.num;
@@ -278,12 +279,15 @@
 			st->audio_done = GF_FALSE;
 
 			if (codecid==GF_CODECID_MPEG_AUDIO) {
-				u32 cid;
+				u32 cid=0;
 				char data8;
 				AVI_set_audio_track(ctx->avi, i);
-				AVI_read_audio(ctx->avi, data, 8, (int*)&cid);
-				u32 hdr = GF_4CC(data0, data1, data2, data3);
-				cid = gf_mp3_object_type_indication(hdr);
+				if (AVI_read_audio(ctx->avi, data, 8, (int*)&cid)) {
+#ifndef GPAC_DISABLE_AV_PARSERS
+					u32 hdr = GF_4CC(data0, data1, data2, data3);
+					cid = gf_mp3_object_type_indication(hdr);
+#endif
+				}
 				AVI_set_audio_position(ctx->avi, 0);
 				if (cid) codecid = cid;
 			}
@@ -549,7 +553,7 @@
 			ctx->video_done = GF_TRUE;
 		}
 	}
-	
+
 	nb_done = 0;
 	count = gf_list_count(ctx->audios);
 	for (i=0; i<count; i++) {
@@ -594,7 +598,7 @@
 			u64 file_offset;
 			GF_FilterPacket *dst_pck = gf_filter_pck_new_alloc(st->opid, size, &pck_data);
 			if (!dst_pck) return GF_OUT_OF_MEM;
-			
+
 			file_offset = gf_ftell(ctx->avi->fdes);
 			AVI_read_audio(ctx->avi, pck_data, size, (int*)&continuous);
 
@@ -698,6 +702,8 @@
 	CAP_UINT(GF_CAPS_INPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_FILE),
 	CAP_STRING(GF_CAPS_INPUT, GF_PROP_PID_FILE_EXT, "avi"),
 	CAP_STRING(GF_CAPS_INPUT, GF_PROP_PID_MIME, "video/avi|video/x-avi"),
+	//we need a file for this demuxer
+	CAP_STRING(GF_CAPS_INPUT, GF_PROP_PID_FILEPATH, "*"),
 	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_AUDIO),
 	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_VISUAL),
 };
@@ -718,6 +724,7 @@
 	GF_FS_SET_DESCRIPTION("AVI demultiplexer")
 	GF_FS_SET_HELP("This filter demultiplexes AVI files to produce media PIDs and frames.")
 	.private_size = sizeof(GF_AVIDmxCtx),
+	.flags = GF_FS_REG_USE_SYNC_READ,
 	.initialize = avidmx_initialize,
 	.finalize = avidmx_finalize,
 	.args = AVIDmxArgs,
@@ -738,4 +745,3 @@
 	return NULL;
 #endif
 }
-

gpac-2.2.1.tar.gz/src/filters/dmx_dash.c -> gpac-2.4.0.tar.gz/src/filters/dmx_dash.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2017-2022
+ *			Copyright (c) Telecom ParisTech 2017-2024
  *					All rights reserved
  *
  *  This file is part of GPAC / DASH/HLS demux filter
@@ -26,7 +26,7 @@
 #include <gpac/filters.h>
 #include <gpac/constants.h>
 
-#ifndef GPAC_DISABLE_DASH_CLIENT
+#ifndef GPAC_DISABLE_DASHIN
 
 #include <gpac/dash.h>
 
@@ -78,7 +78,7 @@
 	Bool max_res, abort;
 	u32 use_bmin;
 	char *query;
-	Bool noxlink, split_as, noseek, groupsel;
+	Bool noxlink, split_as, noseek, groupsel, bsmerge;
 	u32 lowlat;
 
 	GF_FilterPid *mpd_pid;
@@ -90,8 +90,9 @@
 	//http io for manifest
 	GF_DASHFileIO dash_io;
 	GF_DownloadManager *dm;
-	
-	Bool reuse_download_session;
+
+	GF_DownloadSession *reuse_download_session;
+	Bool first_cache_name_fetched;
 
 	Bool initial_setup_done;
 	Bool in_error;
@@ -129,6 +130,11 @@
 	void (*on_new_group)(void *udta, u32 group_idx, void *dash);
 	s32 (*on_rate_adaptation)(void *udta, u32 group_idx, u32 base_group_idx, Bool force_low_complex, void *stats);
 	s32 (*on_download_monitor)(void *udta, u32 group_idx, void *stats);
+
+
+	Bool load_file;
+	GF_FileIO *fio;
+	GF_FilterPacket *mpd_pck_ref;
 } GF_DASHDmxCtx;
 
 typedef struct
@@ -146,10 +152,12 @@
 	Bool eos_detected;
 	u32 next_dependent_rep_idx, current_dependent_rep_idx;
 	u64 utc_map;
-	
+
+#ifdef GPAC_USE_DOWNLOADER
 	GF_DownloadSession *sess;
+#endif
 	Bool is_timestamp_based, pto_setup;
-	Bool prev_is_init_segment;
+	Bool prev_is_init_segment, init_from_media;
 	//media timescale for which the pto, max_cts_in_period and timedisc_ts_offset were computed
 	u32 timescale;
 	s64 pto;
@@ -257,7 +265,12 @@
 				GF_Fraction64 seg_time;
 				const char *seg_name = NULL;
 				u32 seg_number, seg_dur;
-				gf_dash_group_next_seg_info(ctx->dash, group->idx, group->current_dependent_rep_idx, &seg_name, &seg_number, &seg_time, &seg_dur, NULL);
+				if (group->init_from_media) {
+					group->init_from_media = GF_FALSE;
+					gf_dash_group_next_seg_info(ctx->dash, group->idx, 0, NULL, &seg_number, &seg_time, &seg_dur, &seg_name);
+				} else {
+					gf_dash_group_next_seg_info(ctx->dash, group->idx, group->current_dependent_rep_idx, &seg_name, &seg_number, &seg_time, &seg_dur, NULL);
+				}
 				if (seg_name) {
 					gf_filter_pck_set_property(ref, GF_PROP_PCK_FILENAME, &PROP_STRING(seg_name) );
 					gf_filter_pck_set_property(ref, GF_PROP_PCK_FILENUM, &PROP_UINT(seg_number) );
@@ -414,7 +427,7 @@
 				diff *= 1000;
 				diff /= ts;
 				if (diff<=1) diff=0;
-				
+
 				diff *= ts;
 				diff /= 1000;
 			}
@@ -468,7 +481,7 @@
 
 	dst_pck = gf_filter_pck_new_ref(out_pid, 0, 0, in_pck);
 	if (!dst_pck) return;
-	
+
 	//this will copy over clock info for PCR in TS
 	gf_filter_pck_merge_properties(in_pck, dst_pck);
 	gf_filter_pck_set_dts(dst_pck, dts);
@@ -524,7 +537,7 @@
 	return GF_FALSE;
 }
 
-#ifndef GPAC_DISABLE_CRYPTO
+#if !defined(GPAC_DISABLE_CRYPTO) && !defined(GPAC_DISABLE_CRYPTFILE)
 void gf_cryptfin_set_kms(GF_Filter *f, const char *key_url, bin128 key_IV);
 #endif
 
@@ -617,8 +630,10 @@
 
 	gf_filter_set_setup_failure_callback(ctx->filter, group->seg_filter_src, dashdmx_on_filter_setup_error, group);
 
-	if (gf_dash_group_init_segment_is_media(ctx->dash, group_index))
+	if (gf_dash_group_init_segment_is_media(ctx->dash, group_index)) {
 		group->prev_is_init_segment = GF_FALSE;
+		group->init_from_media = GF_TRUE;
+	}
 	else {
 		group->prev_is_init_segment = GF_TRUE;
 		//consider init is always in clear if AES-128, might need further checks
@@ -630,7 +645,7 @@
 	//if HLS AES-CBC, set key BEFORE discarding segment URL (if TS, discarding the segment will discard the key uri)
 	if (key_uri) {
 		if (crypto_type==1) {
-#ifndef GPAC_DISABLE_CRYPTO
+#if !defined(GPAC_DISABLE_CRYPTO) && !defined(GPAC_DISABLE_CRYPTFILE)
 			gf_cryptfin_set_kms(group->seg_filter_src, key_uri, key_IV);
 #else
 			gf_free(sURL);
@@ -653,21 +668,29 @@
 
 void dashdmx_io_delete_cache_file(GF_DASHFileIO *dashio, GF_DASHFileIOSession session, const char *cache_url)
 {
+#ifdef GPAC_USE_DOWNLOADER
 	if (!session) {
 		return;
 	}
-	gf_dm_delete_cached_file_entry_session((GF_DownloadSession *)session, cache_url);
+	gf_dm_delete_cached_file_entry_session((GF_DownloadSession *)session, cache_url, GF_TRUE);
+#endif
 }
 
-void gf_dm_sess_force_blocking(GF_DownloadSession *sess);
+#ifdef GPAC_USE_DOWNLOADER
+void gf_dm_sess_detach_async(GF_DownloadSession *sess);
+#endif
 
 GF_DASHFileIOSession dashdmx_io_create(GF_DASHFileIO *dashio, Bool persistent, const char *url, s32 group_idx)
 {
+#ifdef GPAC_USE_DOWNLOADER
 	GF_DownloadSession *sess;
 	GF_Err e;
-	u32 flags = GF_NETIO_SESSION_NOT_THREADED;
+	u32 flags;
 	GF_DASHDmxCtx *ctx = (GF_DASHDmxCtx *)dashio->udta;
 
+	//use threaded async sessions
+	flags = GF_NETIO_SESSION_NO_BLOCK; //GF_NETIO_SESSION_NOT_THREADED;
+
 	//we work in non-threaded mode, only MPD fetcher is allowed
 	if (group_idx>=0)
 		return NULL;
@@ -678,13 +701,14 @@
 		const GF_PropertyValue *p = gf_filter_pid_get_property(ctx->mpd_pid, GF_PROP_PID_DOWNLOAD_SESSION);
 		if (p) {
 			sess = (GF_DownloadSession *) p->value.ptr;
-			gf_dm_sess_force_blocking(sess);
+			//regardless of how the initial session was created, force its usage as non-blocking async
+			gf_dm_sess_detach_async(sess);
 			if (!ctx->segstore) {
 				gf_dm_sess_force_memory_mode(sess, 1);
 			}
 			if (ctx->reuse_download_session)
 				gf_dm_sess_setup_from_url(sess, url, GF_FALSE);
-			ctx->reuse_download_session = GF_TRUE;
+			ctx->reuse_download_session = sess;
 			return (GF_DASHFileIOSession) sess;
 		}
 	}
@@ -697,53 +721,109 @@
 	}
 	sess = gf_dm_sess_new(ctx->dm, url, flags, NULL, NULL, &e);
 	return (GF_DASHFileIOSession) sess;
+#else
+	//TODO
+	return NULL;
+#endif
 }
+
 void dashdmx_io_del(GF_DASHFileIO *dashio, GF_DASHFileIOSession session)
 {
+#ifdef GPAC_USE_DOWNLOADER
 	GF_DASHDmxCtx *ctx = (GF_DASHDmxCtx *)dashio->udta;
 	if (!ctx->reuse_download_session)
 		gf_dm_sess_del((GF_DownloadSession *)session);
+#endif
 }
 GF_Err dashdmx_io_init(GF_DASHFileIO *dashio, GF_DASHFileIOSession session)
 {
+#ifdef GPAC_USE_DOWNLOADER
+	GF_DASHDmxCtx *ctx = (GF_DASHDmxCtx *)dashio->udta;
+	if (ctx->fio && !ctx->first_cache_name_fetched) return GF_OK;
 	return gf_dm_sess_process_headers((GF_DownloadSession *)session);
+#else
+	return GF_NOT_SUPPORTED;
+#endif
 }
 GF_Err dashdmx_io_run(GF_DASHFileIO *dashio, GF_DASHFileIOSession session)
 {
+#ifdef GPAC_USE_DOWNLOADER
+	GF_DASHDmxCtx *ctx = (GF_DASHDmxCtx *)dashio->udta;
+	if (ctx->fio && !ctx->first_cache_name_fetched) return GF_OK;
 	return gf_dm_sess_process((GF_DownloadSession *)session);
+#else
+	return GF_NOT_SUPPORTED;
+#endif
 }
 const char *dashdmx_io_get_url(GF_DASHFileIO *dashio, GF_DASHFileIOSession session)
 {
+#ifdef GPAC_USE_DOWNLOADER
 	return gf_dm_sess_get_resource_name((GF_DownloadSession *)session);
+#else
+	return NULL;
+#endif
 }
 const char *dashdmx_io_get_cache_name(GF_DASHFileIO *dashio, GF_DASHFileIOSession session)
 {
+#ifdef GPAC_USE_DOWNLOADER
+	GF_DASHDmxCtx *ctx = (GF_DASHDmxCtx *)dashio->udta;
+	if ((ctx->reuse_download_session == (GF_DownloadSession *)session)
+		&& ctx->fio
+		&& !ctx->first_cache_name_fetched
+	) {
+		ctx->first_cache_name_fetched = GF_TRUE;
+		return gf_fileio_url(ctx->fio);
+	}
 	return gf_dm_sess_get_cache_name((GF_DownloadSession *)session);
+#else
+	return NULL;
+#endif
 }
 const char *dashdmx_io_get_mime(GF_DASHFileIO *dashio, GF_DASHFileIOSession session)
 {
+#ifdef GPAC_USE_DOWNLOADER
 	return gf_dm_sess_mime_type((GF_DownloadSession *)session);
+#else
+	return NULL;
+#endif
 }
 const char *dashdmx_io_get_header_value(GF_DASHFileIO *dashio, GF_DASHFileIOSession session, const char *header_name)
 {
+#ifdef GPAC_USE_DOWNLOADER
 	return gf_dm_sess_get_header((GF_DownloadSession *)session, header_name);
+#else
+	return NULL;
+#endif
 }
 u64 dashdmx_io_get_utc_start_time(GF_DASHFileIO *dashio, GF_DASHFileIOSession session)
 {
+#ifdef GPAC_USE_DOWNLOADER
 	return gf_dm_sess_get_utc_start((GF_DownloadSession *)session);
+#else
+	return 0;
+#endif
 }
 GF_Err dashdmx_io_setup_from_url(GF_DASHFileIO *dashio, GF_DASHFileIOSession session, const char *url, s32 group_idx)
 {
+#ifdef GPAC_USE_DOWNLOADER
 	return gf_dm_sess_setup_from_url((GF_DownloadSession *)session, url, GF_FALSE);
+#else
+	return GF_NOT_SUPPORTED;
+#endif
 }
 GF_Err dashdmx_io_set_range(GF_DASHFileIO *dashio, GF_DASHFileIOSession session, u64 start_range, u64 end_range, Bool discontinue_cache)
 {
+#ifdef GPAC_USE_DOWNLOADER
 	return gf_dm_sess_set_range((GF_DownloadSession *)session, start_range, end_range, discontinue_cache);
+#else
+	return GF_NOT_SUPPORTED;
+#endif
 }
 
 u32 dashdmx_io_get_bytes_per_sec(GF_DASHFileIO *dashio, GF_DASHFileIOSession session)
 {
 	u32 bps=0;
+#ifdef GPAC_USE_DOWNLOADER
 	if (session) {
 		gf_dm_sess_get_stats((GF_DownloadSession *)session, NULL, NULL, NULL, NULL, &bps, NULL);
 	} else {
@@ -751,8 +831,30 @@
 		bps = gf_dm_get_data_rate(ctx->dm);
 		bps/=8;
 	}
+#endif
 	return bps;
 }
+
+GF_Err dashdmx_io_get_status(GF_DASHFileIO *dashio, GF_DASHFileIOSession session)
+{
+#ifdef GPAC_USE_DOWNLOADER
+	GF_NetIOStatus status;
+	GF_Err last_err = gf_dm_sess_get_stats((GF_DownloadSession *)session, NULL, NULL, NULL, NULL, NULL, &status);
+
+	if (status==GF_NETIO_DATA_TRANSFERED) return GF_OK;
+	if (status==GF_NETIO_DATA_EXCHANGE) return GF_NOT_READY;
+	if (status==GF_NETIO_STATE_ERROR) return last_err;
+	//session may move to disconnect state upon completion, check if no error
+	if ((status==GF_NETIO_DISCONNECTED) && (last_err>=GF_OK))
+		return GF_OK;
+	return GF_NOT_READY;
+#else
+	return GF_NOT_SUPPORTED;
+#endif
+
+}
+
+
 #if 0 //unused since we are in non threaded mode
 void dashdmx_io_abort(GF_DASHFileIO *dashio, GF_DASHFileIOSession session)
 {
@@ -905,6 +1007,13 @@
 		}
 
 		if ((ctx->forward==DFWD_FILE) && ctx->output_mpd_pid) {
+			//for routeout
+			u32 manifest_type = gf_dash_is_m3u8(ctx->dash) ? 2 : 1;
+			if (!gf_sys_is_test_mode() && gf_dash_is_dynamic_mpd(ctx->dash))
+				manifest_type |= 0x80000000;
+
+			gf_filter_pid_set_property(ctx->output_mpd_pid, GF_PROP_PID_IS_MANIFEST, &PROP_UINT(manifest_type));
+
 			GF_FilterPacket *pck = gf_filter_pck_new_alloc(ctx->output_mpd_pid, manifest_payload_len, &output);
 			if (pck) {
 				GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("DASHDmx Manifest %s updated, forwarding\n", manifest_name));
@@ -918,12 +1027,12 @@
 			}
 		} else if (ctx->forward==DFWD_SBOUND_MANIFEST) {
 			if (group_idx>=0) {
-				assert(manifest_name);
+				gf_assert(manifest_name);
 				if (!ctx->hls_variants) ctx->hls_variants = gf_list_new();
 				if (!ctx->hls_variants_names) ctx->hls_variants_names = gf_list_new();
 				gf_list_add(ctx->hls_variants, manifest_payload);
 				manifest_payload = NULL;
-				gf_list_add(ctx->hls_variants_names, gf_strdup(manifest_name) );
+				gf_list_add(ctx->hls_variants_names, gf_strdup(manifest_name ? manifest_name : "manifest.mpd") );
 
 			} else {
 				if (ctx->manifest_payload) gf_free(ctx->manifest_payload);
@@ -959,7 +1068,7 @@
 			//not used in the test suite (require JS), but don't run if algo is none
 			if (!ctx->algo || strcmp(ctx->algo, "none"))
 				gf_dash_switch_quality(ctx->dash, GF_TRUE);
-			//not used relyably in the test suite (require fatal error in session)
+			//not used reliably in the test suite (require fatal error in session)
 			dashin_abort(NULL);
 		}
 #endif
@@ -1034,8 +1143,8 @@
 				if (! gf_dash_group_enum_descriptor(ctx->dash, i, GF_MPD_DESC_ESSENTIAL_PROPERTIES, j, &desc_id, &desc_scheme, &desc_value))
 					break;
 				j++;
-				if (!strcmp(desc_scheme, "urn:mpeg:dash:srd:2014")) {
-				} else if (!strcmp(desc_scheme, "http://dashif.org/guidelines/trickmode")) {
+				if (desc_scheme && !strcmp(desc_scheme, "urn:mpeg:dash:srd:2014")) {
+				} else if (desc_scheme && !strcmp(desc_scheme, "http://dashif.org/guidelines/trickmode")) {
 				} else {
 					playable = GF_FALSE;
 					break;
@@ -1456,6 +1565,15 @@
 	if (ctx->max_res && gf_filter_pid_get_property(ipid, GF_PROP_PID_WIDTH)) {
 		gf_filter_pid_set_property(opid, GF_PROP_SERVICE_WIDTH, &PROP_UINT(ctx->width));
 		gf_filter_pid_set_property(opid, GF_PROP_SERVICE_HEIGHT, &PROP_UINT(ctx->height));
+
+		//in case the sar indicated in the mpd is not the same as the one in the stream, overwrite
+		if (!gf_sys_is_test_mode()) {
+			GF_Fraction sar;
+			gf_dash_group_get_sar(ctx->dash, group_idx, &sar);
+			if (sar.num && sar.den) {
+				gf_filter_pid_set_property(opid, GF_PROP_PID_SAR, &PROP_FRAC(sar));
+			}
+		}
 	}
 
 	dur = (u32) (1000*gf_dash_get_duration(ctx->dash) );
@@ -1525,6 +1643,11 @@
 		) {
 			stream_type = GF_STREAM_TEXT;
 		}
+		if (qinfo.mime) {
+			if (!strncmp(qinfo.mime, "video/", 6)) stream_type = GF_STREAM_VISUAL;
+			else if (!strncmp(qinfo.mime, "audio/", 6)) stream_type = GF_STREAM_AUDIO;
+			if (!strncmp(qinfo.mime, "text/", 5)) stream_type = GF_STREAM_TEXT;
+		}
 		dashdm_format_qinfo(&qdesc, &qinfo);
 
 		qualities.value.string_list.vals = gf_realloc(qualities.value.string_list.vals, sizeof(char *) * (qualities.value.string_list.nb_items+1));
@@ -1582,7 +1705,8 @@
 	}
 
 	if ((ctx->forward==DFWD_FILE) && (stream_type!=GF_STREAM_UNKNOWN)) {
-		gf_filter_pid_set_property(opid, GF_PROP_PID_ORIG_STREAM_TYPE, &PROP_UINT(stream_type) );
+		//for routeout
+		gf_filter_pid_set_property(opid, GF_PROP_PID_PREMUX_STREAM_TYPE, &PROP_UINT(stream_type) );
 
 		gf_filter_pid_set_property(opid, GF_PROP_PCK_HLS_REF, &PROP_LONGUINT( (u64) 1+group->idx) );
 
@@ -1648,6 +1772,30 @@
 
 		gf_filter_pid_set_property(opid, GF_PROP_PID_SRD, &srd);
 		gf_filter_pid_set_property(opid, GF_PROP_PID_SRD_REF, &srdref);
+
+
+
+		const GF_PropertyValue *p = gf_filter_pid_get_property(ipid, GF_PROP_PID_CODECID);
+		if (p && (p->value.uint==GF_CODECID_HEVC)) {
+			//remove any SRD info from source
+			gf_filter_pid_set_property(opid, GF_PROP_PID_CROP_POS, NULL);
+			gf_filter_pid_set_property(opid, GF_PROP_PID_ORIG_SIZE, NULL);
+			//if compositor is loaded, try merging hevc streams
+			if (!ctx->forward && gf_opts_get_bool("temp", "compositor")  && ctx->bsmerge) {
+				i=0;
+				while (1) {
+					const char *desc_id, *desc_scheme, *desc_value;
+					if (! gf_dash_group_enum_descriptor(ctx->dash, group_idx, GF_MPD_DESC_SUPPLEMENTAL_PROPERTIES, i, &desc_id, &desc_scheme, &desc_value))
+						break;
+					i++;
+					if (!strcmp(desc_scheme, "urn:gpac:video:merge:2023") && desc_value) {
+						gf_filter_pid_set_property(opid, GF_PROP_PID_CODECID, &PROP_UINT(GF_CODECID_HEVC_MERGE));
+						gf_filter_pid_set_property(opid, GF_PROP_PID_CODEC_MERGEABLE, &PROP_UINT(atoi(desc_value) ));
+						break;
+					}
+				}
+			}
+		}
 	}
 
 	//setup initial quality - this is disabled in test mode for the time being (invalidates all dash playback hashes)
@@ -1718,6 +1866,21 @@
 		pstart = gf_dash_get_period_start(ctx->dash);
 		gf_filter_pid_set_property(opid, GF_PROP_PID_DASH_PERIOD_START, &PROP_LONGUINT(pstart) );
 	}
+
+	if (!gf_sys_old_arch_compat()) {
+		const char *str = gf_dash_group_get_representation_id(ctx->dash, group->idx);
+		gf_filter_pid_set_property(opid, GF_PROP_PID_REP_ID, str ? &PROP_STRING(str) : NULL );
+
+		s32 gf_dash_get_base_group_index(GF_DashClient *dash, u32 idx);
+		s32 dep_group = 1 + gf_dash_get_base_group_index(ctx->dash, group->idx);
+		gf_filter_pid_set_property(opid, GF_PROP_PID_DASH_DEP_GROUP, (dep_group > 0) ? &PROP_UINT(dep_group) : NULL );
+
+		str = gf_dash_get_period_id(ctx->dash);
+		gf_filter_pid_set_property(opid, GF_PROP_PID_PERIOD_ID, str ? &PROP_STRING(str) : NULL );
+
+		s32 asid = gf_dash_group_get_as_id(ctx->dash, group->idx);
+		gf_filter_pid_set_property(opid, GF_PROP_PID_AS_ID, (asid>=0) ? &PROP_UINT(asid) : NULL );
+	}
 }
 
 static GF_Err dashdmx_configure_pid(GF_Filter *filter, GF_FilterPid *pid, Bool is_remove)
@@ -1765,14 +1928,44 @@
 	//configure MPD pid
 	if (!ctx->mpd_pid) {
 		char *frag;
+		Bool cache_redirect = GF_FALSE;
 		const GF_PropertyValue *p;
+
+		gf_filter_pid_set_framing_mode(pid, GF_TRUE);
+
+		p = gf_filter_pid_get_property(pid, GF_PROP_PID_REDIRECT_URL);
+		if (p && p->value.string) cache_redirect = GF_TRUE;
+
+		p = gf_filter_pid_get_property(pid, GF_PROP_PID_FILEPATH);
+		if (!p && !cache_redirect) {
+			GF_FilterPacket *pck = gf_filter_pid_get_packet(pid);
+			if (!pck) {
+				ctx->mpd_pid = pid;
+				ctx->load_file = GF_TRUE;
+				return GF_OK;
+			}
+
+			const u8 *data;
+			u32 size;
+			data = gf_filter_pck_get_data(pck, &size);
+			if (ctx->fio) {
+				gf_fclose((FILE*)ctx->fio);
+				gf_filter_pck_unref(ctx->mpd_pck_ref);
+			}
+			ctx->mpd_pck_ref = pck;
+			gf_filter_pck_ref(&ctx->mpd_pck_ref);
+			ctx->fio = gf_fileio_from_mem("_MANIFEST", data, size);
+			ctx->load_file = GF_FALSE;
+			//and remove it
+			gf_filter_pid_drop_packet(pid);
+		}
+
 		p = gf_filter_pid_get_property(pid, GF_PROP_PID_URL);
 		if (!p || !p->value.string) {
 			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("DASHDmx no URL on MPD pid\n"));
 			return GF_NOT_SUPPORTED;
 		}
 
-		gf_filter_pid_set_framing_mode(pid, GF_TRUE);
 		ctx->mpd_pid = pid;
 		ctx->seek_request = -1;
 		ctx->nb_playing = 0;
@@ -1782,17 +1975,18 @@
 			gf_filter_pid_copy_properties(ctx->output_mpd_pid, pid);
 			gf_filter_pid_set_name(ctx->output_mpd_pid, "manifest");
 			GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("DASHDmx Creating manifest output PID\n"));
-			//for route
-			gf_filter_pid_set_property(ctx->output_mpd_pid, GF_PROP_PID_ORIG_STREAM_TYPE, &PROP_UINT(GF_STREAM_FILE));
-			gf_filter_pid_set_property(ctx->output_mpd_pid, GF_PROP_PID_IS_MANIFEST, &PROP_BOOL(GF_TRUE));
+			//for routeout
+			gf_filter_pid_set_property(ctx->output_mpd_pid, GF_PROP_PID_PREMUX_STREAM_TYPE, &PROP_UINT(GF_STREAM_FILE));
 		}
 
+
 		e = gf_dash_open(ctx->dash, p->value.string);
 		if (e) {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("DASHDmx Error - cannot initialize DASH Client for %s: %s\n", p->value.string, gf_error_to_string(e)));
 			gf_filter_setup_failure(filter, e);
 			return e;
 		}
+
 		frag = strchr(p->value.string, '#');
 		if (frag) {
 			if (ctx->frag_url) gf_free(ctx->frag_url);
@@ -1836,7 +2030,7 @@
 	if (opid == NULL) {
 		u32 run_status;
 		group = gf_dash_get_group_udta(ctx->dash, group_idx);
-		assert(group);
+		if (!group) return GF_SERVICE_ERROR;
 		//for now we declare every component from the input source
 		opid = dashdmx_create_output_pid(ctx, pid, &run_status, group);
 		gf_filter_pid_set_udta(opid, group);
@@ -2104,6 +2298,7 @@
 		ctx->dash_io.manifest_updated = dashdmx_io_manifest_updated;
 
 	ctx->dash_io.get_bytes_per_sec = dashdmx_io_get_bytes_per_sec;
+	ctx->dash_io.get_status = dashdmx_io_get_status;
 
 #if 0 //unused since we are in non threaded mode
 	ctx->dash_io.abort = dashdmx_io_abort;
@@ -2251,7 +2446,7 @@
 	}
 #endif
 
-	//we are blocking in live mode for manifest update 
+	//we are blocking in live mode for manifest update
 	gf_filter_set_blocking(filter, GF_TRUE);
 
 	return GF_OK;
@@ -2260,7 +2455,6 @@
 static void dashdmx_finalize(GF_Filter *filter)
 {
 	GF_DASHDmxCtx *ctx = (GF_DASHDmxCtx*) gf_filter_get_udta(filter);
-	assert(ctx);
 
 	if (ctx->dash)
 		gf_dash_del(ctx->dash);
@@ -2282,6 +2476,11 @@
 		gf_list_del(ctx->hls_variants_names);
 	}
 
+	if (ctx->fio) {
+		gf_fclose((FILE*)ctx->fio);
+		gf_filter_pck_unref(ctx->mpd_pck_ref);
+	}
+
 #ifdef GPAC_HAS_QJS
 	dashdmx_cleanup_js(ctx);
 #endif
@@ -2338,7 +2537,7 @@
 			for (i=0; i<gf_dash_get_group_count(ctx->dash); i++) {
 				group = gf_dash_get_group_udta(ctx->dash, i);
 				if (!group || !group->template) continue;
-				
+
 				if (!strncmp(group->template, fevt->file_del.url, strlen(group->template) )) {
 					GF_FilterPid *pid = dashdmx_opid_from_group(ctx, group);
 					if (pid) {
@@ -2512,6 +2711,7 @@
 		}
 		group->is_playing = GF_FALSE;
 		group->prev_is_init_segment = GF_FALSE;
+		group->init_from_media = GF_FALSE;
 		if (ctx->nb_playing) {
 			ctx->initial_play = GF_FALSE;
 			group->force_seg_switch = GF_TRUE;
@@ -2633,8 +2833,13 @@
 				gf_filter_pid_set_property(opid, GF_PROP_PID_DASH_DUR, &PROP_FRAC_INT(dur, timescale) );
 			}
 		}
+		if (!gf_sys_old_arch_compat()) {
+			const char *str = gf_dash_group_get_representation_id(ctx->dash, group->idx);
+			gf_filter_pid_set_property(opid, GF_PROP_PID_REP_ID, str ? &PROP_STRING(str) : NULL );
+		}
 	}
 }
+
 GF_Err gf_dash_group_push_tfrf(GF_DashClient *dash, u32 idx, void *tfrf, u32 timescale);
 
 static void dashdmx_update_group_stats(GF_DASHDmxCtx *ctx, GF_DASHGroup *group)
@@ -2722,10 +2927,9 @@
 	} else {
 		group->init_ok = GF_TRUE;
 	}
-	dashdmx_notify_group_quality(ctx, group);
 
 fetch_next:
-	assert(group->nb_eos || group->seg_was_not_ready || group->in_error);
+	gf_assert(group->nb_eos || group->seg_was_not_ready || group->in_error);
 	group->wait_for_pck = GF_TRUE;
 	group->in_error = GF_FALSE;
 	if (group->segment_sent) {
@@ -2835,12 +3039,18 @@
 			group->current_group_dep = 0;
 	}
 
-	assert(next_url);
+	//setup group quality before sending the event, in case the segment switching does not trigger a reconfigure of the PID(s)
+	dashdmx_notify_group_quality(ctx, group);
+
+	if (!next_url) {
+		gf_assert(0);
+		next_url = "missing_segment";
+	}
 	group->seg_was_not_ready = GF_FALSE;
 
 	if (next_url_init_or_switch_segment && !group->init_switch_seg_sent) {
 		if (group->in_is_cryptfile) {
-#ifndef GPAC_DISABLE_CRYPTO
+#if !defined(GPAC_DISABLE_CRYPTO) && !defined(GPAC_DISABLE_CRYPTFILE)
 			gf_cryptfin_set_kms(group->seg_filter_src, key_url, key_IV);
 #endif
 		}
@@ -2868,6 +3078,7 @@
 
 	group->segment_sent = GF_TRUE;
 	group->prev_is_init_segment = GF_FALSE;
+	group->init_from_media = GF_FALSE;
 	group->init_switch_seg_sent = GF_FALSE;
 	group->signal_seg_name = (ctx->forward==DFWD_FILE) ? GF_TRUE : GF_FALSE;
 	group->us_at_seg_start = gf_sys_clock_high_res();
@@ -2886,7 +3097,7 @@
 	}
 
 	if (group->in_is_cryptfile) {
-#ifndef GPAC_DISABLE_CRYPTO
+#if !defined(GPAC_DISABLE_CRYPTO) && !defined(GPAC_DISABLE_CRYPTFILE)
 		gf_cryptfin_set_kms(group->seg_filter_src, key_url, key_IV);
 #endif
 	}
@@ -2914,7 +3125,7 @@
 {
 	u32 i;
 	if (!ctx || ctx->in_error) return GF_EOS;
-	
+
 	for (i=0; i<gf_filter_get_ipid_count(ctx->filter); i++) {
 		GF_FilterEvent evt;
 		GF_FilterPid *pid = gf_filter_get_ipid(ctx->filter, i);
@@ -2943,6 +3154,14 @@
 	Bool has_pck = GF_FALSE;
 	Bool switch_pending = GF_FALSE;
 
+	if (ctx->load_file) {
+		GF_FilterPid *pid = ctx->mpd_pid;
+		ctx->load_file = GF_FALSE;
+		ctx->mpd_pid = NULL;
+		e = dashdmx_configure_pid(filter, pid, GF_FALSE);
+		if (e) return e;
+	}
+
 	//reset group states and update stats
 	count = gf_dash_get_group_count(ctx->dash);
 	for (i=0; i<count; i++) {
@@ -2985,7 +3204,11 @@
 	}
 	e = gf_dash_process(ctx->dash);
 	if (e == GF_IP_NETWORK_EMPTY) {
-		gf_filter_ask_rt_reschedule(filter, 100000);
+		gf_filter_ask_rt_reschedule(filter, 10000);
+		//in file mode we may have dispatched our MPD and not have any output pid yet, which could trigger blocking of the filter
+		//disable this whenever dash client is waiting for http replies - it will be re-enabled at the end of the first segment
+		if (ctx->forward==DFWD_FILE)
+			gf_filter_prevent_blocking(filter, GF_TRUE);
 		return GF_OK;
 	}
 	else if (e==GF_SERVICE_ERROR) {
@@ -3140,7 +3363,7 @@
 			check_eos = GF_FALSE;
 			dashdmx_forward_packet(ctx, pck, ipid, opid, group);
 			group->wait_for_pck = GF_FALSE;
-			dashdmx_update_group_stats(ctx, group);
+			//do not update stats yet, wait for eos or flush in abort mode
 		}
 	}
 	if (ctx->compute_min_dts) {
@@ -3234,8 +3457,6 @@
 
 	if (gf_dash_is_in_setup(ctx->dash))
 		gf_filter_post_process_task(filter);
-	else if (ctx->abort)
-		gf_filter_ask_rt_reschedule(filter, 50000);
 	else if (next_time_ms)
 		gf_filter_ask_rt_reschedule(filter, 1000 * next_time_ms);
 
@@ -3245,14 +3466,20 @@
 static const char *dashdmx_probe_data(const u8 *data, u32 size, GF_FilterProbeScore *score)
 {
 	char *d = (char *)data;
-	char *res_dash, *res_m3u, *res_smooth;
+	char *res_ghix, *res_dash, *res_m3u, *res_smooth;
 	char last_c = dsize-1;
 	dsize-1 = 0;
+	res_ghix = strstr(data, "<GHIX ");
 	res_dash = strstr(data, "<MPD ");
+	if (!res_dash) res_dash = strstr(data, "<Period ");
 	res_m3u = strstr(data, "#EXTM3U");
 	res_smooth = strstr(data, "<SmoothStreamingMedia");
 	dsize-1 = last_c;
 
+	if (res_ghix) {
+		*score = GF_FPROBE_SUPPORTED;
+		return "application/x-gpac-ghix";
+	}
 	if (res_dash) {
 		*score = GF_FPROBE_SUPPORTED;
 		return "application/dash+xml";
@@ -3356,6 +3583,7 @@
 	"- on: use MPD chaining once over, fallback if MPD load failure\n"
 	"- error: use MPD chaining once over or if error (MPD or segment download)", GF_PROP_UINT, "on", "off|on|error", GF_FS_ARG_HINT_ADVANCED},
 	{ OFFS(asloop), "when auto switch is enabled, iterates back and forth from highest to lowest qualities", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_EXPERT},
+	{ OFFS(bsmerge), "allow merging of video bitstreams (only HEVC for now)", GF_PROP_BOOL, "true", NULL, GF_FS_ARG_HINT_EXPERT},
 	{0}
 };
 
@@ -3388,7 +3616,7 @@
 	"- run with no adaptation, to grab maximum quality.\n"
 	"EX gpac -i MANIFEST_URL:algo=none:start_with=max_bw -o dest.mp4\n"
 	"- run with no adaptation, fetching all qualities.\n"
-	"EX gpac -i MANIFEST_URL:split_as -o dst=$File$.mp4:clone\n"
+	"EX gpac -i MANIFEST_URL:split_as -o dst=$File$.mp4\n"
 	"\n"
 	"# File mode\n"
 	"When -forward() is set to `file`, the client forwards media files without demultiplexing them.\n"
@@ -3446,7 +3674,7 @@
 	.args = DASHDmxArgs,
 	SETCAPS(DASHDmxCaps),
 	//we need the resolver, and pids are declared dynamically
-	.flags = GF_FS_REG_REQUIRES_RESOLVER | GF_FS_REG_DYNAMIC_PIDS,
+	.flags = GF_FS_REG_REQUIRES_RESOLVER | GF_FS_REG_DYNAMIC_PIDS|GF_FS_REG_USE_SYNC_READ,
 	.configure_pid = dashdmx_configure_pid,
 	.process = dashdmx_process,
 	.process_event = dashdmx_process_event,
@@ -3456,11 +3684,11 @@
 };
 
 
-#endif //GPAC_DISABLE_DASH_CLIENT
+#endif // GPAC_DISABLE_DASHIN
 
-const GF_FilterRegister *dashdmx_register(GF_FilterSession *session)
+const GF_FilterRegister *dashin_register(GF_FilterSession *session)
 {
-#ifndef GPAC_DISABLE_DASH_CLIENT
+#ifndef GPAC_DISABLE_DASHIN
 	return &DASHDmxRegister;
 #else
 	return NULL;
@@ -3468,7 +3696,7 @@
 }
 
 
-#ifndef GPAC_DISABLE_DASH_CLIENT
+#ifndef GPAC_DISABLE_DASHIN
 static s32 dashdmx_rate_adaptation_ext(void *udta, u32 group_idx, u32 base_group_idx, Bool force_lower_complexity, GF_DASHCustomAlgoInfo *stats)
 {
 	GF_DASHDmxCtx *ctx = (GF_DASHDmxCtx*) udta;
@@ -3499,20 +3727,18 @@
 	stats.current_seg_dur = current_seg_dur;
 	return ctx->on_download_monitor(ctx->rt_udta, group_idx, &stats);
 }
-#endif /*GPAC_DISABLE_DASH_CLIENT*/
+#endif // GPAC_DISABLE_DASHIN
 
 
 GF_EXPORT
 GF_Err gf_filter_bind_dash_algo_callbacks(GF_Filter *filter, void *udta,
-		void (*period_reset)(void *rate_adaptation, u32 type),
+		void (*period_reset)(void *udta, u32 type),
 		void (*new_group)(void *udta, u32 group_idx, void *dash),
 		s32 (*rate_adaptation)(void *udta, u32 group_idx, u32 base_group_idx, Bool force_low_complex, void *stats),
 		s32 (*download_monitor)(void *udta, u32 group_idx, void *stats)
 )
 {
-#ifdef GPAC_DISABLE_DASH_CLIENT
-	return GF_NOT_SUPPORTED;
-#else
+#ifndef GPAC_DISABLE_DASHIN
 	if (!gf_filter_is_instance_of(filter, &DASHDmxRegister))
 		return GF_BAD_PARAM;
 	GF_DASHDmxCtx *ctx = (GF_DASHDmxCtx*) gf_filter_get_udta(filter);
@@ -3535,6 +3761,7 @@
 		gf_dash_set_algo(ctx->dash, GF_DASH_ALGO_GPAC_LEGACY_BUFFER);
 	}
 	return GF_OK;
-
+#else
+	return GF_NOT_SUPPORTED;
 #endif
 }

gpac-2.4.0.tar.gz/src/filters/dmx_ghi.c Added

@@ -0,0 +1,1368 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2023
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / GHI demuxer filter
+ *
+ *  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/filters.h>
+#include <gpac/constants.h>
+#include <gpac/list.h>
+#include <gpac/mpd.h>
+#include <gpac/bitstream.h>
+#include <gpac/base_coding.h>
+#include <gpac/network.h>
+
+#ifndef GPAC_DISABLE_GHIDMX
+
+typedef struct
+{
+	u64 first_tfdt, first_pck_seq, seg_duration, frag_start_offset, frag_tfdt;
+	u32 split_first, split_last;
+} GHISegInfo;
+
+typedef struct
+{
+	GF_FilterPid *ipid;
+	GF_List *opids;
+
+	GHISegInfo seg_info;
+	u32 nb_pck;
+
+	Bool first_sent;
+	u32 starts_with_sap;
+	u32 seg_num;
+	Bool inactive;
+	Bool empty_seg;
+	u32 active_mux_base_plus_one;
+	GF_PropStringList mux_dst;
+
+#ifndef GPAC_DISABLE_MPD
+	//for xml-based
+	GF_List *segs_xml;
+	GF_List *x_children;
+#endif
+
+	u32 bitrate;
+	u32 delay;
+	Bool use_offsets;
+
+	//for bin-based
+	GF_List *segs_bin;
+
+	GF_Filter *filter_src;
+
+	char *rep_id, *res_url;
+	u32 track_id, pid_timescale, mpd_timescale, sample_duration, first_frag_start_offset;
+	s32 first_cts_offset;
+	u32 props_size, props_offset, rep_flags, nb_segs;
+} GHIStream;
+
+enum
+{
+	GHI_GM_NONE=0,
+	GHI_GM_ALL,
+	GHI_GM_MAIN,
+	GHI_GM_CHILD,
+	GHI_GM_INIT,
+};
+
+typedef struct
+{
+	//options
+	u32 gm;
+	Bool force;
+	GF_PropStringList mux;
+	char *rep, *out;
+	u32 sn;
+
+	//internal
+	GF_FilterPid *ipid;
+	Bool init;
+	GF_List *streams;
+
+	u32 segment_duration;
+	u64 max_segment_duration;
+	u64 media_presentation_duration;
+	u64 period_duration;
+	char *segment_template;
+
+	u64 min_ts_plus_one;
+	u32 min_ts_timescale;
+	u64 min_offset_plus_one, max_end_start_offset_plus_one;
+} GHIDmxCtx;
+
+
+static void set_opids_props(GHIDmxCtx *ctx, GHIStream *st)
+{
+	u32 i, count = gf_list_count(st->opids);
+	for (i=0; i<count; i++) {
+		GF_FilterPid *opid = gf_list_get(st->opids, i);
+
+		if (st->ipid)
+			gf_filter_pid_copy_properties(opid, st->ipid);
+
+		gf_filter_pid_set_property(opid, GF_PROP_PID_DASH_DUR, &PROP_FRAC_INT(ctx->segment_duration, 1000));
+		gf_filter_pid_set_property(opid, GF_PROP_PID_PERIOD_DUR, &PROP_FRAC64_INT(ctx->period_duration, 1000));
+		gf_filter_pid_set_property(opid, GF_PROP_PID_URL, &PROP_STRING( gf_file_basename(st->res_url)) );
+		gf_filter_pid_set_property(opid, GF_PROP_PID_FILEPATH, &PROP_STRING( gf_file_basename(st->res_url)) );
+		if (st->track_id)
+			gf_filter_pid_set_property(opid, GF_PROP_PID_ID, &PROP_UINT(st->track_id) );
+
+		if (ctx->gm) {
+			switch (ctx->gm) {
+			case GHI_GM_ALL:
+				gf_filter_pid_set_property(opid, GF_PROP_PID_DASH_CUE, &PROP_STRING("idx_all"));
+				break;
+			case GHI_GM_MAIN:
+				gf_filter_pid_set_property(opid, GF_PROP_PID_DASH_CUE, &PROP_STRING("idx_man"));
+				break;
+			case GHI_GM_CHILD:
+				gf_filter_pid_set_property(opid, GF_PROP_PID_DASH_CUE, &PROP_STRING("idx_child"));
+				break;
+			case GHI_GM_INIT:
+				gf_filter_pid_set_property(opid, GF_PROP_PID_DASH_CUE, &PROP_STRING("idx_init"));
+				break;
+			}
+			gf_filter_pid_set_property_str(opid, "mpd_duration", &PROP_LONGUINT(ctx->media_presentation_duration));
+			gf_filter_pid_set_property_str(opid, "max_seg_dur", &PROP_UINT((u32) ctx->max_segment_duration));
+			gf_filter_pid_set_property_str(opid, "start_with_sap", &PROP_UINT(st->starts_with_sap));
+		} else {
+			gf_filter_pid_set_property(opid, GF_PROP_PID_DASH_CUE, &PROP_STRING("idx_seg"));
+			gf_filter_pid_set_property(opid, GF_PROP_PID_START_NUMBER, &PROP_UINT(st->seg_num));
+		}
+		if (ctx->segment_template)
+			gf_filter_pid_set_property_str(opid, "idx_template", &PROP_STRING(ctx->segment_template));
+		if (ctx->out)
+			gf_filter_pid_set_property_str(opid, "idx_out", &PROP_STRING(ctx->out));
+
+		if (st->sample_duration)
+			gf_filter_pid_set_property(opid, GF_PROP_PID_CONSTANT_DURATION, &PROP_UINT(st->sample_duration));
+
+		if (st->bitrate)
+			gf_filter_pid_set_property(opid, GF_PROP_PID_BITRATE, &PROP_UINT(st->bitrate));
+
+		if (st->mux_dst.nb_items) {
+			if (st->active_mux_base_plus_one) {
+				gf_filter_pid_set_property(opid, GF_PROP_PID_REP_ID, &PROP_STRING(st->mux_dst.valsst->active_mux_base_plus_one-1));
+			} else {
+				gf_filter_pid_set_property(opid, GF_PROP_PID_REP_ID, &PROP_STRING(st->mux_dst.valsi));
+			}
+		} else {
+			gf_filter_pid_set_property(opid, GF_PROP_PID_REP_ID, &PROP_STRING(st->rep_id));
+		}
+		if (!st->ipid)
+			gf_filter_pid_set_name(opid, st->rep_id);
+	}
+}
+
+static void ghi_dmx_send_seg_times(GHIDmxCtx *ctx, GHIStream *st, GF_FilterPid *opid)
+{
+	u32 i, count;
+#ifndef GPAC_DISABLE_MPD
+	if (st->segs_xml) {
+		count=gf_list_count(st->segs_xml);
+	} else
+#endif
+	{
+		count=gf_list_count(st->segs_bin);
+	}
+	for (i=0; i<count; i++) {
+		GF_FilterPacket *pck = gf_filter_pck_new_alloc(opid, 0, NULL);
+		u32 dur;
+		u64 ts;
+#ifndef GPAC_DISABLE_MPD
+		if (st->segs_xml) {
+			GF_MPD_SegmentURL *surl = gf_list_get(st->segs_xml, i);
+			ts = surl->first_tfdt + surl->split_first_dur;
+			dur = (u32) surl->duration;
+		} else
+#endif
+		{
+			GHISegInfo *si = gf_list_get(st->segs_bin, i);
+			ts = si->first_tfdt + si->split_first;
+			dur = (u32) si->seg_duration;
+		}
+		gf_filter_pck_set_dts(pck, ts);
+		if (!i) ts += st->first_cts_offset;
+		gf_filter_pck_set_cts(pck, ts);
+
+		dur = (u32) gf_timestamp_rescale(dur, st->mpd_timescale, st->pid_timescale);
+		gf_filter_pck_set_duration(pck, dur);
+		gf_filter_pck_set_sap(pck, st->starts_with_sap);
+		gf_filter_pck_set_property(pck, GF_PROP_PCK_CUE_START, &PROP_BOOL(GF_TRUE));
+		gf_filter_pck_set_seek_flag(pck, GF_TRUE);
+		gf_filter_pck_send(pck);
+	}
+	//dasher expects at least one packet to start, send a dummy one - this happens when generating init segments only
+	if (!count) {
+		GF_FilterPacket *pck = gf_filter_pck_new_alloc(opid, 0, NULL);
+		gf_filter_pck_set_dts(pck, 0);
+		gf_filter_pck_set_cts(pck, 0);
+		gf_filter_pck_set_sap(pck, GF_FILTER_SAP_1);
+		gf_filter_pck_set_property(pck, GF_PROP_PCK_CUE_START, &PROP_BOOL(GF_TRUE));
+		gf_filter_pck_set_seek_flag(pck, GF_TRUE);
+		gf_filter_pck_send(pck);
+	}
+	gf_filter_pid_set_eos(opid);
+}
+
+GF_Err ghi_dmx_configure_pid(GF_Filter *filter, GF_FilterPid *pid, Bool is_remove)
+{
+	GHIDmxCtx *ctx = gf_filter_get_udta(filter);
+
+	if (is_remove) {
+		ctx->ipid = NULL;
+		return GF_OK;
+	}
+	if (! gf_filter_pid_check_caps(pid))
+		return GF_NOT_SUPPORTED;
+
+	if (!ctx->ipid) {
+		ctx->ipid = pid;
+		GF_FilterEvent evt;
+		GF_FEVT_INIT(evt, GF_FEVT_PLAY, pid);
+		gf_filter_pid_send_event(pid, &evt);
+		gf_filter_pid_set_framing_mode(pid, GF_TRUE);
+	}
+	if (ctx->ipid == pid) return GF_OK;
+
+	GHIStream *st = gf_filter_pid_get_udta(pid);
+	if (!st) {
+		const GF_PropertyValue *url = gf_filter_pid_get_property(pid, GF_PROP_PID_URL);
+		if (!url) return GF_SERVICE_ERROR;
+		const GF_PropertyValue *p_id = gf_filter_pid_get_property(pid, GF_PROP_PID_ID);
+		if (!p_id) return GF_SERVICE_ERROR;
+		u32 i;
+		for (i=0; i<gf_list_count(ctx->streams); i++) {
+			st = gf_list_get(ctx->streams, i);
+			if (!st->inactive && !gf_filter_pid_is_filter_in_parents(pid, st->filter_src)) {
+				st = NULL;
+				continue;
+			}
+			if (!st->track_id) break;
+			if (st->track_id == p_id->value.uint) break;
+			st = NULL;
+		}
+		if (!st) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("GHIX Failed to locate source filter for pid %s\n", gf_filter_pid_get_name(pid)));
+			return GF_SERVICE_ERROR;
+		}
+		if (st->inactive) {
+			GF_FilterEvent evt;
+			GF_FEVT_INIT(evt, GF_FEVT_PLAY, pid);
+			evt.play.initial_broadcast_play = 2;
+			gf_filter_pid_send_event(pid, &evt);
+			evt.base.type = GF_FEVT_STOP;
+			gf_filter_pid_send_event(pid, &evt);
+			return GF_OK;
+		}
+		gf_filter_pid_set_udta(pid, st);
+
+		st->ipid = pid;
+		if (!st->active_mux_base_plus_one) {
+			for (i=0; i<st->mux_dst.nb_items; i++) {
+				GF_FilterPid *opid = gf_filter_pid_new(filter);
+				gf_list_add(st->opids, opid);
+				gf_filter_pid_set_udta(opid, st);
+			}
+		}
+		if (!gf_list_count(st->opids)) {
+			GF_FilterPid *opid = gf_filter_pid_new(filter);
+			gf_list_add(st->opids, opid);
+			gf_filter_pid_set_udta(opid, st);
+		}
+		gf_filter_pid_set_framing_mode(pid, GF_TRUE);
+	}
+
+	set_opids_props(ctx, st);
+
+	return GF_OK;
+}
+
+static Bool ghi_dmx_process_event(GF_Filter *filter, const GF_FilterEvent *evt)
+{
+	GF_FilterEvent fevt;
+	GHIStream *st = evt->base.on_pid ? gf_filter_pid_get_udta(evt->base.on_pid) : NULL;
+	GHIDmxCtx *ctx = gf_filter_get_udta(filter);
+	if (!st) return GF_FALSE;
+
+	switch (evt->base.type) {
+	case GF_FEVT_PLAY:
+		if (ctx->gm) {
+			ghi_dmx_send_seg_times(ctx, st, evt->base.on_pid);
+			return GF_TRUE;
+		}
+		if (st->empty_seg) {
+			GF_FilterPid *opid = gf_list_get(st->opids, 0);
+			GF_FilterPacket *dst = gf_filter_pck_new_alloc(opid, 0, NULL);
+			gf_filter_pck_set_dts(dst, st->seg_info.first_tfdt);
+			gf_filter_pck_set_cts(dst, st->seg_info.first_tfdt);
+			gf_filter_pck_set_sap(dst, GF_FILTER_SAP_1);
+			gf_filter_pck_set_property(dst, GF_PROP_PCK_CUE_START, &PROP_BOOL(GF_TRUE));
+			u32 dur = (u32) gf_timestamp_rescale(st->seg_info.seg_duration, st->mpd_timescale, st->pid_timescale);
+			gf_filter_pck_set_duration(dst, dur);
+			gf_filter_pck_send(dst);
+
+			gf_filter_pid_set_eos(opid);
+			st->inactive = GF_TRUE;
+			return GF_TRUE;
+		}
+		GF_FEVT_INIT(fevt, GF_FEVT_PLAY, st->ipid);
+		fevt.base.on_pid = st->ipid;
+		if (st->use_offsets) {
+			fevt.play.hint_start_offset = ctx->min_offset_plus_one-1;
+			if (st->seg_info.frag_start_offset) {
+				fevt.play.hint_first_dts = st->seg_info.frag_tfdt ? st->seg_info.frag_tfdt : st->seg_info.first_tfdt;
+			}
+			if (ctx->max_end_start_offset_plus_one)
+				fevt.play.hint_end_offset = ctx->max_end_start_offset_plus_one - 1;
+		}
+		if (ctx->min_ts_plus_one) {
+			fevt.play.start_range = (Double) (ctx->min_ts_plus_one-1);
+			fevt.play.start_range /= ctx->min_ts_timescale;
+		} else {
+			fevt.play.start_range = (Double) st->seg_info.first_tfdt;
+			fevt.play.start_range /= st->pid_timescale;
+		}
+		fevt.play.from_pck = (u32) st->seg_info.first_pck_seq;
+		//if we know the amount of packets (not last seg), signal it otherwise use 0 (no pck end range)
+		if (st->nb_pck != (u32) -1)
+			fevt.play.to_pck = (u32) st->seg_info.first_pck_seq + st->nb_pck;
+		fevt.play.orig_delay = st->delay;
+
+		gf_filter_pid_send_event(st->ipid, &fevt);
+
+		return GF_TRUE;
+
+	case GF_FEVT_STOP:
+		return GF_FALSE;
+
+	case GF_FEVT_SET_SPEED:
+		//cancel event
+		return GF_TRUE;
+	default:
+		break;
+	}
+	//by default don't cancel event - to rework once we have downloading in place
+	return GF_FALSE;
+}
+
+static Bool ghi_dmx_on_filter_setup_error(GF_Filter *failed_filter, void *udta, GF_Err err)
+{
+	GF_Filter *filter = (GF_Filter *)udta;
+	if (udta) gf_filter_setup_failure(filter, err);
+	return GF_FALSE;
+}
+
+static void ghi_dmx_declare_opid_xml(GF_Filter *filter, GHIDmxCtx *ctx, GHIStream *st)
+{
+#ifndef GPAC_DISABLE_MPD
+	if (!gf_list_count(st->opids)) {
+		u32 i;
+		for (i=0; i<st->mux_dst.nb_items; i++) {
+			GF_FilterPid *opid = gf_filter_pid_new(filter);
+			gf_filter_pid_set_udta(opid, st);
+			gf_list_add(st->opids, opid);
+		}
+		if (!st->mux_dst.nb_items) {
+			GF_FilterPid *opid = gf_filter_pid_new(filter);
+			gf_filter_pid_set_udta(opid, st);
+			gf_list_add(st->opids, opid);
+		}
+	}
+
+	u8 *obuf = NULL;
+	u32 obuf_alloc = 0;
+	GF_FilterPid *opid = gf_list_get(st->opids, 0);
+	u32 i, nb_props = gf_list_count(st->x_children);
+	for (i=0; i<nb_props; i++) {
+		Bool is_str_list=GF_FALSE;
+		Bool do_reset=GF_TRUE;
+		u32 j=0, p4cc=0, ptype=0, vlen, obuf_size;
+		const char *pname=NULL;
+		char *value=NULL;
+		GF_XMLAttribute *att;
+		GF_PropertyValue p;
+
+		GF_XMLNode *n = gf_list_get(st->x_children, i);
+		if (n->type != GF_XML_NODE_TYPE) continue;
+		if (!n->name || strcmp(n->name, "prop")) continue;
+		while ( (att = gf_list_enum(n->attributes, &j))) {
+			if (!strcmp(att->name, "type")) p4cc = gf_props_get_id(att->value);
+			else if (!strcmp(att->name, "name")) pname = att->value;
+			else if (!strcmp(att->name, "ptype")) ptype = gf_props_parse_type(att->value);
+			else if (!strcmp(att->name, "value")) value = att->value;
+		}
+		if (p4cc) {
+			ptype = gf_props_4cc_get_type(p4cc);
+			pname = gf_props_4cc_get_name(p4cc);
+		}
+		else if (!pname) continue;
+
+		if (!ptype || !value) continue;
+		vlen = (u32) strlen(value);
+
+		switch (ptype) {
+		case GF_PROP_STRING_LIST:
+			is_str_list = GF_TRUE;
+		case GF_PROP_DATA:
+		case GF_PROP_DATA_NO_COPY:
+		case GF_PROP_CONST_DATA:
+			obuf_size = (vlen+1)*2;
+			if (obuf_alloc<obuf_size) {
+				obuf = gf_realloc(obuf, obuf_size);
+				obuf_alloc = obuf_size;
+			}
+			vlen = gf_base64_decode(value, vlen, obuf, obuf_size);
+			if (is_str_list) {
+				p = gf_props_parse_value(GF_PROP_STRING_LIST, pname, obuf, NULL, ',');
+			} else {
+				p.type = GF_PROP_DATA;
+				p.value.data.ptr = obuf;
+				p.value.data.size = vlen;
+			}
+			do_reset=GF_FALSE;
+			break;
+		default:
+			if (p4cc==GF_PROP_PID_CODECID) {
+				p.type = GF_PROP_UINT;
+				p.value.uint = gf_codecid_parse(value);
+			}
+			//parse the property, based on its property type
+			else if (p4cc==GF_PROP_PID_STREAM_TYPE) {
+				p.type = GF_PROP_UINT;
+				p.value.uint = gf_stream_type_by_name(value);
+			} else {
+				p = gf_props_parse_value(ptype, pname, value, NULL, ',');
+			}
+			break;
+		}
+
+		if (p4cc) {
+			gf_filter_pid_set_property(opid, p4cc, &p);
+		} else {
+			gf_filter_pid_set_property_dyn(opid, (char *)pname, &p);
+		}
+		if (do_reset) gf_props_reset_single(&p);
+	}
+	if (obuf) gf_free(obuf);
+
+	for (i=1; i<gf_list_count(st->opids); i++) {
+		GF_FilterPid *a_opid = gf_list_get(st->opids, i);
+		gf_filter_pid_copy_properties(a_opid, opid);
+	}
+	set_opids_props(ctx, st);
+#endif
+}
+
+static void ghi_dmx_declare_opid_bin(GF_Filter *filter, GHIDmxCtx *ctx, GHIStream *st, GF_BitStream *bs)
+{
+	u32 i;
+	if (!gf_list_count(st->opids)) {
+		for (i=0; i<st->mux_dst.nb_items; i++) {
+			GF_FilterPid *opid = gf_filter_pid_new(filter);
+			gf_filter_pid_set_udta(opid, st);
+			gf_list_add(st->opids, opid);
+		}
+		if (!st->mux_dst.nb_items) {
+			GF_FilterPid *opid = gf_filter_pid_new(filter);
+			gf_filter_pid_set_udta(opid, st);
+			gf_list_add(st->opids, opid);
+		}
+	}
+
+	GF_FilterPid *opid = gf_list_get(st->opids, 0);
+	gf_bs_seek(bs, st->props_offset);
+	u32 end = st->props_offset + st->props_size;
+	gf_bs_skip_bytes(bs, 4);
+
+	//parse props
+	while (1) {
+		char *pname=NULL;
+		u32 ptype;
+		u32 pidx;
+		Bool do_reset=GF_TRUE;
+		GF_PropertyValue p;
+		u32 p4cc = gf_bs_read_u32(bs);
+		if (p4cc == 0xFFFFFFFF) break;
+		if (!p4cc) {
+			pname = gf_bs_read_utf8(bs);
+			ptype = gf_bs_read_u32(bs);
+		} else {
+			ptype = gf_props_4cc_get_type(p4cc);
+			if (!ptype) {
+				//e = GF_NON_COMPLIANT_BITSTREAM;
+				break;
+			}
+		}
+		p.type = ptype;
+		switch (ptype) {
+		case GF_PROP_SINT:
+		case GF_PROP_UINT:
+		case GF_PROP_4CC:
+			p.value.uint = gf_bs_read_u32(bs);
+			break;
+		case GF_PROP_LSINT:
+		case GF_PROP_LUINT:
+			p.value.longuint = gf_bs_read_u64(bs);
+			break;
+		case GF_PROP_BOOL:
+			p.value.boolean = gf_bs_read_u8(bs) ? 1 : 0;
+			break;
+		case GF_PROP_FRACTION:
+			p.value.frac.num = gf_bs_read_u32(bs);
+			p.value.frac.den = gf_bs_read_u32(bs);
+			break;
+		case GF_PROP_FRACTION64:
+			p.value.lfrac.num = gf_bs_read_u64(bs);
+			p.value.lfrac.den = gf_bs_read_u64(bs);
+			break;
+		case GF_PROP_FLOAT:
+			p.value.fnumber = FLT2FIX( gf_bs_read_float(bs) );
+			break;
+		case GF_PROP_DOUBLE:
+			p.value.number = gf_bs_read_double(bs);
+			break;
+		case GF_PROP_VEC2I:
+			p.value.vec2i.x = gf_bs_read_u32(bs);
+			p.value.vec2i.y = gf_bs_read_u32(bs);
+			break;
+		case GF_PROP_VEC2:
+			p.value.vec2.x = gf_bs_read_double(bs);
+			p.value.vec2.y = gf_bs_read_double(bs);
+			break;
+		case GF_PROP_VEC3I:
+			p.value.vec3i.x = gf_bs_read_u32(bs);
+			p.value.vec3i.y = gf_bs_read_u32(bs);
+			p.value.vec3i.z = gf_bs_read_u32(bs);
+			break;
+		case GF_PROP_VEC4I:
+			p.value.vec4i.x = gf_bs_read_u32(bs);
+			p.value.vec4i.y = gf_bs_read_u32(bs);
+			p.value.vec4i.z = gf_bs_read_u32(bs);
+			p.value.vec4i.w = gf_bs_read_u32(bs);
+			break;
+		case GF_PROP_STRING:
+		case GF_PROP_STRING_NO_COPY:
+		case GF_PROP_NAME:
+			p.value.string = gf_bs_read_utf8(bs);
+			p.type = GF_PROP_STRING_NO_COPY;
+			break;
+
+		case GF_PROP_DATA:
+		case GF_PROP_DATA_NO_COPY:
+		case GF_PROP_CONST_DATA:
+			p.value.data.size = gf_bs_read_u32(bs);
+			if (p.value.data.size > gf_bs_available(bs)) {
+				gf_bs_mark_overflow(bs, GF_FALSE);
+				break;
+			}
+			p.value.data.ptr = gf_malloc(p.value.data.size);
+			gf_bs_read_data(bs, p.value.data.ptr, p.value.data.size);
+			p.type = GF_PROP_DATA_NO_COPY;
+			do_reset = GF_FALSE;
+			break;
+
+		//string list: memory is ALWAYS duplicated
+		case GF_PROP_STRING_LIST:
+			p.value.string_list.nb_items = gf_bs_read_u32(bs);
+			p.value.string_list.vals = gf_malloc(sizeof(char*) * p.value.string_list.nb_items);
+			for (pidx=0; pidx<p.value.string_list.nb_items; pidx++) {
+				p.value.string_list.valspidx = gf_bs_read_utf8(bs);
+			}
+			do_reset = GF_FALSE;
+			break;
+
+		case GF_PROP_UINT_LIST:
+		case GF_PROP_SINT_LIST:
+		case GF_PROP_4CC_LIST:
+			p.value.uint_list.nb_items = gf_bs_read_u32(bs);
+			p.value.uint_list.vals = gf_malloc(sizeof(u32) * p.value.string_list.nb_items);
+			for (pidx=0; pidx<p.value.uint_list.nb_items; pidx++) {
+				p.value.uint_list.valspidx = gf_bs_read_u32(bs);
+			}
+			break;
+		case GF_PROP_VEC2I_LIST:
+			p.value.v2i_list.nb_items = gf_bs_read_u32(bs);
+			p.value.v2i_list.vals = gf_malloc(sizeof(u32) * p.value.string_list.nb_items);
+			for (pidx=0; pidx<p.value.v2i_list.nb_items; pidx++) {
+				p.value.v2i_list.valspidx.x = gf_bs_read_u32(bs);
+				p.value.v2i_list.valspidx.y = gf_bs_read_u32(bs);
+			}
+			break;
+		default:
+			break;
+		}
+
+		if (p4cc) {
+			gf_filter_pid_set_property(opid, p4cc, &p);
+		} else {
+			gf_filter_pid_set_property_dyn(opid, (char *)pname, &p);
+			gf_free(pname);
+		}
+		if (do_reset) gf_props_reset_single(&p);
+
+		if ((gf_bs_get_position(bs) > end) || gf_bs_is_overflow(bs)) {
+			//e = GF_NON_COMPLIANT_BITSTREAM;
+			break;
+		}
+	}
+
+	//copy props to other
+	for (i=1; i<gf_list_count(st->opids); i++) {
+		GF_FilterPid *a_opid = gf_list_get(st->opids, i);
+		gf_filter_pid_copy_properties(a_opid, opid);
+	}
+	set_opids_props(ctx, st);
+}
+
+static void ghi_dmx_unmark_muxed(GHIDmxCtx *ctx)
+{
+	u32 i;
+	//unmark muxed inactive
+	if (!ctx->mux.nb_items) return;
+	if (!ctx->rep) return;
+	switch (ctx->gm) {
+	case GHI_GM_NONE:
+	case GHI_GM_INIT:
+		break;
+	default:
+		return;
+	}
+
+	for (i=0; i<gf_list_count(ctx->streams); i++) {
+		GHIStream *st = gf_list_get(ctx->streams, i);
+		if (!st->inactive) continue;
+		if (!st->mux_dst.nb_items) continue;
+		u32 j;
+		st->active_mux_base_plus_one=0;
+		for (j=0; j<st->mux_dst.nb_items; j++) {
+			if (!strcmp(st->mux_dst.valsj, ctx->rep)) {
+				st->active_mux_base_plus_one=j+1;
+				st->inactive = GF_FALSE;
+				break;
+			}
+		}
+	}
+}
+
+static Bool ghi_dmx_check_mux(GHIDmxCtx *ctx, GHIStream *st)
+{
+	//check muxed
+	u32 k;
+	for (k=0; k<ctx->mux.nb_items; k++) {
+		char *sep = strchr(ctx->mux.valsk, '@');
+		if (!sep) continue;
+		sep0 = 0;
+		if (strcmp(st->rep_id, ctx->mux.valsk)) {
+			sep0 = '@';
+			continue;
+		}
+		sep0 = '@';
+		sep++;
+
+		GF_PropertyValue p = gf_props_parse_value(GF_PROP_STRING_LIST, "mux", sep, NULL, '@');
+		st->mux_dst = p.value.string_list;
+	}
+	//mark if inactive
+	switch (ctx->gm) {
+	case GHI_GM_MAIN:
+	case GHI_GM_ALL:
+		return GF_FALSE;
+	case GHI_GM_CHILD:
+	case GHI_GM_INIT:
+		if (strcmp(st->rep_id, ctx->rep)) {
+			st->inactive = GF_TRUE;
+		}
+		return GF_FALSE;
+	}
+	if (!ctx->rep) return GF_FALSE;
+
+	if (strcmp(st->rep_id, ctx->rep)) {
+		st->inactive = GF_TRUE;
+		return GF_TRUE; //do load seg info  !
+	}
+	return GF_TRUE;
+}
+
+void ghi_dmx_parse_seg(GHIDmxCtx *ctx, GF_BitStream *bs, GHIStream *st, s32 num_seg)
+{
+	if (!num_seg) {
+		gf_bs_seek(bs, st->props_offset + st->props_size);
+		num_seg = st->nb_segs;
+	}
+
+	while (1) {
+		GHISegInfo *s;
+		GF_SAFEALLOC(s, GHISegInfo);
+		gf_list_add(st->segs_bin, s);
+
+		if (st->rep_flags & 1) s->first_tfdt = gf_bs_read_u64(bs);
+		else s->first_tfdt = gf_bs_read_u32(bs);
+
+		if (st->rep_flags & (1<<1)) s->first_pck_seq = gf_bs_read_u64(bs);
+		else s->first_pck_seq = gf_bs_read_u32(bs);
+
+		s->seg_duration = gf_bs_read_u32(bs);
+
+		if (st->rep_flags & (1<<2)) {
+			if (st->rep_flags & (1<<3)) s->frag_start_offset = gf_bs_read_u64(bs);
+			else s->frag_start_offset = gf_bs_read_u32(bs);
+		}
+		if (st->rep_flags & (1<<4)) {
+			if (st->rep_flags & (1<<5)) s->frag_tfdt = gf_bs_read_u64(bs);
+			else s->frag_tfdt = gf_bs_read_u32(bs);
+		}
+		if (st->rep_flags & (1<<6)) {
+			s->split_first = gf_bs_read_u32(bs);
+			s->split_last = gf_bs_read_u32(bs);
+		}
+
+		if (num_seg) {
+			num_seg--;
+			if (!num_seg) break;
+		}
+	}
+}
+
+GF_Err ghi_dmx_init_bin(GF_Filter *filter, GHIDmxCtx *ctx, GF_BitStream *bs)
+{
+	gf_bs_read_u32(bs);
+	/*version*/gf_bs_read_u32(bs);
+	ctx->segment_duration = gf_bs_read_u32(bs);
+	ctx->max_segment_duration = gf_bs_read_u32(bs);
+	ctx->media_presentation_duration = gf_bs_read_u64(bs);
+	ctx->period_duration = gf_bs_read_u64(bs);
+	ctx->segment_template = gf_bs_read_utf8(bs);
+
+	u32 i, nb_reps = gf_bs_read_u32(bs);
+	for (i=0; i<nb_reps; i++) {
+		u32 skip, rep_end;
+		u32 size=3; //3 32bit words
+		GHIStream *st;
+		GF_SAFEALLOC(st, GHIStream);
+		if (!st) return GF_OUT_OF_MEM;
+		gf_list_add(ctx->streams, st);
+
+		st->opids = gf_list_new();
+		if (!st->opids) return GF_OUT_OF_MEM;
+		st->segs_bin = gf_list_new();
+		if (!st->segs_bin) return GF_OUT_OF_MEM;
+
+		u32 rep_start = (u32) gf_bs_get_position(bs);
+		u32 rep_size = gf_bs_read_u32(bs);
+
+		st->rep_id = gf_bs_read_utf8(bs);
+		if (!st->rep_id) return GF_NON_COMPLIANT_BITSTREAM;
+		st->res_url = gf_bs_read_utf8(bs);
+		if (!st->res_url) return GF_NON_COMPLIANT_BITSTREAM;
+
+		st->track_id = gf_bs_read_u32(bs);
+		st->first_frag_start_offset = gf_bs_read_u32(bs);
+
+		st->pid_timescale = gf_bs_read_u32(bs);
+		st->mpd_timescale = gf_bs_read_u32(bs);
+		st->bitrate = gf_bs_read_u32(bs);
+		st->delay = gf_bs_read_u32(bs);
+		st->sample_duration = gf_bs_read_u32(bs);
+		st->first_cts_offset = (s32) gf_bs_read_u32(bs);
+		st->nb_segs = gf_bs_read_u32(bs);
+		st->starts_with_sap = gf_bs_read_u8(bs);
+		st->rep_flags = gf_bs_read_u8(bs);
+		gf_bs_read_u16(bs); //unused fo now
+
+		//skip all props
+		st->props_offset = (u32) gf_bs_get_position(bs);
+		st->props_size = gf_bs_read_u32(bs);
+		gf_bs_skip_bytes(bs, st->props_size-4);
+
+		if (!ghi_dmx_check_mux(ctx, st)) {
+			//skip all segs
+			rep_end = rep_size + rep_start;
+			skip = rep_end - (u32) gf_bs_get_position(bs);
+			gf_bs_skip_bytes(bs, skip);
+			continue;
+		}
+
+		if (st->rep_flags & 1) size += 1;
+		if (st->rep_flags & (1<<1)) size += 1;
+		if (st->rep_flags & (1<<2)) size += 1;
+		if (st->rep_flags & (1<<3)) size += 1;
+		if (st->rep_flags & (1<<4)) size += 1;
+		if (st->rep_flags & (1<<5)) size += 1;
+		if (st->rep_flags & (1<<6)) size += 2;
+
+		//locate segment
+		if (ctx->sn > st->nb_segs) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("GHIX Invalid segment index %d - only %d segments available\n", ctx->sn, st->nb_segs));
+			return GF_BAD_PARAM;
+		//todo: locate by other criteria ? (time)
+		} else {
+			st->seg_num = ctx->sn;
+		}
+
+		size *= 4; //seg size in bytes
+		//skip first n-1 segments
+		skip = size * (st->seg_num-1);
+		gf_bs_skip_bytes(bs, skip);
+		ghi_dmx_parse_seg(ctx, bs, st, (st->seg_num==st->nb_segs) ? 1 : 2);
+
+		GHISegInfo *surl = gf_list_get(st->segs_bin, 0);
+		st->seg_info = *surl;
+		st->nb_pck = -1;
+		st->empty_seg = 0;
+		if (st->seg_info.frag_start_offset)
+			st->use_offsets=1;
+
+		if (!st->seg_info.first_pck_seq) {
+			st->empty_seg = 1;
+		} else {
+			surl = gf_list_get(st->segs_bin, 1);
+			if (surl) {
+				st->nb_pck = (u32) (surl->first_pck_seq - st->seg_info.first_pck_seq);
+				if (!ctx->max_end_start_offset_plus_one
+					|| (ctx->max_end_start_offset_plus_one-1 < surl->frag_start_offset)
+				) {
+					ctx->max_end_start_offset_plus_one = surl->frag_start_offset+1;
+				}
+				//first packet of next seg is split, we need this packet in current segment
+				if (surl->split_first) st->nb_pck++;
+
+				if (surl->frag_start_offset)
+					st->use_offsets=1;
+			}
+		}
+
+		//skip remaining segs
+		rep_end = rep_size + rep_start;
+		skip = rep_end - (u32) gf_bs_get_position(bs);
+		gf_bs_skip_bytes(bs, skip);
+	}
+	return GF_OK;
+}
+
+GF_Err ghi_dmx_init_xml(GF_Filter *filter, GHIDmxCtx *ctx, const u8 *data)
+{
+#ifndef GPAC_DISABLE_MPD
+	GF_MPD *mpd;
+	GF_DOMParser *mpd_parser = gf_xml_dom_new();
+	GF_Err e = gf_xml_dom_parse_string(mpd_parser, (char*) data);
+
+	if (e != GF_OK) {
+		gf_xml_dom_del(mpd_parser);
+		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("GHIX Error in XML parsing %s\n", gf_error_to_string(e)));
+		return GF_NON_COMPLIANT_BITSTREAM;
+	}
+	mpd = gf_mpd_new();
+	e = gf_mpd_init_from_dom(gf_xml_dom_get_root(mpd_parser), mpd, NULL);
+	gf_xml_dom_del(mpd_parser);
+	if (e) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("GHIX Error in MPD creation %s\n", gf_error_to_string(e)));
+		gf_mpd_del(mpd);
+		return GF_NON_COMPLIANT_BITSTREAM;
+	}
+
+	ctx->segment_duration = mpd->segment_duration;
+	ctx->max_segment_duration = mpd->max_segment_duration;
+	ctx->media_presentation_duration = mpd->media_presentation_duration;
+	ctx->segment_template = mpd->segment_template;
+	mpd->segment_template = NULL;
+	GF_MPD_Period *period = gf_list_get(mpd->periods, 0);
+	if (!period) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("GHIX No period in index file, aborting !\n"));
+		gf_mpd_del(mpd);
+		return GF_EOS;
+	}
+	ctx->period_duration = period->duration;
+
+	u32 i;
+	for (i=0; i<gf_list_count(period->adaptation_sets); i++) {
+		u32 j;
+		GF_MPD_AdaptationSet *as = gf_list_get(period->adaptation_sets, i);
+		for (j=0; j<gf_list_count(as->representations); j++) {
+			GF_MPD_Representation *rep = gf_list_get(as->representations, j);
+			if (!rep->res_url) continue;
+			GHIStream *st;
+			GF_SAFEALLOC(st, GHIStream);
+			st->rep_id = rep->id;
+			rep->id = NULL;
+			st->res_url = rep->res_url;
+			rep->res_url = NULL;
+			st->segs_xml = rep->segment_list->segment_URLs;
+			rep->segment_list->segment_URLs = NULL;
+			if (ctx->gm && !ctx->force) {
+				st->x_children = rep->x_children;
+				rep->x_children = NULL;
+			}
+			st->bitrate = rep->bandwidth;
+			st->delay = rep->segment_list->pid_delay;
+
+			st->track_id = rep->trackID;
+			//mpd timescale
+			st->pid_timescale = rep->segment_list->src_timescale;
+			st->mpd_timescale = rep->segment_list->timescale;
+			//in pid timescale units
+			st->sample_duration = rep->segment_list->sample_duration;
+			st->first_cts_offset = rep->segment_list->first_cts_offset;
+
+			st->starts_with_sap = as->starts_with_sap ? as->starts_with_sap : rep->starts_with_sap;
+			st->opids = gf_list_new();
+			gf_list_add(ctx->streams, st);
+
+			if (!ghi_dmx_check_mux(ctx, st))
+				continue;
+
+			//locate segment
+			if (ctx->sn > gf_list_count(st->segs_xml)) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("GHIX Invalid segment index %d - only %d segments available\n", ctx->sn, gf_list_count(st->segs_xml)));
+				gf_mpd_del(mpd);
+				return GF_BAD_PARAM;
+			//todo: locate by other criteria ? (time)
+			} else {
+				st->seg_num = ctx->sn;
+			}
+
+			GF_MPD_SegmentURL *surl = gf_list_get(st->segs_xml, st->seg_num-1);
+			//in pid timescale units
+			st->seg_info.first_tfdt = surl->first_tfdt;
+			st->seg_info.first_pck_seq = surl->first_pck_seq;
+			//in mpd timescale units
+			st->seg_info.seg_duration = surl->duration;
+			st->seg_info.frag_start_offset = surl->frag_start_offset;
+			//in pid timescale units
+			st->seg_info.frag_tfdt = surl->frag_tfdt;
+			st->seg_info.split_first = surl->split_first_dur;
+			st->seg_info.split_last = surl->split_last_dur;
+			st->nb_pck = -1;
+			st->empty_seg = 0;
+			if (st->seg_info.frag_start_offset)
+				st->use_offsets=1;
+
+			if (!st->seg_info.first_pck_seq) {
+				st->empty_seg = 1;
+			} else {
+				surl = gf_list_get(st->segs_xml, st->seg_num);
+				if (surl) {
+					st->nb_pck = (u32) (surl->first_pck_seq - st->seg_info.first_pck_seq);
+					if (!ctx->max_end_start_offset_plus_one
+						|| (ctx->max_end_start_offset_plus_one-1<surl->frag_start_offset)
+					) {
+						ctx->max_end_start_offset_plus_one = surl->frag_start_offset+1;
+					}
+					//first packet of next seg is split, we need this packet in current segment
+					if (surl->split_first_dur) st->nb_pck++;
+					if (surl->frag_start_offset)
+						st->use_offsets=1;
+				}
+			}
+			surl = gf_list_get(st->segs_xml, 0);
+			st->first_frag_start_offset = (u32) surl->frag_start_offset;
+		}
+	}
+	gf_mpd_del(mpd);
+	return GF_OK;
+#else
+	return GF_NOT_SUPPORTED;
+#endif
+}
+GF_Err ghi_dmx_init(GF_Filter *filter, GHIDmxCtx *ctx)
+{
+	u32 size, i, nb_active=0;
+	GF_Err e;
+	GF_BitStream *bs = NULL;
+	GF_FilterPacket *pck = gf_filter_pid_get_packet(ctx->ipid);
+	if (!pck) return GF_OK;
+	ctx->init = GF_TRUE;
+	const u8 *data = gf_filter_pck_get_data(pck, &size);
+	if (!data) {
+		return GF_SERVICE_ERROR;
+	}
+	if ((data0 == 'G') && (data1 == 'H') && (data2 == 'I') && (data3 == 'D')) {
+		bs = gf_bs_new(data, size, GF_BITSTREAM_READ);
+		e = ghi_dmx_init_bin(filter, ctx, bs);
+		if (!e && gf_bs_is_overflow(bs)) e = GF_NON_COMPLIANT_BITSTREAM;
+	} else if (gf_utf8_is_legal(data, size)) {
+		char *str = gf_malloc(size+1);
+		if (str) {
+			memcpy(str, data, size);
+			strsize=0;
+			e = ghi_dmx_init_xml(filter, ctx, str);
+			gf_free(str);
+		} else {
+			e = GF_OUT_OF_MEM;
+		}
+	} else {
+		e = GF_NON_COMPLIANT_BITSTREAM;
+	}
+	if (e) {
+		if (bs) gf_bs_del(bs);
+		gf_filter_pid_drop_packet(ctx->ipid);
+		gf_filter_setup_failure(filter, e);
+		return e;
+	}
+
+	//unmark muxed inactive
+	ghi_dmx_unmark_muxed(ctx);
+
+	//declare pids
+	for (i=0; i<gf_list_count(ctx->streams); i++) {
+		GHIStream *st = gf_list_get(ctx->streams, i);
+
+		u32 k;
+		for (k=0; k<gf_list_count(ctx->streams); k++) {
+			GHIStream *st_a = gf_list_get(ctx->streams, k);
+			if (!strcmp(st_a->res_url, st->res_url)) {
+				st->filter_src = st_a->filter_src;
+				break;
+			}
+		}
+		if (st->inactive) continue;
+		nb_active++;
+		if (st->filter_src) continue;
+
+		//load all segments
+		if (ctx->gm && bs)
+			ghi_dmx_parse_seg(ctx, bs, st, 0);
+
+		if (ctx->gm && !ctx->force) {
+			if (st->segs_bin)
+				ghi_dmx_declare_opid_bin(filter, ctx, st, bs);
+			else
+				ghi_dmx_declare_opid_xml(filter, ctx, st);
+			continue;
+		}
+		const GF_PropertyValue *p = gf_filter_pid_get_property(ctx->ipid, GF_PROP_PID_URL);
+		char *args = gf_url_concatenate (p ? p->value.string : "./", st->res_url);
+
+		if (st->first_frag_start_offset) {
+			char szRange100;
+			char c = gf_filter_get_sep(filter, GF_FS_SEP_ARGS);
+			sprintf(szRange, "%cgpac%crange=0-%u", c, c, st->first_frag_start_offset-1);
+			gf_dynstrcat(&args, szRange, NULL);
+		}
+
+		if (!ctx->gm) {
+			char szOpt100;
+			char c = gf_filter_get_sep(filter, GF_FS_SEP_ARGS);
+			sprintf(szOpt, "%cgfopt%clightp%cindex=0", c, c, c);
+			gf_dynstrcat(&args, szOpt, NULL);
+
+			if (!ctx->min_ts_plus_one
+				|| gf_timestamp_less(st->seg_info.first_tfdt+1, st->pid_timescale, ctx->min_ts_plus_one, ctx->min_ts_timescale)
+			) {
+				ctx->min_ts_plus_one = st->seg_info.first_tfdt+1;
+				ctx->min_ts_timescale = st->pid_timescale;
+			}
+
+			if (st->use_offsets) {
+				if (!ctx->min_offset_plus_one || (st->seg_info.frag_start_offset < ctx->min_offset_plus_one-1))
+					ctx->min_offset_plus_one = st->seg_info.frag_start_offset+1;
+			}
+		}
+
+		st->filter_src = gf_filter_connect_source(filter, args, NULL, GF_FALSE, &e);
+		gf_free(args);
+		if (!st->filter_src) {
+			if (bs) gf_bs_del(bs);
+			gf_filter_pid_drop_packet(ctx->ipid);
+
+			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("GHIXDmx error locating source filter for rep %s name %s: %s\n", st->rep_id, st->res_url, gf_error_to_string(e) ));
+			gf_filter_setup_failure(filter, e);
+			return e;
+		}
+		gf_filter_set_source(filter, st->filter_src, NULL);
+
+		gf_filter_set_setup_failure_callback(filter, st->filter_src, ghi_dmx_on_filter_setup_error, filter);
+	}
+
+	if (bs) gf_bs_del(bs);
+	gf_filter_pid_drop_packet(ctx->ipid);
+	gf_filter_pid_set_discard(ctx->ipid, GF_TRUE);
+
+	if (nb_active) return GF_OK;
+	GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("GHIXDmx No active representation to generate !\n"));
+	return GF_BAD_PARAM;
+}
+
+GF_Err ghi_dmx_process(GF_Filter *filter)
+{
+	GHIDmxCtx *ctx = gf_filter_get_udta(filter);
+	u32 i, count;
+	GF_FilterPacket *pck;
+
+	if (!ctx->init) {
+		return ghi_dmx_init(filter, ctx);
+	}
+
+	count = gf_list_count(ctx->streams);
+	for (i=0; i<count; i++) {
+		GHIStream *st = gf_list_get(ctx->streams, i);
+		if (st->inactive || !st->ipid || st->empty_seg) continue;
+
+		GF_FilterPid *opid = gf_list_get(st->opids, 0);
+		pck = gf_filter_pid_get_packet(st->ipid);
+		if (!pck) {
+			if (gf_filter_pid_is_eos(st->ipid))
+				gf_filter_pid_set_eos(opid);
+			continue;
+		}
+		u64 dts = gf_filter_pck_get_dts(pck);
+		if (dts >= st->seg_info.first_tfdt) {
+			if (st->nb_pck) {
+				st->nb_pck--;
+				if (!st->first_sent || (!st->nb_pck && st->seg_info.split_last)) {
+					GF_FilterPacket *dst = gf_filter_pck_new_ref(opid, 0, 0, pck);
+					if (dst) {
+						gf_filter_pck_merge_properties(pck, dst);
+						if (!st->first_sent) {
+							gf_filter_pck_set_property(dst, GF_PROP_PCK_CUE_START, &PROP_BOOL(GF_TRUE));
+							if (st->seg_info.split_first) {
+								gf_filter_pck_set_property(dst, GF_PROP_PCK_SPLIT_START, &PROP_UINT(st->seg_info.split_first));
+								st->seg_info.split_first = 0;
+							}
+						}
+						if (!st->nb_pck) {
+							gf_filter_pck_set_property(dst, GF_PROP_PCK_SPLIT_END, &PROP_UINT(st->seg_info.split_last));
+							st->seg_info.split_last = 0;
+						}
+						gf_filter_pck_send(dst);
+					}
+					st->first_sent = GF_TRUE;
+				} else {
+					gf_filter_pck_forward(pck, opid);
+				}
+				if (!st->nb_pck) {
+					GF_FilterEvent evt;
+					GF_FEVT_INIT(evt, GF_FEVT_STOP, st->ipid);
+					gf_filter_pid_send_event(st->ipid, &evt);
+					gf_filter_pid_set_eos(opid);
+				}
+			} else {
+				GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("GHIX Packet dts "LLU" after segment range, discarding \n", dts));
+			}
+		} else {
+			GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("GHIX Packet dts "LLU" before segment range, discarding \n", dts));
+		}
+		gf_filter_pid_drop_packet(st->ipid);
+	}
+
+	return GF_OK;
+}
+
+GF_Err ghi_dmx_initialize(GF_Filter *filter)
+{
+	GHIDmxCtx *ctx = gf_filter_get_udta(filter);
+	ctx->streams = gf_list_new();
+
+	if (ctx->sn && ctx->rep)
+		ctx->gm = GHI_GM_NONE;
+
+	if (!ctx->gm && !ctx->rep) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("GHIX Missing rep ID, cannot generate manifest\n"));
+		return GF_BAD_PARAM;
+	}
+	if ((ctx->gm>=GHI_GM_CHILD) && !ctx->rep) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("GHIX Missing rep ID, cannot generating %s\n", (ctx->gm==GHI_GM_CHILD) ? "child manifest" : "init segment"));
+		return GF_BAD_PARAM;
+	}
+	return GF_OK;
+}
+
+void ghi_dmx_finalize(GF_Filter *filter)
+{
+	GHIDmxCtx *ctx = gf_filter_get_udta(filter);
+
+	while (gf_list_count(ctx->streams)) {
+		GHIStream *st = gf_list_pop_back(ctx->streams);
+		GF_PropertyValue p;
+		p.type = GF_PROP_STRING_LIST;
+		p.value.string_list = st->mux_dst;
+		gf_props_reset_single(&p);
+
+		if (st->segs_bin) {
+			while (gf_list_count(st->segs_bin)) {
+				GHISegInfo *s = gf_list_pop_back(st->segs_bin);
+				gf_free(s);
+			}
+			gf_list_del(st->segs_bin);
+		}
+#ifndef GPAC_DISABLE_MPD
+		if (st->segs_xml) {
+			while (gf_list_count(st->segs_xml)) {
+				GF_MPD_SegmentURL *s = gf_list_pop_back(st->segs_xml);
+				gf_mpd_segment_url_free(s);
+			}
+			gf_list_del(st->segs_xml);
+		}
+		if (st->x_children) {
+			while (gf_list_count(st->x_children)) {
+				GF_XMLNode *child = gf_list_pop_back(st->x_children);
+				gf_xml_dom_node_del(child);
+			}
+			gf_list_del(st->x_children);
+		}
+#endif
+		gf_list_del(st->opids);
+		if (st->rep_id) gf_free(st->rep_id);
+		if (st->res_url) gf_free(st->res_url);
+		gf_free(st);
+	}
+	gf_list_del(ctx->streams);
+	if (ctx->segment_template) gf_free(ctx->segment_template);
+
+}
+
+
+static const char *ghi_dmx_probe_data(const u8 *data, u32 data_size, GF_FilterProbeScore *score)
+{
+	if (data_size < 10) return NULL;
+	if ((data0 == 'G') && (data1 == 'H') && (data2 == 'I') && (data3 == 'D')) {
+		*score = GF_FPROBE_SUPPORTED;
+		return "application/x-gpac-ghi";
+	}
+	return NULL;
+}
+
+#define OFFS(_n)	#_n, offsetof(GHIDmxCtx, _n)
+static const GF_FilterArgs GHIDmxArgs =
+{
+	{ OFFS(gm), "manifest generation mode\n"
+	"- none: no manifest generation (implied if sn is not 0)\n"
+	"- all: generate all manifests and init segments\n"
+	"- main: generate main manifest (MPD or master M3U8)\n"
+	"- child: generate child playlist for HLS\n"
+	"- init: generate init segment", GF_PROP_UINT, "main", "none|all|main|child|init", GF_FS_ARG_HINT_EXPERT},
+	{ OFFS(force), "force loading sources in manifest generation for debug", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_EXPERT},
+	{ OFFS(rep), "representation to generate", GF_PROP_STRING, NULL, NULL, GF_FS_ARG_HINT_EXPERT},
+	{ OFFS(sn), "segment number to generate, 0 means init segment", GF_PROP_UINT, NULL, NULL, GF_FS_ARG_HINT_EXPERT},
+	{ OFFS(mux), "representation to mux - cf filter help", GF_PROP_STRING_LIST, NULL, NULL, GF_FS_ARG_HINT_EXPERT},
+	{ OFFS(out), "output filename to generate", GF_PROP_STRING, NULL, NULL, GF_FS_ARG_HINT_EXPERT},
+	{0}
+};
+
+static const GF_FilterCapability GHIDmxCaps =
+{
+	CAP_UINT(GF_CAPS_INPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_FILE),
+	CAP_STRING(GF_CAPS_INPUT, GF_PROP_PID_FILE_EXT, "ghix"),
+	CAP_STRING(GF_CAPS_INPUT, GF_PROP_PID_MIME, "application/x-gpac-ghix|application/x-gpac-ghi"),
+	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_AUDIO),
+	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_VISUAL),
+	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_TEXT),
+	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_ENCRYPTED),
+	CAP_UINT(GF_CAPS_OUTPUT_EXCLUDED, GF_PROP_PID_CODECID, GF_CODECID_RAW),
+	{0},
+	//accept any stream but files, framed
+	{ .code=GF_PROP_PID_STREAM_TYPE, .val.type=GF_PROP_UINT, .val.value.uint=GF_STREAM_FILE, .flags=(GF_CAPFLAG_IN_BUNDLE|GF_CAPFLAG_INPUT|GF_CAPFLAG_EXCLUDED|GF_CAPFLAG_LOADED_FILTER) },
+	{ .code=GF_PROP_PID_UNFRAMED, .val.type=GF_PROP_BOOL, .val.value.boolean=GF_TRUE, .flags=(GF_CAPFLAG_IN_BUNDLE|GF_CAPFLAG_INPUT|GF_CAPFLAG_EXCLUDED|GF_CAPFLAG_LOADED_FILTER) },
+	CAP_UINT(GF_CAPS_OUTPUT_EXCLUDED, GF_PROP_PID_STREAM_TYPE, GF_STREAM_FILE),
+};
+
+GF_FilterRegister GHIDXDmxRegister = {
+	.name = "ghidmx",
+	GF_FS_SET_DESCRIPTION("GHI demultiplexer")
+	GF_FS_SET_HELP("This filter handles pre-indexed content for just-in-time processing of HAS manifest, init segment and segments\n"
+	"\n"
+	"Warning: This is work in progress, the format of indexes (binary or XML) may change until finalization of this filter.\n"
+	"\n"
+	"# Generating indexes\n"
+	"Indexes are constructed using the dasher filter and a given segment duration.\n"
+	"EX gpac -i SRC ... -i SRCn -o index.ghi:segdur=2\n"
+	"This constructs a binary index for the DASH session.\n"
+	"EX gpac -i SRC -o index.ghix:segdur=2\n"
+	"This constructs an XML index for the DASH session.\n"
+	"\n"
+	"Warning: XML indexes should only be used for debug purposes as they can take a significant amount of time to be parsed.\n"
+	"\n"
+	"When indexing, the default template used is `$Representation$_$Number$`. The template is stored in the index and shouldn't be re-specified when generating content.\n"
+	"\n"
+	"# Using indexes\n"
+	"The index can be used to generate manifest, child variants for HLS, init segments and segments.\n"
+	"EX gpac -i index.ghi:gm=all -o dash/vod.mpd\n"
+	"This generates manifest(s) and init segment(s).\n"
+	"\n"
+	"EX gpac -i index.ghi:rep=FOO:sn=10 -o dash/vod.mpd\n"
+	"This generates the 10th segment of representation with ID `FOO`.\n"
+	"\n"
+	"Note: The manifest file(s) and init segment(s) are not written when generating a segment. The manifest target (mpd or m3u8) is only used to setup the filter chain and target output path.\n"
+	"\n"
+	"EX gpac -i index.ghi:gm=main -o dash/vod.m3u8\n"
+	"This generates main manifest only (MPD or master HLS playlist).\n"
+	"\n"
+	"EX gpac -i index.ghi:gm=child:rep=FOO:out=BAR -o dash/vod.m3u8\n"
+	"This generates child manifest for representation `FOO` in file `BAR`.\n"
+	"\n"
+	"EX gpac -i index.ghi:gm=init:rep=FOO:out=BAR2 -o dash/vod.m3u8\n"
+	"This generates init segment for representation `FOO` in file `BAR2`.\n"
+	"\n"
+	"The filter outputs are PIDs using framed packets marked with segment boundaries and can be chained to other filters before entering the dasher (e.g. for encryption, transcode...).\n"
+	"\n"
+	"If representation IDs are not assigned during index creation, they default to the 1-based index of the source. You can check them using:\n"
+	"EX: `gpac -i src.ghi inspect:full`\n"
+	"\n"
+	"# Muxed Representations\n"
+	"The filter can be used to generate muxed representations, either at manifest generation time or when generating a segment.\n"
+	"EX gpac -i index.ghi:mux=A@V1@V2 -o dash/vod.mpd\n"
+	"This will generate a manifest muxing representations `A` with representations `V1` and `V2`.\n"
+	"\n"
+	"EX gpac -i index.ghi:mux=A@V1@V2,T@V1@V2 -o dash/vod.mpd\n"
+	"This will generate a manifest muxing representations `A` and `T` with representations `V1` and `V2`.\n"
+	"\n"
+	"EX gpac -i index.ghi:rep=V2:sn=5:mux=A@V2 -o dash/vod.mpd\n"
+	"This will generate the 5th segment containing representations `A` and `V2`.\n"
+	"\n"
+	"The filter does not store any state, it is the user responsibility to use consistent information across calls:\n"
+	"- do not change segment templates\n"
+	"- do not change muxed representations to configurations not advertised in the generated manifests\n"
+	"\n"
+	"# Recommendations\n"
+	"Indexing supports fragmented and non-fragmented MP4, MPEG-2 TS and seekable inputs.\n"
+	"- It is recommended to use fragmented MP4 as input format since this greatly reduces file loading times.\n"
+	"- If non-fragmented MP4 are used, it is recommended to use single-track files to decrease the movie box size and speedup parsing.\n"
+	"- MPEG-2 TS sources will be slower since they require PES reframing and AU reformating, resulting in more IOs than with mp4.\n"
+	"- other seekable sources will likely be slower (seeking, reframing) and are not recommended.\n"
+	"\n"
+	)
+	.private_size = sizeof(GHIDmxCtx),
+	.flags = GF_FS_REG_USE_SYNC_READ,
+	.initialize = ghi_dmx_initialize,
+	.finalize = ghi_dmx_finalize,
+	.args = GHIDmxArgs,
+	SETCAPS(GHIDmxCaps),
+	.configure_pid = ghi_dmx_configure_pid,
+	.process = ghi_dmx_process,
+	.process_event = ghi_dmx_process_event,
+	.probe_data = ghi_dmx_probe_data,
+	//we accept as many input pids as loaded by the session
+	.max_extra_pids = (u32) -1,
+};
+
+const GF_FilterRegister *ghidmx_register(GF_FilterSession *session)
+{
+	return &GHIDXDmxRegister;
+}
+#else
+const GF_FilterRegister *ghidmx_register(GF_FilterSession *session)
+{
+	return NULL;
+}
+#endif // GPAC_DISABLE_GHIDMX
+

gpac-2.2.1.tar.gz/src/filters/dmx_gsf.c -> gpac-2.4.0.tar.gz/src/filters/dmx_gsf.c Changed

gpac-2.2.1.tar.gz/src/filters/dmx_m2ts.c -> gpac-2.4.0.tar.gz/src/filters/dmx_m2ts.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2005-2022
+ *			Copyright (c) Telecom ParisTech 2005-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / M2TS demux filter
@@ -61,6 +61,7 @@
 	//opts
 	const char *temi_url;
 	Bool dsmcc, seeksrc, sigfrag, dvbtxt;
+	Double index;
 
 	GF_Filter *filter;
 	GF_FilterPid *ipid;
@@ -88,6 +89,7 @@
 	u32 wait_for_progs;
 
 	Bool is_dash;
+	u32 nb_stopped_at_init;
 } GF_M2TSDmxCtx;
 
 
@@ -650,6 +652,7 @@
 	}
 
 	if (pck->stream->flags & GF_M2TS_CHECK_VC1) {
+#ifndef GPAC_DISABLE_AV_PARSERS
 		//extract seq header
 		u32 start, next, sc_size, sc_size2, sc_size3, hdr_len=0;
 
@@ -677,6 +680,7 @@
 			len -= hdr_len;
 			pck->stream->flags &= ~GF_M2TS_CHECK_VC1;
 		}
+#endif
 	}
 
 
@@ -720,7 +724,19 @@
 		pck->stream->is_seg_start = GF_FALSE;
 		gf_filter_pck_set_property(dst_pck, GF_PROP_PCK_CUE_START, &PROP_BOOL(GF_TRUE));
 	}
+	if (ctx->sigfrag) {
+		u64 pat_offset;
 
+		if (pck->stream->flags & GF_M2TS_ES_IS_PES) {
+			pat_offset = pck->stream->before_last_pes_start_pn;
+			if (pat_offset>pck->stream->before_last_pat_pn)
+				pat_offset = pck->stream->before_last_pat_pn;
+		} else {
+			pat_offset = ctx->ts->last_pat_start_num;
+		}
+		pat_offset *= (ctx->ts->prefix_present ? 192 : 188);
+		gf_filter_pck_set_property(dst_pck, GF_PROP_PCK_FRAG_RANGE, &PROP_FRAC64_INT(pat_offset, 0));
+	}
 	gf_filter_pck_send(dst_pck);
 	ctx->nb_stop_pending = 0;
 }
@@ -786,6 +802,10 @@
 		pck->stream->is_seg_start = GF_FALSE;
 		gf_filter_pck_set_property(dst_pck, GF_PROP_PCK_CUE_START, &PROP_BOOL(GF_TRUE));
 	}
+	if (ctx->sigfrag) {
+		u64 pat_offset = ctx->ts->last_pat_start_num * (ctx->ts->prefix_present ? 192 : 188);
+		gf_filter_pck_set_property(dst_pck, GF_PROP_PCK_FRAG_RANGE, &PROP_FRAC64_INT(pat_offset, 0));
+	}
 	gf_filter_pck_send(dst_pck);
 
 	if (pck->version_number + 1 == pck->stream->slcfg->carousel_version)
@@ -842,7 +862,7 @@
 #if 0  //unused
 static void m2tsdmx_declare_epg_pid(GF_M2TSDmxCtx *ctx)
 {
-	assert(ctx->eit_pid == NULL);
+	gf_assert(ctx->eit_pid == NULL);
 	ctx->eit_pid = gf_filter_pid_new(ctx->filter);
 	gf_filter_pid_set_property(ctx->eit_pid, GF_PROP_PID_ID, &PROP_UINT(GF_M2TS_PID_EIT_ST_CIT) );
 	gf_filter_pid_set_property(ctx->eit_pid, GF_PROP_PID_STREAM_TYPE, &PROP_UINT(GF_STREAM_PRIVATE_SCENE) );
@@ -875,7 +895,7 @@
 	case GF_M2TS_EVT_PMT_FOUND:
 		m2tsdmx_setup_program(ctx, param);
 		if (ctx->mux_tune_state == DMX_TUNE_WAIT_PROGS) {
-			assert(ctx->wait_for_progs);
+			gf_assert(ctx->wait_for_progs);
 			ctx->wait_for_progs--;
 			if (!ctx->wait_for_progs) {
 				ctx->mux_tune_state = DMX_TUNE_WAIT_SEEK;
@@ -920,8 +940,10 @@
 		GF_M2TS_PES_PCK *pck = ((GF_M2TS_PES_PCK *) param);
 		Bool discontinuity = ( ((GF_M2TS_PES_PCK *) param)->flags & GF_M2TS_PES_PCK_DISCONTINUITY) ? 1 : 0;
 
-		assert(pck->stream);
-		m2tsdmx_estimate_duration(ctx, (GF_M2TS_ES *) pck->stream);
+		gf_fatal_assert(pck->stream);
+		if (!ctx->sigfrag && ctx->index) {
+			m2tsdmx_estimate_duration(ctx, (GF_M2TS_ES *) pck->stream);
+		}
 
 		if (ctx->map_time_on_prog_id && (ctx->map_time_on_prog_id==pck->stream->program->number)) {
 			map_time = GF_TRUE;
@@ -1102,8 +1124,8 @@
 
 static GF_Err m2tsdmx_configure_pid(GF_Filter *filter, GF_FilterPid *pid, Bool is_remove)
 {
-	const GF_PropertyValue *p;;
-	FILE *stream = NULL;
+	const GF_PropertyValue *p;
+	Bool can_probe=GF_FALSE;
 	GF_M2TSDmxCtx *ctx = gf_filter_get_udta(filter);
 
 	if (is_remove) {
@@ -1123,10 +1145,10 @@
 
 	p = gf_filter_pid_get_property(pid, GF_PROP_PID_FILEPATH);
 	if (p && p->value.string && !ctx->duration.num && strncmp(p->value.string, "gmem://", 7)) {
-		stream = gf_fopen(p->value.string, "rb");
+		can_probe = GF_TRUE;
 	}
 
-	if (stream) {
+	if (can_probe) {
 		if (ctx->seeksrc) {
 			//for local file we will send a seek and stop once all programs are configured, and reparse from start
 			p = gf_filter_pid_get_property(pid, GF_PROP_PID_URL);
@@ -1134,22 +1156,29 @@
 				ctx->mux_tune_state = DMX_TUNE_INIT;
 			}
 		}
-		
+
+		FILE *stream = NULL;
+		if (!ctx->sigfrag && ctx->index) {
+			stream = gf_fopen(p->value.string, "rb");
+		}
+
 		ctx->ipid = pid;
 		ctx->is_file = GF_TRUE;
-		ctx->ts->seek_mode = GF_TRUE;
-		ctx->ts->on_event = m2tsdmx_on_event_duration_probe;
-		while (!gf_feof(stream)) {
-			char buf1880;
-			u32 nb_read = (u32) gf_fread(buf, 1880, stream);
-			gf_m2ts_process_data(ctx->ts, buf, nb_read);
-			if (ctx->duration.num || (nb_read!=1880)) break;
+		if (stream) {
+			ctx->ts->seek_mode = GF_TRUE;
+			ctx->ts->on_event = m2tsdmx_on_event_duration_probe;
+			while (!gf_feof(stream)) {
+				char buf1880;
+				u32 nb_read = (u32) gf_fread(buf, 1880, stream);
+				gf_m2ts_process_data(ctx->ts, buf, nb_read);
+				if (ctx->duration.num || (nb_read!=1880)) break;
+			}
+			gf_fclose(stream);
+			gf_m2ts_demux_del(ctx->ts);
+			ctx->ts = gf_m2ts_demux_new();
+			ctx->ts->on_event = m2tsdmx_on_event;
+			ctx->ts->user = filter;
 		}
-		gf_m2ts_demux_del(ctx->ts);
-		gf_fclose(stream);
-		ctx->ts = gf_m2ts_demux_new();
-		ctx->ts->on_event = m2tsdmx_on_event;
-		ctx->ts->user = filter;
 	} else if (!p) {
 		GF_FilterEvent evt;
 		ctx->duration.num = 1;
@@ -1217,6 +1246,7 @@
 
 static Bool m2tsdmx_process_event(GF_Filter *filter, const GF_FilterEvent *com)
 {
+	Bool is_source_seek;
 	GF_M2TS_PES *pes;
 	u64 file_pos = 0;
 	GF_FilterEvent fevt;
@@ -1238,7 +1268,9 @@
 	if (!com->base.on_pid) return GF_FALSE;
 	switch (com->base.type) {
 	case GF_FEVT_PLAY:
-		if (com->play.initial_broadcast_play==2)
+		is_source_seek = (com->play.hint_start_offset || com->play.hint_end_offset) ? GF_TRUE : GF_FALSE;
+
+		if (!is_source_seek && com->play.initial_broadcast_play==2)
 			return GF_TRUE;
 		pes = m2tsdmx_get_stream(ctx, com->base.on_pid);
 		if (!pes) {
@@ -1247,7 +1279,7 @@
 			}
 			return GF_FALSE;
 		}
-		if (com->play.no_byterange_forward)
+		if (!is_source_seek && com->play.no_byterange_forward)
 			ctx->is_dash = GF_TRUE;
 		/*mark pcr as not initialized*/
 		if (pes->program->pcr_pid==pes->pid) pes->program->first_dts=0;
@@ -1277,10 +1309,12 @@
 		}
 
 		ctx->map_time_on_prog_id = pes->program->number;
-		ctx->media_start_range = com->play.start_range;
-
+		ctx->media_start_range = is_source_seek ? 0 : com->play.start_range;
 
-		if (ctx->is_file && ctx->duration.num) {
+		if (is_source_seek) {
+			file_pos = com->play.hint_start_offset;
+		}
+		else if (ctx->is_file && ctx->duration.num) {
 			file_pos = (u64) (ctx->file_size * com->play.start_range);
 			file_pos *= ctx->duration.den;
 			file_pos /= ctx->duration.num;
@@ -1297,9 +1331,13 @@
 		ctx->in_seek = GF_TRUE;
 		//we seek so consider the mux tuned in
 		ctx->mux_tune_state = DMX_TUNE_DONE;
+
 		//post a seek
 		GF_FEVT_INIT(fevt, GF_FEVT_SOURCE_SEEK, ctx->ipid);
 		fevt.seek.start_offset = file_pos;
+		//we don't set the end offset as the start of each seg is likely to be before the packet (at the PAT)
+		//so the end range will not include the last packets
+
 		gf_filter_pid_send_event(ctx->ipid, &fevt);
 		return GF_TRUE;
 
@@ -1313,8 +1351,10 @@
 		}
 		gf_m2ts_set_pes_framing(pes, GF_M2TS_PES_FRAMING_SKIP);
 
-		if (com->play.initial_broadcast_play==2)
+		if (com->play.initial_broadcast_play==2) {
+			ctx->nb_stopped_at_init++;
 			return GF_TRUE;
+		}
 
 		ctx->nb_stop_pending++;
 		if (ctx->nb_playing) ctx->nb_playing--;
@@ -1409,6 +1449,10 @@
 			if (ctx->nb_playing) {
 				gf_filter_ask_rt_reschedule(filter, 0);
 			}
+			if (ctx->nb_stopped_at_init==nb_streams) {
+				gf_filter_pid_set_discard(ctx->ipid, GF_TRUE);
+				return GF_EOS;
+			}
 			return GF_OK;
 		}
 
@@ -1466,6 +1510,7 @@
 	{ OFFS(seeksrc), "seek local source file back to origin once all programs are setup", GF_PROP_BOOL, "true", NULL, GF_FS_ARG_HINT_EXPERT},
 	{ OFFS(sigfrag), "signal segment boundaries on output packets for DASH or HLS sources", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_ADVANCED},
 	{ OFFS(dvbtxt), "export DVB teletext streams", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_EXPERT},
+	{ OFFS(index), "indexing window length", GF_PROP_DOUBLE, "1.0", NULL, GF_FS_ARG_HINT_HIDE},
 	{0}
 };
 
@@ -1478,7 +1523,12 @@
 	.initialize = m2tsdmx_initialize,
 	.finalize = m2tsdmx_finalize,
 	.args = M2TSDmxArgs,
+	//for emscripten ask a config on main thread since we may probe (fopen in read mode) input for duration
+#ifdef GPAC_CONFIG_EMSCRIPTEN
+	.flags = GF_FS_REG_DYNAMIC_PIDS | GF_FS_REG_CONFIGURE_MAIN_THREAD,
+#else
 	.flags = GF_FS_REG_DYNAMIC_PIDS,
+#endif
 	SETCAPS(M2TSDmxCaps),
 	.configure_pid = m2tsdmx_configure_pid,
 	.process = m2tsdmx_process,

gpac-2.2.1.tar.gz/src/filters/dmx_mpegps.c -> gpac-2.4.0.tar.gz/src/filters/dmx_mpegps.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2005-2022
+ *			Copyright (c) Telecom ParisTech 2005-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / MPEG Program Stream demuxer filter
@@ -377,7 +377,7 @@
 			}
 
 			//bug in some streams, make sure we don't dispatch twice the same ts
-			if (st->last_dts == dts) dts++;;
+			if (st->last_dts == dts) dts++;
 			st->last_dts = dts;
 
 			if ((buf_len>4) && (bufbuf_len - 4 == 0) && (bufbuf_len - 3 == 0) && (bufbuf_len - 2 == 1)) buf_len -= 4;
@@ -453,15 +453,21 @@
 
 static const char *m2psdmx_probe_data(const u8 *data, u32 size, GF_FilterProbeScore *score)
 {
-	*score = GF_FPROBE_EXT_MATCH;
-	return "mpg|mpeg|vob";
+	//check we have a pack header
+	if ((size>4) && (data0==0x00) && (data1==0x00) && (data2==0x01) && (data3==0xBA)) {
+		*score = GF_FPROBE_MAYBE_SUPPORTED;
+		return "video/mpegps";
+	}
+	return NULL;
 }
 
 static const GF_FilterCapability M2PSDmxCaps =
 {
 	CAP_UINT(GF_CAPS_INPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_FILE),
 	CAP_STRING(GF_CAPS_INPUT, GF_PROP_PID_FILE_EXT, "mpg|mpeg|vob"),
-	CAP_STRING(GF_CAPS_INPUT, GF_PROP_PID_MIME, "video/mpeg|audio/mpeg"),
+	CAP_STRING(GF_CAPS_INPUT, GF_PROP_PID_MIME, "video/mpeg|audio/mpeg|video/mpegps"),
+	//we need a file for this demuxer
+	CAP_STRING(GF_CAPS_INPUT, GF_PROP_PID_FILEPATH, "*"),
 	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_AUDIO),
 	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_VISUAL),
 	CAP_UINT(GF_CAPS_OUTPUT_EXCLUDED, GF_PROP_PID_CODECID, GF_CODECID_RAW),

gpac-2.2.1.tar.gz/src/filters/dmx_nhml.c -> gpac-2.4.0.tar.gz/src/filters/dmx_nhml.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2005-2022
+ *			Copyright (c) Telecom ParisTech 2005-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / NHML demuxer filter
@@ -33,6 +33,8 @@
 #include <gpac/isomedia.h>
 #include <gpac/base_coding.h>
 
+#ifndef GPAC_DISABLE_NHMLR
+
 #ifndef GPAC_DISABLE_AV_PARSERS
 #include <gpac/avparse.h>
 #endif
@@ -87,6 +89,8 @@
 
 	GF_BitStream *bs_w;
 	GF_BitStream *bs_r;
+
+	GF_FileIO *fio;
 } GF_NHMLDmxCtx;
 
 
@@ -143,7 +147,7 @@
 		//post a seek
 		ctx->in_seek = GF_TRUE;
 
-		//lcoate previous RAP sample
+		//locate previous RAP sample
 		while ((node = (GF_XMLNode *) gf_list_enum(ctx->root->content, &i))) {
 			u32 j=0;
 			u64 dts=0;
@@ -213,13 +217,29 @@
 	return GF_FALSE;
 }
 
+static GF_XMLNode *nhmldmx_get_prop_ref(GF_NHMLDmxCtx *ctx, GF_XMLNode *par, char *ID)
+{
+	u32 i=0;
+	GF_XMLNode *node;
+	while ((node = (GF_XMLNode *) gf_list_enum(par->content, &i))) {
+		if (node->type) continue;
+		if (stricmp(node->name, "P")) continue;
+		GF_XMLAttribute *att;
+		u32 j=0;
+		while ( (att = (GF_XMLAttribute *)gf_list_enum(node->attributes, &j))) {
+			if (!strcmp(att->name, "id") && !strcmp(att->value, ID)) return node;
+		}
+	}
+	return NULL;
+}
+
 static GF_XMLNode *nhmldmx_get_props(GF_NHMLDmxCtx *ctx, char *ID)
 {
 	u32 i=0;
 	GF_XMLNode *node;
 	while ((node = (GF_XMLNode *) gf_list_enum(ctx->root->content, &i))) {
 		GF_XMLAttribute *att;
-		GF_XMLNode *childnode;
+		GF_XMLNode *childnode, *res;
 		u32 j;
 		if (node->type) continue;
 		if (!stricmp(node->name, "Properties")) {
@@ -227,6 +247,8 @@
 			while ( (att = (GF_XMLAttribute *)gf_list_enum(node->attributes, &j))) {
 				if (!strcmp(att->name, "id") && !strcmp(att->value, ID)) return node;
 			}
+			res = nhmldmx_get_prop_ref(ctx, node, ID);
+			if (res) return res;
 			continue;
 		}
 		if (stricmp(node->name, "NHNTSample")) continue;
@@ -238,6 +260,8 @@
 			while ( (att = (GF_XMLAttribute *)gf_list_enum(childnode->attributes, &k))) {
 				if (!strcmp(att->name, "id") && !strcmp(att->value, ID)) return childnode;
 			}
+			res = nhmldmx_get_prop_ref(ctx, childnode, ID);
+			if (res) return res;
 		}
 	}
 	return NULL;
@@ -250,7 +274,7 @@
 
 	i=0;
 	while ( (att = (GF_XMLAttribute *)gf_list_enum(props->attributes, &i))) {
-		if (strcmp(att->name, "ref")) continue;;
+		if (strcmp(att->name, "ref")) continue;
 		GF_XMLNode *ref_props = nhmldmx_get_props(ctx, att->value);
 		if (ref_props) {
 			props = ref_props;
@@ -263,7 +287,9 @@
 		u32 j;
 		GF_XMLNode *bs_child;
 		Bool has_bs = GF_FALSE;
+		Bool is_ref = GF_FALSE;
 		if (childnode->type) continue;
+restart:
 		if (stricmp(childnode->name, "P")) continue;
 
 		char *ptype=NULL;
@@ -274,6 +300,16 @@
 			if (!strcmp(att->name, "type")) ptype = att->value;
 			else if (!strcmp(att->name, "name")) pname = att->value;
 			else if (!strcmp(att->name, "value")) pval = att->value;
+			else if (!strcmp(att->name, "ref")) {
+				if (!is_ref) {
+					GF_XMLNode *ref_props = nhmldmx_get_props(ctx, att->value);
+					if (ref_props) {
+						is_ref = GF_TRUE;
+						childnode = ref_props;
+						goto restart;
+					}
+				}
+			}
 			else if (!pname) {
 				pname = att->name;
 				pval = att->value;
@@ -456,7 +492,7 @@
 		goto exit;
 	}
 
-	assert(breaker.to_pos > breaker.from_pos);
+	gf_assert(breaker.to_pos > breaker.from_pos);
 
 
 	ctx->samp_buffer_size = (u32) (breaker.to_pos - breaker.from_pos);
@@ -838,6 +874,13 @@
 	if (!ctx->opid)
 		ctx->opid = gf_filter_pid_new(filter);
 
+	if (!codecid) {
+		codecid = gf_codec_id_from_isobmf(codec_tag);
+		if (!streamType && codecid) {
+			streamType = gf_codecid_type(codecid);
+		}
+	}
+
 	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_STREAM_TYPE, &PROP_UINT(streamType) );
 	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_CODECID, &PROP_UINT(codecid) );
 	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_TIMESCALE, &PROP_UINT(ctx->timescale) );
@@ -984,7 +1027,6 @@
 	GF_Err e;
 	u32 i;
 	GF_XMLAttribute *att;
-	FILE *nhml;
 	const GF_PropertyValue *p;
 	char *ext;
 	GF_XMLNode *node;
@@ -997,12 +1039,18 @@
 
 	p = gf_filter_pid_get_property(ctx->ipid, GF_PROP_PID_FILEPATH);
 	if (!p) {
-		gf_filter_pid_drop_packet(ctx->ipid);
-		return GF_NOT_SUPPORTED;
+		const u8 *data;
+		u32 size;
+		GF_FilterPacket *pck = gf_filter_pid_get_packet(ctx->ipid);
+		data = gf_filter_pck_get_data(pck, &size);
+		p = gf_filter_pid_get_property(ctx->ipid, GF_PROP_PID_URL);
+		if (ctx->fio) gf_fclose((FILE*) ctx->fio);
+		ctx->fio = gf_fileio_from_mem(p ? p->value.string : NULL, data, size);
+		ctx->src_url = gf_fileio_url(ctx->fio);
+	} else {
+		ctx->src_url = p->value.string;
 	}
-	ctx->src_url = p->value.string;
-	nhml = gf_fopen(ctx->src_url, "rt");
-	if (!nhml) {
+	if (! gf_file_exists(ctx->src_url)) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("NHMLDmx Cannot find %s file %s\n", szImpName, ctx->src_url));
 		return GF_URL_ERROR;
 	}
@@ -1022,13 +1070,11 @@
 	gf_dynstrcat(&ctx->media_file, ".media", NULL);
 
 	ctx->parser = gf_xml_dom_new();
-	e = gf_xml_dom_parse(ctx->parser, p->value.string, NULL, NULL);
+	e = gf_xml_dom_parse(ctx->parser, ctx->src_url, NULL, NULL);
 	if (e) {
-		gf_fclose(nhml);
 		GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("NHMLDmx Error parsing %s file: Line %d - %s\n", szImpName, gf_xml_dom_get_line(ctx->parser), gf_xml_dom_get_error(ctx->parser) ));
 		return GF_NON_COMPLIANT_BITSTREAM;
 	}
-	gf_fclose(nhml);
 
 	ctx->root = gf_xml_dom_get_root(ctx->parser);
 	if (!ctx->root) {
@@ -1041,7 +1087,8 @@
 		return GF_NON_COMPLIANT_BITSTREAM;
 	}
 
-	nhmldmx_config_output(filter, ctx, ctx->root);
+	e = nhmldmx_config_output(filter, ctx, ctx->root);
+	if (e) return e;
 
 	ctx->media_done = 0;
 	ctx->current_child_idx = 0;
@@ -1370,7 +1417,7 @@
 					base_media_file = att->value;
 					char *url = gf_url_concatenate(ctx->src_url, att->value);
 					if (!url) {
-						GF_LOG(GF_LOG_WARNING, GF_LOG_PARSER, ("NHMLDmx Failed to get full url for %s\n", att->value));
+						GF_LOG(GF_LOG_WARNING, GF_LOG_PARSER, ("NHMLDmx Failed to get full url for %s (media import only supported for local URLs)\n", att->value));
 					} else {
 						strncpy(szMediaTemp, url, GF_MAX_PATH-1);
 						szMediaTempGF_MAX_PATH-1 = 0;
@@ -1488,12 +1535,16 @@
 			} else {
 				if (!offset) offset = ctx->media_done;
 				byte_offset = offset;
+				if (!f && ctx->samp_buffer_size) {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("NHMLDmx Media file %s not found\n", ctx->media_file));
+					return GF_NON_COMPLIANT_BITSTREAM;
+				}
 			}
 
 			//use full file only if no subbs
 			if (!ctx->samp_buffer_size && !has_subbs && f) {
 				u64 ssize = gf_fsize(f);
-				assert(ssize < 0x80000000);
+				gf_fatal_assert(ssize < 0x80000000);
 				ctx->samp_buffer_size = (u32) ssize;
 			}
 
@@ -1552,7 +1603,7 @@
 
 			if (ctx->samp_buffer_size > ctx->samp_buffer_alloc) {
 				ctx->samp_buffer_alloc = ctx->samp_buffer_size;
-				ctx->samp_buffer = gf_realloc(ctx->samp_buffer, ctx->samp_buffer_size);;
+				ctx->samp_buffer = gf_realloc(ctx->samp_buffer, ctx->samp_buffer_size);
 			}
 			memcpy(ctx->samp_buffer, output, ctx->samp_buffer_size);
 			gf_free(output);
@@ -1650,7 +1701,7 @@
 	if (pck) {
 		gf_filter_pck_get_framing(pck, &start, &end);
 		//for now we only work with complete files
-		assert(end);
+		gf_assert(end);
 	}
 
 
@@ -1670,9 +1721,16 @@
 		e = nhmldmx_send_sample(filter, ctx);
 		if (e) return e;
 		break;
+	//EOS
 	case 2:
 	default:
-		if (pck) gf_filter_pid_drop_packet(ctx->ipid);
+		if (pck) {
+			gf_filter_pid_drop_packet(ctx->ipid);
+			if (ctx->fio) {
+				gf_fclose((FILE*) ctx->fio);
+				ctx->fio = NULL;
+			}
+		}
 		if (ctx->opid) {
 			gf_filter_pid_set_eos(ctx->opid);
 			return GF_EOS;
@@ -1695,6 +1753,8 @@
 	if (ctx->parser)
 		gf_xml_dom_del(ctx->parser);
 
+	if (ctx->fio) gf_fclose((FILE*) ctx->fio);
+
 #ifndef GPAC_DISABLE_ZLIB
 	if (ctx->dictionary) gf_free(ctx->dictionary);
 #endif
@@ -1730,6 +1790,7 @@
 	GF_FS_SET_HELP("This filter reads NHML files/data to produce a media PID and frames.\n"
 	"NHML documentation is available at https://wiki.gpac.io/NHML-Format\n")
 	.private_size = sizeof(GF_NHMLDmxCtx),
+	.flags = GF_FS_REG_USE_SYNC_READ,
 	.args = GF_NHMLDmxArgs,
 	.initialize = nhmldmx_initialize,
 	.finalize = nhmldmx_finalize,
@@ -1739,8 +1800,13 @@
 	.process_event = nhmldmx_process_event
 };
 
-const GF_FilterRegister *nhmldmx_register(GF_FilterSession *session)
+const GF_FilterRegister *nhmlr_register(GF_FilterSession *session)
 {
 	return &NHMLDmxRegister;
 }
-
+#else
+const GF_FilterRegister *nhmlr_register(GF_FilterSession *session)
+{
+	return NULL;
+}
+#endif // GPAC_DISABLE_NHMLR

gpac-2.2.1.tar.gz/src/filters/dmx_nhnt.c -> gpac-2.4.0.tar.gz/src/filters/dmx_nhnt.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2005-2022
+ *			Copyright (c) Telecom ParisTech 2005-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / NHNT demuxer filter
@@ -29,6 +29,8 @@
 #include <gpac/list.h>
 #include <gpac/bitstream.h>
 
+#ifndef GPAC_DISABLE_NHNTR
+
 #ifndef GPAC_DISABLE_AV_PARSERS
 #include <gpac/avparse.h>
 #endif
@@ -280,7 +282,7 @@
 	data = (u8 *)gf_filter_pck_get_data(pck, &pkt_size);
 	gf_filter_pck_get_framing(pck, &start, &end);
 	//for now we only work with complete files
-	assert(end);
+	gf_assert(end);
 
 	if (!ctx->bs) {
 		ctx->bs = gf_bs_new(data, pkt_size, GF_BITSTREAM_READ);
@@ -292,6 +294,7 @@
 	p = gf_filter_pid_get_property(ctx->ipid, GF_PROP_PID_FILEPATH);
 	if (!p) {
 		gf_filter_pid_drop_packet(ctx->ipid);
+		GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("NHNTDmx NHNT only supported with local files\n"));
 		return GF_NOT_SUPPORTED;
 	}
 
@@ -508,6 +511,7 @@
 	GF_FS_SET_HELP("This filter reads NHNT files/data to produce a media PID and frames.\n"
 	"NHNT documentation is available at https://wiki.gpac.io/NHNT-Format\n")
 	.private_size = sizeof(GF_NHNTDmxCtx),
+	.flags = GF_FS_REG_USE_SYNC_READ,
 	.args = GF_NHNTDmxArgs,
 	.initialize = nhntdmx_initialize,
 	.finalize = nhntdmx_finalize,
@@ -517,8 +521,14 @@
 	.process_event = nhntdmx_process_event
 };
 
-const GF_FilterRegister *nhntdmx_register(GF_FilterSession *session)
+const GF_FilterRegister *nhntr_register(GF_FilterSession *session)
 {
 	return &NHNTDmxRegister;
 }
+#else
+const GF_FilterRegister *nhntr_register(GF_FilterSession *session)
+{
+	return NULL;
+}
+#endif // GPAC_DISABLE_NHNTR

gpac-2.2.1.tar.gz/src/filters/dmx_ogg.c -> gpac-2.4.0.tar.gz/src/filters/dmx_ogg.c Changed

@@ -266,7 +266,7 @@
 	}
 }
 
-static void oggdmx_new_stream(GF_Filter *filter, GF_OGGDmxCtx *ctx, ogg_page *oggpage)
+static GF_Err oggdmx_new_stream(GF_Filter *filter, GF_OGGDmxCtx *ctx, ogg_page *oggpage)
 {
 	ogg_packet oggpacket;
 	u32 serial_no, i;
@@ -282,7 +282,7 @@
 			ogg_stream_init(&st->os, st->serial_no);
 			ogg_stream_pagein(&st->os, oggpage);
 			st->parse_headers = st->info.num_init_headers;
-			return;
+			return GF_OK;
 		}
 	}
 
@@ -297,20 +297,22 @@
 	}
 	if (!st) {
 		GF_SAFEALLOC(st, GF_OGGStream);
-		if (!st) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("OGG Failed to allocate stream for demux\n"));
-			return;
-		}
+		if (!st) return GF_OUT_OF_MEM;
+		gf_list_add(ctx->streams, st);
+	} else {
+		ogg_stream_clear(&st->os);
 	}
 	st->eos_detected = GF_FALSE;
 	st->serial_no = serial_no;
 	ogg_stream_init(&st->os, st->serial_no);
 	ogg_stream_pagein(&st->os, oggpage);
 
-	ogg_stream_packetpeek(&st->os, &oggpacket);
+	if (ogg_stream_packetpeek(&st->os, &oggpacket)<=0) {
+		GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("OGG Invalid OGG page\n"));
+		return GF_NON_COMPLIANT_BITSTREAM;
+	}
 	oggdmx_get_stream_info(&oggpacket, &st->info);
 
-	gf_list_add(ctx->streams, st);
 	st->parse_headers = st->info.num_init_headers;
 	switch (st->info.type) {
 	case GF_CODECID_VORBIS:
@@ -343,6 +345,7 @@
 			ctx->duration.den = ctx->global_rate;
 		}
 	}
+	return GF_OK;
 }
 
 GF_Err oggdmx_configure_pid(GF_Filter *filter, GF_FilterPid *pid, Bool is_remove)
@@ -426,15 +429,16 @@
 		if (ogg_page_bos(&oggpage)) {
 			ogg_stream_init(&os, ogg_page_serialno(&oggpage));
 			if (ogg_stream_pagein(&os, &oggpage) >= 0 ) {
-				ogg_stream_packetpeek(&os, &oggpacket);
-				if (ogg_stream_pagein(&os, &oggpage) >= 0 ) {
-					ogg_stream_packetpeek(&os, &oggpacket);
-					oggdmx_get_stream_info(&oggpacket, &info);
-				}
-				if (!has_stream) {
-					has_stream = GF_TRUE;
-					ogg_stream_init(&the_os, ogg_page_serialno(&oggpage));
-					the_info = info;
+				if (ogg_stream_packetpeek(&os, &oggpacket)>0) {
+					if (ogg_stream_pagein(&os, &oggpage) >= 0 ) {
+						ogg_stream_packetpeek(&os, &oggpacket);
+						oggdmx_get_stream_info(&oggpacket, &info);
+					}
+					if (!has_stream) {
+						has_stream = GF_TRUE;
+						ogg_stream_init(&the_os, ogg_page_serialno(&oggpage));
+						the_info = info;
+					}
 				}
 			}
 			ogg_stream_clear(&os);
@@ -761,7 +765,8 @@
 		}
 
 		if (ogg_page_bos(&oggpage)) {
-			oggdmx_new_stream(filter, ctx, &oggpage);
+			GF_Err e = oggdmx_new_stream(filter, ctx, &oggpage);
+			if (e) return e;
 			continue;
 		}

gpac-2.2.1.tar.gz/src/filters/dmx_saf.c -> gpac-2.4.0.tar.gz/src/filters/dmx_saf.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2005-2022
+ *			Copyright (c) Telecom ParisTech 2005-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / SAF demuxer filter
@@ -29,6 +29,8 @@
 #include <gpac/list.h>
 #include <gpac/bitstream.h>
 
+#ifndef GPAC_DISABLE_SAF
+
 typedef struct
 {
 	GF_FilterPid *opid;
@@ -111,7 +113,7 @@
 		avail-=8;
 
 		if (au_size > avail) break;
-		assert(au_size>=2);
+		gf_assert(au_size>=2);
 
 		type = gf_bs_read_int(bs, 4);
 		stream_id = gf_bs_read_int(bs, 12);
@@ -454,6 +456,7 @@
 	GF_FS_SET_DESCRIPTION("SAF demultiplexer")
 	GF_FS_SET_HELP("This filter demultiplexes SAF (MPEG-4 Simple Aggregation Format for LASeR) files/data into a set of media PIDs and frames.")
 	.private_size = sizeof(GF_SAFDmxCtx),
+	.flags = GF_FS_REG_USE_SYNC_READ,
 	.initialize = safdmx_initialize,
 	.finalize = safdmx_finalize,
 	SETCAPS(SAFDmxCaps),
@@ -467,4 +470,10 @@
 {
 	return &SAFDmxRegister;
 }
+#else
+const GF_FilterRegister *safdmx_register(GF_FilterSession *session)
+{
+	return NULL;
+}
+#endif

gpac-2.2.1.tar.gz/src/filters/dmx_vobsub.c -> gpac-2.4.0.tar.gz/src/filters/dmx_vobsub.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2005-2022
+ *			Copyright (c) Telecom ParisTech 2005-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / NHNT demuxer filter
@@ -190,6 +190,7 @@
 	p = gf_filter_pid_get_property(ctx->idx_pid, GF_PROP_PID_FILEPATH);
 	if (!p) {
 		gf_filter_setup_failure(filter, GF_URL_ERROR);
+		GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("VobSub Demux only supported with local files\n"));
 		return GF_EOS;
 	}
 
@@ -368,7 +369,7 @@
 		if (!pck) return GF_OK;
 		gf_filter_pck_get_framing(pck, &start, &end);
 		//for now we only work with complete files
-		assert(end);
+		gf_assert(end);
 
 		e = vobsubdmx_parse_idx(filter, ctx);
 		ctx->idx_parsed = GF_TRUE;
@@ -402,7 +403,7 @@
 	/*data =*/ gf_filter_pck_get_data(pck, &pkt_size);
 	gf_filter_pck_get_framing(pck, &start, &end);
 	//for now we only work with complete files
-	assert(end);
+	gf_assert(end);
 
 	nb_eos = 0;
 	count = gf_filter_get_opid_count(filter);
@@ -462,6 +463,7 @@
 	GF_FS_SET_DESCRIPTION("VobSub parser")
 	GF_FS_SET_HELP("This filter parses VobSub files/data to produce media PIDs and frames.")
 	.private_size = sizeof(GF_VOBSubDmxCtx),
+	.flags = GF_FS_REG_USE_SYNC_READ,
 	.max_extra_pids = 1,
 	.args = GF_VOBSubDmxArgs,
 	.finalize = vobsubdmx_finalize,

gpac-2.2.1.tar.gz/src/filters/enc_jpg.c -> gpac-2.4.0.tar.gz/src/filters/enc_jpg.c Changed

gpac-2.2.1.tar.gz/src/filters/enc_png.c -> gpac-2.4.0.tar.gz/src/filters/enc_png.c Changed

gpac-2.4.0.tar.gz/src/filters/enc_webcodec.c Added

@@ -0,0 +1,741 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2023
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / WebCodec encoder filter
+ *
+ *  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/media_dev.h>
+#include <gpac/constants.h>
+
+#if defined(GPAC_CONFIG_EMSCRIPTEN)
+
+typedef struct
+{
+	char *c;
+	GF_Fraction fintra;
+	Bool all_intra;
+	u32 b;
+	u32 queued;
+
+	GF_Filter *filter;
+	u32 codecid, dsi_crc, timescale;
+	u32 width, height, pfmt, stride, stride_uv, nb_planes, uv_height;
+	Bool codec_init;
+	u32 pf, out_size, in_flush;
+
+	u32 afmt, sample_rate, num_channels, bytes_per_sample;
+
+	GF_FilterPid *ipid, *opid;
+	GF_List *src_pcks;
+	GF_Err error, enc_error;
+
+	Bool fintra_setup;
+	u64 orig_ts;
+	u32 nb_forced, nb_frames_in;
+	char *pname;
+} GF_WCEncCtx;
+
+GF_EXPORT
+void wcenc_on_error(GF_WCEncCtx *ctx, int state, char *msg)
+{
+	//decode error
+	if (state > 1)
+		ctx->enc_error = GF_BAD_PARAM;
+	else if (state==1)
+		ctx->error = GF_PROFILE_NOT_SUPPORTED;
+	else {
+		ctx->error = GF_OK;
+		ctx->codec_init = GF_TRUE;
+	}
+}
+
+EM_JS(int, wcenc_init, (int wc_ctx, int _codec_str, int bitrate, int width, int height, double FPS, int realtime, int sample_rate, int num_channels), {
+	let codec_str = _codec_str ? libgpac.UTF8ToString(_codec_str) : null;
+	let config = {};
+	config.codec = codec_str;
+	let enc_class = null;
+	if (width) {
+		config.width = width;
+		config.height = height;
+		config.framerate = FPS;
+		config.latency = realtime ?  "realtime" : "quality";
+		enc_class = VideoEncoder;
+		if (codec_str.startsWith("avc")) {
+			config.avc = { format: "annexb" };
+		}
+		else if (codec_str.startsWith("hvc1") || codec_str.startsWith("hev1")) {
+			config.hevc = { format: "annexb" };
+		}
+	} else {
+		config.sampleRate = sample_rate;
+		config.numberOfChannels = num_channels;
+		enc_class = AudioEncoder;
+	}
+	config.bitrate = bitrate;
+
+	if (typeof libgpac._to_webenc != 'function') {
+		libgpac._web_encs = ;
+		libgpac._to_webenc = (ctx) => {
+          for (let i=0; i<libgpac._web_encs.length; i++) {
+            if (libgpac._web_encsi._wc_ctx==ctx) return libgpac._web_encsi;
+          }
+          return null;
+		};
+		libgpac._on_wcenc_error = libgpac.cwrap('wcenc_on_error', null, 'number', 'number', 'string');
+		libgpac._on_wcenc_config = libgpac.cwrap('wcenc_on_config', null, 'number', 'number');
+		libgpac._on_wcenc_frame = libgpac.cwrap('wcenc_on_frame', null, 'number', 'bigint', 'number', 'number', 'number');
+		libgpac._on_wcenc_flush = libgpac.cwrap('wcenc_on_flush', null, 'number');
+	}
+	enc_class.isConfigSupported(config).then( supported => {
+		if (supported.supported) {
+			let c = libgpac._to_webenc(wc_ctx);
+			if (!c) {
+				c = {_wc_ctx: wc_ctx, enc: null, _frame: null};
+				libgpac._web_encs.push(c);
+			}
+			if (!c.enc) {
+				let init_info = {
+					error: (e) => {
+						console.log(e.message);
+					}
+				};
+				init_info.output = (chunk, metadata) => {
+					let dsize = metadata.decoderConfig || null;
+					if (dsize) dsize = dsize.description || null;
+					if (dsize) dsize = dsize.byteLength || 0;
+					if (dsize) {
+						c.decoderConfig = metadata.decoderConfig.description;
+						libgpac._on_wcenc_config(c._wc_ctx, c.decoderConfig.byteLength);
+						c.decoderConfig = null;
+					}
+					c.chunk = chunk;
+					let sap = 1;
+					if (typeof chunk.type != 'undefined') sap = (chunk.type=="key") ? 1 : 0;
+					libgpac._on_wcenc_frame(c._wc_ctx, BigInt(chunk.timestamp), chunk.duration, chunk.byteLength, sap);
+					c.chunk = null;
+				};
+				c.enc = new enc_class(init_info);
+			}
+			c.enc.configure(config);
+			libgpac._on_wcenc_error(wc_ctx, 0, null);
+		} else {
+			libgpac._on_wcenc_error(wc_ctx, 1, "Not Supported");
+		}
+	}).catch( (e) => {
+		libgpac._on_wcenc_error(wc_ctx, 1, ""+e);
+	});
+})
+
+static GF_Err wcenc_configure_pid(GF_Filter *filter, GF_FilterPid *pid, Bool is_remove)
+{
+	const GF_PropertyValue *p;
+	u32 streamtype;
+	char *codec_par=NULL;
+    GF_WCEncCtx *ctx = gf_filter_get_udta(filter);
+
+	if (is_remove) {
+		if (ctx->opid) {
+			gf_filter_pid_remove(ctx->opid);
+			ctx->opid = NULL;
+		}
+		return GF_OK;
+	}
+	if (! gf_filter_pid_check_caps(pid)) {
+		return GF_NOT_SUPPORTED;
+	}
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_CODECID);
+	if (!p || (p->value.uint!=GF_CODECID_RAW)) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("WebEnc Missing codecid, cannot initialize\n"));
+		return GF_NOT_SUPPORTED;
+	}
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_STREAM_TYPE);
+	if (!p) return GF_NOT_SUPPORTED;
+	streamtype = p->value.uint;
+
+	ctx->in_flush = 0;
+	ctx->ipid = pid;
+
+	ctx->codecid = gf_codecid_parse(ctx->c);
+	if (!ctx->codecid) {
+		char *sep = strchr(ctx->c, '.');
+		if (sep) {
+			sep0 = 0;
+			ctx->codecid = gf_codecid_parse(ctx->c);
+			codec_par = sep;
+			sep0 = '.';
+		}
+	}
+	if (!ctx->codecid) {
+		return GF_NOT_SUPPORTED;
+	}
+
+	if (!ctx->opid) {
+		ctx->opid = gf_filter_pid_new(filter);
+		gf_filter_pid_set_framing_mode(pid, GF_TRUE);
+	}
+
+	//copy properties at init or reconfig
+	gf_filter_pid_copy_properties(ctx->opid, pid);
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_CODECID, &PROP_UINT(ctx->codecid) );
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_DECODER_CONFIG, NULL );
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_ISOM_STSD_TEMPLATE, NULL);
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_ISOM_SUBTYPE, NULL);
+
+	switch (ctx->codecid) {
+	//codecs for whoch we will need a reframer (DSI rebuild, DTS recompute and metadata extraction)
+	case GF_CODECID_AVC:
+	case GF_CODECID_HEVC:
+	case GF_CODECID_VVC:
+	case GF_CODECID_AV1:
+	case GF_CODECID_VP8:
+	case GF_CODECID_VP9:
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_UNFRAMED, &PROP_BOOL(GF_TRUE) );
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_UNFRAMED_FULL_AU, &PROP_BOOL(GF_TRUE) );
+		break;
+	}
+
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_TIMESCALE);
+	ctx->timescale = p ? p->value.uint : 1000;
+	Double fps=0;
+	if (streamtype==GF_STREAM_VISUAL) {
+		p = gf_filter_pid_get_property(pid, GF_PROP_PID_WIDTH);
+		if (!p) return GF_BAD_PARAM;
+		if (ctx->width != p->value.uint) {
+			ctx->width = p->value.uint;
+			ctx->codec_init = GF_FALSE;
+		}
+		p = gf_filter_pid_get_property(pid, GF_PROP_PID_HEIGHT);
+		if (!p) return GF_BAD_PARAM;
+		if (ctx->height != p->value.uint) {
+			ctx->height = p->value.uint;
+			ctx->codec_init = GF_FALSE;
+		}
+
+		ctx->stride = ctx->stride_uv = 0;
+		p = gf_filter_pid_get_property(pid, GF_PROP_PID_STRIDE);
+		if (p) ctx->stride = p->value.uint;
+		p = gf_filter_pid_get_property(pid, GF_PROP_PID_STRIDE_UV);
+		if (p) ctx->stride_uv = p->value.uint;
+
+		ctx->nb_planes = 0;
+		ctx->uv_height = 0;
+
+		p = gf_filter_pid_get_property(pid, GF_PROP_PID_PIXFMT);
+		if (p) {
+			u32 ifmt = p->value.uint;
+			ctx->pfmt = ifmt;
+			ctx->pname = NULL;
+			switch (ifmt) {
+			case GF_PIXEL_YUV: ctx->pname = "I420"; break;
+			case GF_PIXEL_YUVA: ctx->pname = "I420A"; break;
+			case GF_PIXEL_YUV422: ctx->pname = "I422"; break;
+			case GF_PIXEL_YUV444: ctx->pname = "I444"; break;
+			case GF_PIXEL_NV12: ctx->pname = "NV12"; break;
+			case GF_PIXEL_RGBA: ctx->pname = "RGBA"; break;
+			case GF_PIXEL_RGBX: ctx->pname = "RGBX"; break;
+			case GF_PIXEL_BGRA: ctx->pname = "BGRA"; break;
+			case GF_PIXEL_BGRX: ctx->pname = "BGRX"; break;
+			default:
+				if (gf_pixel_fmt_is_yuv(ifmt)) {
+					ctx->pfmt = gf_pixel_fmt_is_transparent(ifmt) ? GF_PIXEL_YUVA : GF_PIXEL_YUV;
+				} else {
+					ctx->pfmt = gf_pixel_fmt_is_transparent(ifmt) ? GF_PIXEL_RGBA : GF_PIXEL_RGBX;
+				}
+				break;
+			}
+			if (ctx->pfmt != ifmt) {
+				gf_filter_pid_negotiate_property(ctx->ipid, GF_PROP_PID_PIXFMT, &PROP_UINT(ctx->pfmt) );
+				return GF_OK;
+			}
+
+			gf_pixel_get_size_info(ctx->pfmt, ctx->width, ctx->height, NULL, &ctx->stride, &ctx->stride_uv, &ctx->nb_planes, &ctx->uv_height);
+		}
+
+		p = gf_filter_pid_get_property(pid, GF_PROP_PID_FPS);
+		if (p) {
+			fps = p->value.frac.num;
+			fps /= p->value.frac.den;
+		}
+	} else {
+		p = gf_filter_pid_get_property(pid, GF_PROP_PID_SAMPLE_RATE);
+		if (!p) return GF_BAD_PARAM;
+		if (ctx->sample_rate != p->value.uint) {
+			ctx->sample_rate = p->value.uint;
+			ctx->codec_init = GF_FALSE;
+		}
+		p = gf_filter_pid_get_property(pid, GF_PROP_PID_NUM_CHANNELS);
+		u32 ch = p ? p->value.uint : 1;
+		if (ctx->num_channels != ch) {
+			ctx->num_channels = ch;
+			ctx->codec_init = GF_FALSE;
+		}
+		p = gf_filter_pid_get_property(pid, GF_PROP_PID_AUDIO_FORMAT);
+		if (p) {
+			u32 ifmt = p->value.uint;
+			ctx->afmt = ifmt;
+			ctx->pname = NULL;
+			switch (ifmt) {
+			case GF_AUDIO_FMT_U8: ctx->pname = "u8"; break;
+			case GF_AUDIO_FMT_S16: ctx->pname = "s16"; break;
+			case GF_AUDIO_FMT_S32: ctx->pname = "s32"; break;
+			case GF_AUDIO_FMT_FLT: ctx->pname = "f32"; break;
+			case GF_AUDIO_FMT_U8P: ctx->pname = "u8-planar"; break;
+			case GF_AUDIO_FMT_S16P: ctx->pname = "s16-planar"; break;
+			case GF_AUDIO_FMT_S32P: ctx->pname = "s32-planar"; break;
+			case GF_AUDIO_FMT_FLTP: ctx->pname = "f32-planar"; break;
+			default:
+				ctx->afmt = GF_AUDIO_FMT_S32;
+				break;
+			}
+			if (ctx->afmt != ifmt) {
+				gf_filter_pid_negotiate_property(ctx->ipid, GF_PROP_PID_PIXFMT, &PROP_UINT(ctx->afmt) );
+				return GF_OK;
+			}
+			ctx->bytes_per_sample = gf_audio_fmt_bit_depth(ctx->afmt) * ctx->num_channels / 8;
+		}
+	}
+	if (ctx->codec_init) return GF_OK;
+
+
+	char szCodecRFC6381_CODEC_NAME_SIZE_MAX;
+	strncpy(szCodec, ctx->c, RFC6381_CODEC_NAME_SIZE_MAX);
+	u32 ctype = gf_codecid_4cc_type(ctx->codecid);
+	if (ctype) {
+		strcpy(szCodec, gf_4cc_to_str(ctype));
+
+		if (codec_par) {
+			strncat(szCodec, codec_par, RFC6381_CODEC_NAME_SIZE_MAX);
+		} else {
+			switch (ctx->codecid) {
+			case GF_CODECID_AVC:
+				strcpy(szCodec, "avc1.640028");
+				break;
+			case GF_CODECID_HEVC:
+				strcpy(szCodec, "hvc1.1.6.L153.0");
+				break;
+			case GF_CODECID_VVC:
+				strcpy(szCodec, "vvc1.1.H102.CQA");
+				break;
+			case GF_CODECID_AV1:
+				strcpy(szCodec, "av01.0.08M.08");
+				break;
+			case GF_CODECID_AAC_MPEG2_MP:
+			case GF_CODECID_AAC_MPEG2_LCP:
+			case GF_CODECID_AAC_MPEG2_SSRP:
+			case GF_CODECID_AAC_MPEG4:
+				strcpy(szCodec, "mp4a.40.2");
+				break;
+			}
+		}
+		strlwr(szCodec);
+	}
+
+	ctx->error = GF_OK;
+	//create encoder
+	wcenc_init(EM_CAST_PTR ctx,
+		EM_CAST_PTR szCodec,
+		ctx->b ? ctx->b : (ctx->width ? 2000000 : 124000),
+		ctx->width,
+		ctx->height,
+		fps,
+		0,
+		ctx->sample_rate,
+		ctx->num_channels);
+
+	return ctx->error;
+}
+
+
+
+EM_JS(int, wcenc_encode_frame, (int wc_ctx, u32 w, u32 h, u32 uv_h, int _format, u64 ts, u32 dur, u32 planes, u32 stride1, u32 stride2, u32 sap, int buf, u32 buf_size), {
+	let c = libgpac._to_webenc(wc_ctx);
+	if (!c || !buf || !_format) return;
+	let format = libgpac.UTF8ToString(_format);
+
+	//setup source frame
+	let ab = new Uint8Array(libgpac.HEAPU8.buffer, buf, buf_size);
+	let vbinit = {
+		format: format,
+		layout: ,
+		codedWidth: w,
+		codedHeight: h,
+		timestamp: Number(ts),
+		duration: dur,
+	};
+	let offset=0;
+	for (let i=0; i<planes; i++) {
+		let l={};
+		let p_h=h;
+		l.offset = offset;
+		l.stride = stride1;
+
+		if (i==4) l.stride = stride1;
+		else if (i) {
+			l.stride = stride2;
+			p_h = uv_h;
+		}
+		offset += l.stride * p_h;
+		vbinit.layout.push(l);
+	}
+	let vframe = new VideoFrame(ab, vbinit);
+	c.enc.encode(vframe, {keyFrame: sap ? true : false} );
+	vframe.close();
+})
+
+EM_JS(int, wcenc_encode_audio, (int wc_ctx, u32 sr, u32 ch, u32 frames, int _format, u64 ts, int buf, u32 buf_size), {
+	let c = libgpac._to_webenc(wc_ctx);
+	if (!c || !buf || !_format) return;
+	let format = libgpac.UTF8ToString(_format);
+
+	//setup source frame
+	let adinit = {
+		format: format,
+		sampleRate: sr,
+		numberOfChannels: ch,
+		numberOfFrames: frames,
+		timestamp: Number(ts),
+		data: new Uint8Array(libgpac.HEAPU8.buffer, buf, buf_size)
+	};
+	let adata = new AudioData(adinit);
+	c.enc.encode(adata);
+	adata.close();
+})
+
+
+GF_EXPORT
+void wcenc_on_flush(GF_WCEncCtx *ctx)
+{
+	ctx->in_flush = 2;
+	gf_filter_pid_set_eos(ctx->opid);
+}
+
+EM_JS(int, wcenc_flush, (int wc_ctx), {
+	let c = libgpac._to_webenc(wc_ctx);
+	if (!c || !c.enc) return;
+	c.enc.flush().then( () => {libgpac._on_wcenc_flush(c._wc_ctx); }).catch ( (e) => { libgpac._on_wcenc_flush(c._wc_ctx); } );
+})
+
+
+static GF_Err wcenc_process(GF_Filter *filter)
+{
+	u64 cts=0;
+	GF_Err e;
+	const u8 *in_buffer;
+	u32 in_buffer_size;
+	GF_WCEncCtx *ctx = gf_filter_get_udta(filter);
+	GF_FilterPacket *pck;
+
+	if (ctx->error)
+		return ctx->error;
+	if (!ctx->codec_init) return GF_OK;
+
+
+	while (!ctx->enc_error) {
+		pck = gf_filter_pid_get_packet(ctx->ipid);
+		if (!pck) {
+			if (gf_filter_pid_is_eos(ctx->ipid)) {
+				if (!ctx->in_flush) {
+					ctx->in_flush = 1;
+					wcenc_flush(EM_CAST_PTR ctx);
+				}
+				if (ctx->in_flush == 1) {
+					gf_filter_post_process_task(filter);
+					return GF_OK;
+				}
+				return GF_EOS;
+			}
+			return GF_OK;
+		}
+		ctx->in_flush = 0;
+		//don't push too fast
+		if (gf_list_count(ctx->src_pcks) > ctx->queued) {
+			//ask for later processing to trigger breaking of scheduler loop in case of threading
+			gf_filter_ask_rt_reschedule(filter, 500);
+			return GF_OK;
+		}
+		in_buffer = (u8 *) gf_filter_pck_get_data(pck, &in_buffer_size);
+		cts = gf_timestamp_rescale( gf_filter_pck_get_cts(pck), ctx->timescale, 1000000);
+
+		gf_filter_pck_ref_props(&pck);
+		gf_list_add(ctx->src_pcks, pck);
+
+		//queue input
+		if (ctx->width) {
+			int sap = 0;
+			const GF_PropertyValue *p;
+
+			//force picture type
+			if (ctx->all_intra)
+				sap = 1;
+
+			//if PCK_FILENUM is set on input, this is a file boundary, force IDR sync
+			if (pck && gf_filter_pck_get_property(pck, GF_PROP_PCK_FILENUM)) {
+				sap = 1;
+			}
+			//if CUE_START is set on input, this is a segment boundary, force IDR sync
+			p = pck ? gf_filter_pck_get_property(pck, GF_PROP_PCK_CUE_START) : NULL;
+			if (p && p->value.boolean) {
+				sap = 1;
+			}
+
+			//check if we need to force a closed gop
+			if (pck && ctx->fintra.den && (ctx->fintra.num>0)) {
+				if (!ctx->fintra_setup) {
+					ctx->fintra_setup = GF_TRUE;
+					ctx->orig_ts = cts;
+					sap = 1;
+					ctx->nb_forced=1;
+				} else if (cts < ctx->orig_ts) {
+					GF_LOG(GF_LOG_WARNING, GF_LOG_CODEC, ("WebEnc timestamps not increasing monotonuously, resetting forced intra state !\n"));
+					ctx->orig_ts = cts;
+					sap = 1;
+					ctx->nb_forced=1;
+				} else {
+					u64 ts_diff = cts - ctx->orig_ts;
+					if (ts_diff * ctx->fintra.den >= ctx->nb_forced * ctx->fintra.num * 1000000) {
+						sap = 1;
+						ctx->nb_forced++;
+						GF_LOG(GF_LOG_INFO, GF_LOG_CODEC, ("WebEnc Forcing IDR at frame %d (CTS %d / 1000000)\n", ctx->nb_frames_in, cts));
+					}
+				}
+			}
+
+
+			wcenc_encode_frame(EM_CAST_PTR ctx, ctx->width, ctx->height, ctx->uv_height, EM_CAST_PTR ctx->pname, cts, gf_filter_pck_get_duration(pck), ctx->nb_planes, ctx->stride, ctx->stride_uv, sap, EM_CAST_PTR in_buffer, in_buffer_size);
+			ctx->nb_frames_in++;
+		} else {
+			u32 nb_samples = in_buffer_size / ctx->bytes_per_sample;
+
+			wcenc_encode_audio(EM_CAST_PTR ctx, ctx->sample_rate, ctx->num_channels, nb_samples, EM_CAST_PTR ctx->pname, cts, EM_CAST_PTR in_buffer, in_buffer_size);
+		}
+
+		gf_filter_pid_drop_packet(ctx->ipid);
+	}
+	e = ctx->enc_error;
+	ctx->enc_error = GF_OK;
+	return e;
+}
+
+EM_JS(int, wcenc_get_config, (int wc_ctx, int buf, int buf_size), {
+	let c = libgpac._to_webenc(wc_ctx);
+	if (!c || !c.decoderConfig) {
+		throw 'Bad Param';
+		return;
+	}
+	//setup dst
+	let dst = new Uint8Array(libgpac.HEAPU8.buffer, buf, buf_size);
+	dst.set(c.decoderConfig);
+})
+
+GF_EXPORT
+void wcenc_on_config(GF_WCEncCtx *ctx, int size)
+{
+	u8 *buf = gf_malloc(size);
+	memset(buf, 0, size);
+	wcenc_get_config(EM_CAST_PTR ctx, EM_CAST_PTR buf, size);
+	u32 dsi_crc = gf_crc_32(buf, size);
+	if (dsi_crc != ctx->dsi_crc) {
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_DECODER_CONFIG, &PROP_DATA_NO_COPY(buf, size));
+		ctx->dsi_crc = dsi_crc;
+	} else {
+		gf_free(buf);
+	}
+}
+
+EM_JS(int, wcenc_get_frame, (int wc_ctx, int buf, int buf_size), {
+	let c = libgpac._to_webenc(wc_ctx);
+	if (!c || !c.chunk) {
+		throw 'Bad Param';
+		return;
+	}
+	//setup dst
+	let dst = new Uint8Array(libgpac.HEAPU8.buffer, buf, buf_size);
+	c.chunk.copyTo(dst);
+})
+
+GF_EXPORT
+void wcenc_on_frame(GF_WCEncCtx *ctx, u64 timestamp, u32 duration, u32 size, int is_key)
+{
+	u8 *output;
+	u32 i, count;
+	GF_FilterPacket *src_pck=NULL;
+
+	GF_FilterPacket *dst = gf_filter_pck_new_alloc(ctx->opid, size, &output);
+	if (!dst) return;
+
+	wcenc_get_frame(EM_CAST_PTR ctx, EM_CAST_PTR output, size);
+
+	u64 cts = gf_timestamp_rescale(timestamp, 1000000, ctx->timescale);
+
+	count = gf_list_count(ctx->src_pcks);
+	for (i=0; i<count; i++) {
+		src_pck = gf_list_get(ctx->src_pcks, i);
+		s64 ts = gf_filter_pck_get_cts(src_pck);
+		if (ABS(ts - cts) <= 1) {
+			gf_list_rem(ctx->src_pcks, i);
+			break;
+		}
+		if (ctx->sample_rate && (cts>=ts)) {
+			gf_list_rem(ctx->src_pcks, i);
+			break;
+		}
+		src_pck = NULL;
+	}
+
+	gf_filter_pck_set_cts(dst, cts);
+	if (src_pck) {
+		gf_filter_pck_merge_properties(src_pck, dst);
+		gf_filter_pck_unref(src_pck);
+		gf_filter_pck_set_byte_offset(dst, GF_FILTER_NO_BO);
+	}
+	gf_filter_pck_set_sap(dst, is_key ? GF_FILTER_SAP_1 : GF_FILTER_SAP_NONE);
+	gf_filter_pck_send(dst);
+
+	if (ctx->sample_rate) {
+		while (gf_list_count(ctx->src_pcks)) {
+			src_pck = gf_list_pop_back(ctx->src_pcks);
+			gf_filter_pck_unref(src_pck);
+		}
+	}
+}
+
+
+
+GF_Err wcenc_initialize(GF_Filter *filter)
+{
+    GF_WCEncCtx *ctx = gf_filter_get_udta(filter);
+    ctx->filter = filter;
+	ctx->src_pcks = gf_list_new();
+    return GF_OK;
+}
+
+EM_JS(int, wcenc_del, (int wc_ctx), {
+	if (typeof libgpac._web_encs != 'array') return;
+	for (let i=0; i<libgpac._web_encs.length; i++) {
+		if (libgpac._web_encsi._wc_ctx == wc_ctx) {
+			libgpac._web_encsi.enc.close();
+			libgpac._web_encs.splice(i, 1);
+			return;
+		}
+	}
+})
+
+
+void wcenc_finalize(GF_Filter *filter)
+{
+    GF_WCEncCtx *ctx = gf_filter_get_udta(filter);
+    wcenc_del(EM_CAST_PTR ctx);
+
+    while (gf_list_count(ctx->src_pcks)) {
+		GF_FilterPacket *pck = gf_list_pop_back(ctx->src_pcks);
+		gf_filter_pck_unref(pck);
+	}
+	gf_list_del(ctx->src_pcks);
+}
+
+static GF_FilterCapability WCEncCapsV =
+{
+	CAP_UINT(GF_CAPS_INPUT_OUTPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_VISUAL),
+	CAP_UINT(GF_CAPS_INPUT, GF_PROP_PID_CODECID, GF_CODECID_RAW),
+	CAP_BOOL(GF_CAPS_INPUT_EXCLUDED, GF_PROP_PID_UNFRAMED, GF_TRUE),
+	CAP_UINT(GF_CAPS_OUTPUT_EXCLUDED, GF_PROP_PID_CODECID, GF_CODECID_RAW),
+	CAP_BOOL(GF_CAPS_OUTPUT_EXCLUDED, GF_PROP_PID_TILE_BASE, GF_TRUE),
+};
+
+static GF_FilterCapability WCEncCapsA =
+{
+	CAP_UINT(GF_CAPS_INPUT_OUTPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_AUDIO),
+	CAP_BOOL(GF_CAPS_INPUT_EXCLUDED, GF_PROP_PID_UNFRAMED, GF_TRUE),
+	CAP_UINT(GF_CAPS_INPUT, GF_PROP_PID_CODECID, GF_CODECID_RAW),
+	CAP_UINT(GF_CAPS_OUTPUT_EXCLUDED, GF_PROP_PID_CODECID, GF_CODECID_RAW),
+};
+
+static GF_FilterCapability WCEncCapsAV =
+{
+	CAP_UINT(GF_CAPS_INPUT_OUTPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_VISUAL),
+	CAP_UINT(GF_CAPS_INPUT, GF_PROP_PID_CODECID, GF_CODECID_RAW),
+	CAP_BOOL(GF_CAPS_INPUT_EXCLUDED, GF_PROP_PID_UNFRAMED, GF_TRUE),
+	CAP_UINT(GF_CAPS_OUTPUT_EXCLUDED, GF_PROP_PID_CODECID, GF_CODECID_RAW),
+	CAP_BOOL(GF_CAPS_OUTPUT_EXCLUDED, GF_PROP_PID_TILE_BASE, GF_TRUE),
+	{0},
+	CAP_UINT(GF_CAPS_INPUT_OUTPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_AUDIO),
+	CAP_BOOL(GF_CAPS_INPUT_EXCLUDED, GF_PROP_PID_UNFRAMED, GF_TRUE),
+	CAP_UINT(GF_CAPS_INPUT, GF_PROP_PID_CODECID, GF_CODECID_RAW),
+	CAP_UINT(GF_CAPS_OUTPUT_EXCLUDED, GF_PROP_PID_CODECID, GF_CODECID_RAW),
+};
+
+#define OFFS(_n)	#_n, offsetof(GF_WCEncCtx, _n)
+
+static const GF_FilterArgs WCEncArgs =
+{
+	{ OFFS(c), "codec identifier. Can be any supported GPAC codec name or ffmpeg codec name - updated to ffmpeg codec name after initialization", GF_PROP_STRING, NULL, NULL, 0},
+	{ OFFS(fintra), "force intra / IDR frames at the given period in sec, e.g. `fintra=2` will force an intra every 2 seconds and `fintra=1001/1000` will force an intra every 30 frames on 30000/1001=29.97 fps video; ignored for audio", GF_PROP_FRACTION, "-1/1", NULL, 0},
+
+	{ OFFS(all_intra), "only produce intra frames", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_UPDATE|GF_FS_ARG_HINT_ADVANCED},
+	{ OFFS(b), "bitrate in bits per seconds, defaults to 2M for video and 124K for audio", GF_PROP_UINT, "0", NULL, 0},
+	{ OFFS(queued), "maximum number of packets to queue in webcodec instance", GF_PROP_UINT, "10", NULL, 0},
+	{0}
+};
+
+GF_FilterRegister GF_WCEncCtxRegister = {
+	.name = "wcenc",
+	GF_FS_SET_DESCRIPTION("WebCodec encoder")
+	GF_FS_SET_HELP("This filter encodes video streams using WebCodec encoder of the browser")
+	.args = WCEncArgs,
+	SETCAPS(WCEncCapsAV),
+	.flags = GF_FS_REG_SINGLE_THREAD|GF_FS_REG_ASYNC_BLOCK,
+	.private_size = sizeof(GF_WCEncCtx),
+	.initialize = wcenc_initialize,
+	.finalize = wcenc_finalize,
+	.configure_pid = wcenc_configure_pid,
+	.process = wcenc_process,
+};
+
+
+const GF_FilterRegister *wcenc_register(GF_FilterSession *session)
+{
+	
+	int has_webv_encode = EM_ASM_INT({
+		if (typeof VideoEncoder == 'undefined') return 0;
+		return 1;
+	});
+	int has_weba_encode = EM_ASM_INT({
+		if (typeof AudioEncoder == 'undefined') return 0;
+		return 1;
+	});
+
+	if (!has_webv_encode && !has_weba_encode) {
+		GF_LOG(GF_LOG_INFO, GF_LOG_CODEC, ("WebEnc No WebEncoder support\n"));
+		return NULL;
+	}
+	if (!has_webv_encode) {
+		GF_WCEncCtxRegister.caps = WCEncCapsA;
+		GF_WCEncCtxRegister.nb_caps = sizeof(WCEncCapsA)/sizeof(GF_FilterCapability);
+	} else if (!has_weba_encode) {
+		GF_WCEncCtxRegister.caps = WCEncCapsV;
+		GF_WCEncCtxRegister.nb_caps = sizeof(WCEncCapsV)/sizeof(GF_FilterCapability);
+	}
+	GF_LOG(GF_LOG_INFO, GF_LOG_CODEC, ("WebEnc AudioEncoder %d - VideoEncoder %d\n", has_weba_encode, has_webv_encode));
+	return &GF_WCEncCtxRegister;
+}
+#endif

gpac-2.2.1.tar.gz/src/filters/encrypt_cenc_isma.c -> gpac-2.4.0.tar.gz/src/filters/encrypt_cenc_isma.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2018-2022
+ *			Copyright (c) Telecom ParisTech 2018-2024
  *					All rights reserved
  *
  *  This file is part of GPAC / CENC and ISMA encrypt module
@@ -34,7 +34,7 @@
 
 #include <gpac/internal/media_dev.h>
 
-#ifndef GPAC_DISABLE_CRYPTO
+#if !defined(GPAC_DISABLE_CRYPTO) && !defined(GPAC_DISABLE_CECRYPT)
 
 
 enum
@@ -73,6 +73,7 @@
 	GF_FilterPid *ipid;
 	GF_FilterPid *opid;
 	GF_TrackCryptInfo *tci;
+	u32 crypt_byte_block, skip_byte_block;
 
 	//active keys (for multikey support)
 	u32 nb_keys;
@@ -106,13 +107,11 @@
 	Bool ctr_mode;
 	Bool is_saes;
 
-	Bool rap_roll;
+	Bool rap_roll, warned_clear;
 
 #ifndef GPAC_DISABLE_AV_PARSERS
 	AVCState *avc_state;
-#ifndef GPAC_DISABLE_HEVC
 	HEVCState *hevc_state;
-#endif
 	AV1State *av1_state;
 	GF_VPConfig *vp9_cfg;
 
@@ -125,13 +124,15 @@
 	//0: no generation, >0: use v-1 as key idx
 	u32 pssh_template_plus_one;
 	GF_List *pssh_templates;
+
+	u64 num_block_crypted;
 } GF_CENCStream;
 
 typedef struct
 {
 	//options
 	const char *cfile;
-	Bool allc;
+	Bool allc, bk_stats;
 	
 	//internal
 	GF_CryptInfo *cinfo;
@@ -627,18 +628,16 @@
 		gf_free(cstr->vvc_state);
 		cstr->vvc_state = NULL;
 	}
-#endif
 	if (cstr->vp9_cfg) {
 		gf_odf_vp_cfg_del(cstr->vp9_cfg);
 		cstr->vp9_cfg = NULL;
 	}
+#endif
 }
 
 static GF_Err cenc_enc_configure(GF_CENCEncCtx *ctx, GF_CENCStream *cstr, const char *cfile_name)
 {
-#if !defined(GPAC_DISABLE_AV_PARSERS)
 	u32 i;
-#endif
 	u32 dsi_crc=0;
 	Bool is_reinit=GF_FALSE;
 	GF_AVCConfig *avccfg;
@@ -659,8 +658,8 @@
 
 	cstr->dsi_crc = dsi_crc;
 	if (cstr->is_saes) {
-		cstr->tci->crypt_byte_block = 1;
-		cstr->tci->skip_byte_block = 9;
+		cstr->crypt_byte_block = 1;
+		cstr->skip_byte_block = 9;
 	}
 
 
@@ -708,6 +707,7 @@
 			cenc_pid_reset_codec_states(cstr);
 			cstr->cenc_codec = cenc_codec;
 			switch (cenc_codec) {
+#ifndef GPAC_DISABLE_AV_PARSERS
 			case CENC_AVC:
 				GF_SAFEALLOC(cstr->avc_state, AVCState);
 				if (!cstr->avc_state) return GF_OUT_OF_MEM;
@@ -724,8 +724,12 @@
 				GF_SAFEALLOC(cstr->av1_state, AV1State);
 				if (!cstr->av1_state) return GF_OUT_OF_MEM;
 				break;
+#endif
 			}
-		} else {
+		}
+		//if crypt is init for stream and no codec change, don't reinit
+		//we may have no codec change and still need to init when stream DSI was not ready at first configure (from TS for example)
+		else if (cstr->cenc_init) {
 			is_reinit = GF_FALSE;
 		}
 
@@ -781,7 +785,7 @@
 			hevccfg = gf_odf_hevc_cfg_read(p->value.data.ptr, p->value.data.size, (cstr->codec_id==GF_CODECID_LHVC) ? GF_TRUE : GF_FALSE);
 			if (hevccfg) cstr->nalu_size_length = hevccfg->nal_unit_size;
 
-#if !defined(GPAC_DISABLE_AV_PARSERS) && !defined(GPAC_DISABLE_HEVC)
+#if !defined(GPAC_DISABLE_AV_PARSERS)
 			gf_hevc_parse_ps(hevccfg, cstr->hevc_state, GF_HEVC_NALU_VID_PARAM);
 			gf_hevc_parse_ps(hevccfg, cstr->hevc_state, GF_HEVC_NALU_SEQ_PARAM);
 			gf_hevc_parse_ps(hevccfg, cstr->hevc_state, GF_HEVC_NALU_PIC_PARAM);
@@ -802,7 +806,7 @@
 			if (!p)
 				return GF_OK;
 
-#if !defined(GPAC_DISABLE_AV_PARSERS) && !defined(GPAC_DISABLE_AV1)
+#if !defined(GPAC_DISABLE_AV_PARSERS)
 			cstr->av1_state->config = gf_odf_av1_cfg_read(p->value.data.ptr, p->value.data.size);
 			cstr->bytes_in_nal_hdr = 2;
 #endif
@@ -810,10 +814,14 @@
 			cstr->slice_header_clear = GF_TRUE;
 			break;
 		case CENC_VPX:
+#if !defined(GPAC_DISABLE_AV_PARSERS)
 			if (p) {
 				cstr->bytes_in_nal_hdr = 2;
 				cstr->vp9_cfg = gf_odf_vp_cfg_new();
 			}
+#else
+				return GF_NOT_SUPPORTED;
+#endif
 			break;
 		case CENC_VVC:
 			if (!p)
@@ -847,12 +855,12 @@
 
 	if (((cstr->tci->scheme_type == GF_CRYPT_TYPE_CENS) || (cstr->tci->scheme_type == GF_CRYPT_TYPE_CBCS) ) && (cstr->cenc_codec>CENC_FULL_SAMPLE) && (cstr->cenc_codec<=CENC_AV1)
 	)  {
-		if (!cstr->tci->crypt_byte_block || !cstr->tci->skip_byte_block) {
-			if (cstr->tci->crypt_byte_block || cstr->tci->skip_byte_block) {
+		if (!cstr->crypt_byte_block || !cstr->skip_byte_block) {
+			if (cstr->crypt_byte_block || cstr->skip_byte_block) {
 				GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("CENC Using pattern mode, crypt_byte_block and skip_byte_block shall be 0 only for track other than video, using 1 crypt + 9 skip\n"));
 			}
-			cstr->tci->crypt_byte_block = 1;
-			cstr->tci->skip_byte_block = 9;
+			cstr->crypt_byte_block = 1;
+			cstr->skip_byte_block = 9;
 		}
 	}
 
@@ -869,12 +877,12 @@
 	else if (cstr->tci->scheme_type == GF_CRYPT_TYPE_CBCS) {
 		const GF_PropertyValue *prop = gf_filter_pid_get_property(cstr->ipid, GF_PROP_PID_STREAM_TYPE);
 		if (prop && prop->value.uint != GF_STREAM_VISUAL) {
-			if (cstr->tci->skip_byte_block) {
+			if (cstr->skip_byte_block) {
 				GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("\nCENC Using cbcs pattern mode on-video track is disabled in GPAC, using whole-block full encryption\n"));
-				cstr->tci->skip_byte_block = 0;
+				cstr->skip_byte_block = 0;
 			}
 		}
-		if (cstr->tci->skip_byte_block) {
+		if (cstr->skip_byte_block) {
 			cstr->use_subsamples = GF_TRUE;
 			GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("\nCENC Using cbcs pattern mode on non NAL video track, this may not be supported by most devices; consider setting skip_byte_block to 0\n\n"));
 			//cbcs allows bytes of clear data
@@ -885,20 +893,20 @@
 #if 0
 		//setup defaults
 		else if (!cstr->crypt_byte_block) {
-			cstr->tci->crypt_byte_block = 1;
+			cstr->crypt_byte_block = 1;
 		}
 #else
 		else {
-			cstr->tci->crypt_byte_block = 0;
+			cstr->crypt_byte_block = 0;
 		}
 #endif
 	}
 	else if (cstr->tci->scheme_type == GF_CRYPT_TYPE_CENS) {
-		if (cstr->tci->skip_byte_block) {
+		if (cstr->skip_byte_block) {
 			GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("CENC Using cens pattern mode on non NAL video track not allowed, forcing skip_byte_block to 0\n"));
-			cstr->tci->skip_byte_block = 0;
-			if (!cstr->tci->crypt_byte_block) {
-				cstr->tci->crypt_byte_block = 1;
+			cstr->skip_byte_block = 0;
+			if (!cstr->crypt_byte_block) {
+				cstr->crypt_byte_block = 1;
 			}
 		}
 	}
@@ -1035,8 +1043,8 @@
 		gf_filter_pid_set_property(cstr->opid, GF_PROP_PID_HLS_KMS, hls_info ? &PROP_STRING(hls_info) : NULL);
 	}
 
-	if (cstr->tci->skip_byte_block || cstr->tci->crypt_byte_block) {
-		gf_filter_pid_set_property(cstr->opid, GF_PROP_PID_CENC_PATTERN, &PROP_FRAC_INT(cstr->tci->skip_byte_block, cstr->tci->crypt_byte_block ) );
+	if (cstr->skip_byte_block || cstr->crypt_byte_block) {
+		gf_filter_pid_set_property(cstr->opid, GF_PROP_PID_CENC_PATTERN, &PROP_FRAC_INT(cstr->skip_byte_block, cstr->crypt_byte_block ) );
 	} else {
 		gf_filter_pid_set_property(cstr->opid, GF_PROP_PID_CENC_PATTERN, NULL);
 	}
@@ -1157,7 +1165,10 @@
 
 	if (!tci) {
 		if (cinfo) {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("CENCrypt Missing track crypt info in DRM config file, PID will not be crypted\n") );
+			cstr = gf_filter_pid_get_udta(pid);
+			if (!cstr || !cstr->warned_clear) {
+				GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("CENCrypt Missing track crypt info in DRM config file, PID %s will not be crypted\n", gf_filter_pid_get_name((pid))) );
+			}
 		}
 	} else {
 		scheme_type = tci->scheme_type;
@@ -1192,10 +1203,17 @@
 		//we need full sample
 		gf_filter_pid_set_framing_mode(pid, GF_TRUE);
 	}
+	cstr->warned_clear = GF_TRUE;
 	if (cstr->cinfo) gf_crypt_info_del(cstr->cinfo);
 	cstr->cinfo = (cinfo != ctx->cinfo) ? cinfo : NULL;
 	cstr->tci = tci;
 	cstr->passthrough = tci ? GF_FALSE : GF_TRUE;
+	if (tci) {
+		cstr->crypt_byte_block = cstr->tci->crypt_byte_block;
+		cstr->skip_byte_block = cstr->tci->skip_byte_block;
+	} else {
+		cstr->crypt_byte_block = cstr->skip_byte_block = 0;
+	}
 
 	if (tci && tci->rand_keys) {
 		if (!tci->nb_keys) {
@@ -1420,6 +1438,7 @@
 		}
 		gf_crypt_encrypt(cstr->keys0.crypt, output+isma_hdr_size, size);
 		cstr->prev_pck_encrypted = GF_TRUE;
+		cstr->num_block_crypted += size/16;
 	} else {
 		cstr->prev_pck_encrypted = GF_FALSE;
 	}
@@ -1506,6 +1525,7 @@
 		memset(output+adobe_hdr_size+size, padding_bytes, sizeof(char)*padding_bytes);
 
 		gf_crypt_encrypt(cstr->keys0.crypt, output+adobe_hdr_size, len);
+		cstr->num_block_crypted += len/16;
 
 		/*write encrypted AU header*/
 		output0 = 0x10;
@@ -1613,7 +1633,6 @@
 			}
 
 		} else if (cstr->cenc_codec==CENC_HEVC) {
-#if !defined(GPAC_DISABLE_HEVC)
 			u8 ntype, ntid, nlid;
 			cstr->hevc_state->full_slice_header_parse = GF_TRUE;
 //			gf_hevc_parse_nalu(samp_data + nal_start, nal_size, cstr->hevc_state, &ntype, &ntid, &nlid);
@@ -1623,7 +1642,6 @@
 			} else {
 				clear_bytes = nal_size;
 			}
-#endif
 		} else if (cstr->cenc_codec==CENC_VVC) {
 			u8 ntype, ntid, nlid;
 			cstr->vvc_state->parse_mode = 1;
@@ -1844,7 +1862,7 @@
 				gf_bs_seek(ctx->bs_r, pos);
 
 				clear_bytes = ranges0.clear;
-				assert(frame_sizes0 == ranges0.clear + ranges0.encrypted);
+				gf_assert(frame_sizes0 == ranges0.clear + ranges0.encrypted);
 				nalu_size = frame_sizes0;
 
 				//final superframe index must be in clear
@@ -1882,6 +1900,14 @@
 #else
 			clear_bytes = nalu_size;
 #endif
+			if (clear_bytes < cstr->tci->crypt_byte_offset) {
+				clear_bytes = cstr->tci->crypt_byte_offset;
+				if (clear_bytes>nalu_size) clear_bytes = nalu_size;
+			}
+			if (nalu_size > gf_bs_available(ctx->bs_r)) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("CENC Invalid NALU size %u remaining bytes %u\n", nalu_size, gf_bs_available(ctx->bs_r)));
+				return GF_NON_COMPLIANT_BITSTREAM;
+			}
 
 			//VCL subsample, check out settings to decide if we leave it in the clear
 			if ((nalu_size > clear_bytes) &&
@@ -1925,7 +1951,10 @@
 					nb_subs_crypted++;
 				}
 			}
-			
+			//may happen with SAES
+			if (clear_bytes > nalu_size)
+				clear_bytes = nalu_size;
+
 			while (nb_ranges) {
 				if (cstr->ctr_mode) {
 
@@ -1987,16 +2016,21 @@
 						gf_crypt_set_IV(cstr->keyskey_idx.crypt, cstr->keyskey_idx.IV, 16);
 
 					//pattern encryption
-					if (cstr->tci->crypt_byte_block && cstr->tci->skip_byte_block) {
+					if (cstr->crypt_byte_block && cstr->skip_byte_block) {
 						u32 res = nalu_size - clear_bytes - clear_bytes_at_end;
 						pos = cur_pos;
-						assert((res % 16) == 0);
+						//don't use modulo in case we use fatal_assert
+						gf_assert((res / 16) * 16 == res);
 
 						while (res) {
-							e = gf_crypt_encrypt(cstr->keyskey_idx.crypt, output+pos, res >= (u32) (16*cstr->tci->crypt_byte_block) ? 16*cstr->tci->crypt_byte_block : res);
-							if (res >= (u32) (16 * (cstr->tci->crypt_byte_block + cstr->tci->skip_byte_block))) {
-								pos += 16 * (cstr->tci->crypt_byte_block + cstr->tci->skip_byte_block);
-								res -= 16 * (cstr->tci->crypt_byte_block + cstr->tci->skip_byte_block);
+							u32 to_crypt = (res >= (u32) (16*cstr->crypt_byte_block)) ? 16*cstr->crypt_byte_block : res;
+
+							e = gf_crypt_encrypt(cstr->keyskey_idx.crypt, output+pos, to_crypt);
+							cstr->num_block_crypted += to_crypt/16;
+
+							if (res >= (u32) (16 * (cstr->crypt_byte_block + cstr->skip_byte_block))) {
+								pos += 16 * (cstr->crypt_byte_block + cstr->skip_byte_block);
+								res -= 16 * (cstr->crypt_byte_block + cstr->skip_byte_block);
 							} else {
 								res = 0;
 							}
@@ -2006,7 +2040,9 @@
 					else {
 						//clear_bytes_at_end is 0 unless NALU-based cbcs without pattern (not defined in CENC)
 						//in this case, we must only encrypt a multiple of 16-byte blocks
-						e = gf_crypt_encrypt(cstr->keyskey_idx.crypt, output+cur_pos, nalu_size - clear_bytes - clear_bytes_at_end);
+						u32 to_crypt = nalu_size - clear_bytes - clear_bytes_at_end;
+						e = gf_crypt_encrypt(cstr->keyskey_idx.crypt, output+cur_pos, to_crypt);
+						cstr->num_block_crypted += to_crypt/16;
 					}
 				}
 
@@ -2069,10 +2105,12 @@
 				if (!nb_ranges) break;
 
 				range_idx++;
+#ifndef GPAC_DISABLE_AV_PARSERS
 				if (range_idx >= AV1_MAX_TILE_ROWS * AV1_MAX_TILE_COLS) {
 					GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("CENC More ranges than tiles allowed spec, bitstream error ?\n"));
 					return GF_BAD_PARAM;
 				}
+#endif
 				switch (cstr->cenc_codec) {
 				case CENC_AV1:
 					clear_bytes = rangesrange_idx.clear;
@@ -2084,7 +2122,7 @@
 						nalu_size = clear_bytes + rangesrange_idx.encrypted;
 					} else { /*last*/
 						nalu_size = clear_bytes = rangesrange_idx.clear;
-						assert(rangesrange_idx.encrypted == 0);
+						gf_assert(rangesrange_idx.encrypted == 0);
 					}
 					break;
 				default:
@@ -2098,6 +2136,7 @@
 		else if (cstr->ctr_mode) {
 			gf_bs_skip_bytes(ctx->bs_r, pck_size);
 			e = gf_crypt_encrypt(cstr->keys0.crypt, output, pck_size);
+			cstr->num_block_crypted += pck_size/16;
 		}
 		//CBC full sample with padding
 		else {
@@ -2113,7 +2152,9 @@
 				gf_crypt_set_IV(cstr->keys0.crypt, cstr->keys0.IV, 16);
 
 			if (pck_size >= 16) {
-				gf_crypt_encrypt(cstr->keys0.crypt, output+clear_header, pck_size - clear_header - clear_trailing);
+				u32 to_crypt = pck_size - clear_header - clear_trailing;
+				gf_crypt_encrypt(cstr->keys0.crypt, output+clear_header, to_crypt);
+				cstr->num_block_crypted += to_crypt/16;
 			}
 			gf_bs_skip_bytes(ctx->bs_r, pck_size);
 		}
@@ -2158,6 +2199,7 @@
 		gf_filter_pck_set_property(dst_pck, GF_PROP_PCK_CENC_SAI, NULL);
 
 	if (cstr->is_saes && (cstr->cenc_codec==CENC_AVC)) {
+#ifndef GPAC_DISABLE_AV_PARSERS
 		u8 *nal;
 		u32 epb_add_count = 0;
 
@@ -2184,13 +2226,14 @@
 
 			while (gf_bs_available(ctx->bs_r)) {
 				u32 nalu_size = gf_bs_read_int(ctx->bs_r, 8*cstr->nalu_size_length);
+				nal += cstr->nalu_size_length;
 				epb_add_count = gf_media_nalu_emulation_bytes_add_count(nal, nalu_size);
 				gf_bs_write_int(ctx->bs_w, nalu_size+epb_add_count, 8*cstr->nalu_size_length);
-				nal += cstr->nalu_size_length;
 				dst_nal += cstr->nalu_size_length;
 				w_pos += 4;
+				if (epb_add_count)
+					gf_media_nalu_add_emulation_bytes(nal, dst_nal, nalu_size);
 
-				gf_media_nalu_add_emulation_bytes(nal, dst_nal, nalu_size);
 				nal += nalu_size;
 				dst_nal += nalu_size+epb_add_count;
 				gf_bs_skip_bytes(ctx->bs_r, nalu_size);
@@ -2199,6 +2242,7 @@
 			}
 			gf_free(old_output);
 		}
+#endif
 	}
 
 	if (cstr->pssh_template_plus_one) {
@@ -2569,7 +2613,7 @@
 
 	nb_eos = 0;
 	for (i=0; i<count; i++) {
-		GF_Err e = GF_OK;;
+		GF_Err e = GF_OK;
 		GF_CENCStream *cstr = gf_list_get(ctx->streams, i);
 		GF_FilterPacket *pck = gf_filter_pid_get_packet(cstr->ipid);
 		if (!pck) {
@@ -2619,15 +2663,20 @@
 
 static void cenc_enc_finalize(GF_Filter *filter)
 {
+	u64 num_block_crypted = 0;
 	GF_CENCEncCtx *ctx = (GF_CENCEncCtx *)gf_filter_get_udta(filter);
 	if (ctx->cinfo) gf_crypt_info_del(ctx->cinfo);
 	while (gf_list_count(ctx->streams)) {
 		GF_CENCStream *s = gf_list_pop_back(ctx->streams);
+		num_block_crypted+=s->num_block_crypted;
 		cenc_free_pid_context(s);
 	}
 	gf_list_del(ctx->streams);
 	if (ctx->bs_w) gf_bs_del(ctx->bs_w);
 	if (ctx->bs_r) gf_bs_del(ctx->bs_r);
+	if (ctx->bk_stats) {
+		fprintf(stdout, "16-byte Blocks encrypted "LLU"\n", num_block_crypted);
+	}
 }
 
 
@@ -2646,12 +2695,13 @@
 {
 	{ OFFS(cfile), "crypt file location", GF_PROP_STRING, NULL, NULL, 0},
 	{ OFFS(allc), "throw error if no DRM config file is found for a PID", GF_PROP_BOOL, NULL, NULL, 0},
+	{ OFFS(bk_stats), "print number of encrypted blocks to stdout upon exit", GF_PROP_BOOL, NULL, NULL, 0},
 	{0}
 };
 
 GF_FilterRegister CENCEncRegister = {
 	.name = "cecrypt",
-	GF_FS_SET_DESCRIPTION("CENC  encryptor")
+	GF_FS_SET_DESCRIPTION("CENC encryptor")
 	GF_FS_SET_HELP("The CENC encryptor supports CENC, ISMA and Adobe encryption. It uses a DRM config file for declaring keys.\n"
 	"The syntax is available at https://wiki.gpac.io/Common-Encryption\n"
 	"The DRM config file can be set per PID using the property `CryptInfo`, or set at the filter level using -cfile().\n"
@@ -2674,9 +2724,9 @@
 
 #endif /*GPAC_DISABLE_CRYPTO*/
 
-const GF_FilterRegister *cenc_encrypt_register(GF_FilterSession *session)
+const GF_FilterRegister *cecrypt_register(GF_FilterSession *session)
 {
-#ifndef GPAC_DISABLE_CRYPTO
+#if !defined(GPAC_DISABLE_CRYPTO) && !defined(GPAC_DISABLE_CECRYPT)
 
 #ifdef GPAC_ENABLE_COVERAGE
 	if (gf_sys_is_cov_mode()) {

gpac-2.4.0.tar.gz/src/filters/evg_rescale.c Added

@@ -0,0 +1,538 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2023
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / EVG rescaler filter
+ *
+ *  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/filters.h>
+
+#ifndef GPAC_DISABLE_EVG
+#include <gpac/evg.h>
+
+enum
+{
+	EVGS_KEEPAR_OFF=0,
+	EVGS_KEEPAR_FULL,
+	EVGS_KEEPAR_NOSRC,
+};
+
+typedef struct
+{
+	//options
+	GF_PropVec2i osize;
+	u32 ofmt, nbth;
+	Bool ofr, hq;
+	char *padclr;
+	u32 keepar;
+	GF_Fraction osar;
+
+	//internal data
+	GF_FilterPid *ipid;
+	u32 i_w, i_h, i_stride, i_stride_uv, i_pfmt, i_planes, i_size;
+	Bool i_has_alpha;
+
+	GF_FilterPid *opid;
+	u32 o_size, o_w, o_h, o_stride, o_stride_uv;
+
+	GF_Fraction ar;
+	Bool passthrough, fullrange;
+	u32 offset_w, offset_h;
+
+	GF_EVGSurface *surf;
+	GF_EVGStencil *tx;
+	GF_Path *path;
+} EVGScaleCtx;
+
+u32 gf_evg_stencil_get_pixel_fast(GF_EVGStencil *st, s32 x, s32 y);
+u64 gf_evg_stencil_get_pixel_wide_fast(GF_EVGStencil *st, s32 x, s32 y);
+
+static GF_Err evgs_process(GF_Filter *filter)
+{
+	const char *data;
+	u8 *output;
+	u32 isize;
+	GF_FilterPacket *dst_pck;
+	GF_FilterFrameInterface *frame_ifce;
+	EVGScaleCtx *ctx = gf_filter_get_udta(filter);
+	GF_FilterPacket *pck;
+
+	pck = gf_filter_pid_get_packet(ctx->ipid);
+
+	if (!pck) {
+		if (gf_filter_pid_is_eos(ctx->ipid)) {
+			gf_filter_pid_set_eos(ctx->opid);
+			return GF_EOS;
+		}
+		return GF_OK;
+	}
+
+	if (ctx->passthrough) {
+		gf_filter_pck_forward(pck, ctx->opid);
+		gf_filter_pid_drop_packet(ctx->ipid);
+		return GF_OK;
+	}
+	//not yet configured
+	if (!ctx->ofmt && !ctx->o_w && !ctx->o_h)
+		return GF_OK;
+
+	if (!ctx->surf) {
+		gf_filter_pid_drop_packet(ctx->ipid);
+		return GF_NOT_SUPPORTED;
+	}
+
+	data = gf_filter_pck_get_data(pck, &isize);
+	frame_ifce = gf_filter_pck_get_frame_interface(pck);
+	//we may have buffer input (padding) but shall not have smaller
+	if (isize && (ctx->i_size > isize) ) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("EVGS Mismatch in source osize, expected %d got %d - stride issue ?\n", ctx->i_size, isize));
+		gf_filter_pid_drop_packet(ctx->ipid);
+		return GF_NOT_SUPPORTED;
+	}
+
+	dst_pck = gf_filter_pck_new_alloc(ctx->opid, ctx->o_size, &output);
+	if (!dst_pck) return GF_OUT_OF_MEM;
+
+	gf_filter_pck_merge_properties(pck, dst_pck);
+
+#define CHK_EXIT(_msg) if (e) {\
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("EVGS "_msg": %s\n", gf_error_to_string(e) )); \
+			gf_filter_pck_discard(dst_pck); \
+			gf_filter_pid_drop_packet(ctx->ipid); \
+			return e;\
+		}
+
+	GF_Err e;
+	e = gf_evg_surface_attach_to_buffer(ctx->surf, output, ctx->o_w, ctx->o_h, 0, ctx->o_stride, ctx->ofmt);
+	CHK_EXIT("Failed to create output surface");
+	//threading must be enabled once the surface is configured
+	gf_evg_enable_threading(ctx->surf, ctx->nbth);
+
+	if (ctx->offset_w || ctx->offset_h) {
+		u32 color = ctx->padclr ? gf_color_parse(ctx->padclr) : 0xFF000000;
+		e = gf_evg_surface_clear(ctx->surf, NULL, color);
+		CHK_EXIT("Failed to clear surface");
+	}
+
+	if (data) {
+		e = gf_evg_stencil_set_texture_planes(ctx->tx, ctx->i_w, ctx->i_h, ctx->i_pfmt, data, ctx->i_stride, NULL, NULL, ctx->i_stride_uv, NULL, 0);
+	} else if (frame_ifce && frame_ifce->get_plane) {
+		u32 i, stride_y=0, stride_uv=0, stride_a=0;
+		const u8 *pY=NULL, *pU=NULL, *pV=NULL, *pA=NULL;
+		for (i=0; i<ctx->i_planes; i++) {
+			const u8 *ptr;
+			u32 stride;
+			e = frame_ifce->get_plane(frame_ifce, i, (const u8 **) &ptr, &stride);
+			if (e) break;
+			if (!i) {
+				pY = ptr;
+				stride_y = stride;
+			} else if (ctx->i_has_alpha && (i+1==ctx->i_planes) ) {
+				pA = ptr;
+				stride_a = stride;
+			}
+			else if (i==1) {
+				pU = ptr;
+				stride_uv = stride;
+			} else {
+				pV = ptr;
+			}
+		}
+		if (!e)
+			e = gf_evg_stencil_set_texture_planes(ctx->tx, ctx->i_w, ctx->i_h, ctx->i_pfmt, pY, stride_y, pU, pV, stride_uv, pA, stride_a);
+	} else {
+		e = GF_NOT_SUPPORTED;
+	}
+	CHK_EXIT("Failed setup stencil from input packet");
+
+	e = gf_evg_surface_set_path(ctx->surf, ctx->path);
+	CHK_EXIT("Failed to set surface path");
+	e = gf_evg_surface_fill(ctx->surf, ctx->tx);
+	CHK_EXIT("Failed to fill surface");
+
+	gf_filter_pck_send(dst_pck);
+	gf_filter_pid_drop_packet(ctx->ipid);
+	return e;
+}
+
+static GF_Err evgs_configure_pid(GF_Filter *filter, GF_FilterPid *pid, Bool is_remove)
+{
+	const GF_PropertyValue *p;
+	u32 w, h, stride, stride_uv, ofmt;
+	GF_Fraction sar;
+	Bool fullrange=GF_FALSE;
+	EVGScaleCtx *ctx = gf_filter_get_udta(filter);
+
+	if (is_remove) {
+		if (ctx->opid) {
+			gf_filter_pid_remove(ctx->opid);
+			ctx->opid = NULL;
+		}
+		return GF_OK;
+	}
+	if (! gf_filter_pid_check_caps(pid))
+		return GF_NOT_SUPPORTED;
+
+	if (!ctx->opid) {
+		ctx->opid = gf_filter_pid_new(filter);
+	}
+
+	if (!ctx->ipid) {
+		ctx->ipid = pid;
+	}
+
+	//if nothing is set we, consider we run as an adaptation filter, wait for reconfiguration to be called to declare output format
+	if (!ctx->ofmt && !ctx->osize.x && !ctx->osize.y) {
+		//we were explicitly loaded, act as a passthrough filter until we get a reconfig
+		//we must do so for cases where the declared properties match the consuming format (so reconfiguration will never be called)
+		if (!gf_filter_is_dynamic(filter)) {
+			gf_filter_pid_copy_properties(ctx->opid, ctx->ipid);
+			//make sure we init at some default values as filters down the chain will check for w/h/pfmt
+			p = gf_filter_pid_get_property(pid, GF_PROP_PID_WIDTH);
+			if (!p) gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_WIDTH, &PROP_UINT(128));
+			p = gf_filter_pid_get_property(pid, GF_PROP_PID_HEIGHT);
+			if (!p) gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_HEIGHT, &PROP_UINT(128));
+			p = gf_filter_pid_get_property(pid, GF_PROP_PID_PIXFMT);
+			if (!p) gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_PIXFMT, &PROP_UINT(GF_PIXEL_RGB));
+
+			ctx->passthrough = GF_TRUE;
+			GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("EVGS Running in passthrough mode\n"));
+		}
+		return GF_OK;
+	}
+
+
+
+	w = h = ofmt = stride = stride_uv = 0;
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_WIDTH);
+	if (p) w = p->value.uint;
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_HEIGHT);
+	if (p) h = p->value.uint;
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_STRIDE);
+	if (p) stride = p->value.uint;
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_STRIDE_UV);
+	if (p) stride_uv = p->value.uint;
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_PIXFMT);
+	if (p) ofmt = p->value.uint;
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_SAR);
+	if (p) sar = p->value.frac;
+	else sar.den = sar.num = 1;
+
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_COLR_RANGE);
+	if (p) fullrange = p->value.boolean;
+
+	//ctx->ofmt may be 0 if the filter is instantiated dynamically, we haven't yet been called for reconfigure
+	if (!w || !h || !ofmt) {
+		return GF_OK;
+	}
+	//copy properties at init or reconfig
+	gf_filter_pid_copy_properties(ctx->opid, ctx->ipid);
+
+	if (!ctx->ofmt)
+		ctx->ofmt = ofmt;
+
+	ctx->passthrough = GF_FALSE;
+
+	Bool downsample_w=GF_FALSE, downsample_h=GF_FALSE;
+	switch (ofmt) {
+	case GF_PIXEL_YUV:
+	case GF_PIXEL_YVU:
+	case GF_PIXEL_YUV_10:
+	case GF_PIXEL_NV12:
+	case GF_PIXEL_NV21:
+	case GF_PIXEL_NV12_10:
+	case GF_PIXEL_NV21_10:
+	case GF_PIXEL_YUVA:
+	case GF_PIXEL_YUVD:
+		downsample_h=GF_TRUE;
+		//fallthrough
+	case GF_PIXEL_YUV422:
+	case GF_PIXEL_YUV422_10:
+	case GF_PIXEL_UYVY:
+	case GF_PIXEL_VYUY:
+	case GF_PIXEL_YUYV:
+	case GF_PIXEL_YVYU:
+	case GF_PIXEL_UYVY_10:
+	case GF_PIXEL_VYUY_10:
+	case GF_PIXEL_YUYV_10:
+	case GF_PIXEL_YVYU_10:
+		downsample_w = GF_TRUE;
+		break;
+
+	default:
+		break;
+	}
+
+	u32 scale_w = w;
+	if ((ctx->keepar == EVGS_KEEPAR_FULL) && (sar.num > (s32) sar.den)) {
+		scale_w = w * sar.num / sar.den;
+		sar.num=0;
+	}
+
+	if (!ctx->osize.x && !ctx->osize.y) {
+		ctx->o_w = w;
+		ctx->o_h = h;
+		scale_w = w;
+	}
+	else if (!ctx->osize.x) {
+		ctx->o_h = ctx->osize.y;
+		ctx->o_w = ctx->osize.y * scale_w / h;
+	}
+	else if (!ctx->osize.y) {
+		ctx->o_w = ctx->osize.x;
+		ctx->o_h = ctx->osize.x * h / scale_w;
+	} else {
+		ctx->o_w = ctx->osize.x;
+		ctx->o_h = ctx->osize.y;
+	}
+	ctx->offset_w = ctx->offset_h = 0;
+
+	u32 final_w = ctx->o_w;
+	u32 final_h = ctx->o_h;
+	if (ctx->keepar!=EVGS_KEEPAR_OFF) {
+		if (ctx->o_w * h < scale_w * ctx->o_h) {
+			final_h = ctx->o_w * h / scale_w;
+		} else if (ctx->o_w * h > scale_w * ctx->o_h) {
+			final_w = ctx->o_h * scale_w / h;
+		}
+	}
+	if (ctx->osar.num > (s32) ctx->osar.den) {
+		ctx->o_w = ctx->o_w * ctx->osar.den / ctx->osar.num;
+		final_w = final_w * ctx->osar.den / ctx->osar.num;
+		if (downsample_w) {
+			if (ctx->o_w % 2) ctx->o_w -= 1;
+			if (final_w % 2) final_w -= 1;
+		}
+	}
+	ctx->offset_w = (ctx->o_w - final_w) / 2;
+	ctx->offset_h = (ctx->o_h - final_h) / 2;
+
+	if (downsample_w && (ctx->offset_w % 2)) ctx->offset_w -= 1;
+	if (downsample_h && (ctx->offset_h % 2)) ctx->offset_h -= 1;
+
+	if ((ctx->i_w == w) && (ctx->i_h == h) && (ctx->i_pfmt == ofmt)
+		&& (ctx->i_stride == stride)
+		&& (ctx->i_stride_uv == stride_uv)
+		&& (ctx->fullrange==fullrange)
+	) {
+		//nothing to reconfigure
+	}
+	//passthrough mode
+	else if ((ctx->o_w == w) && (ctx->o_h == h) && (ofmt==ctx->ofmt) && (ctx->ofr == fullrange) ) {
+		ctx->o_stride = 0;
+		ctx->o_stride_uv = 0;
+		gf_pixel_get_size_info(ctx->ofmt, ctx->o_w, ctx->o_h, &ctx->o_size, &ctx->o_stride, &ctx->o_stride_uv, NULL, NULL);
+		ctx->passthrough = GF_TRUE;
+		GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("EVGS Running in passthrough mode\n"));
+	} else {
+		Bool res;
+		ctx->i_stride = stride;
+		ctx->i_stride_uv = stride_uv;
+
+		res = gf_evg_texture_format_ok(ofmt);
+		if (res)
+			res = gf_pixel_get_size_info(ofmt, w, h, &ctx->i_size, &ctx->i_stride, &ctx->i_stride_uv, &ctx->i_planes, NULL);
+		if (!res) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("EVGS Source pixel format %s not supported\n", gf_pixel_fmt_name(ofmt) ));
+			return GF_NOT_SUPPORTED;
+		}
+		ctx->i_has_alpha = gf_pixel_fmt_is_transparent(ofmt);
+
+		ctx->o_stride = 0;
+		ctx->o_stride_uv = 0;
+		res = gf_evg_surface_format_ok(ctx->ofmt);
+		if (res)
+			res = gf_pixel_get_size_info(ctx->ofmt, ctx->o_w, ctx->o_h, &ctx->o_size, &ctx->o_stride, NULL, NULL, NULL);
+
+		if (!res) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("EVGS Output pixel format %s not supported\n", gf_pixel_fmt_name(ctx->ofmt)));
+			return GF_NOT_SUPPORTED;
+		}
+
+		GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("EVGS Converting from %ux%u@%s to %ux%u@%s\n",
+			w, h, gf_pixel_fmt_name(ofmt),
+			ctx->o_w, ctx->o_h, gf_pixel_fmt_name(ctx->ofmt)
+		));
+
+
+		gf_path_reset(ctx->path);
+		gf_path_add_rect_center(ctx->path, 0, 0, INT2FIX(ctx->o_w - 2*ctx->offset_w), INT2FIX(ctx->o_h - 2*ctx->offset_h));
+
+		//set colorspace - TODO
+
+		ctx->i_w = w;
+		ctx->i_h = h;
+		ctx->i_pfmt = ofmt;
+		ctx->fullrange = fullrange;
+		GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("EVGS Setup rescaler from %dx%d fmt %s to %dx%d fmt %s\n", w, h, gf_pixel_fmt_name(ofmt), ctx->o_w, ctx->o_h, gf_pixel_fmt_name(ctx->ofmt)));
+	}
+
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_WIDTH, &PROP_UINT(ctx->o_w));
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_HEIGHT, &PROP_UINT(ctx->o_h));
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_STRIDE, &PROP_UINT(ctx->o_stride));
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_STRIDE_UV, ctx->o_stride_uv ? &PROP_UINT(ctx->o_stride_uv) : NULL );
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_CODECID, &PROP_UINT(GF_CODECID_RAW));
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_PIXFMT, &PROP_UINT(ctx->ofmt));
+
+	if (ctx->osar.num >= (s32) ctx->osar.den) {
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_SAR, &PROP_FRAC(ctx->osar) );
+	} else if (sar.num) {
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_SAR, &PROP_FRAC(sar) );
+	} else {
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_SAR, NULL );
+	}
+
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_CLAP_X, NULL);
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_CLAP_Y, NULL);
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_CLAP_W, NULL);
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_CLAP_H, NULL);
+
+	return GF_OK;
+}
+
+static GF_Err evgs_initialize(GF_Filter *filter)
+{
+	EVGScaleCtx *ctx = gf_filter_get_udta(filter);
+
+	ctx->surf = gf_evg_surface_new(GF_TRUE);
+	if (!ctx->surf) return GF_OUT_OF_MEM;
+
+	ctx->tx = gf_evg_stencil_new(GF_STENCIL_TEXTURE);
+	if (!ctx->tx) return GF_OUT_OF_MEM;
+	ctx->path = gf_path_new();
+	if (!ctx->path) return GF_OUT_OF_MEM;
+
+	if (ctx->osar.num &&
+	 ((ctx->osar.num<0) || (ctx->osar.num < (s32) ctx->osar.den))
+	) {
+		ctx->osar.num = 0;
+		ctx->osar.den = 1;
+	}
+	if (ctx->hq)
+		gf_evg_stencil_set_filter(ctx->tx, GF_TEXTURE_FILTER_HIGH_QUALITY );
+
+	return GF_OK;
+}
+static void evgs_finalize(GF_Filter *filter)
+{
+	EVGScaleCtx *ctx = gf_filter_get_udta(filter);
+	gf_evg_surface_delete(ctx->surf);
+	gf_evg_stencil_delete(ctx->tx);
+	gf_path_del(ctx->path);
+	return;
+}
+
+
+static GF_Err evgs_reconfigure_output(GF_Filter *filter, GF_FilterPid *pid)
+{
+	const GF_PropertyValue *p;
+	EVGScaleCtx *ctx = gf_filter_get_udta(filter);
+	if (ctx->opid != pid) return GF_BAD_PARAM;
+
+	p = gf_filter_pid_caps_query(pid, GF_PROP_PID_WIDTH);
+	if (p) ctx->osize.x = p->value.uint;
+
+	p = gf_filter_pid_caps_query(pid, GF_PROP_PID_HEIGHT);
+	if (p) ctx->osize.y = p->value.uint;
+
+	p = gf_filter_pid_caps_query(pid, GF_PROP_PID_PIXFMT);
+	if (p) ctx->ofmt = p->value.uint;
+	return evgs_configure_pid(filter, ctx->ipid, GF_FALSE);
+}
+
+
+#define OFFS(_n)	#_n, offsetof(EVGScaleCtx, _n)
+static GF_FilterArgs EVGSArgs =
+{
+	{ OFFS(osize), "osize of output video", GF_PROP_VEC2I, NULL, NULL, 0},
+	{ OFFS(ofmt), "pixel format for output video. When not set, input format is used", GF_PROP_PIXFMT, "none", NULL, 0},
+	{ OFFS(ofr), "force output full range", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_EXPERT},
+	{ OFFS(keepar), "keep aspect ratio\n"
+	"- off: ignore aspect ratio\n"
+	"- full: respect aspect ratio, applying input sample aspect ratio info\n"
+	"- nosrc: respect aspect ratio but ignore input sample aspect ratio"
+	, GF_PROP_UINT, "off", "off|full|nosrc", GF_FS_ARG_HINT_EXPERT},
+	{ OFFS(padclr), "clear color when aspect ration preservation is used", GF_PROP_STRING, "black", NULL, GF_FS_ARG_HINT_EXPERT},
+	{ OFFS(osar), "force output pixel aspect ratio", GF_PROP_FRACTION, "0/1", NULL, GF_FS_ARG_HINT_EXPERT},
+	{ OFFS(nbth), "number of threads to use, -1 means all cores", GF_PROP_SINT, "-1", NULL, GF_FS_ARG_HINT_EXPERT},
+	{ OFFS(hq), "use bilinear interpolation instead of closest pixel", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_EXPERT},
+
+	{0}
+};
+
+static const GF_FilterCapability EVGSCaps =
+{
+	CAP_UINT(GF_CAPS_INPUT_OUTPUT,GF_PROP_PID_STREAM_TYPE, GF_STREAM_VISUAL),
+	CAP_UINT(GF_CAPS_INPUT_OUTPUT,GF_PROP_PID_CODECID, GF_CODECID_RAW)
+};
+
+
+GF_FilterRegister EVGSRegister = {
+	.name = "evgs",
+	GF_FS_SET_DESCRIPTION("EVG video rescaler")
+	GF_FS_SET_HELP("This filter rescales raw video data using GPAC's EVG library to the specified size and pixel format.\n"
+	"## Output size assignment\n"
+	"If -osize() is {0,0}, the output dimensions will be set to the input size, and input aspect ratio will be ignored.\n"
+	"\n"
+	"If -osize() is {0,H} (resp. {W,0}), the output width (resp. height) will be set to respect input aspect ratio. If -keepar=nosrc(), input sample aspect ratio is ignored.\n"
+	"## Aspect Ratio and Sample Aspect Ratio\n"
+	"When output sample aspect ratio is set, the output dimensions are divided by the output sample aspect ratio.\n"
+	"EX evgs:osize=288x240:osar=3/2\n"
+	"The output dimensions will be 192x240.\n"
+	"\n"
+	"When aspect ratio is not kept (-keepar=off()):\n"
+	"- source is resampled to desired dimensions\n"
+	"- if output aspect ratio is not set, output will use source sample aspect ratio\n"
+	"\n"
+	"When aspect ratio is partially kept (-keepar=nosrc()):\n"
+	"- resampling is done on the input data without taking input sample aspect ratio into account\n"
+	"- if output sample aspect ratio is not set (-osar=0/N()), source aspect ratio is forwarded to output.\n"
+	"\n"
+	"When aspect ratio is fully kept (-keepar=full()), output aspect ratio is force to 1/1 if not set.\n"
+	"\n"
+	"When sample aspect ratio is kept, the filter will:\n"
+	"- center the rescaled input frame on the output frame\n"
+	"- fill extra pixels with -padclr()\n"
+	)
+	.private_size = sizeof(EVGScaleCtx),
+	.args = EVGSArgs,
+	.configure_pid = evgs_configure_pid,
+	SETCAPS(EVGSCaps),
+	.flags = GF_FS_REG_ALLOW_CYCLIC,
+	.initialize = evgs_initialize,
+	.finalize = evgs_finalize,
+	.process = evgs_process,
+	.reconfigure_output = evgs_reconfigure_output,
+	//use low priority in case we have other scalers (ffsws is faster)
+	.priority = 128,
+};
+
+#endif //GPAC_DISABLE_EVG
+
+const GF_FilterRegister *evgs_register(GF_FilterSession *session)
+{
+#ifndef GPAC_DISABLE_EVG
+	return &EVGSRegister;
+#else
+	return NULL;
+#endif
+}
+

gpac-2.2.1.tar.gz/src/filters/ff_avf.c -> gpac-2.4.0.tar.gz/src/filters/ff_avf.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom Paris 2019-2022
+ *			Copyright (c) Telecom Paris 2019-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / ffmpeg avfilter filter
@@ -25,7 +25,7 @@
 
 #include <gpac/setup.h>
 
-#ifdef GPAC_HAS_FFMPEG
+#if defined(GPAC_HAS_FFMPEG) && !defined(FFMPEG_DISABLE_AVFILTER)
 
 #include "ff_common.h"
 #include <gpac/network.h>
@@ -39,13 +39,13 @@
 
 #endif
 
-#ifdef GPAC_HAS_FFMPEG
+#if defined(GPAC_HAS_FFMPEG) && !defined(FFMPEG_DISABLE_AVFILTER)
 
 typedef struct
 {
 	AVFilterContext *io_filter_ctx;
 	GF_FilterPid *io_pid;
-	u32 timescale, width, height, sr, nb_ch, bps;
+	u32 timescale, width, height, sr, nb_ch, bps, bpp;
 	Bool planar;
 	u32 pfmt; //ffmpeg pixel or audio format
 	u64 ch_layout; //ffmpeg channel layout
@@ -119,6 +119,8 @@
 			   "time_base=%d/%d:sample_rate=%d:sample_fmt=%s:channel_layout=0x"LLU,
 			   1, avpid->timescale, avpid->sr, av_get_sample_fmt_name(avpid->pfmt), avpid->ch_layout);
 	}
+	//destroy filter (will remove from graph)
+	if (avpid->io_filter_ctx) avfilter_free(avpid->io_filter_ctx);
 	avpid->io_filter_ctx = NULL;
 	ret = avfilter_graph_create_filter(&avpid->io_filter_ctx, avf, pid_name, args, NULL, ctx->filter_graph);
 	if (ret<0) {
@@ -169,6 +171,10 @@
 				gf_filter_pid_set_property(opid->io_pid, GF_PROP_PID_NUM_CHANNELS, NULL);
 				gf_filter_pid_set_property(opid->io_pid, GF_PROP_PID_AUDIO_BPS, NULL);
 				gf_filter_pid_set_property(opid->io_pid, GF_PROP_PID_AUDIO_FORMAT, NULL);
+
+				//until configured do not advertize width/height to avoid filters setup down the chain
+				gf_filter_pid_set_property(opid->io_pid, GF_PROP_PID_WIDTH, NULL);
+				gf_filter_pid_set_property(opid->io_pid, GF_PROP_PID_HEIGHT, NULL);
 			} else {
 				gf_filter_pid_set_property(opid->io_pid, GF_PROP_PID_STREAM_TYPE, &PROP_UINT(GF_STREAM_AUDIO));
 				gf_filter_pid_set_property(opid->io_pid, GF_PROP_PID_WIDTH, NULL);
@@ -182,6 +188,10 @@
 				gf_filter_pid_set_property(opid->io_pid, GF_PROP_PID_COLR_RANGE, NULL);
 				gf_filter_pid_set_property(opid->io_pid, GF_PROP_PID_COLR_TRANSFER, NULL);
 				gf_filter_pid_set_property(opid->io_pid, GF_PROP_PID_COLR_PRIMARIES, NULL);
+
+				//until configured do not advertize SR/channels to avoid filters setup down the chain
+				gf_filter_pid_set_property(opid->io_pid, GF_PROP_PID_SAMPLE_RATE, NULL);
+				gf_filter_pid_set_property(opid->io_pid, GF_PROP_PID_NUM_CHANNELS, NULL);
 			}
 			gf_filter_pid_set_property(opid->io_pid, GF_PROP_PID_CODECID, &PROP_UINT(GF_CODECID_RAW));
 			gf_filter_pid_set_property(opid->io_pid, GF_PROP_PID_FILE_EXT, NULL);
@@ -304,7 +314,7 @@
 			char *sep = strstr(desc, avf->filter->name);
 			if (sep) {
 				u32 slen = (u32) strlen(avf->filter->name);
-				if ((sepslen==',') || !sepslen) continue;;
+				if ((sepslen==',') || !sepslen) continue;
 			}
 		}
 		gf_dynstrcat(&desc, avf->filter->name, " ");
@@ -572,8 +582,14 @@
 				ctx->frame->sample_aspect_ratio.num = ipid->sar.num;
 				ctx->frame->sample_aspect_ratio.den = ipid->sar.den;
 			} else {
+#ifdef FFMPEG_OLD_CHLAYOUT
 				ctx->frame->channel_layout = ipid->ch_layout;
 				ctx->frame->channels = ipid->nb_ch;
+#else
+				ctx->frame->ch_layout.order = AV_CHANNEL_ORDER_NATIVE;
+				ctx->frame->ch_layout.nb_channels = ipid->nb_ch;
+				ctx->frame->ch_layout.u.mask = ipid->ch_layout;
+#endif
 				ctx->frame->sample_rate = ipid->sr;
 				ctx->frame->format = ipid->pfmt;
 				ctx->frame->nb_samples = data_size / ipid->nb_ch / ipid->bps;
@@ -669,6 +685,7 @@
 				opid->tb_num = opid->io_filter_ctx->inputs0->time_base.num;
 				opid->stride = 0;
 				opid->stride_uv = 0;
+				opid->bpp = gf_pixel_get_bytes_per_pixel(opid->gf_pfmt);
 				gf_pixel_get_size_info(opid->gf_pfmt, opid->width, opid->height, &opid->out_size, &opid->stride, &opid->stride_uv, NULL, &opid->uv_height);
 				if ((opid->gf_pfmt==GF_PIXEL_YUV444) || (opid->gf_pfmt==GF_PIXEL_YUV444_10)) {
 					opid->uv_width = opid->width;
@@ -685,24 +702,24 @@
 			if (!pck) return GF_OUT_OF_MEM;
 
 			for (j=0; j<opid->height; j++) {
-				memcpy(buffer + j*opid->stride, frame->data0 + j*frame->linesize0, opid->width);
+				memcpy(buffer + j*opid->stride, frame->data0 + j*frame->linesize0, opid->width*opid->bpp);
 			}
 			if (frame->linesize1) {
 				buffer += opid->height*opid->stride;
 				for (j=0; j<opid->uv_height; j++) {
-					memcpy(buffer + j*opid->stride_uv, frame->data1 + j*frame->linesize1, opid->uv_width);
+					memcpy(buffer + j*opid->stride_uv, frame->data1 + j*frame->linesize1, opid->uv_width*opid->bpp);
 				}
 			}
 			if (frame->linesize2) {
 				buffer += opid->uv_height*opid->stride_uv;
 				for (j=0; j<opid->uv_height; j++) {
-					memcpy(buffer + j*opid->stride_uv, frame->data2 + j*frame->linesize2, opid->uv_width);
+					memcpy(buffer + j*opid->stride_uv, frame->data2 + j*frame->linesize2, opid->uv_width*opid->bpp);
 				}
 			}
 			if (frame->linesize3) {
 				buffer += opid->uv_height*opid->stride_uv;
 				for (j=0; j<opid->height; j++) {
-					memcpy(buffer + j*opid->stride, frame->data3 + j*frame->linesize3, opid->width);
+					memcpy(buffer + j*opid->stride, frame->data3 + j*frame->linesize3, opid->width*opid->bpp);
 				}
 			}
 			if (frame->interlaced_frame)
@@ -717,24 +734,36 @@
 			GF_FilterPacket *pck;
 			Bool update_props=GF_TRUE;
 			if (frame->sample_rate!=opid->sr) {}
+#ifdef FFMPEG_OLD_CHLAYOUT
 			else if (frame->channel_layout!=opid->ch_layout) {}
 			else if (frame->channels != opid->nb_ch) {}
+#else
+			else if (frame->ch_layout.u.mask!=opid->ch_layout) {}
+			else if (frame->ch_layout.nb_channels != opid->nb_ch) {}
+#endif
 			else if (frame->format != opid->pfmt) {}
 			else {
 				update_props = GF_FALSE;
 			}
 			if (update_props) {
-				u64 gpac_ch_layout = ffmpeg_channel_layout_to_gpac(frame->channel_layout);
+#ifdef FFMPEG_OLD_CHLAYOUT
+				u32 nb_ch = frame->channels;
+				u64 ff_ch_layout = frame->channel_layout;
+#else
+				u32 nb_ch = frame->ch_layout.nb_channels;
+				u64 ff_ch_layout = (frame->ch_layout.order>=AV_CHANNEL_ORDER_CUSTOM) ? 0 : frame->ch_layout.u.mask;
+#endif
+				u64 gpac_ch_layout = ffmpeg_channel_layout_to_gpac(ff_ch_layout);
 				gf_filter_pid_set_property(opid->io_pid, GF_PROP_PID_SAMPLE_RATE, &PROP_UINT(frame->sample_rate));
 				gf_filter_pid_set_property(opid->io_pid, GF_PROP_PID_CHANNEL_LAYOUT, &PROP_LONGUINT(gpac_ch_layout));
-				gf_filter_pid_set_property(opid->io_pid, GF_PROP_PID_NUM_CHANNELS, &PROP_UINT(frame->channels));
+				gf_filter_pid_set_property(opid->io_pid, GF_PROP_PID_NUM_CHANNELS, &PROP_UINT(nb_ch));
 				opid->gf_pfmt = ffmpeg_audio_fmt_to_gpac(frame->format);
 				gf_filter_pid_set_property(opid->io_pid, GF_PROP_PID_AUDIO_FORMAT, &PROP_UINT(opid->gf_pfmt));
 				gf_filter_pid_set_property(opid->io_pid, GF_PROP_PID_TIMESCALE, &PROP_UINT(opid->io_filter_ctx->inputs0->time_base.den) );
 
 				opid->sr = frame->sample_rate;
-				opid->ch_layout = frame->channel_layout;
-				opid->nb_ch = frame->channels;
+				opid->ch_layout = ff_ch_layout;
+				opid->nb_ch = nb_ch;
 				opid->pfmt = frame->format;
 				opid->tb_num = opid->io_filter_ctx->inputs0->time_base.num;
 				opid->bps = gf_audio_fmt_bit_depth(opid->gf_pfmt) / 8;
@@ -879,8 +908,15 @@
 		p = gf_filter_pid_get_property(pid, GF_PROP_PID_NUM_CHANNELS);
 		if (!p) return GF_OK; //not ready yet
 		nb_ch = p->value.uint;
-		if (!ch_layout) ch_layout = av_get_default_channel_layout(p->value.uint);
-
+		if (!ch_layout) {
+#ifdef FFMPEG_OLD_CHLAYOUT
+			ch_layout = av_get_default_channel_layout(p->value.uint);
+#else
+			AVChannelLayout ff_ch_layout;
+			av_channel_layout_default(&ff_ch_layout, p->value.uint);
+			ch_layout = ff_ch_layout.u.mask;
+#endif
+		}
 		p = gf_filter_pid_get_property(pid, GF_PROP_PID_SAMPLE_RATE);
 		if (!p) return GF_OK; //not ready yet
 		sr = p->value.uint;
@@ -1045,7 +1081,7 @@
 
 GF_FilterRegister FFAVFilterRegister = {
 	.name = "ffavf",
-	.version = LIBAVFORMAT_IDENT,
+	.version = LIBAVFILTER_IDENT,
 	GF_FS_SET_DESCRIPTION("FFMPEG AVFilter")
 	GF_FS_SET_HELP("This filter provides libavfilter raw audio and video tools.\n"
 		"See FFMPEG documentation (https://ffmpeg.org/documentation.html) for more details\n"

gpac-2.2.1.tar.gz/src/filters/ff_bsf.c -> gpac-2.4.0.tar.gz/src/filters/ff_bsf.c Changed

gpac-2.2.1.tar.gz/src/filters/ff_common.c -> gpac-2.4.0.tar.gz/src/filters/ff_common.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2017-2022
+ *			Copyright (c) Telecom ParisTech 2017-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / common ffmpeg filters
@@ -29,7 +29,10 @@
 
 #include "ff_common.h"
 
+#ifndef FFMPEG_DISABLE_AVFILTER
 #include <libavfilter/avfilter.h>
+#endif
+
 #include <gpac/isomedia.h>
 #include <gpac/internal/media_dev.h>
 
@@ -38,9 +41,13 @@
 #  pragma comment(lib, "avutil")
 #  pragma comment(lib, "avformat")
 #  pragma comment(lib, "avcodec")
-#  pragma comment(lib, "avdevice")
 #  pragma comment(lib, "swscale")
+#ifndef FFMPEG_DISABLE_AVDEVICE
+#  pragma comment(lib, "avdevice")
+#endif
+#ifndef FFMPEG_DISABLE_AVFILTER
 #  pragma comment(lib, "avfilter")
+#endif
 # endif
 #endif
 
@@ -115,6 +122,18 @@
 	if (p && (p->type==GF_PROP_STRING) && p->value.string && !strstr(p->value.string, "@GPAC")) {
 		av_dict_set(metadata, "title", p->value.string, 0);
 	}
+	u32 idx=0;
+	while (1) {
+		u32 p4cc;
+		const char *pname, *res;
+		char dumpGF_PROP_DUMP_ARG_SIZE;
+		p = gf_filter_pid_enum_properties(pid, &idx, &p4cc, &pname);
+		if (!p) break;
+		if (p4cc) continue;
+		if (strncmp(pname, "meta:", 5)) continue;
+		res = gf_props_dump_val(p, dump, GF_PROP_DUMP_DATA_INFO, NULL);
+		if (res) av_dict_set(metadata, pname+5, res, 0);
+	}
 }
 
 void ffmpeg_tags_to_gpac(AVDictionary *metadata, GF_FilterPid *pid)
@@ -124,7 +143,8 @@
 		ent = av_dict_get(metadata, "", ent, AV_DICT_IGNORE_SUFFIX);
 		if (!ent) break;
 		if (!strncmp(ent->key, "NUMBER_OF_FRAMES", 16)) {
-			gf_filter_pid_set_property(pid, GF_PROP_PID_NB_FRAMES, &PROP_UINT( atoi(ent->value) ) );
+			//don't export this info, is it often unreliable and exporting it would break import progress in mp4mx
+//			gf_filter_pid_set_property(pid, GF_PROP_PID_NB_FRAMES, &PROP_UINT( atoi(ent->value) ) );
 			continue;
 		}
 		if (!strncmp(ent->key, "_STATISTICS_WRITING_APP", 23)) {
@@ -235,7 +255,7 @@
 			return FF2GPAC_PixelFormatsi.ff_pf;
 		i++;
 	}
-	if (!no_warn) {
+	if (!no_warn && (pfmt!=AV_PIX_FMT_NONE)) {
 		GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("FFMPEG Unmapped GPAC pixel format %s, patch welcome\n", gf_4cc_to_str(pfmt) ));
 	}
 	return AV_PIX_FMT_NONE;
@@ -245,7 +265,9 @@
 {
 	const AVPixFmtDescriptor *ffdesc = av_pix_fmt_desc_get(pfmt);
 	if (!ffdesc) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("FFMPEG Unrecognized FFMPEG pixel format %d\n", pfmt ));
+		if (!no_warn && (pfmt!=AV_PIX_FMT_NONE)) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("FFMPEG Unrecognized FFMPEG pixel format %d\n", pfmt ));
+		}
 		return 0;
 	}
 	u32 i=0;
@@ -254,7 +276,7 @@
 			return FF2GPAC_PixelFormatsi.gpac_pf;
 		i++;
 	}
-	if (!no_warn) {
+	if (!no_warn && (pfmt!=AV_PIX_FMT_NONE)) {
 		GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("FFMPEG Unmapped FFMPEG pixel format %s, patch welcome\n", ffdesc->name));
 	}
 	return 0;
@@ -398,6 +420,7 @@
 	u32 ff_codec_id;
 	u32 gpac_codec_id;
 	u32 ff_codectag;
+	u32 gpac_audio_format;
 } GF_FF_CIDREG;
 
 static const GF_FF_CIDREG FF2GPAC_CodecIDs =
@@ -452,30 +475,30 @@
 
 	//RAW codecs
 	{AV_CODEC_ID_RAWVIDEO, GF_CODECID_RAW, 0},
-	{AV_CODEC_ID_PCM_S16LE, GF_CODECID_RAW, 0},
-	{AV_CODEC_ID_PCM_S16BE, GF_CODECID_RAW, 0},
+	{AV_CODEC_ID_PCM_S16LE, GF_CODECID_RAW, 0, GF_AUDIO_FMT_S16},
+	{AV_CODEC_ID_PCM_S16BE, GF_CODECID_RAW, 0, GF_AUDIO_FMT_S16_BE},
 	{AV_CODEC_ID_PCM_U16LE, GF_CODECID_RAW, 0},
 	{AV_CODEC_ID_PCM_U16BE, GF_CODECID_RAW, 0},
 	{AV_CODEC_ID_PCM_S8, GF_CODECID_RAW, 0},
-	{AV_CODEC_ID_PCM_U8, GF_CODECID_RAW, 0},
+	{AV_CODEC_ID_PCM_U8, GF_CODECID_RAW, 0, GF_AUDIO_FMT_U8},
 	{AV_CODEC_ID_PCM_MULAW, GF_CODECID_RAW, 0},
 	{AV_CODEC_ID_PCM_ALAW, GF_CODECID_RAW, 0},
-	{AV_CODEC_ID_PCM_S32LE, GF_CODECID_RAW, 0},
-	{AV_CODEC_ID_PCM_S32BE, GF_CODECID_RAW, 0},
+	{AV_CODEC_ID_PCM_S32LE, GF_CODECID_RAW, 0, GF_AUDIO_FMT_S32},
+	{AV_CODEC_ID_PCM_S32BE, GF_CODECID_RAW, 0, GF_AUDIO_FMT_S32_BE},
 	{AV_CODEC_ID_PCM_U32LE, GF_CODECID_RAW, 0},
 	{AV_CODEC_ID_PCM_U32BE, GF_CODECID_RAW, 0},
-	{AV_CODEC_ID_PCM_S24LE, GF_CODECID_RAW, 0},
-	{AV_CODEC_ID_PCM_S24BE, GF_CODECID_RAW, 0},
+	{AV_CODEC_ID_PCM_S24LE, GF_CODECID_RAW, 0, GF_AUDIO_FMT_S24},
+	{AV_CODEC_ID_PCM_S24BE, GF_CODECID_RAW, 0, GF_AUDIO_FMT_S24_BE},
 	{AV_CODEC_ID_PCM_U24LE, GF_CODECID_RAW, 0},
 	{AV_CODEC_ID_PCM_U24BE, GF_CODECID_RAW, 0},
 	{AV_CODEC_ID_PCM_S24DAUD, GF_CODECID_RAW, 0},
 	{AV_CODEC_ID_PCM_ZORK, GF_CODECID_RAW, 0},
 	{AV_CODEC_ID_PCM_S16LE_PLANAR, GF_CODECID_RAW, 0},
 	{AV_CODEC_ID_PCM_DVD, GF_CODECID_RAW, 0},
-	{AV_CODEC_ID_PCM_F32BE, GF_CODECID_RAW, 0},
-	{AV_CODEC_ID_PCM_F32LE, GF_CODECID_RAW, 0},
-	{AV_CODEC_ID_PCM_F64BE, GF_CODECID_RAW, 0},
-	{AV_CODEC_ID_PCM_F64LE, GF_CODECID_RAW, 0},
+	{AV_CODEC_ID_PCM_F32BE, GF_CODECID_RAW, 0, GF_AUDIO_FMT_FLT},
+	{AV_CODEC_ID_PCM_F32LE, GF_CODECID_RAW, 0, GF_AUDIO_FMT_FLT_BE},
+	{AV_CODEC_ID_PCM_F64BE, GF_CODECID_RAW, 0, GF_AUDIO_FMT_DBL},
+	{AV_CODEC_ID_PCM_F64LE, GF_CODECID_RAW, 0, GF_AUDIO_FMT_DBL_BE},
 	{AV_CODEC_ID_PCM_BLURAY, GF_CODECID_RAW, 0},
 	{AV_CODEC_ID_PCM_LXF, GF_CODECID_RAW, 0},
 	{AV_CODEC_ID_S302M, GF_CODECID_RAW, 0},
@@ -506,6 +529,7 @@
 	{AV_CODEC_ID_DVB_TELETEXT, GF_CODECID_DVB_TELETEXT, 0},
 	{AV_CODEC_ID_MSMPEG4V3, GF_CODECID_MSPEG4_V3, 0},
 	{AV_CODEC_ID_DTS, GF_CODECID_DTS_CA, 0},
+	{AV_CODEC_ID_DTS, GF_CODECID_DTS_EXPRESS_LBR, 0},
 	{AV_CODEC_ID_ALAC, GF_CODECID_ALAC, 0},
 	{0}
 };
@@ -546,6 +570,16 @@
 	return 0;
 }
 
+u32 ffmpeg_codecid_to_gpac_audio_fmt(u32 codec_id)
+{
+	u32 i=0;
+	while (FF2GPAC_CodecIDsi.ff_codec_id) {
+		if (FF2GPAC_CodecIDsi.ff_codec_id == codec_id)
+			return FF2GPAC_CodecIDsi.gpac_audio_format;
+		i++;
+	}
+	return 0;
+}
 
 typedef struct
 {
@@ -650,13 +684,14 @@
 }
 
 #define FF_LOG_SIZE 2000
+Bool ff_probe_mode=GF_FALSE;
 static void ff_log_callback(void *avcl, int level, const char *fmt, va_list vl)
 {
 	AVClass* avc = avcl ? *(AVClass**)avcl : NULL;
 	GF_LOG_Level glevel = ffmpeg_to_gpac_log_level(level);
 	GF_LOG_Tool gtool = gpac_to_ffmpeg_log_tool(avc);
 
-	if (!gf_log_tool_level_on(gtool, glevel))
+	if (!gf_log_tool_level_on(gtool, glevel) || ff_probe_mode)
 		return;
 	gf_log_lt(glevel, gtool);
 
@@ -765,16 +800,24 @@
 	arg.arg_desc = opt->help;
 	arg.offset_in_private=-1;
 	arg.flags = GF_FS_ARG_META;
-	if (opt->name0 == 0)
-		arg.flags = GF_FS_ARG_META;
 
 	if (!(opt->flags & AV_OPT_FLAG_READONLY))
 		arg.flags |= GF_FS_ARG_UPDATE;
 
-	switch (opt->type) {
+#if AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, LIBAVUTIL_VERSION_MINOR, 0) > AV_VERSION_INT(59,0, 0)
+	u32 type = opt->type & ~AV_OPT_TYPE_FLAG_ARRAY;
+	if (opt->type & AV_OPT_TYPE_FLAG_ARRAY)
+		arg.flags |= GF_FS_ARG_META_ARRAY;
+#else
+	u32 type = opt->type;
+#endif
+
+	switch (type) {
 	case AV_OPT_TYPE_INT64:
 	case AV_OPT_TYPE_INT:
+#ifdef FFMPEG_OLD_CHLAYOUT
 	case AV_OPT_TYPE_CHANNEL_LAYOUT:
+#endif
 		if (opt->type==AV_OPT_TYPE_INT64) arg.arg_type = GF_PROP_LSINT;
 		else if (opt->type==AV_OPT_TYPE_INT) arg.arg_type = GF_PROP_SINT;
 		else arg.arg_type = GF_PROP_UINT; //channel layout, map to int
@@ -918,7 +961,8 @@
 #if (LIBAVFILTER_VERSION_MAJOR > 5)
 	const AVFilter *avf = NULL;
 #endif
-#if (LIBAVCODEC_VERSION_MAJOR >= 58) && (LIBAVCODEC_VERSION_MINOR>=20)
+
+#if !defined(FFMPEG_DISABLE_AVDEVICE) && (LIBAVCODEC_VERSION_MAJOR >= 58) && (LIBAVCODEC_VERSION_MINOR>=20)
 	Bool audio_pass = GF_FALSE;
 #endif
 
@@ -932,11 +976,13 @@
 		fname = "ffdec";
 		flags=AV_OPT_FLAG_DECODING_PARAM;
 	}
+#ifndef FFMPEG_DISABLE_AVDEVICE
 	else if (type==FF_REG_TYPE_DEV_IN) {
 		fname = "ffavin";
 		avdevice_register_all();
 		flags=AV_OPT_FLAG_VIDEO_PARAM|AV_OPT_FLAG_AUDIO_PARAM|AV_OPT_FLAG_DECODING_PARAM;
 	}
+#endif
 	else if (type==FF_REG_TYPE_ENCODE) {
 		fname = "ffenc";
 		flags=AV_OPT_FLAG_ENCODING_PARAM;
@@ -1015,7 +1061,9 @@
 #ifndef GPAC_DISABLE_DOC
 			description = codec->long_name;
 #endif
-		} else if (type==FF_REG_TYPE_DEV_IN) {
+		}
+#ifndef FFMPEG_DISABLE_AVDEVICE
+		else if (type==FF_REG_TYPE_DEV_IN) {
 #if (LIBAVCODEC_VERSION_MAJOR >= 58) && (LIBAVCODEC_VERSION_MINOR>=20)
 			if (audio_pass) {
 				fmt = av_input_audio_device_next(FF_IFMT_CAST fmt);
@@ -1069,7 +1117,9 @@
 			else if (!stricmp(subname, "vfw")) {}
 			else continue;
 #endif
-		} else if (type==FF_REG_TYPE_ENCODE) {
+		}
+#endif
+		else if (type==FF_REG_TYPE_ENCODE) {
 #if (LIBAVFORMAT_VERSION_MAJOR<59)
 			codec = av_codec_next(codec);
 #else
@@ -1096,7 +1146,7 @@
 #endif
 
 			{
-#if (LIBAVFILTER_VERSION_MAJOR > 6)
+#if (LIBAVFORMAT_VERSION_MAJOR >= 59)
 				ofmt = av_muxer_iterate(&av_it);
 #else
 				ofmt = av_oformat_next(ofmt);
@@ -1466,7 +1516,7 @@
 	ffmpeg_initialize();
 
 #ifndef GPAC_DISABLE_DOC
-	orig_reg->author = avfilter_configuration();
+	orig_reg->author = avcodec_configuration();
 #endif
 
 	//by default no need to load option descriptions, everything is handled by av_set_opt in update_args
@@ -1605,7 +1655,7 @@
 					continue;
 				}
 			}
-			assert(nb_args>i);
+			gf_assert(nb_args>i);
 			argsi = ffmpeg_arg_translate(opt);
 			i++;
 		}
@@ -1854,7 +1904,11 @@
 		//fallthrough
 	}
 	if (gpac_codec_id==GF_CODECID_SMPTE_VC1) {
+#ifndef GPAC_DISABLE_AV_PARSERS
 		return gf_media_vc1_seq_header_to_dsi(data, size, dsi_out, dsi_out_size);
+#else
+		return GF_NOT_SUPPORTED;
+#endif
 	}
 
 	//default is direct mapping
@@ -1871,6 +1925,7 @@
 
 void ffmpeg_generate_gpac_dsi(GF_FilterPid *out_pid, u32 gpac_codec_id, u32 color_primaries, u32 transfer_characteristics, u32 colorspace, const u8 *data, u32 size)
 {
+#ifndef GPAC_DISABLE_AV_PARSERS
 	GF_VPConfig *vpc=NULL;
 	GF_AC3Header ac3hdr;
 	u32 dsi_size=0;
@@ -1991,6 +2046,7 @@
 
 	if (dsi)
 		gf_filter_pid_set_property(out_pid, GF_PROP_PID_DECODER_CONFIG, &PROP_DATA_NO_COPY(dsi, dsi_size));
+#endif
 }
 
 #if (LIBAVCODEC_VERSION_MAJOR > 56)
@@ -2043,12 +2099,21 @@
 	}
 	else if (streamtype==GF_STREAM_AUDIO) {
 		u64 ch_layout;
-		u32 samplerate=0;
+		u32 nb_ch=0, samplerate=0;
 
 		p = gf_filter_pid_get_property(pid, GF_PROP_PID_SAMPLE_RATE);
 		if (p) codecpar->sample_rate = samplerate = p->value.uint;
 		p = gf_filter_pid_get_property(pid, GF_PROP_PID_NUM_CHANNELS);
-		if (p) codecpar->channels = p->value.uint;
+		if (p) {
+			nb_ch = p->value.uint;
+#ifdef FFMPEG_OLD_CHLAYOUT
+			codecpar->channels = p->value.uint;
+#else
+			codecpar->ch_layout.order = AV_CHANNEL_ORDER_NATIVE;
+			codecpar->ch_layout.nb_channels = p->value.uint;
+#endif
+		}
+
 		p = gf_filter_pid_get_property(pid, GF_PROP_PID_SAMPLES_PER_FRAME);
 		if (p) codecpar->frame_size = p->value.uint;
 		p = gf_filter_pid_get_property(pid, GF_PROP_PID_AUDIO_BPS);
@@ -2062,10 +2127,13 @@
 		p = gf_filter_pid_get_property(pid, GF_PROP_PID_CHANNEL_LAYOUT);
 		if (p)
 			ch_layout = p->value.longuint;
-		else if (codecpar->channels==2)
+		else if (nb_ch==2)
 			ch_layout = GF_AUDIO_CH_FRONT_LEFT|GF_AUDIO_CH_FRONT_RIGHT;
+#ifdef FFMPEG_OLD_CHLAYOUT
 		codecpar->channel_layout = ffmpeg_channel_layout_from_gpac(ch_layout);
-
+#else
+		codecpar->ch_layout.u.mask = ffmpeg_channel_layout_from_gpac(ch_layout);
+#endif
 		p = gf_filter_pid_get_property(pid, GF_PROP_PID_DELAY);
 		if (p && (p->value.sint<0) && samplerate) {
 			s64 pad = -p->value.longsint;
@@ -2090,26 +2158,29 @@
 	if (codecpar->width)
 		gf_filter_pid_set_property(opid, GF_PROP_PID_WIDTH, &PROP_UINT(codecpar->width));
 	if (codecpar->height)
-		gf_filter_pid_set_property(opid, GF_PROP_PID_WIDTH, &PROP_UINT(codecpar->height));
+		gf_filter_pid_set_property(opid, GF_PROP_PID_HEIGHT, &PROP_UINT(codecpar->height));
 	if (codecpar->sample_aspect_ratio.num) {
 		gf_filter_pid_set_property(opid, GF_PROP_PID_SAR, &PROP_FRAC_INT(codecpar->sample_aspect_ratio.num, codecpar->sample_aspect_ratio.den));
 	}
-	if (codecpar->color_primaries)
-		gf_filter_pid_set_property(opid, GF_PROP_PID_COLR_PRIMARIES, &PROP_UINT(codecpar->color_primaries));
+	//not supported by all versions of ffmpeg
+	if (!gf_sys_is_test_mode()) {
+		if (codecpar->color_range==AVCOL_RANGE_JPEG)
+			gf_filter_pid_set_property(opid, GF_PROP_PID_COLR_RANGE, &PROP_BOOL(GF_TRUE));
+		else if (codecpar->color_range==AVCOL_RANGE_MPEG)
+			gf_filter_pid_set_property(opid, GF_PROP_PID_COLR_RANGE, &PROP_BOOL(GF_FALSE));
 
-	if (codecpar->color_range==AVCOL_RANGE_JPEG)
-		gf_filter_pid_set_property(opid, GF_PROP_PID_COLR_RANGE, &PROP_BOOL(GF_TRUE));
-	else if (codecpar->color_range==AVCOL_RANGE_MPEG)
-		gf_filter_pid_set_property(opid, GF_PROP_PID_COLR_RANGE, &PROP_BOOL(GF_FALSE));
+		if (codecpar->color_primaries)
+			gf_filter_pid_set_property(opid, GF_PROP_PID_COLR_PRIMARIES, &PROP_UINT(codecpar->color_primaries));
 
-	if (codecpar->color_trc)
-		gf_filter_pid_set_property(opid, GF_PROP_PID_COLR_TRANSFER, &PROP_UINT(codecpar->color_trc));
+		if (codecpar->color_trc)
+			gf_filter_pid_set_property(opid, GF_PROP_PID_COLR_TRANSFER, &PROP_UINT(codecpar->color_trc));
 
-	if (codecpar->color_space)
-		gf_filter_pid_set_property(opid, GF_PROP_PID_COLR_MX, &PROP_UINT(codecpar->color_space));
+		if (codecpar->color_space)
+			gf_filter_pid_set_property(opid, GF_PROP_PID_COLR_MX, &PROP_UINT(codecpar->color_space));
 
-	if (codecpar->chroma_location)
-		gf_filter_pid_set_property(opid, GF_PROP_PID_COLR_CHROMALOC, &PROP_UINT(codecpar->chroma_location));
+		if (codecpar->chroma_location)
+			gf_filter_pid_set_property(opid, GF_PROP_PID_COLR_CHROMALOC, &PROP_UINT(codecpar->chroma_location));
+	}
 
 	if (codecpar->format>=0) {
 		if (codecpar->width) {
@@ -2122,10 +2193,19 @@
 	if (codecpar->sample_rate)
 		gf_filter_pid_set_property(opid, GF_PROP_PID_SAMPLE_RATE, &PROP_UINT(codecpar->sample_rate));
 
-	if (codecpar->channels) {
-		gf_filter_pid_set_property(opid, GF_PROP_PID_NUM_CHANNELS, &PROP_UINT(codecpar->channels));
-		if (codecpar->channel_layout) {
-			gf_filter_pid_set_property(opid, GF_PROP_PID_CHANNEL_LAYOUT, &PROP_LONGUINT( ffmpeg_channel_layout_to_gpac(codecpar->channel_layout) ));
+	u32 nb_ch=0;
+	u64 ch_layout=0;
+#ifdef FFMPEG_OLD_CHLAYOUT
+	nb_ch = codecpar->channels;
+	ch_layout = codecpar->channel_layout;
+#else
+	nb_ch = codecpar->ch_layout.nb_channels;
+	ch_layout = (codecpar->ch_layout.order>=AV_CHANNEL_ORDER_CUSTOM) ? 0 : codecpar->ch_layout.u.mask;
+#endif
+	if (nb_ch) {
+		gf_filter_pid_set_property(opid, GF_PROP_PID_NUM_CHANNELS, &PROP_UINT(nb_ch));
+		if (ch_layout) {
+			gf_filter_pid_set_property(opid, GF_PROP_PID_CHANNEL_LAYOUT, &PROP_LONGUINT( ffmpeg_channel_layout_to_gpac(ch_layout) ));
 		}
 
 		if (codecpar->frame_size)
@@ -2161,4 +2241,46 @@
 	return GF_OK;
 }
 
+#ifdef GPAC_CONFIG_EMSCRIPTEN
+Bool gf_filter_on_main_thread(GF_Filter *filter);
+#endif
+void ffmpeg_check_threads(GF_Filter *filter, AVDictionary *options, AVCodecContext *codecctx)
+{
+	s32 num_threads=-1;
+	if (!codecctx) return;
+
+	if (options) {
+		//check if we have --threads=0 - if so disable threading type
+		AVDictionaryEntry *prev_e = NULL;
+		while (1) {
+			prev_e = av_dict_get(options, "", prev_e, AV_DICT_IGNORE_SUFFIX);
+			if (!prev_e) break;
+			if (prev_e->key && !strcmp(prev_e->key, "threads")) {
+				num_threads = atoi(prev_e->value);
+				if (!num_threads)
+					codecctx->thread_type = 0;
+				break;
+			}
+		}
+	}
+
+#if defined(__EMSCRIPTEN_PTHREADS__)
+	//On emscripten, disable threads if running in the main thread
+	//this is needed as in ffmpeg, spawning threads or multi-threaded encode/decode waits on the calling thread for thread creation / task completion
+	//which is acknowledged in the main browser loop (in EM RT, not in gpac/ffmpeg) hence creating a deadlock
+	if (gf_filter_on_main_thread(filter)) {
+		codecctx->thread_count = 0;
+		codecctx->thread_type = 0;
+		if (num_threads>0) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_CODEC, ("Using FFMPEG threads on main thread would deadlock, disabling threading (use -threads=1 to have one extra gpac thread)\n"));
+		}
+	} else {
+		GF_LOG(GF_LOG_INFO, GF_LOG_CODEC, ("FFMPEG threads (%d type %d) enabled\n", num_threads, codecctx->thread_type));
+	}
+#elif defined(GPAC_CONFIG_EMSCRIPTEN)
+	//no thread support in build, disable ffmpeg threading
+	codecctx->thread_count = 0;
+	codecctx->thread_type = 0;
+#endif
+}
 #endif

gpac-2.2.1.tar.gz/src/filters/ff_common.h -> gpac-2.4.0.tar.gz/src/filters/ff_common.h Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2017-2022
+ *			Copyright (c) Telecom ParisTech 2017-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / common ffmpeg filters
@@ -32,7 +32,9 @@
 #include <libavutil/opt.h>
 #include <libavutil/pixdesc.h>
 #include <libavutil/dict.h>
+#ifndef FFMPEG_DISABLE_AVDEVICE
 #include <libavdevice/avdevice.h>
+#endif
 #include <libswscale/swscale.h>
 #include <libavutil/channel_layout.h>
 
@@ -62,6 +64,10 @@
 #include <libavcodec/bsf.h>
 #endif
 
+#if AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, LIBAVUTIL_VERSION_MINOR, 0) < AV_VERSION_INT(59, 0, 0)
+#define FFMPEG_OLD_CHLAYOUT
+#endif
+
 
 GF_FilterArgs ffmpeg_arg_translate(const struct AVOption *opt);
 void ffmpeg_setup_logs(u32 log_class);
@@ -91,6 +97,7 @@
 u32 ffmpeg_audio_fmt_to_gpac(u32 sfmt);
 u32 ffmpeg_codecid_from_gpac(u32 codec_id, u32 *ff_codectag);
 u32 ffmpeg_codecid_to_gpac(u32 codec_id);
+u32 ffmpeg_codecid_to_gpac_audio_fmt(u32 codec_id);
 
 u32 ffmpeg_stream_type_from_gpac(u32 streamtype);
 u32 ffmpeg_stream_type_to_gpac(u32 streamtype);
@@ -129,3 +136,5 @@
 #endif
 
 GF_Err ffmpeg_update_arg(const char *log_name, void *ctx, AVDictionary **options, const char *arg_name, const GF_PropertyValue *arg_val);
+
+void ffmpeg_check_threads(GF_Filter *filter, AVDictionary *options, AVCodecContext *codecctx);

gpac-2.2.1.tar.gz/src/filters/ff_dec.c -> gpac-2.4.0.tar.gz/src/filters/ff_dec.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2017-2022
+ *			Copyright (c) Telecom ParisTech 2017-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / ffmpeg decode filter
@@ -247,10 +247,14 @@
         return GF_EOS;
     }
 
+restart:
+
 	frame = ctx->frame;
 
 	FF_INIT_PCK(ctx, pkt)
 
+	//reset as we may get re-called from goto
+	pck_src=NULL;
 	if (pck) {
 		data = gf_filter_pck_get_data(pck, &size);
 
@@ -311,7 +315,7 @@
 	case AVERROR_EOF:
 		break;
 	default:
-		GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("FFDec PID %s failed to send frame PTS "LLU": %s\n", gf_filter_pid_get_name(ctx->in_pid), pkt->pts, av_err2str(res) ));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("FFDec PID %s failed to queue packet PTS "LLU": %s\n", gf_filter_pid_get_name(ctx->in_pid), pkt->pts, av_err2str(res) ));
 		break;
 	}
 	gotpic = 0;
@@ -535,6 +539,9 @@
 		gf_filter_pck_set_interlaced(dst_pck, frame->top_field_first ? 2 : 1);
 
 	gf_filter_pck_send(dst_pck);
+
+	if (!pck) goto restart;
+
 	return GF_OK;
 }
 
@@ -570,7 +577,7 @@
 
 	if (pck) pkt->data = (uint8_t *) gf_filter_pck_get_data(pck, &in_size);
 
-	if (pck) {
+	if (pck && in_size) {
 		src_pck = pck;
 		gf_filter_pck_ref_props(&src_pck);
 		if (src_pck) gf_list_add(ctx->src_packets, src_pck);
@@ -602,6 +609,7 @@
 
 	} else {
 		pkt->size = 0;
+		pkt->data = NULL;
 	}
 
 	prev_afmt = ctx->decoder->sample_fmt;
@@ -705,8 +713,13 @@
 	FF_RELEASE_PCK(pkt);
 
 
+#ifdef FFMPEG_OLD_CHLAYOUT
 	FF_CHECK_PROP(channels, channels, GF_PROP_PID_NUM_CHANNELS)
 	FF_CHECK_PROPL(channel_layout, channel_layout, GF_PROP_PID_CHANNEL_LAYOUT)
+#else
+	FF_CHECK_PROP(channels, ch_layout.nb_channels, GF_PROP_PID_NUM_CHANNELS)
+	FF_CHECK_PROPL(channel_layout, ch_layout.u.mask, GF_PROP_PID_CHANNEL_LAYOUT)
+#endif
 	FF_CHECK_PROP(sample_rate, sample_rate, GF_PROP_PID_SAMPLE_RATE)
 
 	if (prev_afmt != ctx->decoder->sample_fmt) {
@@ -814,10 +827,10 @@
 	if (pck) gf_filter_pid_drop_packet(ctx->in_pid);
 #endif
 
+	if (gf_filter_pid_would_block(ctx->out_pid))
+		return GF_OK;
 	//avoid recursion
 	goto decode_next;
-
-//	return ffdec_process_audio(filter, ctx);
 }
 
 #ifndef FFMPEG_NO_SUBS
@@ -1058,7 +1071,7 @@
 			prop = gf_filter_pid_get_property(pid, GF_PROP_PID_UNFRAMED);
 			if (!prop || !prop->value.boolean) {
 				gf_filter_override_caps(filter, FFDecodeAnnexBCaps, GF_ARRAY_LENGTH(FFDecodeAnnexBCaps));
-				gf_filter_pid_negociate_property(ctx->in_pid, GF_PROP_PID_UNFRAMED, &PROP_BOOL(GF_TRUE) );
+				gf_filter_pid_negotiate_property(ctx->in_pid, GF_PROP_PID_UNFRAMED, &PROP_BOOL(GF_TRUE) );
 				return GF_OK;
 			}
 		}
@@ -1194,7 +1207,11 @@
 		}
 		if (ctx->sample_rate && ctx->channels) {
 			ctx->decoder->sample_rate = ctx->sample_rate;
+#ifdef FFMPEG_OLD_CHLAYOUT
 			ctx->decoder->channels = ctx->channels;
+#else
+			ctx->decoder->ch_layout.nb_channels = ctx->channels;
+#endif
 		}
 	}
 
@@ -1241,6 +1258,8 @@
 
 	//clone options (in case we need to destroy/recreate the codec) and open codec
 	av_dict_copy(&options, ctx->options, 0);
+	ffmpeg_check_threads(filter, options, ctx->decoder);
+
 	res = avcodec_open2(ctx->decoder, codec, &options);
 	if (res < 0) {
 		if (options) av_dict_free(&options);
@@ -1342,13 +1361,23 @@
 			ctx->bytes_per_sample = gf_audio_fmt_bit_depth(ctx->sample_fmt) / 8;
 		}
 
+		u32 nb_ch=0;
+		u64 ff_ch_layout=0;
+#ifdef FFMPEG_OLD_CHLAYOUT
+		nb_ch = ctx->decoder->channels;
+		ff_ch_layout = ctx->decoder->channel_layout;
+#else
+		nb_ch = ctx->decoder->ch_layout.nb_channels;
+		ff_ch_layout = (ctx->decoder->ch_layout.order>=AV_CHANNEL_ORDER_CUSTOM) ? 0 : ctx->decoder->ch_layout.u.mask;
+#endif
+
 		//override PID props with what decoder gives us
-		if (ctx->decoder->channels) {
-			ctx->channels = 0;
-			FF_CHECK_PROP(channels, channels, GF_PROP_PID_NUM_CHANNELS)
+		if (nb_ch) {
+			gf_filter_pid_set_property(ctx->out_pid, GF_PROP_PID_NUM_CHANNELS, &PROP_UINT(nb_ch ) );
+			ctx->channels = nb_ch;
 		}
-		if (ctx->decoder->channel_layout) {
-			u64 ch_lay = ffmpeg_channel_layout_to_gpac(ctx->decoder->channel_layout);
+		if (ff_ch_layout) {
+			u64 ch_lay = ffmpeg_channel_layout_to_gpac(ff_ch_layout);
 			if (ctx->channel_layout != ch_lay) {
 				gf_filter_pid_set_property(ctx->out_pid, GF_PROP_PID_CHANNEL_LAYOUT, &PROP_LONGUINT(ch_lay ) );
 				ctx->channel_layout = ch_lay;
@@ -1443,6 +1472,7 @@
 	CAP_UINT(GF_CAPS_INPUT_EXCLUDED, GF_PROP_PID_CODECID, GF_CODECID_LHVC),
 	CAP_UINT(GF_CAPS_INPUT_EXCLUDED, GF_PROP_PID_CODECID, GF_CODECID_HEVC_TILES),
 	CAP_UINT(GF_CAPS_INPUT_EXCLUDED, GF_PROP_PID_CODECID, GF_CODECID_VVC_SUBPIC),
+	CAP_UINT(GF_CAPS_INPUT_EXCLUDED, GF_PROP_PID_CODECID, GF_CODECID_HEVC_MERGE),
 	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_CODECID, GF_CODECID_RAW),
 	CAP_BOOL(GF_CAPS_INPUT_EXCLUDED, GF_PROP_PID_TILE_BASE, GF_TRUE),
 	{ .code=GF_PROP_PID_SCALABLE, .val={.type=GF_PROP_BOOL, .value.boolean = GF_TRUE}, .flags=(GF_CAPS_INPUT_OPT), .priority=255 },
@@ -1498,7 +1528,7 @@
 	.process = ffdec_process,
 	.update_arg = ffdec_update_arg,
 	.process_event = ffdec_process_event,
-	.flags = GF_FS_REG_META,
+	.flags = GF_FS_REG_META|GF_FS_REG_BLOCK_MAIN,
 	//use middle priorty, so that hardware decs/other native impl in gpac can take over if needed
 	//don't use lowest one since we use this for scalable codecs
 	.priority = 128
@@ -1515,9 +1545,11 @@
 	{0}
 };
 
+const int FFDEC_STATIC_ARGS = (sizeof (FFDecodeArgs) / sizeof (GF_FilterArgs)) - 1;
+
 const GF_FilterRegister *ffdec_register(GF_FilterSession *session)
 {
-	return ffmpeg_build_register(session, &FFDecodeRegister, FFDecodeArgs, 1, FF_REG_TYPE_DECODE);
+	return ffmpeg_build_register(session, &FFDecodeRegister, FFDecodeArgs, FFDEC_STATIC_ARGS, FF_REG_TYPE_DECODE);
 }
 
 #else

gpac-2.2.1.tar.gz/src/filters/ff_dmx.c -> gpac-2.4.0.tar.gz/src/filters/ff_dmx.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2017-2022
+ *			Copyright (c) Telecom ParisTech 2017-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / ffmpeg demux filter
@@ -52,8 +52,9 @@
 	u64 ts_offset;
 	Bool mkv_webvtt;
 	u32 vc1_mode;
-	u64 fake_dts;
+	u64 fake_dts_plus_one, fake_dts_orig;
 	Bool fake_dts_set;
+	GF_List *pck_queue;
 } PidCtx;
 
 typedef struct
@@ -64,6 +65,7 @@
 	u32 copy, probes;
 	Bool sclock;
 	const char *fmt, *dev;
+	Bool reparse;
 
 	//internal data
 	const char *fname;
@@ -102,13 +104,33 @@
 	AVIOContext *avio_ctx;
 	FILE *gfio;
 	GF_Fraction fps_forced;
+
+	//for ffdmx used as filter on http or file input
+	//we must buffer enough data so that calls to read_packet() does not abort in the middle of a packet
+	GF_FilterPid *ipid;
+	u32 is_open;
+	u32 strbuf_offset;
+	u8 *strbuf;
+	u32 strbuf_size, strbuf_alloc, strbuf_min, in_seek;
+	Bool in_eos, first_block;
+	s64 seek_offset;
+	u64 seek_ms;
 } GF_FFDemuxCtx;
 
 static void ffdmx_finalize(GF_Filter *filter)
 {
 	GF_FFDemuxCtx *ctx = (GF_FFDemuxCtx *) gf_filter_get_udta(filter);
-	if (ctx->pids_ctx)
+	if (ctx->pids_ctx) {
+		u32 i;
+		for (i=0; i<ctx->nb_streams; i++) {
+			if (!ctx->pids_ctxi.pck_queue) continue;
+			while (gf_list_count(ctx->pids_ctxi.pck_queue)) {
+				gf_filter_pck_discard( gf_list_pop_back(ctx->pids_ctxi.pck_queue) );
+			}
+			gf_list_del(ctx->pids_ctxi.pck_queue);
+		}
 		gf_free(ctx->pids_ctx);
+	}
 	if (ctx->options)
 		av_dict_free(&ctx->options);
 	if (ctx->probe_times)
@@ -122,6 +144,7 @@
 		av_freep(&ctx->avio_ctx);
 	}
 	if (ctx->gfio) gf_fclose(ctx->gfio);
+	if (ctx->strbuf) gf_free(ctx->strbuf);
 	return;
 }
 
@@ -284,10 +307,141 @@
 	}
 }
 
+GF_Err ffdmx_init_common(GF_Filter *filter, GF_FFDemuxCtx *ctx, u32 grab_type);
+
+static GF_Err ffdmx_flush_input(GF_Filter *filter, GF_FFDemuxCtx *ctx)
+{
+	int res;
+	GF_Err e;
+	if (ctx->is_open==2)
+		return GF_NOT_SUPPORTED;
+
+	if (!ctx->is_open)
+		ctx->demuxer->pb = ctx->avio_ctx;
+
+	while (1) {
+		if (ctx->strbuf_size - ctx->strbuf_offset >= ctx->strbuf_min) {
+			if (ctx->is_open) return GF_OK;
+			break;
+		}
+
+		GF_FilterPacket *pck = gf_filter_pid_get_packet(ctx->ipid);
+		if (!pck) {
+			if (gf_filter_pid_is_eos(ctx->ipid)) {
+				ctx->in_eos = GF_TRUE;
+				if (ctx->is_open) return GF_OK;
+				break;
+			}
+			return GF_NOT_READY;
+		}
+		u32 size;
+		const u8 *data = gf_filter_pck_get_data(pck, &size);
+		if (!size) {
+			gf_filter_pid_drop_packet(ctx->ipid);
+			continue;
+		}
+		ctx->in_eos = GF_FALSE;
+		memmove(ctx->strbuf, ctx->strbuf+ctx->strbuf_offset, ctx->strbuf_size - ctx->strbuf_offset);
+		ctx->strbuf_size -= ctx->strbuf_offset;
+		ctx->strbuf_offset = 0;
+		if (ctx->strbuf_size + size > ctx->strbuf_alloc) {
+			ctx->strbuf_alloc = ctx->strbuf_size + size;
+			ctx->strbuf = gf_realloc(ctx->strbuf, ctx->strbuf_alloc);
+			if (!ctx->strbuf) {
+				ctx->strbuf_alloc = 0;
+				return GF_OUT_OF_MEM;
+			}
+		}
+		memcpy(ctx->strbuf + ctx->strbuf_size, data, size);
+		ctx->strbuf_size += size;
+		gf_filter_pid_drop_packet(ctx->ipid);
+		ctx->demuxer->pb->eof_reached = 0;
+	}
+
+	ctx->first_block = GF_TRUE;
+
+	//open context
+	AVDictionary *options = NULL;
+	av_dict_copy(&options, ctx->options, 0);
+
+	ctx->demuxer->flags |= AVFMT_FLAG_CUSTOM_IO | AVFMT_FLAG_NONBLOCK | AVFMT_FLAG_NOBUFFER;
+	res = avformat_open_input(&ctx->demuxer, NULL, NULL, &options);
+	switch (res) {
+	case 0:
+		e = GF_OK;
+		break;
+	case AVERROR_INVALIDDATA:
+		e = GF_NON_COMPLIANT_BITSTREAM;
+		break;
+	case AVERROR_DEMUXER_NOT_FOUND:
+	case -ENOENT:
+		e = GF_URL_ERROR;
+		break;
+	case AVERROR_EOF:
+		e = GF_EOS;
+		break;
+	default:
+		e = GF_NOT_SUPPORTED;
+		break;
+	}
+
+	if (e) {
+		GF_LOG(GF_LOG_ERROR, ctx->log_class, ("%s Fail to open %s - error %s\n", ctx->fname, ctx->src, av_err2str(res) ));
+		avformat_close_input(&ctx->demuxer);
+		avformat_free_context(ctx->demuxer);
+		ctx->demuxer = NULL;
+		if (options) av_dict_free(&options);
+		ctx->is_open = 2;
+		ctx->first_block = GF_FALSE;
+		return e;
+	}
+
+	AVDictionary** optionsarr = NULL;
+	if (ctx->options && ctx->demuxer && ctx->demuxer->nb_streams) {
+		optionsarr = (AVDictionary**)gf_malloc(ctx->demuxer->nb_streams * sizeof(AVDictionary*));
+		for (unsigned si = 0; si < ctx->demuxer->nb_streams; si++) {
+			optionsarrsi = NULL;
+			av_dict_copy(&optionsarrsi, ctx->options, 0);
+		}
+	}
+	ctx->demuxer->probesize = ctx->strbuf_size;
+	res = avformat_find_stream_info(ctx->demuxer, optionsarr);
+	ctx->first_block = GF_FALSE;
+
+	if (optionsarr) {
+		for (unsigned si = 0; si < ctx->demuxer->nb_streams; si++) {
+			av_dict_free(&optionsarrsi);
+		}
+		gf_free(optionsarr);
+		optionsarr = NULL;
+	}
+
+	if (res < 0) {
+		GF_LOG(GF_LOG_ERROR, ctx->log_class, ("%s cannot locate streams - error %s\n", ctx->fname, av_err2str(res)));
+		e = GF_NOT_SUPPORTED;
+		avformat_close_input(&ctx->demuxer);
+		avformat_free_context(ctx->demuxer);
+		ctx->demuxer = NULL;
+		if (options) av_dict_free(&options);
+		ctx->is_open = 2;
+		return e;
+	}
+	GF_LOG(GF_LOG_DEBUG, ctx->log_class, ("%s file %s opened - %d streams\n", ctx->fname, ctx->src, ctx->demuxer->nb_streams));
+
+	ffmpeg_report_options(filter, options, ctx->options);
+	e = ffdmx_init_common(filter, ctx, 0);
+	if (e) {
+		ctx->is_open = 2;
+		return e;
+	}
+	ctx->is_open = 1;
+	return GF_OK;
+}
+
 static GF_Err ffdmx_process(GF_Filter *filter)
 {
 	GF_Err e;
-	u32 i;
+	u32 i, nb_pck=0;
 	u64 sample_time;
 	u8 *data_dst;
 	Bool copy = GF_TRUE;
@@ -295,15 +449,34 @@
 	GF_FilterPacket *pck_dst;
 	AVPacket *pkt;
 	PidCtx *pctx;
+	int res;
 	GF_FFDemuxCtx *ctx = (GF_FFDemuxCtx *) gf_filter_get_udta(filter);
 
-	if (!ctx->nb_playing)
+restart:
+	if (ctx->ipid) {
+		e = ffdmx_flush_input(filter, ctx);
+		if (e==GF_NOT_READY) return GF_OK;
+		if (!ctx->is_open) return GF_OK;
+		if (ctx->is_open==2) return GF_PROFILE_NOT_SUPPORTED;
+		if (!ctx->demuxer) return GF_PROFILE_NOT_SUPPORTED;
+		if (!ctx->strbuf_size) return GF_OK;
+	}
+
+	if (!ctx->nb_playing) {
+		if (ctx->stop_seen) {
+			for (i=0; i<ctx->nb_streams; i++) {
+				if (ctx->pids_ctxi.pid) gf_filter_pid_set_eos(ctx->pids_ctxi.pid);
+			}
+		}
 		return GF_EOS;
+	}
 
 	if (ctx->raw_pck_out)
 		return GF_EOS;
 
-	u32 would_block=0, pids=0;
+	u32 would_block, pids;
+
+	would_block = pids = 0;
 	for (i=0; i<ctx->nb_streams; i++) {
 		if (!ctx->pids_ctxi.pid) continue;
 		pids++;
@@ -313,10 +486,10 @@
 			would_block++;
 	}
 	if (would_block == pids) {
-		gf_filter_ask_rt_reschedule(filter, 0);
+		gf_filter_ask_rt_reschedule(filter, 1000);
 		return GF_OK;
 	}
-	
+
 	sample_time = gf_sys_clock_high_res();
 
 	FF_INIT_PCK(ctx, pkt)
@@ -326,7 +499,11 @@
 	pkt->stream_index = -1;
 
 	/*EOF*/
-	if (av_read_frame(ctx->demuxer, pkt) <0) {
+	res = av_read_frame(ctx->demuxer, pkt);
+	if (res < 0) {
+		if (!ctx->in_eos && (ctx->strbuf_size>ctx->strbuf_offset) && (res == AVERROR(EAGAIN)))
+			return GF_OK;
+
 		FF_FREE_PCK(pkt);
 		if (!ctx->raw_data) {
 			for (i=0; i<ctx->nb_streams; i++) {
@@ -336,9 +513,11 @@
 		}
 		return GF_OK;
 	}
-	assert(pkt->stream_index>=0);
-	assert(pkt->stream_index < (s32) ctx->demuxer->nb_streams);
-
+	if (pkt->stream_index<0) {
+		GF_LOG(GF_LOG_WARNING, ctx->log_class, ("%s Packet not associated to any stream in file %s, discarding\n", ctx->fname));
+		FF_FREE_PCK(pkt);
+		return GF_OK;
+	}
 	if (pkt->stream_index >= (s32) ctx->nb_streams) {
 		GF_LOG(GF_LOG_WARNING, ctx->log_class, ("%s More streams (%d) than initialy declared (%d), buggy source demux or not supported, ignoring packet in stream %d\n", ctx->fname, ctx->demuxer->nb_streams, ctx->nb_streams, pkt->stream_index+1 ));
 		FF_FREE_PCK(pkt);
@@ -352,6 +531,15 @@
 			pkt->pts = pkt->dts;
 		}
 	}
+	if (ctx->seek_ms) {
+		if (pkt->pts * 1000 < (s64)ctx->seek_ms * ctx->demuxer->streamspkt->stream_index->time_base.den) {
+			if (!ctx->raw_pck_out) {
+				FF_FREE_PCK(pkt);
+			}
+			goto restart;
+		}
+		ctx->seek_ms = 0;
+	}
 
 	pctx = &ctx->pids_ctxpkt->stream_index;
 	if (! pctx->pid ) {
@@ -411,6 +599,7 @@
 				GF_BitStream *bs = gf_bs_new(sd->data, sd->size, GF_BITSTREAM_READ);
 
 				u32 flags = gf_bs_read_u32_le(bs);
+#ifdef FFMPEG_OLD_CHLAYOUT
 				if (flags & AV_SIDE_DATA_PARAM_CHANGE_CHANNEL_COUNT) {
 					u32 new_ch = gf_bs_read_u32_le(bs);
 					gf_filter_pid_set_property(pctx->pid, GF_PROP_PID_NUM_CHANNELS, &PROP_UINT(new_ch) );
@@ -420,6 +609,10 @@
 					new_lay = ffmpeg_channel_layout_to_gpac(new_lay);
 					gf_filter_pid_set_property(pctx->pid, GF_PROP_PID_CHANNEL_LAYOUT, &PROP_LONGUINT(new_lay) );
 				}
+#else
+				//no message for ch layout/count change in latest API
+#endif
+
 				if (flags & AV_SIDE_DATA_PARAM_CHANGE_SAMPLE_RATE) {
 					u32 new_sr = gf_bs_read_u32_le(bs);
 					gf_filter_pid_set_property(pctx->pid, GF_PROP_PID_SAMPLE_RATE, &PROP_UINT(new_sr) );
@@ -474,6 +667,7 @@
 		memcpy(data_dst, pkt->data, pkt->size);
 	}
 
+	Bool queue_pck=GF_FALSE;
 	if (ctx->raw_data && ctx->sclock) {
 		u64 ts;
 		if (!ctx->first_sample_clock) {
@@ -503,19 +697,37 @@
 		ts = (pkt->pts + pctx->ts_offset-1) * stream->time_base.num;
 		gf_filter_pck_set_cts(pck_dst, ts );
 
+		//trick for some demuxers in libavformat no setting dts when negative (mkv for ex)
+		if (!pctx->fake_dts_plus_one) {
+			pctx->fake_dts_plus_one = 1+ts;
+			pctx->fake_dts_orig = ts;
+		}
+
 		if (pkt->dts != AV_NOPTS_VALUE) {
-			ts = (pctx->fake_dts + pkt->dts + pctx->ts_offset-1) * stream->time_base.num;
+			ts = (pctx->fake_dts_plus_one-1 - pctx->fake_dts_orig + pkt->dts + pctx->ts_offset-1) * stream->time_base.num;
 			gf_filter_pck_set_dts(pck_dst, ts);
-			if (!pctx->fake_dts_set && pctx->fake_dts) {
-				s64 offset = pctx->fake_dts;
-				gf_filter_pid_set_property(pctx->pid, GF_PROP_PID_DELAY, &PROP_LONGSINT( -offset) );
+			if (!pctx->fake_dts_set) {
+				if (pctx->fake_dts_plus_one) {
+					s64 offset = pctx->fake_dts_plus_one-1;
+					offset -= pctx->fake_dts_orig;
+					if (offset)
+						gf_filter_pid_set_property(pctx->pid, GF_PROP_PID_DELAY, &PROP_LONGSINT( -offset) );
+				}
 				pctx->fake_dts_set = GF_TRUE;
+				if (pctx->pck_queue) {
+					while (gf_list_count(pctx->pck_queue)) {
+						GF_FilterPacket *pck_q = gf_list_pop_front(pctx->pck_queue);
+						gf_filter_pck_send(pck_q);
+					}
+					gf_list_del(pctx->pck_queue);
+					pctx->pck_queue = NULL;
+				}
 			}
 		} else {
-			//trick for some demuxers in libavformat no setting dts when negative (mkv for ex)
-			ts = pctx->fake_dts;
+			ts = pctx->fake_dts_plus_one-1;
 			gf_filter_pck_set_dts(pck_dst, ts);
-			pctx->fake_dts += pkt->duration;
+			pctx->fake_dts_plus_one += pkt->duration ? pkt->duration : 1;
+			if (!ctx->raw_data && !pctx->fake_dts_set) queue_pck = GF_TRUE;
 		}
 
 		if (pkt->duration)
@@ -558,13 +770,31 @@
 		}
 	}
 
-	e = gf_filter_pck_send(pck_dst);
-    ctx->nb_pck_sent++;
+	if (queue_pck) {
+		if (!pctx->pck_queue) pctx->pck_queue = gf_list_new();
+		e = gf_list_add(pctx->pck_queue, pck_dst);
+	} else {
+		e = gf_filter_pck_send(pck_dst);
+	}
+	ctx->nb_pck_sent++;
 	ctx->nb_stop_pending=0;
 	if (!ctx->raw_pck_out) {
 		FF_FREE_PCK(pkt);
 	}
-	return e;
+
+	nb_pck++;
+	if (e || (nb_pck>10)) return e;
+
+	//we demux an input, restart to flush it
+	if (ctx->ipid) {
+		if (ctx->strbuf_size && (ctx->strbuf_offset*2 > ctx->strbuf_size)) {
+			gf_filter_post_process_task(filter);
+		}
+		goto restart;
+	}
+
+	//we don't demux an input, only rely on session to schedule the filter
+	return GF_OK;
 }
 
 
@@ -582,6 +812,7 @@
 */
 static u32 ffdmx_valid_should_reframe(u32 gpac_codec_id, u8 *dsi, u32 dsi_size)
 {
+#ifndef GPAC_DISABLE_AV_PARSERS
 	GF_AC3Config ac3;
 	GF_M4ADecSpecInfo aaccfg;
 	GF_AVCConfig *avcc;
@@ -670,6 +901,9 @@
 		break;
 	}
 	return 0;
+#else
+	return 0;
+#endif
 }
 
 GF_Err ffdmx_init_common(GF_Filter *filter, GF_FFDemuxCtx *ctx, u32 grab_type)
@@ -749,7 +983,11 @@
 		u32 exdata_size = stream->codecpar->extradata_size;
 		u32 codec_sample_rate = stream->codecpar->sample_rate;
 		u32 codec_frame_size = stream->codecpar->frame_size;
+#ifdef FFMPEG_OLD_CHLAYOUT
 		u32 codec_channels = stream->codecpar->channels;
+#else
+		u32 codec_channels = stream->codecpar->ch_layout.nb_channels;
+#endif
 		u32 codec_width = stream->codecpar->width;
 		u32 codec_height = stream->codecpar->height;
 		u32 codec_field_order = stream->codecpar->field_order;
@@ -839,8 +1077,16 @@
 		if (grab_type)
 			gf_filter_pid_set_property(pid, GF_PROP_PID_RAWGRAB, &PROP_UINT(grab_type) );
 		else if (ctx->demuxer->iformat) {
-			if ((ctx->demuxer->iformat->flags & AVFMT_SEEK_TO_PTS) || ctx->demuxer->iformat->read_seek)
+			if ((ctx->demuxer->iformat->flags & AVFMT_SEEK_TO_PTS)
+#if (LIBAVFORMAT_VERSION_MAJOR < 59)
+				|| ctx->demuxer->iformat->read_seek
+#else
+				|| (ctx->demuxer->iformat->flags & AVFMT_GENERIC_INDEX)
+				|| !(ctx->demuxer->iformat->flags & AVFMT_NOBINSEARCH)
+#endif
+			) {
 				gf_filter_pid_set_property(pid, GF_PROP_PID_PLAYBACK_MODE, &PROP_UINT(GF_PLAYBACK_MODE_FASTFORWARD ) );
+			}
 		}
 
 
@@ -884,20 +1130,25 @@
 		if (force_reframer) {
 			gf_filter_pid_set_property(pid, GF_PROP_PID_UNFRAMED, &PROP_BOOL(GF_TRUE) );
 		}
-#ifdef FFMPEG_NO_DOVI
 		else if (!gf_sys_is_test_mode() ){
-			//force reparse of nalu-base codecs if no dovi support 
+			//force reparse of nalu-base codecs if no dovi support
 			switch (gpac_codec_id) {
 			case GF_CODECID_AVC:
 			case GF_CODECID_HEVC:
 			case GF_CODECID_LHVC:
 			case GF_CODECID_VVC:
-				gf_filter_pid_set_property(pid, GF_PROP_PID_FORCE_UNFRAME, &PROP_BOOL(GF_TRUE) );
-				gf_filter_pid_set_property(pid, GF_PROP_PID_UNFRAMED, &PROP_BOOL(GF_TRUE) );
+			case GF_CODECID_AV1:
+				if (ctx->reparse
+#ifdef FFMPEG_NO_DOVI
+				 || 1
+#endif
+				) {
+					gf_filter_pid_set_property(pid, GF_PROP_PID_FORCE_UNFRAME, &PROP_BOOL(GF_TRUE) );
+					gf_filter_pid_set_property(pid, GF_PROP_PID_UNFRAMED, &PROP_BOOL(GF_TRUE) );
+				}
 				break;
 			}
 		}
-#endif
 
 
 		if (codec_sample_rate)
@@ -912,6 +1163,15 @@
 		if (codec_height)
 			gf_filter_pid_set_property(pid, GF_PROP_PID_HEIGHT, &PROP_UINT( codec_height ) );
 
+
+#if (LIBAVFORMAT_VERSION_MAJOR >= 59)
+		ffmpeg_codec_par_to_gpac(stream->codecpar, pid, 0);
+		if (gpac_codec_id!=GF_CODECID_RAW) {
+			gf_filter_pid_set_property(pid, GF_PROP_PID_PIXFMT, NULL);
+			gf_filter_pid_set_property(pid, GF_PROP_PID_AUDIO_FORMAT, NULL);
+		}
+#endif
+
 		if (codec_width && codec_height) {
 			if (codec_framerate.num && codec_framerate.den) {
 				gf_media_get_reduced_frame_rate(&codec_framerate.num, &codec_framerate.den);
@@ -921,7 +1181,7 @@
 				gf_filter_pid_set_property(pid, GF_PROP_PID_FPS, &PROP_FRAC_INT( 25, 1 ) );
 			}
 		}
-		
+
 		if (codec_field_order>AV_FIELD_PROGRESSIVE)
 			gf_filter_pid_set_property(pid, GF_PROP_PID_INTERLACED, &PROP_BOOL(GF_TRUE) );
 
@@ -971,6 +1231,10 @@
 			default:
 				GF_LOG(GF_LOG_WARNING, ctx->log_class, ("%s Unsupported sample format %d\n", ctx->fname, codec_sample_fmt));
 			}
+			if (gpac_codec_id==GF_CODECID_RAW) {
+				u32 res = ffmpeg_codecid_to_gpac_audio_fmt(codec_id);
+				if (res) sfmt = res;
+			}
 			gf_filter_pid_set_property(pid, GF_PROP_PID_AUDIO_FORMAT, &PROP_UINT( sfmt) );
 		}
 
@@ -986,9 +1250,49 @@
 		if (codec_blockalign)
 			gf_filter_pid_set_property(pid, GF_PROP_PID_META_DEMUX_OPAQUE, &PROP_UINT(codec_blockalign));
 
+		if ((stream->disposition & AV_DISPOSITION_DEFAULT) && !gf_sys_is_test_mode()) {
+			gf_filter_pid_set_property(pid, GF_PROP_PID_IS_DEFAULT, &PROP_BOOL(GF_TRUE));
+		}
+		gf_filter_pid_set_property(pid, GF_PROP_PID_MUX_INDEX, &PROP_UINT(i+1));
 
 		for (j=0; j<(u32) stream->nb_side_data; j++) {
-			ffdmx_parse_side_data(&stream->side_datai, pid);
+			ffdmx_parse_side_data(&stream->side_dataj, pid);
+		}
+
+		if (ctx->demuxer->nb_chapters) {
+			GF_PropertyValue p;
+			GF_PropUIntList times;
+			GF_PropStringList names;
+			u32 nb_c = ctx->demuxer->nb_chapters;
+
+			times.vals = gf_malloc(sizeof(u32)*nb_c);
+			names.vals = gf_malloc(sizeof(char *)*nb_c);
+			memset(names.vals, 0, sizeof(char *)*nb_c);
+			times.nb_items = names.nb_items = nb_c;
+
+			for (j=0; j<ctx->demuxer->nb_chapters; j++) {
+				AVChapter *c = ctx->demuxer->chaptersj;
+				u64 start = gf_timestamp_rescale(c->start * c->time_base.num, c->time_base.den, 1000);
+				times.valsj = (u32) start;
+				AVDictionaryEntry *ent = NULL;
+				while (c->metadata) {
+					ent = av_dict_get(c->metadata, "", ent, AV_DICT_IGNORE_SUFFIX);
+					if (!ent) break;
+					if (!strcmp(ent->key, "title")) {
+						names.valsj = gf_strdup(ent->value);
+					}
+				}
+				if (!names.valsj) names.valsj = gf_strdup("Unknwon");
+			}
+			p.type = GF_PROP_UINT_LIST;
+			p.value.uint_list = times;
+			gf_filter_pid_set_property(pid, GF_PROP_PID_CHAP_TIMES, &p);
+			gf_free(times.vals);
+
+			p.type = GF_PROP_STRING_LIST;
+			p.value.string_list = names;
+			gf_filter_pid_set_property(pid, GF_PROP_PID_CHAP_NAMES, &p);
+			//no free for string lists
 		}
 	}
 
@@ -1026,6 +1330,7 @@
 	GF_FFDemuxCtx *ctx = gf_filter_get_udta(filter);
 	GF_Err e;
 	s32 res;
+	u32 i;
 	char *ext;
 	const char *url;
 	const AVInputFormat *av_in = NULL;
@@ -1044,8 +1349,8 @@
 	}
 #endif
 	if (!ctx->src) {
-		GF_LOG(GF_LOG_ERROR, ctx->log_class, ("%s Missing file name, cannot open\n", ctx->fname));
-		return GF_SERVICE_ERROR;
+//		GF_LOG(GF_LOG_ERROR, ctx->log_class, ("%s Missing file name, cannot open\n", ctx->fname));
+		return GF_OK;
 	}
 	/*some extensions not supported by ffmpeg, overload input format*/
 	ext = strrchr(ctx->src, '.');
@@ -1130,11 +1435,32 @@
 		GF_LOG(GF_LOG_ERROR, ctx->log_class, ("%s Fail to open %s - error %s\n", ctx->fname, ctx->src, av_err2str(res) ));
 		avformat_close_input(&ctx->demuxer);
 		avformat_free_context(ctx->demuxer);
+		ctx->demuxer = NULL;
 		if (options) av_dict_free(&options);
 		return e;
 	}
 
-	res = avformat_find_stream_info(ctx->demuxer, ctx->options ? &ctx->options : NULL);
+	AVDictionary** optionsarr = NULL;
+	u32 optionsarr_size = 0;
+	if (ctx->options && ctx->demuxer) {
+		optionsarr = (AVDictionary**)gf_malloc(ctx->demuxer->nb_streams * sizeof(AVDictionary*));
+		optionsarr_size = ctx->demuxer->nb_streams;
+		for (i=0; i < optionsarr_size; i++) {
+			optionsarri = NULL;
+			av_dict_copy(&optionsarri, ctx->options, 0);
+		}
+	}
+
+	res = avformat_find_stream_info(ctx->demuxer, optionsarr);
+
+	if (optionsarr) {
+		for (i=0; i < optionsarr_size; i++) {
+			av_dict_free(&optionsarri);
+		}
+		gf_free(optionsarr);
+		optionsarr = NULL;
+	}
+
 	if (res <0) {
 		GF_LOG(GF_LOG_ERROR, ctx->log_class, ("%s cannot locate streams - error %s\n", ctx->fname, av_err2str(res)));
 		e = GF_NOT_SUPPORTED;
@@ -1150,9 +1476,101 @@
 	return ffdmx_init_common(filter, ctx, 0);
 }
 
+static int ffdmx_read_packet(void *opaque, uint8_t *buf, int buf_size)
+{
+	GF_FFDemuxCtx *ctx = (GF_FFDemuxCtx *)opaque;
+	if (ctx->in_seek && (ctx->seek_offset >= 0)) {
+		ctx->in_seek = 2;
+		return -1;
+	}
+	if (ctx->strbuf_offset + buf_size > ctx->strbuf_size) {
+		if (!ctx->in_eos) {
+			GF_LOG(GF_LOG_WARNING, ctx->log_class, ("%s Internal buffer too small, may result in packet drops - try increaset strbuf_min option\n", ctx->fname));
+			ctx->strbuf_min += ctx->strbuf_offset + buf_size - ctx->strbuf_size;
+		}
+		if (buf_size && (ctx->strbuf_size == ctx->strbuf_offset)) {
+			return ctx->in_eos ? AVERROR_EOF : AVERROR(EAGAIN);
+		}
+		buf_size = ctx->strbuf_size - ctx->strbuf_offset;
+	}
+	memcpy(buf, ctx->strbuf + ctx->strbuf_offset, buf_size);
+	ctx->strbuf_offset += buf_size;
+	//if 2xbuffer size is larger than our min internal buffer, increase size - this should limit risks of getting called with no packets to deliver
+	if ((u32)buf_size*2 >= ctx->strbuf_min)
+		ctx->strbuf_min = 2*buf_size;
+	return buf_size;
+}
+
+static int64_t ffdmx_seek(void *opaque, int64_t offset, int whence)
+{
+	GF_FFDemuxCtx *ctx = (GF_FFDemuxCtx *)opaque;
+	if (whence==AVSEEK_SIZE) {
+		const GF_PropertyValue *p = gf_filter_pid_get_property(ctx->ipid, GF_PROP_PID_DOWN_SIZE);
+		if (p) return p->value.longuint;
+		GF_PropertyEntry *pe=NULL;
+		p = gf_filter_pid_get_info(ctx->ipid, GF_PROP_PID_DOWN_SIZE, &pe);
+		s64 val = p ? p->value.longuint : -1;
+		gf_filter_release_property(pe);
+		return val;
+	}
+	if (ctx->in_seek) {
+		if (ctx->in_seek == 1) {
+			ctx->seek_offset = offset;
+			return offset;
+		}
+		return -1;
+	}
+	//if seeking in first block (while probing for stream info), allow it
+	if (ctx->first_block && (whence==SEEK_SET) && (offset<ctx->strbuf_size)) {
+		ctx->strbuf_offset = (u32) offset;
+		return offset;
+	}
+	return -1;
+}
+
+static GF_Err ffdmx_configure_pid(GF_Filter *filter, GF_FilterPid *pid, Bool is_remove)
+{
+	GF_FFDemuxCtx *ctx = gf_filter_get_udta(filter);
+
+	if (ctx->ipid && is_remove) {
+		u32 i;
+		for (i=0; i<ctx->nb_streams; i++) {
+			if (ctx->pids_ctxi.pid) gf_filter_pid_remove(ctx->pids_ctxi.pid);
+			ctx->pids_ctxi.pid = NULL;
+		}
+		ctx->nb_playing = 0;
+		return GF_EOS;
+	}
+	if (ctx->src) return GF_BAD_PARAM;
+
+	const GF_PropertyValue *p = gf_filter_pid_get_property(pid, GF_PROP_PID_URL);
+	if (!p || !p->value.string || !stricmp(p->value.string, "null"))
+		return GF_NOT_SUPPORTED;
+	ctx->src = gf_strdup(p->value.string);
+	ctx->ipid = pid;
+	if (ctx->avio_ctx_buffer) return GF_OK;
+	ctx->avio_ctx_buffer = av_malloc(ctx->block_size);
+	if (!ctx->avio_ctx_buffer) return GF_OUT_OF_MEM;
+
+	ctx->strbuf_min = ctx->strbuf_alloc = 1000000;
+	ctx->strbuf = gf_malloc(ctx->strbuf_alloc);
+	if (!ctx->strbuf) return GF_OUT_OF_MEM;
+
+	ctx->avio_ctx = avio_alloc_context(ctx->avio_ctx_buffer, ctx->block_size, 0, ctx, &ffdmx_read_packet, NULL, &ffdmx_seek);
+//	ctx->avio_ctx = avio_alloc_context(ctx->avio_ctx_buffer, ctx->block_size, 0, ctx, &ffdmx_read_packet, NULL, NULL);
+	if (!ctx->avio_ctx) {
+		GF_LOG(GF_LOG_ERROR, ctx->log_class, ("%s Failed to create AVIO context for %s\n", ctx->fname, ctx->src));
+		return GF_OUT_OF_MEM;
+	}
+	ctx->demuxer = avformat_alloc_context();
+	ffmpeg_set_mx_dmx_flags(ctx->options, ctx->demuxer);
+	return GF_OK;
+}
+
 
 static Bool ffdmx_process_event(GF_Filter *filter, const GF_FilterEvent *evt)
 {
+	u32 i;
 	GF_FFDemuxCtx *ctx = gf_filter_get_udta(filter);
 
 	switch (evt->base.type) {
@@ -1170,27 +1588,63 @@
 				ctx->last_play_start_range = 0;
 			}
 			if (skip_com) {
+				if (evt->play.orig_delay) {
+					for (i=0; i<ctx->nb_streams; i++) {
+						if (ctx->pids_ctxi.pid==evt->base.on_pid) {
+							ctx->pids_ctxi.ts_offset = evt->play.orig_delay+1;
+						}
+					}
+				}
 				return GF_TRUE;
 			}
 			ctx->nb_playing--;
 		}
 
 		//change in play range
+		Bool cancel_event = ctx->ipid ? GF_FALSE : GF_TRUE;
 		if (!ctx->raw_data && (ctx->last_play_start_range != evt->play.start_range)) {
 			u32 i;
+			if (ctx->ipid) {
+				ctx->seek_ms = 0;
+				ctx->in_seek = 1;
+				ctx->seek_offset = -1;
+			}
+
 			int res = av_seek_frame(ctx->demuxer, -1, (s64) (AV_TIME_BASE*evt->play.start_range), AVSEEK_FLAG_BACKWARD);
 			if (res<0) {
 				GF_LOG(GF_LOG_WARNING, ctx->log_class, ("%s Fail to seek %s to %g - error %s\n", ctx->fname, ctx->src, evt->play.start_range, av_err2str(res) ));
+				ctx->in_seek = 2;
+				ctx->seek_offset=0;
+			}
+			if (ctx->ipid && (ctx->seek_offset>=0)) {
+				GF_FilterEvent fevt;
+				//failed to seek, start from 0
+				if (evt->play.start_range && (ctx->in_seek==2)) {
+					ctx->seek_offset=0;
+					ctx->seek_ms = (u64) (1000*evt->play.start_range);
+					GF_LOG(GF_LOG_WARNING, ctx->log_class, ("%s Fail to seek %s to %g, seeking from start\n", ctx->fname, ctx->src, evt->play.start_range));
+					if (res<0)
+						av_seek_frame(ctx->demuxer, -1, 0, AVSEEK_FLAG_BACKWARD);
+				}
+				GF_FEVT_INIT(fevt, GF_FEVT_SOURCE_SEEK, ctx->ipid);
+				fevt.seek.start_offset = ctx->seek_offset;
+				gf_filter_pid_send_event(ctx->ipid, &fevt);
+				ctx->strbuf_size = 0;
+				ctx->strbuf_offset = 0;
+				cancel_event = GF_TRUE;
 			}
+			ctx->in_seek = GF_FALSE;
 			//reset initial delay compute
 			for (i=0; i<ctx->nb_streams; i++) {
 				ctx->pids_ctxi.ts_offset = 0;
+				if (evt->play.orig_delay && (ctx->pids_ctxi.pid==evt->base.on_pid)) {
+					ctx->pids_ctxi.ts_offset = evt->play.orig_delay+1;
+				}
 			}
 			ctx->last_play_start_range = evt->play.start_range;
 		}
 		ctx->stop_seen = GF_FALSE;
-		//cancel event
-		return GF_TRUE;
+		return cancel_event;
 
 	case GF_FEVT_STOP:
 		if (evt->play.initial_broadcast_play==2)
@@ -1200,7 +1654,6 @@
 			ctx->nb_playing--;
 			ctx->stop_seen = GF_TRUE;
 		}
-		//cancel event
 		return GF_TRUE;
 
 	case GF_FEVT_SET_SPEED:
@@ -1229,7 +1682,7 @@
 	return GF_FPROBE_MAYBE_SUPPORTED;
 }
 
-
+extern Bool ff_probe_mode;
 static const char *ffdmx_probe_data(const u8 *data, u32 size, GF_FilterProbeScore *score)
 {
 	int ffscore;
@@ -1241,6 +1694,7 @@
 #endif
 
 	memset(&pb, 0, sizeof(AVProbeData));
+	ff_probe_mode=GF_TRUE;
 	//not setting this crashes some probers in ffmpeg
 	pb.filename = "";
 	if (size <= AVPROBE_PADDING_SIZE) {
@@ -1261,6 +1715,7 @@
 		if (!probe_fmt) probe_fmt = av_probe_input_format3(&pb, GF_FALSE, &ffscore);
 		if (ffscore<=AVPROBE_SCORE_RETRY/2) probe_fmt=NULL;
 	}
+	ff_probe_mode=GF_FALSE;
 
 	if (!probe_fmt) return NULL;
 	if (probe_fmt->mime_type) {
@@ -1307,25 +1762,99 @@
 	.probe_url = ffdmx_probe_url,
 	.probe_data = ffdmx_probe_data,
 	.process_event = ffdmx_process_event,
-	.flags = GF_FS_REG_META,
+	.flags = GF_FS_REG_META | GF_FS_REG_USE_SYNC_READ,
+	.priority = 128
+
 };
 
 
 static const GF_FilterArgs FFDemuxArgs =
 {
 	{ OFFS(src), "URL of source content", GF_PROP_NAME, NULL, NULL, 0},
+	{ OFFS(reparse), "force reparsing of stream content (AVC,HEVC,VVC,AV1 only for now)", GF_PROP_BOOL, "false", NULL, 0},
+	{ OFFS(block_size), "block size used to read file when using GFIO context", GF_PROP_UINT, "4096", NULL, GF_FS_ARG_HINT_EXPERT},
+	{ OFFS(strbuf_min), "internal buffer size when demuxing from GPAC's input stream", GF_PROP_UINT, "1MB", NULL, GF_ARG_HINT_EXPERT},
 	{ "*", -1, "any possible options defined for AVFormatContext and sub-classes. See `gpac -hx ffdmx` and `gpac -hx ffdmx:*`", GF_PROP_STRING, NULL, NULL, GF_FS_ARG_META},
 	{0}
 };
 
+const int FFDMX_STATIC_ARGS = (sizeof (FFDemuxArgs) / sizeof (GF_FilterArgs)) - 1;
+
 
 const GF_FilterRegister *ffdmx_register(GF_FilterSession *session)
 {
-	return ffmpeg_build_register(session, &FFDemuxRegister, FFDemuxArgs, 2, FF_REG_TYPE_DEMUX);
+	return ffmpeg_build_register(session, &FFDemuxRegister, FFDemuxArgs, FFDMX_STATIC_ARGS, FF_REG_TYPE_DEMUX);
 }
 
+//we define a dedicated registry for demuxing a GPAC pid using ffmpeg, not doing so can create wrong link resolutions
+//disabling GPAC demuxers
+static const GF_FilterCapability FFPidDmxCaps =
+{
+	//for demuxing input pids
+	CAP_UINT(GF_CAPS_INPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_FILE),
+	CAP_STRING(GF_CAPS_INPUT_EXCLUDED, GF_PROP_PID_FILEPATH, "*"),
+	CAP_STRING(GF_CAPS_INPUT_EXCLUDED, GF_PROP_PID_URL, "NULL"),
+	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_AUDIO),
+	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_VISUAL),
+	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_TEXT),
+	CAP_UINT(GF_CAPS_OUTPUT_EXCLUDED, GF_PROP_PID_CODECID, GF_CODECID_RAW),
+	{0},
+	//for forced frame->unframe from pid
+	CAP_UINT(GF_CAPS_INPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_FILE),
+	CAP_STRING(GF_CAPS_INPUT_EXCLUDED, GF_PROP_PID_FILEPATH, "*"),
+	CAP_STRING(GF_CAPS_INPUT_EXCLUDED, GF_PROP_PID_URL, "NULL"),
+	CAP_UINT(GF_CAPS_OUTPUT,GF_PROP_PID_STREAM_TYPE, GF_STREAM_VISUAL),
+	CAP_BOOL(GF_CAPS_OUTPUT,GF_PROP_PID_FORCE_UNFRAME, GF_TRUE),
+	CAP_BOOL(GF_CAPS_OUTPUT,GF_PROP_PID_UNFRAMED, GF_TRUE),
+	CAP_UINT(GF_CAPS_OUTPUT_EXCLUDED, GF_PROP_PID_CODECID, GF_CODECID_RAW),
+	{0},
+};
+static const GF_FilterArgs FFDemuxPidArgs =
+{
+	{ OFFS(reparse), "force reparsing of stream content (AVC,HEVC,VVC,AV1 only for now)", GF_PROP_BOOL, "false", NULL, 0},
+	{ OFFS(block_size), "block size used to read file when using GFIO context", GF_PROP_UINT, "4096", NULL, GF_FS_ARG_HINT_EXPERT},
+	{ OFFS(strbuf_min), "internal buffer size when demuxing from GPAC's input stream", GF_PROP_UINT, "1MB", NULL, GF_ARG_HINT_EXPERT},
+	{0}
+};
+
+static void ffdmxpid_finalize(GF_Filter *filter)
+{
+	GF_FFDemuxCtx *ctx = gf_filter_get_udta(filter);
+	if (ctx->src) {
+		gf_free((char *)ctx->src);
+		ctx->src = NULL;
+	}
+	ffdmx_finalize(filter);
+
+}
+const GF_FilterRegister FFDemuxPidRegister = {
+	.name = "ffdmxpid",
+	.version=LIBAVFORMAT_IDENT,
+	GF_FS_SET_DESCRIPTION("FFMPEG demultiplexer")
+	GF_FS_SET_HELP("Alias of ffdmx for GPAC pid demultiplexing, same options as ffdmx.\n")
+	.private_size = sizeof(GF_FFDemuxCtx),
+	SETCAPS(FFPidDmxCaps),
+	.initialize = ffdmx_initialize,
+	.finalize = ffdmxpid_finalize,
+	.configure_pid = ffdmx_configure_pid,
+	.process = ffdmx_process,
+	.update_arg = ffdmx_update_arg,
+	.process_event = ffdmx_process_event,
+	.flags = GF_FS_REG_META,
+	.args = FFDemuxPidArgs,
+	//also set lower priority
+	.priority = 128
+};
+
+const GF_FilterRegister *ffdmxpid_register(GF_FilterSession *session)
+{
+	if (gf_opts_get_bool("temp", "gendoc")) return NULL;
+	return &FFDemuxPidRegister;
+}
 
 
+#ifndef FFMPEG_DISABLE_AVDEVICE
+
 static GF_Err ffavin_initialize(GF_Filter *filter)
 {
 	s32 res, i, dev_idx=-1;
@@ -1402,7 +1931,7 @@
 
 	if (sscanf(dev_name, "%d", &dev_idx)==1) {
 		sprintf(szPatchedName, "%d", dev_idx);
-		if (strcmp(szPatchedName, dev_name)) 
+		if (strcmp(szPatchedName, dev_name))
 			dev_idx = -1;
 	} else {
 		dev_idx = -1;
@@ -1653,7 +2182,6 @@
 		"", GF_PROP_UINT, "A", "N|A|V|AV", GF_FS_ARG_HINT_ADVANCED},
 	{ OFFS(sclock), "use system clock (us) instead of device timestamp (for buggy devices)", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_ADVANCED},
 	{ OFFS(probes), "probe a given number of video frames before emitting (this usually helps with bad timing of the first frames)", GF_PROP_UINT, "10", "0-100", GF_FS_ARG_HINT_EXPERT},
-	{ OFFS(block_size), "block size used to read file when using avio context", GF_PROP_UINT, "4096", NULL, GF_FS_ARG_HINT_EXPERT},
 	{ "*", -1, "any possible options defined for AVInputFormat and AVFormatContext (see `gpac -hx ffavin` and `gpac -hx ffavin:*`)", GF_PROP_STRING, NULL, NULL, GF_FS_ARG_META},
 	{0}
 };
@@ -1704,6 +2232,8 @@
     AVDictionary *tmp = NULL;
 	av_dict_set(&tmp, "list_devices", "1", 0);
     av_opt_set_dict2(ctx, &tmp, AV_OPT_SEARCH_CHILDREN);
+	if (tmp)
+		av_dict_free(&tmp);
 
 	int res = avdevice_list_devices(ctx, &dev_list);
 	if (res<0) {
@@ -1712,6 +2242,8 @@
 			AVDictionary *opts = NULL;
 			av_dict_set(&opts, "list_devices", "1", 0);
 			res = avformat_open_input(&ctx, "dummy", FF_IFMT_CAST fmt, &opts);
+			if (opts)
+				av_dict_free(&opts);
 		}
 	} else if (!res && dev_list->nb_devices) {
 		if (!dev_desc) {
@@ -1792,6 +2324,8 @@
 		ffavin_enum_devices(fmt->name, audio_pass);
 	}
 	av_log_set_callback(av_log_default_callback);
+
+	if (!dev_desc) dev_desc = gf_strdup("No device found !\n");
 	if (dev_desc) {
 		char *out_doc = NULL;
 		gf_dynstrcat(&out_doc, FFAVInRegister.help, NULL);
@@ -1804,6 +2338,15 @@
 	return res_reg;
 }
 
+#else // FFMPEG_DISABLE_AVDEVICE
+
+const GF_FilterRegister *ffavin_register(GF_FilterSession *session)
+{
+	return NULL;
+}
+#endif
+
+
 #else
 
 #include <gpac/filters.h>
@@ -1812,6 +2355,10 @@
 {
 	return NULL;
 }
+const GF_FilterRegister *ffdmxpid_register(GF_FilterSession *session)
+{
+	return NULL;
+}
 
 const GF_FilterRegister *ffavin_register(GF_FilterSession *session)
 {

gpac-2.2.1.tar.gz/src/filters/ff_enc.c -> gpac-2.4.0.tar.gz/src/filters/ff_enc.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2018-2022
+ *			Copyright (c) Telecom ParisTech 2018-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / ffmpeg encode filter
@@ -32,6 +32,12 @@
 
 #include "ff_common.h"
 
+#if (LIBAVUTIL_VERSION_MAJOR < 59)
+#define _avf_dur	pkt_duration
+#else
+#define _avf_dur	duration
+#endif
+
 #define ENC_BUF_ALLOC_SAFE	10000
 
 typedef struct _gf_ffenc_ctx
@@ -46,7 +52,6 @@
 
 	//internal data
 	Bool gen_dsi;
-
 	u32 gop_size;
 	u32 target_rate;
 
@@ -108,7 +113,7 @@
 	GF_BitStream *sdbs;
 
 	Bool reconfig_pending;
-	Bool infmt_negociate;
+	Bool infmt_negotiate;
 	Bool remap_ts;
 	Bool force_reconfig;
 	u32 setup_failed;
@@ -136,9 +141,13 @@
 	AVPacket *pkt;
 #endif
 
+	u32 premul_timescale;
 	Bool args_updated;
 
 	FILE *logfile_pass1;
+
+	u64 prev_dts;
+	Bool generate_dsi_only;
 } GF_FFEncodeCtx;
 
 static GF_Err ffenc_configure_pid_ex(GF_Filter *filter, GF_FilterPid *pid, Bool is_remove, Bool is_force_reconf);
@@ -256,7 +265,6 @@
 	} else {
 		gf_filter_pid_set_property(ctx->out_pid, GF_PROP_PID_CODECID, &PROP_UINT(ctx->codecid) );
 	}
-	gf_filter_pid_set_property(ctx->out_pid, GF_PROP_PID_ISOM_STSD_TEMPLATE, NULL);
 	gf_filter_pid_set_property(ctx->out_pid, GF_PROP_PID_ISOM_SUBTYPE, NULL);
 	gf_filter_pid_set_property(ctx->out_pid, GF_PROP_PID_PROFILE_LEVEL, NULL);
 
@@ -315,6 +323,13 @@
 	}
 	if (ctx->width && ctx->height) {
 		gf_filter_pid_set_property(ctx->out_pid, GF_PROP_PID_HAS_SYNC, ctx->all_intra ? NULL : &PROP_BOOL(GF_TRUE) );
+	} else {
+		if (ctx->encoder && ctx->encoder->frame_size) {
+			u32 dur = (u32) gf_timestamp_rescale(ctx->encoder->frame_size, ctx->sample_rate, ctx->timescale);
+			gf_filter_pid_set_property(ctx->out_pid, GF_PROP_PID_CONSTANT_DURATION, &PROP_UINT(dur));
+		} else {
+			gf_filter_pid_set_property(ctx->out_pid, GF_PROP_PID_CONSTANT_DURATION, NULL);
+		}
 	}
 }
 
@@ -411,6 +426,7 @@
 	u64 now;
 	u8 *output;
 	u32 force_intra = 0;
+	u8 *temp_data = NULL;
 	Bool insert_jp2c = GF_FALSE;
 	GF_FilterPacket *dst_pck, *src_pck;
 	GF_FilterPacket *pck;
@@ -421,8 +437,8 @@
 	pck = gf_filter_pid_get_packet(ctx->in_pid);
 
 	if (!ctx->encoder) {
-		//no encoder: if negociating input format or input pid props not known yet, wait
-		if (ctx->infmt_negociate || !ctx->setup_failed) return GF_OK;
+		//no encoder: if negotiating input format or input pid props not known yet, wait
+		if (ctx->infmt_negotiate || !ctx->setup_failed) return GF_OK;
 
 		if (ctx->setup_failed==1) {
 			GF_FilterEvent fevt;
@@ -445,8 +461,14 @@
 
 	if (ctx->reconfig_pending) pck = NULL;
 
-	if (pck) data = gf_filter_pck_get_data(pck, &size);
-
+	if (pck) {
+		data = gf_filter_pck_get_data(pck, &size);
+		if ((!data || !size) && !gf_filter_pck_get_frame_interface(pck)) {
+			GF_LOG(GF_LOG_INFO, GF_LOG_CODEC, ("FFEnc Packet without associated data\n"));
+			gf_filter_pid_drop_packet(ctx->in_pid);
+			return GF_OK;
+		}
+	}
 
 	FF_INIT_PCK(ctx, pkt)
 
@@ -496,6 +518,8 @@
 			}
 		}
 	}
+	if (!ctx->nb_frames_in)
+		force_intra = 0;
 
 	if (force_intra) {
 		if (ctx->args_updated) {
@@ -516,10 +540,18 @@
 		ctx->frame->pict_type = AV_PICTURE_TYPE_I;
 	}
 
+	if (!pck && !ctx->reconfig_pending && ctx->generate_dsi_only) {
+		u32 osize;
+		gf_pixel_get_size_info(ctx->gpac_pixel_fmt, ctx->width, ctx->width, &osize, &ctx->stride, &ctx->stride_uv, &ctx->nb_planes, &ctx->uv_height);
+		temp_data = gf_malloc(osize);
+		memset(temp_data, 0, osize);
+		data = temp_data;
+		ctx->generate_dsi_only = GF_FALSE;
+	}
 
 	now = gf_sys_clock_high_res();
 	gotpck = 0;
-	if (pck) {
+	if (pck || temp_data) {
 		u32 ilaced;
 		if (data) {
 			ctx->frame->data0 = (u8 *) data;
@@ -554,26 +586,27 @@
 				return e;
 			}
 		}
-
-		ilaced = gf_filter_pck_get_interlaced(pck);
-		if (!ilaced) {
-			ctx->frame->interlaced_frame = 0;
-		} else {
-			ctx->frame->interlaced_frame = 1;
-			ctx->frame->top_field_first = (ilaced==2) ? 1 : 0;
+		if (pck) {
+			ilaced = gf_filter_pck_get_interlaced(pck);
+			if (!ilaced) {
+				ctx->frame->interlaced_frame = 0;
+			} else {
+				ctx->frame->interlaced_frame = 1;
+				ctx->frame->top_field_first = (ilaced==2) ? 1 : 0;
+			}
+			ctx->frame->pts = ffenc_get_cts(ctx, pck);
+			ctx->frame->_avf_dur = gf_filter_pck_get_duration(pck);
 		}
-		ctx->frame->pts = ffenc_get_cts(ctx, pck);
-		ctx->frame->pkt_duration = gf_filter_pck_get_duration(pck);
 
 //use signed version of timestamp rescale since we may have negative dts
-#define SCALE_TS(_ts) if (_ts != GF_FILTER_NO_TS) { _ts = gf_timestamp_rescale_signed(_ts, ctx->timescale, ctx->encoder->time_base.den); }
-#define UNSCALE_TS(_ts) if (_ts != AV_NOPTS_VALUE)  { _ts = gf_timestamp_rescale_signed(_ts, ctx->encoder->time_base.den, ctx->timescale); }
-#define UNSCALE_DUR(_ts) { _ts = gf_timestamp_rescale(_ts, ctx->encoder->time_base.den, ctx->timescale); }
+#define SCALE_TS(_ts) if (_ts != GF_FILTER_NO_TS) { _ts = gf_timestamp_rescale_signed(_ts, ctx->premul_timescale, ctx->encoder->time_base.den); }
+#define UNSCALE_TS(_ts) if (_ts != AV_NOPTS_VALUE)  { _ts = gf_timestamp_rescale_signed(_ts, ctx->encoder->time_base.den, ctx->premul_timescale); }
+#define UNSCALE_DUR(_ts) { _ts = gf_timestamp_rescale(_ts, ctx->encoder->time_base.den, ctx->premul_timescale); }
 
 		if (ctx->remap_ts) {
 			SCALE_TS(ctx->frame->pts);
 
-			SCALE_TS(ctx->frame->pkt_duration);
+			SCALE_TS(ctx->frame->_avf_dur);
 		}
 
 		//store first frame CTS as will be seen after rescaling (to cope with rounding errors
@@ -589,9 +622,19 @@
 		ctx->frame->pkt_dts = ctx->frame->pkt_pts = ctx->frame->pts;
 		res = avcodec_encode_video2(ctx->encoder, pkt, ctx->frame, &gotpck);
 		ctx->nb_frames_in++;
+		if (temp_data) {
+			gf_free(temp_data);
+			avcodec_encode_video2(ctx->encoder, pkt, NULL, &gotpck);
+		}
 #else
 		ctx->frame->pkt_dts = ctx->frame->pts;
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("FFEnc Encoding video frame PTS "LLU"\n", ctx->frame->pts));
 		res = avcodec_send_frame(ctx->encoder, ctx->frame);
+		if (temp_data) {
+			gf_free(temp_data);
+			//flush by sending NULL frame
+			avcodec_send_frame(ctx->encoder, NULL);
+		}
 		switch (res) {
 		case AVERROR(EAGAIN):
 			return GF_OK;
@@ -624,17 +667,19 @@
 
 		//keep ref to source properties
 		gf_filter_pck_ref_props(&pck);
-		gf_list_add(ctx->src_packets, pck);
+		if (pck)
+			gf_list_add(ctx->src_packets, pck);
 		if (ctx->discontunity) {
 			ctx->discontunity = GF_FALSE;
 			ctx->disc_pck_ref = pck;
 		}
 
-		gf_filter_pid_drop_packet(ctx->in_pid);
+		if (pck)
+			gf_filter_pid_drop_packet(ctx->in_pid);
 
 		if (ctx->remap_ts) {
 			UNSCALE_TS(ctx->frame->pts);
-			UNSCALE_TS(ctx->frame->pkt_duration);
+			UNSCALE_TS(ctx->frame->_avf_dur);
 			if (gotpck) {
 				UNSCALE_TS(pkt->dts);
 				UNSCALE_TS(pkt->pts);
@@ -717,7 +762,13 @@
 	count = gf_list_count(ctx->src_packets);
 	for (i=0; i<count; i++) {
 		src_pck = gf_list_get(ctx->src_packets, i);
-		if (ffenc_get_cts(ctx, src_pck) == pkt->pts) break;
+		u64 cts = ffenc_get_cts(ctx, src_pck);
+		if (ctx->remap_ts) {
+			SCALE_TS(cts);
+			UNSCALE_TS(cts);
+		}
+		if (cts == pkt->pts)
+			break;
 		src_pck = NULL;
 	}
 
@@ -812,7 +863,7 @@
 		if (pkt->duration) {
 			gf_filter_pck_set_duration(dst_pck, (u32) pkt->duration);
 		} else {
-			gf_filter_pck_set_duration(dst_pck, (u32) ctx->frame->pkt_duration);
+			gf_filter_pck_set_duration(dst_pck, (u32) ctx->frame->_avf_dur);
 		}
 	}
 	if (ctx->gen_dsi) {
@@ -822,8 +873,17 @@
 
 	ffenc_log_video(filter, ctx, pkt, gf_filter_reporting_enabled(filter));
 
+	//make sure we always send increasing DTS - this can happen when relaunching encoders, the computed delay may vary
+	//and we end up with lesser DTS for a few frames...
+	u64 dts = pkt->dts + ctx->ts_shift;
+	if (!ctx->prev_dts) {
+		ctx->prev_dts = dts;
+	} else if (ctx->prev_dts>=dts) {
+		dts = ctx->prev_dts + 1;
+	}
 	gf_filter_pck_set_cts(dst_pck, pkt->pts + ctx->ts_shift);
-	gf_filter_pck_set_dts(dst_pck, pkt->dts + ctx->ts_shift);
+	gf_filter_pck_set_dts(dst_pck, dts);
+	ctx->prev_dts = dts;
 
 	//this is not 100% correct since we don't have any clue if this is SAP1/2/3/4 ...
 	//since we send the output to our reframers we should be fine
@@ -875,14 +935,14 @@
 
 	bytes_per_chan = ctx->bytes_per_sample / ctx->channels;
 	src_frame_size = size / ctx->bytes_per_sample;
-	assert(ctx->samples_in_audio_buffer + nb_samples <= (u32) ctx->audio_buffer_size);
-	assert(!data || (sample_offset + nb_samples <= src_frame_size));
-	assert(ctx->encoder->frame_size);
+	gf_assert(ctx->samples_in_audio_buffer + nb_samples <= (u32) ctx->audio_buffer_size);
+	gf_assert(!data || (sample_offset + nb_samples <= src_frame_size));
+	gf_assert(ctx->encoder->frame_size);
 
 	f_idx = ctx->samples_in_audio_buffer / ctx->encoder->frame_size;
 	s_idx = ctx->samples_in_audio_buffer % ctx->encoder->frame_size;
 	if (s_idx) {
-		assert(s_idx + nb_samples <= (u32) ctx->encoder->frame_size);
+		gf_assert(s_idx + nb_samples <= (u32) ctx->encoder->frame_size);
 	}
 
 	offset = (f_idx * ctx->channels * ctx->encoder->frame_size + s_idx) * bytes_per_chan;
@@ -899,7 +959,7 @@
 			nb_samples_to_copy = ctx->encoder->frame_size;
 
 		if (data) {
-			assert(sample_offset<src_frame_size);
+			gf_assert(sample_offset<src_frame_size);
 			src = data + sample_offset * bytes_per_chan;
 		}
 
@@ -937,8 +997,8 @@
 	pck = gf_filter_pid_get_packet(ctx->in_pid);
 
 	if (!ctx->encoder) {
-		//no encoder: if negociating input format or input pid props not known yet, wait
-		if (ctx->infmt_negociate || !ctx->setup_failed) return GF_OK;
+		//no encoder: if negotiating input format or input pid props not known yet, wait
+		if (ctx->infmt_negotiate || !ctx->setup_failed) return GF_OK;
 
 		if (ctx->setup_failed==1) {
 			GF_FilterEvent fevt;
@@ -960,6 +1020,13 @@
 	}
 
 	if (ctx->reconfig_pending) pck = NULL;
+	if (!pck && !ctx->reconfig_pending && ctx->generate_dsi_only) {
+		if (ctx->encoder->frame_size)
+			ctx->samples_in_audio_buffer = ctx->encoder->frame_size;
+		else
+			ctx->audio_buffer_size = ctx->sample_rate / ctx->bytes_per_sample;
+		ctx->generate_dsi_only = GF_FALSE;
+	}
 
 	if (ctx->encoder->frame_size && (ctx->encoder->frame_size <= (s32) ctx->samples_in_audio_buffer)) {
 		ctx->frame->nb_samples = ctx->encoder->frame_size;
@@ -975,8 +1042,8 @@
 
 	} else if (pck) {
 		data = gf_filter_pck_get_data(pck, &size);
-		if (!data) {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_CODEC, ("FFEnc Packet without associated data\n"));
+		if (!data || !size) {
+			GF_LOG(GF_LOG_INFO, GF_LOG_CODEC, ("FFEnc Packet without associated data\n"));
 			gf_filter_pid_drop_packet(ctx->in_pid);
 			return GF_OK;
 		}
@@ -1057,14 +1124,20 @@
 	if (pck)
 		ctx->frame->nb_samples = ctx->encoder->frame_size;
 	ctx->frame->format = ctx->encoder->sample_fmt;
+#ifdef FFMPEG_OLD_CHLAYOUT
 	ctx->frame->channels = ctx->encoder->channels;
 	ctx->frame->channel_layout = ctx->encoder->channel_layout;
+#else
+	av_channel_layout_copy(&ctx->frame->ch_layout, &ctx->encoder->ch_layout);
+#endif
+
 	gotpck = 0;
 	if (pck || ctx->samples_in_audio_buffer) {
 #if (LIBAVFORMAT_VERSION_MAJOR<59)
 		ctx->frame->pkt_dts = ctx->frame->pkt_pts = ctx->frame->pts = ctx->first_byte_cts;
 		res = avcodec_encode_audio2(ctx->encoder, pkt, ctx->frame, &gotpck);
 #else
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("FFEnc Encoding audio frame PTS "LLU"\n", ctx->frame->pts));
 		ctx->frame->pkt_dts = ctx->frame->pts = ctx->first_byte_cts;
 		res = avcodec_send_frame(ctx->encoder, ctx->frame);
 		switch (res) {
@@ -1249,7 +1322,7 @@
 		gf_filter_pck_unref(src_pck);
 	}
 	if (ctx->gen_dsi) {
-		ffmpeg_generate_gpac_dsi(ctx->out_pid, ctx->codecid, ctx->encoder->color_primaries, ctx->encoder->color_trc, ctx->encoder->colorspace, output, size);
+		ffmpeg_generate_gpac_dsi(ctx->out_pid, ctx->codecid, ctx->encoder->color_primaries, ctx->encoder->color_trc, ctx->encoder->colorspace, output, pkt->size);
 		ctx->gen_dsi = GF_FALSE;
 	}
 
@@ -1465,7 +1538,12 @@
 
 		if ((type==GF_STREAM_AUDIO)
 			&& (ctx->encoder->codec->id==codec_id) && (ctx->encoder->sample_rate==ctx->sample_rate)
-			&& (ctx->encoder->channels==ctx->channels) && (ctx->gpac_audio_fmt == afmt )
+			&& (ctx->gpac_audio_fmt == afmt )
+#ifdef FFMPEG_OLD_CHLAYOUT
+			&& (ctx->encoder->channels==ctx->channels)
+#else
+			&& (ctx->encoder->ch_layout.nb_channels==ctx->channels)
+#endif
 		) {
 			reuse = GF_TRUE;
 		} else if ((ctx->encoder->codec->id==codec_id)
@@ -1582,10 +1660,10 @@
 				ff_pmft = ffmpeg_pixfmt_from_gpac(ctx->pfmt, GF_FALSE);
 			}
 			pfmt = ffmpeg_pixfmt_to_gpac(ff_pmft, GF_FALSE);
-			gf_filter_pid_negociate_property(ctx->in_pid, GF_PROP_PID_PIXFMT, &PROP_UINT(pfmt) );
-			ctx->infmt_negociate = GF_TRUE;
+			gf_filter_pid_negotiate_property(ctx->in_pid, GF_PROP_PID_PIXFMT, &PROP_UINT(pfmt) );
+			ctx->infmt_negotiate = GF_TRUE;
 		} else {
-			ctx->infmt_negociate = GF_FALSE;
+			ctx->infmt_negotiate = GF_FALSE;
 		}
 	} else {
 		u32 change_input_sr = 0;
@@ -1619,6 +1697,7 @@
 			ctx->channel_layout = gf_audio_fmt_get_layout_from_cicp(gf_audio_fmt_get_cicp_layout(ctx->channels, 0, 0));
 		}
 		u64 ff_ch_layout = ffmpeg_channel_layout_from_gpac(ctx->channel_layout);
+#ifdef FFMPEG_OLD_CHLAYOUT
 		if (!codec->channel_layouts)
 			change_chan_layout = ctx->channel_layout;
 
@@ -1630,6 +1709,19 @@
 			}
 			i++;
 		}
+#else
+		if (!codec->ch_layouts)
+			change_chan_layout = ctx->channel_layout;
+
+		while (codec->ch_layouts) {
+			if (!codec->ch_layoutsi.nb_channels) break;
+			if (codec->ch_layoutsi.u.mask == ff_ch_layout) {
+				change_chan_layout = ctx->channel_layout;
+				break;
+			}
+			i++;
+		}
+#endif
 		//vorbis in ffmpeg currently requires stereo but channel_layouts is not set
 		if (ctx->codecid==GF_CODECID_VORBIS) {
 			change_chan_layout = gf_audio_fmt_get_layout_from_cicp(gf_audio_fmt_get_cicp_layout(2, 0, 0));
@@ -1643,26 +1735,31 @@
 			if (ctx->sample_fmt != change_input_fmt) {
 				ctx->sample_fmt = codec->sample_fmts ? codec->sample_fmts0 : AV_SAMPLE_FMT_S16;
 				afmt = ffmpeg_audio_fmt_to_gpac(ctx->sample_fmt);
-				gf_filter_pid_negociate_property(ctx->in_pid, GF_PROP_PID_AUDIO_FORMAT, &PROP_UINT(afmt) );
+				gf_filter_pid_negotiate_property(ctx->in_pid, GF_PROP_PID_AUDIO_FORMAT, &PROP_UINT(afmt) );
 			}
 			if (ctx->sample_rate != change_input_sr) {
-				gf_filter_pid_negociate_property(ctx->in_pid, GF_PROP_PID_SAMPLE_RATE, &PROP_UINT(codec->supported_samplerates0) );
+				gf_filter_pid_negotiate_property(ctx->in_pid, GF_PROP_PID_SAMPLE_RATE, &PROP_UINT(codec->supported_samplerates0) );
 			}
 			if (ctx->channel_layout != change_chan_layout) {
-				if (!change_chan_layout)
+				if (!change_chan_layout) {
+#ifdef FFMPEG_OLD_CHLAYOUT
 					change_chan_layout = ffmpeg_channel_layout_to_gpac(codec->channel_layouts0);
+#else
+					change_chan_layout = ffmpeg_channel_layout_to_gpac(codec->ch_layouts0.u.mask);
+#endif
+				}
 				u32 nb_chans = gf_audio_fmt_get_num_channels_from_layout(change_chan_layout);
-				gf_filter_pid_negociate_property(ctx->in_pid, GF_PROP_PID_NUM_CHANNELS, &PROP_UINT(nb_chans) );
-				gf_filter_pid_negociate_property(ctx->in_pid, GF_PROP_PID_CHANNEL_LAYOUT, &PROP_LONGUINT(change_chan_layout) );
+				gf_filter_pid_negotiate_property(ctx->in_pid, GF_PROP_PID_NUM_CHANNELS, &PROP_UINT(nb_chans) );
+				gf_filter_pid_negotiate_property(ctx->in_pid, GF_PROP_PID_CHANNEL_LAYOUT, &PROP_LONGUINT(change_chan_layout) );
 			}
-			ctx->infmt_negociate = GF_TRUE;
+			ctx->infmt_negotiate = GF_TRUE;
 		} else {
-			ctx->infmt_negociate = GF_FALSE;
+			ctx->infmt_negotiate = GF_FALSE;
 		}
 	}
 
-	//renegociate input, wait for reconfig call
-	if (ctx->infmt_negociate) return GF_OK;
+	//renegotiate input, wait for reconfig call
+	if (ctx->infmt_negotiate) return GF_OK;
 
 	ctx->gpac_pixel_fmt = pfmt;
 	ctx->gpac_audio_fmt = afmt;
@@ -1694,7 +1791,7 @@
 		ctx->timescale = ctx->encoder->time_base.den = prop ? prop->value.uint : 1000;
 
 		prop = gf_filter_pid_get_property(pid, GF_PROP_PID_FPS);
-		if (prop) {
+		if (prop && prop->value.frac.den) {
 			Bool reset_gop = GF_FALSE;
 			//don't write gop info for these codecs, unless ctx->gop_size is set (done later)
 			if (codec_id==AV_CODEC_ID_FFV1) reset_gop = GF_TRUE;
@@ -1740,6 +1837,13 @@
 		}
 
 		gf_media_get_reduced_frame_rate(&ctx->encoder->time_base.den, &ctx->encoder->time_base.num);
+		//make sure we are still able to rescale timestamps at 1ms precision
+		if (ctx->timescale>1000) {
+			while (ctx->encoder->time_base.den<1000) {
+				ctx->encoder->time_base.den*=10;
+				ctx->encoder->time_base.num*=10;
+			}
+		}
 
 		if (ctx->low_delay) {
 			av_dict_set(&ctx->options, "profile", "baseline", 0);
@@ -1762,7 +1866,7 @@
 		ctx->encoder->color_primaries = prop ? prop->value.uint : AVCOL_PRI_UNSPECIFIED;
 
 		prop = gf_filter_pid_get_property(pid, GF_PROP_PID_COLR_RANGE);
-		if (prop) ctx->encoder->color_range = (prop->value.uint==1) ? AVCOL_RANGE_JPEG : AVCOL_RANGE_MPEG;
+		if (prop) ctx->encoder->color_range = (prop->value.boolean) ? AVCOL_RANGE_JPEG : AVCOL_RANGE_MPEG;
 		else ctx->encoder->color_range = AVCOL_RANGE_UNSPECIFIED;
 
 		prop = gf_filter_pid_get_property(pid, GF_PROP_PID_COLR_TRANSFER);
@@ -1779,8 +1883,14 @@
 		//in annexB (extradata only contains SPS/PPS/etc in annexB)
 		//so we indicate unframed for these codecs and use our own filter for annexB->MP4
 
-		if (!ctx->frame)
+		if (!ctx->frame) {
 			ctx->frame = av_frame_alloc();
+			ctx->frame->color_range = ctx->encoder->color_range;
+			ctx->frame->color_primaries = ctx->encoder->color_primaries;
+			ctx->frame->color_trc = ctx->encoder->color_trc;
+			ctx->frame->colorspace = ctx->encoder->colorspace;
+			ctx->frame->chroma_location = ctx->encoder->chroma_sample_location;
+		}
 
 		ctx->enc_buffer_size = ctx->width*ctx->height + ENC_BUF_ALLOC_SAFE;
 		ctx->enc_buffer = gf_realloc(ctx->enc_buffer, sizeof(char)*ctx->enc_buffer_size);
@@ -1790,13 +1900,13 @@
 		ctx->encoder->pix_fmt = ctx->pixel_fmt;
 		ctx->init_cts_setup = GF_TRUE;
 		ctx->frame->format = ctx->encoder->pix_fmt;
-	} else if (type==GF_STREAM_AUDIO) {
-		ctx->process = ffenc_process_audio;
 
+		if (ctx->codecid==GF_CODECID_AV1)
+			av_dict_set(&ctx->options, "strict", "experimental", 0);
+	} else if (type==GF_STREAM_AUDIO) {
 		ctx->encoder->sample_rate = ctx->sample_rate;
+#ifdef FFMPEG_OLD_CHLAYOUT
 		ctx->encoder->channels = ctx->channels;
-
-		//TODO
 		prop = gf_filter_pid_get_property(pid, GF_PROP_PID_CHANNEL_LAYOUT);
 		if (prop) {
 			ctx->encoder->channel_layout = ffmpeg_channel_layout_from_gpac(prop->value.longuint);
@@ -1805,6 +1915,19 @@
 		} else if (ctx->channels==2) {
 			ctx->encoder->channel_layout = AV_CH_LAYOUT_STEREO;
 		}
+#else
+		av_channel_layout_uninit(&ctx->encoder->ch_layout);
+		ctx->encoder->ch_layout.order = AV_CHANNEL_ORDER_NATIVE;
+		ctx->encoder->ch_layout.nb_channels = ctx->channels;
+		prop = gf_filter_pid_get_property(pid, GF_PROP_PID_CHANNEL_LAYOUT);
+		if (prop) {
+			ctx->encoder->ch_layout.u.mask = ffmpeg_channel_layout_from_gpac(prop->value.longuint);
+		} else if (ctx->channels==1) {
+			ctx->encoder->ch_layout.u.mask = AV_CH_LAYOUT_MONO;
+		} else if (ctx->channels==2) {
+			ctx->encoder->ch_layout.u.mask = AV_CH_LAYOUT_STEREO;
+		}
+#endif
 
 		prop = gf_filter_pid_get_property(pid, GF_PROP_PID_TIMESCALE);
 		if (prop) {
@@ -1921,6 +2044,7 @@
 	}
 
 	av_dict_copy(&options, ctx->options, 0);
+	ffmpeg_check_threads(filter, options, ctx->encoder);
 	res = avcodec_open2(ctx->encoder, codec, &options);
 	if (res < 0) {
 		if (options) av_dict_free(&options);
@@ -1930,6 +2054,10 @@
 		ctx->setup_failed = 1;
 		return GF_BAD_PARAM;
 	}
+	//precompute gpac_timescale * encoder->time_base.num for rescale operations
+	//do that AFTER opening the codec, since some codecs may touch this field ...
+	ctx->premul_timescale = ctx->timescale;
+	ctx->premul_timescale *= ctx->encoder->time_base.num;
 
 	if (ctx->c) gf_free(ctx->c);
 	ctx->c = gf_strdup(codec->name);
@@ -1937,7 +2065,7 @@
 	{
 		char szCodecName1000;
 		if (ctx->encoder->thread_count>1)
-			sprintf(szCodecName, "ffenc:%s (%d frames)", codec->name ? codec->name : "unknown", ctx->encoder->thread_count);
+			sprintf(szCodecName, "ffenc:%s (%d threads)", codec->name ? codec->name : "unknown", ctx->encoder->thread_count);
 		else
 			sprintf(szCodecName, "ffenc:%s", codec->name ? codec->name : "unknown");
 		gf_filter_set_name(filter, szCodecName);
@@ -1945,7 +2073,7 @@
 	}
 
 
-	ctx->remap_ts = (ctx->encoder->time_base.den != ctx->timescale) ? GF_TRUE : GF_FALSE;
+	ctx->remap_ts = (ctx->encoder->time_base.den && (ctx->encoder->time_base.den != ctx->premul_timescale)) ? GF_TRUE : GF_FALSE;
 	if (!ctx->target_rate)
 		ctx->target_rate = (u32)ctx->encoder->bit_rate;
 
@@ -1988,9 +2116,9 @@
 
 	if (!strcmp(arg_name, "b") && arg_val->value.string) {
 		ctx->target_rate = atoi(arg_val->value.string);
-		if (strchr(arg_val->value.string, 'm') || strchr(arg_val->value.string, 'M'))
+		if (strpbrk(arg_val->value.string, "mM"))
 			ctx->target_rate *= 1000000;
-		else if (strchr(arg_val->value.string, 'k') || strchr(arg_val->value.string, 'K'))
+		else if (strpbrk(arg_val->value.string, "kK"))
 			ctx->target_rate *= 1000;
 
 		sprintf(szOverrideOpt, "%d", ctx->target_rate);
@@ -2046,10 +2174,14 @@
 
 static Bool ffenc_process_event(GF_Filter *filter, const GF_FilterEvent *evt)
 {
+	GF_FFEncodeCtx *ctx = gf_filter_get_udta(filter);
 	if (evt->base.type==GF_FEVT_ENCODE_HINTS) {
-		GF_FFEncodeCtx *ctx = gf_filter_get_udta(filter);
-		if ((ctx->fintra.num<0) && evt->encode_hints.intra_period.den && evt->encode_hints.intra_period.num) {
+		if (evt->encode_hints.gen_dsi_only) {
+			ctx->generate_dsi_only = GF_TRUE;
+		}
+		else if ((ctx->fintra.num<0) && evt->encode_hints.intra_period.den && evt->encode_hints.intra_period.num) {
 			ctx->fintra = evt->encode_hints.intra_period;
+
 			if (!ctx->rc || (gf_list_count(ctx->src_packets) && !ctx->force_reconfig)) {
 				ctx->reconfig_pending = GF_TRUE;
 				ctx->force_reconfig = GF_TRUE;
@@ -2111,7 +2243,9 @@
 	.process = ffenc_process,
 	.process_event = ffenc_process_event,
 	.update_arg = ffenc_update_arg,
-	.flags = GF_FS_REG_META | GF_FS_REG_TEMP_INIT,
+	.flags = GF_FS_REG_META | GF_FS_REG_TEMP_INIT | GF_FS_REG_BLOCK_MAIN,
+	//use middle priority in case we have other encoders
+	.priority = 128
 };
 
 #define OFFS(_n)	#_n, offsetof(GF_FFEncodeCtx, _n)

gpac-2.2.1.tar.gz/src/filters/ff_mx.c -> gpac-2.4.0.tar.gz/src/filters/ff_mx.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom Paris 2019-2022
+ *			Copyright (c) Telecom Paris 2019-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / ffmpeg muxer filter
@@ -125,9 +125,10 @@
 	u32 min_timescale=1000;
 	int res;
 
-	assert(ctx->status==FFMX_STATE_AVIO_OPEN);
+	gf_assert(ctx->status==FFMX_STATE_AVIO_OPEN);
 
 	ctx->status = FFMX_STATE_HDR_DONE;
+	ctx->probe_init = 0;
 
 	AVDictionary *options = NULL;
 	av_dict_copy(&options, ctx->options, 0);
@@ -138,6 +139,7 @@
 		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("FFMux Fail to open %s - error %s\n", ctx->dst, av_err2str(res) ));
 		ctx->status = FFMX_STATE_ERROR;
 		if (options) av_dict_free(&options);
+		gf_filter_abort(filter);
 		return GF_NOT_SUPPORTED;
 	}
 
@@ -175,6 +177,9 @@
 		}
 	}
 
+	const GF_PropertyValue *chap_t=NULL;
+	const GF_PropertyValue *chap_n=NULL;
+	u64 max_dur=0;
 	for (i=0; i<nb_pids; i++) {
 		GF_FilterPid *ipid = gf_filter_get_ipid(filter, i);
 		GF_FFMuxStream *st = gf_filter_pid_get_udta(ipid);
@@ -191,6 +196,40 @@
 		if (!ctx->keepts) {
 			st->ts_shift = st->ts_shift - gf_timestamp_rescale(min_ts, min_timescale, st->in_scale.den);
 		}
+
+		chap_t = gf_filter_pid_get_property(ipid, GF_PROP_PID_CHAP_TIMES);
+		chap_n = gf_filter_pid_get_property(ipid, GF_PROP_PID_CHAP_NAMES);
+		if (chap_t && chap_n && (chap_t->value.uint_list.nb_items == chap_n->value.string_list.nb_items)) {
+		} else {
+			chap_t = chap_n = NULL;
+		}
+		p = gf_filter_pid_get_property(ipid, GF_PROP_PID_DURATION);
+		if (p) {
+			u64 d = gf_timestamp_rescale(p->value.lfrac.num, p->value.lfrac.den, 1000);
+			if (max_dur<d) max_dur = d;
+		}
+	}
+
+	if (chap_t) {
+		ctx->muxer->nb_chapters = chap_t->value.uint_list.nb_items;
+		ctx->muxer->chapters = av_malloc(sizeof(AVChapter*)* ctx->muxer->nb_chapters);
+		for (i=0; i<ctx->muxer->nb_chapters; i++) {
+			AVChapter *ch = av_malloc(sizeof(AVChapter));
+			memset(ch, 0, sizeof(AVChapter));
+			ctx->muxer->chaptersi = ch;
+			ch->start = chap_t->value.uint_list.valsi;
+			if (i+1<ctx->muxer->nb_chapters)
+				ch->end = chap_t->value.uint_list.valsi+1;
+			else if (max_dur)
+				ch->end = max_dur;
+			else
+				ch->end = ch->start;
+			if (ch->end < ch->start) ch->end = ch->start;
+			ch->id = i+1;
+			ch->time_base.num = 1;
+			ch->time_base.den = 1000;
+			av_dict_set(&ch->metadata, "title", chap_n->value.string_list.valsi, 0);
+		}
 	}
 
 	res = avformat_write_header(ctx->muxer, &options);
@@ -198,6 +237,7 @@
 		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("FFMux Fail to write header for %s - error %s\n", ctx->dst, av_err2str(res) ));
 		ctx->status = FFMX_STATE_ERROR;
 		if (options) av_dict_free(&options);
+		gf_filter_abort(filter);
 		return GF_SERVICE_ERROR;
 	}
 
@@ -207,7 +247,11 @@
 }
 
 
+#if (LIBAVFORMAT_VERSION_MAJOR <= 59)
 static int ffavio_write_packet(void *opaque, uint8_t *buf, int buf_size)
+#else
+static int ffavio_write_packet(void *opaque, const uint8_t *buf, int buf_size)
+#endif
 {
 	GF_FFMuxCtx *ctx = (GF_FFMuxCtx *)opaque;
 	return (int) gf_fwrite(buf, buf_size, ctx->gfio);
@@ -372,7 +416,11 @@
 		segmux->max_delay = ctx->muxer->max_delay;
 		av_dict_copy(&segmux->metadata, ctx->muxer->metadata, 0);
 		segmux->opaque = ctx->muxer->opaque;
+#if (LIBAVFORMAT_VERSION_MAJOR < 59)
 		segmux->io_close = ctx->muxer->io_close;
+#else
+		segmux->io_close2 = ctx->muxer->io_close2;
+#endif
 		segmux->io_open = ctx->muxer->io_open;
 		segmux->flags = ctx->muxer->flags;
 
@@ -381,8 +429,10 @@
 			AVStream *st;
 			AVCodecParameters *ipar, *opar;
 
-			if (!(st = avformat_new_stream(segmux, NULL)))
+			if (!(st = avformat_new_stream(segmux, NULL))) {
+				avformat_free_context(segmux);
 				return GF_OUT_OF_MEM;
+			}
 			ipar = ctx->muxer->streamsi->codecpar;
 			opar = st->codecpar;
 			avcodec_parameters_copy(opar, ipar);
@@ -417,7 +467,11 @@
 		avformat_free_context(ctx->muxer);
 		ctx->muxer = segmux;
 	} else {
+#if (LIBAVFORMAT_VERSION_MAJOR < 59)
 		ctx->muxer->io_close(ctx->muxer, ctx->muxer->pb);
+#else
+		ctx->muxer->io_close2(ctx->muxer, ctx->muxer->pb);
+#endif
 		ctx->muxer->pb = NULL;
 	}
 
@@ -503,7 +557,11 @@
 		evt.seg_size.is_init = 0;
 	}
 	evt.seg_size.media_range_start = ctx->offset_at_seg_start;
+#if LIBAVFORMAT_VERSION_MAJOR < 59
 	evt.seg_size.media_range_end = ctx->muxer->pb ? (ctx->muxer->pb->written-1) : 0;
+#else
+	evt.seg_size.media_range_end = ctx->muxer->pb ? (ctx->muxer->pb->bytes_written-1) : 0;
+#endif
 	ctx->offset_at_seg_start = evt.seg_size.media_range_end;
 
 	gf_filter_pid_send_event(pid, &evt);
@@ -557,13 +615,20 @@
 		}
 	}
 	if (st->reconfig_stream & FFMX_INJECT_AUD_INFO) {
-		u32 sr, ch, size=12;
-		u64 ch_layout;
-		u32 flags = AV_SIDE_DATA_PARAM_CHANGE_CHANNEL_COUNT | AV_SIDE_DATA_PARAM_CHANGE_SAMPLE_RATE;
+		u32 sr,  size=12;
+		u32 flags = AV_SIDE_DATA_PARAM_CHANGE_SAMPLE_RATE;
+#ifdef FFMPEG_OLD_CHLAYOUT
+		flags |= AV_SIDE_DATA_PARAM_CHANGE_CHANNEL_COUNT;
+		u64 ch_layout=0;
+		u32 ch;
+#endif
+
 		p = gf_filter_pid_get_property(pid, GF_PROP_PID_SAMPLE_RATE);
 		sr = p ? p->value.uint : st->stream->codecpar->sample_rate;
+#ifdef FFMPEG_OLD_CHLAYOUT
 		p = gf_filter_pid_get_property(pid, GF_PROP_PID_NUM_CHANNELS);
 		ch = p ? p->value.uint : st->stream->codecpar->channels;
+
 		p = gf_filter_pid_get_property(pid, GF_PROP_PID_CHANNEL_LAYOUT);
 		if (p) {
 			ch_layout = ffmpeg_channel_layout_from_gpac(p->value.uint);
@@ -574,14 +639,17 @@
 			size += 8;
 			flags |= AV_SIDE_DATA_PARAM_CHANGE_CHANNEL_LAYOUT;
 		}
+#endif
 
 		data = av_packet_new_side_data(pkt, AV_PKT_DATA_PARAM_CHANGE, size);
 		if (data) {
 			GF_BitStream *bs = gf_bs_new(data, 12, GF_BITSTREAM_WRITE);
 			gf_bs_write_u32_le(bs, flags);
+#ifdef FFMPEG_OLD_CHLAYOUT
 			gf_bs_write_u32_le(bs, ch);
 			if (flags & AV_SIDE_DATA_PARAM_CHANGE_CHANNEL_LAYOUT)
 				gf_bs_write_u64_le(bs, ch_layout);
+#endif
 			gf_bs_write_u32_le(bs, sr);
 			gf_bs_del(bs);
 		}
@@ -715,7 +783,7 @@
 			AVPacket *pkt;
 			GF_FilterPacket *ipck = gf_filter_pid_get_packet(ipid);
 			if (!ipck) {
-				if (gf_filter_pid_is_eos(ipid)) {
+				if (gf_filter_pid_is_eos(ipid) && !gf_filter_pid_is_flush_eos(ipid)) {
 					nb_done++;
 				}
 				break;
@@ -807,10 +875,6 @@
 			} else {
 				res = av_write_frame(ctx->muxer, pkt);
 			}
-			if (res<0) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("FFMux Fail to write packet %sto %s - error %s\n", st->reconfig_stream ? "with reconfig side data " : "", AVFMT_URL(ctx->muxer), av_err2str(res) ));
-				e = GF_IO_ERR;
-			}
 
 			if (pkt->side_data) av_packet_free_side_data(pkt);
 			st->reconfig_stream = 0;
@@ -818,6 +882,13 @@
 			gf_filter_pid_drop_packet(ipid);
 			ctx->nb_pck_in_seg++;
 			FF_RELEASE_PCK(pkt)
+
+			if (res<0) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("FFMux Fail to write packet %sto %s: error %s - aborting\n", st->reconfig_stream ? "with reconfig side data " : "", AVFMT_URL(ctx->muxer), av_err2str(res) ));
+				e = GF_IO_ERR;
+				ctx->status = FFMX_STATE_ERROR;
+				gf_filter_abort(filter);
+			}
 		}
 	}
 
@@ -996,14 +1067,30 @@
 			case GF_AUDIO_FMT_S24P:
 				ff_codec_id = AV_CODEC_ID_PCM_S24LE;
 				break;
+			case GF_AUDIO_FMT_S24_BE:
+				ff_codec_id = AV_CODEC_ID_PCM_S24BE;
+				break;
 			case GF_AUDIO_FMT_S32:
 			case GF_AUDIO_FMT_S32P:
 				ff_codec_id = AV_CODEC_ID_PCM_S32LE;
 				break;
+			case GF_AUDIO_FMT_S32_BE:
+				ff_codec_id = AV_CODEC_ID_PCM_S32BE;
+				break;
 			case GF_AUDIO_FMT_FLT:
 			case GF_AUDIO_FMT_FLTP:
 				ff_codec_id = AV_CODEC_ID_PCM_F32LE;
 				break;
+			case GF_AUDIO_FMT_FLT_BE:
+				ff_codec_id = AV_CODEC_ID_PCM_F32BE;
+				break;
+			case GF_AUDIO_FMT_DBL:
+			case GF_AUDIO_FMT_DBLP:
+				ff_codec_id = AV_CODEC_ID_PCM_F64LE;
+				break;
+			case GF_AUDIO_FMT_DBL_BE:
+				ff_codec_id = AV_CODEC_ID_PCM_F64BE;
+				break;
 			default:
 				GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("FFMux Unmapped raw audio format %s to FFMPEG, patch welcome\n", gf_audio_fmt_name(p->value.uint) ));
 				return GF_NOT_SUPPORTED;
@@ -1013,13 +1100,21 @@
 		ff_codec_id = ffmpeg_codecid_from_gpac(codec_id, &ff_codec_tag);
 	}
 
+
+	res = 1;
+#if LIBAVFORMAT_VERSION_MAJOR < 60
 	if (ctx->muxer->oformat && ctx->muxer->oformat->query_codec) {
 		res = ctx->muxer->oformat->query_codec(ff_codec_id, 1);
-		if (!res) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("FFMux Codec %s not supported in container %s\n", gf_codecid_name(codec_id), ctx->muxer->oformat->name));
-			return GF_NOT_SUPPORTED;
-		}
 	}
+#else
+	res = avformat_query_codec(ctx->muxer->oformat, ff_codec_id, FF_COMPLIANCE_NORMAL);
+#endif
+
+	if (!res) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("FFMux Codec %s not supported in container %s\n", gf_codecid_name(codec_id), ctx->muxer->oformat->name));
+		return GF_NOT_SUPPORTED;
+	}
+
 	const AVCodec *c = avcodec_find_decoder(ff_codec_id);
 	if (!c) return GF_NOT_SUPPORTED;
 
@@ -1096,18 +1191,25 @@
 			if ((w != avst->codecpar->width) || (h != avst->codecpar->height))
 				st->reconfig_stream |= FFMX_INJECT_VID_INFO;
 		} else if (streamtype==GF_STREAM_AUDIO) {
-			u32 sr, ch;
+			u32 sr;
 			u64 ch_layout;
 			p = gf_filter_pid_get_property(pid, GF_PROP_PID_SAMPLE_RATE);
 			sr = p ? p->value.uint : 0;
+#ifdef FFMPEG_OLD_CHLAYOUT
 			p = gf_filter_pid_get_property(pid, GF_PROP_PID_NUM_CHANNELS);
-			ch = p ? p->value.uint : 0;
+			u32 ch = p ? p->value.uint : 0;
+#endif
 			p = gf_filter_pid_get_property(pid, GF_PROP_PID_CHANNEL_LAYOUT);
 			ch_layout = p ? p->value.uint : 0;
 			if (ch_layout)
 				ch_layout = ffmpeg_channel_layout_from_gpac(ch_layout);
-			if ((sr != avst->codecpar->sample_rate) || (ch != avst->codecpar->channels) || (ch_layout!=avst->codecpar->channel_layout))
+			if ((sr != avst->codecpar->sample_rate)
+#ifdef FFMPEG_OLD_CHLAYOUT
+				|| (ch != avst->codecpar->channels) || (ch_layout!=avst->codecpar->channel_layout)
+#endif
+			) {
 				st->reconfig_stream |= FFMX_INJECT_AUD_INFO;
+			}
 		}
 
 		p = gf_filter_pid_get_property(pid, GF_PROP_PID_TIMESCALE);
@@ -1166,12 +1268,21 @@
 	}
 	else if (streamtype==GF_STREAM_AUDIO) {
 		u64 ch_layout;
-		u32 samplerate=0;
-
+		u32 nb_ch, samplerate=0;
+#ifndef FFMPEG_OLD_CHLAYOUT
+		av_channel_layout_uninit(&avst->codecpar->ch_layout);
+		avst->codecpar->ch_layout.order = AV_CHANNEL_ORDER_NATIVE;
+#endif
 		p = gf_filter_pid_get_property(pid, GF_PROP_PID_SAMPLE_RATE);
 		if (p) avst->codecpar->sample_rate = samplerate = p->value.uint;
 		p = gf_filter_pid_get_property(pid, GF_PROP_PID_NUM_CHANNELS);
+#ifdef FFMPEG_OLD_CHLAYOUT
 		if (p) avst->codecpar->channels = p->value.uint;
+		nb_ch = avst->codecpar->channels;
+#else
+		if (p) avst->codecpar->ch_layout.nb_channels = p->value.uint;
+		nb_ch = avst->codecpar->ch_layout.nb_channels;
+#endif
 		p = gf_filter_pid_get_property(pid, GF_PROP_PID_SAMPLES_PER_FRAME);
 		if (p) avst->codecpar->frame_size = p->value.uint;
 		p = gf_filter_pid_get_property(pid, GF_PROP_PID_AUDIO_BPS);
@@ -1185,12 +1296,16 @@
 		p = gf_filter_pid_get_property(pid, GF_PROP_PID_CHANNEL_LAYOUT);
 		if (p)
 			ch_layout = p->value.longuint;
-		else if (avst->codecpar->channels==2)
+		else if (nb_ch==2)
 			ch_layout = GF_AUDIO_CH_FRONT_LEFT|GF_AUDIO_CH_FRONT_RIGHT;
-		else if (avst->codecpar->channels==1)
+		else if (nb_ch==1)
 			ch_layout = GF_AUDIO_CH_FRONT_CENTER;
 
+#ifdef FFMPEG_OLD_CHLAYOUT
 		avst->codecpar->channel_layout = ch_layout ? ffmpeg_channel_layout_from_gpac(ch_layout) : 0;
+#else
+		avst->codecpar->ch_layout.u.mask = ch_layout ? ffmpeg_channel_layout_from_gpac(ch_layout) : 0;
+#endif
 
 		p = gf_filter_pid_get_property(pid, GF_PROP_PID_DELAY);
 		if (p && (p->value.sint<0) && samplerate) {
@@ -1235,7 +1350,7 @@
 		AVContentLightMetadata *data = av_malloc(sizeof(AVContentLightMetadata));
 		if (data) {
 			data->MaxCLL = gf_bs_read_u16(bs);
-			data->MaxFALL = gf_bs_read_u16(bs);;
+			data->MaxFALL = gf_bs_read_u16(bs);
 			av_stream_add_side_data(st->stream, AV_PKT_DATA_CONTENT_LIGHT_LEVEL, (u8*) data, sizeof(AVContentLightMetadata));
 		}
 		gf_bs_del(bs);
@@ -1295,11 +1410,17 @@
 #endif
 
 	p = gf_filter_pid_get_property(pid, GF_PROP_PID_DASH_MODE);
-	if (p && (p->value.uint==1)) {
-		ctx->dash_mode = GF_TRUE;
+	if (p) {
+		if (p->value.uint==2) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("FFMux DASH/M3U8 muxing in single file is not supported\n"));
+			return GF_NOT_SUPPORTED;
+		}
+		if (p->value.uint==1) {
+			ctx->dash_mode = GF_TRUE;
+			ctx->ileave.num = 0;
+		}
 	}
 
-
 	gf_filter_pid_set_framing_mode(pid, GF_TRUE);
 	return GF_OK;
 }
@@ -1318,9 +1439,13 @@
 			}
 		}
 		ctx->status = FFMX_STATE_TRAILER_DONE;
-	} 
+	}
 	if (!ctx->gfio && ctx->muxer && ctx->muxer->pb) {
+#if (LIBAVFORMAT_VERSION_MAJOR < 59)
 		ctx->muxer->io_close(ctx->muxer, ctx->muxer->pb);
+#else
+		ctx->muxer->io_close2(ctx->muxer, ctx->muxer->pb);
+#endif
 	}
 
 #if (LIBAVCODEC_VERSION_MAJOR >= 59)
@@ -1357,7 +1482,6 @@
 	if (!url)
 		return GF_FPROBE_NOT_SUPPORTED;
 
-
 	const AVOutputFormat *ofmt = av_guess_format(NULL, url, mime);
 	if (!ofmt && mime) ofmt = av_guess_format(NULL, NULL, mime);
 	if (!ofmt && url) ofmt = av_guess_format(NULL, url, NULL);
@@ -1366,7 +1490,7 @@
 
 	proto = strstr(url, "://");
 	if (!proto)
-		return GF_FPROBE_NOT_SUPPORTED;
+		return GF_FPROBE_MAYBE_NOT_SUPPORTED;
 
 	proto = avio_find_protocol_name(url);
 	if (proto)
@@ -1387,7 +1511,7 @@
 	CAP_UINT(GF_CAPS_INPUT, GF_PROP_PID_CODECID, GF_CODECID_SIMPLE_TEXT),
 	CAP_UINT(GF_CAPS_INPUT, GF_PROP_PID_CODECID, GF_CODECID_SUBS_TEXT),
 	{0},
-	//these  ones are framed (DVB subs, simple text)
+	//these ones are framed (DVB subs, simple text)
 	CAP_UINT(GF_CAPS_INPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_TEXT),
 	CAP_BOOL(GF_CAPS_INPUT_EXCLUDED, GF_PROP_PID_UNFRAMED, GF_TRUE),
 	CAP_UINT(GF_CAPS_INPUT, GF_PROP_PID_CODECID, GF_CODECID_SIMPLE_TEXT),
@@ -1411,6 +1535,8 @@
 		"Unlike other multiplexing filters in GPAC, this filter is a sink filter and does not produce any PID to be redirected in the graph.\n"
 		"The filter can however use template names for its output, using the first input PID to resolve the final name.\n"
 		"The filter watches the property `FileNumber` on incoming packets to create new files.\n"
+		"\n"
+		"All PID properties prefixed with `meta:` will be added as metadata.\n"
 	)
 	.private_size = sizeof(GF_FFMuxCtx),
 	SETCAPS(FFMuxCaps),
@@ -1462,4 +1588,3 @@
 	return NULL;
 }
 #endif
-

gpac-2.2.1.tar.gz/src/filters/ff_rescale.c -> gpac-2.4.0.tar.gz/src/filters/ff_rescale.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2018-2022
+ *			Copyright (c) Telecom ParisTech 2018-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / ffmpeg video rescaler filter
@@ -78,9 +78,11 @@
 	u32 repack_generic, repack_depth;
 	Bool repack_yuv, repack_alpha;
 
+#ifndef GPAC_DISABLE_EVG
 	GF_EVGSurface *surf;
 	GF_EVGStencil *tx;
 	GF_Path *path;
+#endif
 } GF_FFSWScaleCtx;
 
 #include <libavutil/intreadwrite.h>
@@ -253,6 +255,7 @@
 			src_planes1 = src_planes0 + ctx->src_stride0*ctx->h;
 			src_planes2 = src_planes1 + ctx->src_stride1*ctx->h;
 		} else if (ctx->unpack_generic) {
+#ifndef GPAC_DISABLE_EVG
 			GF_Err e = gf_evg_stencil_set_texture_planes(ctx->tx, ctx->w, ctx->h, ctx->s_pfmt, data, ctx->orig_in_stride, NULL, NULL, 0, NULL, 0);
 			if (e) return e;
 
@@ -318,6 +321,10 @@
 				src_planes1 = src_planes0 + ctx->src_stride0*ctx->h;
 				src_planes2 = src_planes1 + ctx->src_stride1*ctx->h;
 			}
+#else
+			gf_filter_pid_drop_packet(ctx->ipid);
+			return GF_NOT_SUPPORTED;
+#endif
 		} else {
 			if (ctx->nb_src_planes==1) {
 			} else if (ctx->nb_src_planes==2) {
@@ -380,11 +387,13 @@
 
 		dst_planes3 += ctx->dst_stride3 * ctx->offset_h + ctx->offset_w*ctx->o_bpp;
 	}
+#ifndef GPAC_DISABLE_EVG
 	if (ctx->offset_w || ctx->offset_h) {
 		u32 color = ctx->padclr ? gf_color_parse(ctx->padclr) : 0xFF000000;
 		gf_evg_surface_attach_to_buffer(ctx->surf, output, ctx->ow, ctx->oh, 0, ctx->dst_stride0, ctx->ofmt);
 		gf_evg_surface_clear(ctx->surf, NULL, color);
 	}
+#endif
 
 	//rescale the cropped frame
 	res = sws_scale(ctx->swscaler, (const u8**) src_planes, ctx->src_stride, 0, ctx->h, dst_planes, ctx->dst_stride);
@@ -497,10 +506,16 @@
 			}
 		}
 	} else if (ctx->repack_generic) {
+#ifndef GPAC_DISABLE_EVG
 		gf_evg_surface_attach_to_buffer(ctx->surf, pck_data, ctx->ow, ctx->oh, 0, ctx->repack_stride, ctx->ofmt);
 		gf_evg_stencil_set_texture(ctx->tx, ctx->repack_buf, ctx->ow, ctx->oh, ctx->dst_stride0, ctx->repack_generic);
 		gf_evg_surface_set_path(ctx->surf, ctx->path);
 		gf_evg_surface_fill(ctx->surf, ctx->tx);
+#else
+		gf_filter_pck_discard(dst_pck);
+		gf_filter_pid_drop_packet(ctx->ipid);
+		return GF_NOT_SUPPORTED;
+#endif
 	} else if (ctx->swap_idx_1 || ctx->swap_idx_2) {
 		u32 i, j;
 		for (i=0; i<ctx->h; i++) {
@@ -581,6 +596,7 @@
 			if (!p) gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_PIXFMT, &PROP_UINT(GF_PIXEL_RGB));
 
 			ctx->passthrough = GF_TRUE;
+			GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("FFSWS Running in passthrough mode\n"));
 		}
 		return GF_OK;
 	}
@@ -702,6 +718,7 @@
 		memset(ctx->dst_stride, 0, sizeof(ctx->dst_stride));
 		gf_pixel_get_size_info(ctx->ofmt, ctx->ow, ctx->oh, &ctx->out_size, &ctx->dst_stride0, &ctx->dst_stride1, &ctx->nb_planes, &ctx->dst_uv_height);
 		ctx->passthrough = GF_TRUE;
+		GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("FFSWS Running in passthrough mode\n"));
 	} else {
 		u32 nb_par = 0;
 		nb_par = 0;
@@ -723,6 +740,7 @@
 		} else {
 			ff_src_pfmt = ffmpeg_pixfmt_from_gpac(ofmt, GF_TRUE);
 			if (ff_src_pfmt==AV_PIX_FMT_NONE) {
+#ifndef GPAC_DISABLE_EVG
 				if (gf_evg_stencil_set_texture(ctx->tx, (u8*)ctx, 4, 2, 0, ofmt)==GF_OK) {
 					ctx->unpack_yuv = gf_pixel_fmt_is_yuv(ofmt);
 					ctx->unpack_depth = gf_pixel_is_wide_depth(ofmt);
@@ -735,6 +753,7 @@
 					}
 					ff_src_pfmt = ffmpeg_pixfmt_from_gpac(ctx->unpack_generic, GF_FALSE);
 				}
+#endif
 			}
 		}
 		if (ctx->ofmt == GF_PIXEL_YUV444_10_PACK) {
@@ -746,6 +765,7 @@
 		} else {
 			ff_dst_pfmt = ffmpeg_pixfmt_from_gpac(ctx->ofmt, GF_TRUE);
 			if (ff_dst_pfmt == AV_PIX_FMT_NONE) {
+#ifndef GPAC_DISABLE_EVG
 				if (gf_evg_surface_attach_to_buffer(ctx->surf, (u8 *) ctx, 4, 2, 0, 0, ctx->ofmt)==GF_OK) {
 					ctx->repack_yuv = gf_pixel_fmt_is_yuv(ctx->ofmt);
 					ctx->repack_depth = gf_pixel_is_wide_depth(ctx->ofmt);
@@ -758,6 +778,7 @@
 					}
 					ff_dst_pfmt = ffmpeg_pixfmt_from_gpac(ctx->repack_generic, GF_FALSE);
 				}
+#endif
 			}
 		}
 
@@ -768,6 +789,10 @@
 		memset(ctx->src_stride, 0, sizeof(ctx->src_stride));
 		if (ctx->stride) ctx->src_stride0 = ctx->stride;
 
+		GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("FFSWS Converting from %ux%u@%s to %ux%u@%s\n",
+			w, h, gf_pixel_fmt_name(ofmt),
+			ctx->ow, ctx->oh, gf_pixel_fmt_name(ctx->ofmt)
+		));
 
 		res = gf_pixel_get_size_info(ofmt, w, h, &ctx->out_src_size, &ctx->src_stride0, &ctx->src_stride1, &ctx->nb_src_planes, &ctx->src_uv_height);
 		if (!res) {
@@ -838,8 +863,10 @@
 			if (ctx->repack_alpha)
 				ctx->dst_stride3 = ctx->dst_stride0;
 
+#ifndef GPAC_DISABLE_EVG
 			gf_path_reset(ctx->path);
 			gf_path_add_rect_center(ctx->path, 0, 0, INT2FIX(ctx->ow), INT2FIX(ctx->oh));
+#endif
 		}
 		if (nb_par) {
 			if ((nb_par==1) && (ctx->p1!=GF_MAX_DOUBLE) ) {
@@ -938,9 +965,11 @@
 {
 	GF_FFSWScaleCtx *ctx = gf_filter_get_udta(filter);
 	ffmpeg_setup_logs(GF_LOG_MEDIA);
+#ifndef GPAC_DISABLE_EVG
 	ctx->surf = gf_evg_surface_new(GF_TRUE);
 	ctx->tx = gf_evg_stencil_new(GF_STENCIL_TEXTURE);
 	ctx->path = gf_path_new();
+#endif
 
 	if (ctx->osar.num &&
 	 ((ctx->osar.num<0) || (ctx->osar.num < (s32) ctx->osar.den))
@@ -956,9 +985,11 @@
 	if (ctx->swscaler) sws_freeContext(ctx->swscaler);
 	if (ctx->unpack_buf) gf_free(ctx->unpack_buf);
 	if (ctx->repack_buf) gf_free(ctx->repack_buf);
+#ifndef GPAC_DISABLE_EVG
 	gf_evg_surface_delete(ctx->surf);
 	gf_evg_stencil_delete(ctx->tx);
 	gf_path_del(ctx->path);
+#endif
 	return;
 }

gpac-2.2.1.tar.gz/src/filters/filelist.c -> gpac-2.4.0.tar.gz/src/filters/filelist.c Changed

gpac-2.2.1.tar.gz/src/filters/hevcmerge.c -> gpac-2.4.0.tar.gz/src/filters/hevcmerge.c Changed

@@ -4,7 +4,7 @@
  *			Authors: Jean Le Feuvre
  *					 Yacine Mathurin Boubacar Aziakou
  *					 Samir Mustapha
- *			Copyright (c) Telecom ParisTech 2019-2022
+ *			Copyright (c) Telecom ParisTech 2019-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / HEVC tile merger filter
@@ -32,7 +32,7 @@
 #include <gpac/internal/media_dev.h>
 #include <math.h>
 
-#if !defined(GPAC_DISABLE_HEVC) && !defined(GPAC_DISABLE_AV_PARSERS)
+#if !defined(GPAC_DISABLE_AV_PARSERS) && !defined(GPAC_DISABLE_HEVCMERGE)
 
 typedef struct
 {
@@ -99,6 +99,10 @@
 	Bool in_error;
 	Bool enable_multi_rows;
 	u32 nb_rows;
+	u32 merge_set_id;
+
+	Bool is_playing;
+	GF_FEVT_Play play_evt;
 } GF_HEVCMergeCtx;
 
 //in src/filters/hevcsplit.c
@@ -178,7 +182,7 @@
 	//num_tile_rows_minus1
 	if (ctx->enable_multi_rows) {
 		u32 nb_rows = ctx->nb_rows - 1;
-		assert(ctx->nb_rows);
+		gf_assert(ctx->nb_rows);
 		gf_bs_write_ue(ctx->bs_nal_out, nb_rows);
 	} else {
 		gf_bs_write_ue(ctx->bs_nal_out, 0);//num_tile_rows_minus1
@@ -264,8 +268,8 @@
 	if (!ctx->bs_nal_out) ctx->bs_nal_out = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
 	else gf_bs_reassign_buffer(ctx->bs_nal_out, ctx->buffer_nal_no_epb, ctx->buffer_nal_no_epb_alloc);
 
-	assert(hevc->s_info.header_size_bits >= 0);
-	assert(hevc->s_info.entry_point_start_bits >= 0);
+	gf_assert(hevc->s_info.header_size_bits >= 0);
+	gf_assert(hevc->s_info.entry_point_start_bits >= 0);
 	header_end = (u64)hevc->s_info.header_size_bits;
 
 	num_entry_point_start = (u32)hevc->s_info.entry_point_start_bits;
@@ -454,6 +458,7 @@
 	if (use_y_coord) {
 		sum_height = tile_pid->pos_y / ctx->max_CU_height;
 	} else {
+		Bool height_multiple_ctu = (tile_pid->height % ctx->max_CU_height) ? GF_FALSE : GF_TRUE;
 		nb_pids = gf_list_count(ctx->pids);
 		for (i=0; i<nb_pids; i++) {
 			HEVCTilePidCtx *actx = gf_list_get(ctx->pids, i);
@@ -463,6 +468,10 @@
 				}
 			}
 		}
+		if (!height_multiple_ctu) {
+			u32 new_sum_height = (ctx->out_height - tile_pid->height) / ctx->max_CU_height;
+			sum_height = new_sum_height;
+		}
 	}
 	return sum_height * (ctx->out_width / ctx->max_CU_width) + sum_width;
 }
@@ -508,22 +517,10 @@
 			srd_w = srd->value.vec4i.z;
 			srd_h = srd->value.vec4i.w;
 
-			if (srd_ref->value.vec2i.x != 0) {
-				x = (srd_x * ctx->out_width) / srd_ref->value.vec2i.x;
-				w = (srd_w * ctx->out_width) / srd_ref->value.vec2i.x;
-			} else {
-				GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("HEVCMerge width=0 in source pid SRD referential, cannot output SRD map\n" ));
-				srd_map_valid = GF_FALSE;
-				break;
-			}
-			if (srd_ref->value.vec2i.y != 0) {
-				y = (srd_y * ctx->out_height) / srd_ref->value.vec2i.y;
-				h = (srd_h * ctx->out_height) / srd_ref->value.vec2i.y;
-			} else {
-				GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("HEVCMerge height=0 in source pid SRD referential, undefined results\n" ));
-				srd_map_valid = GF_FALSE;
-				break;
-			}
+			x = srd_x;
+			w = srd_w;
+			y = srd_y;
+			h = srd_h;
 		} else if (crop_pos) {
 			x = crop_pos->value.vec2i.x;
 			y = crop_pos->value.vec2i.y;
@@ -545,11 +542,11 @@
 		nb_cols = tile->slice_segment_address % width_in_CU;
 		nb_rows = (tile->slice_segment_address - nb_cols) / width_in_CU;
 
-		assert(tile->slice_segment_address == (nb_rows * width_in_CU + nb_cols));
+		gf_assert(tile->slice_segment_address == (nb_rows * width_in_CU + nb_cols));
 
 		//tile_x and tile_y should start at zero
-		tile_x = use_abs_pos ? nb_cols * ctx->max_CU_width  : nb_cols;
-		tile_y = use_abs_pos ? nb_rows * ctx->max_CU_height : nb_rows;
+		tile_x = nb_cols * ctx->max_CU_width;
+		tile_y = nb_rows * ctx->max_CU_height;
 
 		vals8*i+4 = (tile_x * ctx->out_width) / ctx->out_width;
 		vals8*i+5 = (tile_y * ctx->out_height) / ctx->out_height;
@@ -733,7 +730,7 @@
 		// pass on the grid to insert empty columns
 		if (!nb_rel_pos && ctx->grid) {
 			for (j=0; j<max_cols-1; j++) {
-				assert(ctx->gridj.pos_x + ctx->gridj.width <= ctx->gridj+1.pos_x);
+				gf_assert(ctx->gridj.pos_x + ctx->gridj.width <= ctx->gridj+1.pos_x);
 				if (ctx->gridj.pos_x + ctx->gridj.width != ctx->gridj+1.pos_x) {
 					u32 new_width = ctx->gridj+1.pos_x - ctx->gridj.pos_x - ctx->gridj.width;
 					u32 new_x = ctx->gridj.pos_x + ctx->gridj.width;
@@ -810,13 +807,26 @@
 		//gather tiles per columns
 		ctx->grid = gf_malloc(sizeof(HEVCGridInfo)*nb_pids);
 		memset(ctx->grid, 0, sizeof(HEVCGridInfo)*nb_pids);
+		u32 target_nb_rows = 1;
+		while (target_nb_rows*target_nb_rows < nb_pids) target_nb_rows++;
 
+		//double pass:
+		//first pass create columns for tiles with height non-multiple of CTU
+		u32 pass;
 		nb_cols=0;
+		for (pass=0; pass<2; pass++) {
 		for (i=0; i<nb_pids; i++) {
 			Bool found = GF_FALSE;
 			HEVCTilePidCtx *apidctx = gf_list_get(ctx->pids, i);
+			Bool height_multiple_ctu = (apidctx->height % ctx->max_CU_height) ? GF_FALSE : GF_TRUE;
+			if (pass) {
+				if (!height_multiple_ctu) continue;
+			} else {
+				if (height_multiple_ctu) continue;
+			}
 			//do we fit on a col
 			for (j=0; j<nb_cols; j++) {
+				if (ctx->gridj.row_pos>=target_nb_rows) continue;
 				if (ctx->gridj.width == apidctx->width) {
 					found = GF_TRUE;
 					break;
@@ -830,7 +840,6 @@
 				ctx->gridnb_cols.width = apidctx->width;
 				ctx->gridnb_cols.height = apidctx->height;
 				if (apidctx->width % ctx->max_CU_width) {
-					assert(!force_last_col_plus_one);
 					force_last_col_plus_one = nb_cols+1;
 				}
 				if (apidctx->height % ctx->max_CU_height) {
@@ -842,6 +851,7 @@
 				nb_cols++;
 				j=nb_cols-1;
 			} else {
+				//keep same j
 				ctx->gridj.height += apidctx->height;
 				if (apidctx->height % ctx->max_CU_height) {
 					ctx->gridj.last_row_idx = ctx->gridj.row_pos+1;
@@ -849,10 +859,12 @@
 				}
 				ctx->gridj.row_pos ++;
 			}
-			assert(ctx->gridj.row_pos);
+			gf_assert(ctx->gridj.row_pos);
 			apidctx->pos_row = ctx->gridj.row_pos - 1;
 			apidctx->pos_col = j;
 		}
+		}
+
 		//move last column at end if not a multiple of CTU
 		if (force_last_col_plus_one) {
 			for (i=0; i<nb_pids; i++) {
@@ -983,7 +995,7 @@
 			break;
 	}
 
-	assert(gf_list_count(ctx->ordered_pids) == gf_list_count(ctx->pids));
+	gf_assert(gf_list_count(ctx->ordered_pids) == gf_list_count(ctx->pids));
 
 	//build SRD map
 	hevcmerge_build_srdmap(ctx, nb_abs_pos ? GF_TRUE : GF_FALSE);
@@ -1194,6 +1206,11 @@
 	dsi = gf_filter_pid_get_property(pid, GF_PROP_PID_DECODER_CONFIG);
 	if (!dsi) return GF_OK;
 
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_CODEC_MERGEABLE);
+	if (p && ctx->merge_set_id && (ctx->merge_set_id != p->value.uint))
+		return GF_REQUIRES_NEW_INSTANCE;
+	if (p) ctx->merge_set_id = p->value.uint;
+
 	tile_pid = gf_filter_pid_get_udta(pid);
 	//not set, first time we see this pid
 	if (!tile_pid) {
@@ -1206,8 +1223,16 @@
 		gf_list_add(ctx->pids, tile_pid);
 
 		gf_filter_pid_set_framing_mode(pid, GF_TRUE);
+
+		//it may happen that we are already running when we get this pid connection, typically with very large number of tiles
+		//post a play event on pid in this case
+		if (ctx->is_playing) {
+			GF_FilterEvent fevt;
+			fevt.play = ctx->play_evt;
+			fevt.base.on_pid = pid;
+			gf_filter_pid_send_event(pid, &fevt);
+		}
 	}
-	assert(tile_pid);
 
 	p = gf_filter_pid_get_property(pid, GF_PROP_PID_TIMESCALE);
 	if (p) tile_pid->timescale = p->value.uint;
@@ -1272,6 +1297,7 @@
 	if (!ctx->opid) {
 		ctx->opid = gf_filter_pid_new(filter);
 		gf_filter_pid_copy_properties(ctx->opid, pid);
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_CODECID, &PROP_UINT(GF_CODECID_HEVC));
 		//remove all SRD related properties
 		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_SRD, NULL);
 		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_SRD_REF, NULL);
@@ -1366,7 +1392,7 @@
 	}
 
 	dsi = gf_filter_pid_get_property(tile_pid->pid, GF_PROP_PID_DECODER_CONFIG);
-	assert(dsi);
+	gf_assert(dsi);
 	return hevcmerge_rewrite_config(ctx, ctx->opid, dsi->value.data.ptr, dsi->value.data.size);
 }
 
@@ -1423,7 +1449,7 @@
 		u64 dts;
 		GF_FilterPacket *pck_src;
 		HEVCTilePidCtx *tile_pid = gf_list_get(ctx->ordered_pids, i);
-		assert(tile_pid);
+		gf_assert(tile_pid);
 		if (tile_pid->in_error)
 			continue;
 		pck_src = gf_filter_pid_get_packet(tile_pid->pid);
@@ -1531,6 +1557,25 @@
 	return GF_OK;
 }
 
+static Bool hevcmerge_process_event(GF_Filter *filter, const GF_FilterEvent *evt)
+{
+	GF_HEVCMergeCtx *ctx = (GF_HEVCMergeCtx *) gf_filter_get_udta(filter);
+
+	switch (evt->base.type) {
+	case GF_FEVT_PLAY:
+		ctx->is_playing = GF_TRUE;
+		ctx->play_evt = evt->play;
+		return GF_FALSE;
+	case GF_FEVT_STOP:
+	{
+		ctx->is_playing = GF_FALSE;
+		return GF_FALSE;
+	}
+	default:
+		break;
+	}
+	return GF_FALSE;
+}
 static GF_Err hevcmerge_initialize(GF_Filter *filter)
 {
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("HEVCMerge hevcmerge_initialize started.\n"));
@@ -1570,6 +1615,7 @@
 {
 	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_STREAM_TYPE, GF_STREAM_VISUAL),
 	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_CODECID, GF_CODECID_HEVC),
+	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_CODECID, GF_CODECID_HEVC_MERGE),
 	CAP_BOOL(GF_CAPS_INPUT_EXCLUDED, GF_PROP_PID_UNFRAMED, GF_TRUE),
 	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_VISUAL),
 	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_CODECID, GF_CODECID_HEVC)
@@ -1633,13 +1679,14 @@
 		"Assuming the two sources are encoded at 320x240 and merged as src1 above src2, the output will be a 320x480 video with a `SRDMap` of `{0,0,320,240,0,0,320,240,640,0,320,240,0,240,320,240}`\n"
 	)
 	.private_size = sizeof(GF_HEVCMergeCtx),
+	.flags = GF_FS_REG_DYNAMIC_REUSE,
 	SETCAPS(HEVCMergeCaps),
-	.flags = GF_FS_REG_EXPLICIT_ONLY,
 	.initialize = hevcmerge_initialize,
 	.finalize = hevcmerge_finalize,
 	.args = HEVCMergeArgs,
 	.configure_pid = hevcmerge_configure_pid,
 	.process = hevcmerge_process,
+	.process_event = hevcmerge_process_event,
 	.max_extra_pids = -1,
 };
 
@@ -1647,10 +1694,9 @@
 {
 	return &HEVCMergeRegister;
 }
-
 #else
 const GF_FilterRegister *hevcmerge_register(GF_FilterSession *session)
 {
 	return NULL;
 }
-#endif // GPAC_DISABLE_AV_PARSERS
+#endif // GPAC_DISABLE_AV_PARSERS && GPAC_DISABLE_HEVCMERGE

gpac-2.2.1.tar.gz/src/filters/hevcsplit.c -> gpac-2.4.0.tar.gz/src/filters/hevcsplit.c Changed

gpac-2.2.1.tar.gz/src/filters/in_dvb4linux.c -> gpac-2.4.0.tar.gz/src/filters/in_dvb4linux.c Changed

gpac-2.2.1.tar.gz/src/filters/in_file.c -> gpac-2.4.0.tar.gz/src/filters/in_file.c Changed

gpac-2.2.1.tar.gz/src/filters/in_http.c -> gpac-2.4.0.tar.gz/src/filters/in_http.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2017-2022
+ *			Copyright (c) Telecom ParisTech 2017-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / HTTP input filter using GPAC http stack
@@ -25,6 +25,9 @@
 
 
 #include <gpac/filters.h>
+
+#ifdef GPAC_USE_DOWNLOADER
+
 #include <gpac/constants.h>
 #include <gpac/download.h>
 
@@ -103,8 +106,9 @@
 
 	if (!ctx || !ctx->src) return GF_BAD_PARAM;
 	ctx->dm = gf_filter_get_download_manager(filter);
+#ifndef GPAC_CONFIG_EMSCRIPTEN
 	if (!ctx->dm) return GF_SERVICE_ERROR;
-
+#endif
 	ctx->block = gf_malloc(ctx->block_size +1);
 
 	flags = GF_NETIO_SESSION_NOT_THREADED | GF_NETIO_SESSION_PERSISTENT;
@@ -142,6 +146,7 @@
 		ctx->initial_ack_done = GF_TRUE;
 		return e;
 	}
+	gf_dm_sess_set_netcap_id(ctx->sess, gf_filter_get_netcap_id(filter));
 	if (ctx->range.num || ctx->range.den) {
 		gf_dm_sess_set_range(ctx->sess, ctx->range.num, ctx->range.den, GF_TRUE);
 	}
@@ -250,10 +255,10 @@
 		return GF_TRUE;
 	case GF_FEVT_SOURCE_SWITCH:
 		if (evt->seek.source_switch) {
-			assert(ctx->is_end);
-			assert(!ctx->pck_out);
+			gf_fatal_assert(ctx->is_end);
+			gf_fatal_assert(!ctx->pck_out);
 			if (ctx->src && ctx->sess && (ctx->cache!=GF_HTTPIN_STORE_DISK_KEEP) && !ctx->prev_was_init_segment) {
-				gf_dm_delete_cached_file_entry_session(ctx->sess, ctx->src);
+				gf_dm_delete_cached_file_entry_session(ctx->sess, ctx->src, GF_FALSE);
 			}
 			GF_LOG(GF_LOG_INFO, GF_LOG_HTTP, ("HTTPIn Switch from %s to %s\n", gf_file_basename(ctx->src), gf_file_basename(evt->seek.source_switch) ));
 			if (ctx->src) gf_free(ctx->src);
@@ -325,6 +330,7 @@
 			else if (ctx->cache==GF_HTTPIN_STORE_NONE) flags |= GF_NETIO_SESSION_NOT_CACHED;
 
 			ctx->sess = gf_dm_sess_new(ctx->dm, ctx->src, flags, NULL, NULL, &e);
+			if (ctx->sess) gf_dm_sess_set_netcap_id(ctx->sess, gf_filter_get_netcap_id(filter));
 		}
 
 		if (!e && (evt->seek.start_offset || evt->seek.end_offset))
@@ -413,12 +419,16 @@
 		}
 		nb_read = (u32) gf_fread(ctx->block, to_read, ctx->cached);
 		bytes_per_sec = 0;
+		if (!nb_read && (ctx->nb_read == ctx->file_size)) {
+			e = GF_EOS;
+			net_status = GF_NETIO_DATA_TRANSFERED;
+		}
 	}
 	else if (ctx->blob_size) {
 		u8 *b_data;
 		u32 b_size;
 		const char *cached = gf_dm_sess_get_cache_name(ctx->sess);
-		assert(cached);
+		gf_assert(cached);
 
 		gf_blob_get(cached, &b_data, &b_size, NULL);
 
@@ -512,7 +522,7 @@
 						b_size = ctx->block_size;
 						e = GF_OK;
 					}
-					assert(! (b_flags&GF_BLOB_IN_TRANSFER));
+					gf_assert(! (b_flags&GF_BLOB_IN_TRANSFER));
 					memcpy(ctx->block, b_data, b_size);
 					nb_read = b_size;
 					gf_blob_release(cached);
@@ -520,6 +530,7 @@
 					ctx->cached = gf_fopen(cached, "rb");
 					if (ctx->cached) {
 						nb_read = (u32) gf_fread(ctx->block, ctx->block_size, ctx->cached);
+						if (nb_read) e = GF_OK;
 					} else {
 						GF_LOG(GF_LOG_ERROR, GF_LOG_HTTP, ("HTTPIn Failed to open cached file %s\n", cached));
 					}
@@ -529,7 +540,7 @@
 			cfg_e = gf_filter_pid_raw_new(filter, ctx->src, cached, ctx->mime ? ctx->mime : gf_dm_sess_mime_type(ctx->sess), ctx->ext, ctx->block, nb_read, ctx->mime ? GF_TRUE : GF_FALSE, &ctx->pid);
 			if (cfg_e) return cfg_e;
 
-			gf_filter_pid_set_property(ctx->pid, GF_PROP_PID_FILE_CACHED, &PROP_BOOL(GF_FALSE) );
+			gf_filter_pid_set_property(ctx->pid, GF_PROP_PID_FILE_CACHED, &PROP_BOOL(ctx->cached ? GF_TRUE : GF_FALSE) );
 
 			if (!ctx->initial_ack_done) {
 				ctx->initial_ack_done = GF_TRUE;
@@ -616,7 +627,7 @@
 	"- mem_keep: stores to memory, keep after session is reassigned but move to `mem` after first download\n"
 	"- none: no cache\n"
 	"- none_keep: stores to memory, keep after session is reassigned but move to `none` after first download"
-	, GF_PROP_UINT, "disk", "auto|disk|keep|mem|mem_keep|none|none_keep", GF_FS_ARG_HINT_ADVANCED},
+	, GF_PROP_UINT, "none", "auto|disk|keep|mem|mem_keep|none|none_keep", GF_FS_ARG_HINT_ADVANCED},
 	{ OFFS(range), "set byte range, as fraction", GF_PROP_FRACTION64, "0-0", NULL, 0},
 	{ OFFS(ext), "override file extension", GF_PROP_NAME, NULL, NULL, 0},
 	{ OFFS(mime), "set file mime type", GF_PROP_NAME, NULL, NULL, 0},
@@ -640,6 +651,7 @@
 	"\n"
 	"Note: Unless disabled at session level (see -no-probe(CORE) ), file extensions are usually ignored and format probing is done on the first data block.")
 	.private_size = sizeof(GF_HTTPInCtx),
+	.flags = GF_FS_REG_USE_SYNC_READ,
 	.args = HTTPInArgs,
 	SETCAPS(HTTPInCaps),
 	.initialize = httpin_initialize,
@@ -657,4 +669,10 @@
 	}
 	return &HTTPInRegister;
 }
+#else
+const GF_FilterRegister *httpin_register(GF_FilterSession *session)
+{
+	return NULL;
+}
+#endif // GPAC_USE_DOWNLOADER

gpac-2.2.1.tar.gz/src/filters/in_pipe.c -> gpac-2.4.0.tar.gz/src/filters/in_pipe.c Changed

gpac-2.2.1.tar.gz/src/filters/in_route.c -> gpac-2.4.0.tar.gz/src/filters/in_route.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2018-2022
+ *			Copyright (c) Telecom ParisTech 2018-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / ROUTE (ATSC3, DVB-I) input filter
@@ -190,7 +190,7 @@
     //if box completely in a received byte range, keep as is
     //if mdat or free box, keep as is
     //otherwise change box type to free
-    while (pos + 8 < size) {
+    while ((u64)pos + 8 < size) {
         u32 i;
 		Bool is_mdat = GF_FALSE;
         Bool box_complete = GF_FALSE;
@@ -200,7 +200,7 @@
         //no more top-level found, patch from current pos until end of payload
         if (!type) {
             u32 remain = size - pos;
-            assert(remain);
+            gf_assert(remain);
             if (remain<8) {
                 GF_LOG(GF_LOG_ERROR, GF_LOG_ROUTE, ("ROUTE Failed to patch end of corrupted segment, segment size not big enough to hold the final box header, something really corrupted in source data\n"));
                 return;
@@ -559,7 +559,7 @@
 			routein_send_file(ctx, evt_param, finfo, evt);
 			break;
 		}
-        //fallthrough
+		//fallthrough
 
     case GF_ROUTE_EVT_DYN_SEG_FRAG:
         //for now we only push complete files
@@ -584,10 +584,14 @@
         }
 #endif
 			
-		if (!ctx->clock_init_seg) {
+		if (!ctx->clock_init_seg
+			//if full seg push of previsously advertized init, reset x-route-ll header
+			|| ((evt==GF_ROUTE_EVT_DYN_SEG) && !strcmp(ctx->clock_init_seg, finfo->filename))
+		) {
 			DownloadedCacheEntry mpd_cache_entry = gf_route_dmx_get_service_udta(ctx->route_dmx, evt_param);
 			if (mpd_cache_entry) {
-				ctx->clock_init_seg = gf_strdup(finfo->filename);
+				if (!ctx->clock_init_seg)
+					ctx->clock_init_seg = gf_strdup(finfo->filename);
 				sprintf(szPath, "x-route: %d\r\nx-route-first-seg: %s\r\n", evt_param, ctx->clock_init_seg);
 				if (evt==GF_ROUTE_EVT_DYN_SEG_FRAG)
 					strcat(szPath, "x-route-ll: yes\r\n");
@@ -650,7 +654,7 @@
 		}
 			
         if (evt==GF_ROUTE_EVT_DYN_SEG_FRAG) {
-            GF_LOG(GF_LOG_INFO, GF_LOG_ROUTE, ("ROUTE Pushing fragment from file %s to cache\n", finfo->filename));
+            GF_LOG(GF_LOG_DEBUG, GF_LOG_ROUTE, ("ROUTE Pushing fragment from file %s to cache\n", finfo->filename));
 			break;
         }
 			
@@ -707,6 +711,15 @@
 	return GF_TRUE;
 }
 
+static void routein_set_eos(GF_Filter *filter)
+{
+	u32 i, nb_out = gf_filter_get_opid_count(filter);
+	for (i=0; i<nb_out; i++) {
+		GF_FilterPid *opid = gf_filter_get_opid(filter, i);
+		if (opid) gf_filter_pid_set_eos(opid);
+	}
+}
+
 static GF_Err routein_process(GF_Filter *filter)
 {
 	ROUTEInCtx *ctx = gf_filter_get_udta(filter);
@@ -723,6 +736,7 @@
 					u32 diff = gf_sys_clock() - ctx->last_timeout;
 					if (diff > ctx->timeout) {
 						GF_LOG(GF_LOG_INFO, GF_LOG_ROUTE, ("ROUTE No data for %d ms, aborting\n", diff));
+						routein_set_eos(filter);
 						return GF_EOS;
 					}
 				}
@@ -731,6 +745,11 @@
 			break;
 		} else if (!e) {
 			ctx->last_timeout = 0;
+		} else if (e==GF_EOS) {
+			routein_set_eos(filter);
+			return e;
+		} else {
+			break;
 		}
 	}
 	if (!ctx->tune_time) {
@@ -738,6 +757,7 @@
 	 	if (diff>ctx->timeout) {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_ROUTE, ("ROUTE No data for %d ms, aborting\n", diff));
 			gf_filter_setup_failure(filter, GF_SERVICE_ERROR);
+			routein_set_eos(filter);
 			return GF_EOS;
 		}
 	}
@@ -798,7 +818,7 @@
 		ctx->nbcached = 1;
 
 	if (is_atsc) {
-		ctx->route_dmx = gf_route_atsc_dmx_new(ctx->ifce, ctx->buffer, routein_on_event, ctx);
+		ctx->route_dmx = gf_route_atsc_dmx_new_ex(ctx->ifce, ctx->buffer, gf_filter_get_netcap_id(filter), routein_on_event, ctx);
 	} else {
 		char *sep, *root;
 		u32 port;
@@ -814,11 +834,11 @@
 		if (root) root0 = '/';
 
 		if (!gf_sk_is_multicast_address(ctx->src+8)) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_ROUTE, ("ROUTE %s is not a multicast address\n"));
+			GF_LOG(GF_LOG_ERROR, GF_LOG_ROUTE, ("ROUTE %s is not a multicast address\n", ctx->src));
 			sep0 = ':';
 			return GF_BAD_PARAM;
 		}
-		ctx->route_dmx = gf_route_dmx_new(ctx->src+8, port, ctx->ifce, ctx->buffer, routein_on_event, ctx);
+		ctx->route_dmx = gf_route_dmx_new_ex(ctx->src+8, port, ctx->ifce, ctx->buffer, gf_filter_get_netcap_id(filter), routein_on_event, ctx);
 		sep0 = ':';
 	}
 	if (!ctx->route_dmx) return GF_SERVICE_ERROR;

gpac-2.2.1.tar.gz/src/filters/in_rtp.c -> gpac-2.4.0.tar.gz/src/filters/in_rtp.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2022
+ *			Copyright (c) Telecom ParisTech 2000-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / RTP/RTSP input filter
@@ -80,7 +80,7 @@
 
 	//extract the schema
 	i = 0;
-	while (i <= strlen(sURL)) {
+	while (i < strlen(sURL)) {
 		if (sURLi == ':')
 			goto found;
 		schemai = sURLi;
@@ -89,7 +89,7 @@
 	return;
 
 found:
-	schemai = 0;
+	schemaMIN(i, GF_ARRAY_LENGTH(schema)-1) = 0;
 	if (stricmp(schema, "satip")) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_RTP, ("RTP Wrong SATIP schema %s - not setting up\n", schema));
 		return;
@@ -105,25 +105,25 @@
 	if (retest && strstr(retest, "/")) {
 		retest += 1;
 		i = 0;
-		while (i<strlen(retest)) {
+		while (i<strlen(retest) && i<GF_ARRAY_LENGTH(text)) {
 			if (retesti == '/') break;
 			texti = retesti;
 			i += 1;
 		}
-		texti = 0;
+		textMIN(i, GF_ARRAY_LENGTH(text)-1) = 0;
 	}
 	//get the server name
 	is_ipv6 = GF_FALSE;
 	len = (u32)strlen(test);
 	i = 0;
-	while (i<len) {
+	while (i<len && i<GF_ARRAY_LENGTH(text)) {
 		if (testi == '') is_ipv6 = GF_TRUE;
 		else if (testi == '') is_ipv6 = GF_FALSE;
 		if ((testi == '/') || (!is_ipv6 && (testi == ':'))) break;
 		texti = testi;
 		i += 1;
 	}
-	texti = 0;
+	textMIN(i, GF_ARRAY_LENGTH(text)-1) = 0;
 	strcpy(Server, text);
 }
 
@@ -131,8 +131,7 @@
 static GF_Err rtpin_configure_pid(GF_Filter *filter, GF_FilterPid *pid, Bool is_remove)
 {
 	const GF_PropertyValue *prop;
-	const char *src = NULL;
-	u32 crc;
+	u32 crc = 0;
 	GF_RTPIn *ctx = gf_filter_get_udta(filter);
 
 	if (ctx->src) {
@@ -150,13 +149,10 @@
 	if (! gf_filter_pid_check_caps(pid))
 		return GF_NOT_SUPPORTED;
 
-	//we must have a file path
-	prop = gf_filter_pid_get_property(pid, GF_PROP_PID_FILEPATH);
-	if (prop && prop->value.string) src = prop->value.string;
-	if (!src)
-		return GF_NOT_SUPPORTED;
-
-	crc = gf_crc_32(src, (u32) strlen(src) );
+	//get crc of URL
+	prop = gf_filter_pid_get_property(pid, GF_PROP_PID_URL);
+	if (prop && prop->value.string)
+		crc = gf_crc_32(prop->value.string, (u32) strlen(prop->value.string) );
 
 	if (!ctx->ipid) {
 		ctx->ipid = pid;
@@ -465,12 +461,9 @@
 		GF_FilterPacket *pck = gf_filter_pid_get_packet(ctx->ipid);
 
 		if (!ctx->sdp_loaded && pck) {
-			Bool start, end;
 			u32 sdp_len;
 			const char *sdp_data;
-			gf_filter_pck_get_framing(pck, &start, &end);
-			assert(end);
-		
+
 			sdp_data = gf_filter_pck_get_data(pck, &sdp_len);
 			rtpin_load_sdp(ctx, (char *)sdp_data, sdp_len, NULL);
 			gf_filter_pid_drop_packet(ctx->ipid);
@@ -649,13 +642,23 @@
 
 	/*fetch data on udp*/
 	u32 tot_read=0;
-	while (1) {
+	//add a max for netcap without RT regulation
+	u32 run=100;
+	while (run) {
 		u32 read=0;
 		//select both read and write
 		GF_Err e = gf_sk_group_select(ctx->sockgroup, 10, GF_SK_SELECT_BOTH);
 		if (e) {
-			if ((e==GF_IP_NETWORK_EMPTY) && !ctx->eos_probe_start)
-				ctx->eos_probe_start = gf_sys_clock();
+			if (!tot_read && !ctx->eos_probe_start) {
+				if (e==GF_IP_NETWORK_EMPTY)
+					ctx->eos_probe_start = gf_sys_clock();
+				else if (e==GF_IP_CONNECTION_CLOSED)
+					ctx->eos_probe_start = gf_sys_clock() - ctx->udp_timeout;
+				else if (e==GF_EOS) {
+					ctx->eos_probe_start = gf_sys_clock() - ctx->udp_timeout;
+					e = GF_OK;
+				}
+			}
 			break;
 		}
 
@@ -666,19 +669,22 @@
 				read += rtpin_stream_read(stream);
 			}
 
+			//if not init, set probe start time to 500ms before eval time since we have explicit notif of eos through rtcp or rtsp
 			if ((stream->flags & RTP_EOS) && !ctx->eos_probe_start)
-				ctx->eos_probe_start = gf_sys_clock();
+				ctx->eos_probe_start = gf_sys_clock() + ctx->udp_timeout - 500;
 		}
 
+		run--;
 		if (!read) {
 			break;
 		}
-		tot_read+=read;
+
+		tot_read += read;
 		ctx->eos_probe_start = 0;
 	}
 
-	//we wait max 300ms to detect eos
-	if (ctx->eos_probe_start && (gf_sys_clock() - ctx->eos_probe_start > 1000) ) {
+	//we wait max udp_timeout ms to detect eos
+	if (ctx->eos_probe_start && (gf_sys_clock() - ctx->eos_probe_start > ctx->udp_timeout) ) {
 		u32 nb_eos=0;
 		i=0;
 		while ((stream = (GF_RTPInStream *)gf_list_enum(ctx->streams, &i))) {
@@ -755,9 +761,9 @@
 		gf_filter_ask_rt_reschedule(filter, ctx->nb_bytes_rcv ? 1000 : 10000);
 	}
 	else {
-		assert(ctx->min_frame_dur_ms <= (u32) ctx->max_sleep);
 		//reschedule in half the frame dur
-		gf_filter_ask_rt_reschedule(filter, ctx->min_frame_dur_ms*500);
+		if (ctx->min_frame_dur_ms <= (u32) ctx->max_sleep)
+			gf_filter_ask_rt_reschedule(filter, ctx->min_frame_dur_ms*500);
 	}
 	return GF_OK;
 }
@@ -835,18 +841,18 @@
 		return GF_OK;
 	}
 	ctx->session = rtpin_rtsp_new(ctx, (char *) ctx->src);
+	if (!ctx->session)
+		return GF_NOT_SUPPORTED;
+
 	if (!strnicmp(ctx->src, "satip://", 8)) {
 		ctx->session->satip = GF_TRUE;
 		ctx->session->satip_server = gf_malloc(GF_MAX_PATH);
 		rtpin_satip_get_server_ip(ctx->src, ctx->session->satip_server);
 	}
 
-	if (!ctx->session)
-		return GF_NOT_SUPPORTED;
-
 	ctx->dm = gf_filter_get_download_manager(filter);
 	if (!strnicmp(ctx->src, "rtsps://", 8)
-		|| (!strnicmp(ctx->src, "rtsph://", 8) && 
+		|| (!strnicmp(ctx->src, "rtsph://", 8) &&
 			((gf_rtsp_get_session_port(ctx->session->session) == 443) || (gf_rtsp_get_session_port(ctx->session->session) == 8443)))
 	) {
 #ifdef GPAC_HAS_SSL
@@ -1015,4 +1021,3 @@
 	return NULL;
 #endif
 }
-

gpac-2.2.1.tar.gz/src/filters/in_rtp.h -> gpac-2.4.0.tar.gz/src/filters/in_rtp.h Changed

gpac-2.2.1.tar.gz/src/filters/in_rtp_rtsp.c -> gpac-2.4.0.tar.gz/src/filters/in_rtp_rtsp.c Changed

gpac-2.2.1.tar.gz/src/filters/in_rtp_sdp.c -> gpac-2.4.0.tar.gz/src/filters/in_rtp_sdp.c Changed

gpac-2.2.1.tar.gz/src/filters/in_rtp_signaling.c -> gpac-2.4.0.tar.gz/src/filters/in_rtp_signaling.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2022
+ *			Copyright (c) Telecom ParisTech 2000-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / RTP/RTSP input filter
@@ -154,10 +154,10 @@
 
 	/*assign channel handle if not done*/
 	if (ch_desc && stream->opid) {
-		assert(stream->opid == ch_desc->opid);
+		gf_assert(stream->opid == ch_desc->opid);
 	} else if (!stream->opid && stream->rtsp && !stream->rtsp->satip) {
-		assert(ch_desc);
-		assert(ch_desc->opid);
+		gf_assert(ch_desc);
+		gf_assert(ch_desc->opid);
 		stream->opid = ch_desc->opid;
 	}
 
@@ -232,7 +232,7 @@
 	if (!sess->session_id) sess->session_id = gf_strdup(sess->rtsp_rsp->Session);
 
 	if (! (stream->rtsp->flags & RTSP_AGG_CONTROL) )  {
-		assert(!stream->session_id);
+		gf_assert(!stream->session_id);
 		stream->session_id = gf_strdup(sess->rtsp_rsp->Session);
 	}
 
@@ -525,8 +525,8 @@
 			return GF_FALSE;
 		}
 
-		assert(stream->rtsp == sess);
-		assert(stream->opid == ch_ctrl->evt.base.on_pid);
+		gf_assert(stream->rtsp == sess);
+		gf_assert(stream->opid == ch_ctrl->evt.base.on_pid);
 	}
 
 	if (!com->Session) {
@@ -588,7 +588,7 @@
 			return;
 		}
 
-		assert(stream->opid==ch_ctrl->evt.base.on_pid);
+		gf_assert(stream->opid==ch_ctrl->evt.base.on_pid);
 	}
 
 	/*some consistency checking: on interleaved sessions, some servers do NOT reply to the

gpac-2.2.1.tar.gz/src/filters/in_rtp_stream.c -> gpac-2.4.0.tar.gz/src/filters/in_rtp_stream.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2022
+ *			Copyright (c) Telecom ParisTech 2000-2024
  *					All rights reserved
  *
  *  This file is part of GPAC / RTP/RTSP input filter
@@ -163,18 +163,27 @@
 	hdr->seekFlag = 0;
 	hdr->compositionTimeStamp += stream->ts_adjust;
 	if (stream->first_rtp_ts) {
-		assert(hdr->compositionTimeStamp >= stream->first_rtp_ts - 1);
+		gf_assert(hdr->compositionTimeStamp >= stream->first_rtp_ts - 1);
 		hdr->compositionTimeStamp -= stream->first_rtp_ts - 1;
 	}
 
 	if (hdr->decodingTimeStamp) {
 		hdr->decodingTimeStamp += stream->ts_adjust;
 		if (stream->first_rtp_ts) {
-			assert(hdr->decodingTimeStamp >= stream->first_rtp_ts - 1);
+			gf_assert(hdr->decodingTimeStamp >= stream->first_rtp_ts - 1);
 			hdr->decodingTimeStamp -= stream->first_rtp_ts - 1;
 		}
 	}
 
+	if (gf_rtp_is_disc(stream->rtp_ch)) {
+		s64 delta = stream->prev_cts + stream->min_dur_rtp;
+		delta -= hdr->compositionTimeStamp;
+		stream->ts_offset -= (s32) delta;
+
+		stream->prev_cts = (u32) hdr->compositionTimeStamp;
+	}
+
+
 	pck = gf_filter_pck_new_alloc(stream->opid, size, &pck_data);
 	if (!pck) return;
 	
@@ -188,10 +197,9 @@
 	if ((stream->rtpin->max_sleep>0) && stream->prev_cts && diff) {
 		if (diff<0) diff = -diff;
 		if (!stream->min_dur_rtp || (diff < stream->min_dur_rtp)) {
-			u64 dur = diff;
-			dur *= 1000;
-			dur /= stream->rtp_ch->TimeScale;
-			stream->min_dur_rtp = (u32) dur;
+			stream->min_dur_rtp = (u32) diff;
+
+			u64 dur = (u32) gf_timestamp_rescale(diff, stream->rtp_ch->TimeScale, 1000);
 			if (dur > stream->rtpin->max_sleep) dur = stream->rtpin->max_sleep;
 			if (!stream->rtpin->min_frame_dur_ms || ( (u32) dur < stream->rtpin->min_frame_dur_ms)) {
 				stream->rtpin->min_frame_dur_ms = (u32) dur;
@@ -240,7 +248,7 @@
 		}
 		gf_filter_pck_set_property(pck, GF_PROP_PCK_MEDIA_TIME, &PROP_DOUBLE(media_time) );
 
-		GF_LOG(GF_LOG_INFO, GF_LOG_RTP, ("RTP Mapping RTP Time seq %d TS %d Media Time %g - rtp info seq %d TS %d\n",
+		GF_LOG(GF_LOG_INFO, GF_LOG_RTP, ("RTP Mapping RTP Time seq %d TS %u Media Time %g - rtp info seq %d TS %u\n",
 										 hdr->packetSequenceNumber, cts, media_time, stream->rtp_ch->rtp_first_SN, stream->rtp_ch->rtp_time
 										));
 		stream->map_media_time = GF_FALSE;
@@ -274,7 +282,7 @@
 	tmp->buffer = gf_malloc(sizeof(char) * rtp->block_size);
 
 	/*create an RTP channel*/
-	tmp->rtp_ch = gf_rtp_new();
+	tmp->rtp_ch = gf_rtp_new_ex(gf_filter_get_netcap_id(rtp->filter));
 
 	memset(&trans, 0, sizeof(GF_RTSPTransport));
 	trans.Profile = "RTP/AVP";
@@ -415,7 +423,7 @@
 	}
 
 	/*create an RTP channel*/
-	tmp->rtp_ch = gf_rtp_new();
+	tmp->rtp_ch = gf_rtp_new_ex(gf_filter_get_netcap_id(rtp->filter));
 	if (ctrl) tmp->control = gf_strdup(ctrl);
 	tmp->ES_ID = ESID;
 	tmp->OD_ID = ODID;
@@ -475,7 +483,7 @@
 		char *rvc_data=NULL;
 		u32 rvc_size=0;
 		Bool is_gz = GF_FALSE;
-		if (!strncmp(rvc_config_att, "data:application/rvc-config+xml", 32) && strstr(rvc_config_att, "base64") ) {
+		if (!strncmp(rvc_config_att, "data:application/rvc-config+xml", 31) && strstr(rvc_config_att, "base64") ) {
 			char *data = strchr(rvc_config_att, ',');
 			if (data) {
 				rvc_size = (u32) strlen(data) * 3 / 4 + 1;
@@ -483,7 +491,7 @@
 				rvc_size = gf_base64_decode(data, (u32) strlen(data), rvc_data, rvc_size);
 				rvc_datarvc_size = 0;
 			}
-			if (!strncmp(rvc_config_att, "data:application/rvc-config+xml+gz", 35)) is_gz = GF_TRUE;
+			if (!strncmp(rvc_config_att, "data:application/rvc-config+xml+gz", 34)) is_gz = GF_TRUE;
 		} else if (!strnicmp(rvc_config_att, "http://", 7) || !strnicmp(rvc_config_att, "https://", 8) ) {
 			return NULL;
 		}
@@ -494,7 +502,7 @@
 				gf_free(rvc_data);
 				return NULL;
 #else
-				gf_gz_decompress_payload(rvc_data, rvc_size, &tmp->depacketizer->sl_map.rvc_config, &tmp->depacketizer->sl_map.rvc_config_size);
+				gf_gz_decompress_payload_ex(rvc_data, rvc_size, &tmp->depacketizer->sl_map.rvc_config, &tmp->depacketizer->sl_map.rvc_config_size, GF_TRUE);
 				gf_free(rvc_data);
 #endif
 			} else {
@@ -599,7 +607,7 @@
 			if (sn_diff<0) sn_diff = -sn_diff;
 			if (ts_diff<0) ts_diff = -ts_diff;
 			if ((sn_diff > 100) || ((u32) ts_diff > stream->rtp_ch->TimeScale)) {
-				GF_LOG(GF_LOG_WARNING, GF_LOG_RTP, ("RTP Rejecting too early packet (TS %d vs signaled rtp time %d - diff %d ms)\n",
+				GF_LOG(GF_LOG_WARNING, GF_LOG_RTP, ("RTP Rejecting too early packet (TS %u vs signaled rtp time %u - diff %d ms)\n",
 			                                    hdr.TimeStamp, stream->rtp_ch->rtp_time, ((hdr.TimeStamp - stream->rtp_ch->rtp_time)*1000) / stream->rtp_ch->TimeScale));
 				return;
 			}
@@ -744,6 +752,7 @@
 			tot_size += size;
 			rtpin_stream_on_rtcp_pck(stream, stream->buffer, size);
 		}
+		stream->rtpin->eos_probe_start = 0;
 	}
 
 	if (gf_sk_group_sock_is_set(stream->rtpin->sockgroup, stream->rtp_ch->rtp, GF_SK_SELECT_READ)) {
@@ -752,6 +761,7 @@
 			tot_size += size;
 			rtpin_stream_on_rtp_pck(stream, stream->buffer, size);
 		}
+		stream->rtpin->eos_probe_start = 0;
 	}
 
 	/*and send the report*/

gpac-2.2.1.tar.gz/src/filters/in_sock.c -> gpac-2.4.0.tar.gz/src/filters/in_sock.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2017-2022
+ *			Copyright (c) Telecom ParisTech 2017-2024
  *					All rights reserved
  *
  *  This file is part of GPAC / generic TCP/UDP input filter
@@ -25,6 +25,9 @@
 
 
 #include <gpac/filters.h>
+
+#ifndef GPAC_DISABLE_NETWORK
+
 #include <gpac/constants.h>
 #include <gpac/network.h>
 
@@ -44,10 +47,11 @@
 #endif
 	char addressGF_MAX_IP_NAME_LEN;
 
-	u64 start_time, last_stats_time;
 	u32 init_time;
+	Bool done, first_pck;
+	//stats
 	u64 nb_bytes;
-	Bool done;
+	u64 start_time, last_stats_time;
 } GF_SockInClient;
 
 typedef struct
@@ -114,12 +118,14 @@
 
 	url = strchr(ctx->src, ':');
 	url += 3;
+	if (!url0) return GF_IP_ADDRESS_NOT_FOUND;
 
-	ctx->sock_c.socket = gf_sk_new(sock_type);
+	ctx->sock_c.socket = gf_sk_new_ex(sock_type, gf_filter_get_netcap_id(filter));
 	if (! ctx->sock_c.socket ) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("SockIn Failed to open socket for %s\n", ctx->src));
 		return GF_IO_ERR;
 	}
+	ctx->sock_c.first_pck = GF_TRUE;
 
 	/*setup port and src*/
 	port = ctx->port;
@@ -206,8 +212,10 @@
 static void sockin_client_reset(GF_SockInClient *sc)
 {
 	if (sc->socket) gf_sk_del(sc->socket);
+	sc->socket = NULL;
 #ifndef GPAC_DISABLE_STREAMING
 	if (sc->rtp_reorder) gf_rtp_reorderer_del(sc->rtp_reorder);
+	sc->rtp_reorder = NULL;
 #endif
 }
 
@@ -305,6 +313,10 @@
 			case GF_IP_CONNECTION_CLOSED:
 				if (!sock_c->done) {
 					sock_c->done = GF_TRUE;
+					if (ctx->ka) {
+						gf_filter_pid_send_flush(sock_c->pid);
+						return GF_IP_CONNECTION_CLOSED;
+					}
 					gf_filter_pid_set_eos(sock_c->pid);
 				}
 				return GF_EOS;
@@ -325,7 +337,7 @@
 	}
 	if (!nb_read) return GF_OK;
 
-	if (!sock_c->nb_bytes) {
+	if (sock_c->first_pck) {
 		GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("SockIn Reception started after %u ms\n", gf_sys_clock() - sock_c->init_time));
 	}
 
@@ -338,22 +350,25 @@
 	//first run, probe data
 	if (!sock_c->pid) {
 		const char *mime = ctx->mime;
+		const char *ext = ctx->ext;
 		//probe MPEG-2
 		if (ctx->tsprobe) {
 			/*TS over RTP signaled as udp */
 			if ((ctx->buffer0 != 0x47) && ((ctx->buffer1 & 0x7F) == 33) ) {
 #ifndef GPAC_DISABLE_STREAMING
-				sock_c->rtp_reorder = gf_rtp_reorderer_new(ctx->reorder_pck, ctx->reorder_delay);
+				sock_c->rtp_reorder = gf_rtp_reorderer_new(ctx->reorder_pck, ctx->reorder_delay, 90000);
 #else
 				sock_c->is_rtp = GF_TRUE;
 #endif
 				mime = "video/mp2t";
+				ext = "ts";
 			} else if (ctx->buffer0 == 0x47) {
 				mime = "video/mp2t";
+				ext = "ts";
 			}
 		}
 
-		e = gf_filter_pid_raw_new(filter, ctx->src, NULL, mime, ctx->ext, ctx->buffer, nb_read, GF_TRUE, &sock_c->pid);
+		e = gf_filter_pid_raw_new(filter, ctx->src, NULL, mime, ext, ctx->buffer, nb_read, GF_TRUE, &sock_c->pid);
 		if (e) return e;
 
 //		if (ctx->is_udp) gf_filter_pid_set_property(sock_c->pid, GF_PROP_PID_UDP, &PROP_BOOL(GF_TRUE) );
@@ -380,15 +395,16 @@
 		u16 seq_num = ((ctx->buffer2 << 8) & 0xFF00) | (ctx->buffer3 & 0xFF);
 		gf_rtp_reorderer_add(sock_c->rtp_reorder, (void *) ctx->buffer, nb_read, seq_num);
 
-		pck = (char *) gf_rtp_reorderer_get(sock_c->rtp_reorder, &nb_read, GF_FALSE);
+		pck = (char *) gf_rtp_reorderer_get(sock_c->rtp_reorder, &nb_read, GF_FALSE, NULL);
 		if (pck) {
 			dst_pck = gf_filter_pck_new_shared(sock_c->pid, pck+12, nb_read-12, sockin_rtp_destructor);
 			if (dst_pck) {
-				gf_filter_pck_set_framing(dst_pck, GF_TRUE, GF_TRUE);
+				gf_filter_pck_set_framing(dst_pck, sock_c->first_pck, GF_FALSE);
 				gf_filter_pck_send(dst_pck);
+				sock_c->first_pck = GF_FALSE;
 			}
 		}
-		return GF_OK;
+		goto do_stats;
 	}
 #else
 	if (sock_c->is_rtp) {
@@ -402,19 +418,22 @@
 
 	memcpy(out_data, in_data, nb_read);
 
-	gf_filter_pck_set_framing(dst_pck, (sock_c->nb_bytes == nb_read)  ? GF_TRUE : GF_FALSE, GF_FALSE);
+	gf_filter_pck_set_framing(dst_pck, sock_c->first_pck, GF_FALSE);
 	gf_filter_pck_send(dst_pck);
+	sock_c->first_pck = GF_FALSE;
 
-	//send bitrate
+do_stats:
+	//send bitrate ever half sec
 	now = gf_sys_clock_high_res();
-	if (now > sock_c->last_stats_time + 100000) {
+	if (now > sock_c->last_stats_time + 500000) {
 		sock_c->last_stats_time = now;
 		u64 bitrate = (now - sock_c->start_time );
 		if (bitrate) {
-			bitrate = (sock_c->nb_bytes * 8 * 1000000) / bitrate;
+			bitrate = (sock_c->nb_bytes * 8 * 500000) / bitrate;
 			gf_filter_pid_set_info(sock_c->pid, GF_PROP_PID_DOWN_RATE, &PROP_UINT((u32) bitrate) );
-			GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("SockIn Receiving from %s at %d kbps\r", sock_c->address, (u32) (bitrate/10)));
+			GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("SockIn Receiving from %s at %d kbps\r", sock_c->address, (u32) (bitrate/1000)));
 		}
+		sock_c->nb_bytes = 0;
 	}
 
 	return GF_OK;
@@ -442,7 +461,7 @@
 		if (ctx->sock_c.pid)
 			gf_filter_pid_set_eos(ctx->sock_c.pid);
 		ctx->sock_c.done = GF_TRUE;
-		if (ctx->sock_c.nb_bytes) {
+		if (!ctx->sock_c.first_pck) {
 			GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("SockIn No data received for %d ms, assuming end of stream\n", ctx->timeout));
 		} else {
 			GF_LOG(GF_LOG_WARNING, GF_LOG_NETWORK, ("SockIn No data received after %d ms, aborting\n", ctx->timeout));
@@ -467,7 +486,7 @@
 		if (ctx->is_udp) {
 			e = sockin_check_eos(filter, ctx);
 			if (e) return e;
-			if (!ctx->sock_c.nb_bytes) {
+			if (ctx->sock_c.first_pck) {
 				gf_filter_ask_rt_reschedule(filter, 10000);
 				return GF_OK;
 			}
@@ -479,6 +498,12 @@
 		gf_filter_ask_rt_reschedule(filter, 1000);
 		return GF_OK;
 	}
+	else if ((e==GF_IP_CONNECTION_CLOSED) || (e==GF_EOS)) {
+		ctx->is_stop = GF_TRUE;
+		if (ctx->sock_c.pid)
+			gf_filter_pid_set_eos(ctx->sock_c.pid);
+		return e<0 ? e : 0;
+	}
 	else if (e) {
 		return e;
 	}
@@ -494,17 +519,29 @@
 		if (gf_sk_group_sock_is_set(ctx->active_sockets, ctx->sock_c.socket, GF_SK_SELECT_READ)) {
 			e = gf_sk_accept(ctx->sock_c.socket, &new_conn);
 			if ((e==GF_OK) && new_conn) {
-				GF_SockInClient *sc;
-				GF_SAFEALLOC(sc, GF_SockInClient);
-				if (!sc) return GF_OUT_OF_MEM;
-				
+				GF_SockInClient *sc=NULL;
+				if (ctx->ka) {
+					sc = gf_list_get(ctx->clients, 0);
+					if (sc && sc->socket) {
+						gf_sk_del(new_conn);
+						GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("SockIn Rejecting connection since one client is already connected and keep-alive is enabled\n", sc->address));
+						return GF_OK;
+					}
+				}
+				if (!sc) {
+					GF_SAFEALLOC(sc, GF_SockInClient);
+					if (!sc) return GF_OUT_OF_MEM;
+					gf_list_add(ctx->clients, sc);
+					sc->first_pck = GF_TRUE;
+				}
+				sc->done = GF_FALSE;
+
 				sc->socket = new_conn;
 				strcpy(sc->address, "unknown");
 				gf_sk_get_remote_address(new_conn, sc->address);
 				gf_sk_set_block_mode(new_conn, !ctx->block);
 
 				GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("SockIn Accepting new connection from %s\n", sc->address));
-				gf_list_add(ctx->clients, sc);
 				ctx->had_clients = GF_TRUE;
 				gf_sk_group_register(ctx->active_sockets, sc->socket);
 				sc->init_time = gf_sys_clock();
@@ -516,16 +553,18 @@
 	count = gf_list_count(ctx->clients);
 	for (i=0; i<count; i++) {
 		GF_SockInClient *sc = gf_list_get(ctx->clients, i);
+		if (!sc->socket) continue;
 
 		if (!gf_sk_group_sock_is_set(ctx->active_sockets, sc->socket, GF_SK_SELECT_READ)) continue;
 
 	 	e = sockin_read_client(filter, ctx, sc);
 	 	if (e == GF_IP_CONNECTION_CLOSED) {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_NETWORK, ("SockIn Connection to %s lost, removing input\n", sc->address));
+			GF_LOG(ctx->ka ? GF_LOG_INFO : GF_LOG_WARNING, GF_LOG_NETWORK, ("SockIn Connection to %s lost, %s\n", sc->address, ctx->ka ? "entering keepalive" : "removing input"));
 			if (sc->socket)
 				gf_sk_group_unregister(ctx->active_sockets, sc->socket);
 
-	 		sockin_client_reset(sc);
+			sockin_client_reset(sc);
+			if (ctx->ka) continue;
 	 		if (sc->pid) {
 	 			gf_filter_pid_set_eos(sc->pid);
 	 			gf_filter_pid_remove(sc->pid);
@@ -601,17 +640,22 @@
 #ifdef GPAC_HAS_SOCK_UN
 		"- UDP unix domain sockets are used for source URLs formatted as `udpu://NAME`\n"
 		"- TCP unix domain sockets are used for source URLs formatted as `tcpu://NAME`\n"
+#else
+		"Your platform does not supports unix domain sockets, udpu:// and tcpu:// schemes not supported."
+#endif
 		"\n"
 		"When ports are specified in the URL and the default option separators are used (see `gpac -h doc`), the URL must either:\n"
 		"- have a trailing '/', e.g. `udp://localhost:1234/:opts`\n"
 		"- use `gpac` separator, e.g. `udp://localhost:1234:gpac:opts`\n"
+		"\n"
+		"When the socket is listening in keep-alive -ka() mode:\n"
+		"- a single connection is allowed and a single output PID will be produced\n"
+		"- each connection close event will triger a pipeline flush\n"
+		"\n"
 #ifdef GPAC_CONFIG_DARWIN
-	"\nOn OSX with VM packet replay you will need to force multicast routing, e.g. `route add -net 239.255.1.4/32 -interface vboxnet0`"
+		"\nOn OSX with VM packet replay you will need to force multicast routing, e.g. `route add -net 239.255.1.4/32 -interface vboxnet0`"
 #endif
 	""
-#else
-	"Your platform does not supports unix domain sockets, udpu:// and tcpu:// schemes not supported."
-#endif
 	,
 #endif //GPAC_DISABLE_DOC
 	.private_size = sizeof(GF_SockInCtx),
@@ -637,3 +681,9 @@
 	return &SockInRegister;
 }
 
+#else
+const GF_FilterRegister *sockin_register(GF_FilterSession *session)
+{
+	return NULL;
+}
+#endif

gpac-2.2.1.tar.gz/src/filters/inspect.c -> gpac-2.4.0.tar.gz/src/filters/inspect.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2017-2022
+ *			Copyright (c) Telecom ParisTech 2017-2024
  *					All rights reserved
  *
  *  This file is part of GPAC / inspection filter
@@ -29,6 +29,8 @@
 #include <gpac/xml.h>
 #include <gpac/internal/media_dev.h>
 
+#ifndef GPAC_DISABLE_INSPECT
+
 typedef struct
 {
 	GF_FilterPid *src_pid;
@@ -129,6 +131,7 @@
 	Bool has_seen_eos;
 } GF_InspectCtx;
 
+static void format_duration(s64 dur, u64 timescale, FILE *dump, Bool skip_name);
 
 GF_Err gf_bs_set_logger(GF_BitStream *bs, void (*on_bs_log)(void *udta, const char *field_name, u32 nb_bits, u64 field_val, s32 idx1, s32 idx2, s32 idx3), void *udta);
 
@@ -296,7 +299,7 @@
 	{181, "alternative_depth_info"}
 };
 
-static const char *get_sei_name(u32 sei_type, u32 is_hevc)
+static const char *get_sei_name(u32 sei_type)
 {
 	u32 i, count = sizeof(SEINames) / sizeof(tag_to_name);
 	for (i=0; i<count; i++) {
@@ -496,40 +499,251 @@
 			   min_display_mastering_luminance*1.0/(isMPEG?10000:(1<<14)));
 }
 
-static u32 dump_t35(FILE *dump, GF_BitStream *bs)
+static void dump_t35(FILE *dump, GF_BitStream *bs, u32 sei_size)
 {
-	u32 read_bytes = 1;
 	u32 country_code = gf_bs_read_u8(bs);
 	inspect_printf(dump, " country_code=\"0x%x\"", country_code);
 	if (country_code == 0xFF) {
 		u32 country_code_extension = gf_bs_read_u8(bs);
-		read_bytes++;
 		inspect_printf(dump, " country_code_extension=\"0x%x\"", country_code_extension);
 	}
-	if (country_code == 0xB5) { // USA
-		u32 terminal_provider_code = gf_bs_read_u16(bs);
+	u32 terminal_provider_code = gf_bs_read_u16(bs);
+	inspect_printf(dump, " terminal_provider_code=\"0x%x\"", terminal_provider_code);
+
+	if ((terminal_provider_code==49) || (terminal_provider_code==47)) {
+		u32 code = gf_bs_read_u32(bs);
+		u32 udta_code = gf_bs_read_u8(bs);
+		inspect_printf(dump, " user_id=\"%s\"", gf_4cc_to_str(code) );
+		inspect_printf(dump, " user_data_type=\"%d\"", udta_code);
+		if (terminal_provider_code==47) {
+			inspect_printf(dump, " directv_user_data_length %d\n", gf_bs_read_u8(bs) );
+		}
+		if (udta_code==3) {
+			u32 i;
+			inspect_printf(dump, " em_data_flag=\"%d\"\n", gf_bs_read_int(bs, 1) );
+			inspect_printf(dump, " cc_data_flag=\"%d\"\n", gf_bs_read_int(bs, 1) );
+			inspect_printf(dump, " extra_data_flag=\"%d\"\n", gf_bs_read_int(bs, 1) );
+			u32 cc_count = gf_bs_read_int(bs, 5);
+			inspect_printf(dump, " cc_count=\"%d\"\n", cc_count);
+			inspect_printf(dump, " em_data=\"%x\"\n", gf_bs_read_u8(bs));
+
+			inspect_printf(dump, " cc_data=\"");
+			for (i=0; i< cc_count; ++i) {
+				/*u8 marker = */gf_bs_read_int(bs, 5);
+				u8 valid = gf_bs_read_int(bs, 1);
+				u8 type = gf_bs_read_int(bs, 2);
+				u16 data = gf_bs_read_u16(bs);
+				if (i) inspect_printf(dump, ", ");
+				if (valid)
+					inspect_printf(dump, "%d 0x%x", type, data);
+				else
+					inspect_printf(dump, "skip");
+			}
+			inspect_printf(dump, "\"");
+		}
+	} else {
 		u32 terminal_provider_oriented_code = gf_bs_read_u16(bs);
 		u32 application_identifier = gf_bs_read_u8(bs);
 		u32 application_mode = gf_bs_read_u8(bs);
-		read_bytes+=6;
-		inspect_printf(dump, " terminal_provider_code=\"0x%x\" terminal_provider_oriented_code=\"0x%x\" application_identifier=\"%u\" application_mode=\"%u\"",
-				   terminal_provider_code, terminal_provider_oriented_code,
+		inspect_printf(dump, " terminal_provider_oriented_code=\"0x%x\" application_identifier=\"%u\" application_mode=\"%u\"",
+				   terminal_provider_oriented_code,
 				   application_identifier, application_mode);
 	}
-	return read_bytes;
 }
 
-static void dump_sei(FILE *dump, GF_BitStream *bs, Bool is_hevc)
+static u32 dump_udta_m2v(FILE *dump, u8 *data, u32 sei_size)
+{
+
+    u32 udta_id = 0;
+	if (sei_size < 4)
+		return 1;
+
+	udta_id = GF_4CC(data0, data1, data2, data3);
+    u32 udta_code = 0;
+
+	inspect_printf(dump, " udta_id=\"%s\"", gf_4cc_to_str(udta_id));
+
+	if (udta_id==GF_4CC('G','A','9','4') && sei_size >= 5)
+		udta_code = data4;
+	else if (udta_id==GF_4CC('D','T','G','1') && sei_size >= 5)
+		udta_code = data4;
+
+	if (udta_code)
+		inspect_printf(dump, " udta_code=\"0x%X\"", udta_code);
+
+	if (udta_code == 3 && sei_size >= 7) {
+		u32 i;
+		data+=5;
+		inspect_printf(dump, " em_data_flag=\"%d\"\n", (data0 & 0x80) ? 1 : 0);
+		inspect_printf(dump, " cc_data_flag=\"%d\"\n", (data0 & 0x40) ? 1 : 0 );
+		inspect_printf(dump, " extra_data_flag=\"%d\"\n", (data0 & 0x20) ? 1 : 0 );
+		u32 cc_count = data0 & 0x1F;
+		inspect_printf(dump, " cc_count=\"%d\"\n", cc_count);
+		inspect_printf(dump, " em_data=\"%x\"\n", data1);
+		data+=2;
+		sei_size-=7;
+		inspect_printf(dump, " cc_data=\"");
+		for (i=0; i< cc_count; ++i) {
+			if (sei_size < 3)
+				break;
+			u8 valid = (data0>>2) & 0x1;
+			u8 type = data0 & 0x3;
+			u16 ccdata = (data1<<8) | data2;
+			if (i) inspect_printf(dump, ", ");
+				if (valid)
+					inspect_printf(dump, "%d 0x%x", type, ccdata);
+				else
+					inspect_printf(dump, "skip");
+			data+=3;
+			sei_size-=3;
+		}
+		inspect_printf(dump, "\"");
+	}
+	return 0;
+}
+
+static void dump_time_code(FILE *dump, GF_BitStream *bs, int i)
+{
+	Bool full_timestamp_flag, discontinuity_flag, cnt_dropped_flag;
+	u8 counting_type;
+	u32 n_frames;
+	u32 time_offset_length, time_offset_value;
+	u32 seconds = 0, minutes = 0, hours = 0;
+
+	counting_type = gf_bs_read_int(bs, 5);
+	inspect_printf(dump, " counting_type_%d=\"%d\"", i, counting_type);
+	full_timestamp_flag = gf_bs_read_int(bs, 1);
+	inspect_printf(dump, " full_timestamp_flag_%d=\"%d\"", i, full_timestamp_flag);
+	discontinuity_flag = gf_bs_read_int(bs, 1);
+	inspect_printf(dump, " discontinuity_flag_%d=\"%d\"", i, discontinuity_flag);
+	cnt_dropped_flag = gf_bs_read_int(bs, 1);
+	inspect_printf(dump, " cnt_dropped_flag_%d=\"%d\"", i, cnt_dropped_flag);
+	n_frames = gf_bs_read_int(bs, 9);
+	if (full_timestamp_flag) {
+		seconds = gf_bs_read_int(bs, 6);
+		minutes = gf_bs_read_int(bs, 6);
+		hours = gf_bs_read_int(bs, 5);
+	} else {
+		Bool seconds_flag = gf_bs_read_int(bs, 1);
+		if (seconds_flag) {
+			seconds = gf_bs_read_int(bs, 6);
+			Bool minutes_flag = gf_bs_read_int(bs, 1);
+			if (minutes_flag) {
+				minutes = gf_bs_read_int(bs, 6);
+				Bool hours_flag = gf_bs_read_int(bs, 1);
+				if (hours_flag) {
+					hours = gf_bs_read_int(bs, 5);
+				}
+			}
+		}
+	}
+	inspect_printf(dump, " time_code_%d=\"%02d:%02d:%02d:%02d\"", i, hours, minutes, seconds, n_frames);
+	time_offset_length = gf_bs_read_int(bs, 5);
+	inspect_printf(dump, " time_offset_length_%d=\"%d\"", i, time_offset_length);
+	time_offset_value = 0;
+	if (time_offset_length > 0) {
+		time_offset_value = gf_bs_read_int(bs, time_offset_length);
+	}
+	inspect_printf(dump, " time_offset_value_%d=\"%d\"", i, time_offset_value);
+}
+
+static void dump_time_code_hevc(FILE *dump, GF_BitStream *bs)
+{
+	u8 num_clock_ts = gf_bs_read_int(bs, 2);
+	inspect_printf(dump, " num_clock_ts=\"%d\"", num_clock_ts);
+	for (int i = 0; i < num_clock_ts; i++) {
+		Bool clock_timestamp_flag = gf_bs_read_int(bs, 1);
+		if (clock_timestamp_flag) {
+			Bool units_field_based_flag = gf_bs_read_int(bs, 1);
+			inspect_printf(dump, " units_field_based_flag_%d=\"%d\"", i, units_field_based_flag);
+			dump_time_code(dump, bs, i);
+		}
+	}
+}
+
+static u32 gf_bs_inspect_int(GF_BitStream *bs, FILE *dump, char *name, int idx, int nbits)
+{
+	u32 val = gf_bs_read_int(bs, nbits);
+	inspect_printf(dump, " %s_%d=\"%d\"", name, idx, val);
+	return val;
+}
+
+static void dump_avc_pic_timing(FILE *dump, GF_BitStream *bs, AVCState *avc)
+{
+	int sps_id = avc->sps_active_idx;
+	const char NumClockTS = { 1, 1, 1, 2, 2, 3, 3, 2, 3 };
+	AVCSeiPicTiming *pt = &avc->sei.pic_timing;
+
+	if (sps_id < 0) {
+		/*sps_active_idx equals -1 when no sps has been detected. In this case SEI should not be decoded.*/
+		gf_assert(0);
+		return;
+	}
+
+	if (avc->spssps_id.vui.nal_hrd_parameters_present_flag || avc->spssps_id.vui.vcl_hrd_parameters_present_flag) { /*CpbDpbDelaysPresentFlag, see 14496-10(2003) E.11*/
+		gf_bs_inspect_int(bs, dump, "cpb_removal_delay_minus1", sps_id, 1 + avc->spssps_id.vui.hrd.cpb_removal_delay_length_minus1);
+		gf_bs_inspect_int(bs, dump, "dpb_output_delay_minus1", sps_id, 1 + avc->spssps_id.vui.hrd.dpb_output_delay_length_minus1);
+	}
+
+	/*ISO 14496-10 (2003), D.8.2: we need to get pic_struct in order to know if we display top field first or bottom field first*/
+	if (avc->spssps_id.vui.pic_struct_present_flag) {
+		int i;
+		pt->pic_struct = gf_bs_inspect_int(bs, dump, "pic_struct", sps_id, 4);
+		if (pt->pic_struct > 8) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("Inspect invalid avc pic_struct value %d\n", pt->pic_struct));
+			return;
+		}
+
+		inspect_printf(dump, " num_clock_ts=\"%d\"", NumClockTSpt->pic_struct);
+		for (i = 0; i < NumClockTSpt->pic_struct; i++) {
+			if (gf_bs_inspect_int(bs, dump, "clock_timestamp_flag", i, 1)) {
+				Bool full_timestamp_flag;
+				/*ct_type*/gf_bs_read_int(bs, 2);
+				gf_bs_inspect_int(bs, dump, "nuit_field_based_flag", i, 1);
+				gf_bs_inspect_int(bs, dump, "counting_type", i, 5);
+				full_timestamp_flag = gf_bs_inspect_int(bs, dump, "full_timestamp_flag", i, 1);
+				gf_bs_inspect_int(bs, dump, "discontinuity_flag", i, 1);
+				gf_bs_inspect_int(bs, dump, "cnt_dropped_flag", i, 1);
+				u32 n_frames = gf_bs_read_int(bs, 8);
+
+				u32 hours=0, minutes=0, seconds=0;
+				if (full_timestamp_flag) {
+					seconds = gf_bs_read_int(bs, 6);
+					minutes = gf_bs_read_int(bs, 6);
+					hours = gf_bs_read_int(bs, 5);
+				} else {
+					if (gf_bs_read_int(bs, 1)) {
+						seconds = gf_bs_read_int(bs, 6);
+						if (gf_bs_read_int(bs, 1)) {
+							minutes = gf_bs_read_int(bs, 6);
+							if (gf_bs_read_int(bs, 1)) {
+								hours = gf_bs_read_int(bs, 5);
+							}
+						}
+					}
+					if (avc->spssps_id.vui.hrd.time_offset_length > 0) {
+						inspect_printf(dump, " time_offset_length_%d=\"%d\"", i, avc->spssps_id.vui.hrd.time_offset_length);
+						gf_bs_inspect_int(bs, dump, "time_offset_value", i, avc->spssps_id.vui.hrd.time_offset_length);
+					}
+				}
+
+				inspect_printf(dump, " time_code_%d=\"%02d:%02d:%02d:%02d\"", i, hours, minutes, seconds, n_frames);
+			}
+		}
+	}
+}
+
+static void dump_sei(FILE *dump, GF_BitStream *bs, AVCState *avc, HEVCState *hevc, VVCState *vvc)
 {
-	u32 i;
 	gf_bs_enable_emulation_byte_removal(bs, GF_TRUE);
 
 	//skip nal header
-	gf_bs_read_int(bs, is_hevc ? 16 : 8);
+	gf_bs_read_int(bs, avc ? 8 : 16);
 
 	while (gf_bs_available(bs) ) {
 		u32 sei_type = 0;
 		u32 sei_size = 0;
+		u32 sei_pos;
 		while (gf_bs_peek_bits(bs, 8, 0) == 0xFF) {
 			sei_type += 255;
 			gf_bs_read_int(bs, 8);
@@ -540,26 +754,33 @@
 			gf_bs_read_int(bs, 8);
 		}
 		sei_size += gf_bs_read_int(bs, 8);
+		sei_pos = (u32) gf_bs_get_position(bs);
 
-		inspect_printf(dump, "    <SEIMessage ptype=\"%u\" psize=\"%u\" type=\"%s\"", sei_type, sei_size, get_sei_name(sei_type, is_hevc) );
+		inspect_printf(dump, "    <SEIMessage ptype=\"%u\" psize=\"%u\" type=\"%s\"", sei_type, sei_size, get_sei_name(sei_type) );
 		if (sei_type == 144) {
 			dump_clli(dump, bs);
 		} else if (sei_type == 137) {
 			dump_mdcv(dump, bs, GF_TRUE);
+		} else if (sei_type == 1 && avc) {
+			dump_avc_pic_timing(dump, bs, avc);
+		} else if (sei_type == 136) {
+			dump_time_code_hevc(dump, bs);
 		} else if (sei_type == 4) {
-			i = dump_t35(dump, bs);
-			while (i < sei_size) {
-				gf_bs_read_u8(bs);
-				i++;
-			}
-		} else {
-			i=0;
-			while (i < sei_size) {
-				gf_bs_read_u8(bs);
-				i++;
-			}
+			dump_t35(dump, bs, sei_size);
+		}
+		else if (avc && (sei_type==6)) {
+			u32 frame_cnt = gf_bs_read_ue(bs);
+			inspect_printf(dump, " frame_count=\"%u\"", frame_cnt);
 		}
 		inspect_printf(dump, "/>\n");
+
+		//don't trust sei parsers, force jumping to next - use byte-per-byte read for EPB removal
+		gf_bs_seek(bs, sei_pos);
+		while (sei_size && gf_bs_available(bs)) {
+			gf_bs_read_u8(bs);
+			sei_size--;
+		}
+
 		if (gf_bs_peek_bits(bs, 8, 0) == 0x80) {
 			break;
 		}
@@ -595,8 +816,6 @@
 	if (dump_crc) inspect_printf(dump, "crc=\"%u\" ", gf_crc_32(ptr, ptr_size) );
 
 	if (hevc) {
-#ifndef GPAC_DISABLE_HEVC
-
 		if (ptr_size<=1) {
 			inspect_printf(dump, "error=\"invalid nal size 1\"/>\n");
 			return;
@@ -613,6 +832,7 @@
 				bs = gf_bs_new(ptr, ptr_size, GF_BITSTREAM_READ);
 			}
 			gf_bs_set_logger(bs, regular_bs_log, &lcbk);
+			hevc->full_slice_header_parse = GF_TRUE;
 			res = gf_hevc_parse_nalu_bs(bs, hevc, &type, &temporal_id, &quality_id);
 		} else {
 			bs = NULL;
@@ -809,7 +1029,10 @@
 				u32 mode = s0;
 				remain -= 1;
 				s += 1;
-				if (mode) {
+				if (!remain) {
+					inspect_printf(dump, "error=\"invalid inband data extractor size, no bytes remaining\"/>\n");
+					return;
+				} else if (mode) {
 					u32 len = s0;
 					if (len+1>remain) {
 						inspect_printf(dump, "error=\"invalid inband data extractor size: %d vs %d remaining\"/>\n", len, remain);
@@ -873,16 +1096,12 @@
 			} else {
 				bs = gf_bs_new(ptr, ptr_size, GF_BITSTREAM_READ);
 			}
-			dump_sei(dump, bs, GF_TRUE);
+			dump_sei(dump, bs, avc, hevc, vvc);
 			if (!pctx) gf_bs_del(bs);
 			inspect_printf(dump, "   </NALU>\n");
 		} else {
 			inspect_printf(dump, "/>\n");
 		}
-
-#else
-		inspect_printf(dump, "/>\n");
-#endif //GPAC_DISABLE_HEVC
 		return;
 	}
 
@@ -1036,7 +1255,7 @@
 			} else {
 				bs = gf_bs_new(ptr, ptr_size, GF_BITSTREAM_READ);
 			}
-			dump_sei(dump, bs, GF_TRUE);
+			dump_sei(dump, bs, avc, hevc, vvc);
 			if (!pctx) gf_bs_del(bs);
 			inspect_printf(dump, "   </NALU>\n");
 		} else {
@@ -1227,7 +1446,7 @@
 	if (!is_encrypted && (type == GF_AVC_NALU_SEI)) {
 		inspect_printf(dump, ">\n");
 		gf_bs_set_logger(bs, NULL, NULL);
-		dump_sei(dump, bs, GF_FALSE);
+		dump_sei(dump, bs, avc, hevc, vvc);
 		inspect_printf(dump, "   </NALU>\n");
 	} else {
 		inspect_printf(dump, "/>\n");
@@ -1241,11 +1460,26 @@
 	}
 }
 
+static u32 inspect_get_analyze_mode()
+{
+	u32 i, nb_args = gf_sys_get_argc();
+	for (i=1;i<nb_args;i++) {
+		const char *arg = gf_sys_get_arg(i);
+		if (!strncmp(arg, "--analyze=", 10)) {
+			if (!strcmp(arg+10, "on")) return INSPECT_ANALYZE_ON;
+			else if (!strcmp(arg+10, "bs")) return INSPECT_ANALYZE_BS;
+			else if (!strcmp(arg+10, "full")) return INSPECT_ANALYZE_BS_BITS;
+			return INSPECT_ANALYZE_OFF;
+		}
+	}
+	return INSPECT_ANALYZE_OFF;
+}
+
 GF_EXPORT
 void gf_inspect_dump_nalu(FILE *dump, u8 *ptr, u32 ptr_size, Bool is_svc, HEVCState *hevc, AVCState *avc, VVCState *vvc, u32 nalh_size, Bool dump_crc, Bool is_encrypted)
 {
 	if (!dump) return;
-	gf_inspect_dump_nalu_internal(dump, ptr, ptr_size, is_svc, hevc, avc, vvc, nalh_size, dump_crc, is_encrypted, 0, NULL);
+	gf_inspect_dump_nalu_internal(dump, ptr, ptr_size, is_svc, hevc, avc, vvc, nalh_size, dump_crc, is_encrypted, inspect_get_analyze_mode(), NULL);
 }
 
 static void av1_dump_tile(FILE *dump, u32 idx, AV1Tile *tile)
@@ -1256,7 +1490,8 @@
 static u64 gf_inspect_dump_obu_internal(FILE *dump, AV1State *av1, u8 *obu_ptr, u64 obu_ptr_length, ObuType obu_type, u64 obu_size, u32 hdr_size, Bool dump_crc, PidCtx *pctx, u32 full_dump)
 {
 	//when the pid context is not set, obu_size (which includes the header size in gpac) must be set
-	assert(pctx || obu_size >= 2);
+	if (!pctx && (obu_size <= 2))
+		return obu_size;
 
 	if (pctx) {
 		InspectLogCbk lcbk;
@@ -1341,9 +1576,9 @@
 				DUMP_OBU_INT(width);
 				DUMP_OBU_INT(height);
 			}
-			if (obu_type==OBU_FRAME_HEADER)
-				break;
 		}
+		if (obu_type==OBU_FRAME_HEADER)
+			break;
 
 	case OBU_TILE_GROUP:
 		if (av1->frame_state.nb_tiles_in_obu) {
@@ -1359,13 +1594,16 @@
 		inspect_printf(dump, "   </OBU>\n");
 		break;
 	case OBU_METADATA:
-		{
+		if (obu_ptr_length>hdr_size) {
 			GF_BitStream *bs = gf_bs_new(obu_ptr+hdr_size, obu_ptr_length-hdr_size, GF_BITSTREAM_READ);
 			u32 metadata_type = (u32)gf_av1_leb128_read(bs, NULL);
 			DUMP_OBU_INT2("metadata_type", metadata_type);
 			switch (metadata_type) {
+				case OBU_METADATA_TYPE_TIMECODE:
+					dump_time_code(dump, bs, 0);
+					break;
 				case OBU_METADATA_TYPE_ITUT_T35:
-					dump_t35(dump, bs);
+					dump_t35(dump, bs, 0);
 					break;
 				case OBU_METADATA_TYPE_HDR_CLL:
 					dump_clli(dump, bs);
@@ -1393,7 +1631,7 @@
 void gf_inspect_dump_obu(FILE *dump, AV1State *av1, u8 *obu_ptr, u64 obu_ptr_length, ObuType obu_type, u64 obu_size, u32 hdr_size, Bool dump_crc)
 {
 	if (!dump) return;
-	gf_inspect_dump_obu_internal(dump, av1, obu_ptr, obu_ptr_length, obu_type, obu_size, hdr_size, dump_crc, NULL, 0);
+	gf_inspect_dump_obu_internal(dump, av1, obu_ptr, obu_ptr_length, obu_type, obu_size, hdr_size, dump_crc, NULL, inspect_get_analyze_mode());
 }
 
 static void gf_inspect_dump_prores_internal(FILE *dump, u8 *ptr, u64 frame_size, Bool dump_crc, PidCtx *pctx)
@@ -1976,6 +2214,7 @@
 
 	switch (p4cc) {
 	case GF_PROP_PID_DOWNLOAD_SESSION:
+	case GF_PROP_PID_MUX_INDEX:
 	case GF_PROP_PCK_END_RANGE:
 		return;
 	case GF_PROP_PCK_SENDER_NTP:
@@ -1983,6 +2222,8 @@
 	case GF_PROP_PCK_UTC_TIME:
 	case GF_PROP_PCK_MEDIA_TIME:
 	case GF_PROP_PID_CENC_HAS_ROLL:
+	case GF_PROP_PID_DSI_SUPERSET:
+	case GF_PROP_PID_PREMUX_STREAM_TYPE:
 		if (gf_sys_is_test_mode())
 			return;
 		break;
@@ -2100,6 +2341,8 @@
 
 		case GF_PROP_PID_ISOM_TREX_TEMPLATE:
 		case GF_PROP_PID_ISOM_STSD_TEMPLATE:
+		case GF_PROP_PID_ISOM_STSD_TEMPLATE_IDX:
+		case GF_PROP_PID_ISOM_STSD_ALL_TEMPLATES:
 			//TODO once all OK: remove this test and regenerate all hashes
 			if (gf_sys_is_test_mode())
 				return;
@@ -2113,13 +2356,12 @@
 	if (ctx->xml) {
 		if (ctx->dtype)
 			inspect_printf(dump, " type=\"%s\"", gf_props_get_type_name(att->type) );
-			
-		if (pname && (strchr(pname, ' ') || strchr(pname, ':'))) {
+
+		if (pname && (strpbrk(pname, " :"))) {
 			u32 i=0, k;
 			char *pname_no_space = gf_strdup(pname);
 			while (pname_no_spacei) {
-				if (pname_no_spacei==' ') pname_no_spacei='_';
-				if (pname_no_spacei==':') pname_no_spacei='_';
+				if ((pname_no_spacei==' ') || (pname_no_spacei==':')) pname_no_spacei='_';
 				i++;
 			}
 
@@ -2177,6 +2419,9 @@
 		}else{
 			inspect_printf(dump, "%s", gf_props_dump(p4cc, att, szDump, (GF_PropDumpDataMode) ctx->dump_data) );
 		}
+		if ((p4cc==GF_PROP_PID_DURATION) && !gf_sys_is_test_mode()) {
+			format_duration(att->value.lfrac.num, att->value.lfrac.den, dump, GF_TRUE);
+		}
 		inspect_printf(dump, "\n");
 	}
 }
@@ -2187,7 +2432,7 @@
 	u32 size=0;
 	const char *data=NULL;
 	char *str = ctx->fmt;
-	assert(str);
+	gf_assert(str);
 
 	if (pck) {
 		data = gf_filter_pck_get_data(pck, &size);
@@ -2350,7 +2595,7 @@
 				u64 time = ts/1000;
 				h = (u32) (time/3600);
 				m = (u32) (time/60 - h*60);
-				s = (u32) (time - m*60 - h*3660);
+				s = (u32) (time - m*60 - h*3600);
 				ms = (u32) (ts - 1000*time);
 				if (!strcmp(key, "startc") || !strcmp(key, "endc"))
 					inspect_printf(dump, "%02d:%02d:%02d,%03d", h, m, s, ms);
@@ -2529,6 +2774,11 @@
 			case M2V_GOP_START_CODE:
 				inspect_printf(dump, " name=\"GOPStart\"");
 				break;
+			case M2V_UDTA_START_CODE:
+				start = gf_m4v_get_object_start(m4v);
+				if (size > start+4)
+					dump_udta_m2v(dump, data + start+4, (u32) (size-start-4));
+				break;
 			default:
 				break;
 			}
@@ -2683,7 +2933,7 @@
 	if (superframe_index_size)
 		inspect_printf(dump, " nb_frames=\"%u\" index_size=\"%u\">\n", num_frames_in_superframe, superframe_index_size);
 	else {
-		assert(num_frames_in_superframe==1);
+		gf_assert(num_frames_in_superframe==1);
 	}
 	for (i = 0; i < num_frames_in_superframe; ++i) {
 		u64 pos2 = gf_bs_get_position(pctx->bs);
@@ -2978,11 +3228,15 @@
 			}
 		}
 		while (size) {
+			if (size < pctx->nalu_size_length) {
+				inspect_printf(dump, "   \n", pctx->nalu_size_length, size);
+				break;
+			}
 			u32 nal_size = inspect_get_nal_size((char*)data, pctx->nalu_size_length);
 			data += pctx->nalu_size_length;
 
-			if (pctx->nalu_size_length + nal_size > size) {
-				inspect_printf(dump, "   \n", nal_size, size);
+			if (nal_size >= GF_UINT_MAX - pctx->nalu_size_length || pctx->nalu_size_length + nal_size > size) {
+				inspect_printf(dump, "   \n", nal_size, size);
 				break;
 			} else {
 				inspect_printf(dump, "   <NALU size=\"%d\" ", nal_size);
@@ -2999,12 +3253,16 @@
 			u64 obu_size = 0;
 			u32 hdr_size = 0;
 
-			obu_size = gf_inspect_dump_obu_internal(dump, pctx->av1_state, (char *) data, obu_size, obu_type, obu_size, hdr_size, ctx->crc, pctx, ctx->analyze);
+			obu_size = gf_inspect_dump_obu_internal(dump, pctx->av1_state, (char *) data, size, obu_type, obu_size, hdr_size, ctx->crc, pctx, ctx->analyze);
 
 			if (obu_size > size) {
 				inspect_printf(dump, "   \n", (u32) obu_size, size);
 				break;
 			}
+			if (!obu_size) {
+				inspect_printf(dump, "   \n", (u32) obu_size, size);
+				break;
+			}
 			data += obu_size;
 			size -= (u32)obu_size;
 			idx++;
@@ -3018,6 +3276,8 @@
 		case GF_CODECID_MPEG2_SNR:
 		case GF_CODECID_MPEG2_HIGH:
 		case GF_CODECID_MPEG2_MAIN:
+		case GF_CODECID_MPEG2_SIMPLE:
+		case GF_CODECID_MPEG2_SPATIAL:
 		case GF_CODECID_MPEG4_PART2:
 			inspect_dump_mpeg124(pctx, (char *) data, size, dump);
 			break;
@@ -3027,6 +3287,10 @@
 			pos = 0;
 			while (size) {
 				hdr = gf_mp3_get_next_header_mem(data, size, &pos);
+				if (!hdr) {
+					inspect_printf(dump, "\n");
+					break;
+				}
 				fsize = gf_mp3_frame_size(hdr);
 				inspect_printf(dump, "<MPEGAudioFrame size=\"%d\" layer=\"%d\" version=\"%d\" bitrate=\"%d\" channels=\"%d\" samplesPerFrame=\"%d\" samplerate=\"%d\"/>\n", fsize, gf_mp3_layer(hdr), gf_mp3_version(hdr), gf_mp3_bit_rate(hdr), gf_mp3_num_channels(hdr), gf_mp3_window_size(hdr), gf_mp3_sampling_rate(hdr));
 				if (size<pos+fsize) break;
@@ -3039,6 +3303,7 @@
 			break;
 		case GF_CODECID_SUBS_TEXT:
 		case GF_CODECID_META_TEXT:
+		case GF_CODECID_SIMPLE_TEXT:
 			dflag=1;
 		case GF_CODECID_SUBS_XML:
 		case GF_CODECID_META_XML:
@@ -3050,6 +3315,23 @@
 			if (dflag)
 				inspect_printf(dump, ">\n");
 			break;
+		case GF_CODECID_WEBVTT:
+		{
+			GF_List *cues = gf_webvtt_parse_cues_from_data(data, size, 0, 0);
+			while (gf_list_count(cues)) {
+				GF_WebVTTCue *cue = gf_list_pop_front(cues);
+				if (cue->pre_text) gf_fprintf(dump, "%s\n\n", cue->pre_text);
+				if (cue->id) gf_fprintf(dump, "%s\n", cue->id);
+				if (cue->settings) gf_fprintf(dump, " %s", cue->settings);
+				if (cue->text) gf_fprintf(dump, "%s", cue->text);
+				gf_fprintf(dump, "\n");
+				if (cue->post_text) gf_fprintf(dump, "%s\n\n", cue->post_text);
+
+				gf_webvtt_cue_del(cue);
+			}
+			gf_list_del(cues);
+		}
+			break;
 		case GF_CODECID_APCH:
 		case GF_CODECID_APCO:
 		case GF_CODECID_APCN:
@@ -3157,7 +3439,7 @@
 }
 #endif
 
-static void format_duration(s64 dur, u64 timescale, FILE *dump)
+static void format_duration(s64 dur, u64 timescale, FILE *dump, Bool skip_name)
 {
 	u32 h, m, s, ms;
 	const char *name = "duration";
@@ -3178,16 +3460,20 @@
 	m = (u32) (dur/ 60000) - h*60;
 	s = (u32) (dur/1000) - h*3600 - m*60;
 	ms = (u32) (dur) - h*3600000 - m*60000 - s*1000;
+	if (skip_name)
+		inspect_printf(dump, " (");
+	else
+		inspect_printf(dump, " %s ", name);
 	if (h<=24) {
 		if (h)
-			inspect_printf(dump, " %s %02d:%02d:%02d.%03d", name, h, m, s, ms);
+			inspect_printf(dump, "%02d:%02d:%02d.%03d", h, m, s, ms);
 		else
-			inspect_printf(dump, " %s %02d:%02d.%03d", name, m, s, ms);
+			inspect_printf(dump, "%02d:%02d.%03d", m, s, ms);
 	} else {
 		u32 d = (u32) (dur / 3600000 / 24);
 		h = (u32) (dur/3600000)-24*d;
 		if (d<=365) {
-			inspect_printf(dump, " %s %d Days, %02d:%02d:%02d.%03d", name, d, h, m, s, ms);
+			inspect_printf(dump, "%d Days, %02d:%02d:%02d.%03d", d, h, m, s, ms);
 		} else {
 			u32 y=0;
 			while (d>365) {
@@ -3195,14 +3481,17 @@
 				d-=365;
 				if (y%4) d--;
 			}
-			inspect_printf(dump, " %s %d Years %d Days, %02d:%02d:%02d.%03d", name, y, d, h, m, s, ms);
+			inspect_printf(dump, "%d Years %d Days, %02d:%02d:%02d.%03d", y, d, h, m, s, ms);
 		}
 	}
+	if (skip_name)
+		inspect_printf(dump, ")");
 }
 
 
 static void inspect_dump_pid_as_info(GF_InspectCtx *ctx, FILE *dump, GF_FilterPid *pid, u32 pid_idx, Bool is_connect, Bool is_remove, u64 pck_for_config, Bool is_info, PidCtx *pctx)
 {
+	char szCodecRFC6381_CODEC_NAME_SIZE_MAX;
 	const GF_PropertyValue *p, *dsi, *dsi_enh;
 	Bool is_raw=GF_FALSE;
 	Bool is_protected=GF_FALSE;
@@ -3210,6 +3499,9 @@
 
 	if (!ctx->dump_log && !dump) return;
 
+	szCodec0 = 0;
+	gf_filter_pid_get_rfc_6381_codec_string(pid, szCodec, GF_FALSE, GF_FALSE, NULL, NULL);
+
 	inspect_printf(dump, "PID");
 	p = gf_filter_pid_get_property(pid, GF_PROP_PID_ID);
 	if (!p) p = gf_filter_pid_get_property(pid, GF_PROP_PID_ESID);
@@ -3253,7 +3545,7 @@
 	if (p && stricmp(p->value.string, "und")) inspect_printf(dump, " language \"%s\"", p->value.string);
 
 	p = gf_filter_pid_get_property(pid, GF_PROP_PID_DURATION);
-	if (p) format_duration((s64) p->value.lfrac.num, (u32) p->value.lfrac.den, dump);
+	if (p) format_duration((s64) p->value.lfrac.num, (u32) p->value.lfrac.den, dump, GF_FALSE);
 
 	p = gf_filter_pid_get_property(pid, GF_PROP_PID_TIMESCALE);
 	if (p) inspect_printf(dump, " timescale %d", p->value.uint);
@@ -3336,6 +3628,8 @@
 	}
 
 	inspect_printf(dump, " codec");
+	if (szCodec0 && strcmp(szCodec, "unkn"))
+		inspect_printf(dump, " %s", szCodec);
 
 #ifndef GPAC_DISABLE_AV_PARSERS
 	if ((codec_id==GF_CODECID_HEVC) || (codec_id==GF_CODECID_LHVC) || (codec_id==GF_CODECID_HEVC_TILES)) {
@@ -3624,6 +3918,18 @@
 
 			}
 		}
+
+		p = gf_filter_pid_get_property(pid, GF_PROP_PID_CODEC);
+		if (!p &&!gf_sys_is_test_mode()) {
+			char szCodecRFC6381_CODEC_NAME_SIZE_MAX;
+			szCodec0 = 0;
+			if (gf_filter_pid_get_rfc_6381_codec_string(pid, szCodec, GF_FALSE, GF_FALSE, NULL, NULL)==GF_OK) {
+				GF_PropertyValue _p;
+				_p.type = GF_PROP_STRING;
+				_p.value.string = szCodec;
+				inspect_dump_property(ctx, dump, GF_PROP_PID_CODEC, NULL, &_p, pctx);
+			}
+		}
 	} else {
 		while (ctx->info) {
 			u32 prop_4cc;
@@ -3656,6 +3962,7 @@
 	hvcc = NULL;
 	lhcc = NULL;
 	vvcC = NULL;
+	Bool dsi_is_text=GF_FALSE;
 	pctx->has_svcc = 0;
 
 	switch (pctx->codec_id) {
@@ -3873,6 +4180,8 @@
 	case GF_CODECID_MPEG2_SNR:
 	case GF_CODECID_MPEG2_HIGH:
 	case GF_CODECID_MPEG2_MAIN:
+	case GF_CODECID_MPEG2_SIMPLE:
+	case GF_CODECID_MPEG2_SPATIAL:
 	case GF_CODECID_MPEG4_PART2:
 
 #ifndef GPAC_DISABLE_AV_PARSERS
@@ -3904,24 +4213,31 @@
 			inspect_printf(dump, "/>\n");
 			return;
 		}
+		inspect_printf(dump, ">\n");
 		inspect_printf(dump, " <XMLTextConfig>\n");
 		for (i=0; i<dsi->value.data.size; i++) {
 			gf_fputc(dsi->value.data.ptri, dump);
 		}
 		inspect_printf(dump, "\n </XMLTextConfig>\n");
 		break;
+	case GF_CODECID_WEBVTT:
+		dsi_is_text = GF_TRUE;
 	case GF_CODECID_SUBS_TEXT:
 	case GF_CODECID_META_TEXT:
+	case GF_CODECID_SIMPLE_TEXT:
 		if (!dsi) {
 			inspect_printf(dump, "/>\n");
 			return;
 		}
-		inspect_printf(dump, " <TextConfig>\n");
-		inspect_printf(dump, "<!CDATA");
+		inspect_printf(dump, ">\n");
+		inspect_printf(dump, " <TextConfig>");
+		if (!dsi_is_text)
+			inspect_printf(dump, "\n<!CDATA");
 		for (i=0; i<dsi->value.data.size; i++) {
 			gf_fputc(dsi->value.data.ptri, dump);
 		}
-		inspect_printf(dump, ">\n");
+		if (!dsi_is_text)
+			inspect_printf(dump, ">\n");
 		inspect_printf(dump, " </TextConfig>\n");
 		break;
 	case GF_CODECID_APCH:
@@ -3938,13 +4254,14 @@
 			inspect_printf(dump, "/>\n");
 			return;
 		}
-		{
+	{
 		u16 size;
 		if (!pctx->bs)
 			pctx->bs = gf_bs_new(dsi->value.data.ptr, dsi->value.data.size, GF_BITSTREAM_READ);
 		else
 			gf_bs_reassign_buffer(pctx->bs, dsi->value.data.ptr, dsi->value.data.size);
 
+		inspect_printf(dump, ">\n");
 		inspect_printf(dump, " <MPEGHAudioConfig");
 		inspect_printf(dump, " version=\"%d\"", gf_bs_read_u8(pctx->bs) );
 		inspect_printf(dump, " ProfileLevelIndication=\"%d\"", gf_bs_read_u8(pctx->bs) );
@@ -3959,8 +4276,7 @@
 		} else {
 			inspect_printf(dump, "/>\n");
 		}
-		inspect_printf(dump, "/>\n");
-		}
+	}
 		break;
 	case GF_CODECID_VP8:
 	case GF_CODECID_VP9:
@@ -4159,6 +4475,7 @@
 		ctx->args_updated = GF_FALSE;
 		for (i=0; i<count; i++) {
 			PidCtx *pctx = gf_list_get(ctx->src_pids, i);
+			if (!pctx->src_pid) continue;
 			switch (ctx->mode) {
 			case INSPECT_MODE_PCK:
 			case INSPECT_MODE_REFRAME:
@@ -4176,7 +4493,7 @@
 			ctx->dump_pck = GF_FALSE;
 		}
 	}
-	count = gf_list_count(ctx->src_pids);
+
 	for (i=0; i<count; i++) {
 		PidCtx *pctx = gf_list_get(ctx->src_pids, i);
 		GF_FilterPacket *pck = NULL;
@@ -4235,7 +4552,7 @@
 			}
 		}
 		if (!pck) continue;
-		
+
 		pctx->pck_for_config++;
 		pctx->pck_num++;
 
@@ -4251,7 +4568,7 @@
 				}
 			}
 		}
-		
+
 		if (ctx->dur.num && ctx->dur.den) {
 			u64 timescale = gf_filter_pck_get_timescale(pck);
 			u64 ts = gf_filter_pck_get_dts(pck);
@@ -4302,7 +4619,7 @@
 
 	pctx = gf_filter_pid_get_udta(pid);
 	if (pctx) {
-		assert(pctx->src_pid == pid);
+		gf_assert(pctx->src_pid == pid);
 		if (is_remove)
 			pctx->src_pid = NULL;
 		else if (!ctx->is_prober)
@@ -4311,8 +4628,9 @@
 	}
 	GF_SAFEALLOC(pctx, PidCtx);
 	if (!pctx) return GF_OUT_OF_MEM;
-	if (ctx->analyze)
+	if (ctx->analyze) {
 		pctx->bs = gf_bs_new((u8 *)pctx, 0, GF_BITSTREAM_READ);
+	}
 
 	pctx->src_pid = pid;
 	gf_filter_pid_set_udta(pid, pctx);
@@ -4551,13 +4869,18 @@
 #define OFFS(_n)	#_n, offsetof(GF_InspectCtx, _n)
 static const GF_FilterArgs InspectArgs =
 {
-	{ OFFS(log), "set probe log filename to print number of streams, GLOG uses GPAC logs `app@info`(default for android)", GF_PROP_STRING,
+	{ OFFS(log), "set probe log filename\n"
+	"- _any: target file path and name\n"
+	"- stderr: dump to stderr\n"
+	"- stdout: dump to stdout\n"
+	"- GLOG: use GPAC logs `app@info\n"
+	"- null: silent mode", GF_PROP_STRING,
 #ifdef GPAC_CONFIG_ANDROID
 		"GLOG"
 #else
 		"stdout"
 #endif
-		, "fileName, stderr, stdout, GLOG or null", 0},
+		, "_any|stderr|stdout|GLOG|null", 0},
 	{ OFFS(mode), "dump mode\n"
 	"- pck: dump full packet\n"
 	"- blk: dump packets before reconstruction\n"
@@ -4576,7 +4899,7 @@
 	{ OFFS(speed), "set playback command speed. If negative and start is 0, start is set to -1", GF_PROP_DOUBLE, "1.0", NULL, 0},
 	{ OFFS(start), "set playback start offset. A negative value means percent of media duration with -1 equal to duration", GF_PROP_DOUBLE, "0.0", NULL, 0},
 	{ OFFS(dur), "set inspect duration", GF_PROP_FRACTION, "0/0", NULL, 0},
-	{ OFFS(analyze), "analyze sample content (NALU, OBU)\n"
+	{ OFFS(analyze), "analyze sample content (NALU, OBU), similar to `-bsdbg` option of reframer filters\n"
 	"- off: no analyzing\n"
 	"- on: simple analyzing\n"
 	"- bs: log bitstream syntax (all elements read from bitstream)\n"
@@ -4618,7 +4941,7 @@
 	"Otherwise, all properties are dumped.\n"
 	"Note: specifying -xml(), -analyze(), -fmt() or using `-for-test` will force -full() to true.\n"
 	"\n"
-	"# Custom property duming\n"
+	"# Custom property dumping\n"
 	"The packet inspector can be configured to dump specific properties of packets using -fmt().\n"
 	"When the option is not present, all properties are dumped. Otherwise, only properties identified by `$TOKEN$` "
 	"are printed. You may use '$', '@' or '%' for `TOKEN` separator. `TOKEN` can be:\n"
@@ -4680,7 +5003,7 @@
 	"The -speed() option is only used to configure the filter chain but is ignored by the filter when consuming packets.\n"
 	"If real-time consumption is required, a reframer filter must be setup before the inspect filter.\n"
 	"EX gpac -i SRC reframer:rt=on inspect:buffer=10000:rbuffer=1000:mbuffer=30000:speed=2\n"
-	"This will play the session at 2x speed, using 30s of maximum buffering, consumming packets after 10s of media are ready and rebuffering if less than 1s of media.\n"
+	"This will play the session at 2x speed, using 30s of maximum buffering, consuming packets after 10s of media are ready and rebuffering if less than 1s of media.\n"
 	"\n"
 	)
 	.private_size = sizeof(GF_InspectCtx),
@@ -4717,13 +5040,18 @@
 
 static const GF_FilterArgs ProbeArgs =
 {
-	{ OFFS(log), "set probe log filename to print number of streams, GLOG uses GPAC logs `app@info`(default for android)", GF_PROP_STRING,
+	{ OFFS(log), "set probe log filename to print number of streams\n"
+	"- _any: target file path and name\n"
+	"- stderr: dump to stderr\n"
+	"- stdout: dump to stdout\n"
+	"- GLOG: use GPAC logs `app@info\n"
+	"- null: silent mode", GF_PROP_STRING,
 #ifdef GPAC_CONFIG_ANDROID
 		"GLOG"
 #else
 		"stdout"
 #endif
-	, "fileName, stderr, stdout GLOG or null", 0},
+	, "_any|stderr|stdout|GLOG|null", 0},
 	{0}
 };
 
@@ -4754,6 +5082,14 @@
 {
 	return &ProbeRegister;
 }
+#else
+const GF_FilterRegister *inspect_register(GF_FilterSession *session)
+{
+	return NULL;
+}
 
-
-
+const GF_FilterRegister *probe_register(GF_FilterSession *session)
+{
+	return NULL;
+}
+#endif // GPAC_DISABLE_INSPECT

gpac-2.2.1.tar.gz/src/filters/io_fcryp.c -> gpac-2.4.0.tar.gz/src/filters/io_fcryp.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2021-2022
+ *			Copyright (c) Telecom ParisTech 2021-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / file crypt/decrypt for full segment encryption filter
@@ -30,13 +30,14 @@
 #include <gpac/crypt.h>
 #include <gpac/network.h>
 
-#ifndef GPAC_DISABLE_CRYPTO
+#if !defined(GPAC_DISABLE_CRYPTO) && !defined(GPAC_DISABLE_CRYPTFILE)
 
 enum
 {
 	KEY_STATE_NONE=0,
 	KEY_STATE_CHANGED,
 	KEY_STATE_DOWNLOADING,
+	KEY_STATE_DOWNLOAD_DONE,
 	KEY_STATE_SET_IV,
 };
 
@@ -61,7 +62,9 @@
 	char *key_url;
 	bin128 IV;
 
+#ifdef GPAC_USE_DOWNLOADER
 	GF_DownloadSession *key_sess;
+#endif
 	GF_Err in_error;
 
 	u8 key_data20;
@@ -182,6 +185,30 @@
 	ctx->reload_key_state = KEY_STATE_NONE;
 }
 
+#ifdef GPAC_USE_DOWNLOADER
+void cryptfin_net_io(void *usr_cbk, GF_NETIO_Parameter *parameter)
+{
+	GF_CryptFileCtx *ctx = (GF_CryptFileCtx *) usr_cbk;
+	if (parameter->msg_type==GF_NETIO_DATA_EXCHANGE) {
+		if (ctx->key_size + parameter->size > 16) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("CryptFile Invalid key size, greater than 16 bytes\n"))
+			ctx->reload_key_state = KEY_STATE_NONE;
+			ctx->in_error = GF_SERVICE_ERROR;
+			return;
+		}
+		memcpy(ctx->key_data + ctx->key_size, parameter->data, parameter->size);
+		ctx->key_size += parameter->size;
+	}
+	else if (parameter->msg_type==GF_NETIO_DATA_TRANSFERED) {
+		ctx->reload_key_state = KEY_STATE_DOWNLOAD_DONE;
+	} else if (parameter->msg_type==GF_NETIO_STATE_ERROR) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("CryptFile Error downloading key %s: %s\n",ctx->key_url,  gf_error_to_string(parameter->error) ))
+		ctx->reload_key_state = KEY_STATE_NONE;
+		ctx->in_error = parameter->error;
+	}
+}
+#endif
+
 static GF_Err cryptfin_process(GF_Filter *filter)
 {
 	GF_Err e;
@@ -211,10 +238,13 @@
 	}
 
 	if (ctx->reload_key_state) {
+#ifdef GPAC_USE_DOWNLOADER
 		if (ctx->reload_key_state==KEY_STATE_CHANGED) {
+			ctx->key_size = 0;
+			//use a threaded session
 			if (!ctx->key_sess) {
 				GF_DownloadManager *dm = gf_filter_get_download_manager(filter);
-				ctx->key_sess = gf_dm_sess_new(dm, ctx->key_url, GF_NETIO_SESSION_NOT_THREADED | GF_NETIO_SESSION_NOT_CACHED, NULL, NULL, &e);
+				ctx->key_sess = gf_dm_sess_new(dm, ctx->key_url, GF_NETIO_SESSION_NOT_CACHED, cryptfin_net_io, ctx, &e);
 			} else {
 				e = gf_dm_sess_setup_from_url(ctx->key_sess, ctx->key_url, GF_TRUE);
 			}
@@ -223,33 +253,27 @@
 				return ctx->in_error = e;
 			}
 			ctx->reload_key_state = KEY_STATE_DOWNLOADING;
+			gf_dm_sess_process(ctx->key_sess);
 		}
+		//wait for end of download
 		if (ctx->reload_key_state==KEY_STATE_DOWNLOADING) {
-			u32 nb_read;
-			e = gf_dm_sess_fetch_data(ctx->key_sess, ctx->key_data + ctx->key_size, 100-ctx->key_size, &nb_read);
-			ctx->key_size += nb_read;
-			if (ctx->key_size > 16) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("CryptFile Invalid key size, greater than 16 bytes\n"))
-				return ctx->in_error = GF_SERVICE_ERROR;
-			}
-
-			if ((e<0) && (e != GF_IP_NETWORK_EMPTY)) {
-				ctx->in_error = e;
-				ctx->reload_key_state = KEY_STATE_NONE;
-				GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("CryptFile Failed to download key %s: %s\n", ctx->key_url, gf_error_to_string(e)))
-				return e;
-			}
-			if (e == GF_EOS) {
-				cryptfile_set_key(ctx);
-				if (ctx->in_error) return ctx->in_error;
-			} else {
-				return GF_OK;
-			}
+			return GF_OK;
+		}
+		//good to go
+		if (ctx->reload_key_state==KEY_STATE_DOWNLOAD_DONE) {
+			cryptfile_set_key(ctx);
+			if (ctx->in_error) return ctx->in_error;
 		}
 		if (ctx->reload_key_state == KEY_STATE_SET_IV) {
 			gf_crypt_set_IV(ctx->crypt, ctx->IV, 16);
 			ctx->reload_key_state = KEY_STATE_NONE;
 		}
+#else
+		//todo
+		ctx->in_error = GF_NOT_SUPPORTED;
+		ctx->reload_key_state = KEY_STATE_NONE;
+		return ctx->in_error;
+#endif
 	}
 
 	if (ctx->fullfile) {
@@ -354,7 +378,7 @@
 };
 
 
-const GF_FilterRegister *cryptfin_register(GF_FilterSession *session)
+const GF_FilterRegister *cryptin_register(GF_FilterSession *session)
 {
 	return &CryptFinRegister;
 }
@@ -473,7 +497,7 @@
 		return ctx->in_error;
 
 	if (!pck_in) {
-		if (gf_filter_pid_is_eos(ctx->ipid)) {
+		if (gf_filter_pid_is_eos(ctx->ipid) && !gf_filter_pid_is_flush_eos(ctx->ipid)) {
 			if (!ctx->remain && ctx->file_done) {
 				gf_filter_pid_set_eos(ctx->opid);
 				return GF_EOS;
@@ -630,7 +654,7 @@
 };
 
 
-const GF_FilterRegister *cryptfout_register(GF_FilterSession *session)
+const GF_FilterRegister *cryptout_register(GF_FilterSession *session)
 {
 	return &CryptFoutRegister;
 }
@@ -656,11 +680,11 @@
 
 
 #else
-const GF_FilterRegister *cryptfin_register(GF_FilterSession *session)
+const GF_FilterRegister *cryptin_register(GF_FilterSession *session)
 {
 	return NULL;
 }
-const GF_FilterRegister *cryptfout_register(GF_FilterSession *session)
+const GF_FilterRegister *cryptout_register(GF_FilterSession *session)
 {
 	return NULL;
 }
@@ -669,4 +693,4 @@
 {
 	return GF_NOT_SUPPORTED;
 }
-#endif
+#endif // !defined(GPAC_DISABLE_CRYPTO) && !defined(GPAC_DISABLE_CRYPTFILE)

gpac-2.2.1.tar.gz/src/filters/isoffin.h -> gpac-2.4.0.tar.gz/src/filters/isoffin.h Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2022
+ *			Copyright (c) Telecom ParisTech 2000-2024
  *					All rights reserved
  *
  *  This file is part of GPAC / ISOBMFF reader filter
@@ -59,8 +59,8 @@
 {
 	//options
 	char *src, *initseg;
-	Bool allt, noedit, itt, itemid;
-	u32 smode;
+	Bool allt, itt, itemid;
+	u32 smode, edits;
 	u32 stsd;
 	Bool expart;
 	Bool alltk;
@@ -70,7 +70,8 @@
 	u32 xps_check;
 	char *catseg;
 	Bool sigfrag;
-	Bool nocrypt, strtxt, nodata;
+	Bool nocrypt, strtxt, lightp;
+	u32 nodata;
 	u32 mstore_purge, mstore_samples, mstore_size;
 
 	//internal
@@ -151,7 +152,7 @@
 	s32 roll;
 	u32 xps_mask;
 	
-	u32 sample_num;
+	u32 sample_num, sample_last;
 	s64 ts_offset;
 
 	/*for edit lists*/
@@ -187,10 +188,9 @@
 	u32 last_sample_desc_index;
 	u32 isLeading, dependsOn, dependedOn, redundant;
 	u64 dts, cts;
-	u8 skip_byte_block, crypt_byte_block;
+	u32 skip_byte_block, crypt_byte_block;
 	u32 au_seq_num;
 	u64 sender_ntp, ntp_at_server_ntp;
-	u32 au_duration;
 
 	u64 isma_BSO;
 	Bool pck_encrypted;
@@ -205,6 +205,12 @@
 	GF_AVCConfig *avcc;
 	GF_VVCConfig *vvcc;
 	u32 dsi_crc;
+	u64 hint_first_tfdt;
+
+	GF_FilterPacket *pck;
+	u32 alloc_size;
+
+	u32 nb_empty_retry;
 } ISOMChannel;
 
 void isor_reset_reader(ISOMChannel *ch);

gpac-2.2.1.tar.gz/src/filters/isoffin_load.c -> gpac-2.4.0.tar.gz/src/filters/isoffin_load.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2022
+ *			Copyright (c) Telecom ParisTech 2000-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / ISOBMFF reader filter
@@ -27,8 +27,9 @@
 #include <gpac/iso639.h>
 #include <gpac/base_coding.h>
 #include <gpac/media_tools.h>
+#include <gpac/internal/isomedia_dev.h>
 
-#ifndef GPAC_DISABLE_ISOM
+#if !defined(GPAC_DISABLE_ISOM) && !defined(GPAC_DISABLE_MP4DMX)
 
 static void isor_get_chapters(GF_ISOFile *file, GF_FilterPid *opid)
 {
@@ -37,18 +38,76 @@
 	GF_PropUIntList times;
 	GF_PropStringList names;
 	count = gf_isom_get_chapter_count(file, 0);
-	if (!count) return;
+	if (count) {
+		times.vals = gf_malloc(sizeof(u32)*count);
+		if (!times.vals) return;
+		names.vals = gf_malloc(sizeof(char *)*count);
+		if (!names.vals) {
+			gf_free(times.vals);
+			return;
+		}
+		times.nb_items = names.nb_items = count;
+
+		for (i=0; i<count; i++) {
+			const char *name;
+			u64 start;
+			gf_isom_get_chapter(file, 0, i+1, &start, &name);
+			times.valsi = (u32) start;
+			names.valsi = gf_strdup(name ? name : "");
+		}
+		p.type = GF_PROP_UINT_LIST;
+		p.value.uint_list = times;
+		gf_filter_pid_set_property(opid, GF_PROP_PID_CHAP_TIMES, &p);
+		gf_free(times.vals);
+
+		p.type = GF_PROP_STRING_LIST;
+		p.value.string_list = names;
+		gf_filter_pid_set_property(opid, GF_PROP_PID_CHAP_NAMES, &p);
+		//no free for string lists
+		return;
+	}
+
+	u32 chap_tk=0;
+	count = gf_isom_get_track_count(file);
+	for (i=0; i<count; i++) {
+		u32 nb_ref = gf_isom_get_reference_count(file, i+1, GF_ISOM_REF_CHAP);
+		if (nb_ref) {
+			gf_isom_get_reference(file, i+1, GF_ISOM_REF_CHAP, 1, &chap_tk);
+			break;
+		}
+	}
+	if (chap_tk) {
+		count = gf_isom_get_sample_count(file, chap_tk);
+		if (!count) chap_tk=0;
+	}
+	if (!chap_tk) return;
 
 	times.vals = gf_malloc(sizeof(u32)*count);
+	if (!times.vals) return;
 	names.vals = gf_malloc(sizeof(char *)*count);
+	if (!names.vals) {
+		gf_free(times.vals);
+		return;
+	}
 	times.nb_items = names.nb_items = count;
 
 	for (i=0; i<count; i++) {
-		const char *name;
-		u64 start;
-		gf_isom_get_chapter(file, 0, i+1, &start, &name);
-		times.valsi = (u32) start;
-		names.valsi = gf_strdup(name);
+		u32 di;
+		GF_ISOSample *s = gf_isom_get_sample(file, chap_tk, i+1, &di);
+		if (!s) {
+			times.valsi = 0;
+			names.valsi = gf_strdup("");
+			continue;
+		}
+		GF_BitStream *bs = gf_bs_new(s->data, s->dataLength, GF_BITSTREAM_READ);
+		GF_TextSample *txt = gf_isom_parse_text_sample(bs);
+		if (txt) {
+			times.valsi = (u32) s->DTS;
+			names.valsi = gf_strdup(txt->text ? txt->text : "");
+			gf_isom_delete_text_sample(txt);
+		}
+		gf_bs_del(bs);
+		gf_isom_sample_del(&s);
 	}
 	p.type = GF_PROP_UINT_LIST;
 	p.value.uint_list = times;
@@ -58,7 +117,7 @@
 	p.type = GF_PROP_STRING_LIST;
 	p.value.string_list = names;
 	gf_filter_pid_set_property(opid, GF_PROP_PID_CHAP_NAMES, &p);
-	//no free for string lists
+
 }
 
 static void isor_export_ref(ISOMReader *read, ISOMChannel *ch, u32 rtype, char *rname)
@@ -106,6 +165,7 @@
 	char *meta_codec_name = NULL;
 	u32 meta_opaque=0;
 	Bool first_config = GF_FALSE;
+	u32 force_subs = 0;
 
 
 	depends_on_id = avg_rate = max_rate = buffer_size = 0;
@@ -116,7 +176,13 @@
 	} else {
 		m_subtype = gf_isom_get_media_subtype(read->mov, track, stsd_idx);
 	}
-	
+
+	if (m_subtype==GF_ISOM_SUBTYPE_MPEG4) {
+		u32 stsd_type = gf_isom_get_mpeg4_subtype(read->mov, track, stsd_idx);
+		if (stsd_type==GF_ISOM_SUBTYPE_RESV)
+			gf_isom_get_original_format_type(read->mov, track, stsd_idx, &m_subtype);
+	}
+
 	audio_fmt = 0;
 	pix_fmt = 0;
 	ocr_es_id = 0;
@@ -157,8 +223,10 @@
 #endif
 
 	} else {
-		u32 i, pcm_flags, pcm_size;
+		u32 i, pcm_flags, pcm_size, pcm_ch;
+		Double pcm_sr;
 		Bool load_default = GF_FALSE;
+		Bool is_float = GF_FALSE;
 
 		if (an_esd)
 			gf_odf_desc_del((GF_Descriptor *)an_esd);
@@ -189,7 +257,9 @@
 			break;
 		case GF_ISOM_SUBTYPE_WVTT:
 			codec_id = GF_CODECID_WEBVTT;
+#ifndef GPAC_DISABLE_VTT
 			stxtcfg = gf_isom_get_webvtt_config(read->mov, track, stsd_idx);
+#endif
 			break;
 		case GF_ISOM_SUBTYPE_MJP2:
 			codec_id = GF_CODECID_J2K;
@@ -213,6 +283,9 @@
 				GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("IsoMedia Track %d unable to fetch TX3G config\n", track));
 			}
 			if (txtcfg) {
+				if (txtcfg->displayFlags & GF_TXT_ALL_SAMPLES_FORCED) force_subs = 2;
+				else if (txtcfg->displayFlags & GF_TXT_SOME_SAMPLES_FORCED) force_subs = 1;
+
 				gf_odf_tx3g_write(txtcfg, &dsi, &dsi_size);
 				gf_odf_desc_del((GF_Descriptor *) txtcfg);
 			}
@@ -228,14 +301,22 @@
 			gf_isom_opus_config_get(read->mov, track, stsd_idx, &dsi, &dsi_size);
 			break;
 
-		case GF_QT_SUBTYPE_TWOS:
-		case GF_QT_SUBTYPE_SOWT:
 		case GF_QT_SUBTYPE_FL32:
 		case GF_QT_SUBTYPE_FL64:
+			is_float = GF_TRUE;
+		case GF_QT_SUBTYPE_TWOS:
+		case GF_QT_SUBTYPE_SOWT:
 		case GF_QT_SUBTYPE_IN24:
 		case GF_QT_SUBTYPE_IN32:
-			codec_id = GF_CODECID_RAW;
-			audio_fmt = gf_audio_fmt_from_isobmf(m_subtype);
+			if (gf_isom_get_pcm_config(read->mov, track, stsd_idx, &pcm_flags, &pcm_size) == GF_OK) {
+				codec_id = GF_CODECID_RAW;
+				if (pcm_size==16) audio_fmt = (pcm_flags&1) ? GF_AUDIO_FMT_S16 : GF_AUDIO_FMT_S16_BE;
+				else if (pcm_size==24) audio_fmt = (pcm_flags&1) ? GF_AUDIO_FMT_S24 : GF_AUDIO_FMT_S24_BE;
+				else if (!is_float && (pcm_size==32)) audio_fmt = (pcm_flags&1) ? GF_AUDIO_FMT_S32 : GF_AUDIO_FMT_S32_BE;
+				else if (is_float && (pcm_size==32)) audio_fmt = (pcm_flags&1) ? GF_AUDIO_FMT_FLT : GF_AUDIO_FMT_FLT_BE;
+				else if (is_float && (pcm_size==64)) audio_fmt = (pcm_flags&1) ? GF_AUDIO_FMT_DBL : GF_AUDIO_FMT_DBL_BE;
+				else codec_id = 0;
+			}
 			break;
 		case GF_ISOM_MEDIA_TIMECODE:
 			codec_id = GF_CODECID_TMCD;
@@ -253,15 +334,48 @@
 		case GF_ISOM_SUBTYPE_IPCM:
 			if (gf_isom_get_pcm_config(read->mov, track, stsd_idx, &pcm_flags, &pcm_size) == GF_OK) {
 				codec_id = GF_CODECID_RAW;
-				if (pcm_size==16) audio_fmt = GF_AUDIO_FMT_S16;
-				else if (pcm_size==24) audio_fmt = GF_AUDIO_FMT_S24;
-				else if (pcm_size==32) audio_fmt = GF_AUDIO_FMT_S32;
+				if (pcm_size==16) audio_fmt = (pcm_flags & 1) ? GF_AUDIO_FMT_S16 : GF_AUDIO_FMT_S16_BE;
+				else if (pcm_size==24) audio_fmt = (pcm_flags & 1) ? GF_AUDIO_FMT_S24 : GF_AUDIO_FMT_S24_BE;
+				else if (pcm_size==32) audio_fmt = (pcm_flags & 1) ? GF_AUDIO_FMT_S32 : GF_AUDIO_FMT_S32_BE;
 			}
 			break;
 		case GF_ISOM_SUBTYPE_FPCM:
 			if (gf_isom_get_pcm_config(read->mov, track, stsd_idx, &pcm_flags, &pcm_size) == GF_OK) {
 				codec_id = GF_CODECID_RAW;
-				audio_fmt = (pcm_size==64) ? GF_AUDIO_FMT_DBL : GF_AUDIO_FMT_FLT;
+				if (pcm_size==64) audio_fmt = (pcm_flags & 1) ? GF_AUDIO_FMT_DBL : GF_AUDIO_FMT_DBL_BE;
+				else if (pcm_size==32) audio_fmt = (pcm_flags & 1) ? GF_AUDIO_FMT_FLT : GF_AUDIO_FMT_FLT_BE;
+				else codec_id = 0;
+			}
+			break;
+		case GF_QT_SUBTYPE_LPCM:
+			if (gf_isom_get_lpcm_config(read->mov, track, stsd_idx, &pcm_sr, &pcm_ch, &pcm_flags, &pcm_size) == GF_OK) {
+				audio_fmt = 0;
+				Bool is_be = (pcm_flags & (1<<1)) ? GF_TRUE : GF_FALSE;
+				if (pcm_flags >> 4) {}
+				//we don't support non-packed audio
+				else if (!(pcm_flags & (1<<3))) {}
+				else if (pcm_sr != (u32) gf_ceil(pcm_sr)) {}
+				else {
+					sr = (u32) gf_ceil(pcm_sr);
+					nb_ch = pcm_ch;
+					//float formats
+					if (pcm_flags & 1) {
+						if (pcm_size==64) audio_fmt = is_be ? GF_AUDIO_FMT_DBL_BE : GF_AUDIO_FMT_DBL;
+						else if (pcm_size==32) audio_fmt = is_be ? GF_AUDIO_FMT_FLT_BE : GF_AUDIO_FMT_FLT;
+					}
+					//signed int formats
+					else if (pcm_flags & 4) {
+						if (pcm_size==16) audio_fmt = is_be ? GF_AUDIO_FMT_S16_BE : GF_AUDIO_FMT_S16;
+						else if (pcm_size==24) audio_fmt = is_be ? GF_AUDIO_FMT_S24_BE : GF_AUDIO_FMT_S24;
+						else if (pcm_size==32) audio_fmt = is_be ? GF_AUDIO_FMT_S32_BE : GF_AUDIO_FMT_S32;
+					} else {
+						if (pcm_size==8) audio_fmt = GF_AUDIO_FMT_U8;
+					}
+					if (audio_fmt) {
+						codec_id = GF_CODECID_RAW;
+						nb_bps = pcm_size;
+					}
+				}
 			}
 			break;
 
@@ -360,8 +474,10 @@
 
  				if (pix_fmt) {
 					codec_id = GF_CODECID_RAW;
-					if (pix_fmt==GF_PIXEL_UNCV)
+					if (pix_fmt==GF_PIXEL_UNCV) {
 						load_default = GF_TRUE;
+						codec_id = GF_CODECID_RAW_UNCV;
+					}
 				} else {
 					load_default = GF_TRUE;
 				}
@@ -376,8 +492,9 @@
 
 		if (load_default) {
 			if (!codec_id) {
-				GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("IsoMedia Track %d type %s not natively handled\n", track, gf_4cc_to_str(m_subtype) ));
-
+				if (!read->allt || !read->alltk || !read->mov) {
+					GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("IsoMedia Track %d type %s not natively handled\n", track, gf_4cc_to_str(m_subtype) ));
+				}
 				codec_id = m_subtype;
 			}
 			udesc = gf_isom_get_generic_sample_description(read->mov, track, stsd_idx);
@@ -519,7 +636,7 @@
 		if (use_iod)
 			gf_filter_pid_set_property(pid, GF_PROP_PID_ESID, &PROP_UINT(esid));
 
-		if (gf_isom_is_track_in_root_od(read->mov, track)) {
+		if (gf_isom_is_track_in_root_od(read->mov, track) && !read->lightp) {
 			switch (streamtype) {
 			case GF_STREAM_SCENE:
 			case GF_STREAM_OD:
@@ -569,39 +686,62 @@
 		ch->streamType = streamtype;
 //		ch->clock_id = ocr_es_id;
 
-		if (has_scalable_layers)
-			gf_filter_pid_set_property(pid, GF_PROP_PID_SCALABLE, &PROP_BOOL(GF_TRUE));
+		if (!read->lightp) {
+			if (has_scalable_layers)
+				gf_filter_pid_set_property(pid, GF_PROP_PID_SCALABLE, &PROP_BOOL(GF_TRUE));
 
-		if (gf_isom_get_reference_count(read->mov, track, GF_ISOM_REF_SABT)>0) {
-			gf_filter_pid_set_property(pid, GF_PROP_PID_TILE_BASE, &PROP_BOOL(GF_TRUE));
-		}
-		else if (gf_isom_get_reference_count(read->mov, track, GF_ISOM_REF_SUBPIC)>0) {
-			gf_filter_pid_set_property(pid, GF_PROP_PID_TILE_BASE, &PROP_BOOL(GF_TRUE));
-		}
+			if (gf_isom_get_reference_count(read->mov, track, GF_ISOM_REF_SABT)>0) {
+				gf_filter_pid_set_property(pid, GF_PROP_PID_TILE_BASE, &PROP_BOOL(GF_TRUE));
+			}
+			else if (gf_isom_get_reference_count(read->mov, track, GF_ISOM_REF_SUBPIC)>0) {
+				gf_filter_pid_set_property(pid, GF_PROP_PID_TILE_BASE, &PROP_BOOL(GF_TRUE));
+			}
 
-		if (srd_w && srd_h) {
-			gf_filter_pid_set_property(pid, GF_PROP_PID_CROP_POS, &PROP_VEC2I_INT(srd_x, srd_y) );
-			if (base_tile_track) {
-				gf_isom_get_visual_info(read->mov, base_tile_track, stsd_idx, &w, &h);
-				if (w && h) {
-					gf_filter_pid_set_property(pid, GF_PROP_PID_ORIG_SIZE, &PROP_VEC2I_INT(w, h) );
+			if (srd_w && srd_h) {
+				gf_filter_pid_set_property(pid, GF_PROP_PID_CROP_POS, &PROP_VEC2I_INT(srd_x, srd_y) );
+				if (base_tile_track) {
+					gf_isom_get_visual_info(read->mov, base_tile_track, stsd_idx, &w, &h);
+					if (w && h) {
+						gf_filter_pid_set_property(pid, GF_PROP_PID_ORIG_SIZE, &PROP_VEC2I_INT(w, h) );
+					}
+				}
+			} else {
+				u8 *srdg=NULL;
+				u32 srdg_s=0;
+				gf_isom_get_user_data(read->mov, track, GF_ISOM_UDTA_GPAC_SRD, NULL, 1, &srdg, &srdg_s);
+				if (srdg && srdg_s>=21) {
+					GF_BitStream *bs = gf_bs_new(srdg, srdg_s, GF_BITSTREAM_READ);
+					gf_bs_skip_bytes(bs, 5);
+					srd_x = (s32) gf_bs_read_u32(bs);
+					srd_y = (s32) gf_bs_read_u32(bs);
+					srd_w = gf_bs_read_u32(bs);
+					srd_h = gf_bs_read_u32(bs);
+					gf_bs_del(bs);
+					gf_filter_pid_set_property(pid, GF_PROP_PID_CROP_POS, &PROP_VEC2I_INT(srd_x, srd_y) );
+					gf_filter_pid_set_property(pid, GF_PROP_PID_ORIG_SIZE, &PROP_VEC2I_INT(srd_w, srd_h) );
 				}
+				if (srdg) gf_free(srdg);
 			}
-		}
 
 
-		if (codec_id !=GF_CODECID_LHVC)
-			isor_export_ref(read, ch, GF_ISOM_REF_SCAL, "isom:scal");
-		isor_export_ref(read, ch, GF_ISOM_REF_SABT, "isom:sabt");
-		isor_export_ref(read, ch, GF_ISOM_REF_TBAS, "isom:tbas");
-		isor_export_ref(read, ch, GF_ISOM_REF_SUBPIC, "isom:subp");
+			if (codec_id !=GF_CODECID_LHVC)
+				isor_export_ref(read, ch, GF_ISOM_REF_SCAL, "isom:scal");
+			isor_export_ref(read, ch, GF_ISOM_REF_SABT, "isom:sabt");
+			isor_export_ref(read, ch, GF_ISOM_REF_TBAS, "isom:tbas");
+			isor_export_ref(read, ch, GF_ISOM_REF_SUBPIC, "isom:subp");
+		}
 
-		ch->duration = gf_isom_get_track_duration(read->mov, ch->track);
+		if (read->lightp) {
+			ch->duration = gf_isom_get_track_duration_orig(read->mov, ch->track);
+		} else {
+			ch->duration = gf_isom_get_track_duration(read->mov, ch->track);
+		}
 		if (!ch->duration) {
 			ch->duration = gf_isom_get_duration(read->mov);
 		}
 		sample_count = gf_isom_get_sample_count(read->mov, ch->track);
 
+#ifndef GPAC_DISABLE_ISOM_FRAGMENTS
 		if (read->frag_type && !read->input_loaded) {
 			u32 ts;
 			u64 dur;
@@ -613,14 +753,14 @@
 				sample_count = 0;
 			}
 		}
+#endif
 
-		if (!read->mem_load_mode) {
+		if (!read->mem_load_mode || ch->duration) {
 			//if no edit list (whether complex or simple TS offset) and no sidx, use media duration
 			if (!ch->has_edit_list && !use_sidx_dur && !ch->ts_offset) {
 				//no specific edit list type but edit present, use the duration in the edit
 				if (gf_isom_get_edits_count(read->mov, ch->track)) {
-					u64 dur = gf_isom_get_track_duration(read->mov, ch->track);
-					gf_filter_pid_set_property(pid, GF_PROP_PID_DURATION, &PROP_FRAC64_INT(dur, read->timescale));
+					gf_filter_pid_set_property(pid, GF_PROP_PID_DURATION, &PROP_FRAC64_INT(ch->duration, read->timescale));
 				} else {
 					u64 dur = gf_isom_get_media_duration(read->mov, ch->track);
 					gf_filter_pid_set_property(pid, GF_PROP_PID_DURATION, &PROP_FRAC64_INT(dur, ch->timescale));
@@ -670,13 +810,17 @@
 			gf_filter_pid_set_property(pid, GF_PROP_PID_HAS_SYNC, &PROP_BOOL(GF_FALSE) );
 		}
 
+		if (read->lightp) goto props_done;
 
 		w = gf_isom_get_constant_sample_size(read->mov, track);
 		if (w)
 			gf_filter_pid_set_property(ch->pid, GF_PROP_PID_FRAME_SIZE, &PROP_UINT(w));
 
+		//mem mode, cannot read backwards
 		if (read->mem_load_mode) {
-			gf_filter_pid_set_property(pid, GF_PROP_PID_PLAYBACK_MODE, &PROP_UINT(GF_PLAYBACK_MODE_NONE) );
+			const GF_PropertyValue *p = gf_filter_pid_get_property(read->pid, GF_PROP_PID_PLAYBACK_MODE);
+			if (!p)
+				gf_filter_pid_set_property(pid, GF_PROP_PID_PLAYBACK_MODE, &PROP_UINT(GF_PLAYBACK_MODE_FASTFORWARD) );
 		} else {
 			gf_filter_pid_set_property(pid, GF_PROP_PID_PLAYBACK_MODE, &PROP_UINT(GF_PLAYBACK_MODE_REWIND) );
 		}
@@ -866,6 +1010,8 @@
 			if (gf_isom_has_time_offset_table(read->mov, ch->track))
 				gf_filter_pid_set_property_str(ch->pid, "isom_force_ctts", &PROP_BOOL(GF_TRUE) );
 		}
+		if (read->nodata==2)
+			gf_filter_pid_set_property_str(ch->pid, "nodata", &PROP_BOOL(GF_TRUE) );
 
 		if (!gf_sys_is_test_mode()) {
 			u32 nb_udta, alt_grp=0;
@@ -918,21 +1064,46 @@
 							snprintf(szName, 30, "udta_%s", gf_4cc_to_str(type));
 						szName30=0;
 						if (gf_utf8_is_legal(udta, udta_size)) {
-							gf_filter_pid_set_property_dyn(ch->pid, szName, &PROP_STRING_NO_COPY(udta));
+							if (!udtaudta_size-1) {
+								gf_filter_pid_set_property_dyn(ch->pid, szName, &PROP_STRING_NO_COPY(udta));
+							} else {
+								char *data = gf_malloc(udta_size+1);
+								memcpy(data, udta, udta_size);
+								dataudta_size=0;
+								gf_filter_pid_set_property_dyn(ch->pid, szName, &PROP_STRING_NO_COPY(data));
+								gf_free(udta);
+							}
 						} else {
 							gf_filter_pid_set_property_dyn(ch->pid, szName, &PROP_DATA_NO_COPY(udta, udta_size));
 						}
 					}
 				}
 			}
+
+			//delcare track groups
+			u32 idx=0;
+			while (1) {
+				char szTK100;
+				u32 track_group_type, track_group_id;
+				if (!gf_isom_enum_track_group(read->mov, ch->track, &idx, &track_group_type, &track_group_id)) break;
+				sprintf(szTK, "tkgp_%s", gf_4cc_to_str(track_group_type));
+				gf_filter_pid_set_property_dyn(ch->pid, szTK, &PROP_SINT(track_group_id));
+			}
 		}
 
+props_done:
+
 		if (read->sigfrag) {
+#ifndef GPAC_DISABLE_ISOM_FRAGMENTS
 			u64 start, end;
 			if (gf_isom_get_root_sidx_offsets(read->mov, &start, &end)) {
 				if (end)
 					gf_filter_pid_set_property(ch->pid, GF_PROP_PCK_SIDX_RANGE, &PROP_FRAC64_INT(start , end));
 			}
+#endif
+			if (!read->frag_type) {
+				gf_filter_pid_set_property_str(ch->pid, "nofrag", &PROP_BOOL(GF_TRUE));
+			}
 		}
 	}
 
@@ -949,7 +1120,7 @@
 		gf_odf_desc_del((GF_Descriptor *)lang_desc);
 		lang_desc = NULL;
 	}
-	
+
 	if (read->smode != MP4DMX_SINGLE) {
 		if ((codec_id==GF_CODECID_LHVC) || (codec_id==GF_CODECID_HEVC)) {
 			Bool signal_lhv = (read->smode==MP4DMX_SPLIT) ? GF_TRUE : GF_FALSE;
@@ -1089,6 +1260,9 @@
 		gf_filter_pid_set_property(ch->pid, GF_PROP_PID_PIXFMT, &PROP_UINT(pix_fmt));
 	}
 
+
+	gf_filter_pid_set_property(ch->pid, GF_PROP_PID_FORCED_SUB, force_subs ? &PROP_UINT(force_subs) : NULL );
+
 	gf_filter_pid_set_property(ch->pid, GF_PROP_PID_CONFIG_IDX, &PROP_UINT(stsd_idx) );
 
 	w = h = 0;
@@ -1151,8 +1325,10 @@
 			}
 		}
 	}
-	sr = nb_ch = nb_bps = 0;
-	gf_isom_get_audio_info(read->mov,track, stsd_idx, &sr, &nb_ch, &nb_bps);
+	if (m_subtype!=GF_QT_SUBTYPE_LPCM) {
+		sr = nb_ch = nb_bps = 0;
+		gf_isom_get_audio_info(read->mov,track, stsd_idx, &sr, &nb_ch, &nb_bps);
+	}
 	if (streamtype==GF_STREAM_AUDIO) {
 		if (!sr) sr = gf_isom_get_media_timescale(read->mov, track);
 	}
@@ -1237,7 +1413,11 @@
 	if (m_subtype)
 		gf_filter_pid_set_property(ch->pid, GF_PROP_PID_ISOM_SUBTYPE, &PROP_4CC(m_subtype) );
 
-	if (stxtcfg) gf_filter_pid_set_property(ch->pid, GF_PROP_PID_DECODER_CONFIG, &PROP_DATA((char *)stxtcfg, (u32) strlen(stxtcfg) ));
+	if (stxtcfg) {
+		//copy mem to make sure we have a null-terminated string
+		char *dupm = gf_strdup((char *)stxtcfg);
+		gf_filter_pid_set_property(ch->pid, GF_PROP_PID_DECODER_CONFIG, &PROP_DATA_NO_COPY(dupm, (u32) strlen(stxtcfg) ));
+	}
 
 
 #if !defined(GPAC_DISABLE_ISOM_WRITE)
@@ -1246,6 +1426,20 @@
 	e = gf_isom_get_stsd_template(read->mov, ch->track, stsd_idx, &tk_template, &tk_template_size);
 	if (e == GF_OK) {
 		gf_filter_pid_set_property(ch->pid, GF_PROP_PID_ISOM_STSD_TEMPLATE, &PROP_DATA_NO_COPY(tk_template, tk_template_size) );
+
+		if (!gf_sys_old_arch_compat()) {
+			//if more than one sample desc, export all of them
+			if (gf_isom_get_sample_description_count(read->mov, ch->track)>1) {
+				tk_template=NULL;
+				tk_template_size=0;
+				e = gf_isom_get_stsd_template(read->mov, ch->track, 0, &tk_template, &tk_template_size);
+				if (e == GF_OK) {
+					gf_filter_pid_set_property(ch->pid, GF_PROP_PID_ISOM_STSD_ALL_TEMPLATES, &PROP_DATA_NO_COPY(tk_template, tk_template_size) );
+
+					gf_filter_pid_set_property(ch->pid, GF_PROP_PID_ISOM_STSD_TEMPLATE_IDX, &PROP_UINT(stsd_idx) );
+				}
+			}
+		}
 	} else {
 		GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("IsoMedia Failed to serialize stsd box: %s\n", gf_error_to_string(e) ));
 	}
@@ -1282,6 +1476,7 @@
 	else if (codec_id==GF_CODECID_MHAS) {
 		if (!dsi) {
 			ch->check_mhas_pl = 1;
+#ifndef GPAC_DISABLE_AV_PARSERS
 			GF_ISOSample *samp = gf_isom_get_sample(ch->owner->mov, ch->track, 1, NULL);
 			if (samp) {
 				u64 ch_layout=0;
@@ -1294,6 +1489,13 @@
 				}
 				gf_isom_sample_del(&samp);
 			}
+#endif
+		}
+	} else if (codec_id==GF_CODECID_DTS_X) {
+		GF_UDTSConfig cfg;
+		if (gf_isom_get_udts_config(ch->owner->mov, ch->track, 1, &cfg) == GF_OK) {
+			u64 ch_layout = cfg.ChannelMask;
+			gf_filter_pid_set_property(ch->pid, GF_PROP_PID_CHANNEL_LAYOUT, &PROP_LONGUINT(ch_layout));
 		}
 	}
 
@@ -1360,7 +1562,7 @@
 		} else {
 			gf_filter_pid_set_property(ch->pid, GF_PROP_PID_CLAP_W, NULL);
 			gf_filter_pid_set_property(ch->pid, GF_PROP_PID_CLAP_H, NULL);
-			gf_filter_pid_set_property(ch->pid, GF_PROP_PID_CLAP_X, NULL);;
+			gf_filter_pid_set_property(ch->pid, GF_PROP_PID_CLAP_X, NULL);
 			gf_filter_pid_set_property(ch->pid, GF_PROP_PID_CLAP_Y, NULL);
 		}
 
@@ -1438,7 +1640,7 @@
 			} else if (!strcmp(read->tkid, "video")) {
 				if (mtype!=GF_ISOM_MEDIA_VISUAL) continue;
 			} else if (!strcmp(read->tkid, "text")) {
-				if ((mtype!=GF_ISOM_MEDIA_TEXT) && (mtype!=GF_ISOM_MEDIA_SUBT)) continue;
+				if ((mtype!=GF_ISOM_MEDIA_TEXT) && (mtype!=GF_ISOM_MEDIA_SUBT) && (mtype!=GF_ISOM_MEDIA_MPEG_SUBT)) continue;
 			} else if (strlen(read->tkid)==4) {
 				u32 t = GF_4CC(read->tkid0, read->tkid1, read->tkid2, read->tkid3);
 				if (mtype!=t) continue;
@@ -1466,6 +1668,7 @@
 		case GF_ISOM_MEDIA_MPEG_SUBT:
 		case GF_ISOM_MEDIA_CLOSED_CAPTION:
 			streamtype = GF_STREAM_TEXT;
+			mtype = GF_ISOM_MEDIA_TEXT;
 			break;
 		case GF_ISOM_MEDIA_FLASH:
 		case GF_ISOM_MEDIA_DIMS:
@@ -1479,10 +1682,18 @@
 		case GF_ISOM_MEDIA_TIMECODE:
 			streamtype = GF_STREAM_METADATA;
 			break;
-		/*hint tracks are never exported*/
+		/*hint tracks are never exported except when dumping from file*/
 		case GF_ISOM_MEDIA_HINT:
+			if (read->allt && read->alltk && read->mov) {
+				streamtype = GF_STREAM_METADATA;
+				break;
+			}
 			continue;
 		default:
+			if (read->allt && read->alltk && read->mov) {
+				streamtype = GF_STREAM_METADATA;
+				break;
+			}
 			if (!read->allt) {
 				GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("IsoMedia Track %d type %s not supported, ignoring track - you may retry by specifying allt option\n", i+1, gf_4cc_to_str(mtype) ));
 				continue;
@@ -1493,6 +1704,14 @@
 
 		if (!read->alltk && !read->tkid && !gf_isom_is_track_enabled(read->mov, i+1)) {
 			if (count>1) {
+				u32 type = gf_isom_get_media_type(read->mov, i+1);
+
+				//we don't warn for disabled text tracks due to chapters and forced subs
+				if ((type==GF_ISOM_SUBTYPE_TEXT) || (type==GF_ISOM_MEDIA_SUBT))
+					continue;
+				//disabled tracks using QT chapter refs, do not warn
+				if (gf_isom_is_track_referenced(read->mov, i+1, GF_ISOM_REF_CHAP)) continue;
+
 				GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("IsoMedia Track %d is disabled, ignoring track - you may retry by specifying alltk option\n", i+1));
 				continue;
 			} else {
@@ -1564,12 +1783,12 @@
 		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("IsoMedia No suitable tracks in file\n"));
 		return GF_NOT_SUPPORTED;
 	}
-	
+
 	/*if cover art, declare a video pid*/
 	if (gf_isom_apple_get_tag(read->mov, GF_ISOM_ITUNE_COVER_ART, &tag, &tlen)==GF_OK) {
 
 		/*write cover data*/
-		assert(!(tlen & 0x80000000));
+		if (tlen & 0x80000000) return GF_NON_COMPLIANT_BITSTREAM;
 		tlen &= 0x7FFFFFFF;
 
 		if (read->expart && !isom_contains_video) {
@@ -1603,6 +1822,7 @@
 	GF_ESD *esd;
 	u32 item_id=0;
 	u32 scheme_type=0, scheme_version=0, item_type;
+	u32 item_codecid=0;
 	const char *item_name, *item_mime_type, *item_encoding;
 
 retry:
@@ -1635,12 +1855,19 @@
 
 	esd = gf_media_map_item_esd(read->mov, item_id);
 	if (!esd) {
-		//unsupported item, try next
-		item_idx++;
-		goto retry;
+		switch (item_type) {
+		case GF_ISOM_SUBTYPE_HVT1:
+			item_codecid = GF_CODECID_HEVC_TILES;
+			break;
+		default:
+			//unsupported item, try next
+			item_idx++;
+			goto retry;
+		}
+	} else {
+		item_codecid = esd->decoderConfig->objectTypeIndication;
 	}
 
-
 	//OK declare PID
 	if (!ch)
 		pid = gf_filter_pid_new(read->filter);
@@ -1654,23 +1881,32 @@
 	if (!ch) {
 		if (read->pid)
 			gf_filter_pid_copy_properties(pid, read->pid);
-		gf_filter_pid_set_property(pid, GF_PROP_PID_ID, &PROP_UINT(esd->ESID));
+		gf_filter_pid_set_property(pid, GF_PROP_PID_ID, &PROP_UINT(esd ? esd->ESID : item_id));
 	}
 
 	if (read->itemid)
 		gf_filter_pid_set_property(pid, GF_PROP_PID_ITEM_ID, &PROP_UINT(item_id));
-		
+
+	if ((item_codecid==GF_CODECID_HEVC) && gf_isom_meta_item_has_ref(read->mov, GF_TRUE, 0, item_id, GF_ISOM_REF_TBAS)) {
+		gf_filter_pid_set_property(pid, GF_PROP_PID_TILE_BASE, &PROP_BOOL(GF_TRUE));
+	}
+
+
 	//TODO: no support for LHEVC images
 	//gf_filter_pid_set_property(pid, GF_PROP_PID_DEPENDENCY_ID, &PROP_UINT(esd->dependsOnESID));
 
-	gf_filter_pid_set_property(pid, GF_PROP_PID_STREAM_TYPE, &PROP_UINT(esd->decoderConfig->streamType));
-	gf_filter_pid_set_property(pid, GF_PROP_PID_CODECID, &PROP_UINT(esd->decoderConfig->objectTypeIndication));
+	gf_filter_pid_set_property(pid, GF_PROP_PID_STREAM_TYPE, &PROP_UINT(GF_STREAM_VISUAL));
+	gf_filter_pid_set_property(pid, GF_PROP_PID_CODECID, &PROP_UINT(item_codecid));
 	gf_filter_pid_set_property(pid, GF_PROP_PID_TIMESCALE, &PROP_UINT(1000));
-	if (esd->decoderConfig->decoderSpecificInfo && esd->decoderConfig->decoderSpecificInfo->data) {
-		gf_filter_pid_set_property(pid, GF_PROP_PID_DECODER_CONFIG, &PROP_DATA_NO_COPY(esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength));
+	if (esd) {
+		gf_filter_pid_set_property(pid, GF_PROP_PID_TIMESCALE, &PROP_UINT(1000));
+		if (esd->decoderConfig->decoderSpecificInfo && esd->decoderConfig->decoderSpecificInfo->data) {
+			gf_filter_pid_set_property(pid, GF_PROP_PID_DECODER_CONFIG, &PROP_DATA_NO_COPY(esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength));
 
-		esd->decoderConfig->decoderSpecificInfo->data=NULL;
-		esd->decoderConfig->decoderSpecificInfo->dataLength=0;
+			esd->decoderConfig->decoderSpecificInfo->data=NULL;
+			esd->decoderConfig->decoderSpecificInfo->dataLength=0;
+		}
+		gf_odf_desc_del((GF_Descriptor *)esd);
 	}
 
 	if (props.width && props.height) {
@@ -1691,7 +1927,7 @@
 	} else {
 		gf_filter_pid_set_property(pid, GF_PROP_PID_CLAP_W, NULL);
 		gf_filter_pid_set_property(pid, GF_PROP_PID_CLAP_H, NULL);
-		gf_filter_pid_set_property(pid, GF_PROP_PID_CLAP_X, NULL);;
+		gf_filter_pid_set_property(pid, GF_PROP_PID_CLAP_X, NULL);
 		gf_filter_pid_set_property(pid, GF_PROP_PID_CLAP_Y, NULL);
 	}
 
@@ -1708,10 +1944,18 @@
 	gf_filter_pid_set_property_str(pid, "meta:name", item_name ? &PROP_STRING(item_name) : NULL );
 	gf_filter_pid_set_property_str(pid, "meta:encoding", item_encoding ? &PROP_STRING(item_encoding) : NULL );
 
-	if ((item_type == GF_4CC('u','n','c','v')) || (item_type == GF_4CC('u','n','c','i'))) {
+	if ((item_type == GF_ISOM_SUBTYPE_UNCV) || (item_type == GF_ISOM_ITEM_TYPE_UNCI)) {
 		gf_filter_pid_set_property(pid, GF_PROP_PID_PIXFMT, &PROP_UINT(GF_PIXEL_UNCV) );
+		gf_filter_pid_set_property(pid, GF_PROP_PID_CODECID, &PROP_UINT(GF_CODECID_RAW_UNCV) );
+		gf_filter_pid_set_property(pid, GF_PROP_PID_ISOM_SUBTYPE,  &PROP_4CC(GF_ISOM_ITEM_TYPE_UNCI) );
 	}
 
+	if (item_codecid == GF_CODECID_HEVC_TILES) {
+		gf_filter_pid_set_property(pid, GF_PROP_PID_CROP_POS, &PROP_VEC2I_INT(props.hOffset, props.vOffset) );
+
+		u32 base_id = gf_isom_meta_get_item_ref_id(read->mov, GF_TRUE, 0, item_id, GF_ISOM_REF_TBAS, 1);
+		gf_filter_pid_set_property(pid, GF_PROP_PID_DEPENDENCY_ID, base_id ? &PROP_UINT(base_id) : NULL );
+	}
 
 	//setup cenc
 	if (scheme_type) {
@@ -1719,12 +1963,10 @@
 		gf_filter_pid_set_property(pid, GF_PROP_PID_PROTECTION_SCHEME_VERSION, &PROP_UINT(scheme_version) );
 		gf_filter_pid_set_property(pid, GF_PROP_PID_ENCRYPTED, &PROP_BOOL(GF_TRUE) );
 
-		gf_filter_pid_set_property(pid, GF_PROP_PID_ORIG_STREAM_TYPE, &PROP_UINT(esd->decoderConfig->streamType));
+		gf_filter_pid_set_property(pid, GF_PROP_PID_ORIG_STREAM_TYPE, &PROP_UINT(GF_STREAM_VISUAL));
 		gf_filter_pid_set_property(pid, GF_PROP_PID_STREAM_TYPE, &PROP_UINT(GF_STREAM_ENCRYPTED) );
 	}
 
-	gf_odf_desc_del((GF_Descriptor *)esd);
-
 	if (!ch) {
 		ch = isor_create_channel(read, pid, 0, item_id, GF_FALSE);
 		if (ch && scheme_type) {
@@ -1738,7 +1980,4 @@
 	return GF_TRUE;
 }
 
-#endif /*GPAC_DISABLE_ISOM*/
-
-
-
+#endif // !defined(GPAC_DISABLE_ISOM) && !defined(GPAC_DISABLE_MP4DMX)

gpac-2.2.1.tar.gz/src/filters/isoffin_read.c -> gpac-2.4.0.tar.gz/src/filters/isoffin_read.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2022
+ *			Copyright (c) Telecom ParisTech 2000-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / ISOBMFF reader filter
@@ -25,11 +25,18 @@
 
 #include "isoffin.h"
 
-#ifndef GPAC_DISABLE_ISOM
+#if !defined(GPAC_DISABLE_ISOM) && !defined(GPAC_DISABLE_MP4DMX)
 
 #include <gpac/crypt_tools.h>
 #include <gpac/media_tools.h>
 
+enum
+{
+	EDITS_AUTO=0,
+	EDITS_NO,
+	EDITS_STRICT
+};
+
 ISOMChannel *isor_get_channel(ISOMReader *reader, GF_FilterPid *pid)
 {
 	u32 i=0;
@@ -63,7 +70,7 @@
 
 	if (read->pid) {
 		prop = gf_filter_pid_get_property(read->pid, GF_PROP_PID_FILEPATH);
-		assert(prop);
+		gf_fatal_assert(prop);
 		src = prop->value.string;
 	} else {
 		src = read->src;
@@ -162,14 +169,7 @@
 		return e;
 	}
 	read->frag_type = gf_isom_is_fragmented(read->mov) ? 1 : 0;
-	if (!read->frag_type && read->sigfrag) {
-		e = GF_BAD_PARAM;
-		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("IsoMedia sigfrag requested but file %s is not fragmented\n", url));
-		gf_filter_setup_failure(filter, e);
-		gf_free(url);
-		return e;
-	}
-    
+
 	read->timescale = gf_isom_get_timescale(read->mov);
 	if (!read->input_loaded && read->frag_type)
 		read->refresh_fragmented = GF_TRUE;
@@ -233,6 +233,7 @@
 	//no need to lock blob if next_url is a blob, all parsing and probing functions below will lock the blob if any
 
 	switch (gf_isom_probe_file_range(next_url, read->start_range, read->end_range)) {
+#ifndef GPAC_DISABLE_ISOM_FRAGMENTS
 	//this is a fragment
 	case 3:
 		gf_isom_release_segment(read->mov, 1);
@@ -275,9 +276,11 @@
 		}
 #endif
 		break;
+#endif // GPAC_DISABLE_ISOM_FRAGMENTS
 	//this is a movie, reload
 	case 2:
 	case 1:
+#ifndef GPAC_DISABLE_ISOM_FRAGMENTS
 		//get tfdt of next segment (cumulated sample dur since moov load)
 		//if the next segment has a tfdt or a tfrx, this will be ignored
 		//otherwise this value will be used as base tfdt for next segment
@@ -293,7 +296,7 @@
 				GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("IsoMedia Error finding init time for init segment %s at UTC "LLU"\n", next_url, gf_net_get_utc() ));
 			}
 		}
-
+#endif
 		if (read->mov) gf_isom_close(read->mov);
 		e = gf_isom_open_progressive(next_url, read->start_range, read->end_range, read->sigfrag, &read->mov, &read->missing_bytes);
 
@@ -308,9 +311,10 @@
 		if (e < 0) {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("IsoMedia Error opening init segment %s at UTC "LLU": %s\n", next_url, gf_net_get_utc(), gf_error_to_string(e) ));
 		}
+#ifndef GPAC_DISABLE_ISOM_FRAGMENTS
 		if (read->sigfrag)
 			gf_isom_enable_traf_map_templates(read->mov);
-
+#endif
 		is_new_mov = GF_TRUE;
 		break;
 	//empty file
@@ -327,13 +331,15 @@
 	gf_filter_post_process_task(filter);
 
 	count = gf_list_count(read->channels);
-	
+
 	if (e<0) {
 		count = gf_list_count(read->channels);
-		gf_isom_release_segment(read->mov, 1);
         read->invalid_segment = GF_TRUE;
+#ifndef GPAC_DISABLE_ISOM_FRAGMENTS
+		gf_isom_release_segment(read->mov, 1);
 		//error opening the segment, reset everything ...
 		gf_isom_reset_fragment_info(read->mov, GF_FALSE);
+#endif
 		for (i=0; i<count; i++) {
 			ISOMChannel *ch = gf_list_get(read->channels, i);
             if (ch) {
@@ -454,7 +460,7 @@
 		read->end_range = er;
 		read->input_loaded = GF_FALSE;
 		read->eos_signaled = GF_FALSE;
-		
+
 		//we need to reconfigure
 		return isoffin_reconfigure(filter, read, next_url);
 	}
@@ -492,13 +498,14 @@
 		read->frag_type = gf_isom_is_fragmented(read->mov) ? 1 : 0;
 		read->timescale = gf_isom_get_timescale(read->mov);
 
+#ifndef GPAC_DISABLE_ISOM_FRAGMENTS
 		if (read->sigfrag) {
 			gf_isom_enable_traf_map_templates(read->mov);
 		}
-
 		if (read->catseg) {
 			e = gf_isom_open_segment(read->mov, read->catseg, 0, 0, 0);
 		}
+#endif
 		if (!e)
 			e = isor_declare_objects(read);
 
@@ -725,7 +732,9 @@
 			ch->nalu_extract_mode = GF_ISOM_NALU_EXTRACT_INBAND_PS_FLAG /*| GF_ISOM_NALU_EXTRACT_ANNEXB_FLAG*/;
 		break;
 	}
-	if (!read->noedit) {
+	if (read->edits==EDITS_NO) {
+		ch->has_edit_list = 0;
+	} else if (read->edits==EDITS_AUTO) {
 		ch->ts_offset = 0;
 		ch->has_edit_list = gf_isom_get_edit_list_type(ch->owner->mov, ch->track, &ch->ts_offset) ? 1 : 0;
 		if (!ch->has_edit_list && ch->ts_offset) {
@@ -733,8 +742,12 @@
 			//if <0 this is a skip, we signal negative delay
 			gf_filter_pid_set_property(pid, GF_PROP_PID_DELAY, &PROP_LONGSINT( ch->ts_offset) );
 		}
-	} else
-		ch->has_edit_list = 0;
+	} else {
+		if (gf_isom_get_edits_count(ch->owner->mov, ch->track))
+			ch->has_edit_list = 1;
+		else
+			ch->has_edit_list = 0;
+	}
 
 	ch->has_rap = (gf_isom_has_sync_points(ch->owner->mov, ch->track)==1) ? 1 : 0;
 	gf_filter_pid_set_property(pid, GF_PROP_PID_HAS_SYNC, &PROP_BOOL(ch->has_rap) );
@@ -878,6 +891,7 @@
 static Bool isoffin_process_event(GF_Filter *filter, const GF_FilterEvent *evt)
 {
 	u32 count, i;
+	Bool is_byte_range;
 	Bool cancel_event = GF_TRUE;
 	Double start_range, speed;
 	ISOMChannel *ch, *ref_ch;
@@ -909,10 +923,11 @@
 			ch->skip_next_play = 0;
 			return GF_TRUE;
 		}
+		is_byte_range = (evt->play.hint_start_offset || evt->play.hint_end_offset) ? GF_TRUE : GF_FALSE;
 
 		isor_reset_reader(ch);
 		ch->eos_sent = 0;
-		ch->speed = evt->play.speed;
+		ch->speed = is_byte_range ? 1 : evt->play.speed;
 		ch->initial_play_seen = 1;
 		read->reset_frag_state = 1;
 		//it can happen that input_is_stop is still TRUE because we did not get called back after the stop - reset to FALSE since we now play
@@ -921,8 +936,8 @@
 			read->frag_type = 1;
 
 		ch->start = ch->end = 0;
-		start_range = evt->play.start_range;
-		speed = evt->play.speed;
+		start_range = is_byte_range ? 0 : evt->play.start_range;
+		speed = ch->speed;
 		//compute closest range if channel was disconnected
 		if (read->nb_playing && ch->midrun_tune) {
 			ref_ch = NULL;
@@ -950,44 +965,82 @@
 					start_range = orig_range;
 			}
 		}
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("IsoMedia channel start is %f - requested %f\n", start_range, evt->play.start_range));
-
-		if (speed>=0) {
-			Double t;
-			if (start_range>=0) {
-				t = start_range;
-				t *= ch->timescale;
-				ch->start = (u64) t;
-			}
-			if (evt->play.end_range >= start_range) {
-				ch->end = (u64) -1;
-				if (evt->play.end_range<FLT_MAX) {
-					t = evt->play.end_range;
+		if (!is_byte_range) {
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("IsoMedia channel start is %f - requested %f\n", start_range, evt->play.start_range));
+
+			if (speed>=0) {
+				Double t;
+				if (start_range>=0) {
+					t = start_range;
 					t *= ch->timescale;
-					ch->end = (u64) t;
+					ch->start = (u64) t;
 				}
+				if (evt->play.end_range >= start_range) {
+					ch->end = (u64) -1;
+					if (evt->play.end_range<FLT_MAX) {
+						t = evt->play.end_range;
+						t *= ch->timescale;
+						ch->end = (u64) t;
+					}
+				}
+			} else {
+				Double end = evt->play.end_range;
+				if (end==-1) end = 0;
+				ch->start = (u64) (s64) (start_range * ch->timescale);
+				if (end <= start_range)
+					ch->end = (u64) (s64) (end  * ch->timescale);
 			}
+			ch->sample_num = evt->play.from_pck;
+			ch->sample_last = evt->play.to_pck;
+			ch->sap_only = evt->play.drop_non_ref ? 1 : 0;
+
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("IsoMedia Starting channel playback "LLD" to "LLD" (%g to %g)\n", ch->start, ch->end, start_range, evt->play.end_range));
 		} else {
-			Double end = evt->play.end_range;
-			if (end==-1) end = 0;
-			ch->start = (u64) (s64) (start_range * ch->timescale);
-			if (end <= start_range)
-				ch->end = (u64) (s64) (end  * ch->timescale);
+			ch->end = 0;
+			ch->sample_num = 0;
+			ch->sample_last = 0;
+			ch->sap_only = 0;
 		}
-		ch->playing = 1;
-		ch->sample_num = evt->play.from_pck;
 		ch->orig_start = start_range;
+		ch->playing = 1;
 
-		ch->sap_only = evt->play.drop_non_ref ? 1 : 0;
-
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("IsoMedia Starting channel playback "LLD" to "LLD" (%g to %g)\n", ch->start, ch->end, start_range, evt->play.end_range));
-
+#ifndef GPAC_DISABLE_ISOM_FRAGMENTS
 		if (!read->nb_playing)
 			gf_isom_reset_seq_num(read->mov);
-
+#endif
 		if (read->is_partial_download) read->input_loaded = GF_FALSE;
 
-		if (evt->play.no_byterange_forward) {
+		if (is_byte_range) {
+			if (!read->frag_type) {
+				return GF_TRUE;
+			}
+			if (read->mem_load_mode) {
+				GF_FilterEvent fevt;
+				//new segment will be loaded, reset
+				gf_isom_reset_tables(read->mov, GF_TRUE);
+				gf_isom_reset_data_offset(read->mov, NULL);
+				read->refresh_fragmented = GF_TRUE;
+				read->mem_blob.size = 0;
+
+				read->bytes_removed = evt->play.hint_start_offset;
+
+				//send a seek request
+				read->is_partial_download = GF_TRUE;
+				read->wait_for_source = GF_TRUE;
+				read->refresh_fragmented = GF_TRUE;
+
+				GF_FEVT_INIT(fevt, GF_FEVT_SOURCE_SEEK, read->pid);
+				fevt.seek.start_offset = read->bytes_removed;
+				gf_filter_pid_send_event(read->pid, &fevt);
+
+				gf_isom_set_removed_bytes(read->mov, read->bytes_removed);
+				gf_isom_set_byte_offset(read->mov, 0);
+			} else {
+				GF_Err gf_isom_load_fragments(GF_ISOFile *movie, u64 start_range, u64 end_range, u64 *BytesMissing);
+				gf_isom_load_fragments(read->mov, evt->play.hint_start_offset, evt->play.hint_end_offset, &read->missing_bytes);
+				ch->hint_first_tfdt = evt->play.hint_first_dts;
+			}
+		} else if (evt->play.no_byterange_forward) {
 			//new segment will be loaded, reset
 			gf_isom_reset_tables(read->mov, GF_TRUE);
 			gf_isom_reset_data_offset(read->mov, NULL);
@@ -1002,6 +1055,7 @@
 			count = gf_list_count(read->channels);
 
 			//try sidx
+#ifndef GPAC_DISABLE_ISOM_FRAGMENTS
 			if (read->frag_type) {
 				u32 ts;
 				u64 dur=0;
@@ -1021,7 +1075,7 @@
 					}
 				}
 			}
-
+#endif
 			if (!is_sidx_seek) {
 				for (i=0; i< count; i++) {
 					u32 mode, sample_desc_index, sample_num;
@@ -1052,7 +1106,15 @@
 				GF_FEVT_INIT(fevt, GF_FEVT_SOURCE_SEEK, read->pid);
 				fevt.seek.start_offset = max_offset;
 				gf_filter_pid_send_event(read->pid, &fevt);
-				gf_isom_set_byte_offset(read->mov, is_sidx_seek ? 0 : max_offset);
+
+				if (read->mem_load_mode) {
+					read->mem_blob.size = 0;
+					read->bytes_removed = max_offset;
+					gf_isom_set_removed_bytes(read->mov, read->bytes_removed);
+					gf_isom_set_byte_offset(read->mov, 0);
+				} else {
+					gf_isom_set_byte_offset(read->mov, is_sidx_seek ? 0 : max_offset);
+				}
 			}
 		}
 
@@ -1074,7 +1136,7 @@
 				ach->orig_start = ch->orig_start;
 				ach->start = (u64) (ach->orig_start * ach->timescale);
 				ach->eos_sent = 0;
-				ach->speed = evt->play.speed;
+				ach->speed = is_byte_range ? 1 : evt->play.speed;
 				ach->initial_play_seen = 1;
 				ach->skip_next_play = 1;
 				ach->set_disc = 1;
@@ -1142,7 +1204,7 @@
 
 	if (read->mem_load_mode==1) {
 		u32 box_type;
-		e = gf_isom_open_progressive_ex(read->mem_url, 0, 0, GF_FALSE, &read->mov, &bytes_missing, &box_type);
+		e = gf_isom_open_progressive_ex(read->mem_url, 0, 0, read->sigfrag, &read->mov, &bytes_missing, &box_type);
 
 		if (e && (e != GF_ISOM_INCOMPLETE_FILE)) {
 			gf_filter_setup_failure(filter, e);
@@ -1173,8 +1235,12 @@
 		return;
 	}
 	//refresh file
-	gf_isom_refresh_fragmented(read->mov, &bytes_missing, read->mem_url);
-
+#ifndef GPAC_DISABLE_ISOM_FRAGMENTS
+	e = gf_isom_refresh_fragmented(read->mov, &bytes_missing, read->mem_url);
+	if (e && (e!=GF_ISOM_INCOMPLETE_FILE)) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("IsoMedia Failed to refresh fragmented file after buffer push: %s\n", gf_error_to_string(e)));
+	}
+#endif
 	if ((read->mem_load_mode==2) && bytes_missing)
 		read->force_fetch = GF_TRUE;
 
@@ -1187,7 +1253,7 @@
 	u32 nb_bytes_to_purge;
 	u64 bytes_missing;
 
-	//purge every
+	//purge every mstore_purge bytes
 	if (read->mstore_purge && (min_offset - read->last_min_offset < read->mstore_purge))
 		return;
 
@@ -1196,16 +1262,21 @@
 		//bytes (we would trash the top-level box header)
 		gf_isom_get_current_top_box_offset(read->mov, &top_offset);
 		if (top_offset<min_offset) {
+			//force loading more data - we usually get here when mdat is not completely loaded
+			read->force_fetch = GF_TRUE;
 			return;
 		}
 	}
 	read->last_min_offset = min_offset;
 
-	assert(min_offset>=read->bytes_removed);
+	gf_assert(min_offset>=read->bytes_removed);
 	//min_offset is given in absolute file position
 	nb_bytes_to_purge = (u32) (min_offset - read->bytes_removed);
-	assert(nb_bytes_to_purge<=read->mem_blob.size);
-
+	gf_assert(nb_bytes_to_purge<=read->mem_blob.size);
+	if (!nb_bytes_to_purge) {
+		read->force_fetch = GF_TRUE;
+		return;
+	}
 	memmove(read->mem_blob.data, read->mem_blob.data+nb_bytes_to_purge, read->mem_blob.size - nb_bytes_to_purge);
 	read->mem_blob.size -= nb_bytes_to_purge;
 	read->bytes_removed += nb_bytes_to_purge;
@@ -1214,8 +1285,9 @@
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("IsoMedia mem mode %d bytes in mem, "LLU" bytes trashed since start\n", read->mem_blob.size, read->bytes_removed));
 
 	//force a refresh
+#ifndef GPAC_DISABLE_ISOM_FRAGMENTS
 	gf_isom_refresh_fragmented(read->mov, &bytes_missing, read->mem_url);
-
+#endif
 	if (!read->frag_type)
 		return;
 
@@ -1235,7 +1307,7 @@
 			ch->sample_num = 1;
 
 		num_samples = gf_isom_get_sample_count(read->mov, ch->track);
-		assert(ch->sample_num<=num_samples);
+		gf_assert(ch->sample_num<=num_samples);
 		GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("IsoMedia mem mode %d samples now in track %d (prev %d)\n", num_samples, ch->track_id, prev_samples));
 	}
 }
@@ -1246,6 +1318,7 @@
 	u32 i, count = gf_list_count(read->channels);
 	Bool is_active = GF_FALSE;
 	Bool in_is_eos = GF_FALSE;
+	Bool in_is_flush = GF_FALSE;
 	Bool check_forced_end = GF_FALSE;
 	Bool has_new_data = GF_FALSE;
 	u64 min_offset_plus_one = 0;
@@ -1262,7 +1335,7 @@
 			if (read->moov_not_loaded) return GF_OK;
 		}
 		if (read->mem_load_mode==2) {
-			if (!read->force_fetch && read->mem_blob.size > read->mstore_size) {
+			if (!read->force_fetch && (read->mem_blob.size > read->mstore_size)) {
 				fetch_input = GF_FALSE;
 			}
 			read->force_fetch = GF_FALSE;
@@ -1298,8 +1371,12 @@
 				return read->in_error;
 		}
 		if (gf_filter_pid_is_eos(read->pid)) {
-			read->input_loaded = GF_TRUE;
-			in_is_eos = GF_TRUE;
+			if (!gf_filter_pid_is_flush_eos(read->pid)) {
+				read->input_loaded = GF_TRUE;
+				in_is_eos = GF_TRUE;
+			} else {
+				in_is_flush = GF_TRUE;
+			}
 		}
 		if (read->input_is_stop) {
 			read->input_loaded = GF_TRUE;
@@ -1356,6 +1433,7 @@
 			prop = gf_filter_pid_get_property(read->pid, GF_PROP_PID_FILEPATH);
 			if (prop) new_url = prop->value.string;
 
+#ifndef GPAC_DISABLE_ISOM_FRAGMENTS
 			e = gf_isom_refresh_fragmented(read->mov, &bytesMissing, new_url);
 
 			if (e && (e != GF_ISOM_INCOMPLETE_FILE)) {
@@ -1364,6 +1442,7 @@
 			} else {
 				GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("IsoMedia Refreshing current segment at UTC "LLU" - "LLU" bytes still missing - input is EOS %d\n", gf_net_get_utc(), bytesMissing, in_is_eos));
 			}
+#endif
 
 			if (!read->refresh_fragmented && (e==GF_ISOM_INCOMPLETE_FILE)) {
 				GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("IsoMedia Incomplete Segment received - "LLU" bytes missing but EOF found\n", bytesMissing ));
@@ -1398,7 +1477,7 @@
 
 		while (nb_pck) {
 			ch->sample_data_offset = 0;
-			if (!read->full_segment_flush && gf_filter_pid_would_block(ch->pid) )
+			if (!in_is_flush && !read->full_segment_flush && gf_filter_pid_would_block(ch->pid) )
 				break;
 
 			if (ch->item_id) {
@@ -1406,6 +1485,14 @@
 			} else {
 				isor_reader_get_sample(ch);
 			}
+			if (!ch->sample && ch->pck) {
+				gf_filter_pck_discard(ch->pck);
+				ch->pck = NULL;
+				if (ch->static_sample) {
+					ch->static_sample->data = NULL;
+					ch->static_sample->alloc_size=0;
+				}
+			}
 
 			if (read->stsd && (ch->last_sample_desc_index != read->stsd) && ch->sample) {
 				isor_reader_release_sample(ch);
@@ -1432,14 +1519,27 @@
 				//strip param sets from payload, trigger reconfig if needed
 				isor_reader_check_config(ch);
 
-				if (read->nodata) {
-					pck = gf_filter_pck_new_shared(ch->pid, NULL, ch->sample->dataLength, NULL);
+				if (ch->pck) {
+					pck = ch->pck;
+					ch->pck = NULL;
+					gf_filter_pck_check_realloc(pck, ch->sample->data, ch->sample->dataLength);
+					ch->static_sample->data = NULL;
+					ch->static_sample->dataLength = 0;
+					ch->static_sample->alloc_size=0;
+				}
+				else if (read->nodata) {
+					if (read->nodata==1)
+						pck = gf_filter_pck_new_shared(ch->pid, NULL, ch->sample->dataLength, NULL);
+					else
+						pck = gf_filter_pck_new_alloc(ch->pid, ch->sample->dataLength, &data);
+
 					if (!pck) return GF_OUT_OF_MEM;
 				} else {
 					pck = gf_filter_pck_new_alloc(ch->pid, ch->sample->dataLength, &data);
 					if (!pck) return GF_OUT_OF_MEM;
 
-					memcpy(data, ch->sample->data, ch->sample->dataLength);
+					if (ch->sample->data)
+						memcpy(data, ch->sample->data, ch->sample->dataLength);
 				}
 				gf_filter_pck_set_dts(pck, ch->dts);
 				gf_filter_pck_set_cts(pck, ch->cts);
@@ -1457,7 +1557,7 @@
 					gf_filter_pck_set_roll_info(pck, ch->roll);
 				}
 
-				sample_dur = ch->au_duration;
+				sample_dur = ch->sample->duration;
 				if (ch->sample->nb_pack)
 					sample_dur *= ch->sample->nb_pack;
 				gf_filter_pck_set_duration(pck, sample_dur);
@@ -1492,6 +1592,7 @@
 					gf_filter_pck_set_property(pck, GF_PROP_PCK_CENC_SAI, &PROP_DATA(ch->sai_buffer, ch->sai_buffer_size) );
 				}
 
+#ifndef GPAC_DISABLE_ISOM_FRAGMENTS
 				if (read->sigfrag) {
 					GF_ISOFragmentBoundaryInfo finfo;
 					if (gf_isom_sample_is_fragment_start(read->mov, ch->track, ch->sample_num, &finfo) ) {
@@ -1506,14 +1607,19 @@
 						start = finfo.frag_start;
 						if (finfo.seg_start_plus_one) start = finfo.seg_start_plus_one-1;
 						gf_filter_pck_set_property(pck, GF_PROP_PCK_FRAG_RANGE, &PROP_FRAC64_INT(start, finfo.mdat_end));
+
+
 						if (finfo.moof_template) {
 							gf_filter_pck_set_property(pck, GF_PROP_PCK_MOOF_TEMPLATE, &PROP_DATA((u8 *)finfo.moof_template, finfo.moof_template_size));
 						}
 						if (finfo.sidx_end) {
 							gf_filter_pck_set_property(pck, GF_PROP_PCK_SIDX_RANGE, &PROP_FRAC64_INT(finfo.sidx_start , finfo.sidx_end));
 						}
+
+						gf_filter_pck_set_property(pck, GF_PROP_PCK_FRAG_TFDT, &PROP_LONGUINT(finfo.first_dts));
 					}
 				}
+#endif
 				if (ch->sender_ntp) {
 					gf_filter_pck_set_property(pck, GF_PROP_PCK_SENDER_NTP, &PROP_LONGUINT(ch->sender_ntp));
 					if (ch->ntp_at_server_ntp) {
@@ -1521,6 +1627,7 @@
 					}
 				}
 				ch->eos_sent = 0;
+				ch->nb_empty_retry = 0;
 
 				//this might not be the true end of stream
 				if ((ch->streamType==GF_STREAM_AUDIO) && (ch->sample_num == gf_isom_get_sample_count(read->mov, ch->track))) {
@@ -1541,9 +1648,13 @@
 				isor_reader_release_sample(ch);
 
 				ch->last_valid_sample_data_offset = ch->sample_data_offset;
-				nb_pck--;
+				if (!in_is_flush)
+					nb_pck--;
 			} else if (ch->last_state==GF_EOS) {
-				if (ch->playing == 2) {
+				if (in_is_flush) {
+					gf_filter_pid_send_flush(ch->pid);
+				}
+				else if (ch->playing == 2) {
 					if (in_is_eos) {
 						ch->playing = 0;
 					} else {
@@ -1551,6 +1662,7 @@
 						check_forced_end = GF_TRUE;
 					}
 				}
+				ch->nb_empty_retry++;
 				if (in_is_eos && !ch->eos_sent) {
 					void *tfrf;
 					const void *gf_isom_get_tfrf(GF_ISOFile *movie, u32 trackNumber);
@@ -1571,6 +1683,7 @@
 				}
 				break;
 			} else if (ch->last_state==GF_ISOM_INVALID_FILE) {
+				ch->nb_empty_retry++;
 				if (!ch->eos_sent) {
 					ch->eos_sent = 1;
 					read->eos_signaled = GF_TRUE;
@@ -1582,11 +1695,19 @@
 					gf_filter_ask_rt_reschedule(filter, 1);
 
 				read->force_fetch = GF_TRUE;
+				ch->nb_empty_retry++;
 				break;
 			}
 		}
-		if (!min_offset_plus_one || (min_offset_plus_one - 1 > ch->last_valid_sample_data_offset))
+		//if no sample fetched for 100 calls, consider no sample for this track and don't use it for memory purge
+		//this is typically needed when some tracks are declared in fragmented mode but not present in the stream (at all or for a long time):
+		//for these tracks, min_offset_plus_one is always 1 (no samples) or a much smaller value than for active tracks
+		// hence forever growing mem storage until stuck at max size...
+		if ((ch->nb_empty_retry<100)
+			&& (!min_offset_plus_one || (min_offset_plus_one - 1 > ch->last_valid_sample_data_offset))
+		) {
 			min_offset_plus_one = 1 + ch->last_valid_sample_data_offset;
+		}
 	}
 	if (read->mem_load_mode && min_offset_plus_one) {
 		isoffin_purge_mem(read, min_offset_plus_one-1);
@@ -1600,12 +1721,10 @@
 		gf_filter_pid_send_event(read->pid, &evt);
 	}
 
-
 	if (!is_active) {
 		return GF_EOS;
 	}
-	//if (in_is_eos)
-//	gf_filter_ask_rt_reschedule(filter, 1);
+
 	return GF_OK;
 
 }
@@ -1625,7 +1744,10 @@
 {
 	{ OFFS(src), "local file name of source content (only used when explicitly loading the filter)", GF_PROP_NAME, NULL, NULL, GF_FS_ARG_HINT_EXPERT},
 	{ OFFS(allt), "load all tracks even if unknown media type", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_ADVANCED},
-	{ OFFS(noedit), "do not use edit lists", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_ADVANCED},
+	{ OFFS(edits), "do not use edit lists\n"
+		"- auto: track delay and no edit list when possible\n"
+		"- no: ignore edit list\n"
+		"- strict: use edit list even if only signaling a delay", GF_PROP_UINT, "auto", "auto|no|strict", GF_FS_ARG_HINT_ADVANCED},
 	{ OFFS(itt), "convert all items of root meta into a single PID", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_ADVANCED},
 	{ OFFS(itemid), "keep item IDs in PID properties", GF_PROP_BOOL, "true", NULL, GF_FS_ARG_HINT_ADVANCED},
 	{ OFFS(smode), "load mode for scalable/tile tracks\n"
@@ -1635,8 +1757,7 @@
 	{ OFFS(alltk), "declare disabled tracks", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_ADVANCED},
 	{ OFFS(frame_size), "frame size for raw audio samples (dispatches frame_size samples per packet)", GF_PROP_UINT, "1024", NULL, GF_FS_ARG_HINT_ADVANCED},
 	{ OFFS(expart), "expose cover art as a dedicated video PID", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_ADVANCED},
-	{ OFFS(sigfrag), "signal fragment and segment boundaries of source on output packets", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_ADVANCED},
-
+	{ OFFS(sigfrag), "signal fragment and segment boundaries of source on output packets, fails if source is not fragmented", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_EXPERT},
 	{ OFFS(tkid), "declare only track based on given param\n"
 	"- integer value: declares track with the given ID\n"
 	"- audio: declares first audio track\n"
@@ -1654,9 +1775,13 @@
 	{ OFFS(xps_check), "parameter sets extraction mode from AVC/HEVC/VVC samples\n"
 	"- keep: do not inspect sample (assumes input file is compliant when generating DASH/HLS/CMAF)\n"
 	"- rem: removes all inband xPS and notify configuration changes accordingly\n"
-	"- auto: resolves to `keep` for `smode=splix` (dasher mode), `rem` otherwise"
+	"- auto: resolves to `keep` for `smode=splitx` (dasher mode), `rem` otherwise"
 	, GF_PROP_UINT, "auto", "auto|keep|rem", GF_FS_ARG_HINT_EXPERT},
-	{ OFFS(nodata), "do not load sample data", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_EXPERT},
+	{ OFFS(nodata), "control sample data loading\n"
+	"- no: regular load\n"
+	"- yes: skip data loading\n"
+	"- fake: allocate sample but no data copy", GF_PROP_UINT, "no", "no|yes|fake", GF_FS_ARG_HINT_EXPERT},
+	{ OFFS(lightp), "load minimal set of properties", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_EXPERT},
 	{ OFFS(initseg), "local init segment name when input is a single ISOBMFF segment", GF_PROP_STRING, NULL, NULL, GF_FS_ARG_HINT_EXPERT},
 	{0}
 };
@@ -1709,6 +1834,7 @@
 		"Warning: smode=splitx will result in extractor NAL units still present in the output bitstream, which shall only be true if the output is ISOBMFF based\n"
 	 	)
 	.private_size = sizeof(ISOMReader),
+	.flags = GF_FS_REG_USE_SYNC_READ,
 	.args = ISOFFInArgs,
 	.initialize = isoffin_initialize,
 	.finalize = isoffin_finalize,
@@ -1719,15 +1845,13 @@
 	.probe_data = isoffin_probe_data
 };
 
-
-#endif /*GPAC_DISABLE_ISOM*/
-
-const GF_FilterRegister *isoffin_register(GF_FilterSession *session)
+const GF_FilterRegister *mp4dmx_register(GF_FilterSession *session)
 {
-#ifdef GPAC_DISABLE_ISOM
-	return NULL;
-#else
 	return &ISOFFInRegister;
-#endif /*GPAC_DISABLE_ISOM*/
 }
-
+#else
+const GF_FilterRegister *mp4dmx_register(GF_FilterSession *session)
+{
+	return NULL;
+}
+#endif // !defined(GPAC_DISABLE_ISOM) && !defined(GPAC_DISABLE_MP4DMX)

gpac-2.2.1.tar.gz/src/filters/isoffin_read_ch.c -> gpac-2.4.0.tar.gz/src/filters/isoffin_read_ch.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2022
+ *			Copyright (c) Telecom ParisTech 2000-2024
  *					All rights reserved
  *
  *  This file is part of GPAC / ISOBMFF reader filter
@@ -26,10 +26,12 @@
 
 #include "isoffin.h"
 
-#ifndef GPAC_DISABLE_ISOM
+#if !defined(GPAC_DISABLE_ISOM) && !defined(GPAC_DISABLE_MP4DMX)
+
 #include <gpac/network.h>
 #include <gpac/avparse.h>
 
+GF_Err gf_isom_set_sample_alloc(GF_ISOFile *the_file, u32 trackNumber, 	u8 *(*sample_realloc)(u32 size, void *cbk), void *udta);
 
 void isor_reset_reader(ISOMChannel *ch)
 {
@@ -46,6 +48,7 @@
 	ch->start = ch->end = 0;
 	ch->to_init = 1;
 	ch->playing = 0;
+	ch->nb_empty_retry = 0;
 	if (ch->sai_buffer) gf_free(ch->sai_buffer);
 	ch->sai_buffer = NULL;
 	ch->sai_alloc_size = 0;
@@ -63,6 +66,7 @@
 		return;
 	}
 
+#ifndef GPAC_DISABLE_ISOM_FRAGMENTS
 	if (gf_isom_get_last_producer_time_box(read->mov, &trackID, &ntp, &timestamp, GF_TRUE)) {
 #if !defined(_WIN32_WCE) && !defined(GPAC_DISABLE_LOG)
 
@@ -82,6 +86,7 @@
 		read->cts_for_last_sender_ntp = timestamp;
 		read->ntp_at_last_sender_ntp = gf_net_get_ntp_ts();
 	}
+#endif
 }
 
 
@@ -91,13 +96,13 @@
 
 	ch->au_seq_num = 1;
 
-	assert(ch->sample==NULL);
+	gf_assert(ch->sample==NULL);
 	if (!ch->static_sample) {
 		ch->static_sample = gf_isom_sample_new();
 	}
 
 	if (ch->streamType==GF_STREAM_OCR) {
-		assert(!ch->sample);
+		gf_assert(!ch->sample);
 		ch->sample = gf_isom_sample_new();
 		ch->sample->IsRAP = RAP;
 		ch->sample->DTS = ch->start;
@@ -136,6 +141,7 @@
 		}
 
 		if (ch->sample && !ch->sample->data && ch->owner->frag_type && !ch->has_edit_list) {
+			ch->static_sample->alloc_size = 0;
 			ch->sample = NULL;
 			ch->sample_num = 1;
 			ch->sample = gf_isom_get_sample_ex(ch->owner->mov, ch->track, ch->sample_num, &sample_desc_index, ch->static_sample, &ch->sample_data_offset);
@@ -193,7 +199,7 @@
 	GF_Err e;
 	Bool Is_Encrypted;
 	u32 out_size;
-	u8 crypt_byte_block, skip_byte_block;
+	u32 crypt_byte_block, skip_byte_block;
 	u8 piff_info20;
 	u8 *key_info = NULL;
 	u32 key_info_size = 0;
@@ -291,7 +297,7 @@
 
 	ch->sample = ch->static_sample;
 	ch->sample->IsRAP = RAP;
-	ch->au_duration = 1000;
+	ch->sample->duration = 1000;
 	ch->dts = ch->cts = 1000 * ch->au_seq_num;
 	gf_isom_extract_meta_item_mem(ch->owner->mov, GF_TRUE, 0, ch->item_id, &ch->sample->data, &ch->sample->dataLength, &ch->static_sample->alloc_size, NULL, GF_FALSE);
 
@@ -300,6 +306,24 @@
 	}
 }
 
+u8 *isor_sample_alloc(u32 size, void *udta)
+{
+	u8 *output;
+	ISOMChannel *ch = (ISOMChannel *)udta;
+	if (ch->pck) {
+		if (size<ch->alloc_size) {
+			u32 size;
+			return (u8 *) gf_filter_pck_get_data(ch->pck, &size);
+		}
+		gf_filter_pck_expand(ch->pck, size - ch->alloc_size, &output, NULL, NULL);
+		ch->alloc_size = size;
+		return output;
+	}
+	ch->pck = gf_filter_pck_new_alloc(ch->pid, size, &output);
+	ch->alloc_size = size;
+	return output;
+}
+
 void isor_reader_get_sample(ISOMChannel *ch)
 {
 	GF_Err e;
@@ -309,10 +333,14 @@
 
 	if (ch->next_track) {
 		ch->track = ch->next_track;
+		if (!ch->owner->nodata)
+			gf_isom_set_sample_alloc(ch->owner->mov, ch->track, isor_sample_alloc, ch);
 		ch->next_track = 0;
 	}
 
 	if (ch->to_init) {
+		if (!ch->owner->nodata)
+			gf_isom_set_sample_alloc(ch->owner->mov, ch->track, isor_sample_alloc, ch);
 		init_reader(ch);
 		sample_desc_index = ch->last_sample_desc_index;
 	} else if (ch->speed < 0) {
@@ -326,12 +354,14 @@
 		}
 
 		e = gf_isom_get_sample_for_movie_time(ch->owner->mov, ch->track, ch->sample_time + 1, &sample_desc_index, GF_ISOM_SEARCH_FORWARD, &ch->static_sample, &ch->sample_num, NULL);
+		ch->static_sample->alloc_size = 0;
 
 		if ((e==GF_EOS) || (ch->static_sample->IsRAP)) {
 			if (!ch->last_rap_sample_time) {
 				e = GF_EOS;
 			} else {
 				e = gf_isom_get_sample_for_movie_time(ch->owner->mov, ch->track, ch->last_rap_sample_time - 1, &sample_desc_index, GF_ISOM_SEARCH_SYNC_BACKWARD, &ch->static_sample, &ch->sample_num, NULL);
+				ch->static_sample->alloc_size = 0;
 			}
 		}
 
@@ -356,6 +386,7 @@
 	} else if (ch->has_edit_list) {
 		u32 prev_sample = ch->sample_num;
 		e = gf_isom_get_sample_for_movie_time(ch->owner->mov, ch->track, ch->sample_time + 1, &sample_desc_index, GF_ISOM_SEARCH_FORWARD, &ch->static_sample, &ch->sample_num, &ch->sample_data_offset);
+		ch->static_sample->alloc_size = 0;
 
 		if (e == GF_OK) {
 			ch->sample = ch->static_sample;
@@ -364,6 +395,8 @@
 			if (ch->edit_sync_frame) {
 				ch->edit_sync_frame++;
 				if (ch->edit_sync_frame < ch->sample_num) {
+					ch->static_sample->alloc_size = 0;
+					ch->static_sample->dataLength = 0;
 					ch->sample = gf_isom_get_sample_ex(ch->owner->mov, ch->track, ch->edit_sync_frame, &sample_desc_index, ch->static_sample, &ch->sample_data_offset);
 					if (ch->sample) {
 						ch->sample->DTS = ch->sample_time;
@@ -385,11 +418,20 @@
 							//e = GF_EOS;
 						} else {
 							u32 time_diff = gf_isom_get_sample_duration(ch->owner->mov, ch->track, sample_num);
+
+							ch->static_sample->alloc_size = 0;
+							ch->static_sample->dataLength = 0;
+
 							e = gf_isom_get_sample_for_movie_time(ch->owner->mov, ch->track, ch->sample_time + time_diff, &sample_desc_index, GF_ISOM_SEARCH_FORWARD, &ch->static_sample, &ch->sample_num, &ch->sample_data_offset);
+							ch->static_sample->alloc_size = 0;
 							if (e==GF_OK) {
 								if (ch->sample_num == prev_sample) {
 									ch->sample_time += time_diff;
 									ch->sample = NULL;
+									if (ch->pck) {
+										gf_filter_pck_discard(ch->pck);
+										ch->pck = NULL;
+									}
 									return;
 								} else {
 									ch->sample = ch->static_sample;
@@ -405,8 +447,11 @@
 					GF_ISOSample *found = ch->static_sample;
 					u32 samp_num = ch->sample_num;
 					ch->sample = NULL;
+					ch->static_sample->alloc_size = 0;
+					ch->static_sample->dataLength = 0;
 					e = gf_isom_get_sample_for_movie_time(ch->owner->mov, ch->track, ch->sample_time + 1, &sample_desc_index, GF_ISOM_SEARCH_SYNC_BACKWARD, &ch->static_sample, &ch->sample_num, &ch->sample_data_offset);
 
+					ch->static_sample->alloc_size = 0;
 					ch->sample = (e == GF_OK) ? ch->static_sample : NULL;
 
 					/*if no sync point in the past, use the first non-sync for the given time*/
@@ -428,6 +473,12 @@
 	} else {
 		Bool do_fetch = GF_TRUE;
 		ch->sample_num++;
+		if (ch->sample_last && (ch->sample_last<ch->sample_num)) {
+			ch->sample = NULL;
+			ch->last_state = GF_EOS;
+			ch->playing = 2;
+			return;
+		}
 
 		if (ch->sap_only) {
 			Bool is_rap = gf_isom_get_sample_sync(ch->owner->mov, ch->track, ch->sample_num);
@@ -453,6 +504,11 @@
 			if (ch->sample && (ch->sample->IsRAP==RAP_REDUNDANT)) {
 				ch->sample = NULL;
 				ch->sample_num++;
+				if (ch->pck) {
+					gf_filter_pck_discard(ch->pck);
+					ch->pck = NULL;
+					ch->static_sample->alloc_size = ch->static_sample->dataLength = 0;
+				}
 				isor_reader_get_sample(ch);
 				return;
 			}
@@ -466,6 +522,10 @@
 		ch->track = ch->next_track;
 		ch->next_track = 0;
 		ch->sample = NULL;
+		if (ch->pck) {
+			gf_filter_pck_discard(ch->pck);
+			ch->pck = NULL;
+		}
 		isor_reader_get_sample(ch);
 		return;
 	}
@@ -497,8 +557,10 @@
 		}
 		else if (!ch->sample_num
 		         || ((ch->speed >= 0) && (ch->sample_num >= sample_count))
+#ifndef GPAC_DISABLE_ISOM_FRAGMENTS
 		         || ((ch->speed < 0) && (ch->sample_time == gf_isom_get_current_tfdt(ch->owner->mov, ch->track) ))
-		        ) {
+#endif
+		) {
 
 			if (ch->owner->frag_type==1) {
 				/*if sample cannot be found and file is fragmented, rewind sample*/
@@ -522,6 +584,12 @@
 		return;
 	}
 
+	//first sample fetched has DTS, we have a tfdt so ignore the hinted one
+	if ((ch->sample_num==1) && ch->hint_first_tfdt && ch->sample->DTS) {
+		ch->hint_first_tfdt = 0;
+	}
+	ch->sample->DTS += ch->hint_first_tfdt;
+
 	if (sample_desc_index != ch->last_sample_desc_index) {
 		if (!ch->owner->stsd) {
 			//we used sample entry 1 by default to setup, if no active prev sample (edit list might trigger this)
@@ -536,7 +604,6 @@
 	}
 
 	ch->last_state = GF_OK;
-	ch->au_duration = gf_isom_get_sample_duration(ch->owner->mov, ch->track, ch->sample_num);
 
 	ch->sap_3 = GF_FALSE;
 	ch->sap_4_type = 0;
@@ -559,7 +626,7 @@
 			ch->dts = ch->start;
 		}
 
-		if (ch->end && (ch->end < ch->sample->DTS + ch->sample->CTS_Offset + ch->au_duration)) {
+		if (ch->end && (ch->end < ch->sample->DTS + ch->sample->CTS_Offset + ch->sample->duration)) {
 			GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("IsoMedia End of Channel "LLD" (CTS "LLD")\n", ch->end, ch->sample->DTS + ch->sample->CTS_Offset));
 			ch->sample = NULL;
 			ch->last_state = GF_EOS;
@@ -605,15 +672,6 @@
 	ch->sai_buffer_size = 0;
 }
 
-static void isor_reset_seq_list(GF_List *list)
-{
-	while (gf_list_count(list)) {
-		GF_NALUFFParam *sl = gf_list_pop_back(list);
-		gf_free(sl->data);
-		gf_free(sl);
-	}
-}
-
 enum
 {
 	RESET_STATE_VPS=1,
@@ -623,8 +681,100 @@
 	RESET_STATE_DCI=1<<4,
 };
 
-static void isor_replace_nal(ISOMChannel *ch, u8 *data, u32 size, u8 nal_type, u32 *reset_state)
+#include <gpac/internal/media_dev.h>
+
+//quick way of reading ID of AVC/HEVC/VVC param sets
+static s32 isor_ps_get_id(u8 nal_type, u8 *data, u32 size, Bool is_avc)
+{
+	s32 res=-1;
+	GF_BitStream *bs = gf_bs_new(data, size, GF_BITSTREAM_READ);
+	gf_bs_enable_emulation_byte_removal(bs, GF_TRUE);
+	switch (nal_type) {
+	case GF_AVC_NALU_PIC_PARAM:
+		gf_bs_read_u8(bs); //nal header
+		res = gf_bs_read_ue(bs);
+		break;
+	case GF_AVC_NALU_SEQ_PARAM:
+		gf_bs_read_u32(bs); //nal header + start of sps
+		res = gf_bs_read_ue(bs);
+		break;
+	case GF_HEVC_NALU_VID_PARAM:
+		gf_bs_read_u16(bs); //nal header
+		res = gf_bs_read_int(bs, 4);
+		break;
+	case GF_HEVC_NALU_SEQ_PARAM:
+#ifndef GPAC_DISABLE_AV_PARSERS
+		res = gf_hevc_read_sps(data, size, NULL);
+#else
+		res = -1;
+#endif
+		break;
+	case GF_HEVC_NALU_PIC_PARAM:
+		gf_bs_read_u16(bs); //nal header
+		res = gf_bs_read_ue(bs);
+		break;
+	case GF_VVC_NALU_VID_PARAM:
+		gf_bs_read_u16(bs); //nal header
+		res = gf_bs_read_int(bs, 4);
+		break;
+	case GF_VVC_NALU_SEQ_PARAM:
+		gf_bs_read_u16(bs); //nal header
+		res = gf_bs_read_int(bs, 4);
+		break;
+	case GF_VVC_NALU_PIC_PARAM:
+		gf_bs_read_u16(bs); //nal header
+		res = gf_bs_read_int(bs, 6);
+		break;
+	//case GF_AVC_NALU_SEQ_PARAM_EXT: - same value as VVC_DEC_PARAM
+	case GF_VVC_NALU_DEC_PARAM:
+		if (is_avc) {
+			gf_bs_read_u8(bs); //nal header
+			res = (s32) gf_bs_read_ue(bs);
+		} else {
+			res = 0; //no ID for DCI
+		}
+		break;
+	}
+	gf_bs_del(bs);
+	return res;
+}
+
+static void isor_reset_seq_list(GF_List *list)
+{
+   while (gf_list_count(list)) {
+		   GF_NALUFFParam *sl = gf_list_pop_back(list);
+		   gf_free(sl->data);
+		   gf_free(sl);
+   }
+}
+
+static void isor_reset_all_ps(ISOMChannel *ch)
 {
+	u32 i, count;
+	if (ch->avcc) {
+		isor_reset_seq_list(ch->avcc->pictureParameterSets);
+		isor_reset_seq_list(ch->avcc->sequenceParameterSets);
+		isor_reset_seq_list(ch->avcc->sequenceParameterSetExtensions);
+	}
+	else if (ch->hvcc) {
+		count = gf_list_count(ch->hvcc->param_array);
+		for (i=0; i<count; i++) {
+			GF_NALUFFParamArray *hvca = gf_list_get(ch->hvcc->param_array, i);
+			isor_reset_seq_list(hvca->nalus);
+		}
+	}
+	else if (ch->vvcc) {
+		count = gf_list_count(ch->vvcc->param_array);
+		for (i=0; i<count; i++) {
+			GF_NALUFFParamArray *vvca = gf_list_get(ch->vvcc->param_array, i);
+			isor_reset_seq_list(vvca->nalus);
+		}
+	}
+}
+
+static void isor_replace_nal(ISOMChannel *ch, u8 *data, u32 size, u8 nal_type, Bool *needs_reset)
+{
+	s32 ps_id;
 	u32 i, count, state=0;
 	GF_NALUFFParam *sl;
 	GF_List *list=NULL;
@@ -705,24 +855,55 @@
 			break;
 		}
 	}
-
-	ch->xps_mask |= state;
+	//get ps
+	ps_id = 1 + isor_ps_get_id(nal_type, data, size, ch->avcc ? 1 : 0);
 
 	count = gf_list_count(list);
 	for (i=0; i<count; i++) {
 		sl = gf_list_get(list, i);
-		if ((sl->size==size) && !memcmp(sl->data, data, size)) return;
-	}
-	if (! (*reset_state & state))  {
-		isor_reset_seq_list(list);
-		*reset_state |= state;
-	}
-	GF_SAFEALLOC(sl, GF_NALUFFParam);
-	if (!sl) return;
-	sl->data = gf_malloc(sizeof(char)*size);
-	memcpy(sl->data, data, size);
-	sl->size = size;
-	gf_list_add(list, sl);
+		if (!sl->id) {
+			sl->id = 1 + isor_ps_get_id(nal_type, sl->data, sl->size, ch->avcc ? 1 : 0);
+		}
+		if (sl->id != ps_id) {
+			//reset everything whenever we change ID of seq / vps / dci
+			if (!ch->xps_mask && (state != RESET_STATE_PPS)) {
+				isor_reset_all_ps(ch);
+				break;
+			}
+			continue;
+		}
+
+		if ((sl->size==size) && !memcmp(sl->data, data, size)) {
+			ch->xps_mask |= state;
+			return;
+		}
+		if (state == RESET_STATE_PPS) {
+			//PS modified, copy
+			sl->data = gf_realloc(sl->data, size);
+			memcpy(sl->data, data, size);
+			sl->size = size;
+			*needs_reset = 1;
+			ch->xps_mask |= state;
+			return;
+		}
+		//reset, same as above
+		else if (!ch->xps_mask) {
+			isor_reset_all_ps(ch);
+			break;
+		}
+	}
+	ch->xps_mask |= state;
+	*needs_reset = 1;
+
+	if (list) {
+		GF_SAFEALLOC(sl, GF_NALUFFParam);
+		if (!sl) return;
+		sl->data = gf_malloc(sizeof(char)*size);
+		memcpy(sl->data, data, size);
+		sl->size = size;
+		sl->id = ps_id;
+		gf_list_add(list, sl);
+	}
 }
 
 u8 key_info_get_iv_size(const u8 *key_info, u32 nb_keys, u32 idx, u8 *const_iv_size, const u8 **const_iv);
@@ -801,10 +982,11 @@
 
 void isor_reader_check_config(ISOMChannel *ch)
 {
-	u32 nalu_len, reset_state, pos;
+	u32 nalu_len, pos;
+	Bool needs_reset;
 	if (!ch->check_hevc_ps && !ch->check_avc_ps && !ch->check_vvc_ps && !ch->check_mhas_pl) return;
 
-	if (!ch->sample) return;
+	if (!ch->sample || !ch->sample->data) return;
 	ch->xps_mask = 0;
 
 	//we cannot touch the payload if encrypted but not CENC !!
@@ -814,6 +996,7 @@
 	if (ch->check_mhas_pl) {
 		//we cannot touch the payload if encrypted !!
 		if (ch->pck_encrypted) return;
+#ifndef GPAC_DISABLE_AV_PARSERS
 		u64 ch_layout = 0;
 		s32 PL = gf_mpegh_get_mhas_pl(ch->sample->data, ch->sample->dataLength, &ch_layout);
 		if (PL>0) {
@@ -822,6 +1005,7 @@
 			if (ch_layout)
 				gf_filter_pid_set_property(ch->pid, GF_PROP_PID_CHANNEL_LAYOUT, &PROP_LONGUINT(ch_layout));
 		}
+#endif
 		return;
 	}
 	//analyze mode, do not rewrite
@@ -837,7 +1021,7 @@
 	else if (ch->vvcc) nalu_len = ch->vvcc->nal_unit_size;
 
 	if (!nalu_len) return;
-	reset_state = 0;
+	needs_reset = 0;
 
 	pos = 0;
 
@@ -896,7 +1080,7 @@
 
 		if (replace_nal) {
 			u32 move_size = ch->sample->dataLength - size - pos - nalu_len;
-			isor_replace_nal(ch, ch->sample->data + pos + nalu_len, size, nal_type, &reset_state);
+			isor_replace_nal(ch, ch->sample->data + pos + nalu_len, size, nal_type, &needs_reset);
 			if (move_size)
 				memmove(ch->sample->data + pos, ch->sample->data + pos + size + nalu_len, ch->sample->dataLength - size - pos - nalu_len);
 
@@ -912,16 +1096,16 @@
 		}
 	}
 
-	if (reset_state) {
+	if (needs_reset) {
 		u8 *dsi=NULL;
 		u32 dsi_size=0;
-		if (ch->check_avc_ps) {
+		if (ch->check_avc_ps && ch->avcc) {
 			gf_odf_avc_cfg_write(ch->avcc, &dsi, &dsi_size);
 		}
-		else if (ch->check_hevc_ps) {
+		else if (ch->check_hevc_ps && ch->hvcc) {
 			gf_odf_hevc_cfg_write(ch->hvcc, &dsi, &dsi_size);
 		}
-		else if (ch->check_vvc_ps) {
+		else if (ch->check_vvc_ps && ch->vvcc) {
 			gf_odf_vvc_cfg_write(ch->vvcc, &dsi, &dsi_size);
 		}
 		if (dsi && dsi_size) {
@@ -936,29 +1120,35 @@
 	}
 }
 
-
-
 void isor_set_sample_groups_and_aux_data(ISOMReader *read, ISOMChannel *ch, GF_FilterPacket *pck)
 {
-	char szPName30;
+	char szPName100;
 
 	u32 grp_idx=0;
 	while (1) {
-		u32 grp_type=0, grp_size=0, grp_parameter=0;
-		const u8 *grp_data=NULL;
-		GF_Err e = gf_isom_enum_sample_group(read->mov, ch->track, ch->sample_num, &grp_idx, &grp_type, &grp_parameter, &grp_data, &grp_size);
+		u32 grp_type=0, grp_size=0, grp_parameter=0, grp_flags=0;
+		u8 *grp_data=NULL;
+		GF_Err e = gf_isom_enum_sample_group(read->mov, ch->track, ch->sample_num, &grp_idx, &grp_type, &grp_flags, &grp_parameter, &grp_data, &grp_size);
 		if (e || !grp_type) break;
 		if (!grp_size || !grp_data) continue;
 
-		if (grp_type == GF_4CC('P','S','S','H')) {
-			gf_filter_pck_set_property(pck, GF_PROP_PID_CENC_PSSH, &PROP_DATA((u8*)grp_data, grp_size) );
-			continue;
-		}
-		//all other are mapped to sample groups
+		//prepare prop name sample groups
 		if (grp_parameter) sprintf(szPName, "grp_%s_%d", gf_4cc_to_str(grp_type), grp_parameter);
 		else sprintf(szPName, "grp_%s", gf_4cc_to_str(grp_type));
+		if (grp_flags) {
+			char szPFLags30;
+			sprintf(szPFLags, "_z%x", grp_flags);
+			strcat(szPName, szPFLags);
+		}
 
-		gf_filter_pck_set_property_dyn(pck, szPName, &PROP_DATA((u8*)grp_data, grp_size) );
+		switch (grp_type) {
+		case GF_4CC('P','S','S','H'):
+			gf_filter_pck_set_property(pck, GF_PROP_PID_CENC_PSSH, &PROP_DATA_NO_COPY((u8*)grp_data, grp_size) );
+			break;
+		default:
+			gf_filter_pck_set_property_dyn(pck, szPName, &PROP_DATA_NO_COPY(grp_data, grp_size) );
+			break;
+		}
 	}
 
 	u32 sai_idx=0;
@@ -991,4 +1181,4 @@
 }
 
 
-#endif /*GPAC_DISABLE_ISOM*/
+#endif // !defined(GPAC_DISABLE_ISOM) && !defined(GPAC_DISABLE_MP4DMX)

gpac-2.2.1.tar.gz/src/filters/jsfilter.c -> gpac-2.4.0.tar.gz/src/filters/jsfilter.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2019-2022
+ *			Copyright (c) Telecom ParisTech 2019-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / QuickJS bindings for GF_Filter
@@ -357,6 +357,7 @@
 	.gc_mark = jsf_filter_pck_mark
 };
 
+#ifdef GPAC_USE_DOWNLOADER
 GF_DownloadManager *jsf_get_download_manager(JSContext *c)
 {
 	GF_JSFilterCtx *jsf;
@@ -370,12 +371,16 @@
 	if (!jsf) return NULL;
 	return gf_filter_get_download_manager(jsf->filter);
 }
+#endif //GPAC_USE_DOWNLOADER
 
+#ifndef GPAC_DISABLE_FONTS
 GF_FilterSession *jsff_get_session(JSContext *c, JSValue this_val);
 struct _gf_ft_mgr *gf_fs_get_font_manager(GF_FilterSession *fsess);
+#endif
 
 struct _gf_ft_mgr *jsf_get_font_manager(JSContext *c)
 {
+#ifndef GPAC_DISABLE_FONTS
 	JSValue global = JS_GetGlobalObject(c);
 	JSValue obj;
 
@@ -397,6 +402,7 @@
 		if (jsf)
 			return gf_filter_get_font_manager(jsf->filter);
 	}
+#endif
 	return NULL;
 }
 
@@ -670,7 +676,7 @@
 			*prop = gf_props_parse_value(type, NULL, val_str, NULL, filter ? gf_filter_get_sep(filter, GF_FS_SEP_LIST) : ',');
 		}
 		JS_FreeCString(ctx, val_str);
-		if (prop->type==GF_PROP_FORBIDEN) return GF_BAD_PARAM;
+		if (prop->type==GF_PROP_FORBIDDEN) return GF_BAD_PARAM;
 		return GF_OK;
 	}
 	if (JS_IsBool(value)) {
@@ -1336,7 +1342,7 @@
 	pctx->jsf = jsf;
 	pctx->pid = opid;
 	pctx->jsobj = JS_NewObjectClass(ctx, jsf_pid_class_id);
-	//keep ref to value we destroy it upon pid removal or filter desctruction
+	//keep ref to value we destroy it upon pid removal or filter destruction
 	pctx->jsobj = JS_DupValue(ctx, pctx->jsobj);
 	JS_SetOpaque(pctx->jsobj, pctx);
 	gf_filter_pid_set_udta(pctx->pid, pctx);
@@ -2256,7 +2262,7 @@
 
 	if (pctx->pck_head) {
 		pckctx = pctx->pck_head;
-		assert(pckctx->pck == pck);
+		gf_assert(pckctx->pck == pck);
 		return JS_DupValue(ctx, pckctx->jsobj);
 	}
 
@@ -2740,7 +2746,7 @@
 			JS_FreeValue(ctx, obj);
 			return res;
 		}
-		assert(f_ifce);
+		gf_assert(f_ifce);
 		pckc->pck = gf_filter_pck_new_frame_interface(pctx->pid, f_ifce, pck_del);
 		goto pck_done;
 	}
@@ -2798,7 +2804,7 @@
 		if (mode==1) {
 			e = gf_filter_pid_set_info_dyn(pctx->pid, (char *) name, &prop);
 		} else if (mode==2) {
-			e = gf_filter_pid_negociate_property_dyn(pctx->pid, (char *) name, &prop);
+			e = gf_filter_pid_negotiate_property_dyn(pctx->pid, (char *) name, &prop);
 		} else {
 			e = gf_filter_pid_set_property_dyn(pctx->pid, (char *) name, &prop);
 		}
@@ -2816,7 +2822,7 @@
 		if (mode==1) {
 			e = gf_filter_pid_set_info(pctx->pid, p4cc, the_prop);
 		} else if (mode==2) {
-			e = gf_filter_pid_negociate_property(pctx->pid, p4cc, the_prop);
+			e = gf_filter_pid_negotiate_property(pctx->pid, p4cc, the_prop);
 		} else {
 			e = gf_filter_pid_set_property(pctx->pid, p4cc, the_prop);
 		}
@@ -2835,7 +2841,7 @@
 {
 	return jsf_pid_set_property_ex(ctx, this_val, argc, argv, 1);
 }
-static JSValue jsf_pid_negociate_prop(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+static JSValue jsf_pid_negotiate_prop(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
 {
 	return jsf_pid_set_property_ex(ctx, this_val, argc, argv, 2);
 }
@@ -2954,7 +2960,7 @@
     JS_CFUNC_DEF("reset_props", 0, jsf_pid_reset_props),
     JS_CFUNC_DEF("copy_props", 0, jsf_pid_copy_props),
     JS_CFUNC_DEF("forward", 0, jsf_pid_forward),
-    JS_CFUNC_DEF("negociate_prop", 0, jsf_pid_negociate_prop),
+    JS_CFUNC_DEF("negotiate_prop", 0, jsf_pid_negotiate_prop),
     JS_CFUNC_DEF("ignore_blocking", 0, jsf_pid_ignore_blocking),
 };
 
@@ -4358,7 +4364,7 @@
 	pctx = gf_filter_pid_get_udta(pid);
 
 	if (is_remove) {
-		assert(pctx);
+		gf_assert(pctx);
 		gf_js_lock(jsf->ctx, GF_TRUE);
 		ret = JS_Call(jsf->ctx, jsf->funcsJSF_EVT_REMOVE_PID, jsf->filter_obj, 1, &pctx->jsobj);
 		if (JS_IsException(ret)) {
@@ -4411,6 +4417,7 @@
 		GF_LOG(GF_LOG_ERROR, GF_LOG_SCRIPT, ("%s Error configure pid\n", jsf->log_name));
 		js_dump_error(jsf->ctx);
 		e = GF_BAD_PARAM;
+		gf_filter_abort(filter);
 	}
 	else if (JS_IsInteger(ret))
 			JS_ToInt32(jsf->ctx, (int*)&e, ret);
@@ -4470,7 +4477,7 @@
 	DEF_CONST(GF_PROP_CICP_COL_PRIM)
 	DEF_CONST(GF_PROP_CICP_COL_TFC)
 	DEF_CONST(GF_PROP_CICP_COL_MX)
-
+	DEF_CONST(GF_PROP_CICP_LAYOUT)
 
 	DEF_CONST(GF_FEVT_PLAY)
 	DEF_CONST(GF_FEVT_SET_SPEED)
@@ -4548,7 +4555,7 @@
 	DEF_CONST(GF_IP_NETWORK_EMPTY)
 	DEF_CONST(GF_IP_UDP_TIMEOUT)
 	DEF_CONST(GF_AUTHENTICATION_FAILURE)
-	DEF_CONST(GF_SCRIPT_NOT_READY)
+	DEF_CONST(GF_NOT_READY)
 	DEF_CONST(GF_INVALID_CONFIGURATION)
 	DEF_CONST(GF_NOT_FOUND)
 	DEF_CONST(GF_PROFILE_NOT_SUPPORTED)
@@ -5014,7 +5021,7 @@
 		count = gf_list_count(jsf->filter->session->filters);
 		for (i=0; i<count; i++) {
 			GF_Filter *a_f = gf_list_get(jsf->filter->session->filters, i);
-			if (a_f == jsf->filter) continue;;
+			if (a_f == jsf->filter) continue;
 			jsfs_on_filter_destroyed(a_f);
 		}
 		if (!JS_IsUndefined(jsf->filter->jsval)) {
@@ -5246,7 +5253,7 @@
 };
 
 
-const GF_FilterRegister *jsfilter_register(GF_FilterSession *session)
+const GF_FilterRegister *jsf_register(GF_FilterSession *session)
 {
 	return &JSFilterRegister;
 }
@@ -5269,9 +5276,16 @@
 	return JS_DupValue(ctx, jsf->filter_obj);
 }
 
+GF_Filter *jsf_custom_filter_opaque(JSContext *ctx, JSValueConst this_val)
+{
+	GF_JSFilterCtx *jsf = JS_GetOpaque(this_val, jsf_filter_class_id);
+	if (!jsf || !jsf->is_custom) return NULL;
+	return jsf->filter;
+}
+
 #else
 
-const GF_FilterRegister *jsfilter_register(GF_FilterSession *session)
+const GF_FilterRegister *jsf_register(GF_FilterSession *session)
 {
 	return NULL;
 }

gpac-2.2.1.tar.gz/src/filters/load_bt_xmt.c -> gpac-2.4.0.tar.gz/src/filters/load_bt_xmt.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2022
+ *			Copyright (c) Telecom ParisTech 2000-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / Scene Context loader filter
@@ -29,7 +29,7 @@
 #include <gpac/network.h>
 #include <gpac/nodes_mpeg4.h>
 
-#if !defined(GPAC_DISABLE_VRML) && !defined(GPAC_DISABLE_SCENEGRAPH)
+#if !defined(GPAC_DISABLE_VRML) && !defined(GPAC_DISABLE_SCENEGRAPH) && !defined(GPAC_DISABLE_COMPOSITOR) && !defined(GPAC_DISABLE_SMGR)
 
 typedef struct
 {
@@ -60,11 +60,17 @@
 	u64 pck_time;
 	const char *service_url;
 	Bool is_playing;
-} CTXLoadPriv;
 
+	GF_FileIO *fio;
+	Bool load_file;
+	GF_FilterPacket *pck_ref;
+} CTXLoadPriv;
 
+#ifndef GPAC_DISABLE_COMPOSITOR
 void ODS_SetupOD(GF_Scene *scene, GF_ObjectDescriptor *od);
-
+#else
+#define ODS_SetupOD(_scene, _od)
+#endif
 
 static void CTXLoad_ExecuteConditional(M_Conditional *c, GF_Scene *scene)
 {
@@ -169,7 +175,10 @@
 	//we must have a file path
 	prop = gf_filter_pid_get_property(pid, GF_PROP_PID_FILEPATH);
 	if (!prop || ! prop->value.string) {
-		return GF_NOT_SUPPORTED;
+		if (!priv->load_file) {
+			gf_filter_pid_set_framing_mode(pid, GF_TRUE);
+			priv->load_file = GF_TRUE;
+		}
 	}
 
 	if (!priv->in_pid) {
@@ -188,12 +197,14 @@
 			return GF_REQUIRES_NEW_INSTANCE;
 		}
 		//update of PID filename
-		if (!prop->value.string || !priv->file_name || strcmp(prop->value.string, priv->file_name))
-			return GF_NOT_SUPPORTED;
+		if (prop) {
+			if (!prop->value.string || !priv->file_name || strcmp(prop->value.string, priv->file_name))
+				return GF_NOT_SUPPORTED;
+		}
 		return GF_OK;
 	}
 
-	priv->file_name = prop->value.string;
+	priv->file_name = prop ? prop->value.string : NULL;
 	priv->nb_streams = 1;
 
 	//declare a new output PID of type scene, codecid RAW
@@ -376,6 +387,27 @@
 		return GF_OK;
 	}
 
+	if (priv->load_file) {
+		const GF_PropertyValue *p;
+		pck = gf_filter_pid_get_packet(priv->in_pid);
+		const u8 *data;
+		u32 size;
+		if (!pck) return GF_OK;
+		data = gf_filter_pck_get_data(pck, &size);
+		if (priv->fio) {
+			gf_fclose((FILE*)priv->fio);
+			gf_filter_pck_unref(priv->pck_ref);
+		}
+		p = gf_filter_pid_get_property(priv->in_pid, GF_PROP_PID_URL);
+		priv->fio = gf_fileio_from_mem(p ? p->value.string : NULL, data, size);
+		priv->file_name = gf_fileio_url(priv->fio);
+		priv->pck_ref = pck;
+		gf_filter_pck_ref(&priv->pck_ref);
+		e = ctxload_configure_pid(filter, priv->in_pid, GF_FALSE);
+		priv->load_file = GF_FALSE;
+		if (e) return e;
+	}
+
 	/*something failed*/
 	if (priv->load_flags==3) return GF_EOS;
 
@@ -761,6 +793,13 @@
 
 	if ((priv->load_flags==2) && !updates_pending) {
 		gf_filter_pid_set_eos(priv->out_pid);
+
+		if (priv->fio) {
+			gf_fclose((FILE*)priv->fio);
+			priv->fio = NULL;
+			gf_filter_pck_unref(priv->pck_ref);
+			priv->pck_ref = NULL;
+		}
 		return GF_EOS;
 	}
 	if (!min_next_time_ms) min_next_time_ms = 1;
@@ -779,6 +818,11 @@
 
 	if (priv->ctx) gf_sm_del(priv->ctx);
 	if (priv->files_to_delete) gf_list_del(priv->files_to_delete);
+
+	if (priv->fio) {
+		gf_fclose((FILE*)priv->fio);
+		gf_filter_pck_unref(priv->pck_ref);
+	}
 }
 
 #include <gpac/utf.h>
@@ -787,6 +831,7 @@
 	const char *mime_type = NULL;
 	char *dst = NULL;
 	GF_Err e;
+	u32 probe_size=size;
 	char *res=NULL;
 
 	/* check gzip magic header */
@@ -795,63 +840,62 @@
 		return "btz|bt.gz|xmt.gz|xmtz|wrl.gz|x3dv.gz|x3dvz|x3d.gz|x3dz";
 	}
 
-	e = gf_utf_get_utf8_string_from_bom(probe_data, size, &dst, &res);
+	e = gf_utf_get_string_from_bom(probe_data, size, &dst, &res, &probe_size);
 	if (e) return NULL;
 	probe_data = res;
 
 	//strip all spaces and \r\n
-	while (probe_data0 && strchr("\n\r\t ", (char) probe_data0))
+	while (probe_size && probe_data0 && strchr("\n\r\t ", (char) probe_data0)) {
 		probe_data ++;
+		probe_size--;
+	}
 
 	//for XML, strip doctype, <?xml and comments
 	while (1) {
+		char *search=NULL;
 		if (!strncmp(probe_data, "<!DOCTYPE", 9)) {
-			probe_data = strchr(probe_data, '>');
-			if (!probe_data) goto exit;
-			probe_data++;
-			while (probe_data0 && strchr("\n\r\t ", (char) probe_data0))
-				probe_data ++;
+			search = ">";
 		}
 		//for XML, strip xml header
 		else if (!strncmp(probe_data, "<?xml", 5)) {
-			probe_data = strstr(probe_data, "?>");
-			if (!probe_data) goto exit;
-
-			probe_data += 2;
-			while (probe_data0 && strchr("\n\r\t ", (char) probe_data0))
-				probe_data ++;
+			search = "?>";
 		}
 		else if (!strncmp(probe_data, "");
-			if (!probe_data) goto exit;
-			probe_data += 3;
-			while (probe_data0 && strchr("\n\r\t ", (char) probe_data0))
-				probe_data ++;
+			search = "-->";
 		} else {
 			break;
 		}
+		const char *res = gf_strmemstr(probe_data, probe_size, search);
+		if (!res) goto exit;
+		res += strlen(search);
+		probe_size -= (u32) (res - (char*)probe_data);
+		probe_data = res;
+		while (probe_size && probe_data0 && strchr("\n\r\t ", (char) probe_data0)) {
+			probe_data ++;
+			probe_size--;
+		}
 	}
 	//probe_data is now the first element of the document, if XML
 	//we should refine by getting the xmlns attribute value rather than searching for its value...
 
-	if (strstr(probe_data, "http://www.w3.org/1999/XSL/Transform")
+	if (gf_strmemstr(probe_data, probe_size, "http://www.w3.org/1999/XSL/Transform")
 	) {
 	} else if (!strncmp(probe_data, "<XMT-A", strlen("<XMT-A"))
-		|| strstr(probe_data, "urn:mpeg:mpeg4:xmta:schema:2002")
+		|| gf_strmemstr(probe_data, probe_size, "urn:mpeg:mpeg4:xmta:schema:2002")
 	) {
 		mime_type = "application/x-xmt";
-	} else if (strstr(probe_data, "<X3D")
-		|| strstr(probe_data, "http://www.web3d.org/specifications/x3d-3.0.xsd")
+	} else if (gf_strmemstr(probe_data, probe_size, "<X3D")
+		|| gf_strmemstr(probe_data, probe_size, "http://www.web3d.org/specifications/x3d-3.0.xsd")
 	) {
 		mime_type = "model/x3d+xml";
-	} else if (strstr(probe_data, "<saf")
-		|| strstr(probe_data, "urn:mpeg:mpeg4:SAF:2005")
-		|| strstr(probe_data, "urn:mpeg:mpeg4:LASeR:2005")
+	} else if (gf_strmemstr(probe_data, probe_size, "<saf")
+		|| gf_strmemstr(probe_data, probe_size, "urn:mpeg:mpeg4:SAF:2005")
+		|| gf_strmemstr(probe_data, probe_size, "urn:mpeg:mpeg4:LASeR:2005")
 	) {
 		mime_type = "application/x-LASeR+xml";
 	} else if (!strncmp(probe_data, "<DIMSStream", strlen("<DIMSStream") ) ) {
 		mime_type = "application/dims";
-	} else if (!strncmp(probe_data, "<svg", 4) || strstr(probe_data, "http://www.w3.org/2000/svg") ) {
+	} else if (!strncmp(probe_data, "<svg", 4) || gf_strmemstr(probe_data, probe_size, "http://www.w3.org/2000/svg") ) {
 		mime_type = "image/svg+xml";
 	} else if (!strncmp(probe_data, "<widget", strlen("<widget") ) ) {
 		mime_type = "application/widget";
@@ -867,8 +911,11 @@
 		//get first keyword
 		while (1) {
 			//strip all spaces and \r\n
-			while (probe_data0 && strchr("\n\r\t ", (char) probe_data0))
+			while (probe_size && probe_data0 && strchr("\n\r\t ", (char) probe_data0)) {
 				probe_data ++;
+				probe_size--;
+			}
+			if (!probe_size) goto exit;
 
 			//VRML / XRDV files
 			if (!strncmp(probe_data, "#VRML V2.0", strlen("#VRML V2.0"))) {
@@ -891,10 +938,12 @@
 				break;
 			}
 			//skip line and go one
-			probe_data = strchr(probe_data, '\n');
-			if (!probe_data) goto exit;
+			const char *next = gf_strmemstr(probe_data, probe_size, "\n");
+			if (!next) goto exit;
+			probe_size -= (u32) (next - (char*)probe_data);
+			probe_data = next;
 		}
-		
+
 		if (!strncmp(probe_data, "InitialObjectDescriptor", strlen("InitialObjectDescriptor"))
 			|| !strncmp(probe_data, "EXTERNPROTO", strlen("EXTERNPROTO"))
 			|| !strncmp(probe_data, "PROTO", strlen("PROTO"))
@@ -903,12 +952,11 @@
 			|| !strncmp(probe_data, "Layer2D", strlen("Layer2D"))
 			|| !strncmp(probe_data, "Layer3D", strlen("Layer3D"))
 		) {
-			if (strstr(probe_data, "children"))
+			if (gf_strmemstr(probe_data, probe_size, "children"))
 				mime_type = "application/x-bt";
 		}
 	}
 
-
 exit:
 
 	if (dst) gf_free(dst);
@@ -959,13 +1007,11 @@
 #endif //defined(GPAC_DISABLE_VRML) && !defined(GPAC_DISABLE_SCENEGRAPH)
 
 
-const GF_FilterRegister *ctxload_register(GF_FilterSession *session)
+const GF_FilterRegister *btplay_register(GF_FilterSession *session)
 {
-#if !defined(GPAC_DISABLE_VRML) && !defined(GPAC_DISABLE_SCENEGRAPH)
+#if !defined(GPAC_DISABLE_VRML) && !defined(GPAC_DISABLE_SCENEGRAPH) && !defined(GPAC_DISABLE_COMPOSITOR)  && !defined(GPAC_DISABLE_SMGR)
 	return &CTXLoadRegister;
 #else
 	return NULL;
 #endif
 }
-
-

gpac-2.2.1.tar.gz/src/filters/load_svg.c -> gpac-2.4.0.tar.gz/src/filters/load_svg.c Changed

@@ -2,7 +2,7 @@
  *					GPAC Multimedia Framework
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2005-2022
+ *			Copyright (c) Telecom ParisTech 2005-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / SVG loader filter
@@ -28,7 +28,7 @@
 #include <gpac/scene_manager.h>
 #include <gpac/constants.h>
 
-#if !defined(GPAC_DISABLE_SVG) && !defined(GPAC_DISABLE_ZLIB)
+#if !defined(GPAC_DISABLE_SVG) && !defined(GPAC_DISABLE_ZLIB) && !defined(GPAC_DISABLE_COMPOSITOR)
 
 #include <zlib.h>
 
@@ -48,6 +48,10 @@
 	u32 file_pos;
 	void *src;
 	Bool is_playing;
+
+	GF_FileIO *fio;
+	Bool load_file;
+	GF_FilterPacket *pck_ref;
 } SVGIn;
 
 
@@ -94,6 +98,8 @@
 	return GF_NON_COMPLIANT_BITSTREAM;
 }
 
+static GF_Err svgin_configure_pid(GF_Filter *filter, GF_FilterPid *pid, Bool is_remove);
+
 static GF_Err svgin_process(GF_Filter *filter)
 {
 	Bool start, end;
@@ -112,6 +118,27 @@
 		return GF_OK;
 	}
 
+	if (svgin->load_file) {
+		const GF_PropertyValue *p;
+		pck = gf_filter_pid_get_packet(svgin->in_pid);
+		const u8 *data;
+		u32 size;
+		if (!pck) return GF_OK;
+		data = gf_filter_pck_get_data(pck, &size);
+		if (svgin->fio) {
+			gf_fclose((FILE*)svgin->fio);
+			gf_filter_pck_unref(svgin->pck_ref);
+		}
+		p = gf_filter_pid_get_property(svgin->in_pid, GF_PROP_PID_URL);
+		svgin->fio = gf_fileio_from_mem(p ? p->value.string : NULL, data, size);
+		svgin->file_name = gf_fileio_url(svgin->fio);
+		svgin->pck_ref = pck;
+		gf_filter_pck_ref(&svgin->pck_ref);
+		e = svgin_configure_pid(filter, svgin->in_pid, GF_FALSE);
+		svgin->load_file = GF_FALSE;
+		if (e) return e;
+	}
+
 	switch (svgin->codecid) {
 	/*! streaming SVG*/
 	case GF_CODECID_SVG:
@@ -275,6 +302,14 @@
 		gf_sm_load_done(&svgin->loader);
 		svgin->loader.fileName = NULL;
 		gf_filter_pid_set_eos(svgin->out_pid);
+
+		if (svgin->fio) {
+			gf_fclose((FILE*)svgin->fio);
+			svgin->fio = NULL;
+			gf_filter_pck_unref(svgin->pck_ref);
+			svgin->pck_ref = NULL;
+		}
+
 	}
 	return e;
 }
@@ -302,8 +337,12 @@
 		if (prop && prop->value.string) svgin->file_name = prop->value.string;
 	}
 
-	if (!svgin->codecid && !svgin->file_name)
-		return GF_NOT_SUPPORTED;
+	if (!svgin->codecid && !svgin->file_name) {
+		if (!svgin->load_file) {
+			gf_filter_pid_set_framing_mode(pid, GF_TRUE);
+			svgin->load_file = GF_TRUE;
+		}
+	}
 
 	svgin->loader.type = GF_SM_LOAD_SVG;
 	/* decSpecInfo is not null only when reading from an SVG file (local or distant, cached or not) */
@@ -462,9 +501,9 @@
 #endif
 
 
-const GF_FilterRegister *svgin_register(GF_FilterSession *session)
+const GF_FilterRegister *svgplay_register(GF_FilterSession *session)
 {
-#if !defined(GPAC_DISABLE_SVG) && !defined(GPAC_DISABLE_ZLIB)
+#if !defined(GPAC_DISABLE_SVG) && !defined(GPAC_DISABLE_ZLIB) && !defined(GPAC_DISABLE_COMPOSITOR)
 	return &SVGInRegister;
 #else
 	return NULL;

gpac-2.2.1.tar.gz/src/filters/load_text.c -> gpac-2.4.0.tar.gz/src/filters/load_text.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2022
+ *			Copyright (c) Telecom ParisTech 2000-2024
  *					All rights reserved
  *
  *  This file is part of GPAC / text import filter
@@ -40,7 +40,7 @@
 #include <gpac/internal/swf_dev.h>
 #endif
 
-#if !defined(GPAC_DISABLE_ISOM_WRITE)
+#if !defined(GPAC_DISABLE_ISOM_WRITE) && !defined(GPAC_DISABLE_TXTIN)
 
 #define TTML_NAMESPACE "http://www.w3.org/ns/ttml"
 
@@ -72,7 +72,7 @@
 	Bool ttml_split;
 	GF_Fraction64 ttml_cts;
 	GF_Fraction ttml_dur, stxtdur;
-
+	Double index;
 
 	GF_FilterPid *ipid, *opid;
 	char *file_name;
@@ -90,6 +90,8 @@
 	s32 unicode_type;
 
 	FILE *src;
+	Bool is_temp;
+	GF_FileIO *fio;
 
 	GF_BitStream *bs_w;
 	Bool first_samp;
@@ -138,6 +140,9 @@
 
 	GF_List *intervals;
 	u64 cts_first_interval;
+
+	Bool forced_sub;
+	u32 has_forced;
 };
 
 typedef struct
@@ -166,6 +171,7 @@
 	GF_TXTIN_MODE_SWF_SVG,
 	GF_TXTIN_MODE_SSA,
 	GF_TXTIN_MODE_SIMPLE,
+	GF_TXTIN_MODE_PROBE,
 };
 
 #define REM_TRAIL_MARKS(__str, __sep) while (1) {	\
@@ -175,7 +181,7 @@
 		if (strchr(__sep, __str_len)) __str_len = 0;	\
 		else break;	\
 	}	\
- 
+
 
 s32 gf_text_get_utf_type(GF_TXTIn *ctx, FILE *in_src)
 {
@@ -202,17 +208,27 @@
 		gf_fseek(in_src, 3, SEEK_SET);
 		return 1;
 	}
+	gf_fseek(in_src, 0, SEEK_SET);
+
 	if (BOM0<0x80) {
-		gf_fseek(in_src, 0, SEEK_SET);
 		return 0;
 	}
+	//check if ad-hoc charset is set
 	const char *opt = gf_opts_get_key("core", "charset");
+	if (ctx->ipid) {
+		const GF_PropertyValue *p = gf_filter_pid_get_property(ctx->ipid, GF_PROP_PID_CHARSET);
+		if (p && p->value.string) opt = p->value.string;
+	}
 	if (opt) {
 		if (!stricmp(opt, "utf8") || !stricmp(opt, "utf-8")) return 1;
 		if (!stricmp(opt, "utf16") || !stricmp(opt, "utf-16")) return 2;
 		if (!stricmp(opt, "utf16be") || !stricmp(opt, "utf-16be") || !stricmp(opt, "utf-16-be") || !stricmp(opt, "utf16-be")) return 3;
 		return 0;
 	}
+	//otherwise if we have legal UTF8, assume utf8
+	if (gf_utf8_is_legal(BOM, 2) || gf_utf8_is_legal(BOM, 3) || gf_utf8_is_legal(BOM, 4) ) {
+		return 0;
+	}
 	GF_LOG(GF_LOG_WARNING, GF_LOG_PARSER, ("TXTIn Unknown text encoding for PID %s, defaulting to passthrough - use `-charset` to override\n", gf_filter_pid_get_name(ctx->ipid)));
 	return 0;
 }
@@ -245,7 +261,7 @@
 	} else {
 		val = (u32) gf_fread(szLine, 1024, test);
 		if ((s32) val<0) return GF_IO_ERR;
-		
+
 		szLineval=0;
 	}
 	REM_TRAIL_MARKS(szLine, "\r\n\t ")
@@ -321,7 +337,7 @@
 				}
 				/*UTF8 3 bytes char*/
 				else if ( (szLinei & 0xf0) == 0xe0) {
-					if (j+1 >= GF_ARRAY_LENGTH(szLineConv))
+					if (j+1 >= GF_ARRAY_LENGTH(szLineConv) || i+1 >= len)
 						break;
 					szLineConvj = szLinei;
 					i++;
@@ -332,7 +348,7 @@
 				}
 				/*UTF8 4 bytes char*/
 				else if ( (szLinei & 0xf8) == 0xf0) {
-					if (j+2 >= GF_ARRAY_LENGTH(szLineConv))
+					if (j+2 >= GF_ARRAY_LENGTH(szLineConv) || i+2 >= len)
 						break;
 					szLineConvj = szLinei;
 					i++;
@@ -361,6 +377,10 @@
 			GF_LOG(GF_LOG_DEBUG, GF_LOG_PARSER, ("TXTIn Line too long to convert to utf8 (len: %d)\n", len));
 			j = GF_ARRAY_LENGTH(szLineConv) -1 ;
 		}
+		if ( j >= lineSize ) {
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_PARSER, ("TXTIn UT8 converted line too long for buffer (len: %d, buffer: %d)\n", j, lineSize));
+			j = lineSize-1 ;
+		}
 		szLineConvj = 0;
 		strcpy(szLine, szLineConv);
 		return sOK;
@@ -397,6 +417,7 @@
 {
 	GF_Fraction64 dur;
 	dur.num = 0;
+	if (!ctx->index) return;
 
 	if (ctx->fmt == GF_TXTIN_MODE_SWF_SVG) {
 #ifndef GPAC_DISABLE_SWF_IMPORT
@@ -574,7 +595,7 @@
 	GF_TextSampleDescriptor *sd;
 
 	if (!gen_dsi_only) {
-		if (!ctx->unframed)
+		if (!ctx->unframed && !ctx->src)
 			ctx->src = gf_fopen(ctx->file_name, "rb");
 
 		if (!ctx->src) return GF_URL_ERROR;
@@ -681,6 +702,7 @@
 	dst_pck = gf_filter_pck_new_alloc(ctx->opid, size, &pck_data);
 	if (!dst_pck) return;
 
+	ctx->has_forced |= 4;
 	gf_bs_reassign_buffer(ctx->bs_w, pck_data, size);
 	gf_isom_text_sample_write_bs(txt_samp, ctx->bs_w);
 
@@ -799,7 +821,7 @@
 		if (style_def_type==1)  {
 			/*store prev style*/
 			if (*set_end_c) {
-				assert(*set_start_c);
+				gf_assert(*set_start_c);
 				gf_isom_text_add_style(ctx->samp, &ctx->style);
 				*set_end_c = *set_start_c = GF_FALSE;
 				ctx->style.style_flags &= ~rem_styles;
@@ -922,6 +944,7 @@
 	if (len == GF_UTF8_FAIL) len = 0;
 
 	gf_isom_text_add_text(ctx->samp, szText, len);
+	if (ctx->forced_sub) gf_isom_text_set_forced(ctx->samp, GF_TRUE);
 	*char_l += char_line;
 	return GF_OK;
 }
@@ -933,14 +956,17 @@
 	u32 line;
 	char szLine2048;
 
+	if (ctx->playstate==2)
+		return GF_EOS;
+
 	if (!ctx->is_setup) {
 		ctx->is_setup = GF_TRUE;
 		GF_Err e = txtin_setup_srt(filter, ctx, GF_FALSE);
-		if (e || !ctx->unframed) return e;
+		if (e || (!ctx->unframed && ctx->file_name)) return e;
 	}
 	if (!ctx->opid) return GF_NOT_SUPPORTED;
 
-	if (!ctx->unframed) {
+	if (!ctx->unframed && ctx->file_name) {
 		if (!ctx->playstate) return GF_OK;
 		else if (ctx->playstate==2) return GF_EOS;
 	}
@@ -1062,6 +1088,9 @@
 				ctx->start = ctx->end;
 				ctx->state = 3;
 			}
+			ctx->forced_sub = (strstr(szLine, "!!!")) ? GF_TRUE : GF_FALSE;
+			if (ctx->forced_sub) ctx->has_forced |= 1;
+			else ctx->has_forced &= ~2;
 			break;
 
 		default:
@@ -1083,7 +1112,7 @@
 			return GF_OK;
 	}
 
-	/*final flush*/	
+	/*final flush*/
 	if (!ctx->unframed && ctx->end && ! ctx->noflush) {
 		gf_isom_text_reset(ctx->samp);
 		txtin_process_send_text_sample(ctx, ctx->samp, ctx->end, 0, GF_TRUE);
@@ -1115,7 +1144,13 @@
 {
 	GF_TXTIn *ctx = (GF_TXTIn *)user;
 	if (!ctx->hdr_parsed) {
-		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_DECODER_CONFIG, &PROP_DATA((char *) config, (u32) (1+strlen(config)) ) );
+		u32 len = (u32) strlen(config);
+		//if \n is set, ignore it - this avoids decoder config updates
+		if ((len<=7) && !strncmp(config, "WEBVTT", 6)) {
+			gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_DECODER_CONFIG, &PROP_DATA((u8 *) "WEBVTT", 7) );
+		} else {
+			gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_DECODER_CONFIG, &PROP_DATA((char *) config, (u32) (1+strlen(config)) ) );
+		}
 		ctx->hdr_parsed = GF_TRUE;
 		gf_webvtt_parser_suspend(ctx->vttparser);
 	}
@@ -1165,9 +1200,8 @@
 
 	gf_filter_pid_set_info(ctx->opid, GF_PROP_PID_DOWN_BYTES, &PROP_LONGUINT( gf_ftell(ctx->src )) );
 
-	if (gf_filter_pid_would_block(ctx->opid))
+	if (gf_filter_pid_would_block(ctx->opid) && ctx->file_name)
 		gf_webvtt_parser_suspend(ctx->vttparser);
-
 }
 
 static GF_Err txtin_webvtt_setup(GF_Filter *filter, GF_TXTIn *ctx)
@@ -1177,7 +1211,7 @@
 	Bool is_srt;
 	char *ext;
 
-	if (!ctx->unframed)
+	if (!ctx->unframed && !ctx->src)
 		ctx->src = gf_fopen(ctx->file_name, "rb");
 
 	if (ctx->opid && (ctx->playstate==2)) return GF_EOS;
@@ -1236,10 +1270,14 @@
 	return e;
 }
 
+void gf_webvtt_parser_not_done(GF_WebVTTParser *parser);
+
 static GF_Err txtin_process_webvtt(GF_Filter *filter, GF_TXTIn *ctx, GF_FilterPacket *ipck)
 {
 	GF_Err e;
 
+	if (ctx->playstate==2)
+		return GF_EOS;
 	if (!ctx->is_setup) {
 		ctx->is_setup = GF_TRUE;
 		e = txtin_webvtt_setup(filter, ctx);
@@ -1266,6 +1304,9 @@
 			gf_timestamp_rescale(ctx->end, ctx->timescale, 1000),
 			vtt_pre, vtt_cueid, vtt_settings);
 	} else {
+		if (!ctx->file_name)
+			gf_webvtt_parser_not_done(ctx->vttparser);
+
 		e = gf_webvtt_parser_parse(ctx->vttparser);
 	}
 
@@ -1341,7 +1382,7 @@
 					body_num = gf_list_count(body_node->content);
 					while (body_num--) {
 						GF_XMLNode *content_node = (GF_XMLNode*)gf_list_get(body_node->content, 0);
-						assert(gf_list_find(body_node->content, content_node) == 0);
+						gf_assert(gf_list_find(body_node->content, content_node) == 0);
 						gf_list_rem(body_node->content, 0);
 						gf_xml_dom_node_del(content_node);
 					}
@@ -1352,6 +1393,10 @@
 	}
 }
 
+#endif
+
+#if !defined(GPAC_DISABLE_TXTIN) || !defined(GPAC_DISABLE_TTMLCONV)
+
 u64 ttml_get_timestamp_ex(char *value, u32 tick_rate, u32 *ttml_fps_num, u32 *ttml_fps_den, u32 *ttml_sfps)
 {
 	u32 h, m, s, ms, f, sf;
@@ -1446,6 +1491,11 @@
 	}
 	return ts;
 }
+#endif
+
+
+#if !defined(GPAC_DISABLE_ISOM_WRITE) && !defined(GPAC_DISABLE_TXTIN)
+
 static u64 ttml_get_timestamp(GF_TXTIn *ctx, char *value)
 {
 	return ttml_get_timestamp_ex(value, ctx->tick_rate, &ctx->ttml_fps_num, &ctx->ttml_fps_den, &ctx->ttml_sfps);
@@ -1667,11 +1717,13 @@
 			if (att) {
 				att->name = gf_strdup("src");
 				att->value = gf_strdup(szURN);
+				if (!parent_source_node->attributes) parent_source_node->attributes = gf_list_new();
 				gf_list_add(parent_source_node->attributes, att);
 			}
 			if (!att || !att->value || !att->name) return GF_OUT_OF_MEM;
 			if (data_type) {
 				gf_list_del_item(node->attributes, data_type);
+				if (!parent_source_node->attributes) parent_source_node->attributes = gf_list_new();
 				gf_list_add(parent_source_node->attributes, data_type);
 			}
 			gf_xml_dom_node_reset(parent_source_node, GF_FALSE, GF_TRUE);
@@ -1831,6 +1883,11 @@
 	return GF_OK;
 }
 
+#endif
+
+
+#if !defined(GPAC_DISABLE_TTMLCONV) || !defined(GPAC_DISABLE_TXTIN)
+
 GF_Err ttml_parse_root(GF_XMLNode *root, const char **lang, u32 *tick_rate, u32 *ttml_fps_num, u32 *ttml_fps_den, u32 *ttml_sfps)
 {
 	/*** root (including language) ***/
@@ -1893,11 +1950,14 @@
 	}
 	return GF_OK;
 }
+#endif
+
+#if !defined(GPAC_DISABLE_ISOM_WRITE) && !defined(GPAC_DISABLE_TXTIN)
 
 static GF_Err gf_text_ttml_setup(GF_Filter *filter, GF_TXTIn *ctx)
 {
 	GF_Err e;
-	u32 i, nb_children, ID;
+	u32 i, ID;
 	u64 file_size;
 	GF_XMLNode *root, *node, *body_node;
 	const char *lang = ctx->lang;
@@ -1940,13 +2000,10 @@
 		return e;
 	}
 	//locate body
-	nb_children = gf_list_count(root->content);
 	body_node = NULL;
-
 	i=0;
 	while ( (node = (GF_XMLNode*)gf_list_enum(root->content, &i))) {
 		if (node->type) {
-			nb_children--;
 			continue;
 		}
 		e = gf_xml_get_element_check_namespace(node, "body", root->ns);
@@ -2006,7 +2063,7 @@
 	e = gf_xml_dom_parse(ctx->parser_working_copy, ctx->file_name, NULL, NULL);
 	assert (e == GF_OK);
 	ctx->root_working_copy = gf_xml_dom_get_root(ctx->parser_working_copy);
-	assert(ctx->root_working_copy);
+	if (!ctx->root_working_copy) return GF_NON_COMPLIANT_BITSTREAM;
 
 	if (body_node) {
 		/*remove all the sample entries (instances in body) entries from the working copy, we will add each sample in this clone DOM  to create full XML of each sample*/
@@ -2108,10 +2165,11 @@
 	TTMLInterval *interval;
 	Bool sample_empty = GF_TRUE;
 
+	if (ctx->playstate==2) return GF_EOS;
+
 	if (!ctx->is_setup) return gf_text_ttml_setup(filter, ctx);
 	if (ctx->non_compliant_ttml || !ctx->opid) return GF_NOT_SUPPORTED;
 	if (!ctx->playstate) return GF_OK;
-	else if (ctx->playstate==2) return GF_EOS;
 
 	if (ctx->seek_state==1) {
 		ctx->seek_state = 2;
@@ -2185,7 +2243,7 @@
 					gf_xml_dom_append_child(copy_div_node, prev_child);
 				}
 				e = gf_xml_dom_append_child(copy_div_node, div_child);
-				assert(e == GF_OK);
+				gf_assert(e == GF_OK);
 				has_content = GF_TRUE;
 			}
 
@@ -2228,7 +2286,7 @@
 						gf_xml_dom_append_child(copy_div_node, prev_child);
 					}
 					e = gf_xml_dom_append_child(copy_div_node, div_child);
-					assert(e == GF_OK);
+					gf_assert(e == GF_OK);
 					has_content = GF_TRUE;
 					break;
 				}
@@ -2485,6 +2543,8 @@
 {
 	GF_Err e=GF_OK;
 
+	if (ctx->playstate==2) return GF_EOS;
+
 	if (!ctx->is_setup) {
 		ctx->is_setup = GF_TRUE;
 		return gf_text_swf_setup(filter, ctx);
@@ -2507,7 +2567,7 @@
 	}
 	if (e==GF_EOS) {
 		if (ctx->swf_parse->finalize) {
-			ctx->swf_parse->finalize(ctx->swf_parse);
+			ctx->swf_parse->finalize(ctx->swf_parse, GF_FALSE);
 			ctx->swf_parse->finalize = NULL;
 		}
 	}
@@ -2535,6 +2595,9 @@
 	Double ts_scale;
 	char szLine2048, szTime41, szText2048;
 
+	if (ctx->playstate==2)
+		return GF_EOS;
+
 	//same setup as for srt
 	if (!ctx->is_setup) {
 		ctx->is_setup = GF_TRUE;
@@ -3042,6 +3105,12 @@
 							else if (!stricmp(att->value, "Down")) scroll_mode = GF_TXT_SCROLL_DOWN;
 							td.displayFlags |= ((scroll_mode<<7) & GF_TXT_SCROLL_DIRECTION);
 						}
+						else if (!strcmp(att->name, "forced")) {
+							if (!strcmp(att->value, "yes") || !strcmp(att->value, "true") || !strcmp(att->value, "1"))
+								td.displayFlags |= GF_TXT_SOME_SAMPLES_FORCED;
+							if (!strcmp(att->value, "all"))
+								td.displayFlags |= GF_TXT_ALL_SAMPLES_FORCED|GF_TXT_SOME_SAMPLES_FORCED;
+						}
 					}
 
 					k=0;
@@ -3058,6 +3127,7 @@
 								td.font_count += 1;
 								td.fonts = (GF_FontRecord*)gf_realloc(td.fonts, sizeof(GF_FontRecord)*td.font_count);
 								m=0;
+								td.fontstd.font_count-1.fontName = NULL;
 								while ( (att=(GF_XMLAttribute *)gf_list_enum(ftable->attributes, &m))) {
 									if (!stricmp(att->name, "fontID")) td.fontstd.font_count-1.fontID = atoi(att->value);
 									else if (!stricmp(att->name, "fontName")) td.fontstd.font_count-1.fontName = gf_strdup(att->value);
@@ -3121,6 +3191,8 @@
 	u32 j, k;
 	GF_XMLNode *root, *ext;
 
+	if (ctx->playstate==2) return GF_EOS;
+
 	if (!ctx->is_setup) {
 		ctx->is_setup = GF_TRUE;
 		return txtin_setup_ttxt(filter, ctx);
@@ -3152,6 +3224,7 @@
 		ts = 0;
 		descIndex = 1;
 		ctx->last_sample_empty = GF_TRUE;
+		Bool has_force = GF_FALSE;
 
 		j=0;
 		while ( (att=(GF_XMLAttribute*)gf_list_enum(node->attributes, &j))) {
@@ -3175,7 +3248,15 @@
 			else if (!strcmp(att->name, "scrollDelay")) gf_isom_text_set_scroll_delay(samp, (u32) (1000*atoi(att->value)));
 			else if (!strcmp(att->name, "highlightColor")) gf_isom_text_set_highlight_color(samp, ttxt_get_color(att->value));
 			else if (!strcmp(att->name, "wrap") && !strcmp(att->value, "Automatic")) gf_isom_text_set_wrap(samp, 0x01);
+			else if (!strcmp(att->name, "forced") &&
+				(!strcmp(att->value, "yes") || !strcmp(att->value, "true") || !strcmp(att->value, "1"))
+			) {
+				gf_isom_text_set_forced(samp, GF_TRUE);
+				ctx->has_forced |= 1;
+			}
 		}
+		if (!has_force)
+				ctx->has_forced &= ~2;
 
 		/*get all modifiers*/
 		j=0;
@@ -3389,21 +3470,27 @@
 	u32 ID, OCR_ES_ID, i;
 	u64 file_size;
 	GF_XMLAttribute *att;
-	GF_XMLNode *root;
+	GF_XMLNode *root=NULL;
 
 	ctx->parser = gf_xml_dom_new();
 	e = gf_xml_dom_parse(ctx->parser, ctx->file_name, ttxt_dom_progress, ctx);
 	if (e) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("TXTIn Error parsing TeXML file: Line %d - %s", gf_xml_dom_get_line(ctx->parser), gf_xml_dom_get_error(ctx->parser) ));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("TXTIn Error parsing TeXML file: Line %d - %s\n", gf_xml_dom_get_line(ctx->parser), gf_xml_dom_get_error(ctx->parser) ));
 		gf_xml_dom_del(ctx->parser);
 		ctx->parser = NULL;
 		return e;
 	}
 
 	root = gf_xml_dom_get_root(ctx->parser);
+	if (!root) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("TXTIn Empty TeXML file\n"));
+		gf_xml_dom_del(ctx->parser);
+		ctx->parser = NULL;
+		return GF_NON_COMPLIANT_BITSTREAM;
+	}
 
 	if (strcmp(root->name, "text3GTrack")) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("TXTIn Invalid QT TeXML file - expecting root \"text3GTrack\" got \"%s\"", root->name));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("TXTIn Invalid QT TeXML file - expecting root \"text3GTrack\" got \"%s\"\n", root->name));
 		return GF_NON_COMPLIANT_BITSTREAM;
 	}
 	file_size = ctx->end;
@@ -3852,17 +3939,21 @@
 	return gf_filter_pck_send(opck);
 }
 
+static GF_Err txtin_configure_pid(GF_Filter *filter, GF_FilterPid *pid, Bool is_remove);
+
 static GF_Err txtin_process(GF_Filter *filter)
 {
 	GF_TXTIn *ctx = gf_filter_get_udta(filter);
 	GF_FilterPacket *pck;
 	GF_Err e;
 	Bool start, end;
+	u32 size=0;
+	const u8 *data;
 	pck = gf_filter_pid_get_packet(ctx->ipid);
 	if (pck) ctx->is_loaded = GF_FALSE;
 
 	if (!pck) {
-		if (ctx->unframed) {
+		if (ctx->unframed || !ctx->file_name) {
 			if (gf_filter_pid_is_eos(ctx->ipid)) {
 				if (ctx->end) {
 #ifndef GPAC_DISABLE_VTT
@@ -3885,7 +3976,21 @@
 			return GF_OK;
 	}
 
-	if (ctx->unframed) {
+	data = pck ? gf_filter_pck_get_data(pck, &size) : NULL;
+	if (pck && (!data || !size)) {
+		gf_filter_pid_drop_packet(ctx->ipid);
+		return GF_OK;
+	}
+	if (ctx->is_temp) {
+		const GF_PropertyValue *p = gf_filter_pid_get_property(ctx->ipid, GF_PROP_PID_URL);
+		if (ctx->fio) gf_fclose((FILE*)ctx->fio);
+		ctx->fio = gf_fileio_from_mem(p ? p->value.string : NULL, data, size);
+		ctx->is_temp = GF_FALSE;
+		e = txtin_configure_pid(filter, ctx->ipid, GF_FALSE);
+		if (e) return e;
+	}
+
+	if (ctx->unframed || !ctx->file_name) {
 		if (ctx->simple_text) {
 			e = ctx->text_process(filter, ctx, pck);
 			gf_filter_pid_drop_packet(ctx->ipid);
@@ -3901,10 +4006,12 @@
 				e = GF_IO_ERR;
 			gf_fseek(ctx->src, 0, SEEK_SET);
 			//init state as parsing SRT payload
-			ctx->state = 2;
-			ctx->start = gf_filter_pck_get_cts(pck);
-			ctx->end = ctx->start + gf_filter_pck_get_duration(pck);
-			ctx->curLine = 0;
+			if (ctx->unframed) {
+				ctx->state = 2;
+				ctx->start = gf_filter_pck_get_cts(pck);
+				ctx->end = ctx->start + gf_filter_pck_get_duration(pck);
+				ctx->curLine = 0;
+			}
 
 			if (!e)
 				e = ctx->text_process(filter, ctx, pck);
@@ -3935,8 +4042,13 @@
 		if (pck)
 			gf_filter_pid_drop_packet(ctx->ipid);
 
-		if (gf_filter_pid_is_eos(ctx->ipid))
+		if (gf_filter_pid_is_eos(ctx->ipid)) {
+			if (ctx->has_forced & 4) {
+				if (ctx->has_forced & 2) gf_filter_pid_set_info(ctx->opid, GF_PROP_PID_FORCED_SUB, &PROP_UINT(2));
+				else if (ctx->has_forced & 1) gf_filter_pid_set_info(ctx->opid, GF_PROP_PID_FORCED_SUB, &PROP_UINT(1));
+			}
 			gf_filter_pid_set_eos(ctx->opid);
+		}
 	}
 	return e;
 }
@@ -3963,6 +4075,7 @@
 	u32 codec_id=0;
 	Bool gen_ttxt_dsi=GF_FALSE;
 	Bool gen_webvtt_dsi=GF_FALSE;
+	Bool use_file = GF_FALSE;
 	const char *src = NULL;
 	GF_TXTIn *ctx = gf_filter_get_udta(filter);
 	const GF_PropertyValue *prop;
@@ -4015,43 +4128,57 @@
 		prop = gf_filter_pid_get_property(pid, GF_PROP_PID_FILEPATH);
 		if (prop && prop->value.string) src = prop->value.string;
 
-		if (!src)
-			return GF_NOT_SUPPORTED;
+		if (!src && ctx->fio)
+			src = gf_fileio_url(ctx->fio);
+
+		use_file = src ? GF_TRUE : GF_FALSE;
+		//check if mime is a vtt, if so default to vtt output - for other inputs, we'll use tx3g as usual
+		prop = gf_filter_pid_get_property(pid, GF_PROP_PID_MIME);
+		if (prop && !strcmp(prop->value.string, "subtitle/vtt")) {
+			codec_id = GF_CODECID_WEBVTT;
+		}
 	}
 
 	if (!ctx->ipid) {
 		GF_FilterEvent fevt;
 		ctx->ipid = pid;
 
-		if (src) {
+		if (use_file) {
 			//we work with full file only, send a play event on source to indicate that
 			GF_FEVT_INIT(fevt, GF_FEVT_PLAY, pid);
 			fevt.play.start_range = 0;
 			fevt.base.on_pid = ctx->ipid;
-			fevt.play.full_file_only = GF_TRUE;
+			fevt.play.full_file_only = src ? GF_TRUE : GF_FALSE;
 			gf_filter_pid_send_event(ctx->ipid, &fevt);
-			ctx->file_name = gf_strdup(src);
+			if (ctx->file_name) gf_free(ctx->file_name);
+			ctx->file_name = src ? gf_strdup(src) : NULL;
+
+			if (!src) gf_filter_pid_set_framing_mode(ctx->ipid, GF_TRUE);
 		}
 	} else {
 		if (pid != ctx->ipid) {
 			return GF_REQUIRES_NEW_INSTANCE;
 		}
 		if (src) {
-			if (!strcmp(ctx->file_name, src)) return GF_OK;
+			if (ctx->file_name && !strcmp(ctx->file_name, src)) return GF_OK;
 
 			ttxtin_reset(ctx);
 			ctx->is_setup = GF_FALSE;
-			gf_free(ctx->file_name);
+			if (ctx->file_name) gf_free(ctx->file_name);
 			ctx->file_name = gf_strdup(src);
 		}
 	}
-	if (src) {
-		//guess type
-		e = gf_text_guess_format(ctx, ctx->file_name, &ctx->fmt);
-		if (e) return e;
-		if (!ctx->fmt) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("TXTLoad Unknown text format for %s\n", ctx->file_name));
-			return GF_NOT_SUPPORTED;
+	if (use_file) {
+		if (src) {
+			//guess type
+			e = gf_text_guess_format(ctx, ctx->file_name, &ctx->fmt);
+			if (e) return e;
+			if (!ctx->fmt) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("TXTLoad Unknown text format for %s\n", ctx->file_name));
+				return GF_NOT_SUPPORTED;
+			}
+		} else {
+			ctx->fmt = GF_TXTIN_MODE_PROBE;
 		}
 	} else {
 		if (ctx->vtt_to_tx3g)
@@ -4066,12 +4193,13 @@
 			ctx->fmt = ctx->simple_text ? GF_TXTIN_MODE_SIMPLE : GF_TXTIN_MODE_SRT;
 		if (!ctx->opid)
 			ctx->opid = gf_filter_pid_new(filter);
+		if (!ctx->timescale) ctx->timescale = 1000;
 	}
 
 	if (ctx->webvtt && (ctx->fmt == GF_TXTIN_MODE_SRT))
 		ctx->fmt = GF_TXTIN_MODE_WEBVTT;
 
-	if (!src) {
+	if (!use_file) {
 		gf_filter_pid_copy_properties(ctx->opid, pid);
 		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_STREAM_TYPE, &PROP_UINT(GF_STREAM_TEXT) );
 
@@ -4123,6 +4251,9 @@
 		if (ctx->stxtmod==STXT_MODE_TX3G) gen_ttxt_dsi = 1;
 		else if (ctx->stxtmod==STXT_MODE_VTT) gen_webvtt_dsi = 1;
 		break;
+	case GF_TXTIN_MODE_PROBE:
+		ctx->is_temp = GF_TRUE;
+		break;
 	default:
 		return GF_BAD_PARAM;
 	}
@@ -4133,9 +4264,18 @@
 	if (gen_webvtt_dsi) {
 		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_DECODER_CONFIG, &PROP_DATA((u8 *) "WEBVTT", 7 ) );
 	}
+
+	//when translating from unframed srt/vtt to framed tx3g/vtt, the number of input samples will be at most doubled by inserting blank samples
+	if (ctx->unframed && !ctx->no_empty) {
+		const GF_PropertyValue *p = gf_filter_pid_get_property(ctx->ipid, GF_PROP_PID_NB_FRAMES);
+		if (p)
+			gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_NB_FRAMES, &PROP_UINT(p->value.uint*2));
+	}
+
 	return GF_OK;
 }
 
+
 static Bool txtin_process_event(GF_Filter *filter, const GF_FilterEvent *evt)
 {
 	GF_TXTIn *ctx = gf_filter_get_udta(filter);
@@ -4144,9 +4284,11 @@
 	switch (evt->base.type) {
 	case GF_FEVT_PLAY:
 		if (ctx->playstate==1) return ctx->unframed ? GF_FALSE : GF_TRUE;
-		if ((ctx->playstate==2) && !ctx->unframed)
-			gf_filter_post_process_task(filter);
-
+		if (ctx->playstate==2) {
+			ttxtin_reset(ctx);
+			if (!ctx->unframed)
+				gf_filter_post_process_task(filter);
+		}
 		ctx->playstate = 1;
 		if ((ctx->start_range < 0.1) && (evt->play.start_range<0.1)) return ctx->unframed ? GF_FALSE : GF_TRUE;
 		ctx->start_range = evt->play.start_range;
@@ -4156,8 +4298,6 @@
 
 	case GF_FEVT_STOP:
 		ctx->playstate = 2;
-
-		ttxtin_reset(ctx);
 		ctx->is_setup = GF_FALSE;
 		//cancel play event if we work with full file
 		return ctx->unframed ? GF_FALSE : GF_TRUE;
@@ -4172,7 +4312,7 @@
 	char data1;
 	GF_TXTIn *ctx = gf_filter_get_udta(filter);
 	ctx->bs_w = gf_bs_new(data, 1, GF_BITSTREAM_WRITE);
-
+	ctx->has_forced = 2;
 	return GF_OK;
 }
 
@@ -4181,6 +4321,9 @@
 	GF_TXTIn *ctx = gf_filter_get_udta(filter);
 
 	ttxtin_reset(ctx);
+
+	if (ctx->fio) gf_fclose((FILE*)ctx->fio);
+
 	if (ctx->bs_w) gf_bs_del(ctx->bs_w);
 
 	if (ctx->text_descs) {
@@ -4218,13 +4361,17 @@
 {
 	char *dst = NULL;
 	char *res=NULL;
-	GF_Err e = gf_utf_get_utf8_string_from_bom((char *)data, data_size, &dst, &res);
+	u32 res_size=0;
+
+	GF_Err e = gf_utf_get_string_from_bom((char *)data, data_size, &dst, &res, &res_size);
 	if (e) return NULL;
 
 	data = res;
 	//strip all spaces and \r\n\t
-	while (data0 && strchr("\n\r\t ", (char) data0))
-		data ++;
+	while (data0 && strchr("\n\r\t ", (char) data0)) {
+		data++;
+		res_size--;
+	}
 
 #define PROBE_OK(_score, _mime) \
 		*score = _score;\
@@ -4235,7 +4382,7 @@
 	if (!strncmp(data, "WEBVTT", 6)) {
 		PROBE_OK(GF_FPROBE_SUPPORTED, "subtitle/vtt")
 	}
-	if (strstr(data, " --> ")) {
+	if (gf_strmemstr(data, res_size, " --> ")) {
 		PROBE_OK(GF_FPROBE_MAYBE_SUPPORTED, "subtitle/srt")
 	}
 	if (!strncmp(data, "FWS", 3) || !strncmp(data, "CWS", 3)) {
@@ -4245,23 +4392,23 @@
 		PROBE_OK(GF_FPROBE_MAYBE_SUPPORTED, "subtitle/ssa")
 	}
 
-	if ((data0=='{') && strstr(data, "}{")) {
+	if ((data0=='{') && gf_strmemstr(data, res_size, "}{")) {
 		PROBE_OK(GF_FPROBE_MAYBE_SUPPORTED, "subtitle/sub")
 
 	}
 	/*XML formats*/
-	if (!strstr(data, "?>") ) {
+	if (!gf_strmemstr(data, res_size, "?>") ) {
 		if (dst) gf_free(dst);
 		return NULL;
 	}
 
-	if (strstr(data, "<x-quicktime-tx3g") || strstr(data, "<text3GTrack")) {
+	if (gf_strmemstr(data, res_size, "<x-quicktime-tx3g") || gf_strmemstr(data, res_size, "<text3GTrack")) {
 		PROBE_OK(GF_FPROBE_MAYBE_SUPPORTED, "quicktime/text")
 	}
-	if (strstr(data, "TextStream")) {
+	if (gf_strmemstr(data, res_size, "TextStream")) {
 		PROBE_OK(GF_FPROBE_MAYBE_SUPPORTED, "subtitle/ttxt")
 	}
-	if (strstr(data, "<tt ") || strstr(data, ":tt ")) {
+	if (gf_strmemstr(data, res_size, "<tt ") || gf_strmemstr(data, res_size, ":tt ")) {
 		PROBE_OK(GF_FPROBE_MAYBE_SUPPORTED, "subtitle/ttml")
 	}
 
@@ -4329,10 +4476,11 @@
 	{ OFFS(ttml_zero), "set subtitle zero time for TTML", GF_PROP_STRING, NULL, NULL, GF_FS_ARG_HINT_ADVANCED},
 	{ OFFS(no_empty), "do not send empty samples", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_ADVANCED},
 	{ OFFS(stxtdur), "duration for simple text", GF_PROP_FRACTION, "1", NULL, GF_FS_ARG_HINT_ADVANCED},
-	{ OFFS(stxtmod), "simple text stream mode"
+	{ OFFS(stxtmod), "simple text stream mode\n"
 	"- none: declares output PID as simple text stream\n"
 	"- tx3g: declares output PID as TX3G/Apple stream\n"
 	"- vtt: declares output PID as WebVTT stream", GF_PROP_UINT, "none", "none|tx3g|vtt", GF_FS_ARG_HINT_EXPERT},
+	{ OFFS(index), "indexing window length. If 0, bitstream is not probed for duration. A negative value skips the indexing if the source file is larger than 20M (slows down importers) unless a play with start range > 0 is issued", GF_PROP_DOUBLE, "-1.0", NULL, GF_FS_ARG_HINT_HIDE},
 	{0}
 };
 
@@ -4539,5 +4687,4 @@
 	return NULL;
 }
 
-#endif // GPAC_DISABLE_ISOM_WRITE
-
+#endif // !defined(GPAC_DISABLE_ISOM_WRITE) && !defined(GPAC_DISABLE_TXTIN)

gpac-2.2.1.tar.gz/src/filters/mux_avi.c -> gpac-2.4.0.tar.gz/src/filters/mux_avi.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2018-2022
+ *			Copyright (c) Telecom ParisTech 2018-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / AVI output filter
@@ -188,13 +188,13 @@
 
 		if (type==GF_STREAM_VISUAL) {
 			if (pf != GF_PIXEL_BGR) {
-				gf_filter_pid_negociate_property(pid, GF_PROP_PID_PIXFMT, &PROP_UINT(GF_PIXEL_BGR));
+				gf_filter_pid_negotiate_property(pid, GF_PROP_PID_PIXFMT, &PROP_UINT(GF_PIXEL_BGR));
 				return GF_OK;
 			}
 		} else if (type==GF_STREAM_AUDIO) {
 			p = gf_filter_pid_get_property(pid, GF_PROP_PID_AUDIO_FORMAT);
 			if (!p || (p->value.uint != GF_AUDIO_FMT_S16) ) {
-				gf_filter_pid_negociate_property(pid, GF_PROP_PID_AUDIO_FORMAT, &PROP_UINT(GF_AUDIO_FMT_S16));
+				gf_filter_pid_negotiate_property(pid, GF_PROP_PID_AUDIO_FORMAT, &PROP_UINT(GF_AUDIO_FMT_S16));
 				return GF_OK;
 			}
 			wfmt = WAVE_FORMAT_PCM;
@@ -691,7 +691,7 @@
 
 #endif
 
-const GF_FilterRegister *avimux_register(GF_FilterSession *session)
+const GF_FilterRegister *avimx_register(GF_FilterSession *session)
 {
 #ifndef GPAC_DISABLE_AVILIB
 	return &AVIMuxRegister;

gpac-2.2.1.tar.gz/src/filters/mux_gsf.c -> gpac-2.4.0.tar.gz/src/filters/mux_gsf.c Changed

gpac-2.2.1.tar.gz/src/filters/mux_isom.c -> gpac-2.4.0.tar.gz/src/filters/mux_isom.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2017-2022
+ *			Copyright (c) Telecom ParisTech 2017-2024
  *					All rights reserved
  *
  *  This file is part of GPAC / ISOBMF mux filter
@@ -28,7 +28,7 @@
 #include <gpac/internal/isomedia_dev.h>
 #include <gpac/internal/media_dev.h>
 
-#ifndef GPAC_DISABLE_ISOM_WRITE
+#if !defined(GPAC_DISABLE_ISOM_WRITE) && !defined(GPAC_DISABLE_MP4MX)
 
 #define TEXT_DEFAULT_WIDTH	400
 #define TEXT_DEFAULT_HEIGHT	60
@@ -36,6 +36,7 @@
 
 #define GF_VENDOR_GPAC		GF_4CC('G','P','A','C')
 
+#define GF_IMPORT_AUDIO_SAMPLE_ENTRY_v2_QTFF (GF_IMPORT_AUDIO_SAMPLE_ENTRY_v1_QTFF+1)
 
 #define ISOM_FILE_EXT "mp4|mpg4|m4a|m4i|3gp|3gpp|3g2|3gp2|iso|ismv|m4s|heif|heic|iff|avci|avif|mj2|mov|qt"
 #define ISOM_FILE_MIME "video/mp4|audio/mp4|application/mp4|video/3gpp|audio/3gpp|video/3gp2|audio/3gp2|video/iso.segment|audio/iso.segment|image/heif|image/heic|image/avci|video/jp2|video/quicktime"
@@ -89,6 +90,7 @@
 	u32 dep_id;
 	u32 stsd_idx;
 	u32 clear_stsd_idx;
+	Bool reused_stsd;
 
 	Bool use_dref;
 	Bool aborted;
@@ -123,7 +125,7 @@
 	Bool fragment_done;
 	s32 ts_delay, negctts_shift;
 	Bool insert_tfdt, probe_min_ctts;
-	u64 first_dts_in_seg, next_seg_cts, cts_next;
+	u64 first_dts_in_seg_plus_one, next_seg_cts, cts_next;
 	s64 tfdt_offset;
 	u32 samples_in_frag;
 	Bool patch_tfdt;
@@ -191,8 +193,10 @@
 	u32 dyn_pssh_len;
 
 	Bool sparse_inject;
+	Bool is_chap;
 
 	GF_FilterPacket *dgl_copy;
+	u32 all_stsd_crc;
 } TrackWriter;
 
 enum
@@ -242,6 +246,23 @@
 	MP4MX_CMAF_CMF2,
 };
 
+enum
+{
+	MP4MX_CHAPM_OFF=0,
+	MP4MX_CHAPM_TRACK,
+	MP4MX_CHAPM_UDTA,
+	MP4MX_CHAPM_BOTH
+};
+
+enum
+{
+	MP4MX_UNCV_OFF=0,
+	MP4MX_UNCV_NOPROF,
+	MP4MX_UNCV_PROF,
+	MP4MX_UNCV_PROF_ONLY
+};
+
+
 typedef struct
 {
 	//filter args
@@ -281,6 +302,7 @@
 	Bool fcomp, otyp;
 	Bool deps;
 	Bool mvex;
+	Bool trunv1;
 	u32 sdtp_traf;
 	u32 cmaf;
 #ifdef GF_ENABLE_CTRN
@@ -288,12 +310,16 @@
 	Bool ctrni;
 #endif
 	Bool mfra;
+	u32 uncv;
 	Bool forcesync, refrag, pad_sparse;
-	Bool force_dv, tsalign;
+	Bool force_dv, tsalign, dvsingle, patch_dts;
 	u32 itags;
 	Double start;
+	u32 chapm;
+
 
 	//internal
+	GF_Filter *filter;
 	Bool owns_mov;
 	GF_FilterPid *opid;
 	Bool first_pck_sent;
@@ -314,6 +340,8 @@
 	GF_FilterPacket *dst_pck;
 	char *seg_name;
 	u32 dash_seg_num_plus_one;
+	GF_Fraction64 dash_seg_start;
+
 	Bool flush_seg;
 	u32 eos_marker;
 	TrackWriter *ref_tkw;
@@ -374,8 +402,17 @@
 	u32 wait_dts_timescale;
 	Bool force_seg_sync;
 	u32 seg_flush_state;
+	u32 last_block_in_segment;
 	u64 flush_idx_start_range, flush_idx_end_range;
 	Bool flush_ll_hls;
+
+	Bool has_def_vid, has_def_aud, has_def_txt;
+
+	//created from chapters prop
+	u32 chap_track_num;
+	Bool has_chap_tracks;
+
+	GF_List *ref_pcks;
 } GF_MP4MuxCtx;
 
 static void mp4_mux_update_init_edit(GF_MP4MuxCtx *ctx, TrackWriter *tkw, u64 min_ts_service, Bool skip_adjust);
@@ -609,11 +646,19 @@
 {
 	GF_MP4MuxCtx *ctx = (GF_MP4MuxCtx *) udta;
 	u32 i, count;
+
+	if (ctx->chap_track_num==old_track_num) {
+		ctx->chap_track_num = new_track_num;
+		return;
+	}
 	count = gf_list_count(ctx->tracks);
 	for (i=0; i<count; i++) {
 		TrackWriter *tkw = gf_list_get(ctx->tracks, i);
+		if (!tkw->track_id) continue;
 		if (tkw->track_num==old_track_num) {
 			tkw->track_num = new_track_num;
+			//prevent any further changes, trackID is restored in mp4mux_reorder_tracks
+			tkw->track_id = 0;
 			return;
 		}
 	}
@@ -627,6 +672,9 @@
 	count = gf_list_count(ctx->tracks);
 	for (i=0; i<count; i++) {
 		TrackWriter *tkw = gf_list_get(ctx->tracks, i);
+		if (!tkw->track_id)
+			tkw->track_id = gf_isom_get_track_id(ctx->file, tkw->track_num);
+
 		if (tkw->track_num<prev_num) {
 			gf_list_insert(new_tracks, tkw, prev_pos);
 		} else {
@@ -643,6 +691,28 @@
 	ctx->tracks = new_tracks;
 }
 
+static void mp4mx_set_track_group(GF_MP4MuxCtx *ctx, TrackWriter *tkw, char *name, const GF_PropertyValue *p)
+{
+	s32 grp_id=0;
+	u32 grp_type;
+	u32 len = (u32) strlen(name);
+	Bool do_add=GF_TRUE;
+	if (len!=4) return;
+
+	if ((p->type==GF_PROP_STRING) || (p->type==GF_PROP_NAME)) {
+		grp_id = atoi(p->value.string);
+	} else {
+		grp_id = p->value.sint;
+	}
+	if (grp_id<0) {
+		grp_id = -grp_id;
+		do_add = GF_FALSE;
+	}
+	grp_type = GF_4CC(name0, name1, name2, name3);
+	gf_isom_set_track_group(ctx->file, tkw->track_num, grp_id, grp_type, do_add);
+}
+
+
 #include <gpac/revision.h>
 static void mp4_mux_set_tags(GF_MP4MuxCtx *ctx, TrackWriter *tkw)
 {
@@ -675,6 +745,11 @@
 		if (!tag_name)
 			continue;
 
+		if (!strncmp(tag_name, "tkgp_", 5)) {
+			mp4mx_set_track_group(ctx, tkw, (char*) tag_name+5, tag);
+			continue;
+		}
+
 		tag_idx = gf_itags_find_by_name(tag_name);
 		if (tag_idx>=0) {
 			itag = gf_itags_get_itag(tag_idx);
@@ -736,6 +811,10 @@
 			}
 		}
 
+		if (itag==GF_ISOM_ITUNE_TOOL) {
+			continue;
+		}
+
 		switch (tag->type) {
 		case GF_PROP_STRING:
 		case GF_PROP_NAME:
@@ -828,6 +907,22 @@
 	}
 }
 
+static void update_chap_refs(GF_MP4MuxCtx *ctx)
+{
+	u32 i, j, count = gf_list_count(ctx->tracks);
+	for (i=0; i<count; i++) {
+		TrackWriter *tkw = gf_list_get(ctx->tracks, i);
+		if (!tkw->is_chap) continue;
+		for (j=0; j<count; j++) {
+			TrackWriter *atkw = gf_list_get(ctx->tracks, j);
+			if (atkw->is_chap) continue;
+			if ((atkw->stream_type==GF_STREAM_AUDIO) || (atkw->stream_type==GF_STREAM_VISUAL))
+				gf_isom_set_track_reference(ctx->file, atkw->track_num, GF_ISOM_REF_CHAP, tkw->track_id);
+		}
+	}
+}
+
+
 
 static GF_Err mp4_mux_setup_pid(GF_Filter *filter, GF_FilterPid *pid, Bool is_true_pid)
 {
@@ -858,15 +953,15 @@
 	u32 m_subtype=0;
 	u32 m_subtype_src=0;
 	u32 m_subtype_alt_raw=0;
-	u32 raw_bitdepth=0;
 	u32 override_stype=0;
 	u32 width, height, sr, nb_chan, nb_bps, z_order, txt_fsize;
+	u32 afmt_flags = 0;
 	u64 ch_layout;
 	GF_Fraction fps, sar;
 	GF_List *multi_pid_stsd = NULL;
 	u32 multi_pid_idx = 0;
 	GF_FilterPid *orig_pid = NULL;
-	u32 codec_id;
+	u32 codec_id, pix_fmt=0;
 	u32 frames_per_sample_backup=0;
 	u32 is_nalu_backup = NALU_NONE;
 	Bool is_tile_base = GF_FALSE;
@@ -913,6 +1008,12 @@
 			}
 			gf_free(dst);
 		}
+	} else {
+		const char *fname = gf_isom_get_filename(ctx->file);
+		char *ext = fname ? gf_file_ext_start(fname) : NULL;
+		if (ext && (!stricmp(ext, ".mov") || !stricmp(ext, ".qt")) ) {
+			ctx->make_qt = 1;
+		}
 	}
 	//copy properties at init or reconfig
 	if (ctx->opid && is_true_pid) {
@@ -927,13 +1028,10 @@
 		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_STREAM_TYPE, &PROP_UINT(GF_STREAM_FILE) );
 
 		mux_assign_mime_file_ext(pid, ctx->opid, ISOM_FILE_EXT, ISOM_FILE_MIME, NULL);
-		
+
 		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_DASH_MODE, NULL);
 		//we dispatch timing in milliseconds
 		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_TIMESCALE, &PROP_UINT(1000));
-		p = gf_filter_pid_get_property(pid, GF_PROP_PID_STREAM_TYPE);
-		if (p)
-			gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_ORIG_STREAM_TYPE, &PROP_UINT(p->value.uint));
 
 		switch (ctx->store) {
 		case MP4MX_MODE_FLAT:
@@ -983,7 +1081,7 @@
 		GF_FilterEvent evt;
 		GF_SAFEALLOC(tkw, TrackWriter);
 		if (!tkw) return GF_OUT_OF_MEM;
-		
+
 		gf_list_add(ctx->tracks, tkw);
 		tkw->ipid = pid;
 		tkw->fake_track = !is_true_pid;
@@ -1109,6 +1207,7 @@
 	case GF_CODECID_EAC3:
 	case GF_CODECID_OPUS:
 	case GF_CODECID_TRUEHD:
+	case GF_CODECID_RAW_UNCV:
 		if (!dsi && !enh_dsi) return GF_OK;
 		break;
 	case GF_CODECID_APCH:
@@ -1131,6 +1230,16 @@
 	case GF_CODECID_DVB_SUBS:
 		if (!dsi && !enh_dsi) return GF_OK;
 		break;
+	case GF_CODECID_RAW:
+		if (tkw->stream_type==GF_STREAM_VISUAL) {
+			p = gf_filter_pid_get_property(pid, GF_PROP_PID_PIXFMT);
+			if (!p) return GF_OK;
+		}
+		if (tkw->stream_type==GF_STREAM_AUDIO) {
+			p = gf_filter_pid_get_property(pid, GF_PROP_PID_AUDIO_FORMAT);
+			if (!p) return GF_OK;
+		}
+		break;
 	default:
 		break;
 	}
@@ -1328,7 +1437,7 @@
 			if (!ctx->owns_mov) {
 				u32 nb_dst_tk = gf_isom_get_track_count(ctx->file);
 				if (tk_idx < nb_dst_tk) {
-					tk_idx = nb_dst_tk;
+					//tk_idx = nb_dst_tk;
 				}
 			}
 		}
@@ -1368,6 +1477,16 @@
 			if (!ctx->btrt) {
 				gf_isom_update_bitrate(ctx->file, tkw->track_num, 0, 0, 0, 0);
 			}
+			if (!udta_only) {
+				GF_Err gf_isom_set_track_stsd_templates(GF_ISOFile *movie, u32 trackNumber, u8 *stsd_data, u32 stsd_data_size);
+
+				p = gf_filter_pid_get_property(pid, GF_PROP_PID_ISOM_STSD_ALL_TEMPLATES);
+				if (p) {
+					gf_isom_set_track_stsd_templates(ctx->file, tkw->track_num, p->value.data.ptr, p->value.data.size);
+					tkw->all_stsd_crc = gf_crc_32(p->value.data.ptr, p->value.data.size);
+				}
+			}
+
 		} else {
 			if (!mtype) {
 				mtype = GF_4CC('u','n','k','n');
@@ -1407,31 +1526,55 @@
 		}
 		tkw->track_id = gf_isom_get_track_id(ctx->file, tkw->track_num);
 
+		Bool is_disabled = GF_FALSE;
+		//cmaf mandates these flags and only them are set
 		if (ctx->cmaf) {
 			gf_isom_set_track_flags(ctx->file, tkw->track_num, GF_ISOM_TK_ENABLED|GF_ISOM_TK_IN_MOVIE|GF_ISOM_TK_IN_PREVIEW, GF_ISOM_TKFLAGS_SET);
 		}
-		//unless in test mode or old arch compat, set track to be enabled, in movie and in preview
-		else if (!gf_sys_is_test_mode() && !gf_sys_old_arch_compat()) {
-			gf_isom_set_track_flags(ctx->file, tkw->track_num, GF_ISOM_TK_IN_MOVIE|GF_ISOM_TK_IN_PREVIEW, GF_ISOM_TKFLAGS_SET);
-		}
+		else {
+			//unless in test mode or old arch compat, set track to be enabled, in movie and in preview
+			if (!gf_sys_is_test_mode() && !gf_sys_old_arch_compat()) {
+				gf_isom_set_track_flags(ctx->file, tkw->track_num, GF_ISOM_TK_IN_MOVIE|GF_ISOM_TK_IN_PREVIEW, GF_ISOM_TKFLAGS_SET);
+			}
 
-		//override flags if provided
-		p = gf_filter_pid_get_property(tkw->ipid, GF_PROP_PID_ISOM_TRACK_FLAGS);
-		if (p) {
-			gf_isom_set_track_flags(ctx->file, tkw->track_num, p->value.uint, GF_ISOM_TKFLAGS_SET);
-		} else {
-			gf_isom_set_track_enabled(ctx->file, tkw->track_num, GF_TRUE);
+			//override flags if provided
+			p = gf_filter_pid_get_property(tkw->ipid, GF_PROP_PID_ISOM_TRACK_FLAGS);
+			if (p) {
+				gf_isom_set_track_flags(ctx->file, tkw->track_num, p->value.uint, GF_ISOM_TKFLAGS_SET);
+			} else {
+				gf_isom_set_track_enabled(ctx->file, tkw->track_num, GF_TRUE);
+			}
+
+			p = gf_filter_pid_get_property(tkw->ipid, GF_PROP_PID_DISABLED);
+			if (p && p->value.boolean) {
+				gf_isom_set_track_enabled(ctx->file, tkw->track_num, GF_FALSE);
+				is_disabled = GF_TRUE;
+			}
 		}
-		p = gf_filter_pid_get_property(tkw->ipid, GF_PROP_PID_DISABLED);
-		if (p && p->value.boolean)
-			gf_isom_set_track_enabled(ctx->file, tkw->track_num, GF_FALSE);
 
 		//if we have a subtype set for the pid, use it
-		p = gf_filter_pid_get_property(pid, GF_PROP_PID_SUBTYPE);
-		if (p) {
-			mtype = p->value.uint;
-			gf_isom_set_media_type(ctx->file, tkw->track_num, mtype);
+		p = NULL;
+		if ((tkw->stream_type==GF_STREAM_TEXT) && (tkw->codecid==GF_CODECID_TX3G)) {
+			p = gf_filter_pid_get_property(pid, GF_PROP_PID_IS_CHAP);
+			if (p && p->value.boolean) {
+				mtype = GF_ISOM_MEDIA_TEXT;
+				gf_isom_set_media_type(ctx->file, tkw->track_num, mtype);
+				tkw->is_chap = GF_TRUE;
+				ctx->has_chap_tracks = GF_TRUE;
+				gf_isom_set_track_enabled(ctx->file, tkw->track_num, GF_FALSE);
+			} else {
+				p = NULL;
+			}
+		}
+		if (!p) {
+			p = gf_filter_pid_get_property(pid, GF_PROP_PID_SUBTYPE);
+			if (p) {
+				mtype = p->value.uint;
+				gf_isom_set_media_type(ctx->file, tkw->track_num, mtype);
+			}
 		}
+		if (ctx->has_chap_tracks)
+			update_chap_refs(ctx);
 
 		p = gf_filter_pid_get_property(tkw->ipid, GF_PROP_PID_ISOM_HANDLER);
 		if (p && p->value.string) {
@@ -1451,6 +1594,43 @@
 			}
 		}
 
+		//check if we have default flag set
+		if (!is_disabled && !ctx->cmaf) {
+			Bool *has_def = NULL;
+			if (tkw->stream_type==GF_STREAM_VISUAL) has_def = &ctx->has_def_vid;
+			else if (tkw->stream_type==GF_STREAM_AUDIO) has_def = &ctx->has_def_aud;
+			else if (tkw->stream_type==GF_STREAM_TEXT) has_def = &ctx->has_def_txt;
+
+			Bool set_def = GF_FALSE;
+			Bool set_all_def = GF_FALSE;
+			p = gf_filter_pid_get_property(tkw->ipid, GF_PROP_PID_IS_DEFAULT);
+			//first track of this kind set to default, deactivate all except this track
+			if (has_def && ! *has_def && p && p->value.boolean) {
+				*has_def = GF_TRUE;
+				set_def = GF_TRUE;
+			}
+			//second or more track of this kind set to default, re-activate all
+			else if (has_def && *has_def && p && p->value.boolean) {
+				set_all_def = GF_TRUE;
+			}
+			if (set_def || set_all_def) {
+				u32 nb_tk = gf_list_count(ctx->tracks);
+				for (i=0; i<nb_tk; i++) {
+					TrackWriter *atk = gf_list_get(ctx->tracks, i);
+					if (atk->stream_type != tkw->stream_type) continue;
+					if (set_all_def || (tkw == atk)) {
+						gf_isom_set_track_flags(ctx->file, atk->track_num, GF_ISOM_TK_IN_MOVIE|GF_ISOM_TK_IN_PREVIEW, GF_ISOM_TKFLAGS_ADD);
+					} else {
+						gf_isom_set_track_flags(ctx->file, atk->track_num, GF_ISOM_TK_IN_MOVIE|GF_ISOM_TK_IN_PREVIEW, GF_ISOM_TKFLAGS_REM);
+					}
+				}
+			}
+			//no default prop and a default exists for this kind, update flags
+			else if (has_def && *has_def) {
+				gf_isom_set_track_flags(ctx->file, tkw->track_num, GF_ISOM_TK_IN_MOVIE|GF_ISOM_TK_IN_PREVIEW, GF_ISOM_TKFLAGS_REM);
+			}
+		}
+
 		p = gf_filter_pid_get_property(tkw->ipid, GF_PROP_PID_ISOM_TRACK_MATRIX);
 		if (p && (p->value.sint_list.nb_items==9)) {
 			gf_isom_set_track_matrix(ctx->file, tkw->track_num, (s32 *) p->value.sint_list.vals);
@@ -1497,9 +1677,10 @@
 			}
 		}
 
+#ifndef GPAC_DISABLE_ISOM_FRAGMENTS
 		if (ctx->sgpd_traf)
 			gf_isom_set_sample_group_in_traf(ctx->file);
-
+#endif
 		if (ctx->noroll) {
 			gf_isom_remove_sample_group(ctx->file, tkw->track_num, GF_ISOM_SAMPLE_GROUP_ROLL);
 		}
@@ -1538,18 +1719,28 @@
 	}
 
 	if (!tkw->has_brands) {
+		Bool ignore_alt = GF_FALSE;
 		Bool is_isom = GF_FALSE;
 		p = gf_filter_pid_get_property(pid, GF_PROP_PID_ISOM_MBRAND);
 		if (p) {
-			if (!ctx->major_brand_set) {
-				gf_isom_set_brand_info(ctx->file, p->value.uint, 1);
-				ctx->major_brand_set = p->value.uint;
+			u32 brand = p->value.uint;
+			//remove QT brand
+			if ((brand==GF_ISOM_BRAND_QT) && !ctx->make_qt) {
+				is_isom = GF_TRUE;
+				ctx->major_brand_set = brand = GF_ISOM_BRAND_ISOM;
+				gf_isom_set_brand_info(ctx->file, brand, 1);
+				gf_isom_modify_alternate_brand(ctx->file, GF_ISOM_BRAND_QT, GF_FALSE);
+				ignore_alt = GF_TRUE;
+			}
+			else if (!ctx->major_brand_set) {
+				gf_isom_set_brand_info(ctx->file, brand, 1);
+				ctx->major_brand_set = brand;
 			} else {
-				gf_isom_modify_alternate_brand(ctx->file, p->value.uint, GF_TRUE);
+				gf_isom_modify_alternate_brand(ctx->file, brand, GF_TRUE);
 			}
 			if (p->value.uint == GF_ISOM_BRAND_ISOM) is_isom = GF_TRUE;
 		}
-		p = gf_filter_pid_get_property(pid, GF_PROP_PID_ISOM_BRANDS);
+		p = ignore_alt ? NULL : gf_filter_pid_get_property(pid, GF_PROP_PID_ISOM_BRANDS);
 		if (p && p->value.uint_list.nb_items) {
 			tkw->has_brands = GF_TRUE;
 			if (!ctx->major_brand_set) {
@@ -1588,7 +1779,7 @@
 		multi_pid_stsd = p->value.ptr;
 
 		p = gf_filter_pid_get_property(tkw->ipid, GF_PROP_PID_DASH_MULTI_PID_IDX);
-		assert(p);
+		gf_fatal_assert(p);
 		multi_pid_final_stsd_idx = p->value.uint;
 
 		//should never be the case
@@ -1983,17 +2174,27 @@
 		break;
 
 	case GF_CODECID_DTS_CA:
-	case GF_CODECID_DTS_X:
-	case GF_CODECID_DTS_HD_HR:
-	case GF_CODECID_DTS_HD_MASTER:
-	case GF_CODECID_DTS_LBR:
 		m_subtype = GF_ISOM_SUBTYPE_DTSC;
 		break;
+	case GF_CODECID_DTS_HD_HR_MASTER:
+		m_subtype = GF_ISOM_SUBTYPE_DTSH;
+		break;
+	case GF_CODECID_DTS_HD_LOSSLESS:
+		m_subtype = GF_ISOM_SUBTYPE_DTSL;
+		break;
+	case GF_CODECID_DTS_EXPRESS_LBR:
+		m_subtype = GF_ISOM_SUBTYPE_DTSE;
+		break;
+	case GF_CODECID_DTS_X:
+		m_subtype = GF_ISOM_SUBTYPE_DTSX;
+		break;
+	case GF_CODECID_DTS_Y:
+		m_subtype = GF_ISOM_SUBTYPE_DTSY;
+		break;
 	case GF_CODECID_ALAC:
 		m_subtype = GF_QT_SUBTYPE_ALAC;
 		break;
 
-
 	case GF_CODECID_BIFS:
 /* ==  GF_CODECID_OD_V1:*/
 	case GF_CODECID_BIFS_V2:
@@ -2012,17 +2213,22 @@
 		if (tkw->stream_type == GF_STREAM_AUDIO) {
 			u32 afmt;
 			u32 req_non_planar_type = 0;
+			Bool qt_only=GF_FALSE;
 			p = gf_filter_pid_get_property(pid, GF_PROP_PID_AUDIO_FORMAT);
 			if (!p) break;
 			comp_name = "RawAudio";
 			unknown_generic = GF_FALSE;
+
 			afmt = p->value.uint;
+			afmt_flags |= 1<<2; //signed
 			//m_subtype used for QTFF-style raw media, m_subtype_alt_raw for ISOBMFF raw audio
 			switch (afmt) {
 			case GF_AUDIO_FMT_U8P:
 			 	req_non_planar_type = GF_AUDIO_FMT_U8;
 			case GF_AUDIO_FMT_U8:
 				m_subtype = GF_QT_SUBTYPE_RAW;
+				afmt_flags &= ~(1<<2); //unsigned
+				qt_only = GF_TRUE;
 				break;
 			case GF_AUDIO_FMT_S16P:
 			 	req_non_planar_type = GF_AUDIO_FMT_S16;
@@ -2031,7 +2237,9 @@
 				m_subtype_alt_raw = GF_ISOM_SUBTYPE_IPCM;
 				break;
 			case GF_AUDIO_FMT_S16_BE:
+				afmt_flags |= 1<<1;
 				m_subtype = GF_QT_SUBTYPE_TWOS;
+				m_subtype_alt_raw = GF_ISOM_SUBTYPE_IPCM;
 				break;
 			case GF_AUDIO_FMT_S24P:
 			 	req_non_planar_type = GF_AUDIO_FMT_S24;
@@ -2039,39 +2247,72 @@
 				m_subtype = GF_QT_SUBTYPE_IN24;
 				m_subtype_alt_raw = GF_ISOM_SUBTYPE_IPCM;
 				break;
+			case GF_AUDIO_FMT_S24_BE:
+				afmt_flags |= 1<<1;
+				m_subtype = GF_QT_SUBTYPE_IN24;
+				m_subtype_alt_raw = GF_ISOM_SUBTYPE_IPCM;
+				break;
 			case GF_AUDIO_FMT_S32P:
 			 	req_non_planar_type = GF_AUDIO_FMT_S32P;
 			case GF_AUDIO_FMT_S32:
 				m_subtype = GF_QT_SUBTYPE_IN32;
 				m_subtype_alt_raw = GF_ISOM_SUBTYPE_IPCM;
 				break;
+			case GF_AUDIO_FMT_S32_BE:
+				afmt_flags |= 1<<1;
+				m_subtype = GF_QT_SUBTYPE_IN32;
+				m_subtype_alt_raw = GF_ISOM_SUBTYPE_IPCM;
+				break;
 			case GF_AUDIO_FMT_FLTP:
 			 	req_non_planar_type = GF_AUDIO_FMT_FLTP;
 			case GF_AUDIO_FMT_FLT:
 				m_subtype = GF_QT_SUBTYPE_FL32;
 				m_subtype_alt_raw = GF_ISOM_SUBTYPE_FPCM;
+				afmt_flags |= 1;
+				break;
+			case GF_AUDIO_FMT_FLT_BE:
+				afmt_flags |= 1<<1;
+				m_subtype = GF_QT_SUBTYPE_FL32;
+				m_subtype_alt_raw = GF_ISOM_SUBTYPE_FPCM;
+				afmt_flags |= 1;
 				break;
 			case GF_AUDIO_FMT_DBLP:
 			 	req_non_planar_type = GF_AUDIO_FMT_DBL;
 			case GF_AUDIO_FMT_DBL:
 				m_subtype = GF_QT_SUBTYPE_FL64;
 				m_subtype_alt_raw = GF_ISOM_SUBTYPE_FPCM;
+				afmt_flags |= 1;
+				break;
+			case GF_AUDIO_FMT_DBL_BE:
+				afmt_flags |= 1<<1;
+				m_subtype = GF_QT_SUBTYPE_FL64;
+				m_subtype_alt_raw = GF_ISOM_SUBTYPE_FPCM;
+				afmt_flags |= 1;
 				break;
 			default:
 				unknown_generic = GF_TRUE;
 				m_subtype = p->value.uint;
 				break;
 			}
+
+			if (ctx->make_qt && (ase_mode==GF_IMPORT_AUDIO_SAMPLE_ENTRY_v2_QTFF)) {
+				m_subtype = GF_QT_SUBTYPE_LPCM;
+			}
+			//if qt-only sample desc available, force ase mode
+			else if (!ctx->make_qt && qt_only) {
+				ase_mode = GF_IMPORT_AUDIO_SAMPLE_ENTRY_v1_QTFF;
+			}
+
 			if (req_non_planar_type) {
 				if (is_true_pid)
-					gf_filter_pid_negociate_property(pid, GF_PROP_PID_AUDIO_FORMAT, &PROP_UINT(GF_AUDIO_FMT_S16));
+					gf_filter_pid_negotiate_property(pid, GF_PROP_PID_AUDIO_FORMAT, &PROP_UINT(GF_AUDIO_FMT_S16));
 				else {
 					GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("MP4Mux raw audio format planar in DASH multi-stsd mode is not supported, try assigning a resampler before the dasher\n"));
 					return GF_NOT_SUPPORTED;
 				}
 			}
-			raw_bitdepth = gf_audio_fmt_bit_depth(afmt);
-			tkw->raw_audio_bytes_per_sample = raw_bitdepth;
+			nb_bps = gf_audio_fmt_bit_depth(afmt);
+			tkw->raw_audio_bytes_per_sample = nb_bps;
 			tkw->raw_audio_bytes_per_sample *= nb_chan;
 			tkw->raw_audio_bytes_per_sample /= 8;
 			p = gf_filter_pid_get_property(pid, GF_PROP_PID_SAMPLE_RATE);
@@ -2098,14 +2339,15 @@
 			comp_name = "RawVideo";
 			unknown_generic = GF_FALSE;
 			tkw->skip_bitrate_update = GF_TRUE;
+			pix_fmt = p->value.uint;
 
-			m_subtype = gf_pixel_fmt_to_qt_type(p->value.uint);
+			m_subtype = gf_pixel_fmt_to_qt_type(pix_fmt);
 			if (m_subtype) {
 				if (gf_pixel_fmt_is_yuv(p->value.uint))
 					force_colr = GF_TRUE;
 			} else {
 				unknown_generic = GF_TRUE;
-				m_subtype = p->value.uint;
+				m_subtype = pix_fmt;
 			}
 
 			if ((width == tkw->w_or_sr) && (height==tkw->h_or_ch) && (pfmt==tkw->pf_or_af)) {
@@ -2120,6 +2362,13 @@
 		}
 		break;
 
+	case GF_CODECID_RAW_UNCV:
+		m_subtype = GF_ISOM_SUBTYPE_UNCV;
+		unknown_generic = GF_FALSE;
+		use_gen_sample_entry = GF_TRUE;
+		use_m4sys = GF_FALSE;
+		break;
+
 	default:
 		m_subtype = codec_id;
 		unknown_generic = GF_TRUE;
@@ -2152,6 +2401,12 @@
 		mp4_mux_get_video_size(ctx, &width, &height);
 	}
 
+	//if not LPCM and qt v2 is requested, move to qtv1
+	if ((ase_mode==GF_IMPORT_AUDIO_SAMPLE_ENTRY_v2_QTFF) && (m_subtype != GF_QT_SUBTYPE_LPCM) ) {
+		ase_mode = GF_IMPORT_AUDIO_SAMPLE_ENTRY_v1_QTFF;
+	}
+
+
 	if (!ctx->init_movie_done && !tkw->nb_samples && (ctx->mediats<0) && (tkw->tk_timescale==1000)) {
 		if (sr) {
 			tkw->tk_timescale = sr;
@@ -2184,6 +2439,17 @@
 	}
 
 	if (force_mix_xps) {
+		if (tkw->all_stsd_crc) {
+			p = gf_filter_pid_get_property(pid, GF_PROP_PID_ISOM_STSD_ALL_TEMPLATES);
+			u32 crc = p ? gf_crc_32(p->value.data.ptr, p->value.data.size) : 0;
+			if (crc == tkw->all_stsd_crc) {
+				p = gf_filter_pid_get_property(pid, GF_PROP_PID_ISOM_STSD_TEMPLATE_IDX);
+				if (p) {
+					tkw->stsd_idx = p->value.uint;
+					return GF_OK;
+				}
+			}
+		}
 
 		//for AVC and HEVC, move to inband params if config changed
 		if (use_avc && dsi) {
@@ -2245,9 +2511,13 @@
 	}
 
 	tkw->xps_inband = xps_inband;
+	p = needs_sample_entry ? gf_filter_pid_get_property(tkw->ipid, GF_PROP_PID_DSI_SUPERSET) : NULL;
 
-	//little optim here: if no samples were added on the stream description remove it
-	if (!tkw->samples_in_stsd && tkw->stsd_idx && needs_sample_entry) {
+	//if dsi is a superset of previous one, remove stream description
+	if ((p && p->value.boolean)
+		//little optim here: if no samples were added on the stream description remove it
+		|| (!tkw->samples_in_stsd && tkw->stsd_idx && needs_sample_entry)
+	) {
 		gf_isom_remove_stream_description(ctx->file, tkw->track_num, tkw->stsd_idx);
 	}
 
@@ -2303,8 +2573,6 @@
 #endif
 
 	} else if (use_avc) {
-		if (tkw->avcc) gf_odf_avc_cfg_del(tkw->avcc);
-
 		//not yet known
 		if (!dsi && !enh_dsi) return GF_OK;
 
@@ -2312,10 +2580,10 @@
 			dsi = enh_dsi;
 			enh_dsi = NULL;
 		}
+		if (tkw->avcc) gf_odf_avc_cfg_del(tkw->avcc);
 		tkw->avcc = gf_odf_avc_cfg_read(dsi->value.data.ptr, dsi->value.data.size);
 
 		if (needs_sample_entry) {
-
 			if (tkw->codecid == GF_CODECID_SVC) {
 				e = gf_isom_svc_config_new(ctx->file, tkw->track_num, tkw->avcc, NULL, NULL, &tkw->stsd_idx);
 			} else if (tkw->codecid == GF_CODECID_MVC) {
@@ -2348,7 +2616,7 @@
 				return e;
 			}
 		}
-		
+
 		if (xps_inband) {
 			//this will cleanup all PS in avcC / svcC
 			gf_isom_avc_set_inband_config(ctx->file, tkw->track_num, tkw->stsd_idx, (xps_inband==XPS_IB_BOTH) ? GF_TRUE : GF_FALSE);
@@ -2828,8 +3096,21 @@
 
 		udesc.samplerate = sr;
 		udesc.nb_channels = nb_chan;
-		if (codec_id==GF_CODECID_RAW) {
-			if (ase_mode==GF_IMPORT_AUDIO_SAMPLE_ENTRY_v1_MPEG) {
+		udesc.bits_per_sample = nb_bps;
+		udesc.lpcm_flags = afmt_flags | (1<<3); //add packed flag
+		//for raw audio, select qt vs isom and set version
+		if (sr && (codec_id==GF_CODECID_RAW)) {
+			if (ctx->make_qt && (ase_mode==GF_IMPORT_AUDIO_SAMPLE_ENTRY_v0_BS)) {
+				udesc.is_qtff = GF_TRUE;
+				//if extensions or not 'raw ' or 'twos', use v1
+				if (dsi ||
+					((m_subtype!=GF_QT_SUBTYPE_TWOS) && (m_subtype!=GF_QT_SUBTYPE_RAW))
+				) {
+					udesc.version = 1;
+					ase_mode = GF_IMPORT_AUDIO_SAMPLE_ENTRY_v1_QTFF;
+				}
+			}
+			else if (ase_mode<=GF_IMPORT_AUDIO_SAMPLE_ENTRY_v1_MPEG) {
 				m_subtype = m_subtype_alt_raw;
 				udesc.extension_buf_size = 14;
 				udesc.extension_buf = isor_ext_buf;
@@ -2839,8 +3120,10 @@
 				isor_ext_buf5 = 'c';
 				isor_ext_buf6 = 'm';
 				isor_ext_buf7 = 'C';
-				isor_ext_buf12 = 1; //little endian only for now
-				isor_ext_buf13 = raw_bitdepth; //little endian only for now
+				isor_ext_buf12 = (afmt_flags & (1<<1)) ? 0 : 1; //big/little endian
+				isor_ext_buf13 = nb_bps;
+				if (ase_mode==GF_IMPORT_AUDIO_SAMPLE_ENTRY_v1_MPEG)
+					udesc.version = 1;
 			} else {
 				udesc.is_qtff = GF_TRUE;
 				udesc.version = 1;
@@ -2888,6 +3171,14 @@
 			if (udesc.extension_buf)
 				udesc.ext_box_wrap = GF_4CC('d', 'v', 'c', '1');
 		}
+		//move to uncv
+		if ((codec_id==GF_CODECID_RAW) && !ctx->make_qt && ctx->uncv && (tkw->stream_type==GF_STREAM_VISUAL)) {
+			if ( gf_pixel_fmt_get_uncc(pix_fmt, ctx->uncv-1, &gpac_meta_dsi, &udesc.extension_buf_size) == GF_TRUE) {
+				unknown_generic = GF_FALSE;
+				udesc.extension_buf = gpac_meta_dsi;
+				udesc.codec_tag = m_subtype = GF_ISOM_SUBTYPE_UNCV;
+			}
+		}
 
 		if (unknown_generic) {
 			//check if this is a meta codec (unmapped codec from ffmpeg or other)
@@ -2923,7 +3214,7 @@
 				GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("MP4Mux muxing unknown codec ID %s, using generic sample entry with 4CC \"%s\"\n", gf_codecid_name(codec_id), gf_4cc_to_str(m_subtype) ));
 			}
 		}
-		
+
 		e = gf_isom_new_generic_sample_description(ctx->file, tkw->track_num, (char *)src_url, NULL, &udesc, &tkw->stsd_idx);
 		if (gpac_meta_dsi) gf_free(gpac_meta_dsi);
 
@@ -2934,23 +3225,25 @@
 		tkw->use_dref = src_url ? GF_TRUE : GF_FALSE;
 
 	} else {
-		assert(0);
+		gf_fatal_assert(0);
 	}
 
-	if (ctx->btrt && !tkw->skip_bitrate_update) {
-		u32 avg_rate, max_rate, dbsize;
-		p = gf_filter_pid_get_property(pid, GF_PROP_PID_BITRATE);
-		avg_rate = p ? p->value.uint : 0;
-		p = gf_filter_pid_get_property(pid, GF_PROP_PID_MAXRATE);
-		max_rate = p ? p->value.uint : 0;
-		p = gf_filter_pid_get_property(pid, GF_PROP_PID_DBSIZE);
-		dbsize = p ? p->value.uint : 0;
+	if (!tkw->all_stsd_crc) {
+		if (ctx->btrt && !tkw->skip_bitrate_update) {
+			u32 avg_rate, max_rate, dbsize;
+			p = gf_filter_pid_get_property(pid, GF_PROP_PID_BITRATE);
+			avg_rate = p ? p->value.uint : 0;
+			p = gf_filter_pid_get_property(pid, GF_PROP_PID_MAXRATE);
+			max_rate = p ? p->value.uint : 0;
+			p = gf_filter_pid_get_property(pid, GF_PROP_PID_DBSIZE);
+			dbsize = p ? p->value.uint : 0;
 
-		if (avg_rate && max_rate) {
-			gf_isom_update_bitrate(ctx->file, tkw->track_num, tkw->stsd_idx, avg_rate, max_rate, dbsize);
+			if (avg_rate && max_rate) {
+				gf_isom_update_bitrate(ctx->file, tkw->track_num, tkw->stsd_idx, avg_rate, max_rate, dbsize);
+			}
+		} else {
+			gf_isom_update_bitrate(ctx->file, tkw->track_num, tkw->stsd_idx, 0, 0, 0);
 		}
-	} else {
-		gf_isom_update_bitrate(ctx->file, tkw->track_num, tkw->stsd_idx, 0, 0, 0);
 	}
 
 multipid_stsd_setup:
@@ -2998,6 +3291,7 @@
 				break;
 			}
 		}
+		tkw->reused_stsd = reuse_stsd;
 		if (!reuse_stsd) {
 			tkw->samples_in_stsd = 0;
 		} else if (use_3gpp_config) {
@@ -3178,7 +3472,10 @@
 					sr = val;
 				}
 			}
-			gf_isom_set_audio_info(ctx->file, tkw->track_num, tkw->stsd_idx, sr, nb_chan, nb_bps, ctx->make_qt ? GF_IMPORT_AUDIO_SAMPLE_ENTRY_v1_QTFF : ase_mode);
+			if (m_subtype!=GF_QT_SUBTYPE_LPCM) {
+				gf_isom_set_audio_info(ctx->file, tkw->track_num, tkw->stsd_idx, sr, nb_chan, nb_bps, ctx->make_qt ? GF_IMPORT_AUDIO_SAMPLE_ENTRY_v1_QTFF : ase_mode);
+			}
+
 			if ((m_subtype==GF_ISOM_SUBTYPE_IPCM) || (m_subtype==GF_ISOM_SUBTYPE_FPCM)) {
 				GF_AudioChannelLayout layout;
 				memset(&layout, 0, sizeof(GF_AudioChannelLayout));
@@ -3325,9 +3622,20 @@
 				GF_BitStream *bs = gf_bs_new(p->value.data.ptr, p->value.data.size, GF_BITSTREAM_READ);
 				GF_DOVIDecoderConfigurationRecord *dvcc = gf_odf_dovi_cfg_read_bs(bs);
 				gf_bs_del(bs);
+				if (dvcc && tkw->xps_inband && (dvcc->dv_profile==8) && ctx->dvsingle) {
+					GF_DOVIDecoderConfigurationRecord *dovi = gf_isom_dovi_config_get(ctx->file, tkw->track_num, tkw->stsd_idx);
+					if (dovi) {
+						if (dovi->dv_profile==5) {
+							gf_odf_dovi_cfg_del(dvcc);
+							dvcc = NULL;
+						}
+						gf_odf_dovi_cfg_del(dovi);
+					}
+				}
 				if (dvcc) {
 					if (ctx->force_dv)
 						dvcc->force_dv = 1;
+
 					gf_isom_set_dolby_vision_profile(ctx->file, tkw->track_num, tkw->stsd_idx, dvcc);
 
 					if (!dvcc->bl_present_flag) {
@@ -3356,6 +3664,36 @@
 					gf_odf_dovi_cfg_del(dvcc);
 				}
 			}
+
+			p = (codec_id==GF_CODECID_HEVC) ? gf_filter_pid_get_property_str(pid, "hevc_split") : NULL;
+			if (p && p->value.boolean) {
+				p = gf_filter_pid_get_property(pid, GF_PROP_PID_CROP_POS);
+				p2 = gf_filter_pid_get_property(pid, GF_PROP_PID_ORIG_SIZE);
+				if (p && p2) {
+#define GPAC_SRD_SIZE	21
+					u8 srdgGPAC_SRD_SIZE;
+					GF_BitStream *bs = gf_bs_new(srdg, GPAC_SRD_SIZE, GF_BITSTREAM_WRITE);
+					gf_bs_write_int(bs, 1, 1);//mergeable
+					gf_bs_write_int(bs, 0, 7);//unused
+					gf_bs_write_u32(bs, 1);//groupID
+					gf_bs_write_u32(bs, p->value.vec2i.x);//offx
+					gf_bs_write_u32(bs, p->value.vec2i.y);//offy
+					gf_bs_write_u32(bs, p2->value.vec2i.x);//osize_w
+					gf_bs_write_u32(bs, p2->value.vec2i.y);//osize_h
+					gf_bs_del(bs);
+					//stored as track user data for now
+					gf_isom_add_user_data(ctx->file, tkw->track_num, GF_ISOM_UDTA_GPAC_SRD, NULL, srdg, GPAC_SRD_SIZE);
+
+					s32 mx9;
+					memset(mx, 0, sizeof(s32)*9);
+					mx0 = mx4 = 0x00010000;
+					mx8 = 0x40000000;
+					mx6 = 65536*p->value.vec2i.x;
+					mx7 = 65536*p->value.vec2i.y;
+					gf_isom_set_track_matrix(ctx->file, tkw->track_num, mx);
+				}
+
+			}
 		}
 		//default for old arch
 		else if (force_tk_layout
@@ -3374,13 +3712,80 @@
 		p = gf_filter_pid_get_property(pid, GF_PROP_PID_CHAP_TIMES);
 		const GF_PropertyValue *p2 = gf_filter_pid_get_property(pid, GF_PROP_PID_CHAP_NAMES);
 		if (p && p2 && (p->value.uint_list.nb_items == p2->value.string_list.nb_items)) {
-			u32 j;
-			gf_isom_remove_chapter(ctx->file, 0, 0);
-			for (j=0; j<p->value.uint_list.nb_items; j++) {
-				gf_isom_add_chapter(ctx->file, 0, p->value.uint_list.valsj, p2->value.string_list.valsj);
+			Bool add_chap=GF_FALSE;
+			Bool add_tk=GF_FALSE;
+			u32 trak_di=0;
+			if ((ctx->chapm==MP4MX_CHAPM_BOTH) || (ctx->chapm==MP4MX_CHAPM_UDTA)) {
+				gf_isom_remove_chapter(ctx->file, 0, 0);
+				add_chap = GF_TRUE;
+			}
+			if (((ctx->chapm==MP4MX_CHAPM_BOTH) || (ctx->chapm==MP4MX_CHAPM_TRACK))
+				&& !ctx->chap_track_num
+			) {
+				GF_FontRecord frec;
+				GF_TextSampleDescriptor txtdesc;
+				ctx->chap_track_num = gf_isom_new_track(ctx->file, 0xFFFE, GF_ISOM_MEDIA_TEXT, 1000);
+				gf_isom_set_track_flags (ctx->file, ctx->chap_track_num, GF_ISOM_TK_IN_MOVIE|GF_ISOM_TK_IN_PREVIEW, GF_ISOM_TKFLAGS_SET);
+				//move chapter track last
+				gf_isom_set_track_index(ctx->file, ctx->chap_track_num, 0xFFFE, mp4mux_track_reorder, ctx);
+				memset(&txtdesc, 0, sizeof(GF_TextSampleDescriptor));
+				txtdesc.font_count = 1;
+				txtdesc.fonts = &frec;
+				frec.fontName = "SANS";
+				frec.fontID=1;
+				txtdesc.default_style.fontID=1;
+				txtdesc.default_style.font_size = 32;
+				//txtdesc.default_style.text_color = 0xFFFFFFFF;
+				//txtdesc.horiz_justif = 1;
+				//txtdesc.vert_justif = (s8) -1;	/*bottom of scene*/
+
+				gf_isom_new_text_description(ctx->file, ctx->chap_track_num, &txtdesc, NULL, NULL, &trak_di);
+				add_tk = GF_TRUE;
+			}
+
+			if (add_tk || add_chap) {
+				u32 j;
+				u64 maxts = (ctx->dur.num && ctx->dur.den) ? gf_timestamp_rescale(ctx->dur.num, ctx->dur.den, 1000) : 0;
+				for (j=0; j<p->value.uint_list.nb_items; j++) {
+					u32 start_time = p->value.uint_list.valsj;
+					if (ctx->start > start_time) {
+						if (j+1 < p->value.uint_list.nb_items) {
+							u64 next = p->value.uint_list.valsj+1;
+							if (ctx->start>=next)
+								continue;
+						}
+						if (start_time > (u32) ctx->start) start_time -= (u32) ctx->start;
+						else start_time=0;
+					}
+					if (maxts && (maxts<=start_time))
+						break;
+
+					if (add_chap) {
+						gf_isom_add_chapter(ctx->file, 0, start_time, p2->value.string_list.valsj);
+					}
+					if (add_tk && p2->value.string_list.valsj) {
+						GF_TextSample tx;
+						memset(&tx, 0, sizeof(tx));
+						tx.text = p2->value.string_list.valsj;
+						tx.len = (u32) strlen(p2->value.string_list.valsj)+1;
+						GF_ISOSample *samp = gf_isom_text_to_sample(&tx);
+						samp->DTS = start_time;
+						samp->IsRAP = 1;
+
+						//force fist chapter to start at 0
+						if (!j && samp->DTS) {
+							samp->DTS = 0;
+						}
+						gf_isom_add_sample(ctx->file, ctx->chap_track_num, trak_di, samp);
+						gf_isom_sample_del(&samp);
+					}
+				}
 			}
-		}
 
+			if ((ctx->chapm==MP4MX_CHAPM_BOTH) || (ctx->chapm==MP4MX_CHAPM_TRACK)) {
+				gf_isom_set_track_reference(ctx->file, tkw->track_num, GF_ISOM_REF_CHAP, gf_isom_get_track_id(ctx->file, ctx->chap_track_num));
+			}
+		}
 	}
 
 	if (tkw->is_encrypted) {
@@ -3599,14 +4004,19 @@
 			gf_isom_set_composition_offset_mode(ctx->file, tkw->track_num, GF_FALSE);
 		}
 
-		mp4_mux_set_tags(ctx, tkw);
-		mp4_mux_set_udta(ctx, tkw);
+		if (!ctx->noinit) {
+			mp4_mux_set_tags(ctx, tkw);
+			mp4_mux_set_udta(ctx, tkw);
+		}
 	}
 	return GF_OK;
 }
 
-static GF_Err mp4_mux_flush_fragmented(GF_Filter *filter, GF_MP4MuxCtx *ctx);
-static GF_Err mp4_mux_done(GF_Filter *filter, GF_MP4MuxCtx *ctx, Bool is_final);
+#ifndef GPAC_DISABLE_ISOM_FRAGMENTS
+static GF_Err mp4_mux_flush_fragmented(GF_MP4MuxCtx *ctx);
+#endif
+static GF_Err mp4_mux_done(GF_MP4MuxCtx *ctx, Bool is_final);
+static void mp4_mux_done_track(GF_MP4MuxCtx *ctx, TrackWriter *tkw);
 
 static GF_Err mp4_mux_configure_pid(GF_Filter *filter, GF_FilterPid *pid, Bool is_remove)
 {
@@ -3615,7 +4025,9 @@
 	if (is_remove) {
 		TrackWriter *tkw = gf_filter_pid_get_udta(pid);
 		if (tkw) {
+			mp4_mux_done_track(ctx, tkw);
 			gf_list_del_item(ctx->tracks, tkw);
+			if (ctx->ref_tkw == tkw) ctx->ref_tkw = gf_list_get(ctx->tracks, 0);
 			gf_free(tkw);
 		}
 		//removing last pid
@@ -3623,13 +4035,15 @@
 			if (ctx->file) {
 				//non-frag file, flush file
 				if (!ctx->init_movie_done) {
-					mp4_mux_done(filter, ctx, GF_TRUE);
+					mp4_mux_done(ctx, GF_TRUE);
 				}
 			} else {
+#ifndef GPAC_DISABLE_ISOM_FRAGMENTS
 				while (ctx->flush_size) {
-					GF_Err e = mp4_mux_flush_fragmented(filter, ctx);
+					GF_Err e = mp4_mux_flush_fragmented(ctx);
 					if (e) break;
 				}
+#endif
 			}
 			//delete output pid (to flush destruction of filter chain)
 			gf_filter_pid_remove(ctx->opid);
@@ -3662,7 +4076,7 @@
 	}
 	if (!evt->base.on_pid && (evt->base.type==GF_FEVT_STOP) ) {
 		if (ctx->file && ctx->owns_mov) {
-			mp4_mux_done(filter, ctx, GF_TRUE);
+			mp4_mux_done(ctx, GF_TRUE);
 		}
 	}
 	if (evt->base.on_pid && (evt->base.type==GF_FEVT_PLAY) ) {
@@ -3699,7 +4113,7 @@
 	CENC_ADD_FRAG,
 };
 
-static void mp4_mux_cenc_insert_pssh(GF_MP4MuxCtx *ctx, TrackWriter *tkw, const GF_PropertyValue *pssh, Bool dyn_pssh_only)
+static void mp4_mux_cenc_insert_pssh(GF_MP4MuxCtx *ctx, TrackWriter *tkw, const GF_PropertyValue *pssh, u32 dyn_pssh_mode)
 {
 	bin128 *keyIDs=NULL;
 	u32 max_keys = 0;
@@ -3707,9 +4121,10 @@
 	GF_PropertyValue _the_prop;
 
 	//set pssh
-	const GF_PropertyValue *p;
+	const GF_PropertyValue *p=NULL;
 
-	if (dyn_pssh_only) {
+	//only inject if pssh in packet
+	if (dyn_pssh_mode==2) {
 		GF_FilterPacket *pck;
 		//nothing to inject
 		if (!tkw->dyn_pssh) return;
@@ -3724,7 +4139,19 @@
 		_the_prop.value.data.size = tkw->dyn_pssh_len;
 		p = &_the_prop;
 	} else {
-		p = pssh ? pssh : gf_filter_pid_get_property(tkw->ipid, GF_PROP_PID_CENC_PSSH);
+		if (pssh) {
+			p = pssh;
+		} else {
+			//inject pssh from packet if any, or from PID (used for keyroll of master+leaf schemes)
+			if (dyn_pssh_mode) {
+				GF_FilterPacket *pck = gf_filter_pid_get_packet(tkw->ipid);
+				if (pck) {
+					p = gf_filter_pck_get_property(pck, GF_PROP_PID_CENC_PSSH);
+				}
+			}
+			if (!p)
+				p = gf_filter_pid_get_property(tkw->ipid, GF_PROP_PID_CENC_PSSH);
+		}
 		if (!p) return;
 	}
 
@@ -3831,8 +4258,13 @@
 				GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("MP4Mux Failed to clone sample description: %s\n", gf_error_to_string(e) ));
 				return e;
 			}
+			//current stsd reused, use clone one for encrypted stsd
+			if (tkw->reused_stsd) {
+				tkw->clear_stsd_idx = tkw->stsd_idx;
+				tkw->stsd_idx = clone_stsd_idx;
+			}
 			//before
-			if (cenc_stsd_mode==1) {
+			else if (cenc_stsd_mode==1) {
 				tkw->clear_stsd_idx = tkw->stsd_idx;
 				tkw->stsd_idx = clone_stsd_idx;
 			}
@@ -3859,8 +4291,22 @@
 			return e;
 		}
 
+		//purge duplicates
+		u32 k, nb_sdesc = gf_isom_get_sample_description_count(ctx->file, tkw->track_num);
+		if (nb_sdesc>2) {
+			for (k=0; k<nb_sdesc; k++) {
+				if (k+1 == tkw->stsd_idx) continue;
+
+				if (gf_isom_is_same_sample_description(ctx->file, tkw->track_num, tkw->stsd_idx, ctx->file, tkw->track_num, k+1) ) {
+					gf_isom_remove_stream_description(ctx->file, tkw->track_num, tkw->stsd_idx);
+					tkw->stsd_idx = k+1;
+					break;
+				}
+			}
+		}
+
 		if ((ctx->psshs == MP4MX_PSSH_MOOV) || (ctx->psshs == MP4MX_PSSH_BOTH))
-			mp4_mux_cenc_insert_pssh(ctx, tkw, NULL, GF_FALSE);
+			mp4_mux_cenc_insert_pssh(ctx, tkw, NULL, 0);
 
 		if (!tkw->has_brands && (scheme_type==GF_ISOM_OMADRM_SCHEME))
 			gf_isom_modify_alternate_brand(ctx->file, GF_ISOM_BRAND_OPF2, GF_TRUE);
@@ -3904,7 +4350,11 @@
 	if (!pck_is_encrypted) {
 		if (tkw->clear_stsd_idx) {
 			if (act_type==CENC_ADD_FRAG) {
+#ifndef GPAC_DISABLE_ISOM_FRAGMENTS
 				return gf_isom_fragment_set_cenc_sai(ctx->file, tkw->track_id, NULL, 0, GF_FALSE, ctx->saio32, tkw->cenc_multikey);
+#else
+				return GF_NOT_SUPPORTED;
+#endif
 			} else {
 				return gf_isom_track_cenc_add_sample_info(ctx->file, tkw->track_num, GF_ISOM_BOX_TYPE_SENC, NULL, 0, tkw->cenc_subsamples, ctx->saio32, tkw->cenc_multikey);
 			}
@@ -3916,7 +4366,7 @@
 			tkw->has_seig = GF_TRUE;
 		}
 	} else {
-	
+
 		e = GF_OK;
 		//multikey ALWAYS uses seig
 		if (tkw->cenc_ki->value.data.ptr0)
@@ -3943,9 +4393,9 @@
 	p = gf_filter_pck_get_property(pck, GF_PROP_PID_CENC_PSSH);
 	if (p && (p->type == GF_PROP_DATA) && p->value.data.ptr) {
 		if (ctx->store>=MP4MX_MODE_FRAG) {
-			mp4_mux_cenc_insert_pssh(ctx, tkw, p, GF_FALSE);
+			mp4_mux_cenc_insert_pssh(ctx, tkw, p, 0);
 		} else {
-			gf_isom_set_sample_group_description(ctx->file, tkw->track_num, sample_num, GF_4CC('P','S','S','H'), 0, p->value.data.ptr, p->value.data.size);
+			gf_isom_set_sample_group_description(ctx->file, tkw->track_num, sample_num, GF_4CC('P','S','S','H'), 0, p->value.data.ptr, p->value.data.size, 0);
 		}
 	}
 
@@ -4000,7 +4450,7 @@
 		u8 *sai_d;
 		u8 key_info_get_iv_size(const u8 *key_info, u32 nb_keys, u32 idx, u8 *const_iv_size, const u8 **const_iv);
 
-		assert(tkw->cenc_subsamples);
+		gf_assert(tkw->cenc_subsamples);
 
 		//multi-key skip all IV inits
 		if (tkw->cenc_ki->value.data.ptr0) {
@@ -4091,12 +4541,19 @@
 		}
 	}
 
-	if (act_type==CENC_ADD_FRAG) {
+	if (pck_is_encrypted && (sai_size>255)) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("MP4Mux CENC SAI size %u larger than max allowed size (255) in ISOBMFF - please reencode content\n", sai_size ));
+		e = GF_NOT_SUPPORTED;
+	} else if (act_type==CENC_ADD_FRAG) {
+#ifndef GPAC_DISABLE_ISOM_FRAGMENTS
 		if (pck_is_encrypted) {
 			e = gf_isom_fragment_set_cenc_sai(ctx->file, tkw->track_id, sai, sai_size, tkw->cenc_subsamples, ctx->saio32, tkw->cenc_multikey);
 		} else {
 			e = gf_isom_fragment_set_cenc_sai(ctx->file, tkw->track_id, NULL, 0, GF_FALSE, ctx->saio32, tkw->cenc_multikey);
 		}
+#else
+		e = GF_NOT_SUPPORTED;
+#endif
 	} else {
 		if (sai) {
 			e = gf_isom_track_cenc_add_sample_info(ctx->file, tkw->track_num, GF_ISOM_BOX_TYPE_SENC, sai, sai_size, tkw->cenc_subsamples, ctx->saio32, tkw->cenc_multikey);
@@ -4116,6 +4573,12 @@
 	return sap;
 }
 
+#ifndef GPAC_DISABLE_ISOM_FRAGMENTS
+GF_Err gf_isom_fragment_add_sample_ex(GF_ISOFile *movie, GF_ISOTrackID TrackID, const GF_ISOSample *sample, u32 DescIndex,
+                                   u32 Duration, u8 PaddingBits, u16 DegradationPriority, Bool redundant_coding, void **ref, u32 ref_offset);
+GF_Err gf_isom_fragment_append_data_ex(GF_ISOFile *movie, GF_ISOTrackID TrackID, u8 *data, u32 data_size, u8 PaddingBits, void **ref, u32 ref_offset);
+#endif
+
 static GF_Err mp4_mux_process_sample(GF_MP4MuxCtx *ctx, TrackWriter *tkw, GF_FilterPacket *pck, Bool for_fragment)
 {
 	GF_Err e=GF_OK;
@@ -4128,6 +4591,7 @@
 	u32 insert_subsample_dsi_size = 0;
 	u32 first_nal_is_audelim = GF_FALSE;
 	u32 sample_desc_index = tkw->stsd_idx;
+	Bool sample_timing_ok = GF_TRUE;
 
 	timescale = gf_filter_pck_get_timescale(pck);
 
@@ -4157,7 +4621,7 @@
 			u32 min_pck_dur = gf_filter_pid_get_min_pck_duration(tkw->ipid);
 			if (min_pck_dur) {
 				tkw->sample.DTS = prev_dts;
-
+				//transform back to inpput timescale
 				if (timescale != tkw->tk_timescale) {
 					tkw->sample.DTS = gf_timestamp_rescale(tkw->sample.DTS, tkw->tk_timescale, timescale);
 				}
@@ -4185,6 +4649,7 @@
 				cts = tkw->ts_shift - cts;
 			} else {
 				GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("MP4Mux broken timing in track, initial ts "LLU" less than TS "LLU"\n", tkw->ts_shift, tkw->sample.DTS));
+				sample_timing_ok = GF_FALSE;
 			}
 		} else {
 			if (tkw->sample.DTS >= tkw->ts_shift) {
@@ -4192,6 +4657,7 @@
 				cts -= tkw->ts_shift;
 			} else {
 				GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("MP4Mux broken timing in track, initial ts "LLU" greater than TS "LLU"\n", tkw->ts_shift, tkw->sample.DTS));
+				sample_timing_ok = GF_FALSE;
 			}
 		}
 	}
@@ -4224,6 +4690,10 @@
 		tkw->sample.CTS_Offset = (s32) ctso;
 		duration *= tkw->tk_timescale;
 		duration /= timescale;
+
+		if (cts != GF_FILTER_NO_TS) {
+			cts = gf_timestamp_rescale(cts, timescale, tkw->tk_timescale);
+		}
 	}
 
 	tkw->sample.IsRAP = 0;
@@ -4260,14 +4730,15 @@
 	tkw->sample.DTS += tkw->dts_patch;
 	if (tkw->nb_samples && (prev_dts >= tkw->sample.DTS) ) {
 		//the fragmented API will patch the duration on the fly
-		if (!for_fragment) {
+		if (!for_fragment && ctx->patch_dts) {
 			gf_isom_patch_last_sample_duration(ctx->file, tkw->track_num, prev_dts ? prev_dts : 1);
 		}
-		GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("MP4Mux PID %s ID %d Sample %d with DTS "LLU" less than previous sample DTS "LLU", adjusting prev sample duration\n", gf_filter_pid_get_name(tkw->ipid), tkw->track_id, tkw->nb_samples+1, tkw->sample.DTS, prev_dts ));
+		GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("MP4Mux PID %s ID %d Sample %d with DTS "LLU" less than previous sample DTS "LLU", patching DTS%s\n", gf_filter_pid_get_name(tkw->ipid), tkw->track_id, tkw->nb_samples+1, tkw->sample.DTS, prev_dts, ctx->patch_dts ? "and adjusting prev sample duration" : "" ));
+		sample_timing_ok = GF_FALSE;
 
 		if (prev_dts) {
 			tkw->dts_patch = prev_dts - tkw->sample.DTS;
-			tkw->sample.DTS += tkw->dts_patch;
+			tkw->sample.DTS += tkw->dts_patch+1; //+1 to avoid 0-dur samples
 		} else {
 			tkw->sample.DTS += 1;
 			if (tkw->sample.CTS_Offset) tkw->sample.CTS_Offset -= 1;
@@ -4279,15 +4750,17 @@
 	if (tkw->negctts_shift)
 		tkw->sample.CTS_Offset -= tkw->negctts_shift;
 
-	if (tkw->probe_min_ctts) {
-		s32 diff = (s32) ((s64) cts - (s64) tkw->sample.DTS);
-		if (diff < tkw->min_neg_ctts)
-			tkw->min_neg_ctts = diff;
-	}
-	if (tkw->sample.CTS_Offset) tkw->has_ctts = GF_TRUE;
+	if (sample_timing_ok) {
+		if (tkw->probe_min_ctts) {
+			s32 diff = (s32) ((s64) cts - (s64) tkw->sample.DTS);
+			if (diff < tkw->min_neg_ctts)
+				tkw->min_neg_ctts = diff;
+		}
+		if (tkw->sample.CTS_Offset) tkw->has_ctts = GF_TRUE;
 
-	if (tkw->sample.CTS_Offset < tkw->min_neg_ctts)
-		tkw->min_neg_ctts = tkw->sample.CTS_Offset;
+		if (tkw->sample.CTS_Offset < tkw->min_neg_ctts)
+			tkw->min_neg_ctts = tkw->sample.CTS_Offset;
+	}
 
 	tkw->sample.nb_pack = 0;
 	if (tkw->raw_audio_bytes_per_sample) {
@@ -4316,7 +4789,11 @@
 			s.IsRAP = SAP_TYPE_1;
 			ins_dur = (u32) (tkw->sample.DTS - est_time);
 			if (for_fragment) {
+#ifndef GPAC_DISABLE_ISOM_FRAGMENTS
 				e = gf_isom_fragment_add_sample(ctx->file, tkw->track_id, &s, tkw->stsd_idx, ins_dur, 0, 0, 0);
+#else
+				e = GF_NOT_SUPPORTED;
+#endif
 			} else {
 				e = gf_isom_add_sample(ctx->file, tkw->track_num, tkw->stsd_idx, &s);
 				gf_isom_set_last_sample_duration(ctx->file, tkw->track_num, ins_dur);
@@ -4336,7 +4813,11 @@
 		}
 	} else if (tkw->nb_frames_per_sample && (tkw->nb_samples % tkw->nb_frames_per_sample)) {
 		if (for_fragment) {
+#ifndef GPAC_DISABLE_ISOM_FRAGMENTS
 		 	e = gf_isom_fragment_append_data(ctx->file, tkw->track_id, tkw->sample.data, tkw->sample.dataLength, 0);
+#else
+			e = GF_NOT_SUPPORTED;
+#endif
 		} else {
 			e = gf_isom_append_sample_data(ctx->file, tkw->track_num, tkw->sample.data, tkw->sample.dataLength);
 		}
@@ -4398,11 +4879,30 @@
 			}
 
 			if (for_fragment) {
-				e = gf_isom_fragment_add_sample(ctx->file, tkw->track_id, &tkw->sample, sample_desc_index, duration, 0, 0, 0);
+#ifndef GPAC_DISABLE_ISOM_FRAGMENTS
+				//force using ref mode
+				void *ref=NULL;
+				e = gf_isom_fragment_add_sample_ex(ctx->file, tkw->track_id, &tkw->sample, sample_desc_index, duration, 0, 0, 0, &ref, 0);
 				if (!e && au_delim) {
 					e = gf_isom_fragment_append_data(ctx->file, tkw->track_id, inband_xps, inband_xps_size, 0);
 				}
-				if (!e) e = gf_isom_fragment_append_data(ctx->file, tkw->track_id, pck_data, pck_data_len, 0);
+				if (!e) {
+					if ((ctx->subs_sidx>0) || gf_filter_pck_is_blocking_ref(pck)) {
+						e = gf_isom_fragment_append_data(ctx->file, tkw->track_id, pck_data, pck_data_len, 0);
+					} else {
+						gf_filter_pck_ref(&pck);
+						GF_FilterPacket *ref = pck;
+						e = gf_isom_fragment_append_data_ex(ctx->file, tkw->track_id, pck_data, pck_data_len, 0, (void**)&ref, au_delim ? au_delim_size : 0);
+						if (!ref) {
+							gf_list_add(ctx->ref_pcks, pck);
+						} else {
+							gf_filter_pck_unref(pck);
+						}
+					}
+				}
+#else
+				e = GF_NOT_SUPPORTED;
+#endif // GPAC_DISABLE_ISOM_FRAGMENTS
 			} else {
 				e = gf_isom_add_sample(ctx->file, tkw->track_num, sample_desc_index, &tkw->sample);
 				if (au_delim && !e) {
@@ -4412,7 +4912,22 @@
 			}
 			insert_subsample_dsi_size = inband_xps_size;
 		} else if (for_fragment) {
-			e = gf_isom_fragment_add_sample(ctx->file, tkw->track_id, &tkw->sample, sample_desc_index, duration, 0, 0, 0);
+#ifndef GPAC_DISABLE_ISOM_FRAGMENTS
+			if ((ctx->subs_sidx>0) || gf_filter_pck_is_blocking_ref(pck)) {
+				e = gf_isom_fragment_add_sample(ctx->file, tkw->track_id, &tkw->sample, sample_desc_index, duration, 0, 0, 0);
+			} else {
+				gf_filter_pck_ref(&pck);
+				GF_FilterPacket *ref = pck;
+				e = gf_isom_fragment_add_sample_ex(ctx->file, tkw->track_id, &tkw->sample, sample_desc_index, duration, 0, 0, 0, (void**) &ref, 0);
+				if (!ref) {
+					gf_list_add(ctx->ref_pcks, pck);
+				} else {
+					gf_filter_pck_unref(pck);
+				}
+			}
+#else
+			e = GF_NOT_SUPPORTED;
+#endif // GPAC_DISABLE_ISOM_FRAGMENTS
 		} else {
 			e = gf_isom_add_sample(ctx->file, tkw->track_num, sample_desc_index, &tkw->sample);
 			if (!e && !duration) {
@@ -4440,7 +4955,7 @@
 
 	if (e) return e;
 
-	if (!for_fragment) {
+	if (!for_fragment && sample_timing_ok) {
 		u64 samp_cts;
 		if (!tkw->clamp_ts_plus_one) {
 			const GF_PropertyValue *skp = gf_filter_pck_get_property(pck, GF_PROP_PCK_SKIP_PRES);
@@ -4465,7 +4980,11 @@
 	if ((sap_type==3) || tkw->has_open_gop)  {
 		if (!ctx->norap) {
 			if (for_fragment) {
+#ifndef GPAC_DISABLE_ISOM_FRAGMENTS
 				e = gf_isom_fragment_set_sample_rap_group(ctx->file, tkw->track_id, tkw->samples_in_frag, (sap_type==3) ? GF_TRUE : GF_FALSE, 0);
+#else
+				e = GF_NOT_SUPPORTED;
+#endif
 			} else if (sap_type==3) {
 				e = gf_isom_set_sample_rap_group(ctx->file, tkw->track_num, tkw->nb_samples, GF_TRUE /*(sap_type==3) ? GF_TRUE : GF_FALSE*/, 0);
 			}
@@ -4486,7 +5005,11 @@
 			}
 
 			if (for_fragment) {
+#ifndef GPAC_DISABLE_ISOM_FRAGMENTS
 				e = gf_isom_fragment_set_sample_roll_group(ctx->file, tkw->track_id, tkw->samples_in_frag, roll_type, roll);
+#else
+				e = GF_NOT_SUPPORTED;
+#endif
 			} else {
 				e = gf_isom_set_sample_roll_group(ctx->file, tkw->track_num, tkw->nb_samples, roll_type, roll);
 			}
@@ -4497,13 +5020,15 @@
 				tkw->gdr_type = sap_type;
 		}
 	}
-	
+
 	subs = gf_filter_pck_get_property(pck, GF_PROP_PCK_SUBS);
 	if (subs) {
 		//if no AUDelim nal and inband header injection, push new subsample
 		if (!first_nal_is_audelim && insert_subsample_dsi_size) {
 			if (for_fragment) {
+#ifndef GPAC_DISABLE_ISOM_FRAGMENTS
 				gf_isom_fragment_add_subsample(ctx->file, tkw->track_id, 0, insert_subsample_dsi_size, 0, 0, 0);
+#endif
 			} else {
 				gf_isom_add_subsample(ctx->file, tkw->track_num, tkw->nb_samples, 0, insert_subsample_dsi_size, 0, 0, 0);
 			}
@@ -4522,7 +5047,9 @@
 			u8 discardable = gf_bs_read_u8(ctx->bs_r);
 
 			if (for_fragment) {
+#ifndef GPAC_DISABLE_ISOM_FRAGMENTS
 				gf_isom_fragment_add_subsample(ctx->file, tkw->track_id, flags, subs_size, priority, reserved, discardable);
+#endif
 			} else {
 				gf_isom_add_subsample(ctx->file, tkw->track_num, tkw->nb_samples, flags, subs_size, priority, reserved, discardable);
 			}
@@ -4533,7 +5060,9 @@
 					GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("MP4Mux inserting inband param after AU delimiter NALU, but sample has subsample information not aligned on NALU (got %d subsample size but expecting %d) - file might be broken!\n", subs_size, first_nal_is_audelim));
 				}
 				if (for_fragment) {
+#ifndef GPAC_DISABLE_ISOM_FRAGMENTS
 					gf_isom_fragment_add_subsample(ctx->file, tkw->track_id, 0, insert_subsample_dsi_size, 0, 0, 0);
+#endif
 				} else {
 					gf_isom_add_subsample(ctx->file, tkw->track_num, tkw->nb_samples, 0, insert_subsample_dsi_size, 0, 0, 0);
 				}
@@ -4541,11 +5070,13 @@
 			}
 		}
 	} else if (for_fragment && tkw->has_subs && ctx->cmaf && (tkw->codecid==GF_CODECID_SUBS_XML)) {
+#ifndef GPAC_DISABLE_ISOM_FRAGMENTS
 		//tentative implemntation of CMAF 7.5.20 which is just nonsense text !!:
 		//"the value of subsample_count shall equal 1 for the first image sub-sample, and the subsample_count of the TTML document shall equal 0."
 		//
 		//we simply signal a single subsample
 		gf_isom_fragment_add_subsample(ctx->file, tkw->track_id, 0, tkw->sample.dataLength, 0, 0, 0);
+#endif
 	}
 
 	if (ctx->deps) {
@@ -4556,7 +5087,9 @@
 			u32 depended_on = (dep_flags>>2) & 0x3;
 			u32 redundant = (dep_flags) & 0x3;
 			if (for_fragment) {
+#ifndef GPAC_DISABLE_ISOM_FRAGMENTS
 				gf_isom_fragment_set_sample_flags(ctx->file, tkw->track_id, is_leading, depends_on, depended_on, redundant);
+#endif
 			} else {
 				gf_isom_set_sample_flags(ctx->file, tkw->track_num, tkw->nb_samples, is_leading, depends_on, depended_on, redundant);
 			}
@@ -4566,7 +5099,7 @@
 	u32 idx = 0;
 	while (1) {
 		Bool is_sample_group=GF_FALSE;
-		u32 aux_type=0, aux_info=0;
+		u32 aux_type=0, aux_info=0, sg_flags=0;
 		u32 p4cc;
 		const char *pname=NULL;
 		const GF_PropertyValue *p = gf_filter_pck_enum_properties(pck, &idx, &p4cc, &pname);
@@ -4586,17 +5119,46 @@
 		}
 
 		pname+=4;
-		if (strlen(pname) < 4) continue;
-		aux_type = GF_4CC(pname0, pname1, pname2, pname3);
-		if (pname4 == '_') aux_info = atoi(pname+5);
-
+		u32 plen = (u32) strlen(pname);
+		if (plen==3) {
+			aux_type = GF_4CC(pname0, pname1, pname2, ' ');
+			pname+=3;
+		} else if (plen >= 4) {
+			aux_type = GF_4CC(pname0, pname1, pname2, pname3);
+			pname+=4;
+		} else {
+			continue;
+		}
+		if (pname0 == '_') {
+			if (is_sample_group) {
+				char *flags = strstr(pname, "_z");
+				if (flags) flags0=0;
+				if (pname0) aux_info = atoi(pname);
+				if (flags) {
+					sscanf(flags+2, "%x", &sg_flags);
+					flags0='_';
+				}
+			} else {
+				aux_info = atoi(pname);
+			}
+		}
 		if (!aux_type) continue;
 
 		if (is_sample_group) {
-			gf_isom_set_sample_group_description(ctx->file, tkw->track_num, for_fragment ? 0 : tkw->nb_samples, aux_type, aux_info, p->value.data.ptr, p->value.data.size);
+			if (aux_type==GF_ISOM_SAMPLE_GROUP_ESGH) {
+				GF_Err gf_isom_set_sample_description_restricted(GF_ISOFile *movie, u32 trackNumber, u32 sampleDescIndex, u32 scheme_type);
+				gf_isom_set_sample_description_restricted(ctx->file, tkw->track_num, tkw->stsd_idx, GF_4CC( 'e', 's', 's', 'g'));
+
+				sg_flags |= 0x40000000;
+			}
+
+			gf_isom_set_sample_group_description(ctx->file, tkw->track_num, for_fragment ? 0 : tkw->nb_samples, aux_type, aux_info, p->value.data.ptr, p->value.data.size, sg_flags);
+
 		} else {
 			if (for_fragment) {
+#ifndef GPAC_DISABLE_ISOM_FRAGMENTS
 				gf_isom_fragment_set_sample_aux_info(ctx->file, tkw->track_id, tkw->samples_in_frag, aux_type, aux_info, p->value.data.ptr, p->value.data.size);
+#endif
 			} else {
 				gf_isom_add_sample_aux_info(ctx->file, tkw->track_num, tkw->nb_samples, aux_type, aux_info, p->value.data.ptr, p->value.data.size);
 			}
@@ -4613,8 +5175,15 @@
 			u64 mdur = gf_isom_get_media_duration(ctx->file, tkw->track_num);
 
 			/*patch to align to old arch */
-			if (gf_sys_old_arch_compat() && (tkw->stream_type==GF_STREAM_VISUAL)) {
-				mdur = tkw->sample.DTS;
+			if (gf_sys_old_arch_compat()) {
+				if (tkw->stream_type==GF_STREAM_VISUAL) {
+					mdur = tkw->sample.DTS;
+				}
+			}
+			//adjust if shift is below half sec (to take AV delay into account)
+			//if larger, we imported from non-0 initial ts, do not compensate
+			else if (tkw->ts_shift<tkw->tk_timescale/2) {
+				mdur += tkw->ts_shift;
 			}
 
 			if (ctx->importer) {
@@ -4726,6 +5295,7 @@
 
 	dsi = gf_filter_pid_get_property(tkw->ipid, GF_PROP_PID_DECODER_CONFIG);
 	dsi_enh = gf_filter_pid_get_property(tkw->ipid, GF_PROP_PID_DECODER_CONFIG_ENHANCEMENT);
+	Bool free_config_ba = GF_FALSE;
 
 	switch (tkw->codecid) {
 	case GF_CODECID_AVC:
@@ -4843,12 +5413,19 @@
 		media_brand = GF_ISOM_BRAND_VVIC;
 		break;
 	case GF_CODECID_RAW:
+	case GF_CODECID_RAW_UNCV:
 		p = gf_filter_pid_get_property(tkw->ipid, GF_PROP_PID_PIXFMT);
 		if (p && (p->value.uint==GF_PIXEL_UNCV)) {
 			image_props.config_ba = dsi->value.data.ptr;
 			image_props.config_ba_size = dsi->value.data.size;
 			item_type = GF_4CC('u','n','c','i');
 			break;
+		} else {
+			if (gf_pixel_fmt_get_uncc(p->value.uint, ctx->uncv-1, &image_props.config_ba, &image_props.config_ba_size)==GF_TRUE) {
+				free_config_ba = GF_TRUE;
+				item_type = GF_4CC('u','n','c','i');
+				break;
+			}
 		}
 	default:
 		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("Error: Codec %s not supported to create HEIF image items\n", gf_codecid_name(tkw->codecid) ));
@@ -4886,12 +5463,26 @@
 	p = gf_filter_pid_get_property(tkw->ipid, GF_PROP_PID_CLAP_Y);
 	if (p) { image_props.clap_vonum = p->value.frac.num; image_props.clap_voden = p->value.frac.den; }
 
+	p = gf_filter_pck_get_property_str(pck, "grp_ilce");
+	if (p && ((p->type==GF_PROP_DATA)||(p->type==GF_PROP_CONST_DATA)) && p->value.data.ptr) {
+		image_props.interlace_type = p->value.data.ptr0;
+	}
+	if (tkw->codecid==GF_CODECID_HEVC_TILES) {
+		p = gf_filter_pid_get_property(tkw->ipid, GF_PROP_PID_CROP_POS);
+		if (p) {
+			image_props.hOffset = p->value.vec2i.x;
+			image_props.vOffset = p->value.vec2i.y;
+		}
+	}
+
 	//setup crypto
 	if (tkw->is_encrypted && gf_filter_pck_get_crypt_flags(pck)) {
 		memset(&cenc_info, 0, sizeof(GF_ImageItemProtection));
 		p = gf_filter_pck_get_property(pck, GF_PROP_PCK_CENC_SAI);
 		if (!p) {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("Error: Missing CENC SAI on protected packet\n"));
+			if (config_box) gf_isom_box_del(config_box);
+			if (free_config_ba) gf_free(image_props.config_ba);
 			return GF_SERVICE_ERROR;
 		}
 		cenc_info.sai_data = p->value.data.ptr;
@@ -4900,6 +5491,8 @@
 		p = gf_filter_pid_get_property(tkw->ipid, GF_PROP_PID_PROTECTION_SCHEME_TYPE);
 		if (!p) {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("Error: Missing CENC scheme type on protected item\n"));
+			if (config_box) gf_isom_box_del(config_box);
+			if (free_config_ba) gf_free(image_props.config_ba);
 			return GF_SERVICE_ERROR;
 		}
 		cenc_info.scheme_type = p->value.uint;
@@ -4907,6 +5500,8 @@
 		p = gf_filter_pid_get_property(tkw->ipid, GF_PROP_PID_PROTECTION_SCHEME_VERSION);
 		if (!p) {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("Error: Missing CENC scheme version on protected item\n"));
+			if (config_box) gf_isom_box_del(config_box);
+			if (free_config_ba) gf_free(image_props.config_ba);
 			return GF_SERVICE_ERROR;
 		}
 		cenc_info.scheme_version = p->value.uint;
@@ -4914,6 +5509,8 @@
 		p = gf_filter_pid_get_property(tkw->ipid, GF_PROP_PID_CENC_KEY_INFO);
 		if (!p || (p->type != GF_PROP_DATA) || !gf_cenc_validate_key_info(p->value.data.ptr, p->value.data.size)) {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("Error: %s CENC Key info on protected item\n", p ? "Corrupted" : "Missing"));
+			if (config_box) gf_isom_box_del(config_box);
+			if (free_config_ba) gf_free(image_props.config_ba);
 			return GF_NON_COMPLIANT_BITSTREAM;
 		}
 		cenc_info.key_info = p->value.data.ptr;
@@ -4929,7 +5526,7 @@
 
 
 		if (tkw->insert_pssh) {
-			mp4_mux_cenc_insert_pssh(ctx, tkw, NULL, GF_FALSE);
+			mp4_mux_cenc_insert_pssh(ctx, tkw, NULL, 0);
 			tkw->insert_pssh = GF_FALSE;
 		}
 	}
@@ -4939,6 +5536,7 @@
 	e = gf_isom_add_meta_item_memory(ctx->file, GF_TRUE, 0, item_name, &item_id, item_type, NULL, NULL, &image_props, (u8 *)data, size, NULL);
 
 	if (config_box) gf_isom_box_del(config_box);
+	if (free_config_ba) gf_free(image_props.config_ba);
 
 	if (e) return e;
 
@@ -4966,6 +5564,14 @@
 	if (media_brand && (ctx->major_brand_set==2)) {
 		gf_isom_modify_alternate_brand(ctx->file, media_brand, 1);
 	}
+
+	if (tkw->codecid==GF_CODECID_HEVC_TILES) {
+		p = gf_filter_pid_get_property_str(tkw->ipid, "isom:tbas");
+		if (p && (p->value.uint_list.nb_items==1)) {
+			gf_isom_meta_add_item_ref(ctx->file, GF_TRUE, 0, item_id, p->value.uint_list.vals0, GF_ISOM_REF_TBAS, NULL);
+		}
+	}
+
 #if 0
 	if (e == GF_OK && meta->ref_type) {
 		e = gf_isom_meta_add_item_ref(file, meta->root_meta, tk, meta->item_id, meta->ref_item_id, meta->ref_type, NULL);
@@ -4984,7 +5590,9 @@
 				gf_filter_pck_set_property(ctx->dst_pck, GF_PROP_PCK_FILESUF, &PROP_STRING_NO_COPY(ctx->cur_file_suffix) );
 				ctx->cur_file_suffix = NULL;
 			}
-			ctx->notify_filename = 0;
+			ctx->notify_filename = GF_FALSE;
+			if (ctx->dash_seg_start.den)
+				gf_filter_pck_set_property(ctx->dst_pck, GF_PROP_PCK_MPD_SEGSTART, &PROP_FRAC64(ctx->dash_seg_start) );
 		}
 		gf_filter_pck_send(ctx->dst_pck);
 		ctx->dst_pck = NULL;
@@ -5014,7 +5622,9 @@
 	ctx->frag_has_intra = GF_FALSE;
 }
 
-static void mp4_mux_flush_seg(GF_MP4MuxCtx *ctx, Bool is_init, u64 idx_start_range, u64 idx_end_range)
+static GF_Err mp4_mux_on_data(void *cbk, u8 *data, u32 block_size, void *cbk_data, u32 cbk_magic);
+
+static void mp4_mux_flush_seg(GF_MP4MuxCtx *ctx, Bool is_init, u64 idx_start_range, u64 idx_end_range, Bool signal_flush)
 {
 	GF_FilterEvent evt;
 	TrackWriter *tkw = NULL;
@@ -5037,7 +5647,23 @@
 			gf_filter_pck_set_dependency_flags(ctx->dst_pck, 0xFF);
 			gf_filter_pck_set_carousel_version(ctx->dst_pck, 1);
 		}
+		//also inject m4cc after init seg - cf issue 2482
+		//don't send as new packet as this wll break framing if init segment, just expand the packet
+		//the init segment packet is always an allocated one, so expanding it is safe
+		if (is_init && ctx->eos_marker) {
+			u8 *data;
+			gf_filter_pck_expand(ctx->dst_pck, 8, NULL, &data, NULL);
+			memset(data, 0, 8);
+			data3 = 8;
+			data4 = ctx->m4cc0;
+			data5 = ctx->m4cc1;
+			data6 = ctx->m4cc2;
+			data7 = ctx->m4cc3;
+			mp4_mux_on_data(ctx, data, 8, NULL, 0);
+		}
 		mp4mux_send_output(ctx);
+		if (signal_flush)
+			gf_filter_pid_send_flush(ctx->opid);
 	}
 	if (!is_init && ctx->llhls_mode && ctx->frag_size) {
 		mp4_mux_flush_frag_hls(ctx);
@@ -5072,9 +5698,20 @@
 	}
 }
 
+static void mp4mux_check_mpd_start_time(GF_MP4MuxCtx *ctx, GF_FilterPacket *pck)
+{
+	const GF_PropertyValue *p = gf_filter_pck_get_property(pck, GF_PROP_PCK_MPD_SEGSTART);
+	if (p) {
+		ctx->dash_seg_start = p->value.lfrac;
+	} else {
+		ctx->dash_seg_start.num = 0;
+		ctx->dash_seg_start.den = 0;
+	}
+}
 
 static GF_Err mp4_mux_initialize_movie(GF_MP4MuxCtx *ctx)
 {
+#ifndef GPAC_DISABLE_ISOM_FRAGMENTS
 	GF_Err e;
 	u32 i, count = gf_list_count(ctx->tracks);
 	TrackWriter *ref_tkw = NULL;
@@ -5110,6 +5747,7 @@
 
 		pck = gf_filter_pid_get_packet(tkw->ipid);
 		if (!pck) {
+			//eos (wether real or flush event), continue setup
 			if (gf_filter_pid_is_eos(tkw->ipid)) {
 				if (tkw->dgl_copy) {
 					gf_filter_pck_discard(tkw->dgl_copy);
@@ -5146,7 +5784,7 @@
 		if (p && p->value.lfrac.den) {
 			tkw->pid_dur = p->value.lfrac;
 			if (tkw->pid_dur.num<0) tkw->pid_dur.num = -tkw->pid_dur.num;
-			if (max_dur.num * (s64) tkw->pid_dur.den < (s64) max_dur.den * tkw->pid_dur.num) {
+			if (gf_timestamp_less(max_dur.num, max_dur.den, tkw->pid_dur.num, tkw->pid_dur.den)) {
 				max_dur.num = tkw->pid_dur.num;
 				max_dur.den = tkw->pid_dur.den;
 			}
@@ -5203,7 +5841,9 @@
 						def_pck_dur /= pck_size;
 				}
 			} else {
-				def_pck_dur = 0;
+				//check if we have a default constant duration set, if so use it
+				p = gf_filter_pid_get_property(tkw->ipid, GF_PROP_PID_CONSTANT_DURATION);
+				def_pck_dur = p ? p->value.uint : 0;
 			}
 			if (tkw->raw_audio_bytes_per_sample)
 				def_samp_size = tkw->raw_audio_bytes_per_sample;
@@ -5261,6 +5901,7 @@
 			return e;
 		}
 
+#ifndef GPAC_DISABLE_ISOM_FRAGMENTS
 		if (ctx->refrag) {
 			p = gf_filter_pid_get_property(tkw->ipid, GF_PROP_PID_ISOM_TREX_TEMPLATE);
 			if (p) {
@@ -5269,6 +5910,7 @@
 				GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("MP4Mux Refragmentation with default track fragment flags signaling but no TREX found in source track %d, using defaults computed from PID, result might be broken\n", tkw->track_id));
 			}
 		}
+#endif
 
 
 		if (ctx->tfdt.den && ctx->tfdt.num) {
@@ -5402,9 +6044,9 @@
 		ctx->current_size = ctx->current_offset = 0;
 		ctx->first_pck_sent = GF_FALSE;
 	} else {
-		mp4_mux_flush_seg(ctx, GF_TRUE, 0, 0);
+		mp4_mux_flush_seg(ctx, GF_TRUE, 0, 0, GF_TRUE);
 	}
-	assert(!ctx->dst_pck);
+	gf_assert(!ctx->dst_pck);
 
 	//change major brand for segments
 	if (ctx->styp && (strlen(ctx->styp)>=4)) {
@@ -5485,8 +6127,13 @@
 		gf_isom_allocate_sidx(ctx->file, ctx->subs_sidx, ctx->chain_sidx, 0, NULL, NULL, NULL, ctx->ssix);
 	}
 	return GF_OK;
+#else
+	return GF_NOT_SUPPORTED;
+#endif
 }
 
+#ifndef GPAC_DISABLE_ISOM_FRAGMENTS
+
 static GF_Err mp4_mux_start_fragment(GF_MP4MuxCtx *ctx, GF_FilterPacket *pck)
 {
 	GF_Err e;
@@ -5546,10 +6193,13 @@
 		if (ctx->truns_first) {
 			gf_isom_set_fragment_option(ctx->file, tkw->track_id, GF_ISOM_TRAF_TRUNS_FIRST, 1);
 		}
-		//7.7 cmf2 For video CMAF Tracks not contained in Track Files, Version 1 shall be used.
-		if ((ctx->cmaf==MP4MX_CMAF_CMF2) && (tkw->stream_type==GF_STREAM_VISUAL))
-			gf_isom_set_fragment_option(ctx->file, tkw->track_id, GF_ISOM_TRAF_TRUN_V1, 1);
 
+		if (ctx->trunv1 ||
+			//7.7 cmf2 For video CMAF Tracks not contained in Track Files, Version 1 shall be used.
+			((ctx->cmaf==MP4MX_CMAF_CMF2) && (tkw->stream_type==GF_STREAM_VISUAL))
+		) {
+			gf_isom_set_fragment_option(ctx->file, tkw->track_id, GF_ISOM_TRAF_TRUN_V1, 1);
+		}
 		if (ctx->sdtp_traf)
 			gf_isom_set_fragment_option(ctx->file, tkw->track_id, GF_ISOM_TRAF_USE_SAMPLE_DEPS_BOX, ctx->sdtp_traf);
 
@@ -5557,10 +6207,10 @@
 			gf_isom_set_fragment_option(ctx->file, tkw->track_id, GF_ISOM_TRAF_USE_LARGE_TFDT, ctx->tfdt64);
 
 		if (tkw->dyn_pssh) {
-			mp4_mux_cenc_insert_pssh(ctx, tkw, NULL, GF_TRUE);
+			mp4_mux_cenc_insert_pssh(ctx, tkw, NULL, 2);
 		}
 		else if (ctx->insert_pssh)
-			mp4_mux_cenc_insert_pssh(ctx, tkw, NULL, GF_FALSE);
+			mp4_mux_cenc_insert_pssh(ctx, tkw, NULL, 1);
 	}
 	ctx->fragment_started = GF_TRUE;
 	ctx->insert_tfdt = GF_FALSE;
@@ -5568,7 +6218,7 @@
 	return GF_OK;
 }
 
-static GF_Err mp4_mux_flush_fragmented(GF_Filter *filter, GF_MP4MuxCtx *ctx)
+static GF_Err mp4_mux_flush_fragmented(GF_MP4MuxCtx *ctx)
 {
 	GF_FilterPacket *pck;
 	u8 *output;
@@ -5598,7 +6248,7 @@
 	gf_filter_pck_set_framing(pck, GF_FALSE, GF_FALSE);
 	gf_filter_pck_send(pck);
 	//we are not done flushing but we have no more input packets, signal we still need processing
-	gf_filter_ask_rt_reschedule(filter, 1);
+	gf_filter_ask_rt_reschedule(ctx->filter, 1);
 	return GF_OK;
 }
 
@@ -5631,23 +6281,24 @@
 		ctx->box_patched = GF_TRUE;
 	}
 }
+#endif // GPAC_DISABLE_ISOM_FRAGMENTS
 
 
 static GF_Err mp4_mux_initialize(GF_Filter *filter);
 
-GF_Err mp4mx_reload_output(GF_Filter *filter, GF_MP4MuxCtx *ctx)
+GF_Err mp4mx_reload_output(GF_MP4MuxCtx *ctx)
 {
 	GF_Err e;
 	u32 i, count = gf_list_count(ctx->tracks);
 
 	//done with the file
 	if (ctx->file) {
-		e = mp4_mux_done(filter, ctx, GF_FALSE);
+		e = mp4_mux_done(ctx, GF_FALSE);
 		if (e) return e;
 		ctx->file = NULL;
 	}
 	ctx->init_movie_done = GF_FALSE;
-	e = mp4_mux_initialize(filter);
+	e = mp4_mux_initialize(ctx->filter);
 	if (e) return e;
 	ctx->config_timing = GF_TRUE;
 
@@ -5658,7 +6309,7 @@
 		tkw->nb_samples = 0;
 		tkw->max_cts = 0;
 		tkw->min_cts = (u64) -1;
-		e = mp4_mux_configure_pid(filter, tkw->ipid, GF_FALSE);
+		e = mp4_mux_configure_pid(ctx->filter, tkw->ipid, GF_FALSE);
 		if (e) return e;
 		tkw->nb_samples = 0;
 		tkw->sample.DTS = 0;
@@ -5666,11 +6317,11 @@
 		tkw->samples_in_stsd = 0;
 		tkw->samples_in_frag = 0;
 	}
-	assert(ctx->next_file_idx);
+	gf_assert(ctx->next_file_idx);
 	ctx->cur_file_idx_plus_one = ctx->next_file_idx;
 	ctx->next_file_idx = 0;
 	ctx->notify_filename = GF_TRUE;
-	assert(!ctx->cur_file_suffix);
+	gf_assert(!ctx->cur_file_suffix);
 	if (ctx->next_file_suffix) {
 		ctx->cur_file_suffix = gf_strdup(ctx->next_file_suffix);
 		ctx->next_file_suffix = NULL;
@@ -5678,14 +6329,14 @@
 	return GF_OK;
 }
 
-
-static GF_Err mp4_mux_process_fragmented(GF_Filter *filter, GF_MP4MuxCtx *ctx)
+static GF_Err mp4_mux_process_fragmented(GF_MP4MuxCtx *ctx)
 {
+#ifndef GPAC_DISABLE_ISOM_FRAGMENTS
 	GF_Err e = GF_OK;
 	u32 nb_eos, nb_done, nb_suspended, i, count;
 
 	if (ctx->flush_size) {
-		return mp4_mux_flush_fragmented(filter, ctx);
+		return mp4_mux_flush_fragmented(ctx);
 	}
 
 	if (!ctx->file)
@@ -5700,30 +6351,6 @@
 	}
 	/*get count after init, some tracks may have been remove*/
 	count = gf_list_count(ctx->tracks);
-	if (ctx->dash_mode && !ctx->segment_started) {
-		//don't start a new segment if all pids are in eos
-		nb_eos=0;
-		for (i=0; i<count; i++) {
-			TrackWriter *tkw = gf_list_get(ctx->tracks, i);
-			if (gf_filter_pid_is_eos(tkw->ipid)) {
-				nb_eos ++;
-			}
-		}
-		if (nb_eos==count)
-			goto check_eos;
-
-		ctx->segment_started = GF_TRUE;
-		ctx->insert_tfdt = GF_TRUE;
-		switch (ctx->psshs) {
-		case MP4MX_PSSH_MOOF:
-		case MP4MX_PSSH_BOTH:
-			ctx->insert_pssh = GF_TRUE; break;
-		default:
-			ctx->insert_pssh = GF_FALSE; break;
-		}
-
-		gf_isom_start_segment(ctx->file, ctx->single_file ? NULL : "_gpac_isobmff_redirect", GF_FALSE);
-	}
 
 	//process pid by pid
 	nb_eos=0;
@@ -5755,11 +6382,12 @@
 					if (ctx->next_file_idx)
 						nb_suspended++;
 					nb_done ++;
-					nb_eos++;
 					if (tkw->dgl_copy) {
 						gf_filter_pck_discard(tkw->dgl_copy);
 						tkw->dgl_copy = NULL;
 					}
+					if (!gf_filter_pid_is_flush_eos(tkw->ipid))
+						nb_eos++;
 					break;
 				}
 				return GF_OK;
@@ -5772,6 +6400,20 @@
 				if (ctx->dash_mode) ctx->flush_seg = GF_TRUE;
 				break;
 			}
+			//we create dash segment only when we know we have a packet, not before this loop.
+			//This allows taking into account flush signals, otherwise we would create empty segments
+			if (ctx->dash_mode && !ctx->segment_started) {
+				ctx->segment_started = GF_TRUE;
+				ctx->insert_tfdt = GF_TRUE;
+				switch (ctx->psshs) {
+				case MP4MX_PSSH_MOOF:
+				case MP4MX_PSSH_BOTH:
+					ctx->insert_pssh = GF_TRUE; break;
+				default:
+					ctx->insert_pssh = GF_FALSE; break;
+				}
+				gf_isom_start_segment(ctx->file, ctx->single_file ? NULL : "_gpac_isobmff_redirect", GF_FALSE);
+			}
 
 			cts = gf_filter_pck_get_cts(pck);
 
@@ -5858,6 +6500,7 @@
 
 			if (ctx->dash_mode) {
 				if (p) {
+					mp4mux_check_mpd_start_time(ctx, pck);
 					//start of next segment, abort fragmentation for this track and flush all other writers
 					if (ctx->dash_seg_num_plus_one && (ctx->dash_seg_num_plus_one != 1 + p->value.uint) ) {
 						tkw->fragment_done = GF_TRUE;
@@ -5890,8 +6533,8 @@
 
 				dts = gf_filter_pck_get_dts(pck);
 				if (dts==GF_FILTER_NO_TS) dts = cts;
-				if (tkw->first_dts_in_seg > dts)
-					tkw->first_dts_in_seg = dts;
+				if (tkw->first_dts_in_seg_plus_one && (tkw->first_dts_in_seg_plus_one - 1 > dts))
+					tkw->first_dts_in_seg_plus_one = 1 + dts;
 			}
 			ncts = cts + gf_filter_pck_get_duration(pck);
 			if (tkw->cts_next < ncts)
@@ -5926,7 +6569,6 @@
 				}
 				if (frag_done) {
 					ctx->adjusted_next_frag_start = gf_timestamp_rescale(check_ts, tkw->src_timescale, ctx->cdur.den);
-//
 					tkw->fragment_done = GF_TRUE;
 					nb_done ++;
 					tkw->dur_in_frag = 0;
@@ -5991,7 +6633,9 @@
 					gf_isom_set_traf_base_media_decode_time(ctx->file, tkw->track_id, odts + tkw->ts_delay);
 				else
 					gf_isom_set_traf_base_media_decode_time(ctx->file, tkw->track_id, odts);
-				tkw->first_dts_in_seg = (u64) odts;
+
+				if (!tkw->first_dts_in_seg_plus_one)
+					tkw->first_dts_in_seg_plus_one = 1 + (u64) odts;
 			}
 
 			if (ctx->trun_inter) {
@@ -6053,8 +6697,13 @@
 
 
 	if (nb_done==count) {
+		//nothing open (this happens when flushing segments/fragments)
+		if (!ctx->segment_started && !ctx->fragment_started)
+			goto check_eos;
+
 		Bool is_eos = (count == nb_eos) ? GF_TRUE : GF_FALSE;
 		u32 ref_timescale;
+		Bool flush_refs = ctx->dash_mode ? GF_FALSE : GF_TRUE;
 		u64 next_ref_ts = ctx->ref_tkw->next_seg_cts;
 		if (is_eos)
 			next_ref_ts = ctx->ref_tkw->cts_next;
@@ -6079,6 +6728,7 @@
 			s32 subs_sidx = -1;
 			u32 track_ref_id = 0;
 
+			ctx->last_block_in_segment = 1;
 			idx_start_range = idx_end_range = 0;
 			if (ctx->subs_sidx>=0) {
 				subs_sidx = ctx->subs_sidx;
@@ -6091,8 +6741,13 @@
 				ctx->cloned_sidx = NULL;
 			}
 
-			e = gf_isom_close_segment(ctx->file, subs_sidx, track_ref_id, ctx->ref_tkw->first_dts_in_seg, ctx->ref_tkw->ts_delay, next_ref_ts, ctx->chain_sidx, ctx->ssix, ctx->sseg ? GF_FALSE : is_eos, GF_FALSE, ctx->eos_marker, &idx_start_range, &idx_end_range, &segment_size_in_bytes);
+			e = gf_isom_close_segment(ctx->file, subs_sidx, track_ref_id, ctx->ref_tkw->first_dts_in_seg_plus_one ? ctx->ref_tkw->first_dts_in_seg_plus_one-1 : 0,
+				ctx->ref_tkw->negctts_shift ? 0 : ctx->ref_tkw->ts_delay,
+				next_ref_ts, ctx->chain_sidx, ctx->ssix, ctx->sseg ? GF_FALSE : is_eos, GF_FALSE, ctx->eos_marker, &idx_start_range, &idx_end_range, &segment_size_in_bytes);
+			ctx->ref_tkw->first_dts_in_seg_plus_one = 0;
+			ctx->last_block_in_segment = 0;
 			if (e) return e;
+			flush_refs = GF_TRUE;
 
 			GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("MP4Mux Done writing segment %d - estimated next fragment times start %g end %g\n", ctx->dash_seg_num_plus_one - 1, ((Double)next_ref_ts)/ref_timescale, ((Double)ctx->next_frag_start)/ctx->cdur.den ));
 
@@ -6103,28 +6758,39 @@
 					ctx->flush_idx_end_range = idx_end_range ? offset + idx_end_range : 0;
 					return GF_OK;
 				}
-				mp4_mux_flush_seg(ctx, GF_FALSE, offset + idx_start_range, idx_end_range ? offset + idx_end_range : 0);
+				mp4_mux_flush_seg(ctx, GF_FALSE, offset + idx_start_range, idx_end_range ? offset + idx_end_range : 0, !is_eos);
 			} else if (ctx->vodcache==MP4MX_VODCACHE_REPLACE) {
-				mp4_mux_flush_seg(ctx, GF_FALSE, 0, 0);
+				mp4_mux_flush_seg(ctx, GF_FALSE, 0, 0, GF_FALSE);
 			} else {
 				if (ctx->nb_seg_sizes == ctx->alloc_seg_sizes) {
 					 ctx->alloc_seg_sizes *= 2;
 					 if (!ctx->alloc_seg_sizes) ctx->alloc_seg_sizes = 10;
 					 ctx->seg_sizes = gf_realloc(ctx->seg_sizes, sizeof(u32) * ctx->alloc_seg_sizes);
 				}
-				assert(segment_size_in_bytes);
+				gf_assert(segment_size_in_bytes);
 				ctx->seg_sizesctx->nb_seg_sizes = (u32) segment_size_in_bytes;
 				ctx->nb_seg_sizes++;
 			}
 			//we still need to send seg size info for for HLS !
 			if (ctx->vodcache==MP4MX_VODCACHE_INSERT)
-				mp4_mux_flush_seg(ctx, GF_FALSE, 0, 0);
+				mp4_mux_flush_seg(ctx, GF_FALSE, 0, 0, !is_eos);
 		}
 		//cannot flush in DASH mode if using sidx (vod single sidx or live 1 sidx/seg)
 		else if (!ctx->dash_mode || ((ctx->subs_sidx<0) && (ctx->dash_mode<MP4MX_DASH_VOD) && !ctx->cloned_sidx) ) {
 			gf_isom_flush_fragments(ctx->file, GF_FALSE);
-
-			GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("MP4Mux Done writing fragment - next fragment start time %g\n", ((Double)ctx->next_frag_start)/ctx->cdur.den ));
+			flush_refs = GF_TRUE;
+			//if not in dash and EOS marker is set, inject marker after each fragment
+			if (!ctx->dash_mode && ctx->eos_marker && ctx->fragment_started) {
+				u8 data8;
+				memset(data, 0, 8);
+				data3 = 8;
+				data4 = ctx->m4cc0;
+				data5 = ctx->m4cc1;
+				data6 = ctx->m4cc2;
+				data7 = ctx->m4cc3;
+				mp4_mux_on_data(ctx, data, 8, NULL, 0);
+			}
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("MP4Mux Done writing fragment - next fragment start time %g\n", ((Double)ctx->next_frag_start)/ctx->cdur.den ));
 
 			//we need to wait for packet to be written
 			if (ctx->seg_flush_state) {
@@ -6137,10 +6803,8 @@
 			}
 
 			if (!ctx->dash_mode || ctx->flush_seg) {
-				mp4_mux_flush_seg(ctx, GF_FALSE, 0, 0);
+				mp4_mux_flush_seg(ctx, GF_FALSE, 0, 0, !is_eos);
 			}
-
-			GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("MP4Mux Done writing fragment - next fragment start time %g\n", ((Double)ctx->next_frag_start)/ctx->cdur.den ));
 		}
 		ctx->fragment_started = GF_FALSE;
 
@@ -6151,11 +6815,18 @@
 			ctx->nb_segs++;
 			ctx->nb_frags_in_seg=0;
 		}
+		//destroy any pending refs
+		if (flush_refs) {
+			while (gf_list_count(ctx->ref_pcks)) {
+				GF_FilterPacket *pckr = gf_list_pop_back(ctx->ref_pcks);
+				gf_filter_pck_unref(pckr);
+			}
+		}
 	}
 
 	if (nb_suspended && (nb_suspended==count)) {
 		ctx->nb_segs=0;
-		return mp4mx_reload_output(filter, ctx);
+		return mp4mx_reload_output(ctx);
 	}
 
 check_eos:
@@ -6173,7 +6844,7 @@
 				//flush sidx packet
 				mp4mux_send_output(ctx);
 
-				mp4_mux_flush_seg(ctx, GF_TRUE, ctx->current_offset, ctx->current_offset + ctx->current_size - 1);
+				mp4_mux_flush_seg(ctx, GF_TRUE, ctx->current_offset, ctx->current_offset + ctx->current_size - 1, GF_FALSE);
 
 				gf_fflush(ctx->tmp_store);
 				ctx->flush_size = gf_ftell(ctx->tmp_store);
@@ -6184,7 +6855,7 @@
 					start_offset = ctx->current_offset;
 					for (i=0; i<ctx->nb_seg_sizes; i++) {
 						ctx->current_size = ctx->seg_sizesi;
-						mp4_mux_flush_seg(ctx, GF_FALSE, 0, 0);
+						mp4_mux_flush_seg(ctx, GF_FALSE, 0, 0, GF_FALSE);
 					}
 					ctx->current_offset = start_offset;
 					ctx->current_size = 0;
@@ -6210,8 +6881,10 @@
 
 		return ctx->flush_size ? GF_OK : GF_EOS;
 	}
-
 	return GF_OK;
+#else
+	return GF_NOT_SUPPORTED;
+#endif
 }
 
 struct _service_info
@@ -6250,14 +6923,14 @@
 static void mp4_mux_update_init_edit(GF_MP4MuxCtx *ctx, TrackWriter *tkw, u64 min_ts_service, Bool skip_adjust)
 {
 	//compute offsets
-	s64 dts_diff = gf_timestamp_rescale(min_ts_service, 1000000, tkw->src_timescale);
+	s64 dts_diff = ctx->tsalign ? gf_timestamp_rescale(min_ts_service, 1000000, tkw->src_timescale) : 0;
 
 	if (!skip_adjust) {
 		dts_diff = (s64) tkw->ts_shift - dts_diff;
 	}
 	if (ctx->is_rewind) dts_diff = -dts_diff;
 	//negative could happen due to rounding, ignore them
-	if (dts_diff<=0) return;
+	if (dts_diff <= (gf_sys_old_arch_compat() ? 0 : 1)) return;
 
 	// dts_diff > 0, we need to delay the track
 	u64 dur = gf_timestamp_rescale(dts_diff, tkw->src_timescale, ctx->moovts);
@@ -6366,15 +7039,18 @@
 		}
 
 		if (!pck) {
+			//eos (wether real or flush event), setup cenc
 			if (gf_filter_pid_is_eos(tkw->ipid)) {
 				if (tkw->cenc_state==CENC_NEED_SETUP)
 					mp4_mux_cenc_update(ctx, tkw, NULL, CENC_CONFIG, 0, 0);
 
 				if (!tkw->nb_samples) {
+#ifndef GPAC_DISABLE_ISOM_FRAGMENTS
 					const GF_PropertyValue *p = gf_filter_pid_get_property(tkw->ipid, GF_PROP_PID_ISOM_TREX_TEMPLATE);
 					if (p) {
 						gf_isom_setup_track_fragment_template(ctx->file, tkw->track_id, p->value.data.ptr, p->value.data.size, ctx->nofragdef);
 					}
+#endif
 				}
 				if (tkw->dgl_copy) {
 					gf_filter_pck_discard(tkw->dgl_copy);
@@ -6442,7 +7118,7 @@
 		if (blocking_refs && has_ready) {
 			GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("MP4Mux Blocking input packets present, aborting initial timing sync\n"));
 		}
-		//this may be quite long until we have a packet in case input pid is video encoding 
+		//this may be quite long until we have a packet in case input pid is video encoding
 		else if (ctx->config_retry_start && (gf_sys_clock() - ctx->config_retry_start > 10000)) {
 			GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("MP4Mux No input packets present on one or more inputs for more than 10s, aborting initial timing sync\n"));
 		} else {
@@ -6475,12 +7151,12 @@
 	del_service_info(services);
 }
 
-void mp4_mux_format_report(GF_Filter *filter, GF_MP4MuxCtx *ctx, u64 done, u64 total)
+void mp4_mux_format_report(GF_MP4MuxCtx *ctx, u64 done, u64 total)
 {
 	Bool status_changed=GF_FALSE;
 	u32 total_pc = 0;
 	char *status = NULL, szTmp2048, szTK20;
-	if (!gf_filter_reporting_enabled(filter))
+	if (!gf_filter_reporting_enabled(ctx->filter))
 		return;
 	if (!ctx->update_report)
 		return;
@@ -6515,9 +7191,9 @@
 			Double next = ((Double)ctx->next_frag_start)/ctx->cdur.den;
 			is_frag = GF_TRUE;
 			if (ctx->dash_mode) {
-				sprintf(szTmp, "mux segments %d (frags %d) next %02.02g", ctx->nb_segs, ctx->nb_frags_in_seg, next);
+				sprintf(szTmp, "mux segments %d (frags %d) next %02.3f", ctx->nb_segs, ctx->nb_frags_in_seg, next);
 			} else {
-				sprintf(szTmp, "mux frags %d next %02.02g", ctx->nb_frags, next);
+				sprintf(szTmp, "mux frags %d next %02.3f", ctx->nb_frags, next);
 			}
 		} else {
 			sprintf(szTmp, "%s", ((ctx->store==MP4MX_MODE_FLAT) || (ctx->store==MP4MX_MODE_FASTSTART)) ? "mux" : "import");
@@ -6572,7 +7248,7 @@
 		}
 	}
 	if (status_changed) {
-		gf_filter_update_status(filter, total_pc, status);
+		gf_filter_update_status(ctx->filter, total_pc, status);
 	}
 	if (status) gf_free(status);
 }
@@ -6589,7 +7265,7 @@
 	if (ctx->config_timing) {
 		mp4_mux_config_timing(ctx);
 		if (ctx->config_timing) {
-			mp4_mux_format_report(filter, ctx, 0, 0);
+			mp4_mux_format_report(ctx, 0, 0);
 			return GF_OK;
 		}
 	}
@@ -6597,13 +7273,17 @@
 	//fragmented mode
 	if (ctx->store>=MP4MX_MODE_FRAG) {
 		u32 done=0;
+		//postpone until no pending connections, otherwise we will create init segment without all tracks
+		if (gf_filter_connections_pending(filter))
+			return GF_OK;
+
 		if (ctx->seg_flush_state==1) return GF_OK;
 		else if (ctx->seg_flush_state==2)
 			mp4_mux_flush_seg_events(ctx);
 
-		GF_Err e = mp4_mux_process_fragmented(filter, ctx);
+		GF_Err e = mp4_mux_process_fragmented(ctx);
 		if (e==GF_EOS) done=100;
-		mp4_mux_format_report(filter, ctx, done, done);
+		mp4_mux_format_report(ctx, done, done);
 		return e;
 	}
 
@@ -6620,7 +7300,7 @@
 		}
 
 		if (!pck) {
-			if (gf_filter_pid_is_eos(tkw->ipid)) {
+			if (gf_filter_pid_is_eos(tkw->ipid) && !gf_filter_pid_is_flush_eos(tkw->ipid)) {
 				tkw->suspended = GF_FALSE;
 				nb_eos++;
 			}
@@ -6643,6 +7323,7 @@
 			const GF_PropertyValue *p;
 			p = gf_filter_pck_get_property(pck, GF_PROP_PCK_FILENUM);
 			if (p) {
+				mp4mux_check_mpd_start_time(ctx, pck);
 				if (!ctx->cur_file_idx_plus_one) {
 					ctx->cur_file_idx_plus_one = p->value.uint + 1;
 					if (!ctx->cur_file_suffix) {
@@ -6697,15 +7378,15 @@
 		}
 		if (e) return e;
 	}
-	mp4_mux_format_report(filter, ctx, 0, 0);
+	mp4_mux_format_report(ctx, 0, 0);
 
 	if (nb_suspended && (nb_suspended+nb_eos==count)) {
-		return mp4mx_reload_output(filter, ctx);
+		return mp4mx_reload_output(ctx);
 	}
 
 	if (count == nb_eos) {
 		if (ctx->file) {
-			GF_Err e = mp4_mux_done(filter, ctx, GF_TRUE);
+			GF_Err e = mp4_mux_done(ctx, GF_TRUE);
 			if (e) return e;
 		}
 		return GF_EOS;
@@ -6717,10 +7398,8 @@
 		u64 prog_done=0, prog_total=0;
 		for (i=0; i<count; i++) {
 			TrackWriter *tkw = gf_list_get(ctx->tracks, i);
-			if (prog_done * tkw->prog_total <= tkw->prog_done * prog_total) {
-				prog_done = tkw->prog_done;
-				prog_total = tkw->prog_total;
-			}
+			prog_done += tkw->prog_done;
+			prog_total += tkw->prog_total;
 		}
 		gf_set_progress("Import", prog_done, prog_total);
 	}
@@ -6730,9 +7409,8 @@
 
 static GF_Err mp4_mux_on_data_patch(void *cbk, u8 *data, u32 block_size, u64 file_offset, Bool is_insert)
 {
-	GF_Filter *filter = (GF_Filter *) cbk;
+	GF_MP4MuxCtx *ctx = (GF_MP4MuxCtx *) cbk;
 	u8 *output;
-	GF_MP4MuxCtx *ctx = gf_filter_get_udta(filter);
 
 	GF_FilterPacket *pck = gf_filter_pck_new_alloc(ctx->opid, block_size, &output);
 	if (!pck) return GF_OUT_OF_MEM;
@@ -6754,7 +7432,7 @@
 	}
 
 	if (!ctx->dash_mode || ctx->flush_seg) {
-		mp4_mux_flush_seg(ctx, GF_FALSE, ctx->flush_idx_start_range, ctx->flush_idx_end_range);
+		mp4_mux_flush_seg(ctx, GF_FALSE, ctx->flush_idx_start_range, ctx->flush_idx_end_range, GF_FALSE);
 	}
 
 	ctx->fragment_started = GF_FALSE;
@@ -6782,17 +7460,19 @@
 
 static void mp4_mux_on_last_block_start(void *cbk)
 {
-	GF_Filter *filter = (GF_Filter *) cbk;
-	GF_MP4MuxCtx *ctx = gf_filter_get_udta(filter);
+	GF_MP4MuxCtx *ctx = (GF_MP4MuxCtx *) cbk;
+
+	if (ctx->last_block_in_segment == 1)
+		ctx->last_block_in_segment = 2;
 	if (ctx->force_seg_sync)
 		ctx->seg_flush_state = 1;
 }
 
-static GF_Err mp4_mux_on_data(void *cbk, u8 *data, u32 block_size)
+static GF_Err mp4_mux_on_data(void *cbk, u8 *data, u32 block_size, void *cbk_data, u32 cbk_magic)
 {
-	GF_Filter *filter = (GF_Filter *) cbk;
+	GF_MP4MuxCtx *ctx = (GF_MP4MuxCtx *) cbk;
 	u8 *output;
-	GF_MP4MuxCtx *ctx = gf_filter_get_udta(filter);
+	u32 src_pck_dur=0;
 
 	ctx->total_bytes_out += block_size;
 
@@ -6815,7 +7495,7 @@
 			gf_filter_pck_send(pck);
 		} else {
 			GF_BitStream *bs;
-			assert(!ctx->dst_pck);
+			gf_assert(!ctx->dst_pck);
 
 			if (block_size > ctx->sidx_max_size) {
 				GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("MP4Mux Final SIDX chunk larger than preallocated block, will not flush SIDX (output file still readable). Try disabling nocache mode\n"));
@@ -6838,7 +7518,7 @@
 			gf_bs_del(bs);
 			gf_filter_pck_send(pck);
 		}
-		mp4_mux_flush_seg(ctx, GF_TRUE, ctx->sidx_chunk_offset+free_size, ctx->sidx_chunk_offset+free_size + block_size - 1);
+		mp4_mux_flush_seg(ctx, GF_TRUE, ctx->sidx_chunk_offset+free_size, ctx->sidx_chunk_offset+free_size + block_size - 1, GF_FALSE);
 		return GF_OK;
 	}
 
@@ -6851,27 +7531,56 @@
 		return GF_OK;
 	}
 
+	GF_FilterPacket *srcp = (GF_FilterPacket *)cbk_data;
+	if (srcp && gf_list_find(ctx->ref_pcks, srcp)<0) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("MP4Mux Data callback on non-existing packet reference !\n"));
+		return GF_IO_ERR;
+	}
+
+	if (srcp) {
+		if (ctx->seg_flush_state) {
+			ctx->dst_pck = gf_filter_pck_new_ref_destructor(ctx->opid, cbk_magic, block_size, srcp, mp4_mux_on_packet_destruct);
+		} else {
+			ctx->dst_pck = gf_filter_pck_new_ref(ctx->opid, cbk_magic, block_size, srcp);
+		}
+		gf_list_del_item(ctx->ref_pcks, srcp);
+		src_pck_dur = (u32) gf_timestamp_rescale(gf_filter_pck_get_duration(srcp), gf_filter_pck_get_timescale(srcp), 1000);
+		gf_filter_pck_unref(srcp);
+	}
 	//allocate new one
-	if (ctx->seg_flush_state) {
+	else if (ctx->seg_flush_state) {
 		ctx->dst_pck = gf_filter_pck_new_alloc_destructor(ctx->opid, block_size, &output, mp4_mux_on_packet_destruct);
 	} else {
 		ctx->dst_pck = gf_filter_pck_new_alloc(ctx->opid, block_size, &output);
 	}
 	if (!ctx->dst_pck) return GF_OUT_OF_MEM;
 
-	memcpy(output, data, block_size);
-	gf_filter_pck_set_framing(ctx->dst_pck, !ctx->first_pck_sent, GF_FALSE);
+	if (!cbk_data)
+		memcpy(output, data, block_size);
+	//set framing - if we use separate files, mark end of file (for faster flush in sinks)
+	gf_filter_pck_set_framing(ctx->dst_pck, !ctx->first_pck_sent, (ctx->cur_file_idx_plus_one && (ctx->last_block_in_segment==2)) ? GF_TRUE : GF_FALSE);
 
 	//set packet prop as string since we may discard the seg_name  packet before this packet is processed
 	if (!ctx->first_pck_sent && ctx->seg_name) {
 		ctx->current_offset = 0;
 		gf_filter_pck_set_property(ctx->dst_pck, GF_PROP_PCK_FILENAME, &PROP_STRING(ctx->seg_name) );
 		gf_filter_pck_set_property(ctx->dst_pck, GF_PROP_PCK_FILENUM, &PROP_UINT(ctx->dash_seg_num_plus_one-1) );
+		if (ctx->dash_seg_start.den)
+			gf_filter_pck_set_property(ctx->dst_pck, GF_PROP_PCK_MPD_SEGSTART, &PROP_FRAC64(ctx->dash_seg_start) );
 	}
+
 	if (ctx->min_cts_plus_one) {
 		u64 orig = ctx->min_cts_plus_one-1;
 		gf_filter_pck_set_cts(ctx->dst_pck, orig);
-		gf_filter_pck_set_duration(ctx->dst_pck, (u32) (ctx->min_cts_next_frag - orig) );
+		//if we have a source packet duration, use it
+		if (src_pck_dur)
+			gf_filter_pck_set_duration(ctx->dst_pck, src_pck_dur);
+		//it may happen that we don't know precisely the min_cts_next_frag, this is a rough compute based on desire frag dur
+		//if duration is wrong, signal to send asap (dur = 1)
+		else if (ctx->min_cts_next_frag > orig)
+			gf_filter_pck_set_duration(ctx->dst_pck, (u32) (ctx->min_cts_next_frag - orig) );
+		else
+			gf_filter_pck_set_duration(ctx->dst_pck, 1);
 	}
 
 	if ((ctx->llhls_mode>1) && ctx->fragment_started && !ctx->frag_size && ctx->dst_pck) {
@@ -6894,14 +7603,20 @@
 	GF_Filter *filter = (GF_Filter *)udta;
 	GF_MP4MuxCtx *ctx = gf_filter_get_udta(filter);
 	ctx->update_report = GF_TRUE;
-	mp4_mux_format_report(filter, ctx, done, total);
+	mp4_mux_format_report(ctx, done, total);
 }
 
 static GF_Err mp4_mux_initialize(GF_Filter *filter)
 {
 	GF_MP4MuxCtx *ctx = gf_filter_get_udta(filter);
 	gf_filter_set_max_extra_input_pids(filter, -1);
-
+	ctx->filter = filter;
+#ifdef GPAC_DISABLE_ISOM_FRAGMENTS
+	if (ctx->store>=MP4MX_MODE_FRAG) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("MP4Mux Cannot use fragmented mode, disabled in build\n"));
+		return GF_NOT_SUPPORTED;
+	}
+#endif
 	if (ctx->file) {
 		if (gf_isom_get_mode(ctx->file) < GF_ISOM_OPEN_WRITE) return GF_BAD_PARAM;
 		if (ctx->store>=MP4MX_MODE_FRAG) {
@@ -6923,7 +7638,7 @@
 		ctx->file = gf_isom_open("_gpac_isobmff_redirect", open_mode, NULL);
 		if (!ctx->file) return GF_OUT_OF_MEM;
 
-		gf_isom_set_write_callback(ctx->file, mp4_mux_on_data, mp4_mux_on_data_patch, mp4_mux_on_last_block_start,  filter, ctx->block_size);
+		gf_isom_set_write_callback(ctx->file, mp4_mux_on_data, mp4_mux_on_data_patch, mp4_mux_on_last_block_start, ctx, ctx->block_size);
 
 		gf_isom_set_progress_callback(ctx->file, mp4_mux_progress_cbk, filter);
 
@@ -6931,6 +7646,10 @@
 			GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("MP4Mux Cannot use data reference in movie fragments, not supported. Ignoring it\n"));
 			ctx->dref = GF_FALSE;
 		}
+		if (ctx->noinit && (ctx->store<MP4MX_MODE_FRAG)) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("MP4Mux Cannot skip init segment if not fragmented. Ignoring noinit\n"));
+			ctx->noinit = GF_FALSE;
+		}
 
 		if (ctx->store==MP4MX_MODE_FASTSTART) {
 			gf_isom_set_storage_mode(ctx->file, GF_ISOM_STORE_FASTSTART);
@@ -6954,14 +7673,19 @@
 		ctx->cdur.den = 1000;
 	}
 
+#ifndef GPAC_DISABLE_ISOM_FRAGMENTS
 	if (ctx->mfra && (ctx->store>=MP4MX_MODE_FRAG)) {
 		GF_Err e = gf_isom_enable_mfra(ctx->file);
 		if (e) return e;
 	}
+#endif
 
 	if (!ctx->tracks)
 		ctx->tracks = gf_list_new();
 
+	if (!ctx->ref_pcks)
+		ctx->ref_pcks = gf_list_new();
+
 #ifdef GF_ENABLE_CTRN
 	if (ctx->ctrni)
 		ctx->ctrn = GF_TRUE;
@@ -7009,39 +7733,6 @@
 	return GF_OK;
 }
 
-//old code, commented - we track min/max cts while adding to avoid the time-consuming rescan below
-#if 0
-static void mp4_mux_get_min_max_cts(GF_MP4MuxCtx *ctx, TrackWriter *tkw, u64 *omax_cts, u64 *omin_cts)
-{
-	u32 i, count, di;
-	u64 max_cts, min_cts, doff;
-
-	count = gf_isom_get_sample_count(ctx->file, tkw->track_num);
-	max_cts = 0;
-	min_cts = (u64) -1;
-	for (i=0; i<count; i++) {
-		GF_ISOSample *s = gf_isom_get_sample_info(ctx->file, tkw->track_num, i+1, &di, &doff);
-		if (!s)
-			break;
-		if (tkw->clamp_ts_plus_one) {
-			if (s->DTS + s->CTS_Offset + 1 >= tkw->clamp_ts_plus_one ) {
-				gf_isom_sample_del(&s);
-				continue;
-			}
-		}
-
-		if (s->DTS + s->CTS_Offset > max_cts)
-			max_cts = s->DTS + s->CTS_Offset;
-
-		if (min_cts > s->DTS + s->CTS_Offset)
-			min_cts = s->DTS + s->CTS_Offset;
-
-		gf_isom_sample_del(&s);
-	}
-	*omax_cts = max_cts;
-	*omin_cts = min_cts;
-}
-#endif
 
 static void mp4_mux_update_edit_list_for_bframes(GF_MP4MuxCtx *ctx, TrackWriter *tkw, u32 ctts_mode)
 {
@@ -7055,12 +7746,8 @@
 
 	gf_isom_remove_edits(ctx->file, tkw->track_num);
 
-#if 0
-	mp4_mux_get_min_max_cts(ctx, tkw, &max_cts, &min_cts);
-#else
 	max_cts = tkw->max_cts - tkw->min_neg_ctts;
 	min_cts = tkw->min_cts - tkw->min_neg_ctts;
-#endif
 
 	if (min_cts || tkw->empty_init_dur) {
 		max_cts -= min_cts;
@@ -7070,10 +7757,7 @@
 		max_cts = gf_timestamp_rescale(max_cts, tkw->tk_timescale, ctx->moovts);
 
 		if (tkw->empty_init_dur) {
-
 			gf_isom_set_edit(ctx->file, tkw->track_num, 0, tkw->empty_init_dur, 0, GF_ISOM_EDIT_EMPTY);
-			if (max_cts >= tkw->empty_init_dur) max_cts -= tkw->empty_init_dur;
-			else max_cts = 0;
 		}
 		//old arch compat: if we had a simple edit list in source try to keep the original segduration indicated
 		//we tolerate a diff of 100ms
@@ -7104,13 +7788,15 @@
 	const GF_PropertyValue *p = gf_filter_pid_get_info_str(tkw->ipid, "hevc:oinf", &pe);
 	if (p) {
 		u32 gi=0;
+		gf_isom_remove_sample_group(ctx->file, tkw->track_num, GF_ISOM_SAMPLE_GROUP_OINF);
 		gf_isom_add_sample_group_info(ctx->file, tkw->track_num, GF_ISOM_SAMPLE_GROUP_OINF, p->value.data.ptr, p->value.data.size, GF_TRUE, &gi);
-
-		p = gf_filter_pid_get_info_str(tkw->ipid, "hevc:linf", &pe);
-		if (p) {
-			gf_isom_add_sample_group_info(ctx->file, tkw->track_num, GF_ISOM_SAMPLE_GROUP_LINF, p->value.data.ptr, p->value.data.size, GF_TRUE, &gi);
-			gf_isom_set_track_group(ctx->file, tkw->track_num, 1000+gf_isom_get_track_id(ctx->file, tkw->track_num), GF_ISOM_BOX_TYPE_CSTG, GF_TRUE);
-		}
+	}
+	p = gf_filter_pid_get_info_str(tkw->ipid, "hevc:linf", &pe);
+	if (p) {
+		u32 gi=0;
+		gf_isom_remove_sample_group(ctx->file, tkw->track_num, GF_ISOM_SAMPLE_GROUP_LINF);
+		gf_isom_add_sample_group_info(ctx->file, tkw->track_num, GF_ISOM_SAMPLE_GROUP_LINF, p->value.data.ptr, p->value.data.size, GF_TRUE, &gi);
+		gf_isom_set_track_group(ctx->file, tkw->track_num, 1000+gf_isom_get_track_id(ctx->file, tkw->track_num), GF_ISOM_BOX_TYPE_CSTG, GF_TRUE);
 	}
 
 	p = gf_filter_pid_get_info_str(tkw->ipid, "hevc:min_lid", &pe);
@@ -7164,209 +7850,217 @@
 	}
 }
 
-static GF_Err mp4_mux_done(GF_Filter *filter, GF_MP4MuxCtx *ctx, Bool is_final)
+static void mp4_mux_done_track(GF_MP4MuxCtx *ctx, TrackWriter *tkw)
 {
 	GF_Err e = GF_OK;
-	u32 i, count;
 	GF_PropertyEntry *pe=NULL;
+	if (!tkw->ipid) return;
 
-	count = gf_list_count(ctx->tracks);
-	for (i=0; i<count; i++) {
-		u32 ctts_mode = ctx->ctmode;
-		const GF_PropertyValue *p;
-		Bool has_bframes = GF_FALSE;
-		TrackWriter *tkw = gf_list_get(ctx->tracks, i);
+	u32 ctts_mode = ctx->ctmode;
+	const GF_PropertyValue *p;
+	Bool has_bframes = GF_FALSE;
 
-		p = gf_filter_pid_get_property(tkw->ipid, GF_PROP_PID_ISOM_FORCE_NEGCTTS);
-		if (p && p->value.boolean) ctts_mode = MP4MX_CT_NEGCTTS;
+	p = gf_filter_pid_get_property(tkw->ipid, GF_PROP_PID_ISOM_FORCE_NEGCTTS);
+	if (p && p->value.boolean) ctts_mode = MP4MX_CT_NEGCTTS;
 
-		if (tkw->min_neg_ctts<0) {
-			//use ctts v1 negative offsets
-			if (ctts_mode==MP4MX_CT_NEGCTTS) {
-				gf_isom_set_ctts_v1(ctx->file, tkw->track_num, (u32) -tkw->min_neg_ctts);
-			}
-			//ctts v0
-			else {
-				gf_isom_set_cts_packing(ctx->file, tkw->track_num, GF_TRUE);
-				gf_isom_shift_cts_offset(ctx->file, tkw->track_num, (s32) tkw->min_neg_ctts);
-				gf_isom_set_cts_packing(ctx->file, tkw->track_num, GF_FALSE);
-				gf_isom_set_composition_offset_mode(ctx->file, tkw->track_num, GF_FALSE);
+	if (tkw->min_neg_ctts<0) {
+		//use ctts v1 negative offsets
+		if (ctts_mode==MP4MX_CT_NEGCTTS) {
+			gf_isom_set_ctts_v1(ctx->file, tkw->track_num, (u32) -tkw->min_neg_ctts);
+		}
+		//ctts v0
+		else {
+			gf_isom_set_cts_packing(ctx->file, tkw->track_num, GF_TRUE);
+			gf_isom_shift_cts_offset(ctx->file, tkw->track_num, (s32) tkw->min_neg_ctts);
+			gf_isom_set_cts_packing(ctx->file, tkw->track_num, GF_FALSE);
+			gf_isom_set_composition_offset_mode(ctx->file, tkw->track_num, GF_FALSE);
 
-				mp4_mux_update_edit_list_for_bframes(ctx, tkw, ctts_mode);
-			}
-			has_bframes = GF_TRUE;
-		} else if (tkw->has_ctts && (tkw->stream_type==GF_STREAM_VISUAL)) {
 			mp4_mux_update_edit_list_for_bframes(ctx, tkw, ctts_mode);
-
-			has_bframes = GF_TRUE;
-		} else if (tkw->ts_delay || tkw->empty_init_dur) {
-			gf_isom_update_edit_list_duration(ctx->file, tkw->track_num);
 		}
+		has_bframes = GF_TRUE;
+	} else if (tkw->has_ctts && (tkw->stream_type==GF_STREAM_VISUAL)) {
+		mp4_mux_update_edit_list_for_bframes(ctx, tkw, ctts_mode);
+
+		has_bframes = GF_TRUE;
+	} else if (tkw->ts_delay || tkw->empty_init_dur) {
+		gf_isom_update_edit_list_duration(ctx->file, tkw->track_num);
+	}
 
-		if (tkw->min_ts_seek_plus_one) {
-			u64 min_ts = tkw->min_ts_seek_plus_one - 1;
-			u64 mdur = gf_isom_get_media_duration(ctx->file, tkw->track_num);
-			u32 delay = 0;
-			if (tkw->clamp_ts_plus_one) {
-#if 0
-				u64 maxcts, mincts;
-				mp4_mux_get_min_max_cts(ctx, tkw, &maxcts, &mincts);
-				mdur = maxcts - mincts;
-#else
-				mdur = tkw->max_cts - tkw->min_cts;
-				mdur += tkw->max_cts_samp_dur;
-#endif
-			}
-			if (mdur > min_ts)
-				mdur -= min_ts;
-			else
-				mdur = 0;
-
-			if ((ctts_mode != MP4MX_CT_NEGCTTS) && (tkw->ts_delay<0) && (tkw->stream_type==GF_STREAM_VISUAL)) {
-				delay = (u32) -tkw->ts_delay;
-			}
+	if (tkw->min_ts_seek_plus_one) {
+		u64 min_ts = tkw->min_ts_seek_plus_one - 1;
+		u64 mdur = gf_isom_get_media_duration(ctx->file, tkw->track_num);
+		u32 delay = 0;
+		if (tkw->clamp_ts_plus_one) {
+			mdur = tkw->max_cts - tkw->min_cts;
+			mdur += tkw->max_cts_samp_dur;
+		}
+		if (mdur > min_ts)
+			mdur -= min_ts;
+		else
+			mdur = 0;
 
-			if (tkw->src_timescale != tkw->tk_timescale) {
-				min_ts = gf_timestamp_rescale(min_ts, tkw->src_timescale, tkw->tk_timescale);
-				delay = (u32) gf_timestamp_rescale(delay, tkw->src_timescale, tkw->tk_timescale);
-			}
-			mdur += delay;
+		if ((ctts_mode != MP4MX_CT_NEGCTTS) && (tkw->ts_delay<0) && (tkw->stream_type==GF_STREAM_VISUAL)) {
+			delay = (u32) -tkw->ts_delay;
+		}
 
-			if (ctx->moovts != tkw->tk_timescale) {
-				mdur = gf_timestamp_rescale(mdur, tkw->tk_timescale, ctx->moovts);
-			}
-			gf_isom_remove_edits(ctx->file, tkw->track_num);
-			if (tkw->empty_init_dur)
-				gf_isom_set_edit(ctx->file, tkw->track_num, 0, tkw->empty_init_dur, 0, GF_ISOM_EDIT_EMPTY);
-			gf_isom_set_edit(ctx->file, tkw->track_num, tkw->empty_init_dur, mdur, min_ts, GF_ISOM_EDIT_NORMAL);
+		if (tkw->src_timescale != tkw->tk_timescale) {
+			min_ts = gf_timestamp_rescale(min_ts, tkw->src_timescale, tkw->tk_timescale);
+			delay = (u32) gf_timestamp_rescale(delay, tkw->src_timescale, tkw->tk_timescale);
 		}
+		mdur += delay;
 
-		if (tkw->force_ctts) {
-			GF_Err gf_isom_force_ctts(GF_ISOFile *file, u32 track);
-			gf_isom_force_ctts(ctx->file, tkw->track_num);
+		if (ctx->moovts != tkw->tk_timescale) {
+			mdur = gf_timestamp_rescale(mdur, tkw->tk_timescale, ctx->moovts);
 		}
+		gf_isom_remove_edits(ctx->file, tkw->track_num);
+		if (tkw->empty_init_dur)
+			gf_isom_set_edit(ctx->file, tkw->track_num, 0, tkw->empty_init_dur, 0, GF_ISOM_EDIT_EMPTY);
+		gf_isom_set_edit(ctx->file, tkw->track_num, tkw->empty_init_dur, mdur, min_ts, GF_ISOM_EDIT_NORMAL);
+	}
 
-		gf_isom_purge_track_reference(ctx->file, tkw->track_num);
-		
-		if (ctx->importer && ctx->dur.num && ctx->dur.den) {
-			u64 mdur = gf_isom_get_media_duration(ctx->file, tkw->track_num);
-			u64 pdur = gf_isom_get_track_duration(ctx->file, tkw->track_num);
-			if (pdur==mdur) {
-				GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("MP4Mux Imported %d frames - duration %g\n", tkw->nb_samples, ((Double)mdur)/tkw->tk_timescale ));
-			} else {
-				GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("MP4Mux Imported %d frames - media duration %g - track duration %g\n", tkw->nb_samples, ((Double)mdur)/tkw->tk_timescale, ((Double)pdur)/ctx->moovts ));
-			}
+	if (tkw->force_ctts) {
+		GF_Err gf_isom_force_ctts(GF_ISOFile *file, u32 track);
+		gf_isom_force_ctts(ctx->file, tkw->track_num);
+	}
+
+	gf_isom_purge_track_reference(ctx->file, tkw->track_num);
+
+	if (ctx->importer && ctx->dur.num && ctx->dur.den) {
+		u64 mdur = gf_isom_get_media_duration(ctx->file, tkw->track_num);
+		u64 pdur = gf_isom_get_track_duration(ctx->file, tkw->track_num);
+		if (pdur==mdur) {
+			GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("MP4Mux Imported %d frames - duration %g\n", tkw->nb_samples, ((Double)mdur)/tkw->tk_timescale ));
+		} else {
+			GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("MP4Mux Imported %d frames - media duration %g - track duration %g\n", tkw->nb_samples, ((Double)mdur)/tkw->tk_timescale, ((Double)pdur)/ctx->moovts ));
 		}
+	}
 
-		/*this is plain ugly but since some encoders (divx) don't use the video PL correctly
-		 we force the system video_pl to ASP@L5 since we have I, P, B in base layer*/
-		if (tkw->codecid == GF_CODECID_MPEG4_PART2) {
-			Bool force_rewrite = GF_FALSE;
-			u32 PL = tkw->media_profile_level;
-			if (!PL) PL = 0x01;
+	/*this is plain ugly but since some encoders (divx) don't use the video PL correctly
+	 we force the system video_pl to ASP@L5 since we have I, P, B in base layer*/
+	if (tkw->codecid == GF_CODECID_MPEG4_PART2) {
+		Bool force_rewrite = GF_FALSE;
+		u32 PL = tkw->media_profile_level;
+		if (!PL) PL = 0x01;
 
-			if (ctx->importer) {
-				GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("Indicated Profile: %s\n", gf_m4v_get_profile_name((u8) PL) ));
-			}
+		if (ctx->importer) {
+			GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("Indicated Profile: %s\n", gf_m4v_get_profile_name((u8) PL) ));
+		}
 
-			if (has_bframes && (tkw->media_profile_level <= 3)) {
-				PL = 0xF5;
-				GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("MP4Mux Indicated profile doesn't include B-VOPs - forcing %s\n", gf_m4v_get_profile_name((u8) PL) ));
-				force_rewrite = GF_TRUE;
-			}
-			if (PL != tkw->media_profile_level) {
-				if (force_rewrite) {
+		if (has_bframes && (tkw->media_profile_level <= 3)) {
+			PL = 0xF5;
+			GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("MP4Mux Indicated profile doesn't include B-VOPs - forcing %s\n", gf_m4v_get_profile_name((u8) PL) ));
+			force_rewrite = GF_TRUE;
+		}
+		if (PL != tkw->media_profile_level) {
+			if (force_rewrite) {
 #ifndef GPAC_DISABLE_AV_PARSERS
-					GF_ESD *esd = gf_isom_get_esd(ctx->file, tkw->track_num, tkw->stsd_idx);
-					assert(esd);
+				GF_ESD *esd = gf_isom_get_esd(ctx->file, tkw->track_num, tkw->stsd_idx);
+				if (esd) {
 					gf_m4v_rewrite_pl(&esd->decoderConfig->decoderSpecificInfo->data, &esd->decoderConfig->decoderSpecificInfo->dataLength, (u8) PL);
 					gf_isom_change_mpeg4_description(ctx->file, tkw->track_num, tkw->stsd_idx, esd);
 					gf_odf_desc_del((GF_Descriptor*)esd);
+				}
 #endif
 
-				}
-				if (!ctx->make_qt)
-					gf_isom_set_pl_indication(ctx->file, GF_ISOM_PL_VISUAL, PL);
 			}
+			if (!ctx->make_qt)
+				gf_isom_set_pl_indication(ctx->file, GF_ISOM_PL_VISUAL, PL);
 		}
+	}
 
 
-		if (tkw->has_append)
-			gf_isom_refresh_size_info(ctx->file, tkw->track_num);
+	if (tkw->has_append)
+		gf_isom_refresh_size_info(ctx->file, tkw->track_num);
 
-		if ((tkw->nb_samples == 1) && (ctx->dur.num>0) && ctx->dur.den) {
-			u32 dur = (u32) gf_timestamp_rescale(ctx->dur.num, ctx->dur.den, tkw->tk_timescale);
-			gf_isom_set_last_sample_duration(ctx->file, tkw->track_num, dur);
-		}
+	if ((tkw->nb_samples == 1) && (ctx->dur.num>0) && ctx->dur.den) {
+		u32 dur = (u32) gf_timestamp_rescale(ctx->dur.num, ctx->dur.den, tkw->tk_timescale);
+		gf_isom_set_last_sample_duration(ctx->file, tkw->track_num, dur);
+	}
 
-		if (tkw->has_open_gop) {
-			if (ctx->importer) {
-				GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("OpenGOP detected - adjusting file brand\n"));
-			}
-			gf_isom_modify_alternate_brand(ctx->file, GF_ISOM_BRAND_ISO6, GF_TRUE);
+	if (tkw->has_open_gop) {
+		if (ctx->importer) {
+			GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("OpenGOP detected - adjusting file brand\n"));
 		}
+		gf_isom_modify_alternate_brand(ctx->file, GF_ISOM_BRAND_ISO6, GF_TRUE);
+	}
 
-		mp4_mux_set_hevc_groups(ctx, tkw);
+	mp4_mux_set_hevc_groups(ctx, tkw);
 
-		p = gf_filter_pid_get_info_str(tkw->ipid, "ttxt:rem_last", &pe);
-		if (p && p->value.boolean)
-			gf_isom_remove_sample(ctx->file, tkw->track_num, tkw->nb_samples);
+	p = gf_filter_pid_get_info_str(tkw->ipid, "ttxt:rem_last", &pe);
+	if (p && p->value.boolean)
+		gf_isom_remove_sample(ctx->file, tkw->track_num, tkw->nb_samples);
 
-		p = gf_filter_pid_get_info_str(tkw->ipid, "ttxt:last_dur", &pe);
-		if (p) {
-			u64 val = p->value.uint;
-			if (tkw->src_timescale != tkw->tk_timescale) {
-				val = gf_timestamp_rescale(val, tkw->src_timescale, tkw->tk_timescale);
-			}
-			gf_isom_set_last_sample_duration(ctx->file, tkw->track_num, (u32) val);
-		}
-
-		if (tkw->is_nalu && ctx->pack_nal && (gf_isom_get_mode(ctx->file)!=GF_ISOM_OPEN_WRITE)) {
-			u32 msize = 0;
-			Bool do_rewrite = GF_FALSE;
-			u32 j, stsd_count = gf_isom_get_sample_description_count(ctx->file, tkw->track_num);
-			p = gf_filter_pid_get_info(tkw->ipid, GF_PROP_PID_MAX_NALU_SIZE, &pe);
-			msize = gf_get_bit_size(p->value.uint);
-			if (msize<8) msize = 8;
-			else if (msize<16) msize = 16;
-			else msize = 32;
+	p = gf_filter_pid_get_info_str(tkw->ipid, "ttxt:last_dur", &pe);
+	if (p) {
+		u64 val = p->value.uint;
+		if (tkw->src_timescale != tkw->tk_timescale) {
+			val = gf_timestamp_rescale(val, tkw->src_timescale, tkw->tk_timescale);
+		}
+		gf_isom_set_last_sample_duration(ctx->file, tkw->track_num, (u32) val);
+	}
+	p = gf_filter_pid_get_info(tkw->ipid, GF_PROP_PID_FORCED_SUB, &pe);
+	if (p) {
+		gf_isom_set_forced_text(ctx->file, tkw->track_num, tkw->stsd_idx, p->value.uint);
+	}
 
-			if (msize<=0xFFFF) {
+	if (tkw->is_nalu && ctx->pack_nal && (gf_isom_get_mode(ctx->file)!=GF_ISOM_OPEN_WRITE)) {
+		u32 msize = 0;
+		Bool do_rewrite = GF_FALSE;
+		u32 j, stsd_count = gf_isom_get_sample_description_count(ctx->file, tkw->track_num);
+		p = gf_filter_pid_get_info(tkw->ipid, GF_PROP_PID_MAX_NALU_SIZE, &pe);
+		msize = gf_get_bit_size(p->value.uint);
+		if (msize<8) msize = 8;
+		else if (msize<16) msize = 16;
+		else msize = 32;
+
+		if (msize<=0xFFFF) {
+			for (j=0; j<stsd_count; j++) {
+				u32 k = 8 * gf_isom_get_nalu_length_field(ctx->file, tkw->track_num, j+1);
+				if (k > msize) {
+					do_rewrite = GF_TRUE;
+				}
+			}
+			if (do_rewrite) {
+				GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("MP4Mux Adjusting NALU SizeLength to %d bits\n", msize ));
+				gf_media_nal_rewrite_samples(ctx->file, tkw->track_num, msize);
+				msize /= 8;
 				for (j=0; j<stsd_count; j++) {
-					u32 k = 8 * gf_isom_get_nalu_length_field(ctx->file, tkw->track_num, j+1);
-					if (k > msize) {
-						do_rewrite = GF_TRUE;
-					}
-				}
-				if (do_rewrite) {
-					GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("MP4Mux Adjusting NALU SizeLength to %d bits\n", msize ));
-					gf_media_nal_rewrite_samples(ctx->file, tkw->track_num, msize);
-					msize /= 8;
-					for (j=0; j<stsd_count; j++) {
-						gf_isom_set_nalu_length_field(ctx->file, tkw->track_num, j+1, msize);
-					}
+					gf_isom_set_nalu_length_field(ctx->file, tkw->track_num, j+1, msize);
 				}
 			}
 		}
+	}
 
-		//don't update bitrate info for single sample tracks, unless MPEG-4 Systems - compatibility with old arch
-		if (ctx->btrt && !tkw->skip_bitrate_update && ((tkw->nb_samples>1) || ctx->m4sys) )
-			gf_media_update_bitrate(ctx->file, tkw->track_num);
+	//don't update bitrate info for single sample tracks, unless MPEG-4 Systems - compatibility with old arch
+	if (ctx->btrt && !tkw->skip_bitrate_update && ((tkw->nb_samples>1) || ctx->m4sys) )
+		gf_media_update_bitrate(ctx->file, tkw->track_num);
 
-		if (!tkw->box_patched) {
-			p = gf_filter_pid_get_property_str(tkw->ipid, "boxpatch");
-			if (p && p->value.string) {
-				e = gf_isom_apply_box_patch(ctx->file, tkw->track_id ? tkw->track_id : tkw->item_id, p->value.string, GF_FALSE);
-				if (e) {
-					GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("MP4Mux Unable to apply box patch %s to track %d: %s\n",
-						p->value.string, tkw->track_id, gf_error_to_string(e) ));
-				}
+	if (!tkw->box_patched) {
+		p = gf_filter_pid_get_property_str(tkw->ipid, "boxpatch");
+		if (p && p->value.string) {
+			e = gf_isom_apply_box_patch(ctx->file, tkw->track_id ? tkw->track_id : tkw->item_id, p->value.string, GF_FALSE);
+			if (e) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("MP4Mux Unable to apply box patch %s to track %d: %s\n",
+					p->value.string, tkw->track_id, gf_error_to_string(e) ));
 			}
-			tkw->box_patched = GF_TRUE;
 		}
+		tkw->box_patched = GF_TRUE;
 	}
 
 	gf_filter_release_property(pe);
+}
+
+
+static GF_Err mp4_mux_done(GF_MP4MuxCtx *ctx, Bool is_final)
+{
+	GF_Err e = GF_OK;
+	u32 i, count;
+
+	count = gf_list_count(ctx->tracks);
+	for (i=0; i<count; i++) {
+		TrackWriter *tkw = gf_list_get(ctx->tracks, i);
+		mp4_mux_done_track(ctx, tkw);
+	}
 
 	if (ctx->boxpatch && !ctx->box_patched) {
 		e = gf_isom_apply_box_patch(ctx->file, 0, ctx->boxpatch, GF_FALSE);
@@ -7386,6 +8080,7 @@
 			if (ctx->cdur.num==0) {
 				e = gf_isom_set_storage_mode(ctx->file, GF_ISOM_STORE_STREAMABLE);
 			} else {
+				if (ctx->cdur.num < 0) ctx->cdur.num = 1000;
 				e = gf_isom_make_interleave_ex(ctx->file, &ctx->cdur);
 			}
 			break;
@@ -7400,7 +8095,8 @@
 			break;
 		}
 		if (e) {
-			GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("MP4Mux Failed to set storage mode: %s\n", gf_error_to_string(e) ));
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("MP4Mux Failed to set storage mode: %s\n", gf_error_to_string(e) ));
+			gf_isom_delete(ctx->file);
 		} else {
 			e = gf_isom_close(ctx->file);
 			if (e) {
@@ -7432,6 +8128,12 @@
 		mp4_mux_track_writer_del(tkw);
 	}
 	gf_list_del(ctx->tracks);
+	//in case we aborted, release refs
+	while (gf_list_count(ctx->ref_pcks)) {
+		GF_FilterPacket *pckr = gf_list_pop_back(ctx->ref_pcks);
+		gf_filter_pck_unref(pckr);
+	}
+	gf_list_del(ctx->ref_pcks);
 	if (ctx->bs_r) gf_bs_del(ctx->bs_r);
 	if (ctx->seg_name) gf_free(ctx->seg_name);
 	if (ctx->tmp_store) gf_fclose(ctx->tmp_store);
@@ -7459,7 +8161,7 @@
 	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_STREAM_TYPE, GF_STREAM_OD),
 	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_STREAM_TYPE, GF_STREAM_TEXT),
 	CAP_BOOL(GF_CAPS_INPUT_EXCLUDED, GF_PROP_PID_UNFRAMED, GF_TRUE),
-	CAP_UINT(GF_CAPS_INPUT_EXCLUDED,  GF_PROP_PID_CODECID, GF_CODECID_RAW),
+	CAP_UINT(GF_CAPS_INPUT_EXCLUDED, GF_PROP_PID_CODECID, GF_CODECID_RAW),
 };
 
 
@@ -7498,8 +8200,12 @@
 	{ OFFS(abs_offset), "use absolute file offset in fragments rather than offsets from moof", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_ADVANCED},
 	{ OFFS(fsap), "split truns in video fragments at SAPs to reduce file size", GF_PROP_BOOL, "true", NULL, GF_FS_ARG_HINT_ADVANCED},
 	{ OFFS(file), "pointer to a write/edit ISOBMF file used internally by importers and exporters", GF_PROP_POINTER, NULL, NULL, GF_FS_ARG_HINT_HIDE},
-	{ OFFS(subs_sidx), "number of subsegments per sidx. negative value disables sidx, -2 removes sidx if present in source PID", GF_PROP_SINT, "-1", NULL, GF_FS_ARG_HINT_ADVANCED},
-	{ OFFS(m4cc), "4 character code of empty box to append at the end of a segment", GF_PROP_STRING, NULL, NULL, GF_FS_ARG_HINT_ADVANCED},
+	{ OFFS(subs_sidx), "number of subsegments per sidx\n"
+	"- 0: single sidx\n"
+	"- >0: hierarchical or daisy-chained sidx\n"
+	"- <0: disables sidx\n"
+	"- -2: removes sidx if present in source PID", GF_PROP_SINT, "-1", NULL, GF_FS_ARG_HINT_ADVANCED},
+	{ OFFS(m4cc), "4 character code of empty box to append at the end of a segment (DASH mode) or of a fragment (non-DASH mode)", GF_PROP_STRING, NULL, NULL, GF_FS_ARG_HINT_ADVANCED},
 	{ OFFS(chain_sidx), "use daisy-chaining of SIDX", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_EXPERT},
 	{ OFFS(msn), "sequence number of first moof to N", GF_PROP_UINT, "1", NULL, 0},
 	{ OFFS(msninc), "sequence number increase between `moof` boxes", GF_PROP_UINT, "1", NULL, 0},
@@ -7541,8 +8247,9 @@
 			"- v0: use v0 signaling but channel count from stream, recommended for backward compatibility\n"
 			"- v0s: use v0 signaling and force channel count to 2 (stereo) if more than 2 channels\n"
 			"- v1: use v1 signaling, ISOBMFF style (will mux raw PCM as ISOBMFF style)\n"
-			"- v1qt: use v1 signaling, QTFF style"
-		, GF_PROP_UINT, "v0", "|v0|v0s|v1|v1qt", 0},
+			"- v1qt: use v1 signaling, QTFF style\n"
+			"- v2qt: use v2 signaling, QTFF style (lpcm entry type)"
+		, GF_PROP_UINT, "v0", "|v0|v0s|v1|v1qt|v2qt", 0},
 	{ OFFS(ssix), "create `ssix` box when `sidx` box is present, level 1 mapping I-frames byte ranges, level 0xFF mapping the rest", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_ADVANCED},
 	{ OFFS(ccst), "insert coding constraint box for video tracks", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_ADVANCED},
 	{ OFFS(maxchunk), "set max chunk size in bytes for runs (only used in non-fragmented mode). 0 means no constraints", GF_PROP_UINT, "0", NULL, GF_FS_ARG_HINT_ADVANCED},
@@ -7558,7 +8265,7 @@
 
 	{ OFFS(compress), "set top-level box compression mode\n"
 						"- no: disable box compression\n"
-						"- moov: compress only moov box\n"
+						"- moov: compress only moov box (uses cmov for QT)\n"
 						"- moof: compress only moof boxes\n"
 						"- sidx: compress moof and sidx boxes\n"
 						"- ssix: compress moof, sidx and ssix boxes\n"
@@ -7591,8 +8298,21 @@
 	{ OFFS(start), "set playback start offset for MP4Box import only. A negative value means percent of media duration with -1 equal to duration", GF_PROP_DOUBLE, "0.0", NULL, GF_FS_ARG_HINT_HIDE},
 	{ OFFS(pad_sparse), "inject sample with no data (size 0) to keep durations in unknown sparse text and metadata tracks", GF_PROP_BOOL, "true", NULL, GF_FS_ARG_HINT_EXPERT},
 	{ OFFS(force_dv), "force DV sample entry types even when AVC/HEVC compatibility is signaled", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_ADVANCED},
-	{ OFFS(tsalign), "enable timeline realignment to 0 for first sample in fragmented mode", GF_PROP_BOOL, "true", NULL, GF_FS_ARG_HINT_ADVANCED},
-
+	{ OFFS(dvsingle), "ignore DolbyVision profile 8 in xps inband mode if profile 5 is already set", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_ADVANCED},
+	{ OFFS(tsalign), "enable timeline realignment to 0 for first sample - if false, this will keep original timing with empty edit (possibly long) at begin)", GF_PROP_BOOL, "true", NULL, GF_FS_ARG_HINT_ADVANCED},
+	{ OFFS(chapm), "chapter storage mode\n"
+	"- off: disable chapters\n"
+	"- tk: use chapter track (QT-style)\n"
+	"- udta: use user-data box chapters\n"
+	"- both: use both chapter tracks and udta"
+	, GF_PROP_UINT, "both", "off|tk|udta|both", GF_FS_ARG_HINT_ADVANCED},
+	{ OFFS(patch_dts), "patch previous samples duration when dts do not increase monotonically", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_EXPERT},
+	{ OFFS(uncv), "use uncv (ISO 23001-17) for raw video\n"
+	"- off: disabled (always the case when muxing to QT)\n"
+	"- gen: enabled, do not write profile\n"
+	"- prof: enabled and write profile if known\n"
+	"- tiny: enabled and write reduced version if profile known and compatible", GF_PROP_UINT, "prof", "off|gen|prof|tiny", GF_FS_ARG_HINT_EXPERT},
+	{ OFFS(trunv1), "force using version 1 of trun regardless of media type or CMAF brand", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_EXPERT},
 	{0}
 };
 
@@ -7645,6 +8365,7 @@
 	"- `mudtab`: set the movie user-data box to the property value which __must__ be a serialized box array blob\n"
 	"- `udta_U4CC`: set track user-data box entry of type `U4CC` to property value\n"
 	"- `mudta_U4CC`: set movie user-data box entry of type `U4CC` to property value\n"
+	"- `tkgp_T4CC`: set/remove membership to track group with type `T4CC` and ID given by property value. A negative value N removes from track group with ID -N\n"
 	"  \n"
 	"EX gpac -i src.mp4:#udta_tagc='My Awesome Tag' -o tag.mp4\n"
 	"EX gpac -i src.mp4:#mudtab=data@box.bin -o tag.mp4\n"
@@ -7672,6 +8393,15 @@
 	"- if `Sparse` is absent, empty packet is inserted for unknown text and metadata streams\n"
 	"- if `Sparse` is true, empty packet is inserted for all stream types\n"
 	"- if `Sparse` is false, empty packet is never injected\n"
+	"  \n"
+	"The default media type used for a PID can be overriden using property `StreamSubtype`. \n"
+	"EX -i src.srt:#StreamSubtype=sbtl -i ...  -o test.mp4 \n"
+	"This will force the text stream to use `sbtl` handler type instead of default `text` one."
+	"\n"
+	"Subtitle streams may be used as chapters by setting the property `IsChap` on the desired PID.\n"
+	"EX -i src.srt:#IsChap  -i ... -o test.mp4 \n"
+	"This will force the text stream to be used as a QT chapter track."
+	"  \n"
 	)
 	.private_size = sizeof(GF_MP4MuxCtx),
 	.args = MP4MuxArgs,
@@ -7685,15 +8415,13 @@
 };
 
 
-const GF_FilterRegister *mp4_mux_register(GF_FilterSession *session)
+const GF_FilterRegister *mp4mx_register(GF_FilterSession *session)
 {
 	return &MP4MuxRegister;
 }
-
 #else
-const GF_FilterRegister *mp4_mux_register(GF_FilterSession *session)
+const GF_FilterRegister *mp4mx_register(GF_FilterSession *session)
 {
 	return NULL;
 }
 #endif // GPAC_DISABLE_ISOM_WRITE
-

gpac-2.2.1.tar.gz/src/filters/mux_ogg.c -> gpac-2.4.0.tar.gz/src/filters/mux_ogg.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2022
+ *			Copyright (c) Telecom ParisTech 2022-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / OGG muxer filter
@@ -320,7 +320,7 @@
 {
 	u32 nb_skip=0;
 	OGGMuxCtx *ctx = (OGGMuxCtx *) gf_filter_get_udta(filter);
-	u32 i, nb_done = 0, count = gf_list_count(ctx->streams), nb_dash_done = 0;;
+	u32 i, nb_done = 0, count = gf_list_count(ctx->streams), nb_dash_done = 0;
 
 	for (i=0; i<count; i++) {
 		const u8 *data=NULL;
@@ -547,7 +547,7 @@
 	GF_FS_SET_DESCRIPTION("OGG multiplexer")
 	GF_FS_SET_HELP("This filter multiplexes audio and video to produce an OGG stream.\n"
 		"\n"
-		"The -cdur() option allows specifiying the interleaving duration (max time difference between consecutive packets of different streams). \n"
+		"The -cdur() option allows specifying the interleaving duration (max time difference between consecutive packets of different streams). \n"
 	)
 	.private_size = sizeof(OGGMuxCtx),
 	.max_extra_pids = -1,
@@ -562,7 +562,7 @@
 
 #endif
 
-const GF_FilterRegister *oggmux_register(GF_FilterSession *session)
+const GF_FilterRegister *oggmx_register(GF_FilterSession *session)
 {
 #ifndef GPAC_DISABLE_OGG
 	return &OGGMuxRegister;

gpac-2.2.1.tar.gz/src/filters/mux_ts.c -> gpac-2.4.0.tar.gz/src/filters/mux_ts.c Changed

gpac-2.2.1.tar.gz/src/filters/out_audio.c -> gpac-2.4.0.tar.gz/src/filters/out_audio.c Changed

gpac-2.2.1.tar.gz/src/filters/out_file.c -> gpac-2.4.0.tar.gz/src/filters/out_file.c Changed

gpac-2.2.1.tar.gz/src/filters/out_http.c -> gpac-2.4.0.tar.gz/src/filters/out_http.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2019-2022
+ *			Copyright (c) Telecom ParisTech 2019-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / http server and output filter
@@ -24,6 +24,9 @@
  */
 
 #include <gpac/internal/media_dev.h>
+
+#ifndef GPAC_DISABLE_NETWORK
+
 #include <gpac/constants.h>
 #include <gpac/maths.h>
 
@@ -33,19 +36,28 @@
 #include <gpac/base_coding.h>
 #include <gpac/network.h>
 
+#ifdef GPAC_HAS_QJS
+#include "../quickjs/quickjs.h"
+#include "../scenegraph/qjs_common.h"
+#endif
+
+
 //socket and SSL context ownership is transfered to the download session object
 GF_DownloadSession *gf_dm_sess_new_server(GF_DownloadManager *dm, GF_Socket *server, void *ssl_ctx, gf_dm_user_io user_io, void *usr_cbk, Bool async, GF_Err *e);
 GF_DownloadSession *gf_dm_sess_new_subsession(GF_DownloadSession *sess, u32 stream_id, void *usr_cbk, GF_Err *e);
 u32 gf_dm_sess_subsession_count(GF_DownloadSession *);
 
+void gf_dm_sess_set_timeout(GF_DownloadSession *sess, u32 timeout);
+
 GF_Socket *gf_dm_sess_get_socket(GF_DownloadSession *);
 GF_Err gf_dm_sess_send(GF_DownloadSession *sess, u8 *data, u32 size);
 void gf_dm_sess_clear_headers(GF_DownloadSession *sess);
 void  gf_dm_sess_set_header(GF_DownloadSession *sess, const char *name, const char *value);
+void  gf_dm_sess_set_header_ex(GF_DownloadSession *sess, const char *name, const char *value, Bool allow_overwrite);
 GF_Err gf_dm_sess_flush_async(GF_DownloadSession *sess, Bool no_select);
 u32 gf_dm_sess_async_pending(GF_DownloadSession *sess);
 
-GF_Err gf_dm_sess_send_reply(GF_DownloadSession *sess, u32 reply_code, const char *response_body, Bool no_body);
+GF_Err gf_dm_sess_send_reply(GF_DownloadSession *sess, u32 reply_code, const char *response_body, u32 body_len, Bool no_body);
 void gf_dm_sess_server_reset(GF_DownloadSession *sess);
 Bool gf_dm_sess_is_h2(GF_DownloadSession *sess);
 void gf_dm_sess_flush_h2(GF_DownloadSession *sess);
@@ -85,14 +97,20 @@
 	Bool is_subpath;
 } HTTP_DIRInfo;
 
+typedef struct __httpout_session GF_HTTPOutSession;
+
 typedef struct
 {
 	//options
 	char *dst, *user_agent, *ifce, *cache_control, *ext, *mime, *wdir, *cert, *pkey, *reqlog;
+#ifdef GPAC_HAS_QJS
+	char *js;
+#endif
 	GF_PropStringList rdirs;
 	Bool close, hold, quit, post, dlist, ice, reopen, blockio;
-	u32 port, block_size, maxc, maxp, timeout, hmode, sutc, cors, max_client_errors, max_async_buf;
+	u32 port, block_size, maxc, maxp, timeout, hmode, sutc, cors, max_client_errors, max_async_buf, ka, zmax;
 	s32 max_cache_segs;
+	GF_PropStringList hdrs;
 
 	//internal
 	GF_Filter *filter;
@@ -128,6 +146,16 @@
 
 	GF_List *directories;
 	Bool has_read_dir, has_write_dir;
+
+
+#ifdef GPAC_HAS_QJS
+	JSContext *jsc;
+	Bool owns_context;
+	JSValue js_obj;
+	JSValue request_fun;
+#endif
+	s32 (*on_request)(void *udta, GF_HTTPOutSession *session, const char *method, const char *url, u32 auth_code, u32 nb_hdrs, const char **hdrs);
+	void *rt_udta;
 } GF_HTTPOutCtx;
 
 typedef struct __httpout_input
@@ -138,7 +166,7 @@
 	Bool dash_mode;
 	char *mime;
 	u32 nb_dest;
-	Bool hold;
+	Bool hold, write_not_ready;
 
 	Bool is_open, done, is_delete;
 	Bool patch_blocks;
@@ -153,6 +181,7 @@
 	u64 offset_at_seg_start;
 	u64 nb_write, write_start_range, write_end_range;
 	char range_hdr100;
+	Bool seg_info_sent;
 
 	//for server mode, recording
 	char *local_path;
@@ -163,9 +192,10 @@
 
 	u8 *tunein_data;
 	u32 tunein_data_size;
-    
+
     Bool force_dst_name;
     Bool in_error;
+    u32 clock_first_error;
 
 	//max number of files to keep per pid
 	u32 max_segs;
@@ -191,8 +221,7 @@
 	s64 end;
 } HTTByteRange;
 
-typedef struct __httpout_session
-{
+struct __httpout_session {
 	GF_HTTPOutCtx *ctx;
 
 	GF_Socket *socket;
@@ -229,7 +258,7 @@
 	u32 nb_ranges, alloc_ranges, range_idx;
 	HTTByteRange *ranges;
 
-	Bool do_log;
+	u32 do_log;
 	u64 req_id;
 	u32 method_type, reply_code, nb_consecutive_errors;
 
@@ -240,7 +269,24 @@
 	Bool force_destroy;
 
 	HTTP_DIRInfo *dir_desc;
-} GF_HTTPOutSession;
+
+	u8 *comp_data;
+
+#ifdef GPAC_HAS_QJS
+	JSValue obj;
+#endif
+	u32 (*cbk_throttle)(void *udta, u64 done, u64 total);
+	s32 (*cbk_read)(void *udta, u8 *buffer, u32 buffer_size);
+	u32 (*cbk_write)(void *udta, const u8 *buffer, u32 buffer_size);
+	void (*cbk_close)(void *udta, GF_Err reason);
+	void *rt_udta;
+
+	u32 async_pending;
+	char *body_or_file;
+	GF_List *headers;
+	u32 reply;
+	u64 next_process_clock;
+};
 
 /*GF FileIO for mem mode*/
 typedef struct __gf_http_io
@@ -334,7 +380,7 @@
 			httpio_del(ioctx);
 			//last read session on a discarded object, fallthrough to discard parent
 			if (!par->nb_used && par->do_remove) {
-				assert(par->in);
+				gf_assert(par->in);
 				GF_LOG(GF_LOG_DEBUG, GF_LOG_HTTP, ("HTTPOutIO delete old version of input file %s\n", gf_fileio_resource_url(ioctx->fio) ));
 				gf_list_del_item(par->in->mem_files, par);
 				httpio_del(par);
@@ -342,7 +388,7 @@
 			return NULL;
 		}
 		//write file io
-		assert(ioctx->in);
+		gf_assert(ioctx->in);
 
 		//purge old files
 		count = gf_list_count(ioctx->in->mem_files);
@@ -400,11 +446,11 @@
 	return gfio;
 }
 
-static void httpout_close_session(GF_HTTPOutSession *sess)
+static void httpout_close_session(GF_HTTPOutSession *sess, GF_Err code)
 {
 	Bool last_connection = GF_TRUE;
 	if (!sess->http_sess) return;
-	assert(!sess->flush_close);
+
 	if (sess->is_h2) {
 		u32 nb_sub_sess = gf_dm_sess_subsession_count(sess->http_sess);
 		if (nb_sub_sess > 1) {
@@ -416,7 +462,7 @@
 		}
 	}
 	if (last_connection) {
-		assert(sess->ctx->nb_connections);
+		gf_assert(sess->ctx->nb_connections);
 		sess->ctx->nb_connections--;
 
 		gf_sk_group_unregister(sess->ctx->sg, sess->socket);
@@ -425,8 +471,33 @@
 	gf_dm_sess_del(sess->http_sess);
 	sess->http_sess = NULL;
 	sess->socket = NULL;
+	if (sess->comp_data) {
+		gf_free(sess->comp_data);
+		sess->comp_data = NULL;
+	}
 	sess->done = 1;
-
+	sess->flush_close = 0;
+	if (sess->cbk_close)
+		sess->cbk_close(sess->rt_udta, code);
+#ifdef GPAC_HAS_QJS
+	if (sess->ctx->jsc) {
+		gf_js_lock(sess->ctx->jsc, GF_TRUE);
+		JS_FreeValue(sess->ctx->jsc, sess->obj);
+		sess->obj = JS_UNDEFINED;
+		gf_js_lock(sess->ctx->jsc, GF_FALSE);
+	}
+#endif
+	if (sess->body_or_file) gf_free(sess->body_or_file);
+	sess->body_or_file=NULL;
+	if (sess->headers) {
+		while (1) {
+			char *v = gf_list_pop_back(sess->headers);
+			if (!v) break;
+			gf_free(v);
+		}
+		gf_list_del(sess->headers);
+		sess->headers = NULL;
+	}
 	if (sess->in_source) sess->in_source->nb_dest--;
 }
 
@@ -452,7 +523,7 @@
 	sess->done = GF_TRUE;
 
 	if (close_session) {
-		httpout_close_session(sess);
+		httpout_close_session(sess, GF_OK);
 	}
 	//might be NULL if quit was set
 	else if (sess->http_sess) {
@@ -674,7 +745,7 @@
 {
 	char *dir;
 	u32 len;
-	assert(in->path);
+	gf_assert(in->path);
 	//not recording
 	if (!ctx->has_read_dir) return;
 	HTTP_DIRInfo *di = gf_list_get(ctx->directories, 0);
@@ -694,7 +765,7 @@
 
 static Bool httpout_sess_parse_range(GF_HTTPOutSession *sess, char *range)
 {
-	Bool request_ok = GF_TRUE;;
+	Bool request_ok = GF_TRUE;
 	u32 i;
 	Bool has_open_start=GF_FALSE;
 	Bool has_file_end=GF_FALSE;
@@ -771,20 +842,39 @@
 	}
 	if (!request_ok) return GF_FALSE;
 
+	known_file_size = 0;
 	if (sess->in_source && !sess->resource) {
 		//cannot fetch end of file it is not yet known !
 		if (has_file_end) return GF_FALSE;
 		known_file_size = sess->in_source->nb_write;
 	} else {
-		known_file_size = sess->file_size;
+		//HTTP does not allow for "range: X-" to resolve in "content-range: X-/*"
+		//we support this in GPAC and allow other clients too if they set "X-Allow-Open-Partial-Range" (GPAC specific)
+		Bool allow_partial_unknown_size = GF_FALSE;
+		const char *str = gf_dm_sess_get_header(sess->http_sess, "User-Agent");
+		if (str && !strncmp(str, "GPAC/", 5))
+			allow_partial_unknown_size = GF_TRUE;
+		str = gf_dm_sess_get_header(sess->http_sess, "X-Allow-Open-Partial-Range");
+		if (str && (!strcmp(str, "1") || !strcmp(str, "true") || !strcmp(str, "yes")))
+			allow_partial_unknown_size = GF_TRUE;
+
+		if (!allow_partial_unknown_size || !sess->file_in_progress) {
+			known_file_size = sess->file_size;
+		}
 	}
 	sess->bytes_in_req = 0;
 	for (i=0; i<sess->nb_ranges; i++) {
 		if (sess->rangesi.start>=0) {
 			//if start, end is a pos in bytes in size (0-based)
 			if (sess->rangesi.end==-1) {
+				if (known_file_size==0) continue;
+
 				sess->rangesi.end = known_file_size-1;
 			}
+			if (known_file_size==0) {
+				request_ok = GF_FALSE;
+				break;
+			}
 
 			if (sess->rangesi.end >= (s64) known_file_size) {
 				request_ok = GF_FALSE;
@@ -795,6 +885,10 @@
 				break;
 			}
 		} else {
+			if (known_file_size==0) {
+				request_ok = GF_FALSE;
+				break;
+			}
 			//no start, end is a file size
 			if (sess->rangesi.end >= (s64) known_file_size) {
 				request_ok = GF_FALSE;
@@ -822,35 +916,41 @@
 	return GF_TRUE;
 }
 
-static Bool httpout_do_log(GF_HTTPOutSession *sess, u32 method)
+static u32 httpout_do_log(GF_HTTPOutSession *sess, u32 method)
 {
-	if (!sess->ctx->reqlog) return GF_FALSE;
+	u32 ret = 1;
+	if (!sess->ctx->reqlog) return 0;
+	char *reqs = sess->ctx->reqlog;
+	if (reqs0 =='-') {
+		reqs++;
+		ret=2;
+	}
 
-	if (!strcmp(sess->ctx->reqlog, "*")) return GF_TRUE;
+	if (!strcmp(reqs, "*")) return ret;
 
 	switch (method) {
 	case GF_HTTP_GET:
-		if (strstr(sess->ctx->reqlog, "GET") || strstr(sess->ctx->reqlog, "get")) return GF_TRUE;
+		if (strstr(reqs, "GET") || strstr(reqs, "get")) return ret;
 		break;
 	case GF_HTTP_PUT:
-		if (strstr(sess->ctx->reqlog, "PUT") || strstr(sess->ctx->reqlog, "put")) return GF_TRUE;
+		if (strstr(reqs, "PUT") || strstr(reqs, "put")) return ret;
 		break;
 	case GF_HTTP_POST:
-		if (strstr(sess->ctx->reqlog, "POST") || strstr(sess->ctx->reqlog, "post")) return GF_TRUE;
+		if (strstr(reqs, "POST") || strstr(reqs, "post")) return ret;
 		break;
 	case GF_HTTP_DELETE:
-		if (strstr(sess->ctx->reqlog, "DEL") || strstr(sess->ctx->reqlog, "del")) return GF_TRUE;
+		if (strstr(reqs, "DEL") || strstr(reqs, "del")) return ret;
 		break;
 	case GF_HTTP_HEAD:
-		if (strstr(sess->ctx->reqlog, "HEAD") || strstr(sess->ctx->reqlog, "head")) return GF_TRUE;
+		if (strstr(reqs, "HEAD") || strstr(reqs, "head")) return ret;
 		break;
 	case GF_HTTP_OPTIONS:
-		if (strstr(sess->ctx->reqlog, "OPT") || strstr(sess->ctx->reqlog, "opt")) return GF_TRUE;
+		if (strstr(reqs, "OPT") || strstr(reqs, "opt")) return ret;
 		break;
 	default:
-		return GF_TRUE;
+		return ret;
 	}
-	return GF_FALSE;
+	return 0;
 }
 
 #ifndef GPAC_DISABLE_LOG
@@ -892,29 +992,35 @@
 		gf_free(sub_sess);
 		return e;
 	}
+	gf_dm_sess_set_timeout(sub_sess->http_sess, sess->ctx->timeout);
 	gf_list_add(sess->ctx->sessions, sub_sess);
 	gf_list_add(sess->ctx->active_sessions, sub_sess);
 	sess->sub_sess_pending = GF_TRUE;
+#ifdef GPAC_HAS_QJS
+	sess->obj = JS_UNDEFINED;
+#endif
 	return GF_OK;
 }
 
 
 static u32 httpout_auth_check(HTTP_DIRInfo *di, const char *auth_header, Bool for_write)
 {
-	char *c_u=NULL, *c_g=NULL;
-	if (for_write) {
-		if (!di->wu && !di->wg) return 403;
-		if (di->wu && !strcmp(di->wu, "$NONE")) return 403;
+	if (di) {
+		char *c_u=NULL, *c_g=NULL;
+		if (for_write) {
+			if (!di->wu && !di->wg) return 403;
+			if (di->wu && !strcmp(di->wu, "$NONE")) return 403;
 
-		if (di->wu && strcmp(di->wu, "$ALL")) c_u=di->wu;
-		if (di->wg && strcmp(di->wg, "$ALL")) c_g=di->wg;
-	} else {
-		if (di->ru && !strcmp(di->ru, "$NONE")) return 403;
-		c_u=di->ru;
-		c_g=di->rg;
+			if (di->wu && strcmp(di->wu, "$ALL")) c_u=di->wu;
+			if (di->wg && strcmp(di->wg, "$ALL")) c_g=di->wg;
+		} else {
+			if (di->ru && !strcmp(di->ru, "$NONE")) return 403;
+			c_u=di->ru;
+			c_g=di->rg;
+		}
+		if (!c_u && !c_g)
+			return 200;
 	}
-	if (!c_u && !c_g)
-		return 200;
 
 	//no auth info, return unauthorized
 	if (!auth_header)
@@ -939,6 +1045,249 @@
 	return 403;
 }
 
+#ifdef GPAC_HAS_QJS
+u32 js_sess_throttle(void *udta, u64 done, u64 total)
+{
+	s32 next_time;
+	JSValue args2;
+	GF_HTTPOutSession *sess = (void *)udta;
+	gf_js_lock(sess->ctx->jsc, GF_TRUE);
+	JSValue fun = JS_GetPropertyStr(sess->ctx->jsc, sess->obj, "throttle");
+	args0 = JS_NewInt64(sess->ctx->jsc, done);
+	args1 = JS_NewInt64(sess->ctx->jsc, total);
+	JSValue ret = JS_Call(sess->ctx->jsc, fun, sess->obj, 2, args);
+	JS_ToInt32(sess->ctx->jsc, &next_time, ret);
+	JS_FreeValue(sess->ctx->jsc, fun);
+	JS_FreeValue(sess->ctx->jsc, ret);
+	JS_FreeValue(sess->ctx->jsc, args0);
+	JS_FreeValue(sess->ctx->jsc, args1);
+	gf_js_lock(sess->ctx->jsc, GF_FALSE);
+	return next_time;
+}
+
+s32 js_sess_read(void *udta, u8 *buffer, u32 buffer_size)
+{
+	GF_HTTPOutSession *sess = (void *)udta;
+	gf_js_lock(sess->ctx->jsc, GF_TRUE);
+	JSValue fun = JS_GetPropertyStr(sess->ctx->jsc, sess->obj, "read");
+	JSValue arg = JS_NewArrayBuffer(sess->ctx->jsc, sess->buffer, sess->ctx->block_size, NULL, NULL, 0);
+	JSValue ret = JS_Call(sess->ctx->jsc, fun, sess->obj, 1, &arg);
+	s32 nb_read=0;
+	if (JS_IsException(ret))
+		js_dump_error(sess->ctx->jsc);
+	else
+		JS_ToInt32(sess->ctx->jsc, &nb_read, ret);
+
+	JS_FreeValue(sess->ctx->jsc, ret);
+	JS_FreeValue(sess->ctx->jsc, fun);
+	JS_FreeValue(sess->ctx->jsc, arg);
+	gf_js_lock(sess->ctx->jsc, GF_FALSE);
+	return nb_read;
+}
+u32 js_sess_write(void *udta, const u8 *data, u32 size)
+{
+	GF_HTTPOutSession *sess = (void *)udta;
+	gf_js_lock(sess->ctx->jsc, GF_TRUE);
+	JSValue fun = JS_GetPropertyStr(sess->ctx->jsc, sess->obj, "write");
+	JSValue arg = data ? JS_NewArrayBuffer(sess->ctx->jsc, (u8*)data, size, NULL, NULL, 0) : JS_NULL;
+	JSValue ret = JS_Call(sess->ctx->jsc, fun, sess->obj, 1, &arg);
+	JS_FreeValue(sess->ctx->jsc, ret);
+	JS_FreeValue(sess->ctx->jsc, fun);
+	JS_FreeValue(sess->ctx->jsc, arg);
+	gf_js_lock(sess->ctx->jsc, GF_FALSE);
+	return size;
+}
+void js_sess_close(void *udta, GF_Err code)
+{
+	GF_HTTPOutSession *sess = (void *)udta;
+	gf_js_lock(sess->ctx->jsc, GF_TRUE);
+	JSValue fun = JS_GetPropertyStr(sess->ctx->jsc, sess->obj, "close");
+	JSValue arg = JS_NewInt32(sess->ctx->jsc, code);
+	JSValue ret = JS_Call(sess->ctx->jsc, fun, sess->obj, 1, &arg);
+	JS_FreeValue(sess->ctx->jsc, ret);
+	JS_FreeValue(sess->ctx->jsc, arg);
+	JS_FreeValue(sess->ctx->jsc, fun);
+	gf_js_lock(sess->ctx->jsc, GF_FALSE);
+}
+
+static JSValue httpout_js_send(JSContext *c, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	GF_HTTPOutSession *sess = JS_GetOpaque_Nocheck(this_val);
+
+	if (!sess)
+		return js_throw_err_msg(c, GF_BAD_PARAM, "send() called on invalid session\n");
+	if (sess->async_pending!=1)
+		return js_throw_err_msg(c, GF_BAD_PARAM, "send() called multiple times\n");
+
+	JSValue ret = JS_GetPropertyStr(c, sess->obj, "body");
+	if (JS_IsString(ret)) {
+		const char *b = JS_ToCString(c, ret);
+		sess->body_or_file = gf_strdup(b);
+		JS_FreeCString(c, b);
+	}
+	JS_FreeValue(c, ret);
+
+	ret = JS_GetPropertyStr(c, sess->obj, "reply");
+	if (JS_ToInt32(c, &sess->reply, ret))
+		sess->reply = 500;
+	JS_FreeValue(c, ret);
+
+
+	JSValue hdrs = JS_GetPropertyStr(c, sess->obj, "headers_out");
+	u32 i, nb_hdrs=0;
+	ret = JS_GetPropertyStr(c, hdrs, "length");
+	if (JS_ToInt32(c, &nb_hdrs, ret))
+		nb_hdrs = 0;
+	JS_FreeValue(c, ret);
+	for (i=0; i<nb_hdrs; i++) {
+		ret = JS_GetPropertyUint32(c, hdrs, i);
+		JSValue rname = JS_GetPropertyStr(c, ret, "name");
+		JSValue rval = JS_GetPropertyStr(c, ret, "value");
+		const char *n = JS_ToCString(c, rname);
+		const char *v = JS_ToCString(c, rval);
+		if (n && v) {
+			if (!sess->headers) sess->headers = gf_list_new();
+			gf_list_add(sess->headers, gf_strdup(n));
+			gf_list_add(sess->headers, gf_strdup(v));
+		}
+		if (n) JS_FreeCString(c, n);
+		if (v) JS_FreeCString(c, v);
+		JS_FreeValue(c, rname);
+		JS_FreeValue(c, rval);
+		JS_FreeValue(c, ret);
+	}
+	JS_FreeValue(c, hdrs);
+
+	sess->async_pending = 2;
+	sess->rt_udta = sess;
+	sess->next_process_clock = 0;
+	ret = JS_GetPropertyStr(c, sess->obj, "throttle");
+	if (JS_IsFunction(c, ret))
+		sess->cbk_throttle = js_sess_throttle;
+	JS_FreeValue(c, ret);
+
+	ret = JS_GetPropertyStr(c, sess->obj, "close");
+	if (JS_IsFunction(c, ret))
+		sess->cbk_close = js_sess_close;
+	JS_FreeValue(c, ret);
+
+	if (sess->method_type==GF_HTTP_GET) {
+		ret = JS_GetPropertyStr(c, sess->obj, "read");
+		if (JS_IsFunction(c, ret))
+			sess->cbk_read = js_sess_read;
+		JS_FreeValue(c, ret);
+	}
+	if (sess->reply && ((sess->method_type==GF_HTTP_PUT) || (sess->method_type==GF_HTTP_POST))) {
+		ret = JS_GetPropertyStr(c, sess->obj, "write");
+		sess->upload_type = 0;
+		if (JS_IsFunction(c, ret)) {
+			sess->upload_type = 1;
+			sess->cbk_write = js_sess_write;
+		}
+		JS_FreeValue(c, ret);
+		if (!sess->upload_type)
+			return js_throw_err_msg(c, GF_BAD_PARAM, "Missing required callback function on_data for PUT/POST method\n");
+	}
+
+	return JS_UNDEFINED;
+}
+
+static s32 httpout_js_on_request(void *udta, GF_HTTPOutSession *sess, const char * method, const char *url, u32 auth_code, u32 nb_hdrs, const char **headers)
+{
+	JSContext *c = sess->ctx->jsc;
+	if (!c) {
+		sess->async_pending=2;
+		return 0;
+	}
+	gf_js_lock(c, GF_TRUE);
+	JSValue obj = JS_NewObject(c);
+	JS_SetOpaque(obj, sess);
+	JS_SetPropertyStr(c, obj, "method", JS_NewString(c, method ));
+	JS_SetPropertyStr(c, obj, "url", JS_NewString(c, url));
+	JS_SetPropertyStr(c, obj, "auth_code", JS_NewInt32(c, auth_code ));
+	JS_SetPropertyStr(c, obj, "send", JS_NewCFunction(c, httpout_js_send, "send", 0) );
+	JS_SetPropertyStr(c, obj, "reply", JS_NewInt32(c, 0));
+
+	JS_FreeValue(c, sess->obj);
+	sess->obj = obj;
+
+	JSValue hdrs = JS_NewArray(c);
+	JS_SetPropertyStr(c, obj, "headers_out", hdrs);
+	hdrs = JS_NewArray(c);
+	JS_SetPropertyStr(c, obj, "headers_in", hdrs);
+	u32 i;
+	for (i=0; i<nb_hdrs; i+=2) {
+		JSValue h = JS_NewObject(c);
+		JS_SetPropertyStr(c, h, "name", JS_NewString(c, headersi ));
+		JS_SetPropertyStr(c, h, "value", JS_NewString(c, headersi+1 ));
+		JS_SetPropertyUint32(c, hdrs, i, h);
+	}
+
+	JSValue ret = JS_Call(c, sess->ctx->request_fun, sess->ctx->js_obj, 1, &obj);
+	if (JS_IsException(ret)) {
+		js_dump_error(c);
+		JS_FreeValue(c, ret);
+		JS_FreeValue(c, sess->obj);
+		sess->obj = JS_UNDEFINED;
+		gf_js_lock(c, GF_FALSE);
+		sess->async_pending = 0;
+		return 500;
+	}
+	JS_FreeValue(c, ret);
+
+	gf_js_lock(c, GF_FALSE);
+	return 0;
+}
+
+static void httpout_cleanup_js(GF_HTTPOutCtx *ctx)
+{
+	gf_js_lock(ctx->jsc, GF_TRUE);
+	JS_FreeValue(ctx->jsc, ctx->request_fun);
+	ctx->request_fun = JS_UNDEFINED;
+
+	if (!ctx->owns_context)
+		JS_FreeValue(ctx->jsc, ctx->js_obj);
+
+	gf_js_lock(ctx->jsc, GF_FALSE);
+	if (ctx->owns_context)
+		gf_js_delete_context(ctx->jsc);
+	ctx->jsc = NULL;
+	ctx->owns_context = GF_FALSE;
+}
+
+JSValue httpout_bind_js(GF_Filter *f, JSContext *jsc, JSValueConst obj)
+{
+	GF_HTTPOutCtx *ctx = (GF_HTTPOutCtx *) gf_filter_get_udta(f);
+	JSValue req_fun = JS_GetPropertyStr(jsc, obj, "on_request");
+	if (! JS_IsFunction(jsc, req_fun)) {
+		JS_FreeValue(jsc, req_fun);
+		return js_throw_err_msg(jsc, GF_BAD_PARAM, "Object does not define an on_request function\n");
+	}
+
+	if (ctx->jsc) {
+		httpout_cleanup_js(ctx);
+	}
+	ctx->jsc = jsc;
+	ctx->js_obj = JS_DupValue(jsc, obj);
+	ctx->request_fun = req_fun;
+	ctx->on_request = httpout_js_on_request;
+	return JS_UNDEFINED;
+}
+#endif
+
+static void httpout_push_headers(GF_HTTPOutSession *sess)
+{
+	if (!sess->headers) return;
+	while (gf_list_count(sess->headers)) {
+		char *n = gf_list_pop_front(sess->headers);
+		char *v = gf_list_pop_front(sess->headers);
+		gf_dm_sess_set_header_ex(sess->http_sess, n, v, GF_FALSE);
+		gf_free(n);
+		gf_free(v);
+	}
+	gf_list_del(sess->headers);
+	sess->headers=NULL;
+}
 static void httpout_sess_io(void *usr_cbk, GF_NETIO_Parameter *parameter)
 {
 	const char *durl="";
@@ -1001,6 +1350,7 @@
 		gf_dynstrcat(&response_body, "Method is not supported by GPAC", NULL);
 		goto exit;
 	}
+
 	durl = gf_dm_sess_get_resource_name(sess->http_sess);
 	if (!durl || (durl0 != '/')) {
 		sess->reply_code = 400;
@@ -1014,14 +1364,72 @@
 	sess->nb_ranges = 0;
 	sess->do_log = httpout_do_log(sess, parameter->reply);
 	sess->dir_desc = NULL;
+	if (sess->comp_data) {
+		gf_free(sess->comp_data);
+		sess->comp_data=NULL;
+	}
 
-	//resolve name against upload dir
-	if (is_upload) {
+	if (!sess->async_pending && sess->ctx->on_request) {
+		sess->async_pending = 1;
+		sess->method_type = parameter->reply;
+		sess->cbk_read = NULL;
+		sess->cbk_write = NULL;
+		sess->cbk_close = NULL;
+		sess->cbk_throttle = NULL;
+
+		u32 i=0, nb_hdrs=0;
+		char **hdrs=NULL;
+		while (1) {
+			const char *name, *val;
+			if (gf_dm_sess_enum_headers(sess->http_sess, &i, &name, &val)!=GF_OK)
+				break;
+			hdrs = gf_realloc(hdrs, sizeof(char*)*(nb_hdrs+2));
+			if (!hdrs) break;
+			hdrsnb_hdrs = (char*)name;
+			hdrsnb_hdrs+1 = (char*)val;
+			nb_hdrs+=2;
+		}
+
+		u32 auth_code = httpout_auth_check(NULL, gf_dm_sess_get_header(sess->http_sess, "Authorization"), GF_FALSE);
+		s32 ret = sess->ctx->on_request(sess->ctx->rt_udta, sess, get_method_name(parameter->reply), url, auth_code, nb_hdrs, (const char**)hdrs);
+		gf_free(hdrs);
+		if (ret>0) {
+			sess->reply_code = ret;
+			goto exit;
+		}
+	}
+	if (sess->async_pending==1) {
+		if (url) gf_free(url);
+		return;
+	}
+	if (sess->async_pending==2) {
+		sess->async_pending = 3;
+		if (sess->reply) {
+			sess->reply_code = sess->reply;
+			goto exit;
+		}
+		//no reply set, regular process - if body is set and resolve to a file, serve this file
+		if (sess->body_or_file) {
+			if (gf_file_exists(sess->body_or_file))
+				full_path = sess->body_or_file;
+			else
+				gf_free(sess->body_or_file);
+			sess->body_or_file=NULL;
+		}
+	}
+
+	//resolve name against upload dir, unless resolved by the on_request handler
+	if (is_upload && !full_path) {
 		if (!sess->ctx->has_write_dir && (sess->ctx->hmode!=MODE_SOURCE)) {
 			sess->reply_code = 405;
 			gf_dynstrcat(&response_body, "No write directory enabled on server", NULL);
 			goto exit;
 		}
+		if (strstr(url, "../") || strstr(url, "..\\")) {
+			sess->reply_code = 405;
+			gf_dynstrcat(&response_body, "Invalid URL", NULL);
+			goto exit;
+		}
 		if (sess->ctx->has_write_dir) {
 			HTTP_DIRInfo *di=NULL;
 			u32 di_len=0;
@@ -1061,9 +1469,9 @@
 		} else if (sess->ctx->hmode==MODE_SOURCE) {
 			full_path = gf_strdup(url+1);
 		}
-		if (parameter->reply==GF_HTTP_DELETE)
-			is_upload = GF_FALSE;
 	}
+	if (parameter->reply==GF_HTTP_DELETE)
+		is_upload = GF_FALSE;
 
 	if (is_upload) {
 		const char *hdr;
@@ -1088,7 +1496,7 @@
 		sess->file_in_progress = GF_FALSE;
 		sess->nb_bytes = 0;
 		sess->done = GF_FALSE;
-		assert(full_path);
+		gf_assert(full_path);
 		if (sess->path) gf_free(sess->path);
 		sess->path = full_path;
 		if (sess->resource) gf_fclose(sess->resource);
@@ -1155,6 +1563,8 @@
 		sess->req_start_time = gf_sys_clock_high_res();
 		if (url) gf_free(url);
 		gf_dm_sess_clear_headers(sess->http_sess);
+
+		httpout_push_headers(sess);
 		//send reply once we are done receiving
 		return;
 	}
@@ -1168,12 +1578,12 @@
 	Bool no_longer_avail = GF_FALSE;
 	for (i=0; i<count; i++) {
 		GF_HTTPOutInput *in = gf_list_get(sess->ctx->inputs, i);
-		assert(in->path0 == '/');
+		gf_assert(in->path0 == '/');
 		//matching name and input pid not done: file has been created and is in progress
 		//if input pid done, try from file
 		if (!strcmp(in->path, url)) {
 			//source done in server mode with no storage, no longer available unless reopen is set
-			if (in->done && !sess->ctx->has_read_dir && (!sess->ctx->reopen || gf_filter_pid_is_eos(in->ipid))) {
+			if (in->done && !sess->ctx->has_read_dir && (!sess->ctx->reopen || (gf_filter_pid_is_eos(in->ipid) && !gf_filter_pid_is_flush_eos(in->ipid) ))) {
 				no_longer_avail = GF_TRUE;
 			} else if (!in->done) {
 				source_pid = in;
@@ -1245,6 +1655,13 @@
 			}
 			sess->dir_desc = di;
 		}
+		if (!full_path && !strcmp(url+1, "favicon.ico")) {
+			char pathGF_MAX_PATH;
+			if (gf_opts_default_shared_directory(path)) {
+				strcat(path, "/res/gpac.ico");
+				if (gf_file_exists(path)) full_path = gf_strdup(path);
+			}
+		}
 	}
 
 	cors_origin = (char *) gf_dm_sess_get_header(sess->http_sess, "Origin");
@@ -1406,8 +1823,8 @@
 			sess->in_source_is_ll_hls_chunk = source_pid_is_ll_hls_chunk;
 
 			sess->file_in_progress = GF_TRUE;
-			assert(!full_path);
-			assert(source_pid->local_path);
+			gf_assert(!full_path);
+			gf_assert(source_pid->local_path);
 			if (source_pid_is_ll_hls_chunk)
 				full_path = gf_strdup(source_pid->hls_chunk_local_path);
 			else
@@ -1431,6 +1848,7 @@
 				goto exit;
 			}
 		} else {
+			GF_FilterProbeScore probe_score=GF_FPROBE_NOT_SUPPORTED;
 			//no need to use gf_fopen_ex in mem mode, since the fullpath is the gfio:// URL of the mem resource
 			sess->resource = gf_fopen(full_path, "rb");
 			//we may not have the file if it is currently being created
@@ -1457,11 +1875,21 @@
 				}
 				if (read) {
 					probe_bufread = 0;
-					mime = gf_filter_probe_data(sess->ctx->filter, probe_buf, read);
+					mime = gf_filter_probe_data(sess->ctx->filter, probe_buf, read, &probe_score);
+				}
+			}
+			//set some default mimes for wasm and JS
+			if (!mime || (probe_score<=GF_FPROBE_MAYBE_SUPPORTED)) {
+				const char *ext = gf_file_ext_start(full_path);
+				if (ext) {
+					ext++;
+					if (!strcmp(ext, "wasm")) mime = "application/wasm";
+					if (!strcmp(ext, "js")) mime = "application/ecmascript";
 				}
 			}
 			if (source_sess) {
-				sess->file_size = 0;
+				//use uploaded size on source as max file size for this request
+				sess->file_size = source_sess->file_pos;
 				sess->use_chunk_transfer = GF_TRUE;
 				sess->put_in_progress = 1;
 			} else if (sess->resource) {
@@ -1498,6 +1926,14 @@
 		sess->reply_code = 200;
 	}
 
+	u32 content_encoding=0;
+	const char *encode = (char *) gf_dm_sess_get_header(sess->http_sess, "Accept-Encoding");
+	if (encode) {
+		if (strstr(encode, "gzip")) content_encoding=1;
+		else if (strstr(encode, "deflate")) content_encoding=2;
+	}
+
+
 	//copy range for logs before resetting session headers
 	if (sess->do_log && range) {
 		strncpy(szRange, range, 199);
@@ -1519,6 +1955,10 @@
 	if (send_cors) {
 		gf_dm_sess_set_header(sess->http_sess, "Access-Control-Allow-Origin", cors_origin ? cors_origin : "*");
 		gf_dm_sess_set_header(sess->http_sess, "Access-Control-Expose-Headers", "*");
+		//for wasm sharedarraybuffer
+		gf_dm_sess_set_header(sess->http_sess, "Cross-Origin-Embedder-Policy", "require-corp");
+		gf_dm_sess_set_header(sess->http_sess, "Cross-Origin-Opener-Policy", "same-origin");
+//		gf_dm_sess_set_header(sess->http_sess, "Cross-Origin-Resource-Policy", "cross-origin");
 	}
 	if (cors_origin) gf_free(cors_origin);
 
@@ -1559,6 +1999,29 @@
 			sess->nb_ranges = 0;
 			gf_dm_sess_set_header(sess->http_sess, "Cache-Control", "no-cache, no-store");
 		}
+		//setup compression if asked, only if no chunk transfer and no ranges
+		if (!is_head && !sess->use_chunk_transfer && !sess->nb_ranges
+			&& !sess->file_in_progress && content_encoding
+			&& (sess->file_size<=sess->ctx->zmax)
+		) {
+			u8 *data;
+			u32 osize;
+			if (gf_file_load_data_filep(sess->resource, &data, &osize)==GF_OK) {
+				u32 comp_size=0;
+				//only compress text files
+				if (gf_utf8_is_legal(data, osize)
+					&& (gf_gz_compress_payload_ex((u8 **) &data, osize, &comp_size, 0, GF_FALSE, NULL, (content_encoding==1) ? GF_TRUE : GF_FALSE) == GF_OK)
+				) {
+					sess->comp_data = data;
+					data = NULL;
+					sess->file_size = comp_size;
+					sess->bytes_in_req = comp_size;
+					gf_dm_sess_set_header(sess->http_sess, "Content-Encoding", (content_encoding==1) ? "gzip" : "deflate");
+				}
+				if (data) gf_free(data);
+			}
+			gf_fseek(sess->resource, 0, SEEK_SET);
+		}
 		//only put content length if not using chunk transfer - bytes_in_req may be > 0 if we have a byte range on a chunk-transfer session
 		if (sess->bytes_in_req && !sess->use_chunk_transfer) {
 			sprintf(szFmt, LLU, sess->bytes_in_req);
@@ -1578,7 +2041,9 @@
 			char *ranges = NULL;
 			gf_dynstrcat(&ranges, "bytes=", NULL);
 			for (i=0; i<sess->nb_ranges; i++) {
-				if (sess->in_source || !sess->file_size) {
+				if (sess->rangesi.end==-1) {
+					sprintf(szFmt, LLD"-/*", sess->rangesi.start);
+				} else if (sess->in_source || !sess->file_size) {
 					sprintf(szFmt, LLD"-"LLD"/*", sess->rangesi.start, sess->rangesi.end);
 				} else {
 					sprintf(szFmt, LLD"-"LLD"/"LLU, sess->rangesi.start, sess->rangesi.end, sess->file_size);
@@ -1647,6 +2112,13 @@
 		}
 	}
 
+	for (i=0; i<sess->ctx->hdrs.nb_items; i+=2) {
+		char *hdr=sess->ctx->hdrs.valsi;
+		char *val=sess->ctx->hdrs.valsi+1;
+		gf_dm_sess_set_header(sess->http_sess, hdr, val);
+	}
+	httpout_push_headers(sess);
+
 	GF_LOG(GF_LOG_INFO, GF_LOG_HTTP, ("HTTPOut Sending response to %s\n", sess->peer_address));
 
 	if (sess->do_log) {
@@ -1664,8 +2136,8 @@
 
 	sess->nb_consecutive_errors = 0;
 	sess->canceled = GF_FALSE;
-	assert(sess->reply_code);
-	e = gf_dm_sess_send_reply(sess->http_sess, sess->reply_code, response_body, no_body);
+	gf_assert(sess->reply_code);
+	e = gf_dm_sess_send_reply(sess->http_sess, sess->reply_code, response_body, response_body ? (u32) strlen(response_body) : 0, no_body);
 	sess->headers_done = GF_TRUE;
 	sess->is_h2 = gf_dm_sess_is_h2(sess->http_sess);
 
@@ -1740,6 +2212,10 @@
 	if (send_cors) {
 		gf_dm_sess_set_header(sess->http_sess, "Access-Control-Allow-Origin", "*");
 		gf_dm_sess_set_header(sess->http_sess, "Access-Control-Expose-Headers", "*");
+		//for wasm sharedarraybuffer
+		gf_dm_sess_set_header(sess->http_sess, "Cross-Origin-Embedder-Policy", "require-corp");
+		gf_dm_sess_set_header(sess->http_sess, "Cross-Origin-Opener-Policy", "same-origin");
+//		gf_dm_sess_set_header(sess->http_sess, "Cross-Origin-Resource-Policy", "cross-origin");
 
 		if (is_options) {
 			gf_dm_sess_set_header(sess->http_sess, "Access-Control-Allow-Methods", "*");
@@ -1751,9 +2227,11 @@
 		gf_dm_sess_set_header(sess->http_sess, "WWW-Authenticate", "Basic");
 	}
 
-	if (response_body) {
-		body_size = (u32) strlen(response_body);
-		gf_dm_sess_set_header(sess->http_sess, "Content-Type", "text/plain");
+	if (response_body || sess->body_or_file) {
+		body_size = (u32) strlen(response_body ? response_body : sess->body_or_file);
+		if (response_body)
+			gf_dm_sess_set_header(sess->http_sess, "Content-Type", "text/plain");
+
 		sprintf(szFmt, "%d", body_size);
 		gf_dm_sess_set_header(sess->http_sess, "Content-Length", szFmt);
 	}
@@ -1762,10 +2240,31 @@
 		gf_dm_sess_set_header(sess->http_sess, "Content-Length", "0");
 	}
 
-	gf_dm_sess_send_reply(sess->http_sess, sess->reply_code, response_body, GF_FALSE);
+	if (sess->cbk_read || sess->cbk_write) {
+		if (sess->cbk_read) {
+			gf_dm_sess_set_header(sess->http_sess, "Transfer-Encoding", "chunked");
+			sess->use_chunk_transfer=GF_TRUE;
+		}
+		if (!sess->buffer) {
+			sess->buffer = gf_malloc(sizeof(u8)*sess->ctx->block_size);
+		}
+		sess->is_h2 = gf_dm_sess_is_h2(sess->http_sess);
+	}
+	httpout_push_headers(sess);
+
+	//upload with custom IO, do not send reply
+	if (sess->cbk_write && (sess->reply_code<400) ) {
+	} else {
+		char *body = (sess->body_or_file || sess->cbk_read) ? sess->body_or_file : response_body;
+		gf_dm_sess_send_reply(sess->http_sess, sess->reply_code, body, body ? (u32) strlen(body) : 0, GF_FALSE);
+	}
 	sess->is_h2 = gf_dm_sess_is_h2(sess->http_sess);
 
 	if (response_body) gf_free(response_body);
+	if (sess->body_or_file) {
+		gf_free(sess->body_or_file);
+		sess->body_or_file=NULL;
+	}
 	gf_dm_sess_clear_headers(sess->http_sess);
 
 	if (sess->do_log) {
@@ -1778,10 +2277,16 @@
 	}
 
 	if (url) gf_free(url);
-	sess->upload_type = 0;
 	sess->canceled = GF_FALSE;
 	sess->headers_done = GF_FALSE;
 
+	if (sess->cbk_read || sess->cbk_write) {
+		if (sess->cbk_read) sess->headers_done = GF_TRUE;
+		sess->done = GF_FALSE;
+		return;
+	}
+	sess->upload_type = 0;
+
 	httpout_sess_flush_close(sess, GF_FALSE);
 
 	if (!sess->is_h2 && (sess->ctx->close || (sess->nb_consecutive_errors == sess->ctx->max_client_errors))) {
@@ -1849,6 +2354,12 @@
 		default:
 			parameter->name = NULL;
 			parameter->value = NULL;
+			if (2 * ( *cur_header - HTTP_PUT_HEADER_DONE) < in->ctx->hdrs.nb_items) {
+				u32 h_idx = 2*( *cur_header - HTTP_PUT_HEADER_DONE);
+				parameter->name = in->ctx->hdrs.valsh_idx;
+				parameter->value = in->ctx->hdrs.valsh_idx+1;
+				*cur_header = *cur_header+1;
+			}
 			break;
 		}
 	}
@@ -1938,7 +2449,7 @@
 		}
 
 		p = gf_filter_pid_get_property(pid, GF_PROP_PID_IS_MANIFEST);
-		if (p && p->value.boolean) {
+		if (p && p->value.uint) {
 			pctx->is_manifest = GF_TRUE;
 			if (!ctx->hmode && !ctx->has_read_dir) {
 				if (!ctx->reopen) {
@@ -1977,6 +2488,7 @@
 					gf_free(pctx);
 					return e;
 				}
+				gf_dm_sess_set_timeout(pctx->upload, ctx->timeout);
 				gf_dm_sess_set_sock_group(pctx->upload, ctx->sg);
 			} else {
 				if (!pctx->path) {
@@ -2005,7 +2517,7 @@
 
 		gf_filter_pid_init_play_event(pid, &evt, 0.0, 1.0, "HTTPOut");
 		gf_filter_pid_send_event(pid, &evt);
-            
+
 	}
 	if (is_remove) {
 		return GF_OK;
@@ -2025,7 +2537,7 @@
 		sess->canceled = GF_FALSE;
 		sess->upload_type = 0;
 		GF_LOG(GF_LOG_INFO, GF_LOG_HTTP, ("HTTPOut Client %s disconnected, destroying session\n", sess->peer_address));
-		httpout_close_session(sess);
+		httpout_close_session(sess, e);
 		return;
 	}
 }
@@ -2077,6 +2589,9 @@
 		gf_sk_del(new_conn);
 		return;
 	}
+#ifdef GPAC_HAS_QJS
+	sess->obj = JS_UNDEFINED;
+#endif
 
 	//we keep track of the socket for sock group (un)register
 	sess->socket = new_conn;
@@ -2102,6 +2617,7 @@
 		gf_free(sess);
 		return;
 	}
+	gf_dm_sess_set_timeout(sess->http_sess, ctx->timeout);
 	ctx->nb_connections++;
 	if (ctx->quit)
 		ctx->had_connections = GF_TRUE;
@@ -2109,7 +2625,7 @@
 	gf_list_add(ctx->sessions, sess);
 	gf_list_add(ctx->active_sessions, sess);
 	gf_sk_group_register(ctx->sg, sess->socket);
-	
+
 	gf_sk_set_buffer_size(new_conn, GF_FALSE, ctx->block_size);
 	gf_sk_set_buffer_size(new_conn, GF_TRUE, ctx->block_size);
 	strcpy(sess->peer_address, peer_address);
@@ -2131,6 +2647,10 @@
 	char *sep, *url;
 	GF_HTTPOutCtx *ctx = (GF_HTTPOutCtx *) gf_filter_get_udta(filter);
 
+	if (ctx->hdrs.nb_items%2) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_HTTP, ("HTTPOut Invalid custom headers, got odd number but expecting even number\n"));
+		return GF_BAD_PARAM;
+	}
 
 	port = ctx->port;
 	ip = ctx->ifce;
@@ -2150,7 +2670,7 @@
 		cplen = (u32) (sep-ctx->dst-7);
 		if (cplen>1023) cplen=1023;
 		strncpy(szIP, ctx->dst+7, cplen);
-		szIP1023 = 0;
+		szIPMIN(cplen,1023) = 0;
 		sep = strchr(szIP, ':');
 		if (sep) {
 			port = atoi(sep+1);
@@ -2382,7 +2902,7 @@
 	if (ctx->hmode==MODE_SOURCE)
 		gf_filter_get_download_manager(ctx->filter);
 
-	ctx->server_sock = gf_sk_new(GF_SOCK_TYPE_TCP);
+	ctx->server_sock = gf_sk_new_ex(GF_SOCK_TYPE_TCP, gf_filter_get_netcap_id(filter) );
 	e = gf_sk_bind(ctx->server_sock, NULL, ctx->port, ip, 0, GF_SOCK_REUSE_PORT);
 	if (!e) e = gf_sk_listen(ctx->server_sock, ctx->maxc);
 	if (e) {
@@ -2398,6 +2918,63 @@
 		if (strstr(ctx->reqlog, "REC"))
 			ctx->log_record = GF_TRUE;
 	}
+
+#ifdef GPAC_HAS_QJS
+	if (ctx->js) {
+		JSValue global_obj, ret;
+		u8 *buf;
+		u32 buf_len;
+		GF_Err e;
+		u32 flags = JS_EVAL_TYPE_GLOBAL;
+
+		e = gf_file_load_data(ctx->js, &buf, &buf_len);
+		if (e) return e;
+
+		ctx->jsc = gf_js_create_context();
+		if (!ctx->jsc) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_SCRIPT, ("DASHDmx Failed to load QuickJS context\n"));
+			if (buf) gf_free(buf);
+			return GF_IO_ERR;
+		}
+		JS_SetContextOpaque(ctx->jsc, ctx);
+		ctx->owns_context = GF_TRUE;
+
+		global_obj = JS_GetGlobalObject(ctx->jsc);
+		js_load_constants(ctx->jsc, global_obj);
+
+		JS_SetPropertyStr(ctx->jsc, global_obj, "_gpac_log_name", JS_NewString(ctx->jsc, gf_file_basename(ctx->js) ) );
+		ctx->js_obj = JS_NewObject(ctx->jsc);
+		JS_SetPropertyStr(ctx->jsc, global_obj, "httpout", ctx->js_obj);
+
+		if (!gf_opts_get_bool("core", "no-js-mods") && buf && JS_DetectModule((char *)buf, buf_len)) {
+			//init modules, except webgl
+			qjs_init_all_modules(ctx->jsc, GF_TRUE, GF_FALSE);
+			flags = JS_EVAL_TYPE_MODULE;
+		}
+
+		ret = buf ? JS_Eval(ctx->jsc, (char *)buf, buf_len, ctx->js, flags) : JS_TRUE;
+		if (buf) gf_free(buf);
+
+		if (JS_IsException(ret)) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_SCRIPT, ("HTTPOut Error loading script %s\n", ctx->js));
+			js_dump_error(ctx->jsc);
+			JS_FreeValue(ctx->jsc, ret);
+			JS_FreeValue(ctx->jsc, global_obj);
+			return GF_BAD_PARAM;
+		}
+		JS_FreeValue(ctx->jsc, ret);
+		JS_FreeValue(ctx->jsc, global_obj);
+
+		ctx->request_fun = JS_GetPropertyStr(ctx->jsc, ctx->js_obj, "on_request");
+		if (! JS_IsFunction(ctx->jsc, ctx->request_fun)) {
+			JS_FreeValue(ctx->jsc, ctx->request_fun);
+			ctx->request_fun = JS_UNDEFINED;
+			GF_LOG(GF_LOG_ERROR, GF_LOG_SCRIPT, ("HTTPOut JS file does not define an on_request function in httpout object\n"));
+			return GF_BAD_PARAM;
+		}
+		ctx->on_request = httpout_js_on_request;
+	}
+#endif
 	gf_filter_post_process_task(filter);
 	return GF_OK;
 }
@@ -2407,7 +2984,7 @@
 	gf_list_del_item(s->ctx->active_sessions, s);
 	gf_list_del_item(s->ctx->sessions, s);
 	if (s->http_sess)
-		httpout_close_session(s);
+		httpout_close_session(s, GF_OK);
 	if (s->buffer) gf_free(s->buffer);
 	if (s->path) gf_free(s->path);
 	if (s->mime) gf_free(s->mime);
@@ -2440,7 +3017,7 @@
 {
 	if (!in->hls_chunk) return;
 
-	GF_LOG(GF_LOG_INFO, GF_LOG_HTTP, ("HTTPOut Closing LL-HLS %s output\n", in->hls_chunk_path));
+	GF_LOG(GF_LOG_INFO, GF_LOG_MMIO, ("HTTPOut Closing LL-HLS %s output\n", in->hls_chunk_path));
 
 	gf_fclose(in->hls_chunk);
 	in->hls_chunk = NULL;
@@ -2455,7 +3032,7 @@
 			if (!sess->in_source_is_ll_hls_chunk) continue;
 			if (strcmp(sess->path, in->local_path)) continue;
 
-			assert(sess->file_in_progress);
+			gf_assert(sess->file_in_progress);
 			if (sess->in_source) {
 				sess->in_source->nb_dest--;
 				sess->in_source = NULL;
@@ -2558,12 +3135,25 @@
 		gf_free(di);
 	}
 	gf_list_del(ctx->directories);
+
+#ifdef GPAC_HAS_QJS
+	if (ctx->jsc) {
+		httpout_cleanup_js(ctx);
+	}
+#endif
 }
 
 static GF_Err httpout_sess_data_upload(GF_HTTPOutSession *sess, const u8 *data, u32 size)
 {
 	u32 remain, write, to_write;
 
+	if (sess->cbk_write) {
+		sess->cbk_write(sess->rt_udta, data, size);
+		sess->nb_bytes += size;
+		sess->file_pos += size;
+		return GF_OK;
+	}
+
 	if (sess->opid || sess->reconfigure_output) {
 		GF_FilterPacket *pck;
 		u8 *buffer;
@@ -2582,7 +3172,7 @@
 		return GF_OK;
 	}
 	if (!sess->resource) {
-		assert(0);
+		gf_fatal_assert(0);
 	}
 	if (!sess->nb_ranges) {
 		write = (u32) gf_fwrite(data, size, sess->resource);
@@ -2596,7 +3186,11 @@
 	}
 	remain = size;
 	while (remain) {
-		to_write = (u32) (sess->rangessess->range_idx.end + 1 - sess->file_pos);
+		if (sess->rangessess->range_idx.end<0)
+			to_write = remain;
+		else
+			to_write = (u32) (sess->rangessess->range_idx.end + 1 - sess->file_pos);
+
 		if (to_write>=remain) {
 			write = (u32) gf_fwrite(data, remain, sess->resource);
 			if (write != remain) {
@@ -2629,7 +3223,7 @@
 
 static void log_request_done(GF_HTTPOutSession *sess)
 {
-	if (!sess->do_log) return;
+	if (sess->do_log!=1) return;
 	const char *sprefix = sess->is_h2 ? "H2 " : "";
 
 	if (!sess->socket) {
@@ -2648,17 +3242,6 @@
 			unit = "kbps";
 			bps/=1000;
 		}
-#if 0
-		assert(sess->nb_bytes);
-		if (sess->nb_ranges) {
-			u32 i;
-			u64 tot_bytes = 0;
-			for (i=0; i<sess->nb_ranges; i++) {
-				tot_bytes += sess->rangesi.end - sess->rangesi.start + 1;
-			}
-			assert(tot_bytes==sess->nb_bytes);
-		}
-#endif
 		GF_LOG(GF_LOG_INFO, GF_LOG_ALL, ("HTTPOut %sREQ#"LLU" %s done: reply %d - "LLU" bytes in %d ms at %g %s\n", sprefix, sess->req_id, get_method_name(sess->method_type), sess->reply_code, sess->nb_bytes, (u32) (diff_us/1000), bps, unit));
 	}
 }
@@ -2668,19 +3251,39 @@
 	u32 read;
 	u64 to_read=0;
 	GF_Err e = GF_OK;
+	Bool file_in_progress, last_range;
 	Bool close_session = ctx->close;
 
 	if (sess->force_destroy) {
-		httpout_close_session(sess);
+		httpout_close_session(sess, GF_SERVICE_ERROR);
 		return;
 	}
 
+#ifdef GPAC_HAS_QJS
+	if (sess->cbk_throttle) {
+		if (sess->next_process_clock) {
+			if (gf_sys_clock_high_res() < sess->next_process_clock) {
+				ctx->next_wake_us = 1;
+				return;
+			}
+			sess->next_process_clock=0;
+		} else {
+			s32 next_time = sess->cbk_throttle(sess->rt_udta, sess->nb_bytes, sess->body_or_file ? (u32) strlen(sess->body_or_file) : sess->file_size);
+			if (next_time>0) {
+				sess->next_process_clock = gf_sys_clock_high_res()+next_time;
+				ctx->next_wake_us = 1;
+				return;
+			}
+		}
+	}
+#endif
+
 
 	//upload session (PUT, POST)
 	if (sess->upload_type) {
 		u32 i, count;
 		GF_Err write_e=GF_OK;
-		assert(sess->path);
+
 		if (sess->done)
 			return;
 
@@ -2704,21 +3307,22 @@
 				//we way be in end of stream
 				if (e==GF_OK)
 					return;
+				if (sess->cbk_write)
+					sess->cbk_write(sess->rt_udta, NULL, 0);
 			} else {
 				e = write_e;
 			}
 		} else if (e==GF_IP_NETWORK_EMPTY) {
-			//don't reschedule in upload, let server decide
-			ctx->next_wake_us = 100;
+			ctx->next_wake_us = 1;
 			sess->last_active_time = gf_sys_clock_high_res();
-			httpout_check_connection(sess);
+			//httpout_check_connection(sess);
 			return;
 		} else if (e==GF_IP_CONNECTION_CLOSED) {
 			sess->last_active_time = gf_sys_clock_high_res();
 			sess->done = GF_TRUE;
 			sess->canceled = GF_FALSE;
 			sess->upload_type = 0;
-			httpout_close_session(sess);
+			httpout_close_session(sess, e);
 			log_request_done(sess);
 			return;
 		}
@@ -2775,7 +3379,7 @@
 					gf_dynstrcat(&loc, sess->path, "/");
 					gf_dm_sess_set_header(sess->http_sess, "Content-Location", loc);
 					gf_free(loc);
-				} else {
+				} else if (sess->path) {
 					char *dpath=NULL;
 					char *spath = strchr(sess->path, '/');
 					if (spath) spath = spath+1;
@@ -2798,6 +3402,8 @@
 					}
 					gf_dm_sess_set_header(sess->http_sess, "Content-Location", spath);
 					if (dpath) gf_free(dpath);
+				} else {
+					httpout_push_headers(sess);
 				}
 			}
 
@@ -2805,7 +3411,7 @@
 
 			log_request_done(sess);
 
-			gf_dm_sess_send_reply(sess->http_sess, sess->reply_code, NULL, GF_TRUE);
+			gf_dm_sess_send_reply(sess->http_sess, sess->reply_code, NULL, 0, GF_TRUE);
 		}
 
 		sess->last_active_time = gf_sys_clock_high_res();
@@ -2836,18 +3442,18 @@
 		//check we have something to read if not http2
 		//if http2, data might have been received on this session while processing another session
 		if (!sess->is_h2 && !gf_sk_group_sock_is_set(ctx->sg, sess->socket, GF_SK_SELECT_READ)) {
-			ctx->next_wake_us = 2000;
+			ctx->next_wake_us = 100;
 			return;
 		}
 		e = gf_dm_sess_process(sess->http_sess);
 
-		if (e==GF_IP_NETWORK_EMPTY) {
+		if ((e==GF_IP_NETWORK_EMPTY) || (sess->async_pending==1)) {
 			return;
 		}
 
 		if (e<0) {
 			GF_LOG(GF_LOG_INFO, GF_LOG_HTTP, ("HTTPOut Connection to %s closed: %s\n", sess->peer_address, gf_error_to_string(e) ));
-			httpout_close_session(sess);
+			httpout_close_session(sess, e);
 			if (!sess->done)
 				log_request_done(sess);
 			return;
@@ -2889,12 +3495,12 @@
 	}
 
 	if (!gf_sk_group_sock_is_set(ctx->sg, sess->socket, GF_SK_SELECT_WRITE)) {
-		ctx->next_wake_us=1;
+		ctx->next_wake_us = 1;
 		return;
 	}
 	//flush session if async, with no select
 	if (gf_dm_sess_flush_async(sess->http_sess, GF_TRUE)==GF_IP_NETWORK_EMPTY) {
-		ctx->next_wake_us=1;
+		ctx->next_wake_us = 1;
 		return;
 	}
 	//resource is not set
@@ -2920,37 +3526,76 @@
 	}
 
 resend:
-
+	last_range=GF_FALSE;
+	file_in_progress = sess->file_in_progress;
+	to_read=0;
 	//we have ranges
 	if (sess->nb_ranges) {
+		Bool range_done=GF_FALSE;
 		//current range is done
-		if ((s64) sess->file_pos >= sess->rangessess->range_idx.end) {
+		if ((sess->rangessess->range_idx.end>0)
+			&& ((s64) sess->file_pos >= sess->rangessess->range_idx.end)
+		) {
 			//load next range, seeking file
 			if (sess->range_idx+1<sess->nb_ranges) {
 				sess->range_idx++;
 				sess->file_pos = (u64) sess->rangessess->range_idx.start;
 				gf_fseek(sess->resource, sess->file_pos, SEEK_SET);
+			} else {
+				range_done = GF_TRUE;
+				file_in_progress = GF_FALSE;
 			}
 		}
-		if (sess->range_idx<sess->nb_ranges) {
-			to_read = sess->rangessess->range_idx.end + 1 - sess->file_pos;
+		if (!range_done && (sess->range_idx<sess->nb_ranges)) {
+			if (sess->rangessess->range_idx.end>0) {
+				to_read = sess->rangessess->range_idx.end + 1 - sess->file_pos;
+				//we have an explicit closed range request, stop even if file is still being produced
+				file_in_progress = GF_FALSE;
+				if (sess->range_idx+1 == sess->nb_ranges)
+					last_range = GF_TRUE;
+			} else if (sess->file_size > sess->file_pos) {
+				to_read = sess->file_size - sess->file_pos;
+			}
 		}
 	} else if (sess->file_pos < sess->file_size) {
 		to_read = sess->file_size - sess->file_pos;
+		last_range = GF_TRUE;
+	}
+#ifdef GPAC_HAS_QJS
+	else if (sess->cbk_read) {
+		s32 nb_read = sess->cbk_read(sess->rt_udta, sess->buffer, sess->ctx->block_size);
+
+		if (nb_read<0) {
+			ctx->next_wake_us = 1;
+			sess->last_active_time = gf_sys_clock_high_res();
+			return;
+		}
+		to_read = (u32) nb_read;
+		sess->file_size = sess->nb_bytes+nb_read;
 	}
+#endif
 
 	if (to_read) {
+		u64 remain = to_read;
 		//rescedule asap while we send
 		ctx->next_wake_us = 1;
 
 		if (to_read > (u64) sess->ctx->block_size)
 			to_read = (u64) sess->ctx->block_size;
 
-		read = (u32) gf_fread(sess->buffer, (u32) to_read, sess->resource);
-		//may happen when file writing is in progress
-		if (!read) {
-			sess->last_active_time = gf_sys_clock_high_res();
-			return;
+		if (sess->comp_data) {
+			memcpy(sess->buffer, sess->comp_data+sess->file_pos, to_read);
+			read = (u32) to_read;
+		}
+		else if (sess->resource) {
+			read = (u32) gf_fread(sess->buffer, (u32) to_read, sess->resource);
+			//may happen when file writing is in progress
+			if (!read) {
+				sess->last_active_time = gf_sys_clock_high_res();
+				return;
+			}
+		} else {
+			read = (u32) to_read;
 		}
 		//transfer of file being uploaded, use chunk transfer
 		if (!sess->is_h2 && sess->use_chunk_transfer) {
@@ -2975,7 +3620,7 @@
 				GF_LOG(GF_LOG_DEBUG, GF_LOG_HTTP, ("HTTPOut Connection to %s for %s closed\n", sess->peer_address, sess->path));
 				sess->done = GF_TRUE;
 				sess->canceled = GF_FALSE;
-				httpout_close_session(sess);
+				httpout_close_session(sess, e);
 				log_request_done(sess);
 				return;
 			}
@@ -2983,6 +3628,10 @@
 		} else {
 			GF_LOG(GF_LOG_DEBUG, GF_LOG_HTTP, ("HTTPOut sending data to %s for %s: "LLU"/"LLU" bytes\n", sess->peer_address, sess->path, sess->nb_bytes, sess->bytes_in_req));
 
+			//not in progress and we are done, notify (for chunk-transfer or h2) right away
+			if (!file_in_progress && last_range && (remain==read))
+				goto session_done;
+
 			if (gf_dm_sess_flush_async(sess->http_sess, GF_FALSE)==GF_OK) {
 				goto resend;
 			}
@@ -2990,7 +3639,7 @@
 		return;
 	}
 	//file not done yet ...
-	if (sess->file_in_progress || (sess->put_in_progress==1)) {
+	if (file_in_progress || (sess->put_in_progress==1)) {
 		sess->last_active_time = gf_sys_clock_high_res();
 		return;
 	}
@@ -3009,7 +3658,6 @@
 
 	if (!sess->done) {
 		if (!sess->is_h2 && sess->use_chunk_transfer) {
-			assert(sess->nb_bytes);
 			gf_dm_sess_send(sess->http_sess, "0\r\n\r\n", 5);
 		} else {
 			gf_dm_sess_send(sess->http_sess, NULL, 0);
@@ -3017,12 +3665,13 @@
 		if (sess->resource) gf_fclose(sess->resource);
 		sess->resource = NULL;
 
+		if (sess->comp_data) gf_free(sess->comp_data);
+		sess->comp_data = NULL;
+
 		if (sess->nb_bytes) {
 			GF_LOG(GF_LOG_INFO, GF_LOG_HTTP, ("HTTPOut Done sending %s to %s ("LLU"/"LLU" bytes)\n", sess->path, sess->peer_address, sess->nb_bytes, sess->bytes_in_req));
 		}
 
-		log_request_done(sess);
-
 		//keep resource active
 		sess->canceled = GF_FALSE;
 
@@ -3030,7 +3679,7 @@
 		return;
 	}
 	if (close_session) {
-		httpout_close_session(sess);
+		httpout_close_session(sess, sess->canceled ? GF_URL_REMOVED : GF_OK);
 	}
 	//might be NULL if quit was set
 	else if (sess->http_sess) {
@@ -3047,7 +3696,7 @@
 		if (!ctx->blockio && (e==GF_IP_NETWORK_EMPTY)) {
 			res = GF_FALSE;
 		} else {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_HTTP, ("HTTPOut Error closing output %s: %s\n", in->local_path ? in->local_path : in->path, gf_error_to_string(e) ));
+			GF_LOG(GF_LOG_WARNING, GF_LOG_HTTP, ("HTTPOut Failed to close output %s: %s\n", in->local_path ? in->local_path : in->path, gf_error_to_string(e) ));
 		}
 	}
 	if (for_llhls) in->flush_close_llhls = !res;
@@ -3061,6 +3710,7 @@
 		in->done = GF_TRUE;
 		in->is_open = GF_FALSE;
 		in->is_delete = GF_FALSE;
+		in->write_not_ready = GF_FALSE;
 	}
 	return res;
 }
@@ -3108,7 +3758,7 @@
                 if (ctx->dst && !an_in->force_dst_name) continue;
                 if (!gf_filter_pid_share_origin(in->ipid, an_in->ipid))
                     continue;
-                
+
                 o_url = gf_strdup(an_in->path);
                 path_sep = strrchr(o_url, '/');
                 if (path_sep) {
@@ -3132,7 +3782,7 @@
 		sep = name;
     }
     if (!sep) {
-        GF_LOG(GF_LOG_ERROR, GF_LOG_HTTP, ("HTTPOut %s output file %s but cannot guess path !\n", is_delete ? "Deleting" : "Opening",  name));
+        GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("HTTPOut %s output file %s but cannot guess path !\n", is_delete ? "Deleting" : "Opening",  name));
 		return GF_FALSE;
 	}
 
@@ -3145,7 +3795,7 @@
 	}
 
 
-	GF_LOG(GF_LOG_INFO, GF_LOG_HTTP, ("HTTPOut %s output file %s\n", is_delete ? "Deleting" : "Opening", sep+1));
+	GF_LOG(GF_LOG_INFO, GF_LOG_MMIO, ("HTTPOut %s output file %s\n", is_delete ? "Deleting" : "Opening", sep+1));
 	if (in->upload) {
 		GF_Err e;
 		in->done = GF_FALSE;
@@ -3279,9 +3929,19 @@
 	return GF_TRUE;
 }
 
-static void httpout_input_in_error(GF_HTTPOutInput *in)
+static void httpout_input_in_error(GF_HTTPOutInput *in, GF_Err e)
 {
-	if (!in->in_error) {
+	Bool force_close=GF_FALSE;
+	if (e) {
+		if (!in->clock_first_error) {
+			in->clock_first_error = gf_sys_clock();
+		} else if (gf_sys_clock() - in->clock_first_error > in->ctx->timeout*1000) {
+			force_close = GF_TRUE;
+			GF_LOG(GF_LOG_ERROR, GF_LOG_HTTP, ("HTTPOut Failed to open output file %s: %s, aborting\n", in->path, gf_error_to_string(e) ));
+		}
+	}
+
+	if ((!in->ctx->ka || force_close) && !in->in_error) {
 		GF_FilterEvent evt;
 		in->in_error = GF_TRUE;
 		gf_filter_pid_set_discard(in->ipid, GF_TRUE);
@@ -3290,14 +3950,37 @@
 	}
 }
 
+//for upload of LLHLS in seperate file mode only
+static void httpout_close_input_llhls(GF_HTTPOutCtx *ctx, GF_HTTPOutInput *in)
+{
+	GF_Err e;
+	if (!in->llhls_is_open) return;
+
+	GF_LOG(GF_LOG_INFO, GF_LOG_HTTP, ("HTTPOut Closing LL-HLS %s upload\n", in->llhls_url));
+
+	in->llhls_is_open = GF_FALSE;
+	//close prev session
+	if (!in->is_h2) {
+		e = gf_dm_sess_send(in->llhls_upload, "0\r\n\r\n", 5);
+		if (e) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_HTTP, ("HTTPOut Error sending last chunk of LLHLS part %s: %s\n", in->llhls_url, gf_error_to_string(e) ));
+		}
+	}
+	//signal we're done sending the body
+	gf_dm_sess_send(in->llhls_upload, NULL, 0);
+
+	httpout_close_upload(ctx, in, GF_TRUE);
+}
 
 static void httpout_close_input(GF_HTTPOutCtx *ctx, GF_HTTPOutInput *in)
 {
+	httpout_close_input_llhls(ctx, in);
 	if (!in->is_open) return;
 	in->is_open = GF_FALSE;
 	in->done = GF_TRUE;
+	in->clock_first_error = 0;
 
-	GF_LOG(GF_LOG_INFO, GF_LOG_HTTP, ("HTTPOut Closing output %s\n", in->local_path ? in->local_path : in->path));
+	GF_LOG(GF_LOG_INFO, GF_LOG_MMIO, ("HTTPOut Closing output %s\n", in->local_path ? in->local_path : in->path));
 
 	if (in->upload) {
 		GF_Err e;
@@ -3306,7 +3989,7 @@
 			if (e) {
 				GF_LOG(GF_LOG_ERROR, GF_LOG_HTTP, ("HTTPOut Error sending last chunk to %s: %s\n", in->local_path ? in->local_path : in->path, gf_error_to_string(e) ));
 				if (e==GF_IP_CONNECTION_CLOSED) {
-					httpout_input_in_error(in);
+					httpout_input_in_error(in, e);
 					return;
 				}
 			}
@@ -3324,7 +4007,7 @@
 		}
 
 		if (in->resource) {
-			assert(in->local_path);
+			gf_assert(in->local_path);
 			//close all LL-HLS chunks before closing session
 			httpout_close_hls_chunk(ctx, in, GF_FALSE);
 
@@ -3333,7 +4016,7 @@
 			for (i=0; i<count; i++) {
 				GF_HTTPOutSession *sess = gf_list_get(ctx->sessions, i);
 				if (sess->in_source != in) continue;
-				assert(sess->file_in_progress);
+				gf_assert(sess->file_in_progress);
 				if (sess->in_source) {
 					//in mem mode, sess->path may still be a local path, convert to gfio of source if needed
 					httpout_check_mem_path(sess, sess->in_source);
@@ -3371,29 +4054,9 @@
 		}
 	}
 	in->nb_write = 0;
+	in->offset_at_seg_start = 0;
 }
 
-//for upload of LLHLS in seperate file mode only
-static void httpout_close_input_llhls(GF_HTTPOutCtx *ctx, GF_HTTPOutInput *in)
-{
-	GF_Err e;
-	if (!in->llhls_is_open) return;
-
-	GF_LOG(GF_LOG_INFO, GF_LOG_HTTP, ("HTTPOut Closing LL-HLS %s upload\n", in->llhls_url));
-
-	in->llhls_is_open = GF_FALSE;
-	//close prev session
-	if (!in->is_h2) {
-		e = gf_dm_sess_send(in->llhls_upload, "0\r\n\r\n", 5);
-		if (e) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_HTTP, ("HTTPOut Error sending last chunk of LLHLS part %s: %s\n", in->llhls_url, gf_error_to_string(e) ));
-		}
-	}
-	//signal we're done sending the body
-	gf_dm_sess_send(in->llhls_upload, NULL, 0);
-
-	httpout_close_upload(ctx, in, GF_TRUE);
-}
 
 //for upload of LLHLS in seperate file mode only
 static Bool httpout_open_input_llhls(GF_HTTPOutCtx *ctx, GF_HTTPOutInput *in, char *dst)
@@ -3428,7 +4091,7 @@
 
 	if (!in->is_open) return 0;
 
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_HTTP, ("HTTPOut Writing %d bytes to output file %s\n", pck_size, in->local_path ? in->local_path : in->path));
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_MMIO, ("HTTPOut Writing %d bytes to output file %s\n", pck_size, in->local_path ? in->local_path : in->path));
 
 	if (in->upload) {
 		char szChunkHdr100;
@@ -3496,13 +4159,13 @@
 				else in->flush_open = GF_FALSE;
 
 				GF_LOG(GF_LOG_ERROR, GF_LOG_HTTP, ("HTTPOut Connection lost, aborting source %s\n", in->local_path ? in->local_path : in->path));
-				httpout_input_in_error(in);
+				httpout_input_in_error(in, GF_IP_CONNECTION_CLOSED);
 				httpout_close_input(ctx, in);
 				return 0;
 			}
 
 			if (e) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_HTTP, ("HTTPOut Error writing to output file %s: %s\n", in->local_path ? in->local_path : in->path, gf_error_to_string(e) ));
+				GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("HTTPOut Error writing to output file %s: %s\n", in->local_path ? in->local_path : in->path, gf_error_to_string(e) ));
 				out = 0;
 			}
 		}
@@ -3568,7 +4231,7 @@
 					e = gf_dm_sess_send(sess->http_sess, (u8*) pck_data, pck_size);
 				}
 				if ((e==GF_IP_CONNECTION_CLOSED) || (e==GF_URL_REMOVED)) {
-					httpout_close_session(sess);
+					httpout_close_session(sess, e);
 				}
 				if (!e)
 					sess->nb_bytes += pck_size;
@@ -3637,6 +4300,7 @@
 static void httpin_send_seg_info(GF_HTTPOutInput *in)
 {
 	GF_FilterEvent evt;
+
 	GF_FEVT_INIT(evt, GF_FEVT_SEGMENT_SIZE, in->ipid);
 	evt.seg_size.seg_url = NULL;
 
@@ -3647,11 +4311,15 @@
 		evt.seg_size.media_range_end = 0;
 		gf_filter_pid_send_event(in->ipid, &evt);
 	} else {
+		//we already sent the info
+		if (in->seg_info_sent) return;
 		evt.seg_size.is_init = 0;
 		evt.seg_size.media_range_start = in->offset_at_seg_start;
-		evt.seg_size.media_range_end = in->nb_write-1;
+		//end range excludes last byte, except if 0 size (some text segments)
+		evt.seg_size.media_range_end = in->nb_write ? (in->nb_write-1) : 0;
 		in->offset_at_seg_start = 1+evt.seg_size.media_range_end;
 		gf_filter_pid_send_event(in->ipid, &evt);
+		in->seg_info_sent = GF_TRUE;
 	}
 }
 
@@ -3714,18 +4382,22 @@
 		if (!ctx->hmode && !ctx->has_read_dir && !in->nb_dest && in->hold) {
 			continue;
 		}
-		if (gf_dm_sess_flush_async(in->upload, GF_TRUE) == GF_IP_NETWORK_EMPTY)
+		if (gf_dm_sess_flush_async(in->upload, GF_TRUE) == GF_IP_NETWORK_EMPTY) {
+			ctx->next_wake_us = 1;
 			continue;
-		if (gf_dm_sess_flush_async(in->llhls_upload, GF_TRUE) == GF_IP_NETWORK_EMPTY)
+		}
+		if (gf_dm_sess_flush_async(in->llhls_upload, GF_TRUE) == GF_IP_NETWORK_EMPTY) {
+			ctx->next_wake_us = 1;
 			continue;
+		}
 
 		pck = gf_filter_pid_get_packet(in->ipid);
 		if (!pck) {
 			nb_nopck++;
 			//check end of PID state
-			if (gf_filter_pid_is_eos(in->ipid)) {
+			if (gf_filter_pid_is_eos(in->ipid) && !gf_filter_pid_is_flush_eos(in->ipid)) {
 				nb_eos++;
-				if (in->dash_mode && in->is_open) {
+				if (in->dash_mode && !in->seg_info_sent) {
 					httpin_send_seg_info(in);
 				}
 				httpout_close_input(ctx, in);
@@ -3733,6 +4405,7 @@
 				if (in->flush_close || in->flush_close_llhls)
 					keep_alive = GF_TRUE;
 			}
+			ctx->next_wake_us = 100;
 			continue;
 		}
 		if (in->in_error) {
@@ -3747,8 +4420,18 @@
 			if (p) {
 				httpin_send_seg_info(in);
 
-				if ( gf_filter_pck_get_property(pck, GF_PROP_PCK_FILENAME))
+				if ( gf_filter_pck_get_property(pck, GF_PROP_PCK_FILENAME)) {
 					start = GF_TRUE;
+				} else {
+					//single-file case, reset seg_info_flag right away
+					in->seg_info_sent = GF_FALSE;
+				}
+			}
+			p = gf_filter_pck_get_property(pck, GF_PROP_PCK_EODS);
+			if (p && p->value.boolean) {
+				httpin_send_seg_info(in);
+				end = GF_TRUE;
+				goto packet_done;
 			}
 		}
 		//we are waiting for open ack
@@ -3756,10 +4439,14 @@
 			GF_Err e = gf_dm_sess_process(in->upload);
 			if (e==GF_IP_NETWORK_EMPTY) continue;
 			if (e) {
-				httpout_input_in_error(in);
-				GF_LOG(GF_LOG_ERROR, GF_LOG_HTTP, ("HTTPOut Failed to open output file %s: %s\n", in->path, gf_error_to_string(e) ));
+				httpout_input_in_error(in, e);
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_HTTP, ("HTTPOut Failed to open output file %s: %s, retrying\n", in->path, gf_error_to_string(e) ));
 				in->is_open = GF_FALSE;
-				continue;
+				//if ignoring error, consider the flush open is done
+				if (!ctx->ka) continue;
+				//we might reset here ....
+				pck = gf_filter_pid_get_packet(in->ipid);
+				if (!pck) continue;
 			}
 			in->flush_open = GF_FALSE;
 			//disable start since this setup for this output is already done done
@@ -3772,18 +4459,20 @@
 		if (in->flush_llhls_open) {
 			skip_start = GF_TRUE;
 		}
+		//last retry, we couldn't write but we could open the upload, skip start
+		if (in->is_open && in->write_not_ready)
+			skip_start = GF_TRUE;
 
 		if (start && !skip_start) {
 			Bool is_static = in->is_manifest;
 			const GF_PropertyValue *fnum, *fname;
 			const char *name = NULL;
 			fname = NULL;
-
-			if (in->is_open)
+			if (in->is_open) {
 				httpout_close_input(ctx, in);
+			}
 
 			httpout_prune_files(ctx, in);
-
 			//both calls above may trigger waiting for reply on session, postpone
 			if (in->flush_close)
 				continue;
@@ -3806,6 +4495,10 @@
 			p = gf_filter_pck_get_property(pck, GF_PROP_PCK_INIT);
 			if (p && p->value.boolean) is_static = GF_TRUE;
 
+			p = gf_filter_pck_get_property(pck, GF_PROP_PID_FILE_REL);
+			Bool use_rel = (p && p->value.boolean) ? GF_TRUE : GF_FALSE;
+			char *dyn_name=NULL;
+
 			if (!name) {
 				/*if PID was connected to an alias, get the alias context to get the destination
 				Otherwise PID was directly connected to the main filter, use main filter destination*/
@@ -3814,7 +4507,7 @@
 
 				if (orig_ctx->dst_in && (orig_ctx->dst_in != in) ) {
 					GF_LOG(GF_LOG_ERROR, GF_LOG_HTTP, ("HTTPOut Mutliple input PIDs with no file name set, broken graph, discarding input %s\n\tYou may retry by adding a new http output filter\n", gf_filter_pid_get_name(in->ipid) ));
-					httpout_input_in_error(in);
+					httpout_input_in_error(in, GF_SERVICE_ERROR);
 					continue;
 				} else {
 					name = orig_ctx->dst;
@@ -3822,11 +4515,15 @@
 				}
 			} else if (in->force_dst_name && !ctx->dst_in) {
 				ctx->dst_in = in;
+			} else if (use_rel) {
+				dyn_name = gf_url_concatenate(ctx->dst, name);
 			}
 
-			httpout_open_input(ctx, in, name, GF_FALSE, is_static);
+			httpout_open_input(ctx, in, dyn_name ? dyn_name : name, GF_FALSE, is_static);
+			if (dyn_name) gf_free(dyn_name);
+
 			if (!in->is_open) {
-				httpout_input_in_error(in);
+				httpout_input_in_error(in, GF_SERVICE_ERROR);
 				continue;
 			}
 
@@ -3844,6 +4541,8 @@
 			if (in->flush_open) {
 				continue;
 			}
+			//reset seg_info_sent only once we have acknowledged opening of the file
+			in->seg_info_sent = GF_FALSE;
 		}
 
 		p = gf_filter_pck_get_property(pck, GF_PROP_PCK_HLS_FRAG_NUM);
@@ -3877,6 +4576,7 @@
 
 				if (in->llhls_upload) {
 					gf_dm_sess_set_sock_group(in->llhls_upload, ctx->sg);
+					gf_dm_sess_set_timeout(in->llhls_upload, ctx->timeout);
 				}
 			}
 
@@ -3907,18 +4607,20 @@
 		if (!ctx->hmode && !ctx->has_read_dir && !in->nb_dest && !in->hold) {
 			if (end) {
 				httpout_close_input(ctx, in);
-				httpout_close_input_llhls(ctx, in);
 			}
 			gf_filter_pid_drop_packet(in->ipid);
 			if (in->nb_write && ctx->quit) {
-				httpout_input_in_error(in);
+				httpout_input_in_error(in, GF_OK);
 				nb_eos++;
 			}
 			continue;
 		}
 
+		in->write_not_ready=GF_FALSE;
 		if (!httpout_input_write_ready(ctx, in)) {
+			in->write_not_ready=GF_TRUE;
 			ctx->next_wake_us = 1;
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_HTTP, ("HTTPOut push socket not ready\n"));
 			continue;
 		}
 
@@ -4038,13 +4740,15 @@
 			} else {
 				GF_LOG(GF_LOG_DEBUG, GF_LOG_HTTP, ("HTTPOut No data associated with packet, cannot write\n"));
 			}
-		} else {
+			ctx->next_wake_us = 1;
+		} else if (pck_size) {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_HTTP, ("HTTPOut output file handle is not opened, discarding %d bytes\n", pck_size));
 		}
+
+packet_done:
 		gf_filter_pid_drop_packet(in->ipid);
 		if (end) {
 			httpout_close_input(ctx, in);
-			httpout_close_input_llhls(ctx, in);
 		}
 		if (!ctx->blockio && in->upload && gf_dm_sess_async_pending(in->upload))
 			continue;
@@ -4079,6 +4783,14 @@
 	if (ctx->done && !ctx->nb_sess_flush_pending)
 		return GF_EOS;
 
+#ifdef GPAC_HAS_QJS
+	if (ctx->jsc && ctx->owns_context) {
+		gf_js_lock(ctx->jsc, GF_TRUE);
+		js_std_loop(ctx->jsc);
+		gf_js_lock(ctx->jsc, GF_FALSE);
+	}
+#endif
+
 	//wakeup every 50ms when inactive
 	ctx->next_wake_us = 50000;
 
@@ -4092,13 +4804,27 @@
 		count = gf_list_count(ctx->active_sessions);
 		for (i=0; i<count; i++) {
 			GF_HTTPOutSession *sess = gf_list_get(ctx->active_sessions, i);
-			if (sess->flush_close && !httpout_sess_flush_close(sess, GF_FALSE)) {
+			if ((sess->flush_close && !httpout_sess_flush_close(sess, GF_FALSE))
+#ifdef GPAC_HAS_QJS
+				|| (sess->async_pending==1)
+#endif
+			) {
 				ctx->next_wake_us = 1;
 				gf_filter_post_process_task(filter);
 				continue;
 			}
-			//push
-			if (sess->in_source) continue;
+
+			if (sess->async_pending==2) {
+				GF_NETIO_Parameter par;
+				memset(&par, 0, sizeof(GF_NETIO_Parameter));
+				par.msg_type = GF_NETIO_PARSE_REPLY;
+				par.reply = sess->method_type;
+				httpout_sess_io(sess, &par);
+			}
+
+
+			//if true push, don't process
+			if (sess->in_source && !sess->file_in_progress) continue;
 
 			//regular download
 			if (sess->http_sess)
@@ -4138,7 +4864,7 @@
 			if (diff_sec>ctx->timeout) {
 				GF_LOG(sess->done ? GF_LOG_INFO : GF_LOG_WARNING, GF_LOG_HTTP, ("HTTPOut Timeout for peer %s after %d sec, closing connection (last request %s)\n", sess->peer_address, diff_sec, sess->in_source ? sess->in_source->path : sess->path ));
 
-				httpout_close_session(sess);
+				httpout_close_session(sess, GF_IP_UDP_TIMEOUT);
 
 				httpout_del_session(sess);
 				i--;
@@ -4183,7 +4909,7 @@
 			for (i=0; i<count; i++) {
 				GF_HTTPOutSession *sess = gf_list_get(ctx->sessions, i);
 				if (sess->opid == evt->base.on_pid) {
-					httpout_close_session(sess);
+					httpout_close_session(sess, GF_URL_REMOVED);
 				}
 			}
 		}
@@ -4237,9 +4963,7 @@
 {
 	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_STREAM_TYPE, GF_STREAM_FILE),
 	CAP_STRING(GF_CAPS_INPUT,GF_PROP_PID_FILE_EXT, "*"),
-	CAP_STRING(GF_CAPS_INPUT,GF_PROP_PID_MIME, "*"),
-	{0},
-	CAP_UINT(GF_CAPS_OUTPUT,GF_PROP_PID_STREAM_TYPE, GF_STREAM_FILE),
+	CAP_STRING(GF_CAPS_INPUT,GF_PROP_PID_MIME, "*")
 };
 
 
@@ -4264,7 +4988,7 @@
 	"- default: run in server mode\n"
 	"- push: run in client mode using PUT or POST\n"
 	"- source: use server as source filter on incoming PUT/POST", GF_PROP_UINT, "default", "default|push|source", GF_FS_ARG_HINT_ADVANCED},
-	{ OFFS(timeout), "timeout in seconds for persistent connections (0 disable timeout)", GF_PROP_UINT, "5", NULL, GF_FS_ARG_HINT_ADVANCED},
+	{ OFFS(timeout), "timeout in seconds for persistent connections (0 disable timeout)", GF_PROP_UINT, "30", NULL, GF_FS_ARG_HINT_ADVANCED},
 	{ OFFS(ext), "set extension for graph resolution, regardless of file extension", GF_PROP_NAME, NULL, NULL, GF_FS_ARG_HINT_ADVANCED},
 	{ OFFS(mime), "set mime type for graph resolution", GF_PROP_NAME, NULL, NULL, GF_FS_ARG_HINT_EXPERT},
 	{ OFFS(quit), "exit server once all input PIDs are done and client disconnects (for test purposes)", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_EXPERT},
@@ -4275,13 +4999,19 @@
 		"- off: disable CORS\n"
 		"- on: enable CORS\n"
 		"- auto: enable CORS when `Origin` is found in request", GF_PROP_UINT, "auto", "auto|off|on", GF_FS_ARG_HINT_EXPERT},
-	{ OFFS(reqlog), "provide short log of the requests indicated in this option (comma separated list, `*` for all) regardless of HTTP log settings. Value `REC` logs file writing start/end", GF_PROP_STRING, NULL, NULL, GF_FS_ARG_HINT_EXPERT},
+	{ OFFS(reqlog), "provide short log of the requests indicated in this option (comma separated list, `*` for all) regardless of HTTP log settings. Value `REC` logs file writing start/end. If prefix `-` is set, do not log request end", GF_PROP_STRING, NULL, NULL, GF_FS_ARG_HINT_EXPERT},
 	{ OFFS(ice), "insert ICE meta-data in response headers in sink mode", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_EXPERT},
 	{ OFFS(max_client_errors), "force disconnection after specified number of consecutive errors from HTTTP 1.1 client (ignored in H/2 or when `close` is set)", GF_PROP_UINT, "20", NULL, GF_FS_ARG_HINT_EXPERT},
 	{ OFFS(max_cache_segs), "maximum number of segments cached per HAS quality (see filter help)", GF_PROP_SINT, "5", NULL, GF_FS_ARG_HINT_EXPERT},
 	{ OFFS(reopen), "in server mode with no read dir, accept requests on files already over but with input pid not in end of stream", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_EXPERT},
 	{ OFFS(max_async_buf), "maximum async buffer size in bytes when sharing output over multiple connection without file IO", GF_PROP_UINT, "100000", NULL, GF_FS_ARG_HINT_EXPERT},
 	{ OFFS(blockio), "use blocking IO in push or source mode or in server mode with no read dir", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_EXPERT},
+	{ OFFS(ka), "keep input alive if failure in push mode", GF_PROP_BOOL, "true", NULL, GF_FS_ARG_HINT_EXPERT},
+	{ OFFS(hdrs), "additional HTTP headers to inject, even values are names, odd values are values ", GF_PROP_STRING_LIST, NULL, NULL, GF_FS_ARG_HINT_ADVANCED},
+#ifdef GPAC_HAS_QJS
+	{ OFFS(js), "javascript logic for server", GF_PROP_STRING, NULL, NULL, GF_FS_ARG_HINT_EXPERT},
+#endif
+	{ OFFS(zmax), "maximum uncompressed size allowed for gzip or deflate compression for text files (only enabled if client indicates it), 0 will disable compression", GF_PROP_UINT, "50000", NULL, GF_FS_ARG_HINT_EXPERT},
 	{0}
 };
 
@@ -4320,6 +5050,10 @@
 		"When disabled, a GET on a directory will fail.\n"
 		"When enabled, a GET on a directory will return a simple HTML listing of the content inspired from Apache.\n"
 		"  \n"
+		"Custom headers can be specified using -hdrs(), they apply to all requests. For more advanced control on requests, use a javascript binding (see -js() and howtos).\n"
+		"  \n"
+		"Text files are compressed using gzip or deflate if the client accepts these encodings, unless -no_z() is set.\n"
+		"  \n"
 		"# Simple HTTP server\n"
 		"In this mode, the filter does not need any input connection and exposes all files in the directories given by -rdirs().\n"
 		"PUT and POST methods are only supported if a write directory is specified by -wdir() option.\n"
@@ -4396,7 +5130,7 @@
 		"- the first loaded HTTP output filter with same URL/port will be reused\n"
 		"- all httpout options of subsequent httpout filters, except -dst() will be ignored, other options will be inherited as usual\n"
 		"\n"
-		"EX gpac -i dash.mpd dashin:forward=file:SID=D1 dashin:forward=segb:SID=D2 -o http://localhost:80/live.mpd:SID=D1:rdirs=dash -o http://localhost:80/live_rw.mpd:SID=D2:sigfrag\n"
+		"EX gpac -i dash.mpd dashin:forward=file:FID=D1 dashin:forward=segb:FID=D2 -o http://localhost:80/live.mpd:SID=D1:rdirs=dash -o http://localhost:80/live_rw.mpd:SID=D2:sigfrag\n"
 		"This will:\n"
 		"- load the HTTP server and forward (through `D1`) the dash session to this server using `live.mpd` as manifest name\n"
 		"- reuse the HTTP server and regenerate the manifest (through `D2` and `sigfrag` option), using `live_rw.mpd` as manifest name\n"
@@ -4412,7 +5146,7 @@
 	.process = httpout_process,
 	.process_event = httpout_process_event,
 	.use_alias = httpout_use_alias,
-	.flags = GF_FS_REG_TEMP_INIT
+	.flags = GF_FS_REG_TEMP_INIT|GF_FS_REG_USE_SYNC_READ
 };
 
 
@@ -4424,3 +5158,108 @@
 	return &HTTPOutRegister;
 }
 
+#else
+
+typedef void GF_HTTPOutSession ;
+
+const GF_FilterRegister *httpout_register(GF_FilterSession *session)
+{
+	return NULL;
+}
+#endif //GPAC_DISABLE_NETWORK
+
+
+
+
+GF_EXPORT
+GF_Err gf_filter_bind_httpout_callbacks(GF_Filter *filter, void *udta,
+	s32 (*on_request)(void *udta, GF_HTTPOutSession *session, const char *method, const char *url, u32 auth_code, u32 nb_hdrs, const char **hdrs)
+)
+{
+#ifndef GPAC_DISABLE_NETWORK
+	if (!gf_filter_is_instance_of(filter, &HTTPOutRegister))
+		return GF_BAD_PARAM;
+	GF_HTTPOutCtx *ctx = (GF_HTTPOutCtx*) gf_filter_get_udta(filter);
+
+	if (on_request) {
+		ctx->on_request = on_request;
+		ctx->rt_udta = udta;
+	} else {
+		ctx->on_request = NULL;
+		ctx->rt_udta = udta;
+	}
+	return GF_OK;
+#else
+	return GF_NOT_SUPPORTED;
+#endif
+}
+
+GF_EXPORT
+GF_Err gf_httpout_send_request(GF_HTTPOutSession *sess, void *udta,
+	u32 reply,
+	char *body_or_file,
+	u32 nb_headers,
+	const char **headers,
+	u32 (*throttle)(void *udta, u64 done, u64 total),
+	s32 (*read)(void *udta, u8 *buffer, u32 buffer_size),
+	u32 (*write)(void *udta, const u8 *buffer, u32 buffer_size),
+	void (*close)(void *udta, GF_Err reason)
+)
+{
+#ifndef GPAC_DISABLE_NETWORK
+	if (!sess) return GF_BAD_PARAM;
+	if (sess->async_pending!=1) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_HTTP, ("HTTPOut send() called multiple times - state %u\n", sess->async_pending));
+		return GF_BAD_PARAM;
+	}
+	sess->async_pending = 2;
+	sess->next_process_clock = 0;
+
+	if (sess->body_or_file) gf_free(sess->body_or_file);
+	sess->body_or_file = body_or_file ? gf_strdup(body_or_file) : NULL;
+	sess->reply = reply;
+	sess->cbk_write = write;
+	sess->cbk_close = close;
+	sess->cbk_throttle = throttle;
+	sess->upload_type = 0;
+	sess->rt_udta = udta;
+	if (reply && !sess->body_or_file && (sess->method_type==GF_HTTP_GET)) {
+		if (!read && reply) {
+			sess->reply = 500;
+			GF_LOG(GF_LOG_ERROR, GF_LOG_HTTP, ("HTTPOut Missing required callback function read for GET method\n"));
+			return GF_BAD_PARAM;
+		}
+		sess->cbk_read = read;
+	} else {
+		sess->cbk_read = NULL;
+	}
+	if (nb_headers%2) {
+		nb_headers--;
+		GF_LOG(GF_LOG_WARNING, GF_LOG_HTTP, ("HTTPOut Not enough values in header list, truncating to %u\n", nb_headers));
+	}
+	if (nb_headers) {
+		if (!sess->headers) sess->headers = gf_list_new();
+		u32 i;
+		for (i=0; i<nb_headers; i+=2) {
+			if (headersi && headersi+1) {
+				gf_list_add(sess->headers, gf_strdup(headersi));
+				gf_list_add(sess->headers, gf_strdup(headersi+1));
+			}
+		}
+	}
+	if (sess->reply && ((sess->method_type==GF_HTTP_PUT) || (sess->method_type==GF_HTTP_POST))) {
+		if (!sess->cbk_write) {
+			sess->reply = 500;
+			GF_LOG(GF_LOG_ERROR, GF_LOG_HTTP, ("HTTPOut Missing required callback function write for PUT/POST method\n"));
+			return GF_BAD_PARAM;
+		} else {
+			sess->upload_type = 1;
+		}
+	} else {
+		sess->cbk_write=NULL;
+	}
+	return GF_OK;
+#else
+	return GF_NOT_SUPPORTED;
+#endif
+}

gpac-2.2.1.tar.gz/src/filters/out_pipe.c -> gpac-2.4.0.tar.gz/src/filters/out_pipe.c Changed

gpac-2.2.1.tar.gz/src/filters/out_route.c -> gpac-2.4.0.tar.gz/src/filters/out_route.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2020-2022
+ *			Copyright (c) Telecom ParisTech 2020-2024
  *					All rights reserved
  *
  *  This file is part of GPAC / ROUTE output filter
@@ -43,7 +43,7 @@
 {
 	char *dst, *ext, *mime, *ifce, *ip;
 	u32 carousel, first_port, bsid, mtu, splitlct, ttl, brinc, runfor;
-	Bool korean, llmode, noreg;
+	Bool korean, llmode, noreg, nozip;
 
 	GF_FilterCapability in_caps2;
 	char szExt10;
@@ -172,7 +172,7 @@
 } ROUTEPid;
 
 
-ROUTELCT *route_create_lct_channel(GF_ROUTEOutCtx *ctx, const char *ip, u32 port, GF_Err *e)
+ROUTELCT *route_create_lct_channel(GF_Filter *filter, GF_ROUTEOutCtx *ctx, const char *ip, u32 port, GF_Err *e)
 {
 	*e = GF_OUT_OF_MEM;
 	ROUTELCT *rlct;
@@ -189,7 +189,7 @@
 	}
 
 	if (rlct->ip) {
-		rlct->sock = gf_sk_new(GF_SOCK_TYPE_UDP);
+		rlct->sock = gf_sk_new_ex(GF_SOCK_TYPE_UDP, gf_filter_get_netcap_id(filter) );
 		if (rlct->sock) {
 			*e = gf_sk_setup_multicast(rlct->sock, rlct->ip, rlct->port, ctx->ttl, GF_FALSE, ctx->ifce);
 			if (*e) {
@@ -207,7 +207,7 @@
 	return NULL;
 }
 
-ROUTEService *routeout_create_service(GF_ROUTEOutCtx *ctx, u32 service_id, const char *ip, u32 port, GF_Err *e)
+ROUTEService *routeout_create_service(GF_Filter *filter, GF_ROUTEOutCtx *ctx, u32 service_id, const char *ip, u32 port, GF_Err *e)
 {
 	ROUTEService *rserv;
 	ROUTELCT *rlct = NULL;
@@ -215,7 +215,7 @@
 	GF_SAFEALLOC(rserv, ROUTEService);
 	if (!rserv) return NULL;
 
-	rlct = route_create_lct_channel(ctx, ip, port, e);
+	rlct = route_create_lct_channel(filter, ctx, ip, port, e);
 	if (!rlct) {
 		gf_free(rserv);
 		return NULL;
@@ -333,6 +333,14 @@
 		else if (!rpid->manifest_type) {
 			p = gf_filter_pid_get_property(rpid->pid, GF_PROP_PID_TEMPLATE);
 			if (p && p->value.string) {
+				char *sep1 = strstr(p->value.string, "$Number");
+				char *sep2 = strstr(p->value.string, "$Time");
+				if (sep1 && sep2) {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_ROUTE, ("ROUTE DASH Template is %s but ROUTE cannot use both Time and Number !\n", p->value.string));
+					rpid->route->is_done = GF_TRUE;
+					return GF_BAD_PARAM;
+				}
+
 				if (!rpid->template || strcmp(rpid->template, p->value.string)) {
 					if (rpid->template) gf_free(rpid->template);
 					rpid->template = gf_strdup(p->value.string);
@@ -369,27 +377,23 @@
 	}
 
 	manifest_type = 0;
-	p = gf_filter_pid_get_property(pid, GF_PROP_PID_MIME);
-	if (p && p->value.string) {
-		if (strstr(p->value.string, "dash")) manifest_type = 1;
-		else if (strstr(p->value.string, "mpd")) manifest_type = 1;
-		else if (strstr(p->value.string, "mpegurl")) manifest_type = 2;
-	}
-	if (!manifest_type) {
-		p = gf_filter_pid_get_property(pid, GF_PROP_PID_FILE_EXT);
-		if (p && p->value.string) {
-			if (strstr(p->value.string, "mpd")) manifest_type = 1;
-			else if (strstr(p->value.string, "m3u8")) manifest_type = 2;
-			else if (strstr(p->value.string, "3gm")) manifest_type = 1;
-		}
-	}
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_IS_MANIFEST);
+	if (p) manifest_type = p->value.uint;
+
 	if (manifest_type) {
-		p = gf_filter_pid_get_property(pid, GF_PROP_PID_ORIG_STREAM_TYPE);
+		p = gf_filter_pid_get_property(pid, GF_PROP_PID_PREMUX_STREAM_TYPE);
 		if (!p || (p->value.uint!=GF_STREAM_FILE)) {
 			GF_LOG(GF_LOG_WARNING, GF_LOG_ROUTE, ("ROUTE Manifest file detected but no dashin filter, file will be uploaded as is !\n"));
 			manifest_type = 0;
 		}
 	}
+	if (manifest_type) {
+		if (manifest_type & 0x80000000) {
+			manifest_type &= 0x7FFFFFFF;
+		} else {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_ROUTE, ("ROUTE Manifest file describes a static session, clients tune-in will likely fail !\n"));
+		}
+	}
 
 	if (!rserv) {
 		GF_Err e;
@@ -415,7 +419,7 @@
 			else ctx->first_port++;
 		}
 
-		rserv = routeout_create_service(ctx, service_id, service_ip, port, &e);
+		rserv = routeout_create_service(filter, ctx, service_id, service_ip, port, &e);
 		if (!rserv) return e;
 		rserv->dash_mode = pid_dash_mode;
 	}
@@ -455,7 +459,7 @@
 	if (p) rpid->bitrate = p->value.uint * (100+ctx->brinc) / 100;
 
 	rpid->stream_type = 0;
-	p = gf_filter_pid_get_property(rpid->pid, GF_PROP_PID_ORIG_STREAM_TYPE);
+	p = gf_filter_pid_get_property(rpid->pid, GF_PROP_PID_PREMUX_STREAM_TYPE);
 	if (!p) {
 		if (!rpid->manifest_type) {
 			rpid->raw_file = GF_TRUE;
@@ -475,9 +479,16 @@
 
 	if (!rpid->manifest_type && !rpid->raw_file) {
 		p = gf_filter_pid_get_property(rpid->pid, GF_PROP_PID_TEMPLATE);
-		if (p && p->value.string) rpid->template = gf_strdup(p->value.string);
-
-		else {
+		if (p && p->value.string) {
+			char *sep1 = strstr(p->value.string, "$Number");
+			char *sep2 = strstr(p->value.string, "$Time");
+			if (sep1 && sep2) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_ROUTE, ("ROUTE DASH Template is %s but ROUTE cannot use both Time and Number !\n", p->value.string));
+				gf_filter_abort(filter);
+				return GF_BAD_PARAM;
+			}
+			rpid->template = gf_strdup(p->value.string);
+		} else {
 			GF_LOG(GF_LOG_WARNING, GF_LOG_ROUTE, ("ROUTE Segment file PID detected but no template assigned, assuming raw file upload!\n"));
 			rpid->raw_file = GF_TRUE;
 		}
@@ -511,7 +522,7 @@
 				ROUTEPid *apid = gf_list_get(rserv->pids, i);
 				if (apid->manifest_type) continue;
 				if (apid == rpid) continue;
-				p = gf_filter_pid_get_property(rpid->pid, GF_PROP_PID_ORIG_STREAM_TYPE);
+				p = gf_filter_pid_get_property(rpid->pid, GF_PROP_PID_PREMUX_STREAM_TYPE);
 				if (!p) continue;
 				astreamtype = p->value.uint;
 				if (astreamtype==rpid->stream_type) {
@@ -524,7 +535,7 @@
 			GF_Err e;
 			rserv->first_port++;
 			ctx->first_port++;
-			rpid->rlct = route_create_lct_channel(ctx, NULL, rserv->first_port, &e);
+			rpid->rlct = route_create_lct_channel(filter, ctx, NULL, rserv->first_port, &e);
 			if (e) return e;
 			if (rpid->rlct) {
 				gf_list_add(rserv->rlcts, rpid->rlct);
@@ -633,7 +644,7 @@
 	ctx->services = gf_list_new();
 
 	if (is_atsc) {
-		ctx->sock_atsc_lls = gf_sk_new(GF_SOCK_TYPE_UDP);
+		ctx->sock_atsc_lls = gf_sk_new_ex(GF_SOCK_TYPE_UDP, gf_filter_get_netcap_id(filter) );
 		gf_sk_setup_multicast(ctx->sock_atsc_lls, GF_ATSC_MCAST_ADDR, GF_ATSC_MCAST_PORT, 0, GF_FALSE, ctx->ifce);
 	}
 
@@ -764,13 +775,15 @@
 			GF_FilterPacket *pck = gf_filter_pid_get_packet(rpid->pid);
 			if (!pck) break;
 
+			file_name = ctx->dst;
 			p = gf_filter_pck_get_property(pck, GF_PROP_PCK_FILENAME);
-			if (!p) p = gf_filter_pid_get_property(rpid->pid, GF_PROP_PID_URL);
-
-			if (p)
+			if (p) {
 				file_name = p->value.string;
-			else
-				file_name = ctx->dst;
+			} else {
+				p = gf_filter_pid_get_property(rpid->pid, GF_PROP_PID_URL);
+				if (p)
+					file_name = gf_file_basename(p->value.string);
+			}
 
 			if (file_name) {
 				proto = strstr(file_name, "://");
@@ -884,7 +897,7 @@
 
 	//not ready, waiting for manifest
 	if (!serv->manifest && !nb_raw_files) {
-		return GF_OK;
+		return GF_NOT_READY;
 	}
 	//already setup and no changes
 	else if (!serv->wait_for_inputs) {
@@ -893,7 +906,7 @@
 	}
 	if (serv->wait_for_inputs) {
 		if (!serv->manifest) {
-			assert(nb_raw_files);
+			gf_assert(nb_raw_files);
 			serv->stsid_changed = GF_TRUE;
 		}
 		serv->wait_for_inputs = GF_FALSE;
@@ -1049,7 +1062,8 @@
 		char szIPGF_MAX_IP_NAME_LEN;
 		src_ip = ctx->ifce;
 		if (!src_ip) {
-			gf_sk_get_local_ip(rlct->sock, szIP);
+			if (gf_sk_get_local_ip(rlct->sock, szIP) != GF_OK)
+				strcpy(szIP, "127.0.0.1");
 			src_ip = szIP;
 		}
 
@@ -1090,14 +1104,25 @@
 
 			p = gf_filter_pid_get_property(rpid->pid, GF_PROP_PID_TEMPLATE);
 			if (p) {
-				char *sep;
+				char *sep, *sep2, *key = "$Number";
 				strcpy(temp, p->value.string);
 				sep = strstr(temp, "$Number");
+				sep2 = strstr(temp, "$Time");
+				if (sep && sep2) {
+					gf_free(payload_text);
+					GF_LOG(GF_LOG_ERROR, GF_LOG_ROUTE, ("ROUTE DASH Template is %s but ROUTE cannot use both Time and Number !\n", p->value.string));
+					serv->is_done = GF_TRUE;
+					return GF_SERVICE_ERROR;
+				}
+				if (!sep) {
+					sep = sep2;
+					key = "$Time";
+				}
 				if (sep) {
 					sep0 = 0;
 					strcat(temp, "$TOI");
-					sep = strstr(p->value.string, "$Number");
-					strcat(temp, sep + 7);
+					sep = strstr(p->value.string, key);
+					strcat(temp, sep + strlen(key));
 				}
 			}
 
@@ -1218,13 +1243,15 @@
 
 	GF_LOG(GF_LOG_INFO, GF_LOG_ROUTE, ("ROUTE Updated Manifest+S-TSID bundle to:\n%s\n", payload_text));
 
-	//compress and store as final payload
 	if (serv->stsid_bundle) gf_free(serv->stsid_bundle);
 	serv->stsid_bundle = (u8 *) payload_text;
 	serv->stsid_bundle_size = 1 + (u32) strlen(payload_text);
-	gf_gz_compress_payload(&serv->stsid_bundle, serv->stsid_bundle_size, &serv->stsid_bundle_size);
-
-	serv->stsid_bundle_toi = 0x80000000; //compressed
+	if(!ctx->nozip) {
+		//compress and store as final payload
+		gf_gz_compress_payload_ex(&serv->stsid_bundle, serv->stsid_bundle_size, &serv->stsid_bundle_size, 0, GF_FALSE, NULL, GF_TRUE);
+		
+		serv->stsid_bundle_toi = 0x80000000; //compressed
+	}
 	if (manifest_updated) serv->stsid_bundle_toi |= (1<<18);
 	if (serv->stsid_changed) {
 		serv->stsid_bundle_toi |= (1<<17);
@@ -1305,7 +1332,7 @@
 	//start_offset
 	PUT_U32(offset_in_frame);
 
-	assert(send_payl_size+hpos <= ctx->mtu);
+	gf_assert(send_payl_size+hpos <= ctx->mtu);
 
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_ROUTE, ("ROUTE LCT SID %u TSI %u TOI %u size %u (frag %u total %u) offset %u (%u in obj)\n", service_id, tsi, toi, send_payl_size, len, total_size, offset, offset_in_frame));
 
@@ -1350,7 +1377,7 @@
 
 	rpid->current_pck = gf_filter_pid_get_packet(rpid->pid);
 	if (!rpid->current_pck) {
-		if (gf_filter_pid_is_eos(rpid->pid)) {
+		if (gf_filter_pid_is_eos(rpid->pid) && !gf_filter_pid_is_flush_eos(rpid->pid) ) {
 #if 0
 			if (gf_filter_reporting_enabled(filter)) {
 				char szStatus1024;
@@ -1373,7 +1400,8 @@
 				} else {
 					evt.seg_size.is_init = 0;
 					evt.seg_size.media_range_start = rpid->offset_at_seg_start;
-					evt.seg_size.media_range_end = rpid->res_size - 1;
+					//end range excludes last byte, except if 0 size (some text segments)
+					evt.seg_size.media_range_end = rpid->res_size ? (rpid->res_size - 1) : 0;
 					gf_filter_pid_send_event(rpid->pid, &evt);
 				}
 			}
@@ -1383,6 +1411,13 @@
 		}
 		return;
 	}
+	//skip eods packets
+	if (rpid->route->dash_mode && gf_filter_pck_get_property(rpid->current_pck, GF_PROP_PCK_EODS)) {
+		gf_filter_pid_drop_packet(rpid->pid);
+		rpid->current_pck = NULL;
+		goto retry;
+	}
+
 	gf_filter_pck_ref(&rpid->current_pck);
 	gf_filter_pid_drop_packet(rpid->pid);
 
@@ -1405,7 +1440,7 @@
 	p = gf_filter_pck_get_property(rpid->current_pck, GF_PROP_PCK_INIT);
 	if (p && p->value.boolean) {
 		u32 crc;
-		assert(start && end);
+		gf_assert(start && end);
 		crc = gf_crc_32(rpid->pck_data, rpid->pck_size);
 		//whenever init seg changes, bump stsid version
 		if (crc != rpid->init_seg_crc) {
@@ -1429,7 +1464,7 @@
 	p = gf_filter_pck_get_property(rpid->current_pck, GF_PROP_PID_HLS_PLAYLIST);
 	if (p && p->value.string) {
 		u32 crc;
-		assert(start && end);
+		gf_assert(start && end);
 		crc = gf_crc_32(rpid->pck_data, rpid->pck_size);
 		//whenever init seg changes, bump stsid version
 		if (crc != rpid->hld_child_pl_crc) {
@@ -1466,7 +1501,8 @@
 			} else {
 				evt.seg_size.is_init = 0;
 				evt.seg_size.media_range_start = rpid->offset_at_seg_start;
-				evt.seg_size.media_range_end = rpid->res_size - 1;
+				//end range excludes last byte, except if 0 size (some text segments)
+				evt.seg_size.media_range_end = rpid->res_size ? (rpid->res_size - 1) : 0;
 				rpid->offset_at_seg_start = evt.seg_size.media_range_end;
 				gf_filter_pid_send_event(rpid->pid, &evt);
 			}
@@ -1476,7 +1512,7 @@
 	}
 
 	if (rpid->raw_file) {
-		assert(start && end);
+		gf_assert(start && end);
 
 		if (rpid->seg_name) gf_free(rpid->seg_name);
 		rpid->seg_name = "unknown";
@@ -1525,12 +1561,22 @@
 		rpid->seg_name = gf_strdup(rpid->seg_name);
 
 		//file num increased per packet, open new file
-		p = gf_filter_pck_get_property(rpid->current_pck, GF_PROP_PCK_FILENUM);
-		if (p)
-			rpid->current_toi = p->value.uint;
-		else {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_ROUTE, ("ROUTE Missing filenum on segment %s, something is wrong in demux chain - assuming +1 increase\n", rpid->seg_name));
-			rpid->current_toi ++;
+		p = gf_filter_pck_get_property(rpid->current_pck, GF_PROP_PCK_MPD_SEGSTART);
+		if (p) {
+			if (p->value.lfrac.num >= ROUTE_INIT_TOI) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_ROUTE, ("ROUTE MPD Time "LLU" greater than 32 bits, session no longer valid, aborting\n", p->value.lfrac.num));
+				rpid->route->is_done = GF_TRUE;
+				gf_filter_pid_set_discard(rpid->pid, GF_TRUE);
+			}
+			rpid->current_toi = (u32) p->value.lfrac.num;
+		} else {
+			p = gf_filter_pck_get_property(rpid->current_pck, GF_PROP_PCK_FILENUM);
+			if (p)
+				rpid->current_toi = p->value.uint;
+			else {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_ROUTE, ("ROUTE Missing filenum on segment %s, something is wrong in source chain - assuming +1 increase\n", rpid->seg_name));
+				rpid->current_toi ++;
+			}
 		}
 		rpid->frag_idx = 0;
 		rpid->full_frame_size = end ? rpid->pck_size : 0;
@@ -1613,7 +1659,7 @@
 		rpid->current_dur_us = pck_dur;
 		if (!rpid->current_dur_us) {
 			rpid->current_dur_us = rpid->timescale;
-			GF_LOG(GF_LOG_ERROR, GF_LOG_ROUTE, ("ROUTE Missing duration on segment %s, something is wrong in demux chain, will not be able to regulate correctly\n", rpid->seg_name));
+			GF_LOG(GF_LOG_ERROR, GF_LOG_ROUTE, ("ROUTE Missing duration on segment %s, something is wrong in source chain, will not be able to regulate correctly\n", rpid->seg_name));
 		}
 		rpid->current_dur_us = gf_timestamp_rescale(rpid->current_dur_us, rpid->timescale, 1000000);
 	} else if (start && end) {
@@ -1633,10 +1679,12 @@
 	GF_Err e;
 
 	e = routeout_check_service_updates(ctx, serv);
+	if (e==GF_NOT_READY)
+		return GF_OK;
 
 	if (serv->stsid_bundle) {
 		u64 diff = ctx->clock - serv->last_stsid_clock;
-		if (diff >= ctx->carousel) {
+		if (!serv->last_stsid_clock || (diff >= ctx->carousel)) {
 			routeout_service_send_bundle(ctx, serv);
 			serv->last_stsid_clock = ctx->clock;
 		} else {
@@ -1676,7 +1724,7 @@
 			u32 offset;
 			routeout_fetch_packet(ctx, rpid);
 			if (!rpid->current_pck) {
-				if (gf_filter_pid_is_eos(rpid->pid))
+				if (gf_filter_pid_is_eos(rpid->pid) && !gf_filter_pid_is_flush_eos(rpid->pid))
 					nb_done++;
 				continue;
 			}
@@ -1869,9 +1917,9 @@
 
 	if (!ctx->bytes_sent) ctx->clock_stats = ctx->clock;
 
-	//we send 2 LLS tables, SysTime and SLT
+	//ATSC3 we send 2 LLS tables, SysTime and SLT
 
-	//SysTime
+	//ATSC3 SysTime
 	if (!ctx->lls_time_table) {
 		gf_dynstrcat(&payload_text, "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<SystemTime currentUtcOffset=\"", NULL);
 		sprintf(tmp, "%d", GF_TAI_UTC_OFFSET);
@@ -1894,7 +1942,7 @@
 		comp_size = 2*len;
 		payload = gf_malloc(sizeof(char)*(comp_size+4));
 		pay_start = payload + 4;
-		gf_gz_compress_payload_ex((u8 **) &payload_text, len, &comp_size, 0, GF_FALSE, &pay_start);
+		gf_gz_compress_payload_ex((u8 **) &payload_text, len, &comp_size, 0, GF_FALSE, &pay_start, GF_TRUE);
 		gf_free(payload_text);
 		payload_text = NULL;
 
@@ -1913,25 +1961,24 @@
 	gf_sk_send(ctx->sock_atsc_lls, ctx->lls_time_table, ctx->lls_time_table_len);
 	ctx->bytes_sent += ctx->lls_time_table_len;
 
-	//SLT
+	//ATSC3 SLT
 	if (!ctx->lls_slt_table) {
 		count = gf_list_count(ctx->services);
-		snprintf(tmp, 1000, "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<SLT bsid=\"%d\">\n", ctx->bsid);
+		snprintf(tmp, 1000, "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<SLT xmlns=\"tag:atsc.org,2016:XMLSchemas/ATSC3/Delivery/SLT/1.0/\" bsid=\"%d\">\n", ctx->bsid);
 		gf_dynstrcat(&payload_text, tmp, NULL);
 		for (i=0; i<count; i++) {
 			const GF_PropertyValue *p;
-			const char *src_ip, *service_name;
+			const char *src_ip, *service_name, *hidden, *hideInESG, *configuration;
 			char szIPGF_MAX_IP_NAME_LEN;
 			ROUTEPid *rpid;
 			ROUTEService *serv = gf_list_get(ctx->services, i);
+
 			u32 sid = serv->service_id;
 			if (!sid) sid = 1;
-			u32 minor = sid % 1000;
-			if (!minor) minor = 1;
-			u32 major = GF_4CC('G', 'P', 'A', 'C')  % 1000;
 
 			rpid = gf_list_get(serv->pids, 0);
-			p = gf_filter_pid_get_property_str(rpid->pid, "ShortServiceName");
+
+			p = gf_filter_pid_get_property_str(rpid->pid, "ATSC3ShortServiceName");
 			if (!p)
 				p = gf_filter_pid_get_property(rpid->pid, GF_PROP_PID_SERVICE_NAME);
 			service_name = (p && p->value.string) ? p->value.string : "GPAC";
@@ -1940,13 +1987,37 @@
 			strncpy(szIP, service_name, len);
 			szIPlen = 0;
 
+			// ATSC 3.0 major channel number starts at 2. This really should be set rather than using the default.
+			u32 major = 2;
+			p = gf_filter_pid_get_property_str(rpid->pid, "ATSC3MajorChannel");
+			if (p && p->value.string) major = atoi(p->value.string);
+
+			// ATSC 3.0 minor channel number starts at 1.
+			u32 minor = 1;
+			p = gf_filter_pid_get_property_str(rpid->pid, "ATSC3MinorChannel");
+			if (p && p->value.string) minor = atoi(p->value.string);
+
+			u32 service_cat = 1;
+			p = gf_filter_pid_get_property_str(rpid->pid, "ATSC3ServiceCat");
+			if (p && p->value.string) service_cat = atoi(p->value.string);
+
+			p = gf_filter_pid_get_property_str(rpid->pid, "ATSC3hidden");
+			hidden = (p && p->value.string) ? p->value.string : "false";
+
+			p = gf_filter_pid_get_property_str(rpid->pid, "ATSC3hideInGuide");
+			hideInESG = (p && p->value.string) ? p->value.string : "false";
+
+			p = gf_filter_pid_get_property_str(rpid->pid, "ATSC3configuration");
+			configuration = (p && p->value.string) ? p->value.string : "Broadcast";
+
 			snprintf(tmp, 2000,
-				" <Service serviceId=\"%d\" sltSvcSeqNum=\"0 \" serviceCategory=\"1\" globalServiceID=\"urn:atsc:gpac:%d:%d\" majorChannelNo=\"%d\" minorChannelNo=\"%d\" shortServiceName=\"%s\">\n", sid, ctx->bsid, sid, major, minor, szIP);
+				" <Service serviceId=\"%d\" globalServiceID=\"urn:atsc:gpac:%d:%d\" sltSvcSeqNum=\"0\" protected=\"false\" majorChannelNo=\"%d\" minorChannelNo=\"%d\" serviceCategory=\"%d\" shortServiceName=\"%s\" hidden=\"%s\" hideInGuide=\"%s\" broadbandAccessRequired=\"false\" configuration=\"%s\"> \n", sid, ctx->bsid, sid, major, minor, service_cat, szIP, hidden, hideInESG, configuration);
 			gf_dynstrcat(&payload_text, tmp, NULL);
 
 			src_ip = ctx->ifce;
 			if (!src_ip) {
-				gf_sk_get_local_ip(serv->rlct_base->sock, szIP);
+				if (gf_sk_get_local_ip(serv->rlct_base->sock, szIP)!=GF_OK)
+					strcpy(szIP, "127.0.0.1");
 				src_ip = szIP;
 			}
 			int res = snprintf(tmp, 1000, "  <BroadcastSvcSignaling slsProtocol=\"1\" slsDestinationIpAddress=\"%s\" slsDestinationUdpPort=\"%d\" slsSourceIpAddress=\"%s\"/>\n"
@@ -1964,7 +2035,7 @@
 		comp_size = 2*len;
 		payload = gf_malloc(sizeof(char)*(comp_size+4));
 		pay_start = payload + 4;
-		gf_gz_compress_payload_ex((u8 **) &payload_text, len, &comp_size, 0, GF_FALSE, &pay_start);
+		gf_gz_compress_payload_ex((u8 **) &payload_text, len, &comp_size, 0, GF_FALSE, &pay_start, GF_TRUE);
 		gf_free(payload_text);
 		payload_text = NULL;
 
@@ -2119,6 +2190,7 @@
 	{ OFFS(noreg), "disable rate regulation for media segments, pushing them as fast as received", GF_PROP_BOOL, "false", NULL, GF_ARG_HINT_EXPERT},
 
 	{ OFFS(runfor), "run for the given time in ms", GF_PROP_UINT, "0", NULL, 0},
+	{ OFFS(nozip), "do not zip signaling package (STSID+manifest)", GF_PROP_BOOL, "false", NULL, 0},
 	{0}
 };
 
@@ -2172,7 +2244,14 @@
 		"By default, a single multicast IP is used for route sessions, each service will be assigned a different port.\n"
 		"The filter will look for `ROUTEIP` and `ROUTEPort` properties on the incoming PID. If not found, the default -ip() and -port() will be used.\n"
 		"\n"
-		"The ATSC short service name can be set using PID property `ShortServiceName`. If not found, `ServiceName` is checked, otherwise default to `GPAC`.\n"
+		"ATSC 3.0 attributes set by using the following PID properties:\n"
+		"- ATSC3ShortServiceName: set the short service name, maxiumu of 7 characters.  If not found, `ServiceName` is checked, otherwise default to `GPAC`.\n"
+		"- ATSC3MajorChannel: set major channel number of service. Default to 2.  This really should be set and should not use the default.\n"
+		"- ATSC3MinorChannel: set minor channel number of service. Default of 1.\n"
+		"- ATSC3ServiceCat: set service category, default to 1 if not found. 1=Linear a/v service. 2=Linear audio only service. 3=App-based service. 4=ESg service. 5=EA service. 6=DRM service.\n"
+		"- ATSC3hidden: set if service is hidden.  Boolean true or false. Default of false.\n"
+		"- ATSC3hideInGuide: set if service is hidden in ESG.  Boolean true or false. Default of false.\n"
+		"- ATSC3configuration: set service configuration.  Choices are Broadcast or Broadband.  Default of Broadcast\n"
 		"\n"
 		"# ROUTE mode\n"
 		"In this mode, only a single service can be distributed by the ROUTE session.\n"

gpac-2.2.1.tar.gz/src/filters/out_rtp.c -> gpac-2.4.0.tar.gz/src/filters/out_rtp.c Changed

gpac-2.2.1.tar.gz/src/filters/out_rtp.h -> gpac-2.4.0.tar.gz/src/filters/out_rtp.h Changed

gpac-2.2.1.tar.gz/src/filters/out_rtsp.c -> gpac-2.4.0.tar.gz/src/filters/out_rtsp.c Changed

@@ -99,6 +99,7 @@
 	u32 mcast, trp;
 	Bool latm;
 
+	GF_Filter *filter;
 	GF_Socket *server_sock;
 	GF_List *sessions;
 
@@ -398,7 +399,7 @@
 
 	payt = ctx->payt + gf_list_find(sess->streams, stream);
 
-	e = rtpout_init_streamer(stream, ctx->ifce ? ctx->ifce : "127.0.0.1", ctx->xps, ctx->mpeg4, ctx->latm, payt, ctx->mtu, ctx->ttl, ctx->ifce, GF_TRUE, &sess->base_pid_id, 0);
+	e = rtpout_init_streamer(stream, ctx->ifce ? ctx->ifce : "127.0.0.1", ctx->xps, ctx->mpeg4, ctx->latm, payt, ctx->mtu, ctx->ttl, ctx->ifce, GF_TRUE, &sess->base_pid_id, 0, gf_filter_get_netcap_id(filter));
 	if (e) return e;
 
 	if (ctx->loop) {
@@ -420,6 +421,7 @@
 	if (!single_session) {
 		new_sess = gf_rtsp_session_new_server(ctx->server_sock, ctx->htun, ctx->ssl_ctx);
 		if (!new_sess) return GF_OK;
+		gf_rtsp_session_set_netcap_id(new_sess, gf_filter_get_netcap_id(ctx->filter));
 	}
 
 	GF_SAFEALLOC(sess, GF_RTSPOutSession);
@@ -473,6 +475,7 @@
 	if (ctx->payt<96) ctx->payt = 96;
 	if (ctx->payt>127) ctx->payt = 127;
 	ctx->sessions = gf_list_new();
+	ctx->filter = filter;
 
 	ip = ctx->ifce;
 	//move to sec
@@ -490,7 +493,7 @@
 			u32 cplen = (u32) (sep-ctx->dst-7);
 			if (cplen>1023) cplen = 1023;
 			strncpy(szIP, ctx->dst+7, cplen);
-			szIP1023 = 0;
+			szIPMIN(cplen,1023) = 0;
 			sep = strchr(szIP, ':');
 			if (sep) {
 				port = atoi(sep+1);
@@ -548,7 +551,7 @@
 	if (!port)
 		port = ctx->port;
 
-	ctx->server_sock = gf_sk_new(GF_SOCK_TYPE_TCP);
+	ctx->server_sock = gf_sk_new_ex(GF_SOCK_TYPE_TCP, gf_filter_get_netcap_id(filter));
 	e = gf_sk_bind(ctx->server_sock, NULL, port, ip, 0, GF_SOCK_REUSE_PORT);
 	if (!e) e = gf_sk_listen(ctx->server_sock, ctx->maxc);
 	if (e) {

gpac-2.2.1.tar.gz/src/filters/out_sock.c -> gpac-2.4.0.tar.gz/src/filters/out_sock.c Changed

gpac-2.2.1.tar.gz/src/filters/out_video.c -> gpac-2.4.0.tar.gz/src/filters/out_video.c Changed

gpac-2.2.1.tar.gz/src/filters/reframe_ac3.c -> gpac-2.4.0.tar.gz/src/filters/reframe_ac3.c Changed

gpac-2.2.1.tar.gz/src/filters/reframe_adts.c -> gpac-2.4.0.tar.gz/src/filters/reframe_adts.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2022
+ *			Copyright (c) Telecom ParisTech 2000-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / AAC ADTS reframer filter
@@ -27,7 +27,7 @@
 #include <gpac/constants.h>
 #include <gpac/filters.h>
 
-#ifndef GPAC_DISABLE_AV_PARSERS
+#if !defined(GPAC_DISABLE_AV_PARSERS) && !defined(GPAC_DISABLE_RFADTS)
 
 enum
 {
@@ -74,7 +74,7 @@
 	GF_Fraction64 duration;
 	Double start_range;
 	Bool in_seek;
-	u32 timescale;
+	u32 timescale, sample_rate;
 
 	ADTSHeader hdr;
 	u32 dts_inc;
@@ -216,7 +216,10 @@
 		ctx->opid = gf_filter_pid_new(filter);
 		gf_filter_pid_copy_properties(ctx->opid, ctx->ipid);
 		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_UNFRAMED, NULL);
-		//we don't update copy props on output for now - if we decide we need it, we will need to also force resengin the decoder config
+		p = gf_filter_pid_get_property(ctx->ipid, GF_PROP_PID_STREAM_TYPE);
+		if (!p || (p->value.uint==GF_STREAM_FILE)) {
+			gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_STREAM_TYPE, &PROP_UINT(GF_STREAM_AUDIO));
+		}
 	}
 	if (ctx->timescale) ctx->copy_props = GF_TRUE;
 
@@ -418,7 +421,7 @@
 	}
 	ctx->acfg.audioPL = gf_m4a_get_profile(&ctx->acfg);
 
-	/*for better interop, always store using full SR when using explict signaling*/
+	/*for better interop, always store using full SR when using explicit signaling*/
 	if (sbr_sr) {
 		ctx->dts_inc *= 2;
 		sr = sbr_sr;
@@ -450,6 +453,7 @@
 	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_DECODER_CONFIG, & PROP_DATA_NO_COPY(dsi_b, dsi_s) );
 	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_PROFILE_LEVEL, & PROP_UINT (ctx->acfg.audioPL) );
 	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_SAMPLE_RATE, & PROP_UINT(sr));
+	ctx->sample_rate = sr;
 
 	timescale = sr;
 	if (ctx->ovsbr) timescale = 2*sr;
@@ -538,7 +542,7 @@
 
 static GFINLINE void adts_dmx_update_cts(GF_ADTSDmxCtx *ctx)
 {
-	assert(ctx->dts_inc);
+	gf_assert(ctx->dts_inc);
 
 	if (ctx->timescale) {
 		u64 inc = ctx->dts_inc;
@@ -557,7 +561,10 @@
 	u8 *data, *output;
 	u8 *start;
 	u32 pck_size, remain, prev_pck_size;
-	u64 cts = GF_FILTER_NO_TS;
+	u64 cts;
+
+restart:
+	cts = GF_FILTER_NO_TS;
 
 	//always reparse duration
 	if (!ctx->duration.num)
@@ -825,7 +832,7 @@
 
 		if (!ctx->in_seek) {
 
-			if (sync_pos + offset + size > remain) {
+			if (size > GF_UINT_MAX - sync_pos - offset || sync_pos + offset + size > remain) {
 				GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("ADTSDmx truncated frame\n"));
 				break;
 			}
@@ -838,7 +845,10 @@
 
 			gf_filter_pck_set_dts(dst_pck, ctx->cts);
 			gf_filter_pck_set_cts(dst_pck, ctx->cts);
-			gf_filter_pck_set_duration(dst_pck, ctx->dts_inc);
+			if (ctx->timescale && (ctx->timescale!=ctx->sample_rate))
+				gf_filter_pck_set_duration(dst_pck, (u32) gf_timestamp_rescale(ctx->dts_inc, ctx->sample_rate, ctx->timescale) );
+			else
+				gf_filter_pck_set_duration(dst_pck, ctx->dts_inc);
 			gf_filter_pck_set_framing(dst_pck, GF_TRUE, GF_TRUE);
 			gf_filter_pck_set_sap(dst_pck, GF_FILTER_SAP_1);
 
@@ -880,7 +890,8 @@
 
 	if (!pck) {
 		ctx->adts_buffer_size = 0;
-		return adts_dmx_process(filter);
+		//avoid recursive call
+		goto restart;
 	} else {
 		if (remain) {
 			memmove(ctx->adts_buffer, start, remain);
@@ -1033,14 +1044,13 @@
 };
 
 
-const GF_FilterRegister *adts_dmx_register(GF_FilterSession *session)
+const GF_FilterRegister *rfadts_register(GF_FilterSession *session)
 {
 	return &ADTSDmxRegister;
 }
-
 #else
-const GF_FilterRegister *adts_dmx_register(GF_FilterSession *session)
+const GF_FilterRegister *rfadts_register(GF_FilterSession *session)
 {
 	return NULL;
 }
-#endif // GPAC_DISABLE_AV_PARSERS
+#endif // #if !defined(GPAC_DISABLE_AV_PARSERS) && !defined(GPAC_DISABLE_RFADTS)

gpac-2.2.1.tar.gz/src/filters/reframe_amr.c -> gpac-2.4.0.tar.gz/src/filters/reframe_amr.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2022
+ *			Copyright (c) Telecom ParisTech 2000-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / AMR&EVRC&SMV reframer filter
@@ -26,6 +26,8 @@
 #include <gpac/filters.h>
 #include <gpac/constants.h>
 
+#ifndef GPAC_DISABLE_RFAMR
+
 typedef struct
 {
 	u64 pos;
@@ -366,7 +368,7 @@
 		if (gf_filter_pid_is_eos(ctx->ipid)) {
 			if (ctx->opid)
 				gf_filter_pid_set_eos(ctx->opid);
-			assert(ctx->remaining == 0);
+			gf_assert(ctx->remaining == 0);
 			return GF_EOS;
 		}
 		return GF_OK;
@@ -516,7 +518,12 @@
 
 			gf_filter_pck_set_cts(dst_pck, ctx->cts);
 			gf_filter_pck_set_sap(dst_pck, GF_FILTER_SAP_1);
-			gf_filter_pck_set_duration(dst_pck, ctx->block_size);
+			if (ctx->timescale && (ctx->timescale!=ctx->sample_rate))
+				gf_filter_pck_set_duration(dst_pck, (u32) gf_timestamp_rescale(ctx->block_size, ctx->sample_rate, ctx->timescale) );
+			else
+				gf_filter_pck_set_duration(dst_pck, ctx->block_size);
+
+
 			gf_filter_pck_set_framing(dst_pck, GF_TRUE, ctx->remaining ? GF_FALSE : GF_TRUE);
 
 			if (byte_offset != GF_FILTER_NO_BO) {
@@ -534,7 +541,7 @@
 		if (ctx->remaining) break;
 		amrdmx_update_cts(ctx);
 
-		//don't demux too much of input, abort when we would block. This avoid dispatching
+		//don't demux too much of input, abort when we would block. This avoids dispatching
 		//a huge number of frames in a single call
 		if (gf_filter_pid_would_block(ctx->opid)) {
 			ctx->resume_from = (u32) ( (char *)start -  (char *)data);
@@ -617,8 +624,14 @@
 };
 
 
-const GF_FilterRegister *amrdmx_register(GF_FilterSession *session)
+const GF_FilterRegister *rfamr_register(GF_FilterSession *session)
 {
 	return &AMRDmxRegister;
 }
+#else
+const GF_FilterRegister *rfamr_register(GF_FilterSession *session)
+{
+	return NULL;
+}
+#endif //#ifndef GPAC_DISABLE_RFAMR

gpac-2.2.1.tar.gz/src/filters/reframe_av1.c -> gpac-2.4.0.tar.gz/src/filters/reframe_av1.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Romain Bouqueau, Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2018-2022
+ *			Copyright (c) Telecom ParisTech 2018-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / AV1 IVF/OBU/annexB reframer filter
@@ -28,7 +28,7 @@
 #include <gpac/filters.h>
 #include <gpac/internal/media_dev.h>
 
-#ifndef GPAC_DISABLE_AV_PARSERS
+#if !defined(GPAC_DISABLE_AV_PARSERS) && !defined(GPAC_DISABLE_RFAV1)
 
 typedef struct
 {
@@ -276,8 +276,9 @@
 			ctx->bsmode = UNSUPPORTED;
 			return e;
 		}
-		if (!ctx->timescale && (ctx->state.obu_type != OBU_TEMPORAL_DELIMITER)) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("AV1Dmx Error OBU stream start with %s, not a temporal delimiter - NOT SUPPORTED\n", gf_av1_get_obu_name(ctx->state.obu_type) ));
+		if (!ctx->timescale && !ctx->state.has_temporal_delim) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("AV1Dmx Error OBU stream start with %s, not a temporal delimiter\n", gf_av1_get_obu_name(ctx->state.obu_type) ));
+			if (!e) e = GF_NON_COMPLIANT_BITSTREAM;
 			gf_filter_setup_failure(filter, e);
 			ctx->bsmode = UNSUPPORTED;
 			return e;
@@ -545,8 +546,8 @@
 
 static GFINLINE void av1dmx_update_cts(GF_AV1DmxCtx *ctx)
 {
-	assert(ctx->cur_fps.num);
-	assert(ctx->cur_fps.den);
+	gf_assert(ctx->cur_fps.num);
+	gf_assert(ctx->cur_fps.den);
 
 	if (!ctx->notime) {
 		u64 inc = ctx->cur_fps.den;
@@ -600,6 +601,7 @@
 	if (ctx->is_av1 && !gf_list_count(ctx->state.frame_state.header_obus)) return;
 
 	if (!ctx->opid) {
+		if (ctx->bsmode==UNSUPPORTED) return;
 		ctx->opid = gf_filter_pid_new(filter);
 		av1dmx_check_dur(filter, ctx);
 	}
@@ -649,13 +651,17 @@
 	gf_filter_pid_copy_properties(ctx->opid, ctx->ipid);
 	ctx->copy_props = GF_FALSE;
 
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_UNFRAMED, NULL);
 	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_STREAM_TYPE, & PROP_UINT(GF_STREAM_VISUAL));
 
 	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_CODECID, & PROP_UINT(ctx->codecid));
 	if (!ctx->timescale) {
 		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_TIMESCALE, & PROP_UINT(ctx->cur_fps.num));
 	}
-	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_FPS, & PROP_FRAC(ctx->cur_fps));
+	//if we have a FPS prop, use it
+	if (!gf_filter_pid_get_property(ctx->ipid, GF_PROP_PID_FPS))
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_FPS, & PROP_FRAC(ctx->cur_fps));
+
 	if (ctx->state.sequence_width && ctx->state.sequence_height) {
 		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_WIDTH, & PROP_UINT(ctx->state.sequence_width));
 		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_HEIGHT, & PROP_UINT(ctx->state.sequence_height));
@@ -873,7 +879,7 @@
 	}
 
 	u32 pck_size = (u32)(gf_bs_get_position(ctx->bs) - pos);
-	assert(pck_size == frame_size);
+	gf_fatal_assert(pck_size == frame_size);
 
 	//check pid state
 	av1dmx_check_pid(filter, ctx);
@@ -934,7 +940,8 @@
 	if (!ctx->opid)
 		return GF_NON_COMPLIANT_BITSTREAM;
 
-	gf_bs_get_content_no_truncate(ctx->state.bs, &ctx->state.frame_obus, &pck_size, &ctx->state.frame_obus_alloc);
+	if (gf_bs_get_size(ctx->state.bs))
+		gf_bs_get_content_no_truncate(ctx->state.bs, &ctx->state.frame_obus, &pck_size, &ctx->state.frame_obus_alloc);
 
 	if (!pck_size) {
 		GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("AV1Dmx no frame OBU, skipping OBU\n"));
@@ -1102,7 +1109,7 @@
 	}
 
 	if (is_copy && last_obu_end) {
-		assert(ctx->buf_size>=last_obu_end);
+		gf_fatal_assert(ctx->buf_size>=last_obu_end);
 		memmove(ctx->buffer, ctx->buffer+last_obu_end, sizeof(char) * (ctx->buf_size-last_obu_end));
 		ctx->buf_size -= last_obu_end;
 	}
@@ -1212,7 +1219,7 @@
 			gf_filter_pid_drop_packet(ctx->ipid);
 			return GF_OK;
 		}
-		assert(start && end);
+		gf_assert(start && end);
 		//process
 		e = av1dmx_process_buffer(filter, ctx, data, pck_size, GF_FALSE);
 
@@ -1386,14 +1393,14 @@
 };
 
 
-const GF_FilterRegister *av1dmx_register(GF_FilterSession *session)
+const GF_FilterRegister *rfav1_register(GF_FilterSession *session)
 {
 	return &AV1DmxRegister;
 }
-
 #else
-const GF_FilterRegister *av1dmx_register(GF_FilterSession *session)
+const GF_FilterRegister *rfav1_register(GF_FilterSession *session)
 {
 	return NULL;
 }
-#endif // GPAC_DISABLE_AV_PARSERS
+#endif // #if !defined(GPAC_DISABLE_AV_PARSERS) && !defined(GPAC_DISABLE_RFAV1)
+

gpac-2.2.1.tar.gz/src/filters/reframe_flac.c -> gpac-2.4.0.tar.gz/src/filters/reframe_flac.c Changed

gpac-2.2.1.tar.gz/src/filters/reframe_h263.c -> gpac-2.4.0.tar.gz/src/filters/reframe_h263.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2022
+ *			Copyright (c) Telecom ParisTech 2000-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / H263 reframer filter
@@ -27,6 +27,8 @@
 #include <gpac/constants.h>
 #include <gpac/filters.h>
 
+#ifndef GPAC_DISABLE_RFH263
+
 typedef struct
 {
 	u64 pos;
@@ -318,8 +320,8 @@
 
 static GFINLINE void h263dmx_update_cts(GF_H263DmxCtx *ctx)
 {
-	assert(ctx->fps.num);
-	assert(ctx->fps.den);
+	gf_assert(ctx->fps.num);
+	gf_assert(ctx->fps.den);
 
 	if (!ctx->notime) {
 		u64 inc = ctx->fps.den;
@@ -611,6 +613,7 @@
 				memcpy(ctx->hdr_store, start+remain-3, 3);
 				remain -= 3;
 				ctx->bytes_in_header = 3;
+				current=0; //skip test below
 			}
 			size = remain;
 			full_frame = GF_FALSE;
@@ -649,7 +652,7 @@
 		h263dmx_update_cts(ctx);
 
 
-		//don't demux too much of input, abort when we would block. This avoid dispatching
+		//don't demux too much of input, abort when we would block. This avoids dispatching
 		//a huge number of frames in a single call
 		if (gf_filter_pid_would_block(ctx->opid)) {
 			ctx->resume_from = (u32) ( (char *)start -  (char *)data);
@@ -768,7 +771,14 @@
 };
 
 
-const GF_FilterRegister *h263dmx_register(GF_FilterSession *session)
+const GF_FilterRegister *rfh263_register(GF_FilterSession *session)
 {
 	return &H263DmxRegister;
 }
+#else
+const GF_FilterRegister *rfh263_register(GF_FilterSession *session)
+{
+	return NULL;
+}
+#endif //GPAC_DISABLE_RFH263
+

gpac-2.2.1.tar.gz/src/filters/reframe_img.c -> gpac-2.4.0.tar.gz/src/filters/reframe_img.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2022
+ *			Copyright (c) Telecom ParisTech 2000-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / image (jpg/png/bmp/j2k) reframer filter
@@ -26,7 +26,9 @@
 #include <gpac/filters.h>
 #include <gpac/constants.h>
 #include <gpac/avparse.h>
+#include <gpac/network.h>
 
+#ifndef GPAC_DISABLE_RFIMG
 
 #if defined(WIN32) || defined(_WIN32_WCE)
 #include <windows.h>
@@ -86,7 +88,7 @@
 {
 	GF_ReframeImgCtx *ctx = gf_filter_get_udta(filter);
 	const GF_PropertyValue *p;
-	
+
 	if (is_remove) {
 		ctx->ipid = NULL;
 		return GF_OK;
@@ -149,7 +151,7 @@
 	GF_FilterPacket *pck, *dst_pck;
 	GF_Err e;
 	u8 *data, *output;
-	u32 size, w=0, h=0, pf=0;
+	u32 size, w=0, h=0, pf=0, data_size=0;
 	u8 *pix;
 	u32 i, j, irow, in_stride, out_stride;
 	GF_BitStream *bs;
@@ -167,7 +169,8 @@
 		return GF_OK;
 	}
 	data = (char *) gf_filter_pck_get_data(pck, &size);
-	
+	data_size = size;
+
 	if (!ctx->opid || !ctx->codec_id) {
 #ifndef GPAC_DISABLE_AV_PARSERS
 		u32 dsi_size;
@@ -295,7 +298,7 @@
 	/*fh.bfReserved1 = */ gf_bs_read_u16(bs);
 	/*fh.bfReserved2 = */ gf_bs_read_u16(bs);
 	fh.bfOffBits = gf_bs_read_u32(bs);
-	fh.bfOffBits = ntohl(fh.bfOffBits);
+	fh.bfOffBits = gf_ntohl(fh.bfOffBits);
 
 	gf_bs_read_data(bs, (char *) &fi, 40);
 	gf_bs_del(bs);
@@ -305,19 +308,32 @@
 
 	w = fi.biWidth;
 	h = fi.biHeight;
-	pf = (fi.biBitCount==24) ? GF_PIXEL_RGB : GF_PIXEL_RGBA;
+	pf = (fi.biBitCount==24) ? GF_PIXEL_RGB : GF_PIXEL_RGBX;
 	size = (fi.biBitCount==24) ? 3 : 4;
+	if ((u64)size * (u64)h * (u64)w > GF_UINT_MAX ) {
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("Image dimensions too large (%lux%lux%lu)\n", w, h, size));
+		return GF_NON_COMPLIANT_BITSTREAM;
+	}
 	size *= w;
 	out_stride = size;
 	size *= h;
 
+	in_stride = out_stride;
+	while (in_stride % 4) in_stride++;
+
+	u32 max_offset = fh.bfOffBits+(h-1)*in_stride + out_stride ;
+	if (data_size < max_offset) {
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("Trying to output image of size %lu but provided only %lu input bytes\n", max_offset, data_size));
+		return GF_NON_COMPLIANT_BITSTREAM;
+	}
+
 	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_PIXFMT, & PROP_UINT(pf));
 	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_WIDTH, & PROP_UINT(w));
 	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_HEIGHT, & PROP_UINT(h));
 
 	dst_pck = gf_filter_pck_new_alloc(ctx->opid, size, &output);
 	if (!dst_pck) return GF_OUT_OF_MEM;
-	
+
 	gf_filter_pck_merge_properties(pck, dst_pck);
 	if (ctx->owns_timescale) {
 		gf_filter_pck_set_cts(dst_pck, 0);
@@ -325,9 +341,6 @@
 		gf_filter_pck_set_duration(dst_pck, ctx->fps.den);
 	}
 
-	in_stride = out_stride;
-	while (in_stride % 4) in_stride++;
-
 	if (fi.biBitCount==24) {
 		for (i=0; i<h; i++) {
 			irow = (h-1-i)*out_stride;
@@ -432,9 +445,13 @@
 	.process_event = img_process_event
 };
 
-const GF_FilterRegister *img_reframe_register(GF_FilterSession *session)
+const GF_FilterRegister *rfimg_register(GF_FilterSession *session)
 {
 	return &ReframeImgRegister;
 }
-
-
+#else
+const GF_FilterRegister *rfimg_register(GF_FilterSession *session)
+{
+	return NULL;
+}
+#endif //#ifndef GPAC_DISABLE_RFIMG

gpac-2.2.1.tar.gz/src/filters/reframe_latm.c -> gpac-2.4.0.tar.gz/src/filters/reframe_latm.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2022
+ *			Copyright (c) Telecom ParisTech 2000-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / AAC ADTS reframer filter
@@ -28,7 +28,7 @@
 #include <gpac/filters.h>
 #include <gpac/internal/media_dev.h>
 
-#ifndef GPAC_DISABLE_AV_PARSERS
+#if !defined(GPAC_DISABLE_AV_PARSERS) && !defined(GPAC_DISABLE_RFLATM)
 
 #define LATM_DMX_MAX_SIZE	8192
 
@@ -58,10 +58,10 @@
 	u32 timescale;
 
 	GF_M4ADecSpecInfo acfg;
-	
+
 	char *latm_buffer;
 	u32 latm_buffer_size, latm_buffer_alloc;
-	u32 dts_inc;
+	u32 dts_inc, sample_rate;
 
 	Bool is_playing;
 	Bool is_file, file_loaded;
@@ -263,7 +263,7 @@
 	cur_dur = 0;
 	cur_pos = gf_bs_get_position(bs);
 	while (latm_dmx_sync_frame_bs(bs, &acfg, 0, NULL, NULL)) {
-		if ((sr_idx>=0) && (sr_idx != acfg.base_sr_index)) {
+		if ((sr_idx>=0) && (sr_idx != acfg.base_sr_index) && sr_idx < GF_ARRAY_LENGTH(GF_M4ASampleRates) && GF_M4ASampleRatessr_idx) {
 			duration *= GF_M4ASampleRatesacfg.base_sr_index;
 			duration /= GF_M4ASampleRatessr_idx;
 
@@ -273,7 +273,7 @@
 		sr_idx = acfg.base_sr_index;
 		duration += ctx->frame_size;
 		cur_dur += ctx->frame_size;
-		if (cur_dur > ctx->index * GF_M4ASampleRatessr_idx) {
+		if (cur_dur > ctx->index * GF_M4ASampleRatessr_idx  && sr_idx < GF_ARRAY_LENGTH(GF_M4ASampleRates) && GF_M4ASampleRatessr_idx) {
 			if (!ctx->index_alloc_size) ctx->index_alloc_size = 10;
 			else if (ctx->index_alloc_size == ctx->index_size) ctx->index_alloc_size *= 2;
 			ctx->indexes = gf_realloc(ctx->indexes, sizeof(LATMIdx)*ctx->index_alloc_size);
@@ -290,7 +290,7 @@
 	gf_bs_del(bs);
 	gf_fclose(stream);
 
-	if (sr_idx>=0) {
+	if (sr_idx>=0 && sr_idx < GF_ARRAY_LENGTH(GF_M4ASampleRates) && GF_M4ASampleRatessr_idx) {
 		if (!ctx->duration.num || (ctx->duration.num  * GF_M4ASampleRatessr_idx != duration * ctx->duration.den)) {
 			ctx->duration.num = (s32) duration;
 			ctx->duration.den = GF_M4ASampleRatessr_idx;
@@ -364,7 +364,7 @@
 	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_DECODER_CONFIG, & PROP_DATA_NO_COPY(dsi_b, dsi_s) );
 	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_PROFILE_LEVEL, & PROP_UINT (ctx->acfg.audioPL) );
 	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_SAMPLE_RATE, & PROP_UINT(sr));
-
+	ctx->sample_rate = sr;
 	timescale = sr;
 
 	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_TIMESCALE, & PROP_UINT(ctx->timescale ? ctx->timescale : timescale));
@@ -442,7 +442,7 @@
 
 static GFINLINE void latm_dmx_update_cts(GF_LATMDmxCtx *ctx)
 {
-	assert(ctx->dts_inc);
+	gf_assert(ctx->dts_inc);
 
 	if (ctx->timescale) {
 		u64 inc = ctx->dts_inc;
@@ -459,9 +459,13 @@
 	GF_LATMDmxCtx *ctx = gf_filter_get_udta(filter);
 	GF_FilterPacket *pck, *dst_pck;
 	u32 pos;
-	u8 *data=NULL, *output;
+	u8 *data, *output;
 	u32 pck_size=0, prev_pck_size;
-	u64 cts = GF_FILTER_NO_TS;
+	u64 cts;
+
+restart:
+	cts = GF_FILTER_NO_TS;
+	data=NULL;
 
 	if (ctx->in_error)
 		return ctx->in_error;
@@ -534,7 +538,10 @@
 				ctx->in_seek = GF_FALSE;
 			}
 		}
-
+		//don't init until we get audio config
+		if (!ctx->acfg.base_sr) {
+			continue;
+		}
 		latm_dmx_check_pid(filter, ctx);
 
 		if (!ctx->is_playing) {
@@ -553,7 +560,10 @@
 			memcpy(output, latm_buffer, latm_frame_size);
 
 			gf_filter_pck_set_cts(dst_pck, ctx->cts);
-			gf_filter_pck_set_duration(dst_pck, ctx->dts_inc);
+			if (ctx->timescale && (ctx->timescale!=ctx->sample_rate))
+				gf_filter_pck_set_duration(dst_pck, (u32) gf_timestamp_rescale(ctx->dts_inc, ctx->sample_rate, ctx->timescale) );
+			else
+				gf_filter_pck_set_duration(dst_pck, ctx->dts_inc);
 			gf_filter_pck_set_framing(dst_pck, GF_TRUE, GF_TRUE);
 
 			/*xHE-AAC, check RAP*/
@@ -586,14 +596,18 @@
 
 	if (pck) {
 		pos = (u32) gf_bs_get_position(ctx->bs);
-		assert(ctx->latm_buffer_size >= pos);
-		memmove(ctx->latm_buffer, ctx->latm_buffer+pos, ctx->latm_buffer_size - pos);
-		ctx->latm_buffer_size -= pos;
+		if (ctx->latm_buffer_size >= pos) {
+			memmove(ctx->latm_buffer, ctx->latm_buffer+pos, ctx->latm_buffer_size - pos);
+			ctx->latm_buffer_size -= pos;
+		} else {
+			ctx->latm_buffer_size = 0;
+		}
 		gf_filter_pid_drop_packet(ctx->ipid);
-		assert(!ctx->resume_from);
+		gf_assert(!ctx->resume_from);
 	} else {
 		ctx->latm_buffer_size = 0;
-		return latm_dmx_process(filter);
+		//avoid recursive call
+		goto restart;
 	}
 	return GF_OK;
 }
@@ -615,7 +629,7 @@
 	while (1) {
 		u32 nb_skipped = 0;
 		if (!latm_dmx_sync_frame_bs(bs, &acfg, 0, NULL, &nb_skipped)) break;
-		if (acfg.base_sr_index > sizeof(GF_M4ASampleRates) / sizeof(GF_M4ASampleRates0) || GF_M4ASampleRatesacfg.base_sr_index == 0) {
+		if (acfg.base_sr_index >= GF_ARRAY_LENGTH(GF_M4ASampleRates) || GF_M4ASampleRatesacfg.base_sr_index == 0) {
 			nb_frames = 0;
 			break;
 		}
@@ -680,14 +694,13 @@
 };
 
 
-const GF_FilterRegister *latm_dmx_register(GF_FilterSession *session)
+const GF_FilterRegister *rflatm_register(GF_FilterSession *session)
 {
 	return &LATMDmxRegister;
 }
-
 #else
-const GF_FilterRegister *latm_dmx_register(GF_FilterSession *session)
+const GF_FilterRegister *rflatm_register(GF_FilterSession *session)
 {
 	return NULL;
 }
-#endif // GPAC_DISABLE_AV_PARSERS
+#endif // #if !defined(GPAC_DISABLE_AV_PARSERS) && !defined(GPAC_DISABLE_RFLATM)

gpac-2.2.1.tar.gz/src/filters/reframe_mhas.c -> gpac-2.4.0.tar.gz/src/filters/reframe_mhas.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2020-2022
+ *			Copyright (c) Telecom ParisTech 2020-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / MHAS reframer filter
@@ -27,7 +27,7 @@
 #include <gpac/constants.h>
 #include <gpac/filters.h>
 
-#if !defined(GPAC_DISABLE_AV_PARSERS)
+#if !defined(GPAC_DISABLE_AV_PARSERS) && !defined(GPAC_DISABLE_RFMHAS)
 
 
 static u32 USACSampleRates = {96000, 88200, 64000, 48000, 44100, 32000, 24000, 22050, 16000, 12000, 11025, 8000, 7350, 0, 0,
@@ -542,7 +542,7 @@
 			remain=0;
 			break;
 		}
-		if ((hdr_start1==0x01) && (hdr_start2==0xA5)) {
+		if ( (u32)(hdr_start-start)+3 <= remain  && (hdr_start1==0x01) && (hdr_start2==0xA5)) {
 			GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("MHASDmx Sync found !\n"));
 			ctx->nosync = GF_FALSE;
 			break;
@@ -638,10 +638,11 @@
 				numSpeakers = (s32) gf_mpegh_escaped_value(ctx->bs, 5, 8, 16) + 1;
 				//TODO ...
 			}
+			if (sr) {
+				mhas_dmx_check_pid(filter, ctx, pl, sr, frame_len, CICPspeakerLayoutIdx, numSpeakers, start + pay_start, (u32) mhas_size);
 
-			mhas_dmx_check_pid(filter, ctx, pl, sr, frame_len, CICPspeakerLayoutIdx, numSpeakers, start + pay_start, (u32) mhas_size);
-
-			has_cfg = GF_TRUE;
+				has_cfg = GF_TRUE;
+			}
 		}
 		//audio truncation
 		else if (mhas_type==17) {
@@ -713,8 +714,7 @@
 			}
 
 			if (ctx->timescale) {
-				pck_dur *= ctx->timescale;
-				pck_dur /= ctx->sample_rate;
+				pck_dur = gf_timestamp_rescale(pck_dur, ctx->sample_rate, ctx->timescale);
 			}
 
 			dst = gf_filter_pck_new_alloc(ctx->opid, au_size, &output);
@@ -773,9 +773,12 @@
 		}
 	}
 	if (consumed) {
-		assert(remain>=consumed);
-		remain -= consumed;
-		start += consumed;
+		if (remain>=consumed) {
+			remain -= consumed;
+			start += consumed;
+		} else {
+			remain=0;
+		}
 	}
 
 skip:
@@ -836,6 +839,8 @@
 		u32 pos = (u32) (ptr - data);
 		const u8 *sync_start = memchr(ptr, 0xC0, size - pos);
 		if (!sync_start) return NULL;
+		u32 remain = size - (u32) (sync_start-data);
+		if (remain<2) return NULL;
 		if ((sync_start1== 0x01) && (sync_start2==0xA5)) {
 			sync_pos = pos;
 			break;
@@ -914,15 +919,13 @@
 };
 
 
-const GF_FilterRegister *mhas_dmx_register(GF_FilterSession *session)
+const GF_FilterRegister *rfmhas_register(GF_FilterSession *session)
 {
 	return &MHASDmxRegister;
 }
-
 #else
-
-const GF_FilterRegister *mhas_dmx_register(GF_FilterSession *session)
+const GF_FilterRegister *rfmhas_register(GF_FilterSession *session)
 {
 	return NULL;
 }
-#endif //#if !defined(GPAC_DISABLE_AV_PARSERS)
+#endif //#if !defined(GPAC_DISABLE_AV_PARSERS) && !defined(GPAC_DISABLE_RFMHAS)

gpac-2.2.1.tar.gz/src/filters/reframe_mp3.c -> gpac-2.4.0.tar.gz/src/filters/reframe_mp3.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2022
+ *			Copyright (c) Telecom ParisTech 2000-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / MP3 reframer filter
@@ -27,7 +27,7 @@
 #include <gpac/constants.h>
 #include <gpac/filters.h>
 
-#ifndef GPAC_DISABLE_AV_PARSERS
+#if !defined(GPAC_DISABLE_AV_PARSERS) && !defined(GPAC_DISABLE_RFMP3)
 
 typedef struct
 {
@@ -110,6 +110,10 @@
 		ctx->opid = gf_filter_pid_new(filter);
 		gf_filter_pid_copy_properties(ctx->opid, ctx->ipid);
 		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_UNFRAMED, NULL);
+		p = gf_filter_pid_get_property(ctx->ipid, GF_PROP_PID_STREAM_TYPE);
+		if (!p || (p->value.uint==GF_STREAM_FILE)) {
+			gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_STREAM_TYPE, &PROP_UINT(GF_STREAM_AUDIO));
+		}
 	}
 	if (ctx->timescale) ctx->copy_props = GF_TRUE;
 	return GF_OK;
@@ -261,14 +265,16 @@
 			break;
 		}
 
-		if (buf_alloc<=fsize) {
-			_buf = gf_realloc(_buf, fsize+3);
-			buf_alloc = fsize+3;
+		if (buf_alloc <= fsize+3) {
+			_buf = gf_realloc(_buf, fsize+4);
+			buf_alloc = fsize+4;
 		}
 		//read into _buf+1 so that buf+1 is always %2 mem aligned as it can be loaded as unsigned short
+		// having 3 nulls allows for correct 2-char-wide null terminating string not matter the alignment
 		gf_bs_read_data(bs, _buf+1, fsize);
 		_buffsize+1=0;
 		_buffsize+2=0;
+		_buffsize+3=0;
 		buf = _buf+1;
 
 		tag_idx = gf_itags_find_by_id3tag(ftag);
@@ -289,34 +295,38 @@
 			//then mime
 			sep = memchr(buf+1, 0, fsize-1);
 			/*pic_type = sep1;*/
-			sep_desc = memchr(sep+2, 0, fsize-1);
+			sep_desc = sep ? memchr(sep+2, 0, fsize-1) : NULL;
 
 			if (sep_desc) {
 				GF_Err e;
 				pic_size = (u32) ( (sep_desc + 1) - buf);
-				pic_size = fsize - pic_size;
+				if (fsize>pic_size) {
+					pic_size = fsize - pic_size;
 
-				if (video_pid_p) {
-					e = gf_filter_pid_raw_new(filter, NULL, NULL, buf+1, NULL, sep_desc+1, pic_size, GF_FALSE, video_pid_p);
-					if (e) {
-						GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("MP3Dmx error setting up video pid for cover art: %s\n", gf_error_to_string(e) ));
-					}
-					if (*video_pid_p) {
-						u8 *out_buffer;
-						GF_FilterPacket *dst_pck;
-						gf_filter_pid_set_name(*video_pid_p, "CoverArt");
-						gf_filter_pid_set_property(*video_pid_p, GF_PROP_PID_COVER_ART, &PROP_BOOL(GF_TRUE));
-						dst_pck = gf_filter_pck_new_alloc(*video_pid_p, pic_size, &out_buffer);
-						if (dst_pck) {
-							gf_filter_pck_set_framing(dst_pck, GF_TRUE, GF_TRUE);
-							memcpy(out_buffer, sep_desc+1, pic_size);
-							gf_filter_pck_send(dst_pck);
+					if (video_pid_p) {
+						e = gf_filter_pid_raw_new(filter, NULL, NULL, buf+1, NULL, sep_desc+1, pic_size, GF_FALSE, video_pid_p);
+						if (e) {
+							GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("MP3Dmx error setting up video pid for cover art: %s\n", gf_error_to_string(e) ));
 						}
-
-						gf_filter_pid_set_eos(*video_pid_p);
+						if (*video_pid_p) {
+							u8 *out_buffer;
+							GF_FilterPacket *dst_pck;
+							gf_filter_pid_set_name(*video_pid_p, "CoverArt");
+							gf_filter_pid_set_property(*video_pid_p, GF_PROP_PID_COVER_ART, &PROP_BOOL(GF_TRUE));
+							dst_pck = gf_filter_pck_new_alloc(*video_pid_p, pic_size, &out_buffer);
+							if (dst_pck) {
+								gf_filter_pck_set_framing(dst_pck, GF_TRUE, GF_TRUE);
+								memcpy(out_buffer, sep_desc+1, pic_size);
+								gf_filter_pck_send(dst_pck);
+							}
+
+							gf_filter_pid_set_eos(*video_pid_p);
+						}
+					} else {
+						gf_filter_pid_set_property(audio_pid, GF_PROP_PID_COVER_ART, &PROP_DATA(sep_desc+1, pic_size) );
 					}
 				} else {
-					gf_filter_pid_set_property(audio_pid, GF_PROP_PID_COVER_ART, &PROP_DATA(sep_desc+1, pic_size) );
+					GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("MP3Dmx Corrupted cover art, ignoring\n"));
 				}
 			}
 		} else if (tag_idx>=0) {
@@ -371,7 +381,10 @@
 	ctx->copy_props = GF_FALSE;
 	//copy properties at init or reconfig
 	gf_filter_pid_copy_properties(ctx->opid, ctx->ipid);
-	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_STREAM_TYPE, & PROP_UINT( GF_STREAM_AUDIO));
+	const GF_PropertyValue *p = gf_filter_pid_get_property(ctx->ipid, GF_PROP_PID_STREAM_TYPE);
+	if (!p || (p->value.uint==GF_STREAM_FILE)) {
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_STREAM_TYPE, &PROP_UINT(GF_STREAM_AUDIO));
+	}
 	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_UNFRAMED, NULL );
 	if (ctx->is_file && ctx->index) {
 		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_PLAYBACK_MODE, & PROP_UINT(GF_PLAYBACK_MODE_FASTFORWARD) );
@@ -497,11 +510,15 @@
 {
 	GF_MP3DmxCtx *ctx = gf_filter_get_udta(filter);
 	GF_FilterPacket *pck, *dst_pck;
-	Bool is_eos=GF_FALSE;
+	Bool is_eos;
 	u8 *data, *output;
 	u8 *start;
 	u32 pck_size, remain, prev_pck_size;
-	u64 cts = GF_FILTER_NO_TS;
+	u64 cts;
+
+restart:
+	cts = GF_FILTER_NO_TS;
+	is_eos = GF_FALSE;
 
 	//always reparse duration
 	if (!ctx->duration.num)
@@ -575,7 +592,7 @@
 	while (remain) {
 		u8 *sync;
 		Bool skip_id3v1=GF_FALSE;
-		u32 bytes_skipped=0, size, nb_samp, bytes_to_drop=0;;
+		u32 bytes_skipped=0, size, nb_samp, bytes_to_drop=0;
 
 		if (!ctx->tag_size && (remain>3)) {
 
@@ -626,7 +643,7 @@
 
 
 		//ready to send packet
-		if (size + 1 < remain-bytes_skipped) {
+		if (size + 3 < remain-bytes_skipped) {
 			//make sure we are sync!
 			if (syncsize !=0xFF) {
 				if ((syncsize=='T') && (syncsize+1=='A') && (syncsize+2=='G')) {
@@ -677,7 +694,10 @@
 			memcpy(output, sync, size);
 
 			gf_filter_pck_set_cts(dst_pck, ctx->cts);
-			gf_filter_pck_set_duration(dst_pck, nb_samp);
+			if (ctx->timescale && (ctx->timescale!=ctx->sr))
+				gf_filter_pck_set_duration(dst_pck, (u32) gf_timestamp_rescale(nb_samp, ctx->sr, ctx->timescale) );
+			else
+				gf_filter_pck_set_duration(dst_pck, nb_samp);
 			gf_filter_pck_set_sap(dst_pck, GF_FILTER_SAP_1);
 			gf_filter_pck_set_framing(dst_pck, GF_TRUE, GF_TRUE);
 
@@ -724,7 +744,8 @@
 
 	if (!pck) {
 		ctx->mp3_buffer_size = 0;
-		return mp3_dmx_process(filter);
+		//avoid recursive call
+		goto restart;
 	} else {
 		if (remain) {
 			memmove(ctx->mp3_buffer, start, remain);
@@ -900,14 +921,13 @@
 };
 
 
-const GF_FilterRegister *mp3_dmx_register(GF_FilterSession *session)
+const GF_FilterRegister *rfmp3_register(GF_FilterSession *session)
 {
 	return &MP3DmxRegister;
 }
-
 #else
-const GF_FilterRegister *mp3_dmx_register(GF_FilterSession *session)
+const GF_FilterRegister *rfmp3_register(GF_FilterSession *session)
 {
 	return NULL;
 }
-#endif // GPAC_DISABLE_AV_PARSERS
+#endif // #if !defined(GPAC_DISABLE_AV_PARSERS) && !defined(GPAC_DISABLE_RFMP3)

gpac-2.2.1.tar.gz/src/filters/reframe_mpgvid.c -> gpac-2.4.0.tar.gz/src/filters/reframe_mpgvid.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2022
+ *			Copyright (c) Telecom ParisTech 2000-2024
  *					All rights reserved
  *
  *  This file is part of GPAC / MPEG-1/2/4(Part2) video reframer filter
@@ -28,7 +28,7 @@
 #include <gpac/filters.h>
 #include <gpac/internal/media_dev.h>
 
-#ifndef GPAC_DISABLE_AV_PARSERS
+#if !defined(GPAC_DISABLE_AV_PARSERS) && !defined(GPAC_DISABLE_RFMPGVID)
 
 #define MIN_HDR_STORE	12
 typedef struct
@@ -227,6 +227,8 @@
 	if (e) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("MPGVid Could not parse video header - duration  not estimated\n"));
 		ctx->file_loaded = GF_TRUE;
+		gf_m4v_parser_del(vparser);
+		gf_fclose(stream);
 		return;
 	}
 
@@ -317,7 +319,7 @@
 					gf_filter_pck_set_cts(q_pck, cts);
 				} else {
 					//shift all other frames (i.e. pending Bs) by 1 frame in the past since we move the ref frame after them
-					assert(cts >= ctx->cur_fps.den);
+					gf_assert(cts >= ctx->cur_fps.den);
 					cts -= ctx->cur_fps.den;
 					gf_filter_pck_set_cts(q_pck, cts);
 				}
@@ -356,7 +358,11 @@
 		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_CAN_DATAREF, & PROP_BOOL(GF_TRUE ) );
 	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_STREAM_TYPE, & PROP_UINT(GF_STREAM_VISUAL));
 	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_TIMESCALE, & PROP_UINT(ctx->timescale ? ctx->timescale : ctx->cur_fps.num));
-	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_FPS, & PROP_FRAC(ctx->cur_fps));
+
+	//if we have a FPS prop, use it
+	if (!gf_filter_pid_get_property(ctx->ipid, GF_PROP_PID_FPS))
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_FPS, & PROP_FRAC(ctx->cur_fps));
+
 	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_UNFRAMED, NULL);
 
 	if (ctx->width && ctx->height) {
@@ -421,7 +427,7 @@
 			char *frame = dcfg;
 			while ((i+3<vosh_size)  && ((framei!=0) || (framei+1!=0) || (framei+2!=1))) i++;
 			if (i+4>=vosh_size) break;
-			if (strncmp(frame+i+4, "DivX", 4)) {
+			if (i+8 < vosh_size && strncmp(frame+i+4, "DivX", 4)) {
 				i += 4;
 				continue;
 			}
@@ -535,7 +541,7 @@
 
 static GFINLINE void mpgviddmx_update_time(GF_MPGVidDmxCtx *ctx)
 {
-	assert(ctx->cur_fps.num);
+	gf_assert(ctx->cur_fps.num);
 
 	if (!ctx->notime) {
 		u64 inc = 3000;
@@ -549,7 +555,7 @@
 		ctx->cts += inc;
 		ctx->dts += inc;
 	} else {
-		assert(ctx->cur_fps.den);
+		gf_assert(ctx->cur_fps.den);
 		ctx->cts += ctx->cur_fps.den;
 		ctx->dts += ctx->cur_fps.den;
 	}
@@ -581,7 +587,7 @@
 	}
 	if (!found)
 		return -1;
-	assert(end >= start);
+	gf_assert(end >= start);
 	return (s32) (end - start);
 }
 
@@ -683,11 +689,11 @@
 
 		//resume from data copied internally
 		if (ctx->hdr_store_size) {
-			assert(ctx->resume_from <= ctx->hdr_store_size);
+			gf_assert(ctx->resume_from <= ctx->hdr_store_size);
 			start = data = ctx->hdr_store + ctx->resume_from;
 			remain = pck_size = ctx->hdr_store_size - ctx->resume_from;
 		} else {
-			assert(remain >= (s32) ctx->resume_from);
+			gf_assert(remain >= (s32) ctx->resume_from);
 			start += ctx->resume_from;
 			remain -= ctx->resume_from;
 		}
@@ -731,9 +737,11 @@
 		//we have some potential bytes of a start code in the store, copy some more bytes and check if valid start code.
 		//if not, dispatch these bytes as continuation of the data
 		if (ctx->bytes_in_header) {
-
-			memcpy(ctx->hdr_store + ctx->bytes_in_header, start, MIN_HDR_STORE - ctx->bytes_in_header);
-			current = mpgviddmx_next_start_code(ctx->hdr_store, MIN_HDR_STORE);
+			u32 csize = MIN_HDR_STORE - ctx->bytes_in_header;
+			if (csize > (u32) remain) csize=remain;
+			//the two zones may overlap
+			memmove(ctx->hdr_store + ctx->bytes_in_header, start, csize);
+			current = mpgviddmx_next_start_code(ctx->hdr_store, ctx->bytes_in_header+csize);
 
 			//no start code in stored buffer
 			if ((current<0) || (current >= (s32) ctx->bytes_in_header) )  {
@@ -791,7 +799,7 @@
 				//we may have a startcode at the end of the packet, store it and don't dispatch the last 3 bytes !
 				if (!b1 || !b2 || !b3) {
 					copy_last_bytes = GF_TRUE;
-					assert(size >= 3);
+					gf_assert(size >= 3);
 					size -= 3;
 					ctx->bytes_in_header = 3;
 				}
@@ -817,18 +825,18 @@
 			}
 		}
 
-		assert(current>=0);
+		gf_assert(current>=0);
 
 		//if we are in the middle of parsing the vosh, skip over bytes remaining from previous obj not parsed
 		if ((vosh_start>=0) && current) {
-			assert(remain>=current);
+			gf_assert(remain>=current);
 			start += current;
 			remain -= current;
 			current = 0;
 		}
 		//also skip if no output pid
 		if (!ctx->opid && current) {
-			assert(remain>=current);
+			gf_assert(remain>=current);
 			start += current;
 			remain -= current;
 			current = 0;
@@ -848,7 +856,7 @@
 				if (byte_offset != GF_FILTER_NO_BO) {
 					gf_filter_pck_set_byte_offset(dst_pck, byte_offset - bytes_from_store);
 				}
-				assert(bytes_from_store>=(u32) current);
+				gf_assert(bytes_from_store>=(u32) current);
 				bytes_from_store -= current;
 				memcpy(pck_data, ctx->hdr_store, current);
 			} else {
@@ -857,7 +865,7 @@
 					gf_filter_pck_set_byte_offset(dst_pck, byte_offset);
 				}
 				memcpy(pck_data, start, current);
-				assert(remain>=current);
+				gf_assert(remain>=current);
 				start += current;
 				remain -= current;
 				current = 0;
@@ -904,7 +912,7 @@
 							ctx->hdr_store_alloc = (u32) (ctx->hdr_store_size + pck_size - vosh_start);
 							ctx->hdr_store = gf_realloc(ctx->hdr_store, sizeof(char)*ctx->hdr_store_alloc);
 						}
-						memcpy(ctx->hdr_store + ctx->hdr_store_size, data + vosh_start, (size_t) (pck_size - vosh_start) );
+						memmove(ctx->hdr_store + ctx->hdr_store_size, data + vosh_start, (size_t) (pck_size - vosh_start) );
 						ctx->hdr_store_size += pck_size - (u32) vosh_start;
 					}
 					gf_filter_pid_drop_packet(ctx->ipid);
@@ -932,7 +940,7 @@
 				ctx->dsi.VideoPL = (u8) gf_bs_read_u8(ctx->bs);
 				vosh_start = start - (u8 *)data;
 				skip_pck = GF_TRUE;
-				assert(remain>=5);
+				gf_assert(remain>=5);
 				start += 5;
 				remain -= 5;
 				break;
@@ -952,7 +960,7 @@
 							ctx->hdr_store_alloc = (u32) (ctx->hdr_store_size + pck_size - (u32) vosh_start);
 							ctx->hdr_store = gf_realloc(ctx->hdr_store, sizeof(char)*ctx->hdr_store_alloc);
 						}
-						memcpy(ctx->hdr_store + ctx->hdr_store_size, data + vosh_start, (size_t) (pck_size - vosh_start) );
+						memmove(ctx->hdr_store + ctx->hdr_store_size, data + vosh_start, (size_t) (pck_size - vosh_start) );
 						ctx->hdr_store_size += pck_size - (u32) vosh_start;
 					}
 					gf_filter_pid_drop_packet(ctx->ipid);
@@ -966,7 +974,7 @@
 					vosh_end -= vosh_start;
 					mpgviddmx_check_pid(filter, ctx,(u32)  vosh_end, data+vosh_start);
 					skip_pck = GF_TRUE;
-					assert(remain>=(s32) obj_size);
+					gf_assert(remain>=(s32) obj_size);
 					start += obj_size;
 					remain -= obj_size;
 				}
@@ -980,7 +988,7 @@
 			default:
 				if (vosh_start>=0) {
 					skip_pck = GF_TRUE;
-					assert(remain>=4);
+					gf_assert(remain>=4);
 					start += 4;
 					remain -= 4;
 				} else if (!ctx->width) {
@@ -994,7 +1002,7 @@
 						vosh_end -= vosh_start;
 						mpgviddmx_check_pid(filter, ctx,(u32)  vosh_end, data+vosh_start);
 						skip_pck = GF_TRUE;
-						assert(remain>=(s32) obj_size);
+						gf_assert(remain>=(s32) obj_size);
 						start += obj_size;
 						remain -= obj_size;
 					}
@@ -1008,7 +1016,7 @@
 		}
 
 		if (!ctx->opid) {
-			assert(remain>=4);
+			gf_assert(remain>=4);
 			start += 4;
 			remain -= 4;
 			continue;
@@ -1077,6 +1085,11 @@
 		//needs adjustement
 		if (bytes_from_store) {
 			size += bytes_from_store + hdr_offset;
+			if (size > remain) {
+				e = GF_NON_COMPLIANT_BITSTREAM;
+				GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("MPGVid packet too large to process (size %llu remain %d)\n", size, remain ));
+				break;
+			}
 		}
 
 		if ((e == GF_EOS) && !ctx->input_is_au_end) {
@@ -1087,7 +1100,7 @@
 			//we may have a startcode at the end of the packet, store it and don't dispatch the last 3 bytes !
 			if (!b1 || !b2 || !b3) {
 				copy_last_bytes = GF_TRUE;
-				assert(size >= 3);
+				gf_assert(size >= 3);
 				size -= 3;
 				ctx->bytes_in_header = 3;
 			}
@@ -1114,7 +1127,7 @@
 					if (bytes_from_store)
 						size-= bytes_from_store + hdr_offset;
 
-					assert(remain>=size);
+					gf_assert(remain>=size);
 					start += size;
 					remain -= (s32) size;
 					//trash all packets until we align to a new startcode
@@ -1154,7 +1167,7 @@
 		//bytes come from both our store and the data packet
 		if (bytes_from_store) {
 			memcpy(pck_data, ctx->hdr_store+current, bytes_from_store);
-			assert(size >= bytes_from_store);
+			gf_assert(size >= bytes_from_store);
 			size -= bytes_from_store;
 			if (byte_offset != GF_FILTER_NO_BO) {
 				gf_filter_pck_set_byte_offset(dst_pck, byte_offset - bytes_from_store);
@@ -1169,9 +1182,9 @@
 		}
 
 		if (ftype) {
-			assert(pck_data0 == 0);
-			assert(pck_data1 == 0);
-			assert(pck_data2 == 1);
+			gf_assert(pck_data0 == 0);
+			gf_assert(pck_data1 == 0);
+			gf_assert(pck_data2 == 1);
 
 			gf_filter_pck_set_framing(dst_pck, GF_TRUE, (full_frame || ctx->input_is_au_end) ? GF_TRUE : GF_FALSE);
 			gf_filter_pck_set_cts(dst_pck, ctx->cts);
@@ -1180,7 +1193,7 @@
 			if (ctx->input_is_au_start) {
 				ctx->input_is_au_start = GF_FALSE;
 			} else {
-				//we use the carousel flag temporarly to indicate the cts must be recomputed
+				//we use the carousel flag temporarily to indicate the cts must be recomputed
 				gf_filter_pck_set_carousel_version(dst_pck, 1);
 			}
 			gf_filter_pck_set_sap(dst_pck, (ftype==1) ? GF_FILTER_SAP_1 : GF_FILTER_SAP_NONE);
@@ -1202,7 +1215,7 @@
 			}
 			break;
 		}
-		assert(remain>=size);
+		gf_assert(remain>=size);
 		start += size;
 		remain -= (s32) size;
 	}
@@ -1241,7 +1254,7 @@
 			GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("\t%d max consecutive B-frames%s\n", ctx->max_b, ctx->is_packed ? " - packed bitstream" : "" ));
 		}
 		if (ctx->is_vfr && ctx->nb_b && ctx->is_packed) {
-			GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("Warning: Mix of non-coded frames: packed bitstream and encoder skiped - unpredictable timing\n"));
+			GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("Warning: Mix of non-coded frames: packed bitstream and encoder skipped - unpredictable timing\n"));
 		}
 	}
 }
@@ -1396,16 +1409,13 @@
 };
 
 
-const GF_FilterRegister *mpgviddmx_register(GF_FilterSession *session)
+const GF_FilterRegister *rfmpgvid_register(GF_FilterSession *session)
 {
 	return &MPGVidDmxRegister;
 }
-
 #else
-const GF_FilterRegister *mpgviddmx_register(GF_FilterSession *session)
+const GF_FilterRegister *rfmpgvid_register(GF_FilterSession *session)
 {
 	return NULL;
 }
-#endif // GPAC_DISABLE_AV_PARSERS
-
-
+#endif // #if !defined(GPAC_DISABLE_AV_PARSERS) && !defined(GPAC_DISABLE_RFMPGVID)

gpac-2.2.1.tar.gz/src/filters/reframe_nalu.c -> gpac-2.4.0.tar.gz/src/filters/reframe_nalu.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2022
+ *			Copyright (c) Telecom ParisTech 2000-2024
  *					All rights reserved
  *
  *  This file is part of GPAC / NALU (AVC, HEVC, VVC)  reframer filter
@@ -30,7 +30,7 @@
 //for oinf stuff
 #include <gpac/internal/isomedia_dev.h>
 
-#ifndef GPAC_DISABLE_AV_PARSERS
+#if !defined(GPAC_DISABLE_AV_PARSERS) && !defined(GPAC_DISABLE_RFNALU)
 
 #define CTS_POC_OFFSET_SAFETY	1000
 
@@ -158,6 +158,8 @@
 	GF_List *sps, *pps, *vps, *sps_ext, *pps_svc, *vvc_aps_pre, *vvc_dci, *vvc_opi;
 	//set to true if one of the PS has been modified, will potentially trigger a PID reconfigure
 	Bool ps_modified;
+	//set to true if one PS has been changed - if false and ps_modified is set, only new PS have been added
+	Bool ps_changed;
 
 	//stats
 	u32 nb_idr, nb_i, nb_p, nb_b, nb_sp, nb_si, nb_sei, nb_nalus, nb_aud, nb_cra;
@@ -170,9 +172,7 @@
 	u32 nb_slices_in_au;
 	//frame first slice
 	Bool au_sap2_poc_reset;
-	//paff used - NEED FURTHER CHECKING
-	Bool is_paff;
-	Bool bottom_field_flag;
+	u32 field_type;
 	//SEI recovery count - if 0 and I slice only frame, openGOP detection (avc)
 	s32 sei_recovery_frame_count;
 	u32 use_opengop_gdr;
@@ -180,6 +180,7 @@
 	s32 last_poc, max_last_poc, max_last_b_poc, poc_diff, prev_last_poc, min_poc, poc_shift;
 	//set to TRUE once 3 frames with same min poc diff are found, enabling dispatch of the frames
 	Bool poc_probe_done;
+	Bool min_poc_probe_done;
 	//pointer to the first packet of the current frame (the one holding timing info)
 	//this packet is in the packet queue
 	GF_FilterPacket *first_pck_in_au;
@@ -241,6 +242,12 @@
 	u32 nb_dv_rpu, nb_dv_el;
 
 	u32 valid_ps_flags;
+
+	Bool check_prev_sap2;
+	s32 prev_sap2_poc;
+	Bool sap2_as_sap1;
+
+	GF_FilterPacket *prev_sap;
 } GF_NALUDmxCtx;
 
 static void naludmx_enqueue_or_dispatch(GF_NALUDmxCtx *ctx, GF_FilterPacket *n_pck, Bool flush_ref);
@@ -270,13 +277,12 @@
 	p = gf_filter_pid_get_property(pid, GF_PROP_PID_TIMESCALE);
 	if (p) {
 		ctx->timescale = p->value.uint;
-		//if we have a FPS prop, use it
+		ctx->cur_fps.den = 0;
+		ctx->cur_fps.num = ctx->timescale;
+
 		p = gf_filter_pid_get_property(pid, GF_PROP_PID_FPS);
 		if (p) {
 			ctx->cur_fps = p->value.frac;
-		} else {
-			ctx->cur_fps.den = 0;
-			ctx->cur_fps.num = ctx->timescale;
 		}
 	}
 
@@ -343,15 +349,11 @@
 	}
 
 	if (ctx->codecid==GF_CODECID_HEVC) {
-#ifdef GPAC_DISABLE_HEVC
-		return GF_NOT_SUPPORTED;
-#else
 		ctx->log_name = "HEVC";
 		if (ctx->avc_state) { gf_free(ctx->avc_state); ctx->avc_state = NULL; }
 		if (ctx->vvc_state) { gf_free(ctx->vvc_state); ctx->vvc_state = NULL; }
 		if (!ctx->hevc_state) GF_SAFEALLOC(ctx->hevc_state, HEVCState);
 		ctx->min_layer_id = 0xFF;
-#endif
 	} else if (ctx->codecid==GF_CODECID_VVC) {
 		ctx->log_name = "VVC";
 		if (ctx->hevc_state) { gf_free(ctx->hevc_state); ctx->hevc_state = NULL; }
@@ -394,6 +396,10 @@
 			naludmx_enqueue_or_dispatch(ctx, NULL, GF_TRUE);
 		}
 		ctx->nal_store_size = 0;
+
+		if (ctx->timescale != 0)
+			ctx->resume_from = 0;
+
 		gf_filter_pid_copy_properties(ctx->opid, ctx->ipid);
 		//don't change codec type if reframing an ES (for HLS SAES)
 		if (!ctx->timescale)
@@ -566,7 +572,6 @@
 
 		//parse directly from current pos (next byte is first byte of nal hdr)
 		if (hevc_state) {
-#ifndef GPAC_DISABLE_HEVC
 			u8 temporal_id, layer_id, nal_type;
 
 			res = gf_hevc_parse_nalu_bs(bs, hevc_state, &nal_type, &temporal_id, &layer_id);
@@ -600,7 +605,6 @@
 				hevc_state->sei.recovery_point.valid = GF_FALSE;
 				gdr_frame_count = hevc_state->sei.recovery_point.frame_cnt;
 			}
-#endif // GPAC_DISABLE_HEVC
 		} else if (vvc_state) {
 
 			u8 temporal_id, layer_id, nal_type;
@@ -644,7 +648,7 @@
 			case GF_AVC_NALU_SEI:
 				naludmx_probe_recovery_sei(bs, avc_state);
 				break;
-			
+
 			}
 			//also mark open GOP or first slice in gdr as valid seek point
 			if (is_slice && avc_state->sei.recovery_point.valid) {
@@ -701,7 +705,7 @@
 
 		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_DURATION, & PROP_FRAC64(ctx->duration));
 
-		if (duration && (!gf_sys_is_test_mode() || gf_opts_get_bool("temp", "force_indexing"))) {
+		if (duration && ctx->duration.num && (!gf_sys_is_test_mode() || gf_opts_get_bool("temp", "force_indexing"))) {
 			filesize *= 8 * ctx->duration.den;
 			filesize /= ctx->duration.num;
 			ctx->bitrate = (u32) filesize;
@@ -717,7 +721,7 @@
 {
 	//TODO: we are dispatching frames in "negctts mode", ie we may have DTS>CTS
 	//need to signal this for consumers using DTS (eg MPEG-2 TS)
-	if (flush_ref && ctx->pck_queue && ctx->poc_diff) {
+	if (flush_ref && ctx->pck_queue && ctx->poc_diff && ctx->min_poc_probe_done) {
 		u32 dts_inc=0;
 		s32 last_poc = 0;
 		Bool patch_missing_frame = GF_FALSE;
@@ -735,7 +739,7 @@
 				dts = gf_filter_pck_get_dts(q_pck);
 				if (dts == GF_FILTER_NO_TS) continue;
 				poc_ts = gf_filter_pck_get_cts(q_pck);
-				assert(poc_ts != GF_FILTER_NO_TS);
+				gf_assert(poc_ts != GF_FILTER_NO_TS);
 				poc = (s32) ((s64) poc_ts - CTS_POC_OFFSET_SAFETY);
 
 				if (i) {
@@ -766,7 +770,7 @@
 
 				//we reused timing from source packets
 				if (!carousel_info) {
-					assert(ctx->timescale);
+					gf_assert(ctx->timescale);
 					gf_list_rem(ctx->pck_queue, 0);
 					gf_filter_pck_send(q_pck);
 					continue;
@@ -775,7 +779,7 @@
 
 
 				poc_ts = gf_filter_pck_get_cts(q_pck);
-				assert(poc_ts != GF_FILTER_NO_TS);
+				gf_assert(poc_ts != GF_FILTER_NO_TS);
 				poc = (s32) ((s64) poc_ts - CTS_POC_OFFSET_SAFETY);
 
 				if (patch_missing_frame) {
@@ -797,18 +801,8 @@
 					last_poc = poc;
 					dts += dts_inc;
 				}
-				//poc is stored as diff since last IDR which has min_poc
-				cts = ( (ctx->min_poc + (s32) poc) * ctx->cur_fps.den ) / ctx->poc_diff + ctx->dts_last_IDR;
-
-				/*if PAFF, 2 pictures (eg poc) <=> 1 aggregated frame (eg sample), divide by 2*/
-				if (ctx->is_paff) {
-					cts /= 2;
-					/*in some cases the poc is not on the top field - if that is the case, round up*/
-					if (cts % ctx->cur_fps.den) {
-						cts = ((cts/ctx->cur_fps.den)+1) * ctx->cur_fps.den;
-					}
-				}
-
+				//poc is stored as diff to adjusted POC (poc_shift) of last IDR
+				cts = ( ((s32) poc ) * ctx->cur_fps.den ) / ctx->poc_diff + ctx->dts_last_IDR;
 				gf_filter_pck_set_cts(q_pck, cts);
 				GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("%s Frame timestamps computed dts "LLU" cts "LLU" (poc %d min poc %d poc_diff %d last IDR DTS "LLU")\n", ctx->log_name, dts, cts, poc, ctx->min_poc, ctx->poc_diff, ctx->dts_last_IDR));
 
@@ -852,8 +846,6 @@
 	gf_list_add(pa->nalus, sl);
 }
 
-#ifndef GPAC_DISABLE_HEVC
-
 static void naludmx_hevc_set_parall_type(GF_NALUDmxCtx *ctx, GF_HEVCConfig *hevc_cfg)
 {
 	u32 use_tiles, use_wpp, nb_pps, i, count;
@@ -887,10 +879,10 @@
 	else if (!use_tiles && (use_wpp==nb_pps) ) hevc_cfg->parallelismType = 3;
 	else hevc_cfg->parallelismType = 0;
 }
-#endif // GPAC_DISABLE_HEVC
 
 GF_Err naludmx_set_hevc_oinf(GF_NALUDmxCtx *ctx, u8 *max_temporal_id)
 {
+#ifndef GPAC_DISABLE_ISOM
 	GF_OperatingPointsInformation *oinf;
 	GF_BitStream *bs;
 	u8 *data;
@@ -998,6 +990,7 @@
 		LHEVC_DependentLayer *dep;
 		u32 j, k;
 		if (i==MAX_LHVC_LAYERS) break;
+		if (vps->layer_id_in_nuhi>=MAX_LHVC_LAYERS) break;
 
 		GF_SAFEALLOC(dep, LHEVC_DependentLayer);
 		if (!dep) return GF_OUT_OF_MEM;
@@ -1029,6 +1022,7 @@
 	gf_isom_oinf_del_entry(oinf);
 
 	gf_filter_pid_set_info_str(ctx->opid, "hevc:oinf", &PROP_DATA_NO_COPY(data, data_size) );
+#endif
 	return GF_OK;
 }
 
@@ -1043,7 +1037,8 @@
 		if (ctx->linfi.layer_id_plus_one) nb_layers++;
 		if (ctx->linfi.min_temporal_id != ctx->linfi.max_temporal_id) nb_sublayers++;
 	}
-	if (!nb_layers && !nb_sublayers)
+	//only set linf if more than one layer
+	if ((nb_layers<=1) && !nb_sublayers)
 		return;
 
 	bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
@@ -1067,7 +1062,6 @@
 
 static Bool naludmx_create_hevc_decoder_config(GF_NALUDmxCtx *ctx, u8 **dsi, u32 *dsi_size, u8 **dsi_enh, u32 *dsi_enh_size, u32 *max_width, u32 *max_height, u32 *max_enh_width, u32 *max_enh_height, GF_Fraction *sar, Bool *has_hevc_base)
 {
-#ifndef GPAC_DISABLE_HEVC
 	u32 i, count;
 	u8 layer_id;
 	Bool first = GF_TRUE;
@@ -1169,7 +1163,7 @@
 			/*disable frame rate scan, most bitstreams have wrong values there*/
 			if (ctx->notime && first && (!ctx->fps.num || !ctx->fps.den) && sps->has_timing_info
 				/*if detected FPS is greater than 1000, assume wrong timing info*/
-				&& (sps->time_scale <= 1000*sps->num_units_in_tick)
+				&& sps->time_scale && (sps->time_scale / 1000 <= sps->num_units_in_tick)
 			) {
 				ctx->cur_fps.num = sps->time_scale;
 				ctx->cur_fps.den = sps->num_units_in_tick;
@@ -1234,7 +1228,6 @@
 	}
 	gf_odf_hevc_cfg_del(hvcc);
 	gf_odf_hevc_cfg_del(lvcc);
-#endif // GPAC_DISABLE_HEVC
 	return GF_TRUE;
 }
 
@@ -1325,7 +1318,8 @@
 				cfg->ptl_frame_only_constraint = vps->ptl0.frame_only_constraint;
 				cfg->ptl_multilayer_enabled = vps->ptl0.multilayer_enabled;
 
-				cfg->general_constraint_info = gf_malloc(sizeof(u8) * cfg-> num_constraint_info);
+				if (cfg->general_constraint_info) gf_free(cfg->general_constraint_info);
+				cfg->general_constraint_info = gf_malloc(sizeof(u8) * cfg->num_constraint_info);
 				if (cfg->general_constraint_info)
 					memcpy(cfg->general_constraint_info, vps->ptl0.gci, cfg->num_constraint_info);
 
@@ -1347,7 +1341,7 @@
 			/*disable frame rate scan, most bitstreams have wrong values there*/
 			if (ctx->notime && first && (!ctx->fps.num || !ctx->fps.den) && sps->has_timing_info
 				/*if detected FPS is greater than 1000, assume wrong timing info*/
-				&& (sps->time_scale <= 1000*sps->num_units_in_tick)
+				&& sps->time_scale && sps->num_units_in_tick && (sps->time_scale / 1000 <= sps->num_units_in_tick)
 			) {
 				ctx->cur_fps.num = sps->time_scale;
 				ctx->cur_fps.den = sps->num_units_in_tick;
@@ -1496,7 +1490,7 @@
 			/*disable frame rate scan, most bitstreams have wrong values there*/
 			if (first && (!ctx->fps.num || !ctx->fps.den) && sps->vui.timing_info_present_flag
 				/*if detected FPS is greater than 1000, assume wrong timing info*/
-				&& (sps->vui.time_scale <= 1000*sps->vui.num_units_in_tick)
+				&& (sps->vui.time_scale / 1000 <= sps->vui.num_units_in_tick)
 			) {
 				/*ISO/IEC 14496-10 n11084 Table E-6*/
 				/* not used :				u8 DeltaTfiDivisorTable = {1,1,1,2,2,2,2,3,3,4,6}; */
@@ -1511,10 +1505,19 @@
 					else
 						DeltaTfiDivisorIdx = (ctx->avc_state->sei.pic_timing.pic_struct+1) / 2;
 				}
-				if (ctx->notime && sps->vui.time_scale && sps->vui.num_units_in_tick) {
-					ctx->cur_fps.num = 2 * sps->vui.time_scale;
-					ctx->cur_fps.den = 2 * sps->vui.num_units_in_tick * DeltaTfiDivisorIdx;
-
+				if (ctx->notime) {
+					u32 fps_num, fps_den;
+					if ( (s32) (2*sps->vui.time_scale) < 0) {
+						fps_num = sps->vui.time_scale;
+						fps_den = sps->vui.num_units_in_tick * DeltaTfiDivisorIdx;
+					} else {
+						fps_num = 2 * sps->vui.time_scale;
+						fps_den = 2 * sps->vui.num_units_in_tick * DeltaTfiDivisorIdx;
+					}
+					if (fps_num && fps_den) {
+						ctx->cur_fps.num = fps_num;
+						ctx->cur_fps.den = fps_den;
+					}
 					if (!ctx->fps.num && ctx->dts==ctx->fps.den)
 						ctx->dts = ctx->cur_fps.den;
 				}
@@ -1597,7 +1600,8 @@
 	ctx->sei_recovery_frame_count = -1;
 	ctx->au_sap = GF_FILTER_SAP_NONE;
 	ctx->au_sap2_poc_reset = GF_FALSE;
-	ctx->bottom_field_flag = GF_FALSE;
+	ctx->sap2_as_sap1 = GF_FALSE;
+	ctx->field_type = 0;
 }
 
 static void naludmx_update_clli_mdcv(GF_NALUDmxCtx *ctx, Bool reset_crc)
@@ -1630,7 +1634,7 @@
 	u8 dv_cfg24;
 	if (!ctx->opid)
 		return;
-		
+
 	switch (ctx->dv_mode) {
 	case DVMODE_NONE:
 	case DVMODE_CLEAN:
@@ -1776,6 +1780,7 @@
 	Bool has_hevc_base = GF_TRUE;
 	Bool has_colr_info = GF_FALSE;
 	Bool res;
+	Bool dsi_is_superset = (!ctx->crc_cfg || ctx->ps_changed) ? GF_FALSE : GF_TRUE;
 
 	if (ctx->analyze) {
 		if (ctx->opid && !ctx->ps_modified) return;
@@ -1785,6 +1790,7 @@
 			return;
 	}
 	ctx->ps_modified = GF_FALSE;
+	ctx->ps_changed = GF_FALSE;
 
 	dsi = dsi_enh = NULL;
 
@@ -1866,8 +1872,12 @@
 	else
 		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_SAR, NULL);
 
-	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_FPS, & PROP_FRAC(ctx->cur_fps));
+	//if we have a FPS prop, use it
+	if (!gf_filter_pid_get_property(ctx->ipid, GF_PROP_PID_FPS))
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_FPS, & PROP_FRAC(ctx->cur_fps));
+
 	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_TIMESCALE, & PROP_UINT(ctx->timescale ? ctx->timescale : ctx->cur_fps.num));
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_DSI_SUPERSET, dsi_is_superset ? & PROP_BOOL(GF_TRUE) : NULL);
 
 	if (ctx->explicit || !has_hevc_base) {
 		u32 enh_cid = GF_CODECID_SVC;
@@ -2027,7 +2037,7 @@
 
 static GFINLINE void naludmx_update_time(GF_NALUDmxCtx *ctx)
 {
-	assert(ctx->cur_fps.num);
+	gf_assert(ctx->cur_fps.num);
 
 	if (!ctx->notime) {
 		//very first frame, no dts diff, assume 3000/90k. It should only hurt if we have several frames packet in the first packet sent
@@ -2035,7 +2045,7 @@
 		ctx->cts += dts_inc;
 		ctx->dts += dts_inc;
 	} else {
-		assert(ctx->cur_fps.den);
+		gf_assert(ctx->cur_fps.den);
 		ctx->cts += ctx->cur_fps.den;
 		ctx->dts += ctx->cur_fps.den;
 	}
@@ -2068,7 +2078,7 @@
 			ctx->valid_ps_flags |= 1<<1;
 			break;
 		default:
-			assert(0);
+			gf_assert(0);
 			return;
 		}
 	} else if (ctx->codecid==GF_CODECID_VVC) {
@@ -2100,7 +2110,7 @@
 			list = ctx->vvc_aps_pre;
 			break;
 		default:
-			assert(0);
+			gf_assert(0);
 			return;
 		}
 	} else {
@@ -2121,7 +2131,7 @@
 			list = ctx->sps_ext;
 			break;
 		default:
-			assert(0);
+			gf_assert(0);
 			return;
 		}
 	}
@@ -2161,6 +2171,7 @@
 		sl->size = size;
 		sl->crc = crc;
 		ctx->ps_modified = GF_TRUE;
+		ctx->ps_changed = GF_TRUE;
 		//flush AU if we have a slice
 		if (ctx->opid && flush_au && ctx->first_pck_in_au && ctx->nb_slices_in_au) {
 			naludmx_end_access_unit(ctx);
@@ -2197,11 +2208,9 @@
 	if (!ctx->first_pck_in_au)
 		return;
 	if (ctx->au_sap) {
-		gf_filter_pck_set_sap(ctx->first_pck_in_au, ctx->au_sap);
+		gf_filter_pck_set_sap(ctx->first_pck_in_au, ctx->sap2_as_sap1 ? GF_FILTER_SAP_1 : ctx->au_sap);
 		if ((ctx->au_sap == GF_FILTER_SAP_1) || ctx->au_sap2_poc_reset) {
 			ctx->dts_last_IDR = gf_filter_pck_get_dts(ctx->first_pck_in_au);
-			if (ctx->is_paff)
-				ctx->dts_last_IDR *= 2;
 		}
 		if (ctx->au_sap <= GF_FILTER_SAP_3) {
 			is_rap = GF_TRUE;
@@ -2230,17 +2239,17 @@
 			is_rap = GF_TRUE;
 		}
 	}
-	if (ctx->is_paff) {
-		gf_filter_pck_set_interlaced(ctx->first_pck_in_au, ctx->bottom_field_flag ? 2 : 1);
+	if (ctx->field_type) {
+		gf_filter_pck_set_interlaced(ctx->first_pck_in_au, ctx->field_type);
 	}
 
 	//if TS is set, the packet was the first in AU in the input timed packet (eg PES), we reuse the input timing
 	ts = gf_filter_pck_get_cts(ctx->first_pck_in_au);
 	if (ts == GF_FILTER_NO_TS) {
 		/*we store the POC (last POC minus the poc shift) as the CTS offset and re-update the CTS when dispatching*/
-		assert(ctx->last_poc >= ctx->poc_shift);
-		gf_filter_pck_set_cts(ctx->first_pck_in_au, CTS_POC_OFFSET_SAFETY + ctx->last_poc - ctx->poc_shift);
-		//we use the carousel flag temporarly to indicate the cts must be recomputed
+		gf_assert(ctx->last_poc >= ctx->poc_shift);
+		gf_filter_pck_set_cts(ctx->first_pck_in_au, (u64)(CTS_POC_OFFSET_SAFETY + (s64)ctx->last_poc - (s64)ctx->poc_shift));
+		//we use the carousel flag temporarily to indicate the cts must be recomputed
 		gf_filter_pck_set_carousel_version(ctx->first_pck_in_au, 1);
 	}
 
@@ -2339,8 +2348,10 @@
 		} else {
 			//we don't set the CTS, it will be set once we detect frame end
 			gf_filter_pck_set_dts(dst_pck, ctx->dts);
+			//reset CTS since if we merged props before
+			if (ctx->src_pck) gf_filter_pck_set_cts(dst_pck, GF_FILTER_NO_TS);
 		}
-		//we use the carousel flag temporarly to indicate the cts must be recomputed
+		//we use the carousel flag temporarily to indicate the cts must be recomputed
 		gf_filter_pck_set_carousel_version(dst_pck, ctx->notime ? 1 : 0);
 
 		gf_filter_pck_set_duration(dst_pck, ctx->pck_duration ? ctx->pck_duration : ctx->cur_fps.den);
@@ -2371,7 +2382,7 @@
 		ctx->subsamp_buffer_alloc = ctx->subsamp_buffer_size+14;
 		ctx->subsamp_buffer = gf_realloc(ctx->subsamp_buffer, ctx->subsamp_buffer_alloc);
 	}
-	assert(ctx->subsamp_buffer);
+	gf_assert(ctx->subsamp_buffer);
 	gf_bs_reassign_buffer(ctx->bs_w, ctx->subsamp_buffer + ctx->subsamp_buffer_size, 14);
 	gf_bs_write_u32(ctx->bs_w, 0); //flags
 	gf_bs_write_u32(ctx->bs_w, subs_size + ctx->nal_length);
@@ -2407,9 +2418,6 @@
 
 static s32 naludmx_parse_nal_hevc(GF_NALUDmxCtx *ctx, char *data, u32 size, Bool *skip_nal, Bool *is_slice, Bool *is_islice)
 {
-#ifdef GPAC_DISABLE_HEVC
-	return -1;
-#else
 	s32 ps_idx = 0;
 	s32 res;
 	u8 nal_unit_type, temporal_id, layer_id;
@@ -2580,7 +2588,6 @@
 		ctx->max_temporal_idlayer_id = temporal_id;
 	if (ctx->min_layer_id > layer_id) ctx->min_layer_id = layer_id;
 	return res;
-#endif // GPAC_DISABLE_HEVC
 }
 
 
@@ -2887,14 +2894,15 @@
 					/* This PPS is used by an SVC NAL unit, it should be moved to the SVC Config Record) */
 					gf_list_rem(ctx->pps, i);
 					i--;
-					if (!ctx->pps_svc) ctx->pps_svc = gf_list_new(ctx->pps_svc);
+					if (!ctx->pps_svc) ctx->pps_svc = gf_list_new();
 					gf_list_add(ctx->pps_svc, slc);
 					ctx->ps_modified = GF_TRUE;
+					ctx->ps_changed = GF_TRUE;
 				}
 			}
 		}
 		*is_slice = GF_TRUE;
-		//we disable temporal scalability when parsing mvc - never used and many encoders screw up POC in enhancemen
+		//we disable temporal scalability when parsing mvc - never used and many encoders screw up POC in enhancement
 		if (ctx->is_mvc && (res>=0)) {
 			res=0;
 			ctx->avc_state->s_info.poc = ctx->last_poc;
@@ -2946,10 +2954,12 @@
 {
 	//input pid sets some timescale - we flushed pending data , update cts
 	if (!ctx->notime) {
+		Bool cts_swap=GF_FALSE;
 		u64 ts = gf_filter_pck_get_cts(pck);
 		if (ts != GF_FILTER_NO_TS) {
 			ctx->prev_cts = ctx->cts;
 			ctx->cts = ts;
+			cts_swap=GF_TRUE;
 		}
 		ts = gf_filter_pck_get_dts(pck);
 		if (ts != GF_FILTER_NO_TS) {
@@ -2967,10 +2977,24 @@
 				else if (ctx->prev_dts != ts) {
 					u64 diff = ts;
 					diff -= ctx->prev_dts;
-					if (!ctx->cur_fps.den)
+					if (!ctx->cur_fps.den) {
 						ctx->cur_fps.den = (u32) diff;
-					else if (ctx->cur_fps.den > diff)
+						//we initialized with 3000, patch back
+						if (ctx->dts && (ctx->dts!=ts)) {
+							ctx->dts -= 3000;
+							ctx->dts += diff;
+						}
+						if (ctx->prev_cts && cts_swap) {
+							ctx->prev_cts -= 3000;
+							ctx->prev_cts += diff;
+						}
+						if (!gf_filter_pid_get_property(ctx->ipid, GF_PROP_PID_FPS))
+							gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_FPS, & PROP_FRAC(ctx->cur_fps));
+					} else if (ctx->cur_fps.den > diff) {
 						ctx->cur_fps.den = (u32) diff;
+						if (!gf_filter_pid_get_property(ctx->ipid, GF_PROP_PID_FPS))
+							gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_FPS, & PROP_FRAC(ctx->cur_fps));
+					}
 
 					ctx->prev_dts = ts;
 				}
@@ -3029,12 +3053,18 @@
 	GF_NALUDmxCtx *ctx = gf_filter_get_udta(filter);
 	GF_FilterPacket *pck;
 	u8 *start;
-	u32 nalu_before = ctx->nb_nalus;
-	u32 nalu_store_before = 0;
+	u32 nalu_before, nalu_store_before;
 	s32 remain;
-	Bool is_eos = GF_FALSE;
-	Bool drop_packet = GF_FALSE;
-	u64 byte_offset = GF_FILTER_NO_BO;
+	Bool is_eos, drop_packet;
+	u64 byte_offset;
+
+restart:
+
+	nalu_store_before = 0;
+	is_eos = GF_FALSE;
+	drop_packet = GF_FALSE;
+	byte_offset = GF_FILTER_NO_BO;
+	nalu_before = ctx->nb_nalus;
 
 	//always reparse duration
 	if (!ctx->file_loaded)
@@ -3058,6 +3088,7 @@
 			//single-frame stream
 			if (!ctx->poc_diff) ctx->poc_diff = 1;
 			ctx->strict_poc = STRICT_POC_OFF;
+			ctx->min_poc_probe_done = GF_TRUE;
 			naludmx_enqueue_or_dispatch(ctx, NULL, GF_TRUE);
 			if (ctx->src_pck) gf_filter_pck_unref(ctx->src_pck);
 			ctx->src_pck = NULL;
@@ -3118,7 +3149,7 @@
 		if (ctx->opid && gf_filter_pid_would_block(ctx->opid))
 			return GF_OK;
 
-		assert(ctx->resume_from < ctx->nal_store_size);
+		gf_assert(ctx->resume_from < ctx->nal_store_size);
 		start += ctx->resume_from;
 		remain -= ctx->resume_from;
 		ctx->resume_from = 0;
@@ -3140,7 +3171,7 @@
 		gf_bs_reassign_buffer(ctx->bs_r, start, remain);
 	}
 
-    assert(remain>=0);
+    gf_assert(remain>=0);
 
 	while (remain) {
 		u8 *pck_data;
@@ -3157,7 +3188,7 @@
 		Bool slice_is_idr, slice_force_ref;
 		Bool is_slice = GF_FALSE;
 		Bool is_islice = GF_FALSE;
-		Bool bottom_field_flag = GF_FALSE;
+		u32 field_type = 0;
 		Bool au_start;
 		u32 avc_svc_subs_reserved = 0;
 		u8 avc_svc_subs_priority = 0;
@@ -3185,11 +3216,11 @@
 			break;
 		}
 
-		assert(current>=0);
+		gf_assert(current>=0);
 
 		//unknown data before start of nal, may happen when tuning in, discard
 		if (current) {
-			assert(remain>=current);
+			gf_assert(remain>=current);
 			start += current;
 			remain -= current;
 			current = 0;
@@ -3245,7 +3276,7 @@
 					u8 layer_id = nal_data0 & 1;
 					layer_id<<=5;
 					layer_id |= (nal_data1 & 0xF8) >> 3;
-					u8 temporal_id = nal_data2 & 0x7;
+					u8 temporal_id = nal_data1 & 0x7;
 					if (ctx->last_layer_id < layer_id)
 						force_au_flush = GF_FALSE;
 					else if (ctx->last_layer_id == layer_id) {
@@ -3344,21 +3375,26 @@
 			naludmx_end_access_unit(ctx);
 		}
 
-		naludmx_check_pid(filter, ctx, force_au_flush);
-		if (!ctx->opid) skip_nal = GF_TRUE;
+		if (!ctx->opid) {
+			//check output pid cfg before checking NAL skip only if no output pid
+			naludmx_check_pid(filter, ctx, force_au_flush);
+			if (!ctx->opid) skip_nal = GF_TRUE;
+		}
 
 		if (skip_nal) {
 			nal_size += sc_size;
-			assert((u32) remain >= nal_size);
+			gf_assert((u32) remain >= nal_size);
 			start += nal_size;
 			remain -= nal_size;
 			naldmx_check_timestamp_switch(ctx, &nalu_store_before, nal_size, &drop_packet, pck);
 			continue;
 		}
+		//check output pid cfg after skiping nal, to make sure we can flush pending packets when config change
+		naludmx_check_pid(filter, ctx, force_au_flush);
 
 		if (!ctx->is_playing) {
 			ctx->resume_from = (u32) (start - ctx->nal_store);
-            assert(ctx->resume_from<=ctx->nal_store_size);
+            gf_assert(ctx->resume_from<=ctx->nal_store_size);
 			GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("%s not yet playing\n", ctx->log_name));
 
 			if (drop_packet)
@@ -3386,7 +3422,7 @@
 				GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("%s Error parsing NAL Unit %d (size %d type %d frame %d last POC %d) - skipping\n", ctx->log_name, ctx->nb_nalus, nal_size, nal_type, ctx->nb_frames, ctx->last_poc));
 			}
 			nal_size += sc_size;
-			assert((u32) remain >= nal_size);
+			gf_assert((u32) remain >= nal_size);
 			start += nal_size;
 			remain -= nal_size;
 			naldmx_check_timestamp_switch(ctx, &nalu_store_before, nal_size, &drop_packet, pck);
@@ -3416,7 +3452,6 @@
 
 		//store all variables needed to compute POC/CTS and sample SAP and recovery info
 		if (ctx->codecid==GF_CODECID_HEVC) {
-#ifndef GPAC_DISABLE_HEVC
 			slice_is_idr = gf_hevc_slice_is_IDR(ctx->hevc_state);
 
 			recovery_point_valid = ctx->hevc_state->sei.recovery_point.valid;
@@ -3426,11 +3461,16 @@
 			au_sap_type = GF_FILTER_SAP_NONE;
 			if (gf_hevc_slice_is_IDR(ctx->hevc_state)) {
 				au_sap_type = GF_FILTER_SAP_1;
+				switch (ctx->hevc_state->s_info.nal_unit_type) {
+				case GF_HEVC_NALU_SLICE_IDR_W_DLP:
+				case GF_HEVC_NALU_SLICE_BLA_W_DLP:
+					au_sap_type = GF_FILTER_SAP_2;
+					break;
+				}
 			}
 			else {
 				switch (ctx->hevc_state->s_info.nal_unit_type) {
 				case GF_HEVC_NALU_SLICE_BLA_W_LP:
-				case GF_HEVC_NALU_SLICE_BLA_W_DLP:
 					au_sap_type = GF_FILTER_SAP_3;
 					break;
 				case GF_HEVC_NALU_SLICE_BLA_N_LP:
@@ -3451,7 +3491,6 @@
 				slice_is_b = GF_TRUE;
 				break;
 			}
-#endif // GPAC_DISABLE_HEVC
 		} else if (ctx->codecid==GF_CODECID_VVC) {
 			slice_is_idr = gf_vvc_slice_is_ref(ctx->vvc_state);
 			recovery_point_valid = ctx->vvc_state->s_info.recovery_point_valid;
@@ -3551,7 +3590,7 @@
 					}
 					memcpy(ctx->svc_prefix_buffer, start+sc_size, ctx->svc_prefix_buffer_size);
 
-					assert( (u32) remain >= sc_size + nal_size);
+					gf_assert( (u32) remain >= sc_size + nal_size);
 					start += sc_size + nal_size;
 					remain -= sc_size + nal_size;
 					continue;
@@ -3565,8 +3604,7 @@
 			}
 
 			if (is_slice && ctx->avc_state->s_info.field_pic_flag) {
-				ctx->is_paff = GF_TRUE;
-				bottom_field_flag = ctx->avc_state->s_info.bottom_field_flag;
+				field_type = ctx->avc_state->s_info.bottom_field_flag ? 2 : 1;
 			}
 
 			slice_is_idr = (ctx->avc_state->s_info.nal_unit_type==GF_AVC_NALU_IDR_SLICE) ? GF_TRUE : GF_FALSE;
@@ -3587,6 +3625,15 @@
 				slice_is_b = GF_TRUE;
 				break;
 			}
+
+			//if field and we already have first field in au and slice poc is prev+1, consider slice poc to be the same as before
+			//since we pack the two fields in one AU and we use poc to build the AU timestamp, not the field timestamp
+			if (ctx->nb_slices_in_au
+				&& ctx->avc_state->s_info.field_pic_flag
+				&& (slice_poc == ctx->last_poc + 1)
+			) {
+				slice_poc = ctx->last_poc;
+			}
 		}
 
 		if (is_slice) {
@@ -3625,30 +3672,61 @@
 					if (bIntraSlice && ctx->force_sync && (ctx->sei_recovery_frame_count==0))
 						slice_force_ref = GF_TRUE;
 				}
+				ctx->field_type = field_type;
+
+				if (ctx->check_prev_sap2) {
+					if ((ctx->prev_sap2_poc > slice_poc) && ctx->prev_sap && (gf_list_find(ctx->pck_queue, ctx->prev_sap)>=0)) {
+						gf_filter_pck_set_sap(ctx->prev_sap, GF_FILTER_SAP_2);
+					}
+					ctx->check_prev_sap2 = GF_FALSE;
+					ctx->prev_sap = NULL;
+				}
+				//move all sap2 to sap1 and check POC of next frame
+				//we do this because many encoders use IDR+Decodable leading pic NAL types (eg SAP2)
+				//when encoding for IDR without DLP (eg SAP1)...
+				if (au_sap_type==GF_FILTER_SAP_2) {
+					ctx->sap2_as_sap1 = GF_TRUE;
+					ctx->check_prev_sap2 = GF_TRUE;
+					ctx->prev_sap2_poc = slice_poc;
+				}
+
 				ctx->au_sap = au_sap_type;
-				ctx->bottom_field_flag = bottom_field_flag;
 			}
 
 			if (slice_poc < ctx->poc_shift) {
-				u32 i, count = gf_list_count(ctx->pck_queue);
-				for (i=0; i<count; i++) {
-					u64 dts, cts;
-					GF_FilterPacket *q_pck = gf_list_get(ctx->pck_queue, i);
-					assert(q_pck);
-					dts = gf_filter_pck_get_dts(q_pck);
-					if (dts == GF_FILTER_NO_TS) continue;
-					cts = gf_filter_pck_get_cts(q_pck);
-					cts += ctx->poc_shift;
-					cts -= slice_poc;
-					gf_filter_pck_set_cts(q_pck, cts);
+				//slice_poc less than poc shift, update all pending packets if not an IDR
+				//if IDR just update poc_shift
+				if ((au_sap_type != GF_FILTER_SAP_1) && (au_sap_type != GF_FILTER_SAP_2)) {
+					u32 i, count = gf_list_count(ctx->pck_queue);
+					for (i=0; i<count; i++) {
+						u64 dts, cts;
+						GF_FilterPacket *q_pck = gf_list_get(ctx->pck_queue, i);
+						gf_assert(q_pck);
+						dts = gf_filter_pck_get_dts(q_pck);
+						if (dts == GF_FILTER_NO_TS) continue;
+						cts = gf_filter_pck_get_cts(q_pck);
+						//cts may be unset at this point (nal in middle of AU)
+						if (cts == GF_FILTER_NO_TS) continue;
+						cts += ctx->poc_shift;
+						cts -= slice_poc;
+						gf_filter_pck_set_cts(q_pck, cts);
+					}
 				}
-
 				ctx->poc_shift = slice_poc;
 			}
 
 			/*if #pics, compute smallest POC increase*/
 			if (slice_poc != ctx->last_poc) {
-				s32 pdiff = ABS(ctx->last_poc - slice_poc);
+//				s32 pdiff = ABS(ctx->last_poc - slice_poc);
+				s64 pdiff = ctx->last_poc;
+				pdiff -= slice_poc;
+				if (pdiff<0) pdiff=-pdiff;
+				if (pdiff>GF_INT_MAX) {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("%s POC diff overflow %d vs last %d, reseting poc counter - timing will likely be corrupted\n", ctx->log_name, slice_poc, ctx->last_poc));
+					pdiff = 0;
+					slice_poc = ctx->last_poc;
+					ctx->poc_shift = slice_poc;
+				}
 
 				if ((slice_poc < 0) && !ctx->last_poc)
 					ctx->poc_diff = 0;
@@ -3657,10 +3735,25 @@
 					ctx->poc_diff = 0;
 				}
 
+				//estimate min poc in GOP to cover cases where some GOPs use a min_poc > than other GOPs (cf #2716)
+				if (!ctx->min_poc_probe_done) {
+					if (slice_poc < ctx->min_poc) {
+						ctx->min_poc = slice_poc;
+					} else {
+						ctx->min_poc_probe_done = GF_TRUE;
+					}
+				}
+
 				if (!ctx->poc_diff || (ctx->poc_diff > (s32) pdiff ) ) {
-					ctx->poc_diff = pdiff;
+					ctx->poc_diff = (s32) pdiff;
 					ctx->poc_probe_done = GF_FALSE;
-				} else if (first_in_au) {
+				}
+				//first slice (new au) with poc greater than last poc, good to go
+				//We must wait for poc increase for IDR with leading pics (cf #2716):
+				//POCs: 23(IDR) 15 7 3 1 0 2
+				//diffs: 23 8 8 7 4 2 1 1
+				//we would use 8 instead of 1
+				else if (!ctx->poc_probe_done && first_in_au && (ctx->last_poc<slice_poc)) {
 					//second frame with the same poc diff, we should be able to properly recompute CTSs
 					ctx->poc_probe_done = GF_TRUE;
 				}
@@ -3690,11 +3783,15 @@
 						if (!ctx->au_sap2_poc_reset)
 							ctx->last_poc = 0;
 
+						//use IDR POC as new poc_shift
+						ctx->poc_shift = ctx->last_poc;
+						//use IDR POC as min_poc, and restart min_poc_probing
+						ctx->min_poc = ctx->last_poc;
+						ctx->min_poc_probe_done = GF_FALSE;
 						ctx->max_last_poc = ctx->last_poc;
 						ctx->max_last_b_poc = ctx->last_poc;
-						ctx->poc_shift = 0;
 						//force probing of POC diff, this will prevent dispatching frames with wrong CTS until we have a clue of min poc_diff used
-						ctx->poc_probe_done = 0;
+						ctx->poc_probe_done = GF_FALSE;
 					}
 					ctx->last_frame_is_idr = GF_TRUE;
 					if (temp_poc_diff)
@@ -3791,17 +3888,22 @@
 		//bytes only come from the data packet
 		memcpy(pck_data, nal_data, (size_t) nal_size);
 
+		if ((ctx->nb_slices_in_au==1) && ctx->check_prev_sap2) {
+			ctx->prev_sap = ctx->first_pck_in_au;
+		}
+
+
 		nal_size += sc_size;
 		start += nal_size;
 		remain -= nal_size;
 		naldmx_check_timestamp_switch(ctx, &nalu_store_before, nal_size, &drop_packet, pck);
 
-		//don't demux too much of input, abort when we would block. This avoid dispatching
+		//don't demux too much of input, abort when we would block. This avoids dispatching
 		//a huge number of frames in a single call
 		if (remain && gf_filter_pid_would_block(ctx->opid)) {
 			ctx->resume_from = (u32) (start - ctx->nal_store);
-			assert(ctx->resume_from <= ctx->nal_store_size);
-			assert(ctx->resume_from == ctx->nal_store_size - remain);
+			gf_assert(ctx->resume_from <= ctx->nal_store_size);
+			gf_assert(ctx->resume_from == ctx->nal_store_size - remain);
 			if (drop_packet)
 				gf_filter_pid_drop_packet(ctx->ipid);
 			return GF_OK;
@@ -3813,7 +3915,7 @@
 			GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("%s Incomplete last NAL and eos, discarding\n", ctx->log_name));
 			remain = 0;
 		} else {
-			assert((u32) remain<=ctx->nal_store_size);
+			gf_assert((u32) remain<=ctx->nal_store_size);
 			memmove(ctx->nal_store, start, remain);
 		}
 	}
@@ -3822,8 +3924,10 @@
 	if (drop_packet)
 		gf_filter_pid_drop_packet(ctx->ipid);
 
-	if (is_eos)
-		return naludmx_process(filter);
+	if (is_eos) {
+		//avoid recursive call
+		goto restart;
+	}
 
 	if ((ctx->nb_nalus>nalu_before) && gf_filter_reporting_enabled(filter)) {
 		char szStatus1024;
@@ -3995,13 +4099,13 @@
 	u32 nb_hevc=0;
 	u32 nb_avc=0;
 	u32 nb_vvc=0;
-	u32 nb_nalus=0;
+	//u32 nb_nalus=0;
 	u32 nb_hevc_zero=0;
 	u32 nb_avc_zero=0;
 	u32 nb_vvc_zero=0;
 	u32 nb_sps_hevc=0,nb_pps_hevc=0,nb_vps_hevc=0;
 	u32 nb_sps_avc=0,nb_pps_avc=0;
-	u32 nb_sps_vvc=0,nb_pps_vvc=0,nb_vps_vvc=0;
+	u32 nb_sps_vvc=0,nb_pps_vvc=0; //,nb_vps_vvc=0;
 
 	while (size>3) {
 		u32 nal_type=0;
@@ -4019,7 +4123,7 @@
 			not_vvc++;
 			continue;
 		}
-		nb_nalus++;
+		//nb_nalus++;
 
 		nal_type = (data0 & 0x7E) >> 1;
 		if (nal_type<=40) {
@@ -4084,11 +4188,11 @@
 			nb_sps_vvc++;
 			break;
 		case GF_VVC_NALU_VID_PARAM:
-			nb_vps_vvc++;
+			//nb_vps_vvc++;
 			break;
 		case GF_VVC_NALU_ACCESS_UNIT:
 			//to detect files without VPS correctly
-			nb_vps_vvc++;
+			//nb_vps_vvc++;
 			break;
 		case 0:
 			nb_vvc_zero++;
@@ -4223,14 +4327,13 @@
 };
 
 
-const GF_FilterRegister *naludmx_register(GF_FilterSession *session)
+const GF_FilterRegister *rfnalu_register(GF_FilterSession *session)
 {
 	return &NALUDmxRegister;
 }
-
 #else
-const GF_FilterRegister *naludmx_register(GF_FilterSession *session)
+const GF_FilterRegister *rfnalu_register(GF_FilterSession *session)
 {
 	return NULL;
 }
-#endif //GPAC_DISABLE_AV_PARSERS
+#endif //#if !defined(GPAC_DISABLE_AV_PARSERS) && !defined(GPAC_DISABLE_RFNALU)

gpac-2.2.1.tar.gz/src/filters/reframe_prores.c -> gpac-2.4.0.tar.gz/src/filters/reframe_prores.c Changed

gpac-2.2.1.tar.gz/src/filters/reframe_qcp.c -> gpac-2.4.0.tar.gz/src/filters/reframe_qcp.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2022
+ *			Copyright (c) Telecom ParisTech 2000-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / AMR&EVRC&SMV reframer filter
@@ -28,6 +28,8 @@
 #include <gpac/bitstream.h>
 #include <gpac/internal/media_dev.h>
 
+#ifndef GPAC_DISABLE_RFQCP
+
 typedef struct
 {
 	u64 pos;
@@ -432,7 +434,7 @@
 		if (gf_filter_pid_is_eos(ctx->ipid)) {
 			if (ctx->opid)
 				gf_filter_pid_set_eos(ctx->opid);
-			assert(ctx->remaining == 0);
+			gf_assert(ctx->remaining == 0);
 			return GF_EOS;
 		}
 		return GF_OK;
@@ -656,7 +658,7 @@
 		remain -= size;
 
 
-		//don't demux too much of input, abort when we would block. This avoid dispatching
+		//don't demux too much of input, abort when we would block. This avoids dispatching
 		//a huge number of frames in a single call
 		if (gf_filter_pid_would_block(ctx->opid)) {
 			ctx->resume_from = (u32) ((char *)start -  (char *)data);
@@ -736,8 +738,14 @@
 };
 
 
-const GF_FilterRegister *qcpdmx_register(GF_FilterSession *session)
+const GF_FilterRegister *rfqcp_register(GF_FilterSession *session)
 {
 	return &QCPDmxRegister;
 }
+#else
+const GF_FilterRegister *rfqcp_register(GF_FilterSession *session)
+{
+	return NULL;
+}
+#endif //#ifndef GPAC_DISABLE_RFQCP

gpac-2.2.1.tar.gz/src/filters/reframe_rawpcm.c -> gpac-2.4.0.tar.gz/src/filters/reframe_rawpcm.c Changed

gpac-2.2.1.tar.gz/src/filters/reframe_rawvid.c -> gpac-2.4.0.tar.gz/src/filters/reframe_rawvid.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2018-2021
+ *			Copyright (c) Telecom ParisTech 2018-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / RAW video (YUV,RGB) reframer filter
@@ -27,6 +27,8 @@
 #include <gpac/constants.h>
 #include <gpac/filters.h>
 
+#ifndef GPAC_DISABLE_RFRAWVID
+
 typedef struct
 {
 	//opts
@@ -361,7 +363,7 @@
 
 		Bool use_ref = GF_FALSE;
 		if (!ctx->out_pck) {
-			assert(! ctx->nb_bytes_in_frame);
+			gf_assert(! ctx->nb_bytes_in_frame);
 			if (!ctx->copy && (pck_size >= ctx->frame_size)) {
 				ctx->out_pck = gf_filter_pck_new_ref(ctx->opid, offset_in_pck, ctx->frame_size, pck);
 				use_ref = GF_TRUE;
@@ -491,10 +493,17 @@
 };
 
 
-const GF_FilterRegister *rawvidreframe_register(GF_FilterSession *session)
+const GF_FilterRegister *rfrawvid_register(GF_FilterSession *session)
 {
 	RawVidReframeArgs1.min_max_enum = gf_pixel_fmt_all_names();
 	RawVidReframeCaps1.val.value.string = (char *) gf_pixel_fmt_all_shortnames();
 	return &RawVidReframeRegister;
 }
+#else
+const GF_FilterRegister *rfrawvid_register(GF_FilterSession *session)
+{
+	return NULL;
+}
+#endif //#ifndef GPAC_DISABLE_RFRAWVID
+

gpac-2.2.1.tar.gz/src/filters/reframe_truehd.c -> gpac-2.4.0.tar.gz/src/filters/reframe_truehd.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2022
+ *			Copyright (c) Telecom ParisTech 2023
  *					All rights reserved
  *
  *  This file is part of GPAC / TrueHD reframer filter
@@ -27,6 +27,8 @@
 #include <gpac/constants.h>
 #include <gpac/filters.h>
 
+#ifndef GPAC_DISABLE_RFTRUEHD
+
 typedef struct
 {
 	u64 pos;
@@ -86,7 +88,9 @@
 	u32 index_alloc_size, index_size;
 	Bool copy_props;
 
+#ifndef GPAC_DISABLE_AV_PARSERS
 	GF_AC3Header ac3_hdr;
+#endif
 	Bool is_sync;
 } GF_TrueHDDmxCtx;
 
@@ -118,11 +122,13 @@
 		ctx->opid = gf_filter_pid_new(filter);
 		gf_filter_pid_copy_properties(ctx->opid, ctx->ipid);
 		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_UNFRAMED, NULL);
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_STREAM_TYPE, &PROP_UINT(GF_STREAM_AUDIO));
 	}
 	if (ctx->timescale) ctx->copy_props = GF_TRUE;
 	return GF_OK;
 }
 
+#ifndef GPAC_DISABLE_AV_PARSERS
 static void truehd_aux_ac3(GF_TrueHDDmxCtx *ctx, GF_BitStream *bs, GF_AC3Header *hdr)
 {
 	u8 *data;
@@ -170,6 +176,7 @@
 	gf_filter_pck_set_framing(dst_pck, GF_TRUE, GF_TRUE);
 	gf_filter_pck_send(dst_pck);
 }
+#endif
 
 static GF_Err truehd_parse_frame(GF_TrueHDDmxCtx *ctx, GF_BitStream *bs, TrueHDHdr *hdr, u64 *frame_start)
 {
@@ -185,6 +192,7 @@
 	while (gf_bs_available(bs)) {
 		u32 sync = gf_bs_peek_bits(bs, 16, 0);
 		if (sync==0x0B77) {
+#ifndef GPAC_DISABLE_AV_PARSERS
 			GF_AC3Header ac3hdr;
 			if (!gf_ac3_parser_bs(bs, &ac3hdr, GF_TRUE))
 				return GF_OK;
@@ -200,6 +208,9 @@
 			avail = (u32) gf_bs_available(bs);
 			*frame_start = gf_bs_get_position(bs);
 			continue;
+#else
+			return GF_NOT_SUPPORTED;
+#endif
 		}
 		break;
 	}
@@ -521,9 +532,13 @@
 	GF_FilterPacket *pck, *dst_pck;
 	u8 *output;
 	u8 *start;
-	GF_Err e = GF_OK;
+	GF_Err e;
 	u32 pck_size, remain, prev_pck_size;
-	u64 cts = GF_FILTER_NO_TS;
+	u64 cts;
+
+restart:
+	e = GF_OK;
+	cts = GF_FILTER_NO_TS;
 
 	//always reparse duration
 	if (!ctx->duration.num)
@@ -610,7 +625,7 @@
 		u8 *frame;
 		TrueHDHdr hdr;
 		u32 bytes_to_drop=0;
-		u64 frame_start;
+		u64 frame_start=0;
 		e = truehd_parse_frame(ctx, ctx->bs, &hdr, &frame_start);
 		if (e==GF_BUFFER_TOO_SMALL) {
 			e = GF_OK;
@@ -626,8 +641,14 @@
 		}
 
 		//frame not complete, wait
-		if (remain < frame_start + hdr.frame_size)
+		if (remain < frame_start + hdr.frame_size) {
+			//we may have sent the ac3 stream, drop frame
+			if (frame_start) {
+				start += frame_start;
+				remain -= (u32) frame_start;
+			}
 			break;
+		}
 
 		if (hdr.sync)
 			truehd_check_pid(filter, ctx, &hdr);
@@ -716,7 +737,8 @@
 
 	if (!pck) {
 		ctx->truehd_buffer_size = 0;
-		return truehd_process(filter);
+		//avoid recursive call
+		goto restart;
 	} else {
 		if (remain && (remain<ctx->truehd_buffer_size)) {
 			memmove(ctx->truehd_buffer, start, remain);
@@ -796,8 +818,14 @@
 };
 
 
-const GF_FilterRegister *truehd_register(GF_FilterSession *session)
+const GF_FilterRegister *rftruehd_register(GF_FilterSession *session)
 {
 	return &TrueHDDmxRegister;
 }
+#else
+const GF_FilterRegister *rftruehd_register(GF_FilterSession *session)
+{
+	return NULL;
+}
+#endif //#ifndef GPAC_DISABLE_RFTRUEHD

gpac-2.2.1.tar.gz/src/filters/reframer.c -> gpac-2.4.0.tar.gz/src/filters/reframer.c Changed

gpac-2.2.1.tar.gz/src/filters/resample_audio.c -> gpac-2.4.0.tar.gz/src/filters/resample_audio.c Changed

gpac-2.2.1.tar.gz/src/filters/restamp.c -> gpac-2.4.0.tar.gz/src/filters/restamp.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom Paris 2022
+ *			Copyright (c) Telecom Paris 2022-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / restamper filter
@@ -28,6 +28,8 @@
 #include <gpac/internal/media_dev.h>
 #include <gpac/mpeg4_odf.h>
 
+#ifndef GPAC_DISABLE_RESTAMP
+
 typedef struct
 {
 	GF_FilterPid *ipid, *opid;
@@ -43,6 +45,13 @@
 	u64 nb_frames;
 	GF_FilterPacket *pck_ref;
 	u32 keep_prev_state;
+
+	u64 last_ts_ref_plus_one, last_original_ts;
+	u32 ts_rescale, min_ref_dur;
+	//offset added to reference TS of a packet, to add to the cts
+	s64 ref_ts_diff;
+
+	GF_List *packets;
 } RestampPid;
 
 enum
@@ -57,6 +66,8 @@
 	GF_Fraction fps, delay, delay_v, delay_a, delay_t, delay_o;
 	GF_Fraction64 tsinit;
 	u32 rawv;
+	u32 align;
+	Bool reorder;
 
 	GF_List *pids;
 	Bool reconfigure;
@@ -80,7 +91,13 @@
 			}
 			gf_filter_pid_set_udta(pid, NULL);
 			gf_list_del_item(ctx->pids, pctx);
- 			gf_free(pctx);
+			while (gf_list_count(pctx->packets)) {
+				GF_FilterPacket *pck = gf_list_pop_front(pctx->packets);
+				gf_filter_pck_unref(pck);
+			}
+			gf_list_del(pctx->packets);
+
+			gf_free(pctx);
 		}
 		return GF_OK;
 	}
@@ -96,6 +113,8 @@
 		pctx->opid = gf_filter_pid_new(filter);
 		if (!pctx->opid) return GF_OUT_OF_MEM;
 		ctx->config_timing = GF_TRUE;
+		if (ctx->reorder)
+			pctx->packets = gf_list_new();
 	}
 
 	pctx->raw_vid_copy = GF_FALSE;
@@ -104,7 +123,7 @@
 	pctx->is_video = GF_FALSE;
 	GF_Fraction *delay = NULL;
 	prop = gf_filter_pid_get_property(pid, GF_PROP_PID_STREAM_TYPE);
-	assert(prop);
+	gf_fatal_assert(prop);
 	switch (prop->value.uint) {
 	case GF_STREAM_VISUAL:
 		pctx->is_video = GF_TRUE;
@@ -118,7 +137,7 @@
 				if (prop && !prop->value.boolean) {
 					pctx->raw_vid_copy = GF_TRUE;
 				} else {
-					gf_filter_pid_negociate_property(pid, GF_PROP_PID_CODECID, &PROP_UINT(GF_CODECID_RAW) );
+					gf_filter_pid_negotiate_property(pid, GF_PROP_PID_CODECID, &PROP_UINT(GF_CODECID_RAW) );
 					return GF_OK;
 				}
 			}
@@ -162,6 +181,7 @@
 
 	ctx->reconfigure = GF_FALSE;
 	gf_filter_pid_set_framing_mode(pid, GF_TRUE);
+	pctx->ts_rescale = pctx->timescale;
 
 	if (pctx->is_audio) return GF_OK;
 
@@ -204,15 +224,15 @@
 			gf_filter_pid_set_property(pctx->opid, GF_PROP_PID_DURATION, &PROP_FRAC64(ndur));
 		}
 	}
-
 	if ((ctx->fps.num>0) && (timescale % ctx->fps.num)) {
 		gf_filter_pid_set_property(pctx->opid, GF_PROP_PID_TIMESCALE, &PROP_UINT(ctx->fps.num));
 		pctx->rescale = GF_TRUE;
+		pctx->ts_rescale = ctx->fps.num;
 	}
 	return GF_OK;
 }
 
-static u64 restamp_get_timestamp(RestampCtx *ctx, RestampPid *pctx, u64 ots)
+static u64 restamp_get_timestamp(RestampCtx *ctx, RestampPid *pctx, u64 ots, Bool is_ref_ts, GF_FilterPacket *pck)
 {
 	if (ots == GF_FILTER_NO_TS) return ots;
 	u64 ts;
@@ -222,31 +242,32 @@
 	}
 	//ots + pctx->ts_offset<0
 	if ((pctx->ts_offset<0) && (ots < (u64) -pctx->ts_offset)) {
-		pctx->ts_offset += (s64) ots + pctx->ts_offset;;
+		pctx->ts_offset += (s64) ots + pctx->ts_offset;
 		gf_filter_pid_set_property(pctx->opid, GF_PROP_PID_DELAY, &PROP_LONGSINT(pctx->ts_offset) );
 		ts = 0;
 	}
 	else {
 		ts = ots + pctx->ts_offset;
 	}
-	if (pctx->is_audio || !ctx->fps.num || !pctx->is_video) return ts;
+
+	if (pctx->is_audio || !ctx->fps.num || !pctx->is_video) goto ts_done;
 
 	if (!pctx->last_min_dts) {
 		pctx->last_min_dts = 1 + ts;
 		pctx->last_ts = 1 + ts;
 		if (pctx->raw_vid_copy)
 			pctx->keep_prev_state = 1;
-		return ts;
+		goto ts_done;
 	}
 	s64 diff = ts - (pctx->last_min_dts-1);
 	if (ctx->fps.num<0) {
 		diff *= ctx->fps.den;
 		diff /= -ctx->fps.num;
 		ts = pctx->last_min_dts-1 + diff;
-		return ts;
+		goto ts_done;
 	}
 
-	if (ots + 1 <= pctx->last_ts) return ts;
+	if (ots + 1 <= pctx->last_ts) goto ts_done;
 	u64 dur = ots - (pctx->last_ts-1);
 	if (!pctx->min_dur || (dur < pctx->min_dur)) pctx->min_dur = (u32) dur;
 
@@ -262,14 +283,15 @@
 		}
 		else if (dur + pctx->min_dur/2 <= new_ts) {
 			pctx->keep_prev_state = 2;
-			return 0;
+			ts = 0;
+			goto ts_done;
 		}
 
 		if (pctx->rescale) {
 			new_ts = pctx->nb_frames * ctx->fps.den;
 		}
-		new_ts += pctx->last_min_dts-1;
-		return new_ts;
+		ts = new_ts + pctx->last_min_dts-1;
+		goto ts_done;
 	}
 
 
@@ -279,6 +301,42 @@
 	}
 	nb_frames *= ctx->fps.den;
 	ts = pctx->last_min_dts-1 + nb_frames;
+
+
+ts_done:
+	if (ctx->align) {
+		if (is_ref_ts) {
+			//compute duration
+			u32 dur = gf_filter_pck_get_duration(pck);
+			if (!dur || ((pctx->last_original_ts < ots) && (dur > ots - pctx->last_original_ts)))
+				dur = (u32) (ots - pctx->last_original_ts);
+
+			pctx->last_original_ts = ots;
+			if (dur & pctx->rescale)
+				dur = (u32) gf_timestamp_rescale(dur, pctx->timescale, pctx->ts_rescale);
+
+			if (dur && (!pctx->min_ref_dur || (dur < pctx->min_ref_dur)))
+				pctx->min_ref_dur = dur;
+
+			//we have sent a previous packet, check the diff between new TS and last one
+			if (pctx->last_ts_ref_plus_one) {
+				s64 diff = ts;
+				u64 pred_ts = pctx->last_ts_ref_plus_one-1 + pctx->min_ref_dur;
+				pctx->ref_ts_diff = 0;
+				diff -= pred_ts;
+				diff = gf_timestamp_rescale_signed(diff, pctx->ts_rescale, 1000);
+				if (ABS(diff)>ctx->align) {
+					u64 new_ts = pred_ts;
+					pctx->ref_ts_diff = new_ts;
+					pctx->ref_ts_diff -= ts;
+					ts = new_ts;
+				}
+			}
+			pctx->last_ts_ref_plus_one = ts + 1;
+		} else {
+			ts = (s64) ts + pctx->ref_ts_diff;
+		}
+	}
 	return ts;
 }
 
@@ -290,7 +348,7 @@
 	u32 min_timescale=0;
 
 	if ((ctx->tsinit.num<0) || !ctx->tsinit.den) {
-		ctx->config_timing = GF_FALSE;;
+		ctx->config_timing = GF_FALSE;
 		return;
 	}
 
@@ -330,7 +388,7 @@
 		pctx->ts_shift_plus_one += gf_timestamp_rescale(ctx->tsinit.num, ctx->tsinit.den, pctx->timescale);
 		pctx->ts_shift_plus_one += 1;
 	}
-	ctx->config_timing = GF_FALSE;;
+	ctx->config_timing = GF_FALSE;
 }
 
 
@@ -354,30 +412,68 @@
 
 		while (1) {
 			s64 ts;
+			Bool is_ref = GF_FALSE;
 			GF_FilterPacket *pck = gf_filter_pid_get_packet(pctx->ipid);
+
 			if (!pck) {
 				if (gf_filter_pid_is_eos(pctx->ipid)) {
-					gf_filter_pid_set_eos(pctx->opid);
-					if (pctx->pck_ref) {
-						gf_filter_pck_unref(pctx->pck_ref);
-						pctx->pck_ref = NULL;
+					if (pctx->packets) {
+						pck = gf_list_pop_front(pctx->packets);
+						is_ref = GF_TRUE;
+					}
+					if (!pck) {
+						gf_filter_pid_set_eos(pctx->opid);
+						if (pctx->pck_ref) {
+							gf_filter_pck_unref(pctx->pck_ref);
+							pctx->pck_ref = NULL;
+						}
 					}
 				}
-				break;
+				if (!pck)
+					break;
+			}
+
+			if (ctx->reorder && !is_ref) {
+				u64 ts = gf_filter_pck_get_cts(pck);
+				u32 j;
+				Bool can_flush=GF_FALSE;
+				for (j=0; j<gf_list_count(pctx->packets); j++) {
+					GF_FilterPacket *tmp = gf_list_get(pctx->packets, j);
+					u64 ats = gf_filter_pck_get_cts(tmp);
+					if (ats>ts) {
+						gf_filter_pck_ref(&pck);
+						gf_list_insert(pctx->packets, pck, j);
+						pck=NULL;
+						//we insert after first frame, we can flush the first frame
+						if (j) can_flush = GF_TRUE;
+						break;
+					}
+				}
+				if (pck) {
+					gf_filter_pck_ref(&pck);
+					gf_list_add(pctx->packets, pck);
+				}
+				gf_filter_pid_drop_packet(pctx->ipid);
+				if (!can_flush)
+					break;
+				pck = gf_list_pop_front(pctx->packets);
+				is_ref = GF_TRUE;
 			}
 
 			GF_FilterPacket *opck;
 
 			if (!pctx->raw_vid_copy) {
+				Bool ts_is_ref = GF_TRUE;
 				opck = gf_filter_pck_new_ref(pctx->opid, 0, 0, pck);
 				if (!opck) return GF_OUT_OF_MEM;
 				gf_filter_pck_merge_properties(pck, opck);
-				ts = restamp_get_timestamp(ctx, pctx, gf_filter_pck_get_dts(pck) );
-				if (ts != GF_FILTER_NO_TS)
+				ts = restamp_get_timestamp(ctx, pctx, gf_filter_pck_get_dts(pck), ts_is_ref, pck);
+				if (ts != GF_FILTER_NO_TS) {
+					ts_is_ref = GF_FALSE;
 					gf_filter_pck_set_dts(opck, ts);
+				}
 
-
-				ts = restamp_get_timestamp(ctx, pctx, gf_filter_pck_get_cts(pck) );
+				ts = restamp_get_timestamp(ctx, pctx, gf_filter_pck_get_cts(pck), ts_is_ref, pck);
 				if (ts != GF_FILTER_NO_TS)
 					gf_filter_pck_set_cts(opck, ts);
 
@@ -390,19 +486,26 @@
 					}
 				}
 				gf_filter_pck_send(opck);
-				gf_filter_pid_drop_packet(pctx->ipid);
+				if (is_ref)
+					gf_filter_pck_unref(pck);
+				else
+					gf_filter_pid_drop_packet(pctx->ipid);
 			} else {
 				u64 ots = gf_filter_pck_get_cts(pck) ;
  				Bool discard = GF_FALSE;
 				pctx->keep_prev_state = 0;
-				ts = restamp_get_timestamp(ctx, pctx, ots);
+				ts = restamp_get_timestamp(ctx, pctx, ots, GF_TRUE, pck);
 
 				if (pctx->keep_prev_state==2) {
 					if (pctx->pck_ref) {
 						gf_filter_pck_unref(pctx->pck_ref);
 						pctx->pck_ref = NULL;
 					}
-					gf_filter_pid_drop_packet(pctx->ipid);
+					if (is_ref)
+						gf_filter_pck_unref(pck);
+					else
+						gf_filter_pid_drop_packet(pctx->ipid);
+
 					GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("Restamp Droping frame TS "LLU"/%u\n", ots, pctx->timescale));
 					continue;
 				}
@@ -419,7 +522,7 @@
 					gf_filter_pck_ref(&pctx->pck_ref);
 					discard = GF_TRUE;
 				}
-				assert(pctx->pck_ref);
+				gf_assert(pctx->pck_ref);
 				opck = gf_filter_pck_new_ref(pctx->opid, 0, 0, pctx->pck_ref);
 				if (!opck) return GF_OUT_OF_MEM;
 				gf_filter_pck_merge_properties(pck, opck);
@@ -429,8 +532,13 @@
 
 				gf_filter_pck_send(opck);
 
-				if (discard)
-					gf_filter_pid_drop_packet(pctx->ipid);
+				if (discard) {
+					if (!is_ref)
+						gf_filter_pid_drop_packet(pctx->ipid);
+				} else {
+					if (is_ref)
+						gf_list_insert(pctx->packets, pck, 0);
+				}
 			}
 		}
 	}
@@ -481,6 +589,11 @@
 	while (gf_list_count(ctx->pids)) {
 		RestampPid *pctx = gf_list_pop_back(ctx->pids);
 		if (pctx->pck_ref) gf_filter_pck_unref(pctx->pck_ref);
+		while (gf_list_count(pctx->packets)) {
+			GF_FilterPacket *pck = gf_list_pop_front(pctx->packets);
+			gf_filter_pck_unref(pck);
+		}
+		gf_list_del(pctx->packets);
 		gf_free(pctx);
 	}
 	gf_list_del(ctx->pids);
@@ -501,6 +614,8 @@
 		"- dyn: decoding video streams if not all intra"
 	, GF_PROP_UINT, "no", "no|force|dyn", 0},
 	{ OFFS(tsinit), "initial timestamp to resync to, negative values disables resync", GF_PROP_FRACTION64, "-1/1", NULL, 0},
+	{ OFFS(align), "timestamp alignment threshold (0 disables alignment) - see filter help", GF_PROP_UINT, "0", NULL, 0},
+	{ OFFS(reorder), "reorder input packets by CTS (resulting PID may fail decoding)", GF_PROP_BOOL, "false", NULL, 0},
 	{0}
 };
 
@@ -520,7 +635,7 @@
 	CAP_UINT(GF_CAPS_OUTPUT_EXCLUDED, GF_PROP_PID_CODECID, GF_CODECID_NONE),
 };
 
-GF_FilterRegister RestampRegister = {
+const GF_FilterRegister RestampRegister = {
 	.name = "restamp",
 	GF_FS_SET_DESCRIPTION("Packet timestamp rewriter")
 	GF_FS_SET_HELP("This filter rewrites timing (offsets and rate) of packets.\n"
@@ -537,6 +652,9 @@
 	"  - if -rawv=dyn(), input video stream is decoded if not all-intra and video frames are dropped/copied to match the new rate.\n"
 	"\n"
 	"Note: frames are simply copied or dropped with no motion compensation.\n"
+	"\n"
+	"When -align() is not 0, if the difference between two consecutive timestamps is greater than the specified threshold, the new timestamp \n"
+	"is set to the last computed timestamp plus the minimum packet duration for the stream.\n"
 	)
 	.private_size = sizeof(RestampCtx),
 	.max_extra_pids = 0xFFFFFFFF,
@@ -552,5 +670,12 @@
 
 const GF_FilterRegister *restamp_register(GF_FilterSession *session)
 {
-	return (const GF_FilterRegister *) &RestampRegister;
+	return &RestampRegister;
 }
+#else
+const GF_FilterRegister *restamp_register(GF_FilterSession *session)
+{
+	return NULL;
+}
+#endif //#ifndef GPAC_DISABLE_RESTAMP
+

gpac-2.2.1.tar.gz/src/filters/rewind.c -> gpac-2.4.0.tar.gz/src/filters/rewind.c Changed

gpac-2.2.1.tar.gz/src/filters/rewrite_adts.c -> gpac-2.4.0.tar.gz/src/filters/rewrite_adts.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2022
+ *			Copyright (c) Telecom ParisTech 2000-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / AAC ADTS write filter
@@ -27,6 +27,8 @@
 #include <gpac/constants.h>
 #include <gpac/bitstream.h>
 
+#ifndef GPAC_DISABLE_UFAAC
+
 #include <gpac/avparse.h>
 
 
@@ -414,7 +416,7 @@
 };
 
 
-const GF_FilterRegister *adtsmx_register(GF_FilterSession *session)
+const GF_FilterRegister *ufadts_register(GF_FilterSession *session)
 {
 	return &ADTSMxRegister;
 }
@@ -460,7 +462,18 @@
 };
 
 
-const GF_FilterRegister *latm_mx_register(GF_FilterSession *session)
+const GF_FilterRegister *uflatm_register(GF_FilterSession *session)
 {
 	return &LATMMxRegister;
 }
+#else
+const GF_FilterRegister *ufadts_register(GF_FilterSession *session)
+{
+	return NULL;
+}
+const GF_FilterRegister *uflatm_register(GF_FilterSession *session)
+{
+	return NULL;
+}
+#endif //#ifndef GPAC_DISABLE_UFAAC
+

gpac-2.2.1.tar.gz/src/filters/rewrite_mhas.c -> gpac-2.4.0.tar.gz/src/filters/rewrite_mhas.c Changed

gpac-2.2.1.tar.gz/src/filters/rewrite_mp4v.c -> gpac-2.4.0.tar.gz/src/filters/rewrite_mp4v.c Changed

gpac-2.2.1.tar.gz/src/filters/rewrite_nalu.c -> gpac-2.4.0.tar.gz/src/filters/rewrite_nalu.c Changed

gpac-2.2.1.tar.gz/src/filters/rewrite_obu.c -> gpac-2.4.0.tar.gz/src/filters/rewrite_obu.c Changed

gpac-2.2.1.tar.gz/src/filters/tileagg.c -> gpac-2.4.0.tar.gz/src/filters/tileagg.c Changed

gpac-2.2.1.tar.gz/src/filters/tilesplit.c -> gpac-2.4.0.tar.gz/src/filters/tilesplit.c Changed

gpac-2.2.1.tar.gz/src/filters/tssplit.c -> gpac-2.4.0.tar.gz/src/filters/tssplit.c Changed

gpac-2.2.1.tar.gz/src/filters/ttml_conv.c -> gpac-2.4.0.tar.gz/src/filters/ttml_conv.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2022
+ *			Copyright (c) Telecom ParisTech 2022-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / TTML to SRT converter filter
@@ -32,7 +32,7 @@
 #include <gpac/xml.h>
 
 
-#if !defined(GPAC_DISABLE_ISOM_WRITE)
+#if !defined(GPAC_DISABLE_ISOM_WRITE) && !defined(GPAC_DISABLE_TTMLCONV)
 
 typedef struct
 {
@@ -45,6 +45,7 @@
 	u8 *buf;
 	u32 buf_alloc;
 	u64 last_end_ts;
+	s64 delay;
 
 	Bool srt_conv;
 } TTMLConvCtx;
@@ -77,6 +78,10 @@
 
 	const GF_PropertyValue *p = gf_filter_pid_get_property(pid, GF_PROP_PID_TIMESCALE);
 	ctx->timescale = p ? p->value.uint : 1000;
+
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_DELAY);
+	ctx->delay = p ? p->value.longsint : 0;
+	gf_filter_pid_set_property(pid, GF_PROP_PID_DELAY, NULL);
 	return GF_OK;
 }
 
@@ -102,7 +107,7 @@
 	while ( (att = gf_list_enum(p->attributes, &i)) ) {
 		const char *sep = strchr(att->name, ':');
 		const char *name  = sep ? sep+1 : att->name;
-		if (!name) continue;;
+		if (!name) continue;
 		if (!strcmp(name, "fontStyle") && (!strcmp(att->value, "italic") || !strcmp(att->value, "oblique")))
 			needs_italic = GF_TRUE;
 		if (!strcmp(name, "textDecoration") && !strcmp(att->value, "underlined"))
@@ -174,6 +179,11 @@
 	start_ts = gf_filter_pck_get_cts(pck);
 	end_ts = start_ts + gf_filter_pck_get_duration(pck);
 
+	if ((s64) start_ts > -ctx->delay) start_ts += ctx->delay;
+	else start_ts = 0;
+	if ((s64) end_ts > -ctx->delay) end_ts += ctx->delay;
+	else end_ts = 0;
+
 	start_ts = gf_timestamp_rescale(start_ts, ctx->timescale, 1000);
 	end_ts = gf_timestamp_rescale(end_ts, ctx->timescale, 1000);
 
@@ -215,7 +225,6 @@
 	e = ttml_parse_root(root, &lang, &tick_rate, &ttml_fps_num, &ttml_fps_den, &ttml_sfps);
 	if (e) goto exit;
 
-	u32 div_idx=0;
 	body = ttml_get_body(root);
 	nb_children = body ? gf_list_count(body->content) : 0;
 	for (i=0; i<nb_children; i++) {
@@ -223,7 +232,6 @@
 		if (div->type) continue;
 		if (strcmp(div->name, "div")) continue;
 
-		div_idx++;
 //		div_reg = ttml_get_attr(div, "region");
 
 		j=0;
@@ -305,7 +313,7 @@
 GF_FilterRegister TTMLConvRegister = {
 	.name = "ttml2vtt",
 	GF_FS_SET_DESCRIPTION("TTML to WebVTT")
-	GF_FS_SET_HELP("This filter converts TTML frames to unframed WebVTT\n."
+	GF_FS_SET_HELP("This filter converts TTML frames to unframed WebVTT.\n"
 	"\n"
 	"Conversion is quite limited: only the first div is analyzed and only basic styling is implemented.\n"
 	)
@@ -319,7 +327,7 @@
 };
 
 
-const GF_FilterRegister *ttmlconv_register(GF_FilterSession *session)
+const GF_FilterRegister *ttml2vtt_register(GF_FilterSession *session)
 {
 	return &TTMLConvRegister;
 }
@@ -346,7 +354,7 @@
 GF_FilterRegister TTMLConv2Register = {
 	.name = "ttml2srt",
 	GF_FS_SET_DESCRIPTION("TTML to SRT")
-	GF_FS_SET_HELP("This filter converts TTML frames to unframed SRT\n."
+	GF_FS_SET_HELP("This filter converts TTML frames to unframed SRT.\n"
 	"\n"
 	"Conversion is quite limited: only the first div is analyzed and only basic styling is implemented.\n"
 	)
@@ -359,21 +367,21 @@
 };
 
 
-const GF_FilterRegister *ttmlconv2_register(GF_FilterSession *session)
+const GF_FilterRegister *ttml2srt_register(GF_FilterSession *session)
 {
 	return &TTMLConv2Register;
 }
 
 #else
 
-const GF_FilterRegister *ttmlconv_register(GF_FilterSession *session)
+const GF_FilterRegister *ttml2vtt_register(GF_FilterSession *session)
 {
 	return NULL;
 }
 
-const GF_FilterRegister *ttmlconv2_register(GF_FilterSession *session)
+const GF_FilterRegister *ttml2srt_register(GF_FilterSession *session)
 {
 	return NULL;
 }
 
-#endif //#if !defined(GPAC_DISABLE_ISOM_WRITE) 
+#endif //#if !defined(GPAC_DISABLE_ISOM_WRITE) && !defined(GPAC_DISABLE_TTMLCONV)

gpac-2.2.1.tar.gz/src/filters/unframer.c -> gpac-2.4.0.tar.gz/src/filters/unframer.c Changed

gpac-2.2.1.tar.gz/src/filters/unit_test_filter.c -> gpac-2.4.0.tar.gz/src/filters/unit_test_filter.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2017-2021
+ *			Copyright (c) Telecom ParisTech 2017-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / unit test filters
@@ -26,6 +26,8 @@
 #include <gpac/filters.h>
 #include <gpac/list.h>
 
+#ifndef GPAC_DISABLE_UNITS
+
 typedef struct
 {
 	GF_FilterPid *src_pid;
@@ -68,7 +70,7 @@
 {
 	PIDCtx *stack = (PIDCtx *) gf_filter_pid_get_udta(pid);
 	stack->pck_del++;
-	assert(stack->nb_packets >= stack->pck_del);
+	gf_assert(stack->nb_packets >= stack->pck_del);
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_APP, ("%s: Packet deleted - %d out there (%d sent %d destroyed)\n", gf_filter_get_name(filter), stack->nb_packets - stack->pck_del, stack->nb_packets, stack->pck_del));
 }
 
@@ -177,8 +179,8 @@
 		u32 data_offset=0;
 		PIDCtx *pidctx = gf_list_get(stack->pids, i);
 		GF_FilterPacket *pck = gf_filter_pid_get_packet(pidctx->src_pid);
-		assert (pck);
-		assert(pidctx == gf_filter_pid_get_udta(pidctx->src_pid));
+		gf_assert (pck);
+		gf_assert(pidctx == gf_filter_pid_get_udta(pidctx->src_pid));
 
 		data = gf_filter_pck_get_data(pck, &size);
 		gf_sha1_update(pidctx->sha_ctx, (u8*)data, size);
@@ -474,7 +476,7 @@
 	for (i=0; i<count; i++) {
 		pidctx = gf_list_get(stack->pids, i);
 
-		//something is being reconfigured. We check we have the same custum arg, otherwise we do not support
+		//something is being reconfigured. We check we have the same custom arg, otherwise we do not support
 		if (pidctx->src_pid == pid) {
 			format = gf_filter_pid_get_property(pidctx->src_pid, GF_4CC('c','u','s','t') );
 			if (!format || !format->value.string || strcmp(format->value.string, stack->pid_att)) {
@@ -510,7 +512,7 @@
 	if (!pidctx) return GF_OUT_OF_MEM;
 	pidctx->src_pid = pid;
 	gf_list_add(stack->pids, pidctx);
-	assert(pidctx->src_pid);
+	gf_assert(pidctx->src_pid);
 	
 	//coverage mode
 	if (stack->cov) {
@@ -808,7 +810,7 @@
 
 		memset(&p, 0, sizeof(GF_PropertyValue));
 		p2=p;
-		for (i=GF_PROP_FORBIDEN; i<GF_PROP_LAST_DEFINED; i++) {
+		for (i=GF_PROP_FORBIDDEN; i<GF_PROP_LAST_DEFINED; i++) {
 			char dumpGF_PROP_DUMP_ARG_SIZE;
 			gf_props_get_type_name(i);
 			p.type = p2.type = i;
@@ -970,22 +972,22 @@
 };
 
 
-const GF_FilterRegister *ut_filter_register(GF_FilterSession *session, Bool load_meta_filters)
+const GF_FilterRegister *ut_filter_register(GF_FilterSession *session)
 {
 	return &UTFilterRegister;
 }
-const GF_FilterRegister *ut_source_register(GF_FilterSession *session, Bool load_meta_filters)
+const GF_FilterRegister *ut_source_register(GF_FilterSession *session)
 {
 	return &UTSourceRegister;
 }
-const GF_FilterRegister *ut_sink_register(GF_FilterSession *session, Bool load_meta_filters)
+const GF_FilterRegister *ut_sink_register(GF_FilterSession *session)
 {
 	return &UTSinkRegister;
 }
-const GF_FilterRegister *ut_sink2_register(GF_FilterSession *session, Bool load_meta_filters)
+const GF_FilterRegister *ut_sink2_register(GF_FilterSession *session)
 {
 	return &UTSink2Register;
 }
 
-
+#endif //#ifndef GPAC_DISABLE_UNITS

gpac-2.2.1.tar.gz/src/filters/vcrop.c -> gpac-2.4.0.tar.gz/src/filters/vcrop.c Changed

gpac-2.2.1.tar.gz/src/filters/vflip.c -> gpac-2.4.0.tar.gz/src/filters/vflip.c Changed

gpac-2.2.1.tar.gz/src/filters/write_generic.c -> gpac-2.4.0.tar.gz/src/filters/write_generic.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2017-2022
+ *			Copyright (c) Telecom ParisTech 2017-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / generic stream to file filter
@@ -29,6 +29,8 @@
 #include <gpac/xml.h>
 #include <gpac/base_coding.h>
 
+#ifndef GPAC_DISABLE_WRITEGEN
+
 #include <gpac/internal/isomedia_dev.h>
 
 enum
@@ -39,11 +41,18 @@
 	DECINFO_AUTO
 };
 
+enum
+{
+	VTTH_SINGLE=0,
+	VTTH_SEG,
+	VTTH_ALL,
+};
+
 typedef struct
 {
 	//opts
 	Bool exporter, frame, split, merge_region;
-	u32 sstart, send;
+	u32 sstart, send, vtth;
 	u32 pfmt, afmt, decinfo;
 	GF_Fraction dur;
 
@@ -360,7 +369,7 @@
 				//forcing pixel format regardless of extension
 				if (ctx->pfmt) {
 					if (pf != ctx->pfmt) {
-						gf_filter_pid_negociate_property(ctx->ipid, GF_PROP_PID_PIXFMT, &PROP_UINT(ctx->pfmt));
+						gf_filter_pid_negotiate_property(ctx->ipid, GF_PROP_PID_PIXFMT, &PROP_UINT(ctx->pfmt));
 						//make sure we reconfigure
 						ctx->codecid = 0;
 						pf = ctx->pfmt;
@@ -368,7 +377,7 @@
 				}
 				//use extension to derive pixel format
 				else if (pf != ctx->target_pfmt) {
-					gf_filter_pid_negociate_property(ctx->ipid, GF_PROP_PID_PIXFMT, &PROP_UINT(ctx->target_pfmt));
+					gf_filter_pid_negotiate_property(ctx->ipid, GF_PROP_PID_PIXFMT, &PROP_UINT(ctx->target_pfmt));
 					strcpy(szExt, gf_pixel_fmt_sname(ctx->target_pfmt));
 					//make sure we reconfigure
 					ctx->codecid = 0;
@@ -412,7 +421,7 @@
 				//forcing sample format regardless of extension
 				if (ctx->afmt) {
 					if (sfmt != ctx->afmt) {
-						gf_filter_pid_negociate_property(ctx->ipid, GF_PROP_PID_AUDIO_FORMAT, &PROP_UINT(ctx->afmt));
+						gf_filter_pid_negotiate_property(ctx->ipid, GF_PROP_PID_AUDIO_FORMAT, &PROP_UINT(ctx->afmt));
 						//make sure we reconfigure
 						ctx->codecid = 0;
 						sfmt = ctx->afmt;
@@ -420,7 +429,7 @@
 				}
 				//use extension to derive sample format
 				else if (sfmt != ctx->target_afmt) {
-					gf_filter_pid_negociate_property(ctx->ipid, GF_PROP_PID_AUDIO_FORMAT, &PROP_UINT(ctx->target_afmt));
+					gf_filter_pid_negotiate_property(ctx->ipid, GF_PROP_PID_AUDIO_FORMAT, &PROP_UINT(ctx->target_afmt));
 					strcpy(szExt, gf_audio_fmt_sname(ctx->target_afmt));
 					//make sure we reconfigure
 					ctx->codecid = 0;
@@ -778,6 +787,7 @@
 		}
 		i--;
 		gf_list_rem(node_src->content, i);
+		if (!node_dst->content) node_dst->content = gf_list_new();
 		gf_list_add(node_dst->content, child_src);
 	}
 	return;
@@ -859,6 +869,7 @@
 			s->attributes = gf_list_new();
 			s->content = gf_list_new();
 			s->name = gf_strdup("source");
+			if (!node->content) node->content = gf_list_new();
 			gf_list_add(node->content, s);
 			if (!s->name || !s->content || !s->attributes) return GF_OUT_OF_MEM;
 			//move @type to source
@@ -876,6 +887,7 @@
 		data->attributes = gf_list_new();
 		data->content = gf_list_new();
 		data->name = gf_strdup("data");
+		if (!node->content) node->content = gf_list_new();
 		gf_list_add(node->content, data);
 		if (!data->name || !data->content || !data->attributes) return GF_OUT_OF_MEM;
 		//move @type to data
@@ -974,6 +986,7 @@
 	if (head_pck) {
 		if (!head_global) {
 			gf_list_del_item(root_pck->content, head_pck);
+			if (!root_global->content) root_global->content = gf_list_new();
 			gf_list_add(root_global->content, head_pck);
 		} else {
 			ttml_merge_head(head_pck, head_global);
@@ -984,6 +997,7 @@
 	body_global = ttml_get_body(root_global);
 	if (body_pck && !body_global) {
 		gf_list_del_item(root_pck->content, body_pck);
+		if (!root_global->content) root_global->content = gf_list_new();
 		gf_list_add(root_global->content, body_pck);
 		goto exit;
 	}
@@ -1005,6 +1019,7 @@
 
 		if (!div_global) {
 			gf_list_rem(body_pck->content, k);
+			if (!body_global->content) body_global->content = gf_list_new();
 			gf_list_insert(body_global->content, div_pck, div_idx+1);
 			div_idx++;
 			continue;
@@ -1040,6 +1055,7 @@
 
 			i--;
 			gf_list_rem(div_pck->content, i);
+			if (!div_global->content) div_global->content = gf_list_new();
 			if (i) {
 				txt = gf_list_get(div_pck->content, i-1);
 				if (txt->type) {
@@ -1077,10 +1093,10 @@
 			GF_XMLNode *div = gf_list_get(body_global->content, i);
 			if (div->type) continue;
 			if (strcmp(div->name, "div")) continue;
-			if (gf_list_count(div->content) > 1) continue;;
+			if (gf_list_count(div->content) > 1) continue;
 
 			child = gf_list_get(div->content, 0);
-			if (child && !child->type) continue;;
+			if (child && !child->type) continue;
 
 			gf_list_rem(body_global->content, i);
 			i--;
@@ -1185,15 +1201,34 @@
 	}
 	ctx->sample_num++;
 
-	if (ctx->dash_mode && ctx->ttml_agg && gf_filter_pck_get_property(pck, GF_PROP_PCK_FILENUM)) {
-		if (ctx->ttml_dash_pck) {
-			writegen_flush_ttml(ctx);
-			gf_filter_pck_unref(ctx->ttml_dash_pck);
-			ctx->ttml_dash_pck = NULL;
+	if (ctx->dash_mode) {
+		Bool is_eods=GF_FALSE;
+		//eods
+		if (gf_filter_pck_get_property(pck, GF_PROP_PCK_EODS)) {
+			is_eods=1;
+		}
+		//flush if first of segment or if eods
+		if (ctx->ttml_agg && (gf_filter_pck_get_property(pck, GF_PROP_PCK_FILENUM) || is_eods)) {
+			if (ctx->ttml_dash_pck) {
+				writegen_flush_ttml(ctx);
+				if (ctx->ttml_dash_pck) {
+					gf_filter_pck_unref(ctx->ttml_dash_pck);
+					ctx->ttml_dash_pck = NULL;
+				}
+			}
+			//remember first pck of segment
+			if (!is_eods) {
+				ctx->ttml_dash_pck = pck;
+				gf_filter_pck_ref_props(&ctx->ttml_dash_pck);
+			}
+		}
+		//forward eods as is
+		if (is_eods) {
+			gf_filter_pck_forward(pck, ctx->opid);
+			ctx->sample_num--;
+			gf_filter_pid_drop_packet(ctx->ipid);
+			return GF_OK;
 		}
-
-		ctx->ttml_dash_pck = pck;
-		gf_filter_pck_ref_props(&ctx->ttml_dash_pck);
 	}
 
 	if (ctx->sstart) {
@@ -1376,7 +1411,7 @@
 					dur *= p->value.uint;
 					dur /= timescale;
 				}
-				assert(pck_size >= bpp * dur);
+				gf_assert(pck_size >= bpp * dur);
 				pck_size = bpp * dur;
 
 				dst_pck = gf_filter_pck_new_alloc(ctx->opid, pck_size, &odata);
@@ -1389,21 +1424,34 @@
 			dst_pck = gf_filter_pck_new_ref(ctx->opid, 0, 0, pck);
 		}
 	} else if (ctx->webvtt || ctx->dump_srt) {
+		Bool empty_seg = GF_FALSE;
 		const GF_PropertyValue *p;
 
 		if (!data || !pck_size) {
-			ctx->sample_num--;
-			goto no_output;
+			if (ctx->dash_mode) {
+				if ((ctx->vtth<VTTH_ALL) || gf_filter_pck_get_property(pck, GF_PROP_PCK_EODS)) {
+					gf_filter_pck_forward(pck, ctx->opid);
+					goto no_output;
+				}
+				empty_seg=GF_TRUE;
+			} else {
+				ctx->sample_num--;
+				goto no_output;
+			}
 		}
 
 		u64 start = gf_filter_pck_get_cts(pck);
 		u64 end = start + gf_filter_pck_get_duration(pck);
 		u32 timescale = gf_filter_pck_get_timescale(pck);
+		Bool first = ctx->first;
+		//in dash mode always inject the webvtt header for HLS
+		if (ctx->dash_mode && (ctx->vtth!=VTTH_SINGLE) && gf_filter_pck_get_property(pck, GF_PROP_PCK_FILENUM))
+			first = GF_TRUE;
 
 		if (!ctx->bs) ctx->bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
 		else gf_bs_reassign_buffer(ctx->bs, ctx->write_buf, ctx->write_alloc);
 
-		if (ctx->first && !ctx->dump_srt) {
+		if (first && !ctx->dump_srt) {
 			if (ctx->dcfg && ctx->dcfg_size) {
 				u32 len = ctx->dcfg_size;
 				if (ctx->dcfglen-1==0) len--;
@@ -1430,26 +1478,28 @@
 				gf_bs_write_data(ctx->bs, "\n", 1);
 		}
 
-		if (ctx->dump_srt) {
-			char szCID100;
-			sprintf(szCID, "%d\n", ctx->sample_num);
-			gf_bs_write_data(ctx->bs, szCID, (u32) strlen(szCID));
-		}
-		webvtt_timestamps_dump(ctx->bs, start, end, timescale, ctx->dump_srt);
+		if (!empty_seg) {
+			if (ctx->dump_srt) {
+				char szCID100;
+				sprintf(szCID, "%d\n", ctx->sample_num);
+				gf_bs_write_data(ctx->bs, szCID, (u32) strlen(szCID));
+			}
+			webvtt_timestamps_dump(ctx->bs, start, end, timescale, ctx->dump_srt);
 
-		p = gf_filter_pck_get_property_str(pck, "vtt_settings");
-		if (!ctx->dump_srt && p && p->value.string) {
-			gf_bs_write_data(ctx->bs, " ", 1);
-			gf_bs_write_data(ctx->bs, p->value.string, (u32) strlen(p->value.string));
-		}
+			p = gf_filter_pck_get_property_str(pck, "vtt_settings");
+			if (!ctx->dump_srt && p && p->value.string) {
+				gf_bs_write_data(ctx->bs, " ", 1);
+				gf_bs_write_data(ctx->bs, p->value.string, (u32) strlen(p->value.string));
+			}
 
-		gf_bs_write_data(ctx->bs, "\n", 1);
-		if (data) {
-			gf_bs_write_data(ctx->bs, data, pck_size);
-			if (pck_size && (datapck_size-1 != '\n'))
-				gf_bs_write_data(ctx->bs, "\n", 1);
+			gf_bs_write_data(ctx->bs, "\n", 1);
+			if (data) {
+				gf_bs_write_data(ctx->bs, data, pck_size);
+				if (pck_size && (datapck_size-1 != '\n'))
+					gf_bs_write_data(ctx->bs, "\n", 1);
+			}
+			gf_bs_write_data(ctx->bs, "\n", 1);
 		}
-		gf_bs_write_data(ctx->bs, "\n", 1);
 
 		u8 *odata;
 		u32 vtt_data_size, alloc_size;
@@ -1731,6 +1781,7 @@
 	CAP_STRING(GF_CAPS_OUTPUT, GF_PROP_PID_MIME, "audio/x-eac3|audio/eac3"),
 	{0},
 
+	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_STREAM_TYPE, GF_STREAM_TEXT),
 	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_CODECID, GF_CODECID_SIMPLE_TEXT),
 	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_CODECID, GF_CODECID_META_TEXT),
 	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_CODECID, GF_CODECID_SUBS_TEXT),
@@ -1838,10 +1889,11 @@
 
 	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_STREAM_TYPE, GF_STREAM_AUDIO),
 	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_CODECID, GF_CODECID_DTS_CA),
+	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_CODECID, GF_CODECID_DTS_HD_HR_MASTER),
+	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_CODECID, GF_CODECID_DTS_HD_LOSSLESS),
+	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_CODECID, GF_CODECID_DTS_EXPRESS_LBR),
 	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_CODECID, GF_CODECID_DTS_X),
-	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_CODECID, GF_CODECID_DTS_HD_HR),
-	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_CODECID, GF_CODECID_DTS_HD_MASTER),
-	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_CODECID, GF_CODECID_DTS_LBR),
+	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_CODECID, GF_CODECID_DTS_Y),
 	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_FILE),
 	CAP_STRING(GF_CAPS_OUTPUT, GF_PROP_PID_FILE_EXT, "dts"),
 	CAP_STRING(GF_CAPS_OUTPUT, GF_PROP_PID_MIME, "audio/dts"),
@@ -1905,6 +1957,10 @@
 	{ OFFS(send), "end number of frame to forward. If less than start frame, all samples after start are forwarded", GF_PROP_UINT, "0", NULL, 0},
 	{ OFFS(dur), "duration of media to forward after first sample. If 0, all samples are forwarded", GF_PROP_FRACTION, "0", NULL, 0},
 	{ OFFS(merge_region), "merge TTML regions with same ID while reassembling TTML doc", GF_PROP_BOOL, "false", NULL, 0},
+	{ OFFS(vtth), "vtt header injection mode\n"
+	"- single: inject only at first frame of the stream\n"
+	"- seg: inject at each non-empty segment\n"
+	"- all: inject at each segment even empty ones", GF_PROP_UINT, "seg", "single|seg|all", 0},
 	{0}
 };
 
@@ -2005,6 +2061,17 @@
 };
 const GF_FilterRegister *writeuf_register(GF_FilterSession *session)
 {
-
 	return &WriteUFRegister;
 }
+
+#else
+const GF_FilterRegister *writegen_register(GF_FilterSession *session)
+{
+	return NULL;
+}
+const GF_FilterRegister *writeuf_register(GF_FilterSession *session)
+{
+	return NULL;
+}
+#endif //#ifndef GPAC_DISABLE_WRITEGEN
+

gpac-2.2.1.tar.gz/src/filters/write_nhml.c -> gpac-2.4.0.tar.gz/src/filters/write_nhml.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2017-2022
+ *			Copyright (c) Telecom ParisTech 2017-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / NHML stream to file filter
@@ -28,6 +28,8 @@
 #include <gpac/bitstream.h>
 #include <gpac/base_coding.h>
 
+#ifndef GPAC_DISABLE_NHMLW
+
 #include <gpac/internal/isomedia_dev.h>
 
 #ifndef GPAC_DISABLE_ZLIB
@@ -71,9 +73,17 @@
 	Bool side_streams_config;
 } GF_NHMLDumpCtx;
 
+static const char *nhmldump_get_resolved_basename(GF_FilterPid *ipid, const char *fileName, char szFinalNameGF_MAX_PATH)
+{
+	GF_Err e = gf_filter_pid_resolve_file_template(ipid, fileName, szFinalName, 0, NULL);
+	if (e != GF_OK) return fileName;
+	return gf_file_basename(szFinalName);
+}
+
 GF_Err nhmldump_config_side_stream(GF_Filter *filter, GF_NHMLDumpCtx *ctx)
 {
 	char *mime=NULL, *name;
+	char szTempNameGF_MAX_PATH;
 	char fileNameGF_MAX_PATH+1;
 	const GF_PropertyValue *p;
 	GF_FileIO *gfio = NULL;
@@ -130,7 +140,7 @@
 		if (name) name0 = 0;
 		strcat(fileName, ".media");
 		if (gfio) {
-			res_name = (char *) gf_fileio_factory(gfio, gf_file_basename(fileName) );
+			res_name = (char *) gf_fileio_factory(gfio, nhmldump_get_resolved_basename(ctx->ipid, fileName, szTempName) );
 		} else {
 			res_name = fileName;
 		}
@@ -158,7 +168,7 @@
 		if (name) name0 = 0;
 		strcat(fileName, ".info");
 		if (gfio) {
-			res_name = (char *) gf_fileio_factory(gfio, gf_file_basename(fileName) );
+			res_name = (char *) gf_fileio_factory(gfio, nhmldump_get_resolved_basename(ctx->ipid, fileName, szTempName) );
 		} else {
 			res_name = fileName;
 		}
@@ -344,6 +354,7 @@
 
 static GF_Err nhmldump_send_header(GF_NHMLDumpCtx *ctx)
 {
+	char szTempNameGF_MAX_PATH;
 	GF_FilterPacket *dst_pck;
 	char nhml1024;
 	u32 size;
@@ -458,7 +469,7 @@
 
 	//send DCD
 	if (ctx->opid_info) {
-		sprintf(nhml, "specificInfoFile=\"%s\" ", gf_file_basename(ctx->info_file) );
+		sprintf(nhml, "specificInfoFile=\"%s\" ", nhmldump_get_resolved_basename(ctx->ipid, ctx->info_file, szTempName) );
 		gf_bs_write_data(ctx->bs_w, nhml, (u32) strlen(nhml));
 
 		dst_pck = gf_filter_pck_new_shared(ctx->opid_info, ctx->dcfg, ctx->dcfg_size, NULL);
@@ -480,7 +491,7 @@
 	}
 
 	if (ctx->opid_mdia) {
-		sprintf(nhml, "baseMediaFile=\"%s\" ", gf_file_basename(ctx->media_file) );
+		sprintf(nhml, "baseMediaFile=\"%s\" ", nhmldump_get_resolved_basename(ctx->ipid, ctx->media_file, szTempName) );
 		gf_bs_write_data(ctx->bs_w, nhml, (u32) strlen(nhml));
 	}
 	sprintf(nhml, ">\n");
@@ -632,7 +643,7 @@
 	char pvalGF_PROP_DUMP_ARG_SIZE;
 	if (!pname) pname = gf_props_4cc_get_name(p4cc);
 
-	sprintf(nhml, "%s=\"", pname ? pname : gf_4cc_to_str(p4cc));
+	sprintf(nhml, "<P %s=\"", pname ? pname : gf_4cc_to_str(p4cc));
 	gf_bs_write_data(ctx->bs_w, nhml, (u32) strlen(nhml));
 
 	switch (att->type) {
@@ -652,7 +663,10 @@
 		break;
 	}
 	gf_bs_write_data(ctx->bs_w, nhml, (u32) strlen(nhml));
-	sprintf(nhml, "\"");
+	if (p4cc)
+		sprintf(nhml, "\"/>\n");
+	else
+		sprintf(nhml, "\" type=\"%s\"/>\n", gf_props_get_type_name(att->type));
 	gf_bs_write_data(ctx->bs_w, nhml, (u32) strlen(nhml));
 }
 
@@ -714,14 +728,35 @@
 			sprintf(nhml, "carouselVersion=\"%d\" ", idx);
 			gf_bs_write_data(ctx->bs_w, nhml, (u32) strlen(nhml));
 		}
-		idx = 0;
-		while (1) {
-			u32 prop_4cc;
-			const char *prop_name;
-			p = gf_filter_pck_enum_properties(pck, &idx, &prop_4cc, &prop_name);
-			if (!p) break;
-			if (prop_4cc == GF_PROP_PCK_SUBS) continue;
-			nhmldump_pck_property(ctx, prop_4cc, prop_name, p);
+		idx = gf_filter_pck_get_crypt_flags(pck);
+		if (idx) {
+			sprintf(nhml, "encrypted=\"%d\" ", idx);
+			gf_bs_write_data(ctx->bs_w, nhml, (u32) strlen(nhml));
+		}
+		idx = gf_filter_pck_get_seek_flag(pck);
+		if (idx) {
+			sprintf(nhml, "seek=\"%d\" ", idx);
+			gf_bs_write_data(ctx->bs_w, nhml, (u32) strlen(nhml));
+		}
+		idx = gf_filter_pck_get_corrupted(pck);
+		if (idx) {
+			sprintf(nhml, "corrupted=\"%d\" ", idx);
+			gf_bs_write_data(ctx->bs_w, nhml, (u32) strlen(nhml));
+		}
+		idx = gf_filter_pck_get_interlaced(pck);
+		if (idx) {
+			sprintf(nhml, "interlaced=\"%d\" ", idx);
+			gf_bs_write_data(ctx->bs_w, nhml, (u32) strlen(nhml));
+		}
+		s32 roll = gf_filter_pck_get_roll_info(pck);
+		if (roll) {
+			sprintf(nhml, "roll=\"%d\" ", roll);
+			gf_bs_write_data(ctx->bs_w, nhml, (u32) strlen(nhml));
+		}
+		idx = gf_filter_pck_get_dependency_flags(pck);
+		if (idx) {
+			sprintf(nhml, "depends=\"%02X\" ", idx);
+			gf_bs_write_data(ctx->bs_w, nhml, (u32) strlen(nhml));
 		}
 	}
 
@@ -748,6 +783,24 @@
 	sprintf(nhml, ">\n");
 	gf_bs_write_data(ctx->bs_w, nhml, (u32) strlen(nhml));
 
+
+	if (ctx->pckp && gf_filter_pck_has_properties(pck)) {
+		u32 idx = 0;
+		sprintf(nhml, "<Properties>\n");
+		gf_bs_write_data(ctx->bs_w, nhml, (u32) strlen(nhml));
+		while (1) {
+			u32 prop_4cc;
+			const char *prop_name;
+			p = gf_filter_pck_enum_properties(pck, &idx, &prop_4cc, &prop_name);
+			if (!p) break;
+			if (prop_4cc == GF_PROP_PCK_SUBS) continue;
+			nhmldump_pck_property(ctx, prop_4cc, prop_name, p);
+		}
+		sprintf(nhml, "</Properties>\n");
+		gf_bs_write_data(ctx->bs_w, nhml, (u32) strlen(nhml));
+	}
+
+
 	p = gf_filter_pck_get_property(pck, GF_PROP_PCK_SUBS);
 	if (p) {
 		u32 offset_in_sample = 0;
@@ -981,8 +1034,15 @@
 	.process = nhmldump_process
 };
 
-const GF_FilterRegister *nhmldump_register(GF_FilterSession *session)
+const GF_FilterRegister *nhmlw_register(GF_FilterSession *session)
 {
 	return &NHMLDumpRegister;
 }
+#else
+const GF_FilterRegister *nhmlw_register(GF_FilterSession *session)
+{
+	return NULL;
+}
+#endif //#ifndef GPAC_DISABLE_NHMLW
+

gpac-2.2.1.tar.gz/src/filters/write_nhnt.c -> gpac-2.4.0.tar.gz/src/filters/write_nhnt.c Changed

gpac-2.2.1.tar.gz/src/filters/write_qcp.c -> gpac-2.4.0.tar.gz/src/filters/write_qcp.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2022
+ *			Copyright (c) Telecom ParisTech 2000-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / QCP stream to file filter
@@ -27,6 +27,8 @@
 #include <gpac/constants.h>
 #include <gpac/bitstream.h>
 
+#ifndef GPAC_DISABLE_WRITEQCP
+
 #include <gpac/internal/media_dev.h>
 
 
@@ -251,7 +253,7 @@
 	gf_bs_del(bs);
 
 	if (!ctx->first) {
-		assert(ctx->needs_final_pach);
+		gf_assert(ctx->needs_final_pach);
 		gf_filter_pck_set_framing(dst_pck, GF_FALSE, GF_FALSE);
 		gf_filter_pck_set_seek_flag(dst_pck, GF_TRUE);
 		gf_filter_pck_set_byte_offset(dst_pck, 0);
@@ -385,7 +387,14 @@
 };
 
 
-const GF_FilterRegister *qcpmx_register(GF_FilterSession *session)
+const GF_FilterRegister *writeqcp_register(GF_FilterSession *session)
 {
 	return &QCPMxRegister;
 }
+#else
+const GF_FilterRegister *writeqcp_register(GF_FilterSession *session)
+{
+	return NULL;
+}
+#endif //#ifndef GPAC_DISABLE_WRITEQCP
+

gpac-2.2.1.tar.gz/src/filters/write_tx3g.c -> gpac-2.4.0.tar.gz/src/filters/write_tx3g.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2022
+ *			Copyright (c) Telecom ParisTech 2022-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / TX3G to SRT/VTT/TTML convert filter
@@ -32,6 +32,7 @@
 
 #if !defined(GPAC_DISABLE_ISOM_DUMP) && !defined(GPAC_DISABLE_ISOM)
 
+#define TTML_NAMESPACE "http://www.w3.org/ns/ttml"
 
 typedef struct
 {
@@ -47,6 +48,7 @@
 	u32 codecid;
 
 	GF_Fraction64 duration;
+	s64 delay;
 
 	GF_TextConfig *cfg;
 	u32 dsi_crc;
@@ -105,6 +107,10 @@
 		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_UNFRAMED, &PROP_BOOL(GF_TRUE) );
 	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_DECODER_CONFIG, NULL );
 
+	if (ctx->dump_type==3) {
+		gf_filter_pid_set_property_str(ctx->opid, "meta:xmlns", &PROP_STRING(TTML_NAMESPACE) );
+	}
+
 	ctx->ipid = pid;
 
 	//decoder config may be not ready yet
@@ -147,6 +153,11 @@
 	if (!ctx->dump_type)
 		tx3gmx_write_config(ctx);
 
+
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_DELAY);
+	ctx->delay = p ? p->value.longsint : 0;
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_DELAY, NULL);
+
 	return GF_OK;
 }
 
@@ -321,12 +332,9 @@
 				}
 			}
 
-			Bool needs_bold=GF_FALSE;
-			Bool needs_italic=GF_FALSE;
-			Bool needs_underlined=GF_FALSE;
-			Bool needs_strikethrough=GF_FALSE;
 			Bool needs_color=GF_FALSE;
 			Bool close_span=GF_FALSE;
+			Bool needs_span=GF_FALSE;
 
 			if (new_color != color) {
 				close_span = GF_TRUE;
@@ -336,11 +344,21 @@
 				styles = txtd->default_style.style_flags;
 			}
 
+			//check each style:
+			//- if set but not previously set, needs a new span
+			//- if not set but previously set, needs to close span
 			if (new_styles != styles) {
-				if ((new_styles & GF_TXT_STYLE_BOLD) && !(styles & GF_TXT_STYLE_BOLD)) needs_bold = GF_TRUE;
-				if ((new_styles & GF_TXT_STYLE_ITALIC) && !(styles & GF_TXT_STYLE_ITALIC)) needs_italic = GF_TRUE;
-				if ((new_styles & GF_TXT_STYLE_UNDERLINED) && !(styles & GF_TXT_STYLE_UNDERLINED)) needs_underlined = GF_TRUE;
-				if ((new_styles & GF_TXT_STYLE_STRIKETHROUGH) && !(styles & GF_TXT_STYLE_STRIKETHROUGH)) needs_strikethrough = GF_TRUE;
+				if ((new_styles & GF_TXT_STYLE_BOLD) && !(styles & GF_TXT_STYLE_BOLD)) needs_span = GF_TRUE;
+				else if ((styles & GF_TXT_STYLE_BOLD) && !(new_styles & GF_TXT_STYLE_BOLD)) close_span = GF_TRUE;
+
+				if ((new_styles & GF_TXT_STYLE_ITALIC) && !(styles & GF_TXT_STYLE_ITALIC)) needs_span = GF_TRUE;
+				else if ((styles & GF_TXT_STYLE_ITALIC) && !(new_styles & GF_TXT_STYLE_ITALIC)) close_span = GF_TRUE;
+
+				if ((new_styles & GF_TXT_STYLE_UNDERLINED) && !(styles & GF_TXT_STYLE_UNDERLINED)) needs_span = GF_TRUE;
+				if ((styles & GF_TXT_STYLE_UNDERLINED) && !(new_styles & GF_TXT_STYLE_UNDERLINED)) close_span = GF_TRUE;
+
+				if ((new_styles & GF_TXT_STYLE_STRIKETHROUGH) && !(styles & GF_TXT_STYLE_STRIKETHROUGH)) needs_span = GF_TRUE;
+				else if ((styles & GF_TXT_STYLE_STRIKETHROUGH) && !(new_styles & GF_TXT_STYLE_STRIKETHROUGH)) close_span = GF_TRUE;
 
 				styles = new_styles;
 			}
@@ -349,13 +367,13 @@
 				gf_fprintf(dump, "</span>");
 				has_span = GF_FALSE;
 			}
-			if (needs_bold || needs_italic || needs_underlined || needs_strikethrough || needs_color) {
+			if (needs_span) {
 				has_span = GF_TRUE;
 				gf_fprintf(dump, "<span");
-				if (needs_italic) gf_fprintf(dump, " tts:fontStyle=\"italic\"");
-				if (needs_bold) gf_fprintf(dump, " tts:fontWeight=\"bold\"");
-				if (needs_underlined) gf_fprintf(dump, " tts:textDecoration=\"underline\"");
-				if (needs_strikethrough) gf_fprintf(dump, " tts:textDecoration=\"lineThrough\"");
+				if (styles & GF_TXT_STYLE_ITALIC) gf_fprintf(dump, " tts:fontStyle=\"italic\"");
+				if (styles & GF_TXT_STYLE_BOLD) gf_fprintf(dump, " tts:fontWeight=\"bold\"");
+				if (styles & GF_TXT_STYLE_UNDERLINED) gf_fprintf(dump, " tts:textDecoration=\"underline\"");
+				if (styles & GF_TXT_STYLE_STRIKETHROUGH) gf_fprintf(dump, " tts:textDecoration=\"lineThrough\"");
 
 				if (needs_color) gf_fprintf(dump, " tts:color=\"%s\"", gf_color_get_name(color));
 
@@ -399,7 +417,7 @@
 	TX3GMxCtx *ctx = gf_filter_get_udta(filter);
 	GF_FilterPacket *pck, *dst_pck;
 	u8 *data, *output;
-	u64 start_ts, end_ts;
+	u64 start_ts, end_ts, o_start_ts;
 	u32 pck_size, timescale;
 	FILE *dump=NULL;
 	pck = gf_filter_pid_get_packet(ctx->ipid);
@@ -414,7 +432,8 @@
 	data = (char *) gf_filter_pck_get_data(pck, &pck_size);
 	if (pck_size<=1) {
 		gf_filter_pid_drop_packet(ctx->ipid);
-		return GF_NON_COMPLIANT_BITSTREAM;
+		//we consider a 0 packet size not an error
+		return pck_size ? GF_NON_COMPLIANT_BITSTREAM : GF_OK;
 	}
 	if (ctx->dump_type && (pck_size<=2)) {
 		gf_filter_pid_drop_packet(ctx->ipid);
@@ -427,10 +446,15 @@
 	start_ts = gf_filter_pck_get_cts(pck);
 	end_ts = start_ts + gf_filter_pck_get_duration(pck);
 
+	if ((s64) start_ts > -ctx->delay) start_ts += ctx->delay;
+	else start_ts = 0;
+	o_start_ts = start_ts;
+	if ((s64) end_ts > -ctx->delay) end_ts += ctx->delay;
+	else end_ts = 0;
+
 	start_ts = gf_timestamp_rescale(start_ts, timescale, 1000);
 	end_ts = gf_timestamp_rescale(end_ts, timescale, 1000);
 
-
 	gf_bs_reassign_buffer(ctx->bs_r, data, pck_size);
 
 	while (gf_bs_available(ctx->bs_r)) {
@@ -479,7 +503,7 @@
 				}
 			}
 		} else {
-			dump_ttxt_sample(dump, txt, gf_filter_pck_get_cts(pck), gf_filter_pck_get_timescale(pck), sample_index, GF_FALSE);
+			dump_ttxt_sample(dump, txt, o_start_ts, gf_filter_pck_get_timescale(pck), sample_index, GF_FALSE);
 		}
 
 		gf_isom_delete_text_sample(txt);
@@ -503,6 +527,8 @@
 		gf_filter_pck_set_byte_offset(dst_pck, GF_FILTER_NO_BO);
 		gf_filter_pck_set_framing(dst_pck, GF_TRUE, GF_TRUE);
 		gf_filter_pck_set_sap(dst_pck, GF_FILTER_SAP_1);
+		gf_filter_pck_set_cts(dst_pck, o_start_ts);
+		gf_filter_pck_set_dts(dst_pck, o_start_ts);
 
 		gf_filter_pck_send(dst_pck);
 	}
@@ -566,7 +592,7 @@
 	.process = tx3gmx_process
 };
 
-const GF_FilterRegister *ttxtuf_register(GF_FilterSession *session)
+const GF_FilterRegister *ufttxt_register(GF_FilterSession *session)
 {
 	return &TTXTMxRegister;
 }
@@ -690,7 +716,7 @@
 }
 
 #else
-const GF_FilterRegister *ttxtuf_register(GF_FilterSession *session)
+const GF_FilterRegister *ufttxt_register(GF_FilterSession *session)
 {
 	return NULL;
 }

gpac-2.2.1.tar.gz/src/filters/write_vtt.c -> gpac-2.4.0.tar.gz/src/filters/write_vtt.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2022
+ *			Copyright (c) Telecom ParisTech 2000-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / WebVTT stream unframer filter
@@ -46,6 +46,7 @@
 	u32 timescale;
 
 	GF_Fraction64 duration;
+	s64 delay;
 
 	u8 *cues_buffer;
 	u32 cues_buffer_size;
@@ -53,6 +54,8 @@
 	GF_WebVTTParser *parser;
 
 	GF_FilterPacket *src_pck;
+	Bool dash_mode;
+	u32 seg_pck_in, seg_pck_out;
 } GF_WebVTTMxCtx;
 
 static void vttmx_write_cue(void *ctx, GF_WebVTTCue *cue);
@@ -104,10 +107,15 @@
 	gf_filter_pid_set_framing_mode(pid, GF_TRUE);
 
 	p = gf_filter_pid_get_property(pid, GF_PROP_PID_DASH_MODE);
+	ctx->dash_mode = (p && (p->value.uint==1)) ? GF_TRUE : GF_FALSE;
 
 	p = gf_filter_pid_get_property(pid, GF_PROP_PID_TIMESCALE);
 	ctx->timescale = p ? p->value.uint : 1000;
 
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_DELAY);
+	ctx->delay = p ? p->value.longsint : 0;
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_DELAY, NULL);
+
 	return GF_OK;
 }
 
@@ -124,7 +132,9 @@
 	if (!dst) return;
 	if (size) memcpy(output, cue->text, size);
 
-	gf_filter_pck_merge_properties(ctx->src_pck, dst);
+	if (ctx->src_pck)
+		gf_filter_pck_merge_properties(ctx->src_pck, dst);
+
 	u64 start = cue->start.hour*3600 + cue->start.min*60 + cue->start.sec;
 	start *= 1000;
 	start += cue->start.ms;
@@ -157,6 +167,13 @@
 	gf_filter_pck_set_sap(dst, GF_FILTER_SAP_1);
 	gf_filter_pck_set_byte_offset(dst, GF_FILTER_NO_BO);
 	gf_filter_pck_send(dst);
+	ctx->seg_pck_out++;
+
+	//dash mode, drop src props: we must do so otherwise we would signal more than one packet with the PROP_FILENUM set !
+	if (ctx->dash_mode && ctx->src_pck) {
+		gf_filter_pck_unref(ctx->src_pck);
+		ctx->src_pck = NULL;
+	}
 }
 
 static void vttmx_write_cue(void *udta, GF_WebVTTCue *cue)
@@ -176,8 +193,34 @@
 	gf_webvtt_parser_finalize(ctx->parser, duration);
 	gf_webvtt_parser_del(ctx->parser);
 	ctx->parser = NULL;
+}
+
+static void vttmx_flush_segment(GF_WebVTTMxCtx *ctx)
+{
+	gf_webvtt_parser_finalize(ctx->parser, 0);
+	gf_webvtt_parser_del(ctx->parser);
+	ctx->parser = gf_webvtt_parser_new();
+	gf_webvtt_parser_cue_callback(ctx->parser, vttmx_write_cue, ctx);
+
+
+	if (ctx->seg_pck_in && !ctx->seg_pck_out) {
+		GF_FilterPacket *dst = gf_filter_pck_new_alloc(ctx->opid, 0, NULL);
+		if (ctx->src_pck)
+			gf_filter_pck_merge_properties(ctx->src_pck, dst);
 
+		gf_filter_pck_set_property_str(dst, "vtt_pre", NULL);
+		gf_filter_pck_set_property_str(dst, "vtt_cueid", NULL);
+		gf_filter_pck_set_property_str(dst, "vtt_settings", NULL);
+
+
+		gf_filter_pck_set_sap(dst, GF_FILTER_SAP_1);
+		gf_filter_pck_set_byte_offset(dst, GF_FILTER_NO_BO);
+		gf_filter_pck_send(dst);
+	}
+	ctx->seg_pck_in = 0;
+	ctx->seg_pck_out = 0;
 }
+
 GF_Err vttmx_process(GF_Filter *filter)
 {
 	GF_WebVTTMxCtx *ctx = gf_filter_get_udta(filter);
@@ -186,6 +229,7 @@
 	u64 start_ts, end_ts;
 	u32 i, pck_size;
 	GF_List *cues;
+	Bool keep_ref = GF_TRUE;
 
 	pck = gf_filter_pid_get_packet(ctx->ipid);
 	if (!pck) {
@@ -202,18 +246,35 @@
 		}
 		return GF_OK;
 	}
-
 	data = (char *) gf_filter_pck_get_data(pck, &pck_size);
 
 	start_ts = gf_filter_pck_get_cts(pck);
 	end_ts = start_ts + gf_filter_pck_get_duration(pck);
 
+	if ((s64) start_ts > -ctx->delay) start_ts += ctx->delay;
+	else start_ts = 0;
+	if ((s64) end_ts > -ctx->delay) end_ts += ctx->delay;
+	else end_ts = 0;
+
 	start_ts = gf_timestamp_rescale(start_ts, ctx->timescale, 1000);
 	end_ts = gf_timestamp_rescale(end_ts, ctx->timescale, 1000);
 
-	if (ctx->src_pck) gf_filter_pck_unref(ctx->src_pck);
-	ctx->src_pck = pck;
-	gf_filter_pck_ref_props(&ctx->src_pck);
+	if (ctx->dash_mode) {
+		//dash mode, force a flush at each segment start
+		if (gf_filter_pck_get_property(pck, GF_PROP_PCK_FILENUM)!=NULL) {
+			vttmx_flush_segment(ctx);
+		} else {
+			//do not override props if not first packet in segment
+			keep_ref = GF_FALSE;
+		}
+		ctx->seg_pck_in++;
+	}
+
+	if (keep_ref) {
+		if (ctx->src_pck) gf_filter_pck_unref(ctx->src_pck);
+		ctx->src_pck = pck;
+		gf_filter_pck_ref_props(&ctx->src_pck);
+	}
 
 	cues = gf_webvtt_parse_cues_from_data(data, pck_size, start_ts, end_ts);
 	if (ctx->parser) {
@@ -231,6 +292,13 @@
 		u64 ts = gf_filter_pck_get_cts(pck);
 		gf_set_progress("Exporting", ts*ctx->duration.den, ctx->duration.num * ctx->timescale);
 	}
+	if (ctx->dash_mode && (!data || !pck_size) ) {
+		const GF_PropertyValue *p = gf_filter_pck_get_property(pck, GF_PROP_PCK_EODS);
+		if (p && p->value.boolean) {
+			vttmx_flush_segment(ctx);
+			gf_filter_pck_forward(pck, ctx->opid);
+		}
+	}
 
 	gf_filter_pid_drop_packet(ctx->ipid);
 
@@ -282,12 +350,12 @@
 };
 
 
-const GF_FilterRegister *vttmx_register(GF_FilterSession *session)
+const GF_FilterRegister *ufvtt_register(GF_FilterSession *session)
 {
 	return &WebVTTMxRegister;
 }
 #else
-const GF_FilterRegister *vttmx_register(GF_FilterSession *session)
+const GF_FilterRegister *ufvtt_register(GF_FilterSession *session)
 {
 	return NULL;
 }

gpac-2.2.1.tar.gz/src/ietf/rtcp.c -> gpac-2.4.0.tar.gz/src/ietf/rtcp.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2012
+ *			Copyright (c) Telecom ParisTech 2000-2024
  *					All rights reserved
  *
  *  This file is part of GPAC / IETF RTP/RTSP/SDP sub-project
@@ -128,13 +128,18 @@
 #else
 				const char *ascTime = "Not Available";
 #endif
-				GF_LOG(ch->first_SR ? GF_LOG_INFO : GF_LOG_DEBUG, GF_LOG_RTP, ("RTP RTCP %sSR: SSRC %d - RTP Time %u - Nb Pck %d - Nb Bytes %d - Time %s\n",
+				u64 clock_us = ch->last_SR_NTP_frac;
+				clock_us *= 1000000;
+				clock_us /= 0xFFFFFFFF;
+
+				GF_LOG(ch->first_SR ? GF_LOG_INFO : GF_LOG_DEBUG, GF_LOG_RTP, ("RTP RTCP %sSR: SSRC %d - RTP Time %u - Nb Pck %d - Nb Bytes %d - NTP %s %u us\n",
 											   ch->first_SR ? "Initial " : "",
 				                                 ch->SenderSSRC,
 				                                 ch->last_SR_rtp_time,
 				                                 ch->total_pck,
 				                                 ch->total_bytes,
-				                                 ascTime
+				                                 ascTime,
+				                                 clock_us
 				                                ));
 			}
 #endif

gpac-2.2.1.tar.gz/src/ietf/rtp.c -> gpac-2.4.0.tar.gz/src/ietf/rtp.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2022
+ *			Copyright (c) Telecom ParisTech 2000-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / IETF RTP/RTSP/SDP sub-project
@@ -31,7 +31,7 @@
 
 
 GF_EXPORT
-GF_RTPChannel *gf_rtp_new()
+GF_RTPChannel *gf_rtp_new_ex(const char *netcap_id)
 {
 	GF_RTPChannel *tmp;
 	GF_SAFEALLOC(tmp, GF_RTPChannel);
@@ -41,10 +41,17 @@
 	tmp->SSRC = gf_rand();
 	tmp->bs_r = gf_bs_new("d", 1, GF_BITSTREAM_READ);
 	tmp->bs_w = gf_bs_new("d", 1, GF_BITSTREAM_WRITE);
+	tmp->netcap_id = netcap_id;
 	return tmp;
 }
 
 GF_EXPORT
+GF_RTPChannel *gf_rtp_new()
+{
+	return gf_rtp_new_ex(NULL);
+}
+
+GF_EXPORT
 void gf_rtp_del(GF_RTPChannel *ch)
 {
 	if (!ch) return;
@@ -93,7 +100,6 @@
 		ch->net_info.Profile = gf_strdup(trans_info->Profile);
 
 	if (!ch->net_info.IsUnicast && trans_info->destination) {
-		assert( trans_info->destination );
 		ch->net_info.source = gf_strdup(trans_info->destination);
 		if (ch->net_info.client_port_first) {
 			ch->net_info.port_first = ch->net_info.client_port_first;
@@ -231,7 +237,7 @@
 		//
 		//	RTP
 		//
-		ch->rtp = gf_sk_new(GF_SOCK_TYPE_UDP);
+		ch->rtp = gf_sk_new_ex(GF_SOCK_TYPE_UDP, ch->netcap_id);
 		if (!ch->rtp) return GF_IP_NETWORK_FAILURE;
 		if (ch->net_info.IsUnicast) {
 			//if client, bind and connect the socket
@@ -266,13 +272,13 @@
 		//create re-ordering queue for UDP only, and receive
 		if (ReorederingSize && !IsSource) {
 			if (!MaxReorderDelay) MaxReorderDelay = 200;
-			ch->po = gf_rtp_reorderer_new(ReorederingSize, MaxReorderDelay);
+			ch->po = gf_rtp_reorderer_new(ReorederingSize, MaxReorderDelay, ch->TimeScale);
 		}
 
 		//
 		//	RTCP
 		//
-		ch->rtcp = gf_sk_new(GF_SOCK_TYPE_UDP);
+		ch->rtcp = gf_sk_new_ex(GF_SOCK_TYPE_UDP, ch->netcap_id);
 		if (!ch->rtcp) return GF_IP_NETWORK_FAILURE;
 		if (ch->net_info.IsUnicast) {
 			if (!IsSource) {
@@ -371,7 +377,7 @@
 	if (!ch->po) return 0;
 
 	//pck queue may need to be flushed
-	pck = (char *) gf_rtp_reorderer_get(ch->po, &res, GF_TRUE);
+	pck = (char *) gf_rtp_reorderer_get(ch->po, &res, GF_TRUE, NULL);
 	if (pck) {
 		memcpy(buffer, pck, res);
 		gf_free(pck);
@@ -389,7 +395,7 @@
 	if (!ch || !ch->rtp || !ch->po) return 0;
 
 	//pck queue may need to be flushed
-	pck = (char *) gf_rtp_reorderer_get(ch->po, &res, GF_FALSE);
+	pck = (char *) gf_rtp_reorderer_get(ch->po, &res, GF_FALSE, NULL);
 	if (pck) {
 		memcpy(buffer, pck, res);
 		gf_free(pck);
@@ -413,7 +419,6 @@
 		e = gf_sk_receive(ch->rtp, buffer, buffer_size, &res);
 	}
 	if (!res || e || (res < 12)) {
-		assert(res==0);
 		res = 0;
 	}
 	if (res) {
@@ -422,6 +427,7 @@
 	}
 	//add the packet to our Queue if any
 	if (ch->po) {
+		Bool is_disc;
 		char *pck;
 		if (res) {
 			seq_num = ((((u32)buffer2) << 8) & 0xFF00) | (buffer3 & 0xFF);
@@ -429,11 +435,17 @@
 		}
 
 		//pck queue may need to be flushed
-		pck = (char *) gf_rtp_reorderer_get(ch->po, &res, GF_FALSE);
+		pck = (char *) gf_rtp_reorderer_get(ch->po, &res, GF_FALSE, &is_disc);
 		if (pck) {
 			memcpy(buffer, pck, res);
 			gf_free(pck);
 		}
+		if (is_disc && !ch->disc_state) {
+			ch->disc_state = 1;
+		} else if (ch->disc_state) {
+			ch->disc_state = 2;
+			ch->first_SR = 1;
+		}
 	}
 	/*monitor keep-alive period*/
 	if (ch->nat_keepalive_time_period && !ch->send_interleave) {
@@ -509,7 +521,7 @@
 	}
 	if (ch->first_SR && !ch->SenderSSRC && rtp_hdr->SSRC) {
 		ch->SenderSSRC = rtp_hdr->SSRC;
-		GF_LOG(GF_LOG_INFO, GF_LOG_RTP, ("RTP Assigning SSRC to %d because none was specified through SDP/RTSP\n", ch->SenderSSRC));
+		GF_LOG(GF_LOG_INFO, GF_LOG_RTP, ("RTP Assigning SSRC to %d for stream on port %u because none was specified through SDP/RTSP\n", ch->SenderSSRC, ch->net_info.client_port_first));
 	}
 
 	if (!ch->ntp_init && ch->SenderSSRC && (ch->SenderSSRC != rtp_hdr->SSRC) ) {
@@ -592,7 +604,7 @@
 	if (gf_log_tool_level_on(GF_LOG_RTP, GF_LOG_DEBUG))  {
 		ch->total_bytes += pck_size-12;
 
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_RTP, ("RTP\t%d\t%d\t%u\t%d\t%d\t%d\t%d\t%d\t%d\n",
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_RTP, ("RTP Packet\t%d\t%d\t%u\t%d\t%d\t%d\t%d\t%d\t%d\n",
 		                                  ch->SenderSSRC,
 		                                  rtp_hdr->SequenceNumber,
 		                                  rtp_hdr->TimeStamp,
@@ -779,7 +791,7 @@
 	p = NextAvailablePort;
 	if (ch->net_info.client_port_first) return GF_OK;
 
-	sock = gf_sk_new(GF_SOCK_TYPE_UDP);
+	sock = gf_sk_new_ex(GF_SOCK_TYPE_UDP, ch->netcap_id);
 	if (!sock) return GF_IO_ERR;
 
 	/*should be way enough (more than 100 rtp streams open on the machine)*/
@@ -867,7 +879,7 @@
 #define SN_CHECK_OFFSET		0x0A
 
 GF_EXPORT
-GF_RTPReorder *gf_rtp_reorderer_new(u32 MaxCount, u32 MaxDelay)
+GF_RTPReorder *gf_rtp_reorderer_new(u32 MaxCount, u32 MaxDelay, u32 timescale)
 {
 	GF_RTPReorder *tmp;
 
@@ -877,6 +889,7 @@
 	if (!tmp) return NULL;
 	tmp->MaxCount = MaxCount;
 	tmp->MaxDelay = MaxDelay;
+	tmp->TimeScale = timescale;
 	return tmp;
 }
 
@@ -948,12 +961,27 @@
 	if (po->in->pck_seq_num == pck_seqnum) goto discard;
 
 	if ( ( (u16) (pck_seqnum + bounds) <= (u16) (po->in->pck_seq_num + bounds) ) ) {
+		u8 *buffer = (u8*)pck;
+		u32 ts_pck = GF_4CC(buffer4, buffer5, buffer6, buffer7);
+		buffer = (u8*)po->in->pck;
+		u32 ts_in = GF_4CC(buffer4, buffer5, buffer6, buffer7);
+		s32 diff = ts_in;
+		diff-=ts_pck;
+		if (diff<0) diff=-diff;
+		if (po->TimeScale && ((u32) diff > 2*po->TimeScale)) {
+			cur = po->in;
+			while (cur->next) cur = cur->next;
+			cur->next = it;
+			po->Count += 1;
+			po->disc = it;
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_RTP, ("rtp Packet Reorderer: discontinuity detected last ts %u vs new %u\n", ts_in, ts_pck));
+		} else {
+			it->next = po->in;
+			po->in = it;
+			po->Count += 1;
 
-		it->next = po->in;
-		po->in = it;
-		po->Count += 1;
-
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_RTP, ("rtp Packet Reorderer: inserting packet %d at head\n", pck_seqnum));
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_RTP, ("rtp Packet Reorderer: inserting packet %d at head\n", pck_seqnum));
+		}
 		return GF_OK;
 	}
 
@@ -968,7 +996,9 @@
 		if (!cur->next) {
 			cur->next = it;
 			po->Count += 1;
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_RTP, ("rtp Packet Reorderer: Appending packet %d (last %d)\n", pck_seqnum, cur->pck_seq_num));
+			if (pck_seqnum != 1+cur->pck_seq_num) {
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_RTP, ("rtp Packet Reorderer: Appending packet %d (last %d)\n", pck_seqnum, cur->pck_seq_num));
+			}
 			return GF_OK;
 		}
 
@@ -1000,12 +1030,13 @@
 //ever received packet if its SeqNum was unknown
 //the BUFFER is yours, you must delete it
 GF_EXPORT
-void *gf_rtp_reorderer_get(GF_RTPReorder *po, u32 *pck_size, Bool force_flush)
+void *gf_rtp_reorderer_get(GF_RTPReorder *po, u32 *pck_size, Bool force_flush, Bool *is_disc)
 {
 	GF_POItem *t;
 	u32 bounds;
 	void *ret;
 
+	if (is_disc) *is_disc = GF_FALSE;
 	if (!po || !pck_size) return NULL;
 
 	*pck_size = 0;
@@ -1013,6 +1044,11 @@
 	//empty queue
 	if (!po->in) return NULL;
 
+	if (po->disc) {
+		gf_assert(po->in);
+		goto send_it;
+	}
+
 	//check we have received the first packet
 	if ( po->head_seqnum && po->MaxCount
 	        && (po->MaxCount > po->Count)
@@ -1056,13 +1092,19 @@
 
 
 send_it:
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_RTP, ("rtp Packet Reorderer: Fetching %d\n", po->in->pck_seq_num));
+	if (!po->in->next || (po->in->pck_seq_num+1 != po->in->next->pck_seq_num)) {
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_RTP, ("rtp Packet Reorderer: Fetching %d\n", po->in->pck_seq_num));
+	}
 	*pck_size = po->in->size;
 	t = po->in;
 	po->in = po->in->next;
 	//no other output. reset the head seqnum
 	po->head_seqnum = po->in ? po->in->pck_seq_num : 0;
 	po->Count -= 1;
+	if (po->in == po->disc) {
+		if (is_disc) *is_disc = GF_TRUE;
+		po->disc = NULL;
+	}
 	//release the item
 	ret = t->pck;
 	gf_free(t);
@@ -1078,6 +1120,13 @@
 	return GF_OK;
 }
 
-
+Bool gf_rtp_is_disc(GF_RTPChannel *ch)
+{
+	if (ch->disc_state == 2) {
+		ch->disc_state = 0;
+		return GF_TRUE;
+	}
+	return GF_FALSE;
+}
 #endif /*GPAC_DISABLE_STREAMING*/

gpac-2.2.1.tar.gz/src/ietf/rtp_depacketizer.c -> gpac-2.4.0.tar.gz/src/ietf/rtp_depacketizer.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2022
+ *			Copyright (c) Telecom ParisTech 2000-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / RTP input module
@@ -240,8 +240,6 @@
 		if (pay_start >= size) break;
 		num_au ++;
 	}
-//	assert(!au_hdr_size);
-
 	if (hdr->Marker)
 		rtp->flags |= GF_RTP_NEW_AU;
 	else
@@ -573,7 +571,7 @@
 			rtp->sl_hdr.au_duration = duration;
 			/*done*/
 			if (hdr->Marker) {
-				assert(gf_bs_get_position(rtp->inter_bs) < 1<<7);
+				gf_assert(gf_bs_get_position(rtp->inter_bs) < 1<<7);
 				rtp->txt_len = (u8) gf_bs_get_position(rtp->inter_bs);
 				gf_rtp_ttxt_flush(rtp, ts);
 			}
@@ -581,7 +579,7 @@
 			if (!rtp->inter_bs) rtp->inter_bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
 			/*first modifier, store effective written text*/
 			if (type==3) {
-				assert(gf_bs_get_position(rtp->inter_bs) < 1<<7);
+				gf_assert(gf_bs_get_position(rtp->inter_bs) < 1<<7);
 				rtp->txt_len = (u8) gf_bs_get_position(rtp->inter_bs);
 			}
 			if (ttu_len<6) break;
@@ -793,7 +791,7 @@
 }
 #endif
 
-#if !defined(GPAC_DISABLE_HEVC) && !defined(GPAC_DISABLE_AV_PARSERS)
+#if !defined(GPAC_DISABLE_AV_PARSERS)
 
 static void gf_rtp_parse_hevc(GF_RTPDepacketizer *rtp, GF_RTPHeader *hdr, u8 *payload, u32 size)
 {
@@ -1993,7 +1991,7 @@
 		return NULL;
 	}
 
-	assert(tmp->depacketize);
+	gf_assert(tmp->depacketize);
 	tmp->on_sl_packet = sl_packet_cbk;
 	tmp->udta = udta;
 	return tmp;
@@ -2028,7 +2026,7 @@
 GF_EXPORT
 void gf_rtp_depacketizer_process(GF_RTPDepacketizer *rtp, GF_RTPHeader *hdr, u8 *payload, u32 size)
 {
-	assert(rtp && rtp->depacketize);
+	gf_assert(rtp && rtp->depacketize);
 	rtp->sl_hdr.sender_ntp = hdr->recomputed_ntp_ts;
 	rtp->depacketize(rtp, hdr, payload, size);
 }

gpac-2.2.1.tar.gz/src/ietf/rtp_pck_3gpp.c -> gpac-2.4.0.tar.gz/src/ietf/rtp_pck_3gpp.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2012
+ *			Copyright (c) Telecom ParisTech 2000-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / IETF RTP/RTSP/SDP sub-project
@@ -80,7 +80,7 @@
 			builder->rtp_header.Marker = 0;	/*never set*/
 			builder->rtp_header.SequenceNumber += 1;
 			builder->OnNewPacket(builder->cbk_obj, &builder->rtp_header);
-			assert(builder->pck_hdr==NULL);
+			gf_assert(builder->pck_hdr==NULL);
 
 			/*always have header and TOC*/
 			builder->pck_hdr = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
@@ -112,7 +112,7 @@
 		builder->bytesInPacket += size;
 		offset += size;
 		rtp_ts += block_size;
-		assert(builder->bytesInPacket<=builder->Path_MTU);
+		gf_assert(builder->bytesInPacket<=builder->Path_MTU);
 		/*take care of aggregation, flush if needed*/
 		if (builder->last_au_sn==builder->auh_size) rtp_amr_flush(builder);
 	}
@@ -177,7 +177,7 @@
 		builder->bytesInPacket += size;
 		offset += size;
 		rtp_ts += 160;
-		assert(builder->bytesInPacket<=builder->Path_MTU);
+		gf_assert(builder->bytesInPacket<=builder->Path_MTU);
 
 		/*take care of aggregation, flush if needed*/
 		builder->last_au_sn++;
@@ -243,7 +243,7 @@
 			builder->rtp_header.Marker = 0;	/*never set*/
 			builder->rtp_header.SequenceNumber += 1;
 			builder->OnNewPacket(builder->cbk_obj, &builder->rtp_header);
-			assert(builder->pck_hdr==NULL);
+			gf_assert(builder->pck_hdr==NULL);
 
 			if (builder->auh_size>1) {
 				builder->pck_hdr = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
@@ -274,7 +274,7 @@
 		builder->bytesInPacket += size;
 		offset += size;
 		rtp_ts += 160;
-		assert(builder->bytesInPacket<=builder->Path_MTU);
+		gf_assert(builder->bytesInPacket<=builder->Path_MTU);
 		/*take care of aggregation, flush if needed*/
 		if (builder->last_au_sn==builder->auh_size) rtp_evrc_smv_flush(builder);
 	}
@@ -696,7 +696,7 @@
 				builder->bytesInPacket += size;
 			}
 			du_offset += size+size_offset;
-			assert(du_size>= size+size_offset);
+			gf_assert(du_size>= size+size_offset);
 			du_size -= size+size_offset;
 		}
 		offset += orig_size;
@@ -777,7 +777,7 @@
 	}
 
 	/*need fragmentation*/
-	assert(!builder->bytesInPacket);
+	gf_assert(!builder->bytesInPacket);
 	offset = 0;
 	nb_pck = data_size / (builder->Path_MTU-2);
 	if (data_size % (builder->Path_MTU-2)) nb_pck++;

gpac-2.2.1.tar.gz/src/ietf/rtp_pck_mpeg4.c -> gpac-2.4.0.tar.gz/src/ietf/rtp_pck_mpeg4.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2012
+ *			Copyright (c) Telecom ParisTech 2000-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / IETF RTP/RTSP/SDP sub-project
@@ -487,8 +487,8 @@
 	/*fragmentation unit*/
 	else {
 		u32 offset;
-		assert(nalu_size>=builder->Path_MTU);
-		assert(!builder->bytesInPacket);
+		gf_assert(nalu_size>=builder->Path_MTU);
+		gf_assert(!builder->bytesInPacket);
 		/*FU payload doesn't have the NAL hdr*/
 		bytesLeft = nalu_size - 1;
 		offset = 1;
@@ -635,8 +635,8 @@
 		char payload_hdr2;
 		char shdr;
 
-		assert(nalu_size + 4 >=builder->Path_MTU);
-		assert(!builder->bytesInPacket);
+		gf_assert(nalu_size + 4 >=builder->Path_MTU);
+		gf_assert(!builder->bytesInPacket);
 
 		/*FU payload doesn't have the NAL hdr (2 bytes*/
 		bytesLeft = nalu_size - 2;
@@ -789,8 +789,8 @@
 		u8 payload_hdr2;
 		u8 shdr;
 
-		assert(nalu_size + 4 >=builder->Path_MTU);
-		assert(!builder->bytesInPacket);
+		gf_assert(nalu_size + 4 >=builder->Path_MTU);
+		gf_assert(!builder->bytesInPacket);
 
 		/*FU payload doesn't have the NAL hdr (2 bytes*/
 		bytesLeft = nalu_size - 2;
@@ -889,7 +889,7 @@
 		latm_hdr_size = (data_size / 255) + 1;
 		/*fragmenting*/
 		if (latm_hdr_size + data_size > builder->Path_MTU) {
-			assert(!builder->bytesInPacket);
+			gf_assert(!builder->bytesInPacket);
 			fragmented = GF_TRUE;
 			latm_hdr_size = (builder->Path_MTU / 255) + 1;
 			size = builder->Path_MTU - latm_hdr_size;

gpac-2.2.1.tar.gz/src/ietf/rtp_streamer.c -> gpac-2.4.0.tar.gz/src/ietf/rtp_streamer.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2022
+ *			Copyright (c) Telecom ParisTech 2000-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / IETF RTP/RTSP/SDP sub-project
@@ -32,7 +32,7 @@
 #endif
 #include <gpac/internal/ietf_dev.h>
 
-#if !defined(GPAC_DISABLE_STREAMING) && !defined(GPAC_DISABLE_ISOM)
+#if !defined(GPAC_DISABLE_STREAMING)
 
 /*for ISOBMFF subtypes*/
 #include <gpac/isomedia.h>
@@ -50,6 +50,7 @@
 	u32 in_timescale;
 	char rtcp_bufRTCP_BUF_SIZE;
 
+	const char *netcap_id;
 	GF_Err last_err;
 };
 
@@ -100,12 +101,12 @@
 }
 
 
-GF_Err gf_rtp_streamer_init_rtsp(GF_RTPStreamer *rtp, u32 path_mtu, GF_RTSPTransport  *tr, const char *ifce_addr)
+GF_Err gf_rtp_streamer_init_rtsp(GF_RTPStreamer *rtp, u32 path_mtu, GF_RTSPTransport *tr, const char *ifce_addr)
 {
 	GF_Err res;
 
 	if (!rtp->channel) {
-		rtp->channel = gf_rtp_new();
+		rtp->channel = gf_rtp_new_ex(rtp->netcap_id);
 		if (!rtp->channel) return GF_OUT_OF_MEM;
 		rtp->channel->TimeScale = rtp->packetizer->sl_config.timestampResolution;
 	}
@@ -122,12 +123,12 @@
 	}
 	return GF_OK;
 }
-static GF_Err rtp_stream_init_channel(GF_RTPStreamer *rtp, u32 path_mtu, const char * dest, int port, int ttl, const char *ifce_addr)
+static GF_Err rtp_stream_init_channel(GF_RTPStreamer *rtp, u32 path_mtu, const char * dest, int port, int ttl, const char *ifce_addr, const char *netcap_id)
 {
 	GF_RTSPTransport tr;
 	GF_Err res;
 
-	rtp->channel = gf_rtp_new();
+	rtp->channel = gf_rtp_new_ex(netcap_id);
 	if (!rtp->channel) return GF_OUT_OF_MEM;
 	rtp->channel->TimeScale = rtp->packetizer->sl_config.timestampResolution;
 
@@ -167,13 +168,7 @@
 }
 
 GF_EXPORT
-GF_RTPStreamer *gf_rtp_streamer_new(u32 streamType, u32 codecid, u32 timeScale,
-        const char *ip_dest, u16 port, u32 MTU, u8 TTL, const char *ifce_addr,
-        u32 flags, const u8 *dsi, u32 dsi_len,
-        u32 PayloadType, u32 sample_rate, u32 nb_ch,
-        Bool is_crypted, u32 IV_length, u32 KI_length,
-        u32 MinSize, u32 MaxSize, u32 avgTS, u32 maxDTSDelta, u32 const_dur, u32 bandwidth, u32 max_ptime,
-        u32 au_sn_len, Bool for_rtsp)
+GF_RTPStreamer *gf_rtp_streamer_new_ex(const GF_RTPStreamerConfig *cfg, Bool for_rtsp)
 {
 	GF_SLConfig slc;
 	GF_RTPStreamer *stream;
@@ -184,7 +179,13 @@
 	Bool has_mpeg4_mapping;
 	GF_Err e;
 
-	if (!timeScale) timeScale = 1000;
+	u32 timeScale = cfg->timeScale ? cfg->timeScale : 1000;
+	u32 flags = cfg->flags;
+	u32 streamType = cfg->streamType;
+	u32 codecid = cfg->codecid;
+	u32 PayloadType = cfg->PayloadType;
+	u32 maxDTSDelta = cfg->maxDTSDelta;
+	u32 max_ptime = cfg->max_ptime;
 
 	GF_SAFEALLOC(stream, GF_RTPStreamer);
 	if (!stream) return NULL;
@@ -203,28 +204,28 @@
 	default_rtp_rate = 90000;
 
 	/*timed-text is a bit special, we support multiple stream descriptions & co*/
-	switch (streamType) {
+	switch (cfg->streamType) {
 	case GF_STREAM_AUDIO:
-		required_rate = sample_rate;
+		required_rate = cfg->sample_rate;
 		break;
 	case GF_STREAM_VISUAL:
 		rtp_type = GF_RTP_PAYT_MPEG4;
 		required_rate = default_rtp_rate;
-		if (is_crypted) {
+		if (cfg->is_crypted) {
 			/*that's another pain with ISMACryp, even if no B-frames the DTS is signaled...*/
-			if (codecid==GF_CODECID_MPEG4_PART2) force_dts_delta = 22;
+			if (cfg->codecid==GF_CODECID_MPEG4_PART2) force_dts_delta = 22;
 			flags |= GP_RTP_PCK_SIGNAL_RAP | GP_RTP_PCK_SIGNAL_TS;
 		}
 		break;
 	case GF_STREAM_SCENE:
 	case GF_STREAM_OD:
-		if (codecid == GF_CODECID_DIMS) {
+		if (cfg->codecid == GF_CODECID_DIMS) {
 #if GPAC_ENABLE_3GPP_DIMS_RTP
 			rtp_type = GF_RTP_PAYT_3GPP_DIMS;
 			has_mpeg4_mapping = GF_FALSE;
 #else
-			gf_free(stream);
-			GF_LOG(GF_LOG_ERROR, GF_LOG_RTP, ("RTP Packetizer 3GPP DIMS over RTP disabled in build\n", streamType));
+			gf_rtp_streamer_del(stream);
+			GF_LOG(GF_LOG_ERROR, GF_LOG_RTP, ("RTP Packetizer 3GPP DIMS over RTP disabled in build\n", cfg->streamType));
 			return NULL;
 #endif
 		} else {
@@ -233,7 +234,7 @@
 		break;
 	}
 
-	switch (codecid) {
+	switch (cfg->codecid) {
 	/*AAC*/
 	case GF_CODECID_AAC_MPEG4:
 	case GF_CODECID_AAC_MPEG2_MP:
@@ -242,12 +243,12 @@
 		PL_ID = 0x01;
 		mpeg4mode = "AAC";
 		rtp_type = GF_RTP_PAYT_MPEG4;
-		required_rate = sample_rate;
+		required_rate = cfg->sample_rate;
 
 #ifndef GPAC_DISABLE_AV_PARSERS
-		if (dsi) {
+		if (cfg->dsi) {
 			GF_M4ADecSpecInfo a_cfg;
-			gf_m4a_get_config((u8 *)dsi, dsi_len, &a_cfg);
+			gf_m4a_get_config((u8 *)cfg->dsi, cfg->dsi_len, &a_cfg);
 			//nb_ch = a_cfg.nb_chan;
 			//sample_rate = a_cfg.base_sr;
 			PL_ID = a_cfg.audioPL;
@@ -280,7 +281,7 @@
 	case GF_CODECID_MPEG2_PART3:
 	case GF_CODECID_MPEG_AUDIO:
 	case GF_CODECID_MPEG_AUDIO_L1:
-		if (!is_crypted) {
+		if (!cfg->is_crypted) {
 			rtp_type = GF_RTP_PAYT_MPEG12_AUDIO;
 			/*use official RTP/AVP payload type*/
 			OfficialPayloadType = 14;
@@ -296,9 +297,9 @@
 	case GF_CODECID_MPEG4_PART2:
 		PL_ID = 1;
 #ifndef GPAC_DISABLE_AV_PARSERS
-		if (dsi) {
+		if (cfg->dsi) {
 			GF_M4VDecSpecInfo vhdr;
-			gf_m4v_get_config((u8 *)dsi, dsi_len, &vhdr);
+			gf_m4v_get_config((u8 *)cfg->dsi, cfg->dsi_len, &vhdr);
 			PL_ID = vhdr.VideoPL;
 		}
 #endif
@@ -312,7 +313,7 @@
 	case GF_CODECID_MPEG2_SPATIAL:
 	case GF_CODECID_MPEG2_HIGH:
 	case GF_CODECID_MPEG2_422:
-		if (!is_crypted) {
+		if (!cfg->is_crypted) {
 			rtp_type = GF_RTP_PAYT_MPEG12_VIDEO;
 			OfficialPayloadType = 32;
 		}
@@ -421,6 +422,7 @@
 	default:
 		if (!rtp_type) {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_RTP, ("RTP Packetizer Unsupported stream type %x\n", streamType));
+			gf_rtp_streamer_del(stream);
 			return NULL;
 		}
 		break;
@@ -442,8 +444,8 @@
 
 	/*update flags in MultiSL*/
 	if (flags & GP_RTP_PCK_USE_MULTI) {
-		if (MinSize != MaxSize) flags |= GP_RTP_PCK_SIGNAL_SIZE;
-		if (!const_dur) flags |= GP_RTP_PCK_SIGNAL_TS;
+		if (cfg->MinSize != cfg->MaxSize) flags |= GP_RTP_PCK_SIGNAL_SIZE;
+		if (!cfg->const_dur) flags |= GP_RTP_PCK_SIGNAL_TS;
 	}
 
 	/*default SL for RTP */
@@ -463,8 +465,8 @@
 	/*switch to RTP TS*/
 	max_ptime = (u32) (max_ptime * slc.timestampResolution / 1000);
 
-	slc.AUSeqNumLength = au_sn_len;
-	slc.CUDuration = const_dur;
+	slc.AUSeqNumLength = cfg->au_sn_len;
+	slc.CUDuration = cfg->const_dur;
 
 	if (flags & GP_RTP_PCK_SIGNAL_RAP) {
 		slc.useRandomAccessPointFlag = 1;
@@ -480,33 +482,77 @@
 
 	if (!stream->packetizer) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_RTP, ("RTP Packetizer Failed to create packetizer\n"));
-		gf_free(stream);
+		gf_rtp_streamer_del(stream);
 		return NULL;
 	}
 
-	gf_rtp_builder_init(stream->packetizer, (u8) PayloadType, MTU, max_ptime,
-	                    streamType, codecid, PL_ID, MinSize, MaxSize, avgTS, maxDTSDelta, IV_length, KI_length, mpeg4mode);
+	gf_rtp_builder_init(stream->packetizer, (u8) PayloadType, cfg->MTU, max_ptime,
+	                    streamType, codecid, PL_ID, cfg->MinSize, cfg->MaxSize, cfg->avgTS, maxDTSDelta, cfg->IV_length, cfg->KI_length, mpeg4mode);
 
 
 	if (force_dts_delta) stream->packetizer->slMap.DTSDeltaLength = force_dts_delta;
 
 	if (!for_rtsp) {
-		e = rtp_stream_init_channel(stream, MTU + 12, ip_dest, port, TTL, ifce_addr);
+		e = rtp_stream_init_channel(stream, cfg->MTU + 12, cfg->ip_dest, cfg->port, cfg->TTL, cfg->ifce_addr, cfg->netcap_id);
 		if (e) {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_RTP, ("RTP Packetizer Failed to create RTP channel - error %s\n", gf_error_to_string(e) ));
-			gf_free(stream);
+			gf_rtp_streamer_del(stream);
 			return NULL;
 		}
 	}
 
 	stream->in_timescale = timeScale;
+	stream->netcap_id = cfg->netcap_id;
 
-	stream->buffer_alloc = MTU+12;
+	stream->buffer_alloc = cfg->MTU+12;
 	stream->buffer = (char*)gf_malloc(sizeof(char) * stream->buffer_alloc);
 
 	return stream;
 }
 
+GF_EXPORT
+GF_RTPStreamer *gf_rtp_streamer_new(u32 streamType, u32 codecid, u32 timeScale,
+        const char *ip_dest, u16 port, u32 MTU, u8 TTL, const char *ifce_addr,
+        u32 flags, const u8 *dsi, u32 dsi_len,
+        u32 PayloadType, u32 sample_rate, u32 nb_ch,
+        Bool is_crypted, u32 IV_length, u32 KI_length,
+        u32 MinSize, u32 MaxSize, u32 avgTS, u32 maxDTSDelta, u32 const_dur, u32 bandwidth, u32 max_ptime,
+        u32 au_sn_len, Bool for_rtsp)
+{
+	GF_RTPStreamerConfig cfg;
+	memset(&cfg, 0, sizeof(GF_RTPStreamerConfig));
+#define RTCFG_SET(_t) cfg._t = _t
+
+	RTCFG_SET(streamType);
+	RTCFG_SET(codecid);
+	RTCFG_SET(timeScale);
+	RTCFG_SET(ip_dest);
+	RTCFG_SET(port);
+	RTCFG_SET(MTU);
+	RTCFG_SET(TTL);
+	RTCFG_SET(ifce_addr);
+	RTCFG_SET(flags);
+	RTCFG_SET(dsi);
+	RTCFG_SET(dsi_len);
+	RTCFG_SET(PayloadType);
+	RTCFG_SET(sample_rate);
+	RTCFG_SET(nb_ch);
+	RTCFG_SET(is_crypted);
+	RTCFG_SET(IV_length);
+	RTCFG_SET(KI_length);
+	RTCFG_SET(MinSize);
+	RTCFG_SET(MaxSize);
+	RTCFG_SET(avgTS);
+	RTCFG_SET(maxDTSDelta);
+	RTCFG_SET(const_dur);
+	RTCFG_SET(bandwidth);
+	RTCFG_SET(max_ptime);
+	RTCFG_SET(au_sn_len);
+#undef RTCFG_SET
+
+	return gf_rtp_streamer_new_ex(&cfg, for_rtsp);
+}
+
 
 GF_EXPORT
 void gf_rtp_streamer_del(GF_RTPStreamer *streamer)
@@ -591,11 +637,13 @@
 	if ((rtp->packetizer->rtp_payt == GF_RTP_PAYT_AMR) || (rtp->packetizer->rtp_payt == GF_RTP_PAYT_AMR_WB)) {
 		sprintf(sdpLine, "a=fmtp:%d octet-align=1\n", rtp->packetizer->PayloadType);
 	}
+#if !defined(GPAC_DISABLE_ISOM) && !defined(GPAC_DISABLE_STREAMING)
 	/*Text*/
 	else if (rtp->packetizer->rtp_payt == GF_RTP_PAYT_3GPP_TEXT) {
 		gf_media_format_ttxt_sdp(rtp->packetizer, payloadName, sdpLine, tw, th, tx, ty, tl, width, height, (u8 *)dsi_enh);
 		strcat(sdpLine, "\n");
 	}
+#endif
 	/*EVRC/SMV in non header-free mode*/
 	else if ((rtp->packetizer->rtp_payt == GF_RTP_PAYT_EVRC_SMV) && (rtp->packetizer->auh_size>1)) {
 		sprintf(sdpLine, "a=fmtp:%d maxptime=%d\n", rtp->packetizer->PayloadType, rtp->packetizer->auh_size*20);

gpac-2.2.1.tar.gz/src/ietf/rtsp_response.c -> gpac-2.4.0.tar.gz/src/ietf/rtsp_response.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2022
+ *			Copyright (c) Telecom ParisTech 2000-2024
  *					All rights reserved
  *
  *  This file is part of GPAC / IETF RTP/RTSP/SDP sub-project
@@ -194,7 +194,7 @@
 void gf_rtsp_set_response_value(GF_RTSPResponse *rsp, char *Header, char *Value)
 {
 	char LineBuffer400, buf1000, param_name100, param_val1000;
-	s32 LinePos, Pos, nPos, s_val;
+	s32 LinePos, Pos, nPos;
 	GF_RTPInfo *info;
 	GF_RTSPTransport *trans;
 	GF_X_Attribute *x_Att;
@@ -288,12 +288,10 @@
 				if (!stricmp(param_name, "url")) info->url = gf_strdup(param_val);
 				else if (!stricmp(param_name, "seq")) sscanf(param_val, "%u", &info->seq);
 				else if (!stricmp(param_name, "rtptime")) {
-					sscanf(param_val, "%i", &s_val);
-					info->rtp_time = (s_val>0) ? s_val : 0;
+					sscanf(param_val, "%u", &info->rtp_time);
 				}
 				else if (!stricmp(param_name, "ssrc")) {
-					sscanf(param_val, "%i", &s_val);
-					info->ssrc = (s_val>0) ? s_val : 0;
+					sscanf(param_val, "%u", &info->ssrc);
 				}
 			}
 			gf_list_add(rsp->RTP_Infos, info);

gpac-2.2.1.tar.gz/src/ietf/rtsp_session.c -> gpac-2.4.0.tar.gz/src/ietf/rtsp_session.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2022
+ *			Copyright (c) Telecom ParisTech 2000-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / IETF RTP/RTSP/SDP sub-project
@@ -72,6 +72,7 @@
 	//extract the schema
 	i = 0;
 	while (i<=strlen(sURL)) {
+		if (i==10) return GF_BAD_PARAM;
 		if (sURLi == ':') goto found;
 		schemai = sURLi;
 		i += 1;
@@ -112,7 +113,7 @@
 	if (retest && strstr(retest, "/")) {
 		retest += 1;
 		i=0;
-		while (i<strlen(retest)) {
+		while (i<strlen(retest) && i<1023) {
 			if (retesti == '/') break;
 			texti = retesti;
 			i += 1;
@@ -147,11 +148,12 @@
 		if (testi=='') is_ipv6 = GF_TRUE;
 		else if (testi=='') is_ipv6 = GF_FALSE;
 		if ( (testi == '/') || (!is_ipv6 && (testi == ':')) ) break;
+		if (i>=GF_ARRAY_LENGTH(text)) break;
 		texti = testi;
 		i += 1;
 	}
-	texti = 0;
-	strncpy(Server, text, 1023);
+	textMIN(i, GF_ARRAY_LENGTH(text)-1) = 0;
+	strncpy(Server, text, 1024);
 	Server1023=0;
 	if (sep) sep0 = '?';
 
@@ -219,6 +221,11 @@
 	return sess;
 }
 
+GF_EXPORT
+void gf_rtsp_session_set_netcap_id(GF_RTSPSession *sess, const char *netcap_id)
+{
+	if (sess) sess->netcap_id = netcap_id;
+}
 
 GF_EXPORT
 void gf_rtsp_reset_aggregation(GF_RTSPSession *sess)
@@ -417,7 +424,7 @@
 
 	//socket is destroyed, recreate
 	if (!sess->connection) {
-		sess->connection = gf_sk_new(sess->ConnectionType);
+		sess->connection = gf_sk_new_ex(sess->ConnectionType, sess->netcap_id);
 		if (!sess->connection) return GF_OUT_OF_MEM;
 
 		//work in non-blocking mode
@@ -464,7 +471,8 @@
 			if (ret==SSL_ERROR_SSL) {
 				char msg1024;
 				SSL_load_error_strings();
-				ERR_error_string_n(ERR_get_error(), msg, sizeof(msg));
+				ERR_error_string_n(ERR_get_error(), msg, 1023);
+				msg1023=0;
 				GF_LOG(GF_LOG_ERROR, GF_LOG_HTTP, ("SSL Cannot connect, error %s\n", msg));
 				return GF_IP_CONNECTION_FAILURE;
 			} else if ((ret==SSL_ERROR_WANT_READ) || (ret==SSL_ERROR_WANT_WRITE)) {
@@ -572,7 +580,7 @@
 				sess->RTSP_SignalData(sess, ch->ch_ptr, buffer+4, paySize, IsRTCP);
 			}
 			sess->CurrentPos += paySize+4;
-			assert(sess->CurrentPos <= sess->CurrentSize);
+			gf_fatal_assert(sess->CurrentPos <= sess->CurrentSize);
 		} else {
 			/*missed end of pck ?*/
 			if (sess->payloadSize) {
@@ -592,7 +600,7 @@
 			}
 			memcpy(sess->rtsp_pck_buf, buffer+4, Size-4);
 			sess->CurrentPos += Size;
-			assert(sess->CurrentPos <= sess->CurrentSize);
+			gf_fatal_assert(sess->CurrentPos <= sess->CurrentSize);
 		}
 	}
 	/*end of packet*/
@@ -612,7 +620,7 @@
 		sess->pck_start = 0;
 		sess->InterID = (u8) -1;
 		sess->CurrentPos += res;
-		assert(sess->CurrentPos <= sess->CurrentSize);
+		gf_fatal_assert(sess->CurrentPos <= sess->CurrentSize);
 	}
 	/*middle of packet*/
 	else {
@@ -620,7 +628,7 @@
 		memcpy(sess->rtsp_pck_buf + sess->pck_start, buffer, Size);
 		sess->pck_start += Size;
 		sess->CurrentPos += Size;
-		assert(sess->CurrentPos <= sess->CurrentSize);
+		gf_fatal_assert(sess->CurrentPos <= sess->CurrentSize);
 	}
 	return GF_OK;
 }
@@ -732,7 +740,8 @@
 				if (err==SSL_ERROR_SSL) {
 					char msg1024;
 					SSL_load_error_strings();
-					ERR_error_string_n(ERR_get_error(), msg, sizeof(msg));
+					ERR_error_string_n(ERR_get_error(), msg, 1023);
+					msg1023=0;
 					GF_LOG(GF_LOG_ERROR, GF_LOG_HTTP, ("SSL Cannot send, error %s\n", msg));
 				}
 				return GF_IP_NETWORK_FAILURE;
@@ -806,7 +815,7 @@
 				e = GF_IP_CONNECTION_FAILURE;
 			return e;
 		}
-		assert(size);
+		gf_assert(size);
 		sess->tunnel_state = 2;
 		GF_LOG(GF_LOG_INFO, GF_LOG_RTP, ("RTSPTunnel Got reply %s", buffer));
 
@@ -817,8 +826,8 @@
 		}
 
 		//	3. send "POST /sample.mov HTTP/1.0\r\n ..."
-		sess->http = gf_sk_new(GF_SOCK_TYPE_TCP);
-		if (!sess->http ) {
+		sess->http = gf_sk_new_ex(GF_SOCK_TYPE_TCP, sess->netcap_id);
+		if (!sess->http) {
 			sess->tunnel_state = 0;
 			return GF_IP_NETWORK_FAILURE;
 		}
@@ -856,7 +865,8 @@
 			if (ret==SSL_ERROR_SSL) {
 				char msg1024;
 				SSL_load_error_strings();
-				ERR_error_string_n(ERR_get_error(), msg, sizeof(msg));
+				ERR_error_string_n(ERR_get_error(), msg, 1023);
+				msg1023=0;
 				GF_LOG(GF_LOG_ERROR, GF_LOG_HTTP, ("SSL Cannot connect, error %s\n", msg));
 				return GF_IP_CONNECTION_FAILURE;
 			} else if ((ret==SSL_ERROR_WANT_READ) || (ret==SSL_ERROR_WANT_WRITE)) {
@@ -948,7 +958,7 @@
 	//OK create a new session
 	GF_SAFEALLOC(sess, GF_RTSPSession);
 	if (!sess) return NULL;
-	
+
 	sess->connection = new_conn;
 	sess->Port = port;
 	sess->ConnectionType = fam;
@@ -1023,7 +1033,8 @@
 GF_Err gf_rtsp_get_session_ip(GF_RTSPSession *sess, char bufferGF_MAX_IP_NAME_LEN)
 {
 	if (!sess || !sess->connection) return GF_BAD_PARAM;
-	gf_sk_get_local_ip(sess->connection, buffer);
+	if (gf_sk_get_local_ip(sess->connection, buffer) != GF_OK)
+		strcpy(buffer, "127.0.0.1");
 	return GF_OK;
 }

gpac-2.2.1.tar.gz/src/ietf/sdp.c -> gpac-2.4.0.tar.gz/src/ietf/sdp.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2021
+ *			Copyright (c) Telecom ParisTech 2000-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / IETF RTP/RTSP/SDP sub-project
@@ -83,18 +83,21 @@
 	if (!strcmp(comp, "cat")) {
 		if (media) return;
 		/*pos = */gf_token_get(buffer, pos, ":\t\r\n", comp, 3000);
+		if (sdp->a_cat) return;
 		sdp->a_cat = gf_strdup(comp);
 		return;
 	}
 	if (!strcmp(comp, "keywds")) {
 		if (media) return;
 		/*pos = */gf_token_get(buffer, pos, ":\t\r\n", comp, 3000);
+		if (sdp->a_keywds) return;
 		sdp->a_keywds = gf_strdup(comp);
 		return;
 	}
 	if (!strcmp(comp, "tool")) {
 		if (media) return;
 		/*pos = */gf_token_get(buffer, pos, ":\r\n", comp, 3000);
+		if (sdp->a_tool) return;
 		sdp->a_tool = gf_strdup(comp);
 		return;
 	}
@@ -132,26 +135,31 @@
 	if (!strcmp(comp, "orient")) {
 		if (!media || media->Type) return;
 		/*pos = */gf_token_get(buffer, pos, ":\r\n", comp, 3000);
+		if (media->orientation) return;
 		media->orientation = gf_strdup(comp);
 		return;
 	}
 	if (!strcmp(comp, "type")) {
 		if (media) return;
 		/*pos = */gf_token_get(buffer, pos, ":\r\n", comp, 3000);
+		if (sdp->a_type) return;
 		sdp->a_type = gf_strdup(comp);
 		return;
 	}
 	if (!strcmp(comp, "charset")) {
 		if (media) return;
 		/*pos = */gf_token_get(buffer, pos, ":\r\n", comp, 3000);
+		if (sdp->a_charset)
 		sdp->a_charset = gf_strdup(comp);
 		return;
 	}
 	if (!strcmp(comp, "sdplang")) {
 		/*pos = */gf_token_get(buffer, pos, ":\r\n", comp, 3000);
 		if (media) {
+			if (media->sdplang) return;
 			media->sdplang = gf_strdup(comp);
 		} else {
+			if (sdp->a_sdplang) return;
 			sdp->a_sdplang = gf_strdup(comp);
 		}
 		return;
@@ -159,8 +167,10 @@
 	if (!strcmp(comp, "lang")) {
 		/*pos = */gf_token_get(buffer, pos, ":\r\n", comp, 3000);
 		if (media) {
+			if (media->lang) return;
 			media->lang = gf_strdup(comp);
 		} else {
+			if (sdp->a_lang) return;
 			sdp->a_lang = gf_strdup(comp);
 		}
 		return;
@@ -226,8 +236,12 @@
 	att = (GF_X_Attribute*)gf_malloc(sizeof(GF_X_Attribute));
 	att->Name = gf_strdup(comp);
 	att->Value = NULL;
-	pos += 1;
-	if (bufferpos == ' ') pos += 1;
+
+	if (pos+1 < (s32)strlen(buffer)) {
+		pos += 1;
+		if (bufferpos == ' ') pos += 1;
+	}
+
 	pos = gf_token_get(buffer, pos, "\r\n", comp, 3000);
 	if (pos > 0) att->Value = gf_strdup(comp);
 
@@ -443,20 +457,26 @@
 	memset(num, 0, 30);
 	test = strstr(buf, "d");
 	if (test) {
-		assert(strlen(buf)-strlen(test) < sizeof(num));
-		memcpy(num, buf, MIN(sizeof(num)-1, strlen(buf)-strlen(test)));
+		if (strlen(buf)-strlen(test) < sizeof(num))
+			memcpy(num, buf, MIN(sizeof(num)-1, strlen(buf)-strlen(test)));
+		else
+			gf_assert(0);
 		return (atoi(num)*sign*86400);
 	}
 	test = strstr(buf, "h");
 	if (test) {
-		assert(strlen(buf)-strlen(test) < sizeof(num));
-		memcpy(num, buf, MIN(sizeof(num)-1, strlen(buf)-strlen(test)));
+		if (strlen(buf)-strlen(test) < sizeof(num))
+			memcpy(num, buf, MIN(sizeof(num)-1, strlen(buf)-strlen(test)));
+		else
+			gf_assert(0);
 		return (atoi(num)*sign*3600);
 	}
 	test = strstr(buf, "m");
 	if (test) {
-		assert(strlen(buf)-strlen(test) < sizeof(num));
-		memcpy(num, buf, MIN(sizeof(num)-1, strlen(buf)-strlen(test)));
+		if (strlen(buf)-strlen(test) < sizeof(num))
+			memcpy(num, buf, MIN(sizeof(num)-1, strlen(buf)-strlen(test)));
+		else
+			gf_assert(0);
 		return (atoi(num)*sign*60);
 	}
 	return (atoi(buf) * sign);
@@ -494,13 +514,15 @@
 		if (LinePos <= 0) break;
 		if (!strcmp(LineBuf, "\r\n") || !strcmp(LineBuf, "\n") || !strcmp(LineBuf, "\r")) continue;
 
-
+		pos=0;
 		switch (LineBuf0) {
 		case 'v':
 			/*pos = */gf_token_get(LineBuf, 2, "\t\r\n", comp, 3000);
 			sdp->Version = atoi(comp);
 			break;
 		case 'o':
+			//only use first one
+			if (sdp->o_username) break;
 			pos = gf_token_get(LineBuf, 2, " \t\r\n", comp, 3000);
 			sdp->o_username = gf_strdup(comp);
 			pos = gf_token_get(LineBuf, pos, " \t\r\n", comp, 3000);
@@ -518,22 +540,27 @@
 			sdp->o_address = gf_strdup(comp);
 			break;
 		case 's':
+			if (sdp->s_session_name) break;
 			/*pos = */gf_token_get(LineBuf, 2, "\t\r\n", comp, 3000);
 			sdp->s_session_name = gf_strdup(comp);
 			break;
 		case 'i':
+			if (sdp->i_description) break;
 			/*pos = */gf_token_get(LineBuf, 2, "\t\r\n", comp, 3000);
 			sdp->i_description = gf_strdup(comp);
 			break;
 		case 'u':
+			if (sdp->u_uri) break;
 			/*pos = */gf_token_get(LineBuf, 2, "\t\r\n", comp, 3000);
 			sdp->u_uri = gf_strdup(comp);
 			break;
 		case 'e':
+			if (sdp->e_email) break;
 			/*pos = */gf_token_get(LineBuf, 2, "\t\r\n", comp, 3000);
 			sdp->e_email = gf_strdup(comp);
 			break;
 		case 'p':
+			if (sdp->p_phone) break;
 			/*pos = */gf_token_get(LineBuf, 2, "\t\r\n", comp, 3000);
 			sdp->p_phone = gf_strdup(comp);
 			break;
@@ -608,11 +635,11 @@
 			pos = gf_token_get(LineBuf, pos, " \t\r\n", comp, 3000);
 			timing->ActiveDuration = SDP_MakeSeconds(comp);
 			while (pos>=0) {
+				if (timing->NbRepeatOffsets == GF_SDP_MAX_TIMEOFFSET) break;
 				pos = gf_token_get(LineBuf, pos, " \t\r\n", comp, 3000);
 				if (pos <= 0) break;
 				timing->OffsetFromStarttiming->NbRepeatOffsets = SDP_MakeSeconds(comp);
 				timing->NbRepeatOffsets += 1;
-				if (timing->NbRepeatOffsets == GF_SDP_MAX_TIMEOFFSET) break;
 			}
 			break;
 		case 'z':
@@ -622,14 +649,15 @@
 			while (1) {
 				pos = gf_token_get(LineBuf, pos, " \t\r\n", comp, 3000);
 				if (pos <= 0) break;
+				if (timing->NbZoneOffsets >= GF_SDP_MAX_TIMEOFFSET) break;
 				timing->AdjustmentTimetiming->NbZoneOffsets = atoi(comp);
 				pos = gf_token_get(LineBuf, pos, " \t\r\n", comp, 3000);
 				timing->AdjustmentOffsettiming->NbZoneOffsets = SDP_MakeSeconds(comp);
 				timing->NbZoneOffsets += 1;
-				if (timing->NbZoneOffsets == GF_SDP_MAX_TIMEOFFSET) break;
 			}
 			break;
 		case 'k':
+			if (sdp->k_method) break;
 			pos = gf_token_get(LineBuf, 2, ":\t\r\n", comp, 3000);
 			if (media) {
 				media->k_method = gf_strdup(comp);
@@ -687,6 +715,9 @@
 			gf_list_add(sdp->media_desc, media);
 			break;
 		}
+
+		if (pos<0)
+			return GF_NON_COMPLIANT_BITSTREAM;
 	}
 	//finally rewrite the fmt_list for all media, and remove dynamic payloads
 	//from the list

gpac-2.2.1.tar.gz/src/isomedia/avc_ext.c -> gpac-2.4.0.tar.gz/src/isomedia/avc_ext.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2022
+ *			Copyright (c) Telecom ParisTech 2000-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / ISO Media File Format sub-project
@@ -57,6 +57,9 @@
 	case GF_ISOM_BOX_TYPE_MHC1:
 	case GF_ISOM_BOX_TYPE_HVT1:
 	case GF_ISOM_BOX_TYPE_LHT1:
+	case GF_ISOM_BOX_TYPE_VVC1:
+	case GF_ISOM_BOX_TYPE_VVI1:
+	case GF_ISOM_BOX_TYPE_VVS1:
 		return GF_TRUE;
 	case GF_ISOM_BOX_TYPE_GNRV:
 	case GF_ISOM_BOX_TYPE_GNRA:
@@ -179,7 +182,7 @@
 			if ((sample_offset<0) && (ref_sample_num > (u32) -sample_offset)) return GF_ISOM_INVALID_FILE;
 			ref_sample_num = (u32) ( (s32) ref_sample_num + sample_offset);
 
-			e = Media_GetSample(ref_trak->Media, ref_sample_num, &mdia->extracted_samp, &di, GF_FALSE, NULL);
+			e = Media_GetSample(ref_trak->Media, ref_sample_num, &mdia->extracted_samp, &di, GF_FALSE, NULL, GF_FALSE);
 			if (e) return e;
 			if (!mdia->extracted_samp->alloc_size)
 				mdia->extracted_samp->alloc_size = mdia->extracted_samp->dataLength;
@@ -207,7 +210,10 @@
 					if (!header_written) {
 						ref_nalu_size = gf_bs_read_int(mdia->extracted_bs, 8*nal_unit_size_field);
 
-						assert(data_length>nal_unit_size_field);
+						if (data_length<nal_unit_size_field) {
+							GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("ISOBMF: Extractor size is larger than remaining bytes - skipping.\n"));
+							continue;
+						}
 						data_length -= nal_unit_size_field;
 						if (data_length > gf_bs_available(mdia->extracted_bs)) {
 							data_length = (u32)gf_bs_available(mdia->extracted_bs);
@@ -228,7 +234,10 @@
 						else
 							gf_bs_write_int(mdia->nalu_out_bs, ref_nalu_size, 8*nal_unit_size_field);
 					}
-					assert(data_length >= ref_nalu_size);
+					if (data_length < ref_nalu_size) {
+						GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("ISOBMF: Extractor size is larger than referred sample size - skipping.\n"));
+						continue;
+					}
 					gf_bs_write_data(mdia->nalu_out_bs, mdia->tmp_nal_copy_buffer, ref_nalu_size);
 					data_length -= ref_nalu_size;
 
@@ -265,28 +274,42 @@
 	return GF_OK;
 }
 
-#ifndef GPAC_DISABLE_HEVC
+static GF_ISOSAPType check_sap2(GF_MediaBox *mdia, u32 sampleNumber, GF_ISOSample *sample)
+{
+	GF_ISOSample next_s, *s;
+	memset(&next_s, 0, sizeof(GF_ISOSample));
+	s = &next_s;
+	if (Media_GetSample(mdia, sampleNumber+1, &s, NULL, GF_TRUE, NULL, GF_FALSE)==GF_OK) {
+		if (sample->DTS + sample->CTS_Offset > next_s.DTS + next_s.CTS_Offset) {
+			return SAP_TYPE_2;
+		}
+		//next not a LP, SAP1
+	}
+	//return sap1 if we fail to get next sample
+	return SAP_TYPE_1;
+}
+
 /* returns the SAP type as defined in the 14496-12 specification */
-static GF_ISOSAPType sap_type_from_nal_type(u8 nal_type) {
+static GF_ISOSAPType hevc_sap_type_from_nal_type(GF_MediaBox *mdia, u32 sampleNumber, GF_ISOSample *sample, u8 nal_type) {
 	switch (nal_type) {
 	case GF_HEVC_NALU_SLICE_CRA:
+	case GF_HEVC_NALU_SLICE_BLA_W_LP:
 		return SAP_TYPE_3;
 	case GF_HEVC_NALU_SLICE_IDR_N_LP:
 	case GF_HEVC_NALU_SLICE_BLA_N_LP:
 		return SAP_TYPE_1;
 	case GF_HEVC_NALU_SLICE_IDR_W_DLP:
 	case GF_HEVC_NALU_SLICE_BLA_W_DLP:
-	case GF_HEVC_NALU_SLICE_BLA_W_LP:
-		return SAP_TYPE_2;
+		return check_sap2(mdia, sampleNumber, sample);
 	default:
 		return RAP_NO;
 	}
 }
-#endif
 
-static GF_ISOSAPType is_sample_idr(GF_MediaBox *mdia, GF_ISOSample *sample, GF_MPEGVisualSampleEntryBox *entry)
+GF_ISOSAPType gf_isom_nalu_get_sample_sap(GF_MediaBox *mdia, u32 sampleNumber, GF_ISOSample *sample, GF_MPEGVisualSampleEntryBox *entry)
 {
 	Bool is_hevc = GF_FALSE;
+	Bool is_vvc = GF_FALSE;
 	u32 nalu_size_field = 0;
 	if (entry->avc_config && entry->avc_config->config) nalu_size_field = entry->avc_config->config->nal_unit_size;
 	else if (entry->svc_config && entry->svc_config->config) nalu_size_field = entry->svc_config->config->nal_unit_size;
@@ -299,6 +322,10 @@
 		nalu_size_field = entry->lhvc_config->config->nal_unit_size;
 		is_hevc = GF_TRUE;
 	}
+	else if (entry->vvc_config && entry->vvc_config->config) {
+		nalu_size_field = entry->vvc_config->config->nal_unit_size;
+		is_vvc = GF_TRUE;
+	}
 	if (!nalu_size_field) return RAP_NO;
 
 	if (!mdia->nalu_parser)
@@ -313,20 +340,19 @@
 		u32 size = gf_bs_read_int(mdia->nalu_parser, 8*nalu_size_field);
 
 		if (is_hevc) {
-#ifndef GPAC_DISABLE_HEVC
 			u16 nal_hdr = gf_bs_read_u16(mdia->nalu_parser);
 			nal_type = (nal_hdr&0x7E00) >> 9;
 
 			switch (nal_type) {
 			case GF_HEVC_NALU_SLICE_CRA:
+			case GF_HEVC_NALU_SLICE_BLA_W_LP:
 				return SAP_TYPE_3;
 			case GF_HEVC_NALU_SLICE_IDR_N_LP:
 			case GF_HEVC_NALU_SLICE_BLA_N_LP:
 				return SAP_TYPE_1;
 			case GF_HEVC_NALU_SLICE_IDR_W_DLP:
 			case GF_HEVC_NALU_SLICE_BLA_W_DLP:
-			case GF_HEVC_NALU_SLICE_BLA_W_LP:
-				return SAP_TYPE_2;
+				return check_sap2(mdia, sampleNumber, sample);
 			case GF_HEVC_NALU_ACCESS_UNIT:
 			case GF_HEVC_NALU_FILLER_DATA:
 			case GF_HEVC_NALU_SEI_PREFIX:
@@ -338,7 +364,28 @@
 				return RAP_NO;
 			}
 			gf_bs_skip_bytes(mdia->nalu_parser, size - 2);
-#endif
+		} else if (is_vvc) {
+			u16 nal_hdr = gf_bs_read_u16(mdia->nalu_parser);
+			nal_type = (nal_hdr >> 3) & 0x1F;
+
+			switch (nal_type) {
+			case GF_VVC_NALU_SLICE_CRA:
+				return SAP_TYPE_3;
+			case GF_VVC_NALU_SLICE_IDR_N_LP:
+				return SAP_TYPE_1;
+			case GF_VVC_NALU_SLICE_IDR_W_RADL:
+				return check_sap2(mdia, sampleNumber, sample);
+			case GF_VVC_NALU_SLICE_GDR:
+				return SAP_TYPE_3;
+			case GF_VVC_NALU_SLICE_TRAIL:
+			case GF_VVC_NALU_SLICE_STSA:
+			case GF_VVC_NALU_SLICE_RADL:
+			case GF_VVC_NALU_SLICE_RASL:
+				return RAP_NO;
+			default:
+				break;
+			}
+			gf_bs_skip_bytes(mdia->nalu_parser, size - 2);
 		} else {
 			u8 nal_hdr = gf_bs_read_u8(mdia->nalu_parser);
 			nal_type = nal_hdr & 0x1F;
@@ -516,7 +563,7 @@
 
 	if (sample->IsRAP < SAP_TYPE_2) {
 		if (mdia->information->sampleTable->no_sync_found || (!sample->IsRAP && check_cra_bla) ) {
-			sample->IsRAP = is_sample_idr(mdia, sample, entry);
+			sample->IsRAP = gf_isom_nalu_get_sample_sap(mdia, sampleNumber, sample, entry);
 		}
 	}
 	if (!sample->IsRAP)
@@ -631,7 +678,6 @@
 		if (insert_nalu_delim) {
 			gf_bs_write_int(mdia->nalu_out_bs, 1, 32);
 			if (is_hevc) {
-#ifndef GPAC_DISABLE_HEVC
 				gf_bs_write_int(mdia->nalu_out_bs, 0, 1);
 				gf_bs_write_int(mdia->nalu_out_bs, GF_HEVC_NALU_ACCESS_UNIT, 6);
 				gf_bs_write_int(mdia->nalu_out_bs, insert_vdrd_code ? 1 : 0, 6); //we should pick the layerID of the following nalus ...
@@ -640,7 +686,6 @@
 				/*pic-type - by default we signal all slice types possible*/
 				gf_bs_write_int(mdia->nalu_out_bs, 2, 3);
 				gf_bs_write_int(mdia->nalu_out_bs, 0, 5);
-#endif
 			} else {
 				gf_bs_write_int(mdia->nalu_out_bs, (sample->data0 & 0x60) | GF_AVC_NALU_ACCESS_UNIT, 8);
 				gf_bs_write_int(mdia->nalu_out_bs, 0xF0 , 8); /*7 "all supported NALUs" (=111) + rbsp trailing (10000)*/;
@@ -675,12 +720,10 @@
 					//temp fix - if we detect xPS in the beginning of the sample do NOT copy the ps bitstream
 					//this is not correct since we are not sure whether they are the same xPS or not, but it crashes openHEVC ...
 					switch (nal_type) {
-#ifndef GPAC_DISABLE_HEVC
 					case GF_HEVC_NALU_VID_PARAM:
 					case GF_HEVC_NALU_SEQ_PARAM:
 					case GF_HEVC_NALU_PIC_PARAM:
 						break;
-#endif
 					default:
 						gf_bs_transfer(mdia->nalu_out_bs, mdia->nalu_ps_bs, GF_TRUE);
 						break;
@@ -733,16 +776,12 @@
 		}
 
 		if (is_hevc) {
-#ifndef GPAC_DISABLE_HEVC
 			GF_BitStream *write_to_bs = mdia->nalu_out_bs;
-#endif
-
 			if (!ps_transfered) {
 				gf_bs_transfer(mdia->nalu_out_bs, mdia->nalu_ps_bs, GF_TRUE);
 				ps_transfered = GF_TRUE;
 			}
 
-#ifndef GPAC_DISABLE_HEVC
 			switch (nal_type) {
 			/*we already wrote AU delim, and we trash aggregators*/
 			case GF_HEVC_NALU_ACCESS_UNIT:
@@ -781,7 +820,7 @@
 			case GF_HEVC_NALU_SLICE_CRA:
 				//insert xPS before CRA/BLA
 				if (check_cra_bla && !sample->IsRAP) {
-					sample->IsRAP = sap_type_from_nal_type(nal_type);
+					sample->IsRAP = hevc_sap_type_from_nal_type(mdia, sampleNumber, sample, nal_type);
 					if (sei_suffix_bs) gf_bs_del(sei_suffix_bs);
 					mdia->in_nalu_rewrite = GF_FALSE;
 					return gf_isom_nalu_sample_rewrite(mdia, sample, sampleNumber, entry);
@@ -809,8 +848,6 @@
 				gf_bs_write_u16(write_to_bs, nal_hdr);
 				gf_bs_write_data(write_to_bs, mdia->tmp_nal_copy_buffer, nal_size-2);
 			}
-#endif
-
 			//done with HEVC
 			continue;
 		}
@@ -1285,42 +1322,6 @@
 	return GF_OK;
 }
 
-#if !defined(GPAC_DISABLE_AV_PARSERS) && !defined(GPAC_DISABLE_HEVC)
-void gf_hevc_parse_ps(GF_HEVCConfig* hevccfg, HEVCState* hevc, u32 nal_type)
-{
-	u32 i, j;
-	if (!hevccfg) return;
-
-	for (i = 0; i < gf_list_count(hevccfg->param_array); i++) {
-		GF_NALUFFParamArray* ar = gf_list_get(hevccfg->param_array, i);
-		if (ar->type != nal_type) continue;
-		for (j = 0; j < gf_list_count(ar->nalus); j++) {
-			u8 ntype, tid, lid;
-			GF_NALUFFParam* sl = gf_list_get(ar->nalus, j);
-			gf_hevc_parse_nalu(sl->data, sl->size, hevc, &ntype, &tid, &lid);
-		}
-	}
-}
-#endif
-
-#if !defined(GPAC_DISABLE_AV_PARSERS)
-void gf_vvc_parse_ps(GF_VVCConfig* vvccfg, VVCState* vvc, u32 nal_type)
-{
-	u32 i, j;
-	if (!vvccfg) return;
-
-	for (i = 0; i < gf_list_count(vvccfg->param_array); i++) {
-		GF_NALUFFParamArray* ar = gf_list_get(vvccfg->param_array, i);
-		if (ar->type != nal_type) continue;
-		for (j = 0; j < gf_list_count(ar->nalus); j++) {
-			u8 ntype, tid, lid;
-			GF_NALUFFParam* sl = gf_list_get(ar->nalus, j);
-			gf_vvc_parse_nalu(sl->data, sl->size, vvc, &ntype, &tid, &lid);
-		}
-	}
-}
-#endif
-
 
 static GF_Err gf_isom_check_mvc(GF_ISOFile *the_file, GF_TrackBox *trak, GF_MPEGVisualSampleEntryBox *entry)
 {
@@ -2293,9 +2294,6 @@
 	return gf_isom_vvc_config_update_ex(the_file, trackNumber, DescriptionIndex, cfg, GF_ISOM_VVCC_UPDATE, GF_FALSE);
 }
 
-#endif /*GPAC_DISABLE_ISOM_WRITE*/
-
-GF_EXPORT
 GF_Box *gf_isom_clone_config_box(GF_Box *box)
 {
 	u8 *data=NULL;
@@ -2323,6 +2321,7 @@
 	}
 	return clone;
 }
+#endif /*GPAC_DISABLE_ISOM_WRITE*/
 
 GF_EXPORT
 GF_AVCConfig *gf_isom_avc_config_get(GF_ISOFile *the_file, u32 trackNumber, u32 DescriptionIndex)
@@ -2783,7 +2782,9 @@
 
 	for (i=0; i<count; i++) {
 		ISOM_DECREASE_SIZE(ptr, 2)
-		GF_NALUFFParam *sl = (GF_NALUFFParam *) gf_malloc(sizeof(GF_NALUFFParam));
+		GF_NALUFFParam *sl;
+		GF_SAFEALLOC(sl, GF_NALUFFParam);
+		if (!sl) return GF_OUT_OF_MEM;
 		sl->size = gf_bs_read_u16(bs);
 		if (!sl->size || (gf_bs_available(bs) < sl->size) || (ptr->size < sl->size) ) {
 			gf_free(sl);
@@ -2799,7 +2800,9 @@
 	count = gf_bs_read_u8(bs);
 	for (i=0; i<count; i++) {
 		ISOM_DECREASE_SIZE(ptr, 2)
-		GF_NALUFFParam *sl = (GF_NALUFFParam *)gf_malloc(sizeof(GF_NALUFFParam));
+		GF_NALUFFParam *sl;
+		GF_SAFEALLOC(sl, GF_NALUFFParam);
+		if (!sl) return GF_OUT_OF_MEM;
 		sl->size = gf_bs_read_u16(bs);
 		if (!sl->size || (gf_bs_available(bs) < sl->size) || (ptr->size<sl->size)) {
 			gf_free(sl);
@@ -2839,9 +2842,12 @@
 				ptr->config->luma_bit_depth = 8 + avc.spsidx.luma_bit_depth_m8;
 				ptr->config->chroma_bit_depth = 8 + avc.spsidx.chroma_bit_depth_m8;
 			}
-		}
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_CODING, ("isom/avcc Missing REXT profile signaling, patching using SPS.\n"));
+		} else
 #endif
-		GF_LOG(GF_LOG_WARNING, GF_LOG_CODING, ("isom/avcc Missing REXT profile signaling, patching.\n"));
+		{
+			GF_LOG(GF_LOG_WARNING, GF_LOG_CODING, ("isom/avcc Missing REXT profile signaling, forcing 420 8-bit.\n"));
+		}
 		return GF_OK;
 	}
 	ISOM_DECREASE_SIZE(ptr, 4)
@@ -2862,7 +2868,9 @@
 		ptr->config->sequenceParameterSetExtensions = gf_list_new();
 		for (i=0; i<count; i++) {
 			ISOM_DECREASE_SIZE(ptr, 2)
-			GF_NALUFFParam *sl = (GF_NALUFFParam *)gf_malloc(sizeof(GF_NALUFFParam));
+			GF_NALUFFParam *sl;
+			GF_SAFEALLOC(sl, GF_NALUFFParam);
+			if (!sl) return GF_OUT_OF_MEM;
 			sl->size = gf_bs_read_u16(bs);
 			if ((gf_bs_available(bs) < sl->size) || (ptr->size<sl->size)) {
 				gf_free(sl);
@@ -3065,6 +3073,7 @@
 	return GF_OK;
 }
 
+#endif
 
 
 void vvcc_box_del(GF_Box *s)
@@ -3237,6 +3246,7 @@
 	return GF_OK;
 }
 
+#ifndef GPAC_DISABLE_ISOM_WRITE
 GF_Err av1c_box_write(GF_Box *s, GF_BitStream *bs) {
 	GF_Err e;
 	GF_AV1ConfigurationBox *ptr = (GF_AV1ConfigurationBox*)s;
@@ -3323,7 +3333,6 @@
 
 	return gf_odf_vp_cfg_write_bs(ptr->config, bs, ptr->version == 0);
 }
-#endif
 
 GF_Err vpcc_box_size(GF_Box *s)
 {
@@ -3348,6 +3357,8 @@
 	return GF_OK;
 }
 
+#endif
+
 
 GF_Box *SmDm_box_new()
 {

gpac-2.2.1.tar.gz/src/isomedia/box_code_3gpp.c -> gpac-2.4.0.tar.gz/src/isomedia/box_code_3gpp.c Changed

gpac-2.2.1.tar.gz/src/isomedia/box_code_adobe.c -> gpac-2.4.0.tar.gz/src/isomedia/box_code_adobe.c Changed

@@ -224,12 +224,13 @@
 	ptr->segment_run_table_count = gf_bs_read_u8(bs);
 	for (i=0; i<ptr->segment_run_table_count; i++) {
 		GF_AdobeSegmentRunTableBox *asrt = NULL;
-		e = gf_isom_box_parse((GF_Box **)&asrt, bs);
+		e = gf_isom_box_parse_ex((GF_Box **)&asrt, bs, GF_ISOM_BOX_TYPE_ABST, GF_FALSE, ptr->size);
 		if (e) {
 			if (asrt) gf_isom_box_del((GF_Box*)asrt);
 			goto exit;
 		}
 		gf_list_add(ptr->segment_run_table_entries, asrt);
+		ISOM_DECREASE_SIZE_GOTO_EXIT(ptr, asrt->size)
 	}
 	if (ptr->segment_run_table_count != gf_list_count(ptr->segment_run_table_entries)) {
 		e = GF_ISOM_INVALID_FILE;
@@ -240,12 +241,13 @@
 	ptr->fragment_run_table_count = gf_bs_read_u8(bs);
 	for (i=0; i<ptr->fragment_run_table_count; i++) {
 		GF_AdobeFragmentRunTableBox *afrt = NULL;
-		e = gf_isom_box_parse((GF_Box **)&afrt, bs);
+		e = gf_isom_box_parse_ex((GF_Box **)&afrt, bs, GF_ISOM_BOX_TYPE_ABST, GF_FALSE, ptr->size);
 		if (e) {
 			if (afrt) gf_isom_box_del((GF_Box*)afrt);
 			goto exit;
 		}
 		gf_list_add(ptr->fragment_run_table_entries, afrt);
+		ISOM_DECREASE_SIZE_GOTO_EXIT(ptr, afrt->size)
 	}
 	if (ptr->fragment_run_table_count != gf_list_count(ptr->fragment_run_table_entries)) {
 		e = GF_ISOM_INVALID_FILE;

gpac-2.2.1.tar.gz/src/isomedia/box_code_base.c -> gpac-2.4.0.tar.gz/src/isomedia/box_code_base.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2022
+ *			Copyright (c) Telecom ParisTech 2000-2024
  *					All rights reserved
  *
  *  This file is part of GPAC / ISO Media File Format sub-project
@@ -129,7 +129,8 @@
 /*this is using chpl format according to some NeroRecode samples*/
 GF_Err chpl_box_read(GF_Box *s,GF_BitStream *bs)
 {
-	GF_ChapterEntry *ce;
+	GF_Err e;
+	GF_ChapterEntry *ce=NULL;
 	u32 nb_chaps, len, i, count;
 	GF_ChapterListBox *ptr = (GF_ChapterListBox *)s;
 
@@ -142,14 +143,20 @@
 	while (nb_chaps) {
 		GF_SAFEALLOC(ce, GF_ChapterEntry);
 		if (!ce) return GF_OUT_OF_MEM;
-		ISOM_DECREASE_SIZE(ptr, 9)
+		ISOM_DECREASE_SIZE_GOTO_EXIT(ptr, 9)
 		ce->start_time = gf_bs_read_u64(bs);
 		len = gf_bs_read_u8(bs);
-		if (ptr->size<len) return GF_ISOM_INVALID_FILE;
+		if (ptr->size<len) {
+			e = GF_ISOM_INVALID_FILE;
+			goto exit;
+		}
 		if (len) {
 			ce->name = (char *)gf_malloc(sizeof(char)*(len+1));
-			if (!ce->name) return GF_OUT_OF_MEM;
-			ISOM_DECREASE_SIZE(ptr, len)
+			if (!ce->name) {
+				e = GF_OUT_OF_MEM;
+				goto exit;
+			}
+			ISOM_DECREASE_SIZE_GOTO_EXIT(ptr, len)
 			gf_bs_read_data(bs, ce->name, len);
 			ce->namelen = 0;
 		} else {
@@ -167,8 +174,12 @@
 		if (ce) gf_list_add(ptr->list, ce);
 		count++;
 		nb_chaps--;
+		ce = NULL;
 	}
 	return GF_OK;
+exit:
+	if (ce) gf_free(ce);
+	return e;
 }
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
@@ -407,12 +418,19 @@
 		ptr->entriesi.sampleCount = gf_bs_read_u32(bs);
 		if (ptr->version)
 			ptr->entriesi.decodingOffset = gf_bs_read_int(bs, 32);
-		else
+		else {
 			ptr->entriesi.decodingOffset = (s32) gf_bs_read_u32(bs);
 
-		if (ptr->max_cts_delta <= ABS(ptr->entriesi.decodingOffset)) {
+			if (ptr->entriesi.decodingOffset <= INT_MIN) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("iso file Invalid decodingOffset (%d) in entry #%i - defaulting to 0.\n", ptr->entriesi.decodingOffset, i));
+				ptr->entriesi.decodingOffset = 0;
+			}
+		}
+
+		if (ptr->entriesi.decodingOffset == INT_MIN) {
+			ptr->max_cts_delta = INT_MAX;
+		} else if (ptr->max_cts_delta <= ABS(ptr->entriesi.decodingOffset)) {
 			ptr->max_cts_delta = ABS(ptr->entriesi.decodingOffset);
-			//ptr->sample_num_max_cts_delta = sampleCount;
 		}
 		sampleCount += ptr->entriesi.sampleCount;
 	}
@@ -579,6 +597,13 @@
 {
 	GF_DataEntryURLBox *ptr = (GF_DataEntryURLBox *)s;
 
+	//imdt case
+	if (ptr->type == GF_ISOM_BOX_TYPE_IMDT) {
+		ISOM_DECREASE_SIZE(ptr, 4);
+		ptr->imda_ref_id = gf_bs_read_u32(bs);
+		return GF_OK;
+	}
+
 	if (ptr->size) {
 		u32 location_size = (u32) ptr->size;
 		if (location_size < 1) {
@@ -611,6 +636,11 @@
 
 	e = gf_isom_full_box_write(s, bs);
 	if (e) return e;
+	//imdt case
+	if (ptr->type == GF_ISOM_BOX_TYPE_IMDT) {
+		gf_bs_write_u32(bs, ptr->imda_ref_id);
+		return GF_OK;
+	}
 	//the flag set indicates we have a string (WE HAVE TO for URLs)
 	if ( !(ptr->flags & 1)) {
 		if (ptr->location) {
@@ -624,6 +654,11 @@
 {
 	GF_DataEntryURLBox *ptr = (GF_DataEntryURLBox *)s;
 
+	//imdt case
+	if (ptr->type == GF_ISOM_BOX_TYPE_IMDT) {
+		ptr->size+=4;
+		return GF_OK;
+	}
 	if ( !(ptr->flags & 1)) {
 		if (ptr->location) ptr->size += 1 + strlen(ptr->location);
 	}
@@ -760,7 +795,7 @@
 
 	if (!bytesToRead) return GF_OK;
 	if (bytesToRead>1000000) {
-		GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("iso file Unknown box %s (0x%08X) with payload larger than 1 MBytes, ignoring\n", gf_4cc_to_str(ptr->type), ptr->type ));
+		GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("iso file Unknown box %s (0x%08X) with payload larger than 1 MBytes, ignoring\n", gf_4cc_to_str(ptr->original_4cc), ptr->original_4cc ));
 		gf_bs_skip_bytes(bs, ptr->dataSize);
 		return GF_OK;
 	}
@@ -770,6 +805,11 @@
 	ptr->dataSize = bytesToRead;
 	gf_bs_read_data(bs, ptr->data, ptr->dataSize);
 
+	//don't try to load sub boxes if already in udta child box loading
+	if (gf_bs_get_cookie(bs) & GF_ISOM_BS_COOKIE_IN_UDTA) {
+		return GF_OK;
+	}
+
 	//try to parse container boxes, check if next 8 bytes match a subbox
 	sub_bs = gf_bs_new(ptr->data, ptr->dataSize, GF_BITSTREAM_READ);
 	sub_size = gf_bs_read_u32(sub_bs);
@@ -785,7 +825,7 @@
 
 	if (e == GF_OK) {
 		gf_bs_seek(sub_bs, 0);
-		gf_bs_set_cookie(sub_bs, GF_ISOM_BS_COOKIE_NO_LOGS);
+		gf_bs_set_cookie(sub_bs, GF_ISOM_BS_COOKIE_NO_LOGS|GF_ISOM_BS_COOKIE_IN_UDTA);
 		e = gf_isom_box_array_read(s, sub_bs);
 	}
 	gf_bs_del(sub_bs);
@@ -872,7 +912,7 @@
 	return (GF_Box *) tmp;
 }
 
-#ifndef GPAC_DISABLE_ISOM_WRITEHintSa
+#ifndef GPAC_DISABLE_ISOM_WRITE
 
 GF_Err def_parent_box_write(GF_Box *s, GF_BitStream *bs)
 {
@@ -904,7 +944,7 @@
 	return (GF_Box *) tmp;
 }
 
-#ifndef GPAC_DISABLE_ISOM_WRITEHintSa
+#ifndef GPAC_DISABLE_ISOM_WRITE
 
 GF_Err def_parent_full_box_write(GF_Box *s, GF_BitStream *bs)
 {
@@ -2993,6 +3033,137 @@
 	gf_free(ptr);
 }
 
+// Mapping of QuickTime old language codes
+// https://developer.apple.com/library/archive/documentation/QuickTime/QTFF/QTFFChap4/qtff4.html#//apple_ref/doc/uid/TP40000939-CH206-34320
+// to 3-letter codes (per ISO/IEC 639-2/T, https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes)
+// NOTE that Media Info maps them to 2-letter codes, possibly with region codes https://github.com/MediaArea/MediaInfoLib/blob/72213574cbf2ca01c0fbb97d2239b53891ad7b9d/Source/MediaInfo/Multiple/File_Mpeg4.cpp#L754
+// NOTE that FFMPEG mostly maps to ISO/IEC 639-2/B and sometimes 2-letter code
+// (see https://ffmpeg.org/doxygen/trunk/isom_8c_source.html)
+static const char* qtLanguages = {
+	"eng", //  0 English
+	"fra", //  1 French
+	"deu", //  2 German
+	"ita", //  3 Italian
+	"nld", //  4 Dutch
+	"swe", //  5 Swedish
+	"spa", //  6 Spanish
+	"dan", //  7 Danish
+	"por", //  8 Portuguese
+	"nor", //  9 Norwegian
+	"heb", // 10 Hebrew
+	"jpn", // 11 Japanese
+	"ara", // 12 Arabic
+	"fin", // 13 Finnish
+	"ell", // 14 Greek
+	"isl", // 15 Icelandic
+	"mlt", // 16 Maltese
+	"tur", // 17 Turkish
+	"hrv", // 18 Croatian
+	"zho", // 19 Traditional Chinese - general 3-letter code, ignoring the "Traditional" part
+	"urd", // 20 Urdu
+	"hin", // 21 Hindi
+	"tha", // 22 Thai
+	"kor", // 23 Korean
+	"lit", // 24 Lithuanian
+	"pol", // 25 Polish
+	"hun", // 26 Hungarian
+	"est", // 27 Estonian
+	"lav", // 28 Lettish or Latvian
+	"sme", // 29 Saami or Sami
+	"fao", // 30 Faroese
+	"fas", // 31 Farsi
+	"rus", // 32 Russian
+	"zho", // 33 Simplified Chinese - general 3-letter code, ignoring the "Simplified" part
+	"nld", // 34 Flemish - using same code as Dutch
+	"gle", // 35 Irish
+	"sqi", // 36 Albanian
+	"ron", // 37 Romanian
+	"ces", // 38 Czech
+	"slk", // 39 Slovak
+	"slv", // 40 Slovenian
+	"yid", // 41 Yiddish
+	"srp", // 42 Serbian
+	"mkd", // 43 Macedonian
+	"bul", // 44 Bulgarian
+	"ukr", // 45 Ukrainian
+	"bel", // 46 Belarusian
+	"uzb", // 47 Uzbek
+	"kaz", // 48 Kazakh
+	"aze", // 49 Azerbaijani
+	"aze", // 50 AzerbaijanAr (Armenian-Azerbaijani) - using same code as Azerbaijani
+	"hye", // 51 Armenian
+	"kat", // 52 Georgian
+	"ron", // 53 Moldavian
+	"kir", // 54 Kirghiz
+	"tgk", // 55 Tajik
+	"tuk", // 56 Turkmen
+	"mon", // 57 Mongolian
+	"mon", // 58 MongolianCyr - using same code as Mongolian
+	"pus", // 59 Pashto
+	"kur", // 60 Kurdish
+	"kas", // 61 Kashmiri
+	"snd", // 62 Sindhi
+	"bod", // 63 Tibetan
+	"nep", // 64 Nepali
+	"san", // 65 Sanskrit
+	"mar", // 66 Marathi
+	"ben", // 67 Bengali
+	"asm", // 68 Assamese
+	"guj", // 69 Gujarati
+	"pan", // 70 Punjabi
+	"ori", // 71 Oriya
+	"mal", // 72 Malayalam
+	"kan", // 73 Kannada
+	"tam", // 74 Tamil
+	"tel", // 75 Telugu
+	"sin", // 76 Sinhala
+	"mya", // 77 Burmese
+	"khm", // 78 Khmer
+	"lao", // 79 Lao
+	"vie", // 80 Vietnamese
+	"ind", // 81 Indonesian
+	"tgl", // 82 Tagalog
+	"msa", // 83 MalayRoman
+	"msa", // 84 MalayArabic
+	"amh", // 85 Amharic
+	"   ", // 86 Empty
+	"orm", // 87 Oromo
+	"som", // 88 Somali
+	"swa", // 89 Swahili
+	"kin", // 90 Kinyarwanda
+	"run", // 91 Rundi
+	"nya", // 92 Nyanja
+	"mlg", // 93 Malagasy
+	"epo", // 94 Esperanto
+	// Gap 95-127
+	"cym", // 128 Welsh
+	"eus", // 129 Basque
+	"cat", // 130 Catalan
+	"lat", // 131 Latin
+	"que", // 132 Quechua
+	"grn", // 133 Guarani
+	"aym", // 134 Aymara
+	"tat", // 135 Tatar
+	"uig", // 136 Uighur
+	"dzo", // 127 Dzongkha
+	"jav"  // 138 Javanese
+};
+//static const u8 qtLanguagesSize = GF_ARRAY_LENGTH(qtLanguages);
+
+GF_Err set_quicktime_lang(char lang4, u8 code) {
+	if (code > 138 || (code > 94 && code < 128) || code == 86) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("iso file Invalid QuickTime Language Code %d\n", code));
+		return GF_BAD_PARAM;
+	}
+	if (code > 94)
+		code -=(128-94); // Gap in the list
+	lang0 = qtLanguagescode0;
+	lang1 = qtLanguagescode1;
+	lang2 = qtLanguagescode2;
+	lang3 = qtLanguagescode3;
+	return GF_OK;
+}
+
 GF_Err mdhd_box_read(GF_Box *s, GF_BitStream *bs)
 {
 	GF_MediaHeaderBox *ptr = (GF_MediaHeaderBox *)s;
@@ -3026,9 +3197,15 @@
 	ptr->packedLanguage2 = gf_bs_read_int(bs, 5);
 	//but before or after compaction ?? We assume before
 	if (ptr->packedLanguage0 || ptr->packedLanguage1 || ptr->packedLanguage2) {
-		ptr->packedLanguage0 += 0x60;
-		ptr->packedLanguage1 += 0x60;
-		ptr->packedLanguage2 += 0x60;
+		if (ptr->packedLanguage0 < 0x04) {
+			// QuickTime Language Codes
+			u8 code = (ptr->packedLanguage0 << 16) | (ptr->packedLanguage1 << 8) | ptr->packedLanguage2;
+			set_quicktime_lang(ptr->packedLanguage, code);
+		} else {
+			ptr->packedLanguage0 += 0x60;
+			ptr->packedLanguage1 += 0x60;
+			ptr->packedLanguage2 += 0x60;
+		}
 	} else {
 		ptr->packedLanguage0 = 'u';
 		ptr->packedLanguage1 = 'n';
@@ -3651,6 +3828,7 @@
 		}
 		gf_list_del(ptr->emsgs);
 	}
+	gf_list_del(ptr->trun_list);
 	gf_free(ptr);
 }
 
@@ -3760,7 +3938,7 @@
 			GF_TrackBox *tk = (GF_TrackBox *)a;
 			//set our pointer to this obj
 			tk->moov = ptr;
-			tk->index = gf_list_count(ptr->trackList);
+			tk->index = 1+gf_list_count(ptr->trackList);
 			if (tk->References) {
 				GF_TrackReferenceTypeBox *dpnd=NULL;
 				Track_FindRef(tk, GF_ISOM_REF_BASE, &dpnd);
@@ -3769,6 +3947,9 @@
 			}
 		}
 		return gf_list_add(ptr->trackList, a);
+	case GF_QT_BOX_TYPE_CMVD:
+		ptr->has_cmvd = GF_TRUE;
+		break;
 	}
 	return GF_OK;
 }
@@ -4005,15 +4186,14 @@
 	ptr = (GF_MPEGAudioSampleEntryBox *)s;
 
 	start = gf_bs_get_position(bs);
-	gf_bs_seek(bs, start + 8);
-	v = gf_bs_read_u16(bs);
+	v = gf_bs_peek_bits(bs, 16, 8);
 	if (v)
 		ptr->qtff_mode = GF_ISOM_AUDIO_QTFF_ON_NOEXT;
 
 	//try to disambiguate QTFF v1 and MP4 v1 audio sample entries ...
 	if (v==1) {
 		//go to end of ISOM audio sample entry, skip 4 byte (box size field), read 4 bytes (box type) and check if this looks like a box
-		gf_bs_seek(bs, start + 8 + 20  + 4);
+		gf_bs_skip_bytes(bs, 8 + 20 + 4);
 		a = gf_bs_read_u8(bs);
 		b = gf_bs_read_u8(bs);
 		c = gf_bs_read_u8(bs);
@@ -4024,9 +4204,9 @@
 		if (isalnum(c)) nb_alnum++;
 		if (isalnum(d)) nb_alnum++;
 		if (nb_alnum>2) ptr->qtff_mode = GF_ISOM_AUDIO_QTFF_NONE;
+		gf_bs_seek(bs, start);
 	}
 
-	gf_bs_seek(bs, start);
 	e = gf_isom_audio_sample_entry_read((GF_AudioSampleEntryBox*)s, bs);
 	if (e) return e;
 	pos = gf_bs_get_position(bs);
@@ -4071,7 +4251,19 @@
 		if (GF_4CC((u32)datai+4, (u8)datai+5, (u8)datai+6, (u8)datai+7) == GF_ISOM_BOX_TYPE_ESDS) {
 			GF_BitStream *mybs = gf_bs_new(data + i, size - i, GF_BITSTREAM_READ);
 			gf_bs_set_cookie(mybs, GF_ISOM_BS_COOKIE_NO_LOGS);
-			if (ptr->esd) gf_isom_box_del_parent(&ptr->child_boxes, (GF_Box *)ptr->esd);
+			if (ptr->esd) {
+
+				gf_list_del_item(ptr->child_boxes, (GF_Box *)ptr->esd);
+
+				for (u32 i=0; i<gf_list_count(ptr->child_boxes); i++) {
+					GF_Box *inner_box = (GF_Box *)gf_list_get(ptr->child_boxes, i);
+					if (inner_box->child_boxes) {
+						gf_list_del_item(inner_box->child_boxes, (GF_Box *)ptr->esd);
+					}
+				}
+
+				gf_isom_box_del((GF_Box *)ptr->esd);
+			}
 			ptr->esd = NULL;
 			e = gf_isom_box_parse((GF_Box **)&ptr->esd, mybs);
 			gf_bs_del(mybs);
@@ -5971,7 +6163,7 @@
 		//for now we disable the check, one opt could be to have the check only for some media types, or only for the first entry
 #if 0
 		else if ((s32) ptr->entriesi.sampleDelta < 0) {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("iso file stts entry %d has negative duration %d - forbidden ! Fixing to 1, sync may get lost (consider reimport raw media)\n", i, (s32) ptr->entriesi.sampleDelta ));
+			GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("iso file stts entry %d has negative duration %d - forbidden ! Fixing to 1, sync may get lost (consider re-importing raw media)\n", i, (s32) ptr->entriesi.sampleDelta ));
 			ptr->entriesi.sampleDelta = 1;
 		}
 #endif
@@ -6655,13 +6847,15 @@
 		GF_ProtectionSchemeInfoBox *sinf;
 		u32 base_ent_type = 0;
 		u32 type = a->type;
+		u32 sinf_type = GF_ISOM_BOX_TYPE_SINF;
 		switch (a->type) {
+		case GF_ISOM_BOX_TYPE_RESV:
+			sinf_type = GF_ISOM_BOX_TYPE_RINF;
 		case GF_ISOM_BOX_TYPE_ENCS:
 		case GF_ISOM_BOX_TYPE_ENCA:
 		case GF_ISOM_BOX_TYPE_ENCV:
-		case GF_ISOM_BOX_TYPE_RESV:
 		case GF_ISOM_BOX_TYPE_ENCT:
-			sinf = (GF_ProtectionSchemeInfoBox *) gf_isom_box_find_child(a->child_boxes, GF_ISOM_BOX_TYPE_SINF);
+			sinf = (GF_ProtectionSchemeInfoBox *) gf_isom_box_find_child(a->child_boxes, sinf_type);
 			if (!sinf || !sinf->original_format) return GF_ISOM_INVALID_FILE;
 			type = sinf->original_format->data_format;
 			base_ent_type = ((GF_SampleEntryBox *)a)->internal_type;
@@ -6800,7 +6994,10 @@
 			continue;
 		}
 		//we are sure to have an unknown box here
-		assert(a->type==GF_ISOM_BOX_TYPE_UNKNOWN);
+		if (a->type!=GF_ISOM_BOX_TYPE_UNKNOWN) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("iso file Sample description %s not supported\n", gf_4cc_to_str(a->type) ));
+			continue;
+		}
 
 		if (!a->data || (a->dataSize<8) ) {
 			GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("iso file Sample description %s does not have at least 8 bytes!\n", gf_4cc_to_str(a->original_4cc) ));
@@ -6964,7 +7161,7 @@
 	if (ptr->sample_encryption && ptr->sample_encryption->load_needed) {
 		if (!ptr->moov || !ptr->moov->mov || !ptr->moov->mov->movieFileMap)
 			return GF_ISOM_INVALID_FILE;
-		GF_Err e = senc_Parse(ptr->moov->mov->movieFileMap->bs, ptr, NULL, ptr->sample_encryption);
+		GF_Err e = senc_Parse(ptr->moov->mov->movieFileMap->bs, ptr, NULL, ptr->sample_encryption, 0);
 		if (e) return e;
 	}
 
@@ -7417,6 +7614,14 @@
 	if (ptr->samples) gf_free(ptr->samples);
 	if (ptr->cache) gf_bs_del(ptr->cache);
 	if (ptr->sample_order) gf_free(ptr->sample_order);
+	if (ptr->sample_refs) {
+		while (gf_list_count(ptr->sample_refs)) {
+			GF_TrafSampleRef *sref = gf_list_pop_back(ptr->sample_refs);
+			if (!sref->ref) gf_free(sref->data);
+			gf_free(sref);
+		}
+		gf_list_del(ptr->sample_refs);
+	}
 	gf_free(ptr);
 }
 
@@ -7596,12 +7801,19 @@
 		ptr->sample_alloc = ptr->nb_samples = 1;
 		ptr->samples0.nb_pack = ptr->sample_count;
 	} else {
-		//if we get here, at least one flag (so at least 4 bytes) is set, check size
-		if (ptr->sample_count * 4 > ptr->size) {
-			ISOM_DECREASE_SIZE(ptr, ptr->sample_count*4);
+		u32 base_size=0;
+		//check size
+		if (ptr->flags & GF_ISOM_TRUN_DURATION) base_size+=4;
+		if (ptr->flags & GF_ISOM_TRUN_SIZE) base_size+=4;
+		if (ptr->flags & GF_ISOM_TRUN_FLAGS) base_size+=4;
+		if (ptr->flags & GF_ISOM_TRUN_CTS_OFFSET) base_size+=4;
+
+		if ((u64) ptr->sample_count * base_size > ptr->size) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("iso file Invalid number of samples %u in trun for box size %u\n", ptr->sample_count, ptr->size));
+			return GF_ISOM_INVALID_FILE;
 		}
 		if ((u64)ptr->sample_count > (u64)SIZE_MAX/sizeof(GF_TrunEntry)) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("iso file Invalid number of samples %d in trun\n", ptr->sample_count));
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("iso file Invalid number of samples %u in trun\n", ptr->sample_count));
 			return GF_ISOM_INVALID_FILE;
 		}
 		ptr->samples = gf_malloc(sizeof(GF_TrunEntry) * ptr->sample_count);
@@ -7618,6 +7830,9 @@
 			if (ptr->flags & GF_ISOM_TRUN_DURATION) {
 				p->Duration = gf_bs_read_u32(bs);
 				trun_size += 4;
+
+				if (!ptr->min_duration || (ptr->min_duration>p->Duration))
+					ptr->min_duration = p->Duration;
 			}
 			if (ptr->flags & GF_ISOM_TRUN_SIZE) {
 				p->size = gf_bs_read_u32(bs);
@@ -7843,7 +8058,7 @@
 		if (ctrn->ctso_multiplier) return ctrn_s32_to_index(ctts / ctrn->ctso_multiplier);
 		return ctrn_s32_to_index(ctts);
 	}
-	assert(ctts>0);
+	gf_assert(ctts>0);
 	if (ctrn->ctso_multiplier) return ctrn_u32_to_index((u32)ctts / ctrn->ctso_multiplier);
 	return ctrn_s32_to_index((u32)ctts);
 }
@@ -9481,6 +9696,11 @@
 	ISOM_DECREASE_SIZE(ptr, 4);
 	entry_count = gf_bs_read_u32(bs);
 
+	if ((u64)entry_count*6 > gf_bs_available(bs)) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("iso file subs box: available buffer (%lu) too small for entry count read (%u)\n", gf_bs_available(bs), entry_count));
+		return GF_NON_COMPLIANT_BITSTREAM;
+	}
+
 	for (i=0; i<entry_count; i++) {
 		u32 subs_size=0;
 		GF_SubSampleInfoEntry *pSamp = (GF_SubSampleInfoEntry*) gf_malloc(sizeof(GF_SubSampleInfoEntry));
@@ -9709,12 +9929,12 @@
 
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
-static void *sgpd_parse_entry(u32 grouping_type, GF_BitStream *bs, s32 bytes_in_box, u32 entry_size, u32 *total_bytes)
+void *sgpd_parse_entry(GF_SampleGroupDescriptionBox *p, GF_BitStream *bs, s32 bytes_in_box, u32 entry_size, u32 *total_bytes)
 {
 	Bool null_size_ok = GF_FALSE;
 	GF_DefaultSampleGroupDescriptionEntry *def_ptr;
-
-	switch (grouping_type) {
+	p->is_opaque = GF_FALSE;
+	switch (p->grouping_type) {
 	case GF_ISOM_SAMPLE_GROUP_ROLL:
 	case GF_ISOM_SAMPLE_GROUP_PROL:
 	{
@@ -9773,9 +9993,15 @@
 		GF_SAFEALLOC(ptr, GF_CENCSampleEncryptionGroupEntry);
 		if (!ptr) return NULL;
 		Bool use_mkey = gf_bs_read_int(bs, 1);
-		gf_bs_read_int(bs, 7); //reserved
-		ptr->crypt_byte_block = gf_bs_read_int(bs, 4);
-		ptr->skip_byte_block = gf_bs_read_int(bs, 4);
+		Bool ext_pattern = gf_bs_read_int(bs, 1);
+		gf_bs_read_int(bs, 6); //reserved
+		if (ext_pattern) {
+			ptr->crypt_byte_block = gf_bs_read_u32(bs);
+			ptr->skip_byte_block = gf_bs_read_u32(bs);
+		} else {
+			ptr->crypt_byte_block = gf_bs_read_int(bs, 4);
+			ptr->skip_byte_block = gf_bs_read_int(bs, 4);
+		}
 		ptr->IsProtected = gf_bs_read_u8(bs);
 		bytes_in_box -= 3;
 		if (use_mkey) {
@@ -9947,6 +10173,11 @@
 		for (i=0; i<ptr->num_subpic_ref_idx; i++) {
 			ptr->subp_track_ref_idxi = gf_bs_read_u16(bs);
 			*total_bytes += 2;
+			if (gf_bs_is_overflow(bs)) {
+				gf_free(ptr->subp_track_ref_idx);
+				gf_free(ptr);
+				return NULL;
+			}
 		}
 		if (ptr->subpic_id_info_flag) {
 			ptr->spinfo.subpic_id_len_minus1 = gf_bs_read_int(bs, 4);
@@ -9980,6 +10211,48 @@
 		for (i=0; i<ptr->nb_entries; i++) {
 			ptr->groupIDsi = gf_bs_read_u16(bs);
 			*total_bytes += 2;
+			if (gf_bs_is_overflow(bs)) {
+				gf_free(ptr->groupIDs);
+				gf_free(ptr);
+				return NULL;
+			}
+		}
+		return ptr;
+	}
+	case GF_ISOM_SAMPLE_GROUP_ILCE:
+	{
+		GF_FieldInterlaceType *ptr;
+		GF_SAFEALLOC(ptr, GF_FieldInterlaceType);
+		if (!ptr) return NULL;
+		ptr->ilce_type = gf_bs_read_u8(bs);
+		*total_bytes = 1;
+		return ptr;
+	}
+	case GF_ISOM_SAMPLE_GROUP_ESGH:
+	{
+		u32 i;
+		GF_EssentialSamplegroupEntry *ptr;
+		GF_SAFEALLOC(ptr, GF_EssentialSamplegroupEntry);
+		if (!ptr) return NULL;
+		ptr->nb_types = gf_bs_read_u32(bs);
+		if ((u64)ptr->nb_types * 4 + 4 > entry_size) {
+			gf_free(ptr);
+			return NULL;
+		}
+		*total_bytes = 4;
+		ptr->group_types = gf_malloc(sizeof(u32) * ptr->nb_types);
+		if (!ptr->group_types) {
+			gf_free(ptr);
+			return NULL;
+		}
+		for (i=0; i<ptr->nb_types; i++) {
+			ptr->group_typesi = gf_bs_read_u32(bs);
+			*total_bytes += 4;
+			if (gf_bs_is_overflow(bs)) {
+				gf_free(ptr->group_types);
+				gf_free(ptr);
+				return NULL;
+			}
 		}
 		return ptr;
 	}
@@ -9991,9 +10264,10 @@
 	}
 
 	if (!entry_size && !null_size_ok) {
-		GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("iso file %s sample group does not indicate entry size and is not implemented, cannot parse!\n", gf_4cc_to_str( grouping_type) ));
+		GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("iso file %s sample group does not indicate entry size and is not implemented, cannot parse!\n", gf_4cc_to_str( p->grouping_type) ));
 		return NULL;
 	}
+	p->is_opaque = GF_TRUE;
 	GF_SAFEALLOC(def_ptr, GF_DefaultSampleGroupDescriptionEntry);
 	if (!def_ptr) return NULL;
 	if (entry_size) {
@@ -10048,6 +10322,17 @@
 		gf_free(sulm);
 		return;
 	}
+	case GF_ISOM_SAMPLE_GROUP_ILCE:
+		gf_free(entry);
+		return;
+
+	case GF_ISOM_SAMPLE_GROUP_ESGH:
+	{
+		GF_EssentialSamplegroupEntry *esgh = (GF_EssentialSamplegroupEntry *) entry;
+		if (esgh->group_types) gf_free(esgh->group_types);
+		gf_free(esgh);
+		return;
+	}
 
 	default:
 	{
@@ -10093,9 +10378,16 @@
 			nb_keys |= seig->key_info2;
 		}
 		gf_bs_write_int(bs, use_mkey ? 1 : 0, 1);
-		gf_bs_write_int(bs, 0, 7);
-		gf_bs_write_int(bs, seig->crypt_byte_block, 4);
-		gf_bs_write_int(bs, seig->skip_byte_block, 4);
+		if ((seig->crypt_byte_block>15) || (seig->skip_byte_block>15)) {
+			gf_bs_write_int(bs, 1, 1);
+			gf_bs_write_int(bs, 0, 6);
+			gf_bs_write_u32(bs, seig->crypt_byte_block);
+			gf_bs_write_u32(bs, seig->skip_byte_block);
+		} else {
+			gf_bs_write_int(bs, 0, 7);
+			gf_bs_write_int(bs, seig->crypt_byte_block, 4);
+			gf_bs_write_int(bs, seig->skip_byte_block, 4);
+		}
 		gf_bs_write_u8(bs, seig->IsProtected);
 		if (nb_keys>1) {
 			gf_bs_write_data(bs, seig->key_info+1, seig->key_info_size-1);
@@ -10146,6 +10438,23 @@
 		}
 		return;
 	}
+	case GF_ISOM_SAMPLE_GROUP_ILCE:
+	{
+		GF_FieldInterlaceType *ilce = (GF_FieldInterlaceType *) entry;
+		gf_bs_write_u8(bs, ilce->ilce_type);
+		return;
+	}
+
+	case GF_ISOM_SAMPLE_GROUP_ESGH:
+	{
+		u32 i;
+		GF_EssentialSamplegroupEntry *esgh = (GF_EssentialSamplegroupEntry *) entry;
+		gf_bs_write_u32(bs, esgh->nb_types);
+		for (i=0; i<esgh->nb_types; i++) {
+			gf_bs_write_u32(bs, esgh->group_typesi);
+		}
+		return;
+	}
 
 	default:
 	{
@@ -10178,11 +10487,15 @@
 	case GF_ISOM_SAMPLE_GROUP_SEIG:
 	{
 		GF_CENCSampleEncryptionGroupEntry *seig = (GF_CENCSampleEncryptionGroupEntry *)entry;
+		u32 base_size = 3;
+		if ((seig->crypt_byte_block>15) || (seig->skip_byte_block>15)) {
+			base_size += 7;
+		}
 		Bool use_mkey = seig->key_info0 ? GF_TRUE : GF_FALSE;
 		if (use_mkey) {
-			return 3 + seig->key_info_size-1;
+			return base_size + seig->key_info_size-1;
 		}
-		return seig->key_info_size; //== 3 + (seig->key_info_size-3);
+		return base_size + seig->key_info_size-3;
 	}
 	case GF_ISOM_SAMPLE_GROUP_OINF:
 		return gf_isom_oinf_size_entry(entry);
@@ -10202,6 +10515,14 @@
 		GF_SubpictureLayoutMapEntry *sulm = (GF_SubpictureLayoutMapEntry *) entry;
 		return 6 + 2*sulm->nb_entries;
 	}
+	case GF_ISOM_SAMPLE_GROUP_ILCE:
+		return 1;
+
+	case GF_ISOM_SAMPLE_GROUP_ESGH:
+	{
+		GF_EssentialSamplegroupEntry *esgh = (GF_EssentialSamplegroupEntry *) entry;
+		return 4 + 4*esgh->nb_types;
+	}
 
 	default:
 		return ((GF_DefaultSampleGroupDescriptionEntry *)entry)->length;
@@ -10259,7 +10580,10 @@
 			size = gf_bs_read_u32(bs);
 			ISOM_DECREASE_SIZE(p, 4);
 		}
-		ptr = sgpd_parse_entry(p->grouping_type, bs, (s32) p->size, size, &parsed_bytes);
+		if (size && size>p->size) {
+			return GF_ISOM_INVALID_FILE;
+		}
+		ptr = sgpd_parse_entry(p, bs, (s32) p->size, size, &parsed_bytes);
 		//don't return an error, just stop parsing so that we skip over the sgpd box
 		if (!ptr) return GF_OK;
 		gf_list_add(p->group_descriptions, ptr);
@@ -10627,7 +10951,7 @@
 	GF_TrackGroupBox *ptr = (GF_TrackGroupBox *)s;
 
 	BOX_FIELD_LIST_ASSIGN(groups)
-	return gf_list_add(ptr->groups, a);
+	return GF_OK;
 }
 
 
@@ -11425,7 +11749,7 @@
 	GF_Err e;
 	GF_ExtraDataBox *ptr = (GF_ExtraDataBox *)s;
 
-	e = gf_isom_box_parse((GF_Box**) &ptr->feci, bs);
+	e = gf_isom_box_parse_ex((GF_Box**) &ptr->feci, bs, GF_ISOM_BOX_TYPE_EXTR, GF_FALSE, ptr->size);
 	if (e) return e;
 	if (!ptr->feci || ptr->feci->size > ptr->size) return GF_ISOM_INVALID_MEDIA;
 	ptr->data_length = (u32) (ptr->size - ptr->feci->size);
@@ -12165,6 +12489,186 @@
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
 
+GF_Box *ddts_box_new()
+{
+	ISOM_DECL_BOX_ALLOC(GF_DTSSpecificBox, GF_ISOM_BOX_TYPE_DDTS);
+	return (GF_Box *)tmp;
+}
+
+void ddts_box_del(GF_Box *s)
+{
+	GF_DTSSpecificBox *ptr = (GF_DTSSpecificBox *)s;
+	if (ptr) gf_free(ptr);
+}
+
+GF_Err ddts_box_read(GF_Box *s, GF_BitStream *bs)
+{
+	GF_DTSSpecificBox *ptr = (GF_DTSSpecificBox *)s;
+	ISOM_DECREASE_SIZE(ptr, 20);
+	ptr->cfg.SamplingFrequency = gf_bs_read_u32(bs);
+	ptr->cfg.MaxBitrate = gf_bs_read_u32(bs);
+	ptr->cfg.AvgBitrate = gf_bs_read_u32(bs);
+	ptr->cfg.SampleDepth = gf_bs_read_u8(bs);
+	ptr->cfg.FrameDuration = gf_bs_read_int(bs, 2);
+	ptr->cfg.StreamConstruction = gf_bs_read_int(bs, 5);
+	ptr->cfg.CoreLFEPresent = gf_bs_read_int(bs, 1);
+	ptr->cfg.CoreLayout = gf_bs_read_int(bs, 6);
+	ptr->cfg.CoreSize = gf_bs_read_int(bs, 14);
+	ptr->cfg.StereoDownmix = gf_bs_read_int(bs, 1);
+	ptr->cfg.RepresentationType = gf_bs_read_int(bs, 3);
+	ptr->cfg.ChannelLayout = gf_bs_read_u16(bs);
+	ptr->cfg.MultiAssetFlag = gf_bs_read_int(bs, 1);
+	ptr->cfg.LBRDurationMod = gf_bs_read_int(bs, 1);
+	gf_bs_read_int(bs, 6); // ReservedBox flag and reserved bits
+	return GF_OK;
+}
+
+#ifndef GPAC_DISABLE_ISOM_WRITE
+
+GF_Err ddts_box_write(GF_Box *s, GF_BitStream *bs)
+{
+	GF_Err e;
+	GF_DTSSpecificBox *ptr = (GF_DTSSpecificBox *)s;
+	if (!s) return GF_BAD_PARAM;
+	e = gf_isom_box_write_header(s, bs);
+	if (e) return e;
+
+	gf_bs_write_u32(bs, ptr->cfg.SamplingFrequency);
+	gf_bs_write_u32(bs, ptr->cfg.MaxBitrate);
+	gf_bs_write_u32(bs, ptr->cfg.AvgBitrate);
+	gf_bs_write_u8(bs, ptr->cfg.SampleDepth);
+	gf_bs_write_int(bs, ptr->cfg.FrameDuration, 2);
+	gf_bs_write_int(bs, ptr->cfg.StreamConstruction, 5);
+	gf_bs_write_int(bs, ptr->cfg.CoreLFEPresent, 1);
+	gf_bs_write_int(bs, ptr->cfg.CoreLayout, 6);
+	gf_bs_write_int(bs, ptr->cfg.CoreSize, 14);
+	gf_bs_write_int(bs, ptr->cfg.StereoDownmix, 1);
+	gf_bs_write_int(bs, ptr->cfg.RepresentationType, 3);
+	gf_bs_write_u16(bs, ptr->cfg.ChannelLayout);
+	gf_bs_write_int(bs, ptr->cfg.MultiAssetFlag, 1);
+	gf_bs_write_int(bs, ptr->cfg.LBRDurationMod, 1);
+	gf_bs_write_int(bs, 0, 6);  // ReservedBoxPresent and reserved bits
+	return GF_OK;
+}
+
+GF_Err ddts_box_size(GF_Box *s)
+{
+	GF_DTSSpecificBox *ptr = (GF_DTSSpecificBox *)s;
+	ptr->size += 20;
+	return GF_OK;
+}
+
+#endif /*GPAC_DISABLE_ISOM_WRITE*/
+
+
+GF_Box *udts_box_new()
+{
+	ISOM_DECL_BOX_ALLOC(GF_UDTSSpecificBox, GF_ISOM_BOX_TYPE_UDTS);
+	return (GF_Box *)tmp;
+}
+
+void udts_box_del(GF_Box *s)
+{
+	GF_UDTSSpecificBox *ptr = (GF_UDTSSpecificBox *)s;
+	if (ptr) {
+		if (ptr->cfg.PresentationIDTagData) gf_free(ptr->cfg.PresentationIDTagData);
+		if (ptr->cfg.ExpansionBoxData) gf_free(ptr->cfg.ExpansionBoxData);
+		gf_free(ptr);
+	}
+}
+
+GF_Err udts_box_read(GF_Box *s, GF_BitStream *bs)
+{
+	GF_UDTSSpecificBox *ptr = (GF_UDTSSpecificBox *)s;
+	u32 i, bits;
+
+	ISOM_DECREASE_SIZE(ptr, 6);
+	ptr->cfg.DecoderProfileCode = gf_bs_read_int(bs, 6);
+	ptr->cfg.FrameDurationCode = gf_bs_read_int(bs, 2);
+	ptr->cfg.MaxPayloadCode = gf_bs_read_int(bs, 3);
+	ptr->cfg.NumPresentationsCode = gf_bs_read_int(bs, 5);
+	ptr->cfg.ChannelMask = gf_bs_read_u32(bs);
+
+	//non-aligned syntax, count bits
+	bits = 10;
+	ptr->cfg.BaseSamplingFrequencyCode = gf_bs_read_int(bs, 1);
+	ptr->cfg.SampleRateMod = gf_bs_read_int(bs, 2);
+	ptr->cfg.RepresentationType = gf_bs_read_int(bs, 3);
+	ptr->cfg.StreamIndex = gf_bs_read_int(bs, 3);
+	ptr->cfg.ExpansionBoxPresent = gf_bs_read_int(bs, 1);
+	ptr->cfg.PresentationIDTagDataSize = 0;
+
+	for (i=0; i<=ptr->cfg.NumPresentationsCode; i++) {
+		ptr->cfg.IDTagPresenti = gf_bs_read_int(bs, 1);
+		bits++;
+		ptr->cfg.PresentationIDTagDataSize += 16 * (ptr->cfg.IDTagPresenti != 0);
+	}
+	bits+= gf_bs_align(bs);
+	bits/=8;
+	ISOM_DECREASE_SIZE(ptr, bits);
+
+	if (ptr->cfg.PresentationIDTagDataSize > 0) {
+		ISOM_DECREASE_SIZE(ptr, ptr->cfg.PresentationIDTagDataSize);
+
+		ptr->cfg.PresentationIDTagData = gf_realloc(ptr->cfg.PresentationIDTagData, ptr->cfg.PresentationIDTagDataSize);
+		if (!ptr->cfg.PresentationIDTagData) return GF_OUT_OF_MEM;
+		gf_bs_read_data(bs, ptr->cfg.PresentationIDTagData, ptr->cfg.PresentationIDTagDataSize);
+	}
+	//leftover
+	if (ptr->size && ptr->cfg.ExpansionBoxPresent) {
+		ptr->cfg.ExpansionBoxDataSize = (u32) ptr->size;
+		ISOM_DECREASE_SIZE(ptr, ptr->cfg.ExpansionBoxDataSize);
+		ptr->cfg.ExpansionBoxData = gf_realloc(ptr->cfg.ExpansionBoxData, ptr->cfg.ExpansionBoxDataSize);
+		if (!ptr->cfg.ExpansionBoxData) return GF_OUT_OF_MEM;
+		gf_bs_read_data(bs, ptr->cfg.ExpansionBoxData, ptr->cfg.ExpansionBoxDataSize);
+	} else {
+		ptr->cfg.ExpansionBoxPresent = 0;
+	}
+	return GF_OK;
+}
+
+#ifndef GPAC_DISABLE_ISOM_WRITE
+
+GF_Err udts_box_write(GF_Box *s, GF_BitStream *bs)
+{
+	GF_Err e;
+	GF_UDTSSpecificBox *ptr = (GF_UDTSSpecificBox *)s;
+	u8 i;
+	if (!s) return GF_BAD_PARAM;
+	e = gf_isom_box_write_header(s, bs);
+	if (e) return e;
+
+	gf_bs_write_int(bs, ptr->cfg.DecoderProfileCode, 6);
+	gf_bs_write_int(bs, ptr->cfg.FrameDurationCode, 2);
+	gf_bs_write_int(bs, ptr->cfg.MaxPayloadCode, 3);
+	gf_bs_write_int(bs, ptr->cfg.NumPresentationsCode, 5);
+	gf_bs_write_u32(bs, ptr->cfg.ChannelMask);
+	gf_bs_write_int(bs, ptr->cfg.BaseSamplingFrequencyCode, 1);
+	gf_bs_write_int(bs, ptr->cfg.SampleRateMod, 2);
+	gf_bs_write_int(bs, ptr->cfg.RepresentationType, 3);
+	gf_bs_write_int(bs, ptr->cfg.StreamIndex, 3);
+	gf_bs_write_int(bs, ptr->cfg.ExpansionBoxPresent, 1);
+	for (i=0; i<=ptr->cfg.NumPresentationsCode; i++)
+		gf_bs_write_int(bs, ptr->cfg.IDTagPresenti, 1);
+	gf_bs_align(bs);
+	if (ptr->cfg.PresentationIDTagData && ptr->cfg.PresentationIDTagDataSize)
+		gf_bs_write_data(bs, ptr->cfg.PresentationIDTagData, ptr->cfg.PresentationIDTagDataSize);
+	if (ptr->cfg.ExpansionBoxData && ptr->cfg.ExpansionBoxDataSize)
+		gf_bs_write_data(bs, ptr->cfg.ExpansionBoxData, ptr->cfg.ExpansionBoxDataSize);
+	return GF_OK;
+}
+
+GF_Err udts_box_size(GF_Box *s)
+{
+	GF_UDTSSpecificBox *ptr = (GF_UDTSSpecificBox *)s;
+	u32 bits = 58 + ptr->cfg.NumPresentationsCode + 1;  // 58 bits for fixed fields
+	ptr->size += (bits + 7) / 8;  // align to next byte
+	ptr->size += ptr->cfg.PresentationIDTagDataSize + ptr->cfg.ExpansionBoxDataSize;
+	return GF_OK;
+}
+
+#endif /*GPAC_DISABLE_ISOM_WRITE*/
+
 
 void mvcg_box_del(GF_Box *s)
 {
@@ -12454,15 +12958,29 @@
 	GF_ChannelLayoutBox *ptr = (GF_ChannelLayoutBox *) s;
 
 	ISOM_DECREASE_SIZE(s, 1)
-	ptr->layout.stream_structure = gf_bs_read_u8(bs);
+	if (ptr->version==0) {
+		ptr->layout.stream_structure = gf_bs_read_u8(bs);
+	} else {
+		ptr->layout.stream_structure = gf_bs_read_int(bs, 4);
+		ptr->layout.format_ordering = gf_bs_read_int(bs, 4);
+		ISOM_DECREASE_SIZE(s, 1)
+		ptr->layout.base_channel_count = gf_bs_read_u8(bs);
+	}
 	if (ptr->layout.stream_structure & 1) {
 		ISOM_DECREASE_SIZE(s, 1)
 		ptr->layout.definedLayout = gf_bs_read_u8(bs);
-		if (ptr->layout.definedLayout) {
+		if (ptr->layout.definedLayout==0) {
 			u32 remain = (u32) ptr->size;
 			if (ptr->layout.stream_structure & 2) remain--;
 			ptr->layout.channels_count = 0;
+			u32 nb_channels = 0;
+			if (ptr->version) {
+				ISOM_DECREASE_SIZE(s, 1)
+				nb_channels = gf_bs_read_u8(bs);
+			}
 			while (remain) {
+				if (ptr->layout.channels_count==64) return GF_ISOM_INVALID_FILE;
+
 				ISOM_DECREASE_SIZE(s, 1)
 				ptr->layout.layoutsptr->layout.channels_count.position = gf_bs_read_u8(bs);
 				remain--;
@@ -12472,13 +12990,31 @@
 					ptr->layout.layoutsptr->layout.channels_count.elevation = gf_bs_read_int(bs, 8);
 					remain-=3;
 				}
+				ptr->layout.channels_count++;
+				if (ptr->version) {
+					nb_channels--;
+					if (!nb_channels) break;
+				}
 			}
 		} else {
-			ISOM_DECREASE_SIZE(s, 8)
-			ptr->layout.omittedChannelsMap = gf_bs_read_u64(bs);
+			if (ptr->version==0) {
+				ISOM_DECREASE_SIZE(s, 8)
+				ptr->layout.omittedChannelsMap = gf_bs_read_u64(bs);
+				ptr->layout.omitted_channels_present = 1;
+				ptr->layout.channel_order_definition = 0;
+			} else {
+				ISOM_DECREASE_SIZE(s, 1)
+				gf_bs_read_int(bs, 4);
+				ptr->layout.channel_order_definition = gf_bs_read_int(bs, 3);
+				ptr->layout.omitted_channels_present = gf_bs_read_int(bs, 1);
+				if (ptr->layout.omitted_channels_present) {
+					ISOM_DECREASE_SIZE(s, 8)
+					ptr->layout.omittedChannelsMap = gf_bs_read_u64(bs);
+				}
+			}
 		}
 	}
-	if (ptr->layout.stream_structure & 2) {
+	if ((ptr->version==0) && (ptr->layout.stream_structure & 2)) {
 		ISOM_DECREASE_SIZE(s, 1)
 		ptr->layout.object_count = gf_bs_read_u8(bs);
 	}
@@ -12501,11 +13037,20 @@
 	e = gf_isom_full_box_write(s, bs);
 	if (e) return e;
 
-	gf_bs_write_u8(bs, ptr->layout.stream_structure);
+	if (ptr->version==0) {
+		gf_bs_write_u8(bs, ptr->layout.stream_structure);
+	} else {
+		gf_bs_write_int(bs, ptr->layout.stream_structure, 4);
+		gf_bs_write_int(bs, ptr->layout.format_ordering, 4);
+		gf_bs_write_u8(bs, ptr->layout.base_channel_count);
+	}
 	if (ptr->layout.stream_structure & 1) {
 		gf_bs_write_u8(bs, ptr->layout.definedLayout);
 		if (ptr->layout.definedLayout==0) {
 			u32 i;
+			if (ptr->version==1) {
+				gf_bs_write_u8(bs, ptr->layout.channels_count);
+			}
 			for (i=0; i<ptr->layout.channels_count; i++) {
 				gf_bs_write_u8(bs, ptr->layout.layoutsi.position);
 				if (ptr->layout.layoutsi.position==126) {
@@ -12514,10 +13059,18 @@
 				}
 			}
 		} else {
-			gf_bs_write_u64(bs, ptr->layout.omittedChannelsMap);
+			if (ptr->version==1) {
+				gf_bs_write_int(bs, 0, 4);
+				gf_bs_write_int(bs, ptr->layout.channel_order_definition, 3);
+				gf_bs_write_int(bs, ptr->layout.omitted_channels_present, 1);
+				if (ptr->layout.omitted_channels_present)
+					gf_bs_write_u64(bs, ptr->layout.omittedChannelsMap);
+			} else {
+				gf_bs_write_u64(bs, ptr->layout.omittedChannelsMap);
+			}
 		}
 	}
-	if (ptr->layout.stream_structure & 2) {
+	if ((ptr->version==0) && (ptr->layout.stream_structure & 2)) {
 		gf_bs_write_u8(bs, ptr->layout.object_count);
 	}
 	return GF_OK;
@@ -12527,20 +13080,28 @@
 {
 	GF_ChannelLayoutBox *ptr = (GF_ChannelLayoutBox *) s;
 	s->size += 1;
+	if (ptr->version==1) s->size++;
 	if (ptr->layout.stream_structure & 1) {
 		s->size += 1;
 		if (ptr->layout.definedLayout==0) {
 			u32 i;
+			if (ptr->version==1) s->size++;
 			for (i=0; i<ptr->layout.channels_count; i++) {
 				s->size+=1;
 				if (ptr->layout.layoutsi.position==126)
 					s->size+=3;
 			}
 		} else {
-			s->size += 8;
+			if (ptr->version==1) {
+				s->size += 1;
+				if (ptr->layout.omitted_channels_present)
+					s->size += 8;
+			} else {
+				s->size += 8;
+			}
 		}
 	}
-	if (ptr->layout.stream_structure & 2) {
+	if ((ptr->version==0) && (ptr->layout.stream_structure & 2)) {
 		s->size += 1;
 	}
 	return GF_OK;
@@ -12957,6 +13518,9 @@
 			tag_size-=2;
 			prop_type = gf_bs_read_u16(bs);
 			prop_size -= 6;
+			if (ptr->size < prop_size && data) {
+				gf_free(data);
+			}
 			ISOM_DECREASE_SIZE_NO_ERR(ptr, prop_size)
 			//add 3 extra bytes for UTF16 case string dump (3 because we need 0-aligned short value)
 			data2 = gf_malloc(sizeof(char) * (prop_size+3));
@@ -12977,7 +13541,9 @@
 		gf_list_add(ptr->tags, tag);
 
 		if (tag_size) {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("isom invalid tag size in Xtra !\n"));
+			GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("isom left-over bytes in tag %s in Xtra !\n", data));
+			gf_bs_skip_bytes(bs, tag_size);
+			ISOM_DECREASE_SIZE_NO_ERR(ptr, tag_size)
 		}
 	}
 	return GF_OK;
@@ -13248,6 +13814,36 @@
 	return GF_OK;
 }
 
+#endif /*GPAC_DISABLE_ISOM_WRITE*/
+
+
+GF_Box *empty_box_new()
+{
+	ISOM_DECL_BOX_ALLOC(GF_Box, GF_QT_BOX_TYPE_FRCD);
+	return (GF_Box *) tmp;
+}
+
+void empty_box_del(GF_Box *s)
+{
+	gf_free(s);
+}
+
+GF_Err empty_box_read(GF_Box *s, GF_BitStream *bs)
+{
+	return GF_OK;
+}
+
+#ifndef GPAC_DISABLE_ISOM_WRITE
+GF_Err empty_box_write(GF_Box *s, GF_BitStream *bs)
+{
+	return gf_isom_box_write_header(s, bs);
+}
+
+GF_Err empty_box_size(GF_Box *s)
+{
+	return GF_OK;
+}
+
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
 #endif /*GPAC_DISABLE_ISOM*/

gpac-2.2.1.tar.gz/src/isomedia/box_code_drm.c -> gpac-2.4.0.tar.gz/src/isomedia/box_code_drm.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre, Cyril Concolato
- *			Copyright (c) Telecom ParisTech 2005-2022
+ *			Copyright (c) Telecom ParisTech 2005-2024
  *					All rights reserved
  *
  *  This file is part of GPAC / ISO Media File Format sub-project
@@ -862,9 +862,13 @@
 
 	if (!ptr->version) {
 		gf_bs_read_u8(bs); //reserved
-	} else {
+	} else if (ptr->version==1) {
 		ptr->crypt_byte_block = gf_bs_read_int(bs, 4);
 		ptr->skip_byte_block = gf_bs_read_int(bs, 4);
+	} else {
+		ptr->crypt_byte_block = gf_bs_read_u32(bs);
+		ptr->skip_byte_block = gf_bs_read_u32(bs);
+		ISOM_DECREASE_SIZE(ptr, 7);
 	}
 	ptr->isProtected = gf_bs_read_u8(bs);
 
@@ -909,8 +913,13 @@
 	if (!ptr->version) {
 		gf_bs_write_u8(bs, 0); //reserved
 	} else {
-		gf_bs_write_int(bs, ptr->crypt_byte_block, 4);
-		gf_bs_write_int(bs, ptr->skip_byte_block, 4);
+		if (ptr->version==1) {
+			gf_bs_write_int(bs, ptr->crypt_byte_block, 4);
+			gf_bs_write_int(bs, ptr->skip_byte_block, 4);
+		} else {
+			gf_bs_write_u32(bs, ptr->crypt_byte_block);
+			gf_bs_write_u32(bs, ptr->skip_byte_block);
+		}
 	}
 	gf_bs_write_u8(bs, ptr->isProtected);
 
@@ -927,6 +936,10 @@
 {
 	GF_TrackEncryptionBox *ptr = (GF_TrackEncryptionBox*)s;
 	ptr->size += 3;
+	if ((ptr->crypt_byte_block>15) || (ptr->skip_byte_block>15)) {
+		ptr->version=2;
+		ptr->size += 7;
+	}
 
 	ptr->size += 17;
 	if ((ptr->isProtected == 1) && ! ptr->key_info3) {
@@ -1006,12 +1019,14 @@
 void piff_psec_box_del(GF_Box *s)
 {
 	GF_SampleEncryptionBox *ptr = (GF_SampleEncryptionBox *)s;
-	while (gf_list_count(ptr->samp_aux_info)) {
-		GF_CENCSampleAuxInfo *sai = (GF_CENCSampleAuxInfo *)gf_list_get(ptr->samp_aux_info, 0);
-		if (sai) gf_isom_cenc_samp_aux_info_del(sai);
-		gf_list_rem(ptr->samp_aux_info, 0);
+	if (ptr->samp_aux_info) {
+		u32 i, count=gf_list_count(ptr->samp_aux_info);
+		for (i=0; i<count; i++) {
+			GF_CENCSampleAuxInfo *sai = (GF_CENCSampleAuxInfo *)gf_list_get(ptr->samp_aux_info, i);
+			if (sai) gf_isom_cenc_samp_aux_info_del(sai);
+		}
+		gf_list_del(ptr->samp_aux_info);
 	}
-	if (ptr->samp_aux_info) gf_list_del(ptr->samp_aux_info);
 	gf_free(s);
 }
 
@@ -1241,6 +1256,7 @@
 	gf_free(s);
 }
 
+#endif //ISOM
 
 u8 key_info_get_iv_size(const u8 *key_info, u32 key_info_size, u32 idx, u8 *const_iv_size, const u8 **const_iv)
 {
@@ -1280,10 +1296,12 @@
 	return 0;
 }
 
+#ifndef GPAC_DISABLE_ISOM
+
 #ifndef	GPAC_DISABLE_ISOM_FRAGMENTS
-GF_Err senc_Parse(GF_BitStream *bs, GF_TrackBox *trak, GF_TrackFragmentBox *traf, GF_SampleEncryptionBox *senc)
+GF_Err senc_Parse(GF_BitStream *bs, GF_TrackBox *trak, GF_TrackFragmentBox *traf, GF_SampleEncryptionBox *senc, u32 max_nb_samples)
 #else
-GF_Err senc_Parse(GF_BitStream *bs, GF_TrackBox *trak, void *traf, GF_SampleEncryptionBox *senc)
+GF_Err senc_Parse(GF_BitStream *bs, GF_TrackBox *trak, void *traf, GF_SampleEncryptionBox *senc, u32 max_nb_samples)
 #endif
 {
 	GF_Err e;
@@ -1316,6 +1334,19 @@
 	if (senc->flags & 2) subs_size = 8;
 
 	if (senc_size<4) return GF_BAD_PARAM;
+	if (!max_nb_samples) {
+#ifndef	GPAC_DISABLE_ISOM_FRAGMENTS
+		if (traf) {
+			i=0;
+			GF_TrackFragmentRunBox *trun;
+			while ((trun = gf_list_enum(traf->TrackRuns, &i))) {
+				max_nb_samples += trun->nb_samples;
+			}
+		} else
+#endif
+		if (trak->Media->information->sampleTable->SampleSize)
+			max_nb_samples = trak->Media->information->sampleTable->SampleSize->sampleCount;
+	}
 
 	sample_number = 1;
 #ifndef	GPAC_DISABLE_ISOM_FRAGMENTS
@@ -1353,6 +1384,9 @@
 		u32 nb_bytes_subsample = 6;
 		u32 nb_subs_bits = 16;
 
+		if (!max_nb_samples)
+			break;
+
 		GF_SAFEALLOC(sai, GF_CENCSampleAuxInfo);
 		if (!sai) {
 			gf_bs_seek(bs, pos);
@@ -1474,6 +1508,8 @@
 			sai->key_info_size = key_info_size;
 		}
 		gf_list_add(senc->samp_aux_info, sai);
+
+		max_nb_samples--;
 	}
 	gf_bs_seek(bs, pos);
 	if (parse_failed) {
@@ -1736,6 +1772,11 @@
 	GF_AdobeEncryptionInfoBox *ptr = (GF_AdobeEncryptionInfoBox*)s;
 	u32 len;
 
+	if (!ptr->size) {
+		//will force error exit
+		ISOM_DECREASE_SIZE(ptr, 1);
+	}
+
 	len = (u32) ptr->size - 1;
 	if (len) {
 		ptr->enc_algo = (char *)gf_malloc(len*sizeof(char));

gpac-2.2.1.tar.gz/src/isomedia/box_code_meta.c -> gpac-2.4.0.tar.gz/src/isomedia/box_code_meta.c Changed

@@ -315,8 +315,21 @@
 		ISOM_DECREASE_SIZE(ptr, 4)
 		item_count = gf_bs_read_u32(bs);
 	}
+	u32 base_size;
+	if (ptr->version < 2) {
+		base_size=2;
+	} else {
+		base_size=4;
+	}
+	if (ptr->version == 1 || ptr->version == 2) {
+		base_size+=2;
+	}
+	if ((u64)base_size*item_count>ptr->size) {
+		ISOM_DECREASE_SIZE(ptr, (u64)base_size*item_count)
+	}
 
 	for (i = 0; i < item_count; i++) {
+		u32 bpe;
 		GF_ItemLocationEntry *location_entry;
 		GF_SAFEALLOC(location_entry, GF_ItemLocationEntry);
 		if (!location_entry) return GF_OUT_OF_MEM;
@@ -346,6 +359,13 @@
 		ISOM_DECREASE_SIZE(ptr, 2)
 		extent_count = gf_bs_read_u16(bs);
 		location_entry->extent_entries = gf_list_new();
+		bpe = (ptr->offset_size+ptr->length_size);
+		if ((ptr->version == 1 || ptr->version == 2) && ptr->index_size > 0)
+			bpe = ptr->index_size;
+		if ((u64)bpe * extent_count > ptr->size) {
+			ISOM_DECREASE_SIZE(ptr, (u64)bpe * extent_count)
+		}
+
 		for (j = 0; j < extent_count; j++) {
 			GF_ItemExtentEntry *extent_entry;
 			GF_SAFEALLOC(extent_entry, GF_ItemExtentEntry);

gpac-2.2.1.tar.gz/src/isomedia/box_dump.c -> gpac-2.4.0.tar.gz/src/isomedia/box_dump.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2022
+ *			Copyright (c) Telecom ParisTech 2000-2024
  *					All rights reserved
  *
  *  This file is part of GPAC / ISO Media File Format sub-project
@@ -106,6 +106,10 @@
 	return GF_OK;
 }
 
+#ifdef GPAC_HAS_QJS
+static void gf_isom_dump_js_cleanup();
+#endif
+
 static Bool dump_skip_samples = GF_FALSE;
 GF_EXPORT
 GF_Err gf_isom_dump(GF_ISOFile *mov, FILE * trace, Bool skip_init, Bool skip_samples)
@@ -117,7 +121,7 @@
 
 	gf_fprintf(trace, "\n");
 
-	fname = strrchr(mov->fileName, '/');
+	fname = mov->fileName ? strrchr(mov->fileName, '/') : "/memory";
 	if (!fname) fname = strrchr(mov->fileName, '\\');
 	if (!fname) fname = mov->fileName;
 	else fname+=1;
@@ -138,6 +142,10 @@
 		gf_isom_box_dump(box, trace);
 	}
 	gf_fprintf(trace, "</IsoMediaFile>\n");
+
+#ifdef GPAC_HAS_QJS
+	gf_isom_dump_js_cleanup();
+#endif
 	return GF_OK;
 }
 
@@ -359,11 +367,12 @@
 
 GF_Err url_box_dump(GF_Box *a, FILE * trace)
 {
-	GF_DataEntryURLBox *p;
-
-	p = (GF_DataEntryURLBox *)a;
-	gf_isom_box_dump_start(a, "URLDataEntryBox", trace);
-	if (p->location) {
+	GF_DataEntryURLBox *p = (GF_DataEntryURLBox *)a;
+	const char *name = (p->type==GF_ISOM_BOX_TYPE_IMDT) ? "DataEntryImdaBox" : "URLDataEntryBox";
+	gf_isom_box_dump_start(a, name, trace);
+	if (p->type==GF_ISOM_BOX_TYPE_IMDT) {
+		gf_fprintf(trace, " imda_ID=\"%u\">\n", p->imda_ref_id);
+	} else if (p->location) {
 		gf_fprintf(trace, " URL=\"%s\">\n", p->location);
 	} else {
 		gf_fprintf(trace, ">\n");
@@ -375,7 +384,7 @@
 			}
 		}
 	}
-	gf_isom_box_dump_done("URLDataEntryBox", a, trace);
+	gf_isom_box_dump_done(name, a, trace);
 	return GF_OK;
 }
 
@@ -747,19 +756,21 @@
 	if (p->version)
 		gf_fprintf(trace, " Version=\"%d\"", p->version);
 
-	if (p->samplerate_lo) {
-		if (p->type==GF_ISOM_SUBTYPE_MLPA) {
-			u32 sr = p->samplerate_hi;
-			sr <<= 16;
-			sr |= p->samplerate_lo;
-			gf_fprintf(trace, " SampleRate=\"%d\"", sr);
+	if (p->version != 2) {
+		if (p->samplerate_lo) {
+			if (p->type==GF_ISOM_SUBTYPE_MLPA) {
+				u32 sr = p->samplerate_hi;
+				sr <<= 16;
+				sr |= p->samplerate_lo;
+				gf_fprintf(trace, " SampleRate=\"%d\"", sr);
+			} else {
+				gf_fprintf(trace, " SampleRate=\"%d.%d\"", p->samplerate_hi, p->samplerate_lo);
+			}
 		} else {
-			gf_fprintf(trace, " SampleRate=\"%d.%d\"", p->samplerate_hi, p->samplerate_lo);
+			gf_fprintf(trace, " SampleRate=\"%d\"", p->samplerate_hi);
 		}
-	} else {
-		gf_fprintf(trace, " SampleRate=\"%d\"", p->samplerate_hi);
+		gf_fprintf(trace, " Channels=\"%d\" BitsPerSample=\"%d\"", p->channel_count, p->bitspersample);
 	}
-	gf_fprintf(trace, " Channels=\"%d\" BitsPerSample=\"%d\"", p->channel_count, p->bitspersample);
 	if (p->qtff_mode) {
 		gf_fprintf(trace, " isQTFF=\"%d\"", p->qtff_mode);
 		gf_fprintf(trace, " qtRevisionLevel=\"%d\"", p->revision);
@@ -772,6 +783,19 @@
 			gf_fprintf(trace, " qtBytesPerFrame=\"%d\"", p->extensions8<<24 | p->extensions9<<16 | p->extensions10<<8 | p->extensions11);
 			gf_fprintf(trace, " qtBytesPerSample=\"%d\"", p->extensions12<<24 | p->extensions13<<16 | p->extensions14<<8 | p->extensions15);
 		}
+		else if (p->version == 2) {
+			GF_BitStream *bs = gf_bs_new(p->extensions, 36, GF_BITSTREAM_READ);
+			gf_fprintf(trace, " resSampleRate=\"%d\" resChannels=\"%d\" resBitsPerSample=\"%d\"", p->samplerate_hi, p->channel_count, p->bitspersample);
+			gf_fprintf(trace, " sizeOfStructOnly=\"%u\"", gf_bs_read_u32(bs));
+			gf_fprintf(trace, " audioSampleRate=\"%f\"", gf_bs_read_double(bs));
+			gf_fprintf(trace, " numAudioChannels=\"%x\"", gf_bs_read_u32(bs));
+			gf_fprintf(trace, " res1=\"%x\"", gf_bs_read_u32(bs));
+			gf_fprintf(trace, " constBitsPerChannel=\"%u\"", gf_bs_read_u32(bs));
+			gf_fprintf(trace, " formatSpecificFlags=\"%u\"", gf_bs_read_u32(bs));
+			gf_fprintf(trace, " constBytesPerAudioPacket=\"%u\"", gf_bs_read_u32(bs));
+			gf_fprintf(trace, " constLPCMFramesPerAudioPacket=\"%u\"", gf_bs_read_u32(bs));
+			gf_bs_del(bs);
+		}
 	}
 }
 
@@ -1535,8 +1559,9 @@
 	//full box
 	get_and_print("version", 8)
 	get_and_print("flags", 24)
+	get_4cc_and_print("profile", 32)
 
-	nb_comps = gf_bs_read_u16(bs);
+	nb_comps = gf_bs_read_u32(bs);
 	gf_bs_skip_bytes(bs, 5*nb_comps);
 
 	get_and_print("sampling_type", 8)
@@ -1548,14 +1573,14 @@
 	get_and_print("block_reversed", 1)
 	get_and_print("pad_unknown", 1)
 	get_and_print("reserved", 3)
-	get_and_print("pixel_size", 8)
+	get_and_print("pixel_size", 32)
 	get_and_print("row_align_size", 32)
 	get_and_print("tile_align_size", 32)
 	get_and_print("num_tile_cols_minus_one", 32)
 	get_and_print("num_tile_rows_minus_one", 32)
 
 	gf_fprintf(trace, ">\n");
-	gf_bs_seek(bs, 6);
+	gf_bs_seek(bs, 10);
 	for (i=0; i<nb_comps; i++) {
 		gf_fprintf(trace, "<ComponentInfo");
 		get_and_print("index", 16)
@@ -1571,9 +1596,7 @@
 }
 
 static char *ctyp_names = {"Monochrome", "Y", "U/Cb", "V/Cr", "Red", "Green", "Blue", "Alpha", "Depth", "Disparity", "Palette", "FilterArray",
-	"padded", "Gamma", "X-ray", "VUV", "UVC", "UVB", "UVA", "NIR", "SWIR", "MWIR", "LWIR", "Panchromatic",
-	"SAR complex", "SAR magnitude", "SAR phase",
-	"ISAR complex", "ISAR magnitude", "ISAR phase"};
+	"padded", "Cyan", "Magenta", "Yellow", "KeyBlack"};
 
 static const char *get_comp_type_name(u32 ctype)
 {
@@ -1588,7 +1611,7 @@
 	GF_BitStream *bs = gf_bs_new(u->data, u->dataSize, GF_BITSTREAM_READ);
 	gf_isom_box_dump_start((GF_Box *)u, "ComponentDefinitionBox", trace);
 
-	nb_comps = gf_bs_read_u16(bs);
+	nb_comps = gf_bs_read_u32(bs);
 	gf_fprintf(trace, ">\n");
 	for (i=0; i<nb_comps; i++) {
 		gf_fprintf(trace, "<Component");
@@ -1635,7 +1658,7 @@
 	}
 	for (i=0; i<nb_comps; i++) {
 		gf_fprintf(trace, "<Component");
-		get_and_print("index", 16)
+		get_and_print("index", 32)
 		typesi.bits = 1 + gf_bs_read_int(bs, 8);
 		typesi.type = gf_bs_read_int(bs, 8);
 		gf_fprintf(trace, " bit_depth=\"%u\" type=\"%u\" name=\"%s\"/>\n", typesi.bits, typesi.type, get_comp_type_name(typesi.type) );
@@ -1699,8 +1722,8 @@
 	for (i=0; i<pw; i++) {
 		for (j=0; j<ph; j++) {
 			gf_fprintf(trace, "<Component x=\"%d\" y=\"%d\"", i, j);
-			get_and_print("index", 16)
-			gf_fprintf(trace, " gain\"%g\"/>\n", gf_bs_read_double(bs) );
+			get_and_print("index", 32)
+			gf_fprintf(trace, " gain=\"%g\"/>\n", gf_bs_read_float(bs) );
 		}
 	}
 	gf_bs_del(bs);
@@ -1708,6 +1731,94 @@
 	return GF_OK;
 }
 
+static GF_Err dump_sbpm(GF_UnknownBox *u, FILE * trace)
+{
+	u32 val, i, nb_comp, nb_r, nb_c, nb_p;
+	GF_BitStream *bs = gf_bs_new(u->data, u->dataSize, GF_BITSTREAM_READ);
+	gf_isom_box_dump_start((GF_Box *)u, "SensorBrokenPixelMap", trace);
+
+	//full box
+	get_and_print("version", 8)
+	get_and_print("flags", 24)
+	get_and_print("component_count", 32)
+	nb_comp = val;
+	if (nb_comp) {
+		gf_fprintf(trace, " components_indices=\"");
+		for (i=0; i<nb_comp; i++) {
+			gf_fprintf(trace, "%u ", gf_bs_read_u32(bs));
+		}
+		gf_fprintf(trace, "\"");
+	}
+	get_and_print("correction_applied", 1)
+	gf_bs_read_int(bs, 7);
+	nb_r = gf_bs_read_u32(bs);
+	nb_c = gf_bs_read_u32(bs);
+	nb_p = gf_bs_read_u32(bs);
+
+	if (nb_r) {
+		gf_fprintf(trace, " bad_rows=\"");
+		for (i=0; i<nb_r; i++) {
+			gf_fprintf(trace, "%u ", gf_bs_read_u32(bs));
+		}
+		gf_fprintf(trace, "\"");
+	}
+	if (nb_c) {
+		gf_fprintf(trace, " bad_cols=\"");
+		for (i=0; i<nb_c; i++) {
+			gf_fprintf(trace, "%u ", gf_bs_read_u32(bs));
+		}
+		gf_fprintf(trace, "\"");
+	}
+	if (nb_p) {
+		gf_fprintf(trace, " bad_pixels=\"");
+		for (i=0; i<nb_c; i++) {
+			u32 x=gf_bs_read_u32(bs);
+			u32 y=gf_bs_read_u32(bs);
+			gf_fprintf(trace, "%ux%u ", x, y);
+		}
+		gf_fprintf(trace, "\"");
+	}
+	gf_fprintf(trace, ">\n");
+	gf_bs_del(bs);
+	gf_isom_box_dump_done("ComponentPatternBox", (GF_Box *)u, trace);
+	return GF_OK;
+}
+
+static GF_Err dump_cloc(GF_UnknownBox *u, FILE * trace)
+{
+	u32 val;
+	GF_BitStream *bs = gf_bs_new(u->data, u->dataSize, GF_BITSTREAM_READ);
+	gf_isom_box_dump_start((GF_Box *)u, "ChromaLocationBox", trace);
+
+	//full box
+	get_and_print("version", 8)
+	get_and_print("flags", 24)
+	get_and_print("chroma_location", 8)
+	gf_fprintf(trace, ">\n");
+	gf_bs_del(bs);
+	gf_isom_box_dump_done("ChromaLocationBox", (GF_Box *)u, trace);
+	return GF_OK;
+}
+
+static GF_Err dump_fpac(GF_UnknownBox *u, FILE * trace)
+{
+	u32 val;
+	GF_BitStream *bs = gf_bs_new(u->data, u->dataSize, GF_BITSTREAM_READ);
+	gf_isom_box_dump_start((GF_Box *)u, "FramePackingInfoBox", trace);
+
+	//full box
+	get_and_print("version", 8)
+	get_and_print("flags", 24)
+	get_and_print("video_frame_packing", 4)
+	get_and_print("PackedContentInterpretationType", 4)
+	get_and_print("QuincunxSamplingFlag", 1)
+	gf_fprintf(trace, ">\n");
+	gf_bs_del(bs);
+	gf_isom_box_dump_done("FramePackingInfoBox", (GF_Box *)u, trace);
+	return GF_OK;
+}
+
+
 static GF_Err dump_gmcc(GF_UnknownBox *u, FILE * trace)
 {
 	u32 val, pos;
@@ -1761,6 +1872,9 @@
 }
 #undef get_and_print
 
+#ifdef GPAC_HAS_QJS
+GF_Err dump_js_data(u8 *data, u32 size, u32 b4cc, u32 par_type, GF_Box *box, FILE *trace, char *szPath);
+#endif
 
 GF_Err unkn_box_dump(GF_Box *a, FILE * trace)
 {
@@ -1785,10 +1899,28 @@
 		return dump_cpal(u, trace);
 	} else if (u->original_4cc==GF_4CC('c','p','a','t')) {
 		return dump_cpat(u, trace);
+	} else if (u->original_4cc==GF_4CC('c','l','o','c')) {
+		return dump_cloc(u, trace);
+	} else if (u->original_4cc==GF_4CC('s','b','p','m')) {
+		return dump_sbpm(u, trace);
+	} else if (u->original_4cc==GF_4CC('f','p','a','c')) {
+		return dump_fpac(u, trace);
 	} else if (u->original_4cc==GF_4CC('G','M','C','C')) {
 		return dump_gmcc(u, trace);
 	} else if (u->original_4cc==GF_4CC('d','v','c','1')) {
 		return dump_dvc1(u, trace);
+	} else {
+#ifdef GPAC_HAS_QJS
+		const char *opt = gf_opts_get_key("core", "boxdir");
+		if (opt) {
+			char szPathGF_MAX_PATH;
+			snprintf(szPath, GF_MAX_PATH-1, "%s/%s.js", opt, gf_4cc_to_str(u->original_4cc) );
+			if (gf_file_exists(szPath)) {
+				GF_Err e = dump_js_data(u->data, u->dataSize, u->original_4cc, u->parent_4cc, (GF_Box*)u, trace, szPath);
+				if (!e) return GF_OK;
+			}
+		}
+#endif
 	}
 
 	gf_isom_box_dump_start(a, name, trace);
@@ -3412,6 +3544,12 @@
 			break;
 		}
 	}
+
+	if (txt_e->displayFlags & GF_TXT_ALL_SAMPLES_FORCED)
+		gf_fprintf(dump, " forced=\"all\"");
+	else if (txt_e->displayFlags & GF_TXT_SOME_SAMPLES_FORCED)
+		gf_fprintf(dump, " forced=\"yes\"");
+
 	gf_fprintf(dump, ">\n");
 	gf_fprintf(dump, "<FontTable>\n");
 	if (txt_e->font_table) {
@@ -3452,6 +3590,8 @@
 			gf_fprintf(dump, " scrollDelay=\"%g\"", delay);
 		}
 		if (s_txt->wrap) gf_fprintf(dump, " wrap=\"%s\"", (s_txt->wrap->wrap_flag==0x01) ? "Automatic" : "None");
+
+		if (s_txt->is_forced) gf_fprintf(dump, " forced=\"yes\"");
 	}
 
 	so_count = 0;
@@ -3828,6 +3968,11 @@
 	}
 	return GF_OK;
 }
+#else
+#include <gpac/webvtt.h>
+#endif
+
+//webvtt_write_cue_bs is needed event when box dump disabled
 
 static void vttmx_timestamp_dump(GF_BitStream *bs, GF_WebVTTTimestamp *ts, Bool dump_hour, Bool write_srt)
 {
@@ -3883,6 +4028,8 @@
 	}
 }
 
+#ifndef GPAC_DISABLE_ISOM_DUMP
+
 static GF_Err gf_isom_dump_srt_track(GF_ISOFile *the_file, u32 track, FILE *dump)
 {
 	u32 i, j, count, di, ts, cur_frame;
@@ -3946,16 +4093,16 @@
 			tx3g_format_time(start, ts, szDur, GF_TRUE);
 			gf_fprintf(dump, "%s --> ", szDur);
 			tx3g_format_time(end, ts, szDur, GF_TRUE);
-			gf_fprintf(dump, "%s\n", szDur);
+			gf_fprintf(dump, "%s", szDur);
 		}
 
-
 		if (is_wvtt) {
+#ifndef GPAC_DISABLE_VTT
 			u64 start_ts, end_ts;
 			GF_List *cues;
 			u32 nb_cues;
-			u8 *data;
-			u32 data_len;
+			u8 *data=NULL;
+			u32 data_len=0;
 
 			start_ts = s->DTS * 1000;
 			start_ts /= trak->Media->mediaHeader->timeScale;
@@ -3983,21 +4130,23 @@
 			gf_bs_write_u16(bs, 0);
 			gf_bs_get_content(bs, &data, &data_len);
 			gf_bs_del(bs);
-
 			if (data) {
 				gf_fprintf(dump, "%s\n", data);
 				gf_free(data);
 			} else {
 				gf_fprintf(dump, "\n");
 			}
+#endif
 			continue;
 		} else if (subtype == GF_ISOM_SUBTYPE_STXT) {
+			gf_fprintf(dump, "\n");
 			if (s->dataLength)
 				gf_fprintf(dump, "%s\n", s->data);
 			gf_isom_sample_del(&s);
 			continue;
 		}
 		else if ((subtype!=GF_ISOM_SUBTYPE_TX3G) && (subtype!=GF_ISOM_SUBTYPE_TEXT)) {
+			gf_fprintf(dump, "\n");
 			gf_fprintf(dump, "unknown\n");
 			gf_isom_sample_del(&s);
 			continue;
@@ -4008,6 +4157,11 @@
 
 		txtd = (GF_Tx3gSampleEntryBox *)gf_list_get(trak->Media->information->sampleTable->SampleDescription->child_boxes, di-1);
 
+		if (txt->is_forced) gf_fprintf(dump, " !!!");
+		else if (txtd->displayFlags & GF_TXT_ALL_SAMPLES_FORCED) gf_fprintf(dump, " !!!");
+
+		gf_fprintf(dump, "\n");
+
 		GF_Err e = dump_ttxt_sample_srt(dump, txt, txtd, GF_FALSE);
 
 		gf_isom_sample_del(&s);
@@ -4107,7 +4261,7 @@
 
 static GF_Err gf_isom_dump_ogg_chap(GF_ISOFile *the_file, u32 track, FILE *dump, GF_TextDumpType dump_type)
 {
-	u32 i, count, di, ts, cur_frame;
+	u32 i, count, di, ts;
 	u64 start;
 	GF_BitStream *bs;
 
@@ -4122,7 +4276,6 @@
 	}
 
 	ts = trak->Media->mediaHeader->timeScale;
-	cur_frame = 0;
 
 	count = gf_isom_get_sample_count(the_file, track);
 	for (i=0; i<count; i++) {
@@ -4142,7 +4295,6 @@
 			}
 		}
 
-		cur_frame++;
 		bs = gf_bs_new(s->data, s->dataLength, GF_BITSTREAM_READ);
 		txt = gf_isom_parse_text_sample(bs);
 		gf_bs_del(bs);
@@ -4186,9 +4338,10 @@
 /* ISMA 1.0 Encryption and Authentication V 1.0  dump */
 GF_Err sinf_box_dump(GF_Box *a, FILE * trace)
 {
-	gf_isom_box_dump_start(a, "ProtectionSchemeInfoBox", trace);
+	const char *name = (a->type==GF_ISOM_BOX_TYPE_SINF) ? "ProtectionSchemeInfoBox" : "RestrictedSchemeInfoBox";
+	gf_isom_box_dump_start(a, name, trace);
 	gf_fprintf(trace, ">\n");
-	gf_isom_box_dump_done("ProtectionSchemeInfoBox", a, trace);
+	gf_isom_box_dump_done(name, a, trace);
 	return GF_OK;
 }
 
@@ -5295,8 +5448,18 @@
 
 	if (ptr->grouping_type)
 		gf_fprintf(trace, "grouping_type=\"%s\"", gf_4cc_to_str(ptr->grouping_type) );
-	if (ptr->version==1) gf_fprintf(trace, " default_length=\"%d\"", ptr->default_length);
-	if ((ptr->version>=2) && ptr->default_description_index) gf_fprintf(trace, " default_group_index=\"%d\"", ptr->default_description_index);
+	if (ptr->version>=1) gf_fprintf(trace, " default_length=\"%d\"", ptr->default_length);
+	if ((ptr->version>=2) && ptr->default_description_index) {
+		gf_fprintf(trace, " default_group_index=\"");
+		if (ptr->default_description_index>0x10000)
+			fprintf(trace, "%d(traf)", ptr->default_description_index-0x10000);
+		else
+			fprintf(trace, "%d", ptr->default_description_index);
+		gf_fprintf(trace, "\"");
+	}
+	if (ptr->flags & 1) gf_fprintf(trace, " static_samplegroup=\"yes\"");
+	if (ptr->flags & 2) gf_fprintf(trace, " static_mapping=\"yes\"");
+
 	gf_fprintf(trace, ">\n");
 	for (i=0; i<gf_list_count(ptr->group_descriptions); i++) {
 		void *entry = gf_list_get(ptr->group_descriptions, i);
@@ -5341,12 +5504,16 @@
 					kpos += 17;
 					gf_fprintf(trace, "\"");
 					if ((seig->IsProtected == 1) && !iv_size) {
-						if (kpos + 1 >= seig->key_info_size)
+						if (kpos + 1 >= seig->key_info_size) {
+							gf_fprintf(trace, "/>\n");
 							break;
+						}
 						u8 const_IV_size = seig->key_infokpos;
 						gf_fprintf(trace, " constant_IV_size=\"%d\"  constant_IV=\"", const_IV_size);
-						if (kpos + 1 + const_IV_size >= seig->key_info_size)
+						if (kpos + 1 + const_IV_size > seig->key_info_size) {
+							gf_fprintf(trace, "invalid\"/>\n");
 							break;
+						}
 						dump_data_hex(trace, (char *)seig->key_info + kpos + 1, const_IV_size);
 						kpos += 1 + const_IV_size;
 						gf_fprintf(trace, "\"");
@@ -5408,11 +5575,51 @@
 			gf_fprintf(trace, "\"/>\n");
 		}
 			break;
-		default:
-			gf_fprintf(trace, "<DefaultSampleGroupDescriptionEntry size=\"%d\" data=\"", ((GF_DefaultSampleGroupDescriptionEntry*)entry)->length);
-			dump_data(trace, (char *) ((GF_DefaultSampleGroupDescriptionEntry*)entry)->data,  ((GF_DefaultSampleGroupDescriptionEntry*)entry)->length);
+		case GF_ISOM_SAMPLE_GROUP_ILCE:
+		{
+			GF_FieldInterlaceType *ilce = (GF_FieldInterlaceType *) entry;
+			gf_fprintf(trace, "<FieldInterlaceTypeEntry interlace_type=\"%d\" interleaved=\"%d\" first_field_type=\"%d\" bottom_first=\"%d\"/>\n",
+				ilce->ilce_type>>6,
+				(ilce->ilce_type>>5) & 0x1,
+				(ilce->ilce_type>>4) & 0x1,
+				(ilce->ilce_type>>3) & 0x1
+			);
+		}
+			break;
+
+		case GF_ISOM_SAMPLE_GROUP_ESGH:
+		{
+			GF_EssentialSamplegroupEntry *esgh = (GF_EssentialSamplegroupEntry *) entry;
+			gf_fprintf(trace, "<EssentialSampleGroupEntry samplegroup_types=\"");
+			for (i=0; i<esgh->nb_types; i++) {
+				if (i) gf_fprintf(trace, " ");
+				gf_fprintf(trace, "%s", gf_4cc_to_str(esgh->group_typesi));
+			}
 			gf_fprintf(trace, "\"/>\n");
 		}
+			break;
+		default:
+			if (ptr->is_opaque) {
+				Bool do_dump = GF_TRUE;
+#ifdef GPAC_HAS_QJS
+				const char *opt = gf_opts_get_key("core", "boxdir");
+				if (opt) {
+					GF_DefaultSampleGroupDescriptionEntry *defe = (GF_DefaultSampleGroupDescriptionEntry*)entry;
+					char szPathGF_MAX_PATH;
+					snprintf(szPath, GF_MAX_PATH-1, "%s/sgpd_%s.js", opt, gf_4cc_to_str(ptr->grouping_type) );
+					if (gf_file_exists(szPath)) {
+						dump_js_data(defe->data, defe->length, ptr->grouping_type, 0, NULL, trace, szPath);
+						do_dump = GF_FALSE;
+					}
+				}
+#endif
+				if (do_dump) {
+					gf_fprintf(trace, "<DefaultSampleGroupDescriptionEntry size=\"%d\" data=\"", ((GF_DefaultSampleGroupDescriptionEntry*)entry)->length);
+					dump_data(trace, (char *) ((GF_DefaultSampleGroupDescriptionEntry*)entry)->data,  ((GF_DefaultSampleGroupDescriptionEntry*)entry)->length);
+					gf_fprintf(trace, "\"/>\n");
+				}
+			}
+		}
 	}
 	if (!ptr->size) {
 		switch (ptr->grouping_type) {
@@ -5455,6 +5662,13 @@
 		case GF_ISOM_SAMPLE_GROUP_SULM:
 			gf_fprintf(trace, "<SubPictureLayoutMapEntry groupID_info_4cc=\"\" groupIDs=\"\" />\n");
 			break;
+		case GF_ISOM_SAMPLE_GROUP_ILCE:
+			gf_fprintf(trace, "<FieldInterlaceTypeEntry interlace_type=\"\" interleaved=\"\" first_field_type=\"\" bottom_first=\"\"/>\n");
+			break;
+
+		case GF_ISOM_SAMPLE_GROUP_ESGH:
+			gf_fprintf(trace, "<EssentialSampleGroupEntry samplegroup_types=\"\" />\n");
+			break;
 
 		default:
 			gf_fprintf(trace, "<DefaultSampleGroupDescriptionEntry size=\"\" data=\"\"/>\n");
@@ -5518,15 +5732,18 @@
 	}
 
 	gf_fprintf(trace, ">\n");
-
-	if (ptr->version==0) {
-		for (i=0; i<ptr->entry_count; i++) {
-			gf_fprintf(trace, "<SAIChunkOffset offset=\"%d\"/>\n", (u32) ptr->offsetsi);
+	if (ptr->offsets) {
+		if (ptr->version==0) {
+			for (i=0; i<ptr->entry_count; i++) {
+				gf_fprintf(trace, "<SAIChunkOffset offset=\"%d\"/>\n", (u32) ptr->offsetsi);
+			}
+		} else {
+			for (i=0; i<ptr->entry_count; i++) {
+				gf_fprintf(trace, "<SAIChunkOffset offset=\""LLD"\"/>\n", ptr->offsetsi);
+			}
 		}
 	} else {
-		for (i=0; i<ptr->entry_count; i++) {
-			gf_fprintf(trace, "<SAIChunkOffset offset=\""LLD"\"/>\n", ptr->offsetsi);
-		}
+		gf_fprintf(trace, "\n");
 	}
 	if (!ptr->size) {
 			gf_fprintf(trace, "<SAIChunkOffset offset=\"\"/>\n");
@@ -5585,7 +5802,7 @@
 	}
 	dump_data_hex(trace, (char *) ptr->key_info+4, 16);
 	if (ptr->version)
-		gf_fprintf(trace, "\" crypt_byte_block=\"%d\" skip_byte_block=\"%d", ptr->crypt_byte_block, ptr->skip_byte_block);
+		gf_fprintf(trace, "\" crypt_byte_block=\"%u\" skip_byte_block=\"%u", ptr->crypt_byte_block, ptr->skip_byte_block);
 	gf_fprintf(trace, "\">\n");
 
 	if (!ptr->size) {
@@ -5735,7 +5952,7 @@
 			}
 		}
 		if (use_multikey || ((ptr->flags & 0x2) && (sai->cenc_data_size>iv_size)) ) {
-			u32 j, nb_subs;
+			u32 j, nb_subs, total_bytes=0;
 
 			nb_subs = gf_bs_read_int(bs, subs_bits);
 			gf_fprintf(trace, " SubsampleCount=\"%u\"", nb_subs);
@@ -5751,7 +5968,10 @@
 				clear = gf_bs_read_u16(bs);
 				crypt = gf_bs_read_u32(bs);
 				gf_fprintf(trace, " NumClearBytes=\"%u\" NumEncryptedBytes=\"%u\"/>\n", clear, crypt);
+				total_bytes+=clear+crypt;
 			}
+			if (!gf_sys_is_test_mode())
+				gf_fprintf(trace, "\n", total_bytes);
 		} else {
 			gf_fprintf(trace, ">\n");
 		}
@@ -5983,11 +6203,23 @@
 
 GF_Err imir_box_dump(GF_Box *a, FILE * trace)
 {
-	GF_ImageMirrorBox *ptr = (GF_ImageMirrorBox *)a;
 	if (!a) return GF_BAD_PARAM;
-	gf_isom_box_dump_start(a, "ImageMirrorBox", trace);
-	gf_fprintf(trace, "axis=\"%s\">\n", (ptr->axis ? "horizontal" : "vertical"));
-	gf_isom_box_dump_done("ImageMirrorBox", a, trace);
+	if (a->type==GF_ISOM_BOX_TYPE_IMIR) {
+		GF_ImageMirrorBox *ptr = (GF_ImageMirrorBox *)a;
+		gf_isom_box_dump_start(a, "ImageMirrorBox", trace);
+		gf_fprintf(trace, "axis=\"%s\">\n", (ptr->axis ? "horizontal" : "vertical"));
+		gf_isom_box_dump_done("ImageMirrorBox", a, trace);
+	} else if (a->type==GF_ISOM_BOX_TYPE_ILCE) {
+		GF_FieldInterlaceTypeBox *ptr = (GF_FieldInterlaceTypeBox *)a;
+		gf_isom_box_dump_start(a, "FieldInterlaceTypeBox", trace);
+		gf_fprintf(trace, "interlace_type=\"%d\" interleaved=\"%d\" first_field_type=\"%d\" bottom_first=\"%d\">\n",
+			ptr->interlace_type>>6,
+			(ptr->interlace_type>>5)&1,
+			(ptr->interlace_type>>4)&1,
+			(ptr->interlace_type>>3)&1
+		);
+		gf_isom_box_dump_done("FieldInterlaceTypeBox", a, trace);
+	}
 	return GF_OK;
 }
 
@@ -6569,6 +6801,55 @@
 	return GF_OK;
 }
 
+GF_Err ddts_box_dump(GF_Box *a, FILE * trace)
+{
+	GF_DTSSpecificBox *ptr = (GF_DTSSpecificBox *)a;
+
+	gf_isom_box_dump_start(a, "DTSpecificBox", trace);
+	gf_fprintf(trace, "SamplingFrequency=\"%d\" MaxBitrate=\"%d\" AvgBitrate=\"%d\" "
+		"SampleDepth=\"%d\" FrameDuration=\"%d\" StreamConstruction=\"%d\" "
+		"CoreLFEPresent=\"%d\" CoreLayout=\"%d\" CoreSize=\"%d\" StereoDownmix=\"%d\" "
+		"RepresentationType=\"%d\" ChannelLayout=\"%d\" MultiAssetFlag=\"%d\" "
+		"LBRDurationMod=\"%d\"",
+		ptr->cfg.SamplingFrequency, ptr->cfg.MaxBitrate, ptr->cfg.AvgBitrate,
+		ptr->cfg.SampleDepth, ptr->cfg.FrameDuration, ptr->cfg.StreamConstruction,
+		ptr->cfg.CoreLFEPresent, ptr->cfg.CoreLayout, ptr->cfg.CoreSize,
+		ptr->cfg.StereoDownmix, ptr->cfg.RepresentationType, ptr->cfg.ChannelLayout,
+		ptr->cfg.MultiAssetFlag, ptr->cfg.LBRDurationMod);
+	gf_isom_box_dump_done("DTSSpecificBox", a, trace);
+	return GF_OK;
+}
+
+GF_Err udts_box_dump(GF_Box *a, FILE * trace)
+{
+	GF_UDTSSpecificBox *ptr = (GF_UDTSSpecificBox *)a;
+	u32 byte;
+	u8 i;
+	u8 *data;
+	gf_isom_box_dump_start(a, "UDTSpecificBox", trace);
+	gf_fprintf(trace,
+		"DecoderProfileCode=\"%d\" FrameDurationCode=\"%d\" MaxPayloadCode=\"%d\" "
+		"NumPresentationsCode=\"%d\" ChannelMask=\"%d\" BaseSamplingFrequencyCode=\"%d\" "
+		"SampleRateMod=\"%d\" RepresentationType=\"%d\" StreamIndex=\"%d\" "
+		"ExpansionBoxPresent=\"%d\"",
+		ptr->cfg.DecoderProfileCode, ptr->cfg.FrameDurationCode, ptr->cfg.MaxPayloadCode,
+		ptr->cfg.NumPresentationsCode, ptr->cfg.ChannelMask,
+		ptr->cfg.BaseSamplingFrequencyCode, ptr->cfg.SampleRateMod,
+		ptr->cfg.RepresentationType, ptr->cfg.StreamIndex, ptr->cfg.ExpansionBoxPresent);
+	if ((ptr->cfg.NumPresentationsCode + 1) * 16 < ptr->cfg.PresentationIDTagDataSize) {
+		data = ptr->cfg.PresentationIDTagData;
+		for (i=0; i<=ptr->cfg.NumPresentationsCode; i++) {
+			if (ptr->cfg.IDTagPresenti) {
+				gf_fprintf(trace, " PresentationIDTag%d=\"", i + 1);
+				for (byte=0; byte<16; byte++)
+					gf_fprintf(trace, "%02X", *data++);
+				gf_fprintf(trace, "\"");
+			}
+		}
+	}
+	gf_isom_box_dump_done("UDTSSpecificBox", a, trace);
+	return GF_OK;
+}
 
 GF_Err mvcg_box_dump(GF_Box *a, FILE * trace)
 {
@@ -6703,8 +6984,9 @@
 	Bool use_grpt_param = ptr->flags & (1<<6);
 
 	gf_isom_box_dump_start(a, "CompactSampleGroupBox", trace);
-	fprintf(trace, "version=\"%u\" index_msb_indicates_fragment_local_description=\"%d\" grouping_type_parameter_present=\"%d\" pattern_size_code=\"%d\" count_size_code=\"%d\" index_size_code=\"%d\" grouping_type=\"%s\" pattern_count=\"%d\"",
+	fprintf(trace, "Version=\"%u\" Flags=\"%d\" index_msb_indicates_fragment_local_description=\"%d\" grouping_type_parameter_present=\"%d\" pattern_size_code=\"%d\" count_size_code=\"%d\" index_size_code=\"%d\" grouping_type=\"%s\" pattern_count=\"%d\"",
 		ptr->version,
+		ptr->flags,
 		use_msb_traf,
 		use_grpt_param,
 		((ptr->flags>>4) & 0x3),
@@ -6744,7 +7026,7 @@
 	if (!a) return GF_BAD_PARAM;
 	gf_isom_box_dump_start(a, "ItemEncryptionPropertyBox", trace);
 	if (ptr->version)
-		gf_fprintf(trace, " skip_byte_block=\"%d\" crypt_byte_block=\"%d\"", ptr->skip_byte_block, ptr->crypt_byte_block);
+		gf_fprintf(trace, " skip_byte_block=\"%u\" crypt_byte_block=\"%u\"", ptr->skip_byte_block, ptr->crypt_byte_block);
 	gf_fprintf(trace, ">\n");
 	nb_keys = ptr->key_info ? ptr->key_info2 : 0;
 	kpos = 3;
@@ -6896,4 +7178,243 @@
 	return GF_OK;
 }
 
+GF_Err empty_box_dump(GF_Box *a, FILE * trace)
+{
+	if (!a) return GF_BAD_PARAM;
+	char *name=NULL;
+	switch(a->type) {
+	case GF_QT_BOX_TYPE_FRCD: name = "ForcedSubtitleBox"; break;
+	default: return GF_BAD_PARAM;
+	}
+	gf_isom_box_dump_start(a, name, trace);
+	gf_isom_box_dump_done(name, a, trace);
+	return GF_OK;
+}
+
+#ifdef GPAC_HAS_QJS
+#include "../quickjs/quickjs.h"
+
+void qjs_module_init_gpaccore(JSContext *ctx);
+void js_dump_error(JSContext *ctx);
+
+static char *js_pref = "import { Bitstream as BS } from 'gpaccore'\n \
+\
+function _gpac_parse_box(ab) => {\n\
+let bs = ab.byteLength ? new BS(ab) : null;\n\
+";
+
+
+static char *js_suf = "\n\
+if (bs && bs.overflow) throw \"Too many bytes read\";\n\
+else this.__unparsed = bs ? bs.available : 0;\n\
+}\n\
+globalThis.__do_parse = _gpac_parse_box;\n";
+
+void dump_element(JSContext *ctx, FILE *trace, const char *name, JSValue obj, Bool skip_name, u32 parent_type, GF_Box *box, u8 *buf, u32 buflen)
+{
+	u32 len, i, j, pass=0;
+	u32 unparsed_bytes=0;
+	Bool has_child=GF_FALSE;
+	u32 box_has_children=0;
+	JSPropertyEnum *tab;
+	const char *key, *str;
+	JSValue val;
+	JSValue v_name;
+	const char *s_name=NULL;
+	Bool is_array = JS_IsArray(ctx, obj);
+	char *elem_name = NULL;
+
+	if (is_array) {
+		elem_name = gf_strdup(name);
+		gf_dynstrcat(&elem_name, "Entry", NULL);
+	}
+	if (skip_name) {
+		v_name = JS_GetPropertyStr(ctx, obj, "Name");
+		s_name = JS_ToCString(ctx, v_name);
+		name = s_name;
+	}
+
+	val = JS_GetPropertyStr(ctx, obj, "container");
+	JS_ToInt32(ctx, &box_has_children, val);
+	JS_FreeValue(ctx, val);
+
+	val = JS_GetPropertyStr(ctx, obj, "__unparsed");
+	JS_ToInt32(ctx, &unparsed_bytes, val);
+	JS_FreeValue(ctx, val);
+
+	//try parsing remainer as boxes
+	if (box && box_has_children && (unparsed_bytes>=8)) {
+		u32 osize = (u32) box->size;
+		u32 boff = buflen-unparsed_bytes;
+		box->size = unparsed_bytes;
+		GF_BitStream *bs = gf_bs_new(buf+boff, unparsed_bytes, GF_BITSTREAM_READ);
+		gf_bs_set_cookie(bs, GF_ISOM_BS_COOKIE_NO_LOGS);
+		GF_Err e = gf_isom_box_array_read(box, bs);
+		if (e==GF_OK)
+			unparsed_bytes = 0;
+		box->size = osize;
+		gf_bs_del(bs);
+	}
+
+	fprintf(trace, "<%s", name);
+	if (box && gf_list_count(box->child_boxes))
+		has_child = GF_TRUE;
+
+	JS_GetOwnPropertyNames(ctx, &tab, &len, obj, JS_GPN_STRING_MASK | JS_GPN_ENUM_ONLY);
+
+	for (j=0;j<2;j++) {
+	for (i=0; i<len; i++) {
+		val = JS_GetProperty(ctx, obj, tabi.atom);
+		key = JS_AtomToCString(ctx, tabi.atom);
+		str = JS_ToCString(ctx, val);
+
+		if (JS_IsArray(ctx, val)) {
+			has_child = GF_TRUE;
+			if (pass)
+				dump_element(ctx, trace, is_array ? elem_name : key, val, GF_FALSE, 0, NULL, NULL, 0);
+		} else if (JS_IsObject(val)) {
+			has_child = GF_TRUE;
+			if (pass)
+				dump_element(ctx, trace, is_array ? elem_name :key, val, GF_FALSE, 0, NULL, NULL, 0);
+		} else if (!strcmp(key, "__unparsed")) {
+
+		} else if (!pass) {
+			if (!skip_name || strcmp(key, "Name"))
+				fprintf(trace, " %s=\"%s\"", key, str);
+		}
+		JS_FreeCString(ctx, key);
+		JS_FreeCString(ctx, str);
+		JS_FreeValue(ctx, val);
+	}
+		if (!pass) {
+			if (!has_child) {
+				fprintf(trace, "/>\n");
+				break;
+			} else {
+				fprintf(trace, ">\n");
+				pass++;
+			}
+		}
+	}
+
+	for(i = 0; i < len; i++)
+		JS_FreeAtom(ctx, tabi.atom);
+	js_free(ctx, tab);
+	if (unparsed_bytes) {
+		fprintf(trace, "\n", unparsed_bytes);
+	}
+
+	if (parent_type) {
+		JSValue par = JS_GetPropertyStr(ctx, obj, "Container");
+		const char *s_par = JS_ToCString(ctx, par);
+		if (s_par) {
+			if (!strstr(s_par, gf_4cc_to_str(parent_type)))
+				fprintf(trace, "\n", gf_4cc_to_str(parent_type));
+			JS_FreeCString(ctx, s_par);
+		}
+		JS_FreeValue(ctx, par);
+	}
+
+	if (elem_name) gf_free(elem_name);
+	if (has_child) {
+		if (box)
+			gf_isom_box_dump_done(name, box, trace);
+		else
+			fprintf(trace, "</%s>\n", name);
+	}
+
+	if (s_name) {
+		JS_FreeCString(ctx, s_name);
+		JS_FreeValue(ctx, v_name);
+	}
+}
+
+static JSRuntime *rt = NULL;
+static JSContext *ctx = NULL;
+
+GF_Err dump_js_data(u8 *data, u32 size, u32 b4cc, u32 par_type, GF_Box *box, FILE *trace, char *szPath)
+{
+	GF_Err e = GF_OK;
+	char *buf=NULL;
+	u8 *file;
+	u32 blen, flen;
+
+	if (!rt) {
+		rt = JS_NewRuntime();
+		ctx = JS_NewContext(rt);
+		qjs_module_init_gpaccore(ctx);
+	}
+
+	gf_dynstrcat(&buf, js_pref, NULL);
+	gf_file_load_data(szPath, &file, &flen);
+	gf_dynstrcat(&buf, file, NULL);
+	gf_free(file);
+	gf_dynstrcat(&buf, js_suf, NULL);
+	blen = (u32) strlen(buf);
+
+    JSValue ret = JS_Eval(ctx, (char *)buf, blen, szPath, JS_EVAL_TYPE_MODULE);
+	if (JS_IsException(ret)) {
+		e = GF_BAD_PARAM;
+		js_dump_error(ctx);
+	}
+	JS_FreeValue(ctx, ret);
+    gf_free(buf);
+
+	if (!e) {
+		JSValue js_print(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv);
+
+		JSValue global_obj = JS_GetGlobalObject(ctx);
+		JS_SetPropertyStr(ctx, global_obj, "print", JS_NewCFunction(ctx, js_print, "print", 1));
+		JS_SetPropertyStr(ctx, global_obj, "alert", JS_NewCFunction(ctx, js_print, "alert", 1));
+
+		JSValue obj = JS_NewObject(ctx);
+		char szName100;
+		sprintf(szName, "%s", gf_4cc_to_str(b4cc));
+		if (box) {
+			JS_SetPropertyStr(ctx, obj, "type", JS_NewString(ctx, szName));
+			JS_SetPropertyStr(ctx, obj, "Size", JS_NewInt32(ctx, (u32) box->size));
+			strcat(szName, "Box");
+		} else {
+			//sample group description
+			strcat(szName, "Entry");
+			par_type=0;
+		}
+		JS_SetPropertyStr(ctx, obj, "Name", JS_NewString(ctx, szName));
+		JS_SetPropertyStr(ctx, obj, "__unparsed", JS_NewInt32(ctx, 0));
+
+		JSValue arg = JS_NewArrayBuffer(ctx, data, size, NULL, NULL, 0);
+		JSValue fun = JS_GetPropertyStr(ctx, global_obj, "__do_parse");
+
+		ret = JS_Call(ctx, fun, obj, 1, &arg);
+		if (JS_IsException(ret)) {
+			e = GF_BAD_PARAM;
+			js_dump_error(ctx);
+		}
+		JS_FreeValue(ctx, ret);
+
+		JS_FreeValue(ctx, global_obj);
+
+		if (e==GF_OK) {
+			dump_element(ctx, trace, szName, obj, GF_TRUE, par_type, box, data, size);
+		} else {
+			gf_fprintf(trace, "\n", szName);
+		}
+		JS_FreeValue(ctx, obj);
+		JS_FreeValue(ctx, arg);
+		JS_FreeValue(ctx, fun);
+	}
+	return e;
+}
+
+static void gf_isom_dump_js_cleanup()
+{
+	if (ctx) JS_FreeContext(ctx);
+	if (rt) JS_FreeRuntime(rt);
+	ctx=NULL;
+	rt=NULL;
+}
+
+#endif
+
+
 #endif /*GPAC_DISABLE_ISOM_DUMP*/

gpac-2.2.1.tar.gz/src/isomedia/box_funcs.c -> gpac-2.4.0.tar.gz/src/isomedia/box_funcs.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2022
+ *			Copyright (c) Telecom ParisTech 2000-2024
  *					All rights reserved
  *
  *  This file is part of GPAC / ISO Media File Format sub-project
@@ -99,6 +99,7 @@
 	char uuid16;
 	GF_Err e;
 	GF_BitStream *uncomp_bs = NULL;
+	GF_BitStream *orig_bs = NULL;
 	u8 *uncomp_data = NULL;
 	u32 compressed_size=0;
 	GF_Box *newBox;
@@ -137,38 +138,69 @@
 					GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("iso file Read Box type %s (0x%08X) at position "LLU" has size 0 but is not at root/file level. Forbidden, skipping end of parent box !\n", gf_4cc_to_str(type), type, start));
 					return GF_SKIP_BOX;
 				}
-				return GF_OK;
+				return GF_ISOM_INVALID_FILE;
 			}
 		}
-		if (is_root_box && (size>=8)) {
-			Bool do_uncompress = GF_FALSE;
+		if ((is_root_box && (size>=8))
+			|| (type==GF_QT_BOX_TYPE_CMOV)
+		) {
+			u32 do_uncompress = 0;
 			u8 *compb = NULL;
+			u32 extra_bytes = 0;
 			u32 osize = 0;
 			u32 otype = type;
-			if (type==GF_4CC('!', 'm', 'o', 'f')) {
-				do_uncompress = GF_TRUE;
-				type = GF_ISOM_BOX_TYPE_MOOF;
-			}
-			else if (type==GF_4CC('!', 'm', 'o', 'v')) {
-				do_uncompress = GF_TRUE;
+
+			if (type==GF_4CC('!', 'm', 'o', 'v')) {
+				do_uncompress = 1;
 				type = GF_ISOM_BOX_TYPE_MOOV;
 			}
+			else if (type==GF_QT_BOX_TYPE_CMOV) {
+				do_uncompress = 2;
+				u32 cbtype, cbsize, ctype;
+				//parse child boxes directly
+				cbsize = gf_bs_read_u32(bs);
+				if (cbsize != 12) return GF_ISOM_INVALID_FILE;
+				cbtype = gf_bs_read_u32(bs);
+				if (cbtype != GF_QT_BOX_TYPE_DCOM) return GF_ISOM_INVALID_FILE;
+				ctype = gf_bs_read_u32(bs);
+				if (ctype != GF_4CC('z', 'l', 'i', 'b')) return GF_NOT_SUPPORTED;
+				cbsize = gf_bs_read_u32(bs);
+				if (cbsize <= 12) return GF_ISOM_INVALID_FILE;
+				cbtype = gf_bs_read_u32(bs);
+				if (cbtype != GF_QT_BOX_TYPE_CMVD) return GF_ISOM_INVALID_FILE;
+
+				//uncompressed size
+				gf_bs_read_u32(bs);
+				extra_bytes = 6*4;
+				parent_size=0;
+				parent_type=type;
+				type = cbtype;
+			}
+#ifndef GPAC_DISABLE_ISOM_FRAGMENTS
+			else if (type==GF_4CC('!', 'm', 'o', 'f')) {
+				do_uncompress = 1;
+				type = GF_ISOM_BOX_TYPE_MOOF;
+			}
 			else if (type==GF_4CC('!', 's', 'i', 'x')) {
-				do_uncompress = GF_TRUE;
+				do_uncompress = 1;
 				type = GF_ISOM_BOX_TYPE_SIDX;
 			}
 			else if (type==GF_4CC('!', 's', 's', 'x')) {
-				do_uncompress = GF_TRUE;
+				do_uncompress = 1;
 				type = GF_ISOM_BOX_TYPE_SSIX;
 			}
-
+#endif
 			if (do_uncompress) {
+				if (size>100000000) {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("iso file Compressed payload too large (%u)\n", size));
+					return GF_NOT_SUPPORTED;
+				}
 				compb = gf_malloc((u32) (size-8));
 				if (!compb) return GF_OUT_OF_MEM;
 
-				compressed_size = (u32) (size - 8);
+				compressed_size = (u32) (size - 8 - extra_bytes);
 				gf_bs_read_data(bs, compb, compressed_size);
-				e = gf_gz_decompress_payload(compb, compressed_size, &uncomp_data, &osize);
+				e = gf_gz_decompress_payload_ex(compb, compressed_size, &uncomp_data, &osize, GF_FALSE);
 				if (e) {
 					gf_free(compb);
 					GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("iso file Failed to uncompress payload for box type %s (0x%08X)\n", gf_4cc_to_str(otype), otype));
@@ -178,6 +210,7 @@
 				//keep size as complete box size for tests below
 				size = osize + 8;
 				uncomp_bs = gf_bs_new(uncomp_data, osize, GF_BITSTREAM_READ);
+				orig_bs = bs;
 				bs = uncomp_bs;
 				start = 0;
 				gf_free(compb);
@@ -255,7 +288,7 @@
 	} else {
 		//OK, create the box based on the type
 		is_special = GF_FALSE;
-		newBox = gf_isom_box_new_ex(uuid_type ? uuid_type : type, parent_type, skip_logs, is_root_box);
+		newBox = gf_isom_box_new_ex(uuid_type ? uuid_type : type, parent_type, skip_logs, is_root_box, uuid_type ? GF_TRUE : GF_FALSE);
 		if (!newBox) ERR_EXIT(GF_OUT_OF_MEM);
 	}
 
@@ -297,15 +330,20 @@
 		}
 		//move size to real bitstream offsets for tests below
 		size -= 8;
-		//remember compressed vs real size info for moof in order to properly recompute data_offset/base_data_offset
-		if (type==GF_ISOM_BOX_TYPE_MOOF) {
-			((GF_MovieFragmentBox *)newBox)->compressed_diff = (s32)size - (s32)compressed_size;
-		}
 		//remember compressed vs real size info for moov in order to properly recompute chunk offset
-		else if (type==GF_ISOM_BOX_TYPE_MOOV) {
+		if (type==GF_ISOM_BOX_TYPE_MOOV) {
 			((GF_MovieBox *)newBox)->compressed_diff = (s32)size - (s32)compressed_size;
 			((GF_MovieBox *)newBox)->file_offset = comp_start;
 		}
+		else if (type==GF_QT_BOX_TYPE_CMVD) {
+			//do not store compressed diff or file offset, cmov uses offsets in the compressed file
+			newBox->size = compressed_size + 8 + 6*4;
+		}
+#ifndef GPAC_DISABLE_ISOM_FRAGMENTS
+		//remember compressed vs real size info for moof in order to properly recompute data_offset/base_data_offset
+		else if (type==GF_ISOM_BOX_TYPE_MOOF) {
+			((GF_MovieFragmentBox *)newBox)->compressed_diff = (s32)size - (s32)compressed_size;
+		}
 		//remember compressed vs real size info for dump
 		else if (type==GF_ISOM_BOX_TYPE_SIDX) {
 			((GF_SegmentIndexBox *)newBox)->compressed_diff = (s32)size - (s32)compressed_size;
@@ -314,7 +352,9 @@
 		else if (type==GF_ISOM_BOX_TYPE_SSIX) {
 			((GF_SubsegmentIndexBox *)newBox)->compressed_diff = (s32)size - (s32)compressed_size;
 		}
+#endif
 		newBox->internal_flags = GF_ISOM_BOX_COMPRESSED;
+		bs = orig_bs;
 	}
 
 
@@ -526,24 +566,38 @@
 //definition of boxes new/del/read/write/size. For now still exported since some files other than box_funcs.c call them
 //this should be fixed by only using gf_isom_box_new
 
+#ifndef GPAC_DISABLE_ISOM_DUMP
+#define ISOM_BOX_IMPL_DECL_DUMP(a_name) \
+		GF_Err a_name##_box_dump(GF_Box *a, FILE * trace);
+#else
+#define ISOM_BOX_IMPL_DECL_DUMP(a_name)
+
+#endif
+
+#ifndef GPAC_DISABLE_ISOM_WRITE
+#define ISOM_BOX_IMPL_DECL_WRITE(a_name) \
+		GF_Err a_name##_box_write(GF_Box *s, GF_BitStream *bs); \
+		GF_Err a_name##_box_size(GF_Box *s);
+#else
+#define ISOM_BOX_IMPL_DECL_WRITE(a_name)
+
+#endif
+
+
 #define ISOM_BOX_IMPL_DECL(a_name) \
 		GF_Box * a_name##_box_new(); \
 		void a_name##_box_del(GF_Box *); \
 		GF_Err a_name##_box_read(GF_Box *s, GF_BitStream *bs); \
-		GF_Err a_name##_box_write(GF_Box *s, GF_BitStream *bs); \
-		GF_Err a_name##_box_size(GF_Box *s);\
-		GF_Err a_name##_box_dump(GF_Box *a, FILE * trace);
+		ISOM_BOX_IMPL_DECL_WRITE(a_name) \
+		ISOM_BOX_IMPL_DECL_DUMP(a_name) \
 
 #define ISOM_BOX_IMPL_DECL_CHILD(a_name) \
-		GF_Box * a_name##_box_new(); \
-		void a_name##_box_del(GF_Box *); \
-		GF_Err a_name##_box_read(GF_Box *s, GF_BitStream *bs); \
-		GF_Err a_name##_box_write(GF_Box *s, GF_BitStream *bs); \
-		GF_Err a_name##_box_size(GF_Box *s);\
-		GF_Err a_name##_box_dump(GF_Box *a, FILE * trace);\
+		ISOM_BOX_IMPL_DECL(a_name)\
+		ISOM_BOX_IMPL_DECL_DUMP(a_name) \
 		GF_Err a_name##_on_child_box(GF_Box *s, GF_Box *a, Bool is_rem);\
 
 
+ISOM_BOX_IMPL_DECL(empty)
 ISOM_BOX_IMPL_DECL(reftype)
 ISOM_BOX_IMPL_DECL(ireftype)
 ISOM_BOX_IMPL_DECL(free)
@@ -884,6 +938,10 @@
 ISOM_BOX_IMPL_DECL(dvhe)
 ISOM_BOX_IMPL_DECL(dfla)
 
+/* DTS audio */
+ISOM_BOX_IMPL_DECL(ddts)
+ISOM_BOX_IMPL_DECL(udts)
+
 ISOM_BOX_IMPL_DECL(pcmC)
 ISOM_BOX_IMPL_DECL(chnl)
 
@@ -897,31 +955,67 @@
 
 ISOM_BOX_IMPL_DECL(keys)
 
-#define BOX_DEFINE(__type, b_rad, __par) { __type, b_rad##_box_new, b_rad##_box_del, b_rad##_box_read, b_rad##_box_write, b_rad##_box_size, b_rad##_box_dump, 0, 0, 0, __par, "p12", GF_FALSE}
+#if defined(GPAC_DISABLE_ISOM_DUMP) && defined(GPAC_DISABLE_ISOM_WRITE)
+
+#define BOX_DECLARATION(_a, _b, _c, _d, _write, _size, _dump, _g, _h, _i, _j, _k, _l, _m) \
+	{ _a, _b, _c, _d, _g, _h, _i, _j, _k, _l, _m }
+
+#elif defined(GPAC_DISABLE_ISOM_DUMP)
+
+#define BOX_DECLARATION(_a, _b, _c, _d, _write, _size, _dump, _g, _h, _i, _j, _k, _l, _m) \
+	{ _a, _b, _c, _d, _write, _size, _g, _h, _i, _j, _k, _l, _m }
+
+#elif defined(GPAC_DISABLE_ISOM_WRITE)
+
+#define BOX_DECLARATION(_a, _b, _c, _d, _write, _size, _dump, _g, _h, _i, _j, _k, _l, _m) \
+	{ _a, _b, _c, _d, _dump, _g, _h, _i, _j, _k, _l, _m }
+
+#else
+
+#define BOX_DECLARATION(_a, _b, _c, _d, _write, _size, _dump, _g, _h, _i, _j, _k, _l, _m) \
+	{ _a, _b, _c, _d, _write, _size, _dump, _g, _h, _i, _j, _k, _l, _m }
 
-#define BOX_DEFINE_CHILD(__type, b_rad, __par) { __type, b_rad##_box_new, b_rad##_box_del, b_rad##_box_read, b_rad##_box_write, b_rad##_box_size, b_rad##_box_dump, 0, 0, 0, __par, "p12", GF_FALSE, b_rad##_on_child_box}
+#endif
+
+
+#define BOX_DEFINE(__type, b_rad, __par) \
+	BOX_DECLARATION(__type, b_rad##_box_new, b_rad##_box_del, b_rad##_box_read, b_rad##_box_write, b_rad##_box_size, b_rad##_box_dump, 0, 0, 0, __par, "p12", GF_FALSE, NULL)
 
-#define BOX_DEFINE_S(__type, b_rad, __par, __spec) { __type, b_rad##_box_new, b_rad##_box_del, b_rad##_box_read, b_rad##_box_write, b_rad##_box_size, b_rad##_box_dump, 0, 0, 0, __par, __spec, GF_FALSE }
+#define BOX_DEFINE_CHILD(__type, b_rad, __par) \
+	BOX_DECLARATION(__type, b_rad##_box_new, b_rad##_box_del, b_rad##_box_read, b_rad##_box_write, b_rad##_box_size, b_rad##_box_dump, 0, 0, 0, __par, "p12", GF_FALSE, b_rad##_on_child_box)
 
-#define BOX_DEFINE_S_CHILD(__type, b_rad, __par, __spec) { __type, b_rad##_box_new, b_rad##_box_del, b_rad##_box_read, b_rad##_box_write, b_rad##_box_size, b_rad##_box_dump, 0, 0, 0, __par, __spec, GF_FALSE, b_rad##_on_child_box}
+#define BOX_DEFINE_S(__type, b_rad, __par, __spec) \
+	BOX_DECLARATION(__type, b_rad##_box_new, b_rad##_box_del, b_rad##_box_read, b_rad##_box_write, b_rad##_box_size, b_rad##_box_dump, 0, 0, 0, __par, __spec, GF_FALSE, NULL)
 
-#define FBOX_DEFINE(__type, b_rad, __par, __max_v) { __type, b_rad##_box_new, b_rad##_box_del, b_rad##_box_read, b_rad##_box_write, b_rad##_box_size, b_rad##_box_dump, 0, 1+__max_v, 0, __par, "p12", GF_FALSE }
+#define BOX_DEFINE_S_CHILD(__type, b_rad, __par, __spec) \
+	BOX_DECLARATION(__type, b_rad##_box_new, b_rad##_box_del, b_rad##_box_read, b_rad##_box_write, b_rad##_box_size, b_rad##_box_dump, 0, 0, 0, __par, __spec, GF_FALSE, b_rad##_on_child_box)
 
-#define FBOX_DEFINE_CHILD(__type, b_rad, __par, __max_v) { __type, b_rad##_box_new, b_rad##_box_del, b_rad##_box_read, b_rad##_box_write, b_rad##_box_size, b_rad##_box_dump, 0, 1+__max_v, 0, __par, "p12", GF_FALSE, b_rad##_on_child_box}
+#define FBOX_DEFINE(__type, b_rad, __par, __max_v) \
+	BOX_DECLARATION(__type, b_rad##_box_new, b_rad##_box_del, b_rad##_box_read, b_rad##_box_write, b_rad##_box_size, b_rad##_box_dump, 0, 1+__max_v, 0, __par, "p12", GF_FALSE, NULL)
 
-#define FBOX_DEFINE_FLAGS(__type, b_rad, __par, __max_v, flags) { __type, b_rad##_box_new, b_rad##_box_del, b_rad##_box_read, b_rad##_box_write, b_rad##_box_size, b_rad##_box_dump, 0, 1+__max_v, flags, __par, "p12", GF_FALSE }
+#define FBOX_DEFINE_CHILD(__type, b_rad, __par, __max_v) \
+	BOX_DECLARATION(__type, b_rad##_box_new, b_rad##_box_del, b_rad##_box_read, b_rad##_box_write, b_rad##_box_size, b_rad##_box_dump, 0, 1+__max_v, 0, __par, "p12", GF_FALSE, b_rad##_on_child_box)
 
-#define FBOX_DEFINE_FLAGS_S(__type, b_rad, __par, __max_v, flags, __spec) { __type, b_rad##_box_new, b_rad##_box_del, b_rad##_box_read, b_rad##_box_write, b_rad##_box_size, b_rad##_box_dump, 0, 1+__max_v, flags, __par, __spec, GF_FALSE }
+#define FBOX_DEFINE_FLAGS(__type, b_rad, __par, __max_v, flags) \
+	BOX_DECLARATION(__type, b_rad##_box_new, b_rad##_box_del, b_rad##_box_read, b_rad##_box_write, b_rad##_box_size, b_rad##_box_dump, 0, 1+__max_v, flags, __par, "p12", GF_FALSE, NULL)
 
-#define FBOX_DEFINE_S(__type, b_rad, __par, __max_v, __spec) { __type, b_rad##_box_new, b_rad##_box_del, b_rad##_box_read, b_rad##_box_write, b_rad##_box_size, b_rad##_box_dump, 0, 1+__max_v, 0, __par, __spec, GF_FALSE }
+#define FBOX_DEFINE_FLAGS_S(__type, b_rad, __par, __max_v, flags, __spec) \
+	BOX_DECLARATION(__type, b_rad##_box_new, b_rad##_box_del, b_rad##_box_read, b_rad##_box_write, b_rad##_box_size, b_rad##_box_dump, 0, 1+__max_v, flags, __par, __spec, GF_FALSE, NULL)
 
-#define FBOX_DEFINE_S_CHILD(__type, b_rad, __par, __max_v, __spec) { __type, b_rad##_box_new, b_rad##_box_del, b_rad##_box_read, b_rad##_box_write, b_rad##_box_size, b_rad##_box_dump, 0, 1+__max_v, 0, __par, __spec, GF_FALSE, b_rad##_on_child_box}
+#define FBOX_DEFINE_S(__type, b_rad, __par, __max_v, __spec) \
+	BOX_DECLARATION(__type, b_rad##_box_new, b_rad##_box_del, b_rad##_box_read, b_rad##_box_write, b_rad##_box_size, b_rad##_box_dump, 0, 1+__max_v, 0, __par, __spec, GF_FALSE, NULL)
 
-#define TREF_DEFINE(__type, b_rad, __par, __4cc, __spec) { __type, b_rad##_box_new, b_rad##_box_del, b_rad##_box_read, b_rad##_box_write, b_rad##_box_size, b_rad##_box_dump, __4cc, 0, 0, __par, __spec, GF_FALSE }
+#define FBOX_DEFINE_S_CHILD(__type, b_rad, __par, __max_v, __spec) \
+	BOX_DECLARATION(__type, b_rad##_box_new, b_rad##_box_del, b_rad##_box_read, b_rad##_box_write, b_rad##_box_size, b_rad##_box_dump, 0, 1+__max_v, 0, __par, __spec, GF_FALSE, b_rad##_on_child_box)
 
-#define TRGT_DEFINE(__type, b_rad, __par, __4cc, max_version, __spec) { __type, b_rad##_box_new, b_rad##_box_del, b_rad##_box_read, b_rad##_box_write, b_rad##_box_size, b_rad##_box_dump, __4cc, 1+max_version, 0, __par, __spec, GF_FALSE }
+#define TREF_DEFINE(__type, b_rad, __par, __4cc, __spec) \
+	BOX_DECLARATION(__type, b_rad##_box_new, b_rad##_box_del, b_rad##_box_read, b_rad##_box_write, b_rad##_box_size, b_rad##_box_dump, __4cc, 0, 0, __par, __spec, GF_FALSE, NULL)
 
-#define SGPD_DEFINE(__type, b_rad, __par, __4cc, __spec) { __type, b_rad##_box_new, b_rad##_box_del, b_rad##_box_read, b_rad##_box_write, b_rad##_box_size, b_rad##_box_dump, __4cc, 1, 0, __par, __spec, GF_FALSE }
+#define TRGT_DEFINE(__type, b_rad, __par, __4cc, max_version, __spec) \
+	BOX_DECLARATION(__type, b_rad##_box_new, b_rad##_box_del, b_rad##_box_read, b_rad##_box_write, b_rad##_box_size, b_rad##_box_dump, __4cc, 1+max_version, 0, __par, __spec, GF_FALSE, NULL)
+
+#define SGPD_DEFINE(__type, b_rad, __par, __4cc, __spec) \
+	BOX_DECLARATION(__type, b_rad##_box_new, b_rad##_box_del, b_rad##_box_read, b_rad##_box_write, b_rad##_box_size, b_rad##_box_dump, __4cc, 1, 0, __par, __spec, GF_FALSE, NULL)
 
 #define ITUNES_TAG(_val) \
 	BOX_DEFINE_S( _val, ilst_item, "ilst data", "apple")
@@ -931,9 +1025,13 @@
 	GF_Box * (*new_fn)();
 	void (*del_fn)(GF_Box *a);
 	GF_Err (*read_fn)(GF_Box *s, GF_BitStream *bs);
+#ifndef GPAC_DISABLE_ISOM_WRITE
 	GF_Err (*write_fn)(GF_Box *s, GF_BitStream *bs);
 	GF_Err (*size_fn)(GF_Box *a);
+#endif
+#ifndef GPAC_DISABLE_ISOM_DUMP
 	GF_Err (*dump_fn)(GF_Box *a, FILE *trace);
+#endif
 	u32 alt_4cc;//used for sample grouping type and track / item reference types
 	u8 max_version_plus_one;
 	u32 flags;
@@ -1034,7 +1132,8 @@
 	BOX_DEFINE( GF_ISOM_BOX_TYPE_MDAT, mdat, "file"),
 	BOX_DEFINE( GF_ISOM_BOX_TYPE_IDAT, mdat, "meta"),
 	BOX_DEFINE( GF_ISOM_BOX_TYPE_IMDA, mdat, "file"),
-	BOX_DEFINE_CHILD( GF_ISOM_BOX_TYPE_MOOV, moov, "file"),
+	BOX_DEFINE_CHILD( GF_ISOM_BOX_TYPE_MOOV, moov, "file cmvd"),
+	BOX_DEFINE_CHILD( GF_QT_BOX_TYPE_CMVD, moov, "cmov moov"),
 	FBOX_DEFINE( GF_ISOM_BOX_TYPE_MVHD, mvhd, "moov", 1),
 	FBOX_DEFINE( GF_ISOM_BOX_TYPE_MDHD, mdhd, "mdia", 1),
 	FBOX_DEFINE( GF_ISOM_BOX_TYPE_VMHD, vmhd, "minf", 0),
@@ -1046,6 +1145,7 @@
 	BOX_DEFINE_CHILD( GF_ISOM_BOX_TYPE_DINF, dinf, "minf meta"),
 	FBOX_DEFINE_FLAGS( GF_ISOM_BOX_TYPE_URL, url, "dref", 0, 1),
 	FBOX_DEFINE_FLAGS( GF_ISOM_BOX_TYPE_URN, urn, "dref", 0, 1),
+	FBOX_DEFINE_FLAGS( GF_ISOM_BOX_TYPE_IMDT, url, "dref", 0, 0),
 	FBOX_DEFINE( GF_ISOM_BOX_TYPE_CPRT, cprt, "udta", 0),
 	FBOX_DEFINE( GF_ISOM_BOX_TYPE_KIND, kind, "udta", 0),
 	FBOX_DEFINE( GF_ISOM_BOX_TYPE_HDLR, hdlr, "mdia meta minf", 0),	//minf container is OK in QT ...
@@ -1101,7 +1201,7 @@
 	FBOX_DEFINE_CHILD( GF_ISOM_BOX_TYPE_IINF, iinf, "meta", 1),
 	FBOX_DEFINE_CHILD( GF_ISOM_BOX_TYPE_IREF, iref, "meta", 1),
 	BOX_DEFINE_CHILD( GF_ISOM_BOX_TYPE_SINF, sinf, "ipro sample_entry"),
-	BOX_DEFINE( GF_ISOM_BOX_TYPE_RINF, sinf, "sample_entry"),
+	BOX_DEFINE_CHILD( GF_ISOM_BOX_TYPE_RINF, sinf, "sample_entry"),
 	BOX_DEFINE( GF_ISOM_BOX_TYPE_FRMA, frma, "sinf rinf"),
 	FBOX_DEFINE_FLAGS(GF_ISOM_BOX_TYPE_SCHM, schm, "sinf rinf", 0, 1),
 	BOX_DEFINE_CHILD( GF_ISOM_BOX_TYPE_SCHI, schi, "sinf rinf"),
@@ -1318,6 +1418,7 @@
 	FBOX_DEFINE_S( GF_ISOM_BOX_TYPE_RLOC, rloc, "ipco", 0, "iff"),
 	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_IROT, irot, "ipco", "iff"),
 	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_IMIR, imir, "ipco", "iff"),
+	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_ILCE, imir, "ipco", "iff"),
 	FBOX_DEFINE_FLAGS_S( GF_ISOM_BOX_TYPE_IPMA, ipma, "iprp", 1, 1, "iff"),
 	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_GRPL, grpl, "meta", "iff"),
 	FBOX_DEFINE_S( GF_ISOM_BOX_TYPE_CCST, ccst, "sample_entry", 0, "iff"),
@@ -1370,7 +1471,6 @@
 	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_DIMC, dimC, "dims encs", "3gpp"),
 	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_DIST, diST, "dims", "3gpp"),
 
-
 	//CENC boxes
 	FBOX_DEFINE_S( GF_ISOM_BOX_TYPE_PSSH, pssh, "moov moof meta", 0, "cenc"),
 	FBOX_DEFINE_S( GF_ISOM_BOX_TYPE_TENC, tenc, "schi", 1, "cenc"),
@@ -1528,14 +1628,26 @@
 	BOX_DEFINE_S_CHILD( GF_QT_SUBTYPE_YVYU, video_sample_entry, "stsd", "apple"),
 	BOX_DEFINE_S_CHILD( GF_QT_SUBTYPE_RGBA, video_sample_entry, "stsd", "apple"),
 	BOX_DEFINE_S_CHILD( GF_QT_SUBTYPE_ABGR, video_sample_entry, "stsd", "apple"),
+	BOX_DEFINE_S_CHILD( GF_QT_SUBTYPE_LPCM, audio_sample_entry, "stsd", "apple"),
 
 	FBOX_DEFINE_S(GF_QT_BOX_TYPE_STPS, stss, "stbl", 0, "apple"),
 
+	BOX_DEFINE_S( GF_QT_BOX_TYPE_ENCD, unkn, "text_sample", "QT"),
+	BOX_DEFINE_S( GF_QT_BOX_TYPE_FRCD, empty, "text_sample", "QT"),
+
+
 	//dolby boxes
 	BOX_DEFINE_S_CHILD( GF_ISOM_BOX_TYPE_AC3, audio_sample_entry, "stsd", "dolby"),
 	BOX_DEFINE_S_CHILD( GF_ISOM_BOX_TYPE_EC3, audio_sample_entry, "stsd", "dolby"),
 	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_DAC3, dac3, "ac-3 wave enca", "dolby"),
-	{GF_ISOM_BOX_TYPE_DEC3, dec3_box_new, dac3_box_del, dac3_box_read, dac3_box_write, dac3_box_size, dac3_box_dump, 0, 0, 0, "ec-3 wave enca", "dolby" },
+	{GF_ISOM_BOX_TYPE_DEC3, dec3_box_new, dac3_box_del, dac3_box_read,
+#ifndef GPAC_DISABLE_ISOM_WRITE
+		dac3_box_write, dac3_box_size,
+#endif
+#ifndef GPAC_DISABLE_ISOM_DUMP
+		dac3_box_dump,
+#endif
+		0, 0, 0, "ec-3 wave enca", "dolby" },
 	BOX_DEFINE_S(GF_ISOM_BOX_TYPE_DVCC, dvcC, "dvav dva1 dvhe dvh1 dav1 avc1 avc2 avc3 avc4 hev1 hvc1 av01 encv resv", "DolbyVision"),
 	BOX_DEFINE_S(GF_ISOM_BOX_TYPE_DVVC, dvvC, "dvav dva1 dvhe dvh1 dav1 avc1 avc2 avc3 avc4 hev1 hvc1 av01 encv resv", "DolbyVision"),
 	BOX_DEFINE_S_CHILD(GF_ISOM_BOX_TYPE_DVHE, video_sample_entry, "stsd", "DolbyVision"),
@@ -1576,8 +1688,10 @@
 	BOX_DEFINE_S(GF_ISOM_BOX_UUID_TENC, piff_tenc, "schi", "smooth"),
 	BOX_DEFINE_S(GF_ISOM_BOX_UUID_PSEC, piff_psec, "trak traf", "smooth"),
 	BOX_DEFINE_S(GF_ISOM_BOX_UUID_PSSH, piff_pssh, "moov moof", "smooth"),
+#ifndef GPAC_DISABLE_ISOM_FRAGMENTS
 	BOX_DEFINE_S(GF_ISOM_BOX_UUID_TFXD, tfxd, "traf", "smooth"),
 	BOX_DEFINE_S(GF_ISOM_BOX_UUID_TFRF, tfrf, "traf", "smooth"),
+#endif
 	BOX_DEFINE_S(GF_ISOM_BOX_UUID_MSSM, uuid, "file", "smooth"),
 	BOX_DEFINE_S(GF_ISOM_BOX_UUID_TFRF, uuid, "traf", "smooth"),
 
@@ -1620,7 +1734,18 @@
 	BOX_DEFINE_S(GF_4CC('G','M','C','W'), unkn, "stsd", "GPAC"),
 	BOX_DEFINE_S(GF_4CC('G','M','C','C'), unkn, "GMCW", "GPAC"),
 
+	// DTS in ISOBMFF boxes
+	BOX_DEFINE_S_CHILD(GF_ISOM_BOX_TYPE_DTSC, audio_sample_entry, "stsd", "DTS"),
+	BOX_DEFINE_S_CHILD(GF_ISOM_BOX_TYPE_DTSE, audio_sample_entry, "stsd", "DTS"),
+	BOX_DEFINE_S_CHILD(GF_ISOM_BOX_TYPE_DTSH, audio_sample_entry, "stsd", "DTS"),
+	BOX_DEFINE_S_CHILD(GF_ISOM_BOX_TYPE_DTSL, audio_sample_entry, "stsd", "DTS"),
+	BOX_DEFINE_S_CHILD(GF_ISOM_BOX_TYPE_DTSX, audio_sample_entry, "stsd", "DTS"),
+	BOX_DEFINE_S_CHILD(GF_ISOM_BOX_TYPE_DTSY, audio_sample_entry, "stsd", "DTS"),
+	BOX_DEFINE_S(GF_ISOM_BOX_TYPE_DDTS, ddts, "audio_sample_entry", "DTS"),
+	BOX_DEFINE_S(GF_ISOM_BOX_TYPE_UDTS, udts, "audio_sample_entry", "DTS"),
+
 	/* for now we don't parse these*/
+	BOX_DEFINE_S(GF_ISOM_SUBTYPE_UNCV, unkn, "stsd", "rawff"),
 	BOX_DEFINE_S(GF_4CC('u','n','c','C'), unkn, "video_sample_entry ipco", "rawff"),
 	BOX_DEFINE_S(GF_4CC('c','m','p','d'), unkn, "video_sample_entry ipco", "rawff"),
 	BOX_DEFINE_S(GF_4CC('c','p','a','l'), unkn, "video_sample_entry ipco", "rawff"),
@@ -1630,9 +1755,11 @@
 	BOX_DEFINE_S(GF_4CC('s','n','u','c'), unkn, "video_sample_entry ipco", "rawff"),
 	BOX_DEFINE_S(GF_4CC('s','b','p','m'), unkn, "video_sample_entry ipco", "rawff"),
 	BOX_DEFINE_S(GF_4CC('c','l','o','c'), unkn, "video_sample_entry ipco", "rawff"),
-	BOX_DEFINE_S(GF_4CC('f','p','c','k'), unkn, "video_sample_entry ipco", "rawff"),
+	BOX_DEFINE_S(GF_4CC('f','p','a','c'), unkn, "video_sample_entry ipco", "rawff"),
 	BOX_DEFINE_S(GF_4CC('d','i','s','i'), unkn, "video_sample_entry ipco", "rawff"),
 	BOX_DEFINE_S(GF_4CC('d','e','p','i'), unkn, "video_sample_entry ipco", "rawff"),
+	BOX_DEFINE_S(GF_4CC('i','l','c','p'), unkn, "ipco", "rawff"),
+
 
 /*
 	GF_ISOM_BOX_TYPE_CBMP	= GF_4CC( 'c', 'b', 'm', 'p' ),
@@ -1674,12 +1801,14 @@
 
 	for (i=start_from; i<count; i++) {
 		u32 start_par_from;
+		char p4ccGF_4CC_MSIZE;
+
 		if (box_registryi.box_4cc != boxCode)
 			continue;
 
 		if (!parent_type)
 			return i;
-		if (strstr(box_registryi.parents_4cc, gf_4cc_to_str(parent_type)) != NULL)
+		if (strstr(box_registryi.parents_4cc, gf_4cc_to_str_safe(parent_type, p4cc) ) != NULL)
 			return i;
 		if (strstr(box_registryi.parents_4cc, "*") != NULL)
 			return i;
@@ -1706,9 +1835,10 @@
 	return 0;
 }
 
-GF_Box *gf_isom_box_new_ex(u32 boxType, u32 parentType, Bool skip_logs, Bool is_root_box)
+GF_Box *gf_isom_box_new_ex(u32 boxType, u32 parentType, Bool skip_logs, Bool is_root_box, Bool is_uuid)
 {
 	GF_Box *a;
+	const char *opt;
 	s32 idx = get_box_reg_idx(boxType, parentType, 0);
 	if (idx==0) {
 #ifndef GPAC_DISABLE_LOG
@@ -1727,12 +1857,18 @@
 			default:
 				if (boxType==GF_ISOM_BOX_TYPE_GDAT) break;
 
+				opt = gf_opts_get_key("core", "boxdir");
+				if (opt) {
+					char szPathGF_MAX_PATH, szTypeGF_4CC_MSIZE;
+					snprintf(szPath, GF_MAX_PATH-1, "%s/%s.js", opt, gf_4cc_to_str_safe(boxType, szType) );
+					if (gf_file_exists(szPath))
+						break;
+				}
+
 				if (is_root_box) {
 					GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("iso file Unknown top-level box type %s\n", gf_4cc_to_str(boxType)));
 				} else if (parentType) {
-					char szNameGF_4CC_MSIZE;
-					strcpy(szName, gf_4cc_to_str(parentType));
-					GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("iso file Unknown box type %s in parent %s\n", gf_4cc_to_str(boxType), szName));
+					GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("iso file Unknown box type %s in parent %s\n", gf_4cc_to_str(boxType), gf_4cc_to_str(parentType) ));
 				} else {
 					GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("iso file Unknown box type %s\n", gf_4cc_to_str(boxType)));
 				}
@@ -1740,13 +1876,14 @@
 			}
 		}
 #endif
-        if (boxType==GF_ISOM_BOX_TYPE_UUID) {
+        if (is_uuid || (boxType==GF_ISOM_BOX_TYPE_UUID)) {
             a = uuid_box_new();
             if (a) a->registry = &box_registry1;
         } else {
             a = unkn_box_new();
             if (a) {
             	((GF_UnknownBox *)a)->original_4cc = boxType;
+				((GF_UnknownBox *)a)->parent_4cc = parentType;
             	a->registry = &box_registry0;
 			}
         }
@@ -1775,7 +1912,7 @@
 GF_EXPORT
 GF_Box *gf_isom_box_new(u32 boxType)
 {
-	return gf_isom_box_new_ex(boxType, 0, 0, GF_FALSE);
+	return gf_isom_box_new_ex(boxType, 0, 0, GF_FALSE, GF_FALSE);
 }
 
 GF_Err gf_isom_box_array_read(GF_Box *parent, GF_BitStream *bs)
@@ -1784,6 +1921,9 @@
 	u32 parent_type = parent->type;
 	GF_Box *a = NULL;
 	Bool skip_logs = (gf_bs_get_cookie(bs) & GF_ISOM_BS_COOKIE_NO_LOGS ) ? GF_TRUE : GF_FALSE;
+	if (parent_type == GF_ISOM_BOX_TYPE_UNKNOWN) {
+		parent_type = ((GF_UnknownBox*)parent)->original_4cc;
+	}
 
 	//we may have terminators in some QT files (4 bytes set to 0 ...)
 	while (parent->size>=8) {
@@ -1811,9 +1951,12 @@
 		//check container validity
 		if (parent_type && strlen(a->registry->parents_4cc)) {
 			Bool parent_OK = GF_FALSE;
-			const char *parent_code = gf_4cc_to_str(parent->type);
+			char parent_codeGF_4CC_MSIZE;
 			if (parent->type == GF_ISOM_BOX_TYPE_UNKNOWN)
-				parent_code = gf_4cc_to_str( ((GF_UnknownBox*)parent)->original_4cc );
+				gf_4cc_to_str_safe(((GF_UnknownBox*)parent)->original_4cc, parent_code);
+			else
+				gf_4cc_to_str_safe(parent->type, parent_code);
+
 			if (strstr(a->registry->parents_4cc, parent_code) != NULL) {
 				parent_OK = GF_TRUE;
 			} else if (!strcmp(a->registry->parents_4cc, "*") || strstr(a->registry->parents_4cc, "* ") || strstr(a->registry->parents_4cc, " *")) {
@@ -2027,6 +2170,7 @@
 GF_EXPORT
 GF_Err gf_isom_dump_supported_box(u32 idx, FILE * trace)
 {
+#ifndef GPAC_DISABLE_ISOM_DUMP
 	u32 i;
 	u32 nb_versions=0;
 	GF_Err e;
@@ -2080,6 +2224,9 @@
 		gf_isom_box_del(a);
 	}
 	return e;
+#else
+	return GF_NOT_SUPPORTED;
+#endif
 }
 
 GF_EXPORT

gpac-2.2.1.tar.gz/src/isomedia/data_map.c -> gpac-2.4.0.tar.gz/src/isomedia/data_map.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2019
+ *			Copyright (c) Telecom ParisTech 2000-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / ISO Media File Format sub-project
@@ -33,6 +33,14 @@
 
 #ifndef GPAC_DISABLE_ISOM
 
+#ifdef GPAC_HAS_FD
+#include <stdio.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <unistd.h>
+#endif
+
+GF_BitStream *gf_bs_from_fd(int fd, u32 mode);
 
 void gf_isom_datamap_del(GF_DataMap *ptr)
 {
@@ -260,7 +268,11 @@
 		}
 		//else this is a URL (read mode only)
 	} else {
+#ifndef GPAC_DISABLE_ISOM_WRITE
 		e = gf_isom_datamap_new(ent->location, mdia->mediaTrack->moov->mov->fileName ? mdia->mediaTrack->moov->mov->fileName : mdia->mediaTrack->moov->mov->finalName, GF_ISOM_DATA_MAP_READ, & mdia->information->dataHandler);
+#else
+		e = gf_isom_datamap_new(ent->location, mdia->mediaTrack->moov->mov->fileName, GF_ISOM_DATA_MAP_READ, & mdia->information->dataHandler);
+#endif
 		if (e) return (e==GF_URL_ERROR) ? GF_ISOM_UNKNOWN_DATA_REF : e;
 	}
 	//OK, set the data entry index
@@ -372,12 +384,15 @@
 #include <string.h>
 GF_DataMap *gf_isom_fdm_new(const char *sPath, u8 mode)
 {
-	u8 bs_mode;
+	u8 bs_mode = GF_BITSTREAM_READ;
 	GF_FileDataMap *tmp;
 	GF_SAFEALLOC(tmp, GF_FileDataMap);
 	if (!tmp) return NULL;
 
 	tmp->mode = mode;
+#ifdef GPAC_HAS_FD
+	tmp->fd = -1;
+#endif
 
 	if (sPath == NULL) {
 		tmp->type = GF_ISOM_DATA_MEM;
@@ -411,7 +426,15 @@
 
 	switch (mode) {
 	case GF_ISOM_DATA_MAP_READ:
-		if (!tmp->stream) tmp->stream = gf_fopen(sPath, "rb");
+#ifdef GPAC_HAS_FD
+		if (strncmp(sPath, "gfio://", 7) && !gf_opts_get_bool("core", "no-fd")) {
+			tmp->fd = open(sPath, O_RDONLY);
+			if (tmp->fd<0) break;
+			tmp->bs = gf_bs_from_fd(tmp->fd, GF_BITSTREAM_READ);
+		} else
+#endif
+			if (!tmp->stream) tmp->stream = gf_fopen(sPath, "rb");
+
 		bs_mode = GF_BITSTREAM_READ;
 		break;
 	///we open the file in READ/WRITE mode, in case
@@ -424,9 +447,19 @@
 				tmp->stream = stdout;
 				tmp->is_stdout = 1;
 			}
-
-			if (!tmp->stream) tmp->stream = gf_fopen(sPath, "w+b");
-			if (!tmp->stream) tmp->stream = gf_fopen(sPath, "wb");
+#ifdef GPAC_HAS_FD
+			if (strncmp(sPath, "gfio://", 7) && !gf_opts_get_bool("core", "no-fd")) {
+				//make sure output dir exists
+				gf_fopen(sPath, "mkdir");
+				tmp->fd = open(sPath, O_RDWR | O_CREAT | O_TRUNC, S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH );
+				if (tmp->fd<0) break;
+				tmp->bs = gf_bs_from_fd(tmp->fd, GF_BITSTREAM_WRITE);
+			} else
+#endif
+			if (!tmp->stream) {
+				tmp->stream = gf_fopen(sPath, "w+b");
+				if (!tmp->stream) tmp->stream = gf_fopen(sPath, "wb");
+			}
 		}
 		bs_mode = GF_BITSTREAM_WRITE;
 		break;
@@ -472,6 +505,11 @@
 	if (ptr->stream && !ptr->is_stdout)
 		gf_fclose(ptr->stream);
 
+#ifdef GPAC_HAS_FD
+	if (ptr->fd>=0)
+		close(ptr->fd);
+#endif
+
 #ifndef GPAC_DISABLE_ISOM_WRITE
 	if (ptr->temp_file) {
 		gf_file_delete(ptr->temp_file);

gpac-2.2.1.tar.gz/src/isomedia/drm_sample.c -> gpac-2.4.0.tar.gz/src/isomedia/drm_sample.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *          Authors: Cyril Concolato / Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2005-2022
+ *			Copyright (c) Telecom ParisTech 2005-2024
  *					All rights reserved
  *
  *  This file is part of GPAC / ISO Media File Format sub-project
@@ -660,6 +660,7 @@
 		Media_GetSampleDesc(trak->Media, i+1, &sea, NULL);
 		if (!sea) return GF_BAD_PARAM;
 		sinf = (GF_ProtectionSchemeInfoBox*) gf_isom_box_find_child(sea->child_boxes, GF_ISOM_BOX_TYPE_SINF);
+		if (!sinf) sinf = (GF_ProtectionSchemeInfoBox*) gf_isom_box_find_child(sea->child_boxes, GF_ISOM_BOX_TYPE_RINF);
 		if (!sinf) continue;
 
 		if (outOriginalFormat && sinf->original_format) {
@@ -751,7 +752,7 @@
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
 GF_Err gf_isom_set_cenc_protection(GF_ISOFile *the_file, u32 trackNumber, u32 desc_index, u32 scheme_type,
-                                   u32 scheme_version, u32 default_IsEncrypted, u8 default_crypt_byte_block, u8 default_skip_byte_block,
+                                   u32 scheme_version, u32 default_IsEncrypted, u32 default_crypt_byte_block, u32 default_skip_byte_block,
 								    u8 *key_info, u32 key_info_size)
 {
 	GF_Err e;
@@ -890,10 +891,14 @@
 		if (!file->meta->child_boxes) file->meta->child_boxes = gf_list_new();
 		child_boxes = &file->meta->child_boxes;
 	} else if (file->FragmentsFlags & GF_ISOM_FRAG_WRITE_READY) {
+#ifndef GPAC_DISABLE_ISOM_FRAGMENTS
 		if (!file->moof) return GF_BAD_PARAM;
 		if (!file->moof->PSSHs) file->moof->PSSHs = gf_list_new();
 		child_boxes = &file->moof->child_boxes;
 		moof_pssh = file->moof->PSSHs;
+#else
+		return GF_NOT_SUPPORTED;
+#endif
 	} else {
 		if (!file->moov) return GF_BAD_PARAM;
 		if (!file->moov->child_boxes) file->moov->child_boxes = gf_list_new();
@@ -1206,7 +1211,7 @@
 {
 	u32 i;
 	Bool is_first_saiz = GF_FALSE;
-	assert(stbl);
+	gf_assert(stbl);
 
 	if (!senc->cenc_saiz) {
 		senc->cenc_saiz = (GF_SampleAuxiliaryInfoSizeBox *) gf_isom_box_new_parent(&stbl->child_boxes, GF_ISOM_BOX_TYPE_SAIZ);
@@ -1403,7 +1408,9 @@
 			if (stbl) {
 				entry = gf_list_get(stbl->SampleDescription->child_boxes, 0);
 			} else {
+#ifndef GPAC_DISABLE_ISOM_FRAGMENTS
 				entry = gf_list_get(traf->trex->track->Media->information->sampleTable->SampleDescription->child_boxes, 0);
+#endif
 			}
 
 			if (entry)
@@ -1412,6 +1419,9 @@
 			if (sinf && sinf->scheme_type) {
 				saiz_aux_info_type = sinf_fmt = sinf->scheme_type->scheme_type;
 			}
+			//default to cenc for smooth
+			else if (traf->trex->track->moov->mov->is_smooth)
+				saiz_aux_info_type = sinf_fmt = GF_ISOM_CENC_SCHEME;
 		}
 		if (!saiz_aux_info_type && (c1==1) && (c2==1)) {
 			GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("iso file saiz box without flags nor aux info type and no default scheme, ignoring\n"));
@@ -1441,7 +1451,9 @@
 			if (stbl) {
 				entry = gf_list_get(stbl->SampleDescription->child_boxes, 0);
 			} else {
+#ifndef GPAC_DISABLE_ISOM_FRAGMENTS
 				entry = gf_list_get(traf->trex->track->Media->information->sampleTable->SampleDescription->child_boxes, 0);
+#endif
 			}
 			if (entry)
 				sinf = (GF_ProtectionSchemeInfoBox *) gf_isom_box_find_child(entry->child_boxes, GF_ISOM_BOX_TYPE_SINF);
@@ -1449,6 +1461,9 @@
 			if (sinf && sinf->scheme_type) {
 				saio_aux_info_type = sinf_fmt = sinf->scheme_type->scheme_type;
 			}
+			//default to cenc for smooth
+			else if (traf->trex->track->moov->mov->is_smooth)
+				saio_aux_info_type = sinf_fmt = GF_ISOM_CENC_SCHEME;
 		}
 		if (!saio_aux_info_type && (c1==1) && (c2==1)) {
 			GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("iso file saio box without flags nor aux info type and no default scheme, ignoring\n"));
@@ -1579,7 +1594,8 @@
 			saio_cenc->cached_data = gf_malloc(sizeof(u8)*saio_cenc->total_size);
 			if (!saio_cenc->cached_data) return GF_OUT_OF_MEM;
 			cur_position = gf_bs_get_position(mdia->information->dataHandler->bs);
-			gf_bs_seek(mdia->information->dataHandler->bs, offset);
+			//offset is as written in saio (relative to frag base data offset), compensate removed bytes
+			gf_bs_seek(mdia->information->dataHandler->bs, offset - mdia->mediaTrack->moov->mov->bytes_removed );
 			gf_bs_read_data(mdia->information->dataHandler->bs, saio_cenc->cached_data, saio_cenc->total_size);
 			gf_bs_seek(mdia->information->dataHandler->bs, cur_position);
 		}
@@ -1598,7 +1614,8 @@
 
 	offset += (nb_saio == 1) ? prev_sai_size : 0;
 	cur_position = gf_bs_get_position(mdia->information->dataHandler->bs);
-	gf_bs_seek(mdia->information->dataHandler->bs, offset);
+	//offset is as written in saio (relative to frag base data offset), compensate removed bytes
+	gf_bs_seek(mdia->information->dataHandler->bs, offset - mdia->mediaTrack->moov->mov->bytes_removed);
 
 	if (out_buffer) {
 		if ((*out_size) < size) {
@@ -1650,7 +1667,7 @@
 
 	gf_isom_get_cenc_info(the_file, trackNumber, sampleDescIndex, NULL, &scheme_type, NULL);
 
-	/*get sample auxiliary information by saiz/saio rather than by parsing senc box*/
+	/*! if we have saiz/saio use this directly*/
 	if (gf_isom_cenc_has_saiz_saio_track(stbl, scheme_type)) {
 		return isom_cenc_get_sai_by_saiz_saio(trak->Media, sampleNumber, scheme_type, out_buffer, outSize);
 	}
@@ -1659,7 +1676,7 @@
 
 	//senc is not loaded by default, do it now
 	if (!gf_list_count(senc->samp_aux_info)) {
-		GF_Err e = senc_Parse(trak->Media->information->dataHandler->bs, trak, NULL, senc);
+		GF_Err e = senc_Parse(trak->Media->information->dataHandler->bs, trak, NULL, senc, 0);
 		if (e) return e;
 	}
 
@@ -1681,6 +1698,10 @@
 		u8 IV_size=0, constant_IV_size=0;
 		Bool is_Protected;
 
+#ifndef	GPAC_DISABLE_ISOM_FRAGMENTS
+		//read number of trashed samples since gf_isom_get_sample_cenc_info_internal removes them
+		sampleNumber += trak->sample_count_at_seg_start;
+#endif
 		gf_isom_get_sample_cenc_info_internal(trak, NULL, senc, sampleNumber, &is_Protected, NULL, NULL, &key_info, &key_info_size);
 		if (!key_info) {
 			IV_size = key_info_size; //piff default
@@ -1703,7 +1724,7 @@
 	return GF_OK;
 }
 
-void gf_isom_cenc_get_default_info_internal(GF_TrackBox *trak, u32 sampleDescriptionIndex, u32 *container_type, Bool *default_IsEncrypted, u8 *crypt_byte_block, u8 *skip_byte_block, const u8 **key_info, u32 *key_info_size)
+void gf_isom_cenc_get_default_info_internal(GF_TrackBox *trak, u32 sampleDescriptionIndex, u32 *container_type, Bool *default_IsEncrypted, u32 *crypt_byte_block, u32 *skip_byte_block, const u8 **key_info, u32 *key_info_size)
 {
 	GF_ProtectionSchemeInfoBox *sinf;
 
@@ -1800,7 +1821,7 @@
 }
 
 GF_EXPORT
-GF_Err gf_isom_cenc_get_default_info(GF_ISOFile *the_file, u32 trackNumber, u32 sampleDescriptionIndex, u32 *container_type, Bool *default_IsEncrypted, u8 *crypt_byte_block, u8 *skip_byte_block, const u8 **key_info, u32 *key_info_size)
+GF_Err gf_isom_cenc_get_default_info(GF_ISOFile *the_file, u32 trackNumber, u32 sampleDescriptionIndex, u32 *container_type, Bool *default_IsEncrypted, u32 *crypt_byte_block, u32 *skip_byte_block, const u8 **key_info, u32 *key_info_size)
 {
 	GF_TrackBox *trak = gf_isom_get_track_from_file(the_file, trackNumber);
 	if (!trak) return GF_BAD_PARAM;

gpac-2.2.1.tar.gz/src/isomedia/hint_track.c -> gpac-2.4.0.tar.gz/src/isomedia/hint_track.c Changed

gpac-2.2.1.tar.gz/src/isomedia/hinting.c -> gpac-2.4.0.tar.gz/src/isomedia/hinting.c Changed

gpac-2.2.1.tar.gz/src/isomedia/iff.c -> gpac-2.4.0.tar.gz/src/isomedia/iff.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Cyril Concolato
- *			Copyright (c) Telecom ParisTech 2000-2021
+ *			Copyright (c) Telecom ParisTech 2000-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / ISO Media File Format sub-project
@@ -82,6 +82,7 @@
 		return GF_NOT_SUPPORTED;
 	}
 }
+#endif
 
 GF_Box *a1lx_box_new()
 {
@@ -190,8 +191,6 @@
 
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
-#endif /*GPAC_DISABLE_ISOM_WRITE*/
-
 GF_Box *colr_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_ColourInformationBox, GF_ISOM_BOX_TYPE_COLR);
@@ -483,7 +482,9 @@
 GF_Err imir_box_read(GF_Box *s, GF_BitStream *bs)
 {
 	GF_ImageMirrorBox *p = (GF_ImageMirrorBox *)s;
-	p->axis = gf_bs_read_u8(bs) & 0x1;
+	p->axis = gf_bs_read_u8(bs);
+	if (p->type==GF_ISOM_BOX_TYPE_IMIR)
+		p->axis = p->axis & 0x1;
 	return GF_OK;
 }
 
@@ -1225,9 +1226,9 @@
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
 
+#ifndef GPAC_DISABLE_ISOM_WRITE
 
 static GF_Err gf_isom_iff_create_image_item_from_track_internal(GF_ISOFile *movie, Bool root_meta, u32 meta_track_number, u32 imported_track, const char *item_name, u32 item_id, GF_ImageItemProperties *image_props, GF_List *item_extent_refs, u32 sample_number) {
-#ifndef GPAC_DISABLE_ISOM_WRITE
 	GF_Err e;
 	u32 w, h, hSpacing, vSpacing;
 	u8 num_channels;
@@ -1266,7 +1267,7 @@
 		char sz_item_name256;
 		GF_TileItemMode orig_tile_mode;
 
-#if !defined(GPAC_DISABLE_HEVC) && !defined(GPAC_DISABLE_AV_PARSERS)
+#if !defined(GPAC_DISABLE_AV_PARSERS) && !defined(GPAC_DISABLE_MEDIA_IMPORT)
 		if (image_props->src_file)
 			e = GF_SERVICE_ERROR;
 		else
@@ -1620,7 +1621,7 @@
 
 		memset(&ipro, 0, sizeof(GF_ImageItemProtection));
 		gf_isom_get_cenc_info(fsrc, imported_track, sample_desc_index, NULL, &ipro.scheme_type, &ipro.scheme_version);
-		e = gf_isom_get_sample_cenc_info(fsrc, imported_track, sample_desc_index, &Is_Encrypted, &ipro.crypt_byte_block, &ipro.skip_byte_block, &ipro.key_info, &ipro.key_info_size);
+		e = gf_isom_get_sample_cenc_info(fsrc, imported_track, sample_number, &Is_Encrypted, &ipro.crypt_byte_block, &ipro.skip_byte_block, &ipro.key_info, &ipro.key_info_size);
 		if (e) goto exit;
 
 		if (Is_Encrypted) {
@@ -1728,12 +1729,6 @@
 	if (config_box) gf_isom_box_del(config_box);
 	image_props->cenc_info = orig_ipro;
 	return e;
-
-
-#else
-	return GF_NOT_SUPPORTED;
-#endif
-
 }
 
 static
@@ -1965,4 +1960,7 @@
  	return gf_isom_iff_create_image_item_from_track_internal(movie, root_meta, meta_track_number, imported_track, item_name, item_id, image_props, item_extent_refs, 1);
 }
 
+#endif /*GPAC_DISABLE_ISOM_WRITE*/
+
+
 #endif /*GPAC_DISABLE_ISOM*/

gpac-2.2.1.tar.gz/src/isomedia/isom_intern.c -> gpac-2.4.0.tar.gz/src/isomedia/isom_intern.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2022
+ *			Copyright (c) Telecom ParisTech 2000-2024
  *					All rights reserved
  *
  *  This file is part of GPAC / ISO Media File Format sub-project
@@ -72,7 +72,7 @@
 		} else if (mov->is_smooth) {
 			trak = gf_list_get(mov->moov->trackList, 0);
 			traf->trex = (GF_TrackExtendsBox*)gf_list_get(mov->moov->mvex->TrackExList, 0);
-			assert(traf->trex);
+			gf_fatal_assert(traf->trex);
 			traf->trex->trackID = trak->Header->trackID = traf->tfhd->trackID;
 		} else {
 			trak = gf_isom_get_track_from_id(mov->moov, traf->tfhd->trackID);
@@ -102,6 +102,7 @@
 
 		//we have PSSH per moov, internally remap as a sample group of type PSSH
 		if (gf_list_count(moof->PSSHs)) {
+#ifndef GPAC_DISABLE_ISOM_WRITE
 			u8 *pssh_data;
 			u32 pssh_len;
 			u32 k, nb_pssh = gf_list_count(moof->PSSHs);
@@ -123,11 +124,13 @@
 			gf_bs_get_content(pssh_bs, &pssh_data, &pssh_len);
 			gf_bs_del(pssh_bs);
 
-			gf_isom_set_sample_group_description_internal(mov, gf_list_find(mov->moov->trackList, trak)+1, 1+prev_sample_count, GF_4CC('P','S','S','H'), 0, pssh_data, pssh_len, GF_FALSE);
+			gf_isom_set_sample_group_description_internal(mov, gf_list_find(mov->moov->trackList, trak)+1, 1+prev_sample_count, GF_4CC('P','S','S','H'), 0, pssh_data, pssh_len, GF_FALSE, 0);
 			gf_free(pssh_data);
+#endif
 		}
 
 
+#ifndef GPAC_DISABLE_ISOM_WRITE
 		//we have emsg, internally remap as a sample group of type EMSG
 		if (gf_list_count(mov->emsgs)) {
 			u8 *emsg_data;
@@ -141,9 +144,10 @@
 			gf_bs_get_content(emsg_bs, &emsg_data, &emsg_len);
 			gf_bs_del(emsg_bs);
 
-			gf_isom_set_sample_group_description_internal(mov, gf_list_find(mov->moov->trackList, trak)+1, 1+prev_sample_count, GF_4CC('E','M','S','G'), 0, emsg_data, emsg_len, GF_FALSE);
+			gf_isom_set_sample_group_description_internal(mov, gf_list_find(mov->moov->trackList, trak)+1, 1+prev_sample_count, GF_4CC('E','M','S','G'), 0, emsg_data, emsg_len, GF_FALSE, 0);
 			gf_free(emsg_data);
 		}
+#endif
 	}
 	if (mov->emsgs) {
 		gf_isom_box_array_del(mov->emsgs);
@@ -243,6 +247,7 @@
 		}
 	}
 }
+#endif //GPAC_DISABLE_ISOM_FRAGMENTS
 
 void gf_isom_push_mdat_end(GF_ISOFile *mov, u64 mdat_end)
 {
@@ -266,6 +271,8 @@
 	}
 }
 
+#ifndef	GPAC_DISABLE_ISOM_FRAGMENTS
+
 #ifdef GF_ENABLE_CTRN
 static void gf_isom_setup_traf_inheritance(GF_ISOFile *mov)
 {
@@ -349,7 +356,7 @@
 static GF_Err gf_isom_parse_movie_boxes_internal(GF_ISOFile *mov, u32 *boxType, u64 *bytesMissing, Bool progressive_mode)
 {
 	GF_Box *a;
-	u64 totSize, mdat_end=0;
+	u64 top_start, mdat_end=0;
 	GF_Err e = GF_OK;
 
 #ifndef	GPAC_DISABLE_ISOM_FRAGMENTS
@@ -358,12 +365,12 @@
 	}
 
 	/*restart from where we stopped last*/
-	totSize = mov->current_top_box_start;
+	top_start = mov->current_top_box_start;
 	if (mov->bytes_removed) {
-		assert(totSize >= mov->bytes_removed);
-		totSize -= mov->bytes_removed;
+		gf_assert(top_start >= mov->bytes_removed);
+		top_start -= mov->bytes_removed;
 	}
-	gf_bs_seek(mov->movieFileMap->bs, totSize);
+	gf_bs_seek(mov->movieFileMap->bs, top_start);
 #endif
 
 
@@ -404,6 +411,18 @@
 				return GF_ISOM_INVALID_FILE;
 			}
 			mov->moov = (GF_MovieBox *)a;
+			if (mov->moov->has_cmvd) {
+				GF_Box *cmvd = gf_isom_box_find_child(a->child_boxes, GF_QT_BOX_TYPE_CMVD);
+				mov->moov = (GF_MovieBox *) (cmvd ? gf_isom_box_find_child(cmvd->child_boxes, GF_ISOM_BOX_TYPE_MOOV) : NULL);
+				if (!mov->moov) {
+					gf_isom_box_del(a);
+					return GF_ISOM_INVALID_FILE;
+				}
+				gf_list_del_item(cmvd->child_boxes, mov->moov);
+				gf_isom_box_del(a);
+				a = (GF_Box*)mov->moov;
+				mov->moov->type = GF_ISOM_BOX_TYPE_MOOV;
+			}
 			mov->original_moov_offset = mov->current_top_box_start;
 			/*set our pointer to the movie*/
 			mov->moov->mov = mov;
@@ -420,8 +439,6 @@
 			e = gf_list_add(mov->TopBoxes, a);
 			if (e) return e;
 
-			totSize += a->size;
-
             if (!mov->moov->mvhd) {
                 GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("iso file Missing MovieHeaderBox\n"));
                 return GF_ISOM_INVALID_FILE;
@@ -438,7 +455,7 @@
 					GF_TrackBox *trak = (GF_TrackBox *)gf_list_get(mov->moov->trackList, k);
 
 					if (trak->sample_encryption) {
-						e = senc_Parse(mov->movieFileMap->bs, trak, NULL, trak->sample_encryption);
+						e = senc_Parse(mov->movieFileMap->bs, trak, NULL, trak->sample_encryption, 0);
 						if (e) return e;
 					}
 				}
@@ -471,7 +488,6 @@
 			if (e) {
 				return e;
 			}
-			totSize += a->size;
 			gf_isom_meta_restore_items_ref(mov, mov->meta);
 			break;
 
@@ -481,7 +497,6 @@
 				mov->first_data_toplevel_offset = mov->current_top_box_start;
 				mov->first_data_toplevel_size = a->size;
 			}
-			totSize += a->size;
 
 #ifndef	GPAC_DISABLE_ISOM_FRAGMENTS
 			if (mov->emsgs) {
@@ -512,6 +527,11 @@
                     }
 				}
 			}
+			//keep all imda boxes for later rewrite
+			else if (((GF_MediaDataBox *)a)->is_imda) {
+				e = gf_list_add(mov->TopBoxes, a);
+				if (e) return e;
+			}
 			/*if we don't have any MDAT yet, create one (edit-write mode)
 			We only work with one mdat, but we're puting it at the place
 			of the first mdat found when opening a file for editing*/
@@ -535,7 +555,7 @@
 				return GF_ISOM_INVALID_FILE;
 			}
 			mov->brand = (GF_FileTypeBox *)a;
-			totSize += a->size;
+
 			e = gf_list_add(mov->TopBoxes, a);
 			if (e) return e;
 			break;
@@ -550,7 +570,6 @@
 
 			if (mov->FragmentsFlags & GF_ISOM_FRAG_READ_DEBUG) {
 				mov->otyp = (GF_Box *)a;
-				totSize += a->size;
 				e = gf_list_add(mov->TopBoxes, a);
 				if (e) return e;
 			} else {
@@ -576,7 +595,7 @@
 				return GF_ISOM_INVALID_FILE;
 			}
 			mov->pdin = (GF_ProgressiveDownloadBox *) a;
-			totSize += a->size;
+
 			e = gf_list_add(mov->TopBoxes, a);
 			if (e) return e;
 			break;
@@ -604,7 +623,6 @@
 				mov->first_data_toplevel_offset = mov->current_top_box_start;
 				mov->first_data_toplevel_size = a->size;
 			}
-			totSize += a->size;
 			if (mov->FragmentsFlags & GF_ISOM_FRAG_READ_DEBUG) {
 				e = gf_list_add(mov->TopBoxes, a);
 				if (e) return e;
@@ -643,7 +661,9 @@
 
 		case GF_ISOM_BOX_TYPE_MOOF:
 			//no support for inplace rewrite for fragmented files
+#ifndef GPAC_DISABLE_ISOM_WRITE
 			gf_isom_disable_inplace_rewrite(mov);
+#endif
 			if (!mov->moov) {
 				GF_LOG(mov->moof ? GF_LOG_DEBUG : GF_LOG_WARNING, GF_LOG_CONTAINER, ("iso file Movie fragment but no moov (yet) - possibly broken parsing!\n"));
 			}
@@ -656,7 +676,6 @@
 			}
 			((GF_MovieFragmentBox *)a)->mov = mov;
 
-			totSize += a->size;
 			mov->moof = (GF_MovieFragmentBox *) a;
 
 			/*some smooth streaming streams contain a SDTP under the TRAF: this is incorrect, convert it*/
@@ -697,7 +716,7 @@
 							GF_TrackBox *trak = GetTrackbyID(mov->moov, traf->tfhd->trackID);
 							if (trak) {
 								trak->current_traf_stsd_idx = traf->tfhd->sample_desc_index ? traf->tfhd->sample_desc_index : traf->trex->def_sample_desc_index;
-								e = senc_Parse(mov->movieFileMap->bs, trak, traf, traf->sample_encryption);
+								e = senc_Parse(mov->movieFileMap->bs, trak, traf, traf->sample_encryption, 0);
 								if (e) return e;
 								trak->current_traf_stsd_idx = 0;
 							}
@@ -707,7 +726,7 @@
 					for (k=0; k<gf_list_count(mov->moof->TrackList); k++) {
 						GF_TrackFragmentBox *traf = gf_list_get(mov->moof->TrackList, k);
 						if (traf->sample_encryption) {
-							e = senc_Parse(mov->movieFileMap->bs, NULL, traf, traf->sample_encryption);
+							e = senc_Parse(mov->movieFileMap->bs, NULL, traf, traf->sample_encryption, 0);
 							if (e) return e;
 						}
 					}
@@ -750,9 +769,15 @@
 				if ((box->dataSize==4) && (GF_4CC(c0,c1,c2,c3)==(u32)0x0D0A870A))
 					mov->is_jp2 = 1;
 				gf_isom_box_del(a);
-			} else {
+			} else if ((mov->openMode == GF_ISOM_OPEN_READ_DUMP)
+				|| (mov->FragmentsFlags & GF_ISOM_FRAG_READ_DEBUG)
+				|| !mov->mdat || !mov->moov
+			) {
 				e = gf_list_add(mov->TopBoxes, a);
 				if (e) return e;
+			} else {
+				//trash unknown boxes after moov/mdat if not debug
+				gf_isom_box_del(a);
 			}
 		}
 		break;
@@ -765,28 +790,37 @@
 					gf_isom_box_del(a);
 				else
 					mov->last_producer_ref_time = (GF_ProducerReferenceTimeBox *)a;
-				break;
+			} else {
+				e = gf_list_add(mov->TopBoxes, a);
+				if (e) return e;
 			}
 #endif
-		//fallthrough
+			break;
+
 		case GF_ISOM_BOX_TYPE_EMSG:
 #ifndef GPAC_DISABLE_ISOM_FRAGMENTS
 			if (! (mov->FragmentsFlags & GF_ISOM_FRAG_READ_DEBUG)) {
 				if (!mov->emsgs) mov->emsgs = gf_list_new();
 				gf_list_add(mov->emsgs, a);
-				break;
+			} else {
+				e = gf_list_add(mov->TopBoxes, a);
+				if (e) return e;
 			}
 #endif
+			break;
+
 		case GF_ISOM_BOX_TYPE_MFRA:
 		case GF_ISOM_BOX_TYPE_MFRO:
 			//only keep for dump mode, otherwise we ignore these boxes and we don't want to carry them over in non-fragmented file
 			if (! (mov->FragmentsFlags & GF_ISOM_FRAG_READ_DEBUG)) {
-				totSize += a->size;
 				gf_isom_box_del(a);
-				break;
+			} else {
+				e = gf_list_add(mov->TopBoxes, a);
+				if (e) return e;
 			}
+			break;
+
 		default:
-			totSize += a->size;
 			e = gf_list_add(mov->TopBoxes, a);
 			if (e) return e;
 			break;
@@ -891,7 +925,9 @@
 	}
 
 	/*default storage mode is flat*/
+#ifndef GPAC_DISABLE_ISOM_WRITE
 	mov->storageMode = GF_ISOM_STORE_FLAT;
+#endif
 	mov->es_id_default_sync = -1;
 	return mov;
 }
@@ -916,8 +952,12 @@
 		if (OpenMode == GF_ISOM_OPEN_READ_EDIT) {
 			mov->openMode = GF_ISOM_OPEN_READ_EDIT;
 
+#ifndef	GPAC_DISABLE_ISOM_WRITE
 			// create a memory edit map in case we add samples, typically during import
 			e = gf_isom_datamap_new(NULL, tmp_dir, GF_ISOM_DATA_MAP_WRITE, & mov->editFileMap);
+#else
+			e = GF_NOT_SUPPORTED;
+#endif
 			if (e) {
 				gf_isom_set_last_error(NULL, e);
 				gf_isom_delete_movie(mov);
@@ -1007,10 +1047,11 @@
 	return mov;
 }
 
+GF_EXPORT
 GF_Err gf_isom_set_write_callback(GF_ISOFile *mov,
- 			GF_Err (*on_block_out)(void *cbk, u8 *data, u32 block_size),
-			GF_Err (*on_block_patch)(void *usr_data, u8 *block, u32 block_size, u64 block_offset, Bool is_insert),
-			void (*on_last_block_start)(void *usr_data),
+			gf_isom_on_block_out on_block_out,
+			gf_isom_on_block_patch on_block_patch,
+			gf_isom_on_last_block_start on_last_block_start,
  			void *usr_data,
  			u32 block_size)
 {
@@ -1018,6 +1059,7 @@
 	if (mov->finalName && !strcmp(mov->finalName, "_gpac_isobmff_redirect")) {}
 	else if (mov->fileName && !strcmp(mov->fileName, "_gpac_isobmff_redirect")) {}
 	else return GF_BAD_PARAM;
+	if (!on_block_out) return GF_BAD_PARAM;
 	mov->on_block_out = on_block_out;
 	mov->on_block_patch = on_block_patch;
 	mov->on_last_block_start = on_last_block_start;
@@ -1044,6 +1086,23 @@
 {
 	if (!mov) return;
 
+	// track datahandlers might point to the movieFileMap that we are about to delete
+	// remove the association to avoid double frees
+	if (mov->moov && mov->moov->trackList) {
+		u32 i;
+		for (i=0; i<gf_list_count(mov->moov->trackList); i++) {
+			GF_TrackBox *trak = (GF_TrackBox*)gf_list_get(mov->moov->trackList, i);
+
+			if (trak && trak->Media && trak->Media->information) {
+				if (trak->Media->information->dataHandler == mov->movieFileMap)
+					trak->Media->information->dataHandler = NULL;
+
+				if (trak->Media->information->scalableDataHandler == mov->movieFileMap)
+					trak->Media->information->scalableDataHandler = NULL;
+			}
+		}
+	}
+
 	//these are our two main files
 	if (mov->movieFileMap) gf_isom_datamap_del(mov->movieFileMap);
 
@@ -1375,7 +1434,7 @@
 	GF_Err e;
 
 	GF_ISOFile *mov = gf_isom_new_movie();
-	if (!mov) return NULL;
+	if (!mov || !fileName) return NULL;
 	mov->openMode = OpenMode;
 	//then set up our movie
 
@@ -1387,7 +1446,7 @@
 		const char *ext;
 		//THIS IS NOT A TEMP FILE, WRITE mode is used for "live capture"
 		//this file will be the final file...
-		mov->fileName = fileName ? gf_strdup(fileName) : NULL;
+		mov->fileName = gf_strdup(fileName);
 		e = gf_isom_datamap_new(fileName, NULL, GF_ISOM_DATA_MAP_WRITE, &mov->editFileMap);
 		if (e) goto err_exit;
 
@@ -1400,7 +1459,7 @@
 		}
 	} else {
 		//we are in EDIT mode but we are creating the file -> temp file
-		mov->finalName = fileName ? gf_strdup(fileName) : NULL;
+		mov->finalName = gf_strdup(fileName);
 		e = gf_isom_datamap_new("_gpac_isobmff_tmp_edit", tmp_dir, GF_ISOM_DATA_MAP_WRITE, &mov->editFileMap);
 		if (e) {
 			gf_isom_set_last_error(NULL, e);

gpac-2.2.1.tar.gz/src/isomedia/isom_read.c -> gpac-2.4.0.tar.gz/src/isomedia/isom_read.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2022
+ *			Copyright (c) Telecom ParisTech 2000-2024
  *					All rights reserved
  *
  *  This file is part of GPAC / ISO Media File Format sub-project
@@ -205,6 +205,8 @@
 #include <gpac/internal/media_dev.h>
 #endif
 
+#ifndef GPAC_DISABLE_ISOM_FRAGMENTS
+
 static GF_Err isom_create_init_from_mem(const char *fileName, GF_ISOFile *file)
 {
 	u32 sample_rate=0;
@@ -321,7 +323,7 @@
 	if (!stbl->SampleSize) return GF_OUT_OF_MEM;
 	stbl->TimeToSample = (GF_TimeToSampleBox *) gf_isom_box_new_parent(&stbl->child_boxes, GF_ISOM_BOX_TYPE_STTS);
 	if (!stbl->TimeToSample) return GF_OUT_OF_MEM;
-	stbl->ChunkOffset = (GF_Box *) gf_isom_box_new_parent(&stbl->child_boxes, GF_ISOM_BOX_TYPE_STCO);
+	stbl->ChunkOffset = gf_isom_box_new_parent(&stbl->child_boxes, GF_ISOM_BOX_TYPE_STCO);
 	if (!stbl->ChunkOffset) return GF_OUT_OF_MEM;
 	stbl->SampleToChunk = (GF_SampleToChunkBox *) gf_isom_box_new_parent(&stbl->child_boxes, GF_ISOM_BOX_TYPE_STSC);
 	if (!stbl->SampleToChunk) return GF_OUT_OF_MEM;
@@ -418,6 +420,8 @@
 
 	return GF_OK;
 }
+#endif
+
 
 /**************************************************************
 					File Opening in streaming mode
@@ -448,7 +452,11 @@
 
 	if (!strncmp(fileName, "isobmff://", 10)) {
 		movie->movieFileMap = NULL;
+#ifndef GPAC_DISABLE_ISOM_FRAGMENTS
 		e = isom_create_init_from_mem(fileName, movie);
+#else
+			e = GF_NOT_SUPPORTED;
+#endif
 	} else {
 		//do NOT use FileMapping on incomplete files
 		e = gf_isom_datamap_new(fileName, NULL, GF_ISOM_DATA_MAP_READ, &movie->movieFileMap);
@@ -493,6 +501,20 @@
 	return gf_isom_open_progressive_ex(fileName, start_range, end_range, enable_frag_bounds, the_file, BytesMissing, NULL);
 }
 
+void gf_bs_untruncate(GF_BitStream *bs);
+GF_Err gf_isom_load_fragments(GF_ISOFile *movie, u64 start_range, u64 end_range, u64 *BytesMissing)
+{
+	gf_bs_untruncate(movie->movieFileMap->bs);
+	if (end_range>start_range) {
+		gf_bs_seek(movie->movieFileMap->bs, end_range+1);
+		gf_bs_truncate(movie->movieFileMap->bs);
+	}
+	movie->current_top_box_start = start_range;
+	gf_bs_seek(movie->movieFileMap->bs, start_range);
+	return gf_isom_parse_movie_boxes(movie, NULL, BytesMissing, GF_TRUE);
+}
+
+
 /**************************************************************
 					File Reading
 **************************************************************/
@@ -531,37 +553,7 @@
 	return (GF_ISOFile *) movie;
 }
 
-
-#if 0
-/*! gets access to the data bitstream  - see \ref gf_isom_open
-\param isom_file the target ISO file
-\param out_bs set to the file input bitstream - do NOT destroy
-\return error if any
-*/
-GF_Err gf_isom_get_bs(GF_ISOFile *movie, GF_BitStream **out_bs)
-{
-#ifndef GPAC_DISABLE_ISOM_WRITE
-	if (!movie || movie->openMode != GF_ISOM_OPEN_WRITE || !movie->editFileMap) //memory mode
-		return GF_NOT_SUPPORTED;
-
-	if (movie->segment_bs)
-		*out_bs = movie->segment_bs;
-	else
-		*out_bs = movie->editFileMap->bs;
-
-	if (movie->moof)
-		movie->moof->fragment_offset = 0;
-
-	return GF_OK;
-#else
-	return GF_NOT_SUPPORTED;
-#endif
-}
-#endif
-
-
-GF_EXPORT
-GF_Err gf_isom_write(GF_ISOFile *movie)
+static GF_Err gf_isom_write(GF_ISOFile *movie)
 {
 	GF_Err e;
 	if (movie == NULL) return GF_ISOM_INVALID_FILE;
@@ -598,7 +590,7 @@
 
 				//write mfra
 				if (!strcmp(movie->fileName, "_gpac_isobmff_redirect") && movie->on_block_out) {
-					GF_BitStream *bs = gf_bs_new_cbk(movie->on_block_out, movie->on_block_out_usr_data, movie->on_block_out_block_size);
+					GF_BitStream *bs = gf_bs_new_cbk(isom_on_block_out, movie, movie->on_block_out_block_size);
 
 					e = gf_isom_box_write((GF_Box *)movie->mfra, bs);
 					gf_bs_del(bs);
@@ -998,7 +990,7 @@
 	if (!movie || !movie->moov) return GF_BAD_PARAM;
 
 	if (creationTime) *creationTime = movie->moov->mvhd->creationTime;
-	if (creationTime) *modificationTime = movie->moov->mvhd->modificationTime;
+	if (modificationTime) *modificationTime = movie->moov->mvhd->modificationTime;
 	return GF_OK;
 }
 
@@ -1011,7 +1003,7 @@
 	if (!trak) return 0;
 
 	if (creationTime) *creationTime = trak->Media->mediaHeader->creationTime;
-	if (creationTime) *modificationTime = trak->Media->mediaHeader->modificationTime;
+	if (modificationTime) *modificationTime = trak->Media->mediaHeader->modificationTime;
 	return GF_OK;
 }
 
@@ -1084,13 +1076,21 @@
 #ifndef GPAC_DISABLE_ISOM_WRITE
 	/*in all modes except dump recompute duration in case headers are wrong*/
 	if (movie->openMode != GF_ISOM_OPEN_READ_DUMP) {
-		SetTrackDuration(trak);
+		SetTrackDurationEx(trak, GF_TRUE);
 	}
 #endif
 	return trak->Header->duration;
 }
 
 GF_EXPORT
+u64 gf_isom_get_track_duration_orig(GF_ISOFile *movie, u32 trackNumber)
+{
+	GF_TrackBox *trak;
+	trak = gf_isom_get_track_from_file(movie, trackNumber);
+	if (!trak) return 0;
+	return trak->Header->duration;
+}
+GF_EXPORT
 GF_Err gf_isom_get_media_language(GF_ISOFile *the_file, u32 trackNumber, char **lang)
 {
 	u32 count;
@@ -1276,7 +1276,7 @@
 	return GF_OK;
 }
 
-//Return referenceIndex if the given track has a reference to the given TreckID of a given ReferenceType
+//Return referenceIndex if the given track has a reference to the given TrackID of a given ReferenceType
 //return 0 if error
 GF_EXPORT
 u32 gf_isom_has_track_reference(GF_ISOFile *movie, u32 trackNumber, u32 referenceType, GF_ISOTrackID refTrackID)
@@ -1297,6 +1297,31 @@
 	return 0;
 }
 
+//Return referenceIndex if the given track has a reference to the given TrackID of a given ReferenceType
+//return 0 if error
+GF_EXPORT
+u32 gf_isom_is_track_referenced(GF_ISOFile *movie, u32 trackNumber, u32 referenceType)
+{
+	u32 i, j, count;
+	GF_TrackBox *trak;
+	GF_TrackReferenceTypeBox *dpnd;
+	trak = gf_isom_get_track_from_file(movie, trackNumber);
+	if (!trak) return 0;
+	count = gf_list_count(movie->moov->trackList);
+	for (i=0; i<count; i++) {
+		GF_TrackBox *a_trak = gf_list_get(movie->moov->trackList, i);
+		if (!a_trak->References) return 0;
+
+		dpnd = NULL;
+		if ( (movie->LastError = Track_FindRef(a_trak, referenceType, &dpnd)) ) return 0;
+		if (!dpnd) return 0;
+		for (j=0; j<dpnd->trackIDCount; j++) {
+			if (dpnd->trackIDsj == trak->Header->trackID) return i+1;
+		}
+	}
+	return 0;
+}
+
 
 
 //Return the media time given the absolute time in the Movie
@@ -1894,6 +1919,7 @@
 	u32 descIndex;
 	GF_TrackBox *trak;
 	GF_ISOSample *samp;
+	Bool ext_realloc = GF_FALSE;
 	trak = gf_isom_get_track_from_file(the_file, trackNumber);
 	if (!trak) return NULL;
 
@@ -1902,6 +1928,9 @@
 		samp = static_sample;
 		if (static_sample->dataLength && !static_sample->alloc_size)
 			static_sample->alloc_size = static_sample->dataLength;
+
+		if ((static_sample != trak->Media->extracted_samp) && trak->sample_alloc_cbk)
+			ext_realloc = GF_TRUE;
 	} else {
 		samp = gf_isom_sample_new();
 	}
@@ -1913,7 +1942,7 @@
 	sampleNumber -= trak->sample_count_at_seg_start;
 #endif
 
-	e = Media_GetSample(trak->Media, sampleNumber, &samp, &descIndex, GF_FALSE, data_offset);
+	e = Media_GetSample(trak->Media, sampleNumber, &samp, &descIndex, GF_FALSE, data_offset, ext_realloc);
 	if (static_sample && !static_sample->alloc_size)
 		static_sample->alloc_size = static_sample->dataLength;
 
@@ -2066,7 +2095,7 @@
 		if (!samp) return NULL;
 	}
 
-	e = Media_GetSample(trak->Media, sampleNumber, &samp, sampleDescriptionIndex, GF_TRUE, data_offset);
+	e = Media_GetSample(trak->Media, sampleNumber, &samp, sampleDescriptionIndex, GF_TRUE, data_offset, GF_FALSE);
 	if (e) {
 		gf_isom_set_last_error(the_file, e);
 		if (!static_sample)
@@ -2148,6 +2177,7 @@
 	GF_SampleTableBox *stbl;
 	Bool static_sample = GF_FALSE;
 	u8 useShadow, IsSync;
+	Bool ext_realloc = GF_FALSE;
 
 	if (SampleNum) *SampleNum = 0;
 	trak = gf_isom_get_track_from_file(the_file, trackNumber);
@@ -2242,6 +2272,8 @@
 	if (sample) {
 		if (*sample) {
 			static_sample = GF_TRUE;
+			if ((*sample != trak->Media->extracted_samp) && trak->sample_alloc_cbk)
+				ext_realloc = GF_TRUE;
 		} else {
 			*sample = gf_isom_sample_new();
 			if (*sample == NULL) return GF_OUT_OF_MEM;
@@ -2263,7 +2295,7 @@
 		}
 	}
 
-	e = Media_GetSample(trak->Media, sampleNumber, sample, StreamDescriptionIndex, GF_FALSE, data_offset);
+	e = Media_GetSample(trak->Media, sampleNumber, sample, StreamDescriptionIndex, GF_FALSE, data_offset, ext_realloc);
 	if (e) {
 		if (!static_sample)
 			gf_isom_sample_del(sample);
@@ -2647,6 +2679,7 @@
 		if (!trak) return 0;
 		udta = trak->udta;
 	} else {
+		if (!movie->moov) return 0;
 		udta = movie->moov->udta;
 	}
 	if (udta) return gf_list_count(udta->recordList);
@@ -2666,6 +2699,7 @@
 		if (!trak) return GF_OK;
 		udta = trak->udta;
 	} else {
+		if (!movie->moov) return GF_BAD_PARAM;
 		udta = movie->moov->udta;
 	}
 	if (!udta) return GF_BAD_PARAM;
@@ -2695,6 +2729,7 @@
 		if (!trak) return 0;
 		udta = trak->udta;
 	} else {
+		if (!movie->moov) return 0;
 		udta = movie->moov->udta;
 	}
 	if (!udta) return 0;
@@ -2727,6 +2762,7 @@
 		if (!trak) return GF_BAD_PARAM;
 		udta = trak->udta;
 	} else {
+		if (!movie->moov) return GF_BAD_PARAM;
 		udta = movie->moov->udta;
 	}
 	if (!udta) return GF_BAD_PARAM;
@@ -2738,7 +2774,7 @@
 
 	i=0;
 	while ((map = (GF_UserDataMap*)gf_list_enum(udta->recordList, &i))) {
-		if ((map->boxType == GF_ISOM_BOX_TYPE_UUID) && !memcmp(map->uuid, UUID, 16)) goto found;
+		if ((map->boxType == GF_ISOM_BOX_TYPE_UUID) && UUID && !memcmp(map->uuid, UUID, 16)) goto found;
 		else if (map->boxType == UserDataType) goto found;
 
 	}
@@ -2811,7 +2847,11 @@
 			data_size = p_uuid->dataSize;
 			data = p_uuid->data;
 		} else {
+#ifndef GPAC_DISABLE_ISOM_WRITE
 			gf_isom_box_write((GF_Box *)ptr, bs);
+#else
+			GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("ISOBMF: udta is a box-list - cannot export in read-only version of libisom in GPAC\n" ));
+#endif
 			continue;
 		}
 		s = data_size+8;
@@ -3053,7 +3093,7 @@
 		for (i=0; i<gf_list_count(movie->moov->trackList); i++) {
 			GF_TrackBox *trak = (GF_TrackBox *)gf_list_get(movie->moov->trackList, i);
 			if (trak->Media->information->dataHandler == previous_movie_fileMap_address) {
-				//reaasign for later destruction
+				//reassign for later destruction
 				trak->Media->information->scalableDataHandler = movie->movieFileMap;
 				//reassign for Media_GetSample function
 				trak->Media->information->dataHandler = movie->movieFileMap;
@@ -3101,6 +3141,7 @@
 	for (i=0; i<count; i++) {
 		GF_TrackBox *tk = gf_list_get(movie->moov->trackList, i);
 		tk->first_traf_merged = GF_FALSE;
+		tk->Media->information->sampleTable->TimeToSample->cumulated_start_dts = 0;
 	}
 #endif
 	return GF_OK;
@@ -3160,6 +3201,30 @@
 	stbl_RemoveRedundant(stbl, 1, nb_samples);
 	stbl_RemoveRAPs(stbl, nb_samples);
 
+	//purge saiz and saio
+	if (trak->sample_encryption && trak->sample_encryption->cenc_saiz) {
+		GF_SampleAuxiliaryInfoSizeBox *saiz = trak->sample_encryption->cenc_saiz;
+		if (saiz->sample_count <= nb_samples) {
+			saiz->sample_count = 0;
+		} else {
+			if (!saiz->default_sample_info_size) {
+				memmove(saiz->sample_info_size, &saiz->sample_info_sizenb_samples, sizeof(u8)*(saiz->sample_count-nb_samples));
+			}
+			saiz->sample_count-=nb_samples;
+		}
+		saiz->cached_sample_num = 0;
+		saiz->cached_prev_size = 0;
+	}
+	if (trak->sample_encryption && trak->sample_encryption->cenc_saio) {
+		GF_SampleAuxiliaryInfoOffsetBox *saio = trak->sample_encryption->cenc_saio;
+		if (saio->entry_count>1) {
+			if (saio->entry_count <= nb_samples) saio->entry_count = 0;
+			else {
+				memmove(saio->offsets, &saio->offsetsnb_samples, sizeof(u64)*(saio->entry_count-nb_samples));
+				saio->entry_count-=nb_samples;
+			}
+		}
+	}
 	//then remove sample per sample for the rest, which is either
 	//- sparse data
 	//- allocated structure rather than memmove-able array
@@ -3169,6 +3234,10 @@
 		stbl_RemoveSubSample(stbl, 1);
 		stbl_RemovePaddingBits(stbl, 1);
 		stbl_RemoveSampleGroup(stbl, 1);
+		if (trak->sample_encryption) {
+			GF_CENCSampleAuxInfo *sai = gf_list_pop_front(trak->sample_encryption->samp_aux_info);
+			gf_isom_cenc_samp_aux_info_del(sai);
+		}
 		nb_samples--;
 	}
 	return GF_OK;
@@ -4010,9 +4079,21 @@
 	if (!tk) return 0;
 	stsz = tk->Media->information->sampleTable->SampleSize;
 	if (!stsz) return 0;
+	if ( (movie->openMode==GF_ISOM_OPEN_READ) && stsz->total_size
+#ifndef GPAC_DISABLE_ISOM_FRAGMENTS
+		&& !movie->moov->mvex
+#endif
+	) {
+		return stsz->total_size;
+	}
 	if (stsz->sampleSize) return stsz->sampleSize*stsz->sampleCount;
 	size = 0;
 	for (i=0; i<stsz->sampleCount; i++) size += stsz->sizesi;
+#ifndef GPAC_DISABLE_ISOM_FRAGMENTS
+	if (movie->moov->mvex) return size;
+#endif
+	if (movie->openMode==GF_ISOM_OPEN_READ)
+		stsz->total_size = size;
 	return size;
 }
 
@@ -4092,6 +4173,7 @@
 			break;
 		case GF_ISOM_MEDIA_TEXT:
 		case GF_ISOM_MEDIA_SUBT:
+		case GF_ISOM_MEDIA_MPEG_SUBT:
 			nb_text++;
 			break;
 		case GF_ISOM_MEDIA_AUDIO:
@@ -4828,7 +4910,7 @@
 GF_EXPORT
 void gf_isom_reset_seq_num(GF_ISOFile *movie)
 {
-#ifdef GPAC_DISABLE_ISOM_FRAGMENTS
+#ifndef GPAC_DISABLE_ISOM_FRAGMENTS
 	movie->NextMoofNumber = 0;
 #endif
 }
@@ -5021,12 +5103,13 @@
 	return GF_OK;
 }
 
-GF_Err gf_isom_enum_sample_group(GF_ISOFile *the_file, u32 trackNumber, u32 sample_number, u32 *sgrp_idx, u32 *sgrp_type, u32 *sgrp_parameter, const u8 **sgrp_data, u32 *sgrp_size)
+GF_Err gf_isom_enum_sample_group(GF_ISOFile *the_file, u32 trackNumber, u32 sample_number, u32 *sgrp_idx, u32 *sgrp_type, u32 *sgrp_flags, u32 *sgrp_parameter, u8 **sgrp_data, u32 *sgrp_size)
 {
 	GF_TrackBox *trak;
 	u32 i, count;
 
 	if (!sgrp_idx || !sgrp_type) return GF_BAD_PARAM;
+	if (sgrp_flags) *sgrp_flags = 0;
 	if (sgrp_parameter) *sgrp_parameter = 0;
 	if (sgrp_data) *sgrp_data = NULL;
 	if (sgrp_size) *sgrp_size = 0;
@@ -5034,7 +5117,7 @@
 
 	trak = gf_isom_get_track_from_file(the_file, trackNumber);
 	if (!trak) return GF_BAD_PARAM;
-	if (!trak->Media->information->sampleTable->sampleGroups) return GF_OK;
+	if (!trak->Media->information->sampleTable->sampleGroupsDescription) return GF_OK;
 
 #ifndef	GPAC_DISABLE_ISOM_FRAGMENTS
 	if (sample_number <= trak->sample_count_at_seg_start) return GF_BAD_PARAM;
@@ -5043,17 +5126,21 @@
 
 	count = gf_list_count(trak->Media->information->sampleTable->sampleGroupsDescription);
 	for (i=0; i<count; i++) {
-		GF_SampleGroupBox *sg;
+		GF_SampleGroupBox *sg=NULL;
 		u32 j;
 		GF_SampleGroupDescriptionBox *sgd = (GF_SampleGroupDescriptionBox*)gf_list_get(trak->Media->information->sampleTable->sampleGroupsDescription, i);
 
 		switch (sgd->grouping_type) {
+		//use rap/roll API
 		case GF_ISOM_SAMPLE_GROUP_ROLL:
 		case GF_ISOM_SAMPLE_GROUP_PROL:
-		case GF_ISOM_SAMPLE_GROUP_TELE:
 		case GF_ISOM_SAMPLE_GROUP_RAP:
 		case GF_ISOM_SAMPLE_GROUP_SYNC:
+		//part of cenc API
 		case GF_ISOM_SAMPLE_GROUP_SEIG:
+			continue;
+
+		case GF_ISOM_SAMPLE_GROUP_TELE:
 		case GF_ISOM_SAMPLE_GROUP_OINF:
 		case GF_ISOM_SAMPLE_GROUP_LINF:
 		case GF_ISOM_SAMPLE_GROUP_TRIF:
@@ -5061,7 +5148,8 @@
 		case GF_ISOM_SAMPLE_GROUP_SAP:
 		case GF_ISOM_SAMPLE_GROUP_SPOR:
 		case GF_ISOM_SAMPLE_GROUP_SULM:
-			continue;
+		case GF_ISOM_SAMPLE_GROUP_ESGH:
+		case GF_ISOM_SAMPLE_GROUP_ILCE:
 		default:
 			break;
 		}
@@ -5085,13 +5173,20 @@
 		}
 
 		*sgrp_type = sgd->grouping_type;
+		if (sgrp_flags) {
+			*sgrp_flags = sgd->flags;
+			if (sgd->default_description_index && (sgd_index==sgd->default_description_index) )
+				*sgrp_flags |= 0x80000000;
+		}
 		if (sgrp_parameter && sg) *sgrp_parameter = sg->grouping_type_parameter;
 
 		if (sgd_index) {
 			GF_DefaultSampleGroupDescriptionEntry *entry = gf_list_get(sgd->group_descriptions, sgd_index-1);
-			if (entry) {
-				if (sgrp_data) *sgrp_data = entry->data;
-				if (sgrp_size) *sgrp_size = entry->length;
+			if (entry && sgrp_data && sgrp_size) {
+				GF_BitStream *bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
+				sgpd_write_entry(sgd->grouping_type, entry, bs);
+				gf_bs_get_content(bs, sgrp_data, sgrp_size);
+				gf_bs_del(bs);
 			}
 		}
 
@@ -5102,7 +5197,7 @@
 }
 
 
-GF_DefaultSampleGroupDescriptionEntry * gf_isom_get_sample_group_info_entry(GF_ISOFile *the_file, GF_TrackBox *trak, u32 grouping_type, u32 sample_group_description_index, u32 *default_index, GF_SampleGroupDescriptionBox **out_sgdp)
+void *gf_isom_get_sample_group_info_entry(GF_ISOFile *the_file, GF_TrackBox *trak, u32 grouping_type, u32 sample_group_description_index, u32 *default_index, GF_SampleGroupDescriptionBox **out_sgdp)
 {
 	u32 i, count;
 
@@ -5129,14 +5224,16 @@
 Bool gf_isom_get_sample_group_info(GF_ISOFile *the_file, u32 trackNumber, u32 sample_description_index, u32 grouping_type, u32 *default_index, const u8 **data, u32 *size)
 {
 	GF_DefaultSampleGroupDescriptionEntry *sg_entry;
+	GF_SampleGroupDescriptionBox *sgdp=NULL;
 	GF_TrackBox *trak = gf_isom_get_track_from_file(the_file, trackNumber);
 
 	if (default_index) *default_index = 0;
 	if (size) *size = 0;
 	if (data) *data = NULL;
 
-	sg_entry = gf_isom_get_sample_group_info_entry(the_file, trak, grouping_type, sample_description_index, default_index, NULL);
+	sg_entry = (GF_DefaultSampleGroupDescriptionEntry *) gf_isom_get_sample_group_info_entry(the_file, trak, grouping_type, sample_description_index, default_index, &sgdp);
 	if (!sg_entry) return GF_FALSE;
+	if (!sgdp) return GF_FALSE;
 
 	switch (grouping_type) {
 	case GF_ISOM_SAMPLE_GROUP_RAP:
@@ -5147,8 +5244,10 @@
 	case GF_ISOM_SAMPLE_GROUP_LINF:
 		return GF_TRUE;
 	default:
-		if (sg_entry && data) *data = (char *) sg_entry->data;
-		if (sg_entry && size) *size = sg_entry->length;
+		if (sgdp->is_opaque) {
+			if (sg_entry && data) *data = (char *) sg_entry->data;
+			if (sg_entry && size) *size = sg_entry->length;
+		}
 		return GF_TRUE;
 	}
 	return GF_FALSE;
@@ -5390,17 +5489,16 @@
 }
 
 #ifndef	GPAC_DISABLE_ISOM_FRAGMENTS
-GF_Err gf_isom_get_sample_cenc_info_internal(GF_TrackBox *trak, GF_TrackFragmentBox *traf, GF_SampleEncryptionBox *senc, u32 sample_number, Bool *IsEncrypted, u8 *crypt_byte_block, u8 *skip_byte_block, const u8 **key_info, u32 *key_info_size)
+GF_Err gf_isom_get_sample_cenc_info_internal(GF_TrackBox *trak, GF_TrackFragmentBox *traf, GF_SampleEncryptionBox *senc, u32 sample_number, Bool *IsEncrypted, u32 *crypt_byte_block, u32 *skip_byte_block, const u8 **key_info, u32 *key_info_size)
 #else
-GF_Err gf_isom_get_sample_cenc_info_internal(GF_TrackBox *trak, void *traf, GF_SampleEncryptionBox *senc, u32 sample_number, Bool *IsEncrypted, u8 *crypt_byte_block, u8 *skip_byte_block, const u8 **key_info, u32 *key_info_size)
+GF_Err gf_isom_get_sample_cenc_info_internal(GF_TrackBox *trak, void *traf, GF_SampleEncryptionBox *senc, u32 sample_number, Bool *IsEncrypted, u32 *crypt_byte_block, u32 *skip_byte_block, const u8 **key_info, u32 *key_info_size)
 #endif
 {
 	GF_SampleGroupBox *sample_group;
 	u32 j, group_desc_index;
 	GF_SampleGroupDescriptionBox *sgdesc;
 	u32 i, count;
-	u32 descIndex, chunkNum;
-	u64 offset;
+	u32 descIndex=1;
 	u32 first_sample_in_entry, last_sample_in_entry;
 	GF_CENCSampleEncryptionGroupEntry *entry;
 
@@ -5412,7 +5510,7 @@
 
 	if (!trak) return GF_BAD_PARAM;
 
-#ifdef	GPAC_DISABLE_ISOM_FRAGMENTS
+#ifdef GPAC_DISABLE_ISOM_FRAGMENTS
 	if (traf)
 		return GF_NOT_SUPPORTED;
 #else
@@ -5420,11 +5518,16 @@
 #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, NULL);
+		u32 chunkNum;
+		u64 offset;
+		GF_Err e = stbl_GetSampleInfos(trak->Media->information->sampleTable, sample_number, &offset, &chunkNum, &descIndex, NULL);
+		if (e) return e;
 	} else {
+#ifndef	GPAC_DISABLE_ISOM_FRAGMENTS
 		//this is dump mode of fragments, we haven't merged tables yet - use current stsd idx indicated in trak
 		descIndex = trak->current_traf_stsd_idx;
 		if (!descIndex) descIndex = 1;
+#endif
 	}
 
 	gf_isom_cenc_get_default_info_internal(trak, descIndex, NULL, IsEncrypted, crypt_byte_block, skip_byte_block, key_info, key_info_size);
@@ -5524,7 +5627,7 @@
 				senc->piff_type = 2;
 				senc->IV_size = 8;
 			}
-			assert(senc->IV_size);
+			gf_assert(senc->IV_size);
 			if (IsEncrypted) *IsEncrypted = GF_TRUE;
 			if (key_info_size) *key_info_size = senc->IV_size;
 		}
@@ -5534,7 +5637,7 @@
 }
 
 GF_EXPORT
-GF_Err gf_isom_get_sample_cenc_info(GF_ISOFile *movie, u32 track, u32 sample_number, Bool *IsEncrypted, u8 *crypt_byte_block, u8 *skip_byte_block, const u8 **key_info, u32 *key_info_size)
+GF_Err gf_isom_get_sample_cenc_info(GF_ISOFile *movie, u32 track, u32 sample_number, Bool *IsEncrypted, u32 *crypt_byte_block, u32 *skip_byte_block, const u8 **key_info, u32 *key_info_size)
 {
 	GF_TrackBox *trak = gf_isom_get_track_from_file(movie, track);
 	GF_SampleEncryptionBox *senc = trak->sample_encryption;
@@ -5557,6 +5660,7 @@
 		if (timestamp) *timestamp = file->last_producer_ref_time->timestamp;
 
 		if (reset_info) {
+			gf_isom_box_del((GF_Box*)file->last_producer_ref_time);
 			file->last_producer_ref_time = NULL;
 		}
 		return GF_TRUE;
@@ -5692,6 +5796,7 @@
 	if (ve->svc_config) return ve->svc_config->config->nal_unit_size;
 	if (ve->hevc_config) return ve->hevc_config->config->nal_unit_size;
 	if (ve->lhvc_config) return ve->lhvc_config->config->nal_unit_size;
+	if (ve->vvc_config) return ve->vvc_config->config->nal_unit_size;
 	return 0;
 }
 
@@ -5774,6 +5879,7 @@
 		movie->signal_frag_bounds=GF_TRUE;
 }
 
+#ifndef	GPAC_DISABLE_ISOM_FRAGMENTS
 GF_EXPORT
 Bool gf_isom_sample_is_fragment_start(GF_ISOFile *movie, u32 trackNumber, u32 sampleNum, GF_ISOFragmentBoundaryInfo *frag_info)
 {
@@ -5787,15 +5893,20 @@
 	if (!trak || !trak->Media) return GF_FALSE;
 	if (!trak->Media->information->sampleTable->traf_map) return GF_FALSE;
 
-#ifndef	GPAC_DISABLE_ISOM_FRAGMENTS
 	if (sampleNum<=trak->sample_count_at_seg_start)
 		return GF_FALSE;
 	sampleNum -= trak->sample_count_at_seg_start;
-#endif
 
 	tmap = trak->Media->information->sampleTable->traf_map;
 	if (!tmap) return GF_FALSE;
-	for (i=0; i<tmap->nb_entries; i++) {
+
+	if (tmap->r_cur_sample && (tmap->r_cur_sample<=sampleNum)) {
+		i=tmap->r_cur_idx;
+	} else {
+		i=0;
+		tmap->r_cur_sample=0;
+	}
+	for (; i<tmap->nb_entries; i++) {
 		GF_TrafMapEntry *finfo = &tmap->frag_startsi;
 		if (finfo->sample_num == sampleNum) {
 			if (frag_info) {
@@ -5806,7 +5917,10 @@
 				frag_info->seg_start_plus_one = finfo->seg_start_plus_one;
 				frag_info->sidx_start = finfo->sidx_start;
 				frag_info->sidx_end = finfo->sidx_end;
+				frag_info->first_dts = finfo->first_dts;
 			}
+			tmap->r_cur_sample = sampleNum;
+			tmap->r_cur_idx = i;
 			return GF_TRUE;
 		}
 
@@ -5824,10 +5938,13 @@
 	return GF_TRUE;
 }
 
+#endif
+
 
 GF_EXPORT
 GF_Err gf_isom_get_jp2_config(GF_ISOFile *movie, u32 trackNumber, u32 sampleDesc, u8 **out_dsi, u32 *out_size)
 {
+#ifndef GPAC_DISABLE_ISOM_WRITE
 	GF_TrackBox *trak;
 	GF_MPEGVisualSampleEntryBox *entry;
 	GF_BitStream *bs;
@@ -5843,6 +5960,9 @@
 	gf_bs_get_content(bs, out_dsi, out_size);
 	gf_bs_del(bs);
 	return GF_OK;
+#else
+	return GF_NOT_SUPPORTED;
+#endif
 }
 
 
@@ -5894,6 +6014,8 @@
 	return trak->magic;
 }
 
+#ifndef GPAC_DISABLE_ISOM_FRAGMENTS
+
 GF_EXPORT
 GF_Err gf_isom_get_file_offset_for_time(GF_ISOFile *movie, Double start_time, u64 *max_offset)
 {
@@ -5937,6 +6059,7 @@
 	*sidx_dur = dur;
 	return GF_OK;
 }
+#endif // GPAC_DISABLE_ISOM_FRAGMENTS
 
 GF_EXPORT
 const u8 *gf_isom_get_mpegh_compatible_profiles(GF_ISOFile *movie, u32 trackNumber, u32 sampleDescIndex, u32 *nb_compat_profiles)
@@ -6094,7 +6217,7 @@
 				*sample_per_chunk = stsc->entriesi.samplesPerChunk;
 			break;
 		}
-		assert(stsc->entriesi.firstChunk<chunk_num);
+		if (stsc->entriesi.firstChunk>=chunk_num) return GF_ISOM_INVALID_FILE;
 
 		if ((i+1 == stsc->nb_entries)
 			|| (stsc->entriesi+1.firstChunk>chunk_num)
@@ -6106,7 +6229,7 @@
 				*sample_per_chunk = stsc->entriesi.samplesPerChunk;
 			break;
 		}
-		assert(stsc->entriesi+1.firstChunk > stsc->entriesi.firstChunk);
+		if (stsc->entriesi+1.firstChunk <= stsc->entriesi.firstChunk) return GF_ISOM_INVALID_FILE;
 
 		nb_chunks_before = stsc->entriesi+1.firstChunk - stsc->entriesi.firstChunk;
 		nb_samples += stsc->entriesi.samplesPerChunk * nb_chunks_before;
@@ -6181,6 +6304,24 @@
 }
 
 GF_EXPORT
+Bool gf_isom_enum_track_group(GF_ISOFile *file, u32 track_number, u32 *idx, u32 *track_group_type, u32 *track_group_id)
+{
+	GF_TrackGroupTypeBox *trgt;
+	GF_TrackBox *trak;
+
+	trak = gf_isom_get_track_from_file(file, track_number);
+	if (!trak || !idx) return GF_FALSE;
+	if (!trak->groups) return GF_FALSE;
+
+	trgt = gf_list_get(trak->groups->groups, *idx);
+	if (!trgt) return GF_FALSE;
+	if (track_group_type) *track_group_type = trgt->group_type;
+	if (track_group_id) *track_group_id = trgt->track_group_id;
+	*idx = *idx + 1;
+	return GF_TRUE;
+}
+
+GF_EXPORT
 const GF_MasteringDisplayColourVolumeInfo *gf_isom_get_mastering_display_colour_info(GF_ISOFile* movie, u32 trackNumber, u32 StreamDescriptionIndex)
 {
 	GF_TrackBox* trak;
@@ -6331,7 +6472,7 @@
 
 GF_Err gf_isom_pop_emsg(GF_ISOFile *the_file, u8 **emsg_data, u32 *emsg_size)
 {
-#ifndef GPAC_DISABLE_ISOM_FRAGMENTS
+#if !defined(GPAC_DISABLE_ISOM_FRAGMENTS) && !defined(GPAC_DISABLE_ISOM_WRITE)
 	GF_Box *emsg = gf_list_pop_front(the_file->emsgs);
 	if (!emsg) return GF_NOT_FOUND;
 
@@ -6349,4 +6490,14 @@
 
 }
 
+GF_Err gf_isom_set_sample_alloc(GF_ISOFile *the_file, u32 trackNumber, 	u8 *(*sample_alloc)(u32 size, void *cbk), void *udta)
+{
+	GF_TrackBox *trak;
+	trak = gf_isom_get_track_from_file(the_file, trackNumber);
+	if (!trak) return GF_BAD_PARAM;
+	trak->sample_alloc_cbk = sample_alloc;
+	trak->sample_alloc_udta = udta;
+	return GF_OK;
+}
+
 #endif /*GPAC_DISABLE_ISOM*/

gpac-2.2.1.tar.gz/src/isomedia/isom_store.c -> gpac-2.4.0.tar.gz/src/isomedia/isom_store.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2022
+ *			Copyright (c) Telecom ParisTech 2000-2024
  *					All rights reserved
  *
  *  This file is part of GPAC / ISO Media File Format sub-project
@@ -367,31 +367,65 @@
 	return GF_NOT_SUPPORTED;
 #else
 	GF_Err e;
+	Bool use_cmov=GF_FALSE;
 	GF_BitStream *comp_bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
 	e = gf_isom_box_write(root_box, comp_bs);
 
-	if (!e) {
-		u8 *box_data;
-		u32 box_size, comp_size;
+	if (e) {
+		gf_bs_del(comp_bs);
+		return e;
+	}
+	if ((root_box->type==GF_ISOM_BOX_TYPE_MOOV) && mov->brand && (mov->brand->majorBrand == GF_ISOM_BRAND_QT)) {
+		use_cmov = GF_TRUE;
+	}
+	u8 *box_data;
+	u32 box_size, comp_size;
 
-		if (box_csize)
-			*box_csize = (u32) root_box->size;
+	if (box_csize)
+		*box_csize = (u32) root_box->size;
 
-		gf_bs_get_content(comp_bs, &box_data, &box_size);
-		gf_gz_compress_payload_ex(&box_data, box_size, &comp_size, 8, GF_FALSE, NULL);
-		if ((mov->compress_flags & GF_ISOM_COMP_FORCE_ALL) || (comp_size + COMP_BOX_COST_BYTES < box_size)) {
-			if (bs) {
+	gf_bs_get_content(comp_bs, &box_data, &box_size);
+	gf_gz_compress_payload_ex(&box_data, box_size, &comp_size, use_cmov ? 0 : 8, GF_FALSE, NULL, GF_FALSE);
+	if ((mov->compress_flags & GF_ISOM_COMP_FORCE_ALL) || (comp_size + COMP_BOX_COST_BYTES < box_size)) {
+		if (bs) {
+			if (use_cmov) {
+				gf_bs_write_u32(bs, 8 + 8 + 12 + comp_size+12);
+				gf_bs_write_u32(bs, GF_ISOM_BOX_TYPE_MOOV);
+				gf_bs_write_u32(bs, 8 + 12 + comp_size+12);
+				gf_bs_write_u32(bs, GF_QT_BOX_TYPE_CMOV);
+				gf_bs_write_u32(bs, 12);
+				gf_bs_write_u32(bs, GF_QT_BOX_TYPE_DCOM);
+				gf_bs_write_u32(bs, GF_4CC('z','l','i','b'));
+				gf_bs_write_u32(bs, comp_size+12);
+				gf_bs_write_u32(bs, GF_QT_BOX_TYPE_CMVD);
+				gf_bs_write_u32(bs, (u32) root_box->size);
+				gf_bs_write_data(bs, box_data, comp_size);
+
+				gf_bs_write_u32(bs, 8+mov->pad_cmov);
+				gf_bs_write_u32(bs, GF_ISOM_BOX_TYPE_FREE);
+				u32 blank = mov->pad_cmov;
+				while (blank) {
+					gf_bs_write_u8(bs, 0);
+					blank--;
+				}
+			} else {
 				gf_bs_write_u32(bs, comp_size+8);
 				gf_bs_write_u32(bs, repl_type);
 				gf_bs_write_data(bs, box_data, comp_size);
 			}
-			if (box_csize)
+		}
+		if (box_csize) {
+			if (use_cmov) {
+				*box_csize = comp_size + 8 + 8 + 12 + 12;
+			} else {
 				*box_csize = comp_size + COMP_BOX_COST_BYTES;
-		} else if (bs) {
-			gf_isom_box_write(root_box, bs);
+			}
 		}
-		gf_free(box_data);
+	} else if (bs) {
+		gf_isom_box_write(root_box, bs);
 	}
+	gf_free(box_data);
+
 	gf_bs_del(comp_bs);
 	return e;
 #endif /*GPAC_DISABLE_ZLIB*/
@@ -477,10 +511,72 @@
 {
 	u32 i;
 	u64 size;
+	TrackWriter *writer;
 
 	size = 0;
+
+	//if compressing using cmov, offsets MUST be expressed in final file size , we need to get the
+	//moov size after compression, so we must temporary switch back our stsc/stco tables and write+compress
+	if (movie->brand && (movie->brand->majorBrand == GF_ISOM_BRAND_QT)
+		&& ((movie->compress_mode==GF_ISOM_COMP_ALL) || (movie->compress_mode==GF_ISOM_COMP_MOOV))
+	) {
+		GF_SampleToChunkBox *stsc;
+		GF_Box *stco;
+		u8 *box_data;
+		u32 box_size, osize;
+		GF_BitStream *bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
+		if (movie->moov) {
+
+			//switch all our tables
+			i=0;
+			while ((writer = (TrackWriter*)gf_list_enum(writers, &i))) {
+				//don't delete them !!!
+				stsc = writer->stbl->SampleToChunk;
+				stco = writer->stbl->ChunkOffset;
+				s32 stsc_pos = gf_list_del_item(writer->stbl->child_boxes, stsc);
+				s32 stco_pos = gf_list_del_item(writer->stbl->child_boxes, stco);
+				writer->stbl->SampleToChunk = writer->stsc;
+				writer->stbl->ChunkOffset = writer->stco;
+				gf_list_insert(writer->stbl->child_boxes, writer->stsc, stsc_pos);
+				gf_list_insert(writer->stbl->child_boxes, writer->stco, stco_pos);
+				writer->stco = stco;
+				writer->stsc = stsc;
+			}
+
+			gf_isom_box_size((GF_Box *)movie->moov);
+			gf_isom_box_write((GF_Box *)movie->moov, bs);
+
+			//and re-switch our table
+			i=0;
+			while ((writer = (TrackWriter*)gf_list_enum(writers, &i))) {
+				//don't delete them !!!
+				stsc = writer->stsc;
+				stco = writer->stco;
+				writer->stsc = writer->stbl->SampleToChunk;
+				writer->stco = writer->stbl->ChunkOffset;
+				s32 stsc_pos = gf_list_del_item(writer->stbl->child_boxes, writer->stsc);
+				s32 stco_pos = gf_list_del_item(writer->stbl->child_boxes, writer->stco);
+
+				writer->stbl->SampleToChunk = stsc;
+				writer->stbl->ChunkOffset = stco;
+				gf_list_insert(writer->stbl->child_boxes, stsc, stsc_pos);
+				gf_list_insert(writer->stbl->child_boxes, stco, stco_pos);
+			}
+		}
+		if (movie->meta) {
+			gf_isom_box_size((GF_Box *)movie->meta);
+			gf_isom_box_write((GF_Box *)movie->meta, bs);
+		}
+
+		gf_bs_get_content(bs, &box_data, &box_size);
+		gf_gz_compress_payload_ex(&box_data, box_size, &osize, 0, GF_FALSE, NULL, GF_FALSE);
+		gf_free(box_data);
+		gf_bs_del(bs);
+		return osize + 8 + 8 + 12 + 12;
+	}
+
+
 	if (movie->moov) {
-		TrackWriter *writer;
 		gf_isom_box_size((GF_Box *)movie->moov);
 		size = movie->moov->size;
 		if (size > 0xFFFFFFFF) size += 8;
@@ -883,10 +979,22 @@
 				if (!entry) return GF_OUT_OF_MEM;
 				gf_list_add(iloc->extent_entries, entry);
 			}
-			entry = (GF_ItemExtentEntry *)gf_list_get(iloc->extent_entries, 0);
-			entry->extent_offset = 0;
-			/*0 means full length of referenced file*/
-			entry->extent_length = 0;
+			//if we use imdt, do NOT reset the extent length
+			GF_Box *url = gf_list_get(meta->file_locations->dref->child_boxes, iloc->data_reference_index-1);
+			if (!url || (url->type != GF_ISOM_BOX_TYPE_IMDT)) {
+				entry = (GF_ItemExtentEntry *)gf_list_get(iloc->extent_entries, 0);
+				entry->extent_offset = 0;
+				/*0 means full length of referenced file*/
+				entry->extent_length = 0;
+			} else {
+				u32 idx, icount = gf_list_count(file->TopBoxes);
+				for (idx=0; idx<icount; idx++) {
+					GF_MediaDataBox *mdat = (GF_MediaDataBox *)gf_list_get(file->TopBoxes, idx);
+					if (mdat->type!=GF_ISOM_BOX_TYPE_MDAT) continue;
+					if (!mdat->is_imda) continue;
+					mdat->is_imda = 2; //mark as used
+				}
+			}
 		}
 	}
 
@@ -1012,13 +1120,94 @@
 	return GF_OK;
 }
 
+#define CMOV_DEFAULT_PAD	20
+
+static GF_Err UpdateOffsets(GF_ISOFile *movie, GF_List *writers, Bool use_pad, Bool offset_mdat)
+{
+	u64 firstSize, finalSize;
+	Bool use_cmov=GF_FALSE;
+	GF_Err e;
+
+	if (movie->brand && (movie->brand->majorBrand == GF_ISOM_BRAND_QT)
+		&& ((movie->compress_mode==GF_ISOM_COMP_ALL) || (movie->compress_mode==GF_ISOM_COMP_MOOV))
+	) {
+		use_cmov = GF_TRUE;
+	}
+
+	//get size of moov+meta, shift all offsets
+	firstSize = GetMoovAndMetaSize(movie, writers);
+	if (use_pad)
+		firstSize += movie->padding;
+
+	u64 offset = firstSize;
+	if (offset_mdat)
+		offset += 8 + (movie->mdat->dataSize > 0xFFFFFFFF ? 8 : 0);
+
+	//we use cmov, we inject a free box after the moov with a default payload of 20 bytes
+	//and we adjust all offsets to start here
+	//if the final compressed size is less than the initial compressed size, we pad with more datathis allows computing the offsets
+	if (use_cmov) {
+		movie->pad_cmov = CMOV_DEFAULT_PAD;
+		offset += CMOV_DEFAULT_PAD+8;
+	}
+
+	e = ShiftOffset(movie, writers, offset);
+	if (e) return e;
+
+	//get real sample offsets for meta items
+	if (movie->meta) {
+		store_meta_item_references(movie, writers, movie->meta);
+	}
+
+	//get the new size of moov+mdat
+	finalSize = GetMoovAndMetaSize(movie, writers);
+	if (use_pad)
+		finalSize += movie->padding;
+
+	//new size changed, we moved to 64 bit offsets
+	if (firstSize < finalSize) {
+		u64 finalOffset = finalSize;
+		if (offset_mdat)
+			finalOffset += 8 + (movie->mdat->dataSize > 0xFFFFFFFF ? 8 : 0);
+
+		if (use_cmov) finalOffset += CMOV_DEFAULT_PAD+8;
+
+		//OK, now we're sure about the final size.
+		//we don't need to re-emulate, as the only thing that changed is the offset
+		//so just shift the offset
+		e = ShiftOffset(movie, writers, finalOffset - offset);
+		if (e) return e;
+
+		//get real sample offsets for meta items
+		if (movie->meta) {
+			store_meta_item_references(movie, writers, movie->meta);
+		}
+
+		firstSize = finalSize;
+		if (use_cmov) {
+			finalSize = GetMoovAndMetaSize(movie, writers);
+		}
+	}
+	//new size different from first size, happens when compressing the moov
+	if (firstSize != finalSize) {
+		if (!use_cmov) return GF_SERVICE_ERROR;
+		s32 diff = (s32) ( (s64) firstSize - (s64) finalSize);
+		if (diff + CMOV_DEFAULT_PAD < 0) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("isomedia cmov default padding %u not enough, needs %u!\n Please report issue to GPAC devs\n", CMOV_DEFAULT_PAD, -diff));
+			return GF_SERVICE_ERROR;
+		}
+		movie->pad_cmov = movie->pad_cmov + diff;
+	}
+	return GF_OK;
+}
+
 
 //write the file track by track, with moov box before or after the mdat
 static GF_Err WriteFlat(MovieWriter *mw, u8 moovFirst, GF_BitStream *bs, Bool non_seekable, Bool for_fragments, GF_BitStream *moov_bs)
 {
 	GF_Err e;
 	u32 i;
-	u64 offset, finalOffset, totSize, begin, firstSize, finalSize;
+	u64 offset, totSize, begin;
 	GF_Box *a, *cprt_box=NULL;
 	GF_List *writers = gf_list_new();
 	GF_ISOFile *movie = mw->movie;
@@ -1200,21 +1389,8 @@
 			e = DoWrite(mw, writers, bs, 1, movie->mdat->bsOffset);
 			if (e) goto exit;
 
-			firstSize = GetMoovAndMetaSize(movie, writers);
-
-			offset = firstSize;
-			e = ShiftOffset(movie, writers, offset);
+			e = UpdateOffsets(movie, writers, GF_FALSE, GF_FALSE);
 			if (e) goto exit;
-			//get the size and see if it has changed (eg, we moved to 64 bit offsets)
-			finalSize = GetMoovAndMetaSize(movie, writers);
-			if (firstSize != finalSize) {
-				finalOffset = finalSize;
-				//OK, now we're sure about the final size.
-				//we don't need to re-emulate, as the only thing that changed is the offset
-				//so just shift the offset
-				e = ShiftOffset(movie, writers, finalOffset - offset);
-				if (e) goto exit;
-			}
 		}
 		//get real sample offsets for meta items
 		if (movie->meta) {
@@ -1346,21 +1522,11 @@
 	e = DoWrite(mw, writers, bs, 1, gf_bs_get_position(bs));
 	if (e) goto exit;
 
-	firstSize = GetMoovAndMetaSize(movie, writers);
-	//offset = (firstSize > 0xFFFFFFFF ? firstSize + 8 : firstSize) + 8 + (movie->mdat->dataSize > 0xFFFFFFFF ? 8 : 0);
-	offset = firstSize + 8 + (movie->mdat->dataSize > 0xFFFFFFFF ? 8 : 0);
-	e = ShiftOffset(movie, writers, offset);
+
+	e = UpdateOffsets(movie, writers, GF_FALSE, GF_TRUE);
 	if (e) goto exit;
-	//get the size and see if it has changed (eg, we moved to 64 bit offsets)
-	finalSize = GetMoovAndMetaSize(movie, writers);
-	if (firstSize != finalSize) {
-		finalOffset = finalSize + 8 + (movie->mdat->dataSize > 0xFFFFFFFF ? 8 : 0);
-		//OK, now we're sure about the final size.
-		//we don't need to re-emulate, as the only thing that changed is the offset
-		//so just shift the offset
-		e = ShiftOffset(movie, writers, finalOffset - offset);
-		if (e) goto exit;
-	}
+
+
 	//now write our stuff
 	e = WriteMoovAndMeta(movie, writers, bs);
 	if (e) goto exit;
@@ -1815,7 +1981,6 @@
 	u32 i;
 	s32 moov_meta_pos=-1;
 	GF_Box *a, *cprt_box=NULL;
-	u64 firstSize, finalSize, offset, finalOffset;
 	GF_List *writers = gf_list_new();
 	GF_ISOFile *movie = mw->movie;
 
@@ -1885,41 +2050,10 @@
 	e = DoInterleave(mw, writers, bs, 1, gf_bs_get_position(bs), drift_inter);
 	if (e) goto exit;
 
-	firstSize = GetMoovAndMetaSize(movie, writers);
-	if (movie->padding)
-		firstSize += movie->padding;
 
-	offset = firstSize;
-	if (movie->mdat && movie->mdat->dataSize) offset += 8 + (movie->mdat->dataSize > 0xFFFFFFFF ? 8 : 0);
-	e = ShiftOffset(movie, writers, offset);
+	e = UpdateOffsets(movie, writers, GF_TRUE, GF_TRUE);
 	if (e) goto exit;
 
-	//get real sample offsets for meta items
-	if (movie->meta) {
-		store_meta_item_references(movie, writers, movie->meta);
-	}
-
-	//get the size and see if it has changed (eg, we moved to 64 bit offsets)
-	finalSize = GetMoovAndMetaSize(movie, writers);
-	if (movie->padding)
-		finalSize += movie->padding;
-
-	if (firstSize != finalSize) {
-		finalOffset = finalSize;
-		if (movie->mdat && movie->mdat->dataSize) finalOffset += 8 + (movie->mdat->dataSize > 0xFFFFFFFF ? 8 : 0);
-		//OK, now we're sure about the final size -> shift the offsets
-		//we don't need to re-emulate, as the only thing that changed is the offset
-		//so just shift the offset
-		e = ShiftOffset(movie, writers, finalOffset - offset);
-		if (e) goto exit;
-		/*firstSize = */GetMoovAndMetaSize(movie, writers);
-
-		//readjust real sample offsets for meta items
-		if (movie->meta) {
-			store_meta_item_references(movie, writers, movie->meta);
-		}
-	}
-
 	//now write our stuff
 	e = WriteMoovAndMeta(movie, writers, bs);
 	if (e) goto exit;
@@ -2356,6 +2490,12 @@
 	return write_free_box(bs, (u32) size);
 }
 
+GF_Err isom_on_block_out(void *cbk, u8 *data, u32 block_size)
+{
+	GF_ISOFile *movie = (GF_ISOFile *)cbk;
+	movie->blocks_sent = GF_TRUE;
+	return movie->on_block_out(movie->on_block_out_usr_data, data, block_size, NULL, 0);
+}
 
 extern u32 default_write_buffering_size;
 GF_Err gf_isom_flush_chunk(GF_TrackBox *trak, Bool is_final);
@@ -2429,18 +2569,19 @@
 	}
 	//capture mode: we don't need a new bitstream
 	if (movie->openMode == GF_ISOM_OPEN_WRITE) {
-		if (!strcmp(movie->fileName, "_gpac_isobmff_redirect")) {
+		if (movie->fileName && !strcmp(movie->fileName, "_gpac_isobmff_redirect")) {
 			GF_BitStream *bs, *moov_bs=NULL;
 			u64 mdat_end = gf_bs_get_position(movie->editFileMap->bs);
 			u64 mdat_start = movie->mdat->bsOffset;
 			u64 mdat_size = mdat_end - mdat_start;
+			Bool patch_mdat=GF_TRUE;
 
 			if (for_fragments) {
 				if (!movie->on_block_out) {
 					GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("ISOBMFF Missing output block callback, cannot write\n"));
 					return GF_BAD_PARAM;
 				}
-				bs = gf_bs_new_cbk(movie->on_block_out, movie->on_block_out_usr_data, movie->on_block_out_block_size);
+				bs = gf_bs_new_cbk(isom_on_block_out, movie, movie->on_block_out_block_size);
 				e = WriteFlat(&mw, 0, bs, GF_TRUE, GF_TRUE, NULL);
 				movie->fragmented_file_pos = gf_bs_get_position(bs);
 				gf_bs_del(bs);
@@ -2458,14 +2599,27 @@
 					pad--;
 				}
 			}
+			if (!movie->blocks_sent && mdat_start && mdat_size) {
+				u64 pos = gf_bs_get_position(movie->editFileMap->bs);
+				gf_bs_seek(movie->editFileMap->bs, mdat_start);
+				gf_bs_write_u32(movie->editFileMap->bs, (mdat_size>0xFFFFFFFF) ? 1 : (u32) mdat_size);
+				gf_bs_write_u32(movie->editFileMap->bs, GF_ISOM_BOX_TYPE_MDAT);
+				if  (mdat_size>0xFFFFFFFF)
+					gf_bs_write_u64(movie->editFileMap->bs, mdat_size);
+				else
+					gf_bs_write_u64(movie->editFileMap->bs, 0);
+
+				gf_bs_seek(movie->editFileMap->bs, pos);
+				patch_mdat=GF_FALSE;
+			}
 			//write as non-seekable
 			e = WriteFlat(&mw, 0, movie->editFileMap->bs, GF_TRUE, GF_FALSE, moov_bs);
 
 			movie->fragmented_file_pos = gf_bs_get_position(movie->editFileMap->bs);
 
-			if (mdat_start && mdat_size) {
+			if (mdat_start && mdat_size && patch_mdat) {
 				u8 data16;
-				if (!movie->on_block_out) {
+				if (!movie->on_block_patch && movie->blocks_sent) {
 					GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("ISOBMFF Missing output block patch callback, cannot patch mdat size in flat storage\n"));
 					return GF_BAD_PARAM;
 				}
@@ -2485,6 +2639,10 @@
 			if (moov_bs) {
 				u8 *moov_data;
 				u32 moov_size;
+				if (!movie->on_block_patch) {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("ISOBMFF Missing output block patch callback, cannot patch mdat size in fast-start storage\n"));
+					return GF_BAD_PARAM;
+				}
 
 				gf_bs_get_content(moov_bs, &moov_data, &moov_size);
 				gf_bs_del(moov_bs);
@@ -2520,7 +2678,7 @@
 				GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("ISOBMFF Missing output block callback, cannot write\n"));
 				return GF_BAD_PARAM;
 			}
-			bs = gf_bs_new_cbk(movie->on_block_out, movie->on_block_out_usr_data, movie->on_block_out_block_size);
+			bs = gf_bs_new_cbk(isom_on_block_out, movie, movie->on_block_out_block_size);
 			is_stdout = GF_TRUE;
 		} else if (gf_isom_is_inplace_rewrite(movie)) {
 			stream = gf_fopen(movie->fileName, "r+b");
@@ -2564,6 +2722,30 @@
 			e = WriteInplace(&mw, bs);
 		}
 
+		//rewrite all imda boxes
+		u32 i, count = gf_list_count(movie->TopBoxes);
+		for (i=0; i<count; i++) {
+			GF_MediaDataBox *mdat = (GF_MediaDataBox *)gf_list_get(movie->TopBoxes, i);
+			if (mdat->type!=GF_ISOM_BOX_TYPE_MDAT) continue;
+			//not an imda or not used by any item
+			//we could further optimize and do a partial purge of imda content
+			if (mdat->is_imda != 2) continue;
+
+			u64 offset = mdat->bsOffset-12;
+			u32 size = (u32) mdat->dataSize+12;
+			u64 orig_pos = gf_bs_get_position(movie->movieFileMap->bs);
+			gf_bs_seek(movie->movieFileMap->bs, offset);
+			while (size) {
+				u8 buf2048;
+				u32 read = (size>2048) ? 2048 : size;
+				gf_bs_read_data(movie->movieFileMap->bs, buf, read);
+				gf_bs_write_data(bs, buf, read);
+				size -= read;
+			}
+			gf_bs_seek(movie->movieFileMap->bs, orig_pos);
+		}
+
+
 		gf_bs_del(bs);
 		if (!is_stdout)
 			gf_fclose(stream);

gpac-2.2.1.tar.gz/src/isomedia/isom_write.c -> gpac-2.4.0.tar.gz/src/isomedia/isom_write.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2022
+ *			Copyright (c) Telecom ParisTech 2000-2024
  *					All rights reserved
  *
  *  This file is part of GPAC / ISO Media File Format sub-project
@@ -64,14 +64,14 @@
 	/*make sure nothing was added*/
 	if (gf_bs_get_position(movie->editFileMap->bs)) return GF_OK;
 
-	if (!strcmp(movie->fileName, "_gpac_isobmff_redirect")) {
+	if (movie->fileName && !strcmp(movie->fileName, "_gpac_isobmff_redirect")) {
 		if (!movie->on_block_out) {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("ISOBMFF Missing output block callback, cannot write\n"));
 			return GF_BAD_PARAM;
 		}
 
 		gf_bs_del(movie->editFileMap->bs);
-		movie->editFileMap->bs = gf_bs_new_cbk(movie->on_block_out, movie->on_block_out_usr_data, movie->on_block_out_block_size);
+		movie->editFileMap->bs = gf_bs_new_cbk(isom_on_block_out, movie, movie->on_block_out_block_size);
 	}
 
 	/*add all first boxes*/
@@ -359,7 +359,7 @@
 	GF_IsomInitialObjectDescriptor *iod;
 	GF_IsomObjectDescriptor *od;
 	GF_Err e;
-	
+
 	e = gf_isom_insert_moov(movie);
 	if (e) return e;
 	if (!movie->moov->iods) {
@@ -449,10 +449,12 @@
 	/*rewrite all durations and edit lists*/
 	movie->moov->mvhd->duration *= timeScale;
 	movie->moov->mvhd->duration /= movie->moov->mvhd->timeScale;
+#ifndef GPAC_DISABLE_ISOM_FRAGMENTS
 	if (movie->moov->mvex && movie->moov->mvex->mehd) {
 		movie->moov->mvex->mehd->fragment_duration *= timeScale;
 		movie->moov->mvex->mehd->fragment_duration /= movie->moov->mvhd->timeScale;
 	}
+#endif
 
 	i=0;
 	while ((trak = (GF_TrackBox*)gf_list_enum(movie->moov->trackList, &i))) {
@@ -468,10 +470,12 @@
 			}
 		}
 	}
+#ifndef GPAC_DISABLE_ISOM_FRAGMENTS
 	if (movie->moov->mvex && movie->moov->mvex->mehd) {
 		movie->moov->mvex->mehd->fragment_duration *= timeScale;
 		movie->moov->mvex->mehd->fragment_duration /= movie->moov->mvhd->timeScale;
 	}
+#endif
 	movie->moov->mvhd->timeScale = timeScale;
 	movie->interleavingTime = timeScale;
 	return GF_OK;
@@ -727,7 +731,7 @@
 			gf_isom_box_del((GF_Box *)mdia);
 			return 0;
 		}
-		assert(trak->child_boxes);
+		gf_assert(trak->child_boxes);
 		gf_list_add(trak->child_boxes, mdia);
 
 		//OK, add this media to our track
@@ -786,7 +790,7 @@
 		}
 	}
 	movie->last_created_track_id = tkhd->trackID;
-	
+
 	if (!movie->keep_utc && !gf_sys_is_test_mode() ) {
 		tkhd->modificationTime = now;
 	 	mdia->mediaHeader->modificationTime = now;
@@ -795,8 +799,8 @@
 	//OK, add our trak
 	e = moov_on_child_box((GF_Box*)movie->moov, (GF_Box *)trak, GF_FALSE);
 	if (e) goto err_exit;
-	//set the new ID available
-	if (trakID+1> movie->moov->mvhd->nextTrackID)
+	//set the next track ID available
+	if (trakID >= movie->moov->mvhd->nextTrackID)
 		movie->moov->mvhd->nextTrackID = trakID+1;
 
 	if (udta) {
@@ -814,6 +818,33 @@
 	return 0;
 }
 
+GF_Err gf_isom_set_track_stsd_templates(GF_ISOFile *movie, u32 trackNumber, u8 *stsd_data, u32 stsd_data_size)
+{
+	GF_TrackBox *trak;
+	GF_Err e;
+	GF_SampleDescriptionBox *stsd=NULL;
+	GF_List *tmp;
+
+	e = CanAccessMovie(movie, GF_ISOM_OPEN_WRITE);
+	if (e) return e;
+
+	trak = gf_isom_get_track_from_file(movie, trackNumber);
+	if (!trak || !trak->Media) return GF_BAD_PARAM;
+	if (gf_list_count(trak->Media->information->sampleTable->SampleDescription->child_boxes))
+		return GF_BAD_PARAM;
+
+	GF_BitStream *bs = gf_bs_new(stsd_data, stsd_data_size, GF_BITSTREAM_READ);
+	e = gf_isom_box_parse_ex((GF_Box **) &stsd, bs, GF_ISOM_BOX_TYPE_STBL, GF_FALSE, 0);
+	gf_bs_del(bs);
+	if (!e && (stsd->type==GF_ISOM_BOX_TYPE_STSD)) {
+		tmp = trak->Media->information->sampleTable->SampleDescription->child_boxes;
+		trak->Media->information->sampleTable->SampleDescription->child_boxes = stsd->child_boxes;
+		stsd->child_boxes = tmp;
+	}
+	if (stsd) gf_isom_box_del((GF_Box*)stsd);
+	return e;
+}
+
 GF_EXPORT
 u32 gf_isom_new_track(GF_ISOFile *movie, GF_ISOTrackID trakID, u32 MediaType, u32 TimeScale)
 {
@@ -1279,9 +1310,7 @@
 		avg_dur = (u32) (dur_num / nb_samp);
 
 		stts->entries0.sampleDelta = avg_dur;
-		for (i=1; i<stts->nb_entries; i++) {
-			stts->entries0.sampleCount += stts->entriesi.sampleCount;
-		}
+		stts->entries0.sampleCount = nb_samp;
 		stts->nb_entries = 1;
 		stts->w_LastDTS = dur_num - avg_dur;
 		return GF_OK;
@@ -2356,6 +2385,10 @@
 		break;
 	case GF_IMPORT_AUDIO_SAMPLE_ENTRY_v1_QTFF:
 		stsd->version = 0;
+		//don't change if already v2
+		if ((aud_entry->version==2) && aud_entry->qtff_mode) {
+			break;
+		}
 		aud_entry->version = 1;
 		aud_entry->channel_count = nbChannels;
 		old_qtff_mode = aud_entry->qtff_mode;
@@ -2479,6 +2512,10 @@
 	e = CanAccessMovie(movie, GF_ISOM_OPEN_WRITE);
 	if (e) return e;
 
+	if (!layout) return GF_BAD_PARAM;
+	if ((layout->stream_structure & 1) && (layout->definedLayout==0) && (layout->channels_count>=64))
+		return GF_BAD_PARAM;
+
 	trak = gf_isom_get_track_from_file(movie, trackNumber);
 	if (!trak) return GF_BAD_PARAM;
 
@@ -2740,13 +2777,13 @@
 		GF_EditBox *edts = (GF_EditBox *) gf_isom_box_new_parent(&trak->child_boxes, GF_ISOM_BOX_TYPE_EDTS);
 		if (!edts) return GF_OUT_OF_MEM;
 		trak_on_child_box((GF_Box*)trak, (GF_Box *)edts, GF_FALSE);
-		assert(trak->editBox);
+		gf_assert(trak->editBox);
 	}
 	if (!trak->editBox->editList) {
 		GF_EditListBox *elst = (GF_EditListBox *) gf_isom_box_new_parent(&trak->editBox->child_boxes, GF_ISOM_BOX_TYPE_ELST);
 		if (!elst) return GF_OUT_OF_MEM;
 		edts_on_child_box((GF_Box*)trak->editBox, (GF_Box *)elst, GF_FALSE);
-		assert(trak->editBox->editList);
+		gf_assert(trak->editBox->editList);
 	}
 	ent = (GF_EdtsEntry *)gf_malloc(sizeof(GF_EdtsEntry));
 	if (!ent) return GF_OUT_OF_MEM;
@@ -2803,6 +2840,20 @@
 	return SetTrackDuration(trak);
 }
 
+static void update_next_track_id(GF_ISOFile *movie)
+{
+	GF_TrackBox *trak;
+	/*update next track ID*/
+	movie->moov->mvhd->nextTrackID = 0;
+	u32 i=0;
+	while ((trak = (GF_TrackBox *)gf_list_enum(movie->moov->trackList, &i))) {
+		if (trak->Header->trackID>movie->moov->mvhd->nextTrackID)
+			movie->moov->mvhd->nextTrackID = trak->Header->trackID;
+	}
+	//shall be larger than the largest track_ID in use
+	movie->moov->mvhd->nextTrackID++;
+}
+
 //removes the desired track
 GF_EXPORT
 GF_Err gf_isom_remove_track(GF_ISOFile *movie, u32 trackNumber)
@@ -2922,12 +2973,7 @@
 	gf_isom_box_del_parent(&movie->moov->child_boxes, (GF_Box *)the_trak);
 
 	/*update next track ID*/
-	movie->moov->mvhd->nextTrackID = 0;
-	i=0;
-	while ((trak = (GF_TrackBox *)gf_list_enum(movie->moov->trackList, &i))) {
-		if (trak->Header->trackID>movie->moov->mvhd->nextTrackID)
-			movie->moov->mvhd->nextTrackID = trak->Header->trackID;
-	}
+	update_next_track_id(movie);
 
 	if (!gf_list_count(movie->moov->trackList)) {
 		gf_list_del_item(movie->TopBoxes, movie->moov);
@@ -3349,7 +3395,7 @@
 	//fill the table. Although it seems weird , this is needed in case of edition
 	//after the function is called. NOte however than we force regular table
 	//at write time if all samples are of same size
-	if (stsz->sampleSize) {
+	if (stsz->sampleSize && stsz->sampleCount) {
 		//this is a weird table indeed ;)
 		if (stsz->sizes) gf_free(stsz->sizes);
 		stsz->sizes = (u32*) gf_malloc(sizeof(u32)*stsz->sampleCount);
@@ -3478,7 +3524,7 @@
 
 	//found
 	if (AddIt) return GF_OK;
-	assert(movie->brand->altCount>1);
+	gf_assert(movie->brand->altCount>1);
 
 	//remove it
 	p = (u32*)gf_malloc(sizeof(u32)*(movie->brand->altCount - 1));
@@ -3578,6 +3624,7 @@
 		if (!trak) return GF_BAD_PARAM;
 		udta = trak->udta;
 	} else {
+		if (!movie->moov) return GF_BAD_PARAM;
 		udta = movie->moov->udta;
 	}
 	if (!udta) return GF_BAD_PARAM;
@@ -3629,6 +3676,7 @@
 		if (!trak) return GF_EOS;
 		udta = trak->udta;
 	} else {
+		if (!movie->moov) return GF_BAD_PARAM;
 		udta = movie->moov->udta;
 	}
 	//do not return any error if no udta
@@ -3670,6 +3718,7 @@
 		if (!trak->udta) trak_on_child_box((GF_Box*)trak, gf_isom_box_new_parent(&trak->child_boxes, GF_ISOM_BOX_TYPE_UDTA), GF_FALSE);
 		udta = trak->udta;
 	} else {
+		if (!movie->moov) return GF_BAD_PARAM;
 		if (!movie->moov->udta) moov_on_child_box((GF_Box*)movie->moov, gf_isom_box_new_parent(&movie->moov->child_boxes, GF_ISOM_BOX_TYPE_UDTA), GF_FALSE);
 		udta = movie->moov->udta;
 	}
@@ -3687,7 +3736,7 @@
 			a->dataSize = DataLength;
 		}
 		return udta_on_child_box((GF_Box *)udta, (GF_Box *) a, GF_FALSE);
-	} else {
+	} else if (UUID) {
 		GF_UnknownUUIDBox *a = (GF_UnknownUUIDBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_UUID);
 		if (!a) return GF_OUT_OF_MEM;
 		memcpy(a->uuid, UUID, 16);
@@ -3698,6 +3747,8 @@
 			a->dataSize = DataLength;
 		}
 		return udta_on_child_box((GF_Box *)udta, (GF_Box *) a, GF_FALSE);
+	} else {
+		return GF_BAD_PARAM;
 	}
 	return GF_OK;
 }
@@ -3941,7 +3992,9 @@
 		switch (b->type) {
 		case GF_ISOM_BOX_TYPE_TRAK:
 		case GF_ISOM_BOX_TYPE_MVHD:
+#ifndef GPAC_DISABLE_ISOM_FRAGMENTS
 		case GF_ISOM_BOX_TYPE_MVEX:
+#endif
 		case GF_ISOM_BOX_TYPE_IODS:
 		case GF_ISOM_BOX_TYPE_META:
 			continue;
@@ -4029,7 +4082,7 @@
 	//don't serialize senc
 	senc = trak->sample_encryption;
 	if (senc) {
-		assert(trak->child_boxes);
+		gf_assert(trak->child_boxes);
 		gf_list_del_item(trak->child_boxes, senc);
 		trak->sample_encryption = NULL;
 	}
@@ -4076,6 +4129,7 @@
 GF_EXPORT
 GF_Err gf_isom_get_trex_template(GF_ISOFile *file, u32 track, u8 **output, u32 *output_size)
 {
+#ifndef GPAC_DISABLE_ISOM_FRAGMENTS
 	GF_TrackBox *trak;
 	GF_BitStream *bs;
 	u32 i;
@@ -4111,8 +4165,11 @@
 	gf_bs_get_content(bs, output, output_size);
 	gf_bs_del(bs);
 
+#else
+	*output = NULL;
+	*output_size = 0;
+#endif
 	return GF_OK;
-
 }
 
 GF_EXPORT
@@ -4126,15 +4183,19 @@
 	*output_size = 0;
 	/*get orig sample desc and clone it*/
 	trak = gf_isom_get_track_from_file(file, track);
-	if (!trak || !stsd_idx || !trak->Media || !trak->Media->information || !trak->Media->information->sampleTable || !trak->Media->information->sampleTable->SampleDescription) return GF_BAD_PARAM;
+	if (!trak || !trak->Media || !trak->Media->information || !trak->Media->information->sampleTable || !trak->Media->information->sampleTable->SampleDescription) return GF_BAD_PARAM;
 
-	ent = gf_list_get(trak->Media->information->sampleTable->SampleDescription->child_boxes, stsd_idx-1);
-	if (!ent) return GF_BAD_PARAM;
+	if (stsd_idx) {
+		ent = gf_list_get(trak->Media->information->sampleTable->SampleDescription->child_boxes, stsd_idx-1);
+		if (!ent) return GF_BAD_PARAM;
+	} else {
+		ent = (GF_Box*) trak->Media->information->sampleTable->SampleDescription;
+	}
 
 	bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
 
-	gf_isom_box_size( (GF_Box *) ent);
-	gf_isom_box_write((GF_Box *) ent, bs);
+	gf_isom_box_size(ent);
+	gf_isom_box_write(ent, bs);
 	gf_bs_get_content(bs, output, output_size);
 	gf_bs_del(bs);
 	return GF_OK;
@@ -4190,7 +4251,7 @@
 
 	senc = trak->sample_encryption;
 	if (senc) {
-		assert(trak->child_boxes);
+		gf_assert(trak->child_boxes);
 		gf_list_del_item(trak->child_boxes, senc);
 		trak->sample_encryption = NULL;
 	}
@@ -4335,7 +4396,7 @@
 
 	*dest_track = gf_list_count(dest_file->moov->trackList);
 
-	if (dest_file->moov->mvhd->nextTrackID<= new_tk->Header->trackID)
+	if (dest_file->moov->mvhd->nextTrackID <= new_tk->Header->trackID)
 		dest_file->moov->mvhd->nextTrackID = new_tk->Header->trackID+1;
 
 	return GF_OK;
@@ -4513,7 +4574,8 @@
 		entry->spatial_quality = udesc->spatial_quality;
 		entry->Width = udesc->width;
 		entry->Height = udesc->height;
-		strcpy(entry->compressor_name, udesc->compressor_name);
+		strncpy(entry->compressor_name, udesc->compressor_name, GF_ARRAY_LENGTH(entry->compressor_name));
+		entry->compressor_name GF_ARRAY_LENGTH(entry->compressor_name) - 1 = 0;
 		entry->color_table_index = -1;
 		entry->frames_per_sample = 1;
 		entry->horiz_res = udesc->h_res ? udesc->h_res : 0x00480000;
@@ -4549,6 +4611,34 @@
 		gena->samplerate_hi = udesc->samplerate;
 		gena->samplerate_lo = 0;
 		gena->qtff_mode = udesc->is_qtff ? GF_ISOM_AUDIO_QTFF_ON_NOEXT : GF_ISOM_AUDIO_QTFF_NONE;
+		if (gena->EntryType==GF_QT_SUBTYPE_LPCM) {
+			gena->version = 2;
+			gena->qtff_mode = GF_ISOM_AUDIO_QTFF_ON_EXT_VALID;
+			GF_BitStream *bs = gf_bs_new(gena->extensions, 36, GF_BITSTREAM_WRITE);
+			gf_bs_write_u32(bs, 72);
+			gf_bs_write_double(bs, udesc->samplerate);
+			gf_bs_write_u32(bs, udesc->nb_channels);
+			gf_bs_write_u32(bs, 0x7F000000);
+			gf_bs_write_u32(bs, gena->bitspersample);
+			gf_bs_write_u32(bs, udesc->lpcm_flags);
+			gf_bs_write_u32(bs, udesc->nb_channels*gena->bitspersample/8); //constBytesPerAudioPacket
+			gf_bs_write_u32(bs, 1); //constLPCMFramesPerAudioPacket
+			gf_bs_del(bs);
+			gena->revision = 0;
+			gena->vendor = 0;
+			gena->channel_count = 3;
+			gena->bitspersample = 16;
+			gena->compression_id = 0xFFFE;
+			gena->packet_size = 0;
+			gena->samplerate_hi = 1;
+		} else if (udesc->is_qtff) {
+			GF_Box *b = gf_isom_box_new_parent(&gena->child_boxes, GF_QT_BOX_TYPE_WAVE);
+			GF_ChromaInfoBox *enda = (GF_ChromaInfoBox*) gf_isom_box_new_parent(&b->child_boxes, GF_QT_BOX_TYPE_ENDA);
+			((GF_ChromaInfoBox *)enda)->chroma = (udesc->lpcm_flags & (1<<1)) ? 0 : 1;
+
+			GF_UnknownBox *term = (GF_UnknownBox*) gf_isom_box_new_parent(&b->child_boxes, GF_ISOM_BOX_TYPE_UNKNOWN);
+			if (term) term->original_4cc = 0;
+		}
 
 		wrap_data = &gena->data;
 		wrap_size = &gena->data_size;
@@ -4784,6 +4874,7 @@
 	return GF_OK;
 }
 
+GF_EXPORT
 GF_Err gf_isom_remove_track_reference(GF_ISOFile *isom_file, u32 trackNumber, u32 ref_type)
 {
 	GF_TrackBox *trak;
@@ -4799,6 +4890,10 @@
 			break;
 		}
 	}
+	if (!gf_list_count(trak->References->child_boxes)) {
+		gf_isom_box_del_parent(&trak->child_boxes, (GF_Box *)trak->References);
+		trak->References = NULL;
+	}
 	return GF_OK;
 
 }
@@ -4817,9 +4912,6 @@
 	a_trak = gf_isom_get_track_from_id(movie->moov, trackID);
 	if (!trak || a_trak) return GF_BAD_PARAM;
 
-	if (movie->moov->mvhd->nextTrackID<=trackID)
-		movie->moov->mvhd->nextTrackID = trackID;
-
 	/*rewrite all dependencies*/
 	i=0;
 	while ((a_trak = (GF_TrackBox*)gf_list_enum(movie->moov->trackList, &i))) {
@@ -4846,6 +4938,7 @@
 		}
 	}
 	trak->Header->trackID = trackID;
+	update_next_track_id(movie);
 	return GF_OK;
 }
 
@@ -5248,6 +5341,16 @@
 	return ret;
 }
 
+static u32 base_sample_entry_type(u32 type)
+{
+	if (type==GF_ISOM_SUBTYPE_DVH1) return GF_ISOM_SUBTYPE_HVC1;
+	if (type==GF_ISOM_SUBTYPE_DVHE) return GF_ISOM_SUBTYPE_HEV1;
+	if (type==GF_ISOM_SUBTYPE_DVA1) return GF_ISOM_SUBTYPE_AVC_H264;
+	if (type==GF_ISOM_SUBTYPE_DVAV) return GF_ISOM_SUBTYPE_AVC3_H264;
+	if (type==GF_ISOM_SUBTYPE_DAV1) return GF_ISOM_SUBTYPE_AV01;
+	return type;
+}
+
 GF_EXPORT
 Bool gf_isom_is_same_sample_description(GF_ISOFile *f1, u32 tk1, u32 sdesc_index1, GF_ISOFile *f2, u32 tk2, u32 sdesc_index2)
 {
@@ -5271,6 +5374,7 @@
 
 	need_memcmp = GF_TRUE;
 	for (i=0; i<count; i++) {
+		u32 type1, type2;
 		GF_SampleEntryBox *ent1 = (GF_SampleEntryBox *)gf_list_get(trak1->Media->information->sampleTable->SampleDescription->child_boxes, i);
 		GF_SampleEntryBox *ent2 = (GF_SampleEntryBox *)gf_list_get(trak2->Media->information->sampleTable->SampleDescription->child_boxes, i);
 
@@ -5278,8 +5382,10 @@
 		if (sdesc_index2) ent2 = (GF_SampleEntryBox *)gf_list_get(trak2->Media->information->sampleTable->SampleDescription->child_boxes, sdesc_index2 - 1);
 
 		if (!ent1 || !ent2) return GF_FALSE;
-		if (ent1->type != ent2->type) return GF_FALSE;
 		if (ent1->internal_type != ent2->internal_type) return GF_FALSE;
+		type1 = base_sample_entry_type(ent1->type);
+		type2 = base_sample_entry_type(ent2->type);
+		if (type1 != type2) return GF_FALSE;
 
 		switch (ent1->type) {
 		/*for MPEG-4 streams, only compare decSpecInfo (bitrate may not be the same but that's not an issue)*/
@@ -6208,7 +6314,7 @@
 		return GF_OK;
 	}
 	if (!ilst->child_boxes) ilst->child_boxes = gf_list_new();
-	
+
 	return gf_list_add(ilst->child_boxes, info);
 }
 
@@ -6309,7 +6415,6 @@
 
 	nb_keys = gf_list_count(keys->keys);
 	if (!key) {
-		u32 nb_keys = gf_list_count(keys->keys);
 		gf_isom_box_del_parent(&meta->child_boxes, (GF_Box *) keys);
 		for (i=0; i<gf_list_count(ilst->child_boxes); i++) {
 			GF_ListItemBox *info = gf_list_get(ilst->child_boxes, i);
@@ -6731,29 +6836,32 @@
 
 /*for now not exported*/
 /*expands sampleGroup table for the given grouping type and sample_number. If sample_number is 0, just appends an entry at the end of the table*/
-static GF_Err gf_isom_add_sample_group_entry(GF_List *sampleGroups, u32 sample_number, u32 grouping_type, u32 grouping_type_parameter, u32 sampleGroupDescriptionIndex, GF_List *parent, GF_SampleTableBox *stbl)
+static GF_Err gf_isom_add_sample_group_entry(GF_List *sampleGroups, u32 sample_number, GF_SampleGroupDescriptionBox *sgdesc, u32 grouping_type_parameter, u32 sampleGroupDescriptionIndex, GF_List *parent, GF_SampleTableBox *stbl)
 {
 	GF_SampleGroupBox *sgroup = NULL;
 	u32 i, count, last_sample_in_entry;
 	Bool all_samples = GF_FALSE;
-	assert(sampleGroups);
+	gf_assert(sampleGroups);
+	if (!sgdesc) return GF_BAD_PARAM;
 	count = gf_list_count(sampleGroups);
 	for (i=0; i<count; i++) {
 		sgroup = (GF_SampleGroupBox*)gf_list_get(sampleGroups, i);
-		if (sgroup->grouping_type==grouping_type) break;
+		if (sgroup->grouping_type==sgdesc->grouping_type) break;
 		sgroup = NULL;
 	}
 	if (!sgroup) {
 		sgroup = (GF_SampleGroupBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_SBGP);
 		if (!sgroup) return GF_OUT_OF_MEM;
-		sgroup->grouping_type = grouping_type;
+		sgroup->grouping_type = sgdesc->grouping_type;
 		sgroup->grouping_type_parameter = grouping_type_parameter;
 //		gf_list_add(sampleGroups, sgroup);
 		//crude patch to align old arch and filters
 		gf_list_insert(sampleGroups, sgroup, 0);
-		assert(parent);
+		gf_assert(parent);
 		gf_list_add(parent, sgroup);
 	}
+	u32 def_insert_value = (sgdesc && (sgdesc->version==2)) ? sgdesc->default_description_index : 0;
+
 	/*used in fragments, means we are adding the last sample*/
 	if (!sample_number) {
 		sample_number = 1;
@@ -6774,7 +6882,7 @@
 		if (!sgroup->sample_entries) return GF_OUT_OF_MEM;
 		if (sample_number>1) {
 			sgroup->sample_entries0.sample_count = sample_number-1;
-			sgroup->sample_entries0.group_description_index = sampleGroupDescriptionIndex ? 0 : 1;
+			sgroup->sample_entries0.group_description_index = sampleGroupDescriptionIndex ? def_insert_value : 1;
 			idx = 1;
 		}
 		sgroup->sample_entriesidx.sample_count = 1;
@@ -6830,7 +6938,7 @@
 	sgroup->sample_entries = (GF_SampleGroupEntry*)gf_realloc(sgroup->sample_entries, sizeof(GF_SampleGroupEntry) * (sgroup->entry_count + 2) );
 
 	sgroup->sample_entriessgroup->entry_count.sample_count = sample_number - 1 - last_sample_in_entry;
-	sgroup->sample_entriessgroup->entry_count.group_description_index = 0;
+	sgroup->sample_entriessgroup->entry_count.group_description_index = def_insert_value;
 
 	sgroup->sample_entriessgroup->entry_count+1.sample_count = 1;
 	sgroup->sample_entriessgroup->entry_count+1.group_description_index = sampleGroupDescriptionIndex;
@@ -6868,7 +6976,7 @@
 			sgdesc = NULL;
 		}
 	}
-	
+
 #ifndef GPAC_DISABLE_ISOM_FRAGMENTS
 	/*look in stbl or traf for sample sampleGroupsDescription*/
 	if (!sgdesc && traf) {
@@ -6891,7 +6999,7 @@
 		sgdesc = (GF_SampleGroupDescriptionBox *) gf_isom_box_new_parent(parent, GF_ISOM_BOX_TYPE_SGPD);
 		if (!sgdesc) return NULL;
 		sgdesc->grouping_type = grouping_type;
-		assert(groupList);
+		gf_assert(groupList);
 		gf_list_add(groupList, sgdesc);
 	}
 	return sgdesc;
@@ -6953,7 +7061,7 @@
 		parent = stbl->child_boxes;
 	}
 
-	return gf_isom_add_sample_group_entry(groupList, sample_number, grouping_type, grouping_type_parameter, entry_idx, parent, stbl);
+	return gf_isom_add_sample_group_entry(groupList, sample_number, sgdesc, grouping_type_parameter, entry_idx, parent, stbl);
 }
 
 static GF_Err gf_isom_set_sample_group_info_internal(GF_ISOFile *movie, u32 track, u32 trafID, u32 sample_number, u32 grouping_type, u32 grouping_type_parameter, void *udta, void *(*sg_create_entry)(void *udta), Bool (*sg_compare_entry)(void *udta, void *entry))
@@ -6990,13 +7098,14 @@
 #ifndef GPAC_DISABLE_ISOM_FRAGMENTS
 	return gf_isom_set_sample_group_info_ex(trak ? trak->Media->information->sampleTable : NULL, traf, sample_number, grouping_type, grouping_type_parameter, udta, sg_create_entry, sg_compare_entry);
 #else
-	return gf_isom_set_sample_group_info_ex(trak->Media->information->sampleTable, sample_number, grouping_type, grouping_type_parameter, udta, sg_create_entry, sg_compare_entry);
+	return gf_isom_set_sample_group_info_ex(trak->Media->information->sampleTable, NULL, sample_number, grouping_type, grouping_type_parameter, udta, sg_create_entry, sg_compare_entry);
 #endif
 
 }
 
+void *sgpd_parse_entry(GF_SampleGroupDescriptionBox *p, GF_BitStream *bs, s32 bytes_in_box, u32 entry_size, u32 *total_bytes);
 
-GF_Err gf_isom_add_sample_group_info_internal(GF_ISOFile *movie, u32 track, u32 grouping_type, void *data, u32 data_size, Bool is_default, u32 *sampleGroupDescriptionIndex, Bool *is_traf_sgpd, Bool check_access)
+GF_Err gf_isom_add_sample_group_info_internal(GF_ISOFile *movie, u32 track, u32 grouping_type, void *data, u32 data_size, u32 sgpd_flags, u32 *sampleGroupDescriptionIndex, Bool *is_traf_sgpd, Bool check_access, Bool *use_default, GF_SampleGroupDescriptionBox **out_sgdesc)
 {
 	GF_Err e;
 	GF_TrackBox *trak=NULL;
@@ -7008,6 +7117,7 @@
 	u32 trafID=0;
 	GF_DefaultSampleGroupDescriptionEntry *entry=NULL;
 	GF_SampleGroupDescriptionBox *sgdesc = NULL;
+	Bool is_default = sgpd_flags & 0x80000000;
 
 	if (sampleGroupDescriptionIndex) *sampleGroupDescriptionIndex = 0;
 
@@ -7039,7 +7149,52 @@
 	//get sample group desc for this grouping type
 	sgdesc = get_sgdp(trak->Media->information->sampleTable, traf, grouping_type, is_traf_sgpd);
 	if (!sgdesc) return GF_OUT_OF_MEM;
+	//first time we create the sample group description, set flags
+	if (!gf_list_count(sgdesc->group_descriptions) && !traf) {
+		if (sgpd_flags&1) sgdesc->flags |= 1;
+		if (sgpd_flags&2) sgdesc->flags |= 2;
+		if (sgpd_flags&0x40000000) sgdesc->version=3;
+	}
+
+
+	GF_BitStream *bs = gf_bs_new(data, data_size, GF_BITSTREAM_READ);
+	u32 bytes;
+	entry = sgpd_parse_entry(sgdesc, bs, data_size, data_size, &bytes);
+	gf_bs_del(bs);
+	if (!entry) return GF_NON_COMPLIANT_BITSTREAM;
+
+	if (out_sgdesc) *out_sgdesc = sgdesc;
 
+
+	//find the same entry
+	u32 k;
+	for (k=0; k<gf_list_count(sgdesc->group_descriptions); k++) {
+		void *sgde_dst = gf_list_get(sgdesc->group_descriptions, k);
+		if (gf_isom_is_identical_sgpd(entry, sgde_dst, sgdesc->grouping_type)) {
+			if (sampleGroupDescriptionIndex) *sampleGroupDescriptionIndex = k+1;
+			sgpd_del_entry(sgdesc->grouping_type, entry);
+			if (use_default) {
+				u32 idx = k+1;
+				if (is_traf_sgpd && *is_traf_sgpd) idx |= 0x10000;
+				*use_default = (sgdesc->default_description_index==idx) ? GF_TRUE : GF_FALSE;
+			}
+			return GF_OK;
+		}
+	}
+
+	if (traf && ! *is_traf_sgpd) {
+		sgdesc = get_sgdp(NULL, traf, grouping_type, is_traf_sgpd);
+		if (!sgdesc) return GF_OUT_OF_MEM;
+	}
+	if (out_sgdesc) *out_sgdesc = sgdesc;
+
+	e = gf_list_add(sgdesc->group_descriptions, entry);
+	if (e) {
+		sgpd_del_entry(sgdesc->grouping_type, entry);
+		return e;
+	}
+
+#if 0
 	if (grouping_type==GF_ISOM_SAMPLE_GROUP_OINF) {
 		GF_OperatingPointsInformation *ptr = gf_isom_oinf_new_entry();
 		GF_BitStream *bs=gf_bs_new(data, data_size, GF_BITSTREAM_READ);
@@ -7109,31 +7264,42 @@
 			}
 		}
 	}
+#endif
 
 
-	if (is_default) {
+	if (is_default && !sgdesc->default_description_index) {
 		sgdesc->default_description_index = 1 + gf_list_find(sgdesc->group_descriptions, entry);
-		sgdesc->version = 2;
+		if (sgdesc->version < 2) sgdesc->version = 2;
+		if (is_traf_sgpd && *is_traf_sgpd) {
+			sgdesc->default_description_index |= 0x10000;
+		}
+	}
+	u32 grp_idx =  1 + gf_list_find(sgdesc->group_descriptions, entry);
+	if (sampleGroupDescriptionIndex) *sampleGroupDescriptionIndex = grp_idx;
+	if (use_default) {
+		if (*is_traf_sgpd)
+			grp_idx |= 0x10000;
+		*use_default = (sgdesc->default_description_index==grp_idx) ? GF_TRUE : GF_FALSE;
 	}
-	if (sampleGroupDescriptionIndex) *sampleGroupDescriptionIndex = 1 + gf_list_find(sgdesc->group_descriptions, entry);
-
 	return GF_OK;
 }
 GF_EXPORT
 GF_Err gf_isom_add_sample_group_info(GF_ISOFile *movie, u32 track, u32 grouping_type, void *data, u32 data_size, Bool is_default, u32 *sampleGroupDescriptionIndex)
 {
-	return gf_isom_add_sample_group_info_internal(movie, track, grouping_type, data, data_size, is_default, sampleGroupDescriptionIndex, NULL, GF_TRUE);
+	return gf_isom_add_sample_group_info_internal(movie, track, grouping_type, data, data_size, is_default ? 0x80000000 : 0, sampleGroupDescriptionIndex, NULL, GF_TRUE, NULL, NULL);
 }
 
-GF_Err gf_isom_set_sample_group_description_internal(GF_ISOFile *movie, u32 track, u32 sample_number, u32 grouping_type, u32 grouping_type_parameter, void *data, u32 data_size, Bool check_access)
+GF_Err gf_isom_set_sample_group_description_internal(GF_ISOFile *movie, u32 track, u32 sample_number, u32 grouping_type, u32 grouping_type_parameter, void *data, u32 data_size, Bool check_access, u32 sgpd_flags)
 {
 	u32 sampleGroupDescriptionIndex, trafID=0;
 	GF_Err e;
-	Bool is_traf_sgpd;
+	GF_SampleGroupDescriptionBox *sgdesc=NULL;
+	Bool is_traf_sgpd, use_default=GF_FALSE;
 	GF_List *groupList=NULL, *parent=NULL;
-	e = gf_isom_add_sample_group_info_internal(movie, track, grouping_type, data, data_size, GF_FALSE, &sampleGroupDescriptionIndex, &is_traf_sgpd, check_access);
-	if (e) return e;
 
+	e = gf_isom_add_sample_group_info_internal(movie, track, grouping_type, data, data_size, sgpd_flags, &sampleGroupDescriptionIndex, &is_traf_sgpd, check_access, &use_default, &sgdesc);
+	if (e) return e;
+	if (use_default) return GF_OK;
 
 	GF_SampleTableBox *stbl=NULL;
 	GF_TrackBox *trak=NULL;
@@ -7185,13 +7351,13 @@
 		parent = stbl->child_boxes;
 	}
 
-	return gf_isom_add_sample_group_entry(groupList, sample_number, grouping_type, grouping_type_parameter, sampleGroupDescriptionIndex, parent, stbl);
+	return gf_isom_add_sample_group_entry(groupList, sample_number, sgdesc, grouping_type_parameter, sampleGroupDescriptionIndex, parent, stbl);
 
 }
 
-GF_Err gf_isom_set_sample_group_description(GF_ISOFile *movie, u32 track, u32 sample_number, u32 grouping_type, u32 grouping_type_parameter, void *data, u32 data_size)
+GF_Err gf_isom_set_sample_group_description(GF_ISOFile *movie, u32 track, u32 sample_number, u32 grouping_type, u32 grouping_type_parameter, void *data, u32 data_size, u32 sgpd_flags)
 {
-	return gf_isom_set_sample_group_description_internal(movie, track, sample_number, grouping_type, grouping_type_parameter, data, data_size, GF_TRUE);
+	return gf_isom_set_sample_group_description_internal(movie, track, sample_number, grouping_type, grouping_type_parameter, data, data_size, GF_TRUE, sgpd_flags);
 }
 
 GF_EXPORT
@@ -7249,15 +7415,19 @@
 	if (!trak->Media->information->sampleTable->sampleGroups)
 		trak->Media->information->sampleTable->sampleGroups = gf_list_new();
 
+
+	GF_SampleGroupDescriptionBox *sgdesc = get_sgdp(trak->Media->information->sampleTable, NULL, grouping_type, NULL);
+	if (!sgdesc) return GF_BAD_PARAM;
+
 	groupList = trak->Media->information->sampleTable->sampleGroups;
-	return gf_isom_add_sample_group_entry(groupList, sample_number, grouping_type, grouping_type_parameter, sampleGroupDescriptionIndex, trak->Media->information->sampleTable->child_boxes, trak->Media->information->sampleTable);
+	return gf_isom_add_sample_group_entry(groupList, sample_number, sgdesc, grouping_type_parameter, sampleGroupDescriptionIndex, trak->Media->information->sampleTable->child_boxes, trak->Media->information->sampleTable);
 }
 
 void *sg_rap_create_entry(void *udta)
 {
 	GF_VisualRandomAccessEntry *entry;
 	u32 *num_leading_samples = (u32 *) udta;
-	assert(udta);
+	gf_assert(udta);
 	GF_SAFEALLOC(entry, GF_VisualRandomAccessEntry);
 	if (!entry) return NULL;
 	entry->num_leading_samples = *num_leading_samples;
@@ -7357,7 +7527,7 @@
 
 /*sample encryption information group can be in stbl or traf*/
 GF_EXPORT
-GF_Err gf_isom_set_sample_cenc_group(GF_ISOFile *movie, u32 track, u32 sample_number, u8 isEncrypted, u8 crypt_byte_block, u8 skip_byte_block, u8 *key_info, u32 key_info_size)
+GF_Err gf_isom_set_sample_cenc_group(GF_ISOFile *movie, u32 track, u32 sample_number, u8 isEncrypted, u32 crypt_byte_block, u32 skip_byte_block, u8 *key_info, u32 key_info_size)
 {
 	GF_CENCSampleEncryptionGroupEntry entry;
 	if (!key_info || (key_info_size<19))
@@ -7493,7 +7663,7 @@
 			for (i=0; i<ctts->nb_entries; i++) {
 				s64 new_ts = ctts->entriesi.decodingOffset;
 				new_ts += shift;
-				ctts->entriesi.decodingOffset = (u32) shift;
+				ctts->entriesi.decodingOffset = (s32) new_ts;
 			}
 		}
 	}
@@ -7504,7 +7674,7 @@
 		for (i=0; i<ctts->nb_entries; i++) {
 			s64 new_ts = ctts->entriesi.decodingOffset;
 			new_ts += shift;
-			ctts->entriesi.decodingOffset = (u32) shift;
+			ctts->entriesi.decodingOffset = (s32) new_ts;
 		}
 		gf_isom_box_del_parent(&trak->Media->information->sampleTable->child_boxes, (GF_Box *)cslg);
 		trak->Media->information->sampleTable->CompositionToDecode = NULL;
@@ -7686,6 +7856,7 @@
 
 		sg = (GF_SampleGroupBox*)gf_list_get(src_trak->Media->information->sampleTable->sampleGroups, i);
 		for (j=0; j<sg->entry_count; j++) {
+			GF_SampleGroupDescriptionBox *sgd_dst = NULL;
 			last_sample_in_entry = first_sample_in_entry + sg->sample_entriesj.sample_count - 1;
 			if ((sampleNumber<first_sample_in_entry) || (sampleNumber>last_sample_in_entry)) {
 				first_sample_in_entry = last_sample_in_entry+1;
@@ -7698,8 +7869,8 @@
 			group_desc_index_src = group_desc_index_dst = sg->sample_entriesj.group_description_index;
 
 			if (group_desc_index_src) {
-				GF_SampleGroupDescriptionBox *sgd_src, *sgd_dst;
-				GF_DefaultSampleGroupDescriptionEntry *sgde_src, *sgde_dst;
+				GF_SampleGroupDescriptionBox *sgd_src;
+				void *sgde_src, *sgde_dst;
 
 				group_desc_index_dst = 0;
 				//check that the sample group description exists !!
@@ -7720,6 +7891,7 @@
 					gf_isom_clone_box( (GF_Box *) sgd_src, (GF_Box **) &sgd_dst);
 					if (!sgd_dst) return GF_OUT_OF_MEM;
 					gf_list_add(dst_trak->Media->information->sampleTable->sampleGroupsDescription, sgd_dst);
+					gf_list_add(dst_trak->Media->information->sampleTable->child_boxes, sgd_dst);
 				}
 
 				//find the same entry
@@ -7740,11 +7912,13 @@
 					gf_list_add(sgd_dst->group_descriptions, sgde_dst);
 					group_desc_index_dst = gf_list_count(sgd_dst->group_descriptions);
 				}
+			} else {
+				gf_isom_get_sample_group_info_entry(dst, dst_trak, sg->grouping_type, 1, NULL, &sgd_dst);
+				if (!sgd_dst) continue;
 			}
 
-
 			/*found our sample, add it to trak->sampleGroups*/
-			e = gf_isom_add_sample_group_entry(dst_trak->Media->information->sampleTable->sampleGroups, dst_sample_num, sg->grouping_type, sg->grouping_type_parameter, group_desc_index_dst, dst_trak->Media->information->sampleTable->child_boxes, NULL);
+			e = gf_isom_add_sample_group_entry(dst_trak->Media->information->sampleTable->sampleGroups, dst_sample_num, sgd_dst, sg->grouping_type_parameter, group_desc_index_dst, dst_trak->Media->information->sampleTable->child_boxes, NULL);
 			if (e) return e;
 			break;
 		}
@@ -7771,7 +7945,7 @@
 		//no aux sample associated
 		if (saiz->sample_count<sampleNumber) continue;
 		//no size associated
-		if (!saiz->sample_info_sizesampleNumber-1) continue;
+		if (!saiz->default_sample_info_size && !saiz->sample_info_sizesampleNumber-1) continue;
 
 		for (j=0; j<gf_list_count(src_trak->Media->information->sampleTable->sai_offsets); j++) {
 			saio = gf_list_get(src_trak->Media->information->sampleTable->sai_offsets, j);
@@ -8056,6 +8230,7 @@
 	if (ve->svc_config) ve->svc_config->config->nal_unit_size = nalu_size_length;
 	if (ve->hevc_config) ve->hevc_config->config->nal_unit_size = nalu_size_length;
 	if (ve->lhvc_config) ve->lhvc_config->config->nal_unit_size = nalu_size_length;
+	if (ve->vvc_config) ve->vvc_config->config->nal_unit_size = nalu_size_length;
 	return GF_OK;
 }
 
@@ -8158,7 +8333,7 @@
 			gf_isom_box_del(abox);
 			continue;
 		}
-		
+
 		if (!ent->child_boxes) ent->child_boxes = gf_list_new();
 		for (j=0; j<gf_list_count(ent->child_boxes); j++) {
 			GF_Box *b = gf_list_get(ent->child_boxes, j);
@@ -8196,6 +8371,9 @@
 	u8 *box_data=NULL;
 	u32 box_data_size;
 	if (!file || !box_patch_filename) return GF_BAD_PARAM;
+#ifdef GPAC_DISABLE_ISOM_FRAGMENTS
+	if (for_fragments) return GF_NOT_SUPPORTED;
+#endif
 	dom = gf_xml_dom_new();
 	if (strstr(box_patch_filename, "<?xml")) {
 		e = gf_xml_dom_parse_string(dom, (char *) box_patch_filename);
@@ -8212,6 +8390,7 @@
 
 	//compute size of each child boxes to freeze the order
 	if (for_fragments) {
+#ifndef GPAC_DISABLE_ISOM_FRAGMENTS
 		u32 count = file->moof ? gf_list_count(file->moof->child_boxes) : 0;
 		for (i=0; i<count; i++) {
 			GF_Box *box = gf_list_get(file->moof->child_boxes, i);
@@ -8220,6 +8399,7 @@
 				gf_isom_box_freeze_order(box);
 			}
 		}
+#endif
 	} else {
 		for (i=0; i<gf_list_count(file->TopBoxes); i++) {
 			GF_Box *box = gf_list_get(file->TopBoxes, i);
@@ -8292,6 +8472,7 @@
 							box = gf_list_get(file->moov->trackList, 0);
 						}
 					}
+#ifndef GPAC_DISABLE_ISOM_FRAGMENTS
 					else if (box_type==GF_ISOM_BOX_TYPE_TRAF) {
 						if (trackID) {
 							box = (GF_Box *) gf_isom_get_traf(file, trackID);
@@ -8300,6 +8481,7 @@
 							box = gf_list_get(file->moof->TrackList, 0);
 						}
 					}
+#endif
 				}
 				if (!box) {
 					GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("ISOBMFF Cannot locate box type %s at root or as track\n", gf_4cc_to_str(box_type) ));
@@ -8329,7 +8511,11 @@
 			// '+' is append after, '-' is insert before
 			if (path_len && ((box_path0=='-') || (box_path0=='+')) ) {
 				s32 idx = gf_list_find(*parent_list, box);
-				assert(idx>=0);
+				if (idx<0) {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("ISOBMFF Invalid index for path %s\n", box_path));
+					e = GF_NON_COMPLIANT_BITSTREAM;
+					goto err_exit;
+				}
 				if (box_path0=='+') insert_pos = idx+1;
 				else insert_pos = idx;
 			}
@@ -8455,9 +8641,8 @@
 GF_EXPORT
 GF_Err gf_isom_set_track_index(GF_ISOFile *movie, u32 trackNumber, u32 index, void (*track_num_changed)(void *udta, u32 old_track_num, u32 new_track_num), void *udta)
 {
-	u32 i, count;
+	u32 i, j, count;
 	GF_List *tracks;
-	u32 prev_index=0, prev_pos=0;
 	GF_TrackBox *trak = gf_isom_get_track_from_file(movie, trackNumber);
 	if (!trak || !index) return GF_BAD_PARAM;
 	trak->index = index;
@@ -8468,13 +8653,17 @@
 		GF_TrackBox *a_tk = gf_list_get(movie->moov->trackList, i);
 		if (!a_tk->index) {
 			gf_list_insert(tracks, a_tk, 0);
-		} else if (a_tk->index < prev_index) {
-			gf_list_insert(tracks, a_tk, prev_pos);
 		} else {
-			gf_list_add(tracks, a_tk);
+			for (j=0; j<gf_list_count(tracks); j++) {
+				GF_TrackBox *a_tki = gf_list_get(tracks, j);
+				if (a_tki->index<a_tk->index) continue;
+				gf_list_insert(tracks, a_tk, j);
+				a_tk = NULL;
+				break;
+			}
+			if (a_tk)
+				gf_list_add(tracks, a_tk);
 		}
-		prev_pos = gf_list_count(tracks) - 1;
-		prev_index = a_tk->index;
 	}
 	if (gf_list_count(tracks) != count) {
 		gf_list_del(tracks);
@@ -8484,13 +8673,18 @@
 		for (i=0; i<count; i++) {
 			GF_TrackBox *a_tk = gf_list_get(tracks, i);
 			s32 old_pos = gf_list_find(movie->moov->trackList, a_tk);
-			assert(old_pos>=0);
+			gf_assert(old_pos>=0);
 			if (old_pos != i)
 				track_num_changed(udta, old_pos+1, i+1);
 		}
 	}
 	gf_list_del(movie->moov->trackList);
 	movie->moov->trackList = tracks;
+	for (j=0; j<gf_list_count(tracks); j++) {
+		GF_TrackBox *tki = gf_list_get(tracks, j);
+		if (tki->index != 0xFFFE) // special value meaning always last
+			tki->index = j + 1;
+	}
 	return GF_OK;
 }
 
@@ -8624,7 +8818,7 @@
 	//proj mandatory
 	GF_Box *proj = gf_isom_box_find_child(sv3d->child_boxes, GF_ISOM_BOX_TYPE_PROJ);
 	if (!proj) {
-		proj = (GF_Box *) gf_isom_box_new_parent(&sv3d->child_boxes, GF_ISOM_BOX_TYPE_PROJ);
+		proj = gf_isom_box_new_parent(&sv3d->child_boxes, GF_ISOM_BOX_TYPE_PROJ);
 		if (!proj) return GF_OUT_OF_MEM;
 	}
 
@@ -8669,6 +8863,9 @@
 	return GF_OK;
 }
 
+#endif //!defined(GPAC_DISABLE_ISOM_WRITE)
+
+#ifndef GPAC_DISABLE_ISOM
 
 GF_Err gf_isom_add_sample_aux_info_internal(GF_TrackBox *trak, void *_traf, u32 sampleNumber, u32 aux_type, u32 aux_info, u8 *data, u32 size)
 {
@@ -8781,8 +8978,11 @@
 
 	return GF_OK;
 }
+#endif // GPAC_DISABLE_ISOM
 
 
+#if !defined(GPAC_DISABLE_ISOM_WRITE)
+
 #ifndef GPAC_DISABLE_ISOM_FRAGMENTS
 GF_Err gf_isom_fragment_set_sample_aux_info(GF_ISOFile *movie, u32 trackID, u32 sample_number_in_frag, u32 aux_type, u32 aux_info, u8 *data, u32 size)
 {
@@ -8872,5 +9072,103 @@
 	return GF_OK;
 }
 
-#endif	/*!defined(GPAC_DISABLE_ISOM) && !defined(GPAC_DISABLE_ISOM_WRITE)*/
+GF_Err gf_isom_set_sample_description_restricted(GF_ISOFile *movie, u32 trackNumber, u32 sampleDescIndex, u32 scheme_type)
+{
+	u32 type;
+	GF_SampleEntryBox *ent;
+	GF_TrackBox *trak;
+
+	trak = gf_isom_get_track_from_file(movie, trackNumber);
+	if (!trak || !trak->Media) return GF_BAD_PARAM;
+	ent = gf_list_get(trak->Media->information->sampleTable->SampleDescription->child_boxes, sampleDescIndex-1);
+	if (!ent) return GF_BAD_PARAM;
+	type = ent->type;
+
+	u32 original_format = type;
+	u32 gnr_type=0;
+	if (original_format==GF_ISOM_BOX_TYPE_GNRA) {
+		gnr_type = original_format;
+		type = ((GF_GenericAudioSampleEntryBox*)ent)->EntryType;
+	} else if (original_format==GF_ISOM_BOX_TYPE_GNRV) {
+		gnr_type = original_format;
+		type = ((GF_GenericVisualSampleEntryBox*)ent)->EntryType;
+	} else if (original_format==GF_ISOM_BOX_TYPE_GNRM) {
+		gnr_type = original_format;
+		type = ((GF_GenericSampleEntryBox*)ent)->EntryType;
+	}
+
+	switch (type) {
+	case GF_ISOM_BOX_TYPE_RESV:
+	case GF_ISOM_BOX_TYPE_RESA:
+	case GF_ISOM_BOX_TYPE_RESM:
+	case GF_ISOM_BOX_TYPE_REST:
+	case GF_ISOM_BOX_TYPE_RESU:
+	case GF_ISOM_BOX_TYPE_RESS:
+	case GF_ISOM_BOX_TYPE_RESF:
+	case GF_ISOM_BOX_TYPE_RESP:
+	case GF_ISOM_BOX_TYPE_RES3:
+		return GF_OK;
+	case GF_ISOM_BOX_TYPE_STXT:
+		type = GF_ISOM_BOX_TYPE_REST;
+		break;
+	case GF_ISOM_BOX_TYPE_STPP:
+		type = GF_ISOM_BOX_TYPE_RESU;
+		break;
+	case GF_ISOM_BOX_TYPE_METX:
+	case GF_ISOM_BOX_TYPE_METT:
+	case GF_ISOM_BOX_TYPE_URIM:
+	case GF_ISOM_BOX_TYPE_MEBX:
+		type = GF_ISOM_BOX_TYPE_RESM;
+		break;
+	default:
+		type=0;
+		switch (trak->Media->handler->handlerType) {
+		case GF_ISOM_MEDIA_VISUAL:
+		case GF_ISOM_MEDIA_AUXV:
+		case GF_ISOM_MEDIA_PICT:
+			type = GF_ISOM_BOX_TYPE_RESV;
+			break;
+		case GF_ISOM_MEDIA_AUDIO:
+			type = GF_ISOM_BOX_TYPE_RESA;
+			break;
+		case GF_ISOM_MEDIA_OD:
+		case GF_ISOM_MEDIA_OCR:
+		case GF_ISOM_MEDIA_SCENE:
+		case GF_ISOM_MEDIA_MPEG7:
+		case GF_ISOM_MEDIA_OCI:
+		case GF_ISOM_MEDIA_IPMP:
+		case GF_ISOM_MEDIA_MPEGJ:
+			type = GF_ISOM_BOX_TYPE_RESS;
+			break;
+		}
+		break;
+	}
+	if (!type) return GF_NOT_SUPPORTED;
+
+	GF_ProtectionSchemeInfoBox *rinf;
+	rinf = (GF_ProtectionSchemeInfoBox *) gf_isom_box_find_child(ent->child_boxes, GF_ISOM_BOX_TYPE_RINF);
+	if (rinf) gf_isom_box_del_parent(&ent->child_boxes, (GF_Box *)rinf);
 
+	rinf = (GF_ProtectionSchemeInfoBox *)gf_isom_box_new_parent(&ent->child_boxes, GF_ISOM_BOX_TYPE_RINF);
+	if (!rinf) return GF_OUT_OF_MEM;
+
+
+	rinf->original_format = (GF_OriginalFormatBox *)gf_isom_box_new_parent(&rinf->child_boxes, GF_ISOM_BOX_TYPE_FRMA);
+	if (!rinf->original_format) return GF_OUT_OF_MEM;
+	if (gnr_type) {
+		rinf->original_format->data_format = gnr_type;
+		rinf->original_format->gnr_type = original_format;
+	} else {
+		rinf->original_format->data_format = original_format;
+	}
+	//common to isma, cenc and oma
+	rinf->scheme_type = (GF_SchemeTypeBox *)gf_isom_box_new_parent(&rinf->child_boxes, GF_ISOM_BOX_TYPE_SCHM);
+	if (!rinf->scheme_type) return GF_OUT_OF_MEM;
+	rinf->scheme_type->scheme_type  = scheme_type;
+
+	ent->type = type;
+	return GF_OK;
+}
+
+
+#endif	/*!defined(GPAC_DISABLE_ISOM) && !defined(GPAC_DISABLE_ISOM_WRITE)*/

gpac-2.2.1.tar.gz/src/isomedia/media.c -> gpac-2.4.0.tar.gz/src/isomedia/media.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2022
+ *			Copyright (c) Telecom ParisTech 2000-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / ISO Media File Format sub-project
@@ -101,7 +101,7 @@
 		gf_bs_write_data(bs, szName, 80);
 		ent = stbl->TimeToSample->nb_entries ? &stbl->TimeToSample->entries0 : NULL;
 		sample_rate = entry->samplerate_hi;
-		block_size = ent ? ent->sampleDelta : 160;
+		block_size = (ent && ent->sampleDelta) ? ent->sampleDelta : 160;
 		gf_bs_write_u16_le(bs, 8*sample_size*sample_rate/block_size);
 		gf_bs_write_u16_le(bs, sample_size);
 		gf_bs_write_u16_le(bs, block_size);
@@ -308,7 +308,9 @@
 	case GF_ISOM_BOX_TYPE_WVTT:
 		if (entry->internal_type != GF_ISOM_SAMPLE_ENTRY_GENERIC)
 			return GF_ISOM_INVALID_MEDIA;
-	{
+
+		if (true_desc_only) return GF_ISOM_INVALID_MEDIA;
+		{
 		GF_WebVTTSampleEntryBox*vtte = (GF_WebVTTSampleEntryBox*)entry;
 		esd =  gf_odf_desc_esd_new(2);
 		*out_esd = esd;
@@ -392,6 +394,8 @@
 			return GF_ISOM_INVALID_MEDIA;
 		} else {
 			GF_LASeRSampleEntryBox*ptr = (GF_LASeRSampleEntryBox*)entry;
+			if (!ptr || !ptr->lsr_config || !ptr->lsr_config->hdr_size)
+				return GF_ISOM_INVALID_MEDIA;
 			esd =  gf_odf_desc_esd_new(2);
 			*out_esd = esd;
 			esd->decoderConfig->streamType = GF_STREAM_SCENE;
@@ -464,7 +468,7 @@
 	return 0;
 }
 
-GF_Err Media_GetSample(GF_MediaBox *mdia, u32 sampleNumber, GF_ISOSample **samp, u32 *sIDX, Bool no_data, u64 *out_offset)
+GF_Err Media_GetSample(GF_MediaBox *mdia, u32 sampleNumber, GF_ISOSample **samp, u32 *sIDX, Bool no_data, u64 *out_offset, Bool ext_realloc)
 {
 	GF_Err e;
 	u32 bytesRead;
@@ -493,7 +497,7 @@
 
 	if (mdia->information->sampleTable->TimeToSample) {
 		//get the DTS
-		e = stbl_GetSampleDTS(mdia->information->sampleTable->TimeToSample, sampleNumber, &(*samp)->DTS);
+		e = stbl_GetSampleDTS_and_Duration(mdia->information->sampleTable->TimeToSample, sampleNumber, &(*samp)->DTS, &(*samp)->duration);
 		if (e) return e;
 	} else {
 		(*samp)->DTS=0;
@@ -610,6 +614,8 @@
 			data_size *= left_in_chunk;
 			(*samp)->nb_pack = left_in_chunk;
 		}
+		if (! (*samp)->data)
+			(*samp)->alloc_size = 0;
 
 		/*and finally get the data, include padding if needed*/
 		if ((*samp)->alloc_size) {
@@ -620,7 +626,11 @@
 				(*samp)->alloc_size = data_size + mdia->mediaTrack->padding_bytes;
 			}
 		} else {
-			(*samp)->data = (char *) gf_malloc(sizeof(char) * ( data_size + mdia->mediaTrack->padding_bytes) );
+			if (ext_realloc) {
+				(*samp)->data = mdia->mediaTrack->sample_alloc_cbk(data_size + mdia->mediaTrack->padding_bytes, mdia->mediaTrack->sample_alloc_udta);
+			} else {
+				(*samp)->data = (u8 *) gf_malloc(data_size + mdia->mediaTrack->padding_bytes);
+			}
 			if (! (*samp)->data) return GF_OUT_OF_MEM;
 		}
 		(*samp)->dataLength = data_size;
@@ -637,7 +647,6 @@
 				return GF_ISOM_INCOMPLETE_FILE;
 			}
 		}
-
 		bytesRead = gf_isom_datamap_get_data(mdia->information->dataHandler, (*samp)->data, (*samp)->dataLength, offset);
 		//if bytesRead != sampleSize, we have an IO err
 		if (bytesRead < data_size) {
@@ -656,11 +665,18 @@
 			if (e) return e;
 		}
 	}
-	else if (gf_isom_is_nalu_based_entry(mdia, entry)
-		&& !gf_isom_is_encrypted_entry(entry->type)
-	) {
-		e = gf_isom_nalu_sample_rewrite(mdia, *samp, sampleNumber, (GF_MPEGVisualSampleEntryBox *)entry);
-		if (e) return e;
+	else if (gf_isom_is_nalu_based_entry(mdia, entry)) {
+		GF_ISOSAPType gf_isom_nalu_get_sample_sap(GF_MediaBox *mdia, u32 sampleNumber, GF_ISOSample *sample, GF_MPEGVisualSampleEntryBox *entry);
+
+		if (!gf_isom_is_encrypted_entry(entry->type)) {
+			e = gf_isom_nalu_sample_rewrite(mdia, *samp, sampleNumber, (GF_MPEGVisualSampleEntryBox *)entry);
+			if (e) return e;
+		}
+		if (!gf_sys_old_arch_compat()) {
+			GF_ISOSAPType sap = gf_isom_nalu_get_sample_sap(mdia, sampleNumber, *samp, (GF_MPEGVisualSampleEntryBox *)entry);
+			if (sap && ! (*samp)->IsRAP) (*samp)->IsRAP = sap;
+			else if ((*samp)->IsRAP < sap) (*samp)->IsRAP = sap;
+		}
 	}
 	else if (mdia->mediaTrack->moov->mov->convert_streaming_text
 	         && ((mdia->handler->handlerType == GF_ISOM_MEDIA_TEXT) || (mdia->handler->handlerType == GF_ISOM_MEDIA_SCENE) || (mdia->handler->handlerType == GF_ISOM_MEDIA_SUBT))
@@ -1058,7 +1074,7 @@
 		e = stbl_AddChunkOffset(mdia, sampleNumber, StreamDescIndex, data_offset, sample->nb_pack);
 		if (e) return e;
 	}
-	
+
 	if (!syncShadowNumber) return GF_OK;
 	if (!stbl->ShadowSync) {
 		stbl->ShadowSync = (GF_ShadowSyncBox *) gf_isom_box_new_parent(&stbl->child_boxes, GF_ISOM_BOX_TYPE_STSH);

gpac-2.2.1.tar.gz/src/isomedia/media_odf.c -> gpac-2.4.0.tar.gz/src/isomedia/media_odf.c Changed

gpac-2.2.1.tar.gz/src/isomedia/meta.c -> gpac-2.4.0.tar.gz/src/isomedia/meta.c Changed

@@ -2,7 +2,7 @@
  *					GPAC Multimedia Framework
  *
  *			Authors: Cyril Concolato - Jean le Feuvre
- *			Copyright (c) Telecom ParisTech 2005-2022
+ *			Copyright (c) Telecom ParisTech 2005-2024
  *					All rights reserved
  *
  *  This file is part of GPAC / ISO Media File Format sub-project
@@ -287,20 +287,46 @@
 			return GF_BAD_PARAM;
 		}
 	}
+	else if (location_entry->construction_method == 2) {
+		GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("IsoMedia Item %d use from-item construction method, not supported - patch welcome\n", item_num));
+		return GF_NOT_SUPPORTED;
+	}
 	/* when construction_method==1, data_reference_index is ignored */
 	/*FIXME*/
 	else if (location_entry->data_reference_index) {
 		char *item_url = NULL, *item_urn = NULL;
-		GF_Box *a = (GF_Box *)gf_list_get(meta->file_locations->dref->child_boxes, location_entry->data_reference_index-1);
+		GF_FullBox *a = (GF_FullBox *)gf_list_get(meta->file_locations->dref->child_boxes, location_entry->data_reference_index-1);
 		if (!a) return GF_ISOM_INVALID_FILE;
 		if (a->type==GF_ISOM_BOX_TYPE_URL) {
-			item_url = ((GF_DataEntryURLBox*)a)->location;
+			if (!(a->flags & 1)) {
+				item_url = ((GF_DataEntryURLBox*)a)->location;
+			}
 		} else if (a->type==GF_ISOM_BOX_TYPE_URN) {
 			item_url = ((GF_DataEntryURNBox*)a)->location;
 			item_urn = ((GF_DataEntryURNBox*)a)->nameURN;
 		}
-		GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("IsoMedia Item already outside the ISO file at URL: %s, URN: %s\n", (item_url?item_url:"N/A"), (item_urn?item_urn:"N/A") ));
-		return GF_OK;
+		if (item_url || item_urn) {
+			GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("IsoMedia Item already outside the ISO file at URL: %s, URN: %s\n", (item_url?item_url:"N/A"), (item_urn?item_urn:"N/A") ));
+			return GF_OK;
+		}
+		if (a->type==GF_ISOM_BOX_TYPE_IMDT) {
+			Bool found = GF_FALSE;
+			u32 imda_id = ((GF_DataEntryURLBox*)a)->imda_ref_id;
+			count = gf_list_count(file->TopBoxes);
+			for (i=0; i<count; i++) {
+				GF_MediaDataBox *imda = (GF_MediaDataBox *)gf_list_get(file->TopBoxes, i);
+				if (imda->type != GF_ISOM_BOX_TYPE_MDAT) continue;
+				if (!imda->is_imda) continue;
+				if (imda->imda_id != imda_id) continue;
+				idat_offset = imda->bsOffset;
+				found = GF_TRUE;
+				break;
+			}
+			if (!found) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("IsoMedia Item %d references an inexistant imda box of id %u\n", item_num, imda_id));
+				return GF_BAD_PARAM;
+			}
+		}
 	}
 
 	/*don't extract self-reference item*/
@@ -334,15 +360,11 @@
 		u32 j, nb_assoc;
 		GF_HEVCConfigurationBox *hvcc = NULL;
 		GF_AVCConfigurationBox *avcc = NULL;
-		if (! meta->item_props) return GF_NON_COMPLIANT_BITSTREAM;
-		if (! meta->item_props->property_container) {
-			if (item_bs) gf_bs_del(item_bs);
-			return GF_NON_COMPLIANT_BITSTREAM;
-		}
-		if (! meta->item_props->property_association) {
+		if (!meta->item_props || !meta->item_props->property_container || !meta->item_props->property_association) {
 			if (item_bs) gf_bs_del(item_bs);
 			return GF_NON_COMPLIANT_BITSTREAM;
 		}
+
 		nb_assoc = gf_list_count(meta->item_props->property_association->entries);
 		for (i=0; i<nb_assoc; i++) {
 			GF_ItemPropertyAssociationEntry *ent = gf_list_get(meta->item_props->property_association->entries, i);
@@ -455,7 +477,7 @@
 
 GF_EXPORT
 GF_Err gf_isom_extract_meta_item_get_cenc_info(GF_ISOFile *file, Bool root_meta, u32 track_num, u32 item_id, Bool *is_protected,
-	u8 *skip_byte_block, u8 *crypt_byte_block, const u8 **key_info, u32 *key_info_size, u32 *aux_info_type_param,
+	u32 *skip_byte_block, u32 *crypt_byte_block, const u8 **key_info, u32 *key_info_size, u32 *aux_info_type_param,
 	u8 **cenc_sai_data, u32 *cenc_sai_data_size, u32 *cenc_sai_alloc_size)
 {
 	u32 count, i;
@@ -481,7 +503,7 @@
 
 			if (ienc->type!=GF_ISOM_BOX_TYPE_IENC) continue;
 			if (ienc->key_info_size<19) return GF_ISOM_INVALID_FILE;
-			
+
 			*skip_byte_block = ienc->skip_byte_block;
 			*crypt_byte_block = ienc->crypt_byte_block;
 			*key_info = ienc->key_info;
@@ -679,6 +701,7 @@
 	memcpy(xml->xml, data, sizeof(unsigned char)*data_size);
 	return GF_OK;
 }
+#endif
 
 
 GF_EXPORT
@@ -701,10 +724,11 @@
 	if (i & 0x1)
 		prop->hidden = GF_TRUE;
 
-	count = gf_list_count(ipma->entries);
+	count = (ipma && ipma->entries) ? gf_list_count(ipma->entries) : 0;
 	for (i = 0; i < count; i++) {
 		GF_ItemPropertyAssociationEntry *entry = (GF_ItemPropertyAssociationEntry *)gf_list_get(ipma->entries, i);
 		if (entry->item_id != item_id) continue;
+		if (entry->nb_associations && !ipco) return GF_ISOM_INVALID_FILE;
 		for (j = 0; j < entry->nb_associations; j++) {
 			GF_Box *b;
 			u32 index = entry->associationsj.index;
@@ -762,6 +786,12 @@
 				prop->mirror = imir->axis+1;
 			}
 			break;
+			case GF_ISOM_BOX_TYPE_ILCE:
+			{
+				GF_FieldInterlaceTypeBox *ilce = (GF_FieldInterlaceTypeBox *)b;
+				prop->interlace_type = ilce->interlace_type;
+			}
+			break;
 			case GF_ISOM_BOX_TYPE_CLAP:
 			{
 				GF_CleanApertureBox *clap = (GF_CleanApertureBox *)b;
@@ -804,6 +834,8 @@
 	return GF_OK;
 }
 
+#ifndef GPAC_DISABLE_ISOM_WRITE
+
 static s32 meta_find_prop(GF_ItemPropertyContainerBox *boxes, GF_ImageItemProperties *prop) {
 	u32 i;
 	u32 count;
@@ -851,6 +883,14 @@
 			}
 		}
 		break;
+		case GF_ISOM_BOX_TYPE_ILCE:
+		{
+			GF_FieldInterlaceTypeBox *ilce = (GF_FieldInterlaceTypeBox *)b;
+			if (ilce->interlace_type == prop->interlace_type) {
+				return i;
+			}
+		}
+		break;
 		case GF_ISOM_BOX_TYPE_CLAP:
 		{
 			GF_CleanApertureBox *clap = (GF_CleanApertureBox *)b;
@@ -910,11 +950,14 @@
 			}
 		}
 		break;
-		
+
 		default:
-			if (gf_isom_box_equal(prop->config, b)) {
-				return i;
+			if (prop->config) {
+				if (gf_isom_box_equal(prop->config, b)) {
+					return i;
+				}
 			}
+			break;
 		}
 	}
 	return -1;
@@ -945,7 +988,7 @@
 	return GF_OK;
 }
 
-static GF_Err meta_process_image_properties(GF_MetaBox *meta, u32 item_ID, GF_ImageItemProperties *image_props)
+static GF_Err meta_process_image_properties(GF_MetaBox *meta, u32 item_ID, u32 item_type, GF_ImageItemProperties *image_props)
 {
 	GF_ImageItemProperties searchprop;
 	GF_ItemPropertyAssociationBox *ipma;
@@ -992,6 +1035,7 @@
 	}
 
 	if (image_props->width || image_props->height) {
+		Bool essential=GF_FALSE;
 		searchprop.width = image_props->width;
 		searchprop.height = image_props->height;
 		prop_index = meta_find_prop(ipco, &searchprop);
@@ -1002,7 +1046,8 @@
 			ispe->image_height = image_props->height;
 			prop_index = gf_list_count(ipco->child_boxes) - 1;
 		}
-		e = meta_add_item_property_association(ipma, item_ID, prop_index + 1, GF_FALSE);
+		if (item_type==GF_ISOM_ITEM_TYPE_UNCI) essential=GF_TRUE;
+		e = meta_add_item_property_association(ipma, item_ID, prop_index + 1, essential);
 		if (e) return e;
 		searchprop.width = 0;
 		searchprop.height = 0;
@@ -1096,8 +1141,12 @@
 		searchprop.config = image_props->config;
 		prop_index = meta_find_prop(ipco, &searchprop);
 		if (prop_index < 0) {
+#ifndef GPAC_DISABLE_ISOM_WRITE
 			gf_list_add(ipco->child_boxes, gf_isom_clone_config_box(image_props->config));
 			prop_index = gf_list_count(ipco->child_boxes) - 1;
+#else
+			return GF_NOT_SUPPORTED;
+#endif
 		}
 		e = meta_add_item_property_association(ipma, item_ID, prop_index + 1, GF_TRUE);
 		if (e) return e;
@@ -1111,6 +1160,7 @@
 		b->size = image_props->config_ba_size;
 		GF_BitStream *bs = gf_bs_new(image_props->config_ba, image_props->config_ba_size, GF_BITSTREAM_READ);
 		e = gf_isom_box_array_read(b, bs);
+		gf_bs_del(bs);
 		if (e) {
 			gf_isom_box_array_del(b->child_boxes);
 			gf_free(b);
@@ -1118,8 +1168,22 @@
 		}
 		while (gf_list_count(b->child_boxes)) {
 			GF_Box *a = gf_list_pop_front(b->child_boxes);
-			gf_list_add(ipco->child_boxes, a);
-			prop_index = gf_list_count(ipco->child_boxes) - 1;
+			u32 type = a->type;
+			if (a->type==GF_ISOM_BOX_TYPE_UNKNOWN)
+				type = ((GF_UnknownBox*)a)->original_4cc;
+			GF_Box *exists = gf_isom_box_find_child(ipco->child_boxes, type);
+			if (exists) {
+				if (gf_isom_box_equal(a, exists)) {
+					prop_index = gf_list_find(ipco->child_boxes, exists);
+					gf_isom_box_del_parent(&b->child_boxes, a);
+				} else {
+					exists = NULL;
+				}
+			}
+			if (!exists) {
+				gf_list_add(ipco->child_boxes, a);
+				prop_index = gf_list_count(ipco->child_boxes) - 1;
+			}
 			//mark all as essential
 			e = meta_add_item_property_association(ipma, item_ID, prop_index + 1, GF_TRUE);
 			if (e) return e;
@@ -1252,6 +1316,20 @@
 		if (e) return e;
 	}
 
+	if (image_props->interlace_type) {
+		searchprop.interlace_type = image_props->interlace_type;
+		prop_index = meta_find_prop(ipco, &searchprop);
+		if (prop_index < 0) {
+			GF_FieldInterlaceTypeBox *ilce = (GF_FieldInterlaceTypeBox *)gf_isom_box_new_parent(&ipco->child_boxes, GF_ISOM_BOX_TYPE_ILCE);
+			if (!ilce) return GF_OUT_OF_MEM;
+			ilce->interlace_type = image_props->interlace_type;
+			prop_index = gf_list_count(ipco->child_boxes) - 1;
+		}
+		e = meta_add_item_property_association(ipma, item_ID, prop_index + 1, GF_TRUE);
+		if (e) return e;
+		searchprop.interlace_type = 0;
+	}
+
 	if (image_props->cenc_info) {
 		GF_ItemEncryptionPropertyBox *ienc = NULL;
 
@@ -1381,7 +1459,7 @@
 		infe->item_ID = ++lastItemID;
 	}
 	if (io_item_id) *io_item_id = infe->item_ID;
-	
+
 	if (tk_id && sample_num) {
 		data_len = gf_isom_get_sample_size(file, tk_id, sample_num);
 		if (item_name)
@@ -1437,7 +1515,7 @@
 		if (image_props->hidden) {
 			infe->flags = 0x1;
 		}
-		e = meta_process_image_properties(meta, infe->item_ID, image_props);
+		e = meta_process_image_properties(meta, infe->item_ID, item_type, image_props);
 		if (e) return e;
 
 		if (image_props->cenc_info) {
@@ -1653,7 +1731,7 @@
 			if (data) {
 				infe->full_path = (char *)gf_malloc(sizeof(char) * data_len);
 				if (!infe->full_path) return GF_OUT_OF_MEM;
-				
+
 				memcpy(infe->full_path, data, sizeof(char) * data_len);
 				infe->data_len = data_len;
 			}
@@ -2009,6 +2087,8 @@
 	}
 }
 
+#ifndef GPAC_DISABLE_ISOM_WRITE
+
 GF_EXPORT
 GF_Err gf_isom_meta_add_item_group(GF_ISOFile *file, Bool root_meta, u32 track_num, u32 item_id, u32 group_id, u32 group_type)
 {
@@ -2055,6 +2135,8 @@
 	return GF_OK;
 }
 
+#endif // GPAC_DISABLE_ISOM_WRITE
+
 GF_EXPORT
 u32 gf_isom_meta_get_item_ref_count(GF_ISOFile *file, Bool root_meta, u32 track_num, u32 from_id, u32 type)
 {
@@ -2073,6 +2155,28 @@
 	}
 	return 0;
 }
+GF_EXPORT
+u32 gf_isom_meta_item_has_ref(GF_ISOFile *file, Bool root_meta, u32 track_num, u32 to_id, u32 type)
+{
+	u32 i, j, count, nb_refs=0;
+	GF_ItemReferenceTypeBox *ref;
+	GF_MetaBox *meta = gf_isom_get_meta(file, root_meta, track_num);
+	if (!meta || !type || !to_id) return 0;
+	if (!meta->item_refs) return 0;
+
+	count = gf_list_count(meta->item_refs->references);
+	for (i = 0; i < count; i++) {
+		ref = (GF_ItemReferenceTypeBox *)gf_list_get(meta->item_refs->references, i);
+		if (ref->reference_type != type) continue;
+		for (j=0; j<ref->reference_count; j++) {
+			if (ref->to_item_IDsj == to_id) {
+				nb_refs++;
+				break;
+			}
+		}
+	}
+	return nb_refs;
+}
 
 GF_EXPORT
 u32 gf_isom_meta_get_item_ref_id(GF_ISOFile *file, Bool root_meta, u32 track_num, u32 from_id, u32 type, u32 ref_idx)

gpac-2.2.1.tar.gz/src/isomedia/movie_fragments.c -> gpac-2.4.0.tar.gz/src/isomedia/movie_fragments.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2021
+ *			Copyright (c) Telecom ParisTech 2000-2024
  *					All rights reserved
  *
  *  This file is part of GPAC / ISO Media File Format sub-project
@@ -134,6 +134,7 @@
 
 				if (!trex->track->Media->information->sampleTable->SampleSize || ! trex->track->Media->information->sampleTable->SampleSize->sampleCount) {
 					gf_list_add(trep->child_boxes, trex->track->Media->information->sampleTable->CompositionToDecode);
+					gf_list_del_item(trex->track->Media->information->sampleTable->child_boxes, trex->track->Media->information->sampleTable->CompositionToDecode);
 					trex->track->Media->information->sampleTable->CompositionToDecode = NULL;
 				} else {
 					GF_CompositionToDecodeBox *cslg;
@@ -411,79 +412,59 @@
 
 void ComputeFragmentDefaults(GF_TrackFragmentBox *traf)
 {
-	u32 i, j, MaxNum, DefValue, ret;
+	u32 i, j;
 	GF_TrackFragmentRunBox *trun;
-	GF_TrunEntry *ent;
+	GF_TrunEntry *ent, *first_ent=NULL;
 
 	//Duration default
-	MaxNum = DefValue = 0;
-	i=0;
-	while ((trun = (GF_TrackFragmentRunBox *)gf_list_enum(traf->TrackRuns, &i))) {
-		for (j=0; j<trun->nb_samples; j++) {
-			ent = &trun->samplesj;
-			ret = GetNumUsedValues(traf, ent->Duration, 1);
-			if (ret>MaxNum) {
-				//at least 2 duration, specify for all
-				if (MaxNum) {
-					DefValue = 0;
-					goto escape_duration;
-				}
-				MaxNum = ret;
-				DefValue = ent->Duration;
-			}
-		}
-	}
-escape_duration:
-	//store if #
-	if (DefValue && ((DefValue != traf->trex->def_sample_duration) || traf->trex->cannot_use_default ) ) {
-		traf->tfhd->def_sample_duration = DefValue;
-	}
+	u32 def_dur=0;
+	u32 def_size=0;
+	u32 def_flags=0;
+	u32 nb_samp=0;
 
-	//Size default
-	MaxNum = DefValue = 0;
 	i=0;
 	while ((trun = (GF_TrackFragmentRunBox *)gf_list_enum(traf->TrackRuns, &i))) {
 		for (j=0; j<trun->nb_samples; j++) {
-			u32 ssize;
 			ent = &trun->samplesj;
-			ssize = ent->size;
-			if (ent->nb_pack>1)
-				ssize /= ent->nb_pack;
-			ret = GetNumUsedValues(traf, ssize, 2);
-			if (ret>MaxNum || (ret==1)) {
-				//at least 2 sizes so we must specify all sizes
-				if (MaxNum) {
-					DefValue = 0;
-					goto escape_size;
-				}
-				MaxNum = ret;
-				DefValue = ssize;
+			nb_samp++;
+
+			if (!first_ent) {
+				first_ent = ent;
+				def_dur = ent->Duration;
+				def_size = ent->size;
+				if (ent->nb_pack>1)
+					def_size /= ent->nb_pack;
+				continue;
 			}
+			//if more than 2 dur, we need the flag
+			if (def_dur && (ent->Duration != def_dur)) def_dur=0;
+			//if more than 2 size, we need the flag
+			if (def_size) {
+				u32 size = ent->size;
+				if (ent->nb_pack>1)
+					size /= ent->nb_pack;
+				if (size != def_size) def_size=0;
+			}
+			//only check sample flags after first sample (first one uses first sample flags)
+			if (nb_samp==2) def_flags = ent->flags;
+			//if more than 2 sets of flags, we need one entry each
+			else if (def_flags && (ent->flags != def_flags)) def_flags = 0;
+
+			//no default possible
+			if ((def_dur|def_size|def_flags) == 0)
+				break;
 		}
 	}
+	if (nb_samp==1) def_flags = first_ent->flags;
 
-escape_size:
-	//store if #
-	if (DefValue && (DefValue != traf->trex->def_sample_size)) {
-		traf->tfhd->def_sample_size = DefValue;
+	if (def_dur && ((def_dur != traf->trex->def_sample_duration) || traf->trex->cannot_use_default ) ) {
+		traf->tfhd->def_sample_duration = def_dur;
 	}
-
-	//Flags default
-	MaxNum = DefValue = 0;
-	i=0;
-	while ((trun = (GF_TrackFragmentRunBox *)gf_list_enum(traf->TrackRuns, &i))) {
-		for (j=0; j<trun->nb_samples; j++) {
-			ent = &trun->samplesj;
-			ret = GetNumUsedValues(traf, ent->flags, 3);
-			if (ret>MaxNum) {
-				MaxNum = ret;
-				DefValue = ent->flags;
-			}
-		}
+	if (def_size && (def_size != traf->trex->def_sample_size)) {
+		traf->tfhd->def_sample_size = def_size;
 	}
-	//store if #
-	if (traf->trex->cannot_use_default || (DefValue && (DefValue != traf->trex->def_sample_flags))) {
-		traf->tfhd->def_sample_flags = DefValue;
+	if (traf->trex->cannot_use_default || (def_flags && (def_flags != traf->trex->def_sample_flags))) {
+		traf->tfhd->def_sample_flags = def_flags;
 	}
 }
 
@@ -611,6 +592,7 @@
 		while (gf_list_count(traf->TrackRuns)) {
 			trun = (GF_TrackFragmentRunBox *)gf_list_get(traf->TrackRuns, 0);
 			gf_list_rem(traf->TrackRuns, 0);
+			gf_list_del_item(movie->moof->trun_list, trun);
 			gf_isom_box_del_parent(&traf->child_boxes, (GF_Box *)trun);
 		}
 		traf->tfhd->flags |= GF_ISOM_TRAF_DUR_EMPTY;
@@ -663,6 +645,7 @@
 		if (!first_ent) {
 			i--;
 			gf_list_rem(traf->TrackRuns, i);
+			gf_list_del_item(movie->moof->trun_list, trun);
 			continue;
 		}
 		trun->flags = 0;
@@ -763,9 +746,36 @@
 	return sampleCount;
 }
 
+static s32 get_earliest_cts_following(GF_TrackFragmentBox *traf, u32 trun_idx, u32 samp_idx)
+{
+	GF_TrackFragmentRunBox *trun;
+	GF_TrunEntry *ent;
+	s32 earliest_cts = 0;
+	s32 delta = 0;
+	u32 j;
+	u32 i=trun_idx;
+	while ((trun = (GF_TrackFragmentRunBox*)gf_list_enum(traf->TrackRuns, &i))) {
+		j=samp_idx;
+		samp_idx=0;
+		for (; j<trun->nb_samples; j++) {
+			ent = &trun->samplesj;
+			if (!j && (i==1)) {
+				earliest_cts = ent->CTS_Offset;
+			} else {
+				s32 cts = ent->CTS_Offset+delta;
+				if (earliest_cts > cts)
+					earliest_cts = cts;
+			}
+			delta += ent->Duration;
+		}
+	}
+	return earliest_cts;
+}
+
 static u32 moof_get_sap_info(GF_MovieFragmentBox *moof, GF_ISOTrackID refTrackID, u32 *sap_delta, Bool *starts_with_sap)
 {
-	u32 i, j, count, delta, earliest_cts, sap_type, sap_sample_num, cur_sample;
+	u32 i, j, count, sap_type, sap_sample_num, cur_sample;
+	s32 delta, earliest_cts;
 	Bool first = GF_TRUE;
 	GF_TrunEntry *ent;
 	GF_TrackFragmentBox *traf=NULL;
@@ -820,6 +830,8 @@
 			break;
 		}
 	}
+	//compute earliest cts in segment
+	earliest_cts = get_earliest_cts_following(traf, 0, 0);
 
 	/*then browse all samples, looking for SYNC flag or sap_sample_num*/
 	cur_sample = 1;
@@ -829,8 +841,9 @@
 		if (trun->flags & GF_ISOM_TRUN_FIRST_FLAG) {
 			if (GF_ISOM_GET_FRAG_SYNC(trun->flags)) {
 				ent = &trun->samples0;
-//				if (!delta) earliest_cts = ent->CTS_Offset;
-				*sap_delta = delta + ent->CTS_Offset - ent->CTS_Offset;
+				s32 earliest_at_or_after_sap = get_earliest_cts_following(traf, i-1, 0);
+				*sap_delta = (u32) (earliest_at_or_after_sap - earliest_cts);
+
 				*starts_with_sap = first;
 				sap_type = ent->SAP_type;
 				return sap_type;
@@ -838,17 +851,17 @@
 		}
 		for (j=0; j<trun->nb_samples; j++) {
 			ent = &trun->samplesj;
-			if (!delta) earliest_cts = ent->CTS_Offset;
 
 			if (GF_ISOM_GET_FRAG_SYNC(ent->flags)) {
-				*sap_delta = delta + ent->CTS_Offset - earliest_cts;
+				s32 earliest_at_or_after_sap = get_earliest_cts_following(traf, i-1, j);
+				*sap_delta = (u32) (earliest_at_or_after_sap - earliest_cts);
 				*starts_with_sap = first;
 				sap_type = ent->SAP_type;
 				return sap_type;
 			}
 			/*we found our roll or rap sample*/
 			if (cur_sample==sap_sample_num) {
-				*sap_delta = delta + ent->CTS_Offset - earliest_cts;
+				*sap_delta = (u32) (delta + ent->CTS_Offset - earliest_cts);
 				return sap_type;
 			}
 			delta += ent->Duration;
@@ -916,10 +929,35 @@
 
 GF_Err gf_isom_write_compressed_box(GF_ISOFile *mov, GF_Box *root_box, u32 repl_type, GF_BitStream *bs, u32 *box_csize);
 
+void flush_ref_samples(GF_ISOFile *movie, u64 *out_seg_size, Bool is_last_moof)
+{
+	u32 i=0;
+	if (movie->in_sidx_write) return;
+
+	u32 trun_count = gf_list_count(movie->moof->trun_list);
+	for (i=0; i<trun_count; i++) {
+		GF_TrackFragmentRunBox *trun = gf_list_get(movie->moof->trun_list, i);
+		u32 s_count = gf_list_count(trun->sample_refs);
+		while (s_count) {
+			if (is_last_moof && movie->on_last_block_start && (i+1==trun_count) && (s_count==1)) {
+				movie->on_last_block_start(movie->on_block_out_usr_data);
+			}
+			GF_TrafSampleRef *sref = gf_list_pop_front(trun->sample_refs);
+			movie->on_block_out(movie->on_block_out_usr_data, sref->data, sref->len, sref->ref, sref->ref_offset);
+			if (out_seg_size) *out_seg_size += sref->len;
+			if (!sref->ref) gf_free(sref->data);
+			gf_free(sref);
+			s_count--;
+		}
+	}
+}
+
+GF_Err gf_bs_grow(GF_BitStream *bs, u32 addSize);
+
 static GF_Err StoreFragment(GF_ISOFile *movie, Bool load_mdat_only, s32 data_offset_diff, u32 *moof_size, Bool reassign_bs)
 {
 	GF_Err e;
-	u64 moof_start, pos;
+	u64 moof_start, pos, trun_ref_size=0;
 	u32 size, i, s_count, mdat_size;
 	s32 offset;
 	u8 *buffer;
@@ -929,7 +967,11 @@
 	if (!movie->moof) return GF_OK;
 
 	bs = movie->editFileMap->bs;
-	if (!movie->moof_first) load_mdat_only = GF_FALSE;
+	if (!movie->moof_first) {
+		load_mdat_only = GF_FALSE;
+		movie->force_moof_base_offset = GF_FALSE;
+	}
+
 	mdat_size = 0;
 	//1 - flush all caches
 	i=0;
@@ -972,7 +1014,9 @@
 				}
 			}
 		}
+		trun_ref_size += traf->trun_ref_size;
 		if (!traf->DataCache) continue;
+
 		s_count = gf_list_count(traf->TrackRuns);
 		if (!s_count) continue;
 
@@ -1011,50 +1055,20 @@
 		}
 
 		traf->DataCache=0;
-
-		/*merge all truns*/
-		if (traf->merge_sample_interleave) {
-			u32 k, cur_idx = 0;
-			trun = (GF_TrackFragmentRunBox *)gf_list_get(traf->TrackRuns, 0);
-			trun->sample_order = gf_malloc(sizeof(u32) * cur_sample_idx);
-
-			for (k=0; k<trun->sample_count; k++) {
-				trun->sample_ordercur_idx = trun->first_sample_idx + k;
-				cur_idx ++;
-			}
-
-			while (s_count>1) {
-				GF_TrackFragmentRunBox *atrun = (GF_TrackFragmentRunBox *)gf_list_get(traf->TrackRuns, 1);
-				trun->sample_count += atrun->sample_count;
-
-				trun->sample_alloc = trun->nb_samples + atrun->nb_samples;
-				trun->samples = gf_realloc(trun->samples, sizeof(GF_TrunEntry) * trun->sample_alloc);
-				if (!trun->samples) return GF_OUT_OF_MEM;
-
-				memcpy(&trun->samplestrun->nb_samples, atrun->samples, sizeof(GF_TrunEntry)*atrun->nb_samples);
-				trun->nb_samples += atrun->nb_samples;
-
-				for (k=0; k<atrun->sample_count; k++) {
-					trun->sample_ordercur_idx = atrun->first_sample_idx + k;
-					cur_idx ++;
-				}
-				gf_list_rem(traf->TrackRuns, 1);
-				gf_list_del_item(traf->child_boxes, atrun);
-				gf_isom_box_del((GF_Box*)atrun);
-				s_count--;
-			}
-
-		}
 	}
 
 	if (load_mdat_only) {
-		pos = gf_bs_get_position(bs);
+		pos = trun_ref_size ? (trun_ref_size+8) : gf_bs_get_position(bs);
 		if (movie->moof->fragment_offset > pos)
 			return GF_CORRUPTED_DATA;
 
 		//we assume we never write large MDATs in fragment mode which should always be true
 		movie->moof->mdat_size = (u32) (pos - movie->moof->fragment_offset);
 
+		if (trun_ref_size) {
+			gf_bs_seek(movie->editFileMap->bs, 0);
+			return GF_OK;
+		}
 		if (movie->segment_bs) {
 			e = gf_bs_seek(bs, 0);
 			if (e) return e;
@@ -1096,7 +1110,7 @@
 	}
 
 	//2- update MOOF MDAT header
-	if (!movie->moof->mdat) {
+	if (!movie->moof->mdat && !trun_ref_size) {
 		e = gf_bs_seek(bs, movie->moof->fragment_offset);
 		if (e) return e;
 		//we assume we never write large MDATs in fragment mode which should always be true
@@ -1138,7 +1152,7 @@
 
 	buffer = NULL;
 	/*rewind bitstream and load mdat in memory */
-	if (movie->moof_first && !movie->moof->mdat) {
+	if (movie->moof_first && !movie->moof->mdat && !trun_ref_size) {
 		buffer = (char*)gf_malloc(sizeof(char)*mdat_size);
 		if (!buffer) return GF_OUT_OF_MEM;
 		e = gf_bs_seek(bs, movie->moof->fragment_offset);
@@ -1181,9 +1195,23 @@
 	}
 #endif
 
+	if (!movie->moof_first && !movie->force_moof_base_offset) {
+		i=0;
+		while ((traf = (GF_TrackFragmentBox*)gf_list_enum(movie->moof->TrackList, &i))) {
+			/*offset increases by moof size*/
+			if (movie->on_block_out) {
+				traf->tfhd->base_data_offset += movie->fragmented_file_pos;
+			}
+		}
+	}
+
 	bs_orig = bs;
 	if (reassign_bs && movie->on_block_out) {
-		bs = gf_bs_new_cbk(movie->on_block_out, movie->on_block_out_usr_data, movie->on_block_out_block_size);
+		bs = gf_bs_new_cbk(isom_on_block_out, movie, movie->on_block_out_block_size);
+	}
+
+	if (trun_ref_size && movie->in_sidx_write) {
+		bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
 	}
 
 	if (movie->moof->ntp) {
@@ -1210,6 +1238,8 @@
 	if (moof_size) *moof_size = (u32) movie->moof->size;
 
 	pos = gf_bs_get_position(bs);
+	//graw buffer to hold moof, speeds up writes
+	gf_bs_grow(bs, (u32) movie->moof->size + (trun_ref_size ? 8 : 0));
 
 	i=0;
 	while ((traf = (GF_TrackFragmentBox*)gf_list_enum(movie->moof->TrackList, &i))) {
@@ -1226,34 +1256,49 @@
 		e = gf_isom_box_write((GF_Box *) movie->moof, bs);
 	}
 
+	if (trun_ref_size) {
+		gf_bs_write_u32(bs, movie->moof->mdat_size);
+		gf_bs_write_u32(bs, GF_ISOM_BOX_TYPE_MDAT);
+	}
+
 	if (movie->on_block_out)
 		gf_bs_prevent_dispatch(bs, GF_FALSE);
 
 	if (e) return e;
 
-	if (movie->on_last_block_start && !gf_list_count(movie->moof_list))
-		movie->on_last_block_start(movie->on_block_out_usr_data);
-		
-	//rewrite mdat after moof
-	if (movie->moof->mdat) {
-		gf_bs_write_data(bs, movie->moof->mdat, movie->moof->mdat_size);
-		gf_free(movie->moof->mdat);
-		movie->moof->mdat = NULL;
-	} else if (buffer) {
-		gf_bs_write_data(bs, buffer, mdat_size);
-		gf_free(buffer);
+	if (trun_ref_size) {
+		flush_ref_samples(movie, NULL, gf_list_count(movie->moof_list) ? GF_FALSE : GF_TRUE);
+	} else {
+		if (movie->on_last_block_start && !gf_list_count(movie->moof_list))
+			movie->on_last_block_start(movie->on_block_out_usr_data);
+
+		//rewrite mdat after moof
+		if (movie->moof->mdat) {
+			gf_bs_write_data(bs, movie->moof->mdat, movie->moof->mdat_size);
+			gf_free(movie->moof->mdat);
+			movie->moof->mdat = NULL;
+		} else if (buffer) {
+			gf_bs_write_data(bs, buffer, mdat_size);
+			gf_free(buffer);
+		}
 	}
 
-	if (bs != bs_orig) {
+	if (trun_ref_size && movie->in_sidx_write) {
+		gf_bs_get_content(bs, &movie->moof->moof_data, &movie->moof->moof_data_len);
+		gf_bs_del(bs);
+		movie->fragmented_file_pos += movie->moof->moof_data_len + trun_ref_size;
+		movie->moof->trun_ref_size = (u32) trun_ref_size;
+	}
+	else if (bs != bs_orig) {
 		u64 frag_size = gf_bs_get_position(bs);
 		gf_bs_del(bs);
-		movie->fragmented_file_pos += frag_size;
+		movie->fragmented_file_pos += frag_size + trun_ref_size;
 		gf_bs_seek(bs_orig, 0);
 		gf_bs_truncate(bs_orig);
 	}
 	else if (movie->on_block_out) {
 		u64 frag_size = gf_bs_get_position(bs);
-		movie->fragmented_file_pos += frag_size;
+		movie->fragmented_file_pos += frag_size + trun_ref_size;
 	}
 
 	if (!movie->use_segments) {
@@ -1365,25 +1410,25 @@
 static GF_Err gf_isom_write_styp(GF_ISOFile *movie, Bool last_segment)
 {
 	/*write STYP if we write to a different file or if we write the last segment*/
-	if (movie->use_segments && !movie->append_segment && !movie->segment_start && !movie->styp_written) {
+	if (movie->use_segments && !movie->append_segment && !movie->segment_start && movie->write_styp) {
 		GF_Err e;
 
 		/*modify brands STYP*/
-
-		/*"msix" brand: this is a DASH Initialization Segment*/
-		gf_isom_modify_alternate_brand(movie, GF_ISOM_BRAND_MSIX, GF_TRUE);
-		if (last_segment) {
-			/*"lmsg" brand: this is the last DASH Segment*/
-			gf_isom_modify_alternate_brand(movie, GF_ISOM_BRAND_LMSG, GF_TRUE);
+		if (movie->write_styp==1) {
+			/*"msix" brand: this is a DASH Initialization Segment*/
+			gf_isom_modify_alternate_brand(movie, GF_ISOM_BRAND_MSIX, GF_TRUE);
+			if (last_segment) {
+				/*"lmsg" brand: this is the last DASH Segment*/
+				gf_isom_modify_alternate_brand(movie, GF_ISOM_BRAND_LMSG, GF_TRUE);
+			}
 		}
-
 		movie->brand->type = GF_ISOM_BOX_TYPE_STYP;
 		e = gf_isom_box_size((GF_Box *) movie->brand);
 		if (e) return e;
 		e = gf_isom_box_write((GF_Box *) movie->brand, movie->editFileMap->bs);
 		if (e) return e;
 
-		movie->styp_written = GF_TRUE;
+		movie->write_styp = 0;
 	}
 
 	if (movie->emsgs) {
@@ -1421,12 +1466,15 @@
 		movie->editFileMap->bs = movie->segment_bs;
 	}
 
-	gf_bs_seek(movie->editFileMap->bs, movie->segment_start);
-	gf_bs_truncate(movie->editFileMap->bs);
+	if (movie->moof_first) {
+		gf_bs_seek(movie->editFileMap->bs, movie->segment_start);
+		gf_bs_truncate(movie->editFileMap->bs);
+	}
+
 	orig_bs = movie->editFileMap->bs;
 	if (movie->on_block_out) {
 		if (!movie->block_buffer) movie->block_buffer_size = movie->on_block_out_block_size;
-		movie->editFileMap->bs = gf_bs_new_cbk_buffer(movie->on_block_out, movie->on_block_out_usr_data, movie->block_buffer, movie->block_buffer_size);
+		movie->editFileMap->bs = gf_bs_new_cbk_buffer(isom_on_block_out, movie, movie->block_buffer, movie->block_buffer_size);
 	}
 
 	/*write styp to file if needed*/
@@ -1477,6 +1525,10 @@
 
 	if (orig_bs != movie->editFileMap->bs) {
 		u32 tmpsize;
+		if (!movie->moof_first) {
+			gf_bs_transfer(movie->editFileMap->bs, orig_bs, GF_TRUE);
+			gf_bs_seek(orig_bs, 0);
+		}
 		gf_bs_get_content_no_truncate(movie->editFileMap->bs, &movie->block_buffer, &tmpsize, &movie->block_buffer_size);
 		gf_bs_del(movie->editFileMap->bs);
 		movie->editFileMap->bs = orig_bs;
@@ -1636,12 +1688,16 @@
  			if (movie->sidx_pts_next_storei == movie->sidx_pts_storej) {
  			
 			take care of misaligned timescale eg 24fps but 10000 timescale), we may not find exactly
-			the same sample - if diff is below one ms consider it a match
-			not doing so would accumulate PTSs in the list, slowing down the muxing*/
+			the same sample - if diff below N ms consider it a match
+			not doing so would accumulate PTSs in the list, slowing down the muxing
+
+			using N=1ms strict would not be enough to take into account sources with approximate timing - cf issue #2436
+			we use N=2ms max to handle sources with high jitter in cts
+			*/
 			s64 diff = movie->sidx_pts_next_storei;
 			diff -= (s64) movie->sidx_pts_storej;
-			if (timescale>1000) {
-				if (ABS(diff) * 1000 < 1 * timescale)
+			if (diff && (timescale>1000)) {
+				if (ABS(diff) * 1000 < 2 * timescale)
 					diff = 0;
 			}
 			if (diff==0) {
@@ -1672,6 +1728,7 @@
 	GF_SegmentIndexBox *root_sidx=NULL;
 	GF_SubsegmentIndexBox *ssix=NULL;
 	GF_List *daisy_sidx = NULL;
+	GF_List *defer_moofs = NULL;
 	GF_BitStream *orig_bs;
 	u64 sidx_start, sidx_end;
 	Bool first_frag_in_subseg;
@@ -1757,7 +1814,7 @@
 	orig_bs = movie->editFileMap->bs;
 	if (movie->on_block_out) {
 		if (!movie->block_buffer) movie->block_buffer_size = movie->on_block_out_block_size;
-		movie->editFileMap->bs = gf_bs_new_cbk_buffer(movie->on_block_out, movie->on_block_out_usr_data, movie->block_buffer, movie->block_buffer_size);
+		movie->editFileMap->bs = gf_bs_new_cbk_buffer(isom_on_block_out, movie, movie->block_buffer, movie->block_buffer_size);
 		if (referenceTrackID) gf_bs_prevent_dispatch(movie->editFileMap->bs, GF_TRUE);
 	}
 
@@ -1812,12 +1869,18 @@
 		} else {
 			sidx->earliest_presentation_time = prev_earliest_cts;
 
-			/*if more subsegments requested than fragments available, make a single sidx*/
-			if ((s32) count <= subsegments_per_sidx)
-				subsegments_per_sidx = 0;
-
-			if (daisy_chain_sidx && (subsegments_per_sidx<2))
-				subsegments_per_sidx = 2;
+			/*if more subsegments requested than fragments available, make a single sidx
+				for daisy chaining use strict as we don't count the chained entry in subsegments_per_sidx
+			*/
+			if (daisy_chain_sidx) {
+				if ((s32) count < subsegments_per_sidx)
+					subsegments_per_sidx = 0;
+				if (subsegments_per_sidx<2)
+					subsegments_per_sidx = 2;
+			} else {
+				if ((s32) count <= subsegments_per_sidx)
+					subsegments_per_sidx = 0;
+			}
 
 			/*single SIDX, each fragment is a subsegment and we reference all subsegments*/
 			if (!subsegments_per_sidx) {
@@ -1918,7 +1981,6 @@
 		count = cur_idx = 0;
 	}
 
-
 	last_top_box_pos = root_prev_offset = sidx_end;
 	sidx_idx = 0;
 	sidx_dur = 0;
@@ -1930,12 +1992,15 @@
 	cur_idx = 0;
 	first_frag_in_subseg = GF_TRUE;
 	e = GF_OK;
+	u64 cumulated_ref_size=0;
 	while (gf_list_count(movie->moof_list)) {
 		s32 offset_diff;
 		u32 moof_size;
 
 		movie->moof = (GF_MovieFragmentBox*)gf_list_get(movie->moof_list, 0);
 		gf_list_rem(movie->moof_list, 0);
+		movie->in_sidx_write = GF_TRUE;
+		movie->moof->trun_ref_size=0;
 
 		/*hierarchical or daisy-chain SIDXs*/
 		if (!no_sidx && !sidx && (root_sidx || daisy_chain_sidx) ) {
@@ -2044,8 +2109,13 @@
 				cur_dur += moof_get_duration(movie->moof, referenceTrackID);
 
 				/*reference size is end of the moof we just wrote minus last_box_pos*/
-				sidx->refscur_index.reference_size += (u32) ( gf_bs_get_position(movie->editFileMap->bs) - last_top_box_pos) ;
-				last_top_box_pos = gf_bs_get_position(movie->editFileMap->bs);
+				u64 last_pos = gf_bs_get_position(movie->editFileMap->bs);
+				if (movie->moof->moof_data_len) {
+					cumulated_ref_size += movie->moof->moof_data_len + movie->moof->trun_ref_size;
+					last_pos += cumulated_ref_size;
+				}
+				sidx->refscur_index.reference_size += (u32) ( last_pos - last_top_box_pos) ;
+				last_top_box_pos = last_pos;
 
 				count++;
 
@@ -2054,7 +2124,7 @@
 					if (movie->root_ssix) {
 						ssix = movie->root_ssix;
 						if (ssix->subsegment_count <= cur_index) {
-							assert(ssix->subsegment_count == cur_index);
+							gf_assert(ssix->subsegment_count == cur_index);
 							ssix->subsegment_count = cur_index+1;
 							ssix->subsegment_alloc = ssix->subsegment_count;
 							ssix->subsegments = gf_realloc(ssix->subsegments, ssix->subsegment_count * sizeof(GF_SubsegmentInfo));
@@ -2062,7 +2132,7 @@
 							ssix->subsegmentscur_index.ranges = gf_malloc(sizeof(GF_SubsegmentRangeInfo)*2);
 						}
 					}
-					assert(ssix);
+					gf_assert(ssix);
 					ssix->subsegmentscur_index.ranges0.level = 1;
 					ssix->subsegmentscur_index.ranges0.range_size = moof_get_first_sap_end(movie->moof);
 
@@ -2120,8 +2190,7 @@
 
 						root_sidx->refssidx_idx.subsegment_duration += subseg_dur;
 
-
-						root_sidx->refssidx_idx.reference_size = (u32) (gf_bs_get_position(movie->editFileMap->bs) - local_sidx_start);
+						root_sidx->refssidx_idx.reference_size = (u32) (last_pos - local_sidx_start);
 						if (!sidx_idx) {
 							root_sidx->earliest_presentation_time = sidx->earliest_presentation_time;
 						}
@@ -2130,7 +2199,7 @@
 						sidx = NULL;
 					} else if (daisy_chain_sidx) {
 						SIDXEntry *entry = (SIDXEntry*)gf_list_last(daisy_sidx);
-						entry->end_offset = gf_bs_get_position(movie->editFileMap->bs);
+						entry->end_offset = last_pos;
 						nb_subsegs--;
 						sidx = NULL;
 					}
@@ -2141,22 +2210,35 @@
 					if (movie->root_sidx)
 						movie->root_sidx_index++;
 					sidx_idx++;
+
+					if (defer_moofs && gf_list_count(movie->moof_list)) {
+						GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("isobmf Hierarchical or chain sidx cannot be used with deferred sample storage\n"));
+						e = GF_NOT_SUPPORTED;
+						goto exit;
+					}
 				}
+
 			}
 		}
-		gf_isom_box_del((GF_Box *) movie->moof);
+		if (movie->moof->moof_data_len) {
+			if (!defer_moofs) defer_moofs = gf_list_new();
+			gf_list_add(defer_moofs, movie->moof);
+		} else {
+			gf_isom_box_del((GF_Box *) movie->moof);
+		}
 		movie->moof = NULL;
 	}
+	movie->in_sidx_write = GF_FALSE;
 
 	/*append segment marker box*/
-	if (segment_marker_4cc) {
+	if (!defer_moofs && segment_marker_4cc) {
 		gf_bs_write_u32(movie->editFileMap->bs, 8);	//write size field
 		gf_bs_write_u32(movie->editFileMap->bs, segment_marker_4cc); //write box type field
 	}
 
 	if (movie->root_sidx) {
 		if (last_segment && !movie->dyn_root_sidx) {
-			assert(movie->root_sidx_index == movie->root_sidx->nb_refs);
+			gf_assert(movie->root_sidx_index == movie->root_sidx->nb_refs);
 
 			sidx_rewrite(movie->root_sidx, movie->editFileMap->bs, movie->root_sidx_offset, movie->root_ssix);
 			gf_isom_box_del((GF_Box*) movie->root_sidx);
@@ -2175,7 +2257,7 @@
 	}
 
 	if (sidx) {
-		assert(!root_sidx);
+		gf_assert(!root_sidx);
 		sidx_rewrite(sidx, movie->editFileMap->bs, sidx_start, ssix);
 		gf_isom_box_del((GF_Box*)sidx);
 	}
@@ -2202,11 +2284,15 @@
 			entry->sidx->refsentry->sidx->nb_refs-1 = next_entry->sidx->refs0;
 			/*and rewrite reference type, size and dur*/
 			entry->sidx->refsentry->sidx->nb_refs-1.reference_type = GF_TRUE;
-			entry->sidx->refsentry->sidx->nb_refs-1.reference_size = (u32) (last_entry_end_offset - next_entry->start_offset);
 			entry->sidx->refsentry->sidx->nb_refs-1.subsegment_duration = 0;
 			for (j=0; j<next_entry->sidx->nb_refs; j++) {
 				entry->sidx->refsentry->sidx->nb_refs-1.subsegment_duration += next_entry->sidx->refsj.subsegment_duration;
 			}
+			//According to annex J 2.3, the reference size for a daisy entry is the index size of the target sidx, not the size of the target
+			//subsegment (commented below) - cf #2733
+			//entry->sidx->refsentry->sidx->nb_refs-1.reference_size = (u32) (last_entry_end_offset - next_entry->start_offset);
+			gf_isom_box_size((GF_Box *)next_entry->sidx);
+			entry->sidx->refsentry->sidx->nb_refs-1.reference_size = (u32) next_entry->sidx->size;
 			sidx_rewrite(entry->sidx, movie->editFileMap->bs, entry->start_offset, NULL);
 		}
 		while (gf_list_count(daisy_sidx)) {
@@ -2239,6 +2325,10 @@
 		gf_isom_datamap_del(movie->editFileMap);
 		movie->editFileMap = gf_isom_fdm_new_temp(NULL);
 	} else if (close_segment_handle == GF_TRUE) {
+		if (orig_bs != movie->editFileMap->bs) {
+			u32 tmpsize;
+			gf_bs_get_content_no_truncate(movie->editFileMap->bs, &movie->block_buffer, &tmpsize, &movie->block_buffer_size);
+		}
 		gf_isom_datamap_del(movie->editFileMap);
 		movie->editFileMap = NULL;
 	}
@@ -2251,6 +2341,38 @@
 		gf_bs_del(movie->editFileMap->bs);
 		movie->editFileMap->bs = orig_bs;
 	}
+	//flush all deferred
+	if (!e && defer_moofs) {
+		while (gf_list_count(defer_moofs)) {
+			movie->moof = gf_list_pop_front(defer_moofs);
+			movie->on_block_out(movie->on_block_out_usr_data, movie->moof->moof_data, movie->moof->moof_data_len, NULL, 0);
+			if (out_seg_size) *out_seg_size += movie->moof->moof_data_len;
+
+			flush_ref_samples(movie, out_seg_size, (segment_marker_4cc || gf_list_count(defer_moofs)) ? GF_FALSE : GF_TRUE);
+
+			gf_free(movie->moof->moof_data);
+			gf_isom_box_del((GF_Box *) movie->moof);
+			movie->moof = NULL;
+		}
+		gf_list_del(defer_moofs);
+
+		if (segment_marker_4cc) {
+			char seg8;
+			if (movie->on_last_block_start)
+				movie->on_last_block_start(movie->on_block_out_usr_data);
+
+			seg0 = seg1 = seg2 = 0;
+			seg3 = 8;
+			seg4 = (segment_marker_4cc>>24) & 0xFF;
+			seg5 = (segment_marker_4cc>>16) & 0xFF;
+			seg6 = (segment_marker_4cc>>8) & 0xFF;
+			seg7 = (segment_marker_4cc) & 0xFF;
+			movie->on_block_out(movie->on_block_out_usr_data, seg, 8, NULL, 0);
+			if (out_seg_size)
+				*out_seg_size += 8;
+		}
+		gf_bs_seek(movie->editFileMap->bs, 0);
+	}
 	return e;
 }
 
@@ -2268,10 +2390,10 @@
 	if (! movie->root_sidx) return GF_BAD_PARAM;
 
 	if (!movie->block_buffer_size) movie->block_buffer_size = movie->on_block_out_block_size;
-	bs = gf_bs_new_cbk_buffer(movie->on_block_out, movie->on_block_out_usr_data, movie->block_buffer, movie->block_buffer_size);
+	bs = gf_bs_new_cbk_buffer(isom_on_block_out, movie, movie->block_buffer, movie->block_buffer_size);
 	gf_bs_prevent_dispatch(bs, GF_TRUE);
 	
-	assert(movie->root_sidx_index == movie->root_sidx->nb_refs);
+	gf_assert(movie->root_sidx_index == movie->root_sidx->nb_refs);
 
 	if (force_v1)
 		movie->root_sidx->version = 1;
@@ -2389,15 +2511,15 @@
 		if (movie->editFileMap) gf_isom_datamap_del(movie->editFileMap);
 		e = gf_isom_datamap_new(SegName, NULL, GF_ISOM_DATA_MAP_WRITE, &movie->editFileMap);
 		movie->segment_start = 0;
-		movie->styp_written = GF_FALSE;
+		movie->write_styp = 1;
 		if (e) return e;
 	} else {
-		assert(gf_list_count(movie->moof_list) == 0);
+		gf_assert(gf_list_count(movie->moof_list) == 0);
 		movie->segment_start = gf_bs_get_position(movie->editFileMap->bs);
 		/*if movieFileMap is not null, we are concatenating segments to the original movie, force a copy*/
 		if (movie->movieFileMap)
 			movie->append_segment = GF_TRUE;
-		movie->styp_written = GF_TRUE;
+		movie->write_styp = 0;
 	}
 
 	/*create a memory bitstream for all file IO until final flush*/
@@ -2484,6 +2606,9 @@
 	movie->moof->fragment_offset = gf_bs_get_position(movie->editFileMap->bs);
 
 	/*prepare MDAT*/
+	if (movie->on_block_out)
+		gf_bs_prevent_dispatch(movie->editFileMap->bs, GF_TRUE);
+
 	gf_bs_write_u32(movie->editFileMap->bs, 0);
 	gf_bs_write_u32(movie->editFileMap->bs, GF_ISOM_BOX_TYPE_MDAT);
 
@@ -2557,6 +2682,7 @@
 			}
 			movie->brand = (GF_FileTypeBox *) a;
 			gf_list_add(movie->TopBoxes, movie->brand);
+			movie->write_styp = 2;
 			continue;
 		}
 		if (a->type==GF_ISOM_BOX_TYPE_OTYP) {
@@ -2625,19 +2751,9 @@
 	return e;
 }
 
-static
-u32 GetRunSize(GF_TrackFragmentRunBox *trun)
-{
-	u32 i, size=0;
-	for (i=0; i<trun->nb_samples; i++) {
-		size += trun->samplesi.size;
-	}
-	return size;
-}
-
 GF_EXPORT
-GF_Err gf_isom_fragment_add_sample(GF_ISOFile *movie, GF_ISOTrackID TrackID, const GF_ISOSample *sample, u32 DescIndex,
-                                   u32 Duration, u8 PaddingBits, u16 DegradationPriority, Bool redundant_coding)
+GF_Err gf_isom_fragment_add_sample_ex(GF_ISOFile *movie, GF_ISOTrackID TrackID, const GF_ISOSample *sample, u32 DescIndex,
+                                   u32 Duration, u8 PaddingBits, u16 DegradationPriority, Bool redundant_coding, void **ref, u32 ref_offset)
 {
 	u32 count, buffer_size;
 	u8 *buffer;
@@ -2699,13 +2815,14 @@
 		traf = traf_2;
 	}
 
-	pos = gf_bs_get_position(movie->editFileMap->bs);
+	pos = movie->moof->trun_ref_size ? (8+movie->moof->trun_ref_size) : gf_bs_get_position(movie->editFileMap->bs);
+
 	//check if we need a new trun entry
 	count = (traf->use_sample_interleave && traf->force_new_trun) ? 0 : gf_list_count(traf->TrackRuns);
 	if (count) {
 		trun = (GF_TrackFragmentRunBox *)gf_list_get(traf->TrackRuns, count-1);
 		//check data offset when no caching as trun entries shall ALWAYS be contiguous samples
-		if (!traf->DataCache && (movie->moof->fragment_offset + 8 + trun->data_offset + GetRunSize(trun) != pos) )
+		if (!traf->DataCache && (movie->moof->fragment_offset + 8 + trun->data_offset + trun->run_size != pos) )
 			count = 0;
 
 		//check I-frame detection
@@ -2749,13 +2866,16 @@
 		//if we use data caching, create a bitstream
 		if (traf->DataCache)
 			trun->cache = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
+
+		//remember the order in which we created truns for reference flushing (unused otherwise)
+		if (!movie->moof->trun_list) movie->moof->trun_list = gf_list_new();
+		gf_list_add(movie->moof->trun_list, trun);
 	}
 
 	memset(&ent, 0, sizeof(GF_TrunEntry));
 	ent.CTS_Offset = sample->CTS_Offset;
 	ent.Duration = Duration;
 	ent.dts = sample->DTS;
-	ent.size = sample->dataLength;
 	ent.nb_pack = sample->nb_pack;
 	ent.flags = GF_ISOM_FORMAT_FRAG_FLAGS(PaddingBits, sample->IsRAP, DegradationPriority);
 	if (sample->IsRAP) {
@@ -2768,7 +2888,7 @@
 		prev_ent = NULL;
 	}
 
-	if (prev_ent && prev_ent->dts && sample->DTS) {
+	if (prev_ent && (prev_ent->dts || !prev_ent->Duration) && sample->DTS) {
 		u32 nsamp = prev_ent->nb_pack ? prev_ent->nb_pack : 1;
 		if (nsamp*prev_ent->Duration != sample->DTS - prev_ent->dts)
 			prev_ent->Duration = (u32) (sample->DTS - prev_ent->dts) / nsamp;
@@ -2779,36 +2899,66 @@
 		trun->samples = gf_realloc(trun->samples, sizeof(GF_TrunEntry)*trun->sample_alloc);
 		if (!trun->samples) return GF_OUT_OF_MEM;
 	}
-	trun->samplestrun->nb_samples = ent;
-	trun->nb_samples ++;
-	
-	if (sample->CTS_Offset<0) {
-		trun->version = 1;
-	}
-	trun->sample_count += sample->nb_pack ? sample->nb_pack : 1;
 
 	//rewrite OD frames
 	if (traf->trex->track->Media->handler->handlerType == GF_ISOM_MEDIA_OD) {
 		//this may fail if dependencies are not well done ...
-		Media_ParseODFrame(traf->trex->track->Media, sample, &od_sample);
+		GF_Err e = Media_ParseODFrame(traf->trex->track->Media, sample, &od_sample);
+		if (!od_sample) return e;
 		sample = od_sample;
 	}
 
+	ent.size = sample->dataLength;
+	trun->samplestrun->nb_samples = ent;
+	trun->nb_samples ++;
+	trun->run_size += ent.size;
+
+	if (sample->CTS_Offset<0) {
+		trun->version = 1;
+	}
+	trun->sample_count += sample->nb_pack ? sample->nb_pack : 1;
+
 	//finally write the data
 	if (sample->dataLength) {
+		u32 res = 0;
 		if (!traf->DataCache) {
-			if (!gf_bs_write_data(movie->editFileMap->bs, sample->data, sample->dataLength)) {
-				GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("iso fragment Could not add a sample with a size of %u bytes (no DataCache)\n", sample->dataLength));
-				return GF_OUT_OF_MEM;
+			if (movie->moof_first && movie->on_block_out && (ref || trun->sample_refs)) {
+				GF_TrafSampleRef *sref;
+				if (!trun->sample_refs) trun->sample_refs = gf_list_new();
+				GF_SAFEALLOC(sref, GF_TrafSampleRef);
+				if (!sref) return GF_OUT_OF_MEM;
+				if (ref && *ref && !od_sample) {
+					sref->data = sample->data;
+					sref->len = sample->dataLength;
+					sref->ref = *ref;
+					sref->ref_offset = ref_offset;
+					*ref = NULL;
+				} else {
+					sref->data = gf_malloc(sample->dataLength);
+					if (!sref->data) {
+						gf_free(sref);
+						return GF_OUT_OF_MEM;
+					}
+					memcpy(sref->data, sample->data, sample->dataLength);
+					sref->len = sample->dataLength;
+				}
+				res = sref->len;
+				traf->trun_ref_size += res;
+				movie->moof->trun_ref_size += res;
+				gf_list_add(trun->sample_refs, sref);
+			} else {
+				res = gf_bs_write_data(movie->editFileMap->bs, sample->data, sample->dataLength);
 			}
 		} else if (trun->cache) {
-			if (!gf_bs_write_data(trun->cache, sample->data, sample->dataLength)) {
-				GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("iso fragment Could not add a sample with a size of %u bytes (with cache)\n", sample->dataLength));
-				return GF_OUT_OF_MEM;
-			}
+			res = gf_bs_write_data(trun->cache, sample->data, sample->dataLength);
 		} else {
 			return GF_BAD_PARAM;
 		}
+		if (res!=sample->dataLength) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("iso fragment Could not add a sample with a size of %u bytes\n", sample->dataLength));
+			return GF_OUT_OF_MEM;
+		}
+
 	}
 	if (od_sample) gf_isom_sample_del(&od_sample);
 
@@ -2826,6 +2976,13 @@
 }
 
 GF_EXPORT
+GF_Err gf_isom_fragment_add_sample(GF_ISOFile *movie, GF_ISOTrackID TrackID, const GF_ISOSample *sample, u32 DescIndex,
+                                   u32 Duration, u8 PaddingBits, u16 DegradationPriority, Bool redundant_coding)
+{
+	return gf_isom_fragment_add_sample_ex(movie, TrackID, sample, DescIndex, Duration, PaddingBits, DegradationPriority, redundant_coding, NULL, 0);
+
+}
+GF_EXPORT
 GF_Err gf_isom_fragment_set_cenc_sai(GF_ISOFile *output, GF_ISOTrackID TrackID, u8 *sai_b, u32 sai_b_size, Bool use_subsamples, Bool use_saio_32bit, Bool use_multikey)
 {
 	GF_CENCSampleAuxInfo *sai;
@@ -2885,7 +3042,7 @@
 }
 
 GF_EXPORT
-GF_Err gf_isom_fragment_append_data(GF_ISOFile *movie, GF_ISOTrackID TrackID, u8 *data, u32 data_size, u8 PaddingBits)
+GF_Err gf_isom_fragment_append_data_ex(GF_ISOFile *movie, GF_ISOTrackID TrackID, u8 *data, u32 data_size, u8 PaddingBits, void **ref, u32 ref_offset)
 {
 	u32 count;
 	u8 rap;
@@ -2906,6 +3063,7 @@
 	if (!trun->nb_samples) return GF_BAD_PARAM;
 	ent = &trun->samplestrun->nb_samples-1;
 	ent->size += data_size;
+	trun->run_size += data_size;
 
 	rap = GF_ISOM_GET_FRAG_SYNC(ent->flags);
 	degp = GF_ISOM_GET_FRAG_DEG(ent->flags);
@@ -2913,7 +3071,32 @@
 
 	//finally write the data
 	if (!traf->DataCache) {
-		gf_bs_write_data(movie->editFileMap->bs, data, data_size);
+		if (movie->moof_first && movie->on_block_out && (ref || trun->sample_refs)) {
+			GF_TrafSampleRef *sref;
+			if (!trun->sample_refs) trun->sample_refs = gf_list_new();
+			GF_SAFEALLOC(sref, GF_TrafSampleRef);
+			if (!sref) return GF_OUT_OF_MEM;
+			if (ref && *ref) {
+				sref->data = data;
+				sref->len = data_size;
+				sref->ref = *ref;
+				sref->ref_offset = ref_offset;
+				*ref = NULL;
+			} else {
+				sref->data = gf_malloc(data_size);
+				if (!sref->data) {
+					gf_free(sref);
+					return GF_OUT_OF_MEM;
+				}
+				memcpy(sref->data, data, data_size);
+				sref->len = data_size;
+			}
+			traf->trun_ref_size += sref->len;
+			movie->moof->trun_ref_size += sref->len;
+			gf_list_add(trun->sample_refs, sref);
+		} else {
+			gf_bs_write_data(movie->editFileMap->bs, data, data_size);
+		}
 	} else if (trun->cache) {
 		gf_bs_write_data(trun->cache, data, data_size);
 	} else {
@@ -2921,6 +3104,12 @@
 	}
 	return GF_OK;
 }
+GF_EXPORT
+GF_Err gf_isom_fragment_append_data(GF_ISOFile *movie, GF_ISOTrackID TrackID, u8 *data, u32 data_size, u8 PaddingBits)
+{
+	return gf_isom_fragment_append_data_ex(movie, TrackID, data, data_size, PaddingBits, NULL, 0);
+
+}
 
 GF_Err gf_isom_fragment_add_subsample(GF_ISOFile *movie, GF_ISOTrackID TrackID, u32 flags, u32 subSampleSize, u8 priority, u32 reserved, Bool discardable)
 {
@@ -3018,7 +3207,7 @@
 		}
 	}
 
-	return gf_isom_add_sample_group_entry(traf->sampleGroups, 0, grouping_type, grouping_type_parameter, sampleGroupDescriptionIndex, NULL);
+	return gf_isom_add_sample_group_entry(traf->sampleGroups, 0, sgdesc, grouping_type_parameter, sampleGroupDescriptionIndex, NULL);
 }
 /*copy over the subsample and sampleToGroup information of the given sample from the source track/file to the last sample added to the current track fragment of the destination file*/
 GF_Err gf_isom_fragment_copy_subsample(GF_ISOFile *dest, GF_ISOTrackID TrackID, GF_ISOFile *orig, u32 track, u32 sampleNumber, Bool sgpd_in_traf)
@@ -3212,21 +3401,6 @@
 
 #endif	/*GPAC_DISABLE_ISOM_WRITE*/
 
-GF_EXPORT
-Bool gf_isom_is_track_fragmented(GF_ISOFile *movie, GF_ISOTrackID TrackID)
-{
-	if (!movie || !movie->moov || !movie->moov->mvex) return GF_FALSE;
-	return (GetTrex(movie->moov, TrackID) != NULL) ? GF_TRUE : GF_FALSE;
-}
-
-GF_EXPORT
-Bool gf_isom_is_fragmented(GF_ISOFile *movie)
-{
-	if (!movie || !movie->moov) return GF_FALSE;
-	/* By default if the Moov has an mvex, the file is fragmented */
-	if (movie->moov->mvex) return GF_TRUE;
-	return GF_FALSE;
-}
 
 GF_EXPORT
 GF_Err gf_isom_set_traf_base_media_decode_time(GF_ISOFile *movie, GF_ISOTrackID TrackID, u64 decode_time)
@@ -3296,4 +3470,26 @@
 }
 
 
+GF_EXPORT
+Bool gf_isom_is_track_fragmented(GF_ISOFile *movie, GF_ISOTrackID TrackID)
+{
+#ifndef GPAC_DISABLE_ISOM_FRAGMENTS
+	if (!movie || !movie->moov || !movie->moov->mvex) return GF_FALSE;
+	return (GetTrex(movie->moov, TrackID) != NULL) ? GF_TRUE : GF_FALSE;
+#else
+	return GF_FALSE;
+#endif
+}
+
+GF_EXPORT
+Bool gf_isom_is_fragmented(GF_ISOFile *movie)
+{
+#ifndef GPAC_DISABLE_ISOM_FRAGMENTS
+	if (!movie || !movie->moov) return GF_FALSE;
+	/* By default if the Moov has an mvex, the file is fragmented */
+	if (movie->moov->mvex) return GF_TRUE;
+#endif
+	return GF_FALSE;
+}
+
 #endif /*GPAC_DISABLE_ISOM*/

gpac-2.2.1.tar.gz/src/isomedia/sample_descs.c -> gpac-2.4.0.tar.gz/src/isomedia/sample_descs.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2022
+ *			Copyright (c) Telecom ParisTech 2000-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / ISO Media File Format sub-project
@@ -970,6 +970,36 @@
 
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
+
+GF_EXPORT
+GF_Err gf_isom_get_udts_config(GF_ISOFile *movie, u32 trackNumber, u32 descriptionIndex, GF_UDTSConfig *cfg)
+{
+	GF_Box *sample_entry;
+	GF_TrackBox *trak = gf_isom_get_track_from_file(movie, trackNumber);
+	GF_UDTSSpecificBox *udts = NULL;
+
+	if (!trak || !descriptionIndex || !cfg) return GF_BAD_PARAM;
+	sample_entry = (GF_Box *)gf_list_get(trak->Media->information->sampleTable->SampleDescription->child_boxes, descriptionIndex-1);
+	if (sample_entry && sample_entry->type == GF_ISOM_BOX_TYPE_DTSX)
+		udts = (GF_UDTSSpecificBox *)gf_list_get(sample_entry->child_boxes, 0);
+
+	memset(cfg, 0, sizeof(GF_UDTSConfig));
+	if (!udts)
+		return GF_BAD_PARAM;
+
+	cfg->DecoderProfileCode = udts->cfg.DecoderProfileCode;
+	cfg->FrameDurationCode = udts->cfg.FrameDurationCode;
+	cfg->MaxPayloadCode = udts->cfg.MaxPayloadCode;
+	cfg->NumPresentationsCode = udts->cfg.NumPresentationsCode;
+	cfg->ChannelMask = udts->cfg.ChannelMask;
+	cfg->BaseSamplingFrequencyCode = udts->cfg.BaseSamplingFrequencyCode;
+	cfg->SampleRateMod = udts->cfg.SampleRateMod;
+	cfg->RepresentationType = udts->cfg.RepresentationType;
+	cfg->StreamIndex = udts->cfg.RepresentationType;
+	return GF_OK;
+}
+
+
 GF_Err LSR_UpdateESD(GF_LASeRSampleEntryBox *lsr, GF_ESD *esd)
 {
 	GF_BitRateBox *btrt = gf_isom_sample_entry_get_bitrate((GF_SampleEntryBox *)lsr, GF_TRUE);
@@ -1081,6 +1111,7 @@
 	case GF_ISOM_MEDIA_MPEG_SUBT:
 	case GF_ISOM_MEDIA_META:
 	case GF_ISOM_MEDIA_TEXT:
+	case GF_ISOM_MEDIA_SUBT:
 		break;
 	default:
 		return GF_BAD_PARAM;
@@ -1217,6 +1248,7 @@
 	case GF_ISOM_MEDIA_MPEG_SUBT:
 	case GF_ISOM_MEDIA_META:
 	case GF_ISOM_MEDIA_TEXT:
+	case GF_ISOM_MEDIA_SUBT:
 		break;
 	default:
 		return GF_BAD_PARAM;
@@ -1426,6 +1458,8 @@
 
 	switch (trak->Media->handler->handlerType) {
 	case GF_ISOM_MEDIA_TEXT:
+	case GF_ISOM_MEDIA_SUBT:
+	case GF_ISOM_MEDIA_MPEG_SUBT:
 		break;
 	default:
 		return NULL;
@@ -1548,6 +1582,7 @@
 }
 
 #endif /*GPAC_DISABLE_VTT*/
+#endif //GPAC_DISABLE_ISOM_WRITE
 
 GF_BitRateBox *gf_isom_sample_entry_get_bitrate(GF_SampleEntryBox *ent, Bool create)
 {
@@ -1561,6 +1596,8 @@
 	return a;
 }
 
+#ifndef GPAC_DISABLE_ISOM_WRITE
+
 GF_EXPORT
 GF_Err gf_isom_update_bitrate(GF_ISOFile *movie, u32 trackNumber, u32 sampleDescriptionIndex, u32 average_bitrate, u32 max_bitrate, u32 decode_buffer_size)
 {
@@ -1684,7 +1721,7 @@
 		if (!tcmi) return GF_OUT_OF_MEM;
 	}
 
-	entry = (GF_TimeCodeSampleEntryBox *) gf_isom_box_new_ex(GF_QT_BOX_TYPE_TMCD, GF_ISOM_BOX_TYPE_STSD, GF_FALSE, GF_FALSE);
+	entry = (GF_TimeCodeSampleEntryBox *) gf_isom_box_new_ex(GF_QT_BOX_TYPE_TMCD, GF_ISOM_BOX_TYPE_STSD, GF_FALSE, GF_FALSE, GF_FALSE);
 	if (!entry) return GF_OUT_OF_MEM;
 	entry->flags = 0;
 	if (is_drop) entry->flags |= 0x00000001;
@@ -1796,8 +1833,29 @@
 
 	aent = (GF_AudioSampleEntryBox *)gf_list_get(trak->Media->information->sampleTable->SampleDescription->child_boxes, descriptionIndex-1);
 	if (!aent) return GF_BAD_PARAM;
-	if ((aent->type != GF_ISOM_BOX_TYPE_IPCM) && (aent->type != GF_ISOM_BOX_TYPE_FPCM))
-		return GF_BAD_PARAM;
+	if ((aent->type != GF_ISOM_BOX_TYPE_IPCM) && (aent->type != GF_ISOM_BOX_TYPE_FPCM)) {
+		Bool is_le = GF_FALSE;
+		GF_Box *b = gf_isom_box_find_child(aent->child_boxes, GF_QT_BOX_TYPE_WAVE);
+		//if no wave, assume big endian
+		if (b) {
+			GF_ChromaInfoBox *enda = (GF_ChromaInfoBox *)gf_isom_box_find_child(b->child_boxes, GF_QT_BOX_TYPE_ENDA);
+			is_le = (enda && enda->chroma) ? GF_TRUE : GF_FALSE;
+		}
+		u32 bits=0;
+		switch (aent->type) {
+		case GF_QT_SUBTYPE_FL32: bits = 32; break;
+		case GF_QT_SUBTYPE_FL64: bits = 64; break;
+		case GF_QT_SUBTYPE_TWOS: bits = 16; is_le = GF_FALSE; break;
+		case GF_QT_SUBTYPE_SOWT: bits = 16; is_le = GF_TRUE; break;
+		case GF_QT_SUBTYPE_IN24: bits = 24; break;
+		case GF_QT_SUBTYPE_IN32: bits = 32; break;
+		default:
+			return GF_BAD_PARAM;
+		}
+		if (pcm_size) *pcm_size = bits;
+		if (flags) *flags = is_le ? 1 : 0;
+		return GF_OK;
+	}
 
 	pcmC = (GF_PCMConfigBox *) gf_isom_box_find_child(aent->child_boxes, GF_ISOM_BOX_TYPE_PCMC);
 	if (!pcmC) return GF_NON_COMPLIANT_BITSTREAM;
@@ -1807,6 +1865,39 @@
 	return GF_OK;
 }
 
+GF_EXPORT
+GF_Err gf_isom_get_lpcm_config(GF_ISOFile *movie, u32 trackNumber, u32 descriptionIndex, Double *sample_rate, u32 *nb_channels, u32 *flags, u32 *pcm_size)
+{
+	GF_AudioSampleEntryBox *aent;
+	GF_TrackBox *trak;
+	GF_BitStream *bs;
+	trak = gf_isom_get_track_from_file(movie, trackNumber);
+	if (!trak || !descriptionIndex) return GF_BAD_PARAM;
+
+	aent = (GF_AudioSampleEntryBox *)gf_list_get(trak->Media->information->sampleTable->SampleDescription->child_boxes, descriptionIndex-1);
+	if (!aent) return GF_BAD_PARAM;
+	if (aent->type != GF_QT_SUBTYPE_LPCM)
+		return GF_BAD_PARAM;
+	if (aent->version != 2)
+		return GF_BAD_PARAM;
+
+	bs = gf_bs_new(aent->extensions, 36, GF_BITSTREAM_READ);
+	/*offset*/gf_bs_read_u32(bs);
+	Double sr = gf_bs_read_double(bs);
+	if (sample_rate) *sample_rate = sr;
+	u32 nb_ch = gf_bs_read_u32(bs);
+	if (nb_channels) *nb_channels = nb_ch;
+	/*res*/gf_bs_read_u32(bs);
+	u32 constBitsPerChannel = gf_bs_read_u32(bs);
+	if (pcm_size) *pcm_size=constBitsPerChannel;
+	u32 PCM_flags = gf_bs_read_u32(bs);
+	if (flags) *flags = PCM_flags;
+	/*constBytesPerAudioPacket*/gf_bs_read_u32(bs);
+	/*constLPCMFramesPerAudioPacket*/gf_bs_read_u32(bs);
+	gf_bs_del(bs);
+	return GF_OK;
+}
+
 
 
 #endif /*GPAC_DISABLE_ISOM*/

gpac-2.2.1.tar.gz/src/isomedia/stbl_read.c -> gpac-2.4.0.tar.gz/src/isomedia/stbl_read.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2019
+ *			Copyright (c) Telecom ParisTech 2000-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / ISO Media File Format sub-project
@@ -227,7 +227,7 @@
 	return GF_OK;
 
 found:
-	(*DTS) = stts->r_CurrentDTS + j * (u64) ent->sampleDelta;
+	(*DTS) = stts->r_CurrentDTS + j * (u64) ent->sampleDelta + stts->cumulated_start_dts;
 	if (duration) *duration = ent->sampleDelta;
 	return GF_OK;
 }
@@ -258,6 +258,7 @@
 			stss->r_LastSyncSample = SampleNumber;
 			stss->r_LastSampleIndex = i;
 			(*IsRAP) = RAP;
+			if (!nextRAP) return GF_OK;
 		}
 		else if (stss->sampleNumbersi > SampleNumber) {
 			if (nextRAP) *nextRAP = stss->sampleNumbersi;
@@ -271,8 +272,8 @@
 GF_Err stbl_SearchSAPs(GF_SampleTableBox *stbl, u32 SampleNumber, GF_ISOSAPType *IsRAP, u32 *prevRAP, u32 *nextRAP)
 {
 	u32 i, j, count, count2;
-	assert(prevRAP);
-	assert(nextRAP);
+	gf_assert(prevRAP);
+	gf_assert(nextRAP);
 	(*prevRAP) = 0;
 	(*nextRAP) = 0;
 	(*IsRAP) = RAP_NO;
@@ -455,7 +456,7 @@
 
 	//first get the chunk
 	for (; i < stbl->SampleToChunk->nb_entries; i++) {
-		assert(stbl->SampleToChunk->firstSampleInCurrentChunk <= sampleNumber);
+		gf_assert(stbl->SampleToChunk->firstSampleInCurrentChunk <= sampleNumber);
 		//corrupted file (less sample2chunk info than sample count
 		if (k > stbl->SampleToChunk->ghostNumber) {
 			return GF_ISOM_INVALID_FILE;
@@ -604,7 +605,7 @@
 {
 	u8 flag;
 
-	assert(dependsOn && dependedOn && redundant);
+	gf_assert(dependsOn && dependedOn && redundant);
 	*dependsOn = *dependedOn = *redundant = 0;
 
 	if (SampleNumber > sdep->sampleCount) {

gpac-2.2.1.tar.gz/src/isomedia/stbl_write.c -> gpac-2.4.0.tar.gz/src/isomedia/stbl_write.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2022
+ *			Copyright (c) Telecom ParisTech 2000-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / ISO Media File Format sub-project
@@ -35,8 +35,6 @@
 		a = new_a;\
 	}
 
-#ifndef GPAC_DISABLE_ISOM_WRITE
-
 
 #define CHECK_PACK(_e) \
 	if (!nb_pack) nb_pack = 1; \
@@ -45,6 +43,8 @@
 		return _e; \
 	}
 
+#ifndef GPAC_DISABLE_ISOM_WRITE
+
 
 //adds a DTS in the table and get the sample number of this new sample
 //we could return an error if a sample with the same DTS already exists
@@ -372,6 +372,7 @@
 	/*note we don't realloc*/
 	return GF_OK;
 }
+#endif // GPAC_DISABLE_ISOM_WRITE
 
 GF_Err stbl_unpackCTS(GF_SampleTableBox *stbl)
 {
@@ -417,6 +418,9 @@
 	return GF_OK;
 }
 
+
+#ifndef GPAC_DISABLE_ISOM_WRITE
+
 //add size
 GF_Err stbl_AddSize(GF_SampleSizeBox *stsz, u32 sampleNumber, u32 size, u32 nb_pack)
 {
@@ -673,6 +677,8 @@
 }
 #endif
 
+#endif //GPAC_DISABLE_ISOM_WRITE
+
 GF_Err stbl_AppendDependencyType(GF_SampleTableBox *stbl, u32 isLeading, u32 dependsOn, u32 dependedOn, u32 redundant)
 {
 	GF_SampleDependencyTypeBox *sdtp;
@@ -700,6 +706,8 @@
 	return GF_OK;
 }
 
+#ifndef GPAC_DISABLE_ISOM_WRITE
+
 //this function is always called in INCREASING order of shadow sample numbers
 GF_Err stbl_AddShadow(GF_ShadowSyncBox *stsh, u32 sampleNumber, u32 shadowNumber)
 {
@@ -969,7 +977,7 @@
 {
 	GF_CompositionOffsetBox *ctts = stbl->CompositionOffset;
 
-	assert(ctts->unpack_mode);
+	gf_assert(ctts->unpack_mode);
 
 	//if we're setting the CTS of a sample we've skipped...
 	if (ctts->w_LastSampleNumber < sampleNumber) {
@@ -1081,7 +1089,9 @@
 		return gf_list_insert(stsh->entries, ent, i);
 	}
 }
+#endif
 
+#if !defined(GPAC_DISABLE_ISOM_WRITE) || !defined(GPAC_DISABLE_ISOM_FRAGMENTS)
 
 //always called before removing the sample from SampleSize
 GF_Err stbl_RemoveDTS(GF_SampleTableBox *stbl, u32 sampleNumber, u32 nb_samples, u32 LastAUDefDuration)
@@ -1098,6 +1108,8 @@
 		stts->nb_entries = 0;
 		stts->r_FirstSampleInEntry = stts->r_currentEntryIndex = 0;
 		stts->r_CurrentDTS = 0;
+		if (nb_samples>1)
+			stts->cumulated_start_dts += stts->entries0.sampleDelta;
 		return GF_OK;
 	}
 	//we're removing the last sample
@@ -1105,10 +1117,12 @@
 		ent = &stts->entriesstts->nb_entries-1;
 		ent->sampleCount--;
 		if (!ent->sampleCount) stts->nb_entries--;
+		if (nb_samples>1)
+			stts->cumulated_start_dts += ent->sampleDelta;
 	} else {
 		u64 *DTSs, curDTS;
 		u32 i, j, k, sampNum;
-		u32 tot_samples, nb_written=0;
+		u32 tot_samples;
 		//unpack the DTSs...
 		DTSs = (u64*)gf_malloc(sizeof(u64) * (stbl->SampleSize->sampleCount - 1));
 		if (!DTSs) return GF_OUT_OF_MEM;
@@ -1128,9 +1142,12 @@
 					} else {
 						DTSssampNum-k = curDTS;
 					}
-				} else if (sampNum >= nb_samples) {
-					DTSssampNum - nb_samples = curDTS;
-					nb_written++;
+				} else {
+					if (sampNum >= nb_samples) {
+						DTSssampNum - nb_samples = curDTS;
+					} else if (sampNum + 1 == nb_samples) {
+						stts->cumulated_start_dts += curDTS+ent->sampleDelta;
+					}
 				}
 				curDTS += ent->sampleDelta;
 				sampNum ++;
@@ -1138,8 +1155,7 @@
 		}
 
 		if (nb_samples>1) {
-			assert(sampNum == stbl->SampleSize->sampleCount);
-			assert(nb_written + nb_samples == stbl->SampleSize->sampleCount);
+			gf_assert(sampNum == stbl->SampleSize->sampleCount);
 		}
 		j=0;
 
@@ -1155,7 +1171,12 @@
 			if (stbl->SampleSize->sampleCount == 2) {
 				stts->entries0.sampleDelta = LastAUDefDuration;
 			} else {
-				stts->entries0.sampleDelta = (u32) DTSs1 /*- DTSs0*/;
+				if (tot_samples>1) {
+					stts->entries0.sampleDelta = (u32) (DTSs1 - DTSs0);
+				} else {
+					//special case if we remove all but one sample, compute delta based on last DTS
+					stts->entries0.sampleDelta = (u32) (curDTS - DTSs0);
+				}
 			}
 		} else {
 			sampNum = 0;
@@ -1180,14 +1201,14 @@
 				j++;
 				stts->entriesj.sampleCount = 1;
 				stts->entriesj.sampleDelta = (u32) (DTSsi+1 - DTSsi);
-				assert(stts->entriesj.sampleDelta);
+				gf_assert(stts->entriesj.sampleDelta);
 				sampNum ++;
 			}
 		}
 		stts->w_LastDTS = tot_samples ? DTSstot_samples - 1 : 0;
 		gf_free(DTSs);
-		assert(sampNum == tot_samples);
-		assert(sampNum + nb_samples == stbl->SampleSize->sampleCount);
+		gf_assert(sampNum == tot_samples);
+		gf_assert(sampNum + nb_samples == stbl->SampleSize->sampleCount);
 	}
 
 	//reset write the cache to the end
@@ -1205,7 +1226,7 @@
 	GF_CompositionOffsetBox *ctts = stbl->CompositionOffset;
 	if (!ctts) return GF_OK;
 
-	assert(ctts->unpack_mode);
+	gf_assert(ctts->unpack_mode);
 	if ((nb_samples>1) && (sampleNumber>1)) return GF_BAD_PARAM;
 	ctts->max_cts_delta = 0;
 
@@ -1222,7 +1243,7 @@
 	if (sampleNumber > ctts->w_LastSampleNumber) return GF_OK;
 
 	if (nb_samples==1) {
-		assert(ctts->nb_entries);
+		gf_assert(ctts->nb_entries);
 		memmove(&ctts->entriessampleNumber-1, &ctts->entriessampleNumber, sizeof(GF_DttsEntry)* (ctts->nb_entries-sampleNumber) );
 		ctts->nb_entries--;
 	} else {
@@ -1230,7 +1251,7 @@
 		ctts->nb_entries -= nb_samples;
 	}
 	ctts->w_LastSampleNumber -= nb_samples;
-	assert(ctts->w_LastSampleNumber >= ctts->nb_entries);
+	gf_assert(ctts->w_LastSampleNumber >= ctts->nb_entries);
 
 	return GF_OK;
 }
@@ -1304,10 +1325,10 @@
 
 		//update the firstchunk info
 		for (i=sampleNumber-1; i < stsc->nb_entries; i++) {
-			assert(stsc->entriesi.firstChunk >= 1);
+			gf_assert(stsc->entriesi.firstChunk >= 1);
 			stsc->entriesi.firstChunk -= 1;
 			if (stsc->entriesi.nextChunk) {
-				assert(stsc->entriesi.nextChunk >= 1);
+				gf_assert(stsc->entriesi.nextChunk >= 1);
 				stsc->entriesi.nextChunk -= 1;
 			}
 		}
@@ -1339,7 +1360,8 @@
 			stco->alloc_size = 0;
 			return GF_OK;
 		}
-		assert(stco->nb_entries - nb_samples == stbl->SampleSize->sampleCount);
+		if (stco->nb_entries - nb_samples != stbl->SampleSize->sampleCount)
+			return GF_ISOM_INVALID_FILE;
 		if (nb_samples==1) {
 			memmove(&stco->offsetssampleNumber-1, &stco->offsetssampleNumber, sizeof(u32) * (stco->nb_entries - sampleNumber) );
 		} else {
@@ -1356,7 +1378,8 @@
 			return GF_OK;
 		}
 
-		assert(co64->nb_entries - nb_samples == stbl->SampleSize->sampleCount);
+		if (co64->nb_entries - nb_samples != stbl->SampleSize->sampleCount)
+			return GF_ISOM_INVALID_FILE;
 		if (nb_samples==1) {
 			memmove(&co64->offsetssampleNumber-1, &co64->offsetssampleNumber, sizeof(u64) * (co64->nb_entries - sampleNumber) );
 		} else {
@@ -1379,7 +1402,7 @@
 	if (stss->nb_entries == 1) {
 		if (stss->sampleNumbers0 != sampleNumber) {
 			if (sampleNumber < stss->sampleNumbers0) {
-				assert(stss->sampleNumbers0);
+				if (!stss->sampleNumbers0) return GF_ISOM_INVALID_FILE;
 				stss->sampleNumbers0--;
 			}
 			return GF_OK;
@@ -1401,7 +1424,7 @@
 		}
 
 		else if (sampleNumber < stss->sampleNumbersi) {
-			assert(stss->sampleNumbersi);
+			if (!stss->sampleNumbersi) return GF_ISOM_INVALID_FILE;
 			stss->sampleNumbersi--;
 		}
 	}
@@ -1483,7 +1506,9 @@
 	stsh->r_LastFoundSample = 0;
 	return GF_OK;
 }
+#endif
 
+#ifndef GPAC_DISABLE_ISOM_WRITE
 
 GF_Err stbl_SetPaddingBits(GF_SampleTableBox *stbl, u32 SampleNumber, u8 bits)
 {
@@ -1520,6 +1545,8 @@
 	return GF_OK;
 }
 
+#endif // GPAC_DISABLE_ISOM_WRITE
+
 GF_Err stbl_RemovePaddingBits(GF_SampleTableBox *stbl, u32 SampleNumber)
 {
 	u8 *p;
@@ -1635,6 +1662,8 @@
 	return GF_OK;
 }
 
+#ifndef GPAC_DISABLE_ISOM_WRITE
+
 GF_Err stbl_SampleSizeAppend(GF_SampleSizeBox *stsz, u32 data_size)
 {
 	u32 i;
@@ -1860,7 +1889,7 @@
 	return GF_OK;
 }
 
-GF_Err stbl_AppendTrafMap(GF_ISOFile *mov, GF_SampleTableBox *stbl, Bool is_seg_start, u64 seg_start_offset, u64 frag_start_offset, u8 *moof_template, u32 moof_template_size, u64 sidx_start, u64 sidx_end, u32 nb_pack_samples)
+GF_Err stbl_AppendTrafMap(GF_ISOFile *mov, GF_SampleTableBox *stbl, Bool is_seg_start, u64 seg_start_offset, u64 frag_start_offset, u64 tfdt, u8 *moof_template, u32 moof_template_size, u64 sidx_start, u64 sidx_end, u32 nb_pack_samples)
 {
 	GF_TrafToSampleMap *tmap;
 	GF_TrafMapEntry *tmap_ent;
@@ -1891,13 +1920,14 @@
 	memset(tmap_ent, 0, sizeof(GF_TrafMapEntry));
 	tmap_ent->sample_num = stbl->SampleSize->sampleCount;
 	if (nb_pack_samples)
-		tmap_ent->sample_num -= tmap_ent->sample_num-1;
+		tmap_ent->sample_num -= nb_pack_samples-1;
 
 	tmap_ent->moof_template = moof_template;
 	tmap_ent->moof_template_size = moof_template_size;
 	tmap_ent->moof_start = frag_start_offset;
 	tmap_ent->sidx_start = sidx_start;
 	tmap_ent->sidx_end = sidx_end;
+	tmap_ent->first_dts = tfdt;
 	if (is_seg_start)
 		tmap_ent->seg_start_plus_one = 1 + seg_start_offset;
 
@@ -1926,9 +1956,16 @@
 		if (!stbl->CompositionOffset) return GF_OUT_OF_MEM;
 	}
 	ctts = stbl->CompositionOffset;
+#ifndef GPAC_DISABLE_ISOM_WRITE
 	ctts->w_LastSampleNumber ++;
+#endif
 
-	if (!ctts->unpack_mode && ctts->nb_entries && (ctts->entriesctts->nb_entries-1.decodingOffset == offset) ) {
+	if (
+#ifndef GPAC_DISABLE_ISOM_WRITE
+		!ctts->unpack_mode &&
+#endif
+		ctts->nb_entries && (ctts->entriesctts->nb_entries-1.decodingOffset == offset)
+	) {
 		ctts->entriesctts->nb_entries-1.sampleCount++;
 		return GF_OK;
 	}
@@ -1943,7 +1980,9 @@
 	ctts->nb_entries++;
 	if (offset<0) ctts->version=1;
 
-	if (ABS(offset) >= ctts->max_cts_delta) {
+	if(offset == GF_INT_MIN) {
+		ctts->max_cts_delta = GF_INT_MAX;
+	} else if (ABS(offset) > ctts->max_cts_delta) {
 		ctts->max_cts_delta = ABS(offset);
 		//ctts->sample_num_max_cts_delta = ctts->w_LastSampleNumber;
 	}

gpac-2.2.1.tar.gz/src/isomedia/track.c -> gpac-2.4.0.tar.gz/src/isomedia/track.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2022
+ *			Copyright (c) Telecom ParisTech 2000-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / ISO Media File Format sub-project
@@ -42,11 +42,10 @@
 
 GF_TrackBox *gf_isom_get_track(GF_MovieBox *moov, u32 trackNumber)
 {
-	GF_TrackBox *trak;
-	if (!moov || !trackNumber || (trackNumber > gf_list_count(moov->trackList))) return NULL;
-	trak = (GF_TrackBox*)gf_list_get(moov->trackList, trackNumber - 1);
-	return trak;
-
+	if (!moov) return NULL;
+	//no need to check for these, they will anyway result in NULL returned from gf_list_get
+//	if (!moov || !trackNumber || (trackNumber > gf_list_count(moov->trackList))) return NULL;
+	return (GF_TrackBox*)gf_list_get(moov->trackList, trackNumber - 1);
 }
 
 //get the number of a track given its ID
@@ -212,7 +211,7 @@
 				esd->decoderConfig->rvc_config = (GF_DefaultDescriptor *) gf_odf_desc_new(GF_ODF_DSI_TAG);
 				if (mime_type && !strcmp(mime_type, "application/rvc-config+xml+gz") ) {
 #if !defined(GPAC_DISABLE_ZLIB)
-					gf_gz_decompress_payload(rvc_cfg_data, rvc_cfg_size, &esd->decoderConfig->rvc_config->data, &esd->decoderConfig->rvc_config->dataLength);
+					gf_gz_decompress_payload_ex(rvc_cfg_data, rvc_cfg_size, &esd->decoderConfig->rvc_config->data, &esd->decoderConfig->rvc_config->dataLength, GF_TRUE);
 					gf_free(rvc_cfg_data);
 #endif
 				} else {
@@ -376,7 +375,7 @@
 }
 
 
-GF_Err SetTrackDuration(GF_TrackBox *trak)
+GF_Err SetTrackDurationEx(GF_TrackBox *trak, Bool keep_utc)
 {
 	u64 trackDuration;
 	u32 i;
@@ -408,11 +407,16 @@
 		return GF_OK;
 	}
 	trak->Header->duration = trackDuration;
-	if (!trak->moov->mov->keep_utc && !gf_sys_is_test_mode() )
+	if (!keep_utc && !trak->moov->mov->keep_utc && !gf_sys_is_test_mode() )
 		trak->Header->modificationTime = gf_isom_get_mp4time();
 	return GF_OK;
 }
 
+GF_Err SetTrackDuration(GF_TrackBox *trak)
+{
+	return SetTrackDurationEx(trak, GF_FALSE);
+}
+
 
 #ifndef	GPAC_DISABLE_ISOM_FRAGMENTS
 
@@ -458,7 +462,7 @@
 	u32 i, j, chunk_size, track_num;
 	u64 base_offset, data_offset, traf_duration, tfdt;
 	u32 def_duration, DescIndex, def_size, def_flags;
-	u32 duration, size, flags, prev_trun_data_offset, sample_index, num_first_sample_in_traf;
+	u32 duration, size, flags, prev_trun_data_offset, num_first_sample_in_traf;
 	u8 pad, sync;
 	u16 degr;
 	Bool first_samp_in_traf=GF_TRUE;
@@ -471,8 +475,10 @@
 	GF_TrunEntry *ent;
 #ifdef GF_ENABLE_CTRN
 	GF_TrackFragmentBox *traf_ref = NULL;
+	u32 sample_index;
 #endif
 	Bool is_first_merge = !trak->first_traf_merged;
+	Bool patch_no_dur;
 
 	GF_Err stbl_AppendTime(GF_SampleTableBox *stbl, u32 duration, u32 nb_pack);
 	GF_Err stbl_AppendSize(GF_SampleTableBox *stbl, u32 size, u32 nb_pack);
@@ -522,6 +528,8 @@
 	def_size = (traf->tfhd->flags & GF_ISOM_TRAF_SAMPLE_SIZE) ? traf->tfhd->def_sample_size : traf->trex->def_sample_size;
 	def_flags = (traf->tfhd->flags & GF_ISOM_TRAF_SAMPLE_FLAGS) ? traf->tfhd->def_sample_flags : traf->trex->def_sample_flags;
 
+	patch_no_dur = gf_isom_is_video_handler_type(trak->Media->handler->handlerType);
+
 	//locate base offset, by default use moof (dash-like)
 	base_offset = moof_offset;
 	//explicit base offset, use it
@@ -585,6 +593,7 @@
 		if (is_first_merge) {
 			GF_MovieFragmentBox *moof_clone = NULL;
 			gf_isom_box_freeze_order((GF_Box *)moof_box);
+#ifndef GPAC_DISABLE_ISOM_WRITE
 			gf_isom_clone_box((GF_Box *)moof_box, (GF_Box **)&moof_clone);
 
 			if (moof_clone) {
@@ -627,6 +636,7 @@
 				gf_bs_get_content(bs, &moof_template, &moof_template_size);
 				gf_bs_del(bs);
 			}
+#endif
 		}
 		if (trak->moov->mov->seg_styp) {
 			is_seg_start = GF_TRUE;
@@ -645,7 +655,9 @@
 		store_traf_map = GF_TRUE;
 	}
 
+#ifdef GF_ENABLE_CTRN
 	sample_index = 0;
+#endif
 	i=0;
 	while ((trun = (GF_TrackFragmentRunBox *)gf_list_enum(traf->TrackRuns, &i))) {
 		//merge the run
@@ -710,7 +722,14 @@
 					flags = trun->first_sample_flags;
 				}
 			}
+#ifdef GF_ENABLE_CTRN
 			sample_index++;
+#endif
+			//fix for broken truns with empty duration for frame
+			if (patch_no_dur && !duration && (trun->flags & GF_ISOM_TRUN_DURATION)) {
+				duration = trun->min_duration;
+			}
+
 			/*store the resolved value in case we have inheritance*/
 			ent->size = size;
 			ent->Duration = duration;
@@ -797,7 +816,7 @@
 
 			if (store_traf_map && first_samp_in_traf) {
 				first_samp_in_traf = GF_FALSE;
-				e = stbl_AppendTrafMap(trak->moov->mov, trak->Media->information->sampleTable, is_seg_start, seg_start, frag_start, moof_template, moof_template_size, sidx_start, sidx_end, ent->nb_pack);
+				e = stbl_AppendTrafMap(trak->moov->mov, trak->Media->information->sampleTable, is_seg_start, seg_start, frag_start, tfdt ? tfdt : trak->dts_at_next_frag_start, moof_template, moof_template_size, sidx_start, sidx_end, ent->nb_pack);
 				if (e) return e;
 				//do not deallocate, the memory is now owned by traf map
 				moof_template = NULL;
@@ -806,6 +825,7 @@
 			if (ent->nb_pack>1) {
 				j+= ent->nb_pack-1;
 				traf_duration += ent->nb_pack*duration;
+				last_dts += (ent->nb_pack-1)*duration;
 				continue;
 			}
 
@@ -1009,6 +1029,8 @@
 		if (new_idx) gf_free(new_idx);
 	}
 
+	u32 samples_in_traf = trak->Media->information->sampleTable->SampleSize->sampleCount - num_first_sample_in_traf;
+
 	/*content is encrypted*/
 	track_num = gf_isom_get_tracknum_from_id(trak->moov, trak->Header->trackID);
 	if (gf_isom_is_cenc_media(trak->moov->mov, track_num, DescIndex)
@@ -1092,11 +1114,15 @@
 				saiz = NULL;
 			}
 			if (saiz && saio && senc) {
-				for (i = 0; i < saiz->sample_count; i++) {
-					GF_CENCSampleAuxInfo *sai;
+				u32 saiz_count = saiz->sample_count;
+				if (saiz_count > samples_in_traf) {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("isobmf Number of CENC SAI samples %d greater than samples in traf %d, skipping merge\n", saiz_count, samples_in_traf));
+					saiz_count = 0;
+				}
+
+				for (i = 0; i < saiz_count; i++) {
 					const u8 *key_info=NULL;
 					u32 key_info_size, samp_num;
-					u64 cur_position;
 					if (nb_saio != 1) {
 						u32 saio_idx = saio_get_index(traf, i);
 						if (saio_idx>=saio->entry_count)
@@ -1106,31 +1132,17 @@
 					}
 					size = saiz->default_sample_info_size ? saiz->default_sample_info_size : saiz->sample_info_sizei;
 
-					cur_position = gf_bs_get_position(trak->moov->mov->movieFileMap->bs);
-					gf_bs_seek(trak->moov->mov->movieFileMap->bs, offset);
-
-					GF_SAFEALLOC(sai, GF_CENCSampleAuxInfo);
-					if (!sai) return GF_OUT_OF_MEM;
-
 					samp_num = num_first_sample_in_traf + i + 1;
 
 					trak->current_traf_stsd_idx = DescIndex;
-					e = gf_isom_get_sample_cenc_info_internal(trak, traf, senc, samp_num, &is_encrypted, NULL, NULL, &key_info, &key_info_size);
+					//add sample_count_at_seg_start since gf_isom_get_sample_cenc_info_internal removes them
+					e = gf_isom_get_sample_cenc_info_internal(trak, traf, senc, samp_num + trak->sample_count_at_seg_start, &is_encrypted, NULL, NULL, &key_info, &key_info_size);
 					trak->current_traf_stsd_idx = 0;
 					if (e) {
 						GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("isobmf could not get cenc info for sample %d: %s\n", i+1, gf_error_to_string(e) ));
 						return e;
 					}
 
-					if (is_encrypted) {
-						sai->cenc_data_size = size;
-						sai->cenc_data = gf_malloc(sizeof(u8)*size);
-						if (!sai->cenc_data) return GF_OUT_OF_MEM;
-						gf_bs_read_data(trak->moov->mov->movieFileMap->bs, sai->cenc_data, sai->cenc_data_size);
-					} else {
-						sai->isNotProtected=1;
-					}
-
 					if (key_info) {
 						//not multikey
 						if (!key_info0) {
@@ -1143,20 +1155,39 @@
 							senc->flags = 0x00000002;
 						}
 					}
-
-
-					gf_bs_seek(trak->moov->mov->movieFileMap->bs, cur_position);
-
-					gf_list_add(senc->samp_aux_info, sai);
-
+					//merge into table using true sample num since start of fragment
 					e = gf_isom_cenc_merge_saiz_saio(senc, trak->Media->information->sampleTable, samp_num, offset, size);
 					if (e) return e;
-					//always increment size even for saio.nb_entries>1
+
+					//we no longer load sai, this will be loaded through saio/saiz when fecthing it
+					//this avoids too high mem usage
+					//we do keep it if edit mode to rewrite senc
+					if (trak->moov->mov->openMode>=GF_ISOM_OPEN_EDIT) {
+						GF_CENCSampleAuxInfo *sai;
+						GF_SAFEALLOC(sai, GF_CENCSampleAuxInfo);
+						if (!sai) return GF_OUT_OF_MEM;
+						if (is_encrypted) {
+							sai->cenc_data_size = size;
+							sai->cenc_data = gf_malloc(sizeof(u8)*size);
+							if (!sai->cenc_data) return GF_OUT_OF_MEM;
+							u64 cur_position = gf_bs_get_position(trak->moov->mov->movieFileMap->bs);
+							gf_bs_seek(trak->moov->mov->movieFileMap->bs, offset - trak->moov->mov->bytes_removed);
+
+							gf_bs_read_data(trak->moov->mov->movieFileMap->bs, sai->cenc_data, sai->cenc_data_size);
+
+							gf_bs_seek(trak->moov->mov->movieFileMap->bs, cur_position);
+						} else {
+							sai->isNotProtected=1;
+						}
+						gf_list_add(senc->samp_aux_info, sai);
+					}
+
+					//always increment offset (in case we need saio.nb_entries>1)
 					offset += size;
 				}
 			}
 		} else if (traf->sample_encryption) {
-			senc_Parse(trak->moov->mov->movieFileMap->bs, trak, traf, traf->sample_encryption);
+			senc_Parse(trak->moov->mov->movieFileMap->bs, trak, traf, traf->sample_encryption, samples_in_traf);
 			trak->sample_encryption->AlgorithmID = traf->sample_encryption->AlgorithmID;
 			if (!trak->sample_encryption->IV_size)
 				trak->sample_encryption->IV_size = traf->sample_encryption->IV_size;
@@ -1202,6 +1233,11 @@
 			continue;
 		}
 
+		if (saiz->sample_count > samples_in_traf) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("isobmf Number of SAI samples %d greater than samples in traf %d, skipping merge SAI %s aux info type %d\n", saiz->sample_count, samples_in_traf, gf_4cc_to_str(saiz->aux_info_type), saiz->aux_info_type_parameter));
+			continue;
+		}
+
 		u32 sai_max_size=0;
 		u8 *sai = NULL;
 		for (j=0; j < saiz->sample_count; j++) {

gpac-2.2.1.tar.gz/src/isomedia/tx3g.c -> gpac-2.4.0.tar.gz/src/isomedia/tx3g.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2019
+ *			Copyright (c) Telecom ParisTech 2000-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / ISO Media File Format sub-project
@@ -45,6 +45,7 @@
 	return res;
 }
 
+GF_EXPORT
 GF_Err gf_isom_get_text_description(GF_ISOFile *movie, u32 trackNumber, u32 descriptionIndex, GF_TextSampleDescriptor **out_desc)
 {
 	GF_TrackBox *trak;
@@ -59,6 +60,7 @@
 	switch (trak->Media->handler->handlerType) {
 	case GF_ISOM_MEDIA_TEXT:
 	case GF_ISOM_MEDIA_SUBT:
+	case GF_ISOM_MEDIA_MPEG_SUBT:
 		break;
 	default:
 		return GF_BAD_PARAM;
@@ -100,12 +102,15 @@
 		(*out_desc)->displayFlags = txt->displayFlags;
 		(*out_desc)->vert_justif = txt->vertical_justification;
 		(*out_desc)->horiz_justif = txt->horizontal_justification;
-		(*out_desc)->font_count = txt->font_table->entry_count;
-		(*out_desc)->fonts = (GF_FontRecord *) gf_malloc(sizeof(GF_FontRecord) * txt->font_table->entry_count);
-		for (i=0; i<txt->font_table->entry_count; i++) {
-			(*out_desc)->fontsi.fontID = txt->font_table->fontsi.fontID;
-			if (txt->font_table->fontsi.fontName)
-				(*out_desc)->fontsi.fontName = gf_strdup(txt->font_table->fontsi.fontName);
+		if (txt->font_table && txt->font_table->entry_count) {
+			(*out_desc)->font_count = txt->font_table->entry_count;
+			(*out_desc)->fonts = (GF_FontRecord *) gf_malloc(sizeof(GF_FontRecord) * txt->font_table->entry_count);
+			for (i=0; i<txt->font_table->entry_count; i++) {
+				(*out_desc)->fontsi.fontID = txt->font_table->fontsi.fontID;
+				(*out_desc)->fontsi.fontName = NULL;
+				if (txt->font_table->fontsi.fontName)
+					(*out_desc)->fontsi.fontName = gf_strdup(txt->font_table->fontsi.fontName);
+			}
 		}
 	}
 	return GF_OK;
@@ -139,6 +144,7 @@
 	switch (trak->Media->handler->handlerType) {
 	case GF_ISOM_MEDIA_TEXT:
 	case GF_ISOM_MEDIA_SUBT:
+	case GF_ISOM_MEDIA_MPEG_SUBT:
 		break;
 	default:
 		return GF_BAD_PARAM;
@@ -199,11 +205,12 @@
 	if (e) return e;
 
 	trak = gf_isom_get_track_from_file(movie, trackNumber);
-	if (!trak || !trak->Media || !desc || !desc->font_count) return GF_BAD_PARAM;
+	if (!trak || !trak->Media || !desc) return GF_BAD_PARAM;
 
 	switch (trak->Media->handler->handlerType) {
 	case GF_ISOM_MEDIA_TEXT:
 	case GF_ISOM_MEDIA_SUBT:
+	case GF_ISOM_MEDIA_MPEG_SUBT:
 		break;
 	default:
 		return GF_BAD_PARAM;
@@ -234,6 +241,7 @@
 	txt->font_table = (GF_FontTableBox *)gf_isom_box_new_parent(&txt->child_boxes, GF_ISOM_BOX_TYPE_FTAB);
 	if (!txt->font_table) return GF_OUT_OF_MEM;
 	txt->font_table->entry_count = desc->font_count;
+	if (!desc->font_count) return GF_OK;
 
 	txt->font_table->fonts = (GF_FontRecord *) gf_malloc(sizeof(GF_FontRecord) * desc->font_count);
 	if (!txt->font_table->fonts) return GF_OUT_OF_MEM;
@@ -246,7 +254,7 @@
 
 
 /*blindly adds text - note we don't rely on terminaison characters to handle utf8 and utf16 data
-in the same way. It is the user responsability to signal UTF16*/
+in the same way. It is the user responsibility to signal UTF16*/
 GF_EXPORT
 GF_Err gf_isom_text_add_text(GF_TextSample *samp, char *text_data, u32 text_len)
 {
@@ -411,6 +419,14 @@
 	return GF_OK;
 }
 
+GF_EXPORT
+GF_Err gf_isom_text_set_forced(GF_TextSample *samp, Bool is_forced)
+{
+	if (!samp) return GF_BAD_PARAM;
+	samp->is_forced = is_forced;
+	return GF_OK;
+}
+
 static GFINLINE GF_Err gpp_write_modifier(GF_BitStream *bs, GF_Box *a)
 {
 	GF_Err e;
@@ -436,6 +452,11 @@
 	if (!e) e = gpp_write_modifier(bs, (GF_Box *)samp->box);
 	if (!e) e = gpp_write_modifier(bs, (GF_Box *)samp->wrap);
 
+	if (!e && samp->is_forced) {
+		gf_bs_write_u32(bs, 8);
+		gf_bs_write_u32(bs, GF_QT_BOX_TYPE_FRCD);
+	}
+
 	if (!e) {
 		GF_Box *a;
 		i=0;
@@ -538,6 +559,7 @@
 	switch (trak->Media->handler->handlerType) {
 	case GF_ISOM_MEDIA_TEXT:
 	case GF_ISOM_MEDIA_SUBT:
+	case GF_ISOM_MEDIA_MPEG_SUBT:
 		break;
 	default:
 		return GF_BAD_PARAM;
@@ -603,6 +625,7 @@
 		gf_list_rem(samp->others, 0);
 		gf_isom_box_del(a);
 	}
+	samp->is_forced = GF_FALSE;
 	return GF_OK;
 }
 
@@ -644,9 +667,12 @@
 	}
 
 	while (gf_bs_available(bs)) {
-		GF_Box *a;
+		GF_Box *a = NULL;
 		GF_Err e = gf_isom_box_parse(&a, bs);
-		if (e) break;
+		if (e) {
+			if (a) gf_isom_box_del(a);
+			break;
+		}
 
 		switch (a->type) {
 		case GF_ISOM_BOX_TYPE_STYL:
@@ -688,6 +714,10 @@
 			if (s->wrap) gf_isom_box_del(a);
 			else s->wrap= (GF_TextWrapBox*) a;
 			break;
+		case GF_QT_BOX_TYPE_FRCD:
+			s->is_forced = GF_TRUE;
+			gf_isom_box_del(a);
+			break;
 		default:
 			gf_isom_box_del(a);
 			break;
@@ -936,4 +966,32 @@
 	return GF_OK;
 }
 
+GF_Err gf_isom_set_forced_text(GF_ISOFile *file, u32 track, u32 stsd_idx, u32 flags)
+{
+	GF_TrackBox *trak;
+	GF_Tx3gSampleEntryBox *a;
+
+	trak = gf_isom_get_track_from_file(file, track);
+	if (!trak) return GF_BAD_PARAM;
+
+	a = (GF_Tx3gSampleEntryBox *) gf_list_get(trak->Media->information->sampleTable->SampleDescription->child_boxes, stsd_idx-1);
+	if (!a) return GF_BAD_PARAM;
+	if ((a->type != GF_ISOM_BOX_TYPE_TX3G) && (a->type != GF_ISOM_BOX_TYPE_TEXT)) return GF_BAD_PARAM;
+
+	switch (flags) {
+	case 2:
+		a->displayFlags |= GF_TXT_SOME_SAMPLES_FORCED | GF_TXT_ALL_SAMPLES_FORCED;
+		break;
+	case 1:
+		a->displayFlags |= GF_TXT_SOME_SAMPLES_FORCED;
+		a->displayFlags &= ~GF_TXT_ALL_SAMPLES_FORCED;
+		break;
+	default:
+		a->displayFlags &= ~GF_TXT_SOME_SAMPLES_FORCED;
+		a->displayFlags &= ~GF_TXT_ALL_SAMPLES_FORCED;
+		break;
+	}
+	return GF_OK;
+}
+
 #endif /*GPAC_DISABLE_ISOM*/

gpac-2.2.1.tar.gz/src/jsmods/WebGLRenderingContextBase.c -> gpac-2.4.0.tar.gz/src/jsmods/WebGLRenderingContextBase.c Changed

@@ -1249,7 +1249,7 @@
 	WGL_CHECK_CONTEXT
 	if (argc<2) return js_throw_err(ctx, WGL_INVALID_VALUE);
 	WGL_GET_GLID(location, argv0, WebGLUniformLocation_class_id);
-	if (!WGL_LOAD_INT32_VEC(ctx, argv1, (s32 **) &v, &v_size, 1)) return js_throw_err(ctx, WGL_INVALID_VALUE);;
+	if (!WGL_LOAD_INT32_VEC(ctx, argv1, (s32 **) &v, &v_size, 1)) return js_throw_err(ctx, WGL_INVALID_VALUE);
 	/*hack for GPAC textures, we create uniforms with loc -2 for such textures*/
 	if ((s32) location>=0)
 		glUniform1iv(location, v_size, v);
@@ -1317,7 +1317,7 @@
 	WGL_CHECK_CONTEXT
 	if (argc<2) return js_throw_err(ctx, WGL_INVALID_VALUE);
 	WGL_GET_GLID(location, argv0, WebGLUniformLocation_class_id);
-	if (!WGL_LOAD_INT32_VEC(ctx, argv1, (s32 **) &v, &v_size, 1)) return js_throw_err(ctx, WGL_INVALID_VALUE);;
+	if (!WGL_LOAD_INT32_VEC(ctx, argv1, (s32 **) &v, &v_size, 1)) return js_throw_err(ctx, WGL_INVALID_VALUE);
 	/*hack for GPAC textures, we create uniforms with loc -2 for such textures*/
 	if ((s32) location>=0)
 		glUniform2iv(location, v_size, v);
@@ -1389,7 +1389,7 @@
 	WGL_CHECK_CONTEXT
 	if (argc<2) return js_throw_err(ctx, WGL_INVALID_VALUE);
 	WGL_GET_GLID(location, argv0, WebGLUniformLocation_class_id);
-	if (!WGL_LOAD_INT32_VEC(ctx, argv1, (s32 **) &v, &v_size, 1)) return js_throw_err(ctx, WGL_INVALID_VALUE);;
+	if (!WGL_LOAD_INT32_VEC(ctx, argv1, (s32 **) &v, &v_size, 1)) return js_throw_err(ctx, WGL_INVALID_VALUE);
 	/*hack for GPAC textures, we create uniforms with loc -2 for such textures*/
 	if ((s32) location>=0)
 		glUniform3iv(location, v_size, v);
@@ -1465,7 +1465,7 @@
 	WGL_CHECK_CONTEXT
 	if (argc<2) return js_throw_err(ctx, WGL_INVALID_VALUE);
 	WGL_GET_GLID(location, argv0, WebGLUniformLocation_class_id);
-	if (!WGL_LOAD_INT32_VEC(ctx, argv1, (s32 **) &v, &v_size, 1)) return js_throw_err(ctx, WGL_INVALID_VALUE);;
+	if (!WGL_LOAD_INT32_VEC(ctx, argv1, (s32 **) &v, &v_size, 1)) return js_throw_err(ctx, WGL_INVALID_VALUE);
 	/*hack for GPAC textures, we create uniforms with loc -2 for such textures*/
 	if ((s32) location>=0)
 		glUniform4iv(location, v_size, v);

gpac-2.2.1.tar.gz/src/jsmods/core.c -> gpac-2.4.0.tar.gz/src/jsmods/core.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2007-2022
+ *			Copyright (c) Telecom ParisTech 2007-2023
  *			All rights reserved
  *
  *  This file is part of GPAC / JavaScript libgpac Core bindings
@@ -158,7 +158,7 @@
 GF_EXPORT
 Bool gf_js_try_lock(struct JSContext *cx)
 {
-	assert(cx);
+	gf_assert(cx);
 	if (gf_mx_try_lock(js_rt->mx)) {
 		return 1;
 	}
@@ -762,6 +762,7 @@
 	JS_BS_BIT_POS,
 	JS_BS_AVAILABLE,
 	JS_BS_BITS_AVAILABLE,
+	JS_BS_OVERFLOW,
 	JS_BS_REFRESH_SIZE,
 };
 
@@ -784,6 +785,8 @@
 		return JS_NewInt64(ctx, gf_bs_available(bs));
 	case JS_BS_BITS_AVAILABLE:
 		return JS_NewInt32(ctx, gf_bs_bits_available(bs));
+	case JS_BS_OVERFLOW:
+		return JS_NewBool(ctx, gf_bs_is_overflow(bs) );
 	}
 	return JS_UNDEFINED;
 
@@ -811,6 +814,7 @@
     JS_CGETSET_MAGIC_DEF_ENUM("available", js_bs_prop_get, NULL, JS_BS_AVAILABLE),
     JS_CGETSET_MAGIC_DEF_ENUM("bits_available", js_bs_prop_get, NULL, JS_BS_BITS_AVAILABLE),
     JS_CGETSET_MAGIC_DEF_ENUM("refreshed_size", js_bs_prop_get, NULL, JS_BS_REFRESH_SIZE),
+    JS_CGETSET_MAGIC_DEF_ENUM("overflow", js_bs_prop_get, NULL, JS_BS_OVERFLOW),
 
 	JS_CFUNC_DEF("skip", 0, js_bs_skip_bytes),
 	JS_CFUNC_DEF("is_align", 0, js_bs_is_align),
@@ -1026,11 +1030,15 @@
 		return JS_NewInt32(ctx, uval);
 
 	case JS_SYS_HOSTNAME:
+#ifdef GPAC_DISABLE_NETWORK
+		return JS_NewString(ctx, "localhost");
+#else
 		{
 			char hostname100;
 			gf_sk_get_host_name((char*)hostname);
 			return JS_NewString(ctx, hostname);
 		}
+#endif
 		break;
 	case JS_SYS_LAST_WORK_DIR:
 		res = gf_opts_get_key("core", "last-dir");
@@ -1643,6 +1651,7 @@
 {
 	const u8 *data;
 	size_t data_size;
+	Bool use_gz=GF_FALSE;
 	u32 out_size=0;
 	u8 *out_ptr = NULL;
 	JSValue res;
@@ -1650,10 +1659,15 @@
 	if (!argc || !JS_IsObject(argv0)) return GF_JS_EXCEPTION(ctx);
 	data = JS_GetArrayBuffer(ctx, &data_size, argv0 );
 	if (!data) return GF_JS_EXCEPTION(ctx);
+
+	if (argc>1) {
+		use_gz = JS_ToBool(ctx, argv1);
+	}
+
 	if (is_decomp) {
-		e = gf_gz_decompress_payload((u8*) data, (u32) data_size, &out_ptr, &out_size);
+		e = gf_gz_decompress_payload_ex((u8*) data, (u32) data_size, &out_ptr, &out_size, use_gz);
 	} else {
-		e = gf_gz_compress_payload_ex((u8 **)&data, (u32) data_size, &out_size, 0, GF_FALSE, &out_ptr);
+		e = gf_gz_compress_payload_ex((u8 **)&data, (u32) data_size, &out_size, 0, GF_FALSE, &out_ptr, use_gz);
 	}
 
 	if (e) return js_throw_err(ctx, e);
@@ -2279,7 +2293,7 @@
 
 			u32 s_pos = pid->samples_used + pid->consumed;
 			if (s_pos >= pid->nb_samples) {
-				assert(0);
+				gf_assert(0);
 				GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("AVMix error mixing\n"));
 			}
 			u32 pos = s_pos * pid->channels;
@@ -3560,7 +3574,7 @@
 
 	//vrml, init scene JS but do not init xhr (defined in DOM JS)
 	if (for_vrml) {
-#if !defined(GPAC_DISABLE_PLAYER)
+#if !defined(GPAC_DISABLE_COMPOSITOR)
 		qjs_module_init_scenejs(ctx);
 #endif
 	} else {
@@ -3577,7 +3591,7 @@
 int js_module_set_import_meta(JSContext *ctx, JSValueConst func_val, JS_BOOL use_realpath, JS_BOOL is_main);
 
 
-#ifndef GPAC_STATIC_BUILD
+#ifndef GPAC_STATIC_BIN
 
 #if defined(WIN32) || defined(_WIN32_WCE)
 #include <windows.h>
@@ -3643,7 +3657,7 @@
 	return m;
 }
 
-#endif // GPAC_STATIC_BUILD
+#endif // GPAC_STATIC_BIN
 
 JSModuleDef *qjs_module_loader(JSContext *ctx, const char *module_name, void *opaque)
 {
@@ -3651,7 +3665,7 @@
 	const char *fext = gf_file_ext_start(module_name);
 
 	if (fext && (!strcmp(fext, ".so") || !strcmp(fext, ".dll") || !strcmp(fext, ".dylib")) )  {
-#ifndef GPAC_STATIC_BUILD
+#ifndef GPAC_STATIC_BIN
 		m = qjs_module_loader_dyn_lib(ctx, module_name);
 #else
 		JS_ThrowReferenceError(ctx, "could not load module filename '%s', dynamic library loading disabled in build", module_name);

gpac-2.2.1.tar.gz/src/jsmods/evg.c -> gpac-2.4.0.tar.gz/src/jsmods/evg.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2019-2022
+ *			Copyright (c) Telecom ParisTech 2019-2023
  *			All rights reserved
  *
  *  This file is part of GPAC / JavaScript vector graphics bindings
@@ -32,7 +32,8 @@
 
 #include <gpac/setup.h>
 
-#if defined(GPAC_HAS_QJS)
+#if defined(GPAC_HAS_QJS) && !defined(GPAC_DISABLE_EVG)
+
 
 /*base SVG type*/
 #include <gpac/nodes_svg.h>
@@ -310,7 +311,9 @@
 JSClassID va_class_id;
 JSClassID shader_class_id;
 
+#ifndef GPAC_DISABLE_FONTS
 static void text_set_path(GF_JSCanvas *canvas, GF_JSText *text);
+#endif
 
 Bool get_color_from_args(JSContext *c, int argc, JSValueConst *argv, u32 idx, Double *a, Double *r, Double *g, Double *b);
 static Bool get_color(JSContext *c, JSValueConst obj, Double *a, Double *r, Double *g, Double *b);
@@ -610,7 +613,11 @@
 			else {
 				GF_JSText *text = JS_GetOpaque(value, text_class_id);
 				if (text) {
+#ifndef GPAC_DISABLE_FONTS
 					text_set_path(canvas, text);
+#else
+					return GF_JS_EXCEPTION(ctx);
+#endif
 				}
 			}
 		}
@@ -1373,7 +1380,9 @@
 	return JS_UNDEFINED;
 }
 
+#ifndef GPAC_DISABLE_FONTS
 static void text_update_path(GF_JSText *txt, Bool for_centered);
+#endif
 
 static JSValue canvas_draw_path(JSContext *ctx, JSValueConst obj, int argc, JSValueConst *argv)
 {
@@ -1391,8 +1400,12 @@
 	} else {
 		GF_JSText *text = JS_GetOpaque(argv0, text_class_id);
 		if (text) {
+#ifndef GPAC_DISABLE_FONTS
 			text_update_path(text, GF_TRUE);
 			e = gf_evg_surface_draw_path(canvas->surface, text->path, z);
+#else
+			e = GF_NOT_SUPPORTED;
+#endif
 		}
 	}
 	if (e) return js_throw_err(ctx, e);
@@ -1419,10 +1432,10 @@
 	if (!canvas) return GF_JS_EXCEPTION(ctx);
 	if (argc) {
 		if (argc<4) return js_throw_err(ctx, GF_BAD_PARAM);
-		if (JS_ToInt32(ctx, &x, argv0)) return js_throw_err(ctx, GF_BAD_PARAM);;
-		if (JS_ToInt32(ctx, &y, argv1)) return js_throw_err(ctx, GF_BAD_PARAM);;
-		if (JS_ToInt32(ctx, &w, argv2)) return js_throw_err(ctx, GF_BAD_PARAM);;
-		if (JS_ToInt32(ctx, &h, argv3)) return js_throw_err(ctx, GF_BAD_PARAM);;
+		if (JS_ToInt32(ctx, &x, argv0)) return js_throw_err(ctx, GF_BAD_PARAM);
+		if (JS_ToInt32(ctx, &y, argv1)) return js_throw_err(ctx, GF_BAD_PARAM);
+		if (JS_ToInt32(ctx, &w, argv2)) return js_throw_err(ctx, GF_BAD_PARAM);
+		if (JS_ToInt32(ctx, &h, argv3)) return js_throw_err(ctx, GF_BAD_PARAM);
 	} else {
 		x = y = 0;
 		w = canvas->width;
@@ -1620,7 +1633,7 @@
 				}
 				continue;
 			} else if (op->op_type == EVG_OP_END) {
-				assert(nif_level || if_level);
+				gf_assert(nif_level || if_level);
 				if (nif_level) nif_level--;
 				else if (if_level) if_level--;
 				continue;
@@ -1738,7 +1751,7 @@
 
 					right_val = &tmpr;
 					right_val->x = right_val->y = right_val->z = right_val->q = 0;
-					assert(va->nb_comp<=4);
+					gf_assert(va->nb_comp<=4);
 					for (j=0; j<va->nb_comp; j++) {
 						((Float *)right_val)j = va->valuesva_idx+j;
 					}
@@ -6024,7 +6037,7 @@
 		e = gf_evg_stencil_set_texture_planes(tx->stencil, tx->width, tx->height, tx->pf, data, tx->stride, p_u, p_v, tx->stride_uv, p_a, tx->stride);
 		 if (e) return js_throw_err(c, e);
 	} else {
-		assert(data);
+		gf_assert(data);
 		e = gf_evg_stencil_set_texture(tx->stencil, tx->data, tx->width, tx->height, tx->stride, tx->pf);
 		if (e) return js_throw_err(c, e);
 	}
@@ -6089,6 +6102,7 @@
 
 static GF_Err texture_load_data(JSContext *c, GF_JSTexture *tx, u8 *data, u32 size)
 {
+#ifndef GPAC_DISABLE_AV_PARSERS
 	GF_Err e;
 	GF_BitStream *bs;
 	u8 *dsi=NULL;
@@ -6139,6 +6153,9 @@
 		return e;
 	}
 	return GF_OK;
+#else
+	return GF_NOT_SUPPORTED;
+#endif
 }
 static GF_Err texture_load_file(JSContext *c, GF_JSTexture *tx, const char *fileName, Bool rel_to_script)
 {
@@ -6703,7 +6720,7 @@
 }
 #endif
 
-
+#ifndef GPAC_DISABLE_FONTS
 static void text_reset(GF_JSText *txt)
 {
 	if (txt->path) gf_path_del(txt->path);
@@ -6803,6 +6820,7 @@
 	return JS_UNDEFINED;
 }
 
+#ifndef GPAC_DISABLE_FONTS
 static void text_update_path(GF_JSText *txt, Bool for_centered)
 {
 	Fixed cy, off_x, ascent, descent, scale_x, ls;
@@ -6898,12 +6916,14 @@
 		}
 	}
 }
+
 static void text_set_path(GF_JSCanvas *canvas, GF_JSText *txt)
 {
 	text_update_path(txt, canvas->center_coords);
 	gf_evg_surface_set_path(canvas->surface, txt->path);
 	gf_evg_surface_force_aa(canvas->surface);
 }
+#endif
 
 static void text_set_text_from_value(GF_JSText *txt, GF_Font *font, JSContext *c, JSValueConst value)
 {
@@ -7176,6 +7196,7 @@
 	return obj;
 }
 
+#endif // GPAC_DISABLE_FONTS
 
 
 enum
@@ -7780,8 +7801,10 @@
 		JS_NewClassID(&texture_class_id);
 		JS_NewClass(rt, texture_class_id, &texture_class);
 
+#ifndef GPAC_DISABLE_FONTS
 		JS_NewClassID(&text_class_id);
 		JS_NewClass(rt, text_class_id, &text_class);
+#endif
 
 		JS_NewClassID(&matrix_class_id);
 		JS_NewClass(rt, matrix_class_id, &matrix_class);
@@ -7841,9 +7864,12 @@
     JS_SetPropertyFunctionList(c, proto, texture_funcs, countof(texture_funcs));
     JS_SetClassProto(c, texture_class_id, proto);
 
+#ifndef GPAC_DISABLE_FONTS
 	proto = JS_NewObject(c);
     JS_SetPropertyFunctionList(c, proto, text_funcs, countof(text_funcs));
     JS_SetClassProto(c, text_class_id, proto);
+#endif
+
 
 	proto = JS_NewObject(c);
     JS_SetPropertyFunctionList(c, proto, mx_funcs, countof(mx_funcs));
@@ -7913,6 +7939,7 @@
 	JS_SetPropertyStr(c, global, "GF_DASH_STYLE_DASH_DOT_DOT", JS_NewInt32(c, GF_DASH_STYLE_DASH_DOT_DOT));
 	JS_SetPropertyStr(c, global, "GF_DASH_STYLE_SVG", JS_NewInt32(c, GF_DASH_STYLE_SVG));
 
+#ifndef GPAC_DISABLE_FONTS
 	JS_SetPropertyStr(c, global, "GF_TEXT_BASELINE_TOP", JS_NewInt32(c, TXT_BL_TOP));
 	JS_SetPropertyStr(c, global, "GF_TEXT_BASELINE_HANGING", JS_NewInt32(c, TXT_BL_HANGING));
 	JS_SetPropertyStr(c, global, "GF_TEXT_BASELINE_MIDDLE", JS_NewInt32(c, TXT_BL_MIDDLE));
@@ -7925,6 +7952,7 @@
 	JS_SetPropertyStr(c, global, "GF_TEXT_ALIGN_LEFT", JS_NewInt32(c, TXT_AL_LEFT));
 	JS_SetPropertyStr(c, global, "GF_TEXT_ALIGN_RIGHT", JS_NewInt32(c, TXT_AL_RIGHT));
 	JS_SetPropertyStr(c, global, "GF_TEXT_ALIGN_CENTER", JS_NewInt32(c, TXT_AL_CENTER));
+#endif
 
 	JS_SetPropertyStr(c, global, "GF_EVG_SRC_ATOP", JS_NewInt32(c, GF_EVG_SRC_ATOP));
 	JS_SetPropertyStr(c, global, "GF_EVG_SRC_IN", JS_NewInt32(c, GF_EVG_SRC_IN));
@@ -8014,8 +8042,10 @@
     JS_SetModuleExport(c, m, "RadialGradient", ctor);
 	ctor = JS_NewCFunction2(c, texture_constructor, "Texture", 1, JS_CFUNC_constructor, 0);
     JS_SetModuleExport(c, m, "Texture", ctor);
+#ifndef GPAC_DISABLE_FONTS
 	ctor = JS_NewCFunction2(c, text_constructor, "Text", 1, JS_CFUNC_constructor, 0);
     JS_SetModuleExport(c, m, "Text", ctor);
+#endif
 	ctor = JS_NewCFunction2(c, mx_constructor, "Matrix", 1, JS_CFUNC_constructor, 0);
     JS_SetModuleExport(c, m, "Matrix", ctor);
 	ctor = JS_NewCFunction2(c, vai_constructor, "VertexAttribInterpolator", 1, JS_CFUNC_constructor, 0);
@@ -8063,7 +8093,7 @@
     return;
 }
 
-#else
+#else // defined(GPAC_HAS_QJS) && !defined(GPAC_DISABLE_EVG)
 void qjs_module_init_evg(void *ctx)
 {

gpac-2.2.1.tar.gz/src/jsmods/scene_js.c -> gpac-2.4.0.tar.gz/src/jsmods/scene_js.c Changed

gpac-2.2.1.tar.gz/src/jsmods/storage.c -> gpac-2.4.0.tar.gz/src/jsmods/storage.c Changed

gpac-2.2.1.tar.gz/src/jsmods/webgl.c -> gpac-2.4.0.tar.gz/src/jsmods/webgl.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2019-2022
+ *			Copyright (c) Telecom ParisTech 2019-2023
  *			All rights reserved
  *
  *  This file is part of GPAC / JavaScript WebGL bindings
@@ -1248,9 +1248,12 @@
 
 		frame_ifce = gf_filter_pck_get_frame_interface(pck);
 	}
+#ifndef GPAC_DISABLE_EVG
 	/*try evg Texture*/
 	else if (js_evg_is_texture(c, pck_obj)) {
-	} else {
+	}
+#endif
+	else {
 		return js_throw_err(c, WGL_INVALID_VALUE);
 	}
 
@@ -1260,7 +1263,11 @@
 		if (pck) {
 			jsf_get_filter_packet_planes(c, pck_obj, &width, &height, &pix_fmt, &stride, &uv_stride, NULL, NULL, NULL, NULL);
 		} else {
+#ifndef GPAC_DISABLE_EVG
 			js_evg_get_texture_info(c, pck_obj, &width, &height, &pix_fmt, NULL, &stride, NULL, NULL, &uv_stride, NULL);
+#else
+			return js_throw_err(c, WGL_INVALID_VALUE);
+#endif
 		}
 		if (force_resetup)
 			named_tx->tx.uniform_setup = GF_FALSE;
@@ -1278,6 +1285,7 @@
 			if (!data)
 				return js_throw_err_msg(c, WGL_INVALID_VALUE, "WebGL Unable to fetch packet data, cannot setup NamedTexture\n");
 		} else {
+#ifndef GPAC_DISABLE_EVG
 			u32 pix_fmt=0, width=0, height=0, stride=0, uv_stride=0;
 			js_evg_get_texture_info(c, pck_obj, &width, &height, &pix_fmt, (u8 **) &data, &stride, NULL, NULL, &uv_stride, NULL);
 			if (!data)
@@ -1293,6 +1301,9 @@
 					return js_throw_err_msg(c, WGL_INVALID_VALUE, "WebGL Pixel format %s unknown, cannot setup NamedTexture\n", gf_4cc_to_str(pix_fmt));
 				}
 			}
+#else
+			return js_throw_err(c, WGL_INVALID_VALUE);
+#endif
 		}
 	}
 
@@ -1350,10 +1361,12 @@
 	s32 border = 0;
 	u32 format = 0;
 	u32 type = 0;
+#ifndef GPAC_DISABLE_EVG
 	u32 pixfmt;
 	u32 stride;
 	u32 stride_uv;
 	u8 *p_u, *p_v, *p_a;
+#endif
 	u8 *pix_buf;
 	u32 pix_buf_size=0;
 
@@ -1390,6 +1403,7 @@
 		return JS_UNDEFINED;
 	}
 
+#ifndef GPAC_DISABLE_EVG
 	if (js_evg_is_texture(ctx, argv5) && !glc->bound_named_texture) {
 		const char *tx_named = js_evg_get_texture_named(ctx, argv5);
 		if (tx_named && glc->bound_texture) {
@@ -1417,14 +1431,15 @@
 			glc->bound_texture_target = 0;
 			glc->bound_named_texture = named_tx;
 		}
-
 	}
+#endif
 
 	/*bound texture is a named texture, use tx.upload() */
 	if (glc->bound_named_texture) {
 		return wgl_named_texture_upload(ctx, argv5, glc->bound_named_texture, GF_FALSE);
 	}
 
+#ifndef GPAC_DISABLE_EVG
 	/*check if this is an EVG texture*/
 	if (js_evg_get_texture_info(ctx, argv5, &width, &height, &pixfmt, &pix_buf, &stride, &p_u, &p_v, &stride_uv, &p_a)) {
 		switch (pixfmt) {
@@ -1459,6 +1474,7 @@
 		wgl_tex_image_2d(glc, target, level, internalformat, width, height, border, format, type, pix_buf);
 		return JS_UNDEFINED;
 	}
+#endif // GPAC_DISABLE_EVG
 	/*otherwise not supported*/
 	return js_throw_err(ctx, WGL_INVALID_OPERATION);
 }
@@ -1506,8 +1522,11 @@
 	u32 height = 0;
 	u32 format = 0;
 	u32 type = 0;
+#ifndef GPAC_DISABLE_EVG
 	u32 pixfmt, stride, stride_uv;
-	u8 *pix_buf, *p_u, *p_v, *p_a;
+	u8 *p_u, *p_v, *p_a;
+#endif
+	u8 *pix_buf;
 	u32 pix_buf_size=0;
 
 	GF_WebGLContext *glc = JS_GetOpaque(this_val, WebGLRenderingContextBase_class_id);
@@ -1543,6 +1562,7 @@
 	}
 
 	/*check if this is an EVG texture*/
+#ifndef GPAC_DISABLE_EVG
 	if (js_evg_get_texture_info(ctx, argv6, &width, &height, &pixfmt, &pix_buf, &stride, &p_u, &p_v, &stride_uv, &p_a)) {
 		switch (pixfmt) {
 		case GF_PIXEL_GREYSCALE:
@@ -1568,6 +1588,7 @@
 		wgl_tex_sub_image_2d(glc, target, level, xoffset, yoffset, width, height, format, type, pix_buf);
 		return JS_UNDEFINED;
 	}
+#endif
 	return js_throw_err(ctx, WGL_INVALID_OPERATION);
 }
 
@@ -1978,7 +1999,7 @@
 			glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
 			glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
 			glTexImage2D(GL_TEXTURE_2D, 0,
-#if defined(GPAC_CONFIG_IOS) ||  defined(GPAC_CONFIG_ANDROID)
+#if defined(GPAC_CONFIG_IOS) ||  defined(GPAC_CONFIG_ANDROID) || defined(GPAC_USE_GLES2)
 					GL_DEPTH_COMPONENT16,
 #else
 					GL_DEPTH_COMPONENT24,
@@ -1997,7 +2018,7 @@
 			}
 
 			glBindRenderbuffer(GL_RENDERBUFFER, glc->depth_id);
-#if defined(GPAC_CONFIG_IOS) ||  defined(GPAC_CONFIG_ANDROID)
+#if defined(GPAC_CONFIG_IOS) ||  defined(GPAC_CONFIG_ANDROID) || defined(GPAC_USE_GLES2)
 			glRenderbufferStorage(GL_RENDERBUFFER, GL_DEPTH_COMPONENT16, width, height);
 #else
 			glRenderbufferStorage(GL_RENDERBUFFER, GL_DEPTH_COMPONENT24, width, height);
@@ -2224,7 +2245,9 @@
 
 		glActiveTexture(GL_TEXTURE0);
 		glBindTexture(GL_TEXTURE_2D, 0);
+#ifndef GPAC_USE_GLES2
 		glDisable(GL_TEXTURE_2D);
+#endif
 		//clear error
 		glGetError();

gpac-2.2.1.tar.gz/src/jsmods/xhr.c -> gpac-2.4.0.tar.gz/src/jsmods/xhr.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2007-2022
+ *			Copyright (c) Telecom ParisTech 2007-2023
  *			All rights reserved
  *
  *  This file is part of GPAC / JavaScript XmlHttpRequest bindings
@@ -30,7 +30,7 @@
 
 #include <gpac/setup.h>
 
-#ifdef GPAC_HAS_QJS
+#if defined(GPAC_HAS_QJS) && defined(GPAC_USE_DOWNLOADER)
 
 /*base SVG type*/
 #include <gpac/nodes_svg.h>
@@ -153,7 +153,7 @@
 
 	GF_DOMEventTarget *event_target;
 
-#ifndef GPAC_DISABLE_SVG
+#if !defined(GPAC_DISABLE_SVG)
 	/* dom graph in which the XHR is created */
 	GF_SceneGraph *owning_graph;
 	Bool local_graph;
@@ -365,7 +365,7 @@
 	JS_FreeValueRT(rt, ctx->ontimeout);
 	xml_http_reset(ctx);
 
-#ifndef GPAC_DISABLE_SVG
+#if !defined(GPAC_DISABLE_SVG) && !defined(GPAC_DISABLE_VRML)
 	if (ctx->event_target) {
 		if (ctx->local_graph) {
 			while (gf_list_count(ctx->event_target->listeners)) {
@@ -395,7 +395,7 @@
 	return scene;
 }
 
-#ifndef GPAC_DISABLE_SVG
+#if !defined(GPAC_DISABLE_SVG) && defined(GPAC_USE_DOWNLOADER)
 void xhr_get_event_target(JSContext *c, JSValue obj, GF_SceneGraph **sg, GF_DOMEventTarget **target)
 {
 	if (c) {
@@ -426,7 +426,7 @@
 	p->c = c;
 	p->_this = obj;
 
-#ifndef GPAC_DISABLE_SVG
+#if !defined(GPAC_DISABLE_SVG)
 	p->owning_graph = xml_get_scenegraph(c);
 	if (!p->owning_graph) {
 		p->local_graph = GF_TRUE;
@@ -453,7 +453,7 @@
 
 static void xml_http_fire_event(XMLHTTPContext *ctx, GF_EventType evtType)
 {
-#ifndef GPAC_DISABLE_SVG
+#if !defined(GPAC_DISABLE_SVG)
 	GF_DOM_Event xhr_evt;
 	if (!ctx->event_target)
 		return;
@@ -469,11 +469,6 @@
 
 static void xml_http_state_change(XMLHTTPContext *ctx)
 {
-#ifndef GPAC_DISABLE_VRML
-	GF_SceneGraph *scene;
-	GF_Node *n;
-#endif
-
 	gf_js_lock(ctx->c, GF_TRUE);
 	if (! JS_IsNull(ctx->onreadystatechange)) {
 		JSValue ret = JS_Call(ctx->c, ctx->onreadystatechange, ctx->_this, 0, NULL);
@@ -485,7 +480,9 @@
 	js_std_loop(ctx->c);
 	gf_js_lock(ctx->c, GF_FALSE);
 
-#ifndef GPAC_DISABLE_VRML
+#if !defined(GPAC_DISABLE_SVG) && !defined(GPAC_DISABLE_VRML)
+	GF_SceneGraph *scene;
+	GF_Node *n;
 	if (! ctx->owning_graph) return;
 	if (ctx->local_graph) return;
 
@@ -640,7 +637,7 @@
 	if (par) {
 		gf_node_list_add_child(&par->children, (GF_Node*)node);
 	} else {
-		assert(!ctx->document->RootNode);
+		gf_assert(!ctx->document->RootNode);
 		ctx->document->RootNode = (GF_Node*)node;
 	}
 	gf_list_add(ctx->node_stack, node);
@@ -722,7 +719,7 @@
 	}
 
 	if (!ctx->isFile) {
-		assert( locked );
+		gf_assert( locked );
 		gf_js_lock(ctx->c, GF_FALSE);
 		locked = GF_FALSE;
 	}
@@ -792,7 +789,7 @@
 		        || strstr(parameter->value, "/xml")
 //			|| !strncmp(parameter->value, "text/plain", 10)
 		   ) {
-			assert(!ctx->sax);
+			gf_assert(!ctx->sax);
 			ctx->sax = gf_xml_sax_new(xml_http_sax_start, xml_http_sax_end, xml_http_sax_text, ctx);
 			ctx->node_stack = gf_list_new();
 			ctx->document = gf_sg_new();
@@ -866,7 +863,7 @@
 	case GF_NETIO_REQUEST_SESSION:
 	case GF_NETIO_CANCEL_STREAM:
 		parameter->error = GF_NOT_SUPPORTED;
-		return;
+		goto exit;
 	}
 	if (ctx->async) {
 		xml_http_terminate(ctx, parameter->error);
@@ -959,6 +956,10 @@
 	return GF_OK;
 }
 
+#ifdef GPAC_USE_DOWNLOADER
+GF_DownloadManager *jsf_get_download_manager(JSContext *c);
+#endif
+
 static JSValue xml_http_send(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
 {
 	GF_Err e;
@@ -980,7 +981,9 @@
 	} else {
 		par.dnld_man = jsf_get_download_manager(c);
 	}
+#ifndef GPAC_DISABLE_NETWORKING
 	if (!par.dnld_man) return GF_JS_EXCEPTION(c);
+#endif
 
 	if (argc) {
 		if (JS_IsNull(argv0)) {
@@ -1007,8 +1010,13 @@
 
 	if (!strncmp(ctx->url, "http://", 7)) {
 		u32 flags = GF_NETIO_SESSION_NOTIFY_DATA;
+		//disable sync XHR in emscripten
+#ifdef GPAC_CONFIG_EMSCRIPTEN
+		return GF_JS_EXCEPTION(c);
+#else
 		if (!ctx->async)
 			flags |= GF_NETIO_SESSION_NOT_THREADED;
+#endif
 
 		if (ctx->cache != XHR_CACHETYPE_NORMAL) {
 			if (ctx->cache == XHR_CACHETYPE_NONE) {
@@ -1486,12 +1494,18 @@
 #ifdef GPAC_ENABLE_COVERAGE
 	if (gf_sys_is_cov_mode()) {
 		qjs_module_init_xhr_global(NULL, JS_TRUE);
+#if !defined(GPAC_DISABLE_SVG) && defined(GPAC_USE_DOWNLOADER)
 		xhr_get_event_target(NULL, JS_TRUE, NULL, NULL);
+#endif
 	}
 #endif
 	return;
 }
 
-
-#endif
+#else
+#include "../quickjs/quickjs.h"
+void qjs_module_init_xhr(JSContext *ctx)
+{
+}
+#endif // defined(GPAC_HAS_QJS) && defined(GPAC_USE_DOWNLOADER)

gpac-2.2.1.tar.gz/src/laser/lsr_dec.c -> gpac-2.4.0.tar.gz/src/laser/lsr_dec.c Changed

@@ -234,7 +234,7 @@
 
 	for (i=0; i<gf_list_count(codec->unresolved_commands); i++) {
 		GF_Command *com = (GF_Command *)gf_list_get(codec->unresolved_commands, i);
-		assert(!com->node);
+		gf_assert(!com->node);
 		com->node = gf_sg_find_node(codec->sg, com->RouteID);
 		if (com->node) {
 			gf_node_register(com->node, NULL);
@@ -830,8 +830,10 @@
 			}
 		}
 
-		assert(par);
-		gf_node_dom_listener_add(par, listener);
+		if (par)
+			gf_node_dom_listener_add(par, listener);
+		else
+			gf_assert(0);
 		gf_list_rem(lsr->deferred_listeners, i);
 		i--;
 		count--;
@@ -4902,6 +4904,18 @@
 		return res;
 	}
 	case SVG_StrokeDashArray_datatype:
+	{
+		SVG_StrokeDashArray *da;
+		GF_SAFEALLOC(da, SVG_StrokeDashArray);
+		if (!da) {
+			lsr->last_error = GF_OUT_OF_MEM;
+		} else {
+			da->array.vals = (Fixed*)gf_malloc(sizeof(Fixed));
+			da->array.count = 1;
+			if (da->array.vals) da->array.vals0 = lsr_read_fixed_16_8(lsr, "floatValue");
+		}
+		return da;
+	}
 	case SVG_ViewBox_datatype:
 		f_val = (Fixed*)gf_malloc(sizeof(Fixed));
 		if (!f_val) {
@@ -5430,7 +5444,8 @@
 				if (idx==-1) {
 					lsr_read_update_value(lsr, NULL, fieldIndex, field_type, info.far_ptr, 0);
 				} else {
-					assert(0);
+					gf_assert(0);
+					return GF_NON_COMPLIANT_BITSTREAM;
 				}
 
 
@@ -5845,7 +5860,7 @@
 	GF_LASeRCodec *codec = (GF_LASeRCodec *)gf_node_get_private((GF_Node*)node);
 
 	if (is_destroy || !up || (up->sgprivate->tag!=TAG_DOMUpdates)) return;
-	assert(!codec->bs);
+	gf_assert(!codec->bs);
 
 	codec->info = lsr_get_stream(codec, 0);
 	if (!codec->info) return;

gpac-2.2.1.tar.gz/src/laser/lsr_enc.c -> gpac-2.4.0.tar.gz/src/laser/lsr_enc.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2005-2019
+ *			Copyright (c) Telecom ParisTech 2005-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / LASeR codec sub-project
@@ -35,7 +35,7 @@
 
 #define GF_LSR_WRITE_INT(_codec, _val, _nbBits, _str)	{\
 	gf_bs_write_int(_codec->bs, _val, _nbBits);	\
-	assert(_str);\
+	gf_assert(_str);\
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_CODING, ("LASeR %s\t\t%d\t\t%d\n", _str, _nbBits, _val)); \
 	}\
  
@@ -205,7 +205,7 @@
 	u32 nb_bits = val ? gf_get_bit_size(val) : 1;
 	nb_words = nb_bits / 4;
 	if (nb_bits%4) nb_words++;
-	assert(nb_words * 4 >= nb_bits);
+	gf_assert(nb_words * 4 >= nb_bits);
 	nb_bits = 4*nb_words;
 	while (nb_words) {
 		nb_words--;
@@ -223,7 +223,7 @@
 	if (nb_bits%4) nb_words++;
 	nb_words += extra_words;
 
-	assert(nb_words * 4 >= nb_bits);
+	gf_assert(nb_words * 4 >= nb_bits);
 	nb_bits = 4*nb_words;
 	while (nb_words) {
 		nb_words--;
@@ -249,7 +249,7 @@
 	u32 nb_tot, nb_bits = val ? gf_get_bit_size(val) : 1;
 	nb_words = nb_bits / 7;
 	if (nb_bits%7) nb_words++;
-	assert(nb_words * 7 >= nb_bits);
+	gf_assert(nb_words * 7 >= nb_bits);
 	nb_bits = nb_words * 7;
 	nb_tot = nb_words+nb_bits;
 	while (nb_words) {
@@ -279,7 +279,7 @@
 		nID = 1+href->lsr_stream_id;
 	else
 		nID=1;
-	assert(nID);
+	gf_assert(nID);
 
 	lsr_write_vluimsbf5(lsr, nID-1, name);
 	GF_LSR_WRITE_INT(lsr, 0, 1, "reserved");
@@ -288,7 +288,7 @@
 static void lsr_write_codec_IDREF_Node(GF_LASeRCodec *lsr, GF_Node *href, const char *name)
 {
 	u32 nID = gf_node_get_id(href);
-	assert(nID);
+	gf_assert(nID);
 	lsr_write_vluimsbf5(lsr, nID-1, name);
 	GF_LSR_WRITE_INT(lsr, 0, 1, "reserved");
 }
@@ -298,12 +298,12 @@
 	u32 nb_bits, nb_words, nID;
 
 	nID = gf_node_get_id(href);
-	assert(nID);
+	gf_assert(nID);
 
 	nb_bits = nID ? gf_get_bit_size(nID) : 1;
 	nb_words = nb_bits / 4;
 	if (nb_bits%4) nb_words++;
-	assert(nb_words * 4 >= nb_bits);
+	gf_assert(nb_words * 4 >= nb_bits);
 	nb_bits = nb_words * 4;
 	return nb_words+nb_bits /*IDREF part*/ + 1 /*reserevd bit*/;
 }
@@ -494,13 +494,11 @@
 static void lsr_write_private_element_container(GF_LASeRCodec *lsr)
 {
 	/*NO PRIVATE DATA ON ENCODING YET*/
-	assert(0);
 }
 
 static void lsr_write_private_att_class(GF_LASeRCodec *lsr)
 {
 	/*NO PRIVATE DATA ON ENCODING YET*/
-	assert(0);
 }
 
 static void lsr_write_extend_class(GF_LASeRCodec *lsr, char *data, u32 len, const char *name)
@@ -516,7 +514,6 @@
 
 static void lsr_write_private_attr_container(GF_LASeRCodec *lsr, u32 index, const char *name)
 {
-	assert(0);
 }
 
 static Bool lsr_float_list_equal(GF_List *l1, GF_List *l2)
@@ -611,7 +608,7 @@
 			GF_LOG(GF_LOG_DEBUG, GF_LOG_CODING, ("LASeR nb_bits %d not large enough to encode positive number %g!\n", nb_bits, FIX2FLT(x) ));
 			res = max;
 		}
-		assert( ! (res & (1<<(nb_bits-1)) ));
+		gf_assert( ! (res & (1<<(nb_bits-1)) ));
 		return (u32) res;
 	}
 	res += 1<<(nb_bits);
@@ -619,7 +616,7 @@
 		GF_LOG(GF_LOG_DEBUG, GF_LOG_CODING, ("LASeR nb_bits %d not large enough to encode negative number %g!\n", nb_bits, FIX2FLT(x) ));
 		res = max+1;
 	}
-	assert( res & (1<<(nb_bits-1)) );
+	gf_assert( res & (1<<(nb_bits-1)) );
 	return res;
 }
 
@@ -1619,7 +1616,7 @@
 	}
 
 	/*locate field - checkme, this may not work since anim is not setup...*/
-	assert(anim_type->name || anim_type->tag);
+	gf_assert(anim_type->name || anim_type->tag);
 	if (!anim_type->tag) anim_type->tag = gf_xml_get_attribute_tag((GF_Node*)iri->target, anim_type->name, 0);
 	if (!anim_type->type) anim_type->type = gf_xml_get_attribute_type(anim_type->tag);
 	a_type = gf_lsr_anim_type_from_attribute(anim_type->tag);
@@ -2203,14 +2200,14 @@
 {
 	GF_LSR_WRITE_INT(lsr, sync ? 1 : 0, 1, name);
 	if (!sync) return;
-	assert(*sync!=SMIL_SYNCBEHAVIOR_INHERIT);
+	gf_assert(*sync!=SMIL_SYNCBEHAVIOR_INHERIT);
 	GF_LSR_WRITE_INT(lsr, *sync-1, 2, name);
 }
 static void lsr_write_sync_tolerance(GF_LASeRCodec *lsr, SMIL_SyncTolerance *sync, const char *name)
 {
 	GF_LSR_WRITE_INT(lsr, sync ? 1 : 0, 1, name);
 	if (!sync) return;
-	assert(sync->type!=SMIL_SYNCTOLERANCE_INHERIT);
+	gf_assert(sync->type!=SMIL_SYNCTOLERANCE_INHERIT);
 
 	if (sync->type==SMIL_SYNCTOLERANCE_DEFAULT) {
 		GF_LSR_WRITE_INT(lsr, 1, 1, name);
@@ -3697,7 +3694,7 @@
 static void lsr_write_update_value(GF_LASeRCodec *lsr, SVG_Element *elt, u32 fieldType, u32 att_tag, u32 transformType, void *val, Bool is_indexed)
 {
 	if (is_indexed) {
-		assert(gf_list_count(*(GF_List **)val));
+		gf_assert(gf_list_count(*(GF_List **)val));
 		switch (fieldType) {
 		case SVG_Points_datatype:/*points*/
 		{
@@ -4049,7 +4046,7 @@
 		old_bs = lsr->bs;
 		lsr->bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
 	}
-	assert(count>= (u32) (first_implicit ? 1 : 0) );
+	gf_assert(count>= (u32) (first_implicit ? 1 : 0) );
 
 	lsr_write_vluimsbf5(lsr, count-first_implicit, "occ0");

gpac-2.2.1.tar.gz/src/media_tools/av_parsers.c -> gpac-2.4.0.tar.gz/src/media_tools/av_parsers.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre, Romain Bouqueau, Cyril Concolato
- *			Copyright (c) Telecom ParisTech 2000-2022
+ *			Copyright (c) Telecom ParisTech 2000-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / Media Tools sub-project
@@ -41,7 +41,7 @@
 
 #define gf_bs_log(_bs, _nBits, _fname, _val) gf_bs_log_idx(_bs, _nBits, _fname, _val, -1, -1, -1)
 
-u32 gf_bs_read_int_log_idx3(GF_BitStream *bs, u32 nBits, const char *fname, s32 idx1, s32 idx2, s32 idx3)
+static u32 gf_bs_read_int_log_idx3(GF_BitStream *bs, u32 nBits, const char *fname, s32 idx1, s32 idx2, s32 idx3)
 {
 	u32 val = gf_bs_read_int(bs, nBits);
 	gf_bs_log_idx(bs, nBits, fname, val, idx1, idx2, idx3);
@@ -90,17 +90,17 @@
 		}
 		i++;
 	}
-	//not standard one, reduce by power of 2
+	//not standard one, reduce (brute force)
 	i = 2;
 	while (1) {
-		if (w <= i) return;
-		if (h <= i) return;
+		if ((w <= i) || (h <= i))
+			return;
 
-		if (w % i) return;
-		if (h % i) return;
-		*width = w / i;
-		*height = h / i;
-		i *= 2;
+		if (!(w % i) && !(h % i)) {
+			*width = w / i;
+			*height = h / i;
+		}
+		i += 1;
 	}
 }
 
@@ -114,7 +114,7 @@
 		*timescale = res;
 		*sample_dur = 1;
 	}
-	else if ((double)(*timescale * 1001 - (res + 1) * *sample_dur * 1000) / ((res + 1) * *sample_dur * 1000) < 0.001) {
+	else if ((double)((u64)*timescale * 1001 - (u64)(res + 1) * (u64)*sample_dur * 1000) / ((u64)(res + 1) * (u64)*sample_dur * 1000) < 0.001) {
 		*timescale = (res + 1) * 1000;
 		*sample_dur = 1001;
 	}
@@ -386,7 +386,7 @@
 {
 	gf_bs_seek(m4v->bs, start);
 
-	assert(start < (u64)1<<31);
+	gf_fatal_assert(start < (u64)1<<31);
 	m4v->current_object_start = (u32)start;
 	m4v->current_object_type = 0;
 	return GF_OK;
@@ -808,7 +808,7 @@
 		if (m4v->step_mode)
 			return GF_OK;
 	}
-	assert(m4v->current_object_start >= *start);
+	if (m4v->current_object_start < *start) return GF_NON_COMPLIANT_BITSTREAM;
 	*size = m4v->current_object_start - *start;
 	return GF_OK;
 }
@@ -1535,7 +1535,7 @@
 	Bool extra_bit;
 	int w = (u32)(log(n) / log(2)) + 1;
 	u32 m = (1 << w) - n;
-	assert(w < 32);
+	gf_assert(w < 32);
 	v = gf_bs_read_int(bs, w - 1);
 	if (v < m) {
 		if (fname) {
@@ -1640,11 +1640,12 @@
 		if (done)
 			break;
 		leadingZeros++;
+		//avoid calls to bs_available or bs_is_overflow - see #2698 for poc
+		if (leadingZeros >= 32) {
+			return 0xFFFFFFFF;
+		}
 	}
-	if (leadingZeros >= 32) {
-		return 0xFFFFFFFF;
-	}
-	res = gf_bs_read_int(bs, leadingZeros) + (1 << leadingZeros) - 1;
+	res = gf_bs_read_int(bs, leadingZeros) + ((u32)1 << leadingZeros) - 1;
 	gf_bs_log(bs, 2*leadingZeros, fname, res);
 	return res;
 }
@@ -1737,8 +1738,20 @@
 				state->decoder_model_present_for_this_opi = 0;
 			}
 			if (initial_display_delay_present_flag) {
-				if (gf_bs_read_int_log_idx(bs, 1, "initial_display_delay_present_for_this_op", i) ) {
-					gf_bs_read_int_log_idx(bs, 4, "initial_display_delay_minus1", i);
+				state->initial_display_delay_present_for_this_opi = gf_bs_read_int_log_idx(bs, 1, "initial_display_delay_present_for_this_op", i);
+				if (state->initial_display_delay_present_for_this_opi) {
+					state->initial_display_delay_minus1_for_this_opi = gf_bs_read_int_log_idx(bs, 4, "initial_display_delay_minus1", i);
+					// the procedure to compute the initial_presentation_delay (IPD) measured in ISOBMFF samples
+					// from the initial_display_delay (IDD) measured in decoded frames is a bit complex,
+					// and cannot be computed until samples have been formed
+					// except when the number of operating points is 1 (usual, non scalable case)
+					// and for the special case where IDD = 1 (low delay encodes)
+					// because that first frame is necessarily contained in the first sample, so IPD = 1
+					if (state->operating_points_count == 1
+						&& state->initial_display_delay_minus1_for_this_opi == 0) {
+						state->config->initial_presentation_delay_present = GF_TRUE;
+						state->config->initial_presentation_delay_minus_one = 0;
+					}
 				}
 			}
 		}
@@ -1850,7 +1863,7 @@
 	u32 dw = 0;
 
 	if (!width || !height || !codec_fourcc || !timebase_den || !timebase_num || !num_frames) {
-		assert(0);
+		gf_assert(0);
 		return GF_BAD_PARAM;
 	}
 
@@ -1915,7 +1928,7 @@
 	u64 pos = gf_bs_get_position(bs), i = 0;
 	GF_Err e;
 
-	assert(bs && num_frames_in_superframe);
+	gf_assert(bs && num_frames_in_superframe);
 
 	/*initialize like there is no superframe*/
 	memset(frame_sizes, 0, VP9_MAX_FRAMES_IN_SUPERFRAME * sizeof(frame_sizes0));
@@ -2254,7 +2267,7 @@
 	int Sb64Cols = 0, Sb64Rows = 0, i;
 	u8 refresh_frame_flags = 0;
 
-	assert(bs && key_frame);
+	gf_assert(bs && key_frame);
 
 	/*uncompressed header*/
 	/*frame_marker = */gf_bs_read_int_log(bs, 2, "frame_marker");
@@ -2364,6 +2377,7 @@
 	return GF_OK;
 }
 
+GF_EXPORT
 GF_Err gf_av1_parse_obu_header(GF_BitStream *bs, ObuType *obu_type, Bool *obu_extension_flag, Bool *obu_has_size_field, u8 *temporal_id, u8 *spatial_id)
 {
 	Bool forbidden = gf_bs_read_int(bs, 1);
@@ -2439,6 +2453,7 @@
 	}
 }
 
+GF_EXPORT
 u64 gf_av1_leb128_read(GF_BitStream *bs, u8 *opt_Leb128Bytes) {
 	u64 value = 0;
 	u8 Leb128Bytes = 0, i = 0;
@@ -2489,8 +2504,13 @@
 	GF_AV1_OBUArrayEntry *a = NULL;
 
 	if (state && state->mem_mode) {
-		if (!state->bs) state->bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
-		else gf_bs_reassign_buffer(state->bs, state->frame_obus, state->frame_obus_alloc);
+		if (!state->bs) {
+			state->bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
+		} else {
+			gf_bs_reassign_buffer(state->bs, state->frame_obus, state->frame_obus_alloc);
+			//make sure we don't attempt at freeing this buffer while assigned to the bitstream - cf gf_av1_reset_state
+			state->frame_obus = NULL;
+		}
 	}
 	else {
 		GF_SAFEALLOC(a, GF_AV1_OBUArrayEntry);
@@ -2541,14 +2561,14 @@
 				GF_BitStream *bsLeb128 = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
 				/*write size field*/
 				gf_av1_leb128_write(bsLeb128, obu_size);
-				assert(gf_bs_get_position(bsLeb128) == leb_size);
+				gf_assert(gf_bs_get_position(bsLeb128) == leb_size);
 				gf_bs_get_content(bsLeb128, &output, &out_size);
 				gf_bs_del(bsLeb128);
 				memcpy(a->obu + hdr_size, output, out_size);
 				gf_free(output);
 			}
 			gf_bs_read_data(bs, a->obu + hdr_size + leb_size, (u32)(obu_size));
-			assert(gf_bs_get_position(bs) == pos + obu_length);
+			gf_assert(gf_bs_get_position(bs) == pos + obu_length);
 		}
 		else {
 			u32 remain;
@@ -2567,7 +2587,7 @@
 				gf_bs_write_data(state->bs, block, block_size);
 				remain -= block_size;
 			}
-			assert(gf_bs_get_position(bs) == pos + obu_length);
+			gf_assert(gf_bs_get_position(bs) == pos + obu_length);
 			return;
 		}
 	}
@@ -2601,9 +2621,11 @@
 GF_Err aom_av1_parse_temporal_unit_from_section5(GF_BitStream *bs, AV1State *state)
 {
 	if (!state) return GF_BAD_PARAM;
-	state->obu_type = -1;
+	state->has_temporal_delim = 0;
+	//if some OBUs are written, we had a TL before but had to stop parsing due to not enough space
+	Bool first_obu = state->has_frame_data ? GF_FALSE : GF_TRUE;
 
-	while (state->obu_type != OBU_TEMPORAL_DELIMITER) {
+	while (1) {
 		GF_Err e;
 		if (!gf_bs_available(bs))
 			return state->unframed ? GF_BUFFER_TOO_SMALL : GF_OK;
@@ -2619,6 +2641,19 @@
 			return GF_NON_COMPLIANT_BITSTREAM;
 		}
 
+		if (state->obu_type == OBU_TEMPORAL_DELIMITER) {
+			if (!first_obu) {
+				// seek back
+				gf_bs_seek(bs, pos);
+				break;
+			}
+			state->has_temporal_delim = 1;
+			state->has_frame_data = 0;
+		} else {
+			state->has_frame_data = 1;
+		}
+		first_obu = GF_FALSE;
+
 		GF_LOG(GF_LOG_DEBUG, GF_LOG_CODING, ("AV1 Section5 OBU detected (size "LLU")\n", obu_size));
 		av1_populate_state_from_obu(bs, pos, obu_size, state->obu_type, state);
 	}
@@ -2753,7 +2788,7 @@
 			frame_unit_size -= obu_size;
 		}
 	}
-	assert(sz == 0);
+	gf_assert(sz == 0);
 	if (tusize != gf_bs_get_position(bs) - tupos) {
 		GF_LOG(GF_LOG_WARNING, GF_LOG_CODING, ("AV1 Annex B TU size "LLU" different from consumed bytes "LLU".\n", tusize, gf_bs_get_position(bs) - tupos));
 		return GF_NON_COMPLIANT_BITSTREAM;
@@ -2816,7 +2851,7 @@
 	u32 i = 0;
 	u64 t = 0;
 	for (i = 0; i < n; i++) {
-		u8 byte = gf_bs_read_int(bs, 8);
+		u32 byte = gf_bs_read_int(bs, 8);
 		t += (byte << (i * 8));
 	}
 	gf_bs_log(bs, n*8, name, t);
@@ -3367,7 +3402,7 @@
 		if (frame_state->show_existing_frame == GF_TRUE) {
 			frame_state->frame_to_show_map_idx = gf_bs_read_int_log(bs, 3, "frame_to_show_map_idx");
 			frame_state->frame_type = state->RefFrameTypeframe_state->frame_to_show_map_idx;
-
+			frame_state->order_hint = state->RefOrderHintframe_state->frame_to_show_map_idx;
 			if (state->decoder_model_info_present_flag && !state->equal_picture_interval) {
 				gf_bs_read_int_log(bs, state->frame_presentation_time_length, "frame_presentation_time");
 			}
@@ -4007,27 +4042,25 @@
 	l2 = state->frame_state.header_obus;
 	memset(&state->frame_state, 0, sizeof(AV1StateFrame));
 	state->frame_state.is_first_frame = GF_TRUE;
+	state->has_frame_data = 0;
 
 	if (is_destroy) {
 		gf_list_del(l1);
 		gf_list_del(l2);
 		if (state->bs) {
-			u32 size, asize=0;
-			u8 *ptr=NULL;
-			//detach BS internal buffer
-			gf_bs_get_content_no_truncate(state->bs, &ptr, &size, &asize);
-			//avoid double free, cf issue 1893
-			if (ptr != state->frame_obus) {
-				gf_free(ptr);
-			}
+			//cf issues #1893 and #2604:
+			//state->frame_obus is either:
+			//- NULL, in which case there is a valid buffer in bs, freed by bs_del
+			//- not NULL, in which case the internal buffer of bs is NULL and we must free the buffer
+
 			if (state->frame_obus) {
 				gf_free(state->frame_obus);
 				state->frame_obus = NULL;
 				state->frame_obus_alloc = 0;
 			}
 			gf_bs_del(state->bs);
+			state->bs = NULL;
 		}
-		state->bs = NULL;
 	}
 	else {
 		state->frame_state.frame_obus = l1;
@@ -4194,6 +4227,8 @@
 	//gpac's internal obu_size includes the header + the payload
 	*obu_size += hdr_size;
 	if (obu_hdr_size) *obu_hdr_size = hdr_size;
+	if (!*obu_size)
+		return GF_NON_COMPLIANT_BITSTREAM;
 
 	if (*obu_type != OBU_SEQUENCE_HEADER && *obu_type != OBU_TEMPORAL_DELIMITER &&
 		state->OperatingPointIdc != 0 && state->obu_extension_flag == 1)
@@ -4216,10 +4251,12 @@
 
 	switch (*obu_type) {
 	case OBU_SEQUENCE_HEADER:
-		av1_parse_sequence_header_obu(bs, state);
-		if (gf_bs_is_overflow(bs) || (gf_bs_get_position(bs) > pos + *obu_size)) {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_CODING, ("AV1 Sequence header parsing consumed too many bytes !\n"));
-			e = GF_NON_COMPLIANT_BITSTREAM;
+		if (state->config) {
+			av1_parse_sequence_header_obu(bs, state);
+			if (gf_bs_is_overflow(bs) || (gf_bs_get_position(bs) > pos + *obu_size)) {
+				GF_LOG(GF_LOG_WARNING, GF_LOG_CODING, ("AV1 Sequence header parsing consumed too many bytes !\n"));
+				e = GF_NON_COMPLIANT_BITSTREAM;
+			}
 		}
 		gf_bs_seek(bs, pos + *obu_size);
 		break;
@@ -4492,6 +4529,10 @@
 		GF_LOG(GF_LOG_ERROR, GF_LOG_CODING, ("MPEG-1/2 Audio layer index not valid\n"));
 		return 0;
 	}
+	if (bitRateIndex>14) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CODING, ("MPEG-1/2 Audio Bitrate index not valid\n"));
+		return 0;
+	}
 	return bitrate_tablelidxbitRateIndex;
 }
 
@@ -4712,8 +4753,6 @@
 	}
 }
 
-#ifndef GPAC_DISABLE_AV_PARSERS
-
 u32 gf_bs_read_ue_log_idx3(GF_BitStream *bs, const char *fname, s32 idx1, s32 idx2, s32 idx3)
 {
 	u32 val=0, code;
@@ -4822,6 +4861,8 @@
 	gf_bs_write_ue(bs, v);
 }
 
+#ifndef GPAC_DISABLE_AV_PARSERS
+
 GF_EXPORT
 u32 gf_media_nalu_next_start_code(const u8 *data, u32 data_len, u32 *sc_size)
 {
@@ -5069,6 +5110,11 @@
 	return nal_size - emulation_bytes_count;
 }
 
+#define AVC_SPS_BROKEN {\
+	memset(sps, 0, sizeof(AVC_SPS)); \
+	return -1;\
+	}
+
 static s32 gf_avc_read_sps_bs_internal(GF_BitStream *bs, AVCState *avc, u32 subseq_sps, u32 *vui_flag_pos, u32 nal_hdr)
 {
 	AVC_SPS *sps;
@@ -5120,7 +5166,7 @@
 	case 44:
 		/*sanity checks: note1 from 7.4.2.1.1 of iso/iec 14496-10-N11084*/
 		if (pcomp & 0xE0)
-			return -1;
+			AVC_SPS_BROKEN
 	case 83:
 	case 86:
 	case 118:
@@ -5165,14 +5211,12 @@
 	sps->log2_max_frame_num = gf_bs_read_ue_log(bs, "log2_max_frame_num") + 4;
 	if (sps->log2_max_frame_num>16) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_CODING, ("avc-h264 invalid SPS: log2_max_frame_num_minus4 shall be less than 12, but is %d\n", sps->log2_max_frame_num-4));
-		sps->log2_max_frame_num=0;
-		return -1;
+		AVC_SPS_BROKEN
 	}
 	sps->poc_type = gf_bs_read_ue_log(bs, "poc_type");
 	if (sps->poc_type>2) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_CODING, ("avc-h264 invalid SPS: pic_order_cnt_type shall be less than 2, but is %d\n", sps->poc_type));
-		sps->log2_max_frame_num=0;
-		return -1;
+		AVC_SPS_BROKEN
 	}
 	sps->chroma_format = chroma_format_idc;
 	sps->luma_bit_depth_m8 = luma_bd;
@@ -5180,6 +5224,10 @@
 
 	if (sps->poc_type == 0) {
 		sps->log2_max_poc_lsb = gf_bs_read_ue_log(bs, "log2_max_poc_lsb") + 4;
+		//log2_max_poc_lsb shall be in the range of 0 to 12, inclusive
+		if (sps->log2_max_poc_lsb>16) {
+			AVC_SPS_BROKEN
+		}
 	}
 	else if (sps->poc_type == 1) {
 		sps->delta_pic_order_always_zero_flag = gf_bs_read_int_log(bs, 1, "delta_pic_order_always_zero_flag");
@@ -5187,15 +5235,14 @@
 		sps->offset_for_top_to_bottom_field = gf_bs_read_se_log(bs, "offset_for_top_to_bottom_field");
 		sps->poc_cycle_length = gf_bs_read_ue_log(bs, "poc_cycle_length");
 		if (sps->poc_cycle_length > GF_ARRAY_LENGTH(sps->offset_for_ref_frame)) {
-			sps->poc_cycle_length = 255;
 			GF_LOG(GF_LOG_ERROR, GF_LOG_CODING, ("avc-h264 offset_for_ref_frame overflow from poc_cycle_length\n"));
-			return -1;
+			AVC_SPS_BROKEN
 		}
 		for (i = 0; i < sps->poc_cycle_length; i++)
 			sps->offset_for_ref_framei = gf_bs_read_se_log_idx(bs, "offset_for_ref_frame", i);
 	}
 	if (sps->poc_type > 2) {
-		return -1;
+		AVC_SPS_BROKEN
 	}
 	sps->max_num_ref_frames = gf_bs_read_ue_log(bs, "max_num_ref_frames");
 	sps->gaps_in_frame_num_value_allowed_flag = gf_bs_read_int_log(bs, 1, "gaps_in_frame_num_value_allowed_flag");
@@ -5203,7 +5250,7 @@
 	mb_height = gf_bs_read_ue_log(bs, "pic_height_in_map_units_minus1") + 1;
 	//5.1 level max frame size in MBs is 36864, we set our limit at 16k x 16x pixels (eg 1 M MBs) for fuzzed stream detection
 	if ( (u64) mb_width * (u64) mb_height > 1000000) {
-		return -1;
+		AVC_SPS_BROKEN
 	}
 
 	sps->frame_mbs_only_flag = gf_bs_read_int_log(bs, 1, "frame_mbs_only_flag");
@@ -5228,7 +5275,7 @@
 		}
 
 		if (sps->ChromaArrayType == 0) {
-			assert(SubWidthC == -1);
+			gf_assert(SubWidthC == -1);
 			CropUnitX = 1;
 			CropUnitY = 2 - sps->frame_mbs_only_flag;
 		}
@@ -5315,11 +5362,13 @@
 
 		sps->vui.nal_hrd_parameters_present_flag = gf_bs_read_int_log(bs, 1, "nal_hrd_parameters_present_flag");
 		if (sps->vui.nal_hrd_parameters_present_flag)
-			if (avc_parse_hrd_parameters(bs, &sps->vui.hrd)<0) return -1;
+			if (avc_parse_hrd_parameters(bs, &sps->vui.hrd)<0)
+				AVC_SPS_BROKEN
 
 		sps->vui.vcl_hrd_parameters_present_flag = gf_bs_read_int_log(bs, 1, "vcl_hrd_parameters_present_flag");
 		if (sps->vui.vcl_hrd_parameters_present_flag)
-			if (avc_parse_hrd_parameters(bs, &sps->vui.hrd)<0) return -1;
+			if (avc_parse_hrd_parameters(bs, &sps->vui.hrd)<0)
+				AVC_SPS_BROKEN
 
 		if (sps->vui.nal_hrd_parameters_present_flag || sps->vui.vcl_hrd_parameters_present_flag)
 			sps->vui.low_delay_hrd_flag = gf_bs_read_int_log(bs, 1, "low_delay_hrd_flag");
@@ -5396,7 +5445,7 @@
 		}
 	}
 	if (gf_bs_is_overflow(bs))
-		return -1;
+		AVC_SPS_BROKEN
 	return sps_id;
 }
 
@@ -5439,6 +5488,11 @@
 	return sps_id;
 }
 
+#define AVC_PPS_BROKEN {\
+	memset(pps, 0, sizeof(AVC_PPS)); \
+	return -1;\
+	}
+
 static s32 gf_avc_read_pps_bs_internal(GF_BitStream *bs, AVCState *avc, u32 nal_hdr)
 {
 	s32 pps_id;
@@ -5461,12 +5515,13 @@
 	if (!pps->status) pps->status = 1;
 	pps->sps_id = gf_bs_read_ue_log(bs, "sps_id");
 	if ((pps->sps_id<0) || (pps->sps_id >= 32)) {
-		pps->sps_id = 0;
-		return -1;
+		AVC_PPS_BROKEN
 	}
 	/*sps_id may be refer to regular SPS or subseq sps, depending on the coded slice referring to the pps*/
-	if (!avc->spspps->sps_id.state && !avc->spspps->sps_id + GF_SVC_SSPS_ID_SHIFT.state) {
-		return -1;
+	if (!avc->spspps->sps_id.state
+		&& ((pps->sps_id + GF_SVC_SSPS_ID_SHIFT<32) && !avc->spspps->sps_id + GF_SVC_SSPS_ID_SHIFT.state)
+	) {
+		AVC_PPS_BROKEN
 	}
 	avc->pps_active_idx = pps->id; /*set active sps*/
 	avc->sps_active_idx = pps->sps_id; /*set active sps*/
@@ -5515,7 +5570,7 @@
 	pps->redundant_pic_cnt_present = gf_bs_read_int_log(bs, 1, "redundant_pic_cnt_present");
 
 	if (gf_bs_is_overflow(bs))
-		return -1;
+		AVC_PPS_BROKEN
 	return pps_id;
 }
 
@@ -5702,7 +5757,7 @@
 	if (si->sps->poc_type == 0) {
 		si->poc_lsb = gf_bs_read_int_log(bs, si->sps->log2_max_poc_lsb, "poc_lsb");
 		if (si->pps->pic_order_present && !si->field_pic_flag) {
-			si->delta_poc_bottom = gf_bs_read_se_log(bs, "poc_lsb");
+			si->delta_poc_bottom = gf_bs_read_se_log(bs, "delta_poc_bottom");
 		}
 	}
 	else if ((si->sps->poc_type == 1) && !si->sps->delta_pic_order_always_zero_flag) {
@@ -5735,7 +5790,7 @@
 	if (si->nal_unit_type == 20 || si->nal_unit_type == 21) {
 		//ref_pic_list_mvc_modification(); /* specified in Annex H */
 		GF_LOG(GF_LOG_ERROR, GF_LOG_CODING, ("avc-h264 unimplemented ref_pic_list_mvc_modification() in slide header\n"));
-		assert(0);
+		gf_assert(0);
 		return -1;
 	}
 	else {
@@ -5793,6 +5848,8 @@
 	si->pps->id = pps_id;
 	if (!si->pps->slice_group_count)
 		return -2;
+	if (si->pps->sps_id + GF_SVC_SSPS_ID_SHIFT>=32)
+		return -1;
 	si->sps = &avc->spssi->pps->sps_id + GF_SVC_SSPS_ID_SHIFT;
 	if (!si->sps->log2_max_frame_num)
 		return -2;
@@ -5850,7 +5907,7 @@
 
 	if (sps_id < 0) {
 		/*sps_active_idx equals -1 when no sps has been detected. In this case SEI should not be decoded.*/
-		assert(0);
+		gf_assert(0);
 		return 1;
 	}
 	if (avc->spssps_id.vui.nal_hrd_parameters_present_flag || avc->spssps_id.vui.vcl_hrd_parameters_present_flag) { /*CpbDpbDelaysPresentFlag, see 14496-10(2003) E.11*/
@@ -5903,7 +5960,6 @@
 }
 
 
-#if !defined(GPAC_DISABLE_HEVC)
 static void avc_parse_itu_t_t35_sei(GF_BitStream* bs, AVCSeiItuTT35DolbyVision *dovi)
 {
 	u8 itu_t_t35_country_code = gf_bs_read_u8(bs);
@@ -5914,7 +5970,6 @@
 		dovi->rpu_flag = GF_TRUE;
 	}
 }
-#endif
 
 static void avc_compute_poc(AVCSliceInfo *si)
 {
@@ -5940,6 +5995,8 @@
 		si->poc_lsb_prev = 0;
 		si->poc_msb_prev = 0;
 		si->frame_num_offset = 0;
+		si->frame_num_offset_prev = 0;
+		si->frame_num_prev = 0;
 	}
 	else {
 		if (si->frame_num < si->frame_num_prev)
@@ -6355,7 +6412,7 @@
 			//if result fits into source buffer, reformat
 			//otherwise ignore and return source (happens in some fuzzing cases, cf issue 1903)
 			if (dst_no_epb_size + nb_bytes_add <= nal_size)
-				nal_size = gf_media_nalu_add_emulation_bytes(buffer, dst_no_epb, dst_no_epb_size);
+				nal_size = gf_media_nalu_add_emulation_bytes(dst_no_epb, buffer, dst_no_epb_size);
 
 			gf_free(dst_no_epb);
 		}
@@ -6374,6 +6431,74 @@
 	return 0xFF;
 }
 
+static void sub_layer_hrd_parameters(GF_BitStream *bs, int subLayerId, u32 cpb_cnt, Bool sub_pic_hrd_params_present_flag, u32 idx1, u32 idx2)
+{
+	u32 i;
+	if (!gf_bs_available(bs)) return;
+
+	for (i = 0; i <= cpb_cnt; i++) {
+		gf_bs_read_ue_log_idx3(bs, "bit_rate_value_minus1", idx1, idx2, i);
+		gf_bs_read_ue_log_idx3(bs, "cpb_size_value_minus1", idx1, idx2, i);
+		if (sub_pic_hrd_params_present_flag) {
+			gf_bs_read_ue_log_idx3(bs, "cpb_size_du_value_minus1", idx1, idx2, i);
+			gf_bs_read_ue_log_idx3(bs, "bit_rate_du_value_minus1", idx1, idx2, i);
+		}
+		gf_bs_read_int_log_idx3(bs, 1, "cbr_flag", idx1, idx2, i);
+	}
+}
+
+static void hevc_parse_hrd_parameters(GF_BitStream *bs, Bool commonInfPresentFlag, int maxNumSubLayersMinus1, u32 idx)
+{
+	int i;
+	Bool nal_hrd_parameters_present_flag = GF_FALSE;
+	Bool vcl_hrd_parameters_present_flag = GF_FALSE;
+	Bool sub_pic_hrd_params_present_flag = GF_FALSE;
+
+	if (commonInfPresentFlag) {
+		nal_hrd_parameters_present_flag = gf_bs_read_int_log_idx(bs, 1, "nal_hrd_parameters_present_flag", idx);
+		vcl_hrd_parameters_present_flag = gf_bs_read_int_log_idx(bs, 1, "vcl_hrd_parameters_present_flag", idx);
+		if (nal_hrd_parameters_present_flag || vcl_hrd_parameters_present_flag) {
+			sub_pic_hrd_params_present_flag = gf_bs_read_int_log_idx(bs, 1, "sub_pic_hrd_params_present_flag", idx);
+			if (sub_pic_hrd_params_present_flag) {
+				gf_bs_read_int_log_idx(bs, 8, "tick_divisor_minus2", idx);
+				gf_bs_read_int_log_idx(bs, 5, "du_cpb_removal_delay_increment_length_minus1", idx);
+				gf_bs_read_int_log_idx(bs, 1, "sub_pic_cpb_params_in_pic_timing_sei_flag", idx);
+				gf_bs_read_int_log_idx(bs, 5, "dpb_output_delay_du_length_minus1", idx);
+			}
+			gf_bs_read_int_log_idx(bs, 4, "bit_rate_scale", idx);
+			gf_bs_read_int_log_idx(bs, 4, "cpb_size_scale", idx);
+			if (sub_pic_hrd_params_present_flag) {
+				gf_bs_read_int_log_idx(bs, 4, "cpb_size_du_scale", idx);
+			}
+			gf_bs_read_int_log_idx(bs, 5, "initial_cpb_removal_delay_length_minus1", idx);
+			gf_bs_read_int_log_idx(bs, 5, "au_cpb_removal_delay_length_minus1", idx);
+			gf_bs_read_int_log_idx(bs, 5, "dpb_output_delay_length_minus1", idx);
+		}
+	}
+	for (i = 0; i <= maxNumSubLayersMinus1; i++) {
+		Bool fixed_pic_rate_general_flag_i = gf_bs_read_int_log_idx(bs, 1, "fixed_pic_rate_general_flag", idx);
+		Bool fixed_pic_rate_within_cvs_flag_i = GF_TRUE;
+		Bool low_delay_hrd_flag_i = GF_FALSE;
+		u32 cpb_cnt_minus1_i = 0;
+		if (!fixed_pic_rate_general_flag_i) {
+			fixed_pic_rate_within_cvs_flag_i = gf_bs_read_int_log_idx(bs, 1, "fixed_pic_rate_within_cvs_flag", idx);
+		}
+		if (fixed_pic_rate_within_cvs_flag_i)
+			gf_bs_read_ue_log_idx(bs, "elemental_duration_in_tc_minus1", idx);
+		else
+			low_delay_hrd_flag_i = gf_bs_read_int_log_idx(bs, 1, "low_delay_hrd_flag", idx);
+		if (!low_delay_hrd_flag_i) {
+			cpb_cnt_minus1_i = gf_bs_read_ue_log_idx(bs, "cpb_cnt_minus1", idx);
+		}
+		if (nal_hrd_parameters_present_flag) {
+			sub_layer_hrd_parameters(bs, i, cpb_cnt_minus1_i, sub_pic_hrd_params_present_flag, idx, i);
+		}
+		if (vcl_hrd_parameters_present_flag) {
+			sub_layer_hrd_parameters(bs, i, cpb_cnt_minus1_i, sub_pic_hrd_params_present_flag, idx, i);
+		}
+	}
+}
+
 static void avc_hevc_vvc_rewrite_vui(GF_VUIInfo *vui_info, GF_BitStream *orig, GF_BitStream *mod, GF_CodecID codec)
 {
 	/* VUI present flag*/
@@ -6520,6 +6645,8 @@
 					poc_proportional_to_timing_flag = gf_bs_read_int(orig, 1);
 					if (poc_proportional_to_timing_flag)
 						/*vui_num_ticks_poc_diff_one_minus1 = */gf_bs_read_ue(orig);
+					if (/*vui_hrd_parameters_present_flag = */gf_bs_read_int(orig, 1))
+						hevc_parse_hrd_parameters(orig, GF_TRUE, 0/*assumes max_sub_layers_minus1=0*/, 0);
 
 					//LAST bit read for HEVC
 				}
@@ -6772,24 +6899,24 @@
 
 GF_Err gf_avc_change_vui(GF_AVCConfig *avcc, GF_VUIInfo *vui_info)
 {
-	GF_BitStream *orig, *mod;
 	AVCState avc;
 	u32 i, bit_offset, flag;
 	s32 idx;
 	GF_AVCConfigSlot *slc;
-	orig = NULL;
+
+	if (!avcc)
+		return GF_NON_COMPLIANT_BITSTREAM;
 
 	memset(&avc, 0, sizeof(AVCState));
 	avc.sps_active_idx = -1;
 
 	i=0;
 	while ((slc = (GF_AVCConfigSlot *)gf_list_enum(avcc->sequenceParameterSets, &i))) {
+		GF_BitStream *orig, *mod;
 		u8 *no_emulation_buf = NULL;
 		u32 no_emulation_buf_size = 0, emulation_bytes = 0;
 		idx = gf_avc_read_sps(slc->data, slc->size, &avc, 0, &bit_offset);
 		if (idx<0) {
-			if ( orig )
-				gf_bs_del(orig);
 			continue;
 		}
 
@@ -6803,8 +6930,7 @@
 		mod = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
 
 		/*copy over till vui flag*/
-		assert(bit_offset >= 8);
-		while (bit_offset - 8/*bit_offset doesn't take care of the first byte (NALU type)*/) {
+		while (bit_offset > 8/*bit_offset doesn't take care of the first byte (NALU type)*/) {
 			flag = gf_bs_read_int(orig, 1);
 			gf_bs_write_int(mod, flag, 1);
 			bit_offset--;
@@ -6909,8 +7035,6 @@
 	return e;
 }
 
-#ifndef GPAC_DISABLE_HEVC
-
 /**********
 HEVC parsing
 **********/
@@ -6964,7 +7088,9 @@
 		if (idx_rps == sps->num_short_term_ref_pic_sets)
 			delta_idx_minus1 = gf_bs_read_ue_log_idx(bs, "delta_idx_minus1", idx_rps);
 
-		assert(delta_idx_minus1 <= idx_rps - 1);
+		if (delta_idx_minus1 > idx_rps - 1)
+			return GF_FALSE;
+
 		ref_idx = idx_rps - 1 - delta_idx_minus1;
 		delta_rps_sign = gf_bs_read_int_log_idx(bs, 1, "delta_rps_sign", idx_rps);
 		abs_delta_rps_minus1 = gf_bs_read_ue_log_idx(bs, "abs_delta_rps_minus1", idx_rps);
@@ -6983,10 +7109,16 @@
 			}
 			if ((ref_idc == 1) || (ref_idc == 2)) {
 				s32 deltaPOC = deltaRPS;
-				if (i < nb_ref_pics)
-					deltaPOC += ref_ps->delta_poci;
+				if ((i < nb_ref_pics) && (i<16)) {
+					if ((ref_ps->delta_poci > 0 && deltaPOC > GF_INT_MAX - ref_ps->delta_poci) ||
+						(ref_ps->delta_poci < 0 && deltaPOC < GF_INT_MIN - ref_ps->delta_poci) )
 
-				rps->delta_pock = deltaPOC;
+						return GF_FALSE;
+
+					deltaPOC += ref_ps->delta_poci;
+				}
+				if (k<16)
+					rps->delta_pock = deltaPOC;
 
 				if (deltaPOC < 0)  k0++;
 				else k1++;
@@ -7010,7 +7142,7 @@
 			poc = prev - delta_poc_s0_minus1 - 1;
 			prev = poc;
 			sps->rpsidx_rps.delta_poci = poc;
-			gf_bs_read_int_log_idx2(bs, 1, "delta_poc_s0_minus1", idx_rps, i);
+			gf_bs_read_int_log_idx2(bs, 1, "used_by_curr_pic_s0_flag", idx_rps, i);
 		}
 		for (i = 0; i < sps->rpsidx_rps.num_positive_pics; i++) {
 			u32 delta_poc_s1_minus1 = gf_bs_read_ue_log_idx2(bs, "delta_poc_s1_minus1" , idx_rps, i);
@@ -7030,7 +7162,7 @@
 	u8 luma_weights20, chroma_weights20;
 	u32 ChromaArrayType = sps->separate_colour_plane_flag ? 0 : sps->chroma_format_idc;
 
-	num_ref_idx = num_ref_idx_l0_active;
+	num_ref_idx = num_ref_idx_l0_active < 20 ? num_ref_idx_l0_active : 19 ;
 
 	gf_bs_read_ue_log(bs, "luma_log2_weight_denom");
 	if (ChromaArrayType != 0)
@@ -7064,7 +7196,7 @@
 	if (si->slice_type == GF_HEVC_SLICE_TYPE_B) {
 		if (!first_pass) return;
 		first_pass = GF_FALSE;
-		num_ref_idx = num_ref_idx_l1_active;
+		num_ref_idx = num_ref_idx_l1_active < 20 ? num_ref_idx_l1_active : 19 ;
 		goto parse_weights;
 	}
 }
@@ -7204,6 +7336,7 @@
 					num_long_term_sps = gf_bs_read_ue_log(bs, "num_long_term_sps");
 				}
 				num_long_term_pics = gf_bs_read_ue_log(bs, "num_long_term_pics");
+				if (num_long_term_sps+num_long_term_pics>32) return -1;
 
 				for (i = 0; i < num_long_term_sps + num_long_term_pics; i++) {
 					if (i < num_long_term_sps) {
@@ -7642,13 +7775,19 @@
 		}
 
 		if (splitting_flag) {
-			for (i = 0; i < num_scalability_types; i++) {
+			u32 num_bits=0;
+			for (i = 0; i < num_scalability_types-1; i++) {
 				dim_bit_offseti = 0;
+				num_bits+=dimension_id_leni;
 				for (j = 0; j < i; j++)
 					dim_bit_offseti += dimension_id_lenj;
 			}
-			dimension_id_lennum_scalability_types - 1 = 1 + (5 - dim_bit_offsetnum_scalability_types - 1);
-			dim_bit_offsetnum_scalability_types = 6;
+			if (num_bits>=6) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CODING, ("HEVC Too many bits defined for dimension IDs (%d vs 5 max)\n", num_bits));
+				return GF_FALSE;
+			}
+			dimension_id_lennum_scalability_types - 1 = 6 - num_bits; //1 + (5 - dim_bit_offsetnum_scalability_types - 1);
+			dim_bit_offsetnum_scalability_types - 1 = 6;
 		}
 	}
 
@@ -7662,10 +7801,10 @@
 		else {
 			vps->layer_id_in_nuhi = i;
 		}
-		if (vps->layer_id_in_nuhi > MAX_LHVC_LAYERS) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_CODING, ("HEVC %d layers in VPS ext but only %d supported in GPAC\n", vps->layer_id_in_nuhi, MAX_LHVC_LAYERS));
+		if (vps->layer_id_in_nuhi >= MAX_LHVC_LAYERS) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CODING, ("HEVC %d layers in VPS ext but only %d supported in GPAC\n", 1+vps->layer_id_in_nuhi, MAX_LHVC_LAYERS));
 			vps->layer_id_in_nuhi = 0;
-			return -1;
+			return GF_FALSE;
 		}
 		vps->layer_id_in_vpsvps->layer_id_in_nuhi = i;
 
@@ -7677,9 +7816,15 @@
 	}
 
 	if (splitting_flag) {
+		if (num_scalability_types==16)
+			return GF_FALSE;
 		for (i = 0; i < vps->max_layers; i++)
-			for (j = 0; j < num_scalability_types; j++)
-				vps->dimension_idij = ((vps->layer_id_in_nuhi & ((1 << dim_bit_offsetj + 1) - 1)) >> dim_bit_offsetj);
+			for (j = 0; j < num_scalability_types; j++) {
+				if (dim_bit_offsetj + 1 <= 31)
+					vps->dimension_idij = ((vps->layer_id_in_nuhi & ((1 << dim_bit_offsetj + 1) - 1)) >> dim_bit_offsetj);
+				else
+					return GF_FALSE;
+			}
 	}
 	else {
 		for (j = 0; j < num_scalability_types; j++)
@@ -7916,73 +8061,10 @@
 	return GF_TRUE;
 }
 
-static void sub_layer_hrd_parameters(GF_BitStream *bs, int subLayerId, u32 cpb_cnt, Bool sub_pic_hrd_params_present_flag, u32 idx1, u32 idx2)
-{
-	u32 i;
-	if (!gf_bs_available(bs)) return;
-
-	for (i = 0; i <= cpb_cnt; i++) {
-		gf_bs_read_ue_log_idx3(bs, "bit_rate_value_minus1", idx1, idx2, i);
-		gf_bs_read_ue_log_idx3(bs, "cpb_size_value_minus1", idx1, idx2, i);
-		if (sub_pic_hrd_params_present_flag) {
-			gf_bs_read_ue_log_idx3(bs, "cpb_size_du_value_minus1", idx1, idx2, i);
-			gf_bs_read_ue_log_idx3(bs, "bit_rate_du_value_minus1", idx1, idx2, i);
-		}
-		gf_bs_read_int_log_idx3(bs, 1, "cbr_flag", idx1, idx2, i);
-	}
-}
-
-static void hevc_parse_hrd_parameters(GF_BitStream *bs, Bool commonInfPresentFlag, int maxNumSubLayersMinus1, u32 idx)
-{
-	int i;
-	Bool nal_hrd_parameters_present_flag = GF_FALSE;
-	Bool vcl_hrd_parameters_present_flag = GF_FALSE;
-	Bool sub_pic_hrd_params_present_flag = GF_FALSE;
-
-	if (commonInfPresentFlag) {
-		nal_hrd_parameters_present_flag = gf_bs_read_int_log_idx(bs, 1, "nal_hrd_parameters_present_flag", idx);
-		vcl_hrd_parameters_present_flag = gf_bs_read_int_log_idx(bs, 1, "vcl_hrd_parameters_present_flag", idx);
-		if (nal_hrd_parameters_present_flag || vcl_hrd_parameters_present_flag) {
-			sub_pic_hrd_params_present_flag = gf_bs_read_int_log_idx(bs, 1, "sub_pic_hrd_params_present_flag", idx);
-			if (sub_pic_hrd_params_present_flag) {
-				gf_bs_read_int_log_idx(bs, 8, "tick_divisor_minus2", idx);
-				gf_bs_read_int_log_idx(bs, 5, "du_cpb_removal_delay_increment_length_minus1", idx);
-				gf_bs_read_int_log_idx(bs, 1, "sub_pic_cpb_params_in_pic_timing_sei_flag", idx);
-				gf_bs_read_int_log_idx(bs, 5, "dpb_output_delay_du_length_minus1", idx);
-			}
-			gf_bs_read_int_log_idx(bs, 4, "bit_rate_scale", idx);
-			gf_bs_read_int_log_idx(bs, 4, "cpb_size_scale", idx);
-			if (sub_pic_hrd_params_present_flag) {
-				gf_bs_read_int_log_idx(bs, 4, "cpb_size_du_scale", idx);
-			}
-			gf_bs_read_int_log_idx(bs, 5, "initial_cpb_removal_delay_length_minus1", idx);
-			gf_bs_read_int_log_idx(bs, 5, "au_cpb_removal_delay_length_minus1", idx);
-			gf_bs_read_int_log_idx(bs, 5, "dpb_output_delay_length_minus1", idx);
-		}
-	}
-	for (i = 0; i <= maxNumSubLayersMinus1; i++) {
-		Bool fixed_pic_rate_general_flag_i = gf_bs_read_int_log_idx(bs, 1, "fixed_pic_rate_general_flag", idx);
-		Bool fixed_pic_rate_within_cvs_flag_i = GF_TRUE;
-		Bool low_delay_hrd_flag_i = GF_FALSE;
-		u32 cpb_cnt_minus1_i = 0;
-		if (!fixed_pic_rate_general_flag_i) {
-			fixed_pic_rate_within_cvs_flag_i = gf_bs_read_int_log_idx(bs, 1, "fixed_pic_rate_within_cvs_flag", idx);
-		}
-		if (fixed_pic_rate_within_cvs_flag_i)
-			gf_bs_read_ue_log_idx(bs, "elemental_duration_in_tc_minus1", idx);
-		else
-			low_delay_hrd_flag_i = gf_bs_read_int_log_idx(bs, 1, "low_delay_hrd_flag", idx);
-		if (!low_delay_hrd_flag_i) {
-			cpb_cnt_minus1_i = gf_bs_read_ue_log_idx(bs, "cpb_cnt_minus1", idx);
-		}
-		if (nal_hrd_parameters_present_flag) {
-			sub_layer_hrd_parameters(bs, i, cpb_cnt_minus1_i, sub_pic_hrd_params_present_flag, idx, i);
-		}
-		if (vcl_hrd_parameters_present_flag) {
-			sub_layer_hrd_parameters(bs, i, cpb_cnt_minus1_i, sub_pic_hrd_params_present_flag, idx, i);
-		}
+#define HEVC_VPS_BROKEN {\
+	memset(vps, 0, sizeof(HEVC_VPS)); \
+	return -1;\
 	}
-}
 
 static s32 gf_hevc_read_vps_bs_internal(GF_BitStream *bs, HEVCState *hevc, Bool stop_at_vps_ext)
 {
@@ -8009,8 +8091,7 @@
 	vps->max_layers = 1 + gf_bs_read_int_log(bs, 6, "max_layers_minus1");
 	if (vps->max_layers > MAX_LHVC_LAYERS) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_CODING, ("HEVC %d layers in VPS but only %d supported in GPAC\n", vps->max_layers, MAX_LHVC_LAYERS));
-		vps->max_layers = MAX_LHVC_LAYERS;
-		return -1;
+		HEVC_VPS_BROKEN
 	}
 	vps->max_sub_layers = gf_bs_read_int_log(bs, 3, "max_sub_layers_minus1") + 1;
 	vps->temporal_id_nesting = gf_bs_read_int_log(bs, 1, "temporal_id_nesting");
@@ -8026,13 +8107,12 @@
 	vps->max_layer_id = gf_bs_read_int_log(bs, 6, "max_layer_id");
 	if (vps->max_layer_id >= MAX_LHVC_LAYERS) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_CODING, ("HEVC VPS max layer ID %u but GPAC only supports %u\n", vps->max_layer_id, MAX_LHVC_LAYERS));
-		vps->max_layer_id = 0;
-		return -1;
+		HEVC_VPS_BROKEN
 	}
 	vps->num_layer_sets = gf_bs_read_ue_log(bs, "num_layer_sets_minus1") + 1;
 	if (vps->num_layer_sets > MAX_LHVC_LAYERS) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_CODING, ("HEVC Wrong number of layer sets in VPS %d\n", vps->num_layer_sets));
-		return -1;
+		HEVC_VPS_BROKEN
 	}
 	for (i = 1; i < vps->num_layer_sets; i++) {
 		for (j = 0; j <= vps->max_layer_id; j++) {
@@ -8079,7 +8159,7 @@
 		res = hevc_parse_vps_extension(vps, bs);
 		if (res != GF_TRUE) {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_CODING, ("HEVC Failed to parse VPS extensions\n"));
-			return -1;
+			HEVC_VPS_BROKEN
 		}
 		if (gf_bs_read_int_log(bs, 1, "vps_extension2_flag")) {
 #if 0
@@ -8212,6 +8292,11 @@
 	{ 64, 33 }, { 160,99 }, { 4,3}, { 3,2}, { 2,1}
 };
 
+#define HEVC_SPS_BROKEN {\
+	memset(sps, 0, sizeof(HEVC_SPS)); \
+	return -1;\
+	}
+
 static s32 gf_hevc_read_sps_bs_internal(GF_BitStream *bs, HEVCState *hevc, u8 layer_id, u32 *vui_flag_pos)
 {
 	s32 vps_id, sps_id = -1;
@@ -8246,6 +8331,7 @@
 	if ((sps_id < 0) || (sps_id >= 16)) {
 		return -1;
 	}
+	if (!hevc) return sps_id;
 
 	sps = &hevc->spssps_id;
 	if (!sps->state) {
@@ -8255,8 +8341,8 @@
 	}
 	sps->ptl = ptl;
 	vps = &hevc->vpsvps_id;
-	sps->max_sub_layers_minus1 = 0;
-	sps->sps_ext_or_max_sub_layers_minus1 = 0;
+	sps->max_sub_layers_minus1 = max_sub_layers_minus1;
+	sps->sps_ext_or_max_sub_layers_minus1 = sps_ext_or_max_sub_layers_minus1;
 
 	/* default values */
 	sps->colour_primaries = 2;
@@ -8277,8 +8363,7 @@
 		}
 		if (sps->rep_format_idx>15) {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_CODING, ("HEVC Invalid rep_format_idx index %d\n", sps->rep_format_idx));
-			sps->rep_format_idx=0;
-			return -1;
+			HEVC_SPS_BROKEN
 		}
 		sps->width = vps->rep_formatssps->rep_format_idx.pic_width_luma_samples;
 		sps->height = vps->rep_formatssps->rep_format_idx.pic_height_luma_samples;
@@ -8325,8 +8410,7 @@
 	sps->log2_max_pic_order_cnt_lsb = 4 + gf_bs_read_ue_log(bs, "log2_max_pic_order_cnt_lsb_minus4");
 	if (sps->log2_max_pic_order_cnt_lsb>16) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_CODING, ("HEVC Invalid log2_max_pic_order_cnt_lsb_minus4 %d, max shall be 12\n", sps->log2_max_pic_order_cnt_lsb-4));
-		sps->log2_max_pic_order_cnt_lsb = 16;
-		return -1;
+		HEVC_SPS_BROKEN
 	}
 
 	if (!multiLayerExtSpsFlag) {
@@ -8342,13 +8426,19 @@
 	sps->log2_diff_max_min_luma_coding_block_size = gf_bs_read_ue_log(bs, "log2_diff_max_min_luma_coding_block_size");
 	//we allow more than in max profile, but make sure we don't overflow max CU W/H compute below
 	if (sps->log2_min_luma_coding_block_size + sps->log2_diff_max_min_luma_coding_block_size >= 30) {
-		return -1;
+		HEVC_SPS_BROKEN
 	}
 	sps->max_CU_width = (1 << (sps->log2_min_luma_coding_block_size + sps->log2_diff_max_min_luma_coding_block_size));
 	sps->max_CU_height = (1 << (sps->log2_min_luma_coding_block_size + sps->log2_diff_max_min_luma_coding_block_size));
 
 	sps->log2_min_transform_block_size = 2 + gf_bs_read_ue_log(bs, "log2_min_transform_block_size_minus2");
 	sps->log2_max_transform_block_size = sps->log2_min_transform_block_size  + gf_bs_read_ue_log(bs, "log2_max_transform_block_size");
+	//The CVS shall not contain data that result in MinTbLog2SizeY greater than or equal to MinCbLog2SizeY
+	if (sps->log2_min_transform_block_size/*MinTbLog2SizeY*/ >= sps->log2_min_luma_coding_block_size/*MinCbLog2SizeY*/)
+		HEVC_SPS_BROKEN
+	//The CVS shall not contain data that result in MaxTbLog2SizeY greater than Min( CtbLog2SizeY, 5 ).
+	if (sps->log2_max_transform_block_size /*MaxTbLog2SizeY*/ > MIN( sps->log2_min_luma_coding_block_size+ sps->log2_diff_max_min_luma_coding_block_size /*CtbLog2SizeY*/, 5 ))
+		HEVC_SPS_BROKEN
 
 	depth = 0;
 	sps->max_transform_hierarchy_depth_inter = gf_bs_read_ue_log(bs, "max_transform_hierarchy_depth_inter");
@@ -8363,6 +8453,8 @@
 	sps->bitsSliceSegmentAddress = 0;
 	while (nb_CTUs > (u32)(1 << sps->bitsSliceSegmentAddress)) {
 		sps->bitsSliceSegmentAddress++;
+		if (sps->bitsSliceSegmentAddress==31)
+			HEVC_SPS_BROKEN
 	}
 
 	sps->scaling_list_enable_flag = gf_bs_read_int_log(bs, 1, "scaling_list_enable_flag");
@@ -8394,7 +8486,7 @@
 	sps->num_short_term_ref_pic_sets = gf_bs_read_ue_log(bs, "num_short_term_ref_pic_sets");
 	if (sps->num_short_term_ref_pic_sets > 64) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_CODING, ("HEVC Invalid number of short term reference picture sets %d\n", sps->num_short_term_ref_pic_sets));
-		return -1;
+		HEVC_SPS_BROKEN
 	}
 
 	for (i = 0; i < sps->num_short_term_ref_pic_sets; i++) {
@@ -8402,7 +8494,7 @@
 		/*cannot parse short_term_ref_pic_set, skip VUI parsing*/
 		if (!ret) {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_CODING, ("HEVC Invalid short_term_ref_pic_set\n"));
-			return -1;
+			HEVC_SPS_BROKEN
 		}
 	}
 	sps->long_term_ref_pics_present_flag = gf_bs_read_int_log(bs, 1, "long_term_ref_pics_present_flag");
@@ -8497,7 +8589,7 @@
 
 	}
 	if (gf_bs_is_overflow(bs))
-		return -1;
+		HEVC_SPS_BROKEN
 	return sps_id;
 }
 
@@ -8538,6 +8630,10 @@
 	return gf_hevc_read_sps_bs_internal(bs, hevc, layer_id, NULL);
 }
 
+#define HEVC_PPS_BROKEN {\
+	memset(pps, 0, sizeof(HEVC_PPS)); \
+	return -1;\
+	}
 
 static s32 gf_hevc_read_pps_bs_internal(GF_BitStream *bs, HEVCState *hevc)
 {
@@ -8561,8 +8657,7 @@
 	pps->sps_id = gf_bs_read_ue_log(bs, "sps_id");
 	if (((s32)pps->sps_id<0) || (pps->sps_id >= 16)) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_CODING, ("HEVC wrong SPS ID %d in PPS\n", pps->sps_id));
-		pps->sps_id=0;
-		return -1;
+		HEVC_PPS_BROKEN
 	}
 	hevc->sps_active_idx = pps->sps_id; /*set active sps*/
 	pps->dependent_slice_segments_enabled_flag = gf_bs_read_int_log(bs, 1, "dependent_slice_segments_enabled_flag");
@@ -8591,12 +8686,12 @@
 		pps->num_tile_columns = 1 + gf_bs_read_ue_log(bs, "num_tile_columns_minus1");
 		if (pps->num_tile_columns > 22) {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_CODING, ("HEVC Invalid num_tile_columns %u\n", pps->num_tile_columns));
-			return -1;
+			HEVC_PPS_BROKEN
 		}
 		pps->num_tile_rows = 1 + gf_bs_read_ue_log(bs, "num_tile_rows_minus1");
 		if (pps->num_tile_rows > 20) {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_CODING, ("HEVC Invalid num_tile_rows %u\n", pps->num_tile_rows));
-			return -1;
+			HEVC_PPS_BROKEN
 		}
 		pps->uniform_spacing_flag = gf_bs_read_int_log(bs, 1, "uniform_spacing_flag");
 		if (!pps->uniform_spacing_flag) {
@@ -8633,7 +8728,7 @@
 	}
 
 	if (gf_bs_is_overflow(bs))
-		return -1;
+		HEVC_PPS_BROKEN
 	return pps_id;
 }
 
@@ -8837,7 +8932,6 @@
 		mod = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
 
 		/*copy over till vui flag*/
-		assert(bit_offset >= 0);
 		while (bit_offset) {
 			flag = gf_bs_read_int(orig, 1);
 			gf_bs_write_int(mod, flag, 1);
@@ -8927,9 +9021,6 @@
 	return gf_hevc_get_sps_info_with_state(&hevc, sps_data, sps_size, sps_id, width, height, par_n, par_d);
 }
 
-
-#endif //GPAC_DISABLE_HEVC
-
 static u32 AC3_FindSyncCode(u8 *buf, u32 buflen)
 {
 	u32 end = buflen - 6;
@@ -9158,7 +9249,6 @@
 	Bool main_indep_found = GF_FALSE;
 	s32 cur_main_id = -1;
 	u32 nb_blocks_main;
-	u32 cur_main_ac3 = 0;
 	u16 main_substreams; //bit-mask of independent channels found so far
 	static u32 numblks4 = {1, 2, 3, 6};
 
@@ -9207,7 +9297,6 @@
 		}
 		main_indep_found = GF_TRUE;
 		cur_main_id = 0;
-		cur_main_ac3 = 1;
 		goto next_block;
 	}
 	//corrupted frame, trash
@@ -9231,7 +9320,6 @@
 
 	//independent stream
 	if (strmtyp!=0x1) {
-		cur_main_ac3 = 0;
 		//all blocks gathered and we have seen this substreamid, done with whole frame
 		if ( (nb_blocks_main>=6) && ( (main_substreams >> substreamid) & 0x1)) {
 			eac3_update_channels(hdr);
@@ -9256,14 +9344,9 @@
 		}
 		goto retry_frame;
 	}
-	//quick hack (not sure if the spec forbids this): some AC3+EAC3 streams use substreamid=0 for the eac3
-	//which breaks nb_dep_sub / chan_loc signaling
-	//we increase by one in this case
-	if (cur_main_ac3 && !substreamid) cur_main_ac3=2;
-	if (cur_main_ac3==2) substreamid++;
 
 	frmsiz = gf_bs_read_int_log(bs, 11, "frmsiz");
-	framesize += 2 * (1 + frmsiz);
+	framesize = 2 * (1 + frmsiz);
 	fscod = gf_bs_read_int_log(bs, 2, "fscod");
 	if (fscod == 0x3) {
 		fscod = gf_bs_read_int_log(bs, 2, "fscod2");
@@ -9317,7 +9400,7 @@
 	hdr->sample_rate = freq;
 	hdr->framesize += framesize;
 	if (strmtyp != 1) {
-		assert(cur_main_id == substreamid);
+		gf_assert(cur_main_id == substreamid);
 		hdr->streamssubstreamid.lfon = lfon;
 		hdr->streamssubstreamid.bsid = bsid;
 		hdr->streamssubstreamid.bsmod = bsmod;
@@ -9328,8 +9411,9 @@
 			hdr->nb_streams++;
 	}
 	//dependent stream, record max substream ID of dep and store chan map
+	//"Dependent substreams are assigned substream ID's 0 to 7, which shall be assigned sequentially according to the order the dependent substreams are present in the bit stream. "
 	else {
-		hdr->streamscur_main_id.nb_dep_sub = substreamid;
+		hdr->streamscur_main_id.nb_dep_sub = 1+substreamid;
 		hdr->streamscur_main_id.chan_loc |= chanmap;
 	}
 
@@ -9674,7 +9758,11 @@
 			gf_free(class_dims);
 		}
 		else {
-			oggpack_read(&opb, 8 + 16 + 16 + 6 + 8);
+			oggpack_read(&opb, 8);
+			oggpack_read(&opb, 16);
+			oggpack_read(&opb, 16);
+			oggpack_read(&opb, 6);
+			oggpack_read(&opb, 8);
 			nb_books = oggpack_read(&opb, 4) + 1;
 			for (j = 0; j < nb_books; j++)
 				oggpack_read(&opb, 8);
@@ -9853,9 +9941,9 @@
         return 0;
     if (!header)
         return 0;
-    if (!memcmp(data, "OpusHead", sizeof(char)*8))
+    if (data_length>=8 && !memcmp(data, "OpusHead", sizeof(char)*8))
         return 0;
-    if (!memcmp(data, "OpusTags", sizeof(char)*8))
+    if (data_length>=8 && !memcmp(data, "OpusTags", sizeof(char)*8))
         return 0;
 
     GF_LOG(GF_LOG_DEBUG, GF_LOG_CODING, ("Processing Opus packet, self: %d, size %d\n", self_delimited, data_length));
@@ -10320,6 +10408,11 @@
 	}
 }
 
+#define VVC_VPS_BROKEN {\
+	memset(vps, 0, sizeof(VVC_VPS)); \
+	return -1;\
+	}
+
 static s32 gf_vvc_read_vps_bs_internal(GF_BitStream *bs, VVCState *vvc, Bool stop_at_vps_ext)
 {
 	u32 i, j;
@@ -10342,8 +10435,7 @@
 	vps->max_layers = 1 + gf_bs_read_int_log(bs, 6, "max_layers");
 	if (vps->max_layers > VVC_MAX_LAYERS) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_CODING, ("VVC %d layers in VPS but only %d supported in GPAC\n", vps->max_layers, VVC_MAX_LAYERS));
-		vps->max_layers = VVC_MAX_LAYERS;
-		return -1;
+		VVC_VPS_BROKEN
 	}
 	vps->max_sub_layers = gf_bs_read_int_log(bs, 3, "max_sub_layers_minus1") + 1;
 
@@ -10410,7 +10502,7 @@
 
 
 	if (gf_bs_is_overflow(bs))
-		return -1;
+		VVC_VPS_BROKEN
 	return vps_id;
 }
 
@@ -10528,6 +10620,20 @@
 	}
 }
 
+#define VVC_SPS_BROKEN {\
+	memset(sps, 0, sizeof(VVC_SPS)); \
+	return -1;\
+	}
+
+static u32 vvc_ceillog2(u32 val)
+{
+	u32 maxBits=0;
+	while (val > (u32)(1 << maxBits)) {
+		maxBits++;
+	}
+	return maxBits;
+}
+
 static s32 gf_vvc_read_sps_bs_internal(GF_BitStream *bs, VVCState *vvc, u8 layer_id, u32 *vui_flag_pos)
 {
 	s32 vps_id, sps_id;
@@ -10606,26 +10712,35 @@
 	sps->subpic_info_present = gf_bs_read_int_log(bs, 1, "subpic_info_present");
 	if (sps->subpic_info_present) {
 		sps->nb_subpics = 1 + gf_bs_read_ue_log(bs, "nb_subpics_minus1");
+		if (sps->nb_subpics>1000) VVC_SPS_BROKEN
+		if (sps->nb_subpics>VVC_MAX_SUBPIC) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CODING, ("VVC Maximum subpics supported by GPAC is %u, got %u\n", VVC_MAX_SUBPIC, sps->nb_subpics));
+			VVC_SPS_BROKEN
+		}
+
 		if (sps->nb_subpics>1) {
-			u32 tmpWidthVal, tmpHeightVal;
+			u32 tmpWidthBits, tmpHeightBits;
 			sps->independent_subpic_flags = gf_bs_read_int_log(bs, 1, "independent_subpic_flags");
 			sps->subpic_same_size = gf_bs_read_int_log(bs, 1, "subpic_same_size");
 
-			tmpWidthVal = (sps->width + CtbSizeY-1) / CtbSizeY;
-			tmpWidthVal = gf_get_bit_size(tmpWidthVal);
-			tmpHeightVal = (sps->height + CtbSizeY-1) / CtbSizeY;
-			tmpHeightVal = gf_get_bit_size(tmpHeightVal);
+			tmpWidthBits = vvc_ceillog2((sps->width + CtbSizeY-1) / CtbSizeY);
+			tmpHeightBits = vvc_ceillog2((sps->height + CtbSizeY-1) / CtbSizeY);
 
 			for (i=0; i<sps->nb_subpics; i++) {
+				VVC_SubpicInfo *sp = &sps->subpicsi;
+				sp->id = i;
 				if( !sps->subpic_same_size || !i) {
 					if (i && (sps->width > CtbSizeY))
-						gf_bs_read_int_log(bs, tmpWidthVal, "subpic_ctu_top_left_x");
+						sp->x = gf_bs_read_int_log(bs, tmpWidthBits, "subpic_ctu_top_left_x");
 					if (i && (sps->height > CtbSizeY))
-						gf_bs_read_int_log(bs, tmpHeightVal, "subpic_ctu_top_left_y");
+						sp->y = gf_bs_read_int_log(bs, tmpHeightBits, "subpic_ctu_top_left_y");
 					if ((i+1 < sps->nb_subpics) && (sps->width > CtbSizeY))
-						gf_bs_read_int_log(bs, tmpWidthVal, "subpic_width_minus1");
+						sp->w = 1 + gf_bs_read_int_log(bs, tmpWidthBits, "subpic_width_minus1");
 					if ((i+1 < sps->nb_subpics) && (sps->height > CtbSizeY))
-						gf_bs_read_int_log(bs, tmpHeightVal, "subpic_height_minus1");
+						sp->h = 1 + gf_bs_read_int_log(bs, tmpHeightBits, "subpic_height_minus1");
+				} else {
+					sp->w = sps->subpics0.w;
+					sp->h = sps->subpics0.h;
 				}
 				if (!sps->independent_subpic_flags) {
 					gf_bs_read_int_log(bs, 1, "subpic_treated_as_pic_flag");
@@ -10638,7 +10753,8 @@
 				sps->subpicid_mapping_present = gf_bs_read_int_log(bs, 1, "subpic_id_mapping_present_flag");
 				if (sps->subpicid_mapping_present) {
 					for (i=0; i<sps->nb_subpics; i++) {
-						gf_bs_read_ue_log(bs, "subpic_id");
+						VVC_SubpicInfo *sp = &sps->subpicsi;
+						sp->id = gf_bs_read_int_log_idx(bs, sps->subpicid_len, "subpic_id", i);
 					}
 				}
 			}
@@ -10747,10 +10863,11 @@
 	for (i=0; i<sps_rpl1_same_as_rpl0; i++) {
 		u32 j;
 		sps->num_ref_pic_listsi = gf_bs_read_ue_log_idx(bs, "sps_num_ref_pic_lists", i);
-		if (sps->num_ref_pic_listsi > 64) return -1;
+		if (sps->num_ref_pic_listsi > 64) VVC_SPS_BROKEN
+
 		for (j=0; j<sps->num_ref_pic_listsi; j++) {
 			s32 res = vvc_parse_ref_pic_list_struct(bs, sps, i, j, &sps->rpsij);
-			if (res<0) return res;
+			if (res<0) VVC_SPS_BROKEN
 		}
 	}
 	gf_bs_read_int_log(bs, 1, "sps_ref_wraparound_enabled_flag");
@@ -10917,10 +11034,16 @@
 	}
 
 	if (gf_bs_is_overflow(bs))
-		return -1;
+		VVC_SPS_BROKEN
 	return sps_id;
 }
 
+#define VVC_PPS_BROKEN {\
+	memset(pps, 0, sizeof(VVC_PPS)); \
+	return -1;\
+	}
+
+
 static s32 gf_vvc_read_pps_bs_internal(GF_BitStream *bs, VVCState *vvc)
 {
 	u32 i;
@@ -10943,8 +11066,7 @@
 	pps->sps_id = gf_bs_read_int_log(bs, 4, "sps_id");
 	if (((s32)pps->sps_id<0) || (pps->sps_id >= 16)) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_CODING, ("VVC wrong SPS ID %d in PPS\n", pps->sps_id));
-		pps->sps_id=0;
-		return -1;
+		VVC_PPS_BROKEN
 	}
 	vvc->sps_active_idx = pps->sps_id; /*set active sps*/
 	pps->mixed_nal_types = gf_bs_read_int_log(bs, 1, "mixed_nal_types");
@@ -10967,15 +11089,24 @@
 	pps->output_flag_present_flag = gf_bs_read_int_log(bs, 1, "output_flag_present_flag");
 	pps->no_pic_partition_flag = gf_bs_read_int_log(bs, 1, "no_pic_partition_flag");
 	pps->subpic_id_mapping_present_flag = gf_bs_read_int_log(bs, 1, "subpic_id_mapping_present_flag");
+
+	VVC_SPS *sps = &vvc->spspps->sps_id;
+	memcpy(pps->subpics, sps->subpics, sizeof(VVC_SubpicInfo)*sps->nb_subpics);
+
 	u32 pps_num_subpics = 1;
 	if (pps->subpic_id_mapping_present_flag) {
 		u32 pps_subpic_id_len;
 		if (!pps->no_pic_partition_flag) {
 			pps_num_subpics = 1+gf_bs_read_ue_log(bs, "pps_num_subpics_minus1");
+			if (pps_num_subpics != sps->nb_subpics) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CODING, ("VVC wrong number of subpictures %u in PPS vs %u in SPS\n", pps_num_subpics, sps->nb_subpics));
+				VVC_PPS_BROKEN
+			}
 		}
 		pps_subpic_id_len = 1 + gf_bs_read_ue(bs);
 		for (i=0; i<pps_num_subpics; i++) {
-			gf_bs_read_int_log_idx(bs, pps_subpic_id_len, "subpic_id", i);
+			VVC_SubpicInfo *sp = &pps->subpicsi;
+			sp->id = gf_bs_read_int_log_idx(bs, pps_subpic_id_len, "subpic_id", i);
 		}
 	}
 	pps->single_slice_per_subpic_flag = 1;
@@ -10989,13 +11120,11 @@
 
 		if (num_exp_tile_columns > VVC_MAX_TILE_COLS) {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_CODING, ("VVC wrong num tile columns %d in PPS\n", num_exp_tile_columns));
-			pps->sps_id=0;
-			return -1;
+			VVC_PPS_BROKEN
 		}
 		if (num_exp_tile_rows > VVC_MAX_TILE_ROWS) {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_CODING, ("VVC wrong num tile rows %d in PPS\n", num_exp_tile_rows));
-			pps->sps_id=0;
-			return -1;
+			VVC_PPS_BROKEN
 		}
 
 		ctu_size = 1<<ctu_size;
@@ -11010,32 +11139,28 @@
 		for (i=0; i<num_exp_tile_columns; i++) {
 			u32 nb_ctb_width = 1 + gf_bs_read_ue_log_idx(bs, "tile_column_width_minus1", i);
 			if (nb_ctb_left < nb_ctb_width) {
-				pps->sps_id=0;
-				return -1;
+				VVC_PPS_BROKEN
 			}
 			nb_ctb_left -= nb_ctb_width;
 			pps->tile_cols_width_ctbi = nb_ctb_width;
 			nb_ctb_last = nb_ctb_width;
 			pps->num_tile_cols++;
 			if (pps->num_tile_cols > VVC_MAX_TILE_COLS) {
-				pps->sps_id=0;
-				return -1;
+				VVC_PPS_BROKEN
 			}
 		}
 		u32 uni_size_ctb = nb_ctb_last;
 		while (nb_ctb_left >= uni_size_ctb) {
 			nb_ctb_left -= uni_size_ctb;
 			if (pps->num_tile_cols >= VVC_MAX_TILE_COLS) {
-				pps->sps_id=0;
-				return -1;
+				VVC_PPS_BROKEN
 			}
 			pps->tile_cols_width_ctbpps->num_tile_cols = uni_size_ctb;
 			pps->num_tile_cols++;
 		}
 		if (nb_ctb_left>0) {
 			if (pps->num_tile_cols >= VVC_MAX_TILE_COLS) {
-				pps->sps_id=0;
-				return -1;
+				VVC_PPS_BROKEN
 			}
 			pps->tile_cols_width_ctbpps->num_tile_cols = nb_ctb_left;
 			pps->num_tile_cols++;
@@ -11047,39 +11172,35 @@
 		for (i=0; i<num_exp_tile_rows; i++) {
 			u32 nb_ctb_height = 1 + gf_bs_read_ue_log_idx(bs, "tile_row_height_minus1", i);
 			if (nb_ctb_left < nb_ctb_height) {
-				pps->sps_id=0;
-				return -1;
+				VVC_PPS_BROKEN
 			}
 			nb_ctb_left -= nb_ctb_height;
 			pps->tile_rows_height_ctbi = nb_ctb_height;
 			pps->num_tile_rows++;
 			nb_ctb_last = nb_ctb_height;
 			if (pps->num_tile_rows > VVC_MAX_TILE_ROWS) {
-				pps->sps_id=0;
-				return -1;
+				VVC_PPS_BROKEN
 			}
 		}
 		uni_size_ctb = nb_ctb_last;
 		while (nb_ctb_left >= uni_size_ctb) {
 			nb_ctb_left -= uni_size_ctb;
 			if (pps->num_tile_rows >= VVC_MAX_TILE_ROWS) {
-				pps->sps_id=0;
-				return -1;
+				VVC_PPS_BROKEN
 			}
 			pps->tile_rows_height_ctbpps->num_tile_rows = uni_size_ctb;
 			pps->num_tile_rows++;
 		}
 		if (nb_ctb_left>0) {
 			if (pps->num_tile_rows >= VVC_MAX_TILE_ROWS) {
-				pps->sps_id=0;
-				return -1;
+				VVC_PPS_BROKEN
 			}
 			pps->tile_rows_height_ctbpps->num_tile_rows = nb_ctb_left;
 			pps->num_tile_rows++;
 		}
 
 		pps->num_tiles_in_pic = pps->num_tile_cols * pps->num_tile_rows;
-		pps->slice_address_len = gf_get_bit_size(pps->num_tiles_in_pic);
+		pps->slice_address_len = vvc_ceillog2(pps->num_tiles_in_pic);
 		if (pps->num_tiles_in_pic > 1) {
 			gf_bs_read_int_log(bs, 1, "pps_loop_filter_across_tiles_enabled_flag");
 			pps->rect_slice_flag = gf_bs_read_int_log(bs, 1, "pps_rect_slice_flag");
@@ -11134,6 +11255,13 @@
 		}
 	}
 
+	//update subpic info - TODO, for now we assume single slice per subpic
+	if (sps->nb_subpics>1) {
+		for (i=0; i<pps_num_subpics; i++) {
+			VVC_SubpicInfo *sp = &pps->subpicsi;
+			sp->num_slices=1;
+		}
+	}
 
 	pps->cabac_init_present_flag = gf_bs_read_int_log(bs, 1, "pps_cabac_init_present_flag");
 	for (i=0; i<2; i++) {
@@ -11213,7 +11341,7 @@
 	//rbsp_trailing_bits()
 
 	if (gf_bs_is_overflow(bs))
-		return -1;
+		VVC_PPS_BROKEN
 	return pps_id;
 }
 
@@ -11253,13 +11381,13 @@
 
 		if (rpl_sps_flag) {
 			if ((si->sps->num_ref_pic_listsi>1) && (!i || si->pps->rpl1_idx_present_flag)) {
-				u32 nb_bits =  gf_get_bit_size(si->sps->num_ref_pic_listsi);
+				u32 nb_bits =  vvc_ceillog2(si->sps->num_ref_pic_listsi);
 				rpl_idx = gf_bs_read_int_log_idx(bs, nb_bits, "rpl_idx", i);
 			}
 			else if (si->sps->num_ref_pic_listsi == 1) {
 				rpl_idx = 0;
 			} else {
-				assert(p_rpl_idx0 != -1);
+				gf_assert(p_rpl_idx0 != -1);
 				rpl_idx = p_rpl_idx0;
 			}
 			p_rpl_idxi = rpl_idx;
@@ -11606,6 +11734,9 @@
 			u32 min_ctby=0;
 			u32 max_ctby=0;
 
+			if (tileY>=VVC_MAX_TILE_ROWS) return -1;
+			if (tileX>=VVC_MAX_TILE_COLS) return -1;
+
 			for (i=0; i<tileY; i++) min_ctby += si->pps->tile_rows_height_ctbi;
 			max_ctby = min_ctby + si->pps->tile_rows_height_ctbi;
 
@@ -11702,7 +11833,7 @@
 
 static s32 vvc_parse_slice(GF_BitStream *bs, VVCState *vvc, VVCSliceInfo *si)
 {
-	u32 i, slice_address=0, num_tiles_in_slice=1;
+	u32 i, subpic_id=0, slice_address=0, num_tiles_in_slice=1;
 
 	si->picture_header_in_slice_header_flag = gf_bs_read_int_log(bs, 1, "picture_header_in_slice_header_flag");
 	if (si->picture_header_in_slice_header_flag) {
@@ -11713,29 +11844,31 @@
 	if (!si->pps) return -1;
 	si->slice_type = GF_VVC_SLICE_TYPE_I;
 	if (si->sps->subpic_info_present) {
-		gf_bs_read_int_log(bs, si->sps->subpicid_len, "subpic_id");
+		subpic_id = gf_bs_read_int_log(bs, si->sps->subpicid_len, "subpic_id");
 	}
 
 	if (si->pps->rect_slice_flag) {
 		if ((si->sps->nb_subpics==1) && (si->pps->num_slices_in_pic<=1)) {
 
 		} else {
-			if (vvc->parse_mode==1) {
-				GF_LOG(GF_LOG_WARNING, GF_LOG_CODING, ("VVC sub-picture parsing not yet implemented, wrong slice header size estimation (result might be non-compliant) - patch welcome\n"));
-
-				gf_bs_align(bs);
-				si->payload_start_offset = (u32) gf_bs_get_position(bs);
-				return -2;
+			if (!vvc->parse_mode) {
+				return 0;
 			}
-			if (vvc->parse_mode) {
-				GF_LOG(GF_LOG_WARNING, GF_LOG_CODING, ("VVC sub-picture parsing not supported, aborting slice header parsing - patch welcome\n"));
+			VVC_SubpicInfo *sp = NULL;
+			for (i=0;i<si->sps->nb_subpics; i++) {
+				if (si->pps->subpicsi.id==subpic_id) {
+					sp = &si->pps->subpicsi;
+					break;
+				}
+			}
+			if (!sp) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CODING, ("VVC sub-picture with id %u not found\n", subpic_id));
+				return -1;
+			}
+			if (sp->num_slices > 1 ) {
+				u32 shbits = vvc_ceillog2(sp->num_slices);
+				slice_address = gf_bs_read_int_log(bs, shbits, "sh_slice_address");
 			}
-			return 0;
-			//TODO
-	// update CurrSubpicIdx
-	//		if (NumSlicesInSubpicCurrSubpicIdx > 1) {
-	//			sh_slice_address
-	//		}
 		}
 	} else {
 		if (si->pps->num_tiles_in_pic > 1) {
@@ -11747,6 +11880,10 @@
 
 	if (!si->pps->rect_slice_flag && (si->pps->num_tiles_in_pic - slice_address > 1)) {
 		num_tiles_in_slice = 1 + gf_bs_read_ue_log(bs, "sh_num_tiles_in_slice_minus1");
+		if (num_tiles_in_slice > si->pps->num_tiles_in_pic) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CODING, ("VVC Invalid number of tiles in slice %u, should be less than %u\n", num_tiles_in_slice, si->pps->num_tiles_in_pic));
+			num_tiles_in_slice = si->pps->num_tiles_in_pic;
+		}
 	}
 
 	if (si->inter_slice_allowed_flag )
@@ -12204,7 +12341,6 @@
 		mod = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
 
 		/*copy over till vui flag*/
-		assert(bit_offset >= 0);
 		while (bit_offset) {
 			flag = gf_bs_read_int(orig, 1);
 			gf_bs_write_int(mod, flag, 1);
@@ -12383,4 +12519,37 @@
 	gf_bs_del(bs);
 	return GF_OK;
 }
+
+void gf_hevc_parse_ps(GF_HEVCConfig* hevccfg, HEVCState* hevc, u32 nal_type)
+{
+	u32 i, j;
+	if (!hevccfg) return;
+
+	for (i = 0; i < gf_list_count(hevccfg->param_array); i++) {
+		GF_NALUFFParamArray* ar = gf_list_get(hevccfg->param_array, i);
+		if (ar->type != nal_type) continue;
+		for (j = 0; j < gf_list_count(ar->nalus); j++) {
+			u8 ntype, tid, lid;
+			GF_NALUFFParam* sl = gf_list_get(ar->nalus, j);
+			gf_hevc_parse_nalu(sl->data, sl->size, hevc, &ntype, &tid, &lid);
+		}
+	}
+}
+
+void gf_vvc_parse_ps(GF_VVCConfig* vvccfg, VVCState* vvc, u32 nal_type)
+{
+	u32 i, j;
+	if (!vvccfg) return;
+
+	for (i = 0; i < gf_list_count(vvccfg->param_array); i++) {
+		GF_NALUFFParamArray* ar = gf_list_get(vvccfg->param_array, i);
+		if (ar->type != nal_type) continue;
+		for (j = 0; j < gf_list_count(ar->nalus); j++) {
+			u8 ntype, tid, lid;
+			GF_NALUFFParam* sl = gf_list_get(ar->nalus, j);
+			gf_vvc_parse_nalu(sl->data, sl->size, vvc, &ntype, &tid, &lid);
+		}
+	}
+}
+
 #endif /*GPAC_DISABLE_AV_PARSERS*/

gpac-2.2.1.tar.gz/src/media_tools/avilib.c -> gpac-2.4.0.tar.gz/src/media_tools/avilib.c Changed

@@ -1804,6 +1804,7 @@
 
 #define ERR_EXIT(x) \
 { \
+   if (hdrl_data) { gf_free(hdrl_data); hdrl_data=NULL; }\
    AVI_close(AVI); \
    AVI_errno = x; \
    return 0; \
@@ -1886,7 +1887,7 @@
 {
 	int rate, scale, idx_type;
 	s64 n, i;
-	unsigned char *hdrl_data;
+	unsigned char *hdrl_data = NULL;
 	u64 header_offset=0;
 	int hdrl_len=0;
 	int nvi, naiAVI_MAX_TRACKS, ioff;
@@ -1948,8 +1949,10 @@
 
 				header_offset = gf_ftell(AVI->fdes);
 
-				if( avi_read(AVI->fdes,(char *)hdrl_data, (u32) n) != n ) ERR_EXIT(AVI_ERR_READ)
+				if( avi_read(AVI->fdes,(char *)hdrl_data, (u32) n) != n ) {
+					ERR_EXIT(AVI_ERR_READ)
 				}
+			}
 			else if(strnicmp(data,"movi",4) == 0)
 			{
 				AVI->movi_start = gf_ftell(AVI->fdes);
@@ -1964,19 +1967,22 @@
 
 			AVI->n_idx = AVI->max_idx = (u32) (n/16);
 			AVI->idx = (unsigned  char((*)16) ) gf_malloc((u32)n);
-			if(AVI->idx==0) ERR_EXIT(AVI_ERR_NO_MEM)
-				if(avi_read(AVI->fdes, (char *) AVI->idx, (u32) n) != n ) {
-					gf_free( AVI->idx);
-					AVI->idx=NULL;
-					AVI->n_idx = 0;
-				}
+			if(AVI->idx==0) {
+				ERR_EXIT(AVI_ERR_NO_MEM)
+			}
+			if(avi_read(AVI->fdes, (char *) AVI->idx, (u32) n) != n ) {
+				gf_free( AVI->idx);
+				AVI->idx=NULL;
+				AVI->n_idx = 0;
+				ERR_EXIT(AVI_ERR_READ)
+			}
 		}
 		else
 			gf_fseek(AVI->fdes,n,SEEK_CUR);
 	}
 
-	if(!hdrl_data      ) ERR_EXIT(AVI_ERR_NO_HDRL)
-		if(!AVI->movi_start) ERR_EXIT(AVI_ERR_NO_MOVI)
+	if(!hdrl_data) ERR_EXIT(AVI_ERR_NO_HDRL)
+	if(!AVI->movi_start) ERR_EXIT(AVI_ERR_NO_MOVI)
 
 			/* Interpret the header list */
 
@@ -1992,9 +1998,11 @@
 					i+= 12;
 					continue;
 				}
+				if (i+4>=hdrl_len) ERR_EXIT(AVI_ERR_READ)
 
 				n = str2ulong(hdrl_data+i+4);
 				n = PAD_EVEN(n);
+				if (i+n>hdrl_len) ERR_EXIT(AVI_ERR_READ)
 
 
 				/* Interpret the tag and its args */
@@ -2076,11 +2084,13 @@
 						alBITMAPINFOHEADER bih;
 
 						memcpy(&bih, hdrl_data + i, sizeof(alBITMAPINFOHEADER));
-						AVI->bitmap_info_header = (alBITMAPINFOHEADER *)
-						                          gf_malloc(str2ulong((unsigned char *)&bih.bi_size));
+						bih.bi_size = str2ulong((unsigned char *)&bih.bi_size);
+
+						if (i + bih.bi_size > hdrl_len) ERR_EXIT(AVI_ERR_READ)
+
+						AVI->bitmap_info_header = (alBITMAPINFOHEADER *) gf_malloc(bih.bi_size);
 						if (AVI->bitmap_info_header != NULL)
-							memcpy(AVI->bitmap_info_header, hdrl_data + i,
-							       str2ulong((unsigned char *)&bih.bi_size));
+							memcpy(AVI->bitmap_info_header, hdrl_data + i, bih.bi_size);
 
 						AVI->width  = str2ulong(hdrl_data+i+4);
 						AVI->height = str2ulong(hdrl_data+i+8);
@@ -2153,6 +2163,8 @@
 					{
 
 						a = (char*)hdrl_data+i;
+						int avail =(int) (hdrl_len-i);
+						if (avail<32) ERR_EXIT(AVI_ERR_READ)
 
 						AVI->video_superindex = (avisuperindex_chunk *) gf_malloc (sizeof (avisuperindex_chunk));
 						memset(AVI->video_superindex, 0, sizeof (avisuperindex_chunk));
@@ -2179,6 +2191,8 @@
 						if (AVI->video_superindex->bIndexSubType != 0) {
 							GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("avilib Invalid Header, bIndexSubType != 0\n"));
 						}
+						avail -= 32;
+						if (avail < (int) AVI->video_superindex->nEntriesInUse*16) ERR_EXIT(AVI_ERR_READ)
 
 						AVI->video_superindex->aIndex = (avisuperindex_entry*)
 						                                gf_malloc (AVI->video_superindex->wLongsPerEntry * AVI->video_superindex->nEntriesInUse * sizeof (u32));
@@ -2220,6 +2234,8 @@
 					{
 
 						a = (char*) hdrl_data+i;
+						int avail = (int) (hdrl_len-i);
+						if (avail<32) ERR_EXIT(AVI_ERR_READ)
 
 						AVI->trackAVI->aptr.audio_superindex = (avisuperindex_chunk *) gf_malloc (sizeof (avisuperindex_chunk));
 						memcpy (AVI->trackAVI->aptr.audio_superindex->fcc, a, 4);
@@ -2246,6 +2262,9 @@
 							GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("avilib Invalid Header, bIndexSubType != 0\n"));
 						}
 
+						avail -= 32;
+						if (avail < (int) AVI->trackAVI->aptr.audio_superindex->nEntriesInUse*16) ERR_EXIT(AVI_ERR_READ)
+
 						AVI->trackAVI->aptr.audio_superindex->aIndex = (avisuperindex_entry*)
 						        gf_malloc (AVI->trackAVI->aptr.audio_superindex->wLongsPerEntry *
 						                   AVI->trackAVI->aptr.audio_superindex->nEntriesInUse * sizeof (u32));
@@ -2298,6 +2317,7 @@
 			}
 
 	gf_free(hdrl_data);
+	hdrl_data = NULL;
 
 	if(!vids_strh_seen || !vids_strf_seen) ERR_EXIT(AVI_ERR_NO_VIDS)
 
@@ -2929,6 +2949,7 @@
 	}
 
 	gf_fseek(AVI->fdes, AVI->video_indexAVI->video_pos.pos, SEEK_SET);
+	AVI->video_pos++;
 
 	if (avi_read(AVI->fdes,vidbuf,n) != (u32) n)
 	{
@@ -2936,8 +2957,6 @@
 		return -1;
 	}
 
-	AVI->video_pos++;
-
 	return n;
 }
 
@@ -3017,7 +3036,8 @@
 
 int AVI_read_audio(avi_t *AVI, u8 *audbuf, int bytes, int *continuous)
 {
-	int nr, todo;
+	int nr;
+	u32 todo;
 	s64 pos;
 
 	if(AVI->mode==AVI_MODE_WRITE) {
@@ -3040,7 +3060,7 @@
 	while(bytes>0)
 	{
 		s64 ret;
-		int left = (int) (AVI->trackAVI->aptr.audio_indexAVI->trackAVI->aptr.audio_posc.len - AVI->trackAVI->aptr.audio_posb);
+		u32 left = (u32) (AVI->trackAVI->aptr.audio_indexAVI->trackAVI->aptr.audio_posc.len - AVI->trackAVI->aptr.audio_posb);
 		if(left==0)
 		{
 			if(AVI->trackAVI->aptr.audio_posc>=AVI->trackAVI->aptr.audio_chunks-1) return nr;
@@ -3049,21 +3069,21 @@
 			*continuous = 0;
 			continue;
 		}
-		if(bytes<left)
+		if((u32)bytes<left)
 			todo = bytes;
 		else
 			todo = left;
 		pos = AVI->trackAVI->aptr.audio_indexAVI->trackAVI->aptr.audio_posc.pos + AVI->trackAVI->aptr.audio_posb;
 		gf_fseek(AVI->fdes, pos, SEEK_SET);
-		if ( (ret = avi_read(AVI->fdes,audbuf+nr,todo)) != todo)
+		AVI->trackAVI->aptr.audio_posb += (int)todo;
+		if ( (ret = avi_read(AVI->fdes,audbuf+nr,todo)) != (s64)todo)
 		{
-			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("avilib XXX pos = %"LLD", ret = %"LLD", todo = %ld\n", pos, ret, todo));
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("avilib XXX pos = "LLD", ret = "LLD", todo = %ld\n", pos, ret, todo));
 			AVI_errno = AVI_ERR_READ;
 			return -1;
 		}
 		bytes -= todo;
 		nr    += todo;
-		AVI->trackAVI->aptr.audio_posb += todo;
 	}
 
 	return nr;

gpac-2.2.1.tar.gz/src/media_tools/crypt_tools.c -> gpac-2.4.0.tar.gz/src/media_tools/crypt_tools.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2022
+ *			Copyright (c) Telecom ParisTech 2000-2024
  *					All rights reserved
  *
  *  This file is part of GPAC / Media Tools sub-project
@@ -174,8 +174,12 @@
 				}
 				else if (!strnicmp(att->value, "ForceClear", 10)) {
 					char *sep = strchr(att->value, '=');
-					if (sep) tkc->sel_enc_range = atoi(sep+1);
 					tkc->sel_enc_type = GF_CRYPT_SELENC_CLEAR_FORCED;
+					if (sep) {
+						tkc->sel_enc_range = atoi(sep+1);
+						//if set to 0, move to no selective encryption
+						if (!tkc->sel_enc_range) tkc->sel_enc_type = GF_CRYPT_SELENC_NONE;
+					}
 				}
 				else if (!stricmp(att->value, "None")) {
 				} else {
@@ -294,6 +298,9 @@
 			else if (!stricmp(att->name, "clear_bytes")) {
 				tkc->clear_bytes = atoi(att->value);
 			}
+			else if (!stricmp(att->name, "byte_offset")) {
+				tkc->crypt_byte_offset = atoi(att->value);
+			}
 			else if (!stricmp(att->name, "constant_IV_size")
 				|| (!stricmp(att->name, "IV_size") && (tkc->scheme_type == GF_CRYPT_TYPE_CBCS))
 			) {
@@ -450,6 +457,7 @@
                     GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("CENC Missing URI in HLS info %s\n", att->value));
                     return;
 				}
+				if (tkc->keystkc->nb_keys.hls_info) gf_free(tkc->keystkc->nb_keys.hls_info);
 				tkc->keystkc->nb_keys.hls_info = gf_strdup(att->value);
 			}
 			else if (!stricmp(att->name, "IV_size")) {
@@ -471,6 +479,19 @@
 					kas_civ = GF_TRUE;
 				}
 			}
+			else if (!stricmp(att->name, "rep")) {
+				if (tkc->keystkc->nb_keys.repID) gf_free(tkc->keystkc->nb_keys.repID);
+				tkc->keystkc->nb_keys.repID = gf_strdup(att->value);
+			}
+			else if (!stricmp(att->name, "period")) {
+				if (tkc->keystkc->nb_keys.periodID) gf_free(tkc->keystkc->nb_keys.periodID);
+				tkc->keystkc->nb_keys.periodID = gf_strdup(att->value);
+			}
+			else if (!stricmp(att->name, "as")) {
+				tkc->keystkc->nb_keys.ASID = atoi(att->value);
+			} else {
+				GF_LOG(GF_LOG_WARNING, GF_LOG_PARSER, ("CENC unrecognized attribute %s for `key`, ignoring\n", att->name));
+			}
 		}
 		tkc->keystkc->nb_keys.IV_size = IV_size;
 		tkc->keystkc->nb_keys.constant_IV_size = const_IV_size;
@@ -514,6 +535,10 @@
 		for (i=0; i<tci->nb_keys; i++) {
 			if (tci->keysi.hls_info)
 				gf_free(tci->keysi.hls_info);
+			if (tci->keysi.repID)
+				gf_free(tci->keysi.repID);
+			if (tci->keysi.periodID)
+				gf_free(tci->keysi.periodID);
 		}
 		if (tci->keys) gf_free(tci->keys);
 		if (tci->metadata) gf_free(tci->metadata);
@@ -558,6 +583,8 @@
 	return info;
 }
 
+#ifndef GPAC_DISABLE_ISOM
+
 extern char gf_prog_lf;
 
 static Bool on_decrypt_event(void *_udta, GF_Event *evt)
@@ -828,5 +855,8 @@
 	return gf_crypt_file_ex(mp4, drm_file, dst_file, interleave_time, NULL, fs_dump_flags);
 
 }
-#endif /* !defined(GPAC_DISABLE_ISOM_WRITE)*/
+#endif //GPAC_DISABLE_ISOM
+
+
+#endif /* !defined(GPAC_DISABLE_CRYPTO)*/

gpac-2.2.1.tar.gz/src/media_tools/dash_client.c -> gpac-2.4.0.tar.gz/src/media_tools/dash_client.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre, Cyril Concolato
- *			Copyright (c) Telecom ParisTech 2010-2022
+ *			Copyright (c) Telecom ParisTech 2010-2024
  *					All rights reserved
  *
  *  This file is part of GPAC / Adaptive HTTP Streaming
@@ -35,7 +35,7 @@
 #include <math.h>
 
 
-#ifndef GPAC_DISABLE_DASH_CLIENT
+#ifndef GPAC_DISABLE_DASHIN
 
 /*ISO 639 languages*/
 #include <gpac/iso639.h>
@@ -167,7 +167,7 @@
 	Bool initial_period_tunein;
 	u32 preroll_state;
 
-	Bool llhls_single_range;
+	u32 llhls_single_range;
 	Bool m3u8_reload_master;
 	u32 hls_reload_time;
 
@@ -208,6 +208,24 @@
 
 	char *chain_next, *chain_fallback;
 	GF_List *chain_stack;
+
+	//async period fetch
+	GF_DASHFileIOSession xlink_sess;
+	Double seek_pending;
+
+	//async manifest fetching
+	u32 manifest_pending;
+	//manifest parsed but xlink at rep level
+	GF_MPD *pending_mpd;
+	Bool pending_has_reps_unchanged;
+	u32 pending_nb_rep_unchanged;
+	u32 pending_group_idx_plus_one, pending_rep_idx_plus_one;
+	GF_MPD_Representation *pending_hls_temp_rep;
+
+	Bool has_pending_groups;
+
+	GF_DASHFileIOSession pending_utc_session;
+	u32 pending_utc_idx;
 };
 
 static void gf_dash_seek_group(GF_DashClient *dash, GF_DASH_Group *group, Double seek_to, Bool is_dynamic);
@@ -241,7 +259,8 @@
 typedef enum
 {
 	/*set if group cannot be selected (wrong MPD)*/
-	GF_DASH_GROUP_NOT_SELECTABLE = 0,
+	GF_DASH_GROUP_NOT_SETUP = 0,
+	GF_DASH_GROUP_NOT_SELECTABLE,
 	GF_DASH_GROUP_NOT_SELECTED,
 	GF_DASH_GROUP_SELECTED,
 } GF_DASHGroupSelection;
@@ -407,6 +426,19 @@
 	s32 llhls_switch_request;
 	u32 last_mpd_change_time;
 	Bool no_init_seg;
+
+	//async xlink@rep loading (m3u8, dash main/full)
+	GF_MPD_Representation *pending_rep;
+	u32 pending_prev_active_rep_index;
+
+	//async sidx loading
+	Bool download_sidx_pending;
+	u32 box_type;
+	u32 box_size;
+	u32 sidx_offset;
+	u32 sidx_start;
+	GF_MPD_Representation *pending_sidx_rep;
+	u32 last_error_time;
 };
 
 //wait time before requesting again a M3U8 child playlist update when something goes wrong during the update: either same file or the expected next segment is not there
@@ -464,7 +496,7 @@
 		next_rep_index_plus_one = rep->playback.enhancement_rep_index_plus_one;
 	}
 
-	assert(nb_rep_need <= count);
+	gf_assert(nb_rep_need <= count);
 
 	return nb_rep_need;
 }
@@ -476,7 +508,7 @@
 		char *rtype = gf_xml_get_root_type(local_url, NULL);
 		if (rtype) {
 			u32 handled = 0;
-			if (!strcmp(rtype, "MPD")) {
+			if (!strcmp(rtype, "MPD") || !strcmp(rtype, "Period")) {
 				handled = 1;
 			}
 			else if (!strcmp(rtype, "SmoothStreamingMedia")) {
@@ -489,41 +521,58 @@
 	return GF_FALSE;
 }
 
-static Bool gf_dash_get_date(GF_DashClient *dash, char *scheme_id, char *url, u64 *utc)
+static GF_Err gf_dash_get_date(GF_DashClient *dash, char *scheme_id, char *url, u64 *utc)
 {
-	GF_DASHFileIOSession session;
 	GF_Err e;
 	u8 *data;
 	u32 len;
-	Bool res = GF_TRUE;
+	GF_Err res = GF_OK;
 	const char *cache_name;
 	*utc = 0;
 
 	//unsupported schemes
-	if (!strcmp(scheme_id, "urn:mpeg:dash:utc:ntp:2014")) return GF_FALSE;
-	if (!strcmp(scheme_id, "urn:mpeg:dash:utc:sntp:2014")) return GF_FALSE;
-
-	if (!dash->dash_io) return GF_FALSE;
-
-	session = dash->dash_io->create(dash->dash_io, GF_FALSE, url, -2);
-	if (!session) return GF_FALSE;
-	e = dash->dash_io->run(dash->dash_io, session);
+	if (!dash->pending_utc_session) {
+		if (!strcmp(scheme_id, "urn:mpeg:dash:utc:ntp:2014")) return GF_NOT_SUPPORTED;
+		if (!strcmp(scheme_id, "urn:mpeg:dash:utc:sntp:2014")) return GF_NOT_SUPPORTED;
+
+		if (!dash->dash_io) return GF_NOT_SUPPORTED;
+
+		dash->pending_utc_session = dash->dash_io->create(dash->dash_io, GF_FALSE, url, -2);
+		if (!dash->pending_utc_session) return GF_NOT_SUPPORTED;
+		e = dash->dash_io->run(dash->dash_io, dash->pending_utc_session);
+		if (e && (e!=GF_NOT_READY)) {
+			dash->dash_io->del(dash->dash_io, dash->pending_utc_session);
+			dash->pending_utc_session = NULL;
+			return GF_NOT_SUPPORTED;
+		}
+	}
+	e = dash->dash_io->get_status(dash->dash_io, dash->pending_utc_session);
+	if (e==GF_NOT_READY)
+		return GF_NOT_READY;
 	if (e) {
-		dash->dash_io->del(dash->dash_io, session);
-		return GF_FALSE;
+		dash->dash_io->del(dash->dash_io, dash->pending_utc_session);
+		dash->pending_utc_session = NULL;
+		return e;
+	}
+
+	cache_name = dash->dash_io->get_cache_name(dash->dash_io, dash->pending_utc_session);
+	if (!cache_name) {
+		dash->dash_io->del(dash->dash_io, dash->pending_utc_session);
+		dash->pending_utc_session = NULL;
+		return GF_NOT_SUPPORTED;
 	}
-	cache_name = dash->dash_io->get_cache_name(dash->dash_io, session);
+
 	gf_blob_get(cache_name, &data, &len, NULL);
 
 	if (!strcmp(scheme_id, "urn:mpeg:dash:utc:http-head:2014")) {
-		const char *hdr = dash->dash_io->get_header_value(dash->dash_io, session, "Date");
+		const char *hdr = dash->dash_io->get_header_value(dash->dash_io, dash->pending_utc_session, "Date");
 		if (hdr)
 			*utc = gf_net_parse_date(hdr);
 		else
-			res = GF_FALSE;
+			res = GF_NOT_SUPPORTED;
 	}
 	else if (!data) {
-		res = GF_FALSE;
+		res = GF_NOT_SUPPORTED;
 	} else {
 		if (!strcmp(scheme_id, "urn:mpeg:dash:utc:http-xsdate:2014")) {
 			*utc = gf_mpd_parse_date(data);
@@ -541,13 +590,14 @@
 					*utc = gf_net_ntp_to_utc(ntp_ts);
 				}
 			} else {
-				res = GF_FALSE;
+				res = GF_NOT_SUPPORTED;
 			}
 		}
 	}
     gf_blob_release(cache_name);
-    
-	dash->dash_io->del(dash->dash_io, session);
+
+	dash->dash_io->del(dash->dash_io, dash->pending_utc_session);
+	dash->pending_utc_session = NULL;
 	return res;
 }
 
@@ -578,6 +628,16 @@
 
 	/*M3U8 does not use NTP sync, we solve edge while loading subplaylist */
 	if (group->dash->is_m3u8) {
+		//check if we talk to GPAC, in which case allow the tune-in request to use an open-range
+		//otherwise, only allow merging of open-range on the first part of the segment
+		//this is because http does not allow a range request response to have an undefined size (only the resource size can be unknown)
+		val = group->dash->dash_io->get_header_value(group->dash->dash_io, group->dash->mpd_dnload, "Server");
+		if (!val || strncmp(val, "GPAC ", 5)) {
+			if (group->dash->llhls_single_range) {
+				group->dash->llhls_single_range = 2;
+				GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("DASH Server is not GPAC, disabling llhls byte-range merging on tune-in parts\n", group->download_segment_index));
+			}
+		}
 		return;
 	}
 
@@ -600,7 +660,6 @@
 			seg_idx = group->adaptation_set->smooth_max_chunks;
 		} else {
 			u32 i, count;
-			u64 start = 0;
 			u64 cumulated_dur = 0;
 			GF_MPD_SegmentTimeline *stl;
 			if (!group->adaptation_set->segment_template || !group->adaptation_set->segment_template->segment_timeline)
@@ -616,7 +675,7 @@
 				if (!e->duration)
 					continue;
 				if (e->start_time)
-					start = e->start_time;
+					cumulated_dur = e->start_time;
 
 				dur = e->duration * (e->repeat_count+1);
 				if (cumulated_dur + dur >= timeshift) {
@@ -625,7 +684,6 @@
 					break;
 				}
 				cumulated_dur += dur;
-				start += dur;
 				seg_idx += e->repeat_count+1;
 				if (group->adaptation_set->smooth_max_chunks && (seg_idx>=group->adaptation_set->smooth_max_chunks)) {
 					seg_idx = group->adaptation_set->smooth_max_chunks;
@@ -695,7 +753,7 @@
 		}
 
 		for (i=0; i<gf_list_count(dyn_period->adaptation_sets); i++) {
-			u64 sr, seg_dur;
+			u64 sr, seg_dur_ms;
 			u32 j, len, nb_space=0;
 			GF_MPD_AdaptationSet *set;
 			char *sep, *start, *end, *seg_url = NULL;
@@ -722,8 +780,8 @@
 					}
 					continue;
 				}
-
-				gf_mpd_resolve_url(group->dash->mpd, rep, set, dyn_period, "./", 0, GF_MPD_RESOLVE_URL_MEDIA_NOSTART, 9876, 0, &seg_url, &sr, &sr, &seg_dur, NULL, NULL, NULL, NULL);
+				u32 tpl_use_time=0;
+				gf_mpd_resolve_url(group->dash->mpd, rep, set, dyn_period, "./", 0, GF_MPD_RESOLVE_URL_MEDIA_NOSTART, 9876, 0, &seg_url, &sr, &sr, &seg_dur_ms, NULL, NULL, NULL, &tpl_use_time);
 
 				dyn_period->duration = dur;
 
@@ -737,40 +795,100 @@
 				end = sep+4;
 				while (start>seg_url && (*(start-1)=='0')) { start--; nb_space++;}
 				start0=0;
-				len = (u32) strlen(seg_url)-2;
-				if (!strncmp(val, seg_url+2, len)) {
-					u32 number=0;
+				len = (u32) strlen(seg_url);
+				if (!strncmp(val, seg_url, len)) {
+					u64 number=0;
 					char szTemplate100;
 
 					GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("DASH Resolve ROUTE clock on bootstrap segment URL %s template %s\n", val, seg_url+2));
 
-					strcpy(szTemplate, seg_url+2);
+					strcpy(szTemplate, seg_url);
 					strcat(szTemplate, "%");
 					if (nb_space) {
 						char szFmt20;
 						sprintf(szFmt, "0%d", nb_space+4);
 						strcat(szTemplate, szFmt);
 					}
-					strcat(szTemplate, "d");
+					strcat(szTemplate, LLU_SUF);
 					strcat(szTemplate, end);
 					if (sscanf(val, szTemplate, &number) == 1) {
 						u32 startNum = 1;
-						if (dyn_period->segment_template) startNum = dyn_period->segment_template->start_number;
-						if (set->segment_template) startNum = set->segment_template->start_number;
-						if (rep->segment_template) startNum = rep->segment_template->start_number;
-						if (number>=startNum) {
-                            //clock is init which means the segment is available, so the timeline offset must match the AST of the segment (includes seg dur)
-
-                            const char *ll_val = group->dash->dash_io->get_header_value(group->dash->dash_io, group->dash->mpd_dnload, "x-route-ll");
-                            if (ll_val && !strcmp(ll_val, "yes")) {
-                                //low latency case, we are currently receiving the segment
-                                group->dash->route_low_latency = GF_TRUE;
-                                number--;
-                            }
-                            
-                            timeline_offset_ms = seg_dur * ( 1 + number - startNum);
+						u64 pto=0;
+						u32 segdur=0, timescale=0;
+						Bool is_valid = GF_TRUE;
+						GF_MPD_SegmentTimeline *seg_timeline=NULL;
+						if (dyn_period->segment_template) {
+							startNum = dyn_period->segment_template->start_number;
+							segdur = (u32) dyn_period->segment_template->duration;
+							seg_timeline = dyn_period->segment_template->segment_timeline;
+							pto = dyn_period->segment_template->presentation_time_offset;
+							timescale = dyn_period->segment_template->timescale;
+						}
+						if (set->segment_template) {
+							startNum = set->segment_template->start_number;
+							if (set->segment_template->duration) segdur = (u32) set->segment_template->duration;
+							if (set->segment_template->segment_timeline) seg_timeline = set->segment_template->segment_timeline;
+							if (set->segment_template->presentation_time_offset) pto = set->segment_template->presentation_time_offset;
+							if (set->segment_template->timescale) timescale = set->segment_template->timescale;
+						}
+						if (rep->segment_template) {
+							startNum = rep->segment_template->start_number;
+							if (rep->segment_template->duration) segdur = (u32) rep->segment_template->duration;
+							if (rep->segment_template->segment_timeline) seg_timeline = rep->segment_template->segment_timeline;
+							if (rep->segment_template->presentation_time_offset) pto = rep->segment_template->presentation_time_offset;
+							if (rep->segment_template->timescale) timescale = rep->segment_template->timescale;
+						}
+
+						if (tpl_use_time) {
+							if (number < pto) {
+								is_valid = GF_FALSE;
+							} else if (seg_timeline) {
+								number -= pto;
+								u64 start_time=number;
+								u32 ti, nb_it = gf_list_count(seg_timeline->entries);
+								Bool et_found=GF_FALSE;;
+								number = startNum;
+								for (ti=0; ti<nb_it; ti++) {
+									u32 seg_i;
+									GF_MPD_SegmentTimelineEntry *te = gf_list_get(seg_timeline->entries, ti);
+									u64 seg_start = te->start_time;
+									for (seg_i=0; seg_i<te->repeat_count+1;seg_i++) {
+										//we need an exact match
+										if (seg_start == start_time) {
+											timeline_offset_ms = start_time;
+											et_found=GF_TRUE;
+											break;
+										}
+										seg_start+=te->duration;
+										number++;
+									}
+									if (et_found) break;
+								}
+								if (!et_found)
+									is_valid=GF_FALSE;
+							} else if (segdur) {
+								number -= pto;
+								number = startNum + number / segdur;
+							} else {
+								is_valid = GF_FALSE;
+							}
+						}
+						if (is_valid && (number>=startNum)) {
+							//clock is init which means the segment is available, so the timeline offset must match the AST of the segment (includes seg dur)
+							const char *ll_val = group->dash->dash_io->get_header_value(group->dash->dash_io, group->dash->mpd_dnload, "x-route-ll");
+							//low latency case, we are currently receiving the segment
+							//only do this if not using segment-timeline
+							if (!seg_timeline) {
+								if (ll_val && !strcmp(ll_val, "yes")) {
+									//low latency case, we are currently receiving the segment
+									group->dash->route_low_latency = GF_TRUE;
+									number--;
+								}
+								timeline_offset_ms = segdur * ( 1 + number - startNum);
+							}
+							found = 1;
+							timeline_offset_ms = gf_timestamp_rescale(timeline_offset_ms, timescale, 1000);
 						}
-						found = 1;
 					}
 				} else {
 					GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("DASH ROUTE bootstrap segment URL %s does not match template %s for rep #%d\n", val, seg_url+2, j+1));
@@ -835,32 +953,48 @@
 			utc_timing = gf_list_get(group->dash->mpd->utc_timings, 0);
 	}
 
-	if (utc_timing && utc_timing->scheme_id_uri) {
-		Bool res = GF_FALSE;
+	if (utc_timing && utc_timing->scheme_id_uri
+		//for now wo only support one UTC clock ref for the session
+		&& !group->dash->utc_drift_estimate
+	) {
+		GF_Err res = GF_NOT_SUPPORTED;
 		u64 utc=0;
 		s64 drift_estimate;
 
 		if (!strcmp(utc_timing->scheme_id_uri, "urn:mpeg:dash:utc:direct:2014")) {
 			utc = gf_net_parse_date(utc_timing->value);
-			res = GF_TRUE;
+			res = GF_OK;
 		} else {
+			u32 utc_idx=0;
 			char *time_refs = utc_timing->value;
 			utc = 0;
 			while (time_refs) {
 				char *sep = strchr(time_refs, ' ');
 				if (sep) sep0 = 0;
 
-				res = gf_dash_get_date(group->dash, utc_timing->scheme_id_uri, time_refs, &utc);
+				if (group->dash->pending_utc_idx>=utc_idx) {
+					res = gf_dash_get_date(group->dash, utc_timing->scheme_id_uri, time_refs, &utc);
+					if (res==GF_NOT_READY) {
+						group->dash->pending_utc_idx = utc_idx;
+						if (sep) sep0 = ' ';
+						return;
+					}
+				}
+				//already tested
+				else {
+					res = GF_OK;
+				}
 
 				time_refs = NULL;
 				if (sep) {
 					sep0 = ' ';
 					time_refs = sep+1;
 				}
-				if (res) break;
+				if (res==GF_OK) break;
 			}
 		}
-		if (res) {
+		group->dash->pending_utc_idx = 0;
+		if (res==GF_OK) {
 			drift_estimate = ((s64) fetch_time - (s64) utc);
 			group->dash->utc_drift_estimate = drift_estimate;
 			GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("DASH Estimated UTC diff between client and server (%s): "LLD" ms (UTC fetch "LLU" - server UTC "LLU" - MPD AST "LLU" - MPD PublishTime "LLU"\n", utc_timing->value, group->dash->utc_drift_estimate, fetch_time, utc,
@@ -1395,14 +1529,21 @@
 	s32 group_idx = -1;
 	Bool had_sess = GF_FALSE;
 	Bool retry = GF_TRUE;
-	GF_Err e;
+	GF_Err e=GF_OK;
 	GF_DASHFileIO *dash_io = dash->dash_io;
 
 	if (!dash_io) return GF_BAD_PARAM;
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("DASH Downloading %s starting at UTC "LLU" ms\n", url, gf_net_get_utc() ));
 
-	if (group) {
+	if (dash->manifest_pending || dash->pending_group_idx_plus_one) {
+		goto update_download;
+	}
+	else if (group) {
 		group_idx = group->groups_idx;
+		if (group->download_sidx_pending) {
+			assert ( *sess);
+			goto update_download;
+		}
 	}
 
 	if (! *sess) {
@@ -1439,10 +1580,30 @@
 			return e;
 		}
 	}
-	assert(*sess);
+	gf_assert(*sess);
 
-	/*issue HTTP GET for headers only*/
+	/*start downloading the file*/
 	e = dash_io->init(dash_io, *sess);
+	if (!e || (e==GF_IP_NETWORK_EMPTY))
+		e = dash_io->run(dash_io, *sess);
+
+	//sidx download
+update_download:
+	if ((e==GF_NOT_READY) || (e >= GF_OK)) {
+		e = dash_io->get_status(dash_io, *sess);
+		if (group) {
+			if (e == GF_NOT_READY) {
+				group->download_sidx_pending = GF_TRUE;
+				return GF_NOT_READY;
+			}
+			group->download_sidx_pending = GF_FALSE;
+			group->pending_sidx_rep = NULL;
+		} else {
+			if (e == GF_NOT_READY) {
+				return GF_NOT_READY;
+			}
+		}
+	}
 
 	if (e>=GF_OK) {
 		/*check mime type of the adaptation set if not provided*/
@@ -1461,12 +1622,8 @@
 			}
 			group->segment_must_be_streamed = GF_FALSE;
 		}
-
-		//release dl_mutex while downloading segment
-		/*we can download the file*/
-		e = dash_io->run(dash_io, *sess);
 	} else {
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("DASH At "LLU" error %s - released dl_mutex\n", gf_net_get_utc(), gf_error_to_string(e)));
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("DASH At "LLU" error %s\n", gf_net_get_utc(), gf_error_to_string(e)));
 	}
 
 	switch (e) {
@@ -1909,8 +2066,9 @@
 	if (nb_removed) {
 		GF_MPD_SegmentList *segment_list;
 		/*update next download index*/
+		gf_fatal_assert(group->download_segment_index >= (s32) nb_removed);
 		group->download_segment_index -= nb_removed;
-		assert(group->nb_segments_in_rep >= nb_removed);
+		gf_fatal_assert(group->nb_segments_in_rep >= nb_removed);
 		group->nb_segments_in_rep -= nb_removed;
 		/*clean segmentList*/
 		segment_list = NULL;
@@ -1943,13 +2101,15 @@
 	u8 signatureGF_SHA1_DIGEST_SIZE;
 	if (!rep->segment_list->xlink_href) return GF_BAD_PARAM;
 
-	GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("DASH Resolving Representation SegmentList XLINK %s\n", rep->segment_list->xlink_href));
+	if (!rep->in_progress) {
+		GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("DASH Resolving Representation SegmentList XLINK %s\n", rep->segment_list->xlink_href));
 
-	//SPEC: If this value is present, the element containing the xlink:href attribute and all @xlink attributes included in the element containing @xlink:href shall be removed at the time when the resolution is due.
-	if (!strcmp(rep->segment_list->xlink_href, "urn:mpeg:dash:resolve-to-zero:2013")) {
-		gf_mpd_delete_segment_list(rep->segment_list);
-		rep->segment_list = NULL;
-		return GF_OK;
+		//SPEC: If this value is present, the element containing the xlink:href attribute and all @xlink attributes included in the element containing @xlink:href shall be removed at the time when the resolution is due.
+		if (!strcmp(rep->segment_list->xlink_href, "urn:mpeg:dash:resolve-to-zero:2013")) {
+			gf_mpd_delete_segment_list(rep->segment_list);
+			rep->segment_list = NULL;
+			return GF_OK;
+		}
 	}
 
 	//xlink relative to our MPD base URL
@@ -1960,9 +2120,20 @@
 		is_local=GF_TRUE;
 		e = GF_OK;
 	} else {
+		e = GF_OK;
 		/*use non-persistent connection for MPD*/
-		e = gf_dash_download_resource(dash, &(dash->mpd_dnload), url ? url : rep->segment_list->xlink_href, 0, 0, 0, NULL);
+		if (!rep->in_progress) {
+			e = gf_dash_download_resource(dash, &(dash->mpd_dnload), url ? url : rep->segment_list->xlink_href, 0, 0, 0, NULL);
+		}
+		if (!e || (e!=GF_NOT_READY))
+			e = dash->dash_io->get_status(dash->dash_io, dash->mpd_dnload);
+
 		gf_free(url);
+		if (e==GF_NOT_READY) {
+			rep->in_progress = GF_TRUE;
+			return e;
+		}
+		rep->in_progress = GF_FALSE;
 	}
 
 	if (e) {
@@ -2007,10 +2178,10 @@
 		GF_XMLNode *root = gf_xml_dom_get_root_idx(parser, i);
 		if (!strcmp(root->name, "SegmentList")) {
 			GF_MPD_SegmentList *new_seg_list = gf_mpd_solve_segment_list_xlink(dash->mpd, root);
-			//forbiden
+			//forbidden
 			if (new_seg_list && new_seg_list->xlink_href) {
 				if (new_seg_list->xlink_actuate_on_load) {
-					GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("DASH XLINK %s references to remote element entities that contain another @xlink:href attribute with xlink:actuate set to onLoad - forbiden\n", rep->segment_list->xlink_href));
+					GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("DASH XLINK %s references to remote element entities that contain another @xlink:href attribute with xlink:actuate set to onLoad - forbidden\n", rep->segment_list->xlink_href));
 					gf_mpd_delete_segment_list(new_seg_list);
 					new_seg_list = NULL;
 				} else {
@@ -2073,11 +2244,11 @@
 	xlink_copy = gf_url_concatenate(dash->base_url, rep->segment_list->xlink_href);
 	e = gf_m3u8_solve_representation_xlink(rep, dash->base_url, &dash->getter, is_static, duration, signature);
 	//do not notify m3u8 update if same as last one
-	if (e==GF_EOS) {
+	if ((e==GF_EOS) || (e==GF_NOT_READY)) {
 		gf_free(xlink_copy);
 		return e;
 	}
-	
+
 	if (gf_url_is_local(xlink_copy)) {
 		local_url = xlink_copy;
 	} else {
@@ -2199,7 +2370,6 @@
 	Double timeline_start_time=0;
 	GF_MPD *new_mpd=NULL;
 	Bool fetch_only = GF_FALSE;
-	u32 nb_group_unchanged = 0;
 	Bool has_reps_unchanged = GF_FALSE;
 
 	//HLS: do not reload the playlist, directly update the reps
@@ -2208,9 +2378,19 @@
 		new_period = NULL;
 		fetch_time = dash_get_fetch_time(dash);
 		period = gf_list_get(dash->mpd->periods, dash->active_period_index);
+		force_timeline_setup = dash->in_error;
 		goto process_m3u8_manifest;
 	}
 
+	if (dash->pending_mpd) {
+		new_mpd = dash->pending_mpd;
+		dash->pending_mpd = NULL;
+		fetch_time = dash_get_fetch_time(dash);
+		force_timeline_setup = dash->in_error;
+		has_reps_unchanged = dash->pending_has_reps_unchanged;
+		goto resume_mpd_parse;
+	}
+
 	if (!dash->mpd_dnload) {
 		local_url = purl = NULL;
 		if (!gf_list_count(dash->mpd->locations)) {
@@ -2260,6 +2440,13 @@
 		/*use non-persistent connection for MPD*/
 		e = gf_dash_download_resource(dash, &(dash->mpd_dnload), purl, 0, 0, 0, NULL);
 		if (e!=GF_OK) {
+			gf_free(purl);
+			if (e==GF_NOT_READY) {
+				dash->manifest_pending = 1;
+				return GF_NOT_READY;
+			}
+			dash->manifest_pending = 0;
+
 			if (!dash->in_error) {
 				if (e==GF_URL_ERROR) {
 					GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("DASH Error - cannot update manifest: %s, aborting\n", gf_error_to_string(e)));
@@ -2268,11 +2455,11 @@
 					GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("DASH Error while fetching new manifest (%s) - will retry later\n", gf_error_to_string(e)));
 				}
 			}
-			gf_free(purl);
 			//try to refetch MPD every second
 			dash->last_update_time+=1000;
 			return e;
 		} else {
+			dash->manifest_pending = 0;
 			GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("DASH Playlist %s updated with success\n", purl));
 		}
 
@@ -2380,7 +2567,9 @@
 
 	}
 
-	assert(new_mpd);
+resume_mpd_parse:
+
+	gf_assert(new_mpd);
 
 	period = gf_list_get(dash->mpd->periods, dash->active_period_index);
 	if (fetch_only  && !period) goto exit;
@@ -2407,6 +2596,12 @@
 				u32 insert_idx;
 				if (period->type == GF_MPD_TYPE_DYNAMIC) {
 					gf_dash_solve_period_xlink(dash, new_mpd->periods, i);
+					//not ready
+					if (dash->xlink_sess) {
+						//store new mpd
+						dash->pending_mpd = new_mpd;
+						return GF_NOT_READY;
+					}
 					goto restart_period_check;
 				}
 				//this is a static period xlink, no need to further update the mpd, jsut swap the old periods in the new MPD
@@ -2431,7 +2626,10 @@
 				}
 				//update active period index in new list
 				dash->active_period_index = gf_list_find(new_mpd->periods, period);
-				assert((s32)dash->active_period_index >= 0);
+				if ((s32)dash->active_period_index < 0) {
+					dash->active_period_index = 0;
+					gf_assert(0);
+				}
 				//this will do the garbage collection
 				gf_list_add(dash->mpd->periods, new_period);
 				goto exit;
@@ -2467,7 +2665,7 @@
 	}
 
 	dash->active_period_index = gf_list_find(new_mpd->periods, new_period);
-	assert((s32)dash->active_period_index >= 0);
+	gf_assert((s32)dash->active_period_index >= 0);
 
 	if (gf_list_count(period->adaptation_sets) != gf_list_count(new_period->adaptation_sets)) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("DASH Error - cannot update playlist: missing AdaptationSet\n"));
@@ -2507,7 +2705,6 @@
 
 	for (group_idx=0; group_idx<gf_list_count(dash->groups); group_idx++) {
 		GF_MPD_AdaptationSet *set, *new_set=NULL;
-		u32 rep_i;
 		u32 nb_rep_unchanged = 0;
 		GF_DASH_Group *group = gf_list_get(dash->groups, group_idx);
 
@@ -2517,23 +2714,30 @@
 
 		set = group->adaptation_set;
 
-		if (new_period) {
+		if (dash->pending_group_idx_plus_one) {
+			if (group_idx+1 != dash->pending_group_idx_plus_one) continue;
+			nb_rep_unchanged = dash->pending_nb_rep_unchanged;
+			if (new_period)
+				new_set = gf_list_get(new_period->adaptation_sets, group_idx);
+		}
+		//only resort if not a retry of xlink
+		else if (new_period) {
 			new_set = gf_list_get(new_period->adaptation_sets, group_idx);
 
 			//sort by bandwidth and quality
-			for (rep_i = 1; rep_i < gf_list_count(new_set->representations); rep_i++) {
+			for (rep_idx = 1; rep_idx < gf_list_count(new_set->representations); rep_idx++) {
 				Bool swap=GF_FALSE;
-				GF_MPD_Representation *r2 = gf_list_get(new_set->representations, rep_i);
-				GF_MPD_Representation *r1 = gf_list_get(new_set->representations, rep_i-1);
+				GF_MPD_Representation *r2 = gf_list_get(new_set->representations, rep_idx);
+				GF_MPD_Representation *r1 = gf_list_get(new_set->representations, rep_idx-1);
 				if (r1->bandwidth > r2->bandwidth) {
 					swap=GF_TRUE;
 				} else if ((r1->bandwidth == r2->bandwidth) && (r1->quality_ranking<r2->quality_ranking)) {
 					swap=GF_TRUE;
 				}
 				if (swap) {
-					gf_list_rem(new_set->representations, rep_i);
-					gf_list_insert(new_set->representations, r2, rep_i-1);
-					rep_i=0;
+					gf_list_rem(new_set->representations, rep_idx);
+					gf_list_insert(new_set->representations, r2, rep_idx-1);
+					rep_idx=0;
 				}
 			}
 
@@ -2553,8 +2757,11 @@
 
 			rep->playback.not_modified = GF_FALSE;
 
+			if (dash->pending_rep_idx_plus_one && (rep_idx+1 != dash->pending_rep_idx_plus_one))
+				continue;
+
 			if (rep->segment_base || group->adaptation_set->segment_base || period->segment_base) {
-				assert(new_rep);
+				gf_assert(new_rep);
 				if (!new_rep->segment_base && !new_set->segment_base && !new_period->segment_base) {
 					GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("DASH Error - cannot update playlist: representation does not use segment base as previous version\n"));
 					gf_mpd_del(new_mpd);
@@ -2566,7 +2773,7 @@
 			}
 
 			else if (rep->segment_template || group->adaptation_set->segment_template || period->segment_template) {
-				assert(new_rep);
+				gf_assert(new_rep);
 				if (!new_rep->segment_template && !new_set->segment_template && !new_period->segment_template) {
 					GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("DASH Error - cannot update playlist: representation does not use segment template as previous version\n"));
 					gf_mpd_del(new_mpd);
@@ -2598,61 +2805,69 @@
 			else {
 				Bool same_rep = GF_FALSE;
 				/*we're using segment list*/
-				assert(rep->segment_list || group->adaptation_set->segment_list || period->segment_list);
+				gf_assert(rep->segment_list || group->adaptation_set->segment_list || period->segment_list);
 
 				//HLS case
 				if (!new_rep) {
-					assert(rep->segment_list);
-					assert(rep->segment_list->previous_xlink_href || rep->segment_list->xlink_href);
-					hls_temp_rep = gf_mpd_representation_new();
-					GF_SAFEALLOC(hls_temp_rep->segment_list, GF_MPD_SegmentList);
-					hls_temp_rep->segment_list->segment_URLs = gf_list_new();
-					if (rep->segment_list->xlink_href)
-						hls_temp_rep->segment_list->xlink_href = gf_strdup(rep->segment_list->xlink_href);
-					else
-						hls_temp_rep->segment_list->xlink_href = gf_strdup(rep->segment_list->previous_xlink_href);
+					if (dash->pending_hls_temp_rep) {
+						new_rep = hls_temp_rep = dash->pending_hls_temp_rep;
+						dash->pending_hls_temp_rep = NULL;
+					} else {
+						gf_assert(rep->segment_list);
+						gf_assert(rep->segment_list->previous_xlink_href || rep->segment_list->xlink_href);
+						hls_temp_rep = gf_mpd_representation_new();
+						GF_SAFEALLOC(hls_temp_rep->segment_list, GF_MPD_SegmentList);
+						hls_temp_rep->segment_list->segment_URLs = gf_list_new();
+						if (rep->segment_list->xlink_href)
+							hls_temp_rep->segment_list->xlink_href = gf_strdup(rep->segment_list->xlink_href);
+						else
+							hls_temp_rep->segment_list->xlink_href = gf_strdup(rep->segment_list->previous_xlink_href);
 
-					new_rep = hls_temp_rep;
+						new_rep = hls_temp_rep;
+					}
 				}
 				if (group->active_rep_index!=rep_idx)
 					same_rep = GF_TRUE;
 
 				//if we have a xlink_href in segment_list, solve it for the active quality only
 				while (new_rep->segment_list->xlink_href && !same_rep) {
-					u32 retry=10;
 					Bool is_static = GF_FALSE;
 					u64 dur = 0;
 
 					if (new_rep->segment_list->consecutive_xlink_count) {
 						GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("DASH Resolving a XLINK pointed from another XLINK (%d consecutive XLINK in segment list)\n", new_rep->segment_list->consecutive_xlink_count));
 					}
-
-					while (retry) {
-						if (dash->is_m3u8) {
-							if (!rep_idx)
-								rep_idx = 0;
-							e = gf_dash_solve_m3u8_representation_xlink(group, new_rep, &is_static, &dur, rep->playback.xlink_digest);
-						} else {
-							e = gf_dash_solve_representation_xlink(group->dash, new_rep, rep->playback.xlink_digest);
-						}
-						if (e==GF_OK) break;
-						if (e==GF_EOS) {
-							same_rep = GF_TRUE;
-							e = GF_OK;
-							break;
-						}
-						if (e==GF_NON_COMPLIANT_BITSTREAM) break;
-						if (e==GF_OUT_OF_MEM) break;
-						if (group->dash->dash_state != GF_DASH_STATE_RUNNING)
-							break;
-
-						gf_sleep(100);
-						retry --;
+					if (dash->is_m3u8) {
+						if (!rep_idx)
+							rep_idx = 0;
+						e = gf_dash_solve_m3u8_representation_xlink(group, new_rep, &is_static, &dur, rep->playback.xlink_digest);
+					} else {
+						e = gf_dash_solve_representation_xlink(group->dash, new_rep, rep->playback.xlink_digest);
 					}
+					if (e==GF_EOS) {
+						same_rep = GF_TRUE;
+						e = GF_OK;
+					}
+					if (e==GF_NOT_READY) {
+						dash->pending_mpd = new_mpd;
+						dash->pending_hls_temp_rep = hls_temp_rep;
+						dash->pending_group_idx_plus_one = 1 + group_idx;
+						dash->pending_rep_idx_plus_one = 1 + rep_idx;
+						dash->pending_nb_rep_unchanged = nb_rep_unchanged;
+						dash->pending_has_reps_unchanged = has_reps_unchanged;
+						return GF_NOT_READY;
+					}
+					dash->pending_mpd = NULL;
+					dash->pending_hls_temp_rep = NULL;
+					dash->pending_group_idx_plus_one = 0;
+					dash->pending_rep_idx_plus_one = 0;
+					dash->pending_nb_rep_unchanged = 0;
+					dash->pending_has_reps_unchanged = GF_FALSE;
 
 					if (same_rep) break;
 
 					if (e==GF_OK) {
+						group->last_error_time = 0;
 						if (dash->is_m3u8 && is_static) {
 							GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("m3u8 MPD type changed from dynamic to static\n"));
 							group->dash->mpd->type = GF_MPD_TYPE_STATIC;
@@ -2662,6 +2877,15 @@
 							if (group->period->duration < dur)
 								group->period->duration = dur;
 						}
+					} else {
+						if (!group->last_error_time) {
+							group->last_error_time = gf_sys_clock();
+						} else if (gf_sys_clock() - group->last_error_time > (u32) (group->segment_duration*1000)) {
+							if (!dash->in_error) {
+								GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("DASH Error - cannot update manifest: %s, aborting\n", gf_error_to_string(e)));
+								dash->in_error = GF_TRUE;
+							}
+						}
 					}
 				}
 
@@ -2826,7 +3050,7 @@
 							}
 							pos--;
 						}
-						assert(pos>=0);
+						gf_assert(pos>=0);
 						if (pos==0) {
 							gf_list_insert(segments, new_seg, 0);
 						}
@@ -2857,10 +3081,10 @@
 							//we just flushed a new full seg, remove all parts
 							if (first_added_chunk) {
 								s32 pos = gf_list_find(segments, first_added_chunk);
-								assert(pos>=0);
+								gf_assert(pos>=0);
 								while (pos < (s32) gf_list_count(segments)) {
 									GF_MPD_SegmentURL *surl = gf_list_pop_back(segments);
-									assert(surl->hls_ll_chunk_type);
+									gf_assert(surl->hls_ll_chunk_type);
 									gf_mpd_segment_url_free(surl);
 								}
 								first_added_chunk = NULL;
@@ -3042,9 +3266,7 @@
 				return e;
 			}
 
-			if (nb_rep_unchanged == gf_list_count(new_set->representations))
-				nb_group_unchanged++;
-			else
+			if (nb_rep_unchanged != gf_list_count(new_set->representations))
 				group->last_mpd_change_time = gf_sys_clock();
 		}
 	}
@@ -3058,7 +3280,7 @@
 		/*update group/period to new period*/
 		j = gf_list_find(group->period->adaptation_sets, group->adaptation_set);
 		new_as = gf_list_get(new_period->adaptation_sets, j);
-		assert(new_as);
+		gf_assert(new_as);
 
 		if (has_reps_unchanged) {
 			//swap all unchanged reps from old MPD to new MPD
@@ -3078,8 +3300,7 @@
 		group->adaptation_set = new_as;
 		group->period = new_period;
 
-		j = gf_list_count(group->adaptation_set->representations);
-		assert(j);
+		gf_assert( gf_list_count(group->adaptation_set->representations) );
 
 		/*now that all possible SegmentXXX have been updated, purge them if needed: all segments ending before timeline_start_time
 		will be removed from MPD*/
@@ -3238,7 +3459,7 @@
 		if (group->dash->route_clock_state==1)
 			return GF_IP_NETWORK_EMPTY;
 
-		if (group->dash->reinit_period_index)
+		if (group->dash->reinit_period_index || group->dash->pending_utc_session)
 			return GF_IP_NETWORK_EMPTY;
 
 		group->timeline_setup = GF_TRUE;
@@ -3281,7 +3502,7 @@
 }
 
 
-static void gf_dash_set_group_representation(GF_DASH_Group *group, GF_MPD_Representation *rep, Bool is_next_schedule)
+static void gf_dash_set_group_representation(GF_DASH_Group *group, GF_MPD_Representation *rep)
 {
 #ifndef GPAC_DISABLE_LOG
 	u32 width=0, height=0, samplerate=0;
@@ -3295,7 +3516,13 @@
 	u32 i = gf_list_find(group->adaptation_set->representations, rep);
 	u32 prev_active_rep_index = group->active_rep_index;
 	u32 nb_cached_seg_per_rep = group->max_cached_segments / gf_dash_group_count_rep_needed(group);
-	assert((s32) i >= 0);
+	gf_assert((s32) i >= 0);
+
+	if (group->pending_rep) {
+		prev_active_rep_index = group->pending_prev_active_rep_index;
+		ol_nb_segs_in_rep = group->nb_segments_in_rep;
+		goto retry_pending;
+	}
 
 	if (group->llhls_edge_chunk && group->llhls_edge_chunk->hls_ll_chunk_type) {
 		group->llhls_switch_request = i;
@@ -3317,7 +3544,7 @@
 		//if VVC RPR switching, don't allow downswitch to more than half size (max for rpr)
 		//pickup lowest quality above current rep that fits rpr downsampling requirements
 		if (rep->playback.vvc_rpr_switch) {
-#ifndef GPAC_DISABLE_LOGS
+#ifndef GPAC_DISABLE_LOG
 			u32 req_w=rep->width, req_h=rep->height;
 #endif
 			GF_MPD_Representation *orep = gf_list_get(group->adaptation_set->representations, prev_active_rep_index);
@@ -3326,7 +3553,7 @@
 					&& (rep->width * 2 >= orep->width)
 					&& (rep->height * 2 >= orep->height)
 				) {
-#ifndef GPAC_DISABLE_LOGS
+#ifndef GPAC_DISABLE_LOG
 					if (req_w < rep->width) {
 						GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("DASH Cannot switch VVC RPR from %dx%d to %dx%d, using higher resolution %dx%d\n", orep->width, orep->height, req_w, req_h, rep->width, rep->height));
 					}
@@ -3358,6 +3585,8 @@
 		}
 	}
 
+retry_pending:
+
 	while (rep->segment_list && rep->segment_list->xlink_href) {
 		Bool is_static = GF_FALSE;
 		u64 dur = 0;
@@ -3372,10 +3601,20 @@
 		} else {
 			e = gf_dash_solve_representation_xlink(group->dash, rep, rep->playback.xlink_digest);
 		}
+
+		if (e==GF_NOT_READY) {
+			group->pending_rep = rep;
+			group->pending_prev_active_rep_index = prev_active_rep_index;
+			group->dash->has_pending_groups = GF_TRUE;
+			return;
+		}
+		group->pending_rep = NULL;
+		group->pending_prev_active_rep_index = 0;
+
 		if (is_static)
 			group->dash->mpd->type = GF_MPD_TYPE_STATIC;
 
-		//after resolving xlink: if this represenstation is marked as disabled, we have nothing to do
+		//after resolving xlink: if this representation is marked as disabled, we have nothing to do
 		if (rep->playback.disabled)
 			return;
 
@@ -3412,8 +3651,8 @@
 			u32 nb_segs;
 			GF_MPD_Representation *prev_active_rep = (GF_MPD_Representation *)gf_list_get(group->adaptation_set->representations, prev_active_rep_index);
 			GF_MPD_SegmentURL *last_seg_url;
-			assert(rep->segment_list);
-			assert(prev_active_rep->segment_list);
+			gf_assert(rep->segment_list);
+			gf_assert(prev_active_rep->segment_list);
 
 			last_seg_url = gf_list_get(prev_active_rep->segment_list->segment_URLs, group_dld_index);
 			if (last_seg_url)
@@ -3506,8 +3745,10 @@
 				u32 nb_removed = ls_hls_purge_segments(group->download_segment_index, rep->segment_list->segment_URLs);
 				group->download_segment_index -= nb_removed;
 			}
+
 			//if TSB set, roll back
 			m3u8_setup_timeline(group, rep);
+
 			group->timeline_setup = GF_TRUE;
 			group->first_hls_chunk = GF_TRUE;
 		} else {
@@ -3600,10 +3841,10 @@
 		rep_sel = min_rep_sel;
 		min_bandwidth_selected = 1;
 	}
-	assert(rep_sel);
+	gf_assert(rep_sel);
 	i = gf_list_find(group->adaptation_set->representations, rep_sel);
 
-	assert((s32) i >= 0);
+	gf_assert((s32) i >= 0);
 
 	group->force_switch_bandwidth = 0;
 	group->max_bitrate = 0;
@@ -3613,7 +3854,7 @@
 		if (min_bandwidth_selected) {
 			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("DASH No representation found with bandwidth below %d kbps - using representation @ %d kbps\n", group->max_bitrate/1000, rep_sel->bandwidth/1000));
 		}
-		gf_dash_set_group_representation(group, rep_sel, GF_FALSE);
+		gf_dash_set_group_representation(group, rep_sel);
 	}
 }
 
@@ -3686,7 +3927,7 @@
 	}
 #endif
 
-	
+
 	if (!bytes_per_sec && group->local_files) {
 		bytes_per_sec = (u32) -1;
 		bytes_per_sec /= 8;
@@ -3738,8 +3979,8 @@
 	*/
 	if (dash->llhls_single_range && group->llhls_last_was_merged) {
 		u64 duration;
-		assert(rep->segment_list);
-		assert(rep->segment_list->timescale);
+		gf_assert(rep->segment_list);
+		gf_assert(rep->segment_list->timescale);
 		duration = rep->segment_list->duration;
 		if (group->llhls_edge_chunk) {
 			s32 pos = group->download_segment_index-1;
@@ -3971,7 +4212,9 @@
 		//but for a given number of segments - this avoids fluctuation in the quality
 		if (go_up_bitrate && !nb_inter_rep) {
 			new_rep->playback.probe_switch_count++;
-			if (new_rep->playback.probe_switch_count > dash->probe_times_before_switch) {
+			if (group->local_files && (new_rep->playback.probe_switch_count >= dash->probe_times_before_switch)) {
+				new_rep->playback.probe_switch_count = 0;
+			} else if (new_rep->playback.probe_switch_count > dash->probe_times_before_switch) {
 				new_rep->playback.probe_switch_count = 0;
 			} else {
 				new_index = group->active_rep_index;
@@ -4321,7 +4564,7 @@
 						GF_MPD_Representation *rep_m_prime, *rep_m_prime_plus_one;
 						Double Sm_prime, Sm_prime_plus_one, f_m_prime, f_m_prime_1, bola_o_pause;
 
-						assert(m_prime >= 0 && m_prime < nb_reps - 2);
+						gf_assert(m_prime >= 0 && m_prime < nb_reps - 2);
 						rep_m_prime = (GF_MPD_Representation *)gf_list_get(group->adaptation_set->representations, m_prime);
 						rep_m_prime_plus_one = (GF_MPD_Representation *)gf_list_get(group->adaptation_set->representations, m_prime+1);
 						Sm_prime = rep_m_prime->bandwidth*p;
@@ -4372,7 +4615,7 @@
 	}
 
 	/* The bytes_per_sec field is set each time a segment is downloaded,
-	   (this may need to be adjusted in the future to accomodate algorithms
+	   (this may need to be adjusted in the future to accommodate algorithms
 	   that smooth download rate over several segments)
 	   if set to 0, this means that no segment was downloaded since the last call
 	   because this AdaptationSet is not selected
@@ -4505,7 +4748,7 @@
 			new_rep->playback.waiting_codec_reset = GF_TRUE;
 		}
 		/* request downloads for the new representation */
-		gf_dash_set_group_representation(group, new_rep, GF_FALSE);
+		gf_dash_set_group_representation(group, new_rep);
 
 		/* Reset smoothing of switches
 		(note: should really apply only to algorithms using the switch_probe_count (smoothing the aggressiveness of the change)
@@ -4560,10 +4803,10 @@
 	bin128 key_iv;
 	u32 start_number = 0;
 
-	if (!dash || !group)
+	if (!dash || !group || !group->adaptation_set)
 		return GF_BAD_PARAM;
 
-	assert(group->adaptation_set && group->adaptation_set->representations);
+	gf_assert(group->adaptation_set->representations);
 	rep = gf_list_get(group->adaptation_set->representations, group->active_rep_index);
 	if (!rep) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("DASH Unable to find any representation, aborting.\n"));
@@ -4630,7 +4873,7 @@
 		}
 		//we don't reset the baseURL index until we are done fetching all init segments
 
-		assert(!group->nb_cached_segments);
+		gf_assert(!group->nb_cached_segments);
 		//transfer mem
 		group->cached0.url = base_init_url;
 		group->cached0.representation_index = group->active_rep_index;
@@ -4703,13 +4946,13 @@
 
 	if (dash->route_clock_state && !group->period->origin_base_url) {
 		GF_DASHFileIOSession sess = NULL;
-		/*check the init segment has been received*/
+		/*check the init segment has been received (eg is in the cache)*/
 		e = gf_dash_download_resource(dash, &sess, base_init_url, start_range, end_range, 1, NULL);
 		dash->dash_io->del(dash->dash_io, sess);
 
 		if (e!=GF_OK) {
 			//ROUTE + segment format not using init segment, we must wait for the segment to be available
-			//i fnot available after segment duration, check next segment
+			//if not available after segment duration, check next segment
 			if (group->no_init_seg) {
 				u32 ck = gf_sys_clock();
 				if (!group->time_at_first_failure) {
@@ -4720,12 +4963,21 @@
 					group->download_segment_index++;
 				}
 			}
+			//if init seg failed at tune-in, re-estimate route clock - this ensures we are always bootstraping on the last correct state
+			//otherwise we could init clock at segN in low latency but tune-in at segN+1, hence having one extra segment delay
+			else if (dash->initial_period_tunein) {
+				group->timeline_setup = GF_FALSE;
+				group->force_timeline_reeval = GF_TRUE;
+				dash->utc_drift_estimate = 0;
+				dash->route_clock_state = 1;
+				dash->route_low_latency = 0;
+			}
 			gf_free(base_init_url);
 			return e;
 		}
 	}
 
-	assert(!group->nb_cached_segments);
+	gf_assert(!group->nb_cached_segments);
 	group->cached0.url = base_init_url;
 	group->cached0.representation_index = group->active_rep_index;
 	group->cached0.duration = (u32) group->current_downloaded_segment_duration;
@@ -4753,7 +5005,7 @@
 		}
 	}
 	if (key_url) gf_free(key_url);
-	
+
 	group->nb_cached_segments = 1;
 	group->download_segment_index += nb_segment_read;
 
@@ -4827,11 +5079,11 @@
 		if (rep->playback.disabled) continue;
 
 		if (rep->bandwidth<=bandwidth) break;
-		assert(for_autoswitch);
+		gf_assert(for_autoswitch);
 		//go to next rep
 	}
-	assert(rep && !rep->playback.disabled);
-	gf_dash_set_group_representation(group, rep, GF_FALSE);
+	gf_assert(rep && !rep->playback.disabled);
+	gf_dash_set_group_representation(group, rep);
 }
 
 
@@ -4940,14 +5192,14 @@
 		rep = gf_dash_find_rep(dash, rep->dependency_id, &group);
 		if (sep) sep0 = ' ';
 	}
-	return group->groups_idx;
+	return group ? group->groups_idx : idx;
 }
 
 GF_EXPORT
 s32 gf_dash_group_has_dependent_group(GF_DashClient *dash, u32 idx)
 {
 	GF_DASH_Group *group = gf_list_get(dash->groups, idx);
-	if (!group) return GF_FALSE;
+	if (!group) return -1;
 	return group->depend_on_group ? group->depend_on_group->groups_idx : -1;
 }
 
@@ -4970,6 +5222,17 @@
 	return group_depending_on->groups_idx;
 }
 
+GF_EXPORT
+s32 gf_dash_get_base_group_index(GF_DashClient *dash, u32 idx)
+{
+	GF_DASH_Group *group = gf_list_get(dash->groups, idx);
+	if (!group) return -1;
+	if (group->groups_depending_on) return group->groups_idx;
+	if (group->depend_on_group) return group->depend_on_group->groups_idx;
+	return -1;
+}
+
+
 /* create groups (implementation of adaptations set) */
 GF_Err gf_dash_setup_groups(GF_DashClient *dash)
 {
@@ -5014,6 +5277,7 @@
 		group->adaptation_set = set;
 		group->period = period;
 		group->bitstream_switching = (set->bitstream_switching || period->bitstream_switching) ? GF_TRUE : GF_FALSE;
+		group->last_mpd_change_time = gf_sys_clock();
 
 		seg_dur = 0;
 		nb_dependent_rep = 0;
@@ -5148,7 +5412,7 @@
 						tmp = tmp + 1;
 					else
 						tmp = a_rep->dependency_id;
-					if (!strcmp(tmp, rep->id))
+					if (rep->id && !strcmp(tmp, rep->id))
 						rep->playback.enhancement_rep_index_plus_one = k + 1;
 				}
 			}
@@ -5200,7 +5464,7 @@
 		j = gf_dash_group_get_dependency_group(dash, i);
 		if (i != j) {
 			GF_DASH_Group *base_group = gf_list_get(dash->groups, j);
-			assert(base_group);
+			gf_assert(base_group);
 			group->depend_on_group = base_group;
 			if (!base_group->groups_depending_on) {
 				base_group->groups_depending_on = gf_list_new();
@@ -5349,12 +5613,14 @@
 		u8 *mem_address;
 		e = gf_blob_get(cache_name, &mem_address, &size, NULL);
 		if (e) return e;
-        gf_blob_release(cache_name);
-		if (offset+8 > size)
+		if (offset+8 > size) {
+			gf_blob_release(cache_name);
 			return GF_IO_ERR;
+		}
 		mem_address += offset;
 		*box_size = GF_4CC(mem_address0, mem_address1, mem_address2, mem_address3);
 		*box_type = GF_4CC(mem_address4, mem_address5, mem_address6, mem_address7);
+        gf_blob_release(cache_name);
 	} else {
 		unsigned char data4;
 		FILE *f = gf_fopen(cache_name, "rb");
@@ -5384,6 +5650,9 @@
 
 	download_sess = &group->dash->mpd_dnload;
 
+	if (group->download_sidx_pending)
+		goto retry_rep;
+
 	if (!rep->segment_base && !group->adaptation_set->segment_base && !group->period->segment_base) {
 		if (rep->segment_template || group->adaptation_set->segment_template || group->period->segment_template) return GF_OK;
 		if (rep->segment_list || group->adaptation_set->segment_list || group->period->segment_list) return GF_OK;
@@ -5436,15 +5705,18 @@
 		}
 	}
 
+retry_rep:
+
 	/*OK we are in single-file mode, download all required indexes & co*/
 	for (i=0; i<gf_list_count(group->adaptation_set->representations); i++) {
 		char *sidx_file = NULL;
 		u64 duration, index_start_range = 0, index_end_range = 0, init_start_range, init_end_range;
 		Bool index_in_base, init_in_base;
 		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);
+		if (group->pending_sidx_rep && (rep!=group->pending_sidx_rep))
+			continue;
 
 		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, NULL, NULL, NULL, NULL);
@@ -5484,55 +5756,74 @@
 			}
 			/*we need to download the init segment, at least partially*/
 			else {
-				u32 offset = 0;
-				u32 box_type = 0;
-				u32 box_size = 0;
-				u32 sidx_start = 0;
 				const char *cache_name;
 
-				GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("DASH Downloading init segment and SIDX for representation %s\n", init_url));
-
 				/*download first 8 bytes and check if we do have a box starting there*/
-				e = gf_dash_download_resource(group->dash, download_sess, init_url, offset, 7, 1, group);
-				if (e) goto exit;
-				cache_name = group->dash->dash_io->get_cache_name(group->dash->dash_io, *download_sess);
-				e = dash_load_box_type(cache_name, offset, &box_type, &box_size);
-				offset = 8;
-				while (box_type) {
+				if (!group->sidx_offset) {
+					if (!group->pending_sidx_rep) {
+						GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("DASH Downloading init segment and SIDX for representation %s\n", init_url));
+					}
+					group->box_size = 0;
+					group->box_type = 0;
+					group->sidx_start = 0;
+					e = gf_dash_download_resource(group->dash, download_sess, init_url, group->sidx_offset, 7, 1, group);
+					if (e) {
+						if (e==GF_NOT_READY) group->pending_sidx_rep = rep;
+						else group->pending_sidx_rep = NULL;
+						goto exit;
+					}
+					cache_name = group->dash->dash_io->get_cache_name(group->dash->dash_io, *download_sess);
+					if (!cache_name) {
+						group->pending_sidx_rep = NULL;
+						e = GF_SERVICE_ERROR;
+						goto exit;
+					}
+					dash_load_box_type(cache_name, group->sidx_offset, &group->box_type, &group->box_size);
+					group->sidx_offset = 8;
+				}
+				while (group->box_type) {
 					/*we got the moov, stop here */
-					if (!index_in_base && (box_type==GF_ISOM_BOX_TYPE_MOOV)) {
-						e = gf_dash_download_resource(group->dash, download_sess, init_url, offset, offset+box_size-9, 2, group);
+					if (!index_in_base && (group->box_type==GF_ISOM_BOX_TYPE_MOOV)) {
+						e = gf_dash_download_resource(group->dash, download_sess, init_url, group->sidx_offset, group->sidx_offset+group->box_size-9, 2, group);
+						if (e<0) break;
 						break;
 					} else {
-						const u32 offset_ori = offset;
-						e = gf_dash_download_resource(group->dash, download_sess, init_url, offset, offset+box_size-1, 2, group);
-						if (e < 0) goto exit;
-						offset += box_size;
+						const u32 offset_ori = group->sidx_offset;
+						e = gf_dash_download_resource(group->dash, download_sess, init_url, group->sidx_offset, group->sidx_offset+group->box_size-1, 2, group);
+						if (e<0) break;
+
+						group->sidx_offset += group->box_size;
 						/*we need to refresh the cache name because of our memory astorage thing ...*/
 						cache_name = group->dash->dash_io->get_cache_name(group->dash->dash_io, *download_sess);
-						e = dash_load_box_type(cache_name, offset-8, &box_type, &box_size);
-						if (e == GF_IO_ERR) {
+						dash_load_box_type(cache_name, group->sidx_offset-8, &group->box_type, &group->box_size);
+						if (!group->box_type) {
 							/*if the socket was closed then gf_dash_download_resource() with gmem:// was reset - retry*/
-							e = dash_load_box_type(cache_name, offset-offset_ori-8, &box_type, &box_size);
-							if (box_type == GF_ISOM_BOX_TYPE_SIDX) {
-								offset -= 8;
+							dash_load_box_type(cache_name, group->sidx_offset-offset_ori-8, &group->box_type, &group->box_size);
+							if (group->box_type == GF_ISOM_BOX_TYPE_SIDX) {
+								group->sidx_offset -= 8;
 								/*FIXME sidx found, reload the full resource*/
 								GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("DASH have to re-downloading init and SIDX for rep %s\n", init_url));
-								e = gf_dash_download_resource(group->dash, download_sess, init_url, 0, offset+box_size-1, 2, group);
+								e = gf_dash_download_resource(group->dash, download_sess, init_url, 0, group->sidx_offset+group->box_size-1, 2, group);
 								break;
 							}
 						}
 
-						if (box_type == GF_ISOM_BOX_TYPE_SIDX) {
-							if (!sidx_start) sidx_start = offset;
-							has_seen_sidx = 1;
-						} else if (has_seen_sidx)
+						if (group->box_type == GF_ISOM_BOX_TYPE_SIDX) {
+							if (!group->sidx_start) group->sidx_start = group->sidx_offset;
+						} else if (group->sidx_start)
 							break;
 					}
 				}
-				if (e < 0) goto exit;
-
-				if (box_type == 0) {
+				if (e < 0) {
+					if (e==GF_NOT_READY) group->pending_sidx_rep = rep;
+					else {
+						group->sidx_offset = 0;
+						group->pending_sidx_rep = NULL;
+					}
+					goto exit;
+				}
+				group->sidx_offset = 0;
+				if (group->box_type == 0) {
 					e = GF_ISOM_INVALID_FILE;
 					goto exit;
 				}
@@ -5557,7 +5848,7 @@
 					GF_SAFEALLOC(rep->segment_list->initialization_segment->byte_range, GF_MPD_ByteRange);
 					if (rep->segment_list->initialization_segment->byte_range) {
 						rep->segment_list->initialization_segment->byte_range->start_range = init_start_range;
-						rep->segment_list->initialization_segment->byte_range->end_range = init_end_range ? init_end_range : (sidx_start-1);
+						rep->segment_list->initialization_segment->byte_range->end_range = init_end_range ? init_end_range : (group->sidx_start-1);
 					}
 
 					//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 ..
@@ -5598,7 +5889,11 @@
 		/*we have index url, download it*/
 		if (! index_in_base) {
 			e = gf_dash_download_resource(group->dash, download_sess, index_url, index_start_range, index_end_range, 1, group);
-			if (e) goto exit;
+			if (e<0) {
+				if (e==GF_NOT_READY) group->pending_sidx_rep = rep;
+				else group->pending_sidx_rep = NULL;
+				goto exit;
+			}
 			sidx_file = (char *)group->dash->dash_io->get_cache_name(group->dash->dash_io, *download_sess);
 		}
 
@@ -5648,7 +5943,6 @@
 	GF_MPD *new_mpd;
 	GF_MPD_Period *period;
 	u32 nb_inserted = 0;
-	GF_DASHFileIOSession xlink_sess=NULL;
 
 	period = gf_list_get(period_list, period_idx);
 	if (!period->xlink_href || (dash->route_clock_state==1)) {
@@ -5679,7 +5973,8 @@
 		is_local=GF_TRUE;
 		e = GF_OK;
 	} else {
-		if (dash->query_string) {
+		e = GF_OK;
+		if (dash->query_string && !dash->xlink_sess) {
 			char *full_url;
 			char *purl, *sep;
 			u32 len;
@@ -5697,19 +5992,25 @@
 			sep = strstr(dash->query_string, "=PID");
 			if (sep && period->ID) {
 				char *sep2 = strstr(full_url, "=PID");
-				assert(sep2);
+				gf_assert(sep2);
 				sep21 = 0;
 				strcat(full_url, period->ID);
 				strcat(full_url, sep+4);
 			}
 
 			/*use non-persistent connection for MPD*/
-			e = gf_dash_download_resource(dash, &xlink_sess, full_url, 0, 0, 0, NULL);
+			e = gf_dash_download_resource(dash, &dash->xlink_sess, full_url, 0, 0, 0, NULL);
 			gf_free(full_url);
-
-		} else {
+		} else if (!dash->xlink_sess) {
 			/*use non-persistent connection for MPD*/
-			e = gf_dash_download_resource(dash, &xlink_sess, url ? url : period_xlink, 0, 0, 0, NULL);
+			e = gf_dash_download_resource(dash, &dash->xlink_sess, url ? url : period_xlink, 0, 0, 0, NULL);
+		}
+		if (!e) {
+			e = dash->dash_io->get_status(dash->dash_io, dash->xlink_sess);
+		}
+		if (e==GF_NOT_READY) {
+			if (url) gf_free(url);
+			return;
 		}
 	}
 
@@ -5717,14 +6018,17 @@
 		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("DASH Error - cannot download xlink from periods %s: error %s\n", period->xlink_href, gf_error_to_string(e)));
 		gf_free(period->xlink_href);
 		period->xlink_href = NULL;
-		if (xlink_sess) dash->dash_io->del(dash->dash_io, xlink_sess);
+		if (dash->xlink_sess) {
+			dash->dash_io->del(dash->dash_io, dash->xlink_sess);
+			dash->xlink_sess = NULL;
+		}
 		if (url) gf_free(url);
 		return;
 	}
 
 	if (!is_local) {
 		/*in case the session has been restarted, local_url may have been destroyed - get it back*/
-		local_url = dash->dash_io->get_cache_name(dash->dash_io, xlink_sess);
+		local_url = dash->dash_io->get_cache_name(dash->dash_io, dash->xlink_sess);
 	}
 
 	/* parse the MPD */
@@ -5733,11 +6037,12 @@
 	if (url) gf_free(url);
 	url = NULL;
 
-	if (xlink_sess) {
+	if (dash->xlink_sess) {
 		//get redirected URL
-		url = (char *) dash->dash_io->get_url(dash->dash_io, xlink_sess);
+		url = (char *) dash->dash_io->get_url(dash->dash_io, dash->xlink_sess);
 		if (url) url = gf_strdup(url);
-		dash->dash_io->del(dash->dash_io, xlink_sess);
+		dash->dash_io->del(dash->dash_io, dash->xlink_sess);
+		dash->xlink_sess = NULL;
 	}
 	if (e != GF_OK) {
 		gf_xml_dom_del(parser);
@@ -5783,7 +6088,7 @@
 	while (gf_list_count(new_mpd->periods)) {
 		GF_MPD_Period *inserted_period = gf_list_get(new_mpd->periods, 0);
 		gf_list_rem(new_mpd->periods, 0);
-		//forbiden
+		//forbidden
 		if (inserted_period->xlink_href && inserted_period->xlink_actuate_on_load) {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("DASH Invalid remote period with xlink:actuate=\"onLoad\" and xlink:href set, removing parent period.\n"));
 			gf_mpd_period_free(inserted_period);
@@ -5901,7 +6206,7 @@
 		} else {
 			lower_quality = 0;
 		}
-		gf_dash_set_group_representation(group, gf_list_get(group->adaptation_set->representations, lower_quality), GF_FALSE);
+		gf_dash_set_group_representation(group, gf_list_get(group->adaptation_set->representations, lower_quality));
 	}
 }
 
@@ -5922,7 +6227,39 @@
 	gf_list_add(dash->SRDs, srd);
 	return srd;
 }
-
+static GF_Err dash_check_supported_mime(GF_MPD_Period *period)
+{
+	u32 count, as_i;
+	/*we are not able to process mkv / webm dash (youtube) using dashin+input filters due to limitations
+	in ffmpeg avformat APIs - if this is used, return GF_PROFILE_NOT_SUPPORTED, this will trigger reconfig of the filter chain */
+	Bool has_ok=GF_FALSE;
+	count = gf_list_count(period->adaptation_sets);
+	for (as_i=0; as_i<count; as_i++) {
+		u32 k, nb_ko=0, nb_rep;
+		GF_MPD_AdaptationSet *set = (GF_MPD_AdaptationSet*)gf_list_get(period->adaptation_sets, as_i);
+		nb_rep = gf_list_count(set->representations);
+		for (k=0; k<nb_rep; ++k) {
+			GF_MPD_Representation *rep = (GF_MPD_Representation*)gf_list_get(set->representations, k);
+			char *sep = rep->mime_type ? rep->mime_type : set->mime_type;
+			sep = sep ? strchr(sep, '/') : NULL;
+			if (sep) sep++;
+			else sep="";
+			if (!stricmp(sep, "webm") || !stricmp(sep, "matroska") || !stricmp(sep, "x-matroska")) {
+				rep->playback.disabled = GF_TRUE;
+				nb_ko++;
+			} else {
+				has_ok = GF_TRUE;
+			}
+		}
+		//if one AS is using only non-supported mimes, don't open (this prevents trying to open webm + webvtt)
+		if (nb_ko==nb_rep) {
+			return GF_PROFILE_NOT_SUPPORTED;
+		}
+	}
+	if (!has_ok)
+		return GF_PROFILE_NOT_SUPPORTED;
+	return GF_OK;
+}
 static GF_Err gf_dash_setup_period(GF_DashClient *dash)
 {
 	GF_MPD_Period *period;
@@ -5949,18 +6286,9 @@
 			period->duration = next_period->start - period->start;
 	}
 
-	/*we are not able to process webm dash (youtube)*/
-	j = gf_list_count(period->adaptation_sets);
-	for (as_i=0; as_i<j; as_i++) {
-		GF_MPD_AdaptationSet *set = (GF_MPD_AdaptationSet*)gf_list_get(period->adaptation_sets, as_i);
-		if (set->mime_type && strstr(set->mime_type, "webm")) {
-			u32 k;
-			for (k=0; k<gf_list_count(set->representations); ++k) {
-				GF_MPD_Representation *rep = (GF_MPD_Representation*)gf_list_get(set->representations, k);
-				rep->playback.disabled = GF_TRUE;
-			}
-		}
-	}
+	GF_Err e = dash_check_supported_mime(period);
+	if (e) return e;
+
 
 	GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("DASH Setting up period start "LLU" duration "LLU" xlink %s ID %s\n", period->start, period->duration, period->origin_base_url ? period->origin_base_url : "none", period->ID ? period->ID : "none"));
 
@@ -5980,6 +6308,20 @@
 		Bool active_rep_found;
 
 		active_rep = 0;
+		nb_rep = gf_list_count(group->adaptation_set->representations);
+
+		//group already setup
+		if (group->selection != GF_DASH_GROUP_NOT_SETUP) {
+			if (group->selection > GF_DASH_GROUP_NOT_SELECTABLE) nb_groups_ok++;
+			continue;
+		}
+		if (group->pending_rep) {
+			rep_sel = group->pending_rep;
+			goto retry_pending_rep;
+		}
+		if (group->download_sidx_pending) {
+			goto sidx_pending;
+		}
 
 		if (dash->dbg_grps_index) {
 			Bool disable = GF_TRUE;
@@ -5996,8 +6338,6 @@
 			}
 		}
 
-		nb_rep = gf_list_count(group->adaptation_set->representations);
-
 		//on HLS get rid of audio only adaptation set if not in fMP4 mode
 		if (dash->is_m3u8
 			&& !group->adaptation_set->max_width
@@ -6023,7 +6363,12 @@
 
 		for (j=0; j<gf_list_count(group->adaptation_set->essential_properties); j++) {
 			GF_MPD_Descriptor *mpd_desc = gf_list_get(group->adaptation_set->essential_properties, j);
-			if (!strcmp(mpd_desc->scheme_id_uri, "urn:mpeg:dash:srd:2014")) {
+			if (!mpd_desc->scheme_id_uri) {
+				GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("DASH AdaptationSet with unrecognized EssentialProperty (no uri) - ignoring because not supported\n"));
+				disabled = 1;
+				break;
+			}
+			if (mpd_desc && mpd_desc->scheme_id_uri && !strcmp(mpd_desc->scheme_id_uri, "urn:mpeg:dash:srd:2014") && mpd_desc->value) {
 				u32 id, w, h, res;
 				w = h = 0;
 				res = sscanf(mpd_desc->value, "%d,%d,%d,%d,%d,%d,%d", &id, &group->srd_x, &group->srd_y, &group->srd_w, &group->srd_h, &w, &h);
@@ -6074,7 +6419,7 @@
 
 		for (j=0; j<gf_list_count(group->adaptation_set->supplemental_properties); j++) {
 			GF_MPD_Descriptor *mpd_desc = gf_list_get(group->adaptation_set->supplemental_properties, j);
-			if (!strcmp(mpd_desc->scheme_id_uri, "urn:mpeg:dash:srd:2014")) {
+			if (mpd_desc && mpd_desc->scheme_id_uri && !strcmp(mpd_desc->scheme_id_uri, "urn:mpeg:dash:srd:2014") && mpd_desc->value) {
 				u32 id, w, h, res;
 				w = h = 0;
 				res = sscanf(mpd_desc->value, "%d,%d,%d,%d,%d,%d,%d", &id, &group->srd_x, &group->srd_y, &group->srd_w, &group->srd_h, &w, &h);
@@ -6095,8 +6440,12 @@
 			}
 		}
 
+sidx_pending:
 		/*translate from single-indexed file to SegmentList*/
 		gf_dash_setup_single_index_mode(group);
+		if (group->download_sidx_pending) {
+			return GF_NOT_READY;
+		}
 
 		/* Select the appropriate representation in the given period */
 		for (rep_i = 0; rep_i < nb_rep; rep_i++) {
@@ -6124,6 +6473,7 @@
 select_active_rep:
 		group->min_representation_bitrate = (u32) -1;
 		active_rep_found = GF_FALSE;
+
 		for (rep_i = 0; rep_i < nb_rep; rep_i++) {
 			u32 first_select_mode = dash->first_select_mode;
 			GF_MPD_Representation *rep = gf_list_get(group->adaptation_set->representations, rep_i);
@@ -6227,14 +6577,18 @@
 
 		rep_sel = gf_list_get(group->adaptation_set->representations, active_rep);
 
-		gf_dash_set_group_representation(group, rep_sel, GF_FALSE);
+retry_pending_rep:
+		gf_dash_set_group_representation(group, rep_sel);
+		if (group->pending_rep)
+			return GF_NOT_READY;
+
 		if (group->dash->force_period_reload) {
 			gf_dash_reset_groups(dash);
 			dash->period_groups_setup = GF_FALSE;
 			dash->dash_state = GF_DASH_STATE_SETUP;
 			return GF_OK;
 		}
-		
+
 		// active representation is marked as disabled, we need to redo the selection
 		if (rep_sel->playback.disabled)
 			goto select_active_rep;
@@ -6268,7 +6622,7 @@
 
 	//setup SRDs
 	for (as_i = 0; as_i<gf_list_count(dash->SRDs); as_i++) {
-		u32 cols10, rows10;
+		u32 cols10, rows10, nb_srd_it=0;
 		struct _dash_srd_desc *srd = gf_list_get(dash->SRDs, as_i);
 
 		srd->srd_nb_rows = srd->srd_nb_cols = 0;
@@ -6282,7 +6636,7 @@
 
 			if (dg1->srd_desc != srd) continue;
 			if (dg2->srd_desc != srd) continue;
-
+			nb_srd_it++;
 			if (dg1_weight > dg2_weight) {
 				gf_list_rem(dash->groups, j);
 				gf_list_insert(dash->groups, dg2, j-1);
@@ -6290,6 +6644,12 @@
 				j=0;
 			}
 		}
+		if (nb_srd_it && (dash->auto_switch_count<0)) {
+			nb_srd_it++;
+			dash->auto_switch_count = nb_srd_it;
+		} else {
+			nb_srd_it=0;
+		}
 
 		//groups are now sorted for this srd, locate col/row positions
 		for (group_i=0; group_i<gf_list_count(dash->groups); group_i++) {
@@ -6299,6 +6659,10 @@
 			if (group->srd_desc != srd) continue;
 
 			if (!group->srd_w || !group->srd_h) continue;
+			if (nb_srd_it) {
+				nb_srd_it--;
+				group->nb_segments_done = nb_srd_it;
+			}
 
 			for (k=0; k<srd->srd_nb_cols; k++) {
 				if (colsk==group->srd_x) {
@@ -6631,6 +6995,7 @@
 	}
 	if (!group->timeline_setup) {
 		gf_dash_group_timeline_setup(dash->mpd, group, 0);
+		if (group->dash->pending_utc_session) return GF_DASH_DownloadCancel;
 		group->timeline_setup = GF_TRUE;
 	}
 
@@ -6639,6 +7004,7 @@
 	rep = gf_list_get(group->adaptation_set->representations, group->active_rep_index);
 	rep->playback.broadcast_flag = GF_FALSE;
 
+
 llhls_rety:
 	//special case for LL-HLS: if we have a switch request pending, check if next fragment is the first of a new seg
 	//or a complete seg (we do not switch in the middle of a segment)
@@ -6647,10 +7013,10 @@
 		if (hlsseg && (! hlsseg->hls_ll_chunk_type || hlsseg->is_first_part)) {
 			rep = gf_list_get(group->adaptation_set->representations, group->llhls_switch_request);
 			group->llhls_edge_chunk = NULL;
-			gf_dash_set_group_representation(group, rep, GF_TRUE);
-			assert(group->llhls_switch_request<0);
+			gf_dash_set_group_representation(group, rep);
+			gf_assert(group->llhls_switch_request<0);
 			//we are waiting for playlist update, return
-			if (group->hls_next_seq_num) {
+			if (group->hls_next_seq_num || rep->in_progress) {
 				return GF_DASH_DownloadCancel;
 			}
 			//otherwise new rep is set
@@ -6693,12 +7059,17 @@
 					gf_dash_mark_group_done(group);
 					return GF_DASH_DownloadCancel;
 				}
-				else if ((dyn_type==GF_MPD_TYPE_DYNAMIC) && group->period->duration) {
+				//mpd being refreshed, don't take decision now
+				if (dash->pending_group_idx_plus_one)
+					return GF_DASH_DownloadCancel;
+
+				if (group->period->duration) {
 					GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("DASH Last segment in period (dynamic mode) - group is done\n"));
 					gf_dash_mark_group_done(group);
 					return GF_DASH_DownloadCancel;
 				}
-				else if (! group->maybe_end_of_stream) {
+
+				if (! group->maybe_end_of_stream) {
 					u32 now = gf_sys_clock();
 					GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("DASH End of segment list reached (%d segments but idx is %d), waiting for next MPD update\n", group->nb_segments_in_rep, group->download_segment_index));
 
@@ -6707,12 +7078,15 @@
 					}
 
 					if (dash->is_m3u8 && (dyn_type==GF_MPD_TYPE_DYNAMIC)) {
-						if (!group->time_at_first_reload_required)
+						if (!group->time_at_first_reload_required) {
+							//first time we start timeout, force MPD update
+							dash->force_mpd_update = GF_TRUE;
 							group->time_at_first_reload_required = now;
+						}
 
 						//use group last modification time
 						timer = now - group->last_mpd_change_time;
-						if (timer < group->segment_duration * 2000) {
+						if (timer < group->segment_duration * 4000) {
 							//no more segment, force a manifest update now
 							dash->force_mpd_update = GF_TRUE;
 						} else {
@@ -6724,6 +7098,8 @@
 
 					if (!group->time_at_first_reload_required) {
 						group->time_at_first_reload_required = now;
+						//first time we start timeout, force MPD update
+						dash->force_mpd_update = GF_TRUE;
 						return GF_DASH_DownloadCancel;
 					}
 					if (now - group->time_at_first_reload_required < group->cache_duration)
@@ -6849,16 +7225,16 @@
 	}
 
 	if (dash->is_m3u8 && group->is_low_latency) {
-		assert(rep->segment_list);
+		gf_assert(rep->segment_list);
 		GF_MPD_SegmentURL *hlsseg = gf_list_get(rep->segment_list->segment_URLs, group->download_segment_index);
-		assert(hlsseg);
+		gf_assert(hlsseg);
 
 		if (dash->llhls_single_range && hlsseg->media_range && (hlsseg->can_merge || group->llhls_last_was_merged) ) {
 			//if not very first request (tune in) and not first part of seg, if mergeable issue a single byterange
 			if (!group->first_hls_chunk && hlsseg->media_range->start_range) {
 				if (!hlsseg->can_merge) {
 					GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("DASH LL-HLS part cannot be merged with previously open byte-range request, disabling merging !\n"));
-					dash->llhls_single_range = GF_FALSE;
+					dash->llhls_single_range = 0;
 				}
 				group->download_segment_index++;
 				if (new_base_seg_url) gf_free(new_base_seg_url);
@@ -6867,11 +7243,18 @@
 				key_url = NULL;
 				goto llhls_rety;
 			}
-			group->first_hls_chunk = GF_FALSE;
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("DASH Changing LL-HLS request %s @ "LLU"->"LLU" to open end range\n", new_base_seg_url, start_range, end_range));
-			end_range = (u64) -1;
-			llhls_live_edge_type = 2;
-			group->llhls_last_was_merged = GF_TRUE;
+			//tune-in on non-first part, if not talking to GPAC, disable merging
+			if (group->first_hls_chunk && hlsseg->media_range->start_range && (dash->llhls_single_range==2)) {
+				group->llhls_last_was_merged = GF_FALSE;
+				if (hlsseg->hls_ll_chunk_type)
+					llhls_live_edge_type = 1;
+			} else {
+				group->first_hls_chunk = GF_FALSE;
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("DASH Changing LL-HLS request %s @ "LLU"->"LLU" to open end range\n", new_base_seg_url, start_range, end_range));
+				end_range = (u64) -1;
+				llhls_live_edge_type = 2;
+				group->llhls_last_was_merged = GF_TRUE;
+			}
 		} else {
 			group->llhls_last_was_merged = GF_FALSE;
 			if (hlsseg->hls_ll_chunk_type)
@@ -6935,7 +7318,7 @@
 	}
 
 
-	assert(base_group->nb_cached_segments<base_group->max_cached_segments);
+	gf_assert(base_group->nb_cached_segments<base_group->max_cached_segments);
 	cache_entry = &base_group->cachedbase_group->nb_cached_segments;
 
 	//assign url
@@ -7201,7 +7584,6 @@
 			Bool test_pass = GF_TRUE;
 			while (1) {
 				u32 nb_rep_increased = 0;
-				u32 nb_rep_in_qidx = 0;
 				u32 cumulated_bw_in_pass = 0;
 
 				for (i=0; i<count; i++) {
@@ -7217,8 +7599,6 @@
 					if (group->target_new_rep + 1 == gf_list_count(group->adaptation_set->representations))
 						continue;
 
-					nb_rep_in_qidx++;
-
 					rep = gf_list_get(group->adaptation_set->representations, group->target_new_rep);
 					diff = rep->bandwidth;
 					rep_new = gf_list_get(group->adaptation_set->representations, group->target_new_rep+1);
@@ -7313,7 +7693,7 @@
 			else if (dash->tile_rate_decrease) {
 				quality_rank = gf_dash_get_tiles_quality_rank(dash, group);
 				if (quality_rank >= nb_qualities) quality_rank = nb_qualities-1;
-				assert(groups_per_qualityquality_rank);
+				gf_assert(groups_per_qualityquality_rank);
 				group->bytes_per_sec = bandwidthsquality_rank / groups_per_qualityquality_rank;
 			}
 		}
@@ -7355,6 +7735,9 @@
 		/*setup period*/
 		e = gf_dash_setup_period(dash);
 		if (e) {
+			if (e==GF_NOT_READY)
+				return e;
+
 			//move to stop state before sending the error event otherwise we might deadlock when disconnecting the dash client
 			dash->dash_state = GF_DASH_STATE_STOPPED;
 			dash->dash_io->on_dash_event(dash->dash_io, GF_DASH_EVENT_PERIOD_SETUP_ERROR, -1, e);
@@ -7471,6 +7854,10 @@
 		dash->hls_reload_time = 0;
 		e = gf_dash_update_manifest(dash);
 		if (e) {
+			if (e==GF_NOT_READY) {
+				dash->force_mpd_update = GF_TRUE;
+				return e;
+			}
 			if (!dash->in_error) {
 				GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("DASH Error updating MPD %s\n", gf_error_to_string(e)));
 			}
@@ -7580,7 +7967,7 @@
 					} else if (dash->chain_stack_state==GF_DASH_CHAIN_POP) {
 						dash->chain_next = gf_list_pop_back(dash->chain_stack);
 					}
-					assert(dash->chain_next);
+					gf_assert(dash->chain_next);
 					dash->chain_stack_state = 0;
 					dash->dash_state = GF_DASH_STATE_CHAIN_NEXT;
 					is_chain = GF_TRUE;
@@ -7607,6 +7994,9 @@
 	return GF_OK;
 }
 
+static GF_Err gf_dash_check_periods(GF_DashClient *dash);
+static Bool gf_dash_seek_periods(GF_DashClient *dash, Double seek_time);
+
 static GF_Err gf_dash_process_internal(GF_DashClient *dash)
 {
 	GF_Err e;
@@ -7657,9 +8047,33 @@
 		return e;
 	}
 	case GF_DASH_STATE_SETUP:
+
+		if (dash->xlink_sess) {
+			e = gf_dash_check_periods(dash);
+			if (dash->xlink_sess) return GF_IP_NETWORK_EMPTY;
+			if (e) return e;
+		}
+
+		if (dash->force_mpd_update || dash->manifest_pending) {
+			dash->force_mpd_update = GF_FALSE;
+			dash->hls_reload_time = 0;
+			e = gf_dash_update_manifest(dash);
+			if (e==GF_NOT_READY) {
+				return GF_IP_NETWORK_EMPTY;
+			}
+			else if (e) return e;
+		}
+
 		dash->in_period_setup = 1;
 		e = dash_setup_period_and_groups(dash);
-		if (e) return e;
+		if (e) {
+			if ((e==GF_NOT_READY) || (e==GF_IP_NETWORK_EMPTY)) {
+				dash->in_period_setup = 0;
+				dash->dash_state = GF_DASH_STATE_SETUP;
+				return GF_IP_NETWORK_EMPTY;
+			}
+			return e;
+		}
 
 		if (dash->force_period_reload) {
 			dash->force_period_reload = gf_sys_clock();
@@ -7670,7 +8084,7 @@
 		dash->dash_state = GF_DASH_STATE_CONNECTING;
 
 		//fallthrough
-		
+
 	case GF_DASH_STATE_CONNECTING:
 		/*ask the user to connect to desired groups*/
 		e = dash->dash_io->on_dash_event(dash->dash_io, GF_DASH_EVENT_CREATE_PLAYBACK, -1, GF_OK);
@@ -7680,8 +8094,28 @@
 		dash->min_wait_ms_before_next_request = 0;
 		return GF_OK;
 	case GF_DASH_STATE_RUNNING:
+
+		//we are waiting for some xlinks to be resolved on one or more groups
+		if (dash->has_pending_groups) {
+			dash->has_pending_groups = GF_FALSE;
+			u32 i, group_count = gf_list_count(dash->groups);
+			for (i=0; i<group_count; i++) {
+				GF_DASH_Group *group = gf_list_get(dash->groups, i);
+				if (!group->pending_rep) continue;
+				gf_dash_set_group_representation(group, group->pending_rep);
+				if (group->pending_rep) return GF_IP_NETWORK_EMPTY;
+			}
+		}
+
+
+		if (dash->seek_pending>=0) {
+			gf_dash_seek_periods(dash, dash->seek_pending);
+			if (dash->seek_pending>=0) return GF_IP_NETWORK_EMPTY;
+		}
+
 		e = dash_check_mpd_update_and_cache(dash, &cache_is_full);
 		if (e || cache_is_full) {
+			if (e==GF_NOT_READY) return GF_IP_NETWORK_EMPTY;
 			return GF_OK;
 		}
 
@@ -7705,7 +8139,7 @@
 	return gf_dash_process_internal(dash);
 }
 
-
+//only called when setting up an mpd
 static u32 gf_dash_period_index_from_time(GF_DashClient *dash, u64 time)
 {
 	u32 i, count, active_period_plus_one;
@@ -7728,7 +8162,6 @@
 		time += now;
 	}
 
-
 restart:
 	count = gf_list_count(dash->mpd->periods);
 	cumul_start = 0;
@@ -7737,8 +8170,11 @@
 		period = gf_list_get(dash->mpd->periods, i);
 
 		if (period->xlink_href && !period->duration) {
-			if (!active_period_plus_one || period->xlink_actuate_on_load) {
+			//if on_load mode, force period resolving
+			if (!active_period_plus_one  || period->xlink_actuate_on_load) {
 				gf_dash_solve_period_xlink(dash, dash->mpd->periods, i);
+				if (dash->xlink_sess) return 0;
+				//period may be destroyed/recreated at this point, re-browse all lisrt
 				goto restart;
 			}
 		}
@@ -7761,6 +8197,26 @@
 	return active_period_plus_one ? active_period_plus_one-1 : 0;
 }
 
+static GF_Err gf_dash_check_periods(GF_DashClient *dash)
+{
+	GF_MPD_Period *period;
+	/* Get the right period from the given time */
+	dash->active_period_index = gf_dash_period_index_from_time(dash, 0);
+	if (dash->xlink_sess) return GF_OK;
+
+	period = gf_list_get(dash->mpd->periods, dash->active_period_index);
+	if (period && period->xlink_href) {
+		gf_dash_solve_period_xlink(dash, dash->mpd->periods, dash->active_period_index);
+		period = gf_list_get(dash->mpd->periods, dash->active_period_index);
+	}
+	if (!period || !gf_list_count(period->adaptation_sets) ) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("DASH Error - cannot start: not enough periods or representations in MPD\n"));
+		return GF_URL_ERROR;
+	}
+	return dash_check_supported_mime(period);
+}
+
+
 static Bool gf_dash_seek_periods(GF_DashClient *dash, Double seek_time)
 {
 	Double start_time;
@@ -7771,8 +8227,8 @@
 	 * */
 	Bool at_period_boundary=GF_FALSE;
 	u32 i, period_idx;
-	u32 nb_retry = 10;
 
+restart:
 	dash->start_range_period = 0;
 	start_time = 0;
 	period_idx = 0;
@@ -7780,18 +8236,16 @@
 		GF_MPD_Period *period = gf_list_get(dash->mpd->periods, i);
 		Double dur;
 
-		if (period->xlink_href) {
+		if (period->xlink_href && !period->duration) {
 			gf_dash_solve_period_xlink(dash, dash->mpd->periods, i);
-			if (nb_retry) {
-				nb_retry --;
-				i--;
-				continue;
-			}
-			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("DASH Period still resolves to XLINK %s for more than 10 consecutive retry, ignoring it ...\n", period->xlink_href));
-			gf_free(period->xlink_href);
-			period->xlink_href = NULL;
-		} else {
-			nb_retry = 10;
+			//async fetch pending and duration not known, assume perido switch will happen
+			if (dash->xlink_sess) {
+				dash->seek_pending = seek_time;
+				return GF_TRUE;
+			}
+			//period could have been removed or reallocated, restart
+			dash->seek_pending = -1;
+			goto restart;
 		}
 		dur = (Double)period->duration;
 		dur /= 1000;
@@ -7826,7 +8280,7 @@
 	u32 first_downloaded, last_downloaded, segment_idx, orig_idx;
 
 	if (group->selection==GF_DASH_GROUP_NOT_SELECTABLE) return;
-	
+
 	group->force_segment_switch = 0;
 	if (!is_dynamic) {
 		/*figure out where to seek*/
@@ -7954,6 +8408,13 @@
 	return NULL;
 }
 
+static GF_Err http_ifce_get_status(GF_FileDownload *getter)
+{
+	GF_DashClient *dash = (GF_DashClient*) getter->udta;
+	if (getter->session) return dash->dash_io->get_status(dash->dash_io, getter->session);
+	return GF_SERVICE_ERROR;
+}
+
 GF_EXPORT
 GF_Err gf_dash_open(GF_DashClient *dash, const char *manifest_url)
 {
@@ -7962,7 +8423,6 @@
 	char *sep_cgi = NULL;
 	char *sep_frag = NULL;
 	GF_Err e;
-	GF_MPD_Period *period;
 	GF_DOMParser *mpd_parser=NULL;
 	Bool is_local = GF_FALSE;
 
@@ -7977,6 +8437,7 @@
 	dash->utc_drift_estimate = 0;
 	dash->time_in_tsb = dash->prev_time_in_tsb = 0;
 	dash->reinit_period_index = 0;
+	dash->seek_pending = -1;
 
 	if (dash->base_url) gf_free(dash->base_url);
 	sep_cgi = strrchr(manifest_url, '?');
@@ -7988,6 +8449,7 @@
 	dash->getter.new_session = http_ifce_get;
 	dash->getter.del_session = http_ifce_clean;
 	dash->getter.get_cache_name = http_ifce_cache_name;
+	dash->getter.get_status = http_ifce_get_status;
 	dash->getter.session = NULL;
 
 
@@ -8162,26 +8624,12 @@
 	}
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("DASH DASH client initialized from MPD at UTC time "LLU" - availabilityStartTime "LLU"\n", dash->mpd_fetch_time , dash->mpd->availabilityStartTime));
 
-	if (is_local && dash->mpd->minimum_update_period) {
-		e = gf_dash_update_manifest(dash);
-		if (e != GF_OK) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("DASH Error - cannot update MPD: %s\n", gf_error_to_string(e)));
-			goto exit;
-		}
+	if (is_local && dash->mpd->minimum_update_period && (dash->mpd->type==GF_MPD_TYPE_DYNAMIC)) {
+		dash->force_mpd_update = GF_TRUE;
 	}
 
-	/* Get the right period from the given time */
-	dash->active_period_index = gf_dash_period_index_from_time(dash, 0);
-	period = gf_list_get(dash->mpd->periods, dash->active_period_index);
-	if (period->xlink_href) {
-		gf_dash_solve_period_xlink(dash, dash->mpd->periods, dash->active_period_index);
-		period = gf_list_get(dash->mpd->periods, dash->active_period_index);
-	}
-	if (!period || !gf_list_count(period->adaptation_sets) ) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("DASH Error - cannot start: not enough periods or representations in MPD\n"));
-		e = GF_URL_ERROR;
-		goto exit;
-	}
+	e = gf_dash_check_periods(dash);
+	if (e) goto exit;
 
 	if (dash->chaining_mode) {
 		dash_check_chaining(dash, "urn:mpeg:dash:mpd-chaining:2016", &dash->chain_next, 0);
@@ -8208,7 +8656,7 @@
 GF_EXPORT
 void gf_dash_close(GF_DashClient *dash)
 {
-	assert(dash);
+	gf_assert(dash);
 
 	if (dash->dash_io) {
 		if (dash->mpd_dnload) {
@@ -8237,6 +8685,19 @@
 
 	if (dash->dash_state != GF_DASH_STATE_CONNECTING)
 		gf_dash_reset_groups(dash);
+
+	//reset async state in case we close in middle of update
+	if (dash->pending_hls_temp_rep) {
+		gf_mpd_representation_free(dash->pending_hls_temp_rep);
+		dash->pending_hls_temp_rep = NULL;
+	}
+	if (dash->pending_mpd) {
+		gf_mpd_del(dash->pending_mpd);
+		dash->pending_mpd = NULL;
+	}
+	dash->manifest_pending = 0;
+	dash->pending_has_reps_unchanged = GF_FALSE;
+	dash->pending_nb_rep_unchanged = dash->pending_group_idx_plus_one = dash->pending_rep_idx_plus_one = 0;
 }
 
 GF_EXPORT
@@ -8397,7 +8858,7 @@
 GF_EXPORT
 void gf_dash_enable_single_range_llhls(GF_DashClient *dash, Bool enable)
 {
-	dash->llhls_single_range = enable;
+	dash->llhls_single_range = enable ? 1 : 0;
 }
 
 GF_EXPORT
@@ -8793,6 +9254,15 @@
 }
 
 GF_EXPORT
+const char*gf_dash_get_period_id(GF_DashClient *dash)
+{
+	if (!dash) return NULL;
+	GF_MPD_Period *p = gf_list_get(dash->mpd->periods, dash->active_period_index);
+	if (!p) return NULL;
+	return p->ID;
+}
+
+GF_EXPORT
 void gf_dash_group_select(GF_DashClient *dash, u32 idx, Bool select)
 {
 	Bool needs_resetup = GF_FALSE;
@@ -8940,7 +9410,7 @@
 	default:
 		break;
 	}
-	
+
 	if (dash->active_period_index+1 < gf_list_count(dash->mpd->periods))
 		return GF_FALSE;
 
@@ -9048,6 +9518,24 @@
 			GF_MPD_Representation *rep = gf_list_get(group->adaptation_set->representations, group->active_rep_index);
 			*init_segment = rep ? rep->playback.init_seg_name_start : NULL;
 		}
+		if (group->init_segment_is_media) {
+			if (seg_number) *seg_number = 0;
+			if (seg_time || seg_dur_ms) {
+				u64 segment_dur, res;
+				u32 seg_scale;
+				u32 cur_grp_idx = group->download_segment_index;
+				group->download_segment_index = 0;
+				res = gf_dash_get_segment_start_time_with_timescale(group, &segment_dur, &seg_scale, NULL);
+				if (seg_time) {
+					seg_time->num = res;
+					seg_time->den = seg_scale;
+				}
+				if (seg_dur_ms) {
+					*seg_dur_ms = (u32) gf_timestamp_rescale(segment_dur, seg_scale, 1000);
+				}
+				group->download_segment_index = cur_grp_idx;
+			}
+		}
 	} else {
 		u32 rep_idx = dependent_representation_index;
 		if (group->nb_cached_segments <= rep_idx) {
@@ -9068,7 +9556,10 @@
 	GF_MPD_Representation *rep;
 	GF_DASH_Group *group = gf_list_get(dash->groups, idx);
 	if (!group) return NULL;
-	rep = gf_list_get(group->adaptation_set->representations, group->active_rep_index);
+	if (group->nb_cached_segments)
+		rep = gf_list_get(group->adaptation_set->representations, group->cached0.representation_index);
+	else
+		rep = gf_list_get(group->adaptation_set->representations, group->active_rep_index);
 	return rep->id;
 }
 
@@ -9086,7 +9577,7 @@
 		return;
 	}
 	delete_next = (group->cached0.flags & SEG_FLAG_DEP_FOLLOWING) ? GF_TRUE : GF_FALSE;
-	assert(group->cached0.url);
+	gf_assert(group->cached0.url);
 
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("DASH removing segment %s from list\n", group->cached0.url));
 
@@ -9659,11 +10150,19 @@
 	u32 i=0;
 	GF_DASH_Group *group = gf_list_get(dash->groups, idx);
 	if (!group) return 0;
+	GF_List *l = group->adaptation_set->audio_channels;
+	if (!gf_list_count(l)) {
+		GF_MPD_Representation *rep = gf_list_get(group->adaptation_set->representations, 0);
+		if (rep && rep->audio_channels) l = rep->audio_channels;
+	}
 
-	while ((mpd_desc=gf_list_enum(group->adaptation_set->audio_channels, &i))) {
+	while ((mpd_desc=gf_list_enum(l, &i))) {
 		if (!strcmp(mpd_desc->scheme_id_uri, "urn:mpeg:dash:23003:3:audio_channel_configuration:2011")) {
 			return atoi(mpd_desc->value);
 		}
+		if (!strcmp(mpd_desc->scheme_id_uri, "urn:mpeg:mpegB:cicp:ChannelConfiguration")) {
+			return gf_audio_fmt_get_num_channels_from_layout( gf_audio_fmt_get_layout_from_cicp(atoi(mpd_desc->value)));
+		}
 	}
 	return 0;
 }
@@ -10121,7 +10620,54 @@
 	return GF_OK;
 }
 
+static void dash_check_group_visible(GF_DASH_Group *a_group, GF_DASH_Group *par_group, u32 min_x, u32 max_x, u32 min_y, u32 max_y, Bool is_gaze)
+{
+	u32 old_hint;
+	u32 is_visible = 1;
+	if (!a_group->srd_w || !a_group->srd_h) return;
+
+	old_hint = a_group->quality_degradation_hint;
+	if (is_gaze) {
+		if (min_x < a_group->srd_x)
+			is_visible = 0;
+		else if (min_x > a_group->srd_x + a_group->srd_w)
+			is_visible = 0;
+		else if (min_y < a_group->srd_y)
+			is_visible = 0;
+		else if (min_y > a_group->srd_y + a_group->srd_h)
+			is_visible = 0;
+
+	} else {
+		//single rectangle case
+		if (min_x<max_x) {
+			if (a_group->srd_x+a_group->srd_w <min_x) is_visible = 0;
+			else if (a_group->srd_x>max_x) is_visible = 0;
+		} else {
+			if ( (a_group->srd_x>max_x) && (a_group->srd_x+a_group->srd_w<min_x)) is_visible = 0;
+		}
+
+		if (min_y<max_y) {
+			if (a_group->srd_y>max_y) is_visible = 0;
+			else if (a_group->srd_y+a_group->srd_h < min_y) is_visible = 0;
+		} else {
+			if ( (a_group->srd_y>max_y) && (a_group->srd_y+a_group->srd_h<min_y)) is_visible = 0;
+		}
 
+		if ((a_group->srd_x>=min_x) && (a_group->srd_x+a_group->srd_w<=max_x)
+			&& (a_group->srd_y>=min_y) && (a_group->srd_y+a_group->srd_h<=max_y)
+		) {
+			is_visible = 2;
+		}
+	}
+	a_group->quality_degradation_hint = (is_visible==2) ? 0 : (is_visible==1) ? 0 : 100;
+	GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("DASH Group SRD %dx%d@%dx%d is %s%s\n", a_group->srd_x, a_group->srd_y, a_group->srd_w, a_group->srd_h, (is_visible==1) ? "partially " : "", is_visible ? "visible" : "hidden"));
+	if (old_hint != a_group->quality_degradation_hint) {
+		//remember to update tile quality for non-custom algo
+		a_group->update_tile_qualities = GF_TRUE;
+		if (par_group)
+			par_group->update_tile_qualities = GF_TRUE;
+	}
+}
 GF_EXPORT
 GF_Err gf_dash_group_set_visible_rect(GF_DashClient *dash, u32 idx, u32 min_x, u32 max_x, u32 min_y, u32 max_y, Bool is_gaze)
 {
@@ -10134,53 +10680,20 @@
 	}
 
 	//for both regular or tiled, store visible width/height
-	group->hint_visible_width = max_x - min_x;
-	group->hint_visible_height = max_y - min_y;
+	group->hint_visible_width = (max_x>min_x) ? (max_x - min_x) : (min_x - max_x);
+	group->hint_visible_height = (max_y > min_y) ? (max_y - min_y) : (min_y - max_y);
 
-	if (!group->groups_depending_on) return GF_OK;
+	if (!group->groups_depending_on) {
+		count = group->srd_desc ? gf_list_count(dash->groups) : 0;
+		dash_check_group_visible(group, NULL, min_x, max_x, min_y, max_y, is_gaze);
+		return GF_OK;
+	}
 
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("DASH Group Visible rect %d,%d,%d,%d \n", min_x, max_x, min_y, max_y));
 	count = gf_list_count(group->groups_depending_on);
 	for (i=0; i<count; i++) {
-		Bool is_visible = GF_TRUE;
 		GF_DASH_Group *a_group = gf_list_get(group->groups_depending_on, i);
-		u32 old_hint;
-		if (!a_group->srd_w || !a_group->srd_h) continue;
-
-		old_hint = a_group->quality_degradation_hint;
-		if (is_gaze) {
-
-			if (min_x < a_group->srd_x)
-				is_visible = GF_FALSE;
-			else if (min_x > a_group->srd_x + a_group->srd_w)
-				is_visible = GF_FALSE;
-			else if (min_y < a_group->srd_y)
-				is_visible = GF_FALSE;
-			else if (min_y > a_group->srd_y + a_group->srd_h)
-				is_visible = GF_FALSE;
-
-		} else {
-
-			//single rectangle case
-			if (min_x<max_x) {
-				if (a_group->srd_x+a_group->srd_w <min_x) is_visible = GF_FALSE;
-				else if (a_group->srd_x>max_x) is_visible = GF_FALSE;
-			} else {
-				if ( (a_group->srd_x>max_x) && (a_group->srd_x+a_group->srd_w<min_x)) is_visible = GF_FALSE;
-			}
-
-			if (a_group->srd_y>max_y) is_visible = GF_FALSE;
-			else if (a_group->srd_y+a_group->srd_h < min_y) is_visible = GF_FALSE;
-
-		}
-		a_group->quality_degradation_hint = is_visible ? 0 : 100;
-		if (old_hint != a_group->quality_degradation_hint) {
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("DASH Group SRD %d,%d,%d,%d is %s\n", a_group->srd_x, a_group->srd_w, a_group->srd_y, a_group->srd_h, is_visible ? "visible" : "hidden"));
-
-			//remember to update tile quality for non-custom algo
-			a_group->update_tile_qualities = GF_TRUE;
-			group->update_tile_qualities = GF_TRUE;
-		}
+		dash_check_group_visible(a_group, group, min_x, max_x, min_y, max_y, is_gaze);
 	}
 	return GF_OK;
 }
@@ -10332,6 +10845,7 @@
 
 GF_Err gf_dash_group_push_tfrf(GF_DashClient *dash, u32 group_idx, void *_tfrf, u32 timescale)
 {
+#ifndef GPAC_DISABLE_ISOM
 	GF_MSSTimeRefBox *tfrf = (GF_MSSTimeRefBox *)_tfrf;
 	u32 i;
 	GF_MPD_SegmentTemplate *stpl;
@@ -10388,6 +10902,7 @@
 			group->nb_segments_in_rep++;
 		}
 	}
+#endif
 	return GF_OK;
 }
 
@@ -10401,5 +10916,19 @@
 	return GF_TRUE;
 }
 
-#endif //GPAC_DISABLE_DASH_CLIENT
+void gf_dash_group_get_sar(GF_DashClient *dash, u32 group_idx, GF_Fraction *sar)
+{
+	GF_DASH_Group *group;
+	if (sar) sar->num = sar->den = 0;
+	if (!dash) return;
+	group = gf_list_get(dash->groups, group_idx);
+	if (!group || !sar) return;
 
+	GF_MPD_Representation *rep = gf_list_get(group->adaptation_set->representations, group->active_rep_index);
+	if (rep && rep->sar) {
+		sar->num = rep->sar->num;
+		sar->den = rep->sar->den;
+	}
+	return;
+}
+#endif //GPAC_DISABLE_DASHIN

gpac-2.2.1.tar.gz/src/media_tools/dash_segmenter.c -> gpac-2.4.0.tar.gz/src/media_tools/dash_segmenter.c Changed

@@ -115,6 +115,7 @@
 	s32 dash_filter_idx_plus_one;
 	u32 last_prog;
 	Bool keep_utc;
+	Bool skip_profile;
 };
 
 
@@ -135,15 +136,31 @@
 GF_DASHSegmenter *gf_dasher_new(const char *mpdName, GF_DashProfile dash_profile, const char *tmp_dir, u32 dash_timescale, const char *dasher_context_file)
 {
 	GF_DASHSegmenter *dasher;
+	const char *mpd_profile = strstr(mpdName, ":profile=");
+	if (!mpd_profile) {
+		u32 i, nb_args = gf_sys_get_argc();
+		for (i=1;i<nb_args;i++) {
+			const char *arg = gf_sys_get_arg(i);
+			if (!strncmp(arg, "--profile=", 10)) {
+				mpd_profile = arg;
+				break;
+			}
+		}
+	}
+	if (mpd_profile && (dash_profile!=GF_DASH_PROFILE_FULL)) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("DASH Cannot specify both mp4box -profile and dasher :profile option\n"));
+		return NULL;
+	}
+
 	GF_SAFEALLOC(dasher, GF_DASHSegmenter);
 	if (!dasher) return NULL;
 
 	dasher->mpd_name = gf_strdup(mpdName);
-
 	dasher->dash_scale = dash_timescale ? dash_timescale : 1000;
 	dasher->profile = dash_profile;
 	dasher->dash_state = dasher_context_file;
 	dasher->inputs = gf_list_new();
+	if (mpd_profile) dasher->skip_profile = GF_TRUE;
 	return dasher;
 }
 
@@ -549,7 +566,6 @@
 		return GF_OUT_OF_MEM;
 	}
 
-
 	sep_ext = strstr(dasher->mpd_name, ":gpac:");
 	if (sep_ext) {
 		sep_ext0 = 0;
@@ -636,34 +652,37 @@
 		sprintf(szArg, "asto=%d", -dasher->ast_offset_ms);
 		e |= gf_dynstrcat(&args, szArg, ":");
 	}
-	switch (dasher->profile) {
-	case GF_DASH_PROFILE_AUTO:
-		break;
-	case GF_DASH_PROFILE_LIVE:
-		e |= gf_dynstrcat(&args, "profile=live", ":");
-		break;
- 	case GF_DASH_PROFILE_ONDEMAND:
-		e |= gf_dynstrcat(&args, "profile=onDemand", ":");
-		break;
-	case GF_DASH_PROFILE_MAIN:
-		e |= gf_dynstrcat(&args, "profile=main", ":");
-		break;
-	case GF_DASH_PROFILE_FULL:
-		e |= gf_dynstrcat(&args, "profile=full", ":");
-		if (!dasher->segments_start_with_rap) e |= gf_dynstrcat(&args, "!sap", ":");
-		break;
-	case GF_DASH_PROFILE_HBBTV_1_5_ISOBMF_LIVE:
-		e |= gf_dynstrcat(&args, "profile=hbbtv1.5.live", ":");
-		break;
-	case GF_DASH_PROFILE_AVC264_LIVE:
-		e |= gf_dynstrcat(&args, "profile=dashavc264.live", ":");
-		break;
-	case GF_DASH_PROFILE_AVC264_ONDEMAND:
-		e |= gf_dynstrcat(&args, "profile=dashavc264.onDemand", ":");
-		break;
-	case GF_DASH_PROFILE_DASHIF_LL:
-		e |= gf_dynstrcat(&args, "profile=dashif.ll", ":");
-		break;
+
+	if (!dasher->skip_profile) {
+		switch (dasher->profile) {
+		case GF_DASH_PROFILE_AUTO:
+			break;
+		case GF_DASH_PROFILE_LIVE:
+			e |= gf_dynstrcat(&args, "profile=live", ":");
+			break;
+		case GF_DASH_PROFILE_ONDEMAND:
+			e |= gf_dynstrcat(&args, "profile=onDemand", ":");
+			break;
+		case GF_DASH_PROFILE_MAIN:
+			e |= gf_dynstrcat(&args, "profile=main", ":");
+			break;
+		case GF_DASH_PROFILE_FULL:
+			e |= gf_dynstrcat(&args, "profile=full", ":");
+			if (!dasher->segments_start_with_rap) e |= gf_dynstrcat(&args, "!sap", ":");
+			break;
+		case GF_DASH_PROFILE_HBBTV_1_5_ISOBMF_LIVE:
+			e |= gf_dynstrcat(&args, "profile=hbbtv1.5.live", ":");
+			break;
+		case GF_DASH_PROFILE_AVC264_LIVE:
+			e |= gf_dynstrcat(&args, "profile=dashavc264.live", ":");
+			break;
+		case GF_DASH_PROFILE_AVC264_ONDEMAND:
+			e |= gf_dynstrcat(&args, "profile=dashavc264.onDemand", ":");
+			break;
+		case GF_DASH_PROFILE_DASHIF_LL:
+			e |= gf_dynstrcat(&args, "profile=dashif.ll", ":");
+			break;
+		}
 	}
 	if (dasher->cp_location_mode==GF_DASH_CPMODE_REPRESENTATION) e |= gf_dynstrcat(&args, "cp=rep", ":");
 	else if (dasher->cp_location_mode==GF_DASH_CPMODE_BOTH) e |= gf_dynstrcat(&args, "cp=both", ":");

gpac-2.2.1.tar.gz/src/media_tools/dsmcc.c -> gpac-2.4.0.tar.gz/src/media_tools/dsmcc.c Changed

gpac-2.2.1.tar.gz/src/media_tools/dvb_mpe.c -> gpac-2.4.0.tar.gz/src/media_tools/dvb_mpe.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jonathan Sillan, Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2011-2022
+ *			Copyright (c) Telecom ParisTech 2011-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / media tools sub-project
@@ -171,7 +171,7 @@
 	u32 i_streams,j;
 	u32 section_number, last_section_number;
 	s32 len_left = data_size;
-	assert( ts );
+	gf_assert(ts);
 
 
 	i_streams = 0;
@@ -217,10 +217,9 @@
 		GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("IpdcEgine buffer is not null, waiting for a new IP Datagram before processing data\n"));
 		return;
 	} else {
-		GF_SAFEALLOC(mpe->mff,MPE_FEC_FRAME);
+		if (!ip_platform || !ip_platform->ip_streams) return;
 
-		assert( ip_platform );
-		assert(ip_platform->ip_streams);
+		GF_SAFEALLOC(mpe->mff,MPE_FEC_FRAME);
 		i_streams = gf_list_count(ip_platform->ip_streams);
 		for(j=0; j<i_streams; j++) {
 			ip_stream_buff=gf_list_get(ip_platform->ip_streams, j);
@@ -501,7 +500,7 @@
 {
 
 	GF_M2TS_IP_PLATFORM * ip_platform = ts->ip_platform ;
-	assert( ts );
+	gf_assert(ts);
 
 	if ( ip_platform == NULL )
 	{
@@ -525,7 +524,7 @@
 
 	data += 12 ;
 
-	assert( ip_platform);
+	if (!ip_platform || !ip_platform->ip_streams) return;
 	i = dsmcc_pto_platform_descriptor_loop(ip_platform,data);
 	data   += i;
 	length -= i;
@@ -541,7 +540,6 @@
 		i = dsmcc_pto_descriptor_loop(ip_str,data);
 		data   += i;
 		length -= i;
-		assert( ip_platform->ip_streams );
 		gf_list_add(ip_platform->ip_streams, ip_str);
 	}
 
@@ -555,13 +553,13 @@
 {
 	u32 loop_length;
 	s32 length,i;
+	gf_assert(ip_platform);
 
 
 	loop_length = ((data0) & 0xF ) | data1;
 	length = loop_length;
 	data += 2;
 	while (length > 0) {
-		assert( ip_platform);
 		i   = platform_descriptorDSMCC_INT_UNT(ip_platform,data);
 		data   += i;
 		length -= i;
@@ -605,7 +603,7 @@
 {
 	u32 length;
 	length = data1;
-	assert( ip_platform );
+	gf_assert( ip_platform );
 	/* allocation ofr the name of the platform */
 	ip_platform->name = gf_malloc(sizeof(char)*(length-3+1));
 	memcpy(ip_platform->name, data+5, length-3);
@@ -618,7 +616,7 @@
 	u32 length;
 	length = data1;
 	/* allocation of the name of the platform */
-	assert( ip_platform );
+	gf_assert( ip_platform );
 	ip_platform->provider_name = gf_malloc(sizeof(char)*(length-3+1));
 	memcpy(ip_platform->provider_name, data+5, length-3);
 	ip_platform->provider_namelength-3 = 0;
@@ -814,12 +812,12 @@
 	GF_M2TS_IP_Target *ip_targets;
 	GF_M2TS_IP_PLATFORM * ip_platform = ts->ip_platform;
 
-	assert( ts );
+	gf_assert( ts );
 	offset =0;
 	ip_datagram = mff->p_adt;
 	GF_SAFEALLOC(ip_packet,GF_M2TS_IP_Packet);
 	GF_SAFEALLOC(mff_holes,MPE_Error_Holes);
-	assert( ip_platform );
+	gf_assert( ip_platform && ip_platform->ip_streams );
 	while(offset<mff->current_offset_adt)
 	{
 		/* Find the parts of the ADT which contain errors and skip them */
@@ -847,7 +845,6 @@
 
 			if(ip_platform->all_info_gathered != 1)
 			{
-				assert( ip_platform->ip_streams );
 				i_streams = gf_list_count(ip_platform->ip_streams);
 				for(k=0; k<i_streams; k++)
 				{
@@ -904,14 +901,13 @@
 	u32 i_streams,i,j,l;
 	GF_M2TS_IP_Target *ip_targets;
 	u8 *ip_address;
+	if (!ts || !ts->ip_platform) return;
 	GF_M2TS_IP_PLATFORM * ip_platform = ts->ip_platform;
-	assert( ts );
-	if (!ts->ip_platform) return;
 
 	/* provider and ip platform name */
 	GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, (" IP Platform : %s provided by %s \n",ip_platform->name,ip_platform->provider_name));
 
-	assert(ip_platform->ip_streams);
+	gf_assert(ip_platform->ip_streams);
 	i_streams = gf_list_count(ip_platform->ip_streams);
 	for(i=0; i<i_streams; i++) {
 		GF_M2TS_IP_Stream *ip_stream_buff = gf_list_get(ip_platform->ip_streams, i);
@@ -1004,7 +1000,7 @@
 	GF_Err e;
 	u8 nb_socket_struct, i;
 	GF_SOCK_ENTRY *Sock_Struct = NULL;
-	assert( ts );
+	if (!ts) return;
 	if(!ts->ip_platform) {
 		GF_SAFEALLOC(ts->ip_platform,GF_M2TS_IP_PLATFORM );
 	}
@@ -1220,7 +1216,7 @@
 		setErrorIndicator( mff->p_error_rs , mff->current_offset_rs , (offset - mff->current_offset_rs)*sizeof(u32));
 		mff->current_offset_rs = offset;
 	}
-	assert(mff->rows == length);
+	gf_assert(mff->rows == length);
 	memcpy(mff->p_rs + mff->current_offset_rs , pds, length*sizeof(u8) );
 	mff->current_offset_rs = offset + length ;

gpac-2.2.1.tar.gz/src/media_tools/gpac_ogg.c -> gpac-2.4.0.tar.gz/src/media_tools/gpac_ogg.c Changed

@@ -24,7 +24,19 @@
 
 #include <gpac/internal/ogg.h>
 
-#ifndef GPAC_DISABLE_OGG
+#ifdef GPAC_DISABLE_OGG
+# ifndef GPAC_EXTERNAL_LIBOGG
+#  define GPAC_EXTERNAL_LIBOGG	1
+# endif
+#elif defined(GPAC_CONFIG_EMSCRIPTEN)
+# if defined(GPAC_HAS_VORBIS) || defined(GPAC_HAS_THEORA)
+#  ifndef GPAC_EXTERNAL_LIBOGG
+#   define GPAC_EXTERNAL_LIBOGG	1
+#  endif
+# endif
+#endif
+
+#ifndef GPAC_EXTERNAL_LIBOGG
 
 #define BUFFER_INCREMENT 256
 
@@ -351,6 +363,8 @@
 /* bits <= 32 */
 s32 oggpack_read(oggpack_buffer *b,s32 bits) {
 	u32 ret;
+	gf_fatal_assert(bits<33);
+	gf_fatal_assert(b->endbyte<=GF_INT_MAX-4);
 	u32 m=maskbits;
 
 	bits+=b->endbit;
@@ -358,6 +372,8 @@
 	if(b->endbyte+4>=b->storage) {
 		/* not the main path */
 		ret=(u32) (-1);
+
+		gf_fatal_assert(b->endbyte <= GF_INT_MAX/8 - bits);
 		if(b->endbyte*8+bits>b->storage*8)goto overflow;
 	}
 
@@ -1036,6 +1052,7 @@
 */
 
 s32 ogg_sync_pageseek(ogg_sync_state *oy,ogg_page *og) {
+	if (!oy->data) return 0;
 	unsigned char *page=oy->data+oy->returned;
 	unsigned char *next;
 	s32 bytes=oy->fill-oy->returned;
@@ -1390,4 +1407,3 @@
 
 
 #endif /*GPAC_DISABLE_OGG*/
-

gpac-2.2.1.tar.gz/src/media_tools/img.c -> gpac-2.4.0.tar.gz/src/media_tools/img.c Changed

@@ -139,11 +139,12 @@
 		*height = gf_bs_read_u32(bs);
 		*codecid = GF_CODECID_PNG;
 	}
-	/*try j2k*/
+	/* try jpeg200 */
 	else {
 		u32 jp2h_size=0, jp2h_start=0;
 		size = gf_bs_read_u8(bs);
 		type = gf_bs_read_u32(bs);
+		/* try jp2 isomedia */
 		if ( ((size==12) && (type==GF_ISOM_BOX_TYPE_JP ))
 	        || (type==GF_ISOM_BOX_TYPE_JP2H ) ) {
 
@@ -191,6 +192,22 @@
 				}
 			}
 		}
+		/* try j2k codestream */
+		else {
+			gf_bs_seek(bs, pos);
+			type = gf_bs_read_u32(bs);
+
+			/* Start-of-codestream (SOC) + Image size (SIZ) magic number */
+			if (type == 0xFF4FFF51 ) {
+				/* u32 Lsiz = */gf_bs_read_u16(bs);
+				/* u32 Rsiz = */gf_bs_read_u16(bs);
+				*width = gf_bs_read_u32(bs);
+				*height = gf_bs_read_u32(bs);
+				*codecid = GF_CODECID_J2K;
+
+			}
+		}
+
 	}
 
 exit:
@@ -285,7 +302,7 @@
 	}
 #endif
 	if (!dst) *dst_size = 0;
-	
+
 	jpx.cinfo.err = jpeg_std_error(&(jper.pub));
 	jper.pub.error_exit = gf_jpeg_fatal_error;
 	jper.pub.output_message = gf_jpeg_output_message;
@@ -701,5 +718,3 @@
 }
 
 #endif	/*GPAC_HAS_PNG*/
-
-

gpac-2.2.1.tar.gz/src/media_tools/isom_hinter.c -> gpac-2.4.0.tar.gz/src/media_tools/isom_hinter.c Changed

gpac-2.2.1.tar.gz/src/media_tools/isom_tools.c -> gpac-2.4.0.tar.gz/src/media_tools/isom_tools.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2022
+ *			Copyright (c) Telecom ParisTech 2000-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / Media Tools sub-project
@@ -73,7 +73,7 @@
 			if (e) return e;
 #endif
 		}
-#if !defined(GPAC_DISABLE_HEVC) && !defined(GPAC_DISABLE_AV_PARSERS)
+#if !defined(GPAC_DISABLE_AV_PARSERS)
 		else if ((stype==GF_ISOM_SUBTYPE_HVC1) || (stype==GF_ISOM_SUBTYPE_HVC2)
 			|| (stype==GF_ISOM_SUBTYPE_HEV1) || (stype==GF_ISOM_SUBTYPE_HEV2)
 		) {
@@ -97,8 +97,6 @@
 			gf_odf_hevc_cfg_del(hvcc);
 			if (e) return e;
 		}
-#endif
-#if !defined(GPAC_DISABLE_AV1) && !defined(GPAC_DISABLE_AV_PARSERS)
 		else if (stype == GF_ISOM_SUBTYPE_AV01) {
 			//GF_AV1Config *av1c = gf_isom_av1_config_get(file, track, 1);
 			//TODO: e = gf_isom_av1_config_update(file, track, 1, av1c);
@@ -106,8 +104,6 @@
 			//if (e) return e;
 			return GF_NOT_SUPPORTED;
 		}
-#endif
-#if !defined(GPAC_DISABLE_AV_PARSERS)
 		else if ((stype==GF_ISOM_SUBTYPE_VVC1) || (stype==GF_ISOM_SUBTYPE_VVI1)
 		) {
 			GF_VVCConfig *vvcc = gf_isom_vvc_config_get(file, track, 1);
@@ -639,7 +635,7 @@
 
 	_esd = gf_odf_desc_esd_new(SLPredef_MP4);
 	if (!_esd) return GF_OUT_OF_MEM;
-	
+
 	_esd->decoderConfig->bufferSizeDB = 20;
 	_esd->decoderConfig->objectTypeIndication = GF_CODECID_BIFS_V2;
 	_esd->decoderConfig->streamType = GF_STREAM_SCENE;
@@ -834,6 +830,7 @@
 		case GF_ISOM_MEDIA_SUBT:
 			gf_isom_set_media_type(mp4file, i+1, GF_ISOM_MEDIA_TEXT);
 		case GF_ISOM_MEDIA_TEXT:
+		case GF_ISOM_MEDIA_MPEG_SUBT:
 			nb_txt++;
 			break;
 
@@ -1512,7 +1509,7 @@
 		esd->slConfig->timestampResolution = 1000;
 		return esd;
 	}
-	if ((item_type == GF_4CC('u','n','c','v')) || (item_type == GF_4CC('u','n','c','i'))) {
+	if ((item_type == GF_ISOM_SUBTYPE_UNCV) || (item_type == GF_ISOM_ITEM_TYPE_UNCI)) {
 		GF_ImageItemProperties props;
 		esd = gf_odf_desc_esd_new(0);
 		if (!esd) return NULL;
@@ -1526,12 +1523,14 @@
 		esd->decoderConfig->objectTypeIndication = GF_CODECID_RAW;
 		GF_List *other_props = gf_list_new();
 		e = gf_isom_get_meta_image_props(mp4, GF_TRUE, 0, item_id, &props, other_props);
+#ifndef GPAC_DISABLE_ISOM_WRITE
 		if ((e == GF_OK) && gf_list_count(other_props)) {
 			GF_BitStream *bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
 			gf_isom_box_array_write(NULL, other_props, bs);
 			gf_bs_get_content(bs, &esd->decoderConfig->decoderSpecificInfo->data, &esd->decoderConfig->decoderSpecificInfo->dataLength);
 			gf_bs_del(bs);
 		}
+#endif // GPAC_DISABLE_ISOM_WRITE
 		gf_list_del(other_props);
 		esd->slConfig->hasRandomAccessUnitsOnlyFlag = 1;
 		esd->slConfig->useTimestampsFlag = 1;
@@ -1752,7 +1751,7 @@
 		}
 	}
 	/*for testing*/
-	assert(count == num_subseq);
+	gf_assert(count == num_subseq);
 	/*read all pps*/
 	pps =  (s32 *) gf_malloc(num_pps * sizeof(s32));
 	for (j = 0; j < num_pps; j++)
@@ -2553,7 +2552,6 @@
 
 #ifndef GPAC_DISABLE_AV_PARSERS
 
-#if !defined(GPAC_DISABLE_HEVC)
 /* Split LHVC layers */
 static GF_NALUFFParamArray *alloc_hevc_param_array(GF_HEVCConfig *hevc_cfg, u8 type)
 {
@@ -2573,7 +2571,6 @@
 		gf_list_add(hevc_cfg->param_array, ar);
 	return ar;
 }
-#endif
 
 typedef struct{
 	u8 layer_id_plus_one;
@@ -2732,7 +2729,7 @@
 GF_EXPORT
 GF_Err gf_media_split_lhvc(GF_ISOFile *file, u32 track, Bool for_temporal_sublayers, Bool splitAll, GF_LHVCExtractoreMode extractor_mode)
 {
-#if !defined(GPAC_DISABLE_HEVC) && !defined(GPAC_DISABLE_AV_PARSERS)
+#if !defined(GPAC_DISABLE_AV_PARSERS)
 	LHVCTrackInfo sti64;
 	GF_HEVCConfig *hevccfg, *lhvccfg;
 	u32 sample_num, count, cur_extract_mode, j, k, max_layer_id;
@@ -2812,7 +2809,7 @@
 
 				//don't touch base layer
 				if (!layer_id) {
-					assert(base_layer_pass);
+					gf_assert(base_layer_pass);
 					continue;
 				}
 
@@ -3271,7 +3268,7 @@
 #endif
 
 }
-#endif /*GPAC_DISABLE_HEVC*/
+#endif ///GPAC_DISABLE_AV_PARSERS
 
 GF_EXPORT
 GF_Err gf_media_change_pl(GF_ISOFile *file, u32 track, u32 profile, u32 compat, u32 level)
@@ -3292,6 +3289,10 @@
 	}
 
 	avcc = gf_isom_avc_config_get(file, track, 1);
+
+	if (!avcc)
+		return GF_NON_COMPLIANT_BITSTREAM;
+
 	if (level) avcc->AVCLevelIndication = level;
 	if (compat) avcc->profile_compatibility = compat;
 	if (profile) avcc->AVCProfileIndication = profile;
@@ -3307,7 +3308,9 @@
 	return e;
 }
 
-#if !defined(GPAC_DISABLE_HEVC) && !defined(GPAC_DISABLE_AV_PARSERS)
+#endif // GPAC_DISABLE_MEDIA_IMPORT
+
+#if !defined(GPAC_DISABLE_AV_PARSERS)
 u32 hevc_get_tile_id(HEVCState *hevc, u32 *tile_x, u32 *tile_y, u32 *tile_width, u32 *tile_height)
 {
 	HEVCSliceInfo *si = &hevc->s_info;
@@ -3372,6 +3375,8 @@
 	return tileX + tileY * si->pps->num_tile_columns;
 }
 
+#ifndef GPAC_DISABLE_MEDIA_IMPORT
+
 typedef struct
 {
 	u32 track, track_id, sample_count;
@@ -3413,7 +3418,7 @@
 GF_EXPORT
 GF_Err gf_media_split_hevc_tiles(GF_ISOFile *file, u32 signal_mode)
 {
-#if defined(GPAC_DISABLE_HEVC) || defined(GPAC_DISABLE_AV_PARSERS)
+#if defined(GPAC_DISABLE_AV_PARSERS)
 	return GF_NOT_SUPPORTED;
 #else
 	u32 i, j, cur_tile, count, stype, track, nb_tiles, di, nalu_size_length, tx, ty, tw, th;
@@ -3698,7 +3703,7 @@
 			gf_bs_del(bs);
 			data1 = nb_nal_entries;
 
-			e = gf_isom_add_sample_group_info(file, track, GF_ISOM_SAMPLE_GROUP_NALM, data, size, 0, &sdesc);
+			e = gf_isom_add_sample_group_info(file, track, GF_ISOM_SAMPLE_GROUP_NALM, data, size, 1, &sdesc);
 			if (e) {
 				GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("ISOBMF Error defining NALM group description entry\n" ));
 			} else {
@@ -3748,7 +3753,7 @@
 	return e;
 #endif
 }
-#endif /*GPAC_DISABLE_HEVC*/
+#endif /*GPAC_DISABLE_AV_PARSERS*/
 
 #endif /*GPAC_DISABLE_MEDIA_IMPORT*/
 
@@ -3865,7 +3870,7 @@
 	if (dsi && dsi_size) {
 		u8 audio_object_type;
 		if (dsi_size < 2) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("RFC6381-AAC invalid DSI size %u < 2\n", dsi_size));
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("RFC6381 invalid DSI size %u < 2\n", dsi_size));
 			return GF_NON_COMPLIANT_BITSTREAM;
 		}
 		/*5 first bits of AAC config*/
@@ -3898,7 +3903,7 @@
 	case GF_CODECID_AAC_MPEG2_LCP:
 	case GF_CODECID_AAC_MPEG2_SSRP:
 	case GF_CODECID_USAC:
-		GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("RFC6381-AAC Cannot find AAC config, using default %s\n", szCodec));
+		GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("RFC6381 Cannot find AAC config, using default %s\n", szCodec));
 		break;
 	}
 	return GF_OK;
@@ -3915,13 +3920,13 @@
 	}
 #endif
 	snprintf(szCodec, RFC6381_CODEC_NAME_SIZE_MAX, "mp4v.%02X", codec_id);
-	GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("RFC6381-M4V Cannot find M4V config, using default %s\n", szCodec));
+	GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("RFC6381 Cannot find M4V config, using default %s\n", szCodec));
 	return GF_OK;
 }
 
 GF_Err rfc_6381_get_codec_avc(char *szCodec, u32 subtype, GF_AVCConfig *avcc)
 {
-	assert(avcc);
+	gf_assert(avcc);
 	snprintf(szCodec, RFC6381_CODEC_NAME_SIZE_MAX, "%s.%02X%02X%02X", gf_4cc_to_str(subtype), avcc->AVCProfileIndication, avcc->profile_compatibility, avcc->AVCLevelIndication);
 	return GF_OK;
 }
@@ -3930,7 +3935,7 @@
 {
 	u8 c;
 	char szTempRFC6381_CODEC_NAME_SIZE_MAX;
-	assert(hvcc);
+	gf_assert(hvcc);
 
 	snprintf(szCodec, RFC6381_CODEC_NAME_SIZE_MAX, "%s.", gf_4cc_to_str(subtype));
 	if (hvcc->profile_space==1) strcat(szCodec, "A");
@@ -3997,7 +4002,7 @@
 	GF_Err e;
 	u32 i = 0;
 	AV1State av1_state;
-	assert(av1c);
+	gf_assert(av1c);
 
 	gf_av1_init_state(&av1_state);
 	av1_state.config = av1c;
@@ -4007,7 +4012,7 @@
 		GF_AV1_OBUArrayEntry *a = gf_list_get(av1c->obu_array, i);
 		bs = gf_bs_new(a->obu, a->obu_length, GF_BITSTREAM_READ);
 		if (!av1_is_obu_header(a->obu_type))
-			GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("ISOM Tools AV1: unexpected obu_type %d when computing RFC6381. Parsing anyway.\n", a->obu_type, gf_4cc_to_str(subtype)));
+			GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("RFC6381 AV1: unexpected obu_type %d - Parsing anyway.\n", a->obu_type, gf_4cc_to_str(subtype)));
 
 		e = aom_av1_parse_temporal_unit_from_section5(bs, &av1_state);
 		gf_bs_del(bs);
@@ -4034,7 +4039,7 @@
 		if ((av1_state.color_primaries == 2) && (av1_state.transfer_characteristics == 2) && (av1_state.matrix_coefficients == 2) && av1_state.color_range == GF_FALSE) {
 
 		} else {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("AV1 incoherent color characteristics primaries %d transfer %d matrix %d color range %d\n",
+			GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("RFC6381 incoherent color characteristics primaries %d transfer %d matrix %d color range %d\n",
 				av1_state.color_primaries, av1_state.transfer_characteristics, av1_state.matrix_coefficients, av1_state.color_range));
 		}
 	}
@@ -4047,7 +4052,7 @@
 
 GF_Err rfc_6381_get_codec_vpx(char *szCodec, u32 subtype, GF_VPConfig *vpcc, COLR colr)
 {
-	assert(vpcc);
+	gf_assert(vpcc);
 	snprintf(szCodec, RFC6381_CODEC_NAME_SIZE_MAX, "%s.%02u.%02u.%02u.%02u.%02u.%02u.%02u.%02u", gf_4cc_to_str(subtype),
 		vpcc->profile,
 		vpcc->level,
@@ -4070,7 +4075,7 @@
 
 GF_Err rfc_6381_get_codec_vvc(char *szCodec, u32 subtype, GF_VVCConfig *vvcc)
 {
-	assert(vvcc);
+	gf_assert(vvcc);
 	u32 i, pos, len;
 
 	if ( (subtype==GF_4CC('v','v','c','N')) || (subtype==GF_4CC('v','v','s','1')) ) {
@@ -4111,12 +4116,14 @@
 		char b32_char = base32_charsc;
 		//should not happen, we use 100 bytes by default and max general_constraint_info is 63 bytes
 		if (len >= RFC6381_CODEC_NAME_SIZE_MAX) {
+			gf_bs_del(bs);
 			return GF_OUT_OF_MEM;
 		}
 		szCodeclen = b32_char;
 		len++;
 		szCodeclen = 0;
 	}
+	gf_bs_del(bs);
 
 	return GF_OK;
 }
@@ -4126,12 +4133,14 @@
 		pl = dsi1;
 	}
 	if (pl<0) {
-		GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("Cannot find MPEG-H Audio Config or audio PL, defaulting to profile 0x01\n"));
+		GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("RFC6381 Cannot find MPEG-H Audio Config or audio PL, defaulting to profile 0x01\n"));
 	}
 	snprintf(szCodec, RFC6381_CODEC_NAME_SIZE_MAX, "%s.0x%02X", gf_4cc_to_str(subtype), pl);
 	return GF_OK;
 }
 
+GF_Err rfc_6381_get_codec_uncv(char *szCodec, u32 subtype, u8 *dsi, u32 dsi_size);
+
 // Selected (namespace,identifier) pairs from https://www.w3.org/TR/ttml-profile-registry/
 // ordered in decreasing order of preference
 static const char *ttml_namespaces = {
@@ -4181,7 +4190,7 @@
 		else
 			snprintf(szCodec, RFC6381_CODEC_NAME_SIZE_MAX, "mp4s.%02X", codec_id);
 	} else {
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("Codec parameters not known - using default value \"%s\"\n", gf_4cc_to_str(subtype) ));
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("RFC6381 Codec parameters not known - using default value \"%s\"\n", gf_4cc_to_str(subtype) ));
 		snprintf(szCodec, RFC6381_CODEC_NAME_SIZE_MAX, "%s", gf_4cc_to_str(subtype));
 	}
 	return GF_OK;
@@ -4195,9 +4204,7 @@
 	GF_ESD *esd;
 	GF_Err e;
 	GF_AVCConfig *avcc;
-#ifndef GPAC_DISABLE_HEVC
 	GF_HEVCConfig *hvcc;
-#endif
 	u32 subtype = gf_isom_get_media_subtype(movie, track, stsd_idx);
 
 	if (subtype == GF_ISOM_SUBTYPE_MPEG4_CRYP) {
@@ -4209,16 +4216,21 @@
 		} else if(gf_isom_is_cenc_media(movie, track, stsd_idx)) {
 			e = gf_isom_get_cenc_info(movie, track, stsd_idx, &originalFormat, NULL, NULL);
 		} else {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("ISOM Tools Unknown protection scheme type %s\n", gf_4cc_to_str( gf_isom_is_media_encrypted(movie, track, stsd_idx)) ));
+			GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("RFC6381 Unknown protection scheme type %s\n", gf_4cc_to_str( gf_isom_is_media_encrypted(movie, track, stsd_idx)) ));
 			e = gf_isom_get_original_format_type(movie, track, stsd_idx, &originalFormat);
 		}
 		if (e) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("ISOM Tools Error fetching protection information\n"));
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("RFC6381 Error fetching protection information\n"));
 			return e;
 		}
 
 		if (originalFormat) subtype = originalFormat;
 	}
+	else if (subtype==GF_ISOM_SUBTYPE_MPEG4) {
+		u32 stsd_type = gf_isom_get_mpeg4_subtype(movie, track, stsd_idx);
+		if (stsd_type==GF_ISOM_SUBTYPE_RESV)
+			gf_isom_get_original_format_type(movie, track, stsd_idx, &subtype);
+	}
 
 	switch (subtype) {
 	case GF_ISOM_SUBTYPE_MPEG4:
@@ -4267,7 +4279,7 @@
 			gf_odf_avc_cfg_del(avcc);
 			return e;
 		}
-		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("Cannot find AVC configuration box"));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("RFC6381 Cannot find AVC configuration box"));
 		return GF_ISOM_INVALID_FILE;
 
 	case GF_ISOM_SUBTYPE_SVC_H264:
@@ -4279,10 +4291,9 @@
 			gf_odf_avc_cfg_del(avcc);
 			return e;
 		}
-		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("Cannot find SVC/MVC configuration box\n"));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("RFC6381 Cannot find SVC/MVC configuration box\n"));
 		return GF_ISOM_INVALID_FILE;
 
-#ifndef GPAC_DISABLE_HEVC
 	case GF_ISOM_SUBTYPE_HVC1:
 	case GF_ISOM_SUBTYPE_HEV1:
 	case GF_ISOM_SUBTYPE_HVC2:
@@ -4310,13 +4321,9 @@
 			gf_odf_hevc_cfg_del(hvcc);
 			return e;
 		}
-		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("HEVCConfig not compliant\n"));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("RFC6381 HEVCConfig not compliant\n"));
 		return GF_ISOM_INVALID_FILE;
-#else
-		return GF_NOT_SUPPORTED;
-#endif
 
-#if !defined(GPAC_DISABLE_AV1) && !defined(GPAC_DISABLE_AV_PARSERS)
 	case GF_ISOM_SUBTYPE_AV01:
 	{
 		GF_AV1Config *av1c = gf_isom_av1_config_get(movie, track, stsd_idx);
@@ -4331,10 +4338,9 @@
 			gf_odf_av1_cfg_del(av1c);
 			return e;
 		}
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("ISOM Tools No config found for AV1 file (\"%s\") when computing RFC6381.\n", gf_4cc_to_str(subtype)));
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("RFC6381 No config found for AV1 file (\"%s\") when computing RFC6381.\n", gf_4cc_to_str(subtype)));
 		return GF_BAD_PARAM;
 	}
-#endif /*!defined(GPAC_DISABLE_AV1) && !defined(GPAC_DISABLE_AV_PARSERS)*/
 
 	case GF_ISOM_SUBTYPE_VP08:
 	case GF_ISOM_SUBTYPE_VP09:
@@ -4351,7 +4357,7 @@
 			gf_odf_vp_cfg_del(vpcc);
 			return e;
 		}
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("ISOM Tools No config found for VP file (\"%s\") when computing RFC6381.\n", gf_4cc_to_str(subtype)));
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("RFC6381 No config found for VP file (\"%s\") when computing RFC6381.\n", gf_4cc_to_str(subtype)));
 		return GF_BAD_PARAM;
 	}
 
@@ -4363,7 +4369,7 @@
 	{
 		GF_DOVIDecoderConfigurationRecord *dovi = gf_isom_dovi_config_get(movie, track, stsd_idx);
 		if (!dovi) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("ISOM Tools No config found for Dolby Vision file (\"%s\") when computing RFC6381.\n", gf_4cc_to_str(subtype)));
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("RFC6381 No config found for Dolby Vision file (\"%s\") when computing RFC6381.\n", gf_4cc_to_str(subtype)));
 			return GF_NON_COMPLIANT_BITSTREAM;
 		}
 
@@ -4383,7 +4389,7 @@
 			gf_odf_vvc_cfg_del(vvcc);
 			return e;
 		}
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("ISOM Tools No config found for VVC file (\"%s\") when computing RFC6381.\n", gf_4cc_to_str(subtype)));
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("RFC6381 No config found for VVC file (\"%s\") when computing RFC6381.\n", gf_4cc_to_str(subtype)));
 		return GF_BAD_PARAM;
 	}
 
@@ -4404,6 +4410,17 @@
 		return e;
 	}
 
+	case GF_ISOM_SUBTYPE_UNCV:
+	{
+		GF_GenericSampleDescription *udesc = gf_isom_get_generic_sample_description(movie, track, stsd_idx);
+
+		e = rfc_6381_get_codec_uncv(szCodec, subtype, udesc ? udesc->extension_buf : NULL, udesc ? udesc->extension_buf_size : 0);
+		if (udesc) {
+			if (udesc->extension_buf) gf_free(udesc->extension_buf);
+			gf_free(udesc);
+		}
+		return e;
+	}
     case GF_ISOM_SUBTYPE_STPP:
     {
         const char *xmlnamespace;
@@ -4497,6 +4514,8 @@
 #endif
 }
 
+#ifndef GPAC_DISABLE_ISOM_WRITE
+
 GF_EXPORT
 GF_Err gf_media_isom_apply_qt_key(GF_ISOFile *movie, const char *name, const char *val)
 {
@@ -4627,5 +4646,7 @@
 	}
 	return e;
 }
+#endif // GPAC_DISABLE_ISOM_WRITE
+
 
 #endif //GPAC_DISABLE_ISOM

gpac-2.2.1.tar.gz/src/media_tools/m2ts_mux.c -> gpac-2.4.0.tar.gz/src/media_tools/m2ts_mux.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre , Cyril Concolato, Romain Bouqueau
- *			Copyright (c) Telecom ParisTech 2000-2022
+ *			Copyright (c) Telecom ParisTech 2000-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / MPEG2-TS multiplexer sub-project
@@ -113,8 +113,7 @@
  ************************************/
 void gf_m2ts_mux_table_update(GF_M2TS_Mux_Stream *stream, u8 table_id, u16 table_id_extension,
                               u8 *table_payload, u32 table_payload_length,
-                              Bool use_syntax_indicator, Bool private_indicator,
-                              Bool use_checksum)
+                              Bool use_syntax_indicator, Bool private_indicator)
 {
 	u32 overhead_size;
 	u32 offset;
@@ -296,7 +295,7 @@
 void gf_m2ts_mux_table_update_mpeg4(GF_M2TS_Mux_Stream *stream, u8 table_id, u16 table_id_extension,
                                     char *table_payload, u32 table_payload_length,
                                     Bool use_syntax_indicator, Bool private_indicator,
-                                    Bool increment_version_number, Bool use_checksum)
+                                    Bool increment_version_number)
 {
 	GF_SLHeader hdr;
 	u32 overhead_size;
@@ -531,7 +530,7 @@
 	}
 
 	section = stream->current_section;
-	assert(section);
+	gf_assert(section);
 
 	bs = mux->pck_bs;
 
@@ -562,7 +561,7 @@
 #endif
 	}
 
-	assert(payload_length + stream->current_section_offset <= section->length);
+	gf_assert(payload_length + stream->current_section_offset <= section->length);
 
 	//CC field shall not be incremented for if adaptation field only, rewind counter
 	if (adaptation_field_control == GF_M2TS_ADAPTATION_ONLY) {
@@ -673,7 +672,7 @@
 		}
 		gf_bs_get_content(bs, &payload, &size);
 		gf_bs_del(bs);
-		gf_m2ts_mux_table_update(stream, GF_M2TS_TABLE_ID_SDT_ACTUAL, muxer->ts_id, payload, size, GF_TRUE, GF_FALSE, GF_FALSE);
+		gf_m2ts_mux_table_update(stream, GF_M2TS_TABLE_ID_SDT_ACTUAL, muxer->ts_id, payload, size, GF_TRUE, GF_FALSE);
 		stream->table_needs_update = GF_FALSE;
 		stream->table_needs_send = GF_TRUE;
 		gf_free(payload);
@@ -703,7 +702,7 @@
 		}
 		gf_bs_get_content(bs, &payload, &size);
 		gf_bs_del(bs);
-		gf_m2ts_mux_table_update(stream, GF_M2TS_TABLE_ID_PAT, muxer->ts_id, payload, size, GF_TRUE, GF_FALSE, GF_FALSE);
+		gf_m2ts_mux_table_update(stream, GF_M2TS_TABLE_ID_PAT, muxer->ts_id, payload, size, GF_TRUE, GF_FALSE);
 		stream->table_needs_update = GF_FALSE;
 		stream->table_needs_send = GF_TRUE;
 		gf_free(payload);
@@ -1125,7 +1124,7 @@
 		gf_bs_get_content(bs, &payload, &length);
 		gf_bs_del(bs);
 
-		gf_m2ts_mux_table_update(stream, GF_M2TS_TABLE_ID_PMT, stream->program->number, payload, length, GF_TRUE, GF_FALSE, GF_FALSE);
+		gf_m2ts_mux_table_update(stream, GF_M2TS_TABLE_ID_PMT, stream->program->number, payload, length, GF_TRUE, GF_FALSE);
 		stream->table_needs_update = GF_FALSE;
 		stream->table_needs_send = GF_TRUE;
 		gf_free(payload);
@@ -1308,7 +1307,6 @@
 
 		/*EOS*/
 		if (stream->ifce->caps & GF_ESI_STREAM_IS_OVER) return ret;
-		assert(stream->ifce->input_ctrl);
 		stream->ifce->input_ctrl(stream->ifce, GF_ESI_INPUT_DATA_PULL, &stream->curr_pck);
 	} else {
 		GF_M2TS_Packet *curr_pck;
@@ -1376,6 +1374,9 @@
 				}
 			}
 
+			if (stream->program->force_first_pts==GF_FILTER_NO_TS)
+				stream->program->force_first_pts = 0;
+
 			if (stream->program->force_first_pts) {
 				u64 first_pts = stream->curr_pck.cts;
 				u64 first_dts = stream->curr_pck.dts;
@@ -1400,11 +1401,11 @@
 					stream->program->initial_ts = first_dts + stream->program->pcr_offset;
 
 				*/
-/*
-				stream->program->pcr_init_time = first_dts*300 - stream->program->pcr_offset;
-				stream->program->initial_ts = first_pts + stream->program->pcr_offset + stream->program->pcr_init_time/300 - stream->program->force_first_pts;
-*/
 
+				//if forced first PTS is not for this stream, use the forced one
+				if (first_pts > stream->program->force_first_pts) {
+					first_pts = first_dts = stream->program->force_first_pts;
+				}
 				stream->program->initial_ts = first_dts + stream->program->pcr_offset;
 				stream->program->pcr_init_time = 300 * (stream->program->force_first_pts - first_pts - stream->program->pcr_offset + stream->program->initial_ts);
 
@@ -1438,7 +1439,7 @@
 		stream->sl_header.accessUnitStartFlag = (stream->curr_pck.flags & GF_ESI_DATA_AU_START) ? 1 : 0;
 		stream->sl_header.accessUnitEndFlag = (stream->curr_pck.flags & GF_ESI_DATA_AU_END) ? 1 : 0;
 #if 0
-		assert(stream->sl_header.accessUnitLength + stream->curr_pck.data_len < 65536); /*stream->sl_header.accessUnitLength type is u16*/
+		gf_assert(stream->sl_header.accessUnitLength + stream->curr_pck.data_len < 65536); /*stream->sl_header.accessUnitLength type is u16*/
 		stream->sl_header.accessUnitLength += stream->curr_pck.data_len;
 #endif
 		stream->sl_header.randomAccessPointFlag = (stream->curr_pck.sap_type) ? 1: 0;
@@ -1447,7 +1448,7 @@
 		stream->sl_header.decodingTimeStampFlag = (stream->curr_pck.flags & GF_ESI_DATA_HAS_DTS) ? 1: 0;
 		stream->sl_header.decodingTimeStamp = stream->curr_pck.dts;
 
-		gf_m2ts_mux_table_update_mpeg4(stream, stream->table_id, muxer->ts_id, stream->curr_pck.data, stream->curr_pck.data_len, GF_TRUE, GF_FALSE, (stream->curr_pck.flags & GF_ESI_DATA_REPEAT) ? GF_FALSE : GF_TRUE, GF_FALSE);
+		gf_m2ts_mux_table_update_mpeg4(stream, stream->table_id, muxer->ts_id, stream->curr_pck.data, stream->curr_pck.data_len, GF_TRUE, GF_FALSE, (stream->curr_pck.flags & GF_ESI_DATA_REPEAT) ? GF_FALSE : GF_TRUE);
 
 		/*packet data is now copied in sections, discard it if not pull*/
 		if (!(stream->ifce->caps & GF_ESI_AU_PULL_CAP)) {
@@ -1468,7 +1469,7 @@
 		stream->sl_header.accessUnitStartFlag = (stream->curr_pck.flags & GF_ESI_DATA_AU_START) ? 1 : 0;
 		stream->sl_header.accessUnitEndFlag = (stream->curr_pck.flags & GF_ESI_DATA_AU_END) ? 1 : 0;
 #if 0
-		assert(stream->sl_header.accessUnitLength + stream->curr_pck.data_len < 65536); /*stream->sl_header.accessUnitLength type is u16*/
+		gf_assert(stream->sl_header.accessUnitLength + stream->curr_pck.data_len < 65536); /*stream->sl_header.accessUnitLength type is u16*/
 		stream->sl_header.accessUnitLength += stream->curr_pck.data_len;
 #endif
 		stream->sl_header.randomAccessPointFlag = (stream->curr_pck.sap_type) ? 1: 0;
@@ -1497,18 +1498,18 @@
 	/*perform LATM encapsulation*/
 	case GF_M2TS_AUDIO_LATM_AAC:
 	{
-		u32 size, next_time;
+		u32 size, stream_time_ms;
 		GF_BitStream *bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
 		gf_bs_write_int(bs, 0x2B7, 11);
 		gf_bs_write_int(bs, 0, 13);
 
 		/*same mux config = 0 (refresh aac config)*/
-		next_time = gf_sys_clock();
-		if (stream->ifce->decoder_config && (stream->latm_last_aac_time + stream->refresh_rate_ms < next_time)) {
+		stream_time_ms = (u32) (stream->time.sec*1000 + stream->time.nanosec/1000000);
+		if (stream->ifce->decoder_config && (!stream_time_ms || (stream->latm_last_aac_time + stream->refresh_rate_ms < stream_time_ms-1))) {
 #ifndef GPAC_DISABLE_AV_PARSERS
 			GF_M4ADecSpecInfo cfg;
 #endif
-			stream->latm_last_aac_time = next_time;
+			stream->latm_last_aac_time = stream_time_ms+1;
 
 			gf_bs_write_int(bs, 0, 1);
 			/*mux config */
@@ -1552,7 +1553,7 @@
 		stream->reframe_overhead = stream->curr_pck.data_len - stream->reframe_overhead;
 
 		/*rewrite LATM frame header*/
-		size = stream->curr_pck.data_len - 2;
+		size = stream->curr_pck.data_len - 3;
 		stream->curr_pck.data1 |= (size>>8) & 0x1F;
 		stream->curr_pck.data2 = (size) & 0xFF;
 		/*since we reallocated the packet data buffer, force a discard in pull mode*/
@@ -1649,7 +1650,11 @@
 
 	/*compute next interesting time in TS unit: this will be DTS of next packet*/
 	stream->time = stream->program->ts_time_at_pcr_init;
-	time_inc = stream->curr_pck.dts - stream->program->pcr_init_time/300;
+	//safety check
+	if (stream->curr_pck.dts > stream->program->pcr_init_time/300)
+		time_inc = stream->curr_pck.dts - stream->program->pcr_init_time/300;
+	else
+		time_inc = 0;
 
 	/* CBR, estimate number of packets required to send => time in mux rate, and offset send time*/
 	if (muxer->fixed_rate) {
@@ -1800,7 +1805,7 @@
 
 Bool gf_m2ts_stream_compute_pes_length(GF_M2TS_Mux_Stream *stream, u32 payload_length)
 {
-	assert(stream->pes_data_remain==0);
+	gf_assert(stream->pes_data_remain==0);
 	stream->pes_data_len = stream->curr_pck.data_len - stream->pck_offset;
 
 	stream->copy_from_next_packets = 0;
@@ -1951,7 +1956,7 @@
 	}
 
 	/*PES packet length: number of bytes in the PES packet following the last byte of the field "pes packet length"*/
-	assert(stream->pes_data_len);
+	gf_assert(stream->pes_data_len);
 	pes_len = stream->pes_data_len + 3; // 3 = header size
 	if (use_pts) pes_len += 5;
 	if (use_dts) pes_len += 5;
@@ -2008,7 +2013,7 @@
 	Bool needs_pcr, first_pass;
 	u32 adaptation_field_control, payload_length, payload_to_copy, padding_length, hdr_len, pos, copy_next;
 
-	assert(stream->pid);
+	gf_assert(stream->pid);
 
 	if (stream->pcr_only_mode) {
 		payload_length = 184 - 8;
@@ -2081,13 +2086,13 @@
 			}
 
 			if (hdr_len) {
-				assert(!stream->pes_data_remain);
+				gf_assert(!stream->pes_data_remain);
 				if (! gf_m2ts_stream_compute_pes_length(stream, payload_length)) {
 					first_pass = GF_FALSE;
 					continue;
 				}
 
-				assert(stream->pes_data_remain==stream->pes_data_len);
+				gf_assert(stream->pes_data_remain==stream->pes_data_len);
 			}
 			break;
 		}
@@ -2238,12 +2243,18 @@
 		return;
 	}
 
-	assert(stream->curr_pck.data_len - stream->pck_offset >= payload_to_copy);
-	memcpy(packet+pos, stream->curr_pck.data + stream->pck_offset, payload_to_copy);
+	if (stream->curr_pck.data_len - stream->pck_offset >= payload_to_copy)
+		memcpy(packet+pos, stream->curr_pck.data + stream->pck_offset, payload_to_copy);
+	else {
+		gf_assert(0);
+	}
 	stream->pck_offset += payload_to_copy;
-	assert(stream->pes_data_remain >= payload_to_copy);
-	stream->pes_data_remain -= payload_to_copy;
-
+	if (stream->pes_data_remain >= payload_to_copy)
+		stream->pes_data_remain -= payload_to_copy;
+	else {
+		stream->pes_data_remain = 0;
+		gf_assert(0);
+	}
 	/*update stream time, including headers
 	Note that we don't do that if mux is not operating in fixed rate because the rate can be wrong (way too low)
 	causing time to increase too fast on IDRs
@@ -2320,7 +2331,7 @@
 
 				memcpy(packet+pos, stream->curr_pck.data + stream->pck_offset, copy_next);
 				stream->pck_offset += copy_next;
-				assert(stream->pes_data_remain >= copy_next);
+				gf_assert(stream->pes_data_remain >= copy_next);
 				stream->pes_data_remain -= copy_next;
 
 				if (stream->copy_from_next_packets > copy_next) {
@@ -2330,7 +2341,7 @@
 				}
 
 				if (stream->pck_offset == stream->curr_pck.data_len) {
-					assert(!remain || (remain>=stream->min_bytes_copy_from_next));
+					gf_assert(!remain || (remain>=stream->min_bytes_copy_from_next));
 					/*PES has been sent, discard internal buffer*/
 					if (stream->discard_data) gf_free(stream->curr_pck.data);
 					stream->curr_pck.data = NULL;
@@ -2727,10 +2738,11 @@
 			break;
 
 		case GF_CODECID_DTS_CA:
+		case GF_CODECID_DTS_HD_HR_MASTER:
+		case GF_CODECID_DTS_HD_LOSSLESS:
+		case GF_CODECID_DTS_EXPRESS_LBR:
 		case GF_CODECID_DTS_X:
-		case GF_CODECID_DTS_HD_HR:
-		case GF_CODECID_DTS_HD_MASTER:
-		case GF_CODECID_DTS_LBR:
+		case GF_CODECID_DTS_Y:
 			stream->mpeg2_stream_type = GF_M2TS_AUDIO_DTS;
 			break;
 
@@ -2941,6 +2953,14 @@
 	if (program->mux->sdt) program->mux->sdt->table_needs_update = GF_TRUE;
 }
 
+void gf_m2ts_mux_program_force_keep_ts(GF_M2TS_Mux_Program *program)
+{
+	if (program) {
+		program->initial_ts_set = 2;
+		program->initial_ts = 0;
+	}
+}
+
 GF_EXPORT
 GF_M2TS_Mux *gf_m2ts_mux_new(u32 mux_rate, u32 pat_refresh_rate, Bool real_time)
 {
@@ -3298,7 +3318,7 @@
 					if (now.nanosec <= muxer->time.nanosec) {
 						diff += (muxer->time.nanosec - now.nanosec) / 1000;
 					} else {
-						assert(diff);
+						gf_assert(diff);
 						diff -= 1000000;
 						diff += (1000000000 + muxer->time.nanosec - now.nanosec) / 1000;
 					}
@@ -3480,7 +3500,7 @@
 				}
 			}
 			nb_streams++;
-			if ((stream->ifce->caps & GF_ESI_STREAM_IS_OVER) && (!res || stream->refresh_rate_ms) )
+			if ((stream->ifce->caps & GF_ESI_STREAM_IS_OVER) && (!res || stream->refresh_rate_ms) && !stream->pes_data_remain)
 				nb_streams_done ++;
 
 			stream = stream->next;

gpac-2.2.1.tar.gz/src/media_tools/m3u8.c -> gpac-2.4.0.tar.gz/src/media_tools/m3u8.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Pierre Souchay, Jean Le Feuvre, Romain Bouqueau
- *			Copyright (c) Telecom ParisTech 2010-2022
+ *			Copyright (c) Telecom ParisTech 2010-2023
  *					All rights reserved
  *
  *  This file is part of GPAC
@@ -123,7 +123,7 @@
 		gf_free(e->init_segment_url);
 	}
 	memset(e->key_iv, 0, sizeof(bin128) );
-	if (e->url) 
+	if (e->url)
 		gf_free(e->url);
 
 	switch (e->element_type) {
@@ -131,7 +131,7 @@
 	case TYPE_MEDIA:
 		break;
 	case TYPE_PLAYLIST:
-		assert(e->element.playlist.elements);
+		gf_assert(e->element.playlist.elements);
 		result |= cleanup_list_of_elements(e->element.playlist.elements);
 	default:
 		break;
@@ -186,7 +186,7 @@
 	e->utc_start_time = attribs->playlist_utc_timestamp;
 	e->discontinuity = attribs->discontinuity;
 
-	assert(url);
+	gf_assert(url);
 	e->url = gf_strdup(url);
 	e->bandwidth = 0;
 	e->element_type = element_type;
@@ -231,8 +231,8 @@
 	} else {
 		/* Nothing to do, media is an empty structure */
 	}
-	assert(e->bandwidth == 0);
-	assert(e->url);
+	gf_assert(e->bandwidth == 0);
+	gf_assert(e->url);
 	return e;
 }
 
@@ -282,7 +282,7 @@
 	u64 ret=0, i, shift=2;
 	u8 hashGF_SHA1_DIGEST_SIZE;
 	gf_sha1_csum((u8*)s, (u32)strlen(s), hash);
-	assert(shift*GF_SHA1_DIGEST_SIZE < 64);
+	gf_assert(shift*GF_SHA1_DIGEST_SIZE < 64);
 	for (i=0; i<GF_SHA1_DIGEST_SIZE; ++i)
 		ret += (ret << shift) + hashi;
 	return (int)(ret % MEDIA_TYPE_AUDIO);
@@ -293,7 +293,7 @@
 	MEDIA_TYPE_##type + \
 	string2num(group_id) \
 	) \
- 
+
 static Bool safe_start_equals(const char *attribute, const char *line) {
 	size_t len, atlen;
 	if (line == NULL)
@@ -327,6 +327,9 @@
 	if (!safe_start_equals(name, line))
 		return NULL;
 	ret = gf_calloc((num_attributes + 1), sizeof(char*));
+	if (!ret) return NULL;
+	if (!num_attributes) return ret;
+
 	curr_attribute = 0;
 	for (i=start; i<=len; i++) {
 		if (linei == '\0' || (!quote && linei == ',')  || (linei == quote)) {
@@ -334,7 +337,7 @@
 			sz = i - start;
 			if (quote && (linei == quote))
 				sz++;
-			
+
 			while (linestart+spaces == ' ')
 				spaces++;
 			if ((sz-spaces<=1) && (linestart+spaces==',')) {
@@ -345,10 +348,12 @@
 					retcurr_attribute = gf_calloc( (1+sz-spaces), sizeof(char));
 					strncpy(retcurr_attribute, &(linestart+spaces), sz-spaces);
 					curr_attribute++;
+					if (curr_attribute >= num_attributes)
+						break;
 				}
 			}
 			start = i+1;
-			
+
 			if (start == len) {
 				return ret;
 			}
@@ -372,6 +377,15 @@
 	if (v > attributes->compatibility_version) \
 		attributes->compatibility_version = v;
 
+static void free_attrs(char** attributes)
+{
+	u32 i = 0;
+	while (attributesi != NULL) {
+		gf_free(attributesi);
+		i++;
+	}
+	gf_free(attributes);
+}
 /**
  * Parses the attributes and accumulate into the attributes structure
  */
@@ -532,10 +546,12 @@
 			if (safe_start_equals("URI=\"", val)) {
 				char *uri = val + 5;
 				int_value = (u32) strlen(uri);
-				if (uriint_value-1 == '"') {
+				if (int_value > 0 && uriint_value-1 == '"') {
 					if (attributes->init_url) gf_free(attributes->init_url);
 					attributes->init_url = gf_strdup(uri);
 					attributes->init_urlint_value-1=0;
+				} else {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_DASH,("M3U8 Invalid URI (%s) in EXT-X-MAP\n", val));
 				}
 			}
 			else if (safe_start_equals("BYTERANGE=\"", val)) {
@@ -588,13 +604,13 @@
 				}
 				M3U8_COMPATIBILITY_VERSION(2);
 			} else if (safe_start_equals("AUDIO=", reti)) {
-				assert(attributes->type == MEDIA_TYPE_UNKNOWN);
+				gf_assert(attributes->type == MEDIA_TYPE_UNKNOWN);
 				attributes->type = MEDIA_TYPE_AUDIO;
 				if (attributes->group.audio) gf_free(attributes->group.audio);
 				attributes->group.audio = gf_strdup(reti + 6);
 				M3U8_COMPATIBILITY_VERSION(4);
 			} else if (safe_start_equals("VIDEO=", reti)) {
-				assert(attributes->type == MEDIA_TYPE_UNKNOWN);
+				gf_assert(attributes->type == MEDIA_TYPE_UNKNOWN);
 				attributes->type = MEDIA_TYPE_VIDEO;
 				if (attributes->group.video) gf_free(attributes->group.video);
 				attributes->group.video = gf_strdup(reti + 6);
@@ -604,6 +620,7 @@
 		}
 		if (!attributes->bandwidth) {
 			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH,("M3U8 Invalid #EXT-X-STREAM-INF: no BANDWIDTH found. Ignoring the line.\n"));
+			free_attrs(ret);
 			return NULL;
 		}
 		return ret;
@@ -614,7 +631,7 @@
 		M3U8_COMPATIBILITY_VERSION(1);
 		return ret;
 	}
-	ret = extract_attributes("#EXT-X-DISCONTINUITY-SEQUENCE", line, 0);
+	ret = extract_attributes("#EXT-X-DISCONTINUITY-SEQUENCE", line, 1);
 	if (ret) {
 		if (ret0) {
 			int_value = (s32)strtol(ret0, &end_ptr, 10);
@@ -690,6 +707,7 @@
 					attributes->stream_id = GROUP_ID_TO_PROGRAM_ID(CLOSED_CAPTIONS, attributes->group.closed_captions);
 				} 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", reti+9));
+					free_attrs(ret);
 					return NULL;
 				}
 			} else if (safe_start_equals("LANGUAGE=\"", reti)) {
@@ -702,7 +720,7 @@
 				} else {
 					GF_LOG(GF_LOG_WARNING, GF_LOG_DASH,("M3U8 Misformed #EXT-X-MEDIA:LANGUAGE=%s. Quotes are incorrect.\n", reti+5));
 				}
-			} else if (safe_start_equals("NAME=", reti)) {
+			} else if (safe_start_equals("NAME=\"", reti)) {
 				if (attributes->name) gf_free(attributes->name);
 				attributes->name = gf_strdup(reti+5+1);
 				u32 len = (u32) strlen(attributes->name);
@@ -735,6 +753,7 @@
 
 		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"));
+			free_attrs(ret);
 			return NULL;
 		}
 		if (attributes->type == MEDIA_TYPE_CLOSED_CAPTIONS && attributes->mediaURL) {
@@ -745,10 +764,12 @@
 		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"));
+			free_attrs(ret);
 			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"));
+			free_attrs(ret);
 			return NULL;
 		}
 
@@ -763,6 +784,10 @@
 		//todo extract I/intra rate for speed adaptation
 		return NULL;
 	}
+	//ignored for now
+	if (!strncmp(line, "#EXT-X-BITRATE", strlen("#EXT-X-BITRATE") )) {
+		return NULL;
+	}
 	if (!strncmp(line, "#EXT-X-PART-INF", strlen("#EXT-X-PART-INF") )) {
 		attributes->low_latency = GF_TRUE;
 		return NULL;
@@ -785,7 +810,7 @@
 
 /**
  * Creates a new MasterPlaylist
-\param NULL if MasterPlaylist element could not be allocated
+\return NULL if MasterPlaylist element could not be allocated
  */
 MasterPlaylist* master_playlist_new()
 {
@@ -810,13 +835,12 @@
 GF_Err gf_m3u8_master_playlist_del(MasterPlaylist **playlist) {
 	if ((playlist == NULL) || (*playlist == NULL))
 		return GF_OK;
-	assert((*playlist)->streams);
+	gf_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)) {
+		while (p && gf_list_count(p->variants)) {
 			PlaylistElement *pl = gf_list_get(p->variants, 0);
-			assert(pl);
+			if (!pl) break;
 			playlist_element_del(pl);
 			gf_list_rem(p->variants, 0);
 		}
@@ -835,13 +859,13 @@
 
 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);
+	gf_assert(pl);
+	gf_assert(pl->streams);
+	gf_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);
+		gf_assert(cur);
 		if (stream_id == cur->stream_id) {
 			/* We found the program */
 			return cur;
@@ -871,6 +895,7 @@
 	u32 i, count;
 
 	char *fullURL = currentLine;
+	if (!fullURL) return GF_BAD_PARAM;
 
 	if (attribs->is_master_playlist && attribs->is_media_segment) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("M3U8 Media segment tag MUST NOT appear in a Master Playlist\n"));
@@ -900,14 +925,14 @@
 		}
 
 		/* OK, we have a stream, we have to choose the elements within the same stream variant */
-		assert(stream);
-		assert(stream->variants);
+		gf_assert(stream);
+		gf_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);
+				gf_assert(i_playlist_element);
 				if (stream->stream_id < MEDIA_TYPE_AUDIO) {
 					/* regular stream (EXT-X-STREAM-INF) */
 					// Two stream are identical only if they have the same URL
@@ -934,7 +959,6 @@
 				gf_m3u8_master_playlist_del(playlist);
 				return GF_OUT_OF_MEM;
 			}
-			assert(fullURL);
 			if (curr_playlist->url)
 				gf_free(curr_playlist->url);
 			curr_playlist->url = gf_strdup(fullURL);
@@ -956,21 +980,20 @@
 			curr_playlist->channels = attribs->channels;
 		} else {
 			/* Normal Playlist */
-			assert((*playlist)->streams);
+			gf_assert((*playlist)->streams);
 			if (curr_playlist == NULL) {
 
 				/* This is a "normal" playlist without any element in it */
 				PlaylistElement *subElement;
-				assert(baseURL);
+				gf_assert(baseURL);
 				curr_playlist = playlist_element_new(TYPE_PLAYLIST, baseURL, attribs);
 				if (curr_playlist == NULL) {
 					/* out of memory */
 					gf_m3u8_master_playlist_del(playlist);
 					return GF_OUT_OF_MEM;
 				}
-				assert(curr_playlist->element.playlist.elements);
-				assert(fullURL);
-				assert(curr_playlist->url && !curr_playlist->codecs);
+				gf_assert(curr_playlist->element.playlist.elements);
+				gf_assert(curr_playlist->url && !curr_playlist->codecs);
 				curr_playlist->codecs = NULL;
 
 				subElement = playlist_element_new(TYPE_UNKNOWN, fullURL, attribs);
@@ -986,9 +1009,9 @@
 				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);
+				gf_assert(stream);
+				gf_assert(stream->variants);
+				gf_assert(curr_playlist);
 			} else {
 				PlaylistElement *subElement = playlist_element_new(TYPE_UNKNOWN, fullURL, attribs);
 				if (curr_playlist->element_type != TYPE_PLAYLIST) {
@@ -1079,9 +1102,10 @@
 	RST_ATTR(group.audio)
 	RST_ATTR(language)
 	RST_ATTR(title)
-	if (is_cleanup)
+	if (is_cleanup) {
 		RST_ATTR(key_url)
-
+		RST_ATTR(name)
+	}
 	RST_ATTR(init_url)
 	RST_ATTR(mediaURL)
 }
@@ -1142,7 +1166,7 @@
 			if (m3u8pos >= m3u8_size)
 				break;
 			while (1) {
-				assert(__idx < M3U8_BUF_SIZE);
+				if (__idx >= M3U8_BUF_SIZE) break;
 
 				currentLine__idx = m3u8_payloadm3u8pos;
 				__idx++;

gpac-2.2.1.tar.gz/src/media_tools/media_export.c -> gpac-2.4.0.tar.gz/src/media_tools/media_export.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2022
+ *			Copyright (c) Telecom ParisTech 2000-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / Media Tools sub-project
@@ -1089,6 +1089,9 @@
 		if (!export_ext) {
 			use_dynext = GF_TRUE;
 			if (dumper->in_name) {
+#ifdef GPAC_DISABLE_MEDIA_IMPORT
+				return GF_NOT_SUPPORTED;
+#else
 				GF_MediaImporter import;
 				memset(&import, 0, sizeof(GF_MediaImporter));
 				import.flags = GF_IMPORT_PROBE_ONLY;
@@ -1127,6 +1130,7 @@
 					break;
 				}
 				if (!found) return GF_NOT_FOUND;
+#endif
 			}
 		} else {
 			skip_write_filter = GF_TRUE;
@@ -1309,7 +1313,7 @@
 	//we already have the file loaded, directly load the mp4dmx filter with this file
 	if (dumper->file) {
 		//we want to expose every track
-		e = gf_dynstrcat(&args, "mp4dmx:FID=1:noedit:alltk:allt", NULL);
+		e = gf_dynstrcat(&args, "mp4dmx:FID=1:edits=no:alltk:allt", NULL);
 		if (!e) {
 			sprintf(szSubArgs, ":mov=%p", dumper->file);
 			e = gf_dynstrcat(&args, szSubArgs, NULL);
@@ -1322,7 +1326,7 @@
 		args = NULL;
 	} else {
 		//we want to expose every track
-		src_filter = gf_fs_load_source(fsess, dumper->in_name, "FID=1:noedit:alltk:allt", NULL, &e);
+		src_filter = gf_fs_load_source(fsess, dumper->in_name, "FID=1:edits=no:alltk:allt", NULL, &e);
 	}
 
 	if (!src_filter || e) {
@@ -1358,7 +1362,7 @@
 		if (dumper->file)
 			gf_fs_print_unused_args(fsess, NULL);
 		else
-			gf_fs_print_unused_args(fsess, "alltk,allt,noedit");
+			gf_fs_print_unused_args(fsess, "alltk,allt,edits");
 	}
 	gf_fs_print_non_connected(fsess);
 	if (dumper->print_stats_graph & 1) gf_fs_print_stats(fsess);

gpac-2.2.1.tar.gz/src/media_tools/media_import.c -> gpac-2.4.0.tar.gz/src/media_tools/media_import.c Changed

gpac-2.2.1.tar.gz/src/media_tools/mpd.c -> gpac-2.4.0.tar.gz/src/media_tools/mpd.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre, Cyril Concolato
- *			Copyright (c) Telecom ParisTech 2000-2022
+ *			Copyright (c) Telecom ParisTech 2000-2024
  *					All rights reserved
  *
  *  This file is part of GPAC / 3GPP/MPEG Media Presentation Description input module
@@ -483,6 +483,13 @@
             }
         }
 		else if (!strcmp(att->name, "duration")) seg->duration=gf_mpd_parse_int(att->value);
+		else if (!strcmp(att->name, "t")) seg->first_tfdt = gf_mpd_parse_long_int(att->value);
+		else if (!strcmp(att->name, "n")) seg->first_pck_seq = gf_mpd_parse_int(att->value);
+		else if (!strcmp(att->name, "d")) seg->duration = gf_mpd_parse_int(att->value);
+		else if (!strcmp(att->name, "s")) seg->frag_start_offset = gf_mpd_parse_long_int(att->value);
+		else if (!strcmp(att->name, "dt")) seg->frag_tfdt = gf_mpd_parse_long_int(att->value);
+		else if (!strcmp(att->name, "f")) seg->split_first_dur = gf_mpd_parse_int(att->value);
+		else if (!strcmp(att->name, "l")) seg->split_last_dur = gf_mpd_parse_int(att->value);
 	}
 }
 
@@ -501,13 +508,22 @@
 	while ( (att = gf_list_enum(root->attributes, &i)) ) {
 		if (strstr(att->name, "href")) seg->xlink_href = gf_mpd_parse_string(att->value);
 		else if (strstr(att->name, "actuate")) seg->xlink_actuate_on_load = !strcmp(att->value, "onLoad") ? 1 : 0;
+
+		else if (!strcmp(att->name, "sampleDuration")) seg->sample_duration = gf_mpd_parse_int(att->value);
+		else if (!strcmp(att->name, "srcTimescale")) seg->src_timescale = gf_mpd_parse_int(att->value);
+		else if (!strcmp(att->name, "srcDelay")) seg->pid_delay = gf_mpd_parse_int(att->value);
+		else if (!strcmp(att->name, "firstCTSOffset")) seg->first_cts_offset = att->value ? atoi(att->value) : 0;
 	}
 	gf_mpd_parse_multiple_segment_base(mpd, (GF_MPD_MultipleSegmentBase *)seg, root);
 
 	i = 0;
 	while ( (child = gf_list_enum(root->content, &i))) {
 		if (!gf_mpd_valid_child(mpd, child)) continue;
-		if (!strcmp(child->name, "SegmentURL")) gf_mpd_parse_segment_url(seg->segment_URLs, child);
+		if (mpd->index_mode) {
+			if (!strcmp(child->name, "I")) gf_mpd_parse_segment_url(seg->segment_URLs, child);
+		} else {
+			if (!strcmp(child->name, "SegmentURL")) gf_mpd_parse_segment_url(seg->segment_URLs, child);
+		}
 	}
 	if (!gf_list_count(seg->segment_URLs)) {
 		gf_list_del(seg->segment_URLs);
@@ -580,7 +596,7 @@
 	if (container)
 		gf_list_add(container, mpd_desc);
 	else {
-		assert(out_ptr);
+		gf_assert(out_ptr);
 		if (*out_ptr) gf_mpd_descriptor_free(*out_ptr);
 		*out_ptr = mpd_desc;
 	}
@@ -823,6 +839,8 @@
 		else if (!strcmp(att->name, "qualityRanking")) rep->quality_ranking = gf_mpd_parse_int(att->value);
 		else if (!strcmp(att->name, "dependencyId")) rep->dependency_id = gf_mpd_parse_string(att->value);
 		else if (!strcmp(att->name, "mediaStreamStructureId")) rep->media_stream_structure_id = gf_mpd_parse_string(att->value);
+		else if (!strcmp(att->name, "src")) rep->res_url = gf_mpd_parse_string(att->value);
+		else if (!strcmp(att->name, "trackID")) rep->trackID = gf_mpd_parse_int(att->value);
 		else gf_mpd_parse_common_representation_attr(mpd, (GF_MPD_CommonAttributes*)rep, root, att, &i);
 	}
 
@@ -836,12 +854,14 @@
 			if (e) return e;
 		}
 		else if (!strcmp(child->name, "SegmentBase")) {
+			if (mpd->index_mode) return GF_NON_COMPLIANT_BITSTREAM;
 			rep->segment_base = gf_mpd_parse_segment_base(mpd, child);
 		}
 		else if (!strcmp(child->name, "SegmentList")) {
 			rep->segment_list = gf_mpd_parse_segment_list(mpd, child);
 		}
 		else if (!strcmp(child->name, "SegmentTemplate")) {
+			if (mpd->index_mode) return GF_NON_COMPLIANT_BITSTREAM;
 			rep->segment_template = gf_mpd_parse_segment_template(mpd, child);
 		}
 		/*TODO
@@ -851,11 +871,11 @@
 		}
 		*/
 		else if (!strcmp(child->name, "dasher")) {
-			assert(!rep->dasher_ctx);
+			gf_assert(!rep->dasher_ctx);
 			rep->dasher_ctx = gf_mpd_parse_dasher_context(mpd, child);
 		}
 		else if (!strcmp(child->name, "segments")) {
-			assert(!rep->state_seg_list);
+			gf_assert(!rep->state_seg_list);
 			rep->state_seg_list = gf_mpd_parse_segments_context(mpd, child);
 		} else {
 			gf_mpd_parse_common_representation_child(mpd, (GF_MPD_CommonAttributes*)rep, root, child, &i, child_idx);
@@ -1289,7 +1309,7 @@
 	}
 	if (ptr->m3u8_var_name) gf_free(ptr->m3u8_var_name);
 	if (ptr->m3u8_var_file) gf_fclose(ptr->m3u8_var_file);
-
+	if (ptr->res_url) gf_free(ptr->res_url);
 	gf_free(ptr);
 }
 
@@ -1350,6 +1370,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);
+	if (mpd->segment_template) gf_free(mpd->segment_template);
 	gf_mpd_del_list(mpd->utc_timings, gf_mpd_descriptor_free, 0);
 	gf_mpd_del_list(mpd->essential_properties, gf_mpd_descriptor_free, 0);
 	gf_mpd_del_list(mpd->supplemental_properties, gf_mpd_descriptor_free, 0);
@@ -1368,6 +1389,7 @@
 	GF_XMLNode *child;
 
 	if (!root || !mpd) return GF_BAD_PARAM;
+	mpd->index_mode = 0;
 	i=0;
 	while ((att = gf_list_enum(root->attributes, &i))) {
 		if (!strcmp(att->name, "xmlns")) {
@@ -1375,7 +1397,13 @@
 				ns_ok = 1;
 				break;
 			}
+			if (!root->ns && !strcmp(att->value, "urn:gpac:dash:index:2023")) {
+				ns_ok = 1;
+				mpd->index_mode = 1;
+				break;
+			}
 		}
+
 		else if (!strncmp(att->name, "xmlns:", 6)) {
 			if (root->ns && !strcmp(att->name+6, root->ns) && (!strcmp(att->value, "urn:mpeg:dash:schema:mpd:2011") || !strcmp(att->value, "urn:mpeg:DASH:schema:MPD:2011")) ) {
 				ns_ok = 1;
@@ -1430,6 +1458,10 @@
 			mpd->gpac_next_ntp_ms = gf_mpd_parse_long_int(att->value);
 		} else if (!strcmp(att->name, "gpac:mpd_time")) {
 			mpd->gpac_mpd_time = gf_mpd_parse_long_int(att->value);
+		} else if (!strcmp(att->name, "segmentDuration")) {
+			mpd->segment_duration = gf_mpd_parse_duration_u32(att->value);
+		} else if (!strcmp(att->name, "template")) {
+			mpd->segment_template = gf_mpd_parse_string(att->value);
 		} else {
 			MPD_STORE_EXTENSION_ATTR(mpd)
 		}
@@ -1475,7 +1507,7 @@
 
 static void gf_mpd_init_struct(GF_MPD *mpd)
 {
-	assert(!mpd->periods);
+	gf_assert(!mpd->periods);
 	mpd->periods = gf_list_new();
 	mpd->program_infos = gf_list_new();
 	mpd->base_URLs = gf_list_new();
@@ -1541,7 +1573,8 @@
 
 	GF_SAFEALLOC(info, GF_MPD_ProgramInfo);
 	if (!info) return GF_OUT_OF_MEM;
-	info->more_info_url = gf_strdup("http://gpac.io");
+	if (gf_sys_is_test_mode()) info->more_info_url = gf_strdup("http://gpac.io");
+	else info->more_info_url = gf_strdup("https://gpac.io");
 	info->title = gf_strdup(title);
 	sprintf(str, "Generated from URL %s", gf_file_basename(src_base_url));
 	info->source = gf_strdup(str);
@@ -1774,12 +1807,12 @@
 			if (elt && import_file) {
 				GF_MediaImporter import;
 				char *elt_url = elt->init_segment_url ? elt->init_segment_url : elt->url;
-				u64 br_start, br_end;
 				char *tmp_file = NULL;
 
-				br_start = elt->init_segment_url ? elt->init_byte_range_start : elt->byte_range_start;
-				br_end = elt->init_segment_url ? elt->init_byte_range_end : elt->byte_range_end;
-
+#ifndef GPAC_DISABLE_NETWORK
+				u64 br_start = elt->init_segment_url ? elt->init_byte_range_start : elt->byte_range_start;
+				u64 br_end = elt->init_segment_url ? elt->init_byte_range_end : elt->byte_range_end;
+#endif
 				char *par_url = gf_url_concatenate(src_base_url, pe->url);
 				elt_url = gf_url_concatenate(par_url, elt_url);
 				gf_free(par_url);
@@ -1794,10 +1827,12 @@
 						tmp_file = strrchr(elt_url, '\\');
 					if (tmp_file) {
 						tmp_file++;
+#ifndef GPAC_DISABLE_NETWORK
 						e = gf_dm_wget(elt_url, tmp_file, br_start, br_end, NULL);
 						if (e == GF_OK) {
 							import.in_name = tmp_file;
 						}
+#endif
 					}
 				} else {
 					import.in_name = elt_url;
@@ -2014,7 +2049,7 @@
 				//if byte-range media file, add base URL
 				byte_range_media_file
 				//otherwise if we have different location for HLS vs MPD url or if child playlist is not in same path as master HLS
-				|| (rel_url || variant_base_url || strchr(elt->url, '/') || strchr(elt->url, '\\'))
+				|| (rel_url || variant_base_url || strpbrk(elt->url, "/\\"))
 			)) {
 				GF_MPD_BaseURL *url;
 				GF_SAFEALLOC(url, GF_MPD_BaseURL);
@@ -2129,7 +2164,7 @@
 				segment_url->duration = (u64) (rep->segment_list->timescale * elt->duration_info);
 				if (segment_url->duration == rep->segment_list->duration)
 					segment_url->duration = 0;
-					
+
 				if (elt->drm_method != DRM_NONE) {
 					//segment_url->key_url = "aes-128";
 					if (elt->key_uri) {
@@ -2208,8 +2243,8 @@
 	the_pe = NULL;
 	pe = NULL;
 	i = 0;
-	assert(pl);
-	assert(pl->streams);
+	gf_assert(pl);
+	gf_assert(pl->streams);
 	while ((stream = gf_list_enum(pl->streams, &i))) {
 		j = 0;
 		while (NULL != (pe = gf_list_enum(stream->variants, &j))) {
@@ -2259,10 +2294,13 @@
 			} else { /* for use in MP4Box */
 				if (strstr(suburl, "://")) {
 					GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("M3U8 Downloading %s...\n", suburl));
+#ifndef GPAC_DISABLE_NETWORK
 					e = gf_dm_wget(suburl, "tmp.m3u8", 0, 0, NULL);
 					if (e == GF_OK) {
 						e = gf_m3u8_parse_sub_playlist("tmp.m3u8", &pl, suburl, stream, pe, GF_FALSE);
-					} else {
+					} else
+#endif
+					{
 						GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("M3U8 Download failed for %s\n", suburl));
 						e = GF_OK;
 					}
@@ -2285,6 +2323,7 @@
 	is_end = !pl->playlist_needs_refresh;
 	if (!the_pe) {
 		GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("M3U8 The M3U8 playlist is not correct.\n"));
+		gf_m3u8_master_playlist_del(&pl);
 		return GF_BAD_PARAM;
 	}
 
@@ -2316,8 +2355,8 @@
 	if (!title || strlen(title) < 2)
 		title = the_pe->url;
 
-	assert(mpd_file);
-	assert(mpd);
+	gf_assert(mpd_file);
+	gf_assert(mpd);
 
 	e = gf_m3u8_fill_mpd_struct(pl, m3u8_file, base_url, mpd_file, title, update_interval, mimeTypeForM3U8Segments, do_import, use_mpd_templates, use_segment_timeline, is_end,  max_dur, mpd, parse_sub_playlist);
 
@@ -2342,7 +2381,9 @@
 	const char *loc_file = rep->segment_list->xlink_href;
 	char *full_url;
 
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("M3U8 Solving m3u8 variant playlist %s\n", rep->segment_list->xlink_href));
+	if (!rep->in_progress) {
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("M3U8 Solving m3u8 variant playlist %s\n", rep->segment_list->xlink_href));
+	}
 
 	if (!getter || !getter->new_session || !getter->del_session || !getter->get_cache_name) {
 		GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("M3U8 FileDownloader not found\n"));
@@ -2368,13 +2409,29 @@
 		loc_file = full_url;
 		gf_sha1_file(loc_file, signature);
 	} else {
-		e = getter->new_session(getter, full_url);
-		if (e) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("M3U8 Download failed for %s: %s\n", rep->segment_list->xlink_href, gf_error_to_string(e) ));
+		if (!rep->in_progress) {
+			e = getter->new_session(getter, full_url);
+			if (e && (e!=GF_IP_NETWORK_EMPTY)) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("M3U8 Download failed for %s: %s\n", rep->segment_list->xlink_href, gf_error_to_string(e) ));
+				gf_free(full_url);
+				return e;
+			}
+		}
+		e = getter->get_status(getter);
+		if (e == GF_NOT_READY) {
+			rep->in_progress = GF_TRUE;
 			gf_free(full_url);
-			return e;
+			return GF_NOT_READY;
 		}
+		rep->in_progress = GF_FALSE;
+		if (e<0)
+			return e;
+
 		loc_file = getter->get_cache_name(getter);
+		if (!loc_file) {
+			gf_free(full_url);
+			return GF_URL_ERROR;
+		}
 		gf_sha1_file(loc_file, signature);
 	}
 	if (! memcmp(signature, last_sig, GF_SHA1_DIGEST_SIZE)) {
@@ -2391,8 +2448,8 @@
 		return e;
 	}
 
-	assert(pl);
-	assert(pl->streams);
+	gf_assert(pl);
+	gf_assert(pl->streams);
 
 	if (!gf_list_count(pl->streams)) {
 		GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("M3U8 Playlist %s still empty\n", rep->segment_list->xlink_href));
@@ -2400,7 +2457,7 @@
 		return GF_IP_NETWORK_EMPTY;
 	}
 
-	assert(gf_list_count(pl->streams) == 1);
+	gf_assert(gf_list_count(pl->streams) == 1);
 
 
 	memcpy(last_sig, signature, GF_SHA1_DIGEST_SIZE);
@@ -2410,7 +2467,7 @@
 	}
 
 	stream = (Stream *)gf_list_get(pl->streams, 0);
-	assert(gf_list_count(stream->variants) == 1);
+	gf_assert(gf_list_count(stream->variants) == 1);
 	pe = (PlaylistElement *)gf_list_get(stream->variants, 0);
 
 	if (duration) {
@@ -2626,7 +2683,7 @@
 	ms = (u32)(time - ((u64)sec) * 1000);
 
 	if (name) {
-		gf_fprintf(out, " %s=\"", name);
+		gf_xml_dump_string(out, " ", name, "=\"");
 	}
 	t = gf_gmtime(&gtime);
 	sec = t->tm_sec;
@@ -2720,31 +2777,57 @@
 	gf_mpd_lf(out, indent);
 }
 
-static void gf_mpd_print_segment_timeline(FILE *out, GF_MPD_SegmentTimeline *tl, s32 indent)
+static void gf_mpd_print_segment_timeline(FILE *out, GF_MPD_SegmentTimeline *tl, s32 indent, u32 tsb_first_entry)
 {
-	u32 i;
+	u32 i, count, rcount;
 	u64 start_time=0;
-	GF_MPD_SegmentTimelineEntry *se;
+	GF_MPD_SegmentTimelineEntry *se, *prev;
 
 	gf_mpd_nl(out, indent);
 	gf_fprintf(out, "<SegmentTimeline>");
 	gf_mpd_lf(out, indent);
 
-	i = 0;
-	while ( (se = gf_list_enum(tl->entries, &i))) {
-		gf_mpd_nl(out, indent+1);
-		gf_fprintf(out, "<S");
-		if (!start_time || (se->start_time != start_time)) {
-			gf_fprintf(out, " t=\""LLD"\"", se->start_time);
-			start_time = se->start_time;
+	prev = gf_list_get(tl->entries, tsb_first_entry);
+	count = gf_list_count(tl->entries);
+	if (!prev) goto done_tl;
+
+	gf_mpd_nl(out, indent+1);
+	gf_fprintf(out, "<S");
+	gf_fprintf(out, " t=\""LLD"\"", prev->start_time);
+	if (prev->duration) gf_fprintf(out, " d=\"%d\"", prev->duration);
+	rcount = prev->repeat_count;
+	start_time = prev->start_time + (prev->repeat_count+1) * prev->duration;
+
+	for (i = tsb_first_entry+1; i<count && prev; i++) {
+		se = gf_list_get(tl->entries, i);
+		//close entry
+		if ((se->start_time != start_time) || (prev->duration!=se->duration)) {
+			if (rcount) gf_fprintf(out, " r=\"%d\"", rcount);
+			gf_fprintf(out, "/>");
+			gf_mpd_lf(out, indent);
+			//start new one
+			gf_mpd_nl(out, indent+1);
+			gf_fprintf(out, "<S");
+			if (se->start_time != start_time) {
+				gf_fprintf(out, " t=\""LLD"\"", se->start_time);
+				start_time = se->start_time;
+			}
+			if (se->duration) gf_fprintf(out, " d=\"%d\"", se->duration);
+			rcount=0;
+		} else {
+			rcount++;
 		}
 		start_time += (se->repeat_count+1) * se->duration;
-
-		if (se->duration) gf_fprintf(out, " d=\"%d\"", se->duration);
-		if (se->repeat_count) gf_fprintf(out, " r=\"%d\"", se->repeat_count);
-		gf_fprintf(out, "/>");
-		gf_mpd_lf(out, indent);
+		rcount += se->repeat_count;
+		prev = se;
 	}
+	//close last entry
+	if (rcount) gf_fprintf(out, " r=\"%d\"", rcount);
+	gf_fprintf(out, "/>");
+	gf_mpd_lf(out, indent);
+
+
+done_tl:
 	gf_mpd_nl(out, indent);
 	gf_fprintf(out, "</SegmentTimeline>");
 	gf_mpd_lf(out, indent);
@@ -2779,7 +2862,7 @@
 	if (ms->initialization_segment) gf_mpd_print_url(out, ms->initialization_segment, "Initialization", indent+1);
 	if (ms->representation_index) gf_mpd_print_url(out, ms->representation_index, "RepresentationIndex", indent+1);
 
-	if (ms->segment_timeline) gf_mpd_print_segment_timeline(out, ms->segment_timeline, indent+1);
+	if (ms->segment_timeline) gf_mpd_print_segment_timeline(out, ms->segment_timeline, indent+1, ms->tsb_first_entry);
 	if (ms->bitstream_switching_url) gf_mpd_print_url(out, ms->bitstream_switching_url, "BitstreamSwitching", indent+1);
 	return 0;
 }
@@ -2789,31 +2872,56 @@
 	gf_mpd_nl(out, indent);
 	gf_fprintf(out, "<SegmentList");
 	if (s->xlink_href) {
-		gf_fprintf(out, " xlink:href=\"%s\"", s->xlink_href);
+		gf_xml_dump_string(out, " xlink:href=\"", s->xlink_href, "\"");
 		if (s->xlink_actuate_on_load)
 			gf_fprintf(out, " actuate=\"onLoad\"");
-	}	
-	gf_mpd_print_multiple_segment_base(out, (GF_MPD_MultipleSegmentBase *)s, indent, GF_FALSE);
-	
+	}
+	if (s->index_mode) {
+		if (s->timescale) gf_fprintf(out, " timescale=\"%d\"", s->timescale);
+		if (s->presentation_time_offset) gf_fprintf(out, " presentationTimeOffset=\""LLU"\"", s->presentation_time_offset);
+		if (s->sample_duration) gf_fprintf(out, " sampleDuration=\"%u\"", s->sample_duration);
+		if (s->src_timescale) gf_fprintf(out, " srcTimescale=\"%u\"", s->src_timescale);
+		if (s->pid_delay) gf_fprintf(out, " srcDelay=\"%u\"", s->pid_delay);
+		if (s->first_cts_offset) gf_fprintf(out, " firstCTSOffset=\"%d\"", s->first_cts_offset);
+		gf_fprintf(out, ">");
+		gf_mpd_lf(out, indent);
+	} else {
+		gf_mpd_print_multiple_segment_base(out, (GF_MPD_MultipleSegmentBase *)s, indent, GF_FALSE);
+	}
+
 	if (s->segment_URLs) {
 		u32 i;
 		GF_MPD_SegmentURL *url;
-		i = 0;
+		i = s->tsb_first_entry;
 		while ( (url = gf_list_enum(s->segment_URLs, &i))) {
 			gf_mpd_nl(out, indent+1);
-			gf_fprintf(out, "<SegmentURL");
-                       if (url->media) gf_fprintf(out, " media=\"%s\"", url->media);
-                       if (url->duration)gf_fprintf(out, " duration=\""LLU"\"", url->duration);
-			if (url->index) gf_fprintf(out, " index=\"%s\"", url->index);
-			if (url->media_range && url->media_range->end_range!=0) gf_fprintf(out, " mediaRange=\""LLD"-"LLD"\"", url->media_range->start_range, url->media_range->end_range);
-			if (url->index_range && url->index_range->end_range!=0) gf_fprintf(out, " indexRange=\""LLD"-"LLD"\"", url->index_range->start_range, url->index_range->end_range);
-			if (url->key_url) {
-				u32 idx;
-				gf_fprintf(out, " hls:keyMethod=\"aes-128\" hls:KeyURL=%s hls:KeyIV=\"", url->key_url);
-				for (idx=0; idx<16; idx++) {
-					gf_fprintf(out, "%02x", url->key_ividx);
+			if (s->index_mode) {
+				gf_fprintf(out, "<I t=\""LLU"\" n=\""LLU"\" d=\""LLU"\"", url->first_tfdt, url->first_pck_seq, url->duration);
+
+				if (url->split_first_dur || url->split_last_dur)
+					gf_fprintf(out, " f=\"%u\" l=\"%u\" ", url->split_first_dur, url->split_last_dur);
+
+				if (url->frag_start_offset) {
+					gf_fprintf(out, " s=\""LLU"\"", url->frag_start_offset);
+					if (url->first_tfdt && url->frag_tfdt && (url->frag_tfdt!=url->first_tfdt)) {
+						gf_fprintf(out, " dt=\""LLU"\" ", url->frag_tfdt);
+					}
+				}
+			} else {
+				gf_fprintf(out, "<SegmentURL");
+				if (url->media) gf_xml_dump_string(out, " media=\"", url->media, "\"");
+				if (url->duration)gf_fprintf(out, " duration=\""LLU"\"", url->duration);
+				if (url->index) gf_fprintf(out, " index=\"%s\"", url->index);
+				if (url->media_range && url->media_range->end_range!=0) gf_fprintf(out, " mediaRange=\""LLD"-"LLD"\"", url->media_range->start_range, url->media_range->end_range);
+				if (url->index_range && url->index_range->end_range!=0) gf_fprintf(out, " indexRange=\""LLD"-"LLD"\"", url->index_range->start_range, url->index_range->end_range);
+				if (url->key_url) {
+					u32 idx;
+					gf_fprintf(out, " hls:keyMethod=\"aes-128\" hls:KeyURL=%s hls:KeyIV=\"", url->key_url);
+					for (idx=0; idx<16; idx++) {
+						gf_fprintf(out, "%02x", url->key_ividx);
+					}
+					gf_fprintf(out, "\"");
 				}
-				gf_fprintf(out, "\"");
 			}
 			gf_fprintf(out, "/>");
 			gf_mpd_lf(out, indent);
@@ -2829,9 +2937,9 @@
 	gf_mpd_nl(out, indent);
 	gf_fprintf(out, "<SegmentTemplate");
 
-	if (s->media) gf_fprintf(out, " media=\"%s\"", s->media);
+	if (s->media) gf_xml_dump_string(out, " media=\"", s->media, "\"");
 	if (s->index) gf_fprintf(out, " index=\"%s\"", s->index);
-	if (s->initialization) gf_fprintf(out, " initialization=\"%s\"", s->initialization);
+	if (s->initialization) gf_xml_dump_string(out, " initialization=\"", s->initialization, "\"");
 	if (s->bitstream_switching) gf_fprintf(out, " bitstreamSwitching=\"%s\"", s->bitstream_switching);
 
 	if (gf_mpd_print_multiple_segment_base(out, (GF_MPD_MultipleSegmentBase *)s, indent, GF_TRUE))
@@ -2888,9 +2996,9 @@
 {
 	gf_mpd_nl(out, indent);
 	gf_fprintf(out, "<%s", desc_name);
-	if (desc->id) gf_fprintf(out, " id=\"%s\"", desc->id);
-	if (desc->scheme_id_uri) gf_fprintf(out, " schemeIdUri=\"%s\"", desc->scheme_id_uri);
-	if (desc->value) gf_fprintf(out, " value=\"%s\"", desc->value);
+	if (desc->id) gf_xml_dump_string(out, " id=\"", desc->id, "\"");
+	if (desc->scheme_id_uri) gf_xml_dump_string(out, " schemeIdUri=\"", desc->scheme_id_uri, "\"");
+	if (desc->value) gf_xml_dump_string(out, " value=\"", desc->value, "\"");
 
 	gf_mpd_extensible_print_attr(out, desc->x_attributes);
 
@@ -2917,6 +3025,25 @@
 	}
 }
 
+#include <gpac/iso639.h>
+
+static void mpd_print_lang(FILE *out, const char *attVal, const char *attName)
+{
+	if (!attVal) return;
+
+	if (!gf_sys_is_test_mode()) {
+		if (!strcmp(attVal, "und")) return;
+		if (strlen(attVal)==3) {
+			s32 res = gf_lang_find(attVal);
+			if (res>0) {
+				const char *lang = gf_lang_get_2cc(res);
+				if (lang) attVal = lang;
+			}
+		}
+	}
+	gf_fprintf(out, " %s=\"%s\"", attName ? attName : "lang", attVal);
+}
+
 static void gf_mpd_print_content_component(FILE *out, GF_List *content_component , s32 indent)
 {
 	u32 i=0;
@@ -2924,8 +3051,7 @@
 	while ((cc = gf_list_enum(content_component, &i))) {
 		gf_mpd_nl(out, indent);
 		gf_fprintf(out, "<ContentComponent id=\"%d\" contentType=\"%s\"", cc->id, cc->type);
-		if (cc->lang)
-			gf_fprintf(out, " lang=\"%s\"", cc->lang);
+		mpd_print_lang(out, cc->lang, NULL);
 		gf_fprintf(out, "/>");
 		gf_mpd_lf(out, indent);
 	}
@@ -3151,6 +3277,11 @@
 		gf_fprintf(out, " gpac:first_tfdt=\""LLU"\"", rep->first_tfdt_plus_one-1);
 		gf_fprintf(out, " gpac:tfdt_timescale=\""LLU"\"", rep->first_tfdt_timescale);
 	}
+	if (rep->res_url) {
+		gf_fprintf(out, " src=\"%s\"", rep->res_url);
+		if (rep->trackID)
+			gf_fprintf(out, " trackID=\"%d\"", rep->trackID);
+	}
 
 	if (bck_codecs) {
 		gf_free(rep->codecs);
@@ -3215,7 +3346,7 @@
 
 	if (as->id>=0) gf_fprintf(out, " id=\"%d\"", as->id);
 	if (as->xlink_href) {
-		gf_fprintf(out, " xlink:href=\"%s\"", as->xlink_href);
+		gf_xml_dump_string(out, " xlink:href=\"", as->xlink_href,"\"");
 		if (as->xlink_actuate_on_load)
 			gf_fprintf(out, " actuate=\"onLoad\"");
 	}
@@ -3241,7 +3372,7 @@
 	}
 	if (as->par && (as->par->num != 0) && (as->par->den != 0))
 		gf_fprintf(out, " par=\"%d:%d\"", as->par->num, as->par->den);
-	if (as->lang) gf_fprintf(out, " lang=\"%s\"", as->lang);
+	mpd_print_lang(out, as->lang, NULL);
 	if (as->bitstream_switching) gf_fprintf(out, " bitstreamSwitching=\"true\"");
 
 	gf_mpd_print_common_attributes(out, (GF_MPD_CommonAttributes*)as);
@@ -3299,7 +3430,7 @@
 	gf_mpd_nl(out, indent);
 	gf_fprintf(out, "<Period");
 	if (period->xlink_href) {
-		gf_fprintf(out, " xlink:href=\"%s\"", period->xlink_href);
+		gf_xml_dump_string(out, " xlink:href=\"", period->xlink_href, "\"");
 		if (period->xlink_actuate_on_load)
 			gf_fprintf(out, " actuate=\"onLoad\"");
 	}
@@ -3351,7 +3482,7 @@
 	time_ms = mpd->publishTime;
 	sec = (u32)(time_ms / 1000);
 	time_ms -= ((u64)sec) * 1000;
-	assert(time_ms<1000);
+	gf_assert(time_ms<1000);
 
 	gtime = sec;
 	t = gf_gmtime(&gtime);
@@ -3364,42 +3495,24 @@
 	return GF_OK;
 }
 
-static void gf_mpd_write_m3u8_playlist_tags_entry(FILE *out, const GF_MPD_Representation *rep, char *m3u8_name, const char *codec_ext, const char *g_type, const char *g_id_pref, u32 g_as_idx, const char *g2_type, const char *g2_id_pref, u32 g2_as_idx, GF_List *groups_done, const GF_MPD_AdaptationSet *set)
+static void gf_mpd_write_m3u8_playlist_tags_entry(FILE *out, const GF_MPD_Representation *rep, char *m3u8_name, const char *codec_ext, const char *g_type, const char *g_id_pref, const char *g2_type, const char *g2_id_pref, const GF_MPD_AdaptationSet *set, u32 max_alt_bandwidth, u32 max_alt_width, u32 max_alt_height, Double max_alt_fps)
 {
 	u32 i;
-	if (groups_done) {
-		u32 count=gf_list_count(groups_done);
-		Bool g1_done = GF_FALSE;
-		Bool g2_done = GF_FALSE;
-		for (i=0; i<count; i++) {
-			const char *group_name = gf_list_get(groups_done, i);
-			if (g_id_pref && !strcmp(group_name, g_id_pref)) g1_done=GF_TRUE;
-			if (g2_id_pref && !strcmp(group_name, g2_id_pref)) g1_done=GF_TRUE;
-		}
-		if (g_id_pref) {
-			if (g1_done) return;
-			if (!g_as_idx)
-				gf_list_add(groups_done, (void *) g_id_pref);
-		}
-		if (g2_id_pref) {
-			if (g2_done) return;
-			if (!g2_as_idx)
-				gf_list_add(groups_done, (void *) g2_id_pref);
-		}
-	}
 
 	if (set && set->intra_only)
 		gf_fprintf(out, "#EXT-X-I-FRAME-STREAM-INF:");
 	else
 		gf_fprintf(out, "#EXT-X-STREAM-INF:");
 
-	gf_fprintf(out, "BANDWIDTH=%d,CODECS=\"%s", rep->bandwidth, rep->codecs);
+	gf_fprintf(out, "BANDWIDTH=%d,CODECS=\"%s", rep->bandwidth+max_alt_bandwidth , rep->codecs);
 	if (codec_ext)
 		gf_fprintf(out, ",%s", codec_ext);
 	gf_fprintf(out, "\"");
 
 	if (rep->width && rep->height)
 		gf_fprintf(out, ",RESOLUTION=%dx%d", rep->width, rep->height);
+	else if (max_alt_width && max_alt_height)
+		gf_fprintf(out, ",RESOLUTION=%dx%d", max_alt_width, max_alt_height);
 
 	if (set && set->intra_only) {
 		gf_fprintf(out, ",URI=\"%s\"\n", m3u8_name);
@@ -3407,17 +3520,15 @@
 	}
 	if (rep->fps)
 		gf_fprintf(out,",FRAME-RATE=%.03g", rep->fps);
+	else if (max_alt_fps)
+		gf_fprintf(out,",FRAME-RATE=%.03g", max_alt_fps);
 
 	if (g_type && g_id_pref) {
 		gf_fprintf(out, ",%s=\"%s", g_type, g_id_pref);
-		if (g_as_idx)
-			gf_fprintf(out, "%d", g_as_idx);
 		gf_fprintf(out, "\"");
 	}
 	if (g2_type && g2_id_pref) {
 		gf_fprintf(out,",%s=\"%s", g2_type, g2_id_pref);
-		if (g2_as_idx)
-			gf_fprintf(out,"%d", g2_as_idx);
 		gf_fprintf(out,"\"");
 	}
 	for (i=0; i<rep->nb_hls_master_tags; i++) {
@@ -3429,12 +3540,11 @@
 
 }
 
-static void gf_mpd_write_m3u8_playlist_tags(const GF_MPD_AdaptationSet *as, u32 as_idx, const GF_MPD_Representation *rep, FILE *out, char *m3u8_name, GF_MPD_Period *period, u32 nb_audio, u32 nb_subs, u32 nb_cc)
+static void gf_mpd_write_m3u8_playlist_tags(const GF_MPD_AdaptationSet *as, u32 as_idx, const GF_MPD_Representation *rep, FILE *out, char *m3u8_name, GF_MPD_Period *period, u32 nb_alt_media, u32 nb_subs, u32 nb_cc, const char *forced_inf_ids)
 {
-	u32 i, j;
+	u32 i;
 	GF_MPD_AdaptationSet *r_as;
 	GF_MPD_Representation *r_rep;
-	GF_List *groups_done;
 
 	if (!rep->mime_type) return;
 
@@ -3442,109 +3552,142 @@
 	if (!period) {
 		const char *g_type = NULL;
 		const char *g_id = NULL;
-		char szLANG100;
+		Bool has_name = GF_FALSE;
+		Bool has_lang = GF_FALSE;
+		Bool has_chan = GF_FALSE;
+		Bool has_autosel = GF_FALSE;
+		Bool has_forced = GF_TRUE;
 
 		if (rep->streamtype==GF_STREAM_AUDIO) {
 			g_type = "AUDIO";
 			g_id = "audio";
 		}
+		if (rep->streamtype==GF_STREAM_VISUAL) {
+			g_type = "VIDEO";
+			g_id = "video";
+		}
 		else if (rep->streamtype==GF_STREAM_TEXT) {
 			g_type = "SUBTITLES";
 			g_id = "subs";
+			has_forced = GF_FALSE;
 		}
 		if (!g_type || !g_id)
 			return;
 
-		//don't inject LANGUAGE if not known
-		if (!strcmp(as->lang, "und")) {
-			szLANG0 = 0;
-		} else {
-			sprintf(szLANG, ",LANGUAGE=\"%s\"", as->lang);
-		}
+		gf_fprintf(out, "#EXT-X-MEDIA:TYPE=%s", g_type);
 		if (rep->groupID)
-			gf_fprintf(out, "#EXT-X-MEDIA:TYPE=%s,GROUP-ID=\"%s\",NAME=\"%s\"%s,AUTOSELECT=YES,URI=\"%s\"", g_type, rep->groupID, rep->id, szLANG, m3u8_name);
+			gf_fprintf(out, ",GROUP-ID=\"%s\"", rep->groupID);
 		else
-			gf_fprintf(out, "#EXT-X-MEDIA:TYPE=%s,GROUP-ID=\"%s%d\",NAME=\"%s\"%s,AUTOSELECT=YES,URI=\"%s\"", g_type, g_id, as_idx, rep->id, szLANG, m3u8_name);
-		if (rep->nb_chan)
-			gf_fprintf(out,",CHANNELS=\"%d\"", rep->nb_chan);
+			gf_fprintf(out, ",GROUP-ID=\"%s\"", g_id);
 
+		//write tags, filtering out non-configurable ones
 		for (i=0; i<rep->nb_hls_master_tags; i++) {
+			const char *tag = rep->hls_master_tagsi;
+			if (!strncmp(tag, "TYPE=", 5)) continue;
+			else if (!strncmp(tag, "GROUP-ID=", 9)) continue;
+			else if (!strncmp(tag, "URI=", 4)) continue;
+
+			if (!strncmp(tag, "NAME=", 5)) has_name = GF_TRUE;
+			else if (!strncmp(tag, "LANGUAGE=", 9)) has_lang = GF_TRUE;
+			else if (!strncmp(tag, "CHANNELS=", 9)) has_chan = GF_TRUE;
+			else if (!strncmp(tag, "FORCED=", 7)) has_forced = GF_TRUE;
+
+			//if default is present (regardless of value), don't inject an autoselect
+			if (!strncmp(tag, "AUTOSELECT=", 11) || !strncmp(tag, "DEFAULT=", 8)) {
+				has_autosel = GF_TRUE;
+			}
 			gf_fprintf(out,",%s", rep->hls_master_tagsi);
 		}
+		if (!has_name && rep->id)
+			gf_fprintf(out, ",NAME=\"%s\"", rep->id);
+
+		//don't inject LANGUAGE if not known
+		if (!has_lang && as->lang && strcmp(as->lang, "und"))
+			gf_fprintf(out, ",LANGUAGE=\"%s\"", as->lang);
+
+		if (!has_autosel)
+			gf_fprintf(out, ",AUTOSELECT=YES");
+		if (!has_forced && rep->sub_forced)
+			gf_fprintf(out, ",FORCED=YES");
+
+		gf_fprintf(out, ",URI=\"%s\"", m3u8_name);
+
+		if (!has_chan && rep->nb_chan)
+			gf_fprintf(out, ",CHANNELS=\"%d\"", rep->nb_chan);
+
 		return;
 	}
 
 	//no other streams, directly write the entry
-	if (!nb_audio && !nb_subs && !nb_cc) {
-		gf_mpd_write_m3u8_playlist_tags_entry(out, rep, m3u8_name, NULL, NULL, NULL, 0, NULL, NULL, 0, NULL, as);
+	if (!nb_alt_media && !nb_subs && !nb_cc && (!forced_inf_ids || !forced_inf_ids0)) {
+		gf_mpd_write_m3u8_playlist_tags_entry(out, rep, m3u8_name, NULL, NULL, NULL, NULL, NULL, as, 0, 0, 0, 0);
 		return;
 	}
-	groups_done = gf_list_new();
 
-	//otherwise browse all adaptation sets
+	//gather all codecs and max values for alternate stream type and subs
+	char *grp_codecs = NULL;
+	const char *g_type = NULL;
+	const char *g_id = NULL;
+	const char *g_type_subs = NULL;
+	const char *g_id_subs = NULL;
+	u32 g_m_bandwidth=0, g_m_bandwidth_subs=0, g_m_width=0, g_m_height=0;
+	Double g_m_fps=0;
 	i=0;
 	while ( (r_as = (GF_MPD_AdaptationSet *) gf_list_enum(period->adaptation_sets, &i))) {
-		u32 g_as_idx;
-		Bool is_audio = GF_FALSE;
-		GF_MPD_AdaptationSet *r2_as;
-		GF_MPD_Representation *r2_rep;
-		const char *g_type = NULL;
-		const char *g_id = NULL;
-		const char *g_codec = NULL;
-		if (as==r_as) continue;
-
-		g_as_idx = (r_as->group>0) ? r_as->group : i;
-		r_rep = (GF_MPD_Representation *) gf_list_get(r_as->representations, 0);
-
-		//if audio streams are present, the first pass gather audio and we will need a second loop to get subs
-		if (nb_audio) {
-			if (r_rep->streamtype==GF_STREAM_AUDIO) {
-				g_type = "AUDIO";
-				g_id = "audio";
-				g_codec = r_rep->codecs;
-				if (r_rep->groupID) {
-					g_id = r_rep->groupID;
-					g_as_idx = 0;
-				}
-			}
-			is_audio = GF_TRUE;
-		} else {
-			if (r_rep->streamtype==GF_STREAM_TEXT) {
-				g_type = "SUBTITLES";
-				g_id = "subs";
+		u32 j=0;
+		while ( (r_rep = (GF_MPD_Representation *) gf_list_enum(r_as->representations, &j))) {
+			const char *hls_group = rep->groupID;
+			if (forced_inf_ids) {
+				if (r_rep == rep) continue;
+				if ((r_rep->streamtype!=rep->streamtype) && (r_rep->streamtype!=GF_STREAM_TEXT)) continue;
+				hls_group = forced_inf_ids;
+			} else {
+				if (r_rep->streamtype==rep->streamtype) continue;
 			}
-		}
-		//not our type
-		if (!g_type) continue;
-		//no audio, or no subs
-		if (!is_audio || !nb_subs) {
-			gf_mpd_write_m3u8_playlist_tags_entry(out, rep, m3u8_name, g_codec, g_type, g_id, g_as_idx, NULL, NULL, 0, groups_done, as);
-			continue;
-		}
-		//audio and subs, we need a second loop on audio to get all subs
-		j=0;
-		while ( (r2_as = (GF_MPD_AdaptationSet *) gf_list_enum(period->adaptation_sets, &j))) {
-			u32 g2_as_idx;
-			const char *g2_type = NULL;
-			const char *g2_id = NULL;
-			if (r_as==r2_as) continue;
-			g2_as_idx = (r2_as->group>0) ? r2_as->group : j;
+			//both groups specified, check if we match
+			if (r_rep->groupID && hls_group) {
+				char *res = strstr(hls_group, r_rep->groupID);
+				if (res) {
+					u32 gid_len = (u32) strlen(r_rep->groupID);
+					if (resgid_len && (resgid_len!=',')) res = NULL;
+				}
+				if (!res) continue;
+			}
+			//if rep we generate EXT-X-STREAM-INF for has a group set, do not match (even if no group set on tested rep)
+			else if (hls_group) continue;
+			//always match if no groups are specified
+
+			//some reps do not have codecs (raw formats, onlly mime is used)
+			if (r_rep->codecs && (!grp_codecs || !strstr(grp_codecs, r_rep->codecs)))
+				gf_dynstrcat(&grp_codecs, r_rep->codecs, ",");
 
-			r2_rep = (GF_MPD_Representation *) gf_list_get(r2_as->representations, 0);
-			if (r2_rep->streamtype==GF_STREAM_TEXT) {
-				g2_type = "SUBTITLES";
-				g2_id = "subs";
-				if (r_rep->groupID) {
-					g2_id = r_rep->groupID;
-					g2_as_idx = 0;
-				}
+			if (r_rep->streamtype==GF_STREAM_AUDIO) {
+				if (!g_type) g_type = "AUDIO";
+				if (!g_id) g_id = r_rep->groupID ? r_rep->groupID : "audio";
+				g_m_bandwidth = MAX(g_m_bandwidth, r_rep->bandwidth);
+			}
+			else if (r_rep->streamtype==GF_STREAM_VISUAL) {
+				if (!g_type) g_type = "VIDEO";
+				if (!g_id) g_id = r_rep->groupID ? r_rep->groupID : "video";
+				g_m_bandwidth = MAX(g_m_bandwidth, r_rep->bandwidth);
+				g_m_width = MAX(g_m_width, r_rep->width);
+				g_m_height = MAX(g_m_height, r_rep->height);
+				g_m_fps = MAX(g_m_fps, r_rep->fps);
+			}
+			else if (r_rep->streamtype==GF_STREAM_TEXT) {
+				if (!g_type_subs) g_type_subs = "SUBTITLES";
+				if (!g_id_subs) g_id_subs = r_rep->groupID ? r_rep->groupID : "subs";
+				g_m_bandwidth_subs = MAX(g_m_bandwidth_subs, r_rep->bandwidth);
 			}
-			if (!g2_type) continue;
-
-			gf_mpd_write_m3u8_playlist_tags_entry(out, rep, m3u8_name, g_codec, g_type, g_id, g_as_idx, g2_type, g2_id, g2_as_idx, NULL, as);
 		}
 	}
-	gf_list_del(groups_done);
+	g_m_bandwidth += g_m_bandwidth_subs;
+	if (gf_sys_is_test_mode() && !g_m_width)
+		g_m_bandwidth = 0;
+
+	gf_mpd_write_m3u8_playlist_tags_entry(out, rep, m3u8_name, grp_codecs, g_type, g_id, g_type_subs, g_id_subs, as, g_m_bandwidth, g_m_width, g_m_height, g_m_fps);
+	if (grp_codecs) gf_free(grp_codecs);
+	grp_codecs=NULL;
 }
 
 static const char *gf_mpd_m3u8_get_init_seg(const GF_MPD_Period *period, const GF_MPD_AdaptationSet *as, const GF_MPD_Representation *rep)
@@ -3585,12 +3728,12 @@
 	}
 
 	count = gf_list_count(rep->state_seg_list);
-	sctx = gf_list_get(rep->state_seg_list, 0);
+	sctx = gf_list_get(rep->state_seg_list, rep->tsb_first_entry);
 
 	gf_fprintf(out,"#EXTM3U\n");
 	gf_fprintf(out,"#EXT-X-TARGETDURATION:%d\n", (u32) gf_ceil( ((Double) rep->hls_max_seg_dur.num) / rep->hls_max_seg_dur.den) );
 	gf_fprintf(out,"#EXT-X-VERSION:%d\n", hls_version);
-	gf_fprintf(out,"#EXT-X-MEDIA-SEQUENCE:%d\n", sctx->seg_num);
+	gf_fprintf(out,"#EXT-X-MEDIA-SEQUENCE:%d\n", sctx ? sctx->seg_num : 0);
 	if (as->use_hls_ll) {
 		//PART-HOLD-BACK is REQUIRED if the Playlist contains the EXT-X-PART-INF tag
 		//we use the recommended (should) PART-TARGET x 3
@@ -3617,7 +3760,7 @@
 	}
 
 
-	if (sctx->filename) {
+	if (sctx && sctx->filename) {
 		if (as->intra_only) {
 			gf_fprintf(out,"#EXT-X-I-FRAMES-ONLY\n");
 		}
@@ -3633,10 +3776,10 @@
 			}
 		}
 
-		for (i=0; i<count; i++) {
+		for (i=rep->tsb_first_entry; i<count; i++) {
 			Double dur;
 			sctx = gf_list_get(rep->state_seg_list, i);
-			assert(sctx->filename);
+			gf_assert(sctx->filename);
 
 			if (rep->crypto_type) {
 				const char *kms;
@@ -3679,8 +3822,10 @@
 			u64 next_br_start_plus_one=0;
 			u32 next_seg_idx=0;
 			if ((mpd->type == GF_MPD_TYPE_DYNAMIC) && sctx->llhls_mode) {
-				u32 k;
-				for (k=0; k<sctx->nb_frags; k++) {
+				u32 k, nb_parts=sctx->nb_frags;
+				//EXT-X-PART tags SHOULD be removed from the Playlist after they are greater than three Target Durations from the end of the Playlist.
+				if (i+4<count) nb_parts=0;
+				for (k=0; k<nb_parts; k++) {
 					Bool write_br = GF_FALSE;
 					dur = sctx->fragsk.duration;
 					dur /= rep->timescale;
@@ -3724,7 +3869,7 @@
 				if (mpd->llhls_preload) {
 					//last seg has no parts yet, we just started it (live edge), advertise first part
 					if (!sctx->nb_frags) {
-						assert(sctx->filename);
+						gf_assert(sctx->filename);
 						if (sctx->llhls_mode==2) next_seg_idx = 1;
 						else next_br_start_plus_one = 1;
 					}
@@ -3780,7 +3925,7 @@
 						}
 					}
 				}
-				
+
 				if (close_file)
 					gf_fclose(out);
 				return GF_OK;
@@ -3801,8 +3946,9 @@
 		}
 	} else {
 		GF_MPD_BaseURL *base_url=NULL;
+		const char *b_url=NULL;
 		GF_MPD_URL *init=NULL;
-		
+
 		if (rep->segment_base && rep->segment_base->initialization_segment) init = rep->segment_base->initialization_segment;
 		if (as->segment_base && as->segment_base->initialization_segment) init = as->segment_base->initialization_segment;
 		if (period->segment_base && period->segment_base->initialization_segment) init = period->segment_base->initialization_segment;
@@ -3812,17 +3958,21 @@
 		if (period->segment_list && period->segment_list->initialization_segment) init = period->segment_list->initialization_segment;
 
 		base_url = gf_list_get(rep->base_URLs, 0);
-		assert(base_url);
+		if (!base_url) {
+			if (close_file)
+				gf_fclose(out);
+			return GF_SERVICE_ERROR;
+		}
+		b_url = base_url->hls_vp_rel_url ? base_url->hls_vp_rel_url : base_url->URL;
 
 		if (init) {
-
 			if (force_base_url)
-				force_url = gf_url_concatenate(force_base_url, base_url->URL);
+				force_url = gf_url_concatenate(force_base_url, b_url);
 
 			if (init->byte_range) {
-				gf_fprintf(out,"#EXT-X-MAP:URI=\"%s\",BYTERANGE=\"%d@"LLU"\"\n", force_url ? force_url : base_url->URL, (u32) (1+init->byte_range->end_range - init->byte_range->start_range), init->byte_range->start_range);
+				gf_fprintf(out,"#EXT-X-MAP:URI=\"%s\",BYTERANGE=\"%d@"LLU"\"\n", force_url ? force_url : b_url, (u32) (1+init->byte_range->end_range - init->byte_range->start_range), init->byte_range->start_range);
 			} else {
-				gf_fprintf(out,"#EXT-X-MAP:URI=\"%s\"\n", force_url ? force_url : base_url->URL);
+				gf_fprintf(out,"#EXT-X-MAP:URI=\"%s\"\n", force_url ? force_url : b_url);
 			}
 
 			if (force_url) {
@@ -3831,20 +3981,20 @@
 			}
 		}
 
-		for (i=0; i<count; i++) {
+		for (i=rep->tsb_first_entry; i<count; i++) {
 			Double dur;
 			sctx = gf_list_get(rep->state_seg_list, i);
-			assert(!sctx->filename);
-			assert(sctx->file_size);
+			gf_assert(!sctx->filename);
+			gf_assert(sctx->file_size);
 
 			dur = (Double) sctx->dur;
 			dur /= rep->timescale;
 			gf_fprintf(out,"#EXTINF:%g\n", dur);
 			gf_fprintf(out,"#EXT-X-BYTERANGE:%d@"LLU"\n", sctx->file_size, sctx->file_offset);
 			if (force_base_url)
-				force_url = gf_url_concatenate(force_base_url, base_url->URL);
+				force_url = gf_url_concatenate(force_base_url, b_url);
 
-			gf_fprintf(out,"%s\n", force_url ? force_url : base_url->URL);
+			gf_fprintf(out,"%s\n", force_url ? force_url : b_url);
 
 			if (force_url) {
 				gf_free(force_url);
@@ -3858,12 +4008,12 @@
 
 	if (close_file)
 		gf_fclose(out);
-	
+
 	return GF_OK;
 }
 
 
-GF_Err gf_mpd_write_m3u8_master_playlist(GF_MPD const * const mpd, FILE *out, const char* m3u8_name, GF_MPD_Period *period)
+GF_Err gf_mpd_write_m3u8_master_playlist(GF_MPD const * const mpd, FILE *out, const char* m3u8_name, GF_MPD_Period *period, GF_M3U8WriteMode mode)
 {
 	u32 i, j, hls_version;
 	u32 var_idx;
@@ -3877,6 +4027,7 @@
 	Bool is_fmp4 = GF_FALSE;
 	char *szVariantName;
 	char *m3u8_name_rad, *sep, *force_base_url=NULL;
+	u32 nb_video=0;
 	u32 nb_audio=0;
 	u32 nb_cc=0;
 	u32 nb_subs=0;
@@ -3896,12 +4047,12 @@
 		while ( (rep = (GF_MPD_Representation *) gf_list_enum(as->representations, &j))) {
 			GF_DASH_SegmentContext *sctx;
 			const char *init_seg;
-			if (!rep->state_seg_list || !gf_list_count(rep->state_seg_list) ) {
+			if (!mpd->allow_empty_reps && (!rep->state_seg_list || !gf_list_count(rep->state_seg_list)) ) {
 				GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("M3U8 No segment state in representation, MPD cannot be translated to M3U8\n"));
 				return GF_BAD_PARAM;
 			}
 
-			sctx = gf_list_get(rep->state_seg_list, 0);
+			sctx = gf_list_get(rep->state_seg_list, rep->tsb_first_entry);
 			if (sctx && !sctx->filename) use_range = GF_TRUE;
 			if (gf_list_count(rep->content_protection))  { /*use_crypt = GF_TRUE; */ }
 
@@ -3913,6 +4064,7 @@
 
 			if (rep->streamtype==GF_STREAM_AUDIO) nb_audio++;
 			else if (rep->streamtype==GF_STREAM_TEXT) nb_subs++;
+			else if (rep->streamtype==GF_STREAM_VISUAL) nb_video++;
 		}
 	}
 	//we by default use floating point durations
@@ -3921,14 +4073,18 @@
 	if (use_intra_only) hls_version = 5;
 	if (is_fmp4 || use_init) hls_version = 6;
 
-	gf_fprintf(out, "#EXTM3U\n");
-	gf_fprintf(out, "#EXT-X-VERSION:%d\n", hls_version);
-	if (use_ind_segments)
-		gf_fprintf(out, "#EXT-X-INDEPENDENT-SEGMENTS\n");
-
-	for (i=0; i<mpd->nb_hls_ext_master; i++)
-		gf_fprintf(out, "%s\n", mpd->hls_ext_masteri);
-	gf_fprintf(out, "\n");
+	if (mode!=GF_M3U8_WRITE_CHILD) {
+
+		gf_fprintf(out, "#EXTM3U\n");
+		gf_fprintf(out, "#EXT-X-VERSION:%d\n", hls_version);
+		if (use_ind_segments)
+			gf_fprintf(out, "#EXT-X-INDEPENDENT-SEGMENTS\n");
+
+		for (i=0; i<mpd->nb_hls_ext_master; i++)
+			gf_fprintf(out, "%s\n", mpd->hls_ext_masteri);
+		gf_fprintf(out, "\n");
+
+	}
 
 	if (!strncmp(m3u8_name, "gfio://", 7)) {
 		const char *fpath = gf_fileio_translate_url(m3u8_name);
@@ -3957,7 +4113,7 @@
 
 		j=0;
 		while ( (rep = (GF_MPD_Representation *) gf_list_enum(as->representations, &j))) {
-			u32 k=0;
+			u32 k=rep->tsb_first_entry;
 			//figure out max part duration for this version of the playlist
 			Double max_part_dur=0;
 			GF_DASH_SegmentContext *sctx;
@@ -4012,7 +4168,11 @@
 			}
 
 			if (!rep->m3u8_name) {
-				sprintf(szVariantName, "%s_%d.m3u8",m3u8_name_rad, var_idx);
+				if (mpd->m3u8_use_repid) {
+					sprintf(szVariantName, "%s_%s.m3u8",m3u8_name_rad, rep->id);
+				} else {
+					sprintf(szVariantName, "%s_%d.m3u8",m3u8_name_rad, var_idx);
+				}
 				if (rep->m3u8_var_name) gf_free(rep->m3u8_var_name);
 				rep->m3u8_var_name = gf_strdup(szVariantName);
 			}
@@ -4025,10 +4185,11 @@
 	while ( (as = (GF_MPD_AdaptationSet *) gf_list_enum(period->adaptation_sets, &i))) {
 		j=0;
 		while ( (rep = (GF_MPD_Representation *) gf_list_enum(as->representations, &j))) {
-			if (!rep->state_seg_list || !gf_list_count(rep->state_seg_list) ) {
+			if (!mpd->allow_empty_reps && (!rep->state_seg_list || !gf_list_count(rep->state_seg_list) )) {
 				GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("M3U8 No segment state in representation, MPD cannot be translated to M3U8, ignoring representation\n"));
 				continue;
 			}
+			if (mode==GF_M3U8_WRITE_MASTER) break;
 
 			char *name = (char *) rep->m3u8_name;
 			if (!name) {
@@ -4055,6 +4216,10 @@
 		Bool is_audio = GF_FALSE;
 		Bool is_muxed_comp = GF_FALSE;
 		Bool is_primary = GF_TRUE;
+		u32 nb_alt_streams = nb_audio;
+
+		if (mode==GF_M3U8_WRITE_CHILD) break;
+
 		if (as->content_component && gf_list_count(as->content_component)>1) {
 			is_muxed_comp = GF_TRUE;
 		}
@@ -4071,23 +4236,29 @@
 			if (rep->mime_type) {
 				if (!strncmp(rep->mime_type, "video/", 6)) is_video = GF_TRUE;
 				else if (!strncmp(rep->mime_type, "audio/", 6)) is_audio = GF_TRUE;
-				break;
 			}
+			if (rep->width && rep->height) is_video = GF_TRUE;
+			if (rep->samplerate) is_audio = GF_TRUE;
 		}
 		//figure out if this is the primary media or an associated media with the content
 		if (has_muxed_comp) {
 			if (!is_muxed_comp) is_primary = GF_FALSE;
-		} else if (has_video) {
-			if (!is_video) is_primary = GF_FALSE;
-		} else if (has_audio) {
-			if (!is_audio) is_primary = GF_FALSE;
+		} else {
+			if (mpd->hls_audio_primary && has_audio && has_video) {
+				is_primary = is_video ? GF_FALSE : GF_TRUE;
+				nb_alt_streams = nb_video;
+			} else if (has_video) {
+				if (!is_video) is_primary = GF_FALSE;
+			} else if (has_audio) {
+				if (!is_audio) is_primary = GF_FALSE;
+			}
 		}
 
 		j=0;
 		while ( (rep = (GF_MPD_Representation *) gf_list_enum(as->representations, &j))) {
 			char szSuffixNameGF_MAX_PATH+1;
 			char *name = (char *) rep->m3u8_name;
-			if (!rep->state_seg_list || !gf_list_count(rep->state_seg_list) ) {
+			if (!mpd->allow_empty_reps && (!rep->state_seg_list || !gf_list_count(rep->state_seg_list)) ) {
 				continue;
 			}
 			if (rep->m3u8_var_name) {
@@ -4110,8 +4281,14 @@
 			if (force_base_url && ((mpd->hls_abs_url==2) || (mpd->hls_abs_url==3)))
 				force_url = gf_url_concatenate(force_base_url, name);
 
-			gf_mpd_write_m3u8_playlist_tags(as, i, rep, out, force_url ? force_url : name, is_primary ? period : NULL, nb_audio, nb_subs, nb_cc);
+			gf_mpd_write_m3u8_playlist_tags(as, i, rep, out, force_url ? force_url : name, is_primary ? period : NULL, nb_alt_streams, nb_subs, nb_cc, 0);
 			gf_fprintf(out, "\n");
+
+			if (!is_primary && rep->hls_forced) {
+				gf_mpd_write_m3u8_playlist_tags(as, i, rep, out, force_url ? force_url : name, period, 0, 0, 0, rep->hls_forced);
+				gf_fprintf(out, "\n");
+			}
+
 			if (force_url) gf_free(force_url);
 		}
 	}
@@ -4121,27 +4298,6 @@
 }
 
 
-#if 0 //unused
-GF_Err gf_mpd_write_m3u8_file(GF_MPD *mpd, const char *file_name, GF_MPD_Period *period)
-{
-	GF_Err e;
-	FILE *out;
-	if (!strcmp(file_name, "std")) out = stdout;
-	else {
-		out = gf_fopen(file_name, "wb");
-		if (!out) return GF_IO_ERR;
-
-		mpd->create_m3u8_files = GF_TRUE;
-	}
-
-	e = gf_mpd_write_m3u8_master_playlist(mpd, out, file_name, period);
-	gf_fclose(out);
-	mpd->create_m3u8_files = GF_FALSE;
-	return e;
-}
-#endif
-
-
 
 GF_Err gf_mpd_write(GF_MPD const * const mpd, FILE *out, Bool compact)
 {
@@ -4157,14 +4313,32 @@
 	gf_fprintf(out, "<?xml version=\"1.0\"?>");
 	gf_mpd_lf(out, indent);
 	mpd_write_generation_comment(mpd, out);
-	gf_fprintf(out, "<MPD xmlns=\"%s\"", (mpd->xml_namespace ? mpd->xml_namespace : "urn:mpeg:dash:schema:mpd:2011"));
+	if (mpd->index_mode) {
+		gf_fprintf(out, "<GHIX xmlns=\"urn:gpac:dash:index:2023\"");
+		gf_mpd_print_duration(out, "segmentDuration", mpd->segment_duration, GF_TRUE);
+
+		if (mpd->segment_template)
+			gf_fprintf(out, " template=\"%s\"", mpd->segment_template);
+
+		if (mpd->max_segment_duration)
+			gf_mpd_print_duration(out, "maxSegmentDuration", mpd->max_segment_duration, GF_TRUE);
+
+		if (mpd->media_presentation_duration)
+			gf_mpd_print_duration(out, "mediaPresentationDuration", mpd->media_presentation_duration, GF_TRUE);
+
+		gf_fprintf(out, ">");
+		gf_mpd_lf(out, indent);
+		goto print_periods;
+	}
+
+	gf_xml_dump_string(out, "<MPD xmlns=\"", (mpd->xml_namespace ? mpd->xml_namespace : "urn:mpeg:dash:schema:mpd:2011"), "\"");
 
 	if (mpd->write_context || mpd->use_gpac_ext) {
-	 	gf_fprintf(out, " xmlns:gpac=\"urn:gpac:filters:dasher:2018\"" );
+		gf_fprintf(out, " xmlns:gpac=\"urn:gpac:filters:dasher:2018\"" );
 	}
 
 	if (mpd->ID)
-		gf_fprintf(out, " id=\"%s\"", mpd->ID);
+		gf_xml_dump_string(out, " id=\"", mpd->ID, "\"");
 
 	if (mpd->min_buffer_time)
 		gf_mpd_print_duration(out, "minBufferTime", mpd->min_buffer_time, GF_FALSE);
@@ -4186,7 +4360,7 @@
 		gf_mpd_print_duration(out, "timeShiftBufferDepth", mpd->time_shift_buffer_depth, GF_TRUE);
 	if (mpd->suggested_presentation_delay)
 		gf_mpd_print_duration(out, "suggestedPresentationDelay", mpd->suggested_presentation_delay, GF_TRUE);
-	if (mpd->max_segment_duration) 
+	if (mpd->max_segment_duration)
 		gf_mpd_print_duration(out, "maxSegmentDuration", mpd->max_segment_duration, GF_TRUE);
 	if (mpd->max_subsegment_duration)
 		gf_mpd_print_duration(out, "maxSubsegmentDuration", mpd->max_subsegment_duration, GF_TRUE);
@@ -4217,9 +4391,7 @@
 
 		gf_mpd_nl(out, indent+1);
 		gf_fprintf(out, "<ProgramInformation");
-		if (info->lang) {
-			gf_fprintf(out, " lang=\"%s\"", info->lang);
-		}
+		mpd_print_lang(out, info->lang, NULL);
 		if (info->more_info_url) {
 			gf_xml_dump_string(out, " moreInformationURL=\"", info->more_info_url, "\"");
 		}
@@ -4285,6 +4457,7 @@
 
 		}
 	*/
+print_periods:
 
 	count = gf_list_count(mpd->periods);
 	for (i=0; i<count; i++) {
@@ -4312,7 +4485,10 @@
 	}
 	gf_mpd_extensible_print_nodes(out, mpd->x_children, indent, &child_idx, GF_TRUE);
 
-	gf_fprintf(out, "</MPD>");
+	if (mpd->index_mode)
+		gf_fprintf(out, "</GHIX>");
+	else
+		gf_fprintf(out, "</MPD>");
 
 	return GF_OK;
 }
@@ -4405,7 +4581,7 @@
 	url = gf_mpd_get_base_url(period->base_URLs, url, &base_url_index);
 	url = gf_mpd_get_base_url(set->base_URLs, url, &base_url_index);
 	url = gf_mpd_get_base_url(rep->base_URLs, url, &base_url_index);
-	assert(url);
+	gf_assert(url);
 
 	if (resolve_type == GF_MPD_RESOLVE_URL_MEDIA_TEMPLATE_NO_BASE) {
 		resolve_type = GF_MPD_RESOLVE_URL_MEDIA_TEMPLATE;
@@ -4626,7 +4802,10 @@
 
 	if (!media_url) {
 		GF_MPD_BaseURL *base = gf_list_get(rep->base_URLs, 0);
-		if (!base) return GF_BAD_PARAM;
+		if (!base) {
+			gf_free(url);
+			return GF_BAD_PARAM;
+		}
 		media_url = base->URL;
 	}
 	url_to_solve = NULL;
@@ -4731,7 +4910,12 @@
 			strcat(solved_template, szFormat);
 		}
 		else if (!strcmp(first_sep+1, "Time")) {
-			if (resolve_type==GF_MPD_RESOLVE_URL_MEDIA_TEMPLATE) {
+			if (resolve_type==GF_MPD_RESOLVE_URL_MEDIA_NOSTART) {
+				if (out_start_number) *out_start_number = 1;
+				sprintf(szFormat, szPrintFormat, item_index);
+				strcat(solved_template, szFormat);
+			}
+			else if (resolve_type==GF_MPD_RESOLVE_URL_MEDIA_TEMPLATE) {
 				strcat(solved_template, "$Time$");
 			} else if (timeline) {
 				/*uses segment timeline*/
@@ -4980,7 +5164,7 @@
 	if (!rep->segment_template && !set->segment_template && !period->segment_template) {
 		GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("MPD Representation without any SegmentBase, SegmentList or SegmentTemplate (non compliant). Assuming default SegmentBase\n"));
 		*out_segment_start_time = start_time;
-		return GF_OK;
+		return GF_NON_COMPLIANT_BITSTREAM;
 	}
 
 	if (period->segment_template) {
@@ -5095,7 +5279,7 @@
 				break;
 			}
 		} else {
-			assert(0);
+			gf_assert(0);
 			return GF_NOT_SUPPORTED;
 		}
 
@@ -5335,7 +5519,7 @@
             set->segment_template->timescale = timescale;
             GF_SAFEALLOC(set->segment_template->segment_timeline, GF_MPD_SegmentTimeline);
             if (!set->segment_template->segment_timeline) return GF_OUT_OF_MEM;
-            
+
             set->segment_template->segment_timeline->entries = gf_list_new();
         }
     }
@@ -5439,7 +5623,7 @@
 			char_template+=1;	\
 
 GF_EXPORT
-GF_Err gf_media_mpd_format_segment_name(GF_DashTemplateSegmentType seg_type, Bool is_bs_switching, char *segment_name, const char *rep_id, const char *base_url, const char *seg_rad_name, const char *seg_ext, u64 start_time, u32 bandwidth, u32 segment_number, Bool use_segment_timeline)
+GF_Err gf_media_mpd_format_segment_name(GF_DashTemplateSegmentType seg_type, Bool is_bs_switching, char *segment_name, const char *rep_id, const char *base_url, const char *seg_rad_name, const char *seg_ext, u64 start_time, u32 bandwidth, u32 segment_number, Bool use_segment_timeline, Bool forced)
 {
 	Bool has_number= GF_FALSE;
 	Bool force_path = GF_FALSE;
@@ -5457,6 +5641,10 @@
 	Bool is_template = (seg_type==GF_DASH_TEMPLATE_TEMPLATE) ? GF_TRUE : GF_FALSE;
 	Bool is_init_template = (seg_type==GF_DASH_TEMPLATE_INITIALIZATION_TEMPLATE) ? GF_TRUE : GF_FALSE;
 	Bool is_index_template = (seg_type==GF_DASH_TEMPLATE_REPINDEX_TEMPLATE) ? GF_TRUE : GF_FALSE;
+	//except in old arch compat mode, we always append "init" if no "$Init" template, even in BS switching
+	//this avoids confusion in init segment naming when BS switching is on - cf #2773
+	if (!gf_sys_old_arch_compat())
+		is_bs_switching = GF_FALSE;
 	Bool needs_init=((is_init || is_init_template) && !is_bs_switching) ? GF_TRUE : GF_FALSE;
 	u32 has_init_keyword = 0;
 	Bool needs_index = GF_FALSE;
@@ -5464,10 +5652,13 @@
 	size_t seg_rad_name_len;
 
 	char tmp100;
+	char segment_ext_override65;
+
 	strcpy(segment_name, "");
+	strcpy(segment_ext_override, "");
 
 	if (is_index_template) is_template = GF_TRUE;
-	
+
 	if (seg_type==GF_DASH_TEMPLATE_INITIALIZATION_SKIPINIT) {
 		seg_type = GF_DASH_TEMPLATE_INITIALIZATION;
 		needs_init = GF_FALSE;
@@ -5516,7 +5707,7 @@
 			EXTRACT_FORMAT(5);
 			if (is_init || is_init_template) {
 				if (!has_init_keyword && needs_init) {
-					strcat(segment_name, "init");
+					if (!forced) strcat(segment_name, "init");
 					needs_init = GF_FALSE;
 				}
 				continue;
@@ -5533,7 +5724,7 @@
 
 			if (is_init || is_init_template) {
 				if (!has_init_keyword && needs_init) {
-					strcat(segment_name, "init");
+					if (!forced) strcat(segment_name, "init");
 					needs_init = GF_FALSE;
 				}
 				continue;
@@ -5564,6 +5755,15 @@
 			char_template += (u32) strlen(seg_rad_name + char_template)+1;
 			if (sep) sep0 = '$';
 		}
+		else if (!strnicmp(& seg_rad_namechar_template, "$InitExt=", 9)) {
+			char *sep = strchr(seg_rad_name + char_template+9, '$');
+			if (sep) sep0 = 0;
+			if (is_init || is_init_template) {
+				strncpy(segment_ext_override, seg_rad_name + char_template+9, 64);
+			}
+			char_template += (u32) strlen(seg_rad_name + char_template)+1;
+			if (sep) sep0 = '$';
+		}
 		else if (!strnicmp(& seg_rad_namechar_template, "$Index=", 7)) {
 			char *sep = strchr(seg_rad_name + char_template+7, '$');
 			if (sep) sep0 = 0;
@@ -5592,6 +5792,15 @@
 			char_template += (u32) strlen(seg_rad_name + char_template)+1;
 			if (sep) sep0 = '$';
 		}
+		else if (!strnicmp(& seg_rad_namechar_template, "$SegExt=", 8)) {
+			char *sep = strchr(seg_rad_name + char_template+8, '$');
+			if (sep) sep0 = 0;
+			if (!is_init && !is_init_template) {
+				strncpy(segment_ext_override, seg_rad_name + char_template+8, 64);
+			}
+			char_template += (u32) strlen(seg_rad_name + char_template)+1;
+			if (sep) sep0 = '$';
+		}
 
 		else {
 			char_template+=1;
@@ -5602,7 +5811,7 @@
 		}
 	}
 
-	if (is_template && !strstr(seg_rad_name, "$Number") && !strstr(seg_rad_name, "$Time")) {
+	if (is_template && !forced && !strstr(seg_rad_name, "$Number") && !strstr(seg_rad_name, "$Time")) {
 		if (use_segment_timeline) {
 			strcat(segment_name, "$Time$");
 		} else {
@@ -5610,12 +5819,12 @@
 		}
 	}
 
-	if (needs_init)
+	if (needs_init && !forced)
 		strcat(segment_name, "init");
-	if (needs_index)
+	if (needs_index && !forced)
 		strcat(segment_name, "idx");
 
-	if (!is_init && !is_template && !is_init_template && !is_index && !has_number) {
+	if (!is_init && !is_template && !is_init_template && !is_index && !has_number && !forced) {
 		if (use_segment_timeline) {
 			sprintf(tmp, LLU, start_time);
 			strcat(segment_name, tmp);
@@ -5625,7 +5834,13 @@
 			strcat(segment_name, tmp);
 		}
 	}
-	if (seg_ext) {
+
+
+	if (strlen(segment_ext_override) > 0) {
+		strcat(segment_name, ".");
+		strcat(segment_name, segment_ext_override);
+	}
+	else if (seg_ext && !forced) {
 		strcat(segment_name, ".");
 		strcat(segment_name, seg_ext);
 	}
@@ -5819,7 +6034,7 @@
 				gf_blob_unregister(&blob);
 				gf_fclose(f);
 
-				
+
 				gf_mpd_representation_free(rep);
 				gf_list_del(set->representations);
 				set->representations = reps;

gpac-2.2.1.tar.gz/src/media_tools/mpeg2_ps.c -> gpac-2.4.0.tar.gz/src/media_tools/mpeg2_ps.c Changed

@@ -266,6 +266,8 @@
 	u32 scode, ix;
 	s32 found = -1;
 	*have_mpeg2 = 0;
+	if (buflen<6) return found;
+
 	buflen -= 6;
 	bitrate_int = 0;
 	for (ix = 0; ix < buflen; ix++, pbuffer++) {
@@ -996,6 +998,7 @@
 		                       &sptr->par) < 0) {
 			sptr->m_stream_id = 0;
 			sptr->m_fd = FDNULL;
+			return;
 		}
 		sptr->ticks_per_frame = (u64)(90000.0 / sptr->frame_rate);
 		return;
@@ -1202,7 +1205,7 @@
 			}
 			get_info_from_frame(sptr, buffer, buflen);
 			// here - if (sptr->first_pes_has_dts == 0) should be processed
-			if (sptr->first_pes_has_dts == 0) {
+			if ((sptr->first_pes_has_dts == 0) && sptr->m_fd) {
 				u32 frames_from_beg = 0;
 				Bool have_frame;
 				do {
@@ -1223,9 +1226,11 @@
 					if (sptr->is_video) {
 						sptr->start_dts -= frames_from_beg * sptr->ticks_per_frame;
 					} else {
-						u64 conv;
-						conv = sptr->samples_per_frame * 90000;
-						conv /= (u64)sptr->freq;
+						u64 conv = (u64) -1;
+						if ((u64)sptr->freq) {
+							conv = sptr->samples_per_frame * 90000;
+							conv /= (u64)sptr->freq;
+						}
 						sptr->start_dts -= conv;
 					}
 				}

gpac-2.2.1.tar.gz/src/media_tools/mpegts.c -> gpac-2.4.0.tar.gz/src/media_tools/mpegts.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2005-2022
+ *			Copyright (c) Telecom ParisTech 2005-2023
  *
  *  This file is part of GPAC / MPEG2-TS sub-project
  *
@@ -53,7 +53,7 @@
 #define DEBUG_TS_PACKET 0
 
 GF_EXPORT
-const char *gf_m2ts_get_stream_name(u32 streamType)
+const char *gf_m2ts_get_stream_name(GF_M2TSStreamType streamType)
 {
 	switch (streamType) {
 	case GF_M2TS_VIDEO_MPEG1:
@@ -696,6 +696,9 @@
 			return;
 		}
 
+		if (!hdr->pid)
+			ts->last_pat_start_num = ts->pck_number-1;
+
 		/*end of previous section*/
 		if (!sec->length && sec->received) {
 			/* the length of the section could not be determined from the previous TS packet because we had only 1 or 2 bytes */
@@ -824,7 +827,7 @@
 		pos += 5;
 
 		if (pos+descs_size > data_size) {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("MPEG-2 TS Invalid descriptors size read from data (%u)\n"));
+			GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("MPEG-2 TS Invalid descriptors size read from data (%u)\n", descs_size));
 			return;
 		}
 
@@ -876,6 +879,10 @@
 	u32 nb_sections, i;
 	GF_M2TS_Section *section;
 
+	//only process MPEG4 tables
+	if ((table_id != GF_M2TS_TABLE_ID_MPEG4_BIFS) && (table_id != GF_M2TS_TABLE_ID_MPEG4_OD) )
+		return;
+
 	/*skip if already received*/
 	if (status & GF_M2TS_TABLE_REPEAT)
 		if (!(es->flags & GF_M2TS_ES_SEND_REPEATED_SECTIONS))
@@ -966,7 +973,7 @@
 	time_table->hour   = 10*((data2&0xf0)>>4) + (data2&0x0f);
 	time_table->minute = 10*((data3&0xf0)>>4) + (data3&0x0f);
 	time_table->second = 10*((data4&0xf0)>>4) + (data4&0x0f);
-	assert(time_table->hour<24 && time_table->minute<60 && time_table->second<60);
+	gf_assert(time_table->hour<24 && time_table->minute<60 && time_table->second<60);
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("MPEG-2 TS Stream UTC time is %u/%02u/%02u %02u:%02u:%02u\n", time_table->year, time_table->month, time_table->day, time_table->hour, time_table->minute, time_table->second));
 
 	switch (table_id) {
@@ -1029,7 +1036,7 @@
 	if (ts->on_event) ts->on_event(ts, GF_M2TS_EVT_TOT, time_table);
 	break;
 	default:
-		assert(0);
+		gf_assert(0);
 		goto error_exit;
 	}
 
@@ -1149,11 +1156,14 @@
 	u32 info_length, pos, desc_len, evt_type, nb_es,i;
 	u32 nb_sections;
 	u32 data_size;
-	u32 nb_hevc, nb_hevc_temp, nb_shvc, nb_shvc_temp, nb_mhvc, nb_mhvc_temp;
+	u32 nb_hevc_temp, nb_shvc, nb_shvc_temp, nb_mhvc, nb_mhvc_temp;
 	unsigned char *data;
 	GF_M2TS_Section *section;
 	GF_Err e = GF_OK;
 
+	//only process PMT tables
+	if (table_id != GF_M2TS_TABLE_ID_PMT) return;
+
 	/*wait for the last section */
 	if (!(status&GF_M2TS_TABLE_END)) return;
 
@@ -1266,7 +1276,7 @@
 		}
 	}
 
-	nb_hevc = nb_hevc_temp = nb_shvc = nb_shvc_temp = nb_mhvc = nb_mhvc_temp = 0;
+	nb_hevc_temp = nb_shvc = nb_shvc_temp = nb_mhvc = nb_mhvc_temp = 0;
 	while (pos<data_size) {
 		GF_M2TS_PES *pes = NULL;
 		GF_M2TS_SECTION_ES *ses = NULL;
@@ -1732,8 +1742,7 @@
 
 			nb_es++;
 
-			if (es->stream_type == GF_M2TS_VIDEO_HEVC) nb_hevc++;
-			else if (es->stream_type == GF_M2TS_VIDEO_HEVC_TEMPORAL) nb_hevc_temp++;
+			if (es->stream_type == GF_M2TS_VIDEO_HEVC_TEMPORAL) nb_hevc_temp++;
 			else if (es->stream_type == GF_M2TS_VIDEO_SHVC) nb_shvc++;
 			else if (es->stream_type == GF_M2TS_VIDEO_SHVC_TEMPORAL) nb_shvc_temp++;
 			else if (es->stream_type == GF_M2TS_VIDEO_MHVC) nb_mhvc++;
@@ -1742,7 +1751,7 @@
 	}
 
 	//Table 2-139, implied hierarchy indexes
-	if (nb_hevc_temp + nb_shvc + nb_shvc_temp + nb_mhvc+ nb_mhvc_temp) {
+	if (nb_hevc_temp + nb_shvc + nb_shvc_temp + nb_mhvc + nb_mhvc_temp) {
 		for (i=0; i<gf_list_count(pmt->program->streams); i++) {
 			GF_M2TS_PES *es = (GF_M2TS_PES *)gf_list_get(pmt->program->streams, i);
 			if ( !(es->flags & GF_M2TS_ES_IS_PES)) continue;
@@ -1808,6 +1817,9 @@
 	unsigned char *data;
 	GF_M2TS_Section *section;
 
+	//only process PAT tables
+	if (table_id != GF_M2TS_TABLE_ID_PAT) return;
+
 	/*wait for the last section */
 	if (!(status&GF_M2TS_TABLE_END)) return;
 
@@ -1895,6 +1907,9 @@
 		GF_M2TS_Section *section;
 	*/
 
+	//only process CAT tables
+	if (table_id != GF_M2TS_TABLE_ID_CAT) return;
+
 	/*wait for the last section */
 	if (!(status&GF_M2TS_TABLE_END)) return;
 
@@ -2206,8 +2221,8 @@
 			pes->prev_data_len = 0;
 			if (remain) {
 				pes->prev_data = gf_malloc(sizeof(char)*remain);
-				assert(pes->pck_data_len >= remain);
-				memcpy(pes->prev_data, pes->pck_data + pes->pck_data_len - remain, remain);
+				if (pes->pck_data_len >= remain)
+					memcpy(pes->prev_data, pes->pck_data + pes->pck_data_len - remain, remain);
 				pes->prev_data_len = remain;
 			}
 		}
@@ -2267,11 +2282,15 @@
 
 	if (hdr->payload_start) {
 		flush_pes = 1;
+		pes->before_last_pat_pn = pes->last_pat_packet_number;
+		pes->before_last_pes_start_pn = pes->pes_start_packet_number;
+
 		pes->pes_start_packet_number = ts->pck_number;
 		pes->before_last_pcr_value = pes->program->before_last_pcr_value;
 		pes->before_last_pcr_value_pck_number = pes->program->before_last_pcr_value_pck_number;
 		pes->last_pcr_value = pes->program->last_pcr_value;
 		pes->last_pcr_value_pck_number = pes->program->last_pcr_value_pck_number;
+		pes->last_pat_packet_number = ts->last_pat_start_num;
 	} else if (pes->pes_len && (pes->pck_data_len + data_size == pes->pes_len + 6)) {
 		/* 6 = startcode+stream_id+length*/
 		/*reassemble pes*/
@@ -2404,6 +2423,10 @@
 		}
 
 		if (! af_desc_not_present) {
+			if (af_extension + afext_bytes > data+size) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("MPEG-2 TS PID %d: Bad Adaptation Extension found\n", pid));
+				return;
+			}
 			while (afext_bytes) {
 				GF_BitStream *bs;
 				char *desc;
@@ -2438,18 +2461,20 @@
 						char *_url = URL;
 						u8 scheme = gf_bs_read_int(bs, 8);
 						u8 url_len = gf_bs_read_int(bs, 8);
+						u8 scheme_len = 0;
 						switch (scheme) {
 						case 1:
 							strcpy(URL, "http://");
-							_url = URL+7;
+							scheme_len = 7;
 							break;
 						case 2:
 							strcpy(URL, "https://");
-							_url = URL+8;
+							scheme_len = 8;
 							break;
 						}
+						_url = URL + scheme_len;
 						gf_bs_read_data(bs, _url, url_len);
-						_urlurl_len = 0;
+						_urlMIN(url_len, GF_ARRAY_LENGTH(URL)-1-scheme_len) = 0;
 					}
 					temi_loc.external_URL = URL;
 
@@ -2533,16 +2558,12 @@
 	case 3:
 		af_size = data4;
 		if (af_size>183) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("MPEG-2 TS TS Packet %d AF field larger than 183 !\n", ts->pck_number));
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("MPEG-2 TS TS Packet %d AF field larger than 183  for AF type 3!\n", ts->pck_number));
 			//error
 			return GF_CORRUPTED_DATA;
 		}
 		paf = &af;
 		memset(paf, 0, sizeof(GF_M2TS_AdaptationField));
-		//this will stop you when processing invalid (yet existing) mpeg2ts streams in debug
-		assert( af_size<=183);
-		if (af_size>183)
-			GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("MPEG-2 TS TS Packet %d Detected wrong adaption field size %u when control value is 3\n", ts->pck_number, af_size));
 		if (af_size) gf_m2ts_get_adaptation_field(ts, paf, data+5, af_size, hdr.pid);
 		pos += 1+af_size;
 		payload_size = 183 - af_size;
@@ -2765,7 +2786,7 @@
 			e |= gf_m2ts_process_packet(ts, (unsigned char *)ts->buffer);
 			data += copy_size;
 			data_size = data_size - copy_size;
-			assert((s32)data_size >= 0);
+			gf_assert((s32)data_size >= 0);
 		}
 		//not sync, copy over the complete buffer
 		else {
@@ -2803,7 +2824,7 @@
 			if (!ts->buffer_size) {
 				return e;
 			}
-			assert(ts->buffer_size<pck_size);
+			gf_assert(ts->buffer_size<pck_size);
 
 			if (is_align) {
 				u32 s = ts->buffer_size;
@@ -3274,7 +3295,7 @@
 	ptr4 &= 0x1;
 	ptr4 |= (unsigned char)((TS&0x00000007fULL)<<1);
 
-	assert(((u64)(ptr0&0xe)<<29) + ((u64)ptr1<<22) + ((u64)(ptr2&0xfe)<<14) + ((u64)ptr3<<7) + ((ptr4&0xfe)>>1) == TS);
+	gf_assert(((u64)(ptr0&0xe)<<29) + ((u64)ptr1<<22) + ((u64)(ptr2&0xfe)<<14) + ((u64)ptr3<<7) + ((ptr4&0xfe)>>1) == TS);
 }
 
 #define ADJUST_TIMESTAMP(_TS) \

gpac-2.2.1.tar.gz/src/media_tools/route_dmx.c -> gpac-2.4.0.tar.gz/src/media_tools/route_dmx.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2018-2022
+ *			Copyright (c) Telecom ParisTech 2018-2024
  *					All rights reserved
  *
  *  This file is part of GPAC / Media Tools ROUTE (ATSC3, DVB-I) demux sub-project
@@ -92,7 +92,7 @@
 	u32 prev_start_offset;
 
     char solved_pathGF_MAX_PATH;
-    
+
     GF_Blob blob;
 	void *udta;
 } GF_LCTObject;
@@ -135,6 +135,7 @@
 
 struct __gf_routedmx {
 	const char *ip_ifce;
+	const char *netcap_id;
 	GF_Socket *atsc_sock;
 	u8 *buffer;
 	u32 buffer_size;
@@ -144,7 +145,7 @@
 	u32 reorder_timeout;
 	Bool force_reorder;
     Bool progressive_dispatch;
-    
+
 	u32 slt_version, rrt_version, systime_version, aeat_version;
 	GF_List *services;
 
@@ -252,7 +253,7 @@
 	gf_free(routedmx);
 }
 
-static GF_ROUTEDmx *gf_route_dmx_new_internal(const char *ifce, u32 sock_buffer_size, Bool is_atsc,
+static GF_ROUTEDmx *gf_route_dmx_new_internal(const char *ifce, u32 sock_buffer_size, const char *netcap_id, Bool is_atsc,
 							  void (*on_event)(void *udta, GF_ROUTEEventType evt, u32 evt_param, GF_ROUTEEventFileInfo *info),
 							  void *udta)
 {
@@ -264,6 +265,7 @@
 		return NULL;
 	}
 	routedmx->ip_ifce = ifce;
+	routedmx->netcap_id = netcap_id;
 	routedmx->dom = gf_xml_dom_new();
 	if (!routedmx->dom) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_ROUTE, ("ROUTE Failed to allocate DOM parser\n" ));
@@ -323,7 +325,7 @@
 	if (!is_atsc)
 		return routedmx;
 
-	routedmx->atsc_sock = gf_sk_new(GF_SOCK_TYPE_UDP);
+	routedmx->atsc_sock = gf_sk_new_ex(GF_SOCK_TYPE_UDP, routedmx->netcap_id);
 	if (!routedmx->atsc_sock) {
 		gf_route_dmx_del(routedmx);
 		GF_LOG(GF_LOG_ERROR, GF_LOG_ROUTE, ("ROUTE Failed to create UDP socket\n"));
@@ -376,7 +378,7 @@
 	service->service_id = service_id;
 	service->protocol = protocol;
 
-	service->sock = gf_sk_new(GF_SOCK_TYPE_UDP);
+	service->sock = gf_sk_new_ex(GF_SOCK_TYPE_UDP, routedmx->netcap_id);
 	gf_sk_set_usec_wait(service->sock, 1);
 	e = gf_sk_setup_multicast(service->sock, dst_ip, dst_port, 0, GF_FALSE, (char*) routedmx->ip_ifce);
 	if (e) {
@@ -422,15 +424,33 @@
 								   void (*on_event)(void *udta, GF_ROUTEEventType evt, u32 evt_param, GF_ROUTEEventFileInfo *info),
 								   void *udta)
 {
-	return gf_route_dmx_new_internal(ifce, sock_buffer_size, GF_TRUE, on_event, udta);
-
+	return gf_route_dmx_new_internal(ifce, sock_buffer_size, NULL, GF_TRUE, on_event, udta);
 }
 GF_EXPORT
 GF_ROUTEDmx *gf_route_dmx_new(const char *ip, u32 port, const char *ifce, u32 sock_buffer_size,
 							  void (*on_event)(void *udta, GF_ROUTEEventType evt, u32 evt_param, GF_ROUTEEventFileInfo *info),
 							  void *udta)
 {
-	GF_ROUTEDmx *routedmx = gf_route_dmx_new_internal(ifce, sock_buffer_size, GF_FALSE, on_event, udta);
+	GF_ROUTEDmx *routedmx = gf_route_dmx_new_internal(ifce, sock_buffer_size, NULL, GF_FALSE, on_event, udta);
+	if (!routedmx) return NULL;
+	gf_route_create_service(routedmx, ip, port, 1, 1);
+	return routedmx;
+}
+
+
+GF_EXPORT
+GF_ROUTEDmx *gf_route_atsc_dmx_new_ex(const char *ifce, u32 sock_buffer_size, const char *netcap_id,
+								   void (*on_event)(void *udta, GF_ROUTEEventType evt, u32 evt_param, GF_ROUTEEventFileInfo *info),
+								   void *udta)
+{
+	return gf_route_dmx_new_internal(ifce, sock_buffer_size, netcap_id, GF_TRUE, on_event, udta);
+}
+GF_EXPORT
+GF_ROUTEDmx *gf_route_dmx_new_ex(const char *ip, u32 port, const char *ifce, u32 sock_buffer_size, const char *netcap_id,
+							  void (*on_event)(void *udta, GF_ROUTEEventType evt, u32 evt_param, GF_ROUTEEventFileInfo *info),
+							  void *udta)
+{
+	GF_ROUTEDmx *routedmx = gf_route_dmx_new_internal(ifce, sock_buffer_size, netcap_id, GF_FALSE, on_event, udta);
 	if (!routedmx) return NULL;
 	gf_route_create_service(routedmx, ip, port, 1, 1);
 	return routedmx;
@@ -621,10 +641,16 @@
     if (obj->rlct_file) {
         filepath = obj->rlct_file->filename ? obj->rlct_file->filename : "ghost-init.mp4";
         is_init = GF_TRUE;
-        assert(final_push);
+        gf_assert(final_push);
     } else {
-        if (!obj->solved_path0)
+        if (!obj->solved_path0) {
+			if (!obj->rlct->toi_template) {
+				if (obj->status != GF_LCT_OBJ_RECEPTION)
+					gf_route_obj_to_reservoir(routedmx, s, obj);
+				return GF_OK;
+			}
             sprintf(obj->solved_path, obj->rlct->toi_template, obj->toi);
+		}
         filepath = obj->solved_path;
     }
 #ifndef GPAC_DISABLE_LOG
@@ -652,7 +678,7 @@
 			obj->blob.flags = GF_BLOB_IN_TRANSFER;
 			obj->blob.size = (u32) bytes_done;
 		}
-		finfo.blob = &obj->blob;		
+		finfo.blob = &obj->blob;
         finfo.total_size = obj->total_length;
         finfo.tsi = obj->tsi;
         finfo.toi = obj->toi;
@@ -665,7 +691,7 @@
             evt_type = GF_ROUTE_EVT_DYN_SEG;
             finfo.nb_frags = obj->nb_frags;
             finfo.frags = obj->frags;
-			assert(obj->total_length <= obj->alloc_size);
+			gf_assert(obj->total_length <= obj->alloc_size);
         }
         else
             evt_type = GF_ROUTE_EVT_DYN_SEG_FRAG;
@@ -690,7 +716,8 @@
 		GF_LOG(GF_LOG_ERROR, GF_LOG_ROUTE, ("ROUTE Service %d : internal error, no LCT ROUTE channel defined for object TSI %u TOI %u\n", s->service_id, obj->tsi, obj->toi));
 		return GF_SERVICE_ERROR;
 	}
-	assert(obj->status>GF_LCT_OBJ_RECEPTION);
+	if (obj->status<GF_LCT_OBJ_RECEPTION)
+		return GF_SERVICE_ERROR;
 
 	if (obj->status==GF_LCT_OBJ_DONE_ERR) {
 		if (obj->rlct->tsi_init) {
@@ -735,7 +762,7 @@
 
 static GF_Err gf_route_service_gather_object(GF_ROUTEDmx *routedmx, GF_ROUTEService *s, u32 tsi, u32 toi, u32 start_offset, char *data, u32 size, u32 total_len, Bool close_flag, Bool in_order, GF_ROUTELCTChannel *rlct, GF_LCTObject **gather_obj)
 {
-	Bool inserted, done;
+	Bool done;
 	u32 i, count;
     Bool do_push = GF_FALSE;
 	GF_LCTObject *obj = s->last_active_obj;
@@ -756,6 +783,15 @@
 		}
 	}
 
+	if((u64)start_offset + size > GF_UINT_MAX) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_ROUTE, ("ROUTE Service %d TSI %u TOI %u Not supported: Offset (%u) + Size (%u) exceeds the maximum supported value (%u), skipping\n", s->service_id, tsi, toi, start_offset, size, GF_UINT_MAX));
+		return GF_NOT_SUPPORTED;
+	}
+	if(total_len && (start_offset + size > total_len)) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_ROUTE, ("ROUTE Service %d TSI %u TOI %u Corrupted data: Offset (%u) + Size (%u) exceeds Total Size of the object (%u), skipping\n", s->service_id, tsi, toi, start_offset, size, total_len));
+		return GF_NOT_SUPPORTED;
+	}
+
 	if (!obj || (obj->tsi!=tsi) || (obj->toi!=toi)) {
 		count = gf_list_count(s->objects);
 		for (i=0; i<count; i++) {
@@ -769,7 +805,7 @@
 				obj->total_length = total_len;
 				if (obj->total_length>obj->alloc_size) {
 					gf_mx_p(routedmx->blob_mx);
-					obj->payload = gf_realloc(obj->payload, obj->total_length);
+					obj->payload = gf_realloc(obj->payload, obj->total_length+1);
 					obj->alloc_size = obj->total_length;
 					obj->blob.size = obj->total_length;
 					obj->blob.data = obj->payload;
@@ -798,6 +834,14 @@
 		obj->tsi = tsi;
 		obj->status = GF_LCT_OBJ_INIT;
 		obj->total_length = total_len;
+		if (obj->alloc_size < total_len) {
+            gf_mx_p(routedmx->blob_mx);
+            obj->payload = gf_realloc(obj->payload, total_len+1);
+            obj->alloc_size = total_len;
+            obj->blob.size = total_len;
+            obj->blob.data = obj->payload;
+            gf_mx_v(routedmx->blob_mx);
+        }
 		if (tsi && rlct) {
 			count = gf_list_count(rlct->static_files);
 			obj->rlct = rlct;
@@ -821,18 +865,39 @@
 		gf_list_add(s->objects, obj);
 	} else if (!obj->total_length && total_len) {
 		GF_LOG(GF_LOG_INFO, GF_LOG_ROUTE, ("ROUTE Service %d object TSI %u TOI %u was started without total-length assigned, assigning to %u\n", s->service_id, tsi, toi, total_len));
-        
+		// Check if there are no fragments in the object that extend beyond the total length
+		for (i=0; i < obj->nb_frags; i++) {
+			if((u64) obj->fragsi.offset + obj->fragsi.size > total_len) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_ROUTE, ("ROUTE Service %d object TSI %u TOI %u: TOL (%u) doesn't cover previously received fragment %u, %u, purging object \n", s->service_id, tsi, toi, total_len, obj->fragsi.offset, obj->fragsi.offset+obj->fragsi.size));
+				obj->nb_frags = obj->nb_recv_frags = 0;
+				obj->nb_bytes = obj->nb_recv_bytes = 0;
+			}
+		}
         if (obj->alloc_size < total_len) {
             gf_mx_p(routedmx->blob_mx);
-            obj->payload = gf_realloc(obj->payload, total_len);
+            obj->payload = gf_realloc(obj->payload, total_len+1);
             obj->alloc_size = total_len;
             obj->blob.size = total_len;
             obj->blob.data = obj->payload;
             gf_mx_v(routedmx->blob_mx);
         }
 		obj->total_length = total_len;
-	} else if (total_len && (obj->total_length != total_len)) {
-		GF_LOG(GF_LOG_WARNING, GF_LOG_ROUTE, ("ROUTE Service %d object TSI %u TOI %u mismatch in total-length %u  assigned, %u redeclared\n", s->service_id, tsi, toi, obj->total_length, total_len));
+	} else if (total_len && (obj->total_length != total_len) && (obj->status < GF_LCT_OBJ_DONE)) {
+		GF_LOG(GF_LOG_WARNING, GF_LOG_ROUTE, ("ROUTE Service %d object TSI %u TOI %u mismatch in total-length %u assigned, %u redeclared, purging objet\n", s->service_id, tsi, toi, obj->total_length, total_len));
+		obj->nb_frags = obj->nb_recv_frags = 0;
+		obj->nb_bytes = obj->nb_recv_bytes = 0;
+		obj->total_length = total_len;
+
+		if (obj->alloc_size < total_len) {
+			gf_mx_p(routedmx->blob_mx);
+			obj->payload = gf_realloc(obj->payload, obj->total_length+1);
+			obj->alloc_size = obj->total_length;
+			obj->blob.size = obj->total_length;
+			obj->blob.data = obj->payload;
+			gf_mx_v(routedmx->blob_mx);
+		}
+
+		obj->status = GF_LCT_OBJ_INIT;
 	}
 	if (s->last_active_obj != obj) {
 		//last object had EOS and not completed
@@ -885,8 +950,8 @@
 		s->last_active_obj = obj;
 	}
 	*gather_obj = obj;
-	assert(obj->toi == toi);
-	assert(obj->tsi == tsi);
+	gf_assert(obj->toi == toi);
+	gf_assert(obj->tsi == tsi);
 
 	//keep receiving if we are done with errors
 	if (obj->status >= GF_LCT_OBJ_DONE) {
@@ -900,62 +965,72 @@
     }
 	obj->nb_recv_bytes += size;
 
-	inserted = GF_FALSE;
-	for (i=0; i<obj->nb_frags; i++) {
-		if ((obj->fragsi.offset <= start_offset) && (obj->fragsi.offset + obj->fragsi.size >= start_offset + size) ) {
-            //data already received
-			goto check_done;
+	int start_frag = -1;
+	int end_frag = -1;
+	for (i=0; (i < obj->nb_frags) && (start_frag==-1 || end_frag==-1); i++) {
+		if((start_frag == -1) && (start_offset <= obj->fragsi.offset + obj->fragsi.size)) {
+			start_frag = i;
 		}
 
-		//insert fragment
-		if (obj->fragsi.offset > start_offset) {
-			//check overlap (not sure if this is legal)
-			if (start_offset + size > obj->fragsi.offset) {
-				GF_LOG(GF_LOG_WARNING, GF_LOG_ROUTE, ("ROUTE Service %d Overlapping LCT fragment, not supported\n", s->service_id));
-				return GF_NOT_SUPPORTED;
-			}
-			if (obj->nb_frags==obj->nb_alloc_frags) {
-				obj->nb_alloc_frags *= 2;
-				obj->frags = gf_realloc(obj->frags, sizeof(GF_LCTFragInfo)*obj->nb_alloc_frags);
-			}
-			memmove(&obj->fragsi+1, &obj->fragsi, sizeof(GF_LCTFragInfo) * (obj->nb_frags - i)  );
-			obj->fragsi.offset = start_offset;
-			obj->fragsi.size = size;
-			obj->nb_bytes += size;
-			obj->nb_frags++;
-			inserted = GF_TRUE;
-            if (!i)
-                do_push = start_offset ? GF_FALSE : routedmx->progressive_dispatch;
-			break;
-		}
-		//expand fragment
-		if (obj->fragsi.offset + obj->fragsi.size == start_offset) {
-			obj->fragsi.size += size;
-			obj->nb_bytes += size;
-			inserted = GF_TRUE;
-            if (!i)
-                do_push = obj->frags0.offset ? GF_FALSE : routedmx->progressive_dispatch;
-			break;
+		if((end_frag == -1) && (start_offset + size < obj->fragsi.offset)) {
+			end_frag = i;
 		}
 	}
+	if(start_frag == -1) {
+		start_frag = obj->nb_frags;
+	}
+	if(end_frag == -1) {
+		end_frag = obj->nb_frags;
+	}
 
-	if (!inserted) {
+	if(start_frag == end_frag) {
+		// insert new fragment between two already received fragments or at the end
 		if (obj->nb_frags==obj->nb_alloc_frags) {
 			obj->nb_alloc_frags *= 2;
 			obj->frags = gf_realloc(obj->frags, sizeof(GF_LCTFragInfo)*obj->nb_alloc_frags);
 		}
-		obj->fragsobj->nb_frags.offset = start_offset;
-		obj->fragsobj->nb_frags.size = size;
-		obj->nb_frags++;
+		memmove(&obj->fragsstart_frag+1, &obj->fragsstart_frag, sizeof(GF_LCTFragInfo) * (obj->nb_frags - start_frag));
+		obj->fragsstart_frag.offset = start_offset;
+		obj->fragsstart_frag.size = size;
 		obj->nb_bytes += size;
-        if (obj->nb_frags==1)
-            do_push = start_offset ? GF_FALSE : routedmx->progressive_dispatch;
+		obj->nb_frags++;
+	} else {
+		int old_size = obj->fragsstart_frag.size;
+
+		int end = MAX(start_offset+size, obj->fragsend_frag-1.offset+obj->fragsend_frag-1.size);
+		obj->fragsstart_frag.offset = MIN(obj->fragsstart_frag.offset, start_offset);
+		obj->fragsstart_frag.size = end - obj->fragsstart_frag.offset;
+
+		if(end_frag == start_frag + 1) {
+			// received data extends fragment of index start_frag
+			if(obj->fragsstart_frag.size < old_size + size) {
+				GF_LOG(GF_LOG_WARNING, GF_LOG_ROUTE, ("ROUTE Service %d Overlapping or already received LCT fragment %u, %u\n", s->service_id, start_offset, start_offset+size-1));
+			}
+			obj->nb_bytes += obj->fragsstart_frag.size - old_size;
+
+		} else if(end_frag > start_frag + 1) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_ROUTE, ("ROUTE Service %d Overlapping LCT fragment\n", s->service_id));
+
+			memmove(&obj->fragsstart_frag+1, &obj->fragsend_frag, sizeof(GF_LCTFragInfo) * (obj->nb_frags - end_frag));
+			obj->nb_frags += start_frag - end_frag + 1;
+
+			obj->nb_bytes = 0;
+			u32 i;
+			for(i=0; i < obj->nb_frags; i++) {
+				obj->nb_bytes += obj->fragsi.size;
+			}
+		}
+	}
+
+	if (!start_frag) {
+		do_push = start_offset ? GF_FALSE : routedmx->progressive_dispatch;
 	}
+
 	obj->nb_recv_frags++;
 	obj->status = GF_LCT_OBJ_RECEPTION;
 
-	assert(obj->toi == toi);
-	assert(obj->tsi == tsi);
+	gf_assert(obj->toi == toi);
+	gf_assert(obj->tsi == tsi);
 	if (start_offset + size > obj->alloc_size) {
 		obj->alloc_size = start_offset + size;
 		//use total size if available
@@ -970,20 +1045,20 @@
         obj->blob.data = obj->payload;
         gf_mx_v(routedmx->blob_mx);
     }
-	assert(obj->alloc_size >= start_offset + size);
+	gf_assert(obj->alloc_size >= start_offset + size);
 
 	memcpy(obj->payload + start_offset, data, size);
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_ROUTE, ("ROUTE Service %d TSI %u TOI %u append LCT fragment, offset %d total size %d recv bytes %d - offset diff since last %d\n", s->service_id, obj->tsi, obj->toi, start_offset, obj->total_length, obj->nb_bytes, (s32) start_offset - (s32) obj->prev_start_offset));
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_ROUTE, ("ROUTE Service %d TSI %u TOI %u append LCT fragment, offset %u total size %u recv bytes %u - offset diff since last %ld\n", s->service_id, obj->tsi, obj->toi, start_offset, obj->total_length, obj->nb_bytes, (s32) start_offset - (s32) obj->prev_start_offset));
 
 	obj->prev_start_offset = start_offset;
-	assert(obj->toi == toi);
-	assert(obj->tsi == tsi);
-    
+	gf_assert(obj->toi == toi);
+	gf_assert(obj->tsi == tsi);
+
     //not a file (uses templates->segment) and can push
     if (do_push && !obj->rlct_file && obj->rlct) {
         gf_route_dmx_push_object(routedmx, s, obj, GF_FALSE, GF_TRUE, GF_FALSE, obj->frags0.size);
     } else {
-        GF_LOG(GF_LOG_DEBUG, GF_LOG_ROUTE, ("ROUTE Service %d TSI %u TOI %u: %d bytes inserted on non-first fragment (%d totals), cannot push\n", s->service_id, obj->tsi, obj->toi, size, obj->nb_frags));
+        GF_LOG(GF_LOG_DEBUG, GF_LOG_ROUTE, ("ROUTE Service %d TSI %u TOI %u: %u bytes inserted on non-first fragment (%u totals), cannot push\n", s->service_id, obj->tsi, obj->toi, size, obj->nb_frags));
     }
 
 check_done:
@@ -1096,8 +1171,8 @@
 	e = gf_xml_dom_parse_string(routedmx->dom, content);
 	root = gf_xml_dom_get_root(routedmx->dom);
 	if (e || !root) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_ROUTE, ("ROUTE Service %d failed to parse S-TSID: %s\n", s->service_id, gf_error_to_string(e) ));
-		return e;
+		GF_LOG(GF_LOG_ERROR, GF_LOG_ROUTE, ("ROUTE Service %d failed to parse S-TSID: %s\n", s->service_id, (e)?gf_error_to_string(e) : "Unknown error"));
+		return GF_CORRUPTED_DATA;
 	}
 	i=0;
 	while ((rs = gf_list_enum(root->content, &i))) {
@@ -1113,7 +1188,15 @@
 		j=0;
 		while ((att = gf_list_enum(rs->attributes, &j))) {
 			if (!stricmp(att->name, "dIpAddr")) dst_ip = att->value;
-			else if (!stricmp(att->name, "dPort")) dst_port = atoi(att->value);
+			else if (!stricmp(att->name, "dPort")) {
+				if(! gf_strict_atoui(att->value, &dst_port)) {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_ROUTE, ("ROUTE Service %d wrong dPort value (%s), it should be numeric \n", s->service_id, att->value));
+					return GF_CORRUPTED_DATA;
+				} else if(dst_port >= 65536) {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_ROUTE, ("ROUTE Service %d wrong dPort value (%s), it should belong to the interval 0, 65535 \n", s->service_id, att->value));
+					return GF_CORRUPTED_DATA;
+				}
+			}
 		}
 
 		GF_SAFEALLOC(rsess, GF_ROUTESession);
@@ -1123,7 +1206,7 @@
 
 		//need a new socket for the session
 		if ((strcmp(s->dst_ip, dst_ip)) || (s->port != dst_port) ) {
-			rsess->sock = gf_sk_new(GF_SOCK_TYPE_UDP);
+			rsess->sock = gf_sk_new_ex(GF_SOCK_TYPE_UDP, routedmx->netcap_id);
 			gf_sk_set_usec_wait(rsess->sock, 1);
 			e = gf_sk_setup_multicast(rsess->sock, dst_ip, dst_port, 0, GF_FALSE, (char *) routedmx->ip_ifce);
 			if (e) {
@@ -1147,7 +1230,12 @@
 			//extract TSI
 			k=0;
 			while ((att = gf_list_enum(ls->attributes, &k))) {
-				if (!strcmp(att->name, "tsi")) sscanf(att->value, "%u", &tsi);
+				if (!strcmp(att->name, "tsi")) {
+					if(! gf_strict_atoui(att->value, &tsi)) {
+						GF_LOG(GF_LOG_ERROR, GF_LOG_ROUTE, ("ROUTE Service %d wrong TSI value (%s), it should be numeric \n", s->service_id, att->value));
+						return GF_CORRUPTED_DATA;
+					}
+				}
 			}
 			if (!tsi) {
 				GF_LOG(GF_LOG_ERROR, GF_LOG_ROUTE, ("ROUTE Service %d missing TSI in LS/ROUTE session\n", s->service_id));
@@ -1198,7 +1286,14 @@
 							u32 n=0;
 							while ((att = gf_list_enum(fdt->attributes, &n))) {
 								if (!strcmp(att->name, "Content-Location")) rf->filename = gf_strdup(att->value);
-								else if (!strcmp(att->name, "TOI")) sscanf(att->value, "%u", &rf->toi);
+								else if (!strcmp(att->name, "TOI")) {
+									if(! gf_strict_atoui(att->value, &rf->toi)) {
+										GF_LOG(GF_LOG_ERROR, GF_LOG_ROUTE, ("ROUTE Service %d wrong TOI value (%s), it should be numeric \n", s->service_id, att->value));
+										gf_free(rf->filename);
+										gf_free(rf);
+										return GF_CORRUPTED_DATA;
+									}
+								}
 							}
 							if (!rf->filename) {
 								gf_free(rf);
@@ -1226,7 +1321,14 @@
 							u32 n=0;
 							while ((att = gf_list_enum(fdt->attributes, &n))) {
 								if (!strcmp(att->name, "Content-Location")) rf->filename = gf_strdup(att->value);
-								else if (!strcmp(att->name, "TOI")) sscanf(att->value, "%u", &rf->toi);
+								else if (!strcmp(att->name, "TOI")) {
+									if(! gf_strict_atoui(att->value, &rf->toi)) {
+										GF_LOG(GF_LOG_ERROR, GF_LOG_ROUTE, ("ROUTE Service %d wrong TOI value (%s), it should be numeric \n", s->service_id, att->value));
+										gf_free(rf->filename);
+										gf_free(rf);
+										return GF_CORRUPTED_DATA;
+									}
+								}
 							}
 							if (!rf->filename) {
 								gf_free(rf);
@@ -1356,7 +1458,7 @@
 		}
 		memcpy(routedmx->buffer, object->payload, object->total_length);
 		raw_size = routedmx->unz_buffer_size;
-		e = gf_gz_decompress_payload(routedmx->buffer, object->total_length, &routedmx->unz_buffer, &raw_size);
+		e = gf_gz_decompress_payload_ex(routedmx->buffer, object->total_length, &routedmx->unz_buffer, &raw_size, GF_TRUE);
 		if (e) {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_ROUTE, ("ROUTE Service %d failed to decompress signaling bundle: %s\n", s->service_id, gf_error_to_string(e) ));
 			return e;
@@ -1364,11 +1466,16 @@
 		if (raw_size > routedmx->unz_buffer_size) routedmx->unz_buffer_size = raw_size;
 		payload = routedmx->unz_buffer;
 		payload_size = raw_size;
+		payloadpayload_size = 0; //gf_gz_decompress_payload_ex adds one extra byte at end
 	} else {
 		payload = object->payload;
 		payload_size = object->total_length;
+		payloadpayload_size = 0; //object->payload is allocated with one extra byte
+		// Verifying that the payload is not erroneously treated as plaintext
+		if(!isprint(payload0)) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_ROUTE, ("ROUTE Service %d package appears to be compressed but is being treated as plaintext:\n%s\n", s->service_id, payload));
+		}
 	}
-	payloadpayload_size = 0;
 
 	GF_LOG(GF_LOG_INFO, GF_LOG_ROUTE, ("ROUTE Service %d got TSI 0 config package:\n%s\n", s->service_id, payload ));
 
@@ -1407,25 +1514,31 @@
 		}
 
 		//extract headers
-		while (strncmp(payload, "\r\n\r\n", 4)) {
+		while (payload0 && strncmp(payload, "\r\n\r\n", 4)) {
 			u32 i=0;
-			while (strchr("\n\r", payload0) != NULL) payload++;
-			while (strchr("\r\n", payloadi) == NULL) i++;
+			while (payload0 && strchr("\n\r", payload0) != NULL) payload++;
+			while (payloadi && strchr("\r\n", payloadi) == NULL) i++;
 
 			if (!strnicmp(payload, "Content-Type: ", 14)) {
 				u32 copy = MIN(i-14, 100);
 				strncpy(szContentType, payload+14, copy);
 				szContentTypecopy=0;
-				payload += i;
 			}
 			else if (!strnicmp(payload, "Content-Location: ", 18)) {
 				u32 copy = MIN(i-18, 1024);
 				strncpy(szContentLocation, payload+18, copy);
 				szContentLocationcopy=0;
-				payload += i;
 			} else {
-				GF_LOG(GF_LOG_WARNING, GF_LOG_ROUTE, ("ROUTE Service %d unrecognized header entity in package:\n%s\n", s->service_id, payload ));
+				char tmp = payloadi;
+				payloadi = 0;
+				GF_LOG(GF_LOG_WARNING, GF_LOG_ROUTE, ("ROUTE Service %d unrecognized header entity in package:\n%s\n", s->service_id, payload));
+				payloadi = tmp;
 			}
+			payload += i;
+		}
+		if(!payload0) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_ROUTE, ("ROUTE Service %d end of package has been prematurely reached\n", s->service_id));
+			return GF_NON_COMPLIANT_BITSTREAM;
 		}
 		payload += 4;
 		content = boundary ? strstr(payload, "\r\n--") : strstr(payload, "\r\n\r\n");
@@ -1464,10 +1577,16 @@
 		else if (!strcmp(szContentType, "application/s-tsid") || !strcmp(szContentType, "application/route-s-tsid+xml")) {
 			if (!s->stsid_version || (stsid_version && (stsid_version+1 != s->stsid_version))) {
 				s->stsid_version = stsid_version+1;
-				gf_route_service_setup_stsid(routedmx, s, payload, szContentLocation);
+				e = gf_route_service_setup_stsid(routedmx, s, payload, szContentLocation);
+				if (e) {
+					gf_free(boundary);
+					return e;
+				}
 			} else {
 				GF_LOG(GF_LOG_DEBUG, GF_LOG_ROUTE, ("ROUTE Service %d same S-TSID version, ignoring\n",s->service_id));
 			}
+		} else {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_ROUTE, ("ROUTE Service %d unsupported content type (%s), parsing payload is skipped\n", s->service_id, szContentType));
 		}
 		if (!sep) break;
 		sep0 = boundary0;
@@ -1475,9 +1594,26 @@
 	}
 
 	gf_free(boundary);
-	return GF_OK;
+	payload_size = (u32) strlen(payload);
+	if(payload_size > 1) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_ROUTE, ("ROUTE Service %d Unable to process %d remaining characters in the payload due to data corruption\n",s->service_id, payload_size));
+		return GF_CORRUPTED_DATA;
+	} else {
+		GF_ROUTESession *rsess;
+		u32 i=0;
+		u32 nb_channels=0;
+		while ((rsess = gf_list_enum(s->route_sessions, &i))) {
+			nb_channels += gf_list_count(rsess->channels);
+		}
+		if(nb_channels == 0) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_ROUTE, ("ROUTE Service %d No session found, dropping manifest\n", s->service_id));
+			return GF_INVALID_CONFIGURATION;
+		}
+		return GF_OK;
+	}
 }
 
+#define GF_ROUTE_MAX_SIZE 0x40000000
 
 static GF_Err gf_route_dmx_process_service(GF_ROUTEDmx *routedmx, GF_ROUTEService *s, GF_ROUTESession *route_sess)
 {
@@ -1497,7 +1633,7 @@
 	}
 
 	if (e != GF_OK) return e;
-	assert(nb_read);
+	gf_assert(nb_read);
 
 	routedmx->nb_packets++;
 	routedmx->total_bytes_recv += nb_read;
@@ -1521,7 +1657,7 @@
 	cp = gf_bs_read_int(routedmx->bs, 8);
 
 	if (v!=1) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_ROUTE, ("ROUTE Service %d : wrong LCT header version %d\n", s->service_id, v));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_ROUTE, ("ROUTE Service %d : wrong LCT header version %d, expecting 1\n", s->service_id, v));
 		return GF_NON_COMPLIANT_BITSTREAM;
 	}
 	else if (C!=0) {
@@ -1533,19 +1669,19 @@
 		return GF_NON_COMPLIANT_BITSTREAM;
 	}
 	else if (S!=1) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_ROUTE, ("ROUTE Service %d : wrong ROUTE LCT header S, shall be 1\n", s->service_id));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_ROUTE, ("ROUTE Service %d : wrong ROUTE LCT header S, should be 1\n", s->service_id));
 		return GF_NON_COMPLIANT_BITSTREAM;
 	}
 	else if (O!=1) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_ROUTE, ("ROUTE Service %d : wrong ROUTE LCT header 0, shall be b01\n", s->service_id));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_ROUTE, ("ROUTE Service %d : wrong ROUTE LCT header O, should be b01\n", s->service_id));
 		return GF_NON_COMPLIANT_BITSTREAM;
 	}
 	else if (H!=0) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_ROUTE, ("ROUTE Service %d : wrong ROUTE LCT header H, shall be 0\n", s->service_id));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_ROUTE, ("ROUTE Service %d : wrong ROUTE LCT header H, should be 0\n", s->service_id));
 		return GF_NON_COMPLIANT_BITSTREAM;
 	}
 	if (hdr_len<4) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_ROUTE, ("ROUTE Service %d : wrong ROUTE LCT header len %d, shall be at least 4 0\n", s->service_id, hdr_len));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_ROUTE, ("ROUTE Service %d : wrong ROUTE LCT header len %d, should be at least 4\n", s->service_id, hdr_len));
 		return GF_NON_COMPLIANT_BITSTREAM;
 	}
 
@@ -1620,7 +1756,7 @@
 
 
 		//for now we only care about S and M
-		if (!a_S && ! a_M) {
+		if (!a_S && !a_M) {
 			GF_LOG(GF_LOG_DEBUG, GF_LOG_ROUTE, ("ROUTE Service %d : SLT bundle without MPD or S-TSID, skipping packet\n", s->service_id));
 			return GF_OK;
 		}
@@ -1644,6 +1780,9 @@
 
 		case GF_LCT_EXT_TOL24:
 			tol_size = gf_bs_read_int(routedmx->bs, 24);
+			if(! tol_size) {
+				GF_LOG(GF_LOG_WARNING, GF_LOG_ROUTE, ("ROUTE Service %d : wrong TOL=%u value \n", s->service_id, tol_size));
+			}
 			break;
 
 		case GF_LCT_EXT_TOL48:
@@ -1652,6 +1791,9 @@
 				continue;
 			}
 			tol_size = gf_bs_read_long_int(routedmx->bs, 48);
+			if(! tol_size) {
+				GF_LOG(GF_LOG_WARNING, GF_LOG_ROUTE, ("ROUTE Service %d : wrong TOL=%u value \n", s->service_id, tol_size));
+			}
 			break;
 
 		default:
@@ -1667,23 +1809,40 @@
 	}
 
 	start_offset = gf_bs_read_u32(routedmx->bs);
+	if (start_offset>=GF_ROUTE_MAX_SIZE) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_ROUTE, ("ROUTE Service %d : wrong ROUTE start offset %u\n", s->service_id, start_offset));
+		return GF_NON_COMPLIANT_BITSTREAM;
+	}
+	if (tol_size>=GF_ROUTE_MAX_SIZE) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_ROUTE, ("ROUTE Service %d : wrong ROUTE object size %u\n", s->service_id, tol_size));
+		return GF_NON_COMPLIANT_BITSTREAM;
+	}
 	pos = (u32) gf_bs_get_position(routedmx->bs);
 
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_ROUTE, ("ROUTE Service %d : LCT packet TSI %u TOI %u size %d startOffset %u TOL "LLU"\n", s->service_id, tsi, toi, nb_read-pos, start_offset, tol_size));
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_ROUTE, ("ROUTE Service %d : LCT packet TSI %u TOI %u size %d startOffset %u TOL "LLU" (PckNum %d)\n", s->service_id, tsi, toi, nb_read-pos, start_offset, tol_size, routedmx->nb_packets));
 
 	e = gf_route_service_gather_object(routedmx, s, tsi, toi, start_offset, routedmx->buffer + pos, nb_read-pos, (u32) tol_size, B, in_order, rlct, &gather_object);
 
 	if (e==GF_EOS) {
 		if (!tsi) {
 			if (gather_object->status==GF_LCT_OBJ_DONE_ERR) {
+				s->last_dispatched_toi_on_tsi_zero=0;
 				gf_route_obj_to_reservoir(routedmx, s, gather_object);
 				return GF_OK;
 			}
 			//we don't assign version here, we use mbms envelope for that since the bundle may have several
 			//packages
 
-			gf_route_dmx_process_service_signaling(routedmx, s, gather_object, cc, a_S ? v : 0, a_M ? v : 0);
-			//we don't release the LCT object, so that we can disard future versions
+			e = gf_route_dmx_process_service_signaling(routedmx, s, gather_object, cc, a_S ? v : 0, a_M ? v : 0);
+			//we don't release the LCT object, so that we can discard future versions
+			if(e) {
+				//ignore this object in order to be able to accept future versions
+				s->last_dispatched_toi_on_tsi_zero=0;
+				s->stsid_version = 0;
+				s->stsid_crc = 0;
+				s->mpd_version = 0;
+				gf_route_obj_to_reservoir(routedmx, s, gather_object);
+			}
 		} else {
 			gf_route_dmx_process_object(routedmx, s, gather_object);
 		}
@@ -1741,7 +1900,7 @@
 		return GF_OK;
 	}
 
-	e = gf_gz_decompress_payload(&routedmx->buffer4, read-4, &routedmx->unz_buffer, &raw_size);
+	e = gf_gz_decompress_payload_ex(&routedmx->buffer4, read-4, &routedmx->unz_buffer, &raw_size, GF_TRUE);
 	if (e) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_ROUTE, ("ROUTE Failed to decompress %s table: %s\n", name, gf_error_to_string(e) ));
 		return e;
@@ -1876,7 +2035,7 @@
 	i=0;
 	while ((obj = gf_list_enum(s->objects, &i))) {
 		u32 toi;
-		if (obj->rlct && (sscanf(fileName, obj->rlct->toi_template, &toi) == 1)) {
+		if (obj->rlct && obj->rlct->toi_template && (sscanf(fileName, obj->rlct->toi_template, &toi) == 1)) {
 			u32 tsi;
 			if (toi == obj->toi) {
 				GF_ROUTELCTChannel *rlct = obj->rlct;
@@ -1991,7 +2150,7 @@
 		//if object is static file keep it - this may need refinement in case we had init segment updates
 		if (obj->rlct_file) continue;
 		//obj being received do not destroy
-		if (obj->status == GF_LCT_OBJ_RECEPTION) continue;
+		if (obj->status <= GF_LCT_OBJ_RECEPTION) continue;
 		//trash
 		gf_route_obj_to_reservoir(routedmx, s, obj);
 	}

gpac-2.2.1.tar.gz/src/media_tools/vobsub.c -> gpac-2.4.0.tar.gz/src/media_tools/vobsub.c Changed

gpac-2.2.1.tar.gz/src/media_tools/webvtt.c -> gpac-2.4.0.tar.gz/src/media_tools/webvtt.c Changed

@@ -2,7 +2,7 @@
  *          GPAC - Multimedia Framework C SDK
  *
  *          Authors: Cyril Concolato, Jean Le Feuvre
- *          Copyright (c) Telecom ParisTech 2000-2022
+ *          Copyright (c) Telecom ParisTech 2000-2024
  *                  All rights reserved
  *
  *  This file is part of GPAC / ISO Media File Format sub-project
@@ -70,9 +70,9 @@
 		if (string) {
 			/* remove trailing spaces; spec. \r, \n; skip if empty */
 			size_t len = strlen(string);
-			char const* last = string + len-1;
-			while (len && isspace(*last--))
-				--len;
+			while (len && isspace(stringlen-1)) {
+				len--;
+			}
 
 			if (!len) break;
 			if (parent) {
@@ -321,10 +321,10 @@
 			return NULL;
 		}
 	} else {
-		GF_Box *cuebox = (GF_Box *)gf_isom_box_new(GF_ISOM_BOX_TYPE_VTTE);
-		e = gf_isom_box_size((GF_Box *)cuebox);
-		if (!e) e = gf_isom_box_write((GF_Box *)cuebox, bs);
-		gf_isom_box_del((GF_Box *)cuebox);
+		GF_Box *cuebox = gf_isom_box_new(GF_ISOM_BOX_TYPE_VTTE);
+		e = gf_isom_box_size(cuebox);
+		if (!e) e = gf_isom_box_write(cuebox, bs);
+		gf_isom_box_del(cuebox);
 		if (e) {
 			gf_bs_del(bs);
 			return NULL;
@@ -441,7 +441,7 @@
 	void (*on_cue_read)(void *, GF_WebVTTCue *);
 };
 
-#if !defined(GPAC_DISABLE_MEDIA_IMPORT) && !defined(GPAC_DISABLE_ISOM)
+#if !defined(GPAC_DISABLE_MEDIA_IMPORT) || !defined(GPAC_DISABLE_ISOM)
 static Bool gf_webvtt_timestamp_is_zero(GF_WebVTTTimestamp *ts)
 {
 	return (ts->hour == 0 && ts->min == 0 && ts->sec == 0 && ts->ms == 0) ? GF_TRUE : GF_FALSE;
@@ -680,7 +680,8 @@
 		sample_end = sample->end;
 		if (cue_start < sample->start) {
 			/* cues must be ordered according to their start time, so drop the cue */
-			/* TODO delete the cue */
+			gf_webvtt_cue_del(cue);
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("VTT Cue not in order, broken file\n"));
 			return GF_BAD_PARAM;
 		} else if (cue_start == sample->start && cue_end == sample->end) {
 			/* if the timing of the new cue matches the sample, no need to split, add the cue to the sample */
@@ -933,7 +934,7 @@
 
 GF_Err gf_webvtt_parser_parse_internal(GF_WebVTTParser *parser, GF_WebVTTCue *cue)
 {
-	char szLine2048;
+	char szLine2049;
 	char *sOK;
 	u32 len;
 	GF_Err e;
@@ -949,12 +950,17 @@
 		parser->on_header_parsed(parser->user, "WEBVTT\n");
 	}
 
+	szLine2048=0;
 	while (!parser->is_eof) {
 		if (!cue && parser->suspend)
 			break;
 		sOK = gf_text_get_utf8_line(szLine, 2048, parser->vtt_in, parser->unicode_type);
 		REM_TRAIL_MARKS(szLine, "\r\n")
 		len = (u32) strlen(szLine);
+		if (parser->is_srt && sOK && !strncmp(sOK, "WEBVTT", 6)) {
+			parser->is_srt = GF_FALSE;
+			parser->state = WEBVTT_PARSER_STATE_WAITING_SIGNATURE;
+		}
 		switch (parser->state) {
 		case WEBVTT_PARSER_STATE_WAITING_SIGNATURE:
 			if (!sOK || len < 6 || strnicmp(szLine, "WEBVTT", 6) || (len > 6 && szLine6 != ' ' && szLine6 != '\t')) {
@@ -1087,7 +1093,9 @@
 				}
 			} else {
 				/* not possible */
-				assert(0);
+				gf_assert(0);
+				if (header) gf_free(header);
+				return GF_NON_COMPLIANT_BITSTREAM;
 			}
 			break;
 		case WEBVTT_PARSER_STATE_WAITING_CUE_PAYLOAD:
@@ -1159,6 +1167,10 @@
 {
 	return gf_webvtt_parser_parse_internal(parser, NULL);
 }
+void gf_webvtt_parser_not_done(GF_WebVTTParser *parser)
+{
+	if (parser) parser->is_eof = GF_FALSE;
+}
 
 GF_Err gf_webvtt_parser_flush(GF_WebVTTParser *parser)
 {
@@ -1251,7 +1263,7 @@
 	GF_WebVTTSample *prev_wsample;
 	Bool            has_continuation_cue = GF_FALSE;
 
-	assert(gf_list_count(parser->samples) <= 1);
+	gf_assert(gf_list_count(parser->samples) <= 1);
 
 	wsample = gf_webvtt_sample_new();
 	wsample->start = start;
@@ -1428,7 +1440,11 @@
 	wvtt = gf_webvtt_isom_get_description(file, track, index);
 	if (!wvtt) return GF_BAD_PARAM;
 	if (box_mode) {
+#ifndef GPAC_DISABLE_ISOM_DUMP
 		gf_isom_box_dump(wvtt, dump);
+#else
+		return GF_NOT_SUPPORTED;
+#endif
 	} else {
 		gf_fprintf(dump, "%s\n\n", wvtt->config->string);
 	}
@@ -1452,7 +1468,9 @@
 		if (e) return e;
 
 		if (box_mode) {
+#ifndef GPAC_DISABLE_ISOM_DUMP
 			gf_isom_box_dump(box, dump);
+#endif
 		} else if (box->type == GF_ISOM_BOX_TYPE_VTCC_CUE) {
 			GF_VTTCueBox *cuebox = (GF_VTTCueBox *)box;
 			if (cuebox->id) gf_fprintf(dump, "%s", cuebox->id->string);
@@ -1480,11 +1498,11 @@
 }
 #endif
 
-#ifndef GPAC_DISABLE_ISOM_DUMP
+#ifndef GPAC_DISABLE_ISOM
 GF_Err gf_webvtt_parser_finalize(GF_WebVTTParser *parser, u64 duration)
 {
 	GF_WebVTTSample *sample;
-	assert(gf_list_count(parser->samples) <= 1);
+	gf_assert(gf_list_count(parser->samples) <= 1);
 	sample = (GF_WebVTTSample *)gf_list_get(parser->samples, 0);
 	if (sample) {
 		while (gf_list_count(sample->cues)) {

gpac-2.2.1.tar.gz/src/odf/descriptors.c -> gpac-2.4.0.tar.gz/src/odf/descriptors.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2022
+ *			Copyright (c) Telecom ParisTech 2000-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / MPEG-4 ObjectDescriptor sub-project
@@ -726,6 +726,7 @@
 	GF_TextSampleDescriptor *txtc = (GF_TextSampleDescriptor *) gf_odf_new_tx3g();
 	GF_BitStream *bs = gf_bs_new(dsi, dsi_size, GF_BITSTREAM_READ);
 
+	txtc->displayFlags = gf_bs_read_int(bs, 32);
 	txtc->horiz_justif = gf_bs_read_int(bs, 8);
 	txtc->vert_justif  = gf_bs_read_int(bs, 8);
 	txtc->back_color = gpp_read_rgba(bs);
@@ -757,6 +758,7 @@
 	void gpp_write_style(GF_BitStream *bs, GF_StyleRecord *rec);
 	GF_BitStream *bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
 
+	gf_bs_write_u32(bs, a->displayFlags);
 	gf_bs_write_u8(bs, a->horiz_justif);
 	gf_bs_write_u8(bs, a->vert_justif);
 	gpp_write_rgba(bs, a->back_color);
@@ -1479,8 +1481,10 @@
 GF_Err gf_odf_av1_cfg_write_bs(GF_AV1Config *cfg, GF_BitStream *bs)
 {
 	u32 i = 0;
-	gf_bs_write_int(bs, cfg->marker, 1); assert(cfg->marker == 1);
-	gf_bs_write_int(bs, cfg->version, 7); assert(cfg->version == 1);
+	gf_bs_write_int(bs, cfg->marker, 1);
+	gf_assert(cfg->marker == 1);
+	gf_bs_write_int(bs, cfg->version, 7);
+	gf_assert(cfg->version == 1);
 	gf_bs_write_int(bs, cfg->seq_profile, 3);
 	gf_bs_write_int(bs, cfg->seq_level_idx_0, 5);
 	gf_bs_write_int(bs, cfg->seq_tier_0, 1);
@@ -1644,11 +1648,6 @@
 	cfg->chroma_sample_position = gf_bs_read_int(bs, 2);
 
 	reserved = gf_bs_read_int(bs, 3);
-	if (reserved != 0 || cfg->marker != 1 || cfg->version != 1) {
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_CODING, ("AV1 wrong avcC reserved %d / marker %d / version %d expecting 0 1 1\n", reserved, cfg->marker, cfg->version));
-		gf_odf_av1_cfg_del(cfg);
-		return NULL;
-	}
 	cfg->initial_presentation_delay_present = gf_bs_read_int(bs, 1);
 	if (cfg->initial_presentation_delay_present) {
 		cfg->initial_presentation_delay_minus_one = gf_bs_read_int(bs, 4);
@@ -1658,6 +1657,13 @@
 	}
 	size -= 4;
 
+	if (reserved != 0 || cfg->marker != 1 || cfg->version != 1) {
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_CODING, ("AV1 wrong av1C reserved %d / marker %d / version %d expecting 0 1 1\n", reserved, cfg->marker, cfg->version));
+		gf_odf_av1_cfg_del(cfg);
+		return NULL;
+	}
+
+
 	while (size) {
 		u64 pos, obu_size;
 		ObuType obu_type;
@@ -1669,7 +1675,7 @@
 			GF_LOG(GF_LOG_ERROR, GF_LOG_CODING, ("AV1 could not parse AV1 OBU at position "LLU". Leaving parsing.\n", pos));
 			break;
 		}
-		assert(obu_size == gf_bs_get_position(bs) - pos);
+		gf_assert(obu_size == gf_bs_get_position(bs) - pos);
 		GF_LOG(GF_LOG_DEBUG, GF_LOG_CODING, ("AV1 parsed AV1 OBU type=%u size="LLU" at position "LLU".\n", obu_type, obu_size, pos));
 
 		if (!av1_is_obu_header(obu_type)) {

gpac-2.2.1.tar.gz/src/odf/ipmpx_dump.c -> gpac-2.4.0.tar.gz/src/odf/ipmpx_dump.c Changed

gpac-2.2.1.tar.gz/src/odf/odf_dump.c -> gpac-2.4.0.tar.gz/src/odf/odf_dump.c Changed

gpac-2.2.1.tar.gz/src/odf/odf_parse.c -> gpac-2.4.0.tar.gz/src/odf/odf_parse.c Changed

gpac-2.2.1.tar.gz/src/odf/qos.c -> gpac-2.4.0.tar.gz/src/odf/qos.c Changed

gpac-2.2.1.tar.gz/src/quickjs/quickjs-libc.c -> gpac-2.4.0.tar.gz/src/quickjs/quickjs-libc.c Changed

gpac-2.2.1.tar.gz/src/quickjs/quickjs.c -> gpac-2.4.0.tar.gz/src/quickjs/quickjs.c Changed

gpac-2.2.1.tar.gz/src/scene_manager/loader_bt.c -> gpac-2.4.0.tar.gz/src/scene_manager/loader_bt.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2022
+ *			Copyright (c) Telecom ParisTech 2000-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / Scene Management sub-project
@@ -134,7 +134,8 @@
 
 void gf_bt_check_line(GF_BTParser *parser)
 {
-	while (1) {
+reload_line:
+	while (parser->line_pos < parser->line_size) {
 		switch (parser->line_bufferparser->line_pos) {
 		case ' ':
 		case '\t':
@@ -142,16 +143,22 @@
 		case '\r':
 			parser->line_pos++;
 			continue;
+		case '\0':
+			parser->line_pos = parser->line_size;
 		default:
 			break;
 		}
 		break;
 	}
 
-	if (parser->line_bufferparser->line_pos=='#') {
-		parser->line_size = parser->line_pos;
+	if (parser->line_pos < parser->line_size) {
+		if (parser->line_bufferparser->line_pos=='#') {
+			parser->line_size = parser->line_pos;
+		}
+		else if ((parser->line_bufferparser->line_pos=='/') && (parser->line_bufferparser->line_pos+1=='/') ) {
+			parser->line_size = parser->line_pos;
+		}
 	}
-	else if ((parser->line_bufferparser->line_pos=='/') && (parser->line_bufferparser->line_pos+1=='/') ) parser->line_size = parser->line_pos;
 
 	if (parser->line_size == parser->line_pos) {
 		/*string based input - done*/
@@ -337,7 +344,7 @@
 				}
 				if (len) {
 					if (len==1) {
-						if (!strnicmp(parser->line_buffer+parser->line_pos, "0", len)) {
+						if (!strnicmp(parser->line_buffer+parser->line_pos, "0", 1)) {
 							parser->block_comment++;
 						}
 					} else {
@@ -405,10 +412,15 @@
 		}
 	}
 	if (!parser->line_size) {
-		if (!gf_gzeof(parser->gz_in)) gf_bt_check_line(parser);
-		else parser->done = 1;
+		if (!gf_gzeof(parser->gz_in))
+			//avoid recursion
+			goto reload_line;
+		else
+			parser->done = 1;
 	}
-	else if (!parser->done && (parser->line_size == parser->line_pos)) gf_bt_check_line(parser);
+	else if (!parser->done && (parser->line_size == parser->line_pos))
+		//avoid recursion
+		goto reload_line;
 }
 
 void gf_bt_force_line(GF_BTParser *parser)
@@ -435,12 +447,12 @@
 	i=0;
 	has_quote = 0;
 	while (go) {
+		if (parser->line_pos+i>=parser->line_size) break;
+
 		if (parser->line_bufferparser->line_pos + i == '\"') {
 			if (!has_quote) has_quote = 1;
 			else has_quote = 0;
 			parser->line_pos += 1;
-
-			if (parser->line_pos+i==parser->line_size) break;
 			continue;
 		}
 		if (!has_quote) {
@@ -2803,7 +2815,7 @@
 		switch (type) {
 		/*single descriptor*/
 		case GF_ODF_FT_OD:
-			assert(desc->tag==GF_IPMPX_CONNECT_TOOL_TAG);
+			gf_assert(desc->tag==GF_IPMPX_CONNECT_TOOL_TAG);
 			str = gf_bt_get_next(parser, 0);
 			oddesc = gf_bt_parse_descriptor(parser, str);
 			if (!oddesc) {
@@ -2811,12 +2823,12 @@
 				gf_ipmpx_data_del(desc);
 				return NULL;
 			}
-			assert(oddesc->tag==GF_ODF_IPMP_TAG);
+			gf_assert(oddesc->tag==GF_ODF_IPMP_TAG);
 			((GF_IPMPX_ConnectTool *)desc)->toolDescriptor = (GF_IPMP_Descriptor *)oddesc;
 			break;
 		/*descriptor list*/
 		case GF_ODF_FT_OD_LIST:
-			assert(desc->tag==GF_IPMPX_GET_TOOLS_RESPONSE_TAG);
+			gf_assert(desc->tag==GF_IPMPX_GET_TOOLS_RESPONSE_TAG);
 			if (gf_bt_check_code(parser, '')) {
 				while (!gf_bt_check_code(parser, '')) {
 					GF_Descriptor *ipmp_t = gf_bt_parse_descriptor(parser, NULL);
@@ -2825,7 +2837,7 @@
 						parser->last_error = GF_BAD_PARAM;
 						return NULL;
 					}
-					assert(ipmp_t->tag==GF_ODF_IPMP_TOOL_TAG);
+					gf_assert(ipmp_t->tag==GF_ODF_IPMP_TOOL_TAG);
 					gf_list_add( ((GF_IPMPX_GetToolsResponse *)desc)->ipmp_tools, ipmp_t);
 				}
 			}
@@ -2926,7 +2938,7 @@
 {
 	char *str, field500;
 	GF_Descriptor *desc, *subdesc;
-	u32 type;
+	GF_ODF_FieldType type;
 	u8 tag;
 	if (name) {
 		str = name;
@@ -3291,8 +3303,12 @@
 		str = gf_bt_get_next(parser, 0);
 		if (parser->done) break;
 
+		if (!strcmp(str, "")) {
+			//empty string, force moving to next char
+			if (parser->line_pos<parser->line_size) parser->line_pos++;
+		}
 		/*X3D specific things (ignored for now)*/
-		if (!strcmp(str, "PROFILE")) gf_bt_force_line(parser);
+		else if (!strcmp(str, "PROFILE")) gf_bt_force_line(parser);
 		else if (!strcmp(str, "COMPONENT")) gf_bt_force_line(parser);
 		else if (!strcmp(str, "META")) gf_bt_force_line(parser);
 		else if (!strcmp(str, "IMPORT") || !strcmp(str, "EXPORT")) {
@@ -3458,8 +3474,8 @@
 				if (init_com) init_com->node = node;
 				else if (parser->load->flags & GF_SM_LOAD_CONTEXT_READY) {
 					GF_Command *com = gf_sg_command_new(parser->load->scene_graph, GF_SG_SCENE_REPLACE);
-					assert(!parser->bifs_au);
-					assert(parser->bifs_es);
+					gf_assert(!parser->bifs_au);
+					gf_assert(parser->bifs_es);
 					parser->bifs_au = gf_sm_stream_au_new(parser->bifs_es, 0, 0, 1);
 					gf_list_add(parser->bifs_au->commands, com);
 					com->node = node;

gpac-2.2.1.tar.gz/src/scene_manager/loader_svg.c -> gpac-2.4.0.tar.gz/src/scene_manager/loader_svg.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre, Cyril Concolato
- *			Copyright (c) Telecom ParisTech 2000-2022
+ *			Copyright (c) Telecom ParisTech 2000-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / Scene Management sub-project
@@ -567,8 +567,11 @@
 				}
 			}
 		}
-		assert(par);
-		gf_node_dom_listener_add((GF_Node *)par, (GF_Node *) listener);
+		if (par) {
+			gf_node_dom_listener_add((GF_Node *)par, (GF_Node *) listener);
+		} else {
+			gf_assert(0);
+		}
 		gf_list_rem(parser->deferred_listeners, i);
 		i--;
 		count--;
@@ -605,9 +608,12 @@
 		}
 	}
 	if (parser->load->type == GF_SM_LOAD_XSR) {
-		assert(parser->command);
-		assert(parser->command->tag == GF_SG_LSR_NEW_SCENE);
-		parser->command->node = (GF_Node *)root_svg;
+		if (parser->command) {
+			gf_assert(parser->command->tag == GF_SG_LSR_NEW_SCENE);
+			parser->command->node = (GF_Node *)root_svg;
+		} else {
+			gf_assert(0);
+		}
 	}
 	gf_sg_set_root_node(parser->load->scene_graph, (GF_Node *)root_svg);
 	parser->has_root = 1;
@@ -854,10 +860,13 @@
 			if (gf_svg_is_animation_tag(tag)) {
 				/* For xlink:href in animation elements,
 				we try to locate the target of the xlink:href to determine the type of values to be animated */
-				assert(anim);
-				anim->target_id = gf_strdup(att->value);
-				/*The target may be NULL, if it has not yet been parsed, we will try to resolve it later on */
-				anim->target = (SVG_Element *) gf_sg_find_node_by_name(parser->load->scene_graph, anim->target_id + 1);
+				if (anim) {
+					anim->target_id = gf_strdup(att->value);
+					/*The target may be NULL, if it has not yet been parsed, we will try to resolve it later on */
+					anim->target = (SVG_Element *) gf_sg_find_node_by_name(parser->load->scene_graph, anim->target_id + 1);
+				} else {
+					gf_assert(0);
+				}
 				continue;
 			} else {
 				/* For xlink:href attribute on elements other than animation elements,
@@ -1643,7 +1652,10 @@
 
 		if ((parser->load->type==GF_SM_LOAD_XSR) && !parser->laser_au && !cond) {
 			if (parser->load->flags & GF_SM_LOAD_CONTEXT_READY) {
-				assert(parser->laser_es);
+				if (!parser->laser_es) {
+					svg_report(parser, GF_NON_COMPLIANT_BITSTREAM, NULL);
+					return;
+				}
 				parser->laser_au = gf_sm_stream_au_new(parser->laser_es, 0, 0, GF_FALSE);
 				if (!parser->laser_au) {
 					svg_report(parser, GF_OUT_OF_MEM, NULL);
@@ -1759,8 +1771,8 @@
 				field->field_ptr = &field->new_node;
 			}
 		} else {
-			assert(parser->command->tag==GF_SG_LSR_NEW_SCENE);
-			assert(gf_node_get_tag((GF_Node *)elt) == TAG_SVG_svg);
+			gf_assert(parser->command->tag==GF_SG_LSR_NEW_SCENE);
+			gf_assert(gf_node_get_tag((GF_Node *)elt) == TAG_SVG_svg);
 			if(!parser->command->node)
 				parser->command->node = (GF_Node *)elt;
 		}

gpac-2.2.1.tar.gz/src/scene_manager/loader_xmt.c -> gpac-2.4.0.tar.gz/src/scene_manager/loader_xmt.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2021
+ *			Copyright (c) Telecom ParisTech 2000-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / Scene Management sub-project
@@ -259,7 +259,10 @@
 	else ID = 0;
 
 	/*write OD_ID*/
-	assert(url->count);
+	if (!url->count) {
+		gf_assert(0);
+		return;
+	}
 	i = url->count - 1;
 	url->valsi.OD_ID = 0;
 	url->vals->OD_ID = ID;
@@ -532,7 +535,7 @@
 		}
 		if (l->od) {
 			if (!l->ID) l->ID = l->od->objectDescriptorID;
-			assert(l->ID == l->od->objectDescriptorID);
+			gf_assert(l->ID == l->od->objectDescriptorID);
 		}
 	}
 
@@ -719,11 +722,11 @@
 	}		\
 	while (str0 == ' ') str += 1;	\
 	i = 0;	\
-	while ((stri != ' ') && stri) {	\
+	while ((stri != ' ') && stri && i<100) {	\
 		valuei = stri;			\
 		i++;				\
 	}					\
-	valuei = 0;	\
+	valueMIN(i, 99) = 0;	\
 	while ((stri == ' ') && stri) i++;
 
 static u32 xmt_parse_int(GF_XMTParser *parser, const char *name, SFInt32 *val, char *a_value)
@@ -832,7 +835,10 @@
 	res = xmt_parse_string(parser, name, &sfstr, is_mf, a_value);
 	if (parser->last_error) return res;
 
-	assert(val->count);
+	if (!val->count) {
+		gf_assert(0);
+		return 0;
+	}
 	idx = val->count - 1;
 	if (val->valsidx.url) gf_free(val->valsidx.url);
 	val->valsidx.url = sfstr.buffer;
@@ -1873,8 +1879,11 @@
 			gf_node_list_add_child_last( (GF_ChildNodeItem **)container.far_ptr, node, &parent->last);
 			gf_node_register(node, parent->node);
 		}
-		assert(parent->node);
-		gf_node_changed(parent->node, NULL);
+		if (parent->node)
+			gf_node_changed(parent->node, NULL);
+		else {
+			gf_assert(0);
+		}
 	}
 
 	if (!parser->parsing_proto && (tag || proto) )
@@ -2071,8 +2080,7 @@
 	if (!strcmp(name, "repField")) {
 		char *fieldName = NULL;
 		char *fieldValue = NULL;
-		assert(parser->command);
-		if (!parser->command->node) return;
+		if (!parser->command || !parser->command->node) return;
 		for (i=0; i<nb_attributes; i++) {
 			GF_XMLAttribute *att = (GF_XMLAttribute *) &attributesi;
 			if (!att->value || !strlen(att->value)) continue;
@@ -2110,8 +2118,7 @@
 	if (!strcmp(name, "repValue")) {
 		s32 position = -1;
 		char *fieldValue = NULL;
-		assert(parser->command);
-		if (!parser->command->node) return;
+		if (!parser->command || !parser->command->node) return;
 		for (i=0; i<nb_attributes; i++) {
 			GF_XMLAttribute *att = (GF_XMLAttribute *) &attributesi;
 			if (!att->value || !strlen(att->value)) continue;
@@ -2705,7 +2712,7 @@
 			else if ((parser->doc_type == 3) && !strcmp(name, "head")) parser->state = XMT_STATE_BODY;
 		}
 		else if (parser->state == XMT_STATE_ELEMENTS) {
-			assert((parser->doc_type != 1) || parser->command);
+			gf_assert((parser->doc_type != 1) || parser->command);
 			if (!strcmp(name, "Replace") || !strcmp(name, "Insert") || !strcmp(name, "Delete")) {
 				parser->command = NULL;
 				parser->state = XMT_STATE_COMMANDS;
@@ -2849,7 +2856,10 @@
 			if (parser->doc_type == 1) {
 				GF_CommandField *inf;
 				Bool single_node = 0;
-				assert(parser->command);
+				if (!parser->command) {
+					gf_assert(0);
+					return;
+				}
 				switch (parser->command->tag) {
 				case GF_SG_SCENE_REPLACE:
 					if (parser->parsing_proto) {

gpac-2.2.1.tar.gz/src/scene_manager/scene_dump.c -> gpac-2.4.0.tar.gz/src/scene_manager/scene_dump.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2022
+ *			Copyright (c) Telecom ParisTech 2000-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / Scene Management sub-project
@@ -759,7 +759,7 @@
 		return;
 	case GF_SG_VRML_MFNODE:
 		list = * ((GF_ChildNodeItem **) field.far_ptr);
-		assert( list );
+		gf_assert( list );
 		sdump->indent++;
 		while (list) {
 			gf_dump_vrml_node(sdump, list->node, 1, NULL);
@@ -858,7 +858,7 @@
 		}
 #endif
 		list = * ((GF_ChildNodeItem **) field.far_ptr);
-		assert(list);
+		gf_assert(list);
 		if (!sdump->XMLDump || !sdump->X3DDump) StartList(sdump, field.name);
 		sdump->indent++;
 		while (list) {
@@ -2909,7 +2909,7 @@
 			break;
 		case GF_SG_SCENE_REPLACE:
 			/*we don't support replace scene in conditional*/
-			assert(!sdump->current_com_list);
+			gf_assert(!sdump->current_com_list);
 			sdump->current_com_list = comList;
 			e = DumpSceneReplace(sdump, com);
 			sdump->current_com_list = NULL;
@@ -3396,7 +3396,7 @@
 	}
 	/*this happens when converting from xmt to bt*/
 	if (!au->timing) {
-		assert(au->owner->timeScale);
+		gf_assert(au->owner->timeScale);
 		au->timing = (u64) (au->timing_sec * au->owner->timeScale);
 	}
 
@@ -3430,7 +3430,7 @@
 	GF_Err e;
 	GF_List *sample_list;
 	Bool first_par;
-	u32 i, j, indent, num_scene, num_od, first_bifs, num_tracks;
+	u32 i, j, indent, num_scene, num_od, first_bifs;
 	Double time;
 	GF_SceneDumper *dumper;
 	GF_StreamContext *sc;
@@ -3440,7 +3440,6 @@
 	sample_list = gf_list_new();
 
 	num_scene = num_od = 0;
-	num_tracks = 0;
 	indent = 0;
 	dumper = gf_sm_dumper_new(ctx->scene_graph, rad_name, is_final_name, ' ', dump_mode);
 	e = GF_OK;
@@ -3451,11 +3450,9 @@
 		switch (sc->streamType) {
 		case GF_STREAM_SCENE:
 			num_scene ++;
-			num_tracks ++;
 			break;
 		case GF_STREAM_OD:
 			num_od ++;
-			num_tracks ++;
 			break;
 		default:
 			continue;

gpac-2.2.1.tar.gz/src/scene_manager/scene_engine.c -> gpac-2.4.0.tar.gz/src/scene_manager/scene_engine.c Changed

@@ -2,7 +2,7 @@
  *					GPAC Multimedia Framework
  *
  *			Authors: Jean Le Feuvre, Cyril Concolato
- *			Copyright (c) Telecom ParisTech 2000-2022
+ *			Copyright (c) Telecom ParisTech 2000-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / ISO Media File Format sub-project
@@ -395,12 +395,16 @@
 
 	/* Then, if compression is asked, we do it */
 	buffer_len = (u32)fsize;
-	assert(fsize < 0x80000000);
+	if (fsize >= 0x80000000) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_SCENE, ("DIMS unit too big\n"));
+		e = GF_NOT_SUPPORTED;
+		goto exit;
+	}
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_SCENE, ("SceneEngine Sending DIMS data - sizes: raw (%d)", buffer_len));
 	if (compress_dims) {
 #ifndef GPAC_DISABLE_ZLIB
 		dims_header |= GF_DIMS_UNIT_C;
-		e = gf_gz_compress_payload(&buffer, buffer_len, &buffer_len);
+		e = gf_gz_compress_payload_ex(&buffer, buffer_len, &buffer_len, 0, GF_FALSE, NULL, GF_TRUE);
 		GF_LOG(GF_LOG_DEBUG, GF_LOG_SCENE, ("/ compressed (%d)", buffer_len));
 		if (e) goto exit;
 #else

gpac-2.2.1.tar.gz/src/scene_manager/scene_manager.c -> gpac-2.4.0.tar.gz/src/scene_manager/scene_manager.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2012
+ *			Copyright (c) Telecom ParisTech 2000-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / Scene Management sub-project
@@ -409,7 +409,7 @@
 				carousel_au = gf_sm_stream_au_new(aggregate_on_stream, 0, 0, 1);
 			} else {
 				/* assert we already performed aggregation */
-				assert(gf_list_count(aggregate_on_stream->AUs)==1);
+				gf_assert(gf_list_count(aggregate_on_stream->AUs)==1);
 				carousel_au = gf_list_get(aggregate_on_stream->AUs, 0);
 			}
 			carousel_commands = carousel_au->commands;
@@ -488,8 +488,11 @@
 						*/
 						default:
 							/*check if we can directly store the command*/
-							assert(carousel_commands);
-							store = store_or_aggregate(sc, com, carousel_commands, &has_modif);
+							if (carousel_commands)
+								store = store_or_aggregate(sc, com, carousel_commands, &has_modif);
+							else {
+								gf_assert(0);
+							}
 							break;
 						}
 					}

gpac-2.2.1.tar.gz/src/scene_manager/swf_bifs.c -> gpac-2.4.0.tar.gz/src/scene_manager/swf_bifs.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2012
+ *			Copyright (c) Telecom ParisTech 2000-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / Scene Management sub-project
@@ -470,7 +470,7 @@
 	}
 
 
-	assert(srec->path->nbType);
+	gf_assert(srec->path->nbType);
 
 	pt_idx = 0;
 	for (i=0; i<srec->path->nbType; i++) {
@@ -914,7 +914,7 @@
 					dx += gr->dxj;
 					continue;
 				}
-				assert((gf_node_get_tag(gl->geometry)==TAG_MPEG4_Curve2D) || (gf_node_get_tag(gl->geometry)==TAG_MPEG4_XCurve2D));
+				gf_assert((gf_node_get_tag(gl->geometry)==TAG_MPEG4_Curve2D) || (gf_node_get_tag(gl->geometry)==TAG_MPEG4_XCurve2D));
 
 				gl_par = (M_Transform2D *) s2b_new_node(read, TAG_MPEG4_Transform2D);
 				gl->appearance = s2b_get_appearance(read, (GF_Node *) gl, gr->col, 0, 0);
@@ -1298,7 +1298,7 @@
 	ID = read->load->ctx->max_node_id;
 	gf_node_set_id(n, ID, szDEF);
 	par = gf_sg_find_node_by_name(read->load->scene_graph, "DICTIONARY");
-	assert(par);
+	gf_assert(par);
 	gf_node_list_add_child(&((M_Switch *)par)->choice, n);
 	gf_node_register(n, par);
 	par = gf_sg_find_node_by_name(read->load->scene_graph, "Shape0");
@@ -1968,11 +1968,11 @@
 	return GF_OK;
 }
 
-static void swf_bifs_finalize(SWFReader *read)
+static void swf_bifs_finalize(SWFReader *read, Bool is_destroy)
 {
 	u32 i, count;
-
-	swf_bifs_end_of_clip(read);
+	if (!is_destroy)
+		swf_bifs_end_of_clip(read);
 
 	while (gf_list_count(read->buttons)) {
 		S2BBtnRec *btnrec = gf_list_get(read->buttons, 0);

gpac-2.2.1.tar.gz/src/scene_manager/swf_parse.c -> gpac-2.4.0.tar.gz/src/scene_manager/swf_parse.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2022
+ *			Copyright (c) Telecom ParisTech 2000-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / Scene Management sub-project
@@ -98,9 +98,16 @@
 	uLongf destLen;
 	char *src, *dst;
 
-	assert(gf_bs_get_size(read->bs)-8 < (u64)1<<31); /*must fit within 32 bits*/
 	size = (u32) gf_bs_get_size(read->bs)-8;
+	if (gf_bs_get_size(read->bs) - 8 >= (u64)1<<31) {
+		gf_bs_del(read->bs);
+		read->bs = NULL;
+		return;
+	}
 	dst_size = read->length;
+	if (dst_size < 8) {
+		return;
+	}
 	src = gf_malloc(sizeof(char)*size);
 	dst = gf_malloc(sizeof(char)*dst_size);
 	memset(dst, 0, sizeof(char)*8);
@@ -178,37 +185,17 @@
 
 static u32 swf_get_32(SWFReader *read)
 {
-	u32 val, res;
-	val = swf_read_int(read, 32);
-	res = (val&0xFF);
-	res <<=8;
-	res |= ((val>>8)&0xFF);
-	res<<=8;
-	res |= ((val>>16)&0xFF);
-	res<<=8;
-	res|= ((val>>24)&0xFF);
-	return res;
+	return gf_bs_read_u32_le(read->bs);
 }
 
 static u16 swf_get_16(SWFReader *read)
 {
-	u16 val, res;
-	val = swf_read_int(read, 16);
-	res = (val&0xFF);
-	res <<=8;
-	res |= ((val>>8)&0xFF);
-	return res;
+	return gf_bs_read_u16_le(read->bs);
 }
 
 static s16 swf_get_s16(SWFReader *read)
 {
-	s16 val;
-	u8 v1;
-	v1 = swf_read_int(read, 8);
-	val = swf_read_sint(read, 8);
-	val = (val<<8)&0xFF00;
-	val |= (v1&0xFF);
-	return val;
+	return (s16) gf_bs_read_u16_le(read->bs);
 }
 
 static u32 swf_get_color(SWFReader *read)
@@ -333,6 +320,11 @@
 		name = szName;
 	}
 	while (1) {
+		if (i>=read->size) {
+			read->ioerr = GF_NON_COMPLIANT_BITSTREAM;
+			nameread->size ? read->size-1 : 0 = 0;
+			break;
+		}
 		namei = swf_read_int(read, 8);
 		if (!namei) break;
 		i++;
@@ -536,20 +528,29 @@
 		typesj = path->typespath->nbType - i - 1;
 		switch (typesj) {
 		case 2:
-			assert(ptj<=path->nbPts-2);
+			if (ptj>path->nbPts-2) {
+				gf_assert(0);
+				break;
+			}
 			ptsptj = path->ptspti;
 			ptsptj+1 = path->ptspti-1;
 			pti-=2;
 			ptj+=2;
 			break;
 		case 1:
-			assert(ptj<=path->nbPts-1);
+			if(ptj>path->nbPts-1) {
+				gf_assert(0);
+				break;
+			}
 			ptsptj = path->ptspti;
 			pti--;
 			ptj++;
 			break;
 		case 0:
-			assert(ptj<=path->nbPts-1);
+			if (ptj>path->nbPts-1) {
+				gf_assert(0);
+				break;
+			}
 			ptsptj = path->ptspti;
 			pti--;
 			ptj++;
@@ -686,7 +687,7 @@
 						idx += 1;
 						break;
 					default:
-						assert(0);
+						gf_assert(0);
 						break;
 					}
 				}
@@ -718,7 +719,7 @@
 						idx += 1;
 						break;
 					default:
-						assert(0);
+						gf_assert(0);
 						break;
 					}
 				}
@@ -1111,7 +1112,6 @@
 			switch (action_code) {
 			/* SWF 3 Action Model */
 			case 0x81: /* goto frame */
-				assert (length == 2);
 				act.type = GF_SWF_AS3_GOTO_FRAME;
 				act.frame_number = swf_get_16(read);
 				read->action(read, &act);
@@ -1121,8 +1121,8 @@
 				act.url = swf_get_string(read);
 				act.target = swf_get_string(read);
 				read->action(read, &act);
-				gf_free(act.url);
-				gf_free(act.target);
+				if (act.url) gf_free(act.url);
+				if (act.target) gf_free(act.target);
 				break;
 			/* next frame */
 			case 0x04:
@@ -1144,7 +1144,6 @@
 				DO_ACT(GF_SWF_AS3_STOP_SOUNDS)
 			/* wait for frame */
 			case 0x8A:
-				assert (length == 3);
 				act.type = GF_SWF_AS3_WAIT_FOR_FRAME;
 				act.frame_number = swf_get_16(read);
 				skip_actions = swf_read_int(read, 8);
@@ -1155,14 +1154,14 @@
 				act.type = GF_SWF_AS3_SET_TARGET;
 				act.target = swf_get_string(read);
 				read->action(read, &act);
-				gf_free(act.target);
+				if (act.target) gf_free(act.target);
 				break;
 			/* goto label */
 			case 0x8C:
 				act.type = GF_SWF_AS3_GOTO_LABEL;
 				act.target = swf_get_string(read);
 				read->action(read, &act);
-				gf_free(act.target);
+				if (act.target) gf_free(act.target);
 				break;
 			default:
 //				swf_report(read, GF_OK, "Skipping unsupported action %x", action_code);
@@ -1170,6 +1169,8 @@
 				break;
 			}
 		}
+		if (gf_bs_is_overflow(read->bs))
+			return GF_NON_COMPLIANT_BITSTREAM;
 		action_code = swf_read_int(read, 8);
 	}
 #undef DO_ACT
@@ -1209,6 +1210,7 @@
 		else gf_cmx_init(&rec->cmx);
 		gf_bs_align(read->bs);
 		button.count++;
+		if (button.count>=40) return GF_NON_COMPLIANT_BITSTREAM;
 	}
 	read->define_button(read, &button);
 	if (revision==0) {
@@ -1429,7 +1431,7 @@
 	ft->glyphs = gf_list_new();
 	ft->fontID = swf_get_16(read);
 	e = GF_OK;
-
+	gf_list_add(read->fonts, ft);
 
 	if (revision==0) {
 		start = swf_get_file_pos(read);
@@ -1437,7 +1439,7 @@
 		count = swf_get_16(read);
 		ft->nbGlyphs = count / 2;
 		offset_table = (u32*)gf_malloc(sizeof(u32) * ft->nbGlyphs);
-		offset_table0 = 0;
+		if (ft->nbGlyphs) offset_table0 = 0;
 		for (i=1; i<ft->nbGlyphs; i++) offset_tablei = swf_get_16(read);
 
 		for (i=0; i<ft->nbGlyphs; i++) {
@@ -1529,8 +1531,6 @@
 			}
 		}
 	}
-
-	gf_list_add(read->fonts, ft);
 	return GF_OK;
 }
 
@@ -1764,13 +1764,6 @@
 	read->display_list = gf_list_new();
 
 	e = read->define_sprite(read, frame_count);
-	if (e) return e;
-
-	/*close sprite soundStream*/
-	swf_delete_sound_stream(read);
-	/*restore sound stream*/
-	read->sound_stream = snd;
-	read->max_depth = prev_depth;
 
 	while (gf_list_count(read->display_list)) {
 		DispShape *s = (DispShape *)gf_list_get(read->display_list, 0);
@@ -1780,6 +1773,13 @@
 	gf_list_del(read->display_list);
 	read->display_list = prev_dlist;
 
+	if (e) return e;
+
+	/*close sprite soundStream*/
+	/*restore sound stream*/
+	read->sound_stream = snd;
+	read->max_depth = prev_depth;
+
 	read->current_frame = prev_frame;
 	read->current_sprite_id = prev_sprite;
 
@@ -1852,6 +1852,7 @@
 		return gf_list_add(read->sounds, snd);
 	}
 	case 3:
+	default:
 		swf_report(read, GF_NOT_SUPPORTED, "Unrecognized sound format");
 		gf_free(snd);
 		break;
@@ -2092,7 +2093,7 @@
 	if (version!=3)
 		file = gf_fopen(szName, "wb");
 
-	if (version==1 && read->jpeg_hdr_size) {
+	if (version==1 && read->jpeg_hdr_size >= 2) {
 		/*remove JPEG EOI*/
 		if (gf_fwrite(read->jpeg_hdr, read->jpeg_hdr_size-2, file)!=read->jpeg_hdr_size-2)
 			return GF_IO_ERR;
@@ -2138,6 +2139,7 @@
 		char *dst, *raw;
 		u32 codecid;
 		u32 osize, w, h, j, pf;
+		uLongf destLen;
 		GF_BitStream *bs;
 
 		/*decompress jpeg*/
@@ -2163,9 +2165,10 @@
 
 		osize = w*h;
 		dst = gf_malloc(sizeof(char)*osize);
-		uncompress((Bytef *) dst, (uLongf *) &osize, buf, AlphaPlaneSize);
+		destLen = (uLongf)osize;
+		uncompress((Bytef *) dst, &destLen, buf, AlphaPlaneSize);
 		/*write alpha channel*/
-		for (j=0; j<osize; j++) {
+		for (j=0; j<(u32)destLen; j++) {
 			raw4*j + 3 = dstj;
 		}
 		gf_free(dst);
@@ -2179,7 +2182,7 @@
 
 		osize = w*h*4;
 		buf = gf_realloc(buf, sizeof(char)*osize);
-		gf_img_png_enc(raw, w, h, h*4, GF_PIXEL_RGBA, (char *)buf, &osize);
+		gf_img_png_enc(raw, w, h, w*4, GF_PIXEL_RGBA, (char *)buf, &osize);
 
 		file = gf_fopen(szName, "wb");
 		if (gf_fwrite(buf, osize, file)!=osize) e = GF_IO_ERR;
@@ -2411,15 +2414,17 @@
 	diff = pos + read->size;
 	gf_set_progress("SWF Parsing", pos, read->length);
 
+	read->ioerr = GF_OK;
 	e = swf_process_tag(read);
 	swf_align(read);
+	if (!e) e = read->ioerr;
 
 	diff -= swf_get_file_pos(read);
 	if (diff<0) {
 		swf_report(read, GF_IO_ERR, "tag %s over-read of %d bytes (size %d)", swf_get_tag_name(read->tag), -1*diff, read->size);
 		return GF_IO_ERR;
 	} else {
-		swf_read_int(read, diff*8);
+		gf_bs_skip_bytes(read->bs, diff);
 	}
 
 
@@ -2488,7 +2493,7 @@
 
 	if (e==GF_EOS) {
 		if (read->finalize)
-			read->finalize(read);
+			read->finalize(read, GF_FALSE);
 		e = GF_OK;
 	}
 	if (!e) {
@@ -2509,6 +2514,10 @@
 	gf_bs_del(read->bs);
 	if (read->mem) gf_free(read->mem);
 
+	if (read->finalize) {
+		read->finalize(read, GF_TRUE);
+	}
+
 	while (gf_list_count(read->display_list)) {
 		DispShape *s = (DispShape *)gf_list_get(read->display_list, 0);
 		gf_list_rem(read->display_list, 0);
@@ -2539,6 +2548,7 @@
 
 	if (read->jpeg_hdr) gf_free(read->jpeg_hdr);
 	if (read->localPath) gf_free(read->localPath);
+
 	gf_fclose(read->input);
 	gf_free(read->inputName);
 	gf_free(read);
@@ -2620,6 +2630,7 @@
 	/*if compressed decompress the whole file*/
 	if (sig0 == 'C') {
 		swf_init_decompress(read);
+		if (!read->bs) return GF_NON_COMPLIANT_BITSTREAM;
 	}
 
 	swf_get_rec(read, &rc);
@@ -2630,6 +2641,7 @@
 	read->frame_rate = swf_get_16(read)>>8;
 	read->frame_count = swf_get_16(read);
 	GF_LOG(GF_LOG_INFO, GF_LOG_PARSER, ("SWF Import - Scene Size %gx%g - %d frames @ %d FPS\n", read->width, read->height, read->frame_count, read->frame_rate));
+	if (!read->frame_rate) read->frame_rate = 1;
 	return GF_OK;
 }
 
@@ -2658,6 +2670,11 @@
 #endif
 
 	read = gf_swf_reader_new(load->localPath, load->fileName);
+	if (!read) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("SWF Loader - Error opening file %s\n", load->fileName));
+		e = GF_IO_ERR;
+		goto exit;
+	}
 	read->load = load;
 	read->flags = load->swf_import_flags;
 	read->flat_limit = FLT2FIX(load->swf_flatten_limit);

gpac-2.2.1.tar.gz/src/scene_manager/swf_svg.c -> gpac-2.4.0.tar.gz/src/scene_manager/swf_svg.c Changed

gpac-2.2.1.tar.gz/src/scene_manager/text_to_bifs.c -> gpac-2.4.0.tar.gz/src/scene_manager/text_to_bifs.c Changed

gpac-2.2.1.tar.gz/src/scenegraph/base_scenegraph.c -> gpac-2.4.0.tar.gz/src/scenegraph/base_scenegraph.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2022
+ *			Copyright (c) Telecom ParisTech 2000-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / Scene Graph sub-project
@@ -506,10 +506,6 @@
 
 #endif /*GPAC_DISABLE_VRML*/
 
-#ifndef GPAC_DISABLE_SVG
-//	assert(gf_list_count(sg->xlink_hrefs) == 0);
-#endif
-
 	while (gf_list_count(sg->ns)) {
 		GF_XMLNS *ns = gf_list_get(sg->ns, 0);
 		gf_list_rem(sg->ns, 0);
@@ -713,7 +709,7 @@
 #endif
 
 	/*unregister the instance*/
-	assert(pNode->sgprivate->num_instances);
+	gf_assert(pNode->sgprivate->num_instances);
 	pNode->sgprivate->num_instances -= 1;
 
 	/*this is just an instance removed*/
@@ -727,7 +723,7 @@
 		return GF_OK;
 	}
 
-	assert(pNode->sgprivate->parents==NULL);
+	gf_assert(pNode->sgprivate->parents==NULL);
 
 	if (pSG) {
 		/*if def, remove from sg def table*/
@@ -1078,7 +1074,7 @@
 #ifdef GF_CYCLIC_TRAVERSE_ON
 		if (node->sgprivate->flags & GF_NODE_IN_TRAVERSE) return;
 		node->sgprivate->flags |= GF_NODE_IN_TRAVERSE;
-		assert(node->sgprivate->flags);
+		gf_assert(node->sgprivate->flags);
 #endif
 		GF_LOG(GF_LOG_DEBUG, GF_LOG_SCENE, ("SceneGraph Traversing node %s (ID %s)\n", gf_node_get_class_name(node) , gf_node_get_name(node) ));
 		node->sgprivate->UserCallback(node, renderStack, 0);
@@ -1171,7 +1167,7 @@
 {
 	GF_ChildNodeItem *child;
 
-	assert(node);
+	gf_assert(node);
 	child = ((GF_ParentNode *)node)->children;
 	while (child) {
 		gf_node_traverse(child->node, renderStack);
@@ -1263,7 +1259,7 @@
 GF_EXPORT
 u32 gf_node_get_tag(GF_Node*p)
 {
-	assert(p);
+	gf_assert(p);
 	return p->sgprivate->tag;
 }
 GF_EXPORT
@@ -1271,7 +1267,7 @@
 {
 	NodeIDedItem *reg_node;
 	GF_SceneGraph *sg;
-	assert(p);
+	gf_assert(p);
 	if (!(p->sgprivate->flags & GF_NODE_IS_DEF)) return 0;
 	sg = p->sgprivate->scenegraph;
 #ifndef GPAC_DISABLE_VRML
@@ -1313,7 +1309,7 @@
 {
 	GF_SceneGraph *sg;
 	NodeIDedItem *reg_node;
-	assert(p);
+	gf_assert(p);
 	if (!(p->sgprivate->flags & GF_NODE_IS_DEF)) {
 		*id = 0;
 		return NULL;
@@ -1340,19 +1336,19 @@
 GF_EXPORT
 void *gf_node_get_private(GF_Node*p)
 {
-	assert(p);
+	gf_assert(p);
 	return p->sgprivate->UserPrivate;
 }
 GF_EXPORT
 void gf_node_set_private(GF_Node*p, void *pr)
 {
-	assert(p);
+	gf_assert(p);
 	p->sgprivate->UserPrivate = pr;
 }
 GF_EXPORT
 GF_Err gf_node_set_callback_function(GF_Node *p, void (*TraverseNode)(GF_Node *node, void *render_stack, Bool is_destroy) )
 {
-	assert(p);
+	gf_assert(p);
 	p->sgprivate->UserCallback = TraverseNode;
 	return GF_OK;
 }
@@ -1381,7 +1377,7 @@
 	GF_ChildNodeItem *child, *cur, *prev;
 	u32 cur_pos = 0;
 
-	assert(pos != (u32) -1);
+	gf_assert(pos != (u32) -1);
 
 	child = *list;
 
@@ -1617,7 +1613,7 @@
 #endif
 		gf_free(node->sgprivate->interact);
 	}
-	assert(! node->sgprivate->parents);
+	gf_assert(! node->sgprivate->parents);
 	gf_free(node->sgprivate);
 	gf_free(node);
 }
@@ -1784,7 +1780,7 @@
 void gf_node_init(GF_Node *node)
 {
 	GF_SceneGraph *pSG = node->sgprivate->scenegraph;
-	assert(pSG);
+	gf_assert(pSG);
 	/*no user-defined init, consider the scenegraph is only used for parsing/encoding/decoding*/
 	if (!pSG->NodeCallback) return;
 
@@ -1808,7 +1804,7 @@
 	if (!node) return;
 
 	sg = node->sgprivate->scenegraph;
-	assert(sg);
+	gf_assert(sg);
 
 #ifndef GPAC_DISABLE_VRML
 	/*signal changes in node to JS for MFFields*/
@@ -1916,7 +1912,7 @@
 GF_EXPORT
 u32 gf_node_get_field_count(GF_Node *node)
 {
-	assert(node);
+	gf_assert(node);
 	if (node->sgprivate->tag <= TAG_UndefinedNode) return 0;
 #ifndef GPAC_DISABLE_VRML
 	/*for both MPEG4 & X3D*/
@@ -2038,8 +2034,8 @@
 GF_EXPORT
 GF_Err gf_node_get_field(GF_Node *node, u32 FieldIndex, GF_FieldInfo *info)
 {
-	assert(node);
-	assert(info);
+	gf_assert(node);
+	gf_assert(info);
 	memset(info, 0, sizeof(GF_FieldInfo));
 	info->fieldIndex = FieldIndex;
 
@@ -2072,7 +2068,7 @@
 static GF_Err gf_node_get_field_by_name_enum(GF_Node *node, char *name, GF_FieldInfo *field)
 {
 	u32 i, count;
-	assert(node);
+	gf_assert(node);
 	count = gf_node_get_field_count(node);
 	memset(field, 0, sizeof(GF_FieldInfo));
 	for (i=0; i<count; i++) {
@@ -2238,7 +2234,7 @@
 	else if (!strcmp(name, "http://www.w3.org/2000/svg")) return GF_XMLNS_SVG;
 	else if (!strcmp(name, "urn:mpeg:mpeg4:LASeR:2005")) return GF_XMLNS_LASER;
 	else if (!strcmp(name, "http://www.w3.org/ns/xbl")) return GF_XMLNS_XBL;
-	else if (!strcmp(name, "http://gpac.io/svg-extensions")) return GF_XMLNS_SVG_GPAC_EXTENSION;
+	else if (!strcmp(name, "https://gpac.io/svg-extensions")) return GF_XMLNS_SVG_GPAC_EXTENSION;
 	return GF_XMLNS_UNDEFINED;
 }
 
@@ -2452,7 +2448,7 @@
 
 static GF_Err gf_sg_load_dom_node(GF_SceneGraph *document, GF_XMLNode *n, GF_DOMFullNode *par)
 {
-#ifndef GPAC_DISABLE_VRML
+#if !defined(GPAC_DISABLE_VRML) && !defined(GPAC_DISABLE_SVG)
 	u32 i, count;
 	GF_DOMFullAttribute *prev = NULL;
 	GF_DOMFullNode *node;

gpac-2.2.1.tar.gz/src/scenegraph/commands.c -> gpac-2.4.0.tar.gz/src/scenegraph/commands.c Changed

@@ -335,6 +335,7 @@
 			}
 			/*erase the field item*/
 			else {
+				if (!field.far_ptr) return GF_NON_COMPLIANT_BITSTREAM;
 				if ((inf->pos < 0) || ((u32) inf->pos >= ((GenMFField *) field.far_ptr)->count) ) {
 					inf->pos = ((GenMFField *)field.far_ptr)->count - 1;
 					/*may happen with text and default value*/
@@ -398,6 +399,7 @@
 		if (gf_sg_vrml_get_sf_type(field.fieldType) == GF_SG_VRML_SFNODE) {
 			e = gf_node_replace_child(com->node, (GF_ChildNodeItem **) field.far_ptr, inf->pos, NULL);
 		} else {
+			if (!field.far_ptr) return GF_NON_COMPLIANT_BITSTREAM;
 			if ((inf->pos < 0) || ((u32) inf->pos >= ((GenMFField *) field.far_ptr)->count) ) {
 				inf->pos = ((GenMFField *)field.far_ptr)->count - 1;
 			}
@@ -566,6 +568,7 @@
 			/*erase the field item*/
 			else {
 				u32 sftype;
+				if (!field.far_ptr) return GF_NON_COMPLIANT_BITSTREAM;
 				if ((pos < 0) || ((u32) pos >= ((GenMFField *) field.far_ptr)->count) ) {
 					pos = ((GenMFField *)field.far_ptr)->count - 1;
 					/*may happen with text and default value*/

gpac-2.2.1.tar.gz/src/scenegraph/dom_events.c -> gpac-2.4.0.tar.gz/src/scenegraph/dom_events.c Changed

gpac-2.2.1.tar.gz/src/scenegraph/dom_js.c -> gpac-2.4.0.tar.gz/src/scenegraph/dom_js.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2007-2022
+ *			Copyright (c) Telecom ParisTech 2007-2023
  *			All rights reserved
  *
  *  This file is part of GPAC / Scene Graph sub-project
@@ -654,9 +654,11 @@
 			*target = (*n)->sgprivate->interact->dom_evt;
 		}
 	} else {
+#if !defined(GPAC_DISABLE_SVG) && defined(GPAC_USE_DOWNLOADER)
 		void xhr_get_event_target(JSContext *c, JSValue obj, GF_SceneGraph **sg, GF_DOMEventTarget **target);
 
 		xhr_get_event_target(c, obj, sg, target);
+#endif
 	}
 }
 
@@ -776,7 +778,7 @@
 #endif
 
 	if (vrml_node) {
-		assert(handler->js_data);
+		gf_assert(handler->js_data);
 		handler->js_data->ctx = c;
 #ifndef GPAC_DISABLE_VRML
 		if (vrml_node->sgprivate->tag <= GF_NODE_RANGE_LAST_VRML)
@@ -1898,7 +1900,10 @@
 		/* found a listener for this event, override the handler
 		TODO: FIX this, there may be a listener/handler already set with JS, why overriding ? */
 		gf_node_get_attribute_by_tag(listen, TAG_XMLEV_ATT_handler, GF_FALSE, GF_FALSE, &info);
-		assert(info.far_ptr);
+		if (!info.far_ptr) {
+			gf_assert(0);
+			return;
+		}
 		handler = (SVG_handlerElement *) ((XMLRI*)info.far_ptr)->target;
 		text = (GF_DOMText*)handler->children->node;
 		if (text->sgprivate->tag==TAG_DOMText) {
@@ -1919,13 +1924,15 @@
 	GF_DOMFullAttribute *att = (GF_DOMFullAttribute*)node->attributes;
 	while (att) {
 		if ((att->tag==TAG_DOM_ATT_any) && !strcmp(att->name, attribute_name)) {
-			DOM_String *s;
-			assert(att->data_type == DOM_String_datatype);
-			assert(att->data);
-			s = (DOM_String *) att->data;
-			if ( *s ) gf_free( *s);
-			*s = gf_strdup(attribute_content);
-			dom_node_changed((GF_Node *)node, GF_FALSE, NULL);
+			if ((att->data_type == DOM_String_datatype) && att->data) {
+				DOM_String *s;
+				s = (DOM_String *) att->data;
+				if ( *s ) gf_free( *s);
+				*s = gf_strdup(attribute_content);
+				dom_node_changed((GF_Node *)node, GF_FALSE, NULL);
+			} else {
+				gf_assert(0);
+			}
 			return;
 		}
 		prev = att;

gpac-2.2.1.tar.gz/src/scenegraph/mpeg4_animators.c -> gpac-2.4.0.tar.gz/src/scenegraph/mpeg4_animators.c Changed

gpac-2.2.1.tar.gz/src/scenegraph/qjs_common.h -> gpac-2.4.0.tar.gz/src/scenegraph/qjs_common.h Changed

gpac-2.2.1.tar.gz/src/scenegraph/svg_attributes.c -> gpac-2.4.0.tar.gz/src/scenegraph/svg_attributes.c Changed

gpac-2.2.1.tar.gz/src/scenegraph/svg_js.c -> gpac-2.4.0.tar.gz/src/scenegraph/svg_js.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2005-2019
+ *			Copyright (c) Telecom ParisTech 2005-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / Scene Graph sub-project
@@ -2008,7 +2008,7 @@
 	if ((n->sgprivate->tag>=GF_NODE_RANGE_FIRST_SVG) && (n->sgprivate->tag<=GF_NODE_RANGE_LAST_SVG)) {
 #ifdef GPAC_ENABLE_HTML5_MEDIA
 		if (n->sgprivate->tag == TAG_SVG_video || n->sgprivate->tag == TAG_SVG_audio) {
-			assert(0);
+			gf_assert(0);
 			return html_get_element_class(n);
 		}
 #endif
@@ -2220,7 +2220,9 @@
 	/*initialize DOM core */
 	dom_js_load(scene, scene->svg_js->js_ctx);
 
+#ifdef GPAC_USE_DOWNLOADER
 	qjs_module_init_xhr_global(c, global);
+#endif
 
 	svg_define_udom_exception(scene->svg_js->js_ctx, scene->svg_js->global);
 	JSValue console = JS_NewObject(c);
@@ -2409,7 +2411,7 @@
 	return NULL;
 }
 
-static Bool svg_js_load_script(GF_Node *script, char *file)
+Bool svg_js_load_script(GF_Node *script, char *file)
 {
 	GF_Err e;
 	u8 *jsscript;
@@ -2500,7 +2502,6 @@
 		GF_DownloadManager *dnld_man;
 		GF_JSAPIParam par;
 		char *url;
-		GF_Err e;
 		XMLRI *xmlri = (XMLRI *)href_info.far_ptr;
 
 		/* getting a download manager */
@@ -2519,17 +2520,13 @@
 		if (!strstr(url, "://") || !strnicmp(url, "file://", 7)) {
 			svg_js_load_script(node, url);
 		} else if (dnld_man) {
-			/*fetch the remote script synchronously and load it - cf section on script processing in SVG specs*/
-			GF_DownloadSession *sess = gf_dm_sess_new(dnld_man, url, GF_NETIO_SESSION_NOT_THREADED, NULL, NULL, &e);
-			if (sess) {
-				e = gf_dm_sess_process(sess);
-				if (e==GF_OK) {
-					const char *szCache = gf_dm_sess_get_cache_name(sess);
-					if (!svg_js_load_script(node, (char *) szCache))
-						e = GF_SCRIPT_ERROR;
-				}
-				gf_dm_sess_del(sess);
-			}
+			GF_Err e;
+#ifdef GPAC_USE_DOWNLOADER
+			GF_Err vrml_svg_js_async_load(GF_DownloadManager *dnld_man, char *url, u32 type, GF_Node *script, JSValue *rval);
+			e = vrml_svg_js_async_load(dnld_man, url, 2, node, NULL);
+#else
+			e = GF_NOT_SUPPORTED;
+#endif
 			if (e) {
 				par.info.e = e;
 				par.info.msg = "Cannot fetch script";

gpac-2.2.1.tar.gz/src/scenegraph/svg_types.c -> gpac-2.4.0.tar.gz/src/scenegraph/svg_types.c Changed

gpac-2.2.1.tar.gz/src/scenegraph/vrml_interpolators.c -> gpac-2.4.0.tar.gz/src/scenegraph/vrml_interpolators.c Changed

gpac-2.2.1.tar.gz/src/scenegraph/vrml_js.c -> gpac-2.4.0.tar.gz/src/scenegraph/vrml_js.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2019
+ *			Copyright (c) Telecom ParisTech 2000-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / Scene Graph sub-project
@@ -123,18 +123,18 @@
 		}	\
 		}
 
-#ifndef GPAC_DISABLE_PLAYER
 static Bool ScriptAction(JSContext *c, GF_SceneGraph *scene, u32 type, GF_Node *node, GF_JSAPIParam *param)
 {
+#ifndef GPAC_DISABLE_COMPOSITOR
 	if (!scene) {
 		GF_Node *n = (GF_Node *) JS_GetContextOpaque(c);
 		scene = n->sgprivate->scenegraph;
 	}
 	if (scene->script_action)
 		return scene->script_action(scene->script_action_cbck, type, node, param);
+#endif// GPAC_DISABLE_COMPOSITOR
 	return 0;
 }
-#endif// GPAC_DISABLE_PLAYER
 
 GF_JSClass SFNodeClass;
 #ifndef GPAC_DISABLE_VRML
@@ -171,9 +171,7 @@
 void gf_sg_script_to_node_field(struct JSContext *c, JSValue v, GF_FieldInfo *field, GF_Node *owner, GF_JSField *parent);
 JSValue gf_sg_script_to_qjs_field(GF_ScriptPriv *priv, GF_FieldInfo *field, GF_Node *parent, Bool force_evaluate);
 
-#ifndef GPAC_DISABLE_PLAYER
 static void JSScript_NodeModified(GF_SceneGraph *sg, GF_Node *node, GF_FieldInfo *info, GF_Node *script);
-#endif
 
 
 Bool JSScriptFromFile(GF_Node *node, const char *opt_file, Bool no_complain, JSValue *rval);
@@ -349,8 +347,8 @@
 
 	if (node->sgprivate->interact && node->sgprivate->interact->js_binding && node->sgprivate->interact->js_binding->pf) {
 		field = node->sgprivate->interact->js_binding->pf;
-		assert(JS_IsObject(field->obj));
-		assert(JS_GetOpaque(field->obj, SFNodeClass.class_id)!=NULL);
+		gf_assert(JS_IsObject(field->obj));
+		gf_assert(JS_GetOpaque(field->obj, SFNodeClass.class_id)!=NULL);
 		return field->obj;
 	}
 
@@ -542,7 +540,7 @@
 	ptr = (GF_JSField *) JS_GetOpaque(argv0, SFNodeClass.class_id);
 	if (!ptr) return GF_JS_EXCEPTION(c);
 
-	assert(ptr->field.fieldType==GF_SG_VRML_SFNODE);
+	gf_assert(ptr->field.fieldType==GF_SG_VRML_SFNODE);
 	n1 = * ((GF_Node **)ptr->field.far_ptr);
 	if (!n1) return GF_JS_EXCEPTION(c);
 	n2 = NULL;
@@ -569,7 +567,7 @@
 	if (ptr && JS_IsString(argv3) ) {
 		const char *f2;
 		GF_Route *r;
-		assert(ptr->field.fieldType==GF_SG_VRML_SFNODE);
+		gf_assert(ptr->field.fieldType==GF_SG_VRML_SFNODE);
 		n2 = * ((GF_Node **)ptr->field.far_ptr);
 		if (!n2) return GF_JS_EXCEPTION(c);
 
@@ -684,7 +682,7 @@
 
 	ptr = JS_GetOpaque(argv0, SFNodeClass.class_id);
 	if (!ptr) return GF_JS_EXCEPTION(c);
-	assert(ptr->field.fieldType==GF_SG_VRML_SFNODE);
+	gf_assert(ptr->field.fieldType==GF_SG_VRML_SFNODE);
 
 	if (JS_IsString(argv1) && JS_IsNull(argv2) && JS_IsNull(argv3)) {
 		n1 = * ((GF_Node **)ptr->field.far_ptr);
@@ -704,7 +702,7 @@
 
 	ptr = JS_GetOpaque(argv2, SFNodeClass.class_id);
 	if (!ptr) return GF_JS_EXCEPTION(c);
-	assert(ptr->field.fieldType==GF_SG_VRML_SFNODE);
+	gf_assert(ptr->field.fieldType==GF_SG_VRML_SFNODE);
 	n2 = * ((GF_Node **)ptr->field.far_ptr);
 
 	if (!n1 || !n2) return GF_JS_EXCEPTION(c);
@@ -1228,7 +1226,7 @@
 
 	ptr = (GF_JSField *) JS_GetOpaque(obj, SFNodeClass.class_id);
 	if (!ptr) return GF_JS_EXCEPTION(c);
-	assert(ptr->field.fieldType==GF_SG_VRML_SFNODE);
+	gf_assert(ptr->field.fieldType==GF_SG_VRML_SFNODE);
 	n = * ((GF_Node **)ptr->field.far_ptr);
 	if (!n) return GF_JS_EXCEPTION(c);
 	priv = JS_GetScriptStack(c);
@@ -1244,6 +1242,7 @@
 		JS_FreeCString(c, fieldName);
 		return JS_DupValue(priv->js_ctx, priv->node_getTime_fun);
 	}
+#if !defined(GPAC_DISABLE_SVG)
 	if (!strcmp(fieldName, "addEventListener") || !strcmp(fieldName, "addEventListenerNS")) {
 		JS_FreeCString(c, fieldName);
 		return JS_DupValue(priv->js_ctx, priv->node_addEventListener_fun);
@@ -1252,6 +1251,8 @@
 		JS_FreeCString(c, fieldName);
 		return JS_DupValue(priv->js_ctx, priv->node_removeEventListener_fun);
 	}
+#endif
+
 	/*fieldID indexing*/
 	if (!strnicmp(fieldName, "_field", 6)) {
 		index = atoi(fieldName+6);
@@ -1305,7 +1306,7 @@
 	fieldname = JS_AtomToCString(c, atom);
 	if (!fieldname) return -1;
 
-	assert(ptr->field.fieldType==GF_SG_VRML_SFNODE);
+	gf_assert(ptr->field.fieldType==GF_SG_VRML_SFNODE);
 	n = * ((GF_Node **)ptr->field.far_ptr);
 
 	/*fieldID indexing*/
@@ -2687,7 +2688,7 @@
 	GF_JSField *ptr = (GF_JSField *) JS_GetOpaque(this_val, SFNodeClass.class_id);
 	if (!ptr)
 		return GF_JS_EXCEPTION(c);
-	assert(ptr->field.fieldType==GF_SG_VRML_SFNODE);
+	gf_assert(ptr->field.fieldType==GF_SG_VRML_SFNODE);
 	node = * ((GF_Node **)ptr->field.far_ptr);
 	return gf_sg_js_event_add_listener(c, this_val, argc, argv, node);
 }
@@ -2697,7 +2698,7 @@
 	GF_Node *node;
 	GF_JSField *ptr = (GF_JSField *) JS_GetOpaque(this_val, SFNodeClass.class_id);
 	if (!ptr) return GF_JS_EXCEPTION(c);
-	assert(ptr->field.fieldType==GF_SG_VRML_SFNODE);
+	gf_assert(ptr->field.fieldType==GF_SG_VRML_SFNODE);
 	node = * ((GF_Node **)ptr->field.far_ptr);
 	return gf_sg_js_event_remove_listener(c, this_val, argc, argv, node);
 }
@@ -2835,7 +2836,7 @@
 	}
 	if (jsf->mfvals) {
 		u32 i;
-		assert(jsf->mfvals_count);
+		gf_assert(jsf->mfvals_count);
 		for (i=0; i<jsf->mfvals_count; i++)
     		JS_MarkValue(rt, jsf->mfvalsi, mark_func);
 	}
@@ -3612,7 +3613,7 @@
 	{
 //		GF_ChildNodeItem *f = * ((GF_ChildNodeItem **)field->far_ptr);
 		SETUP_MF_FIELD(MFNodeClass)
-		assert(!jsf->mfvals);
+		gf_assert(!jsf->mfvals);
 		jsf->mfvals_count = 0;
 		/*we don't get the binding until the node is requested, and we don't store it in the MFVals value*/
 		break;
@@ -3627,7 +3628,7 @@
 
 	if (!jsf) {
 		jsf = JS_GetOpaque_Nocheck(obj);
-		assert(jsf);
+		gf_assert(jsf);
 	}
 	//store field associated with object if needed
 	JS_SetOpaque(obj, jsf);
@@ -3638,7 +3639,7 @@
 	if (!parent)
 		return obj;
 
-	assert(jsf->owner);
+	gf_assert(jsf->owner);
 
 	/*obj corresponding to an existing field/node, store it and prevent GC on object*/
 	/*remember the object*/
@@ -3661,7 +3662,7 @@
 	}
 
 	if ( gf_list_find(parent->sgprivate->interact->js_binding->fields, jsf) < 0) {
-		assert(jsf->owner == parent);
+		gf_assert(jsf->owner == parent);
 		gf_list_add(parent->sgprivate->interact->js_binding->fields, jsf);
 	}
 
@@ -3669,7 +3670,7 @@
 		if (gf_list_find(priv->jsf_cache, jsf)<0)
 			gf_list_add(priv->jsf_cache, jsf);
 	} else {
-		assert (gf_list_find(priv->jsf_cache, jsf)>=0);
+		gf_assert (gf_list_find(priv->jsf_cache, jsf)>=0);
 	}
 
 	/*our JS Array object (MFXXX) are always rooted and added to the cache upon construction*/
@@ -3705,7 +3706,7 @@
 	while (gf_list_count(priv->jsf_cache)) {
 		JSValue obj;
 		GF_JSField *jsf = gf_list_pop_back(priv->jsf_cache);
-		assert(jsf);
+		gf_assert(jsf);
 
 		/*				!!! WARNING !!!
 
@@ -3906,7 +3907,6 @@
 	do_js_gc(priv->js_ctx, node);
 }
 
-
 static Bool vrml_js_load_script(M_Script *script, char *file, Bool primary_script, JSValue *rval)
 {
 	char *jsscript;
@@ -3963,6 +3963,84 @@
 	return success;
 }
 
+#endif
+
+#ifndef GPAC_DISABLE_SVG
+Bool svg_js_load_script(GF_Node *script, char *file);
+#endif
+
+typedef struct
+{
+	GF_Node *script;
+	//type: 0: VRML main JS, 1: imported JS from VRML JS, 2: SVG JS
+	u32 type;
+	GF_DownloadSession *sess;
+} AsyncFetcher;
+
+#ifdef GPAC_USE_DOWNLOADER
+void async_script_sess_io(void *usr_cbk, GF_NETIO_Parameter *parameter)
+{
+	AsyncFetcher *as = usr_cbk;
+	GF_Err e=GF_OK;
+	if (parameter->msg_type == GF_NETIO_DATA_TRANSFERED) {
+		const char *szCache = gf_dm_sess_get_cache_name(parameter->sess);
+		if (as->type<=1) {
+#ifndef GPAC_DISABLE_VRML
+			M_Script *script = (M_Script *) as->script;
+			GF_ScriptPriv *priv = (GF_ScriptPriv *) as->script->sgprivate->UserPrivate;
+			JSValue rval;
+			if (!vrml_js_load_script(script, (char *) szCache, (as->type==1) ? 0 : 1, &rval))
+				e = GF_SCRIPT_ERROR;
+			JS_FreeValue(priv->js_ctx, rval);
+#else
+			e = GF_NOT_SUPPORTED;
+#endif
+		} else {
+#ifndef GPAC_DISABLE_SVG
+			if (!svg_js_load_script(as->script, (char *) szCache))
+				e = GF_SCRIPT_ERROR;
+#else
+			e = GF_NOT_SUPPORTED;
+#endif
+		}
+		gf_dm_sess_del(as->sess);
+		gf_free(as);
+	}
+	else if (parameter->msg_type == GF_NETIO_STATE_ERROR) {
+		e = parameter->error;
+		gf_dm_sess_del(as->sess);
+		gf_free(as);
+	}
+	if (e) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_SCRIPT, ("Failed to load script: %s\n", gf_error_to_string(e)));
+	}
+}
+#endif
+
+GF_Err vrml_svg_js_async_load(GF_DownloadManager *dnld_man, char *url, u32 type, GF_Node *script, JSValue *rval)
+{
+#ifdef GPAC_USE_DOWNLOADER
+	AsyncFetcher *as;
+	GF_Err e;
+	if (rval) *rval = JS_UNDEFINED;
+	GF_SAFEALLOC(as, AsyncFetcher);
+	if (!as) return GF_OUT_OF_MEM;
+	//GF_ScriptPriv *priv = (GF_ScriptPriv *) script->sgprivate->UserPrivate;
+	as->script = script;
+	as->type = type;
+	as->sess = gf_dm_sess_new(dnld_man, url, GF_NETIO_SESSION_MEMORY_CACHE, async_script_sess_io, as, &e);
+	if (e) {
+		gf_free(as);
+		return e;
+	}
+	return gf_dm_sess_process(as->sess);
+#else
+	return GF_NOT_SUPPORTED;
+#endif
+}
+
+#ifndef GPAC_DISABLE_VRML
+
 /*fetches each listed URL and attempts to load the script - this is SYNCHRONOUS*/
 Bool JSScriptFromFile(GF_Node *node, const char *opt_file, Bool no_complain, JSValue *rval)
 {
@@ -4008,18 +4086,11 @@
 			if (res) return 1;
 			if (no_complain) return 0;
 		} else {
-			GF_DownloadSession *sess = gf_dm_sess_new(dnld_man, url, GF_NETIO_SESSION_NOT_THREADED, NULL, NULL, &e);
-			if (sess) {
-				e = gf_dm_sess_process(sess);
-				if (e==GF_OK) {
-					const char *szCache = gf_dm_sess_get_cache_name(sess);
-					if (!vrml_js_load_script(script, (char *) szCache, opt_file ? 0 : 1, rval))
-						e = GF_SCRIPT_ERROR;
-				}
-				gf_dm_sess_del(sess);
-			}
+#ifdef GPAC_USE_DOWNLOADER
+			e = vrml_svg_js_async_load(dnld_man, url, opt_file ? 1 : 0, node, rval);
 			gf_free(url);
 			if (!e) return 1;
+#endif
 		}
 	}
 
@@ -4083,7 +4154,10 @@
 	priv->the_event = dom_js_define_event(priv->js_ctx);
 	priv->the_event = JS_DupValue(priv->js_ctx, priv->the_event);
 #endif
+
+#ifdef GPAC_USE_DOWNLOADER
 	qjs_module_init_xhr_global(priv->js_ctx, priv->js_obj);
+#endif
 
 	priv->jsf_cache = gf_list_new();
 
@@ -4160,7 +4234,6 @@
 }
 
 
-#ifndef GPAC_DISABLE_PLAYER
 static void JSScript_NodeModified(GF_SceneGraph *sg, GF_Node *node, GF_FieldInfo *info, GF_Node *script)
 {
 	u32 i;
@@ -4173,7 +4246,7 @@
 
 		for (i=0; i<count; i++) {
 			jsf = gf_list_get(priv->jsf_cache, i);
-			assert(jsf);
+			gf_assert(jsf);
 			if (jsf->node && (jsf->node==node)) {
 				//detach node and its js binding
 				jsf->node = NULL;
@@ -4212,7 +4285,7 @@
 					JS_ObjectDestroyed(JS_GetRuntime(field->js_ctx), obj, field, 1);
 					JS_FreeValue(field->js_ctx, obj);
 					gf_free(field);
-					assert( node->sgprivate->interact->js_binding->pf==NULL);
+					gf_assert( node->sgprivate->interact->js_binding->pf==NULL);
 					//unregister node since we destroyed the binding
 					gf_node_unregister(node, NULL);
 				}
@@ -4275,7 +4348,7 @@
 		}
 	}
 }
-#endif
+
 
 GF_EXPORT
 void gf_sg_handle_dom_event_for_vrml(GF_Node *node, GF_DOM_Event *event, GF_Node *observer)

gpac-2.2.1.tar.gz/src/scenegraph/vrml_proto.c -> gpac-2.4.0.tar.gz/src/scenegraph/vrml_proto.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2012
+ *			Copyright (c) Telecom ParisTech 2000-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / Scene Graph sub-project
@@ -440,8 +440,8 @@
 		/*get target ptr*/
 		gf_node_get_field(node, i, &field);
 
-		assert(field.eventType==field_orig.eventType);
-		assert(field.fieldType==field_orig.fieldType);
+		gf_assert(field.eventType==field_orig.eventType);
+		gf_assert(field.fieldType==field_orig.fieldType);
 
 		/*duplicate it*/
 		switch (field.fieldType) {
@@ -550,7 +550,7 @@
 	GF_Proto *proto;
 	u32 i, count;
 
-	assert(sg);
+	gf_assert(sg);
 
 	/*browse all top-level */
 	i=0;
@@ -654,7 +654,7 @@
 	while ((orig = (GF_Node*)gf_list_enum(proto->node_code, &i))) {
 		/*node is cloned in the new scenegraph and its parent is NULL */
 		node = gf_node_clone(proto_node->sgprivate->scenegraph, orig, NULL, "", 1);
-		assert(node);
+		gf_assert(node);
 
 		/*assign first rendering node*/
 		if (i==1) proto_node->RenderingNode = node;
@@ -695,7 +695,7 @@
 	i=0;
 	while ((route = (GF_Route*)gf_list_enum(proto_node->sgprivate->scenegraph->Routes, &i))) {
 		if (!route->IS_route || !route->ToNode) continue;
-		/*		assert(route->is_setup);
+		/*		gf_assert(route->is_setup);
 				if ((route->FromField.eventType == GF_SG_EVENT_OUT) || (route->FromField.eventType == GF_SG_EVENT_IN) ) continue;
 		*/
 
@@ -883,7 +883,7 @@
 
 	gf_free((char *) inst->proto_name);
 	gf_list_del(inst->node_code);
-	assert(!gf_list_count(inst->scripts_to_load));
+	gf_assert(!gf_list_count(inst->scripts_to_load));
 	gf_list_del(inst->scripts_to_load);
 
 	if (inst->proto_interface && inst->proto_interface->instances) gf_list_del_item(inst->proto_interface->instances, inst);
@@ -1118,7 +1118,7 @@
 
 	i=0;
 	while ((proto_field = (GF_ProtoFieldInterface*)gf_list_enum(proto->proto_interface->proto_fields, &i))) {
-		assert(proto_field);
+		gf_assert(proto_field);
 		switch (code_mode) {
 		case GF_SG_FIELD_CODING_IN:
 			if (proto_field->IN_index == index) {

gpac-2.2.1.tar.gz/src/scenegraph/vrml_route.c -> gpac-2.4.0.tar.gz/src/scenegraph/vrml_route.c Changed

gpac-2.2.1.tar.gz/src/scenegraph/vrml_tools.c -> gpac-2.4.0.tar.gz/src/scenegraph/vrml_tools.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2012
+ *			Copyright (c) Telecom ParisTech 2000-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / Scene Graph sub-project
@@ -261,7 +261,7 @@
 	GF_Proto *proto;
 	u32 i;
 
-	assert(sg);
+	gf_assert(sg);
 
 	/*browse all top-level */
 	i=0;
@@ -708,16 +708,16 @@
 		break;
 	//used only in proto since this field is created by default for regular nodes
 	case GF_SG_VRML_MFNODE:
-		assert(0);
+		gf_assert(0);
 		return;
 	case GF_SG_VRML_MFSCRIPT:
 		gf_sg_mfscript_del( * ((MFScript *) field));
 		break;
 	case GF_SG_VRML_SFSCRIPT:
-		return;
+		break;
 
 	default:
-		assert(0);
+		gf_assert(0);
 		return;
 	}
 	//free pointer
@@ -881,6 +881,8 @@
 GF_EXPORT
 Bool gf_sg_vrml_is_sf_field(u32 FieldType)
 {
+	//special case for AttrRef declared after first MF
+	if (FieldType==GF_SG_VRML_SFATTRREF) return GF_TRUE;
 	return (FieldType<GF_SG_VRML_FIRST_MF);
 }
 
@@ -1129,7 +1131,7 @@
 		gf_sg_mfurl_del( * ((MFURL *) mf));
 		break;
 	case GF_SG_VRML_MFSCRIPT:
-		gf_sg_mfscript_del( * ((MFScript *) mf));	
+		gf_sg_mfscript_del( * ((MFScript *) mf));
 		break;
 	default:
 		if (mffield->array) gf_free(mffield->array);
@@ -1558,7 +1560,7 @@
 GF_EXPORT
 u32 gf_node_get_num_fields_in_mode(GF_Node *Node, u8 IndexMode)
 {
-	assert(Node);
+	gf_assert(Node);
 	if (Node->sgprivate->tag == TAG_ProtoNode) return gf_sg_proto_get_num_fields(Node, IndexMode);
 	else if (Node->sgprivate->tag == TAG_MPEG4_Script)
 		return gf_sg_script_get_num_fields(Node, IndexMode);

gpac-2.2.1.tar.gz/src/utils/Remotery.c -> gpac-2.4.0.tar.gz/src/utils/Remotery.c Changed

@@ -2365,12 +2365,12 @@
         if (result != SOCKET_ERROR)
         {
             // Keep receiving until the peer closes the connection
-            int total = 0;
+            //int total = 0;
             char temp_buf128;
             while (result > 0)
             {
                 result = (int)recv(tcp_socket->socket, temp_buf, sizeof(temp_buf), 0);
-                total += result;
+                //total += result;
             }
         }
 
@@ -3500,6 +3500,7 @@
     MsgID_LogText,
     MsgID_SampleTree,
     MsgID_None,
+    MsgID_SendText,
     MsgID_Force32Bits = 0xFFFFFFFF,
 } MessageID;
 
@@ -4757,6 +4758,7 @@
 
             // Dispatch to message handler
             case MsgID_LogText:
+            case MsgID_SendText:
                 error = Remotery_SendLogTextMessage(rmt, message);
                 break;
             case MsgID_SampleTree:
@@ -5325,6 +5327,27 @@
     return RMT_TRUE;
 }
 
+RMT_API void _rmt_SendText(rmtPStr text)
+{
+    //do not check for sampling enabled here
+    if (g_Remotery == NULL)
+        return;
+
+    ThreadSampler* ts;
+    Message* message;
+    rmtU32 size = (rmtU32) strlen(text);
+
+    Remotery_GetThreadSampler(g_Remotery, &ts);
+
+    // Allocate some space for the line
+    message = rmtMessageQueue_AllocMessage(g_Remotery->mq_to_rmt_thread, size, ts);
+    if (message == NULL)
+        return;
+
+    // Copy the text and commit the message
+    memcpy(message->payload, text, size);
+    rmtMessageQueue_CommitMessage(message, MsgID_SendText);
+}
 
 RMT_API void _rmt_LogText(rmtPStr text)
 {

gpac-2.2.1.tar.gz/src/utils/alloc.c -> gpac-2.4.0.tar.gz/src/utils/alloc.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *          Authors: Romain Bouqueau - Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2010-2018
+ *			Copyright (c) Telecom ParisTech 2010-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / common tools sub-project
@@ -192,9 +192,8 @@
 size_t gpac_allocated_memory = 0;
 size_t gpac_nb_alloc_blocs = 0;
 
-#ifdef _WIN32_WCE
-#define assert(p)
-#endif
+//defs for gf_assert
+#include <gpac/setup.h>
 
 //backtrace not supported on these platforms
 #if defined(GPAC_CONFIG_IOS) || defined(GPAC_CONFIG_ANDROID)
@@ -256,18 +255,22 @@
 		s_backtracebt_idx+len='\n';
 		bt_idx += (len+1);
 	}
-	assert(bt_idx < STACK_PRINT_SIZE*SYMBOL_MAX_SIZE);
+	gf_assert(bt_idx < STACK_PRINT_SIZE*SYMBOL_MAX_SIZE);
 	s_backtracebt_idx-1 = '\0';
 }
 
 #else /*WIN32*/
 
 #define SYMBOL_MAX_SIZE  100
+
+#ifndef GPAC_CONFIG_EMSCRIPTEN
 #include <execinfo.h>
+#endif
 
 /*memory ownership to the caller*/
 static void store_backtrace(char *s_backtrace)
 {
+#ifndef GPAC_CONFIG_EMSCRIPTEN
 	size_t i, size, bt_idx=0;
 	void *stackSTACK_PRINT_SIZE+STACK_FIRST_IDX;
 	char **messages;
@@ -290,9 +293,10 @@
 		bt_idx += (len+1);
 
 	}
-	assert(bt_idx < STACK_PRINT_SIZE*SYMBOL_MAX_SIZE);
+	gf_assert(bt_idx < STACK_PRINT_SIZE*SYMBOL_MAX_SIZE);
 	s_backtracebt_idx-1 = '\0';
 	free(messages);
+#endif
 }
 #endif /*WIN32*/
 
@@ -325,7 +329,6 @@
 	STRDUP(str);
 }
 
-
 static unsigned int nb_calls_alloc = 0;
 static unsigned int nb_calls_calloc = 0;
 static unsigned int nb_calls_realloc = 0;
@@ -336,7 +339,7 @@
 	void *ptr = MALLOC(size);
 	if (!ptr) {
 		gf_memory_log(GF_MEMORY_ERROR, "MemTracker malloc() has returned a NULL pointer\n");
-		assert(0);
+		gf_assert(0);
 	} else {
 		register_address(ptr, size, filename, line);
 	}
@@ -352,7 +355,7 @@
 	void *ptr = CALLOC(num, size_of);
 	if (!ptr) {
 		gf_memory_log(GF_MEMORY_ERROR, "MemTracker calloc() has returned a NULL pointer\n");
-		assert(0);
+		gf_assert(0);
 	} else {
 		register_address(ptr, size, filename, line);
 	}
@@ -393,7 +396,7 @@
 		/*b) The return value is NULL if there is not enough available memory to expand the block to the given size. In this case, the original block is unchanged.*/
 		gf_memory_log(GF_MEMORY_ERROR, "MemTracker realloc() has returned a NULL pointer\n");
 		register_address(ptr, size_prev, filename, line);
-		assert(0);
+		gf_assert(0);
 	} else {
 		register_address(ptr_g, size, filename, line);
 //		gf_memory_log(GF_MEMORY_DEBUG, "MemTracker realloc %3d (instead of %3d) bytes at %p (instead of %p)\n", size, size_prev, ptr_g, ptr);
@@ -457,18 +460,29 @@
 	return gf_mem_strdup_proto(str, filename, line);
 }
 
-MY_GF_EXPORT
-void gf_mem_enable_tracker(unsigned int enable_backtrace)
+void gf_mem_enable_tracker(unsigned int mem_track_type)
 {
+	if (mem_track_type) {
 #ifndef GPAC_MEMORY_TRACKING_DISABLE_STACKTRACE
-    gf_mem_backtrace_enabled = enable_backtrace ? 1 : 0;
-#endif
-	gf_mem_track_enabled = 1;
-    gf_mem_malloc_proto = gf_mem_malloc_tracker;
-	gf_mem_calloc_proto = gf_mem_calloc_tracker;
-	gf_mem_realloc_proto = gf_mem_realloc_tracker;
-	gf_mem_free_proto = gf_mem_free_tracker;
-	gf_mem_strdup_proto = gf_mem_strdup_tracker;
+		gf_mem_backtrace_enabled = (mem_track_type==2) ? 1 : 0;
+#endif
+		gf_mem_track_enabled = 1;
+		gf_mem_malloc_proto = gf_mem_malloc_tracker;
+		gf_mem_calloc_proto = gf_mem_calloc_tracker;
+		gf_mem_realloc_proto = gf_mem_realloc_tracker;
+		gf_mem_free_proto = gf_mem_free_tracker;
+		gf_mem_strdup_proto = gf_mem_strdup_tracker;
+	} else {
+#ifndef GPAC_MEMORY_TRACKING_DISABLE_STACKTRACE
+		gf_mem_backtrace_enabled = 0;
+#endif
+		gf_mem_track_enabled = 0;
+		gf_mem_malloc_proto = gf_mem_malloc_basic;
+		gf_mem_calloc_proto = gf_mem_calloc_basic;
+		gf_mem_realloc_proto = gf_mem_realloc_basic;
+		gf_mem_free_proto = gf_mem_free_basic;
+		gf_mem_strdup_proto = gf_mem_strdup_basic;
+	}
 }
 
 size_t gf_mem_get_stats(unsigned int *nb_allocs, unsigned int *nb_callocs, unsigned int *nb_reallocs, unsigned int *nb_free)
@@ -590,7 +604,7 @@
 {
 	unsigned int hash;
 	if (!*p) *p = (memory_list) CALLOC(HASH_ENTRIES, sizeof(memory_element*));
-	assert(*p);
+	gf_fatal_assert(*p);
 
 	hash = gf_memory_hash(ptr);
 	gf_memory_add_stack(&((*p)hash), ptr, size, filename, line);
@@ -600,7 +614,7 @@
 static int gf_memory_find(memory_list p, void *ptr)
 {
 	unsigned int hash;
-	assert(p);
+	gf_assert(p);
 	if (!p) return 0;
 	hash = gf_memory_hash(ptr);
 	return gf_memory_find_stack(phash, ptr);
@@ -612,7 +626,7 @@
 	unsigned int ret;
 	memory_element **sub_list;
 	if (!*p) *p = (memory_list) CALLOC(HASH_ENTRIES, sizeof(memory_element*));
-	assert(*p);
+	gf_fatal_assert(*p);
 	hash = gf_memory_hash(ptr);
 	sub_list = &((*p)hash);
 	if (!sub_list) return 0;
@@ -650,8 +664,8 @@
 {
 	/*mutex initialization*/
 	if (gpac_allocations_lock == 0) {
-		assert(!memory_add);
-		assert(!memory_rem);
+		gf_assert(!memory_add);
+		gf_assert(!memory_rem);
 		gpac_allocations_lock = (GF_Mutex*)1; /*must be non-null to avoid a recursive infinite call*/
 		gpac_allocations_lock = gf_mx_new("gpac_allocations_lock");
 	}
@@ -704,14 +718,13 @@
 		int i;
 		unsigned int hash = gf_memory_hash(ptr);
 		memory_element *element = memory_remhash;
-		assert(element);
+		gf_assert(element);
 		for (i=1; i<pos; i++)
 			element = element->next;
-		assert(element);
+		gf_assert(element);
 		gf_memory_log(GF_MEMORY_ERROR, "MemTracker the block %p was already freed in:\n", ptr);
 		res = GF_FALSE;
         log_backtrace(GF_MEMORY_ERROR, element);
-//		assert(0);
 	}
 	/*unlock*/
 	gf_mx_v(gpac_allocations_lock);
@@ -733,28 +746,28 @@
 			  than being called by free() before the first allocation occured*/
 			return 1;
 			/*gf_memory_log(GF_MEMORY_ERROR, "MemTracker calling free() before the first allocation occured\n");
-			   assert(0); */
+			   gf_assert(0); */
 		}
 	} else {
 		if (!gf_memory_find(memory_add, ptr)) {
 			int pos;
 			if (!(pos=gf_memory_find(memory_rem, ptr))) {
 				gf_memory_log(GF_MEMORY_ERROR, "MemTracker trying to free a never allocated block (%p)\n", ptr);
-				/* assert(0); */ /*don't assert since this is often due to allocations that occured out of gpac (fonts, etc.)*/
+				/* gf_assert(0); */ /*don't assert since this is often due to allocations that occured out of gpac (fonts, etc.)*/
 			} else {
 				int i;
 				unsigned int hash = gf_memory_hash(ptr);
 				memory_element *element = memory_remhash;
 
-				assert(element);
+				gf_assert(element);
 				for (i=1; i<pos; i++)
 					element = element->next;
-				assert(element);
+				gf_assert(element);
 				gf_memory_log(GF_MEMORY_ERROR, "MemTracker the block %p trying to be deleted in:\n", ptr);
 				gf_memory_log(GF_MEMORY_ERROR, "             file %s at line %d\n", filename, line);
 				gf_memory_log(GF_MEMORY_ERROR, "             was already freed in:\n");
 				log_backtrace(GF_MEMORY_ERROR, element);
-				assert(0);
+				gf_fatal_assert(0);
 			}
 		} else {
 			size = gf_memory_del_item(&memory_add, ptr);
@@ -767,8 +780,8 @@
 
 			/*the allocation list is empty: free the lists to avoid a leak (we should be exiting)*/
 			if (!memory_add) {
-				assert(!gpac_allocated_memory);
-				assert(!gpac_nb_alloc_blocs);
+				gf_assert(!gpac_allocated_memory);
+				gf_assert(!gpac_nb_alloc_blocs);
 
 				/*we destroy the mutex we own, then we return*/
 				gf_mx_del(gpac_allocations_lock);
@@ -814,10 +827,10 @@
 static void gf_memory_log(unsigned int level, const char *fmt, ...)
 {
 	va_list vl;
-	char msg1024;
-	assert(strlen(fmt) < 200);
+	char msg1025;
 	va_start(vl, fmt);
 	vsnprintf(msg, 1024, fmt, vl);
+	msg1024 = 0;
 	GF_LOG(level, GF_LOG_MEMORY, (msg));
 	va_end(vl);
 }
@@ -840,11 +853,11 @@
 {
 	/*if lists are empty, the mutex is also NULL*/
 	if (!memory_add) {
-		assert(!gpac_allocations_lock);
+		gf_assert(!gpac_allocations_lock);
 		gf_memory_log(GF_MEMORY_INFO, "MemTracker gf_memory_print(): the memory tracker is not initialized, some file handles are not closed.\n");
 	} else {
 		int i=0;
-		assert(gpac_allocations_lock);
+		gf_assert(gpac_allocations_lock);
 		const char *enum_open_handles(u32 *idx);
 		u32 nb_handles = gf_file_handles_count();
 
@@ -856,7 +869,7 @@
 		for (i=0; i<HASH_ENTRIES; i++) {
 			memory_element *curr_element = memory_addi, *next_element;
 			while (curr_element) {
-				char szVal51;
+				char szVal51, *sep;
 				char szHexVal101;
 				u32 size, j;
 				next_element = curr_element->next;
@@ -867,6 +880,8 @@
 					sprintf(szHexVal+2*j, "%02X", byte);
 				}
 				szValsize = 0;
+				sep = strchr(szVal, '%');
+				if (sep) sep0 = 0;
 				szHexVal2*size = 0;
 				gf_memory_log(GF_MEMORY_INFO, "MemTracker Memory Block %p (size %d) allocated in:\n", curr_element->ptr, curr_element->size);
 				log_backtrace(GF_MEMORY_INFO, curr_element);

gpac-2.2.1.tar.gz/src/utils/base_encoding.c -> gpac-2.4.0.tar.gz/src/utils/base_encoding.c Changed

@@ -185,7 +185,7 @@
 #define ZLIB_COMPRESS_SAFE	4
 
 GF_EXPORT
-GF_Err gf_gz_compress_payload_ex(u8 **data, u32 data_len, u32 *max_size, u8 data_offset, Bool skip_if_larger, u8 **out_comp_data)
+GF_Err gf_gz_compress_payload_ex(u8 **data, u32 data_len, u32 *max_size, u8 data_offset, Bool skip_if_larger, u8 **out_comp_data, Bool use_gz)
 {
 	z_stream stream;
 	int err;
@@ -198,7 +198,11 @@
 	stream.zfree = (free_func)NULL;
 	stream.opaque = (voidpf)NULL;
 
-	err = deflateInit2(&stream, 9, Z_DEFLATED, 16+MAX_WBITS, 8, Z_DEFAULT_STRATEGY);
+	if (use_gz) {
+		err = deflateInit2(&stream, 9, Z_DEFLATED, 16+MAX_WBITS, 8, Z_DEFAULT_STRATEGY);
+	} else {
+		err = deflateInit(&stream, 9);
+	}
 
 	if (err != Z_OK) {
 		gf_free(dest);
@@ -241,11 +245,11 @@
 GF_EXPORT
 GF_Err gf_gz_compress_payload(u8 **data, u32 data_len, u32 *max_size)
 {
-	return gf_gz_compress_payload_ex(data, data_len, max_size, 0, GF_FALSE, NULL);
+	return gf_gz_compress_payload_ex(data, data_len, max_size, 0, GF_FALSE, NULL, GF_FALSE);
 }
 
 GF_EXPORT
-GF_Err gf_gz_decompress_payload(u8 *data, u32 data_len, u8 **uncompressed_data, u32 *out_size)
+GF_Err gf_gz_decompress_payload_ex(u8 *data, u32 data_len, u8 **uncompressed_data, u32 *out_size, Bool use_gz)
 {
 	z_stream d_stream;
 	GF_Err e = GF_OK;
@@ -269,25 +273,31 @@
 	d_stream.next_out = (Bytef*) *uncompressed_data;
 	d_stream.avail_out = size;
 
-	err = inflateInit2(&d_stream, 16+MAX_WBITS);
+	if (use_gz) {
+		err = inflateInit2(&d_stream, 16+MAX_WBITS);
+	} else {
+		err = inflateInit(&d_stream);
+	}
 
 	if (err == Z_OK) {
 		while (d_stream.total_in < data_len) {
 			err = inflate(&d_stream, Z_NO_FLUSH);
-			if (err < Z_OK) {
+			if (err < Z_OK || err == Z_NEED_DICT) {
 				e = GF_NON_COMPLIANT_BITSTREAM;
 				break;
 			}
 			if (err==Z_STREAM_END) break;
 
 			size *= 2;
-			*uncompressed_data = (char*)gf_realloc(*uncompressed_data, sizeof(char)*size);
+			*uncompressed_data = (char*)gf_realloc(*uncompressed_data, sizeof(char)*(size+1));
 			if (!*uncompressed_data) return GF_OUT_OF_MEM;
 			d_stream.avail_out = (u32) (size - d_stream.total_out);
 			d_stream.next_out = (Bytef*) ( *uncompressed_data + d_stream.total_out);
 		}
-		*out_size = (u32) d_stream.total_out;
+		*out_size = MIN( (size?size-1:0) , (u32) d_stream.total_out );
 		inflateEnd(&d_stream);
+		//force last byte to 0
+		(*uncompressed_data)*out_size = 0;
 	}
 	if (e!=GF_OK) {
 		if (owns_buffer) {
@@ -297,6 +307,12 @@
 	}
 	return e;
 }
+GF_EXPORT
+GF_Err gf_gz_decompress_payload(u8 *data, u32 data_len, u8 **uncompressed_data, u32 *out_size)
+{
+	return gf_gz_decompress_payload_ex(data, data_len, uncompressed_data, out_size, GF_FALSE);
+}
+
 #else
 GF_EXPORT
 GF_Err gf_gz_decompress_payload(u8 *data, u32 data_len, u8 **uncompressed_data, u32 *out_size)
@@ -305,12 +321,18 @@
 	return GF_NOT_SUPPORTED;
 }
 GF_EXPORT
+GF_Err gf_gz_decompress_payload_ex(u8 *data, u32 data_len, u8 **uncompressed_data, u32 *out_size, Bool no_hdr)
+{
+	*out_size = 0;
+	return GF_NOT_SUPPORTED;
+}
+GF_EXPORT
 GF_Err gf_gz_compress_payload(u8 **data, u32 data_len, u32 *max_size)
 {
 	*max_size = 0;
 	return GF_NOT_SUPPORTED;
 }
-GF_Err gf_gz_compress_payload_ex(u8 **data, u32 data_len, u32 *max_size, u8 data_offset, Bool skip_if_larger, u8 **out_comp_data)
+GF_Err gf_gz_compress_payload_ex(u8 **data, u32 data_len, u32 *max_size, u8 data_offset, Bool skip_if_larger, u8 **out_comp_data, Bool no_header)
 {
 	*max_size = 0;
 	return GF_NOT_SUPPORTED;

gpac-2.2.1.tar.gz/src/utils/bitstream.c -> gpac-2.4.0.tar.gz/src/utils/bitstream.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2022
+ *			Copyright (c) Telecom ParisTech 2000-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / common tools sub-project
@@ -78,6 +78,12 @@
 
 	u32 total_bits_read;
 	u32 overflow_state;
+
+	u64 o_size;
+
+#ifdef GPAC_HAS_FD
+	int fd;
+#endif
 };
 
 GF_Err gf_bs_reassign_buffer(GF_BitStream *bs, const u8 *buffer, u64 BufferSize)
@@ -129,6 +135,9 @@
 	GF_BitStream *tmp = (GF_BitStream *)gf_malloc(sizeof(GF_BitStream));
 	if (!tmp) return NULL;
 	memset(tmp, 0, sizeof(GF_BitStream));
+#ifdef GPAC_HAS_FD
+	tmp->fd = -1;
+#endif
 
 	tmp->original = (char*)buffer;
 	tmp->size = BufferSize;
@@ -187,6 +196,9 @@
 	tmp->original = NULL;
 	tmp->position = 0;
 	tmp->stream = f;
+#ifdef GPAC_HAS_FD
+	tmp->fd = -1;
+#endif
 
 	/*get the size of this file (for read streams)*/
 	tmp->position = gf_ftell(f);
@@ -220,6 +232,61 @@
 	return tmp;
 }
 
+#ifdef GPAC_HAS_FD
+#include <unistd.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+
+GF_EXPORT
+GF_BitStream *gf_bs_from_fd(int fd, u32 mode)
+{
+	GF_BitStream *tmp;
+	if (fd<0) return NULL;
+
+	tmp = (GF_BitStream *)gf_malloc(sizeof(GF_BitStream));
+	if (!tmp) return NULL;
+	memset(tmp, 0, sizeof(GF_BitStream));
+	/*switch to internal mode*/
+	mode = (mode==GF_BITSTREAM_READ) ? GF_BITSTREAM_FILE_READ : GF_BITSTREAM_FILE_WRITE;
+	tmp->bsmode = mode;
+	tmp->current = 0;
+	tmp->nbBits = (mode == GF_BITSTREAM_FILE_READ) ? 8 : 0;
+	tmp->original = NULL;
+	tmp->position = 0;
+	tmp->fd = fd;
+
+	struct stat sb;
+	fstat(fd, &sb);
+
+	/*get the size of this file (for read streams)*/
+	tmp->position = lseek(fd, 0, SEEK_CUR);
+	tmp->size = sb.st_size;
+
+	if (mode == GF_BITSTREAM_FILE_READ) {
+		tmp->cache_read_alloc = gf_opts_get_int("core", "bs-cache-size");
+		if (tmp->cache_read_alloc) {
+			tmp->cache_read_pos = tmp->cache_read_size = tmp->cache_read_alloc;
+			tmp->cache_read = gf_malloc(tmp->cache_read_alloc);
+			if (!tmp->cache_read) {
+				gf_free(tmp);
+				return NULL;
+			}
+		}
+	}
+	if (mode == GF_BITSTREAM_FILE_WRITE) {
+		tmp->cache_write_size = gf_opts_get_int("core", "bs-cache-size");
+		if (tmp->cache_write_size) {
+			tmp->cache_write = (char*)gf_malloc(tmp->cache_write_size);
+			if (!tmp->cache_write) {
+				gf_free(tmp);
+				return NULL;
+			}
+			tmp->buffer_written = 0;
+		}
+	}
+	return tmp;
+}
+#endif
 
 GF_BitStream *gf_bs_new_cbk_buffer(GF_Err (*on_block_out)(void *cbk, u8 *data, u32 block_size), void *usr_data, u8 *buffer, u32 buffer_size)
 {
@@ -265,7 +332,7 @@
 	bs->prevent_dispatch --;
 
 	if (bs->on_block_out && !bs->prevent_dispatch) {
-		assert(bs->position >= bs->bytes_out);
+		gf_assert(bs->position >= bs->bytes_out);
 		if (bs->position > bs->bytes_out) {
 			bs->on_block_out(bs->usr_data, bs->original, (u32) (bs->position - bs->bytes_out));
 			bs->bytes_out = bs->position;
@@ -278,7 +345,14 @@
 	Bool res = GF_TRUE;
 	if (bs->buffer_written) {
 		u32 nb_write;
-		nb_write = (u32) gf_fwrite(bs->cache_write, bs->buffer_written, bs->stream);
+#ifdef GPAC_HAS_FD
+		if (bs->fd>=0) {
+			nb_write = (u32) write(bs->fd, bs->cache_write, bs->buffer_written);
+		} else
+#endif
+		{
+			nb_write = (u32) gf_fwrite(bs->cache_write, bs->buffer_written, bs->stream);
+		}
 		if (nb_write != bs->buffer_written)
 			res = GF_FALSE;
 		//check we didn't rewind the bitstream
@@ -344,7 +418,14 @@
 	u8 res;
 	if (bs->cache_read) {
 		if (bs->cache_read_pos == bs->cache_read_size) {
-			bs->cache_read_size = (u32) gf_fread(bs->cache_read, bs->cache_read_alloc, bs->stream);
+#ifdef GPAC_HAS_FD
+			if (bs->fd>=0) {
+				bs->cache_read_size = (u32) read(bs->fd, bs->cache_read, bs->cache_read_alloc);
+			} else
+#endif
+			{
+				bs->cache_read_size = (u32) gf_fread(bs->cache_read, bs->cache_read_alloc, bs->stream);
+			}
 			bs->cache_read_pos = 0;
 			if (!bs->cache_read_size) {
 				*is_eos = GF_TRUE;
@@ -354,7 +435,14 @@
 		res = bs->cache_readbs->cache_read_pos;
 		bs->cache_read_pos++;
 	} else {
-		res = gf_fgetc(bs->stream);
+#ifdef GPAC_HAS_FD
+		if (bs->fd>=0) {
+			if (read(bs->fd, &res, 1)<=0) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("BS Failed to read byte from file\n"));
+			}
+		} else
+#endif
+			res = gf_fgetc(bs->stream);
 	}
 	return res;
 }
@@ -386,7 +474,13 @@
 	if (bs->cache_write)
 		bs_flush_write_cache(bs);
 
-	is_eos = bs->stream ? gf_feof(bs->stream) : GF_TRUE;
+#ifdef GPAC_HAS_FD
+	if (bs->fd>=0)
+		is_eos = (bs->position<bs->size) ? GF_FALSE : GF_TRUE;
+	else
+#endif
+		is_eos = bs->stream ? gf_feof(bs->stream) : GF_TRUE;
+
 	//cache not fully read, reset EOS
 	if (bs->cache_read && (bs->cache_read_pos<bs->cache_read_size))
 		is_eos = GF_FALSE;
@@ -395,7 +489,7 @@
 	if (!is_eos) {
 		u8 res;
 		Bool loc_eos=GF_FALSE;
-		assert(bs->position<=bs->size);
+		gf_assert(bs->position<=bs->size);
 		bs->position++;
 
 		res = gf_bs_load_byte(bs, &loc_eos);
@@ -429,7 +523,7 @@
 			GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("BS Attempt to overread bitstream\n"));
 		}
 	}
-	assert(bs->position <= 1+bs->size);
+	gf_assert(bs->position <= 1+bs->size);
 	return 0;
 }
 
@@ -458,7 +552,6 @@
 #else
 	return (u8) (bs->current & bit_maskbs->nbBits++) ? 1 : 0;
 #endif
-
 }
 
 GF_EXPORT
@@ -485,7 +578,7 @@
 GF_EXPORT
 u32 gf_bs_read_u8(GF_BitStream *bs)
 {
-	assert(bs->nbBits==8);
+	gf_fatal_assert(bs->nbBits==8);
 	if (bs->cache_read && (bs->cache_read_pos+1<bs->cache_read_size) ) {
 		u32 ret = bs->cache_readbs->cache_read_pos;
 		bs->cache_read_pos+=1;
@@ -525,7 +618,7 @@
 u32 gf_bs_read_u16(GF_BitStream *bs)
 {
 	u32 ret;
-	assert(bs->nbBits==8);
+	gf_fatal_assert(bs->nbBits==8);
 	if (bs->cache_read && (bs->cache_read_pos+2<bs->cache_read_size) ) {
 		ret = bs->cache_readbs->cache_read_pos;
 		ret<<=8;
@@ -546,7 +639,7 @@
 u32 gf_bs_read_u24(GF_BitStream *bs)
 {
 	u32 ret;
-	assert(bs->nbBits==8);
+	gf_fatal_assert(bs->nbBits==8);
 
 	if (bs->cache_read && (bs->cache_read_pos+3<bs->cache_read_size) ) {
 		ret = bs->cache_readbs->cache_read_pos;
@@ -571,7 +664,7 @@
 u32 gf_bs_read_u32(GF_BitStream *bs)
 {
 	u32 ret;
-	assert(bs->nbBits==8);
+	gf_fatal_assert(bs->nbBits==8);
 
 	if (bs->cache_read && (bs->cache_read_pos+4<bs->cache_read_size) ) {
 		ret = bs->cache_readbs->cache_read_pos;
@@ -718,7 +811,14 @@
 				bytes_read_cache = csize;
 			}
 			if (nbBytes) {
-				bytes_read = (s32) gf_fread(data + bytes_read_cache, nbBytes, bs->stream);
+#ifdef GPAC_HAS_FD
+				if (bs->fd>=0) {
+					bytes_read = (s32) read(bs->fd, data + bytes_read_cache, nbBytes);
+				} else
+#endif
+				{
+					bytes_read = (s32) gf_fread(data + bytes_read_cache, nbBytes, bs->stream);
+				}
 				if (bytes_read<0) return bytes_read_cache;
 			}
 			bs->position += bytes_read + bytes_read_cache;
@@ -744,7 +844,11 @@
 		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("BS Attempt to write on read bitstream\n"));
 		return;
 	}
-	if (!bs->original && !bs->stream) {
+	if (!bs->original && !bs->stream
+#ifdef GPAC_HAS_FD
+		&& (bs->fd==-1)
+#endif
+	) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("BS Attempt to write on unassigned bitstream\n"));
 		return;
 	}
@@ -752,7 +856,7 @@
 	if ( (bs->bsmode == GF_BITSTREAM_WRITE) || (bs->bsmode == GF_BITSTREAM_WRITE_DYN) ) {
 		//if callback mode and dispatch is not blocked, dispatch
 		if (bs->on_block_out && !bs->prevent_dispatch) {
-			assert(bs->position >= bs->bytes_out);
+			gf_assert(bs->position >= bs->bytes_out);
 			if (bs->position - bs->bytes_out == bs->size) {
 				bs->on_block_out(bs->usr_data, bs->original, (u32) (bs->position - bs->bytes_out));
 				bs->bytes_out = bs->position;
@@ -760,7 +864,7 @@
 			if (bs->original)
 				bs->originalbs->position - bs->bytes_out = val;
 			bs->position++;
-			assert(bs->position >= bs->bytes_out);
+			gf_assert(bs->position >= bs->bytes_out);
 			return;
 		}
 		//otherwise store
@@ -790,7 +894,14 @@
 		return;
 	}
 	/*we are in FILE mode, no pb for any gf_realloc...*/
-	gf_fputc(val, bs->stream);
+#ifdef GPAC_HAS_FD
+	if (bs->fd>=0) {
+		if (write(bs->fd, &val, 1)<=0) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("BS Failed to write byte to file\n"));
+		}
+	} else
+#endif
+		gf_fputc(val, bs->stream);
 
 	/*check we didn't rewind the stream*/
 	if (bs->size == bs->position) bs->size++;
@@ -861,7 +972,7 @@
 GF_EXPORT
 void gf_bs_write_u8(GF_BitStream *bs, u32 value)
 {
-	assert(!bs->nbBits);
+	gf_fatal_assert(!bs->nbBits);
 
 	if (bs->cache_write && (bs->buffer_written+1 < bs->cache_write_size) ) {
 		bs->cache_writebs->buffer_written = (u8) value;
@@ -874,7 +985,7 @@
 GF_EXPORT
 void gf_bs_write_u16(GF_BitStream *bs, u32 value)
 {
-	assert(!bs->nbBits);
+	gf_fatal_assert(!bs->nbBits);
 	if (bs->cache_write && (bs->buffer_written+2 < bs->cache_write_size) ) {
 		bs->cache_writebs->buffer_written = (u8) ((value>>8)&0xff);
 		bs->cache_writebs->buffer_written+1 = (u8) ((value)&0xff);
@@ -888,7 +999,7 @@
 GF_EXPORT
 void gf_bs_write_u24(GF_BitStream *bs, u32 value)
 {
-	assert(!bs->nbBits);
+	gf_fatal_assert(!bs->nbBits);
 	if (bs->cache_write && (bs->buffer_written+3 < bs->cache_write_size) ) {
 		bs->cache_writebs->buffer_written = (u8) ((value>>16)&0xff);
 		bs->cache_writebs->buffer_written+1 = (u8) ((value>>8)&0xff);
@@ -904,7 +1015,7 @@
 GF_EXPORT
 void gf_bs_write_u32(GF_BitStream *bs, u32 value)
 {
-	assert(!bs->nbBits);
+	gf_fatal_assert(!bs->nbBits);
 	if (bs->cache_write && (bs->buffer_written+4 < bs->cache_write_size) ) {
 		bs->cache_writebs->buffer_written = (u8) ((value>>24)&0xff);
 		bs->cache_writebs->buffer_written+1 = (u8) ((value>>16)&0xff);
@@ -922,7 +1033,7 @@
 GF_EXPORT
 void gf_bs_write_u64(GF_BitStream *bs, u64 value)
 {
-	assert(!bs->nbBits);
+	gf_fatal_assert(!bs->nbBits);
 	gf_bs_write_u32(bs, (u32) ((value>>32)&0xffffffff));
 	gf_bs_write_u32(bs, (u32) (value&0xffffffff));
 }
@@ -966,8 +1077,16 @@
 		return repeat_count;
 	case GF_BITSTREAM_FILE_READ:
 	case GF_BITSTREAM_FILE_WRITE:
-		if (gf_fwrite(&byte, repeat_count, bs->stream) != repeat_count)
-			return 0;
+#ifdef GPAC_HAS_FD
+		if (bs->fd>=0) {
+			if (write(bs->fd, &byte, repeat_count) != repeat_count)
+				return 0;
+		} else
+#endif
+		{
+			if (gf_fwrite(&byte, repeat_count, bs->stream) != repeat_count)
+				return 0;
+		}
 		if (bs->size == bs->position) bs->size += repeat_count;
 		bs->position += repeat_count;
 		return repeat_count;
@@ -1028,7 +1147,7 @@
 		case GF_BITSTREAM_WRITE_DYN:
 			//if callback mode and dispatch not disabled, dispatch bytes
 			if (bs->on_block_out && !bs->prevent_dispatch) {
-				assert(bs->position >= bs->bytes_out);
+				gf_assert(bs->position >= bs->bytes_out);
 
 				if (bs->position - bs->bytes_out + nbBytes <= bs->size) {
 					memcpy(bs->original + bs->position - bs->bytes_out, data, nbBytes);
@@ -1042,7 +1161,7 @@
 					bs->position += nbBytes;
 					bs->bytes_out = bs->position;
 				}
-				assert(bs->position >= bs->bytes_out);
+				gf_assert(bs->position >= bs->bytes_out);
 				return nbBytes;
 			}
 			//otherwise store
@@ -1077,9 +1196,14 @@
 				if (!bs_flush_write_cache(bs))
 					return 0;
 			}
-
-			if (gf_fwrite(data, nbBytes, bs->stream) != nbBytes) return 0;
-
+#ifdef GPAC_HAS_FD
+			if (bs->fd>=0) {
+				if (write(bs->fd, data, nbBytes) != nbBytes) return 0;
+			} else
+#endif
+			{
+				if (gf_fwrite(data, nbBytes, bs->stream) != nbBytes) return 0;
+			}
 			if (bs->size == bs->position) bs->size += nbBytes;
 			bs->position += nbBytes;
 			return nbBytes;
@@ -1142,10 +1266,17 @@
 	if (bs->cache_write)
 		bs_flush_write_cache(bs);
 
-	cur = gf_ftell(bs->stream);
-	end = gf_fsize(bs->stream);
-	gf_fseek(bs->stream, cur, SEEK_SET);
-
+#ifdef GPAC_HAS_FD
+	if (bs->fd>=0) {
+		cur = lseek(bs->fd, 0, SEEK_CUR);
+		end = bs->position;
+	} else
+#endif
+	{
+		cur = gf_ftell(bs->stream);
+		end = gf_fsize(bs->stream);
+		gf_fseek(bs->stream, cur, SEEK_SET);
+	}
 	return (u64) (end - cur);
 }
 
@@ -1219,6 +1350,16 @@
 	gf_bs_get_content_no_truncate(bs, output, outSize, NULL);
 }
 
+GF_Err gf_bs_grow(GF_BitStream *bs, u32 addSize)
+{
+	if (!bs || (bs->bsmode != GF_BITSTREAM_WRITE_DYN) || bs->cache_write) return GF_OK;
+	if (bs->position + addSize <= bs->size) return GF_OK;
+	bs->size += addSize;
+	bs->original = gf_realloc(bs->original, (u32) bs->size);
+	if (!bs->original) return GF_OUT_OF_MEM;
+	return GF_OK;
+}
+
 /*	Skip nbytes.
 	Align
 	If READ (MEM or FILE) mode, just read n times 8 bit
@@ -1253,7 +1394,14 @@
 		if (bs->bsmode == GF_BITSTREAM_FILE_READ) {
 			if (bs->position > bs->size) bs->position = bs->size;
 		}
-		gf_fseek(bs->stream, bs->position, SEEK_SET);
+#ifdef GPAC_HAS_FD
+		if (bs->fd>=0) {
+			lseek(bs->fd, bs->position, SEEK_SET);
+		} else
+#endif
+		{
+			gf_fseek(bs->stream, bs->position, SEEK_SET);
+		}
 		return;
 	}
 
@@ -1291,7 +1439,7 @@
 	nbBytes = (nbBits+8)>>3;
 	nbBits = nbBytes*8 - nbBits;
 	gf_bs_align(bs);
-	assert(bs->position >= nbBytes);
+	gf_assert(bs->position >= nbBytes);
 	bs->position -= nbBytes + 1;
 	gf_bs_read_int(bs, (u32)nbBits);
 	return;
@@ -1339,13 +1487,21 @@
 		bs->cache_read_pos = bs->cache_read_size;
 	}
 
-	gf_fseek(bs->stream, offset, SEEK_SET);
-
+	s64 res;
+#ifdef GPAC_HAS_FD
+	if (bs->fd>=0) {
+		res = lseek(bs->fd, offset, SEEK_SET);
+		if (res>=0) res = 0;
+	} else
+#endif
+	{
+		res = gf_fseek(bs->stream, offset, SEEK_SET);
+	}
 	bs->position = offset;
 	bs->current = 0;
 	/*setup NbBits so that next acccess to the buffer will trigger read/write*/
 	bs->nbBits = (bs->bsmode == GF_BITSTREAM_FILE_READ) ? 8 : 0;
-	return GF_OK;
+	return res ? GF_IO_ERR : GF_OK;
 }
 
 /*seek from beginning of stream: align before anything else*/
@@ -1387,6 +1543,36 @@
 	if ( (bs->bsmode != GF_BITSTREAM_READ) && (bs->bsmode != GF_BITSTREAM_FILE_READ)) return 0;
 	if (!numBits || (bs->size < bs->position + byte_offset)) return 0;
 
+	if (bs->cache_read) {
+		if ((numBits==32) && (bs->cache_read_pos+byte_offset+4<bs->cache_read_size) ) {
+			ret = bs->cache_readbs->cache_read_pos+byte_offset;
+			ret<<=8;
+			ret |= bs->cache_readbs->cache_read_pos+byte_offset+1;
+			ret<<=8;
+			ret |= bs->cache_readbs->cache_read_pos+byte_offset+2;
+			ret<<=8;
+			ret |= bs->cache_readbs->cache_read_pos+byte_offset+3;
+			return ret;
+		}
+		if ((numBits==24) && (bs->cache_read_pos+byte_offset+3<bs->cache_read_size) ) {
+			ret = bs->cache_readbs->cache_read_pos+byte_offset;
+			ret<<=8;
+			ret |= bs->cache_readbs->cache_read_pos+byte_offset+1;
+			ret<<=8;
+			ret |= bs->cache_readbs->cache_read_pos+byte_offset+2;
+			return ret;
+		}
+		if ((numBits==16) && (bs->cache_read_pos+byte_offset+2<bs->cache_read_size) ) {
+			ret = bs->cache_readbs->cache_read_pos+byte_offset;
+			ret<<=8;
+			ret |= bs->cache_readbs->cache_read_pos+byte_offset+1;
+			return ret;
+		}
+		if ((numBits==8) && (bs->cache_read_pos+byte_offset+1<bs->cache_read_size) ) {
+			return bs->cache_readbs->cache_read_pos+byte_offset;
+		}
+	}
+
 	/*store our state*/
 	curPos = bs->position;
 	curBits = bs->nbBits;
@@ -1420,7 +1606,6 @@
 u64 gf_bs_get_refreshed_size(GF_BitStream *bs)
 {
 	s64 offset;
-
 	switch (bs->bsmode) {
 	case GF_BITSTREAM_READ:
 	case GF_BITSTREAM_WRITE:
@@ -1430,6 +1615,15 @@
 		if (bs->cache_write)
 			bs_flush_write_cache(bs);
 
+#ifdef GPAC_HAS_FD
+		if (bs->fd>=0) {
+			struct stat sb;
+			fstat(bs->fd, &sb);
+			bs->size = sb.st_size;
+			return bs->size;
+		}
+#endif
+
 		if (bs->stream) {
 			offset = gf_ftell(bs->stream);
 			bs->size = gf_fsize(bs->stream);
@@ -1588,9 +1782,15 @@
 GF_EXPORT
 void gf_bs_truncate(GF_BitStream *bs)
 {
+	bs->o_size = bs->size;
 	bs->size = bs->position;
 }
 
+void gf_bs_untruncate(GF_BitStream *bs)
+{
+	bs->size = bs->o_size;
+}
+
 
 GF_EXPORT
 GF_Err gf_bs_transfer(GF_BitStream *dst, GF_BitStream *src, Bool keep_src)
@@ -1680,8 +1880,14 @@
 {
 	u64 cur_r, cur_w, pos;
 	u32 nb_io;
-
+	u8 *block=NULL;
+	u32 bk_size = 8196;
 	if (bs->on_block_out) return GF_BAD_PARAM;
+#ifdef GPAC_HAS_FD
+	if (bs->fd) bk_size = 100000;
+#endif
+	block = gf_malloc(sizeof(u8)*bk_size);
+	if (!block) return GF_OUT_OF_MEM;
 
 	pos = bs->position;
 	nb_io = gf_bs_write_data(bs, data, size);
@@ -1692,8 +1898,7 @@
 	cur_r = pos;
 	pos = cur_w;
 	while (cur_r > offset) {
-		u8 block8196;
-		u32 move_bytes = 8196;
+		u32 move_bytes = bk_size;
 		if (cur_r - offset < move_bytes)
 			move_bytes = (u32) (cur_r - offset);
 
@@ -1712,9 +1917,11 @@
 	if (nb_io != size) goto exit;
 
 	gf_bs_seek(bs, pos);
+	if (block) gf_free(block);
 	return GF_OK;
 
 exit:
+	if (block) gf_free(block);
 	gf_bs_seek(bs, pos);
 	return GF_IO_ERR;
 }
@@ -1731,7 +1938,7 @@
 #ifndef GPAC_DISABLE_AVPARSE_LOGS
 void gf_bs_log_idx(GF_BitStream *bs, u32 nBits, const char *fname, s64 val, s32 idx1, s32 idx2, s32 idx3)
 {
-	assert(bs);
+	gf_assert(bs);
 	if (bs->on_log) bs->on_log(bs->log_udta, fname, nBits, val, idx1, idx2, idx3);
 }
 #endif

gpac-2.2.1.tar.gz/src/utils/cache.c -> gpac-2.4.0.tar.gz/src/utils/cache.c Changed

@@ -2,7 +2,7 @@
  *					GPAC Multimedia Framework
  *
  *			Authors: Jean Le Feuvre, Pierre Souchay
- *			Copyright (c) Telecom ParisTech 2010-2022
+ *			Copyright (c) Telecom ParisTech 2010-2023
  *					All rights reserved
  *
  *   This file is part of GPAC / common tools sub-project
@@ -24,6 +24,9 @@
  */
 
 #include <gpac/cache.h>
+
+#ifndef GPAC_DISABLE_NETWORK
+
 #include <gpac/network.h>
 #include <gpac/download.h>
 #include <gpac/token.h>
@@ -182,9 +185,9 @@
 Bool delete_cache_files(void *cbck, char *item_name, char *item_path, GF_FileEnumInfo *file_info) {
 	const char * startPattern;
 	int sz;
-	assert( cbck );
-	assert( item_name );
-	assert( item_path);
+	gf_assert( cbck );
+	gf_assert( item_name );
+	gf_assert( item_path);
 	startPattern = (const char *) cbck;
 	sz = (u32) strlen( startPattern );
 	if (!strncmp(startPattern, item_name, sz)) {
@@ -457,7 +460,7 @@
 		char name1024;
 		snprintf(name, sizeof(name), "CachedEntryWriteMx=%p, url=%s", (void*) entry, url);
 		entry->write_mutex = gf_mx_new(name);
-		assert(entry->write_mutex);
+		gf_assert(entry->write_mutex);
 	}
 #endif
 
@@ -586,7 +589,7 @@
 	CHECK_ENTRY;
 	if (!sess || !entry->write_session || entry->write_session != sess)
 		return GF_OK;
-	assert( sess == entry->write_session );
+	gf_assert( sess == entry->write_session );
 	if (entry->writeFilePtr) {
 		GF_LOG(GF_LOG_INFO, GF_LOG_CACHE,
 		       ("CACHE Closing file %s, %d bytes written.\n", entry->cache_filename, entry->written_in_cache));
@@ -635,7 +638,7 @@
 	return e;
 }
 
-GF_Err gf_cache_open_write_cache( const DownloadedCacheEntry entry, const GF_DownloadSession * sess, GF_Mutex *mx )
+GF_Err gf_cache_open_write_cache( const DownloadedCacheEntry entry, const GF_DownloadSession * sess)
 {
 	CHECK_ENTRY;
 	if (!sess)
@@ -646,16 +649,13 @@
 #endif
 	entry->write_session = sess;
 	if (!entry->continue_file) {
-		assert( ! entry->writeFilePtr);
+		gf_assert( ! entry->writeFilePtr);
 
 		entry->written_in_cache = 0;
 	}
 	entry->flags &= ~CORRUPTED;
 
 	if (entry->memory_stored) {
-		if (!entry->cache_blob.mx)
-			entry->cache_blob.mx = mx;
-
 		gf_mx_p(entry->cache_blob.mx);
 
 		GF_LOG(GF_LOG_INFO, GF_LOG_CACHE, ("CACHE Opening cache file %s for write (%s)...\n", entry->cache_filename, entry->url));
@@ -709,7 +709,7 @@
 	if (entry->memory_stored) {
 		if (!entry->cache_blob.mx)
 			entry->cache_blob.mx = mx;
-		assert(mx);
+		gf_assert(mx);
 		gf_mx_p(entry->cache_blob.mx);
 		if (entry->written_in_cache + size > entry->mem_allocated) {
 			u32 new_size = MAX(entry->mem_allocated*2, entry->written_in_cache + size);
@@ -844,7 +844,7 @@
     }
 	entry->dm = NULL;
 	if (entry->sessions) {
-		assert( gf_list_count(entry->sessions) == 0);
+		gf_assert( gf_list_count(entry->sessions) == 0);
 		gf_list_del(entry->sessions);
 		entry->sessions = NULL;
 	}
@@ -1105,3 +1105,4 @@
     return GF_TRUE;
 }
 
+#endif //GPAC_DISABLE_NETWORK

gpac-2.2.1.tar.gz/src/utils/color.c -> gpac-2.4.0.tar.gz/src/utils/color.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2022
+ *			Copyright (c) Telecom ParisTech 2000-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / common tools sub-project
@@ -28,7 +28,7 @@
 #include <gpac/constants.h>
 #include <gpac/color.h>
 
-#ifndef GPAC_DISABLE_PLAYER
+#ifndef GPAC_DISABLE_COMPOSITOR
 
 static GF_Err color_write_nv12_10_to_yuv(GF_VideoSurface *vs_dst, GF_VideoSurface *vs_src, GF_Window *_src_wnd, Bool swap_up);
 static GF_Err color_write_yv12_10_to_yuv(GF_VideoSurface *vs_dst, GF_VideoSurface *vs_src, const GF_Window *_src_wnd, Bool swap_up);
@@ -2334,7 +2334,13 @@
 	return GF_OK;
 }
 
-#endif // GPAC_DISABLE_PLAYER
+#else
+GF_EXPORT
+GF_Err gf_stretch_bits(GF_VideoSurface *dst, GF_VideoSurface *src, GF_Window *dst_wnd, GF_Window *src_wnd, u8 alpha, Bool flip, GF_ColorKey *key, GF_ColorMatrix *cmat)
+{
+	return GF_NOT_SUPPORTED;
+}
+#endif // GPAC_DISABLE_COMPOSITOR
 
 
 /*
@@ -2533,7 +2539,7 @@
 }
 
 
-#ifndef GPAC_DISABLE_PLAYER
+#ifndef GPAC_DISABLE_COMPOSITOR
 
 
 //intrinsic code segfaults on 32 bit, need to check why
@@ -3557,8 +3563,8 @@
 	if (is_planar_yuv(vs_dst->pixel_format)) {
 		/*complete source copy*/
 		if ((vs_dst->pitch_y == (s32)vs_src->pitch_y) && (w == vs_src->width) && (h == vs_src->height)) {
-			assert(!ox);
-			assert(!oy);
+			gf_assert(!ox);
+			gf_assert(!oy);
 			memcpy(vs_dst->video_buffer, pY, sizeof(u8)*w*h);
 			if (vs_dst->pixel_format == GF_PIXEL_YUV) {
 				memcpy(vs_dst->video_buffer + vs_dst->pitch_y * vs_dst->height, pV, sizeof(u8)*w*h/ 4);

gpac-2.2.1.tar.gz/src/utils/configfile.c -> gpac-2.4.0.tar.gz/src/utils/configfile.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2012
+ *			Copyright (c) Telecom ParisTech 2000-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / common tools sub-project
@@ -53,12 +53,12 @@
 {
 	if (!ptr) return;
 	if (ptr->keys) {
-		while (gf_list_count(ptr->keys)) {
-			IniKey *k = (IniKey *) gf_list_get(ptr->keys, 0);
+		u32 i, count=gf_list_count(ptr->keys);
+		for (i=0;i<count;i++) {
+			IniKey *k = (IniKey *) gf_list_get(ptr->keys, i);
 			if (k->value) gf_free(k->value);
 			if (k->name) gf_free(k->name);
 			gf_free(k);
-			gf_list_rem(ptr->keys, 0);
 		}
 		gf_list_del(ptr->keys);
 	}
@@ -74,10 +74,10 @@
 {
 	if (!iniFile) return;
 	if (iniFile->sections) {
-		while (gf_list_count(iniFile->sections)) {
-			IniSection *p = (IniSection *) gf_list_get(iniFile->sections, 0);
+		u32 i, count=gf_list_count(iniFile->sections);
+		for (i=0; i<count; i++) {
+			IniSection *p = (IniSection *) gf_list_get(iniFile->sections, i);
 			DelSection(p);
-			gf_list_rem(iniFile->sections, 0);
 		}
 		gf_list_del(iniFile->sections);
 	}
@@ -206,7 +206,8 @@
 			if (ret) {
 				ret0 = 0;
 				k->name = gf_strdup(line);
-				while (k->namestrlen(k->name) - 1 == ' ') k->namestrlen(k->name) - 1 = 0;
+				while (k->name0 && (k->namestrlen(k->name) - 1 == ' '))
+					k->namestrlen(k->name) - 1 = 0;
 				ret0 = '=';
 				ret += 1;
 				while (ret0 == ' ') ret++;
@@ -436,10 +437,12 @@
 	/* need a new key */
 	key = (IniKey *) gf_malloc(sizeof(IniKey));
 	key->name = gf_strdup(keyName);
-	key->value = gf_strdup("");
+	key->value = gf_strdup(keyValue);
 	if (has_changed)
 		iniFile->hasChanged = GF_TRUE;
 	gf_list_add(sec->keys, key);
+	key->do_restrict = is_restrict;
+	return GF_OK;
 
 set_value:
 	if (!keyValue) {

gpac-2.2.1.tar.gz/src/utils/constants.c -> gpac-2.4.0.tar.gz/src/utils/constants.c Changed

gpac-2.2.1.tar.gz/src/utils/downloader.c -> gpac-2.4.0.tar.gz/src/utils/downloader.c Changed

@@ -2,7 +2,7 @@
  *					GPAC Multimedia Framework
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2005-2022
+ *			Copyright (c) Telecom ParisTech 2005-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / common tools sub-project
@@ -23,13 +23,14 @@
  *
  */
 
+#include <gpac/tools.h>
+#ifndef GPAC_DISABLE_NETWORK
 #include <gpac/download.h>
 #include <gpac/network.h>
 #include <gpac/token.h>
 #include <gpac/thread.h>
 #include <gpac/list.h>
 #include <gpac/base_coding.h>
-#include <gpac/tools.h>
 #include <gpac/cache.h>
 #include <gpac/filters.h>
 
@@ -178,6 +179,7 @@
 	char *mime_type;
 	GF_List *headers;
 
+	const char *netcap_id;
 	GF_Socket *sock;
 	u32 num_retry;
 	GF_NetIOStatus status;
@@ -278,7 +280,9 @@
 
 	u8 *h2_upgrade_settings;
 	u32 h2_upgrade_settings_len;
-	u8 h2_headers_seen, h2_ready_to_send, h2_is_eos, h2_data_paused, h2_upgrade_state, h2_data_done, h2_switch_sess;
+	u8 h2_headers_seen, h2_ready_to_send, h2_is_eos, h2_data_paused, h2_data_done, h2_switch_sess;
+	//0: upgrade not started; 1: upgrade headers send; 2: upgrade done; 3: upgrade retry without SSL APN; 4: H2 disabled for session
+	u8 h2_upgrade_state;
 #endif
 };
 static GF_Err dm_sess_write(GF_DownloadSession *sess, const u8 *buffer, u32 size);
@@ -355,7 +359,7 @@
 	{\
 	GF_Err __e = _e;\
 	if (__e==GF_IP_NETWORK_EMPTY) {\
-		assert(sess->status != GF_NETIO_STATE_ERROR); \
+		gf_assert(sess->status != GF_NETIO_STATE_ERROR); \
 	}\
 	sess->last_error = _e;\
 	}\
@@ -388,8 +392,8 @@
 void h2_detach_session(GF_H2_Session *h2_sess, GF_DownloadSession *sess)
 {
 	if (!h2_sess || !sess) return;
-	assert(sess->h2_sess == h2_sess);
-	assert(sess->mx);
+	gf_assert(sess->h2_sess == h2_sess);
+	gf_assert(sess->mx);
 
 	gf_list_del_item(h2_sess->sessions, sess);
 	if (!gf_list_count(h2_sess->sessions)) {
@@ -411,13 +415,13 @@
 		gf_free(h2_sess);
 	} else {
 		GF_DownloadSession *asess = gf_list_get(h2_sess->sessions, 0);
-		assert(asess->h2_sess == h2_sess);
-		assert(asess->sock);
+		gf_assert(asess->h2_sess == h2_sess);
+		gf_assert(asess->sock);
 
 		h2_sess->net_sess = asess;
 		//swap async buf if any to new active session
 		if (sess->async_buf_alloc) {
-			assert(!asess->async_buf);
+			gf_assert(!asess->async_buf);
 			asess->async_buf = sess->async_buf;
 			asess->async_buf_alloc = sess->async_buf_alloc;
 			asess->async_buf_size = sess->async_buf_size;
@@ -441,7 +445,7 @@
 
 static GF_Err h2_session_send(GF_DownloadSession *sess)
 {
-	assert(sess->h2_sess);
+	gf_assert(sess->h2_sess);
 	int rv = nghttp2_session_send(sess->h2_sess->ng_sess);
 	if (rv != 0) {
 		if (sess->last_error != GF_IP_CONNECTION_CLOSED) {
@@ -477,7 +481,7 @@
 	if (can_reassign && first_not_assigned) {
 		first_not_assigned->h2_stream_id = stream_id;
 		GF_LOG(GF_LOG_DEBUG, GF_LOG_HTTP, ("HTTP/2 reassigning old server session to new stream %d\n", stream_id));
-		assert(first_not_assigned->data_io.source.ptr);
+		gf_assert(first_not_assigned->data_io.source.ptr);
 		first_not_assigned->total_size = first_not_assigned->bytes_done = 0;
 		first_not_assigned->status = GF_NETIO_CONNECTED;
 		first_not_assigned->h2_data_done = 0;
@@ -524,8 +528,7 @@
 	if (!sess) {
 		GF_H2_Session *h2sess = (GF_H2_Session *)user_data;
 		GF_DownloadSession *par_sess = h2sess->net_sess;
-		assert(par_sess);
-		if (!par_sess->server_mode)
+		if (!par_sess || !par_sess->server_mode)
 			return NGHTTP2_ERR_CALLBACK_FAILURE;
 
 
@@ -583,6 +586,8 @@
 		if (frame->hd.flags & NGHTTP2_FLAG_END_STREAM) {
 			GF_LOG(GF_LOG_DEBUG, GF_LOG_HTTP, ("HTTP/2 stream_id %d (%s) data done\n", frame->hd.stream_id, sess->remote_path ? sess->remote_path : sess->orig_url));
 			sess->h2_data_done = 1;
+			sess->h2_send_data = NULL;
+			sess->h2_send_data_len = 0;
 		}
 		break;
 	case NGHTTP2_DATA:
@@ -625,7 +630,7 @@
 	if (sess->h2_buf.size + len > sess->h2_buf.alloc) {
 		sess->h2_buf.alloc = sess->h2_buf.size + (u32) len;
 		sess->h2_buf.data = gf_realloc(sess->h2_buf.data, sizeof(u8) * sess->h2_buf.alloc);
-		if (!sess->h2_buf.data) return NGHTTP2_ERR_NOMEM;
+		if (!sess->h2_buf.data)	return NGHTTP2_ERR_NOMEM;
 	}
 	memcpy(sess->h2_buf.data + sess->h2_buf.size, data, len);
 	sess->h2_buf.size += (u32) len;
@@ -800,8 +805,8 @@
 	ssize_t rv;
 	GF_DownloadSession *sess = (GF_DownloadSession *) source->ptr;
 
-	assert(sess->h2_send_data_len);
-	assert(sess->h2_send_data_len >= length);
+	gf_assert(sess->h2_send_data_len);
+	gf_assert(sess->h2_send_data_len >= length);
 
 	rv = h2_write_data(sess, (u8 *) framehd, 9);
 	if (rv<0) {
@@ -809,14 +814,23 @@
 		goto err;
 	}
 
-	if (frame->data.padlen > 0) {
+	while (frame->data.padlen > 0) {
 		u32 padlen = (u32) frame->data.padlen - 1;
 		rv = h2_write_data(sess, padding, padlen);
-		if (rv<0) goto err;
+		if (rv<0) {
+			if (rv==NGHTTP2_ERR_WOULDBLOCK) continue;
+			goto err;
+		}
+		break;
+	}
+	while (1) {
+		rv = h2_write_data(sess, (u8 *) sess->h2_send_data, length);
+		if (rv<0) {
+			if (rv==NGHTTP2_ERR_WOULDBLOCK) continue;
+			goto err;
+		}
+		break;
 	}
-	rv = h2_write_data(sess, (u8 *) sess->h2_send_data, length);
-	if (rv<0) goto err;
-
 	sess->h2_send_data += (u32) length;
 	sess->h2_send_data_len -= (u32) length;
 	return 0;
@@ -824,7 +838,7 @@
 
 	sess->status = GF_NETIO_STATE_ERROR;
 	SET_LAST_ERR(sess->last_error)
-	return NGHTTP2_ERR_CALLBACK_FAILURE;
+	return (int) rv;
 }
 
 static void h2_initialize_session(GF_DownloadSession *sess)
@@ -941,8 +955,8 @@
 		NV_HDR(hdrs4+i, hdr->name, hdr->value);
 	}
 	if (has_body) {
-		assert(sess->data_io.read_callback);
-		assert(sess->data_io.source.ptr != NULL);
+		gf_assert(sess->data_io.read_callback);
+		gf_assert(sess->data_io.source.ptr != NULL);
 	}
 
 	sess->h2_data_done = 0;
@@ -950,7 +964,7 @@
 	sess->h2_stream_id = nghttp2_submit_request(sess->h2_sess->ng_sess, NULL, hdrs, nb_hdrs+4, has_body ? &sess->data_io : NULL, sess);
 	sess->h2_ready_to_send = 0;
 
-#ifndef GPAC_DISABLE_LOGS
+#ifndef GPAC_DISABLE_LOG
 	if (gf_log_tool_level_on(GF_LOG_HTTP, GF_LOG_DEBUG)) {
 		GF_LOG(GF_LOG_DEBUG, GF_LOG_HTTP, ("HTTP/2 send request (has_body %d) for new stream_id %d:\n", has_body, sess->h2_stream_id));
 		for (i=0; i<nb_hdrs+4; i++) {
@@ -985,7 +999,7 @@
 	if (!sess->h2_buf.size)
 		return;
 
-	assert(sess->h2_buf.offset<=sess->h2_buf.size);
+	gf_assert(sess->h2_buf.offset<=sess->h2_buf.size);
 
 	nb_b_pck = sess->h2_buf.size - sess->h2_buf.offset;
 	if (nb_b_pck > size)
@@ -1003,7 +1017,7 @@
 	} else {
 		sess->h2_buf.size = sess->h2_buf.offset = 0;
 	}
-	assert(sess->h2_buf.offset<=sess->h2_buf.size);
+	gf_assert(sess->h2_buf.offset<=sess->h2_buf.size);
 }
 
 
@@ -1032,7 +1046,7 @@
 \param entry The entry to use
 \param sess The download session
 \param success 1 if cache write is success, false otherwise
-\param GF_OK is everything went fine, GF_BAD_PARAM if entry is NULL, GF_IO_ERR if a failure occurs
+\return GF_OK is everything went fine, GF_BAD_PARAM if entry is NULL, GF_IO_ERR if a failure occurs
  */
 GF_Err gf_cache_close_write_cache( const DownloadedCacheEntry entry, const GF_DownloadSession * sess, Bool success);
 
@@ -1041,7 +1055,7 @@
  * This function prepares calls for gf_cache_write_to_cache
 \param entry The entry to use
 \param sess The download session
-\param GF_OK is everything went fine, GF_BAD_PARAM if entry is NULL, GF_IO_ERR if a failure occurs
+\return GF_OK is everything went fine, GF_BAD_PARAM if entry is NULL, GF_IO_ERR if a failure occurs
  */
 GF_Err gf_cache_open_write_cache( const DownloadedCacheEntry entry, const GF_DownloadSession * sess );
 
@@ -1067,8 +1081,7 @@
 	count = gf_list_count( dm->credentials);
 	for (i = 0 ; i < count; i++) {
 		cred = (GF_UserCredentials*)gf_list_get(dm->credentials, i );
-		assert( cred );
-		if (strcmp(cred->site, server_name))
+		if (!cred || strcmp(cred->site, server_name))
 			continue;
 
 		if (!user_name || !strcmp(user_name, cred->username))
@@ -1115,7 +1128,7 @@
  * \brief Saves the digest for authentication of password and username
 \param dm The download manager
 \param creds The credentials to fill
-\param GF_OK if info has been filled, GF_BAD_PARAM if creds == NULL or dm == NULL, GF_AUTHENTICATION_FAILURE if user did not filled the info.
+\return GF_OK if info has been filled, GF_BAD_PARAM if creds == NULL or dm == NULL, GF_AUTHENTICATION_FAILURE if user did not filled the info.
  */
 static GF_Err gf_user_credentials_save_digest( GF_DownloadManager * dm, GF_UserCredentials * creds, const char * password, Bool store_info) {
 	int size;
@@ -1198,7 +1211,7 @@
  * \brief Asks the user for credentials for given site
 \param dm The download manager
 \param creds The credentials to fill
-\param GF_OK if info has been filled, GF_BAD_PARAM if creds == NULL or dm == NULL, GF_AUTHENTICATION_FAILURE if user did not filled the info.
+\return GF_OK if info has been filled, GF_BAD_PARAM if creds == NULL or dm == NULL, GF_AUTHENTICATION_FAILURE if user did not filled the info.
  */
 static GF_Err gf_user_credentials_ask_password( GF_DownloadManager * dm, GF_UserCredentials * creds, Bool secure)
 {
@@ -1220,7 +1233,7 @@
 	GF_UserCredentials * creds;
 	if (!dm)
 		return NULL;
-	assert( server_name );
+	gf_assert( server_name );
 	creds = gf_user_credentials_find_for_site(dm, server_name, username);
 	/* If none found, we create one */
 	if (!creds) {
@@ -1233,8 +1246,11 @@
 	if (username) {
 		strncpy(creds->username, username, 49);
 		creds->username49 = 0;
+	} else {
+		creds->username0 = 0;
 	}
-	strcpy(creds->site, server_name);
+	strncpy(creds->site, server_name, 1023);
+	creds->site1023 = 0;
 	if (username && password && valid)
 		gf_user_credentials_save_digest(dm, creds, password, GF_FALSE);
 	else {
@@ -1255,7 +1271,7 @@
 
 /*!
  * initialize the SSL library once for all download managers
-\param GF_FALSE if everyhing is OK, GF_TRUE otherwise
+\return GF_FALSE if everyhing is OK, GF_TRUE otherwise
  */
 Bool gf_ssl_init_lib() {
 	if (_ssl_is_initialized)
@@ -1606,6 +1622,7 @@
 			//this one crashes /exits on windows, only use if debug level
 			ERR_print_errors_fp(stderr);
 		} else {
+			ERR_print_errors_fp(stderr);
 			GF_LOG(GF_LOG_WARNING, GF_LOG_NETWORK, ("SSL Accept failure\n"));
 		}
 		SSL_shutdown(ssl);
@@ -1644,7 +1661,8 @@
 				if (err==SSL_ERROR_SSL) {
 					char msg1024;
 					SSL_load_error_strings();
-					ERR_error_string_n(ERR_get_error(), msg, sizeof(msg));
+					ERR_error_string_n(ERR_get_error(), msg, 1023);
+					msg1023=0;
 					GF_LOG(GF_LOG_ERROR, GF_LOG_HTTP, ("SSL Cannot send, error %s\n", msg));
 				}
 			}
@@ -1692,9 +1710,13 @@
 	u32 remain = size - written;
 	if (buffer == par_sess->async_buf) {
 		if (written) {
-			memmove(par_sess->async_buf, par_sess->async_buf + written, remain);
-			assert(par_sess->async_buf_size >= written);
-			par_sess->async_buf_size -= written;
+			if (par_sess->async_buf_size >= written) {
+				memmove(par_sess->async_buf, par_sess->async_buf + written, remain);
+				par_sess->async_buf_size -= written;
+			} else {
+				gf_assert(0);
+				par_sess->async_buf_size = 0;
+			}
 		}
 	} else {
 		if (par_sess->async_buf_alloc < par_sess->async_buf_size + remain) {
@@ -1728,20 +1750,20 @@
 /*!
  * Finds an existing entry in the cache for a given URL
 \param sess The session configured with the URL
-\param NULL if none found, the DownloadedCacheEntry otherwise
+\return NULL if none found, the DownloadedCacheEntry otherwise
  */
 DownloadedCacheEntry gf_dm_find_cached_entry_by_url(GF_DownloadSession * sess)
 {
 	u32 i, count;
-	assert( sess && sess->dm && sess->dm->cache_entries );
+	gf_assert( sess && sess->dm && sess->dm->cache_entries );
 	gf_mx_p( sess->dm->cache_mx );
 	count = gf_list_count(sess->dm->cache_entries);
 	for (i = 0 ; i < count; i++) {
 		const char * url;
 		DownloadedCacheEntry e = (DownloadedCacheEntry)gf_list_get(sess->dm->cache_entries, i);
-		assert(e);
+		gf_assert(e);
 		url = gf_cache_get_url(e);
-		assert( url );
+		gf_assert( url );
 		if (strcmp(url, sess->orig_url)) continue;
 
 		if (! sess->is_range_continuation) {
@@ -1765,7 +1787,7 @@
  * Removes a session for a DownloadedCacheEntry
 \param entry The entry
 \param sess The session to remove
-\param the number of sessions left in the cached entry, -1 if one of the parameters is wrong
+\return the number of sessions left in the cached entry, -1 if one of the parameters is wrong
  */
 s32 gf_cache_remove_session_from_cache_entry(DownloadedCacheEntry entry, GF_DownloadSession * sess);
 
@@ -1773,7 +1795,7 @@
 Bool gf_cache_set_range(const DownloadedCacheEntry entry, u64 size, u64 start_range, u64 end_range);
 Bool gf_cache_set_content(const DownloadedCacheEntry entry, GF_Blob *blob, Bool copy, GF_Mutex *mx);
 Bool gf_cache_set_headers(const DownloadedCacheEntry entry, const char *headers);
-Bool gf_cache_set_downtime(const DownloadedCacheEntry entry, u32 download_time_ms);
+void gf_cache_set_downtime(const DownloadedCacheEntry entry, u32 download_time_ms);
 
 
 /**
@@ -1813,7 +1835,7 @@
  * implemented in cache.c
 \param entry The entry
 \param sess The session to add
-\param the number of sessions in the cached entry, -1 if one of the parameters is wrong
+\return the number of sessions in the cached entry, -1 if one of the parameters is wrong
  */
 s32 gf_cache_add_session_to_cache_entry(DownloadedCacheEntry entry, GF_DownloadSession * sess);
 Bool gf_cache_entry_persistent(const DownloadedCacheEntry entry);
@@ -1867,18 +1889,21 @@
 				sess->cache_entry = NULL;
 			}
 			entry = gf_cache_create_entry(sess->dm, sess->dm->cache_directory, sess->orig_url, sess->range_start, sess->range_end, (sess->flags&GF_NETIO_SESSION_MEMORY_CACHE) ? GF_TRUE : GF_FALSE, sess->dm->cache_mx);
+			if (!entry) {
+				SET_LAST_ERR(GF_OUT_OF_MEM)
+				return;
+			}
 			gf_mx_p( sess->dm->cache_mx );
 			gf_list_add(sess->dm->cache_entries, entry);
 			gf_mx_v( sess->dm->cache_mx );
 			sess->is_range_continuation = GF_FALSE;
 		}
-		assert( entry );
 		sess->cache_entry = entry;
 		sess->reused_cache_entry = 	gf_cache_is_in_progress(entry);
 		count = gf_list_count(sess->dm->sessions);
 		for (i=0; i<count; i++) {
 			GF_DownloadSession *a_sess = (GF_DownloadSession*)gf_list_get(sess->dm->sessions, i);
-			assert(a_sess);
+			gf_assert(a_sess);
 			if (a_sess==sess) continue;
 			if (a_sess->cache_entry==entry) {
 				found = GF_TRUE;
@@ -1934,14 +1959,14 @@
 	}
 	realURL = gf_strdup(info.canonicalRepresentation);
 	gf_dm_url_info_del(&info);
-	assert( realURL );
+	gf_assert( realURL );
 	count = gf_list_count(dm->cache_entries);
 	for (i = 0 ; i < count; i++) {
 		const char * e_url;
 		DownloadedCacheEntry cache_ent = (DownloadedCacheEntry)gf_list_get(dm->cache_entries, i);
-		assert(cache_ent);
+		gf_assert(cache_ent);
 		e_url = gf_cache_get_url(cache_ent);
-		assert( e_url );
+		gf_assert( e_url );
 		if (!strcmp(e_url, realURL)) {
 			/* We found the existing session */
 			gf_cache_entry_set_delete_files_when_deleted(cache_ent);
@@ -1963,7 +1988,7 @@
 }
 
 GF_EXPORT
-void gf_dm_delete_cached_file_entry_session(const GF_DownloadSession * sess,  const char * url)
+void gf_dm_delete_cached_file_entry_session(const GF_DownloadSession * sess,  const char * url, Bool force)
 {
 	if (sess && sess->dm && url) {
 		GF_LOG(GF_LOG_INFO, GF_LOG_HTTP, ("CACHE Requesting deletion for %s\n", url));
@@ -1973,7 +1998,7 @@
 	}
 }
 
-void gf_dm_sess_set_header(GF_DownloadSession *sess, const char *name, const char *value)
+void gf_dm_sess_set_header_ex(GF_DownloadSession *sess, const char *name, const char *value, Bool allow_overwrite)
 {
 	GF_HTTPHeader *hdr;
 	if (!sess) return;
@@ -1986,6 +2011,23 @@
 		if (!stricmp(name, "Keep-Alive")) return;
 	}
 #endif
+	//check existing headers
+	u32 i, count = gf_list_count(sess->headers);
+	for (i=0; i<count; i++) {
+		hdr = gf_list_get(sess->headers, i);
+		if (stricmp(hdr->name, name)) continue;
+		if (!allow_overwrite) return;
+
+		gf_free(hdr->value);
+		if (value) {
+			hdr->value = gf_strdup(value);
+			return;
+		}
+		gf_list_rem(sess->headers, i);
+		gf_free(hdr->name);
+		gf_free(hdr);
+		return;
+	}
 
 	GF_SAFEALLOC(hdr, GF_HTTPHeader)
 	if (hdr) {
@@ -1995,7 +2037,12 @@
 	}
 }
 
-GF_Err gf_dm_sess_send_reply(GF_DownloadSession *sess, u32 reply_code, const char *response_body, Bool no_body)
+void gf_dm_sess_set_header(GF_DownloadSession *sess, const char *name, const char *value)
+{
+	gf_dm_sess_set_header_ex(sess, name, value, GF_TRUE);
+}
+
+GF_Err gf_dm_sess_send_reply(GF_DownloadSession *sess, u32 reply_code, const char *response_body, u32 body_len, Bool no_body)
 {
 	u32 i, count;
 	GF_Err e;
@@ -2008,7 +2055,7 @@
 #ifdef GPAC_HAS_HTTP2
 	if (sess->h2_upgrade_settings) {
 		u32 len;
-		assert(!sess->h2_sess);
+		gf_assert(!sess->h2_sess);
 		gf_dynstrcat(&rsp_buf, "HTTP/1.1 101 Switching Protocols\r\n"
 								"Connection: Upgrade\r\n"
 								"Upgrade: h2c\r\n\r\n", NULL);
@@ -2029,7 +2076,7 @@
 		if (response_body) {
 			no_body = GF_FALSE;
 			sess->h2_send_data = (u8 *) response_body;
-			sess->h2_send_data_len = (u32) strlen(response_body);
+			sess->h2_send_data_len = body_len;
 			sess->h2_is_eos = 1;
 		} else if (!no_body) {
 			switch (reply_code) {
@@ -2115,14 +2162,14 @@
 
 	GF_LOG(GF_LOG_INFO, GF_LOG_HTTP, ("HTTP send reply for %s:\n%s\n", sess->orig_url, rsp_buf));
 
+	count = (u32) strlen(rsp_buf);
 	if (response_body) {
-		gf_dynstrcat(&rsp_buf, response_body, NULL);
+		rsp_buf = gf_realloc(rsp_buf, count+body_len);
 		if (!rsp_buf) return GF_OUT_OF_MEM;
+		memcpy(rsp_buf+count, response_body, body_len);
+		count+=body_len;
 	}
-
-	count = (u32) strlen(rsp_buf);
 	e = dm_sess_write(sess, rsp_buf, count);
-
 	gf_free(rsp_buf);
 	return e;
 }
@@ -2151,7 +2198,7 @@
 
 static void gf_dm_disconnect(GF_DownloadSession *sess, HTTPCloseType close_type)
 {
-	assert( sess );
+	gf_assert( sess );
 	if (sess->connection_close) close_type = HTTP_RESET_CONN;
 	sess->connection_close = GF_FALSE;
 	sess->remaining_data_size = 0;
@@ -2177,9 +2224,11 @@
 		if (sess->h2_sess) {
 			do_close = (close_type==HTTP_RESET_CONN) ? GF_TRUE : GF_FALSE;
 		}
+		//if H2 stream is still valid, issue a reset stream
+		if (sess->h2_sess && sess->h2_stream_id)
+			nghttp2_submit_rst_stream(sess->h2_sess->ng_sess, NGHTTP2_FLAG_NONE, sess->h2_stream_id, NGHTTP2_NO_ERROR);
 #endif
 
-
 		if (do_close) {
 #ifdef GPAC_HAS_HTTP2
 			if (sess->h2_sess) {
@@ -2203,6 +2252,7 @@
 		}
 	}
 
+
 	sess->status = GF_NETIO_DISCONNECTED;
 	if (sess->num_retry) sess->num_retry--;
 
@@ -2370,11 +2420,12 @@
 /**
 \param url The url to parse for protocol
 \param info The info to fill
-\param Returns the offset in url of the protocol found -1 if not found
+\return Returns the offset in url of the protocol found -1 if not found
  */
-static s32 gf_dm_parse_protocol(const char * url, GF_URL_Info * info) {
-	assert(info);
-	assert(url);
+static s32 gf_dm_parse_protocol(const char * url, GF_URL_Info * info)
+{
+	gf_assert(info);
+	gf_assert(url);
 	if (!strnicmp(url, "http://", 7)) {
 		info->port = 80;
 		info->protocol = "http://";
@@ -2425,7 +2476,7 @@
 
 			if (proto_offset < 0) {
 				tmp = urlConcatenateWithBaseURL;
-				assert( ! info->remotePath );
+				gf_assert( ! info->remotePath );
 				info->remotePath = gf_url_percent_encode(tmp);
 				gf_free( urlConcatenateWithBaseURL );
 				urlConcatenateWithBaseURL = NULL;
@@ -2452,10 +2503,21 @@
 			return GF_BAD_PARAM;
 		}
 	}
-	assert( proto_offset >= 0 );
+	gf_assert( proto_offset >= 0 );
 	tmp = strchr(url, '/');
-	assert( !info->remotePath );
+	//patch for some broken url http://servername?cgi
+	if (!tmp)
+		tmp = strchr(url, '?');
+	gf_assert( !info->remotePath );
 	info->remotePath = gf_url_percent_encode(tmp ? tmp : "/");
+	if (info->remotePath0=='?') {
+		char *rpath = NULL;
+		gf_dynstrcat(&rpath, "/", NULL);
+		gf_dynstrcat(&rpath, info->remotePath, NULL);
+		gf_free(info->remotePath);
+		info->remotePath = rpath;
+	}
+
 	if (tmp) {
 		tmp0 = 0;
 		copyOfUrl = gf_strdup(url);
@@ -2468,7 +2530,7 @@
 	tmp = strrchr(tmp_url, '@');
 	if (tmp) {
 		current_pos = tmp + 1;
-		assert( ! info->server_name );
+		gf_assert( ! info->server_name );
 		info->server_name = gf_strdup(current_pos);
 		tmp0 = 0;
 		tmp = strchr(tmp_url, ':');
@@ -2479,7 +2541,7 @@
 		}
 		info->userName = gf_strdup(tmp_url);
 	} else {
-		assert( ! info->server_name );
+		gf_assert( ! info->server_name );
 		info->server_name = gf_strdup(tmp_url);
 	}
 
@@ -2577,8 +2639,8 @@
 		}
 	}
 
-	assert(sess->status != GF_NETIO_WAIT_FOR_REPLY);
-	assert(sess->status != GF_NETIO_DATA_EXCHANGE);
+	gf_fatal_assert(sess->status != GF_NETIO_WAIT_FOR_REPLY);
+	gf_fatal_assert(sess->status != GF_NETIO_DATA_EXCHANGE);
 
 	//strip fragment
 	sep_frag = strchr(url, '#');
@@ -2596,7 +2658,7 @@
 		info.server_name = sess->server_name ? gf_strdup(sess->server_name) : NULL;
 		info.remotePath = gf_strdup(url);
 		sep = strstr(sess->orig_url_before_redirect, "://");
-		assert(sep);
+		gf_assert(sep);
 		c = sep3;
 		sep3 = 0;
 		info.protocol = gf_strdup(sess->orig_url_before_redirect);
@@ -2683,7 +2745,9 @@
 	if (sess->sock && !socket_changed) {
 		sess->status = GF_NETIO_CONNECTED;
 		sess->last_error = GF_OK;
+		//reset number of retry and start time
 		sess->num_retry = SESSION_RETRY_COUNT;
+		sess->start_time = 0;
 		sess->needs_cache_reconfig = 1;
 	} else {
 
@@ -2699,6 +2763,9 @@
 
 		sess->status = GF_NETIO_SETUP;
 		sess->last_error = GF_OK;
+		//reset number of retry and start time
+		sess->num_retry = SESSION_RETRY_COUNT;
+		sess->start_time = 0;
 #ifdef GPAC_HAS_SSL
 		if (sess->ssl) {
 			SSL_shutdown(sess->ssl);
@@ -2758,8 +2825,9 @@
 	if (sess->destroy) {
 		do_run = GF_FALSE;
 	} else {
+		Bool unlock = sess->mx ? GF_TRUE : GF_FALSE;
 		gf_mx_p(sess->mx);
-		if (sess->status >= GF_NETIO_DISCONNECTED) {
+		if (sess->status >= GF_NETIO_DATA_TRANSFERED) {
 			do_run = GF_FALSE;
 		} else {
 			if (sess->status < GF_NETIO_CONNECTED) {
@@ -2768,14 +2836,18 @@
 				sess->do_requests(sess);
 			}
 		}
-		gf_mx_v(sess->mx);
+		if (unlock)
+			gf_mx_v(sess->mx);
 	}
 	if (do_run) return GF_TRUE;
 
 	/*destroy all session but keep connection active*/
 	gf_dm_disconnect(sess, HTTP_NO_CLOSE);
-	sess->status = GF_NETIO_STATE_ERROR;
-	SET_LAST_ERR(GF_OK)
+	if (sess->last_error==GF_EOS) sess->last_error = GF_OK;
+	else if (sess->last_error==GF_IP_NETWORK_EMPTY) sess->last_error = GF_OK;
+	else if (sess->last_error) {
+		sess->status = GF_NETIO_STATE_ERROR;
+	}
 	return GF_FALSE;
 }
 
@@ -2792,14 +2864,16 @@
 		*reschedule_ms = 1;
 		return GF_TRUE;
 	}
-	assert(sess->ftask);
+	gf_assert(sess->ftask);
 	gf_free(sess->ftask);
 	sess->ftask = NULL;
-	if (sess->destroy)
+	if (sess->destroy) {
 		gf_dm_sess_del(sess);
+	}
 	return GF_FALSE;
 }
 
+#ifndef GPAC_DISABLE_THREADS
 static u32 gf_dm_session_thread(void *par)
 {
 	GF_DownloadSession *sess = (GF_DownloadSession *)par;
@@ -2817,6 +2891,7 @@
 		gf_dm_sess_del(sess);
 	return 1;
 }
+#endif
 
 static GF_DownloadSession *gf_dm_sess_new_internal(GF_DownloadManager * dm, const char *url, u32 dl_flags,
         gf_dm_user_io user_io,
@@ -2842,7 +2917,6 @@
 	if (!sess->conn_timeout) sess->conn_timeout = 5000;
 
 	sess->request_timeout = gf_opts_get_int("core", "req-timeout");
-	if (!sess->request_timeout) sess->request_timeout = 10000;
 
 	sess->chunk_wnd_dur = gf_opts_get_int("core", "cte-rate-wnd") * 1000;
 	if (!sess->chunk_wnd_dur) sess->chunk_wnd_dur = 20000;
@@ -2876,11 +2950,11 @@
 
 	*e = gf_dm_sess_setup_from_url(sess, url, GF_FALSE);
 	if (*e) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_HTTP, ("Downloader failed to create session for %s: %s\n", url, gf_error_to_string(*e)));
+		GF_LOG(GF_LOG_INFO, GF_LOG_HTTP, ("Downloader failed to create session for %s: %s\n", url, gf_error_to_string(*e)));
 		gf_dm_sess_del(sess);
 		return NULL;
 	}
-	assert( sess );
+	gf_assert( sess );
 	sess->num_retry = SESSION_RETRY_COUNT;
 	/*threaded session must be started with gf_dm_sess_process*/
 	return sess;
@@ -3065,12 +3139,11 @@
 		if (size < 0) {
 			int err = SSL_get_error(sess->ssl, size);
 			if (err==SSL_ERROR_SSL) {
-/*
 				char msg1024;
 				SSL_load_error_strings();
-				ERR_error_string_n(ERR_get_error(), msg, sizeof(msg));
+				ERR_error_string_n(ERR_get_error(), msg, 1023);
+				msg1023=0;
 				GF_LOG(GF_LOG_ERROR, GF_LOG_HTTP, ("SSL Cannot read, error %s\n", msg));
-*/
 				e = GF_IO_ERR;
 			} else {
 				e = gf_sk_probe(sess->sock);
@@ -3092,6 +3165,7 @@
 		if (*out_read > 0) {
 			ssize_t read_len = nghttp2_session_mem_recv(sess->h2_sess->ng_sess, data, *out_read);
 			if(read_len < 0 ) {
+				*out_read = 0;
 				GF_LOG(GF_LOG_ERROR, GF_LOG_HTTP, ("HTTP/2 nghttp2_session_mem_recv error:  %s\n", nghttp2_strerror((int) read_len)));
 				return GF_IO_ERR;
 			}
@@ -3256,7 +3330,7 @@
 		if (sess->num_retry) {
 			SET_LAST_ERR(GF_OK)
 			sess->num_retry--;
-			GF_LOG(GF_LOG_WARNING, GF_LOG_HTTP, ("HTTP/2 stream_id %d (%s) refused by server, retrying and marking session as no longer available\n", sess->h2_stream_id, sess->remote_path ? sess->remote_path : sess->orig_url));
+			GF_LOG(GF_LOG_INFO, GF_LOG_HTTP, ("HTTP/2 stream_id %d (%s) refused by server, retrying and marking session as no longer available\n", sess->h2_stream_id, sess->remote_path ? sess->remote_path : sess->orig_url));
 
 			sess->h2_stream_id = 0;
 		} else {
@@ -3267,14 +3341,27 @@
 			return;
 		}
 	}
-	assert(!sess->h2_sess);
+	if (sess->h2_sess) {
+		sess->connect_time = 0;
+		sess->status = GF_NETIO_CONNECTED;
+		sess->last_error = GF_OK;
+		gf_dm_sess_notify_state(sess, GF_NETIO_CONNECTED, GF_OK);
+		gf_dm_configure_cache(sess);
+		return;
+	}
 
-	if (sess->dm && !sess->dm->disable_http2 && !sess->sock && (sess->h2_upgrade_state!=3)) {
+	if (sess->dm && !sess->dm->disable_http2 && !sess->sock && (sess->h2_upgrade_state<3)) {
 		u32 i, count = gf_list_count(sess->dm->sessions);
 		for (i=0; i<count; i++) {
 			GF_DownloadSession *a_sess = gf_list_get(sess->dm->sessions, i);
 			if (strcmp(a_sess->server_name, sess->server_name)) continue;
 			if (!a_sess->h2_sess) {
+				//we already ahd a connection to this server with H2 failure, do not try h2
+				if (a_sess->h2_upgrade_state==4) {
+					sess->h2_upgrade_state=4;
+					break;
+				}
+
 				//we have the same server name
 				//trick in non-block mode, we want to wait for upgrade to be completed
 				//before creating a new socket
@@ -3296,9 +3383,16 @@
 
 			GF_LOG(GF_LOG_DEBUG, GF_LOG_HTTP, ("HTTP/2 associating session %s to existing http2 session\n", sess->remote_path ? sess->remote_path : sess->orig_url));
 
-			if (sess->mx) gf_mx_del(sess->mx);
+			u32 nb_locks=0;
+			if (sess->mx) {
+				nb_locks = gf_mx_get_num_locks(sess->mx);
+				gf_mx_del(sess->mx);
+			}
 			sess->h2_sess = a_sess->h2_sess;
 			sess->mx = a_sess->h2_sess->mx;
+			if (nb_locks)
+				gf_mx_p(sess->mx);
+
 			sess->sock = a_sess->sock;
 #ifdef GPAC_HAS_SSL
 			sess->ssl = a_sess->ssl;
@@ -3323,7 +3417,7 @@
 
 	Bool register_sock = GF_FALSE;
 	if (!sess->sock) {
-		sess->sock = gf_sk_new(GF_SOCK_TYPE_TCP);
+		sess->sock = gf_sk_new_ex(GF_SOCK_TYPE_TCP, sess->netcap_id);
 
 		if (sess->sock && (sess->flags & GF_NETIO_SESSION_NO_BLOCK))
 			gf_sk_set_block_mode(sess->sock, GF_TRUE);
@@ -3370,7 +3464,7 @@
 		proxy_port = sess->port;
 	}
 	if (!sess->connect_pending) {
-		GF_LOG(GF_LOG_INFO, GF_LOG_HTTP, ("HTTP Connecting to %s:%d\n", proxy, proxy_port));
+		GF_LOG(GF_LOG_INFO, GF_LOG_HTTP, ("HTTP Connecting to %s:%d for URL %s\n", proxy, proxy_port, sess->remote_path ? sess->remote_path : "undefined"));
 	}
 
 	if ((sess->status == GF_NETIO_SETUP) && (sess->connect_pending<2)) {
@@ -3394,20 +3488,26 @@
 			if (sess->num_retry) {
 				if (register_sock) gf_sk_group_register(sess->sock_group, sess->sock);
 				sess->status = GF_NETIO_SETUP;
+				//reset pending flag
+				sess->connect_pending = 0;
 				if (sess->flags & GF_NETIO_SESSION_NO_BLOCK) {
+					//either timeout or set pending flag
 					if ((now - sess->start_time) / 1000 > sess->conn_timeout) {
 						sess->num_retry = 0;
+					} else {
+						sess->connect_pending = 1;
 					}
-				}
-				else {
+				} else {
 					sess->num_retry--;
+					sess->connect_pending = 1;
 				}
-				sess->connect_pending = 1;
-				SET_LAST_ERR(GF_IP_NETWORK_EMPTY)
+				if (sess->connect_pending) {
+					SET_LAST_ERR(GF_IP_NETWORK_EMPTY)
 					return;
-			} else {
-				e = GF_IP_CONNECTION_FAILURE;
+				}
 			}
+
+			e = GF_IP_CONNECTION_FAILURE;
 		}
 
 		sess->connect_pending = 0;
@@ -3464,6 +3564,10 @@
 					SSL_set_alpn_protos(sess->ssl, NULL, 0);
 					sess->h2_upgrade_state = 0;
 				}
+				//h1 disabled, don't use alpn
+				else if (sess->h2_upgrade_state==4) {
+					SSL_set_alpn_protos(sess->ssl, NULL, 0);
+				}
 #endif
 			}
 
@@ -3488,7 +3592,8 @@
 
 					char msg1024;
 					SSL_load_error_strings();
-					ERR_error_string_n(ERR_get_error(), msg, sizeof(msg));
+					ERR_error_string_n(ERR_get_error(), msg, 1023);
+					msg1023=0;
 					GF_LOG(GF_LOG_ERROR, GF_LOG_HTTP, ("SSL Cannot connect, error %s\n", msg));
 #ifdef GPAC_HAS_HTTP2
 					if (!sess->dm->disable_http2) {
@@ -3520,6 +3625,8 @@
 #endif
 					if (alpn == NULL || alpnlen != 2 || memcmp("h2", alpn, 2) != 0) {
 						GF_LOG(GF_LOG_DEBUG, GF_LOG_HTTP, ("SSL HTTP/2 is not negotiated\n"));
+						//disable h2 for the session
+						sess->h2_upgrade_state = 4;
 					} else {
 						h2_initialize_session(sess);
 					}
@@ -3616,7 +3723,7 @@
 	entry = gf_dm_refresh_cache_entry (sess);
 	if (!entry)
 		return sess->mime_type;
-	assert( entry == sess->cache_entry && entry);
+	gf_assert( entry == sess->cache_entry && entry);
 	return gf_cache_get_mime_type( sess->cache_entry );
 }
 
@@ -3654,7 +3761,9 @@
 			}
 		}
 	} else {
-		if ((sess->status != GF_NETIO_SETUP) && (sess->status != GF_NETIO_CONNECTED))
+		if (sess->status == GF_NETIO_DISCONNECTED)
+			sess->status = GF_NETIO_SETUP;
+		else if ((sess->status != GF_NETIO_SETUP) && (sess->status != GF_NETIO_CONNECTED))
 			return GF_BAD_PARAM;
 	}
 	sess->range_start = start_range;
@@ -3687,9 +3796,12 @@
 {
 	Bool go;
 
+#ifndef GPAC_DISABLE_THREADS
 	/*if session is threaded, start thread*/
 	if (! (sess->flags & GF_NETIO_SESSION_NOT_THREADED)) {
 		if (sess->dm->filter_session && !gf_opts_get_bool("core", "dm-threads")) {
+			if (sess->ftask)
+				return GF_OK;
 			GF_SAFEALLOC(sess->ftask, GF_SessTask);
 			if (!sess->ftask) return GF_OUT_OF_MEM;
 			sess->ftask->sess = sess;
@@ -3705,6 +3817,7 @@
 		gf_th_run(sess->th, gf_dm_session_thread, sess);
 		return GF_OK;
 	}
+#endif //GPAC_DISABLE_THREADS
 
 	if (sess->put_state==2) {
 		if (sess->status==GF_NETIO_DATA_TRANSFERED)
@@ -3784,6 +3897,10 @@
 GF_Err gf_dm_sess_process_headers(GF_DownloadSession *sess)
 {
 	Bool go;
+	if (!(sess->flags & GF_NETIO_SESSION_NOT_THREADED)) {
+		return GF_OK;
+	}
+
 	go = GF_TRUE;
 	while (go) {
 		switch (sess->status) {
@@ -3967,14 +4084,14 @@
 {
 	if (!dm)
 		return;
-	assert( dm->sessions);
-	assert( dm->cache_mx );
+	gf_assert( dm->sessions);
+	gf_assert( dm->cache_mx );
 	gf_mx_p( dm->cache_mx );
 
 	while (gf_list_count(dm->partial_downloads)) {
 		GF_PartialDownload * entry = (GF_PartialDownload*)gf_list_get( dm->partial_downloads, 0);
 		gf_list_rem( dm->partial_downloads, 0);
-		assert( entry->filename );
+		gf_assert( entry->filename );
 		gf_file_delete( entry->filename );
 		gf_free(entry->filename );
 		entry->filename = NULL;
@@ -3989,7 +4106,7 @@
 	}
 	gf_list_del(dm->sessions);
 	dm->sessions = NULL;
-	assert( dm->skip_proxy_servers );
+	gf_assert( dm->skip_proxy_servers );
 	while (gf_list_count(dm->skip_proxy_servers)) {
 		char *serv = (char*)gf_list_get(dm->skip_proxy_servers, 0);
 		gf_list_rem(dm->skip_proxy_servers, 0);
@@ -3997,7 +4114,7 @@
 	}
 	gf_list_del(dm->skip_proxy_servers);
 	dm->skip_proxy_servers = NULL;
-	assert( dm->credentials);
+	gf_assert( dm->credentials);
 	while (gf_list_count(dm->credentials)) {
 		GF_UserCredentials * cred = (GF_UserCredentials*)gf_list_get( dm->credentials, 0);
 		gf_list_rem( dm->credentials, 0);
@@ -4005,7 +4122,7 @@
 	}
 	gf_list_del( dm->credentials);
 	dm->credentials = NULL;
-	assert( dm->cache_entries );
+	gf_assert( dm->cache_entries );
 	{
 		/* Deletes DownloadedCacheEntry and associated files if required */
 		Bool delete_my_files = gf_dm_needs_to_delete_cache(dm);
@@ -4053,7 +4170,7 @@
 	if (!sess || !data ) return;
 
 	icy_metaint = sess->icy_metaint;
-	assert( icy_metaint > 0 );
+	gf_assert( icy_metaint > 0 );
 	while (nbBytes) {
 		if (sess->icy_bytes == icy_metaint) {
 			sess->icy_count = 1 + 16* (u8) data0;
@@ -4152,12 +4269,11 @@
 	//cannot parse now, copy over the bytes
 	if (!te_header) {
 		*header_size = 0;
-		GF_LOG(GF_LOG_ERROR, GF_LOG_HTTP, ("HTTP Chunk encoding: current buffer does not contain enough bytes (%d) to read the size\n", *payload_size));
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_HTTP, ("HTTP Chunk encoding: current buffer does not contain enough bytes (%d) to read the size\n", *payload_size));
 		return NULL;
 	}
 
 	te_header0 = 0;
-	//assert(strlen(body_start));
 	*header_size += (u32) (strlen(body_start)) + 2;
 
 	sep = strchr(body_start, ';');
@@ -4233,7 +4349,7 @@
 		return; //nothing to do
 	if (sess->chunked) {
  		data = (u8 *) gf_dm_get_chunk_data(sess, first_chunk_in_payload, (char *) payload, &nbBytes, &hdr_size);
-		if (!hdr_size && !data) {
+		if (!hdr_size && !data && nbBytes) {
 			/* keep the data and wait for the rest */
 			sess->remaining_data_size = nbBytes;
 			sess->remaining_data = (char *)gf_realloc(sess->remaining_data, nbBytes * sizeof(char));
@@ -4243,7 +4359,7 @@
 		} else if (hdr_size + nbBytes > payload_size) {
 			/* chunk header is processed but we will need several TCP frames to get the entire chunk*/
 			remaining = nbBytes + hdr_size - payload_size;
-			assert(payload_size >= hdr_size);
+			gf_assert(payload_size >= hdr_size);
 			nbBytes = payload_size - hdr_size;
 			payload_size = 0;
 			payload = NULL;
@@ -4485,7 +4601,7 @@
         u32 to_copy, data_size;
         const u8 *ptr;
         e = GF_OK;
-        assert(sess->cache_entry);
+        gf_assert(sess->cache_entry);
         //always refresh total size
         sess->total_size = gf_cache_get_content_length(sess->cache_entry);
 
@@ -4547,7 +4663,7 @@
 			}
 			e = gf_dm_read_data(sess, buffer + nb_read + sess->remaining_data_size, buffer_size - sess->remaining_data_size - nb_read, &single_read);
 			if (e<0) {
-				assert(single_read==0);
+				gf_assert(single_read==0);
 				break;
 			}
 
@@ -4574,7 +4690,7 @@
 			h2_session_send(sess);
 
 			//stream is over and all data flushed, move to GF_NETIO_DATA_TRANSFERED in client mode
-			if (sess->h2_data_done && !sess->h2_buf.size && !sess->server_mode) {
+			if (!sess->h2_stream_id && sess->h2_data_done && !sess->h2_buf.size && !sess->server_mode) {
 				sess->status = GF_NETIO_DATA_TRANSFERED;
 				SET_LAST_ERR(GF_OK)
 			}
@@ -4597,7 +4713,10 @@
 
 		if (! (*read_size) && (e==GF_IP_NETWORK_EMPTY)) {
 #ifdef GPAC_HAS_HTTP2
-			if (sess->h2_sess && (!sess->h2_stream_id || sess->h2_data_done) && sess->bytes_done && !sess->total_size) {
+			if (sess->h2_sess && !sess->total_size
+				//for client, wait for close - for server move to data_transfered as soon as we're done pushing data
+				&& ((!sess->h2_stream_id && sess->bytes_done) || (sess->h2_data_done && sess->server_mode))
+			) {
 				sess->status = GF_NETIO_DATA_TRANSFERED;
 				SET_LAST_ERR(GF_OK)
 				return GF_EOS;
@@ -4605,7 +4724,8 @@
 #endif
 
 			e = gf_sk_probe(sess->sock);
-			if ((e==GF_IP_CONNECTION_CLOSED) || (gf_sys_clock_high_res() - sess->last_fetch_time > 1000 * sess->request_timeout)
+			if ((e==GF_IP_CONNECTION_CLOSED)
+				|| (sess->request_timeout && (gf_sys_clock_high_res() - sess->last_fetch_time > 1000 * sess->request_timeout))
 			) {
 				if (e==GF_IP_CONNECTION_CLOSED) {
 					SET_LAST_ERR(GF_IP_CONNECTION_CLOSED)
@@ -4654,8 +4774,13 @@
 	}
 
 	if (net_status) *net_status = sess->status;
-	if (sess->status == GF_NETIO_DISCONNECTED) return GF_EOS;
-	else if (sess->status == GF_NETIO_STATE_ERROR) return GF_SERVICE_ERROR;
+
+	if (sess->status == GF_NETIO_DISCONNECTED) {
+		if (sess->last_error) return sess->last_error;
+		return GF_EOS;
+	}
+	else if (sess->status == GF_NETIO_STATE_ERROR)
+		return sess->last_error ? sess->last_error : GF_SERVICE_ERROR;
 	return GF_OK;
 }
 
@@ -4703,7 +4828,8 @@
 		}
 #endif
 		gf_dm_disconnect(sess, HTTP_CLOSE);
-		sess->status = GF_NETIO_STATE_ERROR;
+		//not an error, move to DISCONNECTED state
+		sess->status = GF_NETIO_DISCONNECTED;
 		SET_LAST_ERR(GF_IP_CONNECTION_CLOSED)
 		gf_mx_v(sess->mx);
 	}
@@ -4713,7 +4839,7 @@
  * Sends the HTTP headers
 \param sess The GF_DownloadSession
 \param sHTTP buffer containing the request
-\param GF_OK if everything went fine, the error otherwise
+\return GF_OK if everything went fine, the error otherwise
  */
 static GF_Err http_send_headers(GF_DownloadSession *sess, char * sHTTP) {
 	GF_Err e;
@@ -4733,7 +4859,7 @@
 	assert (sess->status == GF_NETIO_CONNECTED);
 
 	gf_dm_sess_clear_headers(sess);
-	assert(sess->remaining_data_size == 0);
+	gf_assert(sess->remaining_data_size == 0);
 
 	if (sess->needs_cache_reconfig) {
 		gf_dm_configure_cache(sess);
@@ -4747,6 +4873,21 @@
 		return GF_OK;
 	}
 
+	//in case we got disconnected, reconnect
+	e = gf_sk_probe(sess->sock);
+	if (e && (e!=GF_IP_NETWORK_EMPTY)) {
+		sess_connection_closed(sess);
+		if ((e==GF_IP_CONNECTION_CLOSED) && sess->num_retry) {
+			sess->num_retry--;
+			sess->status = GF_NETIO_SETUP;
+			return GF_OK;
+		}
+		sess->status = GF_NETIO_STATE_ERROR;
+		SET_LAST_ERR(e)
+		gf_dm_sess_notify_state(sess, GF_NETIO_STATE_ERROR, e);
+		return e;
+	}
+
 	/*setup authentification*/
 	strcpy(pass_buf, "");
 	sess->creds = gf_user_credentials_find_for_site( sess->dm, sess->server_name, NULL);
@@ -4814,7 +4955,7 @@
 			continue;
 		}
 
-		PUSH_HDR(par.name, par.value)
+		gf_dm_sess_set_header_ex(sess, par.name, par.value, GF_TRUE);
 
 		if (!stricmp(par.name, "Accept")) has_accept = GF_TRUE;
 		else if (!stricmp(par.name, "Range")) has_range = GF_TRUE;
@@ -5095,7 +5236,7 @@
  * Parse the remaining part of body
 \param sess The session
 \param sHTTP the data buffer
-\param The error code if any
+\return The error code if any
  */
 static GF_Err http_parse_remaining_body(GF_DownloadSession * sess, char * sHTTP)
 {
@@ -5127,7 +5268,7 @@
 			if (!sess->total_size && !sess->chunked && (gf_sys_clock_high_res() - sess->start_time > 5000000)) {
 				sess->total_size = sess->bytes_done;
 				gf_dm_sess_notify_state(sess, GF_NETIO_DATA_TRANSFERED, GF_OK);
-				assert(sess->server_name);
+				gf_assert(sess->server_name);
 				GF_LOG(GF_LOG_ERROR, GF_LOG_HTTP, ("HTTP Disconnected from %s: %s\n", sess->server_name, gf_error_to_string(e)));
 				gf_dm_disconnect(sess, HTTP_NO_CLOSE);
 			}
@@ -5150,7 +5291,7 @@
 					sess->total_size = sess->bytes_done;
 					// HTTP 1.1 without content length...
 					gf_dm_sess_notify_state(sess, GF_NETIO_DATA_TRANSFERED, GF_OK);
-					assert(sess->server_name);
+					gf_assert(sess->server_name);
 					GF_LOG(GF_LOG_ERROR, GF_LOG_HTTP, ("HTTP Disconnected from %s: %s\n", sess->server_name, gf_error_to_string(e)));
 					if (sess->use_cache_file)
 						gf_cache_set_content_length(sess->cache_entry, sess->bytes_done);
@@ -5171,7 +5312,7 @@
 #ifdef GPAC_HAS_HTTP2
 		if (sess->h2_sess) {
 			h2_flush_data(sess, GF_FALSE);
-			if (sess->h2_data_done) {
+			if (!sess->h2_stream_id) {
 				sess->status = GF_NETIO_DATA_TRANSFERED;
 				SET_LAST_ERR(GF_OK)
 			}
@@ -5284,9 +5425,9 @@
 
 
 	if (sess->server_mode) {
-		assert( sess->status == GF_NETIO_CONNECTED );
+		gf_fatal_assert( sess->status == GF_NETIO_CONNECTED );
 	} else {
-		assert( sess->status == GF_NETIO_WAIT_FOR_REPLY );
+		gf_fatal_assert( sess->status == GF_NETIO_WAIT_FOR_REPLY );
 		if (!(sess->flags & GF_NETIO_SESSION_NOT_CACHED)) {
 			sess->use_cache_file = sess->dm->disable_cache ? GF_FALSE : GF_TRUE;
 		}
@@ -5349,7 +5490,10 @@
 					sess->status = GF_NETIO_STATE_ERROR;
 					return GF_IP_NETWORK_EMPTY;
 				}
-				if (!sess->server_mode && (gf_sys_clock_high_res() - sess->request_start_time > 1000 * sess->request_timeout)) {
+				if (!sess->server_mode
+					&& sess->request_timeout
+					&& (gf_sys_clock_high_res() - sess->request_start_time > 1000 * sess->request_timeout)
+				) {
 					SET_LAST_ERR(GF_IP_NETWORK_FAILURE)
 					sess->status = GF_NETIO_STATE_ERROR;
 					return GF_IP_NETWORK_FAILURE;
@@ -5476,7 +5620,7 @@
 
 	if (sess->flags & GF_NETIO_SESSION_NO_BLOCK) {
 		sHTTP = sess->async_req_reply;
-		bytesRead = sess->async_req_reply_size;
+		buf_size = bytesRead = sess->async_req_reply_size;
 		sess->async_req_reply_size = 0;
 	}
 
@@ -5491,7 +5635,7 @@
 		if (!BodyStart)
 			BodyStart = bytesRead;
 
-		sHTTPBodyStart-1 = 0;
+		if (BodyStart) sHTTPBodyStart-1 = 0;
 		GF_LOG(GF_LOG_INFO, GF_LOG_HTTP, ("HTTP %s\n\n", sHTTP));
 
 		sess->reply_time = (u32) (gf_sys_clock_high_res() - sess->request_start_time);
@@ -5561,7 +5705,8 @@
 			GF_SAFEALLOC(hdrp, GF_HTTPHeader);
 			if (hdrp) {
 				hdrp->name = gf_strdup(hdr);
-				hdrp->value = gf_strdup(hdr_val);
+				if (hdr_val)
+					hdrp->value = gf_strdup(hdr_val);
 				gf_list_add(sess->headers, hdrp);
 			}
 
@@ -5780,9 +5925,10 @@
 		if (e) return e;
 		sess->connection_close = GF_FALSE;
 		sess->h2_upgrade_state = 2;
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_HTTP, ("HTTP Upgraded connection to HTTP/2\n"));
 		return GF_OK;
 	}
-//	if (sess->h2_upgrade_state<2)
+	if (sess->h2_upgrade_state<4)
 		sess->h2_upgrade_state = 2;
 #endif
 
@@ -5885,7 +6031,7 @@
 	}
 	//remember if we can keep the session alive after the transfer is done
 	sess->connection_close = connection_closed;
-	assert(rsp_code);
+	gf_assert(rsp_code);
 
 	switch (rsp_code) {
 	//100 continue
@@ -5932,7 +6078,7 @@
 	case 304:
 	{
 		sess->status = GF_NETIO_PARSE_REPLY;
-		assert(sess->cache_entry);
+		gf_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);
@@ -5945,7 +6091,7 @@
 			filename = gf_cache_get_cache_filename(sess->cache_entry);
 			GF_LOG(GF_LOG_INFO, GF_LOG_HTTP, ("HTTP Sending data to modules from %s...\n", filename));
 			f = gf_fopen(filename, "rb");
-			assert(filename);
+			gf_assert(filename);
 			if (!f) {
 				GF_LOG(GF_LOG_INFO, GF_LOG_HTTP, ("HTTP FAILED to open cache file %s for reading contents !\n", filename));
 				/* Ooops, no cache, redownload everything ! */
@@ -6141,7 +6287,7 @@
 	/*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_assert( ! sess->use_cache_file );
 		GF_LOG(GF_LOG_INFO, GF_LOG_HTTP, ("HTTP ICY protocol detected\n"));
 		if (mime_type && !stricmp(mime_type, "video/nsv")) {
 			gf_cache_set_mime_type(sess->cache_entry, "audio/aac");
@@ -6183,7 +6329,6 @@
 		sess->bytes_done = 0;
 	}
 
-
 	/* we may have existing data in this buffer ... */
 #ifdef GPAC_HAS_HTTP2
 	if (!e && sess->h2_sess) {
@@ -6512,7 +6657,7 @@
 	count = gf_list_count(sess->dm->partial_downloads);
 	for (i = 0 ; i < count ; i++) {
 		GF_PartialDownload * pd = (GF_PartialDownload*)gf_list_get(sess->dm->partial_downloads, i);
-		assert( pd->filename && pd->url);
+		gf_assert( pd->filename && pd->url);
 		if (!strcmp(pd->url, sess->orig_url) && pd->startOffset == startOffset && pd->endOffset == endOffset) {
 			/* File already created, just return the file */
 			return pd->filename;
@@ -6747,9 +6892,10 @@
 {
 	if (sess) {
 		sess->flags |= GF_NETIO_SESSION_MEMORY_CACHE;
-		if (force_keep==1)
+		sess->flags &= ~GF_NETIO_SESSION_NOT_CACHED;
+		if (force_keep==1) {
 			sess->flags |= GF_NETIO_SESSION_KEEP_CACHE;
-		else if (force_keep==2)
+		} else if (force_keep==2)
 			sess->flags |= GF_NETIO_SESSION_KEEP_FIRST_CACHE;
 	}
 }
@@ -6778,9 +6924,9 @@
 	for (i = 0 ; i < count; i++) {
 		const char * url;
 		DownloadedCacheEntry e = (DownloadedCacheEntry)gf_list_get(dm->cache_entries, i);
-		assert(e);
+		gf_assert(e);
 		url = gf_cache_get_url(e);
-		assert( url );
+		gf_assert( url );
 		if (strcmp(url, szURL)) continue;
 
 		if (end_range) {
@@ -6856,7 +7002,7 @@
 #ifdef GPAC_HAS_HTTP2
 	if (sess->h2_local_buf_len) {
 		u8 was_eos = sess->h2_is_eos;
-		assert(sess->h2_send_data==NULL);
+		gf_assert(sess->h2_send_data==NULL);
 		sess->h2_send_data = sess->h2_local_buf;
 		sess->h2_send_data_len = sess->h2_local_buf_len;
 		gf_mx_p(sess->mx);
@@ -7043,14 +7189,915 @@
 	}
 }
 
-void gf_dm_sess_force_blocking(GF_DownloadSession *sess)
+void gf_dm_sess_detach_async(GF_DownloadSession *sess)
 {
 	if (sess->sock) {
 		while (sess->async_buf_size) {
 			gf_dm_sess_flush_async(sess, GF_FALSE);
 			gf_sleep(1);
 		}
-		gf_sk_set_block_mode(sess->sock, GF_FALSE);
+		gf_sk_set_block_mode(sess->sock, GF_TRUE);
+	}
+	sess->flags |= GF_NETIO_SESSION_NO_BLOCK;
+	//FOR TEST INLY
+	sess->flags &= ~GF_NETIO_SESSION_NOT_THREADED;
+	//mutex may already be created for H2 sessions
+	if (!sess->mx)
+		sess->mx = gf_mx_new(sess->orig_url);
+}
+
+void gf_dm_sess_set_timeout(GF_DownloadSession *sess, u32 timeout)
+{
+	if (sess) sess->request_timeout = 1000*timeout;
+}
+
+void gf_dm_sess_set_netcap_id(GF_DownloadSession *sess, const char *netcap_id)
+{
+	if (sess) sess->netcap_id = netcap_id;
+}
+
+
+//end GAPC_DISABLE_NETWORK
+#elif defined(GPAC_CONFIG_EMSCRIPTEN)
+#include <gpac/download.h>
+#include <gpac/list.h>
+#include <gpac/thread.h>
+#include <gpac/filters.h>
+
+struct __gf_download_manager
+{
+	GF_FilterSession *fsess;
+	GF_List *all_sessions;
+	GF_Mutex *mx;
+};
+
+GF_DownloadManager *gf_dm_new(GF_DownloadFilterSession *fsess)
+{
+	GF_DownloadManager *tmp;
+	GF_SAFEALLOC(tmp, GF_DownloadManager);
+	if (!tmp) return NULL;
+	tmp->fsess = fsess;
+	tmp->all_sessions = gf_list_new();
+	tmp->mx = gf_mx_new("cache");
+	return tmp;
+}
+void gf_dm_del(GF_DownloadManager *dm)
+{
+	if (!dm) return;
+	gf_list_del(dm->all_sessions);
+	gf_mx_del(dm->mx);
+	gf_free(dm);
+}
+
+u32 gf_dm_get_global_rate(GF_DownloadManager *dm)
+{
+	return 0;
+}
+void gf_dm_set_data_rate(GF_DownloadManager *dm, u32 rate_in_bits_per_sec)
+{
+}
+
+typedef struct __cache_blob
+{
+	GF_Blob blob;
+	char *url, *cache_name;
+	char *mime;
+	u64 start_range, end_range;
+	Bool persistent;
+} GF_CacheBlob;
+
+struct __gf_download_session
+{
+	GF_DownloadManager *dm;
+	gf_dm_user_io user_io;
+	void *usr_cbk;
+	char method100;
+
+	char *req_url;
+	char *rsp_url;
+	/*request headers*/
+	char **req_hdrs;
+	u32 nb_req_hdrs;
+	u32 req_body_size;
+	char *req_body;
+	u64 start_range, end_range;
+
+	/*response headers*/
+	char **rsp_hdrs;
+	u32 nb_rsp_hdrs;
+	char *mime; //pointer to content-type header or blob
+
+	u32 state, bps;
+	u64 start_time, start_time_utc;
+	u64 total_size, bytes_done;
+	GF_Err last_error;
+	GF_NetIOStatus netio_status;
+	u32 dl_flags;
+	Bool reuse_cache;
+	u32 ftask;
+	GF_List *cached_blobs;
+
+	GF_CacheBlob *active_cache;
+
+	Bool destroy, in_callback;
+
+};
+
+EM_JS(int, dm_fetch_cancel, (int sess), {
+  let fetcher = libgpac._get_fetcher(sess);
+  if (!fetcher) return -1;
+  fetcher._controller.abort();
+  libgpac._del_fetcher(fetcher);
+  return 0;
+});
+
+static void clear_headers(char ***_hdrs, u32 *nb_hdrs)
+{
+	char **hdrs = *_hdrs;
+	if (hdrs) {
+		u32 i=0;
+		for (i=0; i<*nb_hdrs; i++) {
+			if (hdrsi) gf_free(hdrsi);
+		}
+		gf_free(hdrs);
+		*_hdrs = NULL;
+		*nb_hdrs = 0;
 	}
-	sess->flags &= ~GF_NETIO_SESSION_NO_BLOCK;
 }
+
+void cache_blob_del(GF_CacheBlob *b)
+{
+	if (!b) return;
+	GF_LOG(GF_LOG_INFO, GF_LOG_HTTP, ("Downloader Removing cache entry of %s (%s - range "LLU"-"LLU")\n", b->url, b->cache_name, b->start_range, b->end_range));
+	gf_blob_unregister(&b->blob);
+	if (b->blob.data) gf_free(b->blob.data);
+	if (b->url) gf_free(b->url);
+	if (b->cache_name) gf_free(b->cache_name);
+	if (b->mime) gf_free(b->mime);
+	gf_free(b);
+}
+
+static void gf_dm_sess_reset(GF_DownloadSession *sess)
+{
+	if (!sess) return;
+	clear_headers(&sess->req_hdrs, &sess->nb_req_hdrs);
+	clear_headers(&sess->rsp_hdrs, &sess->nb_rsp_hdrs);
+	if (sess->req_body) gf_free(sess->req_body);
+	sess->req_body = NULL;
+
+	if (sess->state==1) {
+		dm_fetch_cancel(EM_CAST_PTR sess);
+	}
+	if (sess->req_url) gf_free(sess->req_url);
+	sess->req_url = NULL;
+	if (sess->rsp_url) gf_free(sess->rsp_url);
+	sess->rsp_url = NULL;
+	sess->mime = NULL;
+	sess->state = 0;
+	sess->total_size = 0;
+	sess->bytes_done = 0;
+	sess->start_time = 0;
+	sess->start_range = 0;
+	sess->end_range = 0;
+	sess->bps = 0;
+	sess->last_error = GF_OK;
+	sess->reuse_cache = GF_FALSE;
+	sess->netio_status = GF_NETIO_SETUP;
+}
+
+
+EM_JS(int, fs_fetch_setup, (), {
+	if ((typeof libgpac.gpac_fetch == 'boolean') && !libgpac.gpac_fetch) return 2;
+	if (typeof libgpac._fetcher_set_header == 'function') return 1;
+	try {
+		libgpac._fetchers = ;
+		libgpac._get_fetcher = (sess) => {
+          for (let i=0; i<libgpac._fetchers.length; i++) {
+            if (libgpac._fetchersi.sess==sess) return libgpac._fetchersi;
+          }
+          return null;
+		};
+		libgpac._del_fetcher = (fetcher) => {
+          let i = libgpac._fetchers.indexOf(fetcher);
+          if (i>=0) libgpac._fetchers.splice(i, 1);
+		};
+        libgpac._fetcher_set_header = libgpac.cwrap('gf_dm_sess_push_header', null, 'number', 'string', 'string');
+        libgpac._fetcher_set_reply = libgpac.cwrap('gf_dm_sess_async_reply', null, 'number', 'number', 'string');
+	} catch (e) {
+		return 0;
+	}
+	return 1;
+});
+
+static GF_Err gf_dm_setup_cache(GF_DownloadSession *sess)
+{
+	if (sess->active_cache) {
+		if (!sess->cached_blobs) {
+			cache_blob_del(sess->active_cache);
+		}
+		else if (sess->active_cache->blob.flags & GF_BLOB_CORRUPTED) {
+			gf_list_del_item(sess->cached_blobs, sess->active_cache);
+			cache_blob_del(sess->active_cache);
+		}
+		//remove if not persistent
+		else if (!sess->active_cache->persistent) {
+			gf_list_del_item(sess->cached_blobs, sess->active_cache);
+			cache_blob_del(sess->active_cache);
+		}
+		sess->active_cache = NULL;
+	}
+	//look in session for cache
+	if (sess->cached_blobs) {
+		u32 i, count = gf_list_count(sess->cached_blobs);
+		for (i=0; i<count; i++) {
+			GF_CacheBlob *cb = gf_list_get(sess->cached_blobs, i);
+			if (strcmp(cb->url, sess->req_url)) continue;
+			if (cb->start_range != sess->start_range) continue;
+			if (cb->end_range != sess->end_range) continue;
+			if (!cb->blob.size) continue;
+			sess->active_cache = cb;
+			sess->reuse_cache = GF_TRUE;
+			sess->total_size = cb->blob.size;
+			sess->bytes_done = 0;
+			sess->netio_status = GF_NETIO_DATA_EXCHANGE;
+			sess->last_error = GF_OK;
+			sess->mime = cb->mime;
+			sess->dl_flags &= ~GF_NETIO_SESSION_KEEP_FIRST_CACHE;
+			return GF_OK;
+		}
+	}
+	if (!(sess->dl_flags & GF_NETIO_SESSION_MEMORY_CACHE)) {
+		return GF_OK;
+	}
+
+	GF_SAFEALLOC(sess->active_cache, GF_CacheBlob);
+	if (!sess->active_cache) return GF_OUT_OF_MEM;
+	if (!sess->cached_blobs) sess->cached_blobs = gf_list_new();
+
+	gf_list_add(sess->cached_blobs, sess->active_cache);
+	sess->active_cache->cache_name = gf_blob_register(&sess->active_cache->blob);
+
+	sess->active_cache->blob.flags = GF_BLOB_IN_TRANSFER;
+	sess->active_cache->url = gf_strdup(sess->req_url);
+	sess->active_cache->start_range = sess->start_range;
+	sess->active_cache->end_range = sess->end_range;
+	sess->reuse_cache = GF_FALSE;
+	//only files marked with GF_NETIO_SESSION_KEEP_FIRST_CACHE are kept in our local cache
+	//all other cache settings are ignored, we rely on browser cache for this
+	if (sess->dl_flags & GF_NETIO_SESSION_KEEP_FIRST_CACHE) {
+		sess->active_cache->persistent = GF_TRUE;
+		sess->dl_flags &= ~GF_NETIO_SESSION_KEEP_FIRST_CACHE;
+	} else {
+		sess->active_cache->persistent = GF_FALSE;
+	}
+	GF_LOG(GF_LOG_INFO, GF_LOG_HTTP, ("Downloader Setting up memory cache for %s - persistent %d - name %s\n", sess->req_url, sess->active_cache->persistent, sess->active_cache->cache_name));
+	return GF_OK;
+}
+
+GF_EXPORT
+GF_DownloadSession *gf_dm_sess_new(GF_DownloadManager *dm, const char *url, u32 dl_flags,
+                                   gf_dm_user_io user_io,
+                                   void *usr_cbk,
+                                   GF_Err *e)
+{
+	GF_NETIO_Parameter par;
+	GF_DownloadSession *sess;
+
+	int fetch_init = fs_fetch_setup();
+	if (fetch_init==2) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_HTTP, ("Downloader fecth() disabled\n"));
+		if (e) *e = GF_NOT_SUPPORTED;
+		return NULL;
+	} else if (fetch_init==0) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_HTTP, ("Downloader Failed to initialize fetch\n"));
+		if (e) *e = GF_SERVICE_ERROR;
+		return NULL;
+	}
+
+	GF_SAFEALLOC(sess, GF_DownloadSession);
+	if (!sess) {
+		if (e) *e = GF_OUT_OF_MEM;
+		return NULL;
+	}
+	sess->dm = dm;
+	sess->req_url = gf_strdup(url);
+	if (!sess->req_url) {
+		gf_free(sess);
+		if (e) *e = GF_OUT_OF_MEM;
+		return NULL;
+	}
+	sess->user_io = user_io;
+	sess->usr_cbk = usr_cbk;
+
+	strcpy(sess->method, "GET");
+
+	sess->dl_flags = dl_flags;
+
+	if (dl_flags & GF_NETIO_SESSION_MEMORY_CACHE) {
+		sess->cached_blobs = gf_list_new();
+	}
+
+	if (user_io) {
+		memset(&par, 0, sizeof(GF_NETIO_Parameter));
+		par.msg_type = GF_NETIO_GET_METHOD;
+		sess->user_io(sess->usr_cbk, &par);
+		if (par.name) strcpy(sess->method, par.name);
+
+		sess->nb_req_hdrs=0;
+		while (1) {
+			par.msg_type = GF_NETIO_GET_HEADER;
+			par.value = NULL;
+			sess->user_io(sess->usr_cbk, &par);
+			if (!par.value) break;
+
+			sess->req_hdrs = gf_realloc(sess->req_hdrs, sizeof(char*) * (sess->nb_req_hdrs+2));
+			if (!sess->req_hdrs) {
+				if (e) *e = GF_OUT_OF_MEM;
+				gf_free(sess);
+				return NULL;
+			}
+			sess->req_hdrssess->nb_req_hdrs = gf_strdup(par.name);
+			sess->req_hdrssess->nb_req_hdrs+1 = gf_strdup(par.value);
+			sess->nb_req_hdrs+=2;
+		}
+
+		memset(&par, 0, sizeof(GF_NETIO_Parameter));
+		par.msg_type = GF_NETIO_GET_CONTENT;
+		sess->user_io(sess->usr_cbk, &par);
+
+		sess->req_body_size = par.size;
+		if (par.size && par.data) {
+			sess->req_body = gf_malloc(sizeof(u8)*par.size);
+			if (!sess->req_body) {
+				gf_dm_sess_reset(sess);
+				gf_list_del(sess->cached_blobs);
+				if (e) *e = GF_OUT_OF_MEM;
+				gf_free(sess);
+				return NULL;
+			}
+			memcpy(sess->req_body, par.data, par.size);
+		}
+	}
+	if (e) *e = GF_OK;
+	*e = gf_dm_setup_cache(sess);
+	if (*e) {
+		gf_dm_sess_del(sess);
+		return NULL;
+	}
+	if (dm) {
+		gf_mx_p(dm->mx);
+		gf_list_add(dm->all_sessions, sess);
+		gf_mx_v(dm->mx);
+	}
+
+	sess->user_io = user_io;
+	sess->usr_cbk = usr_cbk;
+
+	return sess;
+}
+
+void gf_dm_sess_abort(GF_DownloadSession * sess)
+{
+	if (sess->state==1) {
+		dm_fetch_cancel(EM_CAST_PTR sess);
+		sess->state = 0;
+		sess->netio_status = GF_NETIO_DISCONNECTED;
+		sess->last_error = GF_IP_CONNECTION_CLOSED;
+		if (sess->active_cache && !sess->reuse_cache && (sess->active_cache->blob.flags & GF_BLOB_IN_TRANSFER)) {
+			sess->active_cache->blob.flags = GF_BLOB_CORRUPTED;
+		}
+	}
+	clear_headers(&sess->rsp_hdrs, &sess->nb_rsp_hdrs);
+	if (sess->ftask) sess->ftask = 2;
+}
+
+void gf_dm_sess_del(GF_DownloadSession *sess)
+{
+	if (sess->in_callback) {
+		sess->destroy = GF_TRUE;
+		return;
+	}
+	gf_dm_sess_reset(sess);
+	while (gf_list_count(sess->cached_blobs)) {
+		cache_blob_del( gf_list_pop_back(sess->cached_blobs) );
+	}
+	gf_list_del(sess->cached_blobs);
+	if (sess->dm) {
+		gf_mx_p(sess->dm->mx);
+		gf_list_del_item(sess->dm->all_sessions, sess);
+		gf_mx_v(sess->dm->mx);
+	}
+	gf_free(sess);
+}
+
+const char *gf_dm_sess_get_cache_name(GF_DownloadSession *sess)
+{
+	if (!sess || !sess->active_cache) return NULL;
+	return sess->active_cache->cache_name;
+}
+
+void gf_dm_sess_force_memory_mode(GF_DownloadSession *sess, u32 force_keep)
+{
+	if (!sess) return;
+	sess->dl_flags |= GF_NETIO_SESSION_MEMORY_CACHE;
+	if (force_keep==1) {
+		//cache is handled by the browser if any, or forced by fetch headers provied by users
+		//sess->dl_flags |= GF_NETIO_SESSION_KEEP_CACHE;
+	} else if (force_keep==2) {
+		sess->dl_flags |= GF_NETIO_SESSION_KEEP_FIRST_CACHE;
+	}
+}
+
+GF_Err gf_dm_sess_setup_from_url(GF_DownloadSession *sess, const char *url, Bool allow_direct_reuse)
+{
+	gf_dm_sess_reset(sess);
+	sess->req_url = gf_strdup(url);
+	if (!sess->req_url) {
+		sess->state=2;
+		return GF_OUT_OF_MEM;
+	}
+	return gf_dm_setup_cache(sess);
+}
+
+GF_Err gf_dm_sess_set_range(GF_DownloadSession *sess, u64 start_range, u64 end_range, Bool discontinue_cache)
+{
+	if (!sess) return GF_BAD_PARAM;
+	if (sess->state==1) return GF_BAD_PARAM;
+	sess->start_range = start_range;
+	sess->end_range = end_range;
+	Bool cache_reset = GF_FALSE;
+	if ((sess->state!=2) || discontinue_cache) {
+		cache_reset = GF_TRUE;
+	}
+	else if (sess->active_cache) {
+		if (sess->active_cache->start_range + sess->active_cache->end_range + 1 == start_range) {
+			sess->active_cache->end_range = end_range;
+			sess->active_cache->blob.flags |= GF_BLOB_IN_TRANSFER;
+		} else {
+			cache_reset = GF_TRUE;
+		}
+	}
+	//set range called before starting session, just adjust cache
+	if (sess->active_cache && cache_reset && !sess->state) {
+		sess->active_cache->start_range = sess->start_range;
+		sess->active_cache->end_range = sess->end_range;
+		cache_reset=GF_FALSE;
+	}
+	if (cache_reset) {
+		GF_LOG(GF_LOG_INFO, GF_LOG_HTTP, ("Downloader Cache discontinuity, reset\n", sess->req_url, sess->active_cache->persistent, sess->active_cache->cache_name));
+		GF_Err e = gf_dm_setup_cache(sess);
+		if (e) return e;
+		sess->last_error = GF_OK;
+	}
+	sess->netio_status = GF_NETIO_CONNECTED;
+	sess->state = 0;
+	return GF_OK;
+}
+
+
+
+EM_JS(int, dm_fetch_init, (int sess, int _url, int _method, int _headers, int nb_headers, int req_body, int req_body_size), {
+  let url = _url ? libgpac.UTF8ToString(_url) : null;
+  ret = GPAC.OK;
+
+  let fetcher = libgpac._get_fetcher(sess);
+  if (!fetcher) {
+	fetcher = {};
+	fetcher.sess = sess;
+	libgpac._fetchers.push(fetcher);
+  }
+
+  fetcher._controller = new AbortController();
+  let options = {
+	signal: fetcher._controller.signal,
+	method: _method ? libgpac.UTF8ToString(_method) : "GET",
+	mode: libgpac.gpac_fetch_mode || 'cors',
+  };
+  let mime_type = 'application/octet-stream';
+  options.headers = {};
+  if (_headers) {
+	for (let i=0; i<nb_headers; i+=2) {
+	  let _s = libgpac.getValue(_headers+i*4, 'i32');
+	  let h_name = _s ? libgpac.UTF8ToString(_s).toLowerCase() : "";
+	  _s = libgpac.getValue(_headers+(i+1)*4, 'i32');
+	  let h_val = _s ? libgpac.UTF8ToString(_s) : "";
+	  if (h_name.length && h_val.length) {
+		  options.headersh_name = h_val;
+		  if (h_name=='content-type')
+			mime_type = h_val;
+	  }
+	}
+  }
+  if (typeof libgpac.gpac_extra_headers == 'object') {
+	for (const hdr in libgpac.gpac_extra_headers) {
+	  options.headershdr = objecthdr;
+	}
+  }
+
+  if (req_body) {
+	let body_ab = new Uint8Array(libgpac.HEAPU8.buffer, req_body, req_body_size);
+	options.body = new Blob(body_ab, {type: mime_type} );
+  }
+  fetcher._state = 0;
+  fetch(url, options).then( (response) => {
+	if (response.ok) {
+	  fetcher._state = 1;
+	  fetcher._bytes = 0;
+	  fetcher._reader = response.body.getReader();
+
+	  let final_url = null;
+	  if (response.redirected) final_url = response.url;
+	  libgpac._fetcher_set_reply(fetcher.sess, response.status, final_url);
+
+	  response.headers.forEach((value, key) => {
+		libgpac._fetcher_set_header(fetcher.sess, key, value);
+	  });
+      libgpac._fetcher_set_header(fetcher.sess, 0, 0);
+	} else {
+	  libgpac._fetcher_set_reply(fetcher.sess, response.status, null);
+	  fetcher._state = 3;
+	}
+  })
+  .catch( (e) => {
+	  do_log_err('fetcher exception ' + e);
+	  ret = GPAC.REMOTE_SERVICE_ERROR;
+	  libgpac._del_fetcher(fetcher);
+  });
+  return ret;
+});
+
+
+EM_JS(int, dm_fetch_data, (int sess, int buffer, int buffer_size, int read_size), {
+  let f = libgpac._get_fetcher(sess);
+  if (!f) return -1;
+  if (f._state==0) return -44;
+  if (f._state==3) return -12;
+  if (f._state==4) return 1;
+  if (f._state == 1) {
+	f._state = 0;
+	f._reader.read().then( (block) => {
+		if (block.done) {
+			f._state = 4;
+		} else {
+			f._ab = block.value;
+			f._bytes += f._ab.byteLength;
+			f._block_pos = 0;
+			f._state = 2;
+		}
+	})
+	.catch( e => {
+		f._state = 0;
+	});
+	if (f._state==0) return -44;
+  }
+
+  let avail = f._ab.byteLength - f._block_pos;
+  if (avail<buffer_size) buffer_size = avail;
+
+  //copy array buffer
+  let src = f._ab.subarray(f._block_pos, f._block_pos+buffer_size);
+  let dst = new Uint8Array(libgpac.HEAPU8.buffer, buffer, buffer_size);
+  dst.set(src);
+
+  libgpac.setValue(read_size, buffer_size, 'i32');
+  f._block_pos += buffer_size;
+  if (f._ab.byteLength == f._block_pos) {
+	  f._ab = null;
+	  f._state = 1;
+  }
+  return 0;
+});
+
+
+GF_Err gf_dm_sess_fetch_data(GF_DownloadSession *sess, char *buffer, u32 buffer_size, u32 *read_size)
+{
+	if (sess->reuse_cache) {
+		u32 remain = sess->active_cache->blob.size - sess->bytes_done;
+		if (!remain) {
+			*read_size = 0;
+			sess->last_error = GF_EOS;
+			sess->netio_status = GF_NETIO_DATA_TRANSFERED;
+			return GF_EOS;
+		}
+		if (remain < buffer_size) buffer_size = remain;
+		memcpy(buffer, sess->active_cache->blob.data + sess->bytes_done, buffer_size);
+		*read_size = buffer_size;
+		sess->bytes_done += buffer_size;
+		return GF_OK;
+	}
+	if (sess->state == 0) {
+		if (sess->start_range || sess->end_range) {
+			char szHdr100;
+			if (sess->end_range)
+				sprintf(szHdr, "bytes="LLU"-"LLU, sess->start_range, sess->end_range);
+			else
+				sprintf(szHdr, "bytes="LLU"-", sess->start_range);
+
+			sess->req_hdrs = gf_realloc(sess->req_hdrs, sizeof(char*) * (sess->nb_req_hdrs+2));
+			if (!sess->req_hdrs) {
+				sess->state = 2;
+				return sess->last_error = GF_OUT_OF_MEM;
+			}
+			sess->req_hdrssess->nb_req_hdrs = gf_strdup("Range");
+			sess->req_hdrssess->nb_req_hdrs+1 = gf_strdup(szHdr);
+			sess->nb_req_hdrs+=2;
+		}
+
+		sess->start_time_utc = gf_net_get_utc();
+		sess->start_time = gf_sys_clock();
+		sess->netio_status = GF_NETIO_CONNECTED;
+
+		if (sess->start_range || sess->end_range) {
+			GF_LOG(GF_LOG_INFO, GF_LOG_HTTP, ("Downloader Starting download of %s (%s - range "LLU"-"LLU")\n", sess->req_url, sess->active_cache ? sess->active_cache->cache_name : "no cache", sess->start_range, sess->end_range));
+		} else {
+			GF_LOG(GF_LOG_INFO, GF_LOG_HTTP, ("Downloader Starting download of %s (%s)\n", sess->req_url, sess->active_cache ? sess->active_cache->cache_name : "no cache"));
+		}
+		GF_Err fetch_e = dm_fetch_init(
+			EM_CAST_PTR sess,
+			EM_CAST_PTR sess->req_url,
+			EM_CAST_PTR sess->method,
+			EM_CAST_PTR sess->req_hdrs,
+			sess->nb_req_hdrs,
+			EM_CAST_PTR sess->req_body,
+			sess->req_body_size
+		);
+
+		if (fetch_e) {
+			gf_dm_sess_reset(sess);
+			sess->state = 2;
+			sess->netio_status = GF_NETIO_DISCONNECTED;
+			return sess->last_error = fetch_e;
+		}
+		sess->state = 1;
+		sess->netio_status = GF_NETIO_WAIT_FOR_REPLY;
+	}
+	if (sess->state==2) return sess->last_error;
+
+	*read_size = 0;
+	GF_Err fetch_err = dm_fetch_data(
+		EM_CAST_PTR sess,
+		EM_CAST_PTR buffer,
+		buffer_size,
+		EM_CAST_PTR read_size
+	);
+
+	if (*read_size) {
+		u64 ellapsed = gf_sys_clock() - sess->start_time;
+		sess->bytes_done += *read_size;
+		if (ellapsed)
+			sess->bps = (u32) (sess->bytes_done * 1000 / ellapsed);
+		sess->netio_status = GF_NETIO_DATA_EXCHANGE;
+
+		if (sess->active_cache) {
+			u32 nb_bytes= *read_size;
+			sess->active_cache->blob.data = gf_realloc(sess->active_cache->blob.data, sess->active_cache->blob.size + nb_bytes);
+			if (!sess->active_cache->blob.data) {
+				sess->active_cache->blob.flags |= GF_BLOB_CORRUPTED;
+			} else {
+				memcpy(sess->active_cache->blob.data + sess->active_cache->blob.size, buffer, nb_bytes);
+				sess->active_cache->blob.size += nb_bytes;
+			}
+		}
+		if (sess->total_size == sess->bytes_done) fetch_err = GF_EOS;
+
+	} else if (!fetch_err) {
+		return GF_IP_NETWORK_EMPTY;
+	} else if (fetch_err!=GF_IP_NETWORK_EMPTY) {
+		sess->state=2;
+		sess->last_error = fetch_err;
+		sess->netio_status = GF_NETIO_STATE_ERROR;
+		if (sess->active_cache)
+			sess->active_cache->blob.flags = GF_BLOB_CORRUPTED;
+	}
+
+	if (fetch_err==GF_EOS) {
+		sess->total_size = sess->bytes_done;
+		sess->state=2;
+		sess->last_error = GF_EOS;
+		sess->netio_status = GF_NETIO_DATA_TRANSFERED;
+		GF_LOG(GF_LOG_INFO, GF_LOG_HTTP, ("Downloader Done downloading %s - rate %d bps\n", sess->req_url, sess->bps));
+		if (sess->active_cache)
+			sess->active_cache->blob.flags &= ~GF_BLOB_IN_TRANSFER;
+	}
+	return fetch_err;
+}
+
+
+GF_Err gf_dm_sess_get_stats(GF_DownloadSession * sess, const char **server, const char **path, u64 *total_size, u64 *bytes_done, u32 *bytes_per_sec, GF_NetIOStatus *net_status)
+{
+	if (!sess) return GF_OUT_OF_MEM;
+	if (total_size) *total_size = sess->total_size;
+	if (bytes_done) *bytes_done = sess->bytes_done;
+	if (bytes_per_sec) *bytes_per_sec = sess->bps;
+	if (net_status) *net_status = sess->netio_status;
+	return sess->last_error;
+}
+
+const char *gf_dm_sess_mime_type(GF_DownloadSession * sess)
+{
+	return sess->mime;
+}
+
+GF_Err gf_dm_sess_enum_headers(GF_DownloadSession *sess, u32 *idx, const char **hdr_name, const char **hdr_val)
+{
+	if( !sess || !idx || !hdr_name || !hdr_val)
+		return GF_BAD_PARAM;
+	if (*idx >= sess->nb_rsp_hdrs/2) return GF_EOS;
+
+	u32 i = *idx * 2;
+	(*hdr_name) = sess->rsp_hdrsi;
+	(*hdr_val) = sess->rsp_hdrsi+1;
+	(*idx) = (*idx) + 1;
+	return GF_OK;
+}
+
+void gf_dm_delete_cached_file_entry_session(const GF_DownloadSession * sess, const char * url, Bool force)
+{
+	//unused we automatically purge cache when setting up session
+	if (!sess || !force) return;
+	if (sess->state==1) return;
+	if (sess->active_cache) {
+		gf_list_del_item(sess->cached_blobs, sess->active_cache);
+		cache_blob_del(sess->active_cache);
+		((GF_DownloadSession *)sess)->active_cache = NULL;
+	}
+}
+
+GF_Err gf_dm_sess_process_headers(GF_DownloadSession *sess)
+{
+	//no control of this for fetch
+	return GF_OK;
+}
+
+GF_EXPORT
+void gf_dm_sess_push_header(GF_DownloadSession *sess, const char *hdr, const char *value)
+{
+	if (!sess) return;
+	if (!hdr || !value) return;
+
+	if (!stricmp(hdr, "Content-Length")) {
+		sscanf(value, LLU, &sess->total_size);
+	}
+
+	sess->rsp_hdrs = gf_realloc(sess->rsp_hdrs, sizeof(char*) * (sess->nb_rsp_hdrs+2));
+	if (!sess->rsp_hdrs) return;
+
+	sess->rsp_hdrssess->nb_rsp_hdrs = gf_strdup(hdr);
+	sess->rsp_hdrssess->nb_rsp_hdrs+1 = gf_strdup(value);
+	if (!stricmp(hdr, "Content-Type")) {
+		sess->mime = sess->rsp_hdrssess->nb_rsp_hdrs+1;
+		//keep a copy of mime
+		if (sess->active_cache && sess->active_cache->persistent)
+			sess->active_cache->mime = gf_strdup(sess->mime);
+	}
+	sess->nb_rsp_hdrs+=2;
+}
+
+GF_EXPORT
+void gf_dm_sess_async_reply(GF_DownloadSession *sess, int rsp_code, const char *final_url)
+{
+	if (!sess) return;
+	GF_Err e;
+	switch (rsp_code) {
+	case 404: e = GF_URL_ERROR; break;
+	case 400: e = GF_SERVICE_ERROR; break;
+	case 401: e = GF_AUTHENTICATION_FAILURE; break;
+	case 405: e = GF_AUTHENTICATION_FAILURE; break;
+	case 416: e = GF_SERVICE_ERROR; break; //range error
+	default:
+		if (rsp_code>=500) e = GF_REMOTE_SERVICE_ERROR;
+		else if (rsp_code>=400) e = GF_SERVICE_ERROR;
+		else e = GF_OK;
+		break;
+	}
+	sess->last_error = e;
+
+	if (final_url) {
+		if (sess->rsp_url) gf_free(sess->rsp_url);
+		sess->rsp_url = final_url ? gf_strdup(final_url) : NULL;
+	}
+}
+
+GF_Err gf_dm_sess_fetch_once(GF_DownloadSession *sess)
+{
+	GF_NETIO_Parameter par;
+	char buffer10000;
+	u32 read = 0;
+	GF_Err e = gf_dm_sess_fetch_data(sess, buffer, 10000, &read);
+	if (e==GF_IP_NETWORK_EMPTY) {
+
+	} else if ((e==GF_OK) || (e==GF_EOS)) {
+		if (sess->user_io && read) {
+			memset(&par, 0, sizeof(GF_NETIO_Parameter));
+			par.sess = sess;
+			par.error = sess->last_error;
+			if (e) {
+				par.msg_type = GF_NETIO_DATA_TRANSFERED;
+			} else {
+				par.msg_type = GF_NETIO_DATA_EXCHANGE;
+				par.data = buffer;
+				par.size = read;
+			}
+			sess->in_callback = GF_FALSE;
+			sess->user_io(sess->usr_cbk, &par);
+			sess->in_callback = GF_FALSE;
+		}
+	} else {
+		if (sess->user_io) {
+			memset(&par, 0, sizeof(GF_NETIO_Parameter));
+			par.sess = sess;
+			par.msg_type = sess->netio_status;
+			par.error = sess->last_error;
+			sess->in_callback = GF_TRUE;
+			sess->user_io(sess->usr_cbk, &par);
+			sess->in_callback = GF_FALSE;
+		}
+	}
+	return e;
+}
+
+Bool gf_dm_session_task(GF_FilterSession *fsess, void *callback, u32 *reschedule_ms)
+{
+	Bool ret = GF_TRUE;
+	GF_DownloadSession *sess = callback;
+	if (!sess) return GF_FALSE;
+	gf_assert(sess->ftask);
+	if (sess->ftask==2) {
+		sess->ftask = 0;
+		return GF_FALSE;
+	}
+
+	GF_Err e = gf_dm_sess_fetch_once(sess);
+	if (e==GF_EOS) ret = GF_FALSE;
+	else if (e && (e!=GF_IP_NETWORK_EMPTY)) ret = GF_FALSE;
+
+	if (ret) {
+		*reschedule_ms = 1;
+		return GF_TRUE;
+	}
+	sess->ftask = 0;
+	if (sess->destroy) {
+		sess->destroy = GF_FALSE;
+		gf_dm_sess_del(sess);
+	}
+	return GF_FALSE;
+}
+
+GF_Err gf_dm_sess_process(GF_DownloadSession *sess)
+{
+	if (sess->netio_status == GF_NETIO_DATA_TRANSFERED) {
+		return GF_OK;
+	}
+
+	if ((sess->dl_flags & GF_NETIO_SESSION_NOT_THREADED) || !sess->dm->fsess) {
+		return gf_dm_sess_fetch_once(sess);
+	}
+	//ignore if task already allocated
+	if (sess->ftask) return GF_OK;
+	sess->ftask = GF_TRUE;
+	return gf_fs_post_user_task(sess->dm->fsess, gf_dm_session_task, sess, "download");
+}
+
+
+const char *gf_dm_sess_get_resource_name(GF_DownloadSession *sess)
+{
+	if (!sess) return NULL;
+	return sess->rsp_url ? sess->rsp_url : sess->req_url;
+}
+
+const char *gf_dm_sess_get_header(GF_DownloadSession *sess, const char *name)
+{
+	u32 i;
+	if (!sess || !name) return NULL;
+	for (i=0; i<sess->nb_rsp_hdrs; i+=2) {
+		char *h = sess->rsp_hdrsi;
+		if (!stricmp(h, name)) return sess->rsp_hdrsi+1;
+	}
+	return NULL;
+}
+
+u64 gf_dm_sess_get_utc_start(GF_DownloadSession * sess)
+{
+	if (!sess) return 0;
+	return sess->start_time_utc;
+}
+
+//only used for dash playing local files
+u32 gf_dm_get_data_rate(GF_DownloadManager *dm)
+{
+	return gf_opts_get_int("core", "maxrate");
+}
+
+void gf_dm_sess_detach_async(GF_DownloadSession *sess)
+{
+	if (!sess) return;
+	sess->dl_flags &= ~GF_NETIO_SESSION_NOT_THREADED;
+	gf_dm_sess_force_memory_mode(sess, 1);
+}
+void gf_dm_sess_set_netcap_id(GF_DownloadSession *sess, const char *netcap_id)
+{
+
+}
+
+#endif // GPAC_CONFIG_EMSCRIPTEN
+

gpac-2.2.1.tar.gz/src/utils/error.c -> gpac-2.4.0.tar.gz/src/utils/error.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2022
+ *			Copyright (c) Telecom ParisTech 2000-2024
  *					All rights reserved
  *
  *  This file is part of GPAC / common tools sub-project
@@ -30,19 +30,17 @@
 //ugly patch, we have a concurrence issue with gf_4cc_to_str, for now fixed by rolling buffers
 #define NB_4CC_BUF	10
 static char szTYPE_BUFNB_4CC_BUFGF_4CC_MSIZE;
-static u32 buf_4cc_idx=0;
+static u32 buf_4cc_idx = NB_4CC_BUF;
 
 GF_EXPORT
-const char *gf_4cc_to_str(u32 type)
+const char *gf_4cc_to_str_safe(u32 type, char szTypeGF_4CC_MSIZE)
 {
 	u32 ch, i;
-	char *szTYPE = szTYPE_BUFbuf_4cc_idx;
-	char *name = (char *)szTYPE;
-	if (!type) return "00000000";
-	buf_4cc_idx++;
-	if (buf_4cc_idx>=NB_4CC_BUF)
-		buf_4cc_idx=0;
-
+	if (!type) {
+		strcpy(szType, "00000000");
+		return szType;
+	}
+	char *name = (char *)szType;
 	for (i = 0; i < 4; i++) {
 		ch = type >> (8 * (3-i) ) & 0xff;
 		if ( ch >= 0x20 && ch <= 0x7E ) {
@@ -54,14 +52,27 @@
 		}
 	}
 	*name = 0;
-	return (const char *) szTYPE;
+	return szType;
+}
+#include <gpac/thread.h>
+
+GF_EXPORT
+const char *gf_4cc_to_str(u32 type)
+{
+	if (!type) return "00000000";
+	if (safe_int_dec(&buf_4cc_idx)==0)
+		buf_4cc_idx=NB_4CC_BUF;
+
+	return gf_4cc_to_str_safe(type, szTYPE_BUFbuf_4cc_idx-1);
 }
 
+
+
 GF_EXPORT
 u32 gf_4cc_parse(const char *val)
 {
 	if (val && strlen(val)==4) return GF_4CC(val0, val1, val2, val3);
-	GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("Core Value is not a properly defined 4CC", val));
+	GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("Core Value %s is not a properly defined 4CC\n", val));
 	return 0;
 }
 
@@ -109,12 +120,13 @@
 
 	pos = MIN((u32) (20 * prog), 20);
 
-	if (pos>prev_pos) {
+	if (done != total && pos>prev_pos) {
 		prev_pos = 0;
 		prev_pc = 0;
 	}
 	pc = (u32) ( 100 * prog);
-	if ((pos!=prev_pos) || (pc!=prev_pc)) {
+
+	if ((done != total || prev_pos ) && ((pos!=prev_pos) || (pc!=prev_pc))) {
 		prev_pos = pos;
 		prev_pc = pc;
 		fprintf(stderr, "%s: |%s| (%02d/100)%c", szT, szProgpos, pc, gf_prog_lf);
@@ -207,6 +219,20 @@
 
 #endif
 
+u32 gf_log_parse_tool(const char *logs)
+{
+#ifndef GPAC_DISABLE_LOG
+	u32 i;
+	for (i=0; i<GF_LOG_TOOL_MAX; i++) {
+		if (!strcmp(global_log_toolsi.name, logs))
+			return global_log_toolsi.type;
+	}
+	if (!strcmp(logs, "all"))
+		return GF_LOG_ALL;
+#endif
+	return GF_LOG_TOOL_UNDEFINED;
+}
+
 GF_EXPORT
 GF_Err gf_log_modify_tools_levels(const char *val_)
 {
@@ -214,7 +240,7 @@
 	char tmpGF_LOG_TOOL_MAX_NAME_SIZE;
 	const char *val = tmp;
 	if (!val_) val_ = "";
-	assert(strlen(val_) < GF_LOG_TOOL_MAX_NAME_SIZE);
+	if (strlen(val_) >= GF_LOG_TOOL_MAX_NAME_SIZE) return GF_BAD_PARAM;
 	strncpy(tmp, val_, GF_LOG_TOOL_MAX_NAME_SIZE - 1);
 	tmpGF_LOG_TOOL_MAX_NAME_SIZE - 1 = 0;
 
@@ -232,6 +258,12 @@
 				if (!val3) break;
 				val += 4;
 				continue;
+			} else if (!strcmp(val, "cl")) {
+				gpac_no_color_logs = GF_FALSE;
+				gf_log_set_callback(NULL, default_log_callback);
+				if (!val2) break;
+				val += 3;
+				continue;
 			} else if (!strcmp(val, "strict")) {
 				gf_log_set_strict_error(GF_TRUE);
 				if (!val6) break;
@@ -292,6 +324,10 @@
 				gpac_no_color_logs = GF_TRUE;
 				gf_log_set_callback(NULL, default_log_callback);
 			}
+			else if (!strcmp(val, "cl")) {
+				gpac_no_color_logs = GF_FALSE;
+				gf_log_set_callback(NULL, default_log_callback);
+			}
 			else {
 				Bool found = GF_FALSE;
 				for (i=0; i<GF_LOG_TOOL_MAX; i++) {
@@ -608,9 +644,71 @@
 u32 call_lev = 0;
 u32 call_tool = 0;
 
+extern GF_Mutex *logs_mx;
+
+#include <gpac/list.h>
+GF_List *logs_extras = NULL;
+
+GF_EXPORT
+void gf_log_push_extra(const GF_LogExtra *log)
+{
+	if (!log) return;
+	gf_mx_p(logs_mx);
+	if (!logs_extras) logs_extras = gf_list_new();
+	if (gf_list_find(logs_extras, (void*)log)<0) {
+		gf_list_add(logs_extras, (void*)log);
+	}
+	gf_mx_v(logs_mx);
+}
+GF_EXPORT
+void gf_log_pop_extra(const GF_LogExtra *log)
+{
+	if (!log) return;
+	gf_mx_p(logs_mx);
+	gf_list_del_item(logs_extras, (void*)log);
+	gf_mx_v(logs_mx);
+}
+
+GF_EXPORT
+void gf_log_reset_extras()
+{
+	gf_mx_p(logs_mx);
+	gf_list_del(logs_extras);
+	logs_extras=NULL;
+	gf_mx_v(logs_mx);
+}
+
 GF_EXPORT
 Bool gf_log_tool_level_on(GF_LOG_Tool log_tool, GF_LOG_Level log_level)
 {
+	if (logs_extras) {
+		gf_mx_p(logs_mx);
+		u32 i, count = gf_list_count(logs_extras);
+		for (i=0;i<count;i++) {
+			GF_LogExtra *lf = gf_list_get(logs_extras, i);
+			u32 j;
+			for (j=0; j<lf->nb_tools; j++) {
+				if (lf->toolsj==GF_LOG_ALL) {}
+				else if (lf->toolsj==GF_LOG_TOOL_UNDEFINED) {
+					lf->toolsj = log_tool;
+				}
+				else if (log_tool!=lf->toolsj)
+					continue;
+
+				if (lf->levelsj >= log_level) {
+					gf_mx_v(logs_mx);
+					if (lf->strict && (log_level==GF_LOG_ERROR) && (log_tool != GF_LOG_MEMORY))
+						gf_log_set_strict_error(GF_TRUE);
+					return GF_TRUE;
+				}
+				if (lf->levelsj == GF_LOG_QUIET) {
+					gf_mx_v(logs_mx);
+					return GF_FALSE;
+				}
+			}
+		}
+		gf_mx_v(logs_mx);
+	}
 	if (log_tool==GF_LOG_TOOL_MAX) return GF_TRUE;
 	if (log_tool>GF_LOG_TOOL_MAX) return GF_FALSE;
 	if (global_log_toolslog_tool.level >= log_level) return GF_TRUE;
@@ -644,6 +742,7 @@
 FILE *gpac_log_file = NULL;
 Bool gpac_log_time_start = GF_FALSE;
 Bool gpac_log_utc_time = GF_FALSE;
+Bool gpac_log_dual = GF_FALSE;
 Bool last_log_is_lf = GF_TRUE;
 static u64 gpac_last_log_time=0;
 
@@ -681,6 +780,12 @@
 	if (gf_fileio_check(logs)) {
 		gf_fileio_printf((GF_FileIO *)logs, fmt, vlist);
 	} else {
+		if (gpac_log_dual && gpac_no_color_logs) {
+			va_list vlist_c;
+			va_copy(vlist_c, vlist);
+			vfprintf(stderr, fmt, vlist_c);
+			va_end(vlist_c);
+		}
 		vfprintf(logs, fmt, vlist);
 	}
 	gf_fflush(logs);
@@ -689,8 +794,14 @@
 void default_log_callback_color(void *cbck, GF_LOG_Level level, GF_LOG_Tool tool, const char *fmt, va_list vlist)
 {
 	if (gpac_log_file) {
-		default_log_callback(cbck, level, tool, fmt, vlist);
-		return;
+		if (!gpac_log_dual) {
+			default_log_callback(cbck, level, tool, fmt, vlist);
+			return;
+		}
+		va_list vlist_c;
+		va_copy(vlist_c, vlist);
+		default_log_callback(cbck, level, tool, fmt, vlist_c);
+		va_end(vlist_c);
 	}
 	switch(level) {
 	case GF_LOG_ERROR:
@@ -722,7 +833,9 @@
 static void *user_log_cbk = NULL;
 gf_log_cbk log_cbk = default_log_callback_color;
 static Bool log_exit_on_error = GF_FALSE;
-extern GF_Mutex *logs_mx;
+#ifdef GPAC_CONFIG_EMSCRIPTEN
+Bool gpac_log_console = GF_FALSE;
+#endif
 
 GF_EXPORT
 Bool gf_log_use_color()
@@ -733,12 +846,26 @@
 GF_EXPORT
 void gf_log(const char *fmt, ...)
 {
+#ifdef GPAC_CONFIG_EMSCRIPTEN
+	if (gpac_log_console && (call_tool!=GF_LOG_APP)) {
+		EM_ASM({
+			libgpac.in_logs = true;
+		});
+	}
+#endif
 	va_list vl;
 	va_start(vl, fmt);
 	gf_mx_p(logs_mx);
 	log_cbk(user_log_cbk, call_lev, call_tool, fmt, vl);
 	gf_mx_v(logs_mx);
 	va_end(vl);
+#ifdef GPAC_CONFIG_EMSCRIPTEN
+	if (gpac_log_console && (call_tool!=GF_LOG_APP)) {
+		EM_ASM({
+			libgpac.in_logs = false;
+		});
+	}
+#endif
 	if (log_exit_on_error && (call_lev==GF_LOG_ERROR) && (call_tool != GF_LOG_MEMORY)) {
 		exit(1);
 	}
@@ -764,7 +891,7 @@
 GF_EXPORT
 void gf_log_set_tool_level(GF_LOG_Tool tool, GF_LOG_Level level)
 {
-	assert(tool<=GF_LOG_TOOL_MAX);
+	if (tool>GF_LOG_TOOL_MAX) return;
 	if (tool==GF_LOG_ALL) {
 		u32 i;
 		for (i=0; i<GF_LOG_TOOL_MAX; i++) {
@@ -842,6 +969,15 @@
 	return GF_FALSE;
 }
 
+GF_EXPORT
+void gf_log_push_extra(const GF_LogExtra *log){}
+
+GF_EXPORT
+void gf_log_pop_extra(const GF_LogExtra *log){}
+
+GF_EXPORT
+void gf_log_reset_extras(){}
+
 #endif
 
 static char szErrMsg50;
@@ -932,8 +1068,8 @@
 		return "UDP traffic timeout";
 	case GF_AUTHENTICATION_FAILURE:
 		return "Authentication failure";
-	case GF_SCRIPT_NOT_READY:
-		return "Script not ready for playback";
+	case GF_NOT_READY:
+		return "Not ready, retry later";
 	case GF_INVALID_CONFIGURATION:
 		return "Bad configuration for the current context";
 	case GF_NOT_FOUND:
@@ -1029,6 +1165,15 @@
 #ifdef GPAC_CONFIG_IOS
 	                       "GPAC_CONFIG_IOS "
 #endif
+#ifdef GPAC_ENABLE_DEBUG
+	                       "GPAC_ENABLE_DEBUG "
+#endif
+#ifdef GPAC_ASSERT_FATAL
+	                       "GPAC_ASSERT_FATAL "
+#endif
+#ifdef GPAC_CONFIG_EMSCRIPTEN
+	                       "GPAC_CONFIG_EMSCRIPTEN "
+#endif
 #ifdef GPAC_64_BITS
 	                       "GPAC_64_BITS "
 #endif
@@ -1104,6 +1249,18 @@
 #ifdef GPAC_HAS_GLU
 	                       "GPAC_HAS_GLU "
 #endif
+#ifdef GPAC_USE_TINYGL
+	                       "GPAC_USE_TINYGL "
+#endif
+#ifdef GPAC_USE_GLES1X
+	                       "GPAC_USE_GLES1X "
+#endif
+#ifdef GPAC_USE_GLES2
+	                       "GPAC_USE_GLES2 "
+#endif
+#ifdef GPAC_HAS_HTTP2
+	                       "GPAC_HAS_HTTP2 "
+#endif
 
 #if defined(_WIN32_WCE)
 #ifdef GPAC_USE_IGPP
@@ -1123,29 +1280,26 @@
 #ifdef GPAC_DISABLE_3D
 	                       "GPAC_DISABLE_3D "
 #endif
-#ifdef GPAC_USE_TINYGL
-	                       "GPAC_USE_TINYGL "
-#endif
-#ifdef GPAC_USE_GLES1X
-	                       "GPAC_USE_GLES1X "
-#endif
-#ifdef GPAC_USE_GLES2
-	                       "GPAC_USE_GLES2 "
+#ifdef GPAC_DISABLE_DOC
+	                       "GPAC_DISABLE_DOC "
 #endif
 #ifdef GPAC_DISABLE_ZLIB
 	                       "GPAC_DISABLE_ZLIB "
 #endif
-#ifdef GPAC_DISABLE_SVG
-	                       "GPAC_DISABLE_SVG "
+#ifdef GPAC_DISABLE_THREADS
+	                       "GPAC_DISABLE_THREADS "
 #endif
-#ifdef GPAC_DISABLE_VRML
-	                       "GPAC_DISABLE_VRML "
+#ifdef GPAC_DISABLE_NETWORK
+	                       "GPAC_DISABLE_NETWORK "
 #endif
-#ifdef GPAC_DISABLE_BIFS
-	                       "GPAC_DISABLE_BIFS "
+#ifdef GPAC_DISABLE_STREAMING
+	                       "GPAC_DISABLE_STREAMING "
 #endif
-#ifdef GPAC_DISABLE_QTVR
-	                       "GPAC_DISABLE_QTVR "
+#ifdef GPAC_DISABLE_ROUTE
+	                       "GPAC_DISABLE_ROUTE "
+#endif
+#ifdef GPAC_DISABLE_EVG
+	                       "GPAC_DISABLE_EVG "
 #endif
 #ifdef GPAC_DISABLE_AVILIB
 	                       "GPAC_DISABLE_AVILIB "
@@ -1153,24 +1307,30 @@
 #ifdef GPAC_DISABLE_OGG
 	                       "GPAC_DISABLE_OGG "
 #endif
+#ifdef GPAC_DISABLE_AV_PARSERS
+	                       "GPAC_DISABLE_AV_PARSERS "
+#endif
 #ifdef GPAC_DISABLE_MPEG2PS
 	                       "GPAC_DISABLE_MPEG2PS "
 #endif
 #ifdef GPAC_DISABLE_MPEG2PS
 	                       "GPAC_DISABLE_MPEG2TS "
 #endif
-#ifdef GPAC_DISABLE_SENG
-	                       "GPAC_DISABLE_SENG "
-#endif
 #ifdef GPAC_DISABLE_MEDIA_IMPORT
 	                       "GPAC_DISABLE_MEDIA_IMPORT "
 #endif
-#ifdef GPAC_DISABLE_AV_PARSERS
-	                       "GPAC_DISABLE_AV_PARSERS "
-#endif
 #ifdef GPAC_DISABLE_MEDIA_EXPORT
 	                       "GPAC_DISABLE_MEDIA_EXPORT "
 #endif
+#ifdef GPAC_DISABLE_VRML
+	                       "GPAC_DISABLE_VRML "
+#endif
+#ifdef GPAC_DISABLE_SVG
+	                       "GPAC_DISABLE_SVG "
+#endif
+#ifdef GPAC_DISABLE_QTVR
+	                       "GPAC_DISABLE_QTVR "
+#endif
 #ifdef GPAC_DISABLE_SWF_IMPORT
 	                       "GPAC_DISABLE_SWF_IMPORT "
 #endif
@@ -1180,6 +1340,15 @@
 #ifdef GPAC_DISABLE_SCENE_DUMP
 	                       "GPAC_DISABLE_SCENE_DUMP "
 #endif
+#ifdef GPAC_DISABLE_BIFS
+	                       "GPAC_DISABLE_BIFS "
+#endif
+#ifdef GPAC_DISABLE_LASER
+	                       "GPAC_DISABLE_LASER "
+#endif
+#ifdef GPAC_DISABLE_SENG
+	                       "GPAC_DISABLE_SENG "
+#endif
 #ifdef GPAC_DISABLE_SCENE_ENCODER
 	                       "GPAC_DISABLE_SCENE_ENCODER "
 #endif
@@ -1204,16 +1373,220 @@
 #ifdef GPAC_DISABLE_ISOM_FRAGMENTS
 	                       "GPAC_DISABLE_ISOM_FRAGMENTS "
 #endif
-#ifdef GPAC_DISABLE_LASER
-	                       "GPAC_DISABLE_LASER "
+#ifdef GPAC_DISABLE_ISOM_DUMP
+	                       "GPAC_DISABLE_ISOM_DUMP "
 #endif
-#ifdef GPAC_DISABLE_STREAMING
-	                       "GPAC_DISABLE_STREAMING "
-#endif
-#ifdef GPAC_DISABLE_ROUTE
-	                       "GPAC_DISABLE_ROUTE "
+#ifdef GPAC_DISABLE_NETCAP
+	                       "GPAC_DISABLE_NETCAP "
 #endif
 
+#ifdef GPAC_DISABLE_COMPOSITOR
+	                       "GPAC_DISABLE_COMPOSITOR "
+#endif
+#ifdef GPAC_DISABLE_FONTS
+	                       "GPAC_DISABLE_FONTS "
+#endif
+#ifdef GPAC_DISABLE_VOUT
+	                       "GPAC_DISABLE_VOUT "
+#endif
+#ifdef GPAC_DISABLE_AOUT
+	                       "GPAC_DISABLE_AOUT "
+#endif
+#ifdef GPAC_DISABLE_BSAGG
+	                       "GPAC_DISABLE_BSAGG "
+#endif
+#ifdef GPAC_DISABLE_BSSPLIT
+	                       "GPAC_DISABLE_BSSPLIT "
+#endif
+#ifdef GPAC_DISABLE_BSRW
+	                       "GPAC_DISABLE_BSRW "
+#endif
+#ifdef GPAC_DISABLE_DASHER
+	                       "GPAC_DISABLE_DASHER "
+#endif
+#ifdef GPAC_DISABLE_DASHIN
+	                       "GPAC_DISABLE_DASHIN "
+#endif
+#ifdef GPAC_DISABLE_IMGDEC
+	                       "GPAC_DISABLE_IMGDEC "
+#endif
+#ifdef GPAC_DISABLE_UNCVDEC
+	                       "GPAC_DISABLE_UNCVDEC "
+#endif
+#ifdef GPAC_DISABLE_CDCRYPT
+	                       "GPAC_DISABLE_CDCRYPT "
+#endif
+#ifdef GPAC_DISABLE_GHIDMX
+	                       "GPAC_DISABLE_GHIDMX "
+#endif
+#ifdef GPAC_DISABLE_GSFDMX
+	                       "GPAC_DISABLE_GSFDMX "
+#endif
+#ifdef GPAC_DISABLE_NHMLR
+	                       "GPAC_DISABLE_NHMLR "
+#endif
+#ifdef GPAC_DISABLE_NHNTR
+	                       "GPAC_DISABLE_NHNTR "
+#endif
+#ifdef GPAC_DISABLE_CECRYPT
+	                       "GPAC_DISABLE_CECRYPT "
+#endif
+#ifdef GPAC_DISABLE_FLIST
+	                       "GPAC_DISABLE_FLIST "
+#endif
+#ifdef GPAC_DISABLE_HEVCMERGE
+	                       "GPAC_DISABLE_HEVCMERGE "
+#endif
+#ifdef GPAC_DISABLE_HEVCSPLIT
+	                       "GPAC_DISABLE_HEVCSPLIT "
+#endif
+#ifdef GPAC_DISABLE_FIN
+	                       "GPAC_DISABLE_FIN "
+#endif
+#ifdef GPAC_DISABLE_PIN
+	                       "GPAC_DISABLE_PIN "
+#endif
+#ifdef GPAC_DISABLE_INSPECT
+	                       "GPAC_DISABLE_INSPECT "
+#endif
+#ifdef GPAC_DISABLE_CRYPTFILE
+	                       "GPAC_DISABLE_CRYPTFILE "
+#endif
+#ifdef GPAC_DISABLE_MP4DMX
+	                       "GPAC_DISABLE_MP4DMX "
+#endif
+#ifdef GPAC_DISABLE_TXTIN
+	                       "GPAC_DISABLE_TXTIN "
+#endif
+#ifdef GPAC_DISABLE_GSFMX
+	                       "GPAC_DISABLE_GSFMX "
+#endif
+#ifdef GPAC_DISABLE_MP4MX
+	                       "GPAC_DISABLE_MP4MX "
+#endif
+#ifdef GPAC_DISABLE_FOUT
+	                       "GPAC_DISABLE_FOUT "
+#endif
+#ifdef GPAC_DISABLE_POUT
+	                       "GPAC_DISABLE_POUT "
+#endif
+#ifdef GPAC_DISABLE_RFAC3
+	                       "GPAC_DISABLE_RFAC3 "
+#endif
+#ifdef GPAC_DISABLE_RFADTS
+	                       "GPAC_DISABLE_RFADTS "
+#endif
+#ifdef GPAC_DISABLE_RFAMR
+	                       "GPAC_DISABLE_RFAMR "
+#endif
+#ifdef GPAC_DISABLE_RFAV1
+	                       "GPAC_DISABLE_RFAV1 "
+#endif
+#ifdef GPAC_DISABLE_RFFLAC
+	                       "GPAC_DISABLE_RFFLAC "
+#endif
+#ifdef GPAC_DISABLE_RFH263
+	                       "GPAC_DISABLE_RFH263 "
+#endif
+#ifdef GPAC_DISABLE_RFIMG
+	                       "GPAC_DISABLE_RFIMG "
+#endif
+#ifdef GPAC_DISABLE_RFLATM
+	                       "GPAC_DISABLE_RFLATM "
+#endif
+#ifdef GPAC_DISABLE_RFMHAS
+	                       "GPAC_DISABLE_RFMHAS "
+#endif
+#ifdef GPAC_DISABLE_RFMP3
+	                       "GPAC_DISABLE_RFMP3 "
+#endif
+#ifdef GPAC_DISABLE_RFMPGVID
+	                       "GPAC_DISABLE_RFMPGVID "
+#endif
+#ifdef GPAC_DISABLE_RFNALU
+	                       "GPAC_DISABLE_RFNALU "
+#endif
+#ifdef GPAC_DISABLE_RFPRORES
+	                       "GPAC_DISABLE_RFPRORES "
+#endif
+#ifdef GPAC_DISABLE_RFQCP
+	                       "GPAC_DISABLE_RFQCP "
+#endif
+#ifdef GPAC_DISABLE_RFPCM
+	                       "GPAC_DISABLE_RFPCM "
+#endif
+#ifdef GPAC_DISABLE_RFRAWVID
+	                       "GPAC_DISABLE_RFRAWVID "
+#endif
+#ifdef GPAC_DISABLE_RFTRUEHD
+	                       "GPAC_DISABLE_RFTRUEHD "
+#endif
+#ifdef GPAC_DISABLE_REFRAMER
+	                       "GPAC_DISABLE_REFRAMER "
+#endif
+#ifdef GPAC_DISABLE_RESAMPLE
+	                       "GPAC_DISABLE_RESAMPLE "
+#endif
+#ifdef GPAC_DISABLE_RESTAMP
+	                       "GPAC_DISABLE_RESTAMP "
+#endif
+#ifdef GPAC_DISABLE_REWIND
+	                       "GPAC_DISABLE_REWIND "
+#endif
+#ifdef GPAC_DISABLE_UFAAC
+	                       "GPAC_DISABLE_UFAAC "
+#endif
+#ifdef GPAC_DISABLE_UFMHAS
+	                       "GPAC_DISABLE_UFMHAS "
+#endif
+#ifdef GPAC_DISABLE_UFM4V
+	                       "GPAC_DISABLE_UFM4V "
+#endif
+#ifdef GPAC_DISABLE_UFNALU
+	                       "GPAC_DISABLE_UFNALU "
+#endif
+#ifdef GPAC_DISABLE_UFOBU
+	                       "GPAC_DISABLE_UFOBU "
+#endif
+#ifdef GPAC_DISABLE_TILEAGG
+	                       "GPAC_DISABLE_TILEAGG "
+#endif
+#ifdef GPAC_DISABLE_TILESPLIT
+	                       "GPAC_DISABLE_TILESPLIT "
+#endif
+#ifdef GPAC_DISABLE_TTMLCONV
+	                       "GPAC_DISABLE_TTMLCONV "
+#endif
+#ifdef GPAC_DISABLE_UNFRAMER
+	                       "GPAC_DISABLE_UNFRAMER "
+#endif
+#ifdef GPAC_DISABLE_VCROP
+	                       "GPAC_DISABLE_VCROP "
+#endif
+#ifdef GPAC_DISABLE_VFLIP
+	                       "GPAC_DISABLE_VFLIP "
+#endif
+#ifdef GPAC_DISABLE_WRITEGEN
+	                       "GPAC_DISABLE_WRITEGEN "
+#endif
+#ifdef GPAC_DISABLE_NHMLW
+	                       "GPAC_DISABLE_NHMLW "
+#endif
+#ifdef GPAC_DISABLE_NHNTW
+	                       "GPAC_DISABLE_NHNTW "
+#endif
+#ifdef GPAC_DISABLE_WRITEQCP
+	                       "GPAC_DISABLE_WRITEQCP "
+#endif
+#ifdef GPAC_DISABLE_UNITS
+	                       "GPAC_DISABLE_UNITS "
+#endif
+#ifdef GPAC_DISABLE_NVDEC
+	                       "GPAC_DISABLE_NVDEC "
+#endif
+#ifdef GPAC_DISABLE_VTBDEC
+	                       "GPAC_DISABLE_VTBDEC "
+#endif
 	                       ;
 	return features;
 }
@@ -1829,6 +2202,11 @@
 	sep = strchr(value, '.');
 	if (!sep) sep = strchr(value, ',');
 	if (!sep) {
+		len = (u32) strlen(value);
+		for (i=0; i<len; i++) {
+			if (((valuei<'0') || (valuei>'9')) && (valuei!='-') && (valuei!='+'))
+				return GF_FALSE;
+		}
 		frac->num = atol(value);
 		frac->den = 1;
 		return GF_TRUE;
@@ -1892,3 +2270,37 @@
 	frac->den = (u32) r.den;
 	return res;
 }
+
+Bool gf_strict_atoi(const char* str, s32* ans) {
+    char* end_ptr = NULL;
+    *ans = strtol(str, &end_ptr, 10);
+    return !isspace(*str) && end_ptr != str && *end_ptr == '\0';
+}
+
+Bool gf_strict_atoui(const char* str, u32* ans) {
+	char* end_ptr = NULL;
+	*ans = strtoul(str, &end_ptr, 10);
+	return !isspace(*str) && end_ptr != str && *end_ptr == '\0';
+}
+
+const char* gf_strmemstr(const char *data, u32 data_size, const char *pat)
+{
+       if (!pat || !data) return NULL;
+
+       u32 len_pat = (u32) strlen(pat);
+       if (len_pat==0) return data;
+       if (len_pat>data_size) return NULL;
+
+       //basically a memmem clone (we don't use for portability reasons)
+       while (1) {
+               char *next = memchr(data, pat0, data_size);
+               if (!next) return NULL;
+               u32 left = data_size - (u32) (next-data);
+               if (left<len_pat) return NULL;
+               if (!memcmp(next, pat, len_pat)) return next;
+               //left is always at least 1
+               data_size = left-1;
+               data = next+1;
+       }
+       return NULL;
+}

gpac-2.2.1.tar.gz/src/utils/gltools.c -> gpac-2.4.0.tar.gz/src/utils/gltools.c Changed

@@ -361,6 +361,24 @@
 uniform sampler2D _gf_%s_3;\n\
 ";
 
+#if defined(GPAC_USE_GLES1X) || defined(GPAC_USE_GLES2)
+static char *gl_shader_fun_yuv_gles10 = \
+"vec2 texc;\n\
+vec4 yuv, col;\n\
+texc = _gpacTexCoord.st;\n\
+col = texture2D(_gf_%s_1, texc);\n\
+yuv.x = (col.a*65280.0 + col.r*255.0)/1023.0;\n\
+col = texture2D(_gf_%s_2, texc);\n\
+yuv.y = (col.a*65280.0 + col.r*255.0)/1023.0;\n\
+col = texture2D(_gf_%s_3, texc);\n\
+yuv.z = (col.a*65280.0 + col.r*255.0)/1023.0;\n\
+yuv.w = 1.0;\n\
+yuv = _gf_%s_mx * yuv;\n\
+yuv.w = 1.0;\n\
+return yuv;\n\
+";
+#endif
+
 static char *gl_shader_fun_yuv = \
 "vec2 texc;\n\
 vec4 yuv;\n\
@@ -374,6 +392,7 @@
 return yuv;\n\
 ";
 
+
 static char *gl_shader_fun_yvu = \
 "vec2 texc;\n\
 vec4 yuv;\n\
@@ -911,13 +930,18 @@
 		shader_fun = gl_shader_fun_bgra;
 		break;
 
-	case GF_PIXEL_YUV:
 	case GF_PIXEL_YUV_10:
+	case GF_PIXEL_YUV422_10:
+	case GF_PIXEL_YUV444_10:
+#if defined(GPAC_USE_GLES1X) || defined(GPAC_USE_GLES2)
+		shader_vars = gl_shader_vars_yuv;
+		shader_fun = gl_shader_fun_yuv_gles10;
+		break;
+#endif
 	case GF_PIXEL_YUVD:
 	case GF_PIXEL_YUV422:
-	case GF_PIXEL_YUV422_10:
 	case GF_PIXEL_YUV444:
-	case GF_PIXEL_YUV444_10:
+	case GF_PIXEL_YUV:
 		shader_vars = gl_shader_vars_yuv;
 		shader_fun = gl_shader_fun_yuv;
 		break;
@@ -1176,8 +1200,21 @@
 				nb_bits--;
 			}
 			tx->scale_10bit = scale;
-#endif
 			tx->memory_format = GL_UNSIGNED_SHORT;
+#else
+
+			switch (tx->pix_fmt) {
+			case GF_PIXEL_YUV_10:
+			case GF_PIXEL_YUV422_10:
+			case GF_PIXEL_YUV444_10:
+				tx->gl_format = GL_LUMINANCE_ALPHA;
+				tx->memory_format = GL_UNSIGNED_BYTE;
+				break;
+			default:
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("Core Pixel format %s unsupported, cannot setup texture wrapper\n", gf_4cc_to_str(tx->pix_fmt)));
+				return GF_FALSE;
+			}
+#endif
 		}
 
 
@@ -1487,7 +1524,9 @@
 	}
 #endif
 	else if ((tx->nb_textures==1) || ((tx->nb_textures==2) && tx->has_alpha)) {
+#if !defined(GPAC_GL_NO_STRIDE)
 		u32 uv_stride = 0;
+#endif
 		glBindTexture(GL_TEXTURE_2D, tx->textures0 );
 
 		use_stride = GF_FALSE;
@@ -1535,7 +1574,9 @@
 				//for YUYV, and we upload as a texture with half the wsize so redivide again by two
 				//since GL_UNPACK_ROW_LENGTH counts in component and we moved the set 2 bytes per comp on 10 bits
 				//no need to further divide
+#if !defined(GPAC_GL_NO_STRIDE)
 				uv_stride = stride_luma/scaler/2;
+#endif
 				use_stride = GF_TRUE;
 			}
 #if !defined(GPAC_GL_NO_STRIDE)
@@ -1559,20 +1600,20 @@
 #if !defined(GPAC_GL_NO_STRIDE)
 		if (use_stride) glPixelStorei(GL_UNPACK_ROW_LENGTH, stride_luma/tx->bytes_per_pix);
 #endif
-		glTexImage2D(GL_TEXTURE_2D, 0, GL_LUMINANCE, tx->width, tx->height, 0, tx->gl_format, tx->memory_format, pY);
+		glTexImage2D(GL_TEXTURE_2D, 0, tx->gl_format, tx->width, tx->height, 0, tx->gl_format, tx->memory_format, pY);
 
 		glBindTexture(GL_TEXTURE_2D, tx->textures1 );
 #if !defined(GPAC_GL_NO_STRIDE)
 		if (use_stride) glPixelStorei(GL_UNPACK_ROW_LENGTH, pV ? stride_chroma/tx->bytes_per_pix : stride_chroma/tx->bytes_per_pix/2);
 #endif
-		glTexImage2D(GL_TEXTURE_2D, 0, pV ? GL_LUMINANCE : GL_LUMINANCE_ALPHA, tx->uv_w, tx->uv_h, 0, pV ? GL_LUMINANCE : GL_LUMINANCE_ALPHA, tx->memory_format, pU);
+		glTexImage2D(GL_TEXTURE_2D, 0, pV ? tx->gl_format : GL_LUMINANCE_ALPHA, tx->uv_w, tx->uv_h, 0, pV ? tx->gl_format : GL_LUMINANCE_ALPHA, tx->memory_format, pU);
 
 		if (pV) {
 			glBindTexture(GL_TEXTURE_2D, tx->textures2 );
 #if !defined(GPAC_GL_NO_STRIDE)
 			if (use_stride) glPixelStorei(GL_UNPACK_ROW_LENGTH, stride_chroma/tx->bytes_per_pix);
 #endif
-			glTexImage2D(GL_TEXTURE_2D, 0, GL_LUMINANCE, tx->uv_w, tx->uv_h, 0, tx->gl_format, tx->memory_format, pV);
+			glTexImage2D(GL_TEXTURE_2D, 0, tx->gl_format, tx->uv_w, tx->uv_h, 0, tx->gl_format, tx->memory_format, pV);
 		}
 
 		if (pA) {
@@ -1580,7 +1621,7 @@
 #if !defined(GPAC_GL_NO_STRIDE)
 			if (use_stride) glPixelStorei(GL_UNPACK_ROW_LENGTH, stride_luma/tx->bytes_per_pix);
 #endif
-			glTexImage2D(GL_TEXTURE_2D, 0, GL_LUMINANCE, tx->width, tx->height, 0, tx->gl_format, tx->memory_format, pA);
+			glTexImage2D(GL_TEXTURE_2D, 0, tx->gl_format, tx->width, tx->height, 0, tx->gl_format, tx->memory_format, pA);
 		}
 
 #if !defined(GPAC_GL_NO_STRIDE)
@@ -1600,7 +1641,7 @@
 #if !defined(GPAC_GL_NO_STRIDE)
 		if (use_stride) glPixelStorei(GL_UNPACK_ROW_LENGTH, pV ? stride_chroma/tx->bytes_per_pix : stride_chroma/tx->bytes_per_pix/2);
 #endif
-		glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, tx->uv_w, tx->uv_h, pV ? GL_LUMINANCE : GL_LUMINANCE_ALPHA, tx->memory_format, pU);
+		glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, tx->uv_w, tx->uv_h, pV ? tx->gl_format : GL_LUMINANCE_ALPHA, tx->memory_format, pU);
 		glBindTexture(GL_TEXTURE_2D, 0);
 
 		if (pV) {

gpac-2.2.1.tar.gz/src/utils/gzio.c -> gpac-2.4.0.tar.gz/src/utils/gzio.c Changed

gpac-2.2.1.tar.gz/src/utils/list.c -> gpac-2.4.0.tar.gz/src/utils/list.c Changed

gpac-2.2.1.tar.gz/src/utils/math.c -> gpac-2.4.0.tar.gz/src/utils/math.c Changed

gpac-2.2.1.tar.gz/src/utils/module.c -> gpac-2.4.0.tar.gz/src/utils/module.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2022
+ *			Copyright (c) Telecom ParisTech 2000-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / common tools sub-project
@@ -50,7 +50,7 @@
 	LOAD_PLUGIN(sdl_out);
 #endif
 
-#ifdef GPAC_HAS_FREETYPE
+#if defined(GPAC_HAS_FREETYPE) && !defined(GPAC_DISABLE_EVG)
 	LOAD_PLUGIN(ftfont);
 #endif
 #ifdef GPAC_HAS_ALSA
@@ -77,7 +77,7 @@
 	LOAD_PLUGIN(pulseaudio);
 #endif
 
-#ifndef GPAC_DISABLE_PLAYER
+#ifndef GPAC_DISABLE_COMPOSITOR
 	LOAD_PLUGIN(validator);
 #endif
 
@@ -194,10 +194,8 @@
 \brief module manager construtcor
  *
  *Constructs a module manager object.
-\param directory absolute path to the directory where the manager shall look for modules
-\param cfgFile GPAC configuration file handle. If this is NULL, the modules won't be able to share the configuration
+\param config GPAC configuration file handle. If this is NULL, the modules won't be able to share the configuration
  *file with the rest of the GPAC framework.
-\return the module manager object
 */
 void gf_modules_new(GF_Config *config)
 {
@@ -253,7 +251,6 @@
 \brief module manager destructor
  *
  *Destroys the module manager
-\param pm the module manager
  */
 void gf_modules_del()
 {
@@ -399,7 +396,7 @@
 		if (!found) goto err_exit;
 	}
 
-	if (!inst->query_func || !inst->query_func(InterfaceFamily) ) goto err_exit;
+	if (!inst->load_func) goto err_exit;
 	ifce = (GF_BaseInterface *) inst->load_func(InterfaceFamily);
 	/*sanity check*/
 	if (!ifce) goto err_exit;
@@ -459,7 +456,7 @@
 }
 
 GF_EXPORT
-GF_BaseInterface *gf_modules_load_by_name(const char *plug_name, u32 InterfaceFamily)
+GF_BaseInterface *gf_modules_load_by_name(const char *plug_name, u32 InterfaceFamily, Bool rebrowse_all)
 {
 	const char *file_name;
 	u32 i, count;
@@ -480,18 +477,23 @@
 
 		for (i=0; i<count; i++) {
 			ModuleInstance *inst = (ModuleInstance *) gf_list_get(pm->plug_list, i);
-			if (!strcmp(inst->name,  file_name)) {
+			if (!rebrowse_all && !strcmp(inst->name,  file_name)) {
 				ifce = gf_modules_load(i, InterfaceFamily);
 				if (ifce) return ifce;
 			}
 		}
 	}
+
 	GF_LOG(GF_LOG_INFO, GF_LOG_CORE, ("Core Plugin %s of type %d not found in cache, searching for it...\n", plug_name, InterfaceFamily));
 	for (i=0; i<count; i++) {
 		const char *mod_filename;
+		if (!rebrowse_all) {
+			ModuleInstance *inst = (ModuleInstance *) gf_list_get(gpac_modules_static->plug_list, i);
+			if (inst->name && strcmp(inst->name, plug_name)) continue;
+		}
 		ifce = gf_modules_load(i, InterfaceFamily);
 		if (!ifce) continue;
-		if (ifce->module_name && !strnicmp(ifce->module_name, plug_name, MIN(strlen(ifce->module_name), strlen(plug_name)) )) {
+		if (ifce->module_name && !strcmp(ifce->module_name, plug_name) ) {
 			/*update cache entry*/
 			gf_cfg_set_key(pm->cfg, "PluginsCache", plug_name, ((ModuleInstance*)ifce->HPLUG)->name);
 			GF_LOG(GF_LOG_DEBUG, GF_LOG_CORE, ("Core Added plugin cache %s for %s\n", plug_name, ((ModuleInstance*)ifce->HPLUG)->name));
@@ -580,7 +582,7 @@
 {
 	GF_BaseInterface *ifce = NULL;
 	if (name) {
-		ifce = gf_modules_load_by_name(name, ifce_type);
+		ifce = gf_modules_load_by_name(name, ifce_type, GF_TRUE);
 		if (!module_check_ifce(ifce, ifce_type)) {
 			gf_modules_close_interface(ifce);
 			ifce = NULL;
@@ -603,7 +605,7 @@
 			sOpt = NULL;
 		}
 		if (sOpt) {
-			ifce = gf_modules_load_by_name(sOpt, ifce_type);
+			ifce = gf_modules_load_by_name(sOpt, ifce_type, GF_TRUE);
 			if (!module_check_ifce(ifce, ifce_type)) {
 				gf_modules_close_interface(ifce);
 				ifce = NULL;
@@ -626,3 +628,62 @@
 	}
 	return ifce;
 }
+
+GF_EXPORT
+const char *gf_module_get_key(GF_BaseInterface *dr, char *key_name)
+{
+	if (!dr || !dr->module_name || !dr->args) return NULL;
+
+	u32 klen = (u32) strlen(key_name);
+	u32 i=0, nb_args = gf_sys_get_argc();
+	Bool found = GF_FALSE;
+	const char *res = NULL;
+	while (dr->argsi.name) {
+		if (!strcmp(dr->argsi.name, key_name)) {
+			res = gf_opts_get_key(dr->module_name, key_name);
+			if (!res)
+				res = dr->argsi.val;
+			found = GF_TRUE;
+		}
+		i++;
+	}
+	if (!found) return NULL;
+	for (i=0; i<nb_args; i++) {
+		const char *a = gf_sys_get_arg(i);
+		if (strncmp(a, "--", 2)) continue;
+		a+=2;
+		char *msep = strchr(a, '@');
+		if (msep) {
+			u32 mlen = (u32) (msep-a);
+			if (strncmp(dr->module_name, a, mlen)) continue;
+			a += mlen+1;
+		}
+		if (strncmp(a, key_name, klen)) continue;
+		if (aklen == '=') {
+			gf_sys_mark_arg_used(i, GF_TRUE);
+			return a+klen+1;
+		}
+		if (!aklen) {
+			gf_sys_mark_arg_used(i, GF_TRUE);
+			return "1";
+		}
+	}
+	return res;
+}
+GF_EXPORT
+Bool gf_module_get_bool(GF_BaseInterface *dr, char *key_name)
+{
+	const char *res = gf_module_get_key(dr, key_name);
+	if (!res) return GF_FALSE;
+	if (!stricmp(res, "yes") || !stricmp(res, "true") || !strcmp(res, "1")) return GF_TRUE;
+	return GF_FALSE;
+}
+GF_EXPORT
+Bool gf_module_get_int(GF_BaseInterface *dr, char *key_name)
+{
+	const char *res = gf_module_get_key(dr, key_name);
+	if (!res) return 0;
+	if (!stricmp(res, "yes") || !stricmp(res, "true") || !strcmp(res, "1")) return atoi(res);
+	return 0;
+}
+

gpac-2.2.1.tar.gz/src/utils/os_config_init.c -> gpac-2.4.0.tar.gz/src/utils/os_config_init.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2022
+ *			Copyright (c) Telecom ParisTech 2000-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / common tools sub-project
@@ -219,7 +219,7 @@
 	}
 
 	/*we are looking for the config file path - make sure it is writable*/
-	assert(path_type == GF_PATH_CFG);
+	gf_assert(path_type == GF_PATH_CFG);
 
 	strcpy(szPath, file_path);
 	strcat(szPath, "\\gpaccfgtest.txt");
@@ -363,6 +363,17 @@
 
 	/*on OSX, Linux & co, user home is where we store the cfg file*/
 	if (path_type==GF_PATH_CFG) {
+
+#ifdef GPAC_CONFIG_EMSCRIPTEN
+		if (gf_dir_exists("/idbfs")) {
+			if (!gf_dir_exists("/idbfs/.gpac")) {
+				gf_mkdir("/idbfs/.gpac");
+			}
+			strcpy(file_path, "/idbfs/.gpac");
+			return 1;
+		}
+#endif
+
 		char *user_home = getenv("HOME");
 #ifdef GPAC_CONFIG_IOS
 		char bufPATH_MAX;
@@ -437,6 +448,8 @@
 			}
 			return 1;
 		}
+#elif defined(GPAC_CONFIG_EMSCRIPTEN)
+		return 0;
 #endif
 		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("Unknown arch, cannot find executable path\n"));
 		return 0;
@@ -456,25 +469,91 @@
 		}
 		return 0;
 #endif
-		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("Unknown arch, cannot find library path\n"));
-		return 0;
-	}
 
-	/*locate the app*/
-	if (!get_default_install_path(app_path, GF_PATH_APP)) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("Couldn't find GPAC binaries install directory\n"));
+		//for emscripten we use a static load for now
+#if !defined(GPAC_CONFIG_EMSCRIPTEN)
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_CORE, ("Unknown arch, cannot find library path\n"));
+#endif
 		return 0;
 	}
-	/*installed or symlink on system, user user home directory*/
-	if (!strnicmp(app_path, "/usr/", 5) || !strnicmp(app_path, "/opt/", 5)) {
-		if (path_type==GF_PATH_SHARE) {
-			/*look in possible install dirs ...*/
+
+	/*check system install:
+		- share is PREFIX/share/gpac/
+		- mod_dir is PREFIX/LIBDIR/gpac/
+	*/
+	if ((path_type==GF_PATH_SHARE) || (path_type==GF_PATH_MODULES)) {
+		char lib_arch_scheme100;
+		lib_arch_scheme0 = 0;
+#if defined(GPAC_CONFIG_EMSCRIPTEN)
+		strcpy(app_path, "/usr/");
+#else
+		/*locate libgpac path first in case we are not run using gpac apps (eg python bindings)
+			if failure (static build) locate app
+		*/
+		if (!get_default_install_path(app_path, GF_PATH_LIB)) {
+			if (!get_default_install_path(app_path, GF_PATH_APP)) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("Couldn't find GPAC binaries install directory\n"));
+				return 0;
+			}
+		}
+#endif
+		//check if we are a lib path and have a .gpac/ here
+		if ((path_type==GF_PATH_MODULES) && strstr(app_path, "/lib")) {
+			strcat(app_path, "/gpac");
+			if (check_file_exists(TEST_MODULE, app_path, file_path)) return 1;
+			char *sep = strrchr(app_path, '/');
+			if (sep) sep0=0;
+		}
+
+		//extract PREFIX
+		//app_path is either PREFIX/lib or PREFIX/lib/arch-specific (shared lib) or PREFIX/bin (if app)
+		//without trailing slash
+		char *root = strrchr(app_path, '/');
+		if (root) {
+			strncpy(lib_arch_scheme, root+1, 99);
+			lib_arch_scheme99=0;
+			root0=0;
+		}
+		//check if we have a /lib/arch-specific scheme
+		char *lib = strrchr(app_path, '/');
+		if (lib && !strncmp(lib, "/lib/", 4)) {
+			root = lib;
+			root0 = 0;
+		} else {
+			lib_arch_scheme0=0;
+		}
+		if ((path_type==GF_PATH_SHARE) && root) {
+			strcat(app_path, "/share/gpac");
+			if (check_file_exists("gui/gui.bt", app_path, file_path)) return 1;
+
+			/*failsafe - look in possible install dirs ...*/
 			if (check_file_exists("gui/gui.bt", "/usr/share/gpac", file_path)) return 1;
 			if (check_file_exists("gui/gui.bt", "/usr/local/share/gpac", file_path)) return 1;
 			if (check_file_exists("gui/gui.bt", "/opt/share/gpac", file_path)) return 1;
 			if (check_file_exists("gui/gui.bt", "/opt/local/share/gpac", file_path)) return 1;
-		} else if (path_type==GF_PATH_MODULES) {
-			/*look in possible install dirs ...*/
+
+		} else if ((path_type==GF_PATH_MODULES) && root) {
+			//if arch-specific scheme try it first (to avoid loading 64bit versions for 32bit shared...)
+			if (lib_arch_scheme0) {
+				strcat(app_path, "/");
+				strcat(app_path, lib_arch_scheme);
+				strcat(app_path, "/gpac");
+				if (check_file_exists(TEST_MODULE, app_path, file_path)) return 1;
+				root0=0;
+			}
+			strcat(app_path, "/lib64/gpac");
+			if (check_file_exists(TEST_MODULE, app_path, file_path)) return 1;
+			root0=0;
+			strcat(app_path, "/lib/gpac");
+			if (check_file_exists(TEST_MODULE, app_path, file_path)) return 1;
+			root0=0;
+			strcat(app_path, "/lib/x86_64-linux-gnu/gpac");
+			if (check_file_exists(TEST_MODULE, app_path, file_path)) return 1;
+			root0=0;
+			strcat(app_path, "/lib/i386-linux-gnu/gpac");
+			if (check_file_exists(TEST_MODULE, app_path, file_path)) return 1;
+
+			/*failsafe - look in possible install dirs ...*/
 			if (check_file_exists(TEST_MODULE, "/usr/lib64/gpac", file_path)) return 1;
 			if (check_file_exists(TEST_MODULE, "/usr/lib/gpac", file_path)) return 1;
 			if (check_file_exists(TEST_MODULE, "/usr/local/lib/gpac", file_path)) return 1;
@@ -568,11 +647,14 @@
 			if (check_file_exists(TEST_MODULE, app_path, file_path)) return 1;
 		}
 		/*modules not found, failure*/
-		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("Couldn't find any modules in HOME path (app path %s)\n", app_path));
+#ifndef GPAC_STATIC_MODULES
+		GF_LOG(GF_LOG_WARNING, GF_LOG_CORE, ("Couldn't find any modules in HOME path (app path %s)\n", app_path));
+#endif
 		return 0;
 	}
 
 	/*OSX way vs iPhone*/
+	get_default_install_path(app_path, GF_PATH_APP);
 	sep = strstr(app_path, ".app/");
 	if (sep) sep4 = 0;
 
@@ -610,7 +692,7 @@
 	if (!res) return;
 
 	sep = strstr(res, ".gpac");
-	assert(sep);
+	gf_assert(sep);
 	sep0 = 0;
 	gf_cfg_set_key(cfg, "core", "docs-dir", res);
 	if (!gf_cfg_get_key(cfg, "core", "last-dir"))
@@ -664,12 +746,16 @@
 	GF_Config *cfg;
 	char szPathGF_MAX_PATH;
 
-	if (! get_default_install_path(file_path, GF_PATH_CFG)) {
+	if (file_path && ! get_default_install_path(file_path, GF_PATH_CFG)) {
 		profile = "0";
 	}
 	/*Create temp config file*/
-	if (profile && !strcmp(profile, "0")) {
+	if (profile && (!strcmp(profile, "0") || !stricmp(profile, "n"))) {
 		cfg = gf_cfg_new(NULL, NULL);
+		if (!stricmp(profile, "n")) {
+			gf_cfg_discard_changes(cfg);
+			return cfg;
+		}
 	} else {
 		FILE *f;
 
@@ -701,17 +787,22 @@
 	gf_cfg_set_key(cfg, "core", "devclass", "ios");
 #elif defined(GPAC_CONFIG_ANDROID)
 	gf_cfg_set_key(cfg, "core", "devclass", "android");
+#elif defined(GPAC_CONFIG_EMSCRIPTEN)
+	gf_cfg_set_key(cfg, "core", "devclass", "wasm");
 #else
 	gf_cfg_set_key(cfg, "core", "devclass", "desktop");
 #endif
 
 
 	if (!moddir_found) {
+#if !defined(GPAC_CONFIG_EMSCRIPTEN)
 		GF_LOG(GF_LOG_WARNING, GF_LOG_CORE, ("Core default modules directory not found\n"));
+#endif
 	} else {
 		gf_cfg_set_key(cfg, "core", "module-dir", szPath);
 	}
 
+
 #if defined(GPAC_CONFIG_IOS)
 	gf_ios_refresh_cache_directory(cfg, file_path);
 #elif defined(GPAC_CONFIG_ANDROID)
@@ -745,12 +836,8 @@
 	gf_cfg_set_key(cfg, "core", "cache", gf_get_default_cache_directory_ex(GF_FALSE));
 #endif
 
-#if defined(WIN32)
-	gf_cfg_set_key(cfg, "core", "ds-disable-notif", "no");
-#endif
-
 	/*Setup font engine to FreeType by default, and locate TrueType font directory on the system*/
-	gf_cfg_set_key(cfg, "core", "font-reader", "FreeType Font Reader");
+	gf_cfg_set_key(cfg, "core", "font-reader", "freetype");
 	gf_cfg_set_key(cfg, "core", "rescan-fonts", "yes");
 
 
@@ -760,18 +847,18 @@
 	gf_cfg_set_key(cfg, "core", "cache-size", "100M");
 
 #if defined(_WIN32_WCE)
-	gf_cfg_set_key(cfg, "core", "video-output", "GAPI Video Output");
+	gf_cfg_set_key(cfg, "core", "video-output", "gapi");
 #elif defined(WIN32)
-	gf_cfg_set_key(cfg, "core", "video-output", "DirectX Video Output");
+	gf_cfg_set_key(cfg, "core", "video-output", "directx");
 #elif defined(__DARWIN__) || defined(__APPLE__)
-	gf_cfg_set_key(cfg, "core", "video-output", "SDL Video Output");
+	gf_cfg_set_key(cfg, "core", "video-output", "sdl");
 #elif defined(GPAC_CONFIG_ANDROID)
-	gf_cfg_set_key(cfg, "core", "video-output", "Android Video Output");
-	gf_cfg_set_key(cfg, "core", "audio-output", "Android Audio Output");
+	gf_cfg_set_key(cfg, "core", "video-output", "android");
+	gf_cfg_set_key(cfg, "core", "audio-output", "android");
 #else
 	//use SDL by default, will fallback to X11 if not found (our X11 wrapper is old and does not have all features of the SDL one)
-	gf_cfg_set_key(cfg, "core", "video-output", "SDL Video Output");
-	gf_cfg_set_key(cfg, "core", "audio-output", "SDL Audio Output");
+	gf_cfg_set_key(cfg, "core", "video-output", "sdl");
+	gf_cfg_set_key(cfg, "core", "audio-output", "sdla");
 #endif
 
 
@@ -911,6 +998,7 @@
 	if (gf_cfg_get_key(cfg, "core", "startup-file")==NULL) return;
 
 	if ( get_default_install_path(path, GF_PATH_SHARE) ) {
+		gf_cfg_set_key(cfg, "temp", "share_dir", path);
 		opt = gf_cfg_get_key(cfg, "core", "startup-file");
 		if (strstr(opt, "gui.bt") && strcmp(opt, path) && strstr(path, ".app") ) {
 #if defined(__DARWIN__) || defined(__APPLE__)
@@ -936,10 +1024,14 @@
 
 static void check_default_cred_file(GF_Config *cfg, char szPathGF_MAX_PATH)
 {
+#ifndef GPAC_CONFIG_EMSCRIPTEN
 	char key16;
 	u64 v1, v2;
 	const char *opt = gf_cfg_get_key(cfg, "core", "cred");
 	if (opt) return;
+	//when running as service, the config file path may be unknown
+	if (!szPath0 || !gf_dir_exists(szPath))
+		return;
 	strcat(szPath, "/creds.key");
 	if (gf_file_exists(szPath)) return;
 
@@ -965,6 +1057,7 @@
 	fwrite(key, 16, 1, crd);
 	fclose(crd);
 	gf_cfg_set_key(cfg, "core", "cred", szPath);
+#endif //GPAC_CONFIF_EMSCRIPTEN
 }
 
 /*!
@@ -983,6 +1076,7 @@
 	GF_Config *cfg=NULL;
 	u32 prof_len=0;
 	Bool force_new_cfg=GF_FALSE;
+	Bool fast_profile=GF_FALSE;
 	char szPathGF_MAX_PATH;
 	char *prof_opt = NULL;
 
@@ -994,11 +1088,16 @@
 			if (strstr(prof_opt, "reload")) force_new_cfg = GF_TRUE;
 			prof_opt0 = 0;
 		}
+		if (!stricmp(profile, "n")) {
+			fast_profile = GF_TRUE;
+			cfg = create_default_config(NULL, "n");
+			goto skip_cfg;
+		}
 	}
 	if (profile && !prof_len)
 		profile = NULL;
 
-	if (profile && (strchr(profile, '/') || strchr(profile, '\\')) ) {
+	if (profile && strpbrk(profile, "/\\")) {
 		if (!gf_file_exists(profile)) {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("core Config file %s does not exist\n", profile));
 			goto exit;
@@ -1025,6 +1124,11 @@
 		goto skip_cfg;
 	}
 
+	if (profile && !strcmp(profile, "0")) {
+		cfg = create_default_config(NULL, "0");
+		goto skip_cfg;
+	}
+
 	if (profile) {
 		strcat(szPath, "/profiles/");
 		strcat(szPath, profile);
@@ -1091,8 +1195,11 @@
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_CORE, ("core Using global config file in %s directory\n", szPath));
 #endif
 
+	if (fast_profile) goto exit;
+
 	check_modules_dir(cfg);
-	check_default_cred_file(cfg, szPath);
+	if (!profile || strcmp(profile, "0"))
+		check_default_cred_file(cfg, szPath);
 
 	if (!gf_cfg_get_key(cfg, "core", "store-dir")) {
 		if (profile && !strcmp(profile, "0")) {
@@ -1131,6 +1238,11 @@
 GF_EXPORT
 Bool gf_opts_default_shared_directory(char *path_buffer)
 {
+	const char *opt = gf_opts_get_key("temp", "share_dir");
+	if (opt) {
+		strcpy(path_buffer, opt);
+		return 1;
+	}
 	return get_default_install_path(path_buffer, GF_PATH_SHARE);
 }
 
@@ -1147,8 +1259,8 @@
 			GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("Fatal error: failed to initialize GPAC global configuration\n"));
 			exit(1);
 		}
-
-		gf_modules_new(gpac_global_config);
+		if (!profile || stricmp(profile, "n"))
+			gf_modules_new(gpac_global_config);
 	}
 }
 
@@ -1164,6 +1276,7 @@
 
 GF_Err gf_cfg_set_key_internal(GF_Config *iniFile, const char *secName, const char *keyName, const char *keyValue, Bool is_restrict);
 
+#ifdef GPAC_ENABLE_RESTRICT
 void gf_cfg_load_restrict()
 {
 	char szPathGF_MAX_PATH;
@@ -1190,6 +1303,7 @@
 		}
 	}
 }
+#endif
 
 GF_EXPORT
 const char *gf_opts_get_key(const char *secName, const char *keyName)
@@ -1268,11 +1382,17 @@
 
 #include <gpac/main.h>
 
+#ifdef GPAC_CONFIG_EMSCRIPTEN
+#define LOGFILE_HELP	"set output log file - use `console` for browser console"
+#else
+#define LOGFILE_HELP	"set output log file"
+#endif
+
 GF_GPACArg GPAC_Args = {
- GF_DEF_ARG("tmp", NULL, "specify directory for temporary file creation instead of OS-default temportary file management", NULL, NULL, GF_ARG_STRING, 0),
+ GF_DEF_ARG("tmp", NULL, "specify directory for temporary file creation instead of OS-default temporary file management", NULL, NULL, GF_ARG_STRING, 0),
  GF_DEF_ARG("noprog", NULL, "disable progress messages", NULL, NULL, GF_ARG_BOOL, GF_ARG_HINT_ADVANCED|GF_ARG_SUBSYS_LOG),
  GF_DEF_ARG("quiet", NULL, "disable all messages, including errors", NULL, NULL, GF_ARG_BOOL, GF_ARG_HINT_ADVANCED|GF_ARG_SUBSYS_LOG),
- GF_DEF_ARG("log-file", "lf", "set output log file", NULL, NULL, GF_ARG_STRING, GF_ARG_SUBSYS_LOG),
+ GF_DEF_ARG("log-file", "lf", LOGFILE_HELP, NULL, NULL, GF_ARG_STRING, GF_ARG_SUBSYS_LOG),
  GF_DEF_ARG("log-clock", "lc", "log time in micro sec since start time of GPAC before each log line except for `app` tool", NULL, NULL, GF_ARG_BOOL, GF_ARG_SUBSYS_LOG),
  GF_DEF_ARG("log-utc", "lu", "log UTC time in ms before each log line except for `app` tool", NULL, NULL, GF_ARG_BOOL, GF_ARG_SUBSYS_LOG),
  GF_DEF_ARG("logs", NULL, "set log tools and levels.  \n"
@@ -1319,13 +1439,14 @@
 			"This moves all log to info level, dash to debug level and disable color logs"
  			, NULL, NULL, GF_ARG_STRING, GF_ARG_SUBSYS_LOG),
  GF_DEF_ARG("proglf", NULL, "use new line at each progress messages", NULL, NULL, GF_ARG_BOOL, GF_ARG_HINT_ADVANCED|GF_ARG_SUBSYS_LOG),
+ GF_DEF_ARG("log-dual", "ld", "output to both file and stderr", NULL, NULL, GF_ARG_BOOL, GF_ARG_SUBSYS_LOG),
 
  GF_DEF_ARG("strict-error", "se", "exit after the first error is reported", NULL, NULL, GF_ARG_BOOL, GF_ARG_HINT_ADVANCED|GF_ARG_SUBSYS_CORE),
  GF_DEF_ARG("store-dir", NULL, "set storage directory", NULL, NULL, GF_ARG_STRING, GF_ARG_HINT_ADVANCED|GF_ARG_SUBSYS_CORE),
  GF_DEF_ARG("mod-dirs", NULL, "set additional module directories as a semi-colon `;` separated list", NULL, NULL, GF_ARG_STRINGS, GF_ARG_HINT_EXPERT|GF_ARG_SUBSYS_CORE),
  GF_DEF_ARG("js-dirs", NULL, "set javascript directories", NULL, NULL, GF_ARG_STRINGS, GF_ARG_HINT_EXPERT|GF_ARG_SUBSYS_CORE),
  GF_DEF_ARG("no-js-mods", NULL, "disable javascript module loading", NULL, NULL, GF_ARG_STRINGS, GF_ARG_HINT_EXPERT|GF_ARG_SUBSYS_CORE),
- GF_DEF_ARG("ifce", NULL, "set default multicast interface through interface IP address (default is 127.0.0.1)", NULL, NULL, GF_ARG_STRING, GF_ARG_SUBSYS_CORE),
+ GF_DEF_ARG("ifce", NULL, "set default multicast interface (default is ANY), either an IP address or a device name as listed by `gpac -h net`. Prefix '+' will force using IPv6 for dual interface", NULL, NULL, GF_ARG_STRING, GF_ARG_SUBSYS_CORE),
  GF_DEF_ARG("lang", NULL, "set preferred language", NULL, NULL, GF_ARG_STRING, GF_ARG_SUBSYS_CORE),
  GF_DEF_ARG("cfg", "opt", "get or set configuration file value. The string parameter can be formatted as:\n"
 	        "- `section:key=val`: set the key to a new value\n"
@@ -1351,12 +1472,39 @@
  GF_DEF_ARG("no-check", NULL, "disable compliance tests for inputs (ISOBMFF for now). This will likely result in random crashes", NULL, NULL, GF_ARG_BOOL, GF_ARG_HINT_EXPERT|GF_ARG_SUBSYS_CORE),
  GF_DEF_ARG("unhandled-rejection", NULL, "dump unhandled promise rejections", NULL, NULL, GF_ARG_BOOL, GF_ARG_HINT_EXPERT|GF_ARG_SUBSYS_CORE),
  GF_DEF_ARG("startup-file", NULL, "startup file of compositor in GUI mode", NULL, NULL, GF_ARG_STRING, GF_ARG_HINT_EXPERT|GF_ARG_SUBSYS_CORE),
- GF_DEF_ARG("docs-dir", NULL, "default documents directoty (for GUI on iOS and Android)", NULL, NULL, GF_ARG_STRING, GF_ARG_HINT_EXPERT|GF_ARG_SUBSYS_CORE),
+ GF_DEF_ARG("docs-dir", NULL, "default documents directory (for GUI on iOS and Android)", NULL, NULL, GF_ARG_STRING, GF_ARG_HINT_EXPERT|GF_ARG_SUBSYS_CORE),
  GF_DEF_ARG("last-dir", NULL, "last working directory (for GUI)", NULL, NULL, GF_ARG_STRING, GF_ARG_HINT_EXPERT|GF_ARG_SUBSYS_CORE),
 #ifdef GPAC_HAS_POLL
  GF_DEF_ARG("no-poll", NULL, "disable poll and use select for socket groups", NULL, NULL, GF_ARG_BOOL, GF_ARG_HINT_EXPERT|GF_ARG_SUBSYS_CORE),
 #endif
- GF_DEF_ARG("no-tls-rcfg", NULL, "disble automatic TCP to TLS reconfiguration", NULL, NULL, GF_ARG_BOOL, GF_ARG_HINT_EXPERT|GF_ARG_SUBSYS_CORE),
+ GF_DEF_ARG("no-tls-rcfg", NULL, "disable automatic TCP to TLS reconfiguration", NULL, NULL, GF_ARG_BOOL, GF_ARG_HINT_EXPERT|GF_ARG_SUBSYS_CORE),
+ GF_DEF_ARG("no-fd", NULL, "use buffered IO instead of file descriptor for read/write - this can speed up operations on small files", NULL, NULL, GF_ARG_BOOL, GF_ARG_HINT_EXPERT|GF_ARG_SUBSYS_CORE),
+ GF_DEF_ARG("no-mx", NULL, "disable all mutexes, threads and semaphores (do not use if unsure about threading used)", NULL, NULL, GF_ARG_BOOL, GF_ARG_HINT_EXPERT|GF_ARG_SUBSYS_CORE),
+#ifndef GPAC_DISABLE_NETCAP
+ GF_DEF_ARG("netcap", NULL, "set packet capture and filtering rules formatted as CFGRULES. Each `-netcap` argument will define a configuration\n"
+ "CFG is an optional comma-separated list of:\n"
+ "- id=ID: ID (string) for this configuration. If NULL, configuration will apply to all sockets not specifying a netcap ID\n"
+ "- src=F: read packets from `F`, as produced by GPAC or a pcap or pcapng file\n"
+ "- dst=F: output packets to `F` (GPAC or pcap/pcapng file), cannot be set if src is set\n"
+ "- loop=N: loop capture file N times, or forever if N is not set or negative\n"
+ "- nrt: disable real-time playback\n"
+ "RULES is an optional list of `OPT,OPT2...` with OPT in:\n"
+ "- m=N: set rule mode - `N` can be `r` for reception only (default), `w` for send only or `rw` for both\n"
+ "- s=N: set packet start range to `N`\n"
+ "- e=N: set packet end range to `N` (only used for `r` and `f` rules)\n"
+ "- n=N: set number of packets to drop to `N` - not set, 0 or 1 means single packet\n"
+ "- r=N: random drop one packet every `N`\n"
+ "- f=N: drop first packet every `N`\n"
+ "- p=P: local port number to filter, if not set the rule applies to all packets\n"
+ "- o=N: patch packet instead of droping (always true for TCP), replacing byte at offset `N` (0 is first byte, <0 for random)\n"
+ "- v=N: set patch byte value to `N` (hexa) or negative value for random (default)\n"
+ "\nEX -netcap=dst=dump.gpc\n"
+ "This will record packets to dump.gpc\n"
+ "\nEX -netcap=src=dump.gpc,id=NC1 -i session1.sdp:NCID=NC1 -i session2.sdp\n"
+ "This will read packets from dump.gpc only for session1.sdp and let session2.sdp use regular sockets\n"
+ "\nEX -netcap=p=1234,s=100,n=20r=200,s=500,o=10,v=FE\n"
+ "This will use regular network interface and drop packets 100 to 119 on port 1234 and patch one random packet every 200 starting from packet 500, setting byte 10 to FE", NULL, NULL, GF_ARG_STRING, GF_ARG_HINT_EXPERT|GF_ARG_SUBSYS_CORE),
+#endif
 
  GF_DEF_ARG("cache", NULL, "cache directory location", NULL, NULL, GF_ARG_STRING, GF_ARG_HINT_ADVANCED|GF_ARG_SUBSYS_HTTP),
  GF_DEF_ARG("proxy-on", NULL, "enable HTTP proxy", NULL, NULL, GF_ARG_BOOL, GF_ARG_HINT_ADVANCED|GF_ARG_SUBSYS_HTTP),
@@ -1368,7 +1516,7 @@
  GF_DEF_ARG("clean-cache", NULL, "indicate if HTTP cache should be clean upon launch/exit", NULL, NULL, GF_ARG_BOOL, GF_ARG_SUBSYS_HTTP),
  GF_DEF_ARG("cache-size", NULL, "specify cache size in bytes", "100M", NULL, GF_ARG_INT, GF_ARG_HINT_ADVANCED|GF_ARG_SUBSYS_HTTP),
  GF_DEF_ARG("tcp-timeout", NULL, "time in milliseconds to wait for HTTP/RTSP connect before error", "5000", NULL, GF_ARG_INT, GF_ARG_HINT_EXPERT|GF_ARG_SUBSYS_HTTP),
- GF_DEF_ARG("req-timeout", NULL, "time in milliseconds to wait on HTTP/RTSP request before error", "10000", NULL, GF_ARG_INT, GF_ARG_HINT_EXPERT|GF_ARG_SUBSYS_HTTP),
+ GF_DEF_ARG("req-timeout", NULL, "time in milliseconds to wait on HTTP/RTSP request before error (0 disables timeout)", "10000", NULL, GF_ARG_INT, GF_ARG_HINT_EXPERT|GF_ARG_SUBSYS_HTTP),
  GF_DEF_ARG("no-timeout", NULL, "ignore HTTP 1.1 timeout in keep-alive", "false", NULL, GF_ARG_BOOL, GF_ARG_HINT_EXPERT|GF_ARG_SUBSYS_HTTP),
  GF_DEF_ARG("broken-cert", NULL, "enable accepting broken SSL certificates", NULL, NULL, GF_ARG_BOOL, GF_ARG_HINT_EXPERT|GF_ARG_SUBSYS_HTTP),
  GF_DEF_ARG("user-agent", "ua", "set user agent name for HTTP/RTSP", NULL, NULL, GF_ARG_STRING, GF_ARG_HINT_ADVANCED|GF_ARG_SUBSYS_HTTP),
@@ -1385,8 +1533,9 @@
  GF_DEF_ARG("h2-copy", NULL, "enable intermediate copy of data in nghttp2 (default is disabled but may report as broken frames in wireshark)", NULL, NULL, GF_ARG_BOOL, GF_ARG_HINT_EXPERT|GF_ARG_SUBSYS_HTTP),
 #endif
 
- GF_DEF_ARG("dbg-edges", NULL, "log edges status in filter graph before dijkstra resolution (for debug). Edges are logged as edge_source(status, weight, src_cap_idx, dst_cap_idx)", NULL, NULL, GF_ARG_BOOL, GF_ARG_HINT_EXPERT|GF_ARG_SUBSYS_FILTERS),
-GF_DEF_ARG("full-link", NULL, "throw error if any PID in the filter graph cannot be linked", NULL, NULL, GF_ARG_BOOL, GF_ARG_HINT_EXPERT|GF_ARG_SUBSYS_FILTERS),
+ GF_DEF_ARG("dbg-edges", NULL, "log edges status in filter graph before dijkstra resolution (for debug). Edges are logged as edge_source(status(disable_depth), weight, src_cap_idx -> dst_cap_idx)", NULL, NULL, GF_ARG_BOOL, GF_ARG_HINT_EXPERT|GF_ARG_SUBSYS_FILTERS),
+ GF_DEF_ARG("full-link", NULL, "throw error if any PID in the filter graph cannot be linked", NULL, NULL, GF_ARG_BOOL, GF_ARG_HINT_EXPERT|GF_ARG_SUBSYS_FILTERS),
+ GF_DEF_ARG("no-dynf", NULL, "disable dynamically loaded filters", NULL, NULL, GF_ARG_BOOL, GF_ARG_HINT_EXPERT|GF_ARG_SUBSYS_FILTERS),
 
  GF_DEF_ARG("no-block", NULL, "disable blocking mode of filters\n"
 			"- no: enable blocking mode\n"
@@ -1409,36 +1558,20 @@
  GF_DEF_ARG("blacklist", NULL, "blacklist the filters listed in the given string (comma-separated list). If first character is '-', this is a whitelist, i.e. only filters listed in the given string will be allowed", NULL, NULL, GF_ARG_STRING, GF_ARG_HINT_ADVANCED|GF_ARG_SUBSYS_FILTERS),
  GF_DEF_ARG("no-graph-cache", NULL, "disable internal caching of filter graph connections. If disabled, the graph will be recomputed at each link resolution (lower memory usage but slower)", NULL, NULL, GF_ARG_BOOL, GF_ARG_HINT_EXPERT|GF_ARG_SUBSYS_FILTERS),
  GF_DEF_ARG("no-reservoir", NULL, "disable memory recycling for packets and properties. This uses much less memory but stresses the system memory allocator much more", NULL, NULL, GF_ARG_BOOL, GF_ARG_HINT_EXPERT|GF_ARG_SUBSYS_FILTERS),
-
  GF_DEF_ARG("buffer-gen", NULL, "default buffer size in microseconds for generic pids", "1000", NULL, GF_ARG_INT, GF_ARG_HINT_ADVANCED|GF_ARG_SUBSYS_FILTERS),
  GF_DEF_ARG("buffer-dec", NULL, "default buffer size in microseconds for decoder input pids", "1000000", NULL, GF_ARG_INT, GF_ARG_HINT_ADVANCED|GF_ARG_SUBSYS_FILTERS),
  GF_DEF_ARG("buffer-units", NULL, "default buffer size in frames when timing is not available", "1", NULL, GF_ARG_INT, GF_ARG_HINT_ADVANCED|GF_ARG_SUBSYS_FILTERS),
 
- GF_DEF_ARG("switch-vres", NULL, "select smallest video resolution larger than scene size, otherwise use current video resolution", NULL, NULL, GF_ARG_BOOL, GF_ARG_HINT_EXPERT|GF_ARG_SUBSYS_VIDEO),
- GF_DEF_ARG("hwvmem", NULL, "specify (2D rendering only) memory type of main video backbuffer. Depending on the scene type, this may drastically change the playback speed\n"
- "- always: always on hardware\n"
- "- never: always on system memory\n"
- "- auto: selected by GPAC based on content type (graphics or video)", "auto", "auto|always|never", GF_ARG_INT, GF_ARG_HINT_EXPERT|GF_ARG_SUBSYS_VIDEO),
- GF_DEF_ARG("pref-yuv4cc", NULL, "set preferred YUV 4CC for overlays (used by DirectX only)", NULL, NULL, GF_ARG_STRING, GF_ARG_HINT_EXPERT|GF_ARG_SUBSYS_VIDEO),
- GF_DEF_ARG("yuv-overlay", NULL, "indicate YUV overlay is possible on the video card. Always overridden by video output module", NULL, NULL, GF_ARG_BOOL, GF_ARG_HINT_HIDE|GF_ARG_SUBSYS_VIDEO),
- GF_DEF_ARG("offscreen-yuv", NULL, "indicate if offscreen yuv->rgb is enabled. can be set to false to force disabling", NULL, NULL, GF_ARG_BOOL, GF_ARG_HINT_EXPERT|GF_ARG_SUBSYS_VIDEO),
- GF_DEF_ARG("overlay-color-key", NULL, "color to use for overlay keying, hex format", NULL, NULL, GF_ARG_STRING, GF_ARG_HINT_EXPERT|GF_ARG_SUBSYS_VIDEO),
  GF_DEF_ARG("gl-bits-comp", NULL, "number of bits per color component in OpenGL", "8", NULL, GF_ARG_INT, GF_ARG_HINT_ADVANCED|GF_ARG_SUBSYS_VIDEO),
  GF_DEF_ARG("gl-bits-depth", NULL, "number of bits for depth buffer in OpenGL", "16", NULL, GF_ARG_INT, GF_ARG_HINT_ADVANCED|GF_ARG_SUBSYS_VIDEO),
  GF_DEF_ARG("gl-doublebuf", NULL, "enable OpenGL double buffering", "yes", NULL, GF_ARG_BOOL, GF_ARG_HINT_ADVANCED|GF_ARG_SUBSYS_VIDEO),
- GF_DEF_ARG("sdl-defer", NULL, "use defer rendering for SDL", NULL, NULL, GF_ARG_BOOL, GF_ARG_HINT_EXPERT|GF_ARG_SUBSYS_VIDEO),
- GF_DEF_ARG("no-colorkey", NULL, "disable color keying at the video output level", NULL, NULL, GF_ARG_BOOL, GF_ARG_HINT_ADVANCED|GF_ARG_SUBSYS_VIDEO),
  GF_DEF_ARG("glfbo-txid", NULL, "set output texture ID when using `glfbo` output. The OpenGL context shall be initialized and gf_term_process shall be called with the OpenGL context active", NULL, NULL, GF_ARG_INT, GF_ARG_HINT_EXPERT|GF_ARG_SUBSYS_VIDEO),
  GF_DEF_ARG("video-output", NULL, "indicate the name of the video output module to use (see `gpac -h modules`)."
 	" The reserved name `glfbo` is used in player mode to draw in the OpenGL texture identified by -glfbo-txid(). "
-	" In this mode, the application is responsible for sending event to the compositor"
- , NULL, NULL, GF_ARG_STRING, GF_ARG_HINT_EXPERT|GF_ARG_SUBSYS_VIDEO),
- GF_DEF_ARG("dfb-sys", NULL, "system DirectFB (x11, sdl, vnc, fbdev, osx ordevmem)", "x11", NULL, GF_ARG_STRING, GF_ARG_HINT_EXPERT|GF_ARG_SUBSYS_VIDEO),
- GF_DEF_ARG("dfb-flip", NULL, "vsync mode for DirectFB (waitsync, wait, sync or swap)", "waitsync", NULL, GF_ARG_STRING, GF_ARG_HINT_EXPERT|GF_ARG_SUBSYS_VIDEO),
+	" In this mode, the application is responsible for sending event to the compositor", NULL, NULL, GF_ARG_STRING, GF_ARG_HINT_EXPERT|GF_ARG_SUBSYS_VIDEO),
+
  GF_DEF_ARG("audio-output", NULL, "indicate the name of the audio output module to use", NULL, NULL, GF_ARG_STRING, GF_ARG_HINT_EXPERT|GF_ARG_SUBSYS_AUDIO),
- GF_DEF_ARG("alsa-devname", NULL, "set ALSA dev name", NULL, NULL, GF_ARG_STRING, GF_ARG_HINT_ADVANCED|GF_ARG_SUBSYS_AUDIO),
- GF_DEF_ARG("force-alsarate", NULL, "force ALSA and OSS output sample rate", NULL, NULL, GF_ARG_INT, GF_ARG_HINT_EXPERT|GF_ARG_SUBSYS_AUDIO),
- GF_DEF_ARG("ds-disable-notif", NULL, "disable DirectSound audio buffer notifications when supported", NULL, NULL, GF_ARG_BOOL, GF_ARG_HINT_EXPERT|GF_ARG_SUBSYS_AUDIO),
+
  GF_DEF_ARG("font-reader", NULL, "indicate name of font reader module", NULL, NULL, GF_ARG_STRING, GF_ARG_HINT_EXPERT|GF_ARG_SUBSYS_TEXT),
  GF_DEF_ARG("font-dirs", NULL, "indicate comma-separated list of directories to scan for fonts", NULL, NULL, GF_ARG_STRING, GF_ARG_HINT_ADVANCED|GF_ARG_SUBSYS_TEXT),
  GF_DEF_ARG("rescan-fonts", NULL, "indicate the font directory must be rescanned", NULL, NULL, GF_ARG_BOOL, GF_ARG_HINT_ADVANCED|GF_ARG_SUBSYS_TEXT),
@@ -1464,6 +1597,7 @@
  GF_DEF_ARG("piff-force-subsamples", NULL, "hack for PIFF PSEC files generated by 0.9.0 and 1.0 MP4Box with wrong subsample_count inserted for audio", NULL, NULL, GF_ARG_BOOL, GF_ARG_HINT_EXPERT|GF_ARG_SUBSYS_HACKS),
  GF_DEF_ARG("vvdec-annexb", NULL, "hack for old vvdec+libavcodec supporting only annexB format", NULL, NULL, GF_ARG_BOOL, GF_ARG_HINT_EXPERT|GF_ARG_SUBSYS_HACKS),
  GF_DEF_ARG("heif-hevc-urn", NULL, "use HEVC URN for alpha and depth in HEIF instead of MPEG-B URN (HEIF first edition)", NULL, NULL, GF_ARG_BOOL, GF_ARG_HINT_EXPERT|GF_ARG_SUBSYS_HACKS),
+ GF_DEF_ARG("boxdir", NULL, "use box definitions in the given directory for XML dump", NULL, NULL, GF_ARG_STRING, GF_ARG_HINT_EXPERT|GF_ARG_SUBSYS_HACKS),
 
 
  {0}
@@ -1516,22 +1650,19 @@
 	if (!opt && !strcmp(secName, "core")) {
 		opt = (char *) gpac_opt_default(keyName);
 	}
-	if (!opt) return 0;
-	char *sep = strchr(opt, 'k');
-	if (sep) times=1000;
-	else {
-		sep = strchr(opt, 'K');
-		if (sep) times=1000;
-		else {
-			sep = strchr(opt, 'm');
-			if (sep) times=1000000;
-			else {
-				sep = strchr(opt, 'M');
-				if (sep) times=1000000;
-			}
-		}
+	if (!opt || !opt0) return 0;
+	val = (u32) strlen(opt);
+	char c = optval-1;
+	switch (c) {
+	case 'k':
+	case 'K':
+		times=1000;
+		break;
+	case 'm':
+	case 'M':
+		times=1000000;
+		break;
 	}
-	sscanf(opt, "%d", &val);
 	val = atoi(opt);
 	return val*times;
 }
@@ -1742,7 +1873,7 @@
 
 
 GF_EXPORT
-void gf_sys_print_arg(FILE *helpout, u32 flags, const GF_GPACArg *arg, const char *arg_subsystem)
+void gf_sys_print_arg(FILE *helpout, GF_SysPrintArgFlags flags, const GF_GPACArg *arg, const char *arg_subsystem)
 {
 	u32 gen_doc = 0;
 	if (flags & GF_PRINTARG_MD)
@@ -1878,7 +2009,7 @@
 
 
 GF_EXPORT
-void gf_sys_print_core_help(FILE *helpout, u32 flags, GF_SysArgMode mode, u32 subsystem_flags)
+void gf_sys_print_core_help(FILE *helpout, GF_SysPrintArgFlags flags, GF_SysArgMode mode, u32 subsystem_flags)
 {
 	u32 i=0;
 	const GF_GPACArg *args = gf_sys_get_options();
@@ -1986,7 +2117,7 @@
 #endif
 
 GF_EXPORT
-void gf_sys_format_help(FILE *helpout, u32 flags, const char *fmt, ...)
+void gf_sys_format_help(FILE *helpout, GF_SysPrintArgFlags flags, const char *fmt, ...)
 {
 	char *line;
 	u32 len;
@@ -2057,6 +2188,7 @@
 			line_pos=0;
 			continue;
 		}
+		if (!line0) flags &= ~GF_PRINTARG_HIGHLIGHT_FIRST;
 
 		if ((line0=='#') && (line1==' ')) {
 			if (!gen_doc)
@@ -2359,7 +2491,7 @@
 
 			if (has_token && tid==TOK_OPTLINK) {
 				char *link = strchr(line, '(');
-				assert(link);
+				gf_assert(link);
 				link++;
 				char *end_link = strchr(line, ')');
 				if (end_link) end_link0 = 0;
@@ -2373,14 +2505,13 @@
 					} else if (!strncmp(link, "LOG", 3)) {
 						fprintf(helpout, "-%s(core_logs/#%s)", line, line);
 						line_pos+=7 + 2* (u32)strlen(line) + (u32)strlen("core_logs");
-					} else if (!strncmp(link, "CORE", 3)) {
+					} else if (!strncmp(link, "CORE", 4)) {
 						fprintf(helpout, "-%s(core_options/#%s)", line, line);
 						line_pos+=7 + 2* (u32)strlen(line) + (u32)strlen("core_options");
-						line_pos+=7 + 2*(u32)strlen(line) + (u32)strlen("core_options");
 					} else if (!strncmp(link, "CFG", 3)) {
 						fprintf(helpout, "-%s(core_config/#%s)", line, line);
 						line_pos+=7 + 2*(u32)strlen(line) + (u32)strlen("core_config");
-					} else if (!strncmp(link, "MP4B_GEN", 3)) {
+					} else if (!strncmp(link, "MP4B_GEN", 8)) {
 						fprintf(helpout, "-%s(mp4box-gen-opts/#%s)", line, line);
 						line_pos+=7 + 2* (u32)strlen(line) + (u32)strlen("mp4box-gen-opts");
 					} else if (strlen(link)) {
@@ -2388,11 +2519,11 @@
 						line_pos+=7 + 2* (u32)strlen(line) + (u32)strlen(link);
 					} else if (is_app_opts || !strcmp(line, "i") || !strcmp(line, "o") || !strcmp(line, "h")) {
 						fprintf(helpout, "-%s(#%s)", line, line);
-						line_pos+=5 + 2* (u32)strlen(line) + (u32)strlen(link);
+						line_pos+=6 + 2* (u32)strlen(line);
 					} else {
 						//this is a filter opt, don't print '-'
 						fprintf(helpout, "%s(#%s)", line, line);
-						line_pos+=4 + 2* (u32)strlen(line) + (u32)strlen(link);
+						line_pos+=5 + 2* (u32)strlen(line);
 					}
 				} else {
 					if (gen_doc==2)
@@ -2400,7 +2531,7 @@
 
 					if (!strncmp(link, "GPAC", 4)
 						|| !strncmp(link, "LOG", 3)
-						|| !strncmp(link, "CORE", 3)
+						|| !strncmp(link, "CORE", 4)
 						|| strlen(link)
 						|| !strcmp(line, "i") || !strcmp(line, "o") || !strcmp(line, "h")
 					) {
@@ -2505,7 +2636,9 @@
 		return GF_FALSE;
 	}
 
-	if (gf_strnistr(orig, dst, dlen))
+	if ((dlen>=3) && gf_strnistr(orig, dst, dlen))
+		return GF_TRUE;
+	if ((olen>=3) && gf_strnistr(dst, orig, olen))
 		return GF_TRUE;
 
 	run = gf_malloc(sizeof(u32) * olen);

gpac-2.2.1.tar.gz/src/utils/os_divers.c -> gpac-2.4.0.tar.gz/src/utils/os_divers.c Changed

gpac-2.2.1.tar.gz/src/utils/os_file.c -> gpac-2.4.0.tar.gz/src/utils/os_file.c Changed

@@ -1,7 +1,7 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre - Copyright (c) Telecom ParisTech 2000-2022
+ *			Authors: Jean Le Feuvre - Copyright (c) Telecom ParisTech 2000-2023
  *			         Romain Bouqueau - Copyright (c) Romain Bouqueau 2015
  *					All rights reserved
  *
@@ -157,10 +157,15 @@
 	gf_free(wcsDirPathName);
 	return (att != INVALID_FILE_ATTRIBUTES && (att & FILE_ATTRIBUTE_DIRECTORY)) ? GF_TRUE : GF_FALSE;
 #else
-	DIR* dir = opendir(DirPathName);
-	if (!dir) return GF_FALSE;
-	closedir(dir);
-	return GF_TRUE;
+	struct stat sb;
+	if (stat(DirPathName, &sb) == 0 && S_ISDIR(sb.st_mode)) {
+		return GF_TRUE;
+	}
+	return GF_FALSE;
+//	DIR* dir = opendir(DirPathName);
+//	if (!dir) return GF_FALSE;
+//	closedir(dir);
+//	return GF_TRUE;
 #endif
 	return GF_FALSE;
 }
@@ -289,7 +294,7 @@
 	}
 	gf_free(wname);
 	return res;
-#elif defined(GPAC_CONFIG_LINUX)
+#elif defined(GPAC_CONFIG_LINUX) || defined(GPAC_CONFIG_EMSCRIPTEN)
 	Bool res = (access(fileName, 4) == -1) ? GF_FALSE : GF_TRUE;
 	if (res && gf_dir_exists(fileName))
 		res = GF_FALSE;
@@ -465,14 +470,22 @@
 	return gpac_file_handles;
 }
 
+#include <gpac/thread.h>
+extern GF_Mutex *logs_mx;
+
 #ifdef GPAC_MEMORY_TRACKING
 const char *enum_open_handles(u32 *idx)
 {
 	GF_FileHandle *h;
+	gf_mx_p(logs_mx);
 	u32 count = gf_list_count(gpac_open_files);
-	if (*idx >= count) return NULL;
+	if (*idx >= count) {
+		gf_mx_v(logs_mx);
+		return NULL;
+	}
 	h = gf_list_get(gpac_open_files, *idx);
 	(*idx)++;
+	gf_mx_v(logs_mx);
 	return h->url;
 }
 #endif
@@ -485,6 +498,7 @@
 #endif
 	) {
 		GF_FileHandle *h;
+		gf_mx_p(logs_mx);
 		if (!gpac_open_files) gpac_open_files = gf_list_new();
 		GF_SAFEALLOC(h, GF_FileHandle);
 		if (h) {
@@ -497,19 +511,17 @@
 			}
 			gf_list_add(gpac_open_files, h);
 		}
+		gf_mx_v(logs_mx);
 	}
 	gpac_file_handles++;
 }
 
-#include <gpac/thread.h>
-extern GF_Mutex *logs_mx;
-
 static Bool gf_unregister_file_handle(FILE *ptr)
 {
 	u32 i, count;
 	Bool res = GF_FALSE;
-	assert(gpac_file_handles);
-	gpac_file_handles--;
+	if (gpac_file_handles)
+		gpac_file_handles--;
 
 	if (!gpac_open_files)
 		return GF_FALSE;
@@ -906,6 +918,7 @@
 		}
 #endif
 
+		Bool done = GF_FALSE;
 #ifdef WIN32
 		mbs_file = gf_wcs_to_utf8(file);
 		mbs_item_path = gf_wcs_to_utf8(item_path);
@@ -924,13 +937,14 @@
 #else
 		if (enum_dir_fct(cbck, file, item_path, &file_info)) {
 #endif
-			break;
+			done = GF_TRUE;
 		}
 
 #ifdef WIN32
 		gf_free(mbs_file);
 		gf_free(mbs_item_path);
 #endif
+		if (done) break;
 
 next:
 #ifdef WIN32
@@ -966,14 +980,17 @@
 	s64 (*tell)(GF_FileIO *fileio);
 	Bool (*eof)(GF_FileIO *fileio);
 	int (*printf)(GF_FileIO *gfio, const char *format, va_list args);
+	char *(*gets)(GF_FileIO *gfio, char *ptr, u32 size);
 
 	char *url;
 	char *res_url;
 	void *udta;
 
 	u64 bytes_done, file_size_plus_one;
-	Bool cache_complete, main_th;
+	Bool main_th;
+	GF_FileIOCacheState cache_state;
 	u32 bytes_per_sec;
+	u32 write_state;
 
 	u32 printf_alloc;
 	u8* printf_buf;
@@ -991,28 +1008,88 @@
 	return GF_FALSE;
 }
 
+GF_EXPORT
+GF_FileIOWriteState gf_fileio_write_ready(FILE *fp)
+{
+	GF_FileIO *fio = (GF_FileIO *)fp;
+	if ((fp==stdin) || (fp==stderr) || (fp==stdout))
+		return GF_FIO_WRITE_READY;
+
+	//GFIO, check state
+	if (fio && !fio->_reserved_null && (fio->__this==fio)) {
+		return fio->write_state;
+	}
+	//sync stdio
+	return GF_FIO_WRITE_READY;
+}
+
+u32 gf_fileio_get_write_rate(FILE *fp)
+{
+	GF_FileIO *fio = (GF_FileIO *)fp;
+	if ((fp==stdin) || (fp==stderr) || (fp==stdout))
+		return 0;
+
+	if (fio && !fio->_reserved_null && (fio->__this==fio)) {
+		return fio->bytes_per_sec;
+	}
+	//sync stdio
+	return 0;
+}
+
 typedef struct
 {
 	u8 *data;
 	u32 size;
 	u32 pos;
+	u32 url_crc;
+	u32 nb_ref;
 } GF_FileIOBlob;
 
 static GF_FileIO *gfio_blob_open(GF_FileIO *fileio_ref, const char *url, const char *mode, GF_Err *out_error)
 {
 	GF_FileIOBlob *blob = gf_fileio_get_udta(fileio_ref);
-	if (!url) {
+	if (!strcmp(mode, "close") || !strcmp(mode, "unref")) {
+		if (blob->nb_ref) blob->nb_ref--;
+		blob->pos = 0;
+		if (blob->nb_ref)
+			return NULL;
+
 		gf_free(blob);
 		gf_fileio_del(fileio_ref);
+		return NULL;
 	}
-	return NULL;
+	if (!strcmp(mode, "ref")) {
+		blob->nb_ref++;
+		*out_error = GF_OK;
+		return NULL;
+	}
+	if (!strcmp(mode, "url")) {
+		*out_error = GF_BAD_PARAM;
+		return NULL;
+	}
+	if (!strcmp(mode, "probe")) {
+		u32 crc = gf_crc_32(url, (u32) strlen(url) );
+		*out_error = (crc==blob->url_crc) ? GF_OK : GF_URL_ERROR;
+		return NULL;
+	}
+	if (mode0!='r') {
+		*out_error = GF_BAD_PARAM;
+		return NULL;
+	}
+	blob->nb_ref++;
+	if (blob->nb_ref>2) {
+		*out_error = GF_BAD_PARAM;
+		return NULL;
+	}
+	*out_error = GF_OK;
+	return fileio_ref;
 }
 
 static GF_Err gfio_blob_seek(GF_FileIO *fileio, u64 offset, s32 whence)
 {
 	GF_FileIOBlob *blob = gf_fileio_get_udta(fileio);
 	if (whence==SEEK_END) blob->pos = blob->size;
-	else if (whence==SEEK_SET) blob->pos = 0;
+	else if (whence==SEEK_SET) blob->pos = (u32) offset;
 	else {
 		if (blob->pos + offset > blob->size) return GF_BAD_PARAM;
 		blob->pos += (u32) offset;
@@ -1042,6 +1119,24 @@
 	return GF_FALSE;
 }
 
+static char *gfio_blob_gets(GF_FileIO *fileio, char *ptr, u32 size)
+{
+	GF_FileIOBlob *blob = gf_fileio_get_udta(fileio);
+	char *buf = blob->data + blob->pos;
+	u32 len = blob->size - blob->pos;
+	if (!len) return NULL;
+
+	char *next = memchr(buf, '\n', len);
+	if (next) {
+		len = (u32) (next - buf);
+		if (len + blob->pos<blob->size) len++;
+	}
+	if (len > size) len = size;
+	memcpy(ptr, blob->data+blob->pos, len);
+	blob->pos += len;
+	return ptr;
+}
+
 GF_EXPORT
 GF_FileIO *gf_fileio_new(char *url, void *udta,
 	gfio_open_proc open,
@@ -1197,7 +1292,7 @@
 
 Bool gf_fileio_eof(GF_FileIO *fileio)
 {
-	if (!fileio || !fileio->tell) return GF_TRUE;
+	if (!fileio || !fileio->eof) return GF_TRUE;
 	return fileio->eof(fileio);
 }
 
@@ -1219,25 +1314,31 @@
 }
 
 GF_EXPORT
-void gf_fileio_set_stats(GF_FileIO *gfio, u64 bytes_done, u64 file_size, Bool cache_complete, u32 bytes_per_sec)
+void gf_fileio_set_stats(GF_FileIO *gfio, u64 bytes_done, u64 file_size, GF_FileIOCacheState cache_state, u32 bytes_per_sec)
 {
 	if (!gfio) return;
 	gfio->bytes_done = bytes_done;
 	gfio->file_size_plus_one = file_size ? (1 + file_size) : 0;
-	gfio->cache_complete = cache_complete;
+	gfio->cache_state = cache_state;
 	gfio->bytes_per_sec = bytes_per_sec;
 }
 
+GF_EXPORT
+void gf_fileio_set_write_state(GF_FileIO *gfio, GF_FileIOWriteState write_state)
+{
+	if (!gfio) return;
+	gfio->write_state = write_state;
+}
 
 GF_EXPORT
-Bool gf_fileio_get_stats(GF_FileIO *gfio, u64 *bytes_done, u64 *file_size, Bool *cache_complete, u32 *bytes_per_sec)
+Bool gf_fileio_get_stats(GF_FileIO *gfio, u64 *bytes_done, u64 *file_size, GF_FileIOCacheState *cache_state, u32 *bytes_per_sec)
 {
 	if (!gf_fileio_check((FILE *)gfio))
 		return GF_FALSE;
 
 	if (bytes_done) *bytes_done = gfio->bytes_done;
 	if (file_size) *file_size = gfio->file_size_plus_one ? gfio->file_size_plus_one-1 : 0;
-	if (cache_complete) *cache_complete = gfio->cache_complete;
+	if (cache_state) *cache_state = gfio->cache_state;
 	if (bytes_per_sec) *bytes_per_sec = gfio->bytes_per_sec;
 	return GF_TRUE;
 }
@@ -1259,6 +1360,7 @@
 }
 
 
+
 GF_EXPORT
 u64 gf_ftell(FILE *fp)
 {
@@ -1331,25 +1433,64 @@
 	GF_Err e = gf_blob_get(file_name, &blob_data, &blob_size, &flags);
 	if (e || !blob_data) return NULL;
     gf_blob_release(file_name);
-    
+
     if (flags) {
         GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("Core Attempt at creating a GFIO object on blob corrupted or in transfer, not supported !"));
         return NULL;
     }
-    
+
 	GF_SAFEALLOC(gfio_blob, GF_FileIOBlob);
 	if (!gfio_blob) return NULL;
 	gfio_blob->data = blob_data;
 	gfio_blob->size = blob_size;
-	return gf_fileio_new((char *) file_name, gfio_blob, gfio_blob_open, gfio_blob_seek, gfio_blob_read, NULL, gfio_blob_tell, gfio_blob_eof, NULL);
+	GF_FileIO *res = gf_fileio_new((char *) file_name, gfio_blob, gfio_blob_open, gfio_blob_seek, gfio_blob_read, NULL, gfio_blob_tell, gfio_blob_eof, NULL);
+	if (!res) return NULL;
+	res->gets = gfio_blob_gets;
+	if (file_name)
+		gfio_blob->url_crc = gf_crc_32(file_name, (u32) strlen(file_name) );
+	return res;
 }
+
+GF_FileIO *gf_fileio_from_mem(const char *URL, const u8 *data, u32 size)
+{
+	GF_FileIOBlob *gfio_blob;
+	GF_SAFEALLOC(gfio_blob, GF_FileIOBlob);
+	if (!gfio_blob) return NULL;
+	gfio_blob->data = (u8 *) data;
+	gfio_blob->size = size;
+	GF_FileIO *res = gf_fileio_new((char *) URL, gfio_blob, gfio_blob_open, gfio_blob_seek, gfio_blob_read, NULL, gfio_blob_tell, gfio_blob_eof, NULL);
+	if (!res)  {
+		gf_free(gfio_blob);
+		return NULL;
+	}
+	res->gets = gfio_blob_gets;
+	if (URL)
+		gfio_blob->url_crc = gf_crc_32(URL, (u32) strlen(URL) );
+	gf_fopen(gf_fileio_url(res), "r");
+	return res;
+}
+
+
+#ifdef GPAC_CONFIG_EMSCRIPTEN
+static u32 mainloop_th_id = 0;
+void gf_set_mainloop_thread(u32 thread_id)
+{
+	mainloop_th_id = thread_id;
+}
+#endif
+
 GF_EXPORT
 FILE *gf_fopen_ex(const char *file_name, const char *parent_name, const char *mode, Bool no_warn)
 {
 	FILE *res = NULL;
 	u32 gfio_type = 0;
+	Bool is_mkdir = GF_FALSE;
 
-	if (!file_name) return NULL;
+	if (!file_name || !mode) return NULL;
+	if (!strcmp(mode, "mkdir")) {
+		is_mkdir = GF_TRUE;
+		mode = "w";
+	}
 
 	if (!strncmp(file_name, "gmem://", 7)) {
 		GF_FileIO *new_gfio;
@@ -1383,7 +1524,7 @@
 			GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("FileIO %s is not read-enabled and open mode %s was requested\n", file_name, mode));
 			return NULL;
 		}
-		if ((strchr(mode, 'w') || strchr(mode, 'a'))  && !gf_fileio_write_mode(gfio_ref)) {
+		if (strpbrk(mode, "wa") && !gf_fileio_write_mode(gfio_ref)) {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("FileIO %s is not write-enabled and open mode %s was requested\n", file_name, mode));
 			return NULL;
 		}
@@ -1426,7 +1567,14 @@
 			sep = n_sep;
 		}
 		gf_free(fname);
+		if (is_mkdir) return NULL;
+	}
+
+#ifdef GPAC_CONFIG_EMSCRIPTEN
+	if (mainloop_th_id && strchr(mode, 'r') && (gf_th_id() != mainloop_th_id)) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("Core Opening file in read mode outside of main loop will likely deadlock - please report to GPAC devs\n"));
 	}
+#endif
 
 #if defined(WIN32)
 	wchar_t *wname;
@@ -1457,7 +1605,7 @@
 
 		GF_LOG(GF_LOG_DEBUG, GF_LOG_CORE, ("Core file \"%s\" opened in mode \"%s\" - %d file handles\n", file_name, mode, gpac_file_handles));
 	} else if (!no_warn) {
-		if (strchr(mode, 'w') || strchr(mode, 'a')) {
+		if (strpbrk(mode, "wa")) {
 #if defined(WIN32)
 			u32 err = GetLastError();
 			GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("Core system failure for file opening of \"%s\" in mode \"%s\": 0x%08x\n", file_name, mode, err));
@@ -1550,6 +1698,9 @@
 {
 	if (gf_fileio_check(stream)) {
 		GF_FileIO *fio = (GF_FileIO *)stream;
+		if (fio->gets)
+			return fio->gets(fio, ptr, (u32) size);
+
 		u32 i, read, nb_read=0;
 		for (i=0; i<size; i++) {
 			u8 buf1;
@@ -1646,6 +1797,8 @@
 GF_EXPORT
 int gf_feof(FILE *stream)
 {
+	if (!stream) return 1;
+
 	if (gf_fileio_check(stream)) {
 		return gf_fileio_eof((GF_FileIO *)stream) ? 1 : 0;
 	}
@@ -1828,4 +1981,3 @@
 	}
 	return sep;
 }
-

gpac-2.2.1.tar.gz/src/utils/os_net.c -> gpac-2.4.0.tar.gz/src/utils/os_net.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2022
+ *			Copyright (c) Telecom ParisTech 2000-2024
  *					All rights reserved
  *
  *  This file is part of GPAC / common tools sub-project
@@ -25,6 +25,10 @@
 
 #include <gpac/network.h>
 
+#ifndef GPAC_DISABLE_NETWORK
+
+#include <gpac/utf.h>
+
 #if defined(WIN32) || defined(_WIN32_WCE)
 #define _WINSOCK_DEPRECATED_NO_WARNINGS
 
@@ -42,6 +46,8 @@
 
 #if !defined(__GNUC__)
 #pragma comment(lib, "ws2_32")
+#pragma comment(lib, "IPHLPAPI.lib")
+#define GPAC_WIN_HAS_ADAPTER_INFO
 #endif
 
 #if !defined(POLLIN)
@@ -329,6 +335,11 @@
 
 #endif //winxp
 
+#ifdef GPAC_BUILD_FOR_WINXP
+#define my_inet_ntop inet_ntop_xp
+#else
+#define my_inet_ntop inet_ntop
+#endif
 
 
 #ifdef GPAC_HAS_IPV6
@@ -362,13 +373,6 @@
 #include <sys/un.h>
 #endif
 
-GF_EXPORT
-const char *gf_errno_str(int errnoval)
-{
-	return strerror(errnoval);
-}
-
-
 /*internal flags*/
 enum
 {
@@ -383,6 +387,29 @@
 	GF_SOCK_HAS_CONNECT = 1<<16,
 };
 
+#ifndef GPAC_DISABLE_NETCAP
+
+typedef struct __netcap_filter GF_NetcapFilter;
+static GF_NetcapFilter *gf_net_filter_get(const char *id);
+
+typedef struct
+{
+	//local host info
+	u32 host_addr_v4;
+	bin128 host_addr_v6;
+	u32 host_port;
+	//remote peer info
+	u32 peer_addr_v4;
+	bin128 peer_addr_v6;
+	u32 peer_port;
+
+	u32 pck_idx_r, pck_idx_w, next_pck_range, next_rand;
+	u32 patch_offset, patch_val;
+	GF_NetcapFilter *nf;
+} NetCapInfo;
+#endif
+
+
 struct __tag_socket
 {
 	u32 flags;
@@ -399,6 +426,10 @@
 #ifdef GPAC_HAS_POLL
 	u32 poll_idx;
 #endif
+
+#ifndef GPAC_DISABLE_NETCAP
+	NetCapInfo *cap_info;
+#endif
 };
 
 
@@ -437,13 +468,39 @@
 GF_EXPORT
 Bool gf_net_is_ipv6(const char *address)
 {
-	char *sep;
-	if (!address) return GF_FALSE;
-	sep = strchr(address, ':');
-	if (sep) sep = strchr(address, ':');
-	return sep ? GF_TRUE : GF_FALSE;
+	u32 i, nb_seps=0, nb_dseps=0, nb_dig=0, count = address ? (u32) strlen(address) : 0;
+	for (i=0;i<count; i++) {
+		if (addressi==':') {
+			nb_seps++;
+			nb_dig=0;
+			if ((i+1<count) && (addressi+1==':')) {
+				nb_dseps++;
+				i++;
+			}
+		}
+		else if (strchr("0123456789ABCDEFabcdef",addressi)==NULL) {
+			return GF_FALSE;
+		} else {
+			nb_dig++;
+			if (nb_dig>4) return GF_FALSE;
+		}
+	}
+	if (nb_seps>7) return GF_FALSE;
+	if (nb_seps==7) return GF_TRUE;
+	if (nb_dseps!=1) return GF_FALSE;
+	return GF_TRUE;
 }
 
+#if defined(GPAC_WIN_HAS_ADAPTER_INFO)
+#include <iphlpapi.h>
+#endif
+
+#if defined(GPAC_HAS_IFADDRS)
+#include <ifaddrs.h>
+#include <net/if.h>
+#endif
+
+
 #ifdef GPAC_HAS_IPV6
 #define MAX_PEER_NAME_LEN 1024
 static struct addrinfo *gf_sk_get_ipv6_addr(const char *PeerName, u16 PortNumber, int family, int flags, int sock_type)
@@ -473,6 +530,7 @@
 	}
 	if (PeerName) {
 		strncpy(node, PeerName, MAX_PEER_NAME_LEN-1);
+		nodeMAX_PEER_NAME_LEN-1 = 0;
 		if (node0=='') {
 			nodestrlen(node)-1 = 0;
 			memmove(node, &node1, MAX_PEER_NAME_LEN-1);
@@ -484,7 +542,105 @@
 	return res;
 }
 
+static struct addrinfo *gf_sk_get_ifce_ipv6_addr(const char *ifce_name_or_ip, u16 PortNumber, int family, int flags, int sock_type)
+{
+	char szIP100;
+	Bool force_ipv6 = GF_FALSE;
+	if (!ifce_name_or_ip || !ifce_name_or_ip0 || gf_net_is_ipv6(ifce_name_or_ip) || strchr(ifce_name_or_ip, '.'))
+		return gf_sk_get_ipv6_addr(ifce_name_or_ip, PortNumber, family, flags, sock_type);
+	if (ifce_name_or_ip0=='+') {
+		force_ipv6 = GF_TRUE;
+		ifce_name_or_ip+=1;
+		if (!ifce_name_or_ip0) {
+			return gf_sk_get_ipv6_addr(ifce_name_or_ip, PortNumber, AF_INET6, flags, sock_type);
+		}
+	}
+	if (family==AF_INET6) force_ipv6 = GF_TRUE;
+
+	szIP0 = 0;
+
+#if defined(GPAC_WIN_HAS_ADAPTER_INFO)
+	IP_ADAPTER_ADDRESSES *AdapterInfo = malloc(sizeof(IP_ADAPTER_ADDRESSES));
+	ULONG ulOutBufLen = sizeof(AdapterInfo);
+	if (AdapterInfo && (GetAdaptersAddresses(AF_UNSPEC, 0, NULL, AdapterInfo, &ulOutBufLen) == ERROR_BUFFER_OVERFLOW)) {
+		free(AdapterInfo);
+		AdapterInfo = malloc(sizeof(IP_ADAPTER_ADDRESSES)*ulOutBufLen);
+	}
+	if (AdapterInfo)
+		GetAdaptersAddresses(AF_UNSPEC, 0, NULL, AdapterInfo, &ulOutBufLen);
+	IP_ADAPTER_ADDRESSES *ifa = AdapterInfo;
+	while (ifa) {
+		Bool match = GF_FALSE;
+		if (!strcmp(ifa->AdapterName, ifce_name_or_ip)) match = GF_TRUE;
+		char *name = gf_wcs_to_utf8(ifa->FriendlyName);
+		if (name) {
+			if (!strcmp(name, ifce_name_or_ip)) match = GF_TRUE;
+			gf_free(name);
+		}
+		if (!match) {
+			ifa = ifa->Next;
+			szIP0 = 0;
+			continue;
+		}
+		IP_ADAPTER_UNICAST_ADDRESS_LH *ipadd = ifa->FirstUnicastAddress;
+		while (ipadd) {
+			if (!ipadd->Address.lpSockaddr) {
+				ipadd = ipadd->Next;
+				continue;
+			}
+			if (ipadd->Address.lpSockaddr->sa_family==AF_INET) {
+				my_inet_ntop(ipadd->Address.lpSockaddr->sa_family, ipadd->Address.lpSockaddr, szIP, 100);
+				free(AdapterInfo);
+				return gf_sk_get_ipv6_addr(szIP, PortNumber, family, flags, sock_type);
+			}
+			if (ipadd->Address.lpSockaddr->sa_family == AF_INET6) {
+				my_inet_ntop(ipadd->Address.lpSockaddr->sa_family, ipadd->Address.lpSockaddr, szIP, 100);
+				if (force_ipv6) {
+					free(AdapterInfo);
+					return gf_sk_get_ipv6_addr(szIP, PortNumber, family, flags, sock_type);
+				}
+			}
+			ipadd = ipadd->Next;
+		}
+		ifa = ifa->Next;
+	}
+	if (AdapterInfo)
+		free(AdapterInfo);
+#endif
 
+#if defined(GPAC_HAS_IFADDRS)
+	struct ifaddrs *ifap = NULL, *ifa;
+	getifaddrs(&ifap);
+	ifa = ifap;
+	while (ifa) {
+		if (!ifa->ifa_addr || strcmp(ifa->ifa_name, ifce_name_or_ip)) {
+			ifa = ifa->ifa_next;
+			continue;
+		}
+		if (ifa->ifa_addr->sa_family==AF_INET) {
+			memset(szIP, 0, 100);
+			inet_ntop(AF_INET, &( ((struct sockaddr_in *)ifa->ifa_addr)->sin_addr), szIP, 100);
+			freeifaddrs(ifap);
+			return gf_sk_get_ipv6_addr(szIP, PortNumber, family, flags, sock_type);
+		}
+		if (ifa->ifa_addr->sa_family==AF_INET6) {
+			memset(szIP, 0, 100);
+			inet_ntop(AF_INET6, &( ((struct sockaddr_in6 *)ifa->ifa_addr)->sin6_addr), szIP, 100);
+			if (force_ipv6) {
+				freeifaddrs(ifap);
+				return gf_sk_get_ipv6_addr(szIP, PortNumber, family, flags, sock_type);
+			}
+		}
+		ifa = ifa->ifa_next;
+	}
+	freeifaddrs(ifap);
+#endif
+
+	if (szIP0) {
+		return gf_sk_get_ipv6_addr(szIP, PortNumber, family, flags, sock_type);
+	}
+	return NULL;
+}
 #endif
 
 
@@ -506,6 +662,8 @@
 	} else {
 		struct sockaddr_storage clientaddr;
 		socklen_t addrlen = sizeof(clientaddr);
+		if (sock->flags & GF_SOCK_IS_MULTICAST)
+			return GF_BAD_PARAM;
 		if (getsockname(sock->socket, (struct sockaddr *)&clientaddr, &addrlen)) return GF_IP_NETWORK_FAILURE;
 
 		if (getnameinfo((struct sockaddr *)&clientaddr, addrlen, clienthost, sizeof(clienthost), NULL, 0, NI_NUMERICHOST))
@@ -528,9 +686,1159 @@
 	return GF_OK;
 }
 
+#ifndef GPAC_DISABLE_NETCAP
+
+#include <gpac/bitstream.h>
+#include <gpac/list.h>
+
+enum
+{
+	NETCAP_IS_MCAST = 1,
+	NETCAP_IS_TCP = 1<<1,
+	NETCAP_HAS_PEER = 1<<2,
+	NETCAP_IS_IPV6 = 1<<3,
+	NETCAP_HAS_EXT = 1<<6,
+	NETCAP_DROP = 1<<7,
+};
+
+//capture mode only, target bitstream
+u16 first_tcp_port=30000;
+
+#define GF_GPC_MAGIC	GF_4CC('G','P','C', 0)
+
+//playback vars
+
+
+enum {
+	NETCAP_NONE = 0,
+	//read/write
+	NETCAP_GPAC = 1,
+	//read only
+	NETCAP_PCAP = 2,
+	NETCAP_PCAPNG = 3,
+};
+
+typedef struct
+{
+	u32 send_recv;
+	u32 pck_start, pck_end;
+	s32 rand_every;
+	u32 nb_pck;
+	u32 port;
+	s32 patch_offset, patch_val;
+} NetFilterRule;
+
+static GF_List *netcap_filters=NULL;
+#ifdef GPAC_HAS_FD
+GF_BitStream *gf_bs_from_fd(int fd, u32 mode);
+#endif
+
+struct __netcap_filter
+{
+	char *id;
+	char *src;
+	char *dst;
+	s32 loops;
+	Bool rt;
+	GF_List *rules;
+	u32 nb_rules;
+
+
+	//target bitstream for read/write
+	GF_BitStream *cap_bs;
+	//playback mode only, set of created sockets, used to discard packets on non-bound sockets
+	GF_List *read_socks;
+	//playback mode only, set to socket corresponding to pending packet
+	GF_Socket *read_sock_selected;
+	//playback/capture, FILE pointer
+	FILE *file;
+#ifdef GPAC_HAS_FD
+	//playback/capture, fd pointer
+	int fd;
+#endif
+
+	//playback only, clock init value for RT regulation
+	u64 init_time;
+	Bool is_eos;
+
+
+	//loaded packet size in bytes - this is the payload of the UDP/TCP packet - if 0, packet fetch failed
+	s32 pck_len;
+	//gpac format only, flags of loaded packet
+	u8 pck_flags;
+	//time of loaded packet, relative to sys_clock_high_res
+	u64 pck_time;
+	//destination port of loaded packet - if 0, new packet needs to be loaded
+	u16 dst_port;
+	//ipv4 dest address or mcast address of loaded packet
+	u32 dst_v4;
+	//ipv6 dest address or mcast address of loaded packet
+	bin128 dst_v6;
+	//source port of loaded packet
+	u16 src_port;
+	//ipv4 source address of loaded packet
+	u32 src_v4;
+	//ipv6 source address of loaded packet
+	bin128 src_v6;
+
+	//source file type
+	u32 cap_mode;
+	//for pcap files, indicate if little endian
+	Bool pcap_le;
+	//for pcap files, indicate nano seconds are used
+	Bool pcap_nano;
+	//number of interfaces currently defined - for pcap, always, 1
+	u32 pcap_num_interfaces;
+	//all defined interfaces
+	u32 link_types20;
+	//trailing bytes in pcapng packet record
+	u32 pcapng_trail;
+	//trailing bytes after packet in pcap (NOT in pcapng)
+	u32 pcap_trail;
+
+	u32 pck_idx_r;
+	u32 pck_idx_w;
+	u32 next_pck_range;
+	u32 next_rand;
+};
+
+static GF_NetcapFilter *gf_net_filter_get(const char *id)
+{
+	u32 i, count;
+	count = gf_list_count(netcap_filters);
+	for (i=0; i<count; i++) {
+		GF_NetcapFilter *f = gf_list_get(netcap_filters, i);
+		if (f->id && id && !strcmp(f->id, id))
+			return f;
+
+		if (!f->id && !id)
+			return f;
+	}
+	return NULL;
+}
+//end playback vars
+
+
+
+void gf_net_close_capture()
+{
+	while (gf_list_count(netcap_filters)) {
+		GF_NetcapFilter *nf = gf_list_pop_back(netcap_filters);
+
+		if (nf->cap_bs) gf_bs_del(nf->cap_bs);
+
+#ifdef GPAC_HAS_FD
+		if (nf->fd>=0) close(nf->fd);
+#endif
+		if (nf->file) gf_fclose(nf->file);
+		if (nf->read_socks) gf_list_del(nf->read_socks);
+
+		if (nf->rules) {
+			while (1) {
+				NetFilterRule *r = gf_list_pop_back(nf->rules);
+				if (!r) break;
+				gf_free(r);
+			}
+			gf_list_del(nf->rules);
+		}
+		if (nf->id) gf_free(nf->id);
+		if (nf->src) gf_free(nf->src);
+		if (nf->dst) gf_free(nf->dst);
+		gf_free(nf);
+	}
+	gf_list_del(netcap_filters);
+	netcap_filters = NULL;
+}
+
+static GF_Err gf_netcap_record(GF_NetcapFilter *nf)
+{
+#ifdef GPAC_HAS_FD
+	if (!gf_opts_get_bool("core", "no-fd")) {
+		//make sure output dir exists
+		gf_fopen(nf->dst, "mkdir");
+		nf->fd = open(nf->dst, O_RDWR | O_CREAT | O_TRUNC, S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH );
+		if (nf->fd>=0) nf->cap_bs = gf_bs_from_fd(nf->fd, GF_BITSTREAM_WRITE);
+	} else
+#endif
+	{
+		nf->file = gf_fopen_ex(nf->dst, NULL, "w+b", GF_FALSE);
+		if (nf->file) nf->cap_bs = gf_bs_from_file(nf->file, GF_BITSTREAM_WRITE);
+	}
+	if (!nf->cap_bs) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("NetCap Failed to setup net capture\n"));
+		return GF_IO_ERR;
+	}
+	char *ext = gf_file_ext_start(nf->dst);
+	if (ext && !strcmp(ext, ".pcap")) {
+		nf->cap_mode = NETCAP_PCAP;
+		gf_bs_write_u32(nf->cap_bs, 0xA1B2C3D4);
+		gf_bs_write_u16(nf->cap_bs, 2);
+		gf_bs_write_u16(nf->cap_bs, 4);
+		gf_bs_write_u32(nf->cap_bs, 0);
+		gf_bs_write_u32(nf->cap_bs, 0);
+		gf_bs_write_u32(nf->cap_bs, 0xFFFF); //snapLen
+		gf_bs_write_u16(nf->cap_bs, 0); //FCS+f+reserved
+		gf_bs_write_u16(nf->cap_bs, 0); //linktype
+	} else if (ext && !strcmp(ext, ".pcapng")) {
+		nf->cap_mode = NETCAP_PCAPNG;
+		//SHB
+		gf_bs_write_u32(nf->cap_bs, 0x0a0d0d0a);
+		gf_bs_write_u32(nf->cap_bs, 12+16);
+		gf_bs_write_u32(nf->cap_bs, 0x1A2B3C4D);
+		gf_bs_write_u16(nf->cap_bs, 1);
+		gf_bs_write_u16(nf->cap_bs, 0);
+		gf_bs_write_u64(nf->cap_bs, 0);
+		gf_bs_write_u32(nf->cap_bs, 12+16);
+		//IDB
+		gf_bs_write_u32(nf->cap_bs, 1);
+		gf_bs_write_u32(nf->cap_bs, 12+8);
+		gf_bs_write_u16(nf->cap_bs, 0); //linktype
+		gf_bs_write_u16(nf->cap_bs, 0); //reserved
+		gf_bs_write_u32(nf->cap_bs, 0); //snapLen
+		gf_bs_write_u32(nf->cap_bs, 12+8);
+	} else {
+		nf->cap_mode = NETCAP_GPAC;
+		gf_bs_write_u32(nf->cap_bs, GF_GPC_MAGIC);
+		nf->init_time = gf_sys_clock_high_res();
+		u32 sec, frac;
+		gf_net_get_ntp(&sec, &frac);
+		//NTP start time of capture
+		gf_bs_write_u32(nf->cap_bs, sec);
+		gf_bs_write_u32(nf->cap_bs, frac);
+		//header extension size
+		gf_bs_write_u32(nf->cap_bs, 0);
+	}
+	return GF_OK;
+}
+
+static void gf_netcap_load_pck_gpac(GF_NetcapFilter *nf)
+{
+	if (gf_bs_available(nf->cap_bs)>4)
+		nf->pck_len = gf_bs_read_u32(nf->cap_bs);
+	else
+		nf->pck_len = 0;
+
+	//we allow size to be equal to our magic for file concat
+	//this means pck size= 1196442368 (for v0) so we should be way over captured MTU
+	if (nf->pck_len == GF_GPC_MAGIC) {
+		/*ntp_sec = */gf_bs_read_u32(nf->cap_bs);
+		/*ntp_frac = */gf_bs_read_u32(nf->cap_bs);
+		u32 hdr_len = gf_bs_read_u32(nf->cap_bs);
+		gf_bs_skip_bytes(nf->cap_bs, hdr_len);
+		nf->pck_flags = NETCAP_DROP;
+		nf->pck_len = 0;
+		nf->dst_port = 1;
+		return;
+	}
+
+	if (nf->pck_len<1+8+4+2) {
+		nf->dst_v4 = 0;
+		nf->dst_port = 0;
+		nf->pck_len = 0;
+		nf->is_eos = GF_TRUE;
+		return;
+	}
+	nf->pck_len -= 1+8+2;
+	//read flags
+	nf->pck_flags = gf_bs_read_u8(nf->cap_bs);
+	nf->pck_time = gf_bs_read_u64(nf->cap_bs);
+	//extensions
+	if (nf->pck_flags & NETCAP_HAS_EXT) {
+		u16 xlen = gf_bs_read_u16(nf->cap_bs);
+		gf_bs_skip_bytes(nf->cap_bs, xlen);
+		nf->pck_len -= 2 + xlen;
+	}
+
+	//init clock on first packet
+	if (!nf->init_time) {
+		nf->init_time = gf_sys_clock_high_res();
+		nf->init_time -= nf->pck_time;
+	}
+	nf->pck_time += nf->init_time;
+	if (nf->pck_flags & NETCAP_IS_IPV6) {
+		nf->dst_v4 = 0;
+		gf_bs_read_data(nf->cap_bs, nf->dst_v6, 16);
+		nf->pck_len -= 16;
+		if (nf->pck_flags & NETCAP_HAS_PEER) {
+			gf_bs_read_data(nf->cap_bs, nf->src_v6, 16);
+			nf->pck_len -= 16;
+		}
+	} else {
+		nf->dst_v4 = gf_bs_read_u32(nf->cap_bs);
+		nf->pck_len -= 4;
+		if (nf->pck_flags & NETCAP_HAS_PEER) {
+			nf->src_v4 = gf_bs_read_u32(nf->cap_bs);
+			nf->pck_len -= 4;
+		}
+	}
+	nf->dst_port = gf_bs_read_u16(nf->cap_bs);
+	if (nf->pck_flags & NETCAP_HAS_PEER) {
+		nf->src_port = gf_bs_read_u16(nf->cap_bs);
+		nf->pck_len -= 2;
+	} else {
+		nf->src_port = 0;
+	}
+
+	//broken packet
+	if (nf->pck_len <0) {
+		nf->dst_v4 = 0;
+		nf->dst_port = 0;
+		nf->pck_len = 0;
+		nf->is_eos = GF_TRUE;
+	}
+}
+
+static GF_Err pcapng_load_shb(GF_NetcapFilter *nf, Bool is_init)
+{
+	u32 blen = gf_bs_read_u32(nf->cap_bs);
+	u32 le_magic = gf_bs_read_u32(nf->cap_bs);
+	if (le_magic == GF_4CC(0x1A, 0x2B, 0x3C, 0x4D)) {
+	} else if (le_magic == GF_4CC(0x4D, 0x3C, 0x2B, 0x1A)) {
+		nf->pcap_le = GF_TRUE;
+		blen = ntohl(blen);
+	} else {
+		if (is_init)
+			gf_net_close_capture();
+		else
+			nf->is_eos = GF_TRUE;
+		GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("NetCap Corrrupted pacpng file\n"));
+		return GF_NON_COMPLIANT_BITSTREAM;
+	}
+	gf_bs_skip_bytes(nf->cap_bs, blen-12);
+	nf->pcap_num_interfaces = 0;
+	return GF_OK;
+}
+
+static void pcapng_load_idb(GF_NetcapFilter *nf)
+{
+	if (nf->pcap_num_interfaces>=20) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("NetCap Maximum 20 concurrent interfaces supported in pacpng, skipping packets\n"));
+		return;
+	}
+	u32 blen = nf->pcap_le ? gf_bs_read_u32_le(nf->cap_bs) : gf_bs_read_u32(nf->cap_bs);
+	nf->link_typesnf->pcap_num_interfaces = nf->pcap_le ? gf_bs_read_u16_le(nf->cap_bs) : gf_bs_read_u16(nf->cap_bs);
+	gf_bs_skip_bytes(nf->cap_bs, blen-10);
+
+	if (nf->link_typesnf->pcap_num_interfaces>1) {
+		GF_LOG(GF_LOG_WARNING, GF_LOG_NETWORK, ("NetCap Only ethernet and BSD-loopback pcap files are supported, skipping packets\n"));
+	}
+	nf->pcap_num_interfaces++;
+}
+
+#define SKIP_PCAP_PCK \
+	if (clen<0) {\
+		GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("NetCap Corrupted PCAP file, aborting\n"));\
+		nf->is_eos = GF_TRUE;\
+		return;\
+	}\
+	gf_bs_skip_bytes(nf->cap_bs, clen);\
+	clen=0;\
+	goto refetch_pcap;
+
+
+static void gf_netcap_load_pck_pcap(GF_NetcapFilter *nf)
+{
+	u32 s, frac;
+	s32 clen=0, bsize=0;
+
+refetch_pcap:
+	nf->dst_port = 0;
+	nf->pck_len = 0;
+	if (nf->pcapng_trail) {
+		gf_bs_skip_bytes(nf->cap_bs, nf->pcapng_trail);
+		nf->pcapng_trail = 0;
+	} else if (nf->pcap_trail) {
+		gf_bs_skip_bytes(nf->cap_bs, nf->pcapng_trail);
+		nf->pcap_trail = 0;
+	}
+
+	if (gf_bs_available(nf->cap_bs)<16) {
+		nf->is_eos = GF_TRUE;
+		return;
+	}
+
+	u32 link_type;
+	if (nf->cap_mode==NETCAP_PCAPNG) {
+
+		u32 btype = nf->pcap_le ? gf_bs_read_u32_le(nf->cap_bs) : gf_bs_read_u32(nf->cap_bs);
+		if (btype==GF_4CC(0x0A, 0x0D, 0x0D, 0x0A)) {
+			GF_Err e = pcapng_load_shb(nf, GF_FALSE);
+			//if failure, nf is destroyed by gf_net_close_capture
+			if (e) {
+				return;
+			}
+			goto refetch_pcap;
+		} else if (btype==0x00000001) {
+			pcapng_load_idb(nf);
+			goto refetch_pcap;
+		}
+
+		bsize = nf->pcap_le ? gf_bs_read_u32_le(nf->cap_bs) : gf_bs_read_u32(nf->cap_bs);
+		if (btype!=0x00000006) {
+			gf_bs_skip_bytes(nf->cap_bs, bsize-8);
+			nf->pcapng_trail = 0;
+			goto refetch_pcap;
+		}
+		u32 ifce_idx = nf->pcap_le ? gf_bs_read_u32_le(nf->cap_bs) : gf_bs_read_u32(nf->cap_bs);
+		if (ifce_idx<nf->pcap_num_interfaces)
+			link_type = nf->link_types0;
+		else
+			link_type = 0xFF;
+	} else {
+		link_type = nf->link_types0;
+	}
+
+	if (nf->pcap_le) {
+		s = gf_bs_read_u32_le(nf->cap_bs);
+		frac = gf_bs_read_u32_le(nf->cap_bs);
+		clen = gf_bs_read_u32_le(nf->cap_bs);
+		/*olen = */gf_bs_read_u32_le(nf->cap_bs);
+	} else {
+		s = gf_bs_read_u32(nf->cap_bs);
+		frac = gf_bs_read_u32(nf->cap_bs);
+		clen = gf_bs_read_u32(nf->cap_bs);
+		/*olen = */gf_bs_read_u32(nf->cap_bs);
+	}
+	if (clen<0) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("NetCap Corrupted PCAP file, aborting\n"));
+		nf->is_eos = GF_TRUE;
+		return;
+	}
+
+	if (nf->cap_mode==NETCAP_PCAPNG) {
+		nf->pcapng_trail = bsize - 28 - clen;
+	}
+
+	Bool ip_v6=GF_FALSE;
+	if (link_type==0) {
+		u32 type = nf->pcap_le ? gf_bs_read_u32_le(nf->cap_bs) : gf_bs_read_u32(nf->cap_bs);
+		clen-=4;
+		if (type==2) {
+		} else if ((type==24) || (type==28) || (type==30)) {
+			ip_v6=GF_TRUE;
+		} else {
+			SKIP_PCAP_PCK
+		}
+	}
+	//Ethernet
+	else if (link_type==1) {
+		gf_bs_skip_bytes(nf->cap_bs, 12);
+		u32 etype = gf_bs_read_u16(nf->cap_bs);
+		clen-=14;
+		if (etype==0x0800) {
+		} else if (etype==0x86DD) {
+			ip_v6=GF_TRUE;
+		} else {
+			SKIP_PCAP_PCK
+		}
+	}
+	//not supported
+	else {
+		gf_bs_skip_bytes(nf->cap_bs, clen);
+		goto refetch_pcap;
+	}
+
+	u8 protocol_type=0;
+	if (ip_v6) {
+		gf_bs_skip_bytes(nf->cap_bs, 4);
+		/*pay_len = */gf_bs_read_u16(nf->cap_bs);
+		u32 next_hdr = gf_bs_read_u8(nf->cap_bs);
+		gf_bs_read_u8(nf->cap_bs);
+		gf_bs_read_data(nf->cap_bs, nf->src_v6, 16);
+		gf_bs_read_data(nf->cap_bs, nf->dst_v6, 16);
+		clen -= 40;
+		Bool has_hdr = 1;
+		while (has_hdr) {
+			u32 hdr_size;
+			switch (next_hdr) {
+			case 0:
+			case 60:
+			case 43:
+			case 44:
+			case 50:
+			case 51:
+			case 135:
+			case 139:
+			case 140:
+				next_hdr = gf_bs_read_u8(nf->cap_bs);
+				hdr_size = gf_bs_read_u8(nf->cap_bs);
+				gf_bs_skip_bytes(nf->cap_bs, 2 + 8*hdr_size);
+				hdr_size = 8*(hdr_size+1);
+				clen -= hdr_size;
+				break;
+			case 6:
+			case 17:
+				protocol_type=next_hdr;
+				has_hdr=0;
+				break;
+			default:
+				SKIP_PCAP_PCK
+			}
+			if (gf_bs_is_overflow(nf->cap_bs)) {
+				break;
+			}
+		}
+	} else {
+		gf_bs_skip_bytes(nf->cap_bs, 9);
+		protocol_type = gf_bs_read_u8(nf->cap_bs);
+		gf_bs_skip_bytes(nf->cap_bs, 2);
+		nf->src_v4 = gf_bs_read_u32_le(nf->cap_bs);
+		nf->dst_v4 = gf_bs_read_u32_le(nf->cap_bs);
+		clen-=20;
+	}
+	//UDP
+	if (protocol_type==17) {
+		nf->src_port = gf_bs_read_u16(nf->cap_bs);
+		nf->dst_port = gf_bs_read_u16(nf->cap_bs);
+		gf_bs_skip_bytes(nf->cap_bs, 4);
+		clen-=8;
+	}
+	//TCP
+	else if (protocol_type==6) {
+		nf->src_port = gf_bs_read_u16(nf->cap_bs);
+		nf->dst_port = gf_bs_read_u16(nf->cap_bs);
+		/*sn = */gf_bs_read_u32(nf->cap_bs);
+		/*ack = */gf_bs_read_u32(nf->cap_bs);
+		u32 data_offset = gf_bs_read_int(nf->cap_bs, 4);
+		gf_bs_read_int(nf->cap_bs, 4);
+		gf_bs_skip_bytes(nf->cap_bs, 7);
+		if (data_offset>5)
+			gf_bs_skip_bytes(nf->cap_bs, (data_offset-5)*4);
+		clen -= data_offset*4;
+	} else {
+		//no support
+		SKIP_PCAP_PCK
+	}
+
+	if ((clen<0)|| gf_bs_is_overflow(nf->cap_bs)) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("NetCap Corrupted PCAP file, aborting\n"));
+		nf->is_eos = GF_TRUE;
+		return;
+	}
+	//for pcap, skip ethernet CRC
+	if ((nf->cap_mode==NETCAP_PCAP) && (link_type==1))
+		nf->pcap_trail = 4;
+
+	if (nf->cap_mode==NETCAP_PCAP) {
+		nf->pck_time = s;
+		nf->pck_time *= 1000000;
+		if (nf->pcap_nano)
+			nf->pck_time+=frac/1000;
+		else
+			nf->pck_time+=frac;
+	} else {
+		nf->pck_time = s;
+		nf->pck_time <<= 32;
+		nf->pck_time |= frac;
+		//in microsec since UTC epoch
+	}
+	if (!nf->init_time) {
+		nf->init_time = gf_sys_clock_high_res();
+		nf->init_time -= nf->pck_time;
+	}
+	nf->pck_time += nf->init_time;
+	nf->pck_len = clen;
+	if (!clen) goto refetch_pcap;
+}
+
+static GF_Err gf_netcap_playback(GF_NetcapFilter *nf);
+
+GF_Err gf_netcap_setup(char *rules)
+{
+	char *id=NULL;
+	char *src=NULL;
+	char *dst=NULL;
+	s32 cap_loop=0;
+	Bool cap_rt=GF_TRUE;
+	char *rsep = strchr(rules, '');
+	if (rsep) rsep0 = 0;
+	//extract src or dst, nrt flag and loop flag
+	while (rules) {
+		char *sep = strchr(rules, ',');
+		if (sep) sep0 = 0;
+		if (!strncmp(rules, "id=", 3)) {
+			id = gf_strdup(rules+3);
+		} else if (!strncmp(rules, "src=", 4)) {
+			src = gf_strdup(rules+4);
+		} else if (!strncmp(rules, "dst=", 4)) {
+			dst = gf_strdup(rules+4);
+		} else if (!strcmp(rules, "loop")) {
+			cap_loop = -1;
+		} else if (!strncmp(rules, "loop=", 5)) {
+			cap_loop = atoi(rules+5);
+		} else if (!strcmp(rules, "nrt")) {
+			cap_rt = GF_FALSE;
+		}
+		if (!sep) {
+			rules=NULL;
+			break;
+		}
+		sep0 = ',';
+		rules = sep+1;
+		if (rules0=='') break;
+	}
+	if (rsep) {
+		rsep0 = '';
+		rules = rsep;
+	}
+	if (!dst && !src && !rules) {
+		if (id) gf_free(id);
+		GF_LOG(GF_LOG_WARNING, GF_LOG_NETWORK, ("NetCap Invalid netcap rule, ignoring\n"));
+		return GF_OK;
+	}
+	if (dst && src) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("NetCap Invalid netcap, src and dst cannot be set at the same time\n"));
+		if (id) gf_free(id);
+		gf_free(src);
+		gf_free(dst);
+		return GF_BAD_PARAM;
+	}
+
+	GF_NetcapFilter *nf = gf_net_filter_get(id);
+	if (nf) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("NetCap Several netcap filters with same IDs are not supported, ignoring\n"));
+		if (id) gf_free(id);
+		if (src) gf_free(src);
+		if (dst) gf_free(dst);
+		return GF_BAD_PARAM;
+	}
+
+	GF_SAFEALLOC(nf, GF_NetcapFilter);
+	if (!nf) {
+		if (id) gf_free(id);
+		if (src) gf_free(src);
+		if (dst) gf_free(dst);
+		return GF_OUT_OF_MEM;
+	}
+	nf->id = id;
+	nf->src = src;
+	nf->dst = dst;
+	nf->loops = cap_loop;
+	nf->rt = cap_rt;
+	nf->rules = gf_list_new();
+	if (!nf->rules) {
+		if (id) gf_free(id);
+		if (src) gf_free(src);
+		if (dst) gf_free(dst);
+		gf_free(nf);
+		return GF_OUT_OF_MEM;
+	}
+	if (!netcap_filters) netcap_filters = gf_list_new();
+	gf_list_add(netcap_filters, nf);
+
+#ifdef GPAC_HAS_FD
+	nf->fd = -1;
+#endif
+
+	while (rules) {
+		u32 send_recv = 1; //default reception only
+		u32 port=0;
+		u32 num_pck=1;
+		u32 pck_start=0;
+		u32 pck_end=0;
+		s32 patch_offset=-1;
+		s32 patch_val=-1;
+		s32 rand_every = 0;
+		char *rule_str;
+		char *sep = strchr(rules, '');
+		if (!sep) break;
+		sep = strchr(sep+1, '');
+		if (!sep) break;
+
+		sep0 = 0;
+		rule_str = rules+1;
+		while (rule_str1=='=') {
+			char *sep2 = strchr(rule_str+2, ',');
+			if (sep2) sep20=0;
+
+			switch (rule_str0) {
+			case 'm':
+				if (!strcmp(rule_str+2, "r")) send_recv = 1;
+				else if (!strcmp(rule_str+2, "w")) send_recv = 2;
+				else if (!strcmp(rule_str+2, "rw") || !strcmp(rule_str+2, "wr")) send_recv = 0;
+				else {
+					GF_LOG(GF_LOG_WARNING, GF_LOG_NETWORK, ("NetCap Unknown mode %s, using read/write\n", rule_str+2));
+					send_recv=0;
+				}
+				break;
+			case 'p':
+				port = atoi(rule_str+2);
+				break;
+			case 's':
+				pck_start = atoi(rule_str+2);
+				break;
+			case 'e':
+				pck_end = atoi(rule_str+2);
+				break;
+			case 'n':
+				num_pck = atoi(rule_str+2);
+				break;
+			case 'r':
+				rand_every = atoi(rule_str+2);
+				if (rand_every<0) rand_every = -rand_every;
+				break;
+			case 'f':
+				rand_every = atoi(rule_str+2);
+				if (rand_every>0) rand_every = -rand_every;
+				break;
+			case 'o':
+				patch_offset = atoi(rule_str+2);
+				break;
+			case 'v':
+				if (strchr(rule_str, '-')) patch_val =-1;
+				else patch_val = strtol(rule_str+2, NULL, 16);
+				break;
+			default:
+				GF_LOG(GF_LOG_WARNING, GF_LOG_NETWORK, ("NetCap Unknown directive %c, ignoring\n", rule_str0));
+			}
+
+			if (!sep2) break;
+			sep20 = ',';
+			rule_str = sep2+1;
+		}
+
+		NetFilterRule *rule;
+		GF_SAFEALLOC(rule, NetFilterRule);
+		rule->send_recv = send_recv;
+		rule->port = port;
+		rule->patch_offset = patch_offset;
+		rule->patch_val = patch_val;
+		rule->pck_start = pck_start;
+		rule->pck_end = pck_end>pck_start ? pck_end : 0;
+		rule->rand_every = rand_every;
+		rule->nb_pck = num_pck;
+
+		gf_list_add(nf->rules, rule);
+		sep0 = '';
+		rules = sep+1;
+	}
+	nf->nb_rules = gf_list_count(nf->rules);
+
+	if (nf->dst) {
+		GF_Err e = gf_netcap_record(nf);
+		if (e) return e;
+	}
+	if (nf->src) {
+		GF_Err e = gf_netcap_playback(nf);
+		if (e) return e;
+	}
+	return GF_OK;
+}
+
+static Bool netcap_filter_pck(GF_Socket *sock, u32 pck_len, Bool for_send)
+{
+	u32 i=0;
+	if (!sock || !sock->cap_info) return GF_FALSE;
+	GF_NetcapFilter *nf = sock->cap_info->nf;
+
+	if (for_send) {
+		nf->pck_idx_w++;
+		sock->cap_info->pck_idx_w++;
+	} else {
+		nf->pck_idx_r++;
+		sock->cap_info->pck_idx_r++;
+	}
+
+	for (i=0; i<nf->nb_rules; i++) {
+		NetFilterRule *r = gf_list_get(nf->rules, i);
+		if (r->port && (r->port != nf->dst_port)) continue;
+		if (for_send) {
+			if (r->send_recv==1) continue;
+		} else {
+			if (r->send_recv==2) continue;
+		}
+		NetCapInfo *ci = r->port ? sock->cap_info : NULL;
+		u32 cur_pck;
+		if (ci) {
+			cur_pck = for_send ? ci->pck_idx_w : ci->pck_idx_r;
+		} else {
+			cur_pck = for_send ? nf->pck_idx_w : nf->pck_idx_r;
+		}
+		//check range
+		if (r->pck_start && (cur_pck < r->pck_start)) continue;
+		if (r->pck_end && (cur_pck >= r->pck_end)) continue;
+
+		//not repeated pattern case
+		if (!r->rand_every) {
+			if ((cur_pck >= r->pck_start) && (r->pck_start + r->nb_pck > cur_pck)) {}
+			else continue;
+		}
+		//repeated pattern case
+		else {
+			u32 next_pck_range = ci ? ci->next_pck_range : nf->next_pck_range;
+			u32 next_rand = ci ? ci->next_rand : nf->next_rand;
+			//in range, check if we need to recompute
+			if (next_pck_range < r->pck_start)
+				next_pck_range = r->pck_start;
+
+			if (next_pck_range <= cur_pck) {
+				if (r->rand_every>0) {
+					next_rand = next_pck_range + gf_rand() % r->rand_every;
+					next_pck_range += r->rand_every;
+				} else {
+					next_rand = next_pck_range;
+					next_pck_range += -r->rand_every;
+				}
+
+				if (ci) {
+					ci->next_pck_range = next_pck_range;
+					ci->next_rand = next_rand;
+				} else {
+					nf->next_pck_range = next_pck_range;
+					nf->next_rand = next_rand;
+				}
+			}
+
+			//ours
+			if (r->nb_pck) {
+				if ((next_rand<=cur_pck) && (next_rand+r->nb_pck>cur_pck)) {}
+				else continue;
+			} else {
+				if (next_rand==cur_pck) {}
+				else continue;
+			}
+		}
+
+		if ((r->patch_offset==-1) && !(sock->flags & GF_SOCK_IS_TCP)) {
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_NETWORK, ("NetCap Droping packet %d\n", cur_pck));
+			return GF_TRUE;
+		}
+		u32 bo = (r->patch_offset>=0) ? r->patch_offset : gf_rand();
+		bo = bo % pck_len;
+		sock->cap_info->patch_offset = 1+bo;
+
+		u32 val = (r->patch_val>=0) ? r->patch_val : gf_rand();
+		val = val % 256;
+
+		sock->cap_info->patch_val = val;
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_NETWORK, ("NetCap Patching packet %d byte offset %d to 0x%02X\n", cur_pck, bo, val));
+		// we want to patch many bytes of same packet
+		// return GF_FALSE;
+	}
+	return GF_FALSE;
+}
+
+static void gf_netcap_load_pck(GF_NetcapFilter *nf, u64 now)
+{
+
+refetch:
+	//no packet loaded
+	if (!nf->dst_port) {
+		nf->pck_flags=0;
+		nf->read_sock_selected = NULL;
+
+		if (nf->loops && !gf_bs_available(nf->cap_bs)) {
+			if (nf->loops>0)
+				nf->loops--;
+
+			gf_bs_seek(nf->cap_bs, 0);
+			nf->init_time = 0;
+			if (nf->cap_mode==NETCAP_PCAP)
+				gf_bs_skip_bytes(nf->cap_bs, 24);
+		}
+
+		if (nf->cap_mode==NETCAP_GPAC)
+			gf_netcap_load_pck_gpac(nf);
+		else
+			gf_netcap_load_pck_pcap(nf);
+
+		//eof
+		if (!nf->dst_port) return;
+		//force discard
+		if ((nf->pck_flags & NETCAP_DROP)) {
+			gf_bs_skip_bytes(nf->cap_bs, nf->pck_len);
+			nf->dst_port = 0;
+			goto refetch;
+		}
+	}
+
+	if (nf->rt && now && (nf->pck_time > now)) {
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_NETWORK, ("NetCap Packet too early by %d ms\n", (u32) (nf->pck_time - now) / 1000));
+		return;
+	}
+
+	//we already have the socket
+	if (nf->read_sock_selected)
+		return;
+
+	//find destination socket
+	u32 i=0;
+	GF_Socket *s = NULL;
+	while ((s=gf_list_enum(nf->read_socks, &i))) {
+		if (s->cap_info->host_port != nf->dst_port)
+			continue;
+		if (nf->pck_flags & NETCAP_IS_IPV6) {
+			if (memcmp(s->cap_info->host_addr_v6, nf->dst_v6, 16)) continue;
+		} else {
+			//accept INADDR_ANY
+			if (s->cap_info->host_addr_v4 && (s->cap_info->host_addr_v4 != nf->dst_v4)) continue;
+			if (s->flags & GF_SOCK_IS_TCP) {
+				if (s->cap_info->peer_addr_v4 != nf->src_v4) continue;
+				if (!s->cap_info->peer_port) {
+					s->cap_info->peer_port = nf->src_port;
+				} else if (s->cap_info->peer_port != nf->src_port) {
+					continue;
+				}
+			}
+		}
+		nf->read_sock_selected = s;
+		s->cap_info->patch_offset = 0;
+		break;
+	}
+	if (netcap_filter_pck(nf->read_sock_selected, nf->pck_len, GF_FALSE))
+		nf->read_sock_selected = NULL;
+
+	if (!nf->read_sock_selected) {
+		gf_bs_skip_bytes(nf->cap_bs, nf->pck_len);
+		nf->dst_port = 0;
+		goto refetch;
+	}
+}
+
+static GF_Err gf_netcap_playback(GF_NetcapFilter *nf)
+{
+#ifdef GPAC_HAS_FD
+	if (!gf_opts_get_bool("core", "no-fd")) {
+		nf->fd = open(nf->src, O_RDONLY);
+		if (nf->fd>=0) nf->cap_bs = gf_bs_from_fd(nf->fd, GF_BITSTREAM_READ);
+	} else
+#endif
+	{
+		nf->file = gf_fopen_ex(nf->src, NULL, "rb", GF_FALSE);
+		if (nf->file) nf->cap_bs = gf_bs_from_file(nf->file, GF_BITSTREAM_READ);
+	}
+	if (!nf->cap_bs) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("NetCap Failed to setup capture playback\n"));
+		return GF_IO_ERR;
+	}
+	nf->read_socks = gf_list_new();
+
+	u32 magic = gf_bs_read_u32(nf->cap_bs);
+	if (magic == GF_GPC_MAGIC) {
+		nf->cap_mode = NETCAP_GPAC;
+	} else if (magic==GF_4CC(0xD4, 0xC3, 0xB2, 0xA1)) {
+		nf->cap_mode = NETCAP_PCAP;
+		nf->pcap_le = GF_TRUE;
+	} else if (magic==GF_4CC(0xA1, 0xB2, 0xC3, 0xD4)) {
+		nf->cap_mode = NETCAP_PCAP;
+	} else if (magic==GF_4CC(0x4D, 0x3C, 0xB2, 0xA1)) {
+		nf->cap_mode = NETCAP_PCAP;
+		nf->pcap_nano = GF_TRUE;
+		nf->pcap_le = GF_TRUE;
+	} else if (magic==GF_4CC(0xA1, 0xB2, 0x3C, 0x4D)) {
+		nf->cap_mode = NETCAP_PCAP;
+		nf->pcap_nano = GF_TRUE;
+	} else if (magic==GF_4CC(0x0A, 0x0D, 0x0D, 0x0A)) {
+		nf->cap_mode = NETCAP_PCAPNG;
+		nf->pcap_nano = GF_TRUE;
+	} else {
+		gf_net_close_capture();
+		GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("NetCap Unsupported capture file magic %s\n", gf_4cc_to_str(magic)));
+		return GF_NOT_SUPPORTED;
+	}
+	if (nf->cap_mode==NETCAP_GPAC) {
+		/*ntp_sec = */gf_bs_read_u32(nf->cap_bs);
+		/*ntp_frac = */gf_bs_read_u32(nf->cap_bs);
+		magic = gf_bs_read_u32(nf->cap_bs);
+		gf_bs_skip_bytes(nf->cap_bs, magic);
+		return GF_OK;
+	}
+
+	if (nf->cap_mode==NETCAP_PCAP) {
+		gf_bs_skip_bytes(nf->cap_bs, 16); //we ignore snapLen
+		gf_bs_read_int(nf->cap_bs, 4);
+		nf->link_types0 = gf_bs_read_int(nf->cap_bs, 28);
+		if (nf->pcap_le) nf->link_types0 = ntohl(nf->link_types0);
+
+		if (nf->link_types0 > 1) {
+			gf_net_close_capture();
+			GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("NetCap Only ethernet and BSD-loopback pcap files are supported\n"));
+			return GF_NOT_SUPPORTED;
+		}
+	}
+	//pcapng
+	else if (nf->cap_mode==NETCAP_PCAPNG) {
+		GF_Err e = pcapng_load_shb(nf, GF_TRUE);
+		if (e) return e;
+
+		u32 btype = nf->pcap_le ? gf_bs_read_u32_le(nf->cap_bs) : gf_bs_read_u32(nf->cap_bs);
+		if (btype != 1) {
+			gf_net_close_capture();
+			GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("NetCap Missing IDB block after pacpng header\n"));
+			return GF_NON_COMPLIANT_BITSTREAM;
+		}
+		pcapng_load_idb(nf);
+	}
+	return GF_OK;
+}
+
+static GF_Err gf_netcap_send_pcap(GF_NetcapFilter *nf, GF_Socket *sock, const u8 *buffer, u32 length, u32 *written, Bool is_ng)
+{
+	u32 sec, frac, pck_len, ng_size=0, ng_trail=0;
+	if (!sock->cap_info->host_port) return GF_BAD_PARAM;
+
+	pck_len = length;
+	pck_len += 4;
+	if (sock->flags & GF_SOCK_IS_IPV6) {
+		pck_len += 40;
+	} else {
+		pck_len += 20;
+	}
+	if (sock->flags & GF_SOCK_IS_TCP) {
+		pck_len += 20;
+	} else {
+		pck_len += 8;
+	}
+
+	if (is_ng) {
+		ng_size = pck_len/4;
+		ng_trail = pck_len%4;
+		if (ng_trail) {
+			ng_size++;
+			ng_trail = 4-ng_trail;
+		}
+		ng_size += 5;
+		ng_size *= 4;
+		ng_size+=12;
+
+		gf_bs_write_u32(nf->cap_bs, 6);
+		gf_bs_write_u32(nf->cap_bs, ng_size);
+		gf_bs_write_u32(nf->cap_bs, 0);
+	}
+
+	gf_net_get_ntp(&sec, &frac);
+	gf_bs_write_u32(nf->cap_bs, sec);
+	gf_bs_write_u32(nf->cap_bs, (u32) gf_timestamp_rescale(frac, 0xFFFFFFFF, 1000000));
+	gf_bs_write_u32(nf->cap_bs, pck_len);
+	gf_bs_write_u32(nf->cap_bs, pck_len);
+
+	gf_bs_write_u32(nf->cap_bs, (sock->flags & GF_SOCK_IS_IPV6) ? 24 : 2);
+	pck_len-=4;
+
+	u8 protocol_type = (sock->flags & GF_SOCK_IS_TCP) ? 6 : 17;
+	if (sock->flags & GF_SOCK_IS_IPV6) {
+		gf_bs_write_int(nf->cap_bs, 6, 4);
+		gf_bs_write_int(nf->cap_bs, 0, 4);
+		gf_bs_write_u24(nf->cap_bs, 0);
+		gf_bs_write_u16(nf->cap_bs, pck_len);
+		gf_bs_write_u8(nf->cap_bs, protocol_type);
+		gf_bs_write_u8(nf->cap_bs, 10);
+		gf_bs_write_data(nf->cap_bs, sock->cap_info->host_addr_v6, 16);
+		gf_bs_write_data(nf->cap_bs, sock->cap_info->peer_addr_v6, 16);
+	} else {
+		u32 chk_sum = 0x4500;
+		gf_bs_write_int(nf->cap_bs, 4, 4);
+		gf_bs_write_int(nf->cap_bs, 5, 4);
+		gf_bs_write_u8(nf->cap_bs, 0);
+		chk_sum += pck_len;
+		gf_bs_write_u16(nf->cap_bs, pck_len);
+		gf_bs_skip_bytes(nf->cap_bs, 4);
+		gf_bs_write_u8(nf->cap_bs, 10);
+		gf_bs_write_u8(nf->cap_bs, protocol_type);
+		chk_sum += (0x0a00 | protocol_type);
+
+		chk_sum += ((sock->cap_info->host_addr_v4&0xFF)<<8) | ((sock->cap_info->host_addr_v4>>8)&0xFF);
+		chk_sum += (((sock->cap_info->host_addr_v4>>16)&0xFF)<<8) | ((sock->cap_info->host_addr_v4>>24)&0xFF);
+		chk_sum += ((sock->cap_info->peer_addr_v4&0xFF)<<8) | ((sock->cap_info->peer_addr_v4>>8)&0xFF);
+		chk_sum += (((sock->cap_info->peer_addr_v4>>16)&0xFF)<<8) | ((sock->cap_info->peer_addr_v4>>24)&0xFF);
+		if (chk_sum>0xFFFF) {
+			u32 high = chk_sum>0xFFFF;
+			chk_sum += high;
+		}
+		gf_bs_write_u16(nf->cap_bs, ~chk_sum);
+		gf_bs_write_u32_le(nf->cap_bs, sock->cap_info->host_addr_v4);
+		gf_bs_write_u32_le(nf->cap_bs, sock->cap_info->peer_addr_v4);
+	}
+	//UDP
+	if (protocol_type==17) {
+		gf_bs_write_u16(nf->cap_bs, sock->cap_info->host_port);
+		gf_bs_write_u16_le(nf->cap_bs, sock->cap_info->peer_port);
+		gf_bs_write_u16(nf->cap_bs, 8+length);
+		//skip checksum
+		gf_bs_skip_bytes(nf->cap_bs, 2);
+	}
+	//TCP
+	else if (protocol_type==6) {
+		gf_bs_write_u16_le(nf->cap_bs, sock->cap_info->host_port);
+		gf_bs_write_u16_le(nf->cap_bs, sock->cap_info->peer_port);
+		/*sn = */gf_bs_write_u32(nf->cap_bs, 0);
+		/*ack = */gf_bs_write_u32(nf->cap_bs, 0);
+		gf_bs_write_int(nf->cap_bs, 5, 4);
+		gf_bs_write_int(nf->cap_bs, 0, 4);
+		gf_bs_skip_bytes(nf->cap_bs, 7);
+	}
+
+	gf_bs_write_data(nf->cap_bs, buffer, length);
+	if (is_ng) {
+		if (ng_trail) gf_bs_skip_bytes(nf->cap_bs, ng_trail);
+		gf_bs_write_u32(nf->cap_bs, ng_size);
+	}
+	if (written) *written = length;
+	return GF_OK;
+}
+
+
+static GF_Err gf_netcap_send_gpac(GF_NetcapFilter *nf, GF_Socket *sock, const u8 *buffer, u32 length, u32 *written)
+{
+	u64 now = gf_sys_clock_high_res();
+	if (!sock->cap_info->host_port) return GF_BAD_PARAM;
+	if (!nf->init_time) nf->init_time = now;
+	now -= nf->init_time;
+
+	//setup flags and size flags
+	u32 size = 1+8+2+length;
+	u8 flags=0;
+	if (sock->flags & GF_SOCK_IS_MULTICAST) flags |= NETCAP_IS_MCAST;
+	if (sock->flags & GF_SOCK_IS_TCP) flags |= NETCAP_IS_TCP;
+	if (sock->flags & GF_SOCK_HAS_PEER) flags |= NETCAP_HAS_PEER;
+	if (sock->flags & GF_SOCK_IS_IPV6) {
+		size += 16;
+		if (sock->flags & GF_SOCK_HAS_PEER) {
+			size += 18;
+		}
+		flags |= NETCAP_IS_IPV6;
+	} else {
+		size += 4;
+		if (sock->flags & GF_SOCK_HAS_PEER) {
+			size += 6;
+		}
+	}
+	gf_bs_write_u32(nf->cap_bs, size);
+	gf_bs_write_u8(nf->cap_bs, flags);
+	gf_bs_write_u64(nf->cap_bs, now);
+	if (sock->flags & GF_SOCK_IS_IPV6) {
+		gf_bs_write_data(nf->cap_bs, sock->cap_info->host_addr_v6, 16);
+		if (sock->flags & GF_SOCK_HAS_PEER)
+			gf_bs_write_data(nf->cap_bs, sock->cap_info->peer_addr_v6, 16);
+	} else {
+		gf_bs_write_u32(nf->cap_bs, sock->cap_info->host_addr_v4);
+		if (sock->flags & GF_SOCK_HAS_PEER)
+			gf_bs_write_u32(nf->cap_bs, sock->cap_info->peer_addr_v4);
+	}
+	gf_bs_write_u16(nf->cap_bs, sock->cap_info->host_port);
+	if (sock->flags & GF_SOCK_HAS_PEER)
+		gf_bs_write_u16(nf->cap_bs, sock->cap_info->peer_port);
+	gf_bs_write_data(nf->cap_bs, buffer, length);
+	if (written) *written = length;
+	return GF_OK;
+}
+
+static GF_Err gf_netcap_send(GF_Socket *sock, const u8 *buffer, u32 length, u32 *written)
+{
+	GF_NetcapFilter *nf = sock->cap_info->nf;
+	if (nf->cap_mode==NETCAP_PCAP) {
+		return gf_netcap_send_pcap(nf, sock, buffer, length, written, GF_FALSE);
+	} else if (nf->cap_mode==NETCAP_PCAPNG) {
+		return gf_netcap_send_pcap(nf, sock, buffer, length, written, GF_TRUE);
+	} else {
+		return gf_netcap_send_gpac(nf, sock, buffer, length, written);
+	}
+}
+#endif //GPAC_DISABLE_NETCAP
+
 
 GF_EXPORT
-GF_Socket *gf_sk_new(u32 SocketType)
+GF_Socket *gf_sk_new_ex(u32 SocketType, const char *netcap_id)
 {
 	GF_Socket *tmp;
 
@@ -571,10 +1879,30 @@
 #ifdef WIN32
 	wsa_init ++;
 #endif
+
+#ifndef GPAC_DISABLE_NETCAP
+	GF_NetcapFilter *nf = gf_net_filter_get(netcap_id);
+	if (nf && (nf->cap_bs || nf->nb_rules)) {
+		GF_SAFEALLOC(tmp->cap_info, NetCapInfo);
+		if (!tmp->cap_info) {
+			gf_free(tmp);
+			return NULL;
+		}
+		if (nf->read_socks)
+			gf_list_add(nf->read_socks, tmp);
+		tmp->cap_info->nf = nf;
+	}
+#endif
 	return tmp;
 }
 
 GF_EXPORT
+GF_Socket *gf_sk_new(u32 SocketType)
+{
+	return gf_sk_new_ex(SocketType, NULL);
+}
+
+GF_EXPORT
 GF_Err gf_sk_set_buffer_size(GF_Socket *sock, Bool SendBuffer, u32 NewSize)
 {
 	u32 nsize=0, psize;
@@ -587,7 +1915,7 @@
 		res = setsockopt(sock->socket, SOL_SOCKET, SO_RCVBUF, (char *) &NewSize, sizeof(u32) );
 	}
 	if (res<0) {
-		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));
+		GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("Socket Couldn't set socket %s buffer size to %d: %s (%d)\n", SendBuffer ? "send" : "receive", NewSize, gf_errno_str(LASTSOCKERROR), LASTSOCKERROR));
 	} else {
 		GF_LOG(GF_LOG_DEBUG, GF_LOG_NETWORK, ("Socket Set socket %s buffer size to %d\n", SendBuffer ? "send" : "receive", NewSize));
 	}
@@ -636,9 +1964,23 @@
 
 #include <assert.h>
 
+#ifndef GPAC_DISABLE_NETCAP
+#define sock_close(_s) \
+	closesocket(_s->socket);\
+	_s->socket = NULL_SOCKET;\
+	if (_s->cap_info) _s->cap_info->host_port = 0; \
+
+#else
+
+#define sock_close(_s) \
+	closesocket(_s->socket);\
+	_s->socket = NULL_SOCKET;
+
+#endif
+
 static void gf_sk_free(GF_Socket *sock)
 {
-	assert( sock );
+	gf_assert( sock );
 	if (!sock->socket) return;
 
 	/*leave multicast*/
@@ -662,20 +2004,28 @@
 		setsockopt(sock->socket, IPPROTO_IP, IP_DROP_MEMBERSHIP, (char *) &mreq, sizeof(mreq));
 #endif
 	}
-	closesocket(sock->socket);
-	sock->socket = (SOCKET) 0L;
+
+	sock_close(sock);
 }
 
 
 GF_EXPORT
 void gf_sk_del(GF_Socket *sock)
 {
-	assert( sock );
+	gf_assert( sock );
 	gf_sk_free(sock);
 #ifdef WIN32
 	wsa_init --;
 	if (!wsa_init) WSACleanup();
 #endif
+
+#ifndef GPAC_DISABLE_NETCAP
+	if (sock->cap_info) {
+		if (sock->cap_info->nf->read_socks)
+			gf_list_del_item(sock->cap_info->nf->read_socks, sock);
+		gf_free(sock->cap_info);
+	}
+#endif
 	gf_free(sock);
 }
 
@@ -701,7 +2051,7 @@
 	sock->usec_wait = (usec_wait>=1000000) ? 500 : usec_wait;
 }
 
-#ifdef GPAC_STATIC_BUILD
+#ifdef GPAC_STATIC_BIN
 struct hostent *gf_gethostbyname(const char *PeerName)
 {
 	GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("Static GPAC build has no DNS support, cannot resolve host %s !\n", PeerName));
@@ -711,10 +2061,11 @@
 #define gf_gethostbyname gethostbyname
 #endif
 
+static u32 inet_addr_from_name(const char *local_interface);
 
 //connects a socket to a remote peer on a given port
 GF_EXPORT
-GF_Err gf_sk_connect(GF_Socket *sock, const char *PeerName, u16 PortNumber, const char *local_ip)
+GF_Err gf_sk_connect(GF_Socket *sock, const char *PeerName, u16 PortNumber, const char *ifce_ip_or_name)
 {
 	s32 ret;
 #ifdef GPAC_HAS_IPV6
@@ -733,7 +2084,8 @@
 				gf_sk_set_block_mode(sock, GF_TRUE);
 		}
 		server_add.sun_family = AF_UNIX;
-		strcpy(server_add.sun_path, PeerName);
+		strncpy(server_add.sun_path, PeerName, sizeof(server_add.sun_path)-1);
+		server_add.sun_pathsizeof(server_add.sun_path)-1=0;
 		if (connect(sock->socket, (struct sockaddr *)&server_add, sizeof(struct sockaddr_un)) < 0) {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("Socket Failed to connect unix domain socket to %s\n", PeerName));
 			return GF_IP_CONNECTION_FAILURE;
@@ -753,17 +2105,45 @@
 	GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("Sock_IPV6 Host %s found\n", PeerName));
 
 	lip = NULL;
-	if (local_ip) {
-		lip = gf_sk_get_ipv6_addr(local_ip, PortNumber, AF_UNSPEC, AI_PASSIVE, type);
-		if (!lip && local_ip) {
-			lip = gf_sk_get_ipv6_addr(NULL, PortNumber, AF_UNSPEC, AI_PASSIVE, type);
-			local_ip = NULL;
-		}
+	if (ifce_ip_or_name) {
+		lip = gf_sk_get_ifce_ipv6_addr(ifce_ip_or_name, PortNumber, AF_UNSPEC, AI_PASSIVE, type);
+		if (!lip) return GF_IP_CONNECTION_FAILURE;
 	}
 
 	/*for all interfaces*/
 	for (aip=res; aip!=NULL; aip=aip->ai_next) {
 		if (type != (u32) aip->ai_socktype) continue;
+
+
+#ifndef GPAC_DISABLE_NETCAP
+		if (sock->cap_info) {
+			sock->cap_info->host_port = PortNumber;
+			if (lip) {
+				if (lip->ai_family==PF_INET) {
+					sock->cap_info->host_addr_v4 = inet_addr_from_name(ifce_ip_or_name);
+				} else {
+					memcpy(sock->cap_info->host_addr_v6, (u8*) &((struct sockaddr_in6 *)lip->ai_addr)->sin6_addr, sizeof(bin128));
+				}
+			}
+			if (aip->ai_family==AF_INET) {
+				sock->cap_info->peer_addr_v4 = inet_addr_from_name(PeerName);
+				sock->cap_info->peer_addr_v4 = ((struct sockaddr_in *)aip->ai_addr)->sin_addr.s_addr;
+			} else {
+				memcpy(sock->cap_info->peer_addr_v6, (u8*) &((struct sockaddr_in6 *)aip->ai_addr)->sin6_addr, sizeof(bin128));
+			}
+			//play/record, don't create socket
+			if (sock->cap_info->nf->cap_mode) {
+				if (sock->cap_info->nf->read_socks==NULL) {
+					sock->cap_info->peer_port = first_tcp_port;
+					first_tcp_port++;
+				}
+				sock->flags |= GF_SOCK_HAS_PEER;
+				freeaddrinfo(res);
+				if (lip) freeaddrinfo(lip);
+				return GF_OK;
+			}
+		}
+#endif
 		if (!sock->socket) {
 			sock->socket = socket(aip->ai_family, aip->ai_socktype, aip->ai_protocol);
 			if (sock->socket == INVALID_SOCKET) {
@@ -781,8 +2161,7 @@
 			if (lip) {
 				ret = bind(sock->socket, lip->ai_addr, (int) lip->ai_addrlen);
 				if (ret == SOCKET_ERROR) {
-					closesocket(sock->socket);
-					sock->socket = NULL_SOCKET;
+					sock_close(sock);
 					continue;
 				}
 			}
@@ -829,9 +2208,8 @@
 						return GF_IP_NETWORK_EMPTY;
 					}
 				}
-				closesocket(sock->socket);
-				sock->socket = NULL_SOCKET;
-				GF_LOG(GF_LOG_WARNING, GF_LOG_NETWORK, ("Sock_IPV6 Failed to connect to host %s: %s (%d) - retrying\n", PeerName, gf_errno_str(err), err ));
+				sock_close(sock);
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_NETWORK, ("Sock_IPV6 Failed to connect to host %s: %s (%d) - retrying with next host address\n", PeerName, gf_errno_str(err), err ));
 				continue;
 			}
 conn_ok:
@@ -854,6 +2232,27 @@
 	return GF_IP_CONNECTION_FAILURE;
 
 #else
+
+#ifndef GPAC_DISABLE_NETCAP
+	if (sock->cap_info) {
+		sock->cap_info->host_port = PortNumber;
+		if (ifce_ip_or_name)
+			sock->cap_info->host_addr_v4 = inet_addr_from_name(ifce_ip_or_name);
+
+		sock->cap_info->peer_addr_v4 = inet_addr_from_name(PeerName);
+		if (sock->cap_info->nf->read_socks==NULL) {
+			sock->cap_info->peer_port = first_tcp_port;
+			first_tcp_port++;
+		}
+
+		//play/record, don't create socket
+		if (sock->cap_info->nf->cap_mode) {
+			sock->flags |= GF_SOCK_HAS_PEER;
+			return GF_OK;
+		}
+	}
+#endif
+
 	if (!sock->socket) {
 		sock->socket = socket(AF_INET, (sock->flags & GF_SOCK_IS_TCP) ? SOCK_STREAM : SOCK_DGRAM, 0);
 		if (sock->flags & GF_SOCK_NON_BLOCKING)
@@ -881,11 +2280,11 @@
 			}
 		}
 		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_list0, sizeof(u32));
+		memcpy(&sock->dest_addr.sin_addr, Host->h_addr_list0, sizeof(u8)*Host->h_length);
 	}
 
-	if (local_ip) {
-		GF_Err e = gf_sk_bind(sock, local_ip, PortNumber, PeerName, PortNumber, GF_SOCK_REUSE_PORT);
+	if (ifce_ip_or_name) {
+		GF_Err e = gf_sk_bind(sock, ifce_ip_or_name, PortNumber, PeerName, PortNumber, GF_SOCK_REUSE_PORT);
 		if (e) return e;
 	}
 	if (!(sock->flags & GF_SOCK_IS_TCP)) {
@@ -946,15 +2345,15 @@
 	}
 	sock->flags &= ~GF_SOCK_HAS_CONNECT;
 	GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("Sock_IPV4 Connected to %s:%d\n", PeerName, PortNumber));
+
 #endif
 	return GF_OK;
 }
 
-
 //binds the given socket to the specified port. If ReUse is true
 //this will enable reuse of ports on a single machine
 GF_EXPORT
-GF_Err gf_sk_bind(GF_Socket *sock, const char *local_ip, u16 port, const char *peer_name, u16 peer_port, u32 options)
+GF_Err gf_sk_bind(GF_Socket *sock, const char *ifce_ip_or_name, u16 port, const char *peer_name, u16 peer_port, u32 options)
 {
 #ifdef GPAC_HAS_IPV6
 	struct addrinfo *res, *aip;
@@ -970,8 +2369,8 @@
 	s32 optval;
 
 	if (!sock || sock->socket) return GF_BAD_PARAM;
-	if (local_ip && !strcmp(local_ip, "127.0.0.1"))
-		local_ip = NULL;
+	if (ifce_ip_or_name && !strcmp(ifce_ip_or_name, "127.0.0.1"))
+		ifce_ip_or_name = NULL;
 
 	if (sock->flags & GF_SOCK_IS_UN) {
 #ifdef GPAC_HAS_SOCK_UN
@@ -982,7 +2381,8 @@
 				gf_sk_set_block_mode(sock, GF_TRUE);
 		}
 		server_un.sun_family = AF_UNIX;
-		strcpy(server_un.sun_path, peer_name);
+		strncpy(server_un.sun_path, peer_name, sizeof(server_un.sun_path)-1);
+		server_un.sun_pathsizeof(server_un.sun_path)-1=0;
 		ret = bind(sock->socket, (struct sockaddr *) &server_un, (int) sizeof(struct sockaddr_un));
 		if (ret == SOCKET_ERROR) {
 			if (LASTSOCKERROR == EADDRINUSE) {
@@ -1000,10 +2400,8 @@
 
 
 #ifndef WIN32
-	if(!local_ip) {
-		if(!peer_name || !strcmp(peer_name,"localhost")) {
-			peer_name="127.0.0.1";
-		}
+	if (!ifce_ip_or_name && (!peer_name || !strcmp(peer_name,"localhost"))) {
+		peer_name="127.0.0.1";
 	}
 #endif
 
@@ -1028,17 +2426,8 @@
 		freeaddrinfo(res);
 	}
 
-	res = gf_sk_get_ipv6_addr(local_ip, port, af, AI_PASSIVE, type);
-	if (!res) {
-		if (local_ip) {
-			res = gf_sk_get_ipv6_addr(NULL, port, af, AI_PASSIVE, type);
-			local_ip = NULL;
-		}
-		if (!res) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("Socket Cannot get IPV6 host name for %s:%d\n", local_ip, port));
-			return GF_IP_ADDRESS_NOT_FOUND;
-		}
-	}
+	res = gf_sk_get_ifce_ipv6_addr(ifce_ip_or_name, port, af, AI_PASSIVE, type);
+	if (!res) return GF_IP_ADDRESS_NOT_FOUND;
 
 	/*for all interfaces*/
 	for (aip=res; aip!=NULL; aip=aip->ai_next) {
@@ -1046,6 +2435,35 @@
 
 		if (aip->ai_next && (aip->ai_next->ai_family==PF_INET) && !gf_net_is_ipv6(peer_name)) continue;
 
+#ifndef GPAC_DISABLE_NETCAP
+		if (sock->cap_info) {
+			sock->cap_info->host_port = port ? port : peer_port;
+			if (aip->ai_family==PF_INET) {
+				sock->cap_info->host_addr_v4 = inet_addr_from_name(peer_name ? peer_name : ifce_ip_or_name);
+			} else {
+				memcpy(sock->cap_info->host_addr_v6, (u8*) &((struct sockaddr_in6 *)aip->ai_addr)->sin6_addr, sizeof(bin128));
+			}
+			if (peer_name && peer_port) {
+				if (sock->dest_addr.ss_family==AF_INET) {
+					struct sockaddr_in *r_add = (struct sockaddr_in *) &sock->dest_addr;
+					sock->cap_info->peer_port = r_add->sin_port;
+					sock->cap_info->peer_addr_v4 = r_add->sin_addr.s_addr;
+				} else {
+					struct sockaddr_in6 *r_add = (struct sockaddr_in6 *) &sock->dest_addr;
+					sock->cap_info->peer_port = r_add->sin6_port;
+					memcpy(sock->cap_info->peer_addr_v6, &(r_add->sin6_addr), sizeof(bin128));
+				}
+			}
+			//play/record, don't create socket
+			if (sock->cap_info->nf->cap_mode) {
+				if (aip->ai_family==PF_INET6) sock->flags |= GF_SOCK_IS_IPV6;
+				else sock->flags &= ~GF_SOCK_IS_IPV6;
+
+				freeaddrinfo(res);
+				return GF_OK;
+			}
+		}
+#endif
 		sock->socket = socket(aip->ai_family, aip->ai_socktype, aip->ai_protocol);
 		if (sock->socket == INVALID_SOCKET) {
 			sock->socket = NULL_SOCKET;
@@ -1069,9 +2487,8 @@
 		if (! (options & GF_SOCK_FAKE_BIND) ) {
 			ret = bind(sock->socket, aip->ai_addr, (int) aip->ai_addrlen);
 			if (ret == SOCKET_ERROR) {
-				GF_LOG(GF_LOG_WARNING, GF_LOG_NETWORK, ("socket cannot bind: %s\n", gf_errno_str(LASTSOCKERROR) ));
-				closesocket(sock->socket);
-				sock->socket = NULL_SOCKET;
+				GF_LOG(GF_LOG_WARNING, GF_LOG_NETWORK, ("socket bind failed: %s\n", gf_errno_str(LASTSOCKERROR) ));
+				sock_close(sock);
 				continue;
 			}
 		}
@@ -1082,11 +2499,27 @@
 		return GF_OK;
 	}
 	freeaddrinfo(res);
-	GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("Socket Cannot bind to host %s port %d\n", local_ip, port));
+	GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("Socket Cannot bind to ifce %s port %d\n", ifce_ip_or_name ? ifce_ip_or_name : "any", port));
 	return GF_IP_CONNECTION_FAILURE;
 
 #else
 
+#ifndef GPAC_DISABLE_NETCAP
+	if (sock->cap_info) {
+		sock->cap_info->host_port = port ? port : peer_port;
+		sock->cap_info->host_addr_v4 = inet_addr_from_name(ifce_ip_or_name);
+		if (peer_name && peer_port) {
+			sock->cap_info->peer_port = peer_port;
+			sock->cap_info->peer_addr_v4 = inet_addr_from_name(peer_name);
+			sock->flags |= GF_SOCK_HAS_PEER;
+		}
+		//play/record, don't create socket
+		if (sock->cap_info->nf->cap_mode) {
+			return GF_OK;
+		}
+	}
+#endif
+
 	sock->socket = socket(AF_INET, (sock->flags & GF_SOCK_IS_TCP) ? SOCK_STREAM : SOCK_DGRAM, 0);
 	if (sock->flags & GF_SOCK_NON_BLOCKING)
 		gf_sk_set_block_mode(sock, GF_TRUE);
@@ -1095,26 +2528,9 @@
 	memset((void *) &LocalAdd, 0, sizeof(LocalAdd));
 
 	/*setup the address*/
-	ip_add = 0;
-	if (local_ip) ip_add = inet_addr(local_ip);
+	ip_add = inet_addr_from_name(ifce_ip_or_name);
+	if (ip_add==0xFFFFFFFF) return GF_IP_CONNECTION_FAILURE;
 
-	if (!ip_add) {
-#if 0
-		char bufGF_MAX_IP_NAME_LEN;
-		buf0 = 0;
-		ret = gethostname(buf, GF_MAX_IP_NAME_LEN);
-		/*get the IP address*/
-		Host = gf_gethostbyname(buf);
-		if (Host != NULL) {
-			memcpy((char *) &LocalAdd.sin_addr, Host->h_addr_list0, sizeof(LocalAdd.sin_addr));
-			ip_add = LocalAdd.sin_addr.s_addr;
-		} else {
-			ip_add = INADDR_ANY;
-		}
-#else
-		ip_add = INADDR_ANY;
-#endif
-	}
 	if (peer_name && peer_port) {
 #ifdef WIN32
 		if ((inet_addr(peer_name)== ip_add) || !strcmp(peer_name, "127.0.0.1") ) {
@@ -1252,6 +2668,23 @@
 	s32 res;
 
 	if (written) *written = 0;
+#ifndef GPAC_DISABLE_NETCAP
+	if (netcap_filter_pck(sock, length, GF_TRUE)) {
+		if (written) *written = length;
+		return GF_OK;
+	}
+	if (sock->cap_info) {
+		if (sock->cap_info->patch_offset) {
+			((u8*)buffer)sock->cap_info->patch_offset-1 = sock->cap_info->patch_val;
+			sock->cap_info->patch_offset = 0;
+		}
+		if (sock->cap_info->nf->read_socks==NULL)
+			return gf_netcap_send(sock, buffer, length, written);
+
+		if (sock->cap_info->nf->read_socks)
+			return GF_OK;
+	}
+#endif
 
 	//the socket must be bound or connected
 	if (!sock || !sock->socket)
@@ -1312,7 +2745,7 @@
 
 }
 
-GF_Err gf_sk_select(GF_Socket *sock, u32 mode)
+GF_Err gf_sk_select(GF_Socket *sock, GF_SockSelectMode mode)
 {
 	//the socket must be bound or connected
 	if (!sock || !sock->socket)
@@ -1326,30 +2759,32 @@
 GF_EXPORT
 u32 gf_sk_is_multicast_address(const char *multi_IPAdd)
 {
+	if (!multi_IPAdd) return 0;
 #ifdef GPAC_HAS_IPV6
 	u32 val;
 	char *sep;
 	struct addrinfo *res;
-	if (!multi_IPAdd) return 0;
-	/*IPV6 multicast address*/
-	sep = strchr(multi_IPAdd, ':');
-	if (sep) sep = strchr(multi_IPAdd, ':');
-	if (sep && !strnicmp(multi_IPAdd, "ff", 2)) return 1;
-	/*ipv4 multicast address*/
-	res = gf_sk_get_ipv6_addr((char*)multi_IPAdd, 7000, AF_UNSPEC, AI_PASSIVE, SOCK_DGRAM);
-	if (!res) return 0;
-	val = 0;
-	if (res->ai_addr->sa_family == AF_INET) {
-		val = IN_MULTICAST(ntohl(((struct sockaddr_in *)res->ai_addr)->sin_addr.s_addr));
-	} else if (res->ai_addr->sa_family == AF_INET6) {
-		val = IN6_IS_ADDR_MULTICAST(& ((struct sockaddr_in6 *)res->ai_addr)->sin6_addr);
+	if (gf_net_is_ipv6(multi_IPAdd)) {
+		/*IPV6 multicast address*/
+		sep = strchr(multi_IPAdd, ':');
+		if (sep) sep = strchr(multi_IPAdd, ':');
+		if (sep && !strnicmp(multi_IPAdd, "ff", 2)) return 1;
+		//mapped address
+		if (!strnicmp(multi_IPAdd, "::ffff:", 7)) multi_IPAdd+=7;
+		/*ipv4 multicast address*/
+		res = gf_sk_get_ipv6_addr((char*)multi_IPAdd, 7000, AF_UNSPEC, AI_PASSIVE, SOCK_DGRAM);
+		if (!res) return 0;
+		val = 0;
+		if (res->ai_addr->sa_family == AF_INET) {
+			val = IN_MULTICAST(ntohl(((struct sockaddr_in *)res->ai_addr)->sin_addr.s_addr));
+		} else if (res->ai_addr->sa_family == AF_INET6) {
+			val = IN6_IS_ADDR_MULTICAST(& ((struct sockaddr_in6 *)res->ai_addr)->sin6_addr);
+		}
+		freeaddrinfo(res);
+		return val;
 	}
-	freeaddrinfo(res);
-	return val;
-#else
-	if (!multi_IPAdd) return 0;
-	return ((htonl(inet_addr(multi_IPAdd)) >> 8) & 0x00f00000) == 0x00e00000;
 #endif
+	return ((htonl(inet_addr(multi_IPAdd)) >> 8) & 0x00f00000) == 0x00e00000;
 }
 
 static GF_Err sk_join_ipv4(GF_Socket *sock, struct ip_mreq *M_req, u32 TTL, const char **src_ip_inc, u32 nb_src_ip_inc, const char **src_ip_exc, u32 nb_src_ip_exc)
@@ -1366,7 +2801,7 @@
 
 		for (i=0; i<nb_src_ip_inc; i++) {
 			if (gf_net_is_ipv6(src_ip_inci)) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("core IPv6 SSM source on IPv4 Mcast adress, ignoring\n", src_ip_inci));
+				GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("core IPv6 SSM source on IPv4 Mcast address, ignoring\n", src_ip_inci));
 				continue;
 			}
 			M_req_src.imr_sourceaddr.s_addr = inet_addr(src_ip_inci);
@@ -1412,7 +2847,7 @@
 		for (i=0; i<nb_src_ip_exc; i++) {
 			Bool match=GF_FALSE;
 			if (gf_net_is_ipv6(src_ip_exci)) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("core IPv6 SSM source on IPv4 Mcast adress, ignoring\n", src_ip_exci));
+				GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("core IPv6 SSM source on IPv4 Mcast address, ignoring\n", src_ip_exci));
 				continue;
 			}
 			for (j=0; j<nb_src_ip_inc; j++) {
@@ -1434,8 +2869,158 @@
 	return GF_OK;
 }
 
+static u32 inet_addr_from_name(const char *local_interface)
+{
+	if (!local_interface) return htonl(INADDR_ANY);
+
+	if (strchr(local_interface, '.'))
+		return inet_addr(local_interface);
+
+	Bool name_match = GF_FALSE;
+	u32 ret = 0;
+
+#if defined(GPAC_WIN_HAS_ADAPTER_INFO)
+	IP_ADAPTER_ADDRESSES *AdapterInfo = malloc(sizeof(IP_ADAPTER_ADDRESSES));
+	IP_ADAPTER_ADDRESSES *ifa = NULL;
+	ULONG ulOutBufLen = sizeof(AdapterInfo);
+	if (AdapterInfo && (GetAdaptersAddresses(AF_INET, 0, NULL, AdapterInfo, &ulOutBufLen) == ERROR_BUFFER_OVERFLOW)) {
+		free(AdapterInfo);
+		AdapterInfo = malloc(sizeof(IP_ADAPTER_ADDRESSES)*ulOutBufLen);
+	}
+	if (AdapterInfo)
+		GetAdaptersAddresses(AF_INET, 0, NULL, AdapterInfo, &ulOutBufLen);
+
+	ifa = AdapterInfo;
+	while (ifa) {
+		Bool match = GF_FALSE;
+		if (!strcmp(ifa->AdapterName, local_interface)) match = GF_FALSE;
+		char *name = gf_wcs_to_utf8(ifa->FriendlyName);
+		if (name) {
+			if (!strcmp(name, local_interface)) match = GF_TRUE;
+			gf_free(name);
+		}
+		if (match) name_match = GF_TRUE;
+
+		if (!match || !ifa->FirstUnicastAddress || !ifa->FirstUnicastAddress->Address.lpSockaddr) {
+			ifa = ifa->Next;
+			continue;
+		}
+		ret = ((struct sockaddr_in*)ifa->FirstUnicastAddress->Address.lpSockaddr)->sin_addr.s_addr;
+		break;
+	}
+	if (AdapterInfo)
+		free(AdapterInfo);
+#endif
+
+#if defined(GPAC_HAS_IFADDRS)
+	struct ifaddrs *ifap=NULL, *res;
+	getifaddrs(&ifap);
+	res = ifap;
+	while (res) {
+		if (res->ifa_name && !strcmp(res->ifa_name, local_interface)) {
+			name_match = GF_TRUE;
+			if (res->ifa_addr && (res->ifa_addr->sa_family==AF_INET)) {
+				ret = ((struct sockaddr_in*)res->ifa_addr)->sin_addr.s_addr;
+				break;
+			}
+		}
+		res = res->ifa_next;
+	}
+	freeifaddrs(ifap);
+#endif
+	if (!name_match) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("core No such interface %s\n", local_interface));
+		return 0xFFFFFFFF;
+	}
+	if (!ret) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("core Interface %s found but has no IPv4 addressing, using INADRR_ANY\n", local_interface));
+		return htonl(INADDR_ANY);
+	}
+	return ret;
+}
+
+GF_EXPORT
+Bool gf_net_enum_interfaces(gf_net_ifce_enum do_enum, void *enum_cbk)
+{
+#if defined(GPAC_WIN_HAS_ADAPTER_INFO)
+	IP_ADAPTER_ADDRESSES *AdapterInfo = malloc(sizeof(IP_ADAPTER_ADDRESSES));
+	IP_ADAPTER_ADDRESSES *ifa = NULL;
+	ULONG ulOutBufLen = sizeof(AdapterInfo);
+	if (AdapterInfo && (GetAdaptersAddresses(AF_UNSPEC, 0, NULL, AdapterInfo, &ulOutBufLen) == ERROR_BUFFER_OVERFLOW)) {
+		free(AdapterInfo);
+		AdapterInfo = malloc(sizeof(IP_ADAPTER_ADDRESSES)*ulOutBufLen);
+	}
+	if (AdapterInfo)
+		GetAdaptersAddresses(AF_UNSPEC, 0, NULL, AdapterInfo, &ulOutBufLen);
+
+	ifa = AdapterInfo;
+	while (ifa) {
+		if (ifa->FirstUnicastAddress) {
+			char szIP100;
+			szIP0 = 0;
+			u32 flags = 0;
+			if (ifa->OperStatus == 1) flags |= GF_NETIF_ACTIVE;
+			if (ifa->Flags & IP_ADAPTER_NO_MULTICAST) flags |= GF_NETIF_NO_MCAST;
+			if (ifa->Flags & IP_ADAPTER_RECEIVE_ONLY) flags |= GF_NETIF_RECV_ONLY;
+			if (ifa->IfType == IF_TYPE_SOFTWARE_LOOPBACK) flags |= GF_NETIF_LOOPBACK;
+
+			Bool abort=GF_FALSE;
+			IP_ADAPTER_UNICAST_ADDRESS_LH *ipadd = ifa->FirstUnicastAddress;
+			while (ipadd) {
+				u32 sa_fam = ipadd->Address.lpSockaddr ? ipadd->Address.lpSockaddr->sa_family : AF_UNSPEC;
+				if (ipadd->Flags & IP_ADAPTER_ADDRESS_TRANSIENT) sa_fam = AF_UNSPEC;
+				if ((sa_fam == AF_INET) || (sa_fam == AF_INET6)) {
+					my_inet_ntop(sa_fam, ipadd->Address.lpSockaddr, szIP, 100);
+					char *name = gf_wcs_to_utf8(ifa->FriendlyName);
+					Bool res = do_enum(enum_cbk, name ? name : ifa->AdapterName, szIP0 ? szIP : NULL, flags | ((sa_fam==AF_INET6) ? GF_NETIF_IPV6 : 0));
+					if (name) gf_free(name);
+					if (res) break;
+				}
+				ipadd = ipadd->Next;
+			}
+			if (abort) break;
+		}
+		ifa = ifa->Next;
+	}
+	if (AdapterInfo)
+		free(AdapterInfo);
+	return GF_TRUE;
+#endif
+
+#if defined(GPAC_HAS_IFADDRS)
+	struct ifaddrs *ifap=NULL, *res;
+	getifaddrs(&ifap);
+	res = ifap;
+	while (res) {
+		if (res->ifa_addr) {
+			char szIP100;
+			szIP0 = 0;
+			u32 flags=0;
+			if (res->ifa_flags & IFF_UP) flags |= GF_NETIF_ACTIVE;
+			if (res->ifa_flags & IFF_LOOPBACK) flags |= GF_NETIF_LOOPBACK;
+			if (!(res->ifa_flags & IFF_MULTICAST)) flags |= GF_NETIF_NO_MCAST;
+
+			if (res->ifa_addr->sa_family==AF_INET) {
+				inet_ntop(AF_INET, &( ((struct sockaddr_in *)res->ifa_addr)->sin_addr), szIP, 100);
+				if (do_enum(enum_cbk, res->ifa_name, szIP0 ? szIP : NULL, flags))
+					break;
+			}
+			if (res->ifa_addr->sa_family==AF_INET6) {
+				inet_ntop(AF_INET6, &( ((struct sockaddr_in6 *)res->ifa_addr)->sin6_addr), szIP, 100);
+				if (do_enum(enum_cbk, res->ifa_name, szIP0 ? szIP : NULL, flags|GF_NETIF_IPV6))
+					break;
+			}
+		}
+		res = res->ifa_next;
+	}
+	freeifaddrs(ifap);
+	return GF_TRUE;
+#endif
+	return GF_FALSE;
+}
+
 GF_EXPORT
-GF_Err gf_sk_setup_multicast_ex(GF_Socket *sock, const char *multi_IPAdd, u16 MultiPortNumber, u32 TTL, Bool NoBind, char *local_interface_ip,
+GF_Err gf_sk_setup_multicast_ex(GF_Socket *sock, const char *multi_IPAdd, u16 MultiPortNumber, u32 TTL, Bool NoBind, const char *ifce_ip_or_name,
 	const char **src_ip_inc, u32 nb_src_ip_inc, const char **src_ip_exc, u32 nb_src_ip_exc)
 {
 	s32 ret;
@@ -1443,8 +3028,8 @@
 	u32 optval;
 #ifdef GPAC_HAS_IPV6
 	struct sockaddr *addr;
-	struct addrinfo *res, *aip;
-	Bool is_ipv6 = GF_FALSE;
+	Bool mcast_ipv6 = GF_FALSE;
+	Bool ifce_ipv6 = GF_FALSE;
 	u32 type;
 #endif
 	GF_Err e;
@@ -1459,23 +3044,128 @@
 
 
 #ifdef GPAC_HAS_IPV6
-	is_ipv6 = gf_net_is_ipv6(multi_IPAdd) || gf_net_is_ipv6(local_interface_ip) ? GF_TRUE : GF_FALSE;
+	mcast_ipv6 = gf_net_is_ipv6(multi_IPAdd);
+	ifce_ipv6 = gf_net_is_ipv6(ifce_ip_or_name);
+	if (ifce_ip_or_name && (ifce_ip_or_name0=='+')) {
+		ifce_ip_or_name += 1;
+		ifce_ipv6 = GF_TRUE;
+	}
+	if (ifce_ip_or_name && !ifce_ip_or_name0)
+		ifce_ip_or_name=NULL;
+
 	type = (sock->flags & GF_SOCK_IS_TCP) ? SOCK_STREAM : SOCK_DGRAM;
 
-	if (is_ipv6) {
-		res = gf_sk_get_ipv6_addr(local_interface_ip, MultiPortNumber, AF_UNSPEC, AI_PASSIVE, type);
-		if (!res) {
-			if (local_interface_ip) {
-				res = gf_sk_get_ipv6_addr(NULL, MultiPortNumber, AF_UNSPEC, AI_PASSIVE, type);
-				local_interface_ip = NULL;
+	if (mcast_ipv6 || ifce_ipv6) {
+		Bool is_mapped_v4=GF_FALSE;
+		struct addrinfo *res, *aip;
+		struct ipv6_mreq M_reqV6;
+		memset(&M_reqV6, 0, sizeof(struct ipv6_mreq));
+
+		//get interface index - force IPV6 when getting address and store result
+		if (ifce_ip_or_name) {
+#if defined(GPAC_WIN_HAS_ADAPTER_INFO)
+			IP_ADAPTER_ADDRESSES *AdapterInfo = malloc(sizeof(IP_ADAPTER_ADDRESSES));
+			ULONG ulOutBufLen = sizeof(AdapterInfo);
+			if (AdapterInfo && (GetAdaptersAddresses(AF_UNSPEC, 0, NULL, AdapterInfo, &ulOutBufLen) == ERROR_BUFFER_OVERFLOW)) {
+				free(AdapterInfo);
+				AdapterInfo = malloc(sizeof(IP_ADAPTER_ADDRESSES)*ulOutBufLen);
+			}
+			if (AdapterInfo)
+				GetAdaptersAddresses(AF_UNSPEC, 0, NULL, AdapterInfo, &ulOutBufLen);
+
+			IP_ADAPTER_ADDRESSES *ifa = AdapterInfo;
+			while (ifa) {
+				//match by adapter name
+				if (!strcmp(ifa->AdapterName, ifce_ip_or_name)) {
+					M_reqV6.ipv6mr_interface = ifa->Ipv6IfIndex;
+					break;
+				}
+				char *name = gf_wcs_to_utf8(ifa->FriendlyName);
+				if (name && !strcmp(name, ifce_ip_or_name)) {
+					M_reqV6.ipv6mr_interface = ifa->Ipv6IfIndex;
+					gf_free(name);
+					break;
+				}
+				if (name) gf_free(name);
+				name = gf_wcs_to_utf8(ifa->Description);
+				if (!strcmp(name, ifce_ip_or_name)) {
+					M_reqV6.ipv6mr_interface = ifa->Ipv6IfIndex;
+					gf_free(name);
+					break;
+				}
+				if (name) gf_free(name);
+
+				//match by IP
+				IP_ADAPTER_UNICAST_ADDRESS_LH *ipadd = ifa->FirstUnicastAddress;
+				while (ipadd) {
+					u32 sa_fam = ipadd->Address.lpSockaddr ? ipadd->Address.lpSockaddr->sa_family : AF_UNSPEC;
+					if ((sa_fam == AF_INET) || (sa_fam == AF_INET6)) {
+						char szIP100;
+						my_inet_ntop(sa_fam, ipadd->Address.lpSockaddr, szIP, 100);
+						if (!strcmp(szIP, ifce_ip_or_name)) {
+							M_reqV6.ipv6mr_interface = ifa->Ipv6IfIndex;
+							break;
+						}
+					}
+					ipadd = ipadd->Next;
+				}
+
+				ifa = ifa->Next;
+			}
+			if (AdapterInfo) free(AdapterInfo);
+#endif
+
+#if defined(GPAC_HAS_IFADDRS)
+			//get sockaddr if this is an IP address and compare with enumerated interface
+			aip = NULL;
+			if (ifce_ip_or_name && strpbrk(ifce_ip_or_name, ".:")) {
+				aip = gf_sk_get_ipv6_addr(ifce_ip_or_name, MultiPortNumber, ifce_ipv6 ? AF_INET6 : AF_UNSPEC, AI_PASSIVE, type);
+			}
+			struct ifaddrs *ifap=NULL, *ifa;
+			getifaddrs(&ifap);
+			ifa = ifap;
+			while (ifa) {
+				//match by ifce name
+				if (ifa->ifa_addr && !strcmp(ifa->ifa_name, ifce_ip_or_name)
+					&& ((ifa->ifa_addr->sa_family == AF_INET) || (ifa->ifa_addr->sa_family == AF_INET6))
+				) {
+					M_reqV6.ipv6mr_interface = if_nametoindex(ifa->ifa_name);
+					break;
+				}
+				//match by ifce IP
+				if (aip && ifa->ifa_addr) {
+					struct sockaddr_in6 *in6_a = (struct sockaddr_in6 *)aip->ai_addr;
+					struct sockaddr_in6 *in6_b = (struct sockaddr_in6 *)ifa->ifa_addr;
+					if ((in6_a->sin6_family == in6_b->sin6_family)
+						&& !memcmp(&in6_a->sin6_addr, &in6_b->sin6_addr, sizeof(struct in6_addr))
+					) {
+
+						M_reqV6.ipv6mr_interface = if_nametoindex(ifa->ifa_name);
+						break;
+					}
+				}
+				ifa = ifa->ifa_next;
+			}
+			if (ifap)
+				freeifaddrs(ifap);
+			if (aip)
+				freeaddrinfo(aip);
+#endif
+
+			if (!M_reqV6.ipv6mr_interface) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("core Failed to query interface index for %s\n", ifce_ip_or_name ));
+				return GF_IP_CONNECTION_FAILURE;
 			}
-			if (!res) return GF_IP_CONNECTION_FAILURE;
 		}
 
+		//do not specify local_interface_ip address
+		res = gf_sk_get_ipv6_addr(NULL, MultiPortNumber, ifce_ipv6 ? AF_INET6 : AF_UNSPEC, AI_PASSIVE, type);
+		if (!res) return GF_IP_CONNECTION_FAILURE;
+
 		/*for all interfaces*/
 		for (aip=res; aip!=NULL; aip=aip->ai_next) {
 			if (type != (u32) aip->ai_socktype) continue;
-			//we have a v4 multicast adress
+			//we have a v4 multicast address
 			if (!gf_net_is_ipv6(multi_IPAdd)) {
 				//if not v4 and next is v4, use next
 				if ((aip->ai_family!=PF_INET) && aip->ai_next && (aip->ai_next->ai_family==PF_INET)) continue;
@@ -1488,6 +3178,7 @@
 				sock->socket = NULL_SOCKET;
 				continue;
 			}
+
 			/*enable address reuse*/
 			optval = 1;
 			setsockopt(sock->socket, SOL_SOCKET, SO_REUSEADDR, (const char *) &optval, sizeof(optval));
@@ -1496,19 +3187,19 @@
 			setsockopt(sock->socket, SOL_SOCKET, SO_REUSEPORT, SSO_CAST &optval, sizeof(optval));
 #endif
 
-			/*TODO: copy over other properties (recption buffer size & co)*/
-			if (sock->flags & GF_SOCK_NON_BLOCKING)
-				gf_sk_set_block_mode(sock, GF_TRUE);
-
-			memcpy(&sock->dest_addr, aip->ai_addr, aip->ai_addrlen);
-			sock->dest_addr_len = (u32) aip->ai_addrlen;
+			if (!mcast_ipv6 && (aip->ai_family == PF_INET6)) {
+				optval = 0;
+				ret = setsockopt(sock->socket, IPPROTO_IPV6, IPV6_V6ONLY, (const char *)&optval, sizeof(optval));
+				if (ret == SOCKET_ERROR) {
+					GF_LOG(GF_LOG_WARNING, GF_LOG_NETWORK, ("Socket Cannot disable ipv6only: %s\n", gf_errno_str(LASTSOCKERROR)));
+				}
+			}
 
 			if (!NoBind) {
-				ret = bind(sock->socket, aip->ai_addr, (int) aip->ai_addrlen);
+				ret = bind(sock->socket, (struct sockaddr *) aip->ai_addr, (int) aip->ai_addrlen);
 				if (ret == SOCKET_ERROR) {
-					closesocket(sock->socket);
-					sock->socket = NULL_SOCKET;
-					continue;
+					GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("core cannot bind socket: %s\n", gf_errno_str(LASTSOCKERROR)));
+					return GF_IP_CONNECTION_FAILURE;
 				}
 			}
 			if (aip->ai_family==PF_INET6) sock->flags |= GF_SOCK_IS_IPV6;
@@ -1516,21 +3207,42 @@
 			break;
 		}
 		freeaddrinfo(res);
+
 		if (!sock->socket) return GF_IP_CONNECTION_FAILURE;
 
-		res = gf_sk_get_ipv6_addr(multi_IPAdd, MultiPortNumber, AF_UNSPEC, 0, SOCK_DGRAM);
-		if (!res) return GF_IP_CONNECTION_FAILURE;
+		/*TODO: copy over other properties (recption buffer size & co)*/
+		if (sock->flags & GF_SOCK_NON_BLOCKING)
+			gf_sk_set_block_mode(sock, GF_TRUE);
+
+		res = gf_sk_get_ipv6_addr(multi_IPAdd, MultiPortNumber, (sock->flags & GF_SOCK_IS_IPV6) ? AF_INET6 : AF_UNSPEC, 0, SOCK_DGRAM);
+		if (!res) {
+			if (sock->flags & GF_SOCK_IS_IPV6) {
+				char szIP100;
+				strcpy(szIP, "::ffff:");
+				strcat(szIP, multi_IPAdd);
+				is_mapped_v4 = GF_TRUE;
+				res = gf_sk_get_ipv6_addr(szIP, MultiPortNumber, AF_INET6, 0, SOCK_DGRAM);
+			}
+			if (!res)
+				return GF_IP_CONNECTION_FAILURE;
+		}
+		//copy for sendto
 		memcpy(&sock->dest_addr, res->ai_addr, res->ai_addrlen);
 		sock->dest_addr_len = (u32) res->ai_addrlen;
 		freeaddrinfo(res);
 
 		addr = (struct sockaddr *)&sock->dest_addr;
-		if (addr->sa_family == AF_INET) {
-			M_req.imr_multiaddr.s_addr = ((struct sockaddr_in *)addr)->sin_addr.s_addr;
-			M_req.imr_interface.s_addr = INADDR_ANY;
+		//ipv4
+		if (is_mapped_v4) {
+			local_add_id = inet_addr_from_name(ifce_ip_or_name);
+			if (local_add_id==0xFFFFFFFF) return GF_IP_CONNECTION_FAILURE;
+
+			M_req.imr_multiaddr.s_addr = inet_addr(multi_IPAdd);
+			M_req.imr_interface.s_addr = local_add_id;
 
 			e = sk_join_ipv4(sock, &M_req, TTL, src_ip_inc, nb_src_ip_inc, src_ip_exc, nb_src_ip_exc);
 			if (e) return e;
+			//keep sock->dest_addr untouched so that we still have a ipv6 sockaddr
 			sock->flags |= GF_SOCK_IS_MULTICAST | GF_SOCK_HAS_PEER;
 			return GF_OK;
 		}
@@ -1538,9 +3250,13 @@
 			return GF_IP_CONNECTION_FAILURE;
 		}
 
-		struct ipv6_mreq M_reqV6;
 		memcpy(&M_reqV6.ipv6mr_multiaddr, &(((struct sockaddr_in6 *)addr)->sin6_addr), sizeof(struct in6_addr));
-		M_reqV6.ipv6mr_interface = 0;
+
+		/*set send IF index*/
+		optval = M_reqV6.ipv6mr_interface;
+		ret = setsockopt(sock->socket, IPPROTO_IPV6, IPV6_MULTICAST_IF, (const char *)&optval, sizeof(optval));
+		if (ret == SOCKET_ERROR) {
+		}
 
 		if (nb_src_ip_inc) {
 #ifdef MCAST_JOIN_SOURCE_GROUP
@@ -1551,7 +3267,7 @@
 			M_reqV6_src.gsr_group = sock->dest_addr;
 
 			for (i=0; i<nb_src_ip_inc; i++) {
-				res = gf_sk_get_ipv6_addr(src_ip_inci, MultiPortNumber, AF_UNSPEC, 0, SOCK_DGRAM);
+				res = gf_sk_get_ipv6_addr(src_ip_inci, MultiPortNumber, AF_INET6, 0, SOCK_DGRAM);
 				if (!res) {
 					GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("core Failed to get address info for SSM source %s, ignoring\n", src_ip_inci));
 					continue;
@@ -1578,8 +3294,11 @@
 		}
 
 		/*set TTL*/
-		ret = setsockopt(sock->socket, IPPROTO_IPV6, IPV6_MULTICAST_HOPS, (char *) &TTL, sizeof(TTL));
-		if (ret == SOCKET_ERROR) return GF_IP_CONNECTION_FAILURE;
+		if (TTL != 0) {
+			ret = setsockopt(sock->socket, IPPROTO_IPV6, IPV6_MULTICAST_HOPS, (char *) &TTL, sizeof(TTL));
+			if (ret == SOCKET_ERROR) return GF_IP_CONNECTION_FAILURE;
+		}
+
 		/*enable loopback*/
 		optval = 1;
 		ret = setsockopt(sock->socket, IPPROTO_IPV6, IPV6_MULTICAST_LOOP, (char *) &optval, sizeof(optval));
@@ -1600,7 +3319,7 @@
 				}
 				if (match) continue;
 
-				res = gf_sk_get_ipv6_addr(src_ip_exci, MultiPortNumber, AF_UNSPEC, 0, SOCK_DGRAM);
+				res = gf_sk_get_ipv6_addr(src_ip_exci, MultiPortNumber, AF_INET6, 0, SOCK_DGRAM);
 				if (!res) {
 					GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("core Failed to get address info for SSM excluded source %s, ignoring\n", src_ip_exci));
 					continue;
@@ -1623,6 +3342,17 @@
 	}
 #endif
 
+#ifndef GPAC_DISABLE_NETCAP
+	if (sock->cap_info && sock->cap_info->nf->cap_mode) {
+		sock->cap_info->host_port = MultiPortNumber;
+		sock->cap_info->host_addr_v4 = inet_addr(multi_IPAdd);
+		sock->flags &= ~GF_SOCK_IS_IPV6;
+		sock->flags |= GF_SOCK_IS_MULTICAST;
+		return GF_OK;
+	}
+#endif
+
+
 	//IPv4 setup
 	sock->socket = socket(AF_INET, (sock->flags & GF_SOCK_IS_TCP) ? SOCK_STREAM : SOCK_DGRAM, 0);
 	if (sock->flags & GF_SOCK_NON_BLOCKING)
@@ -1643,31 +3373,24 @@
 	}
 #endif
 
-	if (local_interface_ip) local_add_id = inet_addr(local_interface_ip);
-	else local_add_id = htonl(INADDR_ANY);
+	local_add_id = inet_addr_from_name(ifce_ip_or_name);
+	if (local_add_id==0xFFFFFFFF) return GF_IP_CONNECTION_FAILURE;
 
 	if (!NoBind) {
 		struct sockaddr_in local_address;
 
 		memset(&local_address, 0, sizeof(struct sockaddr_in ));
 		local_address.sin_family = AF_INET;
-//		local_address.sin_addr.s_addr = local_add_id;
 		local_address.sin_addr.s_addr = htonl(INADDR_ANY);
 		local_address.sin_port = htons( MultiPortNumber);
 
 		ret = bind(sock->socket, (struct sockaddr *) &local_address, sizeof(local_address));
 		if (ret == SOCKET_ERROR) {
-			/*retry without specifying the local add*/
-			local_address.sin_addr.s_addr = local_add_id = htonl(INADDR_ANY);
-			local_interface_ip = NULL;
-			ret = bind(sock->socket, (struct sockaddr *) &local_address, sizeof(local_address));
-			if (ret == SOCKET_ERROR) {
-				GF_LOG(GF_LOG_WARNING, GF_LOG_NETWORK, ("core Failed to bind socket: %s\n", gf_errno_str(LASTSOCKERROR) ));
-				return GF_IP_CONNECTION_FAILURE;
-			}
+			GF_LOG(GF_LOG_WARNING, GF_LOG_NETWORK, ("core Failed to bind socket: %s\n", gf_errno_str(LASTSOCKERROR) ));
+			return GF_IP_CONNECTION_FAILURE;
 		}
 		/*setup local interface*/
-		if (local_interface_ip) {
+		if (ifce_ip_or_name) {
 			ret = setsockopt(sock->socket, IPPROTO_IP, IP_MULTICAST_IF, (void *) &local_add_id, sizeof(local_add_id));
 			if (ret == SOCKET_ERROR) return GF_IP_CONNECTION_FAILURE;
 		}
@@ -1696,9 +3419,9 @@
 }
 
 GF_EXPORT
-GF_Err gf_sk_setup_multicast(GF_Socket *sock, const char *multi_IPAdd, u16 MultiPortNumber, u32 TTL, Bool NoBind, char *local_interface_ip)
+GF_Err gf_sk_setup_multicast(GF_Socket *sock, const char *multi_IPAdd, u16 MultiPortNumber, u32 TTL, Bool NoBind, const char *ifce_ip_or_name)
 {
-	return gf_sk_setup_multicast_ex(sock, multi_IPAdd, MultiPortNumber, TTL, NoBind, local_interface_ip, NULL, 0, NULL, 0);
+	return gf_sk_setup_multicast_ex(sock, multi_IPAdd, MultiPortNumber, TTL, NoBind, ifce_ip_or_name, NULL, 0, NULL, 0);
 
 }
 
@@ -1714,6 +3437,10 @@
 	GF_POLLFD *fds;
 #endif
 
+#ifndef GPAC_DISABLE_NETCAP
+	u32 nb_nfs;
+	u32 nb_socks;
+#endif
 };
 
 GF_SockGroup *gf_sk_group_new()
@@ -1745,6 +3472,15 @@
 	if (!sg->sockets) sg->sockets = gf_list_new();
 	if (gf_list_find(sg->sockets, sk)>=0) return;
 	gf_list_add(sg->sockets, sk);
+
+#ifndef GPAC_DISABLE_NETCAP
+	if (sk->cap_info) {
+		sg->nb_nfs++;
+		sg->nb_socks = gf_list_count(sg->sockets);
+		return;
+	}
+#endif
+
 #ifdef GPAC_HAS_POLL
 	if (!sg->fds && !gpac_use_poll)
 		return;
@@ -1757,7 +3493,7 @@
 	sg->fdssg->nb_fds.events = sg->last_mask;
 	sg->fdssg->nb_fds.revents = 0;
 	sk->poll_idx = sg->nb_fds+1;
-	assert(sg->fdssg->nb_fds.fd != 0);
+	gf_assert(sg->fdssg->nb_fds.fd != 0);
 	sg->nb_fds++;
 #endif
 }
@@ -1766,6 +3502,23 @@
 {
 	if (!sg || !sk) return;
 	s32 pidx = gf_list_del_item(sg->sockets, sk);
+
+#ifndef GPAC_DISABLE_NETCAP
+	if (sk->cap_info && sk->cap_info->nf->read_socks) {
+		if (sg->nb_nfs)
+			sg->nb_nfs--;
+		sg->nb_socks = gf_list_count(sg->sockets);
+
+		if (sk == sk->cap_info->nf->read_sock_selected) {
+			gf_bs_skip_bytes(sk->cap_info->nf->cap_bs, sk->cap_info->nf->pck_len);
+			sk->cap_info->nf->dst_port = 0;
+			sk->cap_info->nf->read_sock_selected=NULL;
+			//do not load a new packet here as this could go into infinite loop when netcap-loop=-1 ...
+		}
+		return;
+	}
+#endif
+
 	if (!gf_list_count(sg->sockets)) {
 		gf_list_del(sg->sockets);
 		sg->sockets = NULL;
@@ -1806,6 +3559,46 @@
 	if (!sg->sockets)
 		return GF_IP_NETWORK_EMPTY;
 
+#ifndef GPAC_DISABLE_NETCAP
+	if (sg->nb_nfs) {
+		u32 nb_closed=0;
+		u32 nb_write=0;
+		u32 nb_nofs=0;
+		u32 nb_tcp=0;
+		u64 now = gf_sys_clock_high_res();
+		for (i=0; i<sg->nb_socks; i++) {
+			GF_Socket *s = gf_list_get(sg->sockets, i);
+			if (!s->cap_info) {
+				nb_nofs++;
+				continue;
+			}
+			if (!s->cap_info->nf->read_socks) {
+				nb_write++;
+				continue;
+			}
+
+			gf_netcap_load_pck(s->cap_info->nf, now);
+			if (!s->cap_info->nf->read_sock_selected) {
+				if (s->cap_info->nf->is_eos) {
+					if (s->flags & GF_SOCK_IS_TCP) nb_tcp++;
+					nb_closed++;
+				}
+				continue;
+			}
+
+			if (s->cap_info->nf->rt && (s->cap_info->nf->pck_time > now))
+				continue; // GF_IP_NETWORK_EMPTY;
+
+			if (s == s->cap_info->nf->read_sock_selected)
+				return GF_OK;
+		}
+		if (nb_closed==sg->nb_socks) return nb_tcp ? GF_IP_CONNECTION_CLOSED : GF_EOS;
+		if (nb_write) return GF_OK;
+		if (!nb_nofs) return GF_IP_NETWORK_EMPTY;
+		//fallthrough
+	}
+#endif
+
 #ifdef GPAC_HAS_POLL
 	if (sg->fds) {
 		u32 mask = 0;
@@ -1816,7 +3609,7 @@
 			sg->last_mask = mask;
 			for (i=0; i<sg->nb_fds; i++) {
 				sg->fdsi.events = mask;
-				assert(sg->fdsi.fd != 0);
+				gf_assert(sg->fdsi.fd != 0);
 			}
 		}
 		int res = poll(sg->fds, sg->nb_fds, usec_wait/1000);
@@ -1895,6 +3688,19 @@
 {
 	if (!sg || !sk) return GF_FALSE;
 
+#ifndef GPAC_DISABLE_NETCAP
+	if (sk->cap_info) {
+		//write, always true
+		if (!sk->cap_info->nf->read_socks) return GF_TRUE;
+		//read
+		if (sk->cap_info->nf->read_sock_selected != sk) return GF_FALSE;
+		if (sk->cap_info->nf->rt && (sk->cap_info->nf->pck_time > gf_sys_clock_high_res()))
+			return GF_FALSE;
+
+		return GF_TRUE;
+	}
+#endif
+
 #ifdef GPAC_HAS_POLL
 	if (sg->fds && sk->poll_idx) {
 		GF_POLLFD *pfd = &sg->fdssk->poll_idx-1;
@@ -1922,7 +3728,6 @@
 	return GF_FALSE;
 }
 
-
 //fetch nb bytes on a socket and fill the buffer from startFrom
 //length is the allocated size of the receiving buffer
 //BytesRead is the number of bytes read from the network
@@ -1931,7 +3736,47 @@
 	s32 res;
 
 	if (BytesRead) *BytesRead = 0;
-	if (!sock || !sock->socket) return GF_BAD_PARAM;
+	if (!sock) return GF_BAD_PARAM;
+
+#ifndef GPAC_DISABLE_NETCAP
+	if (sock->cap_info) {
+		if (!sock->cap_info->nf->read_socks) return GF_IP_NETWORK_EMPTY;
+
+		GF_NetcapFilter *nf = sock->cap_info->nf;
+		if (do_select && !(sock->flags & GF_SOCK_NON_BLOCKING)) {
+			gf_netcap_load_pck(nf, gf_sys_clock_high_res() );
+			if (!nf->read_sock_selected) return nf->is_eos ? GF_IP_CONNECTION_CLOSED : GF_IP_NETWORK_EMPTY;
+
+			if (nf->rt && (nf->pck_time > gf_sys_clock_high_res()))
+				return GF_IP_NETWORK_EMPTY;
+		}
+		if (!buffer) return GF_OK;
+
+		if (sock!=nf->read_sock_selected) return GF_IP_NETWORK_EMPTY;
+		u32 to_read = length;
+		if ((s32) to_read > nf->pck_len) to_read = nf->pck_len;
+		u32 res = gf_bs_read_data(nf->cap_bs, buffer, to_read);
+		if (nf->read_sock_selected->cap_info->patch_offset) {
+			if (nf->read_sock_selected->cap_info->patch_offset-1<res) {
+				buffernf->read_sock_selected->cap_info->patch_offset-1 = nf->read_sock_selected->cap_info->patch_val;
+				nf->read_sock_selected->cap_info->patch_offset = 0;
+			} else {
+				nf->read_sock_selected->cap_info->patch_offset -= res;
+			}
+		}
+		nf->pck_len -= res;
+		if (!nf->pck_len) {
+			nf->dst_port = 0;
+			gf_netcap_load_pck(nf, 0);
+		}
+
+		if (BytesRead)
+			*BytesRead = res;
+		if (!res) return GF_IP_NETWORK_EMPTY;
+		return GF_OK;
+	}
+#endif
+	if (!sock->socket) return GF_BAD_PARAM;
 
 	if (do_select && !(sock->flags & GF_SOCK_NON_BLOCKING)) {
 		//check read
@@ -1979,7 +3824,18 @@
 			return GF_IP_NETWORK_FAILURE;
 		}
 	}
+
+#ifndef GPAC_DISABLE_NETCAP
+	if (netcap_filter_pck(sock, res, GF_FALSE)) {
+		res = 0;
+	} else if (sock->cap_info && sock->cap_info->patch_offset) {
+		buffersock->cap_info->patch_offset-1 = sock->cap_info->patch_val;
+		sock->cap_info->patch_offset = 0;
+	}
+#endif
+
 	if (!res) return GF_IP_NETWORK_EMPTY;
+
 	if (BytesRead)
 		*BytesRead = res;
 	return GF_OK;
@@ -2002,6 +3858,14 @@
 {
 	s32 i;
 	if (!sock || !sock->socket) return GF_BAD_PARAM;
+
+#ifndef GPAC_DISABLE_NETCAP
+	if (sock->cap_info && sock->cap_info->nf->cap_mode) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("socket Listening on socket is not supported when using network capture\n"));
+		return GF_NOT_SUPPORTED;
+	}
+#endif
+
 	if (!MaxConnection || (MaxConnection >= SOMAXCONN)) {
 		MaxConnection = SOMAXCONN;
 	}
@@ -2041,7 +3905,7 @@
 		}
 	}
 
-	(*newConnection) = (GF_Socket *) gf_malloc(sizeof(GF_Socket));
+	GF_SAFEALLOC((*newConnection), GF_Socket);
 	(*newConnection)->socket = sk;
 	(*newConnection)->flags = sock->flags & ~GF_SOCK_IS_LISTENING;
 	(*newConnection)->usec_wait = sock->usec_wait;
@@ -2126,11 +3990,7 @@
 	char servnameNI_MAXHOST;
 	struct sockaddr_in6 * addrptr = (struct sockaddr_in6 *)(&sock->dest_addr);
 	if (!sock || !sock->socket) return GF_BAD_PARAM;
-#ifdef GPAC_BUILD_FOR_WINXP
-	inet_ntop_xp(AF_INET, addrptr, clienthost, NI_MAXHOST);
-#else
-	inet_ntop(AF_INET, addrptr, clienthost, NI_MAXHOST);
-#endif
+	my_inet_ntop(AF_INET, addrptr, clienthost, NI_MAXHOST);
 	strcpy(buf, clienthost);
 	if (getnameinfo((struct sockaddr *)addrptr, sock->dest_addr_len, clienthost, NI_MAXHOST, servname, NI_MAXHOST, NI_NUMERICHOST) == 0) {
 		strcpy(buf, clienthost);
@@ -2225,6 +4085,10 @@
 	u8 buffer1;
 	if (!sock) return GF_BAD_PARAM;
 
+#ifndef GPAC_DISABLE_NETCAP
+	if (sock->cap_info && sock->cap_info->nf->read_socks && sock->cap_info->nf->is_eos) return GF_IP_CONNECTION_CLOSED;
+#endif
+
 	//check read - force using select at least for windows, for which poll returns nothing on connection abort
 	GF_Err e = poll_select(sock, GF_SK_SELECT_READ, 100, GF_TRUE);
 	if (e) return e;
@@ -2249,6 +4113,12 @@
 	return GF_OK;
 }
 
+#else
+//for ntoh/hton
+#include <arpa/inet.h>
+#endif //GPAC_DISABLE_NETWORK
+
+
 GF_EXPORT
 u32 gf_htonl(u32 val)
 {
@@ -2274,3 +4144,9 @@
 {
 	return ntohs(val);
 }
+
+GF_EXPORT
+const char *gf_errno_str(int errnoval)
+{
+	return strerror(errnoval);
+}

gpac-2.2.1.tar.gz/src/utils/os_thread.c -> gpac-2.4.0.tar.gz/src/utils/os_thread.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2022
+ *			Copyright (c) Telecom ParisTech 2000-2023
  *					All rights reserved
  *
  *  This file is part of GPAC / common tools sub-project
@@ -29,6 +29,9 @@
 
 #include <gpac/thread.h>
 
+#ifndef GPAC_DISABLE_THREADS
+
+
 #if defined(WIN32) || defined(_WIN32_WCE)
 
 /*win32 threads*/
@@ -61,6 +64,10 @@
 	void *args;
 	/* lock for signal */
 	GF_Semaphore *_signal;
+	Bool blocking;
+
+	Bool no_kill;
+
 #ifndef GPAC_DISABLE_LOG
 	u32 id;
 	char *log_name;
@@ -100,6 +107,10 @@
 	}
 	return "Main Process";
 }
+const char *gf_th_log_name(GF_Thread *t)
+{
+	return t ? t->log_name : "Main Process";
+}
 
 #endif
 
@@ -107,9 +118,16 @@
 GF_EXPORT
 GF_Thread *gf_th_new(const char *name)
 {
+	if (gf_opts_get_bool("core", "no-mx")) return NULL;
+
 	GF_Thread *tmp = (GF_Thread*)gf_malloc(sizeof(GF_Thread));
 	memset(tmp, 0, sizeof(GF_Thread));
 	tmp->status = GF_THREAD_STATUS_STOP;
+#ifdef GPAC_CONFIG_EMSCRIPTEN
+	tmp->blocking = GF_FALSE;
+#else
+	tmp->blocking = GF_TRUE;
+#endif
 
 #ifndef GPAC_DISABLE_LOG
 	if (name) {
@@ -158,6 +176,9 @@
 
 #endif /* GPAC_CONFIG_ANDROID */
 
+#if defined(GPAC_CONFIG_EMSCRIPTEN) && !defined(GPAC_DISABLE_THREADS)
+#include <emscripten/eventloop.h>
+#endif
 
 #ifdef WIN32
 DWORD WINAPI RunThread(void *ptr)
@@ -183,19 +204,21 @@
 	}
 #endif
 
-
 	/* Signal the caller */
-	if (! t->_signal) goto exit;
+	if (t->blocking && !t->_signal) goto exit;
+
 #ifdef GPAC_CONFIG_ANDROID
 	if (pthread_once(&currentThreadInfoKey_once, &currentThreadInfoKey_alloc) || pthread_setspecific(currentThreadInfoKey, t))
-		GF_LOG(GF_LOG_ERROR, GF_LOG_MUTEX, ("Mutex Couldn't run thread %s, ID 0x%08x\n", t->log_name, t->id));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MUTEX, ("Mutex Couldn't run thread %s, ID %u\n", t->log_name, t->id));
 #endif /* GPAC_CONFIG_ANDROID */
 	t->status = GF_THREAD_STATUS_RUN;
-	gf_sema_notify(t->_signal, 1);
+
+	if (t->blocking)
+		gf_sema_notify(t->_signal, 1);
 
 #ifndef GPAC_DISABLE_LOG
 	t->id = gf_th_id();
-	GF_LOG(GF_LOG_INFO, GF_LOG_MUTEX, ("Thread %s At %d Entering thread proc - thread ID 0x%08x\n", t->log_name, gf_sys_clock(), t->id));
+	GF_LOG(GF_LOG_INFO, GF_LOG_MUTEX, ("Thread %s At %d Entering thread proc - thread ID %u\n", t->log_name, gf_sys_clock(), t->id));
 #endif
 
 	/* Each thread has its own seed */
@@ -205,6 +228,18 @@
 	ret = t->Run(t->args);
 
 exit:
+
+	if (t->no_kill) {
+#if defined(GPAC_CONFIG_EMSCRIPTEN) && !defined(GPAC_DISABLE_THREADS)
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_MUTEX, ("Thread %s exit with no kill - unwinding to JS event loop\n", t->log_name));
+		emscripten_unwind_to_js_event_loop();
+		return (void *)ret;
+#elif defined(WIN32)
+		return ret;
+#else
+		return (void *)ret;
+#endif
+	}
 #ifndef GPAC_DISABLE_LOG
 	GF_LOG(GF_LOG_INFO, GF_LOG_MUTEX, ("Thread %s At %d Exiting thread proc, return code %d\n", t->log_name, gf_sys_clock(), ret));
 #endif
@@ -239,13 +274,16 @@
 #else
 	pthread_attr_t att;
 #endif
-	if (!t || t->Run || t->_signal) return GF_BAD_PARAM;
+	if (!t || t->Run || t->_signal) {
+		return GF_BAD_PARAM;
+	}
 	t->Run = Run;
 	t->args = param;
-	t->_signal = gf_sema_new(1, 0);
+	if (t->blocking) {
+		t->_signal = gf_sema_new(1, 0);
+		if (!t->_signal) return GF_IO_ERR;
+	}
 
-	if (!t->_signal)
-		return GF_IO_ERR;
 
 	GF_LOG(GF_LOG_INFO, GF_LOG_MUTEX, ("Thread %s Starting\n", t->log_name));
 
@@ -282,16 +320,28 @@
 		return GF_IO_ERR;
 	}
 
-
-	/*wait for the child function to call us - do NOT return before, otherwise the thread status would
-	be unknown*/
-	gf_sema_wait(t->_signal);
-	gf_sema_del(t->_signal);
-	t->_signal = NULL;
+	if (t->blocking) {
+		/*wait for the child function to call us - do NOT return before, otherwise the thread status would be unknown*/
+		gf_sema_wait(t->_signal);
+		gf_sema_del(t->_signal);
+		t->_signal = NULL;
+	}
 	GF_LOG(GF_LOG_INFO, GF_LOG_MUTEX, ("Thread %s Started\n", t->log_name));
 	return GF_OK;
 }
 
+#if defined(GPAC_CONFIG_EMSCRIPTEN) && !defined(GPAC_DISABLE_THREADS)
+#include <emscripten/threading.h>
+
+GF_Err gf_th_async_call(GF_Thread *t, u32 (*Run)(void *param), void *param)
+{
+	t->no_kill = 1;
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_MUTEX, ("Thread %s async EM call\n", t->log_name));
+	emscripten_dispatch_to_thread_async_(t->threadH, EM_FUNC_SIG_II, Run, NULL, param);
+	return GF_OK;
+}
+#endif
+
 
 /* Stops a thread. If Destroy is not 0, thread is destroyed DANGEROUS as no cleanup */
 void Thread_Stop(GF_Thread *t, Bool Destroy)
@@ -320,8 +370,19 @@
 			t->threadH = 0;
 		} else {
 			/*gracefully wait for Run to finish*/
+#ifdef GPAC_CONFIG_EMSCRIPTEN
+			//only destroy if in main application thread (otherwise emscripten assert on cleanupThread()  fails)
+			if (emscripten_is_main_runtime_thread()) {
+				int pthread_tryjoin_np(pthread_t, void **);
+				void *rval=NULL;
+				if (!t->no_kill && pthread_tryjoin_np(t->threadH, &rval))
+					GF_LOG(GF_LOG_ERROR, GF_LOG_MUTEX, ("Thread %s pthread_join() returned an error with thread ID 0x%08x\n", t->log_name, t->id));
+			}
+#else
 			if (pthread_join(t->threadH, NULL))
 				GF_LOG(GF_LOG_ERROR, GF_LOG_MUTEX, ("Thread %s pthread_join() returned an error with thread ID 0x%08x\n", t->log_name, t->id));
+#endif
+
 		}
 #endif
 	}
@@ -395,7 +456,7 @@
 	}
 #endif
 
-#else
+#elif !defined(GPAC_CONFIG_EMSCRIPTEN)
 
 	struct sched_param s_par;
 	if (!t) return;
@@ -455,6 +516,8 @@
 GF_EXPORT
 GF_Mutex *gf_mx_new(const char *name)
 {
+	if (gf_opts_get_bool("core", "no-mx")) return NULL;
+
 #ifndef WIN32
 	pthread_mutexattr_t attr;
 #endif
@@ -540,9 +603,11 @@
 	caller = gf_th_id();
 
 	/*only if we own*/
-	assert(caller == mx->Holder);
-	if (caller != mx->Holder) return;
-	assert(mx->HolderCount > 0);
+	if (caller != mx->Holder) {
+		gf_fatal_assert(0);
+		return;
+	}
+	gf_fatal_assert(mx->HolderCount > 0);
 	mx->HolderCount -= 1;
 
 	if (mx->HolderCount == 0) {
@@ -620,7 +685,7 @@
 				GF_LOG(GF_LOG_ERROR, GF_LOG_MUTEX, ("Mutex %p=%s Deadlock detected.\n", mx, mx->log_name));
 		}
 #endif /* GPAC_DISABLE_LOG */
-		assert(0);
+		gf_assert(0);
 		return 0;
 	}
 #endif /* NOT WIN32 */
@@ -679,7 +744,7 @@
 		}
 #endif
 	default:
-		assert(0);
+		gf_assert(0);
 		return GF_FALSE;
 	}
 #else
@@ -722,6 +787,8 @@
 GF_EXPORT
 GF_Semaphore *gf_sema_new(u32 MaxCount, u32 InitCount)
 {
+	if (gf_opts_get_bool("core", "no-mx")) return NULL;
+
 	GF_Semaphore *tmp = (GF_Semaphore*)gf_malloc(sizeof(GF_Semaphore));
 	if (!tmp) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_MUTEX, ("Couldn't allocate semaphore\n"));
@@ -853,7 +920,7 @@
 		return GF_FALSE;
 	}
 
-#if defined(__DARWIN__) || defined(__APPLE__) || defined(GPAC_CONFIG_IOS)
+#if defined(__DARWIN__) || defined(__APPLE__) || defined(GPAC_CONFIG_IOS) || defined(GPAC_CONFIG_EMSCRIPTEN)
 
 	TimeOut += gf_sys_clock();
 	do {
@@ -882,3 +949,6 @@
 
 #endif
 }
+
+
+#endif //GPAC_DISABLE_THREADS

gpac-2.2.1.tar.gz/src/utils/path2d.c -> gpac-2.4.0.tar.gz/src/utils/path2d.c Changed

gpac-2.2.1.tar.gz/src/utils/path2d_stroker.c -> gpac-2.4.0.tar.gz/src/utils/path2d_stroker.c Changed

@@ -18,6 +18,8 @@
 
 #include <gpac/path2d.h>
 
+#ifndef GPAC_DISABLE_EVG
+
 /***************************************************************************/
 /***************************************************************************/
 /*****                                                                 *****/
@@ -207,7 +209,7 @@
 
 static s32 ft_stroke_border_lineto( FT_StrokeBorder  border, GF_Point2D*       to, Bool movable )
 {
-	assert(border->start >= 0);
+	gf_assert(border->start >= 0);
 
 	if ( border->movable ) {
 		/* move last point */
@@ -232,7 +234,7 @@
 #if 0 //unused
 static s32 ft_stroke_border_conicto( FT_StrokeBorder  border, GF_Point2D*       control, GF_Point2D*       to )
 {
-	assert( border->start >= 0 );
+	gf_assert( border->start >= 0 );
 	if (ft_stroke_border_grow( border, 2 )==0) {
 		GF_Point2D*  vec = border->points + border->num_points;
 		u8 *tag = border->tags   + border->num_points;
@@ -257,7 +259,7 @@
                                      GF_Point2D*       control2,
                                      GF_Point2D*       to )
 {
-	assert( border->start >= 0 );
+	gf_assert( border->start >= 0 );
 
 	if (!ft_stroke_border_grow( border, 3 )) {
 		GF_Point2D*  vec = border->points + border->num_points;
@@ -1050,7 +1052,7 @@
 
 	if (!left->num_points) return 0;
 
-	assert( left->start >= 0 );
+	gf_assert( left->start >= 0 );
 	new_points = left->num_points - left->start;
 	if ( new_points > 0 ) {
 		error = ft_stroke_border_grow( right, (u32)new_points );
@@ -1795,3 +1797,4 @@
 	return outline;
 }
 
+#endif //GPAC_DISABLE_EVG

gpac-2.2.1.tar.gz/src/utils/token.c -> gpac-2.4.0.tar.gz/src/utils/token.c Changed

gpac-2.2.1.tar.gz/src/utils/uni_bidi.c -> gpac-2.4.0.tar.gz/src/utils/uni_bidi.c Changed

gpac-2.2.1.tar.gz/src/utils/unicode.c -> gpac-2.4.0.tar.gz/src/utils/unicode.c Changed

gpac-2.2.1.tar.gz/src/utils/url.c -> gpac-2.4.0.tar.gz/src/utils/url.c Changed

@@ -310,6 +310,23 @@
 	rad = strchr(tmp2, '#');
 	if (rad) rad0 = 0;
 
+	//rule out case where we have the same path
+	if (relative_to_parent) {
+		u32 l1=0, l2=0;
+		rad = strrchr(tmp, '/');
+		if (rad) l1 = (u32) (rad - tmp);
+		rad = strrchr(pathName, '/');
+		if (rad) l2 = (u32) (rad - pathName);
+		if (l1 && l2 && (l1==l2) && !strncmp(pathName, parentName, l1)) {
+			outPath = gf_strdup(pathName + l1 + 1);
+			goto check_spaces;
+		}
+		if (!l1 && !l2) {
+			outPath = gf_strdup(pathName);
+			goto check_spaces;
+		}
+	}
+
 	if (pathSepCount)
 		had_sep_count = GF_TRUE;
 	/*remove the last /*/
@@ -317,8 +334,10 @@
 		//break our path at each separator
 		if ((tmpi-1 == GF_PATH_SEPARATOR) || (tmpi-1 == '/'))  {
 			tmpi-1 = 0;
-			if (!pathSepCount) break;
-			pathSepCount--;
+			if (strcmp(tmp, ".")) {
+				if (!pathSepCount) break;
+				pathSepCount--;
+			}
 		}
 	}
 	//if i==0, the parent path was relative, just return the pathName
@@ -410,7 +429,7 @@
 {
 	if (!strnicmp(sURL, "file://", 7)) {
 		/*file:///C:\ scheme*/
-		if ((sURL7=='/') && (sURL9==':')) {
+		if ((strlen(sURL)>=10) && (sURL7=='/') && (sURL9==':')) {
 			memmove(sURL, sURL+8, strlen(sURL)-7);
 		} else {
 			memmove(sURL, sURL+7, strlen(sURL)-6);

gpac-2.2.1.tar.gz/src/utils/utf.c -> gpac-2.4.0.tar.gz/src/utils/utf.c Changed

gpac-2.2.1.tar.gz/src/utils/xml_parser.c -> gpac-2.4.0.tar.gz/src/utils/xml_parser.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2005-2022
+ *			Copyright (c) Telecom ParisTech 2005-2023
  *			All rights reserved
  *
  *  This file is part of GPAC / common tools sub-project
@@ -186,10 +186,12 @@
 	char err_msg1000;
 
 	u32 att_name_start, elt_name_start, elt_name_end, text_start, text_end;
+	u32 text_check_escapes;
 
 	GF_XMLAttribute *attrs;
 	GF_XMLSaxAttribute *sax_attrs;
 	u32 nb_attrs, nb_alloc_attrs;
+	u32 ent_rec_level;
 };
 
 static GF_XMLSaxAttribute *xml_get_sax_attribute(GF_SAXParser *parser)
@@ -241,8 +243,8 @@
 {
 	char *name, c;
 
-	assert(parser->elt_name_start);
-	assert(parser->elt_name_end);
+	gf_assert(parser->elt_name_start);
+	gf_assert(parser->elt_name_end);
 	if (!parser->node_depth) {
 		format_sax_error(parser, 0, "Markup error");
 		return;
@@ -263,7 +265,7 @@
 	}
 	parser->bufferparser->elt_name_end - 1 = c;
 	parser->node_depth--;
-	if (!parser->init_state && !parser->node_depth) parser->sax_state = SAX_STATE_DONE;
+	if (!parser->init_state && !parser->node_depth && parser->sax_state<SAX_STATE_SYNTAX_ERROR) parser->sax_state = SAX_STATE_DONE;
 	xml_sax_swap(parser);
 	parser->text_start = parser->text_end = 0;
 }
@@ -274,7 +276,7 @@
 	u32 i;
 	char c, *name;
 
-	assert(parser->elt_name_start && parser->elt_name_end);
+	gf_assert(parser->elt_name_start && parser->elt_name_end);
 	c = parser->bufferparser->elt_name_end - 1;
 	parser->bufferparser->elt_name_end - 1 = 0;
 	name = parser->buffer + parser->elt_name_start - 1;
@@ -442,7 +444,7 @@
 			att->name_start = parser->att_name_start;
 			att->name_end = parser->current_pos + 1;
 			while (strchr(" \n\t", parser->bufferatt->name_end - 2)) {
-				assert(att->name_end);
+				gf_assert(att->name_end);
 				att->name_end --;
 			}
 			att->has_entities = GF_FALSE;
@@ -490,7 +492,8 @@
 					att->val_start = parser->current_pos + 2;
 					break;
 				default:
-					break;
+					// garbage char before value separator -> error
+					goto att_retry;
 				}
 				parser->current_pos++;
 				if (parser->att_sep) break;
@@ -500,7 +503,10 @@
 
 att_retry:
 
-		assert(parser->att_sep);
+		if (!parser->att_sep) {
+			format_sax_error(parser, parser->current_pos, "Invalid character %c before attribute value separator", parser->bufferparser->current_pos);
+			return GF_TRUE;
+		}
 		sep = strchr(parser->buffer + parser->current_pos, parser->att_sep);
 		if (!sep || !sep1) return GF_TRUE;
 
@@ -546,14 +552,16 @@
 	char *text, c;
 	if (!parser->text_start || parser->init_state || !parser->sax_text_content) return;
 
-	assert(parser->text_start < parser->text_end);
+	gf_assert(parser->text_start < parser->text_end);
 
 	c = parser->bufferparser->text_end-1;
 	parser->bufferparser->text_end-1 = 0;
 	text = parser->buffer + parser->text_start-1;
 
 	/*solve XML built-in entities*/
-	if (strchr(text, '&') && strchr(text, ';')) {
+//old code commented for ref, we now track escape chars
+//	if (strchr(text, '&') && strchr(text, ';')) {
+	if (parser->text_check_escapes==0x3) {
 		char *xml_text = xml_translate_xml_string(text);
 		if (xml_text) {
 			parser->sax_text_content(parser->sax_cbck, xml_text, (parser->sax_state==SAX_STATE_CDATA) ? GF_TRUE : GF_FALSE);
@@ -564,6 +572,7 @@
 	}
 	parser->bufferparser->text_end-1 = c;
 	parser->text_start = parser->text_end = 0;
+	parser->text_check_escapes = 0;
 }
 
 static void xml_sax_store_text(GF_SAXParser *parser, u32 txt_len)
@@ -571,17 +580,18 @@
 	if (!txt_len) return;
 
 	if (!parser->text_start) {
+		parser->text_check_escapes = 0;
 		parser->text_start = parser->current_pos + 1;
 		parser->text_end = parser->text_start + txt_len;
 		parser->current_pos += txt_len;
-		assert(parser->current_pos <= parser->line_size);
+		gf_assert(parser->current_pos <= parser->line_size);
 		return;
 	}
 	/*contiguous text*/
 	if (parser->text_end && (parser->text_end-1 == parser->current_pos)) {
 		parser->text_end += txt_len;
 		parser->current_pos += txt_len;
-		assert(parser->current_pos <= parser->line_size);
+		gf_assert(parser->current_pos <= parser->line_size);
 		return;
 	}
 	/*need to flush*/
@@ -590,7 +600,7 @@
 	parser->text_start = parser->current_pos + 1;
 	parser->text_end = parser->text_start + txt_len;
 	parser->current_pos += txt_len;
-	assert(parser->current_pos <= parser->line_size);
+	gf_assert(parser->current_pos <= parser->line_size);
 }
 
 static char *xml_get_current_text(GF_SAXParser *parser)
@@ -621,8 +631,8 @@
 
 static void xml_sax_skip_xml_proc(GF_SAXParser *parser)
 {
-	while (parser->current_pos + 1 < parser->line_size) {
-		if ((parser->bufferparser->current_pos=='?') && (parser->bufferparser->current_pos+1=='>')) {
+	while (parser->current_pos < parser->line_size) {
+		if ((parser->current_pos + 1 < parser->line_size) && (parser->bufferparser->current_pos=='?') && (parser->bufferparser->current_pos+1=='>')) {
 			parser->sax_state = SAX_STATE_ELEMENT;
 			parser->current_pos++;
 			xml_sax_swap(parser);
@@ -672,7 +682,7 @@
 			ent->namelen = (u32) strlen(ent->name);
 			ent->sep = c;
 			parser->current_pos += 1+i;
-			assert(parser->current_pos < parser->line_size);
+			gf_assert(parser->current_pos < parser->line_size);
 			xml_sax_swap(parser);
 			i=0;
 			gf_list_add(parser->entities, ent);
@@ -685,7 +695,7 @@
 			if (!ent->value) ent->value = gf_strdup("");
 
 			parser->current_pos += 1;
-			assert(parser->current_pos < parser->line_size);
+			gf_assert(parser->current_pos < parser->line_size);
 			xml_sax_swap(parser);
 			parser->sax_state = SAX_STATE_SKIP_DOCTYPE;
 			return;
@@ -698,6 +708,8 @@
 		}
 	}
 	if (ent_name) gf_free(ent_name);
+	if (ent && !ent->value)
+		parser->sax_state = SAX_STATE_SYNTAX_ERROR;
 	xml_sax_store_text(parser, i);
 }
 
@@ -711,7 +723,7 @@
 		xml_sax_store_text(parser, size);
 		xml_sax_flush_text(parser);
 		parser->current_pos += 3;
-		assert(parser->current_pos <= parser->line_size);
+		gf_assert(parser->current_pos <= parser->line_size);
 		parser->sax_state = SAX_STATE_TEXT_CONTENT;
 	}
 }
@@ -727,7 +739,7 @@
 	}
 
 	parser->current_pos += 3 + (u32) (end - (parser->buffer + parser->current_pos) );
-	assert(parser->current_pos <= parser->line_size);
+	gf_assert(parser->current_pos <= parser->line_size);
 	parser->sax_state = SAX_STATE_TEXT_CONTENT;
 	parser->text_start = parser->text_end = 0;
 	xml_sax_swap(parser);
@@ -765,6 +777,10 @@
 				}
 				i++;
 				if (c=='\n') parser->line++;
+				if (is_text) {
+					if (c=='&') parser->text_check_escapes |= 1;
+					else if (c==';') parser->text_check_escapes |= 2;
+				}
 
 				if (parser->current_pos+i==parser->line_size) {
 					if ((parser->line_size>=2*XML_INPUT_SIZE) && !parser->init_state)
@@ -774,11 +790,13 @@
 				}
 			}
 			if (is_text && i) {
+				u32 has_esc = parser->text_check_escapes;
 				xml_sax_store_text(parser, i);
+				parser->text_check_escapes = has_esc;
 				parser->sax_state = SAX_STATE_ELEMENT;
 			} else if (i) {
 				parser->current_pos += i;
-				assert(parser->current_pos < parser->line_size);
+				gf_assert(parser->current_pos < parser->line_size);
 			}
 			is_end = 0;
 			i = 0;
@@ -857,7 +875,7 @@
 			elt = parser->buffer + parser->elt_name_start-1;
 
 			parser->sax_state = SAX_STATE_ATT_NAME;
-			assert(parser->elt_start_pos <= parser->file_pos + parser->current_pos);
+			gf_assert(parser->elt_start_pos <= parser->file_pos + parser->current_pos);
 			parser->elt_start_pos = parser->file_pos + parser->current_pos;
 
 			if (!strncmp(elt, "!--", 3)) {
@@ -891,7 +909,14 @@
 						parser->line_size = 0;
 						parser->elt_start_pos = 0;
 						parser->sax_state = SAX_STATE_TEXT_CONTENT;
-						e = gf_xml_sax_parse_intern(parser, orig_buf);
+						parser->ent_rec_level++;
+						if (parser->ent_rec_level>100) {
+							GF_LOG(GF_LOG_WARNING, GF_LOG_CORE, ("XML Too many recursions in entity solving, max 100 allowed\n"));
+							e = GF_NOT_SUPPORTED;
+						} else {
+							e = gf_xml_sax_parse_intern(parser, orig_buf);
+							parser->ent_rec_level--;
+						}
 						gf_free(orig_buf);
 						return e;
 					}
@@ -949,7 +974,7 @@
 static GF_Err xml_sax_append_string(GF_SAXParser *parser, char *string)
 {
 	u32 size = parser->line_size;
-	u32 nl_size = (u32) strlen(string);
+	u32 nl_size = string ? (u32) strlen(string) : 0;
 
 	if (!nl_size) return GF_OK;
 
@@ -1021,14 +1046,16 @@
 			ent = gf_xml_locate_entity(parser, name, &needs_text);
 			gf_free(name);
 
+			//entity not found, parse as regular string
 			if (!ent && !needs_text) {
 				xml_sax_append_string(parser, current);
 				xml_sax_parse(parser, GF_TRUE);
 				entityEnd0 = ';';
 				current = entityEnd;
+				parser->in_entity = GF_FALSE;
 				continue;
 			}
-			assert(ent);
+			gf_assert(ent);
 			/*truncate input buffer*/
 			parser->line_size -= (u32) strlen(entityStart);
 			entityStart0 = 0;
@@ -1064,8 +1091,9 @@
 		/*append entity*/
 		line_num = parser->line;
 		xml_sax_append_string(parser, ent->value);
-		xml_sax_parse(parser, GF_TRUE);
+		GF_Err e = xml_sax_parse(parser, GF_TRUE);
 		parser->line = line_num;
+		if (e) return e;
 
 	}
 	xml_sax_append_string(parser, current);
@@ -1253,7 +1281,7 @@
             if (parser->on_progress) parser->on_progress(parser->sax_cbck, parser->file_pos, parser->file_size);
         }
         gf_blob_release(fileName);
-        
+
 		parser->elt_start_pos = parser->elt_end_pos = 0;
 		parser->elt_name_start = parser->elt_name_end = 0;
 		parser->att_name_start = 0;
@@ -1271,7 +1299,7 @@
 	if (!test) return GF_URL_ERROR;
 
 	filesize = gf_fsize(test);
-	assert(filesize < 0x80000000);
+	gf_fatal_assert(filesize < 0x80000000);
 	parser->file_size = (u32) filesize;
 	gf_fclose(test);
 
@@ -1662,6 +1690,8 @@
 	gf_free(node);
 }
 
+GF_List * gf_list_new_prealloc(u32 nb_prealloc);
+
 static void on_dom_node_start(void *cbk, const char *name, const char *ns, const GF_XMLAttribute *attributes, u32 nb_attributes)
 {
 	u32 i;
@@ -1678,8 +1708,8 @@
 		par->parser->sax_state = SAX_STATE_ALLOC_ERROR;
 		return;
 	}
-	node->attributes = gf_list_new();
-	node->content = gf_list_new();
+	node->attributes = gf_list_new_prealloc(nb_attributes);
+	//don't allocate content yet
 	node->name = gf_strdup(name);
 	if (ns) node->ns = gf_strdup(ns);
 	gf_list_add(par->stack, node);
@@ -1690,14 +1720,28 @@
 
 	for (i=0; i<nb_attributes; i++) {
 		GF_XMLAttribute *att;
+		const GF_XMLAttribute *in_att = & attributesi;
+		u32 j;
+		Bool dup=GF_FALSE;
+		for (j=0;j<i; j++) {
+			GF_XMLAttribute *p_att = gf_list_get(node->attributes, j);
+			if (!p_att) break;
+			if (!strcmp(p_att->name, in_att->name)) {
+				dup=GF_TRUE;
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_PARSER, ("SAX Duplicated attribute %s on node %s, ignoring\n", in_att->name, name));
+				break;
+			}
+		}
+		if (dup) continue;
+
 		GF_SAFEALLOC(att, GF_XMLAttribute);
 		if (! att) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("SAX Failed to allocate attribute"));
+			GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("SAX Failed to allocate attribute\n"));
 			par->parser->sax_state = SAX_STATE_ALLOC_ERROR;
 			return;
 		}
-		att->name = gf_strdup(attributesi.name);
-		att->value = gf_strdup(attributesi.value);
+		att->name = gf_strdup(in_att->name);
+		att->value = gf_strdup(in_att->value);
 		gf_list_add(node->attributes, att);
 	}
 }
@@ -1720,11 +1764,11 @@
 			gf_list_rem(par->root_nodes, idx);
 		return;
 	}
-
 	if (last != par->root) {
 		GF_XMLNode *node = (GF_XMLNode *)gf_list_last(par->stack);
-		assert(node->content);
-		assert(gf_list_find(node->content, last) == -1);
+		if (!node->content)
+			node->content = gf_list_new();
+
 		gf_list_add(node->content, last);
 	}
 }
@@ -1735,7 +1779,8 @@
 	GF_XMLNode *node;
 	GF_XMLNode *last = (GF_XMLNode *)gf_list_last(par->stack);
 	if (!last) return;
-	assert(last->content);
+	if (!last->content)
+		last->content = gf_list_new();
 
 	GF_SAFEALLOC(node, GF_XMLNode);
 	if (!node) {
@@ -2430,7 +2475,7 @@
 		const char *ns;
 		ns = strstr(att->name, ":");
 		if (!ns) continue;
-		
+
 		if (!strncmp(att->name, "xmlns", 5)) {
 			if (!strcmp(ns+1, n->ns)) {
 				return GF_OK;

gpac-2.2.1.tar.gz/static.mak -> gpac-2.4.0.tar.gz/static.mak Changed

@@ -34,8 +34,10 @@
 ifeq ($(GPAC_USE_TINYGL),yes)
 COMPOSITOR_CFLAGS+=-I"$(SRC_PATH)/../TinyGL/include"
 else
+ifneq ($(CONFIG_EMSCRIPTEN),yes)
 COMPOSITOR_CFLAGS+=-DGPAC_HAS_GLU
 endif
+endif
 
 
 ## libgpac media tools compilation options
@@ -51,7 +53,7 @@
 
 ifeq ($(STATIC_BUILD),yes)
 LINKFLAGS+=$(zlib_ldflags) $(opensvc_ldflags) $(ssl_ldflags) $(jpeg_ldflags) $(openjpeg_ldflags) $(png_ldflags) $(mad_ldflags) $(a52_ldflags) $(xvid_ldflags) $(faad_ldflags)
-LINKFLAGS+=$(ffmpeg_ldflags) $(ogg_ldflags) $(vorbis_ldflags) $(theora_ldflags) $(nghttp2_ldflags) $(vtb_ldflags)
+LINKFLAGS+=$(ffmpeg_ldflags) $(ogg_ldflags) $(vorbis_ldflags) $(theora_ldflags) $(nghttp2_ldflags) $(vtb_ldflags) $(caption_ldflags) $(mpeghdec_ldflags)
 endif
 
 
@@ -82,6 +84,11 @@
 OBJS+=../modules/sdl_out/sdl_out.o ../modules/sdl_out/audio.o ../modules/sdl_out/video.o
 endif
 
+ifeq ($(CONFIG_CACA),yes)
+CFLAGS+= $(libcaca_cflags)
+EXTRALIBS+= $(libcaca_ldflags)
+OBJS+=../modules/caca_out/caca_out.o
+endif
 
 ifeq ($(CONFIG_X11),yes)
 OBJS+= ../modules/x11_out/x11_out.o
@@ -158,4 +165,3 @@
 
 #end of static modules
 endif
-

Build Results
RPM Lint

Refresh

Comments for request 6043 0

Request History

Aloysius created request 29 days ago

Update to version 2.4

Aloysius accepted request 29 days ago